From f2ef4cedecf554c0c9f0694f93df1d53a57bf70c Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 1 Sep 2020 23:02:36 +0200
Subject: [PATCH 001/299] Fix reason filetype detection, closes #532

---
 autoload/polyglot.vim       | 10 ++++++++++
 ftdetect/polyglot.vim       | 12 ++++++------
 heuristics.yaml             |  8 ++++++++
 packages.yaml               |  1 +
 scripts/build               | 14 +++++++++++---
 scripts/test_extensions.vim |  7 +++++++
 scripts/test_filetypes.vim  |  2 +-
 7 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index 7d5aa8676..3753dc8e4 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -202,6 +202,16 @@ func! polyglot#DetectFsFiletype()
   setf forth | return
 endfunc
 
+func! polyglot#DetectReFiletype()
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '^\s*#\%(\%(if\|ifdef\|define\|pragma\)\s\+\w\|\s*include\s\+[<"]\|template\s*<\)'
+      setf cpp | return
+    endif
+    setf reason | return
+  endfor
+endfunc
+
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 974aa9246..9e86a7ad7 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -218,6 +218,11 @@ if !has_key(s:disabled_packages, 'awk')
   au BufNewFile,BufRead *.awk setf awk
 endif
 
+if !has_key(s:disabled_packages, 'reason')
+  au BufNewFile,BufRead *.rei setf reason
+  au! BufNewFile,BufRead *.re call polyglot#DetectReFiletype()
+endif
+
 if !has_key(s:disabled_packages, 'c/c++')
   au BufNewFile,BufRead *.c setf c
   au BufNewFile,BufRead *.cats setf c
@@ -237,9 +242,9 @@ if !has_key(s:disabled_packages, 'c/c++')
   au BufNewFile,BufRead *.inl setf cpp
   au BufNewFile,BufRead *.ino setf cpp
   au BufNewFile,BufRead *.ipp setf cpp
-  au BufNewFile,BufRead *.re setf cpp
   au BufNewFile,BufRead *.tcc setf cpp
   au BufNewFile,BufRead *.tpp setf cpp
+  au! BufNewFile,BufRead *.re call polyglot#DetectReFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'caddyfile')
@@ -1045,11 +1050,6 @@ if !has_key(s:disabled_packages, 'razor')
   au BufNewFile,BufRead *.razor setf razor
 endif
 
-if !has_key(s:disabled_packages, 'reason')
-  au BufNewFile,BufRead *.re setf reason
-  au BufNewFile,BufRead *.rei setf reason
-endif
-
 if !has_key(s:disabled_packages, 'rst')
   au BufNewFile,BufRead *.rest setf rst
   au BufNewFile,BufRead *.rest.txt setf rst
diff --git a/heuristics.yaml b/heuristics.yaml
index 28dff4ce6..97999022b 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -55,3 +55,11 @@ rules:
     filetype: glsl
 - override: "g:filetype_fs"
 - filetype: forth
+---
+extensions: [re]
+rules:
+- lines: 50
+  rules:
+  - pattern: '^\s*#(?:(?:if|ifdef|define|pragma)\s+\w|\s*include\s+[<"]|template\s*<)'
+    filetype: cpp
+  - filetype: reason
diff --git a/packages.yaml b/packages.yaml
index 234891873..d4042c5ef 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1276,6 +1276,7 @@ filetypes:
 ---
 name: reason
 remote: reasonml-editor/vim-reason-plus
+after: c/c++
 filetypes:
 - name: reason
   linguist: Reason
diff --git a/scripts/build b/scripts/build
index 384c8423e..1fe148e7e 100755
--- a/scripts/build
+++ b/scripts/build
@@ -202,9 +202,17 @@ def indent(str, amount)
 end
 
 def pattern_to_condition(rule)
+  if rule.has_key?("or")
+    return rule["or"].map { |p| pattern_to_condition(p) }.join(" || ")
+  end
+
+  if rule.has_key?("or")
+    return rule["and"].map { |p| pattern_to_condition(p) }.join(" && ")
+  end
+
   operator = (rule["negative"] ? "!" : "=") + "~" + (rule["ignore_case"] ? "?" : "#")
 
-  "line #{operator} '#{rule["pattern"]}'"
+  return "line #{operator} '#{rule["pattern"]}'"
 end
 
 def rules_to_code(rules)
@@ -250,10 +258,10 @@ def rule_to_code(rule)
     return rule["rules"].map { |r| indent(rule_to_code(r), 0) }.join("\n")
   end
 
-  if rule.has_key?("pattern")
+  if rule.has_key?("pattern") || rule.has_key?("or") || rule.has_key?("and")
     return <<~EOS
       if #{pattern_to_condition(rule)}
-      #{indent(rule_to_code(except(rule, "pattern", "ignore_case", "negative")), 2)}
+      #{indent(rule_to_code(except(rule, "pattern", "or", "and", "ignore_case", "negative")), 2)}
       endif
     EOS
   end
diff --git a/scripts/test_extensions.vim b/scripts/test_extensions.vim
index cb52bef8c..dfe2f3a33 100644
--- a/scripts/test_extensions.vim
+++ b/scripts/test_extensions.vim
@@ -207,3 +207,10 @@ call TestExtension('fsharp', 'fsharp.fs', "let myInt = 5")
 call TestExtension('glsl', 'glsl.fs', "//#version 120\nvoid main() {}")
 let g:filetype_fs = 'fizfuz'
 call TestExtension('fizfuz', 'fizfuz.fs', '')
+
+" .re extension
+call TestExtension('reason', 'empty.re', '')
+call TestExtension('cpp', 'cpp.re', '#include "config.h"')
+call TestExtension('cpp', 'cpp2.re', '#ifdef HAVE_CONFIG_H')
+call TestExtension('cpp', 'cpp3.re', '#define YYCTYPE unsigned char')
+call TestExtension('reason', 'react.re', 'ReasonReact.Router.push("");')
diff --git a/scripts/test_filetypes.vim b/scripts/test_filetypes.vim
index 86e2ff36d..d0bec4ccb 100644
--- a/scripts/test_filetypes.vim
+++ b/scripts/test_filetypes.vim
@@ -44,6 +44,7 @@ call TestFiletype('atlas')
 call TestFiletype('autoit')
 call TestFiletype('ave')
 call TestFiletype('awk')
+call TestFiletype('reason')
 call TestFiletype('c')
 call TestFiletype('cpp')
 call TestFiletype('caddyfile')
@@ -175,7 +176,6 @@ call TestFiletype('ragel')
 call TestFiletype('raku')
 call TestFiletype('raml')
 call TestFiletype('razor')
-call TestFiletype('reason')
 call TestFiletype('rst')
 call TestFiletype('ruby')
 call TestFiletype('eruby')

From 63119f09d1390b61155cc0dc3ff497356d2fc7e5 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 1 Sep 2020 23:38:17 +0200
Subject: [PATCH 002/299] Automatically detect indentation, closes #529

---
 README.md           |   2 +-
 autoload/sleuth.vim | 221 ++++++++++++++++++++++++++++++++++++++++++++
 plugin/sleuth.vim   | 164 ++++++++++++++++++++++++++++++++
 scripts/build       |  34 +++++++
 4 files changed, 420 insertions(+), 1 deletion(-)
 create mode 100644 autoload/sleuth.vim
 create mode 100644 plugin/sleuth.vim

diff --git a/README.md b/README.md
index 7424431cc..f53acd5f0 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A collection of language packs for Vim.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
-- No support for esoteric languages, only most popular ones (modern too, like `slim`).
+- Automatically detect indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth))
 - Each build is tested by automated vimrunner script on CI. See `spec` directory.
 
 \*To be completely honest, optimized `ftdetect` script takes around `19ms` to load.
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
new file mode 100644
index 000000000..1c9fbefbd
--- /dev/null
+++ b/autoload/sleuth.vim
@@ -0,0 +1,221 @@
+let s:globs = {
+  \ '8th': '{*.8th,}',
+  \ 'Dockerfile': '{*.dockerfile,*.dock,*.Dockerfile,Dockerfile,dockerfile,Dockerfile*,}',
+  \ 'Jenkinsfile': '{*.jenkinsfile,*.Jenkinsfile,Jenkinsfile,Jenkinsfile*,}',
+  \ 'a2ps': '{a2psrc,.a2psrc,}',
+  \ 'a65': '{*.a65,}',
+  \ 'aap': '{*.aap,}',
+  \ 'abap': '{*.abap,}',
+  \ 'abaqus': '{*.inp,}',
+  \ 'abc': '{*.abc,}',
+  \ 'abel': '{*.abl,}',
+  \ 'acedb': '{*.wrm,}',
+  \ 'ada': '{*.adb,*.ads,*.ada,*.gpr,}',
+  \ 'ahdl': '{*.tdf,}',
+  \ 'aidl': '{*.aidl,}',
+  \ 'alsaconf': '{.asoundrc,}',
+  \ 'aml': '{*.aml,}',
+  \ 'ampl': '{*.run,}',
+  \ 'ant': '{build.xml,}',
+  \ 'apache': '{.htaccess,}',
+  \ 'apiblueprint': '{*.apib,}',
+  \ 'applescript': '{*.applescript,*.scpt,}',
+  \ 'aptconf': '{apt.conf,}',
+  \ 'arch': '{.arch-inventory,=tagging-method,}',
+  \ 'arduino': '{*.pde,*.ino,}',
+  \ 'art': '{*.art,}',
+  \ 'asciidoc': '{*.asciidoc,*.adoc,*.asc,}',
+  \ 'asl': '{*.asl,*.dsl,}',
+  \ 'asn': '{*.asn,*.asn1,}',
+  \ 'aspperl': '{*.asp,}',
+  \ 'aspvbs': '{*.asa,*.asp,}',
+  \ 'atlas': '{*.atl,*.as,}',
+  \ 'autohotkey': '{*.ahk,*.ahkl,}',
+  \ 'autoit': '{*.au3,}',
+  \ 'automake': '{[Mm]akefile.am,GNUmakefile.am,}',
+  \ 'ave': '{*.ave,}',
+  \ 'awk': '{*.awk,}',
+  \ 'blade': '{*.blade,*.blade.php,}',
+  \ 'brewfile': '{Brewfile,}',
+  \ 'c': '{*.c,*.cats,*.h,*.idc,}',
+  \ 'caddyfile': '{Caddyfile,}',
+  \ 'carp': '{*.carp,}',
+  \ 'clojure': '{*.clj,*.boot,*.cl2,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.hic,*.edn,riemann.config,build.boot,profile.boot,}',
+  \ 'cmake': '{*.cmake,*.cmake.in,CMakeLists.txt,}',
+  \ 'coffee': '{*.coffee,*._coffee,*.cake,*.cjsx,*.iced,*.coffeekup,Cakefile,}',
+  \ 'cpp': '{*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ino,*.ipp,*.re,*.tcc,*.tpp,}',
+  \ 'cql': '{*.cql,}',
+  \ 'cryptol': '{*.cry,*.cyl,*.lcry,*.lcyl,}',
+  \ 'crystal': '{*.cr,Projectfile,}',
+  \ 'csv': '{*.csv,*.tsv,*.tab,}',
+  \ 'cucumber': '{*.feature,*.story,}',
+  \ 'cuesheet': '{*.cue,}',
+  \ 'd': '{*.d,*.di,}',
+  \ 'dart': '{*.dart,}',
+  \ 'dcov': '{*.lst,}',
+  \ 'dd': '{*.dd,}',
+  \ 'ddoc': '{*.ddoc,}',
+  \ 'dhall': '{*.dhall,}',
+  \ 'dosini': '{*.wrap,}',
+  \ 'dsdl': '{*.sdl,}',
+  \ 'dune': '{jbuild,dune,dune-project,dune-workspace,}',
+  \ 'ecrystal': '{*.ecr,}',
+  \ 'eelixir': '{*.eex,*.leex,}',
+  \ 'elf': '{*.am,}',
+  \ 'elixir': '{*.ex,*.exs,mix.lock,}',
+  \ 'elm': '{*.elm,}',
+  \ 'embeddedpuppet': '{*.epp,}',
+  \ 'ember-script': '{*.em,*.emberscript,}',
+  \ 'emblem': '{*.emblem,*.em,}',
+  \ 'erlang': '{*.erl,*.app.src,*.es,*.escript,*.hrl,*.xrl,*.yrl,*.app,*.yaws,Emakefile,rebar.config,rebar.config.lock,rebar.lock,}',
+  \ 'eruby': '{*.erb,*.erb.deface,*.rhtml,}',
+  \ 'fbs': '{*.fbs,}',
+  \ 'fennel': '{*.fnl,}',
+  \ 'ferm': '{*.ferm,ferm.conf,}',
+  \ 'fish': '{*.fish,}',
+  \ 'flow': '{*.flow,}',
+  \ 'forth': '{*.fs,*.ft,*.fth,}',
+  \ 'fsharp': '{*.fs,*.fsi,*.fsx,}',
+  \ 'gdscript3': '{*.gd,}',
+  \ 'gitcommit': '{,}',
+  \ 'gitconfig': '{*.gitconfig,.gitconfig,.gitmodules,}',
+  \ 'gitrebase': '{git-rebase-todo,}',
+  \ 'gitsendemail': '{.gitsendemail.*,}',
+  \ 'glsl': '{*.glsl,*.fp,*.frag,*.frg,*.fs,*.fsh,*.fshader,*.geo,*.geom,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader,*.comp,}',
+  \ 'gmpl': '{*.mod,}',
+  \ 'gnuplot': '{*.gp,*.gnu,*.gnuplot,*.p,*.plot,*.plt,}',
+  \ 'go': '{*.go,}',
+  \ 'gohtmltmpl': '{*.tmpl,}',
+  \ 'gomod': '{go.mod,}',
+  \ 'graphql': '{*.graphql,*.gql,*.graphqls,}',
+  \ 'groovy': '{*.gradle,}',
+  \ 'grub': '{,}',
+  \ 'haml': '{*.haml,*.haml.deface,*.hamlc,*.hamlbars,}',
+  \ 'haproxy': '{*.cfg,haproxy.cfg,haproxy*.c*,}',
+  \ 'haskell': '{*.hs,*.hs-boot,*.hsc,*.bpk,*.hsig,}',
+  \ 'haxe': '{*.hx,*.hxsl,}',
+  \ 'hcl': '{*.hcl,*.nomad,*.tf,*.tfvars,*.workflow,Appfile,}',
+  \ 'helm': '{,}',
+  \ 'help': '{,}',
+  \ 'hive': '{*.q,*.hql,*.ql,}',
+  \ 'html': '{*.html,*.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml,}',
+  \ 'html.twig': '{*.twig,}',
+  \ 'i3config': '{*.i3.config,*.i3config,i3.config,i3config,.i3.config,.i3config,}',
+  \ 'icalendar': '{*.ics,}',
+  \ 'idris': '{*.idr,*.lidr,idris-response,}',
+  \ 'ion': '{*.ion,}',
+  \ 'javascript': '{*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile,}',
+  \ 'javascriptreact': '{*.jsx,}',
+  \ 'jinja.html': '{*.jinja,*.j2,*.jinja2,*.njk,}',
+  \ 'jq': '{*.jq,.jqrc,}',
+  \ 'json': '{*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.tern-config,.tern-project,.watchmanconfig,composer.lock,mcmod.info,}',
+  \ 'json5': '{*.json5,}',
+  \ 'jsonnet': '{*.jsonnet,*.libsonnet,}',
+  \ 'jst': '{*.ejs,*.ect,*.jst,}',
+  \ 'julia': '{*.jl,}',
+  \ 'kotlin': '{*.kt,*.ktm,*.kts,}',
+  \ 'ledger': '{*.ldg,*.ledger,*.journal,}',
+  \ 'less': '{*.less,}',
+  \ 'lilypond': '{*.ly,*.ily,}',
+  \ 'litcoffee': '{*.litcoffee,*.coffee.md,}',
+  \ 'livescript': '{*.ls,*._ls,Slakefile,}',
+  \ 'llvm': '{*.ll,}',
+  \ 'log': '{*.log,*.LOG,*_log,*_LOG,}',
+  \ 'lua': '{*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,.luacheckrc,}',
+  \ 'm4': '{*.m4,*.at,}',
+  \ 'mako': '{*.mako,*.mao,}',
+  \ 'markdown': '{*.md,*.markdown,*.mdown,*.mdwn,*.mdx,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr,}',
+  \ 'markdown.mdx': '{*.mdx,}',
+  \ 'meson': '{meson.build,meson_options.txt,}',
+  \ 'mma': '{*.mathematica,*.cdf,*.m,*.ma,*.mt,*.nb,*.nbp,*.wl,*.wlt,*.wls,}',
+  \ 'moon': '{*.moon,}',
+  \ 'murphi': '{*.m,}',
+  \ 'mustache': '{*.handlebars,*.hbs,*.hulk,*.hjs,*.mustache,*.njk,*.hogan,*.hdbs,*.hb,}',
+  \ 'nginx': '{*.nginx,*.nginxconf,*.vhost,nginx.conf,nginx*.conf,*nginx.conf,}',
+  \ 'nim': '{*.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg,}',
+  \ 'nix': '{*.nix,}',
+  \ 'oasis': '{_oasis,}',
+  \ 'objc': '{*.m,*.h,}',
+  \ 'ocaml': '{*.ml,*.eliom,*.eliomi,*.ml4,*.mli,*.mll,*.mly,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo,.ocamlinit,}',
+  \ 'ocamlbuild_tags': '{_tags,}',
+  \ 'ocpbuild': '{*.ocp,}',
+  \ 'ocpbuildroot': '{*.root,}',
+  \ 'octave': '{*.oct,*.m,}',
+  \ 'omake': '{*.om,OMakefile,OMakeroot,OMakeroot.in,}',
+  \ 'opam': '{*.opam,*.opam.template,opam,}',
+  \ 'opencl': '{*.cl,*.opencl,}',
+  \ 'perl': '{*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile,}',
+  \ 'php': '{*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,.php,.php_cs,.php_cs.dist,Phakefile,}',
+  \ 'plantuml': '{*.puml,*.iuml,*.plantuml,*.uml,*.pu,}',
+  \ 'pony': '{*.pony,}',
+  \ 'proto': '{*.proto,}',
+  \ 'ps1': '{*.ps1,*.psd1,*.psm1,*.pssc,}',
+  \ 'ps1xml': '{*.ps1xml,}',
+  \ 'pug': '{*.jade,*.pug,}',
+  \ 'puppet': '{*.pp,Modulefile,}',
+  \ 'purescript': '{*.purs,}',
+  \ 'python': '{*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,.gclient,DEPS,SConscript,SConstruct,Snakefile,wscript,}',
+  \ 'qmake': '{*.pro,*.pri,}',
+  \ 'qml': '{*.qml,*.qbs,}',
+  \ 'r': '{*.r,*.rd,*.rsx,*.s,*.S,.Rprofile,expr-dist,}',
+  \ 'racket': '{*.rkt,*.rktd,*.rktl,*.scrbl,}',
+  \ 'ragel': '{*.rl,}',
+  \ 'raku': '{*.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl,*.pl6,*.pm,*.pm6,*.t,*.rakudoc,*.rakutest,*.raku,*.rakumod,*.pod6,*.t6,}',
+  \ 'raml': '{*.raml,}',
+  \ 'razor': '{*.cshtml,*.razor,}',
+  \ 'reason': '{*.re,*.rei,}',
+  \ 'requirements': '{*.pip,*requirements.{txt,in},*require.{txt,in},constraints.{txt,in},}',
+  \ 'rhelp': '{*.rd,}',
+  \ 'rst': '{*.rst,*.rest,*.rest.txt,*.rst.txt,}',
+  \ 'ruby': '{*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Brewfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb,}',
+  \ 'rust': '{*.rs,*.rs.in,}',
+  \ 'sbt.scala': '{*.sbt,}',
+  \ 'scala': '{*.scala,*.kojo,*.sbt,*.sc,}',
+  \ 'scss': '{*.scss,}',
+  \ 'sexplib': '{*.sexp,}',
+  \ 'sh': '{*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,*.zsh,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.login,.profile,.zlogin,.zlogout,.zprofile,.zshenv,.zshrc,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc,}',
+  \ 'slim': '{*.slim,}',
+  \ 'slime': '{*.slime,}',
+  \ 'smt2': '{*.smt2,*.smt,}',
+  \ 'solidity': '{*.sol,}',
+  \ 'sql': '{*.pgsql,*.sql,}',
+  \ 'stylus': '{*.styl,*.stylus,}',
+  \ 'svelte': '{*.svelte,}',
+  \ 'svg': '{*.svg,}',
+  \ 'swift': '{*.swift,}',
+  \ 'sxhkdrc': '{*.sxhkdrc,sxhkdrc,}',
+  \ 'systemd': '{*.automount,*.mount,*.path,*.service,*.socket,*.swap,*.target,*.timer,}',
+  \ 'tablegen': '{*.td,}',
+  \ 'terraform': '{*.hcl,*.nomad,*.tf,*.tfvars,*.workflow,}',
+  \ 'textile': '{*.textile,}',
+  \ 'thrift': '{*.thrift,}',
+  \ 'tmux': '{.tmux.conf,}',
+  \ 'toml': '{*.toml,Cargo.lock,Gopkg.lock,poetry.lock,Pipfile,}',
+  \ 'tptp': '{*.p,*.tptp,*.ax,}',
+  \ 'trasys': '{*.inp,}',
+  \ 'typescript': '{*.ts,}',
+  \ 'typescriptreact': '{*.tsx,}',
+  \ 'unison': '{*.u,*.uu,}',
+  \ 'v': '{*.v,}',
+  \ 'vala': '{*.vala,*.vapi,*.valadoc,}',
+  \ 'vbnet': '{*.vb,*.vbhtml,}',
+  \ 'vcl': '{*.vcl,}',
+  \ 'velocity': '{*.vm,}',
+  \ 'vmasm': '{*.mar,}',
+  \ 'vue': '{*.vue,*.wpy,}',
+  \ 'xdc': '{*.xdc,}',
+  \ 'xml': '{*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ts,*.tsx,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,}',
+  \ 'xml.twig': '{*.xml.twig,}',
+  \ 'xsl': '{*.xslt,*.xsl,}',
+  \ 'yaml': '{*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,.clang-format,.clang-tidy,.gemrc,glide.lock,yarn.lock,fish_history,fish_read_history,}',
+  \ 'yaml.ansible': '{playbook.y{a,}ml,site.y{a,}ml,main.y{a,}ml,local.y{a,}ml,requirements.y{a,}ml,tasks.*.y{a,}ml,roles.*.y{a,}ml,handlers.*.y{a,}ml,}',
+  \ 'yaml.docker-compose': '{docker-compose*.yaml,docker-compose*.yml,}',
+  \ 'zephir': '{*.zep,}',
+  \ 'zig': '{*.zig,*.zir,}',
+  \ 'zir': '{*.zir,}',
+  \ 'zsh': '{*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,}',
+  \}
+
+func! sleuth#GlobForFiletype(type)
+  return get(s:globs, a:type, '')
+endfunc
diff --git a/plugin/sleuth.vim b/plugin/sleuth.vim
new file mode 100644
index 000000000..120861730
--- /dev/null
+++ b/plugin/sleuth.vim
@@ -0,0 +1,164 @@
+" Heuristically set buffer options
+"
+" Modified version of vim-sleuth:
+"   - softtab and tabstop reduced from 8 to 2
+"   - number of considered lines reduced from 1024 to 64
+"   - maximum 6 other files are checked instead of 20
+"   - check maximum of files 2 per directory level instead of 8
+"   - maximum of 3 directory levels are checked
+"   - globs are concatenated for performance
+
+if exists("g:loaded_sleuth") || v:version < 700 || &cp
+  finish
+endif
+let g:loaded_sleuth = 1
+
+function! s:guess(lines) abort
+  let options = {}
+  let heuristics = {'spaces': 0, 'hard': 0, 'soft': 0}
+  let ccomment = 0
+  let podcomment = 0
+  let triplequote = 0
+  let backtick = 0
+  let xmlcomment = 0
+  let softtab = repeat(' ', 2)
+
+  for line in a:lines
+    if !len(line) || line =~# '^\s*$'
+      continue
+    endif
+
+    if line =~# '^\s*/\*'
+      let ccomment = 1
+    endif
+    if ccomment
+      if line =~# '\*/'
+        let ccomment = 0
+      endif
+      continue
+    endif
+
+    if line =~# '^=\w'
+      let podcomment = 1
+    endif
+    if podcomment
+      if line =~# '^=\%(end\|cut\)\>'
+        let podcomment = 0
+      endif
+      continue
+    endif
+
+    if triplequote
+      if line =~# '^[^"]*"""[^"]*$'
+        let triplequote = 0
+      endif
+      continue
+    elseif line =~# '^[^"]*"""[^"]*$'
+      let triplequote = 1
+    endif
+
+    if backtick
+      if line =~# '^[^`]*`[^`]*$'
+        let backtick = 0
+      endif
+      continue
+    elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
+      let backtick = 1
+    endif
+
+    if line =~# '^\s*<\!--'
+      let xmlcomment = 1
+    endif
+    if xmlcomment
+      if line =~# '-->'
+        let xmlcomment = 0
+      endif
+      continue
+    endif
+
+    if line =~# '^\t'
+      let heuristics.hard += 1
+    elseif line =~# '^' . softtab
+      let heuristics.soft += 1
+    endif
+    if line =~# '^  '
+      let heuristics.spaces += 1
+    endif
+    let indent = len(matchstr(substitute(line, '\t', softtab, 'g'), '^ *'))
+    if indent > 1 && (indent < 4 || indent % 2 == 0) &&
+          \ get(options, 'shiftwidth', 99) > indent
+      let options.shiftwidth = indent
+    endif
+  endfor
+
+  if heuristics.hard && !heuristics.spaces
+    return {'expandtab': 0, 'shiftwidth': &tabstop}
+  elseif heuristics.soft != heuristics.hard
+    let options.expandtab = heuristics.soft > heuristics.hard
+    if heuristics.hard
+      let options.tabstop = 2
+    endif
+  endif
+
+  return options
+endfunction
+
+function! s:apply_if_ready(options) abort
+  if !has_key(a:options, 'expandtab') || !has_key(a:options, 'shiftwidth')
+    return 0
+  else
+    for [option, value] in items(a:options)
+      call setbufvar('', '&'.option, value)
+    endfor
+    return 1
+  endif
+endfunction
+
+function! s:detect() abort
+  if &buftype ==# 'help'
+    return
+  endif
+
+  let options = s:guess(getline(1, 64))
+  if s:apply_if_ready(options)
+    return
+  endif
+  let c = 6
+  let pattern = c > 0 ? sleuth#GlobForFiletype(&filetype) : ''
+  let dir = expand('%:p:h')
+  let level = 3
+  while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && c > 0 && level > 0
+    let level -= 1
+    for neighbor in glob(dir.'/'.pattern,0,1)[0:1]
+      if neighbor !=# expand('%:p') && filereadable(neighbor)
+        call extend(options, s:guess(readfile(neighbor, '', 32)), 'keep')
+        let c -= 1
+      endif
+      if s:apply_if_ready(options)
+        let b:sleuth_culprit = neighbor
+        return
+      endif
+      if c <= 0
+        break
+      endif
+    endfor
+    if c <= 0
+      break
+    endif
+    let dir = fnamemodify(dir, ':h')
+  endwhile
+  if has_key(options, 'shiftwidth')
+    return s:apply_if_ready(extend({'expandtab': 1}, options))
+  endif
+endfunction
+
+setglobal smarttab
+
+if !exists('g:did_indent_on')
+  filetype indent on
+endif
+
+augroup polyglot
+  autocmd!
+  autocmd FileType * call s:detect()
+augroup END
diff --git a/scripts/build b/scripts/build
index 1fe148e7e..2fcbe235a 100755
--- a/scripts/build
+++ b/scripts/build
@@ -716,6 +716,39 @@ def detect_filetypes
   }]
 end
 
+def generate_plugins(packages)
+  FileUtils.mkdir_p('autoload/polyglot')
+
+  output = "let s:globs = {\n"
+
+  patterns = Hash.new { |h, k| h[k] = [] }
+
+  for package in packages
+    for filetype in package["filetypes"]
+      extensions = (filetype["extensions"] || []).map { |e| "*.#{e}" }
+      files = (filetype["filenames"] || []).reject { |e| e.match(/\*\*|\//) }
+      patterns[filetype["name"]].concat(extensions)
+      patterns[filetype["name"]].concat(files)
+    end
+  end
+
+  for filetype in patterns.keys.sort
+    output << "  \\ '#{filetype}': '{#{patterns[filetype].uniq.join(",")},}',\n"
+  end
+  output << "  \\}\n\n"
+
+
+  output << <<~EOS
+    func! sleuth#GlobForFiletype(type)
+      return get(s:globs, a:type, '')
+    endfunc
+  EOS
+
+
+  File.write('autoload/sleuth.vim', output)
+end
+
+
 if __FILE__ == $0
   if !ENV["DEV"]
     FileUtils.rm_rf("tmp")
@@ -725,6 +758,7 @@ if __FILE__ == $0
   download(packages)
   extract(packages)
   generate_ftdetect(packages, heuristics)
+  generate_plugins(packages)
   generate_tests(packages)
   puts(" Bye! Have a wonderful time!")
 

From 7123e974980a76e4db9bf7fff1510cab03b072ae Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 3 Sep 2020 05:36:55 +0200
Subject: [PATCH 003/299] Disable native autocommands when appropriate, fixes
 #533

---
 autoload/sleuth.vim   |  20 ++--
 ftdetect/polyglot.vim | 247 ++++++++++++++++++++++++++++++++++++++----
 packages.yaml         |   2 +
 scripts/build         |  51 ++++++---
 4 files changed, 274 insertions(+), 46 deletions(-)

diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 1c9fbefbd..92b531723 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -43,7 +43,7 @@ let s:globs = {
   \ 'clojure': '{*.clj,*.boot,*.cl2,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.hic,*.edn,riemann.config,build.boot,profile.boot,}',
   \ 'cmake': '{*.cmake,*.cmake.in,CMakeLists.txt,}',
   \ 'coffee': '{*.coffee,*._coffee,*.cake,*.cjsx,*.iced,*.coffeekup,Cakefile,}',
-  \ 'cpp': '{*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ino,*.ipp,*.re,*.tcc,*.tpp,}',
+  \ 'cpp': '{*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp,}',
   \ 'cql': '{*.cql,}',
   \ 'cryptol': '{*.cry,*.cyl,*.lcry,*.lcyl,}',
   \ 'crystal': '{*.cr,Projectfile,}',
@@ -94,7 +94,7 @@ let s:globs = {
   \ 'haproxy': '{*.cfg,haproxy.cfg,haproxy*.c*,}',
   \ 'haskell': '{*.hs,*.hs-boot,*.hsc,*.bpk,*.hsig,}',
   \ 'haxe': '{*.hx,*.hxsl,}',
-  \ 'hcl': '{*.hcl,*.nomad,*.tf,*.tfvars,*.workflow,Appfile,}',
+  \ 'hcl': '{*.hcl,*.nomad,*.workflow,Appfile,}',
   \ 'helm': '{,}',
   \ 'help': '{,}',
   \ 'hive': '{*.q,*.hql,*.ql,}',
@@ -106,7 +106,7 @@ let s:globs = {
   \ 'ion': '{*.ion,}',
   \ 'javascript': '{*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile,}',
   \ 'javascriptreact': '{*.jsx,}',
-  \ 'jinja.html': '{*.jinja,*.j2,*.jinja2,*.njk,}',
+  \ 'jinja.html': '{*.jinja,*.j2,*.jinja2,}',
   \ 'jq': '{*.jq,.jqrc,}',
   \ 'json': '{*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.tern-config,.tern-project,.watchmanconfig,composer.lock,mcmod.info,}',
   \ 'json5': '{*.json5,}',
@@ -124,7 +124,7 @@ let s:globs = {
   \ 'lua': '{*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,.luacheckrc,}',
   \ 'm4': '{*.m4,*.at,}',
   \ 'mako': '{*.mako,*.mao,}',
-  \ 'markdown': '{*.md,*.markdown,*.mdown,*.mdwn,*.mdx,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr,}',
+  \ 'markdown': '{*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr,}',
   \ 'markdown.mdx': '{*.mdx,}',
   \ 'meson': '{meson.build,meson_options.txt,}',
   \ 'mma': '{*.mathematica,*.cdf,*.m,*.ma,*.mt,*.nb,*.nbp,*.wl,*.wlt,*.wls,}',
@@ -157,7 +157,7 @@ let s:globs = {
   \ 'python': '{*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,.gclient,DEPS,SConscript,SConstruct,Snakefile,wscript,}',
   \ 'qmake': '{*.pro,*.pri,}',
   \ 'qml': '{*.qml,*.qbs,}',
-  \ 'r': '{*.r,*.rd,*.rsx,*.s,*.S,.Rprofile,expr-dist,}',
+  \ 'r': '{*.r,*.rsx,*.s,*.S,.Rprofile,expr-dist,}',
   \ 'racket': '{*.rkt,*.rktd,*.rktl,*.scrbl,}',
   \ 'ragel': '{*.rl,}',
   \ 'raku': '{*.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl,*.pl6,*.pm,*.pm6,*.t,*.rakudoc,*.rakutest,*.raku,*.rakumod,*.pod6,*.t6,}',
@@ -167,18 +167,18 @@ let s:globs = {
   \ 'requirements': '{*.pip,*requirements.{txt,in},*require.{txt,in},constraints.{txt,in},}',
   \ 'rhelp': '{*.rd,}',
   \ 'rst': '{*.rst,*.rest,*.rest.txt,*.rst.txt,}',
-  \ 'ruby': '{*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Brewfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb,}',
+  \ 'ruby': '{*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb,}',
   \ 'rust': '{*.rs,*.rs.in,}',
   \ 'sbt.scala': '{*.sbt,}',
-  \ 'scala': '{*.scala,*.kojo,*.sbt,*.sc,}',
+  \ 'scala': '{*.scala,*.kojo,*.sc,}',
   \ 'scss': '{*.scss,}',
   \ 'sexplib': '{*.sexp,}',
-  \ 'sh': '{*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,*.zsh,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.login,.profile,.zlogin,.zlogout,.zprofile,.zshenv,.zshrc,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc,}',
+  \ 'sh': '{*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,}',
   \ 'slim': '{*.slim,}',
   \ 'slime': '{*.slime,}',
   \ 'smt2': '{*.smt2,*.smt,}',
   \ 'solidity': '{*.sol,}',
-  \ 'sql': '{*.pgsql,*.sql,}',
+  \ 'sql': '{*.pgsql,}',
   \ 'stylus': '{*.styl,*.stylus,}',
   \ 'svelte': '{*.svelte,}',
   \ 'svg': '{*.svg,}',
@@ -204,7 +204,7 @@ let s:globs = {
   \ 'vmasm': '{*.mar,}',
   \ 'vue': '{*.vue,*.wpy,}',
   \ 'xdc': '{*.xdc,}',
-  \ 'xml': '{*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ts,*.tsx,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,}',
+  \ 'xml': '{*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,}',
   \ 'xml.twig': '{*.xml.twig,}',
   \ 'xsl': '{*.xslt,*.xsl,}',
   \ 'yaml': '{*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,.clang-format,.clang-tidy,.gemrc,glide.lock,yarn.lock,fish_history,fish_read_history,}',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 9e86a7ad7..87b0cf259 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -59,6 +59,230 @@ if !exists('g:python_highlight_all')
   call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
   call s:SetDefault('g:python_slow_sync', 1)
 endif
+if !has_key(s:disabled_packages, '8th')
+  au! BufRead,BufNewFile *.8th
+endif
+
+if !has_key(s:disabled_packages, 'a65')
+  au! BufRead,BufNewFile *.a65
+endif
+
+if !has_key(s:disabled_packages, 'aap')
+  au! BufRead,BufNewFile *.aap
+endif
+
+if !has_key(s:disabled_packages, 'abap')
+  au! BufRead,BufNewFile *.abap
+endif
+
+if !has_key(s:disabled_packages, 'abc')
+  au! BufRead,BufNewFile *.abc
+endif
+
+if !has_key(s:disabled_packages, 'acpiasl')
+  au! BufRead,BufNewFile *.dsl
+endif
+
+if !has_key(s:disabled_packages, 'ada')
+  au! BufRead,BufNewFile *.ada
+endif
+
+if !has_key(s:disabled_packages, 'aidl')
+  au! BufRead,BufNewFile *.aidl
+endif
+
+if !has_key(s:disabled_packages, 'aml')
+  au! BufRead,BufNewFile *.aml
+endif
+
+if !has_key(s:disabled_packages, 'applescript')
+  au! BufRead,BufNewFile *.applescript
+endif
+
+if !has_key(s:disabled_packages, 'art')
+  au! BufRead,BufNewFile *.art
+endif
+
+if !has_key(s:disabled_packages, 'asciidoc')
+  au! BufRead,BufNewFile *.asciidoc
+endif
+
+if !has_key(s:disabled_packages, 'asn')
+  au! BufRead,BufNewFile *.asn
+endif
+
+if !has_key(s:disabled_packages, 'ave')
+  au! BufRead,BufNewFile *.ave
+endif
+
+if !has_key(s:disabled_packages, 'awk')
+  au! BufRead,BufNewFile *.awk
+endif
+
+if !has_key(s:disabled_packages, 'c/c++')
+  au! BufRead,BufNewFile *.c,*.cpp,*.tpp
+endif
+
+if !has_key(s:disabled_packages, 'cmake')
+  au! BufRead,BufNewFile *.cmake
+endif
+
+if !has_key(s:disabled_packages, 'dart')
+  au! BufRead,BufNewFile *.dart
+endif
+
+if !has_key(s:disabled_packages, 'dlang')
+  au! BufRead,BufNewFile *.sdl
+endif
+
+if !has_key(s:disabled_packages, 'dockerfile')
+  au! BufRead,BufNewFile *.dockerfile
+endif
+
+if !has_key(s:disabled_packages, 'elm')
+  au! BufRead,BufNewFile *.elm
+endif
+
+if !has_key(s:disabled_packages, 'git')
+  au! BufRead,BufNewFile *.gitconfig
+endif
+
+if !has_key(s:disabled_packages, 'gnuplot')
+  au! BufRead,BufNewFile *.gp,*.gnuplot
+endif
+
+if !has_key(s:disabled_packages, 'go')
+  au! BufRead,BufNewFile *.go
+endif
+
+if !has_key(s:disabled_packages, 'haml')
+  au! BufRead,BufNewFile *.haml
+endif
+
+if !has_key(s:disabled_packages, 'handlebars')
+  au! BufRead,BufNewFile *.hb
+endif
+
+if !has_key(s:disabled_packages, 'haproxy')
+  au! BufRead,BufNewFile *.cfg
+endif
+
+if !has_key(s:disabled_packages, 'html5')
+  au! BufRead,BufNewFile *.st,*.xhtml
+endif
+
+if !has_key(s:disabled_packages, 'json')
+  au! BufRead,BufNewFile *.json,*.template
+endif
+
+if !has_key(s:disabled_packages, 'less')
+  au! BufRead,BufNewFile *.less
+endif
+
+if !has_key(s:disabled_packages, 'lua')
+  au! BufRead,BufNewFile *.lua
+endif
+
+if !has_key(s:disabled_packages, 'm4')
+  au! BufRead,BufNewFile *.m4
+endif
+
+if !has_key(s:disabled_packages, 'markdown')
+  au! BufRead,BufNewFile *.markdown
+endif
+
+if !has_key(s:disabled_packages, 'opencl')
+  au! BufRead,BufNewFile *.cl
+endif
+
+if !has_key(s:disabled_packages, 'perl')
+  au! BufRead,BufNewFile *.perl
+endif
+
+if !has_key(s:disabled_packages, 'php')
+  au! BufRead,BufNewFile *.php
+endif
+
+if !has_key(s:disabled_packages, 'protobuf')
+  au! BufRead,BufNewFile *.proto
+endif
+
+if !has_key(s:disabled_packages, 'python')
+  au! BufRead,BufNewFile *.spec
+endif
+
+if !has_key(s:disabled_packages, 'r-lang')
+  au! BufRead,BufNewFile *.r
+endif
+
+if !has_key(s:disabled_packages, 'raku')
+  au! BufRead,BufNewFile *.pod6
+endif
+
+if !has_key(s:disabled_packages, 'raml')
+  au! BufRead,BufNewFile *.raml
+endif
+
+if !has_key(s:disabled_packages, 'rst')
+  au! BufRead,BufNewFile *.rst
+endif
+
+if !has_key(s:disabled_packages, 'ruby')
+  au! BufRead,BufNewFile *.ruby,*.spec
+endif
+
+if !has_key(s:disabled_packages, 'scala')
+  au! BufRead,BufNewFile *.scala
+endif
+
+if !has_key(s:disabled_packages, 'sbt')
+  au! BufRead,BufNewFile *.sbt
+endif
+
+if !has_key(s:disabled_packages, 'scss')
+  au! BufRead,BufNewFile *.scss
+endif
+
+if !has_key(s:disabled_packages, 'sh')
+  au! BufRead,BufNewFile *.sh,*.tmux,*.zsh
+endif
+
+if !has_key(s:disabled_packages, 'svg')
+  au! BufRead,BufNewFile *.svg
+endif
+
+if !has_key(s:disabled_packages, 'swift')
+  au! BufRead,BufNewFile *.swift
+endif
+
+if !has_key(s:disabled_packages, 'terraform')
+  au! BufRead,BufNewFile *.tf
+endif
+
+if !has_key(s:disabled_packages, 'twig')
+  au! BufRead,BufNewFile *.twig
+endif
+
+if !has_key(s:disabled_packages, 'vbnet')
+  au! BufRead,BufNewFile *.vb
+endif
+
+if !has_key(s:disabled_packages, 'vue')
+  au! BufRead,BufNewFile *.vue
+endif
+
+if !has_key(s:disabled_packages, 'xml')
+  au! BufRead,BufNewFile *.xml,*.ant,*.xsd
+endif
+
+if !has_key(s:disabled_packages, 'xsl')
+  au! BufRead,BufNewFile *.xslt
+endif
+
+if !has_key(s:disabled_packages, 'yaml')
+  au! BufRead,BufNewFile *.yaml
+endif
+
 if !has_key(s:disabled_packages, '8th')
   au BufNewFile,BufRead *.8th setf 8th
 endif
@@ -240,11 +464,9 @@ if !has_key(s:disabled_packages, 'c/c++')
   au BufNewFile,BufRead *.hxx setf cpp
   au BufNewFile,BufRead *.inc setf cpp
   au BufNewFile,BufRead *.inl setf cpp
-  au BufNewFile,BufRead *.ino setf cpp
   au BufNewFile,BufRead *.ipp setf cpp
   au BufNewFile,BufRead *.tcc setf cpp
   au BufNewFile,BufRead *.tpp setf cpp
-  au! BufNewFile,BufRead *.re call polyglot#DetectReFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'caddyfile')
@@ -535,8 +757,6 @@ endif
 if !has_key(s:disabled_packages, 'hcl')
   au BufNewFile,BufRead *.hcl setf hcl
   au BufNewFile,BufRead *.nomad setf hcl
-  au BufNewFile,BufRead *.tf setf hcl
-  au BufNewFile,BufRead *.tfvars setf hcl
   au BufNewFile,BufRead *.workflow setf hcl
   au BufNewFile,BufRead Appfile setf hcl
 endif
@@ -621,7 +841,6 @@ if !has_key(s:disabled_packages, 'jinja')
   au BufNewFile,BufRead *.j2 setf jinja.html
   au BufNewFile,BufRead *.jinja setf jinja.html
   au BufNewFile,BufRead *.jinja2 setf jinja.html
-  au BufNewFile,BufRead *.njk setf jinja.html
 endif
 
 if !has_key(s:disabled_packages, 'jq')
@@ -768,7 +987,6 @@ if !has_key(s:disabled_packages, 'markdown')
   au BufNewFile,BufRead *.md setf markdown
   au BufNewFile,BufRead *.mdown setf markdown
   au BufNewFile,BufRead *.mdwn setf markdown
-  au BufNewFile,BufRead *.mdx setf markdown
   au BufNewFile,BufRead *.mkd setf markdown
   au BufNewFile,BufRead *.mkdn setf markdown
   au BufNewFile,BufRead *.mkdown setf markdown
@@ -881,7 +1099,6 @@ endif
 
 if !has_key(s:disabled_packages, 'pgsql')
   au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
-  au BufNewFile,BufRead *.sql let b:sql_type_override='pgsql' | set ft=sql
 endif
 
 if !has_key(s:disabled_packages, 'cql')
@@ -1002,7 +1219,6 @@ endif
 if !has_key(s:disabled_packages, 'r-lang')
   au BufNewFile,BufRead *.S setf r
   au BufNewFile,BufRead *.r setf r
-  au BufNewFile,BufRead *.rd setf r
   au BufNewFile,BufRead *.rsx setf r
   au BufNewFile,BufRead *.s setf r
   au BufNewFile,BufRead {.,}Rprofile setf r
@@ -1093,7 +1309,6 @@ if !has_key(s:disabled_packages, 'ruby')
   au BufNewFile,BufRead {.,}simplecov setf ruby
   au BufNewFile,BufRead Appraisals setf ruby
   au BufNewFile,BufRead Berksfile setf ruby
-  au BufNewFile,BufRead Brewfile setf ruby
   au BufNewFile,BufRead Buildfile setf ruby
   au BufNewFile,BufRead Capfile setf ruby
   au BufNewFile,BufRead Cheffile setf ruby
@@ -1140,7 +1355,6 @@ endif
 
 if !has_key(s:disabled_packages, 'scala')
   au BufNewFile,BufRead *.kojo setf scala
-  au BufNewFile,BufRead *.sbt setf scala
   au BufNewFile,BufRead *.sc setf scala
   au BufNewFile,BufRead *.scala setf scala
 endif
@@ -1165,7 +1379,6 @@ if !has_key(s:disabled_packages, 'sh')
   au BufNewFile,BufRead *.sh.in setf sh
   au BufNewFile,BufRead *.tmux setf sh
   au BufNewFile,BufRead *.tool setf sh
-  au BufNewFile,BufRead *.zsh setf sh
   au BufNewFile,BufRead {.,}bash_aliases setf sh
   au BufNewFile,BufRead {.,}bash_history setf sh
   au BufNewFile,BufRead {.,}bash_logout setf sh
@@ -1177,11 +1390,6 @@ if !has_key(s:disabled_packages, 'sh')
   au BufNewFile,BufRead {.,}flaskenv setf sh
   au BufNewFile,BufRead {.,}login setf sh
   au BufNewFile,BufRead {.,}profile setf sh
-  au BufNewFile,BufRead {.,}zlogin setf sh
-  au BufNewFile,BufRead {.,}zlogout setf sh
-  au BufNewFile,BufRead {.,}zprofile setf sh
-  au BufNewFile,BufRead {.,}zshenv setf sh
-  au BufNewFile,BufRead {.,}zshrc setf sh
   au BufNewFile,BufRead 9fs setf sh
   au BufNewFile,BufRead PKGBUILD setf sh
   au BufNewFile,BufRead bash_aliases setf sh
@@ -1193,11 +1401,6 @@ if !has_key(s:disabled_packages, 'sh')
   au BufNewFile,BufRead login setf sh
   au BufNewFile,BufRead man setf sh
   au BufNewFile,BufRead profile setf sh
-  au BufNewFile,BufRead zlogin setf sh
-  au BufNewFile,BufRead zlogout setf sh
-  au BufNewFile,BufRead zprofile setf sh
-  au BufNewFile,BufRead zshenv setf sh
-  au BufNewFile,BufRead zshrc setf sh
   au BufNewFile,BufRead *.zsh setf zsh
   au BufNewFile,BufRead {.,}zlogin setf zsh
   au BufNewFile,BufRead {.,}zlogout setf zsh
@@ -1416,8 +1619,6 @@ if !has_key(s:disabled_packages, 'xml')
   au BufNewFile,BufRead *.sublime-snippet setf xml
   au BufNewFile,BufRead *.targets setf xml
   au BufNewFile,BufRead *.tml setf xml
-  au BufNewFile,BufRead *.ts setf xml
-  au BufNewFile,BufRead *.tsx setf xml
   au BufNewFile,BufRead *.ui setf xml
   au BufNewFile,BufRead *.urdf setf xml
   au BufNewFile,BufRead *.ux setf xml
diff --git a/packages.yaml b/packages.yaml
index d4042c5ef..f4f801cf6 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -302,6 +302,8 @@ filetypes:
   ignored_extensions:
   # conflicts with more popular reason, remove after heuristics work
   - re
+  # implemented by arduino
+  - ino
 ---
 name: caddyfile
 remote: isobit/vim-caddyfile
diff --git a/scripts/build b/scripts/build
index 2fcbe235a..f8efb850f 100755
--- a/scripts/build
+++ b/scripts/build
@@ -59,17 +59,20 @@ def load_data()
 
         linguist = languages.fetch(filetype["linguist"])
 
-        filetype["extensions"] = (linguist["extensions"] || []).map { |e| e[1..-1] } |
-          filetype.fetch("extra_extensions", []) -
-          filetype.fetch("ignored_extensions", []).uniq
-
-        filetype["filenames"] = (linguist["filenames"] || []) |
-          filetype.fetch("extra_filenames", []) -
-          filetype.fetch("ignored_filenames", []).uniq
+        filetype["extensions"] = ((
+          (linguist["extensions"] || []).map { |e| e[1..-1] } |
+          filetype.fetch("extra_extensions", [])
+        ) - filetype.fetch("ignored_extensions", [])).uniq
+
+        filetype["filenames"] = ((
+          (linguist["filenames"] || []) |
+          filetype.fetch("extra_filenames", [])
+        ) - filetype.fetch("ignored_filenames", [])).uniq
         
-        filetype["interpreters"] = (linguist["interpreters"] || []) |
-          filetype.fetch("extra_interpreters", []) -
-          filetype.fetch("ignored_interpreters", []).uniq
+        filetype["interpreters"] = ((
+          (linguist["interpreters"] || []) |
+          filetype.fetch("extra_interpreters", [])
+        ) - filetype.fetch("ignored_interpreters", []).uniq)
       else
         filetype["extensions"] ||= []
         filetype["filenames"] ||= []
@@ -445,7 +448,29 @@ def generate_ftdetect(packages, heuristics)
   ambiguous_extensions = extensions
     .select { |a, b| b.uniq.size > 1 }.keys.sort
 
-  expected_filetypes = detect_filetypes
+  expected_filetypes = detect_filetypes('tmp/**/ftdetect/*.vim')
+  native_filetypes = detect_filetypes('tmp/vim/vim/runtime/filetype.vim')
+  native_extensions = native_filetypes.flat_map { |k, v| v["extensions"] }
+  
+  for package in packages
+    name = package.fetch("name")
+
+    to_disable = []
+
+    for filetype in package["filetypes"]
+      for extension in filetype["extensions"]
+        if native_filetypes.has_key?(extension)
+          to_disable << "*." + extension
+        end
+      end
+    end
+
+    if to_disable.size > 0
+      output << "if !has_key(s:disabled_packages, '#{name}')\n"
+      output << "  au! BufRead,BufNewFile #{to_disable.join(",")}\n"
+      output << "endif\n\n"
+    end
+  end
 
   for package in packages
     name = package.fetch("name")
@@ -690,8 +715,8 @@ def expand_all(pattern)
   end
 end
 
-def detect_filetypes
-  filetypes = Dir['tmp/**/ftdetect/*.vim'].flat_map do |file|
+def detect_filetypes(glob)
+  filetypes = Dir[glob].flat_map do |file|
     contents = File.read(file).gsub(/^\s*au(tocmd)?!?\s*$/, '')
     results = contents.scan(/^\s*(?:au!|au|au[^g][^ ]*) +(?:\S+)\s+(\S+)[\s\\]+([^\n]+)/)
     results = results.map do |a, b|

From 520389bbfd1696806392be3c2d48ab4d4b2fde09 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 3 Sep 2020 05:38:07 +0200
Subject: [PATCH 004/299] Add test for terraform

---
 scripts/test_extensions.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/test_extensions.vim b/scripts/test_extensions.vim
index dfe2f3a33..c45431d5e 100644
--- a/scripts/test_extensions.vim
+++ b/scripts/test_extensions.vim
@@ -188,6 +188,7 @@ call TestExtension('yaml.ansible', 'host_vars/foobar', '')
 call TestExtension('yaml.ansible', 'handlers.foobar.yaml', '')
 call TestExtension('yaml.ansible', 'requirements.yaml', '')
 call TestExtension('ps1xml', 'foobar.ps1xml', '')
+call TestExtension('terraform', 'terraform.tf', '')
 
 " .m extension
 call TestExtension('octave', 'matlab.m', '')

From 96179c95ba1bc76e792ce06beb7525be1412de48 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 3 Sep 2020 17:16:08 +0200
Subject: [PATCH 005/299] Update contribution info

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f53acd5f0..a1dd0de31 100644
--- a/README.md
+++ b/README.md
@@ -257,7 +257,7 @@ Please note that disabling a language won't make in your vim startup any faster
 
 Language packs are periodically updated using automated `scripts/build` script.
 
-Feel free to add your language to `packages.yaml`, and send pull-request. Please don't run `make` and include that in your PR, send just changes to `packages.yaml` and build scripts if really necessary. You can run `make test` to run rough tests.
+Feel free to add your language to `packages.yaml` + `heuristics.yaml`, and send pull-request. You can run `make test` to run rough tests. And `make dev` for easy development.
 
 ## License
 

From 48f59577c8fa68d85ac73bfd9f257d606c4660b5 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 4 Sep 2020 12:11:55 +0200
Subject: [PATCH 006/299] Switch to neovim version of help filetype, fixes #536

---
 README.md         |   2 +-
 autoload/csv.vim  | 111 ++++++++++++++++++++--------------------------
 doc/ft-csv.txt    |  24 +++++-----
 ftplugin/help.vim |  77 +++++++++++++++++++++++++++++++-
 packages.yaml     |   2 +-
 syntax/help.vim   |  26 ++++-------
 6 files changed, 149 insertions(+), 93 deletions(-)

diff --git a/README.md b/README.md
index a1dd0de31..bf51320bc 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [haxe](https://github.com/yaymukund/vim-haxe)
 - [hcl](https://github.com/b4b4r07/vim-hcl)
 - [helm](https://github.com/towolf/vim-helm)
-- [help](https://github.com/vim/vim/tree/master/runtime)
+- [help](https://github.com/neovim/neovim/tree/master/runtime)
 - [hive](https://github.com/zebradil/hive.vim)
 - [html5](https://github.com/othree/html5.vim)
 - [i3](https://github.com/mboughaba/i3config.vim)
diff --git a/autoload/csv.vim b/autoload/csv.vim
index 8561f30f5..16eeb676e 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -1450,7 +1450,7 @@ fu! csv#SumColumn(list) "{{{3
         let b:csv_result = '0'
         return 0
     else
-        let sum = has("float") ? 0.0 : 0
+        let sum = 0.0
         for item in a:list
             if empty(item)
                 continue
@@ -1460,33 +1460,25 @@ fu! csv#SumColumn(list) "{{{3
             let format2 = '\d\+\zs\V' . s:nr_format[1] . '\m\ze\d'
             try
                 let nr = substitute(nr, format1, '', '')
-                if has("float") && s:nr_format[1] != '.'
+                if s:nr_format[1] != '.'
                     let nr = substitute(nr, format2, '.', '')
                 endif
             catch
-                let nr = 0
+                let nr = '0'
             endtry
-            let sum += (has("float") ? str2float(nr) : (nr + 0))
+            let sum += str2float(nr)
         endfor
-        if has("float")
-            let b:csv_result = string(float2nr(sum))
-            if float2nr(sum) == sum
-                return float2nr(sum)
-            else
-                return printf("%.2f", sum)
-            endif
-        endif
-        let b:csv_result = string(sum)
-        return sum
+        let b:csv_result = sum
+        return printf("%.2f", sum)
     endif
 endfu
 fu! csv#AvgColumn(list) "{{{3
     if empty(a:list)
         let b:csv_result = '0'
-        return 0
+        return 0.0
     else
         let cnt = 0
-        let sum = has("float") ? 0.0 : 0
+        let sum = 0.0
         for item in a:list
             if empty(item)
                 continue
@@ -1496,30 +1488,25 @@ fu! csv#AvgColumn(list) "{{{3
             let format2 = '\d\+\zs\V' . s:nr_format[1] . '\m\ze\d'
             try
                 let nr = substitute(nr, format1, '', '')
-                if has("float") && s:nr_format[1] != '.'
+                if s:nr_format[1] != '.'
                     let nr = substitute(nr, format2, '.', '')
                 endif
             catch
-                let nr = 0
+                let nr ='0'
             endtry
-            let sum += (has("float") ? str2float(nr) : (nr + 0))
+            let sum += str2float(nr)
             let cnt += 1
         endfor
-        if has("float")
-            let b:csv_result = printf("%.2f", sum/cnt)
-            return str2float(b:csv_result)
-        else
-            let b:csv_result = printf("%s", sum/cnt)
-            return b:csv_result + 0
-        endif
+        let b:csv_result = printf("%.2f", sum/cnt)
+        return sum/cnt
     endif
 endfu
 fu! csv#VarianceColumn(list, is_population) "{{{3
     if empty(a:list)
-        return 0
+        return 0.0
     else
         let cnt = 0
-        let sum = has("float") ? 0.0 : 0
+        let sum = 0.0
         let avg = csv#AvgColumn(a:list)
         for item in a:list
             if empty(item)
@@ -1530,64 +1517,64 @@ fu! csv#VarianceColumn(list, is_population) "{{{3
             let format2 = '\d\+\zs\V' . s:nr_format[1] . '\m\ze\d'
             try
                 let nr = substitute(nr, format1, '', '')
-                if has("float") && s:nr_format[1] != '.'
+                if s:nr_format[1] != '.'
                     let nr = substitute(nr, format2, '.', '')
                 endif
             catch
-                let nr = 0
+                let nr = '0'
             endtry
-            let sum += pow((has("float") ? (str2float(nr)-avg) : ((nr + 0)-avg)), 2)
+            let nr = str2float(nr)
+            let sum += pow((nr-avg), 2)
             let cnt += 1
         endfor
         if(a:is_population == 0)
             let cnt = cnt-1
         endif
-        if has("float")
-            let b:csv_result = printf("%." . get(b:, 'csv_accuracy', get(g:, 'csv_accuracy', 2)) . "f", sum/cnt)
-            return b:csv_result
-        else
-            let b:csv_result = printf("%s", sum/cnt)
-            return sum/(cnt)
-        endif
+        let b:csv_result = sum/cnt
+        return b:csv_result
     endif
 endfu
 
 fu! csv#SmplVarianceColumn(list) "{{{2
+    unlet! b:csv_result
     if empty(a:list)
-        let b:csv_result = '0'
-        return 0
+        let b:csv_result = 0.0
+        return 0.0
     else
         return csv#VarianceColumn(a:list, 0)
     endif
 endfu
 
 fu! csv#PopVarianceColumn(list) "{{{2
+    unlet! b:csv_result
     if empty(a:list)
-        let b:csv_result = '0'
-        return 0
+        let b:csv_result = 0.0
+        return 0.0
     else
         return csv#VarianceColumn(a:list, 1)
     endif
 endfu
 
 fu! csv#SmplStdDevColumn(list) "{{{2
+    unlet! b:csv_result
     if empty(a:list)
-        let b:csv_result = '0'
-        return 0
+        let b:csv_result = 0.0
+        return 0.0
     else
-        let result = sqrt(str2float(csv#VarianceColumn(a:list, 0)))
-        let b:csv_result = string(result)
+        let result = sqrt(csv#VarianceColumn(a:list, 0))
+        let b:csv_result = result
         return result
     endif
 endfu
 
 fu! csv#PopStdDevColumn(list) "{{{2
+    unlet! b:csv_result
     if empty(a:list)
-        let b:csv_result = '0'
-        return 0
+        let b:csv_result = 0.0
+        return 0.0
     else
-        let result = sqrt(str2float(csv#VarianceColumn(a:list, 1)))
-        let b:csv_result = string(result)
+        let result = sqrt(csv#VarianceColumn(a:list, 1))
+        let b:csv_result = result
         return result
     endif
 endfu
@@ -1610,13 +1597,13 @@ fu! csv#MaxColumn(list) "{{{3
             let format2 = '\d\+\zs\V' . s:nr_format[1] . '\m\ze\d'
             try
                 let nr = substitute(nr, format1, '', '')
-                if has("float") && s:nr_format[1] != '.'
+                if s:nr_format[1] != '.'
                     let nr = substitute(nr, format2, '.', '')
                 endif
             catch
-                let nr = 0
+                let nr = '0'
             endtry
-            call add(result, has("float") ? str2float(nr) : nr+0)
+            call add(result, str2float(nr))
         endfor
         let result = sort(result, s:csv_numeric_sort ? 'n' : 'csv#CSVSortValues')
         let ind = len(result) > 9 ? 9 : len(result)
@@ -1995,10 +1982,7 @@ fu! csv#AnalyzeColumn(...) "{{{3
         call filter(res, 'v:val =~ ''^''.join(max_items, ''\|'').''$''')
     endif
 
-    if has("float")
-        let  title="Nr\tCount\t % \tValue"
-    else
-        let  title="Nr\tCount\tValue"
+    let  title="Nr\tCount\t % \tValue"
     endif
     echohl Title
     echo printf("%s", title)
@@ -2014,12 +1998,8 @@ fu! csv#AnalyzeColumn(...) "{{{3
                 else
                     let k = key
                 endif
-                if has("float")
-                    echo printf("%02d\t%02d\t%2.0f%%\t%.50s", i, res[key],
-                        \ ((res[key] + 0.0)/qty)*100, k)
-                else
-                    echo printf("%02d\t%02d\t%.50s", i, res[key], k)
-                endif
+                echo printf("%02d\t%02d\t%2.0f%%\t%.50s", i, res[key],
+                    \ ((res[key] + 0.0)/qty)*100, k)
                 call remove(res,key)
                 let i+=1
             else
@@ -2950,6 +2930,11 @@ fu! csv#EvalColumn(nr, func, first, last, ...) range "{{{3
         call csv#Warn("File is no CSV file!")
         return
     endif
+    " Need a Vim with floating point feature
+    if !has("float")
+        call csv#Warn("Your Vim is missing floating point feature!")
+        return
+    endif
     let save = winsaveview()
     call csv#CheckHeaderLine()
     let nr = matchstr(a:nr, '^\-\?\d\+')
diff --git a/doc/ft-csv.txt b/doc/ft-csv.txt
index 7e2a00adc..7f8f6eb39 100644
--- a/doc/ft-csv.txt
+++ b/doc/ft-csv.txt
@@ -969,8 +969,7 @@ The result is also available in the buffer-local variable `b:csv_result`.
 
 See also |csv-aggregate-functions|
 
-                                                                *MinCol_CSV*
-3.27 Maximum/Minimum value of a Column 				*MaxCol_CSV*
+3.27 Maximum/Minimum value of a Column 		*MaxCol_CSV* *MinCol_CSV*
 ---------------------------------------
 You can let Vim output the 10 maximum/minimum values of a column using the
 `:CSVMaxCol` command >
@@ -984,6 +983,7 @@ given, this calculates the sum for the column the cursor is on. Note, that the
 delimiter will be stripped away from each value and also empty values won't be
 considered.
 
+                                                    *format_number_csv*
 By default, Vim uses the a numerical format that uses the '.' as decimal
 separator while there is no thousands separator. If youre file contains
 the numbers in a different format, you can use the /format/ option to specify
@@ -1003,10 +1003,6 @@ uses the Space as thousands separator and the '.' as decimal separator.
 
 If [distinct] is given, only returns the number of distinct values.
 
-Note, if you Vim is compiled without floating point number format (|+float|),
-Vim will only aggregate the integer part and therefore won't use the 'y'
-argument in the /format/ specifier.
-
 The result is also available in the buffer-local variable `b:csv_result`.
 
 3.28 Average value of a Column 				*AvgCol_CSV*
@@ -1021,19 +1017,21 @@ given, this calculates the sum for the column the cursor is on. Note, that the
 delimiter will be stripped away from each value and also empty values won't be
 considered.
 
-For the [/format/] part, see |MaxCol_CSV|.
+For the [/format/] part, see |format_number_csv|.
 
 The result is also available in the buffer-local variable `b:csv_result`.
 
 See also |csv-aggregate-functions|
 
-3.29 Variance of a Column 				*VarCol_CSV*
+3.29 Variance of a Column 				*VarCol_CSV* *SmplVarCol* *PopVarCol*
 _________________________
 
     :[range]PopVarCol [nr] [/format/]
 
     :[range]SmplVarCol [nr] [/format/]
 
+Calculate the Population or Sample Variance for the specified column.
+
 This outputs the result of the column `<nr>` within the range given. If no range
 is given, this will calculate the statistical variance of the whole column. If <nr> is not
 given, this calculates the variance for the column the cursor is on. Note, that the delimiter
@@ -1041,13 +1039,17 @@ will be stripped away from each value and also empty values won't be considered.
 
 The result is also available in the buffer-local variable `b:csv_result`.
 
-3.30 Standard Deviation of a Column 				*StdDevCol_CSV*
+For the [/format/] part, see |format_number_csv|.
+
+3.30 Standard Deviation of a Column *StdDevCol_CSV* *PopStdCol* *SmplStdCol*
 ___________________________________
 
     :[range]PopStdCol [nr] [/format/]
 
     :[range]SmplStdCol [nr] [/format/]
 
+Calculate the Population or Sample Standard Deviation for the specified column.
+
 This outputs the result of the column `<nr>` within the range given. If no range
 is given, this will calculate the standard deviation of the whole column. If <nr> is not
 given, this calculates the standard deviation for the column the cursor is on. Note, that
@@ -1055,6 +1057,8 @@ the delimiter will be stripped away from each value and also empty values won't
 
 The result is also available in the buffer-local variable `b:csv_result`.
 
+For the [/format/] part, see |format_number_csv|.
+
                                                             *:CSVDupColumn*
 3.31 Duplicate columns                                       *DupColumn_CSV*
 ----------------------
@@ -1089,7 +1093,7 @@ This outputs the sum of the row [range]. If no range is given, this will
 calculate the sum for the current row. Note, that the delimiter will be
 stripped away from each value and also empty values won't be considered.
 
-For the [/format/] part, see |MaxCol_CSV|.
+For the [/format/] part, see |format_number_csv|
 ==============================================================================
 4. CSV Configuration					 *csv-configuration*
 
diff --git a/ftplugin/help.vim b/ftplugin/help.vim
index 5e9a4aa00..bb6d43e82 100644
--- a/ftplugin/help.vim
+++ b/ftplugin/help.vim
@@ -15,11 +15,86 @@ set cpo&vim
 
 let b:undo_ftplugin = "setl fo< tw< cole< cocu< keywordprg<"
 
-setlocal formatoptions+=tcroql textwidth=78 keywordprg=:help
+setlocal formatoptions+=tcroql textwidth=78
 if has("conceal")
   setlocal cole=2 cocu=nc
 endif
 
+" Prefer Vim help instead of manpages.
+setlocal keywordprg=:help
+
+if !exists('g:no_plugin_maps')
+  function! s:show_toc() abort
+    let bufname = bufname('%')
+    let info = getloclist(0, {'winid': 1})
+    if !empty(info) && getwinvar(info.winid, 'qf_toc') ==# bufname
+      lopen
+      return
+    endif
+
+    let toc = []
+    let lnum = 2
+    let last_line = line('$') - 1
+    let last_added = 0
+    let has_section = 0
+    let has_sub_section = 0
+
+    while lnum && lnum <= last_line
+      let level = 0
+      let add_text = ''
+      let text = getline(lnum)
+
+      if text =~# '^=\+$' && lnum + 1 < last_line
+        " A de-facto section heading.  Other headings are inferred.
+        let has_section = 1
+        let has_sub_section = 0
+        let lnum = nextnonblank(lnum + 1)
+        let text = getline(lnum)
+        let add_text = text
+        while add_text =~# '\*[^*]\+\*\s*$'
+          let add_text = matchstr(add_text, '.*\ze\*[^*]\+\*\s*$')
+        endwhile
+      elseif text =~# '^[A-Z0-9][-A-ZA-Z0-9 .][-A-Z0-9 .():]*\%([ \t]\+\*.\+\*\)\?$'
+        " Any line that's yelling is important.
+        let has_sub_section = 1
+        let level = has_section
+        let add_text = matchstr(text, '.\{-}\ze\s*\%([ \t]\+\*.\+\*\)\?$')
+      elseif text =~# '\~$'
+            \ && matchstr(text, '^\s*\zs.\{-}\ze\s*\~$') !~# '\t\|\s\{2,}'
+            \ && getline(lnum - 1) =~# '^\s*<\?$\|^\s*\*.*\*$'
+            \ && getline(lnum + 1) =~# '^\s*>\?$\|^\s*\*.*\*$'
+        " These lines could be headers or code examples.  We only want the
+        " ones that have subsequent lines at the same indent or more.
+        let l = nextnonblank(lnum + 1)
+        if getline(l) =~# '\*[^*]\+\*$'
+          " Ignore tag lines
+          let l = nextnonblank(l + 1)
+        endif
+
+        if indent(lnum) <= indent(l)
+          let level = has_section + has_sub_section
+          let add_text = matchstr(text, '\S.*')
+        endif
+      endif
+
+      let add_text = substitute(add_text, '\s\+$', '', 'g')
+      if !empty(add_text) && last_added != lnum
+        let last_added = lnum
+        call add(toc, {'bufnr': bufnr('%'), 'lnum': lnum,
+              \ 'text': repeat('  ', level) . add_text})
+      endif
+      let lnum = nextnonblank(lnum + 1)
+    endwhile
+
+    call setloclist(0, toc, ' ')
+    call setloclist(0, [], 'a', {'title': 'Help TOC'})
+    lopen
+    let w:qf_toc = bufname
+  endfunction
+
+  nnoremap <silent><buffer> gO :call <sid>show_toc()<cr>
+endif
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
diff --git a/packages.yaml b/packages.yaml
index f4f801cf6..1ff3f0ebd 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1672,7 +1672,7 @@ filetypes:
   - "*/templates/*.tpl"
 ---
 name: help
-remote: vim/vim:runtime
+remote: neovim/neovim:runtime
 glob: '**/help.vim'
 filetypes:
 - name: help
diff --git a/syntax/help.vim b/syntax/help.vim
index aca620ee9..a031e48e0 100644
--- a/syntax/help.vim
+++ b/syntax/help.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'help') == -1
 " Vim syntax file
 " Language:	Vim help file
 " Maintainer:	Bram Moolenaar (Bram@vim.org)
-" Last Change:	2020 Jul 28
+" Last Change:	2019 May 12
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -13,7 +13,7 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-syn match helpHeadline		"^[-A-Z .][-A-Z0-9 .()_]*\ze\(\s\+\*\|$\)"
+syn match helpHeadline		"^[-A-Z .][-A-Z0-9 .()_]*[ \t]\+\*"me=e-1
 syn match helpSectionDelim	"^===.*===$"
 syn match helpSectionDelim	"^---.*--$"
 if has("conceal")
@@ -21,15 +21,9 @@ if has("conceal")
 else
   syn region helpExample	matchgroup=helpIgnore start=" >$" start="^>$" end="^[^ \t]"me=e-1 end="^<"
 endif
-if has("ebcdic")
-  syn match helpHyperTextJump	"\\\@<!|[^"*|]\+|" contains=helpBar
-  syn match helpHyperTextEntry	"\*[^"*|]\+\*\s"he=e-1 contains=helpStar
-  syn match helpHyperTextEntry	"\*[^"*|]\+\*$" contains=helpStar
-else
-  syn match helpHyperTextJump	"\\\@<!|[#-)!+-~]\+|" contains=helpBar
-  syn match helpHyperTextEntry	"\*[#-)!+-~]\+\*\s"he=e-1 contains=helpStar
-  syn match helpHyperTextEntry	"\*[#-)!+-~]\+\*$" contains=helpStar
-endif
+syn match helpHyperTextJump	"\\\@<!|[#-)!+-~]\+|" contains=helpBar
+syn match helpHyperTextEntry	"\*[#-)!+-~]\+\*\s"he=e-1 contains=helpStar
+syn match helpHyperTextEntry	"\*[#-)!+-~]\+\*$" contains=helpStar
 if has("conceal")
   syn match helpBar		contained "|" conceal
   syn match helpBacktick	contained "`" conceal
@@ -44,6 +38,7 @@ syn match helpNormal		"|||"
 syn match helpNormal		":|vim:|"	" for :help modeline
 syn match helpVim		"\<Vim version [0-9][0-9.a-z]*"
 syn match helpVim		"VIM REFERENCE.*"
+syn match helpVim		"NVIM REFERENCE.*"
 syn match helpOption		"'[a-z]\{2,\}'"
 syn match helpOption		"'t_..'"
 syn match helpCommand		"`[^` \t]\+`"hs=s+1,he=e-1 contains=helpBacktick
@@ -68,7 +63,7 @@ syn match helpSpecial		"\[N]"
 syn match helpSpecial		"N  N"he=s+1
 syn match helpSpecial		"Nth"me=e-2
 syn match helpSpecial		"N-1"me=e-2
-syn match helpSpecial		"{[-a-zA-Z0-9'"*+/:%#=[\]<>.,]\+}"
+syn match helpSpecial		"{[-_a-zA-Z0-9'"*+/:%#=[\]<>.,]\+}"
 syn match helpSpecial		"\s\[[-a-z^A-Z0-9_]\{2,}]"ms=s+1
 syn match helpSpecial		"<[-a-zA-Z0-9_]\+>"
 syn match helpSpecial		"<[SCM]-.>"
@@ -92,15 +87,14 @@ syn match helpSpecial		"\[group]"
 syn match helpNormal		"\[\(readonly\|fifo\|socket\|converted\|crypted\)]"
 
 syn match helpSpecial		"CTRL-."
-syn match helpSpecial		"CTRL-SHIFT-."
 syn match helpSpecial		"CTRL-Break"
 syn match helpSpecial		"CTRL-PageUp"
 syn match helpSpecial		"CTRL-PageDown"
 syn match helpSpecial		"CTRL-Insert"
 syn match helpSpecial		"CTRL-Del"
 syn match helpSpecial		"CTRL-{char}"
-syn region helpNotVi		start="{Vi[: ]" start="{not" start="{only" end="}" contains=helpLeadBlank,helpHyperTextJump
-syn match helpLeadBlank		"^\s\+" contained
+syn match helpSpecial		"META-."
+syn match helpSpecial		"ALT-."
 
 " Highlight group items in their own color.
 syn match helpComment		"\t[* ]Comment\t\+[a-z].*"
@@ -154,7 +148,6 @@ if v:lang =~ '\<IT\>' || v:lang =~ '_IT\>' || v:lang =~? "italian"
   syn match helpSpecial		"Nmi"me=e-2
   syn match helpSpecial		"Nmo"me=e-2
   syn match helpSpecial		"\[interv.]"
-  syn region helpNotVi		start="{non" start="{solo" start="{disponibile" end="}" contains=helpLeadBlank,helpHyperTextJump
 endif
 
 syn sync minlines=40
@@ -175,7 +168,6 @@ hi def link helpVim		Identifier
 hi def link helpCommand		Comment
 hi def link helpExample		Comment
 hi def link helpOption		Type
-hi def link helpNotVi		Special
 hi def link helpSpecial		Special
 hi def link helpNote		Todo
 hi def link helpWarning		Todo

From 4df00e657481fa77c129acdda4d2b367cf64afab Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 4 Sep 2020 14:18:37 +0200
Subject: [PATCH 007/299] Allow to disable autoindent with g:polyglot_disabled

---
 README.md         | 8 +++++++-
 plugin/sleuth.vim | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index bf51320bc..8c744c10a 100644
--- a/README.md
+++ b/README.md
@@ -245,7 +245,7 @@ Please make sure you have `syntax on` in your `.vimrc` (or use something like [s
 
 Individual language packs can be disabled by setting `g:polyglot_disabled` as follows:
 
-```viml
+```vim
 let g:polyglot_disabled = ['css']
 ```
 
@@ -253,6 +253,12 @@ let g:polyglot_disabled = ['css']
 
 Please note that disabling a language won't make in your vim startup any faster / slower (only for specific this specific filetype). All plugins are loaded lazily, on demand.
 
+Vim Polyglot tries to automatically detect indentation settings (just like vim-sleuth). If this feature is not working for you for some reason, please file an issue and disable it temporarily with:
+
+```vim
+let g:polyglot_disabled = ['autoindent']
+```
+
 ## Contributing
 
 Language packs are periodically updated using automated `scripts/build` script.
diff --git a/plugin/sleuth.vim b/plugin/sleuth.vim
index 120861730..d7b9b7731 100644
--- a/plugin/sleuth.vim
+++ b/plugin/sleuth.vim
@@ -7,10 +7,15 @@
 "   - check maximum of files 2 per directory level instead of 8
 "   - maximum of 3 directory levels are checked
 "   - globs are concatenated for performance
+"   - tabstop setting is not configured, it's up to user
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'autoindent') != -1
+  finish 
+endif
 
-if exists("g:loaded_sleuth") || v:version < 700 || &cp
+if exists("g:loaded_sleuth") || exists("g:polyglot_disabled") || v:version < 700 || &cp
   finish
 endif
+
 let g:loaded_sleuth = 1
 
 function! s:guess(lines) abort

From c30ba66d2211d0c5764855d099e171fb2cd1108d Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 4 Sep 2020 14:23:18 +0200
Subject: [PATCH 008/299] Let user select tabstop, by not changing it

---
 plugin/sleuth.vim | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugin/sleuth.vim b/plugin/sleuth.vim
index d7b9b7731..a0bba8c40 100644
--- a/plugin/sleuth.vim
+++ b/plugin/sleuth.vim
@@ -100,9 +100,6 @@ function! s:guess(lines) abort
     return {'expandtab': 0, 'shiftwidth': &tabstop}
   elseif heuristics.soft != heuristics.hard
     let options.expandtab = heuristics.soft > heuristics.hard
-    if heuristics.hard
-      let options.tabstop = 2
-    endif
   endif
 
   return options

From b2640b5b760e6fc68b8cc49d3c8bab6cdef4f889 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 4 Sep 2020 17:31:22 +0200
Subject: [PATCH 009/299] Fix detection of indentation, #537

---
 autoload/sleuth.vim | 430 ++++++++++++++++++++++----------------------
 plugin/polyglot.vim | 149 +++++++++++++++
 plugin/sleuth.vim   | 166 -----------------
 scripts/build       |   4 +-
 4 files changed, 366 insertions(+), 383 deletions(-)
 create mode 100644 plugin/polyglot.vim
 delete mode 100644 plugin/sleuth.vim

diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 92b531723..a912cda45 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -1,219 +1,219 @@
 let s:globs = {
-  \ '8th': '{*.8th,}',
-  \ 'Dockerfile': '{*.dockerfile,*.dock,*.Dockerfile,Dockerfile,dockerfile,Dockerfile*,}',
-  \ 'Jenkinsfile': '{*.jenkinsfile,*.Jenkinsfile,Jenkinsfile,Jenkinsfile*,}',
-  \ 'a2ps': '{a2psrc,.a2psrc,}',
-  \ 'a65': '{*.a65,}',
-  \ 'aap': '{*.aap,}',
-  \ 'abap': '{*.abap,}',
-  \ 'abaqus': '{*.inp,}',
-  \ 'abc': '{*.abc,}',
-  \ 'abel': '{*.abl,}',
-  \ 'acedb': '{*.wrm,}',
-  \ 'ada': '{*.adb,*.ads,*.ada,*.gpr,}',
-  \ 'ahdl': '{*.tdf,}',
-  \ 'aidl': '{*.aidl,}',
-  \ 'alsaconf': '{.asoundrc,}',
-  \ 'aml': '{*.aml,}',
-  \ 'ampl': '{*.run,}',
-  \ 'ant': '{build.xml,}',
-  \ 'apache': '{.htaccess,}',
-  \ 'apiblueprint': '{*.apib,}',
-  \ 'applescript': '{*.applescript,*.scpt,}',
-  \ 'aptconf': '{apt.conf,}',
-  \ 'arch': '{.arch-inventory,=tagging-method,}',
-  \ 'arduino': '{*.pde,*.ino,}',
-  \ 'art': '{*.art,}',
-  \ 'asciidoc': '{*.asciidoc,*.adoc,*.asc,}',
-  \ 'asl': '{*.asl,*.dsl,}',
-  \ 'asn': '{*.asn,*.asn1,}',
-  \ 'aspperl': '{*.asp,}',
-  \ 'aspvbs': '{*.asa,*.asp,}',
-  \ 'atlas': '{*.atl,*.as,}',
-  \ 'autohotkey': '{*.ahk,*.ahkl,}',
-  \ 'autoit': '{*.au3,}',
-  \ 'automake': '{[Mm]akefile.am,GNUmakefile.am,}',
-  \ 'ave': '{*.ave,}',
-  \ 'awk': '{*.awk,}',
-  \ 'blade': '{*.blade,*.blade.php,}',
-  \ 'brewfile': '{Brewfile,}',
-  \ 'c': '{*.c,*.cats,*.h,*.idc,}',
-  \ 'caddyfile': '{Caddyfile,}',
-  \ 'carp': '{*.carp,}',
-  \ 'clojure': '{*.clj,*.boot,*.cl2,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.hic,*.edn,riemann.config,build.boot,profile.boot,}',
-  \ 'cmake': '{*.cmake,*.cmake.in,CMakeLists.txt,}',
-  \ 'coffee': '{*.coffee,*._coffee,*.cake,*.cjsx,*.iced,*.coffeekup,Cakefile,}',
-  \ 'cpp': '{*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp,}',
-  \ 'cql': '{*.cql,}',
-  \ 'cryptol': '{*.cry,*.cyl,*.lcry,*.lcyl,}',
-  \ 'crystal': '{*.cr,Projectfile,}',
-  \ 'csv': '{*.csv,*.tsv,*.tab,}',
-  \ 'cucumber': '{*.feature,*.story,}',
-  \ 'cuesheet': '{*.cue,}',
-  \ 'd': '{*.d,*.di,}',
-  \ 'dart': '{*.dart,}',
-  \ 'dcov': '{*.lst,}',
-  \ 'dd': '{*.dd,}',
-  \ 'ddoc': '{*.ddoc,}',
-  \ 'dhall': '{*.dhall,}',
-  \ 'dosini': '{*.wrap,}',
-  \ 'dsdl': '{*.sdl,}',
-  \ 'dune': '{jbuild,dune,dune-project,dune-workspace,}',
-  \ 'ecrystal': '{*.ecr,}',
-  \ 'eelixir': '{*.eex,*.leex,}',
-  \ 'elf': '{*.am,}',
-  \ 'elixir': '{*.ex,*.exs,mix.lock,}',
-  \ 'elm': '{*.elm,}',
-  \ 'embeddedpuppet': '{*.epp,}',
-  \ 'ember-script': '{*.em,*.emberscript,}',
-  \ 'emblem': '{*.emblem,*.em,}',
-  \ 'erlang': '{*.erl,*.app.src,*.es,*.escript,*.hrl,*.xrl,*.yrl,*.app,*.yaws,Emakefile,rebar.config,rebar.config.lock,rebar.lock,}',
-  \ 'eruby': '{*.erb,*.erb.deface,*.rhtml,}',
-  \ 'fbs': '{*.fbs,}',
-  \ 'fennel': '{*.fnl,}',
-  \ 'ferm': '{*.ferm,ferm.conf,}',
-  \ 'fish': '{*.fish,}',
-  \ 'flow': '{*.flow,}',
-  \ 'forth': '{*.fs,*.ft,*.fth,}',
-  \ 'fsharp': '{*.fs,*.fsi,*.fsx,}',
-  \ 'gdscript3': '{*.gd,}',
-  \ 'gitcommit': '{,}',
-  \ 'gitconfig': '{*.gitconfig,.gitconfig,.gitmodules,}',
-  \ 'gitrebase': '{git-rebase-todo,}',
-  \ 'gitsendemail': '{.gitsendemail.*,}',
-  \ 'glsl': '{*.glsl,*.fp,*.frag,*.frg,*.fs,*.fsh,*.fshader,*.geo,*.geom,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader,*.comp,}',
-  \ 'gmpl': '{*.mod,}',
-  \ 'gnuplot': '{*.gp,*.gnu,*.gnuplot,*.p,*.plot,*.plt,}',
-  \ 'go': '{*.go,}',
-  \ 'gohtmltmpl': '{*.tmpl,}',
-  \ 'gomod': '{go.mod,}',
-  \ 'graphql': '{*.graphql,*.gql,*.graphqls,}',
-  \ 'groovy': '{*.gradle,}',
-  \ 'grub': '{,}',
-  \ 'haml': '{*.haml,*.haml.deface,*.hamlc,*.hamlbars,}',
-  \ 'haproxy': '{*.cfg,haproxy.cfg,haproxy*.c*,}',
-  \ 'haskell': '{*.hs,*.hs-boot,*.hsc,*.bpk,*.hsig,}',
-  \ 'haxe': '{*.hx,*.hxsl,}',
-  \ 'hcl': '{*.hcl,*.nomad,*.workflow,Appfile,}',
-  \ 'helm': '{,}',
-  \ 'help': '{,}',
-  \ 'hive': '{*.q,*.hql,*.ql,}',
-  \ 'html': '{*.html,*.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml,}',
-  \ 'html.twig': '{*.twig,}',
-  \ 'i3config': '{*.i3.config,*.i3config,i3.config,i3config,.i3.config,.i3config,}',
-  \ 'icalendar': '{*.ics,}',
-  \ 'idris': '{*.idr,*.lidr,idris-response,}',
-  \ 'ion': '{*.ion,}',
-  \ 'javascript': '{*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile,}',
-  \ 'javascriptreact': '{*.jsx,}',
-  \ 'jinja.html': '{*.jinja,*.j2,*.jinja2,}',
-  \ 'jq': '{*.jq,.jqrc,}',
-  \ 'json': '{*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.tern-config,.tern-project,.watchmanconfig,composer.lock,mcmod.info,}',
-  \ 'json5': '{*.json5,}',
-  \ 'jsonnet': '{*.jsonnet,*.libsonnet,}',
-  \ 'jst': '{*.ejs,*.ect,*.jst,}',
-  \ 'julia': '{*.jl,}',
-  \ 'kotlin': '{*.kt,*.ktm,*.kts,}',
-  \ 'ledger': '{*.ldg,*.ledger,*.journal,}',
-  \ 'less': '{*.less,}',
-  \ 'lilypond': '{*.ly,*.ily,}',
-  \ 'litcoffee': '{*.litcoffee,*.coffee.md,}',
-  \ 'livescript': '{*.ls,*._ls,Slakefile,}',
-  \ 'llvm': '{*.ll,}',
-  \ 'log': '{*.log,*.LOG,*_log,*_LOG,}',
-  \ 'lua': '{*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,.luacheckrc,}',
-  \ 'm4': '{*.m4,*.at,}',
-  \ 'mako': '{*.mako,*.mao,}',
-  \ 'markdown': '{*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr,}',
-  \ 'markdown.mdx': '{*.mdx,}',
-  \ 'meson': '{meson.build,meson_options.txt,}',
-  \ 'mma': '{*.mathematica,*.cdf,*.m,*.ma,*.mt,*.nb,*.nbp,*.wl,*.wlt,*.wls,}',
-  \ 'moon': '{*.moon,}',
-  \ 'murphi': '{*.m,}',
-  \ 'mustache': '{*.handlebars,*.hbs,*.hulk,*.hjs,*.mustache,*.njk,*.hogan,*.hdbs,*.hb,}',
-  \ 'nginx': '{*.nginx,*.nginxconf,*.vhost,nginx.conf,nginx*.conf,*nginx.conf,}',
-  \ 'nim': '{*.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg,}',
-  \ 'nix': '{*.nix,}',
-  \ 'oasis': '{_oasis,}',
-  \ 'objc': '{*.m,*.h,}',
-  \ 'ocaml': '{*.ml,*.eliom,*.eliomi,*.ml4,*.mli,*.mll,*.mly,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo,.ocamlinit,}',
-  \ 'ocamlbuild_tags': '{_tags,}',
-  \ 'ocpbuild': '{*.ocp,}',
-  \ 'ocpbuildroot': '{*.root,}',
-  \ 'octave': '{*.oct,*.m,}',
-  \ 'omake': '{*.om,OMakefile,OMakeroot,OMakeroot.in,}',
-  \ 'opam': '{*.opam,*.opam.template,opam,}',
-  \ 'opencl': '{*.cl,*.opencl,}',
-  \ 'perl': '{*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile,}',
-  \ 'php': '{*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,.php,.php_cs,.php_cs.dist,Phakefile,}',
-  \ 'plantuml': '{*.puml,*.iuml,*.plantuml,*.uml,*.pu,}',
-  \ 'pony': '{*.pony,}',
-  \ 'proto': '{*.proto,}',
-  \ 'ps1': '{*.ps1,*.psd1,*.psm1,*.pssc,}',
-  \ 'ps1xml': '{*.ps1xml,}',
-  \ 'pug': '{*.jade,*.pug,}',
-  \ 'puppet': '{*.pp,Modulefile,}',
-  \ 'purescript': '{*.purs,}',
-  \ 'python': '{*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,.gclient,DEPS,SConscript,SConstruct,Snakefile,wscript,}',
-  \ 'qmake': '{*.pro,*.pri,}',
-  \ 'qml': '{*.qml,*.qbs,}',
-  \ 'r': '{*.r,*.rsx,*.s,*.S,.Rprofile,expr-dist,}',
-  \ 'racket': '{*.rkt,*.rktd,*.rktl,*.scrbl,}',
-  \ 'ragel': '{*.rl,}',
-  \ 'raku': '{*.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl,*.pl6,*.pm,*.pm6,*.t,*.rakudoc,*.rakutest,*.raku,*.rakumod,*.pod6,*.t6,}',
-  \ 'raml': '{*.raml,}',
-  \ 'razor': '{*.cshtml,*.razor,}',
-  \ 'reason': '{*.re,*.rei,}',
-  \ 'requirements': '{*.pip,*requirements.{txt,in},*require.{txt,in},constraints.{txt,in},}',
-  \ 'rhelp': '{*.rd,}',
-  \ 'rst': '{*.rst,*.rest,*.rest.txt,*.rst.txt,}',
-  \ 'ruby': '{*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb,}',
-  \ 'rust': '{*.rs,*.rs.in,}',
-  \ 'sbt.scala': '{*.sbt,}',
-  \ 'scala': '{*.scala,*.kojo,*.sc,}',
-  \ 'scss': '{*.scss,}',
-  \ 'sexplib': '{*.sexp,}',
-  \ 'sh': '{*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,}',
-  \ 'slim': '{*.slim,}',
-  \ 'slime': '{*.slime,}',
-  \ 'smt2': '{*.smt2,*.smt,}',
-  \ 'solidity': '{*.sol,}',
-  \ 'sql': '{*.pgsql,}',
-  \ 'stylus': '{*.styl,*.stylus,}',
-  \ 'svelte': '{*.svelte,}',
-  \ 'svg': '{*.svg,}',
-  \ 'swift': '{*.swift,}',
-  \ 'sxhkdrc': '{*.sxhkdrc,sxhkdrc,}',
-  \ 'systemd': '{*.automount,*.mount,*.path,*.service,*.socket,*.swap,*.target,*.timer,}',
-  \ 'tablegen': '{*.td,}',
-  \ 'terraform': '{*.hcl,*.nomad,*.tf,*.tfvars,*.workflow,}',
-  \ 'textile': '{*.textile,}',
-  \ 'thrift': '{*.thrift,}',
-  \ 'tmux': '{.tmux.conf,}',
-  \ 'toml': '{*.toml,Cargo.lock,Gopkg.lock,poetry.lock,Pipfile,}',
-  \ 'tptp': '{*.p,*.tptp,*.ax,}',
-  \ 'trasys': '{*.inp,}',
-  \ 'typescript': '{*.ts,}',
-  \ 'typescriptreact': '{*.tsx,}',
-  \ 'unison': '{*.u,*.uu,}',
-  \ 'v': '{*.v,}',
-  \ 'vala': '{*.vala,*.vapi,*.valadoc,}',
-  \ 'vbnet': '{*.vb,*.vbhtml,}',
-  \ 'vcl': '{*.vcl,}',
-  \ 'velocity': '{*.vm,}',
-  \ 'vmasm': '{*.mar,}',
-  \ 'vue': '{*.vue,*.wpy,}',
-  \ 'xdc': '{*.xdc,}',
-  \ 'xml': '{*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,}',
-  \ 'xml.twig': '{*.xml.twig,}',
-  \ 'xsl': '{*.xslt,*.xsl,}',
-  \ 'yaml': '{*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,.clang-format,.clang-tidy,.gemrc,glide.lock,yarn.lock,fish_history,fish_read_history,}',
-  \ 'yaml.ansible': '{playbook.y{a,}ml,site.y{a,}ml,main.y{a,}ml,local.y{a,}ml,requirements.y{a,}ml,tasks.*.y{a,}ml,roles.*.y{a,}ml,handlers.*.y{a,}ml,}',
-  \ 'yaml.docker-compose': '{docker-compose*.yaml,docker-compose*.yml,}',
-  \ 'zephir': '{*.zep,}',
-  \ 'zig': '{*.zig,*.zir,}',
-  \ 'zir': '{*.zir,}',
-  \ 'zsh': '{*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,}',
+  \ '8th': '*.8th',
+  \ 'Dockerfile': '*.dockerfile,*.dock,*.Dockerfile,Dockerfile,dockerfile,Dockerfile*',
+  \ 'Jenkinsfile': '*.jenkinsfile,*.Jenkinsfile,Jenkinsfile,Jenkinsfile*',
+  \ 'a2ps': 'a2psrc',
+  \ 'a65': '*.a65',
+  \ 'aap': '*.aap',
+  \ 'abap': '*.abap',
+  \ 'abaqus': '*.inp',
+  \ 'abc': '*.abc',
+  \ 'abel': '*.abl',
+  \ 'acedb': '*.wrm',
+  \ 'ada': '*.adb,*.ads,*.ada,*.gpr',
+  \ 'ahdl': '*.tdf',
+  \ 'aidl': '*.aidl',
+  \ 'alsaconf': '',
+  \ 'aml': '*.aml',
+  \ 'ampl': '*.run',
+  \ 'ant': 'build.xml',
+  \ 'apache': '',
+  \ 'apiblueprint': '*.apib',
+  \ 'applescript': '*.applescript,*.scpt',
+  \ 'aptconf': 'apt.conf',
+  \ 'arch': '=tagging-method',
+  \ 'arduino': '*.pde,*.ino',
+  \ 'art': '*.art',
+  \ 'asciidoc': '*.asciidoc,*.adoc,*.asc',
+  \ 'asl': '*.asl,*.dsl',
+  \ 'asn': '*.asn,*.asn1',
+  \ 'aspperl': '*.asp',
+  \ 'aspvbs': '*.asa,*.asp',
+  \ 'atlas': '*.atl,*.as',
+  \ 'autohotkey': '*.ahk,*.ahkl',
+  \ 'autoit': '*.au3',
+  \ 'automake': '[Mm]akefile.am,GNUmakefile.am',
+  \ 'ave': '*.ave',
+  \ 'awk': '*.awk',
+  \ 'blade': '*.blade,*.blade.php',
+  \ 'brewfile': 'Brewfile',
+  \ 'c': '*.c,*.cats,*.h,*.idc',
+  \ 'caddyfile': 'Caddyfile',
+  \ 'carp': '*.carp',
+  \ 'clojure': '*.clj,*.boot,*.cl2,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.hic,*.edn,riemann.config,build.boot,profile.boot',
+  \ 'cmake': '*.cmake,*.cmake.in,CMakeLists.txt',
+  \ 'coffee': '*.coffee,*._coffee,*.cake,*.cjsx,*.iced,*.coffeekup,Cakefile',
+  \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp',
+  \ 'cql': '*.cql',
+  \ 'cryptol': '*.cry,*.cyl,*.lcry,*.lcyl',
+  \ 'crystal': '*.cr,Projectfile',
+  \ 'csv': '*.csv,*.tsv,*.tab',
+  \ 'cucumber': '*.feature,*.story',
+  \ 'cuesheet': '*.cue',
+  \ 'd': '*.d,*.di',
+  \ 'dart': '*.dart',
+  \ 'dcov': '*.lst',
+  \ 'dd': '*.dd',
+  \ 'ddoc': '*.ddoc',
+  \ 'dhall': '*.dhall',
+  \ 'dosini': '*.wrap',
+  \ 'dsdl': '*.sdl',
+  \ 'dune': 'jbuild,dune,dune-project,dune-workspace',
+  \ 'ecrystal': '*.ecr',
+  \ 'eelixir': '*.eex,*.leex',
+  \ 'elf': '*.am',
+  \ 'elixir': '*.ex,*.exs,mix.lock',
+  \ 'elm': '*.elm',
+  \ 'embeddedpuppet': '*.epp',
+  \ 'ember-script': '*.em,*.emberscript',
+  \ 'emblem': '*.emblem,*.em',
+  \ 'erlang': '*.erl,*.app.src,*.es,*.escript,*.hrl,*.xrl,*.yrl,*.app,*.yaws,Emakefile,rebar.config,rebar.config.lock,rebar.lock',
+  \ 'eruby': '*.erb,*.erb.deface,*.rhtml',
+  \ 'fbs': '*.fbs',
+  \ 'fennel': '*.fnl',
+  \ 'ferm': '*.ferm,ferm.conf',
+  \ 'fish': '*.fish',
+  \ 'flow': '*.flow',
+  \ 'forth': '*.fs,*.ft,*.fth',
+  \ 'fsharp': '*.fs,*.fsi,*.fsx',
+  \ 'gdscript3': '*.gd',
+  \ 'gitcommit': '',
+  \ 'gitconfig': '*.gitconfig',
+  \ 'gitrebase': 'git-rebase-todo',
+  \ 'gitsendemail': '',
+  \ 'glsl': '*.glsl,*.fp,*.frag,*.frg,*.fs,*.fsh,*.fshader,*.geo,*.geom,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader,*.comp',
+  \ 'gmpl': '*.mod',
+  \ 'gnuplot': '*.gp,*.gnu,*.gnuplot,*.p,*.plot,*.plt',
+  \ 'go': '*.go',
+  \ 'gohtmltmpl': '*.tmpl',
+  \ 'gomod': 'go.mod',
+  \ 'graphql': '*.graphql,*.gql,*.graphqls',
+  \ 'groovy': '*.gradle',
+  \ 'grub': '',
+  \ 'haml': '*.haml,*.haml.deface,*.hamlc,*.hamlbars',
+  \ 'haproxy': '*.cfg,haproxy.cfg,haproxy*.c*',
+  \ 'haskell': '*.hs,*.hs-boot,*.hsc,*.bpk,*.hsig',
+  \ 'haxe': '*.hx,*.hxsl',
+  \ 'hcl': '*.hcl,*.nomad,*.workflow,Appfile',
+  \ 'helm': '',
+  \ 'help': '',
+  \ 'hive': '*.q,*.hql,*.ql',
+  \ 'html': '*.html,*.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml',
+  \ 'html.twig': '*.twig',
+  \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config',
+  \ 'icalendar': '*.ics',
+  \ 'idris': '*.idr,*.lidr,idris-response',
+  \ 'ion': '*.ion',
+  \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
+  \ 'javascriptreact': '*.jsx',
+  \ 'jinja.html': '*.jinja,*.j2,*.jinja2',
+  \ 'jq': '*.jq',
+  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,composer.lock,mcmod.info',
+  \ 'json5': '*.json5',
+  \ 'jsonnet': '*.jsonnet,*.libsonnet',
+  \ 'jst': '*.ejs,*.ect,*.jst',
+  \ 'julia': '*.jl',
+  \ 'kotlin': '*.kt,*.ktm,*.kts',
+  \ 'ledger': '*.ldg,*.ledger,*.journal',
+  \ 'less': '*.less',
+  \ 'lilypond': '*.ly,*.ily',
+  \ 'litcoffee': '*.litcoffee,*.coffee.md',
+  \ 'livescript': '*.ls,*._ls,Slakefile',
+  \ 'llvm': '*.ll',
+  \ 'log': '*.log,*.LOG,*_log,*_LOG',
+  \ 'lua': '*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua',
+  \ 'm4': '*.m4,*.at',
+  \ 'mako': '*.mako,*.mao',
+  \ 'markdown': '*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr',
+  \ 'markdown.mdx': '*.mdx',
+  \ 'meson': 'meson.build,meson_options.txt',
+  \ 'mma': '*.mathematica,*.cdf,*.m,*.ma,*.mt,*.nb,*.nbp,*.wl,*.wlt,*.wls',
+  \ 'moon': '*.moon',
+  \ 'murphi': '*.m',
+  \ 'mustache': '*.handlebars,*.hbs,*.hulk,*.hjs,*.mustache,*.njk,*.hogan,*.hdbs,*.hb',
+  \ 'nginx': '*.nginx,*.nginxconf,*.vhost,nginx.conf,nginx*.conf,*nginx.conf',
+  \ 'nim': '*.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg',
+  \ 'nix': '*.nix',
+  \ 'oasis': '_oasis',
+  \ 'objc': '*.m,*.h',
+  \ 'ocaml': '*.ml,*.eliom,*.eliomi,*.ml4,*.mli,*.mll,*.mly,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo',
+  \ 'ocamlbuild_tags': '_tags',
+  \ 'ocpbuild': '*.ocp',
+  \ 'ocpbuildroot': '*.root',
+  \ 'octave': '*.oct,*.m',
+  \ 'omake': '*.om,OMakefile,OMakeroot,OMakeroot.in',
+  \ 'opam': '*.opam,*.opam.template,opam',
+  \ 'opencl': '*.cl,*.opencl',
+  \ 'perl': '*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile',
+  \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,Phakefile',
+  \ 'plantuml': '*.puml,*.iuml,*.plantuml,*.uml,*.pu',
+  \ 'pony': '*.pony',
+  \ 'proto': '*.proto',
+  \ 'ps1': '*.ps1,*.psd1,*.psm1,*.pssc',
+  \ 'ps1xml': '*.ps1xml',
+  \ 'pug': '*.jade,*.pug',
+  \ 'puppet': '*.pp,Modulefile',
+  \ 'purescript': '*.purs',
+  \ 'python': '*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,DEPS,SConscript,SConstruct,Snakefile,wscript',
+  \ 'qmake': '*.pro,*.pri',
+  \ 'qml': '*.qml,*.qbs',
+  \ 'r': '*.r,*.rsx,*.s,*.S,expr-dist',
+  \ 'racket': '*.rkt,*.rktd,*.rktl,*.scrbl',
+  \ 'ragel': '*.rl',
+  \ 'raku': '*.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl,*.pl6,*.pm,*.pm6,*.t,*.rakudoc,*.rakutest,*.raku,*.rakumod,*.pod6,*.t6',
+  \ 'raml': '*.raml',
+  \ 'razor': '*.cshtml,*.razor',
+  \ 'reason': '*.re,*.rei',
+  \ 'requirements': '*.pip,*requirements.{txt,in},*require.{txt,in},constraints.{txt,in}',
+  \ 'rhelp': '*.rd',
+  \ 'rst': '*.rst,*.rest,*.rest.txt,*.rst.txt',
+  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,Cheffile,KitchenSink,Routefile,vagrantfile,[Rr]akefile*,*_spec.rb',
+  \ 'rust': '*.rs,*.rs.in',
+  \ 'sbt.scala': '*.sbt',
+  \ 'scala': '*.scala,*.kojo,*.sc',
+  \ 'scss': '*.scss',
+  \ 'sexplib': '*.sexp',
+  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile',
+  \ 'slim': '*.slim',
+  \ 'slime': '*.slime',
+  \ 'smt2': '*.smt2,*.smt',
+  \ 'solidity': '*.sol',
+  \ 'sql': '*.pgsql',
+  \ 'stylus': '*.styl,*.stylus',
+  \ 'svelte': '*.svelte',
+  \ 'svg': '*.svg',
+  \ 'swift': '*.swift',
+  \ 'sxhkdrc': '*.sxhkdrc,sxhkdrc',
+  \ 'systemd': '*.automount,*.mount,*.path,*.service,*.socket,*.swap,*.target,*.timer',
+  \ 'tablegen': '*.td',
+  \ 'terraform': '*.hcl,*.nomad,*.tf,*.tfvars,*.workflow',
+  \ 'textile': '*.textile',
+  \ 'thrift': '*.thrift',
+  \ 'tmux': '',
+  \ 'toml': '*.toml,Cargo.lock,Gopkg.lock,poetry.lock,Pipfile',
+  \ 'tptp': '*.p,*.tptp,*.ax',
+  \ 'trasys': '*.inp',
+  \ 'typescript': '*.ts',
+  \ 'typescriptreact': '*.tsx',
+  \ 'unison': '*.u,*.uu',
+  \ 'v': '*.v',
+  \ 'vala': '*.vala,*.vapi,*.valadoc',
+  \ 'vbnet': '*.vb,*.vbhtml',
+  \ 'vcl': '*.vcl',
+  \ 'velocity': '*.vm',
+  \ 'vmasm': '*.mar',
+  \ 'vue': '*.vue,*.wpy',
+  \ 'xdc': '*.xdc',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
+  \ 'xml.twig': '*.xml.twig',
+  \ 'xsl': '*.xslt,*.xsl',
+  \ 'yaml': '*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,glide.lock,yarn.lock,fish_history,fish_read_history',
+  \ 'yaml.ansible': 'playbook.y{a,}ml,site.y{a,}ml,main.y{a,}ml,local.y{a,}ml,requirements.y{a,}ml,tasks.*.y{a,}ml,roles.*.y{a,}ml,handlers.*.y{a,}ml',
+  \ 'yaml.docker-compose': 'docker-compose*.yaml,docker-compose*.yml',
+  \ 'zephir': '*.zep',
+  \ 'zig': '*.zig,*.zir',
+  \ 'zir': '*.zir',
+  \ 'zsh': '*.zsh',
   \}
 
 func! sleuth#GlobForFiletype(type)
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
new file mode 100644
index 000000000..db2976e6d
--- /dev/null
+++ b/plugin/polyglot.vim
@@ -0,0 +1,149 @@
+" Heuristically set expandtab and shiftwidth options
+"
+" Modified version of vim-sleuth:
+"   - tabstop is not set, it's up to user to set it
+"   - check maximum of 32 lines, instead of 1024
+"   - check maximum 6 files, instead of 20
+"   - check maximum of 2 filer per directory level, instead of 8
+"   - check maximum of 3 directory levels
+"   - check only to the nearest .git, .hg, or .svn directory
+"   - globs are concatenated for performance
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'autoindent') != -1
+  finish
+endif
+
+if exists("g:loaded_polyglot") || v:version < 700 || &cp
+  finish
+endif
+
+let g:loaded_sleuth = 1
+let g:loaded_polyglot = 1
+
+function! s:guess(lines) abort
+  let options = {}
+  let ccomment = 0
+  let podcomment = 0
+  let triplequote = 0
+  let backtick = 0
+  let xmlcomment = 0
+  let minindent = 10
+  let spaces_minus_tabs = 0
+
+  for line in a:lines
+    if !len(line) || line =~# '^\s*$'
+      continue
+    endif
+
+    if line =~# '^\s*/\*'
+      let ccomment = 1
+    endif
+    if ccomment
+      if line =~# '\*/'
+        let ccomment = 0
+      endif
+      continue
+    endif
+
+    if line =~# '^=\w'
+      let podcomment = 1
+    endif
+    if podcomment
+      if line =~# '^=\%(end\|cut\)\>'
+        let podcomment = 0
+      endif
+      continue
+    endif
+
+    if triplequote
+      if line =~# '^[^"]*"""[^"]*$'
+        let triplequote = 0
+      endif
+      continue
+    elseif line =~# '^[^"]*"""[^"]*$'
+      let triplequote = 1
+    endif
+
+    if backtick
+      if line =~# '^[^`]*`[^`]*$'
+        let backtick = 0
+      endif
+      continue
+    elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
+      let backtick = 1
+    endif
+
+    if line =~# '^\s*<\!--'
+      let xmlcomment = 1
+    endif
+    if xmlcomment
+      if line =~# '-->'
+        let xmlcomment = 0
+      endif
+      continue
+    endif
+
+    let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
+
+    if line[0] == "\t"
+      setlocal noexpandtab
+      return 1
+    elseif line[0] == " "
+      let indent = len(matchstr(line, '^ *'))
+      if indent % 2 == 0 && indent < minindent
+        let minindent = indent
+      endif
+    endif
+  endfor
+
+  if minindent < 10
+    setlocal expandtab
+    let &shiftwidth=minindent
+    return 1
+  endif
+
+  return 0
+endfunction
+
+function! s:detect_indent() abort
+  if &buftype ==# 'help'
+    return
+  endif
+
+  if s:guess(getline(1, 32))
+    return
+  endif
+  let pattern = sleuth#GlobForFiletype(&filetype)
+  if len(pattern) == 0
+    return
+  endif
+  let pattern = '{' . pattern . ',.git,.svn,.hg}'
+  let dir = expand('%:p:h')
+  let level = 3
+  while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
+    for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
+      " Do not consider directories above .git, .svn or .hg
+      if fnamemodify(neighbor, ":h:t")[0] == "."
+        return
+      endif
+      if neighbor !=# expand('%:p') && filereadable(neighbor)
+        if s:guess(readfile(neighbor, '', 32))
+          return
+        endif
+      endif
+    endfor
+
+    let dir = fnamemodify(dir, ':h')
+    let level -= 1
+  endwhile
+endfunction
+
+setglobal smarttab
+
+if !exists('g:did_indent_on')
+  filetype indent on
+endif
+
+augroup polyglot
+  autocmd!
+  autocmd FileType * call s:detect_indent()
+augroup END
diff --git a/plugin/sleuth.vim b/plugin/sleuth.vim
deleted file mode 100644
index a0bba8c40..000000000
--- a/plugin/sleuth.vim
+++ /dev/null
@@ -1,166 +0,0 @@
-" Heuristically set buffer options
-"
-" Modified version of vim-sleuth:
-"   - softtab and tabstop reduced from 8 to 2
-"   - number of considered lines reduced from 1024 to 64
-"   - maximum 6 other files are checked instead of 20
-"   - check maximum of files 2 per directory level instead of 8
-"   - maximum of 3 directory levels are checked
-"   - globs are concatenated for performance
-"   - tabstop setting is not configured, it's up to user
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'autoindent') != -1
-  finish 
-endif
-
-if exists("g:loaded_sleuth") || exists("g:polyglot_disabled") || v:version < 700 || &cp
-  finish
-endif
-
-let g:loaded_sleuth = 1
-
-function! s:guess(lines) abort
-  let options = {}
-  let heuristics = {'spaces': 0, 'hard': 0, 'soft': 0}
-  let ccomment = 0
-  let podcomment = 0
-  let triplequote = 0
-  let backtick = 0
-  let xmlcomment = 0
-  let softtab = repeat(' ', 2)
-
-  for line in a:lines
-    if !len(line) || line =~# '^\s*$'
-      continue
-    endif
-
-    if line =~# '^\s*/\*'
-      let ccomment = 1
-    endif
-    if ccomment
-      if line =~# '\*/'
-        let ccomment = 0
-      endif
-      continue
-    endif
-
-    if line =~# '^=\w'
-      let podcomment = 1
-    endif
-    if podcomment
-      if line =~# '^=\%(end\|cut\)\>'
-        let podcomment = 0
-      endif
-      continue
-    endif
-
-    if triplequote
-      if line =~# '^[^"]*"""[^"]*$'
-        let triplequote = 0
-      endif
-      continue
-    elseif line =~# '^[^"]*"""[^"]*$'
-      let triplequote = 1
-    endif
-
-    if backtick
-      if line =~# '^[^`]*`[^`]*$'
-        let backtick = 0
-      endif
-      continue
-    elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
-      let backtick = 1
-    endif
-
-    if line =~# '^\s*<\!--'
-      let xmlcomment = 1
-    endif
-    if xmlcomment
-      if line =~# '-->'
-        let xmlcomment = 0
-      endif
-      continue
-    endif
-
-    if line =~# '^\t'
-      let heuristics.hard += 1
-    elseif line =~# '^' . softtab
-      let heuristics.soft += 1
-    endif
-    if line =~# '^  '
-      let heuristics.spaces += 1
-    endif
-    let indent = len(matchstr(substitute(line, '\t', softtab, 'g'), '^ *'))
-    if indent > 1 && (indent < 4 || indent % 2 == 0) &&
-          \ get(options, 'shiftwidth', 99) > indent
-      let options.shiftwidth = indent
-    endif
-  endfor
-
-  if heuristics.hard && !heuristics.spaces
-    return {'expandtab': 0, 'shiftwidth': &tabstop}
-  elseif heuristics.soft != heuristics.hard
-    let options.expandtab = heuristics.soft > heuristics.hard
-  endif
-
-  return options
-endfunction
-
-function! s:apply_if_ready(options) abort
-  if !has_key(a:options, 'expandtab') || !has_key(a:options, 'shiftwidth')
-    return 0
-  else
-    for [option, value] in items(a:options)
-      call setbufvar('', '&'.option, value)
-    endfor
-    return 1
-  endif
-endfunction
-
-function! s:detect() abort
-  if &buftype ==# 'help'
-    return
-  endif
-
-  let options = s:guess(getline(1, 64))
-  if s:apply_if_ready(options)
-    return
-  endif
-  let c = 6
-  let pattern = c > 0 ? sleuth#GlobForFiletype(&filetype) : ''
-  let dir = expand('%:p:h')
-  let level = 3
-  while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && c > 0 && level > 0
-    let level -= 1
-    for neighbor in glob(dir.'/'.pattern,0,1)[0:1]
-      if neighbor !=# expand('%:p') && filereadable(neighbor)
-        call extend(options, s:guess(readfile(neighbor, '', 32)), 'keep')
-        let c -= 1
-      endif
-      if s:apply_if_ready(options)
-        let b:sleuth_culprit = neighbor
-        return
-      endif
-      if c <= 0
-        break
-      endif
-    endfor
-    if c <= 0
-      break
-    endif
-    let dir = fnamemodify(dir, ':h')
-  endwhile
-  if has_key(options, 'shiftwidth')
-    return s:apply_if_ready(extend({'expandtab': 1}, options))
-  endif
-endfunction
-
-setglobal smarttab
-
-if !exists('g:did_indent_on')
-  filetype indent on
-endif
-
-augroup polyglot
-  autocmd!
-  autocmd FileType * call s:detect()
-augroup END
diff --git a/scripts/build b/scripts/build
index f8efb850f..892424aa0 100755
--- a/scripts/build
+++ b/scripts/build
@@ -751,14 +751,14 @@ def generate_plugins(packages)
   for package in packages
     for filetype in package["filetypes"]
       extensions = (filetype["extensions"] || []).map { |e| "*.#{e}" }
-      files = (filetype["filenames"] || []).reject { |e| e.match(/\*\*|\//) }
+      files = (filetype["filenames"] || []).reject { |e| e.match(/\*\*|\//) || e[0] == "." }
       patterns[filetype["name"]].concat(extensions)
       patterns[filetype["name"]].concat(files)
     end
   end
 
   for filetype in patterns.keys.sort
-    output << "  \\ '#{filetype}': '{#{patterns[filetype].uniq.join(",")},}',\n"
+    output << "  \\ '#{filetype}': '#{patterns[filetype].uniq.join(",")}',\n"
   end
   output << "  \\}\n\n"
 

From 262960fa223139eb5e02647e77af6bac13a17066 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 4 Sep 2020 18:29:53 +0200
Subject: [PATCH 010/299] Synchronize shiftwidth with tabstop by default

---
 ftdetect/polyglot.vim |  9 ++++-
 packages.yaml         |  3 +-
 plugin/polyglot.vim   |  5 +++
 scripts/build         | 77 ++-----------------------------------------
 4 files changed, 18 insertions(+), 76 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 87b0cf259..de4665b2a 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -59,6 +59,9 @@ if !exists('g:python_highlight_all')
   call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
   call s:SetDefault('g:python_slow_sync', 1)
 endif
+
+" filetypes
+
 if !has_key(s:disabled_packages, '8th')
   au! BufRead,BufNewFile *.8th
 endif
@@ -377,7 +380,8 @@ endif
 
 if !has_key(s:disabled_packages, 'aptconf')
   au BufNewFile,BufRead */.aptitude/config setf aptconf
-  au BufNewFile,BufRead */etc/apt/apt.conf.d/{[-_[:alnum:]]\+,[-_.[:alnum:]]\+.conf} setf aptconf
+  au BufNewFile,BufRead */etc/apt/apt.conf.d/*.conf setf aptconf
+  au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* setf aptconf
   au BufNewFile,BufRead apt.conf setf aptconf
 endif
 
@@ -1722,6 +1726,9 @@ if !has_key(s:disabled_packages, 'trasys')
   au! BufNewFile,BufRead *.inp call polyglot#DetectInpFiletype()
 endif
 
+
+" end filetypes
+
 au BufNewFile,BufRead,StdinReadPost * 
   \ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat 
   \ | call polyglot#Heuristics() | endif
diff --git a/packages.yaml b/packages.yaml
index 1ff3f0ebd..ca5de3a39 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -179,7 +179,8 @@ filetypes:
   filenames:
   - apt.conf
   - '*/.aptitude/config'
-  - '*/etc/apt/apt.conf.d/{[-_[:alnum:]]\+,[-_.[:alnum:]]\+.conf}'
+  - '*/etc/apt/apt.conf.d/[^.]*'
+  - '*/etc/apt/apt.conf.d/*.conf'
 ---
 name: arch
 remote: vim/vim:runtime
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index db2976e6d..ccdef1128 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -19,6 +19,11 @@ endif
 let g:loaded_sleuth = 1
 let g:loaded_polyglot = 1
 
+" Makes shiftwidth to be synchronized with tabstop by default
+if &shiftwidth == &tabstop
+  let &shiftwidth = 0
+endif
+
 function! s:guess(lines) abort
   let options = {}
   let ccomment = 0
diff --git a/scripts/build b/scripts/build
index 892424aa0..c7f4846fb 100755
--- a/scripts/build
+++ b/scripts/build
@@ -371,69 +371,7 @@ def extract(packages)
 end
 
 def generate_ftdetect(packages, heuristics)
-  output = <<~EOS
-    " don't spam the user when Vim is started in Vi compatibility mode
-    let s:cpo_save = &cpo
-    set cpo&vim
-
-    " Disable all native vim ftdetect
-    if exists('g:polyglot_test')
-      autocmd!
-    endif
-
-    let s:disabled_packages = {}
-
-    if exists('g:polyglot_disabled')
-      for pkg in g:polyglot_disabled
-        let s:disabled_packages[pkg] = 1
-      endfor
-    endif
-
-    function! s:SetDefault(name, value)
-      if !exists(a:name)
-        let {a:name} = a:value
-      endif
-    endfunction
-
-    call s:SetDefault('g:markdown_enable_spell_checking', 0)
-    call s:SetDefault('g:markdown_enable_input_abbreviations', 0)
-    call s:SetDefault('g:markdown_enable_mappings', 0)
-
-    " Enable jsx syntax by default
-    call s:SetDefault('g:jsx_ext_required', 0)
-
-    " Needed for sql highlighting
-    call s:SetDefault('g:javascript_sql_dialect', 'sql')
-
-    " Make csv loading faster
-    call s:SetDefault('g:csv_start', 1)
-    call s:SetDefault('g:csv_end', 2)
-
-    " Disable json concealing by default
-    call s:SetDefault('g:vim_json_syntax_conceal', 0)
-
-    call s:SetDefault('g:filetype_euphoria', 'elixir')
-
-    if !exists('g:python_highlight_all')
-      call s:SetDefault('g:python_highlight_builtins', 1)
-      call s:SetDefault('g:python_highlight_builtin_objs', 1)
-      call s:SetDefault('g:python_highlight_builtin_types', 1)
-      call s:SetDefault('g:python_highlight_builtin_funcs', 1)
-      call s:SetDefault('g:python_highlight_builtin_funcs_kwarg', 1)
-      call s:SetDefault('g:python_highlight_exceptions', 1)
-      call s:SetDefault('g:python_highlight_string_formatting', 1)
-      call s:SetDefault('g:python_highlight_string_format', 1)
-      call s:SetDefault('g:python_highlight_string_templates', 1)
-      call s:SetDefault('g:python_highlight_indent_errors', 1)
-      call s:SetDefault('g:python_highlight_space_errors', 1)
-      call s:SetDefault('g:python_highlight_doctests', 1)
-      call s:SetDefault('g:python_highlight_func_calls', 1)
-      call s:SetDefault('g:python_highlight_class_vars', 1)
-      call s:SetDefault('g:python_highlight_operators', 1)
-      call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
-      call s:SetDefault('g:python_slow_sync', 1)
-    endif
-  EOS
+  output = "\n"
 
   extensions = Hash.new { |h, k| h[k] = [] }
 
@@ -542,18 +480,9 @@ def generate_ftdetect(packages, heuristics)
 
     output << "endif\n\n"
   end
-
-  output << <<~EOS
-    au BufNewFile,BufRead,StdinReadPost * 
-      \\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat 
-      \\ | call polyglot#Heuristics() | endif
-
-    " restore Vi compatibility settings
-    let &cpo = s:cpo_save
-    unlet s:cpo_save
-  EOS
  
-  File.write('ftdetect/polyglot.vim', output)
+  ftdetect = File.read('ftdetect/polyglot.vim')
+  File.write('ftdetect/polyglot.vim', ftdetect.gsub(/(?<=" filetypes\n).*(?=\n" end filetypes)/m, output))
 
   output = <<~EOS
     " Line continuation is used here, remove 'C' from 'cpoptions'

From 556ba05ceeb3e1053c2a99a303a13b2b8e82f0f9 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 4 Sep 2020 18:55:51 +0200
Subject: [PATCH 011/299] Ignore heredoc when detecting indent

---
 plugin/polyglot.vim | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index ccdef1128..bcf255f05 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -31,6 +31,7 @@ function! s:guess(lines) abort
   let triplequote = 0
   let backtick = 0
   let xmlcomment = 0
+  let heredoc = ''
   let minindent = 10
   let spaces_minus_tabs = 0
 
@@ -87,6 +88,18 @@ function! s:guess(lines) abort
       continue
     endif
 
+    " This is correct order because both "<<EOF" and "EOF" matches end
+    if heredoc != ''
+      if line =~# heredoc
+        let heredoc = ''
+      endif
+      continue
+    endif
+    let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
+    if len(herematch) > 0
+      let heredoc = herematch[1] . '$'
+    endif
+
     let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
 
     if line[0] == "\t"

From 48b4f233c57f1439e8c2381fb91d36641ea146eb Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 4 Sep 2020 19:02:39 +0200
Subject: [PATCH 012/299] Fix detecting indentation in some CSS

This is done by ignoring lines that don't have any
alphanumeric characters, e.g. following would be detected
as 4-spaces indentation instead of 2-spaces

.android {
    height: 404px; width: 334px;
    margin: 100px auto;
  }

https://github.com/tpope/vim-sleuth/issues/22
---
 plugin/polyglot.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index bcf255f05..bb31dc07d 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -36,7 +36,7 @@ function! s:guess(lines) abort
   let spaces_minus_tabs = 0
 
   for line in a:lines
-    if !len(line) || line =~# '^\s*$'
+    if !len(line) || line =~# '^\W*$'
       continue
     endif
 

From 99166bd51f2f4f304f03ba762ab4067b00d55bbe Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 4 Sep 2020 19:21:08 +0200
Subject: [PATCH 013/299] Do not set indent on by default

https://github.com/tpope/vim-sleuth/issues/21
---
 plugin/polyglot.vim | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index bb31dc07d..fad7609b9 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -157,10 +157,6 @@ endfunction
 
 setglobal smarttab
 
-if !exists('g:did_indent_on')
-  filetype indent on
-endif
-
 augroup polyglot
   autocmd!
   autocmd FileType * call s:detect_indent()

From b0124dc88082f5ed8c96faa16d3b334d38f5949f Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 4 Sep 2020 19:45:47 +0200
Subject: [PATCH 014/299] Ignore files from homedir and root for indent

https://github.com/tpope/vim-sleuth/pull/57
---
 plugin/polyglot.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index fad7609b9..762e4fcd5 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -138,6 +138,10 @@ function! s:detect_indent() abort
   let dir = expand('%:p:h')
   let level = 3
   while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
+    " Ignore files from homedir and root 
+    if dir == expand('~') || dir == '/'
+      return
+    endif
     for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
       " Do not consider directories above .git, .svn or .hg
       if fnamemodify(neighbor, ":h:t")[0] == "."

From 3baafd5c336d18d87898ae87f16df7cd76bc8d65 Mon Sep 17 00:00:00 2001
From: CodingCellist <teh6@st-andrews.ac.uk>
Date: Sat, 5 Sep 2020 21:37:11 +0200
Subject: [PATCH 015/299] Add support for Idris2, closes #534 (#535)

---
 README.md                   |   3 +-
 after/ftplugin/idris2.vim   |   5 +
 after/syntax/idris2.vim     |  82 +++++++++
 autoload/cargo/quickfix.vim |   3 +-
 autoload/polyglot.vim       |  44 +++++
 autoload/rustfmt.vim        |   4 +-
 autoload/sleuth.vim         |   2 +
 doc/idris2-vim.txt          | 158 +++++++++++++++++
 ftdetect/polyglot.vim       |  11 +-
 ftplugin/idris2.vim         | 334 ++++++++++++++++++++++++++++++++++++
 heuristics.yaml             |  30 ++++
 indent/idris2.vim           | 148 ++++++++++++++++
 packages.yaml               |  13 ++
 scripts/build               |   6 +
 scripts/test_extensions.vim |  30 ++++
 scripts/test_filetypes.vim  |   2 +
 syntax/idris2.vim           |  85 +++++++++
 syntax/lidris2.vim          |  26 +++
 syntax/rust.vim             |   3 +-
 19 files changed, 982 insertions(+), 7 deletions(-)
 create mode 100644 after/ftplugin/idris2.vim
 create mode 100644 after/syntax/idris2.vim
 create mode 100644 doc/idris2-vim.txt
 create mode 100644 ftplugin/idris2.vim
 create mode 100644 indent/idris2.vim
 create mode 100644 syntax/idris2.vim
 create mode 100644 syntax/lidris2.vim

diff --git a/README.md b/README.md
index 8c744c10a..6789eb72a 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->190<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->191<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -130,6 +130,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [html5](https://github.com/othree/html5.vim)
 - [i3](https://github.com/mboughaba/i3config.vim)
 - [icalendar](https://github.com/chutzpah/icalendar.vim)
+- [idris2](https://github.com/edwinb/idris2-vim)
 - [idris](https://github.com/idris-hackers/idris-vim)
 - [ion](https://github.com/vmchale/ion-vim)
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
diff --git a/after/ftplugin/idris2.vim b/after/ftplugin/idris2.vim
new file mode 100644
index 000000000..b96ae5b6c
--- /dev/null
+++ b/after/ftplugin/idris2.vim
@@ -0,0 +1,5 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+
+setlocal iskeyword+='
+
+endif
diff --git a/after/syntax/idris2.vim b/after/syntax/idris2.vim
new file mode 100644
index 000000000..85f674a99
--- /dev/null
+++ b/after/syntax/idris2.vim
@@ -0,0 +1,82 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+
+" This script allows for unicode concealing of certain characters
+" For instance -> goes to →
+"
+" It needs vim >= 7.3, set nocompatible, set enc=utf-8
+"
+" If you want to turn this on, let g:idris_conceal = 1
+
+if !exists('g:idris_conceal') || !has('conceal') || &enc != 'utf-8'
+    finish
+endif
+
+" vim: set fenc=utf-8:
+syntax match idrNiceOperator "\\\ze[[:alpha:][:space:]_([]" conceal cchar=λ
+syntax match idrNiceOperator "<-" conceal cchar=←
+syntax match idrNiceOperator "->" conceal cchar=→
+syntax match idrNiceOperator "\<sum\>" conceal cchar=∑
+syntax match idrNiceOperator "\<product\>" conceal cchar=∏
+syntax match idrNiceOperator "\<sqrt\>" conceal cchar=√
+syntax match idrNiceOperator "\<pi\>" conceal cchar=π
+syntax match idrNiceOperator "==" conceal cchar=≡
+syntax match idrNiceOperator "\/=" conceal cchar=≠
+
+
+let s:extraConceal = 1
+
+let s:doubleArrow = 1
+" Set this to 0 to use the more technically correct arrow from bar
+
+" Some windows font don't support some of the characters,
+" so if they are the main font, we don't load them :)
+if has("win32")
+    let s:incompleteFont = [ 'Consolas'
+                        \ , 'Lucida Console'
+                        \ , 'Courier New'
+                        \ ]
+    let s:mainfont = substitute( &guifont, '^\([^:,]\+\).*', '\1', '')
+    for s:fontName in s:incompleteFont
+        if s:mainfont ==? s:fontName
+            let s:extraConceal = 0
+            break
+        endif
+    endfor
+endif
+
+if s:extraConceal
+    syntax match idrNiceOperator "Void" conceal cchar=⊥
+
+    " Match greater than and lower than w/o messing with Kleisli composition
+    syntax match idrNiceOperator "<=\ze[^<]" conceal cchar=≤
+    syntax match idrNiceOperator ">=\ze[^>]" conceal cchar=≥
+
+    if s:doubleArrow
+      syntax match idrNiceOperator "=>" conceal cchar=⇒
+    else
+      syntax match idrNiceOperator "=>" conceal cchar=↦
+    endif
+
+    syntax match idrNiceOperator "=\zs<<" conceal cchar=«
+
+    syntax match idrNiceOperator "++" conceal cchar=⧺
+    syntax match idrNiceOperator "::" conceal cchar=∷
+    syntax match idrNiceOperator "-<" conceal cchar=↢
+    syntax match idrNiceOperator ">-" conceal cchar=↣
+    syntax match idrNiceOperator "-<<" conceal cchar=⤛
+    syntax match idrNiceOperator ">>-" conceal cchar=⤜
+
+    " Only replace the dot, avoid taking spaces around.
+    syntax match idrNiceOperator /\s\.\s/ms=s+1,me=e-1 conceal cchar=∘
+    syntax match idrNiceOperator "\.\." conceal cchar=‥
+
+    syntax match idrNiceOperator "`elem`" conceal cchar=∈
+    syntax match idrNiceOperator "`notElem`" conceal cchar=∉
+endif
+
+hi link idrNiceOperator Operator
+hi! link Conceal Operator
+setlocal conceallevel=2
+
+
+endif
diff --git a/autoload/cargo/quickfix.vim b/autoload/cargo/quickfix.vim
index e1e5b9d25..cce7fcbb7 100644
--- a/autoload/cargo/quickfix.vim
+++ b/autoload/cargo/quickfix.vim
@@ -1,7 +1,8 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 function! cargo#quickfix#CmdPre() abort
-    if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo'
+    if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo' &&
+         \ &makeprg =~ '\V\^cargo\ \.\*'
         " Preserve the current directory, and 'lcd' to the nearest Cargo file.
         let b:rust_compiler_cargo_qf_has_lcd = haslocaldir()
         let b:rust_compiler_cargo_qf_prev_cd = getcwd()
diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index 3753dc8e4..eca7e304e 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -212,6 +212,50 @@ func! polyglot#DetectReFiletype()
   endfor
 endfunc
 
+func! polyglot#DetectIdrFiletype()
+  for lnum in range(1, min([line("$"), 5]))
+    let line = getline(lnum)
+    if line =~# '^\s*--.*[Ii]dris \=1'
+      setf idris | return
+    endif
+    if line =~# '^\s*--.*[Ii]dris \=2'
+      setf idris2 | return
+    endif
+  endfor
+  for lnum in range(1, min([line("$"), 30]))
+    let line = getline(lnum)
+    if line =~# '^pkgs =.*'
+      setf idris | return
+    endif
+    if line =~# '^depends =.*'
+      setf idris2 | return
+    endif
+    if line =~# '^%language \(TypeProviders\|ElabReflection\)'
+      setf idris | return
+    endif
+    if line =~# '^%language PostfixProjections'
+      setf idris2 | return
+    endif
+    if line =~# '^%access .*'
+      setf idris | return
+    endif
+    if exists("g:filetype_idr")
+      exe "setf " . g:filetype_idr | return
+    endif
+  endfor
+  setf idris2 | return
+endfunc
+
+func! polyglot#DetectLidrFiletype()
+  for lnum in range(1, min([line("$"), 200]))
+    let line = getline(lnum)
+    if line =~# '^>\s*--.*[Ii]dris \=1'
+      setf lidris | return
+    endif
+  endfor
+  setf lidris2 | return
+endfunc
+
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/autoload/rustfmt.vim b/autoload/rustfmt.vim
index 514e41474..60e2029e8 100644
--- a/autoload/rustfmt.vim
+++ b/autoload/rustfmt.vim
@@ -65,12 +65,12 @@ endfunction
 function! s:RustfmtConfigOptions()
     let l:rustfmt_toml = findfile('rustfmt.toml', expand('%:p:h') . ';')
     if l:rustfmt_toml !=# ''
-        return '--config-path '.fnamemodify(l:rustfmt_toml, ":p")
+        return '--config-path '.shellescape(fnamemodify(l:rustfmt_toml, ":p"))
     endif
 
     let l:_rustfmt_toml = findfile('.rustfmt.toml', expand('%:p:h') . ';')
     if l:_rustfmt_toml !=# ''
-        return '--config-path '.fnamemodify(l:_rustfmt_toml, ":p")
+        return '--config-path '.shellescape(fnamemodify(l:_rustfmt_toml, ":p"))
     endif
 
     " Default to edition 2018 in case no rustfmt.toml was found.
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index a912cda45..e70169cb9 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -103,6 +103,7 @@ let s:globs = {
   \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config',
   \ 'icalendar': '*.ics',
   \ 'idris': '*.idr,*.lidr,idris-response',
+  \ 'idris2': '*.idr,*.ipkg,idris-response',
   \ 'ion': '*.ion',
   \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
   \ 'javascriptreact': '*.jsx',
@@ -116,6 +117,7 @@ let s:globs = {
   \ 'kotlin': '*.kt,*.ktm,*.kts',
   \ 'ledger': '*.ldg,*.ledger,*.journal',
   \ 'less': '*.less',
+  \ 'lidris2': '*.lidr',
   \ 'lilypond': '*.ly,*.ily',
   \ 'litcoffee': '*.litcoffee,*.coffee.md',
   \ 'livescript': '*.ls,*._ls,Slakefile',
diff --git a/doc/idris2-vim.txt b/doc/idris2-vim.txt
new file mode 100644
index 000000000..80a53cfc5
--- /dev/null
+++ b/doc/idris2-vim.txt
@@ -0,0 +1,158 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+
+*idris2-vim.txt*   Last change 2020 February 22
+===============================================================================
+===============================================================================
+   @@@@ @@@@@@@@  @@@@@@@@  @@@@  @@@@@@          @@     @@ @@@@ @@     @@
+    @@  @@     @@ @@     @@  @@  @@    @@         @@     @@  @@  @@@   @@@
+    @@  @@     @@ @@     @@  @@  @@               @@     @@  @@  @@@@ @@@@
+    @@  @@     @@ @@@@@@@@   @@   @@@@@@  @@@@@@@ @@     @@  @@  @@ @@@ @@
+    @@  @@     @@ @@   @@    @@        @@          @@   @@   @@  @@     @@
+    @@  @@     @@ @@    @@   @@  @@    @@           @@ @@    @@  @@     @@
+   @@@@ @@@@@@@@  @@     @@ @@@@  @@@@@@             @@@    @@@@ @@     @@
+===============================================================================
+CONTENTS                                                   *idris-vim-contents*
+
+  1. Features:                                   |idris-vim-features|
+  2. Requirements:                               |idris-vim-requirements|
+  3. Functions:                                  |idris-vim-functions|
+  4. Troubleshooting                             |idris-vim-troubleshooting|
+  5. Examples:                                   |idris-vim-examples|
+  6. Information:                                |idris-vim-information|
+
+===============================================================================
+FEATURES                                                   *idris-vim-features*
+
+  * Syntax Highlighting
+  * Indentation
+  * Unicode Concealing
+  * Syntax Checking (via Syntastic(https://github.com/scrooloose/syntastic))
+  * Interactive Editing via the REPL
+
+===============================================================================
+REQUIREMENTS                                           *idris-vim-requirements*
+
+  * Idris2 (https://github.com/edwinb/Idris2/)
+
+  OPTIONAL:
+
+    * Syntastic(https://github.com/scrooloose/syntastic) for syntax checking
+    * Vimshell(https://github.com/Shougo/vimshell.vim) for a REPL
+
+===============================================================================
+FUNCTIONS                                                 *idris-vim-functions*
+
+All of the functions in idris-vim are essentially just calls back to the REPL,
+so documentation for each of them is also available there.
+
+IdrisDocumentation                                           *IdrisDocumentation*
+  Shows internal documentation of the primitive under the cursor.
+
+  Mapped to '<LocalLeader>_h' by default.
+
+IdrisResponseWin                                              *IdrisResponseWin*
+  This opens an idris response window in a new pane.
+
+  Mapped to '<LocalLeader>_i' by default.
+
+IdrisShowType                                                    *IdrisShowType*
+  This shows the type of the name under the cursor (or, if the cursor happens
+  to be over a metavariable, a bit more information about its context).
+
+  Mapped to '<LocalLeader>_t' by default.
+
+IdrisReload                                                        *IdrisReload*
+  This reloads the file and type-checks the file in the current buffer.
+
+  Mapped to '<LocalLeader>_r' by default.
+
+IdrisEval                                                            *IdrisEval*
+  This prompts for an expression and then evaluates it in the REPL, then
+  returns the result.
+
+  Mapped to '<LocalLeader>_e' by default.
+
+IdrisCaseSplit                                                 *IdrisCaseSplit*
+  When the cursor is over a variable in a pattern match clause or case
+  expression, this splits the variable into all well-typed patterns.
+
+  Mapped to '<LocalLeader>_c' by default
+
+IdrisAddClause                                                 *IdrisAddClause*
+  When the cursor is at a type declaration this creates a new clause for that
+  signature.
+
+  By default mapped to '<LocalLeader>_d' for an ordinary top-level definition,
+  '<LocalLeader>_b' for a typeclass instance definition, and
+  '<LocalLeader>_md' to add a pattern-matching proof clause.
+
+IdrisAddMissing:                                               *IdrisAddMissing*
+  When the cursor is over a function, this adds all clauses necessary to make
+  that function cover all inputs.  This also eliminates clauses which would
+  lead to unification errors from appearing.
+
+  Mapped to '<LocalLeader>_m' by default
+
+IdrisRefine:                                                      *IdrisRefine*
+  Refines the item the cursor is over (applies the name and fills in any
+  arguments which can be filled in via unification)
+
+  Mapped to '<LocalLeader>_f' by default
+
+IdrisProofSearch:                                             *IdrisProofSearch*
+  This attempts to find a value for the metavariable it was called on by
+  looking at the rest of the code.  It can also be called with hints, which
+  are functions that can apply to help solve for the metavariable.
+
+  Mapped to '<LocalLeader>_o' without hints and '<LocalLeader>p' with hints by
+  default
+
+IdrisMakeWith:                                                   *IdrisMakeWith*
+  When the cursor is over a pattern clause and this is called, it creates a
+  new with clause.
+
+  Mapped to '<LocalLeader>_w' by default
+
+IdrisMakeLemma:                                                   *IdrisMakeLemma*
+  When the cursor is over a metavariable and this is called, it creates a new
+  top-level definition to solve the metavariable.
+
+  Mapped to '<LocalLeader>_l' by default
+
+===============================================================================
+TROUBLESHOOTING                                      *idris-vim-troubleshooting*
+
+If this isn't working for you, make sure that:
+
+  * There is an Idris REPL running
+  * For syntax checking, you have syntastic installed
+  * The plugins mappings exists and don't conflict with anything else installed
+    (You can use ':map' to check. There should be mappings similar to
+    '\h * :call IdrisShowDoc()'.)
+  * Vim recognizes you're in an idris file (you can use ':verb set ft' to check)
+
+If none of this works, check to issue tracker on github and if nothing is
+there create an issue with a detailed description of the problem.
+
+===============================================================================
+EXAMPLES                                                    *idris-vim-examples*
+
+Some excellent tutorials/examples for interactive editing using the above
+functions can be found at:
+  http://edwinb.wordpress.com/2013/10/28/interactive-idris-editing-with-vim/
+and
+  http://www.scribd.com/doc/214031954/60/Interactive-Editing-in-Vim
+
+===============================================================================
+INFORMATION                                              *idris-vim-information*
+
+Author: edwinb
+Repo: https://github.com/idris-hackers/idris-vim
+
+Documentation by japesinator
+
+===============================================================================
+===============================================================================
+" vim:ft=help:et:ts=2:sw=2:sts=2:norl:
+
+endif
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index de4665b2a..186ba9daf 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -795,9 +795,16 @@ if !has_key(s:disabled_packages, 'icalendar')
 endif
 
 if !has_key(s:disabled_packages, 'idris')
-  au BufNewFile,BufRead *.idr setf idris
-  au BufNewFile,BufRead *.lidr setf idris
   au BufNewFile,BufRead idris-response setf idris
+  au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
+  au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
+endif
+
+if !has_key(s:disabled_packages, 'idris2')
+  au BufNewFile,BufRead *.ipkg setf idris2
+  au BufNewFile,BufRead idris-response setf idris2
+  au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
+  au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'ion')
diff --git a/ftplugin/idris2.vim b/ftplugin/idris2.vim
new file mode 100644
index 000000000..420bc52d2
--- /dev/null
+++ b/ftplugin/idris2.vim
@@ -0,0 +1,334 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+
+if bufname('%') == "idris-response"
+  finish
+endif
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+setlocal shiftwidth=2
+setlocal tabstop=2
+if !exists("g:idris_allow_tabchar") || g:idris_allow_tabchar == 0
+	setlocal expandtab
+endif
+setlocal comments=s1:{-,mb:-,ex:-},:\|\|\|,:--
+setlocal commentstring=--%s
+setlocal iskeyword+=?
+setlocal wildignore+=*.ibc
+
+let idris_response = 0
+let b:did_ftplugin = 1
+
+" Text near cursor position that needs to be passed to a command.
+" Refinment of `expand(<cword>)` to accomodate differences between
+" a (n)vim word and what Idris requires.
+function! s:currentQueryObject()
+  let word = expand("<cword>")
+  if word =~ '^?'
+    " Cut off '?' that introduces a hole identifier.
+    let word = strpart(word, 1)
+  endif
+  return word
+endfunction
+
+function! s:IdrisCommand(...)
+  let idriscmd = shellescape(join(a:000))
+"  echo("idris2 " . expand ('%:p') . " --client " . idriscmd)
+  return system("idris2 --find-ipkg " . shellescape(expand('%:p')) . " --client " . idriscmd)
+endfunction
+
+function! IdrisDocFold(lineNum)
+  let line = getline(a:lineNum)
+
+  if line =~ "^\s*|||"
+    return "1"
+  endif
+
+  return "0"
+endfunction
+
+function! IdrisFold(lineNum)
+  return IdrisDocFold(a:lineNum)
+endfunction
+
+setlocal foldmethod=expr
+setlocal foldexpr=IdrisFold(v:lnum)
+
+function! IdrisResponseWin()
+  if (!bufexists("idris-response"))
+    botright 10split
+    badd idris-response
+    b idris-response
+    let g:idris_respwin = "active"
+    set buftype=nofile
+    wincmd k
+  elseif (bufexists("idris-response") && g:idris_respwin == "hidden")
+    botright 10split
+    b idris-response
+    let g:idris_respwin = "active"
+    wincmd k
+  endif
+endfunction
+
+function! IdrisHideResponseWin()
+  let g:idris_respwin = "hidden"
+endfunction
+
+function! IdrisShowResponseWin()
+  let g:idris_respwin = "active"
+endfunction
+
+function! IWrite(str)
+  if (bufexists("idris-response"))
+    let save_cursor = getcurpos()
+    b idris-response
+    %delete
+    let resp = split(a:str, '\n')
+    call append(1, resp)
+    b #
+    call setpos('.', save_cursor)
+  else
+    echo a:str
+  endif
+endfunction
+
+function! IdrisReload(q)
+  w
+  let file = expand('%:p')
+  let tc = system("idris2 --find-ipkg " . shellescape(file) . " --client ''")
+  if (! (tc is ""))
+    call IWrite(tc)
+  else
+    if (a:q==0)
+       call IWrite("Successfully reloaded " . file)
+    endif
+  endif
+  return tc
+endfunction
+
+function! IdrisReloadToLine(cline)
+  return IdrisReload(1)
+  "w
+  "let file = expand("%:p")
+  "let tc = s:IdrisCommand(":lto", a:cline, file)
+  "if (! (tc is ""))
+  "  call IWrite(tc)
+  "endif
+  "return tc
+endfunction
+
+function! IdrisShowType()
+  w
+  let word = s:currentQueryObject()
+  let cline = line(".")
+  let ccol = col(".")
+    let ty = s:IdrisCommand(":t", word)
+    call IWrite(ty)
+endfunction
+
+function! IdrisShowDoc()
+  w
+  let word = expand("<cword>")
+  let ty = s:IdrisCommand(":doc", word)
+  call IWrite(ty)
+endfunction
+
+function! IdrisProofSearch(hint)
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = s:currentQueryObject()
+
+  if (a:hint==0)
+     let hints = ""
+  else
+     let hints = input ("Hints: ")
+  endif
+
+  let result = s:IdrisCommand(":ps!", cline, word, hints)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+  endif
+endfunction
+
+function! IdrisGenerateDef()
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = s:currentQueryObject()
+
+  let result = s:IdrisCommand(":gd!", cline, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+  endif
+endfunction
+
+function! IdrisMakeLemma()
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = s:currentQueryObject()
+
+  let result = s:IdrisCommand(":ml!", cline, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+    call search(word, "b")
+  endif
+endfunction
+
+function! IdrisRefine()
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = expand("<cword>")
+  let name = input ("Name: ")
+
+  let result = s:IdrisCommand(":ref!", cline, word, name)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+  endif
+endfunction
+
+function! IdrisAddMissing()
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = expand("<cword>")
+
+  let result = s:IdrisCommand(":am!", cline, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+  endif
+endfunction
+
+function! IdrisCaseSplit()
+  w
+  let view = winsaveview()
+  let cline = line(".")
+  let ccol = col(".")
+  let word = expand("<cword>")
+  let result = s:IdrisCommand(":cs!", cline, ccol, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+     e
+     call winrestview(view)
+  endif
+endfunction
+
+function! IdrisMakeWith()
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = s:currentQueryObject()
+  let tc = IdrisReload(1)
+
+  let result = s:IdrisCommand(":mw!", cline, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+    call search("_")
+  endif
+endfunction
+
+function! IdrisMakeCase()
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = s:currentQueryObject()
+
+  let result = s:IdrisCommand(":mc!", cline, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+    call search("_")
+  endif
+endfunction
+
+function! IdrisAddClause(proof)
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = expand("<cword>")
+
+  if (a:proof==0)
+    let fn = ":ac!"
+  else
+    let fn = ":apc!"
+  endif
+
+  let result = s:IdrisCommand(fn, cline, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+    call search(word)
+
+  endif
+endfunction
+
+function! IdrisEval()
+  w
+  let expr = input ("Expression: ")
+  let result = s:IdrisCommand(expr)
+  call IWrite(" = " . result)
+endfunction
+
+nnoremap <buffer> <silent> <LocalLeader>t :call IdrisShowType()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>r :call IdrisReload(0)<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>c :call IdrisCaseSplit()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>a 0:call search(":")<ENTER>b:call IdrisAddClause(0)<ENTER>w
+nnoremap <buffer> <silent> <LocalLeader>d 0:call search(":")<ENTER>b:call IdrisAddClause(0)<ENTER>w
+nnoremap <buffer> <silent> <LocalLeader>b 0:call IdrisAddClause(0)<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>m :call IdrisAddMissing()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>md 0:call search(":")<ENTER>b:call IdrisAddClause(1)<ENTER>w
+nnoremap <buffer> <silent> <LocalLeader>f :call IdrisRefine()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>o :call IdrisProofSearch(0)<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>s :call IdrisProofSearch(0)<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>g :call IdrisGenerateDef()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>p :call IdrisProofSearch(1)<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>l :call IdrisMakeLemma()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>e :call IdrisEval()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>w 0:call IdrisMakeWith()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>mc :call IdrisMakeCase()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>i 0:call IdrisResponseWin()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>h :call IdrisShowDoc()<ENTER>
+
+menu Idris.Reload <LocalLeader>r
+menu Idris.Show\ Type <LocalLeader>t
+menu Idris.Evaluate <LocalLeader>e
+menu Idris.-SEP0- :
+menu Idris.Add\ Clause <LocalLeader>a
+menu Idris.Generate\ Definition <LocalLeader>g
+menu Idris.Add\ with <LocalLeader>w
+menu Idris.Case\ Split <LocalLeader>c
+menu Idris.Add\ missing\ cases <LocalLeader>m
+menu Idris.Proof\ Search <LocalLeader>s
+menu Idris.Proof\ Search\ with\ hints <LocalLeader>p
+
+au BufHidden idris-response call IdrisHideResponseWin()
+au BufEnter idris-response call IdrisShowResponseWin()
+
+endif
diff --git a/heuristics.yaml b/heuristics.yaml
index 97999022b..33c1c6906 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -63,3 +63,33 @@ rules:
   - pattern: '^\s*#(?:(?:if|ifdef|define|pragma)\s+\w|\s*include\s+[<"]|template\s*<)'
     filetype: cpp
   - filetype: reason
+---
+extensions: [idr]
+rules:
+- lines: 5
+  rules:
+  - pattern: '^\s*--.*[Ii]dris ?1'
+    filetype: idris
+  - pattern: '^\s*--.*[Ii]dris ?2'
+    filetype: idris2
+- lines: 30
+  rules:
+  - pattern: '^pkgs =.*'
+    filetype: idris
+  - pattern: '^depends =.*'
+    filetype: idris2
+  - pattern: '^%language (TypeProviders|ElabReflection)'
+    filetype: idris
+  - pattern: '^%language PostfixProjections'
+    filetype: idris2
+  - pattern: '^%access .*'
+    filetype: idris
+  - override: 'g:filetype_idr'
+- filetype: idris2
+---
+extensions: [lidr]
+rules:
+- lines: 200
+  pattern: '^>\s*--.*[Ii]dris ?1'
+  filetype: lidris
+- filetype: lidris2
diff --git a/indent/idris2.vim b/indent/idris2.vim
new file mode 100644
index 000000000..83995423f
--- /dev/null
+++ b/indent/idris2.vim
@@ -0,0 +1,148 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+
+" indentation for idris (idris-lang.org)
+"
+" Based on haskell indentation by motemen <motemen@gmail.com>
+"
+" author: raichoo (raichoo@googlemail.com)
+"
+" Modify g:idris_indent_if and g:idris_indent_case to
+" change indentation for `if'(default 3) and `case'(default 5).
+" Example (in .vimrc):
+" > let g:idris_indent_if = 2
+
+if exists('b:did_indent')
+  finish
+endif
+
+let b:did_indent = 1
+
+if !exists('g:idris_indent_if')
+  " if bool
+  " >>>then ...
+  " >>>else ...
+  let g:idris_indent_if = 3
+endif
+
+if !exists('g:idris_indent_case')
+  " case xs of
+  " >>>>>[]      => ...
+  " >>>>>(y::ys) => ...
+  let g:idris_indent_case = 5
+endif
+
+if !exists('g:idris_indent_let')
+  " let x : Nat = O in
+  " >>>>x
+  let g:idris_indent_let = 4
+endif
+
+if !exists('g:idris_indent_rewrite')
+  " rewrite prf in expr
+  " >>>>>>>>x
+  let g:idris_indent_rewrite = 8
+endif
+
+if !exists('g:idris_indent_where')
+  " where f : Nat -> Nat
+  " >>>>>>f x = x
+  let g:idris_indent_where = 6
+endif
+
+if !exists('g:idris_indent_do')
+  " do x <- a
+  " >>>y <- b
+  let g:idris_indent_do = 3
+endif
+
+setlocal indentexpr=GetIdrisIndent()
+setlocal indentkeys=!^F,o,O,}
+
+function! GetIdrisIndent()
+  let prevline = getline(v:lnum - 1)
+
+  if prevline =~ '\s\+(\s*.\+\s\+:\s\+.\+\s*)\s\+->\s*$'
+    return match(prevline, '(')
+  elseif prevline =~ '\s\+{\s*.\+\s\+:\s\+.\+\s*}\s\+->\s*$'
+    return match(prevline, '{')
+  endif
+
+  if prevline =~ '[!#$%&*+./<>?@\\^|~-]\s*$'
+    let s = match(prevline, '[:=]')
+    if s > 0
+      return s + 2
+    else
+      return match(prevline, '\S')
+    endif
+  endif
+
+  if prevline =~ '[{([][^})\]]\+$'
+    return match(prevline, '[{([]')
+  endif
+
+  if prevline =~ '\<let\>\s\+.\+\<in\>\s*$'
+    return match(prevline, '\<let\>') + g:idris_indent_let
+  endif
+
+  if prevline =~ '\<rewrite\>\s\+.\+\<in\>\s*$'
+    return match(prevline, '\<rewrite\>') + g:idris_indent_rewrite
+  endif
+
+  if prevline !~ '\<else\>'
+    let s = match(prevline, '\<if\>.*\&.*\zs\<then\>')
+    if s > 0
+      return s
+    endif
+
+    let s = match(prevline, '\<if\>')
+    if s > 0
+      return s + g:idris_indent_if
+    endif
+  endif
+
+  if prevline =~ '\(\<where\>\|\<do\>\|=\|[{([]\)\s*$'
+    return match(prevline, '\S') + &shiftwidth
+  endif
+
+  if prevline =~ '\<where\>\s\+\S\+.*$'
+    return match(prevline, '\<where\>') + g:idris_indent_where
+  endif
+
+  if prevline =~ '\<do\>\s\+\S\+.*$'
+    return match(prevline, '\<do\>') + g:idris_indent_do
+  endif
+
+  if prevline =~ '^\s*\<\(co\)\?data\>\s\+[^=]\+\s\+=\s\+\S\+.*$'
+    return match(prevline, '=')
+  endif
+
+  if prevline =~ '\<with\>\s\+([^)]*)\s*$'
+    return match(prevline, '\S') + &shiftwidth
+  endif
+
+  if prevline =~ '\<case\>\s\+.\+\<of\>\s*$'
+    return match(prevline, '\<case\>') + g:idris_indent_case
+  endif
+
+  if prevline =~ '^\s*\(\<namespace\>\|\<\(co\)\?data\>\)\s\+\S\+\s*$'
+    return match(prevline, '\(\<namespace\>\|\<\(co\)\?data\>\)') + &shiftwidth
+  endif
+
+  if prevline =~ '^\s*\(\<using\>\|\<parameters\>\)\s*([^(]*)\s*$'
+    return match(prevline, '\(\<using\>\|\<parameters\>\)') + &shiftwidth
+  endif
+
+  if prevline =~ '^\s*\<mutual\>\s*$'
+    return match(prevline, '\<mutual\>') + &shiftwidth
+  endif
+
+  let line = getline(v:lnum)
+
+  if (line =~ '^\s*}\s*' && prevline !~ '^\s*;')
+    return match(prevline, '\S') - &shiftwidth
+  endif
+
+  return match(prevline, '\S')
+endfunction
+
+endif
diff --git a/packages.yaml b/packages.yaml
index ca5de3a39..04dd4cd41 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -755,6 +755,19 @@ filetypes:
   extra_filenames:
   - idris-response
 ---
+name: idris2
+remote: edwinb/idris2-vim
+filetypes:
+- name: idris2
+  extensions:
+  - idr
+  - ipkg
+  filenames:
+  - idris-response
+- name: lidris2
+  extensions:
+  - lidr
+---
 name: ion
 remote: vmchale/ion-vim
 filetypes:
diff --git a/scripts/build b/scripts/build
index c7f4846fb..79a1cfe77 100755
--- a/scripts/build
+++ b/scripts/build
@@ -77,6 +77,12 @@ def load_data()
         filetype["extensions"] ||= []
         filetype["filenames"] ||= []
         filetype["interpreters"] ||= []
+
+        filetype.keys.each do |key|
+          if key.start_with?("extra_")
+            raise "[#{filetype["name"]}]: #{key} is not allowed if linguist is not used"
+          end
+        end
       end
     end
   end
diff --git a/scripts/test_extensions.vim b/scripts/test_extensions.vim
index c45431d5e..9211818d5 100644
--- a/scripts/test_extensions.vim
+++ b/scripts/test_extensions.vim
@@ -190,6 +190,11 @@ call TestExtension('yaml.ansible', 'requirements.yaml', '')
 call TestExtension('ps1xml', 'foobar.ps1xml', '')
 call TestExtension('terraform', 'terraform.tf', '')
 
+call TestExtension('idris2', 'foobar.idr', '')
+call TestExtension('idris', 'foobar.idr', "pkgs : List String\npkgs = [\"NCurses\", \"Readline\"]")
+let g:filetype_idr = 'fizfuz'
+call TestExtension('fizfuz', 'fizfuz.idr', '')
+
 " .m extension
 call TestExtension('octave', 'matlab.m', '')
 call TestExtension('objc', 'objc.m', "\n\n  #import <Foundation/Foundation.h>")
@@ -215,3 +220,28 @@ call TestExtension('cpp', 'cpp.re', '#include "config.h"')
 call TestExtension('cpp', 'cpp2.re', '#ifdef HAVE_CONFIG_H')
 call TestExtension('cpp', 'cpp3.re', '#define YYCTYPE unsigned char')
 call TestExtension('reason', 'react.re', 'ReasonReact.Router.push("");')
+
+" Idris
+call TestExtension('idris', 'lowercase.idr', '--idris1')
+call TestExtension('idris', 'uppercase.idr', '--Idris1')
+call TestExtension('idris', 'start-space-l.idr', '-- idris1')
+call TestExtension('idris', 'start-space-u.idr', '-- Idris1')
+call TestExtension('idris', 'two-spaces-l.idr', '-- idris 1')
+call TestExtension('idris', 'two-spaces-u.idr', '-- Idris 1')
+"call TestExtension('idris', 'mypkg.ipkg', 'package mypkg\n\npkgs = pruviloj, lightyear')
+call TestExtension('idris', 'use-type-prov.idr', '%language TypeProviders')
+call TestExtension('idris', 'use-elab-refl.idr', '%language ElabReflection')
+call TestExtension('idris', 'access-modifier.idr', '%access export\n\npublic export\nMyTest : Type-> Type\n\nfact : Nat -> Nat')
+call TestExtension('idris2', 'lowercase.idr', '--idris2')
+call TestExtension('idris2', 'uppercase.idr', '--Idris2')
+call TestExtension('idris2', 'start-space-l.idr', '-- idris2')
+call TestExtension('idris2', 'start-space-u.idr', '-- Idris2')
+call TestExtension('idris2', 'two-spaces-l.idr', '-- idris 2')
+call TestExtension('idris2', 'two-spaces-u.idr', '-- Idris 2')
+call TestExtension('idris2', 'mypkg.ipkg', 'package mypkg\n\ndepends = effects')
+call TestExtension('idris2', 'use-post-proj.idr', '%language PostfixProjections')
+
+" Literate Idris
+call TestExtension('lidris', 'lidris-1.lidr', "Some test plaintext\n\n> --idris1\n> myfact : Nat -> Nat\n> myfact Z = 1\n> myfact (S k) = (S k) * myfact k\n\nMore plaintext")
+call TestExtension('lidris2', 'lidris-2.lidr', "Some test plaintext\n\n> --idris2\n> myfact : Nat -> Nat\n> myfact Z = 1\n> myfact (S k) = (S k) * myfact k\n\nMore plaintext")
+
diff --git a/scripts/test_filetypes.vim b/scripts/test_filetypes.vim
index d0bec4ccb..0f870d5a2 100644
--- a/scripts/test_filetypes.vim
+++ b/scripts/test_filetypes.vim
@@ -106,6 +106,8 @@ call TestFiletype('html')
 call TestFiletype('i3config')
 call TestFiletype('icalendar')
 call TestFiletype('idris')
+call TestFiletype('idris2')
+call TestFiletype('lidris2')
 call TestFiletype('ion')
 call TestFiletype('javascript')
 call TestFiletype('flow')
diff --git a/syntax/idris2.vim b/syntax/idris2.vim
new file mode 100644
index 000000000..6bd18c584
--- /dev/null
+++ b/syntax/idris2.vim
@@ -0,0 +1,85 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+
+" syntax highlighting for Idris 2 (idris-lang.org)
+"
+" Heavily modified version of the haskell syntax
+" highlighter to support Idris 2.
+"
+" author: raichoo (raichoo@googlemail.com)
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match idrisTypeDecl "[a-zA-Z][a-zA-z0-9_']*\s\+:\s\+"
+  \ contains=idrisIdentifier,idrisOperators
+syn region idrisParens matchgroup=idrisDelimiter start="(" end=")" contains=TOP,idrisTypeDecl
+syn region idrisBrackets matchgroup=idrisDelimiter start="\[" end="]" contains=TOP,idrisTypeDecl
+syn region idrisBlock matchgroup=idrisDelimiter start="{" end="}" contains=TOP,idrisTypeDecl
+syn keyword idrisModule module namespace
+syn keyword idrisImport import
+syn keyword idrisStructure data record interface implementation
+syn keyword idrisWhere where
+syn keyword idrisVisibility public abstract private export
+syn keyword idrisBlock parameters mutual using
+syn keyword idrisTotality total partial covering
+syn keyword idrisAnnotation auto impossible default constructor
+syn keyword idrisStatement do case of rewrite with
+syn keyword idrisLet let in
+syn keyword idrisForall forall
+syn keyword idrisDataOpt noHints uniqueSearch search external noNewtype containedin=idrisBrackets
+syn match idrisSyntax "\(pattern \+\|term \+\)\?syntax"
+syn keyword idrisConditional if then else
+syn match idrisNumber "\<[0-9]\+\>\|\<0[xX][0-9a-fA-F]\+\>\|\<0[oO][0-7]\+\>"
+syn match idrisFloat "\<[0-9]\+\.[0-9]\+\([eE][-+]\=[0-9]\+\)\=\>"
+syn match idrisDelimiter  "[,;]"
+syn keyword idrisInfix prefix infix infixl infixr
+syn match idrisOperators "\([-!#$%&\*\+./<=>\?@\\^|~:]\|\<_\>\)"
+syn match idrisType "\<[A-Z][a-zA-Z0-9_']*\>"
+syn keyword idrisTodo TODO FIXME XXX HACK contained
+syn match idrisLineComment "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contains=idrisTodo,@Spell
+syn match idrisDocComment "|||\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contains=idrisTodo,@Spell
+syn match idrisMetaVar "?[a-z][A-Za-z0-9_']*"
+syn match idrisPragma "%\(hide\|logging\|auto_lazy\|unbound_implicits\|undotted_record_projections\|amibguity_depth\|pair\|rewrite\|integerLit\|stringLit\|charLit\|name\|start\|allow_overloads\|language\|default\|transform\|hint\|global_hint\|defaulthint\|inline\|extern\|macro\|spec\|foreign\|runElab\|tcinline\)"
+syn match idrisChar "'[^'\\]'\|'\\.'\|'\\u[0-9a-fA-F]\{4}'"
+syn match idrisBacktick "`[A-Za-z][A-Za-z0-9_']*`"
+syn region idrisString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell
+syn region idrisBlockComment start="{-" end="-}" contains=idrisBlockComment,idrisTodo,@Spell
+syn match idrisIdentifier "[a-zA-Z][a-zA-z0-9_']*" contained
+
+highlight def link idrisDeprecated Error
+highlight def link idrisIdentifier Identifier
+highlight def link idrisImport Structure
+highlight def link idrisModule Structure
+highlight def link idrisStructure Structure
+highlight def link idrisStatement Statement
+highlight def link idrisForall Structure
+highlight def link idrisDataOpt Statement
+highlight def link idrisDSL Statement
+highlight def link idrisBlock Statement
+highlight def link idrisAnnotation Statement
+highlight def link idrisWhere Structure
+highlight def link idrisLet Structure
+highlight def link idrisTotality Statement
+highlight def link idrisSyntax Statement
+highlight def link idrisVisibility Statement
+highlight def link idrisConditional Conditional
+highlight def link idrisPragma Statement
+highlight def link idrisNumber Number
+highlight def link idrisFloat Float
+highlight def link idrisDelimiter Delimiter
+highlight def link idrisInfix PreProc
+highlight def link idrisOperators Operator
+highlight def link idrisType Include
+highlight def link idrisDocComment Comment
+highlight def link idrisLineComment Comment
+highlight def link idrisBlockComment Comment
+highlight def link idrisTodo Todo
+highlight def link idrisMetaVar Macro
+highlight def link idrisString String
+highlight def link idrisChar String
+highlight def link idrisBacktick Operator
+
+let b:current_syntax = "idris2"
+
+endif
diff --git a/syntax/lidris2.vim b/syntax/lidris2.vim
new file mode 100644
index 000000000..a47572050
--- /dev/null
+++ b/syntax/lidris2.vim
@@ -0,0 +1,26 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+
+" Vim syntax file
+" Language:    Literate Idris 2
+" Maintainer:  Idris Hackers (https://github.com/edwinb/idris2-vim)
+" Last Change: 2020 May 19
+" Version:     0.1
+"
+" This is just a minimal adaption of the Literate Haskell syntax file.
+
+
+" Read Idris highlighting.
+if version < 600
+    syntax include @idrisTop <sfile>:p:h/idris2.vim
+else
+    syntax include @idrisTop syntax/idris2.vim
+endif
+
+" Recognize blocks of Bird tracks, highlight as Idris.
+syntax region lidrisBirdTrackBlock start="^>" end="\%(^[^>]\)\@=" contains=@idrisTop,lidrisBirdTrack
+syntax match  lidrisBirdTrack "^>" contained
+hi def link   lidrisBirdTrack Comment
+
+let b:current_syntax = "lidris2"
+
+endif
diff --git a/syntax/rust.vim b/syntax/rust.vim
index d1e9d8d4b..2ad37ed84 100644
--- a/syntax/rust.vim
+++ b/syntax/rust.vim
@@ -67,10 +67,11 @@ syn match   rustExternCrateString /".*"\_s*as/ contained nextgroup=rustIdentifie
 syn keyword   rustObsoleteExternMod mod contained nextgroup=rustIdentifier skipwhite skipempty
 
 syn match     rustIdentifier  contains=rustIdentifierPrime "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
-syn match     rustFuncName    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
+syn match     rustFuncName    "\%(r#\)\=\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
 
 syn region rustMacroRepeat matchgroup=rustMacroRepeatDelimiters start="$(" end="),\=[*+]" contains=TOP
 syn match rustMacroVariable "$\w\+"
+syn match rustRawIdent "\<r#\h\w*" contains=NONE
 
 " Reserved (but not yet used) keywords {{{2
 syn keyword   rustReservedKeyword become do priv typeof unsized abstract virtual final override

From 57badea2dc9aff361d528aeeeb22ac2e85da1435 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 6 Sep 2020 02:34:46 +0200
Subject: [PATCH 016/299] Ignore idris2 doc, fixes #538

---
 doc/idris2-vim.txt | 158 ---------------------------------------------
 packages.yaml      |   2 +
 2 files changed, 2 insertions(+), 158 deletions(-)
 delete mode 100644 doc/idris2-vim.txt

diff --git a/doc/idris2-vim.txt b/doc/idris2-vim.txt
deleted file mode 100644
index 80a53cfc5..000000000
--- a/doc/idris2-vim.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
-
-*idris2-vim.txt*   Last change 2020 February 22
-===============================================================================
-===============================================================================
-   @@@@ @@@@@@@@  @@@@@@@@  @@@@  @@@@@@          @@     @@ @@@@ @@     @@
-    @@  @@     @@ @@     @@  @@  @@    @@         @@     @@  @@  @@@   @@@
-    @@  @@     @@ @@     @@  @@  @@               @@     @@  @@  @@@@ @@@@
-    @@  @@     @@ @@@@@@@@   @@   @@@@@@  @@@@@@@ @@     @@  @@  @@ @@@ @@
-    @@  @@     @@ @@   @@    @@        @@          @@   @@   @@  @@     @@
-    @@  @@     @@ @@    @@   @@  @@    @@           @@ @@    @@  @@     @@
-   @@@@ @@@@@@@@  @@     @@ @@@@  @@@@@@             @@@    @@@@ @@     @@
-===============================================================================
-CONTENTS                                                   *idris-vim-contents*
-
-  1. Features:                                   |idris-vim-features|
-  2. Requirements:                               |idris-vim-requirements|
-  3. Functions:                                  |idris-vim-functions|
-  4. Troubleshooting                             |idris-vim-troubleshooting|
-  5. Examples:                                   |idris-vim-examples|
-  6. Information:                                |idris-vim-information|
-
-===============================================================================
-FEATURES                                                   *idris-vim-features*
-
-  * Syntax Highlighting
-  * Indentation
-  * Unicode Concealing
-  * Syntax Checking (via Syntastic(https://github.com/scrooloose/syntastic))
-  * Interactive Editing via the REPL
-
-===============================================================================
-REQUIREMENTS                                           *idris-vim-requirements*
-
-  * Idris2 (https://github.com/edwinb/Idris2/)
-
-  OPTIONAL:
-
-    * Syntastic(https://github.com/scrooloose/syntastic) for syntax checking
-    * Vimshell(https://github.com/Shougo/vimshell.vim) for a REPL
-
-===============================================================================
-FUNCTIONS                                                 *idris-vim-functions*
-
-All of the functions in idris-vim are essentially just calls back to the REPL,
-so documentation for each of them is also available there.
-
-IdrisDocumentation                                           *IdrisDocumentation*
-  Shows internal documentation of the primitive under the cursor.
-
-  Mapped to '<LocalLeader>_h' by default.
-
-IdrisResponseWin                                              *IdrisResponseWin*
-  This opens an idris response window in a new pane.
-
-  Mapped to '<LocalLeader>_i' by default.
-
-IdrisShowType                                                    *IdrisShowType*
-  This shows the type of the name under the cursor (or, if the cursor happens
-  to be over a metavariable, a bit more information about its context).
-
-  Mapped to '<LocalLeader>_t' by default.
-
-IdrisReload                                                        *IdrisReload*
-  This reloads the file and type-checks the file in the current buffer.
-
-  Mapped to '<LocalLeader>_r' by default.
-
-IdrisEval                                                            *IdrisEval*
-  This prompts for an expression and then evaluates it in the REPL, then
-  returns the result.
-
-  Mapped to '<LocalLeader>_e' by default.
-
-IdrisCaseSplit                                                 *IdrisCaseSplit*
-  When the cursor is over a variable in a pattern match clause or case
-  expression, this splits the variable into all well-typed patterns.
-
-  Mapped to '<LocalLeader>_c' by default
-
-IdrisAddClause                                                 *IdrisAddClause*
-  When the cursor is at a type declaration this creates a new clause for that
-  signature.
-
-  By default mapped to '<LocalLeader>_d' for an ordinary top-level definition,
-  '<LocalLeader>_b' for a typeclass instance definition, and
-  '<LocalLeader>_md' to add a pattern-matching proof clause.
-
-IdrisAddMissing:                                               *IdrisAddMissing*
-  When the cursor is over a function, this adds all clauses necessary to make
-  that function cover all inputs.  This also eliminates clauses which would
-  lead to unification errors from appearing.
-
-  Mapped to '<LocalLeader>_m' by default
-
-IdrisRefine:                                                      *IdrisRefine*
-  Refines the item the cursor is over (applies the name and fills in any
-  arguments which can be filled in via unification)
-
-  Mapped to '<LocalLeader>_f' by default
-
-IdrisProofSearch:                                             *IdrisProofSearch*
-  This attempts to find a value for the metavariable it was called on by
-  looking at the rest of the code.  It can also be called with hints, which
-  are functions that can apply to help solve for the metavariable.
-
-  Mapped to '<LocalLeader>_o' without hints and '<LocalLeader>p' with hints by
-  default
-
-IdrisMakeWith:                                                   *IdrisMakeWith*
-  When the cursor is over a pattern clause and this is called, it creates a
-  new with clause.
-
-  Mapped to '<LocalLeader>_w' by default
-
-IdrisMakeLemma:                                                   *IdrisMakeLemma*
-  When the cursor is over a metavariable and this is called, it creates a new
-  top-level definition to solve the metavariable.
-
-  Mapped to '<LocalLeader>_l' by default
-
-===============================================================================
-TROUBLESHOOTING                                      *idris-vim-troubleshooting*
-
-If this isn't working for you, make sure that:
-
-  * There is an Idris REPL running
-  * For syntax checking, you have syntastic installed
-  * The plugins mappings exists and don't conflict with anything else installed
-    (You can use ':map' to check. There should be mappings similar to
-    '\h * :call IdrisShowDoc()'.)
-  * Vim recognizes you're in an idris file (you can use ':verb set ft' to check)
-
-If none of this works, check to issue tracker on github and if nothing is
-there create an issue with a detailed description of the problem.
-
-===============================================================================
-EXAMPLES                                                    *idris-vim-examples*
-
-Some excellent tutorials/examples for interactive editing using the above
-functions can be found at:
-  http://edwinb.wordpress.com/2013/10/28/interactive-idris-editing-with-vim/
-and
-  http://www.scribd.com/doc/214031954/60/Interactive-Editing-in-Vim
-
-===============================================================================
-INFORMATION                                              *idris-vim-information*
-
-Author: edwinb
-Repo: https://github.com/idris-hackers/idris-vim
-
-Documentation by japesinator
-
-===============================================================================
-===============================================================================
-" vim:ft=help:et:ts=2:sw=2:sts=2:norl:
-
-endif
diff --git a/packages.yaml b/packages.yaml
index 04dd4cd41..f757cf994 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -757,6 +757,8 @@ filetypes:
 ---
 name: idris2
 remote: edwinb/idris2-vim
+ignored_dirs:
+- doc
 filetypes:
 - name: idris2
   extensions:

From d9ee362537a34473b32ad3b4a1d7feb56a6b6811 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 6 Sep 2020 15:08:20 +0200
Subject: [PATCH 017/299] Fix weird indentation issue of yaml

---
 README.md               |   5 +-
 after/ftplugin/yaml.vim |   2 +-
 after/syntax/yaml.vim   |   2 +-
 ftdetect/polyglot.vim   |   3 +
 ftplugin/yaml.vim       |  29 +++++
 indent/yaml.vim         | 159 ++++++++++++++++++++++++++
 packages.yaml           |   9 +-
 scripts/build           |   9 +-
 syntax/yaml.vim         | 247 ++++++++++++++++++++++++++++++++++++++++
 9 files changed, 455 insertions(+), 10 deletions(-)
 create mode 100644 ftplugin/yaml.vim
 create mode 100644 indent/yaml.vim
 create mode 100644 syntax/yaml.vim

diff --git a/README.md b/README.md
index 6789eb72a..deaa86660 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->191<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->192<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -229,7 +229,8 @@ If you need full functionality of any plugin, please use it directly with your p
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)
 - [xml](https://github.com/amadeus/vim-xml)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax)
-- [yaml](https://github.com/stephpy/vim-yaml)
+- [yaml-extras](https://github.com/stephpy/vim-yaml)
+- [yaml](https://github.com/vim/vim/tree/df44a27b53586fccfc6a3aedc89061fdd9a515ff/runtime)
 - [yard](https://github.com/sheerun/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir)
 - [zig](https://github.com/ziglang/zig.vim)
diff --git a/after/ftplugin/yaml.vim b/after/ftplugin/yaml.vim
index db608fa4d..69785fc2a 100644
--- a/after/ftplugin/yaml.vim
+++ b/after/ftplugin/yaml.vim
@@ -1,4 +1,4 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml-extras') == -1
 
 " Vim indent file
 " Language: Yaml
diff --git a/after/syntax/yaml.vim b/after/syntax/yaml.vim
index 097d15359..3a1e89a25 100644
--- a/after/syntax/yaml.vim
+++ b/after/syntax/yaml.vim
@@ -1,4 +1,4 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml-extras') == -1
 
 " To make this file do stuff, add something like the following (without the
 " leading ") to your ~/.vimrc:
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 186ba9daf..792c24323 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1677,6 +1677,9 @@ if !has_key(s:disabled_packages, 'xsl')
   au BufNewFile,BufRead *.xslt setf xsl
 endif
 
+if !has_key(s:disabled_packages, 'yaml-extras')
+endif
+
 if !has_key(s:disabled_packages, 'ansible')
   au BufNewFile,BufRead group_vars/* setf yaml.ansible
   au BufNewFile,BufRead handlers.*.y{a,}ml setf yaml.ansible
diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim
new file mode 100644
index 000000000..2e9728bd6
--- /dev/null
+++ b/ftplugin/yaml.vim
@@ -0,0 +1,29 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+
+" Vim filetype plugin file
+" Language:             YAML (YAML Ain't Markup Language)
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se> (inactive)
+" Last Change:      	2020 Mar 02
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< et< fo<"
+
+setlocal comments=:# commentstring=#\ %s expandtab
+setlocal formatoptions-=t formatoptions+=croql
+
+if !exists("g:yaml_recommended_style") || g:yaml_recommended_style != 0
+  let b:undo_ftplugin ..= " sw< sts<"
+  setlocal shiftwidth=2 softtabstop=2
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/indent/yaml.vim b/indent/yaml.vim
new file mode 100644
index 000000000..c7fdebcff
--- /dev/null
+++ b/indent/yaml.vim
@@ -0,0 +1,159 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+
+" Vim indent file
+" Language:         YAML
+" Maintainer:       Nikolai Pavlov <zyx.vim@gmail.com>
+" Last Change:	    2019 Sep 28
+
+" Only load this indent file when no other was loaded.
+if exists('b:did_indent')
+  finish
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+let b:did_indent = 1
+
+setlocal indentexpr=GetYAMLIndent(v:lnum)
+setlocal indentkeys=!^F,o,O,0#,0},0],<:>,0-
+setlocal nosmartindent
+
+let b:undo_indent = 'setlocal indentexpr< indentkeys< smartindent<'
+
+" Only define the function once.
+if exists('*GetYAMLIndent')
+    finish
+endif
+
+function s:FindPrevLessIndentedLine(lnum, ...)
+    let prevlnum = prevnonblank(a:lnum-1)
+    let curindent = a:0 ? a:1 : indent(a:lnum)
+    while           prevlnum
+                \&&  indent(prevlnum) >=  curindent
+                \&& getline(prevlnum) !~# '^\s*#'
+        let prevlnum = prevnonblank(prevlnum-1)
+    endwhile
+    return prevlnum
+endfunction
+
+function s:FindPrevLEIndentedLineMatchingRegex(lnum, regex)
+    let plilnum = s:FindPrevLessIndentedLine(a:lnum, indent(a:lnum)+1)
+    while plilnum && getline(plilnum) !~# a:regex
+        let plilnum = s:FindPrevLessIndentedLine(plilnum)
+    endwhile
+    return plilnum
+endfunction
+
+let s:mapkeyregex='\v^\s*\#@!\S@=%(\''%([^'']|\''\'')*\'''.
+                \                 '|\"%([^"\\]|\\.)*\"'.
+                \                 '|%(%(\:\ )@!.)*)\:%(\ |$)'
+let s:liststartregex='\v^\s*%(\-%(\ |$))'
+
+let s:c_ns_anchor_char = '\v%([\n\r\uFEFF \t,[\]{}]@!\p)'
+let s:c_ns_anchor_name = s:c_ns_anchor_char.'+'
+let s:c_ns_anchor_property =  '\v\&'.s:c_ns_anchor_name
+
+let s:ns_word_char = '\v[[:alnum:]_\-]'
+let s:ns_tag_char  = '\v%(%\x\x|'.s:ns_word_char.'|[#/;?:@&=+$.~*''()])'
+let s:c_named_tag_handle     = '\v\!'.s:ns_word_char.'+\!'
+let s:c_secondary_tag_handle = '\v\!\!'
+let s:c_primary_tag_handle   = '\v\!'
+let s:c_tag_handle = '\v%('.s:c_named_tag_handle.
+            \            '|'.s:c_secondary_tag_handle.
+            \            '|'.s:c_primary_tag_handle.')'
+let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+'
+let s:c_non_specific_tag = '\v\!'
+let s:ns_uri_char  = '\v%(%\x\x|'.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])'
+let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>'
+let s:c_ns_tag_property = '\v'.s:c_verbatim_tag.
+            \               '\v|'.s:c_ns_shorthand_tag.
+            \               '\v|'.s:c_non_specific_tag
+
+let s:block_scalar_header = '\v[|>]%([+-]?[1-9]|[1-9]?[+-])?'
+
+function GetYAMLIndent(lnum)
+    if a:lnum == 1 || !prevnonblank(a:lnum-1)
+        return 0
+    endif
+
+    let prevlnum = prevnonblank(a:lnum-1)
+    let previndent = indent(prevlnum)
+
+    let line = getline(a:lnum)
+    if line =~# '^\s*#' && getline(a:lnum-1) =~# '^\s*#'
+        " Comment blocks should have identical indent
+        return previndent
+    elseif line =~# '^\s*[\]}]'
+        " Lines containing only closing braces should have previous indent
+        return indent(s:FindPrevLessIndentedLine(a:lnum))
+    endif
+
+    " Ignore comment lines when calculating indent
+    while getline(prevlnum) =~# '^\s*#'
+        let prevlnum = prevnonblank(prevlnum-1)
+        if !prevlnum
+            return previndent
+        endif
+    endwhile
+
+    let prevline = getline(prevlnum)
+    let previndent = indent(prevlnum)
+
+    " Any examples below assume that shiftwidth=2
+    if prevline =~# '\v[{[:]$|[:-]\ [|>][+\-]?%(\s+\#.*|\s*)$'
+        " Mapping key:
+        "     nested mapping: ...
+        "
+        " - {
+        "     key: [
+        "         list value
+        "     ]
+        " }
+        "
+        " - |-
+        "     Block scalar without indentation indicator
+        return previndent+shiftwidth()
+    elseif prevline =~# '\v[:-]\ [|>]%(\d+[+\-]?|[+\-]?\d+)%(\#.*|\s*)$'
+        " - |+2
+        "   block scalar with indentation indicator
+        "#^^ indent+2, not indent+shiftwidth
+        return previndent + str2nr(matchstr(prevline,
+                    \'\v([:-]\ [|>])@<=[+\-]?\d+%([+\-]?%(\s+\#.*|\s*)$)@='))
+    elseif prevline =~# '\v\"%([^"\\]|\\.)*\\$'
+        "    "Multiline string \
+        "     with escaped end"
+        let qidx = match(prevline, '\v\"%([^"\\]|\\.)*\\')
+        return virtcol([prevlnum, qidx+1])
+    elseif line =~# s:liststartregex
+        " List line should have indent equal to previous list line unless it was 
+        " caught by one of the previous rules
+        return indent(s:FindPrevLEIndentedLineMatchingRegex(a:lnum,
+                    \                                       s:liststartregex))
+    elseif line =~# s:mapkeyregex
+        " Same for line containing mapping key
+        let prevmapline = s:FindPrevLEIndentedLineMatchingRegex(a:lnum,
+                    \                                           s:mapkeyregex)
+        if getline(prevmapline) =~# '^\s*- '
+            return indent(prevmapline) + 2
+        else
+            return indent(prevmapline)
+        endif
+    elseif prevline =~# '^\s*- '
+        " - List with
+        "   multiline scalar
+        return previndent+2
+    elseif prevline =~# s:mapkeyregex . '\v\s*%(%('.s:c_ns_tag_property.
+                \                              '\v|'.s:c_ns_anchor_property.
+                \                              '\v|'.s:block_scalar_header.
+                \                             '\v)%(\s+|\s*%(\#.*)?$))*'
+        " Mapping with: value
+        "     that is multiline scalar
+        return previndent+shiftwidth()
+    endif
+    return previndent
+endfunction
+
+let &cpo = s:save_cpo
+
+endif
diff --git a/packages.yaml b/packages.yaml
index f757cf994..65df8369d 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1650,7 +1650,9 @@ filetypes:
   linguist: XSLT
 ---
 name: yaml
-remote: stephpy/vim-yaml
+# Fixes indentation issue: https://github.com/vim/vim/issues/6417
+remote: vim/vim@df44a27b53586fccfc6a3aedc89061fdd9a515ff:runtime
+glob: '**/yaml.vim'
 filetypes:
 - name: yaml
   linguist: YAML
@@ -1659,6 +1661,11 @@ filetypes:
   - fish_read_history
   ignored_filenames:
   - '~/.config/fish/fish_{read_,}history'
+---
+name: yaml-extras
+remote: stephpy/vim-yaml
+after: yaml
+filetypes: []
 # Ansible needs to be after YAML
 ---
 name: ansible
diff --git a/scripts/build b/scripts/build
index 79a1cfe77..c9a12743c 100755
--- a/scripts/build
+++ b/scripts/build
@@ -155,7 +155,8 @@ end
 
 def parse_remote(remote)
   match = remote.match(/(?<repo>[^@:]+)(?:@(?<branch>[^:]+))?(?::(?<path>.*))?/)
-  [match[:repo], match[:branch] || "master", match[:path]]
+  dir = "tmp/" + match[:repo] + (match[:branch] ? "-#{match[:branch]}" : "")
+  [match[:repo], match[:branch] || "master", match[:path], dir]
 end
 
 def copy_file(package, src, dest)
@@ -179,8 +180,7 @@ def download(packages)
   packages.map { |p| p["remote"] or raise "No remote for: " + p["name"] }.uniq.each_slice(20) do |remotes|
     remotes.map do |remote|
       Thread.new do
-        repo, branch, path = parse_remote(remote)
-        dir = "tmp/" + repo
+        repo, branch, path, dir = parse_remote(remote)
         unless File.exist?(dir)
           FileUtils.mkdir_p(dir)
           url = "https://codeload.github.com/#{repo}/tar.gz/#{branch}"
@@ -321,8 +321,7 @@ def extract(packages)
 
   output = []
   packages.map do |package|
-    repo, branch, path = parse_remote(package["remote"])
-    dir = "tmp/" + repo
+    repo, branch, path, dir = parse_remote(package["remote"])
     dirs = package.fetch("dirs", default_dirs)
     ignored_dirs = package.fetch("ignored_dirs", [])
     if ignored_dirs.size > 0
diff --git a/syntax/yaml.vim b/syntax/yaml.vim
new file mode 100644
index 000000000..53e606846
--- /dev/null
+++ b/syntax/yaml.vim
@@ -0,0 +1,247 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+
+" Vim syntax file
+" Language:         YAML (YAML Ain't Markup Language) 1.2
+" Maintainer:       Nikolai Pavlov <zyx.vim@gmail.com>
+" First author:     Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2015-03-28
+" 		    removed duplicate yamlKeyValueDelimiter (pull #4799)
+
+if exists('b:current_syntax')
+    finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Choose the schema to use
+" TODO: Validate schema
+if !exists('b:yaml_schema')
+  if exists('g:yaml_schema')
+    let b:yaml_schema = g:yaml_schema
+  else
+    let b:yaml_schema = 'core'
+  endif
+endif
+
+let s:ns_char = '\%([\n\r\uFEFF \t]\@!\p\)'
+let s:ns_word_char = '[[:alnum:]_\-]'
+let s:ns_uri_char  = '\%(%\x\x\|'.s:ns_word_char.'\|[#/;?:@&=+$,.!~*''()[\]]\)'
+let s:ns_tag_char  = '\%(%\x\x\|'.s:ns_word_char.'\|[#/;?:@&=+$.~*''()]\)'
+let s:c_ns_anchor_char = '\%([\n\r\uFEFF \t,[\]{}]\@!\p\)'
+let s:c_indicator      = '[\-?:,[\]{}#&*!|>''"%@`]'
+let s:c_flow_indicator = '[,[\]{}]'
+
+let s:ns_char_without_c_indicator = substitute(s:ns_char, '\v\C[\zs', '\=s:c_indicator[1:-2]', '')
+
+let s:_collection = '[^\@!\(\%(\\\.\|\[^\\\]]\)\+\)]'
+let s:_neg_collection = '[^\(\%(\\\.\|\[^\\\]]\)\+\)]'
+function s:SimplifyToAssumeAllPrintable(p)
+    return substitute(a:p, '\V\C\\%('.s:_collection.'\\@!\\p\\)', '[^\1]', '')
+endfunction
+let s:ns_char = s:SimplifyToAssumeAllPrintable(s:ns_char)
+let s:ns_char_without_c_indicator = s:SimplifyToAssumeAllPrintable(s:ns_char_without_c_indicator)
+let s:c_ns_anchor_char = s:SimplifyToAssumeAllPrintable(s:c_ns_anchor_char)
+
+function s:SimplifyAdjacentCollections(p)
+    return substitute(a:p, '\V\C'.s:_collection.'\\|'.s:_collection, '[\1\2]', 'g')
+endfunction
+let s:ns_uri_char = s:SimplifyAdjacentCollections(s:ns_uri_char)
+let s:ns_tag_char = s:SimplifyAdjacentCollections(s:ns_tag_char)
+
+let s:c_verbatim_tag = '!<'.s:ns_uri_char.'\+>'
+let s:c_named_tag_handle     = '!'.s:ns_word_char.'\+!'
+let s:c_secondary_tag_handle = '!!'
+let s:c_primary_tag_handle   = '!'
+let s:c_tag_handle = '\%('.s:c_named_tag_handle.
+            \         '\|'.s:c_secondary_tag_handle.
+            \         '\|'.s:c_primary_tag_handle.'\)'
+let s:c_ns_shorthand_tag = s:c_tag_handle . s:ns_tag_char.'\+'
+let s:c_non_specific_tag = '!'
+let s:c_ns_tag_property = s:c_verbatim_tag.
+            \        '\|'.s:c_ns_shorthand_tag.
+            \        '\|'.s:c_non_specific_tag
+
+let s:c_ns_anchor_name = s:c_ns_anchor_char.'\+'
+let s:c_ns_anchor_property =  '&'.s:c_ns_anchor_name
+let s:c_ns_alias_node      = '\*'.s:c_ns_anchor_name
+
+let s:ns_directive_name = s:ns_char.'\+'
+
+let s:ns_local_tag_prefix  = '!'.s:ns_uri_char.'*'
+let s:ns_global_tag_prefix = s:ns_tag_char.s:ns_uri_char.'*'
+let s:ns_tag_prefix = s:ns_local_tag_prefix.
+            \    '\|'.s:ns_global_tag_prefix
+
+let s:ns_plain_safe_out = s:ns_char
+let s:ns_plain_safe_in  = '\%('.s:c_flow_indicator.'\@!'.s:ns_char.'\)'
+
+let s:ns_plain_safe_in = substitute(s:ns_plain_safe_in, '\V\C\\%('.s:_collection.'\\@!'.s:_neg_collection.'\\)', '[^\1\2]', '')
+let s:ns_plain_safe_in_without_colhash = substitute(s:ns_plain_safe_in, '\V\C'.s:_neg_collection, '[^\1:#]', '')
+let s:ns_plain_safe_out_without_colhash = substitute(s:ns_plain_safe_out, '\V\C'.s:_neg_collection, '[^\1:#]', '')
+
+let s:ns_plain_first_in  = '\%('.s:ns_char_without_c_indicator.'\|[?:\-]\%('.s:ns_plain_safe_in.'\)\@=\)'
+let s:ns_plain_first_out = '\%('.s:ns_char_without_c_indicator.'\|[?:\-]\%('.s:ns_plain_safe_out.'\)\@=\)'
+
+let s:ns_plain_char_in  = '\%('.s:ns_char.'#\|:'.s:ns_plain_safe_in.'\|'.s:ns_plain_safe_in_without_colhash.'\)'
+let s:ns_plain_char_out = '\%('.s:ns_char.'#\|:'.s:ns_plain_safe_out.'\|'.s:ns_plain_safe_out_without_colhash.'\)'
+
+let s:ns_plain_out = s:ns_plain_first_out . s:ns_plain_char_out.'*'
+let s:ns_plain_in  = s:ns_plain_first_in  . s:ns_plain_char_in.'*'
+
+
+syn keyword yamlTodo            contained TODO FIXME XXX NOTE
+
+syn region  yamlComment         display oneline start='\%\(^\|\s\)#' end='$'
+            \                   contains=yamlTodo
+
+execute 'syn region yamlDirective oneline start='.string('^\ze%'.s:ns_directive_name.'\s\+').' '.
+            \                            'end="$" '.
+            \                            'contains=yamlTAGDirective,'.
+            \                                     'yamlYAMLDirective,'.
+            \                                     'yamlReservedDirective '.
+            \                            'keepend'
+
+syn match yamlTAGDirective '%TAG\s\+' contained nextgroup=yamlTagHandle
+execute 'syn match yamlTagHandle contained nextgroup=yamlTagPrefix '.string(s:c_tag_handle.'\s\+')
+execute 'syn match yamlTagPrefix contained nextgroup=yamlComment ' . string(s:ns_tag_prefix)
+
+syn match yamlYAMLDirective '%YAML\s\+'  contained nextgroup=yamlYAMLVersion
+syn match yamlYAMLVersion   '\d\+\.\d\+' contained nextgroup=yamlComment
+
+execute 'syn match yamlReservedDirective contained nextgroup=yamlComment '.
+            \string('%\%(\%(TAG\|YAML\)\s\)\@!'.s:ns_directive_name)
+
+syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start='"' skip='\\"' end='"'
+            \ contains=yamlEscape
+            \ nextgroup=yamlKeyValueDelimiter
+syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start="'" skip="''"  end="'"
+            \ contains=yamlSingleEscape
+            \ nextgroup=yamlKeyValueDelimiter
+syn match  yamlEscape contained '\\\%([\\"abefnrtv\^0_ NLP\n]\|x\x\x\|u\x\{4}\|U\x\{8}\)'
+syn match  yamlSingleEscape contained "''"
+
+syn match yamlBlockScalarHeader contained '\s\+\zs[|>]\%([+-]\=[1-9]\|[1-9]\=[+-]\)\='
+
+syn cluster yamlConstant contains=yamlBool,yamlNull
+
+syn cluster yamlFlow contains=yamlFlowString,yamlFlowMapping,yamlFlowCollection
+syn cluster yamlFlow      add=yamlFlowMappingKey,yamlFlowMappingMerge
+syn cluster yamlFlow      add=@yamlConstant,yamlPlainScalar,yamlFloat
+syn cluster yamlFlow      add=yamlTimestamp,yamlInteger,yamlMappingKeyStart
+syn cluster yamlFlow      add=yamlComment
+syn region yamlFlowMapping    matchgroup=yamlFlowIndicator start='{' end='}' contains=@yamlFlow
+syn region yamlFlowCollection matchgroup=yamlFlowIndicator start='\[' end='\]' contains=@yamlFlow
+
+execute 'syn match yamlPlainScalar /'.s:ns_plain_out.'/'
+execute 'syn match yamlPlainScalar contained /'.s:ns_plain_in.'/'
+
+syn match yamlMappingKeyStart '?\ze\s'
+syn match yamlMappingKeyStart '?' contained
+
+execute 'syn match yamlFlowMappingKey /\%#=1'.s:ns_plain_in.'\%(\s\+'.s:ns_plain_in.'\)*\ze\s*:/ contained '.
+            \'nextgroup=yamlKeyValueDelimiter'
+syn match yamlFlowMappingMerge /<<\ze\s*:/ contained nextgroup=yamlKeyValueDelimiter
+
+syn match yamlBlockCollectionItemStart '^\s*\zs-\%(\s\+-\)*\s' nextgroup=yamlBlockMappingKey,yamlBlockMappingMerge
+" Use the old regexp engine, the NFA engine doesn't like all the \@ items.
+execute 'syn match yamlBlockMappingKey /\%#=1^\s*\zs'.s:ns_plain_out.'\%(\s\+'.s:ns_plain_out.'\)*\ze\s*:\%(\s\|$\)/ '.
+            \'nextgroup=yamlKeyValueDelimiter'
+execute 'syn match yamlBlockMappingKey /\%#=1\s*\zs'.s:ns_plain_out.'\%(\s\+'.s:ns_plain_out.'\)*\ze\s*:\%(\s\|$\)/ contained '.
+            \'nextgroup=yamlKeyValueDelimiter'
+syn match yamlBlockMappingMerge /^\s*\zs<<\ze:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter
+syn match yamlBlockMappingMerge /<<\ze\s*:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter contained
+
+syn match   yamlKeyValueDelimiter /\s*:/ contained
+
+syn cluster yamlScalarWithSpecials contains=yamlPlainScalar,yamlBlockMappingKey,yamlFlowMappingKey
+
+let s:_bounder = s:SimplifyToAssumeAllPrintable('\%([[\]{}, \t]\@!\p\)')
+if b:yaml_schema is# 'json'
+    syn keyword yamlNull null contained containedin=@yamlScalarWithSpecials
+    syn keyword yamlBool true false
+    exe 'syn match   yamlInteger /'.s:_bounder.'\@1<!\%(0\|-\=[1-9][0-9]*\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+    exe 'syn match   yamlFloat   /'.s:_bounder.'\@1<!\%(-\=[1-9][0-9]*\%(\.[0-9]*\)\=\(e[-+]\=[0-9]\+\)\=\|0\|-\=\.inf\|\.nan\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+elseif b:yaml_schema is# 'core'
+    syn keyword yamlNull null Null NULL contained containedin=@yamlScalarWithSpecials
+    syn keyword yamlBool true True TRUE false False FALSE contained containedin=@yamlScalarWithSpecials
+    exe 'syn match   yamlNull /'.s:_bounder.'\@1<!\~'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+    exe 'syn match   yamlInteger /'.s:_bounder.'\@1<!\%([+-]\=\%(0\%(b[0-1_]\+\|[0-7_]\+\|x[0-9a-fA-F_]\+\)\=\|\%([1-9][0-9_]*\%(:[0-5]\=\d\)\+\)\)\|[1-9][0-9_]*\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+    exe 'syn match   yamlFloat /'.s:_bounder.'\@1<!\%([+-]\=\%(\%(\d[0-9_]*\)\.[0-9_]*\%([eE][+-]\=\d\+\)\=\|\.[0-9_]\+\%([eE][-+]\=[0-9]\+\)\=\|\d[0-9_]*\%(:[0-5]\=\d\)\+\.[0-9_]*\|\.\%(inf\|Inf\|INF\)\)\|\%(\.\%(nan\|NaN\|NAN\)\)\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+elseif b:yaml_schema is# 'pyyaml'
+    syn keyword yamlNull null Null NULL contained containedin=@yamlScalarWithSpecials
+    syn keyword yamlBool true True TRUE false False FALSE yes Yes YES no No NO on On ON off Off OFF contained containedin=@yamlScalarWithSpecials
+    exe 'syn match   yamlNull /'.s:_bounder.'\@1<!\~'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+    exe 'syn match  yamlFloat /'.s:_bounder.'\@1<!\%(\v[-+]?%(\d[0-9_]*)\.[0-9_]*%([eE][-+]\d+)?|\.[0-9_]+%([eE][-+]\d+)?|[-+]?\d[0-9_]*%(\:[0-5]?\d)+\.[0-9_]*|[-+]?\.%(inf|Inf|INF)|\.%(nan|NaN|NAN)\m\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+    exe 'syn match  yamlInteger /'.s:_bounder.'\@1<!\%(\v[-+]?0b[0-1_]+|[-+]?0[0-7_]+|[-+]?%(0|[1-9][0-9_]*)|[-+]?0x[0-9a-fA-F_]+|[-+]?[1-9][0-9_]*%(:[0-5]?\d)+\m\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+    exe 'syn match  yamlTimestamp /'.s:_bounder.'\@1<!\%(\v\d\d\d\d\-\d\d\-\d\d|\d\d\d\d \-\d\d? \-\d\d?%([Tt]|[ \t]+)\d\d?\:\d\d \:\d\d %(\.\d*)?%([ \t]*%(Z|[-+]\d\d?%(\:\d\d)?))?\m\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+elseif b:yaml_schema is# 'failsafe'
+    " Nothing
+endif
+unlet s:_bounder
+
+
+execute 'syn match yamlNodeTag '.string(s:c_ns_tag_property)
+execute 'syn match yamlAnchor  '.string(s:c_ns_anchor_property)
+execute 'syn match yamlAlias   '.string(s:c_ns_alias_node)
+
+syn match yamlDocumentStart '^---\ze\%(\s\|$\)'
+syn match yamlDocumentEnd   '^\.\.\.\ze\%(\s\|$\)'
+
+hi def link yamlTodo                     Todo
+hi def link yamlComment                  Comment
+
+hi def link yamlDocumentStart            PreProc
+hi def link yamlDocumentEnd              PreProc
+
+hi def link yamlDirectiveName            Keyword
+
+hi def link yamlTAGDirective             yamlDirectiveName
+hi def link yamlTagHandle                String
+hi def link yamlTagPrefix                String
+
+hi def link yamlYAMLDirective            yamlDirectiveName
+hi def link yamlReservedDirective        Error
+hi def link yamlYAMLVersion              Number
+
+hi def link yamlString                   String
+hi def link yamlFlowString               yamlString
+hi def link yamlFlowStringDelimiter      yamlString
+hi def link yamlEscape                   SpecialChar
+hi def link yamlSingleEscape             SpecialChar
+
+hi def link yamlBlockCollectionItemStart Label
+hi def link yamlBlockMappingKey          Identifier
+hi def link yamlBlockMappingMerge        Special
+
+hi def link yamlFlowMappingKey           Identifier
+hi def link yamlFlowMappingMerge         Special
+
+hi def link yamlMappingKeyStart          Special
+hi def link yamlFlowIndicator            Special
+hi def link yamlKeyValueDelimiter        Special
+
+hi def link yamlConstant                 Constant
+
+hi def link yamlNull                     yamlConstant
+hi def link yamlBool                     yamlConstant
+
+hi def link yamlAnchor                   Type
+hi def link yamlAlias                    Type
+hi def link yamlNodeTag                  Type
+
+hi def link yamlInteger                  Number
+hi def link yamlFloat                    Float
+hi def link yamlTimestamp                Number
+
+let b:current_syntax = "yaml"
+
+unlet s:ns_word_char s:ns_uri_char s:c_verbatim_tag s:c_named_tag_handle s:c_secondary_tag_handle s:c_primary_tag_handle s:c_tag_handle s:ns_tag_char s:c_ns_shorthand_tag s:c_non_specific_tag s:c_ns_tag_property s:c_ns_anchor_char s:c_ns_anchor_name s:c_ns_anchor_property s:c_ns_alias_node s:ns_char s:ns_directive_name s:ns_local_tag_prefix s:ns_global_tag_prefix s:ns_tag_prefix s:c_indicator s:ns_plain_safe_out s:c_flow_indicator s:ns_plain_safe_in s:ns_plain_first_in s:ns_plain_first_out s:ns_plain_char_in s:ns_plain_char_out s:ns_plain_out s:ns_plain_in s:ns_char_without_c_indicator s:ns_plain_safe_in_without_colhash s:ns_plain_safe_out_without_colhash
+unlet s:_collection s:_neg_collection
+delfunction s:SimplifyAdjacentCollections
+delfunction s:SimplifyToAssumeAllPrintable
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif

From e9b3bcd5e1ba61445565041b757392e385fd5ed0 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 6 Sep 2020 19:20:09 +0200
Subject: [PATCH 018/299] Ensure duplicate tags do not happen in the future,
 #538

---
 scripts/test | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/test b/scripts/test
index 974804399..e5418fa46 100755
--- a/scripts/test
+++ b/scripts/test
@@ -9,3 +9,8 @@ vim --clean -N -u <(echo "
   \"source scripts/test_filetypes.vim
   qa!
 ")
+
+if ! expect -c 'set timeout 1' -c 'spawn vim -N --clean -c "set nomore | :helptags ./doc | q"' -c 'expect "ENTER" { exit 1 }' > /dev/null; then
+  echo "Please ensure ':helptags ./doc' works properly"
+  exit 1
+fi

From 3169f801699b7e95318f3ebe7b4cb44365d21276 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 6 Sep 2020 19:23:23 +0200
Subject: [PATCH 019/299] Remove empty blocks

---
 ftdetect/polyglot.vim | 24 ------------------------
 scripts/build         | 21 +++++++++++----------
 2 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 792c24323..bc79d0a6f 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -515,9 +515,6 @@ if !has_key(s:disabled_packages, 'coffee-script')
   au BufNewFile,BufRead *.litcoffee setf litcoffee
 endif
 
-if !has_key(s:disabled_packages, 'cjsx')
-endif
-
 if !has_key(s:disabled_packages, 'cryptol')
   au BufNewFile,BufRead *.cry setf cryptol
   au BufNewFile,BufRead *.cyl setf cryptol
@@ -812,9 +809,6 @@ if !has_key(s:disabled_packages, 'ion')
   au BufNewFile,BufRead ~/.config/ion/initrc setf ion
 endif
 
-if !has_key(s:disabled_packages, 'javascript-sql')
-endif
-
 if !has_key(s:disabled_packages, 'javascript')
   au BufNewFile,BufRead *._js setf javascript
   au BufNewFile,BufRead *.bones setf javascript
@@ -1204,12 +1198,6 @@ if !has_key(s:disabled_packages, 'python')
   au BufNewFile,BufRead wscript setf python
 endif
 
-if !has_key(s:disabled_packages, 'python-indent')
-endif
-
-if !has_key(s:disabled_packages, 'python-compiler')
-endif
-
 if !has_key(s:disabled_packages, 'requirements')
   au BufNewFile,BufRead *.pip setf requirements
   au BufNewFile,BufRead *require.{txt,in} setf requirements
@@ -1352,9 +1340,6 @@ if !has_key(s:disabled_packages, 'rspec')
   au BufNewFile,BufRead *_spec.rb if !did_filetype() | set ft=ruby syntax=rspec | endif
 endif
 
-if !has_key(s:disabled_packages, 'yard')
-endif
-
 if !has_key(s:disabled_packages, 'brewfile')
   au BufNewFile,BufRead Brewfile setf brewfile
 endif
@@ -1420,9 +1405,6 @@ if !has_key(s:disabled_packages, 'sh')
   au BufNewFile,BufRead {.,}zshrc setf zsh
 endif
 
-if !has_key(s:disabled_packages, 'zinit')
-endif
-
 if !has_key(s:disabled_packages, 'slim')
   au BufNewFile,BufRead *.slim setf slim
 endif
@@ -1453,9 +1435,6 @@ if !has_key(s:disabled_packages, 'svg')
   au BufNewFile,BufRead *.svg setf svg
 endif
 
-if !has_key(s:disabled_packages, 'svg-indent')
-endif
-
 if !has_key(s:disabled_packages, 'swift')
   au BufNewFile,BufRead *.swift setf swift
 endif
@@ -1677,9 +1656,6 @@ if !has_key(s:disabled_packages, 'xsl')
   au BufNewFile,BufRead *.xslt setf xsl
 endif
 
-if !has_key(s:disabled_packages, 'yaml-extras')
-endif
-
 if !has_key(s:disabled_packages, 'ansible')
   au BufNewFile,BufRead group_vars/* setf yaml.ansible
   au BufNewFile,BufRead handlers.*.y{a,}ml setf yaml.ansible
diff --git a/scripts/build b/scripts/build
index c9a12743c..b868ebfc5 100755
--- a/scripts/build
+++ b/scripts/build
@@ -416,14 +416,11 @@ def generate_ftdetect(packages, heuristics)
   end
 
   for package in packages
-    name = package.fetch("name")
-
-    output << "if !has_key(s:disabled_packages, '#{name}')\n"
-
     filetypes = package["filetypes"] or raise "Unknown filetype for: #{package["name"]}"
 
     package_heuristics = []
 
+    autocommands = ""
     for filetype in filetypes
       name = filetype.fetch("name")
       syntax = filetype["syntax"] ? " | set syntax=#{filetype["syntax"]}" : ""
@@ -454,8 +451,8 @@ def generate_ftdetect(packages, heuristics)
       for extension in extensions.sort
         outer_filetype = filetype["outer_filetype"]
         if outer_filetype
-          output << "  au BufNewFile *.*.#{extension} execute \"do BufNewFile filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
-          output << "  au BufReadPre *.*.#{extension} execute \"do BufRead filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
+          autocommands << "  au BufNewFile *.*.#{extension} execute \"do BufNewFile filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
+          autocommands << "  au BufReadPre *.*.#{extension} execute \"do BufRead filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
         end
 
         heuristic = heuristics.find { |h| h["extensions"].include?(extension) }
@@ -466,7 +463,7 @@ def generate_ftdetect(packages, heuristics)
           #   puts "Ambiguous extension without heuristic: #{extension} => #{filetype["name"]}"
           # end
           #
-          output << "  au BufNewFile,BufRead *.#{extension} #{set_command}\n"
+          autocommands << "  au BufNewFile,BufRead *.#{extension} #{set_command}\n"
         end
       end
 
@@ -474,16 +471,20 @@ def generate_ftdetect(packages, heuristics)
         if filename[0] == "."
           filename = "{.,}" + filename[1..]
         end
-        output << "  au BufNewFile,BufRead #{filename} #{set_command}\n"
+        autocommands << "  au BufNewFile,BufRead #{filename} #{set_command}\n"
       end
     end
 
     for heuristic in package_heuristics.uniq
       extensions = heuristic["extensions"].map { |e| "*.#{e}" }
-      output << "  au! BufNewFile,BufRead #{extensions.join(",")} call polyglot#Detect#{camelize(heuristic["extensions"].first)}Filetype()\n"
+      autocommands << "  au! BufNewFile,BufRead #{extensions.join(",")} call polyglot#Detect#{camelize(heuristic["extensions"].first)}Filetype()\n"
     end
 
-    output << "endif\n\n"
+    if autocommands != ""
+      output << "if !has_key(s:disabled_packages, '#{package["name"]}')\n"
+      output << autocommands
+      output << "endif\n\n"
+    end
   end
  
   ftdetect = File.read('ftdetect/polyglot.vim')

From 255345bf9525c94479a7ff9b787d2f9848cb7a18 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 6 Sep 2020 19:25:34 +0200
Subject: [PATCH 020/299] Remove stephpy/vim-yaml syntax

It causes issues:
- https://github.com/dracula/vim/pull/163
- https://github.com/stephpy/vim-yaml/issues/22
---
 README.md               |  3 +-
 after/ftplugin/yaml.vim | 11 -------
 after/syntax/yaml.vim   | 65 -----------------------------------------
 packages.yaml           |  5 ----
 4 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 after/ftplugin/yaml.vim
 delete mode 100644 after/syntax/yaml.vim

diff --git a/README.md b/README.md
index deaa86660..a78562e99 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->192<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->191<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -229,7 +229,6 @@ If you need full functionality of any plugin, please use it directly with your p
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)
 - [xml](https://github.com/amadeus/vim-xml)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax)
-- [yaml-extras](https://github.com/stephpy/vim-yaml)
 - [yaml](https://github.com/vim/vim/tree/df44a27b53586fccfc6a3aedc89061fdd9a515ff/runtime)
 - [yard](https://github.com/sheerun/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir)
diff --git a/after/ftplugin/yaml.vim b/after/ftplugin/yaml.vim
deleted file mode 100644
index 69785fc2a..000000000
--- a/after/ftplugin/yaml.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml-extras') == -1
-
-" Vim indent file
-" Language: Yaml
-" Author: Henrique Barcelos
-" Date: 2014-10-08
-" URL: https://github.com/hjpbarcelos
-setlocal autoindent sw=2 ts=2 expandtab
-" vim:set sw=2:
-
-endif
diff --git a/after/syntax/yaml.vim b/after/syntax/yaml.vim
deleted file mode 100644
index 3a1e89a25..000000000
--- a/after/syntax/yaml.vim
+++ /dev/null
@@ -1,65 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml-extras') == -1
-
-" To make this file do stuff, add something like the following (without the
-" leading ") to your ~/.vimrc:
-" au BufNewFile,BufRead *.yaml,*.yml so ~/src/PyYaml/YAML.vim
-
-" Vim syntax/macro file
-" Language:	YAML
-" Author:	Igor Vergeichik <iverg@mail.ru>
-" Sponsor: Tom Sawyer <transami@transami.net>
-" Stayven: Ryan King <jking@panoptic.com>
-" Copyright (c) 2002 Tom Saywer
-
-" Add an item to a gangly list:
-"map , o<bs><bs><bs><bs>-<esc>o
-" Convert to Canonical form:
-"map \c :%!python -c 'from yaml.redump import redump; import sys; print redump(sys.stdin.read()).rstrip()'
-
-if version < 600
-  syntax clear
-endif
-syntax clear
-
-syn match yamlInline "[\[\]\{\}]"
-syn match yamlBlock "[>|]\d\?[+-]"
-
-syn region yamlComment	start="\#" end="$"
-syn match yamlIndicator	"#YAML:\S\+"
-
-syn region yamlString	start="\(^\|\s\|\[\|\,\|\-\)\@<='" end="'" skip="\\'"
-syn region yamlString	start='"' end='"' skip='\\"' contains=yamlEscape
-syn region yamlString	matchgroup=yamlBlock start=/[>|]\s*\n\+\z(\s\+\)\S/rs=s+1 skip=/^\%(\z1\S\|^$\)/ end=/^\z1\@!.*/me=s-1
-syn region yamlString	matchgroup=yamlBlock start=/[>|]\(\d\|[+-]\)\s*\n\+\z(\s\+\)\S/rs=s+2 skip=/^\%(\z1\S\|^$\)/ end=/^\z1\@!.*/me=s-1
-syn region yamlString	matchgroup=yamlBlock start=/[>|]\d\(\d\|[+-]\)\s*\n\+\z(\s\+\)\S/rs=s+3 skip=/^\%(\z1\S\|^$\)/ end=/^\z1\@!.*/me=s-1
-syn match  yamlEscape	+\\[abfnrtv'"\\]+ contained
-syn match  yamlEscape	"\\\o\o\=\o\=" contained
-syn match  yamlEscape	"\\x\x\+" contained
-
-syn match  yamlType	"!\S\+"
-
-syn keyword yamlConstant NULL Null null NONE None none NIL Nil nil
-syn keyword yamlConstant TRUE True true YES Yes yes ON On on
-syn keyword yamlConstant FALSE False false NO No no OFF Off off
-
-syn match  yamlKey	"^\s*\zs[^ \t\"\'#]\+\ze\s*:"
- syn match  yamlKey	"^\s*-\s*\zs[^ \t\"\'#]\+\ze\s*:"
-syn match  yamlAnchor	"&\S\+"
-syn match  yamlAlias	"*\S\+"
-
-" Setup the highlighting links
-
-hi link yamlConstant Keyword
-hi link yamlIndicator PreCondit
-hi link yamlAnchor	Function
-hi link yamlAlias	Function
-hi link yamlKey		Identifier
-hi link yamlType	Type
-
-hi link yamlComment	Comment
-hi link yamlInline	Operator
-hi link yamlBlock	Operator
-hi link yamlString	String
-hi link yamlEscape	Special
-
-endif
diff --git a/packages.yaml b/packages.yaml
index 65df8369d..0a8361b51 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1661,11 +1661,6 @@ filetypes:
   - fish_read_history
   ignored_filenames:
   - '~/.config/fish/fish_{read_,}history'
----
-name: yaml-extras
-remote: stephpy/vim-yaml
-after: yaml
-filetypes: []
 # Ansible needs to be after YAML
 ---
 name: ansible

From cd2fded0e0abb6b31fceaca128699eca0f300c63 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 6 Sep 2020 20:51:38 +0200
Subject: [PATCH 021/299] Add support for Visual Basic and Basic

---
 README.md                   |   4 +-
 autoload/polyglot.vim       |  10 +
 autoload/sleuth.vim         |   2 +
 ftdetect/polyglot.vim       |  16 ++
 ftplugin/vb.vim             |  49 +++++
 heuristics.yaml             |   8 +
 indent/vb.vim               |  82 ++++++++
 packages.yaml               |  46 ++++-
 scripts/build               |  33 +++-
 scripts/test_extensions.vim | 290 ++++++++++++++--------------
 scripts/test_filetypes.vim  |   2 +
 syntax/basic.vim            | 170 +++++++++++++++++
 syntax/vb.vim               | 369 ++++++++++++++++++++++++++++++++++++
 13 files changed, 925 insertions(+), 156 deletions(-)
 create mode 100644 ftplugin/vb.vim
 create mode 100644 indent/vb.vim
 create mode 100644 syntax/basic.vim
 create mode 100644 syntax/vb.vim

diff --git a/README.md b/README.md
index a78562e99..114002afc 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->191<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->193<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -78,6 +78,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [automake](https://github.com/vim/vim/tree/master/runtime)
 - [ave](https://github.com/vim/vim/tree/master/runtime)
 - [awk](https://github.com/vim/vim/tree/master/runtime)
+- [basic](https://github.com/vim/vim/tree/master/runtime)
 - [blade](https://github.com/jwalton512/vim-blade)
 - [brewfile](https://github.com/bfontaine/Brewfile.vim)
 - [c/c++](https://github.com/vim-jp/vim-cpp)
@@ -224,6 +225,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [vbnet](https://github.com/vim-scripts/vbnet.vim)
 - [vcl](https://github.com/smerrill/vcl-vim-plugin)
 - [velocity](https://github.com/lepture/vim-velocity)
+- [visual-basic](https://github.com/vim/vim/tree/master/runtime)
 - [vmasm](https://github.com/vim/vim/tree/master/runtime)
 - [vue](https://github.com/posva/vim-vue)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)
diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index eca7e304e..ffb3c43fb 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -256,6 +256,16 @@ func! polyglot#DetectLidrFiletype()
   setf lidris2 | return
 endfunc
 
+func! polyglot#DetectBasFiletype()
+  for lnum in range(1, min([line("$"), 5]))
+    let line = getline(lnum)
+    if line =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
+      setf vb | return
+    endif
+  endfor
+  setf basic | return
+endfunc
+
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index e70169cb9..18344723b 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -35,6 +35,7 @@ let s:globs = {
   \ 'automake': '[Mm]akefile.am,GNUmakefile.am',
   \ 'ave': '*.ave',
   \ 'awk': '*.awk',
+  \ 'basic': '*.basic',
   \ 'blade': '*.blade,*.blade.php',
   \ 'brewfile': 'Brewfile',
   \ 'c': '*.c,*.cats,*.h,*.idc',
@@ -200,6 +201,7 @@ let s:globs = {
   \ 'unison': '*.u,*.uu',
   \ 'v': '*.v',
   \ 'vala': '*.vala,*.vapi,*.valadoc',
+  \ 'vb': '*.bas,*.cls,*.frm,*.frx,*.vba,*.vbs,*.dsm,*.ctl,*.sba',
   \ 'vbnet': '*.vb,*.vbhtml',
   \ 'vcl': '*.vcl',
   \ 'velocity': '*.vm',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index bc79d0a6f..a37b76af8 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1712,6 +1712,22 @@ if !has_key(s:disabled_packages, 'trasys')
   au! BufNewFile,BufRead *.inp call polyglot#DetectInpFiletype()
 endif
 
+if !has_key(s:disabled_packages, 'basic')
+  au BufNewFile,BufRead *.basic setf basic
+endif
+
+if !has_key(s:disabled_packages, 'visual-basic')
+  au BufNewFile,BufRead *.cls setf vb
+  au BufNewFile,BufRead *.ctl setf vb
+  au BufNewFile,BufRead *.dsm setf vb
+  au BufNewFile,BufRead *.frm setf vb
+  au BufNewFile,BufRead *.frx setf vb
+  au BufNewFile,BufRead *.sba setf vb
+  au BufNewFile,BufRead *.vba setf vb
+  au BufNewFile,BufRead *.vbs setf vb
+  au! BufNewFile,BufRead *.bas call polyglot#DetectBasFiletype()
+endif
+
 
 " end filetypes
 
diff --git a/ftplugin/vb.vim b/ftplugin/vb.vim
new file mode 100644
index 000000000..63bf8efd0
--- /dev/null
+++ b/ftplugin/vb.vim
@@ -0,0 +1,49 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
+
+" Vim filetype plugin file
+" Language:	VisualBasic (ft=vb)
+" Maintainer:	Johannes Zellner <johannes@zellner.org>
+" Last Change:	Thu, 22 Nov 2001 12:56:14 W. Europe Standard Time
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+
+setlocal com=sr:'\ -,mb:'\ \ ,el:'\ \ ,:'
+
+" we need this wrapper, as call doesn't allow a count
+fun! <SID>VbSearch(pattern, flags)
+    let cnt = v:count1
+    while cnt > 0
+	call search(a:pattern, a:flags)
+	let cnt = cnt - 1
+    endwhile
+endfun
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" NOTE the double escaping \\|
+nnoremap <buffer> <silent> [[ :call <SID>VbSearch('^\s*\(\(private\|public\)\s\+\)\=\(function\\|sub\)', 'bW')<cr>
+nnoremap <buffer> <silent> ]] :call <SID>VbSearch('^\s*\(\(private\|public\)\s\+\)\=\(function\\|sub\)', 'W')<cr>
+nnoremap <buffer> <silent> [] :call <SID>VbSearch('^\s*\<end\>\s\+\(function\\|sub\)', 'bW')<cr>
+nnoremap <buffer> <silent> ][ :call <SID>VbSearch('^\s*\<end\>\s\+\(function\\|sub\)', 'W')<cr>
+
+" matchit support
+if exists("loaded_matchit")
+    let b:match_ignorecase=1
+    let b:match_words=
+    \ '\%(^\s*\)\@<=\<if\>.*\<then\>\s*$:\%(^\s*\)\@<=\<else\>:\%(^\s*\)\@<=\<elseif\>:\%(^\s*\)\@<=\<end\>\s\+\<if\>,' .
+    \ '\%(^\s*\)\@<=\<for\>:\%(^\s*\)\@<=\<next\>,' .
+    \ '\%(^\s*\)\@<=\<while\>:\%(^\s*\)\@<=\<wend\>,' .
+    \ '\%(^\s*\)\@<=\<do\>:\%(^\s*\)\@<=\<loop\>\s\+\<while\>,' .
+    \ '\%(^\s*\)\@<=\<select\>\s\+\<case\>:\%(^\s*\)\@<=\<case\>:\%(^\s*\)\@<=\<end\>\s\+\<select\>,' .
+    \ '\%(^\s*\)\@<=\<enum\>:\%(^\s*\)\@<=\<end\>\s\<enum\>,' .
+    \ '\%(^\s*\)\@<=\<with\>:\%(^\s*\)\@<=\<end\>\s\<with\>,' .
+    \ '\%(^\s*\)\@<=\%(\<\%(private\|public\)\>\s\+\)\=\<function\>\s\+\([^ \t(]\+\):\%(^\s*\)\@<=\<\1\>\s*=:\%(^\s*\)\@<=\<end\>\s\+\<function\>,' .
+    \ '\%(^\s*\)\@<=\%(\<\%(private\|public\)\>\s\+\)\=\<sub\>\s\+:\%(^\s*\)\@<=\<end\>\s\+\<sub\>'
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/heuristics.yaml b/heuristics.yaml
index 33c1c6906..8c0c16630 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -93,3 +93,11 @@ rules:
   pattern: '^>\s*--.*[Ii]dris ?1'
   filetype: lidris
 - filetype: lidris2
+---
+extensions: [bas]
+rules:
+- lines: 5
+  pattern: 'VB_Name|Begin VB\.(Form|MDIForm|UserControl)'
+  filetype: vb
+  ignore_case: true
+- filetype: basic
diff --git a/indent/vb.vim b/indent/vb.vim
new file mode 100644
index 000000000..129c2abde
--- /dev/null
+++ b/indent/vb.vim
@@ -0,0 +1,82 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
+
+" Vim indent file
+" Language:	VisualBasic (ft=vb) / Basic (ft=basic) / SaxBasic (ft=vb)
+" Author:	Johannes Zellner <johannes@zellner.org>
+" Last Change:	Fri, 18 Jun 2004 07:22:42 CEST
+"		Small update 2010 Jul 28 by Maxim Kim
+
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+setlocal autoindent
+setlocal indentexpr=VbGetIndent(v:lnum)
+setlocal indentkeys&
+setlocal indentkeys+==~else,=~elseif,=~end,=~wend,=~case,=~next,=~select,=~loop,<:>
+
+let b:undo_indent = "set ai< indentexpr< indentkeys<"
+
+" Only define the function once.
+if exists("*VbGetIndent")
+    finish
+endif
+
+fun! VbGetIndent(lnum)
+    " labels and preprocessor get zero indent immediately
+    let this_line = getline(a:lnum)
+    let LABELS_OR_PREPROC = '^\s*\(\<\k\+\>:\s*$\|#.*\)'
+    if this_line =~? LABELS_OR_PREPROC
+	return 0
+    endif
+
+    " Find a non-blank line above the current line.
+    " Skip over labels and preprocessor directives.
+    let lnum = a:lnum
+    while lnum > 0
+	let lnum = prevnonblank(lnum - 1)
+	let previous_line = getline(lnum)
+	if previous_line !~? LABELS_OR_PREPROC
+	    break
+	endif
+    endwhile
+
+    " Hit the start of the file, use zero indent.
+    if lnum == 0
+	return 0
+    endif
+
+    let ind = indent(lnum)
+
+    " Add
+    if previous_line =~? '^\s*\<\(begin\|\%(\%(private\|public\|friend\)\s\+\)\=\%(function\|sub\|property\)\|select\|case\|default\|if\|else\|elseif\|do\|for\|while\|enum\|with\)\>'
+	let ind = ind + shiftwidth()
+    endif
+
+    " Subtract
+    if this_line =~? '^\s*\<end\>\s\+\<select\>'
+	if previous_line !~? '^\s*\<select\>'
+	    let ind = ind - 2 * shiftwidth()
+	else
+	    " this case is for an empty 'select' -- 'end select'
+	    " (w/o any case statements) like:
+	    "
+	    " select case readwrite
+	    " end select
+	    let ind = ind - shiftwidth()
+	endif
+    elseif this_line =~? '^\s*\<\(end\|else\|elseif\|until\|loop\|next\|wend\)\>'
+	let ind = ind - shiftwidth()
+    elseif this_line =~? '^\s*\<\(case\|default\)\>'
+	if previous_line !~? '^\s*\<select\>'
+	    let ind = ind - shiftwidth()
+	endif
+    endif
+
+    return ind
+endfun
+
+" vim:sw=4
+
+endif
diff --git a/packages.yaml b/packages.yaml
index 0a8361b51..e167e0f10 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -348,14 +348,14 @@ filetypes:
   extra_extensions:
   # 17 results: https://github.com/search?q=extension%3Acoffeekup+html&type=Code
   - coffeekup
-  ignored_extensions:
+  ignored_filenames:
+  # Probably mistake
+  - '*Cakefile'
+  ignored_warnings:
   # Used by C#
   - csx
   # Used by Chuck
   - ck
-  ignored_filenames:
-  # Probably mistake
-  - '*Cakefile'
 - name: litcoffee
   linguist: Literate CoffeeScript
   extra_extensions:
@@ -395,7 +395,7 @@ filetypes:
   extra_extensions:
   - tsv
   - tab
-  ignored_extensions:
+  ignored_warnings:
   # This is definitely not csv-only, maybe re-enable when heuristics done
   - dat
 ---
@@ -815,8 +815,10 @@ filetypes:
   extra_extensions:
   - j2
   ignored_extensions:
-  - mustache
   - njk
+  ignore_warnings:
+  # handled by mustache plugin
+  - mustache
 ---
 name: jq
 remote: vito-c/jq.vim
@@ -857,8 +859,8 @@ filetypes:
   extra_extensions:
   - jst
   - ect
-  ignored_extensions:
-  # I haven't found reference to them
+  ignored_warnings:
+  # I haven't found reference to them on github
   - djs
   - hamljs
 ---
@@ -974,6 +976,7 @@ filetypes:
   ignored_extensions:
   # Handled by mdx extension
   - mdx
+  ignored_warnings:
   - '{md,mdx,mdown,mkd,mkdn,markdown,mdwn}.{des3,des,bf,bfa,aes,idea,cast,rc2,rc4,rc5,desx}'
 ---
 name: mdx
@@ -1551,9 +1554,9 @@ remote: lumiliet/vim-twig
 filetypes:
 - name: html.twig
   linguist: Twig
-  ignored_extensions:
+  ignored_warnings:
+  # handled by other extension
   - xml.twig
-  ignored_extensions:
   # already covered by .twig
   - html.twig
 - name: xml.twig
@@ -1721,3 +1724,26 @@ filetypes:
 - name: trasys
   extensions:
   - inp
+---
+name: basic
+remote: vim/vim:runtime
+glob: '**/basic.vim'
+filetypes:
+- name: basic
+  extensions:
+  - basic
+---
+name: visual-basic
+remote: vim/vim:runtime
+glob: '**/vb.vim'
+filetypes:
+- name: vb
+  linguist: VBA
+  extra_extensions:
+  - vbs
+  - dsm
+  - ctl
+  # SaxBasic is close to Visual Basic
+  - sba
+  ignore_warnings:
+  - vb
diff --git a/scripts/build b/scripts/build
index b868ebfc5..197b4ea3a 100755
--- a/scripts/build
+++ b/scripts/build
@@ -59,10 +59,15 @@ def load_data()
 
         linguist = languages.fetch(filetype["linguist"])
 
-        filetype["extensions"] = ((
-          (linguist["extensions"] || []).map { |e| e[1..-1] } |
+        filetype["extensions"] = (linguist["extensions"] || []).map { |e| e[1..-1] } |
           filetype.fetch("extra_extensions", [])
-        ) - filetype.fetch("ignored_extensions", [])).uniq
+
+        extra_ignored_extensions = filetype.fetch("ignored_extensions", []) - filetype["extensions"]
+        if extra_ignored_extensions.size > 0
+          raise StandardError.new("[#{filetype["name"]}]: Unnecessary ignored extensions: #{extra_ignored_extensions.join(", ")}") 
+        end
+
+        filetype["extensions"] -= filetype.fetch("ignored_extensions", [])
 
         filetype["filenames"] = ((
           (linguist["filenames"] || []) |
@@ -394,7 +399,19 @@ def generate_ftdetect(packages, heuristics)
   expected_filetypes = detect_filetypes('tmp/**/ftdetect/*.vim')
   native_filetypes = detect_filetypes('tmp/vim/vim/runtime/filetype.vim')
   native_extensions = native_filetypes.flat_map { |k, v| v["extensions"] }
+
+  all_filetypes = Hash.new { |h, k| h[k] = { extensions: [], filenames: [] } }
+
+  for k, v in expected_filetypes
+    all_filetypes[k][:extensions].concat(v[:extensions])
+    all_filetypes[k][:filenames].concat(v[:filenames])
+  end
   
+  for k, v in native_filetypes
+    all_filetypes[k][:extensions].concat(v[:extensions])
+    all_filetypes[k][:filenames].concat(v[:filenames])
+  end
+
   for package in packages
     name = package.fetch("name")
 
@@ -438,12 +455,16 @@ def generate_ftdetect(packages, heuristics)
       extensions = filetype["extensions"]
       filenames = filetype["filenames"]
 
-      if expected_filetypes[name] && !filetype["syntax"]
-        for e in expected_filetypes.fetch(name)[:extensions] - extensions - expand_all(filetype.fetch("ignored_extensions", []))
+      expected_extensions = all_filetypes.has_key?(name) ? all_filetypes.fetch(name)[:extensions] : []
+      ignored_extensions = expand_all(filetype.fetch("ignored_extensions", []))
+      ignored_warnings = expand_all(filetype.fetch("ignored_warnings", []))
+
+      if all_filetypes[name] && !filetype["syntax"]
+        for e in expected_extensions - extensions - ignored_extensions - ignored_warnings
           puts "Probable missing extension for #{name}: #{e}"
         end
 
-        for e in expected_filetypes.fetch(name)[:filenames] - expand_all(filenames).flat_map { |e| [e, e.gsub(/^\./, '')] } - expand_all(filetype.fetch("ignored_filenames", [])) - ['*']
+        for e in all_filetypes.fetch(name)[:filenames] - expand_all(filenames).flat_map { |e| [e, e.gsub(/^\./, '')] } - expand_all(filetype.fetch("ignored_warnings", [])) - ['*']
           puts "Probable missing filename for #{name}: #{e}"
         end
       end
diff --git a/scripts/test_extensions.vim b/scripts/test_extensions.vim
index 9211818d5..9cac0b21a 100644
--- a/scripts/test_extensions.vim
+++ b/scripts/test_extensions.vim
@@ -9,145 +9,145 @@ function! TestExtension(filetype, filename, content)
     exec ":bw!"
   catch
     echo g:message
-    echo 'Filename "' . a:filename  . '" does not resolve to extension "' . a:filetype . '"'
-    echo '  instead received: "' . v:exception . '"'
-    exec ':cq!'
+    echo "Filename '" . a:filename  . "' does not resolve to extension '" . a:filetype . "'"
+    echo "  instead received: '" . v:exception . "'"
+    exec ":cq!"
   endtry
 endfunction
 
-call TestExtension('sh', 'bash1', "#!/bin/bash")
-call TestExtension('sh', 'bash2', "#! /bin/bash")
-call TestExtension('sh', 'bash3', "#! /bin/bash2.3")
-call TestExtension('sh', 'bash4', "#!/usr/bin/env bash")
-call TestExtension('sh', 'bash6', "#!/usr/bin/env -i -=split-string foo=bar bash -l foo")
-call TestExtension('sh', 'bash1', "#!/bin/bash")
+call TestExtension("sh", "bash1", "#!/bin/bash")
+call TestExtension("sh", "bash2", "#! /bin/bash")
+call TestExtension("sh", "bash3", "#! /bin/bash2.3")
+call TestExtension("sh", "bash4", "#!/usr/bin/env bash")
+call TestExtension("sh", "bash6", "#!/usr/bin/env -i -=split-string foo=bar bash -l foo")
+call TestExtension("sh", "bash1", "#!/bin/bash")
 
 " Vim help file
-call TestExtension('help', $VIMRUNTIME . '/doc/foobar.txt', '')
+call TestExtension("help", $VIMRUNTIME . "/doc/foobar.txt", "")
 
 " Abaqus or Trasys
-call TestExtension('abaqus', 'foobar.inp', "*HEADING\nFoobar")
-call TestExtension('trasys', 'foobar.inp', "MSC PATRAN\n* foobar\nHEADER SURFACE DATA\nBSC ENCLO1")
+call TestExtension("abaqus", "foobar.inp", "*HEADING\nFoobar")
+call TestExtension("trasys", "foobar.inp", "MSC PATRAN\n* foobar\nHEADER SURFACE DATA\nBSC ENCLO1")
 
 " 8th (Firth-derivative)
-call TestExtension('8th', 'foobar.8th', '')
-call TestExtension('8th', 'foobar.8th', '')
+call TestExtension("8th", "foobar.8th", "")
+call TestExtension("8th", "foobar.8th", "")
 
 " A-A-P recipe
-call TestExtension('aap', 'foobar.aap', '')
+call TestExtension("aap", "foobar.aap", "")
 
 
 " A2ps printing utility
-call TestExtension('a2ps', '/etc/a2ps.cfg', '')
-call TestExtension('a2ps', '/usr/local/etc/a2ps.cfg', '')
-call TestExtension('a2ps', '/etc/a2ps/foobar.cfg', '')
-call TestExtension('a2ps', '/usr/local/etc/a2ps/foobar.cfg', '')
-call TestExtension('a2ps', '/tmp/a2psrc', '')
-call TestExtension('a2ps', '/tmp/.a2psrc', '')
+call TestExtension("a2ps", "/etc/a2ps.cfg", "")
+call TestExtension("a2ps", "/usr/local/etc/a2ps.cfg", "")
+call TestExtension("a2ps", "/etc/a2ps/foobar.cfg", "")
+call TestExtension("a2ps", "/usr/local/etc/a2ps/foobar.cfg", "")
+call TestExtension("a2ps", "/tmp/a2psrc", "")
+call TestExtension("a2ps", "/tmp/.a2psrc", "")
 
 " ABAB/4
-call TestExtension('abap', 'foobar.abap', '')
+call TestExtension("abap", "foobar.abap", "")
 
 " ABC music notation
-call TestExtension('abc', 'foobar.abc', '')
+call TestExtension("abc", "foobar.abc", "")
 
 " ABEL
-call TestExtension('abel', 'foobar.abl', '')
+call TestExtension("abel", "foobar.abl", "")
 
 " AceDB
-call TestExtension('acedb', 'foobar.wrm', '')
+call TestExtension("acedb", "foobar.wrm", "")
 
 " Ada (83, 9X, 95)
-call TestExtension('ada', 'foobar.adb', '')
-call TestExtension('ada', 'foobar.ads', '')
-call TestExtension('ada', 'foobar.ada', '')
-call TestExtension('ada', 'foobar.gpr', '')
+call TestExtension("ada", "foobar.adb", "")
+call TestExtension("ada", "foobar.ads", "")
+call TestExtension("ada", "foobar.ada", "")
+call TestExtension("ada", "foobar.gpr", "")
 
 " AHDL
-call TestExtension('ahdl', 'foobar.tdf', '')
+call TestExtension("ahdl", "foobar.tdf", "")
 
 " AIDL
-call TestExtension('aidl', 'foobar.aidl', '')
+call TestExtension("aidl", "foobar.aidl", "")
 
 " AMPL
-call TestExtension('ampl', 'foobar.run', '')
+call TestExtension("ampl", "foobar.run", "")
 
 " Ant
-call TestExtension('ant', 'build.xml', '')
+call TestExtension("ant", "build.xml", "")
 
 " Arduino
-call TestExtension('arduino', 'foobar.ino', '')
-call TestExtension('arduino', 'foobar.pde', '')
+call TestExtension("arduino", "foobar.ino", "")
+call TestExtension("arduino", "foobar.pde", "")
 
 " Apache config file
-call TestExtension('apache', '.htaccess', '')
-call TestExtension('apache', '/etc/httpd/foobar.conf', '')
-call TestExtension('apache', '/etc/apache2/sites-foobar/foobar.com', '')
-call TestExtension('apache', '/usr/local/etc/httpd/foobar.conf', '')
-call TestExtension('apache', '/usr/local/etc/apache2/sites-foobar/foobar.com', '')
+call TestExtension("apache", ".htaccess", "")
+call TestExtension("apache", "/etc/httpd/foobar.conf", "")
+call TestExtension("apache", "/etc/apache2/sites-foobar/foobar.com", "")
+call TestExtension("apache", "/usr/local/etc/httpd/foobar.conf", "")
+call TestExtension("apache", "/usr/local/etc/apache2/sites-foobar/foobar.com", "")
 
 " XA65 MOS6510 cross assembler
-call TestExtension('a65', 'foobar.a65', '')
+call TestExtension("a65", "foobar.a65", "")
 
 " Applescript
-call TestExtension('applescript', 'foobar.scpt', '')
+call TestExtension("applescript", "foobar.scpt", "")
 
 " Applix ELF
-call TestExtension('elf', 'foobar.am', '')
-call TestExtension('automake', 'Makefile.am', '')
-call TestExtension('automake', 'makefile.am', '')
+call TestExtension("elf", "foobar.am", "")
+call TestExtension("automake", "Makefile.am", "")
+call TestExtension("automake", "makefile.am", "")
 
 " ALSA configuration
-call TestExtension('alsaconf', '.asoundrc', '')
-call TestExtension('alsaconf', '/usr/share/alsa/alsa.conf', '')
-call TestExtension('alsaconf', '/media/foo/usr/share/alsa/alsa.conf', '')
-call TestExtension('alsaconf', '/etc/asound.conf', '')
-call TestExtension('alsaconf', '/media/foo/etc/asound.conf', '')
+call TestExtension("alsaconf", ".asoundrc", "")
+call TestExtension("alsaconf", "/usr/share/alsa/alsa.conf", "")
+call TestExtension("alsaconf", "/media/foo/usr/share/alsa/alsa.conf", "")
+call TestExtension("alsaconf", "/etc/asound.conf", "")
+call TestExtension("alsaconf", "/media/foo/etc/asound.conf", "")
 
 " Arc Macro Language
-call TestExtension('aml', 'foobar.aml', '')
+call TestExtension("aml", "foobar.aml", "")
 
 " APT config file
-call TestExtension('aptconf', 'apt.conf', '')
-call TestExtension('aptconf', '/root/.aptitude/config', '')
-call TestExtension('aptconf', '/etc/apt/apt.conf.d/foo_bar-12', '')
-call TestExtension('aptconf', '/etc/apt/apt.conf.d/foo_bar-12.conf', '')
-call TestExtension('', '/etc/apt/apt.conf.d/.gsdf', '')
+call TestExtension("aptconf", "apt.conf", "")
+call TestExtension("aptconf", "/root/.aptitude/config", "")
+call TestExtension("aptconf", "/etc/apt/apt.conf.d/foo_bar-12", "")
+call TestExtension("aptconf", "/etc/apt/apt.conf.d/foo_bar-12.conf", "")
+call TestExtension("", "/etc/apt/apt.conf.d/.gsdf", "")
 
 " Arch Inventory file
-call TestExtension('arch', '.arch-inventory', '')
-call TestExtension('arch', '=tagging-method', '')
+call TestExtension("arch", ".arch-inventory", "")
+call TestExtension("arch", "=tagging-method", "")
 
 " ART*Enterprise (formerly ART-IM)
-call TestExtension('art', 'foobar.art', '')
+call TestExtension("art", "foobar.art", "")
 
 " AsciiDoc
-call TestExtension('asciidoc', 'foobar.asciidoc', '')
-call TestExtension('asciidoc', 'foobar.adoc', '')
+call TestExtension("asciidoc", "foobar.asciidoc", "")
+call TestExtension("asciidoc", "foobar.adoc", "")
 
 " ASN.1
-call TestExtension('asn', 'foobar.asn', '')
-call TestExtension('asn', 'foobar.asn1', '')
+call TestExtension("asn", "foobar.asn", "")
+call TestExtension("asn", "foobar.asn1", "")
 
 " Active Server Pages (with Visual Basic Script)
-call TestExtension('aspvbs', 'foobar.asa', '')
-let g:filetype_asa = 'fizfuz'
-call TestExtension('fizfuz', 'foobar.asa', '')
+call TestExtension("aspvbs", "foobar.asa", "")
+let g:filetype_asa = "fizfuz"
+call TestExtension("fizfuz", "foobar.asa", "")
 
 " Active Server Pages (with Perl or Visual Basic Script)
-call TestExtension('aspvbs', 'vbs.asp', "")
-call TestExtension('aspperl', 'perl.asp', "<Job ID=\"DropFiles\">\n<script language=\"PerlScript\">\n</script>\n</Job>")
-let g:filetype_asp = 'fizfuz'
-call TestExtension('fizfuz', 'fizfuz.asp', '')
+call TestExtension("aspvbs", "vbs.asp", "")
+call TestExtension("aspperl", "perl.asp", "<Job ID=\"DropFiles\">\n<script language=\"PerlScript\">\n</script>\n</Job>")
+let g:filetype_asp = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.asp", "")
 
 
 " Grub (must be before catch *.lst)
-call TestExtension('grub', '/boot/grub/menu.lst', '')
-call TestExtension('grub', '/media/foobar/boot/grub/menu.lst', '')
-call TestExtension('grub', '/boot/grub/grub.conf', '')
-call TestExtension('grub', '/media/foobar/boot/grub/grub.conf', '')
-call TestExtension('grub', '/etc/grub.conf', '')
-call TestExtension('grub', '/media/foobar/etc/grub.conf', '')
+call TestExtension("grub", "/boot/grub/menu.lst", "")
+call TestExtension("grub", "/media/foobar/boot/grub/menu.lst", "")
+call TestExtension("grub", "/boot/grub/grub.conf", "")
+call TestExtension("grub", "/media/foobar/boot/grub/grub.conf", "")
+call TestExtension("grub", "/etc/grub.conf", "")
+call TestExtension("grub", "/media/foobar/etc/grub.conf", "")
 
 " Assembly (all kinds)
 " *.lst is not pure assembly, it has two extra columns (address, byte codes)
@@ -155,93 +155,105 @@ call TestExtension('grub', '/media/foobar/etc/grub.conf', '')
 au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call dist#ft#FTasm()
 
 " Macro (VAX)
-call TestExtension('vmasm', 'foobar.mar', '')
+call TestExtension("vmasm", "foobar.mar", "")
 
 " Atlas
-call TestExtension('atlas', 'foobar.atl', '')
-call TestExtension('atlas', 'foobar.as', '')
+call TestExtension("atlas", "foobar.atl", "")
+call TestExtension("atlas", "foobar.as", "")
 
 " Autoit v3
-call TestExtension('autoit', 'foobar.au3', '')
+call TestExtension("autoit", "foobar.au3", "")
 
 " Autohotkey
-call TestExtension('autohotkey', 'foobar.ahk', '')
+call TestExtension("autohotkey", "foobar.ahk", "")
 
 " Automake
-call TestExtension('automake', 'Makefile.am', '')
-call TestExtension('automake', 'makefile.am', '')
-call TestExtension('automake', 'GNUmakefile.am', '')
+call TestExtension("automake", "Makefile.am", "")
+call TestExtension("automake", "makefile.am", "")
+call TestExtension("automake", "GNUmakefile.am", "")
 
 " Autotest .at files are actually m4
-call TestExtension('m4', 'foobar.at', '')
+call TestExtension("m4", "foobar.at", "")
 
 " Avenue
-call TestExtension('ave', 'foobar.ave', '')
+call TestExtension("ave", "foobar.ave", "")
 
 " Awk
-call TestExtension('awk', 'foobar.awk', '')
+call TestExtension("awk", "foobar.awk", "")
 
 " vim-polyglot only
-call TestExtension('blade', 'test.blade.php', '')
-call TestExtension('yaml.ansible', 'playbook.yml', '')
-call TestExtension('yaml.ansible', 'host_vars/foobar', '')
-call TestExtension('yaml.ansible', 'handlers.foobar.yaml', '')
-call TestExtension('yaml.ansible', 'requirements.yaml', '')
-call TestExtension('ps1xml', 'foobar.ps1xml', '')
-call TestExtension('terraform', 'terraform.tf', '')
-
-call TestExtension('idris2', 'foobar.idr', '')
-call TestExtension('idris', 'foobar.idr', "pkgs : List String\npkgs = [\"NCurses\", \"Readline\"]")
-let g:filetype_idr = 'fizfuz'
-call TestExtension('fizfuz', 'fizfuz.idr', '')
+call TestExtension("blade", "test.blade.php", "")
+call TestExtension("yaml.ansible", "playbook.yml", "")
+call TestExtension("yaml.ansible", "host_vars/foobar", "")
+call TestExtension("yaml.ansible", "handlers.foobar.yaml", "")
+call TestExtension("yaml.ansible", "requirements.yaml", "")
+call TestExtension("ps1xml", "foobar.ps1xml", "")
+call TestExtension("terraform", "terraform.tf", "")
+
+call TestExtension("idris2", "foobar.idr", "")
+call TestExtension("idris", "foobar.idr", "pkgs : List String\npkgs = [\"NCurses\", \"Readline\"]")
+let g:filetype_idr = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.idr", "")
 
 " .m extension
-call TestExtension('octave', 'matlab.m', '')
-call TestExtension('objc', 'objc.m', "\n\n  #import <Foundation/Foundation.h>")
-call TestExtension('octave', 'objc.m', "results_ub_times=zeros(2,2,M);\n%results pour la lower bound")
-call TestExtension('mma', 'mathematica.m', "newcase[ \"00003\" ];\n  (* Hello world *)")
-call TestExtension('murphi', 'murphi.m', "type\n  square: 1 .. 9")
-call TestExtension('murphi', 'murphi.m', "something\n--foobar")
-call TestExtension('octave', 'percentcomment.m', "hello world\n%foobar")
-call TestExtension('objc', 'comment.m', "\n/* Hello world */")
-let g:filetype_m = 'fizfuz'
-call TestExtension('fizfuz', 'fizfuz.m', '')
+call TestExtension("octave", "matlab.m", "")
+call TestExtension("objc", "objc.m", "\n\n  #import <Foundation/Foundation.h>")
+call TestExtension("octave", "objc.m", "results_ub_times=zeros(2,2,M);\n%results pour la lower bound")
+call TestExtension("mma", "mathematica.m", "newcase[ \"00003\" ];\n  (* Hello world *)")
+call TestExtension("murphi", "murphi.m", "type\n  square: 1 .. 9")
+call TestExtension("murphi", "murphi.m", "something\n--foobar")
+call TestExtension("octave", "percentcomment.m", "hello world\n%foobar")
+call TestExtension("objc", "comment.m", "\n/* Hello world */")
+let g:filetype_m = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.m", "")
 
 " .fs extension
-call TestExtension('forth', 'empty.fs', '')
-call TestExtension('fsharp', 'fsharp.fs', "let myInt = 5")
-call TestExtension('glsl', 'glsl.fs', "//#version 120\nvoid main() {}")
-let g:filetype_fs = 'fizfuz'
-call TestExtension('fizfuz', 'fizfuz.fs', '')
+call TestExtension("forth", "empty.fs", "")
+call TestExtension("fsharp", "fsharp.fs", "let myInt = 5")
+call TestExtension("glsl", "glsl.fs", "//#version 120\nvoid main() {}")
+let g:filetype_fs = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.fs", "")
 
 " .re extension
-call TestExtension('reason', 'empty.re', '')
-call TestExtension('cpp', 'cpp.re', '#include "config.h"')
-call TestExtension('cpp', 'cpp2.re', '#ifdef HAVE_CONFIG_H')
-call TestExtension('cpp', 'cpp3.re', '#define YYCTYPE unsigned char')
-call TestExtension('reason', 'react.re', 'ReasonReact.Router.push("");')
+call TestExtension("reason", "empty.re", "")
+call TestExtension("cpp", "cpp.re", "#include \"config.h\"")
+call TestExtension("cpp", "cpp2.re", "#ifdef HAVE_CONFIG_H")
+call TestExtension("cpp", "cpp3.re", "#define YYCTYPE unsigned char")
+call TestExtension("reason", "react.re", "ReasonReact.Router.push('');")
+
+" .bas extension
+call TestExtension("vbnet", "vb.vb", "")
+call TestExtension("basic", "empty.bas", "")
+call TestExtension("vb", "vb1.bas", "Attribute VB_Name = \"Class1\"")
+call TestExtension("vb", "vb2.bas", "VERSION 5.00\nBegin VB.Form Form1")
+call TestExtension("vb", "vb2.bas", "VERSION 5.00\nBegin VB.Form Form1")
+call TestExtension("vb", "vb.sba", "")
+call TestExtension("vb", "vb.vbs", "")
+call TestExtension("vb", "vb.dsm", "")
+call TestExtension("vb", "vb.dsm", "")
+call TestExtension("vb", "vb.ctl", "")
 
 " Idris
-call TestExtension('idris', 'lowercase.idr', '--idris1')
-call TestExtension('idris', 'uppercase.idr', '--Idris1')
-call TestExtension('idris', 'start-space-l.idr', '-- idris1')
-call TestExtension('idris', 'start-space-u.idr', '-- Idris1')
-call TestExtension('idris', 'two-spaces-l.idr', '-- idris 1')
-call TestExtension('idris', 'two-spaces-u.idr', '-- Idris 1')
-"call TestExtension('idris', 'mypkg.ipkg', 'package mypkg\n\npkgs = pruviloj, lightyear')
-call TestExtension('idris', 'use-type-prov.idr', '%language TypeProviders')
-call TestExtension('idris', 'use-elab-refl.idr', '%language ElabReflection')
-call TestExtension('idris', 'access-modifier.idr', '%access export\n\npublic export\nMyTest : Type-> Type\n\nfact : Nat -> Nat')
-call TestExtension('idris2', 'lowercase.idr', '--idris2')
-call TestExtension('idris2', 'uppercase.idr', '--Idris2')
-call TestExtension('idris2', 'start-space-l.idr', '-- idris2')
-call TestExtension('idris2', 'start-space-u.idr', '-- Idris2')
-call TestExtension('idris2', 'two-spaces-l.idr', '-- idris 2')
-call TestExtension('idris2', 'two-spaces-u.idr', '-- Idris 2')
-call TestExtension('idris2', 'mypkg.ipkg', 'package mypkg\n\ndepends = effects')
-call TestExtension('idris2', 'use-post-proj.idr', '%language PostfixProjections')
+call TestExtension("idris", "lowercase.idr", "--idris1")
+call TestExtension("idris", "uppercase.idr", "--Idris1")
+call TestExtension("idris", "start-space-l.idr", "-- idris1")
+call TestExtension("idris", "start-space-u.idr", "-- Idris1")
+call TestExtension("idris", "two-spaces-l.idr", "-- idris 1")
+call TestExtension("idris", "two-spaces-u.idr", "-- Idris 1")
+"call TestExtension("idris", "mypkg.ipkg", "package mypkg\n\npkgs = pruviloj, lightyear")
+call TestExtension("idris", "use-type-prov.idr", "%language TypeProviders")
+call TestExtension("idris", "use-elab-refl.idr", "%language ElabReflection")
+call TestExtension("idris", "access-modifier.idr", "%access export\n\npublic export\nMyTest : Type-> Type\n\nfact : Nat -> Nat")
+call TestExtension("idris2", "lowercase.idr", "--idris2")
+call TestExtension("idris2", "uppercase.idr", "--Idris2")
+call TestExtension("idris2", "start-space-l.idr", "-- idris2")
+call TestExtension("idris2", "start-space-u.idr", "-- Idris2")
+call TestExtension("idris2", "two-spaces-l.idr", "-- idris 2")
+call TestExtension("idris2", "two-spaces-u.idr", "-- Idris 2")
+call TestExtension("idris2", "mypkg.ipkg", "package mypkg\n\ndepends = effects")
+call TestExtension("idris2", "use-post-proj.idr", "%language PostfixProjections")
 
 " Literate Idris
-call TestExtension('lidris', 'lidris-1.lidr', "Some test plaintext\n\n> --idris1\n> myfact : Nat -> Nat\n> myfact Z = 1\n> myfact (S k) = (S k) * myfact k\n\nMore plaintext")
-call TestExtension('lidris2', 'lidris-2.lidr', "Some test plaintext\n\n> --idris2\n> myfact : Nat -> Nat\n> myfact Z = 1\n> myfact (S k) = (S k) * myfact k\n\nMore plaintext")
+call TestExtension("lidris", "lidris-1.lidr", "Some test plaintext\n\n> --idris1\n> myfact : Nat -> Nat\n> myfact Z = 1\n> myfact (S k) = (S k) * myfact k\n\nMore plaintext")
+call TestExtension("lidris2", "lidris-2.lidr", "Some test plaintext\n\n> --idris2\n> myfact : Nat -> Nat\n> myfact Z = 1\n> myfact (S k) = (S k) * myfact k\n\nMore plaintext")
 
diff --git a/scripts/test_filetypes.vim b/scripts/test_filetypes.vim
index 0f870d5a2..e157889d8 100644
--- a/scripts/test_filetypes.vim
+++ b/scripts/test_filetypes.vim
@@ -228,3 +228,5 @@ call TestFiletype('zephir')
 call TestFiletype('zir')
 call TestFiletype('zig')
 call TestFiletype('trasys')
+call TestFiletype('basic')
+call TestFiletype('vb')
diff --git a/syntax/basic.vim b/syntax/basic.vim
new file mode 100644
index 000000000..f2aa1bc44
--- /dev/null
+++ b/syntax/basic.vim
@@ -0,0 +1,170 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'basic') == -1
+
+" Vim syntax file
+" Language:	BASIC
+" Maintainer:	Allan Kelly <allan@fruitloaf.co.uk>
+" Last Change:  2011 Dec 25 by Thilo Six
+
+" First version based on Micro$soft QBASIC circa 1989, as documented in
+" 'Learn BASIC Now' by Halvorson&Rygmyr. Microsoft Press 1989.
+" This syntax file not a complete implementation yet.  Send suggestions to the
+" maintainer.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" A bunch of useful BASIC keywords
+syn keyword basicStatement	BEEP beep Beep BLOAD bload Bload BSAVE bsave Bsave
+syn keyword basicStatement	CALL call Call ABSOLUTE absolute Absolute
+syn keyword basicStatement	CHAIN chain Chain CHDIR chdir Chdir
+syn keyword basicStatement	CIRCLE circle Circle CLEAR clear Clear
+syn keyword basicStatement	CLOSE close Close CLS cls Cls COLOR color Color
+syn keyword basicStatement	COM com Com COMMON common Common
+syn keyword basicStatement	CONST const Const DATA data Data
+syn keyword basicStatement	DECLARE declare Declare DEF def Def
+syn keyword basicStatement	DEFDBL defdbl Defdbl DEFINT defint Defint
+syn keyword basicStatement	DEFLNG deflng Deflng DEFSNG defsng Defsng
+syn keyword basicStatement	DEFSTR defstr Defstr DIM dim Dim
+syn keyword basicStatement	DO do Do LOOP loop Loop
+syn keyword basicStatement	DRAW draw Draw END end End
+syn keyword basicStatement	ENVIRON environ Environ ERASE erase Erase
+syn keyword basicStatement	ERROR error Error EXIT exit Exit
+syn keyword basicStatement	FIELD field Field FILES files Files
+syn keyword basicStatement	FOR for For NEXT next Next
+syn keyword basicStatement	FUNCTION function Function GET get Get
+syn keyword basicStatement	GOSUB gosub Gosub GOTO goto Goto
+syn keyword basicStatement	IF if If THEN then Then ELSE else Else
+syn keyword basicStatement	INPUT input Input INPUT# input# Input#
+syn keyword basicStatement	IOCTL ioctl Ioctl KEY key Key
+syn keyword basicStatement	KILL kill Kill LET let Let
+syn keyword basicStatement	LINE line Line LOCATE locate Locate
+syn keyword basicStatement	LOCK lock Lock UNLOCK unlock Unlock
+syn keyword basicStatement	LPRINT lprint Lprint USING using Using
+syn keyword basicStatement	LSET lset Lset MKDIR mkdir Mkdir
+syn keyword basicStatement	NAME name Name ON on On
+syn keyword basicStatement	ERROR error Error OPEN open Open
+syn keyword basicStatement	OPTION option Option BASE base Base
+syn keyword basicStatement	OUT out Out PAINT paint Paint
+syn keyword basicStatement	PALETTE palette Palette PCOPY pcopy Pcopy
+syn keyword basicStatement	PEN pen Pen PLAY play Play
+syn keyword basicStatement	PMAP pmap Pmap POKE poke Poke
+syn keyword basicStatement	PRESET preset Preset PRINT print Print
+syn keyword basicStatement	PRINT# print# Print# USING using Using
+syn keyword basicStatement	PSET pset Pset PUT put Put
+syn keyword basicStatement	RANDOMIZE randomize Randomize READ read Read
+syn keyword basicStatement	REDIM redim Redim RESET reset Reset
+syn keyword basicStatement	RESTORE restore Restore RESUME resume Resume
+syn keyword basicStatement	RETURN return Return RMDIR rmdir Rmdir
+syn keyword basicStatement	RSET rset Rset RUN run Run
+syn keyword basicStatement	SEEK seek Seek SELECT select Select
+syn keyword basicStatement	CASE case Case SHARED shared Shared
+syn keyword basicStatement	SHELL shell Shell SLEEP sleep Sleep
+syn keyword basicStatement	SOUND sound Sound STATIC static Static
+syn keyword basicStatement	STOP stop Stop STRIG strig Strig
+syn keyword basicStatement	SUB sub Sub SWAP swap Swap
+syn keyword basicStatement	SYSTEM system System TIMER timer Timer
+syn keyword basicStatement	TROFF troff Troff TRON tron Tron
+syn keyword basicStatement	TYPE type Type UNLOCK unlock Unlock
+syn keyword basicStatement	VIEW view View WAIT wait Wait
+syn keyword basicStatement	WHILE while While WEND wend Wend
+syn keyword basicStatement	WIDTH width Width WINDOW window Window
+syn keyword basicStatement	WRITE write Write DATE$ date$ Date$
+syn keyword basicStatement	MID$ mid$ Mid$ TIME$ time$ Time$
+
+syn keyword basicFunction	ABS abs Abs ASC asc Asc
+syn keyword basicFunction	ATN atn Atn CDBL cdbl Cdbl
+syn keyword basicFunction	CINT cint Cint CLNG clng Clng
+syn keyword basicFunction	COS cos Cos CSNG csng Csng
+syn keyword basicFunction	CSRLIN csrlin Csrlin CVD cvd Cvd
+syn keyword basicFunction	CVDMBF cvdmbf Cvdmbf CVI cvi Cvi
+syn keyword basicFunction	CVL cvl Cvl CVS cvs Cvs
+syn keyword basicFunction	CVSMBF cvsmbf Cvsmbf EOF eof Eof
+syn keyword basicFunction	ERDEV erdev Erdev ERL erl Erl
+syn keyword basicFunction	ERR err Err EXP exp Exp
+syn keyword basicFunction	FILEATTR fileattr Fileattr FIX fix Fix
+syn keyword basicFunction	FRE fre Fre FREEFILE freefile Freefile
+syn keyword basicFunction	INP inp Inp INSTR instr Instr
+syn keyword basicFunction	INT int Int LBOUND lbound Lbound
+syn keyword basicFunction	LEN len Len LOC loc Loc
+syn keyword basicFunction	LOF lof Lof LOG log Log
+syn keyword basicFunction	LPOS lpos Lpos PEEK peek Peek
+syn keyword basicFunction	PEN pen Pen POINT point Point
+syn keyword basicFunction	POS pos Pos RND rnd Rnd
+syn keyword basicFunction	SADD sadd Sadd SCREEN screen Screen
+syn keyword basicFunction	SEEK seek Seek SETMEM setmem Setmem
+syn keyword basicFunction	SGN sgn Sgn SIN sin Sin
+syn keyword basicFunction	SPC spc Spc SQR sqr Sqr
+syn keyword basicFunction	STICK stick Stick STRIG strig Strig
+syn keyword basicFunction	TAB tab Tab TAN tan Tan
+syn keyword basicFunction	UBOUND ubound Ubound VAL val Val
+syn keyword basicFunction	VALPTR valptr Valptr VALSEG valseg Valseg
+syn keyword basicFunction	VARPTR varptr Varptr VARSEG varseg Varseg
+syn keyword basicFunction	CHR$ Chr$ chr$ COMMAND$ command$ Command$
+syn keyword basicFunction	DATE$ date$ Date$ ENVIRON$ environ$ Environ$
+syn keyword basicFunction	ERDEV$ erdev$ Erdev$ HEX$ hex$ Hex$
+syn keyword basicFunction	INKEY$ inkey$ Inkey$ INPUT$ input$ Input$
+syn keyword basicFunction	IOCTL$ ioctl$ Ioctl$ LCASES$ lcases$ Lcases$
+syn keyword basicFunction	LAFT$ laft$ Laft$ LTRIM$ ltrim$ Ltrim$
+syn keyword basicFunction	MID$ mid$ Mid$ MKDMBF$ mkdmbf$ Mkdmbf$
+syn keyword basicFunction	MKD$ mkd$ Mkd$ MKI$ mki$ Mki$
+syn keyword basicFunction	MKL$ mkl$ Mkl$ MKSMBF$ mksmbf$ Mksmbf$
+syn keyword basicFunction	MKS$ mks$ Mks$ OCT$ oct$ Oct$
+syn keyword basicFunction	RIGHT$ right$ Right$ RTRIM$ rtrim$ Rtrim$
+syn keyword basicFunction	SPACE$ space$ Space$ STR$ str$ Str$
+syn keyword basicFunction	STRING$ string$ String$ TIME$ time$ Time$
+syn keyword basicFunction	UCASE$ ucase$ Ucase$ VARPTR$ varptr$ Varptr$
+syn keyword basicTodo contained	TODO
+
+"integer number, or floating point number without a dot.
+syn match  basicNumber		"\<\d\+\>"
+"floating point number, with dot
+syn match  basicNumber		"\<\d\+\.\d*\>"
+"floating point number, starting with a dot
+syn match  basicNumber		"\.\d\+\>"
+
+" String and Character contstants
+syn match   basicSpecial contained "\\\d\d\d\|\\."
+syn region  basicString		  start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=basicSpecial
+
+syn region  basicComment	start="REM" end="$" contains=basicTodo
+syn region  basicComment	start="^[ \t]*'" end="$" contains=basicTodo
+syn region  basicLineNumber	start="^\d" end="\s"
+syn match   basicTypeSpecifier  "[a-zA-Z0-9][\$%&!#]"ms=s+1
+" Used with OPEN statement
+syn match   basicFilenumber  "#\d\+"
+"syn sync ccomment basicComment
+" syn match   basicMathsOperator "[<>+\*^/\\=-]"
+syn match   basicMathsOperator   "-\|=\|[:<>+\*^/\\]\|AND\|OR"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link basicLabel		Label
+hi def link basicConditional	Conditional
+hi def link basicRepeat		Repeat
+hi def link basicLineNumber	Comment
+hi def link basicNumber		Number
+hi def link basicError		Error
+hi def link basicStatement	Statement
+hi def link basicString		String
+hi def link basicComment		Comment
+hi def link basicSpecial		Special
+hi def link basicTodo		Todo
+hi def link basicFunction		Identifier
+hi def link basicTypeSpecifier Type
+hi def link basicFilenumber basicTypeSpecifier
+"hi basicMathsOperator term=bold cterm=bold gui=bold
+
+
+let b:current_syntax = "basic"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/vb.vim b/syntax/vb.vim
new file mode 100644
index 000000000..04e171ca2
--- /dev/null
+++ b/syntax/vb.vim
@@ -0,0 +1,369 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
+
+" Vim syntax file
+" Language:	Visual Basic
+" Maintainer:	Tim Chase <vb.vim@tim.thechases.com>
+" Former Maintainer:	Robert M. Cortopassi <cortopar@mindspring.com>
+"	(tried multiple times to contact, but email bounced)
+" Last Change:
+"   2005 May 25  Synched with work by Thomas Barthel
+"   2004 May 30  Added a few keywords
+
+" This was thrown together after seeing numerous requests on the
+" VIM and VIM-DEV mailing lists.  It is by no means complete.
+" Send comments, suggestions and requests to the maintainer.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+" VB is case insensitive
+syn case ignore
+
+syn keyword vbConditional If Then ElseIf Else Select Case
+
+syn keyword vbOperator AddressOf And ByRef ByVal Eqv Imp In
+syn keyword vbOperator Is Like Mod Not Or To Xor
+
+syn match vbOperator "[()+.,\-/*=&]"
+syn match vbOperator "[<>]=\="
+syn match vbOperator "<>"
+syn match vbOperator "\s\+_$"
+
+syn keyword vbBoolean  True False
+syn keyword vbConst Null Nothing
+
+syn keyword vbRepeat Do For ForEach Loop Next
+syn keyword vbRepeat Step To Until Wend While
+
+syn keyword vbEvents AccessKeyPress Activate ActiveRowChanged
+syn keyword vbEvents AfterAddFile AfterChangeFileName AfterCloseFile
+syn keyword vbEvents AfterColEdit AfterColUpdate AfterDelete
+syn keyword vbEvents AfterInsert AfterLabelEdit AfterRemoveFile
+syn keyword vbEvents AfterUpdate AfterWriteFile AmbientChanged
+syn keyword vbEvents ApplyChanges Associate AsyncProgress
+syn keyword vbEvents AsyncReadComplete AsyncReadProgress AxisActivated
+syn keyword vbEvents AxisLabelActivated AxisLabelSelected
+syn keyword vbEvents AxisLabelUpdated AxisSelected AxisTitleActivated
+syn keyword vbEvents AxisTitleSelected AxisTitleUpdated AxisUpdated
+syn keyword vbEvents BeforeClick BeforeColEdit BeforeColUpdate
+syn keyword vbEvents BeforeConnect BeforeDelete BeforeInsert
+syn keyword vbEvents BeforeLabelEdit BeforeLoadFile BeforeUpdate
+syn keyword vbEvents BeginRequest BeginTrans ButtonClick
+syn keyword vbEvents ButtonCompleted ButtonDropDown ButtonGotFocus
+syn keyword vbEvents ButtonLostFocus CallbackKeyDown Change Changed
+syn keyword vbEvents ChartActivated ChartSelected ChartUpdated Click
+syn keyword vbEvents Close CloseQuery CloseUp ColEdit ColResize
+syn keyword vbEvents Collapse ColumnClick CommitTrans Compare
+syn keyword vbEvents ConfigChageCancelled ConfigChanged
+syn keyword vbEvents ConfigChangedCancelled Connect ConnectionRequest
+syn keyword vbEvents CurrentRecordChanged DECommandAdded
+syn keyword vbEvents DECommandPropertyChanged DECommandRemoved
+syn keyword vbEvents DEConnectionAdded DEConnectionPropertyChanged
+syn keyword vbEvents DEConnectionRemoved DataArrival DataChanged
+syn keyword vbEvents DataUpdated DateClicked DblClick Deactivate
+syn keyword vbEvents DevModeChange DeviceArrival DeviceOtherEvent
+syn keyword vbEvents DeviceQueryRemove DeviceQueryRemoveFailed
+syn keyword vbEvents DeviceRemoveComplete DeviceRemovePending
+syn keyword vbEvents Disconnect DisplayChanged Dissociate
+syn keyword vbEvents DoGetNewFileName Done DonePainting DownClick
+syn keyword vbEvents DragDrop DragOver DropDown EditProperty EditQuery
+syn keyword vbEvents EndRequest EnterCell EnterFocus ExitFocus Expand
+syn keyword vbEvents FontChanged FootnoteActivated FootnoteSelected
+syn keyword vbEvents FootnoteUpdated Format FormatSize GotFocus
+syn keyword vbEvents HeadClick HeightChanged Hide InfoMessage
+syn keyword vbEvents IniProperties InitProperties Initialize
+syn keyword vbEvents ItemActivated ItemAdded ItemCheck ItemClick
+syn keyword vbEvents ItemReloaded ItemRemoved ItemRenamed
+syn keyword vbEvents ItemSeletected KeyDown KeyPress KeyUp LeaveCell
+syn keyword vbEvents LegendActivated LegendSelected LegendUpdated
+syn keyword vbEvents LinkClose LinkError LinkExecute LinkNotify
+syn keyword vbEvents LinkOpen Load LostFocus MouseDown MouseMove
+syn keyword vbEvents MouseUp NodeCheck NodeClick OLECompleteDrag
+syn keyword vbEvents OLEDragDrop OLEDragOver OLEGiveFeedback OLESetData
+syn keyword vbEvents OLEStartDrag ObjectEvent ObjectMove OnAddNew
+syn keyword vbEvents OnComm Paint PanelClick PanelDblClick PathChange
+syn keyword vbEvents PatternChange PlotActivated PlotSelected
+syn keyword vbEvents PlotUpdated PointActivated PointLabelActivated
+syn keyword vbEvents PointLabelSelected PointLabelUpdated PointSelected
+syn keyword vbEvents PointUpdated PowerQuerySuspend PowerResume
+syn keyword vbEvents PowerStatusChanged PowerSuspend ProcessTag
+syn keyword vbEvents ProcessingTimeout QueryChangeConfig QueryClose
+syn keyword vbEvents QueryComplete QueryCompleted QueryTimeout
+syn keyword vbEvents QueryUnload ReadProperties RepeatedControlLoaded
+syn keyword vbEvents RepeatedControlUnloaded Reposition
+syn keyword vbEvents RequestChangeFileName RequestWriteFile Resize
+syn keyword vbEvents ResultsChanged RetainedProject RollbackTrans
+syn keyword vbEvents RowColChange RowCurrencyChange RowResize
+syn keyword vbEvents RowStatusChanged Scroll SelChange SelectionChanged
+syn keyword vbEvents SendComplete SendProgress SeriesActivated
+syn keyword vbEvents SeriesSelected SeriesUpdated SettingChanged Show
+syn keyword vbEvents SplitChange Start StateChanged StatusUpdate
+syn keyword vbEvents SysColorsChanged Terminate TimeChanged Timer
+syn keyword vbEvents TitleActivated TitleSelected TitleUpdated
+syn keyword vbEvents UnboundAddData UnboundDeleteRow
+syn keyword vbEvents UnboundGetRelativeBookmark UnboundReadData
+syn keyword vbEvents UnboundWriteData Unformat Unload UpClick Updated
+syn keyword vbEvents UserEvent Validate ValidationError
+syn keyword vbEvents VisibleRecordChanged WillAssociate WillChangeData
+syn keyword vbEvents WillDissociate WillExecute WillUpdateRows
+syn keyword vbEvents WriteProperties
+
+
+syn keyword vbFunction Abs Array Asc AscB AscW Atn Avg BOF CBool CByte
+syn keyword vbFunction CCur CDate CDbl CInt CLng CSng CStr CVDate CVErr
+syn keyword vbFunction CVar CallByName Cdec Choose Chr ChrB ChrW Command
+syn keyword vbFunction Cos Count CreateObject CurDir DDB Date DateAdd
+syn keyword vbFunction DateDiff DatePart DateSerial DateValue Day Dir
+syn keyword vbFunction DoEvents EOF Environ Error Exp FV FileAttr
+syn keyword vbFunction FileDateTime FileLen FilterFix Fix Format
+syn keyword vbFunction FormatCurrency FormatDateTime FormatNumber
+syn keyword vbFunction FormatPercent FreeFile GetAllStrings GetAttr
+syn keyword vbFunction GetAutoServerSettings GetObject GetSetting Hex
+syn keyword vbFunction Hour IIf IMEStatus IPmt InStr Input InputB
+syn keyword vbFunction InputBox InstrB Int IsArray IsDate IsEmpty IsError
+syn keyword vbFunction IsMissing IsNull IsNumeric IsObject Join LBound
+syn keyword vbFunction LCase LOF LTrim Left LeftB Len LenB LoadPicture
+syn keyword vbFunction LoadResData LoadResPicture LoadResString Loc Log
+syn keyword vbFunction MIRR Max Mid MidB Min Minute Month MonthName
+syn keyword vbFunction MsgBox NPV NPer Now Oct PPmt PV Partition Pmt
+syn keyword vbFunction QBColor RGB RTrim Rate Replace Right RightB Rnd
+syn keyword vbFunction Round SLN SYD Second Seek Sgn Shell Sin Space Spc
+syn keyword vbFunction Split Sqr StDev StDevP Str StrComp StrConv
+syn keyword vbFunction StrReverse String Sum Switch Tab Tan Time
+syn keyword vbFunction TimeSerial TimeValue Timer Trim TypeName UBound
+syn keyword vbFunction UCase Val Var VarP VarType Weekday WeekdayName
+syn keyword vbFunction Year
+
+syn keyword vbMethods AboutBox Accept Activate Add AddCustom AddFile
+syn keyword vbMethods AddFromFile AddFromGuid AddFromString
+syn keyword vbMethods AddFromTemplate AddItem AddNew AddToAddInToolbar
+syn keyword vbMethods AddToolboxProgID Append AppendAppendChunk
+syn keyword vbMethods AppendChunk Arrange Assert AsyncRead BatchUpdate
+syn keyword vbMethods BeginQueryEdit BeginTrans Bind BuildPath
+syn keyword vbMethods CanPropertyChange Cancel CancelAsyncRead
+syn keyword vbMethods CancelBatch CancelUpdate CaptureImage CellText
+syn keyword vbMethods CellValue Circle Clear ClearFields ClearSel
+syn keyword vbMethods ClearSelCols ClearStructure Clone Close Cls
+syn keyword vbMethods ColContaining CollapseAll ColumnSize CommitTrans
+syn keyword vbMethods CompactDatabase Compose Connect Copy CopyFile
+syn keyword vbMethods CopyFolder CopyQueryDef Count CreateDatabase
+syn keyword vbMethods CreateDragImage CreateEmbed CreateField
+syn keyword vbMethods CreateFolder CreateGroup CreateIndex CreateLink
+syn keyword vbMethods CreatePreparedStatement CreatePropery CreateQuery
+syn keyword vbMethods CreateQueryDef CreateRelation CreateTableDef
+syn keyword vbMethods CreateTextFile CreateToolWindow CreateUser
+syn keyword vbMethods CreateWorkspace Customize Cut Delete
+syn keyword vbMethods DeleteColumnLabels DeleteColumns DeleteFile
+syn keyword vbMethods DeleteFolder DeleteLines DeleteRowLabels
+syn keyword vbMethods DeleteRows DeselectAll DesignerWindow DoVerb Drag
+syn keyword vbMethods Draw DriveExists Edit EditCopy EditPaste EndDoc
+syn keyword vbMethods EnsureVisible EstablishConnection Execute Exists
+syn keyword vbMethods Expand Export ExportReport ExtractIcon Fetch
+syn keyword vbMethods FetchVerbs FileExists Files FillCache Find
+syn keyword vbMethods FindFirst FindItem FindLast FindNext FindPrevious
+syn keyword vbMethods FolderExists Forward GetAbsolutePathName
+syn keyword vbMethods GetBaseName GetBookmark GetChunk GetClipString
+syn keyword vbMethods GetData GetDrive GetDriveName GetFile GetFileName
+syn keyword vbMethods GetFirstVisible GetFolder GetFormat GetHeader
+syn keyword vbMethods GetLineFromChar GetNumTicks GetParentFolderName
+syn keyword vbMethods GetRows GetSelectedPart GetSelection
+syn keyword vbMethods GetSpecialFolder GetTempName GetText
+syn keyword vbMethods GetVisibleCount GoBack GoForward Hide HitTest
+syn keyword vbMethods HoldFields Idle Import InitializeLabels Insert
+syn keyword vbMethods InsertColumnLabels InsertColumns InsertFile
+syn keyword vbMethods InsertLines InsertObjDlg InsertRowLabels
+syn keyword vbMethods InsertRows Item Keys KillDoc Layout Line Lines
+syn keyword vbMethods LinkExecute LinkPoke LinkRequest LinkSend Listen
+syn keyword vbMethods LoadFile LoadResData LoadResPicture LoadResString
+syn keyword vbMethods LogEvent MakeCompileFile MakeCompiledFile
+syn keyword vbMethods MakeReplica MoreResults Move MoveData MoveFile
+syn keyword vbMethods MoveFirst MoveFolder MoveLast MoveNext
+syn keyword vbMethods MovePrevious NavigateTo NewPage NewPassword
+syn keyword vbMethods NextRecordset OLEDrag OnAddinsUpdate OnConnection
+syn keyword vbMethods OnDisconnection OnStartupComplete Open
+syn keyword vbMethods OpenAsTextStream OpenConnection OpenDatabase
+syn keyword vbMethods OpenQueryDef OpenRecordset OpenResultset OpenURL
+syn keyword vbMethods Overlay PSet PaintPicture PastSpecialDlg Paste
+syn keyword vbMethods PeekData Play Point PopulatePartial PopupMenu
+syn keyword vbMethods Print PrintForm PrintReport PropertyChanged Quit
+syn keyword vbMethods Raise RandomDataFill RandomFillColumns
+syn keyword vbMethods RandomFillRows ReFill Read ReadAll ReadFromFile
+syn keyword vbMethods ReadLine ReadProperty Rebind Refresh RefreshLink
+syn keyword vbMethods RegisterDatabase ReleaseInstance Reload Remove
+syn keyword vbMethods RemoveAddInFromToolbar RemoveAll RemoveItem Render
+syn keyword vbMethods RepairDatabase ReplaceLine Reply ReplyAll Requery
+syn keyword vbMethods ResetCustom ResetCustomLabel ResolveName
+syn keyword vbMethods RestoreToolbar Resync Rollback RollbackTrans
+syn keyword vbMethods RowBookmark RowContaining RowTop Save SaveAs
+syn keyword vbMethods SaveFile SaveToFile SaveToOle1File SaveToolbar
+syn keyword vbMethods Scale ScaleX ScaleY Scroll SelPrint SelectAll
+syn keyword vbMethods SelectPart Send SendData Set SetAutoServerSettings
+syn keyword vbMethods SetData SetFocus SetOption SetSelection SetSize
+syn keyword vbMethods SetText SetViewport Show ShowColor ShowFont
+syn keyword vbMethods ShowHelp ShowOpen ShowPrinter ShowSave
+syn keyword vbMethods ShowWhatsThis SignOff SignOn Size Skip SkipLine
+syn keyword vbMethods Span Split SplitContaining StartLabelEdit
+syn keyword vbMethods StartLogging Stop Synchronize Tag TextHeight
+syn keyword vbMethods TextWidth ToDefaults Trace TwipsToChartPart
+syn keyword vbMethods TypeByChartType URLFor Update UpdateControls
+syn keyword vbMethods UpdateRecord UpdateRow Upto ValidateControls Value
+syn keyword vbMethods WhatsThisMode Write WriteBlankLines WriteLine
+syn keyword vbMethods WriteProperty WriteTemplate ZOrder
+syn keyword vbMethods rdoCreateEnvironment rdoRegisterDataSource
+
+syn keyword vbStatement Alias AppActivate As Base Beep Begin Call ChDir
+syn keyword vbStatement ChDrive Close Const Date Declare DefBool DefByte
+syn keyword vbStatement DefCur DefDate DefDbl DefDec DefInt DefLng DefObj
+syn keyword vbStatement DefSng DefStr DefVar Deftype DeleteSetting Dim Do
+syn keyword vbStatement Each ElseIf End Enum Erase Error Event Exit
+syn keyword vbStatement Explicit FileCopy For ForEach Function Get GoSub
+syn keyword vbStatement GoTo Gosub Implements Kill LSet Let Lib LineInput
+syn keyword vbStatement Load Lock Loop Mid MkDir Name Next On OnError Open
+syn keyword vbStatement Option Preserve Private Property Public Put RSet
+syn keyword vbStatement RaiseEvent Randomize ReDim Redim Reset Resume
+syn keyword vbStatement Return RmDir SavePicture SaveSetting Seek SendKeys
+syn keyword vbStatement Sendkeys Set SetAttr Static Step Stop Sub Time
+syn keyword vbStatement Type Unload Unlock Until Wend While Width With
+syn keyword vbStatement Write
+
+syn keyword vbKeyword As Binary ByRef ByVal Date Empty Error Friend Get
+syn keyword vbKeyword Input Is Len Lock Me Mid New Nothing Null On
+syn keyword vbKeyword Option Optional ParamArray Print Private Property
+syn keyword vbKeyword Public PublicNotCreateable OnNewProcessSingleUse
+syn keyword vbKeyword InSameProcessMultiUse GlobalMultiUse Resume Seek
+syn keyword vbKeyword Set Static Step String Time WithEvents
+
+syn keyword vbTodo contained	TODO
+
+"Datatypes
+syn keyword vbTypes Boolean Byte Currency Date Decimal Double Empty
+syn keyword vbTypes Integer Long Object Single String Variant
+
+"VB defined values
+syn keyword vbDefine dbBigInt dbBinary dbBoolean dbByte dbChar
+syn keyword vbDefine dbCurrency dbDate dbDecimal dbDouble dbFloat
+syn keyword vbDefine dbGUID dbInteger dbLong dbLongBinary dbMemo
+syn keyword vbDefine dbNumeric dbSingle dbText dbTime dbTimeStamp
+syn keyword vbDefine dbVarBinary
+
+"VB defined values
+syn keyword vbDefine vb3DDKShadow vb3DFace vb3DHighlight vb3DLight
+syn keyword vbDefine vb3DShadow vbAbort vbAbortRetryIgnore
+syn keyword vbDefine vbActiveBorder vbActiveTitleBar vbAlias
+syn keyword vbDefine vbApplicationModal vbApplicationWorkspace
+syn keyword vbDefine vbAppTaskManager vbAppWindows vbArchive vbArray
+syn keyword vbDefine vbBack vbBinaryCompare vbBlack vbBlue vbBoolean
+syn keyword vbDefine vbButtonFace vbButtonShadow vbButtonText vbByte
+syn keyword vbDefine vbCalGreg vbCalHijri vbCancel vbCr vbCritical
+syn keyword vbDefine vbCrLf vbCurrency vbCyan vbDatabaseCompare
+syn keyword vbDefine vbDataObject vbDate vbDecimal vbDefaultButton1
+syn keyword vbDefine vbDefaultButton2 vbDefaultButton3 vbDefaultButton4
+syn keyword vbDefine vbDesktop vbDirectory vbDouble vbEmpty vbError
+syn keyword vbDefine vbExclamation vbFirstFourDays vbFirstFullWeek
+syn keyword vbDefine vbFirstJan1 vbFormCode vbFormControlMenu
+syn keyword vbDefine vbFormFeed vbFormMDIForm vbFriday vbFromUnicode
+syn keyword vbDefine vbGrayText vbGreen vbHidden vbHide vbHighlight
+syn keyword vbDefine vbHighlightText vbHiragana vbIgnore vbIMEAlphaDbl
+syn keyword vbDefine vbIMEAlphaSng vbIMEDisable vbIMEHiragana
+syn keyword vbDefine vbIMEKatakanaDbl vbIMEKatakanaSng vbIMEModeAlpha
+syn keyword vbDefine vbIMEModeAlphaFull vbIMEModeDisable
+syn keyword vbDefine vbIMEModeHangul vbIMEModeHangulFull
+syn keyword vbDefine vbIMEModeHiragana vbIMEModeKatakana
+syn keyword vbDefine vbIMEModeKatakanaHalf vbIMEModeNoControl
+syn keyword vbDefine vbIMEModeOff vbIMEModeOn vbIMENoOp vbIMEOff
+syn keyword vbDefine vbIMEOn vbInactiveBorder vbInactiveCaptionText
+syn keyword vbDefine vbInactiveTitleBar vbInfoBackground vbInformation
+syn keyword vbDefine vbInfoText vbInteger vbKatakana vbKey0 vbKey1
+syn keyword vbDefine vbKey2 vbKey3 vbKey4 vbKey5 vbKey6 vbKey7 vbKey8
+syn keyword vbDefine vbKey9 vbKeyA vbKeyAdd vbKeyB vbKeyBack vbKeyC
+syn keyword vbDefine vbKeyCancel vbKeyCapital vbKeyClear vbKeyControl
+syn keyword vbDefine vbKeyD vbKeyDecimal vbKeyDelete vbKeyDivide
+syn keyword vbDefine vbKeyDown vbKeyE vbKeyEnd vbKeyEscape vbKeyExecute
+syn keyword vbDefine vbKeyF vbKeyF1 vbKeyF10 vbKeyF11 vbKeyF12 vbKeyF13
+syn keyword vbDefine vbKeyF14 vbKeyF15 vbKeyF16 vbKeyF2 vbKeyF3 vbKeyF4
+syn keyword vbDefine vbKeyF5 vbKeyF6 vbKeyF7 vbKeyF8 vbKeyF9 vbKeyG
+syn keyword vbDefine vbKeyH vbKeyHelp vbKeyHome vbKeyI vbKeyInsert
+syn keyword vbDefine vbKeyJ vbKeyK vbKeyL vbKeyLButton vbKeyLeft vbKeyM
+syn keyword vbDefine vbKeyMButton vbKeyMenu vbKeyMultiply vbKeyN
+syn keyword vbDefine vbKeyNumlock vbKeyNumpad0 vbKeyNumpad1
+syn keyword vbDefine vbKeyNumpad2 vbKeyNumpad3 vbKeyNumpad4
+syn keyword vbDefine vbKeyNumpad5 vbKeyNumpad6 vbKeyNumpad7
+syn keyword vbDefine vbKeyNumpad8 vbKeyNumpad9 vbKeyO vbKeyP
+syn keyword vbDefine vbKeyPageDown vbKeyPageUp vbKeyPause vbKeyPrint
+syn keyword vbDefine vbKeyQ vbKeyR vbKeyRButton vbKeyReturn vbKeyRight
+syn keyword vbDefine vbKeyS vbKeySelect vbKeySeparator vbKeyShift
+syn keyword vbDefine vbKeySnapshot vbKeySpace vbKeySubtract vbKeyT
+syn keyword vbDefine vbKeyTab vbKeyU vbKeyUp vbKeyV vbKeyW vbKeyX
+syn keyword vbDefine vbKeyY vbKeyZ vbLf vbLong vbLowerCase vbMagenta
+syn keyword vbDefine vbMaximizedFocus vbMenuBar vbMenuText
+syn keyword vbDefine vbMinimizedFocus vbMinimizedNoFocus vbMonday
+syn keyword vbDefine vbMsgBox vbMsgBoxHelpButton vbMsgBoxRight
+syn keyword vbDefine vbMsgBoxRtlReading vbMsgBoxSetForeground
+syn keyword vbDefine vbMsgBoxText vbNarrow vbNewLine vbNo vbNormal
+syn keyword vbDefine vbNormalFocus vbNormalNoFocus vbNull vbNullChar
+syn keyword vbDefine vbNullString vbObject vbObjectError vbOK
+syn keyword vbDefine vbOKCancel vbOKOnly vbProperCase vbQuestion
+syn keyword vbDefine vbReadOnly vbRed vbRetry vbRetryCancel vbSaturday
+syn keyword vbDefine vbScrollBars vbSingle vbString vbSunday vbSystem
+syn keyword vbDefine vbSystemModal vbTab vbTextCompare vbThursday
+syn keyword vbDefine vbTitleBarText vbTuesday vbUnicode vbUpperCase
+syn keyword vbDefine vbUseSystem vbUseSystemDayOfWeek vbVariant
+syn keyword vbDefine vbVerticalTab vbVolume vbWednesday vbWhite vbWide
+syn keyword vbDefine vbWindowBackground vbWindowFrame vbWindowText
+syn keyword vbDefine vbYellow vbYes vbYesNo vbYesNoCancel
+
+"Numbers
+"integer number, or floating point number without a dot.
+syn match vbNumber "\<\d\+\>"
+"floating point number, with dot
+syn match vbNumber "\<\d\+\.\d*\>"
+"floating point number, starting with a dot
+syn match vbNumber "\.\d\+\>"
+"syn match  vbNumber		"{[[:xdigit:]-]\+}\|&[hH][[:xdigit:]]\+&"
+"syn match  vbNumber		":[[:xdigit:]]\+"
+"syn match  vbNumber		"[-+]\=\<\d\+\>"
+syn match  vbFloat		"[-+]\=\<\d\+[eE][\-+]\=\d\+"
+syn match  vbFloat		"[-+]\=\<\d\+\.\d*\([eE][\-+]\=\d\+\)\="
+syn match  vbFloat		"[-+]\=\<\.\d\+\([eE][\-+]\=\d\+\)\="
+
+" String and Character contstants
+syn region  vbString		start=+"+  end=+"\|$+
+syn region  vbComment		start="\(^\|\s\)REM\s" end="$" contains=vbTodo
+syn region  vbComment		start="\(^\|\s\)\'"   end="$" contains=vbTodo
+syn match   vbLineNumber	"^\d\+\(\s\|$\)"
+syn match   vbTypeSpecifier  "[a-zA-Z0-9][\$%&!#]"ms=s+1
+syn match   vbTypeSpecifier  "#[a-zA-Z0-9]"me=e-1
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link vbBoolean		Boolean
+hi def link vbLineNumber		Comment
+hi def link vbComment		Comment
+hi def link vbConditional	Conditional
+hi def link vbConst			Constant
+hi def link vbDefine			Constant
+hi def link vbError			Error
+hi def link vbFunction		Identifier
+hi def link vbIdentifier		Identifier
+hi def link vbNumber			Number
+hi def link vbFloat			Float
+hi def link vbMethods		PreProc
+hi def link vbOperator		Operator
+hi def link vbRepeat			Repeat
+hi def link vbString			String
+hi def link vbStatement		Statement
+hi def link vbKeyword		Statement
+hi def link vbEvents			Special
+hi def link vbTodo			Todo
+hi def link vbTypes			Type
+hi def link vbTypeSpecifier	Type
+
+
+let b:current_syntax = "vb"
+
+" vim: ts=8
+
+endif

From 48254ec7adc9cbbc2ff15c606faf062d23d7f200 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 6 Sep 2020 21:07:04 +0200
Subject: [PATCH 022/299] Add more apache filetypes

---
 autoload/sleuth.vim   |  2 +-
 ftdetect/polyglot.vim | 41 +++++++++++++++++++++++++++++++----------
 packages.yaml         | 14 ++++++++++++--
 scripts/build         |  6 +++++-
 4 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 18344723b..0460a46e9 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -17,7 +17,7 @@ let s:globs = {
   \ 'aml': '*.aml',
   \ 'ampl': '*.run',
   \ 'ant': 'build.xml',
-  \ 'apache': '',
+  \ 'apache': 'access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*',
   \ 'apiblueprint': '*.apib',
   \ 'applescript': '*.applescript,*.scpt',
   \ 'aptconf': 'apt.conf',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index a37b76af8..6d080cf3f 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -60,6 +60,17 @@ if !exists('g:python_highlight_all')
   call s:SetDefault('g:python_slow_sync', 1)
 endif
 
+
+" Function used for patterns that end in a star: don't set the filetype if the
+" file name matches ft_ignore_pat.
+" When using this, the entry should probably be further down below with the
+" other StarSetf() calls.
+func! s:StarSetf(ft)
+  if expand("<amatch>") !~ g:ft_ignore_pat
+    exe 'setf ' . a:ft
+  endif
+endfunc
+
 " filetypes
 
 if !has_key(s:disabled_packages, '8th')
@@ -364,9 +375,19 @@ if !has_key(s:disabled_packages, 'ant')
 endif
 
 if !has_key(s:disabled_packages, 'apache')
+  au BufNewFile,BufRead */etc/apache2/*.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/conf.*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/mods-*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/sites-*/* call s:StarSetf('apache')
   au BufNewFile,BufRead */etc/apache2/sites-*/*.com setf apache
   au BufNewFile,BufRead */etc/httpd/*.conf setf apache
+  au BufNewFile,BufRead */etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
   au BufNewFile,BufRead {.,}htaccess setf apache
+  au BufNewFile,BufRead access.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead apache.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
 endif
 
 if !has_key(s:disabled_packages, 'apiblueprint')
@@ -381,7 +402,7 @@ endif
 if !has_key(s:disabled_packages, 'aptconf')
   au BufNewFile,BufRead */.aptitude/config setf aptconf
   au BufNewFile,BufRead */etc/apt/apt.conf.d/*.conf setf aptconf
-  au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* setf aptconf
+  au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
   au BufNewFile,BufRead apt.conf setf aptconf
 endif
 
@@ -571,7 +592,7 @@ if !has_key(s:disabled_packages, 'dockerfile')
   au BufNewFile,BufRead *.dock setf Dockerfile
   au BufNewFile,BufRead *.dockerfile setf Dockerfile
   au BufNewFile,BufRead Dockerfile setf Dockerfile
-  au BufNewFile,BufRead Dockerfile* setf Dockerfile
+  au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
   au BufNewFile,BufRead dockerfile setf Dockerfile
   au BufNewFile,BufRead docker-compose*.yaml setf yaml.docker-compose
   au BufNewFile,BufRead docker-compose*.yml setf yaml.docker-compose
@@ -660,7 +681,7 @@ if !has_key(s:disabled_packages, 'git')
   au BufNewFile,BufRead {.,}gitconfig setf gitconfig
   au BufNewFile,BufRead {.,}gitmodules setf gitconfig
   au BufNewFile,BufRead git-rebase-todo setf gitrebase
-  au BufNewFile,BufRead {.,}gitsendemail.* setf gitsendemail
+  au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
   au BufNewFile,BufRead *.git/{,modules/**/,worktrees/*/}{COMMIT_EDIT,TAG_EDIT,MERGE_,}MSG setf gitcommit
 endif
 
@@ -738,7 +759,7 @@ endif
 
 if !has_key(s:disabled_packages, 'haproxy')
   au BufNewFile,BufRead *.cfg setf haproxy
-  au BufNewFile,BufRead haproxy*.c* setf haproxy
+  au BufNewFile,BufRead haproxy*.c* call s:StarSetf('haproxy')
   au BufNewFile,BufRead haproxy.cfg setf haproxy
 endif
 
@@ -839,7 +860,7 @@ if !has_key(s:disabled_packages, 'jenkins')
   au BufNewFile,BufRead *.Jenkinsfile setf Jenkinsfile
   au BufNewFile,BufRead *.jenkinsfile setf Jenkinsfile
   au BufNewFile,BufRead Jenkinsfile setf Jenkinsfile
-  au BufNewFile,BufRead Jenkinsfile* setf Jenkinsfile
+  au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
 if !has_key(s:disabled_packages, 'jinja')
@@ -1022,9 +1043,9 @@ if !has_key(s:disabled_packages, 'nginx')
   au BufNewFile,BufRead *.nginx setf nginx
   au BufNewFile,BufRead *.nginxconf setf nginx
   au BufNewFile,BufRead *.vhost setf nginx
-  au BufNewFile,BufRead */etc/nginx/* setf nginx
+  au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
   au BufNewFile,BufRead */nginx/*.conf setf nginx
-  au BufNewFile,BufRead */usr/local/nginx/conf/* setf nginx
+  au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
   au BufNewFile,BufRead *nginx.conf setf nginx
   au BufNewFile,BufRead nginx*.conf setf nginx
   au BufNewFile,BufRead nginx.conf setf nginx
@@ -1328,7 +1349,7 @@ if !has_key(s:disabled_packages, 'ruby')
   au BufNewFile,BufRead Snapfile setf ruby
   au BufNewFile,BufRead Thorfile setf ruby
   au BufNewFile,BufRead Vagrantfile setf ruby
-  au BufNewFile,BufRead [Rr]akefile* setf ruby
+  au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
   au BufNewFile,BufRead buildfile setf ruby
   au BufNewFile,BufRead vagrantfile setf ruby
   au BufNewFile,BufRead *.erb setf eruby
@@ -1657,9 +1678,9 @@ if !has_key(s:disabled_packages, 'xsl')
 endif
 
 if !has_key(s:disabled_packages, 'ansible')
-  au BufNewFile,BufRead group_vars/* setf yaml.ansible
+  au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
   au BufNewFile,BufRead handlers.*.y{a,}ml setf yaml.ansible
-  au BufNewFile,BufRead host_vars/* setf yaml.ansible
+  au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
   au BufNewFile,BufRead local.y{a,}ml setf yaml.ansible
   au BufNewFile,BufRead main.y{a,}ml setf yaml.ansible
   au BufNewFile,BufRead playbook.y{a,}ml setf yaml.ansible
diff --git a/packages.yaml b/packages.yaml
index e167e0f10..fb67e6762 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -155,6 +155,16 @@ filetypes:
   - .htaccess
   - '*/etc/httpd/*.conf'
   - '*/etc/apache2/sites-*/*.com'
+  - 'access.conf*'
+  - 'apache.conf*'
+  - 'apache2.conf*'
+  - 'httpd.conf*'
+  - 'srm.conf*'
+  - '*/etc/apache2/*.conf*'
+  - '*/etc/apache2/conf.*/*'
+  - '*/etc/apache2/mods-*/*'
+  - '*/etc/apache2/sites-*/*'
+  - '*/etc/httpd/conf.d/*.conf*'
 ---
 name: apiblueprint
 remote: sheerun/apiblueprint.vim
@@ -1662,7 +1672,7 @@ filetypes:
   extra_filenames:
   - fish_history
   - fish_read_history
-  ignored_filenames:
+  ignored_warnings:
   - '~/.config/fish/fish_{read_,}history'
 # Ansible needs to be after YAML
 ---
@@ -1745,5 +1755,5 @@ filetypes:
   - ctl
   # SaxBasic is close to Visual Basic
   - sba
-  ignore_warnings:
+  ignored_warnings:
   - vb
diff --git a/scripts/build b/scripts/build
index 197b4ea3a..f688c28f7 100755
--- a/scripts/build
+++ b/scripts/build
@@ -492,7 +492,11 @@ def generate_ftdetect(packages, heuristics)
         if filename[0] == "."
           filename = "{.,}" + filename[1..]
         end
-        autocommands << "  au BufNewFile,BufRead #{filename} #{set_command}\n"
+        if filename[-1] == "*"
+          autocommands << "  au BufNewFile,BufRead #{filename} call s:StarSetf('#{name}')\n"
+        else
+          autocommands << "  au BufNewFile,BufRead #{filename} #{set_command}\n"
+        end
       end
     end
 

From 46040f3ffd35c4a981ca1f3713934f55b58bb525 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 6 Sep 2020 23:37:24 +0200
Subject: [PATCH 023/299] Add heuristics for .h extension

---
 autoload/polyglot.vim       | 19 +++++++++++++++++++
 autoload/sleuth.vim         | 10 +++++-----
 ftdetect/polyglot.vim       | 19 ++++++++++++-------
 heuristics.yaml             | 14 ++++++++++++++
 packages.yaml               | 24 +++++++++++++++++++-----
 scripts/build               | 18 +++++++++++++-----
 scripts/test_extensions.vim | 26 ++++++++++++++++++++++++--
 scripts/test_filetypes.vim  |  2 +-
 8 files changed, 107 insertions(+), 25 deletions(-)

diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index ffb3c43fb..1ed718269 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -154,6 +154,25 @@ func! polyglot#DetectAspFiletype()
   setf aspvbs | return
 endfunc
 
+func! polyglot#DetectHFiletype()
+  for lnum in range(1, min([line("$"), 200]))
+    let line = getline(lnum)
+    if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
+      if exists("g:c_syntax_for_h")
+        setf objc | return
+      endif
+      setf objcpp | return
+    endif
+  endfor
+  if exists("g:c_syntax_for_h")
+    setf c | return
+  endif
+  if exists("g:ch_syntax_for_h")
+    setf ch | return
+  endif
+  setf cpp | return
+endfunc
+
 func! polyglot#DetectMFiletype()
   let saw_comment = 0
   for lnum in range(1, min([line("$"), 100]))
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 0460a46e9..2eb95a634 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -10,7 +10,7 @@ let s:globs = {
   \ 'abc': '*.abc',
   \ 'abel': '*.abl',
   \ 'acedb': '*.wrm',
-  \ 'ada': '*.adb,*.ads,*.ada,*.gpr',
+  \ 'ada': '*.adb,*.ads,*.ada,*.adc,*.gpr,*.ada_m',
   \ 'ahdl': '*.tdf',
   \ 'aidl': '*.aidl',
   \ 'alsaconf': '',
@@ -34,17 +34,17 @@ let s:globs = {
   \ 'autoit': '*.au3',
   \ 'automake': '[Mm]akefile.am,GNUmakefile.am',
   \ 'ave': '*.ave',
-  \ 'awk': '*.awk',
+  \ 'awk': '*.awk,*.gawk',
   \ 'basic': '*.basic',
   \ 'blade': '*.blade,*.blade.php',
   \ 'brewfile': 'Brewfile',
-  \ 'c': '*.c,*.cats,*.h,*.idc',
+  \ 'c': '*.c,*.cats,*.h,*.idc,*.qc',
   \ 'caddyfile': 'Caddyfile',
   \ 'carp': '*.carp',
   \ 'clojure': '*.clj,*.boot,*.cl2,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.hic,*.edn,riemann.config,build.boot,profile.boot',
   \ 'cmake': '*.cmake,*.cmake.in,CMakeLists.txt',
   \ 'coffee': '*.coffee,*._coffee,*.cake,*.cjsx,*.iced,*.coffeekup,Cakefile',
-  \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp',
+  \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp,*.moc',
   \ 'cql': '*.cql',
   \ 'cryptol': '*.cry,*.cyl,*.lcry,*.lcyl',
   \ 'crystal': '*.cr,Projectfile',
@@ -52,7 +52,7 @@ let s:globs = {
   \ 'cucumber': '*.feature,*.story',
   \ 'cuesheet': '*.cue',
   \ 'd': '*.d,*.di',
-  \ 'dart': '*.dart',
+  \ 'dart': '*.dart,*.drt',
   \ 'dcov': '*.lst',
   \ 'dd': '*.dd',
   \ 'ddoc': '*.ddoc',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 6d080cf3f..19d164c5c 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -134,7 +134,7 @@ if !has_key(s:disabled_packages, 'awk')
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
-  au! BufRead,BufNewFile *.c,*.cpp,*.tpp
+  au! BufRead,BufNewFile *.cpp,*.tpp,*.c
 endif
 
 if !has_key(s:disabled_packages, 'cmake')
@@ -343,7 +343,9 @@ endif
 
 if !has_key(s:disabled_packages, 'ada')
   au BufNewFile,BufRead *.ada setf ada
+  au BufNewFile,BufRead *.ada_m setf ada
   au BufNewFile,BufRead *.adb setf ada
+  au BufNewFile,BufRead *.adc setf ada
   au BufNewFile,BufRead *.ads setf ada
   au BufNewFile,BufRead *.gpr setf ada
 endif
@@ -465,6 +467,7 @@ endif
 
 if !has_key(s:disabled_packages, 'awk')
   au BufNewFile,BufRead *.awk setf awk
+  au BufNewFile,BufRead *.gawk setf awk
 endif
 
 if !has_key(s:disabled_packages, 'reason')
@@ -473,16 +476,11 @@ if !has_key(s:disabled_packages, 'reason')
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
-  au BufNewFile,BufRead *.c setf c
-  au BufNewFile,BufRead *.cats setf c
-  au BufNewFile,BufRead *.h setf c
-  au BufNewFile,BufRead *.idc setf c
   au BufNewFile,BufRead *.c++ setf cpp
   au BufNewFile,BufRead *.cc setf cpp
   au BufNewFile,BufRead *.cp setf cpp
   au BufNewFile,BufRead *.cpp setf cpp
   au BufNewFile,BufRead *.cxx setf cpp
-  au BufNewFile,BufRead *.h setf cpp
   au BufNewFile,BufRead *.h++ setf cpp
   au BufNewFile,BufRead *.hh setf cpp
   au BufNewFile,BufRead *.hpp setf cpp
@@ -490,8 +488,14 @@ if !has_key(s:disabled_packages, 'c/c++')
   au BufNewFile,BufRead *.inc setf cpp
   au BufNewFile,BufRead *.inl setf cpp
   au BufNewFile,BufRead *.ipp setf cpp
+  au BufNewFile,BufRead *.moc setf cpp
   au BufNewFile,BufRead *.tcc setf cpp
   au BufNewFile,BufRead *.tpp setf cpp
+  au BufNewFile,BufRead *.c setf c
+  au BufNewFile,BufRead *.cats setf c
+  au BufNewFile,BufRead *.idc setf c
+  au BufNewFile,BufRead *.qc setf c
+  au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'caddyfile')
@@ -566,6 +570,7 @@ endif
 
 if !has_key(s:disabled_packages, 'dart')
   au BufNewFile,BufRead *.dart setf dart
+  au BufNewFile,BufRead *.drt setf dart
 endif
 
 if !has_key(s:disabled_packages, 'dhall')
@@ -1065,7 +1070,7 @@ if !has_key(s:disabled_packages, 'nix')
 endif
 
 if !has_key(s:disabled_packages, 'objc')
-  au BufNewFile,BufRead *.h setf objc
+  au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
   au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
 endif
 
diff --git a/heuristics.yaml b/heuristics.yaml
index 8c0c16630..901241cb4 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -23,6 +23,20 @@ rules:
   filetype: aspperl
 - filetype: aspvbs
 ---
+extensions: [h]
+rules:
+- lines: 200
+  pattern: '^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])'
+  rules:
+  - if_exists: "g:c_syntax_for_h"
+    filetype: objc
+  - filetype: objcpp
+- if_exists: "g:c_syntax_for_h"
+  filetype: c
+- if_exists: "g:ch_syntax_for_h"
+  filetype: ch
+- filetype: cpp
+---
 extensions: [m]
 rules:
 - lines: 100
diff --git a/packages.yaml b/packages.yaml
index fb67e6762..e14061013 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -93,7 +93,9 @@ filetypes:
   - adb
   - ads
   - ada
+  - adc
   - gpr
+  - ada_m
 ---
 name: ahdl
 remote: vim/vim:runtime
@@ -191,6 +193,11 @@ filetypes:
   - '*/.aptitude/config'
   - '*/etc/apt/apt.conf.d/[^.]*'
   - '*/etc/apt/apt.conf.d/*.conf'
+  ignored_warnings:
+  # some kind of bugs in filetype detection algorithm
+  - '*/etc/apt/apt.conf.d/{[-_[:alnum:]]\+,[-_.[:alnum:]]\+.conf}'
+  - '*/etc/apt/apt.conf.d/]\+'
+  - '*/etc/apt/apt.conf.d/]\+.conf'
 ---
 name: arch
 remote: vim/vim:runtime
@@ -302,19 +309,25 @@ filetypes:
 - name: awk
   extensions:
   - awk
+  - gawk
 ---
 name: c/c++
 remote: vim-jp/vim-cpp
 filetypes:
-- name: c
-  linguist: C
 - name: cpp
   linguist: C++
+  extra_extensions:
+  - moc
   ignored_extensions:
   # conflicts with more popular reason, remove after heuristics work
   - re
   # implemented by arduino
   - ino
+- name: c
+  linguist: C
+  extra_extensions:
+  # Quake C
+  - qc
 ---
 name: caddyfile
 remote: isobit/vim-caddyfile
@@ -358,10 +371,9 @@ filetypes:
   extra_extensions:
   # 17 results: https://github.com/search?q=extension%3Acoffeekup+html&type=Code
   - coffeekup
-  ignored_filenames:
+  ignored_warnings:
   # Probably mistake
   - '*Cakefile'
-  ignored_warnings:
   # Used by C#
   - csx
   # Used by Chuck
@@ -430,6 +442,8 @@ remote: dart-lang/dart-vim-plugin
 filetypes:
 - name: dart
   linguist: Dart
+  extra_extensions:
+  - drt
 ---
 name: dhall
 remote: vmchale/dhall-vim
@@ -470,7 +484,7 @@ filetypes:
   filenames:
   - 'docker-compose*.yaml'
   - 'docker-compose*.yml'
-  ignored_filenames:
+  ignored_warnings:
   # Probably mistakes?
   - 'docker-compose*.yaml*'
   - 'docker-compose*.yml*'
diff --git a/scripts/build b/scripts/build
index f688c28f7..67f01ca38 100755
--- a/scripts/build
+++ b/scripts/build
@@ -268,10 +268,6 @@ def rule_to_code(rule)
     end
   end
 
-  if rule.has_key?("rules")
-    return rule["rules"].map { |r| indent(rule_to_code(r), 0) }.join("\n")
-  end
-
   if rule.has_key?("pattern") || rule.has_key?("or") || rule.has_key?("and")
     return <<~EOS
       if #{pattern_to_condition(rule)}
@@ -280,6 +276,10 @@ def rule_to_code(rule)
     EOS
   end
 
+  if rule.has_key?("rules")
+    return rule["rules"].map { |r| indent(rule_to_code(r), 0) }.join("\n")
+  end
+
   if rule.has_key?("if_set")
     return <<~EOS
       if #{rule["negative"] ? "!" : ""}#{rule["if_set"]}
@@ -288,6 +288,14 @@ def rule_to_code(rule)
     EOS
   end
 
+  if rule.has_key?("if_exists")
+    return <<~EOS
+      if #{rule["negative"] ? "!" : ""}exists("#{rule["if_exists"]}")
+      #{indent(rule_to_code(except(rule, "if_exists", "negative")), 2)}
+      endif
+    EOS
+  end
+
   if rule.has_key?("set")
     return <<~EOS
       let #{rule["set"]} = 1
@@ -455,7 +463,7 @@ def generate_ftdetect(packages, heuristics)
       extensions = filetype["extensions"]
       filenames = filetype["filenames"]
 
-      expected_extensions = all_filetypes.has_key?(name) ? all_filetypes.fetch(name)[:extensions] : []
+      expected_extensions = (all_filetypes.has_key?(name) ? all_filetypes.fetch(name)[:extensions] : []).map(&:downcase)
       ignored_extensions = expand_all(filetype.fetch("ignored_extensions", []))
       ignored_warnings = expand_all(filetype.fetch("ignored_warnings", []))
 
diff --git a/scripts/test_extensions.vim b/scripts/test_extensions.vim
index 9cac0b21a..f2aaf66c2 100644
--- a/scripts/test_extensions.vim
+++ b/scripts/test_extensions.vim
@@ -181,6 +181,18 @@ call TestExtension("ave", "foobar.ave", "")
 " Awk
 call TestExtension("awk", "foobar.awk", "")
 
+" C++
+call TestExtension("c", "foobar.c", "")
+call TestExtension("cpp", "foobar.cxx", "")
+call TestExtension("cpp", "foobar.c++", "")
+call TestExtension("cpp", "foobar.hh", "")
+call TestExtension("cpp", "foobar.hxx", "")
+call TestExtension("cpp", "foobar.hpp", "")
+call TestExtension("cpp", "foobar.ipp", "")
+call TestExtension("cpp", "foobar.moc", "")
+call TestExtension("cpp", "foobar.tcc", "")
+call TestExtension("cpp", "foobar.inl", "")
+
 " vim-polyglot only
 call TestExtension("blade", "test.blade.php", "")
 call TestExtension("yaml.ansible", "playbook.yml", "")
@@ -233,7 +245,7 @@ call TestExtension("vb", "vb.dsm", "")
 call TestExtension("vb", "vb.dsm", "")
 call TestExtension("vb", "vb.ctl", "")
 
-" Idris
+" .idr extension
 call TestExtension("idris", "lowercase.idr", "--idris1")
 call TestExtension("idris", "uppercase.idr", "--Idris1")
 call TestExtension("idris", "start-space-l.idr", "-- idris1")
@@ -253,7 +265,17 @@ call TestExtension("idris2", "two-spaces-u.idr", "-- Idris 2")
 call TestExtension("idris2", "mypkg.ipkg", "package mypkg\n\ndepends = effects")
 call TestExtension("idris2", "use-post-proj.idr", "%language PostfixProjections")
 
-" Literate Idris
+" .lidr extension
 call TestExtension("lidris", "lidris-1.lidr", "Some test plaintext\n\n> --idris1\n> myfact : Nat -> Nat\n> myfact Z = 1\n> myfact (S k) = (S k) * myfact k\n\nMore plaintext")
 call TestExtension("lidris2", "lidris-2.lidr", "Some test plaintext\n\n> --idris2\n> myfact : Nat -> Nat\n> myfact Z = 1\n> myfact (S k) = (S k) * myfact k\n\nMore plaintext")
 
+
+" .h extension
+call TestExtension("objcpp", "foo.h", "@interface MTNavigationController : UINavigationController")
+call TestExtension("cpp", "foo.h", "")
+let g:c_syntax_for_h = 1
+call TestExtension("objc", "foo.h", "@interface MTNavigationController : UINavigationController")
+call TestExtension("c", "foo.h", "")
+unlet g:c_syntax_for_h
+let g:ch_syntax_for_h = 1
+call TestExtension("ch", "foo.h", "")
diff --git a/scripts/test_filetypes.vim b/scripts/test_filetypes.vim
index e157889d8..42e683d17 100644
--- a/scripts/test_filetypes.vim
+++ b/scripts/test_filetypes.vim
@@ -45,8 +45,8 @@ call TestFiletype('autoit')
 call TestFiletype('ave')
 call TestFiletype('awk')
 call TestFiletype('reason')
-call TestFiletype('c')
 call TestFiletype('cpp')
+call TestFiletype('c')
 call TestFiletype('caddyfile')
 call TestFiletype('carp')
 call TestFiletype('clojure')

From a4b91124a8fea26575d08c1845e141520e7d33e2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 8 Sep 2020 16:15:45 +0200
Subject: [PATCH 024/299] Fix auto-detecting indent, closes #540

---
 ftdetect/polyglot.vim | 156 +++++++++++++++++++++++++++++++++++++++
 plugin/polyglot.vim   | 167 ------------------------------------------
 2 files changed, 156 insertions(+), 167 deletions(-)
 delete mode 100644 plugin/polyglot.vim

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 19d164c5c..0ee86adbe 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1761,6 +1761,162 @@ au BufNewFile,BufRead,StdinReadPost *
   \ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat 
   \ | call polyglot#Heuristics() | endif
 
+
+if v:version < 700 || &cp
+  finish
+endif
+
+
+" Code below re-implements sleuth for vim-polyglot
+let g:loaded_sleuth = 1
+
+" Makes shiftwidth to be synchronized with tabstop by default
+if &shiftwidth == &tabstop
+  let &shiftwidth = 0
+endif
+
+function! s:guess(lines) abort
+  let options = {}
+  let ccomment = 0
+  let podcomment = 0
+  let triplequote = 0
+  let backtick = 0
+  let xmlcomment = 0
+  let heredoc = ''
+  let minindent = 10
+  let spaces_minus_tabs = 0
+
+  for line in a:lines
+    if !len(line) || line =~# '^\W*$'
+      continue
+    endif
+
+    if line =~# '^\s*/\*'
+      let ccomment = 1
+    endif
+    if ccomment
+      if line =~# '\*/'
+        let ccomment = 0
+      endif
+      continue
+    endif
+
+    if line =~# '^=\w'
+      let podcomment = 1
+    endif
+    if podcomment
+      if line =~# '^=\%(end\|cut\)\>'
+        let podcomment = 0
+      endif
+      continue
+    endif
+
+    if triplequote
+      if line =~# '^[^"]*"""[^"]*$'
+        let triplequote = 0
+      endif
+      continue
+    elseif line =~# '^[^"]*"""[^"]*$'
+      let triplequote = 1
+    endif
+
+    if backtick
+      if line =~# '^[^`]*`[^`]*$'
+        let backtick = 0
+      endif
+      continue
+    elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
+      let backtick = 1
+    endif
+
+    if line =~# '^\s*<\!--'
+      let xmlcomment = 1
+    endif
+    if xmlcomment
+      if line =~# '-->'
+        let xmlcomment = 0
+      endif
+      continue
+    endif
+
+    " This is correct order because both "<<EOF" and "EOF" matches end
+    if heredoc != ''
+      if line =~# heredoc
+        let heredoc = ''
+      endif
+      continue
+    endif
+    let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
+    if len(herematch) > 0
+      let heredoc = herematch[1] . '$'
+    endif
+
+    let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
+
+    if line[0] == "\t"
+      setlocal noexpandtab
+      return 1
+    elseif line[0] == " "
+      let indent = len(matchstr(line, '^ *'))
+      if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
+        let minindent = indent
+      endif
+    endif
+  endfor
+
+  if minindent < 10
+    setlocal expandtab
+    let &shiftwidth=minindent
+    return 1
+  endif
+
+  return 0
+endfunction
+
+function! s:detect_indent() abort
+  if &buftype ==# 'help'
+    return
+  endif
+
+  if s:guess(getline(1, 32))
+    return
+  endif
+  let pattern = sleuth#GlobForFiletype(&filetype)
+  if len(pattern) == 0
+    return
+  endif
+  let pattern = '{' . pattern . ',.git,.svn,.hg}'
+  let dir = expand('%:p:h')
+  let level = 3
+  while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
+    " Ignore files from homedir and root 
+    if dir == expand('~') || dir == '/'
+      return
+    endif
+    for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
+      " Do not consider directories above .git, .svn or .hg
+      if fnamemodify(neighbor, ":h:t")[0] == "."
+        return
+      endif
+      if neighbor !=# expand('%:p') && filereadable(neighbor)
+        if s:guess(readfile(neighbor, '', 32))
+          return
+        endif
+      endif
+    endfor
+
+    let dir = fnamemodify(dir, ':h')
+    let level -= 1
+  endwhile
+endfunction
+
+setglobal smarttab
+
+augroup polyglot
+  autocmd!
+  autocmd FileType * call s:detect_indent()
+augroup END
+
 " restore Vi compatibility settings
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
deleted file mode 100644
index 762e4fcd5..000000000
--- a/plugin/polyglot.vim
+++ /dev/null
@@ -1,167 +0,0 @@
-" Heuristically set expandtab and shiftwidth options
-"
-" Modified version of vim-sleuth:
-"   - tabstop is not set, it's up to user to set it
-"   - check maximum of 32 lines, instead of 1024
-"   - check maximum 6 files, instead of 20
-"   - check maximum of 2 filer per directory level, instead of 8
-"   - check maximum of 3 directory levels
-"   - check only to the nearest .git, .hg, or .svn directory
-"   - globs are concatenated for performance
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'autoindent') != -1
-  finish
-endif
-
-if exists("g:loaded_polyglot") || v:version < 700 || &cp
-  finish
-endif
-
-let g:loaded_sleuth = 1
-let g:loaded_polyglot = 1
-
-" Makes shiftwidth to be synchronized with tabstop by default
-if &shiftwidth == &tabstop
-  let &shiftwidth = 0
-endif
-
-function! s:guess(lines) abort
-  let options = {}
-  let ccomment = 0
-  let podcomment = 0
-  let triplequote = 0
-  let backtick = 0
-  let xmlcomment = 0
-  let heredoc = ''
-  let minindent = 10
-  let spaces_minus_tabs = 0
-
-  for line in a:lines
-    if !len(line) || line =~# '^\W*$'
-      continue
-    endif
-
-    if line =~# '^\s*/\*'
-      let ccomment = 1
-    endif
-    if ccomment
-      if line =~# '\*/'
-        let ccomment = 0
-      endif
-      continue
-    endif
-
-    if line =~# '^=\w'
-      let podcomment = 1
-    endif
-    if podcomment
-      if line =~# '^=\%(end\|cut\)\>'
-        let podcomment = 0
-      endif
-      continue
-    endif
-
-    if triplequote
-      if line =~# '^[^"]*"""[^"]*$'
-        let triplequote = 0
-      endif
-      continue
-    elseif line =~# '^[^"]*"""[^"]*$'
-      let triplequote = 1
-    endif
-
-    if backtick
-      if line =~# '^[^`]*`[^`]*$'
-        let backtick = 0
-      endif
-      continue
-    elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
-      let backtick = 1
-    endif
-
-    if line =~# '^\s*<\!--'
-      let xmlcomment = 1
-    endif
-    if xmlcomment
-      if line =~# '-->'
-        let xmlcomment = 0
-      endif
-      continue
-    endif
-
-    " This is correct order because both "<<EOF" and "EOF" matches end
-    if heredoc != ''
-      if line =~# heredoc
-        let heredoc = ''
-      endif
-      continue
-    endif
-    let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
-    if len(herematch) > 0
-      let heredoc = herematch[1] . '$'
-    endif
-
-    let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
-
-    if line[0] == "\t"
-      setlocal noexpandtab
-      return 1
-    elseif line[0] == " "
-      let indent = len(matchstr(line, '^ *'))
-      if indent % 2 == 0 && indent < minindent
-        let minindent = indent
-      endif
-    endif
-  endfor
-
-  if minindent < 10
-    setlocal expandtab
-    let &shiftwidth=minindent
-    return 1
-  endif
-
-  return 0
-endfunction
-
-function! s:detect_indent() abort
-  if &buftype ==# 'help'
-    return
-  endif
-
-  if s:guess(getline(1, 32))
-    return
-  endif
-  let pattern = sleuth#GlobForFiletype(&filetype)
-  if len(pattern) == 0
-    return
-  endif
-  let pattern = '{' . pattern . ',.git,.svn,.hg}'
-  let dir = expand('%:p:h')
-  let level = 3
-  while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
-    " Ignore files from homedir and root 
-    if dir == expand('~') || dir == '/'
-      return
-    endif
-    for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
-      " Do not consider directories above .git, .svn or .hg
-      if fnamemodify(neighbor, ":h:t")[0] == "."
-        return
-      endif
-      if neighbor !=# expand('%:p') && filereadable(neighbor)
-        if s:guess(readfile(neighbor, '', 32))
-          return
-        endif
-      endif
-    endfor
-
-    let dir = fnamemodify(dir, ':h')
-    let level -= 1
-  endwhile
-endfunction
-
-setglobal smarttab
-
-augroup polyglot
-  autocmd!
-  autocmd FileType * call s:detect_indent()
-augroup END

From 002573265a944381cf8dccf5129fc432e33441e7 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 8 Sep 2020 21:17:24 +0200
Subject: [PATCH 025/299] Fix some ftdetect issues from tests

---
 README.md                   |   3 +-
 autoload/polyglot.vim       |   1 +
 autoload/sleuth.vim         |   8 +-
 ftdetect/polyglot.vim       |  21 +-
 ftplugin/groovy.vim         |  23 ++
 packages.yaml               |  37 ++-
 scripts/build               |   2 +-
 scripts/test_extensions.vim |   2 +-
 syntax/groovy.vim           | 454 ++++++++++++++++++++++++++++++++++++
 9 files changed, 538 insertions(+), 13 deletions(-)
 create mode 100644 ftplugin/groovy.vim
 create mode 100644 syntax/groovy.vim

diff --git a/README.md b/README.md
index 114002afc..1c98ba15f 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->193<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->194<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -118,6 +118,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [go](https://github.com/fatih/vim-go)
 - [gradle](https://github.com/tfnico/vim-gradle)
 - [graphql](https://github.com/jparise/vim-graphql)
+- [groovy](https://github.com/vim/vim/tree/master/runtime)
 - [grub](https://github.com/vim/vim/tree/master/runtime)
 - [haml](https://github.com/sheerun/vim-haml)
 - [handlebars](https://github.com/sheerun/vim-mustache-handlebars)
diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index 1ed718269..d54cb87e8 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -21,6 +21,7 @@ let s:interpreters = {
   \ 'escript': 'erlang',
   \ 'fish': 'fish',
   \ 'gnuplot': 'gnuplot',
+  \ 'groovy': 'groovy',
   \ 'runhaskell': 'haskell',
   \ 'chakra': 'javascript',
   \ 'd8': 'javascript',
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 2eb95a634..6cf267fa7 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -44,7 +44,7 @@ let s:globs = {
   \ 'clojure': '*.clj,*.boot,*.cl2,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.hic,*.edn,riemann.config,build.boot,profile.boot',
   \ 'cmake': '*.cmake,*.cmake.in,CMakeLists.txt',
   \ 'coffee': '*.coffee,*._coffee,*.cake,*.cjsx,*.iced,*.coffeekup,Cakefile',
-  \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp,*.moc',
+  \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh',
   \ 'cql': '*.cql',
   \ 'cryptol': '*.cry,*.cyl,*.lcry,*.lcyl',
   \ 'crystal': '*.cr,Projectfile',
@@ -78,18 +78,18 @@ let s:globs = {
   \ 'forth': '*.fs,*.ft,*.fth',
   \ 'fsharp': '*.fs,*.fsi,*.fsx',
   \ 'gdscript3': '*.gd',
-  \ 'gitcommit': '',
+  \ 'gitcommit': 'COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG',
   \ 'gitconfig': '*.gitconfig',
   \ 'gitrebase': 'git-rebase-todo',
   \ 'gitsendemail': '',
   \ 'glsl': '*.glsl,*.fp,*.frag,*.frg,*.fs,*.fsh,*.fshader,*.geo,*.geom,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader,*.comp',
   \ 'gmpl': '*.mod',
-  \ 'gnuplot': '*.gp,*.gnu,*.gnuplot,*.p,*.plot,*.plt',
+  \ 'gnuplot': '*.gp,*.gnu,*.gnuplot,*.p,*.plot,*.plt,*.gpi',
   \ 'go': '*.go',
   \ 'gohtmltmpl': '*.tmpl',
   \ 'gomod': 'go.mod',
   \ 'graphql': '*.graphql,*.gql,*.graphqls',
-  \ 'groovy': '*.gradle',
+  \ 'groovy': '*.groovy,*.grt,*.gtpl,*.gvy,*.gradle,Jenkinsfile',
   \ 'grub': '',
   \ 'haml': '*.haml,*.haml.deface,*.hamlc,*.hamlbars',
   \ 'haproxy': '*.cfg,haproxy.cfg,haproxy*.c*',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 0ee86adbe..9408c2887 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -169,6 +169,10 @@ if !has_key(s:disabled_packages, 'go')
   au! BufRead,BufNewFile *.go
 endif
 
+if !has_key(s:disabled_packages, 'groovy')
+  au! BufRead,BufNewFile *.groovy
+endif
+
 if !has_key(s:disabled_packages, 'haml')
   au! BufRead,BufNewFile *.haml
 endif
@@ -490,11 +494,13 @@ if !has_key(s:disabled_packages, 'c/c++')
   au BufNewFile,BufRead *.ipp setf cpp
   au BufNewFile,BufRead *.moc setf cpp
   au BufNewFile,BufRead *.tcc setf cpp
+  au BufNewFile,BufRead *.tlh setf cpp
   au BufNewFile,BufRead *.tpp setf cpp
   au BufNewFile,BufRead *.c setf c
   au BufNewFile,BufRead *.cats setf c
   au BufNewFile,BufRead *.idc setf c
   au BufNewFile,BufRead *.qc setf c
+  au BufNewFile,BufRead *enlightenment/*.cfg setf c
   au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
 endif
 
@@ -681,13 +687,15 @@ endif
 if !has_key(s:disabled_packages, 'git')
   au BufNewFile,BufRead *.gitconfig setf gitconfig
   au BufNewFile,BufRead *.git/config setf gitconfig
-  au BufNewFile,BufRead *.git/modules/**/config setf gitconfig
+  au BufNewFile,BufRead *.git/modules/*/config setf gitconfig
   au BufNewFile,BufRead */.config/git/config setf gitconfig
+  au BufNewFile,BufRead */git/config setf gitconfig
+  au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
   au BufNewFile,BufRead {.,}gitconfig setf gitconfig
   au BufNewFile,BufRead {.,}gitmodules setf gitconfig
   au BufNewFile,BufRead git-rebase-todo setf gitrebase
   au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
-  au BufNewFile,BufRead *.git/{,modules/**/,worktrees/*/}{COMMIT_EDIT,TAG_EDIT,MERGE_,}MSG setf gitcommit
+  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
 endif
 
 if !has_key(s:disabled_packages, 'glsl')
@@ -722,6 +730,7 @@ if !has_key(s:disabled_packages, 'gnuplot')
   au BufNewFile,BufRead *.gnu setf gnuplot
   au BufNewFile,BufRead *.gnuplot setf gnuplot
   au BufNewFile,BufRead *.gp setf gnuplot
+  au BufNewFile,BufRead *.gpi setf gnuplot
   au BufNewFile,BufRead *.p setf gnuplot
   au BufNewFile,BufRead *.plot setf gnuplot
   au BufNewFile,BufRead *.plt setf gnuplot
@@ -739,8 +748,13 @@ if !has_key(s:disabled_packages, 'graphql')
   au BufNewFile,BufRead *.graphqls setf graphql
 endif
 
-if !has_key(s:disabled_packages, 'gradle')
+if !has_key(s:disabled_packages, 'groovy')
   au BufNewFile,BufRead *.gradle setf groovy
+  au BufNewFile,BufRead *.groovy setf groovy
+  au BufNewFile,BufRead *.grt setf groovy
+  au BufNewFile,BufRead *.gtpl setf groovy
+  au BufNewFile,BufRead *.gvy setf groovy
+  au BufNewFile,BufRead Jenkinsfile setf groovy
 endif
 
 if !has_key(s:disabled_packages, 'haml')
@@ -877,6 +891,7 @@ endif
 if !has_key(s:disabled_packages, 'jq')
   au BufNewFile,BufRead *.jq setf jq
   au BufNewFile,BufRead {.,}jqrc setf jq
+  au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq')
 endif
 
 if !has_key(s:disabled_packages, 'json5')
diff --git a/ftplugin/groovy.vim b/ftplugin/groovy.vim
new file mode 100644
index 000000000..ad78164c2
--- /dev/null
+++ b/ftplugin/groovy.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy') == -1
+
+" Vim filetype plugin file
+" Language:	groovy
+" Maintainer:	Justin M. Keyes <justinkz@gmail.com>
+" Last Change:	2016 May 22
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+let b:undo_ftplugin = 'setlocal commentstring<'
+
+setlocal commentstring=//%s
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/packages.yaml b/packages.yaml
index e14061013..3ddc5776b 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -318,16 +318,25 @@ filetypes:
   linguist: C++
   extra_extensions:
   - moc
+  # TLH files are C++ headers generated by Visual C++'s #import from typelibs
+  - tlh
   ignored_extensions:
   # conflicts with more popular reason, remove after heuristics work
   - re
   # implemented by arduino
   - ino
+  ignored_warnings:
+  # TODO: fix these
+  - C
+  - H
 - name: c
   linguist: C
   extra_extensions:
   # Quake C
   - qc
+  extra_filenames:
+  # Enlightenment configuration file
+  - '*enlightenment/*.cfg'
 ---
 name: caddyfile
 remote: isobit/vim-caddyfile
@@ -601,16 +610,27 @@ filetypes:
   extra_filenames:
   - "*.git/config"
   - "*/.config/git/config"
+  - "*.git/modules/*/config"
+  - "*/git/config"
+  - "*/{.,}gitconfig.d/*"
+  ignored_warnings:
+  - '/etc/gitconfig'
+  - '$XDG_CONFIG_HOME/git/config'
   - "*.git/modules/**/config"
-  - '.gitmodules'
+  - "*.git/modules/**/config"
+  - "/etc/gitconfig.d/*"
 - name: gitrebase
   filenames:
   - git-rebase-todo
 - name: gitsendemail
   filenames:
   - ".gitsendemail.*"
+  ignored_warnings:
+  - '.gitsendemail.msg.??????'
 - name: gitcommit
   filenames:
+  - 'COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG'
+  ignored_warnings:
   - '*.git/{,modules/**/,worktrees/*/}{COMMIT_EDIT,TAG_EDIT,MERGE_,}MSG'
 ---
 name: glsl
@@ -636,6 +656,9 @@ remote: vim-scripts/gnuplot-syntax-highlighting
 filetypes:
 - name: gnuplot
   linguist: Gnuplot
+  extra_extensions:
+  # Gnuplot scripts
+  - gpi
 ---
 name: go
 remote: fatih/vim-go
@@ -662,9 +685,18 @@ filetypes:
 ---
 name: gradle
 remote: tfnico/vim-gradle
+after: groovy
+# Just adds compiler
+filetypes: []
+---
+name: groovy
+remote: vim/vim:runtime
+glob: '**/groovy.vim'
 filetypes:
 - name: groovy
-  linguist: Gradle
+  linguist: Groovy
+  extra_extensions:
+  - gradle
 ---
 name: grub
 remote: vim/vim:runtime
@@ -851,7 +883,6 @@ filetypes:
   linguist: JSONiq
   extra_filenames:
   - ".jqrc"
-  ignored_filenames:
   - ".jqrc*"
 ---
 name: json5
diff --git a/scripts/build b/scripts/build
index 67f01ca38..4a36bbace 100755
--- a/scripts/build
+++ b/scripts/build
@@ -463,7 +463,7 @@ def generate_ftdetect(packages, heuristics)
       extensions = filetype["extensions"]
       filenames = filetype["filenames"]
 
-      expected_extensions = (all_filetypes.has_key?(name) ? all_filetypes.fetch(name)[:extensions] : []).map(&:downcase)
+      expected_extensions = (all_filetypes.has_key?(name) ? all_filetypes.fetch(name)[:extensions] : [])
       ignored_extensions = expand_all(filetype.fetch("ignored_extensions", []))
       ignored_warnings = expand_all(filetype.fetch("ignored_warnings", []))
 
diff --git a/scripts/test_extensions.vim b/scripts/test_extensions.vim
index f2aaf66c2..b0dad2988 100644
--- a/scripts/test_extensions.vim
+++ b/scripts/test_extensions.vim
@@ -6,7 +6,7 @@ function! TestExtension(filetype, filename, content)
     1delete _
     filetype detect
     exec "if &filetype != '" . a:filetype . "' \nthrow &filetype\nendif"
-    exec ":bw!"
+    exec ":q!"
   catch
     echo g:message
     echo "Filename '" . a:filename  . "' does not resolve to extension '" . a:filetype . "'"
diff --git a/syntax/groovy.vim b/syntax/groovy.vim
new file mode 100644
index 000000000..6a4de4d5f
--- /dev/null
+++ b/syntax/groovy.vim
@@ -0,0 +1,454 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy') == -1
+
+" Vim syntax file
+" Language:	Groovy
+" Original Author:	Alessio Pace <billy.corgan AT tiscali.it>
+" Maintainer:	Tobias Rapp <yahuxo+vim AT mailbox.org>
+" Version: 	0.1.17
+" URL:	  http://www.vim.org/scripts/script.php?script_id=945
+" Last Change:	2020 May 26
+
+" THE ORIGINAL AUTHOR'S NOTES:
+"
+" This is my very first vim script, I hope to have
+" done it the right way.
+"
+" I must directly or indirectly thank the author of java.vim and ruby.vim:
+" I copied from them most of the stuff :-)
+"
+" Relies on html.vim
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+"
+" HOWTO USE IT (INSTALL) when not part of the distribution:
+"
+" 1) copy the file in the (global or user's $HOME/.vim/syntax/) syntax folder
+"
+" 2) add this line to recognize groovy files by filename extension:
+"
+" au BufNewFile,BufRead *.groovy  setf groovy
+" in the global vim filetype.vim file or inside $HOME/.vim/filetype.vim
+"
+" 3) add this part to recognize by content groovy script (no extension needed :-)
+"
+"  if did_filetype()
+"    finish
+"  endif
+"  if getline(1) =~ '^#!.*[/\\]groovy\>'
+"    setf groovy
+"  endif
+"
+"  in the global scripts.vim file or in $HOME/.vim/scripts.vim
+"
+" 4) open/write a .groovy file or a groovy script :-)
+"
+" Let me know if you like it or send me patches, so that I can improve it
+" when I have time
+
+" quit when a syntax file was already loaded
+if !exists("main_syntax")
+  if exists("b:current_syntax")
+    finish
+  endif
+  " we define it here so that included files can test for it
+  let main_syntax='groovy'
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" ##########################
+" Java stuff taken from java.vim
+" some characters that cannot be in a groovy program (outside a string)
+" syn match groovyError "[\\@`]"
+"syn match groovyError "<<<\|\.\.\|=>\|<>\|||=\|&&=\|[^-]->\|\*\/"
+"syn match groovyOK "\.\.\."
+
+" keyword definitions
+syn keyword groovyExternal        native package
+syn match groovyExternal          "\<import\>\(\s\+static\>\)\?"
+syn keyword groovyError           goto const
+syn keyword groovyConditional     if else switch
+syn keyword groovyRepeat          while for do
+syn keyword groovyBoolean         true false
+syn keyword groovyConstant        null
+syn keyword groovyTypedef         this super
+syn keyword groovyOperator        new instanceof
+syn keyword groovyType            boolean char byte short int long float double
+syn keyword groovyType            void
+syn keyword groovyType		  Integer Double Date Boolean Float String Array Vector List
+syn keyword groovyStatement       return
+syn keyword groovyStorageClass    static synchronized transient volatile final strictfp serializable
+syn keyword groovyExceptions      throw try catch finally
+syn keyword groovyAssert          assert
+syn keyword groovyMethodDecl      synchronized throws
+syn keyword groovyClassDecl       extends implements interface
+" to differentiate the keyword class from MyClass.class we use a match here
+syn match   groovyTypedef         "\.\s*\<class\>"ms=s+1
+syn keyword groovyClassDecl         enum
+syn match   groovyClassDecl       "^class\>"
+syn match   groovyClassDecl       "[^.]\s*\<class\>"ms=s+1
+syn keyword groovyBranch          break continue nextgroup=groovyUserLabelRef skipwhite
+syn match   groovyUserLabelRef    "\k\+" contained
+syn keyword groovyScopeDecl       public protected private abstract
+
+
+if exists("groovy_highlight_groovy_lang_ids") || exists("groovy_highlight_groovy_lang") || exists("groovy_highlight_all")
+  " groovy.lang.*
+  syn keyword groovyLangClass  Closure MetaMethod GroovyObject
+
+  syn match groovyJavaLangClass "\<System\>"
+  syn keyword groovyJavaLangClass  Cloneable Comparable Runnable Serializable Boolean Byte Class Object
+  syn keyword groovyJavaLangClass  Character CharSequence ClassLoader Compiler
+  " syn keyword groovyJavaLangClass  Integer Double Float Long
+  syn keyword groovyJavaLangClass  InheritableThreadLocal Math Number Object Package Process
+  syn keyword groovyJavaLangClass  Runtime RuntimePermission InheritableThreadLocal
+  syn keyword groovyJavaLangClass  SecurityManager Short StrictMath StackTraceElement
+  syn keyword groovyJavaLangClass  StringBuffer Thread ThreadGroup
+  syn keyword groovyJavaLangClass  ThreadLocal Throwable Void ArithmeticException
+  syn keyword groovyJavaLangClass  ArrayIndexOutOfBoundsException AssertionError
+  syn keyword groovyJavaLangClass  ArrayStoreException ClassCastException
+  syn keyword groovyJavaLangClass  ClassNotFoundException
+  syn keyword groovyJavaLangClass  CloneNotSupportedException Exception
+  syn keyword groovyJavaLangClass  IllegalAccessException
+  syn keyword groovyJavaLangClass  IllegalArgumentException
+  syn keyword groovyJavaLangClass  IllegalMonitorStateException
+  syn keyword groovyJavaLangClass  IllegalStateException
+  syn keyword groovyJavaLangClass  IllegalThreadStateException
+  syn keyword groovyJavaLangClass  IndexOutOfBoundsException
+  syn keyword groovyJavaLangClass  InstantiationException InterruptedException
+  syn keyword groovyJavaLangClass  NegativeArraySizeException NoSuchFieldException
+  syn keyword groovyJavaLangClass  NoSuchMethodException NullPointerException
+  syn keyword groovyJavaLangClass  NumberFormatException RuntimeException
+  syn keyword groovyJavaLangClass  SecurityException StringIndexOutOfBoundsException
+  syn keyword groovyJavaLangClass  UnsupportedOperationException
+  syn keyword groovyJavaLangClass  AbstractMethodError ClassCircularityError
+  syn keyword groovyJavaLangClass  ClassFormatError Error ExceptionInInitializerError
+  syn keyword groovyJavaLangClass  IllegalAccessError InstantiationError
+  syn keyword groovyJavaLangClass  IncompatibleClassChangeError InternalError
+  syn keyword groovyJavaLangClass  LinkageError NoClassDefFoundError
+  syn keyword groovyJavaLangClass  NoSuchFieldError NoSuchMethodError
+  syn keyword groovyJavaLangClass  OutOfMemoryError StackOverflowError
+  syn keyword groovyJavaLangClass  ThreadDeath UnknownError UnsatisfiedLinkError
+  syn keyword groovyJavaLangClass  UnsupportedClassVersionError VerifyError
+  syn keyword groovyJavaLangClass  VirtualMachineError
+
+  syn keyword groovyJavaLangObject clone equals finalize getClass hashCode
+  syn keyword groovyJavaLangObject notify notifyAll toString wait
+
+  hi def link groovyLangClass                   groovyConstant
+  hi def link groovyJavaLangClass               groovyExternal
+  hi def link groovyJavaLangObject              groovyConstant
+  syn cluster groovyTop add=groovyJavaLangObject,groovyJavaLangClass,groovyLangClass
+  syn cluster groovyClasses add=groovyJavaLangClass,groovyLangClass
+endif
+
+
+" Groovy stuff
+syn match groovyOperator "\.\."
+syn match groovyOperator "<\{2,3}"
+syn match groovyOperator ">\{2,3}"
+syn match groovyOperator "->"
+syn match groovyLineComment       '^\%1l#!.*'  " Shebang line
+syn match groovyExceptions        "\<Exception\>\|\<[A-Z]\{1,}[a-zA-Z0-9]*Exception\>"
+
+" Groovy JDK stuff
+syn keyword groovyJDKBuiltin    as def in
+syn keyword groovyJDKOperOverl  div minus plus abs round power multiply
+syn keyword groovyJDKMethods 	each call inject sort print println
+syn keyword groovyJDKMethods    getAt putAt size push pop toList getText writeLine eachLine readLines
+syn keyword groovyJDKMethods    withReader withStream withWriter withPrintWriter write read leftShift
+syn keyword groovyJDKMethods    withWriterAppend readBytes splitEachLine
+syn keyword groovyJDKMethods    newInputStream newOutputStream newPrintWriter newReader newWriter
+syn keyword groovyJDKMethods    compareTo next previous isCase
+syn keyword groovyJDKMethods    times step toInteger upto any collect dump every find findAll grep
+syn keyword groovyJDKMethods    inspect invokeMethods join
+syn keyword groovyJDKMethods    getErr getIn getOut waitForOrKill
+syn keyword groovyJDKMethods    count tokenize asList flatten immutable intersect reverse reverseEach
+syn keyword groovyJDKMethods    subMap append asWritable eachByte eachLine eachFile
+syn cluster groovyTop add=groovyJDKBuiltin,groovyJDKOperOverl,groovyJDKMethods
+
+" no useful I think, so I comment it..
+"if filereadable(expand("<sfile>:p:h")."/groovyid.vim")
+ " source <sfile>:p:h/groovyid.vim
+"endif
+
+if exists("groovy_space_errors")
+  if !exists("groovy_no_trail_space_error")
+    syn match   groovySpaceError  "\s\+$"
+  endif
+  if !exists("groovy_no_tab_space_error")
+    syn match   groovySpaceError  " \+\t"me=e-1
+  endif
+endif
+
+" it is a better case construct than java.vim to match groovy syntax
+syn region  groovyLabelRegion     transparent matchgroup=groovyLabel start="\<case\>" matchgroup=NONE end=":\|$" contains=groovyNumber,groovyString,groovyLangClass,groovyJavaLangClass
+syn match   groovyUserLabel       "^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=groovyLabel
+syn keyword groovyLabel           default
+
+if !exists("groovy_allow_cpp_keywords")
+  syn keyword groovyError auto delete extern friend inline redeclared
+  syn keyword groovyError register signed sizeof struct template typedef union
+  syn keyword groovyError unsigned operator
+endif
+
+" The following cluster contains all groovy groups except the contained ones
+syn cluster groovyTop add=groovyExternal,groovyError,groovyError,groovyBranch,groovyLabelRegion,groovyLabel,groovyConditional,groovyRepeat,groovyBoolean,groovyConstant,groovyTypedef,groovyOperator,groovyType,groovyType,groovyStatement,groovyStorageClass,groovyAssert,groovyExceptions,groovyMethodDecl,groovyClassDecl,groovyClassDecl,groovyClassDecl,groovyScopeDecl,groovyError,groovyError2,groovyUserLabel,groovyLangObject
+
+
+" Comments
+syn keyword groovyTodo             contained TODO FIXME XXX
+if exists("groovy_comment_strings")
+  syn region  groovyCommentString    contained start=+"+ end=+"+ end=+$+ end=+\*/+me=s-1,he=s-1 contains=groovySpecial,groovyCommentStar,groovySpecialChar,@Spell
+  syn region  groovyComment2String   contained start=+"+  end=+$\|"+  contains=groovySpecial,groovySpecialChar,@Spell
+  syn match   groovyCommentCharacter contained "'\\[^']\{1,6\}'" contains=groovySpecialChar
+  syn match   groovyCommentCharacter contained "'\\''" contains=groovySpecialChar
+  syn match   groovyCommentCharacter contained "'[^\\]'"
+  syn cluster groovyCommentSpecial add=groovyCommentString,groovyCommentCharacter,groovyNumber
+  syn cluster groovyCommentSpecial2 add=groovyComment2String,groovyCommentCharacter,groovyNumber
+endif
+syn region  groovyComment          start="/\*"  end="\*/" contains=@groovyCommentSpecial,groovyTodo,@Spell
+syn match   groovyCommentStar      contained "^\s*\*[^/]"me=e-1
+syn match   groovyCommentStar      contained "^\s*\*$"
+syn match   groovyLineComment      "//.*" contains=@groovyCommentSpecial2,groovyTodo,@Spell
+hi def link groovyCommentString groovyString
+hi def link groovyComment2String groovyString
+hi def link groovyCommentCharacter groovyCharacter
+
+syn cluster groovyTop add=groovyComment,groovyLineComment
+
+if !exists("groovy_ignore_groovydoc") && main_syntax != 'jsp'
+  syntax case ignore
+  " syntax coloring for groovydoc comments (HTML)
+  " syntax include @groovyHtml <sfile>:p:h/html.vim
+   syntax include @groovyHtml runtime! syntax/html.vim
+  unlet b:current_syntax
+  syntax spell default  " added by Bram
+  syn region  groovyDocComment    start="/\*\*"  end="\*/" keepend contains=groovyCommentTitle,@groovyHtml,groovyDocTags,groovyTodo,@Spell
+  syn region  groovyCommentTitle  contained matchgroup=groovyDocComment start="/\*\*"   matchgroup=groovyCommentTitle keepend end="\.$" end="\.[ \t\r<&]"me=e-1 end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1 contains=@groovyHtml,groovyCommentStar,groovyTodo,@Spell,groovyDocTags
+
+  syn region groovyDocTags  contained start="{@\(link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}"
+  syn match  groovyDocTags  contained "@\(see\|param\|exception\|throws\|since\)\s\+\S\+" contains=groovyDocParam
+  syn match  groovyDocParam contained "\s\S\+"
+  syn match  groovyDocTags  contained "@\(version\|author\|return\|deprecated\|serial\|serialField\|serialData\)\>"
+  syntax case match
+endif
+
+" match the special comment /**/
+syn match   groovyComment          "/\*\*/"
+
+" Strings and constants
+syn match   groovySpecialError     contained "\\."
+syn match   groovySpecialCharError contained "[^']"
+syn match   groovySpecialChar      contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\|\$\)"
+syn match   groovyRegexChar        contained "\\."
+syn region  groovyString          start=+"+ end=+"+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
+syn region  groovyString          start=+'+ end=+'+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell
+syn region  groovyString          start=+"""+ end=+"""+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
+syn region  groovyString          start=+'''+ end=+'''+ contains=groovySpecialChar,groovySpecialError,@Spell
+if exists("groovy_regex_strings")
+  " regex strings interfere with the division operator and thus are disabled
+  " by default
+  syn region groovyString         start='/[^/*]' end='/' contains=groovySpecialChar,groovyRegexChar,groovyELExpr
+endif
+" syn region groovyELExpr start=+${+ end=+}+ keepend contained
+syn match groovyELExpr /\${.\{-}}/ contained
+syn match groovyELExpr /\$[a-zA-Z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE_][a-zA-Z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE0-9_.]*/ contained
+hi def link groovyELExpr Identifier
+
+" TODO: better matching. I am waiting to understand how it really works in groovy
+" syn region  groovyClosureParamsBraces          start=+|+ end=+|+ contains=groovyClosureParams
+" syn match groovyClosureParams	"[ a-zA-Z0-9_*]\+" contained
+" hi def link groovyClosureParams Identifier
+
+" next line disabled, it can cause a crash for a long line
+"syn match   groovyStringError      +"\([^"\\]\|\\.\)*$+
+
+" disabled: in groovy strings or characters are written the same
+" syn match   groovyCharacter        "'[^']*'" contains=groovySpecialChar,groovySpecialCharError
+" syn match   groovyCharacter        "'\\''" contains=groovySpecialChar
+" syn match   groovyCharacter        "'[^\\]'"
+syn match   groovyNumber           "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
+syn match   groovyNumber           "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
+syn match   groovyNumber           "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
+syn match   groovyNumber           "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
+
+" unicode characters
+syn match   groovySpecial "\\u\d\{4\}"
+
+syn cluster groovyTop add=groovyString,groovyCharacter,groovyNumber,groovySpecial,groovyStringError
+
+if exists("groovy_highlight_functions")
+  if groovy_highlight_functions == "indent"
+    syn match  groovyFuncDef "^\(\t\| \{8\}\)[_$a-zA-Z][_$a-zA-Z0-9_. \[\]]*([^-+*/()]*)" contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn region groovyFuncDef start=+^\(\t\| \{8\}\)[$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn match  groovyFuncDef "^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*)" contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn region groovyFuncDef start=+^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+  else
+    " This line catches method declarations at any indentation>0, but it assumes
+    " two things:
+    "   1. class names are always capitalized (ie: Button)
+    "   2. method names are never capitalized (except constructors, of course)
+    syn region groovyFuncDef start=+^\s\+\(\(public\|protected\|private\|static\|abstract\|final\|native\|synchronized\)\s\+\)*\(\(void\|boolean\|char\|byte\|short\|int\|long\|float\|double\|\([A-Za-z_][A-Za-z0-9_$]*\.\)*[A-Z][A-Za-z0-9_$]*\)\(<[^>]*>\)\=\(\[\]\)*\s\+[a-z][A-Za-z0-9_$]*\|[A-Z][A-Za-z0-9_$]*\)\s*([^0-9]+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,groovyComment,groovyLineComment,@groovyClasses
+  endif
+  syn match  groovyBraces  "[{}]"
+  syn cluster groovyTop add=groovyFuncDef,groovyBraces
+endif
+
+if exists("groovy_highlight_debug")
+
+  " Strings and constants
+  syn match   groovyDebugSpecial          contained "\\\d\d\d\|\\."
+  syn region  groovyDebugString           contained start=+"+  end=+"+  contains=groovyDebugSpecial
+  syn match   groovyDebugStringError      +"\([^"\\]\|\\.\)*$+
+  syn match   groovyDebugCharacter        contained "'[^\\]'"
+  syn match   groovyDebugSpecialCharacter contained "'\\.'"
+  syn match   groovyDebugSpecialCharacter contained "'\\''"
+  syn match   groovyDebugNumber           contained "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
+  syn match   groovyDebugNumber           contained "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
+  syn match   groovyDebugNumber           contained "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
+  syn match   groovyDebugNumber           contained "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
+  syn keyword groovyDebugBoolean          contained true false
+  syn keyword groovyDebugType             contained null this super
+  syn region groovyDebugParen  start=+(+ end=+)+ contained contains=groovyDebug.*,groovyDebugParen
+
+  " to make this work you must define the highlighting for these groups
+  syn match groovyDebug "\<System\.\(out\|err\)\.print\(ln\)*\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
+  syn match groovyDebug "\<p\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
+  syn match groovyDebug "[A-Za-z][a-zA-Z0-9_]*\.printStackTrace\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
+  syn match groovyDebug "\<trace[SL]\=\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
+
+  syn cluster groovyTop add=groovyDebug
+
+  hi def link groovyDebug                 Debug
+  hi def link groovyDebugString           DebugString
+  hi def link groovyDebugStringError      groovyError
+  hi def link groovyDebugType             DebugType
+  hi def link groovyDebugBoolean          DebugBoolean
+  hi def link groovyDebugNumber           Debug
+  hi def link groovyDebugSpecial          DebugSpecial
+  hi def link groovyDebugSpecialCharacter DebugSpecial
+  hi def link groovyDebugCharacter        DebugString
+  hi def link groovyDebugParen            Debug
+
+  hi def link DebugString               String
+  hi def link DebugSpecial              Special
+  hi def link DebugBoolean              Boolean
+  hi def link DebugType                 Type
+endif
+
+" Match all Exception classes
+syn match groovyExceptions        "\<Exception\>\|\<[A-Z]\{1,}[a-zA-Z0-9]*Exception\>"
+
+
+if !exists("groovy_minlines")
+  let groovy_minlines = 10
+endif
+exec "syn sync ccomment groovyComment minlines=" . groovy_minlines
+
+
+" ###################
+" Groovy stuff
+" syn match groovyOperator		"|[ ,a-zA-Z0-9_*]\+|"
+
+" All groovy valid tokens
+" syn match groovyTokens ";\|,\|<=>\|<>\|:\|:=\|>\|>=\|=\|==\|<\|<=\|!=\|/\|/=\|\.\.|\.\.\.\|\~=\|\~=="
+" syn match groovyTokens "\*=\|&\|&=\|\*\|->\|\~\|+\|-\|/\|?\|<<<\|>>>\|<<\|>>"
+
+" Must put explicit these ones because groovy.vim mark them as errors otherwise
+" syn match groovyTokens "<=>\|<>\|==\~"
+"syn cluster groovyTop add=groovyTokens
+
+" Mark these as operators
+
+" Hightlight brackets
+" syn match  groovyBraces		"[{}]"
+" syn match  groovyBraces		"[\[\]]"
+" syn match  groovyBraces		"[\|]"
+
+if exists("groovy_mark_braces_in_parens_as_errors")
+  syn match groovyInParen          contained "[{}]"
+  hi def link groovyInParen        groovyError
+  syn cluster groovyTop add=groovyInParen
+endif
+
+" catch errors caused by wrong parenthesis
+syn region  groovyParenT  transparent matchgroup=groovyParen  start="("  end=")" contains=@groovyTop,groovyParenT1
+syn region  groovyParenT1 transparent matchgroup=groovyParen1 start="(" end=")" contains=@groovyTop,groovyParenT2 contained
+syn region  groovyParenT2 transparent matchgroup=groovyParen2 start="(" end=")" contains=@groovyTop,groovyParenT  contained
+syn match   groovyParenError       ")"
+hi def link groovyParenError       groovyError
+
+" catch errors caused by wrong square parenthesis
+syn region  groovyParenT  transparent matchgroup=groovyParen  start="\["  end="\]" contains=@groovyTop,groovyParenT1
+syn region  groovyParenT1 transparent matchgroup=groovyParen1 start="\[" end="\]" contains=@groovyTop,groovyParenT2 contained
+syn region  groovyParenT2 transparent matchgroup=groovyParen2 start="\[" end="\]" contains=@groovyTop,groovyParenT  contained
+syn match   groovyParenError       "\]"
+
+" ###############################
+" java.vim default highlighting
+hi def link groovyFuncDef		Function
+hi def link groovyBraces		Function
+hi def link groovyBranch		Conditional
+hi def link groovyUserLabelRef	groovyUserLabel
+hi def link groovyLabel		Label
+hi def link groovyUserLabel		Label
+hi def link groovyConditional	Conditional
+hi def link groovyRepeat		Repeat
+hi def link groovyExceptions		Exception
+hi def link groovyAssert 		Statement
+hi def link groovyStorageClass	StorageClass
+hi def link groovyMethodDecl		groovyStorageClass
+hi def link groovyClassDecl		groovyStorageClass
+hi def link groovyScopeDecl		groovyStorageClass
+hi def link groovyBoolean		Boolean
+hi def link groovySpecial		Special
+hi def link groovySpecialError	Error
+hi def link groovySpecialCharError	Error
+hi def link groovyString		String
+hi def link groovyRegexChar		String
+hi def link groovyCharacter		Character
+hi def link groovySpecialChar	SpecialChar
+hi def link groovyNumber		Number
+hi def link groovyError		Error
+hi def link groovyStringError	Error
+hi def link groovyStatement		Statement
+hi def link groovyOperator		Operator
+hi def link groovyComment		Comment
+hi def link groovyDocComment		Comment
+hi def link groovyLineComment	Comment
+hi def link groovyConstant		Constant
+hi def link groovyTypedef		Typedef
+hi def link groovyTodo		Todo
+
+hi def link groovyCommentTitle	SpecialComment
+hi def link groovyDocTags		Special
+hi def link groovyDocParam		Function
+hi def link groovyCommentStar	groovyComment
+
+hi def link groovyType		Type
+hi def link groovyExternal		Include
+
+hi def link htmlComment		Special
+hi def link htmlCommentPart		Special
+hi def link groovySpaceError		Error
+hi def link groovyJDKBuiltin         Special
+hi def link groovyJDKOperOverl       Operator
+hi def link groovyJDKMethods         Function
+
+
+let b:current_syntax = "groovy"
+if main_syntax == 'groovy'
+  unlet main_syntax
+endif
+
+let b:spell_options="contained"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8
+
+endif

From 5e5d127eb8a9a9f4339b60b7f46ec36a359c0211 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 8 Sep 2020 22:41:51 +0200
Subject: [PATCH 026/299] Add expect (fix tests)

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f9005acb4..2e31e4044 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
       run: |
         sudo add-apt-repository ppa:jonathonf/vim -y
         sudo apt-get update -q
-        sudo apt-get install -y vim
+        sudo apt-get install -y vim expect
         vim --version
     - uses: actions/checkout@v2
     - name: Run Tests

From a4a9481d372af2e8bb0469f533e4b047b3a384fb Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Sep 2020 11:58:14 +0200
Subject: [PATCH 027/299] Fix disabling autoindent, closes #541

---
 ftdetect/polyglot.vim | 244 +++++++++++++++++++++---------------------
 1 file changed, 121 insertions(+), 123 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 9408c2887..aed797ab9 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1777,160 +1777,158 @@ au BufNewFile,BufRead,StdinReadPost *
   \ | call polyglot#Heuristics() | endif
 
 
-if v:version < 700 || &cp
-  finish
-endif
-
+if !has_key(s:disabled_packages, 'helm')
 
-" Code below re-implements sleuth for vim-polyglot
-let g:loaded_sleuth = 1
+  " Code below re-implements sleuth for vim-polyglot
+  let g:loaded_sleuth = 1
 
-" Makes shiftwidth to be synchronized with tabstop by default
-if &shiftwidth == &tabstop
-  let &shiftwidth = 0
-endif
-
-function! s:guess(lines) abort
-  let options = {}
-  let ccomment = 0
-  let podcomment = 0
-  let triplequote = 0
-  let backtick = 0
-  let xmlcomment = 0
-  let heredoc = ''
-  let minindent = 10
-  let spaces_minus_tabs = 0
+  " Makes shiftwidth to be synchronized with tabstop by default
+  if &shiftwidth == &tabstop
+    let &shiftwidth = 0
+  endif
 
-  for line in a:lines
-    if !len(line) || line =~# '^\W*$'
-      continue
-    endif
+  function! s:guess(lines) abort
+    let options = {}
+    let ccomment = 0
+    let podcomment = 0
+    let triplequote = 0
+    let backtick = 0
+    let xmlcomment = 0
+    let heredoc = ''
+    let minindent = 10
+    let spaces_minus_tabs = 0
+
+    for line in a:lines
+      if !len(line) || line =~# '^\W*$'
+        continue
+      endif
 
-    if line =~# '^\s*/\*'
-      let ccomment = 1
-    endif
-    if ccomment
-      if line =~# '\*/'
-        let ccomment = 0
+      if line =~# '^\s*/\*'
+        let ccomment = 1
+      endif
+      if ccomment
+        if line =~# '\*/'
+          let ccomment = 0
+        endif
+        continue
       endif
-      continue
-    endif
 
-    if line =~# '^=\w'
-      let podcomment = 1
-    endif
-    if podcomment
-      if line =~# '^=\%(end\|cut\)\>'
-        let podcomment = 0
+      if line =~# '^=\w'
+        let podcomment = 1
+      endif
+      if podcomment
+        if line =~# '^=\%(end\|cut\)\>'
+          let podcomment = 0
+        endif
+        continue
       endif
-      continue
-    endif
 
-    if triplequote
-      if line =~# '^[^"]*"""[^"]*$'
-        let triplequote = 0
+      if triplequote
+        if line =~# '^[^"]*"""[^"]*$'
+          let triplequote = 0
+        endif
+        continue
+      elseif line =~# '^[^"]*"""[^"]*$'
+        let triplequote = 1
       endif
-      continue
-    elseif line =~# '^[^"]*"""[^"]*$'
-      let triplequote = 1
-    endif
 
-    if backtick
-      if line =~# '^[^`]*`[^`]*$'
-        let backtick = 0
+      if backtick
+        if line =~# '^[^`]*`[^`]*$'
+          let backtick = 0
+        endif
+        continue
+      elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
+        let backtick = 1
       endif
-      continue
-    elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
-      let backtick = 1
-    endif
 
-    if line =~# '^\s*<\!--'
-      let xmlcomment = 1
-    endif
-    if xmlcomment
-      if line =~# '-->'
-        let xmlcomment = 0
+      if line =~# '^\s*<\!--'
+        let xmlcomment = 1
+      endif
+      if xmlcomment
+        if line =~# '-->'
+          let xmlcomment = 0
+        endif
+        continue
       endif
-      continue
-    endif
 
-    " This is correct order because both "<<EOF" and "EOF" matches end
-    if heredoc != ''
-      if line =~# heredoc
-        let heredoc = ''
+      " This is correct order because both "<<EOF" and "EOF" matches end
+      if heredoc != ''
+        if line =~# heredoc
+          let heredoc = ''
+        endif
+        continue
+      endif
+      let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
+      if len(herematch) > 0
+        let heredoc = herematch[1] . '$'
       endif
-      continue
-    endif
-    let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
-    if len(herematch) > 0
-      let heredoc = herematch[1] . '$'
-    endif
 
-    let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
+      let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
 
-    if line[0] == "\t"
-      setlocal noexpandtab
-      return 1
-    elseif line[0] == " "
-      let indent = len(matchstr(line, '^ *'))
-      if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
-        let minindent = indent
+      if line[0] == "\t"
+        setlocal noexpandtab
+        return 1
+      elseif line[0] == " "
+        let indent = len(matchstr(line, '^ *'))
+        if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
+          let minindent = indent
+        endif
       endif
-    endif
-  endfor
+    endfor
 
-  if minindent < 10
-    setlocal expandtab
-    let &shiftwidth=minindent
-    return 1
-  endif
+    if minindent < 10
+      setlocal expandtab
+      let &shiftwidth=minindent
+      return 1
+    endif
 
-  return 0
-endfunction
+    return 0
+  endfunction
 
-function! s:detect_indent() abort
-  if &buftype ==# 'help'
-    return
-  endif
+  function! s:detect_indent() abort
+    if &buftype ==# 'help'
+      return
+    endif
 
-  if s:guess(getline(1, 32))
-    return
-  endif
-  let pattern = sleuth#GlobForFiletype(&filetype)
-  if len(pattern) == 0
-    return
-  endif
-  let pattern = '{' . pattern . ',.git,.svn,.hg}'
-  let dir = expand('%:p:h')
-  let level = 3
-  while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
-    " Ignore files from homedir and root 
-    if dir == expand('~') || dir == '/'
+    if s:guess(getline(1, 32))
+      return
+    endif
+    let pattern = sleuth#GlobForFiletype(&filetype)
+    if len(pattern) == 0
       return
     endif
-    for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
-      " Do not consider directories above .git, .svn or .hg
-      if fnamemodify(neighbor, ":h:t")[0] == "."
+    let pattern = '{' . pattern . ',.git,.svn,.hg}'
+    let dir = expand('%:p:h')
+    let level = 3
+    while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
+      " Ignore files from homedir and root 
+      if dir == expand('~') || dir == '/'
         return
       endif
-      if neighbor !=# expand('%:p') && filereadable(neighbor)
-        if s:guess(readfile(neighbor, '', 32))
+      for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
+        " Do not consider directories above .git, .svn or .hg
+        if fnamemodify(neighbor, ":h:t")[0] == "."
           return
         endif
-      endif
-    endfor
+        if neighbor !=# expand('%:p') && filereadable(neighbor)
+          if s:guess(readfile(neighbor, '', 32))
+            return
+          endif
+        endif
+      endfor
 
-    let dir = fnamemodify(dir, ':h')
-    let level -= 1
-  endwhile
-endfunction
+      let dir = fnamemodify(dir, ':h')
+      let level -= 1
+    endwhile
+  endfunction
 
-setglobal smarttab
+  setglobal smarttab
 
-augroup polyglot
-  autocmd!
-  autocmd FileType * call s:detect_indent()
-augroup END
+  augroup polyglot
+    autocmd!
+    autocmd FileType * call s:detect_indent()
+  augroup END
+endif
 
 " restore Vi compatibility settings
 let &cpo = s:cpo_save

From cecfb5dd10497d09fc46e85c15c383166d9fb22a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Sep 2020 16:45:51 +0200
Subject: [PATCH 028/299] Fix disabling autoindent, #541

---
 ftdetect/polyglot.vim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index aed797ab9..7b2439015 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1777,8 +1777,7 @@ au BufNewFile,BufRead,StdinReadPost *
   \ | call polyglot#Heuristics() | endif
 
 
-if !has_key(s:disabled_packages, 'helm')
-
+if !has_key(s:disabled_packages, 'autoindent')
   " Code below re-implements sleuth for vim-polyglot
   let g:loaded_sleuth = 1
 

From 2e1a9806326445c5cbdbb3b0cc7d82c7a16881b0 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Sep 2020 16:48:49 +0200
Subject: [PATCH 029/299] Add missing functions from Sleuth, #541

---
 ftdetect/polyglot.vim | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 7b2439015..fd1dd3d70 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1923,10 +1923,24 @@ if !has_key(s:disabled_packages, 'autoindent')
 
   setglobal smarttab
 
+  function! SleuthIndicator() abort
+    let sw = &shiftwidth ? &shiftwidth : &tabstop
+    if &expandtab
+      return 'sw='.sw
+    elseif &tabstop == sw
+      return 'ts='.&tabstop
+    else
+      return 'sw='.sw.',ts='.&tabstop
+    endif
+  endfunction
+
   augroup polyglot
     autocmd!
     autocmd FileType * call s:detect_indent()
+    autocmd User Flags call Hoist('buffer', 5, 'SleuthIndicator')
   augroup END
+
+  command! -bar -bang Sleuth call s:detect_indent()
 endif
 
 " restore Vi compatibility settings

From 2fe310256e82ec8c4c160ebc171fe18c8da06330 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Sep 2020 17:08:29 +0200
Subject: [PATCH 030/299] Transcompile ..= operator to support old vims, fixes
 #542

---
 ftplugin/yaml.vim | 2 +-
 scripts/build     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim
index 2e9728bd6..261d71ca8 100644
--- a/ftplugin/yaml.vim
+++ b/ftplugin/yaml.vim
@@ -19,7 +19,7 @@ setlocal comments=:# commentstring=#\ %s expandtab
 setlocal formatoptions-=t formatoptions+=croql
 
 if !exists("g:yaml_recommended_style") || g:yaml_recommended_style != 0
-  let b:undo_ftplugin ..= " sw< sts<"
+  let b:undo_ftplugin .= " sw< sts<"
   setlocal shiftwidth=2 softtabstop=2
 endif
 
diff --git a/scripts/build b/scripts/build
index 4a36bbace..699933740 100755
--- a/scripts/build
+++ b/scripts/build
@@ -175,7 +175,9 @@ def copy_file(package, src, dest)
       else
         output << "if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '#{name}') == -1\n\n"
       end
-      IO.copy_stream(input, output)
+      contents = File.read(input)
+      contents.gsub!(' ..= ', ' .= ')
+      output << contents
       output << "\nendif\n"
     end
   end

From a4cc3f64f98e71373e5ee9e566cde17bee723b63 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Sep 2020 17:39:27 +0200
Subject: [PATCH 031/299] Make it easier to debug indentation issues, #542

---
 ftdetect/polyglot.vim | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index fd1dd3d70..c5a47471e 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1780,6 +1780,7 @@ au BufNewFile,BufRead,StdinReadPost *
 if !has_key(s:disabled_packages, 'autoindent')
   " Code below re-implements sleuth for vim-polyglot
   let g:loaded_sleuth = 1
+  let g:loaded_foobar = 1
 
   " Makes shiftwidth to be synchronized with tabstop by default
   if &shiftwidth == &tabstop
@@ -1871,6 +1872,7 @@ if !has_key(s:disabled_packages, 'autoindent')
         let indent = len(matchstr(line, '^ *'))
         if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
           let minindent = indent
+          let b:sleuth_culprit .= ":" . line
         endif
       endif
     endfor
@@ -1881,6 +1883,7 @@ if !has_key(s:disabled_packages, 'autoindent')
       return 1
     endif
 
+    unlet b:sleuth_culprit
     return 0
   endfunction
 
@@ -1889,6 +1892,7 @@ if !has_key(s:disabled_packages, 'autoindent')
       return
     endif
 
+    let b:sleuth_culprit = expand("<amatch>")
     if s:guess(getline(1, 32))
       return
     endif
@@ -1905,6 +1909,7 @@ if !has_key(s:disabled_packages, 'autoindent')
         return
       endif
       for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
+        let b:sleuth_culprit = neighbor
         " Do not consider directories above .git, .svn or .hg
         if fnamemodify(neighbor, ":h:t")[0] == "."
           return

From 46affb6153698d9b5678fdb59b5921ffd53aff13 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Sep 2020 17:50:40 +0200
Subject: [PATCH 032/299] Show warning if g:polyglot_disabled is not at the top
 of .vimrc

---
 ftdetect/polyglot.vim | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index c5a47471e..37a2525e8 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -13,6 +13,8 @@ if exists('g:polyglot_disabled')
   for pkg in g:polyglot_disabled
     let s:disabled_packages[pkg] = 1
   endfor
+else
+  let g:polyglot_disabled_not_set = 1
 endif
 
 function! s:SetDefault(name, value)
@@ -1948,6 +1950,20 @@ if !has_key(s:disabled_packages, 'autoindent')
   command! -bar -bang Sleuth call s:detect_indent()
 endif
 
+func! s:verify()
+  if exists("g:polyglot_disabled_not_set")
+    if exists("g:polyglot_disabled")
+      echohl WarningMsg
+      echo "vim-polyglot: g:polyglot_disabled should be at the top of .vimrc"
+      echohl None
+    endif
+
+    unlet g:polyglot_disabled_not_set
+  endif
+endfunc
+
+autocmd VimEnter * call s:verify()
+
 " restore Vi compatibility settings
 let &cpo = s:cpo_save
 unlet s:cpo_save

From 2369cd5d2290c97b69a540dd88222a4ddcb1fe14 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Sep 2020 18:02:38 +0200
Subject: [PATCH 033/299] Make b:sleuth_culprit more readable

---
 ftdetect/polyglot.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 37a2525e8..f44a19591 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1799,8 +1799,10 @@ if !has_key(s:disabled_packages, 'autoindent')
     let heredoc = ''
     let minindent = 10
     let spaces_minus_tabs = 0
+    let i = 1
 
     for line in a:lines
+      let i += 1
       if !len(line) || line =~# '^\W*$'
         continue
       endif
@@ -1874,7 +1876,7 @@ if !has_key(s:disabled_packages, 'autoindent')
         let indent = len(matchstr(line, '^ *'))
         if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
           let minindent = indent
-          let b:sleuth_culprit .= ":" . line
+          let b:sleuth_culprit .= ':' . i
         endif
       endif
     endfor

From 2dc954d6fa15c897da59ff14aa4d5991a3329eb5 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Sep 2020 18:07:03 +0200
Subject: [PATCH 034/299] Last fixes to b:sleuth_culprit

---
 ftdetect/polyglot.vim | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index f44a19591..ee74a2935 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1887,7 +1887,6 @@ if !has_key(s:disabled_packages, 'autoindent')
       return 1
     endif
 
-    unlet b:sleuth_culprit
     return 0
   endfunction
 
@@ -1910,13 +1909,15 @@ if !has_key(s:disabled_packages, 'autoindent')
     while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
       " Ignore files from homedir and root 
       if dir == expand('~') || dir == '/'
+        unlet b:sleuth_culprit
         return
       endif
       for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
         let b:sleuth_culprit = neighbor
         " Do not consider directories above .git, .svn or .hg
         if fnamemodify(neighbor, ":h:t")[0] == "."
-          return
+          let level = 0
+          continue
         endif
         if neighbor !=# expand('%:p') && filereadable(neighbor)
           if s:guess(readfile(neighbor, '', 32))
@@ -1928,6 +1929,8 @@ if !has_key(s:disabled_packages, 'autoindent')
       let dir = fnamemodify(dir, ':h')
       let level -= 1
     endwhile
+
+    unlet b:sleuth_culprit
   endfunction
 
   setglobal smarttab

From 49840b1893a9ad442c5b7cf65203af47c032e156 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Sep 2020 18:28:23 +0200
Subject: [PATCH 035/299] Show full path in b:sleuth_culprit

---
 ftdetect/polyglot.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index ee74a2935..273cf26b9 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1775,7 +1775,7 @@ endif
 " end filetypes
 
 au BufNewFile,BufRead,StdinReadPost * 
-  \ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat 
+  \ if !did_filetype() && expand("<afile>") !~ g:ft_ignore_pat 
   \ | call polyglot#Heuristics() | endif
 
 
@@ -1895,7 +1895,7 @@ if !has_key(s:disabled_packages, 'autoindent')
       return
     endif
 
-    let b:sleuth_culprit = expand("<amatch>")
+    let b:sleuth_culprit = expand("<afile>:p")
     if s:guess(getline(1, 32))
       return
     endif

From 0ff5d451b0079f5be723276007cfbcc3d1fd06ca Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Sep 2020 18:31:30 +0200
Subject: [PATCH 036/299] Fix b:sleuth_culprit for tabs

---
 ftdetect/polyglot.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 273cf26b9..c13df5169 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1799,10 +1799,11 @@ if !has_key(s:disabled_packages, 'autoindent')
     let heredoc = ''
     let minindent = 10
     let spaces_minus_tabs = 0
-    let i = 1
+    let i = 0
 
     for line in a:lines
       let i += 1
+
       if !len(line) || line =~# '^\W*$'
         continue
       endif
@@ -1871,6 +1872,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
       if line[0] == "\t"
         setlocal noexpandtab
+        let b:sleuth_culprit .= ':' . i
         return 1
       elseif line[0] == " "
         let indent = len(matchstr(line, '^ *'))

From 4f7a4036eb4f4d64fa5f30e55f23fbb0de4680dc Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Sep 2020 19:08:17 +0200
Subject: [PATCH 037/299] Finally fix issues with tab detection, #541

---
 ftdetect/polyglot.vim | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index c13df5169..a7f808e6a 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1872,13 +1872,13 @@ if !has_key(s:disabled_packages, 'autoindent')
 
       if line[0] == "\t"
         setlocal noexpandtab
+        let &shiftwidth=&tabstop
         let b:sleuth_culprit .= ':' . i
         return 1
       elseif line[0] == " "
         let indent = len(matchstr(line, '^ *'))
         if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
           let minindent = indent
-          let b:sleuth_culprit .= ':' . i
         endif
       endif
     endfor
@@ -1886,6 +1886,7 @@ if !has_key(s:disabled_packages, 'autoindent')
     if minindent < 10
       setlocal expandtab
       let &shiftwidth=minindent
+      let b:sleuth_culprit .= ':' . i
       return 1
     endif
 
@@ -1971,6 +1972,9 @@ endfunc
 
 autocmd VimEnter * call s:verify()
 
+set sw=3
+set ts=8
+
 " restore Vi compatibility settings
 let &cpo = s:cpo_save
 unlet s:cpo_save

From 19a69cf77d521d6f3856d2f5c1a2faa678b937ba Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Sep 2020 19:22:27 +0200
Subject: [PATCH 038/299] Remove debugging code...

---
 ftdetect/polyglot.vim | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index a7f808e6a..432b5e010 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1972,9 +1972,6 @@ endfunc
 
 autocmd VimEnter * call s:verify()
 
-set sw=3
-set ts=8
-
 " restore Vi compatibility settings
 let &cpo = s:cpo_save
 unlet s:cpo_save

From fb7cf8a9ab782d67db5aa71bffac67e63fcc0c4c Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 10 Sep 2020 10:30:32 +0200
Subject: [PATCH 039/299] Update

---
 after/ftplugin/javascript.vim      | 44 +++++-----------------
 after/ftplugin/javascriptreact.vim |  2 +-
 after/ftplugin/jsx.vim             | 35 ++++++++++++++++++
 after/indent/javascript.vim        | 30 ++-------------
 after/indent/javascriptreact.vim   |  2 +-
 after/indent/jsx.vim               | 33 +++++++++++++++++
 after/syntax/javascript.vim        | 56 ++--------------------------
 after/syntax/javascriptreact.vim   |  2 +-
 after/syntax/jsx.vim               | 59 ++++++++++++++++++++++++++++++
 after/syntax/reason/graphql.vim    |  2 +-
 autoload/go/config.vim             |  8 ++++
 doc/graphql.txt                    |  3 +-
 doc/vim-go.txt                     | 20 +++++++++-
 doc/vim-jsx-pretty-doc.txt         |  1 +
 ftdetect/polyglot.vim              |  8 ++--
 packages.yaml                      |  1 +
 scripts/test_filetypes.vim         |  2 +-
 syntax/go.vim                      |  4 +-
 18 files changed, 183 insertions(+), 129 deletions(-)
 create mode 100644 after/ftplugin/jsx.vim
 create mode 100644 after/indent/jsx.vim
 create mode 100644 after/syntax/jsx.vim

diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
index a590e11d5..8ff3938a3 100644
--- a/after/ftplugin/javascript.vim
+++ b/after/ftplugin/javascript.vim
@@ -1,3 +1,12 @@
+if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+
+if get(g:, 'vim_jsx_pretty_disable_js', 0)
+  finish
+endif
+
+source <sfile>:h/jsx.vim
+
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 " Vim filetype plugin file
@@ -14,38 +23,3 @@ else
 endif
 
 endif
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim ftplugin file
-"
-" Language: javascript.jsx
-" Maintainer: MaxMEllon <maxmellon1994@gmail.com>
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-" modified from html.vim
-" For matchit plugin
-if exists("loaded_matchit")
-  let b:match_ignorecase = 0
-  let b:match_words = '(:),\[:\],{:},<:>,' .
-        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
-endif
-
-" For andymass/vim-matchup plugin
-if exists("loaded_matchup")
-  setlocal matchpairs=(:),{:},[:],<:>
-  let b:match_words = '<\@<=\([^/][^ \t>]*\)\g{hlend}[^>]*\%(/\@<!>\|$\):<\@<=/\1>'
-  let b:match_skip = 's:comment\|string'
-endif
-
-let b:jsx_pretty_old_cms = &l:commentstring
-
-augroup jsx_comment
-  autocmd! CursorMoved <buffer>
-  autocmd CursorMoved <buffer> call jsx_pretty#comment#update_commentstring(b:jsx_pretty_old_cms)
-augroup end
-
-setlocal suffixesadd+=.jsx
-
-endif
diff --git a/after/ftplugin/javascriptreact.vim b/after/ftplugin/javascriptreact.vim
index ab847072d..265415d0e 100644
--- a/after/ftplugin/javascriptreact.vim
+++ b/after/ftplugin/javascriptreact.vim
@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
 
-source <sfile>:h/javascript.vim
+source <sfile>:h/jsx.vim
 
 endif
diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
new file mode 100644
index 000000000..94f90c13f
--- /dev/null
+++ b/after/ftplugin/jsx.vim
@@ -0,0 +1,35 @@
+if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Vim ftplugin file
+"
+" Language: javascript.jsx
+" Maintainer: MaxMEllon <maxmellon1994@gmail.com>
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+" modified from html.vim
+" For matchit plugin
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_words = '(:),\[:\],{:},<:>,' .
+        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
+endif
+
+" For andymass/vim-matchup plugin
+if exists("loaded_matchup")
+  setlocal matchpairs=(:),{:},[:],<:>
+  let b:match_words = '<\@<=\([^/][^ \t>]*\)\g{hlend}[^>]*\%(/\@<!>\|$\):<\@<=/\1>'
+  let b:match_skip = 's:comment\|string'
+endif
+
+let b:jsx_pretty_old_cms = &l:commentstring
+
+augroup jsx_comment
+  autocmd! CursorMoved <buffer>
+  autocmd CursorMoved <buffer> call jsx_pretty#comment#update_commentstring(b:jsx_pretty_old_cms)
+augroup end
+
+setlocal suffixesadd+=.jsx
+
+endif
diff --git a/after/indent/javascript.vim b/after/indent/javascript.vim
index dd280edb6..0add1da1a 100644
--- a/after/indent/javascript.vim
+++ b/after/indent/javascript.vim
@@ -47,34 +47,10 @@ endfunction
 endif
 if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
 
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim indent file
-"
-" Language: javascript.jsx
-" Maintainer: MaxMellon <maxmellon1994@gmail.com>
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-if exists('b:did_indent')
-  let s:did_indent = b:did_indent
-  unlet b:did_indent
-endif
-
-let s:keepcpo = &cpo
-set cpo&vim
-
-if exists('s:did_indent')
-  let b:did_indent = s:did_indent
+if get(g:, 'vim_jsx_pretty_disable_js', 0)
+  finish
 endif
 
-setlocal indentexpr=GetJsxIndent()
-setlocal indentkeys=0.,0{,0},0),0],0?,0\*,0\,,!^F,:,<:>,o,O,e,<>>,=*/
-
-function! GetJsxIndent()
-  return jsx_pretty#indent#get(function('GetJavascriptIndent'))
-endfunction
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
+source <sfile>:h/jsx.vim
 
 endif
diff --git a/after/indent/javascriptreact.vim b/after/indent/javascriptreact.vim
index ab847072d..265415d0e 100644
--- a/after/indent/javascriptreact.vim
+++ b/after/indent/javascriptreact.vim
@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
 
-source <sfile>:h/javascript.vim
+source <sfile>:h/jsx.vim
 
 endif
diff --git a/after/indent/jsx.vim b/after/indent/jsx.vim
new file mode 100644
index 000000000..fcd7b5adc
--- /dev/null
+++ b/after/indent/jsx.vim
@@ -0,0 +1,33 @@
+if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Vim indent file
+"
+" Language: javascript.jsx
+" Maintainer: MaxMellon <maxmellon1994@gmail.com>
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+if exists('b:did_indent')
+  let s:did_indent = b:did_indent
+  unlet b:did_indent
+endif
+
+let s:keepcpo = &cpo
+set cpo&vim
+
+if exists('s:did_indent')
+  let b:did_indent = s:did_indent
+endif
+
+setlocal indentexpr=GetJsxIndent()
+setlocal indentkeys=0.,0{,0},0),0],0?,0\*,0\,,!^F,:,<:>,o,O,e,<>>,=*/
+
+function! GetJsxIndent()
+  return jsx_pretty#indent#get(function('GetJavascriptIndent'))
+endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim
index 00c4b0791..2992e9427 100644
--- a/after/syntax/javascript.vim
+++ b/after/syntax/javascript.vim
@@ -1,59 +1,9 @@
 if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
 
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim syntax file
-"
-" Language: javascript.jsx
-" Maintainer: MaxMellon <maxmellon1994@gmail.com>
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-let s:jsx_cpo = &cpo
-set cpo&vim
-
-syntax case match
-
-if exists('b:current_syntax')
-  let s:current_syntax = b:current_syntax
-  unlet b:current_syntax
-endif
-
-if exists('s:current_syntax')
-  let b:current_syntax = s:current_syntax
-endif
-
-if hlexists("jsDebugger") || hlexists("jsNoise")    " yuezk/vim-js or pangloss/vim-javascript
-  syntax cluster jsExpression add=jsxRegion
-elseif hlexists("javascriptOpSymbols")    " othree/yajs.vim
-  " refine the javascript line comment
-  syntax region javascriptLineComment start=+//+ end=/$/ contains=@Spell,javascriptCommentTodo extend keepend
-  syntax cluster javascriptValue add=jsxRegion
-  syntax cluster javascriptNoReserved add=jsxElement,jsxTag
-else    " build-in javascript syntax
-  " refine the javascript line comment
-  syntax region javaScriptLineComment start=+//+ end=/$/ contains=@Spell,javascriptCommentTodo extend keepend
-
-  " refine the template string syntax
-  syntax region javaScriptEmbed matchgroup=javaScriptEmbedBraces start=+\${+ end=+}+ contained contains=@javaScriptEmbededExpr
-
-  " add a javaScriptBlock group for build-in syntax
-  syntax region javaScriptBlock
-        \ matchgroup=javaScriptBraces
-        \ start="{"
-        \ end="}"
-        \ contained
-        \ extend
-        \ contains=javaScriptBlock,@javaScriptEmbededExpr,javaScript.*
-        \ fold
-
-  syntax cluster javaScriptEmbededExpr add=jsxRegion,javaScript.*
+if get(g:, 'vim_jsx_pretty_disable_js', 0)
+  finish
 endif
 
-runtime syntax/jsx_pretty.vim
-
-let b:current_syntax = 'javascript.jsx'
-
-let &cpo = s:jsx_cpo
-unlet s:jsx_cpo
+source <sfile>:h/jsx.vim
 
 endif
diff --git a/after/syntax/javascriptreact.vim b/after/syntax/javascriptreact.vim
index ab847072d..265415d0e 100644
--- a/after/syntax/javascriptreact.vim
+++ b/after/syntax/javascriptreact.vim
@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
 
-source <sfile>:h/javascript.vim
+source <sfile>:h/jsx.vim
 
 endif
diff --git a/after/syntax/jsx.vim b/after/syntax/jsx.vim
new file mode 100644
index 000000000..00c4b0791
--- /dev/null
+++ b/after/syntax/jsx.vim
@@ -0,0 +1,59 @@
+if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Vim syntax file
+"
+" Language: javascript.jsx
+" Maintainer: MaxMellon <maxmellon1994@gmail.com>
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+let s:jsx_cpo = &cpo
+set cpo&vim
+
+syntax case match
+
+if exists('b:current_syntax')
+  let s:current_syntax = b:current_syntax
+  unlet b:current_syntax
+endif
+
+if exists('s:current_syntax')
+  let b:current_syntax = s:current_syntax
+endif
+
+if hlexists("jsDebugger") || hlexists("jsNoise")    " yuezk/vim-js or pangloss/vim-javascript
+  syntax cluster jsExpression add=jsxRegion
+elseif hlexists("javascriptOpSymbols")    " othree/yajs.vim
+  " refine the javascript line comment
+  syntax region javascriptLineComment start=+//+ end=/$/ contains=@Spell,javascriptCommentTodo extend keepend
+  syntax cluster javascriptValue add=jsxRegion
+  syntax cluster javascriptNoReserved add=jsxElement,jsxTag
+else    " build-in javascript syntax
+  " refine the javascript line comment
+  syntax region javaScriptLineComment start=+//+ end=/$/ contains=@Spell,javascriptCommentTodo extend keepend
+
+  " refine the template string syntax
+  syntax region javaScriptEmbed matchgroup=javaScriptEmbedBraces start=+\${+ end=+}+ contained contains=@javaScriptEmbededExpr
+
+  " add a javaScriptBlock group for build-in syntax
+  syntax region javaScriptBlock
+        \ matchgroup=javaScriptBraces
+        \ start="{"
+        \ end="}"
+        \ contained
+        \ extend
+        \ contains=javaScriptBlock,@javaScriptEmbededExpr,javaScript.*
+        \ fold
+
+  syntax cluster javaScriptEmbededExpr add=jsxRegion,javaScript.*
+endif
+
+runtime syntax/jsx_pretty.vim
+
+let b:current_syntax = 'javascript.jsx'
+
+let &cpo = s:jsx_cpo
+unlet s:jsx_cpo
+
+endif
diff --git a/after/syntax/reason/graphql.vim b/after/syntax/reason/graphql.vim
index 44a5c846d..4f4ba44c7 100644
--- a/after/syntax/reason/graphql.vim
+++ b/after/syntax/reason/graphql.vim
@@ -32,6 +32,6 @@ if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
 
-syntax region graphqlMultilineString matchgroup=reasonMultilineString start=+graphql\_s*\zs{|+ end=+|}+ contains=@GraphQLSyntax,reasonEscape,reasonEscapeUnicode,reasonEscapeError,reasonStringContinuation keepend
+syntax region graphqlExtensionPoint matchgroup=Noise start=+\[%graphql\_s*{|+lc=10 end=+|}\_s*]+he=s+1 contains=@GraphQLSyntax keepend
 
 endif
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index 956da2207..55bc1902c 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -552,6 +552,14 @@ function! go#config#GoplsLocal() abort
   return get(g:, 'go_gopls_local', v:null)
 endfunction
 
+function! go#config#GoplsGofumpt() abort
+  return get(g:, 'go_gopls_gofumpt', v:null)
+endfunction
+
+function! go#config#GoplsSettings() abort
+  return get(g:, 'go_gopls_settings', v:null)
+endfunction
+
 function! go#config#GoplsEnabled() abort
   return get(g:, 'go_gopls_enabled', 1)
 endfunction
diff --git a/doc/graphql.txt b/doc/graphql.txt
index 3f41deaa4..868c74d85 100644
--- a/doc/graphql.txt
+++ b/doc/graphql.txt
@@ -46,8 +46,7 @@ the list of recognized template tag names.
 REASONML                                                    *graphql-reasonml*
 
 GraphQL syntax support inside of ReasonML template strings using graphql-ppx
-is available when vim-reasonml (https://github.com/jordwalke/vim-reasonml) is
-also installed.
+is available.
 
 ------------------------------------------------------------------------------
 vim:tw=78:ft=help:norl:
diff --git a/doc/vim-go.txt b/doc/vim-go.txt
index e00dec9b1..b92ab5b9c 100644
--- a/doc/vim-go.txt
+++ b/doc/vim-go.txt
@@ -802,7 +802,7 @@ CTRL-t
     You can define a constant value instead of the default field based value.
     For example the following command will add ``valid:"1"`` to all fields.
 >
-      :GoAddTags valid=1
+      :GoAddTags valid:1
 <
                                                                *:GoRemoveTags*
 :[range]GoRemoveTags [key],[option] [key1],[option1] ...
@@ -1876,6 +1876,24 @@ is `v:null`.
   let g:go_gopls_local = v:null
 <
 
+                                                       *'g:go_gopls_gofumpt'*
+
+Specifies whether `gopls` should use `gofumpt` for formatting. When it is
+`v:null`, `gopls`' default will be used.  By default it is `v:null`.
+>
+  let g:go_gopls_gofumpt = v:null
+<
+
+                                                      *'g:go_gopls_settings'*
+
+Specifies `gopls` workspace settings for `gopls` that are not yet officially
+supported by vim-go. Any value in the dictionary will be overridden by values
+provided in the specific options supported by vim-go (e.g.
+g:go_gopls_staticcheck) or settings statically configured by vim-go to ensure
+expected behavior. By default it is `v:null`.
+>
+  let g:go_gopls_settings = v:null
+<
                                                  *'g:go_diagnostics_enabled'*
 
 Specifies whether `gopls` diagnostics are enabled. Only the diagnostics for
diff --git a/doc/vim-jsx-pretty-doc.txt b/doc/vim-jsx-pretty-doc.txt
index a561e4754..cc170976d 100644
--- a/doc/vim-jsx-pretty-doc.txt
+++ b/doc/vim-jsx-pretty-doc.txt
@@ -46,6 +46,7 @@ CONFIG                                                  *vim-jsx-pretty-config*
   |---------------------------------------|---------|----------------------|
   | g:vim_jsx_pretty_enable_jsx_highlight |    1    | jsx highlight flag   |
   | g:vim_jsx_pretty_colorful_config      |    0    | colorful config flag |
+  | g:vim_jsx_pretty_disable_js           |    0    | js toggle flag       |
 <
 
 - *g:vim_jsx_pretty_enable_jsx_highlight*
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 432b5e010..e49a966d4 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -851,6 +851,10 @@ if !has_key(s:disabled_packages, 'ion')
   au BufNewFile,BufRead ~/.config/ion/initrc setf ion
 endif
 
+if !has_key(s:disabled_packages, 'jsx')
+  au BufNewFile,BufRead *.jsx setf javascriptreact
+endif
+
 if !has_key(s:disabled_packages, 'javascript')
   au BufNewFile,BufRead *._js setf javascript
   au BufNewFile,BufRead *.bones setf javascript
@@ -939,10 +943,6 @@ if !has_key(s:disabled_packages, 'jst')
   au BufNewFile,BufRead *.jst setf jst
 endif
 
-if !has_key(s:disabled_packages, 'jsx')
-  au BufNewFile,BufRead *.jsx setf javascriptreact
-endif
-
 if !has_key(s:disabled_packages, 'julia')
   au BufNewFile,BufRead *.jl setf julia
 endif
diff --git a/packages.yaml b/packages.yaml
index 3ddc5776b..dfb17252f 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -921,6 +921,7 @@ filetypes:
 ---
 name: jsx
 remote: MaxMEllon/vim-jsx-pretty
+after: javascript
 filetypes:
 - name: javascriptreact
   linguist: JSX
diff --git a/scripts/test_filetypes.vim b/scripts/test_filetypes.vim
index 42e683d17..e7ae65114 100644
--- a/scripts/test_filetypes.vim
+++ b/scripts/test_filetypes.vim
@@ -109,6 +109,7 @@ call TestFiletype('idris')
 call TestFiletype('idris2')
 call TestFiletype('lidris2')
 call TestFiletype('ion')
+call TestFiletype('javascriptreact')
 call TestFiletype('javascript')
 call TestFiletype('flow')
 call TestFiletype('Jenkinsfile')
@@ -118,7 +119,6 @@ call TestFiletype('json5')
 call TestFiletype('json')
 call TestFiletype('jsonnet')
 call TestFiletype('jst')
-call TestFiletype('javascriptreact')
 call TestFiletype('julia')
 call TestFiletype('kotlin')
 call TestFiletype('ledger')
diff --git a/syntax/go.vim b/syntax/go.vim
index 93d6fbc4d..73f280370 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -424,8 +424,8 @@ function! s:hi()
 
   " :GoDebug commands
   if go#config#HighlightDebug()
-    hi GoDebugBreakpoint term=standout ctermbg=117 ctermfg=0 guibg=#BAD4F5  guifg=Black
-    hi GoDebugCurrent term=reverse  ctermbg=12  ctermfg=7 guibg=DarkBlue guifg=White
+    hi def GoDebugBreakpoint term=standout ctermbg=117 ctermfg=0 guibg=#BAD4F5  guifg=Black
+    hi def GoDebugCurrent term=reverse  ctermbg=12  ctermfg=7 guibg=DarkBlue guifg=White
   endif
 endfunction
 

From be092d6f430ca802d7200e68a5c987195bccd0e9 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 10 Sep 2020 12:18:29 +0200
Subject: [PATCH 040/299] Fix jsx indentation, closes #543

---
 after/ftplugin/javascript-1.vim |  16 ++
 after/ftplugin/javascript-2.vim |   9 +
 after/ftplugin/javascript.vim   |  28 +--
 after/indent/javascript.vim     |  47 -----
 after/indent/typescript.vim     |  47 -----
 packages.yaml                   |   5 +
 scripts/build                   |  31 +++-
 syntax/html-1.vim               |  94 ++++++++++
 syntax/html-2.vim               | 196 +++++++++++++++++++++
 syntax/html.vim                 | 293 +-------------------------------
 10 files changed, 355 insertions(+), 411 deletions(-)
 create mode 100644 after/ftplugin/javascript-1.vim
 create mode 100644 after/ftplugin/javascript-2.vim
 delete mode 100644 after/indent/typescript.vim
 create mode 100644 syntax/html-1.vim
 create mode 100644 syntax/html-2.vim

diff --git a/after/ftplugin/javascript-1.vim b/after/ftplugin/javascript-1.vim
new file mode 100644
index 000000000..9f6c9314b
--- /dev/null
+++ b/after/ftplugin/javascript-1.vim
@@ -0,0 +1,16 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+
+" Vim filetype plugin file
+" Language:     JavaScript
+" Maintainer:   vim-javascript community
+" URL:          https://github.com/pangloss/vim-javascript
+
+setlocal iskeyword+=$ suffixesadd+=.js
+
+if exists('b:undo_ftplugin')
+  let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<'
+else
+  let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
+endif
+
+endif
diff --git a/after/ftplugin/javascript-2.vim b/after/ftplugin/javascript-2.vim
new file mode 100644
index 000000000..2992e9427
--- /dev/null
+++ b/after/ftplugin/javascript-2.vim
@@ -0,0 +1,9 @@
+if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+
+if get(g:, 'vim_jsx_pretty_disable_js', 0)
+  finish
+endif
+
+source <sfile>:h/jsx.vim
+
+endif
diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
index 8ff3938a3..e3d355fcb 100644
--- a/after/ftplugin/javascript.vim
+++ b/after/ftplugin/javascript.vim
@@ -1,25 +1,3 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
-
-if get(g:, 'vim_jsx_pretty_disable_js', 0)
-  finish
-endif
-
-source <sfile>:h/jsx.vim
-
-endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-
-" Vim filetype plugin file
-" Language:     JavaScript
-" Maintainer:   vim-javascript community
-" URL:          https://github.com/pangloss/vim-javascript
-
-setlocal iskeyword+=$ suffixesadd+=.js
-
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<'
-else
-  let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
-endif
-
-endif
+" Polyglot metafile
+source <sfile>:h/javascript-1.vim
+source <sfile>:h/javascript-2.vim
diff --git a/after/indent/javascript.vim b/after/indent/javascript.vim
index 0add1da1a..2992e9427 100644
--- a/after/indent/javascript.vim
+++ b/after/indent/javascript.vim
@@ -1,50 +1,3 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
-"
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to
-" deal in the Software without restriction, including without limitation the
-" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-" sell copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in
-" all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-" IN THE SOFTWARE.
-"
-" Language: GraphQL
-" Maintainer: Jon Parise <jon@indelible.org>
-
-runtime! indent/graphql.vim
-
-" Don't redefine our function and also require the standard Javascript indent
-" function to exist.
-if exists('*GetJavascriptGraphQLIndent') || !exists('*GetJavascriptIndent')
-  finish
-endif
-
-" Set the indentexpr with our own version that will call GetGraphQLIndent when
-" we're inside of a GraphQL string and otherwise defer to GetJavascriptIndent.
-setlocal indentexpr=GetJavascriptGraphQLIndent()
-
-function GetJavascriptGraphQLIndent()
-  let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val,'name')")
-  if !empty(l:stack) && l:stack[0] ==# 'graphqlTemplateString'
-    return GetGraphQLIndent()
-  endif
-
-  return GetJavascriptIndent()
-endfunction
-
-endif
 if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
 
 if get(g:, 'vim_jsx_pretty_disable_js', 0)
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
deleted file mode 100644
index 968517c89..000000000
--- a/after/indent/typescript.vim
+++ /dev/null
@@ -1,47 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
-"
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to
-" deal in the Software without restriction, including without limitation the
-" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-" sell copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in
-" all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-" IN THE SOFTWARE.
-"
-" Language: GraphQL
-" Maintainer: Jon Parise <jon@indelible.org>
-
-runtime! indent/graphql.vim
-
-" Don't redefine our function and also require the standard Typescript indent
-" function to exist.
-if exists('*GetTypescriptGraphQLIndent') || !exists('*GetTypescriptIndent')
-  finish
-endif
-
-" Set the indentexpr with our own version that will call GetGraphQLIndent when
-" we're inside of a GraphQL string and otherwise defer to GetTypescriptIndent.
-setlocal indentexpr=GetTypescriptGraphQLIndent()
-
-function GetTypescriptGraphQLIndent()
-  let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val,'name')")
-  if !empty(l:stack) && l:stack[0] ==# 'graphqlTemplateString'
-    return GetGraphQLIndent()
-  endif
-
-  return GetTypescriptIndent()
-endfunction
-
-endif
diff --git a/packages.yaml b/packages.yaml
index dfb17252f..483672545 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -679,6 +679,11 @@ filetypes:
 ---
 name: graphql
 remote: jparise/vim-graphql
+after: [javascript, jsx]
+ignored_dirs:
+# TODO: remove after bug is fixed:
+# https://github.com/jparise/vim-graphql/issues/62
+- after/indent
 filetypes:
 - name: graphql
   linguist: GraphQL
diff --git a/scripts/build b/scripts/build
index 699933740..7503ebff1 100755
--- a/scripts/build
+++ b/scripts/build
@@ -36,6 +36,7 @@ def load_data()
     end
   end
 
+  puts deps["javascript"]
   each_node = lambda {|&b| packages.keys.each(&b) }
   each_child = lambda {|n, &b| deps[n].each(&b) }
 
@@ -168,8 +169,33 @@ def copy_file(package, src, dest)
   FileUtils.mkdir_p(File.dirname(dest))
   name = package.fetch("name")
 
+  header = '" Polyglot metafile'
+  if File.exist?(dest)
+    meta_dest = dest
+    new_dest = dest
+    i = 0
+    while File.exist?(new_dest)
+      i += 1
+      new_dest = "#{dest.gsub(/\.vim$/, '')}-#{i}.vim"
+    end
+
+    if File.read(dest).include?(header)
+      dest = new_dest
+    else
+      FileUtils.mv(dest, new_dest)
+      File.write(meta_dest, "#{header}\n")
+      open(meta_dest, "a+") do |output|
+        output << "source <sfile>:h/#{File.basename(new_dest)}\n"
+      end
+      dest = "#{dest.gsub(/\.vim$/, '')}-#{i+1}.vim"
+    end
+    open(meta_dest, "a+") do |output|
+      output << "source <sfile>:h/#{File.basename(dest)}\n"
+    end
+  end
+
   open(src, "r") do |input|
-    open(dest, "a+") do |output|
+    open(dest, "w") do |output|
       if name == "jsx"
         output << "if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)\n\n"
       else
@@ -335,7 +361,8 @@ def extract(packages)
   FileUtils.rm_rf(all_dirs)
 
   output = []
-  packages.map do |package|
+  # We need to reverse packages so they are included in proper order
+  packages.reverse.map do |package|
     repo, branch, path, dir = parse_remote(package["remote"])
     dirs = package.fetch("dirs", default_dirs)
     ignored_dirs = package.fetch("ignored_dirs", [])
diff --git a/syntax/html-1.vim b/syntax/html-1.vim
new file mode 100644
index 000000000..ddca92d4c
--- /dev/null
+++ b/syntax/html-1.vim
@@ -0,0 +1,94 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
+
+" Vim syntax file
+" Language:	HTML (version 5)
+" Maintainer:	Rodrigo Machado <rcmachado@gmail.com>
+" URL:		http://rm.blog.br/vim/syntax/html.vim
+" Last Change:  2009 Aug 19
+" License:      Public domain
+"               (but let me know if you like :) )
+"
+" Note: This file just adds the new tags from HTML 5
+"       and don't replace default html.vim syntax file
+"
+" Modified:     othree <othree@gmail.com>
+" Changes:      update to Draft 28 August 2010
+"               add complete new attributes
+"               add wai-aria attributes
+"               add microdata attributes
+"               add rdfa attributes
+
+
+syn keyword htmlTagName contained script
+" HTML 5 tags
+syn keyword htmlTagName contained article aside audio canvas command
+syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
+syn keyword htmlTagName contained header hgroup keygen mark meter menu nav output
+syn keyword htmlTagName contained progress time ruby rt rp section source summary time track video wbr
+
+" HTML 5 arguments
+" Core Attributes
+syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
+syn keyword htmlArg contained draggable hidden id lang spellcheck style tabindex title
+" Event-handler Attributes
+syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange 
+syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
+syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
+syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
+syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
+syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
+syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
+syn keyword htmlArg contained onvolumechange onwaiting
+" XML Attributes
+syn keyword htmlArg contained xml:lang xml:space xml:base
+" new features
+" <body>
+syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
+syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
+" <video>, <audio>, <source>, <track>
+syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track
+" <form>, <input>, <button>
+syn keyword htmlArg contained form autocomplete autofocus list min max step
+syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
+" <command>, <details>, <time>
+syn keyword htmlArg contained label icon open datetime pubdate
+
+" Custom Data Attributes
+" http://dev.w3.org/html5/spec/Overview.html#custom-data-attribute
+syn match   htmlArg "\<\(data(\-[a-z]\+)\+\)=" contained
+
+" Microdata
+" http://dev.w3.org/html5/md/
+syn keyword htmlArg contained item itemid itemscope itemtype itemprop 
+
+" RDFa
+" http://www.w3.org/TR/rdfa-syntax/#a_xhtmlrdfa_dtd
+syn keyword htmlArg contained about typeof property resource content datatype rel rev 
+
+" WAI-ARIA States and Properties
+" http://www.w3.org/TR/wai-aria/states_and_properties
+syn keyword htmlArg contained role
+" Global States and Properties
+syn match  htmlArg contained "\<aria-\(atomic\|busy\|controls\|describedby\)\>"
+syn match  htmlArg contained "\<aria-\(disabled\|dropeffect\|flowto\|grabbed\)\>"
+syn match  htmlArg contained "\<aria-\(haspopup\|hidden\|invalid\|label\)\>"
+syn match  htmlArg contained "\<aria-\(labelledby\|live\|owns\|relevant\)\>"
+
+" Widget Attributes
+syn match  htmlArg contained "\<aria-\(autocomplete\|checked\|disabled\|expanded\)\>"
+syn match  htmlArg contained "\<aria-\(haspopup\|hidden\|invalid\|label\)\>"
+syn match  htmlArg contained "\<aria-\(level\|multiline\|multiselectable\|orientation\)\>"
+syn match  htmlArg contained "\<aria-\(pressed\|readonly\|required\|selected\)\>"
+syn match  htmlArg contained "\<aria-\(sort\|valuemax\|valuemin\|valuenow\|valuetext\|\)\>"
+
+" Live Region Attributes
+syn match  htmlArg contained "\<aria-\(atomic\|busy\|live\|relevant\|\)\>"
+
+" Drag-and-Drop attributes
+syn match  htmlArg contained "\<aria-\(dropeffect\|grabbed\)\>"
+
+" Relationship Attributes
+syn match  htmlArg contained "\<aria-\(activedescendant\|controls\|describedby\|flowto\|\)\>"
+syn match  htmlArg contained "\<aria-\(labelledby\|owns\|posinset\|setsize\|\)\>"
+
+endif
diff --git a/syntax/html-2.vim b/syntax/html-2.vim
new file mode 100644
index 000000000..633a157e7
--- /dev/null
+++ b/syntax/html-2.vim
@@ -0,0 +1,196 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+
+" Vim syntax file
+" Language:     HTML (version 5.1)
+"               SVG (SVG 1.1 Second Edition)
+"               MathML (MathML 3.0 Second Edition)
+" Last Change:  2017 Mar 07
+" License:      Public domain
+"               (but let me know if you like :) )
+"
+" Note: This file just add new tags from HTML 5
+"       and don't replace default html.vim syntax file
+"
+" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
+" Changes:      update to Draft 2016 Jan 13
+"               add microdata Attributes
+" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
+" URL:          http://rm.blog.br/vim/syntax/html.vim
+" Modified:     htdebeer <H.T.de.Beer@gmail.com>
+" Changes:      add common SVG elements and attributes for inline SVG
+
+" Patch 7.4.1142
+if has("patch-7.4-1142")
+  if has("win32")
+    syn iskeyword @,48-57,_,128-167,224-235,-
+  else
+    syn iskeyword @,48-57,_,192-255,-
+  endif
+endif
+
+" HTML 5 tags
+syn keyword htmlTagName contained article aside audio canvas command
+syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
+syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
+syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
+syn keyword htmlTagName contained template content shadow slot
+syn keyword htmlTagName contained wbr bdi
+syn keyword htmlTagName contained picture
+
+" SVG tags
+" http://www.w3.org/TR/SVG/
+" as found in http://www.w3.org/TR/SVG/eltindex.html
+syn keyword htmlTagName contained svg 
+syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
+syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
+syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
+syn keyword htmlTagName contained clipPath color-profile cursor 
+syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
+syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
+syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
+syn keyword htmlTagName contained glyph glyphRef hkern 
+syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
+syn keyword htmlTagName contained missing-glyph mpath 
+syn keyword htmlTagName contained text textPath tref tspan vkern
+syn keyword htmlTagName contained metadata title
+
+" MathML tags
+" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
+syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
+syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
+syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
+syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
+syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
+syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
+syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
+syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
+syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
+syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
+syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
+syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
+syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
+syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
+syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
+syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
+syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
+syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
+syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
+syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
+
+" Custom Element
+syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
+syn match htmlTagName contained "[.0-9_a-z]\@<=-[-.0-9_a-z]*\>"
+
+" HTML 5 arguments
+" Core Attributes
+syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
+syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
+" Event-handler Attributes
+syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
+syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
+syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
+syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
+syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
+syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
+syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
+syn keyword htmlArg contained onvolumechange onwaiting
+" XML Attributes
+syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
+" new features
+" <body>
+syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
+syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
+" <video>, <audio>, <source>, <track>
+syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
+" <form>, <input>, <button>
+syn keyword htmlArg contained form autocomplete autofocus list min max step
+syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
+syn keyword htmlArg contained required placeholder pattern
+" <command>, <details>, <time>
+syn keyword htmlArg contained label icon open datetime-local pubdate
+" <script>
+syn keyword htmlArg contained async
+" <content>
+syn keyword htmlArg contained select
+" <iframe>
+syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest allowpresentation
+" <picture>
+syn keyword htmlArg contained srcset sizes
+" <a>
+syn keyword htmlArg contained download media
+" <script>, <style>
+syn keyword htmlArg contained nonce
+" <area>, <a>, <img>, <iframe>, <link>
+syn keyword htmlArg contained referrerpolicy
+" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
+syn keyword htmlArg contained integrity crossorigin
+" <link>
+syn keyword htmlArg contained prefetch 
+" syn keyword htmlArg contained preload
+" <img>
+syn keyword htmlArg contained decoding
+" https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
+syn keyword htmlArg contained onselectstart onselectionchange
+" https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/loading
+syn keyword htmlArg contained loading
+
+" Custom Data Attributes
+" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
+syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Vendor Extension Attributes
+" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
+syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Microdata
+" http://dev.w3.org/html5/md/
+syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
+
+" SVG
+" http://www.w3.org/TR/SVG/
+" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
+syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
+syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
+syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
+syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
+syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
+syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
+syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
+syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
+syn keyword htmlArg contained id ideographic in in2 intercept 
+syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
+syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
+syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
+syn keyword htmlArg contained numOctaves 
+syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
+syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
+syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
+syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
+syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
+syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
+syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
+syn keyword htmlArg contained width widths 
+syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
+syn keyword htmlArg contained y y1 y2 yChannelSelector 
+syn keyword htmlArg contained z zoomAndPan 
+syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
+
+" MathML attributes
+" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
+syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
+syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
+syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
+syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
+syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
+syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
+syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
+syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
+syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
+syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
+syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
+syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
+syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
+syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
+
+
+endif
diff --git a/syntax/html.vim b/syntax/html.vim
index 53f64797b..a21ec0746 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,290 +1,3 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-
-" Vim syntax file
-" Language:     HTML (version 5.1)
-"               SVG (SVG 1.1 Second Edition)
-"               MathML (MathML 3.0 Second Edition)
-" Last Change:  2017 Mar 07
-" License:      Public domain
-"               (but let me know if you like :) )
-"
-" Note: This file just add new tags from HTML 5
-"       and don't replace default html.vim syntax file
-"
-" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
-" Changes:      update to Draft 2016 Jan 13
-"               add microdata Attributes
-" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
-" URL:          http://rm.blog.br/vim/syntax/html.vim
-" Modified:     htdebeer <H.T.de.Beer@gmail.com>
-" Changes:      add common SVG elements and attributes for inline SVG
-
-" Patch 7.4.1142
-if has("patch-7.4-1142")
-  if has("win32")
-    syn iskeyword @,48-57,_,128-167,224-235,-
-  else
-    syn iskeyword @,48-57,_,192-255,-
-  endif
-endif
-
-" HTML 5 tags
-syn keyword htmlTagName contained article aside audio canvas command
-syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
-syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
-syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
-syn keyword htmlTagName contained template content shadow slot
-syn keyword htmlTagName contained wbr bdi
-syn keyword htmlTagName contained picture
-
-" SVG tags
-" http://www.w3.org/TR/SVG/
-" as found in http://www.w3.org/TR/SVG/eltindex.html
-syn keyword htmlTagName contained svg 
-syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
-syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
-syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
-syn keyword htmlTagName contained clipPath color-profile cursor 
-syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
-syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
-syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
-syn keyword htmlTagName contained glyph glyphRef hkern 
-syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
-syn keyword htmlTagName contained missing-glyph mpath 
-syn keyword htmlTagName contained text textPath tref tspan vkern
-syn keyword htmlTagName contained metadata title
-
-" MathML tags
-" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
-syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
-syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
-syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
-syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
-syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
-syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
-syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
-syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
-syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
-syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
-syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
-syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
-syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
-syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
-syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
-syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
-syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
-syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
-syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
-syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
-
-" Custom Element
-syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
-syn match htmlTagName contained "[.0-9_a-z]\@<=-[-.0-9_a-z]*\>"
-
-" HTML 5 arguments
-" Core Attributes
-syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
-syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
-" Event-handler Attributes
-syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
-syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
-syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
-syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
-syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
-syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
-syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
-syn keyword htmlArg contained onvolumechange onwaiting
-" XML Attributes
-syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
-" new features
-" <body>
-syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
-syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
-" <video>, <audio>, <source>, <track>
-syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
-" <form>, <input>, <button>
-syn keyword htmlArg contained form autocomplete autofocus list min max step
-syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
-syn keyword htmlArg contained required placeholder pattern
-" <command>, <details>, <time>
-syn keyword htmlArg contained label icon open datetime-local pubdate
-" <script>
-syn keyword htmlArg contained async
-" <content>
-syn keyword htmlArg contained select
-" <iframe>
-syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest allowpresentation
-" <picture>
-syn keyword htmlArg contained srcset sizes
-" <a>
-syn keyword htmlArg contained download media
-" <script>, <style>
-syn keyword htmlArg contained nonce
-" <area>, <a>, <img>, <iframe>, <link>
-syn keyword htmlArg contained referrerpolicy
-" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
-syn keyword htmlArg contained integrity crossorigin
-" <link>
-syn keyword htmlArg contained prefetch 
-" syn keyword htmlArg contained preload
-" <img>
-syn keyword htmlArg contained decoding
-" https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
-syn keyword htmlArg contained onselectstart onselectionchange
-" https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/loading
-syn keyword htmlArg contained loading
-
-" Custom Data Attributes
-" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
-syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
-
-" Vendor Extension Attributes
-" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
-syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
-
-" Microdata
-" http://dev.w3.org/html5/md/
-syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
-
-" SVG
-" http://www.w3.org/TR/SVG/
-" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
-syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
-syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
-syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
-syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
-syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
-syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
-syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
-syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
-syn keyword htmlArg contained id ideographic in in2 intercept 
-syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
-syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
-syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
-syn keyword htmlArg contained numOctaves 
-syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
-syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
-syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
-syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
-syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
-syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
-syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
-syn keyword htmlArg contained width widths 
-syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
-syn keyword htmlArg contained y y1 y2 yChannelSelector 
-syn keyword htmlArg contained z zoomAndPan 
-syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
-
-" MathML attributes
-" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
-syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
-syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
-syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
-syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
-syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
-syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
-syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
-syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
-syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
-syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
-syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
-syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
-syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
-syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
-
-
-endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
-
-" Vim syntax file
-" Language:	HTML (version 5)
-" Maintainer:	Rodrigo Machado <rcmachado@gmail.com>
-" URL:		http://rm.blog.br/vim/syntax/html.vim
-" Last Change:  2009 Aug 19
-" License:      Public domain
-"               (but let me know if you like :) )
-"
-" Note: This file just adds the new tags from HTML 5
-"       and don't replace default html.vim syntax file
-"
-" Modified:     othree <othree@gmail.com>
-" Changes:      update to Draft 28 August 2010
-"               add complete new attributes
-"               add wai-aria attributes
-"               add microdata attributes
-"               add rdfa attributes
-
-
-syn keyword htmlTagName contained script
-" HTML 5 tags
-syn keyword htmlTagName contained article aside audio canvas command
-syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
-syn keyword htmlTagName contained header hgroup keygen mark meter menu nav output
-syn keyword htmlTagName contained progress time ruby rt rp section source summary time track video wbr
-
-" HTML 5 arguments
-" Core Attributes
-syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
-syn keyword htmlArg contained draggable hidden id lang spellcheck style tabindex title
-" Event-handler Attributes
-syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange 
-syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
-syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
-syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
-syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
-syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
-syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
-syn keyword htmlArg contained onvolumechange onwaiting
-" XML Attributes
-syn keyword htmlArg contained xml:lang xml:space xml:base
-" new features
-" <body>
-syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
-syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
-" <video>, <audio>, <source>, <track>
-syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track
-" <form>, <input>, <button>
-syn keyword htmlArg contained form autocomplete autofocus list min max step
-syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
-" <command>, <details>, <time>
-syn keyword htmlArg contained label icon open datetime pubdate
-
-" Custom Data Attributes
-" http://dev.w3.org/html5/spec/Overview.html#custom-data-attribute
-syn match   htmlArg "\<\(data(\-[a-z]\+)\+\)=" contained
-
-" Microdata
-" http://dev.w3.org/html5/md/
-syn keyword htmlArg contained item itemid itemscope itemtype itemprop 
-
-" RDFa
-" http://www.w3.org/TR/rdfa-syntax/#a_xhtmlrdfa_dtd
-syn keyword htmlArg contained about typeof property resource content datatype rel rev 
-
-" WAI-ARIA States and Properties
-" http://www.w3.org/TR/wai-aria/states_and_properties
-syn keyword htmlArg contained role
-" Global States and Properties
-syn match  htmlArg contained "\<aria-\(atomic\|busy\|controls\|describedby\)\>"
-syn match  htmlArg contained "\<aria-\(disabled\|dropeffect\|flowto\|grabbed\)\>"
-syn match  htmlArg contained "\<aria-\(haspopup\|hidden\|invalid\|label\)\>"
-syn match  htmlArg contained "\<aria-\(labelledby\|live\|owns\|relevant\)\>"
-
-" Widget Attributes
-syn match  htmlArg contained "\<aria-\(autocomplete\|checked\|disabled\|expanded\)\>"
-syn match  htmlArg contained "\<aria-\(haspopup\|hidden\|invalid\|label\)\>"
-syn match  htmlArg contained "\<aria-\(level\|multiline\|multiselectable\|orientation\)\>"
-syn match  htmlArg contained "\<aria-\(pressed\|readonly\|required\|selected\)\>"
-syn match  htmlArg contained "\<aria-\(sort\|valuemax\|valuemin\|valuenow\|valuetext\|\)\>"
-
-" Live Region Attributes
-syn match  htmlArg contained "\<aria-\(atomic\|busy\|live\|relevant\|\)\>"
-
-" Drag-and-Drop attributes
-syn match  htmlArg contained "\<aria-\(dropeffect\|grabbed\)\>"
-
-" Relationship Attributes
-syn match  htmlArg contained "\<aria-\(activedescendant\|controls\|describedby\|flowto\|\)\>"
-syn match  htmlArg contained "\<aria-\(labelledby\|owns\|posinset\|setsize\|\)\>"
-
-endif
+" Polyglot metafile
+source <sfile>:h/html-1.vim
+source <sfile>:h/html-2.vim

From 1eed30b2af57538496943da09e298a6facc33002 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 10 Sep 2020 14:07:02 +0200
Subject: [PATCH 041/299] Fix filetype detection and docini filetypes

---
 README.md                  |   3 +-
 autoload/sleuth.vim        |   6 +-
 ftdetect/polyglot.vim      | 197 +++++++++++++++++++++++++++++++------
 ftplugin/dosini.vim        |  23 +++++
 packages.yaml              |  19 ++++
 scripts/build              |  66 ++++++-------
 scripts/test_filetypes.vim |   1 +
 syntax/dosini.vim          |  44 +++++++++
 8 files changed, 292 insertions(+), 67 deletions(-)
 create mode 100644 ftplugin/dosini.vim
 create mode 100644 syntax/dosini.vim

diff --git a/README.md b/README.md
index 1c98ba15f..3473f253f 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->194<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->195<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -98,6 +98,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [dhall](https://github.com/vmchale/dhall-vim)
 - [dlang](https://github.com/JesseKPhillips/d.vim)
 - [dockerfile](https://github.com/ekalinin/Dockerfile.vim)
+- [dosini](https://github.com/vim/vim/tree/master/runtime)
 - [elf](https://github.com/vim/vim/tree/master/runtime)
 - [elixir](https://github.com/elixir-lang/vim-elixir)
 - [elm](https://github.com/andys8/vim-elm-syntax)
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 6cf267fa7..819744132 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -57,7 +57,7 @@ let s:globs = {
   \ 'dd': '*.dd',
   \ 'ddoc': '*.ddoc',
   \ 'dhall': '*.dhall',
-  \ 'dosini': '*.wrap',
+  \ 'dosini': '*.wrap,*.ini,*.cfg,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,buildozer.spec,php.ini-*',
   \ 'dsdl': '*.sdl',
   \ 'dune': 'jbuild,dune,dune-project,dune-workspace',
   \ 'ecrystal': '*.ecr',
@@ -110,7 +110,7 @@ let s:globs = {
   \ 'javascriptreact': '*.jsx',
   \ 'jinja.html': '*.jinja,*.j2,*.jinja2',
   \ 'jq': '*.jq',
-  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,composer.lock,mcmod.info',
+  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,composer.lock,mcmod.info,Pipfile.lock',
   \ 'json5': '*.json5',
   \ 'jsonnet': '*.jsonnet,*.libsonnet',
   \ 'jst': '*.ejs,*.ect,*.jst',
@@ -130,7 +130,7 @@ let s:globs = {
   \ 'markdown': '*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr',
   \ 'markdown.mdx': '*.mdx',
   \ 'meson': 'meson.build,meson_options.txt',
-  \ 'mma': '*.mathematica,*.cdf,*.m,*.ma,*.mt,*.nb,*.nbp,*.wl,*.wlt,*.wls',
+  \ 'mma': '*.mathematica,*.cdf,*.m,*.ma,*.mt,*.nb,*.nbp,*.wl,*.wlt,*.wls,*.mma',
   \ 'moon': '*.moon',
   \ 'murphi': '*.m',
   \ 'mustache': '*.handlebars,*.hbs,*.hulk,*.hjs,*.mustache,*.njk,*.hogan,*.hdbs,*.hb',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index e49a966d4..5a95caa1f 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -73,6 +73,8 @@ func! s:StarSetf(ft)
   endif
 endfunc
 
+augroup filetypedetect
+
 " filetypes
 
 if !has_key(s:disabled_packages, '8th')
@@ -95,12 +97,24 @@ if !has_key(s:disabled_packages, 'abc')
   au! BufRead,BufNewFile *.abc
 endif
 
+if !has_key(s:disabled_packages, 'abel')
+  au! BufRead,BufNewFile *.abl
+endif
+
+if !has_key(s:disabled_packages, 'acedb')
+  au! BufRead,BufNewFile *.wrm
+endif
+
 if !has_key(s:disabled_packages, 'acpiasl')
   au! BufRead,BufNewFile *.dsl
 endif
 
 if !has_key(s:disabled_packages, 'ada')
-  au! BufRead,BufNewFile *.ada
+  au! BufRead,BufNewFile *.adb,*.ads,*.ada,*.adc,*.gpr,*.ada_m
+endif
+
+if !has_key(s:disabled_packages, 'ahdl')
+  au! BufRead,BufNewFile *.tdf
 endif
 
 if !has_key(s:disabled_packages, 'aidl')
@@ -111,8 +125,16 @@ if !has_key(s:disabled_packages, 'aml')
   au! BufRead,BufNewFile *.aml
 endif
 
+if !has_key(s:disabled_packages, 'ampl')
+  au! BufRead,BufNewFile *.run
+endif
+
 if !has_key(s:disabled_packages, 'applescript')
-  au! BufRead,BufNewFile *.applescript
+  au! BufRead,BufNewFile *.scpt
+endif
+
+if !has_key(s:disabled_packages, 'arduino')
+  au! BufRead,BufNewFile *.pde,*.ino
 endif
 
 if !has_key(s:disabled_packages, 'art')
@@ -120,11 +142,23 @@ if !has_key(s:disabled_packages, 'art')
 endif
 
 if !has_key(s:disabled_packages, 'asciidoc')
-  au! BufRead,BufNewFile *.asciidoc
+  au! BufRead,BufNewFile *.asciidoc,*.adoc
+endif
+
+if !has_key(s:disabled_packages, 'autohotkey')
+  au! BufRead,BufNewFile *.ahk
 endif
 
 if !has_key(s:disabled_packages, 'asn')
-  au! BufRead,BufNewFile *.asn
+  au! BufRead,BufNewFile *.asn,*.asn1
+endif
+
+if !has_key(s:disabled_packages, 'atlas')
+  au! BufRead,BufNewFile *.atl,*.as
+endif
+
+if !has_key(s:disabled_packages, 'autoit')
+  au! BufRead,BufNewFile *.au3
 endif
 
 if !has_key(s:disabled_packages, 'ave')
@@ -132,19 +166,27 @@ if !has_key(s:disabled_packages, 'ave')
 endif
 
 if !has_key(s:disabled_packages, 'awk')
-  au! BufRead,BufNewFile *.awk
+  au! BufRead,BufNewFile *.awk,*.gawk
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
-  au! BufRead,BufNewFile *.cpp,*.tpp,*.c
+  au! BufRead,BufNewFile *.cpp,*.c++,*.cc,*.cxx,*.hh,*.hpp,*.hxx,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh,*.qc
+endif
+
+if !has_key(s:disabled_packages, 'clojure')
+  au! BufRead,BufNewFile *.clj,*.cljc,*.cljs,*.cljx
 endif
 
 if !has_key(s:disabled_packages, 'cmake')
-  au! BufRead,BufNewFile *.cmake
+  au! BufRead,BufNewFile *.cmake,*.cmake.in
+endif
+
+if !has_key(s:disabled_packages, 'cucumber')
+  au! BufRead,BufNewFile *.feature
 endif
 
 if !has_key(s:disabled_packages, 'dart')
-  au! BufRead,BufNewFile *.dart
+  au! BufRead,BufNewFile *.dart,*.drt
 endif
 
 if !has_key(s:disabled_packages, 'dlang')
@@ -152,27 +194,43 @@ if !has_key(s:disabled_packages, 'dlang')
 endif
 
 if !has_key(s:disabled_packages, 'dockerfile')
-  au! BufRead,BufNewFile *.dockerfile
+  au! BufRead,BufNewFile *.Dockerfile
+endif
+
+if !has_key(s:disabled_packages, 'elf')
+  au! BufRead,BufNewFile *.am
 endif
 
 if !has_key(s:disabled_packages, 'elm')
   au! BufRead,BufNewFile *.elm
 endif
 
-if !has_key(s:disabled_packages, 'git')
-  au! BufRead,BufNewFile *.gitconfig
+if !has_key(s:disabled_packages, 'erlang')
+  au! BufRead,BufNewFile *.erl,*.es,*.hrl,*.yaws
+endif
+
+if !has_key(s:disabled_packages, 'forth')
+  au! BufRead,BufNewFile *.fs,*.ft,*.fth
+endif
+
+if !has_key(s:disabled_packages, 'fsharp')
+  au! BufRead,BufNewFile *.fs
+endif
+
+if !has_key(s:disabled_packages, 'glsl')
+  au! BufRead,BufNewFile *.fs,*.gs,*.comp
 endif
 
 if !has_key(s:disabled_packages, 'gnuplot')
-  au! BufRead,BufNewFile *.gp,*.gnuplot
+  au! BufRead,BufNewFile *.gp,*.gpi
 endif
 
 if !has_key(s:disabled_packages, 'go')
-  au! BufRead,BufNewFile *.go
+  au! BufRead,BufNewFile *.go,*.tmpl
 endif
 
 if !has_key(s:disabled_packages, 'groovy')
-  au! BufRead,BufNewFile *.groovy
+  au! BufRead,BufNewFile *.groovy,*.gradle
 endif
 
 if !has_key(s:disabled_packages, 'haml')
@@ -187,28 +245,56 @@ if !has_key(s:disabled_packages, 'haproxy')
   au! BufRead,BufNewFile *.cfg
 endif
 
+if !has_key(s:disabled_packages, 'haskell')
+  au! BufRead,BufNewFile *.hs,*.hs-boot,*.hsc
+endif
+
 if !has_key(s:disabled_packages, 'html5')
-  au! BufRead,BufNewFile *.st,*.xhtml
+  au! BufRead,BufNewFile *.st,*.xht,*.xhtml
+endif
+
+if !has_key(s:disabled_packages, 'jsx')
+  au! BufRead,BufNewFile *.jsx
+endif
+
+if !has_key(s:disabled_packages, 'javascript')
+  au! BufRead,BufNewFile *.js,*.cjs,*.es,*.gs,*.mjs,*.pac
 endif
 
 if !has_key(s:disabled_packages, 'json')
-  au! BufRead,BufNewFile *.json,*.template
+  au! BufRead,BufNewFile *.json,*.ice,*.webmanifest,*.yy,*.jsonp
+endif
+
+if !has_key(s:disabled_packages, 'kotlin')
+  au! BufRead,BufNewFile *.kt,*.ktm,*.kts
 endif
 
 if !has_key(s:disabled_packages, 'less')
   au! BufRead,BufNewFile *.less
 endif
 
+if !has_key(s:disabled_packages, 'llvm')
+  au! BufRead,BufNewFile *.ll
+endif
+
 if !has_key(s:disabled_packages, 'lua')
-  au! BufRead,BufNewFile *.lua
+  au! BufRead,BufNewFile *.lua,*.nse,*.rockspec
 endif
 
 if !has_key(s:disabled_packages, 'm4')
-  au! BufRead,BufNewFile *.m4
+  au! BufRead,BufNewFile *.m4,*.at
+endif
+
+if !has_key(s:disabled_packages, 'mathematica')
+  au! BufRead,BufNewFile *.cdf,*.nb
 endif
 
 if !has_key(s:disabled_packages, 'markdown')
-  au! BufRead,BufNewFile *.markdown
+  au! BufRead,BufNewFile *.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn
+endif
+
+if !has_key(s:disabled_packages, 'ocaml')
+  au! BufRead,BufNewFile *.ml,*.mli,*.mll,*.mly
 endif
 
 if !has_key(s:disabled_packages, 'opencl')
@@ -216,11 +302,11 @@ if !has_key(s:disabled_packages, 'opencl')
 endif
 
 if !has_key(s:disabled_packages, 'perl')
-  au! BufRead,BufNewFile *.perl
+  au! BufRead,BufNewFile *.al,*.plx,*.psgi,*.t
 endif
 
 if !has_key(s:disabled_packages, 'php')
-  au! BufRead,BufNewFile *.php
+  au! BufRead,BufNewFile *.php,*.ctp
 endif
 
 if !has_key(s:disabled_packages, 'protobuf')
@@ -228,15 +314,19 @@ if !has_key(s:disabled_packages, 'protobuf')
 endif
 
 if !has_key(s:disabled_packages, 'python')
-  au! BufRead,BufNewFile *.spec
+  au! BufRead,BufNewFile *.py,*.pyi,*.pyw,*.spec
 endif
 
 if !has_key(s:disabled_packages, 'r-lang')
-  au! BufRead,BufNewFile *.r
+  au! BufRead,BufNewFile *.s,*.S,*.rd
+endif
+
+if !has_key(s:disabled_packages, 'racket')
+  au! BufRead,BufNewFile *.rkt
 endif
 
 if !has_key(s:disabled_packages, 'raku')
-  au! BufRead,BufNewFile *.pod6
+  au! BufRead,BufNewFile *.p6,*.pl6,*.pm6,*.t,*.raku,*.rakumod,*.pod6
 endif
 
 if !has_key(s:disabled_packages, 'raml')
@@ -248,7 +338,11 @@ if !has_key(s:disabled_packages, 'rst')
 endif
 
 if !has_key(s:disabled_packages, 'ruby')
-  au! BufRead,BufNewFile *.ruby,*.spec
+  au! BufRead,BufNewFile *.rb,*.builder,*.gemspec,*.rake,*.rbw,*.ru,*.spec,*.rxml,*.rjs,*.rant,*.erb,*.rhtml
+endif
+
+if !has_key(s:disabled_packages, 'rust')
+  au! BufRead,BufNewFile *.rs
 endif
 
 if !has_key(s:disabled_packages, 'scala')
@@ -264,7 +358,11 @@ if !has_key(s:disabled_packages, 'scss')
 endif
 
 if !has_key(s:disabled_packages, 'sh')
-  au! BufRead,BufNewFile *.sh,*.tmux,*.zsh
+  au! BufRead,BufNewFile *.zsh
+endif
+
+if !has_key(s:disabled_packages, 'smt2')
+  au! BufRead,BufNewFile *.smt
 endif
 
 if !has_key(s:disabled_packages, 'svg')
@@ -283,24 +381,44 @@ if !has_key(s:disabled_packages, 'twig')
   au! BufRead,BufNewFile *.twig
 endif
 
+if !has_key(s:disabled_packages, 'typescript')
+  au! BufRead,BufNewFile *.ts,*.tsx
+endif
+
+if !has_key(s:disabled_packages, 'v')
+  au! BufRead,BufNewFile *.v
+endif
+
 if !has_key(s:disabled_packages, 'vbnet')
   au! BufRead,BufNewFile *.vb
 endif
 
+if !has_key(s:disabled_packages, 'vmasm')
+  au! BufRead,BufNewFile *.mar
+endif
+
 if !has_key(s:disabled_packages, 'vue')
   au! BufRead,BufNewFile *.vue
 endif
 
 if !has_key(s:disabled_packages, 'xml')
-  au! BufRead,BufNewFile *.xml,*.ant,*.xsd
+  au! BufRead,BufNewFile *.csproj,*.ui,*.wsdl,*.wsf,*.xlf,*.xliff,*.xmi,*.xsd,*.xul
 endif
 
 if !has_key(s:disabled_packages, 'xsl')
-  au! BufRead,BufNewFile *.xslt
+  au! BufRead,BufNewFile *.xslt,*.xsl
 endif
 
 if !has_key(s:disabled_packages, 'yaml')
-  au! BufRead,BufNewFile *.yaml
+  au! BufRead,BufNewFile *.yml,*.yaml
+endif
+
+if !has_key(s:disabled_packages, 'visual-basic')
+  au! BufRead,BufNewFile *.vba,*.vbs,*.dsm,*.ctl,*.sba
+endif
+
+if !has_key(s:disabled_packages, 'dosini')
+  au! BufRead,BufNewFile *.ini,*.cfg,*.properties
 endif
 
 if !has_key(s:disabled_packages, '8th')
@@ -928,6 +1046,7 @@ if !has_key(s:disabled_packages, 'json')
   au BufNewFile,BufRead {.,}tern-config setf json
   au BufNewFile,BufRead {.,}tern-project setf json
   au BufNewFile,BufRead {.,}watchmanconfig setf json
+  au BufNewFile,BufRead Pipfile.lock setf json
   au BufNewFile,BufRead composer.lock setf json
   au BufNewFile,BufRead mcmod.info setf json
 endif
@@ -1021,6 +1140,7 @@ if !has_key(s:disabled_packages, 'mathematica')
   au BufNewFile,BufRead *.cdf setf mma
   au BufNewFile,BufRead *.ma setf mma
   au BufNewFile,BufRead *.mathematica setf mma
+  au BufNewFile,BufRead *.mma setf mma
   au BufNewFile,BufRead *.mt setf mma
   au BufNewFile,BufRead *.nb setf mma
   au BufNewFile,BufRead *.nbp setf mma
@@ -1771,9 +1891,28 @@ if !has_key(s:disabled_packages, 'visual-basic')
   au! BufNewFile,BufRead *.bas call polyglot#DetectBasFiletype()
 endif
 
+if !has_key(s:disabled_packages, 'dosini')
+  au BufNewFile,BufRead *.cfg setf dosini
+  au BufNewFile,BufRead *.dof setf dosini
+  au BufNewFile,BufRead *.ini setf dosini
+  au BufNewFile,BufRead *.lektorproject setf dosini
+  au BufNewFile,BufRead *.prefs setf dosini
+  au BufNewFile,BufRead *.pro setf dosini
+  au BufNewFile,BufRead *.properties setf dosini
+  au BufNewFile,BufRead */etc/pacman.conf setf dosini
+  au BufNewFile,BufRead */etc/yum.conf setf dosini
+  au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
+  au BufNewFile,BufRead {.,}editorconfig setf dosini
+  au BufNewFile,BufRead {.,}npmrc setf dosini
+  au BufNewFile,BufRead buildozer.spec setf dosini
+  au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
+endif
+
 
 " end filetypes
 
+augroup END
+
 au BufNewFile,BufRead,StdinReadPost * 
   \ if !did_filetype() && expand("<afile>") !~ g:ft_ignore_pat 
   \ | call polyglot#Heuristics() | endif
diff --git a/ftplugin/dosini.vim b/ftplugin/dosini.vim
new file mode 100644
index 000000000..e0a2ba3dd
--- /dev/null
+++ b/ftplugin/dosini.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosini') == -1
+
+" Vim filetype plugin file
+" Language:             Configuration File (ini file) for MSDOS/MS Windows
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:; commentstring=;\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/packages.yaml b/packages.yaml
index 483672545..4d302f11e 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -904,6 +904,8 @@ filetypes:
   extra_extensions:
   - jsonp
   - template
+  extra_filenames:
+  - Pipfile.lock
 ---
 name: jsonnet
 remote: google/vim-jsonnet
@@ -1025,6 +1027,7 @@ filetypes:
   linguist: Mathematica
   extra_extensions:
   - wls
+  - mma
 ---
 name: markdown
 remote: plasticboy/vim-markdown
@@ -1808,3 +1811,19 @@ filetypes:
   - sba
   ignored_warnings:
   - vb
+---
+name: dosini
+remote: vim/vim:runtime
+glob: '**/dosini.vim'
+filetypes:
+- name: dosini
+  linguist: INI
+  extra_filenames:
+  - .editorconfig
+  - .npmrc
+  - '*/etc/pacman.conf'
+  - 'php.ini-*'
+  - '*/etc/yum.conf'
+  - '*/etc/yum.repos.d/*'
+  ignored_warnings:
+  - php.ini
diff --git a/scripts/build b/scripts/build
index 7503ebff1..03c005c4f 100755
--- a/scripts/build
+++ b/scripts/build
@@ -36,7 +36,6 @@ def load_data()
     end
   end
 
-  puts deps["javascript"]
   each_node = lambda {|&b| packages.keys.each(&b) }
   each_child = lambda {|n, &b| deps[n].each(&b) }
 
@@ -433,21 +432,15 @@ def generate_ftdetect(packages, heuristics)
   ambiguous_extensions = extensions
     .select { |a, b| b.uniq.size > 1 }.keys.sort
 
-  expected_filetypes = detect_filetypes('tmp/**/ftdetect/*.vim')
+  all_filetypes = packages.flat_map { |f| f["filetypes"] || [] }
+  filetype_names = Set.new(all_filetypes.map { |f| f["name"] })
+
   native_filetypes = detect_filetypes('tmp/vim/vim/runtime/filetype.vim')
-  native_extensions = native_filetypes.flat_map { |k, v| v["extensions"] }
+  expected_filetypes = detect_filetypes('tmp/**/ftdetect/*.vim') + native_filetypes
 
-  all_filetypes = Hash.new { |h, k| h[k] = { extensions: [], filenames: [] } }
+  expected_filetypes = expected_filetypes.select { |e| filetype_names.include?(e["name"]) }
 
-  for k, v in expected_filetypes
-    all_filetypes[k][:extensions].concat(v[:extensions])
-    all_filetypes[k][:filenames].concat(v[:filenames])
-  end
-  
-  for k, v in native_filetypes
-    all_filetypes[k][:extensions].concat(v[:extensions])
-    all_filetypes[k][:filenames].concat(v[:filenames])
-  end
+  native_extensions = Set.new(native_filetypes.flat_map { |f| f["extensions"] || [] })
 
   for package in packages
     name = package.fetch("name")
@@ -456,7 +449,7 @@ def generate_ftdetect(packages, heuristics)
 
     for filetype in package["filetypes"]
       for extension in filetype["extensions"]
-        if native_filetypes.has_key?(extension)
+        if native_extensions.include?(extension)
           to_disable << "*." + extension
         end
       end
@@ -492,20 +485,6 @@ def generate_ftdetect(packages, heuristics)
       extensions = filetype["extensions"]
       filenames = filetype["filenames"]
 
-      expected_extensions = (all_filetypes.has_key?(name) ? all_filetypes.fetch(name)[:extensions] : [])
-      ignored_extensions = expand_all(filetype.fetch("ignored_extensions", []))
-      ignored_warnings = expand_all(filetype.fetch("ignored_warnings", []))
-
-      if all_filetypes[name] && !filetype["syntax"]
-        for e in expected_extensions - extensions - ignored_extensions - ignored_warnings
-          puts "Probable missing extension for #{name}: #{e}"
-        end
-
-        for e in all_filetypes.fetch(name)[:filenames] - expand_all(filenames).flat_map { |e| [e, e.gsub(/^\./, '')] } - expand_all(filetype.fetch("ignored_warnings", [])) - ['*']
-          puts "Probable missing filename for #{name}: #{e}"
-        end
-      end
-
       for extension in extensions.sort
         outer_filetype = filetype["outer_filetype"]
         if outer_filetype
@@ -549,6 +528,24 @@ def generate_ftdetect(packages, heuristics)
     end
   end
  
+  defined_extensions = all_filetypes.flat_map { |f| expand_all(f["extensions"] || []).map { |e| [f["name"], e] } }
+  expected_extensions = expected_filetypes.flat_map { |f| expand_all(f["extensions"] || []).map { |e| [f["name"], e] } }
+  ignored_extensions = all_filetypes.flat_map { |f| expand_all(f.fetch("ignored_extensions", [])).map { |e| [f["name"], e] } }
+
+  defined_filenames = all_filetypes.flat_map { |f| expand_all(f["filenames"] || []).map { |e| [f["name"], e] } }
+  expected_filenames = expected_filetypes.flat_map { |f| expand_all(f["filenames"] || []).map { |e| [f["name"], e] } }
+  ignored_filenames = all_filetypes.flat_map { |f| expand_all(f.fetch("ignored_filenames", [])).map { |e| [f["name"], e] } }
+
+  ignored_warnings = all_filetypes.flat_map { |f| expand_all(f.fetch("ignored_warnings", [])).map { |e| [f["name"], e] } + [f, "*"] }
+
+  for name, e in expected_extensions - defined_extensions - ignored_extensions - ignored_warnings
+    puts "Missing extension for #{name}: #{e}"
+  end
+
+  for name, e in expected_filenames - defined_filenames - ignored_filenames - ignored_warnings
+    puts "Missing filename for #{name}: #{e}"
+  end
+
   ftdetect = File.read('ftdetect/polyglot.vim')
   File.write('ftdetect/polyglot.vim', ftdetect.gsub(/(?<=" filetypes\n).*(?=\n" end filetypes)/m, output))
 
@@ -728,14 +725,15 @@ def detect_filetypes(glob)
     results
   end
 
-  Hash[filetypes.flat_map do |ext, filetype|
+  filetypes.flat_map do |ext, filetype|
     expand_all(ext).map { |e| [filetype, e] }
   end.group_by { |a, b| a }.map { |a, b| [a, b.map { |c, d| d }] }.map { |a, b|
-    [a, {
-      extensions: b.select { |x| x.match(/^\*\.[^\/]+$/) }.map { |a| a.strip[2..] },
-      filenames: expand_all(b.select { |x| !x.match(/^\*\.[^\/]+$/) })
-    }]
-  }]
+    {
+      "name" => a,
+      "extensions" => b.select { |x| x.match(/^\*\.[^\/]+$/) }.map { |a| a.strip[2..] },
+      "filenames" => expand_all(b.select { |x| !x.match(/^\*\.[^\/]+$/) })
+    }
+  }
 end
 
 def generate_plugins(packages)
diff --git a/scripts/test_filetypes.vim b/scripts/test_filetypes.vim
index e7ae65114..74eeb4d03 100644
--- a/scripts/test_filetypes.vim
+++ b/scripts/test_filetypes.vim
@@ -230,3 +230,4 @@ call TestFiletype('zig')
 call TestFiletype('trasys')
 call TestFiletype('basic')
 call TestFiletype('vb')
+call TestFiletype('dosini')
diff --git a/syntax/dosini.vim b/syntax/dosini.vim
new file mode 100644
index 000000000..e84448b44
--- /dev/null
+++ b/syntax/dosini.vim
@@ -0,0 +1,44 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosini') == -1
+
+" Vim syntax file
+" Language:               Configuration File (ini file) for MSDOS/MS Windows
+" Version:                2.2
+" Original Author:        Sean M. McKee <mckee@misslink.net>
+" Previous Maintainer:    Nima Talebi <nima@it.net.au>
+" Current Maintainer:     Hong Xu <hong@topbug.net>
+" Homepage:               http://www.vim.org/scripts/script.php?script_id=3747
+" Repository:             https://github.com/xuhdev/syntax-dosini.vim
+" Last Change:            2018 Sep 11
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" shut case off
+syn case ignore
+
+syn match  dosiniLabel    "^.\{-}\ze\s*=" nextgroup=dosiniNumber,dosiniValue
+syn match  dosiniValue    "=\zs.*"
+syn match  dosiniNumber   "=\zs\s*\d\+\s*$"
+syn match  dosiniNumber   "=\zs\s*\d*\.\d\+\s*$"
+syn match  dosiniNumber   "=\zs\s*\d\+e[+-]\=\d\+\s*$"
+syn region dosiniHeader   start="^\s*\[" end="\]"
+syn match  dosiniComment  "^[#;].*$"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link dosiniNumber   Number
+hi def link dosiniHeader   Special
+hi def link dosiniComment  Comment
+hi def link dosiniLabel    Type
+hi def link dosiniValue    String
+
+
+let b:current_syntax = "dosini"
+
+" vim: sts=2 sw=2 et
+
+endif

From 9243367ba376050621e4c05e8f0439742c1f0f82 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 10 Sep 2020 15:40:27 +0200
Subject: [PATCH 042/299] Automatically detect script filetype when typing

---
 Makefile              |  2 +-
 autoload/polyglot.vim | 40 +++++++++++++++++++++++-----------------
 ftdetect/polyglot.vim | 23 ++++++++++++++++-------
 scripts/build         |  4 +++-
 4 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 9e9ec579f..157db8495 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ test:
 	@ scripts/test
 
 dev:
-	@ echo "packages.yaml\nheuristics.yaml\nscripts/test\nscripts/build\nscripts/test_extensions.vim" | DEV=1 entr bash -c 'make && make test'
+	@ (ls && find scripts) | DEV=1 entr bash -c 'make && make test'
diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index d54cb87e8..d89108aa0 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -4,11 +4,13 @@ set cpo&vim
 
 func! polyglot#Heuristics()
   " Try to detect filetype from shebang
-  let l:filetype = polyglot#Shebang()
-  if l:filetype != ""
-    exec "setf " . l:filetype
-    return
+  let filetype = polyglot#Shebang()
+  if filetype != ""
+    exec "setf " . filetype
+    return 1
   endif
+
+  return 0
 endfunc
 
 let s:interpreters = {
@@ -86,37 +88,41 @@ let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
 let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
 
 func! polyglot#Shebang()
-  let l:line1 = getline(1)
+  let line1 = getline(1)
 
-  if l:line1 !~# "^#!"
+  if line1 !~# "^#!"
     return
   endif
 
-  let l:pathrest = matchlist(l:line1, s:r_hashbang)
+  let pathrest = matchlist(line1, s:r_hashbang)
 
-  if len(l:pathrest) == 0
+  if len(pathrest) == 0
     return 
   endif
 
-  let [_, l:path, l:rest; __] = l:pathrest
+  let [_, path, rest; __] = pathrest
+
+  let script = split(path, "/")[-1]
 
-  let l:script = split(l:path, "/")[-1]
+  if len(script) == 0
+    return
+  endif
 
-  if l:script == "env"
-    let l:argspath = matchlist(l:rest, s:r_env)
-    if len(l:argspath) == 0
+  if script == "env"
+    let argspath = matchlist(rest, s:r_env)
+    if len(argspath) == 0
       return
     endif
 
-    let l:script = l:argspath[1]
+    let script = argspath[1]
   endif
 
-  if has_key(s:interpreters, l:script)
-    return s:interpreters[l:script]
+  if has_key(s:interpreters, script)
+    return s:interpreters[script]
   endif
 
   for interpreter in keys(s:interpreters)
-    if l:script =~# '^' . interpreter
+    if script =~# '^' . interpreter
       return s:interpreters[interpreter]
     endif
   endfor
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 5a95caa1f..0fa71e9cf 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1911,12 +1911,11 @@ endif
 
 " end filetypes
 
-augroup END
-
 au BufNewFile,BufRead,StdinReadPost * 
   \ if !did_filetype() && expand("<afile>") !~ g:ft_ignore_pat 
   \ | call polyglot#Heuristics() | endif
 
+augroup END
 
 if !has_key(s:disabled_packages, 'autoindent')
   " Code below re-implements sleuth for vim-polyglot
@@ -2088,10 +2087,10 @@ if !has_key(s:disabled_packages, 'autoindent')
     endif
   endfunction
 
-  augroup polyglot
-    autocmd!
-    autocmd FileType * call s:detect_indent()
-    autocmd User Flags call Hoist('buffer', 5, 'SleuthIndicator')
+  augroup polyglot-sleuth
+    au!
+    au FileType * call s:detect_indent()
+    au User Flags call Hoist('buffer', 5, 'SleuthIndicator')
   augroup END
 
   command! -bar -bang Sleuth call s:detect_indent()
@@ -2109,7 +2108,17 @@ func! s:verify()
   endif
 endfunc
 
-autocmd VimEnter * call s:verify()
+au VimEnter * call s:verify()
+
+func! s:observe_filetype()
+  augroup polyglot-observer
+    au! CursorHold,CursorHoldI <buffer>
+      \ if polyglot#Heuristics() | au! polyglot-observer CursorHold,CursorHoldI | endif
+  augroup END
+endfunc
+
+au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat
+      \ | call s:observe_filetype() | endif
 
 " restore Vi compatibility settings
 let &cpo = s:cpo_save
diff --git a/scripts/build b/scripts/build
index 03c005c4f..982e0f3a0 100755
--- a/scripts/build
+++ b/scripts/build
@@ -559,8 +559,10 @@ def generate_ftdetect(packages, heuristics)
       let l:filetype = polyglot#Shebang()
       if l:filetype != ""
         exec "setf " . l:filetype
-        return
+        return 1
       endif
+
+      return 0
     endfunc
     
     let s:interpreters = {

From 05ff14bfdaeca8def902c644d119f3946009bf14 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 10 Sep 2020 16:38:32 +0200
Subject: [PATCH 043/299] Add odin support, closes #544

---
 Makefile                   |   2 +-
 README.md                  |   3 +-
 autoload/polyglot.vim      |  36 ++++----
 autoload/sleuth.vim        |   1 +
 ftdetect/polyglot.vim      |   4 +
 indent/odin.vim            |  41 +++++++++
 packages.yaml              |   6 ++
 scripts/build              |  59 +++++--------
 scripts/test_filetypes.vim |   1 +
 syntax/odin.vim            | 170 +++++++++++++++++++++++++++++++++++++
 10 files changed, 263 insertions(+), 60 deletions(-)
 create mode 100644 indent/odin.vim
 create mode 100644 syntax/odin.vim

diff --git a/Makefile b/Makefile
index 157db8495..9e9ec579f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ test:
 	@ scripts/test
 
 dev:
-	@ (ls && find scripts) | DEV=1 entr bash -c 'make && make test'
+	@ echo "packages.yaml\nheuristics.yaml\nscripts/test\nscripts/build\nscripts/test_extensions.vim" | DEV=1 entr bash -c 'make && make test'
diff --git a/README.md b/README.md
index 3473f253f..a41e499aa 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->195<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->196<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -169,6 +169,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [objc](https://github.com/b4winckler/vim-objc)
 - [ocaml](https://github.com/rgrinberg/vim-ocaml)
 - [octave](https://github.com/McSinyx/vim-octave)
+- [odin](https://github.com/Tetralux/odin.vim)
 - [opencl](https://github.com/petRUShka/vim-opencl)
 - [perl](https://github.com/vim-perl/vim-perl)
 - [pgsql](https://github.com/lifepillar/pgsql.vim)
diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index d89108aa0..bc8791f5e 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -4,9 +4,9 @@ set cpo&vim
 
 func! polyglot#Heuristics()
   " Try to detect filetype from shebang
-  let filetype = polyglot#Shebang()
-  if filetype != ""
-    exec "setf " . filetype
+  let l:filetype = polyglot#Shebang()
+  if l:filetype != ""
+    exec "setf " . l:filetype
     return 1
   endif
 
@@ -88,41 +88,37 @@ let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
 let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
 
 func! polyglot#Shebang()
-  let line1 = getline(1)
+  let l:line1 = getline(1)
 
-  if line1 !~# "^#!"
+  if l:line1 !~# "^#!"
     return
   endif
 
-  let pathrest = matchlist(line1, s:r_hashbang)
+  let l:pathrest = matchlist(l:line1, s:r_hashbang)
 
-  if len(pathrest) == 0
+  if len(l:pathrest) == 0
     return 
   endif
 
-  let [_, path, rest; __] = pathrest
+  let [_, l:path, l:rest; __] = l:pathrest
 
-  let script = split(path, "/")[-1]
+  let l:script = split(l:path, "/")[-1]
 
-  if len(script) == 0
-    return
-  endif
-
-  if script == "env"
-    let argspath = matchlist(rest, s:r_env)
-    if len(argspath) == 0
+  if l:script == "env"
+    let l:argspath = matchlist(l:rest, s:r_env)
+    if len(l:argspath) == 0
       return
     endif
 
-    let script = argspath[1]
+    let l:script = l:argspath[1]
   endif
 
-  if has_key(s:interpreters, script)
-    return s:interpreters[script]
+  if has_key(s:interpreters, l:script)
+    return s:interpreters[l:script]
   endif
 
   for interpreter in keys(s:interpreters)
-    if script =~# '^' . interpreter
+    if l:script =~# '^' . interpreter
       return s:interpreters[interpreter]
     endif
   endfor
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 819744132..05459ccde 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -144,6 +144,7 @@ let s:globs = {
   \ 'ocpbuild': '*.ocp',
   \ 'ocpbuildroot': '*.root',
   \ 'octave': '*.oct,*.m',
+  \ 'odin': '*.odin',
   \ 'omake': '*.om,OMakefile,OMakeroot,OMakeroot.in',
   \ 'opam': '*.opam,*.opam.template,opam',
   \ 'opencl': '*.cl,*.opencl',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 0fa71e9cf..ab7e639bf 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1908,6 +1908,10 @@ if !has_key(s:disabled_packages, 'dosini')
   au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
 endif
 
+if !has_key(s:disabled_packages, 'odin')
+  au BufNewFile,BufRead *.odin setf odin
+endif
+
 
 " end filetypes
 
diff --git a/indent/odin.vim b/indent/odin.vim
new file mode 100644
index 000000000..b00b53877
--- /dev/null
+++ b/indent/odin.vim
@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'odin') == -1
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal nosmartindent
+setlocal nolisp
+setlocal autoindent
+
+setlocal indentexpr=GetOdinIndent(v:lnum)
+
+if exists("*GetOdinIndent")
+  finish
+endif
+
+function! GetOdinIndent(lnum)
+  let prev = prevnonblank(a:lnum-1)
+
+  if prev == 0
+    return 0
+  endif
+
+  let prevline = getline(prev)
+  let line = getline(a:lnum)
+
+  let ind = indent(prev)
+
+  if prevline =~ '[({]\s*$'
+    let ind += &sw
+  endif
+
+  if line =~ '^\s*[)}]'
+    let ind -= &sw
+  endif
+
+  return ind
+endfunction
+
+endif
diff --git a/packages.yaml b/packages.yaml
index 4d302f11e..c2e0d3122 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1827,3 +1827,9 @@ filetypes:
   - '*/etc/yum.repos.d/*'
   ignored_warnings:
   - php.ini
+---
+name: odin
+remote: Tetralux/odin.vim
+filetypes:
+- name: odin
+  linguist: Odin
diff --git a/scripts/build b/scripts/build
index 982e0f3a0..fabec0334 100755
--- a/scripts/build
+++ b/scripts/build
@@ -97,25 +97,6 @@ def load_data()
   [packages, transform_patterns(heuristics)]
 end
 
-def parallel(*procs)
-  threads = procs.map { |p| Thread.new { method(p).call } }
-  threads.map(&:join).map(&:value)
-end
-
-def read_strings(data, keys, print=false)
-  if data.is_a?(Hash)
-    data.flat_map do |key, val|
-      read_strings(val, keys, keys.include?(key))
-    end
-  elsif data.is_a?(Array)
-    data.flat_map { |d| read_strings(d, keys, print) }
-  elsif data.is_a?(String)
-    print ? [data] : []
-  else
-    []
-  end
-end
-
 def patterns_to_vim_patterns(patterns)
   stdin, stdout, stderr = Open3.popen3('vim', '-V', '--clean', '/dev/stdin', '-es', '-c', "echo expand('%:p:h') | source #{__dir__}/eregex.vim", '-c', "for line in range(0, line('$')) | call setline(line, ExtendedRegex2VimRegex(getline(line))) | endfor", '-c', ':wq! /dev/stdout', chdir: __dir__)
   stdin.write(patterns.join("\n"))
@@ -168,28 +149,30 @@ def copy_file(package, src, dest)
   FileUtils.mkdir_p(File.dirname(dest))
   name = package.fetch("name")
 
-  header = '" Polyglot metafile'
-  if File.exist?(dest)
-    meta_dest = dest
-    new_dest = dest
-    i = 0
-    while File.exist?(new_dest)
-      i += 1
-      new_dest = "#{dest.gsub(/\.vim$/, '')}-#{i}.vim"
-    end
+  if dest.end_with?(".vim")
+    header = '" Polyglot metafile'
+    if File.exist?(dest)
+      meta_dest = dest
+      new_dest = dest
+      i = 0
+      while File.exist?(new_dest)
+        i += 1
+        new_dest = "#{dest.gsub(/\.vim$/, '')}-#{i}.vim"
+      end
 
-    if File.read(dest).include?(header)
-      dest = new_dest
-    else
-      FileUtils.mv(dest, new_dest)
-      File.write(meta_dest, "#{header}\n")
+      if File.read(dest).include?(header)
+        dest = new_dest
+      else
+        FileUtils.mv(dest, new_dest)
+        File.write(meta_dest, "#{header}\n")
+        open(meta_dest, "a+") do |output|
+          output << "source <sfile>:h/#{File.basename(new_dest)}\n"
+        end
+        dest = "#{dest.gsub(/\.vim$/, '')}-#{i+1}.vim"
+      end
       open(meta_dest, "a+") do |output|
-        output << "source <sfile>:h/#{File.basename(new_dest)}\n"
+        output << "source <sfile>:h/#{File.basename(dest)}\n"
       end
-      dest = "#{dest.gsub(/\.vim$/, '')}-#{i+1}.vim"
-    end
-    open(meta_dest, "a+") do |output|
-      output << "source <sfile>:h/#{File.basename(dest)}\n"
     end
   end
 
diff --git a/scripts/test_filetypes.vim b/scripts/test_filetypes.vim
index 74eeb4d03..4d7cc0d8c 100644
--- a/scripts/test_filetypes.vim
+++ b/scripts/test_filetypes.vim
@@ -231,3 +231,4 @@ call TestFiletype('trasys')
 call TestFiletype('basic')
 call TestFiletype('vb')
 call TestFiletype('dosini')
+call TestFiletype('odin')
diff --git a/syntax/odin.vim b/syntax/odin.vim
new file mode 100644
index 000000000..a8ad7482c
--- /dev/null
+++ b/syntax/odin.vim
@@ -0,0 +1,170 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'odin') == -1
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax keyword odinUsing using
+syntax keyword odinTransmute transmute
+syntax keyword odinDistinct distinct
+syntax keyword odinOpaque opaque
+
+syntax keyword odinStruct struct
+syntax keyword odinEnum enum
+syntax keyword odinUnion union
+syntax keyword odinBitField bit_field
+syntax keyword odinBitSet bit_set
+
+syntax keyword odinIf if
+syntax keyword odinElse else
+syntax keyword odinDo do
+syntax keyword odinFor for
+syntax keyword odinSwitch switch
+syntax keyword odinCase case
+syntax keyword odinContinue continue
+syntax keyword odinBreak break
+syntax keyword odinSizeOf size_of
+syntax keyword odinTypeInfoOf type_info_of
+syntax keyword odinTypeIdOf typeid_of
+syntax keyword odinTypeOf type_of
+syntax keyword odinAlignOf align_of
+
+syntax match odinTodo "TODO"
+syntax match odinNote "NOTE"
+syntax match odinXXX "XXX"
+syntax match odinFixMe "FIXME"
+syntax match odinNoCheckin "NOCHECKIN"
+syntax match odinHack "HACK"
+
+syntax keyword odinDataType string bool b8 b16 b32 b64 rune any rawptr f32 f64 f32le f32be f64le f64be u8 u16 u32 u64 u128 u16le u32le u64le u128le u16be u32be u64be u128be uint i8 i16 i32 i64 i128 i16le i32le i64le i128le i16be i32be i64be i128be int
+syntax keyword odinBool true false
+syntax keyword odinNull nil
+syntax keyword odinDynamic dynamic
+syntax keyword odinProc proc
+syntax keyword odinIn in
+syntax keyword odinNotIn notin
+syntax keyword odinNotIn not_in
+syntax keyword odinImport import
+syntax keyword odinExport export
+syntax keyword odinForeign foreign
+syntax keyword odinConst const
+syntax match odinNoinit "---"
+syntax keyword odinPackage package
+
+syntax keyword odinReturn return
+syntax keyword odinDefer defer
+
+syntax region odinChar start=/\v'/ skip=/\v\\./ end=/\v'/
+syntax region odinString start=/\v"/ skip=/\v\\./ end=/\v"/
+
+syntax match odinFunction "\v<\w*>(\s*::\s*)@="
+syntax match odinDynamicFunction "\v<\w*(\s*:\=\s*\(.*\))@="
+
+syntax match odinTagNote "@\<\w\+\>" display
+
+syntax match odinClass "\v<[A-Z]\w+>" display
+syntax match odinConstant "\v<[A-Z0-9,_]+>" display
+syntax match odinRange "\.\." display
+syntax match odinHalfRange "\.\.\<" display
+syntax match odinTernaryQMark "?" display
+syntax match odinDeclaration "\:\:\?" display
+syntax match odinDeclAssign ":=" display
+syntax match odinReturnOp "->" display
+
+syntax match odinInteger "\-\?\<\d\+\>" display
+syntax match odinFloat "\-\?\<[0-9][0-9_]*\%(\.[0-9][0-9_]*\)\%([eE][+-]\=[0-9_]\+\)\=" display
+syntax match odinHex "\-\?\<0x[0-9A-Fa-f]\+\>" display
+syntax match odinAddressOf "&" display
+syntax match odinDeref "\^" display
+
+syntax match odinMacro "#\<\w\+\>" display
+
+syntax match odinTemplate "$\<\w\+\>"
+
+syntax match odinCommentNote "@\<\w\+\>" contained display
+syntax region odinLineComment start=/\/\// end=/$/  contains=odinLineComment, odinCommentNote, odinTodo, odinNote, odinXXX, odinFixMe, odinNoCheckin, odinHack
+syntax region odinBlockComment start=/\v\/\*/ end=/\v\*\// contains=odinBlockComment, odinCommentNote, odinTodo, odinNote, odinXXX, odinFixMe, odinNoCheckin, odinHack
+
+highlight link odinUsing Keyword
+highlight link odinTransmute Keyword
+highlight link odinDistinct Keyword
+highlight link odinOpaque Keyword
+highlight link odinReturn Keyword
+highlight link odinSwitch Keyword
+highlight link odinCase Keyword
+highlight link odinProc Keyword
+highlight link odinIn Keyword
+highlight link odinNotIn Keyword
+highlight link odinContinue Keyword
+highlight link odinBreak Keyword
+highlight link odinSizeOf Keyword
+highlight link odinTypeOf Keyword
+highlight link odinTypeInfoOf Keyword
+highlight link odinTypeIdOf Keyword
+highlight link odinAlignOf Keyword
+highlight link odinPackage Keyword
+
+highlight link odinImport Keyword
+highlight link odinExport Keyword
+highlight link odinForeign Keyword
+highlight link odinNoinit Keyword
+highlight link odinDo Keyword
+
+highlight link odinDefer Operator
+highlight link odinDynamic Operator
+highlight link odinRange Operator
+highlight link odinHalfRange Operator
+highlight link odinAssign Operator
+highlight link odinAddressOf Operator
+highlight link odinDeref Operator
+
+highlight link odinDeclaration Operator
+highlight link odinDeclAssign Operator
+highlight link odinAssign Operator
+highlight link odinTernaryQMark Operator
+highlight link odinReturnOp Operator
+
+highlight link odinString String
+highlight link odinChar String
+
+highlight link odinStruct Structure
+highlight link odinEnum Structure
+highlight link odinUnion Structure
+highlight link odinBitField Structure
+highlight link odinBitSet Structure
+
+highlight link odinFunction Function
+highlight link odinDynamicFunction Function
+
+highlight link odinMacro Macro
+highlight link odinIf Conditional
+highlight link odinElse Conditional
+highlight link odinFor Repeat
+
+highlight link odinLineComment Comment
+highlight link odinBlockComment Comment
+highlight link odinCommentNote Todo
+
+highlight link odinTodo Todo
+highlight link odinNote Todo
+highlight link odinXXX Todo
+highlight link odinFixMe Todo
+highlight link odinNoCheckin Todo
+highlight link odinHack Todo
+
+highlight link odinClass Type
+
+highlight link odinTemplate Constant
+
+highlight link odinTagNote Identifier
+highlight link odinDataType Type
+highlight link odinBool Boolean
+highlight link odinConstant Constant
+highlight link odinNull Type
+highlight link odinInteger Number
+highlight link odinFloat Float
+highlight link odinHex Number
+
+let b:current_syntax = "odin"
+
+endif

From 947e6853aaa79243a303b303f4d1aca356a642c2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 10 Sep 2020 16:42:43 +0200
Subject: [PATCH 044/299] Improve issue template

---
 .github/ISSUE_TEMPLATE/add-language.md        | 15 +++++++++++---
 .../add-support-for-language.md               | 20 -------------------
 .../{bug_report.md => bug-report.md}          |  0
 3 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/add-support-for-language.md
 rename .github/ISSUE_TEMPLATE/{bug_report.md => bug-report.md} (100%)

diff --git a/.github/ISSUE_TEMPLATE/add-language.md b/.github/ISSUE_TEMPLATE/add-language.md
index 1ef312577..fd0c31f46 100644
--- a/.github/ISSUE_TEMPLATE/add-language.md
+++ b/.github/ISSUE_TEMPLATE/add-language.md
@@ -2,17 +2,26 @@
 name: Add language
 about: Add support for new language
 title: ''
-labels: ''
+labels: 'enhancement'
 assignees: ''
 
 ---
 
-<!--- vim-polyglot accepts only lightweight, maintained github-hosted vim plugins -->
+**What is the name of this language in Linguist?**
+
+<!-- https://github.com/github/linguist/blob/master/lib/linguist/languages.yml -->
+
+**GitHub repository url of vim plugin**
 
-**GitHub repository url**
 
 
 **Is this plugin well maintained?**
 
 
+
 **Is this plugin lightweight? (no advanced functionality, just indent and syntax support)**
+
+
+
+
+
diff --git a/.github/ISSUE_TEMPLATE/add-support-for-language.md b/.github/ISSUE_TEMPLATE/add-support-for-language.md
deleted file mode 100644
index f6317060b..000000000
--- a/.github/ISSUE_TEMPLATE/add-support-for-language.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Add support for language
-about: ''
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug-report.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE/bug_report.md
rename to .github/ISSUE_TEMPLATE/bug-report.md

From ca8818e8ed3c92aa49a98786acc738103c91d067 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 10 Sep 2020 16:46:31 +0200
Subject: [PATCH 045/299] Improve issue template

---
 .github/ISSUE_TEMPLATE/add-language.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/add-language.md b/.github/ISSUE_TEMPLATE/add-language.md
index fd0c31f46..1b9755e81 100644
--- a/.github/ISSUE_TEMPLATE/add-language.md
+++ b/.github/ISSUE_TEMPLATE/add-language.md
@@ -11,7 +11,7 @@ assignees: ''
 
 <!-- https://github.com/github/linguist/blob/master/lib/linguist/languages.yml -->
 
-**GitHub repository url of vim plugin**
+**Link to GitHub repository of Vim plugin**
 
 
 
@@ -22,6 +22,3 @@ assignees: ''
 **Is this plugin lightweight? (no advanced functionality, just indent and syntax support)**
 
 
-
-
-

From 314621a395041a5f93aef16b8c4a65a161a57eb1 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 11 Sep 2020 13:56:24 +0200
Subject: [PATCH 046/299] Make warning more clear, #546

---
 ftdetect/polyglot.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index ab7e639bf..15ca68f57 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2104,7 +2104,7 @@ func! s:verify()
   if exists("g:polyglot_disabled_not_set")
     if exists("g:polyglot_disabled")
       echohl WarningMsg
-      echo "vim-polyglot: g:polyglot_disabled should be at the top of .vimrc"
+      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
       echohl None
     endif
 

From c842cbcb59ba734d803dfe149ae6246d9056539d Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 12 Sep 2020 14:54:55 +0200
Subject: [PATCH 047/299] Update

---
 scripts/build   | 11 +++++++++--
 syntax/rust.vim |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/scripts/build b/scripts/build
index fabec0334..352ff8daf 100755
--- a/scripts/build
+++ b/scripts/build
@@ -135,8 +135,15 @@ def transform_patterns(heuristics)
 end
 
 def load_languages
-  url = "#{BASE_URL}/lib/linguist/languages.yml"
-  data = URI.open(url) { |io| YAML.load(io.read) }
+  file = 'tmp/languages.yml'
+
+  unless File.exist?(file)
+    url = "#{BASE_URL}/lib/linguist/languages.yml"
+    data = URI.open(url) { |io| io.read }
+    File.write(file, data)
+  end
+
+  YAML.load(File.read(file))
 end
 
 def parse_remote(remote)
diff --git a/syntax/rust.vim b/syntax/rust.vim
index 2ad37ed84..a5f312bec 100644
--- a/syntax/rust.vim
+++ b/syntax/rust.vim
@@ -231,7 +231,7 @@ syn region rustCommentBlockDocNestError matchgroup=rustCommentBlockDocError star
 " then you must deal with cases like ``/*/**/*/``. And don't try making it
 " worse with ``\%(/\@<!\*\)\@<!``, either...
 
-syn keyword rustTodo contained TODO FIXME XXX NB NOTE
+syn keyword rustTodo contained TODO FIXME XXX NB NOTE SAFETY
 
 " asm! macro {{{2
 syn region rustAsmMacro matchgroup=rustMacro start="\<asm!\s*(" end=")" contains=rustAsmDirSpec,rustAsmSym,rustAsmConst,rustAsmOptionsGroup,rustComment.*,rustString.*

From 5308fab3e9e61bfe2601e1f2de31b074609d2080 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 13 Sep 2020 09:13:11 +0200
Subject: [PATCH 048/299] Fix build, closes #548

---
 scripts/build | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/build b/scripts/build
index 352ff8daf..6d736e40c 100755
--- a/scripts/build
+++ b/scripts/build
@@ -10,6 +10,8 @@ require 'tsort'
 
 Dir.chdir(File.dirname(__dir__))
 
+Dir.mkdir('tmp') unless File.exists?('tmp')
+
 BASE_URL = 'https://raw.githubusercontent.com/github/linguist/master'
 
 def camelize(str)

From 4314841aa4772d98b186636bdbf34fcf48c74275 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 13 Sep 2020 09:14:21 +0200
Subject: [PATCH 049/299] Fix build, closes #548

---
 scripts/build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build b/scripts/build
index 6d736e40c..b100b80a4 100755
--- a/scripts/build
+++ b/scripts/build
@@ -10,8 +10,6 @@ require 'tsort'
 
 Dir.chdir(File.dirname(__dir__))
 
-Dir.mkdir('tmp') unless File.exists?('tmp')
-
 BASE_URL = 'https://raw.githubusercontent.com/github/linguist/master'
 
 def camelize(str)
@@ -768,6 +766,8 @@ if __FILE__ == $0
     FileUtils.rm_rf("tmp")
   end
 
+  Dir.mkdir('tmp') unless File.exists?('tmp')
+
   packages, heuristics = load_data()
   download(packages)
   extract(packages)

From d43d269bedbb6bcf725eaf5bb5b3c5a0bcfcb0c0 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 15 Sep 2020 10:45:50 +0200
Subject: [PATCH 050/299] Update

---
 ftplugin/zig.vim   | 10 ++++++++++
 indent/erlang.vim  |  2 +-
 indent/graphql.vim | 25 ++++++++++++++-----------
 scripts/Gemfile    |  3 +++
 syntax/dune.vim    |  2 +-
 syntax/erlang.vim  |  2 +-
 syntax/odin.vim    |  4 +++-
 syntax/zig.vim     |  2 +-
 8 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 scripts/Gemfile

diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index 1675d20c9..675a3bcfc 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -26,6 +26,16 @@ if has("comments")
     setlocal commentstring=//\ %s
 endif
 
+if has('find_in_path')
+	let &l:includeexpr='substitute(v:fname, "^([^.])$", "\1.zig", "")'
+	let &l:include='\v(\@import>|\@cInclude>|^\s*\#\s*include)'
+	let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
+endif
+
+if has('eval')
+	execute 'setlocal path+=' . json_decode(system('zig env'))['std_dir']
+endif
+
 let b:undo_ftplugin = "setl et< ts< sts< sw< fo< sua< mp< com< cms<"
 
 let &cpo = s:cpo_orig
diff --git a/indent/erlang.vim b/indent/erlang.vim
index ad06ef5d3..2cc1cb23d 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -6,7 +6,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
 " Contributors: Edwin Fine <efine145_nospam01 at usa dot net>
 "               Pawel 'kTT' Salata <rockplayer.pl@gmail.com>
 "               Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
-" Last Update:  2017-Feb-28
+" Last Update:  2020-Jun-11
 " License:      Vim license
 " URL:          https://github.com/vim-erlang/vim-erlang-runtime
 
diff --git a/indent/graphql.vim b/indent/graphql.vim
index 7b6019572..3a9109286 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -45,6 +45,10 @@ endif
 let s:cpo_save = &cpoptions
 set cpoptions&vim
 
+" searchpair() skip expression that matches in comments and strings.
+let s:pair_skip_expr =
+  \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "comment\\|string"'
+
 " Check if the character at lnum:col is inside a string.
 function s:InString(lnum, col)
   return synIDattr(synID(a:lnum, a:col, 1), 'name') ==# 'graphqlString'
@@ -61,18 +65,18 @@ function GetGraphQLIndent()
   let l:line = getline(v:lnum)
 
   " If this line contains just a closing bracket, find its matching opening
-  " bracket and indent the closing backet to match.
+  " bracket and indent the closing bracket to match.
   let l:col = matchend(l:line, '^\s*[]})]')
   if l:col > 0 && !s:InString(v:lnum, l:col)
-    let l:bracket = l:line[l:col - 1]
     call cursor(v:lnum, l:col)
 
-    if l:bracket is# '}'
-      let l:matched = searchpair('{', '', '}', 'bW')
-    elseif l:bracket is# ']'
-      let l:matched = searchpair('\[', '', '\]', 'bW')
-    elseif l:bracket is# ')'
-      let l:matched = searchpair('(', '', ')', 'bW')
+    let l:bracket = l:line[l:col - 1]
+    if l:bracket ==# '}'
+      let l:matched = searchpair('{', '', '}', 'bW', s:pair_skip_expr)
+    elseif l:bracket ==# ']'
+      let l:matched = searchpair('\[', '', '\]', 'bW', s:pair_skip_expr)
+    elseif l:bracket ==# ')'
+      let l:matched = searchpair('(', '', ')', 'bW', s:pair_skip_expr)
     else
       let l:matched = -1
     endif
@@ -85,9 +89,8 @@ function GetGraphQLIndent()
     return indent(v:lnum)
   endif
 
-  " If the previous line contained an opening bracket, and we are still in it,
-  " add indent depending on the bracket type.
-  if getline(l:prevlnum) =~# '[[{(]\s*$'
+  " If the previous line ended with an opening bracket, indent this line.
+  if getline(l:prevlnum) =~# '\%(#.*\)\@<![[{(]\s*$'
     return indent(l:prevlnum) + shiftwidth()
   endif
 
diff --git a/scripts/Gemfile b/scripts/Gemfile
new file mode 100644
index 000000000..fc8e57456
--- /dev/null
+++ b/scripts/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "jasherai-oniguruma"
diff --git a/syntax/dune.vim b/syntax/dune.vim
index b9160f788..319250884 100644
--- a/syntax/dune.vim
+++ b/syntax/dune.vim
@@ -20,7 +20,7 @@ syn keyword lispKey ppx_runtime_libraries virtual_deps js_of_ocaml link_flags
 syn keyword lispKey javascript_files flags ocamlc_flags ocamlopt_flags pps staged_pps
 syn keyword lispKey library_flags c_flags c_library_flags kind package action
 syn keyword lispKey deps targets locks fallback
-syn keyword lispKey inline_tests tests names
+syn keyword lispKey inline_tests tests test names
 
 syn keyword lispAtom true false
 
diff --git a/syntax/erlang.vim b/syntax/erlang.vim
index a60eaad94..65b8059c2 100644
--- a/syntax/erlang.vim
+++ b/syntax/erlang.vim
@@ -4,7 +4,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
 " Language:     Erlang (http://www.erlang.org)
 " Maintainer:   Csaba Hoch <csaba.hoch@gmail.com>
 " Contributor:  Adam Rutkowski <hq@mtod.org>
-" Last Update:  2019-Jun-18
+" Last Update:  2020-May-26
 " License:      Vim license
 " URL:          https://github.com/vim-erlang/vim-erlang-runtime
 
diff --git a/syntax/odin.vim b/syntax/odin.vim
index a8ad7482c..c9bae6390 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -16,6 +16,7 @@ syntax keyword odinBitField bit_field
 syntax keyword odinBitSet bit_set
 
 syntax keyword odinIf if
+syntax keyword odinWhen when
 syntax keyword odinElse else
 syntax keyword odinDo do
 syntax keyword odinFor for
@@ -36,7 +37,7 @@ syntax match odinFixMe "FIXME"
 syntax match odinNoCheckin "NOCHECKIN"
 syntax match odinHack "HACK"
 
-syntax keyword odinDataType string bool b8 b16 b32 b64 rune any rawptr f32 f64 f32le f32be f64le f64be u8 u16 u32 u64 u128 u16le u32le u64le u128le u16be u32be u64be u128be uint i8 i16 i32 i64 i128 i16le i32le i64le i128le i16be i32be i64be i128be int
+syntax keyword odinDataType string cstring bool b8 b16 b32 b64 rune any rawptr f32 f64 f32le f32be f64le f64be u8 u16 u32 u64 u128 u16le u32le u64le u128le u16be u32be u64be u128be uint i8 i16 i32 i64 i128 i16le i32le i64le i128le i16be i32be i64be i128be int
 syntax keyword odinBool true false
 syntax keyword odinNull nil
 syntax keyword odinDynamic dynamic
@@ -138,6 +139,7 @@ highlight link odinDynamicFunction Function
 
 highlight link odinMacro Macro
 highlight link odinIf Conditional
+highlight link odinWhen Conditional
 highlight link odinElse Conditional
 highlight link odinFor Repeat
 
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 9ab64571a..f9f889c54 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -60,7 +60,7 @@ syn match zigCharacter /'\([^\\]\|\\\(.\|x\x\{2}\|u\x\{4}\|U\x\{6}\)\)'/ contain
 syn region zigBlock start="{" end="}" transparent fold
 
 syn region zigCommentLine start="//" end="$" contains=zigTodo,@Spell
-syn region zigCommentLineDoc start="////\@!" end="$" contains=zigTodo,@Spell
+syn region zigCommentLineDoc start="//[/!]/\@!" end="$" contains=zigTodo,@Spell
 
 " TODO: match only the first '\\' within the zigMultilineString as zigMultilineStringPrefix
 syn match zigMultilineStringPrefix display contained /c\?\\\\/

From 271679272c7bb1a281c7404408a2414068abf91c Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 15 Sep 2020 11:19:56 +0200
Subject: [PATCH 051/299] Fix eruby filetype detect, closes #547

---
 README.md                   |    2 +-
 autoload/polyglot.vim       |   86 +-
 autoload/sleuth.vim         |    2 +-
 ftdetect/polyglot.vim       | 1896 ++++++++++++++++++-----------------
 packages.yaml               |    3 +-
 scripts/build               |   26 +-
 scripts/test                |    2 +-
 scripts/test_extensions.vim |    2 +-
 scripts/test_filetypes.vim  |   28 +-
 syntax/html-1.vim           |  202 +++-
 syntax/html-2.vim           |  202 +---
 11 files changed, 1233 insertions(+), 1218 deletions(-)

diff --git a/README.md b/README.md
index a41e499aa..72c32ae11 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ A collection of language packs for Vim.
 - Automatically detect indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth))
 - Each build is tested by automated vimrunner script on CI. See `spec` directory.
 
-\*To be completely honest, optimized `ftdetect` script takes around `19ms` to load.
+\*To be completely honest, optimized `ftdetect` script takes around `20ms` to load.
 
 ## Installation
 
diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index bc8791f5e..29287ece8 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -2,6 +2,14 @@
 let s:cpo_save = &cpo
 set cpo&vim
 
+" We need it because scripts.vim in vim uses "set ft=" which cannot be
+" overridden with setf (and we can't use set ft= so our scripts.vim work)
+func! s:Setf(ft)
+  if &filetype !~# '<'.a:ft.'>'
+    let &filetype = a:ft
+  endif
+endfunc
+
 func! polyglot#Heuristics()
   " Try to detect filetype from shebang
   let l:filetype = polyglot#Shebang()
@@ -127,34 +135,34 @@ endfunc
 func! polyglot#DetectInpFiletype()
   let line = getline(1)
   if line =~# '^\*'
-    setf abaqus | return
+    call s:Setf('abaqus') | return
   endif
   for lnum in range(1, min([line("$"), 500]))
     let line = getline(lnum)
     if line =~? '^header surface data'
-      setf trasys | return
+      call s:Setf('trasys') | return
     endif
   endfor
 endfunc
 
 func! polyglot#DetectAsaFiletype()
   if exists("g:filetype_asa")
-    exe "setf " . g:filetype_asa | return
+    call s:Setf(g:filetype_asa) | return
   endif
-  setf aspvbs | return
+  call s:Setf('aspvbs') | return
 endfunc
 
 func! polyglot#DetectAspFiletype()
   if exists("g:filetype_asp")
-    exe "setf " . g:filetype_asp | return
+    call s:Setf(g:filetype_asp) | return
   endif
   for lnum in range(1, min([line("$"), 3]))
     let line = getline(lnum)
     if line =~? 'perlscript'
-      setf aspperl | return
+      call s:Setf('aspperl') | return
     endif
   endfor
-  setf aspvbs | return
+  call s:Setf('aspvbs') | return
 endfunc
 
 func! polyglot#DetectHFiletype()
@@ -162,18 +170,18 @@ func! polyglot#DetectHFiletype()
     let line = getline(lnum)
     if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
       if exists("g:c_syntax_for_h")
-        setf objc | return
+        call s:Setf('objc') | return
       endif
-      setf objcpp | return
+      call s:Setf('objcpp') | return
     endif
   endfor
   if exists("g:c_syntax_for_h")
-    setf c | return
+    call s:Setf('c') | return
   endif
   if exists("g:ch_syntax_for_h")
-    setf ch | return
+    call s:Setf('ch') | return
   endif
-  setf cpp | return
+  call s:Setf('cpp') | return
 endfunc
 
 func! polyglot#DetectMFiletype()
@@ -184,53 +192,53 @@ func! polyglot#DetectMFiletype()
       let saw_comment = 1
     endif
     if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
-      setf objc | return
+      call s:Setf('objc') | return
     endif
     if line =~# '^\s*%'
-      setf octave | return
+      call s:Setf('octave') | return
     endif
     if line =~# '^\s*(\*'
-      setf mma | return
+      call s:Setf('mma') | return
     endif
     if line =~? '^\s*\(\(type\|var\)\(\<\|\>\)\|--\)'
-      setf murphi | return
+      call s:Setf('murphi') | return
     endif
   endfor
   if saw_comment
-    setf objc | return
+    call s:Setf('objc') | return
   endif
   if exists("g:filetype_m")
-    exe "setf " . g:filetype_m | return
+    call s:Setf(g:filetype_m) | return
   endif
-  setf octave | return
+  call s:Setf('octave') | return
 endfunc
 
 func! polyglot#DetectFsFiletype()
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
     if line =~# '^\(: \|new-device\)'
-      setf forth | return
+      call s:Setf('forth') | return
     endif
     if line =~# '^\s*\(#light\|import\|let\|module\|namespace\|open\|type\)'
-      setf fsharp | return
+      call s:Setf('fsharp') | return
     endif
     if line =~# '\s*\(#version\|precision\|uniform\|varying\|vec[234]\)'
-      setf glsl | return
+      call s:Setf('glsl') | return
     endif
   endfor
   if exists("g:filetype_fs")
-    exe "setf " . g:filetype_fs | return
+    call s:Setf(g:filetype_fs) | return
   endif
-  setf forth | return
+  call s:Setf('forth') | return
 endfunc
 
 func! polyglot#DetectReFiletype()
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
     if line =~# '^\s*#\%(\%(if\|ifdef\|define\|pragma\)\s\+\w\|\s*include\s\+[<"]\|template\s*<\)'
-      setf cpp | return
+      call s:Setf('cpp') | return
     endif
-    setf reason | return
+    call s:Setf('reason') | return
   endfor
 endfunc
 
@@ -238,54 +246,54 @@ func! polyglot#DetectIdrFiletype()
   for lnum in range(1, min([line("$"), 5]))
     let line = getline(lnum)
     if line =~# '^\s*--.*[Ii]dris \=1'
-      setf idris | return
+      call s:Setf('idris') | return
     endif
     if line =~# '^\s*--.*[Ii]dris \=2'
-      setf idris2 | return
+      call s:Setf('idris2') | return
     endif
   endfor
   for lnum in range(1, min([line("$"), 30]))
     let line = getline(lnum)
     if line =~# '^pkgs =.*'
-      setf idris | return
+      call s:Setf('idris') | return
     endif
     if line =~# '^depends =.*'
-      setf idris2 | return
+      call s:Setf('idris2') | return
     endif
     if line =~# '^%language \(TypeProviders\|ElabReflection\)'
-      setf idris | return
+      call s:Setf('idris') | return
     endif
     if line =~# '^%language PostfixProjections'
-      setf idris2 | return
+      call s:Setf('idris2') | return
     endif
     if line =~# '^%access .*'
-      setf idris | return
+      call s:Setf('idris') | return
     endif
     if exists("g:filetype_idr")
-      exe "setf " . g:filetype_idr | return
+      call s:Setf(g:filetype_idr) | return
     endif
   endfor
-  setf idris2 | return
+  call s:Setf('idris2') | return
 endfunc
 
 func! polyglot#DetectLidrFiletype()
   for lnum in range(1, min([line("$"), 200]))
     let line = getline(lnum)
     if line =~# '^>\s*--.*[Ii]dris \=1'
-      setf lidris | return
+      call s:Setf('lidris') | return
     endif
   endfor
-  setf lidris2 | return
+  call s:Setf('lidris2') | return
 endfunc
 
 func! polyglot#DetectBasFiletype()
   for lnum in range(1, min([line("$"), 5]))
     let line = getline(lnum)
     if line =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
-      setf vb | return
+      call s:Setf('vb') | return
     endif
   endfor
-  setf basic | return
+  call s:Setf('basic') | return
 endfunc
 
 " Restore 'cpoptions'
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 05459ccde..c1de82cd1 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -57,7 +57,7 @@ let s:globs = {
   \ 'dd': '*.dd',
   \ 'ddoc': '*.ddoc',
   \ 'dhall': '*.dhall',
-  \ 'dosini': '*.wrap,*.ini,*.cfg,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,buildozer.spec,php.ini-*',
+  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,buildozer.spec,php.ini-*',
   \ 'dsdl': '*.sdl',
   \ 'dune': 'jbuild,dune,dune-project,dune-workspace',
   \ 'ecrystal': '*.ecr',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 15ca68f57..41819e05e 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -62,6 +62,13 @@ if !exists('g:python_highlight_all')
   call s:SetDefault('g:python_slow_sync', 1)
 endif
 
+" We need it because scripts.vim in vim uses "set ft=" which cannot be
+" overridden with setf (and we can't use set ft= so our scripts.vim work)
+func! s:Setf(ft)
+  if &filetype !~# '\<'.a:ft.'\>'
+    let &filetype = a:ft
+  endif
+endfunc
 
 " Function used for patterns that end in a star: don't set the filetype if the
 " file name matches ft_ignore_pat.
@@ -81,6 +88,10 @@ if !has_key(s:disabled_packages, '8th')
   au! BufRead,BufNewFile *.8th
 endif
 
+if !has_key(s:disabled_packages, 'haproxy')
+  au! BufRead,BufNewFile *.cfg
+endif
+
 if !has_key(s:disabled_packages, 'a65')
   au! BufRead,BufNewFile *.a65
 endif
@@ -129,10 +140,18 @@ if !has_key(s:disabled_packages, 'ampl')
   au! BufRead,BufNewFile *.run
 endif
 
+if !has_key(s:disabled_packages, 'xml')
+  au! BufRead,BufNewFile *.csproj,*.ui,*.wsdl,*.wsf,*.xlf,*.xliff,*.xmi,*.xsd,*.xul
+endif
+
 if !has_key(s:disabled_packages, 'applescript')
   au! BufRead,BufNewFile *.scpt
 endif
 
+if !has_key(s:disabled_packages, 'c/c++')
+  au! BufRead,BufNewFile *.cpp,*.c++,*.cc,*.cxx,*.hh,*.hpp,*.hxx,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh,*.qc
+endif
+
 if !has_key(s:disabled_packages, 'arduino')
   au! BufRead,BufNewFile *.pde,*.ino
 endif
@@ -149,6 +168,10 @@ if !has_key(s:disabled_packages, 'autohotkey')
   au! BufRead,BufNewFile *.ahk
 endif
 
+if !has_key(s:disabled_packages, 'elf')
+  au! BufRead,BufNewFile *.am
+endif
+
 if !has_key(s:disabled_packages, 'asn')
   au! BufRead,BufNewFile *.asn,*.asn1
 endif
@@ -169,10 +192,6 @@ if !has_key(s:disabled_packages, 'awk')
   au! BufRead,BufNewFile *.awk,*.gawk
 endif
 
-if !has_key(s:disabled_packages, 'c/c++')
-  au! BufRead,BufNewFile *.cpp,*.c++,*.cc,*.cxx,*.hh,*.hpp,*.hxx,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh,*.qc
-endif
-
 if !has_key(s:disabled_packages, 'clojure')
   au! BufRead,BufNewFile *.clj,*.cljc,*.cljs,*.cljx
 endif
@@ -197,10 +216,6 @@ if !has_key(s:disabled_packages, 'dockerfile')
   au! BufRead,BufNewFile *.Dockerfile
 endif
 
-if !has_key(s:disabled_packages, 'elf')
-  au! BufRead,BufNewFile *.am
-endif
-
 if !has_key(s:disabled_packages, 'elm')
   au! BufRead,BufNewFile *.elm
 endif
@@ -213,14 +228,14 @@ if !has_key(s:disabled_packages, 'forth')
   au! BufRead,BufNewFile *.fs,*.ft,*.fth
 endif
 
-if !has_key(s:disabled_packages, 'fsharp')
-  au! BufRead,BufNewFile *.fs
-endif
-
 if !has_key(s:disabled_packages, 'glsl')
   au! BufRead,BufNewFile *.fs,*.gs,*.comp
 endif
 
+if !has_key(s:disabled_packages, 'fsharp')
+  au! BufRead,BufNewFile *.fs
+endif
+
 if !has_key(s:disabled_packages, 'gnuplot')
   au! BufRead,BufNewFile *.gp,*.gpi
 endif
@@ -229,6 +244,14 @@ if !has_key(s:disabled_packages, 'go')
   au! BufRead,BufNewFile *.go,*.tmpl
 endif
 
+if !has_key(s:disabled_packages, 'javascript')
+  au! BufRead,BufNewFile *.js,*.cjs,*.es,*.gs,*.mjs,*.pac
+endif
+
+if !has_key(s:disabled_packages, 'jsx')
+  au! BufRead,BufNewFile *.jsx
+endif
+
 if !has_key(s:disabled_packages, 'groovy')
   au! BufRead,BufNewFile *.groovy,*.gradle
 endif
@@ -241,10 +264,6 @@ if !has_key(s:disabled_packages, 'handlebars')
   au! BufRead,BufNewFile *.hb
 endif
 
-if !has_key(s:disabled_packages, 'haproxy')
-  au! BufRead,BufNewFile *.cfg
-endif
-
 if !has_key(s:disabled_packages, 'haskell')
   au! BufRead,BufNewFile *.hs,*.hs-boot,*.hsc
 endif
@@ -253,14 +272,6 @@ if !has_key(s:disabled_packages, 'html5')
   au! BufRead,BufNewFile *.st,*.xht,*.xhtml
 endif
 
-if !has_key(s:disabled_packages, 'jsx')
-  au! BufRead,BufNewFile *.jsx
-endif
-
-if !has_key(s:disabled_packages, 'javascript')
-  au! BufRead,BufNewFile *.js,*.cjs,*.es,*.gs,*.mjs,*.pac
-endif
-
 if !has_key(s:disabled_packages, 'json')
   au! BufRead,BufNewFile *.json,*.ice,*.webmanifest,*.yy,*.jsonp
 endif
@@ -401,10 +412,6 @@ if !has_key(s:disabled_packages, 'vue')
   au! BufRead,BufNewFile *.vue
 endif
 
-if !has_key(s:disabled_packages, 'xml')
-  au! BufRead,BufNewFile *.csproj,*.ui,*.wsdl,*.wsf,*.xlf,*.xliff,*.xmi,*.xsd,*.xul
-endif
-
 if !has_key(s:disabled_packages, 'xsl')
   au! BufRead,BufNewFile *.xslt,*.xsl
 endif
@@ -418,30 +425,36 @@ if !has_key(s:disabled_packages, 'visual-basic')
 endif
 
 if !has_key(s:disabled_packages, 'dosini')
-  au! BufRead,BufNewFile *.ini,*.cfg,*.properties
+  au! BufRead,BufNewFile *.ini,*.properties
 endif
 
 if !has_key(s:disabled_packages, '8th')
-  au BufNewFile,BufRead *.8th setf 8th
+  au BufNewFile,BufRead *.8th call s:Setf('8th')
+endif
+
+if !has_key(s:disabled_packages, 'haproxy')
+  au BufNewFile,BufRead *.cfg call s:Setf('haproxy')
+  au BufNewFile,BufRead haproxy*.c* call s:StarSetf('haproxy')
+  au BufNewFile,BufRead haproxy.cfg call s:Setf('haproxy')
 endif
 
 if !has_key(s:disabled_packages, 'a2ps')
-  au BufNewFile,BufRead */etc/a2ps.cfg setf a2ps
-  au BufNewFile,BufRead */etc/a2ps/*.cfg setf a2ps
-  au BufNewFile,BufRead {.,}a2psrc setf a2ps
-  au BufNewFile,BufRead a2psrc setf a2ps
+  au BufNewFile,BufRead */etc/a2ps.cfg call s:Setf('a2ps')
+  au BufNewFile,BufRead */etc/a2ps/*.cfg call s:Setf('a2ps')
+  au BufNewFile,BufRead {.,}a2psrc call s:Setf('a2ps')
+  au BufNewFile,BufRead a2psrc call s:Setf('a2ps')
 endif
 
 if !has_key(s:disabled_packages, 'a65')
-  au BufNewFile,BufRead *.a65 setf a65
+  au BufNewFile,BufRead *.a65 call s:Setf('a65')
 endif
 
 if !has_key(s:disabled_packages, 'aap')
-  au BufNewFile,BufRead *.aap setf aap
+  au BufNewFile,BufRead *.aap call s:Setf('aap')
 endif
 
 if !has_key(s:disabled_packages, 'abap')
-  au BufNewFile,BufRead *.abap setf abap
+  au BufNewFile,BufRead *.abap call s:Setf('abap')
 endif
 
 if !has_key(s:disabled_packages, 'abaqus')
@@ -449,55 +462,164 @@ if !has_key(s:disabled_packages, 'abaqus')
 endif
 
 if !has_key(s:disabled_packages, 'abc')
-  au BufNewFile,BufRead *.abc setf abc
+  au BufNewFile,BufRead *.abc call s:Setf('abc')
 endif
 
 if !has_key(s:disabled_packages, 'abel')
-  au BufNewFile,BufRead *.abl setf abel
+  au BufNewFile,BufRead *.abl call s:Setf('abel')
 endif
 
 if !has_key(s:disabled_packages, 'acedb')
-  au BufNewFile,BufRead *.wrm setf acedb
+  au BufNewFile,BufRead *.wrm call s:Setf('acedb')
 endif
 
 if !has_key(s:disabled_packages, 'acpiasl')
-  au BufNewFile,BufRead *.asl setf asl
-  au BufNewFile,BufRead *.dsl setf asl
+  au BufNewFile,BufRead *.asl call s:Setf('asl')
+  au BufNewFile,BufRead *.dsl call s:Setf('asl')
 endif
 
 if !has_key(s:disabled_packages, 'ada')
-  au BufNewFile,BufRead *.ada setf ada
-  au BufNewFile,BufRead *.ada_m setf ada
-  au BufNewFile,BufRead *.adb setf ada
-  au BufNewFile,BufRead *.adc setf ada
-  au BufNewFile,BufRead *.ads setf ada
-  au BufNewFile,BufRead *.gpr setf ada
+  au BufNewFile,BufRead *.ada call s:Setf('ada')
+  au BufNewFile,BufRead *.ada_m call s:Setf('ada')
+  au BufNewFile,BufRead *.adb call s:Setf('ada')
+  au BufNewFile,BufRead *.adc call s:Setf('ada')
+  au BufNewFile,BufRead *.ads call s:Setf('ada')
+  au BufNewFile,BufRead *.gpr call s:Setf('ada')
 endif
 
 if !has_key(s:disabled_packages, 'ahdl')
-  au BufNewFile,BufRead *.tdf setf ahdl
+  au BufNewFile,BufRead *.tdf call s:Setf('ahdl')
 endif
 
 if !has_key(s:disabled_packages, 'aidl')
-  au BufNewFile,BufRead *.aidl setf aidl
+  au BufNewFile,BufRead *.aidl call s:Setf('aidl')
 endif
 
 if !has_key(s:disabled_packages, 'alsaconf')
-  au BufNewFile,BufRead */etc/asound.conf setf alsaconf
-  au BufNewFile,BufRead */usr/share/alsa/alsa.conf setf alsaconf
-  au BufNewFile,BufRead {.,}asoundrc setf alsaconf
+  au BufNewFile,BufRead */etc/asound.conf call s:Setf('alsaconf')
+  au BufNewFile,BufRead */usr/share/alsa/alsa.conf call s:Setf('alsaconf')
+  au BufNewFile,BufRead {.,}asoundrc call s:Setf('alsaconf')
 endif
 
 if !has_key(s:disabled_packages, 'aml')
-  au BufNewFile,BufRead *.aml setf aml
+  au BufNewFile,BufRead *.aml call s:Setf('aml')
 endif
 
 if !has_key(s:disabled_packages, 'ampl')
-  au BufNewFile,BufRead *.run setf ampl
+  au BufNewFile,BufRead *.run call s:Setf('ampl')
+endif
+
+if !has_key(s:disabled_packages, 'xml')
+  au BufNewFile,BufRead *.adml call s:Setf('xml')
+  au BufNewFile,BufRead *.admx call s:Setf('xml')
+  au BufNewFile,BufRead *.ant call s:Setf('xml')
+  au BufNewFile,BufRead *.axml call s:Setf('xml')
+  au BufNewFile,BufRead *.builds call s:Setf('xml')
+  au BufNewFile,BufRead *.ccproj call s:Setf('xml')
+  au BufNewFile,BufRead *.ccxml call s:Setf('xml')
+  au BufNewFile,BufRead *.cdxml call s:Setf('xml')
+  au BufNewFile,BufRead *.clixml call s:Setf('xml')
+  au BufNewFile,BufRead *.cproject call s:Setf('xml')
+  au BufNewFile,BufRead *.cscfg call s:Setf('xml')
+  au BufNewFile,BufRead *.csdef call s:Setf('xml')
+  au BufNewFile,BufRead *.csl call s:Setf('xml')
+  au BufNewFile,BufRead *.csproj call s:Setf('xml')
+  au BufNewFile,BufRead *.ct call s:Setf('xml')
+  au BufNewFile,BufRead *.depproj call s:Setf('xml')
+  au BufNewFile,BufRead *.dita call s:Setf('xml')
+  au BufNewFile,BufRead *.ditamap call s:Setf('xml')
+  au BufNewFile,BufRead *.ditaval call s:Setf('xml')
+  au BufNewFile,BufRead *.dll.config call s:Setf('xml')
+  au BufNewFile,BufRead *.dotsettings call s:Setf('xml')
+  au BufNewFile,BufRead *.filters call s:Setf('xml')
+  au BufNewFile,BufRead *.fsproj call s:Setf('xml')
+  au BufNewFile,BufRead *.fxml call s:Setf('xml')
+  au BufNewFile,BufRead *.glade call s:Setf('xml')
+  au BufNewFile,BufRead *.gml call s:Setf('xml')
+  au BufNewFile,BufRead *.gmx call s:Setf('xml')
+  au BufNewFile,BufRead *.grxml call s:Setf('xml')
+  au BufNewFile,BufRead *.gst call s:Setf('xml')
+  au BufNewFile,BufRead *.iml call s:Setf('xml')
+  au BufNewFile,BufRead *.ivy call s:Setf('xml')
+  au BufNewFile,BufRead *.jelly call s:Setf('xml')
+  au BufNewFile,BufRead *.jsproj call s:Setf('xml')
+  au BufNewFile,BufRead *.kml call s:Setf('xml')
+  au BufNewFile,BufRead *.launch call s:Setf('xml')
+  au BufNewFile,BufRead *.mdpolicy call s:Setf('xml')
+  au BufNewFile,BufRead *.mjml call s:Setf('xml')
+  au BufNewFile,BufRead *.mm call s:Setf('xml')
+  au BufNewFile,BufRead *.mod call s:Setf('xml')
+  au BufNewFile,BufRead *.mxml call s:Setf('xml')
+  au BufNewFile,BufRead *.natvis call s:Setf('xml')
+  au BufNewFile,BufRead *.ncl call s:Setf('xml')
+  au BufNewFile,BufRead *.ndproj call s:Setf('xml')
+  au BufNewFile,BufRead *.nproj call s:Setf('xml')
+  au BufNewFile,BufRead *.nuspec call s:Setf('xml')
+  au BufNewFile,BufRead *.odd call s:Setf('xml')
+  au BufNewFile,BufRead *.osm call s:Setf('xml')
+  au BufNewFile,BufRead *.pkgproj call s:Setf('xml')
+  au BufNewFile,BufRead *.pluginspec call s:Setf('xml')
+  au BufNewFile,BufRead *.proj call s:Setf('xml')
+  au BufNewFile,BufRead *.props call s:Setf('xml')
+  au BufNewFile,BufRead *.ps1xml call s:Setf('xml')
+  au BufNewFile,BufRead *.psc1 call s:Setf('xml')
+  au BufNewFile,BufRead *.pt call s:Setf('xml')
+  au BufNewFile,BufRead *.rdf call s:Setf('xml')
+  au BufNewFile,BufRead *.resx call s:Setf('xml')
+  au BufNewFile,BufRead *.rss call s:Setf('xml')
+  au BufNewFile,BufRead *.sch call s:Setf('xml')
+  au BufNewFile,BufRead *.scxml call s:Setf('xml')
+  au BufNewFile,BufRead *.sfproj call s:Setf('xml')
+  au BufNewFile,BufRead *.shproj call s:Setf('xml')
+  au BufNewFile,BufRead *.srdf call s:Setf('xml')
+  au BufNewFile,BufRead *.storyboard call s:Setf('xml')
+  au BufNewFile,BufRead *.sublime-snippet call s:Setf('xml')
+  au BufNewFile,BufRead *.targets call s:Setf('xml')
+  au BufNewFile,BufRead *.tml call s:Setf('xml')
+  au BufNewFile,BufRead *.ui call s:Setf('xml')
+  au BufNewFile,BufRead *.urdf call s:Setf('xml')
+  au BufNewFile,BufRead *.ux call s:Setf('xml')
+  au BufNewFile,BufRead *.vbproj call s:Setf('xml')
+  au BufNewFile,BufRead *.vcxproj call s:Setf('xml')
+  au BufNewFile,BufRead *.vsixmanifest call s:Setf('xml')
+  au BufNewFile,BufRead *.vssettings call s:Setf('xml')
+  au BufNewFile,BufRead *.vstemplate call s:Setf('xml')
+  au BufNewFile,BufRead *.vxml call s:Setf('xml')
+  au BufNewFile,BufRead *.wixproj call s:Setf('xml')
+  au BufNewFile,BufRead *.workflow call s:Setf('xml')
+  au BufNewFile,BufRead *.wsdl call s:Setf('xml')
+  au BufNewFile,BufRead *.wsf call s:Setf('xml')
+  au BufNewFile,BufRead *.wxi call s:Setf('xml')
+  au BufNewFile,BufRead *.wxl call s:Setf('xml')
+  au BufNewFile,BufRead *.wxs call s:Setf('xml')
+  au BufNewFile,BufRead *.x3d call s:Setf('xml')
+  au BufNewFile,BufRead *.xacro call s:Setf('xml')
+  au BufNewFile,BufRead *.xaml call s:Setf('xml')
+  au BufNewFile,BufRead *.xib call s:Setf('xml')
+  au BufNewFile,BufRead *.xlf call s:Setf('xml')
+  au BufNewFile,BufRead *.xliff call s:Setf('xml')
+  au BufNewFile,BufRead *.xmi call s:Setf('xml')
+  au BufNewFile,BufRead *.xml call s:Setf('xml')
+  au BufNewFile,BufRead *.xml.dist call s:Setf('xml')
+  au BufNewFile,BufRead *.xproj call s:Setf('xml')
+  au BufNewFile,BufRead *.xsd call s:Setf('xml')
+  au BufNewFile,BufRead *.xspec call s:Setf('xml')
+  au BufNewFile,BufRead *.xul call s:Setf('xml')
+  au BufNewFile,BufRead *.zcml call s:Setf('xml')
+  au BufNewFile,BufRead {.,}classpath call s:Setf('xml')
+  au BufNewFile,BufRead {.,}cproject call s:Setf('xml')
+  au BufNewFile,BufRead {.,}project call s:Setf('xml')
+  au BufNewFile,BufRead App.config call s:Setf('xml')
+  au BufNewFile,BufRead NuGet.config call s:Setf('xml')
+  au BufNewFile,BufRead Settings.StyleCop call s:Setf('xml')
+  au BufNewFile,BufRead Web.Debug.config call s:Setf('xml')
+  au BufNewFile,BufRead Web.Release.config call s:Setf('xml')
+  au BufNewFile,BufRead Web.config call s:Setf('xml')
+  au BufNewFile,BufRead packages.config call s:Setf('xml')
 endif
 
 if !has_key(s:disabled_packages, 'ant')
-  au BufNewFile,BufRead build.xml setf ant
+  au BufNewFile,BufRead build.xml call s:Setf('ant')
 endif
 
 if !has_key(s:disabled_packages, 'apache')
@@ -505,10 +627,10 @@ if !has_key(s:disabled_packages, 'apache')
   au BufNewFile,BufRead */etc/apache2/conf.*/* call s:StarSetf('apache')
   au BufNewFile,BufRead */etc/apache2/mods-*/* call s:StarSetf('apache')
   au BufNewFile,BufRead */etc/apache2/sites-*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/sites-*/*.com setf apache
-  au BufNewFile,BufRead */etc/httpd/*.conf setf apache
+  au BufNewFile,BufRead */etc/apache2/sites-*/*.com call s:Setf('apache')
+  au BufNewFile,BufRead */etc/httpd/*.conf call s:Setf('apache')
   au BufNewFile,BufRead */etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead {.,}htaccess setf apache
+  au BufNewFile,BufRead {.,}htaccess call s:Setf('apache')
   au BufNewFile,BufRead access.conf* call s:StarSetf('apache')
   au BufNewFile,BufRead apache.conf* call s:StarSetf('apache')
   au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
@@ -517,54 +639,83 @@ if !has_key(s:disabled_packages, 'apache')
 endif
 
 if !has_key(s:disabled_packages, 'apiblueprint')
-  au BufNewFile,BufRead *.apib setf apiblueprint
+  au BufNewFile,BufRead *.apib call s:Setf('apiblueprint')
 endif
 
 if !has_key(s:disabled_packages, 'applescript')
-  au BufNewFile,BufRead *.applescript setf applescript
-  au BufNewFile,BufRead *.scpt setf applescript
+  au BufNewFile,BufRead *.applescript call s:Setf('applescript')
+  au BufNewFile,BufRead *.scpt call s:Setf('applescript')
 endif
 
 if !has_key(s:disabled_packages, 'aptconf')
-  au BufNewFile,BufRead */.aptitude/config setf aptconf
-  au BufNewFile,BufRead */etc/apt/apt.conf.d/*.conf setf aptconf
+  au BufNewFile,BufRead */.aptitude/config call s:Setf('aptconf')
+  au BufNewFile,BufRead */etc/apt/apt.conf.d/*.conf call s:Setf('aptconf')
   au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
-  au BufNewFile,BufRead apt.conf setf aptconf
+  au BufNewFile,BufRead apt.conf call s:Setf('aptconf')
 endif
 
 if !has_key(s:disabled_packages, 'arch')
-  au BufNewFile,BufRead {.,}arch-inventory setf arch
-  au BufNewFile,BufRead =tagging-method setf arch
+  au BufNewFile,BufRead {.,}arch-inventory call s:Setf('arch')
+  au BufNewFile,BufRead =tagging-method call s:Setf('arch')
+endif
+
+if !has_key(s:disabled_packages, 'c/c++')
+  au BufNewFile,BufRead *.c++ call s:Setf('cpp')
+  au BufNewFile,BufRead *.cc call s:Setf('cpp')
+  au BufNewFile,BufRead *.cp call s:Setf('cpp')
+  au BufNewFile,BufRead *.cpp call s:Setf('cpp')
+  au BufNewFile,BufRead *.cxx call s:Setf('cpp')
+  au BufNewFile,BufRead *.h++ call s:Setf('cpp')
+  au BufNewFile,BufRead *.hh call s:Setf('cpp')
+  au BufNewFile,BufRead *.hpp call s:Setf('cpp')
+  au BufNewFile,BufRead *.hxx call s:Setf('cpp')
+  au BufNewFile,BufRead *.inc call s:Setf('cpp')
+  au BufNewFile,BufRead *.inl call s:Setf('cpp')
+  au BufNewFile,BufRead *.ipp call s:Setf('cpp')
+  au BufNewFile,BufRead *.moc call s:Setf('cpp')
+  au BufNewFile,BufRead *.tcc call s:Setf('cpp')
+  au BufNewFile,BufRead *.tlh call s:Setf('cpp')
+  au BufNewFile,BufRead *.tpp call s:Setf('cpp')
+  au BufNewFile,BufRead *.c call s:Setf('c')
+  au BufNewFile,BufRead *.cats call s:Setf('c')
+  au BufNewFile,BufRead *.idc call s:Setf('c')
+  au BufNewFile,BufRead *.qc call s:Setf('c')
+  au BufNewFile,BufRead *enlightenment/*.cfg call s:Setf('c')
+  au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'arduino')
-  au BufNewFile,BufRead *.ino setf arduino
-  au BufNewFile,BufRead *.pde setf arduino
+  au BufNewFile,BufRead *.ino call s:Setf('arduino')
+  au BufNewFile,BufRead *.pde call s:Setf('arduino')
 endif
 
 if !has_key(s:disabled_packages, 'art')
-  au BufNewFile,BufRead *.art setf art
+  au BufNewFile,BufRead *.art call s:Setf('art')
 endif
 
 if !has_key(s:disabled_packages, 'asciidoc')
-  au BufNewFile,BufRead *.adoc setf asciidoc
-  au BufNewFile,BufRead *.asc setf asciidoc
-  au BufNewFile,BufRead *.asciidoc setf asciidoc
+  au BufNewFile,BufRead *.adoc call s:Setf('asciidoc')
+  au BufNewFile,BufRead *.asc call s:Setf('asciidoc')
+  au BufNewFile,BufRead *.asciidoc call s:Setf('asciidoc')
 endif
 
 if !has_key(s:disabled_packages, 'autohotkey')
-  au BufNewFile,BufRead *.ahk setf autohotkey
-  au BufNewFile,BufRead *.ahkl setf autohotkey
+  au BufNewFile,BufRead *.ahk call s:Setf('autohotkey')
+  au BufNewFile,BufRead *.ahkl call s:Setf('autohotkey')
+endif
+
+if !has_key(s:disabled_packages, 'elf')
+  au BufNewFile,BufRead *.am call s:Setf('elf')
 endif
 
 if !has_key(s:disabled_packages, 'automake')
-  au BufNewFile,BufRead GNUmakefile.am setf automake
-  au BufNewFile,BufRead [Mm]akefile.am setf automake
+  au BufNewFile,BufRead GNUmakefile.am call s:Setf('automake')
+  au BufNewFile,BufRead [Mm]akefile.am call s:Setf('automake')
 endif
 
 if !has_key(s:disabled_packages, 'asn')
-  au BufNewFile,BufRead *.asn setf asn
-  au BufNewFile,BufRead *.asn1 setf asn
+  au BufNewFile,BufRead *.asn call s:Setf('asn')
+  au BufNewFile,BufRead *.asn1 call s:Setf('asn')
 endif
 
 if !has_key(s:disabled_packages, 'aspvbs')
@@ -577,604 +728,559 @@ if !has_key(s:disabled_packages, 'aspperl')
 endif
 
 if !has_key(s:disabled_packages, 'atlas')
-  au BufNewFile,BufRead *.as setf atlas
-  au BufNewFile,BufRead *.atl setf atlas
+  au BufNewFile,BufRead *.as call s:Setf('atlas')
+  au BufNewFile,BufRead *.atl call s:Setf('atlas')
 endif
 
 if !has_key(s:disabled_packages, 'autoit')
-  au BufNewFile,BufRead *.au3 setf autoit
+  au BufNewFile,BufRead *.au3 call s:Setf('autoit')
 endif
 
 if !has_key(s:disabled_packages, 'ave')
-  au BufNewFile,BufRead *.ave setf ave
+  au BufNewFile,BufRead *.ave call s:Setf('ave')
 endif
 
 if !has_key(s:disabled_packages, 'awk')
-  au BufNewFile,BufRead *.awk setf awk
-  au BufNewFile,BufRead *.gawk setf awk
-endif
-
-if !has_key(s:disabled_packages, 'reason')
-  au BufNewFile,BufRead *.rei setf reason
-  au! BufNewFile,BufRead *.re call polyglot#DetectReFiletype()
-endif
-
-if !has_key(s:disabled_packages, 'c/c++')
-  au BufNewFile,BufRead *.c++ setf cpp
-  au BufNewFile,BufRead *.cc setf cpp
-  au BufNewFile,BufRead *.cp setf cpp
-  au BufNewFile,BufRead *.cpp setf cpp
-  au BufNewFile,BufRead *.cxx setf cpp
-  au BufNewFile,BufRead *.h++ setf cpp
-  au BufNewFile,BufRead *.hh setf cpp
-  au BufNewFile,BufRead *.hpp setf cpp
-  au BufNewFile,BufRead *.hxx setf cpp
-  au BufNewFile,BufRead *.inc setf cpp
-  au BufNewFile,BufRead *.inl setf cpp
-  au BufNewFile,BufRead *.ipp setf cpp
-  au BufNewFile,BufRead *.moc setf cpp
-  au BufNewFile,BufRead *.tcc setf cpp
-  au BufNewFile,BufRead *.tlh setf cpp
-  au BufNewFile,BufRead *.tpp setf cpp
-  au BufNewFile,BufRead *.c setf c
-  au BufNewFile,BufRead *.cats setf c
-  au BufNewFile,BufRead *.idc setf c
-  au BufNewFile,BufRead *.qc setf c
-  au BufNewFile,BufRead *enlightenment/*.cfg setf c
-  au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
+  au BufNewFile,BufRead *.awk call s:Setf('awk')
+  au BufNewFile,BufRead *.gawk call s:Setf('awk')
 endif
 
 if !has_key(s:disabled_packages, 'caddyfile')
-  au BufNewFile,BufRead Caddyfile setf caddyfile
+  au BufNewFile,BufRead Caddyfile call s:Setf('caddyfile')
 endif
 
 if !has_key(s:disabled_packages, 'carp')
-  au BufNewFile,BufRead *.carp setf carp
+  au BufNewFile,BufRead *.carp call s:Setf('carp')
 endif
 
 if !has_key(s:disabled_packages, 'clojure')
-  au BufNewFile,BufRead *.boot setf clojure
-  au BufNewFile,BufRead *.cl2 setf clojure
-  au BufNewFile,BufRead *.clj setf clojure
-  au BufNewFile,BufRead *.cljc setf clojure
-  au BufNewFile,BufRead *.cljs setf clojure
-  au BufNewFile,BufRead *.cljs.hl setf clojure
-  au BufNewFile,BufRead *.cljscm setf clojure
-  au BufNewFile,BufRead *.cljx setf clojure
-  au BufNewFile,BufRead *.edn setf clojure
-  au BufNewFile,BufRead *.hic setf clojure
-  au BufNewFile,BufRead build.boot setf clojure
-  au BufNewFile,BufRead profile.boot setf clojure
-  au BufNewFile,BufRead riemann.config setf clojure
+  au BufNewFile,BufRead *.boot call s:Setf('clojure')
+  au BufNewFile,BufRead *.cl2 call s:Setf('clojure')
+  au BufNewFile,BufRead *.clj call s:Setf('clojure')
+  au BufNewFile,BufRead *.cljc call s:Setf('clojure')
+  au BufNewFile,BufRead *.cljs call s:Setf('clojure')
+  au BufNewFile,BufRead *.cljs.hl call s:Setf('clojure')
+  au BufNewFile,BufRead *.cljscm call s:Setf('clojure')
+  au BufNewFile,BufRead *.cljx call s:Setf('clojure')
+  au BufNewFile,BufRead *.edn call s:Setf('clojure')
+  au BufNewFile,BufRead *.hic call s:Setf('clojure')
+  au BufNewFile,BufRead build.boot call s:Setf('clojure')
+  au BufNewFile,BufRead profile.boot call s:Setf('clojure')
+  au BufNewFile,BufRead riemann.config call s:Setf('clojure')
 endif
 
 if !has_key(s:disabled_packages, 'cmake')
-  au BufNewFile,BufRead *.cmake setf cmake
-  au BufNewFile,BufRead *.cmake.in setf cmake
-  au BufNewFile,BufRead CMakeLists.txt setf cmake
+  au BufNewFile,BufRead *.cmake call s:Setf('cmake')
+  au BufNewFile,BufRead *.cmake.in call s:Setf('cmake')
+  au BufNewFile,BufRead CMakeLists.txt call s:Setf('cmake')
 endif
 
 if !has_key(s:disabled_packages, 'coffee-script')
-  au BufNewFile,BufRead *._coffee setf coffee
-  au BufNewFile,BufRead *.cake setf coffee
-  au BufNewFile,BufRead *.cjsx setf coffee
-  au BufNewFile,BufRead *.coffee setf coffee
-  au BufNewFile,BufRead *.coffeekup setf coffee
-  au BufNewFile,BufRead *.iced setf coffee
-  au BufNewFile,BufRead Cakefile setf coffee
-  au BufNewFile,BufRead *.coffee.md setf litcoffee
-  au BufNewFile,BufRead *.litcoffee setf litcoffee
+  au BufNewFile,BufRead *._coffee call s:Setf('coffee')
+  au BufNewFile,BufRead *.cake call s:Setf('coffee')
+  au BufNewFile,BufRead *.cjsx call s:Setf('coffee')
+  au BufNewFile,BufRead *.coffee call s:Setf('coffee')
+  au BufNewFile,BufRead *.coffeekup call s:Setf('coffee')
+  au BufNewFile,BufRead *.iced call s:Setf('coffee')
+  au BufNewFile,BufRead Cakefile call s:Setf('coffee')
+  au BufNewFile,BufRead *.coffee.md call s:Setf('litcoffee')
+  au BufNewFile,BufRead *.litcoffee call s:Setf('litcoffee')
 endif
 
 if !has_key(s:disabled_packages, 'cryptol')
-  au BufNewFile,BufRead *.cry setf cryptol
-  au BufNewFile,BufRead *.cyl setf cryptol
-  au BufNewFile,BufRead *.lcry setf cryptol
-  au BufNewFile,BufRead *.lcyl setf cryptol
+  au BufNewFile,BufRead *.cry call s:Setf('cryptol')
+  au BufNewFile,BufRead *.cyl call s:Setf('cryptol')
+  au BufNewFile,BufRead *.lcry call s:Setf('cryptol')
+  au BufNewFile,BufRead *.lcyl call s:Setf('cryptol')
 endif
 
 if !has_key(s:disabled_packages, 'crystal')
-  au BufNewFile,BufRead *.cr setf crystal
-  au BufNewFile,BufRead Projectfile setf crystal
-  au BufNewFile,BufRead *.ecr setf ecrystal
+  au BufNewFile,BufRead *.cr call s:Setf('crystal')
+  au BufNewFile,BufRead Projectfile call s:Setf('crystal')
+  au BufNewFile,BufRead *.ecr call s:Setf('ecrystal')
 endif
 
 if !has_key(s:disabled_packages, 'csv')
-  au BufNewFile,BufRead *.csv setf csv
-  au BufNewFile,BufRead *.tab setf csv
-  au BufNewFile,BufRead *.tsv setf csv
+  au BufNewFile,BufRead *.csv call s:Setf('csv')
+  au BufNewFile,BufRead *.tab call s:Setf('csv')
+  au BufNewFile,BufRead *.tsv call s:Setf('csv')
 endif
 
 if !has_key(s:disabled_packages, 'cucumber')
-  au BufNewFile,BufRead *.feature setf cucumber
-  au BufNewFile,BufRead *.story setf cucumber
+  au BufNewFile,BufRead *.feature call s:Setf('cucumber')
+  au BufNewFile,BufRead *.story call s:Setf('cucumber')
 endif
 
 if !has_key(s:disabled_packages, 'cue')
-  au BufNewFile,BufRead *.cue setf cuesheet
+  au BufNewFile,BufRead *.cue call s:Setf('cuesheet')
 endif
 
 if !has_key(s:disabled_packages, 'dart')
-  au BufNewFile,BufRead *.dart setf dart
-  au BufNewFile,BufRead *.drt setf dart
+  au BufNewFile,BufRead *.dart call s:Setf('dart')
+  au BufNewFile,BufRead *.drt call s:Setf('dart')
 endif
 
 if !has_key(s:disabled_packages, 'dhall')
-  au BufNewFile,BufRead *.dhall setf dhall
-endif
-
-if !has_key(s:disabled_packages, 'grub')
-  au BufNewFile,BufRead */boot/grub/grub.conf setf grub
-  au BufNewFile,BufRead */boot/grub/menu.lst setf grub
-  au BufNewFile,BufRead */etc/grub.conf setf grub
+  au BufNewFile,BufRead *.dhall call s:Setf('dhall')
 endif
 
 if !has_key(s:disabled_packages, 'dlang')
-  au BufNewFile,BufRead *.d setf d
-  au BufNewFile,BufRead *.di setf d
-  au BufNewFile,BufRead *.lst setf dcov
-  au BufNewFile,BufRead *.dd setf dd
-  au BufNewFile,BufRead *.ddoc setf ddoc
-  au BufNewFile,BufRead *.sdl setf dsdl
+  au BufNewFile,BufRead *.d call s:Setf('d')
+  au BufNewFile,BufRead *.di call s:Setf('d')
+  au BufNewFile,BufRead *.lst call s:Setf('dcov')
+  au BufNewFile,BufRead *.dd call s:Setf('dd')
+  au BufNewFile,BufRead *.ddoc call s:Setf('ddoc')
+  au BufNewFile,BufRead *.sdl call s:Setf('dsdl')
 endif
 
 if !has_key(s:disabled_packages, 'dockerfile')
-  au BufNewFile,BufRead *.Dockerfile setf Dockerfile
-  au BufNewFile,BufRead *.dock setf Dockerfile
-  au BufNewFile,BufRead *.dockerfile setf Dockerfile
-  au BufNewFile,BufRead Dockerfile setf Dockerfile
+  au BufNewFile,BufRead *.Dockerfile call s:Setf('Dockerfile')
+  au BufNewFile,BufRead *.dock call s:Setf('Dockerfile')
+  au BufNewFile,BufRead *.dockerfile call s:Setf('Dockerfile')
+  au BufNewFile,BufRead Dockerfile call s:Setf('Dockerfile')
   au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
-  au BufNewFile,BufRead dockerfile setf Dockerfile
-  au BufNewFile,BufRead docker-compose*.yaml setf yaml.docker-compose
-  au BufNewFile,BufRead docker-compose*.yml setf yaml.docker-compose
-endif
-
-if !has_key(s:disabled_packages, 'elf')
-  au BufNewFile,BufRead *.am setf elf
+  au BufNewFile,BufRead dockerfile call s:Setf('Dockerfile')
+  au BufNewFile,BufRead docker-compose*.yaml call s:Setf('yaml.docker-compose')
+  au BufNewFile,BufRead docker-compose*.yml call s:Setf('yaml.docker-compose')
 endif
 
 if !has_key(s:disabled_packages, 'elixir')
-  au BufNewFile,BufRead *.ex setf elixir
-  au BufNewFile,BufRead *.exs setf elixir
-  au BufNewFile,BufRead mix.lock setf elixir
-  au BufNewFile,BufRead *.eex setf eelixir
-  au BufNewFile,BufRead *.leex setf eelixir
+  au BufNewFile,BufRead *.ex call s:Setf('elixir')
+  au BufNewFile,BufRead *.exs call s:Setf('elixir')
+  au BufNewFile,BufRead mix.lock call s:Setf('elixir')
+  au BufNewFile,BufRead *.eex call s:Setf('eelixir')
+  au BufNewFile,BufRead *.leex call s:Setf('eelixir')
 endif
 
 if !has_key(s:disabled_packages, 'elm')
-  au BufNewFile,BufRead *.elm setf elm
+  au BufNewFile,BufRead *.elm call s:Setf('elm')
 endif
 
 if !has_key(s:disabled_packages, 'emberscript')
-  au BufNewFile,BufRead *.em setf ember-script
-  au BufNewFile,BufRead *.emberscript setf ember-script
+  au BufNewFile,BufRead *.em call s:Setf('ember-script')
+  au BufNewFile,BufRead *.emberscript call s:Setf('ember-script')
 endif
 
 if !has_key(s:disabled_packages, 'emblem')
-  au BufNewFile,BufRead *.em setf emblem
-  au BufNewFile,BufRead *.emblem setf emblem
+  au BufNewFile,BufRead *.em call s:Setf('emblem')
+  au BufNewFile,BufRead *.emblem call s:Setf('emblem')
 endif
 
 if !has_key(s:disabled_packages, 'erlang')
-  au BufNewFile,BufRead *.app setf erlang
-  au BufNewFile,BufRead *.app.src setf erlang
-  au BufNewFile,BufRead *.erl setf erlang
-  au BufNewFile,BufRead *.es setf erlang
-  au BufNewFile,BufRead *.escript setf erlang
-  au BufNewFile,BufRead *.hrl setf erlang
-  au BufNewFile,BufRead *.xrl setf erlang
-  au BufNewFile,BufRead *.yaws setf erlang
-  au BufNewFile,BufRead *.yrl setf erlang
-  au BufNewFile,BufRead Emakefile setf erlang
-  au BufNewFile,BufRead rebar.config setf erlang
-  au BufNewFile,BufRead rebar.config.lock setf erlang
-  au BufNewFile,BufRead rebar.lock setf erlang
+  au BufNewFile,BufRead *.app call s:Setf('erlang')
+  au BufNewFile,BufRead *.app.src call s:Setf('erlang')
+  au BufNewFile,BufRead *.erl call s:Setf('erlang')
+  au BufNewFile,BufRead *.es call s:Setf('erlang')
+  au BufNewFile,BufRead *.escript call s:Setf('erlang')
+  au BufNewFile,BufRead *.hrl call s:Setf('erlang')
+  au BufNewFile,BufRead *.xrl call s:Setf('erlang')
+  au BufNewFile,BufRead *.yaws call s:Setf('erlang')
+  au BufNewFile,BufRead *.yrl call s:Setf('erlang')
+  au BufNewFile,BufRead Emakefile call s:Setf('erlang')
+  au BufNewFile,BufRead rebar.config call s:Setf('erlang')
+  au BufNewFile,BufRead rebar.config.lock call s:Setf('erlang')
+  au BufNewFile,BufRead rebar.lock call s:Setf('erlang')
 endif
 
 if !has_key(s:disabled_packages, 'fennel')
-  au BufNewFile,BufRead *.fnl setf fennel
+  au BufNewFile,BufRead *.fnl call s:Setf('fennel')
 endif
 
 if !has_key(s:disabled_packages, 'ferm')
-  au BufNewFile,BufRead *.ferm setf ferm
-  au BufNewFile,BufRead ferm.conf setf ferm
+  au BufNewFile,BufRead *.ferm call s:Setf('ferm')
+  au BufNewFile,BufRead ferm.conf call s:Setf('ferm')
 endif
 
 if !has_key(s:disabled_packages, 'fish')
-  au BufNewFile,BufRead *.fish setf fish
+  au BufNewFile,BufRead *.fish call s:Setf('fish')
 endif
 
 if !has_key(s:disabled_packages, 'flatbuffers')
-  au BufNewFile,BufRead *.fbs setf fbs
+  au BufNewFile,BufRead *.fbs call s:Setf('fbs')
 endif
 
 if !has_key(s:disabled_packages, 'forth')
-  au BufNewFile,BufRead *.ft setf forth
-  au BufNewFile,BufRead *.fth setf forth
+  au BufNewFile,BufRead *.ft call s:Setf('forth')
+  au BufNewFile,BufRead *.fth call s:Setf('forth')
+  au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
+endif
+
+if !has_key(s:disabled_packages, 'glsl')
+  au BufNewFile,BufRead *.comp call s:Setf('glsl')
+  au BufNewFile,BufRead *.fp call s:Setf('glsl')
+  au BufNewFile,BufRead *.frag call s:Setf('glsl')
+  au BufNewFile,BufRead *.frg call s:Setf('glsl')
+  au BufNewFile,BufRead *.fsh call s:Setf('glsl')
+  au BufNewFile,BufRead *.fshader call s:Setf('glsl')
+  au BufNewFile,BufRead *.geo call s:Setf('glsl')
+  au BufNewFile,BufRead *.geom call s:Setf('glsl')
+  au BufNewFile,BufRead *.glsl call s:Setf('glsl')
+  au BufNewFile,BufRead *.glslf call s:Setf('glsl')
+  au BufNewFile,BufRead *.glslv call s:Setf('glsl')
+  au BufNewFile,BufRead *.gs call s:Setf('glsl')
+  au BufNewFile,BufRead *.gshader call s:Setf('glsl')
+  au BufNewFile,BufRead *.shader call s:Setf('glsl')
+  au BufNewFile,BufRead *.tesc call s:Setf('glsl')
+  au BufNewFile,BufRead *.tese call s:Setf('glsl')
+  au BufNewFile,BufRead *.vert call s:Setf('glsl')
+  au BufNewFile,BufRead *.vrx call s:Setf('glsl')
+  au BufNewFile,BufRead *.vsh call s:Setf('glsl')
+  au BufNewFile,BufRead *.vshader call s:Setf('glsl')
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'fsharp')
-  au BufNewFile,BufRead *.fsi setf fsharp
-  au BufNewFile,BufRead *.fsx setf fsharp
+  au BufNewFile,BufRead *.fsi call s:Setf('fsharp')
+  au BufNewFile,BufRead *.fsx call s:Setf('fsharp')
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'gdscript')
-  au BufNewFile,BufRead *.gd setf gdscript3
+  au BufNewFile,BufRead *.gd call s:Setf('gdscript3')
 endif
 
 if !has_key(s:disabled_packages, 'git')
-  au BufNewFile,BufRead *.gitconfig setf gitconfig
-  au BufNewFile,BufRead *.git/config setf gitconfig
-  au BufNewFile,BufRead *.git/modules/*/config setf gitconfig
-  au BufNewFile,BufRead */.config/git/config setf gitconfig
-  au BufNewFile,BufRead */git/config setf gitconfig
+  au BufNewFile,BufRead *.gitconfig call s:Setf('gitconfig')
+  au BufNewFile,BufRead *.git/config call s:Setf('gitconfig')
+  au BufNewFile,BufRead *.git/modules/*/config call s:Setf('gitconfig')
+  au BufNewFile,BufRead */.config/git/config call s:Setf('gitconfig')
+  au BufNewFile,BufRead */git/config call s:Setf('gitconfig')
   au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
-  au BufNewFile,BufRead {.,}gitconfig setf gitconfig
-  au BufNewFile,BufRead {.,}gitmodules setf gitconfig
-  au BufNewFile,BufRead git-rebase-todo setf gitrebase
+  au BufNewFile,BufRead {.,}gitconfig call s:Setf('gitconfig')
+  au BufNewFile,BufRead {.,}gitmodules call s:Setf('gitconfig')
+  au BufNewFile,BufRead git-rebase-todo call s:Setf('gitrebase')
   au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
-  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
-endif
-
-if !has_key(s:disabled_packages, 'glsl')
-  au BufNewFile,BufRead *.comp setf glsl
-  au BufNewFile,BufRead *.fp setf glsl
-  au BufNewFile,BufRead *.frag setf glsl
-  au BufNewFile,BufRead *.frg setf glsl
-  au BufNewFile,BufRead *.fsh setf glsl
-  au BufNewFile,BufRead *.fshader setf glsl
-  au BufNewFile,BufRead *.geo setf glsl
-  au BufNewFile,BufRead *.geom setf glsl
-  au BufNewFile,BufRead *.glsl setf glsl
-  au BufNewFile,BufRead *.glslf setf glsl
-  au BufNewFile,BufRead *.glslv setf glsl
-  au BufNewFile,BufRead *.gs setf glsl
-  au BufNewFile,BufRead *.gshader setf glsl
-  au BufNewFile,BufRead *.shader setf glsl
-  au BufNewFile,BufRead *.tesc setf glsl
-  au BufNewFile,BufRead *.tese setf glsl
-  au BufNewFile,BufRead *.vert setf glsl
-  au BufNewFile,BufRead *.vrx setf glsl
-  au BufNewFile,BufRead *.vsh setf glsl
-  au BufNewFile,BufRead *.vshader setf glsl
-  au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
+  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG call s:Setf('gitcommit')
 endif
 
 if !has_key(s:disabled_packages, 'gmpl')
-  au BufNewFile,BufRead *.mod setf gmpl
+  au BufNewFile,BufRead *.mod call s:Setf('gmpl')
 endif
 
 if !has_key(s:disabled_packages, 'gnuplot')
-  au BufNewFile,BufRead *.gnu setf gnuplot
-  au BufNewFile,BufRead *.gnuplot setf gnuplot
-  au BufNewFile,BufRead *.gp setf gnuplot
-  au BufNewFile,BufRead *.gpi setf gnuplot
-  au BufNewFile,BufRead *.p setf gnuplot
-  au BufNewFile,BufRead *.plot setf gnuplot
-  au BufNewFile,BufRead *.plt setf gnuplot
+  au BufNewFile,BufRead *.gnu call s:Setf('gnuplot')
+  au BufNewFile,BufRead *.gnuplot call s:Setf('gnuplot')
+  au BufNewFile,BufRead *.gp call s:Setf('gnuplot')
+  au BufNewFile,BufRead *.gpi call s:Setf('gnuplot')
+  au BufNewFile,BufRead *.p call s:Setf('gnuplot')
+  au BufNewFile,BufRead *.plot call s:Setf('gnuplot')
+  au BufNewFile,BufRead *.plt call s:Setf('gnuplot')
 endif
 
 if !has_key(s:disabled_packages, 'go')
-  au BufNewFile,BufRead *.go setf go
-  au BufNewFile,BufRead go.mod setf gomod
-  au BufNewFile,BufRead *.tmpl setf gohtmltmpl
+  au BufNewFile,BufRead *.go call s:Setf('go')
+  au BufNewFile,BufRead go.mod call s:Setf('gomod')
+  au BufNewFile,BufRead *.tmpl call s:Setf('gohtmltmpl')
+endif
+
+if !has_key(s:disabled_packages, 'javascript')
+  au BufNewFile,BufRead *._js call s:Setf('javascript')
+  au BufNewFile,BufRead *.bones call s:Setf('javascript')
+  au BufNewFile,BufRead *.cjs call s:Setf('javascript')
+  au BufNewFile,BufRead *.es call s:Setf('javascript')
+  au BufNewFile,BufRead *.es6 call s:Setf('javascript')
+  au BufNewFile,BufRead *.frag call s:Setf('javascript')
+  au BufNewFile,BufRead *.gs call s:Setf('javascript')
+  au BufNewFile,BufRead *.jake call s:Setf('javascript')
+  au BufNewFile,BufRead *.js call s:Setf('javascript')
+  au BufNewFile,BufRead *.jsb call s:Setf('javascript')
+  au BufNewFile,BufRead *.jscad call s:Setf('javascript')
+  au BufNewFile,BufRead *.jsfl call s:Setf('javascript')
+  au BufNewFile,BufRead *.jsm call s:Setf('javascript')
+  au BufNewFile,BufRead *.jss call s:Setf('javascript')
+  au BufNewFile,BufRead *.mjs call s:Setf('javascript')
+  au BufNewFile,BufRead *.njs call s:Setf('javascript')
+  au BufNewFile,BufRead *.pac call s:Setf('javascript')
+  au BufNewFile,BufRead *.sjs call s:Setf('javascript')
+  au BufNewFile,BufRead *.ssjs call s:Setf('javascript')
+  au BufNewFile,BufRead *.xsjs call s:Setf('javascript')
+  au BufNewFile,BufRead *.xsjslib call s:Setf('javascript')
+  au BufNewFile,BufRead Jakefile call s:Setf('javascript')
+  au BufNewFile,BufRead *.flow call s:Setf('flow')
+endif
+
+if !has_key(s:disabled_packages, 'jsx')
+  au BufNewFile,BufRead *.jsx call s:Setf('javascriptreact')
 endif
 
 if !has_key(s:disabled_packages, 'graphql')
-  au BufNewFile,BufRead *.gql setf graphql
-  au BufNewFile,BufRead *.graphql setf graphql
-  au BufNewFile,BufRead *.graphqls setf graphql
+  au BufNewFile,BufRead *.gql call s:Setf('graphql')
+  au BufNewFile,BufRead *.graphql call s:Setf('graphql')
+  au BufNewFile,BufRead *.graphqls call s:Setf('graphql')
 endif
 
 if !has_key(s:disabled_packages, 'groovy')
-  au BufNewFile,BufRead *.gradle setf groovy
-  au BufNewFile,BufRead *.groovy setf groovy
-  au BufNewFile,BufRead *.grt setf groovy
-  au BufNewFile,BufRead *.gtpl setf groovy
-  au BufNewFile,BufRead *.gvy setf groovy
-  au BufNewFile,BufRead Jenkinsfile setf groovy
+  au BufNewFile,BufRead *.gradle call s:Setf('groovy')
+  au BufNewFile,BufRead *.groovy call s:Setf('groovy')
+  au BufNewFile,BufRead *.grt call s:Setf('groovy')
+  au BufNewFile,BufRead *.gtpl call s:Setf('groovy')
+  au BufNewFile,BufRead *.gvy call s:Setf('groovy')
+  au BufNewFile,BufRead Jenkinsfile call s:Setf('groovy')
 endif
 
-if !has_key(s:disabled_packages, 'haml')
-  au BufNewFile,BufRead *.haml setf haml
-  au BufNewFile,BufRead *.haml.deface setf haml
-  au BufNewFile,BufRead *.hamlbars setf haml
-  au BufNewFile,BufRead *.hamlc setf haml
+if !has_key(s:disabled_packages, 'grub')
+  au BufNewFile,BufRead */boot/grub/grub.conf call s:Setf('grub')
+  au BufNewFile,BufRead */boot/grub/menu.lst call s:Setf('grub')
+  au BufNewFile,BufRead */etc/grub.conf call s:Setf('grub')
 endif
 
-if !has_key(s:disabled_packages, 'handlebars')
-  au BufNewFile,BufRead *.handlebars setf mustache
-  au BufNewFile,BufRead *.hb setf mustache
-  au BufNewFile,BufRead *.hbs setf mustache
-  au BufNewFile,BufRead *.hdbs setf mustache
-  au BufNewFile,BufRead *.hjs setf mustache
-  au BufNewFile,BufRead *.hogan setf mustache
-  au BufNewFile,BufRead *.hulk setf mustache
-  au BufNewFile,BufRead *.mustache setf mustache
-  au BufNewFile,BufRead *.njk setf mustache
+if !has_key(s:disabled_packages, 'haml')
+  au BufNewFile,BufRead *.haml call s:Setf('haml')
+  au BufNewFile,BufRead *.haml.deface call s:Setf('haml')
+  au BufNewFile,BufRead *.hamlbars call s:Setf('haml')
+  au BufNewFile,BufRead *.hamlc call s:Setf('haml')
 endif
 
-if !has_key(s:disabled_packages, 'haproxy')
-  au BufNewFile,BufRead *.cfg setf haproxy
-  au BufNewFile,BufRead haproxy*.c* call s:StarSetf('haproxy')
-  au BufNewFile,BufRead haproxy.cfg setf haproxy
+if !has_key(s:disabled_packages, 'handlebars')
+  au BufNewFile,BufRead *.handlebars call s:Setf('mustache')
+  au BufNewFile,BufRead *.hb call s:Setf('mustache')
+  au BufNewFile,BufRead *.hbs call s:Setf('mustache')
+  au BufNewFile,BufRead *.hdbs call s:Setf('mustache')
+  au BufNewFile,BufRead *.hjs call s:Setf('mustache')
+  au BufNewFile,BufRead *.hogan call s:Setf('mustache')
+  au BufNewFile,BufRead *.hulk call s:Setf('mustache')
+  au BufNewFile,BufRead *.mustache call s:Setf('mustache')
+  au BufNewFile,BufRead *.njk call s:Setf('mustache')
 endif
 
 if !has_key(s:disabled_packages, 'haskell')
-  au BufNewFile,BufRead *.bpk setf haskell
-  au BufNewFile,BufRead *.hs setf haskell
-  au BufNewFile,BufRead *.hs-boot setf haskell
-  au BufNewFile,BufRead *.hsc setf haskell
-  au BufNewFile,BufRead *.hsig setf haskell
+  au BufNewFile,BufRead *.bpk call s:Setf('haskell')
+  au BufNewFile,BufRead *.hs call s:Setf('haskell')
+  au BufNewFile,BufRead *.hs-boot call s:Setf('haskell')
+  au BufNewFile,BufRead *.hsc call s:Setf('haskell')
+  au BufNewFile,BufRead *.hsig call s:Setf('haskell')
 endif
 
 if !has_key(s:disabled_packages, 'haxe')
-  au BufNewFile,BufRead *.hx setf haxe
-  au BufNewFile,BufRead *.hxsl setf haxe
+  au BufNewFile,BufRead *.hx call s:Setf('haxe')
+  au BufNewFile,BufRead *.hxsl call s:Setf('haxe')
 endif
 
 if !has_key(s:disabled_packages, 'hcl')
-  au BufNewFile,BufRead *.hcl setf hcl
-  au BufNewFile,BufRead *.nomad setf hcl
-  au BufNewFile,BufRead *.workflow setf hcl
-  au BufNewFile,BufRead Appfile setf hcl
+  au BufNewFile,BufRead *.hcl call s:Setf('hcl')
+  au BufNewFile,BufRead *.nomad call s:Setf('hcl')
+  au BufNewFile,BufRead *.workflow call s:Setf('hcl')
+  au BufNewFile,BufRead Appfile call s:Setf('hcl')
 endif
 
 if !has_key(s:disabled_packages, 'hive')
-  au BufNewFile,BufRead *.hql setf hive
-  au BufNewFile,BufRead *.q setf hive
-  au BufNewFile,BufRead *.ql setf hive
+  au BufNewFile,BufRead *.hql call s:Setf('hive')
+  au BufNewFile,BufRead *.q call s:Setf('hive')
+  au BufNewFile,BufRead *.ql call s:Setf('hive')
 endif
 
 if !has_key(s:disabled_packages, 'html5')
-  au BufNewFile,BufRead *.htm setf html
-  au BufNewFile,BufRead *.html setf html
-  au BufNewFile,BufRead *.html.hl setf html
-  au BufNewFile,BufRead *.inc setf html
-  au BufNewFile,BufRead *.st setf html
-  au BufNewFile,BufRead *.xht setf html
-  au BufNewFile,BufRead *.xhtml setf html
+  au BufNewFile,BufRead *.htm call s:Setf('html')
+  au BufNewFile,BufRead *.html call s:Setf('html')
+  au BufNewFile,BufRead *.html.hl call s:Setf('html')
+  au BufNewFile,BufRead *.inc call s:Setf('html')
+  au BufNewFile,BufRead *.st call s:Setf('html')
+  au BufNewFile,BufRead *.xht call s:Setf('html')
+  au BufNewFile,BufRead *.xhtml call s:Setf('html')
 endif
 
 if !has_key(s:disabled_packages, 'i3')
-  au BufNewFile,BufRead *.i3.config setf i3config
-  au BufNewFile,BufRead *.i3config setf i3config
-  au BufNewFile,BufRead {.,}i3.config setf i3config
-  au BufNewFile,BufRead {.,}i3config setf i3config
-  au BufNewFile,BufRead i3.config setf i3config
-  au BufNewFile,BufRead i3config setf i3config
+  au BufNewFile,BufRead *.i3.config call s:Setf('i3config')
+  au BufNewFile,BufRead *.i3config call s:Setf('i3config')
+  au BufNewFile,BufRead {.,}i3.config call s:Setf('i3config')
+  au BufNewFile,BufRead {.,}i3config call s:Setf('i3config')
+  au BufNewFile,BufRead i3.config call s:Setf('i3config')
+  au BufNewFile,BufRead i3config call s:Setf('i3config')
 endif
 
 if !has_key(s:disabled_packages, 'icalendar')
-  au BufNewFile,BufRead *.ics setf icalendar
+  au BufNewFile,BufRead *.ics call s:Setf('icalendar')
 endif
 
 if !has_key(s:disabled_packages, 'idris')
-  au BufNewFile,BufRead idris-response setf idris
+  au BufNewFile,BufRead idris-response call s:Setf('idris')
   au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
   au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'idris2')
-  au BufNewFile,BufRead *.ipkg setf idris2
-  au BufNewFile,BufRead idris-response setf idris2
+  au BufNewFile,BufRead *.ipkg call s:Setf('idris2')
+  au BufNewFile,BufRead idris-response call s:Setf('idris2')
   au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
   au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'ion')
-  au BufNewFile,BufRead *.ion setf ion
-  au BufNewFile,BufRead ~/.config/ion/initrc setf ion
-endif
-
-if !has_key(s:disabled_packages, 'jsx')
-  au BufNewFile,BufRead *.jsx setf javascriptreact
-endif
-
-if !has_key(s:disabled_packages, 'javascript')
-  au BufNewFile,BufRead *._js setf javascript
-  au BufNewFile,BufRead *.bones setf javascript
-  au BufNewFile,BufRead *.cjs setf javascript
-  au BufNewFile,BufRead *.es setf javascript
-  au BufNewFile,BufRead *.es6 setf javascript
-  au BufNewFile,BufRead *.frag setf javascript
-  au BufNewFile,BufRead *.gs setf javascript
-  au BufNewFile,BufRead *.jake setf javascript
-  au BufNewFile,BufRead *.js setf javascript
-  au BufNewFile,BufRead *.jsb setf javascript
-  au BufNewFile,BufRead *.jscad setf javascript
-  au BufNewFile,BufRead *.jsfl setf javascript
-  au BufNewFile,BufRead *.jsm setf javascript
-  au BufNewFile,BufRead *.jss setf javascript
-  au BufNewFile,BufRead *.mjs setf javascript
-  au BufNewFile,BufRead *.njs setf javascript
-  au BufNewFile,BufRead *.pac setf javascript
-  au BufNewFile,BufRead *.sjs setf javascript
-  au BufNewFile,BufRead *.ssjs setf javascript
-  au BufNewFile,BufRead *.xsjs setf javascript
-  au BufNewFile,BufRead *.xsjslib setf javascript
-  au BufNewFile,BufRead Jakefile setf javascript
-  au BufNewFile,BufRead *.flow setf flow
+  au BufNewFile,BufRead *.ion call s:Setf('ion')
+  au BufNewFile,BufRead ~/.config/ion/initrc call s:Setf('ion')
 endif
 
 if !has_key(s:disabled_packages, 'jenkins')
-  au BufNewFile,BufRead *.Jenkinsfile setf Jenkinsfile
-  au BufNewFile,BufRead *.jenkinsfile setf Jenkinsfile
-  au BufNewFile,BufRead Jenkinsfile setf Jenkinsfile
+  au BufNewFile,BufRead *.Jenkinsfile call s:Setf('Jenkinsfile')
+  au BufNewFile,BufRead *.jenkinsfile call s:Setf('Jenkinsfile')
+  au BufNewFile,BufRead Jenkinsfile call s:Setf('Jenkinsfile')
   au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
 if !has_key(s:disabled_packages, 'jinja')
-  au BufNewFile,BufRead *.j2 setf jinja.html
-  au BufNewFile,BufRead *.jinja setf jinja.html
-  au BufNewFile,BufRead *.jinja2 setf jinja.html
+  au BufNewFile,BufRead *.j2 call s:Setf('jinja.html')
+  au BufNewFile,BufRead *.jinja call s:Setf('jinja.html')
+  au BufNewFile,BufRead *.jinja2 call s:Setf('jinja.html')
 endif
 
 if !has_key(s:disabled_packages, 'jq')
-  au BufNewFile,BufRead *.jq setf jq
-  au BufNewFile,BufRead {.,}jqrc setf jq
+  au BufNewFile,BufRead *.jq call s:Setf('jq')
+  au BufNewFile,BufRead {.,}jqrc call s:Setf('jq')
   au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq')
 endif
 
 if !has_key(s:disabled_packages, 'json5')
-  au BufNewFile,BufRead *.json5 setf json5
+  au BufNewFile,BufRead *.json5 call s:Setf('json5')
 endif
 
 if !has_key(s:disabled_packages, 'json')
-  au BufNewFile,BufRead *.JSON-tmLanguage setf json
-  au BufNewFile,BufRead *.avsc setf json
-  au BufNewFile,BufRead *.geojson setf json
-  au BufNewFile,BufRead *.gltf setf json
-  au BufNewFile,BufRead *.har setf json
-  au BufNewFile,BufRead *.ice setf json
-  au BufNewFile,BufRead *.json setf json
-  au BufNewFile,BufRead *.jsonl setf json
-  au BufNewFile,BufRead *.jsonp setf json
-  au BufNewFile,BufRead *.mcmeta setf json
-  au BufNewFile,BufRead *.template setf json
-  au BufNewFile,BufRead *.tfstate setf json
-  au BufNewFile,BufRead *.tfstate.backup setf json
-  au BufNewFile,BufRead *.topojson setf json
-  au BufNewFile,BufRead *.webapp setf json
-  au BufNewFile,BufRead *.webmanifest setf json
-  au BufNewFile,BufRead *.yy setf json
-  au BufNewFile,BufRead *.yyp setf json
-  au BufNewFile,BufRead {.,}arcconfig setf json
-  au BufNewFile,BufRead {.,}htmlhintrc setf json
-  au BufNewFile,BufRead {.,}tern-config setf json
-  au BufNewFile,BufRead {.,}tern-project setf json
-  au BufNewFile,BufRead {.,}watchmanconfig setf json
-  au BufNewFile,BufRead Pipfile.lock setf json
-  au BufNewFile,BufRead composer.lock setf json
-  au BufNewFile,BufRead mcmod.info setf json
+  au BufNewFile,BufRead *.JSON-tmLanguage call s:Setf('json')
+  au BufNewFile,BufRead *.avsc call s:Setf('json')
+  au BufNewFile,BufRead *.geojson call s:Setf('json')
+  au BufNewFile,BufRead *.gltf call s:Setf('json')
+  au BufNewFile,BufRead *.har call s:Setf('json')
+  au BufNewFile,BufRead *.ice call s:Setf('json')
+  au BufNewFile,BufRead *.json call s:Setf('json')
+  au BufNewFile,BufRead *.jsonl call s:Setf('json')
+  au BufNewFile,BufRead *.jsonp call s:Setf('json')
+  au BufNewFile,BufRead *.mcmeta call s:Setf('json')
+  au BufNewFile,BufRead *.template call s:Setf('json')
+  au BufNewFile,BufRead *.tfstate call s:Setf('json')
+  au BufNewFile,BufRead *.tfstate.backup call s:Setf('json')
+  au BufNewFile,BufRead *.topojson call s:Setf('json')
+  au BufNewFile,BufRead *.webapp call s:Setf('json')
+  au BufNewFile,BufRead *.webmanifest call s:Setf('json')
+  au BufNewFile,BufRead *.yy call s:Setf('json')
+  au BufNewFile,BufRead *.yyp call s:Setf('json')
+  au BufNewFile,BufRead {.,}arcconfig call s:Setf('json')
+  au BufNewFile,BufRead {.,}htmlhintrc call s:Setf('json')
+  au BufNewFile,BufRead {.,}tern-config call s:Setf('json')
+  au BufNewFile,BufRead {.,}tern-project call s:Setf('json')
+  au BufNewFile,BufRead {.,}watchmanconfig call s:Setf('json')
+  au BufNewFile,BufRead Pipfile.lock call s:Setf('json')
+  au BufNewFile,BufRead composer.lock call s:Setf('json')
+  au BufNewFile,BufRead mcmod.info call s:Setf('json')
 endif
 
 if !has_key(s:disabled_packages, 'jsonnet')
-  au BufNewFile,BufRead *.jsonnet setf jsonnet
-  au BufNewFile,BufRead *.libsonnet setf jsonnet
+  au BufNewFile,BufRead *.jsonnet call s:Setf('jsonnet')
+  au BufNewFile,BufRead *.libsonnet call s:Setf('jsonnet')
 endif
 
 if !has_key(s:disabled_packages, 'jst')
-  au BufNewFile,BufRead *.ect setf jst
-  au BufNewFile,BufRead *.ejs setf jst
-  au BufNewFile,BufRead *.jst setf jst
+  au BufNewFile,BufRead *.ect call s:Setf('jst')
+  au BufNewFile,BufRead *.ejs call s:Setf('jst')
+  au BufNewFile,BufRead *.jst call s:Setf('jst')
 endif
 
 if !has_key(s:disabled_packages, 'julia')
-  au BufNewFile,BufRead *.jl setf julia
+  au BufNewFile,BufRead *.jl call s:Setf('julia')
 endif
 
 if !has_key(s:disabled_packages, 'kotlin')
-  au BufNewFile,BufRead *.kt setf kotlin
-  au BufNewFile,BufRead *.ktm setf kotlin
-  au BufNewFile,BufRead *.kts setf kotlin
+  au BufNewFile,BufRead *.kt call s:Setf('kotlin')
+  au BufNewFile,BufRead *.ktm call s:Setf('kotlin')
+  au BufNewFile,BufRead *.kts call s:Setf('kotlin')
 endif
 
 if !has_key(s:disabled_packages, 'ledger')
-  au BufNewFile,BufRead *.journal setf ledger
-  au BufNewFile,BufRead *.ldg setf ledger
-  au BufNewFile,BufRead *.ledger setf ledger
+  au BufNewFile,BufRead *.journal call s:Setf('ledger')
+  au BufNewFile,BufRead *.ldg call s:Setf('ledger')
+  au BufNewFile,BufRead *.ledger call s:Setf('ledger')
 endif
 
 if !has_key(s:disabled_packages, 'less')
-  au BufNewFile,BufRead *.less setf less
+  au BufNewFile,BufRead *.less call s:Setf('less')
 endif
 
 if !has_key(s:disabled_packages, 'lilypond')
-  au BufNewFile,BufRead *.ily setf lilypond
-  au BufNewFile,BufRead *.ly setf lilypond
+  au BufNewFile,BufRead *.ily call s:Setf('lilypond')
+  au BufNewFile,BufRead *.ly call s:Setf('lilypond')
 endif
 
 if !has_key(s:disabled_packages, 'livescript')
-  au BufNewFile,BufRead *._ls setf livescript
-  au BufNewFile,BufRead *.ls setf livescript
-  au BufNewFile,BufRead Slakefile setf livescript
+  au BufNewFile,BufRead *._ls call s:Setf('livescript')
+  au BufNewFile,BufRead *.ls call s:Setf('livescript')
+  au BufNewFile,BufRead Slakefile call s:Setf('livescript')
 endif
 
 if !has_key(s:disabled_packages, 'llvm')
-  au BufNewFile,BufRead *.ll setf llvm
-  au BufNewFile,BufRead *.td setf tablegen
+  au BufNewFile,BufRead *.ll call s:Setf('llvm')
+  au BufNewFile,BufRead *.td call s:Setf('tablegen')
 endif
 
 if !has_key(s:disabled_packages, 'log')
-  au BufNewFile,BufRead *.LOG setf log
-  au BufNewFile,BufRead *.log setf log
-  au BufNewFile,BufRead *_LOG setf log
-  au BufNewFile,BufRead *_log setf log
+  au BufNewFile,BufRead *.LOG call s:Setf('log')
+  au BufNewFile,BufRead *.log call s:Setf('log')
+  au BufNewFile,BufRead *_LOG call s:Setf('log')
+  au BufNewFile,BufRead *_log call s:Setf('log')
 endif
 
 if !has_key(s:disabled_packages, 'lua')
-  au BufNewFile,BufRead *.fcgi setf lua
-  au BufNewFile,BufRead *.lua setf lua
-  au BufNewFile,BufRead *.nse setf lua
-  au BufNewFile,BufRead *.p8 setf lua
-  au BufNewFile,BufRead *.pd_lua setf lua
-  au BufNewFile,BufRead *.rbxs setf lua
-  au BufNewFile,BufRead *.rockspec setf lua
-  au BufNewFile,BufRead *.wlua setf lua
-  au BufNewFile,BufRead {.,}luacheckrc setf lua
+  au BufNewFile,BufRead *.fcgi call s:Setf('lua')
+  au BufNewFile,BufRead *.lua call s:Setf('lua')
+  au BufNewFile,BufRead *.nse call s:Setf('lua')
+  au BufNewFile,BufRead *.p8 call s:Setf('lua')
+  au BufNewFile,BufRead *.pd_lua call s:Setf('lua')
+  au BufNewFile,BufRead *.rbxs call s:Setf('lua')
+  au BufNewFile,BufRead *.rockspec call s:Setf('lua')
+  au BufNewFile,BufRead *.wlua call s:Setf('lua')
+  au BufNewFile,BufRead {.,}luacheckrc call s:Setf('lua')
 endif
 
 if !has_key(s:disabled_packages, 'm4')
-  au BufNewFile,BufRead *.at setf m4
-  au BufNewFile,BufRead *.m4 setf m4
+  au BufNewFile,BufRead *.at call s:Setf('m4')
+  au BufNewFile,BufRead *.m4 call s:Setf('m4')
 endif
 
 if !has_key(s:disabled_packages, 'mako')
   au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile,BufRead *.mako setf mako
+  au BufNewFile,BufRead *.mako call s:Setf('mako')
   au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile,BufRead *.mao setf mako
-endif
-
-if !has_key(s:disabled_packages, 'octave')
-  au BufNewFile,BufRead *.oct setf octave
-  au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
+  au BufNewFile,BufRead *.mao call s:Setf('mako')
 endif
 
 if !has_key(s:disabled_packages, 'mathematica')
-  au BufNewFile,BufRead *.cdf setf mma
-  au BufNewFile,BufRead *.ma setf mma
-  au BufNewFile,BufRead *.mathematica setf mma
-  au BufNewFile,BufRead *.mma setf mma
-  au BufNewFile,BufRead *.mt setf mma
-  au BufNewFile,BufRead *.nb setf mma
-  au BufNewFile,BufRead *.nbp setf mma
-  au BufNewFile,BufRead *.wl setf mma
-  au BufNewFile,BufRead *.wls setf mma
-  au BufNewFile,BufRead *.wlt setf mma
+  au BufNewFile,BufRead *.cdf call s:Setf('mma')
+  au BufNewFile,BufRead *.ma call s:Setf('mma')
+  au BufNewFile,BufRead *.mathematica call s:Setf('mma')
+  au BufNewFile,BufRead *.mma call s:Setf('mma')
+  au BufNewFile,BufRead *.mt call s:Setf('mma')
+  au BufNewFile,BufRead *.nb call s:Setf('mma')
+  au BufNewFile,BufRead *.nbp call s:Setf('mma')
+  au BufNewFile,BufRead *.wl call s:Setf('mma')
+  au BufNewFile,BufRead *.wls call s:Setf('mma')
+  au BufNewFile,BufRead *.wlt call s:Setf('mma')
   au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'markdown')
-  au BufNewFile,BufRead *.markdown setf markdown
-  au BufNewFile,BufRead *.md setf markdown
-  au BufNewFile,BufRead *.mdown setf markdown
-  au BufNewFile,BufRead *.mdwn setf markdown
-  au BufNewFile,BufRead *.mkd setf markdown
-  au BufNewFile,BufRead *.mkdn setf markdown
-  au BufNewFile,BufRead *.mkdown setf markdown
-  au BufNewFile,BufRead *.ronn setf markdown
-  au BufNewFile,BufRead *.workbook setf markdown
-  au BufNewFile,BufRead contents.lr setf markdown
+  au BufNewFile,BufRead *.markdown call s:Setf('markdown')
+  au BufNewFile,BufRead *.md call s:Setf('markdown')
+  au BufNewFile,BufRead *.mdown call s:Setf('markdown')
+  au BufNewFile,BufRead *.mdwn call s:Setf('markdown')
+  au BufNewFile,BufRead *.mkd call s:Setf('markdown')
+  au BufNewFile,BufRead *.mkdn call s:Setf('markdown')
+  au BufNewFile,BufRead *.mkdown call s:Setf('markdown')
+  au BufNewFile,BufRead *.ronn call s:Setf('markdown')
+  au BufNewFile,BufRead *.workbook call s:Setf('markdown')
+  au BufNewFile,BufRead contents.lr call s:Setf('markdown')
 endif
 
 if !has_key(s:disabled_packages, 'mdx')
-  au BufNewFile,BufRead *.mdx setf markdown.mdx
+  au BufNewFile,BufRead *.mdx call s:Setf('markdown.mdx')
 endif
 
 if !has_key(s:disabled_packages, 'meson')
-  au BufNewFile,BufRead meson.build setf meson
-  au BufNewFile,BufRead meson_options.txt setf meson
-  au BufNewFile,BufRead *.wrap setf dosini
+  au BufNewFile,BufRead meson.build call s:Setf('meson')
+  au BufNewFile,BufRead meson_options.txt call s:Setf('meson')
+  au BufNewFile,BufRead *.wrap call s:Setf('dosini')
 endif
 
 if !has_key(s:disabled_packages, 'moonscript')
-  au BufNewFile,BufRead *.moon setf moon
+  au BufNewFile,BufRead *.moon call s:Setf('moon')
 endif
 
 if !has_key(s:disabled_packages, 'murphi')
@@ -1182,28 +1288,28 @@ if !has_key(s:disabled_packages, 'murphi')
 endif
 
 if !has_key(s:disabled_packages, 'nginx')
-  au BufNewFile,BufRead *.nginx setf nginx
-  au BufNewFile,BufRead *.nginxconf setf nginx
-  au BufNewFile,BufRead *.vhost setf nginx
+  au BufNewFile,BufRead *.nginx call s:Setf('nginx')
+  au BufNewFile,BufRead *.nginxconf call s:Setf('nginx')
+  au BufNewFile,BufRead *.vhost call s:Setf('nginx')
   au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
-  au BufNewFile,BufRead */nginx/*.conf setf nginx
+  au BufNewFile,BufRead */nginx/*.conf call s:Setf('nginx')
   au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
-  au BufNewFile,BufRead *nginx.conf setf nginx
-  au BufNewFile,BufRead nginx*.conf setf nginx
-  au BufNewFile,BufRead nginx.conf setf nginx
+  au BufNewFile,BufRead *nginx.conf call s:Setf('nginx')
+  au BufNewFile,BufRead nginx*.conf call s:Setf('nginx')
+  au BufNewFile,BufRead nginx.conf call s:Setf('nginx')
 endif
 
 if !has_key(s:disabled_packages, 'nim')
-  au BufNewFile,BufRead *.nim setf nim
-  au BufNewFile,BufRead *.nim.cfg setf nim
-  au BufNewFile,BufRead *.nimble setf nim
-  au BufNewFile,BufRead *.nimrod setf nim
-  au BufNewFile,BufRead *.nims setf nim
-  au BufNewFile,BufRead nim.cfg setf nim
+  au BufNewFile,BufRead *.nim call s:Setf('nim')
+  au BufNewFile,BufRead *.nim.cfg call s:Setf('nim')
+  au BufNewFile,BufRead *.nimble call s:Setf('nim')
+  au BufNewFile,BufRead *.nimrod call s:Setf('nim')
+  au BufNewFile,BufRead *.nims call s:Setf('nim')
+  au BufNewFile,BufRead nim.cfg call s:Setf('nim')
 endif
 
 if !has_key(s:disabled_packages, 'nix')
-  au BufNewFile,BufRead *.nix setf nix
+  au BufNewFile,BufRead *.nix call s:Setf('nix')
 endif
 
 if !has_key(s:disabled_packages, 'objc')
@@ -1212,57 +1318,62 @@ if !has_key(s:disabled_packages, 'objc')
 endif
 
 if !has_key(s:disabled_packages, 'ocaml')
-  au BufNewFile,BufRead *.eliom setf ocaml
-  au BufNewFile,BufRead *.eliomi setf ocaml
-  au BufNewFile,BufRead *.ml setf ocaml
-  au BufNewFile,BufRead *.ml.cppo setf ocaml
-  au BufNewFile,BufRead *.ml4 setf ocaml
-  au BufNewFile,BufRead *.mli setf ocaml
-  au BufNewFile,BufRead *.mli.cppo setf ocaml
-  au BufNewFile,BufRead *.mlip setf ocaml
-  au BufNewFile,BufRead *.mll setf ocaml
-  au BufNewFile,BufRead *.mlp setf ocaml
-  au BufNewFile,BufRead *.mlt setf ocaml
-  au BufNewFile,BufRead *.mly setf ocaml
-  au BufNewFile,BufRead {.,}ocamlinit setf ocaml
-  au BufNewFile,BufRead *.om setf omake
-  au BufNewFile,BufRead OMakefile setf omake
-  au BufNewFile,BufRead OMakeroot setf omake
-  au BufNewFile,BufRead OMakeroot.in setf omake
-  au BufNewFile,BufRead *.opam setf opam
-  au BufNewFile,BufRead *.opam.template setf opam
-  au BufNewFile,BufRead opam setf opam
-  au BufNewFile,BufRead _oasis setf oasis
-  au BufNewFile,BufRead dune setf dune
-  au BufNewFile,BufRead dune-project setf dune
-  au BufNewFile,BufRead dune-workspace setf dune
-  au BufNewFile,BufRead jbuild setf dune
-  au BufNewFile,BufRead _tags setf ocamlbuild_tags
-  au BufNewFile,BufRead *.ocp setf ocpbuild
-  au BufNewFile,BufRead *.root setf ocpbuildroot
-  au BufNewFile,BufRead *.sexp setf sexplib
+  au BufNewFile,BufRead *.eliom call s:Setf('ocaml')
+  au BufNewFile,BufRead *.eliomi call s:Setf('ocaml')
+  au BufNewFile,BufRead *.ml call s:Setf('ocaml')
+  au BufNewFile,BufRead *.ml.cppo call s:Setf('ocaml')
+  au BufNewFile,BufRead *.ml4 call s:Setf('ocaml')
+  au BufNewFile,BufRead *.mli call s:Setf('ocaml')
+  au BufNewFile,BufRead *.mli.cppo call s:Setf('ocaml')
+  au BufNewFile,BufRead *.mlip call s:Setf('ocaml')
+  au BufNewFile,BufRead *.mll call s:Setf('ocaml')
+  au BufNewFile,BufRead *.mlp call s:Setf('ocaml')
+  au BufNewFile,BufRead *.mlt call s:Setf('ocaml')
+  au BufNewFile,BufRead *.mly call s:Setf('ocaml')
+  au BufNewFile,BufRead {.,}ocamlinit call s:Setf('ocaml')
+  au BufNewFile,BufRead *.om call s:Setf('omake')
+  au BufNewFile,BufRead OMakefile call s:Setf('omake')
+  au BufNewFile,BufRead OMakeroot call s:Setf('omake')
+  au BufNewFile,BufRead OMakeroot.in call s:Setf('omake')
+  au BufNewFile,BufRead *.opam call s:Setf('opam')
+  au BufNewFile,BufRead *.opam.template call s:Setf('opam')
+  au BufNewFile,BufRead opam call s:Setf('opam')
+  au BufNewFile,BufRead _oasis call s:Setf('oasis')
+  au BufNewFile,BufRead dune call s:Setf('dune')
+  au BufNewFile,BufRead dune-project call s:Setf('dune')
+  au BufNewFile,BufRead dune-workspace call s:Setf('dune')
+  au BufNewFile,BufRead jbuild call s:Setf('dune')
+  au BufNewFile,BufRead _tags call s:Setf('ocamlbuild_tags')
+  au BufNewFile,BufRead *.ocp call s:Setf('ocpbuild')
+  au BufNewFile,BufRead *.root call s:Setf('ocpbuildroot')
+  au BufNewFile,BufRead *.sexp call s:Setf('sexplib')
+endif
+
+if !has_key(s:disabled_packages, 'octave')
+  au BufNewFile,BufRead *.oct call s:Setf('octave')
+  au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'opencl')
-  au BufNewFile,BufRead *.cl setf opencl
-  au BufNewFile,BufRead *.opencl setf opencl
+  au BufNewFile,BufRead *.cl call s:Setf('opencl')
+  au BufNewFile,BufRead *.opencl call s:Setf('opencl')
 endif
 
 if !has_key(s:disabled_packages, 'perl')
-  au BufNewFile,BufRead *.al setf perl
-  au BufNewFile,BufRead *.cgi setf perl
-  au BufNewFile,BufRead *.fcgi setf perl
-  au BufNewFile,BufRead *.perl setf perl
-  au BufNewFile,BufRead *.ph setf perl
-  au BufNewFile,BufRead *.pl setf perl
-  au BufNewFile,BufRead *.plx setf perl
-  au BufNewFile,BufRead *.pm setf perl
-  au BufNewFile,BufRead *.psgi setf perl
-  au BufNewFile,BufRead *.t setf perl
-  au BufNewFile,BufRead Makefile.PL setf perl
-  au BufNewFile,BufRead Rexfile setf perl
-  au BufNewFile,BufRead ack setf perl
-  au BufNewFile,BufRead cpanfile setf perl
+  au BufNewFile,BufRead *.al call s:Setf('perl')
+  au BufNewFile,BufRead *.cgi call s:Setf('perl')
+  au BufNewFile,BufRead *.fcgi call s:Setf('perl')
+  au BufNewFile,BufRead *.perl call s:Setf('perl')
+  au BufNewFile,BufRead *.ph call s:Setf('perl')
+  au BufNewFile,BufRead *.pl call s:Setf('perl')
+  au BufNewFile,BufRead *.plx call s:Setf('perl')
+  au BufNewFile,BufRead *.pm call s:Setf('perl')
+  au BufNewFile,BufRead *.psgi call s:Setf('perl')
+  au BufNewFile,BufRead *.t call s:Setf('perl')
+  au BufNewFile,BufRead Makefile.PL call s:Setf('perl')
+  au BufNewFile,BufRead Rexfile call s:Setf('perl')
+  au BufNewFile,BufRead ack call s:Setf('perl')
+  au BufNewFile,BufRead cpanfile call s:Setf('perl')
 endif
 
 if !has_key(s:disabled_packages, 'pgsql')
@@ -1270,233 +1381,238 @@ if !has_key(s:disabled_packages, 'pgsql')
 endif
 
 if !has_key(s:disabled_packages, 'cql')
-  au BufNewFile,BufRead *.cql setf cql
+  au BufNewFile,BufRead *.cql call s:Setf('cql')
 endif
 
-if !has_key(s:disabled_packages, 'blade')
-  au BufNewFile,BufRead *.blade setf blade
-  au BufNewFile,BufRead *.blade.php setf blade
+if !has_key(s:disabled_packages, 'php')
+  au BufNewFile,BufRead *.aw call s:Setf('php')
+  au BufNewFile,BufRead *.ctp call s:Setf('php')
+  au BufNewFile,BufRead *.fcgi call s:Setf('php')
+  au BufNewFile,BufRead *.inc call s:Setf('php')
+  au BufNewFile,BufRead *.php call s:Setf('php')
+  au BufNewFile,BufRead *.php3 call s:Setf('php')
+  au BufNewFile,BufRead *.php4 call s:Setf('php')
+  au BufNewFile,BufRead *.php5 call s:Setf('php')
+  au BufNewFile,BufRead *.phps call s:Setf('php')
+  au BufNewFile,BufRead *.phpt call s:Setf('php')
+  au BufNewFile,BufRead {.,}php call s:Setf('php')
+  au BufNewFile,BufRead {.,}php_cs call s:Setf('php')
+  au BufNewFile,BufRead {.,}php_cs.dist call s:Setf('php')
+  au BufNewFile,BufRead Phakefile call s:Setf('php')
 endif
 
-if !has_key(s:disabled_packages, 'php')
-  au BufNewFile,BufRead *.aw setf php
-  au BufNewFile,BufRead *.ctp setf php
-  au BufNewFile,BufRead *.fcgi setf php
-  au BufNewFile,BufRead *.inc setf php
-  au BufNewFile,BufRead *.php setf php
-  au BufNewFile,BufRead *.php3 setf php
-  au BufNewFile,BufRead *.php4 setf php
-  au BufNewFile,BufRead *.php5 setf php
-  au BufNewFile,BufRead *.phps setf php
-  au BufNewFile,BufRead *.phpt setf php
-  au BufNewFile,BufRead {.,}php setf php
-  au BufNewFile,BufRead {.,}php_cs setf php
-  au BufNewFile,BufRead {.,}php_cs.dist setf php
-  au BufNewFile,BufRead Phakefile setf php
+if !has_key(s:disabled_packages, 'blade')
+  au BufNewFile,BufRead *.blade call s:Setf('blade')
+  au BufNewFile,BufRead *.blade.php call s:Setf('blade')
 endif
 
 if !has_key(s:disabled_packages, 'plantuml')
-  au BufNewFile,BufRead *.iuml setf plantuml
-  au BufNewFile,BufRead *.plantuml setf plantuml
-  au BufNewFile,BufRead *.pu setf plantuml
-  au BufNewFile,BufRead *.puml setf plantuml
-  au BufNewFile,BufRead *.uml setf plantuml
+  au BufNewFile,BufRead *.iuml call s:Setf('plantuml')
+  au BufNewFile,BufRead *.plantuml call s:Setf('plantuml')
+  au BufNewFile,BufRead *.pu call s:Setf('plantuml')
+  au BufNewFile,BufRead *.puml call s:Setf('plantuml')
+  au BufNewFile,BufRead *.uml call s:Setf('plantuml')
 endif
 
 if !has_key(s:disabled_packages, 'pony')
-  au BufNewFile,BufRead *.pony setf pony
+  au BufNewFile,BufRead *.pony call s:Setf('pony')
 endif
 
 if !has_key(s:disabled_packages, 'powershell')
-  au BufNewFile,BufRead *.ps1 setf ps1
-  au BufNewFile,BufRead *.psd1 setf ps1
-  au BufNewFile,BufRead *.psm1 setf ps1
-  au BufNewFile,BufRead *.pssc setf ps1
-  au BufNewFile,BufRead *.ps1xml setf ps1xml
+  au BufNewFile,BufRead *.ps1 call s:Setf('ps1')
+  au BufNewFile,BufRead *.psd1 call s:Setf('ps1')
+  au BufNewFile,BufRead *.psm1 call s:Setf('ps1')
+  au BufNewFile,BufRead *.pssc call s:Setf('ps1')
+  au BufNewFile,BufRead *.ps1xml call s:Setf('ps1xml')
 endif
 
 if !has_key(s:disabled_packages, 'protobuf')
-  au BufNewFile,BufRead *.proto setf proto
+  au BufNewFile,BufRead *.proto call s:Setf('proto')
 endif
 
 if !has_key(s:disabled_packages, 'pug')
-  au BufNewFile,BufRead *.jade setf pug
-  au BufNewFile,BufRead *.pug setf pug
+  au BufNewFile,BufRead *.jade call s:Setf('pug')
+  au BufNewFile,BufRead *.pug call s:Setf('pug')
 endif
 
 if !has_key(s:disabled_packages, 'puppet')
-  au BufNewFile,BufRead *.pp setf puppet
-  au BufNewFile,BufRead Modulefile setf puppet
-  au BufNewFile,BufRead *.epp setf embeddedpuppet
+  au BufNewFile,BufRead *.pp call s:Setf('puppet')
+  au BufNewFile,BufRead Modulefile call s:Setf('puppet')
+  au BufNewFile,BufRead *.epp call s:Setf('embeddedpuppet')
 endif
 
 if !has_key(s:disabled_packages, 'purescript')
-  au BufNewFile,BufRead *.purs setf purescript
+  au BufNewFile,BufRead *.purs call s:Setf('purescript')
 endif
 
 if !has_key(s:disabled_packages, 'python')
-  au BufNewFile,BufRead *.cgi setf python
-  au BufNewFile,BufRead *.fcgi setf python
-  au BufNewFile,BufRead *.gyp setf python
-  au BufNewFile,BufRead *.gypi setf python
-  au BufNewFile,BufRead *.lmi setf python
-  au BufNewFile,BufRead *.py setf python
-  au BufNewFile,BufRead *.py3 setf python
-  au BufNewFile,BufRead *.pyde setf python
-  au BufNewFile,BufRead *.pyi setf python
-  au BufNewFile,BufRead *.pyp setf python
-  au BufNewFile,BufRead *.pyt setf python
-  au BufNewFile,BufRead *.pyw setf python
-  au BufNewFile,BufRead *.rpy setf python
-  au BufNewFile,BufRead *.smk setf python
-  au BufNewFile,BufRead *.spec setf python
-  au BufNewFile,BufRead *.tac setf python
-  au BufNewFile,BufRead *.wsgi setf python
-  au BufNewFile,BufRead *.xpy setf python
-  au BufNewFile,BufRead {.,}gclient setf python
-  au BufNewFile,BufRead DEPS setf python
-  au BufNewFile,BufRead SConscript setf python
-  au BufNewFile,BufRead SConstruct setf python
-  au BufNewFile,BufRead Snakefile setf python
-  au BufNewFile,BufRead wscript setf python
+  au BufNewFile,BufRead *.cgi call s:Setf('python')
+  au BufNewFile,BufRead *.fcgi call s:Setf('python')
+  au BufNewFile,BufRead *.gyp call s:Setf('python')
+  au BufNewFile,BufRead *.gypi call s:Setf('python')
+  au BufNewFile,BufRead *.lmi call s:Setf('python')
+  au BufNewFile,BufRead *.py call s:Setf('python')
+  au BufNewFile,BufRead *.py3 call s:Setf('python')
+  au BufNewFile,BufRead *.pyde call s:Setf('python')
+  au BufNewFile,BufRead *.pyi call s:Setf('python')
+  au BufNewFile,BufRead *.pyp call s:Setf('python')
+  au BufNewFile,BufRead *.pyt call s:Setf('python')
+  au BufNewFile,BufRead *.pyw call s:Setf('python')
+  au BufNewFile,BufRead *.rpy call s:Setf('python')
+  au BufNewFile,BufRead *.smk call s:Setf('python')
+  au BufNewFile,BufRead *.spec call s:Setf('python')
+  au BufNewFile,BufRead *.tac call s:Setf('python')
+  au BufNewFile,BufRead *.wsgi call s:Setf('python')
+  au BufNewFile,BufRead *.xpy call s:Setf('python')
+  au BufNewFile,BufRead {.,}gclient call s:Setf('python')
+  au BufNewFile,BufRead DEPS call s:Setf('python')
+  au BufNewFile,BufRead SConscript call s:Setf('python')
+  au BufNewFile,BufRead SConstruct call s:Setf('python')
+  au BufNewFile,BufRead Snakefile call s:Setf('python')
+  au BufNewFile,BufRead wscript call s:Setf('python')
 endif
 
 if !has_key(s:disabled_packages, 'requirements')
-  au BufNewFile,BufRead *.pip setf requirements
-  au BufNewFile,BufRead *require.{txt,in} setf requirements
-  au BufNewFile,BufRead *requirements.{txt,in} setf requirements
-  au BufNewFile,BufRead constraints.{txt,in} setf requirements
+  au BufNewFile,BufRead *.pip call s:Setf('requirements')
+  au BufNewFile,BufRead *require.{txt,in} call s:Setf('requirements')
+  au BufNewFile,BufRead *requirements.{txt,in} call s:Setf('requirements')
+  au BufNewFile,BufRead constraints.{txt,in} call s:Setf('requirements')
 endif
 
 if !has_key(s:disabled_packages, 'qmake')
-  au BufNewFile,BufRead *.pri setf qmake
-  au BufNewFile,BufRead *.pro setf qmake
+  au BufNewFile,BufRead *.pri call s:Setf('qmake')
+  au BufNewFile,BufRead *.pro call s:Setf('qmake')
 endif
 
 if !has_key(s:disabled_packages, 'qml')
-  au BufNewFile,BufRead *.qbs setf qml
-  au BufNewFile,BufRead *.qml setf qml
+  au BufNewFile,BufRead *.qbs call s:Setf('qml')
+  au BufNewFile,BufRead *.qml call s:Setf('qml')
 endif
 
 if !has_key(s:disabled_packages, 'r-lang')
-  au BufNewFile,BufRead *.S setf r
-  au BufNewFile,BufRead *.r setf r
-  au BufNewFile,BufRead *.rsx setf r
-  au BufNewFile,BufRead *.s setf r
-  au BufNewFile,BufRead {.,}Rprofile setf r
-  au BufNewFile,BufRead expr-dist setf r
-  au BufNewFile,BufRead *.rd setf rhelp
+  au BufNewFile,BufRead *.S call s:Setf('r')
+  au BufNewFile,BufRead *.r call s:Setf('r')
+  au BufNewFile,BufRead *.rsx call s:Setf('r')
+  au BufNewFile,BufRead *.s call s:Setf('r')
+  au BufNewFile,BufRead {.,}Rprofile call s:Setf('r')
+  au BufNewFile,BufRead expr-dist call s:Setf('r')
+  au BufNewFile,BufRead *.rd call s:Setf('rhelp')
 endif
 
 if !has_key(s:disabled_packages, 'racket')
-  au BufNewFile,BufRead *.rkt setf racket
-  au BufNewFile,BufRead *.rktd setf racket
-  au BufNewFile,BufRead *.rktl setf racket
-  au BufNewFile,BufRead *.scrbl setf racket
+  au BufNewFile,BufRead *.rkt call s:Setf('racket')
+  au BufNewFile,BufRead *.rktd call s:Setf('racket')
+  au BufNewFile,BufRead *.rktl call s:Setf('racket')
+  au BufNewFile,BufRead *.scrbl call s:Setf('racket')
 endif
 
 if !has_key(s:disabled_packages, 'ragel')
-  au BufNewFile,BufRead *.rl setf ragel
+  au BufNewFile,BufRead *.rl call s:Setf('ragel')
 endif
 
 if !has_key(s:disabled_packages, 'raku')
-  au BufNewFile,BufRead *.6pl setf raku
-  au BufNewFile,BufRead *.6pm setf raku
-  au BufNewFile,BufRead *.nqp setf raku
-  au BufNewFile,BufRead *.p6 setf raku
-  au BufNewFile,BufRead *.p6l setf raku
-  au BufNewFile,BufRead *.p6m setf raku
-  au BufNewFile,BufRead *.pl setf raku
-  au BufNewFile,BufRead *.pl6 setf raku
-  au BufNewFile,BufRead *.pm setf raku
-  au BufNewFile,BufRead *.pm6 setf raku
-  au BufNewFile,BufRead *.pod6 setf raku
-  au BufNewFile,BufRead *.raku setf raku
-  au BufNewFile,BufRead *.rakudoc setf raku
-  au BufNewFile,BufRead *.rakumod setf raku
-  au BufNewFile,BufRead *.rakutest setf raku
-  au BufNewFile,BufRead *.t setf raku
-  au BufNewFile,BufRead *.t6 setf raku
+  au BufNewFile,BufRead *.6pl call s:Setf('raku')
+  au BufNewFile,BufRead *.6pm call s:Setf('raku')
+  au BufNewFile,BufRead *.nqp call s:Setf('raku')
+  au BufNewFile,BufRead *.p6 call s:Setf('raku')
+  au BufNewFile,BufRead *.p6l call s:Setf('raku')
+  au BufNewFile,BufRead *.p6m call s:Setf('raku')
+  au BufNewFile,BufRead *.pl call s:Setf('raku')
+  au BufNewFile,BufRead *.pl6 call s:Setf('raku')
+  au BufNewFile,BufRead *.pm call s:Setf('raku')
+  au BufNewFile,BufRead *.pm6 call s:Setf('raku')
+  au BufNewFile,BufRead *.pod6 call s:Setf('raku')
+  au BufNewFile,BufRead *.raku call s:Setf('raku')
+  au BufNewFile,BufRead *.rakudoc call s:Setf('raku')
+  au BufNewFile,BufRead *.rakumod call s:Setf('raku')
+  au BufNewFile,BufRead *.rakutest call s:Setf('raku')
+  au BufNewFile,BufRead *.t call s:Setf('raku')
+  au BufNewFile,BufRead *.t6 call s:Setf('raku')
 endif
 
 if !has_key(s:disabled_packages, 'raml')
-  au BufNewFile,BufRead *.raml setf raml
+  au BufNewFile,BufRead *.raml call s:Setf('raml')
 endif
 
 if !has_key(s:disabled_packages, 'razor')
-  au BufNewFile,BufRead *.cshtml setf razor
-  au BufNewFile,BufRead *.razor setf razor
+  au BufNewFile,BufRead *.cshtml call s:Setf('razor')
+  au BufNewFile,BufRead *.razor call s:Setf('razor')
+endif
+
+if !has_key(s:disabled_packages, 'reason')
+  au BufNewFile,BufRead *.rei call s:Setf('reason')
+  au! BufNewFile,BufRead *.re call polyglot#DetectReFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'rst')
-  au BufNewFile,BufRead *.rest setf rst
-  au BufNewFile,BufRead *.rest.txt setf rst
-  au BufNewFile,BufRead *.rst setf rst
-  au BufNewFile,BufRead *.rst.txt setf rst
+  au BufNewFile,BufRead *.rest call s:Setf('rst')
+  au BufNewFile,BufRead *.rest.txt call s:Setf('rst')
+  au BufNewFile,BufRead *.rst call s:Setf('rst')
+  au BufNewFile,BufRead *.rst.txt call s:Setf('rst')
 endif
 
 if !has_key(s:disabled_packages, 'ruby')
-  au BufNewFile,BufRead *.axlsx setf ruby
-  au BufNewFile,BufRead *.builder setf ruby
-  au BufNewFile,BufRead *.cap setf ruby
-  au BufNewFile,BufRead *.eye setf ruby
-  au BufNewFile,BufRead *.fcgi setf ruby
-  au BufNewFile,BufRead *.gemspec setf ruby
-  au BufNewFile,BufRead *.god setf ruby
-  au BufNewFile,BufRead *.jbuilder setf ruby
-  au BufNewFile,BufRead *.mspec setf ruby
-  au BufNewFile,BufRead *.opal setf ruby
-  au BufNewFile,BufRead *.pluginspec setf ruby
-  au BufNewFile,BufRead *.podspec setf ruby
-  au BufNewFile,BufRead *.rabl setf ruby
-  au BufNewFile,BufRead *.rake setf ruby
-  au BufNewFile,BufRead *.rant setf ruby
-  au BufNewFile,BufRead *.rb setf ruby
-  au BufNewFile,BufRead *.rbi setf ruby
-  au BufNewFile,BufRead *.rbuild setf ruby
-  au BufNewFile,BufRead *.rbw setf ruby
-  au BufNewFile,BufRead *.rbx setf ruby
-  au BufNewFile,BufRead *.rjs setf ruby
-  au BufNewFile,BufRead *.ru setf ruby
-  au BufNewFile,BufRead *.ruby setf ruby
-  au BufNewFile,BufRead *.rxml setf ruby
-  au BufNewFile,BufRead *.spec setf ruby
-  au BufNewFile,BufRead *.thor setf ruby
-  au BufNewFile,BufRead *.watchr setf ruby
-  au BufNewFile,BufRead {.,}Brewfile setf ruby
-  au BufNewFile,BufRead {.,}Guardfile setf ruby
-  au BufNewFile,BufRead {.,}autotest setf ruby
-  au BufNewFile,BufRead {.,}irbrc setf ruby
-  au BufNewFile,BufRead {.,}pryrc setf ruby
-  au BufNewFile,BufRead {.,}simplecov setf ruby
-  au BufNewFile,BufRead Appraisals setf ruby
-  au BufNewFile,BufRead Berksfile setf ruby
-  au BufNewFile,BufRead Buildfile setf ruby
-  au BufNewFile,BufRead Capfile setf ruby
-  au BufNewFile,BufRead Cheffile setf ruby
-  au BufNewFile,BufRead Dangerfile setf ruby
-  au BufNewFile,BufRead Deliverfile setf ruby
-  au BufNewFile,BufRead Fastfile setf ruby
-  au BufNewFile,BufRead Gemfile setf ruby
-  au BufNewFile,BufRead Gemfile.lock setf ruby
-  au BufNewFile,BufRead Guardfile setf ruby
-  au BufNewFile,BufRead Jarfile setf ruby
-  au BufNewFile,BufRead KitchenSink setf ruby
-  au BufNewFile,BufRead Mavenfile setf ruby
-  au BufNewFile,BufRead Podfile setf ruby
-  au BufNewFile,BufRead Puppetfile setf ruby
-  au BufNewFile,BufRead Rakefile setf ruby
-  au BufNewFile,BufRead Rantfile setf ruby
-  au BufNewFile,BufRead Routefile setf ruby
-  au BufNewFile,BufRead Snapfile setf ruby
-  au BufNewFile,BufRead Thorfile setf ruby
-  au BufNewFile,BufRead Vagrantfile setf ruby
+  au BufNewFile,BufRead *.axlsx call s:Setf('ruby')
+  au BufNewFile,BufRead *.builder call s:Setf('ruby')
+  au BufNewFile,BufRead *.cap call s:Setf('ruby')
+  au BufNewFile,BufRead *.eye call s:Setf('ruby')
+  au BufNewFile,BufRead *.fcgi call s:Setf('ruby')
+  au BufNewFile,BufRead *.gemspec call s:Setf('ruby')
+  au BufNewFile,BufRead *.god call s:Setf('ruby')
+  au BufNewFile,BufRead *.jbuilder call s:Setf('ruby')
+  au BufNewFile,BufRead *.mspec call s:Setf('ruby')
+  au BufNewFile,BufRead *.opal call s:Setf('ruby')
+  au BufNewFile,BufRead *.pluginspec call s:Setf('ruby')
+  au BufNewFile,BufRead *.podspec call s:Setf('ruby')
+  au BufNewFile,BufRead *.rabl call s:Setf('ruby')
+  au BufNewFile,BufRead *.rake call s:Setf('ruby')
+  au BufNewFile,BufRead *.rant call s:Setf('ruby')
+  au BufNewFile,BufRead *.rb call s:Setf('ruby')
+  au BufNewFile,BufRead *.rbi call s:Setf('ruby')
+  au BufNewFile,BufRead *.rbuild call s:Setf('ruby')
+  au BufNewFile,BufRead *.rbw call s:Setf('ruby')
+  au BufNewFile,BufRead *.rbx call s:Setf('ruby')
+  au BufNewFile,BufRead *.rjs call s:Setf('ruby')
+  au BufNewFile,BufRead *.ru call s:Setf('ruby')
+  au BufNewFile,BufRead *.ruby call s:Setf('ruby')
+  au BufNewFile,BufRead *.rxml call s:Setf('ruby')
+  au BufNewFile,BufRead *.spec call s:Setf('ruby')
+  au BufNewFile,BufRead *.thor call s:Setf('ruby')
+  au BufNewFile,BufRead *.watchr call s:Setf('ruby')
+  au BufNewFile,BufRead {.,}Brewfile call s:Setf('ruby')
+  au BufNewFile,BufRead {.,}Guardfile call s:Setf('ruby')
+  au BufNewFile,BufRead {.,}autotest call s:Setf('ruby')
+  au BufNewFile,BufRead {.,}irbrc call s:Setf('ruby')
+  au BufNewFile,BufRead {.,}pryrc call s:Setf('ruby')
+  au BufNewFile,BufRead {.,}simplecov call s:Setf('ruby')
+  au BufNewFile,BufRead Appraisals call s:Setf('ruby')
+  au BufNewFile,BufRead Berksfile call s:Setf('ruby')
+  au BufNewFile,BufRead Buildfile call s:Setf('ruby')
+  au BufNewFile,BufRead Capfile call s:Setf('ruby')
+  au BufNewFile,BufRead Cheffile call s:Setf('ruby')
+  au BufNewFile,BufRead Dangerfile call s:Setf('ruby')
+  au BufNewFile,BufRead Deliverfile call s:Setf('ruby')
+  au BufNewFile,BufRead Fastfile call s:Setf('ruby')
+  au BufNewFile,BufRead Gemfile call s:Setf('ruby')
+  au BufNewFile,BufRead Gemfile.lock call s:Setf('ruby')
+  au BufNewFile,BufRead Guardfile call s:Setf('ruby')
+  au BufNewFile,BufRead Jarfile call s:Setf('ruby')
+  au BufNewFile,BufRead KitchenSink call s:Setf('ruby')
+  au BufNewFile,BufRead Mavenfile call s:Setf('ruby')
+  au BufNewFile,BufRead Podfile call s:Setf('ruby')
+  au BufNewFile,BufRead Puppetfile call s:Setf('ruby')
+  au BufNewFile,BufRead Rakefile call s:Setf('ruby')
+  au BufNewFile,BufRead Rantfile call s:Setf('ruby')
+  au BufNewFile,BufRead Routefile call s:Setf('ruby')
+  au BufNewFile,BufRead Snapfile call s:Setf('ruby')
+  au BufNewFile,BufRead Thorfile call s:Setf('ruby')
+  au BufNewFile,BufRead Vagrantfile call s:Setf('ruby')
   au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
-  au BufNewFile,BufRead buildfile setf ruby
-  au BufNewFile,BufRead vagrantfile setf ruby
-  au BufNewFile,BufRead *.erb setf eruby
-  au BufNewFile,BufRead *.erb.deface setf eruby
-  au BufNewFile,BufRead *.rhtml setf eruby
+  au BufNewFile,BufRead buildfile call s:Setf('ruby')
+  au BufNewFile,BufRead vagrantfile call s:Setf('ruby')
+  au BufNewFile,BufRead *.erb call s:Setf('eruby')
+  au BufNewFile,BufRead *.erb.deface call s:Setf('eruby')
+  au BufNewFile,BufRead *.rhtml call s:Setf('eruby')
 endif
 
 if !has_key(s:disabled_packages, 'rspec')
@@ -1504,371 +1620,262 @@ if !has_key(s:disabled_packages, 'rspec')
 endif
 
 if !has_key(s:disabled_packages, 'brewfile')
-  au BufNewFile,BufRead Brewfile setf brewfile
+  au BufNewFile,BufRead Brewfile call s:Setf('brewfile')
 endif
 
 if !has_key(s:disabled_packages, 'rust')
-  au BufNewFile,BufRead *.rs setf rust
-  au BufNewFile,BufRead *.rs.in setf rust
+  au BufNewFile,BufRead *.rs call s:Setf('rust')
+  au BufNewFile,BufRead *.rs.in call s:Setf('rust')
 endif
 
 if !has_key(s:disabled_packages, 'scala')
-  au BufNewFile,BufRead *.kojo setf scala
-  au BufNewFile,BufRead *.sc setf scala
-  au BufNewFile,BufRead *.scala setf scala
+  au BufNewFile,BufRead *.kojo call s:Setf('scala')
+  au BufNewFile,BufRead *.sc call s:Setf('scala')
+  au BufNewFile,BufRead *.scala call s:Setf('scala')
 endif
 
 if !has_key(s:disabled_packages, 'sbt')
-  au BufNewFile,BufRead *.sbt setf sbt.scala
+  au BufNewFile,BufRead *.sbt call s:Setf('sbt.scala')
 endif
 
 if !has_key(s:disabled_packages, 'scss')
-  au BufNewFile,BufRead *.scss setf scss
+  au BufNewFile,BufRead *.scss call s:Setf('scss')
 endif
 
 if !has_key(s:disabled_packages, 'sh')
-  au BufNewFile,BufRead *.bash setf sh
-  au BufNewFile,BufRead *.bats setf sh
-  au BufNewFile,BufRead *.cgi setf sh
-  au BufNewFile,BufRead *.command setf sh
-  au BufNewFile,BufRead *.env setf sh
-  au BufNewFile,BufRead *.fcgi setf sh
-  au BufNewFile,BufRead *.ksh setf sh
-  au BufNewFile,BufRead *.sh setf sh
-  au BufNewFile,BufRead *.sh.in setf sh
-  au BufNewFile,BufRead *.tmux setf sh
-  au BufNewFile,BufRead *.tool setf sh
-  au BufNewFile,BufRead {.,}bash_aliases setf sh
-  au BufNewFile,BufRead {.,}bash_history setf sh
-  au BufNewFile,BufRead {.,}bash_logout setf sh
-  au BufNewFile,BufRead {.,}bash_profile setf sh
-  au BufNewFile,BufRead {.,}bashrc setf sh
-  au BufNewFile,BufRead {.,}cshrc setf sh
-  au BufNewFile,BufRead {.,}env setf sh
-  au BufNewFile,BufRead {.,}env.example setf sh
-  au BufNewFile,BufRead {.,}flaskenv setf sh
-  au BufNewFile,BufRead {.,}login setf sh
-  au BufNewFile,BufRead {.,}profile setf sh
-  au BufNewFile,BufRead 9fs setf sh
-  au BufNewFile,BufRead PKGBUILD setf sh
-  au BufNewFile,BufRead bash_aliases setf sh
-  au BufNewFile,BufRead bash_logout setf sh
-  au BufNewFile,BufRead bash_profile setf sh
-  au BufNewFile,BufRead bashrc setf sh
-  au BufNewFile,BufRead cshrc setf sh
-  au BufNewFile,BufRead gradlew setf sh
-  au BufNewFile,BufRead login setf sh
-  au BufNewFile,BufRead man setf sh
-  au BufNewFile,BufRead profile setf sh
-  au BufNewFile,BufRead *.zsh setf zsh
-  au BufNewFile,BufRead {.,}zlogin setf zsh
-  au BufNewFile,BufRead {.,}zlogout setf zsh
-  au BufNewFile,BufRead {.,}zprofile setf zsh
-  au BufNewFile,BufRead {.,}zshenv setf zsh
-  au BufNewFile,BufRead {.,}zshrc setf zsh
+  au BufNewFile,BufRead *.bash call s:Setf('sh')
+  au BufNewFile,BufRead *.bats call s:Setf('sh')
+  au BufNewFile,BufRead *.cgi call s:Setf('sh')
+  au BufNewFile,BufRead *.command call s:Setf('sh')
+  au BufNewFile,BufRead *.env call s:Setf('sh')
+  au BufNewFile,BufRead *.fcgi call s:Setf('sh')
+  au BufNewFile,BufRead *.ksh call s:Setf('sh')
+  au BufNewFile,BufRead *.sh call s:Setf('sh')
+  au BufNewFile,BufRead *.sh.in call s:Setf('sh')
+  au BufNewFile,BufRead *.tmux call s:Setf('sh')
+  au BufNewFile,BufRead *.tool call s:Setf('sh')
+  au BufNewFile,BufRead {.,}bash_aliases call s:Setf('sh')
+  au BufNewFile,BufRead {.,}bash_history call s:Setf('sh')
+  au BufNewFile,BufRead {.,}bash_logout call s:Setf('sh')
+  au BufNewFile,BufRead {.,}bash_profile call s:Setf('sh')
+  au BufNewFile,BufRead {.,}bashrc call s:Setf('sh')
+  au BufNewFile,BufRead {.,}cshrc call s:Setf('sh')
+  au BufNewFile,BufRead {.,}env call s:Setf('sh')
+  au BufNewFile,BufRead {.,}env.example call s:Setf('sh')
+  au BufNewFile,BufRead {.,}flaskenv call s:Setf('sh')
+  au BufNewFile,BufRead {.,}login call s:Setf('sh')
+  au BufNewFile,BufRead {.,}profile call s:Setf('sh')
+  au BufNewFile,BufRead 9fs call s:Setf('sh')
+  au BufNewFile,BufRead PKGBUILD call s:Setf('sh')
+  au BufNewFile,BufRead bash_aliases call s:Setf('sh')
+  au BufNewFile,BufRead bash_logout call s:Setf('sh')
+  au BufNewFile,BufRead bash_profile call s:Setf('sh')
+  au BufNewFile,BufRead bashrc call s:Setf('sh')
+  au BufNewFile,BufRead cshrc call s:Setf('sh')
+  au BufNewFile,BufRead gradlew call s:Setf('sh')
+  au BufNewFile,BufRead login call s:Setf('sh')
+  au BufNewFile,BufRead man call s:Setf('sh')
+  au BufNewFile,BufRead profile call s:Setf('sh')
+  au BufNewFile,BufRead *.zsh call s:Setf('zsh')
+  au BufNewFile,BufRead {.,}zlogin call s:Setf('zsh')
+  au BufNewFile,BufRead {.,}zlogout call s:Setf('zsh')
+  au BufNewFile,BufRead {.,}zprofile call s:Setf('zsh')
+  au BufNewFile,BufRead {.,}zshenv call s:Setf('zsh')
+  au BufNewFile,BufRead {.,}zshrc call s:Setf('zsh')
 endif
 
 if !has_key(s:disabled_packages, 'slim')
-  au BufNewFile,BufRead *.slim setf slim
+  au BufNewFile,BufRead *.slim call s:Setf('slim')
 endif
 
 if !has_key(s:disabled_packages, 'slime')
-  au BufNewFile,BufRead *.slime setf slime
+  au BufNewFile,BufRead *.slime call s:Setf('slime')
 endif
 
 if !has_key(s:disabled_packages, 'smt2')
-  au BufNewFile,BufRead *.smt setf smt2
-  au BufNewFile,BufRead *.smt2 setf smt2
+  au BufNewFile,BufRead *.smt call s:Setf('smt2')
+  au BufNewFile,BufRead *.smt2 call s:Setf('smt2')
 endif
 
 if !has_key(s:disabled_packages, 'solidity')
-  au BufNewFile,BufRead *.sol setf solidity
+  au BufNewFile,BufRead *.sol call s:Setf('solidity')
 endif
 
 if !has_key(s:disabled_packages, 'stylus')
-  au BufNewFile,BufRead *.styl setf stylus
-  au BufNewFile,BufRead *.stylus setf stylus
+  au BufNewFile,BufRead *.styl call s:Setf('stylus')
+  au BufNewFile,BufRead *.stylus call s:Setf('stylus')
 endif
 
 if !has_key(s:disabled_packages, 'svelte')
-  au BufNewFile,BufRead *.svelte setf svelte
+  au BufNewFile,BufRead *.svelte call s:Setf('svelte')
 endif
 
 if !has_key(s:disabled_packages, 'svg')
-  au BufNewFile,BufRead *.svg setf svg
+  au BufNewFile,BufRead *.svg call s:Setf('svg')
 endif
 
 if !has_key(s:disabled_packages, 'swift')
-  au BufNewFile,BufRead *.swift setf swift
+  au BufNewFile,BufRead *.swift call s:Setf('swift')
 endif
 
 if !has_key(s:disabled_packages, 'sxhkd')
-  au BufNewFile,BufRead *.sxhkdrc setf sxhkdrc
-  au BufNewFile,BufRead sxhkdrc setf sxhkdrc
+  au BufNewFile,BufRead *.sxhkdrc call s:Setf('sxhkdrc')
+  au BufNewFile,BufRead sxhkdrc call s:Setf('sxhkdrc')
 endif
 
 if !has_key(s:disabled_packages, 'systemd')
-  au BufNewFile,BufRead *.automount setf systemd
-  au BufNewFile,BufRead *.mount setf systemd
-  au BufNewFile,BufRead *.path setf systemd
-  au BufNewFile,BufRead *.service setf systemd
-  au BufNewFile,BufRead *.socket setf systemd
-  au BufNewFile,BufRead *.swap setf systemd
-  au BufNewFile,BufRead *.target setf systemd
-  au BufNewFile,BufRead *.timer setf systemd
+  au BufNewFile,BufRead *.automount call s:Setf('systemd')
+  au BufNewFile,BufRead *.mount call s:Setf('systemd')
+  au BufNewFile,BufRead *.path call s:Setf('systemd')
+  au BufNewFile,BufRead *.service call s:Setf('systemd')
+  au BufNewFile,BufRead *.socket call s:Setf('systemd')
+  au BufNewFile,BufRead *.swap call s:Setf('systemd')
+  au BufNewFile,BufRead *.target call s:Setf('systemd')
+  au BufNewFile,BufRead *.timer call s:Setf('systemd')
 endif
 
 if !has_key(s:disabled_packages, 'terraform')
-  au BufNewFile,BufRead *.hcl setf terraform
-  au BufNewFile,BufRead *.nomad setf terraform
-  au BufNewFile,BufRead *.tf setf terraform
-  au BufNewFile,BufRead *.tfvars setf terraform
-  au BufNewFile,BufRead *.workflow setf terraform
+  au BufNewFile,BufRead *.hcl call s:Setf('terraform')
+  au BufNewFile,BufRead *.nomad call s:Setf('terraform')
+  au BufNewFile,BufRead *.tf call s:Setf('terraform')
+  au BufNewFile,BufRead *.tfvars call s:Setf('terraform')
+  au BufNewFile,BufRead *.workflow call s:Setf('terraform')
 endif
 
 if !has_key(s:disabled_packages, 'textile')
-  au BufNewFile,BufRead *.textile setf textile
+  au BufNewFile,BufRead *.textile call s:Setf('textile')
 endif
 
 if !has_key(s:disabled_packages, 'thrift')
-  au BufNewFile,BufRead *.thrift setf thrift
+  au BufNewFile,BufRead *.thrift call s:Setf('thrift')
 endif
 
 if !has_key(s:disabled_packages, 'tmux')
-  au BufNewFile,BufRead {.,}tmux.conf setf tmux
+  au BufNewFile,BufRead {.,}tmux.conf call s:Setf('tmux')
 endif
 
 if !has_key(s:disabled_packages, 'toml')
-  au BufNewFile,BufRead *.toml setf toml
-  au BufNewFile,BufRead */.cargo/config setf toml
-  au BufNewFile,BufRead */.cargo/credentials setf toml
-  au BufNewFile,BufRead Cargo.lock setf toml
-  au BufNewFile,BufRead Gopkg.lock setf toml
-  au BufNewFile,BufRead Pipfile setf toml
-  au BufNewFile,BufRead poetry.lock setf toml
+  au BufNewFile,BufRead *.toml call s:Setf('toml')
+  au BufNewFile,BufRead */.cargo/config call s:Setf('toml')
+  au BufNewFile,BufRead */.cargo/credentials call s:Setf('toml')
+  au BufNewFile,BufRead Cargo.lock call s:Setf('toml')
+  au BufNewFile,BufRead Gopkg.lock call s:Setf('toml')
+  au BufNewFile,BufRead Pipfile call s:Setf('toml')
+  au BufNewFile,BufRead poetry.lock call s:Setf('toml')
 endif
 
 if !has_key(s:disabled_packages, 'tptp')
-  au BufNewFile,BufRead *.ax setf tptp
-  au BufNewFile,BufRead *.p setf tptp
-  au BufNewFile,BufRead *.tptp setf tptp
+  au BufNewFile,BufRead *.ax call s:Setf('tptp')
+  au BufNewFile,BufRead *.p call s:Setf('tptp')
+  au BufNewFile,BufRead *.tptp call s:Setf('tptp')
 endif
 
 if !has_key(s:disabled_packages, 'twig')
-  au BufNewFile,BufRead *.twig setf html.twig
-  au BufNewFile,BufRead *.xml.twig setf xml.twig
+  au BufNewFile,BufRead *.twig call s:Setf('html.twig')
+  au BufNewFile,BufRead *.xml.twig call s:Setf('xml.twig')
 endif
 
 if !has_key(s:disabled_packages, 'typescript')
-  au BufNewFile,BufRead *.ts setf typescript
-  au BufNewFile,BufRead *.tsx setf typescriptreact
+  au BufNewFile,BufRead *.ts call s:Setf('typescript')
+  au BufNewFile,BufRead *.tsx call s:Setf('typescriptreact')
 endif
 
 if !has_key(s:disabled_packages, 'unison')
-  au BufNewFile,BufRead *.u setf unison
-  au BufNewFile,BufRead *.uu setf unison
+  au BufNewFile,BufRead *.u call s:Setf('unison')
+  au BufNewFile,BufRead *.uu call s:Setf('unison')
 endif
 
 if !has_key(s:disabled_packages, 'v')
-  au BufNewFile,BufRead *.v setf v
+  au BufNewFile,BufRead *.v call s:Setf('v')
 endif
 
 if !has_key(s:disabled_packages, 'vala')
-  au BufNewFile,BufRead *.vala setf vala
-  au BufNewFile,BufRead *.valadoc setf vala
-  au BufNewFile,BufRead *.vapi setf vala
+  au BufNewFile,BufRead *.vala call s:Setf('vala')
+  au BufNewFile,BufRead *.valadoc call s:Setf('vala')
+  au BufNewFile,BufRead *.vapi call s:Setf('vala')
 endif
 
 if !has_key(s:disabled_packages, 'vbnet')
-  au BufNewFile,BufRead *.vb setf vbnet
-  au BufNewFile,BufRead *.vbhtml setf vbnet
+  au BufNewFile,BufRead *.vb call s:Setf('vbnet')
+  au BufNewFile,BufRead *.vbhtml call s:Setf('vbnet')
 endif
 
 if !has_key(s:disabled_packages, 'vcl')
-  au BufNewFile,BufRead *.vcl setf vcl
+  au BufNewFile,BufRead *.vcl call s:Setf('vcl')
 endif
 
 if !has_key(s:disabled_packages, 'velocity')
-  au BufNewFile,BufRead *.vm setf velocity
+  au BufNewFile,BufRead *.vm call s:Setf('velocity')
 endif
 
 if !has_key(s:disabled_packages, 'vmasm')
-  au BufNewFile,BufRead *.mar setf vmasm
+  au BufNewFile,BufRead *.mar call s:Setf('vmasm')
 endif
 
 if !has_key(s:disabled_packages, 'vue')
-  au BufNewFile,BufRead *.vue setf vue
-  au BufNewFile,BufRead *.wpy setf vue
+  au BufNewFile,BufRead *.vue call s:Setf('vue')
+  au BufNewFile,BufRead *.wpy call s:Setf('vue')
 endif
 
 if !has_key(s:disabled_packages, 'xdc')
-  au BufNewFile,BufRead *.xdc setf xdc
+  au BufNewFile,BufRead *.xdc call s:Setf('xdc')
 endif
 
-if !has_key(s:disabled_packages, 'xml')
-  au BufNewFile,BufRead *.adml setf xml
-  au BufNewFile,BufRead *.admx setf xml
-  au BufNewFile,BufRead *.ant setf xml
-  au BufNewFile,BufRead *.axml setf xml
-  au BufNewFile,BufRead *.builds setf xml
-  au BufNewFile,BufRead *.ccproj setf xml
-  au BufNewFile,BufRead *.ccxml setf xml
-  au BufNewFile,BufRead *.cdxml setf xml
-  au BufNewFile,BufRead *.clixml setf xml
-  au BufNewFile,BufRead *.cproject setf xml
-  au BufNewFile,BufRead *.cscfg setf xml
-  au BufNewFile,BufRead *.csdef setf xml
-  au BufNewFile,BufRead *.csl setf xml
-  au BufNewFile,BufRead *.csproj setf xml
-  au BufNewFile,BufRead *.ct setf xml
-  au BufNewFile,BufRead *.depproj setf xml
-  au BufNewFile,BufRead *.dita setf xml
-  au BufNewFile,BufRead *.ditamap setf xml
-  au BufNewFile,BufRead *.ditaval setf xml
-  au BufNewFile,BufRead *.dll.config setf xml
-  au BufNewFile,BufRead *.dotsettings setf xml
-  au BufNewFile,BufRead *.filters setf xml
-  au BufNewFile,BufRead *.fsproj setf xml
-  au BufNewFile,BufRead *.fxml setf xml
-  au BufNewFile,BufRead *.glade setf xml
-  au BufNewFile,BufRead *.gml setf xml
-  au BufNewFile,BufRead *.gmx setf xml
-  au BufNewFile,BufRead *.grxml setf xml
-  au BufNewFile,BufRead *.gst setf xml
-  au BufNewFile,BufRead *.iml setf xml
-  au BufNewFile,BufRead *.ivy setf xml
-  au BufNewFile,BufRead *.jelly setf xml
-  au BufNewFile,BufRead *.jsproj setf xml
-  au BufNewFile,BufRead *.kml setf xml
-  au BufNewFile,BufRead *.launch setf xml
-  au BufNewFile,BufRead *.mdpolicy setf xml
-  au BufNewFile,BufRead *.mjml setf xml
-  au BufNewFile,BufRead *.mm setf xml
-  au BufNewFile,BufRead *.mod setf xml
-  au BufNewFile,BufRead *.mxml setf xml
-  au BufNewFile,BufRead *.natvis setf xml
-  au BufNewFile,BufRead *.ncl setf xml
-  au BufNewFile,BufRead *.ndproj setf xml
-  au BufNewFile,BufRead *.nproj setf xml
-  au BufNewFile,BufRead *.nuspec setf xml
-  au BufNewFile,BufRead *.odd setf xml
-  au BufNewFile,BufRead *.osm setf xml
-  au BufNewFile,BufRead *.pkgproj setf xml
-  au BufNewFile,BufRead *.pluginspec setf xml
-  au BufNewFile,BufRead *.proj setf xml
-  au BufNewFile,BufRead *.props setf xml
-  au BufNewFile,BufRead *.ps1xml setf xml
-  au BufNewFile,BufRead *.psc1 setf xml
-  au BufNewFile,BufRead *.pt setf xml
-  au BufNewFile,BufRead *.rdf setf xml
-  au BufNewFile,BufRead *.resx setf xml
-  au BufNewFile,BufRead *.rss setf xml
-  au BufNewFile,BufRead *.sch setf xml
-  au BufNewFile,BufRead *.scxml setf xml
-  au BufNewFile,BufRead *.sfproj setf xml
-  au BufNewFile,BufRead *.shproj setf xml
-  au BufNewFile,BufRead *.srdf setf xml
-  au BufNewFile,BufRead *.storyboard setf xml
-  au BufNewFile,BufRead *.sublime-snippet setf xml
-  au BufNewFile,BufRead *.targets setf xml
-  au BufNewFile,BufRead *.tml setf xml
-  au BufNewFile,BufRead *.ui setf xml
-  au BufNewFile,BufRead *.urdf setf xml
-  au BufNewFile,BufRead *.ux setf xml
-  au BufNewFile,BufRead *.vbproj setf xml
-  au BufNewFile,BufRead *.vcxproj setf xml
-  au BufNewFile,BufRead *.vsixmanifest setf xml
-  au BufNewFile,BufRead *.vssettings setf xml
-  au BufNewFile,BufRead *.vstemplate setf xml
-  au BufNewFile,BufRead *.vxml setf xml
-  au BufNewFile,BufRead *.wixproj setf xml
-  au BufNewFile,BufRead *.workflow setf xml
-  au BufNewFile,BufRead *.wsdl setf xml
-  au BufNewFile,BufRead *.wsf setf xml
-  au BufNewFile,BufRead *.wxi setf xml
-  au BufNewFile,BufRead *.wxl setf xml
-  au BufNewFile,BufRead *.wxs setf xml
-  au BufNewFile,BufRead *.x3d setf xml
-  au BufNewFile,BufRead *.xacro setf xml
-  au BufNewFile,BufRead *.xaml setf xml
-  au BufNewFile,BufRead *.xib setf xml
-  au BufNewFile,BufRead *.xlf setf xml
-  au BufNewFile,BufRead *.xliff setf xml
-  au BufNewFile,BufRead *.xmi setf xml
-  au BufNewFile,BufRead *.xml setf xml
-  au BufNewFile,BufRead *.xml.dist setf xml
-  au BufNewFile,BufRead *.xproj setf xml
-  au BufNewFile,BufRead *.xsd setf xml
-  au BufNewFile,BufRead *.xspec setf xml
-  au BufNewFile,BufRead *.xul setf xml
-  au BufNewFile,BufRead *.zcml setf xml
-  au BufNewFile,BufRead {.,}classpath setf xml
-  au BufNewFile,BufRead {.,}cproject setf xml
-  au BufNewFile,BufRead {.,}project setf xml
-  au BufNewFile,BufRead App.config setf xml
-  au BufNewFile,BufRead NuGet.config setf xml
-  au BufNewFile,BufRead Settings.StyleCop setf xml
-  au BufNewFile,BufRead Web.Debug.config setf xml
-  au BufNewFile,BufRead Web.Release.config setf xml
-  au BufNewFile,BufRead Web.config setf xml
-  au BufNewFile,BufRead packages.config setf xml
+if !has_key(s:disabled_packages, 'xsl')
+  au BufNewFile,BufRead *.xsl call s:Setf('xsl')
+  au BufNewFile,BufRead *.xslt call s:Setf('xsl')
 endif
 
-if !has_key(s:disabled_packages, 'xsl')
-  au BufNewFile,BufRead *.xsl setf xsl
-  au BufNewFile,BufRead *.xslt setf xsl
+if !has_key(s:disabled_packages, 'yaml')
+  au BufNewFile,BufRead *.mir call s:Setf('yaml')
+  au BufNewFile,BufRead *.reek call s:Setf('yaml')
+  au BufNewFile,BufRead *.rviz call s:Setf('yaml')
+  au BufNewFile,BufRead *.sublime-syntax call s:Setf('yaml')
+  au BufNewFile,BufRead *.syntax call s:Setf('yaml')
+  au BufNewFile,BufRead *.yaml call s:Setf('yaml')
+  au BufNewFile,BufRead *.yaml-tmlanguage call s:Setf('yaml')
+  au BufNewFile,BufRead *.yaml.sed call s:Setf('yaml')
+  au BufNewFile,BufRead *.yml call s:Setf('yaml')
+  au BufNewFile,BufRead *.yml.mysql call s:Setf('yaml')
+  au BufNewFile,BufRead {.,}clang-format call s:Setf('yaml')
+  au BufNewFile,BufRead {.,}clang-tidy call s:Setf('yaml')
+  au BufNewFile,BufRead {.,}gemrc call s:Setf('yaml')
+  au BufNewFile,BufRead fish_history call s:Setf('yaml')
+  au BufNewFile,BufRead fish_read_history call s:Setf('yaml')
+  au BufNewFile,BufRead glide.lock call s:Setf('yaml')
+  au BufNewFile,BufRead yarn.lock call s:Setf('yaml')
 endif
 
 if !has_key(s:disabled_packages, 'ansible')
   au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
-  au BufNewFile,BufRead handlers.*.y{a,}ml setf yaml.ansible
+  au BufNewFile,BufRead handlers.*.y{a,}ml call s:Setf('yaml.ansible')
   au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
-  au BufNewFile,BufRead local.y{a,}ml setf yaml.ansible
-  au BufNewFile,BufRead main.y{a,}ml setf yaml.ansible
-  au BufNewFile,BufRead playbook.y{a,}ml setf yaml.ansible
-  au BufNewFile,BufRead requirements.y{a,}ml setf yaml.ansible
-  au BufNewFile,BufRead roles.*.y{a,}ml setf yaml.ansible
-  au BufNewFile,BufRead site.y{a,}ml setf yaml.ansible
-  au BufNewFile,BufRead tasks.*.y{a,}ml setf yaml.ansible
-endif
-
-if !has_key(s:disabled_packages, 'yaml')
-  au BufNewFile,BufRead *.mir setf yaml
-  au BufNewFile,BufRead *.reek setf yaml
-  au BufNewFile,BufRead *.rviz setf yaml
-  au BufNewFile,BufRead *.sublime-syntax setf yaml
-  au BufNewFile,BufRead *.syntax setf yaml
-  au BufNewFile,BufRead *.yaml setf yaml
-  au BufNewFile,BufRead *.yaml-tmlanguage setf yaml
-  au BufNewFile,BufRead *.yaml.sed setf yaml
-  au BufNewFile,BufRead *.yml setf yaml
-  au BufNewFile,BufRead *.yml.mysql setf yaml
-  au BufNewFile,BufRead {.,}clang-format setf yaml
-  au BufNewFile,BufRead {.,}clang-tidy setf yaml
-  au BufNewFile,BufRead {.,}gemrc setf yaml
-  au BufNewFile,BufRead fish_history setf yaml
-  au BufNewFile,BufRead fish_read_history setf yaml
-  au BufNewFile,BufRead glide.lock setf yaml
-  au BufNewFile,BufRead yarn.lock setf yaml
+  au BufNewFile,BufRead local.y{a,}ml call s:Setf('yaml.ansible')
+  au BufNewFile,BufRead main.y{a,}ml call s:Setf('yaml.ansible')
+  au BufNewFile,BufRead playbook.y{a,}ml call s:Setf('yaml.ansible')
+  au BufNewFile,BufRead requirements.y{a,}ml call s:Setf('yaml.ansible')
+  au BufNewFile,BufRead roles.*.y{a,}ml call s:Setf('yaml.ansible')
+  au BufNewFile,BufRead site.y{a,}ml call s:Setf('yaml.ansible')
+  au BufNewFile,BufRead tasks.*.y{a,}ml call s:Setf('yaml.ansible')
 endif
 
 if !has_key(s:disabled_packages, 'helm')
-  au BufNewFile,BufRead */templates/*.tpl setf helm
-  au BufNewFile,BufRead */templates/*.yaml setf helm
+  au BufNewFile,BufRead */templates/*.tpl call s:Setf('helm')
+  au BufNewFile,BufRead */templates/*.yaml call s:Setf('helm')
 endif
 
 if !has_key(s:disabled_packages, 'help')
-  au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt setf help
+  au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt call s:Setf('help')
 endif
 
 if !has_key(s:disabled_packages, 'zephir')
-  au BufNewFile,BufRead *.zep setf zephir
+  au BufNewFile,BufRead *.zep call s:Setf('zephir')
 endif
 
 if !has_key(s:disabled_packages, 'zig')
-  au BufNewFile,BufRead *.zir setf zir
-  au BufNewFile,BufRead *.zig setf zig
-  au BufNewFile,BufRead *.zir setf zig
+  au BufNewFile,BufRead *.zir call s:Setf('zir')
+  au BufNewFile,BufRead *.zig call s:Setf('zig')
+  au BufNewFile,BufRead *.zir call s:Setf('zig')
 endif
 
 if !has_key(s:disabled_packages, 'trasys')
@@ -1876,40 +1883,39 @@ if !has_key(s:disabled_packages, 'trasys')
 endif
 
 if !has_key(s:disabled_packages, 'basic')
-  au BufNewFile,BufRead *.basic setf basic
+  au BufNewFile,BufRead *.basic call s:Setf('basic')
 endif
 
 if !has_key(s:disabled_packages, 'visual-basic')
-  au BufNewFile,BufRead *.cls setf vb
-  au BufNewFile,BufRead *.ctl setf vb
-  au BufNewFile,BufRead *.dsm setf vb
-  au BufNewFile,BufRead *.frm setf vb
-  au BufNewFile,BufRead *.frx setf vb
-  au BufNewFile,BufRead *.sba setf vb
-  au BufNewFile,BufRead *.vba setf vb
-  au BufNewFile,BufRead *.vbs setf vb
+  au BufNewFile,BufRead *.cls call s:Setf('vb')
+  au BufNewFile,BufRead *.ctl call s:Setf('vb')
+  au BufNewFile,BufRead *.dsm call s:Setf('vb')
+  au BufNewFile,BufRead *.frm call s:Setf('vb')
+  au BufNewFile,BufRead *.frx call s:Setf('vb')
+  au BufNewFile,BufRead *.sba call s:Setf('vb')
+  au BufNewFile,BufRead *.vba call s:Setf('vb')
+  au BufNewFile,BufRead *.vbs call s:Setf('vb')
   au! BufNewFile,BufRead *.bas call polyglot#DetectBasFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'dosini')
-  au BufNewFile,BufRead *.cfg setf dosini
-  au BufNewFile,BufRead *.dof setf dosini
-  au BufNewFile,BufRead *.ini setf dosini
-  au BufNewFile,BufRead *.lektorproject setf dosini
-  au BufNewFile,BufRead *.prefs setf dosini
-  au BufNewFile,BufRead *.pro setf dosini
-  au BufNewFile,BufRead *.properties setf dosini
-  au BufNewFile,BufRead */etc/pacman.conf setf dosini
-  au BufNewFile,BufRead */etc/yum.conf setf dosini
+  au BufNewFile,BufRead *.dof call s:Setf('dosini')
+  au BufNewFile,BufRead *.ini call s:Setf('dosini')
+  au BufNewFile,BufRead *.lektorproject call s:Setf('dosini')
+  au BufNewFile,BufRead *.prefs call s:Setf('dosini')
+  au BufNewFile,BufRead *.pro call s:Setf('dosini')
+  au BufNewFile,BufRead *.properties call s:Setf('dosini')
+  au BufNewFile,BufRead */etc/pacman.conf call s:Setf('dosini')
+  au BufNewFile,BufRead */etc/yum.conf call s:Setf('dosini')
   au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
-  au BufNewFile,BufRead {.,}editorconfig setf dosini
-  au BufNewFile,BufRead {.,}npmrc setf dosini
-  au BufNewFile,BufRead buildozer.spec setf dosini
+  au BufNewFile,BufRead {.,}editorconfig call s:Setf('dosini')
+  au BufNewFile,BufRead {.,}npmrc call s:Setf('dosini')
+  au BufNewFile,BufRead buildozer.spec call s:Setf('dosini')
   au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
 endif
 
 if !has_key(s:disabled_packages, 'odin')
-  au BufNewFile,BufRead *.odin setf odin
+  au BufNewFile,BufRead *.odin call s:Setf('odin')
 endif
 
 
diff --git a/packages.yaml b/packages.yaml
index c2e0d3122..372abc947 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1197,7 +1197,6 @@ remote: StanAngeloff/php.vim
 filetypes:
 - name: php
   linguist: PHP
-# Needs to be after .php (can be .blade.php)
 ---
 name: blade
 remote: jwalton512/vim-blade
@@ -1825,6 +1824,8 @@ filetypes:
   - 'php.ini-*'
   - '*/etc/yum.conf'
   - '*/etc/yum.repos.d/*'
+  ignored_extensions:
+  - cfg
   ignored_warnings:
   - php.ini
 ---
diff --git a/scripts/build b/scripts/build
index b100b80a4..07bc301bf 100755
--- a/scripts/build
+++ b/scripts/build
@@ -29,15 +29,8 @@ def load_data()
 
   deps = Hash.new { |h, k| h[k] = [] }
 
-  for package in packages.values
-    for name in [package.fetch("after", [])].flatten
-      packages[name] or raise "#{package["name"]} depends on unknown package: #{name}"
-      deps[name] << package["name"]
-    end
-  end
-
   each_node = lambda {|&b| packages.keys.each(&b) }
-  each_child = lambda {|n, &b| deps[n].each(&b) }
+  each_child = lambda {|n, &b| [packages[n].fetch("after", [])].flatten.each(&b) }
 
   languages = load_languages
 
@@ -327,13 +320,13 @@ def rule_to_code(rule)
   if rule.has_key?("override")
     return <<~EOS
       if exists("#{rule["override"]}")
-        exe "setf " . #{rule["override"]} | return
+        call s:Setf(#{rule["override"]}) | return
       endif
     EOS
   end
 
   if rule.has_key?("filetype")
-    return "setf #{rule["filetype"]} | return"
+    return "call s:Setf('#{rule["filetype"]}') | return"
   end
 
   return ""
@@ -350,8 +343,7 @@ def extract(packages)
   FileUtils.rm_rf(all_dirs)
 
   output = []
-  # We need to reverse packages so they are included in proper order
-  packages.reverse.map do |package|
+  packages.map do |package|
     repo, branch, path, dir = parse_remote(package["remote"])
     dirs = package.fetch("dirs", default_dirs)
     ignored_dirs = package.fetch("ignored_dirs", [])
@@ -462,7 +454,7 @@ def generate_ftdetect(packages, heuristics)
       name = filetype.fetch("name")
       syntax = filetype["syntax"] ? " | set syntax=#{filetype["syntax"]}" : ""
 
-      set_command = "setf #{name}"
+      set_command = "call s:Setf('#{name}')"
 
       if filetype["syntax"]
         set_command = "if !did_filetype() | set ft=#{name} syntax=#{filetype["syntax"]} | endif"
@@ -544,6 +536,14 @@ def generate_ftdetect(packages, heuristics)
     let s:cpo_save = &cpo
     set cpo&vim
 
+    " We need it because scripts.vim in vim uses "set ft=" which cannot be
+    " overridden with setf (and we can't use set ft= so our scripts.vim work)
+    func! s:Setf(ft)
+      if &filetype !~# '\<'.a:ft.'\>'
+        let &filetype = a:ft
+      endif
+    endfunc
+
     func! polyglot#Heuristics()
       " Try to detect filetype from shebang
       let l:filetype = polyglot#Shebang()
diff --git a/scripts/test b/scripts/test
index e5418fa46..9e023bb95 100755
--- a/scripts/test
+++ b/scripts/test
@@ -6,7 +6,7 @@ vim --clean -N -u <(echo "
   let &rtp='$PWD,'.&rtp
   let g:polyglot_test = 1
   source scripts/test_extensions.vim
-  \"source scripts/test_filetypes.vim
+  source scripts/test_filetypes.vim
   qa!
 ")
 
diff --git a/scripts/test_extensions.vim b/scripts/test_extensions.vim
index b0dad2988..f2aaf66c2 100644
--- a/scripts/test_extensions.vim
+++ b/scripts/test_extensions.vim
@@ -6,7 +6,7 @@ function! TestExtension(filetype, filename, content)
     1delete _
     filetype detect
     exec "if &filetype != '" . a:filetype . "' \nthrow &filetype\nendif"
-    exec ":q!"
+    exec ":bw!"
   catch
     echo g:message
     echo "Filename '" . a:filename  . "' does not resolve to extension '" . a:filetype . "'"
diff --git a/scripts/test_filetypes.vim b/scripts/test_filetypes.vim
index 4d7cc0d8c..a84b39e37 100644
--- a/scripts/test_filetypes.vim
+++ b/scripts/test_filetypes.vim
@@ -11,6 +11,7 @@ function! TestFiletype(filetype)
 endfunction
 
 call TestFiletype('8th')
+call TestFiletype('haproxy')
 call TestFiletype('a2ps')
 call TestFiletype('a65')
 call TestFiletype('aap')
@@ -26,16 +27,20 @@ call TestFiletype('aidl')
 call TestFiletype('alsaconf')
 call TestFiletype('aml')
 call TestFiletype('ampl')
+call TestFiletype('xml')
 call TestFiletype('ant')
 call TestFiletype('apache')
 call TestFiletype('apiblueprint')
 call TestFiletype('applescript')
 call TestFiletype('aptconf')
 call TestFiletype('arch')
+call TestFiletype('cpp')
+call TestFiletype('c')
 call TestFiletype('arduino')
 call TestFiletype('art')
 call TestFiletype('asciidoc')
 call TestFiletype('autohotkey')
+call TestFiletype('elf')
 call TestFiletype('automake')
 call TestFiletype('asn')
 call TestFiletype('aspvbs')
@@ -44,9 +49,6 @@ call TestFiletype('atlas')
 call TestFiletype('autoit')
 call TestFiletype('ave')
 call TestFiletype('awk')
-call TestFiletype('reason')
-call TestFiletype('cpp')
-call TestFiletype('c')
 call TestFiletype('caddyfile')
 call TestFiletype('carp')
 call TestFiletype('clojure')
@@ -61,7 +63,6 @@ call TestFiletype('cucumber')
 call TestFiletype('cuesheet')
 call TestFiletype('dart')
 call TestFiletype('dhall')
-call TestFiletype('grub')
 call TestFiletype('d')
 call TestFiletype('dcov')
 call TestFiletype('dd')
@@ -69,7 +70,6 @@ call TestFiletype('ddoc')
 call TestFiletype('dsdl')
 call TestFiletype('Dockerfile')
 call TestFiletype('yaml.docker-compose')
-call TestFiletype('elf')
 call TestFiletype('elixir')
 call TestFiletype('eelixir')
 call TestFiletype('elm')
@@ -81,23 +81,26 @@ call TestFiletype('ferm')
 call TestFiletype('fish')
 call TestFiletype('fbs')
 call TestFiletype('forth')
+call TestFiletype('glsl')
 call TestFiletype('fsharp')
 call TestFiletype('gdscript3')
 call TestFiletype('gitconfig')
 call TestFiletype('gitrebase')
 call TestFiletype('gitsendemail')
 call TestFiletype('gitcommit')
-call TestFiletype('glsl')
 call TestFiletype('gmpl')
 call TestFiletype('gnuplot')
 call TestFiletype('go')
 call TestFiletype('gomod')
 call TestFiletype('gohtmltmpl')
+call TestFiletype('javascript')
+call TestFiletype('flow')
+call TestFiletype('javascriptreact')
 call TestFiletype('graphql')
 call TestFiletype('groovy')
+call TestFiletype('grub')
 call TestFiletype('haml')
 call TestFiletype('mustache')
-call TestFiletype('haproxy')
 call TestFiletype('haskell')
 call TestFiletype('haxe')
 call TestFiletype('hcl')
@@ -109,9 +112,6 @@ call TestFiletype('idris')
 call TestFiletype('idris2')
 call TestFiletype('lidris2')
 call TestFiletype('ion')
-call TestFiletype('javascriptreact')
-call TestFiletype('javascript')
-call TestFiletype('flow')
 call TestFiletype('Jenkinsfile')
 call TestFiletype('jinja.html')
 call TestFiletype('jq')
@@ -131,7 +131,6 @@ call TestFiletype('log')
 call TestFiletype('lua')
 call TestFiletype('m4')
 call TestFiletype('mako')
-call TestFiletype('octave')
 call TestFiletype('mma')
 call TestFiletype('markdown')
 call TestFiletype('markdown.mdx')
@@ -152,12 +151,13 @@ call TestFiletype('ocamlbuild_tags')
 call TestFiletype('ocpbuild')
 call TestFiletype('ocpbuildroot')
 call TestFiletype('sexplib')
+call TestFiletype('octave')
 call TestFiletype('opencl')
 call TestFiletype('perl')
 call TestFiletype('sql')
 call TestFiletype('cql')
-call TestFiletype('blade')
 call TestFiletype('php')
+call TestFiletype('blade')
 call TestFiletype('plantuml')
 call TestFiletype('pony')
 call TestFiletype('ps1')
@@ -178,6 +178,7 @@ call TestFiletype('ragel')
 call TestFiletype('raku')
 call TestFiletype('raml')
 call TestFiletype('razor')
+call TestFiletype('reason')
 call TestFiletype('rst')
 call TestFiletype('ruby')
 call TestFiletype('eruby')
@@ -218,10 +219,9 @@ call TestFiletype('velocity')
 call TestFiletype('vmasm')
 call TestFiletype('vue')
 call TestFiletype('xdc')
-call TestFiletype('xml')
 call TestFiletype('xsl')
-call TestFiletype('yaml.ansible')
 call TestFiletype('yaml')
+call TestFiletype('yaml.ansible')
 call TestFiletype('helm')
 call TestFiletype('help')
 call TestFiletype('zephir')
diff --git a/syntax/html-1.vim b/syntax/html-1.vim
index ddca92d4c..633a157e7 100644
--- a/syntax/html-1.vim
+++ b/syntax/html-1.vim
@@ -1,37 +1,92 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 
 " Vim syntax file
-" Language:	HTML (version 5)
-" Maintainer:	Rodrigo Machado <rcmachado@gmail.com>
-" URL:		http://rm.blog.br/vim/syntax/html.vim
-" Last Change:  2009 Aug 19
+" Language:     HTML (version 5.1)
+"               SVG (SVG 1.1 Second Edition)
+"               MathML (MathML 3.0 Second Edition)
+" Last Change:  2017 Mar 07
 " License:      Public domain
 "               (but let me know if you like :) )
 "
-" Note: This file just adds the new tags from HTML 5
+" Note: This file just add new tags from HTML 5
 "       and don't replace default html.vim syntax file
 "
-" Modified:     othree <othree@gmail.com>
-" Changes:      update to Draft 28 August 2010
-"               add complete new attributes
-"               add wai-aria attributes
-"               add microdata attributes
-"               add rdfa attributes
+" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
+" Changes:      update to Draft 2016 Jan 13
+"               add microdata Attributes
+" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
+" URL:          http://rm.blog.br/vim/syntax/html.vim
+" Modified:     htdebeer <H.T.de.Beer@gmail.com>
+" Changes:      add common SVG elements and attributes for inline SVG
 
+" Patch 7.4.1142
+if has("patch-7.4-1142")
+  if has("win32")
+    syn iskeyword @,48-57,_,128-167,224-235,-
+  else
+    syn iskeyword @,48-57,_,192-255,-
+  endif
+endif
 
-syn keyword htmlTagName contained script
 " HTML 5 tags
 syn keyword htmlTagName contained article aside audio canvas command
 syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
-syn keyword htmlTagName contained header hgroup keygen mark meter menu nav output
-syn keyword htmlTagName contained progress time ruby rt rp section source summary time track video wbr
+syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
+syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
+syn keyword htmlTagName contained template content shadow slot
+syn keyword htmlTagName contained wbr bdi
+syn keyword htmlTagName contained picture
+
+" SVG tags
+" http://www.w3.org/TR/SVG/
+" as found in http://www.w3.org/TR/SVG/eltindex.html
+syn keyword htmlTagName contained svg 
+syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
+syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
+syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
+syn keyword htmlTagName contained clipPath color-profile cursor 
+syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
+syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
+syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
+syn keyword htmlTagName contained glyph glyphRef hkern 
+syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
+syn keyword htmlTagName contained missing-glyph mpath 
+syn keyword htmlTagName contained text textPath tref tspan vkern
+syn keyword htmlTagName contained metadata title
+
+" MathML tags
+" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
+syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
+syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
+syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
+syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
+syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
+syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
+syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
+syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
+syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
+syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
+syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
+syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
+syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
+syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
+syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
+syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
+syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
+syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
+syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
+syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
+
+" Custom Element
+syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
+syn match htmlTagName contained "[.0-9_a-z]\@<=-[-.0-9_a-z]*\>"
 
 " HTML 5 arguments
 " Core Attributes
 syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
-syn keyword htmlArg contained draggable hidden id lang spellcheck style tabindex title
+syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
 " Event-handler Attributes
-syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange 
+syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
 syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
 syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
 syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
@@ -40,55 +95,102 @@ syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress o
 syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
 syn keyword htmlArg contained onvolumechange onwaiting
 " XML Attributes
-syn keyword htmlArg contained xml:lang xml:space xml:base
+syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
 " new features
 " <body>
 syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
 syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
 " <video>, <audio>, <source>, <track>
-syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track
+syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
 " <form>, <input>, <button>
 syn keyword htmlArg contained form autocomplete autofocus list min max step
 syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
+syn keyword htmlArg contained required placeholder pattern
 " <command>, <details>, <time>
-syn keyword htmlArg contained label icon open datetime pubdate
+syn keyword htmlArg contained label icon open datetime-local pubdate
+" <script>
+syn keyword htmlArg contained async
+" <content>
+syn keyword htmlArg contained select
+" <iframe>
+syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest allowpresentation
+" <picture>
+syn keyword htmlArg contained srcset sizes
+" <a>
+syn keyword htmlArg contained download media
+" <script>, <style>
+syn keyword htmlArg contained nonce
+" <area>, <a>, <img>, <iframe>, <link>
+syn keyword htmlArg contained referrerpolicy
+" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
+syn keyword htmlArg contained integrity crossorigin
+" <link>
+syn keyword htmlArg contained prefetch 
+" syn keyword htmlArg contained preload
+" <img>
+syn keyword htmlArg contained decoding
+" https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
+syn keyword htmlArg contained onselectstart onselectionchange
+" https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/loading
+syn keyword htmlArg contained loading
 
 " Custom Data Attributes
-" http://dev.w3.org/html5/spec/Overview.html#custom-data-attribute
-syn match   htmlArg "\<\(data(\-[a-z]\+)\+\)=" contained
+" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
+syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Vendor Extension Attributes
+" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
+syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
 
 " Microdata
 " http://dev.w3.org/html5/md/
-syn keyword htmlArg contained item itemid itemscope itemtype itemprop 
-
-" RDFa
-" http://www.w3.org/TR/rdfa-syntax/#a_xhtmlrdfa_dtd
-syn keyword htmlArg contained about typeof property resource content datatype rel rev 
-
-" WAI-ARIA States and Properties
-" http://www.w3.org/TR/wai-aria/states_and_properties
-syn keyword htmlArg contained role
-" Global States and Properties
-syn match  htmlArg contained "\<aria-\(atomic\|busy\|controls\|describedby\)\>"
-syn match  htmlArg contained "\<aria-\(disabled\|dropeffect\|flowto\|grabbed\)\>"
-syn match  htmlArg contained "\<aria-\(haspopup\|hidden\|invalid\|label\)\>"
-syn match  htmlArg contained "\<aria-\(labelledby\|live\|owns\|relevant\)\>"
-
-" Widget Attributes
-syn match  htmlArg contained "\<aria-\(autocomplete\|checked\|disabled\|expanded\)\>"
-syn match  htmlArg contained "\<aria-\(haspopup\|hidden\|invalid\|label\)\>"
-syn match  htmlArg contained "\<aria-\(level\|multiline\|multiselectable\|orientation\)\>"
-syn match  htmlArg contained "\<aria-\(pressed\|readonly\|required\|selected\)\>"
-syn match  htmlArg contained "\<aria-\(sort\|valuemax\|valuemin\|valuenow\|valuetext\|\)\>"
+syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
 
-" Live Region Attributes
-syn match  htmlArg contained "\<aria-\(atomic\|busy\|live\|relevant\|\)\>"
+" SVG
+" http://www.w3.org/TR/SVG/
+" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
+syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
+syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
+syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
+syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
+syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
+syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
+syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
+syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
+syn keyword htmlArg contained id ideographic in in2 intercept 
+syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
+syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
+syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
+syn keyword htmlArg contained numOctaves 
+syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
+syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
+syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
+syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
+syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
+syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
+syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
+syn keyword htmlArg contained width widths 
+syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
+syn keyword htmlArg contained y y1 y2 yChannelSelector 
+syn keyword htmlArg contained z zoomAndPan 
+syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
 
-" Drag-and-Drop attributes
-syn match  htmlArg contained "\<aria-\(dropeffect\|grabbed\)\>"
+" MathML attributes
+" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
+syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
+syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
+syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
+syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
+syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
+syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
+syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
+syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
+syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
+syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
+syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
+syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
+syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
+syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
 
-" Relationship Attributes
-syn match  htmlArg contained "\<aria-\(activedescendant\|controls\|describedby\|flowto\|\)\>"
-syn match  htmlArg contained "\<aria-\(labelledby\|owns\|posinset\|setsize\|\)\>"
 
 endif
diff --git a/syntax/html-2.vim b/syntax/html-2.vim
index 633a157e7..ddca92d4c 100644
--- a/syntax/html-2.vim
+++ b/syntax/html-2.vim
@@ -1,92 +1,37 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
 
 " Vim syntax file
-" Language:     HTML (version 5.1)
-"               SVG (SVG 1.1 Second Edition)
-"               MathML (MathML 3.0 Second Edition)
-" Last Change:  2017 Mar 07
+" Language:	HTML (version 5)
+" Maintainer:	Rodrigo Machado <rcmachado@gmail.com>
+" URL:		http://rm.blog.br/vim/syntax/html.vim
+" Last Change:  2009 Aug 19
 " License:      Public domain
 "               (but let me know if you like :) )
 "
-" Note: This file just add new tags from HTML 5
+" Note: This file just adds the new tags from HTML 5
 "       and don't replace default html.vim syntax file
 "
-" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
-" Changes:      update to Draft 2016 Jan 13
-"               add microdata Attributes
-" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
-" URL:          http://rm.blog.br/vim/syntax/html.vim
-" Modified:     htdebeer <H.T.de.Beer@gmail.com>
-" Changes:      add common SVG elements and attributes for inline SVG
+" Modified:     othree <othree@gmail.com>
+" Changes:      update to Draft 28 August 2010
+"               add complete new attributes
+"               add wai-aria attributes
+"               add microdata attributes
+"               add rdfa attributes
 
-" Patch 7.4.1142
-if has("patch-7.4-1142")
-  if has("win32")
-    syn iskeyword @,48-57,_,128-167,224-235,-
-  else
-    syn iskeyword @,48-57,_,192-255,-
-  endif
-endif
 
+syn keyword htmlTagName contained script
 " HTML 5 tags
 syn keyword htmlTagName contained article aside audio canvas command
 syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
-syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
-syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
-syn keyword htmlTagName contained template content shadow slot
-syn keyword htmlTagName contained wbr bdi
-syn keyword htmlTagName contained picture
-
-" SVG tags
-" http://www.w3.org/TR/SVG/
-" as found in http://www.w3.org/TR/SVG/eltindex.html
-syn keyword htmlTagName contained svg 
-syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
-syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
-syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
-syn keyword htmlTagName contained clipPath color-profile cursor 
-syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
-syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
-syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
-syn keyword htmlTagName contained glyph glyphRef hkern 
-syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
-syn keyword htmlTagName contained missing-glyph mpath 
-syn keyword htmlTagName contained text textPath tref tspan vkern
-syn keyword htmlTagName contained metadata title
-
-" MathML tags
-" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
-syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
-syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
-syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
-syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
-syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
-syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
-syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
-syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
-syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
-syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
-syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
-syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
-syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
-syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
-syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
-syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
-syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
-syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
-syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
-syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
-
-" Custom Element
-syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
-syn match htmlTagName contained "[.0-9_a-z]\@<=-[-.0-9_a-z]*\>"
+syn keyword htmlTagName contained header hgroup keygen mark meter menu nav output
+syn keyword htmlTagName contained progress time ruby rt rp section source summary time track video wbr
 
 " HTML 5 arguments
 " Core Attributes
 syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
-syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
+syn keyword htmlArg contained draggable hidden id lang spellcheck style tabindex title
 " Event-handler Attributes
-syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
+syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange 
 syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
 syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
 syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
@@ -95,102 +40,55 @@ syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress o
 syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
 syn keyword htmlArg contained onvolumechange onwaiting
 " XML Attributes
-syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
+syn keyword htmlArg contained xml:lang xml:space xml:base
 " new features
 " <body>
 syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
 syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
 " <video>, <audio>, <source>, <track>
-syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
+syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track
 " <form>, <input>, <button>
 syn keyword htmlArg contained form autocomplete autofocus list min max step
 syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
-syn keyword htmlArg contained required placeholder pattern
 " <command>, <details>, <time>
-syn keyword htmlArg contained label icon open datetime-local pubdate
-" <script>
-syn keyword htmlArg contained async
-" <content>
-syn keyword htmlArg contained select
-" <iframe>
-syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest allowpresentation
-" <picture>
-syn keyword htmlArg contained srcset sizes
-" <a>
-syn keyword htmlArg contained download media
-" <script>, <style>
-syn keyword htmlArg contained nonce
-" <area>, <a>, <img>, <iframe>, <link>
-syn keyword htmlArg contained referrerpolicy
-" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
-syn keyword htmlArg contained integrity crossorigin
-" <link>
-syn keyword htmlArg contained prefetch 
-" syn keyword htmlArg contained preload
-" <img>
-syn keyword htmlArg contained decoding
-" https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
-syn keyword htmlArg contained onselectstart onselectionchange
-" https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/loading
-syn keyword htmlArg contained loading
+syn keyword htmlArg contained label icon open datetime pubdate
 
 " Custom Data Attributes
-" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
-syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
-
-" Vendor Extension Attributes
-" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
-syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+" http://dev.w3.org/html5/spec/Overview.html#custom-data-attribute
+syn match   htmlArg "\<\(data(\-[a-z]\+)\+\)=" contained
 
 " Microdata
 " http://dev.w3.org/html5/md/
-syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
+syn keyword htmlArg contained item itemid itemscope itemtype itemprop 
+
+" RDFa
+" http://www.w3.org/TR/rdfa-syntax/#a_xhtmlrdfa_dtd
+syn keyword htmlArg contained about typeof property resource content datatype rel rev 
+
+" WAI-ARIA States and Properties
+" http://www.w3.org/TR/wai-aria/states_and_properties
+syn keyword htmlArg contained role
+" Global States and Properties
+syn match  htmlArg contained "\<aria-\(atomic\|busy\|controls\|describedby\)\>"
+syn match  htmlArg contained "\<aria-\(disabled\|dropeffect\|flowto\|grabbed\)\>"
+syn match  htmlArg contained "\<aria-\(haspopup\|hidden\|invalid\|label\)\>"
+syn match  htmlArg contained "\<aria-\(labelledby\|live\|owns\|relevant\)\>"
+
+" Widget Attributes
+syn match  htmlArg contained "\<aria-\(autocomplete\|checked\|disabled\|expanded\)\>"
+syn match  htmlArg contained "\<aria-\(haspopup\|hidden\|invalid\|label\)\>"
+syn match  htmlArg contained "\<aria-\(level\|multiline\|multiselectable\|orientation\)\>"
+syn match  htmlArg contained "\<aria-\(pressed\|readonly\|required\|selected\)\>"
+syn match  htmlArg contained "\<aria-\(sort\|valuemax\|valuemin\|valuenow\|valuetext\|\)\>"
 
-" SVG
-" http://www.w3.org/TR/SVG/
-" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
-syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
-syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
-syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
-syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
-syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
-syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
-syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
-syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
-syn keyword htmlArg contained id ideographic in in2 intercept 
-syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
-syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
-syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
-syn keyword htmlArg contained numOctaves 
-syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
-syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
-syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
-syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
-syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
-syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
-syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
-syn keyword htmlArg contained width widths 
-syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
-syn keyword htmlArg contained y y1 y2 yChannelSelector 
-syn keyword htmlArg contained z zoomAndPan 
-syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
+" Live Region Attributes
+syn match  htmlArg contained "\<aria-\(atomic\|busy\|live\|relevant\|\)\>"
 
-" MathML attributes
-" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
-syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
-syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
-syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
-syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
-syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
-syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
-syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
-syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
-syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
-syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
-syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
-syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
-syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
-syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
+" Drag-and-Drop attributes
+syn match  htmlArg contained "\<aria-\(dropeffect\|grabbed\)\>"
 
+" Relationship Attributes
+syn match  htmlArg contained "\<aria-\(activedescendant\|controls\|describedby\|flowto\|\)\>"
+syn match  htmlArg contained "\<aria-\(labelledby\|owns\|posinset\|setsize\|\)\>"
 
 endif

From 17c2b630e1f0f0f02a24fcc664f0df91122e8e00 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 16 Sep 2020 15:50:39 +0200
Subject: [PATCH 052/299] Write heuristics for perl, closes #550

---
 README.md                   |   5 +-
 autoload/polyglot.vim       | 103 +++++++++++++++++++--
 autoload/sleuth.vim         |   8 ++
 ftdetect/polyglot.vim       | 141 ++++++++++++++++++++++++-----
 ftplugin/bzl.vim            |  98 ++++++++++++++++++++
 ftplugin/prolog.vim         |  24 +++++
 heuristics.yaml             |  69 +++++++++++++-
 indent/bzl.vim              |  98 ++++++++++++++++++++
 indent/prolog.vim           |  71 +++++++++++++++
 packages.yaml               |  39 ++++++++
 scripts/build               |  21 +++--
 scripts/test_extensions.vim |  75 ++++++++++++++++
 scripts/test_filetypes.vim  |   8 ++
 syntax/bzl.vim              |  20 +++++
 syntax/prolog.vim           | 122 +++++++++++++++++++++++++
 syntax/tads.vim             | 175 ++++++++++++++++++++++++++++++++++++
 16 files changed, 1035 insertions(+), 42 deletions(-)
 create mode 100644 ftplugin/bzl.vim
 create mode 100644 ftplugin/prolog.vim
 create mode 100644 indent/bzl.vim
 create mode 100644 indent/prolog.vim
 create mode 100644 syntax/bzl.vim
 create mode 100644 syntax/prolog.vim
 create mode 100644 syntax/tads.vim

diff --git a/README.md b/README.md
index 72c32ae11..4034fc26e 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->196<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->199<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -81,6 +81,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [basic](https://github.com/vim/vim/tree/master/runtime)
 - [blade](https://github.com/jwalton512/vim-blade)
 - [brewfile](https://github.com/bfontaine/Brewfile.vim)
+- [bzl](https://github.com/vim/vim/tree/master/runtime)
 - [c/c++](https://github.com/vim-jp/vim-cpp)
 - [caddyfile](https://github.com/isobit/vim-caddyfile)
 - [carp](https://github.com/hellerve/carp-vim)
@@ -177,6 +178,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [plantuml](https://github.com/aklt/plantuml-syntax)
 - [pony](https://github.com/jakwings/vim-pony)
 - [powershell](https://github.com/PProvost/vim-ps1)
+- [prolog](https://github.com/vim/vim/tree/master/runtime)
 - [protobuf](https://github.com/uarun/vim-protobuf)
 - [pug](https://github.com/digitaltoad/vim-pug)
 - [puppet](https://github.com/rodjek/vim-puppet)
@@ -213,6 +215,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [swift](https://github.com/keith/swift.vim)
 - [sxhkd](https://github.com/baskerville/vim-sxhkdrc)
 - [systemd](https://github.com/wgwoods/vim-systemd-syntax)
+- [tads](https://github.com/vim/vim/tree/master/runtime)
 - [terraform](https://github.com/hashivim/vim-terraform)
 - [textile](https://github.com/timcharper/textile.vim)
 - [thrift](https://github.com/solarnz/thrift.vim)
diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index 29287ece8..5d4bfe9a7 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -10,11 +10,11 @@ func! s:Setf(ft)
   endif
 endfunc
 
-func! polyglot#Heuristics()
+func! polyglot#Shebang()
   " Try to detect filetype from shebang
-  let l:filetype = polyglot#Shebang()
-  if l:filetype != ""
-    exec "setf " . l:filetype
+  let ft = polyglot#ShebangFiletype()
+  if ft != ""
+    call s:Setf(ft)
     return 1
   endif
 
@@ -52,6 +52,8 @@ let s:interpreters = {
   \ 'cperl': 'perl',
   \ 'perl': 'perl',
   \ 'php': 'php',
+  \ 'swipl': 'prolog',
+  \ 'yap': 'prolog',
   \ 'pwsh': 'ps1',
   \ 'python': 'python',
   \ 'python2': 'python',
@@ -95,7 +97,7 @@ let s:r_hashbang = '^#!\s*\(\S\+\)\s*\(.*\)\s*'
 let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
 let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
 
-func! polyglot#Shebang()
+func! polyglot#ShebangFiletype()
   let l:line1 = getline(1)
 
   if l:line1 !~# "^#!"
@@ -133,7 +135,7 @@ func! polyglot#Shebang()
 endfunc
 
 func! polyglot#DetectInpFiletype()
-  let line = getline(1)
+  let line = getline(nextnonblank(1))
   if line =~# '^\*'
     call s:Setf('abaqus') | return
   endif
@@ -269,10 +271,10 @@ func! polyglot#DetectIdrFiletype()
     if line =~# '^%access .*'
       call s:Setf('idris') | return
     endif
-    if exists("g:filetype_idr")
-      call s:Setf(g:filetype_idr) | return
-    endif
   endfor
+  if exists("g:filetype_idr")
+    call s:Setf(g:filetype_idr) | return
+  endif
   call s:Setf('idris2') | return
 endfunc
 
@@ -296,6 +298,89 @@ func! polyglot#DetectBasFiletype()
   call s:Setf('basic') | return
 endfunc
 
+func! polyglot#DetectPmFiletype()
+  let line = getline(nextnonblank(1))
+  if line =~# 'XPM2'
+    call s:Setf('xpm2') | return
+  endif
+  if line =~# 'XPM'
+    call s:Setf('xpm') | return
+  endif
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
+      call s:Setf('raku') | return
+    endif
+    if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
+      call s:Setf('perl') | return
+    endif
+  endfor
+  if exists("g:filetype_pm")
+    call s:Setf(g:filetype_pm) | return
+  endif
+  call s:Setf('perl') | return
+endfunc
+
+func! polyglot#DetectPlFiletype()
+  let line = getline(nextnonblank(1))
+  if line =~# '^[^#]*:-' || line =~# '^\s*\%(%\|/\*\)' || line =~# '\.\s*$'
+    call s:Setf('prolog') | return
+  endif
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
+      call s:Setf('raku') | return
+    endif
+    if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
+      call s:Setf('perl') | return
+    endif
+  endfor
+  if exists("g:filetype_pl")
+    call s:Setf(g:filetype_pl) | return
+  endif
+  call s:Setf('perl') | return
+endfunc
+
+func! polyglot#DetectTFiletype()
+  for lnum in range(1, min([line("$"), 5]))
+    let line = getline(lnum)
+    if line =~# '^\.'
+      call s:Setf('nroff') | return
+    endif
+  endfor
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
+      call s:Setf('raku') | return
+    endif
+    if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
+      call s:Setf('perl') | return
+    endif
+  endfor
+  if exists("g:filetype_t")
+    call s:Setf(g:filetype_t) | return
+  endif
+  call s:Setf('perl') | return
+endfunc
+
+func! polyglot#DetectTt2Filetype()
+  for lnum in range(1, min([line("$"), 3]))
+    let line = getline(lnum)
+    if line =~? '<\%(!DOCTYPE HTML\|[%?]\|html\)'
+      call s:Setf('tt2html') | return
+    endif
+  endfor
+  call s:Setf('tt2') | return
+endfunc
+
+func! polyglot#DetectHtmlFiletype()
+  let line = getline(nextnonblank(1))
+  if line =~# '^\(%\|<[%&].*>\)'
+    call s:Setf('mason') | return
+  endif
+  call s:Setf('html') | return
+endfunc
+
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index c1de82cd1..ae101289a 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -38,6 +38,7 @@ let s:globs = {
   \ 'basic': '*.basic',
   \ 'blade': '*.blade,*.blade.php',
   \ 'brewfile': 'Brewfile',
+  \ 'bzl': '*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE',
   \ 'c': '*.c,*.cats,*.h,*.idc,*.qc',
   \ 'caddyfile': 'Caddyfile',
   \ 'carp': '*.carp',
@@ -129,6 +130,7 @@ let s:globs = {
   \ 'mako': '*.mako,*.mao',
   \ 'markdown': '*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr',
   \ 'markdown.mdx': '*.mdx',
+  \ 'mason': '*.mason,*.mhtml,*.comp',
   \ 'meson': 'meson.build,meson_options.txt',
   \ 'mma': '*.mathematica,*.cdf,*.m,*.ma,*.mt,*.nb,*.nbp,*.wl,*.wlt,*.wls,*.mma',
   \ 'moon': '*.moon',
@@ -151,7 +153,9 @@ let s:globs = {
   \ 'perl': '*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile',
   \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,Phakefile',
   \ 'plantuml': '*.puml,*.iuml,*.plantuml,*.uml,*.pu',
+  \ 'pod': '*.pod',
   \ 'pony': '*.pony',
+  \ 'prolog': '*.pl,*.pro,*.prolog,*.yap',
   \ 'proto': '*.proto',
   \ 'ps1': '*.ps1,*.psd1,*.psm1,*.pssc',
   \ 'ps1xml': '*.ps1xml',
@@ -190,6 +194,7 @@ let s:globs = {
   \ 'sxhkdrc': '*.sxhkdrc,sxhkdrc',
   \ 'systemd': '*.automount,*.mount,*.path,*.service,*.socket,*.swap,*.target,*.timer',
   \ 'tablegen': '*.td',
+  \ 'tads': '*.t',
   \ 'terraform': '*.hcl,*.nomad,*.tf,*.tfvars,*.workflow',
   \ 'textile': '*.textile',
   \ 'thrift': '*.thrift',
@@ -197,6 +202,8 @@ let s:globs = {
   \ 'toml': '*.toml,Cargo.lock,Gopkg.lock,poetry.lock,Pipfile',
   \ 'tptp': '*.p,*.tptp,*.ax',
   \ 'trasys': '*.inp',
+  \ 'tt2': '*.tt2',
+  \ 'tt2html': '*.tt2',
   \ 'typescript': '*.ts',
   \ 'typescriptreact': '*.tsx',
   \ 'unison': '*.u,*.uu',
@@ -211,6 +218,7 @@ let s:globs = {
   \ 'xdc': '*.xdc',
   \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
   \ 'xml.twig': '*.xml.twig',
+  \ 'xs': '*.xs',
   \ 'xsl': '*.xslt,*.xsl',
   \ 'yaml': '*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,glide.lock,yarn.lock,fish_history,fish_read_history',
   \ 'yaml.ansible': 'playbook.y{a,}ml,site.y{a,}ml,main.y{a,}ml,local.y{a,}ml,requirements.y{a,}ml,tasks.*.y{a,}ml,roles.*.y{a,}ml,handlers.*.y{a,}ml',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 41819e05e..1cd0efe75 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -75,13 +75,15 @@ endfunc
 " When using this, the entry should probably be further down below with the
 " other StarSetf() calls.
 func! s:StarSetf(ft)
-  if expand("<amatch>") !~ g:ft_ignore_pat
-    exe 'setf ' . a:ft
+  if expand("<amatch>") !~ g:ft_ignore_pat && &filetype !~# '\<'.a:ft.'\>'
+    let &filetype = a:ft
   endif
 endfunc
 
 augroup filetypedetect
 
+au! filetypedetect BufRead,BufNewFile,StdinReadPost *
+
 " filetypes
 
 if !has_key(s:disabled_packages, '8th')
@@ -92,6 +94,10 @@ if !has_key(s:disabled_packages, 'haproxy')
   au! BufRead,BufNewFile *.cfg
 endif
 
+if !has_key(s:disabled_packages, 'a2ps')
+  au! BufRead,BufNewFile */etc/a2ps.cfg,*/etc/a2ps/*.cfg,a2psrc,.a2psrc
+endif
+
 if !has_key(s:disabled_packages, 'a65')
   au! BufRead,BufNewFile *.a65
 endif
@@ -132,6 +138,10 @@ if !has_key(s:disabled_packages, 'aidl')
   au! BufRead,BufNewFile *.aidl
 endif
 
+if !has_key(s:disabled_packages, 'alsaconf')
+  au! BufRead,BufNewFile .asoundrc,*/usr/share/alsa/alsa.conf,*/etc/asound.conf
+endif
+
 if !has_key(s:disabled_packages, 'aml')
   au! BufRead,BufNewFile *.aml
 endif
@@ -144,12 +154,28 @@ if !has_key(s:disabled_packages, 'xml')
   au! BufRead,BufNewFile *.csproj,*.ui,*.wsdl,*.wsf,*.xlf,*.xliff,*.xmi,*.xsd,*.xul
 endif
 
+if !has_key(s:disabled_packages, 'ant')
+  au! BufRead,BufNewFile build.xml
+endif
+
+if !has_key(s:disabled_packages, 'apache')
+  au! BufRead,BufNewFile .htaccess,*/etc/httpd/*.conf,*/etc/apache2/sites-*/*.com,access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*,*/etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.d/*.conf*
+endif
+
 if !has_key(s:disabled_packages, 'applescript')
   au! BufRead,BufNewFile *.scpt
 endif
 
+if !has_key(s:disabled_packages, 'aptconf')
+  au! BufRead,BufNewFile apt.conf,*/.aptitude/config
+endif
+
+if !has_key(s:disabled_packages, 'arch')
+  au! BufRead,BufNewFile .arch-inventory,=tagging-method
+endif
+
 if !has_key(s:disabled_packages, 'c/c++')
-  au! BufRead,BufNewFile *.cpp,*.c++,*.cc,*.cxx,*.hh,*.hpp,*.hxx,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh,*.qc
+  au! BufRead,BufNewFile *.cpp,*.c++,*.cc,*.cxx,*.hh,*.hpp,*.hxx,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh,*.qc,*enlightenment/*.cfg
 endif
 
 if !has_key(s:disabled_packages, 'arduino')
@@ -172,6 +198,10 @@ if !has_key(s:disabled_packages, 'elf')
   au! BufRead,BufNewFile *.am
 endif
 
+if !has_key(s:disabled_packages, 'automake')
+  au! BufRead,BufNewFile GNUmakefile.am
+endif
+
 if !has_key(s:disabled_packages, 'asn')
   au! BufRead,BufNewFile *.asn,*.asn1
 endif
@@ -197,7 +227,7 @@ if !has_key(s:disabled_packages, 'clojure')
 endif
 
 if !has_key(s:disabled_packages, 'cmake')
-  au! BufRead,BufNewFile *.cmake,*.cmake.in
+  au! BufRead,BufNewFile *.cmake,*.cmake.in,CMakeLists.txt
 endif
 
 if !has_key(s:disabled_packages, 'cucumber')
@@ -213,7 +243,7 @@ if !has_key(s:disabled_packages, 'dlang')
 endif
 
 if !has_key(s:disabled_packages, 'dockerfile')
-  au! BufRead,BufNewFile *.Dockerfile
+  au! BufRead,BufNewFile *.Dockerfile,Dockerfile
 endif
 
 if !has_key(s:disabled_packages, 'elm')
@@ -236,6 +266,10 @@ if !has_key(s:disabled_packages, 'fsharp')
   au! BufRead,BufNewFile *.fs
 endif
 
+if !has_key(s:disabled_packages, 'git')
+  au! BufRead,BufNewFile .gitconfig,.gitmodules,*.git/config,*/.config/git/config,*.git/modules/*/config,git-rebase-todo
+endif
+
 if !has_key(s:disabled_packages, 'gnuplot')
   au! BufRead,BufNewFile *.gp,*.gpi
 endif
@@ -256,6 +290,10 @@ if !has_key(s:disabled_packages, 'groovy')
   au! BufRead,BufNewFile *.groovy,*.gradle
 endif
 
+if !has_key(s:disabled_packages, 'grub')
+  au! BufRead,BufNewFile */boot/grub/menu.lst,*/boot/grub/grub.conf,*/etc/grub.conf
+endif
+
 if !has_key(s:disabled_packages, 'haml')
   au! BufRead,BufNewFile *.haml
 endif
@@ -273,7 +311,7 @@ if !has_key(s:disabled_packages, 'html5')
 endif
 
 if !has_key(s:disabled_packages, 'json')
-  au! BufRead,BufNewFile *.json,*.ice,*.webmanifest,*.yy,*.jsonp
+  au! BufRead,BufNewFile *.json,*.ice,*.webmanifest,*.yy,*.jsonp,Pipfile.lock
 endif
 
 if !has_key(s:disabled_packages, 'kotlin')
@@ -304,8 +342,12 @@ if !has_key(s:disabled_packages, 'markdown')
   au! BufRead,BufNewFile *.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn
 endif
 
+if !has_key(s:disabled_packages, 'meson')
+  au! BufRead,BufNewFile meson.build,meson_options.txt
+endif
+
 if !has_key(s:disabled_packages, 'ocaml')
-  au! BufRead,BufNewFile *.ml,*.mli,*.mll,*.mly
+  au! BufRead,BufNewFile *.ml,*.mli,*.mll,*.mly,.ocamlinit
 endif
 
 if !has_key(s:disabled_packages, 'opencl')
@@ -313,7 +355,7 @@ if !has_key(s:disabled_packages, 'opencl')
 endif
 
 if !has_key(s:disabled_packages, 'perl')
-  au! BufRead,BufNewFile *.al,*.plx,*.psgi,*.t
+  au! BufRead,BufNewFile *.al,*.plx,*.psgi,*.t,*.pod,*.mason,*.mhtml,*.comp,*.xs
 endif
 
 if !has_key(s:disabled_packages, 'php')
@@ -325,7 +367,7 @@ if !has_key(s:disabled_packages, 'protobuf')
 endif
 
 if !has_key(s:disabled_packages, 'python')
-  au! BufRead,BufNewFile *.py,*.pyi,*.pyw,*.spec
+  au! BufRead,BufNewFile *.py,*.pyi,*.pyw,*.spec,SConstruct
 endif
 
 if !has_key(s:disabled_packages, 'r-lang')
@@ -349,7 +391,7 @@ if !has_key(s:disabled_packages, 'rst')
 endif
 
 if !has_key(s:disabled_packages, 'ruby')
-  au! BufRead,BufNewFile *.rb,*.builder,*.gemspec,*.rake,*.rbw,*.ru,*.spec,*.rxml,*.rjs,*.rant,*.erb,*.rhtml
+  au! BufRead,BufNewFile *.rb,*.builder,*.gemspec,*.rake,*.rbw,*.ru,*.spec,*.rxml,*.rjs,*.rant,.irbrc,Gemfile,Rakefile,Rantfile,*.erb,*.rhtml
 endif
 
 if !has_key(s:disabled_packages, 'rust')
@@ -369,7 +411,7 @@ if !has_key(s:disabled_packages, 'scss')
 endif
 
 if !has_key(s:disabled_packages, 'sh')
-  au! BufRead,BufNewFile *.zsh
+  au! BufRead,BufNewFile *.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout
 endif
 
 if !has_key(s:disabled_packages, 'smt2')
@@ -388,6 +430,10 @@ if !has_key(s:disabled_packages, 'terraform')
   au! BufRead,BufNewFile *.tf
 endif
 
+if !has_key(s:disabled_packages, 'toml')
+  au! BufRead,BufNewFile Pipfile
+endif
+
 if !has_key(s:disabled_packages, 'twig')
   au! BufRead,BufNewFile *.twig
 endif
@@ -420,12 +466,24 @@ if !has_key(s:disabled_packages, 'yaml')
   au! BufRead,BufNewFile *.yml,*.yaml
 endif
 
+if !has_key(s:disabled_packages, 'help')
+  au! BufRead,BufNewFile $VIMRUNTIME/doc/*.txt
+endif
+
 if !has_key(s:disabled_packages, 'visual-basic')
   au! BufRead,BufNewFile *.vba,*.vbs,*.dsm,*.ctl,*.sba
 endif
 
 if !has_key(s:disabled_packages, 'dosini')
-  au! BufRead,BufNewFile *.ini,*.properties
+  au! BufRead,BufNewFile *.ini,*.properties,.editorconfig,.npmrc,*/etc/pacman.conf,php.ini-*,*/etc/yum.conf,*/etc/yum.repos.d/*
+endif
+
+if !has_key(s:disabled_packages, 'bzl')
+  au! BufRead,BufNewFile *.bzl,BUILD,WORKSPACE
+endif
+
+if !has_key(s:disabled_packages, 'tads')
+  au! BufRead,BufNewFile *.t
 endif
 
 if !has_key(s:disabled_packages, '8th')
@@ -1071,12 +1129,12 @@ endif
 
 if !has_key(s:disabled_packages, 'html5')
   au BufNewFile,BufRead *.htm call s:Setf('html')
-  au BufNewFile,BufRead *.html call s:Setf('html')
   au BufNewFile,BufRead *.html.hl call s:Setf('html')
   au BufNewFile,BufRead *.inc call s:Setf('html')
   au BufNewFile,BufRead *.st call s:Setf('html')
   au BufNewFile,BufRead *.xht call s:Setf('html')
   au BufNewFile,BufRead *.xhtml call s:Setf('html')
+  au! BufNewFile,BufRead *.html call polyglot#DetectHtmlFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'i3')
@@ -1365,15 +1423,21 @@ if !has_key(s:disabled_packages, 'perl')
   au BufNewFile,BufRead *.fcgi call s:Setf('perl')
   au BufNewFile,BufRead *.perl call s:Setf('perl')
   au BufNewFile,BufRead *.ph call s:Setf('perl')
-  au BufNewFile,BufRead *.pl call s:Setf('perl')
   au BufNewFile,BufRead *.plx call s:Setf('perl')
-  au BufNewFile,BufRead *.pm call s:Setf('perl')
   au BufNewFile,BufRead *.psgi call s:Setf('perl')
-  au BufNewFile,BufRead *.t call s:Setf('perl')
   au BufNewFile,BufRead Makefile.PL call s:Setf('perl')
   au BufNewFile,BufRead Rexfile call s:Setf('perl')
   au BufNewFile,BufRead ack call s:Setf('perl')
   au BufNewFile,BufRead cpanfile call s:Setf('perl')
+  au BufNewFile,BufRead *.pod call s:Setf('pod')
+  au BufNewFile,BufRead *.comp call s:Setf('mason')
+  au BufNewFile,BufRead *.mason call s:Setf('mason')
+  au BufNewFile,BufRead *.mhtml call s:Setf('mason')
+  au BufNewFile,BufRead *.xs call s:Setf('xs')
+  au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
+  au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
+  au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
+  au! BufNewFile,BufRead *.tt2 call polyglot#DetectTt2Filetype()
 endif
 
 if !has_key(s:disabled_packages, 'pgsql')
@@ -1517,17 +1581,17 @@ if !has_key(s:disabled_packages, 'raku')
   au BufNewFile,BufRead *.p6 call s:Setf('raku')
   au BufNewFile,BufRead *.p6l call s:Setf('raku')
   au BufNewFile,BufRead *.p6m call s:Setf('raku')
-  au BufNewFile,BufRead *.pl call s:Setf('raku')
   au BufNewFile,BufRead *.pl6 call s:Setf('raku')
-  au BufNewFile,BufRead *.pm call s:Setf('raku')
   au BufNewFile,BufRead *.pm6 call s:Setf('raku')
   au BufNewFile,BufRead *.pod6 call s:Setf('raku')
   au BufNewFile,BufRead *.raku call s:Setf('raku')
   au BufNewFile,BufRead *.rakudoc call s:Setf('raku')
   au BufNewFile,BufRead *.rakumod call s:Setf('raku')
   au BufNewFile,BufRead *.rakutest call s:Setf('raku')
-  au BufNewFile,BufRead *.t call s:Setf('raku')
   au BufNewFile,BufRead *.t6 call s:Setf('raku')
+  au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
+  au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
+  au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'raml')
@@ -1616,7 +1680,7 @@ if !has_key(s:disabled_packages, 'ruby')
 endif
 
 if !has_key(s:disabled_packages, 'rspec')
-  au BufNewFile,BufRead *_spec.rb if !did_filetype() | set ft=ruby syntax=rspec | endif
+  au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
 endif
 
 if !has_key(s:disabled_packages, 'brewfile')
@@ -1918,12 +1982,41 @@ if !has_key(s:disabled_packages, 'odin')
   au BufNewFile,BufRead *.odin call s:Setf('odin')
 endif
 
+if !has_key(s:disabled_packages, 'bzl')
+  au BufNewFile,BufRead *.bzl call s:Setf('bzl')
+  au BufNewFile,BufRead BUCK call s:Setf('bzl')
+  au BufNewFile,BufRead BUILD call s:Setf('bzl')
+  au BufNewFile,BufRead BUILD.bazel call s:Setf('bzl')
+  au BufNewFile,BufRead Tiltfile call s:Setf('bzl')
+  au BufNewFile,BufRead WORKSPACE call s:Setf('bzl')
+endif
+
+if !has_key(s:disabled_packages, 'prolog')
+  au BufNewFile,BufRead *.pro call s:Setf('prolog')
+  au BufNewFile,BufRead *.prolog call s:Setf('prolog')
+  au BufNewFile,BufRead *.yap call s:Setf('prolog')
+  au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
+endif
+
+if !has_key(s:disabled_packages, 'tads')
+  au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
+endif
+
 
 " end filetypes
 
-au BufNewFile,BufRead,StdinReadPost * 
-  \ if !did_filetype() && expand("<afile>") !~ g:ft_ignore_pat 
-  \ | call polyglot#Heuristics() | endif
+func! s:PolyglotFallback() 
+  if expand("<afile>") !~ g:ft_ignore_pat
+    if getline(1) =~# "^#!"
+      call polyglot#Shebang()
+    endif
+    if &filetype == ''
+      runtime! scripts.vim
+    endif
+  endif
+endfunc
+
+au BufNewFile,BufRead,StdinReadPost * call s:PolyglotFallback()
 
 augroup END
 
@@ -2123,7 +2216,7 @@ au VimEnter * call s:verify()
 func! s:observe_filetype()
   augroup polyglot-observer
     au! CursorHold,CursorHoldI <buffer>
-      \ if polyglot#Heuristics() | au! polyglot-observer CursorHold,CursorHoldI | endif
+      \ if polyglot#Shebang() | au! polyglot-observer CursorHold,CursorHoldI | endif
   augroup END
 endfunc
 
diff --git a/ftplugin/bzl.vim b/ftplugin/bzl.vim
new file mode 100644
index 000000000..3abebee9e
--- /dev/null
+++ b/ftplugin/bzl.vim
@@ -0,0 +1,98 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
+
+" Vim filetype plugin file
+" Language:	Bazel (http://bazel.io)
+" Maintainer:	David Barnett (https://github.com/google/vim-ft-bzl)
+" Last Change:	2015 Aug 11
+
+""
+" @section Introduction, intro
+" Core settings for the bzl filetype, used for BUILD and *.bzl files for the
+" Bazel build system (http://bazel.io/).
+
+if exists('b:did_ftplugin')
+  finish
+endif
+
+
+" Vim 7.4.051 has opinionated settings in ftplugin/python.vim that try to force
+" PEP8 conventions on every python file, but these conflict with Google's
+" indentation guidelines. As a workaround, we explicitly source the system
+" ftplugin, but save indentation settings beforehand and restore them after.
+let s:save_expandtab = &l:expandtab
+let s:save_shiftwidth = &l:shiftwidth
+let s:save_softtabstop = &l:softtabstop
+let s:save_tabstop = &l:tabstop
+
+" NOTE: Vim versions before 7.3.511 had a ftplugin/python.vim that was broken
+" for compatible mode.
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Load base python ftplugin (also defines b:did_ftplugin).
+source $VIMRUNTIME/ftplugin/python.vim
+
+" NOTE: Vim versions before 7.4.104 and later set this in ftplugin/python.vim.
+setlocal comments=b:#,fb:-
+
+" Restore pre-existing indentation settings.
+let &l:expandtab = s:save_expandtab
+let &l:shiftwidth = s:save_shiftwidth
+let &l:softtabstop = s:save_softtabstop
+let &l:tabstop = s:save_tabstop
+
+setlocal formatoptions-=t
+
+" Make gf work with imports in BUILD files.
+setlocal includeexpr=substitute(v:fname,'//','','')
+
+" Enable syntax-based folding, if specified.
+if get(g:, 'ft_bzl_fold', 0)
+  setlocal foldmethod=syntax
+  setlocal foldtext=BzlFoldText()
+endif
+
+if exists('*BzlFoldText')
+  finish
+endif
+
+function BzlFoldText() abort
+  let l:start_num = nextnonblank(v:foldstart)
+  let l:end_num = prevnonblank(v:foldend)
+
+  if l:end_num <= l:start_num + 1
+    " If the fold is empty, don't print anything for the contents.
+    let l:content = ''
+  else
+    " Otherwise look for something matching the content regex.
+    " And if nothing matches, print an ellipsis.
+    let l:content = '...'
+    for l:line in getline(l:start_num + 1, l:end_num - 1)
+      let l:content_match = matchstr(l:line, '\m\C^\s*name = \zs.*\ze,$')
+      if !empty(l:content_match)
+        let l:content = l:content_match
+        break
+      endif
+    endfor
+  endif
+
+  " Enclose content with start and end
+  let l:start_text = getline(l:start_num)
+  let l:end_text = substitute(getline(l:end_num), '^\s*', '', '')
+  let l:text = l:start_text . ' ' . l:content . ' ' . l:end_text
+
+  " Compute the available width for the displayed text.
+  let l:width = winwidth(0) - &foldcolumn - (&number ? &numberwidth : 0)
+  let l:lines_folded = ' ' . string(1 + v:foldend - v:foldstart) . ' lines'
+
+  " Expand tabs, truncate, pad, and concatenate
+  let l:text = substitute(l:text, '\t', repeat(' ', &tabstop), 'g')
+  let l:text = strpart(l:text, 0, l:width - len(l:lines_folded))
+  let l:padding = repeat(' ', l:width - len(l:lines_folded) - len(l:text))
+  return l:text . l:padding . l:lines_folded
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif
diff --git a/ftplugin/prolog.vim b/ftplugin/prolog.vim
new file mode 100644
index 000000000..bd813dcec
--- /dev/null
+++ b/ftplugin/prolog.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
+
+" Vim filetype plugin file
+" Language:             Prolog
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=s1:/*,mb:*,ex:*/,:% commentstring=%\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/heuristics.yaml b/heuristics.yaml
index 901241cb4..8b803011e 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -98,7 +98,7 @@ rules:
     filetype: idris2
   - pattern: '^%access .*'
     filetype: idris
-  - override: 'g:filetype_idr'
+- override: 'g:filetype_idr'
 - filetype: idris2
 ---
 extensions: [lidr]
@@ -115,3 +115,70 @@ rules:
   filetype: vb
   ignore_case: true
 - filetype: basic
+---
+extensions: [pm]
+rules:
+- lines: 1
+  rules:
+  - pattern: 'XPM2'
+    filetype: xpm2
+  - pattern: 'XPM'
+    filetype: xpm
+- lines: 50
+  rules:
+  - pattern: '^\s*(?:use\s+v6\b|\bmodule\b|\b(?:my\s+)?class\b)'
+    filetype: raku
+  - pattern: '\buse\s+(?:strict\b|v?5\.)'
+    filetype: perl
+- override: 'g:filetype_pm'
+- filetype: perl
+---
+extensions: [pl]
+rules:
+- lines: 1
+  or:
+  - pattern: '^[^#]*:-'
+  - pattern: '^\s*(?:%|/\*)'
+  - pattern: '\.\s*$'
+  filetype: prolog
+- lines: 50
+  rules:
+  - pattern: '^\s*(?:use\s+v6\b|\bmodule\b|\b(?:my\s+)?class\b)'
+    filetype: raku
+  - pattern: '\buse\s+(?:strict\b|v?5\.)'
+    filetype: perl
+- override: 'g:filetype_pl'
+- filetype: perl
+---
+extensions: [t]
+rules:
+- lines: 5
+  pattern: '^\.'
+  filetype: nroff
+- lines: 50
+  rules:
+  - pattern: '^\s*(?:use\s+v6\b|\bmodule\b|\b(?:my\s+)?class\b)'
+    filetype: raku
+  - pattern: '\buse\s+(?:strict\b|v?5\.)'
+    filetype: perl
+  ## I haven't found turing syntax for vim...
+  # - pattern: '^\s*%[ \t]+|^\s*var\s+\w+(\s*:\s*\w+)?\s*:=\s*\w+'
+  #   filetype: turing
+- override: 'g:filetype_t'
+- filetype: perl
+---
+extensions: [tt2]
+rules:
+- lines: 3
+  pattern: '<(?:!DOCTYPE HTML|[%?]|html)'
+  ignore_case: true
+  filetype: tt2html
+- filetype: tt2
+---
+extensions: [html]
+rules:
+- lines: 1
+  pattern: '^(%|<[%&].*>)'
+  filetype: mason
+- filetype: html
+
diff --git a/indent/bzl.vim b/indent/bzl.vim
new file mode 100644
index 000000000..adda8a858
--- /dev/null
+++ b/indent/bzl.vim
@@ -0,0 +1,98 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
+
+" Vim indent file
+" Language:	Bazel (http://bazel.io)
+" Maintainer:	David Barnett (https://github.com/google/vim-ft-bzl)
+" Last Change:	2017 Jun 13
+
+if exists('b:did_indent')
+  finish
+endif
+
+" Load base python indent.
+if !exists('*GetPythonIndent')
+  runtime! indent/python.vim
+endif
+
+let b:did_indent = 1
+
+" Only enable bzl google indent if python google indent is enabled.
+if !get(g:, 'no_google_python_indent')
+  setlocal indentexpr=GetBzlIndent(v:lnum)
+endif
+
+if exists('*GetBzlIndent')
+  finish
+endif
+
+let s:save_cpo = &cpo
+set cpo-=C
+
+" Maximum number of lines to look backwards.
+let s:maxoff = 50
+
+""
+" Determine the correct indent level given an {lnum} in the current buffer.
+function GetBzlIndent(lnum) abort
+  let l:use_recursive_indent = !get(g:, 'no_google_python_recursive_indent')
+  if l:use_recursive_indent
+    " Backup and override indent setting variables.
+    if exists('g:pyindent_nested_paren')
+      let l:pyindent_nested_paren = g:pyindent_nested_paren
+    endif
+    if exists('g:pyindent_open_paren')
+      let l:pyindent_open_paren = g:pyindent_open_paren
+    endif
+    let g:pyindent_nested_paren = 'shiftwidth() * 2'
+    let g:pyindent_open_paren = 'shiftwidth() * 2'
+  endif
+
+  let l:indent = -1
+
+  " Indent inside parens.
+  " Align with the open paren unless it is at the end of the line.
+  " E.g.
+  "   open_paren_not_at_EOL(100,
+  "                         (200,
+  "                          300),
+  "                         400)
+  "   open_paren_at_EOL(
+  "       100, 200, 300, 400)
+  call cursor(a:lnum, 1)
+  let [l:par_line, l:par_col] = searchpairpos('(\|{\|\[', '', ')\|}\|\]', 'bW',
+      \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :" .
+      \ " synIDattr(synID(line('.'), col('.'), 1), 'name')" .
+      \ " =~ '\\(Comment\\|String\\)$'")
+  if l:par_line > 0
+    call cursor(l:par_line, 1)
+    if l:par_col != col('$') - 1
+      let l:indent = l:par_col
+    endif
+  endif
+
+  " Delegate the rest to the original function.
+  if l:indent == -1
+    let l:indent = GetPythonIndent(a:lnum)
+  endif
+
+  if l:use_recursive_indent
+    " Restore global variables.
+    if exists('l:pyindent_nested_paren')
+      let g:pyindent_nested_paren = l:pyindent_nested_paren
+    else
+      unlet g:pyindent_nested_paren
+    endif
+    if exists('l:pyindent_open_paren')
+      let g:pyindent_open_paren = l:pyindent_open_paren
+    else
+      unlet g:pyindent_open_paren
+    endif
+  endif
+
+  return l:indent
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif
diff --git a/indent/prolog.vim b/indent/prolog.vim
new file mode 100644
index 000000000..0426a473e
--- /dev/null
+++ b/indent/prolog.vim
@@ -0,0 +1,71 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
+
+"  vim: set sw=4 sts=4:
+"  Maintainer	: Gergely Kontra <kgergely@mcl.hu>
+"  Revised on	: 2002.02.18. 23:34:05
+"  Language	: Prolog
+"  Last change by: Takuya Fujiwara, 2018 Sep 23
+
+" TODO:
+"   checking with respect to syntax highlighting
+"   ignoring multiline comments
+"   detecting multiline strings
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+
+let b:did_indent = 1
+
+setlocal indentexpr=GetPrologIndent()
+setlocal indentkeys-=:,0#
+setlocal indentkeys+=0%,-,0;,>,0)
+
+" Only define the function once.
+"if exists("*GetPrologIndent")
+"    finish
+"endif
+
+function! GetPrologIndent()
+    " Find a non-blank line above the current line.
+    let pnum = prevnonblank(v:lnum - 1)
+    " Hit the start of the file, use zero indent.
+    if pnum == 0
+       return 0
+    endif
+    let line = getline(v:lnum)
+    let pline = getline(pnum)
+
+    let ind = indent(pnum)
+    " Previous line was comment -> use previous line's indent
+    if pline =~ '^\s*%'
+	return ind
+    endif
+    " Previous line was the start of block comment -> +1 after '/*' comment
+    if pline =~ '^\s*/\*'
+	return ind + 1
+    endif
+    " Previous line was the end of block comment -> -1 after '*/' comment
+    if pline =~ '^\s*\*/'
+	return ind - 1
+    endif
+    " Check for clause head on previous line
+    if pline =~ '\%(:-\|-->\)\s*\(%.*\)\?$'
+	let ind = ind + shiftwidth()
+    " Check for end of clause on previous line
+    elseif pline =~ '\.\s*\(%.*\)\?$'
+	let ind = ind - shiftwidth()
+    endif
+    " Check for opening conditional on previous line
+    if pline =~ '^\s*\([(;]\|->\)'
+	let ind = ind + shiftwidth()
+    endif
+    " Check for closing an unclosed paren, or middle ; or ->
+    if line =~ '^\s*\([);]\|->\)'
+	let ind = ind - shiftwidth()
+    endif
+    return ind
+endfunction
+
+endif
diff --git a/packages.yaml b/packages.yaml
index 372abc947..bbdb3214f 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1175,6 +1175,23 @@ remote: vim-perl/vim-perl
 filetypes:
 - name: perl
   linguist: Perl
+- name: pod
+  extensions:
+  - pod
+- name: mason
+  extensions:
+  - mason
+  - mhtml
+  - comp
+- name: tt2
+  extensions:
+  - tt2
+- name: tt2html
+  extensions:
+  - tt2
+- name: xs
+  extensions:
+  - xs
 ---
 name: pgsql
 remote: lifepillar/pgsql.vim
@@ -1834,3 +1851,25 @@ remote: Tetralux/odin.vim
 filetypes:
 - name: odin
   linguist: Odin
+---
+name: bzl
+remote: vim/vim:runtime
+glob: '**/bzl.vim'
+filetypes:
+- name: bzl
+  linguist: Starlark
+---
+name: prolog
+remote: vim/vim:runtime
+glob: '**/prolog.vim'
+filetypes:
+- name: prolog
+  linguist: Prolog
+---
+name: tads
+remote: vim/vim:runtime
+glob: '**/tads.vim'
+filetypes:
+- name: tads
+  extensions:
+  - t
diff --git a/scripts/build b/scripts/build
index 07bc301bf..c44e8cc80 100755
--- a/scripts/build
+++ b/scripts/build
@@ -263,7 +263,7 @@ def rule_to_code(rule)
   if rule.has_key?("lines")
     if rule["lines"] == 1
       return <<~EOS
-        let line = getline(1)
+        let line = getline(nextnonblank(1))
 
         #{indent(rule_to_code(except(rule, "lines")), 0)}
       EOS
@@ -423,6 +423,7 @@ def generate_ftdetect(packages, heuristics)
   expected_filetypes = expected_filetypes.select { |e| filetype_names.include?(e["name"]) }
 
   native_extensions = Set.new(native_filetypes.flat_map { |f| f["extensions"] || [] })
+  native_filenames = Set.new(native_filetypes.flat_map { |f| f["filenames"] || [] })
 
   for package in packages
     name = package.fetch("name")
@@ -435,6 +436,12 @@ def generate_ftdetect(packages, heuristics)
           to_disable << "*." + extension
         end
       end
+
+      for filename in filetype["filenames"]
+        if native_filenames.include?(filename)
+          to_disable << filename
+        end
+      end
     end
 
     if to_disable.size > 0
@@ -457,7 +464,7 @@ def generate_ftdetect(packages, heuristics)
       set_command = "call s:Setf('#{name}')"
 
       if filetype["syntax"]
-        set_command = "if !did_filetype() | set ft=#{name} syntax=#{filetype["syntax"]} | endif"
+        set_command = "set ft=#{name} syntax=#{filetype["syntax"]}"
       end
 
       if filetype["custom_set"]
@@ -544,11 +551,11 @@ def generate_ftdetect(packages, heuristics)
       endif
     endfunc
 
-    func! polyglot#Heuristics()
+    func! polyglot#Shebang()
       " Try to detect filetype from shebang
-      let l:filetype = polyglot#Shebang()
-      if l:filetype != ""
-        exec "setf " . l:filetype
+      let ft = polyglot#ShebangFiletype()
+      if ft != ""
+        call s:Setf(ft)
         return 1
       endif
 
@@ -571,7 +578,7 @@ def generate_ftdetect(packages, heuristics)
     let s:r_envflag = '%(\\S\\+=\\S\\+\\|-[iS]\\|--ignore-environment\\|--split-string\\)'
     let s:r_env = '^\\%(\\' . s:r_envflag . '\\s\\+\\)*\\(\\S\\+\\)'
 
-    func! polyglot#Shebang()
+    func! polyglot#ShebangFiletype()
       let l:line1 = getline(1)
 
       if l:line1 !~# "^#!"
diff --git a/scripts/test_extensions.vim b/scripts/test_extensions.vim
index f2aaf66c2..467ac86a0 100644
--- a/scripts/test_extensions.vim
+++ b/scripts/test_extensions.vim
@@ -15,6 +15,12 @@ function! TestExtension(filetype, filename, content)
   endtry
 endfunction
 
+" make sure native vim scripts.vim is respected
+call TestExtension("rib", "renderman", "##RenderMan")
+
+" make sure case of file does matter when recognizing file
+call TestExtension("ruby", "scripts/build", "#!/usr/bin/env ruby")
+
 call TestExtension("sh", "bash1", "#!/bin/bash")
 call TestExtension("sh", "bash2", "#! /bin/bash")
 call TestExtension("sh", "bash3", "#! /bin/bash2.3")
@@ -279,3 +285,72 @@ call TestExtension("c", "foo.h", "")
 unlet g:c_syntax_for_h
 let g:ch_syntax_for_h = 1
 call TestExtension("ch", "foo.h", "")
+
+" perl
+call TestExtension("perl", "empty.plx", "")
+call TestExtension("perl", "empty.al", "")
+call TestExtension("perl", "empty.psgi", "")
+call TestExtension("pod", "empty.pod", "")
+
+" raku
+call TestExtension("raku", "empty.p6", "")
+call TestExtension("raku", "empty.pm6", "")
+call TestExtension("raku", "empty.pl6", "")
+call TestExtension("raku", "empty.raku", "")
+call TestExtension("raku", "empty.rakumod", "")
+call TestExtension("raku", "empty.pod6", "")
+call TestExtension("raku", "empty.rakudoc", "")
+call TestExtension("raku", "empty.rakutest", "")
+call TestExtension("raku", "empty.t6", "")
+
+
+" .pm extension
+call TestExtension("perl", "empty.pm", "")
+call TestExtension("perl", "strict.pm", " use strict hello;")
+call TestExtension("perl", "use5.pm", " use 5;")
+call TestExtension("perl", "usev5.pm", " use v5;")
+call TestExtension("raku", "script.pm", "#!/usr/bin/env perl6\nprint('Hello world')")
+call TestExtension("raku", "class.pm", " class Class {}")
+call TestExtension("raku", "module.pm", " module foobar")
+call TestExtension("xpm", "xpm.pm", "/* XPM */")
+call TestExtension("xpm2", "xpm2.pm", "/* XPM2 */")
+let g:filetype_pm = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.pm", "")
+
+" .pl extension
+call TestExtension("perl", "empty.pl", "")
+call TestExtension("prolog", "comment.pl", "% hello world")
+call TestExtension("prolog", "comment2.pl", "/* hello world */")
+call TestExtension("prolog", "statement.pl", "happy(vincent). ")
+call TestExtension("prolog", "statement2.pl", "nearbychk(X,Y) :- Y is X-1.")
+call TestExtension("perl", "strict.pl", " use strict hello;")
+call TestExtension("perl", "use5.pl", " use 5;")
+call TestExtension("perl", "usev5.pl", " use v5;")
+call TestExtension("raku", "script.pl", "#!/usr/bin/env perl6\nprint('Hello world')")
+call TestExtension("raku", "class.pl", " class Class {}")
+call TestExtension("raku", "module.pl", " module foobar")
+let g:filetype_pl = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.pl", "")
+
+" .t extension
+call TestExtension("perl", "empty.t", "")
+call TestExtension("perl", "strict.t", " use strict hello;")
+call TestExtension("perl", "use5.t", " use 5;")
+call TestExtension("perl", "usev5.t", " use v5;")
+call TestExtension("raku", "script.t", "#!/usr/bin/env perl6\nprint('Hello world')")
+call TestExtension("raku", "class.t", " class Class {}")
+call TestExtension("raku", "module.t", " module foobar")
+call TestExtension("nroff", "module.t", ".nf\n101 Main Street")
+let g:filetype_t = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.t", "")
+
+" .tt2 extension
+call TestExtension("tt2", "empty.tt2", "")
+call TestExtension("tt2html", "doctype.tt2", "<!DOCTYPE HTML>")
+call TestExtension("tt2html", "percent.tt2", "<%filter>")
+call TestExtension("tt2html", "html.tt2", "<html>")
+
+" .html extension
+call TestExtension("html", "empty.html", "")
+call TestExtension("mason", "mason1.html", "% my $planet = 42;")
+call TestExtension("mason", "mason2.html", "<%filter></%filter>")
diff --git a/scripts/test_filetypes.vim b/scripts/test_filetypes.vim
index a84b39e37..02d44ca46 100644
--- a/scripts/test_filetypes.vim
+++ b/scripts/test_filetypes.vim
@@ -154,6 +154,11 @@ call TestFiletype('sexplib')
 call TestFiletype('octave')
 call TestFiletype('opencl')
 call TestFiletype('perl')
+call TestFiletype('pod')
+call TestFiletype('mason')
+call TestFiletype('tt2')
+call TestFiletype('tt2html')
+call TestFiletype('xs')
 call TestFiletype('sql')
 call TestFiletype('cql')
 call TestFiletype('php')
@@ -232,3 +237,6 @@ call TestFiletype('basic')
 call TestFiletype('vb')
 call TestFiletype('dosini')
 call TestFiletype('odin')
+call TestFiletype('bzl')
+call TestFiletype('prolog')
+call TestFiletype('tads')
diff --git a/syntax/bzl.vim b/syntax/bzl.vim
new file mode 100644
index 000000000..9c0c57811
--- /dev/null
+++ b/syntax/bzl.vim
@@ -0,0 +1,20 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
+
+" Vim syntax file
+" Language:	Bazel (http://bazel.io)
+" Maintainer:	David Barnett (https://github.com/google/vim-ft-bzl)
+" Last Change:	2015 Aug 11
+
+if exists('b:current_syntax')
+  finish
+endif
+
+
+runtime! syntax/python.vim
+
+let b:current_syntax = 'bzl'
+
+syn region bzlRule start='^\w\+($' end='^)\n*' transparent fold
+syn region bzlList start='\[' end='\]' transparent fold
+
+endif
diff --git a/syntax/prolog.vim b/syntax/prolog.vim
new file mode 100644
index 000000000..4d6cb0be5
--- /dev/null
+++ b/syntax/prolog.vim
@@ -0,0 +1,122 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
+
+" Vim syntax file
+" Language:    PROLOG
+" Maintainer:  Anton Kochkov <anton.kochkov@gmail.com>
+" Last Change: 2019 Aug 29
+
+" There are two sets of highlighting in here:
+" If the "prolog_highlighting_clean" variable exists, it is rather sparse.
+" Otherwise you get more highlighting.
+"
+" You can also set the "prolog_highlighting_no_keyword" variable. If set,
+" keywords will not be highlighted.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Prolog is case sensitive.
+syn case match
+
+" Very simple highlighting for comments, clause heads and
+" character codes.  It respects prolog strings and atoms.
+
+syn region   prologCComment start=+/\*+ end=+\*/+
+syn match    prologComment  +%.*+
+
+if !exists("prolog_highlighting_no_keyword")
+  syn keyword  prologKeyword  module meta_predicate multifile dynamic
+endif
+syn match    prologCharCode +0'\\\=.+
+syn region   prologString   start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn region   prologAtom     start=+'+ skip=+\\\\\|\\'+ end=+'+
+syn region   prologClause   matchgroup=prologClauseHead start=+^\s*[a-z]\w*+ matchgroup=Normal end=+\.\s\|\.$+ contains=ALLBUT,prologClause
+
+if !exists("prolog_highlighting_clean")
+
+  " some keywords
+  " some common predicates are also highlighted as keywords
+  " is there a better solution?
+  if !exists("prolog_highlighting_no_keyword")
+    syn keyword prologKeyword   abolish current_output  peek_code
+    syn keyword prologKeyword   append  current_predicate       put_byte
+    syn keyword prologKeyword   arg     current_prolog_flag     put_char
+    syn keyword prologKeyword   asserta fail    put_code
+    syn keyword prologKeyword   assertz findall read
+    syn keyword prologKeyword   at_end_of_stream        float   read_term
+    syn keyword prologKeyword   atom    flush_output    repeat
+    syn keyword prologKeyword   atom_chars      functor retract
+    syn keyword prologKeyword   atom_codes      get_byte        set_input
+    syn keyword prologKeyword   atom_concat     get_char        set_output
+    syn keyword prologKeyword   atom_length     get_code        set_prolog_flag
+    syn keyword prologKeyword   atomic  halt    set_stream_position
+    syn keyword prologKeyword   bagof   integer setof
+    syn keyword prologKeyword   call    is      stream_property
+    syn keyword prologKeyword   catch   nl      sub_atom
+    syn keyword prologKeyword   char_code       nonvar  throw
+    syn keyword prologKeyword   char_conversion number  true
+    syn keyword prologKeyword   clause  number_chars    unify_with_occurs_check
+    syn keyword prologKeyword   close   number_codes    var
+    syn keyword prologKeyword   compound        once    write
+    syn keyword prologKeyword   copy_term       op      write_canonical
+    syn keyword prologKeyword   current_char_conversion open    write_term
+    syn keyword prologKeyword   current_input   peek_byte       writeq
+    syn keyword prologKeyword   current_op      peek_char
+  endif
+
+  syn match   prologOperator "=\\=\|=:=\|\\==\|=<\|==\|>=\|\\=\|\\+\|=\.\.\|<\|>\|="
+  syn match   prologAsIs     "===\|\\===\|<=\|=>"
+
+  syn match   prologNumber            "\<\d*\>'\@!"
+  syn match   prologNumber            "\<0[xX]\x*\>'\@!"
+  syn match   prologCommentError      "\*/"
+  syn match   prologSpecialCharacter  ";"
+  syn match   prologSpecialCharacter  "!"
+  syn match   prologSpecialCharacter  ":-"
+  syn match   prologSpecialCharacter  "-->"
+  syn match   prologQuestion          "?-.*\."  contains=prologNumber
+
+
+endif
+
+syn sync maxlines=50
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default highlighting.
+hi def link prologComment          Comment
+hi def link prologCComment         Comment
+hi def link prologCharCode         Special
+
+if exists ("prolog_highlighting_clean")
+
+hi def link prologKeyword        Statement
+hi def link prologClauseHead     Statement
+hi def link prologClause Normal
+
+else
+
+hi def link prologKeyword        Keyword
+hi def link prologClauseHead     Constant
+hi def link prologClause Normal
+hi def link prologQuestion       PreProc
+hi def link prologSpecialCharacter Special
+hi def link prologNumber         Number
+hi def link prologAsIs           Normal
+hi def link prologCommentError   Error
+hi def link prologAtom           String
+hi def link prologString         String
+hi def link prologOperator       Operator
+
+endif
+
+
+let b:current_syntax = "prolog"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/tads.vim b/syntax/tads.vim
new file mode 100644
index 000000000..e47375354
--- /dev/null
+++ b/syntax/tads.vim
@@ -0,0 +1,175 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tads') == -1
+
+" Vim syntax file
+" Language:	TADS
+" Maintainer:	Amir Karger <karger@post.harvard.edu>
+" $Date: 2004/06/13 19:28:45 $
+" $Revision: 1.1 $
+" Stolen from: Bram Moolenaar's C language file
+" Newest version at: http://www.hec.utah.edu/~karger/vim/syntax/tads.vim
+" History info at the bottom of the file
+
+" TODO lots more keywords
+" global, self, etc. are special *objects*, not functions. They should
+" probably be a different color than the special functions
+" Actually, should cvtstr etc. be functions?! (change tadsFunction)
+" Make global etc. into Identifiers, since we don't have regular variables?
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" A bunch of useful keywords
+syn keyword tadsStatement	goto break return continue pass
+syn keyword tadsLabel		case default
+syn keyword tadsConditional	if else switch
+syn keyword tadsRepeat		while for do
+syn keyword tadsStorageClass	local compoundWord formatstring specialWords
+syn keyword tadsBoolean		nil true
+
+" TADS keywords
+syn keyword tadsKeyword		replace modify
+syn keyword tadsKeyword		global self inherited
+" builtin functions
+syn keyword tadsKeyword		cvtstr cvtnum caps lower upper substr
+syn keyword tadsKeyword		say length
+syn keyword tadsKeyword		setit setscore
+syn keyword tadsKeyword		datatype proptype
+syn keyword tadsKeyword		car cdr
+syn keyword tadsKeyword		defined isclass
+syn keyword tadsKeyword		find firstobj nextobj
+syn keyword tadsKeyword		getarg argcount
+syn keyword tadsKeyword		input yorn askfile
+syn keyword tadsKeyword		rand randomize
+syn keyword tadsKeyword		restart restore quit save undo
+syn keyword tadsException	abort exit exitobj
+
+syn keyword tadsTodo contained	TODO FIXME XXX
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match tadsSpecial contained	"\\."
+syn region tadsDoubleString		start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=tadsSpecial,tadsEmbedded
+syn region tadsSingleString		start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=tadsSpecial
+" Embedded expressions in strings
+syn region tadsEmbedded contained       start="<<" end=">>" contains=tadsKeyword
+
+" TADS doesn't have \xxx, right?
+"syn match cSpecial contained	"\\[0-7][0-7][0-7]\=\|\\."
+"syn match cSpecialCharacter	"'\\[0-7][0-7]'"
+"syn match cSpecialCharacter	"'\\[0-7][0-7][0-7]'"
+
+"catch errors caused by wrong parenthesis
+"syn region cParen		transparent start='(' end=')' contains=ALLBUT,cParenError,cIncluded,cSpecial,cTodo,cUserCont,cUserLabel
+"syn match cParenError		")"
+"syn match cInParen contained	"[{}]"
+syn region tadsBrace		transparent start='{' end='}' contains=ALLBUT,tadsBraceError,tadsIncluded,tadsSpecial,tadsTodo
+syn match tadsBraceError		"}"
+
+"integer number (TADS has no floating point numbers)
+syn case ignore
+syn match tadsNumber		"\<[0-9]\+\>"
+"hex number
+syn match tadsNumber		"\<0x[0-9a-f]\+\>"
+syn match tadsIdentifier	"\<[a-z][a-z0-9_$]*\>"
+syn case match
+" flag an octal number with wrong digits
+syn match tadsOctalError		"\<0[0-7]*[89]"
+
+" Removed complicated c_comment_strings
+syn region tadsComment		start="/\*" end="\*/" contains=tadsTodo
+syn match tadsComment		"//.*" contains=tadsTodo
+syntax match tadsCommentError	"\*/"
+
+syn region tadsPreCondit	start="^\s*#\s*\(if\>\|ifdef\>\|ifndef\>\|elif\>\|else\>\|endif\>\)" skip="\\$" end="$" contains=tadsComment,tadsString,tadsNumber,tadsCommentError
+syn region tadsIncluded contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match tadsIncluded contained "<[^>]*>"
+syn match tadsInclude		"^\s*#\s*include\>\s*["<]" contains=tadsIncluded
+syn region tadsDefine		start="^\s*#\s*\(define\>\|undef\>\)" skip="\\$" end="$" contains=ALLBUT,tadsPreCondit,tadsIncluded,tadsInclude,tadsDefine,tadsInBrace,tadsIdentifier
+
+syn region tadsPreProc start="^\s*#\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" contains=ALLBUT,tadsPreCondit,tadsIncluded,tadsInclude,tadsDefine,tadsInParen,tadsIdentifier
+
+" Highlight User Labels
+" TODO labels for gotos?
+"syn region	cMulti		transparent start='?' end=':' contains=ALLBUT,cIncluded,cSpecial,cTodo,cUserCont,cUserLabel,cBitField
+" Avoid matching foo::bar() in C++ by requiring that the next char is not ':'
+"syn match	cUserCont	"^\s*\I\i*\s*:$" contains=cUserLabel
+"syn match	cUserCont	";\s*\I\i*\s*:$" contains=cUserLabel
+"syn match	cUserCont	"^\s*\I\i*\s*:[^:]" contains=cUserLabel
+"syn match	cUserCont	";\s*\I\i*\s*:[^:]" contains=cUserLabel
+
+"syn match	cUserLabel	"\I\i*" contained
+
+" identifier: class-name [, class-name [...]] [property-list] ;
+" Don't highlight comment in class def
+syn match tadsClassDef		"\<class\>[^/]*" contains=tadsObjectDef,tadsClass
+syn match tadsClass contained   "\<class\>"
+syn match tadsObjectDef "\<[a-zA-Z][a-zA-Z0-9_$]*\s*:\s*[a-zA-Z0-9_$]\+\(\s*,\s*[a-zA-Z][a-zA-Z0-9_$]*\)*\(\s*;\)\="
+syn keyword tadsFunction contained function
+syn match tadsFunctionDef	 "\<[a-zA-Z][a-zA-Z0-9_$]*\s*:\s*function[^{]*" contains=tadsFunction
+"syn region tadsObject		  transparent start = '[a-zA-Z][\i$]\s*:\s*' end=";" contains=tadsBrace,tadsObjectDef
+
+" How far back do we go to find matching groups
+if !exists("tads_minlines")
+  let tads_minlines = 15
+endif
+exec "syn sync ccomment tadsComment minlines=" . tads_minlines
+if !exists("tads_sync_dist")
+  let tads_sync_dist = 100
+endif
+execute "syn sync maxlines=" . tads_sync_dist
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default methods for highlighting.  Can be overridden later
+hi def link tadsFunctionDef Function
+hi def link tadsFunction  Structure
+hi def link tadsClass     Structure
+hi def link tadsClassDef  Identifier
+hi def link tadsObjectDef Identifier
+" no highlight for tadsEmbedded, so it prints as normal text w/in the string
+
+hi def link tadsOperator	Operator
+hi def link tadsStructure	Structure
+hi def link tadsTodo	Todo
+hi def link tadsLabel	Label
+hi def link tadsConditional	Conditional
+hi def link tadsRepeat	Repeat
+hi def link tadsException	Exception
+hi def link tadsStatement	Statement
+hi def link tadsStorageClass	StorageClass
+hi def link tadsKeyWord   Keyword
+hi def link tadsSpecial	SpecialChar
+hi def link tadsNumber	Number
+hi def link tadsBoolean	Boolean
+hi def link tadsDoubleString	tadsString
+hi def link tadsSingleString	tadsString
+
+hi def link tadsOctalError	tadsError
+hi def link tadsCommentError	tadsError
+hi def link tadsBraceError	tadsError
+hi def link tadsInBrace	tadsError
+hi def link tadsError	Error
+
+hi def link tadsInclude	Include
+hi def link tadsPreProc	PreProc
+hi def link tadsDefine	Macro
+hi def link tadsIncluded	tadsString
+hi def link tadsPreCondit	PreCondit
+
+hi def link tadsString	String
+hi def link tadsComment	Comment
+
+
+
+let b:current_syntax = "tads"
+
+" Changes:
+" 11/18/99 Added a bunch of TADS functions, tadsException
+" 10/22/99 Misspelled Moolenaar (sorry!), c_minlines to tads_minlines
+"
+" vim: ts=8
+
+endif

From 0118088e0a312b579d5811e330e194659b15c006 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 16 Sep 2020 17:24:10 +0200
Subject: [PATCH 053/299] Make config more vim-independent

---
 heuristics.yaml |  4 ++--
 scripts/build   | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/heuristics.yaml b/heuristics.yaml
index 8b803011e..6ff7af47d 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -11,12 +11,12 @@ rules:
 ---
 extensions: [asa]
 rules:
-- override: "g:filetype_asa"
+- override: true
 - filetype: aspvbs
 ---
 extensions: [asp]
 rules:
-- override: "g:filetype_asp"
+- override: true
 - lines: 3
   pattern: 'perlscript'
   ignore_case: true
diff --git a/scripts/build b/scripts/build
index c44e8cc80..0fac234de 100755
--- a/scripts/build
+++ b/scripts/build
@@ -257,6 +257,8 @@ def rules_to_code(rules)
   end
 
   output << rule_to_code(rules)
+
+  output
 end
 
 def rule_to_code(rule)
@@ -287,7 +289,9 @@ def rule_to_code(rule)
   end
 
   if rule.has_key?("rules")
-    return rule["rules"].map { |r| indent(rule_to_code(r), 0) }.join("\n")
+    return rule["rules"].map do |r|
+      indent(rule_to_code({ "extensions" => rule["extensions"], **r }), 0)
+    end.join("\n")
   end
 
   if rule.has_key?("if_set")
@@ -313,14 +317,15 @@ def rule_to_code(rule)
     EOS
   end
 
-  if (rule.keys - ["filetype", "override", "set"]).size > 0
+  if (rule.keys - ["filetype", "override", "set", "extensions"]).size > 0
     raise "Unknown rule: #{JSON.generate(rule)}"
   end
   
   if rule.has_key?("override")
+    variable = "g:filetype_#{rule["extensions"].first}"
     return <<~EOS
-      if exists("#{rule["override"]}")
-        call s:Setf(#{rule["override"]}) | return
+      if exists("#{variable}")
+        call s:Setf(#{variable}) | return
       endif
     EOS
   end
@@ -329,6 +334,14 @@ def rule_to_code(rule)
     return "call s:Setf('#{rule["filetype"]}') | return"
   end
 
+  if rule.has_key?("filetype")
+    return "call s:Setf('#{rule["filetype"]}') | return"
+  end
+
+  if rule.has_key?("extensions")
+    return ""
+  end
+
   return ""
 end
 

From 06548fe61765d8a68a289741ce8d30f04a037e60 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 16 Sep 2020 17:43:03 +0200
Subject: [PATCH 054/299] Get rid of s:Setf helper

---
 autoload/polyglot.vim |  128 ++-
 ftdetect/polyglot.vim | 1766 ++++++++++++++++++++---------------------
 heuristics.yaml       |   12 +-
 scripts/build         |   20 +-
 4 files changed, 955 insertions(+), 971 deletions(-)

diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index 5d4bfe9a7..b7113f31f 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -2,19 +2,11 @@
 let s:cpo_save = &cpo
 set cpo&vim
 
-" We need it because scripts.vim in vim uses "set ft=" which cannot be
-" overridden with setf (and we can't use set ft= so our scripts.vim work)
-func! s:Setf(ft)
-  if &filetype !~# '<'.a:ft.'>'
-    let &filetype = a:ft
-  endif
-endfunc
-
 func! polyglot#Shebang()
   " Try to detect filetype from shebang
   let ft = polyglot#ShebangFiletype()
   if ft != ""
-    call s:Setf(ft)
+    let &ft = ft
     return 1
   endif
 
@@ -137,34 +129,34 @@ endfunc
 func! polyglot#DetectInpFiletype()
   let line = getline(nextnonblank(1))
   if line =~# '^\*'
-    call s:Setf('abaqus') | return
+    set ft=abaqus | return
   endif
   for lnum in range(1, min([line("$"), 500]))
     let line = getline(lnum)
     if line =~? '^header surface data'
-      call s:Setf('trasys') | return
+      set ft=trasys | return
     endif
   endfor
 endfunc
 
 func! polyglot#DetectAsaFiletype()
   if exists("g:filetype_asa")
-    call s:Setf(g:filetype_asa) | return
+    let &ft = g:filetype_asa | return
   endif
-  call s:Setf('aspvbs') | return
+  set ft=aspvbs | return
 endfunc
 
 func! polyglot#DetectAspFiletype()
   if exists("g:filetype_asp")
-    call s:Setf(g:filetype_asp) | return
+    let &ft = g:filetype_asp | return
   endif
   for lnum in range(1, min([line("$"), 3]))
     let line = getline(lnum)
     if line =~? 'perlscript'
-      call s:Setf('aspperl') | return
+      set ft=aspperl | return
     endif
   endfor
-  call s:Setf('aspvbs') | return
+  set ft=aspvbs | return
 endfunc
 
 func! polyglot#DetectHFiletype()
@@ -172,18 +164,18 @@ func! polyglot#DetectHFiletype()
     let line = getline(lnum)
     if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
       if exists("g:c_syntax_for_h")
-        call s:Setf('objc') | return
+        set ft=objc | return
       endif
-      call s:Setf('objcpp') | return
+      set ft=objcpp | return
     endif
   endfor
   if exists("g:c_syntax_for_h")
-    call s:Setf('c') | return
+    set ft=c | return
   endif
   if exists("g:ch_syntax_for_h")
-    call s:Setf('ch') | return
+    set ft=ch | return
   endif
-  call s:Setf('cpp') | return
+  set ft=cpp | return
 endfunc
 
 func! polyglot#DetectMFiletype()
@@ -194,53 +186,53 @@ func! polyglot#DetectMFiletype()
       let saw_comment = 1
     endif
     if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
-      call s:Setf('objc') | return
+      set ft=objc | return
     endif
     if line =~# '^\s*%'
-      call s:Setf('octave') | return
+      set ft=octave | return
     endif
     if line =~# '^\s*(\*'
-      call s:Setf('mma') | return
+      set ft=mma | return
     endif
     if line =~? '^\s*\(\(type\|var\)\(\<\|\>\)\|--\)'
-      call s:Setf('murphi') | return
+      set ft=murphi | return
     endif
   endfor
   if saw_comment
-    call s:Setf('objc') | return
+    set ft=objc | return
   endif
   if exists("g:filetype_m")
-    call s:Setf(g:filetype_m) | return
+    let &ft = g:filetype_m | return
   endif
-  call s:Setf('octave') | return
+  set ft=octave | return
 endfunc
 
 func! polyglot#DetectFsFiletype()
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
     if line =~# '^\(: \|new-device\)'
-      call s:Setf('forth') | return
+      set ft=forth | return
     endif
     if line =~# '^\s*\(#light\|import\|let\|module\|namespace\|open\|type\)'
-      call s:Setf('fsharp') | return
+      set ft=fsharp | return
     endif
     if line =~# '\s*\(#version\|precision\|uniform\|varying\|vec[234]\)'
-      call s:Setf('glsl') | return
+      set ft=glsl | return
     endif
   endfor
   if exists("g:filetype_fs")
-    call s:Setf(g:filetype_fs) | return
+    let &ft = g:filetype_fs | return
   endif
-  call s:Setf('forth') | return
+  set ft=forth | return
 endfunc
 
 func! polyglot#DetectReFiletype()
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
     if line =~# '^\s*#\%(\%(if\|ifdef\|define\|pragma\)\s\+\w\|\s*include\s\+[<"]\|template\s*<\)'
-      call s:Setf('cpp') | return
+      set ft=cpp | return
     endif
-    call s:Setf('reason') | return
+    set ft=reason | return
   endfor
 endfunc
 
@@ -248,137 +240,137 @@ func! polyglot#DetectIdrFiletype()
   for lnum in range(1, min([line("$"), 5]))
     let line = getline(lnum)
     if line =~# '^\s*--.*[Ii]dris \=1'
-      call s:Setf('idris') | return
+      set ft=idris | return
     endif
     if line =~# '^\s*--.*[Ii]dris \=2'
-      call s:Setf('idris2') | return
+      set ft=idris2 | return
     endif
   endfor
   for lnum in range(1, min([line("$"), 30]))
     let line = getline(lnum)
     if line =~# '^pkgs =.*'
-      call s:Setf('idris') | return
+      set ft=idris | return
     endif
     if line =~# '^depends =.*'
-      call s:Setf('idris2') | return
+      set ft=idris2 | return
     endif
     if line =~# '^%language \(TypeProviders\|ElabReflection\)'
-      call s:Setf('idris') | return
+      set ft=idris | return
     endif
     if line =~# '^%language PostfixProjections'
-      call s:Setf('idris2') | return
+      set ft=idris2 | return
     endif
     if line =~# '^%access .*'
-      call s:Setf('idris') | return
+      set ft=idris | return
     endif
   endfor
   if exists("g:filetype_idr")
-    call s:Setf(g:filetype_idr) | return
+    let &ft = g:filetype_idr | return
   endif
-  call s:Setf('idris2') | return
+  set ft=idris2 | return
 endfunc
 
 func! polyglot#DetectLidrFiletype()
   for lnum in range(1, min([line("$"), 200]))
     let line = getline(lnum)
     if line =~# '^>\s*--.*[Ii]dris \=1'
-      call s:Setf('lidris') | return
+      set ft=lidris | return
     endif
   endfor
-  call s:Setf('lidris2') | return
+  set ft=lidris2 | return
 endfunc
 
 func! polyglot#DetectBasFiletype()
   for lnum in range(1, min([line("$"), 5]))
     let line = getline(lnum)
     if line =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
-      call s:Setf('vb') | return
+      set ft=vb | return
     endif
   endfor
-  call s:Setf('basic') | return
+  set ft=basic | return
 endfunc
 
 func! polyglot#DetectPmFiletype()
   let line = getline(nextnonblank(1))
   if line =~# 'XPM2'
-    call s:Setf('xpm2') | return
+    set ft=xpm2 | return
   endif
   if line =~# 'XPM'
-    call s:Setf('xpm') | return
+    set ft=xpm | return
   endif
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
     if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
-      call s:Setf('raku') | return
+      set ft=raku | return
     endif
     if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
-      call s:Setf('perl') | return
+      set ft=perl | return
     endif
   endfor
   if exists("g:filetype_pm")
-    call s:Setf(g:filetype_pm) | return
+    let &ft = g:filetype_pm | return
   endif
-  call s:Setf('perl') | return
+  set ft=perl | return
 endfunc
 
 func! polyglot#DetectPlFiletype()
   let line = getline(nextnonblank(1))
   if line =~# '^[^#]*:-' || line =~# '^\s*\%(%\|/\*\)' || line =~# '\.\s*$'
-    call s:Setf('prolog') | return
+    set ft=prolog | return
   endif
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
     if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
-      call s:Setf('raku') | return
+      set ft=raku | return
     endif
     if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
-      call s:Setf('perl') | return
+      set ft=perl | return
     endif
   endfor
   if exists("g:filetype_pl")
-    call s:Setf(g:filetype_pl) | return
+    let &ft = g:filetype_pl | return
   endif
-  call s:Setf('perl') | return
+  set ft=perl | return
 endfunc
 
 func! polyglot#DetectTFiletype()
   for lnum in range(1, min([line("$"), 5]))
     let line = getline(lnum)
     if line =~# '^\.'
-      call s:Setf('nroff') | return
+      set ft=nroff | return
     endif
   endfor
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
     if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
-      call s:Setf('raku') | return
+      set ft=raku | return
     endif
     if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
-      call s:Setf('perl') | return
+      set ft=perl | return
     endif
   endfor
   if exists("g:filetype_t")
-    call s:Setf(g:filetype_t) | return
+    let &ft = g:filetype_t | return
   endif
-  call s:Setf('perl') | return
+  set ft=perl | return
 endfunc
 
 func! polyglot#DetectTt2Filetype()
   for lnum in range(1, min([line("$"), 3]))
     let line = getline(lnum)
     if line =~? '<\%(!DOCTYPE HTML\|[%?]\|html\)'
-      call s:Setf('tt2html') | return
+      set ft=tt2html | return
     endif
   endfor
-  call s:Setf('tt2') | return
+  set ft=tt2 | return
 endfunc
 
 func! polyglot#DetectHtmlFiletype()
   let line = getline(nextnonblank(1))
   if line =~# '^\(%\|<[%&].*>\)'
-    call s:Setf('mason') | return
+    set ft=mason | return
   endif
-  call s:Setf('html') | return
+  set ft=html | return
 endfunc
 
 " Restore 'cpoptions'
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 1cd0efe75..cdb96b50c 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -487,32 +487,32 @@ if !has_key(s:disabled_packages, 'tads')
 endif
 
 if !has_key(s:disabled_packages, '8th')
-  au BufNewFile,BufRead *.8th call s:Setf('8th')
+  au BufNewFile,BufRead *.8th set ft=8th
 endif
 
 if !has_key(s:disabled_packages, 'haproxy')
-  au BufNewFile,BufRead *.cfg call s:Setf('haproxy')
+  au BufNewFile,BufRead *.cfg set ft=haproxy
   au BufNewFile,BufRead haproxy*.c* call s:StarSetf('haproxy')
-  au BufNewFile,BufRead haproxy.cfg call s:Setf('haproxy')
+  au BufNewFile,BufRead haproxy.cfg set ft=haproxy
 endif
 
 if !has_key(s:disabled_packages, 'a2ps')
-  au BufNewFile,BufRead */etc/a2ps.cfg call s:Setf('a2ps')
-  au BufNewFile,BufRead */etc/a2ps/*.cfg call s:Setf('a2ps')
-  au BufNewFile,BufRead {.,}a2psrc call s:Setf('a2ps')
-  au BufNewFile,BufRead a2psrc call s:Setf('a2ps')
+  au BufNewFile,BufRead */etc/a2ps.cfg set ft=a2ps
+  au BufNewFile,BufRead */etc/a2ps/*.cfg set ft=a2ps
+  au BufNewFile,BufRead {.,}a2psrc set ft=a2ps
+  au BufNewFile,BufRead a2psrc set ft=a2ps
 endif
 
 if !has_key(s:disabled_packages, 'a65')
-  au BufNewFile,BufRead *.a65 call s:Setf('a65')
+  au BufNewFile,BufRead *.a65 set ft=a65
 endif
 
 if !has_key(s:disabled_packages, 'aap')
-  au BufNewFile,BufRead *.aap call s:Setf('aap')
+  au BufNewFile,BufRead *.aap set ft=aap
 endif
 
 if !has_key(s:disabled_packages, 'abap')
-  au BufNewFile,BufRead *.abap call s:Setf('abap')
+  au BufNewFile,BufRead *.abap set ft=abap
 endif
 
 if !has_key(s:disabled_packages, 'abaqus')
@@ -520,164 +520,164 @@ if !has_key(s:disabled_packages, 'abaqus')
 endif
 
 if !has_key(s:disabled_packages, 'abc')
-  au BufNewFile,BufRead *.abc call s:Setf('abc')
+  au BufNewFile,BufRead *.abc set ft=abc
 endif
 
 if !has_key(s:disabled_packages, 'abel')
-  au BufNewFile,BufRead *.abl call s:Setf('abel')
+  au BufNewFile,BufRead *.abl set ft=abel
 endif
 
 if !has_key(s:disabled_packages, 'acedb')
-  au BufNewFile,BufRead *.wrm call s:Setf('acedb')
+  au BufNewFile,BufRead *.wrm set ft=acedb
 endif
 
 if !has_key(s:disabled_packages, 'acpiasl')
-  au BufNewFile,BufRead *.asl call s:Setf('asl')
-  au BufNewFile,BufRead *.dsl call s:Setf('asl')
+  au BufNewFile,BufRead *.asl set ft=asl
+  au BufNewFile,BufRead *.dsl set ft=asl
 endif
 
 if !has_key(s:disabled_packages, 'ada')
-  au BufNewFile,BufRead *.ada call s:Setf('ada')
-  au BufNewFile,BufRead *.ada_m call s:Setf('ada')
-  au BufNewFile,BufRead *.adb call s:Setf('ada')
-  au BufNewFile,BufRead *.adc call s:Setf('ada')
-  au BufNewFile,BufRead *.ads call s:Setf('ada')
-  au BufNewFile,BufRead *.gpr call s:Setf('ada')
+  au BufNewFile,BufRead *.ada set ft=ada
+  au BufNewFile,BufRead *.ada_m set ft=ada
+  au BufNewFile,BufRead *.adb set ft=ada
+  au BufNewFile,BufRead *.adc set ft=ada
+  au BufNewFile,BufRead *.ads set ft=ada
+  au BufNewFile,BufRead *.gpr set ft=ada
 endif
 
 if !has_key(s:disabled_packages, 'ahdl')
-  au BufNewFile,BufRead *.tdf call s:Setf('ahdl')
+  au BufNewFile,BufRead *.tdf set ft=ahdl
 endif
 
 if !has_key(s:disabled_packages, 'aidl')
-  au BufNewFile,BufRead *.aidl call s:Setf('aidl')
+  au BufNewFile,BufRead *.aidl set ft=aidl
 endif
 
 if !has_key(s:disabled_packages, 'alsaconf')
-  au BufNewFile,BufRead */etc/asound.conf call s:Setf('alsaconf')
-  au BufNewFile,BufRead */usr/share/alsa/alsa.conf call s:Setf('alsaconf')
-  au BufNewFile,BufRead {.,}asoundrc call s:Setf('alsaconf')
+  au BufNewFile,BufRead */etc/asound.conf set ft=alsaconf
+  au BufNewFile,BufRead */usr/share/alsa/alsa.conf set ft=alsaconf
+  au BufNewFile,BufRead {.,}asoundrc set ft=alsaconf
 endif
 
 if !has_key(s:disabled_packages, 'aml')
-  au BufNewFile,BufRead *.aml call s:Setf('aml')
+  au BufNewFile,BufRead *.aml set ft=aml
 endif
 
 if !has_key(s:disabled_packages, 'ampl')
-  au BufNewFile,BufRead *.run call s:Setf('ampl')
+  au BufNewFile,BufRead *.run set ft=ampl
 endif
 
 if !has_key(s:disabled_packages, 'xml')
-  au BufNewFile,BufRead *.adml call s:Setf('xml')
-  au BufNewFile,BufRead *.admx call s:Setf('xml')
-  au BufNewFile,BufRead *.ant call s:Setf('xml')
-  au BufNewFile,BufRead *.axml call s:Setf('xml')
-  au BufNewFile,BufRead *.builds call s:Setf('xml')
-  au BufNewFile,BufRead *.ccproj call s:Setf('xml')
-  au BufNewFile,BufRead *.ccxml call s:Setf('xml')
-  au BufNewFile,BufRead *.cdxml call s:Setf('xml')
-  au BufNewFile,BufRead *.clixml call s:Setf('xml')
-  au BufNewFile,BufRead *.cproject call s:Setf('xml')
-  au BufNewFile,BufRead *.cscfg call s:Setf('xml')
-  au BufNewFile,BufRead *.csdef call s:Setf('xml')
-  au BufNewFile,BufRead *.csl call s:Setf('xml')
-  au BufNewFile,BufRead *.csproj call s:Setf('xml')
-  au BufNewFile,BufRead *.ct call s:Setf('xml')
-  au BufNewFile,BufRead *.depproj call s:Setf('xml')
-  au BufNewFile,BufRead *.dita call s:Setf('xml')
-  au BufNewFile,BufRead *.ditamap call s:Setf('xml')
-  au BufNewFile,BufRead *.ditaval call s:Setf('xml')
-  au BufNewFile,BufRead *.dll.config call s:Setf('xml')
-  au BufNewFile,BufRead *.dotsettings call s:Setf('xml')
-  au BufNewFile,BufRead *.filters call s:Setf('xml')
-  au BufNewFile,BufRead *.fsproj call s:Setf('xml')
-  au BufNewFile,BufRead *.fxml call s:Setf('xml')
-  au BufNewFile,BufRead *.glade call s:Setf('xml')
-  au BufNewFile,BufRead *.gml call s:Setf('xml')
-  au BufNewFile,BufRead *.gmx call s:Setf('xml')
-  au BufNewFile,BufRead *.grxml call s:Setf('xml')
-  au BufNewFile,BufRead *.gst call s:Setf('xml')
-  au BufNewFile,BufRead *.iml call s:Setf('xml')
-  au BufNewFile,BufRead *.ivy call s:Setf('xml')
-  au BufNewFile,BufRead *.jelly call s:Setf('xml')
-  au BufNewFile,BufRead *.jsproj call s:Setf('xml')
-  au BufNewFile,BufRead *.kml call s:Setf('xml')
-  au BufNewFile,BufRead *.launch call s:Setf('xml')
-  au BufNewFile,BufRead *.mdpolicy call s:Setf('xml')
-  au BufNewFile,BufRead *.mjml call s:Setf('xml')
-  au BufNewFile,BufRead *.mm call s:Setf('xml')
-  au BufNewFile,BufRead *.mod call s:Setf('xml')
-  au BufNewFile,BufRead *.mxml call s:Setf('xml')
-  au BufNewFile,BufRead *.natvis call s:Setf('xml')
-  au BufNewFile,BufRead *.ncl call s:Setf('xml')
-  au BufNewFile,BufRead *.ndproj call s:Setf('xml')
-  au BufNewFile,BufRead *.nproj call s:Setf('xml')
-  au BufNewFile,BufRead *.nuspec call s:Setf('xml')
-  au BufNewFile,BufRead *.odd call s:Setf('xml')
-  au BufNewFile,BufRead *.osm call s:Setf('xml')
-  au BufNewFile,BufRead *.pkgproj call s:Setf('xml')
-  au BufNewFile,BufRead *.pluginspec call s:Setf('xml')
-  au BufNewFile,BufRead *.proj call s:Setf('xml')
-  au BufNewFile,BufRead *.props call s:Setf('xml')
-  au BufNewFile,BufRead *.ps1xml call s:Setf('xml')
-  au BufNewFile,BufRead *.psc1 call s:Setf('xml')
-  au BufNewFile,BufRead *.pt call s:Setf('xml')
-  au BufNewFile,BufRead *.rdf call s:Setf('xml')
-  au BufNewFile,BufRead *.resx call s:Setf('xml')
-  au BufNewFile,BufRead *.rss call s:Setf('xml')
-  au BufNewFile,BufRead *.sch call s:Setf('xml')
-  au BufNewFile,BufRead *.scxml call s:Setf('xml')
-  au BufNewFile,BufRead *.sfproj call s:Setf('xml')
-  au BufNewFile,BufRead *.shproj call s:Setf('xml')
-  au BufNewFile,BufRead *.srdf call s:Setf('xml')
-  au BufNewFile,BufRead *.storyboard call s:Setf('xml')
-  au BufNewFile,BufRead *.sublime-snippet call s:Setf('xml')
-  au BufNewFile,BufRead *.targets call s:Setf('xml')
-  au BufNewFile,BufRead *.tml call s:Setf('xml')
-  au BufNewFile,BufRead *.ui call s:Setf('xml')
-  au BufNewFile,BufRead *.urdf call s:Setf('xml')
-  au BufNewFile,BufRead *.ux call s:Setf('xml')
-  au BufNewFile,BufRead *.vbproj call s:Setf('xml')
-  au BufNewFile,BufRead *.vcxproj call s:Setf('xml')
-  au BufNewFile,BufRead *.vsixmanifest call s:Setf('xml')
-  au BufNewFile,BufRead *.vssettings call s:Setf('xml')
-  au BufNewFile,BufRead *.vstemplate call s:Setf('xml')
-  au BufNewFile,BufRead *.vxml call s:Setf('xml')
-  au BufNewFile,BufRead *.wixproj call s:Setf('xml')
-  au BufNewFile,BufRead *.workflow call s:Setf('xml')
-  au BufNewFile,BufRead *.wsdl call s:Setf('xml')
-  au BufNewFile,BufRead *.wsf call s:Setf('xml')
-  au BufNewFile,BufRead *.wxi call s:Setf('xml')
-  au BufNewFile,BufRead *.wxl call s:Setf('xml')
-  au BufNewFile,BufRead *.wxs call s:Setf('xml')
-  au BufNewFile,BufRead *.x3d call s:Setf('xml')
-  au BufNewFile,BufRead *.xacro call s:Setf('xml')
-  au BufNewFile,BufRead *.xaml call s:Setf('xml')
-  au BufNewFile,BufRead *.xib call s:Setf('xml')
-  au BufNewFile,BufRead *.xlf call s:Setf('xml')
-  au BufNewFile,BufRead *.xliff call s:Setf('xml')
-  au BufNewFile,BufRead *.xmi call s:Setf('xml')
-  au BufNewFile,BufRead *.xml call s:Setf('xml')
-  au BufNewFile,BufRead *.xml.dist call s:Setf('xml')
-  au BufNewFile,BufRead *.xproj call s:Setf('xml')
-  au BufNewFile,BufRead *.xsd call s:Setf('xml')
-  au BufNewFile,BufRead *.xspec call s:Setf('xml')
-  au BufNewFile,BufRead *.xul call s:Setf('xml')
-  au BufNewFile,BufRead *.zcml call s:Setf('xml')
-  au BufNewFile,BufRead {.,}classpath call s:Setf('xml')
-  au BufNewFile,BufRead {.,}cproject call s:Setf('xml')
-  au BufNewFile,BufRead {.,}project call s:Setf('xml')
-  au BufNewFile,BufRead App.config call s:Setf('xml')
-  au BufNewFile,BufRead NuGet.config call s:Setf('xml')
-  au BufNewFile,BufRead Settings.StyleCop call s:Setf('xml')
-  au BufNewFile,BufRead Web.Debug.config call s:Setf('xml')
-  au BufNewFile,BufRead Web.Release.config call s:Setf('xml')
-  au BufNewFile,BufRead Web.config call s:Setf('xml')
-  au BufNewFile,BufRead packages.config call s:Setf('xml')
+  au BufNewFile,BufRead *.adml set ft=xml
+  au BufNewFile,BufRead *.admx set ft=xml
+  au BufNewFile,BufRead *.ant set ft=xml
+  au BufNewFile,BufRead *.axml set ft=xml
+  au BufNewFile,BufRead *.builds set ft=xml
+  au BufNewFile,BufRead *.ccproj set ft=xml
+  au BufNewFile,BufRead *.ccxml set ft=xml
+  au BufNewFile,BufRead *.cdxml set ft=xml
+  au BufNewFile,BufRead *.clixml set ft=xml
+  au BufNewFile,BufRead *.cproject set ft=xml
+  au BufNewFile,BufRead *.cscfg set ft=xml
+  au BufNewFile,BufRead *.csdef set ft=xml
+  au BufNewFile,BufRead *.csl set ft=xml
+  au BufNewFile,BufRead *.csproj set ft=xml
+  au BufNewFile,BufRead *.ct set ft=xml
+  au BufNewFile,BufRead *.depproj set ft=xml
+  au BufNewFile,BufRead *.dita set ft=xml
+  au BufNewFile,BufRead *.ditamap set ft=xml
+  au BufNewFile,BufRead *.ditaval set ft=xml
+  au BufNewFile,BufRead *.dll.config set ft=xml
+  au BufNewFile,BufRead *.dotsettings set ft=xml
+  au BufNewFile,BufRead *.filters set ft=xml
+  au BufNewFile,BufRead *.fsproj set ft=xml
+  au BufNewFile,BufRead *.fxml set ft=xml
+  au BufNewFile,BufRead *.glade set ft=xml
+  au BufNewFile,BufRead *.gml set ft=xml
+  au BufNewFile,BufRead *.gmx set ft=xml
+  au BufNewFile,BufRead *.grxml set ft=xml
+  au BufNewFile,BufRead *.gst set ft=xml
+  au BufNewFile,BufRead *.iml set ft=xml
+  au BufNewFile,BufRead *.ivy set ft=xml
+  au BufNewFile,BufRead *.jelly set ft=xml
+  au BufNewFile,BufRead *.jsproj set ft=xml
+  au BufNewFile,BufRead *.kml set ft=xml
+  au BufNewFile,BufRead *.launch set ft=xml
+  au BufNewFile,BufRead *.mdpolicy set ft=xml
+  au BufNewFile,BufRead *.mjml set ft=xml
+  au BufNewFile,BufRead *.mm set ft=xml
+  au BufNewFile,BufRead *.mod set ft=xml
+  au BufNewFile,BufRead *.mxml set ft=xml
+  au BufNewFile,BufRead *.natvis set ft=xml
+  au BufNewFile,BufRead *.ncl set ft=xml
+  au BufNewFile,BufRead *.ndproj set ft=xml
+  au BufNewFile,BufRead *.nproj set ft=xml
+  au BufNewFile,BufRead *.nuspec set ft=xml
+  au BufNewFile,BufRead *.odd set ft=xml
+  au BufNewFile,BufRead *.osm set ft=xml
+  au BufNewFile,BufRead *.pkgproj set ft=xml
+  au BufNewFile,BufRead *.pluginspec set ft=xml
+  au BufNewFile,BufRead *.proj set ft=xml
+  au BufNewFile,BufRead *.props set ft=xml
+  au BufNewFile,BufRead *.ps1xml set ft=xml
+  au BufNewFile,BufRead *.psc1 set ft=xml
+  au BufNewFile,BufRead *.pt set ft=xml
+  au BufNewFile,BufRead *.rdf set ft=xml
+  au BufNewFile,BufRead *.resx set ft=xml
+  au BufNewFile,BufRead *.rss set ft=xml
+  au BufNewFile,BufRead *.sch set ft=xml
+  au BufNewFile,BufRead *.scxml set ft=xml
+  au BufNewFile,BufRead *.sfproj set ft=xml
+  au BufNewFile,BufRead *.shproj set ft=xml
+  au BufNewFile,BufRead *.srdf set ft=xml
+  au BufNewFile,BufRead *.storyboard set ft=xml
+  au BufNewFile,BufRead *.sublime-snippet set ft=xml
+  au BufNewFile,BufRead *.targets set ft=xml
+  au BufNewFile,BufRead *.tml set ft=xml
+  au BufNewFile,BufRead *.ui set ft=xml
+  au BufNewFile,BufRead *.urdf set ft=xml
+  au BufNewFile,BufRead *.ux set ft=xml
+  au BufNewFile,BufRead *.vbproj set ft=xml
+  au BufNewFile,BufRead *.vcxproj set ft=xml
+  au BufNewFile,BufRead *.vsixmanifest set ft=xml
+  au BufNewFile,BufRead *.vssettings set ft=xml
+  au BufNewFile,BufRead *.vstemplate set ft=xml
+  au BufNewFile,BufRead *.vxml set ft=xml
+  au BufNewFile,BufRead *.wixproj set ft=xml
+  au BufNewFile,BufRead *.workflow set ft=xml
+  au BufNewFile,BufRead *.wsdl set ft=xml
+  au BufNewFile,BufRead *.wsf set ft=xml
+  au BufNewFile,BufRead *.wxi set ft=xml
+  au BufNewFile,BufRead *.wxl set ft=xml
+  au BufNewFile,BufRead *.wxs set ft=xml
+  au BufNewFile,BufRead *.x3d set ft=xml
+  au BufNewFile,BufRead *.xacro set ft=xml
+  au BufNewFile,BufRead *.xaml set ft=xml
+  au BufNewFile,BufRead *.xib set ft=xml
+  au BufNewFile,BufRead *.xlf set ft=xml
+  au BufNewFile,BufRead *.xliff set ft=xml
+  au BufNewFile,BufRead *.xmi set ft=xml
+  au BufNewFile,BufRead *.xml set ft=xml
+  au BufNewFile,BufRead *.xml.dist set ft=xml
+  au BufNewFile,BufRead *.xproj set ft=xml
+  au BufNewFile,BufRead *.xsd set ft=xml
+  au BufNewFile,BufRead *.xspec set ft=xml
+  au BufNewFile,BufRead *.xul set ft=xml
+  au BufNewFile,BufRead *.zcml set ft=xml
+  au BufNewFile,BufRead {.,}classpath set ft=xml
+  au BufNewFile,BufRead {.,}cproject set ft=xml
+  au BufNewFile,BufRead {.,}project set ft=xml
+  au BufNewFile,BufRead App.config set ft=xml
+  au BufNewFile,BufRead NuGet.config set ft=xml
+  au BufNewFile,BufRead Settings.StyleCop set ft=xml
+  au BufNewFile,BufRead Web.Debug.config set ft=xml
+  au BufNewFile,BufRead Web.Release.config set ft=xml
+  au BufNewFile,BufRead Web.config set ft=xml
+  au BufNewFile,BufRead packages.config set ft=xml
 endif
 
 if !has_key(s:disabled_packages, 'ant')
-  au BufNewFile,BufRead build.xml call s:Setf('ant')
+  au BufNewFile,BufRead build.xml set ft=ant
 endif
 
 if !has_key(s:disabled_packages, 'apache')
@@ -685,10 +685,10 @@ if !has_key(s:disabled_packages, 'apache')
   au BufNewFile,BufRead */etc/apache2/conf.*/* call s:StarSetf('apache')
   au BufNewFile,BufRead */etc/apache2/mods-*/* call s:StarSetf('apache')
   au BufNewFile,BufRead */etc/apache2/sites-*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/sites-*/*.com call s:Setf('apache')
-  au BufNewFile,BufRead */etc/httpd/*.conf call s:Setf('apache')
+  au BufNewFile,BufRead */etc/apache2/sites-*/*.com set ft=apache
+  au BufNewFile,BufRead */etc/httpd/*.conf set ft=apache
   au BufNewFile,BufRead */etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead {.,}htaccess call s:Setf('apache')
+  au BufNewFile,BufRead {.,}htaccess set ft=apache
   au BufNewFile,BufRead access.conf* call s:StarSetf('apache')
   au BufNewFile,BufRead apache.conf* call s:StarSetf('apache')
   au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
@@ -697,83 +697,83 @@ if !has_key(s:disabled_packages, 'apache')
 endif
 
 if !has_key(s:disabled_packages, 'apiblueprint')
-  au BufNewFile,BufRead *.apib call s:Setf('apiblueprint')
+  au BufNewFile,BufRead *.apib set ft=apiblueprint
 endif
 
 if !has_key(s:disabled_packages, 'applescript')
-  au BufNewFile,BufRead *.applescript call s:Setf('applescript')
-  au BufNewFile,BufRead *.scpt call s:Setf('applescript')
+  au BufNewFile,BufRead *.applescript set ft=applescript
+  au BufNewFile,BufRead *.scpt set ft=applescript
 endif
 
 if !has_key(s:disabled_packages, 'aptconf')
-  au BufNewFile,BufRead */.aptitude/config call s:Setf('aptconf')
-  au BufNewFile,BufRead */etc/apt/apt.conf.d/*.conf call s:Setf('aptconf')
+  au BufNewFile,BufRead */.aptitude/config set ft=aptconf
+  au BufNewFile,BufRead */etc/apt/apt.conf.d/*.conf set ft=aptconf
   au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
-  au BufNewFile,BufRead apt.conf call s:Setf('aptconf')
+  au BufNewFile,BufRead apt.conf set ft=aptconf
 endif
 
 if !has_key(s:disabled_packages, 'arch')
-  au BufNewFile,BufRead {.,}arch-inventory call s:Setf('arch')
-  au BufNewFile,BufRead =tagging-method call s:Setf('arch')
+  au BufNewFile,BufRead {.,}arch-inventory set ft=arch
+  au BufNewFile,BufRead =tagging-method set ft=arch
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
-  au BufNewFile,BufRead *.c++ call s:Setf('cpp')
-  au BufNewFile,BufRead *.cc call s:Setf('cpp')
-  au BufNewFile,BufRead *.cp call s:Setf('cpp')
-  au BufNewFile,BufRead *.cpp call s:Setf('cpp')
-  au BufNewFile,BufRead *.cxx call s:Setf('cpp')
-  au BufNewFile,BufRead *.h++ call s:Setf('cpp')
-  au BufNewFile,BufRead *.hh call s:Setf('cpp')
-  au BufNewFile,BufRead *.hpp call s:Setf('cpp')
-  au BufNewFile,BufRead *.hxx call s:Setf('cpp')
-  au BufNewFile,BufRead *.inc call s:Setf('cpp')
-  au BufNewFile,BufRead *.inl call s:Setf('cpp')
-  au BufNewFile,BufRead *.ipp call s:Setf('cpp')
-  au BufNewFile,BufRead *.moc call s:Setf('cpp')
-  au BufNewFile,BufRead *.tcc call s:Setf('cpp')
-  au BufNewFile,BufRead *.tlh call s:Setf('cpp')
-  au BufNewFile,BufRead *.tpp call s:Setf('cpp')
-  au BufNewFile,BufRead *.c call s:Setf('c')
-  au BufNewFile,BufRead *.cats call s:Setf('c')
-  au BufNewFile,BufRead *.idc call s:Setf('c')
-  au BufNewFile,BufRead *.qc call s:Setf('c')
-  au BufNewFile,BufRead *enlightenment/*.cfg call s:Setf('c')
+  au BufNewFile,BufRead *.c++ set ft=cpp
+  au BufNewFile,BufRead *.cc set ft=cpp
+  au BufNewFile,BufRead *.cp set ft=cpp
+  au BufNewFile,BufRead *.cpp set ft=cpp
+  au BufNewFile,BufRead *.cxx set ft=cpp
+  au BufNewFile,BufRead *.h++ set ft=cpp
+  au BufNewFile,BufRead *.hh set ft=cpp
+  au BufNewFile,BufRead *.hpp set ft=cpp
+  au BufNewFile,BufRead *.hxx set ft=cpp
+  au BufNewFile,BufRead *.inc set ft=cpp
+  au BufNewFile,BufRead *.inl set ft=cpp
+  au BufNewFile,BufRead *.ipp set ft=cpp
+  au BufNewFile,BufRead *.moc set ft=cpp
+  au BufNewFile,BufRead *.tcc set ft=cpp
+  au BufNewFile,BufRead *.tlh set ft=cpp
+  au BufNewFile,BufRead *.tpp set ft=cpp
+  au BufNewFile,BufRead *.c set ft=c
+  au BufNewFile,BufRead *.cats set ft=c
+  au BufNewFile,BufRead *.idc set ft=c
+  au BufNewFile,BufRead *.qc set ft=c
+  au BufNewFile,BufRead *enlightenment/*.cfg set ft=c
   au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'arduino')
-  au BufNewFile,BufRead *.ino call s:Setf('arduino')
-  au BufNewFile,BufRead *.pde call s:Setf('arduino')
+  au BufNewFile,BufRead *.ino set ft=arduino
+  au BufNewFile,BufRead *.pde set ft=arduino
 endif
 
 if !has_key(s:disabled_packages, 'art')
-  au BufNewFile,BufRead *.art call s:Setf('art')
+  au BufNewFile,BufRead *.art set ft=art
 endif
 
 if !has_key(s:disabled_packages, 'asciidoc')
-  au BufNewFile,BufRead *.adoc call s:Setf('asciidoc')
-  au BufNewFile,BufRead *.asc call s:Setf('asciidoc')
-  au BufNewFile,BufRead *.asciidoc call s:Setf('asciidoc')
+  au BufNewFile,BufRead *.adoc set ft=asciidoc
+  au BufNewFile,BufRead *.asc set ft=asciidoc
+  au BufNewFile,BufRead *.asciidoc set ft=asciidoc
 endif
 
 if !has_key(s:disabled_packages, 'autohotkey')
-  au BufNewFile,BufRead *.ahk call s:Setf('autohotkey')
-  au BufNewFile,BufRead *.ahkl call s:Setf('autohotkey')
+  au BufNewFile,BufRead *.ahk set ft=autohotkey
+  au BufNewFile,BufRead *.ahkl set ft=autohotkey
 endif
 
 if !has_key(s:disabled_packages, 'elf')
-  au BufNewFile,BufRead *.am call s:Setf('elf')
+  au BufNewFile,BufRead *.am set ft=elf
 endif
 
 if !has_key(s:disabled_packages, 'automake')
-  au BufNewFile,BufRead GNUmakefile.am call s:Setf('automake')
-  au BufNewFile,BufRead [Mm]akefile.am call s:Setf('automake')
+  au BufNewFile,BufRead GNUmakefile.am set ft=automake
+  au BufNewFile,BufRead [Mm]akefile.am set ft=automake
 endif
 
 if !has_key(s:disabled_packages, 'asn')
-  au BufNewFile,BufRead *.asn call s:Setf('asn')
-  au BufNewFile,BufRead *.asn1 call s:Setf('asn')
+  au BufNewFile,BufRead *.asn set ft=asn
+  au BufNewFile,BufRead *.asn1 set ft=asn
 endif
 
 if !has_key(s:disabled_packages, 'aspvbs')
@@ -786,559 +786,559 @@ if !has_key(s:disabled_packages, 'aspperl')
 endif
 
 if !has_key(s:disabled_packages, 'atlas')
-  au BufNewFile,BufRead *.as call s:Setf('atlas')
-  au BufNewFile,BufRead *.atl call s:Setf('atlas')
+  au BufNewFile,BufRead *.as set ft=atlas
+  au BufNewFile,BufRead *.atl set ft=atlas
 endif
 
 if !has_key(s:disabled_packages, 'autoit')
-  au BufNewFile,BufRead *.au3 call s:Setf('autoit')
+  au BufNewFile,BufRead *.au3 set ft=autoit
 endif
 
 if !has_key(s:disabled_packages, 'ave')
-  au BufNewFile,BufRead *.ave call s:Setf('ave')
+  au BufNewFile,BufRead *.ave set ft=ave
 endif
 
 if !has_key(s:disabled_packages, 'awk')
-  au BufNewFile,BufRead *.awk call s:Setf('awk')
-  au BufNewFile,BufRead *.gawk call s:Setf('awk')
+  au BufNewFile,BufRead *.awk set ft=awk
+  au BufNewFile,BufRead *.gawk set ft=awk
 endif
 
 if !has_key(s:disabled_packages, 'caddyfile')
-  au BufNewFile,BufRead Caddyfile call s:Setf('caddyfile')
+  au BufNewFile,BufRead Caddyfile set ft=caddyfile
 endif
 
 if !has_key(s:disabled_packages, 'carp')
-  au BufNewFile,BufRead *.carp call s:Setf('carp')
+  au BufNewFile,BufRead *.carp set ft=carp
 endif
 
 if !has_key(s:disabled_packages, 'clojure')
-  au BufNewFile,BufRead *.boot call s:Setf('clojure')
-  au BufNewFile,BufRead *.cl2 call s:Setf('clojure')
-  au BufNewFile,BufRead *.clj call s:Setf('clojure')
-  au BufNewFile,BufRead *.cljc call s:Setf('clojure')
-  au BufNewFile,BufRead *.cljs call s:Setf('clojure')
-  au BufNewFile,BufRead *.cljs.hl call s:Setf('clojure')
-  au BufNewFile,BufRead *.cljscm call s:Setf('clojure')
-  au BufNewFile,BufRead *.cljx call s:Setf('clojure')
-  au BufNewFile,BufRead *.edn call s:Setf('clojure')
-  au BufNewFile,BufRead *.hic call s:Setf('clojure')
-  au BufNewFile,BufRead build.boot call s:Setf('clojure')
-  au BufNewFile,BufRead profile.boot call s:Setf('clojure')
-  au BufNewFile,BufRead riemann.config call s:Setf('clojure')
+  au BufNewFile,BufRead *.boot set ft=clojure
+  au BufNewFile,BufRead *.cl2 set ft=clojure
+  au BufNewFile,BufRead *.clj set ft=clojure
+  au BufNewFile,BufRead *.cljc set ft=clojure
+  au BufNewFile,BufRead *.cljs set ft=clojure
+  au BufNewFile,BufRead *.cljs.hl set ft=clojure
+  au BufNewFile,BufRead *.cljscm set ft=clojure
+  au BufNewFile,BufRead *.cljx set ft=clojure
+  au BufNewFile,BufRead *.edn set ft=clojure
+  au BufNewFile,BufRead *.hic set ft=clojure
+  au BufNewFile,BufRead build.boot set ft=clojure
+  au BufNewFile,BufRead profile.boot set ft=clojure
+  au BufNewFile,BufRead riemann.config set ft=clojure
 endif
 
 if !has_key(s:disabled_packages, 'cmake')
-  au BufNewFile,BufRead *.cmake call s:Setf('cmake')
-  au BufNewFile,BufRead *.cmake.in call s:Setf('cmake')
-  au BufNewFile,BufRead CMakeLists.txt call s:Setf('cmake')
+  au BufNewFile,BufRead *.cmake set ft=cmake
+  au BufNewFile,BufRead *.cmake.in set ft=cmake
+  au BufNewFile,BufRead CMakeLists.txt set ft=cmake
 endif
 
 if !has_key(s:disabled_packages, 'coffee-script')
-  au BufNewFile,BufRead *._coffee call s:Setf('coffee')
-  au BufNewFile,BufRead *.cake call s:Setf('coffee')
-  au BufNewFile,BufRead *.cjsx call s:Setf('coffee')
-  au BufNewFile,BufRead *.coffee call s:Setf('coffee')
-  au BufNewFile,BufRead *.coffeekup call s:Setf('coffee')
-  au BufNewFile,BufRead *.iced call s:Setf('coffee')
-  au BufNewFile,BufRead Cakefile call s:Setf('coffee')
-  au BufNewFile,BufRead *.coffee.md call s:Setf('litcoffee')
-  au BufNewFile,BufRead *.litcoffee call s:Setf('litcoffee')
+  au BufNewFile,BufRead *._coffee set ft=coffee
+  au BufNewFile,BufRead *.cake set ft=coffee
+  au BufNewFile,BufRead *.cjsx set ft=coffee
+  au BufNewFile,BufRead *.coffee set ft=coffee
+  au BufNewFile,BufRead *.coffeekup set ft=coffee
+  au BufNewFile,BufRead *.iced set ft=coffee
+  au BufNewFile,BufRead Cakefile set ft=coffee
+  au BufNewFile,BufRead *.coffee.md set ft=litcoffee
+  au BufNewFile,BufRead *.litcoffee set ft=litcoffee
 endif
 
 if !has_key(s:disabled_packages, 'cryptol')
-  au BufNewFile,BufRead *.cry call s:Setf('cryptol')
-  au BufNewFile,BufRead *.cyl call s:Setf('cryptol')
-  au BufNewFile,BufRead *.lcry call s:Setf('cryptol')
-  au BufNewFile,BufRead *.lcyl call s:Setf('cryptol')
+  au BufNewFile,BufRead *.cry set ft=cryptol
+  au BufNewFile,BufRead *.cyl set ft=cryptol
+  au BufNewFile,BufRead *.lcry set ft=cryptol
+  au BufNewFile,BufRead *.lcyl set ft=cryptol
 endif
 
 if !has_key(s:disabled_packages, 'crystal')
-  au BufNewFile,BufRead *.cr call s:Setf('crystal')
-  au BufNewFile,BufRead Projectfile call s:Setf('crystal')
-  au BufNewFile,BufRead *.ecr call s:Setf('ecrystal')
+  au BufNewFile,BufRead *.cr set ft=crystal
+  au BufNewFile,BufRead Projectfile set ft=crystal
+  au BufNewFile,BufRead *.ecr set ft=ecrystal
 endif
 
 if !has_key(s:disabled_packages, 'csv')
-  au BufNewFile,BufRead *.csv call s:Setf('csv')
-  au BufNewFile,BufRead *.tab call s:Setf('csv')
-  au BufNewFile,BufRead *.tsv call s:Setf('csv')
+  au BufNewFile,BufRead *.csv set ft=csv
+  au BufNewFile,BufRead *.tab set ft=csv
+  au BufNewFile,BufRead *.tsv set ft=csv
 endif
 
 if !has_key(s:disabled_packages, 'cucumber')
-  au BufNewFile,BufRead *.feature call s:Setf('cucumber')
-  au BufNewFile,BufRead *.story call s:Setf('cucumber')
+  au BufNewFile,BufRead *.feature set ft=cucumber
+  au BufNewFile,BufRead *.story set ft=cucumber
 endif
 
 if !has_key(s:disabled_packages, 'cue')
-  au BufNewFile,BufRead *.cue call s:Setf('cuesheet')
+  au BufNewFile,BufRead *.cue set ft=cuesheet
 endif
 
 if !has_key(s:disabled_packages, 'dart')
-  au BufNewFile,BufRead *.dart call s:Setf('dart')
-  au BufNewFile,BufRead *.drt call s:Setf('dart')
+  au BufNewFile,BufRead *.dart set ft=dart
+  au BufNewFile,BufRead *.drt set ft=dart
 endif
 
 if !has_key(s:disabled_packages, 'dhall')
-  au BufNewFile,BufRead *.dhall call s:Setf('dhall')
+  au BufNewFile,BufRead *.dhall set ft=dhall
 endif
 
 if !has_key(s:disabled_packages, 'dlang')
-  au BufNewFile,BufRead *.d call s:Setf('d')
-  au BufNewFile,BufRead *.di call s:Setf('d')
-  au BufNewFile,BufRead *.lst call s:Setf('dcov')
-  au BufNewFile,BufRead *.dd call s:Setf('dd')
-  au BufNewFile,BufRead *.ddoc call s:Setf('ddoc')
-  au BufNewFile,BufRead *.sdl call s:Setf('dsdl')
+  au BufNewFile,BufRead *.d set ft=d
+  au BufNewFile,BufRead *.di set ft=d
+  au BufNewFile,BufRead *.lst set ft=dcov
+  au BufNewFile,BufRead *.dd set ft=dd
+  au BufNewFile,BufRead *.ddoc set ft=ddoc
+  au BufNewFile,BufRead *.sdl set ft=dsdl
 endif
 
 if !has_key(s:disabled_packages, 'dockerfile')
-  au BufNewFile,BufRead *.Dockerfile call s:Setf('Dockerfile')
-  au BufNewFile,BufRead *.dock call s:Setf('Dockerfile')
-  au BufNewFile,BufRead *.dockerfile call s:Setf('Dockerfile')
-  au BufNewFile,BufRead Dockerfile call s:Setf('Dockerfile')
+  au BufNewFile,BufRead *.Dockerfile set ft=Dockerfile
+  au BufNewFile,BufRead *.dock set ft=Dockerfile
+  au BufNewFile,BufRead *.dockerfile set ft=Dockerfile
+  au BufNewFile,BufRead Dockerfile set ft=Dockerfile
   au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
-  au BufNewFile,BufRead dockerfile call s:Setf('Dockerfile')
-  au BufNewFile,BufRead docker-compose*.yaml call s:Setf('yaml.docker-compose')
-  au BufNewFile,BufRead docker-compose*.yml call s:Setf('yaml.docker-compose')
+  au BufNewFile,BufRead dockerfile set ft=Dockerfile
+  au BufNewFile,BufRead docker-compose*.yaml set ft=yaml.docker-compose
+  au BufNewFile,BufRead docker-compose*.yml set ft=yaml.docker-compose
 endif
 
 if !has_key(s:disabled_packages, 'elixir')
-  au BufNewFile,BufRead *.ex call s:Setf('elixir')
-  au BufNewFile,BufRead *.exs call s:Setf('elixir')
-  au BufNewFile,BufRead mix.lock call s:Setf('elixir')
-  au BufNewFile,BufRead *.eex call s:Setf('eelixir')
-  au BufNewFile,BufRead *.leex call s:Setf('eelixir')
+  au BufNewFile,BufRead *.ex set ft=elixir
+  au BufNewFile,BufRead *.exs set ft=elixir
+  au BufNewFile,BufRead mix.lock set ft=elixir
+  au BufNewFile,BufRead *.eex set ft=eelixir
+  au BufNewFile,BufRead *.leex set ft=eelixir
 endif
 
 if !has_key(s:disabled_packages, 'elm')
-  au BufNewFile,BufRead *.elm call s:Setf('elm')
+  au BufNewFile,BufRead *.elm set ft=elm
 endif
 
 if !has_key(s:disabled_packages, 'emberscript')
-  au BufNewFile,BufRead *.em call s:Setf('ember-script')
-  au BufNewFile,BufRead *.emberscript call s:Setf('ember-script')
+  au BufNewFile,BufRead *.em set ft=ember-script
+  au BufNewFile,BufRead *.emberscript set ft=ember-script
 endif
 
 if !has_key(s:disabled_packages, 'emblem')
-  au BufNewFile,BufRead *.em call s:Setf('emblem')
-  au BufNewFile,BufRead *.emblem call s:Setf('emblem')
+  au BufNewFile,BufRead *.em set ft=emblem
+  au BufNewFile,BufRead *.emblem set ft=emblem
 endif
 
 if !has_key(s:disabled_packages, 'erlang')
-  au BufNewFile,BufRead *.app call s:Setf('erlang')
-  au BufNewFile,BufRead *.app.src call s:Setf('erlang')
-  au BufNewFile,BufRead *.erl call s:Setf('erlang')
-  au BufNewFile,BufRead *.es call s:Setf('erlang')
-  au BufNewFile,BufRead *.escript call s:Setf('erlang')
-  au BufNewFile,BufRead *.hrl call s:Setf('erlang')
-  au BufNewFile,BufRead *.xrl call s:Setf('erlang')
-  au BufNewFile,BufRead *.yaws call s:Setf('erlang')
-  au BufNewFile,BufRead *.yrl call s:Setf('erlang')
-  au BufNewFile,BufRead Emakefile call s:Setf('erlang')
-  au BufNewFile,BufRead rebar.config call s:Setf('erlang')
-  au BufNewFile,BufRead rebar.config.lock call s:Setf('erlang')
-  au BufNewFile,BufRead rebar.lock call s:Setf('erlang')
+  au BufNewFile,BufRead *.app set ft=erlang
+  au BufNewFile,BufRead *.app.src set ft=erlang
+  au BufNewFile,BufRead *.erl set ft=erlang
+  au BufNewFile,BufRead *.es set ft=erlang
+  au BufNewFile,BufRead *.escript set ft=erlang
+  au BufNewFile,BufRead *.hrl set ft=erlang
+  au BufNewFile,BufRead *.xrl set ft=erlang
+  au BufNewFile,BufRead *.yaws set ft=erlang
+  au BufNewFile,BufRead *.yrl set ft=erlang
+  au BufNewFile,BufRead Emakefile set ft=erlang
+  au BufNewFile,BufRead rebar.config set ft=erlang
+  au BufNewFile,BufRead rebar.config.lock set ft=erlang
+  au BufNewFile,BufRead rebar.lock set ft=erlang
 endif
 
 if !has_key(s:disabled_packages, 'fennel')
-  au BufNewFile,BufRead *.fnl call s:Setf('fennel')
+  au BufNewFile,BufRead *.fnl set ft=fennel
 endif
 
 if !has_key(s:disabled_packages, 'ferm')
-  au BufNewFile,BufRead *.ferm call s:Setf('ferm')
-  au BufNewFile,BufRead ferm.conf call s:Setf('ferm')
+  au BufNewFile,BufRead *.ferm set ft=ferm
+  au BufNewFile,BufRead ferm.conf set ft=ferm
 endif
 
 if !has_key(s:disabled_packages, 'fish')
-  au BufNewFile,BufRead *.fish call s:Setf('fish')
+  au BufNewFile,BufRead *.fish set ft=fish
 endif
 
 if !has_key(s:disabled_packages, 'flatbuffers')
-  au BufNewFile,BufRead *.fbs call s:Setf('fbs')
+  au BufNewFile,BufRead *.fbs set ft=fbs
 endif
 
 if !has_key(s:disabled_packages, 'forth')
-  au BufNewFile,BufRead *.ft call s:Setf('forth')
-  au BufNewFile,BufRead *.fth call s:Setf('forth')
+  au BufNewFile,BufRead *.ft set ft=forth
+  au BufNewFile,BufRead *.fth set ft=forth
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'glsl')
-  au BufNewFile,BufRead *.comp call s:Setf('glsl')
-  au BufNewFile,BufRead *.fp call s:Setf('glsl')
-  au BufNewFile,BufRead *.frag call s:Setf('glsl')
-  au BufNewFile,BufRead *.frg call s:Setf('glsl')
-  au BufNewFile,BufRead *.fsh call s:Setf('glsl')
-  au BufNewFile,BufRead *.fshader call s:Setf('glsl')
-  au BufNewFile,BufRead *.geo call s:Setf('glsl')
-  au BufNewFile,BufRead *.geom call s:Setf('glsl')
-  au BufNewFile,BufRead *.glsl call s:Setf('glsl')
-  au BufNewFile,BufRead *.glslf call s:Setf('glsl')
-  au BufNewFile,BufRead *.glslv call s:Setf('glsl')
-  au BufNewFile,BufRead *.gs call s:Setf('glsl')
-  au BufNewFile,BufRead *.gshader call s:Setf('glsl')
-  au BufNewFile,BufRead *.shader call s:Setf('glsl')
-  au BufNewFile,BufRead *.tesc call s:Setf('glsl')
-  au BufNewFile,BufRead *.tese call s:Setf('glsl')
-  au BufNewFile,BufRead *.vert call s:Setf('glsl')
-  au BufNewFile,BufRead *.vrx call s:Setf('glsl')
-  au BufNewFile,BufRead *.vsh call s:Setf('glsl')
-  au BufNewFile,BufRead *.vshader call s:Setf('glsl')
+  au BufNewFile,BufRead *.comp set ft=glsl
+  au BufNewFile,BufRead *.fp set ft=glsl
+  au BufNewFile,BufRead *.frag set ft=glsl
+  au BufNewFile,BufRead *.frg set ft=glsl
+  au BufNewFile,BufRead *.fsh set ft=glsl
+  au BufNewFile,BufRead *.fshader set ft=glsl
+  au BufNewFile,BufRead *.geo set ft=glsl
+  au BufNewFile,BufRead *.geom set ft=glsl
+  au BufNewFile,BufRead *.glsl set ft=glsl
+  au BufNewFile,BufRead *.glslf set ft=glsl
+  au BufNewFile,BufRead *.glslv set ft=glsl
+  au BufNewFile,BufRead *.gs set ft=glsl
+  au BufNewFile,BufRead *.gshader set ft=glsl
+  au BufNewFile,BufRead *.shader set ft=glsl
+  au BufNewFile,BufRead *.tesc set ft=glsl
+  au BufNewFile,BufRead *.tese set ft=glsl
+  au BufNewFile,BufRead *.vert set ft=glsl
+  au BufNewFile,BufRead *.vrx set ft=glsl
+  au BufNewFile,BufRead *.vsh set ft=glsl
+  au BufNewFile,BufRead *.vshader set ft=glsl
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'fsharp')
-  au BufNewFile,BufRead *.fsi call s:Setf('fsharp')
-  au BufNewFile,BufRead *.fsx call s:Setf('fsharp')
+  au BufNewFile,BufRead *.fsi set ft=fsharp
+  au BufNewFile,BufRead *.fsx set ft=fsharp
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'gdscript')
-  au BufNewFile,BufRead *.gd call s:Setf('gdscript3')
+  au BufNewFile,BufRead *.gd set ft=gdscript3
 endif
 
 if !has_key(s:disabled_packages, 'git')
-  au BufNewFile,BufRead *.gitconfig call s:Setf('gitconfig')
-  au BufNewFile,BufRead *.git/config call s:Setf('gitconfig')
-  au BufNewFile,BufRead *.git/modules/*/config call s:Setf('gitconfig')
-  au BufNewFile,BufRead */.config/git/config call s:Setf('gitconfig')
-  au BufNewFile,BufRead */git/config call s:Setf('gitconfig')
+  au BufNewFile,BufRead *.gitconfig set ft=gitconfig
+  au BufNewFile,BufRead *.git/config set ft=gitconfig
+  au BufNewFile,BufRead *.git/modules/*/config set ft=gitconfig
+  au BufNewFile,BufRead */.config/git/config set ft=gitconfig
+  au BufNewFile,BufRead */git/config set ft=gitconfig
   au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
-  au BufNewFile,BufRead {.,}gitconfig call s:Setf('gitconfig')
-  au BufNewFile,BufRead {.,}gitmodules call s:Setf('gitconfig')
-  au BufNewFile,BufRead git-rebase-todo call s:Setf('gitrebase')
+  au BufNewFile,BufRead {.,}gitconfig set ft=gitconfig
+  au BufNewFile,BufRead {.,}gitmodules set ft=gitconfig
+  au BufNewFile,BufRead git-rebase-todo set ft=gitrebase
   au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
-  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG call s:Setf('gitcommit')
+  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG set ft=gitcommit
 endif
 
 if !has_key(s:disabled_packages, 'gmpl')
-  au BufNewFile,BufRead *.mod call s:Setf('gmpl')
+  au BufNewFile,BufRead *.mod set ft=gmpl
 endif
 
 if !has_key(s:disabled_packages, 'gnuplot')
-  au BufNewFile,BufRead *.gnu call s:Setf('gnuplot')
-  au BufNewFile,BufRead *.gnuplot call s:Setf('gnuplot')
-  au BufNewFile,BufRead *.gp call s:Setf('gnuplot')
-  au BufNewFile,BufRead *.gpi call s:Setf('gnuplot')
-  au BufNewFile,BufRead *.p call s:Setf('gnuplot')
-  au BufNewFile,BufRead *.plot call s:Setf('gnuplot')
-  au BufNewFile,BufRead *.plt call s:Setf('gnuplot')
+  au BufNewFile,BufRead *.gnu set ft=gnuplot
+  au BufNewFile,BufRead *.gnuplot set ft=gnuplot
+  au BufNewFile,BufRead *.gp set ft=gnuplot
+  au BufNewFile,BufRead *.gpi set ft=gnuplot
+  au BufNewFile,BufRead *.p set ft=gnuplot
+  au BufNewFile,BufRead *.plot set ft=gnuplot
+  au BufNewFile,BufRead *.plt set ft=gnuplot
 endif
 
 if !has_key(s:disabled_packages, 'go')
-  au BufNewFile,BufRead *.go call s:Setf('go')
-  au BufNewFile,BufRead go.mod call s:Setf('gomod')
-  au BufNewFile,BufRead *.tmpl call s:Setf('gohtmltmpl')
+  au BufNewFile,BufRead *.go set ft=go
+  au BufNewFile,BufRead go.mod set ft=gomod
+  au BufNewFile,BufRead *.tmpl set ft=gohtmltmpl
 endif
 
 if !has_key(s:disabled_packages, 'javascript')
-  au BufNewFile,BufRead *._js call s:Setf('javascript')
-  au BufNewFile,BufRead *.bones call s:Setf('javascript')
-  au BufNewFile,BufRead *.cjs call s:Setf('javascript')
-  au BufNewFile,BufRead *.es call s:Setf('javascript')
-  au BufNewFile,BufRead *.es6 call s:Setf('javascript')
-  au BufNewFile,BufRead *.frag call s:Setf('javascript')
-  au BufNewFile,BufRead *.gs call s:Setf('javascript')
-  au BufNewFile,BufRead *.jake call s:Setf('javascript')
-  au BufNewFile,BufRead *.js call s:Setf('javascript')
-  au BufNewFile,BufRead *.jsb call s:Setf('javascript')
-  au BufNewFile,BufRead *.jscad call s:Setf('javascript')
-  au BufNewFile,BufRead *.jsfl call s:Setf('javascript')
-  au BufNewFile,BufRead *.jsm call s:Setf('javascript')
-  au BufNewFile,BufRead *.jss call s:Setf('javascript')
-  au BufNewFile,BufRead *.mjs call s:Setf('javascript')
-  au BufNewFile,BufRead *.njs call s:Setf('javascript')
-  au BufNewFile,BufRead *.pac call s:Setf('javascript')
-  au BufNewFile,BufRead *.sjs call s:Setf('javascript')
-  au BufNewFile,BufRead *.ssjs call s:Setf('javascript')
-  au BufNewFile,BufRead *.xsjs call s:Setf('javascript')
-  au BufNewFile,BufRead *.xsjslib call s:Setf('javascript')
-  au BufNewFile,BufRead Jakefile call s:Setf('javascript')
-  au BufNewFile,BufRead *.flow call s:Setf('flow')
+  au BufNewFile,BufRead *._js set ft=javascript
+  au BufNewFile,BufRead *.bones set ft=javascript
+  au BufNewFile,BufRead *.cjs set ft=javascript
+  au BufNewFile,BufRead *.es set ft=javascript
+  au BufNewFile,BufRead *.es6 set ft=javascript
+  au BufNewFile,BufRead *.frag set ft=javascript
+  au BufNewFile,BufRead *.gs set ft=javascript
+  au BufNewFile,BufRead *.jake set ft=javascript
+  au BufNewFile,BufRead *.js set ft=javascript
+  au BufNewFile,BufRead *.jsb set ft=javascript
+  au BufNewFile,BufRead *.jscad set ft=javascript
+  au BufNewFile,BufRead *.jsfl set ft=javascript
+  au BufNewFile,BufRead *.jsm set ft=javascript
+  au BufNewFile,BufRead *.jss set ft=javascript
+  au BufNewFile,BufRead *.mjs set ft=javascript
+  au BufNewFile,BufRead *.njs set ft=javascript
+  au BufNewFile,BufRead *.pac set ft=javascript
+  au BufNewFile,BufRead *.sjs set ft=javascript
+  au BufNewFile,BufRead *.ssjs set ft=javascript
+  au BufNewFile,BufRead *.xsjs set ft=javascript
+  au BufNewFile,BufRead *.xsjslib set ft=javascript
+  au BufNewFile,BufRead Jakefile set ft=javascript
+  au BufNewFile,BufRead *.flow set ft=flow
 endif
 
 if !has_key(s:disabled_packages, 'jsx')
-  au BufNewFile,BufRead *.jsx call s:Setf('javascriptreact')
+  au BufNewFile,BufRead *.jsx set ft=javascriptreact
 endif
 
 if !has_key(s:disabled_packages, 'graphql')
-  au BufNewFile,BufRead *.gql call s:Setf('graphql')
-  au BufNewFile,BufRead *.graphql call s:Setf('graphql')
-  au BufNewFile,BufRead *.graphqls call s:Setf('graphql')
+  au BufNewFile,BufRead *.gql set ft=graphql
+  au BufNewFile,BufRead *.graphql set ft=graphql
+  au BufNewFile,BufRead *.graphqls set ft=graphql
 endif
 
 if !has_key(s:disabled_packages, 'groovy')
-  au BufNewFile,BufRead *.gradle call s:Setf('groovy')
-  au BufNewFile,BufRead *.groovy call s:Setf('groovy')
-  au BufNewFile,BufRead *.grt call s:Setf('groovy')
-  au BufNewFile,BufRead *.gtpl call s:Setf('groovy')
-  au BufNewFile,BufRead *.gvy call s:Setf('groovy')
-  au BufNewFile,BufRead Jenkinsfile call s:Setf('groovy')
+  au BufNewFile,BufRead *.gradle set ft=groovy
+  au BufNewFile,BufRead *.groovy set ft=groovy
+  au BufNewFile,BufRead *.grt set ft=groovy
+  au BufNewFile,BufRead *.gtpl set ft=groovy
+  au BufNewFile,BufRead *.gvy set ft=groovy
+  au BufNewFile,BufRead Jenkinsfile set ft=groovy
 endif
 
 if !has_key(s:disabled_packages, 'grub')
-  au BufNewFile,BufRead */boot/grub/grub.conf call s:Setf('grub')
-  au BufNewFile,BufRead */boot/grub/menu.lst call s:Setf('grub')
-  au BufNewFile,BufRead */etc/grub.conf call s:Setf('grub')
+  au BufNewFile,BufRead */boot/grub/grub.conf set ft=grub
+  au BufNewFile,BufRead */boot/grub/menu.lst set ft=grub
+  au BufNewFile,BufRead */etc/grub.conf set ft=grub
 endif
 
 if !has_key(s:disabled_packages, 'haml')
-  au BufNewFile,BufRead *.haml call s:Setf('haml')
-  au BufNewFile,BufRead *.haml.deface call s:Setf('haml')
-  au BufNewFile,BufRead *.hamlbars call s:Setf('haml')
-  au BufNewFile,BufRead *.hamlc call s:Setf('haml')
+  au BufNewFile,BufRead *.haml set ft=haml
+  au BufNewFile,BufRead *.haml.deface set ft=haml
+  au BufNewFile,BufRead *.hamlbars set ft=haml
+  au BufNewFile,BufRead *.hamlc set ft=haml
 endif
 
 if !has_key(s:disabled_packages, 'handlebars')
-  au BufNewFile,BufRead *.handlebars call s:Setf('mustache')
-  au BufNewFile,BufRead *.hb call s:Setf('mustache')
-  au BufNewFile,BufRead *.hbs call s:Setf('mustache')
-  au BufNewFile,BufRead *.hdbs call s:Setf('mustache')
-  au BufNewFile,BufRead *.hjs call s:Setf('mustache')
-  au BufNewFile,BufRead *.hogan call s:Setf('mustache')
-  au BufNewFile,BufRead *.hulk call s:Setf('mustache')
-  au BufNewFile,BufRead *.mustache call s:Setf('mustache')
-  au BufNewFile,BufRead *.njk call s:Setf('mustache')
+  au BufNewFile,BufRead *.handlebars set ft=mustache
+  au BufNewFile,BufRead *.hb set ft=mustache
+  au BufNewFile,BufRead *.hbs set ft=mustache
+  au BufNewFile,BufRead *.hdbs set ft=mustache
+  au BufNewFile,BufRead *.hjs set ft=mustache
+  au BufNewFile,BufRead *.hogan set ft=mustache
+  au BufNewFile,BufRead *.hulk set ft=mustache
+  au BufNewFile,BufRead *.mustache set ft=mustache
+  au BufNewFile,BufRead *.njk set ft=mustache
 endif
 
 if !has_key(s:disabled_packages, 'haskell')
-  au BufNewFile,BufRead *.bpk call s:Setf('haskell')
-  au BufNewFile,BufRead *.hs call s:Setf('haskell')
-  au BufNewFile,BufRead *.hs-boot call s:Setf('haskell')
-  au BufNewFile,BufRead *.hsc call s:Setf('haskell')
-  au BufNewFile,BufRead *.hsig call s:Setf('haskell')
+  au BufNewFile,BufRead *.bpk set ft=haskell
+  au BufNewFile,BufRead *.hs set ft=haskell
+  au BufNewFile,BufRead *.hs-boot set ft=haskell
+  au BufNewFile,BufRead *.hsc set ft=haskell
+  au BufNewFile,BufRead *.hsig set ft=haskell
 endif
 
 if !has_key(s:disabled_packages, 'haxe')
-  au BufNewFile,BufRead *.hx call s:Setf('haxe')
-  au BufNewFile,BufRead *.hxsl call s:Setf('haxe')
+  au BufNewFile,BufRead *.hx set ft=haxe
+  au BufNewFile,BufRead *.hxsl set ft=haxe
 endif
 
 if !has_key(s:disabled_packages, 'hcl')
-  au BufNewFile,BufRead *.hcl call s:Setf('hcl')
-  au BufNewFile,BufRead *.nomad call s:Setf('hcl')
-  au BufNewFile,BufRead *.workflow call s:Setf('hcl')
-  au BufNewFile,BufRead Appfile call s:Setf('hcl')
+  au BufNewFile,BufRead *.hcl set ft=hcl
+  au BufNewFile,BufRead *.nomad set ft=hcl
+  au BufNewFile,BufRead *.workflow set ft=hcl
+  au BufNewFile,BufRead Appfile set ft=hcl
 endif
 
 if !has_key(s:disabled_packages, 'hive')
-  au BufNewFile,BufRead *.hql call s:Setf('hive')
-  au BufNewFile,BufRead *.q call s:Setf('hive')
-  au BufNewFile,BufRead *.ql call s:Setf('hive')
+  au BufNewFile,BufRead *.hql set ft=hive
+  au BufNewFile,BufRead *.q set ft=hive
+  au BufNewFile,BufRead *.ql set ft=hive
 endif
 
 if !has_key(s:disabled_packages, 'html5')
-  au BufNewFile,BufRead *.htm call s:Setf('html')
-  au BufNewFile,BufRead *.html.hl call s:Setf('html')
-  au BufNewFile,BufRead *.inc call s:Setf('html')
-  au BufNewFile,BufRead *.st call s:Setf('html')
-  au BufNewFile,BufRead *.xht call s:Setf('html')
-  au BufNewFile,BufRead *.xhtml call s:Setf('html')
+  au BufNewFile,BufRead *.htm set ft=html
+  au BufNewFile,BufRead *.html.hl set ft=html
+  au BufNewFile,BufRead *.inc set ft=html
+  au BufNewFile,BufRead *.st set ft=html
+  au BufNewFile,BufRead *.xht set ft=html
+  au BufNewFile,BufRead *.xhtml set ft=html
   au! BufNewFile,BufRead *.html call polyglot#DetectHtmlFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'i3')
-  au BufNewFile,BufRead *.i3.config call s:Setf('i3config')
-  au BufNewFile,BufRead *.i3config call s:Setf('i3config')
-  au BufNewFile,BufRead {.,}i3.config call s:Setf('i3config')
-  au BufNewFile,BufRead {.,}i3config call s:Setf('i3config')
-  au BufNewFile,BufRead i3.config call s:Setf('i3config')
-  au BufNewFile,BufRead i3config call s:Setf('i3config')
+  au BufNewFile,BufRead *.i3.config set ft=i3config
+  au BufNewFile,BufRead *.i3config set ft=i3config
+  au BufNewFile,BufRead {.,}i3.config set ft=i3config
+  au BufNewFile,BufRead {.,}i3config set ft=i3config
+  au BufNewFile,BufRead i3.config set ft=i3config
+  au BufNewFile,BufRead i3config set ft=i3config
 endif
 
 if !has_key(s:disabled_packages, 'icalendar')
-  au BufNewFile,BufRead *.ics call s:Setf('icalendar')
+  au BufNewFile,BufRead *.ics set ft=icalendar
 endif
 
 if !has_key(s:disabled_packages, 'idris')
-  au BufNewFile,BufRead idris-response call s:Setf('idris')
+  au BufNewFile,BufRead idris-response set ft=idris
   au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
   au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'idris2')
-  au BufNewFile,BufRead *.ipkg call s:Setf('idris2')
-  au BufNewFile,BufRead idris-response call s:Setf('idris2')
+  au BufNewFile,BufRead *.ipkg set ft=idris2
+  au BufNewFile,BufRead idris-response set ft=idris2
   au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
   au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'ion')
-  au BufNewFile,BufRead *.ion call s:Setf('ion')
-  au BufNewFile,BufRead ~/.config/ion/initrc call s:Setf('ion')
+  au BufNewFile,BufRead *.ion set ft=ion
+  au BufNewFile,BufRead ~/.config/ion/initrc set ft=ion
 endif
 
 if !has_key(s:disabled_packages, 'jenkins')
-  au BufNewFile,BufRead *.Jenkinsfile call s:Setf('Jenkinsfile')
-  au BufNewFile,BufRead *.jenkinsfile call s:Setf('Jenkinsfile')
-  au BufNewFile,BufRead Jenkinsfile call s:Setf('Jenkinsfile')
+  au BufNewFile,BufRead *.Jenkinsfile set ft=Jenkinsfile
+  au BufNewFile,BufRead *.jenkinsfile set ft=Jenkinsfile
+  au BufNewFile,BufRead Jenkinsfile set ft=Jenkinsfile
   au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
 if !has_key(s:disabled_packages, 'jinja')
-  au BufNewFile,BufRead *.j2 call s:Setf('jinja.html')
-  au BufNewFile,BufRead *.jinja call s:Setf('jinja.html')
-  au BufNewFile,BufRead *.jinja2 call s:Setf('jinja.html')
+  au BufNewFile,BufRead *.j2 set ft=jinja.html
+  au BufNewFile,BufRead *.jinja set ft=jinja.html
+  au BufNewFile,BufRead *.jinja2 set ft=jinja.html
 endif
 
 if !has_key(s:disabled_packages, 'jq')
-  au BufNewFile,BufRead *.jq call s:Setf('jq')
-  au BufNewFile,BufRead {.,}jqrc call s:Setf('jq')
+  au BufNewFile,BufRead *.jq set ft=jq
+  au BufNewFile,BufRead {.,}jqrc set ft=jq
   au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq')
 endif
 
 if !has_key(s:disabled_packages, 'json5')
-  au BufNewFile,BufRead *.json5 call s:Setf('json5')
+  au BufNewFile,BufRead *.json5 set ft=json5
 endif
 
 if !has_key(s:disabled_packages, 'json')
-  au BufNewFile,BufRead *.JSON-tmLanguage call s:Setf('json')
-  au BufNewFile,BufRead *.avsc call s:Setf('json')
-  au BufNewFile,BufRead *.geojson call s:Setf('json')
-  au BufNewFile,BufRead *.gltf call s:Setf('json')
-  au BufNewFile,BufRead *.har call s:Setf('json')
-  au BufNewFile,BufRead *.ice call s:Setf('json')
-  au BufNewFile,BufRead *.json call s:Setf('json')
-  au BufNewFile,BufRead *.jsonl call s:Setf('json')
-  au BufNewFile,BufRead *.jsonp call s:Setf('json')
-  au BufNewFile,BufRead *.mcmeta call s:Setf('json')
-  au BufNewFile,BufRead *.template call s:Setf('json')
-  au BufNewFile,BufRead *.tfstate call s:Setf('json')
-  au BufNewFile,BufRead *.tfstate.backup call s:Setf('json')
-  au BufNewFile,BufRead *.topojson call s:Setf('json')
-  au BufNewFile,BufRead *.webapp call s:Setf('json')
-  au BufNewFile,BufRead *.webmanifest call s:Setf('json')
-  au BufNewFile,BufRead *.yy call s:Setf('json')
-  au BufNewFile,BufRead *.yyp call s:Setf('json')
-  au BufNewFile,BufRead {.,}arcconfig call s:Setf('json')
-  au BufNewFile,BufRead {.,}htmlhintrc call s:Setf('json')
-  au BufNewFile,BufRead {.,}tern-config call s:Setf('json')
-  au BufNewFile,BufRead {.,}tern-project call s:Setf('json')
-  au BufNewFile,BufRead {.,}watchmanconfig call s:Setf('json')
-  au BufNewFile,BufRead Pipfile.lock call s:Setf('json')
-  au BufNewFile,BufRead composer.lock call s:Setf('json')
-  au BufNewFile,BufRead mcmod.info call s:Setf('json')
+  au BufNewFile,BufRead *.JSON-tmLanguage set ft=json
+  au BufNewFile,BufRead *.avsc set ft=json
+  au BufNewFile,BufRead *.geojson set ft=json
+  au BufNewFile,BufRead *.gltf set ft=json
+  au BufNewFile,BufRead *.har set ft=json
+  au BufNewFile,BufRead *.ice set ft=json
+  au BufNewFile,BufRead *.json set ft=json
+  au BufNewFile,BufRead *.jsonl set ft=json
+  au BufNewFile,BufRead *.jsonp set ft=json
+  au BufNewFile,BufRead *.mcmeta set ft=json
+  au BufNewFile,BufRead *.template set ft=json
+  au BufNewFile,BufRead *.tfstate set ft=json
+  au BufNewFile,BufRead *.tfstate.backup set ft=json
+  au BufNewFile,BufRead *.topojson set ft=json
+  au BufNewFile,BufRead *.webapp set ft=json
+  au BufNewFile,BufRead *.webmanifest set ft=json
+  au BufNewFile,BufRead *.yy set ft=json
+  au BufNewFile,BufRead *.yyp set ft=json
+  au BufNewFile,BufRead {.,}arcconfig set ft=json
+  au BufNewFile,BufRead {.,}htmlhintrc set ft=json
+  au BufNewFile,BufRead {.,}tern-config set ft=json
+  au BufNewFile,BufRead {.,}tern-project set ft=json
+  au BufNewFile,BufRead {.,}watchmanconfig set ft=json
+  au BufNewFile,BufRead Pipfile.lock set ft=json
+  au BufNewFile,BufRead composer.lock set ft=json
+  au BufNewFile,BufRead mcmod.info set ft=json
 endif
 
 if !has_key(s:disabled_packages, 'jsonnet')
-  au BufNewFile,BufRead *.jsonnet call s:Setf('jsonnet')
-  au BufNewFile,BufRead *.libsonnet call s:Setf('jsonnet')
+  au BufNewFile,BufRead *.jsonnet set ft=jsonnet
+  au BufNewFile,BufRead *.libsonnet set ft=jsonnet
 endif
 
 if !has_key(s:disabled_packages, 'jst')
-  au BufNewFile,BufRead *.ect call s:Setf('jst')
-  au BufNewFile,BufRead *.ejs call s:Setf('jst')
-  au BufNewFile,BufRead *.jst call s:Setf('jst')
+  au BufNewFile,BufRead *.ect set ft=jst
+  au BufNewFile,BufRead *.ejs set ft=jst
+  au BufNewFile,BufRead *.jst set ft=jst
 endif
 
 if !has_key(s:disabled_packages, 'julia')
-  au BufNewFile,BufRead *.jl call s:Setf('julia')
+  au BufNewFile,BufRead *.jl set ft=julia
 endif
 
 if !has_key(s:disabled_packages, 'kotlin')
-  au BufNewFile,BufRead *.kt call s:Setf('kotlin')
-  au BufNewFile,BufRead *.ktm call s:Setf('kotlin')
-  au BufNewFile,BufRead *.kts call s:Setf('kotlin')
+  au BufNewFile,BufRead *.kt set ft=kotlin
+  au BufNewFile,BufRead *.ktm set ft=kotlin
+  au BufNewFile,BufRead *.kts set ft=kotlin
 endif
 
 if !has_key(s:disabled_packages, 'ledger')
-  au BufNewFile,BufRead *.journal call s:Setf('ledger')
-  au BufNewFile,BufRead *.ldg call s:Setf('ledger')
-  au BufNewFile,BufRead *.ledger call s:Setf('ledger')
+  au BufNewFile,BufRead *.journal set ft=ledger
+  au BufNewFile,BufRead *.ldg set ft=ledger
+  au BufNewFile,BufRead *.ledger set ft=ledger
 endif
 
 if !has_key(s:disabled_packages, 'less')
-  au BufNewFile,BufRead *.less call s:Setf('less')
+  au BufNewFile,BufRead *.less set ft=less
 endif
 
 if !has_key(s:disabled_packages, 'lilypond')
-  au BufNewFile,BufRead *.ily call s:Setf('lilypond')
-  au BufNewFile,BufRead *.ly call s:Setf('lilypond')
+  au BufNewFile,BufRead *.ily set ft=lilypond
+  au BufNewFile,BufRead *.ly set ft=lilypond
 endif
 
 if !has_key(s:disabled_packages, 'livescript')
-  au BufNewFile,BufRead *._ls call s:Setf('livescript')
-  au BufNewFile,BufRead *.ls call s:Setf('livescript')
-  au BufNewFile,BufRead Slakefile call s:Setf('livescript')
+  au BufNewFile,BufRead *._ls set ft=livescript
+  au BufNewFile,BufRead *.ls set ft=livescript
+  au BufNewFile,BufRead Slakefile set ft=livescript
 endif
 
 if !has_key(s:disabled_packages, 'llvm')
-  au BufNewFile,BufRead *.ll call s:Setf('llvm')
-  au BufNewFile,BufRead *.td call s:Setf('tablegen')
+  au BufNewFile,BufRead *.ll set ft=llvm
+  au BufNewFile,BufRead *.td set ft=tablegen
 endif
 
 if !has_key(s:disabled_packages, 'log')
-  au BufNewFile,BufRead *.LOG call s:Setf('log')
-  au BufNewFile,BufRead *.log call s:Setf('log')
-  au BufNewFile,BufRead *_LOG call s:Setf('log')
-  au BufNewFile,BufRead *_log call s:Setf('log')
+  au BufNewFile,BufRead *.LOG set ft=log
+  au BufNewFile,BufRead *.log set ft=log
+  au BufNewFile,BufRead *_LOG set ft=log
+  au BufNewFile,BufRead *_log set ft=log
 endif
 
 if !has_key(s:disabled_packages, 'lua')
-  au BufNewFile,BufRead *.fcgi call s:Setf('lua')
-  au BufNewFile,BufRead *.lua call s:Setf('lua')
-  au BufNewFile,BufRead *.nse call s:Setf('lua')
-  au BufNewFile,BufRead *.p8 call s:Setf('lua')
-  au BufNewFile,BufRead *.pd_lua call s:Setf('lua')
-  au BufNewFile,BufRead *.rbxs call s:Setf('lua')
-  au BufNewFile,BufRead *.rockspec call s:Setf('lua')
-  au BufNewFile,BufRead *.wlua call s:Setf('lua')
-  au BufNewFile,BufRead {.,}luacheckrc call s:Setf('lua')
+  au BufNewFile,BufRead *.fcgi set ft=lua
+  au BufNewFile,BufRead *.lua set ft=lua
+  au BufNewFile,BufRead *.nse set ft=lua
+  au BufNewFile,BufRead *.p8 set ft=lua
+  au BufNewFile,BufRead *.pd_lua set ft=lua
+  au BufNewFile,BufRead *.rbxs set ft=lua
+  au BufNewFile,BufRead *.rockspec set ft=lua
+  au BufNewFile,BufRead *.wlua set ft=lua
+  au BufNewFile,BufRead {.,}luacheckrc set ft=lua
 endif
 
 if !has_key(s:disabled_packages, 'm4')
-  au BufNewFile,BufRead *.at call s:Setf('m4')
-  au BufNewFile,BufRead *.m4 call s:Setf('m4')
+  au BufNewFile,BufRead *.at set ft=m4
+  au BufNewFile,BufRead *.m4 set ft=m4
 endif
 
 if !has_key(s:disabled_packages, 'mako')
   au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile,BufRead *.mako call s:Setf('mako')
+  au BufNewFile,BufRead *.mako set ft=mako
   au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile,BufRead *.mao call s:Setf('mako')
+  au BufNewFile,BufRead *.mao set ft=mako
 endif
 
 if !has_key(s:disabled_packages, 'mathematica')
-  au BufNewFile,BufRead *.cdf call s:Setf('mma')
-  au BufNewFile,BufRead *.ma call s:Setf('mma')
-  au BufNewFile,BufRead *.mathematica call s:Setf('mma')
-  au BufNewFile,BufRead *.mma call s:Setf('mma')
-  au BufNewFile,BufRead *.mt call s:Setf('mma')
-  au BufNewFile,BufRead *.nb call s:Setf('mma')
-  au BufNewFile,BufRead *.nbp call s:Setf('mma')
-  au BufNewFile,BufRead *.wl call s:Setf('mma')
-  au BufNewFile,BufRead *.wls call s:Setf('mma')
-  au BufNewFile,BufRead *.wlt call s:Setf('mma')
+  au BufNewFile,BufRead *.cdf set ft=mma
+  au BufNewFile,BufRead *.ma set ft=mma
+  au BufNewFile,BufRead *.mathematica set ft=mma
+  au BufNewFile,BufRead *.mma set ft=mma
+  au BufNewFile,BufRead *.mt set ft=mma
+  au BufNewFile,BufRead *.nb set ft=mma
+  au BufNewFile,BufRead *.nbp set ft=mma
+  au BufNewFile,BufRead *.wl set ft=mma
+  au BufNewFile,BufRead *.wls set ft=mma
+  au BufNewFile,BufRead *.wlt set ft=mma
   au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'markdown')
-  au BufNewFile,BufRead *.markdown call s:Setf('markdown')
-  au BufNewFile,BufRead *.md call s:Setf('markdown')
-  au BufNewFile,BufRead *.mdown call s:Setf('markdown')
-  au BufNewFile,BufRead *.mdwn call s:Setf('markdown')
-  au BufNewFile,BufRead *.mkd call s:Setf('markdown')
-  au BufNewFile,BufRead *.mkdn call s:Setf('markdown')
-  au BufNewFile,BufRead *.mkdown call s:Setf('markdown')
-  au BufNewFile,BufRead *.ronn call s:Setf('markdown')
-  au BufNewFile,BufRead *.workbook call s:Setf('markdown')
-  au BufNewFile,BufRead contents.lr call s:Setf('markdown')
+  au BufNewFile,BufRead *.markdown set ft=markdown
+  au BufNewFile,BufRead *.md set ft=markdown
+  au BufNewFile,BufRead *.mdown set ft=markdown
+  au BufNewFile,BufRead *.mdwn set ft=markdown
+  au BufNewFile,BufRead *.mkd set ft=markdown
+  au BufNewFile,BufRead *.mkdn set ft=markdown
+  au BufNewFile,BufRead *.mkdown set ft=markdown
+  au BufNewFile,BufRead *.ronn set ft=markdown
+  au BufNewFile,BufRead *.workbook set ft=markdown
+  au BufNewFile,BufRead contents.lr set ft=markdown
 endif
 
 if !has_key(s:disabled_packages, 'mdx')
-  au BufNewFile,BufRead *.mdx call s:Setf('markdown.mdx')
+  au BufNewFile,BufRead *.mdx set ft=markdown.mdx
 endif
 
 if !has_key(s:disabled_packages, 'meson')
-  au BufNewFile,BufRead meson.build call s:Setf('meson')
-  au BufNewFile,BufRead meson_options.txt call s:Setf('meson')
-  au BufNewFile,BufRead *.wrap call s:Setf('dosini')
+  au BufNewFile,BufRead meson.build set ft=meson
+  au BufNewFile,BufRead meson_options.txt set ft=meson
+  au BufNewFile,BufRead *.wrap set ft=dosini
 endif
 
 if !has_key(s:disabled_packages, 'moonscript')
-  au BufNewFile,BufRead *.moon call s:Setf('moon')
+  au BufNewFile,BufRead *.moon set ft=moon
 endif
 
 if !has_key(s:disabled_packages, 'murphi')
@@ -1346,28 +1346,28 @@ if !has_key(s:disabled_packages, 'murphi')
 endif
 
 if !has_key(s:disabled_packages, 'nginx')
-  au BufNewFile,BufRead *.nginx call s:Setf('nginx')
-  au BufNewFile,BufRead *.nginxconf call s:Setf('nginx')
-  au BufNewFile,BufRead *.vhost call s:Setf('nginx')
+  au BufNewFile,BufRead *.nginx set ft=nginx
+  au BufNewFile,BufRead *.nginxconf set ft=nginx
+  au BufNewFile,BufRead *.vhost set ft=nginx
   au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
-  au BufNewFile,BufRead */nginx/*.conf call s:Setf('nginx')
+  au BufNewFile,BufRead */nginx/*.conf set ft=nginx
   au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
-  au BufNewFile,BufRead *nginx.conf call s:Setf('nginx')
-  au BufNewFile,BufRead nginx*.conf call s:Setf('nginx')
-  au BufNewFile,BufRead nginx.conf call s:Setf('nginx')
+  au BufNewFile,BufRead *nginx.conf set ft=nginx
+  au BufNewFile,BufRead nginx*.conf set ft=nginx
+  au BufNewFile,BufRead nginx.conf set ft=nginx
 endif
 
 if !has_key(s:disabled_packages, 'nim')
-  au BufNewFile,BufRead *.nim call s:Setf('nim')
-  au BufNewFile,BufRead *.nim.cfg call s:Setf('nim')
-  au BufNewFile,BufRead *.nimble call s:Setf('nim')
-  au BufNewFile,BufRead *.nimrod call s:Setf('nim')
-  au BufNewFile,BufRead *.nims call s:Setf('nim')
-  au BufNewFile,BufRead nim.cfg call s:Setf('nim')
+  au BufNewFile,BufRead *.nim set ft=nim
+  au BufNewFile,BufRead *.nim.cfg set ft=nim
+  au BufNewFile,BufRead *.nimble set ft=nim
+  au BufNewFile,BufRead *.nimrod set ft=nim
+  au BufNewFile,BufRead *.nims set ft=nim
+  au BufNewFile,BufRead nim.cfg set ft=nim
 endif
 
 if !has_key(s:disabled_packages, 'nix')
-  au BufNewFile,BufRead *.nix call s:Setf('nix')
+  au BufNewFile,BufRead *.nix set ft=nix
 endif
 
 if !has_key(s:disabled_packages, 'objc')
@@ -1376,64 +1376,64 @@ if !has_key(s:disabled_packages, 'objc')
 endif
 
 if !has_key(s:disabled_packages, 'ocaml')
-  au BufNewFile,BufRead *.eliom call s:Setf('ocaml')
-  au BufNewFile,BufRead *.eliomi call s:Setf('ocaml')
-  au BufNewFile,BufRead *.ml call s:Setf('ocaml')
-  au BufNewFile,BufRead *.ml.cppo call s:Setf('ocaml')
-  au BufNewFile,BufRead *.ml4 call s:Setf('ocaml')
-  au BufNewFile,BufRead *.mli call s:Setf('ocaml')
-  au BufNewFile,BufRead *.mli.cppo call s:Setf('ocaml')
-  au BufNewFile,BufRead *.mlip call s:Setf('ocaml')
-  au BufNewFile,BufRead *.mll call s:Setf('ocaml')
-  au BufNewFile,BufRead *.mlp call s:Setf('ocaml')
-  au BufNewFile,BufRead *.mlt call s:Setf('ocaml')
-  au BufNewFile,BufRead *.mly call s:Setf('ocaml')
-  au BufNewFile,BufRead {.,}ocamlinit call s:Setf('ocaml')
-  au BufNewFile,BufRead *.om call s:Setf('omake')
-  au BufNewFile,BufRead OMakefile call s:Setf('omake')
-  au BufNewFile,BufRead OMakeroot call s:Setf('omake')
-  au BufNewFile,BufRead OMakeroot.in call s:Setf('omake')
-  au BufNewFile,BufRead *.opam call s:Setf('opam')
-  au BufNewFile,BufRead *.opam.template call s:Setf('opam')
-  au BufNewFile,BufRead opam call s:Setf('opam')
-  au BufNewFile,BufRead _oasis call s:Setf('oasis')
-  au BufNewFile,BufRead dune call s:Setf('dune')
-  au BufNewFile,BufRead dune-project call s:Setf('dune')
-  au BufNewFile,BufRead dune-workspace call s:Setf('dune')
-  au BufNewFile,BufRead jbuild call s:Setf('dune')
-  au BufNewFile,BufRead _tags call s:Setf('ocamlbuild_tags')
-  au BufNewFile,BufRead *.ocp call s:Setf('ocpbuild')
-  au BufNewFile,BufRead *.root call s:Setf('ocpbuildroot')
-  au BufNewFile,BufRead *.sexp call s:Setf('sexplib')
+  au BufNewFile,BufRead *.eliom set ft=ocaml
+  au BufNewFile,BufRead *.eliomi set ft=ocaml
+  au BufNewFile,BufRead *.ml set ft=ocaml
+  au BufNewFile,BufRead *.ml.cppo set ft=ocaml
+  au BufNewFile,BufRead *.ml4 set ft=ocaml
+  au BufNewFile,BufRead *.mli set ft=ocaml
+  au BufNewFile,BufRead *.mli.cppo set ft=ocaml
+  au BufNewFile,BufRead *.mlip set ft=ocaml
+  au BufNewFile,BufRead *.mll set ft=ocaml
+  au BufNewFile,BufRead *.mlp set ft=ocaml
+  au BufNewFile,BufRead *.mlt set ft=ocaml
+  au BufNewFile,BufRead *.mly set ft=ocaml
+  au BufNewFile,BufRead {.,}ocamlinit set ft=ocaml
+  au BufNewFile,BufRead *.om set ft=omake
+  au BufNewFile,BufRead OMakefile set ft=omake
+  au BufNewFile,BufRead OMakeroot set ft=omake
+  au BufNewFile,BufRead OMakeroot.in set ft=omake
+  au BufNewFile,BufRead *.opam set ft=opam
+  au BufNewFile,BufRead *.opam.template set ft=opam
+  au BufNewFile,BufRead opam set ft=opam
+  au BufNewFile,BufRead _oasis set ft=oasis
+  au BufNewFile,BufRead dune set ft=dune
+  au BufNewFile,BufRead dune-project set ft=dune
+  au BufNewFile,BufRead dune-workspace set ft=dune
+  au BufNewFile,BufRead jbuild set ft=dune
+  au BufNewFile,BufRead _tags set ft=ocamlbuild_tags
+  au BufNewFile,BufRead *.ocp set ft=ocpbuild
+  au BufNewFile,BufRead *.root set ft=ocpbuildroot
+  au BufNewFile,BufRead *.sexp set ft=sexplib
 endif
 
 if !has_key(s:disabled_packages, 'octave')
-  au BufNewFile,BufRead *.oct call s:Setf('octave')
+  au BufNewFile,BufRead *.oct set ft=octave
   au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'opencl')
-  au BufNewFile,BufRead *.cl call s:Setf('opencl')
-  au BufNewFile,BufRead *.opencl call s:Setf('opencl')
+  au BufNewFile,BufRead *.cl set ft=opencl
+  au BufNewFile,BufRead *.opencl set ft=opencl
 endif
 
 if !has_key(s:disabled_packages, 'perl')
-  au BufNewFile,BufRead *.al call s:Setf('perl')
-  au BufNewFile,BufRead *.cgi call s:Setf('perl')
-  au BufNewFile,BufRead *.fcgi call s:Setf('perl')
-  au BufNewFile,BufRead *.perl call s:Setf('perl')
-  au BufNewFile,BufRead *.ph call s:Setf('perl')
-  au BufNewFile,BufRead *.plx call s:Setf('perl')
-  au BufNewFile,BufRead *.psgi call s:Setf('perl')
-  au BufNewFile,BufRead Makefile.PL call s:Setf('perl')
-  au BufNewFile,BufRead Rexfile call s:Setf('perl')
-  au BufNewFile,BufRead ack call s:Setf('perl')
-  au BufNewFile,BufRead cpanfile call s:Setf('perl')
-  au BufNewFile,BufRead *.pod call s:Setf('pod')
-  au BufNewFile,BufRead *.comp call s:Setf('mason')
-  au BufNewFile,BufRead *.mason call s:Setf('mason')
-  au BufNewFile,BufRead *.mhtml call s:Setf('mason')
-  au BufNewFile,BufRead *.xs call s:Setf('xs')
+  au BufNewFile,BufRead *.al set ft=perl
+  au BufNewFile,BufRead *.cgi set ft=perl
+  au BufNewFile,BufRead *.fcgi set ft=perl
+  au BufNewFile,BufRead *.perl set ft=perl
+  au BufNewFile,BufRead *.ph set ft=perl
+  au BufNewFile,BufRead *.plx set ft=perl
+  au BufNewFile,BufRead *.psgi set ft=perl
+  au BufNewFile,BufRead Makefile.PL set ft=perl
+  au BufNewFile,BufRead Rexfile set ft=perl
+  au BufNewFile,BufRead ack set ft=perl
+  au BufNewFile,BufRead cpanfile set ft=perl
+  au BufNewFile,BufRead *.pod set ft=pod
+  au BufNewFile,BufRead *.comp set ft=mason
+  au BufNewFile,BufRead *.mason set ft=mason
+  au BufNewFile,BufRead *.mhtml set ft=mason
+  au BufNewFile,BufRead *.xs set ft=xs
   au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
   au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
   au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
@@ -1445,238 +1445,238 @@ if !has_key(s:disabled_packages, 'pgsql')
 endif
 
 if !has_key(s:disabled_packages, 'cql')
-  au BufNewFile,BufRead *.cql call s:Setf('cql')
+  au BufNewFile,BufRead *.cql set ft=cql
 endif
 
 if !has_key(s:disabled_packages, 'php')
-  au BufNewFile,BufRead *.aw call s:Setf('php')
-  au BufNewFile,BufRead *.ctp call s:Setf('php')
-  au BufNewFile,BufRead *.fcgi call s:Setf('php')
-  au BufNewFile,BufRead *.inc call s:Setf('php')
-  au BufNewFile,BufRead *.php call s:Setf('php')
-  au BufNewFile,BufRead *.php3 call s:Setf('php')
-  au BufNewFile,BufRead *.php4 call s:Setf('php')
-  au BufNewFile,BufRead *.php5 call s:Setf('php')
-  au BufNewFile,BufRead *.phps call s:Setf('php')
-  au BufNewFile,BufRead *.phpt call s:Setf('php')
-  au BufNewFile,BufRead {.,}php call s:Setf('php')
-  au BufNewFile,BufRead {.,}php_cs call s:Setf('php')
-  au BufNewFile,BufRead {.,}php_cs.dist call s:Setf('php')
-  au BufNewFile,BufRead Phakefile call s:Setf('php')
+  au BufNewFile,BufRead *.aw set ft=php
+  au BufNewFile,BufRead *.ctp set ft=php
+  au BufNewFile,BufRead *.fcgi set ft=php
+  au BufNewFile,BufRead *.inc set ft=php
+  au BufNewFile,BufRead *.php set ft=php
+  au BufNewFile,BufRead *.php3 set ft=php
+  au BufNewFile,BufRead *.php4 set ft=php
+  au BufNewFile,BufRead *.php5 set ft=php
+  au BufNewFile,BufRead *.phps set ft=php
+  au BufNewFile,BufRead *.phpt set ft=php
+  au BufNewFile,BufRead {.,}php set ft=php
+  au BufNewFile,BufRead {.,}php_cs set ft=php
+  au BufNewFile,BufRead {.,}php_cs.dist set ft=php
+  au BufNewFile,BufRead Phakefile set ft=php
 endif
 
 if !has_key(s:disabled_packages, 'blade')
-  au BufNewFile,BufRead *.blade call s:Setf('blade')
-  au BufNewFile,BufRead *.blade.php call s:Setf('blade')
+  au BufNewFile,BufRead *.blade set ft=blade
+  au BufNewFile,BufRead *.blade.php set ft=blade
 endif
 
 if !has_key(s:disabled_packages, 'plantuml')
-  au BufNewFile,BufRead *.iuml call s:Setf('plantuml')
-  au BufNewFile,BufRead *.plantuml call s:Setf('plantuml')
-  au BufNewFile,BufRead *.pu call s:Setf('plantuml')
-  au BufNewFile,BufRead *.puml call s:Setf('plantuml')
-  au BufNewFile,BufRead *.uml call s:Setf('plantuml')
+  au BufNewFile,BufRead *.iuml set ft=plantuml
+  au BufNewFile,BufRead *.plantuml set ft=plantuml
+  au BufNewFile,BufRead *.pu set ft=plantuml
+  au BufNewFile,BufRead *.puml set ft=plantuml
+  au BufNewFile,BufRead *.uml set ft=plantuml
 endif
 
 if !has_key(s:disabled_packages, 'pony')
-  au BufNewFile,BufRead *.pony call s:Setf('pony')
+  au BufNewFile,BufRead *.pony set ft=pony
 endif
 
 if !has_key(s:disabled_packages, 'powershell')
-  au BufNewFile,BufRead *.ps1 call s:Setf('ps1')
-  au BufNewFile,BufRead *.psd1 call s:Setf('ps1')
-  au BufNewFile,BufRead *.psm1 call s:Setf('ps1')
-  au BufNewFile,BufRead *.pssc call s:Setf('ps1')
-  au BufNewFile,BufRead *.ps1xml call s:Setf('ps1xml')
+  au BufNewFile,BufRead *.ps1 set ft=ps1
+  au BufNewFile,BufRead *.psd1 set ft=ps1
+  au BufNewFile,BufRead *.psm1 set ft=ps1
+  au BufNewFile,BufRead *.pssc set ft=ps1
+  au BufNewFile,BufRead *.ps1xml set ft=ps1xml
 endif
 
 if !has_key(s:disabled_packages, 'protobuf')
-  au BufNewFile,BufRead *.proto call s:Setf('proto')
+  au BufNewFile,BufRead *.proto set ft=proto
 endif
 
 if !has_key(s:disabled_packages, 'pug')
-  au BufNewFile,BufRead *.jade call s:Setf('pug')
-  au BufNewFile,BufRead *.pug call s:Setf('pug')
+  au BufNewFile,BufRead *.jade set ft=pug
+  au BufNewFile,BufRead *.pug set ft=pug
 endif
 
 if !has_key(s:disabled_packages, 'puppet')
-  au BufNewFile,BufRead *.pp call s:Setf('puppet')
-  au BufNewFile,BufRead Modulefile call s:Setf('puppet')
-  au BufNewFile,BufRead *.epp call s:Setf('embeddedpuppet')
+  au BufNewFile,BufRead *.pp set ft=puppet
+  au BufNewFile,BufRead Modulefile set ft=puppet
+  au BufNewFile,BufRead *.epp set ft=embeddedpuppet
 endif
 
 if !has_key(s:disabled_packages, 'purescript')
-  au BufNewFile,BufRead *.purs call s:Setf('purescript')
+  au BufNewFile,BufRead *.purs set ft=purescript
 endif
 
 if !has_key(s:disabled_packages, 'python')
-  au BufNewFile,BufRead *.cgi call s:Setf('python')
-  au BufNewFile,BufRead *.fcgi call s:Setf('python')
-  au BufNewFile,BufRead *.gyp call s:Setf('python')
-  au BufNewFile,BufRead *.gypi call s:Setf('python')
-  au BufNewFile,BufRead *.lmi call s:Setf('python')
-  au BufNewFile,BufRead *.py call s:Setf('python')
-  au BufNewFile,BufRead *.py3 call s:Setf('python')
-  au BufNewFile,BufRead *.pyde call s:Setf('python')
-  au BufNewFile,BufRead *.pyi call s:Setf('python')
-  au BufNewFile,BufRead *.pyp call s:Setf('python')
-  au BufNewFile,BufRead *.pyt call s:Setf('python')
-  au BufNewFile,BufRead *.pyw call s:Setf('python')
-  au BufNewFile,BufRead *.rpy call s:Setf('python')
-  au BufNewFile,BufRead *.smk call s:Setf('python')
-  au BufNewFile,BufRead *.spec call s:Setf('python')
-  au BufNewFile,BufRead *.tac call s:Setf('python')
-  au BufNewFile,BufRead *.wsgi call s:Setf('python')
-  au BufNewFile,BufRead *.xpy call s:Setf('python')
-  au BufNewFile,BufRead {.,}gclient call s:Setf('python')
-  au BufNewFile,BufRead DEPS call s:Setf('python')
-  au BufNewFile,BufRead SConscript call s:Setf('python')
-  au BufNewFile,BufRead SConstruct call s:Setf('python')
-  au BufNewFile,BufRead Snakefile call s:Setf('python')
-  au BufNewFile,BufRead wscript call s:Setf('python')
+  au BufNewFile,BufRead *.cgi set ft=python
+  au BufNewFile,BufRead *.fcgi set ft=python
+  au BufNewFile,BufRead *.gyp set ft=python
+  au BufNewFile,BufRead *.gypi set ft=python
+  au BufNewFile,BufRead *.lmi set ft=python
+  au BufNewFile,BufRead *.py set ft=python
+  au BufNewFile,BufRead *.py3 set ft=python
+  au BufNewFile,BufRead *.pyde set ft=python
+  au BufNewFile,BufRead *.pyi set ft=python
+  au BufNewFile,BufRead *.pyp set ft=python
+  au BufNewFile,BufRead *.pyt set ft=python
+  au BufNewFile,BufRead *.pyw set ft=python
+  au BufNewFile,BufRead *.rpy set ft=python
+  au BufNewFile,BufRead *.smk set ft=python
+  au BufNewFile,BufRead *.spec set ft=python
+  au BufNewFile,BufRead *.tac set ft=python
+  au BufNewFile,BufRead *.wsgi set ft=python
+  au BufNewFile,BufRead *.xpy set ft=python
+  au BufNewFile,BufRead {.,}gclient set ft=python
+  au BufNewFile,BufRead DEPS set ft=python
+  au BufNewFile,BufRead SConscript set ft=python
+  au BufNewFile,BufRead SConstruct set ft=python
+  au BufNewFile,BufRead Snakefile set ft=python
+  au BufNewFile,BufRead wscript set ft=python
 endif
 
 if !has_key(s:disabled_packages, 'requirements')
-  au BufNewFile,BufRead *.pip call s:Setf('requirements')
-  au BufNewFile,BufRead *require.{txt,in} call s:Setf('requirements')
-  au BufNewFile,BufRead *requirements.{txt,in} call s:Setf('requirements')
-  au BufNewFile,BufRead constraints.{txt,in} call s:Setf('requirements')
+  au BufNewFile,BufRead *.pip set ft=requirements
+  au BufNewFile,BufRead *require.{txt,in} set ft=requirements
+  au BufNewFile,BufRead *requirements.{txt,in} set ft=requirements
+  au BufNewFile,BufRead constraints.{txt,in} set ft=requirements
 endif
 
 if !has_key(s:disabled_packages, 'qmake')
-  au BufNewFile,BufRead *.pri call s:Setf('qmake')
-  au BufNewFile,BufRead *.pro call s:Setf('qmake')
+  au BufNewFile,BufRead *.pri set ft=qmake
+  au BufNewFile,BufRead *.pro set ft=qmake
 endif
 
 if !has_key(s:disabled_packages, 'qml')
-  au BufNewFile,BufRead *.qbs call s:Setf('qml')
-  au BufNewFile,BufRead *.qml call s:Setf('qml')
+  au BufNewFile,BufRead *.qbs set ft=qml
+  au BufNewFile,BufRead *.qml set ft=qml
 endif
 
 if !has_key(s:disabled_packages, 'r-lang')
-  au BufNewFile,BufRead *.S call s:Setf('r')
-  au BufNewFile,BufRead *.r call s:Setf('r')
-  au BufNewFile,BufRead *.rsx call s:Setf('r')
-  au BufNewFile,BufRead *.s call s:Setf('r')
-  au BufNewFile,BufRead {.,}Rprofile call s:Setf('r')
-  au BufNewFile,BufRead expr-dist call s:Setf('r')
-  au BufNewFile,BufRead *.rd call s:Setf('rhelp')
+  au BufNewFile,BufRead *.S set ft=r
+  au BufNewFile,BufRead *.r set ft=r
+  au BufNewFile,BufRead *.rsx set ft=r
+  au BufNewFile,BufRead *.s set ft=r
+  au BufNewFile,BufRead {.,}Rprofile set ft=r
+  au BufNewFile,BufRead expr-dist set ft=r
+  au BufNewFile,BufRead *.rd set ft=rhelp
 endif
 
 if !has_key(s:disabled_packages, 'racket')
-  au BufNewFile,BufRead *.rkt call s:Setf('racket')
-  au BufNewFile,BufRead *.rktd call s:Setf('racket')
-  au BufNewFile,BufRead *.rktl call s:Setf('racket')
-  au BufNewFile,BufRead *.scrbl call s:Setf('racket')
+  au BufNewFile,BufRead *.rkt set ft=racket
+  au BufNewFile,BufRead *.rktd set ft=racket
+  au BufNewFile,BufRead *.rktl set ft=racket
+  au BufNewFile,BufRead *.scrbl set ft=racket
 endif
 
 if !has_key(s:disabled_packages, 'ragel')
-  au BufNewFile,BufRead *.rl call s:Setf('ragel')
+  au BufNewFile,BufRead *.rl set ft=ragel
 endif
 
 if !has_key(s:disabled_packages, 'raku')
-  au BufNewFile,BufRead *.6pl call s:Setf('raku')
-  au BufNewFile,BufRead *.6pm call s:Setf('raku')
-  au BufNewFile,BufRead *.nqp call s:Setf('raku')
-  au BufNewFile,BufRead *.p6 call s:Setf('raku')
-  au BufNewFile,BufRead *.p6l call s:Setf('raku')
-  au BufNewFile,BufRead *.p6m call s:Setf('raku')
-  au BufNewFile,BufRead *.pl6 call s:Setf('raku')
-  au BufNewFile,BufRead *.pm6 call s:Setf('raku')
-  au BufNewFile,BufRead *.pod6 call s:Setf('raku')
-  au BufNewFile,BufRead *.raku call s:Setf('raku')
-  au BufNewFile,BufRead *.rakudoc call s:Setf('raku')
-  au BufNewFile,BufRead *.rakumod call s:Setf('raku')
-  au BufNewFile,BufRead *.rakutest call s:Setf('raku')
-  au BufNewFile,BufRead *.t6 call s:Setf('raku')
+  au BufNewFile,BufRead *.6pl set ft=raku
+  au BufNewFile,BufRead *.6pm set ft=raku
+  au BufNewFile,BufRead *.nqp set ft=raku
+  au BufNewFile,BufRead *.p6 set ft=raku
+  au BufNewFile,BufRead *.p6l set ft=raku
+  au BufNewFile,BufRead *.p6m set ft=raku
+  au BufNewFile,BufRead *.pl6 set ft=raku
+  au BufNewFile,BufRead *.pm6 set ft=raku
+  au BufNewFile,BufRead *.pod6 set ft=raku
+  au BufNewFile,BufRead *.raku set ft=raku
+  au BufNewFile,BufRead *.rakudoc set ft=raku
+  au BufNewFile,BufRead *.rakumod set ft=raku
+  au BufNewFile,BufRead *.rakutest set ft=raku
+  au BufNewFile,BufRead *.t6 set ft=raku
   au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
   au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
   au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'raml')
-  au BufNewFile,BufRead *.raml call s:Setf('raml')
+  au BufNewFile,BufRead *.raml set ft=raml
 endif
 
 if !has_key(s:disabled_packages, 'razor')
-  au BufNewFile,BufRead *.cshtml call s:Setf('razor')
-  au BufNewFile,BufRead *.razor call s:Setf('razor')
+  au BufNewFile,BufRead *.cshtml set ft=razor
+  au BufNewFile,BufRead *.razor set ft=razor
 endif
 
 if !has_key(s:disabled_packages, 'reason')
-  au BufNewFile,BufRead *.rei call s:Setf('reason')
+  au BufNewFile,BufRead *.rei set ft=reason
   au! BufNewFile,BufRead *.re call polyglot#DetectReFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'rst')
-  au BufNewFile,BufRead *.rest call s:Setf('rst')
-  au BufNewFile,BufRead *.rest.txt call s:Setf('rst')
-  au BufNewFile,BufRead *.rst call s:Setf('rst')
-  au BufNewFile,BufRead *.rst.txt call s:Setf('rst')
+  au BufNewFile,BufRead *.rest set ft=rst
+  au BufNewFile,BufRead *.rest.txt set ft=rst
+  au BufNewFile,BufRead *.rst set ft=rst
+  au BufNewFile,BufRead *.rst.txt set ft=rst
 endif
 
 if !has_key(s:disabled_packages, 'ruby')
-  au BufNewFile,BufRead *.axlsx call s:Setf('ruby')
-  au BufNewFile,BufRead *.builder call s:Setf('ruby')
-  au BufNewFile,BufRead *.cap call s:Setf('ruby')
-  au BufNewFile,BufRead *.eye call s:Setf('ruby')
-  au BufNewFile,BufRead *.fcgi call s:Setf('ruby')
-  au BufNewFile,BufRead *.gemspec call s:Setf('ruby')
-  au BufNewFile,BufRead *.god call s:Setf('ruby')
-  au BufNewFile,BufRead *.jbuilder call s:Setf('ruby')
-  au BufNewFile,BufRead *.mspec call s:Setf('ruby')
-  au BufNewFile,BufRead *.opal call s:Setf('ruby')
-  au BufNewFile,BufRead *.pluginspec call s:Setf('ruby')
-  au BufNewFile,BufRead *.podspec call s:Setf('ruby')
-  au BufNewFile,BufRead *.rabl call s:Setf('ruby')
-  au BufNewFile,BufRead *.rake call s:Setf('ruby')
-  au BufNewFile,BufRead *.rant call s:Setf('ruby')
-  au BufNewFile,BufRead *.rb call s:Setf('ruby')
-  au BufNewFile,BufRead *.rbi call s:Setf('ruby')
-  au BufNewFile,BufRead *.rbuild call s:Setf('ruby')
-  au BufNewFile,BufRead *.rbw call s:Setf('ruby')
-  au BufNewFile,BufRead *.rbx call s:Setf('ruby')
-  au BufNewFile,BufRead *.rjs call s:Setf('ruby')
-  au BufNewFile,BufRead *.ru call s:Setf('ruby')
-  au BufNewFile,BufRead *.ruby call s:Setf('ruby')
-  au BufNewFile,BufRead *.rxml call s:Setf('ruby')
-  au BufNewFile,BufRead *.spec call s:Setf('ruby')
-  au BufNewFile,BufRead *.thor call s:Setf('ruby')
-  au BufNewFile,BufRead *.watchr call s:Setf('ruby')
-  au BufNewFile,BufRead {.,}Brewfile call s:Setf('ruby')
-  au BufNewFile,BufRead {.,}Guardfile call s:Setf('ruby')
-  au BufNewFile,BufRead {.,}autotest call s:Setf('ruby')
-  au BufNewFile,BufRead {.,}irbrc call s:Setf('ruby')
-  au BufNewFile,BufRead {.,}pryrc call s:Setf('ruby')
-  au BufNewFile,BufRead {.,}simplecov call s:Setf('ruby')
-  au BufNewFile,BufRead Appraisals call s:Setf('ruby')
-  au BufNewFile,BufRead Berksfile call s:Setf('ruby')
-  au BufNewFile,BufRead Buildfile call s:Setf('ruby')
-  au BufNewFile,BufRead Capfile call s:Setf('ruby')
-  au BufNewFile,BufRead Cheffile call s:Setf('ruby')
-  au BufNewFile,BufRead Dangerfile call s:Setf('ruby')
-  au BufNewFile,BufRead Deliverfile call s:Setf('ruby')
-  au BufNewFile,BufRead Fastfile call s:Setf('ruby')
-  au BufNewFile,BufRead Gemfile call s:Setf('ruby')
-  au BufNewFile,BufRead Gemfile.lock call s:Setf('ruby')
-  au BufNewFile,BufRead Guardfile call s:Setf('ruby')
-  au BufNewFile,BufRead Jarfile call s:Setf('ruby')
-  au BufNewFile,BufRead KitchenSink call s:Setf('ruby')
-  au BufNewFile,BufRead Mavenfile call s:Setf('ruby')
-  au BufNewFile,BufRead Podfile call s:Setf('ruby')
-  au BufNewFile,BufRead Puppetfile call s:Setf('ruby')
-  au BufNewFile,BufRead Rakefile call s:Setf('ruby')
-  au BufNewFile,BufRead Rantfile call s:Setf('ruby')
-  au BufNewFile,BufRead Routefile call s:Setf('ruby')
-  au BufNewFile,BufRead Snapfile call s:Setf('ruby')
-  au BufNewFile,BufRead Thorfile call s:Setf('ruby')
-  au BufNewFile,BufRead Vagrantfile call s:Setf('ruby')
+  au BufNewFile,BufRead *.axlsx set ft=ruby
+  au BufNewFile,BufRead *.builder set ft=ruby
+  au BufNewFile,BufRead *.cap set ft=ruby
+  au BufNewFile,BufRead *.eye set ft=ruby
+  au BufNewFile,BufRead *.fcgi set ft=ruby
+  au BufNewFile,BufRead *.gemspec set ft=ruby
+  au BufNewFile,BufRead *.god set ft=ruby
+  au BufNewFile,BufRead *.jbuilder set ft=ruby
+  au BufNewFile,BufRead *.mspec set ft=ruby
+  au BufNewFile,BufRead *.opal set ft=ruby
+  au BufNewFile,BufRead *.pluginspec set ft=ruby
+  au BufNewFile,BufRead *.podspec set ft=ruby
+  au BufNewFile,BufRead *.rabl set ft=ruby
+  au BufNewFile,BufRead *.rake set ft=ruby
+  au BufNewFile,BufRead *.rant set ft=ruby
+  au BufNewFile,BufRead *.rb set ft=ruby
+  au BufNewFile,BufRead *.rbi set ft=ruby
+  au BufNewFile,BufRead *.rbuild set ft=ruby
+  au BufNewFile,BufRead *.rbw set ft=ruby
+  au BufNewFile,BufRead *.rbx set ft=ruby
+  au BufNewFile,BufRead *.rjs set ft=ruby
+  au BufNewFile,BufRead *.ru set ft=ruby
+  au BufNewFile,BufRead *.ruby set ft=ruby
+  au BufNewFile,BufRead *.rxml set ft=ruby
+  au BufNewFile,BufRead *.spec set ft=ruby
+  au BufNewFile,BufRead *.thor set ft=ruby
+  au BufNewFile,BufRead *.watchr set ft=ruby
+  au BufNewFile,BufRead {.,}Brewfile set ft=ruby
+  au BufNewFile,BufRead {.,}Guardfile set ft=ruby
+  au BufNewFile,BufRead {.,}autotest set ft=ruby
+  au BufNewFile,BufRead {.,}irbrc set ft=ruby
+  au BufNewFile,BufRead {.,}pryrc set ft=ruby
+  au BufNewFile,BufRead {.,}simplecov set ft=ruby
+  au BufNewFile,BufRead Appraisals set ft=ruby
+  au BufNewFile,BufRead Berksfile set ft=ruby
+  au BufNewFile,BufRead Buildfile set ft=ruby
+  au BufNewFile,BufRead Capfile set ft=ruby
+  au BufNewFile,BufRead Cheffile set ft=ruby
+  au BufNewFile,BufRead Dangerfile set ft=ruby
+  au BufNewFile,BufRead Deliverfile set ft=ruby
+  au BufNewFile,BufRead Fastfile set ft=ruby
+  au BufNewFile,BufRead Gemfile set ft=ruby
+  au BufNewFile,BufRead Gemfile.lock set ft=ruby
+  au BufNewFile,BufRead Guardfile set ft=ruby
+  au BufNewFile,BufRead Jarfile set ft=ruby
+  au BufNewFile,BufRead KitchenSink set ft=ruby
+  au BufNewFile,BufRead Mavenfile set ft=ruby
+  au BufNewFile,BufRead Podfile set ft=ruby
+  au BufNewFile,BufRead Puppetfile set ft=ruby
+  au BufNewFile,BufRead Rakefile set ft=ruby
+  au BufNewFile,BufRead Rantfile set ft=ruby
+  au BufNewFile,BufRead Routefile set ft=ruby
+  au BufNewFile,BufRead Snapfile set ft=ruby
+  au BufNewFile,BufRead Thorfile set ft=ruby
+  au BufNewFile,BufRead Vagrantfile set ft=ruby
   au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
-  au BufNewFile,BufRead buildfile call s:Setf('ruby')
-  au BufNewFile,BufRead vagrantfile call s:Setf('ruby')
-  au BufNewFile,BufRead *.erb call s:Setf('eruby')
-  au BufNewFile,BufRead *.erb.deface call s:Setf('eruby')
-  au BufNewFile,BufRead *.rhtml call s:Setf('eruby')
+  au BufNewFile,BufRead buildfile set ft=ruby
+  au BufNewFile,BufRead vagrantfile set ft=ruby
+  au BufNewFile,BufRead *.erb set ft=eruby
+  au BufNewFile,BufRead *.erb.deface set ft=eruby
+  au BufNewFile,BufRead *.rhtml set ft=eruby
 endif
 
 if !has_key(s:disabled_packages, 'rspec')
@@ -1684,262 +1684,262 @@ if !has_key(s:disabled_packages, 'rspec')
 endif
 
 if !has_key(s:disabled_packages, 'brewfile')
-  au BufNewFile,BufRead Brewfile call s:Setf('brewfile')
+  au BufNewFile,BufRead Brewfile set ft=brewfile
 endif
 
 if !has_key(s:disabled_packages, 'rust')
-  au BufNewFile,BufRead *.rs call s:Setf('rust')
-  au BufNewFile,BufRead *.rs.in call s:Setf('rust')
+  au BufNewFile,BufRead *.rs set ft=rust
+  au BufNewFile,BufRead *.rs.in set ft=rust
 endif
 
 if !has_key(s:disabled_packages, 'scala')
-  au BufNewFile,BufRead *.kojo call s:Setf('scala')
-  au BufNewFile,BufRead *.sc call s:Setf('scala')
-  au BufNewFile,BufRead *.scala call s:Setf('scala')
+  au BufNewFile,BufRead *.kojo set ft=scala
+  au BufNewFile,BufRead *.sc set ft=scala
+  au BufNewFile,BufRead *.scala set ft=scala
 endif
 
 if !has_key(s:disabled_packages, 'sbt')
-  au BufNewFile,BufRead *.sbt call s:Setf('sbt.scala')
+  au BufNewFile,BufRead *.sbt set ft=sbt.scala
 endif
 
 if !has_key(s:disabled_packages, 'scss')
-  au BufNewFile,BufRead *.scss call s:Setf('scss')
+  au BufNewFile,BufRead *.scss set ft=scss
 endif
 
 if !has_key(s:disabled_packages, 'sh')
-  au BufNewFile,BufRead *.bash call s:Setf('sh')
-  au BufNewFile,BufRead *.bats call s:Setf('sh')
-  au BufNewFile,BufRead *.cgi call s:Setf('sh')
-  au BufNewFile,BufRead *.command call s:Setf('sh')
-  au BufNewFile,BufRead *.env call s:Setf('sh')
-  au BufNewFile,BufRead *.fcgi call s:Setf('sh')
-  au BufNewFile,BufRead *.ksh call s:Setf('sh')
-  au BufNewFile,BufRead *.sh call s:Setf('sh')
-  au BufNewFile,BufRead *.sh.in call s:Setf('sh')
-  au BufNewFile,BufRead *.tmux call s:Setf('sh')
-  au BufNewFile,BufRead *.tool call s:Setf('sh')
-  au BufNewFile,BufRead {.,}bash_aliases call s:Setf('sh')
-  au BufNewFile,BufRead {.,}bash_history call s:Setf('sh')
-  au BufNewFile,BufRead {.,}bash_logout call s:Setf('sh')
-  au BufNewFile,BufRead {.,}bash_profile call s:Setf('sh')
-  au BufNewFile,BufRead {.,}bashrc call s:Setf('sh')
-  au BufNewFile,BufRead {.,}cshrc call s:Setf('sh')
-  au BufNewFile,BufRead {.,}env call s:Setf('sh')
-  au BufNewFile,BufRead {.,}env.example call s:Setf('sh')
-  au BufNewFile,BufRead {.,}flaskenv call s:Setf('sh')
-  au BufNewFile,BufRead {.,}login call s:Setf('sh')
-  au BufNewFile,BufRead {.,}profile call s:Setf('sh')
-  au BufNewFile,BufRead 9fs call s:Setf('sh')
-  au BufNewFile,BufRead PKGBUILD call s:Setf('sh')
-  au BufNewFile,BufRead bash_aliases call s:Setf('sh')
-  au BufNewFile,BufRead bash_logout call s:Setf('sh')
-  au BufNewFile,BufRead bash_profile call s:Setf('sh')
-  au BufNewFile,BufRead bashrc call s:Setf('sh')
-  au BufNewFile,BufRead cshrc call s:Setf('sh')
-  au BufNewFile,BufRead gradlew call s:Setf('sh')
-  au BufNewFile,BufRead login call s:Setf('sh')
-  au BufNewFile,BufRead man call s:Setf('sh')
-  au BufNewFile,BufRead profile call s:Setf('sh')
-  au BufNewFile,BufRead *.zsh call s:Setf('zsh')
-  au BufNewFile,BufRead {.,}zlogin call s:Setf('zsh')
-  au BufNewFile,BufRead {.,}zlogout call s:Setf('zsh')
-  au BufNewFile,BufRead {.,}zprofile call s:Setf('zsh')
-  au BufNewFile,BufRead {.,}zshenv call s:Setf('zsh')
-  au BufNewFile,BufRead {.,}zshrc call s:Setf('zsh')
+  au BufNewFile,BufRead *.bash set ft=sh
+  au BufNewFile,BufRead *.bats set ft=sh
+  au BufNewFile,BufRead *.cgi set ft=sh
+  au BufNewFile,BufRead *.command set ft=sh
+  au BufNewFile,BufRead *.env set ft=sh
+  au BufNewFile,BufRead *.fcgi set ft=sh
+  au BufNewFile,BufRead *.ksh set ft=sh
+  au BufNewFile,BufRead *.sh set ft=sh
+  au BufNewFile,BufRead *.sh.in set ft=sh
+  au BufNewFile,BufRead *.tmux set ft=sh
+  au BufNewFile,BufRead *.tool set ft=sh
+  au BufNewFile,BufRead {.,}bash_aliases set ft=sh
+  au BufNewFile,BufRead {.,}bash_history set ft=sh
+  au BufNewFile,BufRead {.,}bash_logout set ft=sh
+  au BufNewFile,BufRead {.,}bash_profile set ft=sh
+  au BufNewFile,BufRead {.,}bashrc set ft=sh
+  au BufNewFile,BufRead {.,}cshrc set ft=sh
+  au BufNewFile,BufRead {.,}env set ft=sh
+  au BufNewFile,BufRead {.,}env.example set ft=sh
+  au BufNewFile,BufRead {.,}flaskenv set ft=sh
+  au BufNewFile,BufRead {.,}login set ft=sh
+  au BufNewFile,BufRead {.,}profile set ft=sh
+  au BufNewFile,BufRead 9fs set ft=sh
+  au BufNewFile,BufRead PKGBUILD set ft=sh
+  au BufNewFile,BufRead bash_aliases set ft=sh
+  au BufNewFile,BufRead bash_logout set ft=sh
+  au BufNewFile,BufRead bash_profile set ft=sh
+  au BufNewFile,BufRead bashrc set ft=sh
+  au BufNewFile,BufRead cshrc set ft=sh
+  au BufNewFile,BufRead gradlew set ft=sh
+  au BufNewFile,BufRead login set ft=sh
+  au BufNewFile,BufRead man set ft=sh
+  au BufNewFile,BufRead profile set ft=sh
+  au BufNewFile,BufRead *.zsh set ft=zsh
+  au BufNewFile,BufRead {.,}zlogin set ft=zsh
+  au BufNewFile,BufRead {.,}zlogout set ft=zsh
+  au BufNewFile,BufRead {.,}zprofile set ft=zsh
+  au BufNewFile,BufRead {.,}zshenv set ft=zsh
+  au BufNewFile,BufRead {.,}zshrc set ft=zsh
 endif
 
 if !has_key(s:disabled_packages, 'slim')
-  au BufNewFile,BufRead *.slim call s:Setf('slim')
+  au BufNewFile,BufRead *.slim set ft=slim
 endif
 
 if !has_key(s:disabled_packages, 'slime')
-  au BufNewFile,BufRead *.slime call s:Setf('slime')
+  au BufNewFile,BufRead *.slime set ft=slime
 endif
 
 if !has_key(s:disabled_packages, 'smt2')
-  au BufNewFile,BufRead *.smt call s:Setf('smt2')
-  au BufNewFile,BufRead *.smt2 call s:Setf('smt2')
+  au BufNewFile,BufRead *.smt set ft=smt2
+  au BufNewFile,BufRead *.smt2 set ft=smt2
 endif
 
 if !has_key(s:disabled_packages, 'solidity')
-  au BufNewFile,BufRead *.sol call s:Setf('solidity')
+  au BufNewFile,BufRead *.sol set ft=solidity
 endif
 
 if !has_key(s:disabled_packages, 'stylus')
-  au BufNewFile,BufRead *.styl call s:Setf('stylus')
-  au BufNewFile,BufRead *.stylus call s:Setf('stylus')
+  au BufNewFile,BufRead *.styl set ft=stylus
+  au BufNewFile,BufRead *.stylus set ft=stylus
 endif
 
 if !has_key(s:disabled_packages, 'svelte')
-  au BufNewFile,BufRead *.svelte call s:Setf('svelte')
+  au BufNewFile,BufRead *.svelte set ft=svelte
 endif
 
 if !has_key(s:disabled_packages, 'svg')
-  au BufNewFile,BufRead *.svg call s:Setf('svg')
+  au BufNewFile,BufRead *.svg set ft=svg
 endif
 
 if !has_key(s:disabled_packages, 'swift')
-  au BufNewFile,BufRead *.swift call s:Setf('swift')
+  au BufNewFile,BufRead *.swift set ft=swift
 endif
 
 if !has_key(s:disabled_packages, 'sxhkd')
-  au BufNewFile,BufRead *.sxhkdrc call s:Setf('sxhkdrc')
-  au BufNewFile,BufRead sxhkdrc call s:Setf('sxhkdrc')
+  au BufNewFile,BufRead *.sxhkdrc set ft=sxhkdrc
+  au BufNewFile,BufRead sxhkdrc set ft=sxhkdrc
 endif
 
 if !has_key(s:disabled_packages, 'systemd')
-  au BufNewFile,BufRead *.automount call s:Setf('systemd')
-  au BufNewFile,BufRead *.mount call s:Setf('systemd')
-  au BufNewFile,BufRead *.path call s:Setf('systemd')
-  au BufNewFile,BufRead *.service call s:Setf('systemd')
-  au BufNewFile,BufRead *.socket call s:Setf('systemd')
-  au BufNewFile,BufRead *.swap call s:Setf('systemd')
-  au BufNewFile,BufRead *.target call s:Setf('systemd')
-  au BufNewFile,BufRead *.timer call s:Setf('systemd')
+  au BufNewFile,BufRead *.automount set ft=systemd
+  au BufNewFile,BufRead *.mount set ft=systemd
+  au BufNewFile,BufRead *.path set ft=systemd
+  au BufNewFile,BufRead *.service set ft=systemd
+  au BufNewFile,BufRead *.socket set ft=systemd
+  au BufNewFile,BufRead *.swap set ft=systemd
+  au BufNewFile,BufRead *.target set ft=systemd
+  au BufNewFile,BufRead *.timer set ft=systemd
 endif
 
 if !has_key(s:disabled_packages, 'terraform')
-  au BufNewFile,BufRead *.hcl call s:Setf('terraform')
-  au BufNewFile,BufRead *.nomad call s:Setf('terraform')
-  au BufNewFile,BufRead *.tf call s:Setf('terraform')
-  au BufNewFile,BufRead *.tfvars call s:Setf('terraform')
-  au BufNewFile,BufRead *.workflow call s:Setf('terraform')
+  au BufNewFile,BufRead *.hcl set ft=terraform
+  au BufNewFile,BufRead *.nomad set ft=terraform
+  au BufNewFile,BufRead *.tf set ft=terraform
+  au BufNewFile,BufRead *.tfvars set ft=terraform
+  au BufNewFile,BufRead *.workflow set ft=terraform
 endif
 
 if !has_key(s:disabled_packages, 'textile')
-  au BufNewFile,BufRead *.textile call s:Setf('textile')
+  au BufNewFile,BufRead *.textile set ft=textile
 endif
 
 if !has_key(s:disabled_packages, 'thrift')
-  au BufNewFile,BufRead *.thrift call s:Setf('thrift')
+  au BufNewFile,BufRead *.thrift set ft=thrift
 endif
 
 if !has_key(s:disabled_packages, 'tmux')
-  au BufNewFile,BufRead {.,}tmux.conf call s:Setf('tmux')
+  au BufNewFile,BufRead {.,}tmux.conf set ft=tmux
 endif
 
 if !has_key(s:disabled_packages, 'toml')
-  au BufNewFile,BufRead *.toml call s:Setf('toml')
-  au BufNewFile,BufRead */.cargo/config call s:Setf('toml')
-  au BufNewFile,BufRead */.cargo/credentials call s:Setf('toml')
-  au BufNewFile,BufRead Cargo.lock call s:Setf('toml')
-  au BufNewFile,BufRead Gopkg.lock call s:Setf('toml')
-  au BufNewFile,BufRead Pipfile call s:Setf('toml')
-  au BufNewFile,BufRead poetry.lock call s:Setf('toml')
+  au BufNewFile,BufRead *.toml set ft=toml
+  au BufNewFile,BufRead */.cargo/config set ft=toml
+  au BufNewFile,BufRead */.cargo/credentials set ft=toml
+  au BufNewFile,BufRead Cargo.lock set ft=toml
+  au BufNewFile,BufRead Gopkg.lock set ft=toml
+  au BufNewFile,BufRead Pipfile set ft=toml
+  au BufNewFile,BufRead poetry.lock set ft=toml
 endif
 
 if !has_key(s:disabled_packages, 'tptp')
-  au BufNewFile,BufRead *.ax call s:Setf('tptp')
-  au BufNewFile,BufRead *.p call s:Setf('tptp')
-  au BufNewFile,BufRead *.tptp call s:Setf('tptp')
+  au BufNewFile,BufRead *.ax set ft=tptp
+  au BufNewFile,BufRead *.p set ft=tptp
+  au BufNewFile,BufRead *.tptp set ft=tptp
 endif
 
 if !has_key(s:disabled_packages, 'twig')
-  au BufNewFile,BufRead *.twig call s:Setf('html.twig')
-  au BufNewFile,BufRead *.xml.twig call s:Setf('xml.twig')
+  au BufNewFile,BufRead *.twig set ft=html.twig
+  au BufNewFile,BufRead *.xml.twig set ft=xml.twig
 endif
 
 if !has_key(s:disabled_packages, 'typescript')
-  au BufNewFile,BufRead *.ts call s:Setf('typescript')
-  au BufNewFile,BufRead *.tsx call s:Setf('typescriptreact')
+  au BufNewFile,BufRead *.ts set ft=typescript
+  au BufNewFile,BufRead *.tsx set ft=typescriptreact
 endif
 
 if !has_key(s:disabled_packages, 'unison')
-  au BufNewFile,BufRead *.u call s:Setf('unison')
-  au BufNewFile,BufRead *.uu call s:Setf('unison')
+  au BufNewFile,BufRead *.u set ft=unison
+  au BufNewFile,BufRead *.uu set ft=unison
 endif
 
 if !has_key(s:disabled_packages, 'v')
-  au BufNewFile,BufRead *.v call s:Setf('v')
+  au BufNewFile,BufRead *.v set ft=v
 endif
 
 if !has_key(s:disabled_packages, 'vala')
-  au BufNewFile,BufRead *.vala call s:Setf('vala')
-  au BufNewFile,BufRead *.valadoc call s:Setf('vala')
-  au BufNewFile,BufRead *.vapi call s:Setf('vala')
+  au BufNewFile,BufRead *.vala set ft=vala
+  au BufNewFile,BufRead *.valadoc set ft=vala
+  au BufNewFile,BufRead *.vapi set ft=vala
 endif
 
 if !has_key(s:disabled_packages, 'vbnet')
-  au BufNewFile,BufRead *.vb call s:Setf('vbnet')
-  au BufNewFile,BufRead *.vbhtml call s:Setf('vbnet')
+  au BufNewFile,BufRead *.vb set ft=vbnet
+  au BufNewFile,BufRead *.vbhtml set ft=vbnet
 endif
 
 if !has_key(s:disabled_packages, 'vcl')
-  au BufNewFile,BufRead *.vcl call s:Setf('vcl')
+  au BufNewFile,BufRead *.vcl set ft=vcl
 endif
 
 if !has_key(s:disabled_packages, 'velocity')
-  au BufNewFile,BufRead *.vm call s:Setf('velocity')
+  au BufNewFile,BufRead *.vm set ft=velocity
 endif
 
 if !has_key(s:disabled_packages, 'vmasm')
-  au BufNewFile,BufRead *.mar call s:Setf('vmasm')
+  au BufNewFile,BufRead *.mar set ft=vmasm
 endif
 
 if !has_key(s:disabled_packages, 'vue')
-  au BufNewFile,BufRead *.vue call s:Setf('vue')
-  au BufNewFile,BufRead *.wpy call s:Setf('vue')
+  au BufNewFile,BufRead *.vue set ft=vue
+  au BufNewFile,BufRead *.wpy set ft=vue
 endif
 
 if !has_key(s:disabled_packages, 'xdc')
-  au BufNewFile,BufRead *.xdc call s:Setf('xdc')
+  au BufNewFile,BufRead *.xdc set ft=xdc
 endif
 
 if !has_key(s:disabled_packages, 'xsl')
-  au BufNewFile,BufRead *.xsl call s:Setf('xsl')
-  au BufNewFile,BufRead *.xslt call s:Setf('xsl')
+  au BufNewFile,BufRead *.xsl set ft=xsl
+  au BufNewFile,BufRead *.xslt set ft=xsl
 endif
 
 if !has_key(s:disabled_packages, 'yaml')
-  au BufNewFile,BufRead *.mir call s:Setf('yaml')
-  au BufNewFile,BufRead *.reek call s:Setf('yaml')
-  au BufNewFile,BufRead *.rviz call s:Setf('yaml')
-  au BufNewFile,BufRead *.sublime-syntax call s:Setf('yaml')
-  au BufNewFile,BufRead *.syntax call s:Setf('yaml')
-  au BufNewFile,BufRead *.yaml call s:Setf('yaml')
-  au BufNewFile,BufRead *.yaml-tmlanguage call s:Setf('yaml')
-  au BufNewFile,BufRead *.yaml.sed call s:Setf('yaml')
-  au BufNewFile,BufRead *.yml call s:Setf('yaml')
-  au BufNewFile,BufRead *.yml.mysql call s:Setf('yaml')
-  au BufNewFile,BufRead {.,}clang-format call s:Setf('yaml')
-  au BufNewFile,BufRead {.,}clang-tidy call s:Setf('yaml')
-  au BufNewFile,BufRead {.,}gemrc call s:Setf('yaml')
-  au BufNewFile,BufRead fish_history call s:Setf('yaml')
-  au BufNewFile,BufRead fish_read_history call s:Setf('yaml')
-  au BufNewFile,BufRead glide.lock call s:Setf('yaml')
-  au BufNewFile,BufRead yarn.lock call s:Setf('yaml')
+  au BufNewFile,BufRead *.mir set ft=yaml
+  au BufNewFile,BufRead *.reek set ft=yaml
+  au BufNewFile,BufRead *.rviz set ft=yaml
+  au BufNewFile,BufRead *.sublime-syntax set ft=yaml
+  au BufNewFile,BufRead *.syntax set ft=yaml
+  au BufNewFile,BufRead *.yaml set ft=yaml
+  au BufNewFile,BufRead *.yaml-tmlanguage set ft=yaml
+  au BufNewFile,BufRead *.yaml.sed set ft=yaml
+  au BufNewFile,BufRead *.yml set ft=yaml
+  au BufNewFile,BufRead *.yml.mysql set ft=yaml
+  au BufNewFile,BufRead {.,}clang-format set ft=yaml
+  au BufNewFile,BufRead {.,}clang-tidy set ft=yaml
+  au BufNewFile,BufRead {.,}gemrc set ft=yaml
+  au BufNewFile,BufRead fish_history set ft=yaml
+  au BufNewFile,BufRead fish_read_history set ft=yaml
+  au BufNewFile,BufRead glide.lock set ft=yaml
+  au BufNewFile,BufRead yarn.lock set ft=yaml
 endif
 
 if !has_key(s:disabled_packages, 'ansible')
   au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
-  au BufNewFile,BufRead handlers.*.y{a,}ml call s:Setf('yaml.ansible')
+  au BufNewFile,BufRead handlers.*.y{a,}ml set ft=yaml.ansible
   au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
-  au BufNewFile,BufRead local.y{a,}ml call s:Setf('yaml.ansible')
-  au BufNewFile,BufRead main.y{a,}ml call s:Setf('yaml.ansible')
-  au BufNewFile,BufRead playbook.y{a,}ml call s:Setf('yaml.ansible')
-  au BufNewFile,BufRead requirements.y{a,}ml call s:Setf('yaml.ansible')
-  au BufNewFile,BufRead roles.*.y{a,}ml call s:Setf('yaml.ansible')
-  au BufNewFile,BufRead site.y{a,}ml call s:Setf('yaml.ansible')
-  au BufNewFile,BufRead tasks.*.y{a,}ml call s:Setf('yaml.ansible')
+  au BufNewFile,BufRead local.y{a,}ml set ft=yaml.ansible
+  au BufNewFile,BufRead main.y{a,}ml set ft=yaml.ansible
+  au BufNewFile,BufRead playbook.y{a,}ml set ft=yaml.ansible
+  au BufNewFile,BufRead requirements.y{a,}ml set ft=yaml.ansible
+  au BufNewFile,BufRead roles.*.y{a,}ml set ft=yaml.ansible
+  au BufNewFile,BufRead site.y{a,}ml set ft=yaml.ansible
+  au BufNewFile,BufRead tasks.*.y{a,}ml set ft=yaml.ansible
 endif
 
 if !has_key(s:disabled_packages, 'helm')
-  au BufNewFile,BufRead */templates/*.tpl call s:Setf('helm')
-  au BufNewFile,BufRead */templates/*.yaml call s:Setf('helm')
+  au BufNewFile,BufRead */templates/*.tpl set ft=helm
+  au BufNewFile,BufRead */templates/*.yaml set ft=helm
 endif
 
 if !has_key(s:disabled_packages, 'help')
-  au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt call s:Setf('help')
+  au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt set ft=help
 endif
 
 if !has_key(s:disabled_packages, 'zephir')
-  au BufNewFile,BufRead *.zep call s:Setf('zephir')
+  au BufNewFile,BufRead *.zep set ft=zephir
 endif
 
 if !has_key(s:disabled_packages, 'zig')
-  au BufNewFile,BufRead *.zir call s:Setf('zir')
-  au BufNewFile,BufRead *.zig call s:Setf('zig')
-  au BufNewFile,BufRead *.zir call s:Setf('zig')
+  au BufNewFile,BufRead *.zir set ft=zir
+  au BufNewFile,BufRead *.zig set ft=zig
+  au BufNewFile,BufRead *.zir set ft=zig
 endif
 
 if !has_key(s:disabled_packages, 'trasys')
@@ -1947,54 +1947,54 @@ if !has_key(s:disabled_packages, 'trasys')
 endif
 
 if !has_key(s:disabled_packages, 'basic')
-  au BufNewFile,BufRead *.basic call s:Setf('basic')
+  au BufNewFile,BufRead *.basic set ft=basic
 endif
 
 if !has_key(s:disabled_packages, 'visual-basic')
-  au BufNewFile,BufRead *.cls call s:Setf('vb')
-  au BufNewFile,BufRead *.ctl call s:Setf('vb')
-  au BufNewFile,BufRead *.dsm call s:Setf('vb')
-  au BufNewFile,BufRead *.frm call s:Setf('vb')
-  au BufNewFile,BufRead *.frx call s:Setf('vb')
-  au BufNewFile,BufRead *.sba call s:Setf('vb')
-  au BufNewFile,BufRead *.vba call s:Setf('vb')
-  au BufNewFile,BufRead *.vbs call s:Setf('vb')
+  au BufNewFile,BufRead *.cls set ft=vb
+  au BufNewFile,BufRead *.ctl set ft=vb
+  au BufNewFile,BufRead *.dsm set ft=vb
+  au BufNewFile,BufRead *.frm set ft=vb
+  au BufNewFile,BufRead *.frx set ft=vb
+  au BufNewFile,BufRead *.sba set ft=vb
+  au BufNewFile,BufRead *.vba set ft=vb
+  au BufNewFile,BufRead *.vbs set ft=vb
   au! BufNewFile,BufRead *.bas call polyglot#DetectBasFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'dosini')
-  au BufNewFile,BufRead *.dof call s:Setf('dosini')
-  au BufNewFile,BufRead *.ini call s:Setf('dosini')
-  au BufNewFile,BufRead *.lektorproject call s:Setf('dosini')
-  au BufNewFile,BufRead *.prefs call s:Setf('dosini')
-  au BufNewFile,BufRead *.pro call s:Setf('dosini')
-  au BufNewFile,BufRead *.properties call s:Setf('dosini')
-  au BufNewFile,BufRead */etc/pacman.conf call s:Setf('dosini')
-  au BufNewFile,BufRead */etc/yum.conf call s:Setf('dosini')
+  au BufNewFile,BufRead *.dof set ft=dosini
+  au BufNewFile,BufRead *.ini set ft=dosini
+  au BufNewFile,BufRead *.lektorproject set ft=dosini
+  au BufNewFile,BufRead *.prefs set ft=dosini
+  au BufNewFile,BufRead *.pro set ft=dosini
+  au BufNewFile,BufRead *.properties set ft=dosini
+  au BufNewFile,BufRead */etc/pacman.conf set ft=dosini
+  au BufNewFile,BufRead */etc/yum.conf set ft=dosini
   au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
-  au BufNewFile,BufRead {.,}editorconfig call s:Setf('dosini')
-  au BufNewFile,BufRead {.,}npmrc call s:Setf('dosini')
-  au BufNewFile,BufRead buildozer.spec call s:Setf('dosini')
+  au BufNewFile,BufRead {.,}editorconfig set ft=dosini
+  au BufNewFile,BufRead {.,}npmrc set ft=dosini
+  au BufNewFile,BufRead buildozer.spec set ft=dosini
   au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
 endif
 
 if !has_key(s:disabled_packages, 'odin')
-  au BufNewFile,BufRead *.odin call s:Setf('odin')
+  au BufNewFile,BufRead *.odin set ft=odin
 endif
 
 if !has_key(s:disabled_packages, 'bzl')
-  au BufNewFile,BufRead *.bzl call s:Setf('bzl')
-  au BufNewFile,BufRead BUCK call s:Setf('bzl')
-  au BufNewFile,BufRead BUILD call s:Setf('bzl')
-  au BufNewFile,BufRead BUILD.bazel call s:Setf('bzl')
-  au BufNewFile,BufRead Tiltfile call s:Setf('bzl')
-  au BufNewFile,BufRead WORKSPACE call s:Setf('bzl')
+  au BufNewFile,BufRead *.bzl set ft=bzl
+  au BufNewFile,BufRead BUCK set ft=bzl
+  au BufNewFile,BufRead BUILD set ft=bzl
+  au BufNewFile,BufRead BUILD.bazel set ft=bzl
+  au BufNewFile,BufRead Tiltfile set ft=bzl
+  au BufNewFile,BufRead WORKSPACE set ft=bzl
 endif
 
 if !has_key(s:disabled_packages, 'prolog')
-  au BufNewFile,BufRead *.pro call s:Setf('prolog')
-  au BufNewFile,BufRead *.prolog call s:Setf('prolog')
-  au BufNewFile,BufRead *.yap call s:Setf('prolog')
+  au BufNewFile,BufRead *.pro set ft=prolog
+  au BufNewFile,BufRead *.prolog set ft=prolog
+  au BufNewFile,BufRead *.yap set ft=prolog
   au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
 endif
 
diff --git a/heuristics.yaml b/heuristics.yaml
index 6ff7af47d..35350a69b 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -54,7 +54,7 @@ rules:
     filetype: murphi
 - if_set: "saw_comment"
   filetype: objc
-- override: "g:filetype_m"
+- override: true
 - filetype: octave
 ---
 extensions: [fs]
@@ -67,7 +67,7 @@ rules:
     filetype: fsharp
   - pattern: '\s*(#version|precision|uniform|varying|vec[234])'
     filetype: glsl
-- override: "g:filetype_fs"
+- override: true
 - filetype: forth
 ---
 extensions: [re]
@@ -98,7 +98,7 @@ rules:
     filetype: idris2
   - pattern: '^%access .*'
     filetype: idris
-- override: 'g:filetype_idr'
+- override: true
 - filetype: idris2
 ---
 extensions: [lidr]
@@ -130,7 +130,7 @@ rules:
     filetype: raku
   - pattern: '\buse\s+(?:strict\b|v?5\.)'
     filetype: perl
-- override: 'g:filetype_pm'
+- override: true
 - filetype: perl
 ---
 extensions: [pl]
@@ -147,7 +147,7 @@ rules:
     filetype: raku
   - pattern: '\buse\s+(?:strict\b|v?5\.)'
     filetype: perl
-- override: 'g:filetype_pl'
+- override: true
 - filetype: perl
 ---
 extensions: [t]
@@ -164,7 +164,7 @@ rules:
   ## I haven't found turing syntax for vim...
   # - pattern: '^\s*%[ \t]+|^\s*var\s+\w+(\s*:\s*\w+)?\s*:=\s*\w+'
   #   filetype: turing
-- override: 'g:filetype_t'
+- override: true
 - filetype: perl
 ---
 extensions: [tt2]
diff --git a/scripts/build b/scripts/build
index 0fac234de..598fc2c55 100755
--- a/scripts/build
+++ b/scripts/build
@@ -30,7 +30,7 @@ def load_data()
   deps = Hash.new { |h, k| h[k] = [] }
 
   each_node = lambda {|&b| packages.keys.each(&b) }
-  each_child = lambda {|n, &b| [packages[n].fetch("after", [])].flatten.each(&b) }
+  each_child = lambda {|n, &b| [packages[n]["after"] || []].flatten.each(&b) }
 
   languages = load_languages
 
@@ -325,17 +325,17 @@ def rule_to_code(rule)
     variable = "g:filetype_#{rule["extensions"].first}"
     return <<~EOS
       if exists("#{variable}")
-        call s:Setf(#{variable}) | return
+        let &ft = #{variable} | return
       endif
     EOS
   end
 
   if rule.has_key?("filetype")
-    return "call s:Setf('#{rule["filetype"]}') | return"
+    return "set ft=#{rule["filetype"]} | return"
   end
 
   if rule.has_key?("filetype")
-    return "call s:Setf('#{rule["filetype"]}') | return"
+    return "set ft=#{rule["filetype"]} | return"
   end
 
   if rule.has_key?("extensions")
@@ -474,7 +474,7 @@ def generate_ftdetect(packages, heuristics)
       name = filetype.fetch("name")
       syntax = filetype["syntax"] ? " | set syntax=#{filetype["syntax"]}" : ""
 
-      set_command = "call s:Setf('#{name}')"
+      set_command = "set ft=#{name}"
 
       if filetype["syntax"]
         set_command = "set ft=#{name} syntax=#{filetype["syntax"]}"
@@ -556,19 +556,11 @@ def generate_ftdetect(packages, heuristics)
     let s:cpo_save = &cpo
     set cpo&vim
 
-    " We need it because scripts.vim in vim uses "set ft=" which cannot be
-    " overridden with setf (and we can't use set ft= so our scripts.vim work)
-    func! s:Setf(ft)
-      if &filetype !~# '\<'.a:ft.'\>'
-        let &filetype = a:ft
-      endif
-    endfunc
-
     func! polyglot#Shebang()
       " Try to detect filetype from shebang
       let ft = polyglot#ShebangFiletype()
       if ft != ""
-        call s:Setf(ft)
+        let &ft = ft
         return 1
       endif
 

From 6f0c50457f9d197c1a1759d4302f251cce4242d8 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 22 Sep 2020 17:16:27 +0200
Subject: [PATCH 055/299] Build

---
 autoload/go/config.vim |  4 ++
 autoload/rustfmt.vim   |  4 +-
 autoload/terraform.vim |  1 +
 doc/vim-go.txt         | 99 +++++++++++++++++++++++++++---------------
 ftplugin/zig.vim       | 21 ++++++---
 syntax/odin.vim        |  8 +++-
 6 files changed, 91 insertions(+), 46 deletions(-)

diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index 55bc1902c..355f90fb6 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -572,6 +572,10 @@ function! go#config#GoplsOptions() abort
   return get(g:, 'go_gopls_options', ['-remote=auto'])
 endfunction
 
+function! go#config#FillStructMode() abort
+  return get(g:, 'go_fillstruct_mode', 'fillstruct')
+endfunction
+
 " Set the default value. A value of "1" is a shortcut for this, for
 " compatibility reasons.
 if exists("g:go_gorename_prefill") && g:go_gorename_prefill == 1
diff --git a/autoload/rustfmt.vim b/autoload/rustfmt.vim
index 60e2029e8..28cca07a7 100644
--- a/autoload/rustfmt.vim
+++ b/autoload/rustfmt.vim
@@ -109,7 +109,7 @@ function! s:DeleteLines(start, end) abort
 endfunction
 
 function! s:RunRustfmt(command, tmpname, from_writepre)
-    mkview!
+    let l:view = winsaveview()
 
     let l:stderr_tmpname = tempname()
     call writefile([], l:stderr_tmpname)
@@ -215,7 +215,7 @@ function! s:RunRustfmt(command, tmpname, from_writepre)
         lwindow
     endif
 
-    silent! loadview
+    call winrestview(l:view)
 endfunction
 
 function! rustfmt#FormatRange(line1, line2)
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index 05a88e30e..1f9876695 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -68,6 +68,7 @@ function! terraform#commands(ArgLead, CmdLine, CursorPos) abort
     \ 'version',
     \ 'workspace',
     \ '0.12upgrade',
+    \ '0.13upgrade',
     \ 'debug',
     \ 'force-unlock',
     \ 'push',
diff --git a/doc/vim-go.txt b/doc/vim-go.txt
index b92ab5b9c..7d4ac52d9 100644
--- a/doc/vim-go.txt
+++ b/doc/vim-go.txt
@@ -426,10 +426,6 @@ CTRL-t
 
     If [!] is not given the first error is jumped to.
 
-    If using neovim `:GoTestFunc` will run in a new terminal or run
-    asynchronously in the background according to |'g:go_term_enabled'|. You
-    can set the mode of the new terminal with |'g:go_term_mode'|.
-
                                                               *:GoTestCompile*
 :GoTestCompile[!] [expand]
 
@@ -441,10 +437,6 @@ CTRL-t
 
     If [!] is not given the first error is jumped to.
 
-    If using neovim `:GoTestCompile` will run in a new terminal or run
-    asynchronously in the background according to |'g:go_term_enabled'|. You
-    can set the mode of the new terminal with |'g:go_term_mode'|.
-
                                                                  *:GoCoverage*
 :GoCoverage[!] [options]
 
@@ -1483,6 +1475,14 @@ accuracy or `godef` for its performance. Valid options are `godef`, `gopls`,
 and `guru`.
 >
   let g:go_def_mode = 'gopls'
+<
+                                                      *'g:go_fillstruct_mode'*
+
+Use this option to define the command to be used for |:GoFillStruct|. By
+default `fillstruct` is used. Valid values are `fillstruct` and `gopls`. By
+default it is `fillstruct`.
+>
+  let g:go_fillstruct_mode = 'fillstruct'
 <
                                                        *'g:go_referrers_mode'*
 
@@ -1789,25 +1789,34 @@ same.
 
                                                         *'g:go_gopls_enabled'*
 
-Specifies whether `gopls` can be used by vim-go. By default gopls is enabled.
-When gopls is disabled completion will not work and other configuration
+Specifies whether `gopls` can be used by vim-go.
+
+Completion will not work when gopls is disabled and other configuration
 options may also need to be adjusted.
 
+By default gopls is enabled.
+
 >
   let g:go_gopls_enabled = 1
 <
 
                                                         *'g:go_gopls_options'*
 
-The commandline arguments to pass to gopls. By default, it's `-remote=auto`.
+The commandline arguments to pass to gopls.
+
+By default, it is `['-remote=auto']`.
 >
-  let g:go_gopls_options = []
+  let g:go_gopls_options = ['-remote=auto']
 <
 
                                                        *'g:go_gopls_analyses'*
 
-The analyses settings for `gopls`. By default, it's `v:null`. Valid map values
-are `v:true` and `v:false`.
+The analyses settings for `gopls`.
+
+The Expected value is either `v:null` or a dictionary. The dictionary will be
+provided to `gopls` via json-rpc, so dictionary values need to be of the
+appropriate type for Vim to convert to JSON (e.g. truthy dictionary values
+should be `v:true` or `v:false`). By default, it is `v:null`.
 >
   let g:go_gopls_analyses = v:null
 <
@@ -1815,34 +1824,36 @@ are `v:true` and `v:false`.
                                             *'g:go_gopls_complete_unimported'*
 
 Specifies whether `gopls` should include suggestions from unimported packages.
-When it is `v:null`, `gopls`' default will be used. By default it is
-`v:null`.
+
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_complete_unimported = v:null
 <
 
                                                 *'g:go_gopls_deep_completion'*
 
-Specifies whether `gopls` should use deep completion. When it is `v:null`,
-`gopls`' default will be used. By default it is `v:null`.
+Specifies whether `gopls` should use deep completion.
 
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_deep_completion = v:null
 <
 
                                                        *'g:go_gopls_matcher'*
 
-Specifies how `gopls` should match for completions. Valid values are `v:null`,
-`fuzzy`, and `caseSensitive`.  When it is `v:null`, `gopls`' default will be
-used. By default it is `v:null`.
+Specifies how `gopls` should match for completions.
+
+Valid values are `v:null`, `fuzzy`, and `caseSensitive`. When it is `v:null`,
+`gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_matcher = v:null
 <
 
                                                    *'g:go_gopls_staticcheck'*
 
-Specifies whether `gopls` should run staticcheck checks. When it is `v:null`,
-`gopls`' default will be used. By default it is `v:null`.
+Specifies whether `gopls` should run staticcheck checks.
+
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_staticcheck = v:null
 <
@@ -1852,8 +1863,9 @@ Specifies whether `gopls` should run staticcheck checks. When it is `v:null`,
 Specifies whether `gopls` can provide placeholders for function parameters and
 struct fields. When set, completion items will be treated as anonymous
 snippets if UltiSnips is installed and configured to be used as
-|'g:go_snippet_engine'|. When it is `v:null`, `gopls`' default will be used.
-By default it is `v:null`.
+|'g:go_snippet_engine'|.
+
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_use_placeholders = v:null
 <
@@ -1861,8 +1873,9 @@ By default it is `v:null`.
                                                    *'g:go_gopls_temp_modfile'*
 
 Specifies whether `gopls` should use a temp modfile and suggest edits rather
-than modifying the ambient go.mod file.  When it is `v:null`, `gopls`' default
-will be used.  By default it is `v:null`.
+than modifying the ambient go.mod file.
+
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_temp_modfile = v:null
 <
@@ -1870,16 +1883,18 @@ will be used.  By default it is `v:null`.
                                                          *'g:go_gopls_local'*
 
 Specifies the prefix for imports that `gopls` should consider group
-separately. When it is `v:null`, `gopls`' default will be used.  By default it
-is `v:null`.
+separately.
+
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_local = v:null
 <
 
                                                        *'g:go_gopls_gofumpt'*
 
-Specifies whether `gopls` should use `gofumpt` for formatting. When it is
-`v:null`, `gopls`' default will be used.  By default it is `v:null`.
+Specifies whether `gopls` should use `gofumpt` for formatting.
+
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_gofumpt = v:null
 <
@@ -1887,10 +1902,12 @@ Specifies whether `gopls` should use `gofumpt` for formatting. When it is
                                                       *'g:go_gopls_settings'*
 
 Specifies `gopls` workspace settings for `gopls` that are not yet officially
-supported by vim-go. Any value in the dictionary will be overridden by values
-provided in the specific options supported by vim-go (e.g.
-g:go_gopls_staticcheck) or settings statically configured by vim-go to ensure
-expected behavior. By default it is `v:null`.
+supported by vim-go.
+
+Any value in the dictionary will be overridden by values provided in the
+specific options supported by vim-go (e.g.  g:go_gopls_staticcheck) or
+settings statically configured by vim-go to ensure expected behavior. By
+default it is `v:null`.
 >
   let g:go_gopls_settings = v:null
 <
@@ -1898,7 +1915,9 @@ expected behavior. By default it is `v:null`.
 
 Specifies whether `gopls` diagnostics are enabled. Only the diagnostics for
 the current buffer will be processed when it is not set; all others will be
-ignored. By default it is disabled.
+ignored.
+
+By default it is disabled.
 >
   let g:go_diagnostics_enabled = 0
 <
@@ -2323,6 +2342,14 @@ The rest of the commands and mappings become available after executing
     Use `-test.flag` to pass flags to `go test` when debugging a test; for
     example `-test.v` or `-test.run TestFoo`
 
+                                                            *:GoDebugTestFunc*
+:GoDebugTestFunc [expand]
+
+    Behaves the same as |:GoDebugTest| and implicitly adds `-test.run` to run
+    the nearest test or example function (i.e the nearest function declaration
+    that matches `func Test` or `func Example`) at or previous to the cursor.
+    Search will not wrap around when at the top of the file.
+
                                                              *:GoDebugRestart*
 :GoDebugRestart
 
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index 675a3bcfc..dc9af384d 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -21,24 +21,31 @@ setlocal formatoptions-=t formatoptions+=croql
 setlocal suffixesadd=.zig,.zir
 setlocal makeprg=zig\ build
 
-if has("comments")
+if has('comments')
     setlocal comments=:///,://!,://,:\\\\
     setlocal commentstring=//\ %s
 endif
 
 if has('find_in_path')
-	let &l:includeexpr='substitute(v:fname, "^([^.])$", "\1.zig", "")'
-	let &l:include='\v(\@import>|\@cInclude>|^\s*\#\s*include)'
-	let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
+    let &l:includeexpr='substitute(v:fname, "^([^.])$", "\1.zig", "")'
+    let &l:include='\v(\@import>|\@cInclude>|^\s*\#\s*include)'
 endif
 
-if has('eval')
-	execute 'setlocal path+=' . json_decode(system('zig env'))['std_dir']
+let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
+
+if exists("*json_decode") && executable('zig')
+    silent let s:env = system('zig env')
+    if v:shell_error == 0
+        let &l:path=json_decode(s:env)['std_dir'] . ',' . &l:path
+    endif
+    unlet! s:env
 endif
 
-let b:undo_ftplugin = "setl et< ts< sts< sw< fo< sua< mp< com< cms<"
+let b:undo_ftplugin =
+    \ 'setl et< ts< sts< sw< fo< sua< mp< com< cms< inex< inc< pa<'
 
 let &cpo = s:cpo_orig
 unlet s:cpo_orig
+" vim: tabstop=8 shiftwidth=4 softtabstop=4 expandtab
 
 endif
diff --git a/syntax/odin.vim b/syntax/odin.vim
index c9bae6390..553f46125 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -30,6 +30,9 @@ syntax keyword odinTypeIdOf typeid_of
 syntax keyword odinTypeOf type_of
 syntax keyword odinAlignOf align_of
 
+syntax keyword odinInline inline
+syntax keyword odinNoInline no_inline
+
 syntax match odinTodo "TODO"
 syntax match odinNote "NOTE"
 syntax match odinXXX "XXX"
@@ -37,7 +40,7 @@ syntax match odinFixMe "FIXME"
 syntax match odinNoCheckin "NOCHECKIN"
 syntax match odinHack "HACK"
 
-syntax keyword odinDataType string cstring bool b8 b16 b32 b64 rune any rawptr f32 f64 f32le f32be f64le f64be u8 u16 u32 u64 u128 u16le u32le u64le u128le u16be u32be u64be u128be uint i8 i16 i32 i64 i128 i16le i32le i64le i128le i16be i32be i64be i128be int
+syntax keyword odinDataType string cstring bool b8 b16 b32 b64 rune any rawptr f32 f64 f32le f32be f64le f64be u8 u16 u32 u64 u128 u16le u32le u64le u128le u16be u32be u64be u128be uint uintptr i8 i16 i32 i64 i128 i16le i32le i64le i128le i16be i32be i64be i128be int
 syntax keyword odinBool true false
 syntax keyword odinNull nil
 syntax keyword odinDynamic dynamic
@@ -105,6 +108,9 @@ highlight link odinTypeIdOf Keyword
 highlight link odinAlignOf Keyword
 highlight link odinPackage Keyword
 
+highlight link odinInline Keyword
+highlight link odinNoInline Keyword
+
 highlight link odinImport Keyword
 highlight link odinExport Keyword
 highlight link odinForeign Keyword

From 378dcb387823e840c13722d4b514086c8dfa3527 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 22 Sep 2020 21:47:21 +0200
Subject: [PATCH 056/299] Update tests location

---
 Makefile                                      |   4 +-
 ftdetect/polyglot.vim                         |   4 +
 scripts/Gemfile                               |   3 -
 scripts/test                                  |   4 +-
 syntax/unison.vim                             |   3 +
 .../extensions.vim                            |   0
 tests/filetypes.vim                           | 242 ++++++++++++++++++
 7 files changed, 253 insertions(+), 7 deletions(-)
 delete mode 100644 scripts/Gemfile
 rename scripts/test_extensions.vim => tests/extensions.vim (100%)
 create mode 100644 tests/filetypes.vim

diff --git a/Makefile b/Makefile
index 9e9ec579f..1ec9bf799 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-.PHONY: all test dev
+.PHONY: build test dev
 
-all:
+build:
 	@ scripts/build
 
 test:
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index cdb96b50c..ba187f91f 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -366,6 +366,10 @@ if !has_key(s:disabled_packages, 'protobuf')
   au! BufRead,BufNewFile *.proto
 endif
 
+if !has_key(s:disabled_packages, 'puppet')
+  au! BufRead,BufNewFile *.pp
+endif
+
 if !has_key(s:disabled_packages, 'python')
   au! BufRead,BufNewFile *.py,*.pyi,*.pyw,*.spec,SConstruct
 endif
diff --git a/scripts/Gemfile b/scripts/Gemfile
deleted file mode 100644
index fc8e57456..000000000
--- a/scripts/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "jasherai-oniguruma"
diff --git a/scripts/test b/scripts/test
index 9e023bb95..227174d76 100755
--- a/scripts/test
+++ b/scripts/test
@@ -5,8 +5,8 @@ set -e
 vim --clean -N -u <(echo "
   let &rtp='$PWD,'.&rtp
   let g:polyglot_test = 1
-  source scripts/test_extensions.vim
-  source scripts/test_filetypes.vim
+  source tests/extensions.vim
+  source tests/filetypes.vim
   qa!
 ")
 
diff --git a/syntax/unison.vim b/syntax/unison.vim
index 8353dce99..2578add82 100644
--- a/syntax/unison.vim
+++ b/syntax/unison.vim
@@ -97,6 +97,7 @@ endif
 syn match   uLineComment      "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$"
 syn region  uBlockComment     start="{-"  end="-}" contains=uBlockComment
 syn region  uPragma	       start="{-#" end="#-}"
+syn region  uBelowFold	       start="^---" skip="." end="." contains=uBelowFold
 
 " Docs
 syn region  uDocBlock         start="\[:" end=":]" contains=uLink,uDocDirective
@@ -134,6 +135,7 @@ if version >= 508 || !exists("did_u_syntax_inits")
   HiLink uBlockComment		  uComment
   HiLink uLineComment			  uComment
   HiLink uComment			  Comment
+  HiLink uBelowFold			  Comment
   HiLink uDocBlock                String
   HiLink uLink                    uType
   HiLink uDocDirective            uImport
@@ -148,6 +150,7 @@ if version >= 508 || !exists("did_u_syntax_inits")
   delcommand HiLink
 endif
 
+
 let b:current_syntax = "unison"
 
 " Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
diff --git a/scripts/test_extensions.vim b/tests/extensions.vim
similarity index 100%
rename from scripts/test_extensions.vim
rename to tests/extensions.vim
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
new file mode 100644
index 000000000..02d44ca46
--- /dev/null
+++ b/tests/filetypes.vim
@@ -0,0 +1,242 @@
+function! TestFiletype(filetype)
+  try
+    enew
+    exec 'set ft=' . a:filetype
+  catch
+    echo 'Error loading filetype ' . a:filetype  . ':'
+    echo v:exception
+    echo v:throwpoint
+    exec ':cq!'
+  endtry
+endfunction
+
+call TestFiletype('8th')
+call TestFiletype('haproxy')
+call TestFiletype('a2ps')
+call TestFiletype('a65')
+call TestFiletype('aap')
+call TestFiletype('abap')
+call TestFiletype('abaqus')
+call TestFiletype('abc')
+call TestFiletype('abel')
+call TestFiletype('acedb')
+call TestFiletype('asl')
+call TestFiletype('ada')
+call TestFiletype('ahdl')
+call TestFiletype('aidl')
+call TestFiletype('alsaconf')
+call TestFiletype('aml')
+call TestFiletype('ampl')
+call TestFiletype('xml')
+call TestFiletype('ant')
+call TestFiletype('apache')
+call TestFiletype('apiblueprint')
+call TestFiletype('applescript')
+call TestFiletype('aptconf')
+call TestFiletype('arch')
+call TestFiletype('cpp')
+call TestFiletype('c')
+call TestFiletype('arduino')
+call TestFiletype('art')
+call TestFiletype('asciidoc')
+call TestFiletype('autohotkey')
+call TestFiletype('elf')
+call TestFiletype('automake')
+call TestFiletype('asn')
+call TestFiletype('aspvbs')
+call TestFiletype('aspperl')
+call TestFiletype('atlas')
+call TestFiletype('autoit')
+call TestFiletype('ave')
+call TestFiletype('awk')
+call TestFiletype('caddyfile')
+call TestFiletype('carp')
+call TestFiletype('clojure')
+call TestFiletype('cmake')
+call TestFiletype('coffee')
+call TestFiletype('litcoffee')
+call TestFiletype('cryptol')
+call TestFiletype('crystal')
+call TestFiletype('ecrystal')
+call TestFiletype('csv')
+call TestFiletype('cucumber')
+call TestFiletype('cuesheet')
+call TestFiletype('dart')
+call TestFiletype('dhall')
+call TestFiletype('d')
+call TestFiletype('dcov')
+call TestFiletype('dd')
+call TestFiletype('ddoc')
+call TestFiletype('dsdl')
+call TestFiletype('Dockerfile')
+call TestFiletype('yaml.docker-compose')
+call TestFiletype('elixir')
+call TestFiletype('eelixir')
+call TestFiletype('elm')
+call TestFiletype('ember-script')
+call TestFiletype('emblem')
+call TestFiletype('erlang')
+call TestFiletype('fennel')
+call TestFiletype('ferm')
+call TestFiletype('fish')
+call TestFiletype('fbs')
+call TestFiletype('forth')
+call TestFiletype('glsl')
+call TestFiletype('fsharp')
+call TestFiletype('gdscript3')
+call TestFiletype('gitconfig')
+call TestFiletype('gitrebase')
+call TestFiletype('gitsendemail')
+call TestFiletype('gitcommit')
+call TestFiletype('gmpl')
+call TestFiletype('gnuplot')
+call TestFiletype('go')
+call TestFiletype('gomod')
+call TestFiletype('gohtmltmpl')
+call TestFiletype('javascript')
+call TestFiletype('flow')
+call TestFiletype('javascriptreact')
+call TestFiletype('graphql')
+call TestFiletype('groovy')
+call TestFiletype('grub')
+call TestFiletype('haml')
+call TestFiletype('mustache')
+call TestFiletype('haskell')
+call TestFiletype('haxe')
+call TestFiletype('hcl')
+call TestFiletype('hive')
+call TestFiletype('html')
+call TestFiletype('i3config')
+call TestFiletype('icalendar')
+call TestFiletype('idris')
+call TestFiletype('idris2')
+call TestFiletype('lidris2')
+call TestFiletype('ion')
+call TestFiletype('Jenkinsfile')
+call TestFiletype('jinja.html')
+call TestFiletype('jq')
+call TestFiletype('json5')
+call TestFiletype('json')
+call TestFiletype('jsonnet')
+call TestFiletype('jst')
+call TestFiletype('julia')
+call TestFiletype('kotlin')
+call TestFiletype('ledger')
+call TestFiletype('less')
+call TestFiletype('lilypond')
+call TestFiletype('livescript')
+call TestFiletype('llvm')
+call TestFiletype('tablegen')
+call TestFiletype('log')
+call TestFiletype('lua')
+call TestFiletype('m4')
+call TestFiletype('mako')
+call TestFiletype('mma')
+call TestFiletype('markdown')
+call TestFiletype('markdown.mdx')
+call TestFiletype('meson')
+call TestFiletype('dosini')
+call TestFiletype('moon')
+call TestFiletype('murphi')
+call TestFiletype('nginx')
+call TestFiletype('nim')
+call TestFiletype('nix')
+call TestFiletype('objc')
+call TestFiletype('ocaml')
+call TestFiletype('omake')
+call TestFiletype('opam')
+call TestFiletype('oasis')
+call TestFiletype('dune')
+call TestFiletype('ocamlbuild_tags')
+call TestFiletype('ocpbuild')
+call TestFiletype('ocpbuildroot')
+call TestFiletype('sexplib')
+call TestFiletype('octave')
+call TestFiletype('opencl')
+call TestFiletype('perl')
+call TestFiletype('pod')
+call TestFiletype('mason')
+call TestFiletype('tt2')
+call TestFiletype('tt2html')
+call TestFiletype('xs')
+call TestFiletype('sql')
+call TestFiletype('cql')
+call TestFiletype('php')
+call TestFiletype('blade')
+call TestFiletype('plantuml')
+call TestFiletype('pony')
+call TestFiletype('ps1')
+call TestFiletype('ps1xml')
+call TestFiletype('proto')
+call TestFiletype('pug')
+call TestFiletype('puppet')
+call TestFiletype('embeddedpuppet')
+call TestFiletype('purescript')
+call TestFiletype('python')
+call TestFiletype('requirements')
+call TestFiletype('qmake')
+call TestFiletype('qml')
+call TestFiletype('r')
+call TestFiletype('rhelp')
+call TestFiletype('racket')
+call TestFiletype('ragel')
+call TestFiletype('raku')
+call TestFiletype('raml')
+call TestFiletype('razor')
+call TestFiletype('reason')
+call TestFiletype('rst')
+call TestFiletype('ruby')
+call TestFiletype('eruby')
+call TestFiletype('ruby')
+call TestFiletype('brewfile')
+call TestFiletype('rust')
+call TestFiletype('scala')
+call TestFiletype('sbt.scala')
+call TestFiletype('scss')
+call TestFiletype('sh')
+call TestFiletype('zsh')
+call TestFiletype('slim')
+call TestFiletype('slime')
+call TestFiletype('smt2')
+call TestFiletype('solidity')
+call TestFiletype('stylus')
+call TestFiletype('svelte')
+call TestFiletype('svg')
+call TestFiletype('swift')
+call TestFiletype('sxhkdrc')
+call TestFiletype('systemd')
+call TestFiletype('terraform')
+call TestFiletype('textile')
+call TestFiletype('thrift')
+call TestFiletype('tmux')
+call TestFiletype('toml')
+call TestFiletype('tptp')
+call TestFiletype('html.twig')
+call TestFiletype('xml.twig')
+call TestFiletype('typescript')
+call TestFiletype('typescriptreact')
+call TestFiletype('unison')
+call TestFiletype('v')
+call TestFiletype('vala')
+call TestFiletype('vbnet')
+call TestFiletype('vcl')
+call TestFiletype('velocity')
+call TestFiletype('vmasm')
+call TestFiletype('vue')
+call TestFiletype('xdc')
+call TestFiletype('xsl')
+call TestFiletype('yaml')
+call TestFiletype('yaml.ansible')
+call TestFiletype('helm')
+call TestFiletype('help')
+call TestFiletype('zephir')
+call TestFiletype('zir')
+call TestFiletype('zig')
+call TestFiletype('trasys')
+call TestFiletype('basic')
+call TestFiletype('vb')
+call TestFiletype('dosini')
+call TestFiletype('odin')
+call TestFiletype('bzl')
+call TestFiletype('prolog')
+call TestFiletype('tads')

From 92cb76e33a9ba4d8ac72018a26c2e99ba50d971c Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 23 Sep 2020 09:43:36 +0200
Subject: [PATCH 057/299] Fix polyglot_disabled docs, closes #555

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4034fc26e..bc738b8d1 100644
--- a/README.md
+++ b/README.md
@@ -255,9 +255,11 @@ Please make sure you have `syntax on` in your `.vimrc` (or use something like [s
 Individual language packs can be disabled by setting `g:polyglot_disabled` as follows:
 
 ```vim
-let g:polyglot_disabled = ['css']
+let g:polyglot_disabled = ['markdown']
 ```
 
+The list of available languages to disable is shown above.
+
 *Please declare this variable before polyglot is loaded (at the top of .vimrc)*
 
 Please note that disabling a language won't make in your vim startup any faster / slower (only for specific this specific filetype). All plugins are loaded lazily, on demand.

From 33f0964d53270e627e9293a3a7a2badb44353a0b Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 23 Sep 2020 19:37:50 +0200
Subject: [PATCH 058/299] Update test script to ruby

---
 Makefile                   |  2 +-
 indent/terraform.vim       |  4 +--
 scripts/build              | 15 +++-----
 scripts/test               | 70 +++++++++++++++++++++++++++++++-------
 scripts/test_filetypes.vim |  2 ++
 tests/extensions.vim       |  4 ++-
 tests/filetypes.vim        | 13 +++----
 tests/indent/2.1/test.js   | 10 ++++++
 tests/indent/4.1/test.js   | 10 ++++++
 9 files changed, 94 insertions(+), 36 deletions(-)
 create mode 100644 tests/indent/2.1/test.js
 create mode 100644 tests/indent/4.1/test.js

diff --git a/Makefile b/Makefile
index 1ec9bf799..fd5b5d84d 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ test:
 	@ scripts/test
 
 dev:
-	@ echo "packages.yaml\nheuristics.yaml\nscripts/test\nscripts/build\nscripts/test_extensions.vim" | DEV=1 entr bash -c 'make && make test'
+	@ echo "packages.yaml\nheuristics.yaml\nscripts/test\nscripts/build\ntests/extensions.vim" | DEV=1 entr bash -c 'make && make test'
diff --git a/indent/terraform.vim b/indent/terraform.vim
index c035c2161..4f536c487 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.vim
@@ -10,11 +10,11 @@ let s:cpo_save = &cpoptions
 set cpoptions&vim
 
 setlocal nolisp
-setlocal autoindent shiftwidth=2 tabstop=2 softtabstop=2
+setlocal autoindent shiftwidth=2 tabstop=2 softtabstop=2 expandtab
 setlocal indentexpr=TerraformIndent(v:lnum)
 setlocal indentkeys+=<:>,0=},0=)
 let b:undo_indent = 'setlocal lisp< autoindent< shiftwidth< tabstop< softtabstop<'
-  \ . ' indentexpr< indentkeys<'
+  \ . ' expandtab< indentexpr< indentkeys<'
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
diff --git a/scripts/build b/scripts/build
index 598fc2c55..44b03e95b 100755
--- a/scripts/build
+++ b/scripts/build
@@ -643,15 +643,10 @@ end
 def generate_tests(packages)
   output = <<~EOS
     function! TestFiletype(filetype)
-      try
-        enew
-        exec 'set ft=' . a:filetype
-      catch
-        echo 'Error loading filetype ' . a:filetype  . ':'
-        echo v:exception
-        echo v:throwpoint
-        exec ':cq!'
-      endtry
+      call Log('Loading ' . a:filetype . ' filetype...')
+
+      enew
+      exec 'set ft=' . a:filetype
     endfunction
 
   EOS
@@ -662,7 +657,7 @@ def generate_tests(packages)
     end
   end
 
-  File.write('scripts/test_filetypes.vim', output)
+  File.write('tests/filetypes.vim', output)
 
 
 end
diff --git a/scripts/test b/scripts/test
index 227174d76..db6de5dac 100755
--- a/scripts/test
+++ b/scripts/test
@@ -1,16 +1,60 @@
-#!/bin/bash
+#!/usr/bin/env ruby
 
-set -e
+def run_script(src)
+  system("bash", "-c", src)
+end
 
-vim --clean -N -u <(echo "
-  let &rtp='$PWD,'.&rtp
-  let g:polyglot_test = 1
-  source tests/extensions.vim
-  source tests/filetypes.vim
-  qa!
-")
+def run_vimscript(src)
+  wrapper = <<~EOF
+    vim --clean --not-a-term -u <(cat <<- "EOM"
+    let g:polyglot_test = 1
+    let &rtp='$PWD,' . &rtp
+    runtime filetype.vim
+    set t_ti= t_te=
+    set shortmess+=F
+    set noswapfile
+    set nocp
+    set nomore
+    func! Log(msg)
+      if $DEV != '1'
+        echo a:msg
+      else
+        echon '.'
+      endif
+    endfunc
+    EOM
+    ) -S <(cat <<- "EOM"
+      try
+      #{src}
+      catch
+        echo v:exception
+        echo v:throwpoint
+      endtry
+      qa!
+    EOM
+    ) | perl -pe 's/\e\[[0-9;]*[a-zA-Z]//g'
+  EOF
 
-if ! expect -c 'set timeout 1' -c 'spawn vim -N --clean -c "set nomore | :helptags ./doc | q"' -c 'expect "ENTER" { exit 1 }' > /dev/null; then
-  echo "Please ensure ':helptags ./doc' works properly"
-  exit 1
-fi
+  run_script(wrapper)
+end
+
+test_helptags = <<~EOF
+  if ! expect -c 'set timeout 1' -c 'spawn vim -N --clean -c "set nomore | :helptags ./doc | q"' -c 'expect "ENTER" { exit 1 }' > /dev/null; then
+    echo "Please ensure ':helptags ./doc' works properly"
+    exit 1
+  fi
+EOF
+
+run_vimscript('source tests/filetypes.vim')
+run_vimscript('source tests/extensions.vim')
+run_script(test_helptags)
+
+# run_vimscript("
+#   func! TestIndent(file)
+#     :e a:file
+#     echo 'ok'
+#     echo &filetype
+#   endfunc
+#
+#   #{Dir['tests/indent/**/test.*'].map { |f| "call TestIndent(\"#{f}\")"}.join("\n")}
+# ")
diff --git a/scripts/test_filetypes.vim b/scripts/test_filetypes.vim
index 02d44ca46..4ce20e723 100644
--- a/scripts/test_filetypes.vim
+++ b/scripts/test_filetypes.vim
@@ -1,4 +1,6 @@
 function! TestFiletype(filetype)
+  call Log('Loading ' . a:filetype . ' filetype...')
+
   try
     enew
     exec 'set ft=' . a:filetype
diff --git a/tests/extensions.vim b/tests/extensions.vim
index 467ac86a0..98a93796e 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -1,8 +1,10 @@
 function! TestExtension(filetype, filename, content)
+  call Log('Detecting ' . a:filetype . ' filetype (' . a:filename . ')...')
+
   try
     let g:message = ""
     exec "noautocmd n " . a:filename
-    put =a:content
+    silent put =a:content
     1delete _
     filetype detect
     exec "if &filetype != '" . a:filetype . "' \nthrow &filetype\nendif"
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 02d44ca46..3128a730e 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -1,13 +1,8 @@
 function! TestFiletype(filetype)
-  try
-    enew
-    exec 'set ft=' . a:filetype
-  catch
-    echo 'Error loading filetype ' . a:filetype  . ':'
-    echo v:exception
-    echo v:throwpoint
-    exec ':cq!'
-  endtry
+  call Log('Loading ' . a:filetype . ' filetype...')
+
+  enew
+  exec 'set ft=' . a:filetype
 endfunction
 
 call TestFiletype('8th')
diff --git a/tests/indent/2.1/test.js b/tests/indent/2.1/test.js
new file mode 100644
index 000000000..bfe70006f
--- /dev/null
+++ b/tests/indent/2.1/test.js
@@ -0,0 +1,10 @@
+// File with 2-spaces indentation
+function foobar() {
+  foo = bar
+  while (true) {
+    fizfuz()
+    fizfuz()
+    fizfuz()
+    fizfuz()
+  }
+}
diff --git a/tests/indent/4.1/test.js b/tests/indent/4.1/test.js
new file mode 100644
index 000000000..64e951033
--- /dev/null
+++ b/tests/indent/4.1/test.js
@@ -0,0 +1,10 @@
+// File with 4-spaces indentation
+function foobar() {
+    foo = bar
+    while (true) {
+        fizfuz()
+        fizfuz()
+        fizfuz()
+        fizfuz()
+    }
+}

From d9ec600545a581da2d248bc60fce5b5f8dcdab8d Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 23 Sep 2020 20:18:38 +0200
Subject: [PATCH 059/299] Allow to use ruby 2.5.5, closes #558

---
 scripts/build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/build b/scripts/build
index 44b03e95b..8b507fef5 100755
--- a/scripts/build
+++ b/scripts/build
@@ -290,7 +290,7 @@ def rule_to_code(rule)
 
   if rule.has_key?("rules")
     return rule["rules"].map do |r|
-      indent(rule_to_code({ "extensions" => rule["extensions"], **r }), 0)
+      indent(rule_to_code({ "extensions" => rule["extensions"] }.merge(r)), 0)
     end.join("\n")
   end
 
@@ -508,7 +508,7 @@ def generate_ftdetect(packages, heuristics)
 
       for filename in filenames.sort
         if filename[0] == "."
-          filename = "{.,}" + filename[1..]
+          filename = "{.,}" + filename[1..-1]
         end
         if filename[-1] == "*"
           autocommands << "  au BufNewFile,BufRead #{filename} call s:StarSetf('#{name}')\n"
@@ -729,7 +729,7 @@ def detect_filetypes(glob)
   end.group_by { |a, b| a }.map { |a, b| [a, b.map { |c, d| d }] }.map { |a, b|
     {
       "name" => a,
-      "extensions" => b.select { |x| x.match(/^\*\.[^\/]+$/) }.map { |a| a.strip[2..] },
+      "extensions" => b.select { |x| x.match(/^\*\.[^\/]+$/) }.map { |a| a.strip[2..-1] },
       "filenames" => expand_all(b.select { |x| !x.match(/^\*\.[^\/]+$/) })
     }
   }

From 3a298c975999f55a84fb40b9bb87be56b2a73953 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 23 Sep 2020 22:04:29 +0200
Subject: [PATCH 060/299] Add more advanced cpp syntax, #557

---
 README.md            |   3 +-
 after/syntax/c.vim   |  74 +++++++
 after/syntax/cpp.vim | 450 +++++++++++++++++++++++++++++++++++++++++++
 packages.yaml        |   5 +
 4 files changed, 531 insertions(+), 1 deletion(-)
 create mode 100644 after/syntax/c.vim
 create mode 100644 after/syntax/cpp.vim

diff --git a/README.md b/README.md
index bc738b8d1..652c1361f 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->199<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->200<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -89,6 +89,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [clojure](https://github.com/guns/vim-clojure-static)
 - [cmake](https://github.com/pboettch/vim-cmake-syntax)
 - [coffee-script](https://github.com/kchmck/vim-coffee-script)
+- [cpp-modern](https://github.com/bfrg/vim-cpp-modern)
 - [cql](https://github.com/elubow/cql-vim)
 - [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim)
 - [crystal](https://github.com/rhysd/vim-crystal)
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
new file mode 100644
index 000000000..a3db4e082
--- /dev/null
+++ b/after/syntax/c.vim
@@ -0,0 +1,74 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') == -1
+
+" ==============================================================================
+" Vim syntax file
+" Language:        C Additions
+" Original Author: Mikhail Wolfson <mywolfson@gmail.com>
+"                  http://www.vim.org/scripts/script.php?script_id=3064
+" Maintainer:      bfrg <bfrg@users.noreply.github.com>
+" Website:         https://github.com/bfrg/vim-cpp-modern
+" Last Change:     Mar 14, 2020
+"
+" Extended C syntax highlighting including highlighting of user-defined
+" functions.
+"
+" This syntax file is based on:
+" https://github.com/octol/vim-cpp-enhanced-highlight
+" ==============================================================================
+
+
+" Highlight some additional keywords in the comments
+syn keyword cTodo contained BUG NOTE
+
+
+" Highlight function names
+if !get(g:, 'cpp_no_function_highlight', 0)
+    syn match cUserFunction "\<\h\w*\>\(\s\|\n\)*("me=e-1 contains=cParen,cCppParen
+    hi def link cUserFunction Function
+endif
+
+
+" Common ANSI-standard Names
+syn keyword cAnsiName
+        \ PRId8 PRIi16 PRIo32 PRIu64 PRId16 PRIi32 PRIo64 PRIuLEAST8 PRId32 PRIi64 PRIoLEAST8 PRIuLEAST16 PRId64 PRIiLEAST8 PRIoLEAST16 PRIuLEAST32 PRIdLEAST8 PRIiLEAST16 PRIoLEAST32 PRIuLEAST64 PRIdLEAST16 PRIiLEAST32 PRIoLEAST64 PRIuFAST8 PRIdLEAST32 PRIiLEAST64 PRIoFAST8 PRIuFAST16 PRIdLEAST64 PRIiFAST8 PRIoFAST16 PRIuFAST32 PRIdFAST8 PRIiFAST16 PRIoFAST32 PRIuFAST64 PRIdFAST16 PRIiFAST32 PRIoFAST64 PRIuMAX PRIdFAST32 PRIiFAST64 PRIoMAX PRIuPTR PRIdFAST64 PRIiMAX PRIoPTR PRIx8 PRIdMAX PRIiPTR PRIu8 PRIx16 PRIdPTR PRIo8 PRIu16 PRIx32 PRIi8 PRIo16 PRIu32 PRIx64 PRIxLEAST8 SCNd8 SCNiFAST32 SCNuLEAST32 PRIxLEAST16 SCNd16 SCNiFAST64 SCNuLEAST64 PRIxLEAST32 SCNd32 SCNiMAX SCNuFAST8 PRIxLEAST64 SCNd64 SCNiPTR SCNuFAST16 PRIxFAST8 SCNdLEAST8 SCNo8 SCNuFAST32 PRIxFAST16 SCNdLEAST16 SCNo16 SCNuFAST64 PRIxFAST32 SCNdLEAST32 SCNo32 SCNuMAX PRIxFAST64 SCNdLEAST64 SCNo64 SCNuPTR PRIxMAX SCNdFAST8 SCNoLEAST8 SCNx8 PRIxPTR SCNdFAST16 SCNoLEAST16 SCNx16 PRIX8 SCNdFAST32 SCNoLEAST32 SCNx32 PRIX16 SCNdFAST64 SCNoLEAST64 SCNx64 PRIX32 SCNdMAX SCNoFAST8 SCNxLEAST8 PRIX64 SCNdPTR SCNoFAST16 SCNxLEAST16 PRIXLEAST8 SCNi8 SCNoFAST32 SCNxLEAST32 PRIXLEAST16 SCNi16 SCNoFAST64 SCNxLEAST64 PRIXLEAST32 SCNi32 SCNoMAX SCNxFAST8 PRIXLEAST64 SCNi64 SCNoPTR SCNxFAST16 PRIXFAST8 SCNiLEAST8 SCNu8 SCNxFAST32 PRIXFAST16 SCNiLEAST16 SCNu16 SCNxFAST64 PRIXFAST32 SCNiLEAST32 SCNu32 SCNxMAX PRIXFAST64 SCNiLEAST64 SCNu64 SCNxPTR PRIXMAX SCNiFAST8 SCNuLEAST8 PRIXPTR SCNiFAST16 SCNuLEAST16 STDC CX_LIMITED_RANGE STDC FENV_ACCESS STDC FP_CONTRACT
+        \ errno environ and bitor not_eq xor and_eq compl or xor_eq bitand not or_eq
+
+" Booleans
+syn keyword cBoolean true false TRUE FALSE
+
+
+" Default highlighting
+hi def link cBoolean  Boolean
+hi def link cAnsiName Identifier
+
+
+" Highlight all standard C keywords as Statement
+" This is very similar to what other IDEs and editors do
+if get(g:, 'cpp_simple_highlight', 0)
+    hi link cStorageClass Statement
+    hi link cStructure    Statement
+    hi link cLabel        Statement
+endif
+
+
+" Operators
+" syn match cOperator "\(<<\|>>\|[-+*/%&^|<>!=]\)="
+" syn match cOperator "<<\|>>\|&&\|||\|++\|--\|->"
+" syn match cOperator "[.!~*&%<>^|=,+-]"
+" syn match cOperator "/[^/*=]"me=e-1
+" syn match cOperator "/$"
+" syn match cOperator "&&\|||"
+" syn match cOperator "[][]"
+
+" Preprocessor
+" syn keyword cDefined defined contained containedin=cDefine
+" hi def link cDefined cDefine
+
+" Delimiters
+" syn match cDelimiter "[();\\]"
+" hi def link cDelimiter Delimiter
+" foldmethod=syntax fix, courtesy of Ivan Freitas
+" syn match cBraces display "[{}]"
+" hi def link cBraces Delimiter
+
+endif
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
new file mode 100644
index 000000000..00ab539c7
--- /dev/null
+++ b/after/syntax/cpp.vim
@@ -0,0 +1,450 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') == -1
+
+" ==============================================================================
+" Vim syntax file
+" Language:        C++ (Standard library including C++11/14/17/20)
+" Original Author: Jon Haggblad <https://github.com/octol>
+" Maintainer:      bfrg <bfrg@users.noreply.github.com>
+" Website:         https://github.com/bfrg/vim-cpp-modern
+" Last Change:     Jun 23, 2020
+"
+" This syntax file is based on:
+" https://github.com/octol/vim-cpp-enhanced-highlight
+" http://www.vim.org/scripts/script.php?script_id=4293
+" ==============================================================================
+
+" Standard library {{{1
+syntax keyword cppSTLconstant
+        \ MB_CUR_MAX MB_LEN_MAX WCHAR_MAX WCHAR_MIN WEOF __STDC_UTF_16__ __STDC_UTF_32__
+
+syntax keyword cppSTLconstant
+        \ badbit digits digits10 eofbit failbit goodbit has_denorm has_denorm_loss has_infinity has_quiet_NaN has_signaling_NaN is_bounded is_exact is_iec559 is_integer is_modulo is_signed is_specialized max_exponent max_exponent10 min_exponent min_exponent10 nothrow npos radix round_style tinyness_before traps
+
+syntax keyword cppSTLVariable
+        \ cerr cin clog cout wcerr wcin wclog wcout
+
+syntax keyword cppSTLexception
+        \ bad_alloc bad_exception bad_typeid bad_cast domain_error exception failure invalid_argument length_error logic_error out_of_range overflow_error range_error runtime_error underflow_error
+
+syntax keyword cppSTLfunctional
+        \ binary_function binary_negate bit_and bit_not bit_or divides equal_to greater greater_equal less less_equal logical_and logical_not logical_or minus modulus multiplies negate not_equal_to plus unary_function unary_negate
+
+syntax keyword cppSTLios
+        \ endl ends flush resetiosflags setbase setfill setiosflags setprecision setw ws
+
+syntax keyword cppSTLios
+        \ boolalpha dec defaultfloat fixed hex hexfloat internal left noboolalpha noshowbase noshowpoint noshowpos noskipws nounitbuf nouppercase oct right scientific showbase showpoint showpos skipws unitbuf uppercase
+
+syntax keyword cppSTLtype
+        \ fmtflags iostate openmode
+
+" Some of these can be highlighted as both cppSTLios and cppSTLconstant
+" syntax keyword cppSTLconstant
+"         \ adjustfield app ate basefield binary floatfield in out trunc boolalpha dec fixed hex internal left oct right scientific showbase showpoint showpos skipws unitbuf uppercase
+
+syntax keyword cppSTLiterator
+        \ back_insert_iterator bidirectional_iterator const_iterator const_reverse_iterator forward_iterator front_insert_iterator input_iterator insert_iterator istream_iterator istreambuf_iterator iterator ostream_iterator ostreambuf_iterator output_iterator random_access_iterator raw_storage_iterator reverse_bidirectional_iterator reverse_iterator
+
+syntax keyword cppSTLiterator_tag
+        \ bidirectional_iterator_tag forward_iterator_tag input_iterator_tag output_iterator_tag random_access_iterator_tag
+
+syntax keyword cppSTLnamespace
+        \ experimental rel_ops std
+
+syntax keyword cppSTLtype
+        \ Init allocator auto_ptr basic_filebuf basic_fstream basic_ifstream basic_ios basic_iostream basic_istream basic_istringstream basic_ofstream basic_ostream basic_ostringstream basic_streambuf basic_string basic_stringbuf basic_stringstream binary_compose binder1st binder2nd bitset char_traits char_type const_mem_fun1_t const_mem_fun_ref1_t const_mem_fun_ref_t const_mem_fun_t const_pointer const_reference container_type deque difference_type div_t double_t event_callback filebuf first_type float_denorm_style float_round_style float_t fpos fstream gslice_array ifstream imaxdiv_t indirect_array int_type ios ios_base iostream istream istringstream istrstream iterator_category iterator_traits key_compare key_type ldiv_t list lldiv_t map mapped_type mask_array mbstate_t mem_fun1_t mem_fun_ref1_t mem_fun_ref_t mem_fun_t multimap multiset nothrow_t numeric_limits off_type ofstream ostream ostringstream ostrstream pair pointer pointer_to_binary_function pointer_to_unary_function pos_type priority_queue queue reference second_type seekdir sequence_buffer set sig_atomic_t size_type slice_array stack state_type stream streambuf streamoff streampos streamsize string stringbuf stringstream strstream strstreambuf temporary_buffer test_type time_t tm traits_type type_info u16string u32string unary_compose unary_negate valarray value_compare value_type vector wctrans_t wctype_t wfilebuf wfstream wifstream wint_t wios wiostream wistream wistringstream wofstream wostream wostringstream wstreambuf wstreampos wstring wstringbuf wstringstream
+
+" locale
+syntax keyword cppSTLtype
+        \ codecvt codecvt_base codecvt_byname collate collate_byname ctype ctype_base ctype_byname locale messages messages_base messages_byname money_base money_get money_put moneypunct moneypunct_byname num_get num_put numpunct numpunct_byname time_base time_get time_get_byname time_put time_put_byname
+
+" template functions that are called with template parameters, like
+" std::use_facet<std::moneypunct<char, true>>(loc).curr_symbol()
+syntax keyword cppSTLfunction use_facet has_facet
+
+" std::get is a template function, so when called as std::get<N>(t), we want it
+" to be highlighted as a function
+syntax keyword cppSTLfunction get
+
+
+" C++11 extensions {{{1
+if !exists('cpp_no_cpp11')
+    syntax keyword cppType char16_t char32_t
+    syntax keyword cppSTLconstant nullptr
+
+    " std containers
+    syntax keyword cppSTLtype array
+
+    " atomic
+    syntax keyword cppSTLconstant ATOMIC_FLAG_INIT
+    syntax keyword cppSTLenum memory_order
+    syntax keyword cppSTLtype
+            \ atomic atomic_bool atomic_char atomic_char16_t atomic_char32_t atomic_flag atomic_int atomic_int_fast16_t atomic_int_fast32_t atomic_int_fast64_t atomic_int_fast8_t atomic_int_least16_t atomic_int_least32_t atomic_int_least64_t atomic_int_least8_t atomic_intmax_t atomic_intptr_t atomic_llong atomic_long atomic_ptrdiff_t atomic_schar atomic_short atomic_size_t atomic_uchar atomic_uint atomic_uint_fast16_t atomic_uint_fast32_t atomic_uint_fast64_t atomic_uint_fast8_t atomic_uint_least16_t atomic_uint_least32_t atomic_uint_least64_t atomic_uint_least8_t atomic_uintmax_t atomic_uintptr_t atomic_ullong atomic_ulong atomic_ushort atomic_wchar_t
+
+    " chrono
+    syntax keyword cppSTLnamespace chrono
+    syntax keyword cppSTLcast duration_cast time_point_cast
+    syntax keyword cppSTLtype
+            \ duration duration_values high_resolution_clock hours microseconds milliseconds minutes nanoseconds seconds steady_clock system_clock time_point treat_as_floating_point
+
+    " condition_variable
+    syntax keyword cppSTLtype condition_variable
+
+    " cstddef
+    syntax keyword cppSTLtype nullptr_t max_align_t
+
+    " exception
+    syntax keyword cppSTLtype exception_ptr nested_exception
+
+    " functional
+    syntax keyword cppSTLexception bad_function_call
+    syntax keyword cppSTLfunctional function
+    syntax keyword cppSTLfunction mem_fn
+    syntax keyword cppSTLconstant _1 _2 _3 _4 _5 _6 _7 _8 _9
+    syntax keyword cppSTLtype
+            \ hash is_bind_expression is_placeholder reference_wrapper
+
+    " iterator
+    syntax keyword cppSTLiterator move_iterator
+
+    " forward_list
+    syntax keyword cppSTLtype forward_list
+
+    " future
+    syntax keyword cppSTLtype future packaged_task promise shared_future
+    syntax keyword cppSTLenum future_status future_errc launch
+    syntax keyword cppSTLexception future_error
+
+    " initializer_list
+    syntax keyword cppSTLtype initializer_list
+
+    " ios
+    syntax keyword cppSTLenum io_errc
+    " syntax keyword cppSTLtype is_error_code_enum
+
+    " limits
+    syntax keyword cppSTLconstant max_digits10
+
+    " locale
+    syntax keyword cppSTLfunction isblank
+    syntax keyword cppSTLtype
+            \ codecvt_mode codecvt_utf16 codecvt_utf8 codecvt_utf8_utf16 wbuffer_convert wstring_convert
+
+    " memory
+    syntax keyword cppSTLconstant allocator_arg
+    syntax keyword cppSTLexception bad_weak_ptr
+    syntax keyword cppSTLfunction allocate_shared make_shared
+    syntax keyword cppSTLfunction
+            \ const_pointer_cast dynamic_pointer_cast static_pointer_cast
+
+    syntax keyword cppSTLtype
+            \ allocator_arg_t allocator_traits allocator_type default_delete enable_shared_from_this is_always_equal owner_less pointer_safety pointer_traits propagate_on_container_copy_assignment propagate_on_container_move_assignment propagate_on_container_swap rebind_alloc rebind_traits shared_ptr unique_ptr uses_allocator void_pointer const_void_pointer weak_ptr
+
+    " mutex
+    syntax keyword cppSTLenum cv_status
+    syntax keyword cppSTLconstant defer_lock try_to_lock adopt_lock
+    syntax keyword cppSTLtype
+            \ adopt_lock_t condition_variable_any defer_lock_t lock_guard mutex once_flag recursive_mutex recursive_timed_mutex timed_mutex try_to_lock_t unique_lock
+
+    " new
+    syntax keyword cppSTLexception bad_array_new_length
+
+    " numerics, cmath
+    syntax keyword cppSTLconstant
+            \ FLT_EVAL_METHOD FP_INFINITE FP_NAN FP_NORMAL FP_SUBNORMAL FP_ZERO HUGE_VALF HUGE_VALL INFINITY MATH_ERREXCEPT MATH_ERRNO NAN math_errhandling
+
+    " random
+    syntax keyword cppSTLfunction generate_canonical
+    syntax keyword cppSTLtype
+            \ bernoulli_distribution binomial_distribution cauchy_distribution chi_squared_distribution default_random_engine discard_block_engine discrete_distribution exponential_distribution extreme_value_distribution fisher_f_distribution gamma_distribution geometric_distribution independent_bits_engine knuth_b linear_congruential_engine lognormal_distribution mersenne_twister_engine minstd_rand minstd_rand0 mt19937 mt19937_64 negative_binomial_distribution normal_distribution piecewise_constant_distribution piecewise_linear_distribution poisson_distribution random_device ranlux24 ranlux24_base ranlux48 ranlux48_base seed_seq shuffle_order_engine student_t_distribution subtract_with_carry_engine uniform_int_distribution uniform_real_distribution weibull_distribution
+
+    " ratio
+    syntax keyword cppSTLtype
+            \ atto centi deca deci exa femto giga hecto kilo mega micro milli nano peta pico ratio ratio_add ratio_divide ratio_equal ratio_greater ratio_greater_equal ratio_less ratio_less_equal ratio_multiply ratio_not_equal ratio_subtract tera yocto yotta zepto zetta
+
+    " regex
+    syntax keyword cppSTLiterator regex_iterator regex_token_iterator
+    syntax keyword cppSTLexception regex_error
+    syntax keyword cppSTLtype
+            \ basic_regex match_results regex_traits sub_match syntax_option_type match_flag_type error_type
+
+    " scoped_allocator
+    syntax keyword cppSTLtype
+            \ scoped_allocator_adaptor outer_allocator_type inner_allocator_type
+
+    " system_error
+    syntax keyword cppSTLenum errc
+    syntax keyword cppSTLexception system_error
+    syntax keyword cppSTLtype
+            \ error_code error_condition error_category is_error_code_enum is_error_condition_enum
+
+    " thread
+    syntax keyword cppSTLnamespace this_thread
+    syntax keyword cppSTLtype thread
+
+    " tuple
+    syntax keyword cppSTLtype tuple tuple_size tuple_element
+    syntax keyword cppSTLfunction forward_as_tuple make_tuple tie tuple_cat
+    " Note: ignore is also a function
+    " syntax keyword cppSTLVariable ignore
+
+    " typeindex
+    syntax keyword cppSTLtype type_index
+
+    " type_traits
+    syntax keyword cppSTLtype
+            \ add_const add_cv add_lvalue_reference add_pointer add_rvalue_reference add_volatile aligned_storage aligned_union alignment_of common_type conditional decay enable_if extent false_type has_virtual_destructor integral_constant is_abstract is_arithmetic is_array is_assignable is_base_of is_class is_compound is_const is_constructible is_convertible is_copy_assignable is_copy_constructible is_default_constructible is_destructible is_empty is_enum is_floating_point is_function is_fundamental is_integral is_literal_type is_lvalue_reference is_member_function_pointer is_member_object_pointer is_member_pointer is_move_assignable is_move_constructible is_nothrow_assignable is_nothrow_constructible is_nothrow_copy_assignable is_nothrow_copy_constructible is_nothrow_default_constructible is_nothrow_destructible is_nothrow_move_assignable is_nothrow_move_constructible is_object is_pod is_pointer is_polymorphic is_reference is_rvalue_reference is_same is_scalar is_signed is_standard_layout is_trivial is_trivially_assignable is_trivially_constructible is_trivially_copy_assignable is_trivially_copy_constructible is_trivially_copyable is_trivially_default_constructible is_trivially_destructible is_trivially_move_assignable is_trivially_move_constructible is_union is_unsigned is_void is_volatile make_signed make_unsigned rank remove_all_extents remove_const remove_cv remove_extent remove_pointer remove_reference remove_volatile result_of true_type underlying_type
+
+    " unordered_map, unordered_set, unordered_multimap, unordered_multiset
+    syntax keyword cppSTLiterator const_local_iterator local_iterator
+    syntax keyword cppSTLtype
+            \ hasher key_equal unordered_map unordered_multimap unordered_multiset unordered_set
+
+    " utility
+    syntax keyword cppSTLtype piecewise_construct_t
+    syntax keyword cppSTLconstant piecewise_construct
+    syntax keyword cppSTLfunction declval forward move move_if_noexcept
+endif
+
+
+" C++14 extensions {{{1
+if !exists('cpp_no_cpp14')
+    " chrono
+    syntax keyword cppSTLnamespace literals chrono_literals
+
+    " memory
+    syntax keyword cppSTLfunction make_unique
+
+    " utility
+    syntax keyword cppSTLtype
+            \ index_sequence index_sequence_for integer_sequence make_index_sequence make_integer_sequence
+
+    " shared_mutex
+    syntax keyword cppSTLtype shared_lock shared_timed_mutex
+
+    " string
+    syntax keyword cppSTLnamespace string_literals
+
+    " tuple
+    syntax keyword cppSTLtype tuple_element_t
+
+    " type_traits
+    syntax keyword cppSTLtype
+            \ add_const_t add_cv_t add_lvalue_reference_t add_pointer_t add_rvalue_reference_t add_volatile_t aligned_storage_t aligned_union_t common_type_t conditional_t decay_t enable_if_t is_null_pointer make_signed_t make_unsigned_t remove_all_extents_t remove_const_t remove_cv_t remove_extent_t remove_pointer_t remove_reference_t remove_volatile_t result_of_t underlying_type_t
+endif
+
+
+" C++17 extensions {{{1
+if !exists('cpp_no_cpp17')
+    " any
+    syntax keyword cppSTLtype any
+    syntax keyword cppSTLexception bad_any_cast
+    syntax keyword cppSTLcast any_cast
+
+    " atomic
+    syntax keyword cppSTLconstant is_always_lock_free
+
+    " chrono
+    syntax keyword cppSTLbool treat_as_floating_point_v
+
+    " execution
+    syntax keyword cppSTLnamespace execution
+    syntax keyword cppSTLconstant seq par par_unseq
+    syntax keyword cppSTLbool is_execution_policy_v
+    syntax keyword cppSTLtype
+            \ is_execution_policy parallel_policy parallel_unsequenced_policy sequenced_policy
+
+    " filesystem
+    syntax keyword cppSTLnamespace filesystem
+    syntax keyword cppSTLexception filesystem_error
+
+    syntax keyword cppSTLtype
+            \ directory_entry directory_iterator file_status file_time_type path recursive_directory_iterator space_info
+
+    syntax keyword cppSTLenum
+            \ copy_options directory_options file_type perm_options perms
+
+    " Note: There is std::filesystem::path::format and std::format() in <format>
+    syntax match cppSTLenum "\<format\>(\@!"
+
+    syntax keyword cppSTLconstant
+            \ copy_symlinks auto_format create_hard_links create_symlinks directories_only follow_directory_symlink generic_format group_all group_exec group_read group_write native_format others_all others_exec others_read others_write overwrite_existing owner_all owner_exec owner_read owner_write preferred_separator recursive set_gid set_uid skip_existing skip_permission_denied skip_symlinks sticky_bit update_existing
+
+    " Note: these keywords are very likely to coincide with user-defined variables
+    " syntax keyword cppSTLconstant
+    "         \ all mask unknown replace add remove nofollow none not_found regular directory symlink block character fifo socket unknown
+
+    " Note: these are also functions
+    " syntax keyword cppSTLconstant capacity free available
+
+    " functional
+    syntax keyword cppSTLbool is_bind_expression_v is_placeholder_v
+    syntax keyword cppSTLtype
+            \ default_order default_order_t default_searcher boyer_moore_searcher boyer_moore_horspool_searcher
+
+    " memory
+    syntax keyword cppSTLfunction reinterpret_pointer_cast
+    syntax keyword cppSTLconstant uses_allocator_v
+
+    " memory_resource
+    syntax keyword cppSTLtype
+            \ memory_resource monotonic_buffer_resource polymorphic_allocator pool_options synchronized_pool_resource unsynchronized_pool_resource
+
+    " mutex
+    syntax keyword cppSTLtype scoped_lock
+
+    " new
+    syntax keyword cppSTLconstant
+            \ hardware_destructive_interference_size hardware_constructive_interference_size
+
+    " optional
+    syntax keyword cppSTLtype optional nullopt_t
+    syntax keyword cppSTLexception bad_optional_access
+    syntax keyword cppSTLconstant nullopt
+    syntax keyword cppSTLfunction make_optional
+
+    " shared_mutex
+    syntax keyword cppSTLtype shared_mutex
+
+    " string_view
+    syntax keyword cppSTLtype
+            \ basic_string_view string_view u16string_view u32string_view wstring_view
+
+    " system_error
+    syntax keyword cppSTLbool is_error_code_enum_v is_error_condition_enum_v
+
+    " tuple
+    syntax keyword cppSTLconstant tuple_size_v
+    syntax keyword cppSTLfunction make_from_tuple
+
+    " type_traits
+    syntax keyword cppSTLconstant alignment_of_v rank_v extent_v
+    syntax keyword cppSTLbool
+            \ conjunction_v disjunction_v has_unique_object_representations_v has_virtual_destructor_v is_abstract_v is_aggregate_v is_arithmetic_v is_array_v is_assignable_v is_base_of_v is_callable_v is_class_v is_compound_v is_const_v is_constructible_v is_convertible_v is_copy_assignable_v is_copy_constructible_v is_default_constructible_v is_destructible_v is_empty_v is_enum_v is_floating_point_v is_function_v is_fundamental_v is_integral_v is_invocable_r_v is_invocable_v is_literal_type_v is_lvalue_reference_v is_member_function_pointer_v is_member_object_pointer_v is_member_pointer_v is_move_assignable_v is_move_constructible_v is_nothrow_assignable_v is_nothrow_constructible_v is_nothrow_copy_assignable_v is_nothrow_copy_constructible_v is_nothrow_default_constructible_v is_nothrow_destructible_v is_nothrow_invocable_r_v is_nothrow_invocable_v is_nothrow_move_assignable_v is_nothrow_move_constructible_v is_nothrow_swappable_v is_nothrow_swappable_with_v is_nowthrow_callable_v is_null_pointer_v is_object_v is_pod_v is_pointer_v is_polymorphic_v is_reference_v is_rvalue_reference_v is_same_v is_scalar_v is_signed_v is_standard_layout_v is_swappable_v is_swappable_with_v is_trivial_v is_trivially_assignable_v is_trivially_constructible_v is_trivially_copy_assignable_v is_trivially_copy_constructible_v is_trivially_copyable_v is_trivially_default_constructible_v is_trivially_destructible_v is_trivially_move_assignable_v is_trivially_move_constructible_v is_union_v is_unsigned_v is_void_v is_volatile_v negation_v
+
+    syntax keyword cppSTLtype
+            \ bool_constant conjunction disjunction has_unique_object_representations invoke_result invoke_result_t is_aggregate is_callable is_invocable is_invocable_r is_nothrow_invocable is_nothrow_invocable_r is_nothrow_swappable is_nothrow_swappable_with is_nowthrow_callable is_swappable is_swappable_with negation void_t
+
+    " unordered_map, unordered_set, unordered_multimap, unordered_multiset
+    syntax keyword cppSTLtype node_type insert_return_type
+
+    " utility
+    syntax keyword cppSTLtype
+            \ in_place_tag in_place_t in_place_type_t in_place_index_t
+
+    " variant
+    syntax keyword cppSTLconstant variant_npos variant_size_v
+    syntax keyword cppSTLexception bad_variant_access
+    syntax keyword cppSTLtype
+            \ monostate variant variant_size variant_alternative variant_alternative_t
+endif
+
+
+" C++20 extensions {{{1
+if !exists('cpp_no_cpp20')
+    syntax keyword cppType char8_t
+    syntax keyword cppOperator co_await
+    syntax keyword cppStatement consteval constinit concept requires co_yield co_return
+
+    " atomic
+    syntax keyword cppSTLtype atomic_ref
+
+    " bit
+    syntax keyword cppSTLtype endian
+
+    " compare
+    syntax keyword cppSTLtype
+            \ weak_ordering strong_ordering partial_ordering weak_equality strong_equality common_comparison_category common_comparison_category_t
+
+    " concepts
+    syntax keyword cppSTLconcept
+            \ assignable_from boolean common_reference_with common_with constructible_from convertible_to copy_constructible copyable default_constructible derived_from destructible equality_comparable equality_comparable_with equivalence_relation floating_point integral invocable movable move_constructible predicate regular regular_invocable relation same_as semiregular signed_integral strict_weak_order swappable swappable_with totally_ordered totally_ordered_with unsigned_integral default_initializable
+
+    " concepts - named requirements
+    " These are concepts that haven't made it into the C++ Standard yet
+    " https://en.cppreference.com/w/cpp/named_req
+    " http://en.cppreference.com/w/cpp/language/constraints
+    if get(g:, 'cpp_named_requirements_highlight', 0)
+        syntax keyword cppSTLNamedReq
+                \ Allocator AllocatorAwareContainer AssociativeContainer BasicLockable BidirectionalIterator BinaryPredicate BinaryTypeTrait BitmaskType Callable CharTraits Clock Compare ConstExprIterator Container ContiguousContainer ContiguousIterator CopyAssignable CopyInsertable CopyInsertable DefaultInsertable EmplaceConstructible Erasable FormattedInputFunction FormattedOutputFunction ForwardIterator FunctionObject Hash InputIterator Iterator LessThanComparable LiteralType Lockable MoveAssignable MoveInsertable Mutex NullablePointer NumericType OutputIterator PODType RandomAccessIterator RandomNumberDistribution RandomNumberEngine RandomNumberEngineAdaptor RegexTraits ReversibleContainer SeedSequence SequenceContainer SharedMutex SharedTimedMutex StandardLayoutType TimedLockable TimedMutex TransformationTrait TrivialClock TrivialType TriviallyCopyable UnaryTypeTrait UnformattedInputFunction UnformattedOutputFunction UniformRandomBitGenerator UnorderedAssociativeContainer ValueSwappable
+        hi def link cppSTLNamedReq Typedef
+    endif
+
+    " contract
+    syntax keyword cppSTLtype contract_violation
+
+    " coroutines
+    syntax keyword cppSTLtype
+            \ coroutine_traits coroutine_handle noop_coroutine_handle noop_coroutine_promise suspend_never suspend_always
+
+    " memory
+    syntax keyword cppSTLfunction
+            \ make_unique_default_init make_shared_default_init allocate_shared_default_init uses_allocator_construction_args make_obj_using_allocator
+
+    " type_traits
+    syntax keyword cppSTLtype
+            \ remove_cvref remove_cvref_t is_bounded_array is_layout_compatible is_unbounded_array is_nothrow_convertible has_strong_structural_equality is_pointer_interconvertible_base_of unwrap_reference unwrap_reference_t unwrap_ref_decay unwrap_ref_decay_t basic_common_reference common_reference common_reference_t
+
+    syntax keyword cppSTLbool
+            \ is_bounded_array_v is_layout_compatible_v is_unbounded_array_v is_nothrow_convertible_v has_strong_structural_equality_v is_pointer_interconvertible_base_of_v
+
+    syntax keyword cppSTLfunction is_corresponding_member
+
+    " ranges
+    syntax keyword cppSTLnamespace ranges views
+
+    syntax keyword cppSTLconcept
+            \ range sized_range view input_range output_range forward_range bidirectional_range random_access_range contiguous_range common_range viewable_range
+
+    syntax keyword cppSTLtype
+            \ iterator_t sentinel_t dangling safe_iterator_t safe_subrange_t ref_view filter_view transform_view iota_view join_view empty_view single_view split_view common_view reverse_view view_interface
+
+    " span
+    syntax keyword cppSTLtype span
+    syntax keyword cppSTLconstant dynamic_extent
+    syntax keyword cppSTLfunction subspan
+
+    " syncstream
+    syntax keyword cppSTLtype
+            \ basic_syncbuf basic_osyncstream syncbuf wsyncbuf osyncstream wosyncstream
+endif
+
+" Boost {{{1
+if !exists('cpp_no_boost')
+    syntax keyword cppSTLnamespace boost
+    syntax keyword cppSTLcast lexical_cast
+endif
+" }}}
+
+
+" Default highlighting
+hi def link cppSTLbool         Boolean
+hi def link cppStatement       Statement
+hi def link cppSTLfunction     Function
+hi def link cppSTLfunctional   Typedef
+hi def link cppSTLconstant     Constant
+hi def link cppSTLnamespace    Constant
+hi def link cppSTLtype         Typedef
+hi def link cppSTLexception    Exception
+hi def link cppSTLiterator     Typedef
+hi def link cppSTLiterator_tag Typedef
+hi def link cppSTLenum         Typedef
+hi def link cppSTLios          Function
+hi def link cppSTLcast         Statement
+hi def link cppSTLconcept      Typedef
+hi def link cppSTLVariable     Identifier
+
+" The keywords {inline, virtual, explicit, export, override, final} are
+" standard C++ keywords and NOT types!
+hi link cppModifier Statement
+
+
+" Highlight all standard C++ keywords as Statement
+if get(g:, 'cpp_simple_highlight', 0)
+    hi link cppStructure    Statement
+    hi link cppExceptions   Statement
+    hi link cppStorageClass Statement
+    hi link cppSTLexception Typedef
+endif
+
+endif
diff --git a/packages.yaml b/packages.yaml
index bbdb3214f..6cec2b086 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -345,6 +345,11 @@ filetypes:
   filenames:
   - Caddyfile
 ---
+name: cpp-modern
+remote: bfrg/vim-cpp-modern
+after: c/c++
+filetypes: []
+---
 name: carp
 remote: hellerve/carp-vim
 filetypes:

From 7e2d060f880a2d1d8e4742e27709869425983335 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 23 Sep 2020 23:25:01 +0200
Subject: [PATCH 061/299] Fix detecting jinja templates, #553

---
 autoload/polyglot.vim      |   6 +
 heuristics.yaml            |   3 +
 scripts/test_filetypes.vim | 244 -------------------------------------
 tests/extensions.vim       |   3 +
 4 files changed, 12 insertions(+), 244 deletions(-)
 delete mode 100644 scripts/test_filetypes.vim

diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index b7113f31f..325287fc8 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -370,6 +370,12 @@ func! polyglot#DetectHtmlFiletype()
   if line =~# '^\(%\|<[%&].*>\)'
     set ft=mason | return
   endif
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '{{.*}}\|{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\(\<\|\>\)'
+      set ft=jinja.html | return
+    endif
+  endfor
   set ft=html | return
 endfunc
 
diff --git a/heuristics.yaml b/heuristics.yaml
index 35350a69b..7cc6a2732 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -180,5 +180,8 @@ rules:
 - lines: 1
   pattern: '^(%|<[%&].*>)'
   filetype: mason
+- lines: 50
+  pattern: '{{.*}}|{%-?\s*(end.*|extends|block|macro|set|if|for|include|trans)\b'
+  filetype: jinja.html
 - filetype: html
 
diff --git a/scripts/test_filetypes.vim b/scripts/test_filetypes.vim
deleted file mode 100644
index 4ce20e723..000000000
--- a/scripts/test_filetypes.vim
+++ /dev/null
@@ -1,244 +0,0 @@
-function! TestFiletype(filetype)
-  call Log('Loading ' . a:filetype . ' filetype...')
-
-  try
-    enew
-    exec 'set ft=' . a:filetype
-  catch
-    echo 'Error loading filetype ' . a:filetype  . ':'
-    echo v:exception
-    echo v:throwpoint
-    exec ':cq!'
-  endtry
-endfunction
-
-call TestFiletype('8th')
-call TestFiletype('haproxy')
-call TestFiletype('a2ps')
-call TestFiletype('a65')
-call TestFiletype('aap')
-call TestFiletype('abap')
-call TestFiletype('abaqus')
-call TestFiletype('abc')
-call TestFiletype('abel')
-call TestFiletype('acedb')
-call TestFiletype('asl')
-call TestFiletype('ada')
-call TestFiletype('ahdl')
-call TestFiletype('aidl')
-call TestFiletype('alsaconf')
-call TestFiletype('aml')
-call TestFiletype('ampl')
-call TestFiletype('xml')
-call TestFiletype('ant')
-call TestFiletype('apache')
-call TestFiletype('apiblueprint')
-call TestFiletype('applescript')
-call TestFiletype('aptconf')
-call TestFiletype('arch')
-call TestFiletype('cpp')
-call TestFiletype('c')
-call TestFiletype('arduino')
-call TestFiletype('art')
-call TestFiletype('asciidoc')
-call TestFiletype('autohotkey')
-call TestFiletype('elf')
-call TestFiletype('automake')
-call TestFiletype('asn')
-call TestFiletype('aspvbs')
-call TestFiletype('aspperl')
-call TestFiletype('atlas')
-call TestFiletype('autoit')
-call TestFiletype('ave')
-call TestFiletype('awk')
-call TestFiletype('caddyfile')
-call TestFiletype('carp')
-call TestFiletype('clojure')
-call TestFiletype('cmake')
-call TestFiletype('coffee')
-call TestFiletype('litcoffee')
-call TestFiletype('cryptol')
-call TestFiletype('crystal')
-call TestFiletype('ecrystal')
-call TestFiletype('csv')
-call TestFiletype('cucumber')
-call TestFiletype('cuesheet')
-call TestFiletype('dart')
-call TestFiletype('dhall')
-call TestFiletype('d')
-call TestFiletype('dcov')
-call TestFiletype('dd')
-call TestFiletype('ddoc')
-call TestFiletype('dsdl')
-call TestFiletype('Dockerfile')
-call TestFiletype('yaml.docker-compose')
-call TestFiletype('elixir')
-call TestFiletype('eelixir')
-call TestFiletype('elm')
-call TestFiletype('ember-script')
-call TestFiletype('emblem')
-call TestFiletype('erlang')
-call TestFiletype('fennel')
-call TestFiletype('ferm')
-call TestFiletype('fish')
-call TestFiletype('fbs')
-call TestFiletype('forth')
-call TestFiletype('glsl')
-call TestFiletype('fsharp')
-call TestFiletype('gdscript3')
-call TestFiletype('gitconfig')
-call TestFiletype('gitrebase')
-call TestFiletype('gitsendemail')
-call TestFiletype('gitcommit')
-call TestFiletype('gmpl')
-call TestFiletype('gnuplot')
-call TestFiletype('go')
-call TestFiletype('gomod')
-call TestFiletype('gohtmltmpl')
-call TestFiletype('javascript')
-call TestFiletype('flow')
-call TestFiletype('javascriptreact')
-call TestFiletype('graphql')
-call TestFiletype('groovy')
-call TestFiletype('grub')
-call TestFiletype('haml')
-call TestFiletype('mustache')
-call TestFiletype('haskell')
-call TestFiletype('haxe')
-call TestFiletype('hcl')
-call TestFiletype('hive')
-call TestFiletype('html')
-call TestFiletype('i3config')
-call TestFiletype('icalendar')
-call TestFiletype('idris')
-call TestFiletype('idris2')
-call TestFiletype('lidris2')
-call TestFiletype('ion')
-call TestFiletype('Jenkinsfile')
-call TestFiletype('jinja.html')
-call TestFiletype('jq')
-call TestFiletype('json5')
-call TestFiletype('json')
-call TestFiletype('jsonnet')
-call TestFiletype('jst')
-call TestFiletype('julia')
-call TestFiletype('kotlin')
-call TestFiletype('ledger')
-call TestFiletype('less')
-call TestFiletype('lilypond')
-call TestFiletype('livescript')
-call TestFiletype('llvm')
-call TestFiletype('tablegen')
-call TestFiletype('log')
-call TestFiletype('lua')
-call TestFiletype('m4')
-call TestFiletype('mako')
-call TestFiletype('mma')
-call TestFiletype('markdown')
-call TestFiletype('markdown.mdx')
-call TestFiletype('meson')
-call TestFiletype('dosini')
-call TestFiletype('moon')
-call TestFiletype('murphi')
-call TestFiletype('nginx')
-call TestFiletype('nim')
-call TestFiletype('nix')
-call TestFiletype('objc')
-call TestFiletype('ocaml')
-call TestFiletype('omake')
-call TestFiletype('opam')
-call TestFiletype('oasis')
-call TestFiletype('dune')
-call TestFiletype('ocamlbuild_tags')
-call TestFiletype('ocpbuild')
-call TestFiletype('ocpbuildroot')
-call TestFiletype('sexplib')
-call TestFiletype('octave')
-call TestFiletype('opencl')
-call TestFiletype('perl')
-call TestFiletype('pod')
-call TestFiletype('mason')
-call TestFiletype('tt2')
-call TestFiletype('tt2html')
-call TestFiletype('xs')
-call TestFiletype('sql')
-call TestFiletype('cql')
-call TestFiletype('php')
-call TestFiletype('blade')
-call TestFiletype('plantuml')
-call TestFiletype('pony')
-call TestFiletype('ps1')
-call TestFiletype('ps1xml')
-call TestFiletype('proto')
-call TestFiletype('pug')
-call TestFiletype('puppet')
-call TestFiletype('embeddedpuppet')
-call TestFiletype('purescript')
-call TestFiletype('python')
-call TestFiletype('requirements')
-call TestFiletype('qmake')
-call TestFiletype('qml')
-call TestFiletype('r')
-call TestFiletype('rhelp')
-call TestFiletype('racket')
-call TestFiletype('ragel')
-call TestFiletype('raku')
-call TestFiletype('raml')
-call TestFiletype('razor')
-call TestFiletype('reason')
-call TestFiletype('rst')
-call TestFiletype('ruby')
-call TestFiletype('eruby')
-call TestFiletype('ruby')
-call TestFiletype('brewfile')
-call TestFiletype('rust')
-call TestFiletype('scala')
-call TestFiletype('sbt.scala')
-call TestFiletype('scss')
-call TestFiletype('sh')
-call TestFiletype('zsh')
-call TestFiletype('slim')
-call TestFiletype('slime')
-call TestFiletype('smt2')
-call TestFiletype('solidity')
-call TestFiletype('stylus')
-call TestFiletype('svelte')
-call TestFiletype('svg')
-call TestFiletype('swift')
-call TestFiletype('sxhkdrc')
-call TestFiletype('systemd')
-call TestFiletype('terraform')
-call TestFiletype('textile')
-call TestFiletype('thrift')
-call TestFiletype('tmux')
-call TestFiletype('toml')
-call TestFiletype('tptp')
-call TestFiletype('html.twig')
-call TestFiletype('xml.twig')
-call TestFiletype('typescript')
-call TestFiletype('typescriptreact')
-call TestFiletype('unison')
-call TestFiletype('v')
-call TestFiletype('vala')
-call TestFiletype('vbnet')
-call TestFiletype('vcl')
-call TestFiletype('velocity')
-call TestFiletype('vmasm')
-call TestFiletype('vue')
-call TestFiletype('xdc')
-call TestFiletype('xsl')
-call TestFiletype('yaml')
-call TestFiletype('yaml.ansible')
-call TestFiletype('helm')
-call TestFiletype('help')
-call TestFiletype('zephir')
-call TestFiletype('zir')
-call TestFiletype('zig')
-call TestFiletype('trasys')
-call TestFiletype('basic')
-call TestFiletype('vb')
-call TestFiletype('dosini')
-call TestFiletype('odin')
-call TestFiletype('bzl')
-call TestFiletype('prolog')
-call TestFiletype('tads')
diff --git a/tests/extensions.vim b/tests/extensions.vim
index 98a93796e..d792ac3c4 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -356,3 +356,6 @@ call TestExtension("tt2html", "html.tt2", "<html>")
 call TestExtension("html", "empty.html", "")
 call TestExtension("mason", "mason1.html", "% my $planet = 42;")
 call TestExtension("mason", "mason2.html", "<%filter></%filter>")
+call TestExtension("jinja.html", "jinja.html", "{{ item.href }}")
+call TestExtension("jinja.html", "jinja.html", "{% for item in navigation %}{% endfor %}")
+call TestExtension("jinja.html", "jinja.html", "{% block head %}")

From 50aa05bd7223bf8887c1b66d092c5177c061c812 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 23 Sep 2020 23:49:57 +0200
Subject: [PATCH 062/299] Allow to disable only syntax highlighting, #556

---
 README.md             |  8 +++++++-
 ftdetect/polyglot.vim | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 652c1361f..75412436d 100644
--- a/README.md
+++ b/README.md
@@ -263,7 +263,13 @@ The list of available languages to disable is shown above.
 
 *Please declare this variable before polyglot is loaded (at the top of .vimrc)*
 
-Please note that disabling a language won't make in your vim startup any faster / slower (only for specific this specific filetype). All plugins are loaded lazily, on demand.
+If you wish to use filetype detection by Vim Polyglot but you'd like to use your own syntax-highlighting plugin, you can append `.plugin` to disabled entry, like so:
+
+```vim
+let g:polyglot_disabled = ['markdown.plugin']
+```
+
+Please note that disabling a language won't make in your vim startup any faster / slower (only for specific this specific filetype). All plugins are lazily loaded only when they are really needed.
 
 Vim Polyglot tries to automatically detect indentation settings (just like vim-sleuth). If this feature is not working for you for some reason, please file an issue and disable it temporarily with:
 
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index ba187f91f..f9b6a670a 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -8,10 +8,15 @@ if exists('g:polyglot_test')
 endif
 
 let s:disabled_packages = {}
+let s:new_polyglot_disabled = []
 
 if exists('g:polyglot_disabled')
   for pkg in g:polyglot_disabled
-    let s:disabled_packages[pkg] = 1
+    let base = split(pkg, '\.')
+    if len(base) > 0
+      let s:disabled_packages[pkg] = 1
+      call add(s:new_polyglot_disabled, base[0]) 
+    endif
   endfor
 else
   let g:polyglot_disabled_not_set = 1
@@ -2227,6 +2232,12 @@ endfunc
 au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat
       \ | call s:observe_filetype() | endif
 
+
+" Save polyglot_disabled without postfixes
+if exists('g:polyglot_disabled')
+  let g:polyglot_disabled = s:new_polyglot_disabled
+endif
+
 " restore Vi compatibility settings
 let &cpo = s:cpo_save
 unlet s:cpo_save

From c284af58fa13ad9fdd831f57d31dc4688977ae94 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 23 Sep 2020 23:55:28 +0200
Subject: [PATCH 063/299] Update readme

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 75412436d..6691627f7 100644
--- a/README.md
+++ b/README.md
@@ -263,13 +263,13 @@ The list of available languages to disable is shown above.
 
 *Please declare this variable before polyglot is loaded (at the top of .vimrc)*
 
-If you wish to use filetype detection by Vim Polyglot but you'd like to use your own syntax-highlighting plugin, you can append `.plugin` to disabled entry, like so:
+If you wish to use filetype detection by Vim Polyglot but you'd like to use your own syntax-highlighting plugin, you can append `.plugin` to disabled entry, like below. Disabling Vim Polyglot filetype plugin won't disable native Vim filetype plugin.
 
 ```vim
 let g:polyglot_disabled = ['markdown.plugin']
 ```
 
-Please note that disabling a language won't make in your vim startup any faster / slower (only for specific this specific filetype). All plugins are lazily loaded only when they are really needed.
+Please note that disabling a language won't make in your vim startup any faster / slower (only for specific this specific filetype). All plugins are lazily loaded only when they are really needed. 
 
 Vim Polyglot tries to automatically detect indentation settings (just like vim-sleuth). If this feature is not working for you for some reason, please file an issue and disable it temporarily with:
 

From 6b4da2753814cc61cd842c589d829f03cd7ca98d Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 24 Sep 2020 09:24:13 +0200
Subject: [PATCH 064/299] Improve html heuristics

---
 autoload/polyglot.vim | 5 ++++-
 heuristics.yaml       | 9 ++++++---
 scripts/build         | 8 ++++++--
 tests/extensions.vim  | 8 +++++---
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index 325287fc8..d8ee601fe 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -372,9 +372,12 @@ func! polyglot#DetectHtmlFiletype()
   endif
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
-    if line =~# '{{.*}}\|{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\(\<\|\>\)'
+    if line =~# '{{.*}}\|{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\(\<\|\>\)\|{#\s\+'
       set ft=jinja.html | return
     endif
+    if line =~# '\(\<\|\>\)DTD\s\+XHTML\s'
+      set ft=xhtml | return
+    endif
   endfor
   set ft=html | return
 endfunc
diff --git a/heuristics.yaml b/heuristics.yaml
index 7cc6a2732..60df69b52 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -181,7 +181,10 @@ rules:
   pattern: '^(%|<[%&].*>)'
   filetype: mason
 - lines: 50
-  pattern: '{{.*}}|{%-?\s*(end.*|extends|block|macro|set|if|for|include|trans)\b'
-  filetype: jinja.html
+  rules:
+  - pattern: '{{.*}}|{%-?\s*(end.*|extends|block|macro|set|if|for|include|trans)\b|{#\s+'
+    filetype: jinja.html
+  - pattern: '\bDTD\s+XHTML\s'
+    filetype: xhtml
 - filetype: html
-
+  fallback: true
diff --git a/scripts/build b/scripts/build
index 8b507fef5..47a7e51ab 100755
--- a/scripts/build
+++ b/scripts/build
@@ -317,7 +317,7 @@ def rule_to_code(rule)
     EOS
   end
 
-  if (rule.keys - ["filetype", "override", "set", "extensions"]).size > 0
+  if (rule.keys - ["filetype", "override", "set", "extensions", "fallback"]).size > 0
     raise "Unknown rule: #{JSON.generate(rule)}"
   end
   
@@ -335,7 +335,11 @@ def rule_to_code(rule)
   end
 
   if rule.has_key?("filetype")
-    return "set ft=#{rule["filetype"]} | return"
+    if rule.has_key?("fallback")
+      return "set ft=#{rule["filetype"]} | return"
+    else
+      return "setf FALLBACK #{rule["filetype"]} | return"
+    end
   end
 
   if rule.has_key?("extensions")
diff --git a/tests/extensions.vim b/tests/extensions.vim
index d792ac3c4..d6f634075 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -356,6 +356,8 @@ call TestExtension("tt2html", "html.tt2", "<html>")
 call TestExtension("html", "empty.html", "")
 call TestExtension("mason", "mason1.html", "% my $planet = 42;")
 call TestExtension("mason", "mason2.html", "<%filter></%filter>")
-call TestExtension("jinja.html", "jinja.html", "{{ item.href }}")
-call TestExtension("jinja.html", "jinja.html", "{% for item in navigation %}{% endfor %}")
-call TestExtension("jinja.html", "jinja.html", "{% block head %}")
+call TestExtension("jinja.html", "jinja1.html", "{{ item.href }}")
+call TestExtension("jinja.html", "jinja2.html", "{% for item in navigation %}{% endfor %}")
+call TestExtension("jinja.html", "jinja3.html", "{% block head %}")
+call TestExtension("jinja.html", "jinja4.html", "{# some comment #}")
+call TestExtension("xhtml", "xhtml.html", "<DTD   XHTML ")

From e2bbed8acc1f1cf498a0085cf771cf9bf40fb709 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 24 Sep 2020 10:50:19 +0200
Subject: [PATCH 065/299] Fix django highlighting, fixes #553

---
 README.md               |  10 +-
 after/syntax/ruby.vim   |  13 +--
 autoload/polyglot.vim   |   2 +-
 autoload/sleuth.vim     |   9 +-
 ftdetect/polyglot.vim   |  35 ++++---
 ftplugin/aspvbs.vim     |  64 +++++++++++++
 ftplugin/handlebars.vim | 127 +++++++++++++++++++++++++
 ftplugin/htmldjango.vim |  17 ++++
 ftplugin/mustache.vim   | 124 +------------------------
 heuristics.yaml         |   2 +-
 indent/handlebars.vim   | 129 ++++++++++++++++++++++++++
 indent/htmldjango.vim   |  16 ++++
 indent/jinja.vim        |  84 -----------------
 indent/mustache.vim     | 126 +------------------------
 packages.yaml           |  46 +++++-----
 scripts/build           |  14 +--
 syntax/aspperl.vim      |  29 ++++++
 syntax/aspvbs.vim       | 186 +++++++++++++++++++++++++++++++++++++
 syntax/django.vim       |  87 ++++++++++++++++++
 syntax/handlebars.vim   | 110 ++++++++++++++++++++++
 syntax/html-1.vim       | 196 ---------------------------------------
 syntax/html-2.vim       |  94 -------------------
 syntax/html.vim         | 199 +++++++++++++++++++++++++++++++++++++++-
 syntax/htmldjango.vim   |  30 ++++++
 syntax/jinja.vim        |  90 ------------------
 syntax/mustache.vim     | 107 +--------------------
 tests/extensions.vim    |  15 ++-
 tests/filetypes.vim     |   5 +-
 28 files changed, 1080 insertions(+), 886 deletions(-)
 create mode 100644 ftplugin/aspvbs.vim
 create mode 100644 ftplugin/handlebars.vim
 create mode 100644 ftplugin/htmldjango.vim
 create mode 100644 indent/handlebars.vim
 create mode 100644 indent/htmldjango.vim
 delete mode 100644 indent/jinja.vim
 create mode 100644 syntax/aspperl.vim
 create mode 100644 syntax/aspvbs.vim
 create mode 100644 syntax/django.vim
 create mode 100644 syntax/handlebars.vim
 delete mode 100644 syntax/html-1.vim
 delete mode 100644 syntax/html-2.vim
 create mode 100644 syntax/htmldjango.vim
 delete mode 100644 syntax/jinja.vim

diff --git a/README.md b/README.md
index 6691627f7..1cf07bec8 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [ansible](https://github.com/pearofducks/ansible-vim)
 - [ant](https://github.com/vim/vim/tree/master/runtime)
 - [apache](https://github.com/vim/vim/tree/master/runtime)
-- [apiblueprint](https://github.com/sheerun/apiblueprint.vim)
+- [apiblueprint](https://github.com/kylef/apiblueprint.vim)
 - [applescript](https://github.com/mityu/vim-applescript)
 - [aptconf](https://github.com/vim/vim/tree/master/runtime)
 - [arch](https://github.com/vim/vim/tree/master/runtime)
@@ -123,8 +123,8 @@ If you need full functionality of any plugin, please use it directly with your p
 - [graphql](https://github.com/jparise/vim-graphql)
 - [groovy](https://github.com/vim/vim/tree/master/runtime)
 - [grub](https://github.com/vim/vim/tree/master/runtime)
-- [haml](https://github.com/sheerun/vim-haml)
-- [handlebars](https://github.com/sheerun/vim-mustache-handlebars)
+- [haml](https://github.com/tpope/vim-haml)
+- [handlebars](https://github.com/mustache/vim-mustache-handlebars)
 - [haproxy](https://github.com/CH-DanReif/haproxy.vim)
 - [haskell](https://github.com/neovimhaskell/haskell-vim)
 - [haxe](https://github.com/yaymukund/vim-haxe)
@@ -133,6 +133,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [help](https://github.com/neovim/neovim/tree/master/runtime)
 - [hive](https://github.com/zebradil/hive.vim)
 - [html5](https://github.com/othree/html5.vim)
+- [htmldjango](https://github.com/vim/vim/tree/master/runtime)
 - [i3](https://github.com/mboughaba/i3config.vim)
 - [icalendar](https://github.com/chutzpah/icalendar.vim)
 - [idris2](https://github.com/edwinb/idris2-vim)
@@ -141,7 +142,6 @@ If you need full functionality of any plugin, please use it directly with your p
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
 - [javascript](https://github.com/pangloss/vim-javascript)
 - [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax)
-- [jinja](https://github.com/lepture/vim-jinja)
 - [jq](https://github.com/vito-c/jq.vim)
 - [json5](https://github.com/GutenYe/json5.vim)
 - [json](https://github.com/elzr/vim-json)
@@ -239,7 +239,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [xml](https://github.com/amadeus/vim-xml)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax)
 - [yaml](https://github.com/vim/vim/tree/df44a27b53586fccfc6a3aedc89061fdd9a515ff/runtime)
-- [yard](https://github.com/sheerun/vim-yardoc)
+- [yard](https://github.com/noprompt/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir)
 - [zig](https://github.com/ziglang/zig.vim)
 - [zinit](https://github.com/zinit-zsh/zplugin-vim-syntax)
diff --git a/after/syntax/ruby.vim b/after/syntax/ruby.vim
index 00cd07d93..a135b6a8c 100644
--- a/after/syntax/ruby.vim
+++ b/after/syntax/ruby.vim
@@ -22,6 +22,7 @@ syn match yardNote "@note" contained
 syn match yardOption "@option" contained
 syn match yardOverload "@overload" contained
 syn match yardParam "@param" contained
+syn match yardParamName /@param \h\+/hs=s+7 contained contains=yardParam
 syn match yardPrivate "@private" contained
 syn match yardRaise "@raise" contained
 syn match yardReturn "@return" contained
@@ -32,7 +33,7 @@ syn match yardVersion "@version" contained
 syn match yardYield "@yield" contained
 syn match yardYieldParam "@yieldparam" contained
 syn match yardYieldReturn "@yieldreturn" contained
-syn cluster yardTags contains=yardGenericTag,yardAbstract,yardApi,yardAttr,yardAttrReader,yardAttrWriter,yardAuthor,yardDeprecated,yardExample,yardNote,yardOption,yardOverload,yardParam,yardPrivate,yardRaise,yardReturn,yardSee,yardSince,yardTodo,yardVersion,yardYield,yardYieldParam,yardYieldReturn
+syn cluster yardTags contains=yardGenericTag,yardAbstract,yardApi,yardAttr,yardAttrReader,yardAttrWriter,yardAuthor,yardDeprecated,yardExample,yardNote,yardOption,yardOverload,yardParam,yardParamName,yardPrivate,yardRaise,yardReturn,yardSee,yardSince,yardTodo,yardVersion,yardYield,yardYieldParam,yardYieldReturn
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Directives
@@ -81,7 +82,7 @@ syn cluster rubyNotTop add=@yardTags,@yardDirectives,@yardTypes,@yardLists,@yard
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 hi def link yardComment rubyComment
 " Tags
-hi def link yardGenericTag rubyKeyword
+hi def link yardGenericTag rubyTodo
 hi def link yardAbstract yardGenericTag
 hi def link yardApi yardGenericTag
 hi def link yardAttr yardGenericTag
@@ -101,11 +102,11 @@ hi def link yardSee yardGenericTag
 hi def link yardSince yardGenericTag
 hi def link yardTodo yardGenericTag
 hi def link yardVersion yardGenericTag
-hi def link yield yardGenericTag
-hi def link yieldparam yardGenericTag
-hi def link yieldreturn yardGenericTag
+hi def link yardYield yardGenericTag
+hi def link yardYieldParam yardGenericTag
+hi def link yardYieldReturn yardGenericTag
 " Directives
-hi def link yardGenericDirective rubyKeyword
+hi def link yardGenericDirective rubyTodo
 hi def link yardAttribute yardGenericDirective
 hi def link yardEndGroup yardGenericDirective
 hi def link yardGroup yardGenericDirective
diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index d8ee601fe..97a837521 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -373,7 +373,7 @@ func! polyglot#DetectHtmlFiletype()
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
     if line =~# '{{.*}}\|{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\(\<\|\>\)\|{#\s\+'
-      set ft=jinja.html | return
+      set ft=htmldjango | return
     endif
     if line =~# '\(\<\|\>\)DTD\s\+XHTML\s'
       set ft=xhtml | return
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index ae101289a..0bb73fd8d 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -38,7 +38,7 @@ let s:globs = {
   \ 'basic': '*.basic',
   \ 'blade': '*.blade,*.blade.php',
   \ 'brewfile': 'Brewfile',
-  \ 'bzl': '*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE',
+  \ 'bzl': '*.bzl,*.bazel,*.BUILD,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE',
   \ 'c': '*.c,*.cats,*.h,*.idc,*.qc',
   \ 'caddyfile': 'Caddyfile',
   \ 'carp': '*.carp',
@@ -101,7 +101,10 @@ let s:globs = {
   \ 'help': '',
   \ 'hive': '*.q,*.hql,*.ql',
   \ 'html': '*.html,*.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml',
+  \ 'html.handlebars': '*.handlebars,*.hbs,*.hdbs,*.hb',
+  \ 'html.mustache': '*.mustache,*.hogan,*.hulk,*.hjs',
   \ 'html.twig': '*.twig',
+  \ 'htmldjango': '*.jinja,*.j2,*.jinja2,*.njk',
   \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config',
   \ 'icalendar': '*.ics',
   \ 'idris': '*.idr,*.lidr,idris-response',
@@ -109,7 +112,6 @@ let s:globs = {
   \ 'ion': '*.ion',
   \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
   \ 'javascriptreact': '*.jsx',
-  \ 'jinja.html': '*.jinja,*.j2,*.jinja2',
   \ 'jq': '*.jq',
   \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,composer.lock,mcmod.info,Pipfile.lock',
   \ 'json5': '*.json5',
@@ -135,7 +137,6 @@ let s:globs = {
   \ 'mma': '*.mathematica,*.cdf,*.m,*.ma,*.mt,*.nb,*.nbp,*.wl,*.wlt,*.wls,*.mma',
   \ 'moon': '*.moon',
   \ 'murphi': '*.m',
-  \ 'mustache': '*.handlebars,*.hbs,*.hulk,*.hjs,*.mustache,*.njk,*.hogan,*.hdbs,*.hb',
   \ 'nginx': '*.nginx,*.nginxconf,*.vhost,nginx.conf,nginx*.conf,*nginx.conf',
   \ 'nim': '*.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg',
   \ 'nix': '*.nix',
@@ -216,7 +217,7 @@ let s:globs = {
   \ 'vmasm': '*.mar',
   \ 'vue': '*.vue,*.wpy',
   \ 'xdc': '*.xdc',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
   \ 'xml.twig': '*.xml.twig',
   \ 'xs': '*.xs',
   \ 'xsl': '*.xslt,*.xsl',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index f9b6a670a..d6379ae20 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -156,7 +156,7 @@ if !has_key(s:disabled_packages, 'ampl')
 endif
 
 if !has_key(s:disabled_packages, 'xml')
-  au! BufRead,BufNewFile *.csproj,*.ui,*.wsdl,*.wsf,*.xlf,*.xliff,*.xmi,*.xsd,*.xul
+  au! BufRead,BufNewFile *.csproj,*.ui,*.wsdl,*.wsf,*.xlf,*.xliff,*.xmi,*.xsd,*.xul,*.tpm,*.csproj.user,*.wpl
 endif
 
 if !has_key(s:disabled_packages, 'ant')
@@ -488,7 +488,7 @@ if !has_key(s:disabled_packages, 'dosini')
 endif
 
 if !has_key(s:disabled_packages, 'bzl')
-  au! BufRead,BufNewFile *.bzl,BUILD,WORKSPACE
+  au! BufRead,BufNewFile *.bzl,*.bazel,*.BUILD,BUILD,WORKSPACE
 endif
 
 if !has_key(s:disabled_packages, 'tads')
@@ -591,6 +591,7 @@ if !has_key(s:disabled_packages, 'xml')
   au BufNewFile,BufRead *.csdef set ft=xml
   au BufNewFile,BufRead *.csl set ft=xml
   au BufNewFile,BufRead *.csproj set ft=xml
+  au BufNewFile,BufRead *.csproj.user set ft=xml
   au BufNewFile,BufRead *.ct set ft=xml
   au BufNewFile,BufRead *.depproj set ft=xml
   au BufNewFile,BufRead *.dita set ft=xml
@@ -643,6 +644,7 @@ if !has_key(s:disabled_packages, 'xml')
   au BufNewFile,BufRead *.sublime-snippet set ft=xml
   au BufNewFile,BufRead *.targets set ft=xml
   au BufNewFile,BufRead *.tml set ft=xml
+  au BufNewFile,BufRead *.tpm set ft=xml
   au BufNewFile,BufRead *.ui set ft=xml
   au BufNewFile,BufRead *.urdf set ft=xml
   au BufNewFile,BufRead *.ux set ft=xml
@@ -654,6 +656,7 @@ if !has_key(s:disabled_packages, 'xml')
   au BufNewFile,BufRead *.vxml set ft=xml
   au BufNewFile,BufRead *.wixproj set ft=xml
   au BufNewFile,BufRead *.workflow set ft=xml
+  au BufNewFile,BufRead *.wpl set ft=xml
   au BufNewFile,BufRead *.wsdl set ft=xml
   au BufNewFile,BufRead *.wsf set ft=xml
   au BufNewFile,BufRead *.wxi set ft=xml
@@ -1099,15 +1102,14 @@ if !has_key(s:disabled_packages, 'haml')
 endif
 
 if !has_key(s:disabled_packages, 'handlebars')
-  au BufNewFile,BufRead *.handlebars set ft=mustache
-  au BufNewFile,BufRead *.hb set ft=mustache
-  au BufNewFile,BufRead *.hbs set ft=mustache
-  au BufNewFile,BufRead *.hdbs set ft=mustache
-  au BufNewFile,BufRead *.hjs set ft=mustache
-  au BufNewFile,BufRead *.hogan set ft=mustache
-  au BufNewFile,BufRead *.hulk set ft=mustache
-  au BufNewFile,BufRead *.mustache set ft=mustache
-  au BufNewFile,BufRead *.njk set ft=mustache
+  au BufNewFile,BufRead *.hjs set ft=html.mustache
+  au BufNewFile,BufRead *.hogan set ft=html.mustache
+  au BufNewFile,BufRead *.hulk set ft=html.mustache
+  au BufNewFile,BufRead *.mustache set ft=html.mustache
+  au BufNewFile,BufRead *.handlebars set ft=html.handlebars
+  au BufNewFile,BufRead *.hb set ft=html.handlebars
+  au BufNewFile,BufRead *.hbs set ft=html.handlebars
+  au BufNewFile,BufRead *.hdbs set ft=html.handlebars
 endif
 
 if !has_key(s:disabled_packages, 'haskell')
@@ -1184,10 +1186,11 @@ if !has_key(s:disabled_packages, 'jenkins')
   au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
-if !has_key(s:disabled_packages, 'jinja')
-  au BufNewFile,BufRead *.j2 set ft=jinja.html
-  au BufNewFile,BufRead *.jinja set ft=jinja.html
-  au BufNewFile,BufRead *.jinja2 set ft=jinja.html
+if !has_key(s:disabled_packages, 'htmldjango')
+  au BufNewFile,BufRead *.j2 set ft=htmldjango
+  au BufNewFile,BufRead *.jinja set ft=htmldjango
+  au BufNewFile,BufRead *.jinja2 set ft=htmldjango
+  au BufNewFile,BufRead *.njk set ft=htmldjango
 endif
 
 if !has_key(s:disabled_packages, 'jq')
@@ -1992,6 +1995,8 @@ if !has_key(s:disabled_packages, 'odin')
 endif
 
 if !has_key(s:disabled_packages, 'bzl')
+  au BufNewFile,BufRead *.BUILD set ft=bzl
+  au BufNewFile,BufRead *.bazel set ft=bzl
   au BufNewFile,BufRead *.bzl set ft=bzl
   au BufNewFile,BufRead BUCK set ft=bzl
   au BufNewFile,BufRead BUILD set ft=bzl
diff --git a/ftplugin/aspvbs.vim b/ftplugin/aspvbs.vim
new file mode 100644
index 000000000..c2afec5aa
--- /dev/null
+++ b/ftplugin/aspvbs.vim
@@ -0,0 +1,64 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aspvbs') == -1
+
+" Vim filetype plugin file
+" Language:	aspvbs
+" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Changed: 20 Jan 2009
+" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+
+if exists("b:did_ftplugin") | finish | endif
+
+" Make sure the continuation lines below do not cause problems in
+" compatibility mode.
+let s:save_cpo = &cpo
+set cpo-=C
+
+" Define some defaults in case the included ftplugins don't set them.
+let s:undo_ftplugin = ""
+let s:browsefilter = "HTML Files (*.html, *.htm)\t*.htm*\n" .
+	    \	     "All Files (*.*)\t*.*\n"
+let s:match_words = ""
+
+runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
+let b:did_ftplugin = 1
+
+" Override our defaults if these were set by an included ftplugin.
+if exists("b:undo_ftplugin")
+    let s:undo_ftplugin = b:undo_ftplugin
+endif
+if exists("b:browsefilter")
+    let s:browsefilter = b:browsefilter
+endif
+if exists("b:match_words")
+    let s:match_words = b:match_words
+endif
+
+" ASP:  Active Server Pages (with Visual Basic Script)
+" thanks to Gontran BAERTS
+if exists("loaded_matchit")
+  let s:notend = '\%(\<end\s\+\)\@<!'
+  let b:match_ignorecase = 1
+  let b:match_words =
+  \ s:notend . '\<if\>\%(.\{-}then\s\+\w\)\@!:\<elseif\>:^\s*\<else\>:\<end\s\+\<if\>,' .
+  \ s:notend . '\<select\s\+case\>:\<case\>:\<case\s\+else\>:\<end\s\+select\>,' .
+  \ '^\s*\<sub\>:\<end\s\+sub\>,' .
+  \ '^\s*\<function\>:\<end\s\+function\>,' .
+  \ '\<class\>:\<end\s\+class\>,' .
+  \ '^\s*\<do\>:\<loop\>,' .
+  \ '^\s*\<for\>:\<next\>,' .
+  \ '\<while\>:\<wend\>,' .
+  \ s:match_words
+endif
+
+" Change the :browse e filter to primarily show ASP-related files.
+if has("gui_win32")
+    let  b:browsefilter="ASP Files (*.asp)\t*.asp\n" . s:browsefilter
+endif
+
+let b:undo_ftplugin = "unlet! b:match_words b:match_ignorecase b:browsefilter | " . s:undo_ftplugin
+
+" Restore the saved compatibility options.
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif
diff --git a/ftplugin/handlebars.vim b/ftplugin/handlebars.vim
new file mode 100644
index 000000000..649984aaa
--- /dev/null
+++ b/ftplugin/handlebars.vim
@@ -0,0 +1,127 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
+
+if exists('b:loaded_mustache_handlebars')
+  finish
+endif
+let b:loaded_mustache_handlebars = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Matchit support for Mustache & Handlebars
+" extending HTML matchit groups
+if exists("loaded_matchit") && exists("b:match_words")
+  let b:match_words = b:match_words
+  \ . ',{:},[:],(:),'
+  \ . '\%({{\)\@<=#\s*\%(if\|unless\)\s*.\{-}}}'
+  \ . ':'
+  \ . '\%({{\)\@<=\s*else\s*}}'
+  \ . ':'
+  \ . '\%({{\)\@<=/\s*\%(if\|unless\)\s*}},'
+  \ . '\%({{\)\@<=[#^]\s*\([-0-9a-zA-Z_?!/.]\+\).\{-}}}'
+  \ . ':'
+  \ . '\%({{\)\@<=/\s*\1\s*}}'
+endif
+
+" Set template for comment
+setlocal commentstring={{!--\ %s\ --}}
+
+if exists("g:mustache_abbreviations")
+  inoremap <buffer> {{{ {{{}}}<left><left><left>
+  inoremap <buffer> {{ {{}}<left><left>
+  inoremap <buffer> {{! {{!}}<left><left>
+  inoremap <buffer> {{< {{<}}<left><left>
+  inoremap <buffer> {{> {{>}}<left><left>
+  inoremap <buffer> {{# {{#}}<cr>{{/}}<up><left><left>
+  inoremap <buffer> {{if {{#if }}<cr>{{/if}}<up><left>
+  inoremap <buffer> {{ife {{#if }}<cr>{{else}}<cr>{{/if}}<up><up><left>
+endif
+
+
+" Section movement
+" Adapted from vim-ruby - many thanks to the maintainers of that plugin
+
+function! s:sectionmovement(pattern,flags,mode,count)
+  norm! m'
+  if a:mode ==# 'v'
+    norm! gv
+  endif
+  let i = 0
+  while i < a:count
+    let i = i + 1
+    " saving current position
+    let line = line('.')
+    let col  = col('.')
+    let pos = search(a:pattern,'W'.a:flags)
+    " if there's no more matches, return to last position
+    if pos == 0
+      call cursor(line,col)
+      return
+    endif
+  endwhile
+endfunction
+
+nnoremap <silent> <buffer> [[ :<C-U>call <SID>sectionmovement('{{','b','n',v:count1)<CR>
+nnoremap <silent> <buffer> ]] :<C-U>call <SID>sectionmovement('{{','' ,'n',v:count1)<CR>
+xnoremap <silent> <buffer> [[ :<C-U>call <SID>sectionmovement('{{','b','v',v:count1)<CR>
+xnoremap <silent> <buffer> ]] :<C-U>call <SID>sectionmovement('{{','' ,'v',v:count1)<CR>
+
+
+" Operator pending mappings
+
+" Operators are available by default. Set `let g:mustache_operators = 0` in
+" your .vimrc to disable them.
+if ! exists("g:mustache_operators")
+  let g:mustache_operators = 1
+endif
+
+if exists("g:mustache_operators") && g:mustache_operators
+  onoremap <silent> <buffer> ie :<C-U>call <SID>wrap_inside()<CR>
+  onoremap <silent> <buffer> ae :<C-U>call <SID>wrap_around()<CR>
+  xnoremap <silent> <buffer> ie :<C-U>call <SID>wrap_inside()<CR>
+  xnoremap <silent> <buffer> ae :<C-U>call <SID>wrap_around()<CR>
+endif
+
+function! s:wrap_around()
+  " If the cursor is at the end of the tag element, move back
+  " so that the end tag can be detected.
+  while getline('.')[col('.')-1] ==# '}'
+    execute 'norm h'
+  endwhile
+
+  " Moves to the end of the closing tag
+  let pos = search('}}','We')
+  if pos != 0
+    if getline('.')[col('.')] ==# '}'
+      " Ending tag contains 3 closing brackets '}}}',
+      " move to the last bracket.
+      execute 'norm l'
+    endif
+
+    " select the whole tag
+    execute 'norm v%'
+  endif
+endfunction
+
+function! s:wrap_inside()
+  " If the cursor is at the end of the tag element, move back
+  " so that the end tag can be detected.
+  while getline('.')[col('.')-1] ==# '}'
+    execute 'norm h'
+  endwhile
+
+  " Moves to the end of the closing tag
+  let pos = search('}}','W')
+  if pos != 0
+    " select only inside the tag
+    execute 'norm v%loho'
+  endif
+endfunction
+
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nofoldenable
+
+endif
diff --git a/ftplugin/htmldjango.vim b/ftplugin/htmldjango.vim
new file mode 100644
index 000000000..55489c0fa
--- /dev/null
+++ b/ftplugin/htmldjango.vim
@@ -0,0 +1,17 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
+
+" Vim filetype plugin file
+" Language:	Django HTML template
+" Maintainer:	Dave Hodder <dmh@dmh.org.uk>
+" Last Change:	2007 Jan 25
+
+" Only use this filetype plugin when no other was loaded.
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Use HTML and Django template ftplugins.
+runtime! ftplugin/html.vim
+runtime! ftplugin/django.vim
+
+endif
diff --git a/ftplugin/mustache.vim b/ftplugin/mustache.vim
index 649984aaa..7ca19b76b 100644
--- a/ftplugin/mustache.vim
+++ b/ftplugin/mustache.vim
@@ -1,127 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
-if exists('b:loaded_mustache_handlebars')
-  finish
-endif
-let b:loaded_mustache_handlebars = 1
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-" Matchit support for Mustache & Handlebars
-" extending HTML matchit groups
-if exists("loaded_matchit") && exists("b:match_words")
-  let b:match_words = b:match_words
-  \ . ',{:},[:],(:),'
-  \ . '\%({{\)\@<=#\s*\%(if\|unless\)\s*.\{-}}}'
-  \ . ':'
-  \ . '\%({{\)\@<=\s*else\s*}}'
-  \ . ':'
-  \ . '\%({{\)\@<=/\s*\%(if\|unless\)\s*}},'
-  \ . '\%({{\)\@<=[#^]\s*\([-0-9a-zA-Z_?!/.]\+\).\{-}}}'
-  \ . ':'
-  \ . '\%({{\)\@<=/\s*\1\s*}}'
-endif
-
-" Set template for comment
-setlocal commentstring={{!--\ %s\ --}}
-
-if exists("g:mustache_abbreviations")
-  inoremap <buffer> {{{ {{{}}}<left><left><left>
-  inoremap <buffer> {{ {{}}<left><left>
-  inoremap <buffer> {{! {{!}}<left><left>
-  inoremap <buffer> {{< {{<}}<left><left>
-  inoremap <buffer> {{> {{>}}<left><left>
-  inoremap <buffer> {{# {{#}}<cr>{{/}}<up><left><left>
-  inoremap <buffer> {{if {{#if }}<cr>{{/if}}<up><left>
-  inoremap <buffer> {{ife {{#if }}<cr>{{else}}<cr>{{/if}}<up><up><left>
-endif
-
-
-" Section movement
-" Adapted from vim-ruby - many thanks to the maintainers of that plugin
-
-function! s:sectionmovement(pattern,flags,mode,count)
-  norm! m'
-  if a:mode ==# 'v'
-    norm! gv
-  endif
-  let i = 0
-  while i < a:count
-    let i = i + 1
-    " saving current position
-    let line = line('.')
-    let col  = col('.')
-    let pos = search(a:pattern,'W'.a:flags)
-    " if there's no more matches, return to last position
-    if pos == 0
-      call cursor(line,col)
-      return
-    endif
-  endwhile
-endfunction
-
-nnoremap <silent> <buffer> [[ :<C-U>call <SID>sectionmovement('{{','b','n',v:count1)<CR>
-nnoremap <silent> <buffer> ]] :<C-U>call <SID>sectionmovement('{{','' ,'n',v:count1)<CR>
-xnoremap <silent> <buffer> [[ :<C-U>call <SID>sectionmovement('{{','b','v',v:count1)<CR>
-xnoremap <silent> <buffer> ]] :<C-U>call <SID>sectionmovement('{{','' ,'v',v:count1)<CR>
-
-
-" Operator pending mappings
-
-" Operators are available by default. Set `let g:mustache_operators = 0` in
-" your .vimrc to disable them.
-if ! exists("g:mustache_operators")
-  let g:mustache_operators = 1
-endif
-
-if exists("g:mustache_operators") && g:mustache_operators
-  onoremap <silent> <buffer> ie :<C-U>call <SID>wrap_inside()<CR>
-  onoremap <silent> <buffer> ae :<C-U>call <SID>wrap_around()<CR>
-  xnoremap <silent> <buffer> ie :<C-U>call <SID>wrap_inside()<CR>
-  xnoremap <silent> <buffer> ae :<C-U>call <SID>wrap_around()<CR>
-endif
-
-function! s:wrap_around()
-  " If the cursor is at the end of the tag element, move back
-  " so that the end tag can be detected.
-  while getline('.')[col('.')-1] ==# '}'
-    execute 'norm h'
-  endwhile
-
-  " Moves to the end of the closing tag
-  let pos = search('}}','We')
-  if pos != 0
-    if getline('.')[col('.')] ==# '}'
-      " Ending tag contains 3 closing brackets '}}}',
-      " move to the last bracket.
-      execute 'norm l'
-    endif
-
-    " select the whole tag
-    execute 'norm v%'
-  endif
-endfunction
-
-function! s:wrap_inside()
-  " If the cursor is at the end of the tag element, move back
-  " so that the end tag can be detected.
-  while getline('.')[col('.')-1] ==# '}'
-    execute 'norm h'
-  endwhile
-
-  " Moves to the end of the closing tag
-  let pos = search('}}','W')
-  if pos != 0
-    " select only inside the tag
-    execute 'norm v%loho'
-  endif
-endfunction
-
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: nofoldenable
+runtime! ftplugin/handlebars*.vim ftplugin/handlebars/*.vim
 
 endif
diff --git a/heuristics.yaml b/heuristics.yaml
index 60df69b52..c53a704cc 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -183,7 +183,7 @@ rules:
 - lines: 50
   rules:
   - pattern: '{{.*}}|{%-?\s*(end.*|extends|block|macro|set|if|for|include|trans)\b|{#\s+'
-    filetype: jinja.html
+    filetype: htmldjango
   - pattern: '\bDTD\s+XHTML\s'
     filetype: xhtml
 - filetype: html
diff --git a/indent/handlebars.vim b/indent/handlebars.vim
new file mode 100644
index 000000000..fbff2fa06
--- /dev/null
+++ b/indent/handlebars.vim
@@ -0,0 +1,129 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
+
+" Mustache & Handlebars syntax
+" Language:	Mustache, Handlebars
+" Maintainer:	Juvenn Woo <machese@gmail.com>
+" Screenshot:   http://imgur.com/6F408
+" Version:	3
+" Last Change:  26 Nov 2018
+" Remarks: based on eruby indent plugin by tpope
+" References:
+"   [Mustache](http://github.com/defunkt/mustache)
+"   [Handlebars](https://github.com/wycats/handlebars.js)
+"   [ctemplate](http://code.google.com/p/google-ctemplate/)
+"   [ctemplate doc](http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html)
+"   [et](http://www.ivan.fomichev.name/2008/05/erlang-template-engine-prototype.html)
+
+if exists("b:did_indent_hbs")
+  finish
+endif
+
+unlet! b:did_indent
+setlocal indentexpr=
+
+runtime! indent/html.vim
+unlet! b:did_indent
+
+" Force HTML indent to not keep state.
+let b:html_indent_usestate = 0
+
+if &l:indentexpr == ''
+  if &l:cindent
+    let &l:indentexpr = 'cindent(v:lnum)'
+  else
+    let &l:indentexpr = 'indent(prevnonblank(v:lnum-1))'
+  endif
+endif
+let b:handlebars_subtype_indentexpr = &l:indentexpr
+
+let b:did_indent = 1
+let b:did_indent_hbs = 1
+
+setlocal indentexpr=GetHandlebarsIndent()
+setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],o,O,!^F,=end,=else,=elsif,=rescue,=ensure,=when
+
+" Only define the function once.
+if exists("*GetHandlebarsIndent")
+  finish
+endif
+
+function! GetHandlebarsIndent(...)
+  " The value of a single shift-width
+  if exists('*shiftwidth')
+    let sw = shiftwidth()
+  else
+    let sw = &sw
+  endif
+
+  if a:0 && a:1 == '.'
+    let v:lnum = line('.')
+  elseif a:0 && a:1 =~ '^\d'
+    let v:lnum = a:1
+  endif
+  let vcol = col('.')
+  call cursor(v:lnum,1)
+  call cursor(v:lnum,vcol)
+  exe "let ind = ".b:handlebars_subtype_indentexpr
+
+  " Workaround for Andy Wokula's HTML indent. This should be removed after
+  " some time, since the newest version is fixed in a different way.
+  if b:handlebars_subtype_indentexpr =~# '^HtmlIndent('
+  \ && exists('b:indent')
+  \ && type(b:indent) == type({})
+  \ && has_key(b:indent, 'lnum')
+    " Force HTML indent to not keep state
+    let b:indent.lnum = -1
+  endif
+  let lnum = prevnonblank(v:lnum-1)
+  let prevLine = getline(lnum)
+  let currentLine = getline(v:lnum)
+
+  " all indent rules only apply if the block opening/closing
+  " tag is on a separate line
+
+  " indent after block {{#block
+  if prevLine =~# '\v\s*\{\{[#^].*\s*'
+    let ind = ind + sw
+  endif
+  " but not if the block ends on the same line
+  if prevLine =~# '\v\s*\{\{\#(.+)(\s+|\}\}).*\{\{\/\1'
+    let ind = ind - sw
+  endif
+  " unindent after block close {{/block}}
+  if currentLine =~# '\v^\s*\{\{\/\S*\}\}\s*'
+    let ind = ind - sw
+  endif
+  " indent after component block {{a-component
+  if prevLine =~# '\v\s*\{\{\w'
+    let ind = ind + sw
+  endif
+  " but not if the component block ends on the same line
+  if prevLine =~# '\v\s*\{\{\w(.+)\}\}'
+    let ind = ind - sw
+  endif
+  " unindent }} lines, and following lines if not inside a block expression
+  let savedPos = getpos('.')
+  if currentLine =~# '\v^\s*\}\}\s*$' || (currentLine !~# '\v^\s*\{\{\/' && prevLine =~# '\v^\s*[^\{\} \t]+\}\}\s*$')
+    let closingLnum = search('}}\s*$', 'Wbc', lnum)
+    let [openingLnum, col] = searchpairpos('{{', '', '}}', 'Wb')
+    if openingLnum > 0 && closingLnum > 0
+      if strpart(getline(openingLnum), col - 1, 3) !~ '{{[#^]'
+        let ind = ind - sw
+      endif
+    else
+      call setpos('.', savedPos)
+    endif
+  endif
+  " unindent {{else}}
+  if currentLine =~# '\v^\s*\{\{else.*\}\}\s*$'
+    let ind = ind - sw
+  endif
+  " indent again after {{else}}
+  if prevLine =~# '\v^\s*\{\{else.*\}\}\s*$'
+    let ind = ind + sw
+  endif
+
+  return ind
+endfunction
+
+endif
diff --git a/indent/htmldjango.vim b/indent/htmldjango.vim
new file mode 100644
index 000000000..493ced544
--- /dev/null
+++ b/indent/htmldjango.vim
@@ -0,0 +1,16 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
+
+" Vim indent file
+" Language:	Django HTML template
+" Maintainer:	Dave Hodder <dmh@dmh.org.uk>
+" Last Change:	2007 Jan 25
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+" Use HTML formatting rules.
+runtime! indent/html.vim
+
+endif
diff --git a/indent/jinja.vim b/indent/jinja.vim
deleted file mode 100644
index da7d676fb..000000000
--- a/indent/jinja.vim
+++ /dev/null
@@ -1,84 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
-
-" Vim indent file
-" Language:	Jinja HTML template
-" Maintainer:	Evan Hammer <evan@evanhammer.com>
-" Last Change:	2013 Jan 26
-
-" Only load this indent file when no other was loaded.
-if exists("b:did_indent")
-  finish
-endif
-
-" Use HTML formatting rules.
-setl indentkeys=o,O,<Return>,<>>,!^F
-runtime! indent/html.vim		 +setl nosmartindent
-let b:did_indent = 1
-
-" Indent within the jinja tags
-" Made by Steve Losh <steve@stevelosh.com>
-if &l:indentexpr == ''
-    if &l:cindent
-        let &l:indentexpr = 'cindent(v:lnum)'
-    else
-        let &l:indentexpr = 'indent(prevnonblank(v:lnum-1))'
-    endif
-endif
-let b:html_indentexpr = &l:indentexpr
-
-let b:did_indent = 1
-
-setlocal indentexpr=GetDjangoIndent()
-setlocal indentkeys=o,O,*<Return>,{,},o,O,!^F,<>>
-
-" Only define the function once.
-if exists("*GetDjangoIndent")
-    finish
-endif
-
-function! GetDjangoIndent(...)
-    if a:0 && a:1 == '.'
-        let v:lnum = line('.')
-    elseif a:0 && a:1 =~ '^\d'
-        let v:lnum = a:1
-    endif
-    let vcol = col('.')
-
-    call cursor(v:lnum,vcol)
-
-    exe "let ind = ".b:html_indentexpr
-
-    let lnum = prevnonblank(v:lnum-1)
-    let pnb = getline(lnum)
-    let cur = getline(v:lnum)
-
-    let tagstart = '.*' . '{%\s*'
-    let tagend = '.*%}' . '.*'
-
-    let blocktags = '\(block\|for\|if\|with\|autoescape\|comment\|filter\|spaceless\)'
-    let midtags = '\(empty\|else\|elif\)'
-
-    let pnb_blockstart = pnb =~# tagstart . blocktags . tagend
-    let pnb_blockend   = pnb =~# tagstart . 'end' . blocktags . tagend
-    let pnb_blockmid   = pnb =~# tagstart . midtags . tagend
-
-    let cur_blockstart = cur =~# tagstart . blocktags . tagend
-    let cur_blockend   = cur =~# tagstart . 'end' . blocktags . tagend
-    let cur_blockmid   = cur =~# tagstart . midtags . tagend
-
-    if pnb_blockstart && !pnb_blockend
-        let ind = ind + &sw
-    elseif pnb_blockmid && !pnb_blockend
-        let ind = ind + &sw
-    endif
-
-    if cur_blockend && !cur_blockstart
-        let ind = ind - &sw
-    elseif cur_blockmid
-        let ind = ind - &sw
-    endif
-
-    return ind
-endfunction
-
-endif
diff --git a/indent/mustache.vim b/indent/mustache.vim
index fbff2fa06..3387485e7 100644
--- a/indent/mustache.vim
+++ b/indent/mustache.vim
@@ -1,129 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
-" Mustache & Handlebars syntax
-" Language:	Mustache, Handlebars
-" Maintainer:	Juvenn Woo <machese@gmail.com>
-" Screenshot:   http://imgur.com/6F408
-" Version:	3
-" Last Change:  26 Nov 2018
-" Remarks: based on eruby indent plugin by tpope
-" References:
-"   [Mustache](http://github.com/defunkt/mustache)
-"   [Handlebars](https://github.com/wycats/handlebars.js)
-"   [ctemplate](http://code.google.com/p/google-ctemplate/)
-"   [ctemplate doc](http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html)
-"   [et](http://www.ivan.fomichev.name/2008/05/erlang-template-engine-prototype.html)
-
-if exists("b:did_indent_hbs")
-  finish
-endif
-
-unlet! b:did_indent
-setlocal indentexpr=
-
-runtime! indent/html.vim
-unlet! b:did_indent
-
-" Force HTML indent to not keep state.
-let b:html_indent_usestate = 0
-
-if &l:indentexpr == ''
-  if &l:cindent
-    let &l:indentexpr = 'cindent(v:lnum)'
-  else
-    let &l:indentexpr = 'indent(prevnonblank(v:lnum-1))'
-  endif
-endif
-let b:handlebars_subtype_indentexpr = &l:indentexpr
-
-let b:did_indent = 1
-let b:did_indent_hbs = 1
-
-setlocal indentexpr=GetHandlebarsIndent()
-setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],o,O,!^F,=end,=else,=elsif,=rescue,=ensure,=when
-
-" Only define the function once.
-if exists("*GetHandlebarsIndent")
-  finish
-endif
-
-function! GetHandlebarsIndent(...)
-  " The value of a single shift-width
-  if exists('*shiftwidth')
-    let sw = shiftwidth()
-  else
-    let sw = &sw
-  endif
-
-  if a:0 && a:1 == '.'
-    let v:lnum = line('.')
-  elseif a:0 && a:1 =~ '^\d'
-    let v:lnum = a:1
-  endif
-  let vcol = col('.')
-  call cursor(v:lnum,1)
-  call cursor(v:lnum,vcol)
-  exe "let ind = ".b:handlebars_subtype_indentexpr
-
-  " Workaround for Andy Wokula's HTML indent. This should be removed after
-  " some time, since the newest version is fixed in a different way.
-  if b:handlebars_subtype_indentexpr =~# '^HtmlIndent('
-  \ && exists('b:indent')
-  \ && type(b:indent) == type({})
-  \ && has_key(b:indent, 'lnum')
-    " Force HTML indent to not keep state
-    let b:indent.lnum = -1
-  endif
-  let lnum = prevnonblank(v:lnum-1)
-  let prevLine = getline(lnum)
-  let currentLine = getline(v:lnum)
-
-  " all indent rules only apply if the block opening/closing
-  " tag is on a separate line
-
-  " indent after block {{#block
-  if prevLine =~# '\v\s*\{\{[#^].*\s*'
-    let ind = ind + sw
-  endif
-  " but not if the block ends on the same line
-  if prevLine =~# '\v\s*\{\{\#(.+)(\s+|\}\}).*\{\{\/\1'
-    let ind = ind - sw
-  endif
-  " unindent after block close {{/block}}
-  if currentLine =~# '\v^\s*\{\{\/\S*\}\}\s*'
-    let ind = ind - sw
-  endif
-  " indent after component block {{a-component
-  if prevLine =~# '\v\s*\{\{\w'
-    let ind = ind + sw
-  endif
-  " but not if the component block ends on the same line
-  if prevLine =~# '\v\s*\{\{\w(.+)\}\}'
-    let ind = ind - sw
-  endif
-  " unindent }} lines, and following lines if not inside a block expression
-  let savedPos = getpos('.')
-  if currentLine =~# '\v^\s*\}\}\s*$' || (currentLine !~# '\v^\s*\{\{\/' && prevLine =~# '\v^\s*[^\{\} \t]+\}\}\s*$')
-    let closingLnum = search('}}\s*$', 'Wbc', lnum)
-    let [openingLnum, col] = searchpairpos('{{', '', '}}', 'Wb')
-    if openingLnum > 0 && closingLnum > 0
-      if strpart(getline(openingLnum), col - 1, 3) !~ '{{[#^]'
-        let ind = ind - sw
-      endif
-    else
-      call setpos('.', savedPos)
-    endif
-  endif
-  " unindent {{else}}
-  if currentLine =~# '\v^\s*\{\{else.*\}\}\s*$'
-    let ind = ind - sw
-  endif
-  " indent again after {{else}}
-  if prevLine =~# '\v^\s*\{\{else.*\}\}\s*$'
-    let ind = ind + sw
-  endif
-
-  return ind
-endfunction
+runtime! indent/handlebars.vim
 
 endif
diff --git a/packages.yaml b/packages.yaml
index 6cec2b086..297150938 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -169,7 +169,7 @@ filetypes:
   - '*/etc/httpd/conf.d/*.conf*'
 ---
 name: apiblueprint
-remote: sheerun/apiblueprint.vim
+remote: kylef/apiblueprint.vim
 filetypes:
 - name: apiblueprint
   linguist: API Blueprint
@@ -440,9 +440,6 @@ remote: tpope/vim-cucumber
 filetypes:
 - name: cucumber
   linguist: Gherkin
-  extra_extensions:
-  # https://github.com/search?q=extension%3Astory+when&type=Code
-  - story
 ---
 name: cue
 remote: mgrabovsky/vim-cuesheet
@@ -720,7 +717,8 @@ filetypes:
   - '*/etc/grub.conf'
 ---
 name: haml
-remote: sheerun/vim-haml
+remote: tpope/vim-haml
+glob: '**/haml.vim'
 filetypes:
 - name: haml
   linguist: Haml
@@ -729,16 +727,17 @@ filetypes:
   - hamlbars
 ---
 name: handlebars
-remote: sheerun/vim-mustache-handlebars
+remote: mustache/vim-mustache-handlebars
 filetypes:
-- name: mustache
-  linguist: Handlebars
+- name: html.mustache
+  linguist: Mustache
   extra_extensions:
+  - hogan
   - hulk
   - hjs
-  - mustache
-  - njk
-  - hogan
+- name: html.handlebars
+  linguist: Handlebars
+  extra_extensions:
   - hdbs
   - hb
 ---
@@ -770,8 +769,6 @@ remote: b4b4r07/vim-hcl
 filetypes:
 - name: hcl
   linguist: HCL
-  extra_extensions:
-  - nomad
   extra_filenames:
   - Appfile
   ignored_extensions:
@@ -873,15 +870,14 @@ filetypes:
   - Jenkinsfile
   - Jenkinsfile*
 ---
-name: jinja
-remote: lepture/vim-jinja
+name: htmldjango
+remote: vim/vim:runtime
+globs:
+- '**/django.vim'
+- '**/htmldjango.vim'
 filetypes:
-- name: jinja.html
+- name: htmldjango
   linguist: HTML+Django
-  extra_extensions:
-  - j2
-  ignored_extensions:
-  - njk
   ignore_warnings:
   # handled by mustache plugin
   - mustache
@@ -1437,7 +1433,9 @@ filetypes:
   - '*_spec.rb'
 ---
 name: yard
-remote: sheerun/vim-yardoc
+remote: noprompt/vim-yardoc
+patches:
+- 'https://github.com/sheerun/vim-yardoc/commit/173924ec12a66e26a886e80431b92cc9bda578d4.patch'
 # just adds to ruby
 filetypes: []
 ---
@@ -1727,6 +1725,9 @@ filetypes:
   linguist: XML
   extra_extensions:
   - cdxml
+  - tpm
+  - csproj.user
+  - wpl
   ignored_extensions:
   - ts
   - tsx
@@ -1863,6 +1864,9 @@ glob: '**/bzl.vim'
 filetypes:
 - name: bzl
   linguist: Starlark
+  extra_extensions:
+  - bazel
+  - BUILD
 ---
 name: prolog
 remote: vim/vim:runtime
diff --git a/scripts/build b/scripts/build
index 47a7e51ab..260beddb9 100755
--- a/scripts/build
+++ b/scripts/build
@@ -375,13 +375,15 @@ def extract(packages)
         if repo == "vim/vim" && (["glob", "globs"] & package.keys).size == 0
           raise "Package from vim/vim should define glob or globs: #{package["name"]}"
         end
-        glob = package.fetch("glob", package.fetch('globs', '**/*.{vim,ctags,vital,txt}'))
-        Dir.glob("#{subdir}/#{glob}", base: subtree).each do |p|
-          next unless File.file?("#{subtree}/#{p}")
-          if p.include?("samba")
-            raise package["name"]
+        globs = [package.fetch("glob", package.fetch('globs', '**/*.{vim,ctags,vital,txt}'))].flatten
+        globs.each do |glob|
+          Dir.glob("#{subdir}/#{glob}", base: subtree).each do |p|
+            next unless File.file?("#{subtree}/#{p}")
+            if p.include?("samba")
+              raise package["name"]
+            end
+            copy_file(package, "#{subtree}/#{p}", p)
           end
-          copy_file(package, "#{subtree}/#{p}", p)
         end
       elsif File.exist?(subpath)
         copy_file(package, subpath, subdir)
diff --git a/syntax/aspperl.vim b/syntax/aspperl.vim
new file mode 100644
index 000000000..18933caf5
--- /dev/null
+++ b/syntax/aspperl.vim
@@ -0,0 +1,29 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aspperl') == -1
+
+" Vim syntax file
+" Language:	Active State's PerlScript (ASP)
+" Maintainer:	Aaron Hope <edh@brioforge.com>
+" URL:		http://nim.dhs.org/~edh/aspperl.vim
+" Last Change:	2001 May 09
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'perlscript'
+endif
+
+runtime! syntax/html.vim
+unlet b:current_syntax
+syn include @AspPerlScript syntax/perl.vim
+
+syn cluster htmlPreproc add=AspPerlScriptInsideHtmlTags
+
+syn region  AspPerlScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<%=\=+ skip=+".*%>.*"+ end=+%>+ contains=@AspPerlScript
+syn region  AspPerlScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<script\s\+language="\=perlscript"\=[^>]*>+ end=+</script>+ contains=@AspPerlScript
+
+let b:current_syntax = "aspperl"
+
+endif
diff --git a/syntax/aspvbs.vim b/syntax/aspvbs.vim
new file mode 100644
index 000000000..d9cf40c6d
--- /dev/null
+++ b/syntax/aspvbs.vim
@@ -0,0 +1,186 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aspvbs') == -1
+
+" Vim syntax file
+" Language:	Microsoft VBScript Web Content (ASP)
+" Maintainer:	Devin Weaver <ktohg@tritarget.com> (non-functional)
+" URL:		http://tritarget.com/pub/vim/syntax/aspvbs.vim (broken)
+" Last Change:	2006 Jun 19
+" 		by Dan Casey
+" Version:	$Revision: 1.3 $
+" Thanks to Jay-Jay <vim@jay-jay.net> for a syntax sync hack, hungarian
+" notation, and extra highlighting.
+" Thanks to patrick dehne <patrick@steidle.net> for the folding code.
+" Thanks to Dean Hall <hall@apt7.com> for testing the use of classes in
+" VBScripts which I've been too scared to do.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'aspvbs'
+endif
+
+runtime! syntax/html.vim
+unlet b:current_syntax
+
+syn cluster htmlPreProc add=AspVBScriptInsideHtmlTags
+
+
+" Colored variable names, if written in hungarian notation
+hi def AspVBSVariableSimple   term=standout  ctermfg=3  guifg=#99ee99
+hi def AspVBSVariableComplex  term=standout  ctermfg=3  guifg=#ee9900
+syn match AspVBSVariableSimple  contained "\<\(bln\|byt\|dtm\=\|dbl\|int\|str\)\u\w*"
+syn match AspVBSVariableComplex contained "\<\(arr\|ary\|obj\)\u\w*"
+
+
+" Functions and methods that are in VB but will cause errors in an ASP page
+" This is helpfull if your porting VB code to ASP
+" I removed (Count, Item) because these are common variable names in AspVBScript
+syn keyword AspVBSError contained Val Str CVar CVDate DoEvents GoSub Return GoTo
+syn keyword AspVBSError contained Stop LinkExecute Add Type LinkPoke
+syn keyword AspVBSError contained LinkRequest LinkSend Declare Optional Sleep
+syn keyword AspVBSError contained ParamArray Static Erl TypeOf Like LSet RSet Mid StrConv
+" It may seem that most of these can fit into a keyword clause but keyword takes
+" priority over all so I can't get the multi-word matches
+syn match AspVBSError contained "\<Def[a-zA-Z0-9_]\+\>"
+syn match AspVBSError contained "^\s*Open\s\+"
+syn match AspVBSError contained "Debug\.[a-zA-Z0-9_]*"
+syn match AspVBSError contained "^\s*[a-zA-Z0-9_]\+:"
+syn match AspVBSError contained "[a-zA-Z0-9_]\+![a-zA-Z0-9_]\+"
+syn match AspVBSError contained "^\s*#.*$"
+syn match AspVBSError contained "\<As\s\+[a-zA-Z0-9_]*"
+syn match AspVBSError contained "\<End\>\|\<Exit\>"
+syn match AspVBSError contained "\<On\s\+Error\>\|\<On\>\|\<Error\>\|\<Resume\s\+Next\>\|\<Resume\>"
+syn match AspVBSError contained "\<Option\s\+\(Base\|Compare\|Private\s\+Module\)\>"
+" This one I want 'cause I always seem to mis-spell it.
+syn match AspVBSError contained "Respon\?ce\.\S*"
+syn match AspVBSError contained "Respose\.\S*"
+" When I looked up the VBScript syntax it mentioned that Property Get/Set/Let
+" statements are illegal, however, I have recived reports that they do work.
+" So I commented it out for now.
+" syn match AspVBSError contained "\<Property\s\+\(Get\|Let\|Set\)\>"
+
+" AspVBScript Reserved Words.
+syn match AspVBSStatement contained "\<On\s\+Error\s\+\(Resume\s\+Next\|goto\s\+0\)\>\|\<Next\>"
+syn match AspVBSStatement contained "\<End\s\+\(If\|For\|Select\|Class\|Function\|Sub\|With\|Property\)\>"
+syn match AspVBSStatement contained "\<Exit\s\+\(Do\|For\|Sub\|Function\)\>"
+syn match AspVBSStatement contained "\<Exit\s\+\(Do\|For\|Sub\|Function\|Property\)\>"
+syn match AspVBSStatement contained "\<Option\s\+Explicit\>"
+syn match AspVBSStatement contained "\<For\s\+Each\>\|\<For\>"
+syn match AspVBSStatement contained "\<Set\>"
+syn keyword AspVBSStatement contained Call Class Const Default Dim Do Loop Erase And
+syn keyword AspVBSStatement contained Function If Then Else ElseIf Or
+syn keyword AspVBSStatement contained Private Public Randomize ReDim
+syn keyword AspVBSStatement contained Select Case Sub While With Wend Not
+
+" AspVBScript Functions
+syn keyword AspVBSFunction contained Abs Array Asc Atn CBool CByte CCur CDate CDbl
+syn keyword AspVBSFunction contained Chr CInt CLng Cos CreateObject CSng CStr Date
+syn keyword AspVBSFunction contained DateAdd DateDiff DatePart DateSerial DateValue
+syn keyword AspVBSFunction contained Date Day Exp Filter Fix FormatCurrency
+syn keyword AspVBSFunction contained FormatDateTime FormatNumber FormatPercent
+syn keyword AspVBSFunction contained GetObject Hex Hour InputBox InStr InStrRev Int
+syn keyword AspVBSFunction contained IsArray IsDate IsEmpty IsNull IsNumeric
+syn keyword AspVBSFunction contained IsObject Join LBound LCase Left Len LoadPicture
+syn keyword AspVBSFunction contained Log LTrim Mid Minute Month MonthName MsgBox Now
+syn keyword AspVBSFunction contained Oct Replace RGB Right Rnd Round RTrim
+syn keyword AspVBSFunction contained ScriptEngine ScriptEngineBuildVersion
+syn keyword AspVBSFunction contained ScriptEngineMajorVersion
+syn keyword AspVBSFunction contained ScriptEngineMinorVersion Second Sgn Sin Space
+syn keyword AspVBSFunction contained Split Sqr StrComp StrReverse String Tan Time Timer
+syn keyword AspVBSFunction contained TimeSerial TimeValue Trim TypeName UBound UCase
+syn keyword AspVBSFunction contained VarType Weekday WeekdayName Year
+
+" AspVBScript Methods
+syn keyword AspVBSMethods contained Add AddFolders BuildPath Clear Close Copy
+syn keyword AspVBSMethods contained CopyFile CopyFolder CreateFolder CreateTextFile
+syn keyword AspVBSMethods contained Delete DeleteFile DeleteFolder DriveExists
+syn keyword AspVBSMethods contained Exists FileExists FolderExists
+syn keyword AspVBSMethods contained GetAbsolutePathName GetBaseName GetDrive
+syn keyword AspVBSMethods contained GetDriveName GetExtensionName GetFile
+syn keyword AspVBSMethods contained GetFileName GetFolder GetParentFolderName
+syn keyword AspVBSMethods contained GetSpecialFolder GetTempName Items Keys Move
+syn keyword AspVBSMethods contained MoveFile MoveFolder OpenAsTextStream
+syn keyword AspVBSMethods contained OpenTextFile Raise Read ReadAll ReadLine Remove
+syn keyword AspVBSMethods contained RemoveAll Skip SkipLine Write WriteBlankLines
+syn keyword AspVBSMethods contained WriteLine
+syn match AspVBSMethods contained "Response\.\w*"
+" Colorize boolean constants:
+syn keyword AspVBSMethods contained true false
+
+" AspVBScript Number Contstants
+" Integer number, or floating point number without a dot.
+syn match  AspVBSNumber	contained	"\<\d\+\>"
+" Floating point number, with dot
+syn match  AspVBSNumber	contained	"\<\d\+\.\d*\>"
+" Floating point number, starting with a dot
+syn match  AspVBSNumber	contained	"\.\d\+\>"
+
+" String and Character Contstants
+" removed (skip=+\\\\\|\\"+) because VB doesn't have backslash escaping in
+" strings (or does it?)
+syn region  AspVBSString	contained	  start=+"+  end=+"+ keepend
+
+" AspVBScript Comments
+syn region  AspVBSComment	contained start="^REM\s\|\sREM\s" end="$" contains=AspVBSTodo keepend
+syn region  AspVBSComment   contained start="^'\|\s'"   end="$" contains=AspVBSTodo keepend
+" misc. Commenting Stuff
+syn keyword AspVBSTodo contained	TODO FIXME
+
+" Cosmetic syntax errors commanly found in VB but not in AspVBScript
+" AspVBScript doesn't use line numbers
+syn region  AspVBSError	contained start="^\d" end="\s" keepend
+" AspVBScript also doesn't have type defining variables
+syn match   AspVBSError  contained "[a-zA-Z0-9_][\$&!#]"ms=s+1
+" Since 'a%' is a VB variable with a type and in AspVBScript you can have 'a%>'
+" I have to make a special case so 'a%>' won't show as an error.
+syn match   AspVBSError  contained "[a-zA-Z0-9_]%\($\|[^>]\)"ms=s+1
+
+" Top Cluster
+syn cluster AspVBScriptTop contains=AspVBSStatement,AspVBSFunction,AspVBSMethods,AspVBSNumber,AspVBSString,AspVBSComment,AspVBSError,AspVBSVariableSimple,AspVBSVariableComplex
+
+" Folding
+syn region AspVBSFold start="^\s*\(class\)\s\+.*$" end="^\s*end\s\+\(class\)\>.*$" fold contained transparent keepend
+syn region AspVBSFold start="^\s*\(private\|public\)\=\(\s\+default\)\=\s\+\(sub\|function\)\s\+.*$" end="^\s*end\s\+\(function\|sub\)\>.*$" fold contained transparent keepend
+
+" Define AspVBScript delimeters
+" <%= func("string_with_%>_in_it") %> This is illegal in ASP syntax.
+syn region  AspVBScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<%=\=+ end=+%>+ contains=@AspVBScriptTop, AspVBSFold
+syn region  AspVBScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<script\s\+language="\=vbscript"\=[^>]*\s\+runatserver[^>]*>+ end=+</script>+ contains=@AspVBScriptTop
+
+
+" Synchronization
+" syn sync match AspVBSSyncGroup grouphere AspVBScriptInsideHtmlTags "<%"
+" This is a kludge so the HTML will sync properly
+syn sync match htmlHighlight grouphere htmlTag "%>"
+
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+"hi def link AspVBScript		Special
+hi def link AspVBSLineNumber	Comment
+hi def link AspVBSNumber		Number
+hi def link AspVBSError		Error
+hi def link AspVBSStatement	Statement
+hi def link AspVBSString		String
+hi def link AspVBSComment		Comment
+hi def link AspVBSTodo		Todo
+hi def link AspVBSFunction		Identifier
+hi def link AspVBSMethods		PreProc
+hi def link AspVBSEvents		Special
+hi def link AspVBSTypeSpecifier	Type
+
+
+let b:current_syntax = "aspvbs"
+
+if main_syntax == 'aspvbs'
+  unlet main_syntax
+endif
+
+" vim: ts=8:sw=2:sts=0:noet
+
+endif
diff --git a/syntax/django.vim b/syntax/django.vim
new file mode 100644
index 000000000..b11caa981
--- /dev/null
+++ b/syntax/django.vim
@@ -0,0 +1,87 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
+
+" Vim syntax file
+" Language:	Django template
+" Maintainer:	Dave Hodder <dmh@dmh.org.uk>
+" Last Change:	2014 Jul 13
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax case match
+
+" Mark illegal characters
+syn match djangoError "%}\|}}\|#}"
+
+" Django template built-in tags and parameters
+" 'comment' doesn't appear here because it gets special treatment
+syn keyword djangoStatement contained autoescape csrf_token empty
+" FIXME ==, !=, <, >, <=, and >= should be djangoStatements:
+" syn keyword djangoStatement contained == != < > <= >=
+syn keyword djangoStatement contained and as block endblock by cycle debug else elif
+syn keyword djangoStatement contained extends filter endfilter firstof for
+syn keyword djangoStatement contained endfor if endif ifchanged endifchanged
+syn keyword djangoStatement contained ifequal endifequal ifnotequal
+syn keyword djangoStatement contained endifnotequal in include load not now or
+syn keyword djangoStatement contained parsed regroup reversed spaceless
+syn keyword djangoStatement contained endspaceless ssi templatetag openblock
+syn keyword djangoStatement contained closeblock openvariable closevariable
+syn keyword djangoStatement contained openbrace closebrace opencomment
+syn keyword djangoStatement contained closecomment widthratio url with endwith
+syn keyword djangoStatement contained get_current_language trans noop blocktrans
+syn keyword djangoStatement contained endblocktrans get_available_languages
+syn keyword djangoStatement contained get_current_language_bidi plural
+
+" Django templete built-in filters
+syn keyword djangoFilter contained add addslashes capfirst center cut date
+syn keyword djangoFilter contained default default_if_none dictsort
+syn keyword djangoFilter contained dictsortreversed divisibleby escape escapejs
+syn keyword djangoFilter contained filesizeformat first fix_ampersands
+syn keyword djangoFilter contained floatformat get_digit join last length length_is
+syn keyword djangoFilter contained linebreaks linebreaksbr linenumbers ljust
+syn keyword djangoFilter contained lower make_list phone2numeric pluralize
+syn keyword djangoFilter contained pprint random removetags rjust slice slugify
+syn keyword djangoFilter contained safe safeseq stringformat striptags
+syn keyword djangoFilter contained time timesince timeuntil title truncatechars
+syn keyword djangoFilter contained truncatewords truncatewords_html unordered_list upper urlencode
+syn keyword djangoFilter contained urlize urlizetrunc wordcount wordwrap yesno
+
+" Keywords to highlight within comments
+syn keyword djangoTodo contained TODO FIXME XXX
+
+" Django template constants (always surrounded by double quotes)
+syn region djangoArgument contained start=/"/ skip=/\\"/ end=/"/
+
+" Mark illegal characters within tag and variables blocks
+syn match djangoTagError contained "#}\|{{\|[^%]}}\|[&#]"
+syn match djangoVarError contained "#}\|{%\|%}\|[<>!&#%]"
+
+" Django template tag and variable blocks
+syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument,djangoTagError display
+syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument,djangoVarError display
+
+" Django template 'comment' tag and comment block
+syn region djangoComment start="{%\s*comment\(\s\+.\{-}\)\?%}" end="{%\s*endcomment\s*%}" contains=djangoTodo
+syn region djangoComBlock start="{#" end="#}" contains=djangoTodo
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link djangoTagBlock PreProc
+hi def link djangoVarBlock PreProc
+hi def link djangoStatement Statement
+hi def link djangoFilter Identifier
+hi def link djangoArgument Constant
+hi def link djangoTagError Error
+hi def link djangoVarError Error
+hi def link djangoError Error
+hi def link djangoComment Comment
+hi def link djangoComBlock Comment
+hi def link djangoTodo Todo
+
+
+let b:current_syntax = "django"
+
+endif
diff --git a/syntax/handlebars.vim b/syntax/handlebars.vim
new file mode 100644
index 000000000..52c2913ab
--- /dev/null
+++ b/syntax/handlebars.vim
@@ -0,0 +1,110 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
+
+" Mustache & Handlebars syntax
+" Language:	Mustache, Handlebars
+" Maintainer:	Juvenn Woo <machese@gmail.com>
+" Screenshot:   http://imgur.com/6F408
+" Version:	6
+" Last Change:  Jul 16 2019
+" Remark:
+"   It lexically hilights embedded mustaches (exclusively) in html file.
+"   While it was written for Ruby-based Mustache template system, it should
+"   work for Google's C-based *ctemplate* as well as Erlang-based *et*. All
+"   of them are, AFAIK, based on the idea of ctemplate.
+" References:
+"   [Mustache](http://github.com/defunkt/mustache)
+"   [Handlebars](https://github.com/wycats/handlebars.js)
+"   [ctemplate](http://code.google.com/p/google-ctemplate/)
+"   [ctemplate doc](http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html)
+"   [et](http://www.ivan.fomichev.name/2008/05/erlang-template-engine-prototype.html)
+" TODO: Feedback is welcomed.
+
+
+" Read the HTML syntax to start with
+if version < 600
+  so <sfile>:p:h/html.vim
+else
+  runtime! syntax/html.vim
+  unlet b:current_syntax
+endif
+
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+" Standard HiLink will not work with included syntax files
+if version < 508
+  command! -nargs=+ HtmlHiLink hi link <args>
+else
+  command! -nargs=+ HtmlHiLink hi def link <args>
+endif
+
+syntax match mustacheError '}}}\?'
+syntax match mustacheInsideError '{{[{$#<>=!\/]\?'
+
+" Ember angle bracket syntax syntax starts with a capital letter:
+" https://github.com/emberjs/rfcs/blob/master/text/0311-angle-bracket-invocation.md
+syntax case match
+syntax region mustacheAngleComponent start=/<\/\?[[:upper:]]/ end=/>/ keepend containedin=TOP,@htmlMustacheContainer
+syntax case ignore
+syntax match mustacheAngleBrackets '</\?\|/\?>' contained containedin=mustacheAngleComponent
+syntax match mustacheAngleComponentName '</[[:alnum:]]\+'hs=s+2 contained containedin=mustacheAngleBrackets
+syntax match mustacheAngleComponentName '<[[:alnum:]]\+'hs=s+1 contained containedin=mustacheAngleBrackets
+
+syntax region mustacheHbsComponent start=/{{[^!][$#^/]\?/ end=/}}}\?/ keepend containedin=TOP,@htmlMustacheContainer
+
+syntax cluster mustacheInside add=mustacheHbsComponent,mustacheAngleComponent
+
+syntax match mustacheOperators '=\|\.\|/^>' contained containedin=@mustacheInside,mustacheParam
+syntax region mustacheHtmlValue start=/={{[^!][$#^/]\?/rs=s+1,hs=s+1 end=/}}/ oneline keepend contained containedin=htmlTag contains=@mustacheInside
+syntax region mustachePartial start=/{{[<>]/lc=2 end=/}}/me=e-2 contained containedin=@mustacheInside,@htmlMustacheContainer
+syntax region mustacheMarkerSet start=/{{=/lc=2 end=/=}}/me=e-2 contained containedin=@mustacheInside,@htmlMustacheContainer
+syntax match mustacheHandlebars '{{\|}}' contained containedin=@mustacheInside
+syntax match mustacheUnescape '{{{\|}}}' contained containedin=@mustacheInside
+syntax match mustacheConditionals '\([/#]\?\<\(if\|unless\)\|\<else\)\>' contained containedin=@mustacheInside
+syntax match mustacheHelpers '[/#]\?\<\(with\|link\-to\|each\(\-in\)\?\|let\)\>' contained containedin=@mustacheInside
+syntax match mustacheHelpers 'else \(if\|unless\|with\|link\-to\|each\(\-in\)\?\)' contained containedin=@mustacheInside
+syntax match mustacheParam /[a-z@_-]\+=/he=e-1 contained containedin=@mustacheInside
+syntax region mustacheComment      start=/{{!/rs=s+2   skip=/{{.\{-}}}/ end=/}}/re=e-2   contains=Todo contained containedin=TOP,@mustacheInside,@htmlMustacheContainer
+syntax region mustacheBlockComment start=/{{!--/rs=s+2 skip=/{{.\{-}}}/ end=/--}}/re=e-2 contains=Todo contained extend containedin=TOP,@mustacheInside,@htmlMustacheContainer
+syntax region mustacheQString start=/'/ skip=/\\'/ end=/'/ contained containedin=@mustacheInside
+syntax region mustacheDQString start=/"/ skip=/\\"/ end=/"/ contained containedin=@mustacheInside
+
+" Clustering
+syntax cluster htmlMustacheContainer add=htmlHead,htmlTitle,htmlString,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,htmlLink,htmlBold,htmlUnderline,htmlItalic,htmlValue
+
+
+" Hilighting
+" mustacheInside hilighted as Number, which is rarely used in html
+" you might like change it to Function or Identifier
+HtmlHiLink mustacheVariable Number
+HtmlHiLink mustacheVariableUnescape Number
+HtmlHiLink mustachePartial Number
+HtmlHiLink mustacheMarkerSet Number
+HtmlHiLink mustacheParam htmlArg
+HtmlHiLink mustacheAngleComponentName htmlTag
+
+HtmlHiLink mustacheComment Comment
+HtmlHiLink mustacheBlockComment Comment
+HtmlHiLink mustacheError Error
+HtmlHiLink mustacheInsideError Error
+
+HtmlHiLink mustacheHandlebars Special
+HtmlHiLink mustacheAngleBrackets htmlTagName
+HtmlHiLink mustacheUnescape Identifier
+HtmlHiLink mustacheOperators Operator
+HtmlHiLink mustacheConditionals Conditional
+HtmlHiLink mustacheHelpers Repeat
+HtmlHiLink mustacheQString String
+HtmlHiLink mustacheDQString String
+
+syn region mustacheScriptTemplate start=+<script [^>]*type *=[^>]*text/\(mustache\|x-handlebars-template\)[^>]*>+
+\                       end=+</script>+me=s-1 keepend
+\                       contains=mustacheInside,@htmlMustacheContainer,htmlTag,htmlEndTag,htmlTagName,htmlSpecialChar
+
+let b:current_syntax = "handlebars"
+delcommand HtmlHiLink
+
+endif
diff --git a/syntax/html-1.vim b/syntax/html-1.vim
deleted file mode 100644
index 633a157e7..000000000
--- a/syntax/html-1.vim
+++ /dev/null
@@ -1,196 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-
-" Vim syntax file
-" Language:     HTML (version 5.1)
-"               SVG (SVG 1.1 Second Edition)
-"               MathML (MathML 3.0 Second Edition)
-" Last Change:  2017 Mar 07
-" License:      Public domain
-"               (but let me know if you like :) )
-"
-" Note: This file just add new tags from HTML 5
-"       and don't replace default html.vim syntax file
-"
-" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
-" Changes:      update to Draft 2016 Jan 13
-"               add microdata Attributes
-" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
-" URL:          http://rm.blog.br/vim/syntax/html.vim
-" Modified:     htdebeer <H.T.de.Beer@gmail.com>
-" Changes:      add common SVG elements and attributes for inline SVG
-
-" Patch 7.4.1142
-if has("patch-7.4-1142")
-  if has("win32")
-    syn iskeyword @,48-57,_,128-167,224-235,-
-  else
-    syn iskeyword @,48-57,_,192-255,-
-  endif
-endif
-
-" HTML 5 tags
-syn keyword htmlTagName contained article aside audio canvas command
-syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
-syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
-syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
-syn keyword htmlTagName contained template content shadow slot
-syn keyword htmlTagName contained wbr bdi
-syn keyword htmlTagName contained picture
-
-" SVG tags
-" http://www.w3.org/TR/SVG/
-" as found in http://www.w3.org/TR/SVG/eltindex.html
-syn keyword htmlTagName contained svg 
-syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
-syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
-syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
-syn keyword htmlTagName contained clipPath color-profile cursor 
-syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
-syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
-syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
-syn keyword htmlTagName contained glyph glyphRef hkern 
-syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
-syn keyword htmlTagName contained missing-glyph mpath 
-syn keyword htmlTagName contained text textPath tref tspan vkern
-syn keyword htmlTagName contained metadata title
-
-" MathML tags
-" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
-syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
-syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
-syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
-syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
-syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
-syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
-syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
-syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
-syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
-syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
-syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
-syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
-syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
-syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
-syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
-syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
-syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
-syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
-syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
-syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
-
-" Custom Element
-syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
-syn match htmlTagName contained "[.0-9_a-z]\@<=-[-.0-9_a-z]*\>"
-
-" HTML 5 arguments
-" Core Attributes
-syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
-syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
-" Event-handler Attributes
-syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
-syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
-syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
-syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
-syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
-syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
-syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
-syn keyword htmlArg contained onvolumechange onwaiting
-" XML Attributes
-syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
-" new features
-" <body>
-syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
-syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
-" <video>, <audio>, <source>, <track>
-syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
-" <form>, <input>, <button>
-syn keyword htmlArg contained form autocomplete autofocus list min max step
-syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
-syn keyword htmlArg contained required placeholder pattern
-" <command>, <details>, <time>
-syn keyword htmlArg contained label icon open datetime-local pubdate
-" <script>
-syn keyword htmlArg contained async
-" <content>
-syn keyword htmlArg contained select
-" <iframe>
-syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest allowpresentation
-" <picture>
-syn keyword htmlArg contained srcset sizes
-" <a>
-syn keyword htmlArg contained download media
-" <script>, <style>
-syn keyword htmlArg contained nonce
-" <area>, <a>, <img>, <iframe>, <link>
-syn keyword htmlArg contained referrerpolicy
-" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
-syn keyword htmlArg contained integrity crossorigin
-" <link>
-syn keyword htmlArg contained prefetch 
-" syn keyword htmlArg contained preload
-" <img>
-syn keyword htmlArg contained decoding
-" https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
-syn keyword htmlArg contained onselectstart onselectionchange
-" https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/loading
-syn keyword htmlArg contained loading
-
-" Custom Data Attributes
-" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
-syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
-
-" Vendor Extension Attributes
-" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
-syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
-
-" Microdata
-" http://dev.w3.org/html5/md/
-syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
-
-" SVG
-" http://www.w3.org/TR/SVG/
-" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
-syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
-syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
-syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
-syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
-syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
-syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
-syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
-syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
-syn keyword htmlArg contained id ideographic in in2 intercept 
-syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
-syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
-syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
-syn keyword htmlArg contained numOctaves 
-syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
-syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
-syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
-syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
-syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
-syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
-syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
-syn keyword htmlArg contained width widths 
-syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
-syn keyword htmlArg contained y y1 y2 yChannelSelector 
-syn keyword htmlArg contained z zoomAndPan 
-syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
-
-" MathML attributes
-" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
-syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
-syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
-syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
-syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
-syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
-syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
-syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
-syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
-syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
-syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
-syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
-syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
-syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
-syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
-
-
-endif
diff --git a/syntax/html-2.vim b/syntax/html-2.vim
deleted file mode 100644
index ddca92d4c..000000000
--- a/syntax/html-2.vim
+++ /dev/null
@@ -1,94 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
-
-" Vim syntax file
-" Language:	HTML (version 5)
-" Maintainer:	Rodrigo Machado <rcmachado@gmail.com>
-" URL:		http://rm.blog.br/vim/syntax/html.vim
-" Last Change:  2009 Aug 19
-" License:      Public domain
-"               (but let me know if you like :) )
-"
-" Note: This file just adds the new tags from HTML 5
-"       and don't replace default html.vim syntax file
-"
-" Modified:     othree <othree@gmail.com>
-" Changes:      update to Draft 28 August 2010
-"               add complete new attributes
-"               add wai-aria attributes
-"               add microdata attributes
-"               add rdfa attributes
-
-
-syn keyword htmlTagName contained script
-" HTML 5 tags
-syn keyword htmlTagName contained article aside audio canvas command
-syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
-syn keyword htmlTagName contained header hgroup keygen mark meter menu nav output
-syn keyword htmlTagName contained progress time ruby rt rp section source summary time track video wbr
-
-" HTML 5 arguments
-" Core Attributes
-syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
-syn keyword htmlArg contained draggable hidden id lang spellcheck style tabindex title
-" Event-handler Attributes
-syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange 
-syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
-syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
-syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
-syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
-syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
-syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
-syn keyword htmlArg contained onvolumechange onwaiting
-" XML Attributes
-syn keyword htmlArg contained xml:lang xml:space xml:base
-" new features
-" <body>
-syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
-syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
-" <video>, <audio>, <source>, <track>
-syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track
-" <form>, <input>, <button>
-syn keyword htmlArg contained form autocomplete autofocus list min max step
-syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
-" <command>, <details>, <time>
-syn keyword htmlArg contained label icon open datetime pubdate
-
-" Custom Data Attributes
-" http://dev.w3.org/html5/spec/Overview.html#custom-data-attribute
-syn match   htmlArg "\<\(data(\-[a-z]\+)\+\)=" contained
-
-" Microdata
-" http://dev.w3.org/html5/md/
-syn keyword htmlArg contained item itemid itemscope itemtype itemprop 
-
-" RDFa
-" http://www.w3.org/TR/rdfa-syntax/#a_xhtmlrdfa_dtd
-syn keyword htmlArg contained about typeof property resource content datatype rel rev 
-
-" WAI-ARIA States and Properties
-" http://www.w3.org/TR/wai-aria/states_and_properties
-syn keyword htmlArg contained role
-" Global States and Properties
-syn match  htmlArg contained "\<aria-\(atomic\|busy\|controls\|describedby\)\>"
-syn match  htmlArg contained "\<aria-\(disabled\|dropeffect\|flowto\|grabbed\)\>"
-syn match  htmlArg contained "\<aria-\(haspopup\|hidden\|invalid\|label\)\>"
-syn match  htmlArg contained "\<aria-\(labelledby\|live\|owns\|relevant\)\>"
-
-" Widget Attributes
-syn match  htmlArg contained "\<aria-\(autocomplete\|checked\|disabled\|expanded\)\>"
-syn match  htmlArg contained "\<aria-\(haspopup\|hidden\|invalid\|label\)\>"
-syn match  htmlArg contained "\<aria-\(level\|multiline\|multiselectable\|orientation\)\>"
-syn match  htmlArg contained "\<aria-\(pressed\|readonly\|required\|selected\)\>"
-syn match  htmlArg contained "\<aria-\(sort\|valuemax\|valuemin\|valuenow\|valuetext\|\)\>"
-
-" Live Region Attributes
-syn match  htmlArg contained "\<aria-\(atomic\|busy\|live\|relevant\|\)\>"
-
-" Drag-and-Drop attributes
-syn match  htmlArg contained "\<aria-\(dropeffect\|grabbed\)\>"
-
-" Relationship Attributes
-syn match  htmlArg contained "\<aria-\(activedescendant\|controls\|describedby\|flowto\|\)\>"
-syn match  htmlArg contained "\<aria-\(labelledby\|owns\|posinset\|setsize\|\)\>"
-
-endif
diff --git a/syntax/html.vim b/syntax/html.vim
index a21ec0746..633a157e7 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,3 +1,196 @@
-" Polyglot metafile
-source <sfile>:h/html-1.vim
-source <sfile>:h/html-2.vim
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+
+" Vim syntax file
+" Language:     HTML (version 5.1)
+"               SVG (SVG 1.1 Second Edition)
+"               MathML (MathML 3.0 Second Edition)
+" Last Change:  2017 Mar 07
+" License:      Public domain
+"               (but let me know if you like :) )
+"
+" Note: This file just add new tags from HTML 5
+"       and don't replace default html.vim syntax file
+"
+" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
+" Changes:      update to Draft 2016 Jan 13
+"               add microdata Attributes
+" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
+" URL:          http://rm.blog.br/vim/syntax/html.vim
+" Modified:     htdebeer <H.T.de.Beer@gmail.com>
+" Changes:      add common SVG elements and attributes for inline SVG
+
+" Patch 7.4.1142
+if has("patch-7.4-1142")
+  if has("win32")
+    syn iskeyword @,48-57,_,128-167,224-235,-
+  else
+    syn iskeyword @,48-57,_,192-255,-
+  endif
+endif
+
+" HTML 5 tags
+syn keyword htmlTagName contained article aside audio canvas command
+syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
+syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
+syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
+syn keyword htmlTagName contained template content shadow slot
+syn keyword htmlTagName contained wbr bdi
+syn keyword htmlTagName contained picture
+
+" SVG tags
+" http://www.w3.org/TR/SVG/
+" as found in http://www.w3.org/TR/SVG/eltindex.html
+syn keyword htmlTagName contained svg 
+syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
+syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
+syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
+syn keyword htmlTagName contained clipPath color-profile cursor 
+syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
+syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
+syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
+syn keyword htmlTagName contained glyph glyphRef hkern 
+syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
+syn keyword htmlTagName contained missing-glyph mpath 
+syn keyword htmlTagName contained text textPath tref tspan vkern
+syn keyword htmlTagName contained metadata title
+
+" MathML tags
+" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
+syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
+syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
+syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
+syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
+syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
+syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
+syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
+syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
+syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
+syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
+syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
+syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
+syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
+syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
+syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
+syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
+syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
+syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
+syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
+syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
+
+" Custom Element
+syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
+syn match htmlTagName contained "[.0-9_a-z]\@<=-[-.0-9_a-z]*\>"
+
+" HTML 5 arguments
+" Core Attributes
+syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
+syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
+" Event-handler Attributes
+syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
+syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
+syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
+syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
+syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
+syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
+syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
+syn keyword htmlArg contained onvolumechange onwaiting
+" XML Attributes
+syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
+" new features
+" <body>
+syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
+syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
+" <video>, <audio>, <source>, <track>
+syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
+" <form>, <input>, <button>
+syn keyword htmlArg contained form autocomplete autofocus list min max step
+syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
+syn keyword htmlArg contained required placeholder pattern
+" <command>, <details>, <time>
+syn keyword htmlArg contained label icon open datetime-local pubdate
+" <script>
+syn keyword htmlArg contained async
+" <content>
+syn keyword htmlArg contained select
+" <iframe>
+syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest allowpresentation
+" <picture>
+syn keyword htmlArg contained srcset sizes
+" <a>
+syn keyword htmlArg contained download media
+" <script>, <style>
+syn keyword htmlArg contained nonce
+" <area>, <a>, <img>, <iframe>, <link>
+syn keyword htmlArg contained referrerpolicy
+" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
+syn keyword htmlArg contained integrity crossorigin
+" <link>
+syn keyword htmlArg contained prefetch 
+" syn keyword htmlArg contained preload
+" <img>
+syn keyword htmlArg contained decoding
+" https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
+syn keyword htmlArg contained onselectstart onselectionchange
+" https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/loading
+syn keyword htmlArg contained loading
+
+" Custom Data Attributes
+" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
+syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Vendor Extension Attributes
+" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
+syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Microdata
+" http://dev.w3.org/html5/md/
+syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
+
+" SVG
+" http://www.w3.org/TR/SVG/
+" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
+syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
+syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
+syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
+syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
+syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
+syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
+syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
+syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
+syn keyword htmlArg contained id ideographic in in2 intercept 
+syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
+syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
+syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
+syn keyword htmlArg contained numOctaves 
+syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
+syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
+syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
+syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
+syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
+syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
+syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
+syn keyword htmlArg contained width widths 
+syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
+syn keyword htmlArg contained y y1 y2 yChannelSelector 
+syn keyword htmlArg contained z zoomAndPan 
+syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
+
+" MathML attributes
+" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
+syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
+syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
+syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
+syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
+syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
+syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
+syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
+syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
+syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
+syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
+syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
+syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
+syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
+syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
+
+
+endif
diff --git a/syntax/htmldjango.vim b/syntax/htmldjango.vim
new file mode 100644
index 000000000..0e2c329d7
--- /dev/null
+++ b/syntax/htmldjango.vim
@@ -0,0 +1,30 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
+
+" Vim syntax file
+" Language:	Django HTML template
+" Maintainer:	Dave Hodder <dmh@dmh.org.uk>
+" Last Change:	2014 Jul 13
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'html'
+endif
+
+runtime! syntax/django.vim
+runtime! syntax/html.vim
+unlet b:current_syntax
+
+syn cluster djangoBlocks add=djangoTagBlock,djangoVarBlock,djangoComment,djangoComBlock
+
+syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument,djangoTagError display containedin=ALLBUT,@djangoBlocks
+syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument,djangoVarError display containedin=ALLBUT,@djangoBlocks
+syn region djangoComment start="{%\s*comment\(\s\+.\{-}\)\?%}" end="{%\s*endcomment\s*%}" contains=djangoTodo containedin=ALLBUT,@djangoBlocks
+syn region djangoComBlock start="{#" end="#}" contains=djangoTodo containedin=ALLBUT,@djangoBlocks
+
+let b:current_syntax = "htmldjango"
+
+endif
diff --git a/syntax/jinja.vim b/syntax/jinja.vim
deleted file mode 100644
index 5f2402b63..000000000
--- a/syntax/jinja.vim
+++ /dev/null
@@ -1,90 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
-
-" jinja syntax file
-" Language: Jinja HTML template
-" Maintainer: Hsiaoming Yang <lepture@me.com>
-" Last Change: Sep 13, 2012
-
-" only support 6.x+
-
-if exists("b:current_syntax")
-  finish
-endif
-
-if !exists("main_syntax")
-  let main_syntax = 'html'
-endif
-
-runtime! syntax/html.vim
-unlet b:current_syntax
-
-syntax case match
-
-" jinja template built-in tags and parameters
-" 'comment' doesn't appear here because it gets special treatment
-syn keyword jinjaStatement contained if else elif endif is not
-syn keyword jinjaStatement contained for in recursive endfor
-syn keyword jinjaStatement contained raw endraw
-syn keyword jinjaStatement contained block endblock extends super scoped
-syn keyword jinjaStatement contained macro endmacro call endcall
-syn keyword jinjaStatement contained from import as do continue break
-syn keyword jinjaStatement contained filter endfilter set
-syn keyword jinjaStatement contained include ignore missing
-syn keyword jinjaStatement contained with without context endwith
-syn keyword jinjaStatement contained trans endtrans pluralize
-syn keyword jinjaStatement contained autoescape endautoescape
-
-" jinja templete built-in filters
-syn keyword jinjaFilter contained abs attr batch capitalize center default
-syn keyword jinjaFilter contained dictsort escape filesizeformat first
-syn keyword jinjaFilter contained float forceescape format groupby indent
-syn keyword jinjaFilter contained int join last length list lower pprint
-syn keyword jinjaFilter contained random replace reverse round safe slice
-syn keyword jinjaFilter contained sort string striptags sum
-syn keyword jinjaFilter contained title trim truncate upper urlize
-syn keyword jinjaFilter contained wordcount wordwrap
-
-" jinja template built-in tests
-syn keyword jinjaTest contained callable defined divisibleby escaped
-syn keyword jinjaTest contained even iterable lower mapping none number
-syn keyword jinjaTest contained odd sameas sequence string undefined upper
-
-syn keyword jinjaFunction contained range lipsum dict cycler joiner
-
-
-" Keywords to highlight within comments
-syn keyword jinjaTodo contained TODO FIXME XXX
-
-" jinja template constants (always surrounded by double quotes)
-syn region jinjaArgument contained start=/"/ skip=/\\"/ end=/"/
-syn region jinjaArgument contained start=/'/ skip=/\\'/ end=/'/
-syn keyword jinjaArgument contained true false
-
-" Mark illegal characters within tag and variables blocks
-syn match jinjaTagError contained "#}\|{{\|[^%]}}\|[&#]"
-syn match jinjaVarError contained "#}\|{%\|%}\|[<>!&#%]"
-syn cluster jinjaBlocks add=jinjaTagBlock,jinjaVarBlock,jinjaComBlock,jinjaComment
-
-" jinja template tag and variable blocks
-syn region jinjaTagBlock start="{%" end="%}" contains=jinjaStatement,jinjaFilter,jinjaArgument,jinjaFilter,jinjaTest,jinjaTagError display containedin=ALLBUT,@jinjaBlocks
-syn region jinjaVarBlock start="{{" end="}}" contains=jinjaFilter,jinjaArgument,jinjaVarError display containedin=ALLBUT,@jinjaBlocks
-syn region jinjaComBlock start="{#" end="#}" contains=jinjaTodo containedin=ALLBUT,@jinjaBlocks
-
-
-hi def link jinjaTagBlock PreProc
-hi def link jinjaVarBlock PreProc
-hi def link jinjaStatement Statement
-hi def link jinjaFunction Function
-hi def link jinjaTest Type
-hi def link jinjaFilter Identifier
-hi def link jinjaArgument Constant
-hi def link jinjaTagError Error
-hi def link jinjaVarError Error
-hi def link jinjaError Error
-hi def link jinjaComment Comment
-hi def link jinjaComBlock Comment
-hi def link jinjaTodo Todo
-
-let b:current_syntax = "jinja"
-
-endif
diff --git a/syntax/mustache.vim b/syntax/mustache.vim
index f6730e1ff..36a4ba271 100644
--- a/syntax/mustache.vim
+++ b/syntax/mustache.vim
@@ -1,110 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
-" Mustache & Handlebars syntax
-" Language:	Mustache, Handlebars
-" Maintainer:	Juvenn Woo <machese@gmail.com>
-" Screenshot:   http://imgur.com/6F408
-" Version:	6
-" Last Change:  Jul 16 2019
-" Remark:
-"   It lexically hilights embedded mustaches (exclusively) in html file.
-"   While it was written for Ruby-based Mustache template system, it should
-"   work for Google's C-based *ctemplate* as well as Erlang-based *et*. All
-"   of them are, AFAIK, based on the idea of ctemplate.
-" References:
-"   [Mustache](http://github.com/defunkt/mustache)
-"   [Handlebars](https://github.com/wycats/handlebars.js)
-"   [ctemplate](http://code.google.com/p/google-ctemplate/)
-"   [ctemplate doc](http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html)
-"   [et](http://www.ivan.fomichev.name/2008/05/erlang-template-engine-prototype.html)
-" TODO: Feedback is welcomed.
-
-
-" Read the HTML syntax to start with
-if version < 600
-  so <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-endif
-
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-" Standard HiLink will not work with included syntax files
-if version < 508
-  command! -nargs=+ HtmlHiLink hi link <args>
-else
-  command! -nargs=+ HtmlHiLink hi def link <args>
-endif
-
-syntax match mustacheError '}}}\?'
-syntax match mustacheInsideError '{{[{$#<>=!\/]\?'
-
-" Ember angle bracket syntax syntax starts with a capital letter:
-" https://github.com/emberjs/rfcs/blob/master/text/0311-angle-bracket-invocation.md
-syntax case match
-syntax region mustacheAngleComponent start=/<\/\?[[:upper:]]/ end=/>/ keepend containedin=TOP,@htmlMustacheContainer
-syntax case ignore
-syntax match mustacheAngleBrackets '</\?\|/\?>' contained containedin=mustacheAngleComponent
-syntax match mustacheAngleComponentName '</[[:alnum:]]\+'hs=s+2 contained containedin=mustacheAngleBrackets
-syntax match mustacheAngleComponentName '<[[:alnum:]]\+'hs=s+1 contained containedin=mustacheAngleBrackets
-
-syntax region mustacheHbsComponent start=/{{[^!][$#^/]\?/ end=/}}}\?/ keepend containedin=TOP,@htmlMustacheContainer
-
-syntax cluster mustacheInside add=mustacheHbsComponent,mustacheAngleComponent
-
-syntax match mustacheOperators '=\|\.\|/^>' contained containedin=@mustacheInside,mustacheParam
-syntax region mustacheHtmlValue start=/={{[^!][$#^/]\?/rs=s+1,hs=s+1 end=/}}/ oneline keepend contained containedin=htmlTag contains=@mustacheInside
-syntax region mustachePartial start=/{{[<>]/lc=2 end=/}}/me=e-2 contained containedin=@mustacheInside,@htmlMustacheContainer
-syntax region mustacheMarkerSet start=/{{=/lc=2 end=/=}}/me=e-2 contained containedin=@mustacheInside,@htmlMustacheContainer
-syntax match mustacheHandlebars '{{\|}}' contained containedin=@mustacheInside
-syntax match mustacheUnescape '{{{\|}}}' contained containedin=@mustacheInside
-syntax match mustacheConditionals '\([/#]\?\<\(if\|unless\)\|\<else\)\>' contained containedin=@mustacheInside
-syntax match mustacheHelpers '[/#]\?\<\(with\|link\-to\|each\(\-in\)\?\|let\)\>' contained containedin=@mustacheInside
-syntax match mustacheHelpers 'else \(if\|unless\|with\|link\-to\|each\(\-in\)\?\)' contained containedin=@mustacheInside
-syntax match mustacheParam /[a-z@_-]\+=/he=e-1 contained containedin=@mustacheInside
-syntax region mustacheComment      start=/{{!/rs=s+2   skip=/{{.\{-}}}/ end=/}}/re=e-2   contains=Todo contained containedin=TOP,@mustacheInside,@htmlMustacheContainer
-syntax region mustacheBlockComment start=/{{!--/rs=s+2 skip=/{{.\{-}}}/ end=/--}}/re=e-2 contains=Todo contained extend containedin=TOP,@mustacheInside,@htmlMustacheContainer
-syntax region mustacheQString start=/'/ skip=/\\'/ end=/'/ contained containedin=@mustacheInside
-syntax region mustacheDQString start=/"/ skip=/\\"/ end=/"/ contained containedin=@mustacheInside
-
-" Clustering
-syntax cluster htmlMustacheContainer add=htmlHead,htmlTitle,htmlString,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,htmlLink,htmlBold,htmlUnderline,htmlItalic,htmlValue
-
-
-" Hilighting
-" mustacheInside hilighted as Number, which is rarely used in html
-" you might like change it to Function or Identifier
-HtmlHiLink mustacheVariable Number
-HtmlHiLink mustacheVariableUnescape Number
-HtmlHiLink mustachePartial Number
-HtmlHiLink mustacheMarkerSet Number
-HtmlHiLink mustacheParam htmlArg
-HtmlHiLink mustacheAngleComponentName htmlTag
-
-HtmlHiLink mustacheComment Comment
-HtmlHiLink mustacheBlockComment Comment
-HtmlHiLink mustacheError Error
-HtmlHiLink mustacheInsideError Error
-
-HtmlHiLink mustacheHandlebars Special
-HtmlHiLink mustacheAngleBrackets htmlTagName
-HtmlHiLink mustacheUnescape Identifier
-HtmlHiLink mustacheOperators Operator
-HtmlHiLink mustacheConditionals Conditional
-HtmlHiLink mustacheHelpers Repeat
-HtmlHiLink mustacheQString String
-HtmlHiLink mustacheDQString String
-
-syn region mustacheScriptTemplate start=+<script [^>]*type *=[^>]*text/\(mustache\|x-handlebars-template\)[^>]*>+
-\                       end=+</script>+me=s-1 keepend
-\                       contains=mustacheInside,@htmlMustacheContainer,htmlTag,htmlEndTag,htmlTagName,htmlSpecialChar
-
-let b:current_syntax = "mustache"
-delcommand HtmlHiLink
+runtime! syntax/handlebars.vim
 
 endif
diff --git a/tests/extensions.vim b/tests/extensions.vim
index d6f634075..ca42edbb6 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -201,6 +201,13 @@ call TestExtension("cpp", "foobar.moc", "")
 call TestExtension("cpp", "foobar.tcc", "")
 call TestExtension("cpp", "foobar.inl", "")
 
+" Django
+
+call TestExtension("htmldjango", "foobar.j2", "")
+call TestExtension("htmldjango", "foobar.jinja", "")
+call TestExtension("htmldjango", "foobar.jinja2", "")
+call TestExtension("htmldjango", "foobar.njk", "")
+
 " vim-polyglot only
 call TestExtension("blade", "test.blade.php", "")
 call TestExtension("yaml.ansible", "playbook.yml", "")
@@ -356,8 +363,8 @@ call TestExtension("tt2html", "html.tt2", "<html>")
 call TestExtension("html", "empty.html", "")
 call TestExtension("mason", "mason1.html", "% my $planet = 42;")
 call TestExtension("mason", "mason2.html", "<%filter></%filter>")
-call TestExtension("jinja.html", "jinja1.html", "{{ item.href }}")
-call TestExtension("jinja.html", "jinja2.html", "{% for item in navigation %}{% endfor %}")
-call TestExtension("jinja.html", "jinja3.html", "{% block head %}")
-call TestExtension("jinja.html", "jinja4.html", "{# some comment #}")
+call TestExtension("htmldjango", "jinja1.html", "{{ item.href }}")
+call TestExtension("htmldjango", "jinja2.html", "{% for item in navigation %}{% endfor %}")
+call TestExtension("htmldjango", "jinja3.html", "{% block head %}")
+call TestExtension("htmldjango", "jinja4.html", "{# some comment #}")
 call TestExtension("xhtml", "xhtml.html", "<DTD   XHTML ")
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 3128a730e..8d0770728 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -95,7 +95,8 @@ call TestFiletype('graphql')
 call TestFiletype('groovy')
 call TestFiletype('grub')
 call TestFiletype('haml')
-call TestFiletype('mustache')
+call TestFiletype('html.mustache')
+call TestFiletype('html.handlebars')
 call TestFiletype('haskell')
 call TestFiletype('haxe')
 call TestFiletype('hcl')
@@ -108,7 +109,7 @@ call TestFiletype('idris2')
 call TestFiletype('lidris2')
 call TestFiletype('ion')
 call TestFiletype('Jenkinsfile')
-call TestFiletype('jinja.html')
+call TestFiletype('htmldjango')
 call TestFiletype('jq')
 call TestFiletype('json5')
 call TestFiletype('json')

From 9ff714cb6c43b920fd76ff793641c5191bf2e991 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 24 Sep 2020 18:52:58 +0200
Subject: [PATCH 066/299] Extract non-generated code to polyglot.vim

---
 Makefile              |   2 +-
 autoload/polyglot.vim | 412 +++++++++++++++++++++++++++++++++++++-----
 ftdetect/polyglot.vim |  33 +---
 heuristics.yaml       |   1 +
 polyglot.vim          | 378 ++++++++++++++++++++++++++++++++++++++
 scripts/build         |  83 ++-------
 6 files changed, 767 insertions(+), 142 deletions(-)
 create mode 100644 polyglot.vim

diff --git a/Makefile b/Makefile
index fd5b5d84d..cc1851b0e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ test:
 	@ scripts/test
 
 dev:
-	@ echo "packages.yaml\nheuristics.yaml\nscripts/test\nscripts/build\ntests/extensions.vim" | DEV=1 entr bash -c 'make && make test'
+	@ echo "polyglot.vim\npackages.yaml\nheuristics.yaml\nscripts/test\nscripts/build\ntests/extensions.vim" | DEV=1 entr bash -c 'make && make test'
diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index 97a837521..ee03e9890 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -1,16 +1,70 @@
+""" autoload/polyglot.vim
+
 " Line continuation is used here, remove 'C' from 'cpoptions'
 let s:cpo_save = &cpo
 set cpo&vim
 
+func! polyglot#ObserveShebang()
+  augroup polyglot-observer
+    au! CursorHold,CursorHoldI,BufWritePost <buffer>
+      \ if polyglot#Shebang() | au! polyglot-observer CursorHold,CursorHoldI,BufWritePost | endif
+  augroup END
+endfunc
+
 func! polyglot#Shebang()
-  " Try to detect filetype from shebang
-  let ft = polyglot#ShebangFiletype()
-  if ft != ""
-    let &ft = ft
-    return 1
+  if getline(1) =~# "^#!"
+    let ft = polyglot#ShebangFiletype()
+    if ft != ""
+      let &ft = ft
+    endif
+  endif
+
+  if &ft == ""
+    runtime! scripts.vim
   endif
 
-  return 0
+  return &ft != ""
+endfunc
+
+let s:r_hashbang = '^#!\s*\(\S\+\)\s*\(.*\)\s*'
+let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
+let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
+
+func! polyglot#ShebangFiletype()
+  let l:line1 = getline(1)
+
+  if l:line1 !~# "^#!"
+    return
+  endif
+
+  let l:pathrest = matchlist(l:line1, s:r_hashbang)
+
+  if len(l:pathrest) == 0
+    return
+  endif
+
+  let [_, l:path, l:rest; __] = l:pathrest
+
+  let l:script = split(l:path, "/")[-1]
+
+  if l:script == "env"
+    let l:argspath = matchlist(l:rest, s:r_env)
+    if len(l:argspath) == 0
+      return
+    endif
+
+    let l:script = l:argspath[1]
+  endif
+
+  if has_key(s:interpreters, l:script)
+    return s:interpreters[l:script]
+  endif
+
+  for interpreter in keys(s:interpreters)
+    if l:script =~# '^' . interpreter
+      return s:interpreters[interpreter]
+    endif
+  endfor
 endfunc
 
 let s:interpreters = {
@@ -83,48 +137,7 @@ let s:interpreters = {
   \ 'z3': 'smt2',
   \ 'deno': 'typescript',
   \ 'ts-node': 'typescript',
-  \ }
-
-let s:r_hashbang = '^#!\s*\(\S\+\)\s*\(.*\)\s*'
-let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
-let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
-
-func! polyglot#ShebangFiletype()
-  let l:line1 = getline(1)
-
-  if l:line1 !~# "^#!"
-    return
-  endif
-
-  let l:pathrest = matchlist(l:line1, s:r_hashbang)
-
-  if len(l:pathrest) == 0
-    return 
-  endif
-
-  let [_, l:path, l:rest; __] = l:pathrest
-
-  let l:script = split(l:path, "/")[-1]
-
-  if l:script == "env"
-    let l:argspath = matchlist(l:rest, s:r_env)
-    if len(l:argspath) == 0
-      return
-    endif
-
-    let l:script = l:argspath[1]
-  endif
-
-  if has_key(s:interpreters, l:script)
-    return s:interpreters[l:script]
-  endif
-
-  for interpreter in keys(s:interpreters)
-    if l:script =~# '^' . interpreter
-      return s:interpreters[interpreter]
-    endif
-  endfor
-endfunc
+\ }
 
 func! polyglot#DetectInpFiletype()
   let line = getline(nextnonblank(1))
@@ -382,6 +395,309 @@ func! polyglot#DetectHtmlFiletype()
   set ft=html | return
 endfunc
 
+
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
 unlet s:cpo_save
+
+""" ftdetect/polyglot.vim
+
+" don't spam the user when Vim is started in Vi compatibility mode
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Disable all native vim ftdetect
+if exists('g:polyglot_test')
+  autocmd!
+endif
+
+let s:disabled_packages = {}
+let s:new_polyglot_disabled = []
+
+if exists('g:polyglot_disabled')
+  for pkg in g:polyglot_disabled
+    let base = split(pkg, '\.')
+    if len(base) > 0
+      let s:disabled_packages[pkg] = 1
+      call add(s:new_polyglot_disabled, base[0]) 
+    endif
+  endfor
+else
+  let g:polyglot_disabled_not_set = 1
+endif
+
+function! s:SetDefault(name, value)
+  if !exists(a:name)
+    let {a:name} = a:value
+  endif
+endfunction
+
+call s:SetDefault('g:markdown_enable_spell_checking', 0)
+call s:SetDefault('g:markdown_enable_input_abbreviations', 0)
+call s:SetDefault('g:markdown_enable_mappings', 0)
+
+" Enable jsx syntax by default
+call s:SetDefault('g:jsx_ext_required', 0)
+
+" Needed for sql highlighting
+call s:SetDefault('g:javascript_sql_dialect', 'sql')
+
+" Make csv loading faster
+call s:SetDefault('g:csv_start', 1)
+call s:SetDefault('g:csv_end', 2)
+
+" Disable json concealing by default
+call s:SetDefault('g:vim_json_syntax_conceal', 0)
+
+call s:SetDefault('g:filetype_euphoria', 'elixir')
+
+if !exists('g:python_highlight_all')
+  call s:SetDefault('g:python_highlight_builtins', 1)
+  call s:SetDefault('g:python_highlight_builtin_objs', 1)
+  call s:SetDefault('g:python_highlight_builtin_types', 1)
+  call s:SetDefault('g:python_highlight_builtin_funcs', 1)
+  call s:SetDefault('g:python_highlight_builtin_funcs_kwarg', 1)
+  call s:SetDefault('g:python_highlight_exceptions', 1)
+  call s:SetDefault('g:python_highlight_string_formatting', 1)
+  call s:SetDefault('g:python_highlight_string_format', 1)
+  call s:SetDefault('g:python_highlight_string_templates', 1)
+  call s:SetDefault('g:python_highlight_indent_errors', 1)
+  call s:SetDefault('g:python_highlight_space_errors', 1)
+  call s:SetDefault('g:python_highlight_doctests', 1)
+  call s:SetDefault('g:python_highlight_func_calls', 1)
+  call s:SetDefault('g:python_highlight_class_vars', 1)
+  call s:SetDefault('g:python_highlight_operators', 1)
+  call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
+  call s:SetDefault('g:python_slow_sync', 1)
+endif
+
+" We need it because scripts.vim in vim uses "set ft=" which cannot be
+" overridden with setf (and we can't use set ft= so our scripts.vim work)
+func! s:Setf(ft)
+  if &filetype !~# '\<'.a:ft.'\>'
+    let &filetype = a:ft
+  endif
+endfunc
+
+" Function used for patterns that end in a star: don't set the filetype if the
+" file name matches ft_ignore_pat.
+" When using this, the entry should probably be further down below with the
+" other StarSetf() calls.
+func! s:StarSetf(ft)
+  if expand("<amatch>") !~ g:ft_ignore_pat && &filetype !~# '\<'.a:ft.'\>'
+    let &filetype = a:ft
+  endif
+endfunc
+
+augroup filetypedetect
+
+" scripts/build inserts here filetype detection autocommands
+
+au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
+  \ call polyglot#Shebang() | endif
+
+au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
+      \ call polyglot#ObserveShebang() | endif
+
+augroup END
+
+if !has_key(s:disabled_packages, 'autoindent')
+  " Code below re-implements sleuth for vim-polyglot
+  let g:loaded_sleuth = 1
+  let g:loaded_foobar = 1
+
+  " Makes shiftwidth to be synchronized with tabstop by default
+  if &shiftwidth == &tabstop
+    let &shiftwidth = 0
+  endif
+
+  function! s:guess(lines) abort
+    let options = {}
+    let ccomment = 0
+    let podcomment = 0
+    let triplequote = 0
+    let backtick = 0
+    let xmlcomment = 0
+    let heredoc = ''
+    let minindent = 10
+    let spaces_minus_tabs = 0
+    let i = 0
+
+    for line in a:lines
+      let i += 1
+
+      if !len(line) || line =~# '^\W*$'
+        continue
+      endif
+
+      if line =~# '^\s*/\*'
+        let ccomment = 1
+      endif
+      if ccomment
+        if line =~# '\*/'
+          let ccomment = 0
+        endif
+        continue
+      endif
+
+      if line =~# '^=\w'
+        let podcomment = 1
+      endif
+      if podcomment
+        if line =~# '^=\%(end\|cut\)\>'
+          let podcomment = 0
+        endif
+        continue
+      endif
+
+      if triplequote
+        if line =~# '^[^"]*"""[^"]*$'
+          let triplequote = 0
+        endif
+        continue
+      elseif line =~# '^[^"]*"""[^"]*$'
+        let triplequote = 1
+      endif
+
+      if backtick
+        if line =~# '^[^`]*`[^`]*$'
+          let backtick = 0
+        endif
+        continue
+      elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
+        let backtick = 1
+      endif
+
+      if line =~# '^\s*<\!--'
+        let xmlcomment = 1
+      endif
+      if xmlcomment
+        if line =~# '-->'
+          let xmlcomment = 0
+        endif
+        continue
+      endif
+
+      " This is correct order because both "<<EOF" and "EOF" matches end
+      if heredoc != ''
+        if line =~# heredoc
+          let heredoc = ''
+        endif
+        continue
+      endif
+      let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
+      if len(herematch) > 0
+        let heredoc = herematch[1] . '$'
+      endif
+
+      let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
+
+      if line[0] == "\t"
+        setlocal noexpandtab
+        let &shiftwidth=&tabstop
+        let b:sleuth_culprit .= ':' . i
+        return 1
+      elseif line[0] == " "
+        let indent = len(matchstr(line, '^ *'))
+        if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
+          let minindent = indent
+        endif
+      endif
+    endfor
+
+    if minindent < 10
+      setlocal expandtab
+      let &shiftwidth=minindent
+      let b:sleuth_culprit .= ':' . i
+      return 1
+    endif
+
+    return 0
+  endfunction
+
+  function! s:detect_indent() abort
+    if &buftype ==# 'help'
+      return
+    endif
+
+    let b:sleuth_culprit = expand("<afile>:p")
+    if s:guess(getline(1, 32))
+      return
+    endif
+    let pattern = sleuth#GlobForFiletype(&filetype)
+    if len(pattern) == 0
+      return
+    endif
+    let pattern = '{' . pattern . ',.git,.svn,.hg}'
+    let dir = expand('%:p:h')
+    let level = 3
+    while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
+      " Ignore files from homedir and root 
+      if dir == expand('~') || dir == '/'
+        unlet b:sleuth_culprit
+        return
+      endif
+      for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
+        let b:sleuth_culprit = neighbor
+        " Do not consider directories above .git, .svn or .hg
+        if fnamemodify(neighbor, ":h:t")[0] == "."
+          let level = 0
+          continue
+        endif
+        if neighbor !=# expand('%:p') && filereadable(neighbor)
+          if s:guess(readfile(neighbor, '', 32))
+            return
+          endif
+        endif
+      endfor
+
+      let dir = fnamemodify(dir, ':h')
+      let level -= 1
+    endwhile
+
+    unlet b:sleuth_culprit
+  endfunction
+
+  setglobal smarttab
+
+  function! SleuthIndicator() abort
+    let sw = &shiftwidth ? &shiftwidth : &tabstop
+    if &expandtab
+      return 'sw='.sw
+    elseif &tabstop == sw
+      return 'ts='.&tabstop
+    else
+      return 'sw='.sw.',ts='.&tabstop
+    endif
+  endfunction
+
+  augroup polyglot-sleuth
+    au!
+    au FileType * call s:detect_indent()
+    au User Flags call Hoist('buffer', 5, 'SleuthIndicator')
+  augroup END
+
+  command! -bar -bang Sleuth call s:detect_indent()
+endif
+
+func! s:verify()
+  if exists("g:polyglot_disabled_not_set")
+    if exists("g:polyglot_disabled")
+      echohl WarningMsg
+      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
+      echohl None
+    endif
+
+    unlet g:polyglot_disabled_not_set
+  endif
+endfunc
+
+au VimEnter * call s:verify()
+
+" Save polyglot_disabled without postfixes
+if exists('g:polyglot_disabled')
+  let g:polyglot_disabled = s:new_polyglot_disabled
+endif
+
+" restore Vi compatibility settings
+let &cpo = s:cpo_save
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index d6379ae20..cba8cf861 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1,3 +1,5 @@
+""" ftdetect/polyglot.vim
+
 " don't spam the user when Vim is started in Vi compatibility mode
 let s:cpo_save = &cpo
 set cpo&vim
@@ -87,9 +89,6 @@ endfunc
 
 augroup filetypedetect
 
-au! filetypedetect BufRead,BufNewFile,StdinReadPost *
-
-" filetypes
 
 if !has_key(s:disabled_packages, '8th')
   au! BufRead,BufNewFile *.8th
@@ -2017,20 +2016,12 @@ if !has_key(s:disabled_packages, 'tads')
 endif
 
 
-" end filetypes
 
-func! s:PolyglotFallback() 
-  if expand("<afile>") !~ g:ft_ignore_pat
-    if getline(1) =~# "^#!"
-      call polyglot#Shebang()
-    endif
-    if &filetype == ''
-      runtime! scripts.vim
-    endif
-  endif
-endfunc
+au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
+  \ call polyglot#Shebang() | endif
 
-au BufNewFile,BufRead,StdinReadPost * call s:PolyglotFallback()
+au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
+      \ call polyglot#ObserveShebang() | endif
 
 augroup END
 
@@ -2227,17 +2218,6 @@ endfunc
 
 au VimEnter * call s:verify()
 
-func! s:observe_filetype()
-  augroup polyglot-observer
-    au! CursorHold,CursorHoldI <buffer>
-      \ if polyglot#Shebang() | au! polyglot-observer CursorHold,CursorHoldI | endif
-  augroup END
-endfunc
-
-au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat
-      \ | call s:observe_filetype() | endif
-
-
 " Save polyglot_disabled without postfixes
 if exists('g:polyglot_disabled')
   let g:polyglot_disabled = s:new_polyglot_disabled
@@ -2245,4 +2225,3 @@ endif
 
 " restore Vi compatibility settings
 let &cpo = s:cpo_save
-unlet s:cpo_save
diff --git a/heuristics.yaml b/heuristics.yaml
index c53a704cc..ee1b21aff 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -69,6 +69,7 @@ rules:
     filetype: glsl
 - override: true
 - filetype: forth
+  fallback: true
 ---
 extensions: [re]
 rules:
diff --git a/polyglot.vim b/polyglot.vim
new file mode 100644
index 000000000..9199a207b
--- /dev/null
+++ b/polyglot.vim
@@ -0,0 +1,378 @@
+""" autoload/polyglot.vim
+
+" Line continuation is used here, remove 'C' from 'cpoptions'
+let s:cpo_save = &cpo
+set cpo&vim
+
+func! polyglot#ObserveShebang()
+  augroup polyglot-observer
+    au! CursorHold,CursorHoldI,BufWritePost <buffer>
+      \ if polyglot#Shebang() | au! polyglot-observer CursorHold,CursorHoldI,BufWritePost | endif
+  augroup END
+endfunc
+
+func! polyglot#Shebang()
+  if getline(1) =~# "^#!"
+    let ft = polyglot#ShebangFiletype()
+    if ft != ""
+      let &ft = ft
+    endif
+  endif
+
+  if &ft == ""
+    runtime! scripts.vim
+  endif
+
+  return &ft != ""
+endfunc
+
+let s:r_hashbang = '^#!\s*\(\S\+\)\s*\(.*\)\s*'
+let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
+let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
+
+func! polyglot#ShebangFiletype()
+  let l:line1 = getline(1)
+
+  if l:line1 !~# "^#!"
+    return
+  endif
+
+  let l:pathrest = matchlist(l:line1, s:r_hashbang)
+
+  if len(l:pathrest) == 0
+    return
+  endif
+
+  let [_, l:path, l:rest; __] = l:pathrest
+
+  let l:script = split(l:path, "/")[-1]
+
+  if l:script == "env"
+    let l:argspath = matchlist(l:rest, s:r_env)
+    if len(l:argspath) == 0
+      return
+    endif
+
+    let l:script = l:argspath[1]
+  endif
+
+  if has_key(s:interpreters, l:script)
+    return s:interpreters[l:script]
+  endif
+
+  for interpreter in keys(s:interpreters)
+    if l:script =~# '^' . interpreter
+      return s:interpreters[interpreter]
+    endif
+  endfor
+endfunc
+
+" scripts/build generates heuristics functions here
+
+" Restore 'cpoptions'
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+""" ftdetect/polyglot.vim
+
+" don't spam the user when Vim is started in Vi compatibility mode
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Disable all native vim ftdetect
+if exists('g:polyglot_test')
+  autocmd!
+endif
+
+let s:disabled_packages = {}
+let s:new_polyglot_disabled = []
+
+if exists('g:polyglot_disabled')
+  for pkg in g:polyglot_disabled
+    let base = split(pkg, '\.')
+    if len(base) > 0
+      let s:disabled_packages[pkg] = 1
+      call add(s:new_polyglot_disabled, base[0]) 
+    endif
+  endfor
+else
+  let g:polyglot_disabled_not_set = 1
+endif
+
+function! s:SetDefault(name, value)
+  if !exists(a:name)
+    let {a:name} = a:value
+  endif
+endfunction
+
+call s:SetDefault('g:markdown_enable_spell_checking', 0)
+call s:SetDefault('g:markdown_enable_input_abbreviations', 0)
+call s:SetDefault('g:markdown_enable_mappings', 0)
+
+" Enable jsx syntax by default
+call s:SetDefault('g:jsx_ext_required', 0)
+
+" Needed for sql highlighting
+call s:SetDefault('g:javascript_sql_dialect', 'sql')
+
+" Make csv loading faster
+call s:SetDefault('g:csv_start', 1)
+call s:SetDefault('g:csv_end', 2)
+
+" Disable json concealing by default
+call s:SetDefault('g:vim_json_syntax_conceal', 0)
+
+call s:SetDefault('g:filetype_euphoria', 'elixir')
+
+if !exists('g:python_highlight_all')
+  call s:SetDefault('g:python_highlight_builtins', 1)
+  call s:SetDefault('g:python_highlight_builtin_objs', 1)
+  call s:SetDefault('g:python_highlight_builtin_types', 1)
+  call s:SetDefault('g:python_highlight_builtin_funcs', 1)
+  call s:SetDefault('g:python_highlight_builtin_funcs_kwarg', 1)
+  call s:SetDefault('g:python_highlight_exceptions', 1)
+  call s:SetDefault('g:python_highlight_string_formatting', 1)
+  call s:SetDefault('g:python_highlight_string_format', 1)
+  call s:SetDefault('g:python_highlight_string_templates', 1)
+  call s:SetDefault('g:python_highlight_indent_errors', 1)
+  call s:SetDefault('g:python_highlight_space_errors', 1)
+  call s:SetDefault('g:python_highlight_doctests', 1)
+  call s:SetDefault('g:python_highlight_func_calls', 1)
+  call s:SetDefault('g:python_highlight_class_vars', 1)
+  call s:SetDefault('g:python_highlight_operators', 1)
+  call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
+  call s:SetDefault('g:python_slow_sync', 1)
+endif
+
+" We need it because scripts.vim in vim uses "set ft=" which cannot be
+" overridden with setf (and we can't use set ft= so our scripts.vim work)
+func! s:Setf(ft)
+  if &filetype !~# '\<'.a:ft.'\>'
+    let &filetype = a:ft
+  endif
+endfunc
+
+" Function used for patterns that end in a star: don't set the filetype if the
+" file name matches ft_ignore_pat.
+" When using this, the entry should probably be further down below with the
+" other StarSetf() calls.
+func! s:StarSetf(ft)
+  if expand("<amatch>") !~ g:ft_ignore_pat && &filetype !~# '\<'.a:ft.'\>'
+    let &filetype = a:ft
+  endif
+endfunc
+
+augroup filetypedetect
+
+" scripts/build inserts here filetype detection autocommands
+
+au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
+  \ call polyglot#Shebang() | endif
+
+au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
+      \ call polyglot#ObserveShebang() | endif
+
+augroup END
+
+if !has_key(s:disabled_packages, 'autoindent')
+  " Code below re-implements sleuth for vim-polyglot
+  let g:loaded_sleuth = 1
+  let g:loaded_foobar = 1
+
+  " Makes shiftwidth to be synchronized with tabstop by default
+  if &shiftwidth == &tabstop
+    let &shiftwidth = 0
+  endif
+
+  function! s:guess(lines) abort
+    let options = {}
+    let ccomment = 0
+    let podcomment = 0
+    let triplequote = 0
+    let backtick = 0
+    let xmlcomment = 0
+    let heredoc = ''
+    let minindent = 10
+    let spaces_minus_tabs = 0
+    let i = 0
+
+    for line in a:lines
+      let i += 1
+
+      if !len(line) || line =~# '^\W*$'
+        continue
+      endif
+
+      if line =~# '^\s*/\*'
+        let ccomment = 1
+      endif
+      if ccomment
+        if line =~# '\*/'
+          let ccomment = 0
+        endif
+        continue
+      endif
+
+      if line =~# '^=\w'
+        let podcomment = 1
+      endif
+      if podcomment
+        if line =~# '^=\%(end\|cut\)\>'
+          let podcomment = 0
+        endif
+        continue
+      endif
+
+      if triplequote
+        if line =~# '^[^"]*"""[^"]*$'
+          let triplequote = 0
+        endif
+        continue
+      elseif line =~# '^[^"]*"""[^"]*$'
+        let triplequote = 1
+      endif
+
+      if backtick
+        if line =~# '^[^`]*`[^`]*$'
+          let backtick = 0
+        endif
+        continue
+      elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
+        let backtick = 1
+      endif
+
+      if line =~# '^\s*<\!--'
+        let xmlcomment = 1
+      endif
+      if xmlcomment
+        if line =~# '-->'
+          let xmlcomment = 0
+        endif
+        continue
+      endif
+
+      " This is correct order because both "<<EOF" and "EOF" matches end
+      if heredoc != ''
+        if line =~# heredoc
+          let heredoc = ''
+        endif
+        continue
+      endif
+      let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
+      if len(herematch) > 0
+        let heredoc = herematch[1] . '$'
+      endif
+
+      let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
+
+      if line[0] == "\t"
+        setlocal noexpandtab
+        let &shiftwidth=&tabstop
+        let b:sleuth_culprit .= ':' . i
+        return 1
+      elseif line[0] == " "
+        let indent = len(matchstr(line, '^ *'))
+        if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
+          let minindent = indent
+        endif
+      endif
+    endfor
+
+    if minindent < 10
+      setlocal expandtab
+      let &shiftwidth=minindent
+      let b:sleuth_culprit .= ':' . i
+      return 1
+    endif
+
+    return 0
+  endfunction
+
+  function! s:detect_indent() abort
+    if &buftype ==# 'help'
+      return
+    endif
+
+    let b:sleuth_culprit = expand("<afile>:p")
+    if s:guess(getline(1, 32))
+      return
+    endif
+    let pattern = sleuth#GlobForFiletype(&filetype)
+    if len(pattern) == 0
+      return
+    endif
+    let pattern = '{' . pattern . ',.git,.svn,.hg}'
+    let dir = expand('%:p:h')
+    let level = 3
+    while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
+      " Ignore files from homedir and root 
+      if dir == expand('~') || dir == '/'
+        unlet b:sleuth_culprit
+        return
+      endif
+      for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
+        let b:sleuth_culprit = neighbor
+        " Do not consider directories above .git, .svn or .hg
+        if fnamemodify(neighbor, ":h:t")[0] == "."
+          let level = 0
+          continue
+        endif
+        if neighbor !=# expand('%:p') && filereadable(neighbor)
+          if s:guess(readfile(neighbor, '', 32))
+            return
+          endif
+        endif
+      endfor
+
+      let dir = fnamemodify(dir, ':h')
+      let level -= 1
+    endwhile
+
+    unlet b:sleuth_culprit
+  endfunction
+
+  setglobal smarttab
+
+  function! SleuthIndicator() abort
+    let sw = &shiftwidth ? &shiftwidth : &tabstop
+    if &expandtab
+      return 'sw='.sw
+    elseif &tabstop == sw
+      return 'ts='.&tabstop
+    else
+      return 'sw='.sw.',ts='.&tabstop
+    endif
+  endfunction
+
+  augroup polyglot-sleuth
+    au!
+    au FileType * call s:detect_indent()
+    au User Flags call Hoist('buffer', 5, 'SleuthIndicator')
+  augroup END
+
+  command! -bar -bang Sleuth call s:detect_indent()
+endif
+
+func! s:verify()
+  if exists("g:polyglot_disabled_not_set")
+    if exists("g:polyglot_disabled")
+      echohl WarningMsg
+      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
+      echohl None
+    endif
+
+    unlet g:polyglot_disabled_not_set
+  endif
+endfunc
+
+au VimEnter * call s:verify()
+
+" Save polyglot_disabled without postfixes
+if exists('g:polyglot_disabled')
+  let g:polyglot_disabled = s:new_polyglot_disabled
+endif
+
+" restore Vi compatibility settings
+let &cpo = s:cpo_save
+
+""" end
diff --git a/scripts/build b/scripts/build
index 260beddb9..0ed76045c 100755
--- a/scripts/build
+++ b/scripts/build
@@ -12,6 +12,10 @@ Dir.chdir(File.dirname(__dir__))
 
 BASE_URL = 'https://raw.githubusercontent.com/github/linguist/master'
 
+def read_section(name)
+  File.read('polyglot.vim').match(/""" #{Regexp.escape(name)}.*\n(?=\n""")/m)[0]
+end
+
 def camelize(str)
   str.split(/[-_\.]/).map { |a| a.capitalize }.join("")
 end
@@ -121,6 +125,10 @@ def transform_patterns(heuristics)
   patterns_mapping = Hash[patterns.zip(patterns_to_vim_patterns(patterns))]
   each_hash(heuristics) do |h|
     if h.has_key?("pattern")
+      if h["pattern"].include?("#import")
+        puts h["pattern"]
+        puts patterns_mapping.fetch(h["pattern"])
+      end
       h["pattern"] = patterns_mapping.fetch(h["pattern"])
     end
   end
@@ -554,25 +562,14 @@ def generate_ftdetect(packages, heuristics)
     puts "Missing filename for #{name}: #{e}"
   end
 
-  ftdetect = File.read('ftdetect/polyglot.vim')
-  File.write('ftdetect/polyglot.vim', ftdetect.gsub(/(?<=" filetypes\n).*(?=\n" end filetypes)/m, output))
+  ftdetect = read_section('ftdetect/polyglot.vim')
 
-  output = <<~EOS
-    " Line continuation is used here, remove 'C' from 'cpoptions'
-    let s:cpo_save = &cpo
-    set cpo&vim
-
-    func! polyglot#Shebang()
-      " Try to detect filetype from shebang
-      let ft = polyglot#ShebangFiletype()
-      if ft != ""
-        let &ft = ft
-        return 1
-      endif
+  File.write(
+    'ftdetect/polyglot.vim',
+     ftdetect.gsub('" scripts/build inserts here filetype detection autocommands') { output }
+  )
 
-      return 0
-    endfunc
-    
+  output = <<~EOS
     let s:interpreters = {
     EOS
 
@@ -585,47 +582,6 @@ def generate_ftdetect(packages, heuristics)
   output << <<~EOS
       \\ }
 
-    let s:r_hashbang = '^#!\\s*\\(\\S\\+\\)\\s*\\(.*\\)\\s*'
-    let s:r_envflag = '%(\\S\\+=\\S\\+\\|-[iS]\\|--ignore-environment\\|--split-string\\)'
-    let s:r_env = '^\\%(\\' . s:r_envflag . '\\s\\+\\)*\\(\\S\\+\\)'
-
-    func! polyglot#ShebangFiletype()
-      let l:line1 = getline(1)
-
-      if l:line1 !~# "^#!"
-        return
-      endif
-
-      let l:pathrest = matchlist(l:line1, s:r_hashbang)
-
-      if len(l:pathrest) == 0
-        return 
-      endif
-
-      let [_, l:path, l:rest; __] = l:pathrest
-
-      let l:script = split(l:path, "/")[-1]
-
-      if l:script == "env"
-        let l:argspath = matchlist(l:rest, s:r_env)
-        if len(l:argspath) == 0
-          return
-        endif
-
-        let l:script = l:argspath[1]
-      endif
-
-      if has_key(s:interpreters, l:script)
-        return s:interpreters[l:script]
-      endif
-
-      for interpreter in keys(s:interpreters)
-        if l:script =~# '^' . interpreter
-          return s:interpreters[interpreter]
-        endif
-      endfor
-    endfunc
-
   EOS
 
   for heuristic in heuristics
@@ -637,13 +593,10 @@ def generate_ftdetect(packages, heuristics)
     EOS
   end
 
-  output << <<~EOS
-    " Restore 'cpoptions'
-    let &cpo = s:cpo_save
-    unlet s:cpo_save
-  EOS
+  autoload_script = read_section('autoload/polyglot.vim')
+  autoload_script["\" scripts/build generates heuristics functions here\n"] = output
 
-  File.write('autoload/polyglot.vim', output)
+  File.write('autoload/polyglot.vim', autoload_script)
 end
 
 def generate_tests(packages)
@@ -742,8 +695,6 @@ def detect_filetypes(glob)
 end
 
 def generate_plugins(packages)
-  FileUtils.mkdir_p('autoload/polyglot')
-
   output = "let s:globs = {\n"
 
   patterns = Hash.new { |h, k| h[k] = [] }

From 4c028b37bf97294710b3ef55ea2a3ec84a1b7a3d Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 24 Sep 2020 18:56:07 +0200
Subject: [PATCH 067/299] Add warning to generated files

---
 autoload/polyglot.vim | 4 ++--
 ftdetect/polyglot.vim | 4 ++--
 scripts/build         | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index ee03e9890..d0e95b753 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -1,4 +1,4 @@
-""" autoload/polyglot.vim
+" Please do not edit this file directly, instead modify polyglot.vim or scripts/build
 
 " Line continuation is used here, remove 'C' from 'cpoptions'
 let s:cpo_save = &cpo
@@ -700,4 +700,4 @@ if exists('g:polyglot_disabled')
 endif
 
 " restore Vi compatibility settings
-let &cpo = s:cpo_save
+let &cpo = s:cpo_save
\ No newline at end of file
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index cba8cf861..343d45283 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1,4 +1,4 @@
-""" ftdetect/polyglot.vim
+" Please do not edit this file directly, instead modify polyglot.vim or scripts/build
 
 " don't spam the user when Vim is started in Vi compatibility mode
 let s:cpo_save = &cpo
@@ -2224,4 +2224,4 @@ if exists('g:polyglot_disabled')
 endif
 
 " restore Vi compatibility settings
-let &cpo = s:cpo_save
+let &cpo = s:cpo_save
\ No newline at end of file
diff --git a/scripts/build b/scripts/build
index 0ed76045c..482ffcf64 100755
--- a/scripts/build
+++ b/scripts/build
@@ -13,7 +13,8 @@ Dir.chdir(File.dirname(__dir__))
 BASE_URL = 'https://raw.githubusercontent.com/github/linguist/master'
 
 def read_section(name)
-  File.read('polyglot.vim').match(/""" #{Regexp.escape(name)}.*\n(?=\n""")/m)[0]
+  "\" Please do not edit this file directly, instead modify polyglot.vim or scripts/build\n\n" +
+  File.read('polyglot.vim').match(/""" #{Regexp.escape(name)}\n*(.*)\n(?=\n""")/m)[1]
 end
 
 def camelize(str)

From 444e7f184df91f1605f06242ad68defb33c2f454 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 24 Sep 2020 19:00:06 +0200
Subject: [PATCH 068/299] Change maintained badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1cf07bec8..0878b37e2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![vim-polyglot](https://i.imgur.com/9RxQK6k.png)
 
-![build](https://github.com/sheerun/vim-polyglot/workflows/Vim%20Polyglot%20CI/badge.svg) [![Maintenance](https://img.shields.io/maintenance/yes/2020.svg?maxAge=2592000)]()
+![build](https://github.com/sheerun/vim-polyglot/workflows/Vim%20Polyglot%20CI/badge.svg) [![Maintenance](https://img.shields.io/badge/maintained%20since-2013-yes)]()
 
 A collection of language packs for Vim.
 

From a6a6aeab76bef135d9f76534efa5ee7391c4ed2a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 24 Sep 2020 22:52:50 +0200
Subject: [PATCH 069/299] Improve django filetype detection, closes #560

---
 autoload/polyglot.vim | 20 +++++++++++---------
 ftdetect/polyglot.vim | 10 +++++++++-
 heuristics.yaml       |  1 -
 polyglot.vim          | 17 +++++++++--------
 scripts/build         | 38 ++++++++++++++++----------------------
 5 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index d0e95b753..b995d2282 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -4,13 +4,6 @@
 let s:cpo_save = &cpo
 set cpo&vim
 
-func! polyglot#ObserveShebang()
-  augroup polyglot-observer
-    au! CursorHold,CursorHoldI,BufWritePost <buffer>
-      \ if polyglot#Shebang() | au! polyglot-observer CursorHold,CursorHoldI,BufWritePost | endif
-  augroup END
-endfunc
-
 func! polyglot#Shebang()
   if getline(1) =~# "^#!"
     let ft = polyglot#ShebangFiletype()
@@ -392,7 +385,8 @@ func! polyglot#DetectHtmlFiletype()
       set ft=xhtml | return
     endif
   endfor
-  set ft=html | return
+  set ft=html | au! BufWritePost <buffer> ++once call polyglot#DetectHtmlFiletype()
+  return
 endfunc
 
 
@@ -411,6 +405,14 @@ if exists('g:polyglot_test')
   autocmd!
 endif
 
+func! polyglot#Observe(fn)
+  let b:polyglot_observe = a:fn
+  augroup polyglot-observer
+    au! CursorHold,CursorHoldI,BufWritePost <buffer>
+      \ execute('if polyglot#' . b:polyglot_observe . '() | au! polyglot-observer | endif')
+  augroup END
+endfunc
+
 let s:disabled_packages = {}
 let s:new_polyglot_disabled = []
 
@@ -497,7 +499,7 @@ au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
   \ call polyglot#Shebang() | endif
 
 au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
-      \ call polyglot#ObserveShebang() | endif
+      \ call polyglot#Observe('Shebang') | endif
 
 augroup END
 
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 343d45283..f1a48357b 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -9,6 +9,14 @@ if exists('g:polyglot_test')
   autocmd!
 endif
 
+func! polyglot#Observe(fn)
+  let b:polyglot_observe = a:fn
+  augroup polyglot-observer
+    au! CursorHold,CursorHoldI,BufWritePost <buffer>
+      \ execute('if polyglot#' . b:polyglot_observe . '() | au! polyglot-observer | endif')
+  augroup END
+endfunc
+
 let s:disabled_packages = {}
 let s:new_polyglot_disabled = []
 
@@ -2021,7 +2029,7 @@ au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
   \ call polyglot#Shebang() | endif
 
 au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
-      \ call polyglot#ObserveShebang() | endif
+      \ call polyglot#Observe('Shebang') | endif
 
 augroup END
 
diff --git a/heuristics.yaml b/heuristics.yaml
index ee1b21aff..c53a704cc 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -69,7 +69,6 @@ rules:
     filetype: glsl
 - override: true
 - filetype: forth
-  fallback: true
 ---
 extensions: [re]
 rules:
diff --git a/polyglot.vim b/polyglot.vim
index 9199a207b..3ac6ef38c 100644
--- a/polyglot.vim
+++ b/polyglot.vim
@@ -4,13 +4,6 @@
 let s:cpo_save = &cpo
 set cpo&vim
 
-func! polyglot#ObserveShebang()
-  augroup polyglot-observer
-    au! CursorHold,CursorHoldI,BufWritePost <buffer>
-      \ if polyglot#Shebang() | au! polyglot-observer CursorHold,CursorHoldI,BufWritePost | endif
-  augroup END
-endfunc
-
 func! polyglot#Shebang()
   if getline(1) =~# "^#!"
     let ft = polyglot#ShebangFiletype()
@@ -84,6 +77,14 @@ if exists('g:polyglot_test')
   autocmd!
 endif
 
+func! polyglot#Observe(fn)
+  let b:polyglot_observe = a:fn
+  augroup polyglot-observer
+    au! CursorHold,CursorHoldI,BufWritePost <buffer>
+      \ execute('if polyglot#' . b:polyglot_observe . '() | au! polyglot-observer | endif')
+  augroup END
+endfunc
+
 let s:disabled_packages = {}
 let s:new_polyglot_disabled = []
 
@@ -170,7 +171,7 @@ au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
   \ call polyglot#Shebang() | endif
 
 au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
-      \ call polyglot#ObserveShebang() | endif
+      \ call polyglot#Observe('Shebang') | endif
 
 augroup END
 
diff --git a/scripts/build b/scripts/build
index 482ffcf64..3c89b6f10 100755
--- a/scripts/build
+++ b/scripts/build
@@ -126,10 +126,6 @@ def transform_patterns(heuristics)
   patterns_mapping = Hash[patterns.zip(patterns_to_vim_patterns(patterns))]
   each_hash(heuristics) do |h|
     if h.has_key?("pattern")
-      if h["pattern"].include?("#import")
-        puts h["pattern"]
-        puts patterns_mapping.fetch(h["pattern"])
-      end
       h["pattern"] = patterns_mapping.fetch(h["pattern"])
     end
   end
@@ -326,10 +322,20 @@ def rule_to_code(rule)
     EOS
   end
 
-  if (rule.keys - ["filetype", "override", "set", "extensions", "fallback"]).size > 0
-    raise "Unknown rule: #{JSON.generate(rule)}"
+  if rule.has_key?("filetype")
+    if rule.has_key?("fallback")
+      return <<~EOS
+        set ft=#{rule["filetype"]} | au! BufWritePost <buffer> ++once call polyglot#Detect#{camelize(rule["extensions"].first)}Filetype()
+        return
+      EOS
+    end
+
+    return <<~EOS
+      set ft=#{rule["filetype"]} | return
+      #{indent(rule_to_code(except(rule, "filetype")), 0)}
+    EOS
   end
-  
+
   if rule.has_key?("override")
     variable = "g:filetype_#{rule["extensions"].first}"
     return <<~EOS
@@ -339,22 +345,10 @@ def rule_to_code(rule)
     EOS
   end
 
-  if rule.has_key?("filetype")
-    return "set ft=#{rule["filetype"]} | return"
-  end
-
-  if rule.has_key?("filetype")
-    if rule.has_key?("fallback")
-      return "set ft=#{rule["filetype"]} | return"
-    else
-      return "setf FALLBACK #{rule["filetype"]} | return"
-    end
-  end
-
-  if rule.has_key?("extensions")
-    return ""
+  if (rule.keys - ["extensions"]).size > 0
+    raise "Unknown rule: #{JSON.generate(rule)}"
   end
-
+  
   return ""
 end
 

From d53d2189b92ab8150753201e2e2f8cba14b8edc9 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 24 Sep 2020 23:24:42 +0200
Subject: [PATCH 070/299] Add support for .gitignore highlighting

---
 README.md             |  3 ++-
 autoload/sleuth.vim   | 43 ++++++++++++++++++++++---------------------
 ftdetect/polyglot.vim |  4 ++++
 packages.yaml         |  7 +++++++
 scripts/build         |  2 +-
 syntax/gitignore.vim  | 23 +++++++++++++++++++++++
 tests/extensions.vim  |  3 +++
 tests/filetypes.vim   |  1 +
 8 files changed, 63 insertions(+), 23 deletions(-)
 create mode 100644 syntax/gitignore.vim

diff --git a/README.md b/README.md
index 0878b37e2..8f9c4353c 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->200<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->201<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -115,6 +115,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [fsharp](https://github.com/ionide/Ionide-vim)
 - [gdscript](https://github.com/calviken/vim-gdscript3)
 - [git](https://github.com/tpope/vim-git)
+- [gitignore](https://github.com/rdolgushin/gitignore.vim)
 - [glsl](https://github.com/tikhomirov/vim-glsl)
 - [gmpl](https://github.com/maelvalais/gmpl.vim)
 - [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting)
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 0bb73fd8d..aa61d8fb8 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -2,7 +2,7 @@ let s:globs = {
   \ '8th': '*.8th',
   \ 'Dockerfile': '*.dockerfile,*.dock,*.Dockerfile,Dockerfile,dockerfile,Dockerfile*',
   \ 'Jenkinsfile': '*.jenkinsfile,*.Jenkinsfile,Jenkinsfile,Jenkinsfile*',
-  \ 'a2ps': 'a2psrc',
+  \ 'a2ps': 'a2psrc,.a2psrc',
   \ 'a65': '*.a65',
   \ 'aap': '*.aap',
   \ 'abap': '*.abap',
@@ -13,15 +13,15 @@ let s:globs = {
   \ 'ada': '*.adb,*.ads,*.ada,*.adc,*.gpr,*.ada_m',
   \ 'ahdl': '*.tdf',
   \ 'aidl': '*.aidl',
-  \ 'alsaconf': '',
+  \ 'alsaconf': '.asoundrc',
   \ 'aml': '*.aml',
   \ 'ampl': '*.run',
   \ 'ant': 'build.xml',
-  \ 'apache': 'access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*',
+  \ 'apache': '.htaccess,access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*',
   \ 'apiblueprint': '*.apib',
   \ 'applescript': '*.applescript,*.scpt',
   \ 'aptconf': 'apt.conf',
-  \ 'arch': '=tagging-method',
+  \ 'arch': '.arch-inventory,=tagging-method',
   \ 'arduino': '*.pde,*.ino',
   \ 'art': '*.art',
   \ 'asciidoc': '*.asciidoc,*.adoc,*.asc',
@@ -58,7 +58,7 @@ let s:globs = {
   \ 'dd': '*.dd',
   \ 'ddoc': '*.ddoc',
   \ 'dhall': '*.dhall',
-  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,buildozer.spec,php.ini-*',
+  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,buildozer.spec,.editorconfig,.npmrc,php.ini-*',
   \ 'dsdl': '*.sdl',
   \ 'dune': 'jbuild,dune,dune-project,dune-workspace',
   \ 'ecrystal': '*.ecr',
@@ -80,9 +80,10 @@ let s:globs = {
   \ 'fsharp': '*.fs,*.fsi,*.fsx',
   \ 'gdscript3': '*.gd',
   \ 'gitcommit': 'COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG',
-  \ 'gitconfig': '*.gitconfig',
+  \ 'gitconfig': '*.gitconfig,.gitconfig,.gitmodules',
+  \ 'gitignore': '.gitignore',
   \ 'gitrebase': 'git-rebase-todo',
-  \ 'gitsendemail': '',
+  \ 'gitsendemail': '.gitsendemail.*',
   \ 'glsl': '*.glsl,*.fp,*.frag,*.frg,*.fs,*.fsh,*.fshader,*.geo,*.geom,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader,*.comp',
   \ 'gmpl': '*.mod',
   \ 'gnuplot': '*.gp,*.gnu,*.gnuplot,*.p,*.plot,*.plt,*.gpi',
@@ -105,15 +106,15 @@ let s:globs = {
   \ 'html.mustache': '*.mustache,*.hogan,*.hulk,*.hjs',
   \ 'html.twig': '*.twig',
   \ 'htmldjango': '*.jinja,*.j2,*.jinja2,*.njk',
-  \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config',
+  \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config,.i3.config,.i3config',
   \ 'icalendar': '*.ics',
   \ 'idris': '*.idr,*.lidr,idris-response',
   \ 'idris2': '*.idr,*.ipkg,idris-response',
   \ 'ion': '*.ion',
   \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
   \ 'javascriptreact': '*.jsx',
-  \ 'jq': '*.jq',
-  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,composer.lock,mcmod.info,Pipfile.lock',
+  \ 'jq': '*.jq,.jqrc,.jqrc*',
+  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.tern-config,.tern-project,.watchmanconfig,composer.lock,mcmod.info,Pipfile.lock',
   \ 'json5': '*.json5',
   \ 'jsonnet': '*.jsonnet,*.libsonnet',
   \ 'jst': '*.ejs,*.ect,*.jst',
@@ -127,7 +128,7 @@ let s:globs = {
   \ 'livescript': '*.ls,*._ls,Slakefile',
   \ 'llvm': '*.ll',
   \ 'log': '*.log,*.LOG,*_log,*_LOG',
-  \ 'lua': '*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua',
+  \ 'lua': '*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,.luacheckrc',
   \ 'm4': '*.m4,*.at',
   \ 'mako': '*.mako,*.mao',
   \ 'markdown': '*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr',
@@ -142,7 +143,7 @@ let s:globs = {
   \ 'nix': '*.nix',
   \ 'oasis': '_oasis',
   \ 'objc': '*.m,*.h',
-  \ 'ocaml': '*.ml,*.eliom,*.eliomi,*.ml4,*.mli,*.mll,*.mly,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo',
+  \ 'ocaml': '*.ml,*.eliom,*.eliomi,*.ml4,*.mli,*.mll,*.mly,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo,.ocamlinit',
   \ 'ocamlbuild_tags': '_tags',
   \ 'ocpbuild': '*.ocp',
   \ 'ocpbuildroot': '*.root',
@@ -152,7 +153,7 @@ let s:globs = {
   \ 'opam': '*.opam,*.opam.template,opam',
   \ 'opencl': '*.cl,*.opencl',
   \ 'perl': '*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile',
-  \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,Phakefile',
+  \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,.php,.php_cs,.php_cs.dist,Phakefile',
   \ 'plantuml': '*.puml,*.iuml,*.plantuml,*.uml,*.pu',
   \ 'pod': '*.pod',
   \ 'pony': '*.pony',
@@ -163,10 +164,10 @@ let s:globs = {
   \ 'pug': '*.jade,*.pug',
   \ 'puppet': '*.pp,Modulefile',
   \ 'purescript': '*.purs',
-  \ 'python': '*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,DEPS,SConscript,SConstruct,Snakefile,wscript',
+  \ 'python': '*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,.gclient,DEPS,SConscript,SConstruct,Snakefile,wscript',
   \ 'qmake': '*.pro,*.pri',
   \ 'qml': '*.qml,*.qbs',
-  \ 'r': '*.r,*.rsx,*.s,*.S,expr-dist',
+  \ 'r': '*.r,*.rsx,*.s,*.S,.Rprofile,expr-dist',
   \ 'racket': '*.rkt,*.rktd,*.rktl,*.scrbl',
   \ 'ragel': '*.rl',
   \ 'raku': '*.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl,*.pl6,*.pm,*.pm6,*.t,*.rakudoc,*.rakutest,*.raku,*.rakumod,*.pod6,*.t6',
@@ -176,13 +177,13 @@ let s:globs = {
   \ 'requirements': '*.pip,*requirements.{txt,in},*require.{txt,in},constraints.{txt,in}',
   \ 'rhelp': '*.rd',
   \ 'rst': '*.rst,*.rest,*.rest.txt,*.rst.txt',
-  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,Cheffile,KitchenSink,Routefile,vagrantfile,[Rr]akefile*,*_spec.rb',
+  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb',
   \ 'rust': '*.rs,*.rs.in',
   \ 'sbt.scala': '*.sbt',
   \ 'scala': '*.scala,*.kojo,*.sc',
   \ 'scss': '*.scss',
   \ 'sexplib': '*.sexp',
-  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile',
+  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile',
   \ 'slim': '*.slim',
   \ 'slime': '*.slime',
   \ 'smt2': '*.smt2,*.smt',
@@ -199,7 +200,7 @@ let s:globs = {
   \ 'terraform': '*.hcl,*.nomad,*.tf,*.tfvars,*.workflow',
   \ 'textile': '*.textile',
   \ 'thrift': '*.thrift',
-  \ 'tmux': '',
+  \ 'tmux': '.tmux.conf',
   \ 'toml': '*.toml,Cargo.lock,Gopkg.lock,poetry.lock,Pipfile',
   \ 'tptp': '*.p,*.tptp,*.ax',
   \ 'trasys': '*.inp',
@@ -217,17 +218,17 @@ let s:globs = {
   \ 'vmasm': '*.mar',
   \ 'vue': '*.vue,*.wpy',
   \ 'xdc': '*.xdc',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
   \ 'xml.twig': '*.xml.twig',
   \ 'xs': '*.xs',
   \ 'xsl': '*.xslt,*.xsl',
-  \ 'yaml': '*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,glide.lock,yarn.lock,fish_history,fish_read_history',
+  \ 'yaml': '*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,.clang-format,.clang-tidy,.gemrc,glide.lock,yarn.lock,fish_history,fish_read_history',
   \ 'yaml.ansible': 'playbook.y{a,}ml,site.y{a,}ml,main.y{a,}ml,local.y{a,}ml,requirements.y{a,}ml,tasks.*.y{a,}ml,roles.*.y{a,}ml,handlers.*.y{a,}ml',
   \ 'yaml.docker-compose': 'docker-compose*.yaml,docker-compose*.yml',
   \ 'zephir': '*.zep',
   \ 'zig': '*.zig,*.zir',
   \ 'zir': '*.zir',
-  \ 'zsh': '*.zsh',
+  \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout',
   \}
 
 func! sleuth#GlobForFiletype(type)
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index f1a48357b..0f7159c32 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2023,6 +2023,10 @@ if !has_key(s:disabled_packages, 'tads')
   au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
 endif
 
+if !has_key(s:disabled_packages, 'gitignore')
+  au BufNewFile,BufRead {.,}gitignore set ft=gitignore
+endif
+
 
 
 au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
diff --git a/packages.yaml b/packages.yaml
index 297150938..4d9a7952d 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1882,3 +1882,10 @@ filetypes:
 - name: tads
   extensions:
   - t
+---
+name: gitignore
+remote: rdolgushin/gitignore.vim
+filetypes:
+- name: gitignore
+  filenames:
+  - '.gitignore'
diff --git a/scripts/build b/scripts/build
index 3c89b6f10..685571966 100755
--- a/scripts/build
+++ b/scripts/build
@@ -697,7 +697,7 @@ def generate_plugins(packages)
   for package in packages
     for filetype in package["filetypes"]
       extensions = (filetype["extensions"] || []).map { |e| "*.#{e}" }
-      files = (filetype["filenames"] || []).reject { |e| e.match(/\*\*|\//) || e[0] == "." }
+      files = (filetype["filenames"] || []).reject { |e| e.match(/\*\*|\//) }
       patterns[filetype["name"]].concat(extensions)
       patterns[filetype["name"]].concat(files)
     end
diff --git a/syntax/gitignore.vim b/syntax/gitignore.vim
new file mode 100644
index 000000000..f83c098b4
--- /dev/null
+++ b/syntax/gitignore.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
+
+" Vim syntax file
+" Language:	.gitignore
+" Maintainer:	Roman Dolgushin <rd@roman-dolgushin.ru>
+" URL:		http://github.com/rdolgushin/gitignore.vim
+
+if exists('b:current_syntax')
+  finish
+endif
+
+if !exists('main_syntax')
+  let main_syntax = 'conf'
+endif
+
+runtime! syntax/conf.vim
+unlet b:current_syntax
+
+let b:current_syntax = 'gitignore'
+
+setlocal commentstring=#%s
+
+endif
diff --git a/tests/extensions.vim b/tests/extensions.vim
index ca42edbb6..4db1c0734 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -368,3 +368,6 @@ call TestExtension("htmldjango", "jinja2.html", "{% for item in navigation %}{%
 call TestExtension("htmldjango", "jinja3.html", "{% block head %}")
 call TestExtension("htmldjango", "jinja4.html", "{# some comment #}")
 call TestExtension("xhtml", "xhtml.html", "<DTD   XHTML ")
+
+" .gitignore
+call TestExtension(".gitignore", ".gitignore", "")
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 8d0770728..accc0a728 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -236,3 +236,4 @@ call TestFiletype('odin')
 call TestFiletype('bzl')
 call TestFiletype('prolog')
 call TestFiletype('tads')
+call TestFiletype('gitignore')

From d6479bbf0baeeedaa183c1f3e11679246ca20138 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 25 Sep 2020 00:07:37 +0200
Subject: [PATCH 071/299] Change gitignore provider

---
 README.md                  |  2 +-
 autoload/fzf_gitignore.vim | 41 ++++++++++++++++++
 doc/fzf_gitignore.txt      | 85 ++++++++++++++++++++++++++++++++++++++
 ftplugin/gitignore.vim     | 20 +++++++++
 packages.yaml              |  2 +-
 syntax/gitignore.vim       | 30 +++++++++-----
 tests/extensions.vim       |  2 +-
 7 files changed, 169 insertions(+), 13 deletions(-)
 create mode 100644 autoload/fzf_gitignore.vim
 create mode 100644 doc/fzf_gitignore.txt
 create mode 100644 ftplugin/gitignore.vim

diff --git a/README.md b/README.md
index 8f9c4353c..fcd206b8d 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [fsharp](https://github.com/ionide/Ionide-vim)
 - [gdscript](https://github.com/calviken/vim-gdscript3)
 - [git](https://github.com/tpope/vim-git)
-- [gitignore](https://github.com/rdolgushin/gitignore.vim)
+- [gitignore](https://github.com/fszymanski/fzf-gitignore)
 - [glsl](https://github.com/tikhomirov/vim-glsl)
 - [gmpl](https://github.com/maelvalais/gmpl.vim)
 - [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting)
diff --git a/autoload/fzf_gitignore.vim b/autoload/fzf_gitignore.vim
new file mode 100644
index 000000000..7548130c4
--- /dev/null
+++ b/autoload/fzf_gitignore.vim
@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
+
+scriptencoding utf-8
+
+" Copyright (c) 2017-2020 Filip Szymański. All rights reserved.
+" Use of this source code is governed by an MIT license that can be
+" found in the LICENSE file.
+
+function! s:template_sink(templates) abort
+  try
+    let l:lines = _fzf_gitignore_create(a:templates)
+  catch /^Vim(\(let\|return\)):/
+    return
+  endtry
+
+  new
+  setlocal filetype=gitignore
+
+  call setline(1, l:lines)
+
+  $-2,$delete _
+  normal! gg
+endfunction
+
+function! fzf_gitignore#run() abort
+  try
+    let l:opts = {
+          \ 'source': _fzf_gitignore_get_all_templates(),
+          \ 'sink*': function('s:template_sink'),
+          \ 'options': '-m --prompt="Template> " --header="gitignore.io"'
+          \ }
+  catch /^Vim(\(let\|return\)):/
+    return
+  endtry
+
+  call fzf#run(fzf#wrap(l:opts))
+endfunction
+
+" vim: ts=2 et sw=2
+
+endif
diff --git a/doc/fzf_gitignore.txt b/doc/fzf_gitignore.txt
new file mode 100644
index 000000000..4d94748ce
--- /dev/null
+++ b/doc/fzf_gitignore.txt
@@ -0,0 +1,85 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
+
+*fzf_gitignore.txt* Create useful .gitignore files for your project
+
+Author: Filip Szymański <fszymanski.pl@gmail.com>
+
+==============================================================================
+CONTENTS                                              *fzf-gitignore-contents*
+
+  1. Introduction                                |fzf-gitignore-introduction|
+  2. Configuration                               |fzf-gitignore-configuration|
+  3. Commands                                    |fzf-gitignore-commands|
+  4. Mappings                                    |fzf-gitignore-mappings|
+  5. License                                     |fzf-gitignore-license|
+  6. Bugs                                        |fzf-gitignore-bugs|
+  7. Contributing                                |fzf-gitignore-contributing|
+
+==============================================================================
+INTRODUCTION                                      *fzf-gitignore-introduction*
+
+fzf[1] interface for creating .gitignore files using the gitignore.io[2] API.
+
+Note: This plugin was inspired by helm-gitignore[3].
+
+==============================================================================
+CONFIGURATION                                    *fzf-gitignore-configuration*
+
+                                                     *g:fzf_gitignore_no_maps*
+Set this option to disable all key mappings.
+>
+  let g:fzf_gitignore_no_maps = 1
+<
+Default: Not defined (number)
+
+                                                         *g:fzf_gitignore_map*
+Set this option to change the |<Plug>(fzf-gitignore)| key mapping.
+>
+  let g:fzf_gitignore_map = '<Leader>i'
+<
+Default: '<Leader>gi' (string)
+
+==============================================================================
+COMMANDS                                              *fzf-gitignore-commands*
+
+                                                               *:FzfGitignore*
+Create .gitignore file.
+
+==============================================================================
+MAPPINGS                                              *fzf-gitignore-mappings*
+
+ -----------------------------------+----------------------------------------
+  Mapping                           | Description                            ~
+ -----------------------------------+----------------------------------------
+  <Plug>(fzf-gitignore)             | Create .gitignore file
+ -----------------------------------+----------------------------------------
+
+==============================================================================
+LICENSE                                                *fzf-gitignore-license*
+
+MIT
+
+==============================================================================
+BUGS                                                      *fzf-gitignore-bugs*
+
+If you find a bug please create an issue on GitHub.
+
+https://github.com/fszymanski/fzf-gitignore/issues
+
+==============================================================================
+CONTRIBUTING                                      *fzf-gitignore-contributing*
+
+Think you can make this plugin better? Awesome. Fork it on GitHub and create
+a pull request.
+
+https://github.com/fszymanski/fzf-gitignore
+
+==============================================================================
+
+[1] https://github.com/junegunn/fzf
+[2] https://www.gitignore.io/
+[3] https://github.com/jupl/helm-gitignore
+
+ vim: tw=78 ts=8 ft=help norl
+
+endif
diff --git a/ftplugin/gitignore.vim b/ftplugin/gitignore.vim
new file mode 100644
index 000000000..d8cbadc53
--- /dev/null
+++ b/ftplugin/gitignore.vim
@@ -0,0 +1,20 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
+
+scriptencoding utf-8
+
+" Copyright (c) 2017-2020 Filip Szymański. All rights reserved.
+" Use of this source code is governed by an MIT license that can be
+" found in the LICENSE file.
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=#\ %s
+
+let b:undo_ftplugin = 'setlocal commentstring<'
+
+" vim: ts=2 et sw=2
+
+endif
diff --git a/packages.yaml b/packages.yaml
index 4d9a7952d..4c0083037 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1884,7 +1884,7 @@ filetypes:
   - t
 ---
 name: gitignore
-remote: rdolgushin/gitignore.vim
+remote: fszymanski/fzf-gitignore
 filetypes:
 - name: gitignore
   filenames:
diff --git a/syntax/gitignore.vim b/syntax/gitignore.vim
index f83c098b4..7a1a8e9ca 100644
--- a/syntax/gitignore.vim
+++ b/syntax/gitignore.vim
@@ -1,23 +1,33 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
 
-" Vim syntax file
-" Language:	.gitignore
-" Maintainer:	Roman Dolgushin <rd@roman-dolgushin.ru>
-" URL:		http://github.com/rdolgushin/gitignore.vim
+scriptencoding utf-8
+
+" Copyright (c) 2017-2020 Filip Szymański. All rights reserved.
+" Use of this source code is governed by an MIT license that can be
+" found in the LICENSE file.
 
 if exists('b:current_syntax')
   finish
 endif
 
-if !exists('main_syntax')
-  let main_syntax = 'conf'
-endif
+" https://git-scm.com/docs/gitignore#_pattern_format
+syntax keyword gitignoreTodo TODO FIXME XXX NOTE SEE contained
+syntax match gitignoreComment '^#.*' contains=gitignoreTodo
+syntax match gitignoreComment '\s#.*'ms=s+1 contains=gitignoreTodo
+syntax match gitignoreNegation '^!'
+syntax match gitignoreSeparator '/'
+syntax match gitignoreWildcard '\(\\\)\@<![*?]'
+syntax region gitignoreSet start='\[' skip='\\\]' end='\]'
 
-runtime! syntax/conf.vim
-unlet b:current_syntax
+highlight default link gitignoreTodo Todo
+highlight default link gitignoreComment Comment
+highlight default link gitignoreNegation Exception
+highlight default link gitignoreSeparator Constant
+highlight default link gitignoreWildcard Special
+highlight default link gitignoreSet Character
 
 let b:current_syntax = 'gitignore'
 
-setlocal commentstring=#%s
+" vim: ts=2 et sw=2
 
 endif
diff --git a/tests/extensions.vim b/tests/extensions.vim
index 4db1c0734..3ed9306d2 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -370,4 +370,4 @@ call TestExtension("htmldjango", "jinja4.html", "{# some comment #}")
 call TestExtension("xhtml", "xhtml.html", "<DTD   XHTML ")
 
 " .gitignore
-call TestExtension(".gitignore", ".gitignore", "")
+call TestExtension("gitignore", ".gitignore", "")

From 4f36a638131a2d08929f3cf22df243c22bddf3fe Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 25 Sep 2020 00:09:44 +0200
Subject: [PATCH 072/299] Update filenames for gitignore

---
 ftdetect/polyglot.vim | 2 ++
 packages.yaml         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 0f7159c32..ff17e5167 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2024,6 +2024,8 @@ if !has_key(s:disabled_packages, 'tads')
 endif
 
 if !has_key(s:disabled_packages, 'gitignore')
+  au BufNewFile,BufRead *.git/info/exclude set ft=gitignore
+  au BufNewFile,BufRead */.config/git/ignore set ft=gitignore
   au BufNewFile,BufRead {.,}gitignore set ft=gitignore
 endif
 
diff --git a/packages.yaml b/packages.yaml
index 4c0083037..bbbb8a880 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1889,3 +1889,5 @@ filetypes:
 - name: gitignore
   filenames:
   - '.gitignore'
+  - '*/.config/git/ignore'
+  - '*.git/info/exclude'

From 33b86476b63f7fc2286336eb488a149a85cb08cb Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 26 Sep 2020 01:23:08 +0200
Subject: [PATCH 073/299] Fix neovim warning, closes #563

---
 autoload/polyglot.vim | 4 ++--
 ftdetect/polyglot.vim | 4 ++--
 polyglot.vim          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index b995d2282..393c92bf2 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -405,7 +405,7 @@ if exists('g:polyglot_test')
   autocmd!
 endif
 
-func! polyglot#Observe(fn)
+func! s:Observe(fn)
   let b:polyglot_observe = a:fn
   augroup polyglot-observer
     au! CursorHold,CursorHoldI,BufWritePost <buffer>
@@ -499,7 +499,7 @@ au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
   \ call polyglot#Shebang() | endif
 
 au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
-      \ call polyglot#Observe('Shebang') | endif
+      \ call s:Observe('Shebang') | endif
 
 augroup END
 
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index ff17e5167..9c517e032 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -9,7 +9,7 @@ if exists('g:polyglot_test')
   autocmd!
 endif
 
-func! polyglot#Observe(fn)
+func! s:Observe(fn)
   let b:polyglot_observe = a:fn
   augroup polyglot-observer
     au! CursorHold,CursorHoldI,BufWritePost <buffer>
@@ -2035,7 +2035,7 @@ au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
   \ call polyglot#Shebang() | endif
 
 au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
-      \ call polyglot#Observe('Shebang') | endif
+      \ call s:Observe('Shebang') | endif
 
 augroup END
 
diff --git a/polyglot.vim b/polyglot.vim
index 3ac6ef38c..b6198b807 100644
--- a/polyglot.vim
+++ b/polyglot.vim
@@ -77,7 +77,7 @@ if exists('g:polyglot_test')
   autocmd!
 endif
 
-func! polyglot#Observe(fn)
+func! s:Observe(fn)
   let b:polyglot_observe = a:fn
   augroup polyglot-observer
     au! CursorHold,CursorHoldI,BufWritePost <buffer>
@@ -171,7 +171,7 @@ au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
   \ call polyglot#Shebang() | endif
 
 au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
-      \ call polyglot#Observe('Shebang') | endif
+      \ call s:Observe('Shebang') | endif
 
 augroup END
 

From 7ec499c19f91122724d1518887ba3ffe4a8fcb43 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 27 Sep 2020 12:05:29 +0200
Subject: [PATCH 074/299] Set indentation only locally, fixes #564

---
 autoload/elixir/indent.vim | 16 +++++++++++++---
 autoload/polyglot.vim      |  4 ++--
 ftdetect/polyglot.vim      |  4 ++--
 polyglot.vim               |  4 ++--
 syntax/basic/type.vim      | 16 +++++++++++++++-
 syntax/common.vim          |  1 +
 syntax/elixir.vim          |  6 +-----
 7 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index e7c8f0ea4..741ec0944 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -276,12 +276,14 @@ function! elixir#indent#handle_inside_block(context)
   " hack - handle do: better
   let block_info = searchpairpos(start_pattern, '', end_pattern, 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip() || getline(line('.')) =~ 'do:'", max([0, a:context.lnum - g:elixir_indent_max_lookbehind]))
   let block_start_lnum = block_info[0]
+  call s:debug("block_start_lnum=" . block_start_lnum)
   let block_start_col = block_info[1]
   if block_start_lnum != 0 || block_start_col != 0
     let block_text = getline(block_start_lnum)
     let block_start_char = block_text[block_start_col - 1]
+    call s:debug("block_start_char=" . block_start_char)
 
-    let never_match = '\(a\)\@=b'
+    let never_match = ''
     let config = {
           \'f': {'aligned_clauses': s:keyword('end'), 'pattern_match_clauses': never_match},
           \'c': {'aligned_clauses': s:keyword('end'), 'pattern_match_clauses': never_match},
@@ -293,17 +295,25 @@ function! elixir#indent#handle_inside_block(context)
           \'(': {'aligned_clauses': ')', 'pattern_match_clauses': never_match}
           \}
 
+    " if `with` clause...
     if block_start_char == 'w'
       call s:debug("testing s:handle_with")
       return s:handle_with(block_start_lnum, block_start_col, a:context)
     else
       let block_config = config[block_start_char]
+      " if aligned clause (closing tag/`else` clause/etc...) then indent this
+      " at the same level as the block open tag (e.g. `if`/`case`/etc...)
       if s:starts_with(a:context, block_config.aligned_clauses)
         call s:debug("clause")
         return indent(block_start_lnum)
       else
-        let clause_lnum = searchpair(block_config.pattern_match_clauses, '', '*', 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()", block_start_lnum)
-        let relative_lnum = max([clause_lnum, block_start_lnum])
+        if block_config.pattern_match_clauses == never_match
+          let relative_lnum = block_start_lnum
+        else
+          let clause_lnum = searchpair(block_config.pattern_match_clauses, '', '*', 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()", block_start_lnum)
+          call s:debug("clause_lum=" . clause_lnum)
+          let relative_lnum = max([clause_lnum, block_start_lnum])
+        end
         call s:debug("pattern matching relative to lnum " . relative_lnum)
         return s:do_handle_pattern_match_block(relative_lnum, a:context)
       endif
diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index 393c92bf2..07d9fe31f 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -596,7 +596,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
       if line[0] == "\t"
         setlocal noexpandtab
-        let &shiftwidth=&tabstop
+        let &l:shiftwidth=&tabstop
         let b:sleuth_culprit .= ':' . i
         return 1
       elseif line[0] == " "
@@ -609,7 +609,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
     if minindent < 10
       setlocal expandtab
-      let &shiftwidth=minindent
+      let &l:shiftwidth=minindent
       let b:sleuth_culprit .= ':' . i
       return 1
     endif
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 9c517e032..4b01a2414 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2132,7 +2132,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
       if line[0] == "\t"
         setlocal noexpandtab
-        let &shiftwidth=&tabstop
+        let &l:shiftwidth=&tabstop
         let b:sleuth_culprit .= ':' . i
         return 1
       elseif line[0] == " "
@@ -2145,7 +2145,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
     if minindent < 10
       setlocal expandtab
-      let &shiftwidth=minindent
+      let &l:shiftwidth=minindent
       let b:sleuth_culprit .= ':' . i
       return 1
     endif
diff --git a/polyglot.vim b/polyglot.vim
index b6198b807..e86e62ef2 100644
--- a/polyglot.vim
+++ b/polyglot.vim
@@ -268,7 +268,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
       if line[0] == "\t"
         setlocal noexpandtab
-        let &shiftwidth=&tabstop
+        let &l:shiftwidth=&tabstop
         let b:sleuth_culprit .= ':' . i
         return 1
       elseif line[0] == " "
@@ -281,7 +281,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
     if minindent < 10
       setlocal expandtab
-      let &shiftwidth=minindent
+      let &l:shiftwidth=minindent
       let b:sleuth_culprit .= ':' . i
       return 1
     endif
diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim
index 616c3271c..02e782375 100644
--- a/syntax/basic/type.vim
+++ b/syntax/basic/type.vim
@@ -56,6 +56,7 @@ syntax cluster typescriptPrimaryType contains=
   \ typescriptTupleType,
   \ typescriptTypeQuery,
   \ typescriptStringLiteralType,
+  \ typescriptTemplateLiteralType,
   \ typescriptReadonlyArrayKeyword,
   \ typescriptAssertType
 
@@ -64,6 +65,17 @@ syntax region  typescriptStringLiteralType contained
   \ nextgroup=typescriptUnion
   \ skipwhite skipempty
 
+syntax region  typescriptTemplateLiteralType contained
+  \ start=/`/  skip=/\\\\\|\\`\|\n/  end=/`\|$/
+  \ contains=typescriptTemplateSubstitutionType
+  \ nextgroup=typescriptTypeOperator
+  \ skipwhite skipempty
+
+syntax region  typescriptTemplateSubstitutionType matchgroup=typescriptTemplateSB
+  \ start=/\${/ end=/}/
+  \ contains=@typescriptType
+  \ contained
+
 syntax region typescriptParenthesizedType matchgroup=typescriptParens
   \ start=/(/ end=/)/
   \ contains=@typescriptType
@@ -103,10 +115,12 @@ syntax region typescriptTupleType matchgroup=typescriptBraces
   \ contained skipwhite
 
 syntax cluster typescriptTypeOperator
-  \ contains=typescriptUnion,typescriptTypeBracket
+  \ contains=typescriptUnion,typescriptTypeBracket,typescriptConstraint,typescriptConditionalType
 
 syntax match typescriptUnion /|\|&/ contained nextgroup=@typescriptPrimaryType skipwhite skipempty
 
+syntax match typescriptConditionalType /?\|:/ contained nextgroup=@typescriptPrimaryType skipwhite skipempty
+
 syntax cluster typescriptFunctionType contains=typescriptGenericFunc,typescriptFuncType
 syntax region typescriptGenericFunc matchgroup=typescriptTypeBrackets
   \ start=/</ end=/>/
diff --git a/syntax/common.vim b/syntax/common.vim
index 0fca4de11..b5e5c16cf 100644
--- a/syntax/common.vim
+++ b/syntax/common.vim
@@ -71,6 +71,7 @@ if exists("did_typescript_hilink")
   HiLink typescriptString               String
   HiLink typescriptSpecial              Special
   HiLink typescriptStringLiteralType    String
+  HiLink typescriptTemplateLiteralType  String
   HiLink typescriptStringMember         String
   HiLink typescriptTemplate             String
   HiLink typescriptEventString          String
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index ca057b3da..890bb279a 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -20,10 +20,6 @@ syn keyword elixirTodo FIXME NOTE TODO OPTIMIZE XXX HACK contained
 
 syn match elixirId '\<[_a-zA-Z]\w*[!?]\?\>' contains=elixirUnusedVariable
 
-syn match elixirFunctionCall '\<[a-z_]\w*[!?]\?\(\s*\.\?\s*(\|\s\+[a-zA-Z0-9@:\'\"\[]\)\@='
-syn match elixirFunctionCall '\(:\w\+\s*\.\s*\|[A-Z]\w*\s*\.\s*\)\@<=[a-z_]\w*[!?]\?'
-syn match elixirFunctionCall '\(>\s+\)\<[a-z_]\w*[!?]\?'
-
 syn match elixirKeyword '\(\.\)\@<!\<\(for\|case\|when\|with\|cond\|if\|unless\|try\|receive\|after\|raise\|rescue\|catch\|else\|quote\|unquote\|super\|unquote_splicing\)\>:\@!'
 
 syn keyword elixirInclude import require alias use
@@ -48,7 +44,7 @@ syn match   elixirOperator '\~>\|\~>>\|<\~\|<<\~\|<\~>'
 
 syn match   elixirAlias '\([a-z]\)\@<![A-Z]\w*\%(\.[A-Z]\w*\)*'
 
-syn match   elixirAtom '\(:\)\@<!:\%([a-zA-Z_]\w*\%([?!]\|=[>=]\@!\)\?\|<>\|===\?\|>=\?\|<=\?\)'
+syn match   elixirAtom '\(:\)\@<!:\%([a-zA-Z_*]\w*\%([?!]\|=[>=]\@!\)\?\|<>\|===\?\|>=\?\|<=\?\)'
 syn match   elixirAtom '\(:\)\@<!:\%(<=>\|&&\?\|%\(()\|\[\]\|{}\)\|++\?\|--\?\|||\?\|!\|//\|[%&`/|]\)'
 syn match   elixirAtom "\%([a-zA-Z_]\w*[?!]\?\):\(:\)\@!"
 

From 2116dd281b99ed77bf9134f96a33230dc5b30e1c Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 28 Sep 2020 00:31:39 +0200
Subject: [PATCH 075/299] Fix some missing extensions warnings

---
 Makefile              |  2 +-
 autoload/sleuth.vim   |  2 +-
 ftdetect/polyglot.vim |  9 ++++--
 packages.yaml         |  5 +++-
 scripts/build         | 64 +++++++++++++++++++++++++++++--------------
 5 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index cc1851b0e..b21d73584 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ test:
 	@ scripts/test
 
 dev:
-	@ echo "polyglot.vim\npackages.yaml\nheuristics.yaml\nscripts/test\nscripts/build\ntests/extensions.vim" | DEV=1 entr bash -c 'make && make test'
+	@ find scripts . -type f -depth 1 | DEV=1 entr bash -c 'make && make test'
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index aa61d8fb8..41ebe474d 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -200,7 +200,7 @@ let s:globs = {
   \ 'terraform': '*.hcl,*.nomad,*.tf,*.tfvars,*.workflow',
   \ 'textile': '*.textile',
   \ 'thrift': '*.thrift',
-  \ 'tmux': '.tmux.conf',
+  \ 'tmux': '.tmux*.conf',
   \ 'toml': '*.toml,Cargo.lock,Gopkg.lock,poetry.lock,Pipfile',
   \ 'tptp': '*.p,*.tptp,*.ax',
   \ 'trasys': '*.inp',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 4b01a2414..52c536e9f 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -427,7 +427,7 @@ if !has_key(s:disabled_packages, 'scss')
 endif
 
 if !has_key(s:disabled_packages, 'sh')
-  au! BufRead,BufNewFile *.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout
+  au! BufRead,BufNewFile */etc/udev/cdsymlinks.conf,*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout
 endif
 
 if !has_key(s:disabled_packages, 'smt2')
@@ -446,6 +446,10 @@ if !has_key(s:disabled_packages, 'terraform')
   au! BufRead,BufNewFile *.tf
 endif
 
+if !has_key(s:disabled_packages, 'tmux')
+  au! BufRead,BufNewFile .tmux*.conf
+endif
+
 if !has_key(s:disabled_packages, 'toml')
   au! BufRead,BufNewFile Pipfile
 endif
@@ -1737,6 +1741,7 @@ if !has_key(s:disabled_packages, 'sh')
   au BufNewFile,BufRead *.sh.in set ft=sh
   au BufNewFile,BufRead *.tmux set ft=sh
   au BufNewFile,BufRead *.tool set ft=sh
+  au BufNewFile,BufRead */etc/udev/cdsymlinks.conf set ft=sh
   au BufNewFile,BufRead {.,}bash_aliases set ft=sh
   au BufNewFile,BufRead {.,}bash_history set ft=sh
   au BufNewFile,BufRead {.,}bash_logout set ft=sh
@@ -1834,7 +1839,7 @@ if !has_key(s:disabled_packages, 'thrift')
 endif
 
 if !has_key(s:disabled_packages, 'tmux')
-  au BufNewFile,BufRead {.,}tmux.conf set ft=tmux
+  au BufNewFile,BufRead {.,}tmux*.conf set ft=tmux
 endif
 
 if !has_key(s:disabled_packages, 'toml')
diff --git a/packages.yaml b/packages.yaml
index bbbb8a880..78595209c 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1492,6 +1492,9 @@ filetypes:
   - 'zlogin'
   - 'zprofile'
   - 'zlogout'
+  extra_filenames:
+  # Udev symlinks config
+  - '*/etc/udev/cdsymlinks.conf'
 - name: zsh
   extensions:
   - zsh
@@ -1611,7 +1614,7 @@ remote: ericpruitt/tmux.vim:vim
 filetypes:
 - name: tmux
   filenames:
-  - '.tmux.conf'
+  - '.tmux*.conf'
 ---
 name: toml
 remote: cespare/vim-toml
diff --git a/scripts/build b/scripts/build
index 685571966..0d810d7bd 100755
--- a/scripts/build
+++ b/scripts/build
@@ -539,23 +539,7 @@ def generate_ftdetect(packages, heuristics)
     end
   end
  
-  defined_extensions = all_filetypes.flat_map { |f| expand_all(f["extensions"] || []).map { |e| [f["name"], e] } }
-  expected_extensions = expected_filetypes.flat_map { |f| expand_all(f["extensions"] || []).map { |e| [f["name"], e] } }
-  ignored_extensions = all_filetypes.flat_map { |f| expand_all(f.fetch("ignored_extensions", [])).map { |e| [f["name"], e] } }
-
-  defined_filenames = all_filetypes.flat_map { |f| expand_all(f["filenames"] || []).map { |e| [f["name"], e] } }
-  expected_filenames = expected_filetypes.flat_map { |f| expand_all(f["filenames"] || []).map { |e| [f["name"], e] } }
-  ignored_filenames = all_filetypes.flat_map { |f| expand_all(f.fetch("ignored_filenames", [])).map { |e| [f["name"], e] } }
-
-  ignored_warnings = all_filetypes.flat_map { |f| expand_all(f.fetch("ignored_warnings", [])).map { |e| [f["name"], e] } + [f, "*"] }
-
-  for name, e in expected_extensions - defined_extensions - ignored_extensions - ignored_warnings
-    puts "Missing extension for #{name}: #{e}"
-  end
-
-  for name, e in expected_filenames - defined_filenames - ignored_filenames - ignored_warnings
-    puts "Missing filename for #{name}: #{e}"
-  end
+  show_warnings(all_filetypes, expected_filetypes)
 
   ftdetect = read_section('ftdetect/polyglot.vim')
 
@@ -650,14 +634,30 @@ def comma_expanson(s)
   end
 end
 
-def expand_all(pattern)
+def expand_all(pattern, all = false)
+  if !pattern
+    return []
+  end
+
   if pattern.is_a?(Array)
-    return pattern.flat_map { |p| expand_all(p) }
+    return pattern.flat_map { |p| expand_all(p, all) }
   end
 
   comma_expanson(pattern).flat_map do |e|
     brace_expansion(e).flat_map do |e2|
-      square_expansion(e2)
+      square_expansion(e2).flat_map do |e3|
+        results = [e3]
+        if all
+          if e3[0] == "."
+            results << e3[1..-1]
+          end
+          if e3.include?("*")
+            results.concat(results.map { |e4| e4.gsub("*", "") })
+          end
+          results << "*"
+        end
+        results
+      end
     end
   end
 end
@@ -719,6 +719,30 @@ def generate_plugins(packages)
   File.write('autoload/sleuth.vim', output)
 end
 
+def process_list(list, extras)
+  list.flat_map do |f|
+    expand_all(yield f, extras).uniq.map { |e| [f["name"], e] }
+  end
+end
+
+def show_warnings(all_filetypes, expected_filetypes)
+  all_expected = process_list(expected_filetypes, false) do |f|
+    (f["extensions"] || []).map { |e| "*" + e } + (f["filenames"] || [])
+  end
+
+  all_handled = process_list(all_filetypes, all_expected) do |f|
+    [f["filenames"], f["ignored_filenames"], f["ignored_warnings"]].compact.flatten + 
+      [f["extensions"], f["ignored_extensions"]].compact.flatten.map { |e| "*." + e }
+  end
+
+  for name, e in all_expected - all_handled
+    if e.match?(/\/\*\.[^\/]+$/) && all_handled.include?([name, e.split('/').last])
+      next
+    end
+    puts "Missing for #{name}: #{e}"
+  end
+end
+
 
 if __FILE__ == $0
   if !ENV["DEV"]

From 63369f98efbe23400f54cd67579c09b6dad8b420 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 28 Sep 2020 00:41:10 +0200
Subject: [PATCH 076/299] Fix missing filetypes detection

---
 packages.yaml | 24 ++++++++++++------------
 scripts/build |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages.yaml b/packages.yaml
index 78595209c..2de5535e0 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -327,8 +327,8 @@ filetypes:
   - ino
   ignored_warnings:
   # TODO: fix these
-  - C
-  - H
+  - '*.C'
+  - '*.H'
 - name: c
   linguist: C
   extra_extensions:
@@ -389,9 +389,9 @@ filetypes:
   # Probably mistake
   - '*Cakefile'
   # Used by C#
-  - csx
+  - '*.csx'
   # Used by Chuck
-  - ck
+  - '*.ck'
 - name: litcoffee
   linguist: Literate CoffeeScript
   extra_extensions:
@@ -433,7 +433,7 @@ filetypes:
   - tab
   ignored_warnings:
   # This is definitely not csv-only, maybe re-enable when heuristics done
-  - dat
+  - '*.dat'
 ---
 name: cucumber
 remote: tpope/vim-cucumber
@@ -924,8 +924,8 @@ filetypes:
   - ect
   ignored_warnings:
   # I haven't found reference to them on github
-  - djs
-  - hamljs
+  - '*.djs'
+  - '*.hamljs'
 ---
 name: jsx
 remote: MaxMEllon/vim-jsx-pretty
@@ -1042,7 +1042,7 @@ filetypes:
   # Handled by mdx extension
   - mdx
   ignored_warnings:
-  - '{md,mdx,mdown,mkd,mkdn,markdown,mdwn}.{des3,des,bf,bfa,aes,idea,cast,rc2,rc4,rc5,desx}'
+  - '*.{md,mdx,mdown,mkd,mkdn,markdown,mdwn}.{des3,des,bf,bfa,aes,idea,cast,rc2,rc4,rc5,desx}'
 ---
 name: mdx
 remote: jxnblk/vim-mdx-js
@@ -1642,9 +1642,9 @@ filetypes:
   linguist: Twig
   ignored_warnings:
   # handled by other extension
-  - xml.twig
+  - '*.xml.twig'
   # already covered by .twig
-  - html.twig
+  - '*.html.twig'
 - name: xml.twig
   extensions:
   - xml.twig
@@ -1835,7 +1835,7 @@ filetypes:
   # SaxBasic is close to Visual Basic
   - sba
   ignored_warnings:
-  - vb
+  - '*.vb'
 ---
 name: dosini
 remote: vim/vim:runtime
@@ -1853,7 +1853,7 @@ filetypes:
   ignored_extensions:
   - cfg
   ignored_warnings:
-  - php.ini
+  - '*.php.ini'
 ---
 name: odin
 remote: Tetralux/odin.vim
diff --git a/scripts/build b/scripts/build
index 0d810d7bd..513b80bbf 100755
--- a/scripts/build
+++ b/scripts/build
@@ -721,13 +721,13 @@ end
 
 def process_list(list, extras)
   list.flat_map do |f|
-    expand_all(yield f, extras).uniq.map { |e| [f["name"], e] }
+    expand_all(yield(f), extras).uniq.map { |e| [f["name"], e] }
   end
 end
 
 def show_warnings(all_filetypes, expected_filetypes)
   all_expected = process_list(expected_filetypes, false) do |f|
-    (f["extensions"] || []).map { |e| "*" + e } + (f["filenames"] || [])
+    (f["extensions"] || []).map { |e| "*." + e } + (f["filenames"] || [])
   end
 
   all_handled = process_list(all_filetypes, all_expected) do |f|

From 312e95099dd38d29be0339b61ff157536ea4df02 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 28 Sep 2020 00:43:36 +0200
Subject: [PATCH 077/299] Show warnings only for DEV build

---
 autoload/sleuth.vim   | 2 +-
 ftdetect/polyglot.vim | 6 +++++-
 packages.yaml         | 5 +++++
 scripts/build         | 3 +++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 41ebe474d..abe8cd85f 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -218,7 +218,7 @@ let s:globs = {
   \ 'vmasm': '*.mar',
   \ 'vue': '*.vue,*.wpy',
   \ 'xdc': '*.xdc',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,*.fglrxrc,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
   \ 'xml.twig': '*.xml.twig',
   \ 'xs': '*.xs',
   \ 'xsl': '*.xslt,*.xsl',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 52c536e9f..18ccd1367 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -163,7 +163,7 @@ if !has_key(s:disabled_packages, 'ampl')
 endif
 
 if !has_key(s:disabled_packages, 'xml')
-  au! BufRead,BufNewFile *.csproj,*.ui,*.wsdl,*.wsf,*.xlf,*.xliff,*.xmi,*.xsd,*.xul,*.tpm,*.csproj.user,*.wpl
+  au! BufRead,BufNewFile *.csproj,*.ui,*.wsdl,*.wsf,*.xlf,*.xliff,*.xmi,*.xsd,*.xul,*.tpm,*.csproj.user,*.wpl,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu
 endif
 
 if !has_key(s:disabled_packages, 'ant')
@@ -610,6 +610,7 @@ if !has_key(s:disabled_packages, 'xml')
   au BufNewFile,BufRead *.ditaval set ft=xml
   au BufNewFile,BufRead *.dll.config set ft=xml
   au BufNewFile,BufRead *.dotsettings set ft=xml
+  au BufNewFile,BufRead *.fglrxrc set ft=xml
   au BufNewFile,BufRead *.filters set ft=xml
   au BufNewFile,BufRead *.fsproj set ft=xml
   au BufNewFile,BufRead *.fxml set ft=xml
@@ -687,6 +688,9 @@ if !has_key(s:disabled_packages, 'xml')
   au BufNewFile,BufRead *.xspec set ft=xml
   au BufNewFile,BufRead *.xul set ft=xml
   au BufNewFile,BufRead *.zcml set ft=xml
+  au BufNewFile,BufRead */etc/blkid.tab set ft=xml
+  au BufNewFile,BufRead */etc/blkid.tab.old set ft=xml
+  au BufNewFile,BufRead */etc/xdg/menus/*.menu set ft=xml
   au BufNewFile,BufRead {.,}classpath set ft=xml
   au BufNewFile,BufRead {.,}cproject set ft=xml
   au BufNewFile,BufRead {.,}project set ft=xml
diff --git a/packages.yaml b/packages.yaml
index 2de5535e0..322a3a156 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1731,6 +1731,11 @@ filetypes:
   - tpm
   - csproj.user
   - wpl
+  - fglrxrc
+  extra_filenames:
+  - '*/etc/blkid.tab'
+  - '*/etc/blkid.tab.old'
+  - '*/etc/xdg/menus/*.menu'
   ignored_extensions:
   - ts
   - tsx
diff --git a/scripts/build b/scripts/build
index 513b80bbf..bc5cd1264 100755
--- a/scripts/build
+++ b/scripts/build
@@ -726,6 +726,9 @@ def process_list(list, extras)
 end
 
 def show_warnings(all_filetypes, expected_filetypes)
+  if !ENV["DEV"]
+    return
+  end
   all_expected = process_list(expected_filetypes, false) do |f|
     (f["extensions"] || []).map { |e| "*." + e } + (f["filenames"] || [])
   end

From b7598ff0c522e56f0a42706176f2fa621d9a1c8e Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 28 Sep 2020 01:23:00 +0200
Subject: [PATCH 078/299] Add missing filetypes for systemd

---
 autoload/sleuth.vim   | 2 +-
 ftdetect/polyglot.vim | 8 ++++++++
 packages.yaml         | 9 +++++++++
 scripts/build         | 9 ++++++++-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index abe8cd85f..ac0b49f5f 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -194,7 +194,7 @@ let s:globs = {
   \ 'svg': '*.svg',
   \ 'swift': '*.swift',
   \ 'sxhkdrc': '*.sxhkdrc,sxhkdrc',
-  \ 'systemd': '*.automount,*.mount,*.path,*.service,*.socket,*.swap,*.target,*.timer',
+  \ 'systemd': '*.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*.#*',
   \ 'tablegen': '*.td',
   \ 'tads': '*.t',
   \ 'terraform': '*.hcl,*.nomad,*.tf,*.tfvars,*.workflow',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 18ccd1367..ced2ce15f 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1817,13 +1817,21 @@ endif
 
 if !has_key(s:disabled_packages, 'systemd')
   au BufNewFile,BufRead *.automount set ft=systemd
+  au BufNewFile,BufRead *.dnssd set ft=systemd
+  au BufNewFile,BufRead *.link set ft=systemd
   au BufNewFile,BufRead *.mount set ft=systemd
+  au BufNewFile,BufRead *.netdev set ft=systemd
+  au BufNewFile,BufRead *.network set ft=systemd
+  au BufNewFile,BufRead *.nspawn set ft=systemd
   au BufNewFile,BufRead *.path set ft=systemd
   au BufNewFile,BufRead *.service set ft=systemd
+  au BufNewFile,BufRead *.slice set ft=systemd
   au BufNewFile,BufRead *.socket set ft=systemd
   au BufNewFile,BufRead *.swap set ft=systemd
   au BufNewFile,BufRead *.target set ft=systemd
   au BufNewFile,BufRead *.timer set ft=systemd
+  au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
+  au BufNewFile,BufRead */systemd/*.conf set ft=systemd
 endif
 
 if !has_key(s:disabled_packages, 'terraform')
diff --git a/packages.yaml b/packages.yaml
index 322a3a156..1ef2942aa 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1583,13 +1583,22 @@ filetypes:
 - name: systemd
   extensions:
   - automount
+  - dnssd
+  - link
   - mount
+  - netdev
+  - network
+  - nspawn
   - path
   - service
+  - slice
   - socket
   - swap
   - target
   - timer
+  filenames:
+  - '*.#*'
+  - '*/systemd/*.conf'
 ---
 name: terraform
 remote: hashivim/vim-terraform
diff --git a/scripts/build b/scripts/build
index bc5cd1264..dd0af0c07 100755
--- a/scripts/build
+++ b/scripts/build
@@ -738,8 +738,15 @@ def show_warnings(all_filetypes, expected_filetypes)
       [f["extensions"], f["ignored_extensions"]].compact.flatten.map { |e| "*." + e }
   end
 
+  all_handled_regexps = Hash[all_handled.group_by { |a, b| a }.map { |a, b| [a, b[1]] }.map do |a, b|
+    [a, Regexp.union(b.map { |x| Regexp.escape(x).gsub('\\*', '.*') })]
+  end]
+
   for name, e in all_expected - all_handled
-    if e.match?(/\/\*\.[^\/]+$/) && all_handled.include?([name, e.split('/').last])
+    if e.match?(/\/\*?\.[^\/]+$/) && all_handled.include?([name, e.split('/').last.gsub('*', '')])
+      next
+    end
+    if e.include?('*') && all_handled_regexps[name].match?(e)
       next
     end
     puts "Missing for #{name}: #{e}"

From ae778bdb175f930b69facec5f3ccd1b95953bc88 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 28 Sep 2020 01:33:57 +0200
Subject: [PATCH 079/299] Add missing filetypes for sql

---
 README.md             |   3 +-
 autoload/sleuth.vim   |   2 +-
 ftdetect/polyglot.vim |  26 ++
 ftplugin/sql.vim      | 552 ++++++++++++++++++++++++++++++++++++++++++
 indent/sql.vim        |  43 ++++
 packages.yaml         |  11 +
 syntax/sql.vim        |  40 +++
 tests/filetypes.vim   |   1 +
 8 files changed, 676 insertions(+), 2 deletions(-)
 create mode 100644 ftplugin/sql.vim
 create mode 100644 indent/sql.vim
 create mode 100644 syntax/sql.vim

diff --git a/README.md b/README.md
index fcd206b8d..2fbbccd91 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->201<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->202<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -210,6 +210,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [slime](https://github.com/slime-lang/vim-slime-syntax)
 - [smt2](https://github.com/bohlender/vim-smt2)
 - [solidity](https://github.com/tomlion/vim-solidity)
+- [sql](https://github.com/vim/vim/tree/master/runtime)
 - [stylus](https://github.com/wavded/vim-stylus)
 - [svelte](https://github.com/evanleck/vim-svelte/tree/main)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index ac0b49f5f..4c1ba5b8b 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -188,7 +188,7 @@ let s:globs = {
   \ 'slime': '*.slime',
   \ 'smt2': '*.smt2,*.smt',
   \ 'solidity': '*.sol',
-  \ 'sql': '*.pgsql',
+  \ 'sql': '*.pgsql,*.pls,*.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.vw,*.tyb,*.typ,*.tyc',
   \ 'stylus': '*.styl,*.stylus',
   \ 'svelte': '*.svelte',
   \ 'svg': '*.svg',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index ced2ce15f..b6a772b76 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -506,6 +506,10 @@ if !has_key(s:disabled_packages, 'tads')
   au! BufRead,BufNewFile *.t
 endif
 
+if !has_key(s:disabled_packages, 'sql')
+  au! BufRead,BufNewFile *.pls,*.pkb,*.pks,*.plsql,*.tyb,*.typ,*.tyc
+endif
+
 if !has_key(s:disabled_packages, '8th')
   au BufNewFile,BufRead *.8th set ft=8th
 endif
@@ -2046,6 +2050,28 @@ if !has_key(s:disabled_packages, 'gitignore')
   au BufNewFile,BufRead {.,}gitignore set ft=gitignore
 endif
 
+if !has_key(s:disabled_packages, 'sql')
+  au BufNewFile,BufRead *.bdy set ft=sql
+  au BufNewFile,BufRead *.ddl set ft=sql
+  au BufNewFile,BufRead *.fnc set ft=sql
+  au BufNewFile,BufRead *.pck set ft=sql
+  au BufNewFile,BufRead *.pkb set ft=sql
+  au BufNewFile,BufRead *.pks set ft=sql
+  au BufNewFile,BufRead *.plb set ft=sql
+  au BufNewFile,BufRead *.pls set ft=sql
+  au BufNewFile,BufRead *.plsql set ft=sql
+  au BufNewFile,BufRead *.prc set ft=sql
+  au BufNewFile,BufRead *.spc set ft=sql
+  au BufNewFile,BufRead *.sql set ft=sql
+  au BufNewFile,BufRead *.tpb set ft=sql
+  au BufNewFile,BufRead *.tps set ft=sql
+  au BufNewFile,BufRead *.trg set ft=sql
+  au BufNewFile,BufRead *.tyb set ft=sql
+  au BufNewFile,BufRead *.tyc set ft=sql
+  au BufNewFile,BufRead *.typ set ft=sql
+  au BufNewFile,BufRead *.vw set ft=sql
+endif
+
 
 
 au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
diff --git a/ftplugin/sql.vim b/ftplugin/sql.vim
new file mode 100644
index 000000000..41e1d2bf4
--- /dev/null
+++ b/ftplugin/sql.vim
@@ -0,0 +1,552 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
+
+" SQL filetype plugin file
+" Language:    SQL (Common for Oracle, Microsoft SQL Server, Sybase)
+" Version:     12.0
+" Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
+" Last Change: 2017 Mar 07
+" Download:    http://vim.sourceforge.net/script.php?script_id=454
+
+" For more details please use:
+"        :h sql.txt
+"
+" This file should only contain values that are common to all SQL languages
+" Oracle, Microsoft SQL Server, Sybase ASA/ASE, MySQL, and so on
+" If additional features are required create:
+"        vimfiles/after/ftplugin/sql.vim (Windows)
+"        .vim/after/ftplugin/sql.vim     (Unix)
+" to override and add any of your own settings.
+
+
+" This file also creates a command, SQLSetType, which allows you to change
+" SQL dialects on the fly.  For example, if I open an Oracle SQL file, it
+" is color highlighted appropriately.  If I open an Informix SQL file, it
+" will still be highlighted according to Oracles settings.  By running:
+"     :SQLSetType sqlinformix
+"
+" All files called sqlinformix.vim will be loaded from the indent and syntax
+" directories.  This allows you to easily flip SQL dialects on a per file
+" basis.  NOTE: you can also use completion:
+"     :SQLSetType <tab>
+"
+" To change the default dialect, add the following to your vimrc:
+"    let g:sql_type_default = 'sqlanywhere'
+"
+" This file also creates a command, SQLGetType, which allows you to
+" determine what the current dialect is in use.
+"     :SQLGetType
+"
+" History
+"
+" Version 12.0 (April 2013)
+"
+" NF: Added support for "BEGIN TRY ... END TRY ... BEGIN CATCH ... END CATCH
+" BF: This plugin is designed to be used with other plugins to enable the 
+"     SQL completion with Perl, Python, Java, ...  The loading mechanism 
+"     was not checking if the SQL objects were created, which can lead to 
+"     the plugin not loading the SQL support.
+"
+" Version 11.0 (May 2013)
+"
+" NF: Updated to use SyntaxComplete's new regex support for syntax groups.
+"
+" Version 10.0 (Dec 2012)
+"
+" NF: Changed all maps to use noremap instead of must map
+" NF: Changed all visual maps to use xnoremap instead of vnoremap as they
+"     should only be used in visual mode and not select mode.
+" BF: Most of the maps were using doubled up backslashes before they were
+"     changed to using the search() function, which meant they no longer
+"     worked.
+"
+" Version 9.0
+"
+" NF: Completes 'b:undo_ftplugin'
+" BF: Correctly set cpoptions when creating script
+"
+" Version 8.0
+"
+" NF: Improved the matchit plugin regex (Talek)
+"
+" Version 7.0
+"
+" NF: Calls the sqlcomplete#ResetCacheSyntax() function when calling
+"     SQLSetType.
+"
+" Version 6.0
+"
+" NF: Adds the command SQLGetType
+"
+" Version 5.0
+"
+" NF: Adds the ability to choose the keys to control SQL completion, just add
+"     the following to your .vimrc:
+"    let g:ftplugin_sql_omni_key       = '<C-C>'
+"    let g:ftplugin_sql_omni_key_right = '<Right>'
+"    let g:ftplugin_sql_omni_key_left  = '<Left>'
+"
+" BF: format-options - Auto-wrap comments using textwidth was turned off
+"                      by mistake.
+
+
+" Only do this when not done yet for this buffer
+" This ftplugin can be used with other ftplugins.  So ensure loading
+" happens if all elements of this plugin have not yet loaded.
+if exists("b:did_ftplugin") && exists("b:current_ftplugin") && b:current_ftplugin == 'sql'
+    finish
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Disable autowrapping for code, but enable for comments
+" t     Auto-wrap text using textwidth
+" c     Auto-wrap comments using textwidth, inserting the current comment
+"       leader automatically.
+setlocal formatoptions-=t
+setlocal formatoptions+=c
+
+" Functions/Commands to allow the user to change SQL syntax dialects
+" through the use of :SQLSetType <tab> for completion.
+" This works with both Vim 6 and 7.
+
+if !exists("*SQL_SetType")
+    " NOTE: You cannot use function! since this file can be
+    " sourced from within this function.  That will result in
+    " an error reported by Vim.
+    function SQL_GetList(ArgLead, CmdLine, CursorPos)
+
+        if !exists('s:sql_list')
+            " Grab a list of files that contain "sql" in their names
+            let list_indent   = globpath(&runtimepath, 'indent/*sql*')
+            let list_syntax   = globpath(&runtimepath, 'syntax/*sql*')
+            let list_ftplugin = globpath(&runtimepath, 'ftplugin/*sql*')
+
+            let sqls = "\n".list_indent."\n".list_syntax."\n".list_ftplugin."\n"
+
+            " Strip out everything (path info) but the filename
+            " Regex
+            "    From between two newline characters
+            "    Non-greedily grab all characters
+            "    Followed by a valid filename \w\+\.\w\+ (sql.vim)
+            "    Followed by a newline, but do not include the newline
+            "
+            "    Replace it with just the filename (get rid of PATH)
+            "
+            "    Recursively, since there are many filenames that contain
+            "    the word SQL in the indent, syntax and ftplugin directory
+            let sqls = substitute( sqls,
+                        \ '[\n]\%(.\{-}\)\(\w\+\.\w\+\)\n\@=',
+                        \ '\1\n',
+                        \ 'g'
+                        \ )
+
+            " Remove duplicates, since sqlanywhere.vim can exist in the
+            " sytax, indent and ftplugin directory, yet we only want
+            " to display the option once
+            let index = match(sqls, '.\{-}\ze\n')
+            while index > -1
+                " Get the first filename
+                let file = matchstr(sqls, '.\{-}\ze\n', index)
+                " Recursively replace any *other* occurrence of that
+                " filename with nothing (ie remove it)
+                let sqls = substitute(sqls, '\%>'.(index+strlen(file)).'c\<'.file.'\>\n', '', 'g')
+                " Move on to the next filename
+                let index = match(sqls, '.\{-}\ze\n', (index+strlen(file)+1))
+            endwhile
+
+            " Sort the list if using version 7
+            if v:version >= 700
+                let mylist = split(sqls, "\n")
+                let mylist = sort(mylist)
+                let sqls   = join(mylist, "\n")
+            endif
+
+            let s:sql_list = sqls
+        endif
+
+        return s:sql_list
+
+    endfunction
+
+    function SQL_SetType(name)
+
+        " User has decided to override default SQL scripts and
+        " specify a vendor specific version
+        " (ie Oracle, Informix, SQL Anywhere, ...)
+        " So check for an remove any settings that prevent the
+        " scripts from being executed, and then source the
+        " appropriate Vim scripts.
+        if exists("b:did_ftplugin")
+            unlet b:did_ftplugin
+        endif
+        if exists("b:current_syntax")
+            " echomsg 'SQLSetType - clearing syntax'
+            syntax clear
+            if exists("b:current_syntax")
+                unlet b:current_syntax
+            endif
+        endif
+        if exists("b:did_indent")
+            " echomsg 'SQLSetType - clearing indent'
+            unlet b:did_indent
+            " Set these values to their defaults
+            setlocal indentkeys&
+            setlocal indentexpr&
+        endif
+
+        " Ensure the name is in the correct format
+        let new_sql_type = substitute(a:name,
+                    \ '\s*\([^\.]\+\)\(\.\w\+\)\?', '\L\1', '')
+
+        " Do not specify a buffer local variable if it is
+        " the default value
+        if new_sql_type == 'sql'
+            let new_sql_type = 'sqloracle'
+        endif
+        let b:sql_type_override = new_sql_type
+
+        " Remove any cached SQL since a new sytax will have different
+        " items and groups
+        if !exists('g:loaded_sql_completion') || g:loaded_sql_completion >= 100
+            call sqlcomplete#ResetCacheSyntax()
+        endif
+
+        " Vim will automatically source the correct files if we
+        " change the filetype.  You cannot do this with setfiletype
+        " since that command will only execute if a filetype has
+        " not already been set.  In this case we want to override
+        " the existing filetype.
+        let &filetype = 'sql'
+
+        if b:sql_compl_savefunc != ""
+            " We are changing the filetype to SQL from some other filetype
+            " which had OMNI completion defined.  We need to activate the
+            " SQL completion plugin in order to cache some of the syntax items
+            " while the syntax rules for SQL are active.
+            call sqlcomplete#PreCacheSyntax()
+        endif
+    endfunction
+    command! -nargs=* -complete=custom,SQL_GetList SQLSetType :call SQL_SetType(<q-args>)
+
+endif
+
+" Functions/Commands to allow the user determine current SQL syntax dialect
+" This works with both Vim 6 and 7.
+
+if !exists("*SQL_GetType")
+    function SQL_GetType()
+        if exists('b:sql_type_override')
+            echomsg "Current SQL dialect in use:".b:sql_type_override
+        else
+            echomsg "Current SQL dialect in use:".g:sql_type_default
+        endif
+    endfunction
+    command! -nargs=0 SQLGetType :call SQL_GetType()
+endif
+
+if exists("b:sql_type_override")
+    " echo 'sourcing buffer ftplugin/'.b:sql_type_override.'.vim'
+    if globpath(&runtimepath, 'ftplugin/'.b:sql_type_override.'.vim') != ''
+        exec 'runtime ftplugin/'.b:sql_type_override.'.vim'
+        " else
+        "     echomsg 'ftplugin/'.b:sql_type_override.' not exist, using default'
+    endif
+elseif exists("g:sql_type_default")
+    " echo 'sourcing global ftplugin/'.g:sql_type_default.'.vim'
+    if globpath(&runtimepath, 'ftplugin/'.g:sql_type_default.'.vim') != ''
+        exec 'runtime ftplugin/'.g:sql_type_default.'.vim'
+        " else
+        "     echomsg 'ftplugin/'.g:sql_type_default.'.vim not exist, using default'
+    endif
+endif
+
+" If the above runtime command succeeded, do not load the default settings
+" as they should have already been loaded from a previous run.
+if exists("b:did_ftplugin") && exists("b:current_ftplugin") && b:current_ftplugin == 'sql'
+    finish
+endif
+
+let b:undo_ftplugin = "setl comments< formatoptions< define< omnifunc<" .
+            \ " | unlet! b:browsefilter b:match_words"
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin     = 1
+let b:current_ftplugin = 'sql'
+
+" Win32 can filter files in the browse dialog
+if has("gui_win32") && !exists("b:browsefilter")
+    let b:browsefilter = "SQL Files (*.sql)\t*.sql\n" .
+                \ "All Files (*.*)\t*.*\n"
+endif
+
+" Some standard expressions for use with the matchit strings
+let s:notend = '\%(\<end\s\+\)\@<!'
+let s:when_no_matched_or_others = '\%(\<when\>\%(\s\+\%(\%(\<not\>\s\+\)\?<matched\>\)\|\<others\>\)\@!\)'
+let s:or_replace = '\%(or\s\+replace\s\+\)\?'
+
+" Define patterns for the matchit macro
+if !exists("b:match_words")
+    " SQL is generally case insensitive
+    let b:match_ignorecase = 1
+
+    " Handle the following:
+    " if
+    " elseif | elsif
+    " else [if]
+    " end if
+    "
+    " [while condition] loop
+    "     leave
+    "     break
+    "     continue
+    "     exit
+    " end loop
+    "
+    " for
+    "     leave
+    "     break
+    "     continue
+    "     exit
+    " end loop
+    "
+    " do
+    "     statements
+    " doend
+    "
+    " case
+    " when
+    " when
+    " default
+    " end case
+    "
+    " merge
+    " when not matched
+    " when matched
+    "
+    " EXCEPTION
+    " WHEN column_not_found THEN
+    " WHEN OTHERS THEN
+    "
+    " begin try
+    " end try
+    " begin catch
+    " end catch
+    "
+    " create[ or replace] procedure|function|event
+    " \ '^\s*\<\%(do\|for\|while\|loop\)\>.*:'.
+
+    " For ColdFusion support
+    setlocal matchpairs+=<:>
+    let b:match_words = &matchpairs .
+                \ ',\%(\<begin\)\%(\s\+\%(try\|catch\)\>\)\@!:\<end\>\W*$,'.
+                \
+                \ '\<begin\s\+try\>:'.
+                \ '\<end\s\+try\>:'.
+                \ '\<begin\s\+catch\>:'.
+                \ '\<end\s\+catch\>,'.
+                \
+                \ s:notend . '\<if\>:'.
+                \ '\<elsif\>\|\<elseif\>\|\<else\>:'.
+                \ '\<end\s\+if\>,'.
+                \
+                \ '\(^\s*\)\@<=\(\<\%(do\|for\|while\|loop\)\>.*\):'.
+                \ '\%(\<exit\>\|\<leave\>\|\<break\>\|\<continue\>\):'.
+                \ '\%(\<doend\>\|\%(\<end\s\+\%(for\|while\|loop\>\)\)\),'.
+                \
+                \ '\%('. s:notend . '\<case\>\):'.
+                \ '\%('.s:when_no_matched_or_others.'\):'.
+                \ '\%(\<when\s\+others\>\|\<end\s\+case\>\),' .
+                \
+                \ '\<merge\>:' .
+                \ '\<when\s\+not\s\+matched\>:' .
+                \ '\<when\s\+matched\>,' .
+                \
+                \ '\%(\<create\s\+' . s:or_replace . '\)\?'.
+                \ '\%(function\|procedure\|event\):'.
+                \ '\<returns\?\>'
+    " \ '\<begin\>\|\<returns\?\>:'.
+    " \ '\<end\>\(;\)\?\s*$'
+    " \ '\<exception\>:'.s:when_no_matched_or_others.
+    " \ ':\<when\s\+others\>,'.
+    "
+    " \ '\%(\<exception\>\|\%('. s:notend . '\<case\>\)\):'.
+    " \ '\%(\<default\>\|'.s:when_no_matched_or_others.'\):'.
+    " \ '\%(\%(\<when\s\+others\>\)\|\<end\s\+case\>\),' .
+endif
+
+" Define how to find the macro definition of a variable using the various
+" [d, [D, [_CTRL_D and so on features
+" Match these values ignoring case
+" ie  DECLARE varname INTEGER
+let &l:define = '\c\<\(VARIABLE\|DECLARE\|IN\|OUT\|INOUT\)\>'
+
+
+" Mappings to move to the next BEGIN ... END block
+" \W - no characters or digits
+nnoremap <buffer> <silent> ]] :call search('\c^\s*begin\>', 'W' )<CR>
+nnoremap <buffer> <silent> [[ :call search('\c^\s*begin\>', 'bW' )<CR>
+nnoremap <buffer> <silent> ][ :call search('\c^\s*end\W*$', 'W' )<CR>
+nnoremap <buffer> <silent> [] :call search('\c^\s*end\W*$', 'bW' )<CR>
+xnoremap <buffer> <silent> ]] :<C-U>exec "normal! gv"<Bar>call search('\c^\s*begin\>', 'W' )<CR>
+xnoremap <buffer> <silent> [[ :<C-U>exec "normal! gv"<Bar>call search('\c^\s*begin\>', 'bW' )<CR>
+xnoremap <buffer> <silent> ][ :<C-U>exec "normal! gv"<Bar>call search('\c^\s*end\W*$', 'W' )<CR>
+xnoremap <buffer> <silent> [] :<C-U>exec "normal! gv"<Bar>call search('\c^\s*end\W*$', 'bW' )<CR>
+
+
+" By default only look for CREATE statements, but allow
+" the user to override
+if !exists('g:ftplugin_sql_statements')
+    let g:ftplugin_sql_statements = 'create'
+endif
+
+" Predefined SQL objects what are used by the below mappings using
+" the ]} style maps.
+" This global variable allows the users to override its value
+" from within their vimrc.
+" Note, you cannot use \?, since these patterns can be used to search
+" backwards, you must use \{,1}
+if !exists('g:ftplugin_sql_objects')
+    let g:ftplugin_sql_objects = 'function,procedure,event,' .
+                \ '\(existing\\|global\s\+temporary\s\+\)\{,1}' .
+                \ 'table,trigger' .
+                \ ',schema,service,publication,database,datatype,domain' .
+                \ ',index,subscription,synchronization,view,variable'
+endif
+
+" Key to trigger SQL completion
+if !exists('g:ftplugin_sql_omni_key')
+    let g:ftplugin_sql_omni_key = '<C-C>'
+endif
+" Key to trigger drill into column list
+if !exists('g:ftplugin_sql_omni_key_right')
+    let g:ftplugin_sql_omni_key_right = '<Right>'
+endif
+" Key to trigger drill out of column list
+if !exists('g:ftplugin_sql_omni_key_left')
+    let g:ftplugin_sql_omni_key_left = '<Left>'
+endif
+
+" Replace all ,'s with bars, except ones with numbers after them.
+" This will most likely be a \{,1} string.
+let s:ftplugin_sql_objects =
+            \ '\c^\s*' .
+            \ '\(\(' .
+            \ substitute(g:ftplugin_sql_statements, ',\d\@!', '\\\\|', 'g') .
+            \ '\)\s\+\(or\s\+replace\s\+\)\{,1}\)\{,1}' .
+            \ '\<\(' .
+            \ substitute(g:ftplugin_sql_objects, ',\d\@!', '\\\\|', 'g') .
+            \ '\)\>'
+
+" Mappings to move to the next CREATE ... block
+exec "nnoremap <buffer> <silent> ]} :call search('".s:ftplugin_sql_objects."', 'W')<CR>"
+exec "nnoremap <buffer> <silent> [{ :call search('".s:ftplugin_sql_objects."', 'bW')<CR>"
+" Could not figure out how to use a :call search() string in visual mode
+" without it ending visual mode
+" Unfortunately, this will add a entry to the search history
+exec 'xnoremap <buffer> <silent> ]} /'.s:ftplugin_sql_objects.'<CR>'
+exec 'xnoremap <buffer> <silent> [{ ?'.s:ftplugin_sql_objects.'<CR>'
+
+" Mappings to move to the next COMMENT
+"
+" Had to double the \ for the \| separator since this has a special
+" meaning on maps
+let b:comment_leader = '\(--\\|\/\/\\|\*\\|\/\*\\|\*\/\)'
+" Find the start of the next comment
+let b:comment_start  = '^\(\s*'.b:comment_leader.'.*\n\)\@<!'.
+            \ '\(\s*'.b:comment_leader.'\)'
+" Find the end of the previous comment
+let b:comment_end = '\(^\s*'.b:comment_leader.'.*\n\)'.
+            \ '\(^\s*'.b:comment_leader.'\)\@!'
+" Skip over the comment
+let b:comment_jump_over  = "call search('".
+            \ '^\(\s*'.b:comment_leader.'.*\n\)\@<!'.
+            \ "', 'W')"
+let b:comment_skip_back  = "call search('".
+            \ '^\(\s*'.b:comment_leader.'.*\n\)\@<!'.
+            \ "', 'bW')"
+" Move to the start and end of comments
+exec 'nnoremap <silent><buffer> ]" :call search('."'".b:comment_start."'".', "W" )<CR>'
+exec 'nnoremap <silent><buffer> [" :call search('."'".b:comment_end."'".', "W" )<CR>'
+exec 'xnoremap <silent><buffer> ]" :<C-U>exec "normal! gv"<Bar>call search('."'".b:comment_start."'".', "W" )<CR>'
+exec 'xnoremap <silent><buffer> [" :<C-U>exec "normal! gv"<Bar>call search('."'".b:comment_end."'".', "W" )<CR>'
+
+" Comments can be of the form:
+"   /*
+"    *
+"    */
+" or
+"   --
+" or
+"   //
+setlocal comments=s1:/*,mb:*,ex:*/,:--,://
+
+" Set completion with CTRL-X CTRL-O to autoloaded function.
+if exists('&omnifunc')
+    " Since the SQL completion plugin can be used in conjunction
+    " with other completion filetypes it must record the previous
+    " OMNI function prior to setting up the SQL OMNI function
+    let b:sql_compl_savefunc = &omnifunc
+
+    " Source it to determine its version
+    runtime autoload/sqlcomplete.vim
+    " This is used by the sqlcomplete.vim plugin
+    " Source it for its global functions
+    runtime autoload/syntaxcomplete.vim
+
+    setlocal omnifunc=sqlcomplete#Complete
+    " Prevent the intellisense plugin from loading
+    let b:sql_vis = 1
+    if !exists('g:omni_sql_no_default_maps')
+        let regex_extra = ''
+        if exists('g:loaded_syntax_completion') && exists('g:loaded_sql_completion')
+            if g:loaded_syntax_completion > 120 && g:loaded_sql_completion > 140
+                let regex_extra = '\\w*'
+            endif
+        endif
+        " Static maps which use populate the completion list
+        " using Vim's syntax highlighting rules
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'a <C-\><C-O>:call sqlcomplete#Map("syntax")<CR><C-X><C-O>'
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'k <C-\><C-O>:call sqlcomplete#Map("sqlKeyword'.regex_extra.'")<CR><C-X><C-O>'
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'f <C-\><C-O>:call sqlcomplete#Map("sqlFunction'.regex_extra.'")<CR><C-X><C-O>'
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'o <C-\><C-O>:call sqlcomplete#Map("sqlOption'.regex_extra.'")<CR><C-X><C-O>'
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'T <C-\><C-O>:call sqlcomplete#Map("sqlType'.regex_extra.'")<CR><C-X><C-O>'
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'s <C-\><C-O>:call sqlcomplete#Map("sqlStatement'.regex_extra.'")<CR><C-X><C-O>'
+        " Dynamic maps which use populate the completion list
+        " using the dbext.vim plugin
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'t <C-\><C-O>:call sqlcomplete#Map("table")<CR><C-X><C-O>'
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'p <C-\><C-O>:call sqlcomplete#Map("procedure")<CR><C-X><C-O>'
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'v <C-\><C-O>:call sqlcomplete#Map("view")<CR><C-X><C-O>'
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'c <C-\><C-O>:call sqlcomplete#Map("column")<CR><C-X><C-O>'
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'l <C-\><C-O>:call sqlcomplete#Map("column_csv")<CR><C-X><C-O>'
+        " The next 3 maps are only to be used while the completion window is
+        " active due to the <CR> at the beginning of the map
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'L <C-Y><C-\><C-O>:call sqlcomplete#Map("column_csv")<CR><C-X><C-O>'
+        " <C-Right> is not recognized on most Unix systems, so only create
+        " these additional maps on the Windows platform.
+        " If you would like to use these maps, choose a different key and make
+        " the same map in your vimrc.
+        " if has('win32')
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key_right.' <C-R>=sqlcomplete#DrillIntoTable()<CR>'
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key_left.'  <C-R>=sqlcomplete#DrillOutOfColumns()<CR>'
+        " endif
+        " Remove any cached items useful for schema changes
+        exec 'inoremap <buffer> '.g:ftplugin_sql_omni_key.'R <C-\><C-O>:call sqlcomplete#Map("resetCache")<CR><C-X><C-O>'
+    endif
+
+    if b:sql_compl_savefunc != ""
+        " We are changing the filetype to SQL from some other filetype
+        " which had OMNI completion defined.  We need to activate the
+        " SQL completion plugin in order to cache some of the syntax items
+        " while the syntax rules for SQL are active.
+        call sqlcomplete#ResetCacheSyntax()
+        call sqlcomplete#PreCacheSyntax()
+    endif
+endif
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:sw=4:
+
+endif
diff --git a/indent/sql.vim b/indent/sql.vim
new file mode 100644
index 000000000..495845242
--- /dev/null
+++ b/indent/sql.vim
@@ -0,0 +1,43 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
+
+" Vim indent file loader
+" Language:    SQL
+" Maintainer:  David Fishburn <fishburn at ianywhere dot com>
+" Last Change: Thu Sep 15 2005 10:27:51 AM
+" Version:     1.0
+" Download:    http://vim.sourceforge.net/script.php?script_id=495
+
+" Description: Checks for a:
+"                  buffer local variable,
+"                  global variable,
+"              If the above exist, it will source the type specified.
+"              If none exist, it will source the default sqlanywhere.vim file.
+
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+
+" Default to the standard Vim distribution file
+let filename = 'sqlanywhere'
+
+" Check for overrides.  Buffer variables have the highest priority.
+if exists("b:sql_type_override")
+    " Check the runtimepath to see if the file exists
+    if globpath(&runtimepath, 'indent/'.b:sql_type_override.'.vim') != ''
+        let filename = b:sql_type_override
+    endif
+elseif exists("g:sql_type_default")
+    if globpath(&runtimepath, 'indent/'.g:sql_type_default.'.vim') != ''
+        let filename = g:sql_type_default
+    endif
+endif
+
+" Source the appropriate file
+exec 'runtime indent/'.filename.'.vim'
+
+
+" vim:sw=4:
+
+endif
diff --git a/packages.yaml b/packages.yaml
index 1ef2942aa..494812f6e 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1908,3 +1908,14 @@ filetypes:
   - '.gitignore'
   - '*/.config/git/ignore'
   - '*.git/info/exclude'
+---
+name: sql
+remote: vim/vim:runtime
+glob: '**/sql.vim'
+filetypes:
+- name: sql
+  linguist: PLSQL
+  extra_extensions:
+  - tyb
+  - typ
+  - tyc
diff --git a/syntax/sql.vim b/syntax/sql.vim
new file mode 100644
index 000000000..54cc4673f
--- /dev/null
+++ b/syntax/sql.vim
@@ -0,0 +1,40 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
+
+" Vim syntax file loader
+" Language:    SQL
+" Maintainer:  David Fishburn <fishburn at ianywhere dot com>
+" Last Change: Thu Sep 15 2005 10:30:02 AM
+" Version:     1.0
+
+" Description: Checks for a:
+"                  buffer local variable,
+"                  global variable,
+"              If the above exist, it will source the type specified.
+"              If none exist, it will source the default sql.vim file.
+"
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+" Default to the standard Vim distribution file
+let filename = 'sqloracle'
+
+" Check for overrides.  Buffer variables have the highest priority.
+if exists("b:sql_type_override")
+    " Check the runtimepath to see if the file exists
+    if globpath(&runtimepath, 'syntax/'.b:sql_type_override.'.vim') != ''
+        let filename = b:sql_type_override
+    endif
+elseif exists("g:sql_type_default")
+    if globpath(&runtimepath, 'syntax/'.g:sql_type_default.'.vim') != ''
+        let filename = g:sql_type_default
+    endif
+endif
+
+" Source the appropriate file
+exec 'runtime syntax/'.filename.'.vim'
+
+" vim:sw=4:
+
+endif
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index accc0a728..78edf1ef7 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -237,3 +237,4 @@ call TestFiletype('bzl')
 call TestFiletype('prolog')
 call TestFiletype('tads')
 call TestFiletype('gitignore')
+call TestFiletype('sql')

From 417df69667c1df5484d01ea766320324759d8718 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 28 Sep 2020 02:19:06 +0200
Subject: [PATCH 080/299] Fix zsh missing filenames

---
 autoload/sleuth.vim   | 2 +-
 ftdetect/polyglot.vim | 5 ++++-
 packages.yaml         | 3 +++
 scripts/build         | 6 +++++-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 4c1ba5b8b..d73e48bf2 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -228,7 +228,7 @@ let s:globs = {
   \ 'zephir': '*.zep',
   \ 'zig': '*.zig,*.zir',
   \ 'zir': '*.zir',
-  \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout',
+  \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks',
   \}
 
 func! sleuth#GlobForFiletype(type)
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index b6a772b76..ad8feb246 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -427,7 +427,7 @@ if !has_key(s:disabled_packages, 'scss')
 endif
 
 if !has_key(s:disabled_packages, 'sh')
-  au! BufRead,BufNewFile */etc/udev/cdsymlinks.conf,*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout
+  au! BufRead,BufNewFile */etc/udev/cdsymlinks.conf,*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks
 endif
 
 if !has_key(s:disabled_packages, 'smt2')
@@ -1773,6 +1773,9 @@ if !has_key(s:disabled_packages, 'sh')
   au BufNewFile,BufRead man set ft=sh
   au BufNewFile,BufRead profile set ft=sh
   au BufNewFile,BufRead *.zsh set ft=zsh
+  au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
+  au BufNewFile,BufRead {.,}zfbfmarks set ft=zsh
+  au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh')
   au BufNewFile,BufRead {.,}zlogin set ft=zsh
   au BufNewFile,BufRead {.,}zlogout set ft=zsh
   au BufNewFile,BufRead {.,}zprofile set ft=zsh
diff --git a/packages.yaml b/packages.yaml
index 494812f6e..e0c4be4cf 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1504,6 +1504,9 @@ filetypes:
   - '.zlogin'
   - '.zprofile'
   - '.zlogout'
+  - '.zlog*'
+  - '.zcompdump*'
+  - '.zfbfmarks'
 ---
 name: zinit
 remote: zinit-zsh/zplugin-vim-syntax
diff --git a/scripts/build b/scripts/build
index dd0af0c07..49ae41e17 100755
--- a/scripts/build
+++ b/scripts/build
@@ -729,6 +729,7 @@ def show_warnings(all_filetypes, expected_filetypes)
   if !ENV["DEV"]
     return
   end
+
   all_expected = process_list(expected_filetypes, false) do |f|
     (f["extensions"] || []).map { |e| "*." + e } + (f["filenames"] || [])
   end
@@ -742,8 +743,11 @@ def show_warnings(all_filetypes, expected_filetypes)
     [a, Regexp.union(b.map { |x| Regexp.escape(x).gsub('\\*', '.*') })]
   end]
 
+  puts all_handled.select { |a, b| a.include?('zsh') }
+
+  puts all_handled_regexps["zsh"]
   for name, e in all_expected - all_handled
-    if e.match?(/\/\*?\.[^\/]+$/) && all_handled.include?([name, e.split('/').last.gsub('*', '')])
+    if all_handled.include?([name, e.split('/').last.gsub('*', '')])
       next
     end
     if e.include?('*') && all_handled_regexps[name].match?(e)

From 692db4dc29293f713999cab70740e9f39cc71c40 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 28 Sep 2020 02:30:26 +0200
Subject: [PATCH 081/299] Fix more warnings

---
 scripts/build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/build b/scripts/build
index 49ae41e17..d34c7fa94 100755
--- a/scripts/build
+++ b/scripts/build
@@ -654,6 +654,9 @@ def expand_all(pattern, all = false)
           if e3.include?("*")
             results.concat(results.map { |e4| e4.gsub("*", "") })
           end
+          if e3.match(/\*\.[a-z]/)
+            results << "*." + e3[2].upcase + e3[3..-1]
+          end
           results << "*"
         end
         results
@@ -743,9 +746,6 @@ def show_warnings(all_filetypes, expected_filetypes)
     [a, Regexp.union(b.map { |x| Regexp.escape(x).gsub('\\*', '.*') })]
   end]
 
-  puts all_handled.select { |a, b| a.include?('zsh') }
-
-  puts all_handled_regexps["zsh"]
   for name, e in all_expected - all_handled
     if all_handled.include?([name, e.split('/').last.gsub('*', '')])
       next

From 6a086b0c797f703b713bc887b1a4cee5a70d01ec Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 28 Sep 2020 03:00:01 +0200
Subject: [PATCH 082/299] Fix many extensions detection

---
 autoload/sleuth.vim   | 12 ++++++------
 ftdetect/polyglot.vim | 24 ++++++++++++++++++++----
 packages.yaml         | 23 ++++++++++++++---------
 scripts/build         |  5 +----
 tests/extensions.vim  |  5 +++++
 5 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index d73e48bf2..ce2e21133 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -152,19 +152,19 @@ let s:globs = {
   \ 'omake': '*.om,OMakefile,OMakeroot,OMakeroot.in',
   \ 'opam': '*.opam,*.opam.template,opam',
   \ 'opencl': '*.cl,*.opencl',
-  \ 'perl': '*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile',
-  \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,.php,.php_cs,.php_cs.dist,Phakefile',
+  \ 'perl': '*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc,.gitolite.rc',
+  \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,.php,.php_cs,.php_cs.dist,Phakefile',
   \ 'plantuml': '*.puml,*.iuml,*.plantuml,*.uml,*.pu',
   \ 'pod': '*.pod',
   \ 'pony': '*.pony',
-  \ 'prolog': '*.pl,*.pro,*.prolog,*.yap',
+  \ 'prolog': '*.pl,*.pro,*.prolog,*.yap,*.pdb',
   \ 'proto': '*.proto',
   \ 'ps1': '*.ps1,*.psd1,*.psm1,*.pssc',
   \ 'ps1xml': '*.ps1xml',
   \ 'pug': '*.jade,*.pug',
   \ 'puppet': '*.pp,Modulefile',
   \ 'purescript': '*.purs',
-  \ 'python': '*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,.gclient,DEPS,SConscript,SConstruct,Snakefile,wscript',
+  \ 'python': '*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,*.ptl,.gclient,DEPS,SConscript,SConstruct,Snakefile,wscript,.pythonrc,.pythonstartup',
   \ 'qmake': '*.pro,*.pri',
   \ 'qml': '*.qml,*.qbs',
   \ 'r': '*.r,*.rsx,*.s,*.S,.Rprofile,expr-dist',
@@ -183,7 +183,7 @@ let s:globs = {
   \ 'scala': '*.scala,*.kojo,*.sc',
   \ 'scss': '*.scss',
   \ 'sexplib': '*.sexp',
-  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile',
+  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc',
   \ 'slim': '*.slim',
   \ 'slime': '*.slime',
   \ 'smt2': '*.smt2,*.smt',
@@ -218,7 +218,7 @@ let s:globs = {
   \ 'vmasm': '*.mar',
   \ 'vue': '*.vue,*.wpy',
   \ 'xdc': '*.xdc',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,*.fglrxrc,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
   \ 'xml.twig': '*.xml.twig',
   \ 'xs': '*.xs',
   \ 'xsl': '*.xslt,*.xsl',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index ad8feb246..0d71a1278 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -367,11 +367,11 @@ if !has_key(s:disabled_packages, 'opencl')
 endif
 
 if !has_key(s:disabled_packages, 'perl')
-  au! BufRead,BufNewFile *.al,*.plx,*.psgi,*.t,*.pod,*.mason,*.mhtml,*.comp,*.xs
+  au! BufRead,BufNewFile *.al,*.plx,*.psgi,*.t,example.gitolite.rc,.gitolite.rc,*.pod,*.mason,*.mhtml,*.comp,*.xs
 endif
 
 if !has_key(s:disabled_packages, 'php')
-  au! BufRead,BufNewFile *.php,*.ctp
+  au! BufRead,BufNewFile *.php,*.ctp,*.phtml
 endif
 
 if !has_key(s:disabled_packages, 'protobuf')
@@ -383,7 +383,7 @@ if !has_key(s:disabled_packages, 'puppet')
 endif
 
 if !has_key(s:disabled_packages, 'python')
-  au! BufRead,BufNewFile *.py,*.pyi,*.pyw,*.spec,SConstruct
+  au! BufRead,BufNewFile *.py,*.pyi,*.pyw,*.spec,*.ptl,SConstruct,.pythonrc,.pythonstartup
 endif
 
 if !has_key(s:disabled_packages, 'r-lang')
@@ -502,6 +502,10 @@ if !has_key(s:disabled_packages, 'bzl')
   au! BufRead,BufNewFile *.bzl,*.bazel,*.BUILD,BUILD,WORKSPACE
 endif
 
+if !has_key(s:disabled_packages, 'prolog')
+  au! BufRead,BufNewFile *.pdb
+endif
+
 if !has_key(s:disabled_packages, 'tads')
   au! BufRead,BufNewFile *.t
 endif
@@ -614,7 +618,6 @@ if !has_key(s:disabled_packages, 'xml')
   au BufNewFile,BufRead *.ditaval set ft=xml
   au BufNewFile,BufRead *.dll.config set ft=xml
   au BufNewFile,BufRead *.dotsettings set ft=xml
-  au BufNewFile,BufRead *.fglrxrc set ft=xml
   au BufNewFile,BufRead *.filters set ft=xml
   au BufNewFile,BufRead *.fsproj set ft=xml
   au BufNewFile,BufRead *.fxml set ft=xml
@@ -695,6 +698,7 @@ if !has_key(s:disabled_packages, 'xml')
   au BufNewFile,BufRead */etc/blkid.tab set ft=xml
   au BufNewFile,BufRead */etc/blkid.tab.old set ft=xml
   au BufNewFile,BufRead */etc/xdg/menus/*.menu set ft=xml
+  au BufNewFile,BufRead *fglrxrc set ft=xml
   au BufNewFile,BufRead {.,}classpath set ft=xml
   au BufNewFile,BufRead {.,}cproject set ft=xml
   au BufNewFile,BufRead {.,}project set ft=xml
@@ -1456,10 +1460,12 @@ if !has_key(s:disabled_packages, 'perl')
   au BufNewFile,BufRead *.ph set ft=perl
   au BufNewFile,BufRead *.plx set ft=perl
   au BufNewFile,BufRead *.psgi set ft=perl
+  au BufNewFile,BufRead {.,}gitolite.rc set ft=perl
   au BufNewFile,BufRead Makefile.PL set ft=perl
   au BufNewFile,BufRead Rexfile set ft=perl
   au BufNewFile,BufRead ack set ft=perl
   au BufNewFile,BufRead cpanfile set ft=perl
+  au BufNewFile,BufRead example.gitolite.rc set ft=perl
   au BufNewFile,BufRead *.pod set ft=pod
   au BufNewFile,BufRead *.comp set ft=mason
   au BufNewFile,BufRead *.mason set ft=mason
@@ -1490,6 +1496,7 @@ if !has_key(s:disabled_packages, 'php')
   au BufNewFile,BufRead *.php5 set ft=php
   au BufNewFile,BufRead *.phps set ft=php
   au BufNewFile,BufRead *.phpt set ft=php
+  au BufNewFile,BufRead *.phtml set ft=php
   au BufNewFile,BufRead {.,}php set ft=php
   au BufNewFile,BufRead {.,}php_cs set ft=php
   au BufNewFile,BufRead {.,}php_cs.dist set ft=php
@@ -1546,6 +1553,7 @@ if !has_key(s:disabled_packages, 'python')
   au BufNewFile,BufRead *.gyp set ft=python
   au BufNewFile,BufRead *.gypi set ft=python
   au BufNewFile,BufRead *.lmi set ft=python
+  au BufNewFile,BufRead *.ptl set ft=python
   au BufNewFile,BufRead *.py set ft=python
   au BufNewFile,BufRead *.py3 set ft=python
   au BufNewFile,BufRead *.pyde set ft=python
@@ -1560,6 +1568,8 @@ if !has_key(s:disabled_packages, 'python')
   au BufNewFile,BufRead *.wsgi set ft=python
   au BufNewFile,BufRead *.xpy set ft=python
   au BufNewFile,BufRead {.,}gclient set ft=python
+  au BufNewFile,BufRead {.,}pythonrc set ft=python
+  au BufNewFile,BufRead {.,}pythonstartup set ft=python
   au BufNewFile,BufRead DEPS set ft=python
   au BufNewFile,BufRead SConscript set ft=python
   au BufNewFile,BufRead SConstruct set ft=python
@@ -1772,6 +1782,11 @@ if !has_key(s:disabled_packages, 'sh')
   au BufNewFile,BufRead login set ft=sh
   au BufNewFile,BufRead man set ft=sh
   au BufNewFile,BufRead profile set ft=sh
+  au BufNewFile,BufRead zlogin set ft=sh
+  au BufNewFile,BufRead zlogout set ft=sh
+  au BufNewFile,BufRead zprofile set ft=sh
+  au BufNewFile,BufRead zshenv set ft=sh
+  au BufNewFile,BufRead zshrc set ft=sh
   au BufNewFile,BufRead *.zsh set ft=zsh
   au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
   au BufNewFile,BufRead {.,}zfbfmarks set ft=zsh
@@ -2037,6 +2052,7 @@ if !has_key(s:disabled_packages, 'bzl')
 endif
 
 if !has_key(s:disabled_packages, 'prolog')
+  au BufNewFile,BufRead *.pdb set ft=prolog
   au BufNewFile,BufRead *.pro set ft=prolog
   au BufNewFile,BufRead *.prolog set ft=prolog
   au BufNewFile,BufRead *.yap set ft=prolog
diff --git a/packages.yaml b/packages.yaml
index e0c4be4cf..4796a1b57 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1176,6 +1176,9 @@ remote: vim-perl/vim-perl
 filetypes:
 - name: perl
   linguist: Perl
+  extra_filenames:
+  - example.gitolite.rc
+  - .gitolite.rc
 - name: pod
   extensions:
   - pod
@@ -1215,6 +1218,8 @@ remote: StanAngeloff/php.vim
 filetypes:
 - name: php
   linguist: PHP
+  extra_extensions:
+  - phtml
 ---
 name: blade
 remote: jwalton512/vim-blade
@@ -1284,6 +1289,11 @@ filetypes:
   linguist: Python
   ignored_filenames:
   - 'lit.*cfg'
+  extra_extensions:
+  - ptl
+  extra_filenames:
+  - '.pythonrc'
+  - '.pythonstartup'
 ---
 name: python-indent
 remote: Vimjas/vim-python-pep8-indent
@@ -1487,13 +1497,8 @@ filetypes:
   - '.zlogin'
   - '.zprofile'
   - '.zlogout'
-  - 'zshrc'
-  - 'zshenv'
-  - 'zlogin'
-  - 'zprofile'
-  - 'zlogout'
-  extra_filenames:
   # Udev symlinks config
+  extra_filenames:
   - '*/etc/udev/cdsymlinks.conf'
 - name: zsh
   extensions:
@@ -1743,11 +1748,11 @@ filetypes:
   - tpm
   - csproj.user
   - wpl
-  - fglrxrc
   extra_filenames:
   - '*/etc/blkid.tab'
   - '*/etc/blkid.tab.old'
   - '*/etc/xdg/menus/*.menu'
+  - '*fglrxrc'
   ignored_extensions:
   - ts
   - tsx
@@ -1869,8 +1874,6 @@ filetypes:
   - '*/etc/yum.repos.d/*'
   ignored_extensions:
   - cfg
-  ignored_warnings:
-  - '*.php.ini'
 ---
 name: odin
 remote: Tetralux/odin.vim
@@ -1894,6 +1897,8 @@ glob: '**/prolog.vim'
 filetypes:
 - name: prolog
   linguist: Prolog
+  extra_extensions:
+  - pdb
 ---
 name: tads
 remote: vim/vim:runtime
diff --git a/scripts/build b/scripts/build
index d34c7fa94..0e2df590e 100755
--- a/scripts/build
+++ b/scripts/build
@@ -747,10 +747,7 @@ def show_warnings(all_filetypes, expected_filetypes)
   end]
 
   for name, e in all_expected - all_handled
-    if all_handled.include?([name, e.split('/').last.gsub('*', '')])
-      next
-    end
-    if e.include?('*') && all_handled_regexps[name].match?(e)
+    if all_handled_regexps[name].match?(e)
       next
     end
     puts "Missing for #{name}: #{e}"
diff --git a/tests/extensions.vim b/tests/extensions.vim
index 3ed9306d2..695d0455c 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -371,3 +371,8 @@ call TestExtension("xhtml", "xhtml.html", "<DTD   XHTML ")
 
 " .gitignore
 call TestExtension("gitignore", ".gitignore", "")
+
+" .xml
+
+call TestExtension("xml", ".fglrxrc", "")
+call TestExtension("xml", "fglrxrc", "")

From f431aee86e51cb416ee83f895526d0ea46e46e5e Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 28 Sep 2020 18:28:56 +0200
Subject: [PATCH 083/299] Change less provider, closes #567

---
 README.md         |   2 +-
 ftplugin/less.vim |  22 +++------
 indent/less.vim   |  10 ++--
 packages.yaml     |   6 +--
 syntax/less.vim   | 121 ++++++++++++++++++++++++++--------------------
 5 files changed, 86 insertions(+), 75 deletions(-)

diff --git a/README.md b/README.md
index 2fbbccd91..e41b56ec4 100644
--- a/README.md
+++ b/README.md
@@ -152,7 +152,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [julia](https://github.com/JuliaEditorSupport/julia-vim)
 - [kotlin](https://github.com/udalov/kotlin-vim)
 - [ledger](https://github.com/ledger/vim-ledger)
-- [less](https://github.com/groenewege/vim-less)
+- [less](https://github.com/vim/vim/tree/master/runtime)
 - [lilypond](https://github.com/anowlcalledjosh/vim-lilypond)
 - [livescript](https://github.com/gkz/vim-ls)
 - [llvm](https://github.com/rhysd/vim-llvm)
diff --git a/ftplugin/less.vim b/ftplugin/less.vim
index ecb060b9f..2a8ff1724 100644
--- a/ftplugin/less.vim
+++ b/ftplugin/less.vim
@@ -1,10 +1,10 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 
 " Vim filetype plugin
-" Language:	    LessCSS
-" Author:	    Tim Pope <vimNOSPAM@tpope.org>
-" Maintainer:   Leonard Ehrenfried <leonard.ehrenfried@web.de>
-" Last Change:  2011 Sep 30
+" Language:	less
+" Maintainer:	Alessandro Vioni <jenoma@gmail.com>
+" URL: https://github.com/genoma/vim-less
+" Last Change:	2014 November 24
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -14,17 +14,11 @@ let b:did_ftplugin = 1
 
 let b:undo_ftplugin = "setl cms< def< inc< inex< ofu< sua<"
 
-setlocal iskeyword+=-
-setlocal commentstring=//%s
-setlocal define=^\\s*\\%(@mixin\\\|=\\)
-setlocal includeexpr=substitute(v:fname,'\\%(.*/\\\|^\\)\\zs','_','')
-setlocal omnifunc=csscomplete#CompleteCSS
-setlocal suffixesadd=.less
-setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,://
-setlocal fo=croql
+setlocal formatoptions-=t formatoptions+=croql
 
-let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\='
+setlocal comments=:// commentstring=//\ %s
 
-" vim:set sw=2:
+setlocal omnifunc=csscomplete#CompleteCSS
+setlocal suffixesadd=.less
 
 endif
diff --git a/indent/less.vim b/indent/less.vim
index 61739f73e..628f2ff3b 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,13 +1,17 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 
 " Vim indent file
-" Language:            LessCSS
-" Maintainer:        Leonard Ehrenfried <leonard.ehrenfried@web.de>
-" Last Change:        2011 Sep 26
+" Language:	less
+" Maintainer:	Alessandro Vioni <jenoma@gmail.com>
+" URL: https://github.com/genoma/vim-less
+" Last Change:	2014 November 24
 
 if exists("b:did_indent")
   finish
 endif
 
 runtime! indent/css.vim
+
+" vim:set sw=2:
+
 endif
diff --git a/packages.yaml b/packages.yaml
index 4796a1b57..855a23059 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -958,10 +958,8 @@ filetypes:
   - journal
 ---
 name: less
-remote: groenewege/vim-less
-ignored_dirs:
-# We don't want to slow down .html files
-- after
+remote: vim/vim:runtime
+glob: '**/less.vim'
 filetypes:
 - name: less
   linguist: Less
diff --git a/syntax/less.vim b/syntax/less.vim
index 3f497bc62..0b0c5373a 100644
--- a/syntax/less.vim
+++ b/syntax/less.vim
@@ -1,68 +1,83 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 
+" Vim syntax file
+" Language:	less
+" Maintainer:	Alessandro Vioni <jenoma@gmail.com>
+" URL: https://github.com/genoma/vim-less
+" Last Change:	2014 November 24
+
 if exists("b:current_syntax")
   finish
 endif
 
 runtime! syntax/css.vim
 runtime! after/syntax/css.vim
-" load files from vim-css3-syntax plugin (https://github.com/hail2u/vim-css3-syntax)
-runtime! after/syntax/css/*.vim
 
 syn case ignore
 
-syn region lessDefinition transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssTagName,cssPseudoClass,cssUrl,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,lessDefinition,lessComment,lessClassChar,lessVariable,lessMixinChar,lessAmpersandChar,lessFunction,lessNestedSelector,@cssColors fold
-
-syn match lessVariable "@[[:alnum:]_-]\+" contained
-syn match lessVariable "@[[:alnum:]_-]\+" nextgroup=lessVariableAssignment skipwhite
-syn match lessVariableAssignment ":" contained nextgroup=lessVariableValue skipwhite
-syn match lessVariableValue ".*;"me=e-1 contained contains=lessVariable,lessOperator,lessDefault,cssValue.*,@cssColors "me=e-1 means that the last char of the pattern is not highlighted
-
-syn match lessOperator "+" contained
-syn match lessOperator "-" contained
-syn match lessOperator "/" contained
-syn match lessOperator "*" contained
-
-syn match lessNestedSelector "[^/]* {"me=e-1 contained contains=cssTagName,cssAttributeSelector,lessAmpersandChar,lessVariable,lessMixinChar,lessFunction,lessNestedProperty
-syn match lessNestedProperty "[[:alnum:]]\+:"me=e-1 contained
-
-syn match lessDefault "!default" contained
-
-syn match lessMixinChar "\.[[:alnum:]_-]\@=" contained nextgroup=lessClass
-syn match lessAmpersandChar "&" contained nextgroup=lessClass,cssPseudoClass
-syn match lessClass "[[:alnum:]_-]\+" contained
-
-" functions {{{
-
-" string functions
-syn keyword lessFunction escape e % containedin=cssDefinition contained
-" misc functions
-syn keyword lessFunction unit containedin=cssDefinition contained
-" math functions
-syn keyword lessFunction ceil floor percentage round containedin=cssDefinition contained
-" color definition
-syn keyword lessFunction rgb rgba argb hsl hsla hsv hsva containedin=cssDefinition contained
-" color channel information
-syn keyword lessFunction hue saturation lightness red green blue alpha luma containedin=cssDefinition contained
-" color operations
-syn keyword lessFunction saturate desaturate lighten darken fadein fadeout fade spin mix greyscale contrast containedin=cssDefinition contained
-" color blending
-syn keyword lessFunction multiply screen overlay softlight hardlight difference exclusion average negation containedin=cssDefinition contained
-
-" }}}
-
-syn match lessComment "//.*$" contains=@Spell
-
-hi def link lessVariable Special
-hi def link lessVariableValue Constant
-hi def link lessDefault Special
-hi def link lessComment Comment
-hi def link lessFunction Function
-hi def link lessMixinChar Special
-hi def link lessAmpersandChar Special
-hi def link lessNestedProperty Type
-hi def link lessClass PreProc
+syn cluster lessCssProperties contains=cssFontProp,cssFontDescriptorProp,cssColorProp,cssTextProp,cssBoxProp,cssGeneratedContentProp,cssPagingProp,cssUIProp,cssRenderProp,cssAuralProp,cssTableProp
+syn cluster lessCssAttributes contains=css.*Attr,lessEndOfLineComment,lessComment,cssValue.*,cssColor,cssURL,lessDefault,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssRenderProp
+
+syn region lessDefinition matchgroup=cssBraces start="{" end="}" contains=TOP
+
+syn match lessProperty "\%([{};]\s*\|^\)\@<=\%([[:alnum:]-]\|#{[^{}]*}\)\+\s*:" contains=css.*Prop skipwhite nextgroup=lessCssAttribute contained containedin=lessDefinition
+syn match lessProperty "^\s*\zs\s\%(\%([[:alnum:]-]\|#{[^{}]*}\)\+\s*:\|:[[:alnum:]-]\+\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=lessCssAttribute
+syn match lessProperty "^\s*\zs\s\%(:\=[[:alnum:]-]\+\s*=\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=lessCssAttribute
+syn match lessCssAttribute +\%("\%([^"]\|\\"\)*"\|'\%([^']\|\\'\)*'\|#{[^{}]*}\|[^{};]\)*+ contained contains=@lessCssAttributes,lessVariable,lessFunction,lessInterpolation
+syn match lessDefault "!default\>" contained
+
+" less variables and media queries
+syn match lessVariable "@[[:alnum:]_-]\+" nextgroup=lessCssAttribute skipwhite
+syn match lessMedia "@media" nextgroup=lessCssAttribute skipwhite
+
+" Less functions
+syn match lessFunction "\<\%(escape\|e\|unit\)\>(\@=" contained
+syn match lessFunction "\<\%(ceil\|floor\|percentage\|round\|sqrt\|abs\|sin\|asin\|cos\|acos\|tan\|atan\|pi\|pow\|min\|max\)\>(\@=" contained
+syn match lessFunction "\<\%(rgb\|rgba\|argb\|argb\|hsl\|hsla\|hsv\|hsva\)\>(\@=" contained
+syn match lessFunction "\<\%(hue\|saturation\|lightness\|red\|green\|blue\|alpha\|luma\)\>(\@=" contained
+syn match lessFunction "\<\%(saturate\|desaturate\|lighten\|darken\|fadein\|fadeout\|fade\|spin\|mix\|greyscale\|contrast\)\>(\@=" contained
+syn match lessFunction "\<\%(multiply\|screen\|overlay\|softlight\|hardlight\|difference\|exclusion\|average\|negation\)\>(\@=" contained
+
+" Less id class visualization
+syn match lessIdChar     "#[[:alnum:]_-]\@=" nextgroup=lessId,lessClassIdCall
+syn match lessId         "[[:alnum:]_-]\+" contained
+syn match lessClassIdCall  "[[:alnum:]_-]\+()" contained
+
+syn match lessClassChar  "\.[[:alnum:]_-]\@=" nextgroup=lessClass,lessClassCall
+syn match lessClass      "[[:alnum:]_-]\+" contained
+syn match lessClassCall  "[[:alnum:]_-]\+()" contained
+
+syn match lessAmpersand  "&" contains=lessIdChar,lessClassChar
+
+syn region lessInclude start="@import" end=";\|$" contains=lessComment,cssURL,cssUnicodeEscape,cssMediaType,cssStringQ,cssStringQQ
+
+syn keyword lessTodo        FIXME NOTE TODO OPTIMIZE XXX contained
+syn region  lessComment     start="^\z(\s*\)//"  end="^\%(\z1 \)\@!" contains=lessTodo,@Spell
+syn region  lessCssComment  start="^\z(\s*\)/\*" end="^\%(\z1 \)\@!" contains=lessTodo,@Spell
+syn match   lessEndOfLineComment "//.*" contains=lessComment,lessTodo,@Spell
+
+hi def link lessEndOfLineComment        lessComment
+hi def link lessCssComment              lessComment
+hi def link lessComment                 Comment
+hi def link lessDefault                 cssImportant
+hi def link lessVariable                Identifier
+hi def link lessFunction                PreProc
+hi def link lessTodo                    Todo
+hi def link lessInclude                 Include
+hi def link lessIdChar                  Special
+hi def link lessClassChar               Special
+hi def link lessAmpersand               Character
+hi def link lessId                      Identifier
+hi def link lessClass                   Type
+hi def link lessCssAttribute            PreProc
+hi def link lessClassCall               Type
+hi def link lessClassIdCall             Type
+hi def link lessTagName                 cssTagName
+hi def link lessDeprecated              cssDeprecated
+hi def link lessMedia                   cssMedia
 
 let b:current_syntax = "less"
 
+" vim:set sw=2:
+
 endif

From 31409eaafb75e2454c732dd953e92acc557fd5a7 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 28 Sep 2020 18:56:36 +0200
Subject: [PATCH 084/299] Fix all warning messages

---
 autoload/sleuth.vim   | 4 ++--
 ftdetect/polyglot.vim | 6 ++++--
 packages.yaml         | 3 +++
 scripts/build         | 8 ++++----
 scripts/test          | 2 --
 tests/extensions.vim  | 1 +
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index ce2e21133..1ee1cd9b7 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -111,7 +111,7 @@ let s:globs = {
   \ 'idris': '*.idr,*.lidr,idris-response',
   \ 'idris2': '*.idr,*.ipkg,idris-response',
   \ 'ion': '*.ion',
-  \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
+  \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,*.javascript,Jakefile',
   \ 'javascriptreact': '*.jsx',
   \ 'jq': '*.jq,.jqrc,.jqrc*',
   \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.tern-config,.tern-project,.watchmanconfig,composer.lock,mcmod.info,Pipfile.lock',
@@ -228,7 +228,7 @@ let s:globs = {
   \ 'zephir': '*.zep',
   \ 'zig': '*.zig,*.zir',
   \ 'zir': '*.zir',
-  \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks',
+  \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks,.zsh*',
   \}
 
 func! sleuth#GlobForFiletype(type)
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 0d71a1278..615f491bd 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -291,7 +291,7 @@ if !has_key(s:disabled_packages, 'go')
 endif
 
 if !has_key(s:disabled_packages, 'javascript')
-  au! BufRead,BufNewFile *.js,*.cjs,*.es,*.gs,*.mjs,*.pac
+  au! BufRead,BufNewFile *.js,*.cjs,*.es,*.gs,*.mjs,*.pac,*.javascript
 endif
 
 if !has_key(s:disabled_packages, 'jsx')
@@ -427,7 +427,7 @@ if !has_key(s:disabled_packages, 'scss')
 endif
 
 if !has_key(s:disabled_packages, 'sh')
-  au! BufRead,BufNewFile */etc/udev/cdsymlinks.conf,*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks
+  au! BufRead,BufNewFile */etc/udev/cdsymlinks.conf,*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks,.zsh*
 endif
 
 if !has_key(s:disabled_packages, 'smt2')
@@ -1075,6 +1075,7 @@ if !has_key(s:disabled_packages, 'javascript')
   au BufNewFile,BufRead *.frag set ft=javascript
   au BufNewFile,BufRead *.gs set ft=javascript
   au BufNewFile,BufRead *.jake set ft=javascript
+  au BufNewFile,BufRead *.javascript set ft=javascript
   au BufNewFile,BufRead *.js set ft=javascript
   au BufNewFile,BufRead *.jsb set ft=javascript
   au BufNewFile,BufRead *.jscad set ft=javascript
@@ -1794,6 +1795,7 @@ if !has_key(s:disabled_packages, 'sh')
   au BufNewFile,BufRead {.,}zlogin set ft=zsh
   au BufNewFile,BufRead {.,}zlogout set ft=zsh
   au BufNewFile,BufRead {.,}zprofile set ft=zsh
+  au BufNewFile,BufRead {.,}zsh* call s:StarSetf('zsh')
   au BufNewFile,BufRead {.,}zshenv set ft=zsh
   au BufNewFile,BufRead {.,}zshrc set ft=zsh
 endif
diff --git a/packages.yaml b/packages.yaml
index 855a23059..330b68d44 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -850,6 +850,8 @@ ignored_dirs:
 filetypes:
 - name: javascript
   linguist: JavaScript
+  extra_extensions:
+  - javascript
 - name: flow
   extensions:
   - flow
@@ -1510,6 +1512,7 @@ filetypes:
   - '.zlog*'
   - '.zcompdump*'
   - '.zfbfmarks'
+  - '.zsh*'
 ---
 name: zinit
 remote: zinit-zsh/zplugin-vim-syntax
diff --git a/scripts/build b/scripts/build
index 0e2df590e..f60146c21 100755
--- a/scripts/build
+++ b/scripts/build
@@ -657,7 +657,6 @@ def expand_all(pattern, all = false)
           if e3.match(/\*\.[a-z]/)
             results << "*." + e3[2].upcase + e3[3..-1]
           end
-          results << "*"
         end
         results
       end
@@ -737,17 +736,18 @@ def show_warnings(all_filetypes, expected_filetypes)
     (f["extensions"] || []).map { |e| "*." + e } + (f["filenames"] || [])
   end
 
+
   all_handled = process_list(all_filetypes, all_expected) do |f|
     [f["filenames"], f["ignored_filenames"], f["ignored_warnings"]].compact.flatten + 
       [f["extensions"], f["ignored_extensions"]].compact.flatten.map { |e| "*." + e }
   end
 
-  all_handled_regexps = Hash[all_handled.group_by { |a, b| a }.map { |a, b| [a, b[1]] }.map do |a, b|
-    [a, Regexp.union(b.map { |x| Regexp.escape(x).gsub('\\*', '.*') })]
+  all_handled_regexps = Hash[all_handled.group_by { |a, b| a }.map do |a, b|
+    [a, Regexp.union(b.map { |x| Regexp.new(Regexp.escape(x[1]).gsub('\\*', '.*')) })]
   end]
 
   for name, e in all_expected - all_handled
-    if all_handled_regexps[name].match?(e)
+    if all_handled_regexps[name].match?(e) || e == "*"
       next
     end
     puts "Missing for #{name}: #{e}"
diff --git a/scripts/test b/scripts/test
index db6de5dac..ebb6d6ce8 100755
--- a/scripts/test
+++ b/scripts/test
@@ -18,8 +18,6 @@ def run_vimscript(src)
     func! Log(msg)
       if $DEV != '1'
         echo a:msg
-      else
-        echon '.'
       endif
     endfunc
     EOM
diff --git a/tests/extensions.vim b/tests/extensions.vim
index 695d0455c..7f6adb9eb 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -2,6 +2,7 @@ function! TestExtension(filetype, filename, content)
   call Log('Detecting ' . a:filetype . ' filetype (' . a:filename . ')...')
 
   try
+    set shortmess+=F
     let g:message = ""
     exec "noautocmd n " . a:filename
     silent put =a:content

From 046a052f18b5941a511a5cddf978606e17930fb6 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 28 Sep 2020 19:13:59 +0200
Subject: [PATCH 085/299] Make generated file bit shorter

---
 ftdetect/polyglot.vim | 705 ++++++------------------------------------
 scripts/build         |   7 +-
 2 files changed, 106 insertions(+), 606 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 615f491bd..ac567f276 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -560,17 +560,11 @@ if !has_key(s:disabled_packages, 'acedb')
 endif
 
 if !has_key(s:disabled_packages, 'acpiasl')
-  au BufNewFile,BufRead *.asl set ft=asl
-  au BufNewFile,BufRead *.dsl set ft=asl
+  au BufNewFile,BufRead *.asl,*.dsl set ft=asl
 endif
 
 if !has_key(s:disabled_packages, 'ada')
-  au BufNewFile,BufRead *.ada set ft=ada
-  au BufNewFile,BufRead *.ada_m set ft=ada
-  au BufNewFile,BufRead *.adb set ft=ada
-  au BufNewFile,BufRead *.adc set ft=ada
-  au BufNewFile,BufRead *.ads set ft=ada
-  au BufNewFile,BufRead *.gpr set ft=ada
+  au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr set ft=ada
 endif
 
 if !has_key(s:disabled_packages, 'ahdl')
@@ -596,105 +590,7 @@ if !has_key(s:disabled_packages, 'ampl')
 endif
 
 if !has_key(s:disabled_packages, 'xml')
-  au BufNewFile,BufRead *.adml set ft=xml
-  au BufNewFile,BufRead *.admx set ft=xml
-  au BufNewFile,BufRead *.ant set ft=xml
-  au BufNewFile,BufRead *.axml set ft=xml
-  au BufNewFile,BufRead *.builds set ft=xml
-  au BufNewFile,BufRead *.ccproj set ft=xml
-  au BufNewFile,BufRead *.ccxml set ft=xml
-  au BufNewFile,BufRead *.cdxml set ft=xml
-  au BufNewFile,BufRead *.clixml set ft=xml
-  au BufNewFile,BufRead *.cproject set ft=xml
-  au BufNewFile,BufRead *.cscfg set ft=xml
-  au BufNewFile,BufRead *.csdef set ft=xml
-  au BufNewFile,BufRead *.csl set ft=xml
-  au BufNewFile,BufRead *.csproj set ft=xml
-  au BufNewFile,BufRead *.csproj.user set ft=xml
-  au BufNewFile,BufRead *.ct set ft=xml
-  au BufNewFile,BufRead *.depproj set ft=xml
-  au BufNewFile,BufRead *.dita set ft=xml
-  au BufNewFile,BufRead *.ditamap set ft=xml
-  au BufNewFile,BufRead *.ditaval set ft=xml
-  au BufNewFile,BufRead *.dll.config set ft=xml
-  au BufNewFile,BufRead *.dotsettings set ft=xml
-  au BufNewFile,BufRead *.filters set ft=xml
-  au BufNewFile,BufRead *.fsproj set ft=xml
-  au BufNewFile,BufRead *.fxml set ft=xml
-  au BufNewFile,BufRead *.glade set ft=xml
-  au BufNewFile,BufRead *.gml set ft=xml
-  au BufNewFile,BufRead *.gmx set ft=xml
-  au BufNewFile,BufRead *.grxml set ft=xml
-  au BufNewFile,BufRead *.gst set ft=xml
-  au BufNewFile,BufRead *.iml set ft=xml
-  au BufNewFile,BufRead *.ivy set ft=xml
-  au BufNewFile,BufRead *.jelly set ft=xml
-  au BufNewFile,BufRead *.jsproj set ft=xml
-  au BufNewFile,BufRead *.kml set ft=xml
-  au BufNewFile,BufRead *.launch set ft=xml
-  au BufNewFile,BufRead *.mdpolicy set ft=xml
-  au BufNewFile,BufRead *.mjml set ft=xml
-  au BufNewFile,BufRead *.mm set ft=xml
-  au BufNewFile,BufRead *.mod set ft=xml
-  au BufNewFile,BufRead *.mxml set ft=xml
-  au BufNewFile,BufRead *.natvis set ft=xml
-  au BufNewFile,BufRead *.ncl set ft=xml
-  au BufNewFile,BufRead *.ndproj set ft=xml
-  au BufNewFile,BufRead *.nproj set ft=xml
-  au BufNewFile,BufRead *.nuspec set ft=xml
-  au BufNewFile,BufRead *.odd set ft=xml
-  au BufNewFile,BufRead *.osm set ft=xml
-  au BufNewFile,BufRead *.pkgproj set ft=xml
-  au BufNewFile,BufRead *.pluginspec set ft=xml
-  au BufNewFile,BufRead *.proj set ft=xml
-  au BufNewFile,BufRead *.props set ft=xml
-  au BufNewFile,BufRead *.ps1xml set ft=xml
-  au BufNewFile,BufRead *.psc1 set ft=xml
-  au BufNewFile,BufRead *.pt set ft=xml
-  au BufNewFile,BufRead *.rdf set ft=xml
-  au BufNewFile,BufRead *.resx set ft=xml
-  au BufNewFile,BufRead *.rss set ft=xml
-  au BufNewFile,BufRead *.sch set ft=xml
-  au BufNewFile,BufRead *.scxml set ft=xml
-  au BufNewFile,BufRead *.sfproj set ft=xml
-  au BufNewFile,BufRead *.shproj set ft=xml
-  au BufNewFile,BufRead *.srdf set ft=xml
-  au BufNewFile,BufRead *.storyboard set ft=xml
-  au BufNewFile,BufRead *.sublime-snippet set ft=xml
-  au BufNewFile,BufRead *.targets set ft=xml
-  au BufNewFile,BufRead *.tml set ft=xml
-  au BufNewFile,BufRead *.tpm set ft=xml
-  au BufNewFile,BufRead *.ui set ft=xml
-  au BufNewFile,BufRead *.urdf set ft=xml
-  au BufNewFile,BufRead *.ux set ft=xml
-  au BufNewFile,BufRead *.vbproj set ft=xml
-  au BufNewFile,BufRead *.vcxproj set ft=xml
-  au BufNewFile,BufRead *.vsixmanifest set ft=xml
-  au BufNewFile,BufRead *.vssettings set ft=xml
-  au BufNewFile,BufRead *.vstemplate set ft=xml
-  au BufNewFile,BufRead *.vxml set ft=xml
-  au BufNewFile,BufRead *.wixproj set ft=xml
-  au BufNewFile,BufRead *.workflow set ft=xml
-  au BufNewFile,BufRead *.wpl set ft=xml
-  au BufNewFile,BufRead *.wsdl set ft=xml
-  au BufNewFile,BufRead *.wsf set ft=xml
-  au BufNewFile,BufRead *.wxi set ft=xml
-  au BufNewFile,BufRead *.wxl set ft=xml
-  au BufNewFile,BufRead *.wxs set ft=xml
-  au BufNewFile,BufRead *.x3d set ft=xml
-  au BufNewFile,BufRead *.xacro set ft=xml
-  au BufNewFile,BufRead *.xaml set ft=xml
-  au BufNewFile,BufRead *.xib set ft=xml
-  au BufNewFile,BufRead *.xlf set ft=xml
-  au BufNewFile,BufRead *.xliff set ft=xml
-  au BufNewFile,BufRead *.xmi set ft=xml
-  au BufNewFile,BufRead *.xml set ft=xml
-  au BufNewFile,BufRead *.xml.dist set ft=xml
-  au BufNewFile,BufRead *.xproj set ft=xml
-  au BufNewFile,BufRead *.xsd set ft=xml
-  au BufNewFile,BufRead *.xspec set ft=xml
-  au BufNewFile,BufRead *.xul set ft=xml
-  au BufNewFile,BufRead *.zcml set ft=xml
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml set ft=xml
   au BufNewFile,BufRead */etc/blkid.tab set ft=xml
   au BufNewFile,BufRead */etc/blkid.tab.old set ft=xml
   au BufNewFile,BufRead */etc/xdg/menus/*.menu set ft=xml
@@ -736,8 +632,7 @@ if !has_key(s:disabled_packages, 'apiblueprint')
 endif
 
 if !has_key(s:disabled_packages, 'applescript')
-  au BufNewFile,BufRead *.applescript set ft=applescript
-  au BufNewFile,BufRead *.scpt set ft=applescript
+  au BufNewFile,BufRead *.applescript,*.scpt set ft=applescript
 endif
 
 if !has_key(s:disabled_packages, 'aptconf')
@@ -753,33 +648,14 @@ if !has_key(s:disabled_packages, 'arch')
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
-  au BufNewFile,BufRead *.c++ set ft=cpp
-  au BufNewFile,BufRead *.cc set ft=cpp
-  au BufNewFile,BufRead *.cp set ft=cpp
-  au BufNewFile,BufRead *.cpp set ft=cpp
-  au BufNewFile,BufRead *.cxx set ft=cpp
-  au BufNewFile,BufRead *.h++ set ft=cpp
-  au BufNewFile,BufRead *.hh set ft=cpp
-  au BufNewFile,BufRead *.hpp set ft=cpp
-  au BufNewFile,BufRead *.hxx set ft=cpp
-  au BufNewFile,BufRead *.inc set ft=cpp
-  au BufNewFile,BufRead *.inl set ft=cpp
-  au BufNewFile,BufRead *.ipp set ft=cpp
-  au BufNewFile,BufRead *.moc set ft=cpp
-  au BufNewFile,BufRead *.tcc set ft=cpp
-  au BufNewFile,BufRead *.tlh set ft=cpp
-  au BufNewFile,BufRead *.tpp set ft=cpp
-  au BufNewFile,BufRead *.c set ft=c
-  au BufNewFile,BufRead *.cats set ft=c
-  au BufNewFile,BufRead *.idc set ft=c
-  au BufNewFile,BufRead *.qc set ft=c
+  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp set ft=cpp
+  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc set ft=c
   au BufNewFile,BufRead *enlightenment/*.cfg set ft=c
   au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'arduino')
-  au BufNewFile,BufRead *.ino set ft=arduino
-  au BufNewFile,BufRead *.pde set ft=arduino
+  au BufNewFile,BufRead *.ino,*.pde set ft=arduino
 endif
 
 if !has_key(s:disabled_packages, 'art')
@@ -787,14 +663,11 @@ if !has_key(s:disabled_packages, 'art')
 endif
 
 if !has_key(s:disabled_packages, 'asciidoc')
-  au BufNewFile,BufRead *.adoc set ft=asciidoc
-  au BufNewFile,BufRead *.asc set ft=asciidoc
-  au BufNewFile,BufRead *.asciidoc set ft=asciidoc
+  au BufNewFile,BufRead *.adoc,*.asc,*.asciidoc set ft=asciidoc
 endif
 
 if !has_key(s:disabled_packages, 'autohotkey')
-  au BufNewFile,BufRead *.ahk set ft=autohotkey
-  au BufNewFile,BufRead *.ahkl set ft=autohotkey
+  au BufNewFile,BufRead *.ahk,*.ahkl set ft=autohotkey
 endif
 
 if !has_key(s:disabled_packages, 'elf')
@@ -807,8 +680,7 @@ if !has_key(s:disabled_packages, 'automake')
 endif
 
 if !has_key(s:disabled_packages, 'asn')
-  au BufNewFile,BufRead *.asn set ft=asn
-  au BufNewFile,BufRead *.asn1 set ft=asn
+  au BufNewFile,BufRead *.asn,*.asn1 set ft=asn
 endif
 
 if !has_key(s:disabled_packages, 'aspvbs')
@@ -821,8 +693,7 @@ if !has_key(s:disabled_packages, 'aspperl')
 endif
 
 if !has_key(s:disabled_packages, 'atlas')
-  au BufNewFile,BufRead *.as set ft=atlas
-  au BufNewFile,BufRead *.atl set ft=atlas
+  au BufNewFile,BufRead *.as,*.atl set ft=atlas
 endif
 
 if !has_key(s:disabled_packages, 'autoit')
@@ -834,8 +705,7 @@ if !has_key(s:disabled_packages, 'ave')
 endif
 
 if !has_key(s:disabled_packages, 'awk')
-  au BufNewFile,BufRead *.awk set ft=awk
-  au BufNewFile,BufRead *.gawk set ft=awk
+  au BufNewFile,BufRead *.awk,*.gawk set ft=awk
 endif
 
 if !has_key(s:disabled_packages, 'caddyfile')
@@ -847,44 +717,25 @@ if !has_key(s:disabled_packages, 'carp')
 endif
 
 if !has_key(s:disabled_packages, 'clojure')
-  au BufNewFile,BufRead *.boot set ft=clojure
-  au BufNewFile,BufRead *.cl2 set ft=clojure
-  au BufNewFile,BufRead *.clj set ft=clojure
-  au BufNewFile,BufRead *.cljc set ft=clojure
-  au BufNewFile,BufRead *.cljs set ft=clojure
-  au BufNewFile,BufRead *.cljs.hl set ft=clojure
-  au BufNewFile,BufRead *.cljscm set ft=clojure
-  au BufNewFile,BufRead *.cljx set ft=clojure
-  au BufNewFile,BufRead *.edn set ft=clojure
-  au BufNewFile,BufRead *.hic set ft=clojure
+  au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic set ft=clojure
   au BufNewFile,BufRead build.boot set ft=clojure
   au BufNewFile,BufRead profile.boot set ft=clojure
   au BufNewFile,BufRead riemann.config set ft=clojure
 endif
 
 if !has_key(s:disabled_packages, 'cmake')
-  au BufNewFile,BufRead *.cmake set ft=cmake
-  au BufNewFile,BufRead *.cmake.in set ft=cmake
+  au BufNewFile,BufRead *.cmake,*.cmake.in set ft=cmake
   au BufNewFile,BufRead CMakeLists.txt set ft=cmake
 endif
 
 if !has_key(s:disabled_packages, 'coffee-script')
-  au BufNewFile,BufRead *._coffee set ft=coffee
-  au BufNewFile,BufRead *.cake set ft=coffee
-  au BufNewFile,BufRead *.cjsx set ft=coffee
-  au BufNewFile,BufRead *.coffee set ft=coffee
-  au BufNewFile,BufRead *.coffeekup set ft=coffee
-  au BufNewFile,BufRead *.iced set ft=coffee
+  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced set ft=coffee
   au BufNewFile,BufRead Cakefile set ft=coffee
-  au BufNewFile,BufRead *.coffee.md set ft=litcoffee
-  au BufNewFile,BufRead *.litcoffee set ft=litcoffee
+  au BufNewFile,BufRead *.coffee.md,*.litcoffee set ft=litcoffee
 endif
 
 if !has_key(s:disabled_packages, 'cryptol')
-  au BufNewFile,BufRead *.cry set ft=cryptol
-  au BufNewFile,BufRead *.cyl set ft=cryptol
-  au BufNewFile,BufRead *.lcry set ft=cryptol
-  au BufNewFile,BufRead *.lcyl set ft=cryptol
+  au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl set ft=cryptol
 endif
 
 if !has_key(s:disabled_packages, 'crystal')
@@ -894,14 +745,11 @@ if !has_key(s:disabled_packages, 'crystal')
 endif
 
 if !has_key(s:disabled_packages, 'csv')
-  au BufNewFile,BufRead *.csv set ft=csv
-  au BufNewFile,BufRead *.tab set ft=csv
-  au BufNewFile,BufRead *.tsv set ft=csv
+  au BufNewFile,BufRead *.csv,*.tab,*.tsv set ft=csv
 endif
 
 if !has_key(s:disabled_packages, 'cucumber')
-  au BufNewFile,BufRead *.feature set ft=cucumber
-  au BufNewFile,BufRead *.story set ft=cucumber
+  au BufNewFile,BufRead *.feature,*.story set ft=cucumber
 endif
 
 if !has_key(s:disabled_packages, 'cue')
@@ -909,8 +757,7 @@ if !has_key(s:disabled_packages, 'cue')
 endif
 
 if !has_key(s:disabled_packages, 'dart')
-  au BufNewFile,BufRead *.dart set ft=dart
-  au BufNewFile,BufRead *.drt set ft=dart
+  au BufNewFile,BufRead *.dart,*.drt set ft=dart
 endif
 
 if !has_key(s:disabled_packages, 'dhall')
@@ -918,8 +765,7 @@ if !has_key(s:disabled_packages, 'dhall')
 endif
 
 if !has_key(s:disabled_packages, 'dlang')
-  au BufNewFile,BufRead *.d set ft=d
-  au BufNewFile,BufRead *.di set ft=d
+  au BufNewFile,BufRead *.d,*.di set ft=d
   au BufNewFile,BufRead *.lst set ft=dcov
   au BufNewFile,BufRead *.dd set ft=dd
   au BufNewFile,BufRead *.ddoc set ft=ddoc
@@ -927,9 +773,7 @@ if !has_key(s:disabled_packages, 'dlang')
 endif
 
 if !has_key(s:disabled_packages, 'dockerfile')
-  au BufNewFile,BufRead *.Dockerfile set ft=Dockerfile
-  au BufNewFile,BufRead *.dock set ft=Dockerfile
-  au BufNewFile,BufRead *.dockerfile set ft=Dockerfile
+  au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile set ft=Dockerfile
   au BufNewFile,BufRead Dockerfile set ft=Dockerfile
   au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
   au BufNewFile,BufRead dockerfile set ft=Dockerfile
@@ -938,11 +782,9 @@ if !has_key(s:disabled_packages, 'dockerfile')
 endif
 
 if !has_key(s:disabled_packages, 'elixir')
-  au BufNewFile,BufRead *.ex set ft=elixir
-  au BufNewFile,BufRead *.exs set ft=elixir
+  au BufNewFile,BufRead *.ex,*.exs set ft=elixir
   au BufNewFile,BufRead mix.lock set ft=elixir
-  au BufNewFile,BufRead *.eex set ft=eelixir
-  au BufNewFile,BufRead *.leex set ft=eelixir
+  au BufNewFile,BufRead *.eex,*.leex set ft=eelixir
 endif
 
 if !has_key(s:disabled_packages, 'elm')
@@ -950,25 +792,15 @@ if !has_key(s:disabled_packages, 'elm')
 endif
 
 if !has_key(s:disabled_packages, 'emberscript')
-  au BufNewFile,BufRead *.em set ft=ember-script
-  au BufNewFile,BufRead *.emberscript set ft=ember-script
+  au BufNewFile,BufRead *.em,*.emberscript set ft=ember-script
 endif
 
 if !has_key(s:disabled_packages, 'emblem')
-  au BufNewFile,BufRead *.em set ft=emblem
-  au BufNewFile,BufRead *.emblem set ft=emblem
+  au BufNewFile,BufRead *.em,*.emblem set ft=emblem
 endif
 
 if !has_key(s:disabled_packages, 'erlang')
-  au BufNewFile,BufRead *.app set ft=erlang
-  au BufNewFile,BufRead *.app.src set ft=erlang
-  au BufNewFile,BufRead *.erl set ft=erlang
-  au BufNewFile,BufRead *.es set ft=erlang
-  au BufNewFile,BufRead *.escript set ft=erlang
-  au BufNewFile,BufRead *.hrl set ft=erlang
-  au BufNewFile,BufRead *.xrl set ft=erlang
-  au BufNewFile,BufRead *.yaws set ft=erlang
-  au BufNewFile,BufRead *.yrl set ft=erlang
+  au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl set ft=erlang
   au BufNewFile,BufRead Emakefile set ft=erlang
   au BufNewFile,BufRead rebar.config set ft=erlang
   au BufNewFile,BufRead rebar.config.lock set ft=erlang
@@ -993,38 +825,17 @@ if !has_key(s:disabled_packages, 'flatbuffers')
 endif
 
 if !has_key(s:disabled_packages, 'forth')
-  au BufNewFile,BufRead *.ft set ft=forth
-  au BufNewFile,BufRead *.fth set ft=forth
+  au BufNewFile,BufRead *.ft,*.fth set ft=forth
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'glsl')
-  au BufNewFile,BufRead *.comp set ft=glsl
-  au BufNewFile,BufRead *.fp set ft=glsl
-  au BufNewFile,BufRead *.frag set ft=glsl
-  au BufNewFile,BufRead *.frg set ft=glsl
-  au BufNewFile,BufRead *.fsh set ft=glsl
-  au BufNewFile,BufRead *.fshader set ft=glsl
-  au BufNewFile,BufRead *.geo set ft=glsl
-  au BufNewFile,BufRead *.geom set ft=glsl
-  au BufNewFile,BufRead *.glsl set ft=glsl
-  au BufNewFile,BufRead *.glslf set ft=glsl
-  au BufNewFile,BufRead *.glslv set ft=glsl
-  au BufNewFile,BufRead *.gs set ft=glsl
-  au BufNewFile,BufRead *.gshader set ft=glsl
-  au BufNewFile,BufRead *.shader set ft=glsl
-  au BufNewFile,BufRead *.tesc set ft=glsl
-  au BufNewFile,BufRead *.tese set ft=glsl
-  au BufNewFile,BufRead *.vert set ft=glsl
-  au BufNewFile,BufRead *.vrx set ft=glsl
-  au BufNewFile,BufRead *.vsh set ft=glsl
-  au BufNewFile,BufRead *.vshader set ft=glsl
+  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'fsharp')
-  au BufNewFile,BufRead *.fsi set ft=fsharp
-  au BufNewFile,BufRead *.fsx set ft=fsharp
+  au BufNewFile,BufRead *.fsi,*.fsx set ft=fsharp
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
 endif
 
@@ -1051,13 +862,7 @@ if !has_key(s:disabled_packages, 'gmpl')
 endif
 
 if !has_key(s:disabled_packages, 'gnuplot')
-  au BufNewFile,BufRead *.gnu set ft=gnuplot
-  au BufNewFile,BufRead *.gnuplot set ft=gnuplot
-  au BufNewFile,BufRead *.gp set ft=gnuplot
-  au BufNewFile,BufRead *.gpi set ft=gnuplot
-  au BufNewFile,BufRead *.p set ft=gnuplot
-  au BufNewFile,BufRead *.plot set ft=gnuplot
-  au BufNewFile,BufRead *.plt set ft=gnuplot
+  au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt set ft=gnuplot
 endif
 
 if !has_key(s:disabled_packages, 'go')
@@ -1067,28 +872,7 @@ if !has_key(s:disabled_packages, 'go')
 endif
 
 if !has_key(s:disabled_packages, 'javascript')
-  au BufNewFile,BufRead *._js set ft=javascript
-  au BufNewFile,BufRead *.bones set ft=javascript
-  au BufNewFile,BufRead *.cjs set ft=javascript
-  au BufNewFile,BufRead *.es set ft=javascript
-  au BufNewFile,BufRead *.es6 set ft=javascript
-  au BufNewFile,BufRead *.frag set ft=javascript
-  au BufNewFile,BufRead *.gs set ft=javascript
-  au BufNewFile,BufRead *.jake set ft=javascript
-  au BufNewFile,BufRead *.javascript set ft=javascript
-  au BufNewFile,BufRead *.js set ft=javascript
-  au BufNewFile,BufRead *.jsb set ft=javascript
-  au BufNewFile,BufRead *.jscad set ft=javascript
-  au BufNewFile,BufRead *.jsfl set ft=javascript
-  au BufNewFile,BufRead *.jsm set ft=javascript
-  au BufNewFile,BufRead *.jss set ft=javascript
-  au BufNewFile,BufRead *.mjs set ft=javascript
-  au BufNewFile,BufRead *.njs set ft=javascript
-  au BufNewFile,BufRead *.pac set ft=javascript
-  au BufNewFile,BufRead *.sjs set ft=javascript
-  au BufNewFile,BufRead *.ssjs set ft=javascript
-  au BufNewFile,BufRead *.xsjs set ft=javascript
-  au BufNewFile,BufRead *.xsjslib set ft=javascript
+  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib set ft=javascript
   au BufNewFile,BufRead Jakefile set ft=javascript
   au BufNewFile,BufRead *.flow set ft=flow
 endif
@@ -1098,17 +882,11 @@ if !has_key(s:disabled_packages, 'jsx')
 endif
 
 if !has_key(s:disabled_packages, 'graphql')
-  au BufNewFile,BufRead *.gql set ft=graphql
-  au BufNewFile,BufRead *.graphql set ft=graphql
-  au BufNewFile,BufRead *.graphqls set ft=graphql
+  au BufNewFile,BufRead *.gql,*.graphql,*.graphqls set ft=graphql
 endif
 
 if !has_key(s:disabled_packages, 'groovy')
-  au BufNewFile,BufRead *.gradle set ft=groovy
-  au BufNewFile,BufRead *.groovy set ft=groovy
-  au BufNewFile,BufRead *.grt set ft=groovy
-  au BufNewFile,BufRead *.gtpl set ft=groovy
-  au BufNewFile,BufRead *.gvy set ft=groovy
+  au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy set ft=groovy
   au BufNewFile,BufRead Jenkinsfile set ft=groovy
 endif
 
@@ -1119,62 +897,38 @@ if !has_key(s:disabled_packages, 'grub')
 endif
 
 if !has_key(s:disabled_packages, 'haml')
-  au BufNewFile,BufRead *.haml set ft=haml
-  au BufNewFile,BufRead *.haml.deface set ft=haml
-  au BufNewFile,BufRead *.hamlbars set ft=haml
-  au BufNewFile,BufRead *.hamlc set ft=haml
+  au BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc set ft=haml
 endif
 
 if !has_key(s:disabled_packages, 'handlebars')
-  au BufNewFile,BufRead *.hjs set ft=html.mustache
-  au BufNewFile,BufRead *.hogan set ft=html.mustache
-  au BufNewFile,BufRead *.hulk set ft=html.mustache
-  au BufNewFile,BufRead *.mustache set ft=html.mustache
-  au BufNewFile,BufRead *.handlebars set ft=html.handlebars
-  au BufNewFile,BufRead *.hb set ft=html.handlebars
-  au BufNewFile,BufRead *.hbs set ft=html.handlebars
-  au BufNewFile,BufRead *.hdbs set ft=html.handlebars
+  au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache set ft=html.mustache
+  au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs set ft=html.handlebars
 endif
 
 if !has_key(s:disabled_packages, 'haskell')
-  au BufNewFile,BufRead *.bpk set ft=haskell
-  au BufNewFile,BufRead *.hs set ft=haskell
-  au BufNewFile,BufRead *.hs-boot set ft=haskell
-  au BufNewFile,BufRead *.hsc set ft=haskell
-  au BufNewFile,BufRead *.hsig set ft=haskell
+  au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig set ft=haskell
 endif
 
 if !has_key(s:disabled_packages, 'haxe')
-  au BufNewFile,BufRead *.hx set ft=haxe
-  au BufNewFile,BufRead *.hxsl set ft=haxe
+  au BufNewFile,BufRead *.hx,*.hxsl set ft=haxe
 endif
 
 if !has_key(s:disabled_packages, 'hcl')
-  au BufNewFile,BufRead *.hcl set ft=hcl
-  au BufNewFile,BufRead *.nomad set ft=hcl
-  au BufNewFile,BufRead *.workflow set ft=hcl
+  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow set ft=hcl
   au BufNewFile,BufRead Appfile set ft=hcl
 endif
 
 if !has_key(s:disabled_packages, 'hive')
-  au BufNewFile,BufRead *.hql set ft=hive
-  au BufNewFile,BufRead *.q set ft=hive
-  au BufNewFile,BufRead *.ql set ft=hive
+  au BufNewFile,BufRead *.hql,*.q,*.ql set ft=hive
 endif
 
 if !has_key(s:disabled_packages, 'html5')
-  au BufNewFile,BufRead *.htm set ft=html
-  au BufNewFile,BufRead *.html.hl set ft=html
-  au BufNewFile,BufRead *.inc set ft=html
-  au BufNewFile,BufRead *.st set ft=html
-  au BufNewFile,BufRead *.xht set ft=html
-  au BufNewFile,BufRead *.xhtml set ft=html
+  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml set ft=html
   au! BufNewFile,BufRead *.html call polyglot#DetectHtmlFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'i3')
-  au BufNewFile,BufRead *.i3.config set ft=i3config
-  au BufNewFile,BufRead *.i3config set ft=i3config
+  au BufNewFile,BufRead *.i3.config,*.i3config set ft=i3config
   au BufNewFile,BufRead {.,}i3.config set ft=i3config
   au BufNewFile,BufRead {.,}i3config set ft=i3config
   au BufNewFile,BufRead i3.config set ft=i3config
@@ -1204,17 +958,13 @@ if !has_key(s:disabled_packages, 'ion')
 endif
 
 if !has_key(s:disabled_packages, 'jenkins')
-  au BufNewFile,BufRead *.Jenkinsfile set ft=Jenkinsfile
-  au BufNewFile,BufRead *.jenkinsfile set ft=Jenkinsfile
+  au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile set ft=Jenkinsfile
   au BufNewFile,BufRead Jenkinsfile set ft=Jenkinsfile
   au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
 if !has_key(s:disabled_packages, 'htmldjango')
-  au BufNewFile,BufRead *.j2 set ft=htmldjango
-  au BufNewFile,BufRead *.jinja set ft=htmldjango
-  au BufNewFile,BufRead *.jinja2 set ft=htmldjango
-  au BufNewFile,BufRead *.njk set ft=htmldjango
+  au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk set ft=htmldjango
 endif
 
 if !has_key(s:disabled_packages, 'jq')
@@ -1228,24 +978,7 @@ if !has_key(s:disabled_packages, 'json5')
 endif
 
 if !has_key(s:disabled_packages, 'json')
-  au BufNewFile,BufRead *.JSON-tmLanguage set ft=json
-  au BufNewFile,BufRead *.avsc set ft=json
-  au BufNewFile,BufRead *.geojson set ft=json
-  au BufNewFile,BufRead *.gltf set ft=json
-  au BufNewFile,BufRead *.har set ft=json
-  au BufNewFile,BufRead *.ice set ft=json
-  au BufNewFile,BufRead *.json set ft=json
-  au BufNewFile,BufRead *.jsonl set ft=json
-  au BufNewFile,BufRead *.jsonp set ft=json
-  au BufNewFile,BufRead *.mcmeta set ft=json
-  au BufNewFile,BufRead *.template set ft=json
-  au BufNewFile,BufRead *.tfstate set ft=json
-  au BufNewFile,BufRead *.tfstate.backup set ft=json
-  au BufNewFile,BufRead *.topojson set ft=json
-  au BufNewFile,BufRead *.webapp set ft=json
-  au BufNewFile,BufRead *.webmanifest set ft=json
-  au BufNewFile,BufRead *.yy set ft=json
-  au BufNewFile,BufRead *.yyp set ft=json
+  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp set ft=json
   au BufNewFile,BufRead {.,}arcconfig set ft=json
   au BufNewFile,BufRead {.,}htmlhintrc set ft=json
   au BufNewFile,BufRead {.,}tern-config set ft=json
@@ -1257,14 +990,11 @@ if !has_key(s:disabled_packages, 'json')
 endif
 
 if !has_key(s:disabled_packages, 'jsonnet')
-  au BufNewFile,BufRead *.jsonnet set ft=jsonnet
-  au BufNewFile,BufRead *.libsonnet set ft=jsonnet
+  au BufNewFile,BufRead *.jsonnet,*.libsonnet set ft=jsonnet
 endif
 
 if !has_key(s:disabled_packages, 'jst')
-  au BufNewFile,BufRead *.ect set ft=jst
-  au BufNewFile,BufRead *.ejs set ft=jst
-  au BufNewFile,BufRead *.jst set ft=jst
+  au BufNewFile,BufRead *.ect,*.ejs,*.jst set ft=jst
 endif
 
 if !has_key(s:disabled_packages, 'julia')
@@ -1272,15 +1002,11 @@ if !has_key(s:disabled_packages, 'julia')
 endif
 
 if !has_key(s:disabled_packages, 'kotlin')
-  au BufNewFile,BufRead *.kt set ft=kotlin
-  au BufNewFile,BufRead *.ktm set ft=kotlin
-  au BufNewFile,BufRead *.kts set ft=kotlin
+  au BufNewFile,BufRead *.kt,*.ktm,*.kts set ft=kotlin
 endif
 
 if !has_key(s:disabled_packages, 'ledger')
-  au BufNewFile,BufRead *.journal set ft=ledger
-  au BufNewFile,BufRead *.ldg set ft=ledger
-  au BufNewFile,BufRead *.ledger set ft=ledger
+  au BufNewFile,BufRead *.journal,*.ldg,*.ledger set ft=ledger
 endif
 
 if !has_key(s:disabled_packages, 'less')
@@ -1288,13 +1014,11 @@ if !has_key(s:disabled_packages, 'less')
 endif
 
 if !has_key(s:disabled_packages, 'lilypond')
-  au BufNewFile,BufRead *.ily set ft=lilypond
-  au BufNewFile,BufRead *.ly set ft=lilypond
+  au BufNewFile,BufRead *.ily,*.ly set ft=lilypond
 endif
 
 if !has_key(s:disabled_packages, 'livescript')
-  au BufNewFile,BufRead *._ls set ft=livescript
-  au BufNewFile,BufRead *.ls set ft=livescript
+  au BufNewFile,BufRead *._ls,*.ls set ft=livescript
   au BufNewFile,BufRead Slakefile set ft=livescript
 endif
 
@@ -1304,62 +1028,35 @@ if !has_key(s:disabled_packages, 'llvm')
 endif
 
 if !has_key(s:disabled_packages, 'log')
-  au BufNewFile,BufRead *.LOG set ft=log
-  au BufNewFile,BufRead *.log set ft=log
+  au BufNewFile,BufRead *.LOG,*.log set ft=log
   au BufNewFile,BufRead *_LOG set ft=log
   au BufNewFile,BufRead *_log set ft=log
 endif
 
 if !has_key(s:disabled_packages, 'lua')
-  au BufNewFile,BufRead *.fcgi set ft=lua
-  au BufNewFile,BufRead *.lua set ft=lua
-  au BufNewFile,BufRead *.nse set ft=lua
-  au BufNewFile,BufRead *.p8 set ft=lua
-  au BufNewFile,BufRead *.pd_lua set ft=lua
-  au BufNewFile,BufRead *.rbxs set ft=lua
-  au BufNewFile,BufRead *.rockspec set ft=lua
-  au BufNewFile,BufRead *.wlua set ft=lua
+  au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua set ft=lua
   au BufNewFile,BufRead {.,}luacheckrc set ft=lua
 endif
 
 if !has_key(s:disabled_packages, 'm4')
-  au BufNewFile,BufRead *.at set ft=m4
-  au BufNewFile,BufRead *.m4 set ft=m4
+  au BufNewFile,BufRead *.at,*.m4 set ft=m4
 endif
 
 if !has_key(s:disabled_packages, 'mako')
   au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile,BufRead *.mako set ft=mako
   au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile,BufRead *.mao set ft=mako
+  au BufNewFile,BufRead *.mako,*.mao set ft=mako
 endif
 
 if !has_key(s:disabled_packages, 'mathematica')
-  au BufNewFile,BufRead *.cdf set ft=mma
-  au BufNewFile,BufRead *.ma set ft=mma
-  au BufNewFile,BufRead *.mathematica set ft=mma
-  au BufNewFile,BufRead *.mma set ft=mma
-  au BufNewFile,BufRead *.mt set ft=mma
-  au BufNewFile,BufRead *.nb set ft=mma
-  au BufNewFile,BufRead *.nbp set ft=mma
-  au BufNewFile,BufRead *.wl set ft=mma
-  au BufNewFile,BufRead *.wls set ft=mma
-  au BufNewFile,BufRead *.wlt set ft=mma
+  au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt set ft=mma
   au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'markdown')
-  au BufNewFile,BufRead *.markdown set ft=markdown
-  au BufNewFile,BufRead *.md set ft=markdown
-  au BufNewFile,BufRead *.mdown set ft=markdown
-  au BufNewFile,BufRead *.mdwn set ft=markdown
-  au BufNewFile,BufRead *.mkd set ft=markdown
-  au BufNewFile,BufRead *.mkdn set ft=markdown
-  au BufNewFile,BufRead *.mkdown set ft=markdown
-  au BufNewFile,BufRead *.ronn set ft=markdown
-  au BufNewFile,BufRead *.workbook set ft=markdown
+  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook set ft=markdown
   au BufNewFile,BufRead contents.lr set ft=markdown
 endif
 
@@ -1382,9 +1079,7 @@ if !has_key(s:disabled_packages, 'murphi')
 endif
 
 if !has_key(s:disabled_packages, 'nginx')
-  au BufNewFile,BufRead *.nginx set ft=nginx
-  au BufNewFile,BufRead *.nginxconf set ft=nginx
-  au BufNewFile,BufRead *.vhost set ft=nginx
+  au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost set ft=nginx
   au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
   au BufNewFile,BufRead */nginx/*.conf set ft=nginx
   au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
@@ -1394,11 +1089,7 @@ if !has_key(s:disabled_packages, 'nginx')
 endif
 
 if !has_key(s:disabled_packages, 'nim')
-  au BufNewFile,BufRead *.nim set ft=nim
-  au BufNewFile,BufRead *.nim.cfg set ft=nim
-  au BufNewFile,BufRead *.nimble set ft=nim
-  au BufNewFile,BufRead *.nimrod set ft=nim
-  au BufNewFile,BufRead *.nims set ft=nim
+  au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims set ft=nim
   au BufNewFile,BufRead nim.cfg set ft=nim
 endif
 
@@ -1412,25 +1103,13 @@ if !has_key(s:disabled_packages, 'objc')
 endif
 
 if !has_key(s:disabled_packages, 'ocaml')
-  au BufNewFile,BufRead *.eliom set ft=ocaml
-  au BufNewFile,BufRead *.eliomi set ft=ocaml
-  au BufNewFile,BufRead *.ml set ft=ocaml
-  au BufNewFile,BufRead *.ml.cppo set ft=ocaml
-  au BufNewFile,BufRead *.ml4 set ft=ocaml
-  au BufNewFile,BufRead *.mli set ft=ocaml
-  au BufNewFile,BufRead *.mli.cppo set ft=ocaml
-  au BufNewFile,BufRead *.mlip set ft=ocaml
-  au BufNewFile,BufRead *.mll set ft=ocaml
-  au BufNewFile,BufRead *.mlp set ft=ocaml
-  au BufNewFile,BufRead *.mlt set ft=ocaml
-  au BufNewFile,BufRead *.mly set ft=ocaml
+  au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly set ft=ocaml
   au BufNewFile,BufRead {.,}ocamlinit set ft=ocaml
   au BufNewFile,BufRead *.om set ft=omake
   au BufNewFile,BufRead OMakefile set ft=omake
   au BufNewFile,BufRead OMakeroot set ft=omake
   au BufNewFile,BufRead OMakeroot.in set ft=omake
-  au BufNewFile,BufRead *.opam set ft=opam
-  au BufNewFile,BufRead *.opam.template set ft=opam
+  au BufNewFile,BufRead *.opam,*.opam.template set ft=opam
   au BufNewFile,BufRead opam set ft=opam
   au BufNewFile,BufRead _oasis set ft=oasis
   au BufNewFile,BufRead dune set ft=dune
@@ -1449,18 +1128,11 @@ if !has_key(s:disabled_packages, 'octave')
 endif
 
 if !has_key(s:disabled_packages, 'opencl')
-  au BufNewFile,BufRead *.cl set ft=opencl
-  au BufNewFile,BufRead *.opencl set ft=opencl
+  au BufNewFile,BufRead *.cl,*.opencl set ft=opencl
 endif
 
 if !has_key(s:disabled_packages, 'perl')
-  au BufNewFile,BufRead *.al set ft=perl
-  au BufNewFile,BufRead *.cgi set ft=perl
-  au BufNewFile,BufRead *.fcgi set ft=perl
-  au BufNewFile,BufRead *.perl set ft=perl
-  au BufNewFile,BufRead *.ph set ft=perl
-  au BufNewFile,BufRead *.plx set ft=perl
-  au BufNewFile,BufRead *.psgi set ft=perl
+  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi set ft=perl
   au BufNewFile,BufRead {.,}gitolite.rc set ft=perl
   au BufNewFile,BufRead Makefile.PL set ft=perl
   au BufNewFile,BufRead Rexfile set ft=perl
@@ -1468,9 +1140,7 @@ if !has_key(s:disabled_packages, 'perl')
   au BufNewFile,BufRead cpanfile set ft=perl
   au BufNewFile,BufRead example.gitolite.rc set ft=perl
   au BufNewFile,BufRead *.pod set ft=pod
-  au BufNewFile,BufRead *.comp set ft=mason
-  au BufNewFile,BufRead *.mason set ft=mason
-  au BufNewFile,BufRead *.mhtml set ft=mason
+  au BufNewFile,BufRead *.comp,*.mason,*.mhtml set ft=mason
   au BufNewFile,BufRead *.xs set ft=xs
   au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
   au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
@@ -1487,17 +1157,7 @@ if !has_key(s:disabled_packages, 'cql')
 endif
 
 if !has_key(s:disabled_packages, 'php')
-  au BufNewFile,BufRead *.aw set ft=php
-  au BufNewFile,BufRead *.ctp set ft=php
-  au BufNewFile,BufRead *.fcgi set ft=php
-  au BufNewFile,BufRead *.inc set ft=php
-  au BufNewFile,BufRead *.php set ft=php
-  au BufNewFile,BufRead *.php3 set ft=php
-  au BufNewFile,BufRead *.php4 set ft=php
-  au BufNewFile,BufRead *.php5 set ft=php
-  au BufNewFile,BufRead *.phps set ft=php
-  au BufNewFile,BufRead *.phpt set ft=php
-  au BufNewFile,BufRead *.phtml set ft=php
+  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml set ft=php
   au BufNewFile,BufRead {.,}php set ft=php
   au BufNewFile,BufRead {.,}php_cs set ft=php
   au BufNewFile,BufRead {.,}php_cs.dist set ft=php
@@ -1505,16 +1165,11 @@ if !has_key(s:disabled_packages, 'php')
 endif
 
 if !has_key(s:disabled_packages, 'blade')
-  au BufNewFile,BufRead *.blade set ft=blade
-  au BufNewFile,BufRead *.blade.php set ft=blade
+  au BufNewFile,BufRead *.blade,*.blade.php set ft=blade
 endif
 
 if !has_key(s:disabled_packages, 'plantuml')
-  au BufNewFile,BufRead *.iuml set ft=plantuml
-  au BufNewFile,BufRead *.plantuml set ft=plantuml
-  au BufNewFile,BufRead *.pu set ft=plantuml
-  au BufNewFile,BufRead *.puml set ft=plantuml
-  au BufNewFile,BufRead *.uml set ft=plantuml
+  au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml set ft=plantuml
 endif
 
 if !has_key(s:disabled_packages, 'pony')
@@ -1522,10 +1177,7 @@ if !has_key(s:disabled_packages, 'pony')
 endif
 
 if !has_key(s:disabled_packages, 'powershell')
-  au BufNewFile,BufRead *.ps1 set ft=ps1
-  au BufNewFile,BufRead *.psd1 set ft=ps1
-  au BufNewFile,BufRead *.psm1 set ft=ps1
-  au BufNewFile,BufRead *.pssc set ft=ps1
+  au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc set ft=ps1
   au BufNewFile,BufRead *.ps1xml set ft=ps1xml
 endif
 
@@ -1534,8 +1186,7 @@ if !has_key(s:disabled_packages, 'protobuf')
 endif
 
 if !has_key(s:disabled_packages, 'pug')
-  au BufNewFile,BufRead *.jade set ft=pug
-  au BufNewFile,BufRead *.pug set ft=pug
+  au BufNewFile,BufRead *.jade,*.pug set ft=pug
 endif
 
 if !has_key(s:disabled_packages, 'puppet')
@@ -1549,25 +1200,7 @@ if !has_key(s:disabled_packages, 'purescript')
 endif
 
 if !has_key(s:disabled_packages, 'python')
-  au BufNewFile,BufRead *.cgi set ft=python
-  au BufNewFile,BufRead *.fcgi set ft=python
-  au BufNewFile,BufRead *.gyp set ft=python
-  au BufNewFile,BufRead *.gypi set ft=python
-  au BufNewFile,BufRead *.lmi set ft=python
-  au BufNewFile,BufRead *.ptl set ft=python
-  au BufNewFile,BufRead *.py set ft=python
-  au BufNewFile,BufRead *.py3 set ft=python
-  au BufNewFile,BufRead *.pyde set ft=python
-  au BufNewFile,BufRead *.pyi set ft=python
-  au BufNewFile,BufRead *.pyp set ft=python
-  au BufNewFile,BufRead *.pyt set ft=python
-  au BufNewFile,BufRead *.pyw set ft=python
-  au BufNewFile,BufRead *.rpy set ft=python
-  au BufNewFile,BufRead *.smk set ft=python
-  au BufNewFile,BufRead *.spec set ft=python
-  au BufNewFile,BufRead *.tac set ft=python
-  au BufNewFile,BufRead *.wsgi set ft=python
-  au BufNewFile,BufRead *.xpy set ft=python
+  au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy set ft=python
   au BufNewFile,BufRead {.,}gclient set ft=python
   au BufNewFile,BufRead {.,}pythonrc set ft=python
   au BufNewFile,BufRead {.,}pythonstartup set ft=python
@@ -1586,30 +1219,22 @@ if !has_key(s:disabled_packages, 'requirements')
 endif
 
 if !has_key(s:disabled_packages, 'qmake')
-  au BufNewFile,BufRead *.pri set ft=qmake
-  au BufNewFile,BufRead *.pro set ft=qmake
+  au BufNewFile,BufRead *.pri,*.pro set ft=qmake
 endif
 
 if !has_key(s:disabled_packages, 'qml')
-  au BufNewFile,BufRead *.qbs set ft=qml
-  au BufNewFile,BufRead *.qml set ft=qml
+  au BufNewFile,BufRead *.qbs,*.qml set ft=qml
 endif
 
 if !has_key(s:disabled_packages, 'r-lang')
-  au BufNewFile,BufRead *.S set ft=r
-  au BufNewFile,BufRead *.r set ft=r
-  au BufNewFile,BufRead *.rsx set ft=r
-  au BufNewFile,BufRead *.s set ft=r
+  au BufNewFile,BufRead *.S,*.r,*.rsx,*.s set ft=r
   au BufNewFile,BufRead {.,}Rprofile set ft=r
   au BufNewFile,BufRead expr-dist set ft=r
   au BufNewFile,BufRead *.rd set ft=rhelp
 endif
 
 if !has_key(s:disabled_packages, 'racket')
-  au BufNewFile,BufRead *.rkt set ft=racket
-  au BufNewFile,BufRead *.rktd set ft=racket
-  au BufNewFile,BufRead *.rktl set ft=racket
-  au BufNewFile,BufRead *.scrbl set ft=racket
+  au BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl set ft=racket
 endif
 
 if !has_key(s:disabled_packages, 'ragel')
@@ -1617,20 +1242,7 @@ if !has_key(s:disabled_packages, 'ragel')
 endif
 
 if !has_key(s:disabled_packages, 'raku')
-  au BufNewFile,BufRead *.6pl set ft=raku
-  au BufNewFile,BufRead *.6pm set ft=raku
-  au BufNewFile,BufRead *.nqp set ft=raku
-  au BufNewFile,BufRead *.p6 set ft=raku
-  au BufNewFile,BufRead *.p6l set ft=raku
-  au BufNewFile,BufRead *.p6m set ft=raku
-  au BufNewFile,BufRead *.pl6 set ft=raku
-  au BufNewFile,BufRead *.pm6 set ft=raku
-  au BufNewFile,BufRead *.pod6 set ft=raku
-  au BufNewFile,BufRead *.raku set ft=raku
-  au BufNewFile,BufRead *.rakudoc set ft=raku
-  au BufNewFile,BufRead *.rakumod set ft=raku
-  au BufNewFile,BufRead *.rakutest set ft=raku
-  au BufNewFile,BufRead *.t6 set ft=raku
+  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 set ft=raku
   au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
   au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
   au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
@@ -1641,8 +1253,7 @@ if !has_key(s:disabled_packages, 'raml')
 endif
 
 if !has_key(s:disabled_packages, 'razor')
-  au BufNewFile,BufRead *.cshtml set ft=razor
-  au BufNewFile,BufRead *.razor set ft=razor
+  au BufNewFile,BufRead *.cshtml,*.razor set ft=razor
 endif
 
 if !has_key(s:disabled_packages, 'reason')
@@ -1651,40 +1262,11 @@ if !has_key(s:disabled_packages, 'reason')
 endif
 
 if !has_key(s:disabled_packages, 'rst')
-  au BufNewFile,BufRead *.rest set ft=rst
-  au BufNewFile,BufRead *.rest.txt set ft=rst
-  au BufNewFile,BufRead *.rst set ft=rst
-  au BufNewFile,BufRead *.rst.txt set ft=rst
+  au BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt set ft=rst
 endif
 
 if !has_key(s:disabled_packages, 'ruby')
-  au BufNewFile,BufRead *.axlsx set ft=ruby
-  au BufNewFile,BufRead *.builder set ft=ruby
-  au BufNewFile,BufRead *.cap set ft=ruby
-  au BufNewFile,BufRead *.eye set ft=ruby
-  au BufNewFile,BufRead *.fcgi set ft=ruby
-  au BufNewFile,BufRead *.gemspec set ft=ruby
-  au BufNewFile,BufRead *.god set ft=ruby
-  au BufNewFile,BufRead *.jbuilder set ft=ruby
-  au BufNewFile,BufRead *.mspec set ft=ruby
-  au BufNewFile,BufRead *.opal set ft=ruby
-  au BufNewFile,BufRead *.pluginspec set ft=ruby
-  au BufNewFile,BufRead *.podspec set ft=ruby
-  au BufNewFile,BufRead *.rabl set ft=ruby
-  au BufNewFile,BufRead *.rake set ft=ruby
-  au BufNewFile,BufRead *.rant set ft=ruby
-  au BufNewFile,BufRead *.rb set ft=ruby
-  au BufNewFile,BufRead *.rbi set ft=ruby
-  au BufNewFile,BufRead *.rbuild set ft=ruby
-  au BufNewFile,BufRead *.rbw set ft=ruby
-  au BufNewFile,BufRead *.rbx set ft=ruby
-  au BufNewFile,BufRead *.rjs set ft=ruby
-  au BufNewFile,BufRead *.ru set ft=ruby
-  au BufNewFile,BufRead *.ruby set ft=ruby
-  au BufNewFile,BufRead *.rxml set ft=ruby
-  au BufNewFile,BufRead *.spec set ft=ruby
-  au BufNewFile,BufRead *.thor set ft=ruby
-  au BufNewFile,BufRead *.watchr set ft=ruby
+  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr set ft=ruby
   au BufNewFile,BufRead {.,}Brewfile set ft=ruby
   au BufNewFile,BufRead {.,}Guardfile set ft=ruby
   au BufNewFile,BufRead {.,}autotest set ft=ruby
@@ -1716,9 +1298,7 @@ if !has_key(s:disabled_packages, 'ruby')
   au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
   au BufNewFile,BufRead buildfile set ft=ruby
   au BufNewFile,BufRead vagrantfile set ft=ruby
-  au BufNewFile,BufRead *.erb set ft=eruby
-  au BufNewFile,BufRead *.erb.deface set ft=eruby
-  au BufNewFile,BufRead *.rhtml set ft=eruby
+  au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml set ft=eruby
 endif
 
 if !has_key(s:disabled_packages, 'rspec')
@@ -1730,14 +1310,11 @@ if !has_key(s:disabled_packages, 'brewfile')
 endif
 
 if !has_key(s:disabled_packages, 'rust')
-  au BufNewFile,BufRead *.rs set ft=rust
-  au BufNewFile,BufRead *.rs.in set ft=rust
+  au BufNewFile,BufRead *.rs,*.rs.in set ft=rust
 endif
 
 if !has_key(s:disabled_packages, 'scala')
-  au BufNewFile,BufRead *.kojo set ft=scala
-  au BufNewFile,BufRead *.sc set ft=scala
-  au BufNewFile,BufRead *.scala set ft=scala
+  au BufNewFile,BufRead *.kojo,*.sc,*.scala set ft=scala
 endif
 
 if !has_key(s:disabled_packages, 'sbt')
@@ -1749,17 +1326,7 @@ if !has_key(s:disabled_packages, 'scss')
 endif
 
 if !has_key(s:disabled_packages, 'sh')
-  au BufNewFile,BufRead *.bash set ft=sh
-  au BufNewFile,BufRead *.bats set ft=sh
-  au BufNewFile,BufRead *.cgi set ft=sh
-  au BufNewFile,BufRead *.command set ft=sh
-  au BufNewFile,BufRead *.env set ft=sh
-  au BufNewFile,BufRead *.fcgi set ft=sh
-  au BufNewFile,BufRead *.ksh set ft=sh
-  au BufNewFile,BufRead *.sh set ft=sh
-  au BufNewFile,BufRead *.sh.in set ft=sh
-  au BufNewFile,BufRead *.tmux set ft=sh
-  au BufNewFile,BufRead *.tool set ft=sh
+  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool set ft=sh
   au BufNewFile,BufRead */etc/udev/cdsymlinks.conf set ft=sh
   au BufNewFile,BufRead {.,}bash_aliases set ft=sh
   au BufNewFile,BufRead {.,}bash_history set ft=sh
@@ -1809,8 +1376,7 @@ if !has_key(s:disabled_packages, 'slime')
 endif
 
 if !has_key(s:disabled_packages, 'smt2')
-  au BufNewFile,BufRead *.smt set ft=smt2
-  au BufNewFile,BufRead *.smt2 set ft=smt2
+  au BufNewFile,BufRead *.smt,*.smt2 set ft=smt2
 endif
 
 if !has_key(s:disabled_packages, 'solidity')
@@ -1818,8 +1384,7 @@ if !has_key(s:disabled_packages, 'solidity')
 endif
 
 if !has_key(s:disabled_packages, 'stylus')
-  au BufNewFile,BufRead *.styl set ft=stylus
-  au BufNewFile,BufRead *.stylus set ft=stylus
+  au BufNewFile,BufRead *.styl,*.stylus set ft=stylus
 endif
 
 if !has_key(s:disabled_packages, 'svelte')
@@ -1840,30 +1405,13 @@ if !has_key(s:disabled_packages, 'sxhkd')
 endif
 
 if !has_key(s:disabled_packages, 'systemd')
-  au BufNewFile,BufRead *.automount set ft=systemd
-  au BufNewFile,BufRead *.dnssd set ft=systemd
-  au BufNewFile,BufRead *.link set ft=systemd
-  au BufNewFile,BufRead *.mount set ft=systemd
-  au BufNewFile,BufRead *.netdev set ft=systemd
-  au BufNewFile,BufRead *.network set ft=systemd
-  au BufNewFile,BufRead *.nspawn set ft=systemd
-  au BufNewFile,BufRead *.path set ft=systemd
-  au BufNewFile,BufRead *.service set ft=systemd
-  au BufNewFile,BufRead *.slice set ft=systemd
-  au BufNewFile,BufRead *.socket set ft=systemd
-  au BufNewFile,BufRead *.swap set ft=systemd
-  au BufNewFile,BufRead *.target set ft=systemd
-  au BufNewFile,BufRead *.timer set ft=systemd
+  au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer set ft=systemd
   au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
   au BufNewFile,BufRead */systemd/*.conf set ft=systemd
 endif
 
 if !has_key(s:disabled_packages, 'terraform')
-  au BufNewFile,BufRead *.hcl set ft=terraform
-  au BufNewFile,BufRead *.nomad set ft=terraform
-  au BufNewFile,BufRead *.tf set ft=terraform
-  au BufNewFile,BufRead *.tfvars set ft=terraform
-  au BufNewFile,BufRead *.workflow set ft=terraform
+  au BufNewFile,BufRead *.hcl,*.nomad,*.tf,*.tfvars,*.workflow set ft=terraform
 endif
 
 if !has_key(s:disabled_packages, 'textile')
@@ -1889,9 +1437,7 @@ if !has_key(s:disabled_packages, 'toml')
 endif
 
 if !has_key(s:disabled_packages, 'tptp')
-  au BufNewFile,BufRead *.ax set ft=tptp
-  au BufNewFile,BufRead *.p set ft=tptp
-  au BufNewFile,BufRead *.tptp set ft=tptp
+  au BufNewFile,BufRead *.ax,*.p,*.tptp set ft=tptp
 endif
 
 if !has_key(s:disabled_packages, 'twig')
@@ -1905,8 +1451,7 @@ if !has_key(s:disabled_packages, 'typescript')
 endif
 
 if !has_key(s:disabled_packages, 'unison')
-  au BufNewFile,BufRead *.u set ft=unison
-  au BufNewFile,BufRead *.uu set ft=unison
+  au BufNewFile,BufRead *.u,*.uu set ft=unison
 endif
 
 if !has_key(s:disabled_packages, 'v')
@@ -1914,14 +1459,11 @@ if !has_key(s:disabled_packages, 'v')
 endif
 
 if !has_key(s:disabled_packages, 'vala')
-  au BufNewFile,BufRead *.vala set ft=vala
-  au BufNewFile,BufRead *.valadoc set ft=vala
-  au BufNewFile,BufRead *.vapi set ft=vala
+  au BufNewFile,BufRead *.vala,*.valadoc,*.vapi set ft=vala
 endif
 
 if !has_key(s:disabled_packages, 'vbnet')
-  au BufNewFile,BufRead *.vb set ft=vbnet
-  au BufNewFile,BufRead *.vbhtml set ft=vbnet
+  au BufNewFile,BufRead *.vb,*.vbhtml set ft=vbnet
 endif
 
 if !has_key(s:disabled_packages, 'vcl')
@@ -1937,8 +1479,7 @@ if !has_key(s:disabled_packages, 'vmasm')
 endif
 
 if !has_key(s:disabled_packages, 'vue')
-  au BufNewFile,BufRead *.vue set ft=vue
-  au BufNewFile,BufRead *.wpy set ft=vue
+  au BufNewFile,BufRead *.vue,*.wpy set ft=vue
 endif
 
 if !has_key(s:disabled_packages, 'xdc')
@@ -1946,21 +1487,11 @@ if !has_key(s:disabled_packages, 'xdc')
 endif
 
 if !has_key(s:disabled_packages, 'xsl')
-  au BufNewFile,BufRead *.xsl set ft=xsl
-  au BufNewFile,BufRead *.xslt set ft=xsl
+  au BufNewFile,BufRead *.xsl,*.xslt set ft=xsl
 endif
 
 if !has_key(s:disabled_packages, 'yaml')
-  au BufNewFile,BufRead *.mir set ft=yaml
-  au BufNewFile,BufRead *.reek set ft=yaml
-  au BufNewFile,BufRead *.rviz set ft=yaml
-  au BufNewFile,BufRead *.sublime-syntax set ft=yaml
-  au BufNewFile,BufRead *.syntax set ft=yaml
-  au BufNewFile,BufRead *.yaml set ft=yaml
-  au BufNewFile,BufRead *.yaml-tmlanguage set ft=yaml
-  au BufNewFile,BufRead *.yaml.sed set ft=yaml
-  au BufNewFile,BufRead *.yml set ft=yaml
-  au BufNewFile,BufRead *.yml.mysql set ft=yaml
+  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql set ft=yaml
   au BufNewFile,BufRead {.,}clang-format set ft=yaml
   au BufNewFile,BufRead {.,}clang-tidy set ft=yaml
   au BufNewFile,BufRead {.,}gemrc set ft=yaml
@@ -1998,8 +1529,7 @@ endif
 
 if !has_key(s:disabled_packages, 'zig')
   au BufNewFile,BufRead *.zir set ft=zir
-  au BufNewFile,BufRead *.zig set ft=zig
-  au BufNewFile,BufRead *.zir set ft=zig
+  au BufNewFile,BufRead *.zig,*.zir set ft=zig
 endif
 
 if !has_key(s:disabled_packages, 'trasys')
@@ -2011,24 +1541,12 @@ if !has_key(s:disabled_packages, 'basic')
 endif
 
 if !has_key(s:disabled_packages, 'visual-basic')
-  au BufNewFile,BufRead *.cls set ft=vb
-  au BufNewFile,BufRead *.ctl set ft=vb
-  au BufNewFile,BufRead *.dsm set ft=vb
-  au BufNewFile,BufRead *.frm set ft=vb
-  au BufNewFile,BufRead *.frx set ft=vb
-  au BufNewFile,BufRead *.sba set ft=vb
-  au BufNewFile,BufRead *.vba set ft=vb
-  au BufNewFile,BufRead *.vbs set ft=vb
+  au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs set ft=vb
   au! BufNewFile,BufRead *.bas call polyglot#DetectBasFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'dosini')
-  au BufNewFile,BufRead *.dof set ft=dosini
-  au BufNewFile,BufRead *.ini set ft=dosini
-  au BufNewFile,BufRead *.lektorproject set ft=dosini
-  au BufNewFile,BufRead *.prefs set ft=dosini
-  au BufNewFile,BufRead *.pro set ft=dosini
-  au BufNewFile,BufRead *.properties set ft=dosini
+  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties set ft=dosini
   au BufNewFile,BufRead */etc/pacman.conf set ft=dosini
   au BufNewFile,BufRead */etc/yum.conf set ft=dosini
   au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
@@ -2043,9 +1561,7 @@ if !has_key(s:disabled_packages, 'odin')
 endif
 
 if !has_key(s:disabled_packages, 'bzl')
-  au BufNewFile,BufRead *.BUILD set ft=bzl
-  au BufNewFile,BufRead *.bazel set ft=bzl
-  au BufNewFile,BufRead *.bzl set ft=bzl
+  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl set ft=bzl
   au BufNewFile,BufRead BUCK set ft=bzl
   au BufNewFile,BufRead BUILD set ft=bzl
   au BufNewFile,BufRead BUILD.bazel set ft=bzl
@@ -2054,10 +1570,7 @@ if !has_key(s:disabled_packages, 'bzl')
 endif
 
 if !has_key(s:disabled_packages, 'prolog')
-  au BufNewFile,BufRead *.pdb set ft=prolog
-  au BufNewFile,BufRead *.pro set ft=prolog
-  au BufNewFile,BufRead *.prolog set ft=prolog
-  au BufNewFile,BufRead *.yap set ft=prolog
+  au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap set ft=prolog
   au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
 endif
 
@@ -2072,25 +1585,7 @@ if !has_key(s:disabled_packages, 'gitignore')
 endif
 
 if !has_key(s:disabled_packages, 'sql')
-  au BufNewFile,BufRead *.bdy set ft=sql
-  au BufNewFile,BufRead *.ddl set ft=sql
-  au BufNewFile,BufRead *.fnc set ft=sql
-  au BufNewFile,BufRead *.pck set ft=sql
-  au BufNewFile,BufRead *.pkb set ft=sql
-  au BufNewFile,BufRead *.pks set ft=sql
-  au BufNewFile,BufRead *.plb set ft=sql
-  au BufNewFile,BufRead *.pls set ft=sql
-  au BufNewFile,BufRead *.plsql set ft=sql
-  au BufNewFile,BufRead *.prc set ft=sql
-  au BufNewFile,BufRead *.spc set ft=sql
-  au BufNewFile,BufRead *.sql set ft=sql
-  au BufNewFile,BufRead *.tpb set ft=sql
-  au BufNewFile,BufRead *.tps set ft=sql
-  au BufNewFile,BufRead *.trg set ft=sql
-  au BufNewFile,BufRead *.tyb set ft=sql
-  au BufNewFile,BufRead *.tyc set ft=sql
-  au BufNewFile,BufRead *.typ set ft=sql
-  au BufNewFile,BufRead *.vw set ft=sql
+  au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw set ft=sql
 endif
 
 
diff --git a/scripts/build b/scripts/build
index f60146c21..45713994e 100755
--- a/scripts/build
+++ b/scripts/build
@@ -496,6 +496,7 @@ def generate_ftdetect(packages, heuristics)
       extensions = filetype["extensions"]
       filenames = filetype["filenames"]
 
+      set_extensions = []
       for extension in extensions.sort
         outer_filetype = filetype["outer_filetype"]
         if outer_filetype
@@ -511,10 +512,14 @@ def generate_ftdetect(packages, heuristics)
           #   puts "Ambiguous extension without heuristic: #{extension} => #{filetype["name"]}"
           # end
           #
-          autocommands << "  au BufNewFile,BufRead *.#{extension} #{set_command}\n"
+          set_extensions << "*." + extension
         end
       end
 
+      if set_extensions.size > 0
+        autocommands << "  au BufNewFile,BufRead #{set_extensions.join(",")} #{set_command}\n"
+      end
+
       for filename in filenames.sort
         if filename[0] == "."
           filename = "{.,}" + filename[1..-1]

From 63f43f3b01a910444176eeb972c88964ebb87e45 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 28 Sep 2020 19:35:09 +0200
Subject: [PATCH 086/299] Make ftdetect even shorter

---
 ftdetect/polyglot.vim | 478 +++++++++++++-----------------------------
 scripts/build         |  27 +--
 2 files changed, 158 insertions(+), 347 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index ac567f276..0d79667b0 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -519,16 +519,12 @@ if !has_key(s:disabled_packages, '8th')
 endif
 
 if !has_key(s:disabled_packages, 'haproxy')
-  au BufNewFile,BufRead *.cfg set ft=haproxy
+  au BufNewFile,BufRead *.cfg,haproxy.cfg set ft=haproxy
   au BufNewFile,BufRead haproxy*.c* call s:StarSetf('haproxy')
-  au BufNewFile,BufRead haproxy.cfg set ft=haproxy
 endif
 
 if !has_key(s:disabled_packages, 'a2ps')
-  au BufNewFile,BufRead */etc/a2ps.cfg set ft=a2ps
-  au BufNewFile,BufRead */etc/a2ps/*.cfg set ft=a2ps
-  au BufNewFile,BufRead {.,}a2psrc set ft=a2ps
-  au BufNewFile,BufRead a2psrc set ft=a2ps
+  au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc set ft=a2ps
 endif
 
 if !has_key(s:disabled_packages, 'a65')
@@ -576,9 +572,7 @@ if !has_key(s:disabled_packages, 'aidl')
 endif
 
 if !has_key(s:disabled_packages, 'alsaconf')
-  au BufNewFile,BufRead */etc/asound.conf set ft=alsaconf
-  au BufNewFile,BufRead */usr/share/alsa/alsa.conf set ft=alsaconf
-  au BufNewFile,BufRead {.,}asoundrc set ft=alsaconf
+  au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc set ft=alsaconf
 endif
 
 if !has_key(s:disabled_packages, 'aml')
@@ -590,21 +584,7 @@ if !has_key(s:disabled_packages, 'ampl')
 endif
 
 if !has_key(s:disabled_packages, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml set ft=xml
-  au BufNewFile,BufRead */etc/blkid.tab set ft=xml
-  au BufNewFile,BufRead */etc/blkid.tab.old set ft=xml
-  au BufNewFile,BufRead */etc/xdg/menus/*.menu set ft=xml
-  au BufNewFile,BufRead *fglrxrc set ft=xml
-  au BufNewFile,BufRead {.,}classpath set ft=xml
-  au BufNewFile,BufRead {.,}cproject set ft=xml
-  au BufNewFile,BufRead {.,}project set ft=xml
-  au BufNewFile,BufRead App.config set ft=xml
-  au BufNewFile,BufRead NuGet.config set ft=xml
-  au BufNewFile,BufRead Settings.StyleCop set ft=xml
-  au BufNewFile,BufRead Web.Debug.config set ft=xml
-  au BufNewFile,BufRead Web.Release.config set ft=xml
-  au BufNewFile,BufRead Web.config set ft=xml
-  au BufNewFile,BufRead packages.config set ft=xml
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config set ft=xml
 endif
 
 if !has_key(s:disabled_packages, 'ant')
@@ -612,19 +592,17 @@ if !has_key(s:disabled_packages, 'ant')
 endif
 
 if !has_key(s:disabled_packages, 'apache')
-  au BufNewFile,BufRead */etc/apache2/*.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/conf.*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/mods-*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/sites-*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/sites-*/*.com set ft=apache
-  au BufNewFile,BufRead */etc/httpd/*.conf set ft=apache
-  au BufNewFile,BufRead */etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead {.,}htaccess set ft=apache
-  au BufNewFile,BufRead access.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead apache.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess set ft=apache
   au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead apache.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead access.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/sites-*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/mods-*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/conf.*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/*.conf* call s:StarSetf('apache')
 endif
 
 if !has_key(s:disabled_packages, 'apiblueprint')
@@ -636,22 +614,18 @@ if !has_key(s:disabled_packages, 'applescript')
 endif
 
 if !has_key(s:disabled_packages, 'aptconf')
-  au BufNewFile,BufRead */.aptitude/config set ft=aptconf
-  au BufNewFile,BufRead */etc/apt/apt.conf.d/*.conf set ft=aptconf
+  au BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf set ft=aptconf
   au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
-  au BufNewFile,BufRead apt.conf set ft=aptconf
 endif
 
 if !has_key(s:disabled_packages, 'arch')
-  au BufNewFile,BufRead {.,}arch-inventory set ft=arch
-  au BufNewFile,BufRead =tagging-method set ft=arch
+  au BufNewFile,BufRead {.,}arch-inventory,=tagging-method set ft=arch
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
-  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp set ft=cpp
-  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc set ft=c
-  au BufNewFile,BufRead *enlightenment/*.cfg set ft=c
   au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
+  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg set ft=c
+  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp set ft=cpp
 endif
 
 if !has_key(s:disabled_packages, 'arduino')
@@ -675,8 +649,7 @@ if !has_key(s:disabled_packages, 'elf')
 endif
 
 if !has_key(s:disabled_packages, 'automake')
-  au BufNewFile,BufRead GNUmakefile.am set ft=automake
-  au BufNewFile,BufRead [Mm]akefile.am set ft=automake
+  au BufNewFile,BufRead GNUmakefile.am,[Mm]akefile.am set ft=automake
 endif
 
 if !has_key(s:disabled_packages, 'asn')
@@ -684,8 +657,8 @@ if !has_key(s:disabled_packages, 'asn')
 endif
 
 if !has_key(s:disabled_packages, 'aspvbs')
-  au! BufNewFile,BufRead *.asa call polyglot#DetectAsaFiletype()
   au! BufNewFile,BufRead *.asp call polyglot#DetectAspFiletype()
+  au! BufNewFile,BufRead *.asa call polyglot#DetectAsaFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'aspperl')
@@ -712,26 +685,27 @@ if !has_key(s:disabled_packages, 'caddyfile')
   au BufNewFile,BufRead Caddyfile set ft=caddyfile
 endif
 
+if !has_key(s:disabled_packages, 'cpp-modern')
+endif
+
 if !has_key(s:disabled_packages, 'carp')
   au BufNewFile,BufRead *.carp set ft=carp
 endif
 
 if !has_key(s:disabled_packages, 'clojure')
-  au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic set ft=clojure
-  au BufNewFile,BufRead build.boot set ft=clojure
-  au BufNewFile,BufRead profile.boot set ft=clojure
-  au BufNewFile,BufRead riemann.config set ft=clojure
+  au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config set ft=clojure
 endif
 
 if !has_key(s:disabled_packages, 'cmake')
-  au BufNewFile,BufRead *.cmake,*.cmake.in set ft=cmake
-  au BufNewFile,BufRead CMakeLists.txt set ft=cmake
+  au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt set ft=cmake
 endif
 
 if !has_key(s:disabled_packages, 'coffee-script')
-  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced set ft=coffee
-  au BufNewFile,BufRead Cakefile set ft=coffee
   au BufNewFile,BufRead *.coffee.md,*.litcoffee set ft=litcoffee
+  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile set ft=coffee
+endif
+
+if !has_key(s:disabled_packages, 'cjsx')
 endif
 
 if !has_key(s:disabled_packages, 'cryptol')
@@ -739,9 +713,8 @@ if !has_key(s:disabled_packages, 'cryptol')
 endif
 
 if !has_key(s:disabled_packages, 'crystal')
-  au BufNewFile,BufRead *.cr set ft=crystal
-  au BufNewFile,BufRead Projectfile set ft=crystal
   au BufNewFile,BufRead *.ecr set ft=ecrystal
+  au BufNewFile,BufRead *.cr,Projectfile set ft=crystal
 endif
 
 if !has_key(s:disabled_packages, 'csv')
@@ -765,26 +738,22 @@ if !has_key(s:disabled_packages, 'dhall')
 endif
 
 if !has_key(s:disabled_packages, 'dlang')
-  au BufNewFile,BufRead *.d,*.di set ft=d
-  au BufNewFile,BufRead *.lst set ft=dcov
-  au BufNewFile,BufRead *.dd set ft=dd
-  au BufNewFile,BufRead *.ddoc set ft=ddoc
   au BufNewFile,BufRead *.sdl set ft=dsdl
+  au BufNewFile,BufRead *.ddoc set ft=ddoc
+  au BufNewFile,BufRead *.dd set ft=dd
+  au BufNewFile,BufRead *.lst set ft=dcov
+  au BufNewFile,BufRead *.d,*.di set ft=d
 endif
 
 if !has_key(s:disabled_packages, 'dockerfile')
-  au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile set ft=Dockerfile
-  au BufNewFile,BufRead Dockerfile set ft=Dockerfile
+  au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml set ft=yaml.docker-compose
+  au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile set ft=Dockerfile
   au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
-  au BufNewFile,BufRead dockerfile set ft=Dockerfile
-  au BufNewFile,BufRead docker-compose*.yaml set ft=yaml.docker-compose
-  au BufNewFile,BufRead docker-compose*.yml set ft=yaml.docker-compose
 endif
 
 if !has_key(s:disabled_packages, 'elixir')
-  au BufNewFile,BufRead *.ex,*.exs set ft=elixir
-  au BufNewFile,BufRead mix.lock set ft=elixir
   au BufNewFile,BufRead *.eex,*.leex set ft=eelixir
+  au BufNewFile,BufRead *.ex,*.exs,mix.lock set ft=elixir
 endif
 
 if !has_key(s:disabled_packages, 'elm')
@@ -800,11 +769,7 @@ if !has_key(s:disabled_packages, 'emblem')
 endif
 
 if !has_key(s:disabled_packages, 'erlang')
-  au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl set ft=erlang
-  au BufNewFile,BufRead Emakefile set ft=erlang
-  au BufNewFile,BufRead rebar.config set ft=erlang
-  au BufNewFile,BufRead rebar.config.lock set ft=erlang
-  au BufNewFile,BufRead rebar.lock set ft=erlang
+  au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock set ft=erlang
 endif
 
 if !has_key(s:disabled_packages, 'fennel')
@@ -812,8 +777,7 @@ if !has_key(s:disabled_packages, 'fennel')
 endif
 
 if !has_key(s:disabled_packages, 'ferm')
-  au BufNewFile,BufRead *.ferm set ft=ferm
-  au BufNewFile,BufRead ferm.conf set ft=ferm
+  au BufNewFile,BufRead *.ferm,ferm.conf set ft=ferm
 endif
 
 if !has_key(s:disabled_packages, 'fish')
@@ -825,18 +789,18 @@ if !has_key(s:disabled_packages, 'flatbuffers')
 endif
 
 if !has_key(s:disabled_packages, 'forth')
-  au BufNewFile,BufRead *.ft,*.fth set ft=forth
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
+  au BufNewFile,BufRead *.ft,*.fth set ft=forth
 endif
 
 if !has_key(s:disabled_packages, 'glsl')
-  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
+  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl
 endif
 
 if !has_key(s:disabled_packages, 'fsharp')
-  au BufNewFile,BufRead *.fsi,*.fsx set ft=fsharp
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
+  au BufNewFile,BufRead *.fsi,*.fsx set ft=fsharp
 endif
 
 if !has_key(s:disabled_packages, 'gdscript')
@@ -844,17 +808,11 @@ if !has_key(s:disabled_packages, 'gdscript')
 endif
 
 if !has_key(s:disabled_packages, 'git')
-  au BufNewFile,BufRead *.gitconfig set ft=gitconfig
-  au BufNewFile,BufRead *.git/config set ft=gitconfig
-  au BufNewFile,BufRead *.git/modules/*/config set ft=gitconfig
-  au BufNewFile,BufRead */.config/git/config set ft=gitconfig
-  au BufNewFile,BufRead */git/config set ft=gitconfig
-  au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
-  au BufNewFile,BufRead {.,}gitconfig set ft=gitconfig
-  au BufNewFile,BufRead {.,}gitmodules set ft=gitconfig
-  au BufNewFile,BufRead git-rebase-todo set ft=gitrebase
-  au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
   au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG set ft=gitcommit
+  au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
+  au BufNewFile,BufRead git-rebase-todo set ft=gitrebase
+  au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules set ft=gitconfig
+  au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
 endif
 
 if !has_key(s:disabled_packages, 'gmpl')
@@ -866,15 +824,14 @@ if !has_key(s:disabled_packages, 'gnuplot')
 endif
 
 if !has_key(s:disabled_packages, 'go')
-  au BufNewFile,BufRead *.go set ft=go
-  au BufNewFile,BufRead go.mod set ft=gomod
   au BufNewFile,BufRead *.tmpl set ft=gohtmltmpl
+  au BufNewFile,BufRead go.mod set ft=gomod
+  au BufNewFile,BufRead *.go set ft=go
 endif
 
 if !has_key(s:disabled_packages, 'javascript')
-  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib set ft=javascript
-  au BufNewFile,BufRead Jakefile set ft=javascript
   au BufNewFile,BufRead *.flow set ft=flow
+  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile set ft=javascript
 endif
 
 if !has_key(s:disabled_packages, 'jsx')
@@ -886,14 +843,14 @@ if !has_key(s:disabled_packages, 'graphql')
 endif
 
 if !has_key(s:disabled_packages, 'groovy')
-  au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy set ft=groovy
-  au BufNewFile,BufRead Jenkinsfile set ft=groovy
+  au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile set ft=groovy
+endif
+
+if !has_key(s:disabled_packages, 'gradle')
 endif
 
 if !has_key(s:disabled_packages, 'grub')
-  au BufNewFile,BufRead */boot/grub/grub.conf set ft=grub
-  au BufNewFile,BufRead */boot/grub/menu.lst set ft=grub
-  au BufNewFile,BufRead */etc/grub.conf set ft=grub
+  au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf set ft=grub
 endif
 
 if !has_key(s:disabled_packages, 'haml')
@@ -901,8 +858,8 @@ if !has_key(s:disabled_packages, 'haml')
 endif
 
 if !has_key(s:disabled_packages, 'handlebars')
-  au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache set ft=html.mustache
   au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs set ft=html.handlebars
+  au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache set ft=html.mustache
 endif
 
 if !has_key(s:disabled_packages, 'haskell')
@@ -914,8 +871,7 @@ if !has_key(s:disabled_packages, 'haxe')
 endif
 
 if !has_key(s:disabled_packages, 'hcl')
-  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow set ft=hcl
-  au BufNewFile,BufRead Appfile set ft=hcl
+  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile set ft=hcl
 endif
 
 if !has_key(s:disabled_packages, 'hive')
@@ -923,16 +879,12 @@ if !has_key(s:disabled_packages, 'hive')
 endif
 
 if !has_key(s:disabled_packages, 'html5')
-  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml set ft=html
   au! BufNewFile,BufRead *.html call polyglot#DetectHtmlFiletype()
+  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml set ft=html
 endif
 
 if !has_key(s:disabled_packages, 'i3')
-  au BufNewFile,BufRead *.i3.config,*.i3config set ft=i3config
-  au BufNewFile,BufRead {.,}i3.config set ft=i3config
-  au BufNewFile,BufRead {.,}i3config set ft=i3config
-  au BufNewFile,BufRead i3.config set ft=i3config
-  au BufNewFile,BufRead i3config set ft=i3config
+  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config set ft=i3config
 endif
 
 if !has_key(s:disabled_packages, 'icalendar')
@@ -940,26 +892,26 @@ if !has_key(s:disabled_packages, 'icalendar')
 endif
 
 if !has_key(s:disabled_packages, 'idris')
-  au BufNewFile,BufRead idris-response set ft=idris
-  au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
   au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
+  au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
+  au BufNewFile,BufRead idris-response set ft=idris
 endif
 
 if !has_key(s:disabled_packages, 'idris2')
-  au BufNewFile,BufRead *.ipkg set ft=idris2
-  au BufNewFile,BufRead idris-response set ft=idris2
-  au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
   au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
+  au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
+  au BufNewFile,BufRead *.ipkg,idris-response set ft=idris2
 endif
 
 if !has_key(s:disabled_packages, 'ion')
-  au BufNewFile,BufRead *.ion set ft=ion
-  au BufNewFile,BufRead ~/.config/ion/initrc set ft=ion
+  au BufNewFile,BufRead *.ion,~/.config/ion/initrc set ft=ion
+endif
+
+if !has_key(s:disabled_packages, 'javascript-sql')
 endif
 
 if !has_key(s:disabled_packages, 'jenkins')
-  au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile set ft=Jenkinsfile
-  au BufNewFile,BufRead Jenkinsfile set ft=Jenkinsfile
+  au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile set ft=Jenkinsfile
   au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
@@ -968,8 +920,7 @@ if !has_key(s:disabled_packages, 'htmldjango')
 endif
 
 if !has_key(s:disabled_packages, 'jq')
-  au BufNewFile,BufRead *.jq set ft=jq
-  au BufNewFile,BufRead {.,}jqrc set ft=jq
+  au BufNewFile,BufRead *.jq,{.,}jqrc set ft=jq
   au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq')
 endif
 
@@ -978,15 +929,7 @@ if !has_key(s:disabled_packages, 'json5')
 endif
 
 if !has_key(s:disabled_packages, 'json')
-  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp set ft=json
-  au BufNewFile,BufRead {.,}arcconfig set ft=json
-  au BufNewFile,BufRead {.,}htmlhintrc set ft=json
-  au BufNewFile,BufRead {.,}tern-config set ft=json
-  au BufNewFile,BufRead {.,}tern-project set ft=json
-  au BufNewFile,BufRead {.,}watchmanconfig set ft=json
-  au BufNewFile,BufRead Pipfile.lock set ft=json
-  au BufNewFile,BufRead composer.lock set ft=json
-  au BufNewFile,BufRead mcmod.info set ft=json
+  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info set ft=json
 endif
 
 if !has_key(s:disabled_packages, 'jsonnet')
@@ -1018,24 +961,20 @@ if !has_key(s:disabled_packages, 'lilypond')
 endif
 
 if !has_key(s:disabled_packages, 'livescript')
-  au BufNewFile,BufRead *._ls,*.ls set ft=livescript
-  au BufNewFile,BufRead Slakefile set ft=livescript
+  au BufNewFile,BufRead *._ls,*.ls,Slakefile set ft=livescript
 endif
 
 if !has_key(s:disabled_packages, 'llvm')
-  au BufNewFile,BufRead *.ll set ft=llvm
   au BufNewFile,BufRead *.td set ft=tablegen
+  au BufNewFile,BufRead *.ll set ft=llvm
 endif
 
 if !has_key(s:disabled_packages, 'log')
-  au BufNewFile,BufRead *.LOG,*.log set ft=log
-  au BufNewFile,BufRead *_LOG set ft=log
-  au BufNewFile,BufRead *_log set ft=log
+  au BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log set ft=log
 endif
 
 if !has_key(s:disabled_packages, 'lua')
-  au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua set ft=lua
-  au BufNewFile,BufRead {.,}luacheckrc set ft=lua
+  au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc set ft=lua
 endif
 
 if !has_key(s:disabled_packages, 'm4')
@@ -1043,21 +982,20 @@ if !has_key(s:disabled_packages, 'm4')
 endif
 
 if !has_key(s:disabled_packages, 'mako')
-  au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufNewFile,BufRead *.mako,*.mao set ft=mako
+  au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
 endif
 
 if !has_key(s:disabled_packages, 'mathematica')
-  au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt set ft=mma
   au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
+  au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt set ft=mma
 endif
 
 if !has_key(s:disabled_packages, 'markdown')
-  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook set ft=markdown
-  au BufNewFile,BufRead contents.lr set ft=markdown
+  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr set ft=markdown
 endif
 
 if !has_key(s:disabled_packages, 'mdx')
@@ -1065,9 +1003,8 @@ if !has_key(s:disabled_packages, 'mdx')
 endif
 
 if !has_key(s:disabled_packages, 'meson')
-  au BufNewFile,BufRead meson.build set ft=meson
-  au BufNewFile,BufRead meson_options.txt set ft=meson
   au BufNewFile,BufRead *.wrap set ft=dosini
+  au BufNewFile,BufRead meson.build,meson_options.txt set ft=meson
 endif
 
 if !has_key(s:disabled_packages, 'moonscript')
@@ -1079,18 +1016,13 @@ if !has_key(s:disabled_packages, 'murphi')
 endif
 
 if !has_key(s:disabled_packages, 'nginx')
-  au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost set ft=nginx
-  au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
-  au BufNewFile,BufRead */nginx/*.conf set ft=nginx
+  au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf set ft=nginx
   au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
-  au BufNewFile,BufRead *nginx.conf set ft=nginx
-  au BufNewFile,BufRead nginx*.conf set ft=nginx
-  au BufNewFile,BufRead nginx.conf set ft=nginx
+  au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
 endif
 
 if !has_key(s:disabled_packages, 'nim')
-  au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims set ft=nim
-  au BufNewFile,BufRead nim.cfg set ft=nim
+  au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg set ft=nim
 endif
 
 if !has_key(s:disabled_packages, 'nix')
@@ -1098,33 +1030,25 @@ if !has_key(s:disabled_packages, 'nix')
 endif
 
 if !has_key(s:disabled_packages, 'objc')
-  au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
   au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
+  au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'ocaml')
-  au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly set ft=ocaml
-  au BufNewFile,BufRead {.,}ocamlinit set ft=ocaml
-  au BufNewFile,BufRead *.om set ft=omake
-  au BufNewFile,BufRead OMakefile set ft=omake
-  au BufNewFile,BufRead OMakeroot set ft=omake
-  au BufNewFile,BufRead OMakeroot.in set ft=omake
-  au BufNewFile,BufRead *.opam,*.opam.template set ft=opam
-  au BufNewFile,BufRead opam set ft=opam
-  au BufNewFile,BufRead _oasis set ft=oasis
-  au BufNewFile,BufRead dune set ft=dune
-  au BufNewFile,BufRead dune-project set ft=dune
-  au BufNewFile,BufRead dune-workspace set ft=dune
-  au BufNewFile,BufRead jbuild set ft=dune
-  au BufNewFile,BufRead _tags set ft=ocamlbuild_tags
-  au BufNewFile,BufRead *.ocp set ft=ocpbuild
-  au BufNewFile,BufRead *.root set ft=ocpbuildroot
   au BufNewFile,BufRead *.sexp set ft=sexplib
+  au BufNewFile,BufRead *.root set ft=ocpbuildroot
+  au BufNewFile,BufRead *.ocp set ft=ocpbuild
+  au BufNewFile,BufRead _tags set ft=ocamlbuild_tags
+  au BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild set ft=dune
+  au BufNewFile,BufRead _oasis set ft=oasis
+  au BufNewFile,BufRead *.opam,*.opam.template,opam set ft=opam
+  au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in set ft=omake
+  au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit set ft=ocaml
 endif
 
 if !has_key(s:disabled_packages, 'octave')
-  au BufNewFile,BufRead *.oct set ft=octave
   au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
+  au BufNewFile,BufRead *.oct set ft=octave
 endif
 
 if !has_key(s:disabled_packages, 'opencl')
@@ -1132,20 +1056,14 @@ if !has_key(s:disabled_packages, 'opencl')
 endif
 
 if !has_key(s:disabled_packages, 'perl')
-  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi set ft=perl
-  au BufNewFile,BufRead {.,}gitolite.rc set ft=perl
-  au BufNewFile,BufRead Makefile.PL set ft=perl
-  au BufNewFile,BufRead Rexfile set ft=perl
-  au BufNewFile,BufRead ack set ft=perl
-  au BufNewFile,BufRead cpanfile set ft=perl
-  au BufNewFile,BufRead example.gitolite.rc set ft=perl
-  au BufNewFile,BufRead *.pod set ft=pod
-  au BufNewFile,BufRead *.comp,*.mason,*.mhtml set ft=mason
-  au BufNewFile,BufRead *.xs set ft=xs
-  au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
-  au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
-  au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
   au! BufNewFile,BufRead *.tt2 call polyglot#DetectTt2Filetype()
+  au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
+  au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
+  au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
+  au BufNewFile,BufRead *.xs set ft=xs
+  au BufNewFile,BufRead *.comp,*.mason,*.mhtml set ft=mason
+  au BufNewFile,BufRead *.pod set ft=pod
+  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc set ft=perl
 endif
 
 if !has_key(s:disabled_packages, 'pgsql')
@@ -1157,11 +1075,7 @@ if !has_key(s:disabled_packages, 'cql')
 endif
 
 if !has_key(s:disabled_packages, 'php')
-  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml set ft=php
-  au BufNewFile,BufRead {.,}php set ft=php
-  au BufNewFile,BufRead {.,}php_cs set ft=php
-  au BufNewFile,BufRead {.,}php_cs.dist set ft=php
-  au BufNewFile,BufRead Phakefile set ft=php
+  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile set ft=php
 endif
 
 if !has_key(s:disabled_packages, 'blade')
@@ -1177,8 +1091,8 @@ if !has_key(s:disabled_packages, 'pony')
 endif
 
 if !has_key(s:disabled_packages, 'powershell')
-  au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc set ft=ps1
   au BufNewFile,BufRead *.ps1xml set ft=ps1xml
+  au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc set ft=ps1
 endif
 
 if !has_key(s:disabled_packages, 'protobuf')
@@ -1190,9 +1104,8 @@ if !has_key(s:disabled_packages, 'pug')
 endif
 
 if !has_key(s:disabled_packages, 'puppet')
-  au BufNewFile,BufRead *.pp set ft=puppet
-  au BufNewFile,BufRead Modulefile set ft=puppet
   au BufNewFile,BufRead *.epp set ft=embeddedpuppet
+  au BufNewFile,BufRead *.pp,Modulefile set ft=puppet
 endif
 
 if !has_key(s:disabled_packages, 'purescript')
@@ -1200,22 +1113,17 @@ if !has_key(s:disabled_packages, 'purescript')
 endif
 
 if !has_key(s:disabled_packages, 'python')
-  au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy set ft=python
-  au BufNewFile,BufRead {.,}gclient set ft=python
-  au BufNewFile,BufRead {.,}pythonrc set ft=python
-  au BufNewFile,BufRead {.,}pythonstartup set ft=python
-  au BufNewFile,BufRead DEPS set ft=python
-  au BufNewFile,BufRead SConscript set ft=python
-  au BufNewFile,BufRead SConstruct set ft=python
-  au BufNewFile,BufRead Snakefile set ft=python
-  au BufNewFile,BufRead wscript set ft=python
+  au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript set ft=python
+endif
+
+if !has_key(s:disabled_packages, 'python-indent')
+endif
+
+if !has_key(s:disabled_packages, 'python-compiler')
 endif
 
 if !has_key(s:disabled_packages, 'requirements')
-  au BufNewFile,BufRead *.pip set ft=requirements
-  au BufNewFile,BufRead *require.{txt,in} set ft=requirements
-  au BufNewFile,BufRead *requirements.{txt,in} set ft=requirements
-  au BufNewFile,BufRead constraints.{txt,in} set ft=requirements
+  au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} set ft=requirements
 endif
 
 if !has_key(s:disabled_packages, 'qmake')
@@ -1227,10 +1135,8 @@ if !has_key(s:disabled_packages, 'qml')
 endif
 
 if !has_key(s:disabled_packages, 'r-lang')
-  au BufNewFile,BufRead *.S,*.r,*.rsx,*.s set ft=r
-  au BufNewFile,BufRead {.,}Rprofile set ft=r
-  au BufNewFile,BufRead expr-dist set ft=r
   au BufNewFile,BufRead *.rd set ft=rhelp
+  au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist set ft=r
 endif
 
 if !has_key(s:disabled_packages, 'racket')
@@ -1242,10 +1148,10 @@ if !has_key(s:disabled_packages, 'ragel')
 endif
 
 if !has_key(s:disabled_packages, 'raku')
-  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 set ft=raku
-  au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
-  au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
   au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
+  au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
+  au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
+  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 set ft=raku
 endif
 
 if !has_key(s:disabled_packages, 'raml')
@@ -1257,8 +1163,8 @@ if !has_key(s:disabled_packages, 'razor')
 endif
 
 if !has_key(s:disabled_packages, 'reason')
-  au BufNewFile,BufRead *.rei set ft=reason
   au! BufNewFile,BufRead *.re call polyglot#DetectReFiletype()
+  au BufNewFile,BufRead *.rei set ft=reason
 endif
 
 if !has_key(s:disabled_packages, 'rst')
@@ -1266,45 +1172,18 @@ if !has_key(s:disabled_packages, 'rst')
 endif
 
 if !has_key(s:disabled_packages, 'ruby')
-  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr set ft=ruby
-  au BufNewFile,BufRead {.,}Brewfile set ft=ruby
-  au BufNewFile,BufRead {.,}Guardfile set ft=ruby
-  au BufNewFile,BufRead {.,}autotest set ft=ruby
-  au BufNewFile,BufRead {.,}irbrc set ft=ruby
-  au BufNewFile,BufRead {.,}pryrc set ft=ruby
-  au BufNewFile,BufRead {.,}simplecov set ft=ruby
-  au BufNewFile,BufRead Appraisals set ft=ruby
-  au BufNewFile,BufRead Berksfile set ft=ruby
-  au BufNewFile,BufRead Buildfile set ft=ruby
-  au BufNewFile,BufRead Capfile set ft=ruby
-  au BufNewFile,BufRead Cheffile set ft=ruby
-  au BufNewFile,BufRead Dangerfile set ft=ruby
-  au BufNewFile,BufRead Deliverfile set ft=ruby
-  au BufNewFile,BufRead Fastfile set ft=ruby
-  au BufNewFile,BufRead Gemfile set ft=ruby
-  au BufNewFile,BufRead Gemfile.lock set ft=ruby
-  au BufNewFile,BufRead Guardfile set ft=ruby
-  au BufNewFile,BufRead Jarfile set ft=ruby
-  au BufNewFile,BufRead KitchenSink set ft=ruby
-  au BufNewFile,BufRead Mavenfile set ft=ruby
-  au BufNewFile,BufRead Podfile set ft=ruby
-  au BufNewFile,BufRead Puppetfile set ft=ruby
-  au BufNewFile,BufRead Rakefile set ft=ruby
-  au BufNewFile,BufRead Rantfile set ft=ruby
-  au BufNewFile,BufRead Routefile set ft=ruby
-  au BufNewFile,BufRead Snapfile set ft=ruby
-  au BufNewFile,BufRead Thorfile set ft=ruby
-  au BufNewFile,BufRead Vagrantfile set ft=ruby
-  au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
-  au BufNewFile,BufRead buildfile set ft=ruby
-  au BufNewFile,BufRead vagrantfile set ft=ruby
   au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml set ft=eruby
+  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile set ft=ruby
+  au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
 endif
 
 if !has_key(s:disabled_packages, 'rspec')
   au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
 endif
 
+if !has_key(s:disabled_packages, 'yard')
+endif
+
 if !has_key(s:disabled_packages, 'brewfile')
   au BufNewFile,BufRead Brewfile set ft=brewfile
 endif
@@ -1326,45 +1205,14 @@ if !has_key(s:disabled_packages, 'scss')
 endif
 
 if !has_key(s:disabled_packages, 'sh')
-  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool set ft=sh
-  au BufNewFile,BufRead */etc/udev/cdsymlinks.conf set ft=sh
-  au BufNewFile,BufRead {.,}bash_aliases set ft=sh
-  au BufNewFile,BufRead {.,}bash_history set ft=sh
-  au BufNewFile,BufRead {.,}bash_logout set ft=sh
-  au BufNewFile,BufRead {.,}bash_profile set ft=sh
-  au BufNewFile,BufRead {.,}bashrc set ft=sh
-  au BufNewFile,BufRead {.,}cshrc set ft=sh
-  au BufNewFile,BufRead {.,}env set ft=sh
-  au BufNewFile,BufRead {.,}env.example set ft=sh
-  au BufNewFile,BufRead {.,}flaskenv set ft=sh
-  au BufNewFile,BufRead {.,}login set ft=sh
-  au BufNewFile,BufRead {.,}profile set ft=sh
-  au BufNewFile,BufRead 9fs set ft=sh
-  au BufNewFile,BufRead PKGBUILD set ft=sh
-  au BufNewFile,BufRead bash_aliases set ft=sh
-  au BufNewFile,BufRead bash_logout set ft=sh
-  au BufNewFile,BufRead bash_profile set ft=sh
-  au BufNewFile,BufRead bashrc set ft=sh
-  au BufNewFile,BufRead cshrc set ft=sh
-  au BufNewFile,BufRead gradlew set ft=sh
-  au BufNewFile,BufRead login set ft=sh
-  au BufNewFile,BufRead man set ft=sh
-  au BufNewFile,BufRead profile set ft=sh
-  au BufNewFile,BufRead zlogin set ft=sh
-  au BufNewFile,BufRead zlogout set ft=sh
-  au BufNewFile,BufRead zprofile set ft=sh
-  au BufNewFile,BufRead zshenv set ft=sh
-  au BufNewFile,BufRead zshrc set ft=sh
-  au BufNewFile,BufRead *.zsh set ft=zsh
-  au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
-  au BufNewFile,BufRead {.,}zfbfmarks set ft=zsh
-  au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh')
-  au BufNewFile,BufRead {.,}zlogin set ft=zsh
-  au BufNewFile,BufRead {.,}zlogout set ft=zsh
-  au BufNewFile,BufRead {.,}zprofile set ft=zsh
+  au BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc set ft=zsh
   au BufNewFile,BufRead {.,}zsh* call s:StarSetf('zsh')
-  au BufNewFile,BufRead {.,}zshenv set ft=zsh
-  au BufNewFile,BufRead {.,}zshrc set ft=zsh
+  au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh')
+  au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
+  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc set ft=sh
+endif
+
+if !has_key(s:disabled_packages, 'zinit')
 endif
 
 if !has_key(s:disabled_packages, 'slim')
@@ -1395,19 +1243,20 @@ if !has_key(s:disabled_packages, 'svg')
   au BufNewFile,BufRead *.svg set ft=svg
 endif
 
+if !has_key(s:disabled_packages, 'svg-indent')
+endif
+
 if !has_key(s:disabled_packages, 'swift')
   au BufNewFile,BufRead *.swift set ft=swift
 endif
 
 if !has_key(s:disabled_packages, 'sxhkd')
-  au BufNewFile,BufRead *.sxhkdrc set ft=sxhkdrc
-  au BufNewFile,BufRead sxhkdrc set ft=sxhkdrc
+  au BufNewFile,BufRead *.sxhkdrc,sxhkdrc set ft=sxhkdrc
 endif
 
 if !has_key(s:disabled_packages, 'systemd')
-  au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer set ft=systemd
+  au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf set ft=systemd
   au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
-  au BufNewFile,BufRead */systemd/*.conf set ft=systemd
 endif
 
 if !has_key(s:disabled_packages, 'terraform')
@@ -1427,13 +1276,7 @@ if !has_key(s:disabled_packages, 'tmux')
 endif
 
 if !has_key(s:disabled_packages, 'toml')
-  au BufNewFile,BufRead *.toml set ft=toml
-  au BufNewFile,BufRead */.cargo/config set ft=toml
-  au BufNewFile,BufRead */.cargo/credentials set ft=toml
-  au BufNewFile,BufRead Cargo.lock set ft=toml
-  au BufNewFile,BufRead Gopkg.lock set ft=toml
-  au BufNewFile,BufRead Pipfile set ft=toml
-  au BufNewFile,BufRead poetry.lock set ft=toml
+  au BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock set ft=toml
 endif
 
 if !has_key(s:disabled_packages, 'tptp')
@@ -1441,13 +1284,13 @@ if !has_key(s:disabled_packages, 'tptp')
 endif
 
 if !has_key(s:disabled_packages, 'twig')
-  au BufNewFile,BufRead *.twig set ft=html.twig
   au BufNewFile,BufRead *.xml.twig set ft=xml.twig
+  au BufNewFile,BufRead *.twig set ft=html.twig
 endif
 
 if !has_key(s:disabled_packages, 'typescript')
-  au BufNewFile,BufRead *.ts set ft=typescript
   au BufNewFile,BufRead *.tsx set ft=typescriptreact
+  au BufNewFile,BufRead *.ts set ft=typescript
 endif
 
 if !has_key(s:disabled_packages, 'unison')
@@ -1491,32 +1334,17 @@ if !has_key(s:disabled_packages, 'xsl')
 endif
 
 if !has_key(s:disabled_packages, 'yaml')
-  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql set ft=yaml
-  au BufNewFile,BufRead {.,}clang-format set ft=yaml
-  au BufNewFile,BufRead {.,}clang-tidy set ft=yaml
-  au BufNewFile,BufRead {.,}gemrc set ft=yaml
-  au BufNewFile,BufRead fish_history set ft=yaml
-  au BufNewFile,BufRead fish_read_history set ft=yaml
-  au BufNewFile,BufRead glide.lock set ft=yaml
-  au BufNewFile,BufRead yarn.lock set ft=yaml
+  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock set ft=yaml
 endif
 
 if !has_key(s:disabled_packages, 'ansible')
-  au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
-  au BufNewFile,BufRead handlers.*.y{a,}ml set ft=yaml.ansible
+  au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml set ft=yaml.ansible
   au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
-  au BufNewFile,BufRead local.y{a,}ml set ft=yaml.ansible
-  au BufNewFile,BufRead main.y{a,}ml set ft=yaml.ansible
-  au BufNewFile,BufRead playbook.y{a,}ml set ft=yaml.ansible
-  au BufNewFile,BufRead requirements.y{a,}ml set ft=yaml.ansible
-  au BufNewFile,BufRead roles.*.y{a,}ml set ft=yaml.ansible
-  au BufNewFile,BufRead site.y{a,}ml set ft=yaml.ansible
-  au BufNewFile,BufRead tasks.*.y{a,}ml set ft=yaml.ansible
+  au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
 endif
 
 if !has_key(s:disabled_packages, 'helm')
-  au BufNewFile,BufRead */templates/*.tpl set ft=helm
-  au BufNewFile,BufRead */templates/*.yaml set ft=helm
+  au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml set ft=helm
 endif
 
 if !has_key(s:disabled_packages, 'help')
@@ -1528,8 +1356,8 @@ if !has_key(s:disabled_packages, 'zephir')
 endif
 
 if !has_key(s:disabled_packages, 'zig')
-  au BufNewFile,BufRead *.zir set ft=zir
   au BufNewFile,BufRead *.zig,*.zir set ft=zig
+  au BufNewFile,BufRead *.zir set ft=zir
 endif
 
 if !has_key(s:disabled_packages, 'trasys')
@@ -1541,19 +1369,14 @@ if !has_key(s:disabled_packages, 'basic')
 endif
 
 if !has_key(s:disabled_packages, 'visual-basic')
-  au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs set ft=vb
   au! BufNewFile,BufRead *.bas call polyglot#DetectBasFiletype()
+  au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs set ft=vb
 endif
 
 if !has_key(s:disabled_packages, 'dosini')
-  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties set ft=dosini
-  au BufNewFile,BufRead */etc/pacman.conf set ft=dosini
-  au BufNewFile,BufRead */etc/yum.conf set ft=dosini
-  au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
-  au BufNewFile,BufRead {.,}editorconfig set ft=dosini
-  au BufNewFile,BufRead {.,}npmrc set ft=dosini
-  au BufNewFile,BufRead buildozer.spec set ft=dosini
+  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec set ft=dosini
   au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
+  au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
 endif
 
 if !has_key(s:disabled_packages, 'odin')
@@ -1561,17 +1384,12 @@ if !has_key(s:disabled_packages, 'odin')
 endif
 
 if !has_key(s:disabled_packages, 'bzl')
-  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl set ft=bzl
-  au BufNewFile,BufRead BUCK set ft=bzl
-  au BufNewFile,BufRead BUILD set ft=bzl
-  au BufNewFile,BufRead BUILD.bazel set ft=bzl
-  au BufNewFile,BufRead Tiltfile set ft=bzl
-  au BufNewFile,BufRead WORKSPACE set ft=bzl
+  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE set ft=bzl
 endif
 
 if !has_key(s:disabled_packages, 'prolog')
-  au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap set ft=prolog
   au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
+  au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap set ft=prolog
 endif
 
 if !has_key(s:disabled_packages, 'tads')
@@ -1579,9 +1397,7 @@ if !has_key(s:disabled_packages, 'tads')
 endif
 
 if !has_key(s:disabled_packages, 'gitignore')
-  au BufNewFile,BufRead *.git/info/exclude set ft=gitignore
-  au BufNewFile,BufRead */.config/git/ignore set ft=gitignore
-  au BufNewFile,BufRead {.,}gitignore set ft=gitignore
+  au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore set ft=gitignore
 endif
 
 if !has_key(s:disabled_packages, 'sql')
diff --git a/scripts/build b/scripts/build
index 45713994e..f4fc866ff 100755
--- a/scripts/build
+++ b/scripts/build
@@ -433,9 +433,6 @@ def generate_ftdetect(packages, heuristics)
     end
   end
 
-  ambiguous_extensions = extensions
-    .select { |a, b| b.uniq.size > 1 }.keys.sort
-
   all_filetypes = packages.flat_map { |f| f["filetypes"] || [] }
   filetype_names = Set.new(all_filetypes.map { |f| f["name"] })
 
@@ -478,7 +475,7 @@ def generate_ftdetect(packages, heuristics)
 
     package_heuristics = []
 
-    autocommands = ""
+    autocommands = []
     for filetype in filetypes
       name = filetype.fetch("name")
       syntax = filetype["syntax"] ? " | set syntax=#{filetype["syntax"]}" : ""
@@ -496,7 +493,8 @@ def generate_ftdetect(packages, heuristics)
       extensions = filetype["extensions"]
       filenames = filetype["filenames"]
 
-      set_extensions = []
+      set_globs = []
+
       for extension in extensions.sort
         outer_filetype = filetype["outer_filetype"]
         if outer_filetype
@@ -508,18 +506,10 @@ def generate_ftdetect(packages, heuristics)
         if heuristic
           package_heuristics << heuristic
         else
-          # if ambiguous_extensions.include?(extension)
-          #   puts "Ambiguous extension without heuristic: #{extension} => #{filetype["name"]}"
-          # end
-          #
-          set_extensions << "*." + extension
+          set_globs << "*." + extension
         end
       end
 
-      if set_extensions.size > 0
-        autocommands << "  au BufNewFile,BufRead #{set_extensions.join(",")} #{set_command}\n"
-      end
-
       for filename in filenames.sort
         if filename[0] == "."
           filename = "{.,}" + filename[1..-1]
@@ -527,11 +517,16 @@ def generate_ftdetect(packages, heuristics)
         if filename[-1] == "*"
           autocommands << "  au BufNewFile,BufRead #{filename} call s:StarSetf('#{name}')\n"
         else
-          autocommands << "  au BufNewFile,BufRead #{filename} #{set_command}\n"
+          set_globs << filename
         end
       end
+
+      if set_globs.size > 0
+        autocommands << "  au BufNewFile,BufRead #{set_globs.join(",")} #{set_command}\n"
+      end
     end
 
+
     for heuristic in package_heuristics.uniq
       extensions = heuristic["extensions"].map { |e| "*.#{e}" }
       autocommands << "  au! BufNewFile,BufRead #{extensions.join(",")} call polyglot#Detect#{camelize(heuristic["extensions"].first)}Filetype()\n"
@@ -539,7 +534,7 @@ def generate_ftdetect(packages, heuristics)
 
     if autocommands != ""
       output << "if !has_key(s:disabled_packages, '#{package["name"]}')\n"
-      output << autocommands
+      output << autocommands.reverse.join("")
       output << "endif\n\n"
     end
   end

From 46b09b0d5b3cb45d8e62851c40b418a3b9f20af4 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Sep 2020 16:26:03 +0200
Subject: [PATCH 087/299] Remove {{ }} from detecting htmldjango, #560

---
 autoload/polyglot.vim | 2 +-
 heuristics.yaml       | 2 +-
 tests/extensions.vim  | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
index 07d9fe31f..33210855d 100644
--- a/autoload/polyglot.vim
+++ b/autoload/polyglot.vim
@@ -378,7 +378,7 @@ func! polyglot#DetectHtmlFiletype()
   endif
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
-    if line =~# '{{.*}}\|{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\(\<\|\>\)\|{#\s\+'
+    if line =~# '{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\(\<\|\>\)\|{#\s\+'
       set ft=htmldjango | return
     endif
     if line =~# '\(\<\|\>\)DTD\s\+XHTML\s'
diff --git a/heuristics.yaml b/heuristics.yaml
index c53a704cc..129734f8e 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -182,7 +182,7 @@ rules:
   filetype: mason
 - lines: 50
   rules:
-  - pattern: '{{.*}}|{%-?\s*(end.*|extends|block|macro|set|if|for|include|trans)\b|{#\s+'
+  - pattern: '{%-?\s*(end.*|extends|block|macro|set|if|for|include|trans)\b|{#\s+'
     filetype: htmldjango
   - pattern: '\bDTD\s+XHTML\s'
     filetype: xhtml
diff --git a/tests/extensions.vim b/tests/extensions.vim
index 7f6adb9eb..45ee6c7d6 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -364,12 +364,14 @@ call TestExtension("tt2html", "html.tt2", "<html>")
 call TestExtension("html", "empty.html", "")
 call TestExtension("mason", "mason1.html", "% my $planet = 42;")
 call TestExtension("mason", "mason2.html", "<%filter></%filter>")
-call TestExtension("htmldjango", "jinja1.html", "{{ item.href }}")
 call TestExtension("htmldjango", "jinja2.html", "{% for item in navigation %}{% endfor %}")
 call TestExtension("htmldjango", "jinja3.html", "{% block head %}")
 call TestExtension("htmldjango", "jinja4.html", "{# some comment #}")
 call TestExtension("xhtml", "xhtml.html", "<DTD   XHTML ")
 
+" many html templates use {{ }}, e.g. Angular, we should not assume django
+call TestExtension("html", "template.html", "{{ item.href }}")
+
 " .gitignore
 call TestExtension("gitignore", ".gitignore", "")
 

From 1872af2d5e596cbea44a6e5739692dbff8302af5 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Sep 2020 19:11:11 +0200
Subject: [PATCH 088/299] Fix detection of conf files, closes #569

---
 README.md             |   3 +-
 autoload/sleuth.vim   |   3 +-
 ftdetect/polyglot.vim |  52 ++++++++++++---------
 ftplugin/conf.vim     |  23 ++++++++++
 packages.yaml         |  42 +++++++++--------
 scripts/build         | 102 +++++++++++++++++++++++++++++++++---------
 syntax/conf.vim       |  30 +++++++++++++
 tests/extensions.vim  |   6 ++-
 tests/filetypes.vim   |   7 +--
 9 files changed, 199 insertions(+), 69 deletions(-)
 create mode 100644 ftplugin/conf.vim
 create mode 100644 syntax/conf.vim

diff --git a/README.md b/README.md
index e41b56ec4..ef1360421 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->202<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->203<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -89,6 +89,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [clojure](https://github.com/guns/vim-clojure-static)
 - [cmake](https://github.com/pboettch/vim-cmake-syntax)
 - [coffee-script](https://github.com/kchmck/vim-coffee-script)
+- [conf](https://github.com/vim/vim/tree/master/runtime)
 - [cpp-modern](https://github.com/bfrg/vim-cpp-modern)
 - [cql](https://github.com/elubow/cql-vim)
 - [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim)
diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 1ee1cd9b7..e5f2e2ed8 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -45,6 +45,7 @@ let s:globs = {
   \ 'clojure': '*.clj,*.boot,*.cl2,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.hic,*.edn,riemann.config,build.boot,profile.boot',
   \ 'cmake': '*.cmake,*.cmake.in,CMakeLists.txt',
   \ 'coffee': '*.coffee,*._coffee,*.cake,*.cjsx,*.iced,*.coffeekup,Cakefile',
+  \ 'conf': '*.conf,auto.master,config',
   \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh',
   \ 'cql': '*.cql',
   \ 'cryptol': '*.cry,*.cyl,*.lcry,*.lcyl',
@@ -94,7 +95,7 @@ let s:globs = {
   \ 'groovy': '*.groovy,*.grt,*.gtpl,*.gvy,*.gradle,Jenkinsfile',
   \ 'grub': '',
   \ 'haml': '*.haml,*.haml.deface,*.hamlc,*.hamlbars',
-  \ 'haproxy': '*.cfg,haproxy.cfg,haproxy*.c*',
+  \ 'haproxy': '*.cfg,haproxy.cfg,haproxy*.conf*',
   \ 'haskell': '*.hs,*.hs-boot,*.hsc,*.bpk,*.hsig',
   \ 'haxe': '*.hx,*.hxsl',
   \ 'hcl': '*.hcl,*.nomad,*.workflow,Appfile',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 0d79667b0..cdcf7dcfd 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -102,6 +102,10 @@ if !has_key(s:disabled_packages, '8th')
   au! BufRead,BufNewFile *.8th
 endif
 
+if !has_key(s:disabled_packages, 'conf')
+  au! BufRead,BufNewFile auto.master
+endif
+
 if !has_key(s:disabled_packages, 'haproxy')
   au! BufRead,BufNewFile *.cfg
 endif
@@ -254,6 +258,10 @@ if !has_key(s:disabled_packages, 'dlang')
   au! BufRead,BufNewFile *.sdl
 endif
 
+if !has_key(s:disabled_packages, 'yaml')
+  au! BufRead,BufNewFile *.yml,*.yaml
+endif
+
 if !has_key(s:disabled_packages, 'dockerfile')
   au! BufRead,BufNewFile *.Dockerfile,Dockerfile
 endif
@@ -270,10 +278,6 @@ if !has_key(s:disabled_packages, 'forth')
   au! BufRead,BufNewFile *.fs,*.ft,*.fth
 endif
 
-if !has_key(s:disabled_packages, 'glsl')
-  au! BufRead,BufNewFile *.fs,*.gs,*.comp
-endif
-
 if !has_key(s:disabled_packages, 'fsharp')
   au! BufRead,BufNewFile *.fs
 endif
@@ -282,6 +286,10 @@ if !has_key(s:disabled_packages, 'git')
   au! BufRead,BufNewFile .gitconfig,.gitmodules,*.git/config,*/.config/git/config,*.git/modules/*/config,git-rebase-todo
 endif
 
+if !has_key(s:disabled_packages, 'glsl')
+  au! BufRead,BufNewFile *.fs,*.gs,*.comp
+endif
+
 if !has_key(s:disabled_packages, 'gnuplot')
   au! BufRead,BufNewFile *.gp,*.gpi
 endif
@@ -482,10 +490,6 @@ if !has_key(s:disabled_packages, 'xsl')
   au! BufRead,BufNewFile *.xslt,*.xsl
 endif
 
-if !has_key(s:disabled_packages, 'yaml')
-  au! BufRead,BufNewFile *.yml,*.yaml
-endif
-
 if !has_key(s:disabled_packages, 'help')
   au! BufRead,BufNewFile $VIMRUNTIME/doc/*.txt
 endif
@@ -518,9 +522,13 @@ if !has_key(s:disabled_packages, '8th')
   au BufNewFile,BufRead *.8th set ft=8th
 endif
 
+if !has_key(s:disabled_packages, 'conf')
+  au BufNewFile,BufRead *.conf,auto.master,config set ft=conf
+endif
+
 if !has_key(s:disabled_packages, 'haproxy')
   au BufNewFile,BufRead *.cfg,haproxy.cfg set ft=haproxy
-  au BufNewFile,BufRead haproxy*.c* call s:StarSetf('haproxy')
+  au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
 endif
 
 if !has_key(s:disabled_packages, 'a2ps')
@@ -583,6 +591,10 @@ if !has_key(s:disabled_packages, 'ampl')
   au BufNewFile,BufRead *.run set ft=ampl
 endif
 
+if !has_key(s:disabled_packages, 'csv')
+  au BufNewFile,BufRead *.csv,*.tab,*.tsv set ft=csv
+endif
+
 if !has_key(s:disabled_packages, 'xml')
   au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config set ft=xml
 endif
@@ -717,10 +729,6 @@ if !has_key(s:disabled_packages, 'crystal')
   au BufNewFile,BufRead *.cr,Projectfile set ft=crystal
 endif
 
-if !has_key(s:disabled_packages, 'csv')
-  au BufNewFile,BufRead *.csv,*.tab,*.tsv set ft=csv
-endif
-
 if !has_key(s:disabled_packages, 'cucumber')
   au BufNewFile,BufRead *.feature,*.story set ft=cucumber
 endif
@@ -745,6 +753,10 @@ if !has_key(s:disabled_packages, 'dlang')
   au BufNewFile,BufRead *.d,*.di set ft=d
 endif
 
+if !has_key(s:disabled_packages, 'yaml')
+  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock set ft=yaml
+endif
+
 if !has_key(s:disabled_packages, 'dockerfile')
   au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml set ft=yaml.docker-compose
   au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile set ft=Dockerfile
@@ -793,11 +805,6 @@ if !has_key(s:disabled_packages, 'forth')
   au BufNewFile,BufRead *.ft,*.fth set ft=forth
 endif
 
-if !has_key(s:disabled_packages, 'glsl')
-  au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
-  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl
-endif
-
 if !has_key(s:disabled_packages, 'fsharp')
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
   au BufNewFile,BufRead *.fsi,*.fsx set ft=fsharp
@@ -815,6 +822,11 @@ if !has_key(s:disabled_packages, 'git')
   au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
 endif
 
+if !has_key(s:disabled_packages, 'glsl')
+  au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
+  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl
+endif
+
 if !has_key(s:disabled_packages, 'gmpl')
   au BufNewFile,BufRead *.mod set ft=gmpl
 endif
@@ -1333,10 +1345,6 @@ if !has_key(s:disabled_packages, 'xsl')
   au BufNewFile,BufRead *.xsl,*.xslt set ft=xsl
 endif
 
-if !has_key(s:disabled_packages, 'yaml')
-  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock set ft=yaml
-endif
-
 if !has_key(s:disabled_packages, 'ansible')
   au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml set ft=yaml.ansible
   au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
diff --git a/ftplugin/conf.vim b/ftplugin/conf.vim
new file mode 100644
index 000000000..50f87fa72
--- /dev/null
+++ b/ftplugin/conf.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'conf') == -1
+
+" Vim filetype plugin file
+" Language:             generic configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/packages.yaml b/packages.yaml
index 330b68d44..e8a5d9b59 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -10,8 +10,6 @@ filetypes:
 name: a2ps
 remote: vim/vim:runtime
 glob: '**/a2ps.vim'
-after:
-- haproxy
 filetypes:
 - name: a2ps
   filenames:
@@ -142,7 +140,6 @@ filetypes:
 name: ant
 remote: vim/vim:runtime
 glob: '**/ant.vim'
-after: xml
 filetypes:
 - name: ant
   filenames:
@@ -210,7 +207,7 @@ filetypes:
 ---
 name: arduino
 remote: sudar/vim-arduino-syntax
-after: c/c++
+dependencies: c/c++
 filetypes:
 - name: arduino
   linguist: Processing
@@ -240,7 +237,6 @@ filetypes:
 name: automake
 remote: vim/vim:runtime
 glob: '**/automake.vim'
-after: elf
 filetypes:
 - name: automake
   filenames:
@@ -260,7 +256,6 @@ name: aspvbs
 remote: vim/vim:runtime
 globs:
 - '**/aspvbs.vim'
-dependencies:
 filetypes:
 - name: aspvbs
   extensions:
@@ -271,7 +266,6 @@ name: aspperl
 remote: vim/vim:runtime
 globs:
 - '**/aspperl.vim'
-dependencies:
 filetypes:
 - name: aspperl
   extensions:
@@ -347,7 +341,7 @@ filetypes:
 ---
 name: cpp-modern
 remote: bfrg/vim-cpp-modern
-after: c/c++
+dependencies: c/c++
 filetypes: []
 ---
 name: carp
@@ -590,7 +584,6 @@ name: fsharp
 remote: ionide/Ionide-vim
 ignored_dirs:
 - ftplugin
-after: glsl
 filetypes:
 - name: fsharp
   linguist: F#
@@ -681,7 +674,8 @@ filetypes:
 ---
 name: graphql
 remote: jparise/vim-graphql
-after: [javascript, jsx]
+dependencies: javascript
+after: jsx
 ignored_dirs:
 # TODO: remove after bug is fixed:
 # https://github.com/jparise/vim-graphql/issues/62
@@ -692,7 +686,7 @@ filetypes:
 ---
 name: gradle
 remote: tfnico/vim-gradle
-after: groovy
+dependencies: groovy
 # Just adds compiler
 filetypes: []
 ---
@@ -708,7 +702,6 @@ filetypes:
 name: grub
 remote: vim/vim:runtime
 glob: '**/grub.vim'
-after: dlang
 filetypes:
 - name: grub
   filenames:
@@ -747,6 +740,8 @@ filetypes:
 - name: haproxy
   linguist: HAProxy
   extra_filenames:
+  - 'haproxy*.conf*'
+  ignored_warnings:
   - 'haproxy*.c*'
 ---
 name: haskell
@@ -858,7 +853,7 @@ filetypes:
 ---
 name: javascript-sql
 remote: statico/vim-javascript-sql
-after: javascript
+dependencies: javascript
 filetypes: []
 ---
 name: jenkins
@@ -931,7 +926,7 @@ filetypes:
 ---
 name: jsx
 remote: MaxMEllon/vim-jsx-pretty
-after: javascript
+dependencies: javascript
 filetypes:
 - name: javascriptreact
   linguist: JSX
@@ -1158,7 +1153,7 @@ filetypes:
 ---
 name: octave
 remote: McSinyx/vim-octave
-after: mathematica
+dependencies: mathematica
 filetypes:
 - name: octave
   extensions:
@@ -1223,7 +1218,7 @@ filetypes:
 ---
 name: blade
 remote: jwalton512/vim-blade
-after: php
+dependencies: php
 filetypes:
 - name: blade
   linguist: Blade
@@ -1245,7 +1240,6 @@ filetypes:
 ---
 name: powershell
 remote: PProvost/vim-ps1
-after: xml
 filetypes:
 - name: ps1
   linguist: PowerShell
@@ -1388,7 +1382,6 @@ filetypes:
 ---
 name: reason
 remote: reasonml-editor/vim-reason-plus
-after: c/c++
 filetypes:
 - name: reason
   linguist: Reason
@@ -1780,7 +1773,7 @@ filetypes:
 ---
 name: ansible
 remote: pearofducks/ansible-vim
-after: yaml
+dependencies: yaml
 filetypes:
 - name: yaml.ansible
   filenames:
@@ -1928,3 +1921,14 @@ filetypes:
   - tyb
   - typ
   - tyc
+---
+name: conf
+remote: vim/vim:runtime
+glob: '**/conf.vim'
+filetypes:
+- name: conf
+  extensions:
+  - conf
+  filenames:
+  - auto.master
+  - config
diff --git a/scripts/build b/scripts/build
index f4fc866ff..14141aa3f 100755
--- a/scripts/build
+++ b/scripts/build
@@ -27,23 +27,81 @@ def except(hash, *keys)
   h
 end
 
-def load_data()
-  packages = Hash[YAML.load_stream(File.read('packages.yaml'))
-    .group_by { |a| a.fetch("name") }
-    .map { |a, b| [a, b.first] }]
+def verify(packages, heuristics)
+  extensions_with_heuristics = Set.new(heuristics.flat_map { |e| e["extensions"] })
+  no_heuristics = Hash.new { |a, b| a[b] = [] }
+
+  for p in packages
+    for f in p["filetypes"]
+      for e in f["extensions"]
+        if !extensions_with_heuristics.include?(e)
+          no_heuristics[e] << p["name"]
+        end
+      end
+    end
+  end
+
+  no_heuristics.select! { |a, b| b.size > 1}
+
+  for e, names in no_heuristics
+    if ENV["DEV"]
+      puts "No heuristics for .#{e} extension (#{names.join(", ")})"
+    end
+  end
+end
 
-  deps = Hash.new { |h, k| h[k] = [] }
+def sort_packages(packages)
+  implicit_dependencies = Hash.new { |h, k| h[k] = [] }
+  by_extension = Hash.new { |h, k| h[k] = [] }
 
-  each_node = lambda {|&b| packages.keys.each(&b) }
-  each_child = lambda {|n, &b| [packages[n]["after"] || []].flatten.each(&b) }
+  for p in packages
+    for f in p["filetypes"]
+      for e in f["extensions"]
+        by_extension[e] << p["name"]
+      end
+    end
+  end
+
+  for p in packages
+    for f in p["filetypes"]
+      for t in f["filenames"]
+        filename = t.split('/').last
+        if filename.include?(".")
+          ext = filename.split(".").last.gsub('*', '')
+          if by_extension[ext]
+            for name in by_extension[ext]
+              if p["name"] != name
+                implicit_dependencies[p["name"]] |= [name]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
 
+  packages = Hash[packages.group_by { |a| a.fetch("name") }.map { |a, b| [a, b.first] }]
+
+  each_node = lambda { |&b| packages.keys.each(&b) }
+  each_child = lambda { |n, &b|
+    [
+      implicit_dependencies[n] || [],
+      packages[n]["dependencies"] || [],
+      packages[n]["after"] || []
+    ].flatten.each(&b)
+  }
+
+  TSort.tsort(each_node, each_child).map { |a| packages[a] }
+end
+
+def load_data()
+  packages = load_packages
   languages = load_languages
+  heuristics = load_heuristics
 
   # Reason can have ocaml as interpreter but let's not depend on it...
   languages["Reason"]["interpreters"] -= ["ocaml"]
 
-  packages = TSort.tsort(each_node, each_child).map { |a| packages[a] }
-
   for package in packages
     for filetype in package["filetypes"]
       if filetype["linguist"]
@@ -90,7 +148,9 @@ def load_data()
     end
   end
 
-  heuristics = YAML.load_stream(File.read('heuristics.yaml'))
+  verify(packages, heuristics)
+
+  packages = sort_packages(packages)
 
   [packages, transform_patterns(heuristics)]
 end
@@ -144,6 +204,14 @@ def load_languages
   YAML.load(File.read(file))
 end
 
+def load_packages
+  YAML.load_stream(File.read('packages.yaml'))
+end
+
+def load_heuristics
+  YAML.load_stream(File.read('heuristics.yaml'))
+end
+
 def parse_remote(remote)
   match = remote.match(/(?<repo>[^@:]+)(?:@(?<branch>[^:]+))?(?::(?<path>.*))?/)
   dir = "tmp/" + match[:repo] + (match[:branch] ? "-#{match[:branch]}" : "")
@@ -423,16 +491,6 @@ end
 def generate_ftdetect(packages, heuristics)
   output = "\n"
 
-  extensions = Hash.new { |h, k| h[k] = [] }
-
-  for package in packages
-    for filetype in package["filetypes"]
-      for ext in filetype["extensions"]
-        extensions[ext] << filetype["name"]
-      end
-    end
-  end
-
   all_filetypes = packages.flat_map { |f| f["filetypes"] || [] }
   filetype_names = Set.new(all_filetypes.map { |f| f["name"] })
 
@@ -738,8 +796,8 @@ def show_warnings(all_filetypes, expected_filetypes)
 
 
   all_handled = process_list(all_filetypes, all_expected) do |f|
-    [f["filenames"], f["ignored_filenames"], f["ignored_warnings"]].compact.flatten + 
-      [f["extensions"], f["ignored_extensions"]].compact.flatten.map { |e| "*." + e }
+    [f["filenames"], f["ignored_filenames"], f["ignored_warnings"], f["extra_filenames"]].compact.flatten + 
+      [f["extensions"], f["ignored_extensions"], f["extra_extensions"]].compact.flatten.map { |e| "*." + e }
   end
 
   all_handled_regexps = Hash[all_handled.group_by { |a, b| a }.map do |a, b|
diff --git a/syntax/conf.vim b/syntax/conf.vim
new file mode 100644
index 000000000..209d92d96
--- /dev/null
+++ b/syntax/conf.vim
@@ -0,0 +1,30 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'conf') == -1
+
+" Vim syntax file
+" Language:	generic configure file
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2005 Jun 20
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn keyword	confTodo	contained TODO FIXME XXX
+" Avoid matching "text#text", used in /etc/disktab and /etc/gettytab
+syn match	confComment	"^#.*" contains=confTodo
+syn match	confComment	"\s#.*"ms=s+1 contains=confTodo
+syn region	confString	start=+"+ skip=+\\\\\|\\"+ end=+"+ oneline
+syn region	confString	start=+'+ skip=+\\\\\|\\'+ end=+'+ oneline
+
+" Define the default highlighting.
+" Only used when an item doesn't have highlighting yet
+hi def link confComment	Comment
+hi def link confTodo	Todo
+hi def link confString	String
+
+let b:current_syntax = "conf"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/tests/extensions.vim b/tests/extensions.vim
index 45ee6c7d6..16548eb83 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -376,6 +376,10 @@ call TestExtension("html", "template.html", "{{ item.href }}")
 call TestExtension("gitignore", ".gitignore", "")
 
 " .xml
-
 call TestExtension("xml", ".fglrxrc", "")
 call TestExtension("xml", "fglrxrc", "")
+
+" .conf
+call TestExtension("conf", "foo.conf", "")
+call TestExtension("conf", "config", "")
+call TestExtension("conf", "auto.master", "")
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 78edf1ef7..0c36df68b 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -6,6 +6,7 @@ function! TestFiletype(filetype)
 endfunction
 
 call TestFiletype('8th')
+call TestFiletype('conf')
 call TestFiletype('haproxy')
 call TestFiletype('a2ps')
 call TestFiletype('a65')
@@ -22,6 +23,7 @@ call TestFiletype('aidl')
 call TestFiletype('alsaconf')
 call TestFiletype('aml')
 call TestFiletype('ampl')
+call TestFiletype('csv')
 call TestFiletype('xml')
 call TestFiletype('ant')
 call TestFiletype('apache')
@@ -53,7 +55,6 @@ call TestFiletype('litcoffee')
 call TestFiletype('cryptol')
 call TestFiletype('crystal')
 call TestFiletype('ecrystal')
-call TestFiletype('csv')
 call TestFiletype('cucumber')
 call TestFiletype('cuesheet')
 call TestFiletype('dart')
@@ -63,6 +64,7 @@ call TestFiletype('dcov')
 call TestFiletype('dd')
 call TestFiletype('ddoc')
 call TestFiletype('dsdl')
+call TestFiletype('yaml')
 call TestFiletype('Dockerfile')
 call TestFiletype('yaml.docker-compose')
 call TestFiletype('elixir')
@@ -76,13 +78,13 @@ call TestFiletype('ferm')
 call TestFiletype('fish')
 call TestFiletype('fbs')
 call TestFiletype('forth')
-call TestFiletype('glsl')
 call TestFiletype('fsharp')
 call TestFiletype('gdscript3')
 call TestFiletype('gitconfig')
 call TestFiletype('gitrebase')
 call TestFiletype('gitsendemail')
 call TestFiletype('gitcommit')
+call TestFiletype('glsl')
 call TestFiletype('gmpl')
 call TestFiletype('gnuplot')
 call TestFiletype('go')
@@ -221,7 +223,6 @@ call TestFiletype('vmasm')
 call TestFiletype('vue')
 call TestFiletype('xdc')
 call TestFiletype('xsl')
-call TestFiletype('yaml')
 call TestFiletype('yaml.ansible')
 call TestFiletype('helm')
 call TestFiletype('help')

From b5cc8fc336ca2f06242fe2a61de881b34852c168 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Sep 2020 19:35:05 +0200
Subject: [PATCH 089/299] Remove ambiguity for terraform files, #570

---
 autoload/sleuth.vim   | 2 +-
 ftdetect/polyglot.vim | 2 +-
 packages.yaml         | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index e5f2e2ed8..2e08b32b6 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -198,7 +198,7 @@ let s:globs = {
   \ 'systemd': '*.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*.#*',
   \ 'tablegen': '*.td',
   \ 'tads': '*.t',
-  \ 'terraform': '*.hcl,*.nomad,*.tf,*.tfvars,*.workflow',
+  \ 'terraform': '*.tf,*.tfvars',
   \ 'textile': '*.textile',
   \ 'thrift': '*.thrift',
   \ 'tmux': '.tmux*.conf',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index cdcf7dcfd..b1cf745d4 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1272,7 +1272,7 @@ if !has_key(s:disabled_packages, 'systemd')
 endif
 
 if !has_key(s:disabled_packages, 'terraform')
-  au BufNewFile,BufRead *.hcl,*.nomad,*.tf,*.tfvars,*.workflow set ft=terraform
+  au BufNewFile,BufRead *.tf,*.tfvars set ft=terraform
 endif
 
 if !has_key(s:disabled_packages, 'textile')
diff --git a/packages.yaml b/packages.yaml
index e8a5d9b59..76da2a731 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1606,7 +1606,9 @@ name: terraform
 remote: hashivim/vim-terraform
 filetypes:
 - name: terraform
-  linguist: HCL
+  extensions:
+  - tf
+  - tfvars
 ---
 name: textile
 remote: timcharper/textile.vim

From 539952f922b27a4a7459092734dd529b77eb00c3 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Sep 2020 19:38:49 +0200
Subject: [PATCH 090/299] Prevent warning for ps1xml heuristics, #570

---
 autoload/sleuth.vim   | 2 +-
 ftdetect/polyglot.vim | 2 +-
 packages.yaml         | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/autoload/sleuth.vim b/autoload/sleuth.vim
index 2e08b32b6..3a41f6f9d 100644
--- a/autoload/sleuth.vim
+++ b/autoload/sleuth.vim
@@ -219,7 +219,7 @@ let s:globs = {
   \ 'vmasm': '*.mar',
   \ 'vue': '*.vue,*.wpy',
   \ 'xdc': '*.xdc',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
   \ 'xml.twig': '*.xml.twig',
   \ 'xs': '*.xs',
   \ 'xsl': '*.xslt,*.xsl',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index b1cf745d4..f506bd84d 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -596,7 +596,7 @@ if !has_key(s:disabled_packages, 'csv')
 endif
 
 if !has_key(s:disabled_packages, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config set ft=xml
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config set ft=xml
 endif
 
 if !has_key(s:disabled_packages, 'ant')
diff --git a/packages.yaml b/packages.yaml
index 76da2a731..4d4365d32 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1752,6 +1752,8 @@ filetypes:
   ignored_extensions:
   - ts
   - tsx
+  # handled by powershell plugin
+  - ps1xml
 ---
 name: xsl
 remote: vim-scripts/XSLT-syntax

From 2f133372bc19259888036c659cc618299ae5df59 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Sep 2020 19:51:43 +0200
Subject: [PATCH 091/299] Make loading faster for ambiguous extensions

---
 ftdetect/polyglot.vim | 866 +++++++++++-------------------------------
 scripts/build         |  28 +-
 2 files changed, 224 insertions(+), 670 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index f506bd84d..0d9fd370e 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -99,452 +99,32 @@ augroup filetypedetect
 
 
 if !has_key(s:disabled_packages, '8th')
-  au! BufRead,BufNewFile *.8th
+  au! BufNewFile,BufRead *.8th set ft=8th
 endif
 
 if !has_key(s:disabled_packages, 'conf')
-  au! BufRead,BufNewFile auto.master
+  au! BufNewFile,BufRead *.conf,auto.master,config set ft=conf
 endif
 
 if !has_key(s:disabled_packages, 'haproxy')
-  au! BufRead,BufNewFile *.cfg
-endif
-
-if !has_key(s:disabled_packages, 'a2ps')
-  au! BufRead,BufNewFile */etc/a2ps.cfg,*/etc/a2ps/*.cfg,a2psrc,.a2psrc
-endif
-
-if !has_key(s:disabled_packages, 'a65')
-  au! BufRead,BufNewFile *.a65
-endif
-
-if !has_key(s:disabled_packages, 'aap')
-  au! BufRead,BufNewFile *.aap
-endif
-
-if !has_key(s:disabled_packages, 'abap')
-  au! BufRead,BufNewFile *.abap
-endif
-
-if !has_key(s:disabled_packages, 'abc')
-  au! BufRead,BufNewFile *.abc
-endif
-
-if !has_key(s:disabled_packages, 'abel')
-  au! BufRead,BufNewFile *.abl
-endif
-
-if !has_key(s:disabled_packages, 'acedb')
-  au! BufRead,BufNewFile *.wrm
-endif
-
-if !has_key(s:disabled_packages, 'acpiasl')
-  au! BufRead,BufNewFile *.dsl
-endif
-
-if !has_key(s:disabled_packages, 'ada')
-  au! BufRead,BufNewFile *.adb,*.ads,*.ada,*.adc,*.gpr,*.ada_m
-endif
-
-if !has_key(s:disabled_packages, 'ahdl')
-  au! BufRead,BufNewFile *.tdf
-endif
-
-if !has_key(s:disabled_packages, 'aidl')
-  au! BufRead,BufNewFile *.aidl
-endif
-
-if !has_key(s:disabled_packages, 'alsaconf')
-  au! BufRead,BufNewFile .asoundrc,*/usr/share/alsa/alsa.conf,*/etc/asound.conf
-endif
-
-if !has_key(s:disabled_packages, 'aml')
-  au! BufRead,BufNewFile *.aml
-endif
-
-if !has_key(s:disabled_packages, 'ampl')
-  au! BufRead,BufNewFile *.run
-endif
-
-if !has_key(s:disabled_packages, 'xml')
-  au! BufRead,BufNewFile *.csproj,*.ui,*.wsdl,*.wsf,*.xlf,*.xliff,*.xmi,*.xsd,*.xul,*.tpm,*.csproj.user,*.wpl,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu
-endif
-
-if !has_key(s:disabled_packages, 'ant')
-  au! BufRead,BufNewFile build.xml
-endif
-
-if !has_key(s:disabled_packages, 'apache')
-  au! BufRead,BufNewFile .htaccess,*/etc/httpd/*.conf,*/etc/apache2/sites-*/*.com,access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*,*/etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.d/*.conf*
-endif
-
-if !has_key(s:disabled_packages, 'applescript')
-  au! BufRead,BufNewFile *.scpt
-endif
-
-if !has_key(s:disabled_packages, 'aptconf')
-  au! BufRead,BufNewFile apt.conf,*/.aptitude/config
-endif
-
-if !has_key(s:disabled_packages, 'arch')
-  au! BufRead,BufNewFile .arch-inventory,=tagging-method
-endif
-
-if !has_key(s:disabled_packages, 'c/c++')
-  au! BufRead,BufNewFile *.cpp,*.c++,*.cc,*.cxx,*.hh,*.hpp,*.hxx,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh,*.qc,*enlightenment/*.cfg
-endif
-
-if !has_key(s:disabled_packages, 'arduino')
-  au! BufRead,BufNewFile *.pde,*.ino
-endif
-
-if !has_key(s:disabled_packages, 'art')
-  au! BufRead,BufNewFile *.art
-endif
-
-if !has_key(s:disabled_packages, 'asciidoc')
-  au! BufRead,BufNewFile *.asciidoc,*.adoc
-endif
-
-if !has_key(s:disabled_packages, 'autohotkey')
-  au! BufRead,BufNewFile *.ahk
-endif
-
-if !has_key(s:disabled_packages, 'elf')
-  au! BufRead,BufNewFile *.am
-endif
-
-if !has_key(s:disabled_packages, 'automake')
-  au! BufRead,BufNewFile GNUmakefile.am
-endif
-
-if !has_key(s:disabled_packages, 'asn')
-  au! BufRead,BufNewFile *.asn,*.asn1
-endif
-
-if !has_key(s:disabled_packages, 'atlas')
-  au! BufRead,BufNewFile *.atl,*.as
-endif
-
-if !has_key(s:disabled_packages, 'autoit')
-  au! BufRead,BufNewFile *.au3
-endif
-
-if !has_key(s:disabled_packages, 'ave')
-  au! BufRead,BufNewFile *.ave
-endif
-
-if !has_key(s:disabled_packages, 'awk')
-  au! BufRead,BufNewFile *.awk,*.gawk
-endif
-
-if !has_key(s:disabled_packages, 'clojure')
-  au! BufRead,BufNewFile *.clj,*.cljc,*.cljs,*.cljx
-endif
-
-if !has_key(s:disabled_packages, 'cmake')
-  au! BufRead,BufNewFile *.cmake,*.cmake.in,CMakeLists.txt
-endif
-
-if !has_key(s:disabled_packages, 'cucumber')
-  au! BufRead,BufNewFile *.feature
-endif
-
-if !has_key(s:disabled_packages, 'dart')
-  au! BufRead,BufNewFile *.dart,*.drt
-endif
-
-if !has_key(s:disabled_packages, 'dlang')
-  au! BufRead,BufNewFile *.sdl
-endif
-
-if !has_key(s:disabled_packages, 'yaml')
-  au! BufRead,BufNewFile *.yml,*.yaml
-endif
-
-if !has_key(s:disabled_packages, 'dockerfile')
-  au! BufRead,BufNewFile *.Dockerfile,Dockerfile
-endif
-
-if !has_key(s:disabled_packages, 'elm')
-  au! BufRead,BufNewFile *.elm
-endif
-
-if !has_key(s:disabled_packages, 'erlang')
-  au! BufRead,BufNewFile *.erl,*.es,*.hrl,*.yaws
-endif
-
-if !has_key(s:disabled_packages, 'forth')
-  au! BufRead,BufNewFile *.fs,*.ft,*.fth
-endif
-
-if !has_key(s:disabled_packages, 'fsharp')
-  au! BufRead,BufNewFile *.fs
-endif
-
-if !has_key(s:disabled_packages, 'git')
-  au! BufRead,BufNewFile .gitconfig,.gitmodules,*.git/config,*/.config/git/config,*.git/modules/*/config,git-rebase-todo
-endif
-
-if !has_key(s:disabled_packages, 'glsl')
-  au! BufRead,BufNewFile *.fs,*.gs,*.comp
-endif
-
-if !has_key(s:disabled_packages, 'gnuplot')
-  au! BufRead,BufNewFile *.gp,*.gpi
-endif
-
-if !has_key(s:disabled_packages, 'go')
-  au! BufRead,BufNewFile *.go,*.tmpl
-endif
-
-if !has_key(s:disabled_packages, 'javascript')
-  au! BufRead,BufNewFile *.js,*.cjs,*.es,*.gs,*.mjs,*.pac,*.javascript
-endif
-
-if !has_key(s:disabled_packages, 'jsx')
-  au! BufRead,BufNewFile *.jsx
-endif
-
-if !has_key(s:disabled_packages, 'groovy')
-  au! BufRead,BufNewFile *.groovy,*.gradle
-endif
-
-if !has_key(s:disabled_packages, 'grub')
-  au! BufRead,BufNewFile */boot/grub/menu.lst,*/boot/grub/grub.conf,*/etc/grub.conf
-endif
-
-if !has_key(s:disabled_packages, 'haml')
-  au! BufRead,BufNewFile *.haml
-endif
-
-if !has_key(s:disabled_packages, 'handlebars')
-  au! BufRead,BufNewFile *.hb
-endif
-
-if !has_key(s:disabled_packages, 'haskell')
-  au! BufRead,BufNewFile *.hs,*.hs-boot,*.hsc
-endif
-
-if !has_key(s:disabled_packages, 'html5')
-  au! BufRead,BufNewFile *.st,*.xht,*.xhtml
-endif
-
-if !has_key(s:disabled_packages, 'json')
-  au! BufRead,BufNewFile *.json,*.ice,*.webmanifest,*.yy,*.jsonp,Pipfile.lock
-endif
-
-if !has_key(s:disabled_packages, 'kotlin')
-  au! BufRead,BufNewFile *.kt,*.ktm,*.kts
-endif
-
-if !has_key(s:disabled_packages, 'less')
-  au! BufRead,BufNewFile *.less
-endif
-
-if !has_key(s:disabled_packages, 'llvm')
-  au! BufRead,BufNewFile *.ll
-endif
-
-if !has_key(s:disabled_packages, 'lua')
-  au! BufRead,BufNewFile *.lua,*.nse,*.rockspec
-endif
-
-if !has_key(s:disabled_packages, 'm4')
-  au! BufRead,BufNewFile *.m4,*.at
-endif
-
-if !has_key(s:disabled_packages, 'mathematica')
-  au! BufRead,BufNewFile *.cdf,*.nb
-endif
-
-if !has_key(s:disabled_packages, 'markdown')
-  au! BufRead,BufNewFile *.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn
-endif
-
-if !has_key(s:disabled_packages, 'meson')
-  au! BufRead,BufNewFile meson.build,meson_options.txt
-endif
-
-if !has_key(s:disabled_packages, 'ocaml')
-  au! BufRead,BufNewFile *.ml,*.mli,*.mll,*.mly,.ocamlinit
-endif
-
-if !has_key(s:disabled_packages, 'opencl')
-  au! BufRead,BufNewFile *.cl
-endif
-
-if !has_key(s:disabled_packages, 'perl')
-  au! BufRead,BufNewFile *.al,*.plx,*.psgi,*.t,example.gitolite.rc,.gitolite.rc,*.pod,*.mason,*.mhtml,*.comp,*.xs
-endif
-
-if !has_key(s:disabled_packages, 'php')
-  au! BufRead,BufNewFile *.php,*.ctp,*.phtml
-endif
-
-if !has_key(s:disabled_packages, 'protobuf')
-  au! BufRead,BufNewFile *.proto
-endif
-
-if !has_key(s:disabled_packages, 'puppet')
-  au! BufRead,BufNewFile *.pp
-endif
-
-if !has_key(s:disabled_packages, 'python')
-  au! BufRead,BufNewFile *.py,*.pyi,*.pyw,*.spec,*.ptl,SConstruct,.pythonrc,.pythonstartup
-endif
-
-if !has_key(s:disabled_packages, 'r-lang')
-  au! BufRead,BufNewFile *.s,*.S,*.rd
-endif
-
-if !has_key(s:disabled_packages, 'racket')
-  au! BufRead,BufNewFile *.rkt
-endif
-
-if !has_key(s:disabled_packages, 'raku')
-  au! BufRead,BufNewFile *.p6,*.pl6,*.pm6,*.t,*.raku,*.rakumod,*.pod6
-endif
-
-if !has_key(s:disabled_packages, 'raml')
-  au! BufRead,BufNewFile *.raml
-endif
-
-if !has_key(s:disabled_packages, 'rst')
-  au! BufRead,BufNewFile *.rst
-endif
-
-if !has_key(s:disabled_packages, 'ruby')
-  au! BufRead,BufNewFile *.rb,*.builder,*.gemspec,*.rake,*.rbw,*.ru,*.spec,*.rxml,*.rjs,*.rant,.irbrc,Gemfile,Rakefile,Rantfile,*.erb,*.rhtml
-endif
-
-if !has_key(s:disabled_packages, 'rust')
-  au! BufRead,BufNewFile *.rs
-endif
-
-if !has_key(s:disabled_packages, 'scala')
-  au! BufRead,BufNewFile *.scala
-endif
-
-if !has_key(s:disabled_packages, 'sbt')
-  au! BufRead,BufNewFile *.sbt
-endif
-
-if !has_key(s:disabled_packages, 'scss')
-  au! BufRead,BufNewFile *.scss
-endif
-
-if !has_key(s:disabled_packages, 'sh')
-  au! BufRead,BufNewFile */etc/udev/cdsymlinks.conf,*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks,.zsh*
-endif
-
-if !has_key(s:disabled_packages, 'smt2')
-  au! BufRead,BufNewFile *.smt
-endif
-
-if !has_key(s:disabled_packages, 'svg')
-  au! BufRead,BufNewFile *.svg
-endif
-
-if !has_key(s:disabled_packages, 'swift')
-  au! BufRead,BufNewFile *.swift
-endif
-
-if !has_key(s:disabled_packages, 'terraform')
-  au! BufRead,BufNewFile *.tf
-endif
-
-if !has_key(s:disabled_packages, 'tmux')
-  au! BufRead,BufNewFile .tmux*.conf
-endif
-
-if !has_key(s:disabled_packages, 'toml')
-  au! BufRead,BufNewFile Pipfile
-endif
-
-if !has_key(s:disabled_packages, 'twig')
-  au! BufRead,BufNewFile *.twig
-endif
-
-if !has_key(s:disabled_packages, 'typescript')
-  au! BufRead,BufNewFile *.ts,*.tsx
-endif
-
-if !has_key(s:disabled_packages, 'v')
-  au! BufRead,BufNewFile *.v
-endif
-
-if !has_key(s:disabled_packages, 'vbnet')
-  au! BufRead,BufNewFile *.vb
-endif
-
-if !has_key(s:disabled_packages, 'vmasm')
-  au! BufRead,BufNewFile *.mar
-endif
-
-if !has_key(s:disabled_packages, 'vue')
-  au! BufRead,BufNewFile *.vue
-endif
-
-if !has_key(s:disabled_packages, 'xsl')
-  au! BufRead,BufNewFile *.xslt,*.xsl
-endif
-
-if !has_key(s:disabled_packages, 'help')
-  au! BufRead,BufNewFile $VIMRUNTIME/doc/*.txt
-endif
-
-if !has_key(s:disabled_packages, 'visual-basic')
-  au! BufRead,BufNewFile *.vba,*.vbs,*.dsm,*.ctl,*.sba
-endif
-
-if !has_key(s:disabled_packages, 'dosini')
-  au! BufRead,BufNewFile *.ini,*.properties,.editorconfig,.npmrc,*/etc/pacman.conf,php.ini-*,*/etc/yum.conf,*/etc/yum.repos.d/*
-endif
-
-if !has_key(s:disabled_packages, 'bzl')
-  au! BufRead,BufNewFile *.bzl,*.bazel,*.BUILD,BUILD,WORKSPACE
-endif
-
-if !has_key(s:disabled_packages, 'prolog')
-  au! BufRead,BufNewFile *.pdb
-endif
-
-if !has_key(s:disabled_packages, 'tads')
-  au! BufRead,BufNewFile *.t
-endif
-
-if !has_key(s:disabled_packages, 'sql')
-  au! BufRead,BufNewFile *.pls,*.pkb,*.pks,*.plsql,*.tyb,*.typ,*.tyc
-endif
-
-if !has_key(s:disabled_packages, '8th')
-  au BufNewFile,BufRead *.8th set ft=8th
-endif
-
-if !has_key(s:disabled_packages, 'conf')
-  au BufNewFile,BufRead *.conf,auto.master,config set ft=conf
-endif
-
-if !has_key(s:disabled_packages, 'haproxy')
-  au BufNewFile,BufRead *.cfg,haproxy.cfg set ft=haproxy
+  au! BufNewFile,BufRead *.cfg,haproxy.cfg set ft=haproxy
   au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
 endif
 
 if !has_key(s:disabled_packages, 'a2ps')
-  au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc set ft=a2ps
+  au! BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc set ft=a2ps
 endif
 
 if !has_key(s:disabled_packages, 'a65')
-  au BufNewFile,BufRead *.a65 set ft=a65
+  au! BufNewFile,BufRead *.a65 set ft=a65
 endif
 
 if !has_key(s:disabled_packages, 'aap')
-  au BufNewFile,BufRead *.aap set ft=aap
+  au! BufNewFile,BufRead *.aap set ft=aap
 endif
 
 if !has_key(s:disabled_packages, 'abap')
-  au BufNewFile,BufRead *.abap set ft=abap
+  au! BufNewFile,BufRead *.abap set ft=abap
 endif
 
 if !has_key(s:disabled_packages, 'abaqus')
@@ -552,59 +132,59 @@ if !has_key(s:disabled_packages, 'abaqus')
 endif
 
 if !has_key(s:disabled_packages, 'abc')
-  au BufNewFile,BufRead *.abc set ft=abc
+  au! BufNewFile,BufRead *.abc set ft=abc
 endif
 
 if !has_key(s:disabled_packages, 'abel')
-  au BufNewFile,BufRead *.abl set ft=abel
+  au! BufNewFile,BufRead *.abl set ft=abel
 endif
 
 if !has_key(s:disabled_packages, 'acedb')
-  au BufNewFile,BufRead *.wrm set ft=acedb
+  au! BufNewFile,BufRead *.wrm set ft=acedb
 endif
 
 if !has_key(s:disabled_packages, 'acpiasl')
-  au BufNewFile,BufRead *.asl,*.dsl set ft=asl
+  au! BufNewFile,BufRead *.asl,*.dsl set ft=asl
 endif
 
 if !has_key(s:disabled_packages, 'ada')
-  au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr set ft=ada
+  au! BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr set ft=ada
 endif
 
 if !has_key(s:disabled_packages, 'ahdl')
-  au BufNewFile,BufRead *.tdf set ft=ahdl
+  au! BufNewFile,BufRead *.tdf set ft=ahdl
 endif
 
 if !has_key(s:disabled_packages, 'aidl')
-  au BufNewFile,BufRead *.aidl set ft=aidl
+  au! BufNewFile,BufRead *.aidl set ft=aidl
 endif
 
 if !has_key(s:disabled_packages, 'alsaconf')
-  au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc set ft=alsaconf
+  au! BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc set ft=alsaconf
 endif
 
 if !has_key(s:disabled_packages, 'aml')
-  au BufNewFile,BufRead *.aml set ft=aml
+  au! BufNewFile,BufRead *.aml set ft=aml
 endif
 
 if !has_key(s:disabled_packages, 'ampl')
-  au BufNewFile,BufRead *.run set ft=ampl
+  au! BufNewFile,BufRead *.run set ft=ampl
 endif
 
 if !has_key(s:disabled_packages, 'csv')
-  au BufNewFile,BufRead *.csv,*.tab,*.tsv set ft=csv
+  au! BufNewFile,BufRead *.csv,*.tab,*.tsv set ft=csv
 endif
 
 if !has_key(s:disabled_packages, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config set ft=xml
+  au! BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config set ft=xml
 endif
 
 if !has_key(s:disabled_packages, 'ant')
-  au BufNewFile,BufRead build.xml set ft=ant
+  au! BufNewFile,BufRead build.xml set ft=ant
 endif
 
 if !has_key(s:disabled_packages, 'apache')
-  au BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess set ft=apache
+  au! BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess set ft=apache
   au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
   au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
   au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
@@ -618,54 +198,54 @@ if !has_key(s:disabled_packages, 'apache')
 endif
 
 if !has_key(s:disabled_packages, 'apiblueprint')
-  au BufNewFile,BufRead *.apib set ft=apiblueprint
+  au! BufNewFile,BufRead *.apib set ft=apiblueprint
 endif
 
 if !has_key(s:disabled_packages, 'applescript')
-  au BufNewFile,BufRead *.applescript,*.scpt set ft=applescript
+  au! BufNewFile,BufRead *.applescript,*.scpt set ft=applescript
 endif
 
 if !has_key(s:disabled_packages, 'aptconf')
-  au BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf set ft=aptconf
+  au! BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf set ft=aptconf
   au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
 endif
 
 if !has_key(s:disabled_packages, 'arch')
-  au BufNewFile,BufRead {.,}arch-inventory,=tagging-method set ft=arch
+  au! BufNewFile,BufRead {.,}arch-inventory,=tagging-method set ft=arch
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
   au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
-  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg set ft=c
-  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp set ft=cpp
+  au! BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg set ft=c
+  au! BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp set ft=cpp
 endif
 
 if !has_key(s:disabled_packages, 'arduino')
-  au BufNewFile,BufRead *.ino,*.pde set ft=arduino
+  au! BufNewFile,BufRead *.ino,*.pde set ft=arduino
 endif
 
 if !has_key(s:disabled_packages, 'art')
-  au BufNewFile,BufRead *.art set ft=art
+  au! BufNewFile,BufRead *.art set ft=art
 endif
 
 if !has_key(s:disabled_packages, 'asciidoc')
-  au BufNewFile,BufRead *.adoc,*.asc,*.asciidoc set ft=asciidoc
+  au! BufNewFile,BufRead *.adoc,*.asc,*.asciidoc set ft=asciidoc
 endif
 
 if !has_key(s:disabled_packages, 'autohotkey')
-  au BufNewFile,BufRead *.ahk,*.ahkl set ft=autohotkey
+  au! BufNewFile,BufRead *.ahk,*.ahkl set ft=autohotkey
 endif
 
 if !has_key(s:disabled_packages, 'elf')
-  au BufNewFile,BufRead *.am set ft=elf
+  au! BufNewFile,BufRead *.am set ft=elf
 endif
 
 if !has_key(s:disabled_packages, 'automake')
-  au BufNewFile,BufRead GNUmakefile.am,[Mm]akefile.am set ft=automake
+  au! BufNewFile,BufRead GNUmakefile.am,[Mm]akefile.am set ft=automake
 endif
 
 if !has_key(s:disabled_packages, 'asn')
-  au BufNewFile,BufRead *.asn,*.asn1 set ft=asn
+  au! BufNewFile,BufRead *.asn,*.asn1 set ft=asn
 endif
 
 if !has_key(s:disabled_packages, 'aspvbs')
@@ -678,323 +258,323 @@ if !has_key(s:disabled_packages, 'aspperl')
 endif
 
 if !has_key(s:disabled_packages, 'atlas')
-  au BufNewFile,BufRead *.as,*.atl set ft=atlas
+  au! BufNewFile,BufRead *.as,*.atl set ft=atlas
 endif
 
 if !has_key(s:disabled_packages, 'autoit')
-  au BufNewFile,BufRead *.au3 set ft=autoit
+  au! BufNewFile,BufRead *.au3 set ft=autoit
 endif
 
 if !has_key(s:disabled_packages, 'ave')
-  au BufNewFile,BufRead *.ave set ft=ave
+  au! BufNewFile,BufRead *.ave set ft=ave
 endif
 
 if !has_key(s:disabled_packages, 'awk')
-  au BufNewFile,BufRead *.awk,*.gawk set ft=awk
+  au! BufNewFile,BufRead *.awk,*.gawk set ft=awk
 endif
 
 if !has_key(s:disabled_packages, 'caddyfile')
-  au BufNewFile,BufRead Caddyfile set ft=caddyfile
+  au! BufNewFile,BufRead Caddyfile set ft=caddyfile
 endif
 
 if !has_key(s:disabled_packages, 'cpp-modern')
 endif
 
 if !has_key(s:disabled_packages, 'carp')
-  au BufNewFile,BufRead *.carp set ft=carp
+  au! BufNewFile,BufRead *.carp set ft=carp
 endif
 
 if !has_key(s:disabled_packages, 'clojure')
-  au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config set ft=clojure
+  au! BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config set ft=clojure
 endif
 
 if !has_key(s:disabled_packages, 'cmake')
-  au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt set ft=cmake
+  au! BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt set ft=cmake
 endif
 
 if !has_key(s:disabled_packages, 'coffee-script')
-  au BufNewFile,BufRead *.coffee.md,*.litcoffee set ft=litcoffee
-  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile set ft=coffee
+  au! BufNewFile,BufRead *.coffee.md,*.litcoffee set ft=litcoffee
+  au! BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile set ft=coffee
 endif
 
 if !has_key(s:disabled_packages, 'cjsx')
 endif
 
 if !has_key(s:disabled_packages, 'cryptol')
-  au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl set ft=cryptol
+  au! BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl set ft=cryptol
 endif
 
 if !has_key(s:disabled_packages, 'crystal')
-  au BufNewFile,BufRead *.ecr set ft=ecrystal
-  au BufNewFile,BufRead *.cr,Projectfile set ft=crystal
+  au! BufNewFile,BufRead *.ecr set ft=ecrystal
+  au! BufNewFile,BufRead *.cr,Projectfile set ft=crystal
 endif
 
 if !has_key(s:disabled_packages, 'cucumber')
-  au BufNewFile,BufRead *.feature,*.story set ft=cucumber
+  au! BufNewFile,BufRead *.feature,*.story set ft=cucumber
 endif
 
 if !has_key(s:disabled_packages, 'cue')
-  au BufNewFile,BufRead *.cue set ft=cuesheet
+  au! BufNewFile,BufRead *.cue set ft=cuesheet
 endif
 
 if !has_key(s:disabled_packages, 'dart')
-  au BufNewFile,BufRead *.dart,*.drt set ft=dart
+  au! BufNewFile,BufRead *.dart,*.drt set ft=dart
 endif
 
 if !has_key(s:disabled_packages, 'dhall')
-  au BufNewFile,BufRead *.dhall set ft=dhall
+  au! BufNewFile,BufRead *.dhall set ft=dhall
 endif
 
 if !has_key(s:disabled_packages, 'dlang')
-  au BufNewFile,BufRead *.sdl set ft=dsdl
-  au BufNewFile,BufRead *.ddoc set ft=ddoc
-  au BufNewFile,BufRead *.dd set ft=dd
-  au BufNewFile,BufRead *.lst set ft=dcov
-  au BufNewFile,BufRead *.d,*.di set ft=d
+  au! BufNewFile,BufRead *.sdl set ft=dsdl
+  au! BufNewFile,BufRead *.ddoc set ft=ddoc
+  au! BufNewFile,BufRead *.dd set ft=dd
+  au! BufNewFile,BufRead *.lst set ft=dcov
+  au! BufNewFile,BufRead *.d,*.di set ft=d
 endif
 
 if !has_key(s:disabled_packages, 'yaml')
-  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock set ft=yaml
+  au! BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock set ft=yaml
 endif
 
 if !has_key(s:disabled_packages, 'dockerfile')
-  au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml set ft=yaml.docker-compose
-  au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile set ft=Dockerfile
+  au! BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml set ft=yaml.docker-compose
+  au! BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile set ft=Dockerfile
   au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
 endif
 
 if !has_key(s:disabled_packages, 'elixir')
-  au BufNewFile,BufRead *.eex,*.leex set ft=eelixir
-  au BufNewFile,BufRead *.ex,*.exs,mix.lock set ft=elixir
+  au! BufNewFile,BufRead *.eex,*.leex set ft=eelixir
+  au! BufNewFile,BufRead *.ex,*.exs,mix.lock set ft=elixir
 endif
 
 if !has_key(s:disabled_packages, 'elm')
-  au BufNewFile,BufRead *.elm set ft=elm
+  au! BufNewFile,BufRead *.elm set ft=elm
 endif
 
 if !has_key(s:disabled_packages, 'emberscript')
-  au BufNewFile,BufRead *.em,*.emberscript set ft=ember-script
+  au! BufNewFile,BufRead *.em,*.emberscript set ft=ember-script
 endif
 
 if !has_key(s:disabled_packages, 'emblem')
-  au BufNewFile,BufRead *.em,*.emblem set ft=emblem
+  au! BufNewFile,BufRead *.em,*.emblem set ft=emblem
 endif
 
 if !has_key(s:disabled_packages, 'erlang')
-  au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock set ft=erlang
+  au! BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock set ft=erlang
 endif
 
 if !has_key(s:disabled_packages, 'fennel')
-  au BufNewFile,BufRead *.fnl set ft=fennel
+  au! BufNewFile,BufRead *.fnl set ft=fennel
 endif
 
 if !has_key(s:disabled_packages, 'ferm')
-  au BufNewFile,BufRead *.ferm,ferm.conf set ft=ferm
+  au! BufNewFile,BufRead *.ferm,ferm.conf set ft=ferm
 endif
 
 if !has_key(s:disabled_packages, 'fish')
-  au BufNewFile,BufRead *.fish set ft=fish
+  au! BufNewFile,BufRead *.fish set ft=fish
 endif
 
 if !has_key(s:disabled_packages, 'flatbuffers')
-  au BufNewFile,BufRead *.fbs set ft=fbs
+  au! BufNewFile,BufRead *.fbs set ft=fbs
 endif
 
 if !has_key(s:disabled_packages, 'forth')
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
-  au BufNewFile,BufRead *.ft,*.fth set ft=forth
+  au! BufNewFile,BufRead *.ft,*.fth set ft=forth
 endif
 
 if !has_key(s:disabled_packages, 'fsharp')
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
-  au BufNewFile,BufRead *.fsi,*.fsx set ft=fsharp
+  au! BufNewFile,BufRead *.fsi,*.fsx set ft=fsharp
 endif
 
 if !has_key(s:disabled_packages, 'gdscript')
-  au BufNewFile,BufRead *.gd set ft=gdscript3
+  au! BufNewFile,BufRead *.gd set ft=gdscript3
 endif
 
 if !has_key(s:disabled_packages, 'git')
-  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG set ft=gitcommit
+  au! BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG set ft=gitcommit
   au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
-  au BufNewFile,BufRead git-rebase-todo set ft=gitrebase
-  au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules set ft=gitconfig
+  au! BufNewFile,BufRead git-rebase-todo set ft=gitrebase
+  au! BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules set ft=gitconfig
   au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
 endif
 
 if !has_key(s:disabled_packages, 'glsl')
   au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
-  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl
+  au! BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl
 endif
 
 if !has_key(s:disabled_packages, 'gmpl')
-  au BufNewFile,BufRead *.mod set ft=gmpl
+  au! BufNewFile,BufRead *.mod set ft=gmpl
 endif
 
 if !has_key(s:disabled_packages, 'gnuplot')
-  au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt set ft=gnuplot
+  au! BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt set ft=gnuplot
 endif
 
 if !has_key(s:disabled_packages, 'go')
-  au BufNewFile,BufRead *.tmpl set ft=gohtmltmpl
-  au BufNewFile,BufRead go.mod set ft=gomod
-  au BufNewFile,BufRead *.go set ft=go
+  au! BufNewFile,BufRead *.tmpl set ft=gohtmltmpl
+  au! BufNewFile,BufRead go.mod set ft=gomod
+  au! BufNewFile,BufRead *.go set ft=go
 endif
 
 if !has_key(s:disabled_packages, 'javascript')
-  au BufNewFile,BufRead *.flow set ft=flow
-  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile set ft=javascript
+  au! BufNewFile,BufRead *.flow set ft=flow
+  au! BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile set ft=javascript
 endif
 
 if !has_key(s:disabled_packages, 'jsx')
-  au BufNewFile,BufRead *.jsx set ft=javascriptreact
+  au! BufNewFile,BufRead *.jsx set ft=javascriptreact
 endif
 
 if !has_key(s:disabled_packages, 'graphql')
-  au BufNewFile,BufRead *.gql,*.graphql,*.graphqls set ft=graphql
+  au! BufNewFile,BufRead *.gql,*.graphql,*.graphqls set ft=graphql
 endif
 
 if !has_key(s:disabled_packages, 'groovy')
-  au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile set ft=groovy
+  au! BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile set ft=groovy
 endif
 
 if !has_key(s:disabled_packages, 'gradle')
 endif
 
 if !has_key(s:disabled_packages, 'grub')
-  au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf set ft=grub
+  au! BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf set ft=grub
 endif
 
 if !has_key(s:disabled_packages, 'haml')
-  au BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc set ft=haml
+  au! BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc set ft=haml
 endif
 
 if !has_key(s:disabled_packages, 'handlebars')
-  au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs set ft=html.handlebars
-  au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache set ft=html.mustache
+  au! BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs set ft=html.handlebars
+  au! BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache set ft=html.mustache
 endif
 
 if !has_key(s:disabled_packages, 'haskell')
-  au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig set ft=haskell
+  au! BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig set ft=haskell
 endif
 
 if !has_key(s:disabled_packages, 'haxe')
-  au BufNewFile,BufRead *.hx,*.hxsl set ft=haxe
+  au! BufNewFile,BufRead *.hx,*.hxsl set ft=haxe
 endif
 
 if !has_key(s:disabled_packages, 'hcl')
-  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile set ft=hcl
+  au! BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile set ft=hcl
 endif
 
 if !has_key(s:disabled_packages, 'hive')
-  au BufNewFile,BufRead *.hql,*.q,*.ql set ft=hive
+  au! BufNewFile,BufRead *.hql,*.q,*.ql set ft=hive
 endif
 
 if !has_key(s:disabled_packages, 'html5')
   au! BufNewFile,BufRead *.html call polyglot#DetectHtmlFiletype()
-  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml set ft=html
+  au! BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml set ft=html
 endif
 
 if !has_key(s:disabled_packages, 'i3')
-  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config set ft=i3config
+  au! BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config set ft=i3config
 endif
 
 if !has_key(s:disabled_packages, 'icalendar')
-  au BufNewFile,BufRead *.ics set ft=icalendar
+  au! BufNewFile,BufRead *.ics set ft=icalendar
 endif
 
 if !has_key(s:disabled_packages, 'idris')
   au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
   au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
-  au BufNewFile,BufRead idris-response set ft=idris
+  au! BufNewFile,BufRead idris-response set ft=idris
 endif
 
 if !has_key(s:disabled_packages, 'idris2')
   au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
   au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
-  au BufNewFile,BufRead *.ipkg,idris-response set ft=idris2
+  au! BufNewFile,BufRead *.ipkg,idris-response set ft=idris2
 endif
 
 if !has_key(s:disabled_packages, 'ion')
-  au BufNewFile,BufRead *.ion,~/.config/ion/initrc set ft=ion
+  au! BufNewFile,BufRead *.ion,~/.config/ion/initrc set ft=ion
 endif
 
 if !has_key(s:disabled_packages, 'javascript-sql')
 endif
 
 if !has_key(s:disabled_packages, 'jenkins')
-  au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile set ft=Jenkinsfile
+  au! BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile set ft=Jenkinsfile
   au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
 if !has_key(s:disabled_packages, 'htmldjango')
-  au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk set ft=htmldjango
+  au! BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk set ft=htmldjango
 endif
 
 if !has_key(s:disabled_packages, 'jq')
-  au BufNewFile,BufRead *.jq,{.,}jqrc set ft=jq
+  au! BufNewFile,BufRead *.jq,{.,}jqrc set ft=jq
   au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq')
 endif
 
 if !has_key(s:disabled_packages, 'json5')
-  au BufNewFile,BufRead *.json5 set ft=json5
+  au! BufNewFile,BufRead *.json5 set ft=json5
 endif
 
 if !has_key(s:disabled_packages, 'json')
-  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info set ft=json
+  au! BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info set ft=json
 endif
 
 if !has_key(s:disabled_packages, 'jsonnet')
-  au BufNewFile,BufRead *.jsonnet,*.libsonnet set ft=jsonnet
+  au! BufNewFile,BufRead *.jsonnet,*.libsonnet set ft=jsonnet
 endif
 
 if !has_key(s:disabled_packages, 'jst')
-  au BufNewFile,BufRead *.ect,*.ejs,*.jst set ft=jst
+  au! BufNewFile,BufRead *.ect,*.ejs,*.jst set ft=jst
 endif
 
 if !has_key(s:disabled_packages, 'julia')
-  au BufNewFile,BufRead *.jl set ft=julia
+  au! BufNewFile,BufRead *.jl set ft=julia
 endif
 
 if !has_key(s:disabled_packages, 'kotlin')
-  au BufNewFile,BufRead *.kt,*.ktm,*.kts set ft=kotlin
+  au! BufNewFile,BufRead *.kt,*.ktm,*.kts set ft=kotlin
 endif
 
 if !has_key(s:disabled_packages, 'ledger')
-  au BufNewFile,BufRead *.journal,*.ldg,*.ledger set ft=ledger
+  au! BufNewFile,BufRead *.journal,*.ldg,*.ledger set ft=ledger
 endif
 
 if !has_key(s:disabled_packages, 'less')
-  au BufNewFile,BufRead *.less set ft=less
+  au! BufNewFile,BufRead *.less set ft=less
 endif
 
 if !has_key(s:disabled_packages, 'lilypond')
-  au BufNewFile,BufRead *.ily,*.ly set ft=lilypond
+  au! BufNewFile,BufRead *.ily,*.ly set ft=lilypond
 endif
 
 if !has_key(s:disabled_packages, 'livescript')
-  au BufNewFile,BufRead *._ls,*.ls,Slakefile set ft=livescript
+  au! BufNewFile,BufRead *._ls,*.ls,Slakefile set ft=livescript
 endif
 
 if !has_key(s:disabled_packages, 'llvm')
-  au BufNewFile,BufRead *.td set ft=tablegen
-  au BufNewFile,BufRead *.ll set ft=llvm
+  au! BufNewFile,BufRead *.td set ft=tablegen
+  au! BufNewFile,BufRead *.ll set ft=llvm
 endif
 
 if !has_key(s:disabled_packages, 'log')
-  au BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log set ft=log
+  au! BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log set ft=log
 endif
 
 if !has_key(s:disabled_packages, 'lua')
-  au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc set ft=lua
+  au! BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc set ft=lua
 endif
 
 if !has_key(s:disabled_packages, 'm4')
-  au BufNewFile,BufRead *.at,*.m4 set ft=m4
+  au! BufNewFile,BufRead *.at,*.m4 set ft=m4
 endif
 
 if !has_key(s:disabled_packages, 'mako')
-  au BufNewFile,BufRead *.mako,*.mao set ft=mako
+  au! BufNewFile,BufRead *.mako,*.mao set ft=mako
   au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
@@ -1003,24 +583,24 @@ endif
 
 if !has_key(s:disabled_packages, 'mathematica')
   au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
-  au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt set ft=mma
+  au! BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt set ft=mma
 endif
 
 if !has_key(s:disabled_packages, 'markdown')
-  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr set ft=markdown
+  au! BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr set ft=markdown
 endif
 
 if !has_key(s:disabled_packages, 'mdx')
-  au BufNewFile,BufRead *.mdx set ft=markdown.mdx
+  au! BufNewFile,BufRead *.mdx set ft=markdown.mdx
 endif
 
 if !has_key(s:disabled_packages, 'meson')
-  au BufNewFile,BufRead *.wrap set ft=dosini
-  au BufNewFile,BufRead meson.build,meson_options.txt set ft=meson
+  au! BufNewFile,BufRead *.wrap set ft=dosini
+  au! BufNewFile,BufRead meson.build,meson_options.txt set ft=meson
 endif
 
 if !has_key(s:disabled_packages, 'moonscript')
-  au BufNewFile,BufRead *.moon set ft=moon
+  au! BufNewFile,BufRead *.moon set ft=moon
 endif
 
 if !has_key(s:disabled_packages, 'murphi')
@@ -1028,17 +608,17 @@ if !has_key(s:disabled_packages, 'murphi')
 endif
 
 if !has_key(s:disabled_packages, 'nginx')
-  au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf set ft=nginx
+  au! BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf set ft=nginx
   au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
   au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
 endif
 
 if !has_key(s:disabled_packages, 'nim')
-  au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg set ft=nim
+  au! BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg set ft=nim
 endif
 
 if !has_key(s:disabled_packages, 'nix')
-  au BufNewFile,BufRead *.nix set ft=nix
+  au! BufNewFile,BufRead *.nix set ft=nix
 endif
 
 if !has_key(s:disabled_packages, 'objc')
@@ -1047,24 +627,24 @@ if !has_key(s:disabled_packages, 'objc')
 endif
 
 if !has_key(s:disabled_packages, 'ocaml')
-  au BufNewFile,BufRead *.sexp set ft=sexplib
-  au BufNewFile,BufRead *.root set ft=ocpbuildroot
-  au BufNewFile,BufRead *.ocp set ft=ocpbuild
-  au BufNewFile,BufRead _tags set ft=ocamlbuild_tags
-  au BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild set ft=dune
-  au BufNewFile,BufRead _oasis set ft=oasis
-  au BufNewFile,BufRead *.opam,*.opam.template,opam set ft=opam
-  au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in set ft=omake
-  au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit set ft=ocaml
+  au! BufNewFile,BufRead *.sexp set ft=sexplib
+  au! BufNewFile,BufRead *.root set ft=ocpbuildroot
+  au! BufNewFile,BufRead *.ocp set ft=ocpbuild
+  au! BufNewFile,BufRead _tags set ft=ocamlbuild_tags
+  au! BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild set ft=dune
+  au! BufNewFile,BufRead _oasis set ft=oasis
+  au! BufNewFile,BufRead *.opam,*.opam.template,opam set ft=opam
+  au! BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in set ft=omake
+  au! BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit set ft=ocaml
 endif
 
 if !has_key(s:disabled_packages, 'octave')
   au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
-  au BufNewFile,BufRead *.oct set ft=octave
+  au! BufNewFile,BufRead *.oct set ft=octave
 endif
 
 if !has_key(s:disabled_packages, 'opencl')
-  au BufNewFile,BufRead *.cl,*.opencl set ft=opencl
+  au! BufNewFile,BufRead *.cl,*.opencl set ft=opencl
 endif
 
 if !has_key(s:disabled_packages, 'perl')
@@ -1072,60 +652,60 @@ if !has_key(s:disabled_packages, 'perl')
   au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
   au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
   au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
-  au BufNewFile,BufRead *.xs set ft=xs
-  au BufNewFile,BufRead *.comp,*.mason,*.mhtml set ft=mason
-  au BufNewFile,BufRead *.pod set ft=pod
-  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc set ft=perl
+  au! BufNewFile,BufRead *.xs set ft=xs
+  au! BufNewFile,BufRead *.comp,*.mason,*.mhtml set ft=mason
+  au! BufNewFile,BufRead *.pod set ft=pod
+  au! BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc set ft=perl
 endif
 
 if !has_key(s:disabled_packages, 'pgsql')
-  au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
+  au! BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
 endif
 
 if !has_key(s:disabled_packages, 'cql')
-  au BufNewFile,BufRead *.cql set ft=cql
+  au! BufNewFile,BufRead *.cql set ft=cql
 endif
 
 if !has_key(s:disabled_packages, 'php')
-  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile set ft=php
+  au! BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile set ft=php
 endif
 
 if !has_key(s:disabled_packages, 'blade')
-  au BufNewFile,BufRead *.blade,*.blade.php set ft=blade
+  au! BufNewFile,BufRead *.blade,*.blade.php set ft=blade
 endif
 
 if !has_key(s:disabled_packages, 'plantuml')
-  au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml set ft=plantuml
+  au! BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml set ft=plantuml
 endif
 
 if !has_key(s:disabled_packages, 'pony')
-  au BufNewFile,BufRead *.pony set ft=pony
+  au! BufNewFile,BufRead *.pony set ft=pony
 endif
 
 if !has_key(s:disabled_packages, 'powershell')
-  au BufNewFile,BufRead *.ps1xml set ft=ps1xml
-  au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc set ft=ps1
+  au! BufNewFile,BufRead *.ps1xml set ft=ps1xml
+  au! BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc set ft=ps1
 endif
 
 if !has_key(s:disabled_packages, 'protobuf')
-  au BufNewFile,BufRead *.proto set ft=proto
+  au! BufNewFile,BufRead *.proto set ft=proto
 endif
 
 if !has_key(s:disabled_packages, 'pug')
-  au BufNewFile,BufRead *.jade,*.pug set ft=pug
+  au! BufNewFile,BufRead *.jade,*.pug set ft=pug
 endif
 
 if !has_key(s:disabled_packages, 'puppet')
-  au BufNewFile,BufRead *.epp set ft=embeddedpuppet
-  au BufNewFile,BufRead *.pp,Modulefile set ft=puppet
+  au! BufNewFile,BufRead *.epp set ft=embeddedpuppet
+  au! BufNewFile,BufRead *.pp,Modulefile set ft=puppet
 endif
 
 if !has_key(s:disabled_packages, 'purescript')
-  au BufNewFile,BufRead *.purs set ft=purescript
+  au! BufNewFile,BufRead *.purs set ft=purescript
 endif
 
 if !has_key(s:disabled_packages, 'python')
-  au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript set ft=python
+  au! BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript set ft=python
 endif
 
 if !has_key(s:disabled_packages, 'python-indent')
@@ -1135,237 +715,237 @@ if !has_key(s:disabled_packages, 'python-compiler')
 endif
 
 if !has_key(s:disabled_packages, 'requirements')
-  au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} set ft=requirements
+  au! BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} set ft=requirements
 endif
 
 if !has_key(s:disabled_packages, 'qmake')
-  au BufNewFile,BufRead *.pri,*.pro set ft=qmake
+  au! BufNewFile,BufRead *.pri,*.pro set ft=qmake
 endif
 
 if !has_key(s:disabled_packages, 'qml')
-  au BufNewFile,BufRead *.qbs,*.qml set ft=qml
+  au! BufNewFile,BufRead *.qbs,*.qml set ft=qml
 endif
 
 if !has_key(s:disabled_packages, 'r-lang')
-  au BufNewFile,BufRead *.rd set ft=rhelp
-  au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist set ft=r
+  au! BufNewFile,BufRead *.rd set ft=rhelp
+  au! BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist set ft=r
 endif
 
 if !has_key(s:disabled_packages, 'racket')
-  au BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl set ft=racket
+  au! BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl set ft=racket
 endif
 
 if !has_key(s:disabled_packages, 'ragel')
-  au BufNewFile,BufRead *.rl set ft=ragel
+  au! BufNewFile,BufRead *.rl set ft=ragel
 endif
 
 if !has_key(s:disabled_packages, 'raku')
   au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
   au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
   au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
-  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 set ft=raku
+  au! BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 set ft=raku
 endif
 
 if !has_key(s:disabled_packages, 'raml')
-  au BufNewFile,BufRead *.raml set ft=raml
+  au! BufNewFile,BufRead *.raml set ft=raml
 endif
 
 if !has_key(s:disabled_packages, 'razor')
-  au BufNewFile,BufRead *.cshtml,*.razor set ft=razor
+  au! BufNewFile,BufRead *.cshtml,*.razor set ft=razor
 endif
 
 if !has_key(s:disabled_packages, 'reason')
   au! BufNewFile,BufRead *.re call polyglot#DetectReFiletype()
-  au BufNewFile,BufRead *.rei set ft=reason
+  au! BufNewFile,BufRead *.rei set ft=reason
 endif
 
 if !has_key(s:disabled_packages, 'rst')
-  au BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt set ft=rst
+  au! BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt set ft=rst
 endif
 
 if !has_key(s:disabled_packages, 'ruby')
-  au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml set ft=eruby
-  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile set ft=ruby
+  au! BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml set ft=eruby
+  au! BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile set ft=ruby
   au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
 endif
 
 if !has_key(s:disabled_packages, 'rspec')
-  au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
+  au! BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
 endif
 
 if !has_key(s:disabled_packages, 'yard')
 endif
 
 if !has_key(s:disabled_packages, 'brewfile')
-  au BufNewFile,BufRead Brewfile set ft=brewfile
+  au! BufNewFile,BufRead Brewfile set ft=brewfile
 endif
 
 if !has_key(s:disabled_packages, 'rust')
-  au BufNewFile,BufRead *.rs,*.rs.in set ft=rust
+  au! BufNewFile,BufRead *.rs,*.rs.in set ft=rust
 endif
 
 if !has_key(s:disabled_packages, 'scala')
-  au BufNewFile,BufRead *.kojo,*.sc,*.scala set ft=scala
+  au! BufNewFile,BufRead *.kojo,*.sc,*.scala set ft=scala
 endif
 
 if !has_key(s:disabled_packages, 'sbt')
-  au BufNewFile,BufRead *.sbt set ft=sbt.scala
+  au! BufNewFile,BufRead *.sbt set ft=sbt.scala
 endif
 
 if !has_key(s:disabled_packages, 'scss')
-  au BufNewFile,BufRead *.scss set ft=scss
+  au! BufNewFile,BufRead *.scss set ft=scss
 endif
 
 if !has_key(s:disabled_packages, 'sh')
-  au BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc set ft=zsh
+  au! BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc set ft=zsh
   au BufNewFile,BufRead {.,}zsh* call s:StarSetf('zsh')
   au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh')
   au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
-  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc set ft=sh
+  au! BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc set ft=sh
 endif
 
 if !has_key(s:disabled_packages, 'zinit')
 endif
 
 if !has_key(s:disabled_packages, 'slim')
-  au BufNewFile,BufRead *.slim set ft=slim
+  au! BufNewFile,BufRead *.slim set ft=slim
 endif
 
 if !has_key(s:disabled_packages, 'slime')
-  au BufNewFile,BufRead *.slime set ft=slime
+  au! BufNewFile,BufRead *.slime set ft=slime
 endif
 
 if !has_key(s:disabled_packages, 'smt2')
-  au BufNewFile,BufRead *.smt,*.smt2 set ft=smt2
+  au! BufNewFile,BufRead *.smt,*.smt2 set ft=smt2
 endif
 
 if !has_key(s:disabled_packages, 'solidity')
-  au BufNewFile,BufRead *.sol set ft=solidity
+  au! BufNewFile,BufRead *.sol set ft=solidity
 endif
 
 if !has_key(s:disabled_packages, 'stylus')
-  au BufNewFile,BufRead *.styl,*.stylus set ft=stylus
+  au! BufNewFile,BufRead *.styl,*.stylus set ft=stylus
 endif
 
 if !has_key(s:disabled_packages, 'svelte')
-  au BufNewFile,BufRead *.svelte set ft=svelte
+  au! BufNewFile,BufRead *.svelte set ft=svelte
 endif
 
 if !has_key(s:disabled_packages, 'svg')
-  au BufNewFile,BufRead *.svg set ft=svg
+  au! BufNewFile,BufRead *.svg set ft=svg
 endif
 
 if !has_key(s:disabled_packages, 'svg-indent')
 endif
 
 if !has_key(s:disabled_packages, 'swift')
-  au BufNewFile,BufRead *.swift set ft=swift
+  au! BufNewFile,BufRead *.swift set ft=swift
 endif
 
 if !has_key(s:disabled_packages, 'sxhkd')
-  au BufNewFile,BufRead *.sxhkdrc,sxhkdrc set ft=sxhkdrc
+  au! BufNewFile,BufRead *.sxhkdrc,sxhkdrc set ft=sxhkdrc
 endif
 
 if !has_key(s:disabled_packages, 'systemd')
-  au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf set ft=systemd
+  au! BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf set ft=systemd
   au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
 endif
 
 if !has_key(s:disabled_packages, 'terraform')
-  au BufNewFile,BufRead *.tf,*.tfvars set ft=terraform
+  au! BufNewFile,BufRead *.tf,*.tfvars set ft=terraform
 endif
 
 if !has_key(s:disabled_packages, 'textile')
-  au BufNewFile,BufRead *.textile set ft=textile
+  au! BufNewFile,BufRead *.textile set ft=textile
 endif
 
 if !has_key(s:disabled_packages, 'thrift')
-  au BufNewFile,BufRead *.thrift set ft=thrift
+  au! BufNewFile,BufRead *.thrift set ft=thrift
 endif
 
 if !has_key(s:disabled_packages, 'tmux')
-  au BufNewFile,BufRead {.,}tmux*.conf set ft=tmux
+  au! BufNewFile,BufRead {.,}tmux*.conf set ft=tmux
 endif
 
 if !has_key(s:disabled_packages, 'toml')
-  au BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock set ft=toml
+  au! BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock set ft=toml
 endif
 
 if !has_key(s:disabled_packages, 'tptp')
-  au BufNewFile,BufRead *.ax,*.p,*.tptp set ft=tptp
+  au! BufNewFile,BufRead *.ax,*.p,*.tptp set ft=tptp
 endif
 
 if !has_key(s:disabled_packages, 'twig')
-  au BufNewFile,BufRead *.xml.twig set ft=xml.twig
-  au BufNewFile,BufRead *.twig set ft=html.twig
+  au! BufNewFile,BufRead *.xml.twig set ft=xml.twig
+  au! BufNewFile,BufRead *.twig set ft=html.twig
 endif
 
 if !has_key(s:disabled_packages, 'typescript')
-  au BufNewFile,BufRead *.tsx set ft=typescriptreact
-  au BufNewFile,BufRead *.ts set ft=typescript
+  au! BufNewFile,BufRead *.tsx set ft=typescriptreact
+  au! BufNewFile,BufRead *.ts set ft=typescript
 endif
 
 if !has_key(s:disabled_packages, 'unison')
-  au BufNewFile,BufRead *.u,*.uu set ft=unison
+  au! BufNewFile,BufRead *.u,*.uu set ft=unison
 endif
 
 if !has_key(s:disabled_packages, 'v')
-  au BufNewFile,BufRead *.v set ft=v
+  au! BufNewFile,BufRead *.v set ft=v
 endif
 
 if !has_key(s:disabled_packages, 'vala')
-  au BufNewFile,BufRead *.vala,*.valadoc,*.vapi set ft=vala
+  au! BufNewFile,BufRead *.vala,*.valadoc,*.vapi set ft=vala
 endif
 
 if !has_key(s:disabled_packages, 'vbnet')
-  au BufNewFile,BufRead *.vb,*.vbhtml set ft=vbnet
+  au! BufNewFile,BufRead *.vb,*.vbhtml set ft=vbnet
 endif
 
 if !has_key(s:disabled_packages, 'vcl')
-  au BufNewFile,BufRead *.vcl set ft=vcl
+  au! BufNewFile,BufRead *.vcl set ft=vcl
 endif
 
 if !has_key(s:disabled_packages, 'velocity')
-  au BufNewFile,BufRead *.vm set ft=velocity
+  au! BufNewFile,BufRead *.vm set ft=velocity
 endif
 
 if !has_key(s:disabled_packages, 'vmasm')
-  au BufNewFile,BufRead *.mar set ft=vmasm
+  au! BufNewFile,BufRead *.mar set ft=vmasm
 endif
 
 if !has_key(s:disabled_packages, 'vue')
-  au BufNewFile,BufRead *.vue,*.wpy set ft=vue
+  au! BufNewFile,BufRead *.vue,*.wpy set ft=vue
 endif
 
 if !has_key(s:disabled_packages, 'xdc')
-  au BufNewFile,BufRead *.xdc set ft=xdc
+  au! BufNewFile,BufRead *.xdc set ft=xdc
 endif
 
 if !has_key(s:disabled_packages, 'xsl')
-  au BufNewFile,BufRead *.xsl,*.xslt set ft=xsl
+  au! BufNewFile,BufRead *.xsl,*.xslt set ft=xsl
 endif
 
 if !has_key(s:disabled_packages, 'ansible')
-  au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml set ft=yaml.ansible
+  au! BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml set ft=yaml.ansible
   au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
   au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
 endif
 
 if !has_key(s:disabled_packages, 'helm')
-  au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml set ft=helm
+  au! BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml set ft=helm
 endif
 
 if !has_key(s:disabled_packages, 'help')
-  au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt set ft=help
+  au! BufNewFile,BufRead $VIMRUNTIME/doc/*.txt set ft=help
 endif
 
 if !has_key(s:disabled_packages, 'zephir')
-  au BufNewFile,BufRead *.zep set ft=zephir
+  au! BufNewFile,BufRead *.zep set ft=zephir
 endif
 
 if !has_key(s:disabled_packages, 'zig')
-  au BufNewFile,BufRead *.zig,*.zir set ft=zig
-  au BufNewFile,BufRead *.zir set ft=zir
+  au! BufNewFile,BufRead *.zig,*.zir set ft=zig
+  au! BufNewFile,BufRead *.zir set ft=zir
 endif
 
 if !has_key(s:disabled_packages, 'trasys')
@@ -1373,31 +953,31 @@ if !has_key(s:disabled_packages, 'trasys')
 endif
 
 if !has_key(s:disabled_packages, 'basic')
-  au BufNewFile,BufRead *.basic set ft=basic
+  au! BufNewFile,BufRead *.basic set ft=basic
 endif
 
 if !has_key(s:disabled_packages, 'visual-basic')
   au! BufNewFile,BufRead *.bas call polyglot#DetectBasFiletype()
-  au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs set ft=vb
+  au! BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs set ft=vb
 endif
 
 if !has_key(s:disabled_packages, 'dosini')
-  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec set ft=dosini
+  au! BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec set ft=dosini
   au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
   au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
 endif
 
 if !has_key(s:disabled_packages, 'odin')
-  au BufNewFile,BufRead *.odin set ft=odin
+  au! BufNewFile,BufRead *.odin set ft=odin
 endif
 
 if !has_key(s:disabled_packages, 'bzl')
-  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE set ft=bzl
+  au! BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE set ft=bzl
 endif
 
 if !has_key(s:disabled_packages, 'prolog')
   au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
-  au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap set ft=prolog
+  au! BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap set ft=prolog
 endif
 
 if !has_key(s:disabled_packages, 'tads')
@@ -1405,11 +985,11 @@ if !has_key(s:disabled_packages, 'tads')
 endif
 
 if !has_key(s:disabled_packages, 'gitignore')
-  au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore set ft=gitignore
+  au! BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore set ft=gitignore
 endif
 
 if !has_key(s:disabled_packages, 'sql')
-  au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw set ft=sql
+  au! BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw set ft=sql
 endif
 
 
diff --git a/scripts/build b/scripts/build
index 14141aa3f..2e767b9b3 100755
--- a/scripts/build
+++ b/scripts/build
@@ -502,32 +502,6 @@ def generate_ftdetect(packages, heuristics)
   native_extensions = Set.new(native_filetypes.flat_map { |f| f["extensions"] || [] })
   native_filenames = Set.new(native_filetypes.flat_map { |f| f["filenames"] || [] })
 
-  for package in packages
-    name = package.fetch("name")
-
-    to_disable = []
-
-    for filetype in package["filetypes"]
-      for extension in filetype["extensions"]
-        if native_extensions.include?(extension)
-          to_disable << "*." + extension
-        end
-      end
-
-      for filename in filetype["filenames"]
-        if native_filenames.include?(filename)
-          to_disable << filename
-        end
-      end
-    end
-
-    if to_disable.size > 0
-      output << "if !has_key(s:disabled_packages, '#{name}')\n"
-      output << "  au! BufRead,BufNewFile #{to_disable.join(",")}\n"
-      output << "endif\n\n"
-    end
-  end
-
   for package in packages
     filetypes = package["filetypes"] or raise "Unknown filetype for: #{package["name"]}"
 
@@ -580,7 +554,7 @@ def generate_ftdetect(packages, heuristics)
       end
 
       if set_globs.size > 0
-        autocommands << "  au BufNewFile,BufRead #{set_globs.join(",")} #{set_command}\n"
+        autocommands << "  au! BufNewFile,BufRead #{set_globs.join(",")} #{set_command}\n"
       end
     end
 

From 543e8c917beddea04099ce9fe28e780ef7bda7fa Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Sep 2020 21:48:38 +0200
Subject: [PATCH 092/299] Modularize lazy loading of polyglot parts

---
 autoload/polyglot.vim              | 705 -----------------------------
 autoload/polyglot/detect.vim       | 262 +++++++++++
 autoload/polyglot/shebang.vim      | 129 ++++++
 autoload/{ => polyglot}/sleuth.vim |   2 +-
 ftdetect/polyglot.vim              |  73 +--
 heuristics.yaml                    |   6 +
 polyglot.vim                       |  34 +-
 scripts/build                      |  56 ++-
 tests/extensions.vim               |   1 +
 9 files changed, 480 insertions(+), 788 deletions(-)
 delete mode 100644 autoload/polyglot.vim
 create mode 100644 autoload/polyglot/detect.vim
 create mode 100644 autoload/polyglot/shebang.vim
 rename autoload/{ => polyglot}/sleuth.vim (99%)

diff --git a/autoload/polyglot.vim b/autoload/polyglot.vim
deleted file mode 100644
index 33210855d..000000000
--- a/autoload/polyglot.vim
+++ /dev/null
@@ -1,705 +0,0 @@
-" Please do not edit this file directly, instead modify polyglot.vim or scripts/build
-
-" Line continuation is used here, remove 'C' from 'cpoptions'
-let s:cpo_save = &cpo
-set cpo&vim
-
-func! polyglot#Shebang()
-  if getline(1) =~# "^#!"
-    let ft = polyglot#ShebangFiletype()
-    if ft != ""
-      let &ft = ft
-    endif
-  endif
-
-  if &ft == ""
-    runtime! scripts.vim
-  endif
-
-  return &ft != ""
-endfunc
-
-let s:r_hashbang = '^#!\s*\(\S\+\)\s*\(.*\)\s*'
-let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
-let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
-
-func! polyglot#ShebangFiletype()
-  let l:line1 = getline(1)
-
-  if l:line1 !~# "^#!"
-    return
-  endif
-
-  let l:pathrest = matchlist(l:line1, s:r_hashbang)
-
-  if len(l:pathrest) == 0
-    return
-  endif
-
-  let [_, l:path, l:rest; __] = l:pathrest
-
-  let l:script = split(l:path, "/")[-1]
-
-  if l:script == "env"
-    let l:argspath = matchlist(l:rest, s:r_env)
-    if len(l:argspath) == 0
-      return
-    endif
-
-    let l:script = l:argspath[1]
-  endif
-
-  if has_key(s:interpreters, l:script)
-    return s:interpreters[l:script]
-  endif
-
-  for interpreter in keys(s:interpreters)
-    if l:script =~# '^' . interpreter
-      return s:interpreters[interpreter]
-    endif
-  endfor
-endfunc
-
-let s:interpreters = {
-  \ 'osascript': 'applescript',
-  \ 'tcc': 'c',
-  \ 'coffee': 'coffee',
-  \ 'crystal': 'crystal',
-  \ 'dart': 'dart',
-  \ 'elixir': 'elixir',
-  \ 'escript': 'erlang',
-  \ 'fish': 'fish',
-  \ 'gnuplot': 'gnuplot',
-  \ 'groovy': 'groovy',
-  \ 'runhaskell': 'haskell',
-  \ 'chakra': 'javascript',
-  \ 'd8': 'javascript',
-  \ 'gjs': 'javascript',
-  \ 'js': 'javascript',
-  \ 'node': 'javascript',
-  \ 'nodejs': 'javascript',
-  \ 'qjs': 'javascript',
-  \ 'rhino': 'javascript',
-  \ 'v8': 'javascript',
-  \ 'v8-shell': 'javascript',
-  \ 'julia': 'julia',
-  \ 'lua': 'lua',
-  \ 'moon': 'moon',
-  \ 'ocaml': 'ocaml',
-  \ 'ocamlrun': 'ocaml',
-  \ 'ocamlscript': 'ocaml',
-  \ 'cperl': 'perl',
-  \ 'perl': 'perl',
-  \ 'php': 'php',
-  \ 'swipl': 'prolog',
-  \ 'yap': 'prolog',
-  \ 'pwsh': 'ps1',
-  \ 'python': 'python',
-  \ 'python2': 'python',
-  \ 'python3': 'python',
-  \ 'qmake': 'qmake',
-  \ 'Rscript': 'r',
-  \ 'racket': 'racket',
-  \ 'perl6': 'raku',
-  \ 'raku': 'raku',
-  \ 'rakudo': 'raku',
-  \ 'ruby': 'ruby',
-  \ 'macruby': 'ruby',
-  \ 'rake': 'ruby',
-  \ 'jruby': 'ruby',
-  \ 'rbx': 'ruby',
-  \ 'scala': 'scala',
-  \ 'ash': 'sh',
-  \ 'bash': 'sh',
-  \ 'dash': 'sh',
-  \ 'ksh': 'sh',
-  \ 'mksh': 'sh',
-  \ 'pdksh': 'sh',
-  \ 'rc': 'sh',
-  \ 'sh': 'sh',
-  \ 'zsh': 'sh',
-  \ 'boolector': 'smt2',
-  \ 'cvc4': 'smt2',
-  \ 'mathsat5': 'smt2',
-  \ 'opensmt': 'smt2',
-  \ 'smtinterpol': 'smt2',
-  \ 'smt-rat': 'smt2',
-  \ 'stp': 'smt2',
-  \ 'verit': 'smt2',
-  \ 'yices2': 'smt2',
-  \ 'z3': 'smt2',
-  \ 'deno': 'typescript',
-  \ 'ts-node': 'typescript',
-\ }
-
-func! polyglot#DetectInpFiletype()
-  let line = getline(nextnonblank(1))
-  if line =~# '^\*'
-    set ft=abaqus | return
-  endif
-  for lnum in range(1, min([line("$"), 500]))
-    let line = getline(lnum)
-    if line =~? '^header surface data'
-      set ft=trasys | return
-    endif
-  endfor
-endfunc
-
-func! polyglot#DetectAsaFiletype()
-  if exists("g:filetype_asa")
-    let &ft = g:filetype_asa | return
-  endif
-  set ft=aspvbs | return
-endfunc
-
-func! polyglot#DetectAspFiletype()
-  if exists("g:filetype_asp")
-    let &ft = g:filetype_asp | return
-  endif
-  for lnum in range(1, min([line("$"), 3]))
-    let line = getline(lnum)
-    if line =~? 'perlscript'
-      set ft=aspperl | return
-    endif
-  endfor
-  set ft=aspvbs | return
-endfunc
-
-func! polyglot#DetectHFiletype()
-  for lnum in range(1, min([line("$"), 200]))
-    let line = getline(lnum)
-    if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
-      if exists("g:c_syntax_for_h")
-        set ft=objc | return
-      endif
-      set ft=objcpp | return
-    endif
-  endfor
-  if exists("g:c_syntax_for_h")
-    set ft=c | return
-  endif
-  if exists("g:ch_syntax_for_h")
-    set ft=ch | return
-  endif
-  set ft=cpp | return
-endfunc
-
-func! polyglot#DetectMFiletype()
-  let saw_comment = 0
-  for lnum in range(1, min([line("$"), 100]))
-    let line = getline(lnum)
-    if line =~# '^\s*/\*'
-      let saw_comment = 1
-    endif
-    if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
-      set ft=objc | return
-    endif
-    if line =~# '^\s*%'
-      set ft=octave | return
-    endif
-    if line =~# '^\s*(\*'
-      set ft=mma | return
-    endif
-    if line =~? '^\s*\(\(type\|var\)\(\<\|\>\)\|--\)'
-      set ft=murphi | return
-    endif
-  endfor
-  if saw_comment
-    set ft=objc | return
-  endif
-  if exists("g:filetype_m")
-    let &ft = g:filetype_m | return
-  endif
-  set ft=octave | return
-endfunc
-
-func! polyglot#DetectFsFiletype()
-  for lnum in range(1, min([line("$"), 50]))
-    let line = getline(lnum)
-    if line =~# '^\(: \|new-device\)'
-      set ft=forth | return
-    endif
-    if line =~# '^\s*\(#light\|import\|let\|module\|namespace\|open\|type\)'
-      set ft=fsharp | return
-    endif
-    if line =~# '\s*\(#version\|precision\|uniform\|varying\|vec[234]\)'
-      set ft=glsl | return
-    endif
-  endfor
-  if exists("g:filetype_fs")
-    let &ft = g:filetype_fs | return
-  endif
-  set ft=forth | return
-endfunc
-
-func! polyglot#DetectReFiletype()
-  for lnum in range(1, min([line("$"), 50]))
-    let line = getline(lnum)
-    if line =~# '^\s*#\%(\%(if\|ifdef\|define\|pragma\)\s\+\w\|\s*include\s\+[<"]\|template\s*<\)'
-      set ft=cpp | return
-    endif
-    set ft=reason | return
-  endfor
-endfunc
-
-func! polyglot#DetectIdrFiletype()
-  for lnum in range(1, min([line("$"), 5]))
-    let line = getline(lnum)
-    if line =~# '^\s*--.*[Ii]dris \=1'
-      set ft=idris | return
-    endif
-    if line =~# '^\s*--.*[Ii]dris \=2'
-      set ft=idris2 | return
-    endif
-  endfor
-  for lnum in range(1, min([line("$"), 30]))
-    let line = getline(lnum)
-    if line =~# '^pkgs =.*'
-      set ft=idris | return
-    endif
-    if line =~# '^depends =.*'
-      set ft=idris2 | return
-    endif
-    if line =~# '^%language \(TypeProviders\|ElabReflection\)'
-      set ft=idris | return
-    endif
-    if line =~# '^%language PostfixProjections'
-      set ft=idris2 | return
-    endif
-    if line =~# '^%access .*'
-      set ft=idris | return
-    endif
-  endfor
-  if exists("g:filetype_idr")
-    let &ft = g:filetype_idr | return
-  endif
-  set ft=idris2 | return
-endfunc
-
-func! polyglot#DetectLidrFiletype()
-  for lnum in range(1, min([line("$"), 200]))
-    let line = getline(lnum)
-    if line =~# '^>\s*--.*[Ii]dris \=1'
-      set ft=lidris | return
-    endif
-  endfor
-  set ft=lidris2 | return
-endfunc
-
-func! polyglot#DetectBasFiletype()
-  for lnum in range(1, min([line("$"), 5]))
-    let line = getline(lnum)
-    if line =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
-      set ft=vb | return
-    endif
-  endfor
-  set ft=basic | return
-endfunc
-
-func! polyglot#DetectPmFiletype()
-  let line = getline(nextnonblank(1))
-  if line =~# 'XPM2'
-    set ft=xpm2 | return
-  endif
-  if line =~# 'XPM'
-    set ft=xpm | return
-  endif
-  for lnum in range(1, min([line("$"), 50]))
-    let line = getline(lnum)
-    if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
-      set ft=raku | return
-    endif
-    if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
-      set ft=perl | return
-    endif
-  endfor
-  if exists("g:filetype_pm")
-    let &ft = g:filetype_pm | return
-  endif
-  set ft=perl | return
-endfunc
-
-func! polyglot#DetectPlFiletype()
-  let line = getline(nextnonblank(1))
-  if line =~# '^[^#]*:-' || line =~# '^\s*\%(%\|/\*\)' || line =~# '\.\s*$'
-    set ft=prolog | return
-  endif
-  for lnum in range(1, min([line("$"), 50]))
-    let line = getline(lnum)
-    if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
-      set ft=raku | return
-    endif
-    if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
-      set ft=perl | return
-    endif
-  endfor
-  if exists("g:filetype_pl")
-    let &ft = g:filetype_pl | return
-  endif
-  set ft=perl | return
-endfunc
-
-func! polyglot#DetectTFiletype()
-  for lnum in range(1, min([line("$"), 5]))
-    let line = getline(lnum)
-    if line =~# '^\.'
-      set ft=nroff | return
-    endif
-  endfor
-  for lnum in range(1, min([line("$"), 50]))
-    let line = getline(lnum)
-    if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
-      set ft=raku | return
-    endif
-    if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
-      set ft=perl | return
-    endif
-  endfor
-  if exists("g:filetype_t")
-    let &ft = g:filetype_t | return
-  endif
-  set ft=perl | return
-endfunc
-
-func! polyglot#DetectTt2Filetype()
-  for lnum in range(1, min([line("$"), 3]))
-    let line = getline(lnum)
-    if line =~? '<\%(!DOCTYPE HTML\|[%?]\|html\)'
-      set ft=tt2html | return
-    endif
-  endfor
-  set ft=tt2 | return
-endfunc
-
-func! polyglot#DetectHtmlFiletype()
-  let line = getline(nextnonblank(1))
-  if line =~# '^\(%\|<[%&].*>\)'
-    set ft=mason | return
-  endif
-  for lnum in range(1, min([line("$"), 50]))
-    let line = getline(lnum)
-    if line =~# '{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\(\<\|\>\)\|{#\s\+'
-      set ft=htmldjango | return
-    endif
-    if line =~# '\(\<\|\>\)DTD\s\+XHTML\s'
-      set ft=xhtml | return
-    endif
-  endfor
-  set ft=html | au! BufWritePost <buffer> ++once call polyglot#DetectHtmlFiletype()
-  return
-endfunc
-
-
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-""" ftdetect/polyglot.vim
-
-" don't spam the user when Vim is started in Vi compatibility mode
-let s:cpo_save = &cpo
-set cpo&vim
-
-" Disable all native vim ftdetect
-if exists('g:polyglot_test')
-  autocmd!
-endif
-
-func! s:Observe(fn)
-  let b:polyglot_observe = a:fn
-  augroup polyglot-observer
-    au! CursorHold,CursorHoldI,BufWritePost <buffer>
-      \ execute('if polyglot#' . b:polyglot_observe . '() | au! polyglot-observer | endif')
-  augroup END
-endfunc
-
-let s:disabled_packages = {}
-let s:new_polyglot_disabled = []
-
-if exists('g:polyglot_disabled')
-  for pkg in g:polyglot_disabled
-    let base = split(pkg, '\.')
-    if len(base) > 0
-      let s:disabled_packages[pkg] = 1
-      call add(s:new_polyglot_disabled, base[0]) 
-    endif
-  endfor
-else
-  let g:polyglot_disabled_not_set = 1
-endif
-
-function! s:SetDefault(name, value)
-  if !exists(a:name)
-    let {a:name} = a:value
-  endif
-endfunction
-
-call s:SetDefault('g:markdown_enable_spell_checking', 0)
-call s:SetDefault('g:markdown_enable_input_abbreviations', 0)
-call s:SetDefault('g:markdown_enable_mappings', 0)
-
-" Enable jsx syntax by default
-call s:SetDefault('g:jsx_ext_required', 0)
-
-" Needed for sql highlighting
-call s:SetDefault('g:javascript_sql_dialect', 'sql')
-
-" Make csv loading faster
-call s:SetDefault('g:csv_start', 1)
-call s:SetDefault('g:csv_end', 2)
-
-" Disable json concealing by default
-call s:SetDefault('g:vim_json_syntax_conceal', 0)
-
-call s:SetDefault('g:filetype_euphoria', 'elixir')
-
-if !exists('g:python_highlight_all')
-  call s:SetDefault('g:python_highlight_builtins', 1)
-  call s:SetDefault('g:python_highlight_builtin_objs', 1)
-  call s:SetDefault('g:python_highlight_builtin_types', 1)
-  call s:SetDefault('g:python_highlight_builtin_funcs', 1)
-  call s:SetDefault('g:python_highlight_builtin_funcs_kwarg', 1)
-  call s:SetDefault('g:python_highlight_exceptions', 1)
-  call s:SetDefault('g:python_highlight_string_formatting', 1)
-  call s:SetDefault('g:python_highlight_string_format', 1)
-  call s:SetDefault('g:python_highlight_string_templates', 1)
-  call s:SetDefault('g:python_highlight_indent_errors', 1)
-  call s:SetDefault('g:python_highlight_space_errors', 1)
-  call s:SetDefault('g:python_highlight_doctests', 1)
-  call s:SetDefault('g:python_highlight_func_calls', 1)
-  call s:SetDefault('g:python_highlight_class_vars', 1)
-  call s:SetDefault('g:python_highlight_operators', 1)
-  call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
-  call s:SetDefault('g:python_slow_sync', 1)
-endif
-
-" We need it because scripts.vim in vim uses "set ft=" which cannot be
-" overridden with setf (and we can't use set ft= so our scripts.vim work)
-func! s:Setf(ft)
-  if &filetype !~# '\<'.a:ft.'\>'
-    let &filetype = a:ft
-  endif
-endfunc
-
-" Function used for patterns that end in a star: don't set the filetype if the
-" file name matches ft_ignore_pat.
-" When using this, the entry should probably be further down below with the
-" other StarSetf() calls.
-func! s:StarSetf(ft)
-  if expand("<amatch>") !~ g:ft_ignore_pat && &filetype !~# '\<'.a:ft.'\>'
-    let &filetype = a:ft
-  endif
-endfunc
-
-augroup filetypedetect
-
-" scripts/build inserts here filetype detection autocommands
-
-au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
-  \ call polyglot#Shebang() | endif
-
-au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
-      \ call s:Observe('Shebang') | endif
-
-augroup END
-
-if !has_key(s:disabled_packages, 'autoindent')
-  " Code below re-implements sleuth for vim-polyglot
-  let g:loaded_sleuth = 1
-  let g:loaded_foobar = 1
-
-  " Makes shiftwidth to be synchronized with tabstop by default
-  if &shiftwidth == &tabstop
-    let &shiftwidth = 0
-  endif
-
-  function! s:guess(lines) abort
-    let options = {}
-    let ccomment = 0
-    let podcomment = 0
-    let triplequote = 0
-    let backtick = 0
-    let xmlcomment = 0
-    let heredoc = ''
-    let minindent = 10
-    let spaces_minus_tabs = 0
-    let i = 0
-
-    for line in a:lines
-      let i += 1
-
-      if !len(line) || line =~# '^\W*$'
-        continue
-      endif
-
-      if line =~# '^\s*/\*'
-        let ccomment = 1
-      endif
-      if ccomment
-        if line =~# '\*/'
-          let ccomment = 0
-        endif
-        continue
-      endif
-
-      if line =~# '^=\w'
-        let podcomment = 1
-      endif
-      if podcomment
-        if line =~# '^=\%(end\|cut\)\>'
-          let podcomment = 0
-        endif
-        continue
-      endif
-
-      if triplequote
-        if line =~# '^[^"]*"""[^"]*$'
-          let triplequote = 0
-        endif
-        continue
-      elseif line =~# '^[^"]*"""[^"]*$'
-        let triplequote = 1
-      endif
-
-      if backtick
-        if line =~# '^[^`]*`[^`]*$'
-          let backtick = 0
-        endif
-        continue
-      elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
-        let backtick = 1
-      endif
-
-      if line =~# '^\s*<\!--'
-        let xmlcomment = 1
-      endif
-      if xmlcomment
-        if line =~# '-->'
-          let xmlcomment = 0
-        endif
-        continue
-      endif
-
-      " This is correct order because both "<<EOF" and "EOF" matches end
-      if heredoc != ''
-        if line =~# heredoc
-          let heredoc = ''
-        endif
-        continue
-      endif
-      let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
-      if len(herematch) > 0
-        let heredoc = herematch[1] . '$'
-      endif
-
-      let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
-
-      if line[0] == "\t"
-        setlocal noexpandtab
-        let &l:shiftwidth=&tabstop
-        let b:sleuth_culprit .= ':' . i
-        return 1
-      elseif line[0] == " "
-        let indent = len(matchstr(line, '^ *'))
-        if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
-          let minindent = indent
-        endif
-      endif
-    endfor
-
-    if minindent < 10
-      setlocal expandtab
-      let &l:shiftwidth=minindent
-      let b:sleuth_culprit .= ':' . i
-      return 1
-    endif
-
-    return 0
-  endfunction
-
-  function! s:detect_indent() abort
-    if &buftype ==# 'help'
-      return
-    endif
-
-    let b:sleuth_culprit = expand("<afile>:p")
-    if s:guess(getline(1, 32))
-      return
-    endif
-    let pattern = sleuth#GlobForFiletype(&filetype)
-    if len(pattern) == 0
-      return
-    endif
-    let pattern = '{' . pattern . ',.git,.svn,.hg}'
-    let dir = expand('%:p:h')
-    let level = 3
-    while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
-      " Ignore files from homedir and root 
-      if dir == expand('~') || dir == '/'
-        unlet b:sleuth_culprit
-        return
-      endif
-      for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
-        let b:sleuth_culprit = neighbor
-        " Do not consider directories above .git, .svn or .hg
-        if fnamemodify(neighbor, ":h:t")[0] == "."
-          let level = 0
-          continue
-        endif
-        if neighbor !=# expand('%:p') && filereadable(neighbor)
-          if s:guess(readfile(neighbor, '', 32))
-            return
-          endif
-        endif
-      endfor
-
-      let dir = fnamemodify(dir, ':h')
-      let level -= 1
-    endwhile
-
-    unlet b:sleuth_culprit
-  endfunction
-
-  setglobal smarttab
-
-  function! SleuthIndicator() abort
-    let sw = &shiftwidth ? &shiftwidth : &tabstop
-    if &expandtab
-      return 'sw='.sw
-    elseif &tabstop == sw
-      return 'ts='.&tabstop
-    else
-      return 'sw='.sw.',ts='.&tabstop
-    endif
-  endfunction
-
-  augroup polyglot-sleuth
-    au!
-    au FileType * call s:detect_indent()
-    au User Flags call Hoist('buffer', 5, 'SleuthIndicator')
-  augroup END
-
-  command! -bar -bang Sleuth call s:detect_indent()
-endif
-
-func! s:verify()
-  if exists("g:polyglot_disabled_not_set")
-    if exists("g:polyglot_disabled")
-      echohl WarningMsg
-      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
-      echohl None
-    endif
-
-    unlet g:polyglot_disabled_not_set
-  endif
-endfunc
-
-au VimEnter * call s:verify()
-
-" Save polyglot_disabled without postfixes
-if exists('g:polyglot_disabled')
-  let g:polyglot_disabled = s:new_polyglot_disabled
-endif
-
-" restore Vi compatibility settings
-let &cpo = s:cpo_save
\ No newline at end of file
diff --git a/autoload/polyglot/detect.vim b/autoload/polyglot/detect.vim
new file mode 100644
index 000000000..e92d4d127
--- /dev/null
+++ b/autoload/polyglot/detect.vim
@@ -0,0 +1,262 @@
+func! polyglot#detect#Inp()
+  let line = getline(nextnonblank(1))
+  if line =~# '^\*'
+    set ft=abaqus | return
+  endif
+  for lnum in range(1, min([line("$"), 500]))
+    let line = getline(lnum)
+    if line =~? '^header surface data'
+      set ft=trasys | return
+    endif
+  endfor
+endfunc
+
+func! polyglot#detect#Asa()
+  if exists("g:filetype_asa")
+    let &ft = g:filetype_asa | return
+  endif
+  set ft=aspvbs | return
+endfunc
+
+func! polyglot#detect#Asp()
+  if exists("g:filetype_asp")
+    let &ft = g:filetype_asp | return
+  endif
+  for lnum in range(1, min([line("$"), 3]))
+    let line = getline(lnum)
+    if line =~? 'perlscript'
+      set ft=aspperl | return
+    endif
+  endfor
+  set ft=aspvbs | return
+endfunc
+
+func! polyglot#detect#H()
+  for lnum in range(1, min([line("$"), 200]))
+    let line = getline(lnum)
+    if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
+      if exists("g:c_syntax_for_h")
+        set ft=objc | return
+      endif
+      set ft=objcpp | return
+    endif
+  endfor
+  if exists("g:c_syntax_for_h")
+    set ft=c | return
+  endif
+  if exists("g:ch_syntax_for_h")
+    set ft=ch | return
+  endif
+  set ft=cpp | return
+endfunc
+
+func! polyglot#detect#M()
+  let saw_comment = 0
+  for lnum in range(1, min([line("$"), 100]))
+    let line = getline(lnum)
+    if line =~# '^\s*/\*'
+      let saw_comment = 1
+    endif
+    if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
+      set ft=objc | return
+    endif
+    if line =~# '^\s*%'
+      set ft=octave | return
+    endif
+    if line =~# '^\s*(\*'
+      set ft=mma | return
+    endif
+    if line =~? '^\s*\(\(type\|var\)\(\<\|\>\)\|--\)'
+      set ft=murphi | return
+    endif
+  endfor
+  if saw_comment
+    set ft=objc | return
+  endif
+  if exists("g:filetype_m")
+    let &ft = g:filetype_m | return
+  endif
+  set ft=octave | return
+endfunc
+
+func! polyglot#detect#Fs()
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '^\(: \|new-device\)'
+      set ft=forth | return
+    endif
+    if line =~# '^\s*\(#light\|import\|let\|module\|namespace\|open\|type\)'
+      set ft=fsharp | return
+    endif
+    if line =~# '\s*\(#version\|precision\|uniform\|varying\|vec[234]\)'
+      set ft=glsl | return
+    endif
+  endfor
+  if exists("g:filetype_fs")
+    let &ft = g:filetype_fs | return
+  endif
+  set ft=forth | return
+endfunc
+
+func! polyglot#detect#Re()
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '^\s*#\%(\%(if\|ifdef\|define\|pragma\)\s\+\w\|\s*include\s\+[<"]\|template\s*<\)'
+      set ft=cpp | return
+    endif
+    set ft=reason | return
+  endfor
+endfunc
+
+func! polyglot#detect#Idr()
+  for lnum in range(1, min([line("$"), 5]))
+    let line = getline(lnum)
+    if line =~# '^\s*--.*[Ii]dris \=1'
+      set ft=idris | return
+    endif
+    if line =~# '^\s*--.*[Ii]dris \=2'
+      set ft=idris2 | return
+    endif
+  endfor
+  for lnum in range(1, min([line("$"), 30]))
+    let line = getline(lnum)
+    if line =~# '^pkgs =.*'
+      set ft=idris | return
+    endif
+    if line =~# '^depends =.*'
+      set ft=idris2 | return
+    endif
+    if line =~# '^%language \(TypeProviders\|ElabReflection\)'
+      set ft=idris | return
+    endif
+    if line =~# '^%language PostfixProjections'
+      set ft=idris2 | return
+    endif
+    if line =~# '^%access .*'
+      set ft=idris | return
+    endif
+  endfor
+  if exists("g:filetype_idr")
+    let &ft = g:filetype_idr | return
+  endif
+  set ft=idris2 | return
+endfunc
+
+func! polyglot#detect#Lidr()
+  for lnum in range(1, min([line("$"), 200]))
+    let line = getline(lnum)
+    if line =~# '^>\s*--.*[Ii]dris \=1'
+      set ft=lidris | return
+    endif
+  endfor
+  set ft=lidris2 | return
+endfunc
+
+func! polyglot#detect#Bas()
+  for lnum in range(1, min([line("$"), 5]))
+    let line = getline(lnum)
+    if line =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
+      set ft=vb | return
+    endif
+  endfor
+  set ft=basic | return
+endfunc
+
+func! polyglot#detect#Pm()
+  let line = getline(nextnonblank(1))
+  if line =~# 'XPM2'
+    set ft=xpm2 | return
+  endif
+  if line =~# 'XPM'
+    set ft=xpm | return
+  endif
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
+      set ft=raku | return
+    endif
+    if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
+      set ft=perl | return
+    endif
+  endfor
+  if exists("g:filetype_pm")
+    let &ft = g:filetype_pm | return
+  endif
+  if polyglot#shebang#Detect() | return | endif
+  set ft=perl | au! BufWritePost <buffer> ++once call polyglot#detect#Pm()
+  return
+endfunc
+
+func! polyglot#detect#Pl()
+  let line = getline(nextnonblank(1))
+  if line =~# '^[^#]*:-' || line =~# '^\s*\%(%\|/\*\)' || line =~# '\.\s*$'
+    set ft=prolog | return
+  endif
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
+      set ft=raku | return
+    endif
+    if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
+      set ft=perl | return
+    endif
+  endfor
+  if exists("g:filetype_pl")
+    let &ft = g:filetype_pl | return
+  endif
+  if polyglot#shebang#Detect() | return | endif
+  set ft=perl | au! BufWritePost <buffer> ++once call polyglot#detect#Pl()
+  return
+endfunc
+
+func! polyglot#detect#T()
+  for lnum in range(1, min([line("$"), 5]))
+    let line = getline(lnum)
+    if line =~# '^\.'
+      set ft=nroff | return
+    endif
+  endfor
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
+      set ft=raku | return
+    endif
+    if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
+      set ft=perl | return
+    endif
+  endfor
+  if exists("g:filetype_t")
+    let &ft = g:filetype_t | return
+  endif
+  if polyglot#shebang#Detect() | return | endif
+  set ft=perl | au! BufWritePost <buffer> ++once call polyglot#detect#T()
+  return
+endfunc
+
+func! polyglot#detect#Tt2()
+  for lnum in range(1, min([line("$"), 3]))
+    let line = getline(lnum)
+    if line =~? '<\%(!DOCTYPE HTML\|[%?]\|html\)'
+      set ft=tt2html | return
+    endif
+  endfor
+  set ft=tt2 | return
+endfunc
+
+func! polyglot#detect#Html()
+  let line = getline(nextnonblank(1))
+  if line =~# '^\(%\|<[%&].*>\)'
+    set ft=mason | return
+  endif
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\(\<\|\>\)\|{#\s\+'
+      set ft=htmldjango | return
+    endif
+    if line =~# '\(\<\|\>\)DTD\s\+XHTML\s'
+      set ft=xhtml | return
+    endif
+  endfor
+  set ft=html | au! BufWritePost <buffer> ++once call polyglot#detect#Html()
+  return
+endfunc
diff --git a/autoload/polyglot/shebang.vim b/autoload/polyglot/shebang.vim
new file mode 100644
index 000000000..bf2a793a2
--- /dev/null
+++ b/autoload/polyglot/shebang.vim
@@ -0,0 +1,129 @@
+" Please do not edit this file directly, instead modify polyglot.vim or scripts/build
+
+func! polyglot#shebang#Detect()
+  let ft = s:Filetype()
+  if ft != ""
+    let &ft = ft
+  endif
+
+  if &ft == ""
+    runtime! scripts.vim
+  endif
+
+  return &ft != ""
+endfunc
+
+let s:r_hashbang = '^#!\s*\(\S\+\)\s*\(.*\)\s*'
+let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
+let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
+
+func! s:Filetype()
+  let l:line1 = getline(1)
+
+  if l:line1 !~# "^#!"
+    return
+  endif
+
+  let l:pathrest = matchlist(l:line1, s:r_hashbang)
+
+  if len(l:pathrest) == 0
+    return
+  endif
+
+  let [_, l:path, l:rest; __] = l:pathrest
+
+  let l:script = split(l:path, "/")[-1]
+
+  if l:script == "env"
+    let l:argspath = matchlist(l:rest, s:r_env)
+    if len(l:argspath) == 0
+      return
+    endif
+
+    let l:script = l:argspath[1]
+  endif
+
+  if has_key(s:interpreters, l:script)
+    return s:interpreters[l:script]
+  endif
+
+  for interpreter in keys(s:interpreters)
+    if l:script =~# '^' . interpreter
+      return s:interpreters[interpreter]
+    endif
+  endfor
+endfunc
+
+
+
+let s:interpreters = {
+  \ 'osascript': 'applescript',
+  \ 'tcc': 'c',
+  \ 'coffee': 'coffee',
+  \ 'crystal': 'crystal',
+  \ 'dart': 'dart',
+  \ 'elixir': 'elixir',
+  \ 'escript': 'erlang',
+  \ 'fish': 'fish',
+  \ 'gnuplot': 'gnuplot',
+  \ 'groovy': 'groovy',
+  \ 'runhaskell': 'haskell',
+  \ 'chakra': 'javascript',
+  \ 'd8': 'javascript',
+  \ 'gjs': 'javascript',
+  \ 'js': 'javascript',
+  \ 'node': 'javascript',
+  \ 'nodejs': 'javascript',
+  \ 'qjs': 'javascript',
+  \ 'rhino': 'javascript',
+  \ 'v8': 'javascript',
+  \ 'v8-shell': 'javascript',
+  \ 'julia': 'julia',
+  \ 'lua': 'lua',
+  \ 'moon': 'moon',
+  \ 'ocaml': 'ocaml',
+  \ 'ocamlrun': 'ocaml',
+  \ 'ocamlscript': 'ocaml',
+  \ 'cperl': 'perl',
+  \ 'perl': 'perl',
+  \ 'php': 'php',
+  \ 'swipl': 'prolog',
+  \ 'yap': 'prolog',
+  \ 'pwsh': 'ps1',
+  \ 'python': 'python',
+  \ 'python2': 'python',
+  \ 'python3': 'python',
+  \ 'qmake': 'qmake',
+  \ 'Rscript': 'r',
+  \ 'racket': 'racket',
+  \ 'perl6': 'raku',
+  \ 'raku': 'raku',
+  \ 'rakudo': 'raku',
+  \ 'ruby': 'ruby',
+  \ 'macruby': 'ruby',
+  \ 'rake': 'ruby',
+  \ 'jruby': 'ruby',
+  \ 'rbx': 'ruby',
+  \ 'scala': 'scala',
+  \ 'ash': 'sh',
+  \ 'bash': 'sh',
+  \ 'dash': 'sh',
+  \ 'ksh': 'sh',
+  \ 'mksh': 'sh',
+  \ 'pdksh': 'sh',
+  \ 'rc': 'sh',
+  \ 'sh': 'sh',
+  \ 'zsh': 'sh',
+  \ 'boolector': 'smt2',
+  \ 'cvc4': 'smt2',
+  \ 'mathsat5': 'smt2',
+  \ 'opensmt': 'smt2',
+  \ 'smtinterpol': 'smt2',
+  \ 'smt-rat': 'smt2',
+  \ 'stp': 'smt2',
+  \ 'verit': 'smt2',
+  \ 'yices2': 'smt2',
+  \ 'z3': 'smt2',
+  \ 'deno': 'typescript',
+  \ 'ts-node': 'typescript',
+  \ }
\ No newline at end of file
diff --git a/autoload/sleuth.vim b/autoload/polyglot/sleuth.vim
similarity index 99%
rename from autoload/sleuth.vim
rename to autoload/polyglot/sleuth.vim
index 3a41f6f9d..d74de687f 100644
--- a/autoload/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -232,6 +232,6 @@ let s:globs = {
   \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks,.zsh*',
   \}
 
-func! sleuth#GlobForFiletype(type)
+func! polyglot#sleuth#GlobForFiletype(type)
   return get(s:globs, a:type, '')
 endfunc
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 0d9fd370e..c96760a7c 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -128,7 +128,7 @@ if !has_key(s:disabled_packages, 'abap')
 endif
 
 if !has_key(s:disabled_packages, 'abaqus')
-  au! BufNewFile,BufRead *.inp call polyglot#DetectInpFiletype()
+  au! BufNewFile,BufRead *.inp call polyglot#detect#Inp()
 endif
 
 if !has_key(s:disabled_packages, 'abc')
@@ -215,7 +215,7 @@ if !has_key(s:disabled_packages, 'arch')
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
-  au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
+  au! BufNewFile,BufRead *.h call polyglot#detect#H()
   au! BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg set ft=c
   au! BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp set ft=cpp
 endif
@@ -249,12 +249,12 @@ if !has_key(s:disabled_packages, 'asn')
 endif
 
 if !has_key(s:disabled_packages, 'aspvbs')
-  au! BufNewFile,BufRead *.asp call polyglot#DetectAspFiletype()
-  au! BufNewFile,BufRead *.asa call polyglot#DetectAsaFiletype()
+  au! BufNewFile,BufRead *.asp call polyglot#detect#Asp()
+  au! BufNewFile,BufRead *.asa call polyglot#detect#Asa()
 endif
 
 if !has_key(s:disabled_packages, 'aspperl')
-  au! BufNewFile,BufRead *.asp call polyglot#DetectAspFiletype()
+  au! BufNewFile,BufRead *.asp call polyglot#detect#Asp()
 endif
 
 if !has_key(s:disabled_packages, 'atlas')
@@ -381,12 +381,12 @@ if !has_key(s:disabled_packages, 'flatbuffers')
 endif
 
 if !has_key(s:disabled_packages, 'forth')
-  au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
+  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
   au! BufNewFile,BufRead *.ft,*.fth set ft=forth
 endif
 
 if !has_key(s:disabled_packages, 'fsharp')
-  au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
+  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
   au! BufNewFile,BufRead *.fsi,*.fsx set ft=fsharp
 endif
 
@@ -403,7 +403,7 @@ if !has_key(s:disabled_packages, 'git')
 endif
 
 if !has_key(s:disabled_packages, 'glsl')
-  au! BufNewFile,BufRead *.fs call polyglot#DetectFsFiletype()
+  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
   au! BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl
 endif
 
@@ -471,7 +471,7 @@ if !has_key(s:disabled_packages, 'hive')
 endif
 
 if !has_key(s:disabled_packages, 'html5')
-  au! BufNewFile,BufRead *.html call polyglot#DetectHtmlFiletype()
+  au! BufNewFile,BufRead *.html call polyglot#detect#Html()
   au! BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml set ft=html
 endif
 
@@ -484,14 +484,14 @@ if !has_key(s:disabled_packages, 'icalendar')
 endif
 
 if !has_key(s:disabled_packages, 'idris')
-  au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
-  au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
+  au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
+  au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
   au! BufNewFile,BufRead idris-response set ft=idris
 endif
 
 if !has_key(s:disabled_packages, 'idris2')
-  au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
-  au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
+  au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
+  au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
   au! BufNewFile,BufRead *.ipkg,idris-response set ft=idris2
 endif
 
@@ -582,7 +582,7 @@ if !has_key(s:disabled_packages, 'mako')
 endif
 
 if !has_key(s:disabled_packages, 'mathematica')
-  au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
+  au! BufNewFile,BufRead *.m call polyglot#detect#M()
   au! BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt set ft=mma
 endif
 
@@ -604,7 +604,7 @@ if !has_key(s:disabled_packages, 'moonscript')
 endif
 
 if !has_key(s:disabled_packages, 'murphi')
-  au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
+  au! BufNewFile,BufRead *.m call polyglot#detect#M()
 endif
 
 if !has_key(s:disabled_packages, 'nginx')
@@ -622,8 +622,8 @@ if !has_key(s:disabled_packages, 'nix')
 endif
 
 if !has_key(s:disabled_packages, 'objc')
-  au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
-  au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
+  au! BufNewFile,BufRead *.m call polyglot#detect#M()
+  au! BufNewFile,BufRead *.h call polyglot#detect#H()
 endif
 
 if !has_key(s:disabled_packages, 'ocaml')
@@ -639,7 +639,7 @@ if !has_key(s:disabled_packages, 'ocaml')
 endif
 
 if !has_key(s:disabled_packages, 'octave')
-  au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
+  au! BufNewFile,BufRead *.m call polyglot#detect#M()
   au! BufNewFile,BufRead *.oct set ft=octave
 endif
 
@@ -648,10 +648,10 @@ if !has_key(s:disabled_packages, 'opencl')
 endif
 
 if !has_key(s:disabled_packages, 'perl')
-  au! BufNewFile,BufRead *.tt2 call polyglot#DetectTt2Filetype()
-  au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
-  au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
-  au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
+  au! BufNewFile,BufRead *.tt2 call polyglot#detect#Tt2()
+  au! BufNewFile,BufRead *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
   au! BufNewFile,BufRead *.xs set ft=xs
   au! BufNewFile,BufRead *.comp,*.mason,*.mhtml set ft=mason
   au! BufNewFile,BufRead *.pod set ft=pod
@@ -740,9 +740,9 @@ if !has_key(s:disabled_packages, 'ragel')
 endif
 
 if !has_key(s:disabled_packages, 'raku')
-  au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
-  au! BufNewFile,BufRead *.pm call polyglot#DetectPmFiletype()
-  au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
+  au! BufNewFile,BufRead *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
   au! BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 set ft=raku
 endif
 
@@ -755,7 +755,7 @@ if !has_key(s:disabled_packages, 'razor')
 endif
 
 if !has_key(s:disabled_packages, 'reason')
-  au! BufNewFile,BufRead *.re call polyglot#DetectReFiletype()
+  au! BufNewFile,BufRead *.re call polyglot#detect#Re()
   au! BufNewFile,BufRead *.rei set ft=reason
 endif
 
@@ -949,7 +949,7 @@ if !has_key(s:disabled_packages, 'zig')
 endif
 
 if !has_key(s:disabled_packages, 'trasys')
-  au! BufNewFile,BufRead *.inp call polyglot#DetectInpFiletype()
+  au! BufNewFile,BufRead *.inp call polyglot#detect#Inp()
 endif
 
 if !has_key(s:disabled_packages, 'basic')
@@ -957,7 +957,7 @@ if !has_key(s:disabled_packages, 'basic')
 endif
 
 if !has_key(s:disabled_packages, 'visual-basic')
-  au! BufNewFile,BufRead *.bas call polyglot#DetectBasFiletype()
+  au! BufNewFile,BufRead *.bas call polyglot#detect#Bas()
   au! BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs set ft=vb
 endif
 
@@ -976,12 +976,12 @@ if !has_key(s:disabled_packages, 'bzl')
 endif
 
 if !has_key(s:disabled_packages, 'prolog')
-  au! BufNewFile,BufRead *.pl call polyglot#DetectPlFiletype()
+  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
   au! BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap set ft=prolog
 endif
 
 if !has_key(s:disabled_packages, 'tads')
-  au! BufNewFile,BufRead *.t call polyglot#DetectTFiletype()
+  au! BufNewFile,BufRead *.t call polyglot#detect#T()
 endif
 
 if !has_key(s:disabled_packages, 'gitignore')
@@ -994,11 +994,11 @@ endif
 
 
 
-au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
-  \ call polyglot#Shebang() | endif
+au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>:e") == "" |
+  \ call polyglot#shebang#Detect() | endif
 
-au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
-      \ call s:Observe('Shebang') | endif
+au BufEnter * if &ft == "" && expand("<afile>:e") == ""  |
+      \ call s:Observe('shebang#Detect') | endif
 
 augroup END
 
@@ -1125,7 +1125,7 @@ if !has_key(s:disabled_packages, 'autoindent')
     if s:guess(getline(1, 32))
       return
     endif
-    let pattern = sleuth#GlobForFiletype(&filetype)
+    let pattern = polyglot#sleuth#GlobForFiletype(&filetype)
     if len(pattern) == 0
       return
     endif
@@ -1201,4 +1201,5 @@ if exists('g:polyglot_disabled')
 endif
 
 " restore Vi compatibility settings
-let &cpo = s:cpo_save
\ No newline at end of file
+let &cpo = s:cpo_save
+
diff --git a/heuristics.yaml b/heuristics.yaml
index 129734f8e..4080cbc44 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -132,6 +132,8 @@ rules:
     filetype: perl
 - override: true
 - filetype: perl
+  shebang: true
+  fallback: true
 ---
 extensions: [pl]
 rules:
@@ -149,6 +151,8 @@ rules:
     filetype: perl
 - override: true
 - filetype: perl
+  shebang: true
+  fallback: true
 ---
 extensions: [t]
 rules:
@@ -166,6 +170,8 @@ rules:
   #   filetype: turing
 - override: true
 - filetype: perl
+  shebang: true
+  fallback: true
 ---
 extensions: [tt2]
 rules:
diff --git a/polyglot.vim b/polyglot.vim
index e86e62ef2..7c922d09c 100644
--- a/polyglot.vim
+++ b/polyglot.vim
@@ -1,15 +1,9 @@
-""" autoload/polyglot.vim
+""" autoload/polyglot/shebang.vim
 
-" Line continuation is used here, remove 'C' from 'cpoptions'
-let s:cpo_save = &cpo
-set cpo&vim
-
-func! polyglot#Shebang()
-  if getline(1) =~# "^#!"
-    let ft = polyglot#ShebangFiletype()
-    if ft != ""
-      let &ft = ft
-    endif
+func! polyglot#shebang#Detect()
+  let ft = s:Filetype()
+  if ft != ""
+    let &ft = ft
   endif
 
   if &ft == ""
@@ -23,7 +17,7 @@ let s:r_hashbang = '^#!\s*\(\S\+\)\s*\(.*\)\s*'
 let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
 let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
 
-func! polyglot#ShebangFiletype()
+func! s:Filetype()
   let l:line1 = getline(1)
 
   if l:line1 !~# "^#!"
@@ -60,12 +54,6 @@ func! polyglot#ShebangFiletype()
   endfor
 endfunc
 
-" scripts/build generates heuristics functions here
-
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
 """ ftdetect/polyglot.vim
 
 " don't spam the user when Vim is started in Vi compatibility mode
@@ -167,11 +155,11 @@ augroup filetypedetect
 
 " scripts/build inserts here filetype detection autocommands
 
-au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
-  \ call polyglot#Shebang() | endif
+au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>:e") == "" |
+  \ call polyglot#shebang#Detect() | endif
 
-au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
-      \ call s:Observe('Shebang') | endif
+au BufEnter * if &ft == "" && expand("<afile>:e") == ""  |
+      \ call s:Observe('shebang#Detect') | endif
 
 augroup END
 
@@ -298,7 +286,7 @@ if !has_key(s:disabled_packages, 'autoindent')
     if s:guess(getline(1, 32))
       return
     endif
-    let pattern = sleuth#GlobForFiletype(&filetype)
+    let pattern = polyglot#sleuth#GlobForFiletype(&filetype)
     if len(pattern) == 0
       return
     endif
diff --git a/scripts/build b/scripts/build
index 2e767b9b3..3ec5b50cb 100755
--- a/scripts/build
+++ b/scripts/build
@@ -13,8 +13,11 @@ Dir.chdir(File.dirname(__dir__))
 BASE_URL = 'https://raw.githubusercontent.com/github/linguist/master'
 
 def read_section(name)
-  "\" Please do not edit this file directly, instead modify polyglot.vim or scripts/build\n\n" +
-  File.read('polyglot.vim').match(/""" #{Regexp.escape(name)}\n*(.*)\n(?=\n""")/m)[1]
+  section = File.read('polyglot.vim').split('""" ').find { |e| e.start_with?(name) }
+  if section.nil?
+    raise StandardError.new("Section not found: #{name}")
+  end
+  "\" Please do not edit this file directly, instead modify polyglot.vim or scripts/build\n" + section[(section.index("\n") + 1)..-1]
 end
 
 def camelize(str)
@@ -390,10 +393,17 @@ def rule_to_code(rule)
     EOS
   end
 
+  if rule.has_key?("shebang")
+    return <<~EOS
+      if polyglot#shebang#Detect() | return | endif
+      #{indent(rule_to_code(except(rule, "shebang")), 0)}
+    EOS
+  end
+
   if rule.has_key?("filetype")
     if rule.has_key?("fallback")
       return <<~EOS
-        set ft=#{rule["filetype"]} | au! BufWritePost <buffer> ++once call polyglot#Detect#{camelize(rule["extensions"].first)}Filetype()
+        set ft=#{rule["filetype"]} | au! BufWritePost <buffer> ++once call polyglot#detect##{camelize(rule["extensions"].first)}()
         return
       EOS
     end
@@ -489,6 +499,8 @@ def extract(packages)
 end
 
 def generate_ftdetect(packages, heuristics)
+  FileUtils.mkdir_p('autoload/polyglot')
+
   output = "\n"
 
   all_filetypes = packages.flat_map { |f| f["filetypes"] || [] }
@@ -561,7 +573,7 @@ def generate_ftdetect(packages, heuristics)
 
     for heuristic in package_heuristics.uniq
       extensions = heuristic["extensions"].map { |e| "*.#{e}" }
-      autocommands << "  au! BufNewFile,BufRead #{extensions.join(",")} call polyglot#Detect#{camelize(heuristic["extensions"].first)}Filetype()\n"
+      autocommands << "  au! BufNewFile,BufRead #{extensions.join(",")} call polyglot#detect##{camelize(heuristic["extensions"].first)}()\n"
     end
 
     if autocommands != ""
@@ -580,6 +592,18 @@ def generate_ftdetect(packages, heuristics)
      ftdetect.gsub('" scripts/build inserts here filetype detection autocommands') { output }
   )
 
+  output = []
+
+  for heuristic in heuristics
+    output << <<~EOS
+      func! polyglot#detect##{camelize(heuristic["extensions"].first)}()
+      #{indent(rules_to_code(heuristic), 2)}
+      endfunc
+    EOS
+  end
+
+  File.write('autoload/polyglot/detect.vim', output.join("\n"))
+
   output = <<~EOS
     let s:interpreters = {
     EOS
@@ -590,24 +614,10 @@ def generate_ftdetect(packages, heuristics)
       end
     end
 
-  output << <<~EOS
-      \\ }
-
-  EOS
-
-  for heuristic in heuristics
-    output << <<~EOS
-      func! polyglot#Detect#{camelize(heuristic["extensions"].first)}Filetype()
-      #{indent(rules_to_code(heuristic), 2)}
-      endfunc
-
-    EOS
-  end
-
-  autoload_script = read_section('autoload/polyglot.vim')
-  autoload_script["\" scripts/build generates heuristics functions here\n"] = output
+  output << "  \\ }"
 
-  File.write('autoload/polyglot.vim', autoload_script)
+  autoload_script = read_section('autoload/polyglot/shebang.vim')
+  File.write('autoload/polyglot/shebang.vim', autoload_script + "\n\n" + output)
 end
 
 def generate_tests(packages)
@@ -744,13 +754,13 @@ def generate_plugins(packages)
 
 
   output << <<~EOS
-    func! sleuth#GlobForFiletype(type)
+    func! polyglot#sleuth#GlobForFiletype(type)
       return get(s:globs, a:type, '')
     endfunc
   EOS
 
 
-  File.write('autoload/sleuth.vim', output)
+  File.write('autoload/polyglot/sleuth.vim', output)
 end
 
 def process_list(list, extras)
diff --git a/tests/extensions.vim b/tests/extensions.vim
index 16548eb83..6492e1ac8 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -30,6 +30,7 @@ call TestExtension("sh", "bash3", "#! /bin/bash2.3")
 call TestExtension("sh", "bash4", "#!/usr/bin/env bash")
 call TestExtension("sh", "bash6", "#!/usr/bin/env -i -=split-string foo=bar bash -l foo")
 call TestExtension("sh", "bash1", "#!/bin/bash")
+call TestExtension("sh", "bash7", ":")
 
 " Vim help file
 call TestExtension("help", $VIMRUNTIME . "/doc/foobar.txt", "")

From c1aac2e2794006d035c8bb9a8c7037b78e8ecbba Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Sep 2020 23:36:28 +0200
Subject: [PATCH 093/299] Deduplicate polyglot files

---
 autoload/polyglot/detect.vim  |   2 +
 autoload/polyglot/shebang.vim |   6 +-
 autoload/polyglot/sleuth.vim  |   2 +
 ftdetect/polyglot.vim         |   3 +-
 polyglot.vim                  | 367 ----------------------------------
 scripts/build                 |  42 ++--
 6 files changed, 34 insertions(+), 388 deletions(-)
 delete mode 100644 polyglot.vim

diff --git a/autoload/polyglot/detect.vim b/autoload/polyglot/detect.vim
index e92d4d127..53086c4ea 100644
--- a/autoload/polyglot/detect.vim
+++ b/autoload/polyglot/detect.vim
@@ -1,3 +1,5 @@
+" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
+
 func! polyglot#detect#Inp()
   let line = getline(nextnonblank(1))
   if line =~# '^\*'
diff --git a/autoload/polyglot/shebang.vim b/autoload/polyglot/shebang.vim
index bf2a793a2..72c56f6fc 100644
--- a/autoload/polyglot/shebang.vim
+++ b/autoload/polyglot/shebang.vim
@@ -1,5 +1,3 @@
-" Please do not edit this file directly, instead modify polyglot.vim or scripts/build
-
 func! polyglot#shebang#Detect()
   let ft = s:Filetype()
   if ft != ""
@@ -54,7 +52,7 @@ func! s:Filetype()
   endfor
 endfunc
 
-
+" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
 let s:interpreters = {
   \ 'osascript': 'applescript',
@@ -126,4 +124,4 @@ let s:interpreters = {
   \ 'z3': 'smt2',
   \ 'deno': 'typescript',
   \ 'ts-node': 'typescript',
-  \ }
\ No newline at end of file
+  \ }
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index d74de687f..0c3c34e81 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -1,3 +1,5 @@
+" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
+
 let s:globs = {
   \ '8th': '*.8th',
   \ 'Dockerfile': '*.dockerfile,*.dock,*.Dockerfile,Dockerfile,dockerfile,Dockerfile*',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index c96760a7c..52323e920 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -97,6 +97,7 @@ endfunc
 
 augroup filetypedetect
 
+" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
 if !has_key(s:disabled_packages, '8th')
   au! BufNewFile,BufRead *.8th set ft=8th
@@ -992,7 +993,7 @@ if !has_key(s:disabled_packages, 'sql')
   au! BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw set ft=sql
 endif
 
-
+" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 
 au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>:e") == "" |
   \ call polyglot#shebang#Detect() | endif
diff --git a/polyglot.vim b/polyglot.vim
deleted file mode 100644
index 7c922d09c..000000000
--- a/polyglot.vim
+++ /dev/null
@@ -1,367 +0,0 @@
-""" autoload/polyglot/shebang.vim
-
-func! polyglot#shebang#Detect()
-  let ft = s:Filetype()
-  if ft != ""
-    let &ft = ft
-  endif
-
-  if &ft == ""
-    runtime! scripts.vim
-  endif
-
-  return &ft != ""
-endfunc
-
-let s:r_hashbang = '^#!\s*\(\S\+\)\s*\(.*\)\s*'
-let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
-let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
-
-func! s:Filetype()
-  let l:line1 = getline(1)
-
-  if l:line1 !~# "^#!"
-    return
-  endif
-
-  let l:pathrest = matchlist(l:line1, s:r_hashbang)
-
-  if len(l:pathrest) == 0
-    return
-  endif
-
-  let [_, l:path, l:rest; __] = l:pathrest
-
-  let l:script = split(l:path, "/")[-1]
-
-  if l:script == "env"
-    let l:argspath = matchlist(l:rest, s:r_env)
-    if len(l:argspath) == 0
-      return
-    endif
-
-    let l:script = l:argspath[1]
-  endif
-
-  if has_key(s:interpreters, l:script)
-    return s:interpreters[l:script]
-  endif
-
-  for interpreter in keys(s:interpreters)
-    if l:script =~# '^' . interpreter
-      return s:interpreters[interpreter]
-    endif
-  endfor
-endfunc
-
-""" ftdetect/polyglot.vim
-
-" don't spam the user when Vim is started in Vi compatibility mode
-let s:cpo_save = &cpo
-set cpo&vim
-
-" Disable all native vim ftdetect
-if exists('g:polyglot_test')
-  autocmd!
-endif
-
-func! s:Observe(fn)
-  let b:polyglot_observe = a:fn
-  augroup polyglot-observer
-    au! CursorHold,CursorHoldI,BufWritePost <buffer>
-      \ execute('if polyglot#' . b:polyglot_observe . '() | au! polyglot-observer | endif')
-  augroup END
-endfunc
-
-let s:disabled_packages = {}
-let s:new_polyglot_disabled = []
-
-if exists('g:polyglot_disabled')
-  for pkg in g:polyglot_disabled
-    let base = split(pkg, '\.')
-    if len(base) > 0
-      let s:disabled_packages[pkg] = 1
-      call add(s:new_polyglot_disabled, base[0]) 
-    endif
-  endfor
-else
-  let g:polyglot_disabled_not_set = 1
-endif
-
-function! s:SetDefault(name, value)
-  if !exists(a:name)
-    let {a:name} = a:value
-  endif
-endfunction
-
-call s:SetDefault('g:markdown_enable_spell_checking', 0)
-call s:SetDefault('g:markdown_enable_input_abbreviations', 0)
-call s:SetDefault('g:markdown_enable_mappings', 0)
-
-" Enable jsx syntax by default
-call s:SetDefault('g:jsx_ext_required', 0)
-
-" Needed for sql highlighting
-call s:SetDefault('g:javascript_sql_dialect', 'sql')
-
-" Make csv loading faster
-call s:SetDefault('g:csv_start', 1)
-call s:SetDefault('g:csv_end', 2)
-
-" Disable json concealing by default
-call s:SetDefault('g:vim_json_syntax_conceal', 0)
-
-call s:SetDefault('g:filetype_euphoria', 'elixir')
-
-if !exists('g:python_highlight_all')
-  call s:SetDefault('g:python_highlight_builtins', 1)
-  call s:SetDefault('g:python_highlight_builtin_objs', 1)
-  call s:SetDefault('g:python_highlight_builtin_types', 1)
-  call s:SetDefault('g:python_highlight_builtin_funcs', 1)
-  call s:SetDefault('g:python_highlight_builtin_funcs_kwarg', 1)
-  call s:SetDefault('g:python_highlight_exceptions', 1)
-  call s:SetDefault('g:python_highlight_string_formatting', 1)
-  call s:SetDefault('g:python_highlight_string_format', 1)
-  call s:SetDefault('g:python_highlight_string_templates', 1)
-  call s:SetDefault('g:python_highlight_indent_errors', 1)
-  call s:SetDefault('g:python_highlight_space_errors', 1)
-  call s:SetDefault('g:python_highlight_doctests', 1)
-  call s:SetDefault('g:python_highlight_func_calls', 1)
-  call s:SetDefault('g:python_highlight_class_vars', 1)
-  call s:SetDefault('g:python_highlight_operators', 1)
-  call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
-  call s:SetDefault('g:python_slow_sync', 1)
-endif
-
-" We need it because scripts.vim in vim uses "set ft=" which cannot be
-" overridden with setf (and we can't use set ft= so our scripts.vim work)
-func! s:Setf(ft)
-  if &filetype !~# '\<'.a:ft.'\>'
-    let &filetype = a:ft
-  endif
-endfunc
-
-" Function used for patterns that end in a star: don't set the filetype if the
-" file name matches ft_ignore_pat.
-" When using this, the entry should probably be further down below with the
-" other StarSetf() calls.
-func! s:StarSetf(ft)
-  if expand("<amatch>") !~ g:ft_ignore_pat && &filetype !~# '\<'.a:ft.'\>'
-    let &filetype = a:ft
-  endif
-endfunc
-
-augroup filetypedetect
-
-" scripts/build inserts here filetype detection autocommands
-
-au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>:e") == "" |
-  \ call polyglot#shebang#Detect() | endif
-
-au BufEnter * if &ft == "" && expand("<afile>:e") == ""  |
-      \ call s:Observe('shebang#Detect') | endif
-
-augroup END
-
-if !has_key(s:disabled_packages, 'autoindent')
-  " Code below re-implements sleuth for vim-polyglot
-  let g:loaded_sleuth = 1
-  let g:loaded_foobar = 1
-
-  " Makes shiftwidth to be synchronized with tabstop by default
-  if &shiftwidth == &tabstop
-    let &shiftwidth = 0
-  endif
-
-  function! s:guess(lines) abort
-    let options = {}
-    let ccomment = 0
-    let podcomment = 0
-    let triplequote = 0
-    let backtick = 0
-    let xmlcomment = 0
-    let heredoc = ''
-    let minindent = 10
-    let spaces_minus_tabs = 0
-    let i = 0
-
-    for line in a:lines
-      let i += 1
-
-      if !len(line) || line =~# '^\W*$'
-        continue
-      endif
-
-      if line =~# '^\s*/\*'
-        let ccomment = 1
-      endif
-      if ccomment
-        if line =~# '\*/'
-          let ccomment = 0
-        endif
-        continue
-      endif
-
-      if line =~# '^=\w'
-        let podcomment = 1
-      endif
-      if podcomment
-        if line =~# '^=\%(end\|cut\)\>'
-          let podcomment = 0
-        endif
-        continue
-      endif
-
-      if triplequote
-        if line =~# '^[^"]*"""[^"]*$'
-          let triplequote = 0
-        endif
-        continue
-      elseif line =~# '^[^"]*"""[^"]*$'
-        let triplequote = 1
-      endif
-
-      if backtick
-        if line =~# '^[^`]*`[^`]*$'
-          let backtick = 0
-        endif
-        continue
-      elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
-        let backtick = 1
-      endif
-
-      if line =~# '^\s*<\!--'
-        let xmlcomment = 1
-      endif
-      if xmlcomment
-        if line =~# '-->'
-          let xmlcomment = 0
-        endif
-        continue
-      endif
-
-      " This is correct order because both "<<EOF" and "EOF" matches end
-      if heredoc != ''
-        if line =~# heredoc
-          let heredoc = ''
-        endif
-        continue
-      endif
-      let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
-      if len(herematch) > 0
-        let heredoc = herematch[1] . '$'
-      endif
-
-      let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
-
-      if line[0] == "\t"
-        setlocal noexpandtab
-        let &l:shiftwidth=&tabstop
-        let b:sleuth_culprit .= ':' . i
-        return 1
-      elseif line[0] == " "
-        let indent = len(matchstr(line, '^ *'))
-        if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
-          let minindent = indent
-        endif
-      endif
-    endfor
-
-    if minindent < 10
-      setlocal expandtab
-      let &l:shiftwidth=minindent
-      let b:sleuth_culprit .= ':' . i
-      return 1
-    endif
-
-    return 0
-  endfunction
-
-  function! s:detect_indent() abort
-    if &buftype ==# 'help'
-      return
-    endif
-
-    let b:sleuth_culprit = expand("<afile>:p")
-    if s:guess(getline(1, 32))
-      return
-    endif
-    let pattern = polyglot#sleuth#GlobForFiletype(&filetype)
-    if len(pattern) == 0
-      return
-    endif
-    let pattern = '{' . pattern . ',.git,.svn,.hg}'
-    let dir = expand('%:p:h')
-    let level = 3
-    while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
-      " Ignore files from homedir and root 
-      if dir == expand('~') || dir == '/'
-        unlet b:sleuth_culprit
-        return
-      endif
-      for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
-        let b:sleuth_culprit = neighbor
-        " Do not consider directories above .git, .svn or .hg
-        if fnamemodify(neighbor, ":h:t")[0] == "."
-          let level = 0
-          continue
-        endif
-        if neighbor !=# expand('%:p') && filereadable(neighbor)
-          if s:guess(readfile(neighbor, '', 32))
-            return
-          endif
-        endif
-      endfor
-
-      let dir = fnamemodify(dir, ':h')
-      let level -= 1
-    endwhile
-
-    unlet b:sleuth_culprit
-  endfunction
-
-  setglobal smarttab
-
-  function! SleuthIndicator() abort
-    let sw = &shiftwidth ? &shiftwidth : &tabstop
-    if &expandtab
-      return 'sw='.sw
-    elseif &tabstop == sw
-      return 'ts='.&tabstop
-    else
-      return 'sw='.sw.',ts='.&tabstop
-    endif
-  endfunction
-
-  augroup polyglot-sleuth
-    au!
-    au FileType * call s:detect_indent()
-    au User Flags call Hoist('buffer', 5, 'SleuthIndicator')
-  augroup END
-
-  command! -bar -bang Sleuth call s:detect_indent()
-endif
-
-func! s:verify()
-  if exists("g:polyglot_disabled_not_set")
-    if exists("g:polyglot_disabled")
-      echohl WarningMsg
-      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
-      echohl None
-    endif
-
-    unlet g:polyglot_disabled_not_set
-  endif
-endfunc
-
-au VimEnter * call s:verify()
-
-" Save polyglot_disabled without postfixes
-if exists('g:polyglot_disabled')
-  let g:polyglot_disabled = s:new_polyglot_disabled
-endif
-
-" restore Vi compatibility settings
-let &cpo = s:cpo_save
-
-""" end
diff --git a/scripts/build b/scripts/build
index 3ec5b50cb..a2f43fb2e 100755
--- a/scripts/build
+++ b/scripts/build
@@ -12,14 +12,6 @@ Dir.chdir(File.dirname(__dir__))
 
 BASE_URL = 'https://raw.githubusercontent.com/github/linguist/master'
 
-def read_section(name)
-  section = File.read('polyglot.vim').split('""" ').find { |e| e.start_with?(name) }
-  if section.nil?
-    raise StandardError.new("Section not found: #{name}")
-  end
-  "\" Please do not edit this file directly, instead modify polyglot.vim or scripts/build\n" + section[(section.index("\n") + 1)..-1]
-end
-
 def camelize(str)
   str.split(/[-_\.]/).map { |a| a.capitalize }.join("")
 end
@@ -431,7 +423,7 @@ def rule_to_code(rule)
 end
 
 def extract(packages)
-  all_dirs = %w(syntax indent doc compiler autoload ftplugin ctags extras after)
+  all_dirs = %w(syntax indent doc compiler ftplugin ctags extras after)
 
   default_dirs = %w(
     syntax indent doc compiler autoload ftplugin ctags extras
@@ -440,6 +432,12 @@ def extract(packages)
 
   FileUtils.rm_rf(all_dirs)
 
+  for dir in Dir.glob("*", base: "autoload")
+    if dir != "polyglot"
+      FileUtils.rm_rf("autoload/" + dir)
+    end
+  end
+
   output = []
   packages.map do |package|
     repo, branch, path, dir = parse_remote(package["remote"])
@@ -582,17 +580,20 @@ def generate_ftdetect(packages, heuristics)
       output << "endif\n\n"
     end
   end
- 
+
   show_warnings(all_filetypes, expected_filetypes)
 
-  ftdetect = read_section('ftdetect/polyglot.vim')
+  ftdetect = File.read('ftdetect/polyglot.vim')
+
+  starting = '" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE'
+  ending = '" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE'
 
   File.write(
     'ftdetect/polyglot.vim',
-     ftdetect.gsub('" scripts/build inserts here filetype detection autocommands') { output }
+    ftdetect.gsub(/(?<=#{starting}\n)(.*)(?=#{ending})/m) { output }
   )
 
-  output = []
+  output = ["\" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE\n"]
 
   for heuristic in heuristics
     output << <<~EOS
@@ -616,8 +617,13 @@ def generate_ftdetect(packages, heuristics)
 
   output << "  \\ }"
 
-  autoload_script = read_section('autoload/polyglot/shebang.vim')
-  File.write('autoload/polyglot/shebang.vim', autoload_script + "\n\n" + output)
+  inject_code('autoload/polyglot/shebang.vim', output)
+end
+
+def inject_code(path, code)
+  header = "\" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE\n"
+  normal, generated = File.read(path).split(header)
+  File.write(path, [normal, generated].join(header))
 end
 
 def generate_tests(packages)
@@ -734,7 +740,11 @@ def detect_filetypes(glob)
 end
 
 def generate_plugins(packages)
-  output = "let s:globs = {\n"
+  output = <<~EOS
+    " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
+
+    let s:globs = {
+  EOS
 
   patterns = Hash.new { |h, k| h[k] = [] }
 

From a37e7e29392b9496ffb08258d965515e9cf57a80 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Sep 2020 01:22:44 +0200
Subject: [PATCH 094/299] Reduce startup time by avoiding calling slow au!

---
 autoload/polyglot/detect.vim          |   8 +-
 ftdetect/polyglot.vim => filetype.vim | 463 +++++++++++++-------------
 scripts/build                         |   8 +-
 tests/extensions.vim                  |   1 +
 4 files changed, 245 insertions(+), 235 deletions(-)
 rename ftdetect/polyglot.vim => filetype.vim (57%)

diff --git a/autoload/polyglot/detect.vim b/autoload/polyglot/detect.vim
index 53086c4ea..af143865e 100644
--- a/autoload/polyglot/detect.vim
+++ b/autoload/polyglot/detect.vim
@@ -185,7 +185,7 @@ func! polyglot#detect#Pm()
     let &ft = g:filetype_pm | return
   endif
   if polyglot#shebang#Detect() | return | endif
-  set ft=perl | au! BufWritePost <buffer> ++once call polyglot#detect#Pm()
+  set ft=perl | au BufWritePost <buffer> ++once call polyglot#detect#Pm()
   return
 endfunc
 
@@ -207,7 +207,7 @@ func! polyglot#detect#Pl()
     let &ft = g:filetype_pl | return
   endif
   if polyglot#shebang#Detect() | return | endif
-  set ft=perl | au! BufWritePost <buffer> ++once call polyglot#detect#Pl()
+  set ft=perl | au BufWritePost <buffer> ++once call polyglot#detect#Pl()
   return
 endfunc
 
@@ -231,7 +231,7 @@ func! polyglot#detect#T()
     let &ft = g:filetype_t | return
   endif
   if polyglot#shebang#Detect() | return | endif
-  set ft=perl | au! BufWritePost <buffer> ++once call polyglot#detect#T()
+  set ft=perl | au BufWritePost <buffer> ++once call polyglot#detect#T()
   return
 endfunc
 
@@ -259,6 +259,6 @@ func! polyglot#detect#Html()
       set ft=xhtml | return
     endif
   endfor
-  set ft=html | au! BufWritePost <buffer> ++once call polyglot#detect#Html()
+  set ft=html | au BufWritePost <buffer> ++once call polyglot#detect#Html()
   return
 endfunc
diff --git a/ftdetect/polyglot.vim b/filetype.vim
similarity index 57%
rename from ftdetect/polyglot.vim
rename to filetype.vim
index 52323e920..b6b78fd5d 100644
--- a/ftdetect/polyglot.vim
+++ b/filetype.vim
@@ -1,6 +1,15 @@
-" Please do not edit this file directly, instead modify polyglot.vim or scripts/build
+" Vim support file to detect file types
+"
+" Maintainer:	Adam Stankiewicz <sheerun@sher.pl>
+" URL: https://github.com/sheerun/vim-polyglot
 
-" don't spam the user when Vim is started in Vi compatibility mode
+" Listen very carefully, I will say this only once
+if exists("did_load_polyglot")
+  finish
+endif
+let did_load_polyglot = 1
+
+" Line continuation is used here, remove 'C' from 'cpoptions'
 let s:cpo_save = &cpo
 set cpo&vim
 
@@ -100,32 +109,32 @@ augroup filetypedetect
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
 if !has_key(s:disabled_packages, '8th')
-  au! BufNewFile,BufRead *.8th set ft=8th
+  au BufNewFile,BufRead *.8th set ft=8th
 endif
 
 if !has_key(s:disabled_packages, 'conf')
-  au! BufNewFile,BufRead *.conf,auto.master,config set ft=conf
+  au BufNewFile,BufRead *.conf,auto.master,config set ft=conf
 endif
 
 if !has_key(s:disabled_packages, 'haproxy')
-  au! BufNewFile,BufRead *.cfg,haproxy.cfg set ft=haproxy
+  au BufNewFile,BufRead *.cfg,haproxy.cfg set ft=haproxy
   au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
 endif
 
 if !has_key(s:disabled_packages, 'a2ps')
-  au! BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc set ft=a2ps
+  au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc set ft=a2ps
 endif
 
 if !has_key(s:disabled_packages, 'a65')
-  au! BufNewFile,BufRead *.a65 set ft=a65
+  au BufNewFile,BufRead *.a65 set ft=a65
 endif
 
 if !has_key(s:disabled_packages, 'aap')
-  au! BufNewFile,BufRead *.aap set ft=aap
+  au BufNewFile,BufRead *.aap set ft=aap
 endif
 
 if !has_key(s:disabled_packages, 'abap')
-  au! BufNewFile,BufRead *.abap set ft=abap
+  au BufNewFile,BufRead *.abap set ft=abap
 endif
 
 if !has_key(s:disabled_packages, 'abaqus')
@@ -133,59 +142,59 @@ if !has_key(s:disabled_packages, 'abaqus')
 endif
 
 if !has_key(s:disabled_packages, 'abc')
-  au! BufNewFile,BufRead *.abc set ft=abc
+  au BufNewFile,BufRead *.abc set ft=abc
 endif
 
 if !has_key(s:disabled_packages, 'abel')
-  au! BufNewFile,BufRead *.abl set ft=abel
+  au BufNewFile,BufRead *.abl set ft=abel
 endif
 
 if !has_key(s:disabled_packages, 'acedb')
-  au! BufNewFile,BufRead *.wrm set ft=acedb
+  au BufNewFile,BufRead *.wrm set ft=acedb
 endif
 
 if !has_key(s:disabled_packages, 'acpiasl')
-  au! BufNewFile,BufRead *.asl,*.dsl set ft=asl
+  au BufNewFile,BufRead *.asl,*.dsl set ft=asl
 endif
 
 if !has_key(s:disabled_packages, 'ada')
-  au! BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr set ft=ada
+  au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr set ft=ada
 endif
 
 if !has_key(s:disabled_packages, 'ahdl')
-  au! BufNewFile,BufRead *.tdf set ft=ahdl
+  au BufNewFile,BufRead *.tdf set ft=ahdl
 endif
 
 if !has_key(s:disabled_packages, 'aidl')
-  au! BufNewFile,BufRead *.aidl set ft=aidl
+  au BufNewFile,BufRead *.aidl set ft=aidl
 endif
 
 if !has_key(s:disabled_packages, 'alsaconf')
-  au! BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc set ft=alsaconf
+  au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc set ft=alsaconf
 endif
 
 if !has_key(s:disabled_packages, 'aml')
-  au! BufNewFile,BufRead *.aml set ft=aml
+  au BufNewFile,BufRead *.aml set ft=aml
 endif
 
 if !has_key(s:disabled_packages, 'ampl')
-  au! BufNewFile,BufRead *.run set ft=ampl
+  au BufNewFile,BufRead *.run set ft=ampl
 endif
 
 if !has_key(s:disabled_packages, 'csv')
-  au! BufNewFile,BufRead *.csv,*.tab,*.tsv set ft=csv
+  au BufNewFile,BufRead *.csv,*.tab,*.tsv set ft=csv
 endif
 
 if !has_key(s:disabled_packages, 'xml')
-  au! BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config set ft=xml
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config set ft=xml
 endif
 
 if !has_key(s:disabled_packages, 'ant')
-  au! BufNewFile,BufRead build.xml set ft=ant
+  au BufNewFile,BufRead build.xml set ft=ant
 endif
 
 if !has_key(s:disabled_packages, 'apache')
-  au! BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess set ft=apache
+  au BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess set ft=apache
   au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
   au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
   au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
@@ -199,54 +208,54 @@ if !has_key(s:disabled_packages, 'apache')
 endif
 
 if !has_key(s:disabled_packages, 'apiblueprint')
-  au! BufNewFile,BufRead *.apib set ft=apiblueprint
+  au BufNewFile,BufRead *.apib set ft=apiblueprint
 endif
 
 if !has_key(s:disabled_packages, 'applescript')
-  au! BufNewFile,BufRead *.applescript,*.scpt set ft=applescript
+  au BufNewFile,BufRead *.applescript,*.scpt set ft=applescript
 endif
 
 if !has_key(s:disabled_packages, 'aptconf')
-  au! BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf set ft=aptconf
+  au BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf set ft=aptconf
   au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
 endif
 
 if !has_key(s:disabled_packages, 'arch')
-  au! BufNewFile,BufRead {.,}arch-inventory,=tagging-method set ft=arch
+  au BufNewFile,BufRead {.,}arch-inventory,=tagging-method set ft=arch
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
   au! BufNewFile,BufRead *.h call polyglot#detect#H()
-  au! BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg set ft=c
-  au! BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp set ft=cpp
+  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg set ft=c
+  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp set ft=cpp
 endif
 
 if !has_key(s:disabled_packages, 'arduino')
-  au! BufNewFile,BufRead *.ino,*.pde set ft=arduino
+  au BufNewFile,BufRead *.ino,*.pde set ft=arduino
 endif
 
 if !has_key(s:disabled_packages, 'art')
-  au! BufNewFile,BufRead *.art set ft=art
+  au BufNewFile,BufRead *.art set ft=art
 endif
 
 if !has_key(s:disabled_packages, 'asciidoc')
-  au! BufNewFile,BufRead *.adoc,*.asc,*.asciidoc set ft=asciidoc
+  au BufNewFile,BufRead *.adoc,*.asc,*.asciidoc set ft=asciidoc
 endif
 
 if !has_key(s:disabled_packages, 'autohotkey')
-  au! BufNewFile,BufRead *.ahk,*.ahkl set ft=autohotkey
+  au BufNewFile,BufRead *.ahk,*.ahkl set ft=autohotkey
 endif
 
 if !has_key(s:disabled_packages, 'elf')
-  au! BufNewFile,BufRead *.am set ft=elf
+  au BufNewFile,BufRead *.am set ft=elf
 endif
 
 if !has_key(s:disabled_packages, 'automake')
-  au! BufNewFile,BufRead GNUmakefile.am,[Mm]akefile.am set ft=automake
+  au BufNewFile,BufRead GNUmakefile.am,[Mm]akefile.am set ft=automake
 endif
 
 if !has_key(s:disabled_packages, 'asn')
-  au! BufNewFile,BufRead *.asn,*.asn1 set ft=asn
+  au BufNewFile,BufRead *.asn,*.asn1 set ft=asn
 endif
 
 if !has_key(s:disabled_packages, 'aspvbs')
@@ -259,323 +268,323 @@ if !has_key(s:disabled_packages, 'aspperl')
 endif
 
 if !has_key(s:disabled_packages, 'atlas')
-  au! BufNewFile,BufRead *.as,*.atl set ft=atlas
+  au BufNewFile,BufRead *.as,*.atl set ft=atlas
 endif
 
 if !has_key(s:disabled_packages, 'autoit')
-  au! BufNewFile,BufRead *.au3 set ft=autoit
+  au BufNewFile,BufRead *.au3 set ft=autoit
 endif
 
 if !has_key(s:disabled_packages, 'ave')
-  au! BufNewFile,BufRead *.ave set ft=ave
+  au BufNewFile,BufRead *.ave set ft=ave
 endif
 
 if !has_key(s:disabled_packages, 'awk')
-  au! BufNewFile,BufRead *.awk,*.gawk set ft=awk
+  au BufNewFile,BufRead *.awk,*.gawk set ft=awk
 endif
 
 if !has_key(s:disabled_packages, 'caddyfile')
-  au! BufNewFile,BufRead Caddyfile set ft=caddyfile
+  au BufNewFile,BufRead Caddyfile set ft=caddyfile
 endif
 
 if !has_key(s:disabled_packages, 'cpp-modern')
 endif
 
 if !has_key(s:disabled_packages, 'carp')
-  au! BufNewFile,BufRead *.carp set ft=carp
+  au BufNewFile,BufRead *.carp set ft=carp
 endif
 
 if !has_key(s:disabled_packages, 'clojure')
-  au! BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config set ft=clojure
+  au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config set ft=clojure
 endif
 
 if !has_key(s:disabled_packages, 'cmake')
-  au! BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt set ft=cmake
+  au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt set ft=cmake
 endif
 
 if !has_key(s:disabled_packages, 'coffee-script')
-  au! BufNewFile,BufRead *.coffee.md,*.litcoffee set ft=litcoffee
-  au! BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile set ft=coffee
+  au BufNewFile,BufRead *.coffee.md,*.litcoffee set ft=litcoffee
+  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile set ft=coffee
 endif
 
 if !has_key(s:disabled_packages, 'cjsx')
 endif
 
 if !has_key(s:disabled_packages, 'cryptol')
-  au! BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl set ft=cryptol
+  au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl set ft=cryptol
 endif
 
 if !has_key(s:disabled_packages, 'crystal')
-  au! BufNewFile,BufRead *.ecr set ft=ecrystal
-  au! BufNewFile,BufRead *.cr,Projectfile set ft=crystal
+  au BufNewFile,BufRead *.ecr set ft=ecrystal
+  au BufNewFile,BufRead *.cr,Projectfile set ft=crystal
 endif
 
 if !has_key(s:disabled_packages, 'cucumber')
-  au! BufNewFile,BufRead *.feature,*.story set ft=cucumber
+  au BufNewFile,BufRead *.feature,*.story set ft=cucumber
 endif
 
 if !has_key(s:disabled_packages, 'cue')
-  au! BufNewFile,BufRead *.cue set ft=cuesheet
+  au BufNewFile,BufRead *.cue set ft=cuesheet
 endif
 
 if !has_key(s:disabled_packages, 'dart')
-  au! BufNewFile,BufRead *.dart,*.drt set ft=dart
+  au BufNewFile,BufRead *.dart,*.drt set ft=dart
 endif
 
 if !has_key(s:disabled_packages, 'dhall')
-  au! BufNewFile,BufRead *.dhall set ft=dhall
+  au BufNewFile,BufRead *.dhall set ft=dhall
 endif
 
 if !has_key(s:disabled_packages, 'dlang')
-  au! BufNewFile,BufRead *.sdl set ft=dsdl
-  au! BufNewFile,BufRead *.ddoc set ft=ddoc
-  au! BufNewFile,BufRead *.dd set ft=dd
-  au! BufNewFile,BufRead *.lst set ft=dcov
-  au! BufNewFile,BufRead *.d,*.di set ft=d
+  au BufNewFile,BufRead *.sdl set ft=dsdl
+  au BufNewFile,BufRead *.ddoc set ft=ddoc
+  au BufNewFile,BufRead *.dd set ft=dd
+  au BufNewFile,BufRead *.lst set ft=dcov
+  au BufNewFile,BufRead *.d,*.di set ft=d
 endif
 
 if !has_key(s:disabled_packages, 'yaml')
-  au! BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock set ft=yaml
+  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock set ft=yaml
 endif
 
 if !has_key(s:disabled_packages, 'dockerfile')
-  au! BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml set ft=yaml.docker-compose
-  au! BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile set ft=Dockerfile
+  au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml set ft=yaml.docker-compose
+  au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile set ft=Dockerfile
   au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
 endif
 
 if !has_key(s:disabled_packages, 'elixir')
-  au! BufNewFile,BufRead *.eex,*.leex set ft=eelixir
-  au! BufNewFile,BufRead *.ex,*.exs,mix.lock set ft=elixir
+  au BufNewFile,BufRead *.eex,*.leex set ft=eelixir
+  au BufNewFile,BufRead *.ex,*.exs,mix.lock set ft=elixir
 endif
 
 if !has_key(s:disabled_packages, 'elm')
-  au! BufNewFile,BufRead *.elm set ft=elm
+  au BufNewFile,BufRead *.elm set ft=elm
 endif
 
 if !has_key(s:disabled_packages, 'emberscript')
-  au! BufNewFile,BufRead *.em,*.emberscript set ft=ember-script
+  au BufNewFile,BufRead *.em,*.emberscript set ft=ember-script
 endif
 
 if !has_key(s:disabled_packages, 'emblem')
-  au! BufNewFile,BufRead *.em,*.emblem set ft=emblem
+  au BufNewFile,BufRead *.em,*.emblem set ft=emblem
 endif
 
 if !has_key(s:disabled_packages, 'erlang')
-  au! BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock set ft=erlang
+  au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock set ft=erlang
 endif
 
 if !has_key(s:disabled_packages, 'fennel')
-  au! BufNewFile,BufRead *.fnl set ft=fennel
+  au BufNewFile,BufRead *.fnl set ft=fennel
 endif
 
 if !has_key(s:disabled_packages, 'ferm')
-  au! BufNewFile,BufRead *.ferm,ferm.conf set ft=ferm
+  au BufNewFile,BufRead *.ferm,ferm.conf set ft=ferm
 endif
 
 if !has_key(s:disabled_packages, 'fish')
-  au! BufNewFile,BufRead *.fish set ft=fish
+  au BufNewFile,BufRead *.fish set ft=fish
 endif
 
 if !has_key(s:disabled_packages, 'flatbuffers')
-  au! BufNewFile,BufRead *.fbs set ft=fbs
+  au BufNewFile,BufRead *.fbs set ft=fbs
 endif
 
 if !has_key(s:disabled_packages, 'forth')
   au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
-  au! BufNewFile,BufRead *.ft,*.fth set ft=forth
+  au BufNewFile,BufRead *.ft,*.fth set ft=forth
 endif
 
 if !has_key(s:disabled_packages, 'fsharp')
   au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
-  au! BufNewFile,BufRead *.fsi,*.fsx set ft=fsharp
+  au BufNewFile,BufRead *.fsi,*.fsx set ft=fsharp
 endif
 
 if !has_key(s:disabled_packages, 'gdscript')
-  au! BufNewFile,BufRead *.gd set ft=gdscript3
+  au BufNewFile,BufRead *.gd set ft=gdscript3
 endif
 
 if !has_key(s:disabled_packages, 'git')
-  au! BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG set ft=gitcommit
+  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG set ft=gitcommit
   au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
-  au! BufNewFile,BufRead git-rebase-todo set ft=gitrebase
-  au! BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules set ft=gitconfig
+  au BufNewFile,BufRead git-rebase-todo set ft=gitrebase
+  au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules set ft=gitconfig
   au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
 endif
 
 if !has_key(s:disabled_packages, 'glsl')
   au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
-  au! BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl
+  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl
 endif
 
 if !has_key(s:disabled_packages, 'gmpl')
-  au! BufNewFile,BufRead *.mod set ft=gmpl
+  au BufNewFile,BufRead *.mod set ft=gmpl
 endif
 
 if !has_key(s:disabled_packages, 'gnuplot')
-  au! BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt set ft=gnuplot
+  au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt set ft=gnuplot
 endif
 
 if !has_key(s:disabled_packages, 'go')
-  au! BufNewFile,BufRead *.tmpl set ft=gohtmltmpl
-  au! BufNewFile,BufRead go.mod set ft=gomod
-  au! BufNewFile,BufRead *.go set ft=go
+  au BufNewFile,BufRead *.tmpl set ft=gohtmltmpl
+  au BufNewFile,BufRead go.mod set ft=gomod
+  au BufNewFile,BufRead *.go set ft=go
 endif
 
 if !has_key(s:disabled_packages, 'javascript')
-  au! BufNewFile,BufRead *.flow set ft=flow
-  au! BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile set ft=javascript
+  au BufNewFile,BufRead *.flow set ft=flow
+  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile set ft=javascript
 endif
 
 if !has_key(s:disabled_packages, 'jsx')
-  au! BufNewFile,BufRead *.jsx set ft=javascriptreact
+  au BufNewFile,BufRead *.jsx set ft=javascriptreact
 endif
 
 if !has_key(s:disabled_packages, 'graphql')
-  au! BufNewFile,BufRead *.gql,*.graphql,*.graphqls set ft=graphql
+  au BufNewFile,BufRead *.gql,*.graphql,*.graphqls set ft=graphql
 endif
 
 if !has_key(s:disabled_packages, 'groovy')
-  au! BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile set ft=groovy
+  au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile set ft=groovy
 endif
 
 if !has_key(s:disabled_packages, 'gradle')
 endif
 
 if !has_key(s:disabled_packages, 'grub')
-  au! BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf set ft=grub
+  au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf set ft=grub
 endif
 
 if !has_key(s:disabled_packages, 'haml')
-  au! BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc set ft=haml
+  au BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc set ft=haml
 endif
 
 if !has_key(s:disabled_packages, 'handlebars')
-  au! BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs set ft=html.handlebars
-  au! BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache set ft=html.mustache
+  au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs set ft=html.handlebars
+  au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache set ft=html.mustache
 endif
 
 if !has_key(s:disabled_packages, 'haskell')
-  au! BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig set ft=haskell
+  au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig set ft=haskell
 endif
 
 if !has_key(s:disabled_packages, 'haxe')
-  au! BufNewFile,BufRead *.hx,*.hxsl set ft=haxe
+  au BufNewFile,BufRead *.hx,*.hxsl set ft=haxe
 endif
 
 if !has_key(s:disabled_packages, 'hcl')
-  au! BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile set ft=hcl
+  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile set ft=hcl
 endif
 
 if !has_key(s:disabled_packages, 'hive')
-  au! BufNewFile,BufRead *.hql,*.q,*.ql set ft=hive
+  au BufNewFile,BufRead *.hql,*.q,*.ql set ft=hive
 endif
 
 if !has_key(s:disabled_packages, 'html5')
   au! BufNewFile,BufRead *.html call polyglot#detect#Html()
-  au! BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml set ft=html
+  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml set ft=html
 endif
 
 if !has_key(s:disabled_packages, 'i3')
-  au! BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config set ft=i3config
+  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config set ft=i3config
 endif
 
 if !has_key(s:disabled_packages, 'icalendar')
-  au! BufNewFile,BufRead *.ics set ft=icalendar
+  au BufNewFile,BufRead *.ics set ft=icalendar
 endif
 
 if !has_key(s:disabled_packages, 'idris')
   au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
   au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
-  au! BufNewFile,BufRead idris-response set ft=idris
+  au BufNewFile,BufRead idris-response set ft=idris
 endif
 
 if !has_key(s:disabled_packages, 'idris2')
   au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
   au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
-  au! BufNewFile,BufRead *.ipkg,idris-response set ft=idris2
+  au BufNewFile,BufRead *.ipkg,idris-response set ft=idris2
 endif
 
 if !has_key(s:disabled_packages, 'ion')
-  au! BufNewFile,BufRead *.ion,~/.config/ion/initrc set ft=ion
+  au BufNewFile,BufRead *.ion,~/.config/ion/initrc set ft=ion
 endif
 
 if !has_key(s:disabled_packages, 'javascript-sql')
 endif
 
 if !has_key(s:disabled_packages, 'jenkins')
-  au! BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile set ft=Jenkinsfile
+  au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile set ft=Jenkinsfile
   au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
 if !has_key(s:disabled_packages, 'htmldjango')
-  au! BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk set ft=htmldjango
+  au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk set ft=htmldjango
 endif
 
 if !has_key(s:disabled_packages, 'jq')
-  au! BufNewFile,BufRead *.jq,{.,}jqrc set ft=jq
+  au BufNewFile,BufRead *.jq,{.,}jqrc set ft=jq
   au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq')
 endif
 
 if !has_key(s:disabled_packages, 'json5')
-  au! BufNewFile,BufRead *.json5 set ft=json5
+  au BufNewFile,BufRead *.json5 set ft=json5
 endif
 
 if !has_key(s:disabled_packages, 'json')
-  au! BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info set ft=json
+  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info set ft=json
 endif
 
 if !has_key(s:disabled_packages, 'jsonnet')
-  au! BufNewFile,BufRead *.jsonnet,*.libsonnet set ft=jsonnet
+  au BufNewFile,BufRead *.jsonnet,*.libsonnet set ft=jsonnet
 endif
 
 if !has_key(s:disabled_packages, 'jst')
-  au! BufNewFile,BufRead *.ect,*.ejs,*.jst set ft=jst
+  au BufNewFile,BufRead *.ect,*.ejs,*.jst set ft=jst
 endif
 
 if !has_key(s:disabled_packages, 'julia')
-  au! BufNewFile,BufRead *.jl set ft=julia
+  au BufNewFile,BufRead *.jl set ft=julia
 endif
 
 if !has_key(s:disabled_packages, 'kotlin')
-  au! BufNewFile,BufRead *.kt,*.ktm,*.kts set ft=kotlin
+  au BufNewFile,BufRead *.kt,*.ktm,*.kts set ft=kotlin
 endif
 
 if !has_key(s:disabled_packages, 'ledger')
-  au! BufNewFile,BufRead *.journal,*.ldg,*.ledger set ft=ledger
+  au BufNewFile,BufRead *.journal,*.ldg,*.ledger set ft=ledger
 endif
 
 if !has_key(s:disabled_packages, 'less')
-  au! BufNewFile,BufRead *.less set ft=less
+  au BufNewFile,BufRead *.less set ft=less
 endif
 
 if !has_key(s:disabled_packages, 'lilypond')
-  au! BufNewFile,BufRead *.ily,*.ly set ft=lilypond
+  au BufNewFile,BufRead *.ily,*.ly set ft=lilypond
 endif
 
 if !has_key(s:disabled_packages, 'livescript')
-  au! BufNewFile,BufRead *._ls,*.ls,Slakefile set ft=livescript
+  au BufNewFile,BufRead *._ls,*.ls,Slakefile set ft=livescript
 endif
 
 if !has_key(s:disabled_packages, 'llvm')
-  au! BufNewFile,BufRead *.td set ft=tablegen
-  au! BufNewFile,BufRead *.ll set ft=llvm
+  au BufNewFile,BufRead *.td set ft=tablegen
+  au BufNewFile,BufRead *.ll set ft=llvm
 endif
 
 if !has_key(s:disabled_packages, 'log')
-  au! BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log set ft=log
+  au BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log set ft=log
 endif
 
 if !has_key(s:disabled_packages, 'lua')
-  au! BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc set ft=lua
+  au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc set ft=lua
 endif
 
 if !has_key(s:disabled_packages, 'm4')
-  au! BufNewFile,BufRead *.at,*.m4 set ft=m4
+  au BufNewFile,BufRead *.at,*.m4 set ft=m4
 endif
 
 if !has_key(s:disabled_packages, 'mako')
-  au! BufNewFile,BufRead *.mako,*.mao set ft=mako
+  au BufNewFile,BufRead *.mako,*.mao set ft=mako
   au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
@@ -584,24 +593,24 @@ endif
 
 if !has_key(s:disabled_packages, 'mathematica')
   au! BufNewFile,BufRead *.m call polyglot#detect#M()
-  au! BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt set ft=mma
+  au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt set ft=mma
 endif
 
 if !has_key(s:disabled_packages, 'markdown')
-  au! BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr set ft=markdown
+  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr set ft=markdown
 endif
 
 if !has_key(s:disabled_packages, 'mdx')
-  au! BufNewFile,BufRead *.mdx set ft=markdown.mdx
+  au BufNewFile,BufRead *.mdx set ft=markdown.mdx
 endif
 
 if !has_key(s:disabled_packages, 'meson')
-  au! BufNewFile,BufRead *.wrap set ft=dosini
-  au! BufNewFile,BufRead meson.build,meson_options.txt set ft=meson
+  au BufNewFile,BufRead *.wrap set ft=dosini
+  au BufNewFile,BufRead meson.build,meson_options.txt set ft=meson
 endif
 
 if !has_key(s:disabled_packages, 'moonscript')
-  au! BufNewFile,BufRead *.moon set ft=moon
+  au BufNewFile,BufRead *.moon set ft=moon
 endif
 
 if !has_key(s:disabled_packages, 'murphi')
@@ -609,17 +618,17 @@ if !has_key(s:disabled_packages, 'murphi')
 endif
 
 if !has_key(s:disabled_packages, 'nginx')
-  au! BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf set ft=nginx
+  au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf set ft=nginx
   au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
   au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
 endif
 
 if !has_key(s:disabled_packages, 'nim')
-  au! BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg set ft=nim
+  au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg set ft=nim
 endif
 
 if !has_key(s:disabled_packages, 'nix')
-  au! BufNewFile,BufRead *.nix set ft=nix
+  au BufNewFile,BufRead *.nix set ft=nix
 endif
 
 if !has_key(s:disabled_packages, 'objc')
@@ -628,24 +637,24 @@ if !has_key(s:disabled_packages, 'objc')
 endif
 
 if !has_key(s:disabled_packages, 'ocaml')
-  au! BufNewFile,BufRead *.sexp set ft=sexplib
-  au! BufNewFile,BufRead *.root set ft=ocpbuildroot
-  au! BufNewFile,BufRead *.ocp set ft=ocpbuild
-  au! BufNewFile,BufRead _tags set ft=ocamlbuild_tags
-  au! BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild set ft=dune
-  au! BufNewFile,BufRead _oasis set ft=oasis
-  au! BufNewFile,BufRead *.opam,*.opam.template,opam set ft=opam
-  au! BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in set ft=omake
-  au! BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit set ft=ocaml
+  au BufNewFile,BufRead *.sexp set ft=sexplib
+  au BufNewFile,BufRead *.root set ft=ocpbuildroot
+  au BufNewFile,BufRead *.ocp set ft=ocpbuild
+  au BufNewFile,BufRead _tags set ft=ocamlbuild_tags
+  au BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild set ft=dune
+  au BufNewFile,BufRead _oasis set ft=oasis
+  au BufNewFile,BufRead *.opam,*.opam.template,opam set ft=opam
+  au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in set ft=omake
+  au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit set ft=ocaml
 endif
 
 if !has_key(s:disabled_packages, 'octave')
   au! BufNewFile,BufRead *.m call polyglot#detect#M()
-  au! BufNewFile,BufRead *.oct set ft=octave
+  au BufNewFile,BufRead *.oct set ft=octave
 endif
 
 if !has_key(s:disabled_packages, 'opencl')
-  au! BufNewFile,BufRead *.cl,*.opencl set ft=opencl
+  au BufNewFile,BufRead *.cl,*.opencl set ft=opencl
 endif
 
 if !has_key(s:disabled_packages, 'perl')
@@ -653,60 +662,60 @@ if !has_key(s:disabled_packages, 'perl')
   au! BufNewFile,BufRead *.t call polyglot#detect#T()
   au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
   au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
-  au! BufNewFile,BufRead *.xs set ft=xs
-  au! BufNewFile,BufRead *.comp,*.mason,*.mhtml set ft=mason
-  au! BufNewFile,BufRead *.pod set ft=pod
-  au! BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc set ft=perl
+  au BufNewFile,BufRead *.xs set ft=xs
+  au BufNewFile,BufRead *.comp,*.mason,*.mhtml set ft=mason
+  au BufNewFile,BufRead *.pod set ft=pod
+  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc set ft=perl
 endif
 
 if !has_key(s:disabled_packages, 'pgsql')
-  au! BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
+  au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
 endif
 
 if !has_key(s:disabled_packages, 'cql')
-  au! BufNewFile,BufRead *.cql set ft=cql
+  au BufNewFile,BufRead *.cql set ft=cql
 endif
 
 if !has_key(s:disabled_packages, 'php')
-  au! BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile set ft=php
+  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile set ft=php
 endif
 
 if !has_key(s:disabled_packages, 'blade')
-  au! BufNewFile,BufRead *.blade,*.blade.php set ft=blade
+  au BufNewFile,BufRead *.blade,*.blade.php set ft=blade
 endif
 
 if !has_key(s:disabled_packages, 'plantuml')
-  au! BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml set ft=plantuml
+  au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml set ft=plantuml
 endif
 
 if !has_key(s:disabled_packages, 'pony')
-  au! BufNewFile,BufRead *.pony set ft=pony
+  au BufNewFile,BufRead *.pony set ft=pony
 endif
 
 if !has_key(s:disabled_packages, 'powershell')
-  au! BufNewFile,BufRead *.ps1xml set ft=ps1xml
-  au! BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc set ft=ps1
+  au BufNewFile,BufRead *.ps1xml set ft=ps1xml
+  au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc set ft=ps1
 endif
 
 if !has_key(s:disabled_packages, 'protobuf')
-  au! BufNewFile,BufRead *.proto set ft=proto
+  au BufNewFile,BufRead *.proto set ft=proto
 endif
 
 if !has_key(s:disabled_packages, 'pug')
-  au! BufNewFile,BufRead *.jade,*.pug set ft=pug
+  au BufNewFile,BufRead *.jade,*.pug set ft=pug
 endif
 
 if !has_key(s:disabled_packages, 'puppet')
-  au! BufNewFile,BufRead *.epp set ft=embeddedpuppet
-  au! BufNewFile,BufRead *.pp,Modulefile set ft=puppet
+  au BufNewFile,BufRead *.epp set ft=embeddedpuppet
+  au BufNewFile,BufRead *.pp,Modulefile set ft=puppet
 endif
 
 if !has_key(s:disabled_packages, 'purescript')
-  au! BufNewFile,BufRead *.purs set ft=purescript
+  au BufNewFile,BufRead *.purs set ft=purescript
 endif
 
 if !has_key(s:disabled_packages, 'python')
-  au! BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript set ft=python
+  au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript set ft=python
 endif
 
 if !has_key(s:disabled_packages, 'python-indent')
@@ -716,237 +725,237 @@ if !has_key(s:disabled_packages, 'python-compiler')
 endif
 
 if !has_key(s:disabled_packages, 'requirements')
-  au! BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} set ft=requirements
+  au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} set ft=requirements
 endif
 
 if !has_key(s:disabled_packages, 'qmake')
-  au! BufNewFile,BufRead *.pri,*.pro set ft=qmake
+  au BufNewFile,BufRead *.pri,*.pro set ft=qmake
 endif
 
 if !has_key(s:disabled_packages, 'qml')
-  au! BufNewFile,BufRead *.qbs,*.qml set ft=qml
+  au BufNewFile,BufRead *.qbs,*.qml set ft=qml
 endif
 
 if !has_key(s:disabled_packages, 'r-lang')
-  au! BufNewFile,BufRead *.rd set ft=rhelp
-  au! BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist set ft=r
+  au BufNewFile,BufRead *.rd set ft=rhelp
+  au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist set ft=r
 endif
 
 if !has_key(s:disabled_packages, 'racket')
-  au! BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl set ft=racket
+  au BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl set ft=racket
 endif
 
 if !has_key(s:disabled_packages, 'ragel')
-  au! BufNewFile,BufRead *.rl set ft=ragel
+  au BufNewFile,BufRead *.rl set ft=ragel
 endif
 
 if !has_key(s:disabled_packages, 'raku')
   au! BufNewFile,BufRead *.t call polyglot#detect#T()
   au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
   au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
-  au! BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 set ft=raku
+  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 set ft=raku
 endif
 
 if !has_key(s:disabled_packages, 'raml')
-  au! BufNewFile,BufRead *.raml set ft=raml
+  au BufNewFile,BufRead *.raml set ft=raml
 endif
 
 if !has_key(s:disabled_packages, 'razor')
-  au! BufNewFile,BufRead *.cshtml,*.razor set ft=razor
+  au BufNewFile,BufRead *.cshtml,*.razor set ft=razor
 endif
 
 if !has_key(s:disabled_packages, 'reason')
   au! BufNewFile,BufRead *.re call polyglot#detect#Re()
-  au! BufNewFile,BufRead *.rei set ft=reason
+  au BufNewFile,BufRead *.rei set ft=reason
 endif
 
 if !has_key(s:disabled_packages, 'rst')
-  au! BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt set ft=rst
+  au BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt set ft=rst
 endif
 
 if !has_key(s:disabled_packages, 'ruby')
-  au! BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml set ft=eruby
-  au! BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile set ft=ruby
+  au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml set ft=eruby
+  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile set ft=ruby
   au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
 endif
 
 if !has_key(s:disabled_packages, 'rspec')
-  au! BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
+  au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
 endif
 
 if !has_key(s:disabled_packages, 'yard')
 endif
 
 if !has_key(s:disabled_packages, 'brewfile')
-  au! BufNewFile,BufRead Brewfile set ft=brewfile
+  au BufNewFile,BufRead Brewfile set ft=brewfile
 endif
 
 if !has_key(s:disabled_packages, 'rust')
-  au! BufNewFile,BufRead *.rs,*.rs.in set ft=rust
+  au BufNewFile,BufRead *.rs,*.rs.in set ft=rust
 endif
 
 if !has_key(s:disabled_packages, 'scala')
-  au! BufNewFile,BufRead *.kojo,*.sc,*.scala set ft=scala
+  au BufNewFile,BufRead *.kojo,*.sc,*.scala set ft=scala
 endif
 
 if !has_key(s:disabled_packages, 'sbt')
-  au! BufNewFile,BufRead *.sbt set ft=sbt.scala
+  au BufNewFile,BufRead *.sbt set ft=sbt.scala
 endif
 
 if !has_key(s:disabled_packages, 'scss')
-  au! BufNewFile,BufRead *.scss set ft=scss
+  au BufNewFile,BufRead *.scss set ft=scss
 endif
 
 if !has_key(s:disabled_packages, 'sh')
-  au! BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc set ft=zsh
+  au BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc set ft=zsh
   au BufNewFile,BufRead {.,}zsh* call s:StarSetf('zsh')
   au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh')
   au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
-  au! BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc set ft=sh
+  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc set ft=sh
 endif
 
 if !has_key(s:disabled_packages, 'zinit')
 endif
 
 if !has_key(s:disabled_packages, 'slim')
-  au! BufNewFile,BufRead *.slim set ft=slim
+  au BufNewFile,BufRead *.slim set ft=slim
 endif
 
 if !has_key(s:disabled_packages, 'slime')
-  au! BufNewFile,BufRead *.slime set ft=slime
+  au BufNewFile,BufRead *.slime set ft=slime
 endif
 
 if !has_key(s:disabled_packages, 'smt2')
-  au! BufNewFile,BufRead *.smt,*.smt2 set ft=smt2
+  au BufNewFile,BufRead *.smt,*.smt2 set ft=smt2
 endif
 
 if !has_key(s:disabled_packages, 'solidity')
-  au! BufNewFile,BufRead *.sol set ft=solidity
+  au BufNewFile,BufRead *.sol set ft=solidity
 endif
 
 if !has_key(s:disabled_packages, 'stylus')
-  au! BufNewFile,BufRead *.styl,*.stylus set ft=stylus
+  au BufNewFile,BufRead *.styl,*.stylus set ft=stylus
 endif
 
 if !has_key(s:disabled_packages, 'svelte')
-  au! BufNewFile,BufRead *.svelte set ft=svelte
+  au BufNewFile,BufRead *.svelte set ft=svelte
 endif
 
 if !has_key(s:disabled_packages, 'svg')
-  au! BufNewFile,BufRead *.svg set ft=svg
+  au BufNewFile,BufRead *.svg set ft=svg
 endif
 
 if !has_key(s:disabled_packages, 'svg-indent')
 endif
 
 if !has_key(s:disabled_packages, 'swift')
-  au! BufNewFile,BufRead *.swift set ft=swift
+  au BufNewFile,BufRead *.swift set ft=swift
 endif
 
 if !has_key(s:disabled_packages, 'sxhkd')
-  au! BufNewFile,BufRead *.sxhkdrc,sxhkdrc set ft=sxhkdrc
+  au BufNewFile,BufRead *.sxhkdrc,sxhkdrc set ft=sxhkdrc
 endif
 
 if !has_key(s:disabled_packages, 'systemd')
-  au! BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf set ft=systemd
+  au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf set ft=systemd
   au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
 endif
 
 if !has_key(s:disabled_packages, 'terraform')
-  au! BufNewFile,BufRead *.tf,*.tfvars set ft=terraform
+  au BufNewFile,BufRead *.tf,*.tfvars set ft=terraform
 endif
 
 if !has_key(s:disabled_packages, 'textile')
-  au! BufNewFile,BufRead *.textile set ft=textile
+  au BufNewFile,BufRead *.textile set ft=textile
 endif
 
 if !has_key(s:disabled_packages, 'thrift')
-  au! BufNewFile,BufRead *.thrift set ft=thrift
+  au BufNewFile,BufRead *.thrift set ft=thrift
 endif
 
 if !has_key(s:disabled_packages, 'tmux')
-  au! BufNewFile,BufRead {.,}tmux*.conf set ft=tmux
+  au BufNewFile,BufRead {.,}tmux*.conf set ft=tmux
 endif
 
 if !has_key(s:disabled_packages, 'toml')
-  au! BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock set ft=toml
+  au BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock set ft=toml
 endif
 
 if !has_key(s:disabled_packages, 'tptp')
-  au! BufNewFile,BufRead *.ax,*.p,*.tptp set ft=tptp
+  au BufNewFile,BufRead *.ax,*.p,*.tptp set ft=tptp
 endif
 
 if !has_key(s:disabled_packages, 'twig')
-  au! BufNewFile,BufRead *.xml.twig set ft=xml.twig
-  au! BufNewFile,BufRead *.twig set ft=html.twig
+  au BufNewFile,BufRead *.xml.twig set ft=xml.twig
+  au BufNewFile,BufRead *.twig set ft=html.twig
 endif
 
 if !has_key(s:disabled_packages, 'typescript')
-  au! BufNewFile,BufRead *.tsx set ft=typescriptreact
-  au! BufNewFile,BufRead *.ts set ft=typescript
+  au BufNewFile,BufRead *.tsx set ft=typescriptreact
+  au BufNewFile,BufRead *.ts set ft=typescript
 endif
 
 if !has_key(s:disabled_packages, 'unison')
-  au! BufNewFile,BufRead *.u,*.uu set ft=unison
+  au BufNewFile,BufRead *.u,*.uu set ft=unison
 endif
 
 if !has_key(s:disabled_packages, 'v')
-  au! BufNewFile,BufRead *.v set ft=v
+  au BufNewFile,BufRead *.v set ft=v
 endif
 
 if !has_key(s:disabled_packages, 'vala')
-  au! BufNewFile,BufRead *.vala,*.valadoc,*.vapi set ft=vala
+  au BufNewFile,BufRead *.vala,*.valadoc,*.vapi set ft=vala
 endif
 
 if !has_key(s:disabled_packages, 'vbnet')
-  au! BufNewFile,BufRead *.vb,*.vbhtml set ft=vbnet
+  au BufNewFile,BufRead *.vb,*.vbhtml set ft=vbnet
 endif
 
 if !has_key(s:disabled_packages, 'vcl')
-  au! BufNewFile,BufRead *.vcl set ft=vcl
+  au BufNewFile,BufRead *.vcl set ft=vcl
 endif
 
 if !has_key(s:disabled_packages, 'velocity')
-  au! BufNewFile,BufRead *.vm set ft=velocity
+  au BufNewFile,BufRead *.vm set ft=velocity
 endif
 
 if !has_key(s:disabled_packages, 'vmasm')
-  au! BufNewFile,BufRead *.mar set ft=vmasm
+  au BufNewFile,BufRead *.mar set ft=vmasm
 endif
 
 if !has_key(s:disabled_packages, 'vue')
-  au! BufNewFile,BufRead *.vue,*.wpy set ft=vue
+  au BufNewFile,BufRead *.vue,*.wpy set ft=vue
 endif
 
 if !has_key(s:disabled_packages, 'xdc')
-  au! BufNewFile,BufRead *.xdc set ft=xdc
+  au BufNewFile,BufRead *.xdc set ft=xdc
 endif
 
 if !has_key(s:disabled_packages, 'xsl')
-  au! BufNewFile,BufRead *.xsl,*.xslt set ft=xsl
+  au BufNewFile,BufRead *.xsl,*.xslt set ft=xsl
 endif
 
 if !has_key(s:disabled_packages, 'ansible')
-  au! BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml set ft=yaml.ansible
+  au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml set ft=yaml.ansible
   au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
   au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
 endif
 
 if !has_key(s:disabled_packages, 'helm')
-  au! BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml set ft=helm
+  au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml set ft=helm
 endif
 
 if !has_key(s:disabled_packages, 'help')
-  au! BufNewFile,BufRead $VIMRUNTIME/doc/*.txt set ft=help
+  au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt set ft=help
 endif
 
 if !has_key(s:disabled_packages, 'zephir')
-  au! BufNewFile,BufRead *.zep set ft=zephir
+  au BufNewFile,BufRead *.zep set ft=zephir
 endif
 
 if !has_key(s:disabled_packages, 'zig')
-  au! BufNewFile,BufRead *.zig,*.zir set ft=zig
-  au! BufNewFile,BufRead *.zir set ft=zir
+  au BufNewFile,BufRead *.zig,*.zir set ft=zig
+  au BufNewFile,BufRead *.zir set ft=zir
 endif
 
 if !has_key(s:disabled_packages, 'trasys')
@@ -954,31 +963,31 @@ if !has_key(s:disabled_packages, 'trasys')
 endif
 
 if !has_key(s:disabled_packages, 'basic')
-  au! BufNewFile,BufRead *.basic set ft=basic
+  au BufNewFile,BufRead *.basic set ft=basic
 endif
 
 if !has_key(s:disabled_packages, 'visual-basic')
   au! BufNewFile,BufRead *.bas call polyglot#detect#Bas()
-  au! BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs set ft=vb
+  au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs set ft=vb
 endif
 
 if !has_key(s:disabled_packages, 'dosini')
-  au! BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec set ft=dosini
+  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec set ft=dosini
   au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
   au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
 endif
 
 if !has_key(s:disabled_packages, 'odin')
-  au! BufNewFile,BufRead *.odin set ft=odin
+  au BufNewFile,BufRead *.odin set ft=odin
 endif
 
 if !has_key(s:disabled_packages, 'bzl')
-  au! BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE set ft=bzl
+  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE set ft=bzl
 endif
 
 if !has_key(s:disabled_packages, 'prolog')
   au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
-  au! BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap set ft=prolog
+  au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap set ft=prolog
 endif
 
 if !has_key(s:disabled_packages, 'tads')
@@ -986,11 +995,11 @@ if !has_key(s:disabled_packages, 'tads')
 endif
 
 if !has_key(s:disabled_packages, 'gitignore')
-  au! BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore set ft=gitignore
+  au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore set ft=gitignore
 endif
 
 if !has_key(s:disabled_packages, 'sql')
-  au! BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw set ft=sql
+  au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw set ft=sql
 endif
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
@@ -1201,6 +1210,6 @@ if exists('g:polyglot_disabled')
   let g:polyglot_disabled = s:new_polyglot_disabled
 endif
 
-" restore Vi compatibility settings
+" Restore 'cpoptions'
 let &cpo = s:cpo_save
-
+unlet s:cpo_save
diff --git a/scripts/build b/scripts/build
index a2f43fb2e..303f46414 100755
--- a/scripts/build
+++ b/scripts/build
@@ -395,7 +395,7 @@ def rule_to_code(rule)
   if rule.has_key?("filetype")
     if rule.has_key?("fallback")
       return <<~EOS
-        set ft=#{rule["filetype"]} | au! BufWritePost <buffer> ++once call polyglot#detect##{camelize(rule["extensions"].first)}()
+        set ft=#{rule["filetype"]} | au BufWritePost <buffer> ++once call polyglot#detect##{camelize(rule["extensions"].first)}()
         return
       EOS
     end
@@ -564,7 +564,7 @@ def generate_ftdetect(packages, heuristics)
       end
 
       if set_globs.size > 0
-        autocommands << "  au! BufNewFile,BufRead #{set_globs.join(",")} #{set_command}\n"
+        autocommands << "  au BufNewFile,BufRead #{set_globs.join(",")} #{set_command}\n"
       end
     end
 
@@ -583,13 +583,13 @@ def generate_ftdetect(packages, heuristics)
 
   show_warnings(all_filetypes, expected_filetypes)
 
-  ftdetect = File.read('ftdetect/polyglot.vim')
+  ftdetect = File.read('filetype.vim')
 
   starting = '" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE'
   ending = '" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE'
 
   File.write(
-    'ftdetect/polyglot.vim',
+    'filetype.vim',
     ftdetect.gsub(/(?<=#{starting}\n)(.*)(?=#{ending})/m) { output }
   )
 
diff --git a/tests/extensions.vim b/tests/extensions.vim
index 6492e1ac8..f66065321 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -30,6 +30,7 @@ call TestExtension("sh", "bash3", "#! /bin/bash2.3")
 call TestExtension("sh", "bash4", "#!/usr/bin/env bash")
 call TestExtension("sh", "bash6", "#!/usr/bin/env -i -=split-string foo=bar bash -l foo")
 call TestExtension("sh", "bash1", "#!/bin/bash")
+" This is defined only by vim-native scripts.vim for now
 call TestExtension("sh", "bash7", ":")
 
 " Vim help file

From 7036147860952571d2d11b2218c72431f535a660 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Sep 2020 01:23:41 +0200
Subject: [PATCH 095/299] Brag in readme about shortened ftdetect time

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ef1360421..545fa0ce0 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ A collection of language packs for Vim.
 - Automatically detect indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth))
 - Each build is tested by automated vimrunner script on CI. See `spec` directory.
 
-\*To be completely honest, optimized `ftdetect` script takes around `20ms` to load.
+\*To be completely honest, optimized `ftdetect` script takes around `10ms` to load.
 
 ## Installation
 

From 449bb882486ee69cc63f812120218ed5c17a1ef7 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Sep 2020 01:40:34 +0200
Subject: [PATCH 096/299] Make loading faster for ambiguous extensions without
 heuristics

---
 filetype.vim  | 974 +++++++++++++++++++++++++-------------------------
 scripts/build |   5 +-
 2 files changed, 490 insertions(+), 489 deletions(-)

diff --git a/filetype.vim b/filetype.vim
index b6b78fd5d..34c31ef3d 100644
--- a/filetype.vim
+++ b/filetype.vim
@@ -108,898 +108,898 @@ augroup filetypedetect
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
-if !has_key(s:disabled_packages, '8th')
-  au BufNewFile,BufRead *.8th set ft=8th
+if !has_key(s:disabled_packages, 'sql')
+  au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw setf sql
 endif
 
-if !has_key(s:disabled_packages, 'conf')
-  au BufNewFile,BufRead *.conf,auto.master,config set ft=conf
+if !has_key(s:disabled_packages, 'gitignore')
+  au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore setf gitignore
 endif
 
-if !has_key(s:disabled_packages, 'haproxy')
-  au BufNewFile,BufRead *.cfg,haproxy.cfg set ft=haproxy
-  au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
+if !has_key(s:disabled_packages, 'tads')
+  au! BufNewFile,BufRead *.t call polyglot#detect#T()
 endif
 
-if !has_key(s:disabled_packages, 'a2ps')
-  au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc set ft=a2ps
+if !has_key(s:disabled_packages, 'prolog')
+  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap setf prolog
 endif
 
-if !has_key(s:disabled_packages, 'a65')
-  au BufNewFile,BufRead *.a65 set ft=a65
+if !has_key(s:disabled_packages, 'bzl')
+  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE setf bzl
 endif
 
-if !has_key(s:disabled_packages, 'aap')
-  au BufNewFile,BufRead *.aap set ft=aap
+if !has_key(s:disabled_packages, 'odin')
+  au BufNewFile,BufRead *.odin setf odin
 endif
 
-if !has_key(s:disabled_packages, 'abap')
-  au BufNewFile,BufRead *.abap set ft=abap
+if !has_key(s:disabled_packages, 'dosini')
+  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec setf dosini
+  au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
+  au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
 endif
 
-if !has_key(s:disabled_packages, 'abaqus')
-  au! BufNewFile,BufRead *.inp call polyglot#detect#Inp()
+if !has_key(s:disabled_packages, 'visual-basic')
+  au! BufNewFile,BufRead *.bas call polyglot#detect#Bas()
+  au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs setf vb
 endif
 
-if !has_key(s:disabled_packages, 'abc')
-  au BufNewFile,BufRead *.abc set ft=abc
+if !has_key(s:disabled_packages, 'basic')
+  au BufNewFile,BufRead *.basic setf basic
 endif
 
-if !has_key(s:disabled_packages, 'abel')
-  au BufNewFile,BufRead *.abl set ft=abel
+if !has_key(s:disabled_packages, 'trasys')
+  au! BufNewFile,BufRead *.inp call polyglot#detect#Inp()
 endif
 
-if !has_key(s:disabled_packages, 'acedb')
-  au BufNewFile,BufRead *.wrm set ft=acedb
+if !has_key(s:disabled_packages, 'zig')
+  au BufNewFile,BufRead *.zig,*.zir setf zig
+  au BufNewFile,BufRead *.zir setf zir
 endif
 
-if !has_key(s:disabled_packages, 'acpiasl')
-  au BufNewFile,BufRead *.asl,*.dsl set ft=asl
+if !has_key(s:disabled_packages, 'zephir')
+  au BufNewFile,BufRead *.zep setf zephir
 endif
 
-if !has_key(s:disabled_packages, 'ada')
-  au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr set ft=ada
+if !has_key(s:disabled_packages, 'help')
+  au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt setf help
 endif
 
-if !has_key(s:disabled_packages, 'ahdl')
-  au BufNewFile,BufRead *.tdf set ft=ahdl
+if !has_key(s:disabled_packages, 'helm')
+  au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml setf helm
 endif
 
-if !has_key(s:disabled_packages, 'aidl')
-  au BufNewFile,BufRead *.aidl set ft=aidl
+if !has_key(s:disabled_packages, 'ansible')
+  au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml setf yaml.ansible
+  au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
+  au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
 endif
 
-if !has_key(s:disabled_packages, 'alsaconf')
-  au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc set ft=alsaconf
+if !has_key(s:disabled_packages, 'xsl')
+  au BufNewFile,BufRead *.xsl,*.xslt setf xsl
 endif
 
-if !has_key(s:disabled_packages, 'aml')
-  au BufNewFile,BufRead *.aml set ft=aml
+if !has_key(s:disabled_packages, 'xdc')
+  au BufNewFile,BufRead *.xdc setf xdc
 endif
 
-if !has_key(s:disabled_packages, 'ampl')
-  au BufNewFile,BufRead *.run set ft=ampl
+if !has_key(s:disabled_packages, 'vue')
+  au BufNewFile,BufRead *.vue,*.wpy setf vue
 endif
 
-if !has_key(s:disabled_packages, 'csv')
-  au BufNewFile,BufRead *.csv,*.tab,*.tsv set ft=csv
+if !has_key(s:disabled_packages, 'vmasm')
+  au BufNewFile,BufRead *.mar setf vmasm
 endif
 
-if !has_key(s:disabled_packages, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config set ft=xml
+if !has_key(s:disabled_packages, 'velocity')
+  au BufNewFile,BufRead *.vm setf velocity
 endif
 
-if !has_key(s:disabled_packages, 'ant')
-  au BufNewFile,BufRead build.xml set ft=ant
+if !has_key(s:disabled_packages, 'vcl')
+  au BufNewFile,BufRead *.vcl setf vcl
 endif
 
-if !has_key(s:disabled_packages, 'apache')
-  au BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess set ft=apache
-  au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead apache.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead access.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/sites-*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/mods-*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/conf.*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/*.conf* call s:StarSetf('apache')
+if !has_key(s:disabled_packages, 'vbnet')
+  au BufNewFile,BufRead *.vb,*.vbhtml setf vbnet
 endif
 
-if !has_key(s:disabled_packages, 'apiblueprint')
-  au BufNewFile,BufRead *.apib set ft=apiblueprint
+if !has_key(s:disabled_packages, 'vala')
+  au BufNewFile,BufRead *.vala,*.valadoc,*.vapi setf vala
 endif
 
-if !has_key(s:disabled_packages, 'applescript')
-  au BufNewFile,BufRead *.applescript,*.scpt set ft=applescript
+if !has_key(s:disabled_packages, 'v')
+  au BufNewFile,BufRead *.v setf v
 endif
 
-if !has_key(s:disabled_packages, 'aptconf')
-  au BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf set ft=aptconf
-  au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
+if !has_key(s:disabled_packages, 'unison')
+  au BufNewFile,BufRead *.u,*.uu setf unison
 endif
 
-if !has_key(s:disabled_packages, 'arch')
-  au BufNewFile,BufRead {.,}arch-inventory,=tagging-method set ft=arch
+if !has_key(s:disabled_packages, 'typescript')
+  au BufNewFile,BufRead *.tsx setf typescriptreact
+  au BufNewFile,BufRead *.ts setf typescript
 endif
 
-if !has_key(s:disabled_packages, 'c/c++')
-  au! BufNewFile,BufRead *.h call polyglot#detect#H()
-  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg set ft=c
-  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp set ft=cpp
+if !has_key(s:disabled_packages, 'twig')
+  au BufNewFile,BufRead *.xml.twig setf xml.twig
+  au BufNewFile,BufRead *.twig setf html.twig
 endif
 
-if !has_key(s:disabled_packages, 'arduino')
-  au BufNewFile,BufRead *.ino,*.pde set ft=arduino
+if !has_key(s:disabled_packages, 'tptp')
+  au BufNewFile,BufRead *.ax,*.p,*.tptp setf tptp
 endif
 
-if !has_key(s:disabled_packages, 'art')
-  au BufNewFile,BufRead *.art set ft=art
+if !has_key(s:disabled_packages, 'toml')
+  au BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock setf toml
 endif
 
-if !has_key(s:disabled_packages, 'asciidoc')
-  au BufNewFile,BufRead *.adoc,*.asc,*.asciidoc set ft=asciidoc
+if !has_key(s:disabled_packages, 'tmux')
+  au BufNewFile,BufRead {.,}tmux*.conf setf tmux
 endif
 
-if !has_key(s:disabled_packages, 'autohotkey')
-  au BufNewFile,BufRead *.ahk,*.ahkl set ft=autohotkey
+if !has_key(s:disabled_packages, 'thrift')
+  au BufNewFile,BufRead *.thrift setf thrift
 endif
 
-if !has_key(s:disabled_packages, 'elf')
-  au BufNewFile,BufRead *.am set ft=elf
+if !has_key(s:disabled_packages, 'textile')
+  au BufNewFile,BufRead *.textile setf textile
 endif
 
-if !has_key(s:disabled_packages, 'automake')
-  au BufNewFile,BufRead GNUmakefile.am,[Mm]akefile.am set ft=automake
+if !has_key(s:disabled_packages, 'terraform')
+  au BufNewFile,BufRead *.tf,*.tfvars setf terraform
 endif
 
-if !has_key(s:disabled_packages, 'asn')
-  au BufNewFile,BufRead *.asn,*.asn1 set ft=asn
+if !has_key(s:disabled_packages, 'systemd')
+  au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf setf systemd
+  au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
 endif
 
-if !has_key(s:disabled_packages, 'aspvbs')
-  au! BufNewFile,BufRead *.asp call polyglot#detect#Asp()
-  au! BufNewFile,BufRead *.asa call polyglot#detect#Asa()
+if !has_key(s:disabled_packages, 'sxhkd')
+  au BufNewFile,BufRead *.sxhkdrc,sxhkdrc setf sxhkdrc
 endif
 
-if !has_key(s:disabled_packages, 'aspperl')
-  au! BufNewFile,BufRead *.asp call polyglot#detect#Asp()
+if !has_key(s:disabled_packages, 'swift')
+  au BufNewFile,BufRead *.swift setf swift
 endif
 
-if !has_key(s:disabled_packages, 'atlas')
-  au BufNewFile,BufRead *.as,*.atl set ft=atlas
+if !has_key(s:disabled_packages, 'svg-indent')
 endif
 
-if !has_key(s:disabled_packages, 'autoit')
-  au BufNewFile,BufRead *.au3 set ft=autoit
+if !has_key(s:disabled_packages, 'svg')
+  au BufNewFile,BufRead *.svg setf svg
 endif
 
-if !has_key(s:disabled_packages, 'ave')
-  au BufNewFile,BufRead *.ave set ft=ave
+if !has_key(s:disabled_packages, 'svelte')
+  au BufNewFile,BufRead *.svelte setf svelte
 endif
 
-if !has_key(s:disabled_packages, 'awk')
-  au BufNewFile,BufRead *.awk,*.gawk set ft=awk
+if !has_key(s:disabled_packages, 'stylus')
+  au BufNewFile,BufRead *.styl,*.stylus setf stylus
 endif
 
-if !has_key(s:disabled_packages, 'caddyfile')
-  au BufNewFile,BufRead Caddyfile set ft=caddyfile
+if !has_key(s:disabled_packages, 'solidity')
+  au BufNewFile,BufRead *.sol setf solidity
 endif
 
-if !has_key(s:disabled_packages, 'cpp-modern')
+if !has_key(s:disabled_packages, 'smt2')
+  au BufNewFile,BufRead *.smt,*.smt2 setf smt2
 endif
 
-if !has_key(s:disabled_packages, 'carp')
-  au BufNewFile,BufRead *.carp set ft=carp
+if !has_key(s:disabled_packages, 'slime')
+  au BufNewFile,BufRead *.slime setf slime
 endif
 
-if !has_key(s:disabled_packages, 'clojure')
-  au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config set ft=clojure
+if !has_key(s:disabled_packages, 'slim')
+  au BufNewFile,BufRead *.slim setf slim
 endif
 
-if !has_key(s:disabled_packages, 'cmake')
-  au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt set ft=cmake
+if !has_key(s:disabled_packages, 'zinit')
 endif
 
-if !has_key(s:disabled_packages, 'coffee-script')
-  au BufNewFile,BufRead *.coffee.md,*.litcoffee set ft=litcoffee
-  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile set ft=coffee
+if !has_key(s:disabled_packages, 'sh')
+  au BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
+  au BufNewFile,BufRead {.,}zsh* call s:StarSetf('zsh')
+  au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh')
+  au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
+  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc setf sh
 endif
 
-if !has_key(s:disabled_packages, 'cjsx')
+if !has_key(s:disabled_packages, 'scss')
+  au BufNewFile,BufRead *.scss setf scss
 endif
 
-if !has_key(s:disabled_packages, 'cryptol')
-  au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl set ft=cryptol
+if !has_key(s:disabled_packages, 'sbt')
+  au BufNewFile,BufRead *.sbt setf sbt.scala
 endif
 
-if !has_key(s:disabled_packages, 'crystal')
-  au BufNewFile,BufRead *.ecr set ft=ecrystal
-  au BufNewFile,BufRead *.cr,Projectfile set ft=crystal
+if !has_key(s:disabled_packages, 'scala')
+  au BufNewFile,BufRead *.kojo,*.sc,*.scala setf scala
 endif
 
-if !has_key(s:disabled_packages, 'cucumber')
-  au BufNewFile,BufRead *.feature,*.story set ft=cucumber
+if !has_key(s:disabled_packages, 'rust')
+  au BufNewFile,BufRead *.rs,*.rs.in setf rust
 endif
 
-if !has_key(s:disabled_packages, 'cue')
-  au BufNewFile,BufRead *.cue set ft=cuesheet
+if !has_key(s:disabled_packages, 'brewfile')
+  au BufNewFile,BufRead Brewfile setf brewfile
 endif
 
-if !has_key(s:disabled_packages, 'dart')
-  au BufNewFile,BufRead *.dart,*.drt set ft=dart
+if !has_key(s:disabled_packages, 'yard')
 endif
 
-if !has_key(s:disabled_packages, 'dhall')
-  au BufNewFile,BufRead *.dhall set ft=dhall
+if !has_key(s:disabled_packages, 'rspec')
+  au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
 endif
 
-if !has_key(s:disabled_packages, 'dlang')
-  au BufNewFile,BufRead *.sdl set ft=dsdl
-  au BufNewFile,BufRead *.ddoc set ft=ddoc
-  au BufNewFile,BufRead *.dd set ft=dd
-  au BufNewFile,BufRead *.lst set ft=dcov
-  au BufNewFile,BufRead *.d,*.di set ft=d
+if !has_key(s:disabled_packages, 'ruby')
+  au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml setf eruby
+  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile setf ruby
+  au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
 endif
 
-if !has_key(s:disabled_packages, 'yaml')
-  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock set ft=yaml
+if !has_key(s:disabled_packages, 'rst')
+  au BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt setf rst
 endif
 
-if !has_key(s:disabled_packages, 'dockerfile')
-  au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml set ft=yaml.docker-compose
-  au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile set ft=Dockerfile
-  au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
+if !has_key(s:disabled_packages, 'reason')
+  au! BufNewFile,BufRead *.re call polyglot#detect#Re()
+  au BufNewFile,BufRead *.rei setf reason
 endif
 
-if !has_key(s:disabled_packages, 'elixir')
-  au BufNewFile,BufRead *.eex,*.leex set ft=eelixir
-  au BufNewFile,BufRead *.ex,*.exs,mix.lock set ft=elixir
+if !has_key(s:disabled_packages, 'razor')
+  au BufNewFile,BufRead *.cshtml,*.razor setf razor
 endif
 
-if !has_key(s:disabled_packages, 'elm')
-  au BufNewFile,BufRead *.elm set ft=elm
+if !has_key(s:disabled_packages, 'raml')
+  au BufNewFile,BufRead *.raml setf raml
 endif
 
-if !has_key(s:disabled_packages, 'emberscript')
-  au BufNewFile,BufRead *.em,*.emberscript set ft=ember-script
+if !has_key(s:disabled_packages, 'raku')
+  au! BufNewFile,BufRead *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 setf raku
 endif
 
-if !has_key(s:disabled_packages, 'emblem')
-  au BufNewFile,BufRead *.em,*.emblem set ft=emblem
+if !has_key(s:disabled_packages, 'ragel')
+  au BufNewFile,BufRead *.rl setf ragel
 endif
 
-if !has_key(s:disabled_packages, 'erlang')
-  au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock set ft=erlang
+if !has_key(s:disabled_packages, 'racket')
+  au BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl setf racket
 endif
 
-if !has_key(s:disabled_packages, 'fennel')
-  au BufNewFile,BufRead *.fnl set ft=fennel
+if !has_key(s:disabled_packages, 'r-lang')
+  au BufNewFile,BufRead *.rd setf rhelp
+  au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist setf r
 endif
 
-if !has_key(s:disabled_packages, 'ferm')
-  au BufNewFile,BufRead *.ferm,ferm.conf set ft=ferm
+if !has_key(s:disabled_packages, 'qml')
+  au BufNewFile,BufRead *.qbs,*.qml setf qml
 endif
 
-if !has_key(s:disabled_packages, 'fish')
-  au BufNewFile,BufRead *.fish set ft=fish
+if !has_key(s:disabled_packages, 'qmake')
+  au BufNewFile,BufRead *.pri,*.pro setf qmake
 endif
 
-if !has_key(s:disabled_packages, 'flatbuffers')
-  au BufNewFile,BufRead *.fbs set ft=fbs
+if !has_key(s:disabled_packages, 'requirements')
+  au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} setf requirements
 endif
 
-if !has_key(s:disabled_packages, 'forth')
-  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
-  au BufNewFile,BufRead *.ft,*.fth set ft=forth
+if !has_key(s:disabled_packages, 'python-compiler')
 endif
 
-if !has_key(s:disabled_packages, 'fsharp')
-  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
-  au BufNewFile,BufRead *.fsi,*.fsx set ft=fsharp
+if !has_key(s:disabled_packages, 'python-indent')
 endif
 
-if !has_key(s:disabled_packages, 'gdscript')
-  au BufNewFile,BufRead *.gd set ft=gdscript3
+if !has_key(s:disabled_packages, 'python')
+  au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript setf python
 endif
 
-if !has_key(s:disabled_packages, 'git')
-  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG set ft=gitcommit
-  au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
-  au BufNewFile,BufRead git-rebase-todo set ft=gitrebase
-  au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules set ft=gitconfig
-  au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
+if !has_key(s:disabled_packages, 'purescript')
+  au BufNewFile,BufRead *.purs setf purescript
 endif
 
-if !has_key(s:disabled_packages, 'glsl')
-  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
-  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader set ft=glsl
+if !has_key(s:disabled_packages, 'puppet')
+  au BufNewFile,BufRead *.epp setf embeddedpuppet
+  au BufNewFile,BufRead *.pp,Modulefile setf puppet
 endif
 
-if !has_key(s:disabled_packages, 'gmpl')
-  au BufNewFile,BufRead *.mod set ft=gmpl
+if !has_key(s:disabled_packages, 'pug')
+  au BufNewFile,BufRead *.jade,*.pug setf pug
 endif
 
-if !has_key(s:disabled_packages, 'gnuplot')
-  au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt set ft=gnuplot
+if !has_key(s:disabled_packages, 'protobuf')
+  au BufNewFile,BufRead *.proto setf proto
 endif
 
-if !has_key(s:disabled_packages, 'go')
-  au BufNewFile,BufRead *.tmpl set ft=gohtmltmpl
-  au BufNewFile,BufRead go.mod set ft=gomod
-  au BufNewFile,BufRead *.go set ft=go
+if !has_key(s:disabled_packages, 'powershell')
+  au BufNewFile,BufRead *.ps1xml setf ps1xml
+  au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc setf ps1
 endif
 
-if !has_key(s:disabled_packages, 'javascript')
-  au BufNewFile,BufRead *.flow set ft=flow
-  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile set ft=javascript
+if !has_key(s:disabled_packages, 'pony')
+  au BufNewFile,BufRead *.pony setf pony
 endif
 
-if !has_key(s:disabled_packages, 'jsx')
-  au BufNewFile,BufRead *.jsx set ft=javascriptreact
+if !has_key(s:disabled_packages, 'plantuml')
+  au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml setf plantuml
 endif
 
-if !has_key(s:disabled_packages, 'graphql')
-  au BufNewFile,BufRead *.gql,*.graphql,*.graphqls set ft=graphql
+if !has_key(s:disabled_packages, 'blade')
+  au BufNewFile,BufRead *.blade,*.blade.php setf blade
 endif
 
-if !has_key(s:disabled_packages, 'groovy')
-  au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile set ft=groovy
+if !has_key(s:disabled_packages, 'php')
+  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile setf php
 endif
 
-if !has_key(s:disabled_packages, 'gradle')
+if !has_key(s:disabled_packages, 'cql')
+  au BufNewFile,BufRead *.cql setf cql
 endif
 
-if !has_key(s:disabled_packages, 'grub')
-  au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf set ft=grub
+if !has_key(s:disabled_packages, 'pgsql')
+  au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
 endif
 
-if !has_key(s:disabled_packages, 'haml')
-  au BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc set ft=haml
+if !has_key(s:disabled_packages, 'perl')
+  au! BufNewFile,BufRead *.tt2 call polyglot#detect#Tt2()
+  au! BufNewFile,BufRead *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead *.xs setf xs
+  au BufNewFile,BufRead *.comp,*.mason,*.mhtml setf mason
+  au BufNewFile,BufRead *.pod setf pod
+  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc setf perl
 endif
 
-if !has_key(s:disabled_packages, 'handlebars')
-  au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs set ft=html.handlebars
-  au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache set ft=html.mustache
+if !has_key(s:disabled_packages, 'opencl')
+  au BufNewFile,BufRead *.cl,*.opencl setf opencl
 endif
 
-if !has_key(s:disabled_packages, 'haskell')
-  au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig set ft=haskell
+if !has_key(s:disabled_packages, 'octave')
+  au! BufNewFile,BufRead *.m call polyglot#detect#M()
+  au BufNewFile,BufRead *.oct setf octave
 endif
 
-if !has_key(s:disabled_packages, 'haxe')
-  au BufNewFile,BufRead *.hx,*.hxsl set ft=haxe
+if !has_key(s:disabled_packages, 'ocaml')
+  au BufNewFile,BufRead *.sexp setf sexplib
+  au BufNewFile,BufRead *.root setf ocpbuildroot
+  au BufNewFile,BufRead *.ocp setf ocpbuild
+  au BufNewFile,BufRead _tags setf ocamlbuild_tags
+  au BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild setf dune
+  au BufNewFile,BufRead _oasis setf oasis
+  au BufNewFile,BufRead *.opam,*.opam.template,opam setf opam
+  au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in setf omake
+  au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit setf ocaml
 endif
 
-if !has_key(s:disabled_packages, 'hcl')
-  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile set ft=hcl
+if !has_key(s:disabled_packages, 'objc')
+  au! BufNewFile,BufRead *.m call polyglot#detect#M()
+  au! BufNewFile,BufRead *.h call polyglot#detect#H()
 endif
 
-if !has_key(s:disabled_packages, 'hive')
-  au BufNewFile,BufRead *.hql,*.q,*.ql set ft=hive
+if !has_key(s:disabled_packages, 'nix')
+  au BufNewFile,BufRead *.nix setf nix
 endif
 
-if !has_key(s:disabled_packages, 'html5')
-  au! BufNewFile,BufRead *.html call polyglot#detect#Html()
-  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml set ft=html
+if !has_key(s:disabled_packages, 'nim')
+  au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg setf nim
 endif
 
-if !has_key(s:disabled_packages, 'i3')
-  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config set ft=i3config
+if !has_key(s:disabled_packages, 'nginx')
+  au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf setf nginx
+  au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
+  au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
 endif
 
-if !has_key(s:disabled_packages, 'icalendar')
-  au BufNewFile,BufRead *.ics set ft=icalendar
+if !has_key(s:disabled_packages, 'murphi')
+  au! BufNewFile,BufRead *.m call polyglot#detect#M()
 endif
 
-if !has_key(s:disabled_packages, 'idris')
-  au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
-  au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
-  au BufNewFile,BufRead idris-response set ft=idris
+if !has_key(s:disabled_packages, 'moonscript')
+  au BufNewFile,BufRead *.moon setf moon
 endif
 
-if !has_key(s:disabled_packages, 'idris2')
-  au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
-  au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
-  au BufNewFile,BufRead *.ipkg,idris-response set ft=idris2
+if !has_key(s:disabled_packages, 'meson')
+  au BufNewFile,BufRead *.wrap setf dosini
+  au BufNewFile,BufRead meson.build,meson_options.txt setf meson
 endif
 
-if !has_key(s:disabled_packages, 'ion')
-  au BufNewFile,BufRead *.ion,~/.config/ion/initrc set ft=ion
+if !has_key(s:disabled_packages, 'mdx')
+  au BufNewFile,BufRead *.mdx setf markdown.mdx
 endif
 
-if !has_key(s:disabled_packages, 'javascript-sql')
+if !has_key(s:disabled_packages, 'markdown')
+  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr setf markdown
 endif
 
-if !has_key(s:disabled_packages, 'jenkins')
-  au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile set ft=Jenkinsfile
-  au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
+if !has_key(s:disabled_packages, 'mathematica')
+  au! BufNewFile,BufRead *.m call polyglot#detect#M()
+  au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt setf mma
 endif
 
-if !has_key(s:disabled_packages, 'htmldjango')
-  au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk set ft=htmldjango
+if !has_key(s:disabled_packages, 'mako')
+  au BufNewFile,BufRead *.mako,*.mao setf mako
+  au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
 endif
 
-if !has_key(s:disabled_packages, 'jq')
-  au BufNewFile,BufRead *.jq,{.,}jqrc set ft=jq
-  au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq')
+if !has_key(s:disabled_packages, 'm4')
+  au BufNewFile,BufRead *.at,*.m4 setf m4
 endif
 
-if !has_key(s:disabled_packages, 'json5')
-  au BufNewFile,BufRead *.json5 set ft=json5
+if !has_key(s:disabled_packages, 'lua')
+  au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc setf lua
 endif
 
-if !has_key(s:disabled_packages, 'json')
-  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info set ft=json
+if !has_key(s:disabled_packages, 'log')
+  au BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log setf log
 endif
 
-if !has_key(s:disabled_packages, 'jsonnet')
-  au BufNewFile,BufRead *.jsonnet,*.libsonnet set ft=jsonnet
+if !has_key(s:disabled_packages, 'llvm')
+  au BufNewFile,BufRead *.td setf tablegen
+  au BufNewFile,BufRead *.ll setf llvm
 endif
 
-if !has_key(s:disabled_packages, 'jst')
-  au BufNewFile,BufRead *.ect,*.ejs,*.jst set ft=jst
+if !has_key(s:disabled_packages, 'livescript')
+  au BufNewFile,BufRead *._ls,*.ls,Slakefile setf livescript
 endif
 
-if !has_key(s:disabled_packages, 'julia')
-  au BufNewFile,BufRead *.jl set ft=julia
+if !has_key(s:disabled_packages, 'lilypond')
+  au BufNewFile,BufRead *.ily,*.ly setf lilypond
 endif
 
-if !has_key(s:disabled_packages, 'kotlin')
-  au BufNewFile,BufRead *.kt,*.ktm,*.kts set ft=kotlin
+if !has_key(s:disabled_packages, 'less')
+  au BufNewFile,BufRead *.less setf less
 endif
 
 if !has_key(s:disabled_packages, 'ledger')
-  au BufNewFile,BufRead *.journal,*.ldg,*.ledger set ft=ledger
+  au BufNewFile,BufRead *.journal,*.ldg,*.ledger setf ledger
 endif
 
-if !has_key(s:disabled_packages, 'less')
-  au BufNewFile,BufRead *.less set ft=less
+if !has_key(s:disabled_packages, 'kotlin')
+  au BufNewFile,BufRead *.kt,*.ktm,*.kts setf kotlin
 endif
 
-if !has_key(s:disabled_packages, 'lilypond')
-  au BufNewFile,BufRead *.ily,*.ly set ft=lilypond
+if !has_key(s:disabled_packages, 'julia')
+  au BufNewFile,BufRead *.jl setf julia
 endif
 
-if !has_key(s:disabled_packages, 'livescript')
-  au BufNewFile,BufRead *._ls,*.ls,Slakefile set ft=livescript
+if !has_key(s:disabled_packages, 'jst')
+  au BufNewFile,BufRead *.ect,*.ejs,*.jst setf jst
 endif
 
-if !has_key(s:disabled_packages, 'llvm')
-  au BufNewFile,BufRead *.td set ft=tablegen
-  au BufNewFile,BufRead *.ll set ft=llvm
+if !has_key(s:disabled_packages, 'jsonnet')
+  au BufNewFile,BufRead *.jsonnet,*.libsonnet setf jsonnet
 endif
 
-if !has_key(s:disabled_packages, 'log')
-  au BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log set ft=log
+if !has_key(s:disabled_packages, 'json')
+  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
 endif
 
-if !has_key(s:disabled_packages, 'lua')
-  au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc set ft=lua
+if !has_key(s:disabled_packages, 'json5')
+  au BufNewFile,BufRead *.json5 setf json5
 endif
 
-if !has_key(s:disabled_packages, 'm4')
-  au BufNewFile,BufRead *.at,*.m4 set ft=m4
+if !has_key(s:disabled_packages, 'jq')
+  au BufNewFile,BufRead *.jq,{.,}jqrc setf jq
+  au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq')
 endif
 
-if !has_key(s:disabled_packages, 'mako')
-  au BufNewFile,BufRead *.mako,*.mao set ft=mako
-  au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+if !has_key(s:disabled_packages, 'htmldjango')
+  au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk setf htmldjango
 endif
 
-if !has_key(s:disabled_packages, 'mathematica')
-  au! BufNewFile,BufRead *.m call polyglot#detect#M()
-  au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt set ft=mma
+if !has_key(s:disabled_packages, 'jenkins')
+  au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile setf Jenkinsfile
+  au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
-if !has_key(s:disabled_packages, 'markdown')
-  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr set ft=markdown
+if !has_key(s:disabled_packages, 'javascript-sql')
 endif
 
-if !has_key(s:disabled_packages, 'mdx')
-  au BufNewFile,BufRead *.mdx set ft=markdown.mdx
+if !has_key(s:disabled_packages, 'ion')
+  au BufNewFile,BufRead *.ion,~/.config/ion/initrc setf ion
 endif
 
-if !has_key(s:disabled_packages, 'meson')
-  au BufNewFile,BufRead *.wrap set ft=dosini
-  au BufNewFile,BufRead meson.build,meson_options.txt set ft=meson
+if !has_key(s:disabled_packages, 'idris2')
+  au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
+  au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
+  au BufNewFile,BufRead *.ipkg,idris-response setf idris2
 endif
 
-if !has_key(s:disabled_packages, 'moonscript')
-  au BufNewFile,BufRead *.moon set ft=moon
+if !has_key(s:disabled_packages, 'idris')
+  au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
+  au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
+  au BufNewFile,BufRead idris-response setf idris
 endif
 
-if !has_key(s:disabled_packages, 'murphi')
-  au! BufNewFile,BufRead *.m call polyglot#detect#M()
+if !has_key(s:disabled_packages, 'icalendar')
+  au BufNewFile,BufRead *.ics setf icalendar
 endif
 
-if !has_key(s:disabled_packages, 'nginx')
-  au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf set ft=nginx
-  au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
-  au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
+if !has_key(s:disabled_packages, 'i3')
+  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config setf i3config
 endif
 
-if !has_key(s:disabled_packages, 'nim')
-  au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg set ft=nim
+if !has_key(s:disabled_packages, 'html5')
+  au! BufNewFile,BufRead *.html call polyglot#detect#Html()
+  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
 endif
 
-if !has_key(s:disabled_packages, 'nix')
-  au BufNewFile,BufRead *.nix set ft=nix
+if !has_key(s:disabled_packages, 'hive')
+  au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
 endif
 
-if !has_key(s:disabled_packages, 'objc')
-  au! BufNewFile,BufRead *.m call polyglot#detect#M()
-  au! BufNewFile,BufRead *.h call polyglot#detect#H()
+if !has_key(s:disabled_packages, 'hcl')
+  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile setf hcl
 endif
 
-if !has_key(s:disabled_packages, 'ocaml')
-  au BufNewFile,BufRead *.sexp set ft=sexplib
-  au BufNewFile,BufRead *.root set ft=ocpbuildroot
-  au BufNewFile,BufRead *.ocp set ft=ocpbuild
-  au BufNewFile,BufRead _tags set ft=ocamlbuild_tags
-  au BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild set ft=dune
-  au BufNewFile,BufRead _oasis set ft=oasis
-  au BufNewFile,BufRead *.opam,*.opam.template,opam set ft=opam
-  au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in set ft=omake
-  au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit set ft=ocaml
+if !has_key(s:disabled_packages, 'haxe')
+  au BufNewFile,BufRead *.hx,*.hxsl setf haxe
 endif
 
-if !has_key(s:disabled_packages, 'octave')
-  au! BufNewFile,BufRead *.m call polyglot#detect#M()
-  au BufNewFile,BufRead *.oct set ft=octave
+if !has_key(s:disabled_packages, 'haskell')
+  au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig setf haskell
 endif
 
-if !has_key(s:disabled_packages, 'opencl')
-  au BufNewFile,BufRead *.cl,*.opencl set ft=opencl
+if !has_key(s:disabled_packages, 'handlebars')
+  au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs setf html.handlebars
+  au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache setf html.mustache
 endif
 
-if !has_key(s:disabled_packages, 'perl')
-  au! BufNewFile,BufRead *.tt2 call polyglot#detect#Tt2()
-  au! BufNewFile,BufRead *.t call polyglot#detect#T()
-  au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
-  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
-  au BufNewFile,BufRead *.xs set ft=xs
-  au BufNewFile,BufRead *.comp,*.mason,*.mhtml set ft=mason
-  au BufNewFile,BufRead *.pod set ft=pod
-  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc set ft=perl
+if !has_key(s:disabled_packages, 'haml')
+  au BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc setf haml
 endif
 
-if !has_key(s:disabled_packages, 'pgsql')
-  au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
+if !has_key(s:disabled_packages, 'grub')
+  au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf setf grub
 endif
 
-if !has_key(s:disabled_packages, 'cql')
-  au BufNewFile,BufRead *.cql set ft=cql
+if !has_key(s:disabled_packages, 'gradle')
 endif
 
-if !has_key(s:disabled_packages, 'php')
-  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile set ft=php
+if !has_key(s:disabled_packages, 'groovy')
+  au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile setf groovy
 endif
 
-if !has_key(s:disabled_packages, 'blade')
-  au BufNewFile,BufRead *.blade,*.blade.php set ft=blade
+if !has_key(s:disabled_packages, 'graphql')
+  au BufNewFile,BufRead *.gql,*.graphql,*.graphqls setf graphql
 endif
 
-if !has_key(s:disabled_packages, 'plantuml')
-  au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml set ft=plantuml
+if !has_key(s:disabled_packages, 'jsx')
+  au BufNewFile,BufRead *.jsx setf javascriptreact
 endif
 
-if !has_key(s:disabled_packages, 'pony')
-  au BufNewFile,BufRead *.pony set ft=pony
+if !has_key(s:disabled_packages, 'javascript')
+  au BufNewFile,BufRead *.flow setf flow
+  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
 endif
 
-if !has_key(s:disabled_packages, 'powershell')
-  au BufNewFile,BufRead *.ps1xml set ft=ps1xml
-  au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc set ft=ps1
+if !has_key(s:disabled_packages, 'go')
+  au BufNewFile,BufRead *.tmpl setf gohtmltmpl
+  au BufNewFile,BufRead go.mod setf gomod
+  au BufNewFile,BufRead *.go setf go
 endif
 
-if !has_key(s:disabled_packages, 'protobuf')
-  au BufNewFile,BufRead *.proto set ft=proto
+if !has_key(s:disabled_packages, 'gnuplot')
+  au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt setf gnuplot
 endif
 
-if !has_key(s:disabled_packages, 'pug')
-  au BufNewFile,BufRead *.jade,*.pug set ft=pug
+if !has_key(s:disabled_packages, 'gmpl')
+  au BufNewFile,BufRead *.mod setf gmpl
 endif
 
-if !has_key(s:disabled_packages, 'puppet')
-  au BufNewFile,BufRead *.epp set ft=embeddedpuppet
-  au BufNewFile,BufRead *.pp,Modulefile set ft=puppet
+if !has_key(s:disabled_packages, 'glsl')
+  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
+  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
 endif
 
-if !has_key(s:disabled_packages, 'purescript')
-  au BufNewFile,BufRead *.purs set ft=purescript
+if !has_key(s:disabled_packages, 'git')
+  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
+  au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
+  au BufNewFile,BufRead git-rebase-todo setf gitrebase
+  au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules setf gitconfig
+  au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
 endif
 
-if !has_key(s:disabled_packages, 'python')
-  au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript set ft=python
+if !has_key(s:disabled_packages, 'gdscript')
+  au BufNewFile,BufRead *.gd setf gdscript3
 endif
 
-if !has_key(s:disabled_packages, 'python-indent')
+if !has_key(s:disabled_packages, 'fsharp')
+  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
+  au BufNewFile,BufRead *.fsi,*.fsx setf fsharp
 endif
 
-if !has_key(s:disabled_packages, 'python-compiler')
+if !has_key(s:disabled_packages, 'forth')
+  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
+  au BufNewFile,BufRead *.ft,*.fth setf forth
 endif
 
-if !has_key(s:disabled_packages, 'requirements')
-  au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} set ft=requirements
+if !has_key(s:disabled_packages, 'flatbuffers')
+  au BufNewFile,BufRead *.fbs setf fbs
 endif
 
-if !has_key(s:disabled_packages, 'qmake')
-  au BufNewFile,BufRead *.pri,*.pro set ft=qmake
+if !has_key(s:disabled_packages, 'fish')
+  au BufNewFile,BufRead *.fish setf fish
 endif
 
-if !has_key(s:disabled_packages, 'qml')
-  au BufNewFile,BufRead *.qbs,*.qml set ft=qml
+if !has_key(s:disabled_packages, 'ferm')
+  au BufNewFile,BufRead *.ferm,ferm.conf setf ferm
 endif
 
-if !has_key(s:disabled_packages, 'r-lang')
-  au BufNewFile,BufRead *.rd set ft=rhelp
-  au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist set ft=r
+if !has_key(s:disabled_packages, 'fennel')
+  au BufNewFile,BufRead *.fnl setf fennel
 endif
 
-if !has_key(s:disabled_packages, 'racket')
-  au BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl set ft=racket
+if !has_key(s:disabled_packages, 'erlang')
+  au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock setf erlang
 endif
 
-if !has_key(s:disabled_packages, 'ragel')
-  au BufNewFile,BufRead *.rl set ft=ragel
+if !has_key(s:disabled_packages, 'emblem')
+  au BufNewFile,BufRead *.em,*.emblem setf emblem
 endif
 
-if !has_key(s:disabled_packages, 'raku')
-  au! BufNewFile,BufRead *.t call polyglot#detect#T()
-  au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
-  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
-  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 set ft=raku
+if !has_key(s:disabled_packages, 'emberscript')
+  au BufNewFile,BufRead *.em,*.emberscript setf ember-script
 endif
 
-if !has_key(s:disabled_packages, 'raml')
-  au BufNewFile,BufRead *.raml set ft=raml
+if !has_key(s:disabled_packages, 'elm')
+  au BufNewFile,BufRead *.elm setf elm
 endif
 
-if !has_key(s:disabled_packages, 'razor')
-  au BufNewFile,BufRead *.cshtml,*.razor set ft=razor
+if !has_key(s:disabled_packages, 'elixir')
+  au BufNewFile,BufRead *.eex,*.leex setf eelixir
+  au BufNewFile,BufRead *.ex,*.exs,mix.lock setf elixir
 endif
 
-if !has_key(s:disabled_packages, 'reason')
-  au! BufNewFile,BufRead *.re call polyglot#detect#Re()
-  au BufNewFile,BufRead *.rei set ft=reason
+if !has_key(s:disabled_packages, 'dockerfile')
+  au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml setf yaml.docker-compose
+  au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile setf Dockerfile
+  au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
 endif
 
-if !has_key(s:disabled_packages, 'rst')
-  au BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt set ft=rst
+if !has_key(s:disabled_packages, 'yaml')
+  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock setf yaml
 endif
 
-if !has_key(s:disabled_packages, 'ruby')
-  au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml set ft=eruby
-  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile set ft=ruby
-  au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
+if !has_key(s:disabled_packages, 'dlang')
+  au BufNewFile,BufRead *.sdl setf dsdl
+  au BufNewFile,BufRead *.ddoc setf ddoc
+  au BufNewFile,BufRead *.dd setf dd
+  au BufNewFile,BufRead *.lst setf dcov
+  au BufNewFile,BufRead *.d,*.di setf d
 endif
 
-if !has_key(s:disabled_packages, 'rspec')
-  au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
+if !has_key(s:disabled_packages, 'dhall')
+  au BufNewFile,BufRead *.dhall setf dhall
 endif
 
-if !has_key(s:disabled_packages, 'yard')
+if !has_key(s:disabled_packages, 'dart')
+  au BufNewFile,BufRead *.dart,*.drt setf dart
 endif
 
-if !has_key(s:disabled_packages, 'brewfile')
-  au BufNewFile,BufRead Brewfile set ft=brewfile
+if !has_key(s:disabled_packages, 'cue')
+  au BufNewFile,BufRead *.cue setf cuesheet
 endif
 
-if !has_key(s:disabled_packages, 'rust')
-  au BufNewFile,BufRead *.rs,*.rs.in set ft=rust
+if !has_key(s:disabled_packages, 'cucumber')
+  au BufNewFile,BufRead *.feature,*.story setf cucumber
 endif
 
-if !has_key(s:disabled_packages, 'scala')
-  au BufNewFile,BufRead *.kojo,*.sc,*.scala set ft=scala
+if !has_key(s:disabled_packages, 'crystal')
+  au BufNewFile,BufRead *.ecr setf ecrystal
+  au BufNewFile,BufRead *.cr,Projectfile setf crystal
 endif
 
-if !has_key(s:disabled_packages, 'sbt')
-  au BufNewFile,BufRead *.sbt set ft=sbt.scala
+if !has_key(s:disabled_packages, 'cryptol')
+  au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl setf cryptol
 endif
 
-if !has_key(s:disabled_packages, 'scss')
-  au BufNewFile,BufRead *.scss set ft=scss
+if !has_key(s:disabled_packages, 'cjsx')
 endif
 
-if !has_key(s:disabled_packages, 'sh')
-  au BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc set ft=zsh
-  au BufNewFile,BufRead {.,}zsh* call s:StarSetf('zsh')
-  au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh')
-  au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
-  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc set ft=sh
+if !has_key(s:disabled_packages, 'coffee-script')
+  au BufNewFile,BufRead *.coffee.md,*.litcoffee setf litcoffee
+  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile setf coffee
 endif
 
-if !has_key(s:disabled_packages, 'zinit')
+if !has_key(s:disabled_packages, 'cmake')
+  au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt setf cmake
 endif
 
-if !has_key(s:disabled_packages, 'slim')
-  au BufNewFile,BufRead *.slim set ft=slim
+if !has_key(s:disabled_packages, 'clojure')
+  au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config setf clojure
 endif
 
-if !has_key(s:disabled_packages, 'slime')
-  au BufNewFile,BufRead *.slime set ft=slime
+if !has_key(s:disabled_packages, 'carp')
+  au BufNewFile,BufRead *.carp setf carp
 endif
 
-if !has_key(s:disabled_packages, 'smt2')
-  au BufNewFile,BufRead *.smt,*.smt2 set ft=smt2
+if !has_key(s:disabled_packages, 'cpp-modern')
 endif
 
-if !has_key(s:disabled_packages, 'solidity')
-  au BufNewFile,BufRead *.sol set ft=solidity
+if !has_key(s:disabled_packages, 'caddyfile')
+  au BufNewFile,BufRead Caddyfile setf caddyfile
 endif
 
-if !has_key(s:disabled_packages, 'stylus')
-  au BufNewFile,BufRead *.styl,*.stylus set ft=stylus
+if !has_key(s:disabled_packages, 'awk')
+  au BufNewFile,BufRead *.awk,*.gawk setf awk
 endif
 
-if !has_key(s:disabled_packages, 'svelte')
-  au BufNewFile,BufRead *.svelte set ft=svelte
+if !has_key(s:disabled_packages, 'ave')
+  au BufNewFile,BufRead *.ave setf ave
 endif
 
-if !has_key(s:disabled_packages, 'svg')
-  au BufNewFile,BufRead *.svg set ft=svg
+if !has_key(s:disabled_packages, 'autoit')
+  au BufNewFile,BufRead *.au3 setf autoit
 endif
 
-if !has_key(s:disabled_packages, 'svg-indent')
+if !has_key(s:disabled_packages, 'atlas')
+  au BufNewFile,BufRead *.as,*.atl setf atlas
 endif
 
-if !has_key(s:disabled_packages, 'swift')
-  au BufNewFile,BufRead *.swift set ft=swift
+if !has_key(s:disabled_packages, 'aspperl')
+  au! BufNewFile,BufRead *.asp call polyglot#detect#Asp()
 endif
 
-if !has_key(s:disabled_packages, 'sxhkd')
-  au BufNewFile,BufRead *.sxhkdrc,sxhkdrc set ft=sxhkdrc
+if !has_key(s:disabled_packages, 'aspvbs')
+  au! BufNewFile,BufRead *.asp call polyglot#detect#Asp()
+  au! BufNewFile,BufRead *.asa call polyglot#detect#Asa()
 endif
 
-if !has_key(s:disabled_packages, 'systemd')
-  au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf set ft=systemd
-  au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
+if !has_key(s:disabled_packages, 'asn')
+  au BufNewFile,BufRead *.asn,*.asn1 setf asn
 endif
 
-if !has_key(s:disabled_packages, 'terraform')
-  au BufNewFile,BufRead *.tf,*.tfvars set ft=terraform
+if !has_key(s:disabled_packages, 'automake')
+  au BufNewFile,BufRead GNUmakefile.am,[Mm]akefile.am setf automake
 endif
 
-if !has_key(s:disabled_packages, 'textile')
-  au BufNewFile,BufRead *.textile set ft=textile
+if !has_key(s:disabled_packages, 'elf')
+  au BufNewFile,BufRead *.am setf elf
 endif
 
-if !has_key(s:disabled_packages, 'thrift')
-  au BufNewFile,BufRead *.thrift set ft=thrift
+if !has_key(s:disabled_packages, 'autohotkey')
+  au BufNewFile,BufRead *.ahk,*.ahkl setf autohotkey
 endif
 
-if !has_key(s:disabled_packages, 'tmux')
-  au BufNewFile,BufRead {.,}tmux*.conf set ft=tmux
+if !has_key(s:disabled_packages, 'asciidoc')
+  au BufNewFile,BufRead *.adoc,*.asc,*.asciidoc setf asciidoc
 endif
 
-if !has_key(s:disabled_packages, 'toml')
-  au BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock set ft=toml
+if !has_key(s:disabled_packages, 'art')
+  au BufNewFile,BufRead *.art setf art
 endif
 
-if !has_key(s:disabled_packages, 'tptp')
-  au BufNewFile,BufRead *.ax,*.p,*.tptp set ft=tptp
+if !has_key(s:disabled_packages, 'arduino')
+  au BufNewFile,BufRead *.ino,*.pde setf arduino
 endif
 
-if !has_key(s:disabled_packages, 'twig')
-  au BufNewFile,BufRead *.xml.twig set ft=xml.twig
-  au BufNewFile,BufRead *.twig set ft=html.twig
+if !has_key(s:disabled_packages, 'c/c++')
+  au! BufNewFile,BufRead *.h call polyglot#detect#H()
+  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
+  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp setf cpp
 endif
 
-if !has_key(s:disabled_packages, 'typescript')
-  au BufNewFile,BufRead *.tsx set ft=typescriptreact
-  au BufNewFile,BufRead *.ts set ft=typescript
+if !has_key(s:disabled_packages, 'arch')
+  au BufNewFile,BufRead {.,}arch-inventory,=tagging-method setf arch
 endif
 
-if !has_key(s:disabled_packages, 'unison')
-  au BufNewFile,BufRead *.u,*.uu set ft=unison
+if !has_key(s:disabled_packages, 'aptconf')
+  au BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf setf aptconf
+  au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
 endif
 
-if !has_key(s:disabled_packages, 'v')
-  au BufNewFile,BufRead *.v set ft=v
+if !has_key(s:disabled_packages, 'applescript')
+  au BufNewFile,BufRead *.applescript,*.scpt setf applescript
 endif
 
-if !has_key(s:disabled_packages, 'vala')
-  au BufNewFile,BufRead *.vala,*.valadoc,*.vapi set ft=vala
+if !has_key(s:disabled_packages, 'apiblueprint')
+  au BufNewFile,BufRead *.apib setf apiblueprint
 endif
 
-if !has_key(s:disabled_packages, 'vbnet')
-  au BufNewFile,BufRead *.vb,*.vbhtml set ft=vbnet
+if !has_key(s:disabled_packages, 'apache')
+  au BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess setf apache
+  au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead apache.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead access.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/sites-*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/mods-*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/conf.*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/*.conf* call s:StarSetf('apache')
 endif
 
-if !has_key(s:disabled_packages, 'vcl')
-  au BufNewFile,BufRead *.vcl set ft=vcl
+if !has_key(s:disabled_packages, 'ant')
+  au BufNewFile,BufRead build.xml setf ant
 endif
 
-if !has_key(s:disabled_packages, 'velocity')
-  au BufNewFile,BufRead *.vm set ft=velocity
+if !has_key(s:disabled_packages, 'xml')
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
 endif
 
-if !has_key(s:disabled_packages, 'vmasm')
-  au BufNewFile,BufRead *.mar set ft=vmasm
+if !has_key(s:disabled_packages, 'csv')
+  au BufNewFile,BufRead *.csv,*.tab,*.tsv setf csv
 endif
 
-if !has_key(s:disabled_packages, 'vue')
-  au BufNewFile,BufRead *.vue,*.wpy set ft=vue
+if !has_key(s:disabled_packages, 'ampl')
+  au BufNewFile,BufRead *.run setf ampl
 endif
 
-if !has_key(s:disabled_packages, 'xdc')
-  au BufNewFile,BufRead *.xdc set ft=xdc
+if !has_key(s:disabled_packages, 'aml')
+  au BufNewFile,BufRead *.aml setf aml
 endif
 
-if !has_key(s:disabled_packages, 'xsl')
-  au BufNewFile,BufRead *.xsl,*.xslt set ft=xsl
+if !has_key(s:disabled_packages, 'alsaconf')
+  au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc setf alsaconf
 endif
 
-if !has_key(s:disabled_packages, 'ansible')
-  au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml set ft=yaml.ansible
-  au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
-  au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
+if !has_key(s:disabled_packages, 'aidl')
+  au BufNewFile,BufRead *.aidl setf aidl
 endif
 
-if !has_key(s:disabled_packages, 'helm')
-  au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml set ft=helm
+if !has_key(s:disabled_packages, 'ahdl')
+  au BufNewFile,BufRead *.tdf setf ahdl
 endif
 
-if !has_key(s:disabled_packages, 'help')
-  au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt set ft=help
+if !has_key(s:disabled_packages, 'ada')
+  au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr setf ada
 endif
 
-if !has_key(s:disabled_packages, 'zephir')
-  au BufNewFile,BufRead *.zep set ft=zephir
+if !has_key(s:disabled_packages, 'acpiasl')
+  au BufNewFile,BufRead *.asl,*.dsl setf asl
 endif
 
-if !has_key(s:disabled_packages, 'zig')
-  au BufNewFile,BufRead *.zig,*.zir set ft=zig
-  au BufNewFile,BufRead *.zir set ft=zir
+if !has_key(s:disabled_packages, 'acedb')
+  au BufNewFile,BufRead *.wrm setf acedb
 endif
 
-if !has_key(s:disabled_packages, 'trasys')
-  au! BufNewFile,BufRead *.inp call polyglot#detect#Inp()
+if !has_key(s:disabled_packages, 'abel')
+  au BufNewFile,BufRead *.abl setf abel
 endif
 
-if !has_key(s:disabled_packages, 'basic')
-  au BufNewFile,BufRead *.basic set ft=basic
+if !has_key(s:disabled_packages, 'abc')
+  au BufNewFile,BufRead *.abc setf abc
 endif
 
-if !has_key(s:disabled_packages, 'visual-basic')
-  au! BufNewFile,BufRead *.bas call polyglot#detect#Bas()
-  au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs set ft=vb
+if !has_key(s:disabled_packages, 'abaqus')
+  au! BufNewFile,BufRead *.inp call polyglot#detect#Inp()
 endif
 
-if !has_key(s:disabled_packages, 'dosini')
-  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec set ft=dosini
-  au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
-  au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
+if !has_key(s:disabled_packages, 'abap')
+  au BufNewFile,BufRead *.abap setf abap
 endif
 
-if !has_key(s:disabled_packages, 'odin')
-  au BufNewFile,BufRead *.odin set ft=odin
+if !has_key(s:disabled_packages, 'aap')
+  au BufNewFile,BufRead *.aap setf aap
 endif
 
-if !has_key(s:disabled_packages, 'bzl')
-  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE set ft=bzl
+if !has_key(s:disabled_packages, 'a65')
+  au BufNewFile,BufRead *.a65 setf a65
 endif
 
-if !has_key(s:disabled_packages, 'prolog')
-  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
-  au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap set ft=prolog
+if !has_key(s:disabled_packages, 'a2ps')
+  au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc setf a2ps
 endif
 
-if !has_key(s:disabled_packages, 'tads')
-  au! BufNewFile,BufRead *.t call polyglot#detect#T()
+if !has_key(s:disabled_packages, 'haproxy')
+  au BufNewFile,BufRead *.cfg,haproxy.cfg setf haproxy
+  au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
 endif
 
-if !has_key(s:disabled_packages, 'gitignore')
-  au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore set ft=gitignore
+if !has_key(s:disabled_packages, 'conf')
+  au BufNewFile,BufRead *.conf,auto.master,config setf conf
 endif
 
-if !has_key(s:disabled_packages, 'sql')
-  au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw set ft=sql
+if !has_key(s:disabled_packages, '8th')
+  au BufNewFile,BufRead *.8th setf 8th
 endif
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
diff --git a/scripts/build b/scripts/build
index 303f46414..42ff4f3a7 100755
--- a/scripts/build
+++ b/scripts/build
@@ -512,7 +512,8 @@ def generate_ftdetect(packages, heuristics)
   native_extensions = Set.new(native_filetypes.flat_map { |f| f["extensions"] || [] })
   native_filenames = Set.new(native_filetypes.flat_map { |f| f["filenames"] || [] })
 
-  for package in packages
+  # Because we're using setf we need to reverse order
+  for package in packages.reverse
     filetypes = package["filetypes"] or raise "Unknown filetype for: #{package["name"]}"
 
     package_heuristics = []
@@ -522,7 +523,7 @@ def generate_ftdetect(packages, heuristics)
       name = filetype.fetch("name")
       syntax = filetype["syntax"] ? " | set syntax=#{filetype["syntax"]}" : ""
 
-      set_command = "set ft=#{name}"
+      set_command = "setf #{name}"
 
       if filetype["syntax"]
         set_command = "set ft=#{name} syntax=#{filetype["syntax"]}"

From 8b272d6e5256e4b28178fb343f01b11272fe080d Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Sep 2020 05:38:14 +0200
Subject: [PATCH 097/299] Document how to install with vim8 packages

---
 README.md           | 5 +++--
 plugin/polyglot.vim | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 plugin/polyglot.vim

diff --git a/README.md b/README.md
index 545fa0ce0..d8a6d5bd6 100644
--- a/README.md
+++ b/README.md
@@ -32,10 +32,11 @@ Optionally download one of the [releases](https://github.com/sheerun/vim-polyglo
 You can also use Vim 8 built-in package manager:
 
 ```
-mkdir -p ~/.vim/pack/default/start
-git clone https://github.com/sheerun/vim-polyglot ~/.vim/pack/default/start/vim-polyglot
+git clone --depth 1 https://github.com/sheerun/vim-polyglot ~/.vim/pack/plugins/opt/sheerun/vim-polyglot
 ```
 
+**And then add `packload` command to your `.vimrc`** (or `packadd sheerun/vim-polyglot`)
+
 NOTE: Not all features of individual language packs are available. We strip them from functionality slowing vim startup (for example we ignore `plugins` folder that is loaded regardless of file type, instead we prefer `ftplugin` which is loaded lazily).
 
 If you need full functionality of any plugin, please use it directly with your plugin manager.
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
new file mode 100644
index 000000000..ab74485f6
--- /dev/null
+++ b/plugin/polyglot.vim
@@ -0,0 +1,9 @@
+if !exists("did_load_polyglot")
+  if expand("<sfile>:p") =~# '/pack/' && (exists("did_load_filetypes") || exists("did_indent_on"))
+    echohl WarningMsg
+    echo "Improper install of vim-polyglot. Please add 'packload' to .vimrc"
+    echohl None
+  end
+  filetype plugin indent on
+  syntax enable
+endif

From 5d7121d8290fa0b61e7cb4ab3ece3105af664b30 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Sep 2020 11:03:53 +0200
Subject: [PATCH 098/299] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d8a6d5bd6..da678bf0d 100644
--- a/README.md
+++ b/README.md
@@ -32,10 +32,10 @@ Optionally download one of the [releases](https://github.com/sheerun/vim-polyglo
 You can also use Vim 8 built-in package manager:
 
 ```
-git clone --depth 1 https://github.com/sheerun/vim-polyglot ~/.vim/pack/plugins/opt/sheerun/vim-polyglot
+git clone --depth 1 https://github.com/sheerun/vim-polyglot ~/.vim/pack/plugins/opt/vim-polyglot
 ```
 
-**And then add `packload` command to your `.vimrc`** (or `packadd sheerun/vim-polyglot`)
+**And then add `packload` command to your `.vimrc`** (or `packadd vim-polyglot`)
 
 NOTE: Not all features of individual language packs are available. We strip them from functionality slowing vim startup (for example we ignore `plugins` folder that is loaded regardless of file type, instead we prefer `ftplugin` which is loaded lazily).
 

From 3ad297db5c1cf94660e4297ffa81b6281eab2884 Mon Sep 17 00:00:00 2001
From: Chayoung You <yousbe@gmail.com>
Date: Wed, 30 Sep 2020 18:20:29 +0900
Subject: [PATCH 099/299] Fix error when editing path for shebang (#572)

---
 autoload/polyglot/shebang.vim | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/autoload/polyglot/shebang.vim b/autoload/polyglot/shebang.vim
index 72c56f6fc..66ccacd63 100644
--- a/autoload/polyglot/shebang.vim
+++ b/autoload/polyglot/shebang.vim
@@ -30,7 +30,13 @@ func! s:Filetype()
 
   let [_, l:path, l:rest; __] = l:pathrest
 
-  let l:script = split(l:path, "/")[-1]
+  let l:pathparts = split(l:path, "/")
+
+  if len(l:pathparts) == 0
+    return
+  endif
+
+  let l:script = l:pathparts[-1]
 
   if l:script == "env"
     let l:argspath = matchlist(l:rest, s:r_env)

From 560024abe07ac73b31574167653a9b94821365fb Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 2 Oct 2020 00:36:09 +0200
Subject: [PATCH 100/299] Resolve issues with loading order, closes #571

---
 README.md             |    3 +-
 after/syntax/cpp.vim  |  374 +----
 after/syntax/ruby.vim |    4 +-
 filetype.vim          | 1219 +--------------
 ftdetect/polyglot.vim | 3434 +++++++++++++++++++++++++++++++++++++++++
 ftplugin/awk.vim      |   41 +-
 plugin/polyglot.vim   |    9 -
 scripts/build         |    7 +-
 syntax/odin.vim       |    2 +
 9 files changed, 3541 insertions(+), 1552 deletions(-)
 create mode 100644 ftdetect/polyglot.vim
 delete mode 100644 plugin/polyglot.vim

diff --git a/README.md b/README.md
index da678bf0d..75dfdf2f8 100644
--- a/README.md
+++ b/README.md
@@ -32,11 +32,10 @@ Optionally download one of the [releases](https://github.com/sheerun/vim-polyglo
 You can also use Vim 8 built-in package manager:
 
 ```
+" You should put in your ~/.vimrc "packadd vim-polyglot"
 git clone --depth 1 https://github.com/sheerun/vim-polyglot ~/.vim/pack/plugins/opt/vim-polyglot
 ```
 
-**And then add `packload` command to your `.vimrc`** (or `packadd vim-polyglot`)
-
 NOTE: Not all features of individual language packs are available. We strip them from functionality slowing vim startup (for example we ignore `plugins` folder that is loaded regardless of file type, instead we prefer `ftplugin` which is loaded lazily).
 
 If you need full functionality of any plugin, please use it directly with your plugin manager.
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index 00ab539c7..91030f392 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -4,9 +4,9 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') ==
 " Vim syntax file
 " Language:        C++ (Standard library including C++11/14/17/20)
 " Original Author: Jon Haggblad <https://github.com/octol>
-" Maintainer:      bfrg <bfrg@users.noreply.github.com>
+" Maintainer:      bfrg <https://github.com/bfrg>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Jun 23, 2020
+" Last Change:     Oct 1, 2020
 "
 " This syntax file is based on:
 " https://github.com/octol/vim-cpp-enhanced-highlight
@@ -17,18 +17,18 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') ==
 syntax keyword cppSTLconstant
         \ MB_CUR_MAX MB_LEN_MAX WCHAR_MAX WCHAR_MIN WEOF __STDC_UTF_16__ __STDC_UTF_32__
 
+syntax keyword cppSTLnamespace
+        \ std experimental rel_ops
+
 syntax keyword cppSTLconstant
         \ badbit digits digits10 eofbit failbit goodbit has_denorm has_denorm_loss has_infinity has_quiet_NaN has_signaling_NaN is_bounded is_exact is_iec559 is_integer is_modulo is_signed is_specialized max_exponent max_exponent10 min_exponent min_exponent10 nothrow npos radix round_style tinyness_before traps
 
-syntax keyword cppSTLVariable
+syntax keyword cppSTLvariable
         \ cerr cin clog cout wcerr wcin wclog wcout
 
 syntax keyword cppSTLexception
         \ bad_alloc bad_exception bad_typeid bad_cast domain_error exception failure invalid_argument length_error logic_error out_of_range overflow_error range_error runtime_error underflow_error
 
-syntax keyword cppSTLfunctional
-        \ binary_function binary_negate bit_and bit_not bit_or divides equal_to greater greater_equal less less_equal logical_and logical_not logical_or minus modulus multiplies negate not_equal_to plus unary_function unary_negate
-
 syntax keyword cppSTLios
         \ endl ends flush resetiosflags setbase setfill setiosflags setprecision setw ws
 
@@ -36,230 +36,83 @@ syntax keyword cppSTLios
         \ boolalpha dec defaultfloat fixed hex hexfloat internal left noboolalpha noshowbase noshowpoint noshowpos noskipws nounitbuf nouppercase oct right scientific showbase showpoint showpos skipws unitbuf uppercase
 
 syntax keyword cppSTLtype
-        \ fmtflags iostate openmode
-
-" Some of these can be highlighted as both cppSTLios and cppSTLconstant
-" syntax keyword cppSTLconstant
-"         \ adjustfield app ate basefield binary floatfield in out trunc boolalpha dec fixed hex internal left oct right scientific showbase showpoint showpos skipws unitbuf uppercase
+        \ fmtflags iostate openmode Init allocator auto_ptr basic_filebuf basic_fstream basic_ifstream basic_ios basic_iostream basic_istream basic_istringstream basic_ofstream basic_ostream basic_ostringstream basic_streambuf basic_string basic_stringbuf basic_stringstream binary_compose binder1st binder2nd bitset char_traits char_type const_mem_fun1_t const_mem_fun_ref1_t const_mem_fun_ref_t const_mem_fun_t const_pointer const_reference container_type deque difference_type div_t double_t event_callback filebuf first_type float_denorm_style float_round_style float_t fpos fstream gslice_array ifstream imaxdiv_t indirect_array int_type ios ios_base iostream istream istringstream istrstream iterator_category iterator_traits key_compare key_type ldiv_t list lldiv_t map mapped_type mask_array mbstate_t mem_fun1_t mem_fun_ref1_t mem_fun_ref_t mem_fun_t multimap multiset nothrow_t numeric_limits off_type ofstream ostream ostringstream ostrstream pair pointer pointer_to_binary_function pointer_to_unary_function pos_type priority_queue queue reference second_type seekdir sequence_buffer set sig_atomic_t size_type slice_array stack state_type stream streambuf streamoff streampos streamsize string stringbuf stringstream strstream strstreambuf temporary_buffer test_type time_t tm traits_type type_info u16string u32string unary_compose unary_negate valarray value_compare value_type vector wctrans_t wctype_t wfilebuf wfstream wifstream wint_t wios wiostream wistream wistringstream wofstream wostream wostringstream wstreambuf wstreampos wstring wstringbuf wstringstream codecvt codecvt_base codecvt_byname collate collate_byname ctype ctype_base ctype_byname locale messages messages_base messages_byname money_base money_get money_put moneypunct moneypunct_byname num_get num_put numpunct numpunct_byname time_base time_get time_get_byname time_put time_put_byname binary_function binary_negate bit_and bit_not bit_or divides equal_to greater greater_equal less less_equal logical_and logical_not logical_or minus modulus multiplies negate not_equal_to plus unary_function unary_negate bidirectional_iterator_tag forward_iterator_tag input_iterator_tag output_iterator_tag random_access_iterator_tag
 
 syntax keyword cppSTLiterator
         \ back_insert_iterator bidirectional_iterator const_iterator const_reverse_iterator forward_iterator front_insert_iterator input_iterator insert_iterator istream_iterator istreambuf_iterator iterator ostream_iterator ostreambuf_iterator output_iterator random_access_iterator raw_storage_iterator reverse_bidirectional_iterator reverse_iterator
 
-syntax keyword cppSTLiterator_tag
-        \ bidirectional_iterator_tag forward_iterator_tag input_iterator_tag output_iterator_tag random_access_iterator_tag
-
-syntax keyword cppSTLnamespace
-        \ experimental rel_ops std
-
-syntax keyword cppSTLtype
-        \ Init allocator auto_ptr basic_filebuf basic_fstream basic_ifstream basic_ios basic_iostream basic_istream basic_istringstream basic_ofstream basic_ostream basic_ostringstream basic_streambuf basic_string basic_stringbuf basic_stringstream binary_compose binder1st binder2nd bitset char_traits char_type const_mem_fun1_t const_mem_fun_ref1_t const_mem_fun_ref_t const_mem_fun_t const_pointer const_reference container_type deque difference_type div_t double_t event_callback filebuf first_type float_denorm_style float_round_style float_t fpos fstream gslice_array ifstream imaxdiv_t indirect_array int_type ios ios_base iostream istream istringstream istrstream iterator_category iterator_traits key_compare key_type ldiv_t list lldiv_t map mapped_type mask_array mbstate_t mem_fun1_t mem_fun_ref1_t mem_fun_ref_t mem_fun_t multimap multiset nothrow_t numeric_limits off_type ofstream ostream ostringstream ostrstream pair pointer pointer_to_binary_function pointer_to_unary_function pos_type priority_queue queue reference second_type seekdir sequence_buffer set sig_atomic_t size_type slice_array stack state_type stream streambuf streamoff streampos streamsize string stringbuf stringstream strstream strstreambuf temporary_buffer test_type time_t tm traits_type type_info u16string u32string unary_compose unary_negate valarray value_compare value_type vector wctrans_t wctype_t wfilebuf wfstream wifstream wint_t wios wiostream wistream wistringstream wofstream wostream wostringstream wstreambuf wstreampos wstring wstringbuf wstringstream
+" Function templates that are called with template parameters
+syntax keyword cppSTLfunction
+        \ use_facet has_facet get
 
-" locale
-syntax keyword cppSTLtype
-        \ codecvt codecvt_base codecvt_byname collate collate_byname ctype ctype_base ctype_byname locale messages messages_base messages_byname money_base money_get money_put moneypunct moneypunct_byname num_get num_put numpunct numpunct_byname time_base time_get time_get_byname time_put time_put_byname
-
-" template functions that are called with template parameters, like
-" std::use_facet<std::moneypunct<char, true>>(loc).curr_symbol()
-syntax keyword cppSTLfunction use_facet has_facet
-
-" std::get is a template function, so when called as std::get<N>(t), we want it
-" to be highlighted as a function
-syntax keyword cppSTLfunction get
+" Some of these keywords can be highlighted as cppSTLios or cppSTLconstant
+" syntax keyword cppSTLconstant
+"         \ adjustfield app ate basefield binary floatfield in out trunc boolalpha dec fixed hex internal left oct right scientific showbase showpoint showpos skipws unitbuf uppercase
 
 
 " C++11 extensions {{{1
 if !exists('cpp_no_cpp11')
+    syntax keyword cppStatement nullptr
     syntax keyword cppType char16_t char32_t
-    syntax keyword cppSTLconstant nullptr
-
-    " std containers
-    syntax keyword cppSTLtype array
-
-    " atomic
-    syntax keyword cppSTLconstant ATOMIC_FLAG_INIT
-    syntax keyword cppSTLenum memory_order
-    syntax keyword cppSTLtype
-            \ atomic atomic_bool atomic_char atomic_char16_t atomic_char32_t atomic_flag atomic_int atomic_int_fast16_t atomic_int_fast32_t atomic_int_fast64_t atomic_int_fast8_t atomic_int_least16_t atomic_int_least32_t atomic_int_least64_t atomic_int_least8_t atomic_intmax_t atomic_intptr_t atomic_llong atomic_long atomic_ptrdiff_t atomic_schar atomic_short atomic_size_t atomic_uchar atomic_uint atomic_uint_fast16_t atomic_uint_fast32_t atomic_uint_fast64_t atomic_uint_fast8_t atomic_uint_least16_t atomic_uint_least32_t atomic_uint_least64_t atomic_uint_least8_t atomic_uintmax_t atomic_uintptr_t atomic_ullong atomic_ulong atomic_ushort atomic_wchar_t
-
-    " chrono
-    syntax keyword cppSTLnamespace chrono
-    syntax keyword cppSTLcast duration_cast time_point_cast
-    syntax keyword cppSTLtype
-            \ duration duration_values high_resolution_clock hours microseconds milliseconds minutes nanoseconds seconds steady_clock system_clock time_point treat_as_floating_point
-
-    " condition_variable
-    syntax keyword cppSTLtype condition_variable
-
-    " cstddef
-    syntax keyword cppSTLtype nullptr_t max_align_t
-
-    " exception
-    syntax keyword cppSTLtype exception_ptr nested_exception
-
-    " functional
-    syntax keyword cppSTLexception bad_function_call
-    syntax keyword cppSTLfunctional function
-    syntax keyword cppSTLfunction mem_fn
-    syntax keyword cppSTLconstant _1 _2 _3 _4 _5 _6 _7 _8 _9
-    syntax keyword cppSTLtype
-            \ hash is_bind_expression is_placeholder reference_wrapper
-
-    " iterator
-    syntax keyword cppSTLiterator move_iterator
-
-    " forward_list
-    syntax keyword cppSTLtype forward_list
 
-    " future
-    syntax keyword cppSTLtype future packaged_task promise shared_future
-    syntax keyword cppSTLenum future_status future_errc launch
-    syntax keyword cppSTLexception future_error
-
-    " initializer_list
-    syntax keyword cppSTLtype initializer_list
-
-    " ios
-    syntax keyword cppSTLenum io_errc
-    " syntax keyword cppSTLtype is_error_code_enum
-
-    " limits
-    syntax keyword cppSTLconstant max_digits10
-
-    " locale
-    syntax keyword cppSTLfunction isblank
-    syntax keyword cppSTLtype
-            \ codecvt_mode codecvt_utf16 codecvt_utf8 codecvt_utf8_utf16 wbuffer_convert wstring_convert
-
-    " memory
-    syntax keyword cppSTLconstant allocator_arg
-    syntax keyword cppSTLexception bad_weak_ptr
-    syntax keyword cppSTLfunction allocate_shared make_shared
-    syntax keyword cppSTLfunction
-            \ const_pointer_cast dynamic_pointer_cast static_pointer_cast
+    syntax keyword cppSTLnamespace chrono this_thread
 
     syntax keyword cppSTLtype
-            \ allocator_arg_t allocator_traits allocator_type default_delete enable_shared_from_this is_always_equal owner_less pointer_safety pointer_traits propagate_on_container_copy_assignment propagate_on_container_move_assignment propagate_on_container_swap rebind_alloc rebind_traits shared_ptr unique_ptr uses_allocator void_pointer const_void_pointer weak_ptr
+            \ array atomic atomic_bool atomic_char atomic_char16_t atomic_char32_t atomic_flag atomic_int atomic_int_fast16_t atomic_int_fast32_t atomic_int_fast64_t atomic_int_fast8_t atomic_int_least16_t atomic_int_least32_t atomic_int_least64_t atomic_int_least8_t atomic_intmax_t atomic_intptr_t atomic_llong atomic_long atomic_ptrdiff_t atomic_schar atomic_short atomic_size_t atomic_uchar atomic_uint atomic_uint_fast16_t atomic_uint_fast32_t atomic_uint_fast64_t atomic_uint_fast8_t atomic_uint_least16_t atomic_uint_least32_t atomic_uint_least64_t atomic_uint_least8_t atomic_uintmax_t atomic_uintptr_t atomic_ullong atomic_ulong atomic_ushort atomic_wchar_t duration duration_values high_resolution_clock hours microseconds milliseconds minutes nanoseconds seconds steady_clock system_clock time_point treat_as_floating_point condition_variable nullptr_t max_align_t exception_ptr nested_exception hash is_bind_expression is_placeholder reference_wrapper forward_list future packaged_task promise shared_future initializer_list codecvt_mode codecvt_utf16 codecvt_utf8 codecvt_utf8_utf16 wbuffer_convert wstring_convert allocator_arg_t allocator_traits allocator_type default_delete enable_shared_from_this is_always_equal owner_less pointer_safety pointer_traits propagate_on_container_copy_assignment propagate_on_container_move_assignment propagate_on_container_swap rebind_alloc rebind_traits shared_ptr unique_ptr uses_allocator void_pointer const_void_pointer weak_ptr adopt_lock_t condition_variable_any defer_lock_t lock_guard mutex once_flag recursive_mutex recursive_timed_mutex timed_mutex try_to_lock_t unique_lock bernoulli_distribution binomial_distribution cauchy_distribution chi_squared_distribution default_random_engine discard_block_engine discrete_distribution exponential_distribution extreme_value_distribution fisher_f_distribution gamma_distribution geometric_distribution independent_bits_engine knuth_b linear_congruential_engine lognormal_distribution mersenne_twister_engine minstd_rand minstd_rand0 mt19937 mt19937_64 negative_binomial_distribution normal_distribution piecewise_constant_distribution piecewise_linear_distribution poisson_distribution random_device ranlux24 ranlux24_base ranlux48 ranlux48_base seed_seq shuffle_order_engine student_t_distribution subtract_with_carry_engine uniform_int_distribution uniform_real_distribution weibull_distribution atto centi deca deci exa femto giga hecto kilo mega micro milli nano peta pico ratio ratio_add ratio_divide ratio_equal ratio_greater ratio_greater_equal ratio_less ratio_less_equal ratio_multiply ratio_not_equal ratio_subtract tera yocto yotta zepto zetta basic_regex match_results regex_traits sub_match syntax_option_type match_flag_type error_type scoped_allocator_adaptor outer_allocator_type inner_allocator_type error_code error_condition error_category is_error_code_enum is_error_condition_enum thread tuple tuple_size tuple_element type_index add_const add_cv add_lvalue_reference add_pointer add_rvalue_reference add_volatile aligned_storage aligned_union alignment_of common_type conditional decay enable_if extent false_type has_virtual_destructor integral_constant is_abstract is_arithmetic is_array is_assignable is_base_of is_class is_compound is_const is_constructible is_convertible is_copy_assignable is_copy_constructible is_default_constructible is_destructible is_empty is_enum is_floating_point is_function is_fundamental is_integral is_literal_type is_lvalue_reference is_member_function_pointer is_member_object_pointer is_member_pointer is_move_assignable is_move_constructible is_nothrow_assignable is_nothrow_constructible is_nothrow_copy_assignable is_nothrow_copy_constructible is_nothrow_default_constructible is_nothrow_destructible is_nothrow_move_assignable is_nothrow_move_constructible is_object is_pod is_pointer is_polymorphic is_reference is_rvalue_reference is_same is_scalar is_signed is_standard_layout is_trivial is_trivially_assignable is_trivially_constructible is_trivially_copy_assignable is_trivially_copy_constructible is_trivially_copyable is_trivially_default_constructible is_trivially_destructible is_trivially_move_assignable is_trivially_move_constructible is_union is_unsigned is_void is_volatile make_signed make_unsigned rank remove_all_extents remove_const remove_cv remove_extent remove_pointer remove_reference remove_volatile result_of true_type underlying_type hasher key_equal unordered_map unordered_multimap unordered_multiset unordered_set piecewise_construct_t function
 
-    " mutex
-    syntax keyword cppSTLenum cv_status
-    syntax keyword cppSTLconstant defer_lock try_to_lock adopt_lock
-    syntax keyword cppSTLtype
-            \ adopt_lock_t condition_variable_any defer_lock_t lock_guard mutex once_flag recursive_mutex recursive_timed_mutex timed_mutex try_to_lock_t unique_lock
-
-    " new
-    syntax keyword cppSTLexception bad_array_new_length
-
-    " numerics, cmath
     syntax keyword cppSTLconstant
-            \ FLT_EVAL_METHOD FP_INFINITE FP_NAN FP_NORMAL FP_SUBNORMAL FP_ZERO HUGE_VALF HUGE_VALL INFINITY MATH_ERREXCEPT MATH_ERRNO NAN math_errhandling
-
-    " random
-    syntax keyword cppSTLfunction generate_canonical
-    syntax keyword cppSTLtype
-            \ bernoulli_distribution binomial_distribution cauchy_distribution chi_squared_distribution default_random_engine discard_block_engine discrete_distribution exponential_distribution extreme_value_distribution fisher_f_distribution gamma_distribution geometric_distribution independent_bits_engine knuth_b linear_congruential_engine lognormal_distribution mersenne_twister_engine minstd_rand minstd_rand0 mt19937 mt19937_64 negative_binomial_distribution normal_distribution piecewise_constant_distribution piecewise_linear_distribution poisson_distribution random_device ranlux24 ranlux24_base ranlux48 ranlux48_base seed_seq shuffle_order_engine student_t_distribution subtract_with_carry_engine uniform_int_distribution uniform_real_distribution weibull_distribution
-
-    " ratio
-    syntax keyword cppSTLtype
-            \ atto centi deca deci exa femto giga hecto kilo mega micro milli nano peta pico ratio ratio_add ratio_divide ratio_equal ratio_greater ratio_greater_equal ratio_less ratio_less_equal ratio_multiply ratio_not_equal ratio_subtract tera yocto yotta zepto zetta
+            \ _1 _2 _3 _4 _5 _6 _7 _8 _9 max_digits10 allocator_arg defer_lock try_to_lock adopt_lock math_errhandling
 
-    " regex
-    syntax keyword cppSTLiterator regex_iterator regex_token_iterator
-    syntax keyword cppSTLexception regex_error
-    syntax keyword cppSTLtype
-            \ basic_regex match_results regex_traits sub_match syntax_option_type match_flag_type error_type
-
-    " scoped_allocator
-    syntax keyword cppSTLtype
-            \ scoped_allocator_adaptor outer_allocator_type inner_allocator_type
-
-    " system_error
-    syntax keyword cppSTLenum errc
-    syntax keyword cppSTLexception system_error
-    syntax keyword cppSTLtype
-            \ error_code error_condition error_category is_error_code_enum is_error_condition_enum
-
-    " thread
-    syntax keyword cppSTLnamespace this_thread
-    syntax keyword cppSTLtype thread
+    syntax keyword cppSTLconstant
+            \ FLT_EVAL_METHOD FP_INFINITE FP_NAN FP_NORMAL FP_SUBNORMAL FP_ZERO HUGE_VALF HUGE_VALL INFINITY MATH_ERREXCEPT MATH_ERRNO NAN
 
-    " tuple
-    syntax keyword cppSTLtype tuple tuple_size tuple_element
-    syntax keyword cppSTLfunction forward_as_tuple make_tuple tie tuple_cat
-    " Note: ignore is also a function
-    " syntax keyword cppSTLVariable ignore
+    syntax keyword cppSTLenum
+            \ memory_order future_status future_errc launch io_errc cv_status errc
 
-    " typeindex
-    syntax keyword cppSTLtype type_index
+    syntax keyword cppSTLfunction
+            \ duration_cast time_point_cast mem_fn const_pointer_cast dynamic_pointer_cast static_pointer_cast allocate_shared make_shared isblank generate_canonical forward_as_tuple make_tuple tie tuple_cat declval forward move move_if_noexcept
 
-    " type_traits
-    syntax keyword cppSTLtype
-            \ add_const add_cv add_lvalue_reference add_pointer add_rvalue_reference add_volatile aligned_storage aligned_union alignment_of common_type conditional decay enable_if extent false_type has_virtual_destructor integral_constant is_abstract is_arithmetic is_array is_assignable is_base_of is_class is_compound is_const is_constructible is_convertible is_copy_assignable is_copy_constructible is_default_constructible is_destructible is_empty is_enum is_floating_point is_function is_fundamental is_integral is_literal_type is_lvalue_reference is_member_function_pointer is_member_object_pointer is_member_pointer is_move_assignable is_move_constructible is_nothrow_assignable is_nothrow_constructible is_nothrow_copy_assignable is_nothrow_copy_constructible is_nothrow_default_constructible is_nothrow_destructible is_nothrow_move_assignable is_nothrow_move_constructible is_object is_pod is_pointer is_polymorphic is_reference is_rvalue_reference is_same is_scalar is_signed is_standard_layout is_trivial is_trivially_assignable is_trivially_constructible is_trivially_copy_assignable is_trivially_copy_constructible is_trivially_copyable is_trivially_default_constructible is_trivially_destructible is_trivially_move_assignable is_trivially_move_constructible is_union is_unsigned is_void is_volatile make_signed make_unsigned rank remove_all_extents remove_const remove_cv remove_extent remove_pointer remove_reference remove_volatile result_of true_type underlying_type
+    syntax keyword cppSTLexception
+            \ bad_function_call future_error regex_error system_error bad_weak_ptr bad_array_new_length
 
-    " unordered_map, unordered_set, unordered_multimap, unordered_multiset
-    syntax keyword cppSTLiterator const_local_iterator local_iterator
-    syntax keyword cppSTLtype
-            \ hasher key_equal unordered_map unordered_multimap unordered_multiset unordered_set
+    " syntax keyword cppSTLiterator contained
+    syntax keyword cppSTLiterator
+            \ move_iterator regex_iterator regex_token_iterator const_local_iterator local_iterator
 
-    " utility
-    syntax keyword cppSTLtype piecewise_construct_t
-    syntax keyword cppSTLconstant piecewise_construct
-    syntax keyword cppSTLfunction declval forward move move_if_noexcept
+    " Note: ignore is also a function (could also be put under cppSTLvariable)
+    syntax match cppSTLconstant "\<ignore\>(\@!"
 endif
 
 
 " C++14 extensions {{{1
 if !exists('cpp_no_cpp14')
-    " chrono
-    syntax keyword cppSTLnamespace literals chrono_literals
+    syntax keyword cppSTLnamespace literals chrono_literals string_literals
 
-    " memory
     syntax keyword cppSTLfunction make_unique
 
-    " utility
     syntax keyword cppSTLtype
-            \ index_sequence index_sequence_for integer_sequence make_index_sequence make_integer_sequence
-
-    " shared_mutex
-    syntax keyword cppSTLtype shared_lock shared_timed_mutex
-
-    " string
-    syntax keyword cppSTLnamespace string_literals
-
-    " tuple
-    syntax keyword cppSTLtype tuple_element_t
-
-    " type_traits
-    syntax keyword cppSTLtype
-            \ add_const_t add_cv_t add_lvalue_reference_t add_pointer_t add_rvalue_reference_t add_volatile_t aligned_storage_t aligned_union_t common_type_t conditional_t decay_t enable_if_t is_null_pointer make_signed_t make_unsigned_t remove_all_extents_t remove_const_t remove_cv_t remove_extent_t remove_pointer_t remove_reference_t remove_volatile_t result_of_t underlying_type_t
+            \ index_sequence index_sequence_for integer_sequence make_index_sequence make_integer_sequence shared_lock shared_timed_mutex tuple_element_t add_const_t add_cv_t add_lvalue_reference_t add_pointer_t add_rvalue_reference_t add_volatile_t aligned_storage_t aligned_union_t common_type_t conditional_t decay_t enable_if_t is_null_pointer make_signed_t make_unsigned_t remove_all_extents_t remove_const_t remove_cv_t remove_extent_t remove_pointer_t remove_reference_t remove_volatile_t result_of_t underlying_type_t
 endif
 
 
 " C++17 extensions {{{1
 if !exists('cpp_no_cpp17')
-    " any
-    syntax keyword cppSTLtype any
-    syntax keyword cppSTLexception bad_any_cast
-    syntax keyword cppSTLcast any_cast
+    syntax keyword cppSTLnamespace filesystem execution
 
-    " atomic
-    syntax keyword cppSTLconstant is_always_lock_free
+    syntax keyword cppSTLtype
+            \ any is_execution_policy parallel_policy parallel_unsequenced_policy sequenced_policy directory_entry directory_iterator file_status file_time_type path recursive_directory_iterator space_info default_order default_order_t default_searcher boyer_moore_searcher boyer_moore_horspool_searcher memory_resource monotonic_buffer_resource polymorphic_allocator pool_options synchronized_pool_resource unsynchronized_pool_resource scoped_lock optional nullopt_t shared_mutex basic_string_view string_view u16string_view u32string_view wstring_view bool_constant conjunction disjunction has_unique_object_representations invoke_result invoke_result_t is_aggregate is_callable is_invocable is_invocable_r is_nothrow_invocable is_nothrow_invocable_r is_nothrow_swappable is_nothrow_swappable_with is_nowthrow_callable is_swappable is_swappable_with negation void_t node_type insert_return_type in_place_tag in_place_t in_place_type_t in_place_index_t monostate variant variant_size variant_alternative variant_alternative_t
 
-    " chrono
-    syntax keyword cppSTLbool treat_as_floating_point_v
+    syntax keyword cppSTLexception
+            \ bad_any_cast filesystem_error bad_optional_access bad_variant_access
 
-    " execution
-    syntax keyword cppSTLnamespace execution
-    syntax keyword cppSTLconstant seq par par_unseq
-    syntax keyword cppSTLbool is_execution_policy_v
-    syntax keyword cppSTLtype
-            \ is_execution_policy parallel_policy parallel_unsequenced_policy sequenced_policy
+    syntax keyword cppSTLconstant
+            \ is_always_lock_free seq par par_unseq copy_symlinks auto_format create_hard_links create_symlinks directories_only follow_directory_symlink generic_format group_all group_exec group_read group_write native_format others_all others_exec others_read others_write overwrite_existing owner_all owner_exec owner_read owner_write preferred_separator recursive set_gid set_uid skip_existing skip_permission_denied skip_symlinks sticky_bit update_existing hardware_destructive_interference_size hardware_constructive_interference_size tuple_size_v nullopt alignment_of_v rank_v extent_v variant_npos variant_size_v
 
-    " filesystem
-    syntax keyword cppSTLnamespace filesystem
-    syntax keyword cppSTLexception filesystem_error
+    syntax keyword cppSTLbool
+            \ treat_as_floating_point_v is_execution_policy_v is_bind_expression_v is_placeholder_v is_error_code_enum_v is_error_condition_enum_v uses_allocator_v conjunction_v disjunction_v has_unique_object_representations_v has_virtual_destructor_v is_abstract_v is_aggregate_v is_arithmetic_v is_array_v is_assignable_v is_base_of_v is_callable_v is_class_v is_compound_v is_const_v is_constructible_v is_convertible_v is_copy_assignable_v is_copy_constructible_v is_default_constructible_v is_destructible_v is_empty_v is_enum_v is_floating_point_v is_function_v is_fundamental_v is_integral_v is_invocable_r_v is_invocable_v is_literal_type_v is_lvalue_reference_v is_member_function_pointer_v is_member_object_pointer_v is_member_pointer_v is_move_assignable_v is_move_constructible_v is_nothrow_assignable_v is_nothrow_constructible_v is_nothrow_copy_assignable_v is_nothrow_copy_constructible_v is_nothrow_default_constructible_v is_nothrow_destructible_v is_nothrow_invocable_r_v is_nothrow_invocable_v is_nothrow_move_assignable_v is_nothrow_move_constructible_v is_nothrow_swappable_v is_nothrow_swappable_with_v is_nowthrow_callable_v is_null_pointer_v is_object_v is_pod_v is_pointer_v is_polymorphic_v is_reference_v is_rvalue_reference_v is_same_v is_scalar_v is_signed_v is_standard_layout_v is_swappable_v is_swappable_with_v is_trivial_v is_trivially_assignable_v is_trivially_constructible_v is_trivially_copy_assignable_v is_trivially_copy_constructible_v is_trivially_copyable_v is_trivially_default_constructible_v is_trivially_destructible_v is_trivially_move_assignable_v is_trivially_move_constructible_v is_union_v is_unsigned_v is_void_v is_volatile_v negation_v
 
-    syntax keyword cppSTLtype
-            \ directory_entry directory_iterator file_status file_time_type path recursive_directory_iterator space_info
+    syntax keyword cppSTLfunction
+            \ reinterpret_pointer_cast make_from_tuple make_optional any_cast
 
     syntax keyword cppSTLenum
             \ copy_options directory_options file_type perm_options perms
@@ -267,152 +120,39 @@ if !exists('cpp_no_cpp17')
     " Note: There is std::filesystem::path::format and std::format() in <format>
     syntax match cppSTLenum "\<format\>(\@!"
 
-    syntax keyword cppSTLconstant
-            \ copy_symlinks auto_format create_hard_links create_symlinks directories_only follow_directory_symlink generic_format group_all group_exec group_read group_write native_format others_all others_exec others_read others_write overwrite_existing owner_all owner_exec owner_read owner_write preferred_separator recursive set_gid set_uid skip_existing skip_permission_denied skip_symlinks sticky_bit update_existing
-
     " Note: these keywords are very likely to coincide with user-defined variables
     " syntax keyword cppSTLconstant
     "         \ all mask unknown replace add remove nofollow none not_found regular directory symlink block character fifo socket unknown
 
     " Note: these are also functions
     " syntax keyword cppSTLconstant capacity free available
-
-    " functional
-    syntax keyword cppSTLbool is_bind_expression_v is_placeholder_v
-    syntax keyword cppSTLtype
-            \ default_order default_order_t default_searcher boyer_moore_searcher boyer_moore_horspool_searcher
-
-    " memory
-    syntax keyword cppSTLfunction reinterpret_pointer_cast
-    syntax keyword cppSTLconstant uses_allocator_v
-
-    " memory_resource
-    syntax keyword cppSTLtype
-            \ memory_resource monotonic_buffer_resource polymorphic_allocator pool_options synchronized_pool_resource unsynchronized_pool_resource
-
-    " mutex
-    syntax keyword cppSTLtype scoped_lock
-
-    " new
-    syntax keyword cppSTLconstant
-            \ hardware_destructive_interference_size hardware_constructive_interference_size
-
-    " optional
-    syntax keyword cppSTLtype optional nullopt_t
-    syntax keyword cppSTLexception bad_optional_access
-    syntax keyword cppSTLconstant nullopt
-    syntax keyword cppSTLfunction make_optional
-
-    " shared_mutex
-    syntax keyword cppSTLtype shared_mutex
-
-    " string_view
-    syntax keyword cppSTLtype
-            \ basic_string_view string_view u16string_view u32string_view wstring_view
-
-    " system_error
-    syntax keyword cppSTLbool is_error_code_enum_v is_error_condition_enum_v
-
-    " tuple
-    syntax keyword cppSTLconstant tuple_size_v
-    syntax keyword cppSTLfunction make_from_tuple
-
-    " type_traits
-    syntax keyword cppSTLconstant alignment_of_v rank_v extent_v
-    syntax keyword cppSTLbool
-            \ conjunction_v disjunction_v has_unique_object_representations_v has_virtual_destructor_v is_abstract_v is_aggregate_v is_arithmetic_v is_array_v is_assignable_v is_base_of_v is_callable_v is_class_v is_compound_v is_const_v is_constructible_v is_convertible_v is_copy_assignable_v is_copy_constructible_v is_default_constructible_v is_destructible_v is_empty_v is_enum_v is_floating_point_v is_function_v is_fundamental_v is_integral_v is_invocable_r_v is_invocable_v is_literal_type_v is_lvalue_reference_v is_member_function_pointer_v is_member_object_pointer_v is_member_pointer_v is_move_assignable_v is_move_constructible_v is_nothrow_assignable_v is_nothrow_constructible_v is_nothrow_copy_assignable_v is_nothrow_copy_constructible_v is_nothrow_default_constructible_v is_nothrow_destructible_v is_nothrow_invocable_r_v is_nothrow_invocable_v is_nothrow_move_assignable_v is_nothrow_move_constructible_v is_nothrow_swappable_v is_nothrow_swappable_with_v is_nowthrow_callable_v is_null_pointer_v is_object_v is_pod_v is_pointer_v is_polymorphic_v is_reference_v is_rvalue_reference_v is_same_v is_scalar_v is_signed_v is_standard_layout_v is_swappable_v is_swappable_with_v is_trivial_v is_trivially_assignable_v is_trivially_constructible_v is_trivially_copy_assignable_v is_trivially_copy_constructible_v is_trivially_copyable_v is_trivially_default_constructible_v is_trivially_destructible_v is_trivially_move_assignable_v is_trivially_move_constructible_v is_union_v is_unsigned_v is_void_v is_volatile_v negation_v
-
-    syntax keyword cppSTLtype
-            \ bool_constant conjunction disjunction has_unique_object_representations invoke_result invoke_result_t is_aggregate is_callable is_invocable is_invocable_r is_nothrow_invocable is_nothrow_invocable_r is_nothrow_swappable is_nothrow_swappable_with is_nowthrow_callable is_swappable is_swappable_with negation void_t
-
-    " unordered_map, unordered_set, unordered_multimap, unordered_multiset
-    syntax keyword cppSTLtype node_type insert_return_type
-
-    " utility
-    syntax keyword cppSTLtype
-            \ in_place_tag in_place_t in_place_type_t in_place_index_t
-
-    " variant
-    syntax keyword cppSTLconstant variant_npos variant_size_v
-    syntax keyword cppSTLexception bad_variant_access
-    syntax keyword cppSTLtype
-            \ monostate variant variant_size variant_alternative variant_alternative_t
 endif
 
 
 " C++20 extensions {{{1
 if !exists('cpp_no_cpp20')
-    syntax keyword cppType char8_t
-    syntax keyword cppOperator co_await
-    syntax keyword cppStatement consteval constinit concept requires co_yield co_return
-
-    " atomic
-    syntax keyword cppSTLtype atomic_ref
-
-    " bit
-    syntax keyword cppSTLtype endian
-
-    " compare
-    syntax keyword cppSTLtype
-            \ weak_ordering strong_ordering partial_ordering weak_equality strong_equality common_comparison_category common_comparison_category_t
+    syntax keyword cppSTLnamespace ranges views
+    syntax keyword cppSTLconstant dynamic_extent
+    syntax keyword cppSTLvariable default_sentinel unreachable_sentinel
 
-    " concepts
-    syntax keyword cppSTLconcept
-            \ assignable_from boolean common_reference_with common_with constructible_from convertible_to copy_constructible copyable default_constructible derived_from destructible equality_comparable equality_comparable_with equivalence_relation floating_point integral invocable movable move_constructible predicate regular regular_invocable relation same_as semiregular signed_integral strict_weak_order swappable swappable_with totally_ordered totally_ordered_with unsigned_integral default_initializable
-
-    " concepts - named requirements
-    " These are concepts that haven't made it into the C++ Standard yet
-    " https://en.cppreference.com/w/cpp/named_req
-    " http://en.cppreference.com/w/cpp/language/constraints
-    if get(g:, 'cpp_named_requirements_highlight', 0)
-        syntax keyword cppSTLNamedReq
-                \ Allocator AllocatorAwareContainer AssociativeContainer BasicLockable BidirectionalIterator BinaryPredicate BinaryTypeTrait BitmaskType Callable CharTraits Clock Compare ConstExprIterator Container ContiguousContainer ContiguousIterator CopyAssignable CopyInsertable CopyInsertable DefaultInsertable EmplaceConstructible Erasable FormattedInputFunction FormattedOutputFunction ForwardIterator FunctionObject Hash InputIterator Iterator LessThanComparable LiteralType Lockable MoveAssignable MoveInsertable Mutex NullablePointer NumericType OutputIterator PODType RandomAccessIterator RandomNumberDistribution RandomNumberEngine RandomNumberEngineAdaptor RegexTraits ReversibleContainer SeedSequence SequenceContainer SharedMutex SharedTimedMutex StandardLayoutType TimedLockable TimedMutex TransformationTrait TrivialClock TrivialType TriviallyCopyable UnaryTypeTrait UnformattedInputFunction UnformattedOutputFunction UniformRandomBitGenerator UnorderedAssociativeContainer ValueSwappable
-        hi def link cppSTLNamedReq Typedef
-    endif
-
-    " contract
-    syntax keyword cppSTLtype contract_violation
-
-    " coroutines
     syntax keyword cppSTLtype
-            \ coroutine_traits coroutine_handle noop_coroutine_handle noop_coroutine_promise suspend_never suspend_always
+            \ atomic_ref endian weak_ordering strong_ordering partial_ordering weak_equality strong_equality common_comparison_category common_comparison_category_t contract_violation coroutine_traits coroutine_handle noop_coroutine_handle noop_coroutine_promise suspend_never suspend_always remove_cvref remove_cvref_t is_bounded_array is_layout_compatible is_unbounded_array is_nothrow_convertible has_strong_structural_equality is_pointer_interconvertible_base_of unwrap_reference unwrap_reference_t unwrap_ref_decay unwrap_ref_decay_t basic_common_reference common_reference common_reference_t iterator_t sentinel_t dangling safe_iterator_t safe_subrange_t ref_view filter_view transform_view iota_view join_view empty_view single_view split_view common_view reverse_view view_interface span basic_syncbuf basic_osyncstream syncbuf wsyncbuf osyncstream wosyncstream jthread latch barrier stop_token stop_source stop_callback counting_semaphore binary_semaphore source_location compare_three_way_result compare_three_way_result_t contiguous_iterator_tag incrementable_traits iter_value_t iter_reference_t iter_difference_t iter_rvalue_reference_t iter_common_reference_t indirectly_readable_traits move_sentinel default_sentinel_t unreachable_sentinel_t common_iterator counted_iterator indirect_result_t projected type_identity type_identity_t
 
-    " memory
     syntax keyword cppSTLfunction
-            \ make_unique_default_init make_shared_default_init allocate_shared_default_init uses_allocator_construction_args make_obj_using_allocator
-
-    " type_traits
-    syntax keyword cppSTLtype
-            \ remove_cvref remove_cvref_t is_bounded_array is_layout_compatible is_unbounded_array is_nothrow_convertible has_strong_structural_equality is_pointer_interconvertible_base_of unwrap_reference unwrap_reference_t unwrap_ref_decay unwrap_ref_decay_t basic_common_reference common_reference common_reference_t
+            \ make_unique_default_init make_shared_default_init allocate_shared_default_init uses_allocator_construction_args make_obj_using_allocator is_corresponding_member subspan in_range is_pointer_interconvertible_with_class
 
     syntax keyword cppSTLbool
-            \ is_bounded_array_v is_layout_compatible_v is_unbounded_array_v is_nothrow_convertible_v has_strong_structural_equality_v is_pointer_interconvertible_base_of_v
-
-    syntax keyword cppSTLfunction is_corresponding_member
-
-    " ranges
-    syntax keyword cppSTLnamespace ranges views
+            \ is_bounded_array_v is_layout_compatible_v is_unbounded_array_v is_nothrow_convertible_v has_strong_structural_equality_v is_pointer_interconvertible_base_of_v disable_sized_sentinel_for disable_sized_range enable_borrowed_range enable_view
 
     syntax keyword cppSTLconcept
-            \ range sized_range view input_range output_range forward_range bidirectional_range random_access_range contiguous_range common_range viewable_range
-
-    syntax keyword cppSTLtype
-            \ iterator_t sentinel_t dangling safe_iterator_t safe_subrange_t ref_view filter_view transform_view iota_view join_view empty_view single_view split_view common_view reverse_view view_interface
-
-    " span
-    syntax keyword cppSTLtype span
-    syntax keyword cppSTLconstant dynamic_extent
-    syntax keyword cppSTLfunction subspan
-
-    " syncstream
-    syntax keyword cppSTLtype
-            \ basic_syncbuf basic_osyncstream syncbuf wsyncbuf osyncstream wosyncstream
+            \ assignable_from boolean common_reference_with common_with constructible_from convertible_to copy_constructible copyable default_constructible derived_from destructible equality_comparable equality_comparable_with equivalence_relation floating_point integral invocable movable move_constructible predicate regular regular_invocable relation same_as semiregular signed_integral strict_weak_order swappable swappable_with totally_ordered totally_ordered_with unsigned_integral default_initializable range sized_range view input_range output_range forward_range bidirectional_range random_access_range contiguous_range common_range viewable_range three_way_comparable three_way_comparable_with indirectly_readable indirectly_writable weakly_incrementable incrementable input_or_output_iterator sentinel_for sized_sentinel_for input_iterator output_iterator forward_iterator bidirectional_iterator random_access_iterator contiguous_iterator indirectly_unary_invocable indirectly_regular_unary_invocable indirect_unary_predicate indirect_binary_predicate indirect_equivalence_relation indirect_strict_weak_order indirectly_movable indirectly_movable_storable indirectly_copyable indirectly_copyable_storable indirectly_swappable indirectly_comparable permutable mergeable sortable
 endif
 
+
 " Boost {{{1
 if !exists('cpp_no_boost')
     syntax keyword cppSTLnamespace boost
-    syntax keyword cppSTLcast lexical_cast
+    syntax keyword cppSTLfunction lexical_cast
 endif
 " }}}
 
@@ -421,18 +161,15 @@ endif
 hi def link cppSTLbool         Boolean
 hi def link cppStatement       Statement
 hi def link cppSTLfunction     Function
-hi def link cppSTLfunctional   Typedef
 hi def link cppSTLconstant     Constant
 hi def link cppSTLnamespace    Constant
-hi def link cppSTLtype         Typedef
-hi def link cppSTLexception    Exception
+hi def link cppSTLtype         Type
+hi def link cppSTLexception    Type
 hi def link cppSTLiterator     Typedef
-hi def link cppSTLiterator_tag Typedef
 hi def link cppSTLenum         Typedef
 hi def link cppSTLios          Function
-hi def link cppSTLcast         Statement
 hi def link cppSTLconcept      Typedef
-hi def link cppSTLVariable     Identifier
+hi def link cppSTLvariable     Identifier
 
 " The keywords {inline, virtual, explicit, export, override, final} are
 " standard C++ keywords and NOT types!
@@ -444,7 +181,6 @@ if get(g:, 'cpp_simple_highlight', 0)
     hi link cppStructure    Statement
     hi link cppExceptions   Statement
     hi link cppStorageClass Statement
-    hi link cppSTLexception Typedef
 endif
 
 endif
diff --git a/after/syntax/ruby.vim b/after/syntax/ruby.vim
index a135b6a8c..78503c94f 100644
--- a/after/syntax/ruby.vim
+++ b/after/syntax/ruby.vim
@@ -82,7 +82,7 @@ syn cluster rubyNotTop add=@yardTags,@yardDirectives,@yardTypes,@yardLists,@yard
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 hi def link yardComment rubyComment
 " Tags
-hi def link yardGenericTag rubyTodo
+hi def link yardGenericTag rubyKeyword
 hi def link yardAbstract yardGenericTag
 hi def link yardApi yardGenericTag
 hi def link yardAttr yardGenericTag
@@ -106,7 +106,7 @@ hi def link yardYield yardGenericTag
 hi def link yardYieldParam yardGenericTag
 hi def link yardYieldReturn yardGenericTag
 " Directives
-hi def link yardGenericDirective rubyTodo
+hi def link yardGenericDirective rubyKeyword
 hi def link yardAttribute yardGenericDirective
 hi def link yardEndGroup yardGenericDirective
 hi def link yardGroup yardGenericDirective
diff --git a/filetype.vim b/filetype.vim
index 34c31ef3d..824eec6ba 100644
--- a/filetype.vim
+++ b/filetype.vim
@@ -1,1215 +1,8 @@
-" Vim support file to detect file types
-"
-" Maintainer:	Adam Stankiewicz <sheerun@sher.pl>
-" URL: https://github.com/sheerun/vim-polyglot
+" Oh yeah, we are loading before vim's filetype.vim so we can
+" make startup little faster by preventing it to load later
+if !exists("did_load_filetypes")
+  runtime! ftdetect/polyglot.vim
 
-" Listen very carefully, I will say this only once
-if exists("did_load_polyglot")
-  finish
+  " We need to do it here to avoid recursive loop
+  runtime! ftdetect/*.vim
 endif
-let did_load_polyglot = 1
-
-" Line continuation is used here, remove 'C' from 'cpoptions'
-let s:cpo_save = &cpo
-set cpo&vim
-
-" Disable all native vim ftdetect
-if exists('g:polyglot_test')
-  autocmd!
-endif
-
-func! s:Observe(fn)
-  let b:polyglot_observe = a:fn
-  augroup polyglot-observer
-    au! CursorHold,CursorHoldI,BufWritePost <buffer>
-      \ execute('if polyglot#' . b:polyglot_observe . '() | au! polyglot-observer | endif')
-  augroup END
-endfunc
-
-let s:disabled_packages = {}
-let s:new_polyglot_disabled = []
-
-if exists('g:polyglot_disabled')
-  for pkg in g:polyglot_disabled
-    let base = split(pkg, '\.')
-    if len(base) > 0
-      let s:disabled_packages[pkg] = 1
-      call add(s:new_polyglot_disabled, base[0]) 
-    endif
-  endfor
-else
-  let g:polyglot_disabled_not_set = 1
-endif
-
-function! s:SetDefault(name, value)
-  if !exists(a:name)
-    let {a:name} = a:value
-  endif
-endfunction
-
-call s:SetDefault('g:markdown_enable_spell_checking', 0)
-call s:SetDefault('g:markdown_enable_input_abbreviations', 0)
-call s:SetDefault('g:markdown_enable_mappings', 0)
-
-" Enable jsx syntax by default
-call s:SetDefault('g:jsx_ext_required', 0)
-
-" Needed for sql highlighting
-call s:SetDefault('g:javascript_sql_dialect', 'sql')
-
-" Make csv loading faster
-call s:SetDefault('g:csv_start', 1)
-call s:SetDefault('g:csv_end', 2)
-
-" Disable json concealing by default
-call s:SetDefault('g:vim_json_syntax_conceal', 0)
-
-call s:SetDefault('g:filetype_euphoria', 'elixir')
-
-if !exists('g:python_highlight_all')
-  call s:SetDefault('g:python_highlight_builtins', 1)
-  call s:SetDefault('g:python_highlight_builtin_objs', 1)
-  call s:SetDefault('g:python_highlight_builtin_types', 1)
-  call s:SetDefault('g:python_highlight_builtin_funcs', 1)
-  call s:SetDefault('g:python_highlight_builtin_funcs_kwarg', 1)
-  call s:SetDefault('g:python_highlight_exceptions', 1)
-  call s:SetDefault('g:python_highlight_string_formatting', 1)
-  call s:SetDefault('g:python_highlight_string_format', 1)
-  call s:SetDefault('g:python_highlight_string_templates', 1)
-  call s:SetDefault('g:python_highlight_indent_errors', 1)
-  call s:SetDefault('g:python_highlight_space_errors', 1)
-  call s:SetDefault('g:python_highlight_doctests', 1)
-  call s:SetDefault('g:python_highlight_func_calls', 1)
-  call s:SetDefault('g:python_highlight_class_vars', 1)
-  call s:SetDefault('g:python_highlight_operators', 1)
-  call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
-  call s:SetDefault('g:python_slow_sync', 1)
-endif
-
-" We need it because scripts.vim in vim uses "set ft=" which cannot be
-" overridden with setf (and we can't use set ft= so our scripts.vim work)
-func! s:Setf(ft)
-  if &filetype !~# '\<'.a:ft.'\>'
-    let &filetype = a:ft
-  endif
-endfunc
-
-" Function used for patterns that end in a star: don't set the filetype if the
-" file name matches ft_ignore_pat.
-" When using this, the entry should probably be further down below with the
-" other StarSetf() calls.
-func! s:StarSetf(ft)
-  if expand("<amatch>") !~ g:ft_ignore_pat && &filetype !~# '\<'.a:ft.'\>'
-    let &filetype = a:ft
-  endif
-endfunc
-
-augroup filetypedetect
-
-" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
-
-if !has_key(s:disabled_packages, 'sql')
-  au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw setf sql
-endif
-
-if !has_key(s:disabled_packages, 'gitignore')
-  au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore setf gitignore
-endif
-
-if !has_key(s:disabled_packages, 'tads')
-  au! BufNewFile,BufRead *.t call polyglot#detect#T()
-endif
-
-if !has_key(s:disabled_packages, 'prolog')
-  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
-  au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap setf prolog
-endif
-
-if !has_key(s:disabled_packages, 'bzl')
-  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE setf bzl
-endif
-
-if !has_key(s:disabled_packages, 'odin')
-  au BufNewFile,BufRead *.odin setf odin
-endif
-
-if !has_key(s:disabled_packages, 'dosini')
-  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec setf dosini
-  au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
-  au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
-endif
-
-if !has_key(s:disabled_packages, 'visual-basic')
-  au! BufNewFile,BufRead *.bas call polyglot#detect#Bas()
-  au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs setf vb
-endif
-
-if !has_key(s:disabled_packages, 'basic')
-  au BufNewFile,BufRead *.basic setf basic
-endif
-
-if !has_key(s:disabled_packages, 'trasys')
-  au! BufNewFile,BufRead *.inp call polyglot#detect#Inp()
-endif
-
-if !has_key(s:disabled_packages, 'zig')
-  au BufNewFile,BufRead *.zig,*.zir setf zig
-  au BufNewFile,BufRead *.zir setf zir
-endif
-
-if !has_key(s:disabled_packages, 'zephir')
-  au BufNewFile,BufRead *.zep setf zephir
-endif
-
-if !has_key(s:disabled_packages, 'help')
-  au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt setf help
-endif
-
-if !has_key(s:disabled_packages, 'helm')
-  au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml setf helm
-endif
-
-if !has_key(s:disabled_packages, 'ansible')
-  au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml setf yaml.ansible
-  au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
-  au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
-endif
-
-if !has_key(s:disabled_packages, 'xsl')
-  au BufNewFile,BufRead *.xsl,*.xslt setf xsl
-endif
-
-if !has_key(s:disabled_packages, 'xdc')
-  au BufNewFile,BufRead *.xdc setf xdc
-endif
-
-if !has_key(s:disabled_packages, 'vue')
-  au BufNewFile,BufRead *.vue,*.wpy setf vue
-endif
-
-if !has_key(s:disabled_packages, 'vmasm')
-  au BufNewFile,BufRead *.mar setf vmasm
-endif
-
-if !has_key(s:disabled_packages, 'velocity')
-  au BufNewFile,BufRead *.vm setf velocity
-endif
-
-if !has_key(s:disabled_packages, 'vcl')
-  au BufNewFile,BufRead *.vcl setf vcl
-endif
-
-if !has_key(s:disabled_packages, 'vbnet')
-  au BufNewFile,BufRead *.vb,*.vbhtml setf vbnet
-endif
-
-if !has_key(s:disabled_packages, 'vala')
-  au BufNewFile,BufRead *.vala,*.valadoc,*.vapi setf vala
-endif
-
-if !has_key(s:disabled_packages, 'v')
-  au BufNewFile,BufRead *.v setf v
-endif
-
-if !has_key(s:disabled_packages, 'unison')
-  au BufNewFile,BufRead *.u,*.uu setf unison
-endif
-
-if !has_key(s:disabled_packages, 'typescript')
-  au BufNewFile,BufRead *.tsx setf typescriptreact
-  au BufNewFile,BufRead *.ts setf typescript
-endif
-
-if !has_key(s:disabled_packages, 'twig')
-  au BufNewFile,BufRead *.xml.twig setf xml.twig
-  au BufNewFile,BufRead *.twig setf html.twig
-endif
-
-if !has_key(s:disabled_packages, 'tptp')
-  au BufNewFile,BufRead *.ax,*.p,*.tptp setf tptp
-endif
-
-if !has_key(s:disabled_packages, 'toml')
-  au BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock setf toml
-endif
-
-if !has_key(s:disabled_packages, 'tmux')
-  au BufNewFile,BufRead {.,}tmux*.conf setf tmux
-endif
-
-if !has_key(s:disabled_packages, 'thrift')
-  au BufNewFile,BufRead *.thrift setf thrift
-endif
-
-if !has_key(s:disabled_packages, 'textile')
-  au BufNewFile,BufRead *.textile setf textile
-endif
-
-if !has_key(s:disabled_packages, 'terraform')
-  au BufNewFile,BufRead *.tf,*.tfvars setf terraform
-endif
-
-if !has_key(s:disabled_packages, 'systemd')
-  au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf setf systemd
-  au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
-endif
-
-if !has_key(s:disabled_packages, 'sxhkd')
-  au BufNewFile,BufRead *.sxhkdrc,sxhkdrc setf sxhkdrc
-endif
-
-if !has_key(s:disabled_packages, 'swift')
-  au BufNewFile,BufRead *.swift setf swift
-endif
-
-if !has_key(s:disabled_packages, 'svg-indent')
-endif
-
-if !has_key(s:disabled_packages, 'svg')
-  au BufNewFile,BufRead *.svg setf svg
-endif
-
-if !has_key(s:disabled_packages, 'svelte')
-  au BufNewFile,BufRead *.svelte setf svelte
-endif
-
-if !has_key(s:disabled_packages, 'stylus')
-  au BufNewFile,BufRead *.styl,*.stylus setf stylus
-endif
-
-if !has_key(s:disabled_packages, 'solidity')
-  au BufNewFile,BufRead *.sol setf solidity
-endif
-
-if !has_key(s:disabled_packages, 'smt2')
-  au BufNewFile,BufRead *.smt,*.smt2 setf smt2
-endif
-
-if !has_key(s:disabled_packages, 'slime')
-  au BufNewFile,BufRead *.slime setf slime
-endif
-
-if !has_key(s:disabled_packages, 'slim')
-  au BufNewFile,BufRead *.slim setf slim
-endif
-
-if !has_key(s:disabled_packages, 'zinit')
-endif
-
-if !has_key(s:disabled_packages, 'sh')
-  au BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
-  au BufNewFile,BufRead {.,}zsh* call s:StarSetf('zsh')
-  au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh')
-  au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
-  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc setf sh
-endif
-
-if !has_key(s:disabled_packages, 'scss')
-  au BufNewFile,BufRead *.scss setf scss
-endif
-
-if !has_key(s:disabled_packages, 'sbt')
-  au BufNewFile,BufRead *.sbt setf sbt.scala
-endif
-
-if !has_key(s:disabled_packages, 'scala')
-  au BufNewFile,BufRead *.kojo,*.sc,*.scala setf scala
-endif
-
-if !has_key(s:disabled_packages, 'rust')
-  au BufNewFile,BufRead *.rs,*.rs.in setf rust
-endif
-
-if !has_key(s:disabled_packages, 'brewfile')
-  au BufNewFile,BufRead Brewfile setf brewfile
-endif
-
-if !has_key(s:disabled_packages, 'yard')
-endif
-
-if !has_key(s:disabled_packages, 'rspec')
-  au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
-endif
-
-if !has_key(s:disabled_packages, 'ruby')
-  au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml setf eruby
-  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile setf ruby
-  au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
-endif
-
-if !has_key(s:disabled_packages, 'rst')
-  au BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt setf rst
-endif
-
-if !has_key(s:disabled_packages, 'reason')
-  au! BufNewFile,BufRead *.re call polyglot#detect#Re()
-  au BufNewFile,BufRead *.rei setf reason
-endif
-
-if !has_key(s:disabled_packages, 'razor')
-  au BufNewFile,BufRead *.cshtml,*.razor setf razor
-endif
-
-if !has_key(s:disabled_packages, 'raml')
-  au BufNewFile,BufRead *.raml setf raml
-endif
-
-if !has_key(s:disabled_packages, 'raku')
-  au! BufNewFile,BufRead *.t call polyglot#detect#T()
-  au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
-  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
-  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 setf raku
-endif
-
-if !has_key(s:disabled_packages, 'ragel')
-  au BufNewFile,BufRead *.rl setf ragel
-endif
-
-if !has_key(s:disabled_packages, 'racket')
-  au BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl setf racket
-endif
-
-if !has_key(s:disabled_packages, 'r-lang')
-  au BufNewFile,BufRead *.rd setf rhelp
-  au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist setf r
-endif
-
-if !has_key(s:disabled_packages, 'qml')
-  au BufNewFile,BufRead *.qbs,*.qml setf qml
-endif
-
-if !has_key(s:disabled_packages, 'qmake')
-  au BufNewFile,BufRead *.pri,*.pro setf qmake
-endif
-
-if !has_key(s:disabled_packages, 'requirements')
-  au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} setf requirements
-endif
-
-if !has_key(s:disabled_packages, 'python-compiler')
-endif
-
-if !has_key(s:disabled_packages, 'python-indent')
-endif
-
-if !has_key(s:disabled_packages, 'python')
-  au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript setf python
-endif
-
-if !has_key(s:disabled_packages, 'purescript')
-  au BufNewFile,BufRead *.purs setf purescript
-endif
-
-if !has_key(s:disabled_packages, 'puppet')
-  au BufNewFile,BufRead *.epp setf embeddedpuppet
-  au BufNewFile,BufRead *.pp,Modulefile setf puppet
-endif
-
-if !has_key(s:disabled_packages, 'pug')
-  au BufNewFile,BufRead *.jade,*.pug setf pug
-endif
-
-if !has_key(s:disabled_packages, 'protobuf')
-  au BufNewFile,BufRead *.proto setf proto
-endif
-
-if !has_key(s:disabled_packages, 'powershell')
-  au BufNewFile,BufRead *.ps1xml setf ps1xml
-  au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc setf ps1
-endif
-
-if !has_key(s:disabled_packages, 'pony')
-  au BufNewFile,BufRead *.pony setf pony
-endif
-
-if !has_key(s:disabled_packages, 'plantuml')
-  au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml setf plantuml
-endif
-
-if !has_key(s:disabled_packages, 'blade')
-  au BufNewFile,BufRead *.blade,*.blade.php setf blade
-endif
-
-if !has_key(s:disabled_packages, 'php')
-  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile setf php
-endif
-
-if !has_key(s:disabled_packages, 'cql')
-  au BufNewFile,BufRead *.cql setf cql
-endif
-
-if !has_key(s:disabled_packages, 'pgsql')
-  au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
-endif
-
-if !has_key(s:disabled_packages, 'perl')
-  au! BufNewFile,BufRead *.tt2 call polyglot#detect#Tt2()
-  au! BufNewFile,BufRead *.t call polyglot#detect#T()
-  au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
-  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
-  au BufNewFile,BufRead *.xs setf xs
-  au BufNewFile,BufRead *.comp,*.mason,*.mhtml setf mason
-  au BufNewFile,BufRead *.pod setf pod
-  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc setf perl
-endif
-
-if !has_key(s:disabled_packages, 'opencl')
-  au BufNewFile,BufRead *.cl,*.opencl setf opencl
-endif
-
-if !has_key(s:disabled_packages, 'octave')
-  au! BufNewFile,BufRead *.m call polyglot#detect#M()
-  au BufNewFile,BufRead *.oct setf octave
-endif
-
-if !has_key(s:disabled_packages, 'ocaml')
-  au BufNewFile,BufRead *.sexp setf sexplib
-  au BufNewFile,BufRead *.root setf ocpbuildroot
-  au BufNewFile,BufRead *.ocp setf ocpbuild
-  au BufNewFile,BufRead _tags setf ocamlbuild_tags
-  au BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild setf dune
-  au BufNewFile,BufRead _oasis setf oasis
-  au BufNewFile,BufRead *.opam,*.opam.template,opam setf opam
-  au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in setf omake
-  au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit setf ocaml
-endif
-
-if !has_key(s:disabled_packages, 'objc')
-  au! BufNewFile,BufRead *.m call polyglot#detect#M()
-  au! BufNewFile,BufRead *.h call polyglot#detect#H()
-endif
-
-if !has_key(s:disabled_packages, 'nix')
-  au BufNewFile,BufRead *.nix setf nix
-endif
-
-if !has_key(s:disabled_packages, 'nim')
-  au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg setf nim
-endif
-
-if !has_key(s:disabled_packages, 'nginx')
-  au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf setf nginx
-  au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
-  au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
-endif
-
-if !has_key(s:disabled_packages, 'murphi')
-  au! BufNewFile,BufRead *.m call polyglot#detect#M()
-endif
-
-if !has_key(s:disabled_packages, 'moonscript')
-  au BufNewFile,BufRead *.moon setf moon
-endif
-
-if !has_key(s:disabled_packages, 'meson')
-  au BufNewFile,BufRead *.wrap setf dosini
-  au BufNewFile,BufRead meson.build,meson_options.txt setf meson
-endif
-
-if !has_key(s:disabled_packages, 'mdx')
-  au BufNewFile,BufRead *.mdx setf markdown.mdx
-endif
-
-if !has_key(s:disabled_packages, 'markdown')
-  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr setf markdown
-endif
-
-if !has_key(s:disabled_packages, 'mathematica')
-  au! BufNewFile,BufRead *.m call polyglot#detect#M()
-  au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt setf mma
-endif
-
-if !has_key(s:disabled_packages, 'mako')
-  au BufNewFile,BufRead *.mako,*.mao setf mako
-  au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-endif
-
-if !has_key(s:disabled_packages, 'm4')
-  au BufNewFile,BufRead *.at,*.m4 setf m4
-endif
-
-if !has_key(s:disabled_packages, 'lua')
-  au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc setf lua
-endif
-
-if !has_key(s:disabled_packages, 'log')
-  au BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log setf log
-endif
-
-if !has_key(s:disabled_packages, 'llvm')
-  au BufNewFile,BufRead *.td setf tablegen
-  au BufNewFile,BufRead *.ll setf llvm
-endif
-
-if !has_key(s:disabled_packages, 'livescript')
-  au BufNewFile,BufRead *._ls,*.ls,Slakefile setf livescript
-endif
-
-if !has_key(s:disabled_packages, 'lilypond')
-  au BufNewFile,BufRead *.ily,*.ly setf lilypond
-endif
-
-if !has_key(s:disabled_packages, 'less')
-  au BufNewFile,BufRead *.less setf less
-endif
-
-if !has_key(s:disabled_packages, 'ledger')
-  au BufNewFile,BufRead *.journal,*.ldg,*.ledger setf ledger
-endif
-
-if !has_key(s:disabled_packages, 'kotlin')
-  au BufNewFile,BufRead *.kt,*.ktm,*.kts setf kotlin
-endif
-
-if !has_key(s:disabled_packages, 'julia')
-  au BufNewFile,BufRead *.jl setf julia
-endif
-
-if !has_key(s:disabled_packages, 'jst')
-  au BufNewFile,BufRead *.ect,*.ejs,*.jst setf jst
-endif
-
-if !has_key(s:disabled_packages, 'jsonnet')
-  au BufNewFile,BufRead *.jsonnet,*.libsonnet setf jsonnet
-endif
-
-if !has_key(s:disabled_packages, 'json')
-  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
-endif
-
-if !has_key(s:disabled_packages, 'json5')
-  au BufNewFile,BufRead *.json5 setf json5
-endif
-
-if !has_key(s:disabled_packages, 'jq')
-  au BufNewFile,BufRead *.jq,{.,}jqrc setf jq
-  au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq')
-endif
-
-if !has_key(s:disabled_packages, 'htmldjango')
-  au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk setf htmldjango
-endif
-
-if !has_key(s:disabled_packages, 'jenkins')
-  au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile setf Jenkinsfile
-  au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
-endif
-
-if !has_key(s:disabled_packages, 'javascript-sql')
-endif
-
-if !has_key(s:disabled_packages, 'ion')
-  au BufNewFile,BufRead *.ion,~/.config/ion/initrc setf ion
-endif
-
-if !has_key(s:disabled_packages, 'idris2')
-  au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
-  au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
-  au BufNewFile,BufRead *.ipkg,idris-response setf idris2
-endif
-
-if !has_key(s:disabled_packages, 'idris')
-  au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
-  au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
-  au BufNewFile,BufRead idris-response setf idris
-endif
-
-if !has_key(s:disabled_packages, 'icalendar')
-  au BufNewFile,BufRead *.ics setf icalendar
-endif
-
-if !has_key(s:disabled_packages, 'i3')
-  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config setf i3config
-endif
-
-if !has_key(s:disabled_packages, 'html5')
-  au! BufNewFile,BufRead *.html call polyglot#detect#Html()
-  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
-endif
-
-if !has_key(s:disabled_packages, 'hive')
-  au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
-endif
-
-if !has_key(s:disabled_packages, 'hcl')
-  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile setf hcl
-endif
-
-if !has_key(s:disabled_packages, 'haxe')
-  au BufNewFile,BufRead *.hx,*.hxsl setf haxe
-endif
-
-if !has_key(s:disabled_packages, 'haskell')
-  au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig setf haskell
-endif
-
-if !has_key(s:disabled_packages, 'handlebars')
-  au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs setf html.handlebars
-  au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache setf html.mustache
-endif
-
-if !has_key(s:disabled_packages, 'haml')
-  au BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc setf haml
-endif
-
-if !has_key(s:disabled_packages, 'grub')
-  au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf setf grub
-endif
-
-if !has_key(s:disabled_packages, 'gradle')
-endif
-
-if !has_key(s:disabled_packages, 'groovy')
-  au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile setf groovy
-endif
-
-if !has_key(s:disabled_packages, 'graphql')
-  au BufNewFile,BufRead *.gql,*.graphql,*.graphqls setf graphql
-endif
-
-if !has_key(s:disabled_packages, 'jsx')
-  au BufNewFile,BufRead *.jsx setf javascriptreact
-endif
-
-if !has_key(s:disabled_packages, 'javascript')
-  au BufNewFile,BufRead *.flow setf flow
-  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
-endif
-
-if !has_key(s:disabled_packages, 'go')
-  au BufNewFile,BufRead *.tmpl setf gohtmltmpl
-  au BufNewFile,BufRead go.mod setf gomod
-  au BufNewFile,BufRead *.go setf go
-endif
-
-if !has_key(s:disabled_packages, 'gnuplot')
-  au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt setf gnuplot
-endif
-
-if !has_key(s:disabled_packages, 'gmpl')
-  au BufNewFile,BufRead *.mod setf gmpl
-endif
-
-if !has_key(s:disabled_packages, 'glsl')
-  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
-  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
-endif
-
-if !has_key(s:disabled_packages, 'git')
-  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
-  au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
-  au BufNewFile,BufRead git-rebase-todo setf gitrebase
-  au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules setf gitconfig
-  au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
-endif
-
-if !has_key(s:disabled_packages, 'gdscript')
-  au BufNewFile,BufRead *.gd setf gdscript3
-endif
-
-if !has_key(s:disabled_packages, 'fsharp')
-  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
-  au BufNewFile,BufRead *.fsi,*.fsx setf fsharp
-endif
-
-if !has_key(s:disabled_packages, 'forth')
-  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
-  au BufNewFile,BufRead *.ft,*.fth setf forth
-endif
-
-if !has_key(s:disabled_packages, 'flatbuffers')
-  au BufNewFile,BufRead *.fbs setf fbs
-endif
-
-if !has_key(s:disabled_packages, 'fish')
-  au BufNewFile,BufRead *.fish setf fish
-endif
-
-if !has_key(s:disabled_packages, 'ferm')
-  au BufNewFile,BufRead *.ferm,ferm.conf setf ferm
-endif
-
-if !has_key(s:disabled_packages, 'fennel')
-  au BufNewFile,BufRead *.fnl setf fennel
-endif
-
-if !has_key(s:disabled_packages, 'erlang')
-  au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock setf erlang
-endif
-
-if !has_key(s:disabled_packages, 'emblem')
-  au BufNewFile,BufRead *.em,*.emblem setf emblem
-endif
-
-if !has_key(s:disabled_packages, 'emberscript')
-  au BufNewFile,BufRead *.em,*.emberscript setf ember-script
-endif
-
-if !has_key(s:disabled_packages, 'elm')
-  au BufNewFile,BufRead *.elm setf elm
-endif
-
-if !has_key(s:disabled_packages, 'elixir')
-  au BufNewFile,BufRead *.eex,*.leex setf eelixir
-  au BufNewFile,BufRead *.ex,*.exs,mix.lock setf elixir
-endif
-
-if !has_key(s:disabled_packages, 'dockerfile')
-  au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml setf yaml.docker-compose
-  au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile setf Dockerfile
-  au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
-endif
-
-if !has_key(s:disabled_packages, 'yaml')
-  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock setf yaml
-endif
-
-if !has_key(s:disabled_packages, 'dlang')
-  au BufNewFile,BufRead *.sdl setf dsdl
-  au BufNewFile,BufRead *.ddoc setf ddoc
-  au BufNewFile,BufRead *.dd setf dd
-  au BufNewFile,BufRead *.lst setf dcov
-  au BufNewFile,BufRead *.d,*.di setf d
-endif
-
-if !has_key(s:disabled_packages, 'dhall')
-  au BufNewFile,BufRead *.dhall setf dhall
-endif
-
-if !has_key(s:disabled_packages, 'dart')
-  au BufNewFile,BufRead *.dart,*.drt setf dart
-endif
-
-if !has_key(s:disabled_packages, 'cue')
-  au BufNewFile,BufRead *.cue setf cuesheet
-endif
-
-if !has_key(s:disabled_packages, 'cucumber')
-  au BufNewFile,BufRead *.feature,*.story setf cucumber
-endif
-
-if !has_key(s:disabled_packages, 'crystal')
-  au BufNewFile,BufRead *.ecr setf ecrystal
-  au BufNewFile,BufRead *.cr,Projectfile setf crystal
-endif
-
-if !has_key(s:disabled_packages, 'cryptol')
-  au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl setf cryptol
-endif
-
-if !has_key(s:disabled_packages, 'cjsx')
-endif
-
-if !has_key(s:disabled_packages, 'coffee-script')
-  au BufNewFile,BufRead *.coffee.md,*.litcoffee setf litcoffee
-  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile setf coffee
-endif
-
-if !has_key(s:disabled_packages, 'cmake')
-  au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt setf cmake
-endif
-
-if !has_key(s:disabled_packages, 'clojure')
-  au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config setf clojure
-endif
-
-if !has_key(s:disabled_packages, 'carp')
-  au BufNewFile,BufRead *.carp setf carp
-endif
-
-if !has_key(s:disabled_packages, 'cpp-modern')
-endif
-
-if !has_key(s:disabled_packages, 'caddyfile')
-  au BufNewFile,BufRead Caddyfile setf caddyfile
-endif
-
-if !has_key(s:disabled_packages, 'awk')
-  au BufNewFile,BufRead *.awk,*.gawk setf awk
-endif
-
-if !has_key(s:disabled_packages, 'ave')
-  au BufNewFile,BufRead *.ave setf ave
-endif
-
-if !has_key(s:disabled_packages, 'autoit')
-  au BufNewFile,BufRead *.au3 setf autoit
-endif
-
-if !has_key(s:disabled_packages, 'atlas')
-  au BufNewFile,BufRead *.as,*.atl setf atlas
-endif
-
-if !has_key(s:disabled_packages, 'aspperl')
-  au! BufNewFile,BufRead *.asp call polyglot#detect#Asp()
-endif
-
-if !has_key(s:disabled_packages, 'aspvbs')
-  au! BufNewFile,BufRead *.asp call polyglot#detect#Asp()
-  au! BufNewFile,BufRead *.asa call polyglot#detect#Asa()
-endif
-
-if !has_key(s:disabled_packages, 'asn')
-  au BufNewFile,BufRead *.asn,*.asn1 setf asn
-endif
-
-if !has_key(s:disabled_packages, 'automake')
-  au BufNewFile,BufRead GNUmakefile.am,[Mm]akefile.am setf automake
-endif
-
-if !has_key(s:disabled_packages, 'elf')
-  au BufNewFile,BufRead *.am setf elf
-endif
-
-if !has_key(s:disabled_packages, 'autohotkey')
-  au BufNewFile,BufRead *.ahk,*.ahkl setf autohotkey
-endif
-
-if !has_key(s:disabled_packages, 'asciidoc')
-  au BufNewFile,BufRead *.adoc,*.asc,*.asciidoc setf asciidoc
-endif
-
-if !has_key(s:disabled_packages, 'art')
-  au BufNewFile,BufRead *.art setf art
-endif
-
-if !has_key(s:disabled_packages, 'arduino')
-  au BufNewFile,BufRead *.ino,*.pde setf arduino
-endif
-
-if !has_key(s:disabled_packages, 'c/c++')
-  au! BufNewFile,BufRead *.h call polyglot#detect#H()
-  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
-  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp setf cpp
-endif
-
-if !has_key(s:disabled_packages, 'arch')
-  au BufNewFile,BufRead {.,}arch-inventory,=tagging-method setf arch
-endif
-
-if !has_key(s:disabled_packages, 'aptconf')
-  au BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf setf aptconf
-  au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
-endif
-
-if !has_key(s:disabled_packages, 'applescript')
-  au BufNewFile,BufRead *.applescript,*.scpt setf applescript
-endif
-
-if !has_key(s:disabled_packages, 'apiblueprint')
-  au BufNewFile,BufRead *.apib setf apiblueprint
-endif
-
-if !has_key(s:disabled_packages, 'apache')
-  au BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess setf apache
-  au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead apache.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead access.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/sites-*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/mods-*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/conf.*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/*.conf* call s:StarSetf('apache')
-endif
-
-if !has_key(s:disabled_packages, 'ant')
-  au BufNewFile,BufRead build.xml setf ant
-endif
-
-if !has_key(s:disabled_packages, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
-endif
-
-if !has_key(s:disabled_packages, 'csv')
-  au BufNewFile,BufRead *.csv,*.tab,*.tsv setf csv
-endif
-
-if !has_key(s:disabled_packages, 'ampl')
-  au BufNewFile,BufRead *.run setf ampl
-endif
-
-if !has_key(s:disabled_packages, 'aml')
-  au BufNewFile,BufRead *.aml setf aml
-endif
-
-if !has_key(s:disabled_packages, 'alsaconf')
-  au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc setf alsaconf
-endif
-
-if !has_key(s:disabled_packages, 'aidl')
-  au BufNewFile,BufRead *.aidl setf aidl
-endif
-
-if !has_key(s:disabled_packages, 'ahdl')
-  au BufNewFile,BufRead *.tdf setf ahdl
-endif
-
-if !has_key(s:disabled_packages, 'ada')
-  au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr setf ada
-endif
-
-if !has_key(s:disabled_packages, 'acpiasl')
-  au BufNewFile,BufRead *.asl,*.dsl setf asl
-endif
-
-if !has_key(s:disabled_packages, 'acedb')
-  au BufNewFile,BufRead *.wrm setf acedb
-endif
-
-if !has_key(s:disabled_packages, 'abel')
-  au BufNewFile,BufRead *.abl setf abel
-endif
-
-if !has_key(s:disabled_packages, 'abc')
-  au BufNewFile,BufRead *.abc setf abc
-endif
-
-if !has_key(s:disabled_packages, 'abaqus')
-  au! BufNewFile,BufRead *.inp call polyglot#detect#Inp()
-endif
-
-if !has_key(s:disabled_packages, 'abap')
-  au BufNewFile,BufRead *.abap setf abap
-endif
-
-if !has_key(s:disabled_packages, 'aap')
-  au BufNewFile,BufRead *.aap setf aap
-endif
-
-if !has_key(s:disabled_packages, 'a65')
-  au BufNewFile,BufRead *.a65 setf a65
-endif
-
-if !has_key(s:disabled_packages, 'a2ps')
-  au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc setf a2ps
-endif
-
-if !has_key(s:disabled_packages, 'haproxy')
-  au BufNewFile,BufRead *.cfg,haproxy.cfg setf haproxy
-  au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
-endif
-
-if !has_key(s:disabled_packages, 'conf')
-  au BufNewFile,BufRead *.conf,auto.master,config setf conf
-endif
-
-if !has_key(s:disabled_packages, '8th')
-  au BufNewFile,BufRead *.8th setf 8th
-endif
-
-" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
-
-au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>:e") == "" |
-  \ call polyglot#shebang#Detect() | endif
-
-au BufEnter * if &ft == "" && expand("<afile>:e") == ""  |
-      \ call s:Observe('shebang#Detect') | endif
-
-augroup END
-
-if !has_key(s:disabled_packages, 'autoindent')
-  " Code below re-implements sleuth for vim-polyglot
-  let g:loaded_sleuth = 1
-  let g:loaded_foobar = 1
-
-  " Makes shiftwidth to be synchronized with tabstop by default
-  if &shiftwidth == &tabstop
-    let &shiftwidth = 0
-  endif
-
-  function! s:guess(lines) abort
-    let options = {}
-    let ccomment = 0
-    let podcomment = 0
-    let triplequote = 0
-    let backtick = 0
-    let xmlcomment = 0
-    let heredoc = ''
-    let minindent = 10
-    let spaces_minus_tabs = 0
-    let i = 0
-
-    for line in a:lines
-      let i += 1
-
-      if !len(line) || line =~# '^\W*$'
-        continue
-      endif
-
-      if line =~# '^\s*/\*'
-        let ccomment = 1
-      endif
-      if ccomment
-        if line =~# '\*/'
-          let ccomment = 0
-        endif
-        continue
-      endif
-
-      if line =~# '^=\w'
-        let podcomment = 1
-      endif
-      if podcomment
-        if line =~# '^=\%(end\|cut\)\>'
-          let podcomment = 0
-        endif
-        continue
-      endif
-
-      if triplequote
-        if line =~# '^[^"]*"""[^"]*$'
-          let triplequote = 0
-        endif
-        continue
-      elseif line =~# '^[^"]*"""[^"]*$'
-        let triplequote = 1
-      endif
-
-      if backtick
-        if line =~# '^[^`]*`[^`]*$'
-          let backtick = 0
-        endif
-        continue
-      elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
-        let backtick = 1
-      endif
-
-      if line =~# '^\s*<\!--'
-        let xmlcomment = 1
-      endif
-      if xmlcomment
-        if line =~# '-->'
-          let xmlcomment = 0
-        endif
-        continue
-      endif
-
-      " This is correct order because both "<<EOF" and "EOF" matches end
-      if heredoc != ''
-        if line =~# heredoc
-          let heredoc = ''
-        endif
-        continue
-      endif
-      let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
-      if len(herematch) > 0
-        let heredoc = herematch[1] . '$'
-      endif
-
-      let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
-
-      if line[0] == "\t"
-        setlocal noexpandtab
-        let &l:shiftwidth=&tabstop
-        let b:sleuth_culprit .= ':' . i
-        return 1
-      elseif line[0] == " "
-        let indent = len(matchstr(line, '^ *'))
-        if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
-          let minindent = indent
-        endif
-      endif
-    endfor
-
-    if minindent < 10
-      setlocal expandtab
-      let &l:shiftwidth=minindent
-      let b:sleuth_culprit .= ':' . i
-      return 1
-    endif
-
-    return 0
-  endfunction
-
-  function! s:detect_indent() abort
-    if &buftype ==# 'help'
-      return
-    endif
-
-    let b:sleuth_culprit = expand("<afile>:p")
-    if s:guess(getline(1, 32))
-      return
-    endif
-    let pattern = polyglot#sleuth#GlobForFiletype(&filetype)
-    if len(pattern) == 0
-      return
-    endif
-    let pattern = '{' . pattern . ',.git,.svn,.hg}'
-    let dir = expand('%:p:h')
-    let level = 3
-    while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
-      " Ignore files from homedir and root 
-      if dir == expand('~') || dir == '/'
-        unlet b:sleuth_culprit
-        return
-      endif
-      for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
-        let b:sleuth_culprit = neighbor
-        " Do not consider directories above .git, .svn or .hg
-        if fnamemodify(neighbor, ":h:t")[0] == "."
-          let level = 0
-          continue
-        endif
-        if neighbor !=# expand('%:p') && filereadable(neighbor)
-          if s:guess(readfile(neighbor, '', 32))
-            return
-          endif
-        endif
-      endfor
-
-      let dir = fnamemodify(dir, ':h')
-      let level -= 1
-    endwhile
-
-    unlet b:sleuth_culprit
-  endfunction
-
-  setglobal smarttab
-
-  function! SleuthIndicator() abort
-    let sw = &shiftwidth ? &shiftwidth : &tabstop
-    if &expandtab
-      return 'sw='.sw
-    elseif &tabstop == sw
-      return 'ts='.&tabstop
-    else
-      return 'sw='.sw.',ts='.&tabstop
-    endif
-  endfunction
-
-  augroup polyglot-sleuth
-    au!
-    au FileType * call s:detect_indent()
-    au User Flags call Hoist('buffer', 5, 'SleuthIndicator')
-  augroup END
-
-  command! -bar -bang Sleuth call s:detect_indent()
-endif
-
-func! s:verify()
-  if exists("g:polyglot_disabled_not_set")
-    if exists("g:polyglot_disabled")
-      echohl WarningMsg
-      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
-      echohl None
-    endif
-
-    unlet g:polyglot_disabled_not_set
-  endif
-endfunc
-
-au VimEnter * call s:verify()
-
-" Save polyglot_disabled without postfixes
-if exists('g:polyglot_disabled')
-  let g:polyglot_disabled = s:new_polyglot_disabled
-endif
-
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
new file mode 100644
index 000000000..498450d80
--- /dev/null
+++ b/ftdetect/polyglot.vim
@@ -0,0 +1,3434 @@
+" Vim support file to detect file types
+"
+" Maintainer:	Adam Stankiewicz <sheerun@sher.pl>
+" URL: https://github.com/sheerun/vim-polyglot
+
+" Listen very carefully, I will say this only once
+if exists("did_load_polyglot")
+  finish
+endif
+
+let did_load_polyglot = 1
+
+" It can happen vim filetype.vim loads first, then we need a reset
+if exists("did_load_filetypes")
+  au! filetypedetect
+endif
+
+" Prevent filetype.vim of vim from loading again
+let did_load_filetypes = 1
+
+" Line continuation is used here, remove 'C' from 'cpoptions'
+let s:cpo_save = &cpo
+set cpo&vim
+
+func! s:Observe(fn)
+  let b:polyglot_observe = a:fn
+  augroup polyglot-observer
+    au! CursorHold,CursorHoldI,BufWritePost <buffer>
+      \ execute('if polyglot#' . b:polyglot_observe . '() | au! polyglot-observer | endif')
+  augroup END
+endfunc
+
+let s:disabled_packages = {}
+let s:new_polyglot_disabled = []
+
+if exists('g:polyglot_disabled')
+  for pkg in g:polyglot_disabled
+    let base = split(pkg, '\.')
+    if len(base) > 0
+      let s:disabled_packages[pkg] = 1
+      call add(s:new_polyglot_disabled, base[0]) 
+    endif
+  endfor
+else
+  let g:polyglot_disabled_not_set = 1
+endif
+
+function! s:SetDefault(name, value)
+  if !exists(a:name)
+    let {a:name} = a:value
+  endif
+endfunction
+
+call s:SetDefault('g:markdown_enable_spell_checking', 0)
+call s:SetDefault('g:markdown_enable_input_abbreviations', 0)
+call s:SetDefault('g:markdown_enable_mappings', 0)
+
+" Enable jsx syntax by default
+call s:SetDefault('g:jsx_ext_required', 0)
+
+" Needed for sql highlighting
+call s:SetDefault('g:javascript_sql_dialect', 'sql')
+
+" Make csv loading faster
+call s:SetDefault('g:csv_start', 1)
+call s:SetDefault('g:csv_end', 2)
+
+" Disable json concealing by default
+call s:SetDefault('g:vim_json_syntax_conceal', 0)
+
+call s:SetDefault('g:filetype_euphoria', 'elixir')
+
+if !exists('g:python_highlight_all')
+  call s:SetDefault('g:python_highlight_builtins', 1)
+  call s:SetDefault('g:python_highlight_builtin_objs', 1)
+  call s:SetDefault('g:python_highlight_builtin_types', 1)
+  call s:SetDefault('g:python_highlight_builtin_funcs', 1)
+  call s:SetDefault('g:python_highlight_builtin_funcs_kwarg', 1)
+  call s:SetDefault('g:python_highlight_exceptions', 1)
+  call s:SetDefault('g:python_highlight_string_formatting', 1)
+  call s:SetDefault('g:python_highlight_string_format', 1)
+  call s:SetDefault('g:python_highlight_string_templates', 1)
+  call s:SetDefault('g:python_highlight_indent_errors', 1)
+  call s:SetDefault('g:python_highlight_space_errors', 1)
+  call s:SetDefault('g:python_highlight_doctests', 1)
+  call s:SetDefault('g:python_highlight_func_calls', 1)
+  call s:SetDefault('g:python_highlight_class_vars', 1)
+  call s:SetDefault('g:python_highlight_operators', 1)
+  call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
+  call s:SetDefault('g:python_slow_sync', 1)
+endif
+
+" We need it because scripts.vim in vim uses "set ft=" which cannot be
+" overridden with setf (and we can't use set ft= so our scripts.vim work)
+func! s:Setf(ft)
+  if &filetype !~# '\<'.a:ft.'\>'
+    let &filetype = a:ft
+  endif
+endfunc
+
+" Function used for patterns that end in a star: don't set the filetype if the
+" file name matches ft_ignore_pat.
+" When using this, the entry should probably be further down below with the
+" other StarSetf() calls.
+func! s:StarSetf(ft)
+  if expand("<amatch>") !~ g:ft_ignore_pat
+    exe 'setf ' . a:ft
+  endif
+endfunc
+
+augroup filetypedetect
+
+" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
+
+if !has_key(s:disabled_packages, 'sql')
+  au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw setf sql
+endif
+
+if !has_key(s:disabled_packages, 'gitignore')
+  au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore setf gitignore
+endif
+
+if !has_key(s:disabled_packages, 'tads')
+  au! BufNewFile,BufRead *.t call polyglot#detect#T()
+endif
+
+if !has_key(s:disabled_packages, 'prolog')
+  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap setf prolog
+endif
+
+if !has_key(s:disabled_packages, 'bzl')
+  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE setf bzl
+endif
+
+if !has_key(s:disabled_packages, 'odin')
+  au BufNewFile,BufRead *.odin setf odin
+endif
+
+if !has_key(s:disabled_packages, 'dosini')
+  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec setf dosini
+  au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
+  au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
+endif
+
+if !has_key(s:disabled_packages, 'visual-basic')
+  au! BufNewFile,BufRead *.bas call polyglot#detect#Bas()
+  au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs setf vb
+endif
+
+if !has_key(s:disabled_packages, 'basic')
+  au BufNewFile,BufRead *.basic setf basic
+endif
+
+if !has_key(s:disabled_packages, 'trasys')
+  au! BufNewFile,BufRead *.inp call polyglot#detect#Inp()
+endif
+
+if !has_key(s:disabled_packages, 'zig')
+  au BufNewFile,BufRead *.zig,*.zir setf zig
+  au BufNewFile,BufRead *.zir setf zir
+endif
+
+if !has_key(s:disabled_packages, 'zephir')
+  au BufNewFile,BufRead *.zep setf zephir
+endif
+
+if !has_key(s:disabled_packages, 'help')
+  au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt setf help
+endif
+
+if !has_key(s:disabled_packages, 'helm')
+  au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml setf helm
+endif
+
+if !has_key(s:disabled_packages, 'ansible')
+  au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml setf yaml.ansible
+  au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
+  au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
+endif
+
+if !has_key(s:disabled_packages, 'xsl')
+  au BufNewFile,BufRead *.xsl,*.xslt setf xsl
+endif
+
+if !has_key(s:disabled_packages, 'xdc')
+  au BufNewFile,BufRead *.xdc setf xdc
+endif
+
+if !has_key(s:disabled_packages, 'vue')
+  au BufNewFile,BufRead *.vue,*.wpy setf vue
+endif
+
+if !has_key(s:disabled_packages, 'vmasm')
+  au BufNewFile,BufRead *.mar setf vmasm
+endif
+
+if !has_key(s:disabled_packages, 'velocity')
+  au BufNewFile,BufRead *.vm setf velocity
+endif
+
+if !has_key(s:disabled_packages, 'vcl')
+  au BufNewFile,BufRead *.vcl setf vcl
+endif
+
+if !has_key(s:disabled_packages, 'vbnet')
+  au BufNewFile,BufRead *.vb,*.vbhtml setf vbnet
+endif
+
+if !has_key(s:disabled_packages, 'vala')
+  au BufNewFile,BufRead *.vala,*.valadoc,*.vapi setf vala
+endif
+
+if !has_key(s:disabled_packages, 'v')
+  au BufNewFile,BufRead *.v setf v
+endif
+
+if !has_key(s:disabled_packages, 'unison')
+  au BufNewFile,BufRead *.u,*.uu setf unison
+endif
+
+if !has_key(s:disabled_packages, 'typescript')
+  au BufNewFile,BufRead *.tsx setf typescriptreact
+  au BufNewFile,BufRead *.ts setf typescript
+endif
+
+if !has_key(s:disabled_packages, 'twig')
+  au BufNewFile,BufRead *.xml.twig setf xml.twig
+  au BufNewFile,BufRead *.twig setf html.twig
+endif
+
+if !has_key(s:disabled_packages, 'tptp')
+  au BufNewFile,BufRead *.ax,*.p,*.tptp setf tptp
+endif
+
+if !has_key(s:disabled_packages, 'toml')
+  au BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock setf toml
+endif
+
+if !has_key(s:disabled_packages, 'tmux')
+  au BufNewFile,BufRead {.,}tmux*.conf setf tmux
+endif
+
+if !has_key(s:disabled_packages, 'thrift')
+  au BufNewFile,BufRead *.thrift setf thrift
+endif
+
+if !has_key(s:disabled_packages, 'textile')
+  au BufNewFile,BufRead *.textile setf textile
+endif
+
+if !has_key(s:disabled_packages, 'terraform')
+  au BufNewFile,BufRead *.tf,*.tfvars setf terraform
+endif
+
+if !has_key(s:disabled_packages, 'systemd')
+  au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf setf systemd
+  au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
+endif
+
+if !has_key(s:disabled_packages, 'sxhkd')
+  au BufNewFile,BufRead *.sxhkdrc,sxhkdrc setf sxhkdrc
+endif
+
+if !has_key(s:disabled_packages, 'swift')
+  au BufNewFile,BufRead *.swift setf swift
+endif
+
+if !has_key(s:disabled_packages, 'svg-indent')
+endif
+
+if !has_key(s:disabled_packages, 'svg')
+  au BufNewFile,BufRead *.svg setf svg
+endif
+
+if !has_key(s:disabled_packages, 'svelte')
+  au BufNewFile,BufRead *.svelte setf svelte
+endif
+
+if !has_key(s:disabled_packages, 'stylus')
+  au BufNewFile,BufRead *.styl,*.stylus setf stylus
+endif
+
+if !has_key(s:disabled_packages, 'solidity')
+  au BufNewFile,BufRead *.sol setf solidity
+endif
+
+if !has_key(s:disabled_packages, 'smt2')
+  au BufNewFile,BufRead *.smt,*.smt2 setf smt2
+endif
+
+if !has_key(s:disabled_packages, 'slime')
+  au BufNewFile,BufRead *.slime setf slime
+endif
+
+if !has_key(s:disabled_packages, 'slim')
+  au BufNewFile,BufRead *.slim setf slim
+endif
+
+if !has_key(s:disabled_packages, 'zinit')
+endif
+
+if !has_key(s:disabled_packages, 'sh')
+  au BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
+  au BufNewFile,BufRead {.,}zsh* call s:StarSetf('zsh')
+  au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh')
+  au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
+  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc setf sh
+endif
+
+if !has_key(s:disabled_packages, 'scss')
+  au BufNewFile,BufRead *.scss setf scss
+endif
+
+if !has_key(s:disabled_packages, 'sbt')
+  au BufNewFile,BufRead *.sbt setf sbt.scala
+endif
+
+if !has_key(s:disabled_packages, 'scala')
+  au BufNewFile,BufRead *.kojo,*.sc,*.scala setf scala
+endif
+
+if !has_key(s:disabled_packages, 'rust')
+  au BufNewFile,BufRead *.rs,*.rs.in setf rust
+endif
+
+if !has_key(s:disabled_packages, 'brewfile')
+  au BufNewFile,BufRead Brewfile setf brewfile
+endif
+
+if !has_key(s:disabled_packages, 'yard')
+endif
+
+if !has_key(s:disabled_packages, 'rspec')
+  au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
+endif
+
+if !has_key(s:disabled_packages, 'ruby')
+  au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml setf eruby
+  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile setf ruby
+  au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
+endif
+
+if !has_key(s:disabled_packages, 'rst')
+  au BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt setf rst
+endif
+
+if !has_key(s:disabled_packages, 'reason')
+  au! BufNewFile,BufRead *.re call polyglot#detect#Re()
+  au BufNewFile,BufRead *.rei setf reason
+endif
+
+if !has_key(s:disabled_packages, 'razor')
+  au BufNewFile,BufRead *.cshtml,*.razor setf razor
+endif
+
+if !has_key(s:disabled_packages, 'raml')
+  au BufNewFile,BufRead *.raml setf raml
+endif
+
+if !has_key(s:disabled_packages, 'raku')
+  au! BufNewFile,BufRead *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 setf raku
+endif
+
+if !has_key(s:disabled_packages, 'ragel')
+  au BufNewFile,BufRead *.rl setf ragel
+endif
+
+if !has_key(s:disabled_packages, 'racket')
+  au BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl setf racket
+endif
+
+if !has_key(s:disabled_packages, 'r-lang')
+  au BufNewFile,BufRead *.rd setf rhelp
+  au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist setf r
+endif
+
+if !has_key(s:disabled_packages, 'qml')
+  au BufNewFile,BufRead *.qbs,*.qml setf qml
+endif
+
+if !has_key(s:disabled_packages, 'qmake')
+  au BufNewFile,BufRead *.pri,*.pro setf qmake
+endif
+
+if !has_key(s:disabled_packages, 'requirements')
+  au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} setf requirements
+endif
+
+if !has_key(s:disabled_packages, 'python-compiler')
+endif
+
+if !has_key(s:disabled_packages, 'python-indent')
+endif
+
+if !has_key(s:disabled_packages, 'python')
+  au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript setf python
+endif
+
+if !has_key(s:disabled_packages, 'purescript')
+  au BufNewFile,BufRead *.purs setf purescript
+endif
+
+if !has_key(s:disabled_packages, 'puppet')
+  au BufNewFile,BufRead *.epp setf embeddedpuppet
+  au BufNewFile,BufRead *.pp,Modulefile setf puppet
+endif
+
+if !has_key(s:disabled_packages, 'pug')
+  au BufNewFile,BufRead *.jade,*.pug setf pug
+endif
+
+if !has_key(s:disabled_packages, 'protobuf')
+  au BufNewFile,BufRead *.proto setf proto
+endif
+
+if !has_key(s:disabled_packages, 'powershell')
+  au BufNewFile,BufRead *.ps1xml setf ps1xml
+  au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc setf ps1
+endif
+
+if !has_key(s:disabled_packages, 'pony')
+  au BufNewFile,BufRead *.pony setf pony
+endif
+
+if !has_key(s:disabled_packages, 'plantuml')
+  au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml setf plantuml
+endif
+
+if !has_key(s:disabled_packages, 'blade')
+  au BufNewFile,BufRead *.blade,*.blade.php setf blade
+endif
+
+if !has_key(s:disabled_packages, 'php')
+  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile setf php
+endif
+
+if !has_key(s:disabled_packages, 'cql')
+  au BufNewFile,BufRead *.cql setf cql
+endif
+
+if !has_key(s:disabled_packages, 'pgsql')
+  au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
+endif
+
+if !has_key(s:disabled_packages, 'perl')
+  au! BufNewFile,BufRead *.tt2 call polyglot#detect#Tt2()
+  au! BufNewFile,BufRead *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead *.xs setf xs
+  au BufNewFile,BufRead *.comp,*.mason,*.mhtml setf mason
+  au BufNewFile,BufRead *.pod setf pod
+  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc setf perl
+endif
+
+if !has_key(s:disabled_packages, 'opencl')
+  au BufNewFile,BufRead *.cl,*.opencl setf opencl
+endif
+
+if !has_key(s:disabled_packages, 'octave')
+  au! BufNewFile,BufRead *.m call polyglot#detect#M()
+  au BufNewFile,BufRead *.oct setf octave
+endif
+
+if !has_key(s:disabled_packages, 'ocaml')
+  au BufNewFile,BufRead *.sexp setf sexplib
+  au BufNewFile,BufRead *.root setf ocpbuildroot
+  au BufNewFile,BufRead *.ocp setf ocpbuild
+  au BufNewFile,BufRead _tags setf ocamlbuild_tags
+  au BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild setf dune
+  au BufNewFile,BufRead _oasis setf oasis
+  au BufNewFile,BufRead *.opam,*.opam.template,opam setf opam
+  au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in setf omake
+  au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit setf ocaml
+endif
+
+if !has_key(s:disabled_packages, 'objc')
+  au! BufNewFile,BufRead *.m call polyglot#detect#M()
+  au! BufNewFile,BufRead *.h call polyglot#detect#H()
+endif
+
+if !has_key(s:disabled_packages, 'nix')
+  au BufNewFile,BufRead *.nix setf nix
+endif
+
+if !has_key(s:disabled_packages, 'nim')
+  au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg setf nim
+endif
+
+if !has_key(s:disabled_packages, 'nginx')
+  au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf setf nginx
+  au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
+  au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
+endif
+
+if !has_key(s:disabled_packages, 'murphi')
+  au! BufNewFile,BufRead *.m call polyglot#detect#M()
+endif
+
+if !has_key(s:disabled_packages, 'moonscript')
+  au BufNewFile,BufRead *.moon setf moon
+endif
+
+if !has_key(s:disabled_packages, 'meson')
+  au BufNewFile,BufRead *.wrap setf dosini
+  au BufNewFile,BufRead meson.build,meson_options.txt setf meson
+endif
+
+if !has_key(s:disabled_packages, 'mdx')
+  au BufNewFile,BufRead *.mdx setf markdown.mdx
+endif
+
+if !has_key(s:disabled_packages, 'markdown')
+  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr setf markdown
+endif
+
+if !has_key(s:disabled_packages, 'mathematica')
+  au! BufNewFile,BufRead *.m call polyglot#detect#M()
+  au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt setf mma
+endif
+
+if !has_key(s:disabled_packages, 'mako')
+  au BufNewFile,BufRead *.mako,*.mao setf mako
+  au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+endif
+
+if !has_key(s:disabled_packages, 'm4')
+  au BufNewFile,BufRead *.at,*.m4 setf m4
+endif
+
+if !has_key(s:disabled_packages, 'lua')
+  au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc setf lua
+endif
+
+if !has_key(s:disabled_packages, 'log')
+  au BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log setf log
+endif
+
+if !has_key(s:disabled_packages, 'llvm')
+  au BufNewFile,BufRead *.td setf tablegen
+  au BufNewFile,BufRead *.ll setf llvm
+endif
+
+if !has_key(s:disabled_packages, 'livescript')
+  au BufNewFile,BufRead *._ls,*.ls,Slakefile setf livescript
+endif
+
+if !has_key(s:disabled_packages, 'lilypond')
+  au BufNewFile,BufRead *.ily,*.ly setf lilypond
+endif
+
+if !has_key(s:disabled_packages, 'less')
+  au BufNewFile,BufRead *.less setf less
+endif
+
+if !has_key(s:disabled_packages, 'ledger')
+  au BufNewFile,BufRead *.journal,*.ldg,*.ledger setf ledger
+endif
+
+if !has_key(s:disabled_packages, 'kotlin')
+  au BufNewFile,BufRead *.kt,*.ktm,*.kts setf kotlin
+endif
+
+if !has_key(s:disabled_packages, 'julia')
+  au BufNewFile,BufRead *.jl setf julia
+endif
+
+if !has_key(s:disabled_packages, 'jst')
+  au BufNewFile,BufRead *.ect,*.ejs,*.jst setf jst
+endif
+
+if !has_key(s:disabled_packages, 'jsonnet')
+  au BufNewFile,BufRead *.jsonnet,*.libsonnet setf jsonnet
+endif
+
+if !has_key(s:disabled_packages, 'json')
+  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
+endif
+
+if !has_key(s:disabled_packages, 'json5')
+  au BufNewFile,BufRead *.json5 setf json5
+endif
+
+if !has_key(s:disabled_packages, 'jq')
+  au BufNewFile,BufRead *.jq,{.,}jqrc setf jq
+  au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq')
+endif
+
+if !has_key(s:disabled_packages, 'htmldjango')
+  au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk setf htmldjango
+endif
+
+if !has_key(s:disabled_packages, 'jenkins')
+  au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile setf Jenkinsfile
+  au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
+endif
+
+if !has_key(s:disabled_packages, 'javascript-sql')
+endif
+
+if !has_key(s:disabled_packages, 'ion')
+  au BufNewFile,BufRead *.ion,~/.config/ion/initrc setf ion
+endif
+
+if !has_key(s:disabled_packages, 'idris2')
+  au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
+  au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
+  au BufNewFile,BufRead *.ipkg,idris-response setf idris2
+endif
+
+if !has_key(s:disabled_packages, 'idris')
+  au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
+  au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
+  au BufNewFile,BufRead idris-response setf idris
+endif
+
+if !has_key(s:disabled_packages, 'icalendar')
+  au BufNewFile,BufRead *.ics setf icalendar
+endif
+
+if !has_key(s:disabled_packages, 'i3')
+  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config setf i3config
+endif
+
+if !has_key(s:disabled_packages, 'html5')
+  au! BufNewFile,BufRead *.html call polyglot#detect#Html()
+  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
+endif
+
+if !has_key(s:disabled_packages, 'hive')
+  au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
+endif
+
+if !has_key(s:disabled_packages, 'hcl')
+  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile setf hcl
+endif
+
+if !has_key(s:disabled_packages, 'haxe')
+  au BufNewFile,BufRead *.hx,*.hxsl setf haxe
+endif
+
+if !has_key(s:disabled_packages, 'haskell')
+  au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig setf haskell
+endif
+
+if !has_key(s:disabled_packages, 'handlebars')
+  au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs setf html.handlebars
+  au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache setf html.mustache
+endif
+
+if !has_key(s:disabled_packages, 'haml')
+  au BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc setf haml
+endif
+
+if !has_key(s:disabled_packages, 'grub')
+  au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf setf grub
+endif
+
+if !has_key(s:disabled_packages, 'gradle')
+endif
+
+if !has_key(s:disabled_packages, 'groovy')
+  au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile setf groovy
+endif
+
+if !has_key(s:disabled_packages, 'graphql')
+  au BufNewFile,BufRead *.gql,*.graphql,*.graphqls setf graphql
+endif
+
+if !has_key(s:disabled_packages, 'jsx')
+  au BufNewFile,BufRead *.jsx setf javascriptreact
+endif
+
+if !has_key(s:disabled_packages, 'javascript')
+  au BufNewFile,BufRead *.flow setf flow
+  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
+endif
+
+if !has_key(s:disabled_packages, 'go')
+  au BufNewFile,BufRead *.tmpl setf gohtmltmpl
+  au BufNewFile,BufRead go.mod setf gomod
+  au BufNewFile,BufRead *.go setf go
+endif
+
+if !has_key(s:disabled_packages, 'gnuplot')
+  au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt setf gnuplot
+endif
+
+if !has_key(s:disabled_packages, 'gmpl')
+  au BufNewFile,BufRead *.mod setf gmpl
+endif
+
+if !has_key(s:disabled_packages, 'glsl')
+  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
+  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
+endif
+
+if !has_key(s:disabled_packages, 'git')
+  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
+  au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
+  au BufNewFile,BufRead git-rebase-todo setf gitrebase
+  au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules setf gitconfig
+  au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
+endif
+
+if !has_key(s:disabled_packages, 'gdscript')
+  au BufNewFile,BufRead *.gd setf gdscript3
+endif
+
+if !has_key(s:disabled_packages, 'fsharp')
+  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
+  au BufNewFile,BufRead *.fsi,*.fsx setf fsharp
+endif
+
+if !has_key(s:disabled_packages, 'forth')
+  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
+  au BufNewFile,BufRead *.ft,*.fth setf forth
+endif
+
+if !has_key(s:disabled_packages, 'flatbuffers')
+  au BufNewFile,BufRead *.fbs setf fbs
+endif
+
+if !has_key(s:disabled_packages, 'fish')
+  au BufNewFile,BufRead *.fish setf fish
+endif
+
+if !has_key(s:disabled_packages, 'ferm')
+  au BufNewFile,BufRead *.ferm,ferm.conf setf ferm
+endif
+
+if !has_key(s:disabled_packages, 'fennel')
+  au BufNewFile,BufRead *.fnl setf fennel
+endif
+
+if !has_key(s:disabled_packages, 'erlang')
+  au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock setf erlang
+endif
+
+if !has_key(s:disabled_packages, 'emblem')
+  au BufNewFile,BufRead *.em,*.emblem setf emblem
+endif
+
+if !has_key(s:disabled_packages, 'emberscript')
+  au BufNewFile,BufRead *.em,*.emberscript setf ember-script
+endif
+
+if !has_key(s:disabled_packages, 'elm')
+  au BufNewFile,BufRead *.elm setf elm
+endif
+
+if !has_key(s:disabled_packages, 'elixir')
+  au BufNewFile,BufRead *.eex,*.leex setf eelixir
+  au BufNewFile,BufRead *.ex,*.exs,mix.lock setf elixir
+endif
+
+if !has_key(s:disabled_packages, 'dockerfile')
+  au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml setf yaml.docker-compose
+  au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile setf Dockerfile
+  au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
+endif
+
+if !has_key(s:disabled_packages, 'yaml')
+  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock setf yaml
+endif
+
+if !has_key(s:disabled_packages, 'dlang')
+  au BufNewFile,BufRead *.sdl setf dsdl
+  au BufNewFile,BufRead *.ddoc setf ddoc
+  au BufNewFile,BufRead *.dd setf dd
+  au BufNewFile,BufRead *.lst setf dcov
+  au BufNewFile,BufRead *.d,*.di setf d
+endif
+
+if !has_key(s:disabled_packages, 'dhall')
+  au BufNewFile,BufRead *.dhall setf dhall
+endif
+
+if !has_key(s:disabled_packages, 'dart')
+  au BufNewFile,BufRead *.dart,*.drt setf dart
+endif
+
+if !has_key(s:disabled_packages, 'cue')
+  au BufNewFile,BufRead *.cue setf cuesheet
+endif
+
+if !has_key(s:disabled_packages, 'cucumber')
+  au BufNewFile,BufRead *.feature,*.story setf cucumber
+endif
+
+if !has_key(s:disabled_packages, 'crystal')
+  au BufNewFile,BufRead *.ecr setf ecrystal
+  au BufNewFile,BufRead *.cr,Projectfile setf crystal
+endif
+
+if !has_key(s:disabled_packages, 'cryptol')
+  au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl setf cryptol
+endif
+
+if !has_key(s:disabled_packages, 'cjsx')
+endif
+
+if !has_key(s:disabled_packages, 'coffee-script')
+  au BufNewFile,BufRead *.coffee.md,*.litcoffee setf litcoffee
+  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile setf coffee
+endif
+
+if !has_key(s:disabled_packages, 'cmake')
+  au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt setf cmake
+endif
+
+if !has_key(s:disabled_packages, 'clojure')
+  au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config setf clojure
+endif
+
+if !has_key(s:disabled_packages, 'carp')
+  au BufNewFile,BufRead *.carp setf carp
+endif
+
+if !has_key(s:disabled_packages, 'cpp-modern')
+endif
+
+if !has_key(s:disabled_packages, 'caddyfile')
+  au BufNewFile,BufRead Caddyfile setf caddyfile
+endif
+
+if !has_key(s:disabled_packages, 'awk')
+  au BufNewFile,BufRead *.awk,*.gawk setf awk
+endif
+
+if !has_key(s:disabled_packages, 'ave')
+  au BufNewFile,BufRead *.ave setf ave
+endif
+
+if !has_key(s:disabled_packages, 'autoit')
+  au BufNewFile,BufRead *.au3 setf autoit
+endif
+
+if !has_key(s:disabled_packages, 'atlas')
+  au BufNewFile,BufRead *.as,*.atl setf atlas
+endif
+
+if !has_key(s:disabled_packages, 'aspperl')
+  au! BufNewFile,BufRead *.asp call polyglot#detect#Asp()
+endif
+
+if !has_key(s:disabled_packages, 'aspvbs')
+  au! BufNewFile,BufRead *.asp call polyglot#detect#Asp()
+  au! BufNewFile,BufRead *.asa call polyglot#detect#Asa()
+endif
+
+if !has_key(s:disabled_packages, 'asn')
+  au BufNewFile,BufRead *.asn,*.asn1 setf asn
+endif
+
+if !has_key(s:disabled_packages, 'automake')
+  au BufNewFile,BufRead GNUmakefile.am,[Mm]akefile.am setf automake
+endif
+
+if !has_key(s:disabled_packages, 'elf')
+  au BufNewFile,BufRead *.am setf elf
+endif
+
+if !has_key(s:disabled_packages, 'autohotkey')
+  au BufNewFile,BufRead *.ahk,*.ahkl setf autohotkey
+endif
+
+if !has_key(s:disabled_packages, 'asciidoc')
+  au BufNewFile,BufRead *.adoc,*.asc,*.asciidoc setf asciidoc
+endif
+
+if !has_key(s:disabled_packages, 'art')
+  au BufNewFile,BufRead *.art setf art
+endif
+
+if !has_key(s:disabled_packages, 'arduino')
+  au BufNewFile,BufRead *.ino,*.pde setf arduino
+endif
+
+if !has_key(s:disabled_packages, 'c/c++')
+  au! BufNewFile,BufRead *.h call polyglot#detect#H()
+  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
+  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp setf cpp
+endif
+
+if !has_key(s:disabled_packages, 'arch')
+  au BufNewFile,BufRead {.,}arch-inventory,=tagging-method setf arch
+endif
+
+if !has_key(s:disabled_packages, 'aptconf')
+  au BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf setf aptconf
+  au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
+endif
+
+if !has_key(s:disabled_packages, 'applescript')
+  au BufNewFile,BufRead *.applescript,*.scpt setf applescript
+endif
+
+if !has_key(s:disabled_packages, 'apiblueprint')
+  au BufNewFile,BufRead *.apib setf apiblueprint
+endif
+
+if !has_key(s:disabled_packages, 'apache')
+  au BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess setf apache
+  au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead apache.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead access.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/sites-*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/mods-*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/conf.*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/*.conf* call s:StarSetf('apache')
+endif
+
+if !has_key(s:disabled_packages, 'ant')
+  au BufNewFile,BufRead build.xml setf ant
+endif
+
+if !has_key(s:disabled_packages, 'xml')
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
+endif
+
+if !has_key(s:disabled_packages, 'csv')
+  au BufNewFile,BufRead *.csv,*.tab,*.tsv setf csv
+endif
+
+if !has_key(s:disabled_packages, 'ampl')
+  au BufNewFile,BufRead *.run setf ampl
+endif
+
+if !has_key(s:disabled_packages, 'aml')
+  au BufNewFile,BufRead *.aml setf aml
+endif
+
+if !has_key(s:disabled_packages, 'alsaconf')
+  au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc setf alsaconf
+endif
+
+if !has_key(s:disabled_packages, 'aidl')
+  au BufNewFile,BufRead *.aidl setf aidl
+endif
+
+if !has_key(s:disabled_packages, 'ahdl')
+  au BufNewFile,BufRead *.tdf setf ahdl
+endif
+
+if !has_key(s:disabled_packages, 'ada')
+  au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr setf ada
+endif
+
+if !has_key(s:disabled_packages, 'acpiasl')
+  au BufNewFile,BufRead *.asl,*.dsl setf asl
+endif
+
+if !has_key(s:disabled_packages, 'acedb')
+  au BufNewFile,BufRead *.wrm setf acedb
+endif
+
+if !has_key(s:disabled_packages, 'abel')
+  au BufNewFile,BufRead *.abl setf abel
+endif
+
+if !has_key(s:disabled_packages, 'abc')
+  au BufNewFile,BufRead *.abc setf abc
+endif
+
+if !has_key(s:disabled_packages, 'abaqus')
+  au! BufNewFile,BufRead *.inp call polyglot#detect#Inp()
+endif
+
+if !has_key(s:disabled_packages, 'abap')
+  au BufNewFile,BufRead *.abap setf abap
+endif
+
+if !has_key(s:disabled_packages, 'aap')
+  au BufNewFile,BufRead *.aap setf aap
+endif
+
+if !has_key(s:disabled_packages, 'a65')
+  au BufNewFile,BufRead *.a65 setf a65
+endif
+
+if !has_key(s:disabled_packages, 'a2ps')
+  au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc setf a2ps
+endif
+
+if !has_key(s:disabled_packages, 'haproxy')
+  au BufNewFile,BufRead *.cfg,haproxy.cfg setf haproxy
+  au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
+endif
+
+if !has_key(s:disabled_packages, 'conf')
+  au BufNewFile,BufRead *.conf,auto.master,config setf conf
+endif
+
+if !has_key(s:disabled_packages, '8th')
+  au BufNewFile,BufRead *.8th setf 8th
+endif
+
+" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
+
+au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>:e") == "" |
+  \ call polyglot#shebang#Detect() | endif
+
+au BufEnter * if &ft == "" && expand("<afile>:e") == ""  |
+      \ call s:Observe('shebang#Detect') | endif
+
+augroup END
+
+if !has_key(s:disabled_packages, 'autoindent')
+  " Code below re-implements sleuth for vim-polyglot
+  let g:loaded_sleuth = 1
+  let g:loaded_foobar = 1
+
+  " Makes shiftwidth to be synchronized with tabstop by default
+  if &shiftwidth == &tabstop
+    let &shiftwidth = 0
+  endif
+
+  function! s:guess(lines) abort
+    let options = {}
+    let ccomment = 0
+    let podcomment = 0
+    let triplequote = 0
+    let backtick = 0
+    let xmlcomment = 0
+    let heredoc = ''
+    let minindent = 10
+    let spaces_minus_tabs = 0
+    let i = 0
+
+    for line in a:lines
+      let i += 1
+
+      if !len(line) || line =~# '^\W*$'
+        continue
+      endif
+
+      if line =~# '^\s*/\*'
+        let ccomment = 1
+      endif
+      if ccomment
+        if line =~# '\*/'
+          let ccomment = 0
+        endif
+        continue
+      endif
+
+      if line =~# '^=\w'
+        let podcomment = 1
+      endif
+      if podcomment
+        if line =~# '^=\%(end\|cut\)\>'
+          let podcomment = 0
+        endif
+        continue
+      endif
+
+      if triplequote
+        if line =~# '^[^"]*"""[^"]*$'
+          let triplequote = 0
+        endif
+        continue
+      elseif line =~# '^[^"]*"""[^"]*$'
+        let triplequote = 1
+      endif
+
+      if backtick
+        if line =~# '^[^`]*`[^`]*$'
+          let backtick = 0
+        endif
+        continue
+      elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
+        let backtick = 1
+      endif
+
+      if line =~# '^\s*<\!--'
+        let xmlcomment = 1
+      endif
+      if xmlcomment
+        if line =~# '-->'
+          let xmlcomment = 0
+        endif
+        continue
+      endif
+
+      " This is correct order because both "<<EOF" and "EOF" matches end
+      if heredoc != ''
+        if line =~# heredoc
+          let heredoc = ''
+        endif
+        continue
+      endif
+      let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
+      if len(herematch) > 0
+        let heredoc = herematch[1] . '$'
+      endif
+
+      let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
+
+      if line[0] == "\t"
+        setlocal noexpandtab
+        let &l:shiftwidth=&tabstop
+        let b:sleuth_culprit .= ':' . i
+        return 1
+      elseif line[0] == " "
+        let indent = len(matchstr(line, '^ *'))
+        if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
+          let minindent = indent
+        endif
+      endif
+    endfor
+
+    if minindent < 10
+      setlocal expandtab
+      let &l:shiftwidth=minindent
+      let b:sleuth_culprit .= ':' . i
+      return 1
+    endif
+
+    return 0
+  endfunction
+
+  function! s:detect_indent() abort
+    if &buftype ==# 'help'
+      return
+    endif
+
+    let b:sleuth_culprit = expand("<afile>:p")
+    if s:guess(getline(1, 32))
+      return
+    endif
+    let pattern = polyglot#sleuth#GlobForFiletype(&filetype)
+    if len(pattern) == 0
+      return
+    endif
+    let pattern = '{' . pattern . ',.git,.svn,.hg}'
+    let dir = expand('%:p:h')
+    let level = 3
+    while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
+      " Ignore files from homedir and root 
+      if dir == expand('~') || dir == '/'
+        unlet b:sleuth_culprit
+        return
+      endif
+      for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
+        let b:sleuth_culprit = neighbor
+        " Do not consider directories above .git, .svn or .hg
+        if fnamemodify(neighbor, ":h:t")[0] == "."
+          let level = 0
+          continue
+        endif
+        if neighbor !=# expand('%:p') && filereadable(neighbor)
+          if s:guess(readfile(neighbor, '', 32))
+            return
+          endif
+        endif
+      endfor
+
+      let dir = fnamemodify(dir, ':h')
+      let level -= 1
+    endwhile
+
+    unlet b:sleuth_culprit
+  endfunction
+
+  setglobal smarttab
+
+  function! SleuthIndicator() abort
+    let sw = &shiftwidth ? &shiftwidth : &tabstop
+    if &expandtab
+      return 'sw='.sw
+    elseif &tabstop == sw
+      return 'ts='.&tabstop
+    else
+      return 'sw='.sw.',ts='.&tabstop
+    endif
+  endfunction
+
+  augroup polyglot-sleuth
+    au!
+    au FileType * call s:detect_indent()
+    au User Flags call Hoist('buffer', 5, 'SleuthIndicator')
+  augroup END
+
+  command! -bar -bang Sleuth call s:detect_indent()
+endif
+
+func! s:verify()
+  if exists("g:polyglot_disabled_not_set")
+    if exists("g:polyglot_disabled")
+      echohl WarningMsg
+      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
+      echohl None
+    endif
+
+    unlet g:polyglot_disabled_not_set
+  endif
+endfunc
+
+au VimEnter * call s:verify()
+
+" Save polyglot_disabled without postfixes
+if exists('g:polyglot_disabled')
+  let g:polyglot_disabled = s:new_polyglot_disabled
+endif
+
+augroup filetypedetect
+
+" Ignored extensions
+if exists("*fnameescape")
+au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.dpkg-dist,?\+.dpkg-old,?\+.dpkg-new,?\+.dpkg-bak,?\+.rpmsave,?\+.rpmnew,?\+.pacsave,?\+.pacnew
+	\ exe "doau filetypedetect BufRead " . fnameescape(expand("<afile>:r"))
+au BufNewFile,BufRead *~
+	\ let s:name = expand("<afile>") |
+	\ let s:short = substitute(s:name, '\~$', '', '') |
+	\ if s:name != s:short && s:short != "" |
+	\   exe "doau filetypedetect BufRead " . fnameescape(s:short) |
+	\ endif |
+	\ unlet! s:name s:short
+au BufNewFile,BufRead ?\+.in
+	\ if expand("<afile>:t") != "configure.in" |
+	\   exe "doau filetypedetect BufRead " . fnameescape(expand("<afile>:r")) |
+	\ endif
+elseif &verbose > 0
+  echomsg "Warning: some filetypes will not be recognized because this version of Vim does not have fnameescape()"
+endif
+
+" Pattern used to match file names which should not be inspected.
+" Currently finds compressed files.
+if !exists("g:ft_ignore_pat")
+  let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|zip\|tgz\)$'
+endif
+
+" Vim help file
+au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt	setf help
+
+" Abaqus or Trasys
+au BufNewFile,BufRead *.inp			call dist#ft#Check_inp()
+
+" 8th (Firth-derivative)
+au BufNewFile,BufRead *.8th			setf 8th
+
+" A-A-P recipe
+au BufNewFile,BufRead *.aap			setf aap
+
+" A2ps printing utility
+au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,a2psrc,.a2psrc setf a2ps
+
+" ABAB/4
+au BufNewFile,BufRead *.abap			setf abap
+
+" ABC music notation
+au BufNewFile,BufRead *.abc			setf abc
+
+" ABEL
+au BufNewFile,BufRead *.abl			setf abel
+
+" AceDB
+au BufNewFile,BufRead *.wrm			setf acedb
+
+" Ada (83, 9X, 95)
+au BufNewFile,BufRead *.adb,*.ads,*.ada		setf ada
+if has("vms")
+  au BufNewFile,BufRead *.gpr,*.ada_m,*.adc	setf ada
+else
+  au BufNewFile,BufRead *.gpr			setf ada
+endif
+
+" AHDL
+au BufNewFile,BufRead *.tdf			setf ahdl
+
+" AIDL
+au BufNewFile,BufRead *.aidl			setf aidl
+
+" AMPL
+au BufNewFile,BufRead *.run			setf ampl
+
+" Ant
+au BufNewFile,BufRead build.xml			setf ant
+
+" Arduino
+au BufNewFile,BufRead *.ino,*.pde		setf arduino
+
+" Apache config file
+au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf		setf apache
+au BufNewFile,BufRead */etc/apache2/sites-*/*.com		setf apache
+
+" XA65 MOS6510 cross assembler
+au BufNewFile,BufRead *.a65			setf a65
+
+" Applescript
+au BufNewFile,BufRead *.scpt			setf applescript
+
+" Applix ELF
+au BufNewFile,BufRead *.am
+	\ if expand("<afile>") !~? 'Makefile.am\>' | setf elf | endif
+
+" ALSA configuration
+au BufNewFile,BufRead .asoundrc,*/usr/share/alsa/alsa.conf,*/etc/asound.conf setf alsaconf
+
+" Arc Macro Language
+au BufNewFile,BufRead *.aml			setf aml
+
+" APT config file
+au BufNewFile,BufRead apt.conf		       setf aptconf
+au BufNewFile,BufRead */.aptitude/config       setf aptconf
+au BufNewFile,BufRead */etc/apt/apt.conf.d/{[-_[:alnum:]]\+,[-_.[:alnum:]]\+.conf} setf aptconf
+
+" Arch Inventory file
+au BufNewFile,BufRead .arch-inventory,=tagging-method	setf arch
+
+" ART*Enterprise (formerly ART-IM)
+au BufNewFile,BufRead *.art			setf art
+
+" AsciiDoc
+au BufNewFile,BufRead *.asciidoc,*.adoc		setf asciidoc
+
+" ASN.1
+au BufNewFile,BufRead *.asn,*.asn1		setf asn
+
+" Active Server Pages (with Visual Basic Script)
+au BufNewFile,BufRead *.asa
+	\ if exists("g:filetype_asa") |
+	\   exe "setf " . g:filetype_asa |
+	\ else |
+	\   setf aspvbs |
+	\ endif
+
+" Active Server Pages (with Perl or Visual Basic Script)
+au BufNewFile,BufRead *.asp
+	\ if exists("g:filetype_asp") |
+	\   exe "setf " . g:filetype_asp |
+	\ elseif getline(1) . getline(2) . getline(3) =~? "perlscript" |
+	\   setf aspperl |
+	\ else |
+	\   setf aspvbs |
+	\ endif
+
+" Grub (must be before catch *.lst)
+au BufNewFile,BufRead */boot/grub/menu.lst,*/boot/grub/grub.conf,*/etc/grub.conf setf grub
+
+" Assembly (all kinds)
+" *.lst is not pure assembly, it has two extra columns (address, byte codes)
+au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call dist#ft#FTasm()
+
+" Macro (VAX)
+au BufNewFile,BufRead *.mar			setf vmasm
+
+" Atlas
+au BufNewFile,BufRead *.atl,*.as		setf atlas
+
+" Autoit v3
+au BufNewFile,BufRead *.au3			setf autoit
+
+" Autohotkey
+au BufNewFile,BufRead *.ahk			setf autohotkey
+
+" Automake
+au BufNewFile,BufRead [mM]akefile.am,GNUmakefile.am	setf automake
+
+" Autotest .at files are actually m4
+au BufNewFile,BufRead *.at			setf m4
+
+" Avenue
+au BufNewFile,BufRead *.ave			setf ave
+
+" Awk
+au BufNewFile,BufRead *.awk,*.gawk		setf awk
+
+" B
+au BufNewFile,BufRead *.mch,*.ref,*.imp		setf b
+
+" BASIC or Visual Basic
+au BufNewFile,BufRead *.bas			call dist#ft#FTVB("basic")
+
+" Visual Basic Script (close to Visual Basic) or Visual Basic .NET
+au BufNewFile,BufRead *.vb,*.vbs,*.dsm,*.ctl	setf vb
+
+" IBasic file (similar to QBasic)
+au BufNewFile,BufRead *.iba,*.ibi		setf ibasic
+
+" FreeBasic file (similar to QBasic)
+au BufNewFile,BufRead *.fb,*.bi			setf freebasic
+
+" Batch file for MSDOS.
+au BufNewFile,BufRead *.bat,*.sys		setf dosbatch
+" *.cmd is close to a Batch file, but on OS/2 Rexx files also use *.cmd.
+au BufNewFile,BufRead *.cmd
+	\ if getline(1) =~ '^/\*' | setf rexx | else | setf dosbatch | endif
+
+" Batch file for 4DOS
+au BufNewFile,BufRead *.btm			call dist#ft#FTbtm()
+
+" BC calculator
+au BufNewFile,BufRead *.bc			setf bc
+
+" BDF font
+au BufNewFile,BufRead *.bdf			setf bdf
+
+" BibTeX bibliography database file
+au BufNewFile,BufRead *.bib			setf bib
+
+" BibTeX Bibliography Style
+au BufNewFile,BufRead *.bst			setf bst
+
+" BIND configuration
+" sudoedit uses namedXXXX.conf
+au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key	setf named
+
+" BIND zone
+au BufNewFile,BufRead named.root		setf bindzone
+au BufNewFile,BufRead *.db			call dist#ft#BindzoneCheck('')
+
+" Blank
+au BufNewFile,BufRead *.bl			setf blank
+
+" Blkid cache file
+au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old   setf xml
+
+" BSDL
+au BufNewFile,BufRead *bsd,*.bsdl		setf bsdl
+
+" Bazel (http://bazel.io)
+autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE	setf bzl
+if has("fname_case")
+  " There is another check for BUILD further below.
+  autocmd BufRead,BufNewFile *.BUILD,BUILD		setf bzl
+endif
+
+" C or lpc
+au BufNewFile,BufRead *.c			call dist#ft#FTlpc()
+au BufNewFile,BufRead *.lpc,*.ulpc		setf lpc
+
+" Calendar
+au BufNewFile,BufRead calendar			setf calendar
+
+" C#
+au BufNewFile,BufRead *.cs			setf cs
+
+" CSDL
+au BufNewFile,BufRead *.csdl			setf csdl
+
+" Cabal
+au BufNewFile,BufRead *.cabal			setf cabal
+
+" Cdrdao TOC
+au BufNewFile,BufRead *.toc			setf cdrtoc
+
+" Cdrdao config
+au BufNewFile,BufRead */etc/cdrdao.conf,*/etc/defaults/cdrdao,*/etc/default/cdrdao,.cdrdao	setf cdrdaoconf
+
+" Cfengine
+au BufNewFile,BufRead cfengine.conf		setf cfengine
+
+" ChaiScript
+au BufRead,BufNewFile *.chai			setf chaiscript
+
+" Comshare Dimension Definition Language
+au BufNewFile,BufRead *.cdl			setf cdl
+
+" Conary Recipe
+au BufNewFile,BufRead *.recipe			setf conaryrecipe
+
+" Controllable Regex Mutilator
+au BufNewFile,BufRead *.crm			setf crm
+
+" Cyn++
+au BufNewFile,BufRead *.cyn			setf cynpp
+
+" Cynlib
+" .cc and .cpp files can be C++ or Cynlib.
+au BufNewFile,BufRead *.cc
+	\ if exists("cynlib_syntax_for_cc")|setf cynlib|else|setf cpp|endif
+au BufNewFile,BufRead *.cpp
+	\ if exists("cynlib_syntax_for_cpp")|setf cynlib|else|setf cpp|endif
+
+" C++
+au BufNewFile,BufRead *.cxx,*.c++,*.hh,*.hxx,*.hpp,*.ipp,*.moc,*.tcc,*.inl setf cpp
+if has("fname_case")
+  au BufNewFile,BufRead *.C,*.H setf cpp
+endif
+
+" .h files can be C, Ch C++, ObjC or ObjC++.
+" Set c_syntax_for_h if you want C, ch_syntax_for_h if you want Ch. ObjC is
+" detected automatically.
+au BufNewFile,BufRead *.h			call dist#ft#FTheader()
+
+" Ch (CHscript)
+au BufNewFile,BufRead *.chf			setf ch
+
+" TLH files are C++ headers generated by Visual C++'s #import from typelibs
+au BufNewFile,BufRead *.tlh			setf cpp
+
+" Cascading Style Sheets
+au BufNewFile,BufRead *.css			setf css
+
+" Century Term Command Scripts (*.cmd too)
+au BufNewFile,BufRead *.con			setf cterm
+
+" Changelog
+au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch,*/debian/changelog
+					\	setf debchangelog
+
+au BufNewFile,BufRead [cC]hange[lL]og
+	\  if getline(1) =~ '; urgency='
+	\|   setf debchangelog
+	\| else
+	\|   setf changelog
+	\| endif
+
+au BufNewFile,BufRead NEWS
+	\  if getline(1) =~ '; urgency='
+	\|   setf debchangelog
+	\| endif
+
+" CHILL
+au BufNewFile,BufRead *..ch			setf chill
+
+" Changes for WEB and CWEB or CHILL
+au BufNewFile,BufRead *.ch			call dist#ft#FTchange()
+
+" ChordPro
+au BufNewFile,BufRead *.chopro,*.crd,*.cho,*.crdpro,*.chordpro	setf chordpro
+
+" Clean
+au BufNewFile,BufRead *.dcl,*.icl		setf clean
+
+" Clever
+au BufNewFile,BufRead *.eni			setf cl
+
+" Clever or dtd
+au BufNewFile,BufRead *.ent			call dist#ft#FTent()
+
+" Clipper (or FoxPro; could also be eviews)
+au BufNewFile,BufRead *.prg
+	\ if exists("g:filetype_prg") |
+	\   exe "setf " . g:filetype_prg |
+	\ else |
+	\   setf clipper |
+	\ endif
+
+" Clojure
+au BufNewFile,BufRead *.clj,*.cljs,*.cljx,*.cljc		setf clojure
+
+" Cmake
+au BufNewFile,BufRead CMakeLists.txt,*.cmake,*.cmake.in		setf cmake
+
+" Cmusrc
+au BufNewFile,BufRead */.cmus/{autosave,rc,command-history,*.theme} setf cmusrc
+au BufNewFile,BufRead */cmus/{rc,*.theme}			setf cmusrc
+
+" Cobol
+au BufNewFile,BufRead *.cbl,*.cob,*.lib	setf cobol
+"   cobol or zope form controller python script? (heuristic)
+au BufNewFile,BufRead *.cpy
+	\ if getline(1) =~ '^##' |
+	\   setf python |
+	\ else |
+	\   setf cobol |
+	\ endif
+
+" Coco/R
+au BufNewFile,BufRead *.atg			setf coco
+
+" Cold Fusion
+au BufNewFile,BufRead *.cfm,*.cfi,*.cfc		setf cf
+
+" Configure scripts
+au BufNewFile,BufRead configure.in,configure.ac setf config
+
+" CUDA  Cumpute Unified Device Architecture
+au BufNewFile,BufRead *.cu,*.cuh		setf cuda
+
+" Dockerfile; Podman uses the same syntax with name Containerfile
+au BufNewFile,BufRead Containerfile,Dockerfile,*.Dockerfile	setf dockerfile
+
+" WildPackets EtherPeek Decoder
+au BufNewFile,BufRead *.dcd			setf dcd
+
+" Enlightenment configuration files
+au BufNewFile,BufRead *enlightenment/*.cfg	setf c
+
+" Eterm
+au BufNewFile,BufRead *Eterm/*.cfg		setf eterm
+
+" Euphoria 3 or 4
+au BufNewFile,BufRead *.eu,*.ew,*.ex,*.exu,*.exw  call dist#ft#EuphoriaCheck()
+if has("fname_case")
+   au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW  call dist#ft#EuphoriaCheck()
+endif
+
+" Lynx config files
+au BufNewFile,BufRead lynx.cfg			setf lynx
+
+" Quake
+au BufNewFile,BufRead *baseq[2-3]/*.cfg,*id1/*.cfg	setf quake
+au BufNewFile,BufRead *quake[1-3]/*.cfg			setf quake
+
+" Quake C
+au BufNewFile,BufRead *.qc			setf c
+
+" Configure files
+au BufNewFile,BufRead *.cfg			setf cfg
+
+" Cucumber
+au BufNewFile,BufRead *.feature			setf cucumber
+
+" Communicating Sequential Processes
+au BufNewFile,BufRead *.csp,*.fdr		setf csp
+
+" CUPL logic description and simulation
+au BufNewFile,BufRead *.pld			setf cupl
+au BufNewFile,BufRead *.si			setf cuplsim
+
+" Dart
+au BufRead,BufNewfile *.dart,*.drt		setf dart
+
+" Debian Control
+au BufNewFile,BufRead */debian/control		setf debcontrol
+au BufNewFile,BufRead control
+	\  if getline(1) =~ '^Source:'
+	\|   setf debcontrol
+	\| endif
+
+" Debian Copyright
+au BufNewFile,BufRead */debian/copyright	setf debcopyright
+au BufNewFile,BufRead copyright
+	\  if getline(1) =~ '^Format:'
+	\|   setf debcopyright
+	\| endif
+
+" Debian Sources.list
+au BufNewFile,BufRead */etc/apt/sources.list		setf debsources
+au BufNewFile,BufRead */etc/apt/sources.list.d/*.list	setf debsources
+
+" Deny hosts
+au BufNewFile,BufRead denyhosts.conf		setf denyhosts
+
+" dnsmasq(8) configuration files
+au BufNewFile,BufRead */etc/dnsmasq.conf	setf dnsmasq
+
+" ROCKLinux package description
+au BufNewFile,BufRead *.desc			setf desc
+
+" the D language or dtrace
+au BufNewFile,BufRead *.d			call dist#ft#DtraceCheck()
+
+" Desktop files
+au BufNewFile,BufRead *.desktop,*.directory	setf desktop
+
+" Dict config
+au BufNewFile,BufRead dict.conf,.dictrc		setf dictconf
+
+" Dictd config
+au BufNewFile,BufRead dictd.conf		setf dictdconf
+
+" Diff files
+au BufNewFile,BufRead *.diff,*.rej		setf diff
+au BufNewFile,BufRead *.patch
+	\ if getline(1) =~ '^From [0-9a-f]\{40\} Mon Sep 17 00:00:00 2001$' |
+	\   setf gitsendemail |
+	\ else |
+	\   setf diff |
+	\ endif
+
+" Dircolors
+au BufNewFile,BufRead .dir_colors,.dircolors,*/etc/DIR_COLORS	setf dircolors
+
+" Diva (with Skill) or InstallShield
+au BufNewFile,BufRead *.rul
+	\ if getline(1).getline(2).getline(3).getline(4).getline(5).getline(6) =~? 'InstallShield' |
+	\   setf ishd |
+	\ else |
+	\   setf diva |
+	\ endif
+
+" DCL (Digital Command Language - vms) or DNS zone file
+au BufNewFile,BufRead *.com			call dist#ft#BindzoneCheck('dcl')
+
+" DOT
+au BufNewFile,BufRead *.dot,*.gv		setf dot
+
+" Dylan - lid files
+au BufNewFile,BufRead *.lid			setf dylanlid
+
+" Dylan - intr files (melange)
+au BufNewFile,BufRead *.intr			setf dylanintr
+
+" Dylan
+au BufNewFile,BufRead *.dylan			setf dylan
+
+" Microsoft Module Definition
+au BufNewFile,BufRead *.def			setf def
+
+" Dracula
+au BufNewFile,BufRead *.drac,*.drc,*lvs,*lpe	setf dracula
+
+" Datascript
+au BufNewFile,BufRead *.ds			setf datascript
+
+" dsl
+au BufNewFile,BufRead *.dsl			setf dsl
+
+" DTD (Document Type Definition for XML)
+au BufNewFile,BufRead *.dtd			setf dtd
+
+" DTS/DSTI (device tree files)
+au BufNewFile,BufRead *.dts,*.dtsi		setf dts
+
+" EDIF (*.edf,*.edif,*.edn,*.edo) or edn
+au BufNewFile,BufRead *.ed\(f\|if\|o\)		setf edif
+au BufNewFile,BufRead *.edn
+	\ if getline(1) =~ '^\s*(\s*edif\>' |
+	\   setf edif |
+	\ else |
+	\   setf clojure |
+	\ endif
+
+" EditorConfig (close enough to dosini)
+au BufNewFile,BufRead .editorconfig		setf dosini
+
+" Embedix Component Description
+au BufNewFile,BufRead *.ecd			setf ecd
+
+" Eiffel or Specman or Euphoria
+au BufNewFile,BufRead *.e,*.E			call dist#ft#FTe()
+
+" Elinks configuration
+au BufNewFile,BufRead elinks.conf		setf elinks
+
+" ERicsson LANGuage; Yaws is erlang too
+au BufNewFile,BufRead *.erl,*.hrl,*.yaws	setf erlang
+
+" Elm
+au BufNewFile,BufRead *.elm			setf elm
+
+" Elm Filter Rules file
+au BufNewFile,BufRead filter-rules		setf elmfilt
+
+" ESMTP rc file
+au BufNewFile,BufRead *esmtprc			setf esmtprc
+
+" ESQL-C
+au BufNewFile,BufRead *.ec,*.EC			setf esqlc
+
+" Esterel
+au BufNewFile,BufRead *.strl			setf esterel
+
+" Essbase script
+au BufNewFile,BufRead *.csc			setf csc
+
+" Exim
+au BufNewFile,BufRead exim.conf			setf exim
+
+" Expect
+au BufNewFile,BufRead *.exp			setf expect
+
+" Exports
+au BufNewFile,BufRead exports			setf exports
+
+" Falcon
+au BufNewFile,BufRead *.fal			setf falcon
+
+" Fantom
+au BufNewFile,BufRead *.fan,*.fwt		setf fan
+
+" Factor
+au BufNewFile,BufRead *.factor			setf factor
+
+" Fetchmail RC file
+au BufNewFile,BufRead .fetchmailrc		setf fetchmail
+
+" FlexWiki - disabled, because it has side effects when a .wiki file
+" is not actually FlexWiki
+"au BufNewFile,BufRead *.wiki			setf flexwiki
+
+" Focus Executable
+au BufNewFile,BufRead *.fex,*.focexec		setf focexec
+
+" Focus Master file (but not for auto.master)
+au BufNewFile,BufRead auto.master		setf conf
+au BufNewFile,BufRead *.mas,*.master		setf master
+
+" Forth
+au BufNewFile,BufRead *.fs,*.ft,*.fth		setf forth
+
+" Reva Forth
+au BufNewFile,BufRead *.frt			setf reva
+
+" Fortran
+if has("fname_case")
+  au BufNewFile,BufRead *.F,*.FOR,*.FPP,*.FTN,*.F77,*.F90,*.F95,*.F03,*.F08	 setf fortran
+endif
+au BufNewFile,BufRead   *.f,*.for,*.fortran,*.fpp,*.ftn,*.f77,*.f90,*.f95,*.f03,*.f08  setf fortran
+
+" Framescript
+au BufNewFile,BufRead *.fsl			setf framescript
+
+" FStab
+au BufNewFile,BufRead fstab,mtab		setf fstab
+
+" GDB command files
+au BufNewFile,BufRead .gdbinit			setf gdb
+
+" GDMO
+au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
+
+" Gedcom
+au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
+
+" Git
+au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG	setf gitcommit
+au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig	setf gitconfig
+au BufNewFile,BufRead */.config/git/config			setf gitconfig
+au BufNewFile,BufRead .gitmodules,*.git/modules/*/config	setf gitconfig
+if !empty($XDG_CONFIG_HOME)
+  au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config		setf gitconfig
+endif
+au BufNewFile,BufRead git-rebase-todo		setf gitrebase
+au BufRead,BufNewFile .gitsendemail.msg.??????	setf gitsendemail
+au BufNewFile,BufRead .msg.[0-9]*
+      \ if getline(1) =~ '^From.*# This line is ignored.$' |
+      \   setf gitsendemail |
+      \ endif
+au BufNewFile,BufRead *.git/*
+      \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
+      \   setf git |
+      \ endif
+
+" Gkrellmrc
+au BufNewFile,BufRead gkrellmrc,gkrellmrc_?	setf gkrellmrc
+
+" GP scripts (2.0 and onward)
+au BufNewFile,BufRead *.gp,.gprc		setf gp
+
+" GPG
+au BufNewFile,BufRead */.gnupg/options		setf gpg
+au BufNewFile,BufRead */.gnupg/gpg.conf		setf gpg
+au BufNewFile,BufRead */usr/*/gnupg/options.skel setf gpg
+if !empty($GNUPGHOME)
+  au BufNewFile,BufRead $GNUPGHOME/options	setf gpg
+  au BufNewFile,BufRead $GNUPGHOME/gpg.conf	setf gpg
+endif
+
+" gnash(1) configuration files
+au BufNewFile,BufRead gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc setf gnash
+
+" Gitolite
+au BufNewFile,BufRead gitolite.conf		setf gitolite
+au BufNewFile,BufRead {,.}gitolite.rc,example.gitolite.rc	setf perl
+
+" Gnuplot scripts
+au BufNewFile,BufRead *.gpi			setf gnuplot
+
+" Go (Google)
+au BufNewFile,BufRead *.go			setf go
+
+" GrADS scripts
+au BufNewFile,BufRead *.gs			setf grads
+
+" Gretl
+au BufNewFile,BufRead *.gretl			setf gretl
+
+" Groovy
+au BufNewFile,BufRead *.gradle,*.groovy		setf groovy
+
+" GNU Server Pages
+au BufNewFile,BufRead *.gsp			setf gsp
+
+" Group file
+au BufNewFile,BufRead */etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/etc/gshadow-,*/etc/gshadow.edit,*/var/backups/group.bak,*/var/backups/gshadow.bak  setf group
+
+" GTK RC
+au BufNewFile,BufRead .gtkrc,gtkrc		setf gtkrc
+
+" Haml
+au BufNewFile,BufRead *.haml			setf haml
+
+" Hamster Classic | Playground files
+au BufNewFile,BufRead *.hsc,*.hsm		setf hamster
+
+" Haskell
+au BufNewFile,BufRead *.hs,*.hs-boot		setf haskell
+au BufNewFile,BufRead *.lhs			setf lhaskell
+au BufNewFile,BufRead *.chs			setf chaskell
+
+" Haste
+au BufNewFile,BufRead *.ht			setf haste
+au BufNewFile,BufRead *.htpp			setf hastepreproc
+
+" Hercules
+au BufNewFile,BufRead *.vc,*.ev,*.sum,*.errsum	setf hercules
+
+" HEX (Intel)
+au BufNewFile,BufRead *.hex,*.h32		setf hex
+
+" Hollywood
+au BufRead,BufNewFile *.hws			setf hollywood
+
+" Tilde (must be before HTML)
+au BufNewFile,BufRead *.t.html			setf tilde
+
+" HTML (.shtml and .stm for server side)
+au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm  call dist#ft#FThtml()
+
+" HTML with Ruby - eRuby
+au BufNewFile,BufRead *.erb,*.rhtml		setf eruby
+
+" HTML with M4
+au BufNewFile,BufRead *.html.m4			setf htmlm4
+
+" Some template.  Used to be HTML Cheetah.
+au BufNewFile,BufRead *.tmpl			setf template
+
+" Host config
+au BufNewFile,BufRead */etc/host.conf		setf hostconf
+
+" Hosts access
+au BufNewFile,BufRead */etc/hosts.allow,*/etc/hosts.deny  setf hostsaccess
+
+" Hyper Builder
+au BufNewFile,BufRead *.hb			setf hb
+
+" Httest
+au BufNewFile,BufRead *.htt,*.htb		setf httest
+
+" Icon
+au BufNewFile,BufRead *.icn			setf icon
+
+" IDL (Interface Description Language)
+au BufNewFile,BufRead *.idl			call dist#ft#FTidl()
+
+" Microsoft IDL (Interface Description Language)  Also *.idl
+" MOF = WMI (Windows Management Instrumentation) Managed Object Format
+au BufNewFile,BufRead *.odl,*.mof		setf msidl
+
+" Icewm menu
+au BufNewFile,BufRead */.icewm/menu		setf icemenu
+
+" Indent profile (must come before IDL *.pro!)
+au BufNewFile,BufRead .indent.pro		setf indent
+au BufNewFile,BufRead indent.pro		call dist#ft#ProtoCheck('indent')
+
+" IDL (Interactive Data Language)
+au BufNewFile,BufRead *.pro			call dist#ft#ProtoCheck('idlang')
+
+" Indent RC
+au BufNewFile,BufRead indentrc			setf indent
+
+" Inform
+au BufNewFile,BufRead *.inf,*.INF		setf inform
+
+" Initng
+au BufNewFile,BufRead */etc/initng/*/*.i,*.ii	setf initng
+
+" Innovation Data Processing
+au BufRead,BufNewFile upstream.dat\c,upstream.*.dat\c,*.upstream.dat\c	setf upstreamdat
+au BufRead,BufNewFile fdrupstream.log,upstream.log\c,upstream.*.log\c,*.upstream.log\c,UPSTREAM-*.log\c	setf upstreamlog
+au BufRead,BufNewFile upstreaminstall.log\c,upstreaminstall.*.log\c,*.upstreaminstall.log\c setf upstreaminstalllog
+au BufRead,BufNewFile usserver.log\c,usserver.*.log\c,*.usserver.log\c	setf usserverlog
+au BufRead,BufNewFile usw2kagt.log\c,usw2kagt.*.log\c,*.usw2kagt.log\c	setf usw2kagtlog
+
+" Ipfilter
+au BufNewFile,BufRead ipf.conf,ipf6.conf,ipf.rules	setf ipfilter
+
+" Informix 4GL (source - canonical, include file, I4GL+M4 preproc.)
+au BufNewFile,BufRead *.4gl,*.4gh,*.m4gl	setf fgl
+
+" .INI file for MSDOS
+au BufNewFile,BufRead *.ini			setf dosini
+
+" SysV Inittab
+au BufNewFile,BufRead inittab			setf inittab
+
+" Inno Setup
+au BufNewFile,BufRead *.iss			setf iss
+
+" J
+au BufNewFile,BufRead *.ijs			setf j
+
+" JAL
+au BufNewFile,BufRead *.jal,*.JAL		setf jal
+
+" Jam
+au BufNewFile,BufRead *.jpl,*.jpr		setf jam
+
+" Java
+au BufNewFile,BufRead *.java,*.jav		setf java
+
+" JavaCC
+au BufNewFile,BufRead *.jj,*.jjt		setf javacc
+
+" JavaScript, ECMAScript, ES module script, CommonJS script
+au BufNewFile,BufRead *.js,*.javascript,*.es,*.mjs,*.cjs   setf javascript
+
+" JavaScript with React
+au BufNewFile,BufRead *.jsx			setf javascriptreact
+
+" Java Server Pages
+au BufNewFile,BufRead *.jsp			setf jsp
+
+" Java Properties resource file (note: doesn't catch font.properties.pl)
+au BufNewFile,BufRead *.properties,*.properties_??,*.properties_??_??	setf jproperties
+
+" Jess
+au BufNewFile,BufRead *.clp			setf jess
+
+" Jgraph
+au BufNewFile,BufRead *.jgr			setf jgraph
+
+" Jovial
+au BufNewFile,BufRead *.jov,*.j73,*.jovial	setf jovial
+
+" JSON
+au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest	setf json
+
+" Kixtart
+au BufNewFile,BufRead *.kix			setf kix
+
+" Kimwitu[++]
+au BufNewFile,BufRead *.k			setf kwt
+
+" Kivy
+au BufNewFile,BufRead *.kv			setf kivy
+
+" Kotlin
+au BufNewFile,BufRead *.kt,*.ktm,*.kts		setf kotlin
+
+" KDE script
+au BufNewFile,BufRead *.ks			setf kscript
+
+" Kconfig
+au BufNewFile,BufRead Kconfig,Kconfig.debug	setf kconfig
+
+" Lace (ISE)
+au BufNewFile,BufRead *.ace,*.ACE		setf lace
+
+" Latte
+au BufNewFile,BufRead *.latte,*.lte		setf latte
+
+" Limits
+au BufNewFile,BufRead */etc/limits,*/etc/*limits.conf,*/etc/*limits.d/*.conf	setf limits
+
+" LambdaProlog (*.mod too, see Modsim)
+au BufNewFile,BufRead *.sig			setf lprolog
+
+" LDAP LDIF
+au BufNewFile,BufRead *.ldif			setf ldif
+
+" Ld loader
+au BufNewFile,BufRead *.ld			setf ld
+
+" Less
+au BufNewFile,BufRead *.less			setf less
+
+" Lex
+au BufNewFile,BufRead *.lex,*.l,*.lxx,*.l++	setf lex
+
+" Libao
+au BufNewFile,BufRead */etc/libao.conf,*/.libao	setf libao
+
+" Libsensors
+au BufNewFile,BufRead */etc/sensors.conf,*/etc/sensors3.conf	setf sensors
+
+" LFTP
+au BufNewFile,BufRead lftp.conf,.lftprc,*lftp/rc	setf lftp
+
+" Lifelines (or Lex for C++!)
+au BufNewFile,BufRead *.ll			setf lifelines
+
+" Lilo: Linux loader
+au BufNewFile,BufRead lilo.conf			setf lilo
+
+" Lisp (*.el = ELisp, *.cl = Common Lisp)
+" *.jl was removed, it's also used for Julia, better skip than guess wrong.
+if has("fname_case")
+  au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.L,.emacs,.sawfishrc setf lisp
+else
+  au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,.emacs,.sawfishrc setf lisp
+endif
+
+" SBCL implementation of Common Lisp
+au BufNewFile,BufRead sbclrc,.sbclrc		setf lisp
+
+" Liquid
+au BufNewFile,BufRead *.liquid			setf liquid
+
+" Lite
+au BufNewFile,BufRead *.lite,*.lt		setf lite
+
+" LiteStep RC files
+au BufNewFile,BufRead */LiteStep/*/*.rc		setf litestep
+
+" Login access
+au BufNewFile,BufRead */etc/login.access	setf loginaccess
+
+" Login defs
+au BufNewFile,BufRead */etc/login.defs		setf logindefs
+
+" Logtalk
+au BufNewFile,BufRead *.lgt			setf logtalk
+
+" LOTOS
+au BufNewFile,BufRead *.lot,*.lotos		setf lotos
+
+" Lout (also: *.lt)
+au BufNewFile,BufRead *.lou,*.lout		setf lout
+
+" Lua
+au BufNewFile,BufRead *.lua			setf lua
+
+" Luarocks
+au BufNewFile,BufRead *.rockspec		setf lua
+
+" Linden Scripting Language (Second Life)
+au BufNewFile,BufRead *.lsl			setf lsl
+
+" Lynx style file (or LotusScript!)
+au BufNewFile,BufRead *.lss			setf lss
+
+" M4
+au BufNewFile,BufRead *.m4
+	\ if expand("<afile>") !~? 'html.m4$\|fvwm2rc' | setf m4 | endif
+
+" MaGic Point
+au BufNewFile,BufRead *.mgp			setf mgp
+
+" Mail (for Elm, trn, mutt, muttng, rn, slrn, neomutt)
+au BufNewFile,BufRead snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\\\{6\},neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml setf mail
+
+" Mail aliases
+au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases	setf mailaliases
+
+" Mailcap configuration file
+au BufNewFile,BufRead .mailcap,mailcap		setf mailcap
+
+" Makefile
+"au BufNewFile,BufRead *[mM]akefile,*.mk,*.mak,*.dsp setf make
+
+" MakeIndex
+au BufNewFile,BufRead *.ist,*.mst		setf ist
+
+" Mallard
+au BufNewFile,BufRead *.page			setf mallard
+
+" Manpage
+au BufNewFile,BufRead *.man			setf man
+
+" Man config
+au BufNewFile,BufRead */etc/man.conf,man.config	setf manconf
+
+" Maple V
+au BufNewFile,BufRead *.mv,*.mpl,*.mws		setf maple
+
+" Map (UMN mapserver config file)
+au BufNewFile,BufRead *.map			setf map
+
+" Markdown
+au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,*.md  setf markdown
+
+" Mason
+au BufNewFile,BufRead *.mason,*.mhtml,*.comp	setf mason
+
+" Mathematica, Matlab, Murphi or Objective C
+au BufNewFile,BufRead *.m			call dist#ft#FTm()
+
+" Mathematica notebook
+au BufNewFile,BufRead *.nb			setf mma
+
+" Maya Extension Language
+au BufNewFile,BufRead *.mel			setf mel
+
+" Mercurial (hg) commit file
+au BufNewFile,BufRead hg-editor-*.txt		setf hgcommit
+
+" Mercurial config (looks like generic config file)
+au BufNewFile,BufRead *.hgrc,*hgrc		setf cfg
+
+" Meson Build system config
+au BufNewFile,BufRead meson.build,meson_options.txt setf meson
+
+" Messages (logs mostly)
+au BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.[0-9]*,-[0-9]*} setf messages
+
+" Metafont
+au BufNewFile,BufRead *.mf			setf mf
+
+" MetaPost
+au BufNewFile,BufRead *.mp			setf mp
+
+" MGL
+au BufNewFile,BufRead *.mgl			setf mgl
+
+" MIX - Knuth assembly
+au BufNewFile,BufRead *.mix,*.mixal		setf mix
+
+" MMIX or VMS makefile
+au BufNewFile,BufRead *.mms			call dist#ft#FTmms()
+
+" Symbian meta-makefile definition (MMP)
+au BufNewFile,BufRead *.mmp			setf mmp
+
+" Modsim III (or LambdaProlog)
+au BufNewFile,BufRead *.mod
+	\ if getline(1) =~ '\<module\>' |
+	\   setf lprolog |
+	\ else |
+	\   setf modsim3 |
+	\ endif
+
+" Modula 2  (.md removed in favor of Markdown)
+au BufNewFile,BufRead *.m2,*.DEF,*.MOD,*.mi	setf modula2
+
+" Modula 3 (.m3, .i3, .mg, .ig)
+au BufNewFile,BufRead *.[mi][3g]		setf modula3
+
+" Monk
+au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc	setf monk
+
+" MOO
+au BufNewFile,BufRead *.moo			setf moo
+
+" Modconf
+au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules setf modconf
+
+" Mplayer config
+au BufNewFile,BufRead mplayer.conf,*/.mplayer/config	setf mplayerconf
+
+" Motorola S record
+au BufNewFile,BufRead *.s19,*.s28,*.s37,*.mot,*.srec	setf srec
+
+" Mrxvtrc
+au BufNewFile,BufRead mrxvtrc,.mrxvtrc		setf mrxvtrc
+
+" Msql
+au BufNewFile,BufRead *.msql			setf msql
+
+" Mysql
+au BufNewFile,BufRead *.mysql			setf mysql
+
+" Mutt setup files (must be before catch *.rc)
+au BufNewFile,BufRead */etc/Muttrc.d/*		call s:StarSetf('muttrc')
+
+" M$ Resource files
+au BufNewFile,BufRead *.rc,*.rch		setf rc
+
+" MuPAD source
+au BufRead,BufNewFile *.mu			setf mupad
+
+" Mush
+au BufNewFile,BufRead *.mush			setf mush
+
+" Mutt setup file (also for Muttng)
+au BufNewFile,BufRead Mutt{ng,}rc		setf muttrc
+
+" N1QL
+au BufRead,BufNewfile *.n1ql,*.nql		setf n1ql
+
+" Nano
+au BufNewFile,BufRead */etc/nanorc,*.nanorc	setf nanorc
+
+" Nastran input/DMAP
+"au BufNewFile,BufRead *.dat			setf nastran
+
+" Natural
+au BufNewFile,BufRead *.NS[ACGLMNPS]		setf natural
+
+" Noemutt setup file
+au BufNewFile,BufRead Neomuttrc			setf neomuttrc
+
+" Netrc
+au BufNewFile,BufRead .netrc			setf netrc
+
+" Ninja file
+au BufNewFile,BufRead *.ninja			setf ninja
+
+" NPM RC file
+au BufNewFile,BufRead npmrc,.npmrc		setf dosini
+
+" Novell netware batch files
+au BufNewFile,BufRead *.ncf			setf ncf
+
+" Nroff/Troff (*.ms and *.t are checked below)
+au BufNewFile,BufRead *.me
+	\ if expand("<afile>") != "read.me" && expand("<afile>") != "click.me" |
+	\   setf nroff |
+	\ endif
+au BufNewFile,BufRead *.tr,*.nr,*.roff,*.tmac,*.mom	setf nroff
+au BufNewFile,BufRead *.[1-9]			call dist#ft#FTnroff()
+
+" Nroff or Objective C++
+au BufNewFile,BufRead *.mm			call dist#ft#FTmm()
+
+" Not Quite C
+au BufNewFile,BufRead *.nqc			setf nqc
+
+" NSE - Nmap Script Engine - uses Lua syntax
+au BufNewFile,BufRead *.nse			setf lua
+
+" NSIS
+au BufNewFile,BufRead *.nsi,*.nsh		setf nsis
+
+" OCAML
+au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit	setf ocaml
+
+" Occam
+au BufNewFile,BufRead *.occ			setf occam
+
+" Omnimark
+au BufNewFile,BufRead *.xom,*.xin		setf omnimark
+
+" OpenROAD
+au BufNewFile,BufRead *.or			setf openroad
+
+" OPL
+au BufNewFile,BufRead *.[Oo][Pp][Ll]		setf opl
+
+" Oracle config file
+au BufNewFile,BufRead *.ora			setf ora
+
+" Packet filter conf
+au BufNewFile,BufRead pf.conf			setf pf
+
+" Pacman Config (close enough to dosini)
+au BufNewFile,BufRead */etc/pacman.conf		setf dosini
+
+" Pacman hooks
+au BufNewFile,BufRead *.hook
+	\ if getline(1) == '[Trigger]' |
+	\   setf dosini |
+	\ endif
+
+" Pam conf
+au BufNewFile,BufRead */etc/pam.conf			setf pamconf
+
+" Pam environment
+au BufNewFile,BufRead pam_env.conf,.pam_environment	setf pamenv
+
+" PApp
+au BufNewFile,BufRead *.papp,*.pxml,*.pxsl	setf papp
+
+" Password file
+au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
+
+" Pascal (also *.p)
+au BufNewFile,BufRead *.pas,*.pp		setf pascal
+
+" Delphi or Lazarus program file
+au BufNewFile,BufRead *.dpr,*.lpr		setf pascal
+
+" PDF
+au BufNewFile,BufRead *.pdf			setf pdf
+
+" PCMK - HAE - crm configure edit
+au BufNewFile,BufRead *.pcmk			setf pcmk
+
+" Perl
+if has("fname_case")
+  au BufNewFile,BufRead *.pl,*.PL		call dist#ft#FTpl()
+else
+  au BufNewFile,BufRead *.pl			call dist#ft#FTpl()
+endif
+au BufNewFile,BufRead *.plx,*.al,*.psgi		setf perl
+au BufNewFile,BufRead *.p6,*.pm6,*.pl6		setf perl6
+au BufNewFile,BufRead *.raku,*.rakumod		setf perl6
+
+" Perl, XPM or XPM2
+au BufNewFile,BufRead *.pm
+	\ if getline(1) =~ "XPM2" |
+	\   setf xpm2 |
+	\ elseif getline(1) =~ "XPM" |
+	\   setf xpm |
+	\ else |
+	\   setf perl |
+	\ endif
+
+" Perl POD
+au BufNewFile,BufRead *.pod			setf pod
+au BufNewFile,BufRead *.pod6			setf pod6
+
+" Php, php3, php4, etc.
+" Also Phtml (was used for PHP 2 in the past)
+" Also .ctp for Cake template file
+au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp	setf php
+
+" PHP config
+au BufNewFile,BufRead php.ini-*			setf dosini
+
+" Pike and Cmod
+au BufNewFile,BufRead *.pike,*.pmod		setf pike
+au BufNewFile,BufRead *.cmod			setf cmod
+
+" Pinfo config
+au BufNewFile,BufRead */etc/pinforc,*/.pinforc	setf pinfo
+
+" Palm Resource compiler
+au BufNewFile,BufRead *.rcp			setf pilrc
+
+" Pine config
+au BufNewFile,BufRead .pinerc,pinerc,.pinercex,pinercex		setf pine
+
+" Pipenv Pipfiles
+au BufNewFile,BufRead Pipfile			setf config
+au BufNewFile,BufRead Pipfile.lock		setf json
+
+" PL/1, PL/I
+au BufNewFile,BufRead *.pli,*.pl1		setf pli
+
+" PL/M (also: *.inp)
+au BufNewFile,BufRead *.plm,*.p36,*.pac		setf plm
+
+" PL/SQL
+au BufNewFile,BufRead *.pls,*.plsql		setf plsql
+
+" PLP
+au BufNewFile,BufRead *.plp			setf plp
+
+" PO and PO template (GNU gettext)
+au BufNewFile,BufRead *.po,*.pot		setf po
+
+" Postfix main config
+au BufNewFile,BufRead main.cf			setf pfmain
+
+" PostScript (+ font files, encapsulated PostScript, Adobe Illustrator)
+au BufNewFile,BufRead *.ps,*.pfa,*.afm,*.eps,*.epsf,*.epsi,*.ai	  setf postscr
+
+" PostScript Printer Description
+au BufNewFile,BufRead *.ppd			setf ppd
+
+" Povray
+au BufNewFile,BufRead *.pov			setf pov
+
+" Povray configuration
+au BufNewFile,BufRead .povrayrc			setf povini
+
+" Povray, PHP or assembly
+au BufNewFile,BufRead *.inc			call dist#ft#FTinc()
+
+" Printcap and Termcap
+au BufNewFile,BufRead *printcap
+	\ let b:ptcap_type = "print" | setf ptcap
+au BufNewFile,BufRead *termcap
+	\ let b:ptcap_type = "term" | setf ptcap
+
+" PCCTS / ANTRL
+"au BufNewFile,BufRead *.g			setf antrl
+au BufNewFile,BufRead *.g			setf pccts
+
+" PPWizard
+au BufNewFile,BufRead *.it,*.ih			setf ppwiz
+
+" Obj 3D file format
+" TODO: is there a way to avoid MS-Windows Object files?
+au BufNewFile,BufRead *.obj			setf obj
+
+" Oracle Pro*C/C++
+au BufNewFile,BufRead *.pc			setf proc
+
+" Privoxy actions file
+au BufNewFile,BufRead *.action			setf privoxy
+
+" Procmail
+au BufNewFile,BufRead .procmail,.procmailrc	setf procmail
+
+" Progress or CWEB
+au BufNewFile,BufRead *.w			call dist#ft#FTprogress_cweb()
+
+" Progress or assembly
+au BufNewFile,BufRead *.i			call dist#ft#FTprogress_asm()
+
+" Progress or Pascal
+au BufNewFile,BufRead *.p			call dist#ft#FTprogress_pascal()
+
+" Software Distributor Product Specification File (POSIX 1387.2-1995)
+au BufNewFile,BufRead *.psf			setf psf
+au BufNewFile,BufRead INDEX,INFO
+	\ if getline(1) =~ '^\s*\(distribution\|installed_software\|root\|bundle\|product\)\s*$' |
+	\   setf psf |
+	\ endif
+
+" Prolog
+au BufNewFile,BufRead *.pdb			setf prolog
+
+" Promela
+au BufNewFile,BufRead *.pml			setf promela
+
+" Google protocol buffers
+au BufNewFile,BufRead *.proto			setf proto
+
+" Protocols
+au BufNewFile,BufRead */etc/protocols		setf protocols
+
+" Pyrex
+au BufNewFile,BufRead *.pyx,*.pxd		setf pyrex
+
+" Python, Python Shell Startup and Python Stub Files
+" Quixote (Python-based web framework)
+au BufNewFile,BufRead *.py,*.pyw,.pythonstartup,.pythonrc  setf python
+au BufNewFile,BufRead *.ptl,*.pyi,SConstruct		   setf python
+
+" Radiance
+au BufNewFile,BufRead *.rad,*.mat		setf radiance
+
+" Ratpoison config/command files
+au BufNewFile,BufRead .ratpoisonrc,ratpoisonrc	setf ratpoison
+
+" RCS file
+au BufNewFile,BufRead *\,v			setf rcs
+
+" Readline
+au BufNewFile,BufRead .inputrc,inputrc		setf readline
+
+" Registry for MS-Windows
+au BufNewFile,BufRead *.reg
+	\ if getline(1) =~? '^REGEDIT[0-9]*\s*$\|^Windows Registry Editor Version \d*\.\d*\s*$' | setf registry | endif
+
+" Renderman Interface Bytestream
+au BufNewFile,BufRead *.rib			setf rib
+
+" Rego Policy Language
+au BufNewFile,BufRead *.rego			setf rego
+
+" Rexx
+au BufNewFile,BufRead *.rex,*.orx,*.rxo,*.rxj,*.jrexx,*.rexxj,*.rexx,*.testGroup,*.testUnit	setf rexx
+
+" R (Splus)
+if has("fname_case")
+  au BufNewFile,BufRead *.s,*.S			setf r
+else
+  au BufNewFile,BufRead *.s			setf r
+endif
+
+" R Help file
+if has("fname_case")
+  au BufNewFile,BufRead *.rd,*.Rd		setf rhelp
+else
+  au BufNewFile,BufRead *.rd			setf rhelp
+endif
+
+" R noweb file
+if has("fname_case")
+  au BufNewFile,BufRead *.Rnw,*.rnw,*.Snw,*.snw		setf rnoweb
+else
+  au BufNewFile,BufRead *.rnw,*.snw			setf rnoweb
+endif
+
+" R Markdown file
+if has("fname_case")
+  au BufNewFile,BufRead *.Rmd,*.rmd,*.Smd,*.smd		setf rmd
+else
+  au BufNewFile,BufRead *.rmd,*.smd			setf rmd
+endif
+
+" R reStructuredText file
+if has("fname_case")
+  au BufNewFile,BufRead *.Rrst,*.rrst,*.Srst,*.srst	setf rrst
+else
+  au BufNewFile,BufRead *.rrst,*.srst			setf rrst
+endif
+
+" Rexx, Rebol or R
+au BufNewFile,BufRead *.r,*.R				call dist#ft#FTr()
+
+" Remind
+au BufNewFile,BufRead .reminders,*.remind,*.rem		setf remind
+
+" Resolv.conf
+au BufNewFile,BufRead resolv.conf		setf resolv
+
+" Relax NG Compact
+au BufNewFile,BufRead *.rnc			setf rnc
+
+" Relax NG XML
+au BufNewFile,BufRead *.rng			setf rng
+
+" RPL/2
+au BufNewFile,BufRead *.rpl			setf rpl
+
+" Robots.txt
+au BufNewFile,BufRead robots.txt		setf robots
+
+" Rpcgen
+au BufNewFile,BufRead *.x			setf rpcgen
+
+" reStructuredText Documentation Format
+au BufNewFile,BufRead *.rst			setf rst
+
+" RTF
+au BufNewFile,BufRead *.rtf			setf rtf
+
+" Interactive Ruby shell
+au BufNewFile,BufRead .irbrc,irbrc		setf ruby
+
+" Ruby
+au BufNewFile,BufRead *.rb,*.rbw		setf ruby
+
+" RubyGems
+au BufNewFile,BufRead *.gemspec			setf ruby
+
+" Rust
+au BufNewFile,BufRead *.rs			setf rust
+
+" Rackup
+au BufNewFile,BufRead *.ru			setf ruby
+
+" Bundler
+au BufNewFile,BufRead Gemfile			setf ruby
+
+" Ruby on Rails
+au BufNewFile,BufRead *.builder,*.rxml,*.rjs	setf ruby
+
+" Rantfile and Rakefile is like Ruby
+au BufNewFile,BufRead [rR]antfile,*.rant,[rR]akefile,*.rake	setf ruby
+
+" S-lang (or shader language, or SmallLisp)
+au BufNewFile,BufRead *.sl			setf slang
+
+" Samba config
+au BufNewFile,BufRead smb.conf			setf samba
+
+" SAS script
+au BufNewFile,BufRead *.sas			setf sas
+
+" Sass
+au BufNewFile,BufRead *.sass			setf sass
+
+" Sather
+au BufNewFile,BufRead *.sa			setf sather
+
+" Scala
+au BufNewFile,BufRead *.scala			setf scala
+
+" SBT - Scala Build Tool
+au BufNewFile,BufRead *.sbt			setf sbt
+
+" Scilab
+au BufNewFile,BufRead *.sci,*.sce		setf scilab
+
+" SCSS
+au BufNewFile,BufRead *.scss			setf scss
+
+" SD: Streaming Descriptors
+au BufNewFile,BufRead *.sd			setf sd
+
+" SDL
+au BufNewFile,BufRead *.sdl,*.pr		setf sdl
+
+" sed
+au BufNewFile,BufRead *.sed			setf sed
+
+" Sieve (RFC 3028, 5228)
+au BufNewFile,BufRead *.siv,*.sieve		setf sieve
+
+" Sendmail
+au BufNewFile,BufRead sendmail.cf		setf sm
+
+" Sendmail .mc files are actually m4.  Could also be MS Message text file.
+au BufNewFile,BufRead *.mc			call dist#ft#McSetf()
+
+" Services
+au BufNewFile,BufRead */etc/services		setf services
+
+" Service Location config
+au BufNewFile,BufRead */etc/slp.conf		setf slpconf
+
+" Service Location registration
+au BufNewFile,BufRead */etc/slp.reg		setf slpreg
+
+" Service Location SPI
+au BufNewFile,BufRead */etc/slp.spi		setf slpspi
+
+" Setserial config
+au BufNewFile,BufRead */etc/serial.conf		setf setserial
+
+" SGML
+au BufNewFile,BufRead *.sgm,*.sgml
+	\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'linuxdoc' |
+	\   setf sgmllnx |
+	\ elseif getline(1) =~ '<!DOCTYPE.*DocBook' || getline(2) =~ '<!DOCTYPE.*DocBook' |
+	\   let b:docbk_type = "sgml" |
+	\   let b:docbk_ver = 4 |
+	\   setf docbk |
+	\ else |
+	\   setf sgml |
+	\ endif
+
+" SGMLDECL
+au BufNewFile,BufRead *.decl,*.dcl,*.dec
+	\ if getline(1).getline(2).getline(3) =~? '^<!SGML' |
+	\    setf sgmldecl |
+	\ endif
+
+" SGML catalog file
+au BufNewFile,BufRead catalog			setf catalog
+
+" Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc.
+" Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts
+" NOTE: Patterns ending in a star are further down, these have lower priority.
+au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD call dist#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .kshrc,*.ksh call dist#ft#SetFileTypeSH("ksh")
+au BufNewFile,BufRead */etc/profile,.profile,*.sh,*.env call dist#ft#SetFileTypeSH(getline(1))
+
+
+" Shell script (Arch Linux) or PHP file (Drupal)
+au BufNewFile,BufRead *.install
+	\ if getline(1) =~ '<?php' |
+	\   setf php |
+	\ else |
+	\   call dist#ft#SetFileTypeSH("bash") |
+	\ endif
+
+" tcsh scripts (patterns ending in a star further below)
+au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login	call dist#ft#SetFileTypeShell("tcsh")
+
+" csh scripts, but might also be tcsh scripts (on some systems csh is tcsh)
+" (patterns ending in a start further below)
+au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias  call dist#ft#CSH()
+
+" Z-Shell script (patterns ending in a star further below)
+au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks  setf zsh
+au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump setf zsh
+au BufNewFile,BufRead *.zsh			setf zsh
+
+" Scheme
+au BufNewFile,BufRead *.scm,*.ss,*.rkt		setf scheme
+
+" Screen RC
+au BufNewFile,BufRead .screenrc,screenrc	setf screen
+
+" Simula
+au BufNewFile,BufRead *.sim			setf simula
+
+" SINDA
+au BufNewFile,BufRead *.sin,*.s85		setf sinda
+
+" SiSU
+au BufNewFile,BufRead *.sst,*.ssm,*.ssi,*.-sst,*._sst setf sisu
+au BufNewFile,BufRead *.sst.meta,*.-sst.meta,*._sst.meta setf sisu
+
+" SKILL
+au BufNewFile,BufRead *.il,*.ils,*.cdf		setf skill
+
+" SLRN
+au BufNewFile,BufRead .slrnrc			setf slrnrc
+au BufNewFile,BufRead *.score			setf slrnsc
+
+" Smalltalk (and TeX)
+au BufNewFile,BufRead *.st			setf st
+au BufNewFile,BufRead *.cls
+	\ if getline(1) =~ '^%' |
+	\  setf tex |
+	\ elseif getline(1)[0] == '#' && getline(1) =~ 'rexx' |
+	\  setf rexx |
+	\ else |
+	\  setf st |
+	\ endif
+
+" Smarty templates
+au BufNewFile,BufRead *.tpl			setf smarty
+
+" SMIL or XML
+au BufNewFile,BufRead *.smil
+	\ if getline(1) =~ '<?\s*xml.*?>' |
+	\   setf xml |
+	\ else |
+	\   setf smil |
+	\ endif
+
+" SMIL or SNMP MIB file
+au BufNewFile,BufRead *.smi
+	\ if getline(1) =~ '\<smil\>' |
+	\   setf smil |
+	\ else |
+	\   setf mib |
+	\ endif
+
+" SMITH
+au BufNewFile,BufRead *.smt,*.smith		setf smith
+
+" Snobol4 and spitbol
+au BufNewFile,BufRead *.sno,*.spt		setf snobol4
+
+" SNMP MIB files
+au BufNewFile,BufRead *.mib,*.my		setf mib
+
+" Snort Configuration
+au BufNewFile,BufRead *.hog,snort.conf,vision.conf	setf hog
+au BufNewFile,BufRead *.rules			call dist#ft#FTRules()
+
+" Spec (Linux RPM)
+au BufNewFile,BufRead *.spec			setf spec
+
+" Speedup (AspenTech plant simulator)
+au BufNewFile,BufRead *.speedup,*.spdata,*.spd	setf spup
+
+" Slice
+au BufNewFile,BufRead *.ice			setf slice
+
+" Spice
+au BufNewFile,BufRead *.sp,*.spice		setf spice
+
+" Spyce
+au BufNewFile,BufRead *.spy,*.spi		setf spyce
+
+" Squid
+au BufNewFile,BufRead squid.conf		setf squid
+
+" SQL for Oracle Designer
+au BufNewFile,BufRead *.tyb,*.typ,*.tyc,*.pkb,*.pks	setf sql
+
+" SQL
+au BufNewFile,BufRead *.sql			call dist#ft#SQL()
+
+" SQLJ
+au BufNewFile,BufRead *.sqlj			setf sqlj
+
+" SQR
+au BufNewFile,BufRead *.sqr,*.sqi		setf sqr
+
+" OpenSSH configuration
+au BufNewFile,BufRead ssh_config,*/.ssh/config		setf sshconfig
+au BufNewFile,BufRead */etc/ssh/ssh_config.d/*.conf	setf sshconfig
+
+" OpenSSH server configuration
+au BufNewFile,BufRead sshd_config			setf sshdconfig
+au BufNewFile,BufRead */etc/ssh/sshd_config.d/*.conf	setf sshdconfig
+
+" Stata
+au BufNewFile,BufRead *.ado,*.do,*.imata,*.mata	setf stata
+" Also *.class, but not when it's a Java bytecode file
+au BufNewFile,BufRead *.class
+	\ if getline(1) !~ "^\xca\xfe\xba\xbe" | setf stata | endif
+
+" SMCL
+au BufNewFile,BufRead *.hlp,*.ihlp,*.smcl	setf smcl
+
+" Stored Procedures
+au BufNewFile,BufRead *.stp			setf stp
+
+" Standard ML
+au BufNewFile,BufRead *.sml			setf sml
+
+" Sratus VOS command macro
+au BufNewFile,BufRead *.cm			setf voscm
+
+" Swift
+au BufNewFile,BufRead *.swift			setf swift
+au BufNewFile,BufRead *.swift.gyb		setf swiftgyb
+
+" Swift Intermediate Language
+au BufNewFile,BufRead *.sil			setf sil
+
+" Sysctl
+au BufNewFile,BufRead */etc/sysctl.conf,*/etc/sysctl.d/*.conf	setf sysctl
+
+" Systemd unit files
+au BufNewFile,BufRead */systemd/*.{automount,dnssd,link,mount,netdev,network,nspawn,path,service,slice,socket,swap,target,timer}	setf systemd
+" Systemd overrides
+au BufNewFile,BufRead */etc/systemd/*.conf.d/*.conf	setf systemd
+au BufNewFile,BufRead */etc/systemd/system/*.d/*.conf	setf systemd
+au BufNewFile,BufRead */.config/systemd/user/*.d/*.conf	setf systemd
+" Systemd temp files
+au BufNewFile,BufRead */etc/systemd/system/*.d/.#*	setf systemd
+au BufNewFile,BufRead */etc/systemd/system/.#*		setf systemd
+au BufNewFile,BufRead */.config/systemd/user/*.d/.#*	setf systemd
+au BufNewFile,BufRead */.config/systemd/user/.#*	setf systemd
+
+" Synopsys Design Constraints
+au BufNewFile,BufRead *.sdc			setf sdc
+
+" Sudoers
+au BufNewFile,BufRead */etc/sudoers,sudoers.tmp	setf sudoers
+
+" SVG (Scalable Vector Graphics)
+au BufNewFile,BufRead *.svg			setf svg
+
+" Tads (or Nroff or Perl test file)
+au BufNewFile,BufRead *.t
+	\ if !dist#ft#FTnroff() && !dist#ft#FTperl() | setf tads | endif
+
+" Tags
+au BufNewFile,BufRead tags			setf tags
+
+" TAK
+au BufNewFile,BufRead *.tak			setf tak
+
+" Task
+au BufRead,BufNewFile {pending,completed,undo}.data  setf taskdata
+au BufRead,BufNewFile *.task			setf taskedit
+
+" Tcl (JACL too)
+au BufNewFile,BufRead *.tcl,*.tk,*.itcl,*.itk,*.jacl	setf tcl
+
+" TealInfo
+au BufNewFile,BufRead *.tli			setf tli
+
+" Telix Salt
+au BufNewFile,BufRead *.slt			setf tsalt
+
+" Tera Term Language
+au BufRead,BufNewFile *.ttl			setf teraterm
+
+" Terminfo
+au BufNewFile,BufRead *.ti			setf terminfo
+
+" TeX
+au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl	setf tex
+au BufNewFile,BufRead *.tex			call dist#ft#FTtex()
+
+" ConTeXt
+au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi   setf context
+
+" Texinfo
+au BufNewFile,BufRead *.texinfo,*.texi,*.txi	setf texinfo
+
+" TeX configuration
+au BufNewFile,BufRead texmf.cnf			setf texmf
+
+" Tidy config
+au BufNewFile,BufRead .tidyrc,tidyrc,tidy.conf	setf tidy
+
+" TF mud client
+au BufNewFile,BufRead *.tf,.tfrc,tfrc		setf tf
+
+" tmux configuration
+au BufNewFile,BufRead {.,}tmux*.conf		setf tmux
+
+" TPP - Text Presentation Program
+au BufNewFile,BufReadPost *.tpp			setf tpp
+
+" Treetop
+au BufRead,BufNewFile *.treetop			setf treetop
+
+" Trustees
+au BufNewFile,BufRead trustees.conf		setf trustees
+
+" TSS - Geometry
+au BufNewFile,BufReadPost *.tssgm		setf tssgm
+
+" TSS - Optics
+au BufNewFile,BufReadPost *.tssop		setf tssop
+
+" TSS - Command Line (temporary)
+au BufNewFile,BufReadPost *.tsscl		setf tsscl
+
+" TWIG files
+au BufNewFile,BufReadPost *.twig		setf twig
+
+" Typescript
+au BufNewFile,BufReadPost *.ts			setf typescript
+
+" TypeScript with React
+au BufNewFile,BufRead *.tsx			setf typescriptreact
+
+" Motif UIT/UIL files
+au BufNewFile,BufRead *.uit,*.uil		setf uil
+
+" Udev conf
+au BufNewFile,BufRead */etc/udev/udev.conf	setf udevconf
+
+" Udev permissions
+au BufNewFile,BufRead */etc/udev/permissions.d/*.permissions setf udevperm
+"
+" Udev symlinks config
+au BufNewFile,BufRead */etc/udev/cdsymlinks.conf	setf sh
+
+" UnrealScript
+au BufNewFile,BufRead *.uc			setf uc
+
+" Updatedb
+au BufNewFile,BufRead */etc/updatedb.conf	setf updatedb
+
+" Upstart (init(8)) config files
+au BufNewFile,BufRead */usr/share/upstart/*.conf	       setf upstart
+au BufNewFile,BufRead */usr/share/upstart/*.override	       setf upstart
+au BufNewFile,BufRead */etc/init/*.conf,*/etc/init/*.override  setf upstart
+au BufNewFile,BufRead */.init/*.conf,*/.init/*.override	       setf upstart
+au BufNewFile,BufRead */.config/upstart/*.conf		       setf upstart
+au BufNewFile,BufRead */.config/upstart/*.override	       setf upstart
+
+" Vera
+au BufNewFile,BufRead *.vr,*.vri,*.vrh		setf vera
+
+" Verilog HDL
+au BufNewFile,BufRead *.v			setf verilog
+
+" Verilog-AMS HDL
+au BufNewFile,BufRead *.va,*.vams		setf verilogams
+
+" SystemVerilog
+au BufNewFile,BufRead *.sv,*.svh		setf systemverilog
+
+" VHDL
+au BufNewFile,BufRead *.hdl,*.vhd,*.vhdl,*.vbe,*.vst,*.vho  setf vhdl
+
+" Vim script
+au BufNewFile,BufRead *.vim,*.vba,.exrc,_exrc	setf vim
+
+" Viminfo file
+au BufNewFile,BufRead .viminfo,_viminfo		setf viminfo
+
+" Virata Config Script File or Drupal module
+au BufRead,BufNewFile *.hw,*.module,*.pkg
+	\ if getline(1) =~ '<?php' |
+	\   setf php |
+	\ else |
+	\   setf virata |
+	\ endif
+
+" Visual Basic (also uses *.bas) or FORM
+au BufNewFile,BufRead *.frm			call dist#ft#FTVB("form")
+
+" SaxBasic is close to Visual Basic
+au BufNewFile,BufRead *.sba			setf vb
+
+" Vgrindefs file
+au BufNewFile,BufRead vgrindefs			setf vgrindefs
+
+" VRML V1.0c
+au BufNewFile,BufRead *.wrl			setf vrml
+
+" Vroom (vim testing and executable documentation)
+au BufNewFile,BufRead *.vroom			setf vroom
+
+" Vue.js Single File Component
+au BufNewFile,BufRead *.vue			setf vue
+
+" WebAssembly
+au BufNewFile,BufRead *.wast,*.wat		setf wast
+
+" Webmacro
+au BufNewFile,BufRead *.wm			setf webmacro
+
+" Wget config
+au BufNewFile,BufRead .wgetrc,wgetrc		setf wget
+
+" Website MetaLanguage
+au BufNewFile,BufRead *.wml			setf wml
+
+" Winbatch
+au BufNewFile,BufRead *.wbt			setf winbatch
+
+" WSML
+au BufNewFile,BufRead *.wsml			setf wsml
+
+" WPL
+au BufNewFile,BufRead *.wpl			setf xml
+
+" WvDial
+au BufNewFile,BufRead wvdial.conf,.wvdialrc	setf wvdial
+
+" CVS RC file
+au BufNewFile,BufRead .cvsrc			setf cvsrc
+
+" CVS commit file
+au BufNewFile,BufRead cvs\d\+			setf cvs
+
+" WEB (*.web is also used for Winbatch: Guess, based on expecting "%" comment
+" lines in a WEB file).
+au BufNewFile,BufRead *.web
+	\ if getline(1)[0].getline(2)[0].getline(3)[0].getline(4)[0].getline(5)[0] =~ "%" |
+	\   setf web |
+	\ else |
+	\   setf winbatch |
+	\ endif
+
+" Windows Scripting Host and Windows Script Component
+au BufNewFile,BufRead *.ws[fc]			setf wsh
+
+" XHTML
+au BufNewFile,BufRead *.xhtml,*.xht		setf xhtml
+
+" X Pixmap (dynamically sets colors, use BufEnter to make it work better)
+au BufEnter *.xpm
+	\ if getline(1) =~ "XPM2" |
+	\   setf xpm2 |
+	\ else |
+	\   setf xpm |
+	\ endif
+au BufEnter *.xpm2				setf xpm2
+
+" XFree86 config
+au BufNewFile,BufRead XF86Config
+	\ if getline(1) =~ '\<XConfigurator\>' |
+	\   let b:xf86conf_xfree86_version = 3 |
+	\ endif |
+	\ setf xf86conf
+au BufNewFile,BufRead */xorg.conf.d/*.conf
+	\ let b:xf86conf_xfree86_version = 4 |
+	\ setf xf86conf
+
+" Xorg config
+au BufNewFile,BufRead xorg.conf,xorg.conf-4	let b:xf86conf_xfree86_version = 4 | setf xf86conf
+
+" Xinetd conf
+au BufNewFile,BufRead */etc/xinetd.conf		setf xinetd
+
+" XS Perl extension interface language
+au BufNewFile,BufRead *.xs			setf xs
+
+" X resources file
+au BufNewFile,BufRead .Xdefaults,.Xpdefaults,.Xresources,xdm-config,*.ad setf xdefaults
+
+" Xmath
+au BufNewFile,BufRead *.msc,*.msf		setf xmath
+au BufNewFile,BufRead *.ms
+	\ if !dist#ft#FTnroff() | setf xmath | endif
+
+" XML  specific variants: docbk and xbl
+au BufNewFile,BufRead *.xml			call dist#ft#FTxml()
+
+" XMI (holding UML models) is also XML
+au BufNewFile,BufRead *.xmi			setf xml
+
+" CSPROJ files are Visual Studio.NET's XML-based project config files
+au BufNewFile,BufRead *.csproj,*.csproj.user	setf xml
+
+" Qt Linguist translation source and Qt User Interface Files are XML
+" However, for .ts Typescript is more common.
+au BufNewFile,BufRead *.ui			setf xml
+
+" TPM's are RDF-based descriptions of TeX packages (Nikolai Weibull)
+au BufNewFile,BufRead *.tpm			setf xml
+
+" Xdg menus
+au BufNewFile,BufRead */etc/xdg/menus/*.menu	setf xml
+
+" ATI graphics driver configuration
+au BufNewFile,BufRead fglrxrc			setf xml
+
+" Web Services Description Language (WSDL)
+au BufNewFile,BufRead *.wsdl			setf xml
+
+" XLIFF (XML Localisation Interchange File Format) is also XML
+au BufNewFile,BufRead *.xlf			setf xml
+au BufNewFile,BufRead *.xliff			setf xml
+
+" XML User Interface Language
+au BufNewFile,BufRead *.xul			setf xml
+
+" X11 xmodmap (also see below)
+au BufNewFile,BufRead *Xmodmap			setf xmodmap
+
+" Xquery
+au BufNewFile,BufRead *.xq,*.xql,*.xqm,*.xquery,*.xqy	setf xquery
+
+" XSD
+au BufNewFile,BufRead *.xsd			setf xsd
+
+" Xslt
+au BufNewFile,BufRead *.xsl,*.xslt		setf xslt
+
+" Yacc
+au BufNewFile,BufRead *.yy,*.yxx,*.y++		setf yacc
+
+" Yacc or racc
+au BufNewFile,BufRead *.y			call dist#ft#FTy()
+
+" Yaml
+au BufNewFile,BufRead *.yaml,*.yml		setf yaml
+
+" Raml
+au BufNewFile,BufRead *.raml			setf raml
+
+" yum conf (close enough to dosini)
+au BufNewFile,BufRead */etc/yum.conf		setf dosini
+
+" Zimbu
+au BufNewFile,BufRead *.zu			setf zimbu
+" Zimbu Templates
+au BufNewFile,BufRead *.zut			setf zimbutempl
+
+" Zope
+"   dtml (zope dynamic template markup language), pt (zope page template),
+"   cpt (zope form controller page template)
+au BufNewFile,BufRead *.dtml,*.pt,*.cpt		call dist#ft#FThtml()
+"   zsql (zope sql method)
+au BufNewFile,BufRead *.zsql			call dist#ft#SQL()
+
+" Z80 assembler asz80
+au BufNewFile,BufRead *.z8a			setf z8a
+
+augroup END
+
+
+" Source the user-specified filetype file, for backwards compatibility with
+" Vim 5.x.
+if exists("myfiletypefile") && filereadable(expand(myfiletypefile))
+  execute "source " . myfiletypefile
+endif
+
+
+" Check for "*" after loading myfiletypefile, so that scripts.vim is only used
+" when there are no matching file name extensions.
+" Don't do this for compressed files.
+augroup filetypedetect
+au BufNewFile,BufRead *
+	\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
+	\ | runtime! scripts.vim | endif
+au StdinReadPost * if !did_filetype() | runtime! scripts.vim | endif
+
+
+" Extra checks for when no filetype has been detected now.  Mostly used for
+" patterns that end in "*".  E.g., "zsh*" matches "zsh.vim", but that's a Vim
+" script file.
+" Most of these should call s:StarSetf() to avoid names ending in .gz and the
+" like are used.
+
+" More Apache style config files
+au BufNewFile,BufRead */etc/proftpd/*.conf*,*/etc/proftpd/conf.*/*	call s:StarSetf('apachestyle')
+au BufNewFile,BufRead proftpd.conf*					call s:StarSetf('apachestyle')
+
+" More Apache config files
+au BufNewFile,BufRead access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*	call s:StarSetf('apache')
+au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.d/*.conf*		call s:StarSetf('apache')
+
+" Asterisk config file
+au BufNewFile,BufRead *asterisk/*.conf*		call s:StarSetf('asterisk')
+au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
+
+" Bazaar version control
+au BufNewFile,BufRead bzr_log.*			setf bzr
+
+" Bazel build file
+if !has("fname_case")
+  au BufNewFile,BufRead *.BUILD,BUILD			setf bzl
+endif
+
+" BIND zone
+au BufNewFile,BufRead */named/db.*,*/bind/db.*	call s:StarSetf('bindzone')
+
+" Calendar
+au BufNewFile,BufRead */.calendar/*,
+	\*/share/calendar/*/calendar.*,*/share/calendar/calendar.*
+	\					call s:StarSetf('calendar')
+
+" Changelog
+au BufNewFile,BufRead [cC]hange[lL]og*
+	\ if getline(1) =~ '; urgency='
+	\|  call s:StarSetf('debchangelog')
+	\|else
+	\|  call s:StarSetf('changelog')
+	\|endif
+
+" Crontab
+au BufNewFile,BufRead crontab,crontab.*,*/etc/cron.d/*		call s:StarSetf('crontab')
+
+" dnsmasq(8) configuration
+au BufNewFile,BufRead */etc/dnsmasq.d/*		call s:StarSetf('dnsmasq')
+
+" Dracula
+au BufNewFile,BufRead drac.*			call s:StarSetf('dracula')
+
+" Fvwm
+au BufNewFile,BufRead */.fvwm/*			call s:StarSetf('fvwm')
+au BufNewFile,BufRead *fvwmrc*,*fvwm95*.hook
+	\ let b:fvwm_version = 1 | call s:StarSetf('fvwm')
+au BufNewFile,BufRead *fvwm2rc*
+	\ if expand("<afile>:e") == "m4"
+	\|  call s:StarSetf('fvwm2m4')
+	\|else
+	\|  let b:fvwm_version = 2 | call s:StarSetf('fvwm')
+	\|endif
+
+" Gedcom
+au BufNewFile,BufRead */tmp/lltmp*		call s:StarSetf('gedcom')
+
+" Git
+au BufNewFile,BufRead */.gitconfig.d/*,/etc/gitconfig.d/*	call s:StarSetf('gitconfig')
+
+" Gitolite
+au BufNewFile,BufRead */gitolite-admin/conf/*	call s:StarSetf('gitolite')
+
+" GTK RC
+au BufNewFile,BufRead .gtkrc*,gtkrc*		call s:StarSetf('gtkrc')
+
+" Jam
+au BufNewFile,BufRead Prl*.*,JAM*.*		call s:StarSetf('jam')
+
+" Jargon
+au! BufNewFile,BufRead *jarg*
+	\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'THIS IS THE JARGON FILE'
+	\|  call s:StarSetf('jargon')
+	\|endif
+
+" Java Properties resource file (note: doesn't catch font.properties.pl)
+au BufNewFile,BufRead *.properties_??_??_*	call s:StarSetf('jproperties')
+
+" Kconfig
+au BufNewFile,BufRead Kconfig.*			call s:StarSetf('kconfig')
+
+" Lilo: Linux loader
+au BufNewFile,BufRead lilo.conf*		call s:StarSetf('lilo')
+
+" Logcheck
+au BufNewFile,BufRead */etc/logcheck/*.d*/*	call s:StarSetf('logcheck')
+
+" Makefile
+au BufNewFile,BufRead [mM]akefile*		call s:StarSetf('make')
+
+" Ruby Makefile
+au BufNewFile,BufRead [rR]akefile*		call s:StarSetf('ruby')
+
+" Mail (also matches muttrc.vim, so this is below the other checks)
+au BufNewFile,BufRead {neo,}mutt[[:alnum:]._-]\\\{6\}	setf mail
+
+au BufNewFile,BufRead reportbug-*		call s:StarSetf('mail')
+
+" Modconf
+au BufNewFile,BufRead */etc/modutils/*
+	\ if executable(expand("<afile>")) != 1
+	\|  call s:StarSetf('modconf')
+	\|endif
+au BufNewFile,BufRead */etc/modprobe.*		call s:StarSetf('modconf')
+
+" Mutt setup file
+au BufNewFile,BufRead .mutt{ng,}rc*,*/.mutt{ng,}/mutt{ng,}rc*	call s:StarSetf('muttrc')
+au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc*		call s:StarSetf('muttrc')
+
+" Neomutt setup file
+au BufNewFile,BufRead .neomuttrc*,*/.neomutt/neomuttrc*	call s:StarSetf('neomuttrc')
+au BufNewFile,BufRead neomuttrc*,Neomuttrc*		call s:StarSetf('neomuttrc')
+
+" Nroff macros
+au BufNewFile,BufRead tmac.*			call s:StarSetf('nroff')
+
+" OpenBSD hostname.if
+au BufNewFile,BufRead /etc/hostname.*		call s:StarSetf('config')
+
+" Pam conf
+au BufNewFile,BufRead */etc/pam.d/*		call s:StarSetf('pamconf')
+
+" Printcap and Termcap
+au BufNewFile,BufRead *printcap*
+	\ if !did_filetype()
+	\|  let b:ptcap_type = "print" | call s:StarSetf('ptcap')
+	\|endif
+au BufNewFile,BufRead *termcap*
+	\ if !did_filetype()
+	\|  let b:ptcap_type = "term" | call s:StarSetf('ptcap')
+	\|endif
+
+" ReDIF
+" Only used when the .rdf file was not detected to be XML.
+au BufRead,BufNewFile *.rdf			call dist#ft#Redif()
+
+" Remind
+au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
+
+" SGML catalog file
+au BufNewFile,BufRead sgml.catalog*		call s:StarSetf('catalog')
+
+" Shell scripts ending in a star
+au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,,PKGBUILD* call dist#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .kshrc* call dist#ft#SetFileTypeSH("ksh")
+au BufNewFile,BufRead .profile* call dist#ft#SetFileTypeSH(getline(1))
+
+" tcsh scripts ending in a star
+au BufNewFile,BufRead .tcshrc*	call dist#ft#SetFileTypeShell("tcsh")
+
+" csh scripts ending in a star
+au BufNewFile,BufRead .login*,.cshrc*  call dist#ft#CSH()
+
+" VHDL
+au BufNewFile,BufRead *.vhdl_[0-9]*		call s:StarSetf('vhdl')
+
+" Vim script
+au BufNewFile,BufRead *vimrc*			call s:StarSetf('vim')
+
+" Subversion commit file
+au BufNewFile,BufRead svn-commit*.tmp		setf svn
+
+" X resources file
+au BufNewFile,BufRead Xresources*,*/app-defaults/*,*/Xresources/* call s:StarSetf('xdefaults')
+
+" XFree86 config
+au BufNewFile,BufRead XF86Config-4*
+	\ let b:xf86conf_xfree86_version = 4 | call s:StarSetf('xf86conf')
+au BufNewFile,BufRead XF86Config*
+	\ if getline(1) =~ '\<XConfigurator\>'
+	\|  let b:xf86conf_xfree86_version = 3
+	\|endif
+	\|call s:StarSetf('xf86conf')
+
+" X11 xmodmap
+au BufNewFile,BufRead *xmodmap*			call s:StarSetf('xmodmap')
+
+" Xinetd conf
+au BufNewFile,BufRead */etc/xinetd.d/*		call s:StarSetf('xinetd')
+
+" yum conf (close enough to dosini)
+au BufNewFile,BufRead */etc/yum.repos.d/*	call s:StarSetf('dosini')
+
+" Z-Shell script ending in a star
+au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump*  call s:StarSetf('zsh')
+au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
+
+
+" Plain text files, needs to be far down to not override others.  This avoids
+" the "conf" type being used if there is a line starting with '#'.
+au BufNewFile,BufRead *.text,README		setf text
+
+" Help files match *.txt but should have a last line that is a modeline.
+au BufNewFile,BufRead *.txt
+	\  if getline('$') !~ 'vim:.*ft=help'
+	\|   setf text
+	\| endif
+
+" NOTE: The above command could have ended the filetypedetect autocmd group
+" and started another one. Let's make sure it has ended to get to a consistent
+" state.
+augroup END
+
+" Generic configuration file. Use FALLBACK, it's just guessing!
+au filetypedetect BufNewFile,BufRead,StdinReadPost *
+	\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
+	\    && (getline(1) =~ '^#' || getline(2) =~ '^#' || getline(3) =~ '^#'
+	\	|| getline(4) =~ '^#' || getline(5) =~ '^#') |
+	\   setf FALLBACK conf |
+	\ endif
+
+" Restore 'cpoptions'
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/ftplugin/awk.vim b/ftplugin/awk.vim
index fbccec1cb..4425ac475 100644
--- a/ftplugin/awk.vim
+++ b/ftplugin/awk.vim
@@ -3,9 +3,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'awk') == -1
 " Vim filetype plugin
 " Language:	awk, nawk, gawk, mawk
 " Maintainer:	Antonio Colombo <azc100@gmail.com>
-" Last Change:	2017 Feb 17
+" Last Change:	2020 Sep 28
 
 " This plugin was prepared by Mark Sikora
+" This plugin was updated as proposed by Doug Kearns
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -15,8 +16,44 @@ endif
 " Don't load another plugin for this buffer
 let b:did_ftplugin = 1
 
-let b:undo_ftplugin = "setl commentstring<"
+let s:cpo_save = &cpo
+set cpo&vim
 
+setlocal comments=:#
 setlocal commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+setlocal define=function
+setlocal suffixesadd+=.awk
+
+let b:undo_ftplugin = "setl fo< com< cms< def< sua<" .
+		    \ " | unlet! b:browsefilter"
+
+" TODO: set this in scripts.vim?
+if exists("g:awk_is_gawk")
+  setlocal include=@include
+  setlocal suffixesadd+=.gawk
+  if has("unix") || has("win32unix")
+    setlocal formatprg=gawk\ -f-\ -o/dev/stdout
+    let b:undo_ftplugin .= " | setl fp<"
+  endif
+
+  let path = system("gawk 'BEGIN { printf ENVIRON[\"AWKPATH\"] }'")
+  let path = substitute(path, '^\.\=:\|:\.\=$\|:\.\=:', ',,', 'g') " POSIX cwd
+  let path = substitute(path, ':', ',', 'g')
+
+  let &l:path = path
+  let b:undo_ftplugin .= " | setl inc< path<"
+endif
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Awk Source Files (*.awk,*.gawk)\t*.awk;*.gawk\n" .
+		     \ "All Files (*.*)\t*.*\n"
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8
 
 endif
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
deleted file mode 100644
index ab74485f6..000000000
--- a/plugin/polyglot.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-if !exists("did_load_polyglot")
-  if expand("<sfile>:p") =~# '/pack/' && (exists("did_load_filetypes") || exists("did_indent_on"))
-    echohl WarningMsg
-    echo "Improper install of vim-polyglot. Please add 'packload' to .vimrc"
-    echohl None
-  end
-  filetype plugin indent on
-  syntax enable
-endif
diff --git a/scripts/build b/scripts/build
index 42ff4f3a7..8b40e5717 100755
--- a/scripts/build
+++ b/scripts/build
@@ -94,9 +94,6 @@ def load_data()
   languages = load_languages
   heuristics = load_heuristics
 
-  # Reason can have ocaml as interpreter but let's not depend on it...
-  languages["Reason"]["interpreters"] -= ["ocaml"]
-
   for package in packages
     for filetype in package["filetypes"]
       if filetype["linguist"]
@@ -584,13 +581,13 @@ def generate_ftdetect(packages, heuristics)
 
   show_warnings(all_filetypes, expected_filetypes)
 
-  ftdetect = File.read('filetype.vim')
+  ftdetect = File.read('ftdetect/polyglot.vim')
 
   starting = '" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE'
   ending = '" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE'
 
   File.write(
-    'filetype.vim',
+    'ftdetect/polyglot.vim',
     ftdetect.gsub(/(?<=#{starting}\n)(.*)(?=#{ending})/m) { output }
   )
 
diff --git a/syntax/odin.vim b/syntax/odin.vim
index 553f46125..393929e9d 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -25,6 +25,7 @@ syntax keyword odinCase case
 syntax keyword odinContinue continue
 syntax keyword odinBreak break
 syntax keyword odinSizeOf size_of
+syntax keyword odinOffsetOf offset_of
 syntax keyword odinTypeInfoOf type_info_of
 syntax keyword odinTypeIdOf typeid_of
 syntax keyword odinTypeOf type_of
@@ -102,6 +103,7 @@ highlight link odinNotIn Keyword
 highlight link odinContinue Keyword
 highlight link odinBreak Keyword
 highlight link odinSizeOf Keyword
+highlight link odinOffsetOf Keyword
 highlight link odinTypeOf Keyword
 highlight link odinTypeInfoOf Keyword
 highlight link odinTypeIdOf Keyword

From bff55a54fa8a70e664ebe8a614681dd0d92d66b6 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 2 Oct 2020 00:44:02 +0200
Subject: [PATCH 101/299] Update Vim 8 installation instructions

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 75dfdf2f8..a9af6b665 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,7 @@ Optionally download one of the [releases](https://github.com/sheerun/vim-polyglo
 You can also use Vim 8 built-in package manager:
 
 ```
-" You should put in your ~/.vimrc "packadd vim-polyglot"
-git clone --depth 1 https://github.com/sheerun/vim-polyglot ~/.vim/pack/plugins/opt/vim-polyglot
+git clone --depth 1 https://github.com/sheerun/vim-polyglot ~/.vim/pack/plugins/start/vim-polyglot
 ```
 
 NOTE: Not all features of individual language packs are available. We strip them from functionality slowing vim startup (for example we ignore `plugins` folder that is loaded regardless of file type, instead we prefer `ftplugin` which is loaded lazily).

From 94ec9c38e744241e48fb8d75ae6e8811bc73fc59 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 2 Oct 2020 03:42:03 +0200
Subject: [PATCH 102/299] Do not use ++once to support older vims, fixes #7056

---
 Makefile                      |   2 +-
 autoload/polyglot/detect.vim  |  25 +-
 autoload/polyglot/ft.vim      | 757 ++++++++++++++++++++++++++++++++++
 autoload/polyglot/shebang.vim | 406 +++++++++++++++++-
 autoload/polyglot/sleuth.vim  |   2 -
 ftdetect/polyglot.vim         | 107 ++---
 scripts/build                 |  33 +-
 7 files changed, 1251 insertions(+), 81 deletions(-)
 create mode 100644 autoload/polyglot/ft.vim

diff --git a/Makefile b/Makefile
index b21d73584..827ac66b1 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ test:
 	@ scripts/test
 
 dev:
-	@ find scripts . -type f -depth 1 | DEV=1 entr bash -c 'make && make test'
+	@ find scripts autoload/polyglot ftdetect tests . -type f -depth 1 | DEV=1 entr bash -c 'make && make test'
diff --git a/autoload/polyglot/detect.vim b/autoload/polyglot/detect.vim
index af143865e..86783cb3f 100644
--- a/autoload/polyglot/detect.vim
+++ b/autoload/polyglot/detect.vim
@@ -1,3 +1,11 @@
+" Line continuation is used here, remove 'C' from 'cpoptions'
+let s:cpo_save = &cpo
+set cpo&vim
+
+func! s:WritePostOnce(fn)
+  exe 'au! filetypedetect BufWritePost <buffer> ++once ' . a:fn
+endfunc
+
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
 func! polyglot#detect#Inp()
@@ -185,7 +193,8 @@ func! polyglot#detect#Pm()
     let &ft = g:filetype_pm | return
   endif
   if polyglot#shebang#Detect() | return | endif
-  set ft=perl | au BufWritePost <buffer> ++once call polyglot#detect#Pm()
+  setf perl
+  call s:WritePostOnce('call polyglot#detect#Pm()')
   return
 endfunc
 
@@ -207,7 +216,8 @@ func! polyglot#detect#Pl()
     let &ft = g:filetype_pl | return
   endif
   if polyglot#shebang#Detect() | return | endif
-  set ft=perl | au BufWritePost <buffer> ++once call polyglot#detect#Pl()
+  setf perl
+  call s:WritePostOnce('call polyglot#detect#Pl()')
   return
 endfunc
 
@@ -231,7 +241,8 @@ func! polyglot#detect#T()
     let &ft = g:filetype_t | return
   endif
   if polyglot#shebang#Detect() | return | endif
-  set ft=perl | au BufWritePost <buffer> ++once call polyglot#detect#T()
+  setf perl
+  call s:WritePostOnce('call polyglot#detect#T()')
   return
 endfunc
 
@@ -259,6 +270,12 @@ func! polyglot#detect#Html()
       set ft=xhtml | return
     endif
   endfor
-  set ft=html | au BufWritePost <buffer> ++once call polyglot#detect#Html()
+  setf html
+  call s:WritePostOnce('call polyglot#detect#Html()')
   return
 endfunc
+
+" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/autoload/polyglot/ft.vim b/autoload/polyglot/ft.vim
new file mode 100644
index 000000000..35812c377
--- /dev/null
+++ b/autoload/polyglot/ft.vim
@@ -0,0 +1,757 @@
+" Vim functions for file type detection
+"
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2020 Aug 17
+
+" These functions are moved here from runtime/filetype.vim to make startup
+" faster.
+
+" Line continuation is used here, remove 'C' from 'cpoptions'
+let s:cpo_save = &cpo
+set cpo&vim
+
+func polyglot#ft#Check_inp()
+  if getline(1) =~ '^\*'
+    setf abaqus
+  else
+    let n = 1
+    if line("$") > 500
+      let nmax = 500
+    else
+      let nmax = line("$")
+    endif
+    while n <= nmax
+      if getline(n) =~? "^header surface data"
+	setf trasys
+	break
+      endif
+      let n = n + 1
+    endwhile
+  endif
+endfunc
+
+" This function checks for the kind of assembly that is wanted by the user, or
+" can be detected from the first five lines of the file.
+func polyglot#ft#FTasm()
+  " make sure b:asmsyntax exists
+  if !exists("b:asmsyntax")
+    let b:asmsyntax = ""
+  endif
+
+  if b:asmsyntax == ""
+    call polyglot#ft#FTasmsyntax()
+  endif
+
+  " if b:asmsyntax still isn't set, default to asmsyntax or GNU
+  if b:asmsyntax == ""
+    if exists("g:asmsyntax")
+      let b:asmsyntax = g:asmsyntax
+    else
+      let b:asmsyntax = "asm"
+    endif
+  endif
+
+  exe "setf " . fnameescape(b:asmsyntax)
+endfunc
+
+func polyglot#ft#FTasmsyntax()
+  " see if file contains any asmsyntax=foo overrides. If so, change
+  " b:asmsyntax appropriately
+  let head = " ".getline(1)." ".getline(2)." ".getline(3)." ".getline(4).
+	\" ".getline(5)." "
+  let match = matchstr(head, '\sasmsyntax=\zs[a-zA-Z0-9]\+\ze\s')
+  if match != ''
+    let b:asmsyntax = match
+  elseif ((head =~? '\.title') || (head =~? '\.ident') || (head =~? '\.macro') || (head =~? '\.subtitle') || (head =~? '\.library'))
+    let b:asmsyntax = "vmasm"
+  endif
+endfunc
+
+" Check if one of the first five lines contains "VB_Name".  In that case it is
+" probably a Visual Basic file.  Otherwise it's assumed to be "alt" filetype.
+func polyglot#ft#FTVB(alt)
+  if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
+    setf vb
+  else
+    exe "setf " . a:alt
+  endif
+endfunc
+
+func polyglot#ft#FTbtm()
+  if exists("g:dosbatch_syntax_for_btm") && g:dosbatch_syntax_for_btm
+    setf dosbatch
+  else
+    setf btm
+  endif
+endfunc
+
+func polyglot#ft#BindzoneCheck(default)
+  if getline(1).getline(2).getline(3).getline(4) =~ '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
+    setf bindzone
+  elseif a:default != ''
+    exe 'setf ' . a:default
+  endif
+endfunc
+
+func polyglot#ft#FTlpc()
+  if exists("g:lpc_syntax_for_c")
+    let lnum = 1
+    while lnum <= 12
+      if getline(lnum) =~# '^\(//\|inherit\|private\|protected\|nosave\|string\|object\|mapping\|mixed\)'
+	setf lpc
+	return
+      endif
+      let lnum = lnum + 1
+    endwhile
+  endif
+  setf c
+endfunc
+
+func polyglot#ft#FTheader()
+  if match(getline(1, min([line("$"), 200])), '^@\(interface\|end\|class\)') > -1
+    if exists("g:c_syntax_for_h")
+      setf objc
+    else
+      setf objcpp
+    endif
+  elseif exists("g:c_syntax_for_h")
+    setf c
+  elseif exists("g:ch_syntax_for_h")
+    setf ch
+  else
+    setf cpp
+  endif
+endfunc
+
+" This function checks if one of the first ten lines start with a '@'.  In
+" that case it is probably a change file.
+" If the first line starts with # or ! it's probably a ch file.
+" If a line has "main", "include", "//" or "/*" it's probably ch.
+" Otherwise CHILL is assumed.
+func polyglot#ft#FTchange()
+  let lnum = 1
+  while lnum <= 10
+    if getline(lnum)[0] == '@'
+      setf change
+      return
+    endif
+    if lnum == 1 && (getline(1)[0] == '#' || getline(1)[0] == '!')
+      setf ch
+      return
+    endif
+    if getline(lnum) =~ "MODULE"
+      setf chill
+      return
+    endif
+    if getline(lnum) =~ 'main\s*(\|#\s*include\|//'
+      setf ch
+      return
+    endif
+    let lnum = lnum + 1
+  endwhile
+  setf chill
+endfunc
+
+func polyglot#ft#FTent()
+  " This function checks for valid cl syntax in the first five lines.
+  " Look for either an opening comment, '#', or a block start, '{".
+  " If not found, assume SGML.
+  let lnum = 1
+  while lnum < 6
+    let line = getline(lnum)
+    if line =~ '^\s*[#{]'
+      setf cl
+      return
+    elseif line !~ '^\s*$'
+      " Not a blank line, not a comment, and not a block start,
+      " so doesn't look like valid cl code.
+      break
+    endif
+    let lnum = lnum + 1
+  endw
+  setf dtd
+endfunc
+
+func polyglot#ft#EuphoriaCheck()
+  if exists('g:filetype_euphoria')
+    exe 'setf ' . g:filetype_euphoria
+  else
+    setf euphoria3
+  endif
+endfunc
+
+func polyglot#ft#DtraceCheck()
+  let lines = getline(1, min([line("$"), 100]))
+  if match(lines, '^module\>\|^import\>') > -1
+    " D files often start with a module and/or import statement.
+    setf d
+  elseif match(lines, '^#!\S\+dtrace\|#pragma\s\+D\s\+option\|:\S\{-}:\S\{-}:') > -1
+    setf dtrace
+  else
+    setf d
+  endif
+endfunc
+
+func polyglot#ft#FTe()
+  if exists('g:filetype_euphoria')
+    exe 'setf ' . g:filetype_euphoria
+  else
+    let n = 1
+    while n < 100 && n <= line("$")
+      if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$"
+	setf specman
+	return
+      endif
+      let n = n + 1
+    endwhile
+    setf eiffel
+  endif
+endfunc
+
+" Distinguish between HTML, XHTML and Django
+func polyglot#ft#FThtml()
+  let n = 1
+  while n < 10 && n <= line("$")
+    if getline(n) =~ '\<DTD\s\+XHTML\s'
+      setf xhtml
+      return
+    endif
+    if getline(n) =~ '{%\s*\(extends\|block\|load\)\>\|{#\s\+'
+      setf htmldjango
+      return
+    endif
+    let n = n + 1
+  endwhile
+  setf FALLBACK html
+endfunc
+
+" Distinguish between standard IDL and MS-IDL
+func polyglot#ft#FTidl()
+  let n = 1
+  while n < 50 && n <= line("$")
+    if getline(n) =~ '^\s*import\s\+"\(unknwn\|objidl\)\.idl"'
+      setf msidl
+      return
+    endif
+    let n = n + 1
+  endwhile
+  setf idl
+endfunc
+
+" Distinguish between "default" and Cproto prototype file. */
+func polyglot#ft#ProtoCheck(default)
+  " Cproto files have a comment in the first line and a function prototype in
+  " the second line, it always ends in ";".  Indent files may also have
+  " comments, thus we can't match comments to see the difference.
+  " IDL files can have a single ';' in the second line, require at least one
+  " chacter before the ';'.
+  if getline(2) =~ '.;$'
+    setf cpp
+  else
+    exe 'setf ' . a:default
+  endif
+endfunc
+
+func polyglot#ft#FTm()
+  let n = 1
+  let saw_comment = 0 " Whether we've seen a multiline comment leader.
+  while n < 100
+    let line = getline(n)
+    if line =~ '^\s*/\*'
+      " /* ... */ is a comment in Objective C and Murphi, so we can't conclude
+      " it's either of them yet, but track this as a hint in case we don't see
+      " anything more definitive.
+      let saw_comment = 1
+    endif
+    if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|//\)'
+      setf objc
+      return
+    endif
+    if line =~ '^\s*%'
+      setf matlab
+      return
+    endif
+    if line =~ '^\s*(\*'
+      setf mma
+      return
+    endif
+    if line =~ '^\c\s*\(\(type\|var\)\>\|--\)'
+      setf murphi
+      return
+    endif
+    let n = n + 1
+  endwhile
+
+  if saw_comment
+    " We didn't see anything definitive, but this looks like either Objective C
+    " or Murphi based on the comment leader. Assume the former as it is more
+    " common.
+    setf objc
+  elseif exists("g:filetype_m")
+    " Use user specified default filetype for .m
+    exe "setf " . g:filetype_m
+  else
+    " Default is matlab
+    setf matlab
+  endif
+endfunc
+
+func polyglot#ft#FTmms()
+  let n = 1
+  while n < 20
+    let line = getline(n)
+    if line =~ '^\s*\(%\|//\)' || line =~ '^\*'
+      setf mmix
+      return
+    endif
+    if line =~ '^\s*#'
+      setf make
+      return
+    endif
+    let n = n + 1
+  endwhile
+  setf mmix
+endfunc
+
+" This function checks if one of the first five lines start with a dot.  In
+" that case it is probably an nroff file: 'filetype' is set and 1 is returned.
+func polyglot#ft#FTnroff()
+  if getline(1)[0] . getline(2)[0] . getline(3)[0] . getline(4)[0] . getline(5)[0] =~ '\.'
+    setf nroff
+    return 1
+  endif
+  return 0
+endfunc
+
+func polyglot#ft#FTmm()
+  let n = 1
+  while n < 20
+    let line = getline(n)
+    if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)'
+      setf objcpp
+      return
+    endif
+    let n = n + 1
+  endwhile
+  setf nroff
+endfunc
+
+func polyglot#ft#FTpl()
+  if exists("g:filetype_pl")
+    exe "setf " . g:filetype_pl
+  else
+    " recognize Prolog by specific text in the first non-empty line
+    " require a blank after the '%' because Perl uses "%list" and "%translate"
+    let l = getline(nextnonblank(1))
+    if l =~ '\<prolog\>' || l =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || l =~ ':-'
+      setf prolog
+    else
+      setf perl
+    endif
+  endif
+endfunc
+
+func polyglot#ft#FTinc()
+  if exists("g:filetype_inc")
+    exe "setf " . g:filetype_inc
+  else
+    let lines = getline(1).getline(2).getline(3)
+    if lines =~? "perlscript"
+      setf aspperl
+    elseif lines =~ "<%"
+      setf aspvbs
+    elseif lines =~ "<?"
+      setf php
+    else
+      call polyglot#ft#FTasmsyntax()
+      if exists("b:asmsyntax")
+	exe "setf " . fnameescape(b:asmsyntax)
+      else
+	setf pov
+      endif
+    endif
+  endif
+endfunc
+
+func polyglot#ft#FTprogress_cweb()
+  if exists("g:filetype_w")
+    exe "setf " . g:filetype_w
+    return
+  endif
+  if getline(1) =~ '&ANALYZE' || getline(3) =~ '&GLOBAL-DEFINE'
+    setf progress
+  else
+    setf cweb
+  endif
+endfunc
+
+func polyglot#ft#FTprogress_asm()
+  if exists("g:filetype_i")
+    exe "setf " . g:filetype_i
+    return
+  endif
+  " This function checks for an assembly comment the first ten lines.
+  " If not found, assume Progress.
+  let lnum = 1
+  while lnum <= 10 && lnum < line('$')
+    let line = getline(lnum)
+    if line =~ '^\s*;' || line =~ '^\*'
+      call polyglot#ft#FTasm()
+      return
+    elseif line !~ '^\s*$' || line =~ '^/\*'
+      " Not an empty line: Doesn't look like valid assembly code.
+      " Or it looks like a Progress /* comment
+      break
+    endif
+    let lnum = lnum + 1
+  endw
+  setf progress
+endfunc
+
+func polyglot#ft#FTprogress_pascal()
+  if exists("g:filetype_p")
+    exe "setf " . g:filetype_p
+    return
+  endif
+  " This function checks for valid Pascal syntax in the first ten lines.
+  " Look for either an opening comment or a program start.
+  " If not found, assume Progress.
+  let lnum = 1
+  while lnum <= 10 && lnum < line('$')
+    let line = getline(lnum)
+    if line =~ '^\s*\(program\|unit\|procedure\|function\|const\|type\|var\)\>'
+	\ || line =~ '^\s*{' || line =~ '^\s*(\*'
+      setf pascal
+      return
+    elseif line !~ '^\s*$' || line =~ '^/\*'
+      " Not an empty line: Doesn't look like valid Pascal code.
+      " Or it looks like a Progress /* comment
+      break
+    endif
+    let lnum = lnum + 1
+  endw
+  setf progress
+endfunc
+
+func polyglot#ft#FTr()
+  let max = line("$") > 50 ? 50 : line("$")
+
+  for n in range(1, max)
+    " Rebol is easy to recognize, check for that first
+    if getline(n) =~? '\<REBOL\>'
+      setf rebol
+      return
+    endif
+  endfor
+
+  for n in range(1, max)
+    " R has # comments
+    if getline(n) =~ '^\s*#'
+      setf r
+      return
+    endif
+    " Rexx has /* comments */
+    if getline(n) =~ '^\s*/\*'
+      setf rexx
+      return
+    endif
+  endfor
+
+  " Nothing recognized, use user default or assume Rexx
+  if exists("g:filetype_r")
+    exe "setf " . g:filetype_r
+  else
+    " Rexx used to be the default, but R appears to be much more popular.
+    setf r
+  endif
+endfunc
+
+func polyglot#ft#McSetf()
+  " Rely on the file to start with a comment.
+  " MS message text files use ';', Sendmail files use '#' or 'dnl'
+  for lnum in range(1, min([line("$"), 20]))
+    let line = getline(lnum)
+    if line =~ '^\s*\(#\|dnl\)'
+      setf m4  " Sendmail .mc file
+      return
+    elseif line =~ '^\s*;'
+      setf msmessages  " MS Message text file
+      return
+    endif
+  endfor
+  setf m4  " Default: Sendmail .mc file
+endfunc
+
+" Called from filetype.vim and scripts.vim.
+func polyglot#ft#SetFileTypeSH(name)
+  if did_filetype()
+    " Filetype was already detected
+    return
+  endif
+  if expand("<amatch>") =~ g:ft_ignore_pat
+    return
+  endif
+  if a:name =~ '\<csh\>'
+    " Some .sh scripts contain #!/bin/csh.
+    call polyglot#ft#SetFileTypeShell("csh")
+    return
+  elseif a:name =~ '\<tcsh\>'
+    " Some .sh scripts contain #!/bin/tcsh.
+    call polyglot#ft#SetFileTypeShell("tcsh")
+    return
+  elseif a:name =~ '\<zsh\>'
+    " Some .sh scripts contain #!/bin/zsh.
+    call polyglot#ft#SetFileTypeShell("zsh")
+    return
+  elseif a:name =~ '\<ksh\>'
+    let b:is_kornshell = 1
+    if exists("b:is_bash")
+      unlet b:is_bash
+    endif
+    if exists("b:is_sh")
+      unlet b:is_sh
+    endif
+  elseif exists("g:bash_is_sh") || a:name =~ '\<bash\>' || a:name =~ '\<bash2\>'
+    let b:is_bash = 1
+    if exists("b:is_kornshell")
+      unlet b:is_kornshell
+    endif
+    if exists("b:is_sh")
+      unlet b:is_sh
+    endif
+  elseif a:name =~ '\<sh\>'
+    let b:is_sh = 1
+    if exists("b:is_kornshell")
+      unlet b:is_kornshell
+    endif
+    if exists("b:is_bash")
+      unlet b:is_bash
+    endif
+  endif
+  call polyglot#ft#SetFileTypeShell("sh")
+endfunc
+
+" For shell-like file types, check for an "exec" command hidden in a comment,
+" as used for Tcl.
+" Also called from scripts.vim, thus can't be local to this script.
+func polyglot#ft#SetFileTypeShell(name)
+  if did_filetype()
+    " Filetype was already detected
+    return
+  endif
+  if expand("<amatch>") =~ g:ft_ignore_pat
+    return
+  endif
+  let l = 2
+  while l < 20 && l < line("$") && getline(l) =~ '^\s*\(#\|$\)'
+    " Skip empty and comment lines.
+    let l = l + 1
+  endwhile
+  if l < line("$") && getline(l) =~ '\s*exec\s' && getline(l - 1) =~ '^\s*#.*\\$'
+    " Found an "exec" line after a comment with continuation
+    let n = substitute(getline(l),'\s*exec\s\+\([^ ]*/\)\=', '', '')
+    if n =~ '\<tclsh\|\<wish'
+      setf tcl
+      return
+    endif
+  endif
+  exe "setf " . a:name
+endfunc
+
+func polyglot#ft#CSH()
+  if did_filetype()
+    " Filetype was already detected
+    return
+  endif
+  if exists("g:filetype_csh")
+    call polyglot#ft#SetFileTypeShell(g:filetype_csh)
+  elseif &shell =~ "tcsh"
+    call polyglot#ft#SetFileTypeShell("tcsh")
+  else
+    call polyglot#ft#SetFileTypeShell("csh")
+  endif
+endfunc
+
+let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*'
+func polyglot#ft#FTRules()
+  let path = expand('<amatch>:p')
+  if path =~ '/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|\%(usr/\)\=lib/udev/\%(rules\.d/\)\=.*\.rules\)$'
+    setf udevrules
+    return
+  endif
+  if path =~ '^/etc/ufw/'
+    setf conf  " Better than hog
+    return
+  endif
+  if path =~ '^/\(etc\|usr/share\)/polkit-1/rules\.d'
+    setf javascript
+    return
+  endif
+  try
+    let config_lines = readfile('/etc/udev/udev.conf')
+  catch /^Vim\%((\a\+)\)\=:E484/
+    setf hog
+    return
+  endtry
+  let dir = expand('<amatch>:p:h')
+  for line in config_lines
+    if line =~ s:ft_rules_udev_rules_pattern
+      let udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "")
+      if dir == udev_rules
+	setf udevrules
+      endif
+      break
+    endif
+  endfor
+  setf hog
+endfunc
+
+func polyglot#ft#SQL()
+  if exists("g:filetype_sql")
+    exe "setf " . g:filetype_sql
+  else
+    setf sql
+  endif
+endfunc
+
+" If the file has an extension of 't' and is in a directory 't' or 'xt' then
+" it is almost certainly a Perl test file.
+" If the first line starts with '#' and contains 'perl' it's probably a Perl
+" file.
+" (Slow test) If a file contains a 'use' statement then it is almost certainly
+" a Perl file.
+func polyglot#ft#FTperl()
+  let dirname = expand("%:p:h:t")
+  if expand("%:e") == 't' && (dirname == 't' || dirname == 'xt')
+    setf perl
+    return 1
+  endif
+  if getline(1)[0] == '#' && getline(1) =~ 'perl'
+    setf perl
+    return 1
+  endif
+  let save_cursor = getpos('.')
+  call cursor(1,1)
+  let has_use = search('^use\s\s*\k', 'c', 30)
+  call setpos('.', save_cursor)
+  if has_use
+    setf perl
+    return 1
+  endif
+  return 0
+endfunc
+
+" Choose context, plaintex, or tex (LaTeX) based on these rules:
+" 1. Check the first line of the file for "%&<format>".
+" 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords.
+" 3. Default to "plain" or to g:tex_flavor, can be set in user's vimrc.
+func polyglot#ft#FTtex()
+  let firstline = getline(1)
+  if firstline =~ '^%&\s*\a\+'
+    let format = tolower(matchstr(firstline, '\a\+'))
+    let format = substitute(format, 'pdf', '', '')
+    if format == 'tex'
+      let format = 'latex'
+    elseif format == 'plaintex'
+      let format = 'plain'
+    endif
+  elseif expand('%') =~ 'tex/context/.*/.*.tex'
+    let format = 'context'
+  else
+    " Default value, may be changed later:
+    let format = exists("g:tex_flavor") ? g:tex_flavor : 'plain'
+    " Save position, go to the top of the file, find first non-comment line.
+    let save_cursor = getpos('.')
+    call cursor(1,1)
+    let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
+    if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
+      let lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>'
+      let cpat = 'start\a\+\|setup\a\+\|usemodule\|enablemode\|enableregime\|setvariables\|useencoding\|usesymbols\|stelle\a\+\|verwende\a\+\|stel\a\+\|gebruik\a\+\|usa\a\+\|imposta\a\+\|regle\a\+\|utilisemodule\>'
+      let kwline = search('^\s*\\\%(' . lpat . '\)\|^\s*\\\(' . cpat . '\)',
+			      \ 'cnp', firstNC + 1000)
+      if kwline == 1	" lpat matched
+	let format = 'latex'
+      elseif kwline == 2	" cpat matched
+	let format = 'context'
+      endif		" If neither matched, keep default set above.
+      " let lline = search('^\s*\\\%(' . lpat . '\)', 'cn', firstNC + 1000)
+      " let cline = search('^\s*\\\%(' . cpat . '\)', 'cn', firstNC + 1000)
+      " if cline > 0
+      "   let format = 'context'
+      " endif
+      " if lline > 0 && (cline == 0 || cline > lline)
+      "   let format = 'tex'
+      " endif
+    endif " firstNC
+    call setpos('.', save_cursor)
+  endif " firstline =~ '^%&\s*\a\+'
+
+  " Translation from formats to file types.  TODO:  add AMSTeX, RevTex, others?
+  if format == 'plain'
+    setf plaintex
+  elseif format == 'context'
+    setf context
+  else " probably LaTeX
+    setf tex
+  endif
+  return
+endfunc
+
+func polyglot#ft#FTxml()
+  let n = 1
+  while n < 100 && n <= line("$")
+    let line = getline(n)
+    " DocBook 4 or DocBook 5.
+    let is_docbook4 = line =~ '<!DOCTYPE.*DocBook'
+    let is_docbook5 = line =~ ' xmlns="http://docbook.org/ns/docbook"'
+    if is_docbook4 || is_docbook5
+      let b:docbk_type = "xml"
+      if is_docbook5
+	let b:docbk_ver = 5
+      else
+	let b:docbk_ver = 4
+      endif
+      setf docbk
+      return
+    endif
+    if line =~ 'xmlns:xbl="http://www.mozilla.org/xbl"'
+      setf xbl
+      return
+    endif
+    let n += 1
+  endwhile
+  setf xml
+endfunc
+
+func polyglot#ft#FTy()
+  let n = 1
+  while n < 100 && n <= line("$")
+    let line = getline(n)
+    if line =~ '^\s*%'
+      setf yacc
+      return
+    endif
+    if getline(n) =~ '^\s*\(#\|class\>\)' && getline(n) !~ '^\s*#\s*include'
+      setf racc
+      return
+    endif
+    let n = n + 1
+  endwhile
+  setf yacc
+endfunc
+
+func polyglot#ft#Redif()
+  let lnum = 1
+  while lnum <= 5 && lnum < line('$')
+    if getline(lnum) =~ "^\ctemplate-type:"
+      setf redif
+      return
+    endif
+    let lnum = lnum + 1
+  endwhile
+endfunc
+
+
+" Restore 'cpoptions'
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/autoload/polyglot/shebang.vim b/autoload/polyglot/shebang.vim
index 66ccacd63..62eb11a2d 100644
--- a/autoload/polyglot/shebang.vim
+++ b/autoload/polyglot/shebang.vim
@@ -1,14 +1,20 @@
+" Line continuation is used here, remove 'C' from 'cpoptions'
+let s:cpo_save = &cpo
+set cpo&vim
+
 func! polyglot#shebang#Detect()
   let ft = s:Filetype()
   if ft != ""
     let &ft = ft
+    return 1
   endif
 
-  if &ft == ""
-    runtime! scripts.vim
+  let err = polyglot#shebang#VimDetect()
+  if err == ""
+    return 1
   endif
 
-  return &ft != ""
+  return 0
 endfunc
 
 let s:r_hashbang = '^#!\s*\(\S\+\)\s*\(.*\)\s*'
@@ -58,6 +64,394 @@ func! s:Filetype()
   endfor
 endfunc
 
+func! polyglot#shebang#VimDetect()
+  let line1 = getline(1)
+
+  if line1 =~# "^#!"
+    " A script that starts with "#!".
+
+    " Check for a line like "#!/usr/bin/env {options} bash".  Turn it into
+    " "#!/usr/bin/bash" to make matching easier.
+    " Recognize only a few {options} that are commonly used.
+    if line1 =~# '^#!\s*\S*\<env\s'
+      let line1 = substitute(line1, '\S\+=\S\+', '', 'g')
+      let line1 = substitute(line1, '\(-[iS]\|--ignore-environment\|--split-string\)', '', '')
+      let line1 = substitute(line1, '\<env\s\+', '', '')
+    endif
+
+    " Get the program name.
+    " Only accept spaces in PC style path "#!c:/program files/perl [args]".
+    " If the word env is used, use the first word after the space:
+    " "#!/usr/bin/env perl [path/args]"
+    " If there is no path use the first word: "#!perl [path/args]".
+    " Otherwise get the last word after a slash: "#!/usr/bin/perl [path/args]".
+    if line1 =~# '^#!\s*\a:[/\\]'
+      let name = substitute(line1, '^#!.*[/\\]\(\i\+\).*', '\1', '')
+    elseif line1 =~# '^#!.*\<env\>'
+      let name = substitute(line1, '^#!.*\<env\>\s\+\(\i\+\).*', '\1', '')
+    elseif line1 =~# '^#!\s*[^/\\ ]*\>\([^/\\]\|$\)'
+      let name = substitute(line1, '^#!\s*\([^/\\ ]*\>\).*', '\1', '')
+    else
+      let name = substitute(line1, '^#!\s*\S*[/\\]\(\i\+\).*', '\1', '')
+    endif
+
+    " tcl scripts may have #!/bin/sh in the first line and "exec wish" in the
+    " third line.  Suggested by Steven Atkinson.
+    if getline(3) =~# '^exec wish'
+      let name = 'wish'
+    endif
+
+    " Bourne-like shell script bash bash2 ksh ksh93 sh
+    if name =~# '^\(bash\d*\|\|ksh\d*\|sh\)\>'
+      call dist#ft#SetFileTypeSH(line1)	" defined in filetype.vim
+      return
+
+      " csh scripts
+    elseif name =~# '^csh\>'
+      if exists("g:filetype_csh")
+        call dist#ft#SetFileTypeShell(g:filetype_csh)
+        return
+      else
+        call dist#ft#SetFileTypeShell("csh")
+        return
+      endif
+
+      " tcsh scripts
+    elseif name =~# '^tcsh\>'
+      call dist#ft#SetFileTypeShell("tcsh")
+      return
+
+      " Z shell scripts
+    elseif name =~# '^zsh\>'
+      set ft=zsh | return
+
+      " TCL scripts
+    elseif name =~# '^\(tclsh\|wish\|expectk\|itclsh\|itkwish\)\>'
+      set ft=tcl | return
+
+      " Expect scripts
+    elseif name =~# '^expect\>'
+      set ft=expect | return
+
+      " Gnuplot scripts
+    elseif name =~# '^gnuplot\>'
+      set ft=gnuplot | return
+
+      " Makefiles
+    elseif name =~# 'make\>'
+      set ft=make | return
+
+      " Pike
+    elseif name =~# '^pike\%(\>\|[0-9]\)'
+      set ft=pike | return
+
+      " Lua
+    elseif name =~# 'lua'
+      set ft=lua | return
+
+      " Perl 6
+    elseif name =~# 'perl6'
+      set ft=perl6 | return
+
+      " Perl
+    elseif name =~# 'perl'
+      set ft=perl | return
+
+      " PHP
+    elseif name =~# 'php'
+      set ft=php | return
+
+      " Python
+    elseif name =~# 'python'
+      set ft=python | return
+
+      " Groovy
+    elseif name =~# '^groovy\>'
+      set ft=groovy | return
+
+      " Ruby
+    elseif name =~# 'ruby'
+      set ft=ruby | return
+
+      " JavaScript
+    elseif name =~# 'node\(js\)\=\>\|js\>' || name =~# 'rhino\>'
+      set ft=javascript | return
+
+      " BC calculator
+    elseif name =~# '^bc\>'
+      set ft=bc | return
+
+      " sed
+    elseif name =~# 'sed\>'
+      set ft=sed | return
+
+      " OCaml-scripts
+    elseif name =~# 'ocaml'
+      set ft=ocaml | return
+
+      " Awk scripts; also finds "gawk"
+    elseif name =~# 'awk\>'
+      set ft=awk | return
+
+      " Website MetaLanguage
+    elseif name =~# 'wml'
+      set ft=wml | return
+
+      " Scheme scripts
+    elseif name =~# 'scheme'
+      set ft=scheme | return
+
+      " CFEngine scripts
+    elseif name =~# 'cfengine'
+      set ft=cfengine | return
+
+      " Erlang scripts
+    elseif name =~# 'escript'
+      set ft=erlang | return
+
+      " Haskell
+    elseif name =~# 'haskell'
+      set ft=haskell | return
+
+      " Scala
+    elseif name =~# 'scala\>'
+      set ft=scala | return
+
+      " Clojure
+    elseif name =~# 'clojure'
+      set ft=clojure | return
+
+    endif
+    unlet name
+
+  else
+    " File does not start with "#!".
+
+    let line2 = getline(2)
+    let line3 = getline(3)
+    let line4 = getline(4)
+    let line5 = getline(5)
+
+    " Bourne-like shell script sh ksh bash bash2
+    if line1 =~# '^:$'
+      call dist#ft#SetFileTypeSH(line1)	" defined in filetype.vim
+      return
+
+    " Z shell scripts
+    elseif line1 =~# '^#compdef\>' || line1 =~# '^#autoload\>' ||
+          \ "\n".line1."\n".line2."\n".line3."\n".line4."\n".line5 =~# '\n\s*emulate\s\+\%(-[LR]\s\+\)\=[ckz]\=sh\>'
+      set ft=zsh | return
+
+    " ELM Mail files
+    elseif line1 =~# '^From \([a-zA-Z][a-zA-Z_0-9\.=-]*\(@[^ ]*\)\=\|-\) .* \(19\|20\)\d\d$'
+      set ft=mail | return
+
+    " Mason
+    elseif line1 =~# '^<[%&].*>'
+      set ft=mason | return
+
+    " Vim scripts (must have '" vim' as the first line to trigger this)
+    elseif line1 =~# '^" *[vV]im$'
+      set ft=vim | return
+
+    " libcxx and libstdc++ standard library headers like "iostream" do not have
+    " an extension, recognize the Emacs file mode.
+    elseif line1 =~? '-\*-.*C++.*-\*-'
+      set ft=cpp | return
+
+    " MOO
+    elseif line1 =~# '^\*\* LambdaMOO Database, Format Version \%([1-3]\>\)\@!\d\+ \*\*$'
+      set ft=moo | return
+
+      " Diff file:
+      " - "diff" in first line (context diff)
+      " - "Only in " in first line
+      " - "--- " in first line and "+++ " in second line (unified diff).
+      " - "*** " in first line and "--- " in second line (context diff).
+      " - "# It was generated by makepatch " in the second line (makepatch diff).
+      " - "Index: <filename>" in the first line (CVS file)
+      " - "=== ", line of "=", "---", "+++ " (SVK diff)
+      " - "=== ", "--- ", "+++ " (bzr diff, common case)
+      " - "=== (removed|added|renamed|modified)" (bzr diff, alternative)
+      " - "# HG changeset patch" in first line (Mercurial export format)
+    elseif line1 =~# '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\>\|# It was generated by makepatch \|Index:\s\+\f\+\r\=$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\|# HG changeset patch\)'
+    \ || (line1 =~# '^--- ' && line2 =~# '^+++ ')
+    \ || (line1 =~# '^\* looking for ' && line2 =~# '^\* comparing to ')
+    \ || (line1 =~# '^\*\*\* ' && line2 =~# '^--- ')
+    \ || (line1 =~# '^=== ' && ((line2 =~# '^=\{66\}' && line3 =~# '^--- ' && line4 =~# '^+++') || (line2 =~# '^--- ' && line3 =~# '^+++ ')))
+    \ || (line1 =~# '^=== \(removed\|added\|renamed\|modified\)')
+      set ft=diff | return
+
+      " PostScript Files (must have %!PS as the first line, like a2ps output)
+    elseif line1 =~# '^%![ \t]*PS'
+      set ft=postscr | return
+
+      " M4 script Guess there is a line that starts with "dnl".
+    elseif line1 =~# '^\s*dnl\>'
+    \ || line2 =~# '^\s*dnl\>'
+    \ || line3 =~# '^\s*dnl\>'
+    \ || line4 =~# '^\s*dnl\>'
+    \ || line5 =~# '^\s*dnl\>'
+      set ft=m4 | return
+
+      " AmigaDos scripts
+    elseif $TERM == "amiga"
+    \ && (line1 =~# "^;" || line1 =~? '^\.bra')
+      set ft=amiga | return
+
+      " SiCAD scripts (must have procn or procd as the first line to trigger this)
+    elseif line1 =~? '^ *proc[nd] *$'
+      set ft=sicad | return
+
+      " Purify log files start with "****  Purify"
+    elseif line1 =~# '^\*\*\*\*  Purify'
+      set ft=purifylog | return
+
+      " XML
+    elseif line1 =~# '<?\s*xml.*?>'
+      set ft=xml | return
+
+      " XHTML (e.g.: PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN")
+    elseif line1 =~# '\<DTD\s\+XHTML\s'
+      set ft=xhtml | return
+
+      " HTML (e.g.: <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN")
+      " Avoid "doctype html", used by slim.
+    elseif line1 =~? '<!DOCTYPE\s\+html\>'
+      set ft=html | return
+
+      " PDF
+    elseif line1 =~# '^%PDF-'
+      set ft=pdf | return
+
+      " XXD output
+    elseif line1 =~# '^\x\{7}: \x\{2} \=\x\{2} \=\x\{2} \=\x\{2} '
+      set ft=xxd | return
+
+      " RCS/CVS log output
+    elseif line1 =~# '^RCS file:' || line2 =~# '^RCS file:'
+      set ft=rcslog | return
+
+      " CVS commit
+    elseif line2 =~# '^CV' || getline("$") =~# '^CV '
+      set ft=cvs | return
+
+      " Prescribe
+    elseif line1 =~# '^!R!'
+      set ft=prescribe | return
+
+      " Send-pr
+    elseif line1 =~# '^SEND-PR:'
+      set ft=sendpr | return
+
+      " SNNS files
+    elseif line1 =~# '^SNNS network definition file'
+      set ft=snnsnet | return
+    elseif line1 =~# '^SNNS pattern definition file'
+      set ft=snnspat | return
+    elseif line1 =~# '^SNNS result file'
+      set ft=snnsres | return
+
+      " Virata
+    elseif line1 =~# '^%.\{-}[Vv]irata'
+    \ || line2 =~# '^%.\{-}[Vv]irata'
+    \ || line3 =~# '^%.\{-}[Vv]irata'
+    \ || line4 =~# '^%.\{-}[Vv]irata'
+    \ || line5 =~# '^%.\{-}[Vv]irata'
+      set ft=virata | return
+
+      " Strace
+    elseif line1 =~# '[0-9:.]* *execve(' || line1 =~# '^__libc_start_main'
+      set ft=strace | return
+
+      " VSE JCL
+    elseif line1 =~# '^\* $$ JOB\>' || line1 =~# '^// *JOB\>'
+      set ft=vsejcl | return
+
+      " TAK and SINDA
+    elseif line4 =~# 'K & K  Associates' || line2 =~# 'TAK 2000'
+      set ft=takout | return
+    elseif line3 =~# 'S Y S T E M S   I M P R O V E D '
+      set ft=sindaout | return
+    elseif getline(6) =~# 'Run Date: '
+      set ft=takcmp | return
+    elseif getline(9) =~# 'Node    File  1'
+      set ft=sindacmp | return
+
+      " DNS zone files
+    elseif line1.line2.line3.line4 =~# '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
+      set ft=bindzone | return
+
+      " BAAN
+    elseif line1 =~# '|\*\{1,80}' && line2 =~# 'VRC '
+    \ || line2 =~# '|\*\{1,80}' && line3 =~# 'VRC '
+      set ft=baan | return
+
+    " Valgrind
+    elseif line1 =~# '^==\d\+== valgrind' || line3 =~# '^==\d\+== Using valgrind'
+      set ft=valgrind | return
+
+    " Go docs
+    elseif line1 =~# '^PACKAGE DOCUMENTATION$'
+      set ft=godoc | return
+
+    " Renderman Interface Bytestream
+    elseif line1 =~# '^##RenderMan'
+      set ft=rib | return
+
+    " Scheme scripts
+    elseif line1 =~# 'exec\s\+\S*scheme' || line2 =~# 'exec\s\+\S*scheme'
+      set ft=scheme | return
+
+    " Git output
+    elseif line1 =~# '^\(commit\|tree\|object\) \x\{40\}\>\|^tag \S\+$'
+      set ft=git | return
+
+     " Gprof (gnu profiler)
+     elseif line1 == 'Flat profile:'
+       \ && line2 == ''
+       \ && line3 =~# '^Each sample counts as .* seconds.$'
+       set ft=gprof | return
+
+    " Erlang terms
+    " (See also: http://www.gnu.org/software/emacs/manual/html_node/emacs/Choosing-Modes.html#Choosing-Modes)
+    elseif line1 =~? '-\*-.*erlang.*-\*-'
+      set ft=erlang | return
+
+    " YAML
+    elseif line1 =~# '^%YAML'
+      set ft=yaml | return
+
+    " CVS diff
+    else
+      let lnum = 1
+      while getline(lnum) =~# "^? " && lnum < line("$")
+        let lnum += 1
+      endwhile
+      if getline(lnum) =~# '^Index:\s\+\f\+$'
+        set ft=diff | return
+
+        " locale input file Formal Definitions of Cultural Conventions
+        " filename must be like en_US, fr_FR@euro or en_US.UTF-8
+      elseif expand("%") =~# '\a\a_\a\a\($\|[.@]\)\|i18n$\|POSIX$\|translit_'
+        let lnum = 1
+        while lnum < 100 && lnum < line("$")
+    if getline(lnum) =~# '^LC_\(IDENTIFICATION\|CTYPE\|COLLATE\|MONETARY\|NUMERIC\|TIME\|MESSAGES\|PAPER\|TELEPHONE\|MEASUREMENT\|NAME\|ADDRESS\)$'
+      setf fdcc | return
+      break
+    endif
+    let lnum += 1
+        endwhile
+      endif
+      unlet lnum
+
+    endif
+
+  endif
+
+  return 1
+endfunc
+
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
 let s:interpreters = {
@@ -71,7 +465,9 @@ let s:interpreters = {
   \ 'fish': 'fish',
   \ 'gnuplot': 'gnuplot',
   \ 'groovy': 'groovy',
+  \ 'runghc': 'haskell',
   \ 'runhaskell': 'haskell',
+  \ 'runhugs': 'haskell',
   \ 'chakra': 'javascript',
   \ 'd8': 'javascript',
   \ 'gjs': 'javascript',
@@ -131,3 +527,7 @@ let s:interpreters = {
   \ 'deno': 'typescript',
   \ 'ts-node': 'typescript',
   \ }
+" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 0c3c34e81..d74de687f 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -1,5 +1,3 @@
-" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
-
 let s:globs = {
   \ '8th': '*.8th',
   \ 'Dockerfile': '*.dockerfile,*.dock,*.Dockerfile,Dockerfile,dockerfile,Dockerfile*',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 498450d80..b3d04effe 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1006,6 +1006,7 @@ if !has_key(s:disabled_packages, '8th')
   au BufNewFile,BufRead *.8th setf 8th
 endif
 
+
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 
 au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>:e") == "" |
@@ -1245,7 +1246,7 @@ endif
 au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt	setf help
 
 " Abaqus or Trasys
-au BufNewFile,BufRead *.inp			call dist#ft#Check_inp()
+au BufNewFile,BufRead *.inp			call polyglot#ft#Check_inp()
 
 " 8th (Firth-derivative)
 au BufNewFile,BufRead *.8th			setf 8th
@@ -1351,7 +1352,7 @@ au BufNewFile,BufRead */boot/grub/menu.lst,*/boot/grub/grub.conf,*/etc/grub.conf
 
 " Assembly (all kinds)
 " *.lst is not pure assembly, it has two extra columns (address, byte codes)
-au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call dist#ft#FTasm()
+au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call polyglot#ft#FTasm()
 
 " Macro (VAX)
 au BufNewFile,BufRead *.mar			setf vmasm
@@ -1381,7 +1382,7 @@ au BufNewFile,BufRead *.awk,*.gawk		setf awk
 au BufNewFile,BufRead *.mch,*.ref,*.imp		setf b
 
 " BASIC or Visual Basic
-au BufNewFile,BufRead *.bas			call dist#ft#FTVB("basic")
+au BufNewFile,BufRead *.bas			call polyglot#ft#FTVB("basic")
 
 " Visual Basic Script (close to Visual Basic) or Visual Basic .NET
 au BufNewFile,BufRead *.vb,*.vbs,*.dsm,*.ctl	setf vb
@@ -1399,7 +1400,7 @@ au BufNewFile,BufRead *.cmd
 	\ if getline(1) =~ '^/\*' | setf rexx | else | setf dosbatch | endif
 
 " Batch file for 4DOS
-au BufNewFile,BufRead *.btm			call dist#ft#FTbtm()
+au BufNewFile,BufRead *.btm			call polyglot#ft#FTbtm()
 
 " BC calculator
 au BufNewFile,BufRead *.bc			setf bc
@@ -1419,7 +1420,7 @@ au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key	setf named
 
 " BIND zone
 au BufNewFile,BufRead named.root		setf bindzone
-au BufNewFile,BufRead *.db			call dist#ft#BindzoneCheck('')
+au BufNewFile,BufRead *.db			call polyglot#ft#BindzoneCheck('')
 
 " Blank
 au BufNewFile,BufRead *.bl			setf blank
@@ -1438,7 +1439,7 @@ if has("fname_case")
 endif
 
 " C or lpc
-au BufNewFile,BufRead *.c			call dist#ft#FTlpc()
+au BufNewFile,BufRead *.c			call polyglot#ft#FTlpc()
 au BufNewFile,BufRead *.lpc,*.ulpc		setf lpc
 
 " Calendar
@@ -1493,7 +1494,7 @@ endif
 " .h files can be C, Ch C++, ObjC or ObjC++.
 " Set c_syntax_for_h if you want C, ch_syntax_for_h if you want Ch. ObjC is
 " detected automatically.
-au BufNewFile,BufRead *.h			call dist#ft#FTheader()
+au BufNewFile,BufRead *.h			call polyglot#ft#FTheader()
 
 " Ch (CHscript)
 au BufNewFile,BufRead *.chf			setf ch
@@ -1527,7 +1528,7 @@ au BufNewFile,BufRead NEWS
 au BufNewFile,BufRead *..ch			setf chill
 
 " Changes for WEB and CWEB or CHILL
-au BufNewFile,BufRead *.ch			call dist#ft#FTchange()
+au BufNewFile,BufRead *.ch			call polyglot#ft#FTchange()
 
 " ChordPro
 au BufNewFile,BufRead *.chopro,*.crd,*.cho,*.crdpro,*.chordpro	setf chordpro
@@ -1539,7 +1540,7 @@ au BufNewFile,BufRead *.dcl,*.icl		setf clean
 au BufNewFile,BufRead *.eni			setf cl
 
 " Clever or dtd
-au BufNewFile,BufRead *.ent			call dist#ft#FTent()
+au BufNewFile,BufRead *.ent			call polyglot#ft#FTent()
 
 " Clipper (or FoxPro; could also be eviews)
 au BufNewFile,BufRead *.prg
@@ -1594,9 +1595,9 @@ au BufNewFile,BufRead *enlightenment/*.cfg	setf c
 au BufNewFile,BufRead *Eterm/*.cfg		setf eterm
 
 " Euphoria 3 or 4
-au BufNewFile,BufRead *.eu,*.ew,*.ex,*.exu,*.exw  call dist#ft#EuphoriaCheck()
+au BufNewFile,BufRead *.eu,*.ew,*.ex,*.exu,*.exw  call polyglot#ft#EuphoriaCheck()
 if has("fname_case")
-   au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW  call dist#ft#EuphoriaCheck()
+   au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW  call polyglot#ft#EuphoriaCheck()
 endif
 
 " Lynx config files
@@ -1653,7 +1654,7 @@ au BufNewFile,BufRead */etc/dnsmasq.conf	setf dnsmasq
 au BufNewFile,BufRead *.desc			setf desc
 
 " the D language or dtrace
-au BufNewFile,BufRead *.d			call dist#ft#DtraceCheck()
+au BufNewFile,BufRead *.d			call polyglot#ft#DtraceCheck()
 
 " Desktop files
 au BufNewFile,BufRead *.desktop,*.directory	setf desktop
@@ -1685,7 +1686,7 @@ au BufNewFile,BufRead *.rul
 	\ endif
 
 " DCL (Digital Command Language - vms) or DNS zone file
-au BufNewFile,BufRead *.com			call dist#ft#BindzoneCheck('dcl')
+au BufNewFile,BufRead *.com			call polyglot#ft#BindzoneCheck('dcl')
 
 " DOT
 au BufNewFile,BufRead *.dot,*.gv		setf dot
@@ -1733,7 +1734,7 @@ au BufNewFile,BufRead .editorconfig		setf dosini
 au BufNewFile,BufRead *.ecd			setf ecd
 
 " Eiffel or Specman or Euphoria
-au BufNewFile,BufRead *.e,*.E			call dist#ft#FTe()
+au BufNewFile,BufRead *.e,*.E			call polyglot#ft#FTe()
 
 " Elinks configuration
 au BufNewFile,BufRead elinks.conf		setf elinks
@@ -1911,7 +1912,7 @@ au BufRead,BufNewFile *.hws			setf hollywood
 au BufNewFile,BufRead *.t.html			setf tilde
 
 " HTML (.shtml and .stm for server side)
-au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm  call dist#ft#FThtml()
+au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm  call polyglot#ft#FThtml()
 
 " HTML with Ruby - eRuby
 au BufNewFile,BufRead *.erb,*.rhtml		setf eruby
@@ -1938,7 +1939,7 @@ au BufNewFile,BufRead *.htt,*.htb		setf httest
 au BufNewFile,BufRead *.icn			setf icon
 
 " IDL (Interface Description Language)
-au BufNewFile,BufRead *.idl			call dist#ft#FTidl()
+au BufNewFile,BufRead *.idl			call polyglot#ft#FTidl()
 
 " Microsoft IDL (Interface Description Language)  Also *.idl
 " MOF = WMI (Windows Management Instrumentation) Managed Object Format
@@ -1949,10 +1950,10 @@ au BufNewFile,BufRead */.icewm/menu		setf icemenu
 
 " Indent profile (must come before IDL *.pro!)
 au BufNewFile,BufRead .indent.pro		setf indent
-au BufNewFile,BufRead indent.pro		call dist#ft#ProtoCheck('indent')
+au BufNewFile,BufRead indent.pro		call polyglot#ft#ProtoCheck('indent')
 
 " IDL (Interactive Data Language)
-au BufNewFile,BufRead *.pro			call dist#ft#ProtoCheck('idlang')
+au BufNewFile,BufRead *.pro			call polyglot#ft#ProtoCheck('idlang')
 
 " Indent RC
 au BufNewFile,BufRead indentrc			setf indent
@@ -2172,7 +2173,7 @@ au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,*.md  setf markdown
 au BufNewFile,BufRead *.mason,*.mhtml,*.comp	setf mason
 
 " Mathematica, Matlab, Murphi or Objective C
-au BufNewFile,BufRead *.m			call dist#ft#FTm()
+au BufNewFile,BufRead *.m			call polyglot#ft#FTm()
 
 " Mathematica notebook
 au BufNewFile,BufRead *.nb			setf mma
@@ -2205,7 +2206,7 @@ au BufNewFile,BufRead *.mgl			setf mgl
 au BufNewFile,BufRead *.mix,*.mixal		setf mix
 
 " MMIX or VMS makefile
-au BufNewFile,BufRead *.mms			call dist#ft#FTmms()
+au BufNewFile,BufRead *.mms			call polyglot#ft#FTmms()
 
 " Symbian meta-makefile definition (MMP)
 au BufNewFile,BufRead *.mmp			setf mmp
@@ -2296,10 +2297,10 @@ au BufNewFile,BufRead *.me
 	\   setf nroff |
 	\ endif
 au BufNewFile,BufRead *.tr,*.nr,*.roff,*.tmac,*.mom	setf nroff
-au BufNewFile,BufRead *.[1-9]			call dist#ft#FTnroff()
+au BufNewFile,BufRead *.[1-9]			call polyglot#ft#FTnroff()
 
 " Nroff or Objective C++
-au BufNewFile,BufRead *.mm			call dist#ft#FTmm()
+au BufNewFile,BufRead *.mm			call polyglot#ft#FTmm()
 
 " Not Quite C
 au BufNewFile,BufRead *.nqc			setf nqc
@@ -2366,9 +2367,9 @@ au BufNewFile,BufRead *.pcmk			setf pcmk
 
 " Perl
 if has("fname_case")
-  au BufNewFile,BufRead *.pl,*.PL		call dist#ft#FTpl()
+  au BufNewFile,BufRead *.pl,*.PL		call polyglot#ft#FTpl()
 else
-  au BufNewFile,BufRead *.pl			call dist#ft#FTpl()
+  au BufNewFile,BufRead *.pl			call polyglot#ft#FTpl()
 endif
 au BufNewFile,BufRead *.plx,*.al,*.psgi		setf perl
 au BufNewFile,BufRead *.p6,*.pm6,*.pl6		setf perl6
@@ -2444,7 +2445,7 @@ au BufNewFile,BufRead *.pov			setf pov
 au BufNewFile,BufRead .povrayrc			setf povini
 
 " Povray, PHP or assembly
-au BufNewFile,BufRead *.inc			call dist#ft#FTinc()
+au BufNewFile,BufRead *.inc			call polyglot#ft#FTinc()
 
 " Printcap and Termcap
 au BufNewFile,BufRead *printcap
@@ -2473,13 +2474,13 @@ au BufNewFile,BufRead *.action			setf privoxy
 au BufNewFile,BufRead .procmail,.procmailrc	setf procmail
 
 " Progress or CWEB
-au BufNewFile,BufRead *.w			call dist#ft#FTprogress_cweb()
+au BufNewFile,BufRead *.w			call polyglot#ft#FTprogress_cweb()
 
 " Progress or assembly
-au BufNewFile,BufRead *.i			call dist#ft#FTprogress_asm()
+au BufNewFile,BufRead *.i			call polyglot#ft#FTprogress_asm()
 
 " Progress or Pascal
-au BufNewFile,BufRead *.p			call dist#ft#FTprogress_pascal()
+au BufNewFile,BufRead *.p			call polyglot#ft#FTprogress_pascal()
 
 " Software Distributor Product Specification File (POSIX 1387.2-1995)
 au BufNewFile,BufRead *.psf			setf psf
@@ -2569,7 +2570,7 @@ else
 endif
 
 " Rexx, Rebol or R
-au BufNewFile,BufRead *.r,*.R				call dist#ft#FTr()
+au BufNewFile,BufRead *.r,*.R				call polyglot#ft#FTr()
 
 " Remind
 au BufNewFile,BufRead .reminders,*.remind,*.rem		setf remind
@@ -2665,7 +2666,7 @@ au BufNewFile,BufRead *.siv,*.sieve		setf sieve
 au BufNewFile,BufRead sendmail.cf		setf sm
 
 " Sendmail .mc files are actually m4.  Could also be MS Message text file.
-au BufNewFile,BufRead *.mc			call dist#ft#McSetf()
+au BufNewFile,BufRead *.mc			call polyglot#ft#McSetf()
 
 " Services
 au BufNewFile,BufRead */etc/services		setf services
@@ -2706,9 +2707,9 @@ au BufNewFile,BufRead catalog			setf catalog
 " Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc.
 " Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts
 " NOTE: Patterns ending in a star are further down, these have lower priority.
-au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD call dist#ft#SetFileTypeSH("bash")
-au BufNewFile,BufRead .kshrc,*.ksh call dist#ft#SetFileTypeSH("ksh")
-au BufNewFile,BufRead */etc/profile,.profile,*.sh,*.env call dist#ft#SetFileTypeSH(getline(1))
+au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD call polyglot#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .kshrc,*.ksh call polyglot#ft#SetFileTypeSH("ksh")
+au BufNewFile,BufRead */etc/profile,.profile,*.sh,*.env call polyglot#ft#SetFileTypeSH(getline(1))
 
 
 " Shell script (Arch Linux) or PHP file (Drupal)
@@ -2716,15 +2717,15 @@ au BufNewFile,BufRead *.install
 	\ if getline(1) =~ '<?php' |
 	\   setf php |
 	\ else |
-	\   call dist#ft#SetFileTypeSH("bash") |
+	\   call polyglot#ft#SetFileTypeSH("bash") |
 	\ endif
 
 " tcsh scripts (patterns ending in a star further below)
-au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login	call dist#ft#SetFileTypeShell("tcsh")
+au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login	call polyglot#ft#SetFileTypeShell("tcsh")
 
 " csh scripts, but might also be tcsh scripts (on some systems csh is tcsh)
 " (patterns ending in a start further below)
-au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias  call dist#ft#CSH()
+au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias  call polyglot#ft#CSH()
 
 " Z-Shell script (patterns ending in a star further below)
 au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks  setf zsh
@@ -2795,7 +2796,7 @@ au BufNewFile,BufRead *.mib,*.my		setf mib
 
 " Snort Configuration
 au BufNewFile,BufRead *.hog,snort.conf,vision.conf	setf hog
-au BufNewFile,BufRead *.rules			call dist#ft#FTRules()
+au BufNewFile,BufRead *.rules			call polyglot#ft#FTRules()
 
 " Spec (Linux RPM)
 au BufNewFile,BufRead *.spec			setf spec
@@ -2819,7 +2820,7 @@ au BufNewFile,BufRead squid.conf		setf squid
 au BufNewFile,BufRead *.tyb,*.typ,*.tyc,*.pkb,*.pks	setf sql
 
 " SQL
-au BufNewFile,BufRead *.sql			call dist#ft#SQL()
+au BufNewFile,BufRead *.sql			call polyglot#ft#SQL()
 
 " SQLJ
 au BufNewFile,BufRead *.sqlj			setf sqlj
@@ -2885,8 +2886,8 @@ au BufNewFile,BufRead */etc/sudoers,sudoers.tmp	setf sudoers
 au BufNewFile,BufRead *.svg			setf svg
 
 " Tads (or Nroff or Perl test file)
-au BufNewFile,BufRead *.t
-	\ if !dist#ft#FTnroff() && !dist#ft#FTperl() | setf tads | endif
+"au BufNewFile,BufRead *.t
+"	\ if !polyglot#ft#FTnroff() && !polyglot#ft#FTperl() | setf tads | endif
 
 " Tags
 au BufNewFile,BufRead tags			setf tags
@@ -2915,7 +2916,7 @@ au BufNewFile,BufRead *.ti			setf terminfo
 
 " TeX
 au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl	setf tex
-au BufNewFile,BufRead *.tex			call dist#ft#FTtex()
+au BufNewFile,BufRead *.tex			call polyglot#ft#FTtex()
 
 " ConTeXt
 au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi   setf context
@@ -3018,7 +3019,7 @@ au BufRead,BufNewFile *.hw,*.module,*.pkg
 	\ endif
 
 " Visual Basic (also uses *.bas) or FORM
-au BufNewFile,BufRead *.frm			call dist#ft#FTVB("form")
+au BufNewFile,BufRead *.frm			call polyglot#ft#FTVB("form")
 
 " SaxBasic is close to Visual Basic
 au BufNewFile,BufRead *.sba			setf vb
@@ -3114,10 +3115,10 @@ au BufNewFile,BufRead .Xdefaults,.Xpdefaults,.Xresources,xdm-config,*.ad setf xd
 " Xmath
 au BufNewFile,BufRead *.msc,*.msf		setf xmath
 au BufNewFile,BufRead *.ms
-	\ if !dist#ft#FTnroff() | setf xmath | endif
+	\ if !polyglot#ft#FTnroff() | setf xmath | endif
 
 " XML  specific variants: docbk and xbl
-au BufNewFile,BufRead *.xml			call dist#ft#FTxml()
+au BufNewFile,BufRead *.xml			call polyglot#ft#FTxml()
 
 " XMI (holding UML models) is also XML
 au BufNewFile,BufRead *.xmi			setf xml
@@ -3164,7 +3165,7 @@ au BufNewFile,BufRead *.xsl,*.xslt		setf xslt
 au BufNewFile,BufRead *.yy,*.yxx,*.y++		setf yacc
 
 " Yacc or racc
-au BufNewFile,BufRead *.y			call dist#ft#FTy()
+au BufNewFile,BufRead *.y			call polyglot#ft#FTy()
 
 " Yaml
 au BufNewFile,BufRead *.yaml,*.yml		setf yaml
@@ -3183,9 +3184,9 @@ au BufNewFile,BufRead *.zut			setf zimbutempl
 " Zope
 "   dtml (zope dynamic template markup language), pt (zope page template),
 "   cpt (zope form controller page template)
-au BufNewFile,BufRead *.dtml,*.pt,*.cpt		call dist#ft#FThtml()
+au BufNewFile,BufRead *.dtml,*.pt,*.cpt		call polyglot#ft#FThtml()
 "   zsql (zope sql method)
-au BufNewFile,BufRead *.zsql			call dist#ft#SQL()
+au BufNewFile,BufRead *.zsql			call polyglot#ft#SQL()
 
 " Z80 assembler asz80
 au BufNewFile,BufRead *.z8a			setf z8a
@@ -3352,7 +3353,7 @@ au BufNewFile,BufRead *termcap*
 
 " ReDIF
 " Only used when the .rdf file was not detected to be XML.
-au BufRead,BufNewFile *.rdf			call dist#ft#Redif()
+au BufRead,BufNewFile *.rdf			call polyglot#ft#Redif()
 
 " Remind
 au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
@@ -3361,15 +3362,15 @@ au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
 au BufNewFile,BufRead sgml.catalog*		call s:StarSetf('catalog')
 
 " Shell scripts ending in a star
-au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,,PKGBUILD* call dist#ft#SetFileTypeSH("bash")
-au BufNewFile,BufRead .kshrc* call dist#ft#SetFileTypeSH("ksh")
-au BufNewFile,BufRead .profile* call dist#ft#SetFileTypeSH(getline(1))
+au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,,PKGBUILD* call polyglot#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .kshrc* call polyglot#ft#SetFileTypeSH("ksh")
+au BufNewFile,BufRead .profile* call polyglot#ft#SetFileTypeSH(getline(1))
 
 " tcsh scripts ending in a star
-au BufNewFile,BufRead .tcshrc*	call dist#ft#SetFileTypeShell("tcsh")
+au BufNewFile,BufRead .tcshrc*	call polyglot#ft#SetFileTypeShell("tcsh")
 
 " csh scripts ending in a star
-au BufNewFile,BufRead .login*,.cshrc*  call dist#ft#CSH()
+au BufNewFile,BufRead .login*,.cshrc*  call polyglot#ft#CSH()
 
 " VHDL
 au BufNewFile,BufRead *.vhdl_[0-9]*		call s:StarSetf('vhdl')
diff --git a/scripts/build b/scripts/build
index 8b40e5717..48ed10a14 100755
--- a/scripts/build
+++ b/scripts/build
@@ -392,7 +392,8 @@ def rule_to_code(rule)
   if rule.has_key?("filetype")
     if rule.has_key?("fallback")
       return <<~EOS
-        set ft=#{rule["filetype"]} | au BufWritePost <buffer> ++once call polyglot#detect##{camelize(rule["extensions"].first)}()
+        setf #{rule["filetype"]}
+        call s:WritePostOnce('call polyglot#detect##{camelize(rule["extensions"].first)}()')
         return
       EOS
     end
@@ -496,7 +497,7 @@ end
 def generate_ftdetect(packages, heuristics)
   FileUtils.mkdir_p('autoload/polyglot')
 
-  output = "\n"
+  output = ""
 
   all_filetypes = packages.flat_map { |f| f["filetypes"] || [] }
   filetype_names = Set.new(all_filetypes.map { |f| f["name"] })
@@ -581,17 +582,9 @@ def generate_ftdetect(packages, heuristics)
 
   show_warnings(all_filetypes, expected_filetypes)
 
-  ftdetect = File.read('ftdetect/polyglot.vim')
-
-  starting = '" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE'
-  ending = '" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE'
-
-  File.write(
-    'ftdetect/polyglot.vim',
-    ftdetect.gsub(/(?<=#{starting}\n)(.*)(?=#{ending})/m) { output }
-  )
+  inject_code('ftdetect/polyglot.vim', output)
 
-  output = ["\" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE\n"]
+  output = []
 
   for heuristic in heuristics
     output << <<~EOS
@@ -601,7 +594,7 @@ def generate_ftdetect(packages, heuristics)
     EOS
   end
 
-  File.write('autoload/polyglot/detect.vim', output.join("\n"))
+  inject_code('autoload/polyglot/detect.vim', output.join("\n"))
 
   output = <<~EOS
     let s:interpreters = {
@@ -619,9 +612,15 @@ def generate_ftdetect(packages, heuristics)
 end
 
 def inject_code(path, code)
-  header = "\" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE\n"
-  normal, generated = File.read(path).split(header)
-  File.write(path, [normal, generated].join(header))
+  source = File.read(path)
+
+  starting = '" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE'
+  ending = '" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE'
+
+  File.write(
+    path,
+    source.gsub(/(?<=#{starting}\n)(.*)(?=#{ending})/m) { "\n" + code + "\n" }
+  )
 end
 
 def generate_tests(packages)
@@ -739,8 +738,6 @@ end
 
 def generate_plugins(packages)
   output = <<~EOS
-    " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
-
     let s:globs = {
   EOS
 

From 5bd9f16476dbefc44ad23df08268d66bb938107f Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 2 Oct 2020 03:46:08 +0200
Subject: [PATCH 103/299] Disable vim-polyglot for compatible mode

---
 ftdetect/polyglot.vim | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index b3d04effe..2441272c5 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -3,6 +3,11 @@
 " Maintainer:	Adam Stankiewicz <sheerun@sher.pl>
 " URL: https://github.com/sheerun/vim-polyglot
 
+" We are not supporting non-compatible mode
+if &compatible
+  finish
+endif
+
 " Listen very carefully, I will say this only once
 if exists("did_load_polyglot")
   finish

From 073e4d44beb431e3846992d9145719d90d626a42 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 2 Oct 2020 10:39:03 +0200
Subject: [PATCH 104/299] Actually do not use ++once, fixes #573

---
 autoload/polyglot/detect.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/polyglot/detect.vim b/autoload/polyglot/detect.vim
index 86783cb3f..b630712d8 100644
--- a/autoload/polyglot/detect.vim
+++ b/autoload/polyglot/detect.vim
@@ -3,7 +3,7 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 func! s:WritePostOnce(fn)
-  exe 'au! filetypedetect BufWritePost <buffer> ++once ' . a:fn
+  exe 'au! filetypedetect BufWritePost <buffer> au! filetypedetect BufWritePost <buffer> | ' . a:fn
 endfunc
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE

From d221139bd70fd474be52237dc8e6440e6da632bd Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 4 Oct 2020 19:00:16 +0200
Subject: [PATCH 105/299] Address BufWritePost error, fixes #573

---
 autoload/polyglot/detect.vim | 20 +++--------
 ftdetect/polyglot.vim        | 67 ++++++++++++++++--------------------
 scripts/build                | 12 ++-----
 3 files changed, 36 insertions(+), 63 deletions(-)

diff --git a/autoload/polyglot/detect.vim b/autoload/polyglot/detect.vim
index b630712d8..85b9cd6a1 100644
--- a/autoload/polyglot/detect.vim
+++ b/autoload/polyglot/detect.vim
@@ -2,10 +2,6 @@
 let s:cpo_save = &cpo
 set cpo&vim
 
-func! s:WritePostOnce(fn)
-  exe 'au! filetypedetect BufWritePost <buffer> au! filetypedetect BufWritePost <buffer> | ' . a:fn
-endfunc
-
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
 func! polyglot#detect#Inp()
@@ -193,9 +189,7 @@ func! polyglot#detect#Pm()
     let &ft = g:filetype_pm | return
   endif
   if polyglot#shebang#Detect() | return | endif
-  setf perl
-  call s:WritePostOnce('call polyglot#detect#Pm()')
-  return
+  set ft=perl | return
 endfunc
 
 func! polyglot#detect#Pl()
@@ -216,9 +210,7 @@ func! polyglot#detect#Pl()
     let &ft = g:filetype_pl | return
   endif
   if polyglot#shebang#Detect() | return | endif
-  setf perl
-  call s:WritePostOnce('call polyglot#detect#Pl()')
-  return
+  set ft=perl | return
 endfunc
 
 func! polyglot#detect#T()
@@ -241,9 +233,7 @@ func! polyglot#detect#T()
     let &ft = g:filetype_t | return
   endif
   if polyglot#shebang#Detect() | return | endif
-  setf perl
-  call s:WritePostOnce('call polyglot#detect#T()')
-  return
+  set ft=perl | return
 endfunc
 
 func! polyglot#detect#Tt2()
@@ -270,9 +260,7 @@ func! polyglot#detect#Html()
       set ft=xhtml | return
     endif
   endfor
-  setf html
-  call s:WritePostOnce('call polyglot#detect#Html()')
-  return
+  set ft=html | return
 endfunc
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 2441272c5..d4a5fe550 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -126,11 +126,11 @@ if !has_key(s:disabled_packages, 'gitignore')
 endif
 
 if !has_key(s:disabled_packages, 'tads')
-  au! BufNewFile,BufRead *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
 endif
 
 if !has_key(s:disabled_packages, 'prolog')
-  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
+  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap setf prolog
 endif
 
@@ -149,7 +149,7 @@ if !has_key(s:disabled_packages, 'dosini')
 endif
 
 if !has_key(s:disabled_packages, 'visual-basic')
-  au! BufNewFile,BufRead *.bas call polyglot#detect#Bas()
+  au! BufNewFile,BufRead,BufWritePost *.bas call polyglot#detect#Bas()
   au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs setf vb
 endif
 
@@ -158,7 +158,7 @@ if !has_key(s:disabled_packages, 'basic')
 endif
 
 if !has_key(s:disabled_packages, 'trasys')
-  au! BufNewFile,BufRead *.inp call polyglot#detect#Inp()
+  au! BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
 endif
 
 if !has_key(s:disabled_packages, 'zig')
@@ -351,7 +351,7 @@ if !has_key(s:disabled_packages, 'rst')
 endif
 
 if !has_key(s:disabled_packages, 'reason')
-  au! BufNewFile,BufRead *.re call polyglot#detect#Re()
+  au! BufNewFile,BufRead,BufWritePost *.re call polyglot#detect#Re()
   au BufNewFile,BufRead *.rei setf reason
 endif
 
@@ -364,9 +364,9 @@ if !has_key(s:disabled_packages, 'raml')
 endif
 
 if !has_key(s:disabled_packages, 'raku')
-  au! BufNewFile,BufRead *.t call polyglot#detect#T()
-  au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
-  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
+  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 setf raku
 endif
 
@@ -452,10 +452,10 @@ if !has_key(s:disabled_packages, 'pgsql')
 endif
 
 if !has_key(s:disabled_packages, 'perl')
-  au! BufNewFile,BufRead *.tt2 call polyglot#detect#Tt2()
-  au! BufNewFile,BufRead *.t call polyglot#detect#T()
-  au! BufNewFile,BufRead *.pm call polyglot#detect#Pm()
-  au! BufNewFile,BufRead *.pl call polyglot#detect#Pl()
+  au! BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
+  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.xs setf xs
   au BufNewFile,BufRead *.comp,*.mason,*.mhtml setf mason
   au BufNewFile,BufRead *.pod setf pod
@@ -467,7 +467,7 @@ if !has_key(s:disabled_packages, 'opencl')
 endif
 
 if !has_key(s:disabled_packages, 'octave')
-  au! BufNewFile,BufRead *.m call polyglot#detect#M()
+  au! BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
   au BufNewFile,BufRead *.oct setf octave
 endif
 
@@ -484,8 +484,8 @@ if !has_key(s:disabled_packages, 'ocaml')
 endif
 
 if !has_key(s:disabled_packages, 'objc')
-  au! BufNewFile,BufRead *.m call polyglot#detect#M()
-  au! BufNewFile,BufRead *.h call polyglot#detect#H()
+  au! BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+  au! BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
 endif
 
 if !has_key(s:disabled_packages, 'nix')
@@ -503,7 +503,7 @@ if !has_key(s:disabled_packages, 'nginx')
 endif
 
 if !has_key(s:disabled_packages, 'murphi')
-  au! BufNewFile,BufRead *.m call polyglot#detect#M()
+  au! BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
 endif
 
 if !has_key(s:disabled_packages, 'moonscript')
@@ -524,7 +524,7 @@ if !has_key(s:disabled_packages, 'markdown')
 endif
 
 if !has_key(s:disabled_packages, 'mathematica')
-  au! BufNewFile,BufRead *.m call polyglot#detect#M()
+  au! BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
   au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt setf mma
 endif
 
@@ -615,14 +615,14 @@ if !has_key(s:disabled_packages, 'ion')
 endif
 
 if !has_key(s:disabled_packages, 'idris2')
-  au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
-  au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
+  au! BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
+  au! BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
   au BufNewFile,BufRead *.ipkg,idris-response setf idris2
 endif
 
 if !has_key(s:disabled_packages, 'idris')
-  au! BufNewFile,BufRead *.lidr call polyglot#detect#Lidr()
-  au! BufNewFile,BufRead *.idr call polyglot#detect#Idr()
+  au! BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
+  au! BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
   au BufNewFile,BufRead idris-response setf idris
 endif
 
@@ -635,7 +635,7 @@ if !has_key(s:disabled_packages, 'i3')
 endif
 
 if !has_key(s:disabled_packages, 'html5')
-  au! BufNewFile,BufRead *.html call polyglot#detect#Html()
+  au! BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
   au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
 endif
 
@@ -703,7 +703,7 @@ if !has_key(s:disabled_packages, 'gmpl')
 endif
 
 if !has_key(s:disabled_packages, 'glsl')
-  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
+  au! BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
 endif
 
@@ -720,12 +720,12 @@ if !has_key(s:disabled_packages, 'gdscript')
 endif
 
 if !has_key(s:disabled_packages, 'fsharp')
-  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
+  au! BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.fsi,*.fsx setf fsharp
 endif
 
 if !has_key(s:disabled_packages, 'forth')
-  au! BufNewFile,BufRead *.fs call polyglot#detect#Fs()
+  au! BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.ft,*.fth setf forth
 endif
 
@@ -853,12 +853,12 @@ if !has_key(s:disabled_packages, 'atlas')
 endif
 
 if !has_key(s:disabled_packages, 'aspperl')
-  au! BufNewFile,BufRead *.asp call polyglot#detect#Asp()
+  au! BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
 endif
 
 if !has_key(s:disabled_packages, 'aspvbs')
-  au! BufNewFile,BufRead *.asp call polyglot#detect#Asp()
-  au! BufNewFile,BufRead *.asa call polyglot#detect#Asa()
+  au! BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
+  au! BufNewFile,BufRead,BufWritePost *.asa call polyglot#detect#Asa()
 endif
 
 if !has_key(s:disabled_packages, 'asn')
@@ -890,7 +890,7 @@ if !has_key(s:disabled_packages, 'arduino')
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
-  au! BufNewFile,BufRead *.h call polyglot#detect#H()
+  au! BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
   au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
   au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp setf cpp
 endif
@@ -979,7 +979,7 @@ if !has_key(s:disabled_packages, 'abc')
 endif
 
 if !has_key(s:disabled_packages, 'abaqus')
-  au! BufNewFile,BufRead *.inp call polyglot#detect#Inp()
+  au! BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
 endif
 
 if !has_key(s:disabled_packages, 'abap')
@@ -3427,13 +3427,6 @@ au BufNewFile,BufRead *.txt
 " state.
 augroup END
 
-" Generic configuration file. Use FALLBACK, it's just guessing!
-au filetypedetect BufNewFile,BufRead,StdinReadPost *
-	\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
-	\    && (getline(1) =~ '^#' || getline(2) =~ '^#' || getline(3) =~ '^#'
-	\	|| getline(4) =~ '^#' || getline(5) =~ '^#') |
-	\   setf FALLBACK conf |
-	\ endif
 
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
diff --git a/scripts/build b/scripts/build
index 48ed10a14..fe07db70d 100755
--- a/scripts/build
+++ b/scripts/build
@@ -390,17 +390,9 @@ def rule_to_code(rule)
   end
 
   if rule.has_key?("filetype")
-    if rule.has_key?("fallback")
-      return <<~EOS
-        setf #{rule["filetype"]}
-        call s:WritePostOnce('call polyglot#detect##{camelize(rule["extensions"].first)}()')
-        return
-      EOS
-    end
-
     return <<~EOS
       set ft=#{rule["filetype"]} | return
-      #{indent(rule_to_code(except(rule, "filetype")), 0)}
+      #{indent(rule_to_code(except(rule, "filetype", "fallback")), 0)}
     EOS
   end
 
@@ -570,7 +562,7 @@ def generate_ftdetect(packages, heuristics)
 
     for heuristic in package_heuristics.uniq
       extensions = heuristic["extensions"].map { |e| "*.#{e}" }
-      autocommands << "  au! BufNewFile,BufRead #{extensions.join(",")} call polyglot#detect##{camelize(heuristic["extensions"].first)}()\n"
+      autocommands << "  au! BufNewFile,BufRead,BufWritePost #{extensions.join(",")} call polyglot#detect##{camelize(heuristic["extensions"].first)}()\n"
     end
 
     if autocommands != ""

From b4868c7ea7b75dd09a6d172871c901905f5d539a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 4 Oct 2020 21:17:06 +0200
Subject: [PATCH 106/299] Add comments for some extensions + test

---
 after/syntax/c.vim                  |  25 +----
 after/syntax/cpp.vim                |  59 +++++++----
 after/syntax/javascript/graphql.vim |   4 +-
 after/syntax/typescript/graphql.vim |   2 +-
 doc/pgsql.txt                       |   2 +
 ftdetect/polyglot.vim               | 150 ++++++++++------------------
 indent/graphql.vim                  |   7 ++
 packages.yaml                       |  11 ++
 scripts/build                       |  78 +++++++++------
 syntax/pgsql.vim                    |  35 ++++---
 10 files changed, 185 insertions(+), 188 deletions(-)

diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index a3db4e082..1f2821d7a 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -7,7 +7,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') ==
 "                  http://www.vim.org/scripts/script.php?script_id=3064
 " Maintainer:      bfrg <bfrg@users.noreply.github.com>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Mar 14, 2020
+" Last Change:     Oct 4, 2020
 "
 " Extended C syntax highlighting including highlighting of user-defined
 " functions.
@@ -17,7 +17,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') ==
 " ==============================================================================
 
 
-" Highlight some additional keywords in the comments
+" Highlight additional keywords in the comments
 syn keyword cTodo contained BUG NOTE
 
 
@@ -50,25 +50,4 @@ if get(g:, 'cpp_simple_highlight', 0)
     hi link cLabel        Statement
 endif
 
-
-" Operators
-" syn match cOperator "\(<<\|>>\|[-+*/%&^|<>!=]\)="
-" syn match cOperator "<<\|>>\|&&\|||\|++\|--\|->"
-" syn match cOperator "[.!~*&%<>^|=,+-]"
-" syn match cOperator "/[^/*=]"me=e-1
-" syn match cOperator "/$"
-" syn match cOperator "&&\|||"
-" syn match cOperator "[][]"
-
-" Preprocessor
-" syn keyword cDefined defined contained containedin=cDefine
-" hi def link cDefined cDefine
-
-" Delimiters
-" syn match cDelimiter "[();\\]"
-" hi def link cDelimiter Delimiter
-" foldmethod=syntax fix, courtesy of Ivan Freitas
-" syn match cBraces display "[{}]"
-" hi def link cBraces Delimiter
-
 endif
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index 91030f392..730bb819b 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -6,7 +6,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') ==
 " Original Author: Jon Haggblad <https://github.com/octol>
 " Maintainer:      bfrg <https://github.com/bfrg>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Oct 1, 2020
+" Last Change:     Oct 4, 2020
 "
 " This syntax file is based on:
 " https://github.com/octol/vim-cpp-enhanced-highlight
@@ -14,17 +14,17 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') ==
 " ==============================================================================
 
 " Standard library {{{1
-syntax keyword cppSTLconstant
+syntax keyword cppSTLdefine
         \ MB_CUR_MAX MB_LEN_MAX WCHAR_MAX WCHAR_MIN WEOF __STDC_UTF_16__ __STDC_UTF_32__
 
 syntax keyword cppSTLnamespace
         \ std experimental rel_ops
 
 syntax keyword cppSTLconstant
-        \ badbit digits digits10 eofbit failbit goodbit has_denorm has_denorm_loss has_infinity has_quiet_NaN has_signaling_NaN is_bounded is_exact is_iec559 is_integer is_modulo is_signed is_specialized max_exponent max_exponent10 min_exponent min_exponent10 nothrow npos radix round_style tinyness_before traps
+        \ badbit digits digits10 eofbit failbit goodbit has_denorm has_denorm_loss has_infinity has_quiet_NaN has_signaling_NaN is_bounded is_exact is_iec559 is_integer is_modulo is_signed is_specialized max_exponent max_exponent10 min_exponent min_exponent10 npos radix round_style tinyness_before traps
 
 syntax keyword cppSTLvariable
-        \ cerr cin clog cout wcerr wcin wclog wcout
+        \ cerr cin clog cout wcerr wcin wclog wcout nothrow
 
 syntax keyword cppSTLexception
         \ bad_alloc bad_exception bad_typeid bad_cast domain_error exception failure invalid_argument length_error logic_error out_of_range overflow_error range_error runtime_error underflow_error
@@ -36,7 +36,10 @@ syntax keyword cppSTLios
         \ boolalpha dec defaultfloat fixed hex hexfloat internal left noboolalpha noshowbase noshowpoint noshowpos noskipws nounitbuf nouppercase oct right scientific showbase showpoint showpos skipws unitbuf uppercase
 
 syntax keyword cppSTLtype
-        \ fmtflags iostate openmode Init allocator auto_ptr basic_filebuf basic_fstream basic_ifstream basic_ios basic_iostream basic_istream basic_istringstream basic_ofstream basic_ostream basic_ostringstream basic_streambuf basic_string basic_stringbuf basic_stringstream binary_compose binder1st binder2nd bitset char_traits char_type const_mem_fun1_t const_mem_fun_ref1_t const_mem_fun_ref_t const_mem_fun_t const_pointer const_reference container_type deque difference_type div_t double_t event_callback filebuf first_type float_denorm_style float_round_style float_t fpos fstream gslice_array ifstream imaxdiv_t indirect_array int_type ios ios_base iostream istream istringstream istrstream iterator_category iterator_traits key_compare key_type ldiv_t list lldiv_t map mapped_type mask_array mbstate_t mem_fun1_t mem_fun_ref1_t mem_fun_ref_t mem_fun_t multimap multiset nothrow_t numeric_limits off_type ofstream ostream ostringstream ostrstream pair pointer pointer_to_binary_function pointer_to_unary_function pos_type priority_queue queue reference second_type seekdir sequence_buffer set sig_atomic_t size_type slice_array stack state_type stream streambuf streamoff streampos streamsize string stringbuf stringstream strstream strstreambuf temporary_buffer test_type time_t tm traits_type type_info u16string u32string unary_compose unary_negate valarray value_compare value_type vector wctrans_t wctype_t wfilebuf wfstream wifstream wint_t wios wiostream wistream wistringstream wofstream wostream wostringstream wstreambuf wstreampos wstring wstringbuf wstringstream codecvt codecvt_base codecvt_byname collate collate_byname ctype ctype_base ctype_byname locale messages messages_base messages_byname money_base money_get money_put moneypunct moneypunct_byname num_get num_put numpunct numpunct_byname time_base time_get time_get_byname time_put time_put_byname binary_function binary_negate bit_and bit_not bit_or divides equal_to greater greater_equal less less_equal logical_and logical_not logical_or minus modulus multiplies negate not_equal_to plus unary_function unary_negate bidirectional_iterator_tag forward_iterator_tag input_iterator_tag output_iterator_tag random_access_iterator_tag
+        \ fmtflags iostate openmode Init allocator auto_ptr basic_filebuf basic_fstream basic_ifstream basic_ios basic_iostream basic_istream basic_istringstream basic_ofstream basic_ostream basic_ostringstream basic_streambuf basic_string basic_stringbuf basic_stringstream binary_compose binder1st binder2nd bitset char_traits char_type const_mem_fun1_t const_mem_fun_ref1_t const_mem_fun_ref_t const_mem_fun_t const_pointer const_reference container_type deque difference_type div_t event_callback filebuf first_type float_denorm_style float_round_style fpos fstream gslice_array ifstream imaxdiv_t indirect_array int_type ios ios_base iostream istream istringstream istrstream iterator_category iterator_traits key_compare key_type ldiv_t list lldiv_t map mapped_type mask_array mbstate_t mem_fun1_t mem_fun_ref1_t mem_fun_ref_t mem_fun_t multimap multiset nothrow_t numeric_limits off_type ofstream ostream ostringstream ostrstream pair pointer pointer_to_binary_function pointer_to_unary_function pos_type priority_queue queue reference second_type seekdir sequence_buffer set size_type slice_array stack state_type stream streambuf streamoff streampos streamsize string stringbuf stringstream strstream strstreambuf temporary_buffer test_type tm traits_type type_info u16string u32string unary_compose unary_negate valarray value_compare value_type vector wfilebuf wfstream wifstream wios wiostream wistream wistringstream wofstream wostream wostringstream wstreambuf wstreampos wstring wstringbuf wstringstream codecvt codecvt_base codecvt_byname collate collate_byname ctype ctype_base ctype_byname locale messages messages_base messages_byname money_base money_get money_put moneypunct moneypunct_byname num_get num_put numpunct numpunct_byname time_base time_get time_get_byname time_put time_put_byname binary_function binary_negate bit_and bit_not bit_or divides equal_to greater greater_equal less less_equal logical_and logical_not logical_or minus modulus multiplies negate not_equal_to plus unary_function unary_negate bidirectional_iterator_tag forward_iterator_tag input_iterator_tag output_iterator_tag random_access_iterator_tag
+
+syntax keyword cppSTLtypedef
+        \ time_t sig_atomic_t wctrans_t wctype_t wint_t
 
 syntax keyword cppSTLiterator
         \ back_insert_iterator bidirectional_iterator const_iterator const_reverse_iterator forward_iterator front_insert_iterator input_iterator insert_iterator istream_iterator istreambuf_iterator iterator ostream_iterator ostreambuf_iterator output_iterator random_access_iterator raw_storage_iterator reverse_bidirectional_iterator reverse_iterator
@@ -58,13 +61,18 @@ if !exists('cpp_no_cpp11')
     syntax keyword cppSTLnamespace chrono this_thread
 
     syntax keyword cppSTLtype
-            \ array atomic atomic_bool atomic_char atomic_char16_t atomic_char32_t atomic_flag atomic_int atomic_int_fast16_t atomic_int_fast32_t atomic_int_fast64_t atomic_int_fast8_t atomic_int_least16_t atomic_int_least32_t atomic_int_least64_t atomic_int_least8_t atomic_intmax_t atomic_intptr_t atomic_llong atomic_long atomic_ptrdiff_t atomic_schar atomic_short atomic_size_t atomic_uchar atomic_uint atomic_uint_fast16_t atomic_uint_fast32_t atomic_uint_fast64_t atomic_uint_fast8_t atomic_uint_least16_t atomic_uint_least32_t atomic_uint_least64_t atomic_uint_least8_t atomic_uintmax_t atomic_uintptr_t atomic_ullong atomic_ulong atomic_ushort atomic_wchar_t duration duration_values high_resolution_clock hours microseconds milliseconds minutes nanoseconds seconds steady_clock system_clock time_point treat_as_floating_point condition_variable nullptr_t max_align_t exception_ptr nested_exception hash is_bind_expression is_placeholder reference_wrapper forward_list future packaged_task promise shared_future initializer_list codecvt_mode codecvt_utf16 codecvt_utf8 codecvt_utf8_utf16 wbuffer_convert wstring_convert allocator_arg_t allocator_traits allocator_type default_delete enable_shared_from_this is_always_equal owner_less pointer_safety pointer_traits propagate_on_container_copy_assignment propagate_on_container_move_assignment propagate_on_container_swap rebind_alloc rebind_traits shared_ptr unique_ptr uses_allocator void_pointer const_void_pointer weak_ptr adopt_lock_t condition_variable_any defer_lock_t lock_guard mutex once_flag recursive_mutex recursive_timed_mutex timed_mutex try_to_lock_t unique_lock bernoulli_distribution binomial_distribution cauchy_distribution chi_squared_distribution default_random_engine discard_block_engine discrete_distribution exponential_distribution extreme_value_distribution fisher_f_distribution gamma_distribution geometric_distribution independent_bits_engine knuth_b linear_congruential_engine lognormal_distribution mersenne_twister_engine minstd_rand minstd_rand0 mt19937 mt19937_64 negative_binomial_distribution normal_distribution piecewise_constant_distribution piecewise_linear_distribution poisson_distribution random_device ranlux24 ranlux24_base ranlux48 ranlux48_base seed_seq shuffle_order_engine student_t_distribution subtract_with_carry_engine uniform_int_distribution uniform_real_distribution weibull_distribution atto centi deca deci exa femto giga hecto kilo mega micro milli nano peta pico ratio ratio_add ratio_divide ratio_equal ratio_greater ratio_greater_equal ratio_less ratio_less_equal ratio_multiply ratio_not_equal ratio_subtract tera yocto yotta zepto zetta basic_regex match_results regex_traits sub_match syntax_option_type match_flag_type error_type scoped_allocator_adaptor outer_allocator_type inner_allocator_type error_code error_condition error_category is_error_code_enum is_error_condition_enum thread tuple tuple_size tuple_element type_index add_const add_cv add_lvalue_reference add_pointer add_rvalue_reference add_volatile aligned_storage aligned_union alignment_of common_type conditional decay enable_if extent false_type has_virtual_destructor integral_constant is_abstract is_arithmetic is_array is_assignable is_base_of is_class is_compound is_const is_constructible is_convertible is_copy_assignable is_copy_constructible is_default_constructible is_destructible is_empty is_enum is_floating_point is_function is_fundamental is_integral is_literal_type is_lvalue_reference is_member_function_pointer is_member_object_pointer is_member_pointer is_move_assignable is_move_constructible is_nothrow_assignable is_nothrow_constructible is_nothrow_copy_assignable is_nothrow_copy_constructible is_nothrow_default_constructible is_nothrow_destructible is_nothrow_move_assignable is_nothrow_move_constructible is_object is_pod is_pointer is_polymorphic is_reference is_rvalue_reference is_same is_scalar is_signed is_standard_layout is_trivial is_trivially_assignable is_trivially_constructible is_trivially_copy_assignable is_trivially_copy_constructible is_trivially_copyable is_trivially_default_constructible is_trivially_destructible is_trivially_move_assignable is_trivially_move_constructible is_union is_unsigned is_void is_volatile make_signed make_unsigned rank remove_all_extents remove_const remove_cv remove_extent remove_pointer remove_reference remove_volatile result_of true_type underlying_type hasher key_equal unordered_map unordered_multimap unordered_multiset unordered_set piecewise_construct_t function
+            \ array atomic atomic_bool atomic_char atomic_flag atomic_int atomic_llong atomic_long atomic_schar atomic_short atomic_uchar atomic_uint atomic_ullong atomic_ulong atomic_ushort duration duration_values high_resolution_clock hours microseconds milliseconds minutes nanoseconds seconds steady_clock system_clock time_point treat_as_floating_point condition_variable exception_ptr nested_exception hash is_bind_expression is_placeholder reference_wrapper forward_list future packaged_task promise shared_future initializer_list codecvt_mode codecvt_utf16 codecvt_utf8 codecvt_utf8_utf16 wbuffer_convert wstring_convert allocator_traits allocator_type default_delete enable_shared_from_this is_always_equal owner_less pointer_safety pointer_traits propagate_on_container_copy_assignment propagate_on_container_move_assignment propagate_on_container_swap rebind_alloc rebind_traits shared_ptr unique_ptr uses_allocator void_pointer const_void_pointer weak_ptr condition_variable_any lock_guard mutex once_flag recursive_mutex recursive_timed_mutex timed_mutex unique_lock bernoulli_distribution binomial_distribution cauchy_distribution chi_squared_distribution default_random_engine discard_block_engine discrete_distribution exponential_distribution extreme_value_distribution fisher_f_distribution gamma_distribution geometric_distribution independent_bits_engine knuth_b linear_congruential_engine lognormal_distribution mersenne_twister_engine minstd_rand minstd_rand0 mt19937 mt19937_64 negative_binomial_distribution normal_distribution piecewise_constant_distribution piecewise_linear_distribution poisson_distribution random_device ranlux24 ranlux24_base ranlux48 ranlux48_base seed_seq shuffle_order_engine student_t_distribution subtract_with_carry_engine uniform_int_distribution uniform_real_distribution weibull_distribution atto centi deca deci exa femto giga hecto kilo mega micro milli nano peta pico ratio ratio_add ratio_divide ratio_equal ratio_greater ratio_greater_equal ratio_less ratio_less_equal ratio_multiply ratio_not_equal ratio_subtract tera yocto yotta zepto zetta basic_regex match_results regex_traits sub_match syntax_option_type match_flag_type error_type scoped_allocator_adaptor outer_allocator_type inner_allocator_type error_code error_condition error_category is_error_code_enum is_error_condition_enum thread tuple tuple_size tuple_element type_index add_const add_cv add_lvalue_reference add_pointer add_rvalue_reference add_volatile aligned_storage aligned_union alignment_of common_type conditional decay enable_if extent false_type has_virtual_destructor integral_constant is_abstract is_arithmetic is_array is_assignable is_base_of is_class is_compound is_const is_constructible is_convertible is_copy_assignable is_copy_constructible is_default_constructible is_destructible is_empty is_enum is_floating_point is_function is_fundamental is_integral is_literal_type is_lvalue_reference is_member_function_pointer is_member_object_pointer is_member_pointer is_move_assignable is_move_constructible is_nothrow_assignable is_nothrow_constructible is_nothrow_copy_assignable is_nothrow_copy_constructible is_nothrow_default_constructible is_nothrow_destructible is_nothrow_move_assignable is_nothrow_move_constructible is_object is_pod is_pointer is_polymorphic is_reference is_rvalue_reference is_same is_scalar is_signed is_standard_layout is_trivial is_trivially_assignable is_trivially_constructible is_trivially_copy_assignable is_trivially_copy_constructible is_trivially_copyable is_trivially_default_constructible is_trivially_destructible is_trivially_move_assignable is_trivially_move_constructible is_union is_unsigned is_void is_volatile make_signed make_unsigned rank remove_all_extents remove_const remove_cv remove_extent remove_pointer remove_reference remove_volatile result_of true_type underlying_type hasher key_equal unordered_map unordered_multimap unordered_multiset unordered_set function
 
-    syntax keyword cppSTLconstant
-            \ _1 _2 _3 _4 _5 _6 _7 _8 _9 max_digits10 allocator_arg defer_lock try_to_lock adopt_lock math_errhandling
+    syntax keyword cppSTLtypedef
+            \ atomic_char16_t atomic_char32_t atomic_int_fast16_t atomic_int_fast32_t atomic_int_fast64_t atomic_int_fast8_t atomic_int_least16_t atomic_int_least32_t atomic_int_least64_t atomic_int_least8_t atomic_intmax_t atomic_intptr_t atomic_ptrdiff_t atomic_size_t atomic_uint_fast16_t atomic_uint_fast32_t atomic_uint_fast64_t atomic_uint_fast8_t atomic_uint_least16_t atomic_uint_least32_t atomic_uint_least64_t atomic_uint_least8_t atomic_uintmax_t atomic_uintptr_t atomic_wchar_t nullptr_t max_align_t allocator_arg_t adopt_lock_t defer_lock_t try_to_lock_t piecewise_construct_t
 
-    syntax keyword cppSTLconstant
-            \ FLT_EVAL_METHOD FP_INFINITE FP_NAN FP_NORMAL FP_SUBNORMAL FP_ZERO HUGE_VALF HUGE_VALL INFINITY MATH_ERREXCEPT MATH_ERRNO NAN
+    syntax keyword cppSTLconstant max_digits10
+
+    syntax keyword cppSTLvariable
+            \ _1 _2 _3 _4 _5 _6 _7 _8 _9 defer_lock try_to_lock adopt_lock allocator_arg
+
+    syntax keyword cppSTLdefine
+            \ math_errhandling FLT_EVAL_METHOD FP_INFINITE FP_NAN FP_NORMAL FP_SUBNORMAL FP_ZERO HUGE_VALF HUGE_VALL INFINITY MATH_ERREXCEPT MATH_ERRNO NAN
 
     syntax keyword cppSTLenum
             \ memory_order future_status future_errc launch io_errc cv_status errc
@@ -79,8 +87,8 @@ if !exists('cpp_no_cpp11')
     syntax keyword cppSTLiterator
             \ move_iterator regex_iterator regex_token_iterator const_local_iterator local_iterator
 
-    " Note: ignore is also a function (could also be put under cppSTLvariable)
-    syntax match cppSTLconstant "\<ignore\>(\@!"
+    " Note: ignore is also a function
+    syntax match cppSTLvariable "\<ignore\>(\@!"
 endif
 
 
@@ -91,7 +99,10 @@ if !exists('cpp_no_cpp14')
     syntax keyword cppSTLfunction make_unique
 
     syntax keyword cppSTLtype
-            \ index_sequence index_sequence_for integer_sequence make_index_sequence make_integer_sequence shared_lock shared_timed_mutex tuple_element_t add_const_t add_cv_t add_lvalue_reference_t add_pointer_t add_rvalue_reference_t add_volatile_t aligned_storage_t aligned_union_t common_type_t conditional_t decay_t enable_if_t is_null_pointer make_signed_t make_unsigned_t remove_all_extents_t remove_const_t remove_cv_t remove_extent_t remove_pointer_t remove_reference_t remove_volatile_t result_of_t underlying_type_t
+            \ index_sequence index_sequence_for integer_sequence make_index_sequence make_integer_sequence shared_lock shared_timed_mutex is_null_pointer
+
+    syntax keyword cppSTLtypedef
+            \ tuple_element_t add_const_t add_cv_t add_lvalue_reference_t add_pointer_t add_rvalue_reference_t add_volatile_t aligned_storage_t aligned_union_t common_type_t conditional_t decay_t enable_if_t make_signed_t make_unsigned_t remove_all_extents_t remove_const_t remove_cv_t remove_extent_t remove_pointer_t remove_reference_t remove_volatile_t result_of_t underlying_type_t
 endif
 
 
@@ -100,7 +111,10 @@ if !exists('cpp_no_cpp17')
     syntax keyword cppSTLnamespace filesystem execution
 
     syntax keyword cppSTLtype
-            \ any is_execution_policy parallel_policy parallel_unsequenced_policy sequenced_policy directory_entry directory_iterator file_status file_time_type path recursive_directory_iterator space_info default_order default_order_t default_searcher boyer_moore_searcher boyer_moore_horspool_searcher memory_resource monotonic_buffer_resource polymorphic_allocator pool_options synchronized_pool_resource unsynchronized_pool_resource scoped_lock optional nullopt_t shared_mutex basic_string_view string_view u16string_view u32string_view wstring_view bool_constant conjunction disjunction has_unique_object_representations invoke_result invoke_result_t is_aggregate is_callable is_invocable is_invocable_r is_nothrow_invocable is_nothrow_invocable_r is_nothrow_swappable is_nothrow_swappable_with is_nowthrow_callable is_swappable is_swappable_with negation void_t node_type insert_return_type in_place_tag in_place_t in_place_type_t in_place_index_t monostate variant variant_size variant_alternative variant_alternative_t
+            \ any is_execution_policy parallel_policy parallel_unsequenced_policy sequenced_policy directory_entry directory_iterator file_status file_time_type path recursive_directory_iterator space_info default_order default_searcher boyer_moore_searcher boyer_moore_horspool_searcher memory_resource monotonic_buffer_resource polymorphic_allocator pool_options synchronized_pool_resource unsynchronized_pool_resource scoped_lock optional shared_mutex basic_string_view string_view u16string_view u32string_view wstring_view bool_constant conjunction disjunction has_unique_object_representations invoke_result is_aggregate is_callable is_invocable is_invocable_r is_nothrow_invocable is_nothrow_invocable_r is_nothrow_swappable is_nothrow_swappable_with is_nowthrow_callable is_swappable is_swappable_with negation node_type insert_return_type in_place_tag monostate variant variant_size variant_alternative
+
+    syntax keyword cppSTLtypedef
+            \ invoke_result_t default_order_t nullopt_t void_t in_place_t in_place_type_t in_place_index_t variant_alternative_t
 
     syntax keyword cppSTLexception
             \ bad_any_cast filesystem_error bad_optional_access bad_variant_access
@@ -120,12 +134,12 @@ if !exists('cpp_no_cpp17')
     " Note: There is std::filesystem::path::format and std::format() in <format>
     syntax match cppSTLenum "\<format\>(\@!"
 
+    " Note: these can be both member objects and methods
+    syntax match cppSTLvariable "\<\%(capacity\|free\|available\)\>(\@!"
+
     " Note: these keywords are very likely to coincide with user-defined variables
     " syntax keyword cppSTLconstant
     "         \ all mask unknown replace add remove nofollow none not_found regular directory symlink block character fifo socket unknown
-
-    " Note: these are also functions
-    " syntax keyword cppSTLconstant capacity free available
 endif
 
 
@@ -136,7 +150,10 @@ if !exists('cpp_no_cpp20')
     syntax keyword cppSTLvariable default_sentinel unreachable_sentinel
 
     syntax keyword cppSTLtype
-            \ atomic_ref endian weak_ordering strong_ordering partial_ordering weak_equality strong_equality common_comparison_category common_comparison_category_t contract_violation coroutine_traits coroutine_handle noop_coroutine_handle noop_coroutine_promise suspend_never suspend_always remove_cvref remove_cvref_t is_bounded_array is_layout_compatible is_unbounded_array is_nothrow_convertible has_strong_structural_equality is_pointer_interconvertible_base_of unwrap_reference unwrap_reference_t unwrap_ref_decay unwrap_ref_decay_t basic_common_reference common_reference common_reference_t iterator_t sentinel_t dangling safe_iterator_t safe_subrange_t ref_view filter_view transform_view iota_view join_view empty_view single_view split_view common_view reverse_view view_interface span basic_syncbuf basic_osyncstream syncbuf wsyncbuf osyncstream wosyncstream jthread latch barrier stop_token stop_source stop_callback counting_semaphore binary_semaphore source_location compare_three_way_result compare_three_way_result_t contiguous_iterator_tag incrementable_traits iter_value_t iter_reference_t iter_difference_t iter_rvalue_reference_t iter_common_reference_t indirectly_readable_traits move_sentinel default_sentinel_t unreachable_sentinel_t common_iterator counted_iterator indirect_result_t projected type_identity type_identity_t
+            \ atomic_ref endian weak_ordering strong_ordering partial_ordering weak_equality strong_equality common_comparison_category contract_violation coroutine_traits coroutine_handle noop_coroutine_handle noop_coroutine_promise suspend_never suspend_always remove_cvref is_bounded_array is_layout_compatible is_unbounded_array is_nothrow_convertible has_strong_structural_equality is_pointer_interconvertible_base_of unwrap_reference unwrap_ref_decay basic_common_reference common_reference dangling ref_view filter_view transform_view iota_view join_view empty_view single_view split_view common_view reverse_view view_interface span basic_syncbuf basic_osyncstream syncbuf wsyncbuf osyncstream wosyncstream jthread latch barrier stop_token stop_source stop_callback counting_semaphore binary_semaphore source_location compare_three_way_result contiguous_iterator_tag incrementable_traits indirectly_readable_traits move_sentinel common_iterator counted_iterator projected type_identity
+
+    syntax keyword cppSTLtypedef
+            \ common_comparison_category_t remove_cvref_t unwrap_reference_t unwrap_ref_decay_t common_reference_t iterator_t sentinel_t safe_iterator_t safe_subrange_t compare_three_way_result_t iter_value_t iter_reference_t iter_difference_t iter_rvalue_reference_t iter_common_reference_t default_sentinel_t unreachable_sentinel_t indirect_result_t type_identity_t
 
     syntax keyword cppSTLfunction
             \ make_unique_default_init make_shared_default_init allocate_shared_default_init uses_allocator_construction_args make_obj_using_allocator is_corresponding_member subspan in_range is_pointer_interconvertible_with_class
@@ -161,11 +178,13 @@ endif
 hi def link cppSTLbool         Boolean
 hi def link cppStatement       Statement
 hi def link cppSTLfunction     Function
+hi def link cppSTLdefine       Constant
 hi def link cppSTLconstant     Constant
 hi def link cppSTLnamespace    Constant
-hi def link cppSTLtype         Type
 hi def link cppSTLexception    Type
-hi def link cppSTLiterator     Typedef
+hi def link cppSTLiterator     Type
+hi def link cppSTLtype         Type
+hi def link cppSTLtypedef      Typedef
 hi def link cppSTLenum         Typedef
 hi def link cppSTLios          Function
 hi def link cppSTLconcept      Typedef
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index f085a301a..22557862d 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -36,7 +36,7 @@ let s:tags = '\%(' . join(graphql#javascript_tags(), '\|') . '\)'
 
 if graphql#has_syntax_group('jsTemplateExpression')
   " pangloss/vim-javascript
-  exec 'syntax region graphqlTemplateString start=+' . s:tags . '\@20<=`+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,jsTemplateExpression,jsSpecial extend'
+  exec 'syntax region graphqlTemplateString matchgroup=jsTemplateString start=+' . s:tags . '\@20<=`+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,jsTemplateExpression,jsSpecial extend'
   exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlTemplateString'
   syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=jsTemplateExpression containedin=graphqlFold keepend
 
@@ -48,7 +48,7 @@ if graphql#has_syntax_group('jsTemplateExpression')
   syn cluster graphqlTaggedTemplate add=graphqlTemplateString
 elseif graphql#has_syntax_group('javaScriptStringT')
   " runtime/syntax/javascript.vim
-  exec 'syntax region graphqlTemplateString start=+' . s:tags . '\@20<=`+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,javaScriptSpecial,javaScriptEmbed,@htmlPreproc extend'
+  exec 'syntax region graphqlTemplateString matchgroup=javaScriptStringT start=+' . s:tags . '\@20<=`+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,javaScriptSpecial,javaScriptEmbed,@htmlPreproc extend'
   exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlTemplateString'
   syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=@javaScriptEmbededExpr containedin=graphqlFold keepend
 
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index 30075e6de..5dd01e284 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -34,7 +34,7 @@ endif
 
 let s:tags = '\%(' . join(graphql#javascript_tags(), '\|') . '\)'
 
-exec 'syntax region graphqlTemplateString start=+' . s:tags . '\@20<=`+ skip=+\\`+ end=+`+ contains=@GraphQLSyntax,typescriptTemplateSubstitution extend'
+exec 'syntax region graphqlTemplateString matchgroup=typescriptTemplate start=+' . s:tags . '\@20<=`+ skip=+\\`+ end=+`+ contains=@GraphQLSyntax,typescriptTemplateSubstitution extend'
 exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlTemplateString'
 
 " Support expression interpolation ((${...})) inside template strings.
diff --git a/doc/pgsql.txt b/doc/pgsql.txt
index 7ccd03d04..2d2de6ed8 100644
--- a/doc/pgsql.txt
+++ b/doc/pgsql.txt
@@ -53,6 +53,8 @@ Text enclosed between `$anyword$` pairs, where `anyword` is any non-empty
 sequence of word characters different from those with a special meaning (such
 as `$pgsql$`) is treated as a multi-line string.
 
+When |foldmethod| is set to "syntax", SQL commands can be folded.
+
 Finally, the plugin supports syntax highlighting of arbitrary languages within
 procedure and function blocks. This feature needs to be configured: see
 |g:pgsql_pl|.
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index d4a5fe550..1e079217b 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -162,8 +162,8 @@ if !has_key(s:disabled_packages, 'trasys')
 endif
 
 if !has_key(s:disabled_packages, 'zig')
-  au BufNewFile,BufRead *.zig,*.zir setf zig
   au BufNewFile,BufRead *.zir setf zir
+  au BufNewFile,BufRead *.zig,*.zir setf zig
 endif
 
 if !has_key(s:disabled_packages, 'zephir')
@@ -225,13 +225,13 @@ if !has_key(s:disabled_packages, 'unison')
 endif
 
 if !has_key(s:disabled_packages, 'typescript')
-  au BufNewFile,BufRead *.tsx setf typescriptreact
   au BufNewFile,BufRead *.ts setf typescript
+  au BufNewFile,BufRead *.tsx setf typescriptreact
 endif
 
 if !has_key(s:disabled_packages, 'twig')
-  au BufNewFile,BufRead *.xml.twig setf xml.twig
   au BufNewFile,BufRead *.twig setf html.twig
+  au BufNewFile,BufRead *.xml.twig setf xml.twig
 endif
 
 if !has_key(s:disabled_packages, 'tptp')
@@ -271,9 +271,6 @@ if !has_key(s:disabled_packages, 'swift')
   au BufNewFile,BufRead *.swift setf swift
 endif
 
-if !has_key(s:disabled_packages, 'svg-indent')
-endif
-
 if !has_key(s:disabled_packages, 'svg')
   au BufNewFile,BufRead *.svg setf svg
 endif
@@ -302,15 +299,12 @@ if !has_key(s:disabled_packages, 'slim')
   au BufNewFile,BufRead *.slim setf slim
 endif
 
-if !has_key(s:disabled_packages, 'zinit')
-endif
-
 if !has_key(s:disabled_packages, 'sh')
+  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc setf sh
   au BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
   au BufNewFile,BufRead {.,}zsh* call s:StarSetf('zsh')
   au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh')
   au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
-  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc setf sh
 endif
 
 if !has_key(s:disabled_packages, 'scss')
@@ -333,17 +327,14 @@ if !has_key(s:disabled_packages, 'brewfile')
   au BufNewFile,BufRead Brewfile setf brewfile
 endif
 
-if !has_key(s:disabled_packages, 'yard')
-endif
-
 if !has_key(s:disabled_packages, 'rspec')
   au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
 endif
 
 if !has_key(s:disabled_packages, 'ruby')
-  au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml setf eruby
   au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile setf ruby
   au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
+  au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml setf eruby
 endif
 
 if !has_key(s:disabled_packages, 'rst')
@@ -379,8 +370,8 @@ if !has_key(s:disabled_packages, 'racket')
 endif
 
 if !has_key(s:disabled_packages, 'r-lang')
-  au BufNewFile,BufRead *.rd setf rhelp
   au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist setf r
+  au BufNewFile,BufRead *.rd setf rhelp
 endif
 
 if !has_key(s:disabled_packages, 'qml')
@@ -395,12 +386,6 @@ if !has_key(s:disabled_packages, 'requirements')
   au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} setf requirements
 endif
 
-if !has_key(s:disabled_packages, 'python-compiler')
-endif
-
-if !has_key(s:disabled_packages, 'python-indent')
-endif
-
 if !has_key(s:disabled_packages, 'python')
   au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript setf python
 endif
@@ -410,8 +395,8 @@ if !has_key(s:disabled_packages, 'purescript')
 endif
 
 if !has_key(s:disabled_packages, 'puppet')
-  au BufNewFile,BufRead *.epp setf embeddedpuppet
   au BufNewFile,BufRead *.pp,Modulefile setf puppet
+  au BufNewFile,BufRead *.epp setf embeddedpuppet
 endif
 
 if !has_key(s:disabled_packages, 'pug')
@@ -423,8 +408,8 @@ if !has_key(s:disabled_packages, 'protobuf')
 endif
 
 if !has_key(s:disabled_packages, 'powershell')
-  au BufNewFile,BufRead *.ps1xml setf ps1xml
   au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc setf ps1
+  au BufNewFile,BufRead *.ps1xml setf ps1xml
 endif
 
 if !has_key(s:disabled_packages, 'pony')
@@ -452,14 +437,15 @@ if !has_key(s:disabled_packages, 'pgsql')
 endif
 
 if !has_key(s:disabled_packages, 'perl')
-  au! BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
   au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
   au! BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
   au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
-  au BufNewFile,BufRead *.xs setf xs
-  au BufNewFile,BufRead *.comp,*.mason,*.mhtml setf mason
-  au BufNewFile,BufRead *.pod setf pod
   au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc setf perl
+  au BufNewFile,BufRead *.pod setf pod
+  au BufNewFile,BufRead *.comp,*.mason,*.mhtml setf mason
+  au! BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
+  au! BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
+  au BufNewFile,BufRead *.xs setf xs
 endif
 
 if !has_key(s:disabled_packages, 'opencl')
@@ -472,15 +458,15 @@ if !has_key(s:disabled_packages, 'octave')
 endif
 
 if !has_key(s:disabled_packages, 'ocaml')
-  au BufNewFile,BufRead *.sexp setf sexplib
-  au BufNewFile,BufRead *.root setf ocpbuildroot
-  au BufNewFile,BufRead *.ocp setf ocpbuild
-  au BufNewFile,BufRead _tags setf ocamlbuild_tags
-  au BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild setf dune
-  au BufNewFile,BufRead _oasis setf oasis
-  au BufNewFile,BufRead *.opam,*.opam.template,opam setf opam
-  au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in setf omake
   au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit setf ocaml
+  au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in setf omake
+  au BufNewFile,BufRead *.opam,*.opam.template,opam setf opam
+  au BufNewFile,BufRead _oasis setf oasis
+  au BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild setf dune
+  au BufNewFile,BufRead _tags setf ocamlbuild_tags
+  au BufNewFile,BufRead *.ocp setf ocpbuild
+  au BufNewFile,BufRead *.root setf ocpbuildroot
+  au BufNewFile,BufRead *.sexp setf sexplib
 endif
 
 if !has_key(s:disabled_packages, 'objc')
@@ -511,8 +497,8 @@ if !has_key(s:disabled_packages, 'moonscript')
 endif
 
 if !has_key(s:disabled_packages, 'meson')
-  au BufNewFile,BufRead *.wrap setf dosini
   au BufNewFile,BufRead meson.build,meson_options.txt setf meson
+  au BufNewFile,BufRead *.wrap setf dosini
 endif
 
 if !has_key(s:disabled_packages, 'mdx')
@@ -549,8 +535,8 @@ if !has_key(s:disabled_packages, 'log')
 endif
 
 if !has_key(s:disabled_packages, 'llvm')
-  au BufNewFile,BufRead *.td setf tablegen
   au BufNewFile,BufRead *.ll setf llvm
+  au BufNewFile,BufRead *.td setf tablegen
 endif
 
 if !has_key(s:disabled_packages, 'livescript')
@@ -607,17 +593,14 @@ if !has_key(s:disabled_packages, 'jenkins')
   au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
-if !has_key(s:disabled_packages, 'javascript-sql')
-endif
-
 if !has_key(s:disabled_packages, 'ion')
   au BufNewFile,BufRead *.ion,~/.config/ion/initrc setf ion
 endif
 
 if !has_key(s:disabled_packages, 'idris2')
-  au! BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
   au! BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
   au BufNewFile,BufRead *.ipkg,idris-response setf idris2
+  au! BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
 endif
 
 if !has_key(s:disabled_packages, 'idris')
@@ -656,8 +639,8 @@ if !has_key(s:disabled_packages, 'haskell')
 endif
 
 if !has_key(s:disabled_packages, 'handlebars')
-  au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs setf html.handlebars
   au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache setf html.mustache
+  au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs setf html.handlebars
 endif
 
 if !has_key(s:disabled_packages, 'haml')
@@ -668,9 +651,6 @@ if !has_key(s:disabled_packages, 'grub')
   au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf setf grub
 endif
 
-if !has_key(s:disabled_packages, 'gradle')
-endif
-
 if !has_key(s:disabled_packages, 'groovy')
   au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile setf groovy
 endif
@@ -684,14 +664,14 @@ if !has_key(s:disabled_packages, 'jsx')
 endif
 
 if !has_key(s:disabled_packages, 'javascript')
-  au BufNewFile,BufRead *.flow setf flow
   au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
+  au BufNewFile,BufRead *.flow setf flow
 endif
 
 if !has_key(s:disabled_packages, 'go')
-  au BufNewFile,BufRead *.tmpl setf gohtmltmpl
-  au BufNewFile,BufRead go.mod setf gomod
   au BufNewFile,BufRead *.go setf go
+  au BufNewFile,BufRead go.mod setf gomod
+  au BufNewFile,BufRead *.tmpl setf gohtmltmpl
 endif
 
 if !has_key(s:disabled_packages, 'gnuplot')
@@ -708,11 +688,11 @@ if !has_key(s:disabled_packages, 'glsl')
 endif
 
 if !has_key(s:disabled_packages, 'git')
-  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
-  au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
-  au BufNewFile,BufRead git-rebase-todo setf gitrebase
   au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules setf gitconfig
   au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
+  au BufNewFile,BufRead git-rebase-todo setf gitrebase
+  au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
+  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
 endif
 
 if !has_key(s:disabled_packages, 'gdscript')
@@ -762,14 +742,14 @@ if !has_key(s:disabled_packages, 'elm')
 endif
 
 if !has_key(s:disabled_packages, 'elixir')
-  au BufNewFile,BufRead *.eex,*.leex setf eelixir
   au BufNewFile,BufRead *.ex,*.exs,mix.lock setf elixir
+  au BufNewFile,BufRead *.eex,*.leex setf eelixir
 endif
 
 if !has_key(s:disabled_packages, 'dockerfile')
-  au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml setf yaml.docker-compose
   au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile setf Dockerfile
   au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
+  au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml setf yaml.docker-compose
 endif
 
 if !has_key(s:disabled_packages, 'yaml')
@@ -777,11 +757,11 @@ if !has_key(s:disabled_packages, 'yaml')
 endif
 
 if !has_key(s:disabled_packages, 'dlang')
-  au BufNewFile,BufRead *.sdl setf dsdl
-  au BufNewFile,BufRead *.ddoc setf ddoc
-  au BufNewFile,BufRead *.dd setf dd
-  au BufNewFile,BufRead *.lst setf dcov
   au BufNewFile,BufRead *.d,*.di setf d
+  au BufNewFile,BufRead *.lst setf dcov
+  au BufNewFile,BufRead *.dd setf dd
+  au BufNewFile,BufRead *.ddoc setf ddoc
+  au BufNewFile,BufRead *.sdl setf dsdl
 endif
 
 if !has_key(s:disabled_packages, 'dhall')
@@ -801,20 +781,17 @@ if !has_key(s:disabled_packages, 'cucumber')
 endif
 
 if !has_key(s:disabled_packages, 'crystal')
-  au BufNewFile,BufRead *.ecr setf ecrystal
   au BufNewFile,BufRead *.cr,Projectfile setf crystal
+  au BufNewFile,BufRead *.ecr setf ecrystal
 endif
 
 if !has_key(s:disabled_packages, 'cryptol')
   au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl setf cryptol
 endif
 
-if !has_key(s:disabled_packages, 'cjsx')
-endif
-
 if !has_key(s:disabled_packages, 'coffee-script')
-  au BufNewFile,BufRead *.coffee.md,*.litcoffee setf litcoffee
   au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile setf coffee
+  au BufNewFile,BufRead *.coffee.md,*.litcoffee setf litcoffee
 endif
 
 if !has_key(s:disabled_packages, 'cmake')
@@ -829,9 +806,6 @@ if !has_key(s:disabled_packages, 'carp')
   au BufNewFile,BufRead *.carp setf carp
 endif
 
-if !has_key(s:disabled_packages, 'cpp-modern')
-endif
-
 if !has_key(s:disabled_packages, 'caddyfile')
   au BufNewFile,BufRead Caddyfile setf caddyfile
 endif
@@ -891,8 +865,9 @@ endif
 
 if !has_key(s:disabled_packages, 'c/c++')
   au! BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
-  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
   au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp setf cpp
+  au! BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
+  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
 endif
 
 if !has_key(s:disabled_packages, 'arch')
@@ -939,6 +914,7 @@ if !has_key(s:disabled_packages, 'csv')
 endif
 
 if !has_key(s:disabled_packages, 'ampl')
+  " AMPL
   au BufNewFile,BufRead *.run setf ampl
 endif
 
@@ -951,14 +927,17 @@ if !has_key(s:disabled_packages, 'alsaconf')
 endif
 
 if !has_key(s:disabled_packages, 'aidl')
+  " AIDL
   au BufNewFile,BufRead *.aidl setf aidl
 endif
 
 if !has_key(s:disabled_packages, 'ahdl')
+  " AHDL
   au BufNewFile,BufRead *.tdf setf ahdl
 endif
 
 if !has_key(s:disabled_packages, 'ada')
+  " Ada (83, 9X, 95)
   au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr setf ada
 endif
 
@@ -967,14 +946,17 @@ if !has_key(s:disabled_packages, 'acpiasl')
 endif
 
 if !has_key(s:disabled_packages, 'acedb')
+  " AceDB
   au BufNewFile,BufRead *.wrm setf acedb
 endif
 
 if !has_key(s:disabled_packages, 'abel')
+  " ABEL
   au BufNewFile,BufRead *.abl setf abel
 endif
 
 if !has_key(s:disabled_packages, 'abc')
+  " ABC music notation
   au BufNewFile,BufRead *.abc setf abc
 endif
 
@@ -983,14 +965,17 @@ if !has_key(s:disabled_packages, 'abaqus')
 endif
 
 if !has_key(s:disabled_packages, 'abap')
+  " ABAB/4
   au BufNewFile,BufRead *.abap setf abap
 endif
 
 if !has_key(s:disabled_packages, 'aap')
+  " A-A-P recipe
   au BufNewFile,BufRead *.aap setf aap
 endif
 
 if !has_key(s:disabled_packages, 'a65')
+  " XA65 MOS6510 cross assembler
   au BufNewFile,BufRead *.a65 setf a65
 endif
 
@@ -1008,6 +993,7 @@ if !has_key(s:disabled_packages, 'conf')
 endif
 
 if !has_key(s:disabled_packages, '8th')
+  " 8th (Firth-derivative)
   au BufNewFile,BufRead *.8th setf 8th
 endif
 
@@ -1253,41 +1239,9 @@ au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt	setf help
 " Abaqus or Trasys
 au BufNewFile,BufRead *.inp			call polyglot#ft#Check_inp()
 
-" 8th (Firth-derivative)
-au BufNewFile,BufRead *.8th			setf 8th
-
-" A-A-P recipe
-au BufNewFile,BufRead *.aap			setf aap
-
 " A2ps printing utility
 au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,a2psrc,.a2psrc setf a2ps
 
-" ABAB/4
-au BufNewFile,BufRead *.abap			setf abap
-
-" ABC music notation
-au BufNewFile,BufRead *.abc			setf abc
-
-" ABEL
-au BufNewFile,BufRead *.abl			setf abel
-
-" AceDB
-au BufNewFile,BufRead *.wrm			setf acedb
-
-" Ada (83, 9X, 95)
-au BufNewFile,BufRead *.adb,*.ads,*.ada		setf ada
-if has("vms")
-  au BufNewFile,BufRead *.gpr,*.ada_m,*.adc	setf ada
-else
-  au BufNewFile,BufRead *.gpr			setf ada
-endif
-
-" AHDL
-au BufNewFile,BufRead *.tdf			setf ahdl
-
-" AIDL
-au BufNewFile,BufRead *.aidl			setf aidl
-
 " AMPL
 au BufNewFile,BufRead *.run			setf ampl
 
diff --git a/indent/graphql.vim b/indent/graphql.vim
index 3a9109286..12204f5f2 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -62,6 +62,13 @@ function GetGraphQLIndent()
     return 0
   endif
 
+  " If the previous line isn't GraphQL, don't change this line's indentation.
+  " Assume we've been manually indented as part of a template string.
+  let l:stack = map(synstack(l:prevlnum, 1), "synIDattr(v:val, 'name')")
+  if get(l:stack, -1) !~# '^graphql'
+    return -1
+  endif
+
   let l:line = getline(v:lnum)
 
   " If this line contains just a closing bracket, find its matching opening
diff --git a/packages.yaml b/packages.yaml
index 4d4365d32..2baddea24 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -4,6 +4,7 @@ remote: vim/vim:runtime
 glob: '**/8th.vim'
 filetypes:
 - name: 8th
+  description: 8th (Firth-derivative)
   extensions:
   - 8th
 ---
@@ -23,6 +24,7 @@ remote: vim/vim:runtime
 glob: '**/a65.vim'
 filetypes:
 - name: a65
+  description: XA65 MOS6510 cross assembler
   extensions:
   - a65
 ---
@@ -31,6 +33,7 @@ remote: vim/vim:runtime
 glob: '**/aap.vim'
 filetypes:
 - name: aap
+  description: A-A-P recipe
   extensions:
   - aap
 ---
@@ -39,6 +42,7 @@ remote: vim/vim:runtime
 glob: '**/abap.vim'
 filetypes:
 - name: abap
+  description: ABAB/4
   extensions:
   - abap
 ---
@@ -55,6 +59,7 @@ remote: vim/vim:runtime
 glob: '**/abc.vim'
 filetypes:
 - name: abc
+  description: ABC music notation
   extensions:
   - abc
 ---
@@ -63,6 +68,7 @@ remote: vim/vim:runtime
 glob: '**/abel.vim'
 filetypes:
 - name: abel
+  description: ABEL
   extensions:
   - abl
 ---
@@ -71,6 +77,7 @@ remote: vim/vim:runtime
 glob: '**/acedb.vim'
 filetypes:
 - name: acedb
+  description: AceDB
   extensions:
   - wrm
 ---
@@ -87,6 +94,7 @@ remote: vim/vim:runtime
 glob: '**/ada.vim'
 filetypes:
 - name: ada
+  description: Ada (83, 9X, 95)
   extensions:
   - adb
   - ads
@@ -100,6 +108,7 @@ remote: vim/vim:runtime
 glob: '**/ahdl.vim'
 filetypes:
 - name: ahdl
+  description: AHDL
   extensions:
   - tdf
 ---
@@ -108,6 +117,7 @@ remote: vim/vim:runtime
 glob: '**/aidl.vim'
 filetypes:
 - name: aidl
+  description: AIDL
   extensions:
   - aidl
 ---
@@ -134,6 +144,7 @@ remote: vim/vim:runtime
 glob: '**/ampl.vim'
 filetypes:
 - name: ampl
+  description: AMPL
   extensions:
   - run
 ---
diff --git a/scripts/build b/scripts/build
index fe07db70d..948da1150 100755
--- a/scripts/build
+++ b/scripts/build
@@ -43,6 +43,18 @@ def verify(packages, heuristics)
       puts "No heuristics for .#{e} extension (#{names.join(", ")})"
     end
   end
+
+  extensions = packages.flat_map { |e| e["filetypes"] || [] }
+    .flat_map { |e| e["extensions"].map { |e| "*." + e } }
+  native_filetypes = detect_filetypes_str(
+    File.read('ftdetect/polyglot.vim').match(/" DO NOT EDIT CODE ABOVE.*/m)[0]
+  ).flat_map { |e| expand_all(e) }
+
+  for e in (native_filetypes & extensions)
+    if ENV["DEV"]
+      puts "Duplicated handling for #{e}"
+    end
+  end
 end
 
 def sort_packages(packages)
@@ -506,10 +518,12 @@ def generate_ftdetect(packages, heuristics)
   for package in packages.reverse
     filetypes = package["filetypes"] or raise "Unknown filetype for: #{package["name"]}"
 
-    package_heuristics = []
+    package_autocommands = []
 
-    autocommands = []
     for filetype in filetypes
+      autocommands = []
+      filetype_heuristics = []
+
       name = filetype.fetch("name")
       syntax = filetype["syntax"] ? " | set syntax=#{filetype["syntax"]}" : ""
 
@@ -531,13 +545,13 @@ def generate_ftdetect(packages, heuristics)
       for extension in extensions.sort
         outer_filetype = filetype["outer_filetype"]
         if outer_filetype
-          autocommands << "  au BufNewFile *.*.#{extension} execute \"do BufNewFile filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
-          autocommands << "  au BufReadPre *.*.#{extension} execute \"do BufRead filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
+          autocommands << "au BufNewFile *.*.#{extension} execute \"do BufNewFile filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}"
+          autocommands << "au BufReadPre *.*.#{extension} execute \"do BufRead filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}"
         end
 
         heuristic = heuristics.find { |h| h["extensions"].include?(extension) }
         if heuristic
-          package_heuristics << heuristic
+          filetype_heuristics << heuristic
         else
           set_globs << "*." + extension
         end
@@ -548,28 +562,34 @@ def generate_ftdetect(packages, heuristics)
           filename = "{.,}" + filename[1..-1]
         end
         if filename[-1] == "*"
-          autocommands << "  au BufNewFile,BufRead #{filename} call s:StarSetf('#{name}')\n"
+          autocommands << "au BufNewFile,BufRead #{filename} call s:StarSetf('#{name}')"
         else
           set_globs << filename
         end
       end
 
       if set_globs.size > 0
-        autocommands << "  au BufNewFile,BufRead #{set_globs.join(",")} #{set_command}\n"
+        autocommands << "au BufNewFile,BufRead #{set_globs.join(",")} #{set_command}"
       end
-    end
 
+      for heuristic in filetype_heuristics.uniq
+        extensions = heuristic["extensions"].map { |e| "*.#{e}" }
+        autocommands << "au! BufNewFile,BufRead,BufWritePost #{extensions.join(",")} call polyglot#detect##{camelize(heuristic["extensions"].first)}()"
+      end
 
-    for heuristic in package_heuristics.uniq
-      extensions = heuristic["extensions"].map { |e| "*.#{e}" }
-      autocommands << "  au! BufNewFile,BufRead,BufWritePost #{extensions.join(",")} call polyglot#detect##{camelize(heuristic["extensions"].first)}()\n"
+      if autocommands.size > 0 && filetype["description"]
+        autocommands << '" ' + filetype["description"]
+      end
+
+      package_autocommands << autocommands
     end
 
-    if autocommands != ""
+    if package_autocommands.flatten.size > 0
       output << "if !has_key(s:disabled_packages, '#{package["name"]}')\n"
-      output << autocommands.reverse.join("")
-      output << "endif\n\n"
+      output << indent(package_autocommands.map { |pc| pc.reverse.join("\n") }.join("\n\n"), 2)
+      output << "\nendif\n\n"
     end
+
   end
 
   show_warnings(all_filetypes, expected_filetypes)
@@ -701,21 +721,23 @@ def expand_all(pattern, all = false)
   end
 end
 
+def detect_filetypes_str(contents)
+  contents = contents.gsub(/^\s*au(tocmd)?!?\s*$/, '')
+  results = contents.scan(/^\s*(?:au!|au|au[^g][^ ]*) +(?:\S+)\s+(\S+)[\s\\]+([^\n]+)/)
+  results = results.map do |a, b|
+    [
+      a,
+      b.gsub(/call (?:s:setf|s:StarSetf)\('([^']+)'\)/i, 'setf \1')
+      .gsub(/set(?:local)?\s+(?:ft|filetype)=(\S+)/, 'setf \1')
+      .gsub(/setf\S*/, 'setf')
+      .gsub(/.*setf\s+(\S+).*/, 'setf \1')
+    ]
+  end.select { |a, b| b.match(/setf \S+/) }.map { |a, b| [a, b.split(" ")[1]] }
+  results
+end
+
 def detect_filetypes(glob)
-  filetypes = Dir[glob].flat_map do |file|
-    contents = File.read(file).gsub(/^\s*au(tocmd)?!?\s*$/, '')
-    results = contents.scan(/^\s*(?:au!|au|au[^g][^ ]*) +(?:\S+)\s+(\S+)[\s\\]+([^\n]+)/)
-    results = results.map do |a, b|
-      [
-        a,
-        b.gsub(/call (?:s:setf|s:StarSetf)\('([^']+)'\)/i, 'setf \1')
-          .gsub(/set(?:local)?\s+(?:ft|filetype)=(\S+)/, 'setf \1')
-        .gsub(/setf\S*/, 'setf')
-        .gsub(/.*setf\s+(\S+).*/, 'setf \1')
-      ]
-    end.select { |a, b| b.match(/setf \S+/) }.map { |a, b| [a, b.split(" ")[1]] }
-    results
-  end
+  filetypes = Dir[glob].flat_map { |file| detect_filetypes_str(File.read(file)) }
 
   filetypes.flat_map do |ext, filetype|
     expand_all(ext).map { |e| [filetype, e] }
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 20da69d1c..c85b97cb4 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -6,8 +6,8 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pgsql') == -1
 " Version:      2.2.2
 " License:      This file is placed in the public domain.
 
-" Based on PostgreSQL 12.3
-" Automatically generated on 2020-07-31 at 10:47:30
+" Based on PostgreSQL 12.4
+" Automatically generated on 2020-10-03 at 18:36:49
 
 if exists("b:current_syntax")
   finish
@@ -25,12 +25,12 @@ syn keyword sqlSpecial contained false null true
 
 " Statements
 syn keyword sqlStatement contained abort add alter analyze begin checkpoint close cluster comment
-syn keyword sqlStatement contained commit constraints copy create deallocate declare delete discard do drop
-syn keyword sqlStatement contained end execute explain fetch grant import insert label listen load lock
-syn keyword sqlStatement contained move notify prepare prepared reassign refresh reindex release reset
-syn keyword sqlStatement contained revoke rollback savepoint security select select set show start
-syn keyword sqlStatement contained transaction truncate unlisten update vacuum values work
-syn match sqlStatement /\<create\_s\+or\_s\+replace\>/
+syn keyword sqlStatement contained commit constraints copy deallocate declare delete discard do drop end
+syn keyword sqlStatement contained execute explain fetch grant import insert label listen load lock move
+syn keyword sqlStatement contained notify prepare prepared reassign refresh reindex release reset revoke
+syn keyword sqlStatement contained rollback savepoint security select select set show start transaction
+syn keyword sqlStatement contained truncate unlisten update vacuum values work
+syn match sqlStatement contained /\<create\%(\_s\+or\_s\+replace\)\=\>/
 " Types
 syn keyword sqlType contained aclitem addbandarg addr addr_gid_seq addrfeat addrfeat_gid_seq
 syn keyword sqlType contained agg_count agg_samealignment anyarray anyelement anyenum
@@ -702,7 +702,7 @@ syn keyword sqlConstant contained ltree_plpythonu pldbgapi plpython2u plpython3u
 if index(get(g:, 'pgsql_disabled_extensions', []), 'refint') == -1
   syn keyword sqlFunction contained check_foreign_key check_primary_key
 endif " refint
-" Extension: postgis (v3.0.1)
+" Extension: postgis (v3.0.2)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis') == -1
   syn keyword sqlFunction contained addauth addgeometrycolumn box
   syn keyword sqlFunction contained box2d box2d_in box2d_out box2df_in
@@ -988,7 +988,7 @@ endif " adminpack
 if index(get(g:, 'pgsql_disabled_extensions', []), 'dict_xsyn') == -1
   syn keyword sqlFunction contained dxsyn_init dxsyn_lexize
 endif " dict_xsyn
-" Extension: address_standardizer (v3.0.1)
+" Extension: address_standardizer (v3.0.2)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'address_standardizer') == -1
   syn keyword sqlFunction contained parse_address standardize_address
   syn keyword sqlType contained stdaddr
@@ -1046,7 +1046,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'cube') == -1
   syn keyword sqlType contained cube
   syn keyword sqlFunction contained g_cube_compress g_cube_decompress
 endif " cube
-" Extension: postgis_tiger_geocoder (v3.0.1)
+" Extension: postgis_tiger_geocoder (v3.0.2)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_tiger_geocoder') == -1
   syn keyword sqlFunction contained count_words create_census_base_tables
   syn keyword sqlFunction contained cull_null diff_zip
@@ -1150,11 +1150,11 @@ endif " pgstattuple
 if index(get(g:, 'pgsql_disabled_extensions', []), 'autoinc') == -1
   syn keyword sqlFunction contained autoinc
 endif " autoinc
-" Extension: address_standardizer_data_us (v3.0.1)
+" Extension: address_standardizer_data_us (v3.0.2)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'address_standardizer_data_us') == -1
   syn keyword sqlTable contained us_gaz us_lex us_rules
 endif " address_standardizer_data_us
-" Extension: postgis_topology (v3.0.1)
+" Extension: postgis_topology (v3.0.2)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_topology') == -1
   syn keyword sqlFunction contained addedge addface addnode
   syn keyword sqlFunction contained addtopogeometrycolumn addtosearchpath asgml
@@ -1187,7 +1187,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_topology') == -1
   syn keyword sqlType contained topoelementarray topogeometry
   syn keyword sqlType contained validatetopology_returntype
 endif " postgis_topology
-" Extension: postgis_raster (v3.0.1)
+" Extension: postgis_raster (v3.0.2)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_raster') == -1
   syn keyword sqlFunction contained addoverviewconstraints addrasterconstraints
   syn keyword sqlFunction contained box3d bytea dropoverviewconstraints
@@ -1534,7 +1534,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'fuzzystrmatch') == -1
   syn keyword sqlFunction contained levenshtein levenshtein_less_equal
   syn keyword sqlFunction contained metaphone soundex text_soundex
 endif " fuzzystrmatch
-" Extension: pgrouting (v3.0.2)
+" Extension: pgrouting (v3.1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pgrouting') == -1
   syn keyword sqlFunction contained pgr_alphashape pgr_analyzegraph
   syn keyword sqlFunction contained pgr_analyzeoneway pgr_articulationpoints pgr_astar
@@ -1578,7 +1578,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'pgcrypto') == -1
   syn keyword sqlFunction contained pgp_sym_decrypt_bytea pgp_sym_encrypt
   syn keyword sqlFunction contained pgp_sym_encrypt_bytea
 endif " pgcrypto
-" Extension: postgis_sfcgal (v3.0.1)
+" Extension: postgis_sfcgal (v3.0.2)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_sfcgal') == -1
   syn keyword sqlFunction contained postgis_sfcgal_noop
   syn keyword sqlFunction contained postgis_sfcgal_scripts_installed postgis_sfcgal_version st_3darea
@@ -1972,6 +1972,9 @@ else
     \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlString,sqlTodo
 endif
 
+" Folding
+syn region sqlFold start='^\s*\zs\c\(create\|update\|alter\|select\|insert\|do\)\>' end=';$' transparent fold contains=ALL
+
 " PL/<any other language>
 fun! s:add_syntax(s)
   execute 'syn include @PL' . a:s . ' syntax/' . a:s . '.vim'

From c0b866aac3c5cb534486a70284de1bbbdc392d97 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 4 Oct 2020 21:19:51 +0200
Subject: [PATCH 107/299] Add graphql indentation again, thanks @jparise!

---
 after/indent/javascript-1.vim |  9 +++++++
 after/indent/javascript-2.vim | 47 +++++++++++++++++++++++++++++++++++
 after/indent/javascript.vim   | 12 +++------
 after/indent/typescript.vim   | 47 +++++++++++++++++++++++++++++++++++
 packages.yaml                 |  4 ---
 5 files changed, 106 insertions(+), 13 deletions(-)
 create mode 100644 after/indent/javascript-1.vim
 create mode 100644 after/indent/javascript-2.vim
 create mode 100644 after/indent/typescript.vim

diff --git a/after/indent/javascript-1.vim b/after/indent/javascript-1.vim
new file mode 100644
index 000000000..2992e9427
--- /dev/null
+++ b/after/indent/javascript-1.vim
@@ -0,0 +1,9 @@
+if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+
+if get(g:, 'vim_jsx_pretty_disable_js', 0)
+  finish
+endif
+
+source <sfile>:h/jsx.vim
+
+endif
diff --git a/after/indent/javascript-2.vim b/after/indent/javascript-2.vim
new file mode 100644
index 000000000..4e066e6fc
--- /dev/null
+++ b/after/indent/javascript-2.vim
@@ -0,0 +1,47 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+
+" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+"
+" Permission is hereby granted, free of charge, to any person obtaining a copy
+" of this software and associated documentation files (the "Software"), to
+" deal in the Software without restriction, including without limitation the
+" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+" sell copies of the Software, and to permit persons to whom the Software is
+" furnished to do so, subject to the following conditions:
+"
+" The above copyright notice and this permission notice shall be included in
+" all copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+" IN THE SOFTWARE.
+"
+" Language: GraphQL
+" Maintainer: Jon Parise <jon@indelible.org>
+
+runtime! indent/graphql.vim
+
+" Don't redefine our function and also require the standard Javascript indent
+" function to exist.
+if exists('*GetJavascriptGraphQLIndent') || !exists('*GetJavascriptIndent')
+  finish
+endif
+
+" Set the indentexpr with our own version that will call GetGraphQLIndent when
+" we're inside of a GraphQL string and otherwise defer to GetJavascriptIndent.
+setlocal indentexpr=GetJavascriptGraphQLIndent()
+
+function GetJavascriptGraphQLIndent()
+  let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val,'name')")
+  if !empty(l:stack) && l:stack[0] ==# 'graphqlTemplateString'
+    return GetGraphQLIndent()
+  endif
+
+  return GetJavascriptIndent()
+endfunction
+
+endif
diff --git a/after/indent/javascript.vim b/after/indent/javascript.vim
index 2992e9427..e3d355fcb 100644
--- a/after/indent/javascript.vim
+++ b/after/indent/javascript.vim
@@ -1,9 +1,3 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
-
-if get(g:, 'vim_jsx_pretty_disable_js', 0)
-  finish
-endif
-
-source <sfile>:h/jsx.vim
-
-endif
+" Polyglot metafile
+source <sfile>:h/javascript-1.vim
+source <sfile>:h/javascript-2.vim
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
new file mode 100644
index 000000000..968517c89
--- /dev/null
+++ b/after/indent/typescript.vim
@@ -0,0 +1,47 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+
+" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+"
+" Permission is hereby granted, free of charge, to any person obtaining a copy
+" of this software and associated documentation files (the "Software"), to
+" deal in the Software without restriction, including without limitation the
+" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+" sell copies of the Software, and to permit persons to whom the Software is
+" furnished to do so, subject to the following conditions:
+"
+" The above copyright notice and this permission notice shall be included in
+" all copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+" IN THE SOFTWARE.
+"
+" Language: GraphQL
+" Maintainer: Jon Parise <jon@indelible.org>
+
+runtime! indent/graphql.vim
+
+" Don't redefine our function and also require the standard Typescript indent
+" function to exist.
+if exists('*GetTypescriptGraphQLIndent') || !exists('*GetTypescriptIndent')
+  finish
+endif
+
+" Set the indentexpr with our own version that will call GetGraphQLIndent when
+" we're inside of a GraphQL string and otherwise defer to GetTypescriptIndent.
+setlocal indentexpr=GetTypescriptGraphQLIndent()
+
+function GetTypescriptGraphQLIndent()
+  let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val,'name')")
+  if !empty(l:stack) && l:stack[0] ==# 'graphqlTemplateString'
+    return GetGraphQLIndent()
+  endif
+
+  return GetTypescriptIndent()
+endfunction
+
+endif
diff --git a/packages.yaml b/packages.yaml
index 2baddea24..f5d42425b 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -687,10 +687,6 @@ name: graphql
 remote: jparise/vim-graphql
 dependencies: javascript
 after: jsx
-ignored_dirs:
-# TODO: remove after bug is fixed:
-# https://github.com/jparise/vim-graphql/issues/62
-- after/indent
 filetypes:
 - name: graphql
   linguist: GraphQL

From 04d110660e86ef0fd3e773dd7e47151ce998be77 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 4 Oct 2020 21:25:26 +0200
Subject: [PATCH 108/299] Fix formatting

---
 packages.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages.yaml b/packages.yaml
index f5d42425b..eda3e2173 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1010,11 +1010,11 @@ name: m4
 remote: vim/vim:runtime
 glob: '**/m4.vim'
 filetypes:
-  - name: m4
-    linguist: M4
-    extra_extensions:
-    # Autotest .at files are actually m4
-    - at
+- name: m4
+  linguist: M4
+  extra_extensions:
+  # Autotest .at files are actually m4
+  - at
 ---
 name: mako
 remote: sophacles/vim-bundle-mako

From 32b097f67ed9c9b95a9ef1960399197434eb0bdf Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 4 Oct 2020 22:20:23 +0200
Subject: [PATCH 109/299] Add some missing filetypes

---
 README.md                    |   6 +-
 autoload/polyglot/sleuth.vim |   4 +
 ftdetect/polyglot.vim        | 147 ++------------
 ftplugin/hamster.vim         |  66 +++++++
 indent/hamster.vim           |  59 ++++++
 packages.yaml                |  37 ++++
 syntax/b.vim                 | 118 +++++++++++
 syntax/freebasic.vim         | 261 ++++++++++++++++++++++++
 syntax/hamster.vim           | 374 +++++++++++++++++++++++++++++++++++
 syntax/ibasic.vim            | 180 +++++++++++++++++
 tests/filetypes.vim          |   4 +
 11 files changed, 1124 insertions(+), 132 deletions(-)
 create mode 100644 ftplugin/hamster.vim
 create mode 100644 indent/hamster.vim
 create mode 100644 syntax/b.vim
 create mode 100644 syntax/freebasic.vim
 create mode 100644 syntax/hamster.vim
 create mode 100644 syntax/ibasic.vim

diff --git a/README.md b/README.md
index a9af6b665..adf45f792 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->203<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->207<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -77,6 +77,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [automake](https://github.com/vim/vim/tree/master/runtime)
 - [ave](https://github.com/vim/vim/tree/master/runtime)
 - [awk](https://github.com/vim/vim/tree/master/runtime)
+- [b](https://github.com/vim/vim/tree/master/runtime)
 - [basic](https://github.com/vim/vim/tree/master/runtime)
 - [blade](https://github.com/jwalton512/vim-blade)
 - [brewfile](https://github.com/bfontaine/Brewfile.vim)
@@ -112,6 +113,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [fish](https://github.com/georgewitteman/vim-fish)
 - [flatbuffers](https://github.com/dcharbon/vim-flatbuffers)
 - [forth](https://github.com/vim/vim/tree/master/runtime)
+- [freebasic](https://github.com/vim/vim/tree/master/runtime)
 - [fsharp](https://github.com/ionide/Ionide-vim)
 - [gdscript](https://github.com/calviken/vim-gdscript3)
 - [git](https://github.com/tpope/vim-git)
@@ -125,6 +127,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [groovy](https://github.com/vim/vim/tree/master/runtime)
 - [grub](https://github.com/vim/vim/tree/master/runtime)
 - [haml](https://github.com/tpope/vim-haml)
+- [hamster](https://github.com/vim/vim/tree/master/runtime)
 - [handlebars](https://github.com/mustache/vim-mustache-handlebars)
 - [haproxy](https://github.com/CH-DanReif/haproxy.vim)
 - [haskell](https://github.com/neovimhaskell/haskell-vim)
@@ -136,6 +139,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [html5](https://github.com/othree/html5.vim)
 - [htmldjango](https://github.com/vim/vim/tree/master/runtime)
 - [i3](https://github.com/mboughaba/i3config.vim)
+- [ibasic](https://github.com/vim/vim/tree/master/runtime)
 - [icalendar](https://github.com/chutzpah/icalendar.vim)
 - [idris2](https://github.com/edwinb/idris2-vim)
 - [idris](https://github.com/idris-hackers/idris-vim)
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index d74de687f..aab55ef02 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -35,6 +35,7 @@ let s:globs = {
   \ 'automake': '[Mm]akefile.am,GNUmakefile.am',
   \ 'ave': '*.ave',
   \ 'awk': '*.awk,*.gawk',
+  \ 'b': '*.mch,*.ref,*.imp',
   \ 'basic': '*.basic',
   \ 'blade': '*.blade,*.blade.php',
   \ 'brewfile': 'Brewfile',
@@ -78,6 +79,7 @@ let s:globs = {
   \ 'fish': '*.fish',
   \ 'flow': '*.flow',
   \ 'forth': '*.fs,*.ft,*.fth',
+  \ 'freebasic': '*.fb,*.bi',
   \ 'fsharp': '*.fs,*.fsi,*.fsx',
   \ 'gdscript3': '*.gd',
   \ 'gitcommit': 'COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG',
@@ -95,6 +97,7 @@ let s:globs = {
   \ 'groovy': '*.groovy,*.grt,*.gtpl,*.gvy,*.gradle,Jenkinsfile',
   \ 'grub': '',
   \ 'haml': '*.haml,*.haml.deface,*.hamlc,*.hamlbars',
+  \ 'hamster': '*.hsc,*.hsm',
   \ 'haproxy': '*.cfg,haproxy.cfg,haproxy*.conf*',
   \ 'haskell': '*.hs,*.hs-boot,*.hsc,*.bpk,*.hsig',
   \ 'haxe': '*.hx,*.hxsl',
@@ -108,6 +111,7 @@ let s:globs = {
   \ 'html.twig': '*.twig',
   \ 'htmldjango': '*.jinja,*.j2,*.jinja2,*.njk',
   \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config,.i3.config,.i3config',
+  \ 'ibasic': '*.iba,*.ibi',
   \ 'icalendar': '*.ics',
   \ 'idris': '*.idr,*.lidr,idris-response',
   \ 'idris2': '*.idr,*.ipkg,idris-response',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 1e079217b..dc39341d4 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -117,6 +117,22 @@ augroup filetypedetect
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(s:disabled_packages, 'hamster')
+  au BufNewFile,BufRead *.hsc,*.hsm setf hamster
+endif
+
+if !has_key(s:disabled_packages, 'freebasic')
+  au BufNewFile,BufRead *.bi,*.fb setf freebasic
+endif
+
+if !has_key(s:disabled_packages, 'ibasic')
+  au BufNewFile,BufRead *.iba,*.ibi setf ibasic
+endif
+
+if !has_key(s:disabled_packages, 'b')
+  au BufNewFile,BufRead *.imp,*.mch,*.ref setf b
+endif
+
 if !has_key(s:disabled_packages, 'sql')
   au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw setf sql
 endif
@@ -1233,125 +1249,6 @@ if !exists("g:ft_ignore_pat")
   let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|zip\|tgz\)$'
 endif
 
-" Vim help file
-au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt	setf help
-
-" Abaqus or Trasys
-au BufNewFile,BufRead *.inp			call polyglot#ft#Check_inp()
-
-" A2ps printing utility
-au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,a2psrc,.a2psrc setf a2ps
-
-" AMPL
-au BufNewFile,BufRead *.run			setf ampl
-
-" Ant
-au BufNewFile,BufRead build.xml			setf ant
-
-" Arduino
-au BufNewFile,BufRead *.ino,*.pde		setf arduino
-
-" Apache config file
-au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf		setf apache
-au BufNewFile,BufRead */etc/apache2/sites-*/*.com		setf apache
-
-" XA65 MOS6510 cross assembler
-au BufNewFile,BufRead *.a65			setf a65
-
-" Applescript
-au BufNewFile,BufRead *.scpt			setf applescript
-
-" Applix ELF
-au BufNewFile,BufRead *.am
-	\ if expand("<afile>") !~? 'Makefile.am\>' | setf elf | endif
-
-" ALSA configuration
-au BufNewFile,BufRead .asoundrc,*/usr/share/alsa/alsa.conf,*/etc/asound.conf setf alsaconf
-
-" Arc Macro Language
-au BufNewFile,BufRead *.aml			setf aml
-
-" APT config file
-au BufNewFile,BufRead apt.conf		       setf aptconf
-au BufNewFile,BufRead */.aptitude/config       setf aptconf
-au BufNewFile,BufRead */etc/apt/apt.conf.d/{[-_[:alnum:]]\+,[-_.[:alnum:]]\+.conf} setf aptconf
-
-" Arch Inventory file
-au BufNewFile,BufRead .arch-inventory,=tagging-method	setf arch
-
-" ART*Enterprise (formerly ART-IM)
-au BufNewFile,BufRead *.art			setf art
-
-" AsciiDoc
-au BufNewFile,BufRead *.asciidoc,*.adoc		setf asciidoc
-
-" ASN.1
-au BufNewFile,BufRead *.asn,*.asn1		setf asn
-
-" Active Server Pages (with Visual Basic Script)
-au BufNewFile,BufRead *.asa
-	\ if exists("g:filetype_asa") |
-	\   exe "setf " . g:filetype_asa |
-	\ else |
-	\   setf aspvbs |
-	\ endif
-
-" Active Server Pages (with Perl or Visual Basic Script)
-au BufNewFile,BufRead *.asp
-	\ if exists("g:filetype_asp") |
-	\   exe "setf " . g:filetype_asp |
-	\ elseif getline(1) . getline(2) . getline(3) =~? "perlscript" |
-	\   setf aspperl |
-	\ else |
-	\   setf aspvbs |
-	\ endif
-
-" Grub (must be before catch *.lst)
-au BufNewFile,BufRead */boot/grub/menu.lst,*/boot/grub/grub.conf,*/etc/grub.conf setf grub
-
-" Assembly (all kinds)
-" *.lst is not pure assembly, it has two extra columns (address, byte codes)
-au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call polyglot#ft#FTasm()
-
-" Macro (VAX)
-au BufNewFile,BufRead *.mar			setf vmasm
-
-" Atlas
-au BufNewFile,BufRead *.atl,*.as		setf atlas
-
-" Autoit v3
-au BufNewFile,BufRead *.au3			setf autoit
-
-" Autohotkey
-au BufNewFile,BufRead *.ahk			setf autohotkey
-
-" Automake
-au BufNewFile,BufRead [mM]akefile.am,GNUmakefile.am	setf automake
-
-" Autotest .at files are actually m4
-au BufNewFile,BufRead *.at			setf m4
-
-" Avenue
-au BufNewFile,BufRead *.ave			setf ave
-
-" Awk
-au BufNewFile,BufRead *.awk,*.gawk		setf awk
-
-" B
-au BufNewFile,BufRead *.mch,*.ref,*.imp		setf b
-
-" BASIC or Visual Basic
-au BufNewFile,BufRead *.bas			call polyglot#ft#FTVB("basic")
-
-" Visual Basic Script (close to Visual Basic) or Visual Basic .NET
-au BufNewFile,BufRead *.vb,*.vbs,*.dsm,*.ctl	setf vb
-
-" IBasic file (similar to QBasic)
-au BufNewFile,BufRead *.iba,*.ibi		setf ibasic
-
-" FreeBasic file (similar to QBasic)
-au BufNewFile,BufRead *.fb,*.bi			setf freebasic
-
 " Batch file for MSDOS.
 au BufNewFile,BufRead *.bat,*.sys		setf dosbatch
 " *.cmd is close to a Batch file, but on OS/2 Rexx files also use *.cmd.
@@ -1819,12 +1716,6 @@ au BufNewFile,BufRead gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc setf gnash
 au BufNewFile,BufRead gitolite.conf		setf gitolite
 au BufNewFile,BufRead {,.}gitolite.rc,example.gitolite.rc	setf perl
 
-" Gnuplot scripts
-au BufNewFile,BufRead *.gpi			setf gnuplot
-
-" Go (Google)
-au BufNewFile,BufRead *.go			setf go
-
 " GrADS scripts
 au BufNewFile,BufRead *.gs			setf grads
 
@@ -1843,12 +1734,6 @@ au BufNewFile,BufRead */etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/
 " GTK RC
 au BufNewFile,BufRead .gtkrc,gtkrc		setf gtkrc
 
-" Haml
-au BufNewFile,BufRead *.haml			setf haml
-
-" Hamster Classic | Playground files
-au BufNewFile,BufRead *.hsc,*.hsm		setf hamster
-
 " Haskell
 au BufNewFile,BufRead *.hs,*.hs-boot		setf haskell
 au BufNewFile,BufRead *.lhs			setf lhaskell
diff --git a/ftplugin/hamster.vim b/ftplugin/hamster.vim
new file mode 100644
index 000000000..ad5fe0d35
--- /dev/null
+++ b/ftplugin/hamster.vim
@@ -0,0 +1,66 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hamster') == -1
+
+" Vim filetype plugin
+" Language:    Hamster Script
+" Version:     2.0.6.0
+" Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
+" Last Change: 2017 Mar 18
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl fo< com< tw< commentstring<"
+	\ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" and insert the comment leader when hitting <CR> or using "o".
+setlocal fo-=t fo+=croql
+
+" Use the # sign for comments
+setlocal comments=:#
+
+" Format comments to be up to 78 characters long
+if &tw == 0
+  setlocal tw=78
+endif
+
+" Comments start with a double quote
+setlocal commentstring=#%s
+
+" Move around functions.
+noremap <silent><buffer> [[ :call search('^\s*sub\>', "bW")<CR>
+noremap <silent><buffer> ]] :call search('^\s*sub\>', "W")<CR>
+noremap <silent><buffer> [] :call search('^\s*endsub\>', "bW")<CR>
+noremap <silent><buffer> ][ :call search('^\s*endsub\>', "W")<CR>
+
+" Move around comments
+noremap <silent><buffer> ]# :call search('^\s*#\@!', "W")<CR>
+noremap <silent><buffer> [# :call search('^\s*#\@!', "bW")<CR>
+
+" Let the matchit plugin know what items can be matched.
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_words =
+	\ '\<sub\>:\<return\>:\<endsub\>,' .
+        \ '\<do\|while\|repeat\|for\>:\<break\>:\<continue\>:\<loop\|endwhile\|until\|endfor\>,' .
+	\ '\<if\>:\<else\%[if]\>:\<endif\>' 
+
+  " Ignore ":syntax region" commands, the 'end' argument clobbers if-endif
+  " let b:match_skip = 'getline(".") =~ "^\\s*sy\\%[ntax]\\s\\+region" ||
+  "	\ synIDattr(synID(line("."),col("."),1),"name") =~? "comment\\|string"'
+endif
+
+setlocal ignorecase
+let &cpo = s:cpo_save
+unlet s:cpo_save
+setlocal cpo+=M		" makes \%( match \)
+
+endif
diff --git a/indent/hamster.vim b/indent/hamster.vim
new file mode 100644
index 000000000..b8f0b5d4b
--- /dev/null
+++ b/indent/hamster.vim
@@ -0,0 +1,59 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hamster') == -1
+
+" Vim indent file
+" Language:    Hamster Script 
+" Version:     2.0.6.0
+" Last Change: Wed Nov 08 2006 12:02:42 PM
+" Maintainer:  David Fishburn <fishburn@ianywhere.com>
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentkeys+==~if,=~else,=~endif,=~endfor,=~endwhile
+setlocal indentkeys+==~do,=~until,=~while,=~repeat,=~for,=~loop
+setlocal indentkeys+==~sub,=~endsub
+
+" Define the appropriate indent function but only once
+setlocal indentexpr=HamGetFreeIndent()
+if exists("*HamGetFreeIndent")
+  finish
+endif
+
+function HamGetIndent(lnum)
+  let ind = indent(a:lnum)
+  let prevline=getline(a:lnum)
+
+  " Add a shiftwidth to statements following if,  else, elseif,
+  " case, select, default, do, until, while, for, start
+  if prevline =~? '^\s*\<\(if\|else\%(if\)\?\|for\|repeat\|do\|while\|sub\)\>' 
+    let ind = ind + shiftwidth()
+  endif
+
+  " Subtract a shiftwidth from else, elseif, end(if|while|for), until
+  let line = getline(v:lnum)
+  if line =~? '^\s*\(else\|elseif\|loop\|until\|end\%(if\|while\|for\|sub\)\)\>'
+    let ind = ind - shiftwidth()
+  endif
+
+  return ind
+endfunction
+
+function HamGetFreeIndent()
+  " Find the previous non-blank line
+  let lnum = prevnonblank(v:lnum - 1)
+
+  " Use zero indent at the top of the file
+  if lnum == 0
+    return 0
+  endif
+
+  let ind=HamGetIndent(lnum)
+  return ind
+endfunction
+
+" vim:sw=2 tw=80
+
+endif
diff --git a/packages.yaml b/packages.yaml
index eda3e2173..9245307ae 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1943,3 +1943,40 @@ filetypes:
   filenames:
   - auto.master
   - config
+---
+name: b
+remote: vim/vim:runtime
+glob: '**/b.vim'
+filetypes:
+- name: b
+  extensions:
+  - mch
+  - ref
+  - imp
+---
+name: ibasic
+remote: vim/vim:runtime
+glob: '**/ibasic.vim'
+filetypes:
+- name: ibasic
+  extensions:
+  - iba
+  - ibi
+---
+name: freebasic
+remote: vim/vim:runtime
+glob: '**/freebasic.vim'
+filetypes:
+- name: freebasic
+  extensions:
+  - fb
+  - bi
+---
+name: hamster
+remote: vim/vim:runtime
+glob: '**/hamster.vim'
+filetypes:
+- name: hamster
+  extensions:
+  - hsc
+  - hsm
diff --git a/syntax/b.vim b/syntax/b.vim
new file mode 100644
index 000000000..588fdebc0
--- /dev/null
+++ b/syntax/b.vim
@@ -0,0 +1,118 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'b') == -1
+
+" Vim syntax file
+" Language:	B (A Formal Method with refinement and mathematical proof)
+" Maintainer:	Mathieu Clabaut <mathieu.clabaut@gmail.com>
+" Contributor:  Csaba Hoch
+" LastChange:	8 Dec 2007
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+   finish
+endif
+
+
+" A bunch of useful B keywords
+syn keyword bStatement	        MACHINE MODEL SEES OPERATIONS INCLUDES DEFINITIONS CONSTRAINTS CONSTANTS VARIABLES CONCRETE_CONSTANTS CONCRETE_VARIABLES ABSTRACT_CONSTANTS ABSTRACT_VARIABLES HIDDEN_CONSTANTS HIDDEN_VARIABLES ASSERT ASSERTIONS  EXTENDS IMPLEMENTATION REFINEMENT IMPORTS USES INITIALISATION INVARIANT PROMOTES PROPERTIES REFINES SETS VALUES VARIANT VISIBLE_CONSTANTS VISIBLE_VARIABLES THEORY XLS THEOREMS LOCAL_OPERATIONS
+syn keyword bLabel		CASE IN EITHER OR CHOICE DO OF
+syn keyword bConditional	IF ELSE SELECT ELSIF THEN WHEN
+syn keyword bRepeat		WHILE FOR
+syn keyword bOps		bool card conc closure closure1 dom first fnc front not or id inter iseq iseq1 iterate last max min mod perm pred prj1 prj2 ran rel rev seq seq1 size skip succ tail union
+syn keyword bKeywords		LET VAR BE IN BEGIN END  POW POW1 FIN FIN1  PRE  SIGMA STRING UNION IS ANY WHERE
+
+syn keyword bBoolean	TRUE FALSE bfalse btrue
+syn keyword bConstant	PI MAXINT MININT User_Pass PatchProver PatchProverH0 PatchProverB0 FLAT ARI DED SUB RES
+syn keyword bGuard binhyp band bnot bguard bsearch bflat bfresh bguardi bget bgethyp barith bgetresult bresult bgoal bmatch bmodr bnewv  bnum btest bpattern bprintf bwritef bsubfrm  bvrb blvar bcall bappend bclose
+
+syn keyword bLogic	or not
+syn match bLogic	"\(!\|#\|%\|&\|+->>\|+->\|-->>\|->>\|-->\|->\|/:\|/<:\|/<<:\|/=\|/\\\|/|\\\|::\|:\|;:\|<+\|<->\|<--\|<-\|<:\|<<:\|<<|\|<=>\|<|\|==\|=>\|>+>>\|>->\|>+>\|||\||->\)"
+syn match bNothing      /:=/
+
+syn keyword cTodo contained	TODO FIXME XXX
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match bSpecial contained	"\\[0-7][0-7][0-7]\=\|\\."
+syn region bString		start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=bSpecial
+syn match bCharacter		"'[^\\]'"
+syn match bSpecialCharacter	"'\\.'"
+syn match bSpecialCharacter	"'\\[0-7][0-7]'"
+syn match bSpecialCharacter	"'\\[0-7][0-7][0-7]'"
+
+"catch errors caused by wrong parenthesis
+syn region bParen		transparent start='(' end=')' contains=ALLBUT,bParenError,bIncluded,bSpecial,bTodo,bUserLabel,bBitField
+syn match bParenError		")"
+syn match bInParen contained	"[{}]"
+
+"integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match bNumber		"\<[0-9]\+\>"
+"syn match bIdentifier	"\<[a-z_][a-z0-9_]*\>"
+syn case match
+
+  syn region bComment		start="/\*" end="\*/" contains=bTodo
+  syn match bComment		"//.*" contains=bTodo
+syntax match bCommentError	"\*/"
+
+syn keyword bType		INT INTEGER BOOL NAT NATURAL NAT1 NATURAL1
+
+syn region bPreCondit	start="^\s*#\s*\(if\>\|ifdef\>\|ifndef\>\|elif\>\|else\>\|endif\>\)" skip="\\$" end="$" contains=bComment,bString,bCharacter,bNumber,bCommentError
+syn region bIncluded contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match bIncluded contained "<[^>]*>"
+syn match bInclude		"^\s*#\s*include\>\s*["<]" contains=bIncluded
+
+syn region bDefine		start="^\s*#\s*\(define\>\|undef\>\)" skip="\\$" end="$" contains=ALLBUT,bPreCondit,bIncluded,bInclude,bDefine,bInParen
+syn region bPreProc		start="^\s*#\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" contains=ALLBUT,bPreCondit,bIncluded,bInclude,bDefine,bInParen
+
+syn sync ccomment bComment minlines=10
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+
+" The default methods for highlighting.  Can be overridden later
+hi def link bLabel	Label
+hi def link bUserLabel	Label
+hi def link bConditional	Conditional
+hi def link bRepeat	Repeat
+hi def link bLogic	Special
+hi def link bCharacter	Character
+hi def link bSpecialCharacter bSpecial
+hi def link bNumber	Number
+hi def link bFloat	Float
+hi def link bOctalError	bError
+hi def link bParenError	bError
+" hi def link bInParen	bError
+hi def link bCommentError	bError
+hi def link bBoolean	Identifier
+hi def link bConstant	Identifier
+hi def link bGuard	Identifier
+hi def link bOperator	Operator
+hi def link bKeywords	Operator
+hi def link bOps		Identifier
+hi def link bStructure	Structure
+hi def link bStorageClass	StorageClass
+hi def link bInclude	Include
+hi def link bPreProc	PreProc
+hi def link bDefine	Macro
+hi def link bIncluded	bString
+hi def link bError	Error
+hi def link bStatement	Statement
+hi def link bPreCondit	PreCondit
+hi def link bType		Type
+hi def link bCommentError	bError
+hi def link bCommentString bString
+hi def link bComment2String bString
+hi def link bCommentSkip	bComment
+hi def link bString	String
+hi def link bComment	Comment
+hi def link bSpecial	SpecialChar
+hi def link bTodo		Todo
+"hi link bIdentifier	Identifier
+
+let b:current_syntax = "b"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/freebasic.vim b/syntax/freebasic.vim
new file mode 100644
index 000000000..cc932d63f
--- /dev/null
+++ b/syntax/freebasic.vim
@@ -0,0 +1,261 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'freebasic') == -1
+
+" Vim syntax file
+" Language:    FreeBasic
+" Maintainer:  Mark Manning <markem@sim1.us>
+" Updated:     10/9/2019
+" Version:		7.0b
+"
+" Description:
+"
+"	Based originally on the work done by Allan Kelly <Allan.Kelly@ed.ac.uk>
+"	Updated by Mark Manning <markem@sim1.us>
+"	Applied FreeBasic support to the already excellent support
+"	for standard basic syntax (like QB).
+"
+"	First version based on Micro$soft QBASIC circa
+"	1989, as documented in 'Learn BASIC Now' by
+"	Halvorson&Rygmyr. Microsoft Press 1989.  This syntax file
+"	not a complete implementation yet.  Send suggestions to
+"	the maintainer.
+"
+"	Quit when a (custom) syntax file was already loaded (Taken from c.vim)
+"
+if exists("b:current_syntax")
+  finish
+endif
+"
+"	Be sure to turn on the "case ignore" since current versions
+"	of freebasic support both upper as well as lowercase
+"	letters. - MEM 10/1/2006
+"
+syn case ignore
+"
+"	This list of keywords is taken directly from the FreeBasic
+"	user's guide as presented by the FreeBasic online site.
+"
+syn keyword	freebasicArrays			ERASE LBOUND REDIM PRESERVE UBOUND
+
+syn keyword	freebasicBitManipulation	BIT BITRESET BITSET HIBYTE HIWORD LOBYTE LOWORD SHL SHR
+
+syn keyword	freebasicCompilerSwitches	DEFBYTE DEFDBL DEFINT DEFLNG DEFLNGINT DEFSHORT DEFSNG DEFSTR
+syn keyword	freebasicCompilerSwitches	DEFUBYTE DEFUINT DEFULNGINT DEFUSHORT
+syn match	freebasicCompilerSwitches	"\<option\s+\(BASE\|BYVAL\|DYNAMIC\|ESCAPE\|EXPLICIT\|NOKEYWORD\)\>"
+syn match	freebasicCompilerSwitches	"\<option\s+\(PRIVATE\|STATIC\)\>"
+
+syn region	freebasicConditional		start="\son\s+" skip=".*" end="gosub"
+syn region	freebasicConditional		start="\son\s+" skip=".*" end="goto"
+syn match	freebasicConditional		"\<select\s+case\>"
+syn keyword	freebasicConditional		if iif then case else elseif with
+
+syn match	freebasicConsole		"\<open\s+\(CONS\|ERR\|PIPE\|SCRN\)\>"
+syn keyword	freebasicConsole		BEEP CLS CSRLIN LOCATE PRINT POS SPC TAB VIEW WIDTH
+
+syn keyword	freebasicDataTypes		BYTE AS DIM CONST DOUBLE ENUM INTEGER LONG LONGINT SHARED SHORT STRING
+syn keyword	freebasicDataTypes		SINGLE TYPE UBYTE UINTEGER ULONGINT UNION UNSIGNED USHORT WSTRING ZSTRING
+
+syn keyword	freebasicDateTime		DATE DATEADD DATEDIFF DATEPART DATESERIAL DATEVALUE DAY HOUR MINUTE
+syn keyword	freebasicDateTime		MONTH MONTHNAME NOW SECOND SETDATE SETTIME TIME TIMESERIAL TIMEVALUE
+syn keyword	freebasicDateTime		TIMER YEAR WEEKDAY WEEKDAYNAME
+
+syn keyword	freebasicDebug			ASSERT STOP
+
+syn keyword	freebasicErrorHandling		ERR ERL ERROR LOCAL RESUME
+syn match	freebasicErrorHandling		"\<resume\s+next\>"
+syn match	freebasicErrorHandling		"\<on\s+error\>"
+
+syn match	freebasicFiles			"\<get\s+#\>"
+syn match	freebasicFiles			"\<input\s+#\>"
+syn match	freebasicFiles			"\<line\s+input\s+#\>"
+syn match	freebasicFiles			"\<put\s+#\>"
+syn keyword	freebasicFiles			ACCESS APPEND BINARY BLOAD BSAVE CLOSE EOF FREEFILE INPUT LOC
+syn keyword	freebasicFiles			LOCK LOF OPEN OUTPUT RANDOM RESET SEEK UNLOCK WRITE
+
+syn keyword	freebasicFunctions		ALIAS ANY BYREF BYVAL CALL CDECL CONSTRUCTOR DESTRUCTOR
+syn keyword	freebasicFunctions		DECLARE FUNCTION LIB OVERLOAD PASCAL STATIC SUB STDCALL
+syn keyword	freebasicFunctions		VA_ARG VA_FIRST VA_NEXT
+
+syn match	freebasicGraphics		"\<palette\s+get\>"
+syn keyword	freebasicGraphics		ALPHA CIRCLE CLS COLOR CUSTOM DRAW FLIP GET
+syn keyword	freebasicGraphics		IMAGECREATE IMAGEDESTROY LINE PAINT PALETTE PCOPY PMAP POINT
+syn keyword	freebasicGraphics		PRESET PSET PUT RGB RGBA SCREEN SCREENCOPY SCREENINFO SCREENLIST
+syn keyword	freebasicGraphics		SCREENLOCK SCREENPTR SCREENRES SCREENSET SCREENSYNC SCREENUNLOCK
+syn keyword	freebasicGraphics		TRANS USING VIEW WINDOW
+
+syn match	freebasicHardware		"\<open\s+com\>"
+syn keyword	freebasicHardware		INP OUT WAIT LPT LPOS LPRINT
+
+syn keyword	freebasicLogical		AND EQV IMP OR NOT XOR
+
+syn keyword	freebasicMath			ABS ACOS ASIN ATAN2 ATN COS EXP FIX INT LOG MOD RANDOMIZE
+syn keyword	freebasicMath			RND SGN SIN SQR TAN
+
+syn keyword	freebasicMemory			ALLOCATE CALLOCATE CLEAR DEALLOCATE FIELD FRE PEEK POKE REALLOCATE
+
+syn keyword	freebasicMisc			ASM DATA LET TO READ RESTORE SIZEOF SWAP OFFSETOF
+
+syn keyword	freebasicModularizing		CHAIN COMMON EXPORT EXTERN DYLIBFREE DYLIBLOAD DYLIBSYMBOL
+syn keyword	freebasicModularizing		PRIVATE PUBLIC
+
+syn keyword	freebasicMultithreading		MUTEXCREATE MUTEXDESTROY MUTEXLOCK MUTEXUNLOCK THREADCREATE THREADWAIT
+
+syn keyword	freebasicShell			CHDIR DIR COMMAND ENVIRON EXEC EXEPATH KILL NAME MKDIR RMDIR RUN
+
+syn keyword	freebasicEnviron		SHELL SYSTEM WINDOWTITLE POINTERS
+
+syn keyword	freebasicLoops			FOR LOOP WHILE WEND DO CONTINUE STEP UNTIL next
+
+syn match	freebasicInclude		"\<#\s*\(inclib\|include\)\>"
+syn match	freebasicInclude		"\<\$\s*include\>"
+
+syn keyword	freebasicPointer		PROCPTR PTR SADD STRPTR VARPTR
+
+syn keyword	freebasicPredefined		__DATE__ __FB_DOS__ __FB_LINUX__ __FB_MAIN__ __FB_MIN_VERSION__
+syn keyword	freebasicPredefined		__FB_SIGNATURE__ __FB_VERSION__ __FB_WIN32__ __FB_VER_MAJOR__
+syn keyword	freebasicPredefined		__FB_VER_MINOR__ __FB_VER_PATCH__ __FILE__ __FUNCTION__
+syn keyword	freebasicPredefined		__LINE__ __TIME__
+
+syn match	freebasicPreProcessor		"\<^#\s*\(define\|undef\)\>"
+syn match	freebasicPreProcessor		"\<^#\s*\(ifdef\|ifndef\|else\|elseif\|endif\|if\)\>"
+syn match	freebasicPreProcessor		"\<#\s*error\>"
+syn match	freebasicPreProcessor		"\<#\s*\(print\|dynamic\|static\)\>"
+syn keyword	freebasicPreProcessor		DEFINED ONCE
+
+syn keyword	freebasicProgramFlow		END EXIT GOSUB GOTO
+syn keyword	freebasicProgramFlow		IS RETURN SCOPE SLEEP
+
+syn keyword	freebasicString			INSTR LCASE LEFT LEN LSET LTRIM MID RIGHT RSET RTRIM
+syn keyword	freebasicString			SPACE STRING TRIM UCASE ASC BIN CHR CVD CVI CVL CVLONGINT
+syn keyword	freebasicString			CVS CVSHORT FORMAT HEX MKD MKI MKL MKLONGINT MKS MKSHORT
+syn keyword	freebasicString			OCT STR VAL VALLNG VALINT VALUINT VALULNG
+
+syn keyword	freebasicTypeCasting		CAST CBYTE CDBL CINT CLNG CLNGINT CPTR CSHORT CSIGN CSNG
+syn keyword	freebasicTypeCasting		CUBYTE CUINT CULNGINT CUNSG CURDIR CUSHORT
+
+syn match	freebasicUserInput		"\<line\s+input\>"
+syn keyword	freebasicUserInput		GETJOYSTICK GETKEY GETMOUSE INKEY INPUT MULTIKEY SETMOUSE
+"
+"	Do the Basic variables names first.  This is because it
+"	is the most inclusive of the tests.  Later on we change
+"	this so the identifiers are split up into the various
+"	types of identifiers like functions, basic commands and
+"	such. MEM 9/9/2006
+"
+syn match	freebasicIdentifier			"\<[a-zA-Z_][a-zA-Z0-9_]*\>"
+syn match	freebasicGenericFunction	"\<[a-zA-Z_][a-zA-Z0-9_]*\>\s*("me=e-1,he=e-1
+"
+"	Function list
+"
+syn keyword	freebasicTodo		contained TODO
+"
+"	Catch errors caused by wrong parenthesis
+"
+syn region	freebasicParen		transparent start='(' end=')' contains=ALLBUT,@freebasicParenGroup
+syn match	freebasicParenError	")"
+syn match	freebasicInParen	contained "[{}]"
+syn cluster	freebasicParenGroup	contains=freebasicParenError,freebasicSpecial,freebasicTodo,freebasicUserCont,freebasicUserLabel,freebasicBitField
+"
+"	Integer number, or floating point number without a dot and with "f".
+"
+syn region	freebasicHex			start="&h" end="\W"
+syn region	freebasicHexError		start="&h\x*[g-zG-Z]" end="\W"
+syn region	freebasicOctal			start="&o" end="\W"
+syn region	freebasicOctalError		start="&o[0-7]*[89a-zA-Z]" end="\W"
+syn region	freebasicBinary			start="&b" end="\W"
+syn region	freebasicBinaryError	start="&b[01]*[2-9a-zA-Z]" end="\W"
+syn match	freebasicInteger		"\<\d\+\(u\=l\=\|lu\|f\)\>"
+"
+"	Floating point number, with dot, optional exponent
+"
+syn match	freebasicFloat		"\<\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=\>"
+"
+"	Floating point number, starting with a dot, optional exponent
+"
+syn match	freebasicFloat		"\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"
+"	Floating point number, without dot, with exponent
+"
+syn match	freebasicFloat		"\<\d\+e[-+]\=\d\+[fl]\=\>"
+"
+"	Octal number
+"
+syn case match
+syn match	freebasicOctal2			"\<0\o*\>"
+syn match	freebasicOctal2Error	"\<0\o*[89a-zA-Z]"
+"
+"	String and Character contstants
+"
+syn region	freebasicString		start='"' end='"' contains=freebasicSpecial,freebasicTodo
+syn region	freebasicString		start="'" end="'" contains=freebasicSpecial,freebasicTodo
+"
+"	Comments
+"
+syn match	freebasicSpecial	contained "\\\\."
+syn region	freebasicComment	start="^rem" end="$" contains=freebasicSpecial,freebasicTodo
+syn region	freebasicComment	start=":\s*rem" end="$" contains=freebasicSpecial,freebasicTodo
+syn region	freebasicComment	start="\s*'" end="$" contains=freebasicSpecial,freebasicTodo
+syn region	freebasicComment	start="^'" end="$" contains=freebasicSpecial,freebasicTodo
+"
+"	Now do the comments and labels
+"
+syn match	freebasicLabel		"^\d"
+syn match	freebasicLabel		"\<^\w+:\>"
+syn region	freebasicLineNumber	start="^\d" end="\s"
+"
+"	Create the clusters
+"
+syn cluster	freebasicNumber		contains=freebasicHex,freebasicOctal,freebasicOctal2,freebasicBinary,freebasicInteger,freebasicFloat
+syn cluster	freebasicError		contains=freebasicHexError,freebasicOctalError,freebasicOctal2,freebasicBinary
+"
+"	Used with OPEN statement
+"
+syn match	freebasicFilenumber		"#\d\+"
+syn match	freebasicMathOperator	"[\+\-\=\|\*\/\>\<\%\()[\]]" contains=freebasicParen
+"
+"	The default methods for highlighting.  Can be overridden later
+"
+hi def link freebasicArrays		StorageClass
+hi def link freebasicBitManipulation	Operator
+hi def link freebasicCompilerSwitches	PreCondit
+hi def link freebasicConsole		Special
+hi def link freebasicDataTypes		Type
+hi def link freebasicDateTime		Type
+hi def link freebasicDebug		Special
+hi def link freebasicErrorHandling	Special
+hi def link freebasicFiles		Special
+hi def link freebasicFunctions		Function
+hi def link freebasicGraphics		Function
+hi def link freebasicHardware		Special
+hi def link freebasicLogical		Conditional
+hi def link freebasicMath		Function
+hi def link freebasicMemory		Function
+hi def link freebasicMisc		Special
+hi def link freebasicModularizing	Special
+hi def link freebasicMultithreading	Special
+hi def link freebasicShell		Special
+hi def link freebasicEnviron		Special
+hi def link freebasicPointer		Special
+hi def link freebasicPredefined		PreProc
+hi def link freebasicPreProcessor	PreProc
+hi def link freebasicProgramFlow	Statement
+hi def link freebasicString		String
+hi def link freebasicTypeCasting	Type
+hi def link freebasicUserInput		Statement
+hi def link freebasicComment		Comment
+hi def link freebasicConditional	Conditional
+hi def link freebasicError		Error
+hi def link freebasicIdentifier		Identifier
+hi def link freebasicInclude		Include
+hi def link freebasicGenericFunction	Function
+hi def link freebasicLabel		Label
+hi def link freebasicLineNumber		Label
+hi def link freebasicMathOperator	Operator
+hi def link freebasicNumber		Number
+hi def link freebasicSpecial		Special
+hi def link freebasicTodo		Todo
+
+let b:current_syntax = "freebasic"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/hamster.vim b/syntax/hamster.vim
new file mode 100644
index 000000000..c93e95fa2
--- /dev/null
+++ b/syntax/hamster.vim
@@ -0,0 +1,374 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hamster') == -1
+
+" Vim syntax file
+" Language:    Hamster Scripting Language
+" Maintainer:  David Fishburn <fishburn@ianywhere.com>
+" Last Change: Sun Oct 24 2004 7:11:50 PM
+" Version:     2.0.6.0
+
+" Description: Hamster Classic
+" Hamster is a local server for news and mail. It's a windows-32-bit-program.
+" It allows the use of multiple news- and mailserver and combines them to one
+" mail- and newsserver for the news/mail-client. It load faster than a normal
+" newsreader because many threads can run simultaneous. It contains scorefile
+" for news and mail, a build-in script language, the GUI allows translation to
+" other languages, it can be used in a network and that's not all features...
+"
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+syn case ignore
+
+syn keyword hamsterSpecial abs
+syn keyword hamsterSpecial artaddheader
+syn keyword hamsterSpecial artalloc
+syn keyword hamsterSpecial artdelheader
+syn keyword hamsterSpecial artfree
+syn keyword hamsterSpecial artgetbody
+syn keyword hamsterSpecial artgetheader
+syn keyword hamsterSpecial artgetheaders
+syn keyword hamsterSpecial artgettext
+syn keyword hamsterSpecial artheaderexists
+syn keyword hamsterSpecial artload
+syn keyword hamsterSpecial artsave
+syn keyword hamsterSpecial artsetbody
+syn keyword hamsterSpecial artsetheader
+syn keyword hamsterSpecial artsetheaders
+syn keyword hamsterSpecial artsettext
+syn keyword hamsterSpecial assert
+syn keyword hamsterSpecial atadd
+syn keyword hamsterSpecial atclear
+syn keyword hamsterSpecial atcount
+syn keyword hamsterSpecial ateverymins
+syn keyword hamsterSpecial atexecute
+syn keyword hamsterSpecial atfrom
+syn keyword hamsterSpecial atondays
+syn keyword hamsterSpecial atsubfunction
+syn keyword hamsterSpecial atuntil
+syn keyword hamsterSpecial beep
+syn keyword hamsterSpecial break
+syn keyword hamsterSpecial chr
+syn keyword hamsterSpecial clearxcounter
+syn keyword hamsterSpecial clipread
+syn keyword hamsterSpecial clipwrite
+syn keyword hamsterSpecial const
+syn keyword hamsterSpecial constenum
+syn keyword hamsterSpecial continue
+syn keyword hamsterSpecial copy
+syn keyword hamsterSpecial debug
+syn keyword hamsterSpecial dec
+syn keyword hamsterSpecial decodebase64
+syn keyword hamsterSpecial decodeqp
+syn keyword hamsterSpecial decodetime
+syn keyword hamsterSpecial decxcounter
+syn keyword hamsterSpecial delete
+syn keyword hamsterSpecial deletehostsentry
+syn keyword hamsterSpecial digest
+syn keyword hamsterSpecial dirchange
+syn keyword hamsterSpecial dircurrent
+syn keyword hamsterSpecial direxists
+syn keyword hamsterSpecial dirmake
+syn keyword hamsterSpecial dirremove
+syn keyword hamsterSpecial dirsystem
+syn keyword hamsterSpecial dirwindows
+syn keyword hamsterSpecial diskfreekb
+syn keyword hamsterSpecial dllcall
+syn keyword hamsterSpecial dllfree
+syn keyword hamsterSpecial dlllasterror
+syn keyword hamsterSpecial dllload
+syn keyword hamsterSpecial dump
+syn keyword hamsterSpecial encodetime
+syn keyword hamsterSpecial entercontext
+syn keyword hamsterSpecial errcatch
+syn keyword hamsterSpecial errline
+syn keyword hamsterSpecial errlineno
+syn keyword hamsterSpecial errmodule
+syn keyword hamsterSpecial errmsg
+syn keyword hamsterSpecial errnum
+syn keyword hamsterSpecial error
+syn keyword hamsterSpecial errsender
+syn keyword hamsterSpecial eval
+syn keyword hamsterSpecial eventclose
+syn keyword hamsterSpecial eventcreate
+syn keyword hamsterSpecial eventmultiplewait
+syn keyword hamsterSpecial eventpulse
+syn keyword hamsterSpecial eventreset
+syn keyword hamsterSpecial eventset
+syn keyword hamsterSpecial eventwait
+syn keyword hamsterSpecial execute
+syn keyword hamsterSpecial false
+syn keyword hamsterSpecial filecopy
+syn keyword hamsterSpecial filedelete
+syn keyword hamsterSpecial fileexists
+syn keyword hamsterSpecial filemove
+syn keyword hamsterSpecial filerename
+syn keyword hamsterSpecial filesize
+syn keyword hamsterSpecial filetime
+syn keyword hamsterSpecial getenv
+syn keyword hamsterSpecial getprocessidentifier
+syn keyword hamsterSpecial getuptimedays
+syn keyword hamsterSpecial getuptimehours
+syn keyword hamsterSpecial getuptimemins
+syn keyword hamsterSpecial getuptimesecs
+syn keyword hamsterSpecial gosub
+syn keyword hamsterSpecial goto
+syn keyword hamsterSpecial hex
+syn keyword hamsterSpecial icase
+syn keyword hamsterSpecial iif
+syn keyword hamsterSpecial inc
+syn keyword hamsterSpecial incxcounter
+syn keyword hamsterSpecial inidelete
+syn keyword hamsterSpecial inierasesection
+syn keyword hamsterSpecial iniread
+syn keyword hamsterSpecial iniwrite
+syn keyword hamsterSpecial inputbox
+syn keyword hamsterSpecial inputpw
+syn keyword hamsterSpecial int
+syn keyword hamsterSpecial isint
+syn keyword hamsterSpecial isstr
+syn keyword hamsterSpecial leavecontext
+syn keyword hamsterSpecial len
+syn keyword hamsterSpecial listadd
+syn keyword hamsterSpecial listalloc
+syn keyword hamsterSpecial listappend
+syn keyword hamsterSpecial listbox
+syn keyword hamsterSpecial listclear
+syn keyword hamsterSpecial listcount
+syn keyword hamsterSpecial listdelete
+syn keyword hamsterSpecial listdirs
+syn keyword hamsterSpecial listexists
+syn keyword hamsterSpecial listfiles
+syn keyword hamsterSpecial listfiles
+syn keyword hamsterSpecial listfree
+syn keyword hamsterSpecial listget
+syn keyword hamsterSpecial listgetkey
+syn keyword hamsterSpecial listgettag
+syn keyword hamsterSpecial listgettext
+syn keyword hamsterSpecial listindexof
+syn keyword hamsterSpecial listinsert
+syn keyword hamsterSpecial listload
+syn keyword hamsterSpecial listrasentries
+syn keyword hamsterSpecial listsave
+syn keyword hamsterSpecial listset
+syn keyword hamsterSpecial listsetkey
+syn keyword hamsterSpecial listsettag
+syn keyword hamsterSpecial listsettext
+syn keyword hamsterSpecial listsort
+syn keyword hamsterSpecial localhostaddr
+syn keyword hamsterSpecial localhostname
+syn keyword hamsterSpecial lookuphostaddr
+syn keyword hamsterSpecial lookuphostname
+syn keyword hamsterSpecial lowercase
+syn keyword hamsterSpecial memalloc
+syn keyword hamsterSpecial memforget
+syn keyword hamsterSpecial memfree
+syn keyword hamsterSpecial memgetint
+syn keyword hamsterSpecial memgetstr
+syn keyword hamsterSpecial memsetint
+syn keyword hamsterSpecial memsetstr
+syn keyword hamsterSpecial memsize
+syn keyword hamsterSpecial memvarptr
+syn keyword hamsterSpecial msgbox
+syn keyword hamsterSpecial ord
+syn keyword hamsterSpecial paramcount
+syn keyword hamsterSpecial paramstr
+syn keyword hamsterSpecial popupbox
+syn keyword hamsterSpecial pos
+syn keyword hamsterSpecial print
+syn keyword hamsterSpecial quit
+syn keyword hamsterSpecial random
+syn keyword hamsterSpecial randomize
+syn keyword hamsterSpecial rasdial
+syn keyword hamsterSpecial rasgetconnection
+syn keyword hamsterSpecial rasgetip
+syn keyword hamsterSpecial rashangup
+syn keyword hamsterSpecial rasisconnected
+syn keyword hamsterSpecial re_extract
+syn keyword hamsterSpecial re_match
+syn keyword hamsterSpecial re_parse
+syn keyword hamsterSpecial re_split
+syn keyword hamsterSpecial replace
+syn keyword hamsterSpecial return
+syn keyword hamsterSpecial runscript
+syn keyword hamsterSpecial scriptpriority
+syn keyword hamsterSpecial set
+syn keyword hamsterSpecial sethostsentry_byaddr
+syn keyword hamsterSpecial sethostsentry_byname
+syn keyword hamsterSpecial setxcounter
+syn keyword hamsterSpecial sgn
+syn keyword hamsterSpecial shell
+syn keyword hamsterSpecial sleep
+syn keyword hamsterSpecial stopthread
+syn keyword hamsterSpecial str
+syn keyword hamsterSpecial syserrormessage
+syn keyword hamsterSpecial testmailfilterline
+syn keyword hamsterSpecial testnewsfilterline
+syn keyword hamsterSpecial ticks
+syn keyword hamsterSpecial time
+syn keyword hamsterSpecial timegmt
+syn keyword hamsterSpecial trace
+syn keyword hamsterSpecial trim
+syn keyword hamsterSpecial true
+syn keyword hamsterSpecial uppercase
+syn keyword hamsterSpecial utf7toucs16
+syn keyword hamsterSpecial utf8toucs32
+syn keyword hamsterSpecial var
+syn keyword hamsterSpecial varset
+syn keyword hamsterSpecial warning
+syn keyword hamsterSpecial xcounter
+
+" common functions
+syn keyword hamsterFunction addlog
+syn keyword hamsterFunction decodemimeheaderstring
+syn keyword hamsterFunction decodetolocalcharset
+syn keyword hamsterFunction gettasksactive
+syn keyword hamsterFunction gettasksrun
+syn keyword hamsterFunction gettaskswait
+syn keyword hamsterFunction hamaddgroup
+syn keyword hamsterFunction hamaddlog
+syn keyword hamsterFunction hamaddpull
+syn keyword hamsterFunction hamartcount
+syn keyword hamsterFunction hamartdeletemid
+syn keyword hamsterFunction hamartdeletemidingroup
+syn keyword hamsterFunction hamartdeletenringroup
+syn keyword hamsterFunction hamartimport
+syn keyword hamsterFunction hamartlocatemid
+syn keyword hamsterFunction hamartlocatemidingroup
+syn keyword hamsterFunction hamartnomax
+syn keyword hamsterFunction hamartnomin
+syn keyword hamsterFunction hamarttext
+syn keyword hamsterFunction hamarttextexport
+syn keyword hamsterFunction hamchangepassword
+syn keyword hamsterFunction hamcheckpurge
+syn keyword hamsterFunction hamdelgroup
+syn keyword hamsterFunction hamdelpull
+syn keyword hamsterFunction hamdialogaddpull
+syn keyword hamsterFunction hamdialogeditdirs
+syn keyword hamsterFunction hamdialogmailkillfilelog
+syn keyword hamsterFunction hamdialognewskillfilelog
+syn keyword hamsterFunction hamdialogscripts
+syn keyword hamsterFunction hamenvelopefrom
+syn keyword hamsterFunction hamexepath
+syn keyword hamsterFunction hamfetchmail
+syn keyword hamsterFunction hamflush
+syn keyword hamsterFunction hamgetstatus
+syn keyword hamsterFunction hamgroupclose
+syn keyword hamsterFunction hamgroupcount
+syn keyword hamsterFunction hamgroupindex
+syn keyword hamsterFunction hamgroupname
+syn keyword hamsterFunction hamgroupnamebyhandle
+syn keyword hamsterFunction hamgroupopen
+syn keyword hamsterFunction hamgroupspath
+syn keyword hamsterFunction hamhscpath
+syn keyword hamsterFunction hamhsmpath
+syn keyword hamsterFunction hamimapserver
+syn keyword hamsterFunction hamisidle
+syn keyword hamsterFunction hamlogspath
+syn keyword hamsterFunction hammailexchange
+syn keyword hamsterFunction hammailpath
+syn keyword hamsterFunction hammailsoutpath
+syn keyword hamsterFunction hammainfqdn
+syn keyword hamsterFunction hammainwindow
+syn keyword hamsterFunction hammessage
+syn keyword hamsterFunction hammidfqdn
+syn keyword hamsterFunction hamnewmail
+syn keyword hamsterFunction hamnewserrpath
+syn keyword hamsterFunction hamnewsjobsadd
+syn keyword hamsterFunction hamnewsjobscheckactive
+syn keyword hamsterFunction hamnewsjobsclear
+syn keyword hamsterFunction hamnewsjobsdelete
+syn keyword hamsterFunction hamnewsjobsfeed
+syn keyword hamsterFunction hamnewsjobsgetcounter
+syn keyword hamsterFunction hamnewsjobsgetparam
+syn keyword hamsterFunction hamnewsjobsgetpriority
+syn keyword hamsterFunction hamnewsjobsgetserver
+syn keyword hamsterFunction hamnewsjobsgettype
+syn keyword hamsterFunction hamnewsjobspost
+syn keyword hamsterFunction hamnewsjobspostdef
+syn keyword hamsterFunction hamnewsjobspull
+syn keyword hamsterFunction hamnewsjobspulldef
+syn keyword hamsterFunction hamnewsjobssetpriority
+syn keyword hamsterFunction hamnewsjobsstart
+syn keyword hamsterFunction hamnewsoutpath
+syn keyword hamsterFunction hamnewspost
+syn keyword hamsterFunction hamnewspull
+syn keyword hamsterFunction hamnntpserver
+syn keyword hamsterFunction hampassreload
+syn keyword hamsterFunction hampath
+syn keyword hamsterFunction hampop3server
+syn keyword hamsterFunction hampostmaster
+syn keyword hamsterFunction hampurge
+syn keyword hamsterFunction hamrasdial
+syn keyword hamsterFunction hamrashangup
+syn keyword hamsterFunction hamrcpath
+syn keyword hamsterFunction hamrebuildgloballists
+syn keyword hamsterFunction hamrebuildhistory
+syn keyword hamsterFunction hamrecoserver
+syn keyword hamsterFunction hamreloadconfig
+syn keyword hamsterFunction hamreloadipaccess
+syn keyword hamsterFunction hamresetcounters
+syn keyword hamsterFunction hamrotatelog
+syn keyword hamsterFunction hamscorelist
+syn keyword hamsterFunction hamscoretest
+syn keyword hamsterFunction hamsendmail
+syn keyword hamsterFunction hamsendmailauth
+syn keyword hamsterFunction hamserverpath
+syn keyword hamsterFunction hamsetlogin
+syn keyword hamsterFunction hamshutdown
+syn keyword hamsterFunction hamsmtpserver
+syn keyword hamsterFunction hamstopalltasks
+syn keyword hamsterFunction hamthreadcount
+syn keyword hamsterFunction hamtrayicon
+syn keyword hamsterFunction hamusenetacc
+syn keyword hamsterFunction hamversion
+syn keyword hamsterFunction hamwaitidle
+syn keyword hamsterFunction raslasterror
+syn keyword hamsterFunction rfctimezone
+syn keyword hamsterFunction settasklimiter
+
+syn keyword hamsterStatement if
+syn keyword hamsterStatement else
+syn keyword hamsterStatement elseif
+syn keyword hamsterStatement endif
+syn keyword hamsterStatement do
+syn keyword hamsterStatement loop
+syn keyword hamsterStatement while
+syn keyword hamsterStatement endwhile
+syn keyword hamsterStatement repeat
+syn keyword hamsterStatement until
+syn keyword hamsterStatement for
+syn keyword hamsterStatement endfor
+syn keyword hamsterStatement sub
+syn keyword hamsterStatement endsub
+syn keyword hamsterStatement label
+
+
+" Strings and characters:
+syn region hamsterString	start=+"+    end=+"+ contains=@Spell
+syn region hamsterString	start=+'+    end=+'+ contains=@Spell
+
+" Numbers:
+syn match hamsterNumber		"-\=\<\d*\.\=[0-9_]\>"
+
+" Comments:
+syn region hamsterHashComment	start=/#/ end=/$/ contains=@Spell
+syn cluster hamsterComment	contains=hamsterHashComment
+syn sync ccomment hamsterHashComment
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link hamsterHashComment	Comment
+hi def link hamsterSpecial	Special
+hi def link hamsterStatement	Statement
+hi def link hamsterString	String
+hi def link hamsterFunction	Function
+
+
+let b:current_syntax = "hamster"
+
+" vim:sw=4
+
+endif
diff --git a/syntax/ibasic.vim b/syntax/ibasic.vim
new file mode 100644
index 000000000..0fd76d484
--- /dev/null
+++ b/syntax/ibasic.vim
@@ -0,0 +1,180 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ibasic') == -1
+
+" Vim syntax file
+" Language:	ibasic
+" Maintainer:	Mark Manning <markem@airmail.net>
+" Originator:	Allan Kelly <Allan.Kelly@ed.ac.uk>
+" Created:	10/1/2006
+" Updated:	10/21/2006
+" Description:  A vim file to handle the IBasic file format.
+" Notes:
+"	Updated by Mark Manning <markem@airmail.net>
+"	Applied IBasic support to the already excellent support for standard
+"	basic syntax (like QB).
+"
+"	First version based on Micro$soft QBASIC circa 1989, as documented in
+"	'Learn BASIC Now' by Halvorson&Rygmyr. Microsoft Press 1989.
+"	This syntax file not a complete implementation yet.
+"	Send suggestions to the maintainer.
+"
+"	This version is based upon the commands found in IBasic (www.pyxia.com).
+"	MEM 10/6/2006
+"
+"	Quit when a (custom) syntax file was already loaded (Taken from c.vim)
+"
+if exists("b:current_syntax")
+  finish
+endif
+"
+"	Be sure to turn on the "case ignore" since current versions of basic
+"	support both upper as well as lowercase letters.
+"
+syn case ignore
+"
+" A bunch of useful BASIC keywords
+"
+syn keyword ibasicStatement	beep bload bsave call absolute chain chdir circle
+syn keyword ibasicStatement	clear close cls color com common const data
+syn keyword ibasicStatement	loop draw end environ erase error exit field
+syn keyword ibasicStatement	files function get gosub goto
+syn keyword ibasicStatement	input input# ioctl key kill let line locate
+syn keyword ibasicStatement	lock unlock lprint using lset mkdir name
+syn keyword ibasicStatement	on error open option base out paint palette pcopy
+syn keyword ibasicStatement	pen play pmap poke preset print print# using pset
+syn keyword ibasicStatement	put randomize read redim reset restore resume
+syn keyword ibasicStatement	return rmdir rset run seek screen
+syn keyword ibasicStatement	shared shell sleep sound static stop strig sub
+syn keyword ibasicStatement	swap system timer troff tron type unlock
+syn keyword ibasicStatement	view wait width window write
+syn keyword ibasicStatement	date$ mid$ time$
+"
+"	Do the basic variables names first.  This is because it
+"	is the most inclusive of the tests.  Later on we change
+"	this so the identifiers are split up into the various
+"	types of identifiers like functions, basic commands and
+"	such. MEM 9/9/2006
+"
+syn match	ibasicIdentifier			"\<[a-zA-Z_][a-zA-Z0-9_]*\>"
+syn match	ibasicGenericFunction	"\<[a-zA-Z_][a-zA-Z0-9_]*\>\s*("me=e-1,he=e-1
+"
+"	Function list
+"
+syn keyword ibasicBuiltInFunction	abs asc atn cdbl cint clng cos csng csrlin cvd cvdmbf
+syn keyword ibasicBuiltInFunction	cvi cvl cvs cvsmbf eof erdev erl err exp fileattr
+syn keyword ibasicBuiltInFunction	fix fre freefile inp instr lbound len loc lof
+syn keyword ibasicBuiltInFunction	log lpos mod peek pen point pos rnd sadd screen seek
+syn keyword ibasicBuiltInFunction	setmem sgn sin spc sqr stick strig tab tan ubound
+syn keyword ibasicBuiltInFunction	val valptr valseg varptr varseg
+syn keyword ibasicBuiltInFunction	chr\$ command$ date$ environ$ erdev$ hex$ inkey$
+syn keyword ibasicBuiltInFunction	input$ ioctl$ lcases$ laft$ ltrim$ mid$ mkdmbf$ mkd$
+syn keyword ibasicBuiltInFunction	mki$ mkl$ mksmbf$ mks$ oct$ right$ rtrim$ space$
+syn keyword ibasicBuiltInFunction	str$ string$ time$ ucase$ varptr$
+syn keyword ibasicTodo contained	TODO
+syn cluster	ibasicFunctionCluster	contains=ibasicBuiltInFunction,ibasicGenericFunction
+
+syn keyword Conditional	if else then elseif endif select case endselect
+syn keyword Repeat	for do while next enddo endwhile wend
+
+syn keyword ibasicTypeSpecifier	single double defdbl defsng
+syn keyword ibasicTypeSpecifier	int integer uint uinteger int64 uint64 defint deflng
+syn keyword ibasicTypeSpecifier	byte char string istring defstr
+syn keyword ibasicDefine	dim def declare
+"
+"catch errors caused by wrong parenthesis
+"
+syn cluster	ibasicParenGroup	contains=ibasicParenError,ibasicIncluded,ibasicSpecial,ibasicTodo,ibasicUserCont,ibasicUserLabel,ibasicBitField
+syn region	ibasicParen		transparent start='(' end=')' contains=ALLBUT,@bParenGroup
+syn match	ibasicParenError	")"
+syn match	ibasicInParen	contained "[{}]"
+"
+"integer number, or floating point number without a dot and with "f".
+"
+syn region	ibasicHex		start="&h" end="\W"
+syn region	ibasicHexError	start="&h\x*[g-zG-Z]" end="\W"
+syn match	ibasicInteger	"\<\d\+\(u\=l\=\|lu\|f\)\>"
+"
+"floating point number, with dot, optional exponent
+"
+syn match	ibasicFloat		"\<\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=\>"
+"
+"floating point number, starting with a dot, optional exponent
+"
+syn match	ibasicFloat		"\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"
+"floating point number, without dot, with exponent
+"
+syn match	ibasicFloat		"\<\d\+e[-+]\=\d\+[fl]\=\>"
+"
+"hex number
+"
+syn match	ibasicIdentifier	"\<[a-zA-Z_][a-zA-Z0-9_]*\>"
+syn match	ibasicFunction	"\<[a-zA-Z_][a-zA-Z0-9_]*\>\s*("me=e-1,he=e-1
+syn case match
+syn match	ibasicOctalError	"\<0\o*[89]"
+"
+" String and Character contstants
+"
+syn region	ibasicString		start='"' end='"' contains=ibasicSpecial,ibasicTodo
+syn region	ibasicString		start="'" end="'" contains=ibasicSpecial,ibasicTodo
+"
+"	Comments
+"
+syn match	ibasicSpecial	contained "\\."
+syn region  ibasicComment	start="^rem" end="$" contains=ibasicSpecial,ibasicTodo
+syn region  ibasicComment	start=":\s*rem" end="$" contains=ibasicSpecial,ibasicTodo
+syn region	ibasicComment	start="\s*'" end="$" contains=ibasicSpecial,ibasicTodo
+syn region	ibasicComment	start="^'" end="$" contains=ibasicSpecial,ibasicTodo
+"
+"	Now do the comments and labels
+"
+syn match	ibasicLabel		"^\d"
+syn region  ibasicLineNumber	start="^\d" end="\s"
+"
+"	Pre-compiler options : FreeBasic
+"
+syn region	ibasicPreCondit	start="^\s*#\s*\(if\>\|ifdef\>\|ifndef\>\|elif\>\|else\>\|endif\>\)" skip="\\$" end="$" contains=ibasicString,ibasicCharacter,ibasicNumber,ibasicCommentError,ibasicSpaceError
+syn match	ibasicInclude	"^\s*#\s*include\s*"
+"
+"	Create the clusters
+"
+syn cluster ibasicNumber contains=ibasicHex,ibasicInteger,ibasicFloat
+syn cluster	ibasicError	contains=ibasicHexError
+"
+"	Used with OPEN statement
+"
+syn match   ibasicFilenumber  "#\d\+"
+"
+"syn sync ccomment ibasicComment
+"
+syn match	ibasicMathOperator	"[\+\-\=\|\*\/\>\<\%\()[\]]" contains=ibasicParen
+"
+" The default methods for highlighting.  Can be overridden later
+"
+hi def link ibasicLabel			Label
+hi def link ibasicConditional		Conditional
+hi def link ibasicRepeat		Repeat
+hi def link ibasicHex			Number
+hi def link ibasicInteger		Number
+hi def link ibasicFloat			Number
+hi def link ibasicError			Error
+hi def link ibasicHexError		Error
+hi def link ibasicStatement		Statement
+hi def link ibasicString		String
+hi def link ibasicComment		Comment
+hi def link ibasicLineNumber		Comment
+hi def link ibasicSpecial		Special
+hi def link ibasicTodo			Todo
+hi def link ibasicGenericFunction	Function
+hi def link ibasicBuiltInFunction	Function
+hi def link ibasicTypeSpecifier		Type
+hi def link ibasicDefine		Type
+hi def link ibasicInclude		Include
+hi def link ibasicIdentifier		Identifier
+hi def link ibasicFilenumber		ibasicTypeSpecifier
+hi def link ibasicMathOperator		Operator
+
+let b:current_syntax = "ibasic"
+
+" vim: ts=8
+
+endif
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 0c36df68b..39caa48a1 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -239,3 +239,7 @@ call TestFiletype('prolog')
 call TestFiletype('tads')
 call TestFiletype('gitignore')
 call TestFiletype('sql')
+call TestFiletype('b')
+call TestFiletype('ibasic')
+call TestFiletype('freebasic')
+call TestFiletype('hamster')

From cbc460033329db8a1638e27830ad7264cd349a9d Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 4 Oct 2020 23:25:48 +0200
Subject: [PATCH 110/299] Update

---
 after/indent/javascript-2.vim | 17 ++++++++---------
 after/indent/typescript.vim   | 17 ++++++++---------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/after/indent/javascript-2.vim b/after/indent/javascript-2.vim
index 4e066e6fc..85e523121 100644
--- a/after/indent/javascript-2.vim
+++ b/after/indent/javascript-2.vim
@@ -23,25 +23,24 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
 
-runtime! indent/graphql.vim
-
-" Don't redefine our function and also require the standard Javascript indent
-" function to exist.
-if exists('*GetJavascriptGraphQLIndent') || !exists('*GetJavascriptIndent')
+if exists('*GetJavascriptGraphQLIndent') && !empty(&indentexpr)
   finish
 endif
 
+runtime! indent/graphql.vim
+
 " Set the indentexpr with our own version that will call GetGraphQLIndent when
-" we're inside of a GraphQL string and otherwise defer to GetJavascriptIndent.
+" we're inside of a GraphQL string and otherwise defer to the base function.
+let b:indentexpr_base = &indentexpr
 setlocal indentexpr=GetJavascriptGraphQLIndent()
 
 function GetJavascriptGraphQLIndent()
-  let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val,'name')")
-  if !empty(l:stack) && l:stack[0] ==# 'graphqlTemplateString'
+  let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val, 'name')")
+  if get(l:stack, 0) ==# 'graphqlTemplateString'
     return GetGraphQLIndent()
   endif
 
-  return GetJavascriptIndent()
+  return eval(b:indentexpr_base)
 endfunction
 
 endif
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
index 968517c89..45ef3492e 100644
--- a/after/indent/typescript.vim
+++ b/after/indent/typescript.vim
@@ -23,25 +23,24 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 " Language: GraphQL
 " Maintainer: Jon Parise <jon@indelible.org>
 
-runtime! indent/graphql.vim
-
-" Don't redefine our function and also require the standard Typescript indent
-" function to exist.
-if exists('*GetTypescriptGraphQLIndent') || !exists('*GetTypescriptIndent')
+if exists('*GetTypescriptGraphQLIndent') && !empty(&indentexpr)
   finish
 endif
 
+runtime! indent/graphql.vim
+
 " Set the indentexpr with our own version that will call GetGraphQLIndent when
-" we're inside of a GraphQL string and otherwise defer to GetTypescriptIndent.
+" we're inside of a GraphQL string and otherwise defer to the base function.
+let b:indentexpr_base = &indentexpr
 setlocal indentexpr=GetTypescriptGraphQLIndent()
 
 function GetTypescriptGraphQLIndent()
-  let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val,'name')")
-  if !empty(l:stack) && l:stack[0] ==# 'graphqlTemplateString'
+  let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val, 'name')")
+  if get(l:stack, 0) ==# 'graphqlTemplateString'
     return GetGraphQLIndent()
   endif
 
-  return GetTypescriptIndent()
+  return eval(b:indentexpr_base)
 endfunction
 
 endif

From c6fa4d2bf5eb5301f4d3f123031cf34839a5508d Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 6 Oct 2020 11:02:00 +0200
Subject: [PATCH 111/299] Add extensions to vlang

---
 autoload/polyglot/sleuth.vim | 2 +-
 ftdetect/polyglot.vim        | 2 +-
 packages.yaml                | 5 ++++-
 syntax/svelte.vim            | 9 +++++----
 tests/filetypes.vim          | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index aab55ef02..e2e371002 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -214,12 +214,12 @@ let s:globs = {
   \ 'typescript': '*.ts',
   \ 'typescriptreact': '*.tsx',
   \ 'unison': '*.u,*.uu',
-  \ 'v': '*.v',
   \ 'vala': '*.vala,*.vapi,*.valadoc',
   \ 'vb': '*.bas,*.cls,*.frm,*.frx,*.vba,*.vbs,*.dsm,*.ctl,*.sba',
   \ 'vbnet': '*.vb,*.vbhtml',
   \ 'vcl': '*.vcl',
   \ 'velocity': '*.vm',
+  \ 'vlang': '*.v,*.vv,*.vsh',
   \ 'vmasm': '*.mar',
   \ 'vue': '*.vue,*.wpy',
   \ 'xdc': '*.xdc',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index dc39341d4..de6e5919c 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -233,7 +233,7 @@ if !has_key(s:disabled_packages, 'vala')
 endif
 
 if !has_key(s:disabled_packages, 'v')
-  au BufNewFile,BufRead *.v setf v
+  au BufNewFile,BufRead *.v,*.vsh,*.vv setf vlang
 endif
 
 if !has_key(s:disabled_packages, 'unison')
diff --git a/packages.yaml b/packages.yaml
index 9245307ae..ec6579015 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1688,8 +1688,11 @@ filetypes:
 name: v
 remote: ollykel/v-vim
 filetypes:
-- name: v
+- name: vlang
   linguist: V
+  extra_extensions:
+  - vv
+  - vsh
 ---
 name: vala
 remote: arrufat/vala.vim
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index 8ec3bb736..4a510bebd 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -74,13 +74,14 @@ highlight def link svelteRepeat Repeat
 " Vim and it is enabled for the Svelte plugin.
 function! s:enabled(language)
   " Check whether a syntax file for {language} exists
-  if empty(globpath(&runtimepath, 'syntax/' . a:language . '.vim'))
+  let s:syntax_name = get(a:language, 'as', a:language.name)
+  if empty(globpath(&runtimepath, 'syntax/' . s:syntax_name . '.vim'))
     return 0
   endif
 
   " If g:svelte_preprocessors is set, check for it there, otherwise return 0.
   if exists('g:svelte_preprocessors') && type(g:svelte_preprocessors) == v:t_list
-    return index(g:svelte_preprocessors, a:language) != -1
+    return index(g:svelte_preprocessors, a:language.name) != -1
   else
     return 0
   endif
@@ -96,7 +97,7 @@ let s:languages = [
       \ ]
 
 " Add global tag definitions to our defaults.
-if exists('g:svelte_preprocessor_tags') && type('g:svelte_preprocessor_tags') == v:t_list
+if exists('g:svelte_preprocessor_tags') && type(g:svelte_preprocessor_tags) == v:t_list
   let s:languages += g:svelte_preprocessor_tags
 endif
 
@@ -104,7 +105,7 @@ for s:language in s:languages
   let s:attr = '\(lang\|type\)=\("\|''\)[^\2]*' . s:language.name . '[^\2]*\2'
   let s:start = '<' . s:language.tag . '\>\_[^>]*' . s:attr . '\_[^>]*>'
 
-  if s:enabled(s:language.name)
+  if s:enabled(s:language)
     execute 'syntax include @' . s:language.name . ' syntax/' . get(s:language, 'as', s:language.name) . '.vim'
     unlet! b:current_syntax
 
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 39caa48a1..1a2b725c0 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -214,7 +214,7 @@ call TestFiletype('xml.twig')
 call TestFiletype('typescript')
 call TestFiletype('typescriptreact')
 call TestFiletype('unison')
-call TestFiletype('v')
+call TestFiletype('vlang')
 call TestFiletype('vala')
 call TestFiletype('vbnet')
 call TestFiletype('vcl')

From bc9757916ed09763d96283ee62dbed58bd713a11 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 6 Oct 2020 18:54:19 +0200
Subject: [PATCH 112/299] Add all vim filetypes

---
 README.md                     |  386 +++-
 autoload/context.vim          |  188 ++
 autoload/polyglot/sleuth.vim  |  386 +++-
 autoload/xml/xsd.vim          |  134 ++
 compiler/bdf.vim              |   26 +
 compiler/context.vim          |   58 +
 compiler/cs.vim               |   30 +
 compiler/dot.vim              |   19 +
 compiler/sass.vim             |   34 +
 compiler/tcl.vim              |   21 +
 compiler/tex.vim              |   71 +
 compiler/tidy.vim             |   23 +
 ftdetect/polyglot.vim         | 1581 ++++++++++++++-
 ftplugin/bdf.vim              |   24 +
 ftplugin/bst.vim              |   19 +
 ftplugin/calendar.vim         |   24 +
 ftplugin/cdrdaoconf.vim       |   22 +
 ftplugin/cfg.vim              |   23 +
 ftplugin/ch.vim               |   21 +
 ftplugin/cobol.vim            |  273 +++
 ftplugin/config.vim           |   46 +
 ftplugin/context.vim          |  106 +
 ftplugin/crm.vim              |   23 +
 ftplugin/cs.vim               |   33 +
 ftplugin/csc.vim              |   31 +
 ftplugin/css.vim              |   28 +
 ftplugin/cvsrc.vim            |   23 +
 ftplugin/debchangelog.vim     |  387 ++++
 ftplugin/debcontrol.vim       |   74 +
 ftplugin/denyhosts.vim        |   22 +
 ftplugin/dictconf.vim         |   23 +
 ftplugin/dictdconf.vim        |   23 +
 ftplugin/diff.vim             |   22 +
 ftplugin/dircolors.vim        |   23 +
 ftplugin/dosbatch.vim         |   44 +
 ftplugin/dtd.vim              |   44 +
 ftplugin/elinks.vim           |   23 +
 ftplugin/eterm.vim            |   24 +
 ftplugin/falcon.vim           |   52 +
 ftplugin/fetchmail.vim        |   23 +
 ftplugin/fortran.vim          |  137 ++
 ftplugin/framescript.vim      |   34 +
 ftplugin/fvwm.vim             |   18 +
 ftplugin/gdb.vim              |   16 +
 ftplugin/gpg.vim              |   23 +
 ftplugin/group.vim            |   23 +
 ftplugin/hgcommit.vim         |   20 +
 ftplugin/hog.vim              |   43 +
 ftplugin/hostconf.vim         |   22 +
 ftplugin/hostsaccess.vim      |   23 +
 ftplugin/indent.vim           |   24 +
 ftplugin/j.vim                |   85 +
 ftplugin/java.vim             |   55 +
 ftplugin/jproperties.vim      |   19 +
 ftplugin/jsp.vim              |   71 +
 ftplugin/kconfig.vim          |   31 +
 ftplugin/kwt.vim              |   36 +
 ftplugin/ld.vim               |   24 +
 ftplugin/lftp.vim             |   23 +
 ftplugin/libao.vim            |   23 +
 ftplugin/limits.vim           |   23 +
 ftplugin/liquid.vim           |   65 +
 ftplugin/lisp.vim             |   30 +
 ftplugin/logcheck.vim         |   21 +
 ftplugin/loginaccess.vim      |   23 +
 ftplugin/logindefs.vim        |   23 +
 ftplugin/logtalk.vim          |   23 +
 ftplugin/lprolog.vim          |   41 +
 ftplugin/mail.vim             |   42 +
 ftplugin/mailaliases.vim      |   22 +
 ftplugin/mailcap.vim          |   23 +
 ftplugin/man.vim              |  254 +++
 ftplugin/manconf.vim          |   23 +
 ftplugin/mf.vim               |   74 +
 ftplugin/modconf.vim          |   24 +
 ftplugin/mp.vim               |   86 +
 ftplugin/mplayerconf.vim      |   24 +
 ftplugin/mrxvtrc.vim          |   26 +
 ftplugin/muttrc.vim           |   26 +
 ftplugin/nanorc.vim           |   23 +
 ftplugin/neomuttrc.vim        |   27 +
 ftplugin/netrc.vim            |   23 +
 ftplugin/nroff.vim            |   15 +
 ftplugin/nsis.vim             |   47 +
 ftplugin/occam.vim            |   53 +
 ftplugin/pamconf.vim          |   23 +
 ftplugin/pascal.vim           |   24 +
 ftplugin/passwd.vim           |   23 +
 ftplugin/pdf.vim              |   93 +
 ftplugin/pinfo.vim            |   23 +
 ftplugin/postscr.vim          |   42 +
 ftplugin/procmail.vim         |   25 +
 ftplugin/protocols.vim        |   23 +
 ftplugin/pyrex.vim            |   31 +
 ftplugin/quake.vim            |   23 +
 ftplugin/readline.vim         |   23 +
 ftplugin/reva.vim             |   29 +
 ftplugin/rmd.vim              |   67 +
 ftplugin/rnc.vim              |   23 +
 ftplugin/rnoweb.vim           |   45 +
 ftplugin/rpl.vim              |   26 +
 ftplugin/rrst.vim             |   58 +
 ftplugin/sass.vim             |   41 +
 ftplugin/scheme.vim           |   61 +
 ftplugin/screen.vim           |   23 +
 ftplugin/sensors.vim          |   23 +
 ftplugin/services.vim         |   23 +
 ftplugin/setserial.vim        |   23 +
 ftplugin/sieve.vim            |   24 +
 ftplugin/slpconf.vim          |   24 +
 ftplugin/slpreg.vim           |   24 +
 ftplugin/slpspi.vim           |   24 +
 ftplugin/spec.vim             |  212 ++
 ftplugin/sshconfig.vim        |   23 +
 ftplugin/sudoers.vim          |   23 +
 ftplugin/swiftgyb.vim         |   15 +
 ftplugin/sysctl.vim           |   24 +
 ftplugin/systemverilog.vim    |   15 +
 ftplugin/tcl.vim              |   41 +
 ftplugin/terminfo.vim         |   23 +
 ftplugin/tex.vim              |   50 +
 ftplugin/text.vim             |   22 +
 ftplugin/treetop.vim          |   23 +
 ftplugin/udevconf.vim         |   23 +
 ftplugin/udevperm.vim         |   23 +
 ftplugin/updatedb.vim         |   23 +
 ftplugin/verilog.vim          |   70 +
 ftplugin/vhdl.vim             |   92 +
 ftplugin/vim.vim              |  109 +
 ftplugin/vroom.vim            |   39 +
 ftplugin/wast.vim             |   21 +
 ftplugin/xdefaults.vim        |   24 +
 ftplugin/xhtml.vim            |   71 +
 ftplugin/xinetd.vim           |   24 +
 ftplugin/xmodmap.vim          |   23 +
 ftplugin/xsd.vim              |   43 +
 ftplugin/xslt.vim             |   20 +
 ftplugin/yaml.vim             |   29 -
 ftplugin/zimbu.vim            |  157 ++
 indent/bib.vim                |   19 +
 indent/bst.vim                |   79 +
 indent/cdl.vim                |  133 ++
 indent/ch.vim                 |   22 +
 indent/chaiscript.vim         |   54 +
 indent/cobol.vim              |  227 +++
 indent/config.vim             |   86 +
 indent/context.vim            |   40 +
 indent/cs.vim                 |   77 +
 indent/css.vim                |   88 +
 indent/cuda.vim               |   19 +
 indent/dictconf.vim           |   17 +
 indent/dictdconf.vim          |   17 +
 indent/dosbatch.vim           |   63 +
 indent/dtd.vim                |  329 ++++
 indent/dylan.vim              |   94 +
 indent/eterm.vim              |   40 +
 indent/falcon.vim             |  455 +++++
 indent/fortran.vim            |  223 +++
 indent/framescript.vim        |   45 +
 indent/gitolite.vim           |   53 +
 indent/hog.vim                |   81 +
 indent/j.vim                  |   54 +
 indent/java.vim               |  154 ++
 indent/jsp.vim                |   21 +
 indent/ld.vim                 |   88 +
 indent/lifelines.vim          |   28 +
 indent/liquid.vim             |   67 +
 indent/lisp.vim               |   19 +
 indent/logtalk.vim            |   68 +
 indent/mail.vim               |   17 +
 indent/mf.vim                 |   10 +
 indent/mp.vim                 |  364 ++++
 indent/nsis.vim               |   95 +
 indent/occam.vim              |  191 ++
 indent/pascal.vim             |  232 +++
 indent/postscr.vim            |   72 +
 indent/pov.vim                |   88 +
 indent/pyrex.vim              |   17 +
 indent/readline.vim           |   40 +
 indent/rmd.vim                |   70 +
 indent/rnoweb.vim             |   51 +
 indent/rpl.vim                |   67 +
 indent/rrst.vim               |   51 +
 indent/sas.vim                |  142 ++
 indent/sass.vim               |   42 +
 indent/scheme.vim             |   18 +
 indent/sdl.vim                |   97 +
 indent/sml.vim                |  221 +++
 indent/sshconfig.vim          |   38 +
 indent/systemverilog.vim      |  233 +++
 indent/tcl.vim                |  105 +
 indent/teraterm.vim           |   59 +
 indent/tex.vim                |  427 ++++
 indent/tf.vim                 |   76 +
 indent/tilde.vim              |   40 +
 indent/treetop.vim            |   42 +
 indent/verilog.vim            |  233 +++
 indent/vhdl.vim               |  439 +++++
 indent/vim.vim                |  134 ++
 indent/vroom.vim              |   25 +
 indent/wast.vim               |   21 +
 indent/xhtml.vim              |   16 +
 indent/xinetd.vim             |   59 +
 indent/xsd.vim                |   17 +
 indent/xslt.vim               |   17 +
 indent/yacc.vim               |   45 +
 indent/yaml.vim               |  159 --
 indent/zimbu.vim              |  132 ++
 packages.yaml                 | 3509 ++++++++++++++++++++++++++++++++-
 scripts/build                 |   16 +-
 scripts/import_vim            |  122 ++
 syntax/apachestyle.vim        |   58 +
 syntax/asterisk.vim           |   92 +
 syntax/asteriskvm.vim         |   55 +
 syntax/bc.vim                 |   70 +
 syntax/bdf.vim                |  101 +
 syntax/bib.vim                |  125 ++
 syntax/bindzone.vim           |  101 +
 syntax/blank.vim              |   43 +
 syntax/bsdl.vim               |   21 +
 syntax/bst.vim                |   74 +
 syntax/bzr.vim                |   54 +
 syntax/cabal-1.vim            |   55 +
 syntax/cabal-2.vim            |  245 +++
 syntax/cabal.vim              |   58 +-
 syntax/calendar.vim           |  114 ++
 syntax/catalog.vim            |   34 +
 syntax/cdl.vim                |   82 +
 syntax/cdrdaoconf.vim         |  143 ++
 syntax/cdrtoc.vim             |  541 +++++
 syntax/cf.vim                 | 1022 ++++++++++
 syntax/cfg.vim                |   52 +
 syntax/ch.vim                 |   42 +
 syntax/chaiscript.vim         |   98 +
 syntax/chaskell.vim           |   18 +
 syntax/chill.vim              |  182 ++
 syntax/chordpro.vim           |   71 +
 syntax/cl.vim                 |  102 +
 syntax/clean.vim              |   94 +
 syntax/cmod.vim               |  148 ++
 syntax/cmusrc.vim             |  313 +++
 syntax/cobol.vim              |  264 +++
 syntax/coco.vim               |   36 +
 syntax/conaryrecipe.vim       |  141 ++
 syntax/config.vim             |   58 +
 syntax/context.vim            |  145 ++
 syntax/crm.vim                |   45 +
 syntax/crontab.vim            |   71 +
 syntax/cs.vim                 |  225 +++
 syntax/csc.vim                |  195 ++
 syntax/csdl.vim               |  540 +++++
 syntax/csp.vim                |  186 ++
 syntax/css.vim                |  657 ++++++
 syntax/cterm.vim              |  181 ++
 syntax/cuda.vim               |   69 +
 syntax/cupl.vim               |  128 ++
 syntax/cuplsim.vim            |   67 +
 syntax/cvs.vim                |   33 +
 syntax/cvsrc.vim              |   43 +
 syntax/cynpp.vim              |   54 +
 syntax/datascript.vim         |  106 +
 syntax/dcd.vim                |   55 +
 syntax/debchangelog.vim       |   80 +
 syntax/debcontrol.vim         |  147 ++
 syntax/debcopyright.vim       |   37 +
 syntax/debsources.vim         |   60 +
 syntax/def.vim                |   48 +
 syntax/denyhosts.vim          |  293 +++
 syntax/desc.vim               |   92 +
 syntax/desktop.vim            |  271 +++
 syntax/dictconf.vim           |   84 +
 syntax/dictdconf.vim          |  150 ++
 syntax/diff.vim               |  386 ++++
 syntax/dircolors.vim          |  226 +++
 syntax/dnsmasq.vim            |  246 +++
 syntax/dosbatch.vim           |  151 ++
 syntax/dot.vim                |  101 +
 syntax/dracula.vim            |   76 +
 syntax/dsl.vim                |   42 +
 syntax/dtd.vim                |  165 ++
 syntax/dts.vim                |   34 +
 syntax/dylan.vim              |   96 +
 syntax/dylanintr.vim          |   43 +
 syntax/dylanlid.vim           |   33 +
 syntax/ecd.vim                |   48 +
 syntax/edif.vim               |   49 +
 syntax/elinks.vim             |  192 ++
 syntax/elmfilt.vim            |   62 +
 syntax/esmtprc.vim            |   35 +
 syntax/esqlc.vim              |   62 +
 syntax/esterel.vim            |   82 +
 syntax/eterm.vim              |  433 ++++
 syntax/exim.vim               |  109 +
 syntax/expect.vim             |  107 +
 syntax/exports.vim            |   62 +
 syntax/falcon.vim             |  201 ++
 syntax/fan.vim                |  136 ++
 syntax/fetchmail.vim          |   79 +
 syntax/fgl.vim                |  138 ++
 syntax/focexec.vim            |   92 +
 syntax/fortran.vim            |  542 +++++
 syntax/framescript.vim        |  495 +++++
 syntax/fstab.vim              |  295 +++
 syntax/fvwm.vim               |  646 ++++++
 syntax/gdb.vim                |  107 +
 syntax/gdmo.vim               |   87 +
 syntax/gedcom.vim             |   57 +
 syntax/gitolite.vim           |   98 +
 syntax/gkrellmrc.vim          |   79 +
 syntax/gnash.vim              |  100 +
 syntax/gp.vim                 |   87 +
 syntax/gpg.vim                |  109 +
 syntax/grads.vim              |   77 +
 syntax/gretl.vim              |   89 +
 syntax/group.vim              |   56 +
 syntax/gsp.vim                |   58 +
 syntax/gtkrc.vim              |  130 ++
 syntax/haste.vim              |  146 ++
 syntax/hastepreproc.vim       |   42 +
 syntax/hb.vim                 |   93 +
 syntax/hercules.vim           |  123 ++
 syntax/hex.vim                |   93 +
 syntax/hgcommit.vim           |   31 +
 syntax/hog.vim                |  212 ++
 syntax/hollywood.vim          |  185 ++
 syntax/hostconf.vim           |  151 ++
 syntax/hostsaccess.vim        |   27 +
 syntax/htmlm4.vim             |   35 +
 syntax/icemenu.vim            |   38 +
 syntax/icon.vim               |  203 ++
 syntax/indent.vim             |  156 ++
 syntax/inform.vim             |  396 ++++
 syntax/initng.vim             |   95 +
 syntax/inittab.vim            |   66 +
 syntax/ipfilter.vim           |   58 +
 syntax/iss.vim                |  140 ++
 syntax/ist.vim                |   62 +
 syntax/j.vim                  |  150 ++
 syntax/jal.vim                |  240 +++
 syntax/jam.vim                |  244 +++
 syntax/java.vim               |  359 ++++
 syntax/javacc.vim             |   69 +
 syntax/jess.vim               |  148 ++
 syntax/jgraph.vim             |   49 +
 syntax/jovial.vim             |  114 ++
 syntax/jproperties.vim        |  139 ++
 syntax/jsp.vim                |   72 +
 syntax/kconfig.vim            |  743 +++++++
 syntax/kivy.vim               |   40 +
 syntax/kix.vim                |  174 ++
 syntax/kscript.vim            |   61 +
 syntax/kwt.vim                |   74 +
 syntax/lace.vim               |  126 ++
 syntax/latte.vim              |   85 +
 syntax/ld.vim                 |   85 +
 syntax/ldif.vim               |   37 +
 syntax/lex.vim                |  192 ++
 syntax/lftp.vim               |  156 ++
 syntax/lhaskell.vim           |  127 ++
 syntax/libao.vim              |   31 +
 syntax/lifelines.vim          |  158 ++
 syntax/lilo.vim               |  178 ++
 syntax/limits.vim             |   48 +
 syntax/liquid.vim             |  142 ++
 syntax/lisp.vim               |  624 ++++++
 syntax/lite.vim               |  172 ++
 syntax/litestep.vim           |  273 +++
 syntax/loginaccess.vim        |  100 +
 syntax/logindefs.vim          |  178 ++
 syntax/logtalk.vim            |  458 +++++
 syntax/lotos.vim              |   73 +
 syntax/lout.vim               |  139 ++
 syntax/lpc.vim                |  451 +++++
 syntax/lprolog.vim            |  128 ++
 syntax/lsl.vim                |  281 +++
 syntax/lss.vim                |  127 ++
 syntax/lynx.vim               |  144 ++
 syntax/mail.vim               |  116 ++
 syntax/mailaliases.vim        |   75 +
 syntax/mailcap.vim            |   39 +
 syntax/mallard.vim            |   41 +
 syntax/man.vim                |   60 +
 syntax/manconf.vim            |  121 ++
 syntax/maple.vim              |  626 ++++++
 syntax/master.vim             |   41 +
 syntax/mel.vim                |  112 ++
 syntax/messages.vim           |   77 +
 syntax/mf.vim                 |  299 +++
 syntax/mgl.vim                |  121 ++
 syntax/mgp.vim                |   73 +
 syntax/mib.vim                |   61 +
 syntax/mix.vim                |   88 +
 syntax/mmp.vim                |   53 +
 syntax/modconf.vim            |   48 +
 syntax/modula2.vim            |   77 +
 syntax/modula3.vim            |   63 +
 syntax/monk.vim               |  221 +++
 syntax/moo.vim                |  177 ++
 syntax/mp.vim                 |  773 ++++++++
 syntax/mplayerconf.vim        |  132 ++
 syntax/mrxvtrc.vim            |  286 +++
 syntax/msidl.vim              |   88 +
 syntax/msql.vim               |   87 +
 syntax/mupad.vim              |  287 +++
 syntax/mush.vim               |  219 ++
 syntax/muttrc.vim             |  825 ++++++++
 syntax/mysql.vim              |  292 +++
 syntax/n1ql.vim               |  438 ++++
 syntax/named.vim              |  233 +++
 syntax/nanorc.vim             |  247 +++
 syntax/natural.vim            |  205 ++
 syntax/ncf.vim                |  251 +++
 syntax/neomuttrc.vim          |  865 ++++++++
 syntax/netrc.vim              |   56 +
 syntax/ninja.vim              |   91 +
 syntax/nqc.vim                |  369 ++++
 syntax/nroff.vim              |  253 +++
 syntax/nsis.vim               |  686 +++++++
 syntax/obj.vim                |   87 +
 syntax/occam.vim              |  120 ++
 syntax/omnimark.vim           |  110 ++
 syntax/openroad.vim           |  256 +++
 syntax/opl.vim                |   93 +
 syntax/ora.vim                |  468 +++++
 syntax/pamconf.vim            |  135 ++
 syntax/pamenv.vim             |   32 +
 syntax/papp.vim               |   80 +
 syntax/pascal.vim             |  364 ++++
 syntax/passwd.vim             |   75 +
 syntax/pccts.vim              |   93 +
 syntax/pdf.vim                |   77 +
 syntax/pf.vim                 |  337 ++++
 syntax/pfmain.vim             | 1839 +++++++++++++++++
 syntax/pike.vim               |  390 ++++
 syntax/pilrc.vim              |  140 ++
 syntax/pine.vim               |  359 ++++
 syntax/pinfo.vim              |  114 ++
 syntax/pli.vim                |  270 +++
 syntax/plm.vim                |  138 ++
 syntax/plp.vim                |   41 +
 syntax/plsql.vim              |  268 +++
 syntax/po.vim                 |  137 ++
 syntax/postscr.vim            |  784 ++++++++
 syntax/pov.vim                |  148 ++
 syntax/povini.vim             |   60 +
 syntax/ppd.vim                |   39 +
 syntax/ppwiz.vim              |   88 +
 syntax/privoxy.vim            |   75 +
 syntax/procmail.vim           |   58 +
 syntax/promela.vim            |   57 +
 syntax/protocols.vim          |   48 +
 syntax/psf.vim                |   95 +
 syntax/pyrex.vim              |   55 +
 syntax/quake.vim              |  174 ++
 syntax/radiance.vim           |  146 ++
 syntax/ratpoison.vim          |  271 +++
 syntax/rc.vim                 |  194 ++
 syntax/rcs.vim                |   67 +
 syntax/readline.vim           |  415 ++++
 syntax/rego.vim               |   93 +
 syntax/remind.vim             |   77 +
 syntax/resolv.vim             |  123 ++
 syntax/reva.vim               |  195 ++
 syntax/rexx.vim               |  322 +++
 syntax/rib.vim                |   66 +
 syntax/rmd.vim                |  122 ++
 syntax/rnc.vim                |   72 +
 syntax/rng.vim                |   29 +
 syntax/rnoweb-1.vim           |   60 +
 syntax/rnoweb-2.vim           |   56 +
 syntax/rnoweb.vim             |   63 +-
 syntax/robots.vim             |   61 +
 syntax/rpcgen.vim             |   50 +
 syntax/rpl.vim                |  487 +++++
 syntax/rrst.vim               |   47 +
 syntax/rtf.vim                |   79 +
 syntax/samba.vim              |  122 ++
 syntax/sas.vim                |  269 +++
 syntax/sass.vim               |  109 +
 syntax/sather.vim             |   96 +
 syntax/scheme.vim             |  468 +++++
 syntax/scilab.vim             |  106 +
 syntax/screen.vim             |  264 +++
 syntax/sd.vim                 |   75 +
 syntax/sdc.vim                |   45 +
 syntax/sdl.vim                |  157 ++
 syntax/sed.vim                |  114 ++
 syntax/sensors.vim            |   56 +
 syntax/services.vim           |   58 +
 syntax/setserial.vim          |  124 ++
 syntax/sieve.vim              |   59 +
 syntax/sil.vim                |  182 ++
 syntax/simula.vim             |   91 +
 syntax/sinda.vim              |  133 ++
 syntax/sisu.vim               |  279 +++
 syntax/skill.vim              |  553 ++++++
 syntax/slang.vim              |   93 +
 syntax/slice.vim              |   82 +
 syntax/slpconf.vim            |  277 +++
 syntax/slpreg.vim             |  126 ++
 syntax/slpspi.vim             |   43 +
 syntax/slrnrc.vim             |  185 ++
 syntax/slrnsc.vim             |   72 +
 syntax/sm.vim                 |   84 +
 syntax/smarty.vim             |   80 +
 syntax/smcl.vim               |  311 +++
 syntax/smith.vim              |   43 +
 syntax/sml.vim                |  221 +++
 syntax/snobol4.vim            |  117 ++
 syntax/spec.vim               |  230 +++
 syntax/spice.vim              |   79 +
 syntax/spup.vim               |  273 +++
 syntax/spyce.vim              |  108 +
 syntax/sqlj.vim               |   95 +
 syntax/sqr.vim                |  266 +++
 syntax/squid.vim              |  144 ++
 syntax/srec.vim               |   87 +
 syntax/sshconfig.vim          |  281 +++
 syntax/sshdconfig.vim         |  286 +++
 syntax/st.vim                 |   99 +
 syntax/stata.vim              |  454 +++++
 syntax/stp.vim                |  158 ++
 syntax/sudoers.vim            |  393 ++++
 syntax/svn.vim                |   60 +
 syntax/swiftgyb.vim           |   28 +
 syntax/sysctl.vim             |   43 +
 syntax/systemverilog.vim      |   89 +
 syntax/tags.vim               |   35 +
 syntax/tak.vim                |  123 ++
 syntax/taskdata.vim           |   49 +
 syntax/taskedit.vim           |   41 +
 syntax/tcl.vim                |  278 +++
 syntax/template.vim           |   19 +
 syntax/teraterm.vim           |  144 ++
 syntax/terminfo.vim           |   97 +
 syntax/tex.vim                | 1344 +++++++++++++
 syntax/texinfo.vim            |  400 ++++
 syntax/texmf.vim              |   78 +
 syntax/tf.vim                 |  200 ++
 syntax/tidy.vim               |  139 ++
 syntax/tilde.vim              |   45 +
 syntax/tli.vim                |   62 +
 syntax/tpp.vim                |   87 +
 syntax/treetop.vim            |  114 ++
 syntax/trustees.vim           |   46 +
 syntax/tsalt.vim              |  210 ++
 syntax/tsscl.vim              |  208 ++
 syntax/tssgm.vim              |  102 +
 syntax/tssop.vim              |   78 +
 syntax/uc.vim                 |  169 ++
 syntax/udevconf.vim           |   43 +
 syntax/udevperm.vim           |   73 +
 syntax/uil.vim                |   79 +
 syntax/updatedb.vim           |   45 +
 syntax/upstart.vim            |  115 ++
 syntax/upstreamdat.vim        |  309 +++
 syntax/upstreaminstalllog.vim |   31 +
 syntax/upstreamlog.vim        |   58 +
 syntax/usserverlog.vim        |   64 +
 syntax/usw2kagtlog.vim        |   58 +
 syntax/vera.vim               |  352 ++++
 syntax/verilog.vim            |  123 ++
 syntax/verilogams.vim         |  136 ++
 syntax/vgrindefs.vim          |   49 +
 syntax/vhdl.vim               |  272 +++
 syntax/vim.vim                | 1032 ++++++++++
 syntax/viminfo.vim            |   52 +
 syntax/voscm.vim              |   98 +
 syntax/vrml.vim               |  226 +++
 syntax/vroom.vim              |  114 ++
 syntax/wast.vim               |   88 +
 syntax/webmacro.vim           |   71 +
 syntax/wget.vim               |  193 ++
 syntax/winbatch.vim           |  178 ++
 syntax/wml.vim                |  154 ++
 syntax/wsh.vim                |   49 +
 syntax/wsml.vim               |  117 ++
 syntax/wvdial.vim             |   32 +
 syntax/xdefaults.vim          |  136 ++
 syntax/xhtml.vim              |   15 +
 syntax/xinetd.vim             |  351 ++++
 syntax/xmath.vim              |  229 +++
 syntax/xmodmap.vim            |  681 +++++++
 syntax/xquery.vim             |   86 +
 syntax/xsd.vim                |   65 +
 syntax/xslt.vim               |   75 +
 syntax/yacc.vim               |  124 ++
 syntax/z8a.vim                |  105 +
 syntax/zimbu.vim              |  164 ++
 tests/filetypes.vim           |  384 ++++
 590 files changed, 82640 insertions(+), 310 deletions(-)
 create mode 100644 autoload/context.vim
 create mode 100644 autoload/xml/xsd.vim
 create mode 100644 compiler/bdf.vim
 create mode 100644 compiler/context.vim
 create mode 100644 compiler/cs.vim
 create mode 100644 compiler/dot.vim
 create mode 100644 compiler/sass.vim
 create mode 100644 compiler/tcl.vim
 create mode 100644 compiler/tex.vim
 create mode 100644 compiler/tidy.vim
 create mode 100644 ftplugin/bdf.vim
 create mode 100644 ftplugin/bst.vim
 create mode 100644 ftplugin/calendar.vim
 create mode 100644 ftplugin/cdrdaoconf.vim
 create mode 100644 ftplugin/cfg.vim
 create mode 100644 ftplugin/ch.vim
 create mode 100644 ftplugin/cobol.vim
 create mode 100644 ftplugin/config.vim
 create mode 100644 ftplugin/context.vim
 create mode 100644 ftplugin/crm.vim
 create mode 100644 ftplugin/cs.vim
 create mode 100644 ftplugin/csc.vim
 create mode 100644 ftplugin/css.vim
 create mode 100644 ftplugin/cvsrc.vim
 create mode 100644 ftplugin/debchangelog.vim
 create mode 100644 ftplugin/debcontrol.vim
 create mode 100644 ftplugin/denyhosts.vim
 create mode 100644 ftplugin/dictconf.vim
 create mode 100644 ftplugin/dictdconf.vim
 create mode 100644 ftplugin/diff.vim
 create mode 100644 ftplugin/dircolors.vim
 create mode 100644 ftplugin/dosbatch.vim
 create mode 100644 ftplugin/dtd.vim
 create mode 100644 ftplugin/elinks.vim
 create mode 100644 ftplugin/eterm.vim
 create mode 100644 ftplugin/falcon.vim
 create mode 100644 ftplugin/fetchmail.vim
 create mode 100644 ftplugin/fortran.vim
 create mode 100644 ftplugin/framescript.vim
 create mode 100644 ftplugin/fvwm.vim
 create mode 100644 ftplugin/gdb.vim
 create mode 100644 ftplugin/gpg.vim
 create mode 100644 ftplugin/group.vim
 create mode 100644 ftplugin/hgcommit.vim
 create mode 100644 ftplugin/hog.vim
 create mode 100644 ftplugin/hostconf.vim
 create mode 100644 ftplugin/hostsaccess.vim
 create mode 100644 ftplugin/indent.vim
 create mode 100644 ftplugin/j.vim
 create mode 100644 ftplugin/java.vim
 create mode 100644 ftplugin/jproperties.vim
 create mode 100644 ftplugin/jsp.vim
 create mode 100644 ftplugin/kconfig.vim
 create mode 100644 ftplugin/kwt.vim
 create mode 100644 ftplugin/ld.vim
 create mode 100644 ftplugin/lftp.vim
 create mode 100644 ftplugin/libao.vim
 create mode 100644 ftplugin/limits.vim
 create mode 100644 ftplugin/liquid.vim
 create mode 100644 ftplugin/lisp.vim
 create mode 100644 ftplugin/logcheck.vim
 create mode 100644 ftplugin/loginaccess.vim
 create mode 100644 ftplugin/logindefs.vim
 create mode 100644 ftplugin/logtalk.vim
 create mode 100644 ftplugin/lprolog.vim
 create mode 100644 ftplugin/mail.vim
 create mode 100644 ftplugin/mailaliases.vim
 create mode 100644 ftplugin/mailcap.vim
 create mode 100644 ftplugin/man.vim
 create mode 100644 ftplugin/manconf.vim
 create mode 100644 ftplugin/mf.vim
 create mode 100644 ftplugin/modconf.vim
 create mode 100644 ftplugin/mp.vim
 create mode 100644 ftplugin/mplayerconf.vim
 create mode 100644 ftplugin/mrxvtrc.vim
 create mode 100644 ftplugin/muttrc.vim
 create mode 100644 ftplugin/nanorc.vim
 create mode 100644 ftplugin/neomuttrc.vim
 create mode 100644 ftplugin/netrc.vim
 create mode 100644 ftplugin/nroff.vim
 create mode 100644 ftplugin/nsis.vim
 create mode 100644 ftplugin/occam.vim
 create mode 100644 ftplugin/pamconf.vim
 create mode 100644 ftplugin/pascal.vim
 create mode 100644 ftplugin/passwd.vim
 create mode 100644 ftplugin/pdf.vim
 create mode 100644 ftplugin/pinfo.vim
 create mode 100644 ftplugin/postscr.vim
 create mode 100644 ftplugin/procmail.vim
 create mode 100644 ftplugin/protocols.vim
 create mode 100644 ftplugin/pyrex.vim
 create mode 100644 ftplugin/quake.vim
 create mode 100644 ftplugin/readline.vim
 create mode 100644 ftplugin/reva.vim
 create mode 100644 ftplugin/rmd.vim
 create mode 100644 ftplugin/rnc.vim
 create mode 100644 ftplugin/rnoweb.vim
 create mode 100644 ftplugin/rpl.vim
 create mode 100644 ftplugin/rrst.vim
 create mode 100644 ftplugin/sass.vim
 create mode 100644 ftplugin/scheme.vim
 create mode 100644 ftplugin/screen.vim
 create mode 100644 ftplugin/sensors.vim
 create mode 100644 ftplugin/services.vim
 create mode 100644 ftplugin/setserial.vim
 create mode 100644 ftplugin/sieve.vim
 create mode 100644 ftplugin/slpconf.vim
 create mode 100644 ftplugin/slpreg.vim
 create mode 100644 ftplugin/slpspi.vim
 create mode 100644 ftplugin/spec.vim
 create mode 100644 ftplugin/sshconfig.vim
 create mode 100644 ftplugin/sudoers.vim
 create mode 100644 ftplugin/swiftgyb.vim
 create mode 100644 ftplugin/sysctl.vim
 create mode 100644 ftplugin/systemverilog.vim
 create mode 100644 ftplugin/tcl.vim
 create mode 100644 ftplugin/terminfo.vim
 create mode 100644 ftplugin/tex.vim
 create mode 100644 ftplugin/text.vim
 create mode 100644 ftplugin/treetop.vim
 create mode 100644 ftplugin/udevconf.vim
 create mode 100644 ftplugin/udevperm.vim
 create mode 100644 ftplugin/updatedb.vim
 create mode 100644 ftplugin/verilog.vim
 create mode 100644 ftplugin/vhdl.vim
 create mode 100644 ftplugin/vim.vim
 create mode 100644 ftplugin/vroom.vim
 create mode 100644 ftplugin/wast.vim
 create mode 100644 ftplugin/xdefaults.vim
 create mode 100644 ftplugin/xhtml.vim
 create mode 100644 ftplugin/xinetd.vim
 create mode 100644 ftplugin/xmodmap.vim
 create mode 100644 ftplugin/xsd.vim
 create mode 100644 ftplugin/xslt.vim
 delete mode 100644 ftplugin/yaml.vim
 create mode 100644 ftplugin/zimbu.vim
 create mode 100644 indent/bib.vim
 create mode 100644 indent/bst.vim
 create mode 100644 indent/cdl.vim
 create mode 100644 indent/ch.vim
 create mode 100644 indent/chaiscript.vim
 create mode 100644 indent/cobol.vim
 create mode 100644 indent/config.vim
 create mode 100644 indent/context.vim
 create mode 100644 indent/cs.vim
 create mode 100644 indent/css.vim
 create mode 100644 indent/cuda.vim
 create mode 100644 indent/dictconf.vim
 create mode 100644 indent/dictdconf.vim
 create mode 100644 indent/dosbatch.vim
 create mode 100644 indent/dtd.vim
 create mode 100644 indent/dylan.vim
 create mode 100644 indent/eterm.vim
 create mode 100644 indent/falcon.vim
 create mode 100644 indent/fortran.vim
 create mode 100644 indent/framescript.vim
 create mode 100644 indent/gitolite.vim
 create mode 100644 indent/hog.vim
 create mode 100644 indent/j.vim
 create mode 100644 indent/java.vim
 create mode 100644 indent/jsp.vim
 create mode 100644 indent/ld.vim
 create mode 100644 indent/lifelines.vim
 create mode 100644 indent/liquid.vim
 create mode 100644 indent/lisp.vim
 create mode 100644 indent/logtalk.vim
 create mode 100644 indent/mail.vim
 create mode 100644 indent/mf.vim
 create mode 100644 indent/mp.vim
 create mode 100644 indent/nsis.vim
 create mode 100644 indent/occam.vim
 create mode 100644 indent/pascal.vim
 create mode 100644 indent/postscr.vim
 create mode 100644 indent/pov.vim
 create mode 100644 indent/pyrex.vim
 create mode 100644 indent/readline.vim
 create mode 100644 indent/rmd.vim
 create mode 100644 indent/rnoweb.vim
 create mode 100644 indent/rpl.vim
 create mode 100644 indent/rrst.vim
 create mode 100644 indent/sas.vim
 create mode 100644 indent/sass.vim
 create mode 100644 indent/scheme.vim
 create mode 100644 indent/sdl.vim
 create mode 100644 indent/sml.vim
 create mode 100644 indent/sshconfig.vim
 create mode 100644 indent/systemverilog.vim
 create mode 100644 indent/tcl.vim
 create mode 100644 indent/teraterm.vim
 create mode 100644 indent/tex.vim
 create mode 100644 indent/tf.vim
 create mode 100644 indent/tilde.vim
 create mode 100644 indent/treetop.vim
 create mode 100644 indent/verilog.vim
 create mode 100644 indent/vhdl.vim
 create mode 100644 indent/vim.vim
 create mode 100644 indent/vroom.vim
 create mode 100644 indent/wast.vim
 create mode 100644 indent/xhtml.vim
 create mode 100644 indent/xinetd.vim
 create mode 100644 indent/xsd.vim
 create mode 100644 indent/xslt.vim
 create mode 100644 indent/yacc.vim
 delete mode 100644 indent/yaml.vim
 create mode 100644 indent/zimbu.vim
 create mode 100755 scripts/import_vim
 create mode 100644 syntax/apachestyle.vim
 create mode 100644 syntax/asterisk.vim
 create mode 100644 syntax/asteriskvm.vim
 create mode 100644 syntax/bc.vim
 create mode 100644 syntax/bdf.vim
 create mode 100644 syntax/bib.vim
 create mode 100644 syntax/bindzone.vim
 create mode 100644 syntax/blank.vim
 create mode 100644 syntax/bsdl.vim
 create mode 100644 syntax/bst.vim
 create mode 100644 syntax/bzr.vim
 create mode 100644 syntax/cabal-1.vim
 create mode 100644 syntax/cabal-2.vim
 create mode 100644 syntax/calendar.vim
 create mode 100644 syntax/catalog.vim
 create mode 100644 syntax/cdl.vim
 create mode 100644 syntax/cdrdaoconf.vim
 create mode 100644 syntax/cdrtoc.vim
 create mode 100644 syntax/cf.vim
 create mode 100644 syntax/cfg.vim
 create mode 100644 syntax/ch.vim
 create mode 100644 syntax/chaiscript.vim
 create mode 100644 syntax/chaskell.vim
 create mode 100644 syntax/chill.vim
 create mode 100644 syntax/chordpro.vim
 create mode 100644 syntax/cl.vim
 create mode 100644 syntax/clean.vim
 create mode 100644 syntax/cmod.vim
 create mode 100644 syntax/cmusrc.vim
 create mode 100644 syntax/cobol.vim
 create mode 100644 syntax/coco.vim
 create mode 100644 syntax/conaryrecipe.vim
 create mode 100644 syntax/config.vim
 create mode 100644 syntax/context.vim
 create mode 100644 syntax/crm.vim
 create mode 100644 syntax/crontab.vim
 create mode 100644 syntax/cs.vim
 create mode 100644 syntax/csc.vim
 create mode 100644 syntax/csdl.vim
 create mode 100644 syntax/csp.vim
 create mode 100644 syntax/css.vim
 create mode 100644 syntax/cterm.vim
 create mode 100644 syntax/cuda.vim
 create mode 100644 syntax/cupl.vim
 create mode 100644 syntax/cuplsim.vim
 create mode 100644 syntax/cvs.vim
 create mode 100644 syntax/cvsrc.vim
 create mode 100644 syntax/cynpp.vim
 create mode 100644 syntax/datascript.vim
 create mode 100644 syntax/dcd.vim
 create mode 100644 syntax/debchangelog.vim
 create mode 100644 syntax/debcontrol.vim
 create mode 100644 syntax/debcopyright.vim
 create mode 100644 syntax/debsources.vim
 create mode 100644 syntax/def.vim
 create mode 100644 syntax/denyhosts.vim
 create mode 100644 syntax/desc.vim
 create mode 100644 syntax/desktop.vim
 create mode 100644 syntax/dictconf.vim
 create mode 100644 syntax/dictdconf.vim
 create mode 100644 syntax/diff.vim
 create mode 100644 syntax/dircolors.vim
 create mode 100644 syntax/dnsmasq.vim
 create mode 100644 syntax/dosbatch.vim
 create mode 100644 syntax/dot.vim
 create mode 100644 syntax/dracula.vim
 create mode 100644 syntax/dsl.vim
 create mode 100644 syntax/dtd.vim
 create mode 100644 syntax/dts.vim
 create mode 100644 syntax/dylan.vim
 create mode 100644 syntax/dylanintr.vim
 create mode 100644 syntax/dylanlid.vim
 create mode 100644 syntax/ecd.vim
 create mode 100644 syntax/edif.vim
 create mode 100644 syntax/elinks.vim
 create mode 100644 syntax/elmfilt.vim
 create mode 100644 syntax/esmtprc.vim
 create mode 100644 syntax/esqlc.vim
 create mode 100644 syntax/esterel.vim
 create mode 100644 syntax/eterm.vim
 create mode 100644 syntax/exim.vim
 create mode 100644 syntax/expect.vim
 create mode 100644 syntax/exports.vim
 create mode 100644 syntax/falcon.vim
 create mode 100644 syntax/fan.vim
 create mode 100644 syntax/fetchmail.vim
 create mode 100644 syntax/fgl.vim
 create mode 100644 syntax/focexec.vim
 create mode 100644 syntax/fortran.vim
 create mode 100644 syntax/framescript.vim
 create mode 100644 syntax/fstab.vim
 create mode 100644 syntax/fvwm.vim
 create mode 100644 syntax/gdb.vim
 create mode 100644 syntax/gdmo.vim
 create mode 100644 syntax/gedcom.vim
 create mode 100644 syntax/gitolite.vim
 create mode 100644 syntax/gkrellmrc.vim
 create mode 100644 syntax/gnash.vim
 create mode 100644 syntax/gp.vim
 create mode 100644 syntax/gpg.vim
 create mode 100644 syntax/grads.vim
 create mode 100644 syntax/gretl.vim
 create mode 100644 syntax/group.vim
 create mode 100644 syntax/gsp.vim
 create mode 100644 syntax/gtkrc.vim
 create mode 100644 syntax/haste.vim
 create mode 100644 syntax/hastepreproc.vim
 create mode 100644 syntax/hb.vim
 create mode 100644 syntax/hercules.vim
 create mode 100644 syntax/hex.vim
 create mode 100644 syntax/hgcommit.vim
 create mode 100644 syntax/hog.vim
 create mode 100644 syntax/hollywood.vim
 create mode 100644 syntax/hostconf.vim
 create mode 100644 syntax/hostsaccess.vim
 create mode 100644 syntax/htmlm4.vim
 create mode 100644 syntax/icemenu.vim
 create mode 100644 syntax/icon.vim
 create mode 100644 syntax/indent.vim
 create mode 100644 syntax/inform.vim
 create mode 100644 syntax/initng.vim
 create mode 100644 syntax/inittab.vim
 create mode 100644 syntax/ipfilter.vim
 create mode 100644 syntax/iss.vim
 create mode 100644 syntax/ist.vim
 create mode 100644 syntax/j.vim
 create mode 100644 syntax/jal.vim
 create mode 100644 syntax/jam.vim
 create mode 100644 syntax/java.vim
 create mode 100644 syntax/javacc.vim
 create mode 100644 syntax/jess.vim
 create mode 100644 syntax/jgraph.vim
 create mode 100644 syntax/jovial.vim
 create mode 100644 syntax/jproperties.vim
 create mode 100644 syntax/jsp.vim
 create mode 100644 syntax/kconfig.vim
 create mode 100644 syntax/kivy.vim
 create mode 100644 syntax/kix.vim
 create mode 100644 syntax/kscript.vim
 create mode 100644 syntax/kwt.vim
 create mode 100644 syntax/lace.vim
 create mode 100644 syntax/latte.vim
 create mode 100644 syntax/ld.vim
 create mode 100644 syntax/ldif.vim
 create mode 100644 syntax/lex.vim
 create mode 100644 syntax/lftp.vim
 create mode 100644 syntax/lhaskell.vim
 create mode 100644 syntax/libao.vim
 create mode 100644 syntax/lifelines.vim
 create mode 100644 syntax/lilo.vim
 create mode 100644 syntax/limits.vim
 create mode 100644 syntax/liquid.vim
 create mode 100644 syntax/lisp.vim
 create mode 100644 syntax/lite.vim
 create mode 100644 syntax/litestep.vim
 create mode 100644 syntax/loginaccess.vim
 create mode 100644 syntax/logindefs.vim
 create mode 100644 syntax/logtalk.vim
 create mode 100644 syntax/lotos.vim
 create mode 100644 syntax/lout.vim
 create mode 100644 syntax/lpc.vim
 create mode 100644 syntax/lprolog.vim
 create mode 100644 syntax/lsl.vim
 create mode 100644 syntax/lss.vim
 create mode 100644 syntax/lynx.vim
 create mode 100644 syntax/mail.vim
 create mode 100644 syntax/mailaliases.vim
 create mode 100644 syntax/mailcap.vim
 create mode 100644 syntax/mallard.vim
 create mode 100644 syntax/man.vim
 create mode 100644 syntax/manconf.vim
 create mode 100644 syntax/maple.vim
 create mode 100644 syntax/master.vim
 create mode 100644 syntax/mel.vim
 create mode 100644 syntax/messages.vim
 create mode 100644 syntax/mf.vim
 create mode 100644 syntax/mgl.vim
 create mode 100644 syntax/mgp.vim
 create mode 100644 syntax/mib.vim
 create mode 100644 syntax/mix.vim
 create mode 100644 syntax/mmp.vim
 create mode 100644 syntax/modconf.vim
 create mode 100644 syntax/modula2.vim
 create mode 100644 syntax/modula3.vim
 create mode 100644 syntax/monk.vim
 create mode 100644 syntax/moo.vim
 create mode 100644 syntax/mp.vim
 create mode 100644 syntax/mplayerconf.vim
 create mode 100644 syntax/mrxvtrc.vim
 create mode 100644 syntax/msidl.vim
 create mode 100644 syntax/msql.vim
 create mode 100644 syntax/mupad.vim
 create mode 100644 syntax/mush.vim
 create mode 100644 syntax/muttrc.vim
 create mode 100644 syntax/mysql.vim
 create mode 100644 syntax/n1ql.vim
 create mode 100644 syntax/named.vim
 create mode 100644 syntax/nanorc.vim
 create mode 100644 syntax/natural.vim
 create mode 100644 syntax/ncf.vim
 create mode 100644 syntax/neomuttrc.vim
 create mode 100644 syntax/netrc.vim
 create mode 100644 syntax/ninja.vim
 create mode 100644 syntax/nqc.vim
 create mode 100644 syntax/nroff.vim
 create mode 100644 syntax/nsis.vim
 create mode 100644 syntax/obj.vim
 create mode 100644 syntax/occam.vim
 create mode 100644 syntax/omnimark.vim
 create mode 100644 syntax/openroad.vim
 create mode 100644 syntax/opl.vim
 create mode 100644 syntax/ora.vim
 create mode 100644 syntax/pamconf.vim
 create mode 100644 syntax/pamenv.vim
 create mode 100644 syntax/papp.vim
 create mode 100644 syntax/pascal.vim
 create mode 100644 syntax/passwd.vim
 create mode 100644 syntax/pccts.vim
 create mode 100644 syntax/pdf.vim
 create mode 100644 syntax/pf.vim
 create mode 100644 syntax/pfmain.vim
 create mode 100644 syntax/pike.vim
 create mode 100644 syntax/pilrc.vim
 create mode 100644 syntax/pine.vim
 create mode 100644 syntax/pinfo.vim
 create mode 100644 syntax/pli.vim
 create mode 100644 syntax/plm.vim
 create mode 100644 syntax/plp.vim
 create mode 100644 syntax/plsql.vim
 create mode 100644 syntax/po.vim
 create mode 100644 syntax/postscr.vim
 create mode 100644 syntax/pov.vim
 create mode 100644 syntax/povini.vim
 create mode 100644 syntax/ppd.vim
 create mode 100644 syntax/ppwiz.vim
 create mode 100644 syntax/privoxy.vim
 create mode 100644 syntax/procmail.vim
 create mode 100644 syntax/promela.vim
 create mode 100644 syntax/protocols.vim
 create mode 100644 syntax/psf.vim
 create mode 100644 syntax/pyrex.vim
 create mode 100644 syntax/quake.vim
 create mode 100644 syntax/radiance.vim
 create mode 100644 syntax/ratpoison.vim
 create mode 100644 syntax/rc.vim
 create mode 100644 syntax/rcs.vim
 create mode 100644 syntax/readline.vim
 create mode 100644 syntax/rego.vim
 create mode 100644 syntax/remind.vim
 create mode 100644 syntax/resolv.vim
 create mode 100644 syntax/reva.vim
 create mode 100644 syntax/rexx.vim
 create mode 100644 syntax/rib.vim
 create mode 100644 syntax/rmd.vim
 create mode 100644 syntax/rnc.vim
 create mode 100644 syntax/rng.vim
 create mode 100644 syntax/rnoweb-1.vim
 create mode 100644 syntax/rnoweb-2.vim
 create mode 100644 syntax/robots.vim
 create mode 100644 syntax/rpcgen.vim
 create mode 100644 syntax/rpl.vim
 create mode 100644 syntax/rrst.vim
 create mode 100644 syntax/rtf.vim
 create mode 100644 syntax/samba.vim
 create mode 100644 syntax/sas.vim
 create mode 100644 syntax/sass.vim
 create mode 100644 syntax/sather.vim
 create mode 100644 syntax/scheme.vim
 create mode 100644 syntax/scilab.vim
 create mode 100644 syntax/screen.vim
 create mode 100644 syntax/sd.vim
 create mode 100644 syntax/sdc.vim
 create mode 100644 syntax/sdl.vim
 create mode 100644 syntax/sed.vim
 create mode 100644 syntax/sensors.vim
 create mode 100644 syntax/services.vim
 create mode 100644 syntax/setserial.vim
 create mode 100644 syntax/sieve.vim
 create mode 100644 syntax/sil.vim
 create mode 100644 syntax/simula.vim
 create mode 100644 syntax/sinda.vim
 create mode 100644 syntax/sisu.vim
 create mode 100644 syntax/skill.vim
 create mode 100644 syntax/slang.vim
 create mode 100644 syntax/slice.vim
 create mode 100644 syntax/slpconf.vim
 create mode 100644 syntax/slpreg.vim
 create mode 100644 syntax/slpspi.vim
 create mode 100644 syntax/slrnrc.vim
 create mode 100644 syntax/slrnsc.vim
 create mode 100644 syntax/sm.vim
 create mode 100644 syntax/smarty.vim
 create mode 100644 syntax/smcl.vim
 create mode 100644 syntax/smith.vim
 create mode 100644 syntax/sml.vim
 create mode 100644 syntax/snobol4.vim
 create mode 100644 syntax/spec.vim
 create mode 100644 syntax/spice.vim
 create mode 100644 syntax/spup.vim
 create mode 100644 syntax/spyce.vim
 create mode 100644 syntax/sqlj.vim
 create mode 100644 syntax/sqr.vim
 create mode 100644 syntax/squid.vim
 create mode 100644 syntax/srec.vim
 create mode 100644 syntax/sshconfig.vim
 create mode 100644 syntax/sshdconfig.vim
 create mode 100644 syntax/st.vim
 create mode 100644 syntax/stata.vim
 create mode 100644 syntax/stp.vim
 create mode 100644 syntax/sudoers.vim
 create mode 100644 syntax/svn.vim
 create mode 100644 syntax/swiftgyb.vim
 create mode 100644 syntax/sysctl.vim
 create mode 100644 syntax/systemverilog.vim
 create mode 100644 syntax/tags.vim
 create mode 100644 syntax/tak.vim
 create mode 100644 syntax/taskdata.vim
 create mode 100644 syntax/taskedit.vim
 create mode 100644 syntax/tcl.vim
 create mode 100644 syntax/template.vim
 create mode 100644 syntax/teraterm.vim
 create mode 100644 syntax/terminfo.vim
 create mode 100644 syntax/tex.vim
 create mode 100644 syntax/texinfo.vim
 create mode 100644 syntax/texmf.vim
 create mode 100644 syntax/tf.vim
 create mode 100644 syntax/tidy.vim
 create mode 100644 syntax/tilde.vim
 create mode 100644 syntax/tli.vim
 create mode 100644 syntax/tpp.vim
 create mode 100644 syntax/treetop.vim
 create mode 100644 syntax/trustees.vim
 create mode 100644 syntax/tsalt.vim
 create mode 100644 syntax/tsscl.vim
 create mode 100644 syntax/tssgm.vim
 create mode 100644 syntax/tssop.vim
 create mode 100644 syntax/uc.vim
 create mode 100644 syntax/udevconf.vim
 create mode 100644 syntax/udevperm.vim
 create mode 100644 syntax/uil.vim
 create mode 100644 syntax/updatedb.vim
 create mode 100644 syntax/upstart.vim
 create mode 100644 syntax/upstreamdat.vim
 create mode 100644 syntax/upstreaminstalllog.vim
 create mode 100644 syntax/upstreamlog.vim
 create mode 100644 syntax/usserverlog.vim
 create mode 100644 syntax/usw2kagtlog.vim
 create mode 100644 syntax/vera.vim
 create mode 100644 syntax/verilog.vim
 create mode 100644 syntax/verilogams.vim
 create mode 100644 syntax/vgrindefs.vim
 create mode 100644 syntax/vhdl.vim
 create mode 100644 syntax/vim.vim
 create mode 100644 syntax/viminfo.vim
 create mode 100644 syntax/voscm.vim
 create mode 100644 syntax/vrml.vim
 create mode 100644 syntax/vroom.vim
 create mode 100644 syntax/wast.vim
 create mode 100644 syntax/webmacro.vim
 create mode 100644 syntax/wget.vim
 create mode 100644 syntax/winbatch.vim
 create mode 100644 syntax/wml.vim
 create mode 100644 syntax/wsh.vim
 create mode 100644 syntax/wsml.vim
 create mode 100644 syntax/wvdial.vim
 create mode 100644 syntax/xdefaults.vim
 create mode 100644 syntax/xhtml.vim
 create mode 100644 syntax/xinetd.vim
 create mode 100644 syntax/xmath.vim
 create mode 100644 syntax/xmodmap.vim
 create mode 100644 syntax/xquery.vim
 create mode 100644 syntax/xsd.vim
 create mode 100644 syntax/xslt.vim
 create mode 100644 syntax/yacc.vim
 create mode 100644 syntax/z8a.vim
 create mode 100644 syntax/zimbu.vim

diff --git a/README.md b/README.md
index adf45f792..63a34062e 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->207<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->591<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -61,6 +61,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [ansible](https://github.com/pearofducks/ansible-vim)
 - [ant](https://github.com/vim/vim/tree/master/runtime)
 - [apache](https://github.com/vim/vim/tree/master/runtime)
+- [apachestyle](https://github.com/vim/vim/tree/master/runtime)
 - [apiblueprint](https://github.com/kylef/apiblueprint.vim)
 - [applescript](https://github.com/mityu/vim-applescript)
 - [aptconf](https://github.com/vim/vim/tree/master/runtime)
@@ -71,6 +72,8 @@ If you need full functionality of any plugin, please use it directly with your p
 - [asn](https://github.com/vim/vim/tree/master/runtime)
 - [aspperl](https://github.com/vim/vim/tree/master/runtime)
 - [aspvbs](https://github.com/vim/vim/tree/master/runtime)
+- [asterisk](https://github.com/vim/vim/tree/master/runtime)
+- [asteriskvm](https://github.com/vim/vim/tree/master/runtime)
 - [atlas](https://github.com/vim/vim/tree/master/runtime)
 - [autohotkey](https://github.com/hnamikaw/vim-autohotkey)
 - [autoit](https://github.com/vim/vim/tree/master/runtime)
@@ -79,175 +82,556 @@ If you need full functionality of any plugin, please use it directly with your p
 - [awk](https://github.com/vim/vim/tree/master/runtime)
 - [b](https://github.com/vim/vim/tree/master/runtime)
 - [basic](https://github.com/vim/vim/tree/master/runtime)
+- [bc](https://github.com/vim/vim/tree/master/runtime)
+- [bdf](https://github.com/vim/vim/tree/master/runtime)
+- [bib](https://github.com/vim/vim/tree/master/runtime)
+- [bindzone](https://github.com/vim/vim/tree/master/runtime)
 - [blade](https://github.com/jwalton512/vim-blade)
+- [blank](https://github.com/vim/vim/tree/master/runtime)
 - [brewfile](https://github.com/bfontaine/Brewfile.vim)
+- [bsdl](https://github.com/vim/vim/tree/master/runtime)
+- [bst](https://github.com/vim/vim/tree/master/runtime)
 - [bzl](https://github.com/vim/vim/tree/master/runtime)
+- [bzr](https://github.com/vim/vim/tree/master/runtime)
 - [c/c++](https://github.com/vim-jp/vim-cpp)
+- [cabal](https://github.com/vim/vim/tree/master/runtime)
 - [caddyfile](https://github.com/isobit/vim-caddyfile)
+- [calendar](https://github.com/vim/vim/tree/master/runtime)
 - [carp](https://github.com/hellerve/carp-vim)
+- [catalog](https://github.com/vim/vim/tree/master/runtime)
+- [cdl](https://github.com/vim/vim/tree/master/runtime)
+- [cdrdaoconf](https://github.com/vim/vim/tree/master/runtime)
+- [cdrtoc](https://github.com/vim/vim/tree/master/runtime)
+- [cf](https://github.com/vim/vim/tree/master/runtime)
+- [cfengine](https://github.com/vim/vim/tree/master/runtime)
+- [cfg](https://github.com/vim/vim/tree/master/runtime)
+- [ch](https://github.com/vim/vim/tree/master/runtime)
+- [chaiscript](https://github.com/vim/vim/tree/master/runtime)
+- [chaskell](https://github.com/vim/vim/tree/master/runtime)
+- [chill](https://github.com/vim/vim/tree/master/runtime)
+- [chordpro](https://github.com/vim/vim/tree/master/runtime)
 - [cjsx](https://github.com/mtscout6/vim-cjsx)
+- [cl](https://github.com/vim/vim/tree/master/runtime)
+- [clean](https://github.com/vim/vim/tree/master/runtime)
 - [clojure](https://github.com/guns/vim-clojure-static)
 - [cmake](https://github.com/pboettch/vim-cmake-syntax)
+- [cmod](https://github.com/vim/vim/tree/master/runtime)
+- [cmusrc](https://github.com/vim/vim/tree/master/runtime)
+- [cobol](https://github.com/vim/vim/tree/master/runtime)
+- [coco](https://github.com/vim/vim/tree/master/runtime)
 - [coffee-script](https://github.com/kchmck/vim-coffee-script)
+- [conaryrecipe](https://github.com/vim/vim/tree/master/runtime)
 - [conf](https://github.com/vim/vim/tree/master/runtime)
+- [config](https://github.com/vim/vim/tree/master/runtime)
+- [context](https://github.com/vim/vim/tree/master/runtime)
 - [cpp-modern](https://github.com/bfrg/vim-cpp-modern)
 - [cql](https://github.com/elubow/cql-vim)
+- [crm](https://github.com/vim/vim/tree/master/runtime)
+- [crontab](https://github.com/vim/vim/tree/master/runtime)
 - [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim)
 - [crystal](https://github.com/rhysd/vim-crystal)
+- [cs](https://github.com/vim/vim/tree/master/runtime)
+- [csc](https://github.com/vim/vim/tree/master/runtime)
+- [csdl](https://github.com/vim/vim/tree/master/runtime)
+- [csp](https://github.com/vim/vim/tree/master/runtime)
+- [css](https://github.com/vim/vim/tree/master/runtime)
 - [csv](https://github.com/chrisbra/csv.vim)
+- [cterm](https://github.com/vim/vim/tree/master/runtime)
 - [cucumber](https://github.com/tpope/vim-cucumber)
+- [cuda](https://github.com/vim/vim/tree/master/runtime)
 - [cue](https://github.com/mgrabovsky/vim-cuesheet)
+- [cupl](https://github.com/vim/vim/tree/master/runtime)
+- [cuplsim](https://github.com/vim/vim/tree/master/runtime)
+- [cvs](https://github.com/vim/vim/tree/master/runtime)
+- [cvsrc](https://github.com/vim/vim/tree/master/runtime)
+- [cynpp](https://github.com/vim/vim/tree/master/runtime)
 - [dart](https://github.com/dart-lang/dart-vim-plugin)
+- [datascript](https://github.com/vim/vim/tree/master/runtime)
+- [dcd](https://github.com/vim/vim/tree/master/runtime)
+- [debchangelog](https://github.com/vim/vim/tree/master/runtime)
+- [debcontrol](https://github.com/vim/vim/tree/master/runtime)
+- [debcopyright](https://github.com/vim/vim/tree/master/runtime)
+- [debsources](https://github.com/vim/vim/tree/master/runtime)
+- [def](https://github.com/vim/vim/tree/master/runtime)
+- [denyhosts](https://github.com/vim/vim/tree/master/runtime)
+- [desc](https://github.com/vim/vim/tree/master/runtime)
+- [desktop](https://github.com/vim/vim/tree/master/runtime)
 - [dhall](https://github.com/vmchale/dhall-vim)
+- [dictconf](https://github.com/vim/vim/tree/master/runtime)
+- [dictdconf](https://github.com/vim/vim/tree/master/runtime)
+- [diff](https://github.com/vim/vim/tree/master/runtime)
+- [dircolors](https://github.com/vim/vim/tree/master/runtime)
 - [dlang](https://github.com/JesseKPhillips/d.vim)
+- [dnsmasq](https://github.com/vim/vim/tree/master/runtime)
 - [dockerfile](https://github.com/ekalinin/Dockerfile.vim)
+- [dosbatch](https://github.com/vim/vim/tree/master/runtime)
 - [dosini](https://github.com/vim/vim/tree/master/runtime)
+- [dot](https://github.com/vim/vim/tree/master/runtime)
+- [dracula](https://github.com/vim/vim/tree/master/runtime)
+- [dsl](https://github.com/vim/vim/tree/master/runtime)
+- [dtd](https://github.com/vim/vim/tree/master/runtime)
+- [dts](https://github.com/vim/vim/tree/master/runtime)
+- [dylan](https://github.com/vim/vim/tree/master/runtime)
+- [dylanintr](https://github.com/vim/vim/tree/master/runtime)
+- [dylanlid](https://github.com/vim/vim/tree/master/runtime)
+- [ecd](https://github.com/vim/vim/tree/master/runtime)
+- [edif](https://github.com/vim/vim/tree/master/runtime)
 - [elf](https://github.com/vim/vim/tree/master/runtime)
+- [elinks](https://github.com/vim/vim/tree/master/runtime)
 - [elixir](https://github.com/elixir-lang/vim-elixir)
 - [elm](https://github.com/andys8/vim-elm-syntax)
+- [elmfilt](https://github.com/vim/vim/tree/master/runtime)
 - [emberscript](https://github.com/yalesov/vim-ember-script)
 - [emblem](https://github.com/yalesov/vim-emblem)
 - [erlang](https://github.com/vim-erlang/vim-erlang-runtime)
+- [esmtprc](https://github.com/vim/vim/tree/master/runtime)
+- [esqlc](https://github.com/vim/vim/tree/master/runtime)
+- [esterel](https://github.com/vim/vim/tree/master/runtime)
+- [eterm](https://github.com/vim/vim/tree/master/runtime)
+- [exim](https://github.com/vim/vim/tree/master/runtime)
+- [expect](https://github.com/vim/vim/tree/master/runtime)
+- [exports](https://github.com/vim/vim/tree/master/runtime)
+- [factor](https://github.com/vim/vim/tree/master/runtime)
+- [falcon](https://github.com/vim/vim/tree/master/runtime)
+- [fan](https://github.com/vim/vim/tree/master/runtime)
 - [fennel](https://github.com/bakpakin/fennel.vim)
 - [ferm](https://github.com/vim-scripts/ferm.vim)
+- [fetchmail](https://github.com/vim/vim/tree/master/runtime)
+- [fgl](https://github.com/vim/vim/tree/master/runtime)
 - [fish](https://github.com/georgewitteman/vim-fish)
 - [flatbuffers](https://github.com/dcharbon/vim-flatbuffers)
+- [focexec](https://github.com/vim/vim/tree/master/runtime)
 - [forth](https://github.com/vim/vim/tree/master/runtime)
+- [fortran](https://github.com/vim/vim/tree/master/runtime)
+- [framescript](https://github.com/vim/vim/tree/master/runtime)
 - [freebasic](https://github.com/vim/vim/tree/master/runtime)
 - [fsharp](https://github.com/ionide/Ionide-vim)
+- [fstab](https://github.com/vim/vim/tree/master/runtime)
+- [fvwm](https://github.com/vim/vim/tree/master/runtime)
+- [gdb](https://github.com/vim/vim/tree/master/runtime)
+- [gdmo](https://github.com/vim/vim/tree/master/runtime)
 - [gdscript](https://github.com/calviken/vim-gdscript3)
+- [gedcom](https://github.com/vim/vim/tree/master/runtime)
 - [git](https://github.com/tpope/vim-git)
 - [gitignore](https://github.com/fszymanski/fzf-gitignore)
+- [gitolite](https://github.com/vim/vim/tree/master/runtime)
+- [gkrellmrc](https://github.com/vim/vim/tree/master/runtime)
 - [glsl](https://github.com/tikhomirov/vim-glsl)
 - [gmpl](https://github.com/maelvalais/gmpl.vim)
+- [gnash](https://github.com/vim/vim/tree/master/runtime)
 - [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting)
 - [go](https://github.com/fatih/vim-go)
+- [gp](https://github.com/vim/vim/tree/master/runtime)
+- [gpg](https://github.com/vim/vim/tree/master/runtime)
 - [gradle](https://github.com/tfnico/vim-gradle)
+- [grads](https://github.com/vim/vim/tree/master/runtime)
 - [graphql](https://github.com/jparise/vim-graphql)
+- [gretl](https://github.com/vim/vim/tree/master/runtime)
 - [groovy](https://github.com/vim/vim/tree/master/runtime)
+- [group](https://github.com/vim/vim/tree/master/runtime)
 - [grub](https://github.com/vim/vim/tree/master/runtime)
+- [gsp](https://github.com/vim/vim/tree/master/runtime)
+- [gtkrc](https://github.com/vim/vim/tree/master/runtime)
 - [haml](https://github.com/tpope/vim-haml)
 - [hamster](https://github.com/vim/vim/tree/master/runtime)
 - [handlebars](https://github.com/mustache/vim-mustache-handlebars)
 - [haproxy](https://github.com/CH-DanReif/haproxy.vim)
 - [haskell](https://github.com/neovimhaskell/haskell-vim)
+- [haste](https://github.com/vim/vim/tree/master/runtime)
+- [hastepreproc](https://github.com/vim/vim/tree/master/runtime)
 - [haxe](https://github.com/yaymukund/vim-haxe)
+- [hb](https://github.com/vim/vim/tree/master/runtime)
 - [hcl](https://github.com/b4b4r07/vim-hcl)
 - [helm](https://github.com/towolf/vim-helm)
 - [help](https://github.com/neovim/neovim/tree/master/runtime)
+- [hercules](https://github.com/vim/vim/tree/master/runtime)
+- [hex](https://github.com/vim/vim/tree/master/runtime)
+- [hgcommit](https://github.com/vim/vim/tree/master/runtime)
 - [hive](https://github.com/zebradil/hive.vim)
+- [hog](https://github.com/vim/vim/tree/master/runtime)
+- [hollywood](https://github.com/vim/vim/tree/master/runtime)
+- [hostconf](https://github.com/vim/vim/tree/master/runtime)
+- [hostsaccess](https://github.com/vim/vim/tree/master/runtime)
 - [html5](https://github.com/othree/html5.vim)
 - [htmldjango](https://github.com/vim/vim/tree/master/runtime)
+- [htmlm4](https://github.com/vim/vim/tree/master/runtime)
+- [httest](https://github.com/vim/vim/tree/master/runtime)
 - [i3](https://github.com/mboughaba/i3config.vim)
 - [ibasic](https://github.com/vim/vim/tree/master/runtime)
 - [icalendar](https://github.com/chutzpah/icalendar.vim)
+- [icemenu](https://github.com/vim/vim/tree/master/runtime)
+- [icon](https://github.com/vim/vim/tree/master/runtime)
 - [idris2](https://github.com/edwinb/idris2-vim)
 - [idris](https://github.com/idris-hackers/idris-vim)
+- [indent](https://github.com/vim/vim/tree/master/runtime)
+- [inform](https://github.com/vim/vim/tree/master/runtime)
+- [initng](https://github.com/vim/vim/tree/master/runtime)
+- [inittab](https://github.com/vim/vim/tree/master/runtime)
 - [ion](https://github.com/vmchale/ion-vim)
+- [ipfilter](https://github.com/vim/vim/tree/master/runtime)
+- [iss](https://github.com/vim/vim/tree/master/runtime)
+- [ist](https://github.com/vim/vim/tree/master/runtime)
+- [j](https://github.com/vim/vim/tree/master/runtime)
+- [jal](https://github.com/vim/vim/tree/master/runtime)
+- [jam](https://github.com/vim/vim/tree/master/runtime)
+- [java](https://github.com/vim/vim/tree/master/runtime)
+- [javacc](https://github.com/vim/vim/tree/master/runtime)
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
 - [javascript](https://github.com/pangloss/vim-javascript)
 - [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax)
+- [jess](https://github.com/vim/vim/tree/master/runtime)
+- [jgraph](https://github.com/vim/vim/tree/master/runtime)
+- [jovial](https://github.com/vim/vim/tree/master/runtime)
+- [jproperties](https://github.com/vim/vim/tree/master/runtime)
 - [jq](https://github.com/vito-c/jq.vim)
 - [json5](https://github.com/GutenYe/json5.vim)
 - [json](https://github.com/elzr/vim-json)
 - [jsonnet](https://github.com/google/vim-jsonnet)
+- [jsp](https://github.com/vim/vim/tree/master/runtime)
 - [jst](https://github.com/briancollins/vim-jst)
 - [jsx](https://github.com/MaxMEllon/vim-jsx-pretty)
 - [julia](https://github.com/JuliaEditorSupport/julia-vim)
+- [kconfig](https://github.com/vim/vim/tree/master/runtime)
+- [kivy](https://github.com/vim/vim/tree/master/runtime)
+- [kix](https://github.com/vim/vim/tree/master/runtime)
 - [kotlin](https://github.com/udalov/kotlin-vim)
+- [kscript](https://github.com/vim/vim/tree/master/runtime)
+- [kwt](https://github.com/vim/vim/tree/master/runtime)
+- [lace](https://github.com/vim/vim/tree/master/runtime)
+- [latte](https://github.com/vim/vim/tree/master/runtime)
+- [ld](https://github.com/vim/vim/tree/master/runtime)
+- [ldif](https://github.com/vim/vim/tree/master/runtime)
 - [ledger](https://github.com/ledger/vim-ledger)
 - [less](https://github.com/vim/vim/tree/master/runtime)
+- [lex](https://github.com/vim/vim/tree/master/runtime)
+- [lftp](https://github.com/vim/vim/tree/master/runtime)
+- [lhaskell](https://github.com/vim/vim/tree/master/runtime)
+- [libao](https://github.com/vim/vim/tree/master/runtime)
+- [lifelines](https://github.com/vim/vim/tree/master/runtime)
+- [lilo](https://github.com/vim/vim/tree/master/runtime)
 - [lilypond](https://github.com/anowlcalledjosh/vim-lilypond)
+- [limits](https://github.com/vim/vim/tree/master/runtime)
+- [liquid](https://github.com/vim/vim/tree/master/runtime)
+- [lisp](https://github.com/vim/vim/tree/master/runtime)
+- [lite](https://github.com/vim/vim/tree/master/runtime)
+- [litestep](https://github.com/vim/vim/tree/master/runtime)
 - [livescript](https://github.com/gkz/vim-ls)
 - [llvm](https://github.com/rhysd/vim-llvm)
 - [log](https://github.com/MTDL9/vim-log-highlighting)
+- [logcheck](https://github.com/vim/vim/tree/master/runtime)
+- [loginaccess](https://github.com/vim/vim/tree/master/runtime)
+- [logindefs](https://github.com/vim/vim/tree/master/runtime)
+- [logtalk](https://github.com/vim/vim/tree/master/runtime)
+- [lotos](https://github.com/vim/vim/tree/master/runtime)
+- [lout](https://github.com/vim/vim/tree/master/runtime)
+- [lpc](https://github.com/vim/vim/tree/master/runtime)
+- [lprolog](https://github.com/vim/vim/tree/master/runtime)
+- [lsl](https://github.com/vim/vim/tree/master/runtime)
+- [lss](https://github.com/vim/vim/tree/master/runtime)
 - [lua](https://github.com/tbastos/vim-lua)
+- [lynx](https://github.com/vim/vim/tree/master/runtime)
 - [m4](https://github.com/vim/vim/tree/master/runtime)
+- [mail](https://github.com/vim/vim/tree/master/runtime)
+- [mailaliases](https://github.com/vim/vim/tree/master/runtime)
+- [mailcap](https://github.com/vim/vim/tree/master/runtime)
 - [mako](https://github.com/sophacles/vim-bundle-mako)
+- [mallard](https://github.com/vim/vim/tree/master/runtime)
+- [man](https://github.com/vim/vim/tree/master/runtime)
+- [manconf](https://github.com/vim/vim/tree/master/runtime)
+- [map](https://github.com/vim/vim/tree/master/runtime)
+- [maple](https://github.com/vim/vim/tree/master/runtime)
 - [markdown](https://github.com/plasticboy/vim-markdown)
+- [master](https://github.com/vim/vim/tree/master/runtime)
 - [mathematica](https://github.com/voldikss/vim-mma)
 - [mdx](https://github.com/jxnblk/vim-mdx-js)
+- [mel](https://github.com/vim/vim/tree/master/runtime)
 - [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim)
+- [messages](https://github.com/vim/vim/tree/master/runtime)
+- [mf](https://github.com/vim/vim/tree/master/runtime)
+- [mgl](https://github.com/vim/vim/tree/master/runtime)
+- [mgp](https://github.com/vim/vim/tree/master/runtime)
+- [mib](https://github.com/vim/vim/tree/master/runtime)
+- [mix](https://github.com/vim/vim/tree/master/runtime)
+- [mmp](https://github.com/vim/vim/tree/master/runtime)
+- [modconf](https://github.com/vim/vim/tree/master/runtime)
+- [modula2](https://github.com/vim/vim/tree/master/runtime)
+- [modula3](https://github.com/vim/vim/tree/master/runtime)
+- [monk](https://github.com/vim/vim/tree/master/runtime)
+- [moo](https://github.com/vim/vim/tree/master/runtime)
 - [moonscript](https://github.com/leafo/moonscript-vim)
+- [mp](https://github.com/vim/vim/tree/master/runtime)
+- [mplayerconf](https://github.com/vim/vim/tree/master/runtime)
+- [mrxvtrc](https://github.com/vim/vim/tree/master/runtime)
+- [msidl](https://github.com/vim/vim/tree/master/runtime)
+- [msql](https://github.com/vim/vim/tree/master/runtime)
+- [mupad](https://github.com/vim/vim/tree/master/runtime)
 - [murphi](https://github.com/vim/vim/tree/master/runtime)
+- [mush](https://github.com/vim/vim/tree/master/runtime)
+- [muttrc](https://github.com/vim/vim/tree/master/runtime)
+- [mysql](https://github.com/vim/vim/tree/master/runtime)
+- [n1ql](https://github.com/vim/vim/tree/master/runtime)
+- [named](https://github.com/vim/vim/tree/master/runtime)
+- [nanorc](https://github.com/vim/vim/tree/master/runtime)
+- [natural](https://github.com/vim/vim/tree/master/runtime)
+- [ncf](https://github.com/vim/vim/tree/master/runtime)
+- [neomuttrc](https://github.com/vim/vim/tree/master/runtime)
+- [netrc](https://github.com/vim/vim/tree/master/runtime)
 - [nginx](https://github.com/chr4/nginx.vim)
 - [nim](https://github.com/zah/nim.vim)
+- [ninja](https://github.com/vim/vim/tree/master/runtime)
 - [nix](https://github.com/LnL7/vim-nix)
+- [nqc](https://github.com/vim/vim/tree/master/runtime)
+- [nroff](https://github.com/vim/vim/tree/master/runtime)
+- [nsis](https://github.com/vim/vim/tree/master/runtime)
+- [obj](https://github.com/vim/vim/tree/master/runtime)
 - [objc](https://github.com/b4winckler/vim-objc)
 - [ocaml](https://github.com/rgrinberg/vim-ocaml)
+- [occam](https://github.com/vim/vim/tree/master/runtime)
 - [octave](https://github.com/McSinyx/vim-octave)
 - [odin](https://github.com/Tetralux/odin.vim)
+- [omnimark](https://github.com/vim/vim/tree/master/runtime)
 - [opencl](https://github.com/petRUShka/vim-opencl)
+- [openroad](https://github.com/vim/vim/tree/master/runtime)
+- [opl](https://github.com/vim/vim/tree/master/runtime)
+- [ora](https://github.com/vim/vim/tree/master/runtime)
+- [pamconf](https://github.com/vim/vim/tree/master/runtime)
+- [pamenv](https://github.com/vim/vim/tree/master/runtime)
+- [papp](https://github.com/vim/vim/tree/master/runtime)
+- [pascal](https://github.com/vim/vim/tree/master/runtime)
+- [passwd](https://github.com/vim/vim/tree/master/runtime)
+- [pccts](https://github.com/vim/vim/tree/master/runtime)
+- [pcmk](https://github.com/vim/vim/tree/master/runtime)
+- [pdf](https://github.com/vim/vim/tree/master/runtime)
 - [perl](https://github.com/vim-perl/vim-perl)
+- [pf](https://github.com/vim/vim/tree/master/runtime)
+- [pfmain](https://github.com/vim/vim/tree/master/runtime)
 - [pgsql](https://github.com/lifepillar/pgsql.vim)
 - [php](https://github.com/StanAngeloff/php.vim)
+- [pike](https://github.com/vim/vim/tree/master/runtime)
+- [pilrc](https://github.com/vim/vim/tree/master/runtime)
+- [pine](https://github.com/vim/vim/tree/master/runtime)
+- [pinfo](https://github.com/vim/vim/tree/master/runtime)
 - [plantuml](https://github.com/aklt/plantuml-syntax)
+- [pli](https://github.com/vim/vim/tree/master/runtime)
+- [plm](https://github.com/vim/vim/tree/master/runtime)
+- [plp](https://github.com/vim/vim/tree/master/runtime)
+- [plsql](https://github.com/vim/vim/tree/master/runtime)
+- [po](https://github.com/vim/vim/tree/master/runtime)
 - [pony](https://github.com/jakwings/vim-pony)
+- [postscr](https://github.com/vim/vim/tree/master/runtime)
+- [pov](https://github.com/vim/vim/tree/master/runtime)
+- [povini](https://github.com/vim/vim/tree/master/runtime)
 - [powershell](https://github.com/PProvost/vim-ps1)
+- [ppd](https://github.com/vim/vim/tree/master/runtime)
+- [ppwiz](https://github.com/vim/vim/tree/master/runtime)
+- [privoxy](https://github.com/vim/vim/tree/master/runtime)
+- [proc](https://github.com/vim/vim/tree/master/runtime)
+- [procmail](https://github.com/vim/vim/tree/master/runtime)
 - [prolog](https://github.com/vim/vim/tree/master/runtime)
+- [promela](https://github.com/vim/vim/tree/master/runtime)
 - [protobuf](https://github.com/uarun/vim-protobuf)
+- [protocols](https://github.com/vim/vim/tree/master/runtime)
+- [psf](https://github.com/vim/vim/tree/master/runtime)
 - [pug](https://github.com/digitaltoad/vim-pug)
+- [pullrequest](https://github.com/vim/vim/tree/master/runtime)
 - [puppet](https://github.com/rodjek/vim-puppet)
 - [purescript](https://github.com/purescript-contrib/purescript-vim)
+- [pyrex](https://github.com/vim/vim/tree/master/runtime)
 - [python-compiler](https://github.com/aliev/vim-compiler-python)
 - [python-indent](https://github.com/Vimjas/vim-python-pep8-indent)
 - [python](https://github.com/vim-python/python-syntax)
 - [qmake](https://github.com/artoj/qmake-syntax-vim)
 - [qml](https://github.com/peterhoeg/vim-qml)
+- [quake](https://github.com/vim/vim/tree/master/runtime)
 - [r-lang](https://github.com/vim-scripts/R.vim)
 - [racket](https://github.com/wlangstroth/vim-racket)
+- [radiance](https://github.com/vim/vim/tree/master/runtime)
 - [ragel](https://github.com/jneen/ragel.vim)
 - [raku](https://github.com/Raku/vim-raku)
 - [raml](https://github.com/IN3D/vim-raml)
+- [ratpoison](https://github.com/vim/vim/tree/master/runtime)
 - [razor](https://github.com/adamclerk/vim-razor)
+- [rc](https://github.com/vim/vim/tree/master/runtime)
+- [rcs](https://github.com/vim/vim/tree/master/runtime)
+- [readline](https://github.com/vim/vim/tree/master/runtime)
 - [reason](https://github.com/reasonml-editor/vim-reason-plus)
+- [rego](https://github.com/vim/vim/tree/master/runtime)
+- [remind](https://github.com/vim/vim/tree/master/runtime)
 - [requirements](https://github.com/raimon49/requirements.txt.vim)
+- [resolv](https://github.com/vim/vim/tree/master/runtime)
+- [reva](https://github.com/vim/vim/tree/master/runtime)
+- [rexx](https://github.com/vim/vim/tree/master/runtime)
+- [rib](https://github.com/vim/vim/tree/master/runtime)
+- [rmd](https://github.com/vim/vim/tree/master/runtime)
+- [rnc](https://github.com/vim/vim/tree/master/runtime)
+- [rng](https://github.com/vim/vim/tree/master/runtime)
+- [rnoweb](https://github.com/vim/vim/tree/master/runtime)
+- [robots](https://github.com/vim/vim/tree/master/runtime)
+- [rpcgen](https://github.com/vim/vim/tree/master/runtime)
+- [rpl](https://github.com/vim/vim/tree/master/runtime)
+- [rrst](https://github.com/vim/vim/tree/master/runtime)
 - [rspec](https://github.com/keith/rspec.vim)
 - [rst](https://github.com/marshallward/vim-restructuredtext)
+- [rtf](https://github.com/vim/vim/tree/master/runtime)
 - [ruby](https://github.com/vim-ruby/vim-ruby)
 - [rust](https://github.com/rust-lang/rust.vim)
+- [samba](https://github.com/vim/vim/tree/master/runtime)
+- [sas](https://github.com/vim/vim/tree/master/runtime)
+- [sass](https://github.com/vim/vim/tree/master/runtime)
+- [sather](https://github.com/vim/vim/tree/master/runtime)
 - [sbt](https://github.com/derekwyatt/vim-sbt)
 - [scala](https://github.com/derekwyatt/vim-scala)
+- [scheme](https://github.com/vim/vim/tree/master/runtime)
+- [scilab](https://github.com/vim/vim/tree/master/runtime)
+- [screen](https://github.com/vim/vim/tree/master/runtime)
 - [scss](https://github.com/cakebaker/scss-syntax.vim)
+- [sd](https://github.com/vim/vim/tree/master/runtime)
+- [sdc](https://github.com/vim/vim/tree/master/runtime)
+- [sdl](https://github.com/vim/vim/tree/master/runtime)
+- [sed](https://github.com/vim/vim/tree/master/runtime)
+- [sensors](https://github.com/vim/vim/tree/master/runtime)
+- [services](https://github.com/vim/vim/tree/master/runtime)
+- [setserial](https://github.com/vim/vim/tree/master/runtime)
 - [sh](https://github.com/arzg/vim-sh)
+- [sieve](https://github.com/vim/vim/tree/master/runtime)
+- [sil](https://github.com/vim/vim/tree/master/runtime)
+- [simula](https://github.com/vim/vim/tree/master/runtime)
+- [sinda](https://github.com/vim/vim/tree/master/runtime)
+- [sisu](https://github.com/vim/vim/tree/master/runtime)
+- [skill](https://github.com/vim/vim/tree/master/runtime)
+- [slang](https://github.com/vim/vim/tree/master/runtime)
+- [slice](https://github.com/vim/vim/tree/master/runtime)
 - [slim](https://github.com/slim-template/vim-slim)
 - [slime](https://github.com/slime-lang/vim-slime-syntax)
+- [slpconf](https://github.com/vim/vim/tree/master/runtime)
+- [slpreg](https://github.com/vim/vim/tree/master/runtime)
+- [slpspi](https://github.com/vim/vim/tree/master/runtime)
+- [slrnrc](https://github.com/vim/vim/tree/master/runtime)
+- [slrnsc](https://github.com/vim/vim/tree/master/runtime)
+- [sm](https://github.com/vim/vim/tree/master/runtime)
+- [smarty](https://github.com/vim/vim/tree/master/runtime)
+- [smcl](https://github.com/vim/vim/tree/master/runtime)
+- [smith](https://github.com/vim/vim/tree/master/runtime)
+- [sml](https://github.com/vim/vim/tree/master/runtime)
 - [smt2](https://github.com/bohlender/vim-smt2)
+- [snobol4](https://github.com/vim/vim/tree/master/runtime)
 - [solidity](https://github.com/tomlion/vim-solidity)
+- [spec](https://github.com/vim/vim/tree/master/runtime)
+- [spice](https://github.com/vim/vim/tree/master/runtime)
+- [spup](https://github.com/vim/vim/tree/master/runtime)
+- [spyce](https://github.com/vim/vim/tree/master/runtime)
 - [sql](https://github.com/vim/vim/tree/master/runtime)
+- [sqlj](https://github.com/vim/vim/tree/master/runtime)
+- [sqr](https://github.com/vim/vim/tree/master/runtime)
+- [squid](https://github.com/vim/vim/tree/master/runtime)
+- [srec](https://github.com/vim/vim/tree/master/runtime)
+- [sshconfig](https://github.com/vim/vim/tree/master/runtime)
+- [sshdconfig](https://github.com/vim/vim/tree/master/runtime)
+- [st](https://github.com/vim/vim/tree/master/runtime)
+- [stata](https://github.com/vim/vim/tree/master/runtime)
+- [stp](https://github.com/vim/vim/tree/master/runtime)
 - [stylus](https://github.com/wavded/vim-stylus)
+- [sudoers](https://github.com/vim/vim/tree/master/runtime)
 - [svelte](https://github.com/evanleck/vim-svelte/tree/main)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
 - [svg](https://github.com/vim-scripts/svg.vim)
+- [svn](https://github.com/vim/vim/tree/master/runtime)
 - [swift](https://github.com/keith/swift.vim)
+- [swiftgyb](https://github.com/vim/vim/tree/master/runtime)
 - [sxhkd](https://github.com/baskerville/vim-sxhkdrc)
+- [sysctl](https://github.com/vim/vim/tree/master/runtime)
 - [systemd](https://github.com/wgwoods/vim-systemd-syntax)
+- [systemverilog](https://github.com/vim/vim/tree/master/runtime)
 - [tads](https://github.com/vim/vim/tree/master/runtime)
+- [tags](https://github.com/vim/vim/tree/master/runtime)
+- [tak](https://github.com/vim/vim/tree/master/runtime)
+- [taskdata](https://github.com/vim/vim/tree/master/runtime)
+- [taskedit](https://github.com/vim/vim/tree/master/runtime)
+- [tcl](https://github.com/vim/vim/tree/master/runtime)
+- [template](https://github.com/vim/vim/tree/master/runtime)
+- [teraterm](https://github.com/vim/vim/tree/master/runtime)
+- [terminfo](https://github.com/vim/vim/tree/master/runtime)
 - [terraform](https://github.com/hashivim/vim-terraform)
+- [tex](https://github.com/vim/vim/tree/master/runtime)
+- [texinfo](https://github.com/vim/vim/tree/master/runtime)
+- [texmf](https://github.com/vim/vim/tree/master/runtime)
+- [text](https://github.com/vim/vim/tree/master/runtime)
 - [textile](https://github.com/timcharper/textile.vim)
+- [tf](https://github.com/vim/vim/tree/master/runtime)
 - [thrift](https://github.com/solarnz/thrift.vim)
+- [tidy](https://github.com/vim/vim/tree/master/runtime)
+- [tilde](https://github.com/vim/vim/tree/master/runtime)
+- [tli](https://github.com/vim/vim/tree/master/runtime)
 - [tmux](https://github.com/ericpruitt/tmux.vim/tree/master/vim)
 - [toml](https://github.com/cespare/vim-toml)
+- [tpp](https://github.com/vim/vim/tree/master/runtime)
 - [tptp](https://github.com/c-cube/vim-tptp)
 - [trasys](https://github.com/vim/vim/tree/master/runtime)
+- [treetop](https://github.com/vim/vim/tree/master/runtime)
+- [trustees](https://github.com/vim/vim/tree/master/runtime)
+- [tsalt](https://github.com/vim/vim/tree/master/runtime)
+- [tsscl](https://github.com/vim/vim/tree/master/runtime)
+- [tssgm](https://github.com/vim/vim/tree/master/runtime)
+- [tssop](https://github.com/vim/vim/tree/master/runtime)
 - [twig](https://github.com/lumiliet/vim-twig)
 - [typescript](https://github.com/HerringtonDarkholme/yats.vim)
+- [uc](https://github.com/vim/vim/tree/master/runtime)
+- [udevconf](https://github.com/vim/vim/tree/master/runtime)
+- [udevperm](https://github.com/vim/vim/tree/master/runtime)
+- [uil](https://github.com/vim/vim/tree/master/runtime)
 - [unison](https://github.com/unisonweb/unison/tree/trunk/editor-support/vim)
+- [updatedb](https://github.com/vim/vim/tree/master/runtime)
+- [upstart](https://github.com/vim/vim/tree/master/runtime)
+- [upstreamdat](https://github.com/vim/vim/tree/master/runtime)
+- [upstreaminstalllog](https://github.com/vim/vim/tree/master/runtime)
+- [upstreamlog](https://github.com/vim/vim/tree/master/runtime)
+- [usserverlog](https://github.com/vim/vim/tree/master/runtime)
+- [usw2kagtlog](https://github.com/vim/vim/tree/master/runtime)
 - [v](https://github.com/ollykel/v-vim)
 - [vala](https://github.com/arrufat/vala.vim)
 - [vbnet](https://github.com/vim-scripts/vbnet.vim)
 - [vcl](https://github.com/smerrill/vcl-vim-plugin)
 - [velocity](https://github.com/lepture/vim-velocity)
+- [vera](https://github.com/vim/vim/tree/master/runtime)
+- [verilog](https://github.com/vim/vim/tree/master/runtime)
+- [verilogams](https://github.com/vim/vim/tree/master/runtime)
+- [vgrindefs](https://github.com/vim/vim/tree/master/runtime)
+- [vhdl](https://github.com/vim/vim/tree/master/runtime)
+- [vim](https://github.com/vim/vim/tree/master/runtime)
+- [viminfo](https://github.com/vim/vim/tree/master/runtime)
 - [visual-basic](https://github.com/vim/vim/tree/master/runtime)
 - [vmasm](https://github.com/vim/vim/tree/master/runtime)
+- [voscm](https://github.com/vim/vim/tree/master/runtime)
+- [vrml](https://github.com/vim/vim/tree/master/runtime)
+- [vroom](https://github.com/vim/vim/tree/master/runtime)
 - [vue](https://github.com/posva/vim-vue)
+- [wast](https://github.com/vim/vim/tree/master/runtime)
+- [webmacro](https://github.com/vim/vim/tree/master/runtime)
+- [wget](https://github.com/vim/vim/tree/master/runtime)
+- [winbatch](https://github.com/vim/vim/tree/master/runtime)
+- [wml](https://github.com/vim/vim/tree/master/runtime)
+- [wsh](https://github.com/vim/vim/tree/master/runtime)
+- [wsml](https://github.com/vim/vim/tree/master/runtime)
+- [wvdial](https://github.com/vim/vim/tree/master/runtime)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)
+- [xdefaults](https://github.com/vim/vim/tree/master/runtime)
+- [xhtml](https://github.com/vim/vim/tree/master/runtime)
+- [xinetd](https://github.com/vim/vim/tree/master/runtime)
+- [xmath](https://github.com/vim/vim/tree/master/runtime)
 - [xml](https://github.com/amadeus/vim-xml)
+- [xmodmap](https://github.com/vim/vim/tree/master/runtime)
+- [xquery](https://github.com/vim/vim/tree/master/runtime)
+- [xsd](https://github.com/vim/vim/tree/master/runtime)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax)
+- [xslt](https://github.com/vim/vim/tree/master/runtime)
+- [yacc](https://github.com/vim/vim/tree/master/runtime)
 - [yaml](https://github.com/vim/vim/tree/df44a27b53586fccfc6a3aedc89061fdd9a515ff/runtime)
 - [yard](https://github.com/noprompt/vim-yardoc)
+- [z8a](https://github.com/vim/vim/tree/master/runtime)
 - [zephir](https://github.com/xwsoul/vim-zephir)
 - [zig](https://github.com/ziglang/zig.vim)
+- [zimbu](https://github.com/vim/vim/tree/master/runtime)
+- [zimbutempl](https://github.com/vim/vim/tree/master/runtime)
 - [zinit](https://github.com/zinit-zsh/zplugin-vim-syntax)
 <!--/Language Packs-->
 
diff --git a/autoload/context.vim b/autoload/context.vim
new file mode 100644
index 000000000..437864639
--- /dev/null
+++ b/autoload/context.vim
@@ -0,0 +1,188 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
+
+" Language:           ConTeXt typesetting engine
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Latest Revision:    2016 Oct 21
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+" Helper functions {{{
+function! s:context_echo(message, mode)
+  redraw
+  echo "\r"
+  execute 'echohl' a:mode
+  echomsg '[ConTeXt]' a:message
+  echohl None
+endf
+
+function! s:sh()
+  return has('win32') || has('win64') || has('win16') || has('win95')
+        \ ? ['cmd.exe', '/C']
+        \ : ['/bin/sh', '-c']
+endfunction
+
+" For backward compatibility
+if exists('*win_getid')
+
+  function! s:win_getid()
+    return win_getid()
+  endf
+
+  function! s:win_id2win(winid)
+    return win_id2win(a:winid)
+  endf
+
+else
+
+  function! s:win_getid()
+    return winnr()
+  endf
+
+  function! s:win_id2win(winnr)
+    return a:winnr
+  endf
+
+endif
+" }}}
+
+" ConTeXt jobs {{{
+if has('job')
+
+  let g:context_jobs = []
+
+  " Print the status of ConTeXt jobs
+  function! context#job_status()
+    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
+    let l:n = len(l:jobs)
+    call s:context_echo(
+          \ 'There '.(l:n == 1 ? 'is' : 'are').' '.(l:n == 0 ? 'no' : l:n)
+          \ .' job'.(l:n == 1 ? '' : 's').' running'
+          \ .(l:n == 0 ? '.' : ' (' . join(l:jobs, ', ').').'),
+          \ 'ModeMsg')
+  endfunction
+
+  " Stop all ConTeXt jobs
+  function! context#stop_jobs()
+    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
+    for job in l:jobs
+      call job_stop(job)
+    endfor
+    sleep 1
+    let l:tmp = []
+    for job in l:jobs
+      if job_status(job) == "run"
+        call add(l:tmp, job)
+      endif
+    endfor
+    let g:context_jobs = l:tmp
+    if empty(g:context_jobs)
+      call s:context_echo('Done. No jobs running.', 'ModeMsg')
+    else
+      call s:context_echo('There are still some jobs running. Please try again.', 'WarningMsg')
+    endif
+  endfunction
+
+  function! context#callback(path, job, status)
+    if index(g:context_jobs, a:job) != -1 && job_status(a:job) != 'run' " just in case
+      call remove(g:context_jobs, index(g:context_jobs, a:job))
+    endif
+    call s:callback(a:path, a:job, a:status)
+  endfunction
+
+  function! context#close_cb(channel)
+    call job_status(ch_getjob(a:channel)) " Trigger exit_cb's callback for faster feedback
+  endfunction
+
+  function! s:typeset(path)
+    call add(g:context_jobs,
+          \ job_start(add(s:sh(), context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))), {
+          \   'close_cb' : 'context#close_cb',
+          \   'exit_cb'  : function(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
+          \                         [a:path]),
+          \   'in_io'    : 'null'
+          \ }))
+  endfunction
+
+else " No jobs
+
+  function! context#job_status()
+    call s:context_echo('Not implemented', 'WarningMsg')
+  endfunction!
+
+  function! context#stop_jobs()
+    call s:context_echo('Not implemented', 'WarningMsg')
+  endfunction
+
+  function! context#callback(path, job, status)
+    call s:callback(a:path, a:job, a:status)
+  endfunction
+
+  function! s:typeset(path)
+    execute '!' . context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))
+    call call(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
+          \ [a:path, 0, v:shell_error])
+  endfunction
+
+endif " has('job')
+
+function! s:callback(path, job, status) abort
+  if a:status < 0 " Assume the job was terminated
+    return
+  endif
+  " Get info about the current window
+  let l:winid = s:win_getid()             " Save window id
+  let l:efm = &l:errorformat              " Save local errorformat
+  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
+  " Set errorformat to parse ConTeXt errors
+  execute 'setl efm=' . escape(b:context_errorformat, ' ')
+  try " Set cwd to expand error file correctly
+    execute 'lcd' fnameescape(fnamemodify(a:path, ':h'))
+  catch /.*/
+    execute 'setl efm=' . escape(l:efm, ' ')
+    throw v:exception
+  endtry
+  try
+    execute 'cgetfile' fnameescape(fnamemodify(a:path, ':r') . '.log')
+    botright cwindow
+  finally " Restore cwd and errorformat
+    execute s:win_id2win(l:winid) . 'wincmd w'
+    execute 'lcd ' . fnameescape(l:cwd)
+    execute 'setl efm=' . escape(l:efm, ' ')
+  endtry
+  if a:status == 0
+    call s:context_echo('Success!', 'ModeMsg')
+  else
+    call s:context_echo('There are errors. ', 'ErrorMsg')
+  endif
+endfunction
+
+function! context#command()
+  return get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
+        \ . ' --script context --autogenerate --nonstopmode'
+        \ . ' --synctex=' . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
+        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
+endfunction
+
+" Accepts an optional path (useful for big projects, when the file you are
+" editing is not the project's root document). If no argument is given, uses
+" the path of the current buffer.
+function! context#typeset(...) abort
+  let l:path = fnamemodify(strlen(a:000[0]) > 0 ? a:1 : expand("%"), ":p")
+  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
+  call s:context_echo('Typesetting...',  'ModeMsg')
+  execute 'lcd' fnameescape(fnamemodify(l:path, ":h"))
+  try
+    call s:typeset(l:path)
+  finally " Restore local working directory
+    execute 'lcd ' . fnameescape(l:cwd)
+  endtry
+endfunction!
+"}}}
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim: sw=2 fdm=marker
+
+endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index e2e371002..db1c70d1f 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -18,6 +18,7 @@ let s:globs = {
   \ 'ampl': '*.run',
   \ 'ant': 'build.xml',
   \ 'apache': '.htaccess,access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*',
+  \ 'apachestyle': 'proftpd.conf*',
   \ 'apiblueprint': '*.apib',
   \ 'applescript': '*.applescript,*.scpt',
   \ 'aptconf': 'apt.conf',
@@ -29,209 +30,592 @@ let s:globs = {
   \ 'asn': '*.asn,*.asn1',
   \ 'aspperl': '*.asp',
   \ 'aspvbs': '*.asa,*.asp',
+  \ 'asterisk': '',
+  \ 'asteriskvm': '',
   \ 'atlas': '*.atl,*.as',
   \ 'autohotkey': '*.ahk,*.ahkl',
   \ 'autoit': '*.au3',
-  \ 'automake': '[Mm]akefile.am,GNUmakefile.am',
+  \ 'automake': '*.mak,*.dsp,*.mk,Makefile.am,makefile.am,GNUmakefile.am',
   \ 'ave': '*.ave',
   \ 'awk': '*.awk,*.gawk',
   \ 'b': '*.mch,*.ref,*.imp',
   \ 'basic': '*.basic',
+  \ 'bc': '*.bc',
+  \ 'bdf': '*.bdf',
+  \ 'bib': '*.bib',
+  \ 'bindzone': 'named.root',
   \ 'blade': '*.blade,*.blade.php',
+  \ 'blank': '*.bl',
   \ 'brewfile': 'Brewfile',
+  \ 'bsdl': '*.bsdl,*bsd',
+  \ 'bst': '*.bst',
   \ 'bzl': '*.bzl,*.bazel,*.BUILD,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE',
+  \ 'bzr': 'bzr_log.*',
   \ 'c': '*.c,*.cats,*.h,*.idc,*.qc',
+  \ 'cabal': '*.cabal',
   \ 'caddyfile': 'Caddyfile',
+  \ 'calendar': 'calendar',
   \ 'carp': '*.carp',
+  \ 'catalog': 'catalog,sgml.catalog*',
+  \ 'cdl': '*.cdl',
+  \ 'cdrdaoconf': '.cdrdao',
+  \ 'cdrtoc': '*.toc',
+  \ 'cf': '*.cfm,*.cfi,*.cfc',
+  \ 'cfengine': 'cfengine.conf',
+  \ 'cfg': '*.cfg,*.hgrc,*hgrc',
+  \ 'ch': '*.chf',
+  \ 'chaiscript': '*.chai',
+  \ 'chaskell': '*.chs',
+  \ 'chill': '*..ch',
+  \ 'chordpro': '*.chopro,*.crd,*.cho,*.crdpro,*.chordpro',
+  \ 'cl': '*.eni',
+  \ 'clean': '*.dcl,*.icl',
   \ 'clojure': '*.clj,*.boot,*.cl2,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.hic,*.edn,riemann.config,build.boot,profile.boot',
   \ 'cmake': '*.cmake,*.cmake.in,CMakeLists.txt',
+  \ 'cmod': '*.cmod',
+  \ 'cmusrc': '',
+  \ 'cobol': '*.cbl,*.cob,*.lib',
+  \ 'coco': '*.atg',
   \ 'coffee': '*.coffee,*._coffee,*.cake,*.cjsx,*.iced,*.coffeekup,Cakefile',
+  \ 'conaryrecipe': '*.recipe',
   \ 'conf': '*.conf,auto.master,config',
+  \ 'config': 'configure.in,configure.ac,Pipfile',
+  \ 'context': '*.mkii,*.mkiv,*.mkvi',
   \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh',
   \ 'cql': '*.cql',
+  \ 'crm': '*.crm',
+  \ 'crontab': 'crontab,crontab.*',
   \ 'cryptol': '*.cry,*.cyl,*.lcry,*.lcyl',
   \ 'crystal': '*.cr,Projectfile',
+  \ 'cs': '*.cs',
+  \ 'csc': '*.csc',
+  \ 'csdl': '*.csdl',
+  \ 'csp': '*.csp,*.fdr',
+  \ 'css': '*.css',
   \ 'csv': '*.csv,*.tsv,*.tab',
+  \ 'cterm': '*.con',
   \ 'cucumber': '*.feature,*.story',
+  \ 'cuda': '*.cu,*.cuh',
   \ 'cuesheet': '*.cue',
+  \ 'cupl': '*.pld',
+  \ 'cuplsim': '*.si',
+  \ 'cvs': 'cvs\d\+',
+  \ 'cvsrc': '.cvsrc',
+  \ 'cynpp': '*.cyn',
   \ 'd': '*.d,*.di',
   \ 'dart': '*.dart,*.drt',
+  \ 'datascript': '*.ds',
+  \ 'dcd': '*.dcd',
   \ 'dcov': '*.lst',
   \ 'dd': '*.dd',
   \ 'ddoc': '*.ddoc',
+  \ 'debchangelog': 'changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch',
+  \ 'debcontrol': '',
+  \ 'debcopyright': '',
+  \ 'debsources': '',
+  \ 'def': '*.def',
+  \ 'denyhosts': 'denyhosts.conf',
+  \ 'desc': '*.desc',
+  \ 'desktop': '*.desktop,*.directory',
   \ 'dhall': '*.dhall',
+  \ 'dictconf': 'dict.conf,.dictrc',
+  \ 'dictdconf': 'dictd.conf',
+  \ 'diff': '*.diff,*.rej',
+  \ 'dircolors': '.dir_colors,.dircolors',
+  \ 'dnsmasq': '',
+  \ 'dosbatch': '*.bat,*.sys',
   \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,buildozer.spec,.editorconfig,.npmrc,php.ini-*',
+  \ 'dot': '*.dot,*.gv',
+  \ 'dracula': '*.drac,*.drc,*lvs,*lpe,drac.*',
   \ 'dsdl': '*.sdl',
+  \ 'dsl': '*.dsl',
+  \ 'dtd': '*.dtd',
+  \ 'dts': '*.dts,*.dtsi',
   \ 'dune': 'jbuild,dune,dune-project,dune-workspace',
+  \ 'dylan': '*.dylan',
+  \ 'dylanintr': '*.intr',
+  \ 'dylanlid': '*.lid',
+  \ 'ecd': '*.ecd',
   \ 'ecrystal': '*.ecr',
+  \ 'edif': '*.ed\(f\|if\|o\)',
   \ 'eelixir': '*.eex,*.leex',
   \ 'elf': '*.am',
+  \ 'elinks': 'elinks.conf',
   \ 'elixir': '*.ex,*.exs,mix.lock',
   \ 'elm': '*.elm',
+  \ 'elmfilt': 'filter-rules',
   \ 'embeddedpuppet': '*.epp',
   \ 'ember-script': '*.em,*.emberscript',
   \ 'emblem': '*.emblem,*.em',
   \ 'erlang': '*.erl,*.app.src,*.es,*.escript,*.hrl,*.xrl,*.yrl,*.app,*.yaws,Emakefile,rebar.config,rebar.config.lock,rebar.lock',
   \ 'eruby': '*.erb,*.erb.deface,*.rhtml',
+  \ 'esmtprc': '*esmtprc',
+  \ 'esqlc': '*.ec,*.EC',
+  \ 'esterel': '*.strl',
+  \ 'eterm': '',
+  \ 'exim': 'exim.conf',
+  \ 'expect': '*.exp',
+  \ 'exports': 'exports',
+  \ 'factor': '*.factor',
+  \ 'falcon': '*.fal',
+  \ 'fan': '*.fan,*.fwt',
   \ 'fbs': '*.fbs',
   \ 'fennel': '*.fnl',
   \ 'ferm': '*.ferm,ferm.conf',
+  \ 'fetchmail': '.fetchmailrc',
+  \ 'fgl': '*.4gl,*.4gh,*.m4gl',
   \ 'fish': '*.fish',
   \ 'flow': '*.flow',
+  \ 'focexec': '*.fex,*.focexec',
   \ 'forth': '*.fs,*.ft,*.fth',
+  \ 'fortran': '*.f,*.for,*.fortran,*.fpp,*.ftn,*.f77,*.f90,*.f95,*.f03,*.f08',
+  \ 'framescript': '*.fsl',
   \ 'freebasic': '*.fb,*.bi',
   \ 'fsharp': '*.fs,*.fsi,*.fsx',
+  \ 'fstab': 'fstab,mtab',
+  \ 'fvwm': '',
+  \ 'gdb': '.gdbinit',
+  \ 'gdmo': '*.mo,*.gdmo',
   \ 'gdscript3': '*.gd',
+  \ 'gedcom': '*.ged,lltxxxxx.txt',
   \ 'gitcommit': 'COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG',
   \ 'gitconfig': '*.gitconfig,.gitconfig,.gitmodules',
   \ 'gitignore': '.gitignore',
+  \ 'gitolite': 'gitolite.conf',
   \ 'gitrebase': 'git-rebase-todo',
   \ 'gitsendemail': '.gitsendemail.*',
+  \ 'gkrellmrc': 'gkrellmrc,gkrellmrc_?',
   \ 'glsl': '*.glsl,*.fp,*.frag,*.frg,*.fs,*.fsh,*.fshader,*.geo,*.geom,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader,*.comp',
   \ 'gmpl': '*.mod',
+  \ 'gnash': 'gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc',
   \ 'gnuplot': '*.gp,*.gnu,*.gnuplot,*.p,*.plot,*.plt,*.gpi',
   \ 'go': '*.go',
   \ 'gohtmltmpl': '*.tmpl',
   \ 'gomod': 'go.mod',
+  \ 'gp': '*.gp,.gprc',
+  \ 'gpg': '',
+  \ 'grads': '*.gs',
   \ 'graphql': '*.graphql,*.gql,*.graphqls',
+  \ 'gretl': '*.gretl',
   \ 'groovy': '*.groovy,*.grt,*.gtpl,*.gvy,*.gradle,Jenkinsfile',
+  \ 'group': '',
   \ 'grub': '',
+  \ 'gsp': '*.gsp',
+  \ 'gtkrc': '.gtkrc,gtkrc,.gtkrc*,gtkrc*',
   \ 'haml': '*.haml,*.haml.deface,*.hamlc,*.hamlbars',
   \ 'hamster': '*.hsc,*.hsm',
   \ 'haproxy': '*.cfg,haproxy.cfg,haproxy*.conf*',
   \ 'haskell': '*.hs,*.hs-boot,*.hsc,*.bpk,*.hsig',
+  \ 'haste': '*.ht',
+  \ 'hastepreproc': '*.htpp',
   \ 'haxe': '*.hx,*.hxsl',
+  \ 'hb': '*.hb',
   \ 'hcl': '*.hcl,*.nomad,*.workflow,Appfile',
   \ 'helm': '',
   \ 'help': '',
+  \ 'hercules': '*.vc,*.ev,*.sum,*.errsum',
+  \ 'hex': '*.hex,*.h32',
+  \ 'hgcommit': 'hg-editor-*.txt',
   \ 'hive': '*.q,*.hql,*.ql',
+  \ 'hog': '*.hog,snort.conf,vision.conf',
+  \ 'hollywood': '*.hws',
+  \ 'hostconf': '',
+  \ 'hostsaccess': '',
   \ 'html': '*.html,*.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml',
   \ 'html.handlebars': '*.handlebars,*.hbs,*.hdbs,*.hb',
   \ 'html.mustache': '*.mustache,*.hogan,*.hulk,*.hjs',
   \ 'html.twig': '*.twig',
   \ 'htmldjango': '*.jinja,*.j2,*.jinja2,*.njk',
+  \ 'htmlm4': '*.html.m4',
+  \ 'httest': '*.htt,*.htb',
   \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config,.i3.config,.i3config',
   \ 'ibasic': '*.iba,*.ibi',
   \ 'icalendar': '*.ics',
+  \ 'icemenu': '',
+  \ 'icon': '*.icn',
   \ 'idris': '*.idr,*.lidr,idris-response',
   \ 'idris2': '*.idr,*.ipkg,idris-response',
+  \ 'indent': '.indent.pro,indentrc',
+  \ 'inform': '*.inf,*.INF',
+  \ 'initng': '*.ii',
+  \ 'inittab': 'inittab',
   \ 'ion': '*.ion',
+  \ 'ipfilter': 'ipf.conf,ipf6.conf,ipf.rules',
+  \ 'iss': '*.iss',
+  \ 'ist': '*.ist,*.mst',
+  \ 'j': '*.ijs',
+  \ 'jal': '*.jal,*.JAL',
+  \ 'jam': '*.jpl,*.jpr,Prl*.*,JAM*.*',
+  \ 'java': '*.java,*.jav',
+  \ 'javacc': '*.jj,*.jjt',
   \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,*.javascript,Jakefile',
   \ 'javascriptreact': '*.jsx',
+  \ 'jess': '*.clp',
+  \ 'jgraph': '*.jgr',
+  \ 'jovial': '*.jov,*.j73,*.jovial',
+  \ 'jproperties': '*.properties,*.properties_??,*.properties_??_??,*.properties_??_??_*',
   \ 'jq': '*.jq,.jqrc,.jqrc*',
   \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.tern-config,.tern-project,.watchmanconfig,composer.lock,mcmod.info,Pipfile.lock',
   \ 'json5': '*.json5',
   \ 'jsonnet': '*.jsonnet,*.libsonnet',
+  \ 'jsp': '*.jsp',
   \ 'jst': '*.ejs,*.ect,*.jst',
   \ 'julia': '*.jl',
+  \ 'kconfig': 'Kconfig,Kconfig.debug,Kconfig.*',
+  \ 'kivy': '*.kv',
+  \ 'kix': '*.kix',
   \ 'kotlin': '*.kt,*.ktm,*.kts',
+  \ 'kscript': '*.ks',
+  \ 'kwt': '*.k',
+  \ 'lace': '*.ace,*.ACE',
+  \ 'latte': '*.latte,*.lte',
+  \ 'ld': '*.ld',
+  \ 'ldif': '*.ldif',
   \ 'ledger': '*.ldg,*.ledger,*.journal',
   \ 'less': '*.less',
+  \ 'lex': '*.lex,*.l,*.lxx,*.l++',
+  \ 'lftp': 'lftp.conf,.lftprc',
+  \ 'lhaskell': '*.lhs',
+  \ 'libao': '',
   \ 'lidris2': '*.lidr',
+  \ 'lifelines': '*.ll',
+  \ 'lilo': 'lilo.conf,lilo.conf*',
   \ 'lilypond': '*.ly,*.ily',
+  \ 'limits': '',
+  \ 'liquid': '*.liquid',
+  \ 'lisp': '*.lsp,*.lisp,*.el,*.cl,.emacs,.sawfishrc,sbclrc,.sbclrc',
   \ 'litcoffee': '*.litcoffee,*.coffee.md',
+  \ 'lite': '*.lite,*.lt',
+  \ 'litestep': '',
   \ 'livescript': '*.ls,*._ls,Slakefile',
   \ 'llvm': '*.ll',
   \ 'log': '*.log,*.LOG,*_log,*_LOG',
+  \ 'logcheck': '',
+  \ 'loginaccess': '',
+  \ 'logindefs': '',
+  \ 'logtalk': '*.lgt',
+  \ 'lotos': '*.lot,*.lotos',
+  \ 'lout': '*.lou,*.lout',
+  \ 'lpc': '*.lpc,*.ulpc',
+  \ 'lprolog': '*.sig',
+  \ 'lsl': '*.lsl',
+  \ 'lss': '*.lss',
   \ 'lua': '*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,.luacheckrc',
+  \ 'lynx': 'lynx.cfg',
   \ 'm4': '*.m4,*.at',
+  \ 'mail': '*.eml,snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\\\{6\},neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},ae\d\+.txt,{neo,}mutt[[:alnum:]._-]\\\{6\},reportbug-*',
+  \ 'mailaliases': '',
+  \ 'mailcap': '.mailcap,mailcap',
   \ 'mako': '*.mako,*.mao',
+  \ 'mallard': '*.page',
+  \ 'man': '*.man',
+  \ 'manconf': 'man.config',
+  \ 'map': '*.map',
+  \ 'maple': '*.mv,*.mpl,*.mws',
   \ 'markdown': '*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr',
   \ 'markdown.mdx': '*.mdx',
   \ 'mason': '*.mason,*.mhtml,*.comp',
+  \ 'master': '*.mas,*.master',
+  \ 'mel': '*.mel',
   \ 'meson': 'meson.build,meson_options.txt',
+  \ 'messages': '',
+  \ 'mf': '*.mf',
+  \ 'mgl': '*.mgl',
+  \ 'mgp': '*.mgp',
+  \ 'mib': '*.mib,*.my',
+  \ 'mix': '*.mix,*.mixal',
   \ 'mma': '*.mathematica,*.cdf,*.m,*.ma,*.mt,*.nb,*.nbp,*.wl,*.wlt,*.wls,*.mma',
+  \ 'mmp': '*.mmp',
+  \ 'modconf': '',
+  \ 'modula2': '*.m2,*.DEF,*.MOD,*.mi',
+  \ 'modula3': '*.[mi][3g]',
+  \ 'monk': '*.isc,*.monk,*.ssc,*.tsc',
+  \ 'moo': '*.moo',
   \ 'moon': '*.moon',
+  \ 'mp': '*.mp',
+  \ 'mplayerconf': 'mplayer.conf',
+  \ 'mrxvtrc': 'mrxvtrc,.mrxvtrc',
+  \ 'msidl': '*.odl,*.mof',
+  \ 'msql': '*.msql',
+  \ 'mupad': '*.mu',
   \ 'murphi': '*.m',
+  \ 'mush': '*.mush',
+  \ 'muttrc': '.mutt{ng,}rc*,mutt{ng,}rc*,Mutt{ng,}rc*,Mutt{ng,}rc',
+  \ 'mysql': '*.mysql',
+  \ 'n1ql': '*.n1ql,*.nql',
+  \ 'named': 'named*.conf,rndc*.conf,rndc*.key',
+  \ 'nanorc': '*.nanorc',
+  \ 'natural': '*.NS[ACGLMNPS]',
+  \ 'ncf': '*.ncf',
+  \ 'neomuttrc': 'Neomuttrc,.neomuttrc*,neomuttrc*,Neomuttrc*',
+  \ 'netrc': '.netrc',
   \ 'nginx': '*.nginx,*.nginxconf,*.vhost,nginx.conf,nginx*.conf,*nginx.conf',
   \ 'nim': '*.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg',
+  \ 'ninja': '*.ninja',
   \ 'nix': '*.nix',
+  \ 'nqc': '*.nqc',
+  \ 'nroff': '*.tr,*.nr,*.roff,*.tmac,*.mom,tmac.*',
+  \ 'nsis': '*.nsi,*.nsh',
   \ 'oasis': '_oasis',
+  \ 'obj': '*.obj',
   \ 'objc': '*.m,*.h',
   \ 'ocaml': '*.ml,*.eliom,*.eliomi,*.ml4,*.mli,*.mll,*.mly,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo,.ocamlinit',
   \ 'ocamlbuild_tags': '_tags',
+  \ 'occam': '*.occ',
   \ 'ocpbuild': '*.ocp',
   \ 'ocpbuildroot': '*.root',
   \ 'octave': '*.oct,*.m',
   \ 'odin': '*.odin',
   \ 'omake': '*.om,OMakefile,OMakeroot,OMakeroot.in',
+  \ 'omnimark': '*.xom,*.xin',
   \ 'opam': '*.opam,*.opam.template,opam',
   \ 'opencl': '*.cl,*.opencl',
+  \ 'openroad': '*.or',
+  \ 'opl': '*.[Oo][Pp][Ll]',
+  \ 'ora': '*.ora',
+  \ 'pamconf': '',
+  \ 'pamenv': 'pam_env.conf,.pam_environment',
+  \ 'papp': '*.papp,*.pxml,*.pxsl',
+  \ 'pascal': '*.pas,*.dpr',
+  \ 'passwd': '',
+  \ 'pccts': '*.g',
+  \ 'pcmk': '*.pcmk',
+  \ 'pdf': '*.pdf',
   \ 'perl': '*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc,.gitolite.rc',
+  \ 'pf': 'pf.conf',
+  \ 'pfmain': 'main.cf',
   \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,.php,.php_cs,.php_cs.dist,Phakefile',
+  \ 'pike': '*.pike,*.pmod',
+  \ 'pilrc': '*.rcp',
+  \ 'pine': '.pinerc,pinerc,.pinercex,pinercex',
+  \ 'pinfo': '',
   \ 'plantuml': '*.puml,*.iuml,*.plantuml,*.uml,*.pu',
+  \ 'pli': '*.pli,*.pl1',
+  \ 'plm': '*.plm,*.p36,*.pac',
+  \ 'plp': '*.plp',
+  \ 'plsql': '*.pls,*.plsql',
+  \ 'po': '*.po,*.pot',
   \ 'pod': '*.pod',
   \ 'pony': '*.pony',
+  \ 'postscr': '*.ps,*.pfa,*.afm,*.eps,*.epsf,*.epsi,*.ai',
+  \ 'pov': '*.pov',
+  \ 'povini': '.povrayrc',
+  \ 'ppd': '*.ppd',
+  \ 'ppwiz': '*.it,*.ih',
+  \ 'privoxy': '*.action',
+  \ 'proc': '*.pc',
+  \ 'procmail': '.procmail,.procmailrc',
   \ 'prolog': '*.pl,*.pro,*.prolog,*.yap,*.pdb',
+  \ 'promela': '*.pml',
   \ 'proto': '*.proto',
+  \ 'protocols': '',
   \ 'ps1': '*.ps1,*.psd1,*.psm1,*.pssc',
   \ 'ps1xml': '*.ps1xml',
+  \ 'psf': '*.psf',
   \ 'pug': '*.jade,*.pug',
+  \ 'pullrequest': 'PULLREQ_EDITMSG',
   \ 'puppet': '*.pp,Modulefile',
   \ 'purescript': '*.purs',
+  \ 'pyrex': '*.pyx,*.pxd',
   \ 'python': '*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,*.ptl,.gclient,DEPS,SConscript,SConstruct,Snakefile,wscript,.pythonrc,.pythonstartup',
   \ 'qmake': '*.pro,*.pri',
   \ 'qml': '*.qml,*.qbs',
+  \ 'quake': '',
   \ 'r': '*.r,*.rsx,*.s,*.S,.Rprofile,expr-dist',
   \ 'racket': '*.rkt,*.rktd,*.rktl,*.scrbl',
+  \ 'radiance': '*.rad,*.mat',
   \ 'ragel': '*.rl',
   \ 'raku': '*.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl,*.pl6,*.pm,*.pm6,*.t,*.rakudoc,*.rakutest,*.raku,*.rakumod,*.pod6,*.t6',
   \ 'raml': '*.raml',
+  \ 'ratpoison': '.ratpoisonrc,ratpoisonrc',
   \ 'razor': '*.cshtml,*.razor',
+  \ 'rc': '*.rc,*.rch',
+  \ 'rcs': '*\,v',
+  \ 'readline': '.inputrc,inputrc',
   \ 'reason': '*.re,*.rei',
+  \ 'rego': '*.rego',
+  \ 'remind': '*.remind,*.rem,.reminders,.reminders*',
   \ 'requirements': '*.pip,*requirements.{txt,in},*require.{txt,in},constraints.{txt,in}',
+  \ 'resolv': 'resolv.conf',
+  \ 'reva': '*.frt',
+  \ 'rexx': '*.rex,*.orx,*.rxo,*.rxj,*.jrexx,*.rexxj,*.rexx,*.testGroup,*.testUnit',
   \ 'rhelp': '*.rd',
+  \ 'rib': '*.rib',
+  \ 'rmd': '*.rmd,*.smd',
+  \ 'rnc': '*.rnc',
+  \ 'rng': '*.rng',
+  \ 'rnoweb': '*.rnw,*.snw',
+  \ 'robots': 'robots.txt',
+  \ 'rpcgen': '*.x',
+  \ 'rpl': '*.rpl',
+  \ 'rrst': '*.rrst,*.srst',
   \ 'rst': '*.rst,*.rest,*.rest.txt,*.rst.txt',
+  \ 'rtf': '*.rtf',
   \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb',
   \ 'rust': '*.rs,*.rs.in',
+  \ 'samba': 'smb.conf',
+  \ 'sas': '*.sas',
+  \ 'sass': '*.sass',
+  \ 'sather': '*.sa',
   \ 'sbt.scala': '*.sbt',
   \ 'scala': '*.scala,*.kojo,*.sc',
+  \ 'scheme': '*.scm,*.ss,*.rkt',
+  \ 'scilab': '*.sci,*.sce',
+  \ 'screen': '.screenrc,screenrc',
   \ 'scss': '*.scss',
+  \ 'sd': '*.sd',
+  \ 'sdc': '*.sdc',
+  \ 'sdl': '*.sdl,*.pr',
+  \ 'sed': '*.sed',
+  \ 'sensors': '',
+  \ 'services': '',
+  \ 'setserial': '',
   \ 'sexplib': '*.sexp',
   \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc',
+  \ 'sieve': '*.siv,*.sieve',
+  \ 'sil': '*.sil',
+  \ 'simula': '*.sim',
+  \ 'sinda': '*.sin,*.s85',
+  \ 'sisu': '*.sst,*.ssm,*.ssi,*.-sst,*._sst,*.sst.meta,*.-sst.meta,*._sst.meta',
+  \ 'skill': '*.il,*.ils,*.cdf',
+  \ 'slang': '*.sl',
+  \ 'slice': '*.ice',
   \ 'slim': '*.slim',
   \ 'slime': '*.slime',
+  \ 'slpconf': '',
+  \ 'slpreg': '',
+  \ 'slpspi': '',
+  \ 'slrnrc': '.slrnrc',
+  \ 'slrnsc': '*.score',
+  \ 'sm': 'sendmail.cf',
+  \ 'smarty': '*.tpl',
+  \ 'smcl': '*.hlp,*.ihlp,*.smcl',
+  \ 'smith': '*.smt,*.smith',
+  \ 'sml': '*.sml',
   \ 'smt2': '*.smt2,*.smt',
+  \ 'snobol4': '*.sno,*.spt',
   \ 'solidity': '*.sol',
+  \ 'spec': '*.spec',
+  \ 'spice': '*.sp,*.spice',
+  \ 'spup': '*.speedup,*.spdata,*.spd',
+  \ 'spyce': '*.spy,*.spi',
   \ 'sql': '*.pgsql,*.pls,*.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.vw,*.tyb,*.typ,*.tyc',
+  \ 'sqlj': '*.sqlj',
+  \ 'sqr': '*.sqr,*.sqi',
+  \ 'squid': 'squid.conf',
+  \ 'srec': '*.s19,*.s28,*.s37,*.mot,*.srec',
+  \ 'sshconfig': 'ssh_config',
+  \ 'sshdconfig': 'sshd_config',
+  \ 'st': '*.st',
+  \ 'stata': '*.ado,*.do,*.imata,*.mata',
+  \ 'stp': '*.stp',
   \ 'stylus': '*.styl,*.stylus',
+  \ 'sudoers': 'sudoers.tmp',
   \ 'svelte': '*.svelte',
   \ 'svg': '*.svg',
+  \ 'svn': 'svn-commit*.tmp',
   \ 'swift': '*.swift',
+  \ 'swiftgyb': '*.swift.gyb',
   \ 'sxhkdrc': '*.sxhkdrc,sxhkdrc',
+  \ 'sysctl': '',
   \ 'systemd': '*.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*.#*',
+  \ 'systemverilog': '*.sv,*.svh',
   \ 'tablegen': '*.td',
   \ 'tads': '*.t',
+  \ 'tags': 'tags',
+  \ 'tak': '*.tak',
+  \ 'taskdata': '{pending,completed,undo}.data',
+  \ 'taskedit': '*.task',
+  \ 'tcl': '*.tcl,*.tk,*.itcl,*.itk,*.jacl',
+  \ 'template': '*.tmpl',
+  \ 'teraterm': '*.ttl',
+  \ 'terminfo': '*.ti',
   \ 'terraform': '*.tf,*.tfvars',
+  \ 'tex': '*.latex,*.sty,*.dtx,*.ltx,*.bbl',
+  \ 'texinfo': '*.texinfo,*.texi,*.txi',
+  \ 'texmf': 'texmf.cnf',
+  \ 'text': '*.text,README',
   \ 'textile': '*.textile',
+  \ 'tf': '*.tf,.tfrc,tfrc',
   \ 'thrift': '*.thrift',
+  \ 'tidy': '.tidyrc,tidyrc',
+  \ 'tilde': '*.t.html',
+  \ 'tli': '*.tli',
   \ 'tmux': '.tmux*.conf',
   \ 'toml': '*.toml,Cargo.lock,Gopkg.lock,poetry.lock,Pipfile',
+  \ 'tpp': '*.tpp',
   \ 'tptp': '*.p,*.tptp,*.ax',
   \ 'trasys': '*.inp',
+  \ 'treetop': '*.treetop',
+  \ 'trustees': 'trustees.conf',
+  \ 'tsalt': '*.slt',
+  \ 'tsscl': '*.tsscl',
+  \ 'tssgm': '*.tssgm',
+  \ 'tssop': '*.tssop',
   \ 'tt2': '*.tt2',
   \ 'tt2html': '*.tt2',
   \ 'typescript': '*.ts',
   \ 'typescriptreact': '*.tsx',
+  \ 'uc': '*.uc',
+  \ 'udevconf': '',
+  \ 'udevperm': '',
+  \ 'uil': '*.uit,*.uil',
   \ 'unison': '*.u,*.uu',
+  \ 'updatedb': '',
+  \ 'upstart': '',
+  \ 'upstreamdat': '*.upstream.dat\c,upstream.dat\c,upstream.*.dat\c',
+  \ 'upstreaminstalllog': '*.upstreaminstall.log\c,upstreaminstall.log\c,upstreaminstall.*.log\c',
+  \ 'upstreamlog': '*.upstream.log\c,fdrupstream.log,upstream.log\c,upstream.*.log\c,UPSTREAM-*.log\c',
+  \ 'usserverlog': '*.usserver.log\c,usserver.log\c,usserver.*.log\c',
+  \ 'usw2kagtlog': '*.usw2kagt.log\c,usw2kagt.log\c,usw2kagt.*.log\c',
   \ 'vala': '*.vala,*.vapi,*.valadoc',
   \ 'vb': '*.bas,*.cls,*.frm,*.frx,*.vba,*.vbs,*.dsm,*.ctl,*.sba',
   \ 'vbnet': '*.vb,*.vbhtml',
   \ 'vcl': '*.vcl',
   \ 'velocity': '*.vm',
+  \ 'vera': '*.vr,*.vri,*.vrh',
+  \ 'verilog': '*.v',
+  \ 'verilogams': '*.va,*.vams',
+  \ 'vgrindefs': 'vgrindefs',
+  \ 'vhdl': '*.hdl,*.vhd,*.vhdl,*.vbe,*.vst,*.vho,*.vhdl_[0-9]*',
+  \ 'vim': '*.vim,*.vba,.exrc,_exrc,*vimrc*',
+  \ 'viminfo': '.viminfo,_viminfo',
   \ 'vlang': '*.v,*.vv,*.vsh',
   \ 'vmasm': '*.mar',
+  \ 'voscm': '*.cm',
+  \ 'vrml': '*.wrl',
+  \ 'vroom': '*.vroom',
   \ 'vue': '*.vue,*.wpy',
+  \ 'wast': '*.wast,*.wat',
+  \ 'webmacro': '*.wm',
+  \ 'wget': '.wgetrc,wgetrc',
+  \ 'winbatch': '*.wbt',
+  \ 'wml': '*.wml',
+  \ 'wsh': '*.ws[fc]',
+  \ 'wsml': '*.wsml',
+  \ 'wvdial': 'wvdial.conf,.wvdialrc',
   \ 'xdc': '*.xdc',
+  \ 'xdefaults': '*.ad,.Xdefaults,.Xpdefaults,.Xresources,xdm-config,Xresources*',
+  \ 'xhtml': '*.xhtml,*.xht',
+  \ 'xinetd': '',
+  \ 'xmath': '*.msc,*.msf',
   \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
   \ 'xml.twig': '*.xml.twig',
+  \ 'xmodmap': '*Xmodmap,*xmodmap*',
+  \ 'xquery': '*.xq,*.xql,*.xqm,*.xquery,*.xqy',
   \ 'xs': '*.xs',
+  \ 'xsd': '*.xsd',
   \ 'xsl': '*.xslt,*.xsl',
+  \ 'xslt': '*.xsl,*.xslt',
+  \ 'yacc': '*.yy,*.yxx,*.y++',
   \ 'yaml': '*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,.clang-format,.clang-tidy,.gemrc,glide.lock,yarn.lock,fish_history,fish_read_history',
   \ 'yaml.ansible': 'playbook.y{a,}ml,site.y{a,}ml,main.y{a,}ml,local.y{a,}ml,requirements.y{a,}ml,tasks.*.y{a,}ml,roles.*.y{a,}ml,handlers.*.y{a,}ml',
   \ 'yaml.docker-compose': 'docker-compose*.yaml,docker-compose*.yml',
+  \ 'z8a': '*.z8a',
   \ 'zephir': '*.zep',
   \ 'zig': '*.zig,*.zir',
+  \ 'zimbu': '*.zu',
+  \ 'zimbutempl': '*.zut',
   \ 'zir': '*.zir',
   \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks,.zsh*',
   \}
diff --git a/autoload/xml/xsd.vim b/autoload/xml/xsd.vim
new file mode 100644
index 000000000..572581a13
--- /dev/null
+++ b/autoload/xml/xsd.vim
@@ -0,0 +1,134 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
+
+" Author: Thomas Barthel
+" Last change: 2007 May 8
+let g:xmldata_xsd = {
+	\ 'schema': [
+		\ [ 'include', 'import', 'redefine', 'annotation', 'simpleType', 'complexType', 'element', 'attribute', 'attributeGroup', 'group', 'notation', 'annotation'],
+		\ { 'targetNamespace' : [], 'version' : [], 'xmlns' : [], 'finalDefault' : [], 'blockDefault' : [], 'id' : [], 'elementFormDefault' : [], 'attributeFormDefault' : [], 'xml:lang' : [] }],
+	\ 'redefine' : [
+		\ ['annotation', 'simpleType', 'complexType', 'attributeGroup', 'group'],
+		\ {'schemaLocation' : [], 'id' : []} ],
+	\ 'include' : [
+		\ ['annotation'],
+		\ {'namespace' : [], 'id' : []} ],
+	\ 'import' : [
+		\ ['annotation'],
+		\ {'namespace' : [], 'schemaLocation' : [], 'id' : []} ],
+	\ 'complexType' : [
+		\ ['annotation', 'simpleContent', 'complexContent', 'all', 'choice', 'sequence', 'group', 'attribute', 'attributeGroup', 'anyAttribute'],
+		\ {'name' : [], 'id' : [], 'abstract' : [], 'final' : [], 'block' : [], 'mixed' : []} ],
+	\ 'complexContent' : [
+		\ ['annotation', 'restriction', 'extension'],
+		\ {'mixed' : [], 'id' : [] } ],
+	\ 'simpleType' : [
+		\ ['annotation', 'restriction', 'list', 'union'],
+		\ {'name' : [], 'final' : [], 'id' : []} ],
+	\ 'simpleContent' : [
+		\ ['annotation', 'restriction', 'extension'],
+		\ {'id' : []} ],
+	\ 'element' : [
+		\ ['annotation', 'complexType', 'simpleType', 'unique', 'key', 'keyref'],
+		\ {'name' : [], 'id' : [], 'ref' : [], 'type' : [], 'minOccurs' : [], 'maxOccurs' : [], 'nillable' : [], 'substitutionGroup' : [], 'abstract' : [], 'final' : [], 'block' : [], 'default' : [], 'fixed' : [], 'form' : []} ],
+	\ 'attribute' : [
+		\ ['annotation', 'simpleType'],
+		\ {'name' : [], 'id' : [], 'ref' : [], 'type' : [], 'use' : [], 'default' : [], 'fixed' : [], 'form' : []} ],
+	\ 'group' : [
+		\ ['annotation', 'all', 'choice', 'sequence'],
+		\ {'name' : [], 'ref' : [], 'minOccurs' : [], 'maxOccurs' : [], 'id' : []} ],
+	\ 'choice' : [
+		\ ['annotation', 'element', 'group', 'choice', 'sequence', 'any'],
+		\ {'minOccurs' : [], 'maxOccurs' : [], 'id' : []} ],
+	\ 'sequence' : [
+		\ ['annotation', 'element', 'group', 'choice', 'sequence', 'any'],
+		\ {'minOccurs' : [], 'maxOccurs' : [], 'id' : []} ],
+	\ 'all' : [
+		\ ['annotation', 'element'],
+		\ {'minOccurs' : [], 'maxOccurs' : [], 'id' : []} ],
+	\ 'any' : [
+		\ ['annotation'],
+		\ {'namespace' : [], 'processContents' : [], 'minOccurs' : [], 'maxOccurs' : [], 'id' : []} ],
+	\ 'unique' : [
+		\ ['annotation', 'selector', 'field'],
+		\ {'name' : [],  'id' : []} ],
+	\ 'key' : [
+		\ ['annotation', 'selector', 'field'],
+		\ {'name' : [],  'id' : []} ],
+	\ 'keyref' : [
+		\ ['annotation', 'selector', 'field'],
+		\ {'name' : [], 'refer' : [], 'id' : []} ],
+	\ 'selector' : [
+		\ ['annotation'],
+		\ {'xpath' : [],  'id' : []} ],
+	\ 'field' : [
+		\ ['annotation'],
+		\ {'xpath' : [],  'id' : []} ],
+	\ 'restriction' : [
+		\ ['annotation', 'simpleType', 'minExclusive', 'maxExclusive', 'minInclusive', 'maxInclusive', 'totalDigits', 'fractionDigits', 'length', 'minLength', 'maxLength', 'enumeration', 'whiteSpace', 'pattern'],
+		\ {'base' : [], 'id' : []} ],
+	\ 'minExclusive' : [
+		\ ['annotation'],
+		\ {'value' : [], 'id' : [], 'fixed' : []}],
+	\ 'maxExclusive' : [
+		\ ['annotation'],
+		\ {'value' : [], 'id' : [], 'fixed' : []}],
+	\ 'minInclusive' : [
+		\ ['annotation'],
+		\ {'value' : [], 'id' : [], 'fixed' : []}],
+	\ 'maxInclusive' : [
+		\ ['annotation'],
+		\ {'value' : [], 'id' : [], 'fixed' : []}],
+	\ 'totalDigits' : [		
+	    \ ['annotation'],
+		\ {'value' : [], 'id' : [], 'fixed' : []}],
+	\ 'fractionDigits' : [
+		\ ['annotation'],
+		\ {'value' : [], 'id' : [], 'fixed' : []}],
+     \ 'length' : [
+     	\ ['annotation'],
+     	\ {'value' : [], 'id' : [], 'fixed' : []}],
+     \ 'minLength' : [
+     	\ ['annotation'],
+     	\ {'value' : [], 'id' : [], 'fixed' : []}],
+     \ 'maxLength' : [
+     	\ ['annotation'],
+     	\ {'value' : [], 'id' : [], 'fixed' : []}],
+     \ 'enumeration' : [
+     	\ ['annotation'],
+     	\ {'value' : [], 'id' : []}],
+     \ 'whiteSpace' : [
+     	\ ['annotation'],
+     	\ {'value' : [], 'id' : [], 'fixed' : []}],
+     \ 'pattern' : [
+     	\ ['annotation'],
+     	\ {'value' : [], 'id' : []}],
+     \ 'extension' : [
+     	\ ['annotation', 'all', 'choice', 'sequence', 'group', 'attribute', 'attributeGroup', 'anyAttribute'],
+		\ {'base' : [], 'id' : []} ],
+	 \ 'attributeGroup' : [
+	 	\ ['annotation', 'attribute', 'attributeGroup', 'anyAttribute'],
+	 	\ {'name' : [], 'id' : [], 'ref' : []} ],
+	 \ 'anyAttribute' : [
+	 	\ ['annotation'],
+	 	\ {'namespace' : [], 'processContents' : [], 'id' : []} ],
+	 \ 'list' : [
+		\ ['annotation', 'simpleType'],
+		\ {'itemType' : [], 'id' : []} ],
+	 \ 'union' : [
+	 	\ ['annotation', 'simpleType'],
+	 	\ {'id' : [], 'memberTypes' : []} ],
+	 \ 'notation' : [
+	 	\ ['annotation'],
+	 	\ {'name' : [], 'id' : [], 'public' : [], 'system' : []} ],
+	 \ 'annotation' : [
+	 	\ ['appinfo', 'documentation'],
+	 	\ {} ],
+	 \ 'appinfo' : [
+	 	\ [],
+	 	\ {'source' : [], 'id' : []} ],
+	 \ 'documentation' : [
+		\ [],
+		\ {'source' : [], 'id' : [], 'xml' : []} ]
+	\ }
+
+endif
diff --git a/compiler/bdf.vim b/compiler/bdf.vim
new file mode 100644
index 000000000..5bdd94775
--- /dev/null
+++ b/compiler/bdf.vim
@@ -0,0 +1,26 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bdf') == -1
+
+" Vim compiler file
+" Compiler:             BDF to PCF Conversion
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "bdf"
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+setlocal makeprg=bdftopcf\ $*
+
+setlocal errorformat=%ABDF\ %trror\ on\ line\ %l:\ %m,
+      \%-Z%p^,
+      \%Cbdftopcf:\ bdf\ input\\,\ %f\\,\ corrupt,
+      \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/compiler/context.vim b/compiler/context.vim
new file mode 100644
index 000000000..9c05b4146
--- /dev/null
+++ b/compiler/context.vim
@@ -0,0 +1,58 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
+
+" Vim compiler file
+" Compiler:     ConTeXt typesetting engine
+" Maintainer:   Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Last Change:  2016 Oct 21
+
+if exists("current_compiler")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+if exists(":CompilerSet") != 2    " older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+" If makefile exists and we are not asked to ignore it, we use standard make
+" (do not redefine makeprg)
+if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
+      \ (!filereadable('Makefile') && !filereadable('makefile'))
+  let current_compiler = 'context'
+  " The following assumes that the current working directory is set to the
+  " directory of the file to be typeset
+  let &l:makeprg = get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
+        \ . ' --script context --autogenerate --nonstopmode --synctex='
+        \ . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
+        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
+        \ . ' ' . shellescape(expand('%:p:t'))
+else
+  let current_compiler = 'make'
+endif
+
+let b:context_errorformat = ''
+      \ . '%-Popen source%.%#> %f,'
+      \ . '%-Qclose source%.%#> %f,'
+      \ . "%-Popen source%.%#name '%f',"
+      \ . "%-Qclose source%.%#name '%f',"
+      \ . '%Etex %trror%.%#mp error on line %l in file %f:%.%#,'
+      \ . 'tex %trror%.%#error on line %l in file %f: %m,'
+      \ . '%Elua %trror%.%#error on line %l in file %f:,'
+      \ . '%+Emetapost %#> error: %#,'
+      \ . '! error: %#%m,'
+      \ . '%-C %#,'
+      \ . '%C! %m,'
+      \ . '%Z[ctxlua]%m,'
+      \ . '%+C<*> %.%#,'
+      \ . '%-C%.%#,'
+      \ . '%Z...%m,'
+      \ . '%-Zno-error,'
+      \ . '%-G%.%#' " Skip remaining lines
+
+execute 'CompilerSet errorformat=' . escape(b:context_errorformat, ' ')
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/compiler/cs.vim b/compiler/cs.vim
new file mode 100644
index 000000000..4e56feebc
--- /dev/null
+++ b/compiler/cs.vim
@@ -0,0 +1,30 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
+
+" Vim compiler file
+" Compiler:               Microsoft Visual Studio C#
+" Maintainer:             Yichao Zhou (broken.zhou@gmail.com)
+" Previous Maintainer:    Joseph H. Yao (hyao@sina.com)
+" Last Change:            Jul 22, 2019
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "cs"
+let s:keepcpo= &cpo
+set cpo&vim
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet errorformat&
+CompilerSet errorformat+=%f(%l\\,%v):\ %t%*[^:]:\ %m,
+            \%trror%*[^:]:\ %m,
+            \%tarning%*[^:]:\ %m
+
+CompilerSet makeprg=csc\ %:S
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/compiler/dot.vim b/compiler/dot.vim
new file mode 100644
index 000000000..30af567d3
--- /dev/null
+++ b/compiler/dot.vim
@@ -0,0 +1,19 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dot') == -1
+
+" Vim compiler file
+" Compiler:     ATT dot
+" Maintainer:	Marcos Macedo <bar4ka@bol.com.br>
+" Last Change:	2004 May 16
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "dot"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=dot\ -T$*\ \"%:p\"\ -o\ \"%:p:r.$*\"
+
+endif
diff --git a/compiler/sass.vim b/compiler/sass.vim
new file mode 100644
index 000000000..8ce9dc846
--- /dev/null
+++ b/compiler/sass.vim
@@ -0,0 +1,34 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
+
+" Vim compiler file
+" Compiler:	Sass
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Last Change:	2016 Aug 29
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "sass"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=sass
+
+CompilerSet errorformat=
+      \%f:%l:%m\ (Sass::Syntax%trror),
+      \%ESyntax\ %trror:%m,
+      \%C%\\s%\\+on\ line\ %l\ of\ %f,
+      \%Z%.%#,
+      \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:set sw=2 sts=2:
+
+endif
diff --git a/compiler/tcl.vim b/compiler/tcl.vim
new file mode 100644
index 000000000..11792a1ca
--- /dev/null
+++ b/compiler/tcl.vim
@@ -0,0 +1,21 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
+
+" Vim compiler file
+" Compiler:	tcl
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2004 Nov 27
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "tcl"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=tcl
+
+CompilerSet errorformat=%EError:\ %m,%+Z\ %\\{4}(file\ \"%f\"\ line\ %l),%-G%.%#
+
+endif
diff --git a/compiler/tex.vim b/compiler/tex.vim
new file mode 100644
index 000000000..da14b9144
--- /dev/null
+++ b/compiler/tex.vim
@@ -0,0 +1,71 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
+
+" Vim compiler file
+" Compiler:     TeX
+" Maintainer:   Artem Chuprina <ran@ran.pp.ru>
+" Last Change:  2012 Apr 30
+
+if exists("current_compiler")
+	finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+" If makefile exists and we are not asked to ignore it, we use standard make
+" (do not redefine makeprg)
+if exists('b:tex_ignore_makefile') || exists('g:tex_ignore_makefile') ||
+			\(!filereadable('Makefile') && !filereadable('makefile'))
+	" If buffer-local variable 'tex_flavor' exists, it defines TeX flavor,
+	" otherwize the same for global variable with same name, else it will be
+	" LaTeX
+	if exists("b:tex_flavor")
+		let current_compiler = b:tex_flavor
+	elseif exists("g:tex_flavor")
+		let current_compiler = g:tex_flavor
+	else
+		let current_compiler = "latex"
+	endif
+	let &l:makeprg=current_compiler.' -interaction=nonstopmode'
+else
+	let current_compiler = 'make'
+endif
+
+" Value errorformat are taken from vim help, see :help errorformat-LaTeX, with
+" addition from Srinath Avadhanula <srinath@fastmail.fm>
+CompilerSet errorformat=%E!\ LaTeX\ %trror:\ %m,
+	\%E!\ %m,
+	\%+WLaTeX\ %.%#Warning:\ %.%#line\ %l%.%#,
+	\%+W%.%#\ at\ lines\ %l--%*\\d,
+	\%WLaTeX\ %.%#Warning:\ %m,
+	\%Cl.%l\ %m,
+	\%+C\ \ %m.,
+	\%+C%.%#-%.%#,
+	\%+C%.%#[]%.%#,
+	\%+C[]%.%#,
+	\%+C%.%#%[{}\\]%.%#,
+	\%+C<%.%#>%.%#,
+	\%C\ \ %m,
+	\%-GSee\ the\ LaTeX%m,
+	\%-GType\ \ H\ <return>%m,
+	\%-G\ ...%.%#,
+	\%-G%.%#\ (C)\ %.%#,
+	\%-G(see\ the\ transcript%.%#),
+	\%-G\\s%#,
+	\%+O(%*[^()])%r,
+	\%+O%*[^()](%*[^()])%r,
+	\%+P(%f%r,
+	\%+P\ %\\=(%f%r,
+	\%+P%*[^()](%f%r,
+	\%+P[%\\d%[^()]%#(%f%r,
+	\%+Q)%r,
+	\%+Q%*[^()])%r,
+	\%+Q[%\\d%*[^()])%r
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/compiler/tidy.vim b/compiler/tidy.vim
new file mode 100644
index 000000000..f13b36649
--- /dev/null
+++ b/compiler/tidy.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tidy') == -1
+
+" Vim compiler file
+" Compiler:	HTML Tidy
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2016 Apr 21
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "tidy"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ %:S
+
+" foo.html:8:1: Warning: inserting missing 'foobar' element
+" foo.html:9:2: Error: <foobar> is not recognized!
+CompilerSet errorformat=%f:%l:%c:\ %trror:%m,%f:%l:%c:\ %tarning:%m,%-G%.%#
+
+endif
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index de6e5919c..4e1988b43 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -117,6 +117,1561 @@ augroup filetypedetect
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(s:disabled_packages, 'pullrequest')
+  au BufNewFile,BufRead PULLREQ_EDITMSG setf pullrequest
+endif
+
+if !has_key(s:disabled_packages, 'text')
+  au BufNewFile,BufRead *.text,README setf text
+endif
+
+if !has_key(s:disabled_packages, 'svn')
+  au BufNewFile,BufRead svn-commit*.tmp setf svn
+endif
+
+if !has_key(s:disabled_packages, 'logcheck')
+  au BufNewFile,BufRead */etc/logcheck/*.d*/* call s:StarSetf('logcheck')
+endif
+
+if !has_key(s:disabled_packages, 'fvwm')
+  au BufNewFile,BufRead */.fvwm/* call s:StarSetf('fvwm')
+endif
+
+if !has_key(s:disabled_packages, 'crontab')
+  au BufNewFile,BufRead crontab setf crontab
+  au BufNewFile,BufRead crontab.* call s:StarSetf('crontab')
+  au BufNewFile,BufRead */etc/cron.d/* call s:StarSetf('crontab')
+endif
+
+if !has_key(s:disabled_packages, 'bzr')
+  au BufNewFile,BufRead bzr_log.* call s:StarSetf('bzr')
+endif
+
+if !has_key(s:disabled_packages, 'asteriskvm')
+  au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
+endif
+
+if !has_key(s:disabled_packages, 'asterisk')
+  au BufNewFile,BufRead *asterisk/*.conf* call s:StarSetf('asterisk')
+endif
+
+if !has_key(s:disabled_packages, 'apachestyle')
+  au BufNewFile,BufRead proftpd.conf* call s:StarSetf('apachestyle')
+  au BufNewFile,BufRead */etc/proftpd/conf.*/* call s:StarSetf('apachestyle')
+  au BufNewFile,BufRead */etc/proftpd/*.conf* call s:StarSetf('apachestyle')
+endif
+
+if !has_key(s:disabled_packages, 'z8a')
+  au BufNewFile,BufRead *.z8a setf z8a
+endif
+
+if !has_key(s:disabled_packages, 'zimbutempl')
+  au BufNewFile,BufRead *.zut setf zimbutempl
+endif
+
+if !has_key(s:disabled_packages, 'zimbu')
+  au BufNewFile,BufRead *.zu setf zimbu
+endif
+
+if !has_key(s:disabled_packages, 'yacc')
+  au BufNewFile,BufRead *.y++,*.yxx,*.yy setf yacc
+endif
+
+if !has_key(s:disabled_packages, 'xslt')
+  au BufNewFile,BufRead *.xsl,*.xslt setf xslt
+endif
+
+if !has_key(s:disabled_packages, 'xsd')
+  au BufNewFile,BufRead *.xsd setf xsd
+endif
+
+if !has_key(s:disabled_packages, 'xquery')
+  au BufNewFile,BufRead *.xq,*.xql,*.xqm,*.xquery,*.xqy setf xquery
+endif
+
+if !has_key(s:disabled_packages, 'xmodmap')
+  au BufNewFile,BufRead *Xmodmap setf xmodmap
+  au BufNewFile,BufRead *xmodmap* call s:StarSetf('xmodmap')
+endif
+
+if !has_key(s:disabled_packages, 'xmath')
+  au BufNewFile,BufRead *.msc,*.msf setf xmath
+endif
+
+if !has_key(s:disabled_packages, 'xdefaults')
+  au BufNewFile,BufRead *.ad,{.,}Xdefaults,{.,}Xpdefaults,{.,}Xresources,xdm-config setf xdefaults
+  au BufNewFile,BufRead Xresources* call s:StarSetf('xdefaults')
+  au BufNewFile,BufRead */app-defaults/* call s:StarSetf('xdefaults')
+  au BufNewFile,BufRead */Xresources/* call s:StarSetf('xdefaults')
+endif
+
+if !has_key(s:disabled_packages, 'xinetd')
+  au BufNewFile,BufRead */etc/xinetd.conf setf xinetd
+  au BufNewFile,BufRead */etc/xinetd.d/* call s:StarSetf('xinetd')
+endif
+
+if !has_key(s:disabled_packages, 'xhtml')
+  au BufNewFile,BufRead *.xht,*.xhtml setf xhtml
+endif
+
+if !has_key(s:disabled_packages, 'wsh')
+  au BufNewFile,BufRead *.ws[fc] setf wsh
+endif
+
+if !has_key(s:disabled_packages, 'cvs')
+  au BufNewFile,BufRead cvs\d\+ setf cvs
+endif
+
+if !has_key(s:disabled_packages, 'cvsrc')
+  au BufNewFile,BufRead {.,}cvsrc setf cvsrc
+endif
+
+if !has_key(s:disabled_packages, 'wvdial')
+  au BufNewFile,BufRead {.,}wvdialrc,wvdial.conf setf wvdial
+endif
+
+if !has_key(s:disabled_packages, 'wsml')
+  au BufNewFile,BufRead *.wsml setf wsml
+endif
+
+if !has_key(s:disabled_packages, 'winbatch')
+  au BufNewFile,BufRead *.wbt setf winbatch
+endif
+
+if !has_key(s:disabled_packages, 'wml')
+  au BufNewFile,BufRead *.wml setf wml
+endif
+
+if !has_key(s:disabled_packages, 'wget')
+  au BufNewFile,BufRead {.,}wgetrc,wgetrc setf wget
+endif
+
+if !has_key(s:disabled_packages, 'webmacro')
+  au BufNewFile,BufRead *.wm setf webmacro
+endif
+
+if !has_key(s:disabled_packages, 'wast')
+  au BufNewFile,BufRead *.wast,*.wat setf wast
+endif
+
+if !has_key(s:disabled_packages, 'vroom')
+  au BufNewFile,BufRead *.vroom setf vroom
+endif
+
+if !has_key(s:disabled_packages, 'vrml')
+  au BufNewFile,BufRead *.wrl setf vrml
+endif
+
+if !has_key(s:disabled_packages, 'vgrindefs')
+  au BufNewFile,BufRead vgrindefs setf vgrindefs
+endif
+
+if !has_key(s:disabled_packages, 'viminfo')
+  au BufNewFile,BufRead {.,}viminfo,_viminfo setf viminfo
+endif
+
+if !has_key(s:disabled_packages, 'vim')
+  au BufNewFile,BufRead *.vba,*.vim,{.,}exrc,_exrc setf vim
+  au BufNewFile,BufRead *vimrc* call s:StarSetf('vim')
+endif
+
+if !has_key(s:disabled_packages, 'vhdl')
+  au BufNewFile,BufRead *.hdl,*.vbe,*.vhd,*.vhdl,*.vho,*.vst setf vhdl
+  au BufNewFile,BufRead *.vhdl_[0-9]* call s:StarSetf('vhdl')
+endif
+
+if !has_key(s:disabled_packages, 'systemverilog')
+  au BufNewFile,BufRead *.sv,*.svh setf systemverilog
+endif
+
+if !has_key(s:disabled_packages, 'verilogams')
+  au BufNewFile,BufRead *.va,*.vams setf verilogams
+endif
+
+if !has_key(s:disabled_packages, 'verilog')
+  au BufNewFile,BufRead *.v setf verilog
+endif
+
+if !has_key(s:disabled_packages, 'vera')
+  au BufNewFile,BufRead *.vr,*.vrh,*.vri setf vera
+endif
+
+if !has_key(s:disabled_packages, 'upstart')
+  au BufNewFile,BufRead */.config/upstart/*.conf,*/.config/upstart/*.override,*/.init/*.conf,*/.init/*.override,*/etc/init/*.conf,*/etc/init/*.override,*/usr/share/upstart/*.conf,*/usr/share/upstart/*.override setf upstart
+endif
+
+if !has_key(s:disabled_packages, 'updatedb')
+  au BufNewFile,BufRead */etc/updatedb.conf setf updatedb
+endif
+
+if !has_key(s:disabled_packages, 'uc')
+  au BufNewFile,BufRead *.uc setf uc
+endif
+
+if !has_key(s:disabled_packages, 'udevperm')
+  au BufNewFile,BufRead */etc/udev/permissions.d/*.permissions setf udevperm
+endif
+
+if !has_key(s:disabled_packages, 'udevconf')
+  au BufNewFile,BufRead */etc/udev/udev.conf setf udevconf
+endif
+
+if !has_key(s:disabled_packages, 'uil')
+  au BufNewFile,BufRead *.uil,*.uit setf uil
+endif
+
+if !has_key(s:disabled_packages, 'tsscl')
+  au BufNewFile,BufRead *.tsscl setf tsscl
+endif
+
+if !has_key(s:disabled_packages, 'tssop')
+  au BufNewFile,BufRead *.tssop setf tssop
+endif
+
+if !has_key(s:disabled_packages, 'tssgm')
+  au BufNewFile,BufRead *.tssgm setf tssgm
+endif
+
+if !has_key(s:disabled_packages, 'trustees')
+  au BufNewFile,BufRead trustees.conf setf trustees
+endif
+
+if !has_key(s:disabled_packages, 'treetop')
+  au BufNewFile,BufRead *.treetop setf treetop
+endif
+
+if !has_key(s:disabled_packages, 'tpp')
+  au BufNewFile,BufRead *.tpp setf tpp
+endif
+
+if !has_key(s:disabled_packages, 'tidy')
+  au BufNewFile,BufRead {.,}tidyrc,tidyrc setf tidy
+endif
+
+if !has_key(s:disabled_packages, 'texmf')
+  au BufNewFile,BufRead texmf.cnf setf texmf
+endif
+
+if !has_key(s:disabled_packages, 'texinfo')
+  au BufNewFile,BufRead *.texi,*.texinfo,*.txi setf texinfo
+endif
+
+if !has_key(s:disabled_packages, 'context')
+  au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi setf context
+endif
+
+if !has_key(s:disabled_packages, 'tex')
+  au BufNewFile,BufRead *.bbl,*.dtx,*.latex,*.ltx,*.sty setf tex
+endif
+
+if !has_key(s:disabled_packages, 'terminfo')
+  au BufNewFile,BufRead *.ti setf terminfo
+endif
+
+if !has_key(s:disabled_packages, 'teraterm')
+  au BufNewFile,BufRead *.ttl setf teraterm
+endif
+
+if !has_key(s:disabled_packages, 'tsalt')
+  au BufNewFile,BufRead *.slt setf tsalt
+endif
+
+if !has_key(s:disabled_packages, 'tli')
+  au BufNewFile,BufRead *.tli setf tli
+endif
+
+if !has_key(s:disabled_packages, 'tcl')
+  au BufNewFile,BufRead *.itcl,*.itk,*.jacl,*.tcl,*.tk setf tcl
+endif
+
+if !has_key(s:disabled_packages, 'taskedit')
+  au BufNewFile,BufRead *.task setf taskedit
+endif
+
+if !has_key(s:disabled_packages, 'taskdata')
+  au BufNewFile,BufRead {pending,completed,undo}.data setf taskdata
+endif
+
+if !has_key(s:disabled_packages, 'tak')
+  au BufNewFile,BufRead *.tak setf tak
+endif
+
+if !has_key(s:disabled_packages, 'tags')
+  au BufNewFile,BufRead tags setf tags
+endif
+
+if !has_key(s:disabled_packages, 'sudoers')
+  au BufNewFile,BufRead */etc/sudoers,sudoers.tmp setf sudoers
+endif
+
+if !has_key(s:disabled_packages, 'sdc')
+  au BufNewFile,BufRead *.sdc setf sdc
+endif
+
+if !has_key(s:disabled_packages, 'sysctl')
+  au BufNewFile,BufRead */etc/sysctl.conf,*/etc/sysctl.d/*.conf setf sysctl
+endif
+
+if !has_key(s:disabled_packages, 'sil')
+  au BufNewFile,BufRead *.sil setf sil
+endif
+
+if !has_key(s:disabled_packages, 'swiftgyb')
+  au BufNewFile,BufRead *.swift.gyb setf swiftgyb
+endif
+
+if !has_key(s:disabled_packages, 'voscm')
+  au BufNewFile,BufRead *.cm setf voscm
+endif
+
+if !has_key(s:disabled_packages, 'sml')
+  au BufNewFile,BufRead *.sml setf sml
+endif
+
+if !has_key(s:disabled_packages, 'stp')
+  au BufNewFile,BufRead *.stp setf stp
+endif
+
+if !has_key(s:disabled_packages, 'smcl')
+  au BufNewFile,BufRead *.hlp,*.ihlp,*.smcl setf smcl
+endif
+
+if !has_key(s:disabled_packages, 'stata')
+  au BufNewFile,BufRead *.ado,*.do,*.imata,*.mata setf stata
+endif
+
+if !has_key(s:disabled_packages, 'sshdconfig')
+  au BufNewFile,BufRead */etc/ssh/sshd_config.d/*.conf,sshd_config setf sshdconfig
+endif
+
+if !has_key(s:disabled_packages, 'sshconfig')
+  au BufNewFile,BufRead */.ssh/config,*/etc/ssh/ssh_config.d/*.conf,ssh_config setf sshconfig
+endif
+
+if !has_key(s:disabled_packages, 'sqr')
+  au BufNewFile,BufRead *.sqi,*.sqr setf sqr
+endif
+
+if !has_key(s:disabled_packages, 'sqlj')
+  au BufNewFile,BufRead *.sqlj setf sqlj
+endif
+
+if !has_key(s:disabled_packages, 'squid')
+  au BufNewFile,BufRead squid.conf setf squid
+endif
+
+if !has_key(s:disabled_packages, 'spice')
+  au BufNewFile,BufRead *.sp,*.spice setf spice
+endif
+
+if !has_key(s:disabled_packages, 'slice')
+  au BufNewFile,BufRead *.ice setf slice
+endif
+
+if !has_key(s:disabled_packages, 'spup')
+  au BufNewFile,BufRead *.spd,*.spdata,*.speedup setf spup
+endif
+
+if !has_key(s:disabled_packages, 'hog')
+  au BufNewFile,BufRead *.hog,snort.conf,vision.conf setf hog
+endif
+
+if !has_key(s:disabled_packages, 'mib')
+  au BufNewFile,BufRead *.mib,*.my setf mib
+endif
+
+if !has_key(s:disabled_packages, 'snobol4')
+  au BufNewFile,BufRead *.sno,*.spt setf snobol4
+endif
+
+if !has_key(s:disabled_packages, 'smith')
+  au BufNewFile,BufRead *.smith,*.smt setf smith
+endif
+
+if !has_key(s:disabled_packages, 'st')
+  au BufNewFile,BufRead *.st setf st
+endif
+
+if !has_key(s:disabled_packages, 'slrnsc')
+  au BufNewFile,BufRead *.score setf slrnsc
+endif
+
+if !has_key(s:disabled_packages, 'slrnrc')
+  au BufNewFile,BufRead {.,}slrnrc setf slrnrc
+endif
+
+if !has_key(s:disabled_packages, 'skill')
+  au BufNewFile,BufRead *.cdf,*.il,*.ils setf skill
+endif
+
+if !has_key(s:disabled_packages, 'sisu')
+  au BufNewFile,BufRead *.-sst,*.-sst.meta,*._sst,*._sst.meta,*.ssi,*.ssm,*.sst,*.sst.meta setf sisu
+endif
+
+if !has_key(s:disabled_packages, 'sinda')
+  au BufNewFile,BufRead *.s85,*.sin setf sinda
+endif
+
+if !has_key(s:disabled_packages, 'simula')
+  au BufNewFile,BufRead *.sim setf simula
+endif
+
+if !has_key(s:disabled_packages, 'screen')
+  au BufNewFile,BufRead {.,}screenrc,screenrc setf screen
+endif
+
+if !has_key(s:disabled_packages, 'scheme')
+  au BufNewFile,BufRead *.rkt,*.scm,*.ss setf scheme
+endif
+
+if !has_key(s:disabled_packages, 'catalog')
+  au BufNewFile,BufRead catalog setf catalog
+  au BufNewFile,BufRead sgml.catalog* call s:StarSetf('catalog')
+endif
+
+if !has_key(s:disabled_packages, 'setserial')
+  au BufNewFile,BufRead */etc/serial.conf setf setserial
+endif
+
+if !has_key(s:disabled_packages, 'slpspi')
+  au BufNewFile,BufRead */etc/slp.spi setf slpspi
+endif
+
+if !has_key(s:disabled_packages, 'spyce')
+  au BufNewFile,BufRead *.spi,*.spy setf spyce
+endif
+
+if !has_key(s:disabled_packages, 'slpreg')
+  au BufNewFile,BufRead */etc/slp.reg setf slpreg
+endif
+
+if !has_key(s:disabled_packages, 'slpconf')
+  au BufNewFile,BufRead */etc/slp.conf setf slpconf
+endif
+
+if !has_key(s:disabled_packages, 'services')
+  au BufNewFile,BufRead */etc/services setf services
+endif
+
+if !has_key(s:disabled_packages, 'sm')
+  au BufNewFile,BufRead sendmail.cf setf sm
+endif
+
+if !has_key(s:disabled_packages, 'sieve')
+  au BufNewFile,BufRead *.sieve,*.siv setf sieve
+endif
+
+if !has_key(s:disabled_packages, 'sed')
+  au BufNewFile,BufRead *.sed setf sed
+endif
+
+if !has_key(s:disabled_packages, 'sdl')
+  au BufNewFile,BufRead *.pr,*.sdl setf sdl
+endif
+
+if !has_key(s:disabled_packages, 'sd')
+  au BufNewFile,BufRead *.sd setf sd
+endif
+
+if !has_key(s:disabled_packages, 'scilab')
+  au BufNewFile,BufRead *.sce,*.sci setf scilab
+endif
+
+if !has_key(s:disabled_packages, 'sather')
+  au BufNewFile,BufRead *.sa setf sather
+endif
+
+if !has_key(s:disabled_packages, 'sass')
+  au BufNewFile,BufRead *.sass setf sass
+endif
+
+if !has_key(s:disabled_packages, 'sas')
+  au BufNewFile,BufRead *.sas setf sas
+endif
+
+if !has_key(s:disabled_packages, 'samba')
+  au BufNewFile,BufRead smb.conf setf samba
+endif
+
+if !has_key(s:disabled_packages, 'slang')
+  au BufNewFile,BufRead *.sl setf slang
+endif
+
+if !has_key(s:disabled_packages, 'rtf')
+  au BufNewFile,BufRead *.rtf setf rtf
+endif
+
+if !has_key(s:disabled_packages, 'rpcgen')
+  au BufNewFile,BufRead *.x setf rpcgen
+endif
+
+if !has_key(s:disabled_packages, 'robots')
+  au BufNewFile,BufRead robots.txt setf robots
+endif
+
+if !has_key(s:disabled_packages, 'rpl')
+  au BufNewFile,BufRead *.rpl setf rpl
+endif
+
+if !has_key(s:disabled_packages, 'rng')
+  au BufNewFile,BufRead *.rng setf rng
+endif
+
+if !has_key(s:disabled_packages, 'rnc')
+  au BufNewFile,BufRead *.rnc setf rnc
+endif
+
+if !has_key(s:disabled_packages, 'resolv')
+  au BufNewFile,BufRead resolv.conf setf resolv
+endif
+
+if !has_key(s:disabled_packages, 'remind')
+  au BufNewFile,BufRead *.rem,*.remind,{.,}reminders setf remind
+  au BufNewFile,BufRead {.,}reminders* call s:StarSetf('remind')
+endif
+
+if !has_key(s:disabled_packages, 'rrst')
+  au BufNewFile,BufRead *.rrst,*.srst setf rrst
+endif
+
+if !has_key(s:disabled_packages, 'rmd')
+  au BufNewFile,BufRead *.rmd,*.smd setf rmd
+endif
+
+if !has_key(s:disabled_packages, 'rnoweb')
+  au BufNewFile,BufRead *.rnw,*.snw setf rnoweb
+endif
+
+if !has_key(s:disabled_packages, 'rexx')
+  au BufNewFile,BufRead *.jrexx,*.orx,*.rex,*.rexx,*.rexxj,*.rxj,*.rxo,*.testGroup,*.testUnit setf rexx
+endif
+
+if !has_key(s:disabled_packages, 'rego')
+  au BufNewFile,BufRead *.rego setf rego
+endif
+
+if !has_key(s:disabled_packages, 'rib')
+  au BufNewFile,BufRead *.rib setf rib
+endif
+
+if !has_key(s:disabled_packages, 'readline')
+  au BufNewFile,BufRead {.,}inputrc,inputrc setf readline
+endif
+
+if !has_key(s:disabled_packages, 'rcs')
+  au BufNewFile,BufRead *\,v setf rcs
+endif
+
+if !has_key(s:disabled_packages, 'ratpoison')
+  au BufNewFile,BufRead {.,}ratpoisonrc,ratpoisonrc setf ratpoison
+endif
+
+if !has_key(s:disabled_packages, 'radiance')
+  au BufNewFile,BufRead *.mat,*.rad setf radiance
+endif
+
+if !has_key(s:disabled_packages, 'pyrex')
+  au BufNewFile,BufRead *.pxd,*.pyx setf pyrex
+endif
+
+if !has_key(s:disabled_packages, 'protocols')
+  au BufNewFile,BufRead */etc/protocols setf protocols
+endif
+
+if !has_key(s:disabled_packages, 'promela')
+  au BufNewFile,BufRead *.pml setf promela
+endif
+
+if !has_key(s:disabled_packages, 'psf')
+  au BufNewFile,BufRead *.psf setf psf
+endif
+
+if !has_key(s:disabled_packages, 'procmail')
+  au BufNewFile,BufRead {.,}procmail,{.,}procmailrc setf procmail
+endif
+
+if !has_key(s:disabled_packages, 'privoxy')
+  au BufNewFile,BufRead *.action setf privoxy
+endif
+
+if !has_key(s:disabled_packages, 'proc')
+  au BufNewFile,BufRead *.pc setf proc
+endif
+
+if !has_key(s:disabled_packages, 'obj')
+  au BufNewFile,BufRead *.obj setf obj
+endif
+
+if !has_key(s:disabled_packages, 'ppwiz')
+  au BufNewFile,BufRead *.ih,*.it setf ppwiz
+endif
+
+if !has_key(s:disabled_packages, 'pccts')
+  au BufNewFile,BufRead *.g setf pccts
+endif
+
+if !has_key(s:disabled_packages, 'povini')
+  au BufNewFile,BufRead {.,}povrayrc setf povini
+endif
+
+if !has_key(s:disabled_packages, 'pov')
+  au BufNewFile,BufRead *.pov setf pov
+endif
+
+if !has_key(s:disabled_packages, 'ppd')
+  au BufNewFile,BufRead *.ppd setf ppd
+endif
+
+if !has_key(s:disabled_packages, 'postscr')
+  au BufNewFile,BufRead *.afm,*.ai,*.eps,*.epsf,*.epsi,*.pfa,*.ps setf postscr
+endif
+
+if !has_key(s:disabled_packages, 'pfmain')
+  au BufNewFile,BufRead main.cf setf pfmain
+endif
+
+if !has_key(s:disabled_packages, 'po')
+  au BufNewFile,BufRead *.po,*.pot setf po
+endif
+
+if !has_key(s:disabled_packages, 'plp')
+  au BufNewFile,BufRead *.plp setf plp
+endif
+
+if !has_key(s:disabled_packages, 'plsql')
+  au BufNewFile,BufRead *.pls,*.plsql setf plsql
+endif
+
+if !has_key(s:disabled_packages, 'plm')
+  au BufNewFile,BufRead *.p36,*.pac,*.plm setf plm
+endif
+
+if !has_key(s:disabled_packages, 'pli')
+  au BufNewFile,BufRead *.pl1,*.pli setf pli
+endif
+
+if !has_key(s:disabled_packages, 'pine')
+  au BufNewFile,BufRead {.,}pinerc,{.,}pinercex,pinerc,pinercex setf pine
+endif
+
+if !has_key(s:disabled_packages, 'pilrc')
+  au BufNewFile,BufRead *.rcp setf pilrc
+endif
+
+if !has_key(s:disabled_packages, 'pinfo')
+  au BufNewFile,BufRead */.pinforc,*/etc/pinforc setf pinfo
+endif
+
+if !has_key(s:disabled_packages, 'cmod')
+  au BufNewFile,BufRead *.cmod setf cmod
+endif
+
+if !has_key(s:disabled_packages, 'pike')
+  au BufNewFile,BufRead *.pike,*.pmod setf pike
+endif
+
+if !has_key(s:disabled_packages, 'pcmk')
+  au BufNewFile,BufRead *.pcmk setf pcmk
+endif
+
+if !has_key(s:disabled_packages, 'pdf')
+  au BufNewFile,BufRead *.pdf setf pdf
+endif
+
+if !has_key(s:disabled_packages, 'pascal')
+  au BufNewFile,BufRead *.dpr,*.pas setf pascal
+endif
+
+if !has_key(s:disabled_packages, 'passwd')
+  au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
+endif
+
+if !has_key(s:disabled_packages, 'papp')
+  au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp
+endif
+
+if !has_key(s:disabled_packages, 'pamenv')
+  au BufNewFile,BufRead {.,}pam_environment,pam_env.conf setf pamenv
+endif
+
+if !has_key(s:disabled_packages, 'pamconf')
+  au BufNewFile,BufRead */etc/pam.conf setf pamconf
+  au BufNewFile,BufRead */etc/pam.d/* call s:StarSetf('pamconf')
+endif
+
+if !has_key(s:disabled_packages, 'pf')
+  au BufNewFile,BufRead pf.conf setf pf
+endif
+
+if !has_key(s:disabled_packages, 'ora')
+  au BufNewFile,BufRead *.ora setf ora
+endif
+
+if !has_key(s:disabled_packages, 'opl')
+  au BufNewFile,BufRead *.[Oo][Pp][Ll] setf opl
+endif
+
+if !has_key(s:disabled_packages, 'openroad')
+  au BufNewFile,BufRead *.or setf openroad
+endif
+
+if !has_key(s:disabled_packages, 'omnimark')
+  au BufNewFile,BufRead *.xin,*.xom setf omnimark
+endif
+
+if !has_key(s:disabled_packages, 'occam')
+  au BufNewFile,BufRead *.occ setf occam
+endif
+
+if !has_key(s:disabled_packages, 'nsis')
+  au BufNewFile,BufRead *.nsh,*.nsi setf nsis
+endif
+
+if !has_key(s:disabled_packages, 'nqc')
+  au BufNewFile,BufRead *.nqc setf nqc
+endif
+
+if !has_key(s:disabled_packages, 'nroff')
+  au BufNewFile,BufRead *.mom,*.nr,*.roff,*.tmac,*.tr setf nroff
+  au BufNewFile,BufRead tmac.* call s:StarSetf('nroff')
+endif
+
+if !has_key(s:disabled_packages, 'ncf')
+  au BufNewFile,BufRead *.ncf setf ncf
+endif
+
+if !has_key(s:disabled_packages, 'ninja')
+  au BufNewFile,BufRead *.ninja setf ninja
+endif
+
+if !has_key(s:disabled_packages, 'netrc')
+  au BufNewFile,BufRead {.,}netrc setf netrc
+endif
+
+if !has_key(s:disabled_packages, 'neomuttrc')
+  au BufNewFile,BufRead Neomuttrc setf neomuttrc
+  au BufNewFile,BufRead neomuttrc* call s:StarSetf('neomuttrc')
+  au BufNewFile,BufRead Neomuttrc* call s:StarSetf('neomuttrc')
+  au BufNewFile,BufRead {.,}neomuttrc* call s:StarSetf('neomuttrc')
+  au BufNewFile,BufRead */.neomutt/neomuttrc* call s:StarSetf('neomuttrc')
+endif
+
+if !has_key(s:disabled_packages, 'natural')
+  au BufNewFile,BufRead *.NS[ACGLMNPS] setf natural
+endif
+
+if !has_key(s:disabled_packages, 'nanorc')
+  au BufNewFile,BufRead *.nanorc,*/etc/nanorc setf nanorc
+endif
+
+if !has_key(s:disabled_packages, 'n1ql')
+  au BufNewFile,BufRead *.n1ql,*.nql setf n1ql
+endif
+
+if !has_key(s:disabled_packages, 'mush')
+  au BufNewFile,BufRead *.mush setf mush
+endif
+
+if !has_key(s:disabled_packages, 'mupad')
+  au BufNewFile,BufRead *.mu setf mupad
+endif
+
+if !has_key(s:disabled_packages, 'muttrc')
+  au BufNewFile,BufRead Mutt{ng,}rc setf muttrc
+  au BufNewFile,BufRead mutt{ng,}rc* call s:StarSetf('muttrc')
+  au BufNewFile,BufRead Mutt{ng,}rc* call s:StarSetf('muttrc')
+  au BufNewFile,BufRead {.,}mutt{ng,}rc* call s:StarSetf('muttrc')
+  au BufNewFile,BufRead */etc/Muttrc.d/* call s:StarSetf('muttrc')
+  au BufNewFile,BufRead */.mutt{ng,}/mutt{ng,}rc* call s:StarSetf('muttrc')
+endif
+
+if !has_key(s:disabled_packages, 'mysql')
+  au BufNewFile,BufRead *.mysql setf mysql
+endif
+
+if !has_key(s:disabled_packages, 'msql')
+  au BufNewFile,BufRead *.msql setf msql
+endif
+
+if !has_key(s:disabled_packages, 'mrxvtrc')
+  au BufNewFile,BufRead {.,}mrxvtrc,mrxvtrc setf mrxvtrc
+endif
+
+if !has_key(s:disabled_packages, 'srec')
+  au BufNewFile,BufRead *.mot,*.s19,*.s28,*.s37,*.srec setf srec
+endif
+
+if !has_key(s:disabled_packages, 'mplayerconf')
+  au BufNewFile,BufRead */.mplayer/config,mplayer.conf setf mplayerconf
+endif
+
+if !has_key(s:disabled_packages, 'modconf')
+  au BufNewFile,BufRead */etc/conf.modules,*/etc/modules,*/etc/modules.conf setf modconf
+  au BufNewFile,BufRead */etc/modprobe.* call s:StarSetf('modconf')
+endif
+
+if !has_key(s:disabled_packages, 'moo')
+  au BufNewFile,BufRead *.moo setf moo
+endif
+
+if !has_key(s:disabled_packages, 'monk')
+  au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc setf monk
+endif
+
+if !has_key(s:disabled_packages, 'modula3')
+  au BufNewFile,BufRead *.[mi][3g] setf modula3
+endif
+
+if !has_key(s:disabled_packages, 'modula2')
+  au BufNewFile,BufRead *.DEF,*.MOD,*.m2,*.mi setf modula2
+endif
+
+if !has_key(s:disabled_packages, 'mmp')
+  au BufNewFile,BufRead *.mmp setf mmp
+endif
+
+if !has_key(s:disabled_packages, 'mix')
+  au BufNewFile,BufRead *.mix,*.mixal setf mix
+endif
+
+if !has_key(s:disabled_packages, 'mgl')
+  au BufNewFile,BufRead *.mgl setf mgl
+endif
+
+if !has_key(s:disabled_packages, 'mp')
+  au BufNewFile,BufRead *.mp setf mp
+endif
+
+if !has_key(s:disabled_packages, 'mf')
+  au BufNewFile,BufRead *.mf setf mf
+endif
+
+if !has_key(s:disabled_packages, 'messages')
+  au BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.[0-9]*,-[0-9]*} setf messages
+endif
+
+if !has_key(s:disabled_packages, 'hgcommit')
+  au BufNewFile,BufRead hg-editor-*.txt setf hgcommit
+endif
+
+if !has_key(s:disabled_packages, 'mel')
+  au BufNewFile,BufRead *.mel setf mel
+endif
+
+if !has_key(s:disabled_packages, 'map')
+  au BufNewFile,BufRead *.map setf map
+endif
+
+if !has_key(s:disabled_packages, 'maple')
+  au BufNewFile,BufRead *.mpl,*.mv,*.mws setf maple
+endif
+
+if !has_key(s:disabled_packages, 'manconf')
+  au BufNewFile,BufRead */etc/man.conf,man.config setf manconf
+endif
+
+if !has_key(s:disabled_packages, 'man')
+  au BufNewFile,BufRead *.man setf man
+endif
+
+if !has_key(s:disabled_packages, 'mallard')
+  au BufNewFile,BufRead *.page setf mallard
+endif
+
+if !has_key(s:disabled_packages, 'ist')
+  au BufNewFile,BufRead *.ist,*.mst setf ist
+endif
+
+if !has_key(s:disabled_packages, 'mailcap')
+  au BufNewFile,BufRead {.,}mailcap,mailcap setf mailcap
+endif
+
+if !has_key(s:disabled_packages, 'mailaliases')
+  au BufNewFile,BufRead */etc/aliases,*/etc/mail/aliases setf mailaliases
+endif
+
+if !has_key(s:disabled_packages, 'mail')
+  au BufNewFile,BufRead *.eml,{.,}article,{.,}article.\d\+,{.,}followup,{.,}letter,{.,}letter.\d\+,/tmp/SLRN[0-9A-Z.]\+,ae\d\+.txt,mutt[[:alnum:]_-]\\\{6\},mutt{ng,}-*-\w\+,neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},pico.\d\+,snd.\d\+,{neo,}mutt[[:alnum:]._-]\\\{6\} setf mail
+  au BufNewFile,BufRead reportbug-* call s:StarSetf('mail')
+endif
+
+if !has_key(s:disabled_packages, 'mgp')
+  au BufNewFile,BufRead *.mgp setf mgp
+endif
+
+if !has_key(s:disabled_packages, 'lss')
+  au BufNewFile,BufRead *.lss setf lss
+endif
+
+if !has_key(s:disabled_packages, 'lsl')
+  au BufNewFile,BufRead *.lsl setf lsl
+endif
+
+if !has_key(s:disabled_packages, 'lout')
+  au BufNewFile,BufRead *.lou,*.lout setf lout
+endif
+
+if !has_key(s:disabled_packages, 'lotos')
+  au BufNewFile,BufRead *.lot,*.lotos setf lotos
+endif
+
+if !has_key(s:disabled_packages, 'logtalk')
+  au BufNewFile,BufRead *.lgt setf logtalk
+endif
+
+if !has_key(s:disabled_packages, 'logindefs')
+  au BufNewFile,BufRead */etc/login.defs setf logindefs
+endif
+
+if !has_key(s:disabled_packages, 'loginaccess')
+  au BufNewFile,BufRead */etc/login.access setf loginaccess
+endif
+
+if !has_key(s:disabled_packages, 'litestep')
+  au BufNewFile,BufRead */LiteStep/*/*.rc setf litestep
+endif
+
+if !has_key(s:disabled_packages, 'lite')
+  au BufNewFile,BufRead *.lite,*.lt setf lite
+endif
+
+if !has_key(s:disabled_packages, 'liquid')
+  au BufNewFile,BufRead *.liquid setf liquid
+endif
+
+if !has_key(s:disabled_packages, 'lisp')
+  au BufNewFile,BufRead *.cl,*.el,*.lisp,*.lsp,{.,}emacs,{.,}sawfishrc,{.,}sbclrc,sbclrc setf lisp
+endif
+
+if !has_key(s:disabled_packages, 'lilo')
+  au BufNewFile,BufRead lilo.conf setf lilo
+  au BufNewFile,BufRead lilo.conf* call s:StarSetf('lilo')
+endif
+
+if !has_key(s:disabled_packages, 'lifelines')
+  au BufNewFile,BufRead *.ll setf lifelines
+endif
+
+if !has_key(s:disabled_packages, 'lftp')
+  au BufNewFile,BufRead *lftp/rc,{.,}lftprc,lftp.conf setf lftp
+endif
+
+if !has_key(s:disabled_packages, 'sensors')
+  au BufNewFile,BufRead */etc/sensors.conf,*/etc/sensors3.conf setf sensors
+endif
+
+if !has_key(s:disabled_packages, 'libao')
+  au BufNewFile,BufRead */.libao,*/etc/libao.conf setf libao
+endif
+
+if !has_key(s:disabled_packages, 'lex')
+  au BufNewFile,BufRead *.l,*.l++,*.lex,*.lxx setf lex
+endif
+
+if !has_key(s:disabled_packages, 'ld')
+  au BufNewFile,BufRead *.ld setf ld
+endif
+
+if !has_key(s:disabled_packages, 'ldif')
+  au BufNewFile,BufRead *.ldif setf ldif
+endif
+
+if !has_key(s:disabled_packages, 'lprolog')
+  au BufNewFile,BufRead *.sig setf lprolog
+endif
+
+if !has_key(s:disabled_packages, 'limits')
+  au BufNewFile,BufRead */etc/*limits.conf,*/etc/*limits.d/*.conf,*/etc/limits setf limits
+endif
+
+if !has_key(s:disabled_packages, 'latte')
+  au BufNewFile,BufRead *.latte,*.lte setf latte
+endif
+
+if !has_key(s:disabled_packages, 'lace')
+  au BufNewFile,BufRead *.ACE,*.ace setf lace
+endif
+
+if !has_key(s:disabled_packages, 'kconfig')
+  au BufNewFile,BufRead Kconfig,Kconfig.debug setf kconfig
+  au BufNewFile,BufRead Kconfig.* call s:StarSetf('kconfig')
+endif
+
+if !has_key(s:disabled_packages, 'kscript')
+  au BufNewFile,BufRead *.ks setf kscript
+endif
+
+if !has_key(s:disabled_packages, 'kivy')
+  au BufNewFile,BufRead *.kv setf kivy
+endif
+
+if !has_key(s:disabled_packages, 'kwt')
+  au BufNewFile,BufRead *.k setf kwt
+endif
+
+if !has_key(s:disabled_packages, 'kix')
+  au BufNewFile,BufRead *.kix setf kix
+endif
+
+if !has_key(s:disabled_packages, 'jovial')
+  au BufNewFile,BufRead *.j73,*.jov,*.jovial setf jovial
+endif
+
+if !has_key(s:disabled_packages, 'jgraph')
+  au BufNewFile,BufRead *.jgr setf jgraph
+endif
+
+if !has_key(s:disabled_packages, 'jess')
+  au BufNewFile,BufRead *.clp setf jess
+endif
+
+if !has_key(s:disabled_packages, 'jproperties')
+  au BufNewFile,BufRead *.properties,*.properties_??,*.properties_??_?? setf jproperties
+  au BufNewFile,BufRead *.properties_??_??_* call s:StarSetf('jproperties')
+endif
+
+if !has_key(s:disabled_packages, 'jsp')
+  au BufNewFile,BufRead *.jsp setf jsp
+endif
+
+if !has_key(s:disabled_packages, 'javacc')
+  au BufNewFile,BufRead *.jj,*.jjt setf javacc
+endif
+
+if !has_key(s:disabled_packages, 'java')
+  au BufNewFile,BufRead *.jav,*.java setf java
+endif
+
+if !has_key(s:disabled_packages, 'jam')
+  au BufNewFile,BufRead *.jpl,*.jpr setf jam
+  au BufNewFile,BufRead Prl*.* call s:StarSetf('jam')
+  au BufNewFile,BufRead JAM*.* call s:StarSetf('jam')
+endif
+
+if !has_key(s:disabled_packages, 'jal')
+  au BufNewFile,BufRead *.JAL,*.jal setf jal
+endif
+
+if !has_key(s:disabled_packages, 'j')
+  au BufNewFile,BufRead *.ijs setf j
+endif
+
+if !has_key(s:disabled_packages, 'iss')
+  au BufNewFile,BufRead *.iss setf iss
+endif
+
+if !has_key(s:disabled_packages, 'inittab')
+  au BufNewFile,BufRead inittab setf inittab
+endif
+
+if !has_key(s:disabled_packages, 'fgl')
+  au BufNewFile,BufRead *.4gh,*.4gl,*.m4gl setf fgl
+endif
+
+if !has_key(s:disabled_packages, 'ipfilter')
+  au BufNewFile,BufRead ipf.conf,ipf.rules,ipf6.conf setf ipfilter
+endif
+
+if !has_key(s:disabled_packages, 'usw2kagtlog')
+  au BufNewFile,BufRead *.usw2kagt.log\c,usw2kagt.*.log\c,usw2kagt.log\c setf usw2kagtlog
+endif
+
+if !has_key(s:disabled_packages, 'usserverlog')
+  au BufNewFile,BufRead *.usserver.log\c,usserver.*.log\c,usserver.log\c setf usserverlog
+endif
+
+if !has_key(s:disabled_packages, 'upstreaminstalllog')
+  au BufNewFile,BufRead *.upstreaminstall.log\c,upstreaminstall.*.log\c,upstreaminstall.log\c setf upstreaminstalllog
+endif
+
+if !has_key(s:disabled_packages, 'upstreamlog')
+  au BufNewFile,BufRead *.upstream.log\c,UPSTREAM-*.log\c,fdrupstream.log,upstream.*.log\c,upstream.log\c setf upstreamlog
+endif
+
+if !has_key(s:disabled_packages, 'upstreamdat')
+  au BufNewFile,BufRead *.upstream.dat\c,upstream.*.dat\c,upstream.dat\c setf upstreamdat
+endif
+
+if !has_key(s:disabled_packages, 'initng')
+  au BufNewFile,BufRead *.ii,*/etc/initng/*/*.i setf initng
+endif
+
+if !has_key(s:disabled_packages, 'inform')
+  au BufNewFile,BufRead *.INF,*.inf setf inform
+endif
+
+if !has_key(s:disabled_packages, 'indent')
+  au BufNewFile,BufRead {.,}indent.pro,indentrc setf indent
+endif
+
+if !has_key(s:disabled_packages, 'icemenu')
+  au BufNewFile,BufRead */.icewm/menu setf icemenu
+endif
+
+if !has_key(s:disabled_packages, 'msidl')
+  au BufNewFile,BufRead *.mof,*.odl setf msidl
+endif
+
+if !has_key(s:disabled_packages, 'icon')
+  au BufNewFile,BufRead *.icn setf icon
+endif
+
+if !has_key(s:disabled_packages, 'httest')
+  au BufNewFile,BufRead *.htb,*.htt setf httest
+endif
+
+if !has_key(s:disabled_packages, 'hb')
+  au BufNewFile,BufRead *.hb setf hb
+endif
+
+if !has_key(s:disabled_packages, 'hostsaccess')
+  au BufNewFile,BufRead */etc/hosts.allow,*/etc/hosts.deny setf hostsaccess
+endif
+
+if !has_key(s:disabled_packages, 'hostconf')
+  au BufNewFile,BufRead */etc/host.conf setf hostconf
+endif
+
+if !has_key(s:disabled_packages, 'template')
+  au BufNewFile,BufRead *.tmpl setf template
+endif
+
+if !has_key(s:disabled_packages, 'htmlm4')
+  au BufNewFile,BufRead *.html.m4 setf htmlm4
+endif
+
+if !has_key(s:disabled_packages, 'tilde')
+  au BufNewFile,BufRead *.t.html setf tilde
+endif
+
+if !has_key(s:disabled_packages, 'hollywood')
+  au BufNewFile,BufRead *.hws setf hollywood
+endif
+
+if !has_key(s:disabled_packages, 'hex')
+  au BufNewFile,BufRead *.h32,*.hex setf hex
+endif
+
+if !has_key(s:disabled_packages, 'hercules')
+  au BufNewFile,BufRead *.errsum,*.ev,*.sum,*.vc setf hercules
+endif
+
+if !has_key(s:disabled_packages, 'hastepreproc')
+  au BufNewFile,BufRead *.htpp setf hastepreproc
+endif
+
+if !has_key(s:disabled_packages, 'haste')
+  au BufNewFile,BufRead *.ht setf haste
+endif
+
+if !has_key(s:disabled_packages, 'chaskell')
+  au BufNewFile,BufRead *.chs setf chaskell
+endif
+
+if !has_key(s:disabled_packages, 'lhaskell')
+  au BufNewFile,BufRead *.lhs setf lhaskell
+endif
+
+if !has_key(s:disabled_packages, 'gtkrc')
+  au BufNewFile,BufRead {.,}gtkrc,gtkrc setf gtkrc
+  au BufNewFile,BufRead gtkrc* call s:StarSetf('gtkrc')
+  au BufNewFile,BufRead {.,}gtkrc* call s:StarSetf('gtkrc')
+endif
+
+if !has_key(s:disabled_packages, 'group')
+  au BufNewFile,BufRead */etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/etc/gshadow-,*/etc/gshadow.edit,*/var/backups/group.bak,*/var/backups/gshadow.bak setf group
+endif
+
+if !has_key(s:disabled_packages, 'gsp')
+  au BufNewFile,BufRead *.gsp setf gsp
+endif
+
+if !has_key(s:disabled_packages, 'gretl')
+  au BufNewFile,BufRead *.gretl setf gretl
+endif
+
+if !has_key(s:disabled_packages, 'grads')
+  au BufNewFile,BufRead *.gs setf grads
+endif
+
+if !has_key(s:disabled_packages, 'gitolite')
+  au BufNewFile,BufRead gitolite.conf setf gitolite
+  au BufNewFile,BufRead */gitolite-admin/conf/* call s:StarSetf('gitolite')
+endif
+
+if !has_key(s:disabled_packages, 'gnash')
+  au BufNewFile,BufRead {.,}gnashpluginrc,{.,}gnashrc,gnashpluginrc,gnashrc setf gnash
+endif
+
+if !has_key(s:disabled_packages, 'gpg')
+  au BufNewFile,BufRead */.gnupg/gpg.conf,*/.gnupg/options,*/usr/*/gnupg/options.skel setf gpg
+endif
+
+if !has_key(s:disabled_packages, 'gp')
+  au BufNewFile,BufRead *.gp,{.,}gprc setf gp
+endif
+
+if !has_key(s:disabled_packages, 'gkrellmrc')
+  au BufNewFile,BufRead gkrellmrc,gkrellmrc_? setf gkrellmrc
+endif
+
+if !has_key(s:disabled_packages, 'gedcom')
+  au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
+  au BufNewFile,BufRead */tmp/lltmp* call s:StarSetf('gedcom')
+endif
+
+if !has_key(s:disabled_packages, 'gdmo')
+  au BufNewFile,BufRead *.gdmo,*.mo setf gdmo
+endif
+
+if !has_key(s:disabled_packages, 'gdb')
+  au BufNewFile,BufRead {.,}gdbinit setf gdb
+endif
+
+if !has_key(s:disabled_packages, 'fstab')
+  au BufNewFile,BufRead fstab,mtab setf fstab
+endif
+
+if !has_key(s:disabled_packages, 'framescript')
+  au BufNewFile,BufRead *.fsl setf framescript
+endif
+
+if !has_key(s:disabled_packages, 'fortran')
+  au BufNewFile,BufRead *.f,*.f03,*.f08,*.f77,*.f90,*.f95,*.for,*.fortran,*.fpp,*.ftn setf fortran
+endif
+
+if !has_key(s:disabled_packages, 'reva')
+  au BufNewFile,BufRead *.frt setf reva
+endif
+
+if !has_key(s:disabled_packages, 'focexec')
+  au BufNewFile,BufRead *.fex,*.focexec setf focexec
+endif
+
+if !has_key(s:disabled_packages, 'fetchmail')
+  au BufNewFile,BufRead {.,}fetchmailrc setf fetchmail
+endif
+
+if !has_key(s:disabled_packages, 'factor')
+  au BufNewFile,BufRead *.factor setf factor
+endif
+
+if !has_key(s:disabled_packages, 'fan')
+  au BufNewFile,BufRead *.fan,*.fwt setf fan
+endif
+
+if !has_key(s:disabled_packages, 'falcon')
+  au BufNewFile,BufRead *.fal setf falcon
+endif
+
+if !has_key(s:disabled_packages, 'exports')
+  au BufNewFile,BufRead exports setf exports
+endif
+
+if !has_key(s:disabled_packages, 'expect')
+  au BufNewFile,BufRead *.exp setf expect
+endif
+
+if !has_key(s:disabled_packages, 'exim')
+  au BufNewFile,BufRead exim.conf setf exim
+endif
+
+if !has_key(s:disabled_packages, 'csc')
+  au BufNewFile,BufRead *.csc setf csc
+endif
+
+if !has_key(s:disabled_packages, 'esterel')
+  au BufNewFile,BufRead *.strl setf esterel
+endif
+
+if !has_key(s:disabled_packages, 'esqlc')
+  au BufNewFile,BufRead *.EC,*.ec setf esqlc
+endif
+
+if !has_key(s:disabled_packages, 'esmtprc')
+  au BufNewFile,BufRead *esmtprc setf esmtprc
+endif
+
+if !has_key(s:disabled_packages, 'elmfilt')
+  au BufNewFile,BufRead filter-rules setf elmfilt
+endif
+
+if !has_key(s:disabled_packages, 'elinks')
+  au BufNewFile,BufRead elinks.conf setf elinks
+endif
+
+if !has_key(s:disabled_packages, 'ecd')
+  au BufNewFile,BufRead *.ecd setf ecd
+endif
+
+if !has_key(s:disabled_packages, 'edif')
+  au BufNewFile,BufRead *.ed\(f\|if\|o\) setf edif
+endif
+
+if !has_key(s:disabled_packages, 'dts')
+  au BufNewFile,BufRead *.dts,*.dtsi setf dts
+endif
+
+if !has_key(s:disabled_packages, 'dtd')
+  au BufNewFile,BufRead *.dtd setf dtd
+endif
+
+if !has_key(s:disabled_packages, 'dsl')
+  au BufNewFile,BufRead *.dsl setf dsl
+endif
+
+if !has_key(s:disabled_packages, 'datascript')
+  au BufNewFile,BufRead *.ds setf datascript
+endif
+
+if !has_key(s:disabled_packages, 'dracula')
+  au BufNewFile,BufRead *.drac,*.drc,*lpe,*lvs setf dracula
+  au BufNewFile,BufRead drac.* call s:StarSetf('dracula')
+endif
+
+if !has_key(s:disabled_packages, 'def')
+  au BufNewFile,BufRead *.def setf def
+endif
+
+if !has_key(s:disabled_packages, 'dylan')
+  au BufNewFile,BufRead *.dylan setf dylan
+endif
+
+if !has_key(s:disabled_packages, 'dylanintr')
+  au BufNewFile,BufRead *.intr setf dylanintr
+endif
+
+if !has_key(s:disabled_packages, 'dylanlid')
+  au BufNewFile,BufRead *.lid setf dylanlid
+endif
+
+if !has_key(s:disabled_packages, 'dot')
+  au BufNewFile,BufRead *.dot,*.gv setf dot
+endif
+
+if !has_key(s:disabled_packages, 'dircolors')
+  au BufNewFile,BufRead */etc/DIR_COLORS,{.,}dir_colors,{.,}dircolors setf dircolors
+endif
+
+if !has_key(s:disabled_packages, 'diff')
+  au BufNewFile,BufRead *.diff,*.rej setf diff
+endif
+
+if !has_key(s:disabled_packages, 'dictdconf')
+  au BufNewFile,BufRead dictd.conf setf dictdconf
+endif
+
+if !has_key(s:disabled_packages, 'dictconf')
+  au BufNewFile,BufRead {.,}dictrc,dict.conf setf dictconf
+endif
+
+if !has_key(s:disabled_packages, 'desktop')
+  au BufNewFile,BufRead *.desktop,*.directory setf desktop
+endif
+
+if !has_key(s:disabled_packages, 'desc')
+  au BufNewFile,BufRead *.desc setf desc
+endif
+
+if !has_key(s:disabled_packages, 'dnsmasq')
+  au BufNewFile,BufRead */etc/dnsmasq.conf setf dnsmasq
+  au BufNewFile,BufRead */etc/dnsmasq.d/* call s:StarSetf('dnsmasq')
+endif
+
+if !has_key(s:disabled_packages, 'denyhosts')
+  au BufNewFile,BufRead denyhosts.conf setf denyhosts
+endif
+
+if !has_key(s:disabled_packages, 'debsources')
+  au BufNewFile,BufRead */etc/apt/sources.list,*/etc/apt/sources.list.d/*.list setf debsources
+endif
+
+if !has_key(s:disabled_packages, 'debcopyright')
+  au BufNewFile,BufRead */debian/copyright setf debcopyright
+endif
+
+if !has_key(s:disabled_packages, 'debcontrol')
+  au BufNewFile,BufRead */debian/control setf debcontrol
+endif
+
+if !has_key(s:disabled_packages, 'cuplsim')
+  au BufNewFile,BufRead *.si setf cuplsim
+endif
+
+if !has_key(s:disabled_packages, 'cupl')
+  au BufNewFile,BufRead *.pld setf cupl
+endif
+
+if !has_key(s:disabled_packages, 'csp')
+  au BufNewFile,BufRead *.csp,*.fdr setf csp
+endif
+
+if !has_key(s:disabled_packages, 'quake')
+  au BufNewFile,BufRead *baseq[2-3]/*.cfg,*id1/*.cfg,*quake[1-3]/*.cfg setf quake
+endif
+
+if !has_key(s:disabled_packages, 'lynx')
+  au BufNewFile,BufRead lynx.cfg setf lynx
+endif
+
+if !has_key(s:disabled_packages, 'eterm')
+  au BufNewFile,BufRead *Eterm/*.cfg setf eterm
+endif
+
+if !has_key(s:disabled_packages, 'dcd')
+  au BufNewFile,BufRead *.dcd setf dcd
+endif
+
+if !has_key(s:disabled_packages, 'cuda')
+  au BufNewFile,BufRead *.cu,*.cuh setf cuda
+endif
+
+if !has_key(s:disabled_packages, 'config')
+  au BufNewFile,BufRead Pipfile,configure.ac,configure.in setf config
+  au BufNewFile,BufRead /etc/hostname.* call s:StarSetf('config')
+endif
+
+if !has_key(s:disabled_packages, 'cf')
+  au BufNewFile,BufRead *.cfc,*.cfi,*.cfm setf cf
+endif
+
+if !has_key(s:disabled_packages, 'coco')
+  au BufNewFile,BufRead *.atg setf coco
+endif
+
+if !has_key(s:disabled_packages, 'cobol')
+  au BufNewFile,BufRead *.cbl,*.cob,*.lib setf cobol
+endif
+
+if !has_key(s:disabled_packages, 'cmusrc')
+  au BufNewFile,BufRead */.cmus/{autosave,rc,command-history,*.theme},*/cmus/{rc,*.theme} setf cmusrc
+endif
+
+if !has_key(s:disabled_packages, 'cl')
+  au BufNewFile,BufRead *.eni setf cl
+endif
+
+if !has_key(s:disabled_packages, 'clean')
+  au BufNewFile,BufRead *.dcl,*.icl setf clean
+endif
+
+if !has_key(s:disabled_packages, 'chordpro')
+  au BufNewFile,BufRead *.cho,*.chopro,*.chordpro,*.crd,*.crdpro setf chordpro
+endif
+
+if !has_key(s:disabled_packages, 'chill')
+  au BufNewFile,BufRead *..ch setf chill
+endif
+
+if !has_key(s:disabled_packages, 'debchangelog')
+  au BufNewFile,BufRead NEWS.Debian,NEWS.dch,changelog.Debian,changelog.dch setf debchangelog
+endif
+
+if !has_key(s:disabled_packages, 'cterm')
+  au BufNewFile,BufRead *.con setf cterm
+endif
+
+if !has_key(s:disabled_packages, 'css')
+  au BufNewFile,BufRead *.css setf css
+endif
+
+if !has_key(s:disabled_packages, 'ch')
+  au BufNewFile,BufRead *.chf setf ch
+endif
+
+if !has_key(s:disabled_packages, 'cynpp')
+  au BufNewFile,BufRead *.cyn setf cynpp
+endif
+
+if !has_key(s:disabled_packages, 'crm')
+  au BufNewFile,BufRead *.crm setf crm
+endif
+
+if !has_key(s:disabled_packages, 'conaryrecipe')
+  au BufNewFile,BufRead *.recipe setf conaryrecipe
+endif
+
+if !has_key(s:disabled_packages, 'cdl')
+  au BufNewFile,BufRead *.cdl setf cdl
+endif
+
+if !has_key(s:disabled_packages, 'chaiscript')
+  au BufNewFile,BufRead *.chai setf chaiscript
+endif
+
+if !has_key(s:disabled_packages, 'cfengine')
+  au BufNewFile,BufRead cfengine.conf setf cfengine
+endif
+
+if !has_key(s:disabled_packages, 'cdrdaoconf')
+  au BufNewFile,BufRead */etc/cdrdao.conf,*/etc/default/cdrdao,*/etc/defaults/cdrdao,{.,}cdrdao setf cdrdaoconf
+endif
+
+if !has_key(s:disabled_packages, 'cdrtoc')
+  au BufNewFile,BufRead *.toc setf cdrtoc
+endif
+
+if !has_key(s:disabled_packages, 'cabal')
+  au BufNewFile,BufRead *.cabal setf cabal
+endif
+
+if !has_key(s:disabled_packages, 'csdl')
+  au BufNewFile,BufRead *.csdl setf csdl
+endif
+
+if !has_key(s:disabled_packages, 'cs')
+  au BufNewFile,BufRead *.cs setf cs
+endif
+
+if !has_key(s:disabled_packages, 'calendar')
+  au BufNewFile,BufRead calendar setf calendar
+  au BufNewFile,BufRead */share/calendar/calendar.* call s:StarSetf('calendar')
+  au BufNewFile,BufRead */share/calendar/*/calendar.* call s:StarSetf('calendar')
+  au BufNewFile,BufRead */.calendar/* call s:StarSetf('calendar')
+endif
+
+if !has_key(s:disabled_packages, 'lpc')
+  au BufNewFile,BufRead *.lpc,*.ulpc setf lpc
+endif
+
+if !has_key(s:disabled_packages, 'bsdl')
+  au BufNewFile,BufRead *.bsdl,*bsd setf bsdl
+endif
+
+if !has_key(s:disabled_packages, 'blank')
+  au BufNewFile,BufRead *.bl setf blank
+endif
+
+if !has_key(s:disabled_packages, 'bindzone')
+  au BufNewFile,BufRead named.root setf bindzone
+  au BufNewFile,BufRead */named/db.* call s:StarSetf('bindzone')
+  au BufNewFile,BufRead */bind/db.* call s:StarSetf('bindzone')
+endif
+
+if !has_key(s:disabled_packages, 'named')
+  au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key setf named
+endif
+
+if !has_key(s:disabled_packages, 'bst')
+  au BufNewFile,BufRead *.bst setf bst
+endif
+
+if !has_key(s:disabled_packages, 'bib')
+  au BufNewFile,BufRead *.bib setf bib
+endif
+
+if !has_key(s:disabled_packages, 'bdf')
+  au BufNewFile,BufRead *.bdf setf bdf
+endif
+
+if !has_key(s:disabled_packages, 'bc')
+  au BufNewFile,BufRead *.bc setf bc
+endif
+
+if !has_key(s:disabled_packages, 'dosbatch')
+  au BufNewFile,BufRead *.bat,*.sys setf dosbatch
+endif
+
 if !has_key(s:disabled_packages, 'hamster')
   au BufNewFile,BufRead *.hsc,*.hsm setf hamster
 endif
@@ -164,6 +1719,10 @@ if !has_key(s:disabled_packages, 'dosini')
   au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
 endif
 
+if !has_key(s:disabled_packages, 'spec')
+  au BufNewFile,BufRead *.spec setf spec
+endif
+
 if !has_key(s:disabled_packages, 'visual-basic')
   au! BufNewFile,BufRead,BufWritePost *.bas call polyglot#detect#Bas()
   au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs setf vb
@@ -194,6 +1753,10 @@ if !has_key(s:disabled_packages, 'helm')
   au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml setf helm
 endif
 
+if !has_key(s:disabled_packages, 'smarty')
+  au BufNewFile,BufRead *.tpl setf smarty
+endif
+
 if !has_key(s:disabled_packages, 'ansible')
   au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml setf yaml.ansible
   au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
@@ -274,6 +1837,10 @@ if !has_key(s:disabled_packages, 'terraform')
   au BufNewFile,BufRead *.tf,*.tfvars setf terraform
 endif
 
+if !has_key(s:disabled_packages, 'tf')
+  au BufNewFile,BufRead *.tf,{.,}tfrc,tfrc setf tf
+endif
+
 if !has_key(s:disabled_packages, 'systemd')
   au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf setf systemd
   au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
@@ -464,6 +2031,10 @@ if !has_key(s:disabled_packages, 'perl')
   au BufNewFile,BufRead *.xs setf xs
 endif
 
+if !has_key(s:disabled_packages, 'rc')
+  au BufNewFile,BufRead *.rc,*.rch setf rc
+endif
+
 if !has_key(s:disabled_packages, 'opencl')
   au BufNewFile,BufRead *.cl,*.opencl setf opencl
 endif
@@ -856,7 +2427,7 @@ if !has_key(s:disabled_packages, 'asn')
 endif
 
 if !has_key(s:disabled_packages, 'automake')
-  au BufNewFile,BufRead GNUmakefile.am,[Mm]akefile.am setf automake
+  au BufNewFile,BufRead *.dsp,*.mak,*.mk,GNUmakefile.am,Makefile.am,makefile.am setf automake
 endif
 
 if !has_key(s:disabled_packages, 'elf')
@@ -1008,6 +2579,14 @@ if !has_key(s:disabled_packages, 'conf')
   au BufNewFile,BufRead *.conf,auto.master,config setf conf
 endif
 
+if !has_key(s:disabled_packages, 'master')
+  au BufNewFile,BufRead *.mas,*.master setf master
+endif
+
+if !has_key(s:disabled_packages, 'cfg')
+  au BufNewFile,BufRead *.cfg,*.hgrc,*hgrc setf cfg
+endif
+
 if !has_key(s:disabled_packages, '8th')
   " 8th (Firth-derivative)
   au BufNewFile,BufRead *.8th setf 8th
diff --git a/ftplugin/bdf.vim b/ftplugin/bdf.vim
new file mode 100644
index 000000000..e18c493cf
--- /dev/null
+++ b/ftplugin/bdf.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bdf') == -1
+
+" Vim filetype plugin file
+" Language:             BDF font definition
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=b:COMMENT commentstring=COMMENT\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/bst.vim b/ftplugin/bst.vim
new file mode 100644
index 000000000..e4445546f
--- /dev/null
+++ b/ftplugin/bst.vim
@@ -0,0 +1,19 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bst') == -1
+
+" Vim filetype plugin file
+" Language:	bst
+" Author:	Tim Pope <vimNOSPAM@tpope.info>
+" $Id: bst.vim,v 1.1 2007/05/05 17:37:57 vimboss Exp $
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=%\ %s
+setlocal comments=:%
+setlocal fo-=t fo+=croql
+
+let b:undo_ftplugin = "setlocal com< cms< fo<"
+
+endif
diff --git a/ftplugin/calendar.vim b/ftplugin/calendar.vim
new file mode 100644
index 000000000..1ce0e41dd
--- /dev/null
+++ b/ftplugin/calendar.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'calendar') == -1
+
+" Vim filetype plugin file
+" Language:             calendar(1) input file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< inc< fo<"
+
+setlocal comments=s1:/*,mb:*,ex:*/ commentstring& include&
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/cdrdaoconf.vim b/ftplugin/cdrdaoconf.vim
new file mode 100644
index 000000000..8b114fcbd
--- /dev/null
+++ b/ftplugin/cdrdaoconf.vim
@@ -0,0 +1,22 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdrdaoconf') == -1
+
+" Vim filetype plugin file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-12-04
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/cfg.vim b/ftplugin/cfg.vim
new file mode 100644
index 000000000..6b4fb0626
--- /dev/null
+++ b/ftplugin/cfg.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cfg') == -1
+
+" Vim filetype plugin file
+" Language:		Configuration File
+" Maintainer:		Christian Brabandt <cb@256bit.org>
+" Latest Revision:	2018-12-24
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl cms< fo<"
+
+setlocal commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/ch.vim b/ftplugin/ch.vim
new file mode 100644
index 000000000..71f4870be
--- /dev/null
+++ b/ftplugin/ch.vim
@@ -0,0 +1,21 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ch') == -1
+
+" Vim filetype plugin file
+" Language:     Ch
+" Maintainer:   SoftIntegration, Inc. <info@softintegration.com>
+" URL:		http://www.softintegration.com/download/vim/ftplugin/ch.vim
+" Last change:	2004 May 16
+"		Created based on cpp.vim
+"
+" Ch is a C/C++ interpreter with many high level extensions
+"
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Behaves just like C
+runtime! ftplugin/c.vim ftplugin/c_*.vim ftplugin/c/*.vim
+
+endif
diff --git a/ftplugin/cobol.vim b/ftplugin/cobol.vim
new file mode 100644
index 000000000..45050de26
--- /dev/null
+++ b/ftplugin/cobol.vim
@@ -0,0 +1,273 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cobol') == -1
+
+" Vim filetype plugin file
+" Language:	cobol
+" Maintainer: Ankit Jain <ajatkj@yahoo.co.in>
+"     (formerly Tim Pope <vimNOSPAM@tpope.info>)
+" Last Update:	By Ankit Jain (add gtk support) on 15.08.2020
+
+" Insert mode mappings: <C-T> <C-D> <Tab>
+" Normal mode mappings: < > << >> [[ ]] [] ][
+" Visual mode mappings: < >
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal commentstring=\ \ \ \ \ \ *%s
+setlocal comments=:*
+setlocal fo+=croqlt
+setlocal expandtab
+setlocal textwidth=72
+
+" matchit support
+if exists("loaded_matchit")
+    let s:ordot = '\|\ze\.\%( \@=\|$\)'
+    let b:match_ignorecase=1
+    "let b:match_skip = 'getline(".") =~ "^.\\{6\\}[*/C]"'
+    let b:match_words=
+    \ '\$if\>:$else\>:\$endif\>,' .
+    \ '[$-]\@<!\<if\>:\<\%(then\|else\)\>:\<end-if\>'.s:ordot.',' .
+    \ '-\@<!\<perform\s\+\%(\d\+\s\+times\|until\|varying\|with\s\+test\)\>:\<end-perform\>'.s:ordot . ',' .
+    \ '-\@<!\<\%(search\|evaluate\)\>:\<\%(when\)\>:\<end-\%(search\|evaluate\)\>' .s:ordot . ',' .
+    \ '-\@<!\<\%(add\|compute\|divide\|multiply\|subtract\)\>\%(.*\(\%$\|\%(\n\%(\%(\s*\|.\{6\}\)[*/].*\n\)*\)\=\s*\%(not\s\+\)\=on\s\+size\s\+error\>\)\)\@=:\%(\<not\s\+\)\@<!\<\%(not\s\+\)\=on\s\+size\s\+error\>:\<end-\%(add\|compute\|divide\|multiply\|subtract\)\>' .s:ordot . ',' .
+    \ '-\@<!\<\%(string\|unstring\|accept\|display\|call\)\>\%(.*\(\%$\|\%(\n\%(\%(\s*\|.\{6\}\)[*/].*\n\)*\)\=\s*\%(not\s\+\)\=on\s\+\%(overflow\|exception\)\>\)\)\@=:\%(\<not\s\+\)\@<!\<\%(not\s\+\)\=on\s\+\%(overflow\|exception\)\>:\<end-\%(string\|unstring\|accept\|display\|call\)\>' .s:ordot . ',' .
+    \ '-\@<!\<\%(delete\|rewrite\|start\|write\|read\)\>\%(.*\(\%$\|\%(\n\%(\%(\s*\|.\{6\}\)[*/].*\n\)*\)\=\s*\%(invalid\s\+key\|at\s\+end\|no\s\+data\|at\s\+end-of-page\)\>\)\)\@=:\%(\<not\s\+\)\@<!\<\%(not\s\+\)\=\%(invalid\s\+key\|at\s\+end\|no\s\+data\|at\s\+end-of-page\)\>:\<end-\%(delete\|rewrite\|start\|write\|read\)\>' .s:ordot
+endif
+
+" add gtk support
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "COBOL Source Files (*.cbl, *.cob)\t*.cbl;*.cob;*.lib\n".
+		     \ "All Files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setlocal com< cms< fo< et< tw<" .
+            \ " | unlet! b:browsefilter b:match_words b:match_ignorecase b:match_skip"
+if !exists("g:no_plugin_maps") && !exists("g:no_cobol_maps")
+    let b:undo_ftplugin = b:undo_ftplugin .
+            \ " | sil! exe 'nunmap <buffer> <'" .
+            \ " | sil! exe 'nunmap <buffer> >'" .
+            \ " | sil! exe 'nunmap <buffer> <<'" .
+            \ " | sil! exe 'nunmap <buffer> >>'" .
+            \ " | sil! exe 'vunmap <buffer> <'" .
+            \ " | sil! exe 'vunmap <buffer> >'" .
+            \ " | sil! exe 'iunmap <buffer> <C-D>'" .
+            \ " | sil! exe 'iunmap <buffer> <C-T>'" .
+            \ " | sil! exe 'iunmap <buffer> <Tab>'" .
+            \ " | sil! exe 'nunmap <buffer> <Plug>Traditional'" .
+            \ " | sil! exe 'nunmap <buffer> <Plug>Comment'" .
+            \ " | sil! exe 'nunmap <buffer> <Plug>DeComment'" .
+            \ " | sil! exe 'vunmap <buffer> <Plug>VisualTraditional'" .
+            \ " | sil! exe 'vunmap <buffer> <Plug>VisualComment'" .
+            \ " | sil! exe 'iunmap <buffer> <Plug>VisualDeComment'" .
+            \ " | sil! exe 'unmap  <buffer> [['" .
+            \ " | sil! exe 'unmap  <buffer> ]]'" .
+            \ " | sil! exe 'unmap  <buffer> []'" .
+            \ " | sil! exe 'unmap  <buffer> ]['"
+endif
+
+if !exists("g:no_plugin_maps") && !exists("g:no_cobol_maps")
+    if version >= 700
+        nnoremap <silent> <buffer> > :set opfunc=<SID>IncreaseFunc<CR>g@
+        nnoremap <silent> <buffer> < :set opfunc=<SID>DecreaseFunc<CR>g@
+    endif
+    nnoremap <silent> <buffer> >> :call CobolIndentBlock(1)<CR>
+    nnoremap <silent> <buffer> << :call CobolIndentBlock(-1)<CR>
+    vnoremap <silent> <buffer> > :call CobolIndentBlock(v:count1)<CR>
+    vnoremap <silent> <buffer> < :call CobolIndentBlock(-v:count1)<CR>
+    inoremap <silent> <buffer> <C-T> <C-R>=<SID>IncreaseIndent()<CR><C-R>=<SID>RestoreShiftwidth()<CR>
+    inoremap <silent> <buffer> <C-D> <C-R>=<SID>DecreaseIndent()<CR><C-R>=<SID>RestoreShiftwidth()<CR>
+    if !maparg("<Tab>","i")
+        inoremap <silent> <buffer> <Tab> <C-R>=<SID>Tab()<CR><C-R>=<SID>RestoreShiftwidth()<CR>
+    endif
+    noremap <silent> <buffer> [[ m':call search('\c^\%(\s*\<Bar>.\{6\}\s\+\)\zs[A-Za-z0-9-]\+\s\+\%(division\<Bar>section\)\s*\.','bW')<CR>
+    noremap <silent> <buffer> ]] m':call search('\c^\%(\s*\<Bar>.\{6\}\s\+\)\zs[A-Za-z0-9-]\+\s\+\%(division\<Bar>section\)\.','W')<CR>
+    noremap <silent> <buffer> [] m':call <SID>toend('b')<CR>
+    noremap <silent> <buffer> ][ m':call <SID>toend('')<CR>
+    " For EnhancedCommentify
+    noremap <silent> <buffer> <Plug>Traditional      :call <SID>Comment('t')<CR>
+    noremap <silent> <buffer> <Plug>Comment          :call <SID>Comment('c')<CR>
+    noremap <silent> <buffer> <Plug>DeComment        :call <SID>Comment('u')<CR>
+    noremap <silent> <buffer> <Plug>VisualTraditional :'<,'>call <SID>Comment('t')<CR>
+    noremap <silent> <buffer> <Plug>VisualComment     :'<,'>call <SID>Comment('c')<CR>
+    noremap <silent> <buffer> <Plug>VisualDeComment   :'<,'>call <SID>Comment('u')<CR>
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+if exists("g:did_cobol_ftplugin_functions")
+    finish
+endif
+let g:did_cobol_ftplugin_functions = 1
+
+function! s:repeat(str,count)
+    let i = 0
+    let ret = ""
+    while i < a:count
+        let ret = ret . a:str
+        let i = i + 1
+    endwhile
+    return ret
+endfunction
+
+function! s:increase(...)
+    let lnum = '.'
+    let sw = shiftwidth()
+    let i = a:0 ? a:1 : indent(lnum)
+    if i >= 11
+        return sw - (i - 11) % sw
+    elseif i >= 7
+        return 11-i
+    elseif i == 6
+        return 1
+    else
+        return 6-i
+    endif
+endfunction
+
+function! s:decrease(...)
+    let lnum = '.'
+    let sw = shiftwidth()
+    let i = indent(a:0 ? a:1 : lnum)
+    if i >= 11 + sw
+        return 1 + (i + 12) % sw
+    elseif i > 11
+        return i-11
+    elseif i > 7
+        return i-7
+    elseif i == 7
+        return 1
+    else
+        return i
+    endif
+endfunction
+
+function! CobolIndentBlock(shift)
+    let head = strpart(getline('.'),0,7)
+    let tail = strpart(getline('.'),7)
+    let indent = match(tail,'[^ ]')
+    let sw = shiftwidth()
+    let shift = a:shift
+    if shift > 0
+        if indent < 4
+            let tail = s:repeat(" ",4-indent).tail
+            let shift = shift - 1
+        endif
+        let tail = s:repeat(" ",shift*sw).tail
+        let shift = 0
+    elseif shift < 0
+        if (indent-4) > -shift * sw
+            let tail = strpart(tail,-shift * sw)
+        elseif (indent-4) > (-shift-1) * sw
+            let tail = strpart(tail,indent - 4)
+        else
+            let tail = strpart(tail,indent)
+        endif
+    endif
+    call setline('.',head.tail)
+endfunction
+
+function! s:IncreaseFunc(type)
+    '[,']call CobolIndentBlock(1)
+endfunction
+
+function! s:DecreaseFunc(type)
+    '[,']call CobolIndentBlock(-1)
+endfunction
+
+function! s:IncreaseIndent()
+    let c = "\<C-T>"
+    if exists("*InsertCtrlTWrapper")
+        let key = InsertCtrlTWrapper()
+        if key != c
+            return key
+        endif
+    endif
+    let interval = s:increase()
+    let b:cobol_shiftwidth = &shiftwidth
+    let &shiftwidth = 1
+    let lastchar = strpart(getline('.'),col('.')-2,1)
+    if lastchar == '0' || lastchar == '^'
+        return "\<BS>".lastchar.c
+    else
+        return s:repeat(c,interval)
+    endif
+endfunction
+
+function! s:DecreaseIndent()
+    let c = "\<C-D>"
+    if exists("*InsertCtrlDWrapper")
+        " I hack Ctrl-D to delete when not at the end of the line.
+        let key = InsertCtrlDWrapper()
+        if key != c
+            return key
+        endif
+    endif
+    let interval = s:decrease()
+    let b:cobol_shiftwidth = &shiftwidth
+    let &shiftwidth = 1
+    return s:repeat(c,interval)
+endfunction
+
+function! s:RestoreShiftwidth()
+    if exists("b:cobol_shiftwidth")
+        let &shiftwidth=b:cobol_shiftwidth
+        unlet b:cobol_shiftwidth
+    endif
+    return ""
+endfunction
+
+function! s:Tab()
+    if (strpart(getline('.'),0,col('.')-1) =~ '^\s*$' && &sta)
+        return s:IncreaseIndent()
+    " &softtabstop < 0: &softtabstop follows &shiftwidth
+    elseif (&sts < 0 || &sts == shiftwidth()) && &sts != 8 && &et
+        return s:repeat(" ",s:increase(col('.')-1))
+    else
+        return "\<Tab>"
+    endif
+endfunction
+
+function! s:Comment(arg)
+    " For EnhancedCommentify
+    let line = getline('.')
+    if (line =~ '^.\{6\}[*/C]' || a:arg == 'c') && a:arg != 'u'
+        let line = substitute(line,'^.\{6\}\zs.',' ','')
+    else
+        let line = substitute(line,'^.\{6\}\zs.','*','')
+    endif
+    call setline('.',line)
+endfunction
+
+function! s:toend(direction)
+    let ignore = '^\(\s*\|.\{6\}\)\%([*/]\|\s*$\)'
+    let keep = line('.')
+    keepjumps +
+    while line('.') < line('$') && getline('.') =~ ignore
+        keepjumps +
+    endwhile
+    let res = search('\c^\%(\s*\|.\{6\}\s\+\)\zs[A-Za-z0-9-]\+\s\+\%(division\|section\)\s*\.',a:direction.'W')
+    if a:direction != 'b' && !res
+        let res = line('$')
+        keepjumps $
+    elseif res
+        keepjumps -
+    endif
+    if res
+        while line('.') > 1 && getline('.') =~ ignore
+            keepjumps -
+        endwhile
+        if line('.') == 1 && getline('.') =~ ignore
+            exe "keepjumps ".keep
+        endif
+    else
+        exe "keepjumps ".keep
+    endif
+endfunction
+
+endif
diff --git a/ftplugin/config.vim b/ftplugin/config.vim
new file mode 100644
index 000000000..d6a4281bd
--- /dev/null
+++ b/ftplugin/config.vim
@@ -0,0 +1,46 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'config') == -1
+
+" Vim filetype plugin file
+" Language:	config
+" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Changed: 20 Jan 2009
+" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+
+if exists("b:did_ftplugin") | finish | endif
+
+" Make sure the continuation lines below do not cause problems in
+" compatibility mode.
+let s:save_cpo = &cpo
+set cpo-=C
+
+" Define some defaults in case the included ftplugins don't set them.
+let s:undo_ftplugin = ""
+let s:browsefilter = "Bourne Shell Files (*.sh)\t*.sh\n" .
+	    \	 "All Files (*.*)\t*.*\n"
+let s:match_words = ""
+
+runtime! ftplugin/sh.vim ftplugin/sh_*.vim ftplugin/sh/*.vim
+let b:did_ftplugin = 1
+
+" Override our defaults if these were set by an included ftplugin.
+if exists("b:undo_ftplugin")
+    let s:undo_ftplugin = b:undo_ftplugin
+endif
+if exists("b:browsefilter")
+    let s:browsefilter = b:browsefilter
+endif
+
+" Change the :browse e filter to primarily show configure-related files.
+if has("gui_win32")
+    let  b:browsefilter="Configure Scripts (configure.*, config.*)\tconfigure*;config.*\n" .
+		\	s:browsefilter
+endif
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "unlet! b:browsefilter | " . b:undo_ftplugin
+
+" Restore the saved compatibility options.
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif
diff --git a/ftplugin/context.vim b/ftplugin/context.vim
new file mode 100644
index 000000000..2e68ecfc1
--- /dev/null
+++ b/ftplugin/context.vim
@@ -0,0 +1,106 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
+
+" Vim filetype plugin file
+" Language:           ConTeXt typesetting engine
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Nikolai Weibull <now@bitwi.se>
+" Latest Revision:    2016 Oct 30
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if !exists('current_compiler')
+  compiler context
+endif
+
+let b:undo_ftplugin = "setl com< cms< def< inc< sua< fo< ofu<"
+      \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
+
+setlocal comments=b:%D,b:%C,b:%M,:% commentstring=%\ %s formatoptions+=tjcroql2
+if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
+  setlocal omnifunc=contextcomplete#Complete
+  let g:omni_syntax_group_include_context = 'mf\w\+,mp\w\+'
+  let g:omni_syntax_group_exclude_context = 'mfTodoComment'
+endif
+
+let &l:define='\\\%([egx]\|char\|mathchar\|count\|dimen\|muskip\|skip\|toks\)\='
+        \ .     'def\|\\font\|\\\%(future\)\=let'
+        \ . '\|\\new\%(count\|dimen\|skip\|muskip\|box\|toks\|read\|write'
+        \ .     '\|fam\|insert\|if\)'
+
+let &l:include = '^\s*\\\%(input\|component\|product\|project\|environment\)'
+
+setlocal suffixesadd=.tex
+
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_skip = 'r:\\\@<!\%(\\\\\)*%'
+  let b:match_words = '(:),\[:],{:},\\(:\\),\\\[:\\],' .
+        \ '\\start\(\a\+\):\\stop\1'
+endif
+
+let s:context_regex = {
+      \ 'beginsection' : '\\\%(start\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
+      \ 'endsection'   : '\\\%(stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
+      \ 'beginblock'   : '\\\%(start\|setup\|define\)',
+      \ 'endblock'     : '\\\%(stop\|setup\|define\)'
+      \ }
+
+function! s:move_around(count, what, flags, visual)
+  if a:visual
+    exe "normal! gv"
+  endif
+  call search(s:context_regex[a:what], a:flags.'s') " 's' sets previous context mark
+  call map(range(2, a:count), 'search(s:context_regex[a:what], a:flags)')
+endfunction
+
+" Move around macros.
+nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
+vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
+vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
+nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
+vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
+nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
+vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
+
+" Other useful mappings
+if get(g:, 'context_mappings', 1)
+  let s:tp_regex = '?^$\|^\s*\\\(item\|start\|stop\|blank\|\%(sub\)*section\|chapter\|\%(sub\)*subject\|title\|part\)'
+
+  fun! s:tp()
+    call cursor(search(s:tp_regex, 'bcW') + 1, 1)
+    normal! V
+    call cursor(search(s:tp_regex, 'W') - 1, 1)
+  endf
+
+  " Reflow paragraphs with commands like gqtp ("gq TeX paragraph")
+  onoremap <silent><buffer> tp :<c-u>call <sid>tp()<cr>
+  " Select TeX paragraph
+  vnoremap <silent><buffer> tp <esc>:<c-u>call <sid>tp()<cr>
+
+  " $...$ text object
+  onoremap <silent><buffer> i$ :<c-u>normal! T$vt$<cr>
+  onoremap <silent><buffer> a$ :<c-u>normal! F$vf$<cr>
+  vnoremap <buffer> i$ T$ot$
+  vnoremap <buffer> a$ F$of$
+endif
+
+" Commands for asynchronous typesetting
+command! -buffer -nargs=? -complete=file ConTeXt          call context#typeset(<q-args>)
+command!         -nargs=0                ConTeXtJobStatus call context#job_status()
+command!         -nargs=0                ConTeXtStopJobs  call context#stop_jobs()
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/crm.vim b/ftplugin/crm.vim
new file mode 100644
index 000000000..f5a6268d3
--- /dev/null
+++ b/ftplugin/crm.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crm') == -1
+
+" Vim filetype plugin file
+" Language:             CRM114
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/cs.vim b/ftplugin/cs.vim
new file mode 100644
index 000000000..46d26f558
--- /dev/null
+++ b/ftplugin/cs.vim
@@ -0,0 +1,33 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
+
+" Vim filetype plugin file
+" Language:	C#
+" Maintainer:	Johannes Zellner <johannes@zellner.org>
+" Last Change:	Tue, 09 Mar 2004 14:09:33 CET
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+let s:keepcpo= &cpo
+set cpo&vim
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" and insert the comment leader when hitting <CR> or using "o".
+setlocal fo-=t fo+=croql
+
+" Set 'comments' to format dashed lists in comments.
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,:///,://
+
+if has("gui_win32") && !exists("b:browsefilter")
+    let b:browsefilter = "C# Source Files (*.cs)\t*.cs\n" .
+		       \ "All Files (*.*)\t*.*\n"
+endif
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/ftplugin/csc.vim b/ftplugin/csc.vim
new file mode 100644
index 000000000..e992f438a
--- /dev/null
+++ b/ftplugin/csc.vim
@@ -0,0 +1,31 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csc') == -1
+
+" Vim filetype plugin file
+" Language:	csc
+" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Changed: 20 Jan 2009
+" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+
+" Make sure the continuation lines below do not cause problems in
+" compatibility mode.
+let s:save_cpo = &cpo
+set cpo-=C
+
+if exists("loaded_matchit")
+    let b:match_words=
+	\ '\<fix\>:\<endfix\>,' .
+	\ '\<if\>:\<else\%(if\)\=\>:\<endif\>,' .
+	\ '\<!loopondimensions\>\|\<!looponselected\>:\<!endloop\>'
+endif
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "unlet! b:match_words"
+
+" Restore the saved compatibility options.
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif
diff --git a/ftplugin/css.vim b/ftplugin/css.vim
new file mode 100644
index 000000000..47db09cde
--- /dev/null
+++ b/ftplugin/css.vim
@@ -0,0 +1,28 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'css') == -1
+
+" Vim filetype plugin file
+" Language:		CSS
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Latest Revision:	2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< inc< fo< ofu<"
+
+setlocal comments=s1:/*,mb:*,ex:*/ commentstring&
+setlocal formatoptions-=t formatoptions+=croql
+setlocal omnifunc=csscomplete#CompleteCSS
+
+let &l:include = '^\s*@import\s\+\%(url(\)\='
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/cvsrc.vim b/ftplugin/cvsrc.vim
new file mode 100644
index 000000000..b408fdb11
--- /dev/null
+++ b/ftplugin/cvsrc.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cvsrc') == -1
+
+" Vim filetype plugin file
+" Language:             cvs(1) RC file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments= commentstring= formatoptions-=tcroql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/debchangelog.vim b/ftplugin/debchangelog.vim
new file mode 100644
index 000000000..261af91cb
--- /dev/null
+++ b/ftplugin/debchangelog.vim
@@ -0,0 +1,387 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debchangelog') == -1
+
+" Vim filetype plugin file (GUI menu, folding and completion)
+" Language:     Debian Changelog
+" Maintainer:   Debian Vim Maintainers
+" Former Maintainers:   Michael Piefel <piefel@informatik.hu-berlin.de>
+"                       Stefano Zacchiroli <zack@debian.org>
+" Last Change:  2018-01-28
+" License:      Vim License
+" URL:          https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/debchangelog.vim
+
+" Bug completion requires apt-listbugs installed for Debian packages or
+" python-launchpadlib installed for Ubuntu packages
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin=1
+
+" {{{1 Local settings (do on every load)
+if exists('g:debchangelog_fold_enable')
+  setlocal foldmethod=expr
+  setlocal foldexpr=DebGetChangelogFold(v:lnum)
+  setlocal foldtext=DebChangelogFoldText()
+endif
+
+" Debian changelogs are not supposed to have any other text width,
+" so the user cannot override this setting
+setlocal tw=78
+setlocal comments=f:* 
+
+" Clean unloading
+let b:undo_ftplugin = 'setlocal tw< comments< foldmethod< foldexpr< foldtext<'
+" }}}1
+
+if exists('g:did_changelog_ftplugin')
+  finish
+endif
+
+" Don't load another plugin (this is global)
+let g:did_changelog_ftplugin = 1
+
+" {{{1 GUI menu
+
+" Helper functions returning various data.
+" Returns full name, either from $DEBFULLNAME or debianfullname.
+" TODO Is there a way to determine name from anywhere else?
+function <SID>FullName()
+    if exists('$DEBFULLNAME')
+	return $DEBFULLNAME
+    elseif exists('g:debianfullname')
+	return g:debianfullname
+    else
+	return 'Your Name'
+    endif
+endfunction
+
+" Returns email address, from $DEBEMAIL, $EMAIL or debianemail.
+function <SID>Email()
+    if exists('$DEBEMAIL')
+	return $DEBEMAIL
+    elseif exists('$EMAIL')
+	return $EMAIL
+    elseif exists('g:debianemail')
+	return g:debianemail
+    else
+	return 'your@email.address'
+    endif
+endfunction
+
+" Returns date in RFC822 format.
+function <SID>Date()
+    let savelang = v:lc_time
+    execute 'language time C'
+    let dateandtime = strftime('%a, %d %b %Y %X %z')
+    execute 'language time ' . savelang
+    return dateandtime
+endfunction
+
+function <SID>WarnIfNotUnfinalised()
+    if match(getline('.'), ' -- [[:alpha:]][[:alnum:].]')!=-1
+	echohl WarningMsg
+	echo 'The entry has not been unfinalised before editing.'
+	echohl None
+	return 1
+    endif
+    return 0
+endfunction
+
+function <SID>Finalised()
+    let savelinenum = line('.')
+    1
+    call search('^ -- ')
+    if match(getline('.'), ' -- [[:alpha:]][[:alnum:].]')!=-1
+	let returnvalue = 1
+    else
+	let returnvalue = 0
+    endif
+    execute savelinenum
+    return returnvalue
+endfunction
+
+" These functions implement the menus
+function NewVersion()
+    " The new entry is unfinalised and shall be changed
+    amenu disable Changelog.New\ Version
+    amenu enable Changelog.Add\ Entry
+    amenu enable Changelog.Close\ Bug
+    amenu enable Changelog.Set\ Distribution
+    amenu enable Changelog.Set\ Urgency
+    amenu disable Changelog.Unfinalise
+    amenu enable Changelog.Finalise
+    call append(0, substitute(getline(1), '-\([[:digit:]]\+\))', '-$$\1)', ''))
+    call append(1, '')
+    call append(2, '')
+    call append(3, ' -- ')
+    call append(4, '')
+    call Urgency('low')
+    normal! 1G0
+    call search(')')
+    normal! h
+    normal! 

+    call setline(1, substitute(getline(1), '-\$\$', '-', ''))
+    if exists('g:debchangelog_fold_enable')
+        foldopen
+    endif
+    call AddEntry()
+endfunction
+
+function AddEntry()
+    1
+    call search('^ -- ')
+    .-2
+    call append('.', '  * ')
+    .+3
+    let warn=<SID>WarnIfNotUnfinalised()
+    .-2
+    if warn
+	echohl MoreMsg
+	call input('Hit ENTER')
+	echohl None
+    endif
+    startinsert!
+endfunction
+
+function CloseBug()
+    1
+    call search('^ -- ')
+    let warn=<SID>WarnIfNotUnfinalised()
+    .-2
+    call append('.', '  *  (closes: #' . input('Bug number to close: ') . ')')
+    normal! j^ll
+    startinsert
+endfunction
+
+function Distribution(dist)
+    call setline(1, substitute(getline(1), ')  *\%(UNRELEASED\|\l\+\);', ') ' . a:dist . ';', ''))
+endfunction
+
+function Urgency(urg)
+    call setline(1, substitute(getline(1), 'urgency=.*$', 'urgency=' . a:urg, ''))
+endfunction
+
+function <SID>UnfinaliseMenu()
+    " This means the entry shall be changed
+    amenu disable Changelog.New\ Version
+    amenu enable Changelog.Add\ Entry
+    amenu enable Changelog.Close\ Bug
+    amenu enable Changelog.Set\ Distribution
+    amenu enable Changelog.Set\ Urgency
+    amenu disable Changelog.Unfinalise
+    amenu enable Changelog.Finalise
+endfunction
+
+function Unfinalise()
+    call <SID>UnfinaliseMenu()
+    1
+    call search('^ -- ')
+    call setline('.', ' -- ')
+endfunction
+
+function <SID>FinaliseMenu()
+    " This means the entry should not be changed anymore
+    amenu enable Changelog.New\ Version
+    amenu disable Changelog.Add\ Entry
+    amenu disable Changelog.Close\ Bug
+    amenu disable Changelog.Set\ Distribution
+    amenu disable Changelog.Set\ Urgency
+    amenu enable Changelog.Unfinalise
+    amenu disable Changelog.Finalise
+endfunction
+
+function Finalise()
+    call <SID>FinaliseMenu()
+    1
+    call search('^ -- ')
+    call setline('.', ' -- ' . <SID>FullName() . ' <' . <SID>Email() . '>  ' . <SID>Date())
+endfunction
+
+
+function <SID>MakeMenu()
+    amenu &Changelog.&New\ Version			:call NewVersion()<CR>
+    amenu Changelog.&Add\ Entry				:call AddEntry()<CR>
+    amenu Changelog.&Close\ Bug				:call CloseBug()<CR>
+    menu Changelog.-sep-				<nul>
+
+    amenu Changelog.Set\ &Distribution.&unstable	:call Distribution("unstable")<CR>
+    amenu Changelog.Set\ Distribution.&frozen		:call Distribution("frozen")<CR>
+    amenu Changelog.Set\ Distribution.&stable		:call Distribution("stable")<CR>
+    menu Changelog.Set\ Distribution.-sep-		<nul>
+    amenu Changelog.Set\ Distribution.frozen\ unstable	:call Distribution("frozen unstable")<CR>
+    amenu Changelog.Set\ Distribution.stable\ unstable	:call Distribution("stable unstable")<CR>
+    amenu Changelog.Set\ Distribution.stable\ frozen	:call Distribution("stable frozen")<CR>
+    amenu Changelog.Set\ Distribution.stable\ frozen\ unstable	:call Distribution("stable frozen unstable")<CR>
+
+    amenu Changelog.Set\ &Urgency.&low			:call Urgency("low")<CR>
+    amenu Changelog.Set\ Urgency.&medium		:call Urgency("medium")<CR>
+    amenu Changelog.Set\ Urgency.&high			:call Urgency("high")<CR>
+
+    menu Changelog.-sep-				<nul>
+    amenu Changelog.U&nfinalise				:call Unfinalise()<CR>
+    amenu Changelog.&Finalise				:call Finalise()<CR>
+
+    if <SID>Finalised()
+	call <SID>FinaliseMenu()
+    else
+	call <SID>UnfinaliseMenu()
+    endif
+endfunction
+
+augroup changelogMenu
+au BufEnter * if &filetype == "debchangelog" | call <SID>MakeMenu() | endif
+au BufLeave * if &filetype == "debchangelog" | silent! aunmenu Changelog | endif
+augroup END
+
+" }}}
+" {{{1 folding
+
+" look for an author name in the [zonestart zoneend] lines searching backward
+function! s:getAuthor(zonestart, zoneend)
+  let linepos = a:zoneend
+  while linepos >= a:zonestart
+    let line = getline(linepos)
+    if line =~# '^ --'
+      return substitute(line, '^ --\s*\([^<]\+\)\s*.*', '\1', '')
+    endif
+    let linepos -= 1
+  endwhile
+  return '[unknown]'
+endfunction
+
+" Look for a package source name searching backward from the givenline and
+" returns it. Return the empty string if the package name can't be found
+function! DebGetPkgSrcName(lineno)
+  let lineidx = a:lineno
+  let pkgname = ''
+  while lineidx > 0
+    let curline = getline(lineidx)
+    if curline =~# '^\S'
+      let pkgname = matchlist(curline, '^\(\S\+\).*$')[1]
+      break
+    endif
+    let lineidx = lineidx - 1
+  endwhile
+  return pkgname
+endfunction
+
+function! DebChangelogFoldText()
+  if v:folddashes ==# '-'  " changelog entry fold
+    return foldtext() . ' -- ' . s:getAuthor(v:foldstart, v:foldend) . ' '
+  endif
+  return foldtext()
+endfunction
+
+function! DebGetChangelogFold(lnum)
+  let line = getline(a:lnum)
+  if line =~# '^\w\+'
+    return '>1' " beginning of a changelog entry
+  endif
+  if line =~# '^\s\+\[.*\]'
+    return '>2' " beginning of an author-specific chunk
+  endif
+  if line =~# '^ --'
+    return '1'
+  endif
+  return '='
+endfunction
+
+if exists('g:debchangelog_fold_enable')
+  silent! foldopen!   " unfold the entry the cursor is on (usually the first one)
+endif
+
+" }}}
+
+" {{{1 omnicompletion for Closes: #
+
+if !exists('g:debchangelog_listbugs_severities')
+  let g:debchangelog_listbugs_severities = 'critical,grave,serious,important,normal,minor,wishlist'
+endif
+
+fun! DebCompleteBugs(findstart, base)
+  if a:findstart
+    let line = getline('.')
+
+    " try to detect whether this is closes: or lp:
+    let g:debchangelog_complete_mode = 'debbugs'
+    let try_colidx = col('.') - 1
+    let colidx = -1 " default to no-completion-possible
+
+    while try_colidx > 0 && line[try_colidx - 1] =~# '\s\|\d\|#\|,\|:'
+      let try_colidx = try_colidx - 1
+      if line[try_colidx] ==# '#' && colidx == -1
+        " found hash, where we complete from:
+        let colidx = try_colidx
+      elseif line[try_colidx] ==# ':'
+        if try_colidx > 1 && strpart(line, try_colidx - 2, 3) =~? '\clp:'
+          let g:debchangelog_complete_mode = 'lp'
+        endif
+        break
+      endif
+    endwhile
+    return colidx
+  else " return matches:
+    let bug_lines = []
+    if g:debchangelog_complete_mode ==? 'lp'
+      if ! has('python')
+        echoerr 'vim must be built with Python support to use LP bug completion'
+        return
+      endif
+      let pkgsrc = DebGetPkgSrcName(line('.'))
+      python << EOF
+import vim
+try:
+    from launchpadlib.launchpad import Launchpad
+    from lazr.restfulclient.errors import HTTPError
+    # login anonymously
+    lp = Launchpad.login_anonymously('debchangelog.vim', 'production')
+    ubuntu = lp.distributions['ubuntu']
+    try:
+        sp = ubuntu.getSourcePackage(name=vim.eval('pkgsrc'))
+        status = ('New', 'Incomplete', 'Confirmed', 'Triaged',
+                  'In Progress', 'Fix Committed')
+        tasklist = sp.searchTasks(status=status, order_by='id')
+        liststr = '['
+        for task in tasklist:
+            bug = task.bug
+            liststr += "'#%d - %s'," % (bug.id, bug.title.replace('\'', '\'\''))
+        liststr += ']'
+        vim.command('silent let bug_lines = %s' % liststr.encode('utf-8'))
+    except HTTPError:
+        pass
+except ImportError:
+    vim.command('echoerr \'python-launchpadlib >= 1.5.4 needs to be installed to use Launchpad bug completion\'')
+EOF
+    else
+      if ! filereadable('/usr/sbin/apt-listbugs')
+        echoerr 'apt-listbugs not found, you should install it to use Closes bug completion'
+        return
+      endif
+      let pkgsrc = DebGetPkgSrcName(line('.'))
+      let listbugs_output = system('/usr/sbin/apt-listbugs -s ' . g:debchangelog_listbugs_severities . ' list ' . pkgsrc . ' | grep "^ #" 2> /dev/null')
+      let bug_lines = split(listbugs_output, '\n')
+    endif
+    let completions = []
+    for line in bug_lines
+      let parts = matchlist(line, '^\s*\(#\S\+\)\s*-\s*\(.*\)$')
+      " filter only those which match a:base:
+      if parts[1] !~ '^' . a:base
+        continue
+      endif
+      let completion = {}
+      let completion['word'] = parts[1]
+      let completion['menu'] = parts[2]
+      let completion['info'] = parts[0]
+      let completions += [completion]
+    endfor
+    return completions
+  endif
+endfun
+
+setlocal omnifunc=DebCompleteBugs
+
+" }}}
+
+" vim: set foldmethod=marker:
+
+endif
diff --git a/ftplugin/debcontrol.vim b/ftplugin/debcontrol.vim
new file mode 100644
index 000000000..47128050c
--- /dev/null
+++ b/ftplugin/debcontrol.vim
@@ -0,0 +1,74 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debcontrol') == -1
+
+" Vim filetype plugin file (GUI menu and folding)
+" Language:     Debian control files
+" Maintainer:   Debian Vim Maintainers
+" Former Maintainer:    Pierre Habouzit <madcoder@debian.org>
+" Last Change:  2018-01-28
+" URL:          https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/debcontrol.vim
+
+" Do these settings once per buffer
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin=1
+
+" {{{1 Local settings (do on every load)
+if exists('g:debcontrol_fold_enable')
+  setlocal foldmethod=expr
+  setlocal foldexpr=DebControlFold(v:lnum)
+  setlocal foldtext=DebControlFoldText()
+endif
+setlocal textwidth=0
+
+" Clean unloading
+let b:undo_ftplugin = 'setlocal tw< foldmethod< foldexpr< foldtext<'
+
+" }}}1
+
+" {{{1 folding
+
+function! s:getField(f, lnum)
+  let line = getline(a:lnum)
+  let fwdsteps = 0
+  while line !~ '^'.a:f.':'
+    let fwdsteps += 1
+    let line = getline(a:lnum + fwdsteps)
+    if line ==# ''
+      return 'unknown'
+    endif
+  endwhile
+  return substitute(line, '^'.a:f.': *', '', '')
+endfunction
+
+function! DebControlFoldText()
+  if v:folddashes ==# '-'  " debcontrol entry fold
+    let type = substitute(getline(v:foldstart), ':.*', '', '')
+    if type ==# 'Source'
+      let ftext = substitute(foldtext(), ' *Source: *', ' ', '')
+      return ftext . ' -- ' . s:getField('Maintainer', v:foldstart) . ' '
+    endif
+    let arch  = s:getField('Architecture', v:foldstart)
+    let ftext = substitute(foldtext(), ' *Package: *', ' [' . arch . '] ', '')
+    return ftext . ': ' . s:getField('Description', v:foldstart) . ' '
+  endif
+  return foldtext()
+endfunction
+
+function! DebControlFold(l)
+
+  " This is for not merging blank lines around folds to them
+  if getline(a:l) =~# '^Source:'
+    return '>1'
+  endif
+
+  if getline(a:l) =~# '^Package:'
+    return '>1'
+  endif
+
+  return '='
+endfunction
+
+" }}}1
+
+endif
diff --git a/ftplugin/denyhosts.vim b/ftplugin/denyhosts.vim
new file mode 100644
index 000000000..9b5cbba36
--- /dev/null
+++ b/ftplugin/denyhosts.vim
@@ -0,0 +1,22 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'denyhosts') == -1
+
+" Vim filetype plugin file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-12-04
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/dictconf.vim b/ftplugin/dictconf.vim
new file mode 100644
index 000000000..0ac9a9f48
--- /dev/null
+++ b/ftplugin/dictconf.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictconf') == -1
+
+" Vim filetype plugin file
+" Language:             dict(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/dictdconf.vim b/ftplugin/dictdconf.vim
new file mode 100644
index 000000000..df6226c3b
--- /dev/null
+++ b/ftplugin/dictdconf.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictdconf') == -1
+
+" Vim filetype plugin file
+" Language:             dictd(8) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/diff.vim b/ftplugin/diff.vim
new file mode 100644
index 000000000..8b7d05514
--- /dev/null
+++ b/ftplugin/diff.vim
@@ -0,0 +1,22 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'diff') == -1
+
+" Vim filetype plugin file
+" Language:	Diff
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2020 Jul 18
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl modeline<"
+
+" Don't use modelines in a diff, they apply to the diffed file
+setlocal nomodeline
+
+" If there are comments they start with #
+let &commentstring = "# %s"
+
+endif
diff --git a/ftplugin/dircolors.vim b/ftplugin/dircolors.vim
new file mode 100644
index 000000000..9e2ef46ae
--- /dev/null
+++ b/ftplugin/dircolors.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dircolors') == -1
+
+" Vim filetype plugin file
+" Language:             dircolors(1) input file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/dosbatch.vim b/ftplugin/dosbatch.vim
new file mode 100644
index 000000000..b846f4f51
--- /dev/null
+++ b/ftplugin/dosbatch.vim
@@ -0,0 +1,44 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosbatch') == -1
+
+" Vim filetype plugin file
+" Language:    MS-DOS .bat files
+" Maintainer:  Mike Williams <mrw@eandem.co.uk>
+" Last Change: 7th May 2020
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" BAT comment formatting
+setlocal comments=b:rem,b:@rem,b:REM,b:@REM,:::
+setlocal commentstring=::\ %s
+setlocal formatoptions-=t formatoptions+=rol
+
+" Lookup DOS keywords using Windows command help.
+if executable('help.exe')
+  if has('terminal')
+    setlocal keywordprg=:term\ help.exe
+  else
+    setlocal keywordprg=help.exe
+  endif
+endif
+
+" Define patterns for the browse file filter
+if has("gui_win32") && !exists("b:browsefilter")
+  let b:browsefilter = "DOS Batch Files (*.bat, *.cmd)\t*.bat;*.cmd\nAll Files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setlocal comments< formatoptions< keywordprg<"
+    \ . "| unlet! b:browsefiler"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/dtd.vim b/ftplugin/dtd.vim
new file mode 100644
index 000000000..d2c4876e4
--- /dev/null
+++ b/ftplugin/dtd.vim
@@ -0,0 +1,44 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dtd') == -1
+
+" Vim filetype plugin file
+" Language:	dtd
+" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Changed: 20 Jan 2009
+" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+
+" Make sure the continuation lines below do not cause problems in
+" compatibility mode.
+let s:save_cpo = &cpo
+set cpo-=C
+
+setlocal commentstring=<!--%s-->
+setlocal comments=s:<!--,m:\ \ \ \ \ ,e:-->
+
+setlocal formatoptions-=t
+if !exists("g:ft_dtd_autocomment") || (g:ft_dtd_autocomment == 1)
+    setlocal formatoptions+=croql
+endif
+
+if exists("loaded_matchit")
+    let b:match_words = '<!--:-->,<!:>'
+endif
+
+" Change the :browse e filter to primarily show Java-related files.
+if has("gui_win32")
+    let  b:browsefilter="DTD Files (*.dtd)\t*.dtd\n" .
+		\	"XML Files (*.xml)\t*.xml\n" .
+		\	"All Files (*.*)\t*.*\n"
+endif
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions<" .
+		\     " | unlet! b:matchwords b:browsefilter"
+
+" Restore the saved compatibility options.
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif
diff --git a/ftplugin/elinks.vim b/ftplugin/elinks.vim
new file mode 100644
index 000000000..8e2611dc6
--- /dev/null
+++ b/ftplugin/elinks.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elinks') == -1
+
+" Vim filetype plugin file
+" Language:             elinks(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/eterm.vim b/ftplugin/eterm.vim
new file mode 100644
index 000000000..3211c867c
--- /dev/null
+++ b/ftplugin/eterm.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'eterm') == -1
+
+" Vim filetype plugin file
+" Language:             eterm(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< inc< fo<"
+
+setlocal comments=:# commentstring=#\ %s include=^\\s*include
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/falcon.vim b/ftplugin/falcon.vim
new file mode 100644
index 000000000..f0735dd5e
--- /dev/null
+++ b/ftplugin/falcon.vim
@@ -0,0 +1,52 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'falcon') == -1
+
+" Vim filetype plugin file
+" Language:     Falcon
+" Author:       Steven Oliver <oliver.steven@gmail.com>
+" Copyright:    Copyright (c) 2009-2013 Steven Oliver
+" License:      You may redistribute this under the same terms as Vim itself
+" --------------------------------------------------------------------------
+
+" Only do this when not done yet for this buffer
+if (exists("b:did_ftplugin"))
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal softtabstop=4 shiftwidth=4 fileencoding=utf-8
+setlocal suffixesadd=.fal,.ftd
+
+" Matchit support
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_ignorecase = 0
+
+  let b:match_words =
+	\ '\<\%(if\|case\|while\|until\|for\|do\|class\)\>=\@!' .
+	\ ':' .
+	\ '\<\%(else\|elsif\|when\)\>' .
+	\ ':' .
+	\ '\<end\>' .
+	\ ',{:},\[:\],(:)'
+endif
+
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+
+" Windows allows you to filter the open file dialog
+if has("gui_win32") && !exists("b:browsefilter")
+  let b:browsefilter = "Falcon Source Files (*.fal *.ftd)\t*.fal;*.ftd\n" .
+                     \ "All Files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setlocal tabstop< shiftwidth< expandtab< fileencoding<"
+	\ . " suffixesadd< comments<"
+	\ . "| unlet! b:browsefiler"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: set sw=4 sts=4 et tw=80 :
+
+endif
diff --git a/ftplugin/fetchmail.vim b/ftplugin/fetchmail.vim
new file mode 100644
index 000000000..2001caad1
--- /dev/null
+++ b/ftplugin/fetchmail.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fetchmail') == -1
+
+" Vim filetype plugin file
+" Language:             fetchmail(1) RC File
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/fortran.vim b/ftplugin/fortran.vim
new file mode 100644
index 000000000..7b8a1fb1e
--- /dev/null
+++ b/ftplugin/fortran.vim
@@ -0,0 +1,137 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
+
+" Vim settings file
+" Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, 77, 66)
+" Version:	0.50
+" Last Change:	2020 Apr 20
+" Patched By:	Eisuke Kawashima
+" Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
+" Usage:	For instructions, do :help fortran-plugin from Vim
+" Credits:
+" Useful suggestions were made by Stefano Zacchiroli, Hendrik Merx, Ben
+" Fritz, and David Barnett.
+
+" Only do these settings when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+let s:cposet=&cpoptions
+set cpoptions&vim
+
+" Don't do other file type settings for this buffer
+let b:did_ftplugin = 1
+
+" Determine whether this is a fixed or free format source file
+" if this hasn't been done yet using the priority:
+" buffer-local value
+" > global value
+" > file extension as in Intel ifort, gcc (gfortran), NAG, Pathscale, and Cray compilers
+if !exists("b:fortran_fixed_source")
+  if exists("fortran_free_source")
+    " User guarantees free source form
+    let b:fortran_fixed_source = 0
+  elseif exists("fortran_fixed_source")
+    " User guarantees fixed source form
+    let b:fortran_fixed_source = 1
+  elseif expand("%:e") =~? '^f\%(90\|95\|03\|08\)$'
+    " Free-form file extension defaults as in Intel ifort, gcc(gfortran), NAG, Pathscale, and Cray compilers
+    let b:fortran_fixed_source = 0
+  elseif expand("%:e") =~? '^\%(f\|f77\|for\)$'
+    " Fixed-form file extension defaults
+    let b:fortran_fixed_source = 1
+  else
+    " Modern fortran still allows both fixed and free source form
+    " Assume fixed source form unless signs of free source form
+    " are detected in the first five columns of the first s:lmax lines.
+    " Detection becomes more accurate and time-consuming if more lines
+    " are checked. Increase the limit below if you keep lots of comments at
+    " the very top of each file and you have a fast computer.
+    let s:lmax = 500
+    if ( s:lmax > line("$") )
+      let s:lmax = line("$")
+    endif
+    let b:fortran_fixed_source = 1
+    let s:ln=1
+    while s:ln <= s:lmax
+      let s:test = strpart(getline(s:ln),0,5)
+      if s:test !~ '^[Cc*]' && s:test !~ '^ *[!#]' && s:test =~ '[^ 0-9\t]' && s:test !~ '^[ 0-9]*\t'
+	let b:fortran_fixed_source = 0
+	break
+      endif
+      let s:ln = s:ln + 1
+    endwhile
+    unlet! s:lmax s:ln s:test
+  endif
+endif
+
+" Set comments and textwidth according to source type
+if (b:fortran_fixed_source == 1)
+  setlocal comments=:!,:*,:C
+  " Fixed format requires a textwidth of 72 for code
+  setlocal tw=72
+  " If you need to add "&" on continued lines so that the code is
+  " compatible with both free and fixed format, then you should do so
+  " in column 73 and uncomment the next line
+  " setlocal tw=73
+else
+  setlocal comments=:!
+  " Free format allows a textwidth of 132
+  setlocal tw=132
+endif
+
+" Set commentstring for foldmethod=marker
+setlocal cms=!%s
+
+" Tabs are not a good idea in Fortran so the default is to expand tabs
+if !exists("fortran_have_tabs")
+  setlocal expandtab
+endif
+
+" Set 'formatoptions' to break text lines
+setlocal fo+=t
+
+setlocal include=^\\c#\\=\\s*include\\s\\+
+setlocal suffixesadd+=.f08,.f03,.f95,.f90,.for,.f,.F,.f77,.ftn,.fpp
+
+" Define patterns for the matchit plugin
+if !exists("b:match_words")
+  let s:notend = '\%(\<end\s\+\)\@<!'
+  let s:notselect = '\%(\<select\s\+\)\@<!'
+  let s:notelse = '\%(\<end\s\+\|\<else\s\+\)\@<!'
+  let s:notprocedure = '\%(\s\+procedure\>\)\@!'
+  let b:match_ignorecase = 1
+  let b:match_words =
+    \ '(:),' .
+    \ '\<select\s*case\>:' . s:notselect. '\<case\>:\<end\s*select\>,' .
+    \ s:notelse . '\<if\s*(.\+)\s*then\>:' .
+    \ '\<else\s*\%(if\s*(.\+)\s*then\)\=\>:\<end\s*if\>,'.
+    \ 'do\s\+\(\d\+\):\%(^\s*\)\@<=\1\s,'.
+    \ s:notend . '\<do\>:\<end\s*do\>,'.
+    \ s:notelse . '\<where\>:\<elsewhere\>:\<end\s*where\>,'.
+    \ s:notend . '\<type\s*[^(]:\<end\s*type\>,'.
+    \ s:notend . '\<forall\>:\<end\s*forall\>,'.
+    \ s:notend . '\<associate\>:\<end\s*associate\>,'.
+    \ s:notend . '\<enum\>:\<end\s*enum\>,'.
+    \ s:notend . '\<interface\>:\<end\s*interface\>,'.
+    \ s:notend . '\<subroutine\>:\<end\s*subroutine\>,'.
+    \ s:notend . '\<function\>:\<end\s*function\>,'.
+    \ s:notend . '\<module\>' . s:notprocedure . ':\<end\s*module\>,'.
+    \ s:notend . '\<program\>:\<end\s*program\>'
+endif
+
+" File filters for :browse e
+if has("gui_win32") && !exists("b:browsefilter")
+  let b:browsefilter = "Fortran Files (*.f;*.for;*.f77;*.f90;*.f95;*.f03;*.f08;*.fpp;*.ftn)\t*.f;*.for;*.f77;*.f90;*.f95;*.f03;*.f08;*.fpp;*.ftn\n" .
+    \ "All Files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setl fo< com< tw< cms< et< inc< sua<"
+	\ . "| unlet! b:match_ignorecase b:match_words b:browsefilter"
+
+let &cpoptions=s:cposet
+unlet s:cposet
+
+" vim:sw=2
+
+endif
diff --git a/ftplugin/framescript.vim b/ftplugin/framescript.vim
new file mode 100644
index 000000000..aa56a7b72
--- /dev/null
+++ b/ftplugin/framescript.vim
@@ -0,0 +1,34 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'framescript') == -1
+
+" Vim ftplugin file
+" Language:             FrameScript
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-19
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< fo< inc< | unlet! b:matchwords"
+
+setlocal comments=s1:/*,mb:*,ex:*/,:// commentstring=/*\ %s\ */
+setlocal formatoptions-=t formatoptions+=croql
+setlocal include=^\\s*<#Include
+
+if exists("loaded_matchit")
+  let s:not_end = '\c\%(\<End\)\@<!'
+  let b:match_words =
+        \ s:not_end . '\<If\>:\c\<ElseIf\>:\c\<Else\>:\c\<EndIf\>,' .
+        \ s:not_end . '\<Loop\>:\c\<EndLoop\>' .
+        \ s:not_end . '\<Sub\>:\c\<EndSub\>'
+  unlet s:not_end
+endif
+
+let &cpo = s:cpo_save 
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/fvwm.vim b/ftplugin/fvwm.vim
new file mode 100644
index 000000000..76ba91962
--- /dev/null
+++ b/ftplugin/fvwm.vim
@@ -0,0 +1,18 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fvwm') == -1
+
+" Created	: Tue 09 May 2006 02:07:31 PM CDT
+" Modified	: Tue 09 May 2006 02:07:31 PM CDT
+" Author	: Gautam Iyer <gi1242@users.sourceforge.net>
+" Description	: ftplugin for fvwm config files
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+endif
diff --git a/ftplugin/gdb.vim b/ftplugin/gdb.vim
new file mode 100644
index 000000000..abfa32088
--- /dev/null
+++ b/ftplugin/gdb.vim
@@ -0,0 +1,16 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdb') == -1
+
+" Vim filetype plugin file
+" Language:	gdb
+" Maintainer:	Michaël Peeters <NOSPAMm.vim@noekeon.org>
+" Last Changed: 26 Oct 2017
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=#%s
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "setlocal cms<"
+
+endif
diff --git a/ftplugin/gpg.vim b/ftplugin/gpg.vim
new file mode 100644
index 000000000..d75199241
--- /dev/null
+++ b/ftplugin/gpg.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gpg') == -1
+
+" Vim filetype plugin file
+" Language:             gpg(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/group.vim b/ftplugin/group.vim
new file mode 100644
index 000000000..5f0b4d908
--- /dev/null
+++ b/ftplugin/group.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'group') == -1
+
+" Vim filetype plugin file
+" Language:             group(5) user group file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments= commentstring= formatoptions-=tcroq formatoptions+=l
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/hgcommit.vim b/ftplugin/hgcommit.vim
new file mode 100644
index 000000000..16c927967
--- /dev/null
+++ b/ftplugin/hgcommit.vim
@@ -0,0 +1,20 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hgcommit') == -1
+
+" Vim filetype plugin file
+" Language:	hg (Mercurial) commit file
+" Maintainer:	Ken Takata <kentkt at csc dot jp>
+" Last Change:	2016 Jan 6
+" Filenames:	hg-editor-*.txt
+" License:	VIM License
+" URL:		https://github.com/k-takata/hg-vim
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal nomodeline
+
+let b:undo_ftplugin = 'setl modeline<'
+
+endif
diff --git a/ftplugin/hog.vim b/ftplugin/hog.vim
new file mode 100644
index 000000000..b0541a398
--- /dev/null
+++ b/ftplugin/hog.vim
@@ -0,0 +1,43 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hog') == -1
+
+" Vim filetype plugin
+" Language:     hog (snort.conf)
+" Maintainer: . Victor Roemer, <vroemer@badsec.org>.
+" Last Change:  Mar 1, 2013
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+let s:undo_ftplugin = "setl fo< com< cms< def< inc<"
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal formatoptions=croq
+setlocal comments=:#
+setlocal commentstring=\c#\ %s
+setlocal define=\c^\s\{-}var
+setlocal include=\c^\s\{-}include
+
+" Move around configurations 
+let s:hog_keyword_match = '\c^\s*\<\(preprocessor\\|config\\|output\\|include\\|ipvar\\|portvar\\|var\\|dynamicpreprocessor\\|' . 
+                        \ 'dynamicengine\\|dynamicdetection\\|activate\\|alert\\|drop\\|block\\|dynamic\\|log\\|pass\\|reject\\|sdrop\\|sblock\)\>'
+
+exec "nnoremap <buffer><silent> ]] :call search('" . s:hog_keyword_match . "', 'W' )<CR>"
+exec "nnoremap <buffer><silent> [[ :call search('" . s:hog_keyword_match . "', 'bW' )<CR>"
+
+if exists("loaded_matchit")
+    let b:match_words =
+                  \ '^\s*\<\%(preprocessor\|config\|output\|include\|ipvar\|portvar' . 
+                  \ '\|var\|dynamicpreprocessor\|dynamicengine\|dynamicdetection' . 
+                  \ '\|activate\|alert\|drop\|block\|dynamic\|log\|pass\|reject' . 
+                  \ '\|sdrop\|sblock\>\):$,\::\,:;'
+    let b:match_skip = 'r:\\.\{-}$\|^\s*#.\{-}$\|^\s*$'
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/hostconf.vim b/ftplugin/hostconf.vim
new file mode 100644
index 000000000..a6a9a840b
--- /dev/null
+++ b/ftplugin/hostconf.vim
@@ -0,0 +1,22 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hostconf') == -1
+
+" Vim filetype plugin file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-12-04
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/hostsaccess.vim b/ftplugin/hostsaccess.vim
new file mode 100644
index 000000000..36a67e90c
--- /dev/null
+++ b/ftplugin/hostsaccess.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hostsaccess') == -1
+
+" Vim filetype plugin file
+" Language:             hosts_access(5) control file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/indent.vim b/ftplugin/indent.vim
new file mode 100644
index 000000000..c4c1ab4a4
--- /dev/null
+++ b/ftplugin/indent.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'indent') == -1
+
+" Vim filetype plugin file
+" Language:             indent(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=s1:/*,mb:*,ex:*/ commentstring&
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/j.vim b/ftplugin/j.vim
new file mode 100644
index 000000000..0d8ef152b
--- /dev/null
+++ b/ftplugin/j.vim
@@ -0,0 +1,85 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'j') == -1
+
+" Vim filetype plugin
+" Language:	J
+" Maintainer:	David Bürgin <dbuergin@gluet.ch>
+" URL:		https://gitlab.com/glts/vim-j
+" Last Change:	2015-10-27
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+setlocal iskeyword=48-57,A-Z,a-z,_
+setlocal comments=:NB.
+setlocal commentstring=NB.\ %s
+setlocal formatoptions-=t
+setlocal matchpairs=(:)
+setlocal path-=/usr/include
+
+" Includes. To make the shorthand form "require 'web/cgi'" work, double the
+" last path component. Also strip off leading folder names like "~addons/".
+setlocal include=\\v^\\s*(load\|require)\\s*'\\zs\\f+\\ze'
+setlocal includeexpr=substitute(substitute(tr(v:fname,'\\','/'),'\\v^[^~][^/.]*(/[^/.]+)$','&\\1',''),'\\v^\\~[^/]+/','','')
+setlocal suffixesadd=.ijs
+
+let b:undo_ftplugin = 'setlocal suffixesadd< includeexpr< include< path< matchpairs< formatoptions< commentstring< comments< iskeyword<'
+
+" Section movement with ]] ][ [[ []. The start/end patterns below are amended
+" inside the function in order to avoid matching on the current cursor line.
+let s:sectionstart = '\%(\s*Note\|.\{-}\<\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\)\>.*'
+let s:sectionend = '\s*)\s*'
+
+function! s:SearchSection(end, backwards, visualmode) abort
+  if a:visualmode !=# ''
+    normal! gv
+  endif
+  let l:flags = a:backwards ? 'bsW' : 'sW'
+  if a:end
+    call search('^' . s:sectionend . (a:backwards ? '\n\_.\{-}\%#' : '$'), l:flags)
+  else
+    call search('^' . s:sectionstart . (a:backwards ? '\n\_.\{-}\%#' : '$'), l:flags)
+  endif
+endfunction
+
+noremap <buffer> <silent> ]] :<C-U>call <SID>SearchSection(0, 0, '')<CR>
+xnoremap <buffer> <silent> ]] :<C-U>call <SID>SearchSection(0, 0, visualmode())<CR>
+sunmap <buffer> ]]
+noremap <buffer> <silent> ][ :<C-U>call <SID>SearchSection(1, 0, '')<CR>
+xnoremap <buffer> <silent> ][ :<C-U>call <SID>SearchSection(1, 0, visualmode())<CR>
+sunmap <buffer> ][
+noremap <buffer> <silent> [[ :<C-U>call <SID>SearchSection(0, 1, '')<CR>
+xnoremap <buffer> <silent> [[ :<C-U>call <SID>SearchSection(0, 1, visualmode())<CR>
+sunmap <buffer> [[
+noremap <buffer> <silent> [] :<C-U>call <SID>SearchSection(1, 1, '')<CR>
+xnoremap <buffer> <silent> [] :<C-U>call <SID>SearchSection(1, 1, visualmode())<CR>
+sunmap <buffer> []
+
+let b:undo_ftplugin .= ' | silent! execute "unmap <buffer> ]]"'
+                   \ . ' | silent! execute "unmap <buffer> ]["'
+                   \ . ' | silent! execute "unmap <buffer> [["'
+                   \ . ' | silent! execute "unmap <buffer> []"'
+
+" Browse dialog filter on Windows (see ":help browsefilter")
+if has('gui_win32') && !exists('b:browsefilter')
+  let b:browsefilter = "J Script Files (*.ijs)\t*.ijs\n"
+                   \ . "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin .= ' | unlet! b:browsefilter'
+endif
+
+" Enhanced "%" matching (see ":help matchit")
+if exists('loaded_matchit') && !exists('b:match_words')
+  let b:match_ignorecase = 0
+  let b:match_words = '^\%(\s*Note\|.\{-}\<\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(\:\s*0\|def\s\+0\|define\)\)\>:^\s*\:\s*$:^\s*)\s*$'
+                  \ . ',\<\%(for\%(_\a\k*\)\=\|if\|select\|try\|whil\%(e\|st\)\)\.:\<\%(case\|catch[dt]\=\|else\%(if\)\=\|fcase\)\.:\<end\.'
+  let b:undo_ftplugin .= ' | unlet! b:match_ignorecase b:match_words'
+endif
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
new file mode 100644
index 000000000..e41d53e0c
--- /dev/null
+++ b/ftplugin/java.vim
@@ -0,0 +1,55 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'java') == -1
+
+" Vim filetype plugin file
+" Language:	Java
+" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Change:  2012 Mar 11
+" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+
+" Make sure the continuation lines below do not cause problems in
+" compatibility mode.
+let s:save_cpo = &cpo
+set cpo-=C
+
+" For filename completion, prefer the .java extension over the .class
+" extension.
+set suffixes+=.class
+
+" Enable gf on import statements.  Convert . in the package
+" name to / and append .java to the name, then search the path.
+setlocal includeexpr=substitute(v:fname,'\\.','/','g')
+setlocal suffixesadd=.java
+if exists("g:ftplugin_java_source_path")
+    let &l:path=g:ftplugin_java_source_path . ',' . &l:path
+endif
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" and insert the comment leader when hitting <CR> or using "o".
+setlocal formatoptions-=t formatoptions+=croql
+
+" Set 'comments' to format dashed lists in comments. Behaves just like C.
+setlocal comments& comments^=sO:*\ -,mO:*\ \ ,exO:*/
+
+setlocal commentstring=//%s
+
+" Change the :browse e filter to primarily show Java-related files.
+if has("gui_win32")
+    let  b:browsefilter="Java Files (*.java)\t*.java\n" .
+		\	"Properties Files (*.prop*)\t*.prop*\n" .
+		\	"Manifest Files (*.mf)\t*.mf\n" .
+		\	"All Files (*.*)\t*.*\n"
+endif
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "setlocal suffixes< suffixesadd<" .
+		\     " formatoptions< comments< commentstring< path< includeexpr<" .
+		\     " | unlet! b:browsefilter"
+
+" Restore the saved compatibility options.
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif
diff --git a/ftplugin/jproperties.vim b/ftplugin/jproperties.vim
new file mode 100644
index 000000000..a9cf4e624
--- /dev/null
+++ b/ftplugin/jproperties.vim
@@ -0,0 +1,19 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jproperties') == -1
+
+" Vim filetype plugin
+" Language:	Java properties file
+" Maintainer:	None
+" Last Change:	2019 Dec 01
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal formatoptions-=t
+setlocal comments=:#,:!
+setlocal commentstring=#\ %s
+
+let b:undo_ftplugin = "setl cms< com< fo<"
+
+endif
diff --git a/ftplugin/jsp.vim b/ftplugin/jsp.vim
new file mode 100644
index 000000000..091e359a8
--- /dev/null
+++ b/ftplugin/jsp.vim
@@ -0,0 +1,71 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsp') == -1
+
+" Vim filetype plugin file
+" Language:	jsp
+" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Changed: 20 Jan 2009
+" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+
+if exists("b:did_ftplugin") | finish | endif
+
+" Make sure the continuation lines below do not cause problems in
+" compatibility mode.
+let s:save_cpo = &cpo
+set cpo-=C
+
+" Define some defaults in case the included ftplugins don't set them.
+let s:undo_ftplugin = ""
+let s:browsefilter = "Java Files (*.java)\t*.java\n" .
+	    \	 "HTML Files (*.html, *.htm)\t*.html;*.htm\n" .
+	    \	 "All Files (*.*)\t*.*\n"
+let s:match_words = ""
+
+runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
+unlet b:did_ftplugin
+
+" Override our defaults if these were set by an included ftplugin.
+if exists("b:undo_ftplugin")
+    let s:undo_ftplugin = b:undo_ftplugin
+    unlet b:undo_ftplugin
+endif
+if exists("b:browsefilter")
+    let s:browsefilter = b:browsefilter
+    unlet b:browsefilter
+endif
+if exists("b:match_words")
+    let s:match_words = b:match_words
+    unlet b:match_words
+endif
+
+runtime! ftplugin/java.vim ftplugin/java_*.vim ftplugin/java/*.vim
+let b:did_ftplugin = 1
+
+" Combine the new set of values with those previously included.
+if exists("b:undo_ftplugin")
+    let s:undo_ftplugin = b:undo_ftplugin . " | " . s:undo_ftplugin
+endif
+if exists ("b:browsefilter")
+    let s:browsefilter = b:browsefilter . s:browsefilter
+endif
+if exists("b:match_words")
+    let s:match_words = b:match_words . ',' . s:match_words
+endif
+
+" Load the combined list of match_words for matchit.vim
+if exists("loaded_matchit")
+    let b:match_words = s:match_words
+endif
+
+" Change the :browse e filter to primarily show JSP-related files.
+if has("gui_win32")
+    let  b:browsefilter="JSP Files (*.jsp)\t*.jsp\n" . s:browsefilter
+endif
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
+
+" Restore the saved compatibility options.
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif
diff --git a/ftplugin/kconfig.vim b/ftplugin/kconfig.vim
new file mode 100644
index 000000000..b106b3d9f
--- /dev/null
+++ b/ftplugin/kconfig.vim
@@ -0,0 +1,31 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kconfig') == -1
+
+" Vim filetype plugin file
+" Vim syntax file
+" Maintainer:           Christian Brabandt <cb@256bit.org>
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2015-05-29
+" License:              Vim (see :h license)
+" Repository:		https://github.com/chrisbra/vim-kconfig
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+" For matchit.vim
+if exists("loaded_matchit")
+  let b:match_words = '^\<menu\>:\<endmenu\>,^\<if\>:\<endif\>,^\<choice\>:\<endchoice\>'
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/kwt.vim b/ftplugin/kwt.vim
new file mode 100644
index 000000000..5bc89215e
--- /dev/null
+++ b/ftplugin/kwt.vim
@@ -0,0 +1,36 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kwt') == -1
+
+" Vim filetype plugin file
+" Language:	Kimwitu++
+" Maintainer:	Michael Piefel <entwurf@piefel.de>
+" Last Change:	10 March 2012
+
+" Behaves almost like C++
+runtime! ftplugin/cpp.vim ftplugin/cpp_*.vim ftplugin/cpp/*.vim
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Limit the browser to related files
+if has("gui_win32") && !exists("b:browsefilter")
+    let b:browsefilter = "Kimwitu/Kimwitu++ Files (*.k)\t*.k\n" .
+		\ "Lex/Flex Files (*.l)\t*.l\n" .
+		\ "Yacc/Bison Files (*.y)\t*.y\n" .
+		\ "All Files (*.*)\t*.*\n"
+endif
+
+" Set the errorformat for the Kimwitu++ compiler
+set efm+=kc%.%#:\ error\ at\ %f:%l:\ %m
+
+if exists("b:undo_ftplugin")
+    let b:undo_ftplugin = b:undo_ftplugin . " | setlocal efm<"
+	\ . "| unlet! b:browsefiler"
+else
+    let b:undo_ftplugin = "setlocal efm<"
+	\ . "| unlet! b:browsefiler"
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/ld.vim b/ftplugin/ld.vim
new file mode 100644
index 000000000..bd9723f4f
--- /dev/null
+++ b/ftplugin/ld.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ld') == -1
+
+" Vim filetype plugin file
+" Language:             ld(1) script
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< inc< fo<"
+
+setlocal comments=s1:/*,mb:*,ex:*/ commentstring=/*%s*/ include=^\\s*INCLUDE
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/lftp.vim b/ftplugin/lftp.vim
new file mode 100644
index 000000000..f9e0be864
--- /dev/null
+++ b/ftplugin/lftp.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lftp') == -1
+
+" Vim filetype plugin file
+" Language:             lftp(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/libao.vim b/ftplugin/libao.vim
new file mode 100644
index 000000000..d6d6e660a
--- /dev/null
+++ b/ftplugin/libao.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'libao') == -1
+
+" Vim filetype plugin file
+" Language:             libao.conf(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/limits.vim b/ftplugin/limits.vim
new file mode 100644
index 000000000..873f93415
--- /dev/null
+++ b/ftplugin/limits.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'limits') == -1
+
+" Vim filetype plugin file
+" Language:             limits(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/liquid.vim b/ftplugin/liquid.vim
new file mode 100644
index 000000000..5ffbade6b
--- /dev/null
+++ b/ftplugin/liquid.vim
@@ -0,0 +1,65 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
+
+" Vim filetype plugin
+" Language:     Liquid
+" Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
+" Last Change:	2010 May 21
+
+if exists('b:did_ftplugin')
+  finish
+endif
+
+if !exists('g:liquid_default_subtype')
+  let g:liquid_default_subtype = 'html'
+endif
+
+if !exists('b:liquid_subtype')
+  let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
+  let b:liquid_subtype = matchstr(s:lines,'liquid_subtype=\zs\w\+')
+  if b:liquid_subtype == ''
+    let b:liquid_subtype = matchstr(&filetype,'^liquid\.\zs\w\+')
+  endif
+  if b:liquid_subtype == ''
+    let b:liquid_subtype = matchstr(substitute(expand('%:t'),'\c\%(\.liquid\)\+$','',''),'\.\zs\w\+$')
+  endif
+  if b:liquid_subtype == ''
+    let b:liquid_subtype = g:liquid_default_subtype
+  endif
+endif
+
+if exists('b:liquid_subtype') && b:liquid_subtype != ''
+  exe 'runtime! ftplugin/'.b:liquid_subtype.'.vim ftplugin/'.b:liquid_subtype.'_*.vim ftplugin/'.b:liquid_subtype.'/*.vim'
+else
+  runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
+endif
+let b:did_ftplugin = 1
+
+if exists('b:undo_ftplugin')
+  let b:undo_ftplugin .= '|'
+else
+  let b:undo_ftplugin = ''
+endif
+if exists('b:browsefilter')
+  let b:browsefilter = "\n".b:browsefilter
+else
+  let b:browsefilter = ''
+endif
+if exists('b:match_words')
+  let b:match_words .= ','
+elseif exists('loaded_matchit')
+  let b:match_words = ''
+endif
+
+if has('gui_win32')
+  let b:browsefilter="Liquid Files (*.liquid)\t*.liquid" . b:browsefilter
+endif
+
+if exists('loaded_matchit')
+  let b:match_words .= '\<\%(if\w*\|unless\|case\)\>:\<\%(elsif\|else\|when\)\>:\<end\%(if\w*\|unless\|case\)\>,\<\%(for\|tablerow\)\>:\%({%\s*\)\@<=empty\>:\<end\%(for\|tablerow\)\>,<\(capture\|comment\|highlight\)\>:\<end\1\>'
+endif
+
+setlocal commentstring={%\ comment\ %}%s{%\ endcomment\ %}
+
+let b:undo_ftplugin .= 'setl cms< | unlet! b:browsefilter b:match_words'
+
+endif
diff --git a/ftplugin/lisp.vim b/ftplugin/lisp.vim
new file mode 100644
index 000000000..eaae27950
--- /dev/null
+++ b/ftplugin/lisp.vim
@@ -0,0 +1,30 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lisp') == -1
+
+" Vim filetype plugin
+" Language:      Lisp
+" Maintainer:    Sergey Khorev <sergey.khorev@gmail.com>
+" URL:		 http://sites.google.com/site/khorser/opensource/vim
+" Original author:    Dorai Sitaram <ds26@gte.com>
+" Original URL:		 http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
+" Last Change:   Oct 23, 2013
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+setl comments=:;
+setl define=^\\s*(def\\k*
+setl formatoptions-=t
+setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!,@-@,94
+setl lisp
+setl commentstring=;%s
+
+setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|#
+
+let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp< commentstring<"
+
+endif
diff --git a/ftplugin/logcheck.vim b/ftplugin/logcheck.vim
new file mode 100644
index 000000000..1c1d85109
--- /dev/null
+++ b/ftplugin/logcheck.vim
@@ -0,0 +1,21 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logcheck') == -1
+
+" Vim filetype plugin file
+" Language:    Logcheck
+" Maintainer:  Debian Vim Maintainers
+" Last Change: 2018 Dec 27
+" License:     Vim License
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/ftplugin/logcheck.vim
+
+if exists('b:did_ftplugin')
+    finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = 'setl fo<'
+
+" Do not hard-wrap non-comment lines since each line is a self-contained
+" regular expression
+setlocal formatoptions-=t
+
+endif
diff --git a/ftplugin/loginaccess.vim b/ftplugin/loginaccess.vim
new file mode 100644
index 000000000..e19e9d8dd
--- /dev/null
+++ b/ftplugin/loginaccess.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'loginaccess') == -1
+
+" Vim filetype plugin file
+" Language:             login.access(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/logindefs.vim b/ftplugin/logindefs.vim
new file mode 100644
index 000000000..be22441f4
--- /dev/null
+++ b/ftplugin/logindefs.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logindefs') == -1
+
+" Vim filetype plugin file
+" Language:             login.defs(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/logtalk.vim b/ftplugin/logtalk.vim
new file mode 100644
index 000000000..2b79723fb
--- /dev/null
+++ b/ftplugin/logtalk.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logtalk') == -1
+
+" Logtalk filetype plugin file
+" Language:         Logtalk
+" Maintainer:       Paulo Moura <pmoura@logtalk.org>
+" Latest Revision:  2018-08-03
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl ts< sw< fdm< fdc< ai< dict<"
+
+setlocal ts=4
+setlocal sw=4
+setlocal fdm=syntax
+setlocal fdn=10
+setlocal fdc=2
+setlocal autoindent
+setlocal dict=$VIMRUNTIME/ftplugin/logtalk.dict
+
+endif
diff --git a/ftplugin/lprolog.vim b/ftplugin/lprolog.vim
new file mode 100644
index 000000000..8f4654608
--- /dev/null
+++ b/ftplugin/lprolog.vim
@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lprolog') == -1
+
+" Vim settings file
+" Language:     LambdaProlog (Teyjus)
+" Maintainer:   Markus Mottl  <markus.mottl@gmail.com>
+" URL:          http://www.ocaml.info/vim/ftplugin/lprolog.vim
+" Last Change:  2006 Feb 05
+"               2001 Sep 16 - fixed 'no_mail_maps'-bug (MM)
+"               2001 Sep 02 - initial release  (MM)
+
+" Only do these settings when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't do other file type settings for this buffer
+let b:did_ftplugin = 1
+
+" Error format
+setlocal efm=%+A./%f:%l.%c:\ %m formatprg=fmt\ -w75\ -p\\%
+
+" Formatting of comments
+setlocal formatprg=fmt\ -w75\ -p\\%
+
+" Add mappings, unless the user didn't want this.
+if !exists("no_plugin_maps") && !exists("no_lprolog_maps")
+  " Uncommenting
+  if !hasmapto('<Plug>Comment')
+    nmap <buffer> <LocalLeader>c <Plug>LUncomOn
+    vmap <buffer> <LocalLeader>c <Plug>BUncomOn
+    nmap <buffer> <LocalLeader>C <Plug>LUncomOff
+    vmap <buffer> <LocalLeader>C <Plug>BUncomOff
+  endif
+
+  nnoremap <buffer> <Plug>LUncomOn mz0i/* <ESC>$A */<ESC>`z
+  nnoremap <buffer> <Plug>LUncomOff <ESC>:s/^\/\* \(.*\) \*\//\1/<CR>
+  vnoremap <buffer> <Plug>BUncomOn <ESC>:'<,'><CR>`<O<ESC>0i/*<ESC>`>o<ESC>0i*/<ESC>`<
+  vnoremap <buffer> <Plug>BUncomOff <ESC>:'<,'><CR>`<dd`>dd`<
+endif
+
+endif
diff --git a/ftplugin/mail.vim b/ftplugin/mail.vim
new file mode 100644
index 000000000..b3d7f5b9e
--- /dev/null
+++ b/ftplugin/mail.vim
@@ -0,0 +1,42 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mail') == -1
+
+" Vim filetype plugin file
+" Language:	Mail
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2012 Nov 20
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl modeline< tw< fo< comments<"
+
+" Don't use modelines in e-mail messages, avoid trojan horses and nasty
+" "jokes" (e.g., setting 'textwidth' to 5).
+setlocal nomodeline
+
+" many people recommend keeping e-mail messages 72 chars wide
+if &tw == 0
+  setlocal tw=72
+endif
+
+" Set 'formatoptions' to break text lines and keep the comment leader ">".
+setlocal fo+=tcql
+
+" Add n:> to 'comments, in case it was removed elsewhere
+setlocal comments+=n:>
+
+" Add mappings, unless the user doesn't want this.
+if !exists("no_plugin_maps") && !exists("no_mail_maps")
+  " Quote text by inserting "> "
+  if !hasmapto('<Plug>MailQuote')
+    vmap <buffer> <LocalLeader>q <Plug>MailQuote
+    nmap <buffer> <LocalLeader>q <Plug>MailQuote
+  endif
+  vnoremap <buffer> <Plug>MailQuote :s/^/> /<CR>:noh<CR>``
+  nnoremap <buffer> <Plug>MailQuote :.,$s/^/> /<CR>:noh<CR>``
+endif
+
+endif
diff --git a/ftplugin/mailaliases.vim b/ftplugin/mailaliases.vim
new file mode 100644
index 000000000..ac7466cca
--- /dev/null
+++ b/ftplugin/mailaliases.vim
@@ -0,0 +1,22 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mailaliases') == -1
+
+" Vim filetype plugin file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/mailcap.vim b/ftplugin/mailcap.vim
new file mode 100644
index 000000000..fca0215b8
--- /dev/null
+++ b/ftplugin/mailcap.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mailcap') == -1
+
+" Vim filetype plugin file
+" Language:             Mailcap configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/man.vim b/ftplugin/man.vim
new file mode 100644
index 000000000..300129c2a
--- /dev/null
+++ b/ftplugin/man.vim
@@ -0,0 +1,254 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'man') == -1
+
+" Vim filetype plugin file
+" Language:	man
+" Maintainer:	Jason Franklin <vim@justemail.net>
+" Maintainer:	SungHyun Nam <goweol@gmail.com>
+" Last Change: 	2020 Jun 01
+
+" To make the ":Man" command available before editing a manual page, source
+" this script from your startup vimrc file.
+
+" If 'filetype' isn't "man", we must have been called to only define ":Man".
+if &filetype == "man"
+
+  " Only do this when not done yet for this buffer
+  if exists("b:did_ftplugin")
+    finish
+  endif
+  let b:did_ftplugin = 1
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+if &filetype == "man"
+  " allow dot and dash in manual page name.
+  setlocal iskeyword+=\.,-
+  let b:undo_ftplugin = "setlocal iskeyword<"
+
+  " Add mappings, unless the user didn't want this.
+  if !exists("no_plugin_maps") && !exists("no_man_maps")
+    if !hasmapto('<Plug>ManBS')
+      nmap <buffer> <LocalLeader>h <Plug>ManBS
+      let b:undo_ftplugin = b:undo_ftplugin
+	    \ . '|silent! nunmap <buffer> <LocalLeader>h'
+    endif
+    nnoremap <buffer> <Plug>ManBS :%s/.\b//g<CR>:setl nomod<CR>''
+
+    nnoremap <buffer> <silent> <c-]> :call <SID>PreGetPage(v:count)<CR>
+    nnoremap <buffer> <silent> <c-t> :call <SID>PopPage()<CR>
+    nnoremap <buffer> <silent> q :q<CR>
+
+    " Add undo commands for the maps
+    let b:undo_ftplugin = b:undo_ftplugin
+	  \ . '|silent! nunmap <buffer> <Plug>ManBS'
+	  \ . '|silent! nunmap <buffer> <c-]>'
+	  \ . '|silent! nunmap <buffer> <c-t>'
+	  \ . '|silent! nunmap <buffer> q'
+  endif
+
+  if exists('g:ft_man_folding_enable') && (g:ft_man_folding_enable == 1)
+    setlocal foldmethod=indent foldnestmax=1 foldenable
+    let b:undo_ftplugin = b:undo_ftplugin
+	  \ . '|silent! setl fdm< fdn< fen<'
+  endif
+
+endif
+
+if exists(":Man") != 2
+  com -nargs=+ -complete=shellcmd Man call s:GetPage(<q-mods>, <f-args>)
+  nmap <Leader>K :call <SID>PreGetPage(0)<CR>
+  nmap <Plug>ManPreGetPage :call <SID>PreGetPage(0)<CR>
+endif
+
+" Define functions only once.
+if !exists("s:man_tag_depth")
+
+let s:man_tag_depth = 0
+
+let s:man_sect_arg = ""
+let s:man_find_arg = "-w"
+try
+  if !has("win32") && $OSTYPE !~ 'cygwin\|linux' && system('uname -s') =~ "SunOS" && system('uname -r') =~ "^5"
+    let s:man_sect_arg = "-s"
+    let s:man_find_arg = "-l"
+  endif
+catch /E145:/
+  " Ignore the error in restricted mode
+endtry
+
+func <SID>PreGetPage(cnt)
+  if a:cnt == 0
+    let old_isk = &iskeyword
+    if &ft == 'man'
+      setl iskeyword+=(,)
+    endif
+    let str = expand("<cword>")
+    let &l:iskeyword = old_isk
+    let page = substitute(str, '(*\(\k\+\).*', '\1', '')
+    let sect = substitute(str, '\(\k\+\)(\([^()]*\)).*', '\2', '')
+    if match(sect, '^[0-9 ]\+$') == -1
+      let sect = ""
+    endif
+    if sect == page
+      let sect = ""
+    endif
+  else
+    let sect = a:cnt
+    let page = expand("<cword>")
+  endif
+  call s:GetPage('', sect, page)
+endfunc
+
+func <SID>GetCmdArg(sect, page)
+  if a:sect == ''
+    return a:page
+  endif
+  return s:man_sect_arg.' '.a:sect.' '.a:page
+endfunc
+
+func <SID>FindPage(sect, page)
+  let where = system("man ".s:man_find_arg.' '.s:GetCmdArg(a:sect, a:page))
+  if where !~ "^/"
+    if matchstr(where, " [^ ]*$") !~ "^ /"
+      return 0
+    endif
+  endif
+  return 1
+endfunc
+
+func <SID>GetPage(cmdmods, ...)
+  if a:0 >= 2
+    let sect = a:1
+    let page = a:2
+  elseif a:0 >= 1
+    let sect = ""
+    let page = a:1
+  else
+    return
+  endif
+
+  " To support:	    nmap K :Man <cword>
+  if page == '<cword>'
+    let page = expand('<cword>')
+  endif
+
+  if !exists('g:ft_man_no_sect_fallback') || (g:ft_man_no_sect_fallback == 0)
+    if sect != "" && s:FindPage(sect, page) == 0
+      let sect = ""
+    endif
+  endif
+  if s:FindPage(sect, page) == 0
+    let msg = 'man.vim: no manual entry for "' . page . '"'
+    if !empty(sect)
+      let msg .= ' in section ' . sect
+    endif
+    echomsg msg
+    return
+  endif
+  exec "let s:man_tag_buf_".s:man_tag_depth." = ".bufnr("%")
+  exec "let s:man_tag_lin_".s:man_tag_depth." = ".line(".")
+  exec "let s:man_tag_col_".s:man_tag_depth." = ".col(".")
+  let s:man_tag_depth = s:man_tag_depth + 1
+
+  let open_cmd = 'edit'
+
+  " Use an existing "man" window if it exists, otherwise open a new one.
+  if &filetype != "man"
+    let thiswin = winnr()
+    exe "norm! \<C-W>b"
+    if winnr() > 1
+      exe "norm! " . thiswin . "\<C-W>w"
+      while 1
+	if &filetype == "man"
+	  break
+	endif
+	exe "norm! \<C-W>w"
+	if thiswin == winnr()
+	  break
+	endif
+      endwhile
+    endif
+    if &filetype != "man"
+      if exists("g:ft_man_open_mode")
+        if g:ft_man_open_mode == 'vert'
+	  let open_cmd = 'vsplit'
+        elseif g:ft_man_open_mode == 'tab'
+	  let open_cmd = 'tabedit'
+        else
+	  let open_cmd = 'split'
+        endif
+      else
+	let open_cmd = a:cmdmods . ' split'
+      endif
+    endif
+  endif
+
+  silent execute open_cmd . " $HOME/" . page . '.' . sect . '~'
+
+  " Avoid warning for editing the dummy file twice
+  setl buftype=nofile noswapfile
+
+  setl fdc=0 ma nofen nonu nornu
+  %delete _
+  let unsetwidth = 0
+  if empty($MANWIDTH)
+    let $MANWIDTH = winwidth(0)
+    let unsetwidth = 1
+  endif
+
+  " Ensure Vim is not recursively invoked (man-db does this) when doing ctrl-[
+  " on a man page reference by unsetting MANPAGER.
+  " Some versions of env(1) do not support the '-u' option, and in such case
+  " we set MANPAGER=cat.
+  if !exists('s:env_has_u')
+    call system('env -u x true')
+    let s:env_has_u = (v:shell_error == 0)
+  endif
+  let env_cmd = s:env_has_u ? 'env -u MANPAGER' : 'env MANPAGER=cat'
+  let env_cmd .= ' GROFF_NO_SGR=1'
+  let man_cmd = env_cmd . ' man ' . s:GetCmdArg(sect, page) . ' | col -b'
+  silent exec "r !" . man_cmd
+
+  if unsetwidth
+    let $MANWIDTH = ''
+  endif
+  " Remove blank lines from top and bottom.
+  while line('$') > 1 && getline(1) =~ '^\s*$'
+    1delete _
+  endwhile
+  while line('$') > 1 && getline('$') =~ '^\s*$'
+    $delete _
+  endwhile
+  1
+  setl ft=man nomod
+  setl bufhidden=hide
+  setl nobuflisted
+  setl noma
+endfunc
+
+func <SID>PopPage()
+  if s:man_tag_depth > 0
+    let s:man_tag_depth = s:man_tag_depth - 1
+    exec "let s:man_tag_buf=s:man_tag_buf_".s:man_tag_depth
+    exec "let s:man_tag_lin=s:man_tag_lin_".s:man_tag_depth
+    exec "let s:man_tag_col=s:man_tag_col_".s:man_tag_depth
+    exec s:man_tag_buf."b"
+    exec s:man_tag_lin
+    exec "norm! ".s:man_tag_col."|"
+    exec "unlet s:man_tag_buf_".s:man_tag_depth
+    exec "unlet s:man_tag_lin_".s:man_tag_depth
+    exec "unlet s:man_tag_col_".s:man_tag_depth
+    unlet s:man_tag_buf s:man_tag_lin s:man_tag_col
+  endif
+endfunc
+
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: set sw=2 ts=8 noet:
+
+endif
diff --git a/ftplugin/manconf.vim b/ftplugin/manconf.vim
new file mode 100644
index 000000000..cfe01594c
--- /dev/null
+++ b/ftplugin/manconf.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'manconf') == -1
+
+" Vim filetype plugin file
+" Language:             man.conf(5) - man configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/mf.vim b/ftplugin/mf.vim
new file mode 100644
index 000000000..1a005d662
--- /dev/null
+++ b/ftplugin/mf.vim
@@ -0,0 +1,74 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mf') == -1
+
+" Vim filetype plugin file
+" Language:           METAFONT
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Nikolai Weibull <now@bitwi.se>
+" Latest Revision:    2016 Oct 2
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<"
+      \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
+
+setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=cjroql2
+setlocal suffixesadd=.mf
+let &l:include = '\<input\>'
+let &l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+'
+setlocal omnifunc=syntaxcomplete#Complete
+let g:omni_syntax_group_include_mf = 'mf\w\+'
+let g:omni_syntax_group_exclude_mf = 'mfTodoComment'
+
+let s:mp_regex = {
+      \ 'beginsection' : '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|beginchar\|beginlogochar\)\>',
+      \ 'endsection'   : '^\s*\%(enddef\|endchar\)\>',
+      \ 'beginblock'   : '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>',
+      \ 'endblock'     : '^\s*\%(endgroup\|fi\|endfor\)\>'
+      \ }
+
+function! s:move_around(count, what, flags, visual)
+  if a:visual
+    exe "normal! gv"
+  endif
+  call search(s:mp_regex[a:what], a:flags.'s') " 's' sets previous context mark
+  call map(range(2, a:count), 'search(s:mp_regex[a:what], a:flags)')
+endfunction
+
+
+" Move around macros.
+nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
+vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
+vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
+nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
+vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
+nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
+vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
+
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_words =
+        \ '\<if\>:\<else\%[if]\>:\<fi\>,' .
+        \ '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,' .
+        \ '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,' .
+        \ '\<begingroup\>:\<endgroup\>,' .
+        \ '\<begin\%(logo\)\?char\>:\<endchar\>'
+  " Ignore comments and strings
+  let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name")
+        \ =~# "mf\\(Comment\\|String\\)$"'
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/modconf.vim b/ftplugin/modconf.vim
new file mode 100644
index 000000000..07ea16692
--- /dev/null
+++ b/ftplugin/modconf.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'modconf') == -1
+
+" Vim filetype plugin file
+" Language:             modules.conf(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< inc< fo<"
+
+setlocal comments=:# commentstring=#\ %s include=^\\s*include
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/mp.vim b/ftplugin/mp.vim
new file mode 100644
index 000000000..a13f5cff3
--- /dev/null
+++ b/ftplugin/mp.vim
@@ -0,0 +1,86 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mp') == -1
+
+" Vim filetype plugin file
+" Language:           MetaPost
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Nikolai Weibull <now@bitwi.se>
+" Latest Revision:    2016 Oct 2
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<"
+      \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
+
+setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=cjroql2
+setlocal suffixesadd=.mp,.mpiv
+let &l:include = '\<\%(input\|loadmodule\)\>' " loadmodule is in MetaFun
+let &l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+'
+setlocal omnifunc=syntaxcomplete#Complete
+let g:omni_syntax_group_include_mp = 'mf\w\+,mp\w\+'
+let g:omni_syntax_group_exclude_mp = 'mfTodoComment'
+
+if exists(":FixBeginfigs") != 2
+  command -nargs=0 FixBeginfigs call s:fix_beginfigs()
+
+  function! s:fix_beginfigs()
+    let i = 1
+    g/^beginfig(\d*);$/s//\='beginfig('.i.');'/ | let i = i + 1
+  endfunction
+endif
+
+let s:mp_regex = {
+      \ 'beginsection' : '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|begin\%(fig\|char\|logochar\|glyph\|graph\)\)\>',
+      \ 'endsection'   : '^\s*\%(enddef\|end\%(fig\|char\|glyph\|graph\)\)\>',
+      \ 'beginblock'   : '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>',
+      \ 'endblock'     : '^\s*\%(endgroup\|fi\|endfor\)\>'
+      \ }
+
+function! s:move_around(count, what, flags, visual)
+  if a:visual
+    exe "normal! gv"
+  endif
+  call search(s:mp_regex[a:what], a:flags.'s') " 's' sets previous context mark
+  call map(range(2, a:count), 'search(s:mp_regex[a:what], a:flags)')
+endfunction
+
+
+" Move around macros.
+nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
+vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
+vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
+nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
+vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
+nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
+vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
+
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_words =
+        \ '\<if\>:\<else\%[if]\>:\<fi\>,' .
+        \ '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,' .
+        \ '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,' .
+        \ '\<beginfig\>:\<endfig\>,' .
+        \ '\<begingroup\>:\<endgroup\>,' .
+        \ '\<begin\%(logo\)\?char\>:\<endchar\>,' .
+        \ '\<beginglyph\>:\<endglyph\>,' .
+        \ '\<begingraph\>:\<endgraph\>'
+  " Ignore comments and strings
+  let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name")
+        \ =~# "^mf\\%(Comment\\|String\\|\\)$\\|^mpTeXinsert$"'
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/mplayerconf.vim b/ftplugin/mplayerconf.vim
new file mode 100644
index 000000000..b3587bdcf
--- /dev/null
+++ b/ftplugin/mplayerconf.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mplayerconf') == -1
+
+" Vim filetype plugin file
+" Language:             mplayer(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< inc< fo<"
+
+setlocal comments=:# commentstring=#\ %s include=^\\s*include
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/mrxvtrc.vim b/ftplugin/mrxvtrc.vim
new file mode 100644
index 000000000..bf73b0e4c
--- /dev/null
+++ b/ftplugin/mrxvtrc.vim
@@ -0,0 +1,26 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mrxvtrc') == -1
+
+" Created	: Wed 26 Apr 2006 01:20:53 AM CDT
+" Modified	: Fri 28 Apr 2006 03:24:01 AM CDT
+" Author	: Gautam Iyer <gi1242@users.sourceforge.net>
+" Description	: ftplugin for mrxvtrc
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+" Really any line that does not match an option is a comment. But use '!' for
+" compatibility with x-defaults files, and "#" (preferred) for compatibility
+" with all other config files.
+"
+" Comments beginning with "#" are preferred because Vim will not flag the
+" first word as a spelling error if it is not capitalised. The '!' used as
+" comment leaders makes Vim think that every comment line is a new sentence.
+
+setlocal comments=:!,:# commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+endif
diff --git a/ftplugin/muttrc.vim b/ftplugin/muttrc.vim
new file mode 100644
index 000000000..1d77a63f7
--- /dev/null
+++ b/ftplugin/muttrc.vim
@@ -0,0 +1,26 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'muttrc') == -1
+
+" Vim filetype plugin file
+" Language:             mutt RC File
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< inc< fo<"
+
+setlocal comments=:# commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let &l:include = '^\s*source\>'
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/nanorc.vim b/ftplugin/nanorc.vim
new file mode 100644
index 000000000..a116e3181
--- /dev/null
+++ b/ftplugin/nanorc.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nanorc') == -1
+
+" Vim filetype plugin file
+" Language:             nanorc(5) - GNU nano configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/neomuttrc.vim b/ftplugin/neomuttrc.vim
new file mode 100644
index 000000000..660931d0e
--- /dev/null
+++ b/ftplugin/neomuttrc.vim
@@ -0,0 +1,27 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'neomuttrc') == -1
+
+" Vim filetype plugin file
+" Language:             NeoMutt RC File
+" Previous Maintainer:  Guillaume Brogi <gui-gui@netcourrier.com>
+" Latest Revision:      2017-09-17
+" Original version copied from ftplugin/muttrc.vim
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< inc< fo<"
+
+setlocal comments=:# commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let &l:include = '^\s*source\>'
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/netrc.vim b/ftplugin/netrc.vim
new file mode 100644
index 000000000..75f5ff7f9
--- /dev/null
+++ b/ftplugin/netrc.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'netrc') == -1
+
+" Vim filetype plugin file
+" Language:             netrc(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments= commentstring= formatoptions-=tcroq formatoptions+=l
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/nroff.vim b/ftplugin/nroff.vim
new file mode 100644
index 000000000..2d040e3a4
--- /dev/null
+++ b/ftplugin/nroff.vim
@@ -0,0 +1,15 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nroff') == -1
+
+" Vim filetype plugin
+" Language:	roff(7)
+" Maintainer:	Chris Spiegel <cspiegel@gmail.com>
+" Last Change:	2019 Apr 24
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=.\\\"%s
+
+endif
diff --git a/ftplugin/nsis.vim b/ftplugin/nsis.vim
new file mode 100644
index 000000000..8820f0664
--- /dev/null
+++ b/ftplugin/nsis.vim
@@ -0,0 +1,47 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nsis') == -1
+
+" Vim ftplugin file
+" Language:		NSIS script
+" Maintainer:		Ken Takata
+" URL:			https://github.com/k-takata/vim-nsis
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Last Change:		2018-01-26
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< fo< def< inc<"
+      \ " | unlet! b:match_ignorecase b:match_words"
+
+setlocal comments=s1:/*,mb:*,ex:*/,b:#,:; commentstring=;\ %s
+setlocal formatoptions-=t formatoptions+=croql
+setlocal define=^\\s*!define\\%(\\%(utc\\)\\=date\\|math\\)\\=
+setlocal include=^\\s*!include\\%(/NONFATAL\\)\\=
+
+if exists("loaded_matchit")
+  let b:match_ignorecase = 1
+  let b:match_words =
+	\ '\${\%(If\|IfNot\|Unless\)}:\${\%(Else\|ElseIf\|ElseIfNot\|ElseUnless\)}:\${\%(EndIf\|EndUnless\)},' .
+	\ '\${Select}:\${EndSelect},' .
+	\ '\${Switch}:\${EndSwitch},' .
+	\ '\${\%(Do\|DoWhile\|DoUntil\)}:\${\%(Loop\|LoopWhile\|LoopUntil\)},' .
+	\ '\${\%(For\|ForEach\)}:\${Next},' .
+	\ '\<Function\>:\<FunctionEnd\>,' .
+	\ '\<Section\>:\<SectionEnd\>,' .
+	\ '\<SectionGroup\>:\<SectionGroupEnd\>,' .
+	\ '\<PageEx\>:\<PageExEnd\>,' .
+	\ '\${MementoSection}:\${MementoSectionEnd},' .
+	\ '!if\%(\%(macro\)\?n\?def\)\?\>:!else\>:!endif\>,' .
+	\ '!macro\>:!macroend\>'
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/occam.vim b/ftplugin/occam.vim
new file mode 100644
index 000000000..c428c13b9
--- /dev/null
+++ b/ftplugin/occam.vim
@@ -0,0 +1,53 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'occam') == -1
+
+" Vim filetype plugin file
+" Language:	occam
+" Copyright:	Christian Jacobsen <clj3@kent.ac.uk>, Mario Schweigler <ms44@kent.ac.uk>
+" Maintainer:	Mario Schweigler <ms44@kent.ac.uk>
+" Last Change:	23 April 2003
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+let s:keepcpo= &cpo
+set cpo&vim
+
+"{{{  Indent settings
+" Set shift width for indent
+setlocal shiftwidth=2
+" Set the tab key size to two spaces
+setlocal softtabstop=2
+" Let tab keys always be expanded to spaces
+setlocal expandtab
+"}}}
+
+"{{{  Formatting
+" Break comment lines and insert comment leader in this case
+setlocal formatoptions-=t formatoptions+=cql
+setlocal comments+=:--
+" Maximum length of comments is 78
+setlocal textwidth=78
+"}}}
+
+"{{{  File browsing filters
+" Win32 can filter files in the browse dialog
+if has("gui_win32") && !exists("b:browsefilter")
+  let b:browsefilter = "All Occam Files (*.occ *.inc)\t*.occ;*.inc\n" .
+	\ "Occam Include Files (*.inc)\t*.inc\n" .
+	\ "Occam Source Files (*.occ)\t*.occ\n" .
+	\ "All Files (*.*)\t*.*\n"
+endif
+"}}}
+
+"{{{  Undo settings
+let b:undo_ftplugin = "setlocal shiftwidth< softtabstop< expandtab<"
+	\ . " formatoptions< comments< textwidth<"
+	\ . "| unlet! b:browsefiler"
+"}}}
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/ftplugin/pamconf.vim b/ftplugin/pamconf.vim
new file mode 100644
index 000000000..e8925de49
--- /dev/null
+++ b/ftplugin/pamconf.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pamconf') == -1
+
+" Vim filetype plugin file
+" Language:             pam(8) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/pascal.vim b/ftplugin/pascal.vim
new file mode 100644
index 000000000..f026da082
--- /dev/null
+++ b/ftplugin/pascal.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pascal') == -1
+
+" Vim filetype plugin file
+" Language:	pascal
+" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Changed: 11 Apr 2011
+" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+
+if exists("loaded_matchit")
+    let b:match_ignorecase = 1 " (pascal is case-insensitive)
+
+    let b:match_words = '\<\%(begin\|case\|record\|object\|try\)\>'
+    let b:match_words .= ':\<^\s*\%(except\|finally\)\>:\<end\>'
+    let b:match_words .= ',\<repeat\>:\<until\>'
+    let b:match_words .= ',\<if\>:\<else\>'
+endif
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "unlet! b:match_words"
+
+endif
diff --git a/ftplugin/passwd.vim b/ftplugin/passwd.vim
new file mode 100644
index 000000000..d13758720
--- /dev/null
+++ b/ftplugin/passwd.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'passwd') == -1
+
+" Vim filetype plugin file
+" Language:             passwd(5) password file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments= commentstring= formatoptions-=tcroq formatoptions+=l
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/pdf.vim b/ftplugin/pdf.vim
new file mode 100644
index 000000000..12dbc6038
--- /dev/null
+++ b/ftplugin/pdf.vim
@@ -0,0 +1,93 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pdf') == -1
+
+" Vim filetype plugin file
+" Language:	PDF
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
+" Last Change:	2007 Dec 16
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=%%s
+setlocal comments=:%
+let b:undo_ftplugin = "setlocal cms< com< | unlet! b:match_words"
+
+if exists("g:loaded_matchit")
+    let b:match_words = '\<\%(\d\+\s\+\d\+\s\+\)obj\>:\<endobj\>,\<stream$:\<endstream\>,\<xref\>:\<trailer\>,<<:>>'
+endif
+
+if exists("g:no_plugin_maps") || exists("g:no_pdf_maps") || v:version < 700
+    finish
+endif
+
+if !exists("b:pdf_tagstack")
+    let b:pdf_tagstack = []
+endif
+
+let b:undo_ftplugin .= " | silent! nunmap <buffer> <C-]> | silent! nunmap <buffer> <C-T>"
+nnoremap <silent><buffer> <C-]> :call <SID>Tag()<CR>
+" Inline, so the error from an empty tag stack will be simple.
+nnoremap <silent><buffer> <C-T> :if len(b:pdf_tagstack) > 0 <Bar> call setpos('.',remove(b:pdf_tagstack, -1)) <Bar> else <Bar> exe "norm! \<Lt>C-T>" <Bar> endif<CR>
+
+function! s:Tag()
+    call add(b:pdf_tagstack,getpos('.'))
+    if getline('.') =~ '^\d\+$' && getline(line('.')-1) == 'startxref'
+	return s:dodigits(getline('.'))
+    elseif getline('.') =~ '/Prev\s\+\d\+\>\%(\s\+\d\)\@!' && expand("<cword>") =~ '^\d\+$'
+	return s:dodigits(expand("<cword>"))
+    elseif getline('.') =~ '^\d\{10\} \d\{5\} '
+	return s:dodigits(matchstr(getline('.'),'^\d\+'))
+    else
+	let line = getline(".")
+	let lastend = 0
+	let pat = '\<\d\+\s\+\d\+\s\+R\>'
+	while lastend >= 0
+	    let beg = match(line,'\C'.pat,lastend)
+	    let end = matchend(line,'\C'.pat,lastend)
+	    if beg < col(".") && end >= col(".")
+		return s:doobject(matchstr(line,'\C'.pat,lastend))
+	    endif
+	    let lastend = end
+	endwhile
+	return s:notag()
+    endif
+endfunction
+
+function! s:doobject(string)
+    let first = matchstr(a:string,'^\s*\zs\d\+')
+    let second = matchstr(a:string,'^\s*\d\+\s\+\zs\d\+')
+    norm! m'
+    if first != '' && second != ''
+	let oldline = line('.')
+	let oldcol = col('.')
+	1
+	if !search('^\s*'.first.'\s\+'.second.'\s\+obj\>')
+	    exe oldline
+	    exe 'norm! '.oldcol.'|'
+	    return s:notag()
+	endif
+    endif
+endfunction
+
+function! s:dodigits(digits)
+    let digits = 0 + substitute(a:digits,'^0*','','')
+    norm! m'
+    if digits <= 0
+	norm! 1go
+    else
+	" Go one character before the destination and advance.  This method
+	" lands us after a newline rather than before, if that is our target.
+	exe "goto ".(digits)."|norm! 1 "
+    endif
+endfunction
+
+function! s:notag()
+    silent! call remove(b:pdf_tagstack,-1)
+    echohl ErrorMsg
+    echo "E426: tag not found"
+    echohl NONE
+endfunction
+
+endif
diff --git a/ftplugin/pinfo.vim b/ftplugin/pinfo.vim
new file mode 100644
index 000000000..1fbcab16f
--- /dev/null
+++ b/ftplugin/pinfo.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pinfo') == -1
+
+" Vim filetype plugin file
+" Language:             pinfo(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/postscr.vim b/ftplugin/postscr.vim
new file mode 100644
index 000000000..7730cdc87
--- /dev/null
+++ b/ftplugin/postscr.vim
@@ -0,0 +1,42 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'postscr') == -1
+
+" Vim filetype plugin file
+" Language:	PostScript
+" Maintainer:	Mike Williams <mrw@eandem.co.uk>
+" Last Change:  24th April 2012
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" PS comment formatting
+setlocal comments=b:%
+setlocal formatoptions-=t formatoptions+=rol
+
+" Define patterns for the matchit macro
+if !exists("b:match_words")
+  let b:match_ignorecase = 0
+  let b:match_words = '<<:>>,\<begin\>:\<end\>,\<save\>:\<restore\>,\<gsave\>:\<grestore\>'
+endif
+
+" Define patterns for the browse file filter
+if has("gui_win32") && !exists("b:browsefilter")
+  let b:browsefilter = "PostScript Files (*.ps)\t*.ps\n" .
+    \ "EPS Files (*.eps)\t*.eps\n" .
+    \ "All Files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setlocal comments< formatoptions<"
+    \ . "| unlet! b:browsefiler b:match_ignorecase b:match_words"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/procmail.vim b/ftplugin/procmail.vim
new file mode 100644
index 000000000..7bc335d75
--- /dev/null
+++ b/ftplugin/procmail.vim
@@ -0,0 +1,25 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'procmail') == -1
+
+" Vim filetype plugin file
+" Language:             procmail(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< inc< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &l:include = '^\s*INCLUDERC\>'
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/protocols.vim b/ftplugin/protocols.vim
new file mode 100644
index 000000000..293bc6c27
--- /dev/null
+++ b/ftplugin/protocols.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protocols') == -1
+
+" Vim filetype plugin file
+" Language:             protocols(5) - Internet protocols definition file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/pyrex.vim b/ftplugin/pyrex.vim
new file mode 100644
index 000000000..62b8e2ae7
--- /dev/null
+++ b/ftplugin/pyrex.vim
@@ -0,0 +1,31 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pyrex') == -1
+
+" Vim filetype plugin file
+" Language:	Pyrex
+" Maintainer:	Marco Barisione <marco.bari@people.it>
+" URL:		http://marcobari.altervista.org/pyrex_vim.html
+" Last Change:	2012 May 18
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+" Behaves just like Python
+runtime! ftplugin/python.vim ftplugin/python_*.vim ftplugin/python/*.vim
+
+if has("gui_win32") && exists("b:browsefilter")
+    let  b:browsefilter = "Pyrex files (*.pyx,*.pxd)\t*.pyx;*.pxd\n" .
+			\ "Python Files (*.py)\t*.py\n" .
+			\ "C Source Files (*.c)\t*.c\n" .
+			\ "C Header Files (*.h)\t*.h\n" .
+			\ "C++ Source Files (*.cpp *.c++)\t*.cpp;*.c++\n" .
+			\ "All Files (*.*)\t*.*\n"
+endif
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/ftplugin/quake.vim b/ftplugin/quake.vim
new file mode 100644
index 000000000..bab3eca14
--- /dev/null
+++ b/ftplugin/quake.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'quake') == -1
+
+" Vim filetype plugin file
+" Language:             Quake[1-3] configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:// commentstring=//\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/readline.vim b/ftplugin/readline.vim
new file mode 100644
index 000000000..042f4b6bb
--- /dev/null
+++ b/ftplugin/readline.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'readline') == -1
+
+" Vim filetype plugin file
+" Language:             readline(3) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/reva.vim b/ftplugin/reva.vim
new file mode 100644
index 000000000..5fe5f59f1
--- /dev/null
+++ b/ftplugin/reva.vim
@@ -0,0 +1,29 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reva') == -1
+
+" Vim ftplugin file
+" Language:	Reva Forth
+" Version:	7.1
+" Last Change:	2008/01/11
+" Maintainer:	Ron Aaron <ron@ronware.org>
+" URL:		http://ronware.org/reva/
+" Filetypes:	*.rf *.frt 
+" NOTE: 	Forth allows any non-whitespace in a name, so you need to do:
+" 		setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
+"
+" 		This goes with the syntax/reva.vim file.
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+ finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+setlocal sts=4 sw=4 
+setlocal com=s1:/*,mb:*,ex:*/,:\|,:\\
+setlocal fo=tcrqol
+setlocal matchpairs+=\::;
+setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
+
+endif
diff --git a/ftplugin/rmd.vim b/ftplugin/rmd.vim
new file mode 100644
index 000000000..32fcc9618
--- /dev/null
+++ b/ftplugin/rmd.vim
@@ -0,0 +1,67 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rmd') == -1
+
+" Vim filetype plugin file
+" Language: R Markdown file
+" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Sun Jul 22, 2018  06:51PM
+" Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann)
+
+" Only do this when not yet done for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+if exists('g:rmd_include_html') && g:rmd_include_html
+  runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
+endif
+
+setlocal comments=fb:*,fb:-,fb:+,n:>
+setlocal commentstring=#\ %s
+setlocal formatoptions+=tcqln
+setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+
+setlocal iskeyword=@,48-57,_,.
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+function! FormatRmd()
+  if search("^[ \t]*```[ ]*{r", "bncW") > search("^[ \t]*```$", "bncW")
+    setlocal comments=:#',:###,:##,:#
+  else
+    setlocal comments=fb:*,fb:-,fb:+,n:>
+  endif
+  return 1
+endfunction
+
+" If you do not want 'comments' dynamically defined, put in your vimrc:
+" let g:rmd_dynamic_comments = 0
+if !exists("g:rmd_dynamic_comments") || (exists("g:rmd_dynamic_comments") && g:rmd_dynamic_comments == 1)
+  setlocal formatexpr=FormatRmd()
+endif
+
+
+" Enables pandoc if it is installed
+unlet! b:did_ftplugin
+runtime ftplugin/pandoc.vim
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+if has("gui_win32") && !exists("b:browsefilter")
+  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
+        \ "All Files (*.*)\t*.*\n"
+endif
+
+if exists('b:undo_ftplugin')
+  let b:undo_ftplugin .= " | setl cms< com< fo< flp< isk< | unlet! b:browsefilter"
+else
+  let b:undo_ftplugin = "setl cms< com< fo< flp< isk< | unlet! b:browsefilter"
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: sw=2
+
+endif
diff --git a/ftplugin/rnc.vim b/ftplugin/rnc.vim
new file mode 100644
index 000000000..78f30817e
--- /dev/null
+++ b/ftplugin/rnc.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnc') == -1
+
+" Vim filetype plugin file
+" Language:             Relax NG compact syntax
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/rnoweb.vim b/ftplugin/rnoweb.vim
new file mode 100644
index 000000000..1253c4511
--- /dev/null
+++ b/ftplugin/rnoweb.vim
@@ -0,0 +1,45 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnoweb') == -1
+
+" Vim filetype plugin file
+" Language: Rnoweb
+" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Tue Apr 07, 2015  04:37PM
+
+" Only do this when not yet done for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+runtime! ftplugin/tex.vim
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+" Enables Vim-Latex-Suite, LaTeX-Box if installed
+runtime ftplugin/tex_*.vim
+
+setlocal iskeyword=@,48-57,_,.
+setlocal suffixesadd=.bib,.tex
+setlocal comments=b:%,b:#,b:##,b:###,b:#'
+
+if has("gui_win32") && !exists("b:browsefilter")
+  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
+        \ "All Files (*.*)\t*.*\n"
+endif
+
+if exists('b:undo_ftplugin')
+  let b:undo_ftplugin .= " | setl isk< sua< com< | unlet! b:browsefilter"
+else
+  let b:undo_ftplugin = "setl isk< sua< com< | unlet! b:browsefilter"
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: sw=2
+
+endif
diff --git a/ftplugin/rpl.vim b/ftplugin/rpl.vim
new file mode 100644
index 000000000..cc24fffd0
--- /dev/null
+++ b/ftplugin/rpl.vim
@@ -0,0 +1,26 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
+
+" Vim filetype plugin file
+" Language:     RPL/2
+" Maintainer:   Jo�l BERTRAND <rpl2@free.fr>
+" Last Change:	2012 Mar 07
+" Version: 		0.1
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" and insert the comment leader when hitting <CR> or using "o".
+setlocal fo-=t fo+=croql
+
+" Set 'comments' to format dashed lists in comments.
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+
+let b:undo_ftplugin = "setlocal fo< comments<"
+
+endif
diff --git a/ftplugin/rrst.vim b/ftplugin/rrst.vim
new file mode 100644
index 000000000..7ddc0fc77
--- /dev/null
+++ b/ftplugin/rrst.vim
@@ -0,0 +1,58 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rrst') == -1
+
+" Vim filetype plugin file
+" Language: reStructuredText documentation format with R code
+" Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Wed Nov 01, 2017  10:47PM
+" Original work by Alex Zvoleff
+
+" Only do this when not yet done for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=fb:*,fb:-,fb:+,n:>
+setlocal commentstring=#\ %s
+setlocal formatoptions+=tcqln
+setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+
+setlocal iskeyword=@,48-57,_,.
+
+function! FormatRrst()
+  if search('^\.\. {r', "bncW") > search('^\.\. \.\.$', "bncW")
+    setlocal comments=:#',:###,:##,:#
+  else
+    setlocal comments=fb:*,fb:-,fb:+,n:>
+  endif
+  return 1
+endfunction
+
+" If you do not want 'comments' dynamically defined, put in your vimrc:
+" let g:rrst_dynamic_comments = 0
+if !exists("g:rrst_dynamic_comments") || (exists("g:rrst_dynamic_comments") && g:rrst_dynamic_comments == 1)
+  setlocal formatexpr=FormatRrst()
+endif
+
+if has("gui_win32") && !exists("b:browsefilter")
+  let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
+        \ "All Files (*.*)\t*.*\n"
+endif
+
+if exists('b:undo_ftplugin')
+  let b:undo_ftplugin .= " | setl cms< com< fo< flp< isk< | unlet! b:browsefilter"
+else
+  let b:undo_ftplugin = "setl cms< com< fo< flp< isk< | unlet! b:browsefilter"
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: sw=2
+
+endif
diff --git a/ftplugin/sass.vim b/ftplugin/sass.vim
new file mode 100644
index 000000000..d13a9e185
--- /dev/null
+++ b/ftplugin/sass.vim
@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
+
+" Vim filetype plugin
+" Language:	Sass
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Last Change:	2019 Dec 05
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< def< inc< inex< ofu< sua<"
+
+setlocal comments=://
+setlocal commentstring=//\ %s
+setlocal includeexpr=SassIncludeExpr(v:fname)
+setlocal omnifunc=csscomplete#CompleteCSS
+setlocal suffixesadd=.sass,.scss,.css
+if &filetype =~# '\<s[ac]ss]\>'
+  setlocal iskeyword+=-
+  setlocal iskeyword+=$
+  setlocal iskeyword+=%
+  let b:undo_ftplugin .= ' isk<'
+endif
+
+let &l:define = '^\C\v\s*%(\@function|\@mixin|\=)|^\s*%(\$[[:alnum:]-]+:|[%.][:alnum:]-]+\s*%(\{|$))@='
+let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\='
+
+function! SassIncludeExpr(file) abort
+  let partial = substitute(a:file, '\%(.*/\|^\)\zs', '_', '')
+  if !empty(findfile(partial))
+    return partial
+  endif
+  return a:file
+endfunction
+
+" vim:set sw=2:
+
+endif
diff --git a/ftplugin/scheme.vim b/ftplugin/scheme.vim
new file mode 100644
index 000000000..e79efe7e6
--- /dev/null
+++ b/ftplugin/scheme.vim
@@ -0,0 +1,61 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scheme') == -1
+
+" Vim filetype plugin file
+" Language: Scheme (R7RS)
+" Last Change: 2019 Nov 18
+" Author: Evan Hanson <evhan@foldling.org>
+" Maintainer: Evan Hanson <evhan@foldling.org>
+" Previous Maintainer: Sergey Khorev <sergey.khorev@gmail.com>
+" URL: https://foldling.org/vim/ftplugin/scheme.vim
+
+if exists('b:did_ftplugin')
+  finish
+endif
+
+let s:cpo = &cpo
+set cpo&vim
+
+setl lisp
+setl comments=:;;;;,:;;;,:;;,:;,sr:#\|,mb:\|,ex:\|#
+setl commentstring=;%s
+setl define=^\\s*(def\\k*
+setl iskeyword=33,35-39,42-43,45-58,60-90,94,95,97-122,126
+
+let b:undo_ftplugin = 'setl lisp< comments< commentstring< define< iskeyword<'
+
+setl lispwords+=case
+setl lispwords+=define
+setl lispwords+=define-record-type
+setl lispwords+=define-syntax
+setl lispwords+=define-values
+setl lispwords+=do
+setl lispwords+=guard
+setl lispwords+=lambda
+setl lispwords+=let
+setl lispwords+=let*
+setl lispwords+=let*-values
+setl lispwords+=let-syntax
+setl lispwords+=let-values
+setl lispwords+=letrec
+setl lispwords+=letrec*
+setl lispwords+=letrec-syntax
+setl lispwords+=parameterize
+setl lispwords+=set!
+setl lispwords+=syntax-rules
+setl lispwords+=unless
+setl lispwords+=when
+
+let b:undo_ftplugin = b:undo_ftplugin . ' lispwords<'
+
+let b:did_scheme_ftplugin = 1
+
+if exists('b:is_chicken') || exists('g:is_chicken')
+  exe 'ru! ftplugin/chicken.vim'
+endif
+
+unlet b:did_scheme_ftplugin
+let b:did_ftplugin = 1
+let &cpo = s:cpo
+unlet s:cpo
+
+endif
diff --git a/ftplugin/screen.vim b/ftplugin/screen.vim
new file mode 100644
index 000000000..ecd1f5acc
--- /dev/null
+++ b/ftplugin/screen.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'screen') == -1
+
+" Vim filetype plugin file
+" Language:             screen(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/sensors.vim b/ftplugin/sensors.vim
new file mode 100644
index 000000000..bdf1ea91a
--- /dev/null
+++ b/ftplugin/sensors.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensors') == -1
+
+" Vim filetype plugin file
+" Language:             sensors.conf(5) - libsensors configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/services.vim b/ftplugin/services.vim
new file mode 100644
index 000000000..c676b8a77
--- /dev/null
+++ b/ftplugin/services.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'services') == -1
+
+" Vim filetype plugin file
+" Language:             services(5) - Internet network services list
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/setserial.vim b/ftplugin/setserial.vim
new file mode 100644
index 000000000..270f2e0fa
--- /dev/null
+++ b/ftplugin/setserial.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'setserial') == -1
+
+" Vim filetype plugin file
+" Language:             setserial(8) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/sieve.vim b/ftplugin/sieve.vim
new file mode 100644
index 000000000..e14eadf46
--- /dev/null
+++ b/ftplugin/sieve.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sieve') == -1
+
+" Vim filetype plugin file
+" Language:             Sieve filtering language input file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=s1:/*,mb:*,ex:*/,:# commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/slpconf.vim b/ftplugin/slpconf.vim
new file mode 100644
index 000000000..c03df0c1e
--- /dev/null
+++ b/ftplugin/slpconf.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpconf') == -1
+
+" Vim filetype plugin file
+" Language:             RFC 2614 - An API for Service Location configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:#,:; commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/slpreg.vim b/ftplugin/slpreg.vim
new file mode 100644
index 000000000..5e6bcfebc
--- /dev/null
+++ b/ftplugin/slpreg.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpreg') == -1
+
+" Vim filetype plugin file
+" Language:             RFC 2614 - An API for Service Location registration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:#,:; commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/slpspi.vim b/ftplugin/slpspi.vim
new file mode 100644
index 000000000..1e253e1f9
--- /dev/null
+++ b/ftplugin/slpspi.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpspi') == -1
+
+" Vim filetype plugin file
+" Language:             RFC 2614 - An API for Service Location SPI file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:#,:; commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/spec.vim b/ftplugin/spec.vim
new file mode 100644
index 000000000..cf93a223c
--- /dev/null
+++ b/ftplugin/spec.vim
@@ -0,0 +1,212 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spec') == -1
+
+" Plugin to update the %changelog section of RPM spec files
+" Filename: spec.vim
+" Maintainer: Igor Gnatenko i.gnatenko.brain@gmail.com
+" Former Maintainer: Gustavo Niemeyer <niemeyer@conectiva.com> (until March 2014)
+" Last Change: Mon Jun 01 21:15 MSK 2015 Igor Gnatenko
+
+if exists("b:did_ftplugin")
+	finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if !exists("no_plugin_maps") && !exists("no_spec_maps")
+	if !hasmapto("<Plug>SpecChangelog")
+		map <buffer> <LocalLeader>c <Plug>SpecChangelog
+	endif
+endif
+
+if !hasmapto("call <SID>SpecChangelog(\"\")<CR>")
+       noremap <buffer> <unique> <script> <Plug>SpecChangelog :call <SID>SpecChangelog("")<CR>
+endif
+
+if !exists("*s:GetRelVer")
+	function! s:GetRelVer()
+		if has('python')
+python << PYEND
+import sys, datetime, shutil, tempfile
+import vim
+
+try:
+    import rpm
+except ImportError:
+    pass
+else:
+    specfile = vim.current.buffer.name
+    if specfile:
+        rpm.delMacro("dist")
+        spec = rpm.spec(specfile)
+        headers = spec.sourceHeader
+        version = headers["Version"]
+        release = headers["Release"]
+        vim.command("let ver = " + version)
+        vim.command("let rel = " + release)
+PYEND
+		endif
+	endfunction
+endif
+
+if !exists("*s:SpecChangelog")
+	function s:SpecChangelog(format)
+		if strlen(a:format) == 0
+			if !exists("g:spec_chglog_format")
+				let email = input("Name <email address>: ")
+				let g:spec_chglog_format = "%a %b %d %Y " . l:email
+				echo "\r"
+			endif
+			let format = g:spec_chglog_format
+		else
+			if !exists("g:spec_chglog_format")
+				let g:spec_chglog_format = a:format
+			endif
+			let format = a:format
+		endif
+		let line = 0
+		let name = ""
+		let ver = ""
+		let rel = ""
+		let nameline = -1
+		let verline = -1
+		let relline = -1
+		let chgline = -1
+		while (line <= line("$"))
+			let linestr = getline(line)
+			if (name == "" && linestr =~? '^Name:')
+				let nameline = line
+				let name = substitute(strpart(linestr,5), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
+			elseif (ver == "" && linestr =~? '^Version:')
+				let verline = line
+				let ver = substitute(strpart(linestr,8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
+			elseif (rel == "" && linestr =~? '^Release:')
+				let relline = line
+				let rel = substitute(strpart(linestr,8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
+			elseif (linestr =~? '^%changelog')
+				let chgline = line
+				execute line
+				break
+			endif
+			let line = line+1
+		endwhile
+		if (nameline != -1 && verline != -1 && relline != -1)
+			let include_release_info = exists("g:spec_chglog_release_info")
+			let name = s:ParseRpmVars(name, nameline)
+			let ver = s:ParseRpmVars(ver, verline)
+			let rel = s:ParseRpmVars(rel, relline)
+		else
+			let include_release_info = 0
+		endif
+
+		call s:GetRelVer()
+
+		if (chgline == -1)
+			let option = confirm("Can't find %changelog. Create one? ","&End of file\n&Here\n&Cancel",3)
+			if (option == 1)
+				call append(line("$"),"")
+				call append(line("$"),"%changelog")
+				execute line("$")
+				let chgline = line(".")
+			elseif (option == 2)
+				call append(line("."),"%changelog")
+				normal j
+				chgline = line(".")
+			endif
+		endif
+		if (chgline != -1)
+			let tmptime = v:lc_time
+			language time C
+			let parsed_format = "* ".strftime(format)." - ".ver."-".rel
+			execute "language time" tmptime
+			let release_info = "+ ".name."-".ver."-".rel
+			let wrong_format = 0
+			let wrong_release = 0
+			let insert_line = 0
+			if (getline(chgline+1) != parsed_format)
+				let wrong_format = 1
+			endif
+			if (include_release_info && getline(chgline+2) != release_info)
+				let wrong_release = 1
+			endif
+			if (wrong_format || wrong_release)
+				if (include_release_info && !wrong_release && !exists("g:spec_chglog_never_increase_release"))
+					let option = confirm("Increase release? ","&Yes\n&No",1)
+					if (option == 1)
+						execute relline
+						normal 

+						let rel = substitute(strpart(getline(relline),8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
+						let release_info = "+ ".name."-".ver."-".rel
+					endif
+				endif
+				let n = 0
+				call append(chgline+n, parsed_format)
+				if include_release_info
+					let n = n + 1
+					call append(chgline+n, release_info)
+				endif
+				let n = n + 1
+				call append(chgline+n,"- ")
+				let n = n + 1
+				call append(chgline+n,"")
+				let insert_line = chgline+n
+			else
+				let line = chgline
+				if !exists("g:spec_chglog_prepend")
+					while !(getline(line+2) =~ '^\( *\|\*.*\)$')
+						let line = line+1
+					endwhile
+				endif
+				call append(line+1,"- ")
+				let insert_line = line+2
+			endif
+			execute insert_line
+			startinsert!
+		endif
+	endfunction
+endif
+
+if !exists("*s:ParseRpmVars")
+    function s:ParseRpmVars(str, strline)
+	let end = -1
+	let ret = ""
+	while (1)
+		let start = match(a:str, "\%{", end+1)
+		if (start == -1)
+			let ret = ret . strpart(a:str, end+1)
+			break
+		endif
+		let ret = ret . strpart(a:str, end+1, start-(end+1))
+		let end = match(a:str, "}", start)
+		if (end == -1)
+			let ret = ret . strpart(a:str, start)
+			break
+		endif
+		let varname = strpart(a:str, start+2, end-(start+2))
+		execute a:strline
+		let definestr = "^[ \t]*%\\(define\\|global\\)[ \t]\\+".varname."[ \t]\\+\\(.*\\)$"
+		let linenum = search(definestr, "bW")
+		if (linenum != 0)
+			let ret = ret .  substitute(getline(linenum), definestr, "\\2", "")
+		endif
+	endwhile
+	return ret
+    endfunction
+endif
+
+" The following lines, along with the macros/matchit.vim plugin,
+" make it easy to navigate the different sections of a spec file
+" with the % key (thanks to Max Ischenko).
+
+let b:match_ignorecase = 0
+let b:match_words =
+  \ '^Name:^%description:^%clean:^%(?:auto)?setup:^%build:^%install:^%files:' .
+  \ '^%package:^%preun:^%postun:^%changelog'
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+let b:undo_ftplugin = "unlet! b:match_ignorecase b:match_words"
+
+endif
diff --git a/ftplugin/sshconfig.vim b/ftplugin/sshconfig.vim
new file mode 100644
index 000000000..3233a591a
--- /dev/null
+++ b/ftplugin/sshconfig.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshconfig') == -1
+
+" Vim filetype plugin file
+" Language:             OpenSSH client configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/sudoers.vim b/ftplugin/sudoers.vim
new file mode 100644
index 000000000..61a5f708d
--- /dev/null
+++ b/ftplugin/sudoers.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sudoers') == -1
+
+" Vim filetype plugin file
+" Language:             sudoers(5) configuration files
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/swiftgyb.vim b/ftplugin/swiftgyb.vim
new file mode 100644
index 000000000..a8f2ebcf0
--- /dev/null
+++ b/ftplugin/swiftgyb.vim
@@ -0,0 +1,15 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swiftgyb') == -1
+
+" This source file is part of the Swift.org open source project
+"
+" Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+" Licensed under Apache License v2.0 with Runtime Library Exception
+"
+" See https://swift.org/LICENSE.txt for license information
+" See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+"
+" Vim maintainer: Emir SARI <bitigchi@me.com>
+
+runtime! ftplugin/swift.vim
+
+endif
diff --git a/ftplugin/sysctl.vim b/ftplugin/sysctl.vim
new file mode 100644
index 000000000..7288f0207
--- /dev/null
+++ b/ftplugin/sysctl.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sysctl') == -1
+
+" Vim filetype plugin file
+" Language:             sysctl.conf(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:;,:# commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/systemverilog.vim b/ftplugin/systemverilog.vim
new file mode 100644
index 000000000..49502bfab
--- /dev/null
+++ b/ftplugin/systemverilog.vim
@@ -0,0 +1,15 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemverilog') == -1
+
+" Vim filetype plugin file
+" Language:    SystemVerilog
+" Maintainer:  kocha <kocha.lsifrontend@gmail.com>
+" Last Change: 12-Aug-2013. 
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Behaves just like Verilog
+runtime! ftplugin/verilog.vim
+
+endif
diff --git a/ftplugin/tcl.vim b/ftplugin/tcl.vim
new file mode 100644
index 000000000..d9bd25c26
--- /dev/null
+++ b/ftplugin/tcl.vim
@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
+
+" Vim filetype plugin file
+" Language:         Tcl
+" Maintainer:       Robert L Hicks <sigzero@gmail.com>
+" Latest Revision:  2009-05-01
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+" Make sure the continuation lines below do not cause problems in
+" compatibility mode.
+let s:cpo_save = &cpo
+set cpo-=C
+
+setlocal comments=:#
+setlocal commentstring=#%s
+setlocal formatoptions+=croql
+
+" Change the browse dialog on Windows to show mainly Tcl-related files
+if has("gui_win32")
+    let b:browsefilter = "Tcl Source Files (.tcl)\t*.tcl\n" .
+                \ "Tcl Test Files (.test)\t*.test\n" .
+                \ "All Files (*.*)\t*.*\n"
+endif
+
+"-----------------------------------------------------------------------------
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< kp<" .
+	    \	      " | unlet! b:browsefilter"
+
+" Restore the saved compatibility options.
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: set et ts=4 sw=4 tw=78:
+
+endif
diff --git a/ftplugin/terminfo.vim b/ftplugin/terminfo.vim
new file mode 100644
index 000000000..6466f3c6e
--- /dev/null
+++ b/ftplugin/terminfo.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terminfo') == -1
+
+" Vim filetype plugin file
+" Language:             terminfo(5) definition
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/tex.vim b/ftplugin/tex.vim
new file mode 100644
index 000000000..4890dba3a
--- /dev/null
+++ b/ftplugin/tex.vim
@@ -0,0 +1,50 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
+
+" LaTeX filetype plugin
+" Language:     LaTeX (ft=tex)
+" Maintainer:   Benji Fisher, Ph.D. <benji@member.AMS.org>
+" Version:	1.4
+" Last Change:	Wed 19 Apr 2006
+"  URL:		http://www.vim.org/script.php?script_id=411
+
+" Only do this when not done yet for this buffer.
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Start with plain TeX.  This will also define b:did_ftplugin .
+source $VIMRUNTIME/ftplugin/plaintex.vim
+
+" Avoid problems if running in 'compatible' mode.
+let s:save_cpo = &cpo
+set cpo&vim
+
+let b:undo_ftplugin .= "| setl inex<"
+
+" Allow "[d" to be used to find a macro definition:
+" Recognize plain TeX \def as well as LaTeX \newcommand and \renewcommand .
+" I may as well add the AMS-LaTeX DeclareMathOperator as well.
+let &l:define .= '\|\\\(re\)\=new\(boolean\|command\|counter\|environment\|font'
+	\ . '\|if\|length\|savebox\|theorem\(style\)\=\)\s*\*\=\s*{\='
+	\ . '\|DeclareMathOperator\s*{\=\s*'
+
+" Tell Vim how to recognize LaTeX \include{foo} and plain \input bar :
+let &l:include .= '\|\\include{'
+" On some file systems, "{" and "}" are inluded in 'isfname'.  In case the
+" TeX file has \include{fname} (LaTeX only), strip everything except "fname".
+let &l:includeexpr = "substitute(v:fname, '^.\\{-}{\\|}.*', '', 'g')"
+
+" The following lines enable the macros/matchit.vim plugin for
+" extended matching with the % key.
+" ftplugin/plaintex.vim already defines b:match_skip and b:match_ignorecase
+" and matches \(, \), \[, \], \{, and \} .
+if exists("loaded_matchit")
+  let b:match_words .= ',\\begin\s*\({\a\+\*\=}\):\\end\s*\1'
+endif " exists("loaded_matchit")
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:sts=2:sw=2:
+
+endif
diff --git a/ftplugin/text.vim b/ftplugin/text.vim
new file mode 100644
index 000000000..8dcebd6db
--- /dev/null
+++ b/ftplugin/text.vim
@@ -0,0 +1,22 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'text') == -1
+
+" Vim filetype plugin
+" Language:		Text
+" Maintainer:		David Barnett <daviebdawg+vim@gmail.com>
+" Last Change:		2019 Jan 10
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = 'setlocal comments< commentstring<'
+
+" We intentionally don't set formatoptions-=t since text should wrap as text.
+
+" Pseudo comment leaders to indent bulleted lists with '-' and '*'.  And allow
+" for Mail quoted text with '>'.
+setlocal comments=fb:-,fb:*,n:>
+setlocal commentstring=
+
+endif
diff --git a/ftplugin/treetop.vim b/ftplugin/treetop.vim
new file mode 100644
index 000000000..59376a3b8
--- /dev/null
+++ b/ftplugin/treetop.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'treetop') == -1
+
+" Vim filetype plugin file
+" Language:             Treetop
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2011-03-14
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=b:# commentstring=#\ %s formatoptions-=tcroq formatoptions+=l
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/udevconf.vim b/ftplugin/udevconf.vim
new file mode 100644
index 000000000..2e706fd16
--- /dev/null
+++ b/ftplugin/udevconf.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'udevconf') == -1
+
+" Vim filetype plugin file
+" Language:             udev(8) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/udevperm.vim b/ftplugin/udevperm.vim
new file mode 100644
index 000000000..26616d829
--- /dev/null
+++ b/ftplugin/udevperm.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'udevperm') == -1
+
+" Vim filetype plugin file
+" Language:             udev(8) permissions file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/updatedb.vim b/ftplugin/updatedb.vim
new file mode 100644
index 000000000..69f4c712d
--- /dev/null
+++ b/ftplugin/updatedb.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'updatedb') == -1
+
+" Vim filetype plugin file
+" Language:             updatedb.conf(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/verilog.vim b/ftplugin/verilog.vim
new file mode 100644
index 000000000..dd3805251
--- /dev/null
+++ b/ftplugin/verilog.vim
@@ -0,0 +1,70 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilog') == -1
+
+" Vim filetype plugin file
+" Language:	Verilog HDL
+" Maintainer:	Chih-Tsun Huang <cthuang@cs.nthu.edu.tw>
+" Last Change:	2017 Aug 25 by Chih-Tsun Huang
+" URL:	    	http://www.cs.nthu.edu.tw/~cthuang/vim/ftplugin/verilog.vim
+"
+" Credits:
+"   Suggestions for improvement, bug reports by
+"     Shao <shaominghai2005@163.com>
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+" Set 'cpoptions' to allow line continuations
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Undo the plugin effect
+let b:undo_ftplugin = "setlocal fo< com< tw<"
+    \ . "| unlet! b:browsefilter b:match_ignorecase b:match_words"
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" and insert the comment leader when hitting <CR> or using "o".
+setlocal fo-=t fo+=croqlm1
+
+" Set 'comments' to format dashed lists in comments.
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+
+" Format comments to be up to 78 characters long
+if &textwidth == 0 
+  setlocal tw=78
+endif
+
+" Win32 can filter files in the browse dialog
+if has("gui_win32") && !exists("b:browsefilter")
+  let b:browsefilter = "Verilog Source Files (*.v)\t*.v\n" .
+	\ "All Files (*.*)\t*.*\n"
+endif
+
+" Let the matchit plugin know what items can be matched.
+if exists("loaded_matchit")
+  let b:match_ignorecase=0
+  let b:match_words=
+    \ '\<begin\>:\<end\>,' .
+    \ '\<case\>\|\<casex\>\|\<casez\>:\<endcase\>,' .
+    \ '\<module\>:\<endmodule\>,' .
+    \ '\<if\>:`\@<!\<else\>,' .
+    \ '\<function\>:\<endfunction\>,' .
+    \ '`ifn\?def\>:`elsif\>:`else\>:`endif\>,' .
+    \ '\<task\>:\<endtask\>,' .
+    \ '\<specify\>:\<endspecify\>,' .
+    \ '\<config\>:\<endconfig\>,' .
+    \ '\<generate\>:\<endgenerate\>,' .
+    \ '\<fork\>:\<join\>,' .
+    \ '\<primitive\>:\<endprimitive\>,' .
+    \ '\<table\>:\<endtable\>'
+endif
+
+" Reset 'cpoptions' back to the user's setting
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/vhdl.vim b/ftplugin/vhdl.vim
new file mode 100644
index 000000000..55490ffbc
--- /dev/null
+++ b/ftplugin/vhdl.vim
@@ -0,0 +1,92 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vhdl') == -1
+
+" VHDL filetype plugin
+" Language:    VHDL
+" Maintainer:  R.Shankar <shankar.pec?gmail.com>
+" Modified By: Gerald Lai <laigera+vim?gmail.com>
+" Last Change: 2011 Dec 11
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" and insert the comment leader when hitting <CR> or using "o".
+"setlocal fo-=t fo+=croqlm1
+
+" Set 'comments' to format dashed lists in comments.
+"setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+
+" Format comments to be up to 78 characters long
+"setlocal tw=75
+
+" Win32 can filter files in the browse dialog
+"if has("gui_win32") && !exists("b:browsefilter")
+"  let b:browsefilter = "Verilog Source Files (*.v)\t*.v\n" .
+"   \ "All Files (*.*)\t*.*\n"
+"endif
+
+" Let the matchit plugin know what items can be matched.
+if ! exists("b:match_words")  &&  exists("loaded_matchit")
+  let b:match_ignorecase=1
+  let s:notend = '\%(\<end\s\+\)\@<!'
+  let b:match_words =
+    \ s:notend.'\<if\>:\<elsif\>:\<else\>:\<end\s\+if\>,'.
+    \ s:notend.'\<case\>:\<when\>:\<end\s\+case\>,'.
+    \ s:notend.'\<loop\>:\<end\s\+loop\>,'.
+    \ s:notend.'\<for\>:\<end\s\+for\>,'.
+    \ s:notend.'\<generate\>:\<end\s\+generate\>,'.
+    \ s:notend.'\<record\>:\<end\s\+record\>,'.
+    \ s:notend.'\<units\>:\<end\s\+units\>,'.
+    \ s:notend.'\<process\>:\<end\s\+process\>,'.
+    \ s:notend.'\<block\>:\<end\s\+block\>,'.
+    \ s:notend.'\<function\>:\<end\s\+function\>,'.
+    \ s:notend.'\<entity\>:\<end\s\+entity\>,'.
+    \ s:notend.'\<component\>:\<end\s\+component\>,'.
+    \ s:notend.'\<architecture\>:\<end\s\+architecture\>,'.
+    \ s:notend.'\<package\>:\<end\s\+package\>,'.
+    \ s:notend.'\<procedure\>:\<end\s\+procedure\>,'.
+    \ s:notend.'\<configuration\>:\<end\s\+configuration\>'
+endif
+
+" count repeat
+function! <SID>CountWrapper(cmd)
+  let i = v:count1
+  if a:cmd[0] == ":"
+    while i > 0
+      execute a:cmd
+      let i = i - 1
+    endwhile
+  else
+    execute "normal! gv\<Esc>"
+    execute "normal ".i.a:cmd
+    let curcol = col(".")
+    let curline = line(".")
+    normal! gv
+    call cursor(curline, curcol)
+  endif
+endfunction
+
+" explore motion
+" keywords: "architecture", "block", "configuration", "component", "entity", "function", "package", "procedure", "process", "record", "units"
+let b:vhdl_explore = '\%(architecture\|block\|configuration\|component\|entity\|function\|package\|procedure\|process\|record\|units\)'
+noremap  <buffer><silent>[[ :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\%(\\<end\\s\\+\\)\\@<!\\<".b:vhdl_explore."\\>\\c\\<Bar>\\%^","bW")')<CR>
+noremap  <buffer><silent>]] :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\%(\\<end\\s\\+\\)\\@<!\\<".b:vhdl_explore."\\>\\c\\<Bar>\\%$","W")')<CR>
+noremap  <buffer><silent>[] :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\<end\\s\\+".b:vhdl_explore."\\>\\c\\<Bar>\\%^","bW")')<CR>
+noremap  <buffer><silent>][ :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\<end\\s\\+".b:vhdl_explore."\\>\\c\\<Bar>\\%$","W")')<CR>
+vnoremap <buffer><silent>[[ :<C-u>cal <SID>CountWrapper('[[')<CR>
+vnoremap <buffer><silent>]] :<C-u>cal <SID>CountWrapper(']]')<CR>
+vnoremap <buffer><silent>[] :<C-u>cal <SID>CountWrapper('[]')<CR>
+vnoremap <buffer><silent>][ :<C-u>cal <SID>CountWrapper('][')<CR>
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/vim.vim b/ftplugin/vim.vim
new file mode 100644
index 000000000..bf721a024
--- /dev/null
+++ b/ftplugin/vim.vim
@@ -0,0 +1,109 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vim') == -1
+
+" Vim filetype plugin
+" Language:	Vim
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2020 Aug 14
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if !exists('*VimFtpluginUndo')
+  func VimFtpluginUndo()
+    setl fo< isk< com< tw< commentstring<
+    if exists('b:did_add_maps')
+      silent! nunmap <buffer> [[
+      silent! vunmap <buffer> [[
+      silent! nunmap <buffer> ]]
+      silent! vunmap <buffer> ]]
+      silent! nunmap <buffer> []
+      silent! vunmap <buffer> []
+      silent! nunmap <buffer> ][
+      silent! vunmap <buffer> ][
+      silent! nunmap <buffer> ]"
+      silent! vunmap <buffer> ]"
+      silent! nunmap <buffer> ["
+      silent! vunmap <buffer> ["
+    endif
+    unlet! b:match_ignorecase b:match_words b:match_skip b:did_add_maps
+  endfunc
+endif
+
+let b:undo_ftplugin = "call VimFtpluginUndo()"
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" and insert the comment leader when hitting <CR> or using "o".
+setlocal fo-=t fo+=croql
+
+" To allow tag lookup via CTRL-] for autoload functions, '#' must be a
+" keyword character.  E.g., for netrw#Nread().
+setlocal isk+=#
+
+" Use :help to lookup the keyword under the cursor with K.
+setlocal keywordprg=:help
+
+" Set 'comments' to format dashed lists in comments
+" Avoid that #{} starts a comment.
+setlocal com=sO:\"\ -,mO:\"\ \ ,sO:#\ -,mO:#\ \ ,eO:##,:\",b:#
+
+" Format comments to be up to 78 characters long
+if &tw == 0
+  setlocal tw=78
+endif
+
+" Comments start with a double quote; in Vim9 script # would also work
+setlocal commentstring=\"%s
+
+if !exists("no_plugin_maps") && !exists("no_vim_maps")
+  let b:did_add_maps = 1
+
+  " Move around functions.
+  nnoremap <silent><buffer> [[ m':call search('^\s*\(fu\%[nction]\\|def\)\>', "bW")<CR>
+  vnoremap <silent><buffer> [[ m':<C-U>exe "normal! gv"<Bar>call search('^\s*\(fu\%[nction]\\|def\)\>', "bW")<CR>
+  nnoremap <silent><buffer> ]] m':call search('^\s*\(fu\%[nction]\\|def\)\>', "W")<CR>
+  vnoremap <silent><buffer> ]] m':<C-U>exe "normal! gv"<Bar>call search('^\s*\(fu\%[nction]\\|def\)\>', "W")<CR>
+  nnoremap <silent><buffer> [] m':call search('^\s*end\(f\%[unction]\\|def\)\>', "bW")<CR>
+  vnoremap <silent><buffer> [] m':<C-U>exe "normal! gv"<Bar>call search('^\s*end\(f\%[unction]\\|def\)\>', "bW")<CR>
+  nnoremap <silent><buffer> ][ m':call search('^\s*end\(f\%[unction]\\|def\)\>', "W")<CR>
+  vnoremap <silent><buffer> ][ m':<C-U>exe "normal! gv"<Bar>call search('^\s*end\(f\%[unction]\\|def\)\>', "W")<CR>
+
+  " Move around comments
+  nnoremap <silent><buffer> ]" :call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR>
+  vnoremap <silent><buffer> ]" :<C-U>exe "normal! gv"<Bar>call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR>
+  nnoremap <silent><buffer> [" :call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR>
+  vnoremap <silent><buffer> [" :<C-U>exe "normal! gv"<Bar>call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR>
+endif
+
+" Let the matchit plugin know what items can be matched.
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_words =
+	\ '\<\%(fu\%[nction]\|def\)\>)\@!:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' .
+ 	\ '\<\(wh\%[ile]\|for\)\>:\<brea\%[k]\>:\<con\%[tinue]\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' .
+	\ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' .
+	\ '{:},' .
+	\ '\<try\>:\<cat\%[ch]\>:\<fina\%[lly]\>:\<endt\%[ry]\>,' .
+	\ '\<aug\%[roup]\s\+\%(END\>\)\@!\S:\<aug\%[roup]\s\+END\>,'
+  " Ignore syntax region commands and settings, any 'en*' would clobber
+  " if-endif.
+  " - set spl=de,en
+  " - au! FileType javascript syntax region foldBraces start=/{/ end=/}/ …
+  let b:match_skip = 'synIDattr(synID(line("."),col("."),1),"name")
+        \ =~? "comment\\|string\\|vimSynReg\\|vimSet"'
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" removed this, because 'cpoptions' is a global option.
+" setlocal cpo+=M		" makes \%( match \)
+
+endif
diff --git a/ftplugin/vroom.vim b/ftplugin/vroom.vim
new file mode 100644
index 000000000..0c1eee801
--- /dev/null
+++ b/ftplugin/vroom.vim
@@ -0,0 +1,39 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vroom') == -1
+
+" Vim filetype plugin file
+" Language:	Vroom (vim testing and executable documentation)
+" Maintainer:	David Barnett (https://github.com/google/vim-ft-vroom)
+" Last Change:	2014 Jul 23
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+
+let b:undo_ftplugin = 'setlocal formatoptions< shiftwidth< softtabstop<' .
+    \ ' expandtab< iskeyword< comments< commentstring<'
+
+setlocal formatoptions-=t
+
+" The vroom interpreter doesn't accept anything but 2-space indent.
+setlocal shiftwidth=2
+setlocal softtabstop=2
+setlocal expandtab
+
+" To allow tag lookup and autocomplete for whole autoload functions, '#' must be
+" a keyword character. This also conforms to the behavior of ftplugin/vim.vim.
+setlocal iskeyword+=#
+
+" Vroom files have no comments (text is inert documentation unless indented).
+setlocal comments=
+setlocal commentstring=
+
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/wast.vim b/ftplugin/wast.vim
new file mode 100644
index 000000000..b211e6f54
--- /dev/null
+++ b/ftplugin/wast.vim
@@ -0,0 +1,21 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wast') == -1
+
+" Vim filetype plugin file
+" Language:     WebAssembly
+" Maintainer:   rhysd <lin90162@yahoo.co.jp>
+" Last Change:  Jul 29, 2018
+" For bugs, patches and license go to https://github.com/rhysd/vim-wasm
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=s:(;,e:;),:;;
+setlocal commentstring=(;%s;)
+setlocal formatoptions-=t
+setlocal iskeyword+=$,.,/
+
+let b:undo_ftplugin = "setlocal comments< commentstring< formatoptions< iskeyword<"
+
+endif
diff --git a/ftplugin/xdefaults.vim b/ftplugin/xdefaults.vim
new file mode 100644
index 000000000..d3fb6487b
--- /dev/null
+++ b/ftplugin/xdefaults.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xdefaults') == -1
+
+" Vim filetype plugin file
+" Language:             X resources files like ~/.Xdefaults (xrdb)
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< inc< fo<"
+
+setlocal comments=s1:/*,mb:*,ex:*/,:! commentstring& inc&
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/xhtml.vim b/ftplugin/xhtml.vim
new file mode 100644
index 000000000..0556d1bec
--- /dev/null
+++ b/ftplugin/xhtml.vim
@@ -0,0 +1,71 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xhtml') == -1
+
+" Vim filetype plugin file
+" Language:	xhtml
+" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Changed: 20 Jan 2009
+" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+
+if exists("b:did_ftplugin") | finish | endif
+
+" Make sure the continuation lines below do not cause problems in
+" compatibility mode.
+let s:save_cpo = &cpo
+set cpo-=C
+
+" Define some defaults in case the included ftplugins don't set them.
+let s:undo_ftplugin = ""
+let s:browsefilter = "HTML Files (*.html, *.htm)\t*.html;*.htm\n" .
+	    \	     "XML Files (*.xml)\t*.xml\n" .
+	    \	     "All Files (*.*)\t*.*\n"
+let s:match_words = ""
+
+runtime! ftplugin/xml.vim ftplugin/xml_*.vim ftplugin/xml/*.vim
+unlet b:did_ftplugin
+
+" Override our defaults if these were set by an included ftplugin.
+if exists("b:undo_ftplugin")
+    let s:undo_ftplugin = b:undo_ftplugin
+    unlet b:undo_ftplugin
+endif
+if exists("b:browsefilter")
+    let s:browsefilter = b:browsefilter
+    unlet b:browsefilter
+endif
+if exists("b:match_words")
+    let s:match_words = b:match_words
+    unlet b:match_words
+endif
+
+runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
+let b:did_ftplugin = 1
+
+" Combine the new set of values with those previously included.
+if exists("b:undo_ftplugin")
+    let s:undo_ftplugin = b:undo_ftplugin . " | " . s:undo_ftplugin
+endif
+if exists("b:browsefilter")
+    let s:browsefilter = b:browsefilter . s:browsefilter
+endif
+if exists("b:match_words")
+    let s:match_words = b:match_words . "," . s:match_words
+endif
+
+" Load the combined list of match_words for matchit.vim
+if exists("loaded_matchit")
+    let b:match_words = s:match_words
+endif
+
+" Change the :browse e filter to primarily show tcsh-related files.
+if has("gui_win32")
+    let  b:browsefilter="XHTML files (*.xhtml, *.xhtm)\t*.xhtml;*.xhtm\n" . s:browsefilter
+endif
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
+
+" Restore the saved compatibility options.
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif
diff --git a/ftplugin/xinetd.vim b/ftplugin/xinetd.vim
new file mode 100644
index 000000000..f99a91ac4
--- /dev/null
+++ b/ftplugin/xinetd.vim
@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xinetd') == -1
+
+" Vim filetype plugin file
+" Language:             xinetd.conf(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< inc< fo<"
+
+setlocal comments=:# commentstring=#\ %s include=^\\s*include
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/xmodmap.vim b/ftplugin/xmodmap.vim
new file mode 100644
index 000000000..16ab12ee0
--- /dev/null
+++ b/ftplugin/xmodmap.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xmodmap') == -1
+
+" Vim filetype plugin file
+" Language:             xmodmap(1) definition file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:! commentstring=!\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/xsd.vim b/ftplugin/xsd.vim
new file mode 100644
index 000000000..f3f94d919
--- /dev/null
+++ b/ftplugin/xsd.vim
@@ -0,0 +1,43 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
+
+" Vim filetype plugin file
+" Language:	xsd
+" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Changed: 20 Jan 2009
+" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+
+if exists("b:did_ftplugin") | finish | endif
+
+" Make sure the continuation lines below do not cause problems in
+" compatibility mode.
+let s:save_cpo = &cpo
+set cpo-=C
+
+" Define some defaults in case the included ftplugins don't set them.
+let s:undo_ftplugin = ""
+let s:browsefilter = "XML Files (*.xml)\t*.xml\n" .
+	    \	     "All Files (*.*)\t*.*\n"
+
+runtime! ftplugin/xml.vim ftplugin/xml_*.vim ftplugin/xml/*.vim
+let b:did_ftplugin = 1
+
+" Override our defaults if these were set by an included ftplugin.
+if exists("b:undo_ftplugin")
+    let s:undo_ftplugin = b:undo_ftplugin
+endif
+if exists("b:browsefilter")
+    let s:browsefilter = b:browsefilter
+endif
+
+" Change the :browse e filter to primarily show xsd-related files.
+if has("gui_win32")
+    let  b:browsefilter="XSD Files (*.xsd)\t*.xsd\n" . s:browsefilter
+endif
+
+let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
+
+" Restore the saved compatibility options.
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif
diff --git a/ftplugin/xslt.vim b/ftplugin/xslt.vim
new file mode 100644
index 000000000..2d2320ae4
--- /dev/null
+++ b/ftplugin/xslt.vim
@@ -0,0 +1,20 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xslt') == -1
+
+" Vim filetype plugin file
+" Language:	xslt
+" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Changed: 20 Jan 2009
+" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+
+if exists("b:did_ftplugin") | finish | endif
+
+runtime! ftplugin/xml.vim ftplugin/xml_*.vim ftplugin/xml/*.vim
+
+let b:did_ftplugin = 1
+
+" Change the :browse e filter to primarily show xsd-related files.
+if has("gui_win32") && exists("b:browsefilter")
+    let  b:browsefilter="XSLT Files (*.xsl,*.xslt)\t*.xsl;*.xslt\n" . b:browsefilter
+endif
+
+endif
diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim
deleted file mode 100644
index 261d71ca8..000000000
--- a/ftplugin/yaml.vim
+++ /dev/null
@@ -1,29 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
-
-" Vim filetype plugin file
-" Language:             YAML (YAML Ain't Markup Language)
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se> (inactive)
-" Last Change:      	2020 Mar 02
-
-if exists("b:did_ftplugin")
-  finish
-endif
-let b:did_ftplugin = 1
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-let b:undo_ftplugin = "setl com< cms< et< fo<"
-
-setlocal comments=:# commentstring=#\ %s expandtab
-setlocal formatoptions-=t formatoptions+=croql
-
-if !exists("g:yaml_recommended_style") || g:yaml_recommended_style != 0
-  let b:undo_ftplugin .= " sw< sts<"
-  setlocal shiftwidth=2 softtabstop=2
-endif
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-endif
diff --git a/ftplugin/zimbu.vim b/ftplugin/zimbu.vim
new file mode 100644
index 000000000..fc939fde0
--- /dev/null
+++ b/ftplugin/zimbu.vim
@@ -0,0 +1,157 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zimbu') == -1
+
+" Vim filetype plugin file
+" Language:	Zimbu
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2017 Dec 05
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+" Using line continuation here.
+let s:cpo_save = &cpo
+set cpo-=C
+
+let b:undo_ftplugin = "setl fo< com< ofu< efm< tw< et< sts< sw< | if has('vms') | setl isk< | endif"
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" and insert the comment leader when hitting <CR> or using "o".
+setlocal fo-=t fo+=croql
+
+" Set completion with CTRL-X CTRL-O to autoloaded function.
+if exists('&ofu')
+  setlocal ofu=ccomplete#Complete
+endif
+
+" Set 'comments' to format dashed lists in comments.
+" And to keep Zudocu comment characters.
+setlocal comments=sO:#\ -,mO:#\ \ ,:#=,:#-,:#%,:#
+
+setlocal errorformat^=%f\ line\ %l\ col\ %c:\ %m,ERROR:\ %m
+
+" When the matchit plugin is loaded, this makes the % command skip parens and
+" braces in comments.
+let b:match_words = '\(^\s*\)\@<=\(MODULE\|CLASS\|INTERFACE\|BITS\|ENUM\|SHARED\|FUNC\|REPLACE\|DEFINE\|PROC\|EQUAL\|MAIN\|IF\|GENERATE_IF\|WHILE\|REPEAT\|WITH\|DO\|FOR\|SWITCH\|TRY\)\>\|{\s*$:\(^\s*\)\@<=\(ELSE\|ELSEIF\|GENERATE_ELSE\|GENERATE_ELSEIF\|CATCH\|FINALLY\)\>:\(^\s*\)\@<=\(}\|\<UNTIL\>\)'
+
+let b:match_skip = 's:comment\|string\|zimbuchar'
+
+setlocal tw=78
+setlocal et sts=2 sw=2
+
+" Does replace when a dot, space or closing brace is typed.
+func! GCUpperDot(what)
+  if v:char != ' ' && v:char != "\r" && v:char != "\x1b" && v:char != '.' && v:char != ')' && v:char != '}' && v:char != ','
+    " no space or dot after the typed text
+    let g:got_char = v:char
+    return a:what
+  endif
+  return GCUpperCommon(a:what)
+endfunc
+
+" Does not replace when a dot is typed.
+func! GCUpper(what)
+  if v:char != ' ' && v:char != "\r" && v:char != "\x1b" && v:char != ')' && v:char != ','
+    " no space or other "terminating" character after the typed text
+    let g:got_char = v:char
+    return a:what
+  endif
+  return GCUpperCommon(a:what)
+endfunc
+
+" Only replaces when a space is typed.
+func! GCUpperSpace(what)
+  if v:char != ' '
+    " no space after the typed text
+    let g:got_char = v:char
+    return a:what
+  endif
+  return GCUpperCommon(a:what)
+endfunc
+
+func! GCUpperCommon(what)
+  let col = col(".") - strlen(a:what)
+  if col > 1 && getline('.')[col - 2] != ' '
+    " no space before the typed text
+    let g:got_char = 999
+    return a:what
+  endif
+  let synName = synIDattr(synID(line("."), col(".") - 2, 1), "name")
+  if synName =~ 'Comment\|String\|zimbuCregion\|\<c'
+    " inside a comment or C code
+    let g:got_char = 777
+    return a:what
+  endif
+    let g:got_char = 1111
+  return toupper(a:what)
+endfunc
+
+iabbr <buffer> <expr> alias GCUpperSpace("alias")
+iabbr <buffer> <expr> arg GCUpperDot("arg")
+iabbr <buffer> <expr> break GCUpper("break")
+iabbr <buffer> <expr> case GCUpperSpace("case")
+iabbr <buffer> <expr> catch GCUpperSpace("catch")
+iabbr <buffer> <expr> check GCUpperDot("check")
+iabbr <buffer> <expr> class GCUpperSpace("class")
+iabbr <buffer> <expr> interface GCUpperSpace("interface")
+iabbr <buffer> <expr> implements GCUpperSpace("implements")
+iabbr <buffer> <expr> shared GCUpperSpace("shared")
+iabbr <buffer> <expr> continue GCUpper("continue")
+iabbr <buffer> <expr> default GCUpper("default")
+iabbr <buffer> <expr> extends GCUpper("extends")
+iabbr <buffer> <expr> do GCUpper("do")
+iabbr <buffer> <expr> else GCUpper("else")
+iabbr <buffer> <expr> elseif GCUpperSpace("elseif")
+iabbr <buffer> <expr> enum GCUpperSpace("enum")
+iabbr <buffer> <expr> exit GCUpper("exit")
+iabbr <buffer> <expr> false GCUpper("false")
+iabbr <buffer> <expr> fail GCUpper("fail")
+iabbr <buffer> <expr> finally GCUpper("finally")
+iabbr <buffer> <expr> for GCUpperSpace("for")
+iabbr <buffer> <expr> func GCUpperSpace("func")
+iabbr <buffer> <expr> if GCUpperSpace("if")
+iabbr <buffer> <expr> import GCUpperSpace("import")
+iabbr <buffer> <expr> in GCUpperSpace("in")
+iabbr <buffer> <expr> io GCUpperDot("io")
+iabbr <buffer> <expr> main GCUpper("main")
+iabbr <buffer> <expr> module GCUpperSpace("module")
+iabbr <buffer> <expr> new GCUpper("new")
+iabbr <buffer> <expr> nil GCUpper("nil")
+iabbr <buffer> <expr> ok GCUpper("ok")
+iabbr <buffer> <expr> proc GCUpperSpace("proc")
+iabbr <buffer> <expr> proceed GCUpper("proceed")
+iabbr <buffer> <expr> return GCUpper("return")
+iabbr <buffer> <expr> step GCUpperSpace("step")
+iabbr <buffer> <expr> switch GCUpperSpace("switch")
+iabbr <buffer> <expr> sys GCUpperDot("sys")
+iabbr <buffer> <expr> this GCUpperDot("this")
+iabbr <buffer> <expr> throw GCUpperSpace("throw")
+iabbr <buffer> <expr> try GCUpper("try")
+iabbr <buffer> <expr> to GCUpperSpace("to")
+iabbr <buffer> <expr> true GCUpper("true")
+iabbr <buffer> <expr> until GCUpperSpace("until")
+iabbr <buffer> <expr> while GCUpperSpace("while")
+iabbr <buffer> <expr> repeat GCUpper("repeat")
+
+if !exists("no_plugin_maps") && !exists("no_zimbu_maps")
+  nnoremap <silent> <buffer> [[ m`:call ZimbuGoStartBlock()<CR>
+  nnoremap <silent> <buffer> ]] m`:call ZimbuGoEndBlock()<CR>
+endif
+
+" Using a function makes sure the search pattern is restored
+func! ZimbuGoStartBlock()
+  ?^\s*\(FUNC\|PROC\|MAIN\|ENUM\|CLASS\|INTERFACE\)\>
+endfunc
+func! ZimbuGoEndBlock()
+  /^\s*\(FUNC\|PROC\|MAIN\|ENUM\|CLASS\|INTERFACE\)\>
+endfunc
+
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/indent/bib.vim b/indent/bib.vim
new file mode 100644
index 000000000..677b19df4
--- /dev/null
+++ b/indent/bib.vim
@@ -0,0 +1,19 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bib') == -1
+
+" Vim indent file
+" Language:      BibTeX
+" Maintainer:    Dorai Sitaram <ds26@gte.com>
+" URL:		 http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
+" Last Change:   2005 Mar 28
+
+" Only do this when not done yet for this buffer
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal cindent
+
+let b:undo_indent = "setl cin<"
+
+endif
diff --git a/indent/bst.vim b/indent/bst.vim
new file mode 100644
index 000000000..6d41acf8c
--- /dev/null
+++ b/indent/bst.vim
@@ -0,0 +1,79 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bst') == -1
+
+" Vim indent file
+" Language:	bst
+" Author:	Tim Pope <vimNOSPAM@tpope.info>
+" $Id: bst.vim,v 1.1 2007/05/05 18:11:12 vimboss Exp $
+
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+setlocal expandtab
+setlocal indentexpr=GetBstIndent(v:lnum)
+"setlocal smartindent
+setlocal cinkeys&
+setlocal cinkeys-=0#
+setlocal indentkeys&
+"setlocal indentkeys+=0%
+
+" Only define the function once.
+if exists("*GetBstIndent")
+    finish
+endif
+
+function! s:prevgood(lnum)
+    " Find a non-blank line above the current line.
+    " Skip over comments.
+    let lnum = a:lnum
+    while lnum > 0
+        let lnum = prevnonblank(lnum - 1)
+        if getline(lnum) !~ '^\s*%.*$'
+            break
+        endif
+    endwhile
+    return lnum
+endfunction
+
+function! s:strip(lnum)
+    let line = getline(a:lnum)
+    let line = substitute(line,'"[^"]*"','""','g')
+    let line = substitute(line,'%.*','','')
+    let line = substitute(line,'^\s\+','','')
+    return line
+endfunction
+
+function! s:count(string,char)
+    let str = substitute(a:string,'[^'.a:char.']','','g')
+    return strlen(str)
+endfunction
+
+function! GetBstIndent(lnum) abort
+    if a:lnum == 1
+        return 0
+    endif
+    let lnum = s:prevgood(a:lnum)
+    if lnum <= 0
+        return indent(a:lnum - 1)
+    endif
+    let line = s:strip(lnum)
+    let cline = s:strip(a:lnum)
+    if cline =~ '^}' && exists("b:current_syntax")
+        call cursor(a:lnum,indent(a:lnum))
+        if searchpair('{','','}','bW',"synIDattr(synID(line('.'),col('.'),1),'name') =~? 'comment\\|string'")
+            if col('.')+1 == col('$')
+                return indent('.')
+            else
+                return virtcol('.')-1
+            endif
+        endif
+    endif
+    let fakeline = substitute(line,'^}','','').matchstr(cline,'^}')
+    let ind = indent(lnum)
+    let ind = ind + shiftwidth() * s:count(line,'{')
+    let ind = ind - shiftwidth() * s:count(fakeline,'}')
+    return ind
+endfunction
+
+endif
diff --git a/indent/cdl.vim b/indent/cdl.vim
new file mode 100644
index 000000000..844ae7177
--- /dev/null
+++ b/indent/cdl.vim
@@ -0,0 +1,133 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdl') == -1
+
+" Description:	Comshare Dimension Definition Language (CDL)
+" Author:	Raul Segura Acevedo <raulseguraaceved@netscape.net>
+" Last Change:	Fri Nov 30 13:35:48  2001 CST
+
+if exists("b:did_indent")
+    "finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=CdlGetIndent(v:lnum)
+setlocal indentkeys&
+setlocal indentkeys+==~else,=~endif,=~then,;,),=
+
+" Only define the function once.
+if exists("*CdlGetIndent")
+    "finish
+endif
+
+" find out if an "...=..." expresion is an assignment (or a conditional)
+" it scans 'line' first, and then the previos lines
+fun! CdlAsignment(lnum, line)
+  let f = -1
+  let lnum = a:lnum
+  let line = a:line
+  while lnum > 0 && f == -1
+    " line without members [a] of [b]:[c]...
+    let inicio = 0
+    while 1
+      " keywords that help to decide
+      let inicio = matchend(line, '\c\<\(expr\|\a*if\|and\|or\|not\|else\|then\|memberis\|\k\+of\)\>\|[<>;]', inicio)
+      if inicio < 0
+	break
+      endif
+      " it's formula if there's a ';', 'elsE', 'theN', 'enDif' or 'expr'
+      " conditional if there's a '<', '>', 'elseif', 'if', 'and', 'or', 'not',
+      " 'memberis', 'childrenof' and other \k\+of funcions
+      let f = line[inicio-1] =~? '[en;]' || strpart(line, inicio-4, 4) =~? 'ndif\|expr'
+    endw
+    let lnum = prevnonblank(lnum-1)
+    let line = substitute(getline(lnum), '\c\(\[[^]]*]\(\s*of\s*\|:\)*\)\+', ' ', 'g')
+  endw
+  " if we hit the start of the file then f = -1, return 1 (formula)
+  return f != 0
+endf
+
+fun! CdlGetIndent(lnum)
+  let thisline = getline(a:lnum)
+  if match(thisline, '^\s*\(\k\+\|\[[^]]*]\)\s*\(,\|;\s*$\)') >= 0
+    " it's an attributes line
+    return shiftwidth()
+  elseif match(thisline, '^\c\s*\([{}]\|\/[*/]\|dimension\|schedule\|group\|hierarchy\|class\)') >= 0
+    " it's a header or '{' or '}' or a comment
+    return 0
+  end
+
+  let lnum = prevnonblank(a:lnum-1)
+  " Hit the start of the file, use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  " PREVIOUS LINE
+  let ind = indent(lnum)
+  let line = getline(lnum)
+  let f = -1 " wether a '=' is a conditional or a asignment, -1 means we don't know yet
+  " one 'closing' element at the beginning of the line has already reduced the
+  "   indent, but 'else', 'elseif' & 'then' increment it for the next line
+  " '=' at the beginning has already de right indent (increased for asignments)
+  let inicio = matchend(line, '^\c\s*\(else\a*\|then\|endif\|/[*/]\|[);={]\)')
+  if inicio > 0
+    let c = line[inicio-1]
+    " ')' and '=' don't change indent and are useless to set 'f'
+    if c == '{'
+      return shiftwidth()
+    elseif c != ')' && c != '='
+      let f = 1 " all but 'elseif' are followed by a formula
+      if c ==? 'n' || c ==? 'e' " 'then', 'else'
+	let ind = ind + shiftwidth()
+      elseif strpart(line, inicio-6, 6) ==? 'elseif' " elseif, set f to conditional
+	let ind = ind + shiftwidth()
+	let f = 0
+      end
+    end
+  end
+
+  " remove members [a] of [b]:[c]... (inicio remainds valid)
+  let line = substitute(line, '\c\(\[[^]]*]\(\s*of\s*\|:\)*\)\+', ' ', 'g')
+  while 1
+    " search for the next interesting element
+    let inicio=matchend(line, '\c\<if\|endif\|[()=;]', inicio)
+    if inicio < 0
+      break
+    end
+
+    let c = line[inicio-1]
+    " 'expr(...)' containing the formula
+    if strpart(line, inicio-5, 5) ==? 'expr('
+      let ind = 0
+      let f = 1
+    elseif c == ')' || c== ';' || strpart(line, inicio-5, 5) ==? 'endif'
+      let ind = ind - shiftwidth()
+    elseif c == '(' || c ==? 'f' " '(' or 'if'
+      let ind = ind + shiftwidth()
+    else " c == '='
+      " if it is an asignment increase indent
+      if f == -1 " we don't know yet, find out
+	let f = CdlAsignment(lnum, strpart(line, 0, inicio))
+      end
+      if f == 1 " formula increase it
+	let ind = ind + shiftwidth()
+      end
+    end
+  endw
+
+  " CURRENT LINE, if it starts with a closing element, decrease indent
+  " or if it starts with '=' (asignment), increase indent
+  if match(thisline, '^\c\s*\(else\|then\|endif\|[);]\)') >= 0
+    let ind = ind - shiftwidth()
+  elseif match(thisline, '^\s*=') >= 0
+    if f == -1 " we don't know yet if is an asignment, find out
+      let f = CdlAsignment(lnum, "")
+    end
+    if f == 1 " formula increase it
+      let ind = ind + shiftwidth()
+    end
+  end
+
+  return ind
+endfun
+
+endif
diff --git a/indent/ch.vim b/indent/ch.vim
new file mode 100644
index 000000000..479ce324d
--- /dev/null
+++ b/indent/ch.vim
@@ -0,0 +1,22 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ch') == -1
+
+" Vim indent file
+" Language:	Ch
+" Maintainer:	SoftIntegration, Inc. <info@softintegration.com>
+" URL:		http://www.softintegration.com/download/vim/indent/ch.vim
+" Last change:	2006 Apr 30
+"		Created based on cpp.vim
+"
+" Ch is a C/C++ interpreter with many high level extensions
+
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+   finish
+endif
+let b:did_indent = 1
+
+" Ch indenting is built-in, thus this is very simple
+setlocal cindent
+
+endif
diff --git a/indent/chaiscript.vim b/indent/chaiscript.vim
new file mode 100644
index 000000000..49b9bad36
--- /dev/null
+++ b/indent/chaiscript.vim
@@ -0,0 +1,54 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chaiscript') == -1
+
+" Vim indent file
+" Language:     ChaiScript
+" Maintainer:	Jason Turner <lefticus 'at' gmail com>
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetChaiScriptIndent()
+setlocal autoindent
+
+" Only define the function once.
+if exists("*GetChaiScriptIndent")
+  finish
+endif
+
+function! GetChaiScriptIndent()
+  " Find a non-blank line above the current line.
+  let lnum = prevnonblank(v:lnum - 1)
+
+  " Hit the start of the file, use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  " Add a 'shiftwidth' after lines that start a block:
+  " lines containing a {
+  let ind = indent(lnum)
+  let flag = 0
+  let prevline = getline(lnum)
+  if prevline =~ '^.*{.*'
+    let ind = ind + shiftwidth()
+    let flag = 1
+  endif
+
+  " Subtract a 'shiftwidth' after lines containing a { followed by a }
+  " to keep it balanced
+  if flag == 1 && prevline =~ '.*{.*}.*'
+    let ind = ind - shiftwidth()
+  endif
+
+  " Subtract a 'shiftwidth' on lines ending with }
+  if getline(v:lnum) =~ '^\s*\%(}\)'
+    let ind = ind - shiftwidth()
+  endif
+
+  return ind
+endfunction
+
+endif
diff --git a/indent/cobol.vim b/indent/cobol.vim
new file mode 100644
index 000000000..5cfe23211
--- /dev/null
+++ b/indent/cobol.vim
@@ -0,0 +1,227 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cobol') == -1
+
+" Vim indent file
+" Language:	cobol
+" Maintainer: Ankit Jain <ajatkj@yahoo.co.in>
+"     (formerly Tim Pope <vimNOSPAM@tpope.info>)
+" $Id: cobol.vim,v 1.1 2007/05/05 18:08:19 vimboss Exp $
+" Last Update:	By Ankit Jain on 22.03.2019
+" Ankit Jain      22.03.2019     Changes & fixes:
+"                                Allow chars in 1st 6 columns
+"                                #C22032019
+
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+setlocal expandtab
+setlocal indentexpr=GetCobolIndent(v:lnum)
+setlocal indentkeys&
+setlocal indentkeys+=0<*>,0/,0$,0=01,=~division,=~section,0=~end,0=~then,0=~else,0=~when,*<Return>,.
+
+" Only define the function once.
+if exists("*GetCobolIndent")
+    finish
+endif
+
+let s:skip = 'getline(".") =~ "^.\\{6\\}[*/$-]\\|\"[^\"]*\""'
+
+function! s:prevgood(lnum)
+    " Find a non-blank line above the current line.
+    " Skip over comments.
+    let lnum = a:lnum
+    while lnum > 0
+        let lnum = prevnonblank(lnum - 1)
+        let line = getline(lnum)
+        if line !~? '^\s*[*/$-]' && line !~? '^.\{6\}[*/$CD-]'
+            break
+        endif
+    endwhile
+    return lnum
+endfunction
+
+function! s:stripped(lnum)
+    return substitute(strpart(getline(a:lnum),0,72),'^\s*','','')
+endfunction
+
+function! s:optionalblock(lnum,ind,blocks,clauses)
+    let ind = a:ind
+    let clauses = '\c\<\%(\<NOT\s\+\)\@<!\%(NOT\s\+\)\=\%('.a:clauses.'\)'
+    let begin = '\c-\@<!\<\%('.a:blocks.'\)\>'
+    let beginfull = begin.'\ze.*\%(\n\%(\s*\%([*/$-].*\)\=\n\)*\)\=\s*\%('.clauses.'\)'
+    let end   = '\c\<end-\%('.a:blocks.'\)\>\|\%(\.\%( \|$\)\)\@='
+    let cline = s:stripped(a:lnum)
+    let line  = s:stripped(s:prevgood(a:lnum))
+    if cline =~? clauses "&& line !~? '^search\>'
+        call cursor(a:lnum,1)
+        let lastclause = searchpair(beginfull,clauses,end,'bWr',s:skip)
+        if getline(lastclause) =~? clauses && s:stripped(lastclause) !~? '^'.begin
+            let ind = indent(lastclause)
+        elseif lastclause > 0
+            let ind = indent(lastclause) + shiftwidth()
+            "let ind = ind + shiftwidth()
+        endif
+    elseif line =~? clauses && cline !~? end
+        let ind = ind + shiftwidth()
+    endif
+    return ind
+endfunction
+
+function! GetCobolIndent(lnum) abort
+    let minshft = 6
+    let ashft = minshft + 1
+    let bshft = ashft + 4
+    " (Obsolete) numbered lines
+    " #C22032019: Columns 1-6 could have alphabets as well as numbers
+    "if getline(a:lnum) =~? '^\s*\d\{6\}\%($\|[ */$CD-]\)'
+    if getline(a:lnum) =~? '^\s*[a-zA-Z0-9]\{6\}\%($\|[ */$CD-]\)'
+        return 0
+    endif
+    let cline = s:stripped(a:lnum)
+    " Comments, etc. must start in the 7th column
+    if cline =~? '^[*/$-]'
+        return minshft
+    elseif cline =~# '^[CD]' && indent(a:lnum) == minshft
+        return minshft
+    endif
+    " Divisions, sections, and file descriptions start in area A
+    if cline =~? '\<\(DIVISION\|SECTION\)\%($\|\.\)' || cline =~? '^[FS]D\>'
+        return ashft
+    endif
+    " Fields
+    if cline =~? '^0*\(1\|77\)\>'
+        return ashft
+    endif
+    if cline =~? '^\d\+\>'
+        let cnum = matchstr(cline,'^\d\+\>')
+        let default = 0
+        let step = -1
+        while step < 2
+        let lnum = a:lnum
+        while lnum > 0 && lnum < line('$') && lnum > a:lnum - 500 && lnum < a:lnum + 500
+            let lnum = step > 0 ? nextnonblank(lnum + step) : prevnonblank(lnum + step)
+            let line = getline(lnum)
+            let lindent = indent(lnum)
+            if line =~? '^\s*\d\+\>'
+                let num = matchstr(line,'^\s*\zs\d\+\>')
+                if 0+cnum == num
+                    return lindent
+                elseif 0+cnum > num && default < lindent + shiftwidth()
+                    let default = lindent + shiftwidth()
+                endif
+            elseif lindent < bshft && lindent >= ashft
+                break
+            endif
+        endwhile
+        let step = step + 2
+        endwhile
+        return default ? default : bshft
+    endif
+    let lnum = s:prevgood(a:lnum)
+    " Hit the start of the file, use "zero" indent.
+    if lnum == 0
+        return ashft
+    endif
+    " Initial spaces are ignored
+    let line = s:stripped(lnum)
+    let ind = indent(lnum)
+    " Paragraphs.  There may be some false positives.
+    if cline =~? '^\(\a[A-Z0-9-]*[A-Z0-9]\|\d[A-Z0-9-]*\a\)\.' "\s*$'
+        if cline !~? '^EXIT\s*\.' && line =~? '\.\s*$'
+            return ashft
+        endif
+    endif
+    " Paragraphs in the identification division.
+    "if cline =~? '^\(PROGRAM-ID\|AUTHOR\|INSTALLATION\|' .
+                "\ 'DATE-WRITTEN\|DATE-COMPILED\|SECURITY\)\>'
+        "return ashft
+    "endif
+    if line =~? '\.$'
+        " XXX
+        return bshft
+    endif
+    if line =~? '^PERFORM\>'
+        let perfline = substitute(line, '\c^PERFORM\s*', "", "")
+        if perfline =~? '^\%(\k\+\s\+TIMES\)\=\s*$'
+            let ind = ind + shiftwidth()
+        elseif perfline =~? '^\%(WITH\s\+TEST\|VARYING\|UNTIL\)\>.*[^.]$'
+            let ind = ind + shiftwidth()
+        endif
+    endif
+    if line =~? '^\%(IF\|THEN\|ELSE\|READ\|EVALUATE\|SEARCH\|SELECT\)\>'
+        let ind = ind + shiftwidth()
+    endif
+    let ind = s:optionalblock(a:lnum,ind,'ADD\|COMPUTE\|DIVIDE\|MULTIPLY\|SUBTRACT','ON\s\+SIZE\s\+ERROR')
+    let ind = s:optionalblock(a:lnum,ind,'STRING\|UNSTRING\|ACCEPT\|DISPLAY\|CALL','ON\s\+OVERFLOW\|ON\s\+EXCEPTION')
+    if cline !~? '^AT\s\+END\>' || line !~? '^SEARCH\>'
+        let ind = s:optionalblock(a:lnum,ind,'DELETE\|REWRITE\|START\|WRITE\|READ','INVALID\s\+KEY\|AT\s\+END\|NO\s\+DATA\|AT\s\+END-OF-PAGE')
+    endif
+    if cline =~? '^WHEN\>'
+        call cursor(a:lnum,1)
+        " We also search for READ so that contained AT ENDs are skipped
+        let lastclause = searchpair('\c-\@<!\<\%(SEARCH\|EVALUATE\|READ\)\>','\c\<\%(WHEN\|AT\s\+END\)\>','\c\<END-\%(SEARCH\|EVALUATE\|READ\)\>','bW',s:skip)
+        let g:foo = s:stripped(lastclause)
+        if s:stripped(lastclause) =~? '\c\<\%(WHEN\|AT\s\+END\)\>'
+            "&& s:stripped(lastclause) !~? '^\%(SEARCH\|EVALUATE\|READ\)\>'
+            let ind = indent(lastclause)
+        elseif lastclause > 0
+            let ind = indent(lastclause) + shiftwidth()
+        endif
+    elseif line =~? '^WHEN\>'
+        let ind = ind + shiftwidth()
+    endif
+    "I'm not sure why I had this
+    "if line =~? '^ELSE\>-\@!' && line !~? '\.$'
+        "let ind = indent(s:prevgood(lnum))
+    "endif
+    if cline =~? '^\(END\)\>-\@!'
+        " On lines with just END, 'guess' a simple shift left
+        let ind = ind - shiftwidth()
+    elseif cline =~? '^\(END-IF\|THEN\|ELSE\)\>-\@!'
+        call cursor(a:lnum,indent(a:lnum))
+        let match = searchpair('\c-\@<!\<IF\>','\c-\@<!\%(THEN\|ELSE\)\>','\c-\@<!\<END-IF\>\zs','bnW',s:skip)
+        if match > 0
+            let ind = indent(match)
+        endif
+    elseif cline =~? '^END-[A-Z]'
+        let beginword = matchstr(cline,'\c\<END-\zs[A-Z0-9-]\+')
+        let endword = 'END-'.beginword
+        let first = 0
+        let suffix = '.*\%(\n\%(\%(\s*\|.\{6\}\)[*/].*\n\)*\)\=\s*'
+        if beginword =~? '^\%(ADD\|COMPUTE\|DIVIDE\|MULTIPLY\|SUBTRACT\)$'
+            let beginword = beginword . suffix . '\<\%(NOT\s\+\)\=ON\s\+SIZE\s\+ERROR'
+            let g:beginword = beginword
+            let first = 1
+        elseif beginword =~? '^\%(STRING\|UNSTRING\)$'
+            let beginword = beginword . suffix . '\<\%(NOT\s\+\)\=ON\s\+OVERFLOW'
+            let first = 1
+        elseif beginword =~? '^\%(ACCEPT\|DISPLAY\)$'
+            let beginword = beginword . suffix . '\<\%(NOT\s\+\)\=ON\s\+EXCEPTION'
+            let first = 1
+        elseif beginword ==? 'CALL'
+            let beginword = beginword . suffix . '\<\%(NOT\s\+\)\=ON\s\+\%(EXCEPTION\|OVERFLOW\)'
+            let first = 1
+        elseif beginword =~? '^\%(DELETE\|REWRITE\|START\|READ\|WRITE\)$'
+            let first = 1
+            let beginword = beginword . suffix . '\<\%(NOT\s\+\)\=\(INVALID\s\+KEY'
+            if beginword =~? '^READ'
+                let first = 0
+                let beginword = beginword . '\|AT\s\+END\|NO\s\+DATA'
+            elseif beginword =~? '^WRITE'
+                let beginword = beginword . '\|AT\s\+END-OF-PAGE'
+            endif
+            let beginword = beginword . '\)'
+        endif
+        call cursor(a:lnum,indent(a:lnum))
+        let match = searchpair('\c-\@<!\<'.beginword.'\>','','\c\<'.endword.'\>\zs','bnW'.(first? 'r' : ''),s:skip)
+        if match > 0
+            let ind = indent(match)
+        elseif cline =~? '^\(END-\(READ\|EVALUATE\|SEARCH\|PERFORM\)\)\>'
+            let ind = ind - shiftwidth()
+        endif
+    endif
+    return ind < bshft ? bshft : ind
+endfunction
+
+endif
diff --git a/indent/config.vim b/indent/config.vim
new file mode 100644
index 000000000..3e59cc5e7
--- /dev/null
+++ b/indent/config.vim
@@ -0,0 +1,86 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'config') == -1
+
+" Vim indent file
+" Language:             Autoconf configure.{ac,in} file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-12-20
+" TODO:                 how about nested [()]'s in one line
+"                   what's wrong with '\\\@!'?
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+runtime! indent/sh.vim          " will set b:did_indent
+
+setlocal indentexpr=GetConfigIndent()
+setlocal indentkeys=!^F,o,O,=then,=do,=else,=elif,=esac,=fi,=fin,=fil,=done
+setlocal nosmartindent
+
+" Only define the function once.
+if exists("*GetConfigIndent")
+  finish
+endif
+
+" get the offset (indent) of the end of the match of 'regexp' in 'line'
+function s:GetOffsetOf(line, regexp)
+  let end = matchend(a:line, a:regexp)
+  let width = 0
+  let i = 0
+  while i < end
+    if a:line[i] != "\t"
+      let width = width + 1
+    else
+      let width = width + &ts - (width % &ts)
+    endif
+    let i = i + 1
+  endwhile
+  return width
+endfunction
+
+function GetConfigIndent()
+  " Find a non-blank line above the current line.
+  let lnum = prevnonblank(v:lnum - 1)
+
+  " Hit the start of the file, use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  " where to put this
+  let ind = GetShIndent()
+  let line = getline(lnum)
+
+  " if previous line has unmatched, unescaped opening parentheses,
+  " indent to its position. TODO: not failsafe if multiple ('s
+  if line =~ '\\\@<!([^)]*$'
+    let ind = s:GetOffsetOf(line, '\\\@!(')
+  endif
+
+  " if previous line has unmatched opening bracket,
+  " indent to its position. TODO: same as above
+  if line =~ '\[[^]]*$'
+    let ind = s:GetOffsetOf(line, '\[')
+  endif
+
+  " if previous line had an unmatched closing parantheses,
+  " indent to the matching opening parantheses
+  if line =~ '[^(]\+\\\@<!)$'
+    call search(')', 'bW')
+    let lnum = searchpair('\\\@<!(', '', ')', 'bWn')
+    let ind = indent(lnum)
+  endif
+
+  " if previous line had an unmatched closing bracket,
+  " indent to the matching opening bracket
+  if line =~ '[^[]\+]$'
+    call search(']', 'bW')
+    let lnum = searchpair('\[', '', ']', 'bWn')
+    let ind = indent(lnum)
+  endif
+
+  return ind
+endfunction
+
+endif
diff --git a/indent/context.vim b/indent/context.vim
new file mode 100644
index 000000000..16ec08298
--- /dev/null
+++ b/indent/context.vim
@@ -0,0 +1,40 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
+
+" ConTeXt indent file
+" Language: ConTeXt typesetting engine
+" Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Last Change:  2016 Oct 15
+
+if exists("b:did_indent")
+  finish
+endif
+
+if !get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
+  finish
+endif
+
+" Load MetaPost indentation script
+runtime! indent/mp.vim
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+setlocal indentexpr=GetConTeXtIndent()
+
+let b:undo_indent = "setl indentexpr<"
+
+function! GetConTeXtIndent()
+  " Use MetaPost rules inside MetaPost graphic environments
+  if len(synstack(v:lnum, 1)) > 0 &&
+        \ synIDattr(synstack(v:lnum, 1)[0], "name") ==# 'contextMPGraphic'
+    return GetMetaPostIndent()
+  endif
+  return -1
+endfunc
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim:sw=2
+
+endif
diff --git a/indent/cs.vim b/indent/cs.vim
new file mode 100644
index 000000000..893f5b806
--- /dev/null
+++ b/indent/cs.vim
@@ -0,0 +1,77 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
+
+" Vim indent file
+" Language:            C#
+" Maintainer:          Nick Jensen <nickspoon@gmail.com>
+" Former Maintainers:  Aquila Deus
+"                      Johannes Zellner <johannes@zellner.org>
+" Last Change:         2018-11-21
+" Filenames:           *.cs
+" License:             Vim (see :h license)
+" Repository:          https://github.com/nickspoons/vim-cs
+"
+
+" Only load this indent file when no other was loaded.
+if exists('b:did_indent')
+  finish
+endif
+let b:did_indent = 1
+
+let s:save_cpo = &cpoptions
+set cpoptions&vim
+
+
+setlocal indentexpr=GetCSIndent(v:lnum)
+
+function! s:IsCompilerDirective(line)
+  return a:line =~? '^\s*#'
+endf
+
+function! s:IsAttributeLine(line)
+  return a:line =~? '^\s*\[[A-Za-z]' && a:line =~? '\]$'
+endf
+
+function! s:FindPreviousNonCompilerDirectiveLine(start_lnum)
+  for delta in range(0, a:start_lnum)
+    let lnum = a:start_lnum - delta
+    let line = getline(lnum)
+    let is_directive = s:IsCompilerDirective(line)
+    if !is_directive
+      return lnum
+    endif
+  endfor
+  return 0
+endf
+
+function! GetCSIndent(lnum) abort
+  " Hit the start of the file, use zero indent.
+  if a:lnum == 0
+    return 0
+  endif
+
+  let this_line = getline(a:lnum)
+
+  " Compiler directives use zero indent if so configured.
+  let is_first_col_macro = s:IsCompilerDirective(this_line) && stridx(&l:cinkeys, '0#') >= 0
+  if is_first_col_macro
+    return cindent(a:lnum)
+  endif
+
+  let lnum = s:FindPreviousNonCompilerDirectiveLine(a:lnum - 1)
+  let previous_code_line = getline(lnum)
+  if s:IsAttributeLine(previous_code_line)
+    let ind = indent(lnum)
+    return ind
+  else
+    return cindent(a:lnum)
+  endif
+endfunction
+
+let b:undo_indent = 'setlocal indentexpr<'
+
+let &cpoptions = s:save_cpo
+unlet s:save_cpo
+
+" vim:et:sw=2:sts=2
+
+endif
diff --git a/indent/css.vim b/indent/css.vim
new file mode 100644
index 000000000..58189a485
--- /dev/null
+++ b/indent/css.vim
@@ -0,0 +1,88 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'css') == -1
+
+" Vim indent file
+" Language:	    CSS
+" Maintainer:	    Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2012-05-30
+"		    Use of shiftwidth() added by Oleg Zubchenko.	
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetCSSIndent()
+setlocal indentkeys=0{,0},!^F,o,O
+setlocal nosmartindent
+
+let b:undo_indent = "setl smartindent< indentkeys< indentexpr<"
+
+if exists("*GetCSSIndent")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+function s:prevnonblanknoncomment(lnum)
+  let lnum = a:lnum
+  while lnum > 1
+    let lnum = prevnonblank(lnum)
+    let line = getline(lnum)
+    if line =~ '\*/'
+      while lnum > 1 && line !~ '/\*'
+        let lnum -= 1
+      endwhile
+      if line =~ '^\s*/\*'
+        let lnum -= 1
+      else
+        break
+      endif
+    else
+      break
+    endif
+  endwhile
+  return lnum
+endfunction
+
+function s:count_braces(lnum, count_open)
+  let n_open = 0
+  let n_close = 0
+  let line = getline(a:lnum)
+  let pattern = '[{}]'
+  let i = match(line, pattern)
+  while i != -1
+    if synIDattr(synID(a:lnum, i + 1, 0), 'name') !~ 'css\%(Comment\|StringQ\{1,2}\)'
+      if line[i] == '{'
+        let n_open += 1
+      elseif line[i] == '}'
+        if n_open > 0
+          let n_open -= 1
+        else
+          let n_close += 1
+        endif
+      endif
+    endif
+    let i = match(line, pattern, i + 1)
+  endwhile
+  return a:count_open ? n_open : n_close
+endfunction
+
+function GetCSSIndent()
+  let line = getline(v:lnum)
+  if line =~ '^\s*\*'
+    return cindent(v:lnum)
+  endif
+
+  let pnum = s:prevnonblanknoncomment(v:lnum - 1)
+  if pnum == 0
+    return 0
+  endif
+
+  return indent(pnum) + s:count_braces(pnum, 1) * shiftwidth()
+        \ - s:count_braces(v:lnum, 0) * shiftwidth()
+endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/indent/cuda.vim b/indent/cuda.vim
new file mode 100644
index 000000000..22552a293
--- /dev/null
+++ b/indent/cuda.vim
@@ -0,0 +1,19 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cuda') == -1
+
+" Vim indent file
+" Language:	CUDA
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2008 Nov 29
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+   finish
+endif
+let b:did_indent = 1
+
+" It's just like C indenting
+setlocal cindent
+
+let b:undo_indent = "setl cin<"
+
+endif
diff --git a/indent/dictconf.vim b/indent/dictconf.vim
new file mode 100644
index 000000000..3a10fef5c
--- /dev/null
+++ b/indent/dictconf.vim
@@ -0,0 +1,17 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictconf') == -1
+
+" Vim indent file
+" Language:             dict(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-12-20
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentkeys=0{,0},!^F,o,O cinwords= autoindent smartindent
+setlocal nosmartindent
+inoremap <buffer> # X#
+
+endif
diff --git a/indent/dictdconf.vim b/indent/dictdconf.vim
new file mode 100644
index 000000000..4338ff88d
--- /dev/null
+++ b/indent/dictdconf.vim
@@ -0,0 +1,17 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictdconf') == -1
+
+" Vim indent file
+" Language:             dictd(8) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-12-20
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentkeys=0{,0},!^F,o,O cinwords= autoindent smartindent
+setlocal nosmartindent
+inoremap <buffer> # X#
+
+endif
diff --git a/indent/dosbatch.vim b/indent/dosbatch.vim
new file mode 100644
index 000000000..f4352ead8
--- /dev/null
+++ b/indent/dosbatch.vim
@@ -0,0 +1,63 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosbatch') == -1
+
+" Vim indent file
+" Language:	MSDOS batch file (with NT command extensions)
+" Maintainer:	Ken Takata
+" URL:		https://github.com/k-takata/vim-dosbatch-indent
+" Last Change:	2017 May 10
+" Filenames:	*.bat
+" License:	VIM License
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal nosmartindent
+setlocal noautoindent
+setlocal indentexpr=GetDosBatchIndent(v:lnum)
+setlocal indentkeys=!^F,o,O
+setlocal indentkeys+=0=)
+
+if exists("*GetDosBatchIndent")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+function! GetDosBatchIndent(lnum)
+  let l:prevlnum = prevnonblank(a:lnum-1)
+  if l:prevlnum == 0
+    " top of file
+    return 0
+  endif
+
+  " grab the previous and current line, stripping comments.
+  let l:prevl = substitute(getline(l:prevlnum), '\c^\s*\%(@\s*\)\?rem\>.*$', '', '')
+  let l:thisl = getline(a:lnum)
+  let l:previ = indent(l:prevlnum)
+
+  let l:ind = l:previ
+
+  if l:prevl =~? '^\s*@\=if\>.*(\s*$' ||
+        \ l:prevl =~? '\<do\>\s*(\s*$' ||
+        \ l:prevl =~? '\<else\>\s*\%(if\>.*\)\?(\s*$' ||
+        \ l:prevl =~? '^.*\(&&\|||\)\s*(\s*$'
+    " previous line opened a block
+    let l:ind += shiftwidth()
+  endif
+  if l:thisl =~ '^\s*)'
+    " this line closed a block
+    let l:ind -= shiftwidth()
+  endif
+
+  return l:ind
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8 sw=2 sts=2
+
+endif
diff --git a/indent/dtd.vim b/indent/dtd.vim
new file mode 100644
index 000000000..189182b1d
--- /dev/null
+++ b/indent/dtd.vim
@@ -0,0 +1,329 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dtd') == -1
+
+" Vim indent file
+" Language:    	    DTD (Document Type Definition for XML)
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2011-07-08
+
+setlocal indentexpr=GetDTDIndent()
+setlocal indentkeys=!^F,o,O,>
+setlocal nosmartindent
+
+if exists("*GetDTDIndent")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" TODO: Needs to be adjusted to stop at [, <, and ].
+let s:token_pattern = '^[^[:space:]]\+'
+
+function s:lex1(input, start, ...)
+  let pattern = a:0 > 0 ? a:1 : s:token_pattern
+  let start = matchend(a:input, '^\_s*', a:start)
+  if start == -1
+    return ["", a:start]
+  endif
+  let end = matchend(a:input, pattern, start)
+  if end == -1
+    return ["", a:start]
+  endif
+  let token = strpart(a:input, start, end - start)
+  return [token, end]
+endfunction
+
+function s:lex(input, start, ...)
+  let pattern = a:0 > 0 ? a:1 : s:token_pattern
+  let info = s:lex1(a:input, a:start, pattern)
+  while info[0] == '--'
+    let info = s:lex1(a:input, info[1], pattern)
+    while info[0] != "" && info[0] != '--'
+      let info = s:lex1(a:input, info[1], pattern)
+    endwhile
+    if info[0] == ""
+      return info
+    endif
+    let info = s:lex1(a:input, info[1], pattern)
+  endwhile
+  return info
+endfunction
+
+function s:indent_to_innermost_parentheses(line, end)
+  let token = '('
+  let end = a:end
+  let parentheses = [end - 1]
+  while token != ""
+    let [token, end] = s:lex(a:line, end, '^\%([(),|]\|[A-Za-z0-9_-]\+\|#P\=CDATA\|%[A-Za-z0-9_-]\+;\)[?*+]\=')
+    if token[0] == '('
+      call add(parentheses, end - 1)
+    elseif token[0] == ')'
+      if len(parentheses) == 1
+        return [-1, end]
+      endif
+      call remove(parentheses, -1)
+    endif
+  endwhile
+  return [parentheses[-1] - strridx(a:line, "\n", parentheses[-1]), end]
+endfunction
+
+" TODO: Line and end could be script global (think OO members).
+function GetDTDIndent()
+  if v:lnum == 1
+    return 0
+  endif
+  
+  " Begin by searching back for a <! that isn’t inside a comment.
+  " From here, depending on what follows immediately after, parse to
+  " where we’re at to determine what to do.
+  if search('<!', 'bceW') == 0
+    return indent(v:lnum - 1)
+  endif
+  let lnum = line('.')
+  let col = col('.')
+  let indent = indent('.')
+  let line = lnum == v:lnum ? getline(lnum) : join(getline(lnum, v:lnum - 1), "\n")
+
+  let [declaration, end] = s:lex1(line, col)
+  if declaration == ""
+    return indent + shiftwidth()
+  elseif declaration == '--'
+    " We’re looking at a comment.  Now, simply determine if the comment is
+    " terminated or not.  If it isn’t, let Vim take care of that using
+    " 'comments' and 'autoindent'. Otherwise, indent to the first lines level.
+    while declaration != ""
+      let [declaration, end] = s:lex(line, end)
+      if declaration == "-->"
+        return indent
+      endif
+    endwhile
+    return -1
+  elseif declaration == 'ELEMENT'
+    " Check for element name.  If none exists, indent one level.
+    let [name, end] = s:lex(line, end)
+    if name == ""
+      return indent + shiftwidth()
+    endif
+
+    " Check for token following element name.  This can be a specification of
+    " whether the start or end tag may be omitted.  If nothing is found, indent
+    " one level.
+    let [token, end] = s:lex(line, end, '^\%([-O(]\|ANY\|EMPTY\)')
+    let n = 0
+    while token =~ '[-O]' && n < 2
+      let [token, end] = s:lex(line, end, '^\%([-O(]\|ANY\|EMPTY\)')
+      let n += 1
+    endwhile
+    if token == ""
+      return indent + shiftwidth()
+    endif
+
+    " Next comes the content model.  If the token we’ve found isn’t a
+    " parenthesis it must be either ANY, EMPTY or some random junk.  Either
+    " way, we’re done indenting this element, so set it to that of the first
+    " line so that the terminating “>” winds up having the same indention.
+    if token != '('
+      return indent
+    endif
+
+    " Now go through the content model.  We need to keep track of the nesting
+    " of parentheses.  As soon as we hit 0 we’re done.  If that happens we must
+    " have a complete content model.  Thus set indention to be the same as that
+    " of the first line so that the terminating “>” winds up having the same
+    " indention.  Otherwise, we’ll indent to the innermost parentheses not yet
+    " matched.
+    let [indent_of_innermost, end] = s:indent_to_innermost_parentheses(line, end)
+    if indent_of_innermost != -1
+      return indent_of_innermost
+    endif
+
+    " Finally, look for any additions and/or exceptions to the content model.
+    " This is defined by a “+” or “-” followed by another content model
+    " declaration.
+    " TODO: Can the “-” be separated by whitespace from the “(”?
+    let seen = { '+(': 0, '-(': 0 }
+    while 1
+      let [additions_exceptions, end] = s:lex(line, end, '^[+-](')
+      if additions_exceptions != '+(' && additions_exceptions != '-('
+        let [token, end] = s:lex(line, end)
+        if token == '>'
+          return indent
+        endif
+        " TODO: Should use s:lex here on getline(v:lnum) and check for >.
+        return getline(v:lnum) =~ '^\s*>' || count(values(seen), 0) == 0 ? indent : (indent + shiftwidth())
+      endif
+
+      " If we’ve seen an addition or exception already and this is of the same
+      " kind, the user is writing a broken DTD.  Time to bail.
+      if seen[additions_exceptions]
+        return indent
+      endif
+      let seen[additions_exceptions] = 1
+
+      let [indent_of_innermost, end] = s:indent_to_innermost_parentheses(line, end)
+      if indent_of_innermost != -1
+        return indent_of_innermost
+      endif
+    endwhile
+  elseif declaration == 'ATTLIST'
+    " Check for element name.  If none exists, indent one level.
+    let [name, end] = s:lex(line, end)
+    if name == ""
+      return indent + shiftwidth()
+    endif
+
+    " Check for any number of attributes.
+    while 1
+      " Check for attribute name.  If none exists, indent one level, unless the
+      " current line is a lone “>”, in which case we indent to the same level
+      " as the first line.  Otherwise, if the attribute name is “>”, we have
+      " actually hit the end of the attribute list, in which case we indent to
+      " the same level as the first line.
+      let [name, end] = s:lex(line, end)
+      if name == ""
+        " TODO: Should use s:lex here on getline(v:lnum) and check for >.
+        return getline(v:lnum) =~ '^\s*>' ? indent : (indent + shiftwidth())
+      elseif name == ">"
+        return indent
+      endif
+
+      " Check for attribute value declaration.  If none exists, indent two
+      " levels.  Otherwise, if it’s an enumerated value, check for nested
+      " parentheses and indent to the innermost one if we don’t reach the end
+      " of the listc.  Otherwise, just continue with looking for the default
+      " attribute value.
+      " TODO: Do validation of keywords
+      " (CDATA|NMTOKEN|NMTOKENS|ID|IDREF|IDREFS|ENTITY|ENTITIES)?
+      let [value, end] = s:lex(line, end, '^\%((\|[^[:space:]]\+\)')
+      if value == ""
+        return indent + shiftwidth() * 2
+      elseif value == 'NOTATION'
+        " If this is a enumerated value based on notations, read another token
+        " for the actual value.  If it doesn’t exist, indent three levels.
+        " TODO: If validating according to above, value must be equal to '('.
+        let [value, end] = s:lex(line, end, '^\%((\|[^[:space:]]\+\)')
+        if value == ""
+          return indent + shiftwidth() * 3
+        endif
+      endif
+
+      if value == '('
+        let [indent_of_innermost, end] = s:indent_to_innermost_parentheses(line, end)
+        if indent_of_innermost != -1
+          return indent_of_innermost
+        endif
+      endif
+
+      " Finally look for the attribute’s default value.  If non exists, indent
+      " two levels.
+      let [default, end] = s:lex(line, end, '^\%("\_[^"]*"\|#\(REQUIRED\|IMPLIED\|FIXED\)\)')
+      if default == ""
+        return indent + shiftwidth() * 2
+      elseif default == '#FIXED'
+        " We need to look for the fixed value.  If non exists, indent three
+        " levels.
+        let [default, end] = s:lex(line, end, '^"\_[^"]*"')
+        if default == ""
+          return indent + shiftwidth() * 3
+        endif
+      endif
+    endwhile
+  elseif declaration == 'ENTITY'
+    " Check for entity name.  If none exists, indent one level.  Otherwise, if
+    " the name actually turns out to be a percent sign, “%”, this is a
+    " parameter entity.  Read another token to determine the entity name and,
+    " again, if none exists, indent one level.
+    let [name, end] = s:lex(line, end)
+    if name == ""
+      return indent + shiftwidth()
+    elseif name == '%'
+      let [name, end] = s:lex(line, end)
+      if name == ""
+        return indent + shiftwidth()
+      endif
+    endif
+
+    " Now check for the entity value.  If none exists, indent one level.  If it
+    " does exist, indent to same level as first line, as we’re now done with
+    " this entity.
+    "
+    " The entity value can be a string in single or double quotes (no escapes
+    " to worry about, as entities are used instead).  However, it can also be
+    " that this is an external unparsed entity.  In that case we have to look
+    " further for (possibly) a public ID and an URI followed by the NDATA
+    " keyword and the actual notation name.  For the public ID and URI, indent
+    " two levels, if they don’t exist.  If the NDATA keyword doesn’t exist,
+    " indent one level.  Otherwise, if the actual notation name doesn’t exist,
+    " indent two level.  If it does, indent to same level as first line, as
+    " we’re now done with this entity.
+    let [value, end] = s:lex(line, end)
+    if value == ""
+      return indent + shiftwidth()
+    elseif value == 'SYSTEM' || value == 'PUBLIC'
+      let [quoted_string, end] = s:lex(line, end, '\%("[^"]\+"\|''[^'']\+''\)')
+      if quoted_string == ""
+        return indent + shiftwidth() * 2
+      endif
+
+      if value == 'PUBLIC'
+        let [quoted_string, end] = s:lex(line, end, '\%("[^"]\+"\|''[^'']\+''\)')
+        if quoted_string == ""
+          return indent + shiftwidth() * 2
+        endif
+      endif
+
+      let [ndata, end] = s:lex(line, end)
+      if ndata == ""
+        return indent + shiftwidth()
+      endif
+
+      let [name, end] = s:lex(line, end)
+      return name == "" ? (indent + shiftwidth() * 2) : indent
+    else
+      return indent
+    endif
+  elseif declaration == 'NOTATION'
+    " Check for notation name.  If none exists, indent one level.
+    let [name, end] = s:lex(line, end)
+    if name == ""
+      return indent + shiftwidth()
+    endif
+
+    " Now check for the external ID.  If none exists, indent one level.
+    let [id, end] = s:lex(line, end)
+    if id == ""
+      return indent + shiftwidth()
+    elseif id == 'SYSTEM' || id == 'PUBLIC'
+      let [quoted_string, end] = s:lex(line, end, '\%("[^"]\+"\|''[^'']\+''\)')
+      if quoted_string == ""
+        return indent + shiftwidth() * 2
+      endif
+
+      if id == 'PUBLIC'
+        let [quoted_string, end] = s:lex(line, end, '\%("[^"]\+"\|''[^'']\+''\|>\)')
+        if quoted_string == ""
+          " TODO: Should use s:lex here on getline(v:lnum) and check for >.
+          return getline(v:lnum) =~ '^\s*>' ? indent : (indent + shiftwidth() * 2)
+        elseif quoted_string == '>'
+          return indent
+        endif
+      endif
+    endif
+
+    return indent
+  endif
+
+  " TODO: Processing directives could be indented I suppose.  But perhaps it’s
+  " just as well to let the user decide how to indent them (perhaps extending
+  " this function to include proper support for whatever processing directive
+  " language they want to use).
+
+  " Conditional sections are simply passed along to let Vim decide what to do
+  " (and hence the user).
+  return -1
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/indent/dylan.vim b/indent/dylan.vim
new file mode 100644
index 000000000..f882f7bdb
--- /dev/null
+++ b/indent/dylan.vim
@@ -0,0 +1,94 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylan') == -1
+
+" Vim indent file
+" Language:	Dylan
+" Version:	0.01
+" Last Change:	2017 Jun 13
+" Maintainer:	Brent A. Fulgham <bfulgham@debian.org>
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentkeys+==~begin,=~block,=~case,=~cleanup,=~define,=~end,=~else,=~elseif,=~exception,=~for,=~finally,=~if,=~otherwise,=~select,=~unless,=~while
+
+" Define the appropriate indent function but only once
+setlocal indentexpr=DylanGetIndent()
+if exists("*DylanGetIndent")
+  finish
+endif
+
+function DylanGetIndent()
+  " Get the line to be indented
+  let cline = getline(v:lnum)
+
+  " Don't reindent comments on first column
+  if cline =~ '^/\[/\*]'
+    return 0
+  endif
+
+  "Find the previous non-blank line
+  let lnum = prevnonblank(v:lnum - 1)
+  "Use zero indent at the top of the file
+  if lnum == 0
+    return 0
+  endif
+
+  let prevline=getline(lnum)
+  let ind = indent(lnum)
+  let chg = 0
+
+  " If previous line was a comment, use its indent
+  if prevline =~ '^\s*//'
+    return ind
+  endif
+
+  " If previous line was a 'define', indent
+  if prevline =~? '\(^\s*\(begin\|block\|case\|define\|else\|elseif\|for\|finally\|if\|select\|unless\|while\)\|\s*\S*\s*=>$\)'
+    let chg = shiftwidth()
+  " local methods indent the shift-width, plus 6 for the 'local'
+  elseif prevline =~? '^\s*local'
+    let chg = shiftwidth() + 6
+  " If previous line was a let with no closing semicolon, indent
+  elseif prevline =~? '^\s*let.*[^;]\s*$'
+    let chg = shiftwidth()
+  " If previous line opened a parenthesis, and did not close it, indent
+  elseif prevline =~ '^.*(\s*[^)]*\((.*)\)*[^)]*$'
+    return = match( prevline, '(.*\((.*)\|[^)]\)*.*$') + 1
+  "elseif prevline =~ '^.*(\s*[^)]*\((.*)\)*[^)]*$'
+  elseif prevline =~ '^[^(]*)\s*$'
+    " This line closes a parenthesis.  Find opening
+    let curr_line = prevnonblank(lnum - 1)
+    while curr_line >= 0
+      let str = getline(curr_line)
+      if str !~ '^.*(\s*[^)]*\((.*)\)*[^)]*$'
+	let curr_line = prevnonblank(curr_line - 1)
+      else
+	break
+      endif
+    endwhile
+    if curr_line < 0
+      return -1
+    endif
+    let ind = indent(curr_line)
+    " Although we found the closing parenthesis, make sure this
+    " line doesn't start with an indentable command:
+    let curr_str = getline(curr_line)
+    if curr_str =~? '^\s*\(begin\|block\|case\|define\|else\|elseif\|for\|finally\|if\|select\|unless\|while\)'
+      let chg = shiftwidth()
+    endif
+  endif
+
+  " If a line starts with end, un-indent (even if we just indented!)
+  if cline =~? '^\s*\(cleanup\|end\|else\|elseif\|exception\|finally\|otherwise\)'
+    let chg = chg - shiftwidth()
+  endif
+
+  return ind + chg
+endfunction
+
+" vim:sw=2 tw=130
+
+endif
diff --git a/indent/eterm.vim b/indent/eterm.vim
new file mode 100644
index 000000000..6042815ce
--- /dev/null
+++ b/indent/eterm.vim
@@ -0,0 +1,40 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'eterm') == -1
+
+" Vim indent file
+" Language:             Eterm configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-12-20
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetEtermIndent()
+setlocal indentkeys=!^F,o,O,=end
+setlocal nosmartindent
+
+if exists("*GetEtermIndent")
+  finish
+endif
+
+function GetEtermIndent()
+  let lnum = prevnonblank(v:lnum - 1)
+  if lnum == 0
+    return 0
+  endif
+
+  let ind = indent(lnum)
+
+  if getline(lnum) =~ '^\s*begin\>'
+    let ind = ind + shiftwidth()
+  endif
+
+  if getline(v:lnum) =~ '^\s*end\>'
+    let ind = ind - shiftwidth()
+  endif
+
+  return ind
+endfunction
+
+endif
diff --git a/indent/falcon.vim b/indent/falcon.vim
new file mode 100644
index 000000000..a00d80a74
--- /dev/null
+++ b/indent/falcon.vim
@@ -0,0 +1,455 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'falcon') == -1
+
+" Vim indent file
+" Language: Falcon
+" Maintainer: Steven Oliver <oliver.steven@gmail.com>
+" Website: https://steveno@github.com/steveno/falconpl-vim.git
+" Credits: This is, to a great extent, a copy n' paste of ruby.vim.
+
+" 1. Setup {{{1
+" ============
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+setlocal nosmartindent
+
+" Setup indent function and when to use it
+setlocal indentexpr=FalconGetIndent(v:lnum)
+setlocal indentkeys=0{,0},0),0],!^F,o,O,e
+setlocal indentkeys+==~case,=~catch,=~default,=~elif,=~else,=~end,=~\"
+
+" Define the appropriate indent function but only once
+if exists("*FalconGetIndent")
+    finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" 2. Variables {{{1
+" ============
+
+" Regex of syntax group names that are strings AND comments
+let s:syng_strcom = '\<falcon\%(String\|StringEscape\|Comment\)\>'
+
+" Regex of syntax group names that are strings
+let s:syng_string = '\<falcon\%(String\|StringEscape\)\>'
+
+" Regex that defines blocks.
+"
+" Note that there's a slight problem with this regex and s:continuation_regex.
+" Code like this will be matched by both:
+"
+"   method_call do |(a, b)|
+"
+" The reason is that the pipe matches a hanging "|" operator.
+"
+let s:block_regex =
+      \ '\%(\<do:\@!\>\|%\@<!{\)\s*\%(|\s*(*\s*\%([*@&]\=\h\w*,\=\s*\)\%(,\s*(*\s*[*@&]\=\h\w*\s*)*\s*\)*|\)\=\s*\%(#.*\)\=$'
+
+let s:block_continuation_regex = '^\s*[^])}\t ].*'.s:block_regex
+
+" Regex that defines continuation lines.
+" TODO: this needs to deal with if ...: and so on
+let s:continuation_regex =
+      \ '\%(%\@<![({[\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
+
+" Regex that defines bracket continuations
+let s:bracket_continuation_regex = '%\@<!\%([({[]\)\s*\%(#.*\)\=$'
+
+" Regex that defines continuation lines, not including (, {, or [.
+let s:non_bracket_continuation_regex = '\%([\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
+
+" Keywords to indent on
+let s:falcon_indent_keywords = '^\s*\(case\|catch\|class\|enum\|default\|elif\|else' .
+    \ '\|for\|function\|if.*"[^"]*:.*"\|if \(\(:\)\@!.\)*$\|loop\|object\|select' .
+    \ '\|switch\|try\|while\|\w*\s*=\s*\w*([$\)'
+
+" Keywords to deindent on
+let s:falcon_deindent_keywords = '^\s*\(case\|catch\|default\|elif\|else\|end\)'
+
+" 3. Functions {{{1
+" ============
+
+" Check if the character at lnum:col is inside a string, comment, or is ascii.
+function s:IsInStringOrComment(lnum, col)
+    return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_strcom
+endfunction
+
+" Check if the character at lnum:col is inside a string.
+function s:IsInString(lnum, col)
+    return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_string
+endfunction
+
+" Check if the character at lnum:col is inside a string delimiter
+function s:IsInStringDelimiter(lnum, col)
+    return synIDattr(synID(a:lnum, a:col, 1), 'name') == 'falconStringDelimiter'
+endfunction
+
+" Find line above 'lnum' that isn't empty, in a comment, or in a string.
+function s:PrevNonBlankNonString(lnum)
+    let in_block = 0
+    let lnum = prevnonblank(a:lnum)
+    while lnum > 0
+	" Go in and out of blocks comments as necessary.
+	" If the line isn't empty (with opt. comment) or in a string, end search.
+	let line = getline(lnum)
+	if line =~ '^=begin'
+	    if in_block
+		let in_block = 0
+	    else
+		break
+	    endif
+	elseif !in_block && line =~ '^=end'
+	    let in_block = 1
+	elseif !in_block && line !~ '^\s*#.*$' && !(s:IsInStringOrComment(lnum, 1)
+		    \ && s:IsInStringOrComment(lnum, strlen(line)))
+	    break
+	endif
+	let lnum = prevnonblank(lnum - 1)
+    endwhile
+    return lnum
+endfunction
+
+" Find line above 'lnum' that started the continuation 'lnum' may be part of.
+function s:GetMSL(lnum)
+    " Start on the line we're at and use its indent.
+    let msl = a:lnum
+    let msl_body = getline(msl)
+    let lnum = s:PrevNonBlankNonString(a:lnum - 1)
+    while lnum > 0
+	" If we have a continuation line, or we're in a string, use line as MSL.
+	" Otherwise, terminate search as we have found our MSL already.
+	let line = getline(lnum)
+	
+	if s:Match(line, s:non_bracket_continuation_regex) &&
+          	\ s:Match(msl, s:non_bracket_continuation_regex)
+	    " If the current line is a non-bracket continuation and so is the
+	    " previous one, keep its indent and continue looking for an MSL.
+	    "    
+	    " Example:
+	    "   method_call one,
+	    "       two,
+	    "           three
+	    "           
+	    let msl = lnum
+	elseif s:Match(lnum, s:non_bracket_continuation_regex) &&
+		    \ (s:Match(msl, s:bracket_continuation_regex) || s:Match(msl, s:block_continuation_regex))
+	    " If the current line is a bracket continuation or a block-starter, but
+	    " the previous is a non-bracket one, respect the previous' indentation,
+	    " and stop here.
+	    " 
+	    " Example:
+	    "   method_call one,
+	    "       two {
+	    "           three
+	    "
+	    return lnum
+	elseif s:Match(lnum, s:bracket_continuation_regex) &&
+		    \ (s:Match(msl, s:bracket_continuation_regex) || s:Match(msl, s:block_continuation_regex))
+	    " If both lines are bracket continuations (the current may also be a
+	    " block-starter), use the current one's and stop here
+	    "
+	    " Example:
+	    "   method_call(
+	    "       other_method_call(
+	    "             foo
+	    return msl
+	elseif s:Match(lnum, s:block_regex) &&
+		    \ !s:Match(msl, s:continuation_regex) &&
+		    \ !s:Match(msl, s:block_continuation_regex)
+	    " If the previous line is a block-starter and the current one is
+	    " mostly ordinary, use the current one as the MSL.
+	    " 
+	    " Example:
+	    "   method_call do
+	    "       something
+	    "           something_else
+	    return msl
+	else
+	    let col = match(line, s:continuation_regex) + 1
+	    if (col > 0 && !s:IsInStringOrComment(lnum, col))
+			\ || s:IsInString(lnum, strlen(line))
+		let msl = lnum
+	    else
+		break
+	    endif
+	endif
+	
+	let msl_body = getline(msl)
+	let lnum = s:PrevNonBlankNonString(lnum - 1)
+    endwhile
+    return msl
+endfunction
+
+" Check if line 'lnum' has more opening brackets than closing ones.
+function s:ExtraBrackets(lnum)
+    let opening = {'parentheses': [], 'braces': [], 'brackets': []}
+    let closing = {'parentheses': [], 'braces': [], 'brackets': []}
+
+    let line = getline(a:lnum)
+    let pos  = match(line, '[][(){}]', 0)
+
+    " Save any encountered opening brackets, and remove them once a matching
+    " closing one has been found. If a closing bracket shows up that doesn't
+    " close anything, save it for later.
+    while pos != -1
+	if !s:IsInStringOrComment(a:lnum, pos + 1)
+	    if line[pos] == '('
+		call add(opening.parentheses, {'type': '(', 'pos': pos})
+	    elseif line[pos] == ')'
+		if empty(opening.parentheses)
+		    call add(closing.parentheses, {'type': ')', 'pos': pos})
+		else
+		    let opening.parentheses = opening.parentheses[0:-2]
+		endif
+	    elseif line[pos] == '{'
+		call add(opening.braces, {'type': '{', 'pos': pos})
+	    elseif line[pos] == '}'
+		if empty(opening.braces)
+		    call add(closing.braces, {'type': '}', 'pos': pos})
+		else
+		    let opening.braces = opening.braces[0:-2]
+		endif
+	    elseif line[pos] == '['
+		call add(opening.brackets, {'type': '[', 'pos': pos})
+	    elseif line[pos] == ']'
+		if empty(opening.brackets)
+		    call add(closing.brackets, {'type': ']', 'pos': pos})
+		else
+		    let opening.brackets = opening.brackets[0:-2]
+		endif
+	    endif
+	endif
+	
+	let pos = match(line, '[][(){}]', pos + 1)
+    endwhile
+
+    " Find the rightmost brackets, since they're the ones that are important in
+    " both opening and closing cases
+    let rightmost_opening = {'type': '(', 'pos': -1}
+    let rightmost_closing = {'type': ')', 'pos': -1}
+
+    for opening in opening.parentheses + opening.braces + opening.brackets
+	if opening.pos > rightmost_opening.pos
+	    let rightmost_opening = opening
+	endif
+    endfor
+
+    for closing in closing.parentheses + closing.braces + closing.brackets
+	if closing.pos > rightmost_closing.pos
+	    let rightmost_closing = closing
+	endif
+    endfor
+
+    return [rightmost_opening, rightmost_closing]
+endfunction
+
+function s:Match(lnum, regex)
+    let col = match(getline(a:lnum), '\C'.a:regex) + 1
+    return col > 0 && !s:IsInStringOrComment(a:lnum, col) ? col : 0
+endfunction
+
+function s:MatchLast(lnum, regex)
+    let line = getline(a:lnum)
+    let col = match(line, '.*\zs' . a:regex)
+    while col != -1 && s:IsInStringOrComment(a:lnum, col)
+	let line = strpart(line, 0, col)
+	let col = match(line, '.*' . a:regex)
+    endwhile
+    return col + 1
+endfunction
+
+" 4. FalconGetIndent Routine {{{1
+" ============
+
+function FalconGetIndent(...)
+    " For the current line, use the first argument if given, else v:lnum
+    let clnum = a:0 ? a:1 : v:lnum
+
+    " Use zero indent at the top of the file
+    if clnum == 0
+        return 0
+    endif
+
+    let line = getline(clnum)
+    let ind = -1
+
+    " If we got a closing bracket on an empty line, find its match and indent
+    " according to it.  For parentheses we indent to its column - 1, for the
+    " others we indent to the containing line's MSL's level.  Return -1 if fail.
+    let col = matchend(line, '^\s*[]})]')
+    if col > 0 && !s:IsInStringOrComment(clnum, col)
+	call cursor(clnum, col)
+	let bs = strpart('(){}[]', stridx(')}]', line[col - 1]) * 2, 2)
+	if searchpair(escape(bs[0], '\['), '', bs[1], 'bW', s:skip_expr) > 0
+	    if line[col-1]==')' && col('.') != col('$') - 1
+		let ind = virtcol('.') - 1
+	    else
+		let ind = indent(s:GetMSL(line('.')))
+	    endif
+	endif
+	return ind
+    endif
+
+    " If we have a deindenting keyword, find its match and indent to its level.
+    " TODO: this is messy
+    if s:Match(clnum, s:falcon_deindent_keywords)
+	call cursor(clnum, 1)
+	if searchpair(s:end_start_regex, s:end_middle_regex, s:end_end_regex, 'bW',
+		    \ s:end_skip_expr) > 0
+	    let msl  = s:GetMSL(line('.'))
+	    let line = getline(line('.'))
+
+	    if strpart(line, 0, col('.') - 1) =~ '=\s*$' &&
+			\ strpart(line, col('.') - 1, 2) !~ 'do'
+		let ind = virtcol('.') - 1
+	    elseif getline(msl) =~ '=\s*\(#.*\)\=$'
+		let ind = indent(line('.'))
+	    else
+		let ind = indent(msl)
+	    endif
+	endif
+	return ind
+    endif
+
+    " If we are in a multi-line string or line-comment, don't do anything to it.
+    if s:IsInString(clnum, matchend(line, '^\s*') + 1)
+	return indent('.')
+    endif
+
+    " Find a non-blank, non-multi-line string line above the current line.
+    let lnum = s:PrevNonBlankNonString(clnum - 1)
+
+    " If the line is empty and inside a string, use the previous line.
+    if line =~ '^\s*$' && lnum != prevnonblank(clnum - 1)
+	return indent(prevnonblank(clnum))
+    endif
+
+    " At the start of the file use zero indent.
+    if lnum == 0
+	return 0
+    endif
+
+    " Set up variables for the previous line.
+    let line = getline(lnum)
+    let ind = indent(lnum)
+
+    " If the previous line ended with a block opening, add a level of indent.
+    if s:Match(lnum, s:block_regex)
+	return indent(s:GetMSL(lnum)) + shiftwidth()
+    endif
+
+    " If it contained hanging closing brackets, find the rightmost one, find its
+    " match and indent according to that.
+    if line =~ '[[({]' || line =~ '[])}]\s*\%(#.*\)\=$'
+	let [opening, closing] = s:ExtraBrackets(lnum)
+
+	if opening.pos != -1
+	    if opening.type == '(' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0
+		if col('.') + 1 == col('$')
+		    return ind + shiftwidth()
+		else
+		    return virtcol('.')
+		endif
+	    else
+		let nonspace = matchend(line, '\S', opening.pos + 1) - 1
+		return nonspace > 0 ? nonspace : ind + shiftwidth()
+	    endif
+	elseif closing.pos != -1
+	    call cursor(lnum, closing.pos + 1)
+	    normal! %
+
+	    if s:Match(line('.'), s:falcon_indent_keywords)
+		return indent('.') + shiftwidth()
+	    else
+		return indent('.')
+	    endif
+	else
+	    call cursor(clnum, 0)  " FIXME: column was vcol
+	end
+    endif
+
+    " If the previous line ended with an "end", match that "end"s beginning's
+    " indent.
+    let col = s:Match(lnum, '\%(^\|[^.:@$]\)\<end\>\s*\%(#.*\)\=$')
+    if col > 0
+	call cursor(lnum, col)
+	if searchpair(s:end_start_regex, '', s:end_end_regex, 'bW',
+		    \ s:end_skip_expr) > 0
+	    let n = line('.')
+	    let ind = indent('.')
+	    let msl = s:GetMSL(n)
+	    if msl != n
+		let ind = indent(msl)
+	    end
+	    return ind
+	endif
+    end
+
+    let col = s:Match(lnum, s:falcon_indent_keywords)
+    if col > 0
+	call cursor(lnum, col)
+	let ind = virtcol('.') - 1 + shiftwidth()
+	" TODO: make this better (we need to count them) (or, if a searchpair
+	" fails, we know that something is lacking an end and thus we indent a
+	" level
+	if s:Match(lnum, s:end_end_regex)
+	    let ind = indent('.')
+	endif
+	return ind
+    endif
+
+    " Set up variables to use and search for MSL to the previous line.
+    let p_lnum = lnum
+    let lnum = s:GetMSL(lnum)
+
+    " If the previous line wasn't a MSL and is continuation return its indent.
+    " TODO: the || s:IsInString() thing worries me a bit.
+    if p_lnum != lnum
+	if s:Match(p_lnum, s:non_bracket_continuation_regex) || s:IsInString(p_lnum,strlen(line))
+	    return ind
+	endif
+    endif
+
+    " Set up more variables, now that we know we wasn't continuation bound.
+    let line = getline(lnum)
+    let msl_ind = indent(lnum)
+
+    " If the MSL line had an indenting keyword in it, add a level of indent.
+    " TODO: this does not take into account contrived things such as
+    " module Foo; class Bar; end
+    if s:Match(lnum, s:falcon_indent_keywords)
+	let ind = msl_ind + shiftwidth()
+	if s:Match(lnum, s:end_end_regex)
+	    let ind = ind - shiftwidth()
+	endif
+	return ind
+    endif
+
+    " If the previous line ended with [*+/.,-=], but wasn't a block ending or a
+    " closing bracket, indent one extra level.
+    if s:Match(lnum, s:non_bracket_continuation_regex) && !s:Match(lnum, '^\s*\([\])}]\|end\)')
+	if lnum == p_lnum
+	    let ind = msl_ind + shiftwidth()
+	else
+	    let ind = msl_ind
+	endif
+	return ind
+    endif
+
+  return ind
+endfunction
+
+" }}}1
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: set sw=4 sts=4 et tw=80 :
+
+endif
diff --git a/indent/fortran.vim b/indent/fortran.vim
new file mode 100644
index 000000000..1fed2974d
--- /dev/null
+++ b/indent/fortran.vim
@@ -0,0 +1,223 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
+
+" Vim indent file
+" Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
+" Version:	47
+" Last Change:	2020 Apr 20
+" Patched By:	Eisuke Kawashima
+" Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
+" Usage:	For instructions, do :help fortran-indent from Vim
+" Credits:
+"  Useful suggestions were made, in chronological order, by:
+"  Albert Oliver Serra, Takuya Fujiwara and Philipp Edelmann.
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+let s:cposet=&cpoptions
+set cpoptions&vim
+
+setlocal indentkeys+==~end,=~case,=~if,=~else,=~do,=~where,=~elsewhere,=~select
+setlocal indentkeys+==~endif,=~enddo,=~endwhere,=~endselect,=~elseif
+setlocal indentkeys+==~type,=~interface,=~forall,=~associate,=~block,=~enum
+setlocal indentkeys+==~endforall,=~endassociate,=~endblock,=~endenum
+if exists("b:fortran_indent_more") || exists("g:fortran_indent_more")
+  setlocal indentkeys+==~function,=~subroutine,=~module,=~contains,=~program
+  setlocal indentkeys+==~endfunction,=~endsubroutine,=~endmodule
+  setlocal indentkeys+==~endprogram
+endif
+
+" Determine whether this is a fixed or free format source file
+" if this hasn't been done yet using the priority:
+" buffer-local value
+" > global value
+" > file extension as in Intel ifort, gcc (gfortran), NAG, Pathscale, and Cray compilers
+if !exists("b:fortran_fixed_source")
+  if exists("fortran_free_source")
+    " User guarantees free source form
+    let b:fortran_fixed_source = 0
+  elseif exists("fortran_fixed_source")
+    " User guarantees fixed source form
+    let b:fortran_fixed_source = 1
+  elseif expand("%:e") =~? '^f\%(90\|95\|03\|08\)$'
+    " Free-form file extension defaults as in Intel ifort, gcc(gfortran), NAG, Pathscale, and Cray compilers
+    let b:fortran_fixed_source = 0
+  elseif expand("%:e") =~? '^\%(f\|f77\|for\)$'
+    " Fixed-form file extension defaults
+    let b:fortran_fixed_source = 1
+  else
+    " Modern fortran still allows both fixed and free source form
+    " Assume fixed source form unless signs of free source form
+    " are detected in the first five columns of the first s:lmax lines.
+    " Detection becomes more accurate and time-consuming if more lines
+    " are checked. Increase the limit below if you keep lots of comments at
+    " the very top of each file and you have a fast computer.
+    let s:lmax = 500
+    if ( s:lmax > line("$") )
+      let s:lmax = line("$")
+    endif
+    let b:fortran_fixed_source = 1
+    let s:ln=1
+    while s:ln <= s:lmax
+      let s:test = strpart(getline(s:ln),0,5)
+      if s:test !~ '^[Cc*]' && s:test !~ '^ *[!#]' && s:test =~ '[^ 0-9\t]' && s:test !~ '^[ 0-9]*\t'
+	let b:fortran_fixed_source = 0
+	break
+      endif
+      let s:ln = s:ln + 1
+    endwhile
+  endif
+endif
+
+" Define the appropriate indent function but only once
+if (b:fortran_fixed_source == 1)
+  setlocal indentexpr=FortranGetFixedIndent()
+  if exists("*FortranGetFixedIndent")
+    finish
+  endif
+else
+  setlocal indentexpr=FortranGetFreeIndent()
+  if exists("*FortranGetFreeIndent")
+    finish
+  endif
+endif
+
+function FortranGetIndent(lnum)
+  let ind = indent(a:lnum)
+  let prevline=getline(a:lnum)
+  " Strip tail comment
+  let prevstat=substitute(prevline, '!.*$', '', '')
+  let prev2line=getline(a:lnum-1)
+  let prev2stat=substitute(prev2line, '!.*$', '', '')
+
+  "Indent do loops only if they are all guaranteed to be of do/end do type
+  if exists("b:fortran_do_enddo") || exists("g:fortran_do_enddo")
+    if prevstat =~? '^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*do\>'
+      let ind = ind + shiftwidth()
+    endif
+    if getline(v:lnum) =~? '^\s*\(\d\+\s\)\=\s*end\s*do\>'
+      let ind = ind - shiftwidth()
+    endif
+  endif
+
+  "Add a shiftwidth to statements following if, else, else if, case, class,
+  "where, else where, forall, type, interface and associate statements
+  if prevstat =~? '^\s*\(case\|class\|else\|else\s*if\|else\s*where\)\>'
+	\ ||prevstat=~? '^\s*\(type\|interface\|associate\|enum\)\>'
+	\ ||prevstat=~?'^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*\(forall\|where\|block\)\>'
+	\ ||prevstat=~? '^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*if\>'
+     let ind = ind + shiftwidth()
+    " Remove unwanted indent after logical and arithmetic ifs
+    if prevstat =~? '\<if\>' && prevstat !~? '\<then\>'
+      let ind = ind - shiftwidth()
+    endif
+    " Remove unwanted indent after type( statements
+    if prevstat =~? '^\s*type\s*('
+      let ind = ind - shiftwidth()
+    endif
+  endif
+
+  "Indent program units unless instructed otherwise
+  if !exists("b:fortran_indent_less") && !exists("g:fortran_indent_less")
+    let prefix='\(\(pure\|impure\|elemental\|recursive\)\s\+\)\{,2}'
+    let type='\(\(integer\|real\|double\s\+precision\|complex\|logical'
+          \.'\|character\|type\|class\)\s*\S*\s\+\)\='
+    if prevstat =~? '^\s*\(contains\|submodule\|program\)\>'
+            \ ||prevstat =~? '^\s*'.'module\>\(\s*\procedure\)\@!'
+            \ ||prevstat =~? '^\s*'.prefix.'subroutine\>'
+            \ ||prevstat =~? '^\s*'.prefix.type.'function\>'
+            \ ||prevstat =~? '^\s*'.type.prefix.'function\>'
+      let ind = ind + shiftwidth()
+    endif
+    if getline(v:lnum) =~? '^\s*contains\>'
+          \ ||getline(v:lnum)=~? '^\s*end\s*'
+          \ .'\(function\|subroutine\|module\|submodule\|program\)\>'
+      let ind = ind - shiftwidth()
+    endif
+  endif
+
+  "Subtract a shiftwidth from else, else if, elsewhere, case, class, end if,
+  " end where, end select, end forall, end interface, end associate,
+  " end enum, end type, end block and end type statements
+  if getline(v:lnum) =~? '^\s*\(\d\+\s\)\=\s*'
+        \. '\(else\|else\s*if\|else\s*where\|case\|class\|'
+        \. 'end\s*\(if\|where\|select\|interface\|'
+        \. 'type\|forall\|associate\|enum\|block\)\)\>'
+    let ind = ind - shiftwidth()
+    " Fix indent for case statement immediately after select
+    if prevstat =~? '\<select\s\+\(case\|type\)\>'
+      let ind = ind + shiftwidth()
+    endif
+  endif
+
+  "First continuation line
+  if prevstat =~ '&\s*$' && prev2stat !~ '&\s*$'
+    let ind = ind + shiftwidth()
+  endif
+  "Line after last continuation line
+  if prevstat !~ '&\s*$' && prev2stat =~ '&\s*$' && prevstat !~? '\<then\>'
+    let ind = ind - shiftwidth()
+  endif
+
+  return ind
+endfunction
+
+function FortranGetFreeIndent()
+  "Find the previous non-blank line
+  let lnum = prevnonblank(v:lnum - 1)
+
+  "Use zero indent at the top of the file
+  if lnum == 0
+    return 0
+  endif
+
+  let ind=FortranGetIndent(lnum)
+  return ind
+endfunction
+
+function FortranGetFixedIndent()
+  let currline=getline(v:lnum)
+  "Don't indent comments, continuation lines and labelled lines
+  if strpart(currline,0,6) =~ '[^ \t]'
+    let ind = indent(v:lnum)
+    return ind
+  endif
+
+  "Find the previous line which is not blank, not a comment,
+  "not a continuation line, and does not have a label
+  let lnum = v:lnum - 1
+  while lnum > 0
+    let prevline=getline(lnum)
+    if (prevline =~ "^[C*!]") || (prevline =~ "^\s*$")
+	\ || (strpart(prevline,5,1) !~ "[ 0]")
+      " Skip comments, blank lines and continuation lines
+      let lnum = lnum - 1
+    else
+      let test=strpart(prevline,0,5)
+      if test =~ "[0-9]"
+	" Skip lines with statement numbers
+	let lnum = lnum - 1
+      else
+	break
+      endif
+    endif
+  endwhile
+
+  "First line must begin at column 7
+  if lnum == 0
+    return 6
+  endif
+
+  let ind=FortranGetIndent(lnum)
+  return ind
+endfunction
+
+let &cpoptions=s:cposet
+unlet s:cposet
+
+" vim:sw=2 tw=130
+
+endif
diff --git a/indent/framescript.vim b/indent/framescript.vim
new file mode 100644
index 000000000..d7a7b0e16
--- /dev/null
+++ b/indent/framescript.vim
@@ -0,0 +1,45 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'framescript') == -1
+
+" Vim indent file
+" Language:             FrameScript
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-19
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetFrameScriptIndent()
+setlocal indentkeys=!^F,o,O,0=~Else,0=~EndIf,0=~EndLoop,0=~EndSub
+setlocal nosmartindent
+
+if exists("*GetFrameScriptIndent")
+  finish
+endif
+
+function GetFrameScriptIndent()
+  let lnum = prevnonblank(v:lnum - 1)
+
+  if lnum == 0
+    return 0
+  endif
+
+  if getline(v:lnum) =~ '^\s*\*'
+    return cindent(v:lnum)
+  endif
+
+  let ind = indent(lnum)
+
+  if getline(lnum) =~? '^\s*\%(If\|Loop\|Sub\)'
+    let ind = ind + shiftwidth()
+  endif
+
+  if getline(v:lnum) =~? '^\s*\%(Else\|End\%(If\|Loop\|Sub\)\)'
+    let ind = ind - shiftwidth()
+  endif
+
+  return ind
+endfunction
+
+endif
diff --git a/indent/gitolite.vim b/indent/gitolite.vim
new file mode 100644
index 000000000..acde56c90
--- /dev/null
+++ b/indent/gitolite.vim
@@ -0,0 +1,53 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitolite') == -1
+
+" Vim indent file
+" Language:	gitolite configuration
+" URL:		https://github.com/sitaramc/gitolite/blob/master/contrib/vim/indent/gitolite.vim
+"	(https://raw.githubusercontent.com/sitaramc/gitolite/master/contrib/vim/indent/gitolite.vim)
+" Maintainer:	Sitaram Chamarty <sitaramc@gmail.com>
+" (former Maintainer:	Teemu Matilainen <teemu.matilainen@iki.fi>)
+" Last Change:	2017 Oct 05
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal autoindent
+setlocal indentexpr=GetGitoliteIndent()
+setlocal indentkeys=o,O,*<Return>,!^F,=repo,\",=
+
+" Only define the function once.
+if exists("*GetGitoliteIndent")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+function! GetGitoliteIndent()
+  let prevln = prevnonblank(v:lnum-1)
+  let pline = getline(prevln)
+  let cline = getline(v:lnum)
+
+  if cline =~ '^\s*\(C\|R\|RW\|RW+\|RWC\|RW+C\|RWD\|RW+D\|RWCD\|RW+CD\|-\)[ \t=]'
+    return shiftwidth()
+  elseif cline =~ '^\s*config\s'
+    return shiftwidth()
+  elseif cline =~ '^\s*option\s'
+    return shiftwidth()
+  elseif pline =~ '^\s*repo\s' && cline =~ '^\s*\(#.*\)\?$'
+    return shiftwidth()
+  elseif cline =~ '^\s*#'
+    return indent(prevln)
+  elseif cline =~ '^\s*$'
+    return -1
+  else
+    return 0
+  endif
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/indent/hog.vim b/indent/hog.vim
new file mode 100644
index 000000000..20e152b3b
--- /dev/null
+++ b/indent/hog.vim
@@ -0,0 +1,81 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hog') == -1
+
+" Vim indent file
+" Language:     hog (Snort.conf)
+" Maintainer:   Victor Roemer, <vroemer@badsec.org>
+" Last Change:  Mar 7, 2013
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+let b:undo_indent = 'setlocal smartindent< indentexpr< indentkeys<'
+
+setlocal nosmartindent
+setlocal indentexpr=GetHogIndent()
+setlocal indentkeys+=!^F,o,O,0#
+
+" Only define the function once.
+if exists("*GetHogIndent")
+    finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let s:syn_blocks = '\<SnortRuleTypeBody\>'
+
+function s:IsInBlock(lnum)
+    return synIDattr(synID(a:lnum, 1, 1), 'name') =~ s:syn_blocks 
+endfunction
+
+function GetHogIndent()
+    let prevlnum = prevnonblank(v:lnum-1)
+
+    " Comment blocks have identical indent
+    if getline(v:lnum) =~ '^\s*#' && getline(prevlnum) =~ '^\s*#'
+            return indent(prevlnum)
+    endif
+
+    " Ignore comment lines when calculating indent
+    while getline(prevlnum) =~ '^\s*#'
+        let prevlnum = prevnonblank(prevlnum-1)
+        if !prevlnum
+            return previndent
+        endif
+    endwhile
+
+    " Continuation of a line that wasn't indented
+    let prevline = getline(prevlnum)
+    if prevline =~ '^\k\+.*\\\s*$'
+        return shiftwidth() 
+    endif
+
+    " Continuation of a line that was indented
+    if prevline =~ '\k\+.*\\\s*$'
+        return indent(prevlnum)
+    endif
+
+    " Indent the next line if previous line contained a start of a block
+    " definition ('{' or '(').
+    if prevline =~ '^\k\+[^#]*{}\@!\s*$' " TODO || prevline =~ '^\k\+[^#]*()\@!\s*$'
+        return shiftwidth()
+    endif
+
+    " Match inside of a block
+    if s:IsInBlock(v:lnum)
+        if prevline =~ "^\k\+.*$"
+            return shiftwidth()
+        else
+            return indent(prevlnum)
+        endif
+    endif
+
+    return 0 
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/indent/j.vim b/indent/j.vim
new file mode 100644
index 000000000..550fae8a3
--- /dev/null
+++ b/indent/j.vim
@@ -0,0 +1,54 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'j') == -1
+
+" Vim indent file
+" Language:	J
+" Maintainer:	David Bürgin <dbuergin@gluet.ch>
+" URL:		https://gitlab.com/glts/vim-j
+" Last Change:	2015-01-11
+
+if exists('b:did_indent')
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetJIndent()
+setlocal indentkeys-=0{,0},:,0#
+setlocal indentkeys+=0),0<:>,=case.,=catch.,=catchd.,=catcht.,=do.,=else.,=elseif.,=end.,=fcase.
+
+let b:undo_indent = 'setlocal indentkeys< indentexpr<'
+
+if exists('*GetJIndent')
+  finish
+endif
+
+" If g:j_indent_definitions is true, the bodies of explicit definitions of
+" adverbs, conjunctions, and verbs will be indented. Default is false (0).
+if !exists('g:j_indent_definitions')
+  let g:j_indent_definitions = 0
+endif
+
+function GetJIndent() abort
+  let l:prevlnum = prevnonblank(v:lnum - 1)
+  if l:prevlnum == 0
+    return 0
+  endif
+  let l:indent = indent(l:prevlnum)
+  let l:prevline = getline(l:prevlnum)
+  if l:prevline =~# '^\s*\%(case\|catch[dt]\=\|do\|else\%(if\)\=\|fcase\|for\%(_\a\k*\)\=\|if\|select\|try\|whil\%(e\|st\)\)\.\%(\%(\<end\.\)\@!.\)*$'
+    " Increase indentation after an initial control word that starts or
+    " continues a block and is not terminated by "end."
+    let l:indent += shiftwidth()
+  elseif g:j_indent_definitions && (l:prevline =~# '\<\%([1-4]\|13\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\>' || l:prevline =~# '^\s*:\s*$')
+    " Increase indentation in explicit definitions of adverbs, conjunctions,
+    " and verbs
+    let l:indent += shiftwidth()
+  endif
+  " Decrease indentation in lines that start with either control words that
+  " continue or end a block, or the special items ")" and ":"
+  if getline(v:lnum) =~# '^\s*\%()\|:\|\%(case\|catch[dt]\=\|do\|else\%(if\)\=\|end\|fcase\)\.\)'
+    let l:indent -= shiftwidth()
+  endif
+  return l:indent
+endfunction
+
+endif
diff --git a/indent/java.vim b/indent/java.vim
new file mode 100644
index 000000000..99203420a
--- /dev/null
+++ b/indent/java.vim
@@ -0,0 +1,154 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'java') == -1
+
+" Vim indent file
+" Language:	Java
+" Previous Maintainer: Toby Allsopp <toby.allsopp@peace.com>
+" Current Maintainer: Hong Xu <hong@topbug.net>
+" Homepage: http://www.vim.org/scripts/script.php?script_id=3899
+"           https://github.com/xuhdev/indent-java.vim
+" Last Change:	2016 Mar 7
+" Version: 1.1
+" License: Same as Vim.
+" Copyright (c) 2012-2016 Hong Xu
+" Before 2012, this file was maintained by Toby Allsopp.
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+" Indent Java anonymous classes correctly.
+setlocal cindent cinoptions& cinoptions+=j1
+
+" The "extends" and "implements" lines start off with the wrong indent.
+setlocal indentkeys& indentkeys+=0=extends indentkeys+=0=implements
+
+" Set the function to do the work.
+setlocal indentexpr=GetJavaIndent()
+
+let b:undo_indent = "set cin< cino< indentkeys< indentexpr<"
+
+" Only define the function once.
+if exists("*GetJavaIndent")
+  finish
+endif
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+function! SkipJavaBlanksAndComments(startline)
+  let lnum = a:startline
+  while lnum > 1
+    let lnum = prevnonblank(lnum)
+    if getline(lnum) =~ '\*/\s*$'
+      while getline(lnum) !~ '/\*' && lnum > 1
+        let lnum = lnum - 1
+      endwhile
+      if getline(lnum) =~ '^\s*/\*'
+        let lnum = lnum - 1
+      else
+        break
+      endif
+    elseif getline(lnum) =~ '^\s*//'
+      let lnum = lnum - 1
+    else
+      break
+    endif
+  endwhile
+  return lnum
+endfunction
+
+function GetJavaIndent()
+
+  " Java is just like C; use the built-in C indenting and then correct a few
+  " specific cases.
+  let theIndent = cindent(v:lnum)
+
+  " If we're in the middle of a comment then just trust cindent
+  if getline(v:lnum) =~ '^\s*\*'
+    return theIndent
+  endif
+
+  " find start of previous line, in case it was a continuation line
+  let lnum = SkipJavaBlanksAndComments(v:lnum - 1)
+
+  " If the previous line starts with '@', we should have the same indent as
+  " the previous one
+  if getline(lnum) =~ '^\s*@.*$'
+    return indent(lnum)
+  endif
+
+  let prev = lnum
+  while prev > 1
+    let next_prev = SkipJavaBlanksAndComments(prev - 1)
+    if getline(next_prev) !~ ',\s*$'
+      break
+    endif
+    let prev = next_prev
+  endwhile
+
+  " Try to align "throws" lines for methods and "extends" and "implements" for
+  " classes.
+  if getline(v:lnum) =~ '^\s*\(throws\|extends\|implements\)\>'
+        \ && getline(lnum) !~ '^\s*\(throws\|extends\|implements\)\>'
+    let theIndent = theIndent + shiftwidth()
+  endif
+
+  " correct for continuation lines of "throws", "implements" and "extends"
+  let cont_kw = matchstr(getline(prev),
+        \ '^\s*\zs\(throws\|implements\|extends\)\>\ze.*,\s*$')
+  if strlen(cont_kw) > 0
+    let amount = strlen(cont_kw) + 1
+    if getline(lnum) !~ ',\s*$'
+      let theIndent = theIndent - (amount + shiftwidth())
+      if theIndent < 0
+        let theIndent = 0
+      endif
+    elseif prev == lnum
+      let theIndent = theIndent + amount
+      if cont_kw ==# 'throws'
+        let theIndent = theIndent + shiftwidth()
+      endif
+    endif
+  elseif getline(prev) =~ '^\s*\(throws\|implements\|extends\)\>'
+        \ && (getline(prev) =~ '{\s*$'
+        \  || getline(v:lnum) =~ '^\s*{\s*$')
+    let theIndent = theIndent - shiftwidth()
+  endif
+
+  " When the line starts with a }, try aligning it with the matching {,
+  " skipping over "throws", "extends" and "implements" clauses.
+  if getline(v:lnum) =~ '^\s*}\s*\(//.*\|/\*.*\)\=$'
+    call cursor(v:lnum, 1)
+    silent normal! %
+    let lnum = line('.')
+    if lnum < v:lnum
+      while lnum > 1
+        let next_lnum = SkipJavaBlanksAndComments(lnum - 1)
+        if getline(lnum) !~ '^\s*\(throws\|extends\|implements\)\>'
+              \ && getline(next_lnum) !~ ',\s*$'
+          break
+        endif
+        let lnum = prevnonblank(next_lnum)
+      endwhile
+      return indent(lnum)
+    endif
+  endif
+
+  " Below a line starting with "}" never indent more.  Needed for a method
+  " below a method with an indented "throws" clause.
+  let lnum = SkipJavaBlanksAndComments(v:lnum - 1)
+  if getline(lnum) =~ '^\s*}\s*\(//.*\|/\*.*\)\=$' && indent(lnum) < theIndent
+    let theIndent = indent(lnum)
+  endif
+
+  return theIndent
+endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vi: sw=2 et
+
+endif
diff --git a/indent/jsp.vim b/indent/jsp.vim
new file mode 100644
index 000000000..613496bcb
--- /dev/null
+++ b/indent/jsp.vim
@@ -0,0 +1,21 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsp') == -1
+
+" Vim filetype indent file
+" Language:    JSP files
+" Maintainer:  David Fishburn <fishburn@ianywhere.com>
+" Version:     1.0
+" Last Change: Wed Nov 08 2006 11:08:05 AM
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+
+" If there has been no specific JSP indent script created, 
+" use the default html indent script which will handle
+" html, javascript and most of the JSP constructs.
+runtime! indent/html.vim
+
+
+
+endif
diff --git a/indent/ld.vim b/indent/ld.vim
new file mode 100644
index 000000000..d5c908546
--- /dev/null
+++ b/indent/ld.vim
@@ -0,0 +1,88 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ld') == -1
+
+" Vim indent file
+" Language:             ld(1) script
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-12-20
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetLDIndent()
+setlocal indentkeys=0{,0},!^F,o,O
+setlocal nosmartindent
+
+if exists("*GetLDIndent")
+  finish
+endif
+
+function s:prevnonblanknoncomment(lnum)
+  let lnum = a:lnum
+  while lnum > 1
+    let lnum = prevnonblank(lnum)
+    let line = getline(lnum)
+    if line =~ '\*/'
+      while lnum > 1 && line !~ '/\*'
+        let lnum -= 1
+      endwhile
+      if line =~ '^\s*/\*'
+        let lnum -= 1
+      else
+        break
+      endif
+    else
+      break
+    endif
+  endwhile
+  return lnum
+endfunction
+
+function s:count_braces(lnum, count_open)
+  let n_open = 0
+  let n_close = 0
+  let line = getline(a:lnum)
+  let pattern = '[{}]'
+  let i = match(line, pattern)
+  while i != -1
+    if synIDattr(synID(a:lnum, i + 1, 0), 'name') !~ 'ld\%(Comment\|String\)'
+      if line[i] == '{'
+        let n_open += 1
+      elseif line[i] == '}'
+        if n_open > 0
+          let n_open -= 1
+        else
+          let n_close += 1
+        endif
+      endif
+    endif
+    let i = match(line, pattern, i + 1)
+  endwhile
+  return a:count_open ? n_open : n_close
+endfunction
+
+function GetLDIndent()
+  let line = getline(v:lnum)
+  if line =~ '^\s*\*'
+    return cindent(v:lnum)
+  elseif line =~ '^\s*}'
+    return indent(v:lnum) - shiftwidth()
+  endif
+
+  let pnum = s:prevnonblanknoncomment(v:lnum - 1)
+  if pnum == 0
+    return 0
+  endif
+
+  let ind = indent(pnum) + s:count_braces(pnum, 1) * shiftwidth()
+
+  let pline = getline(pnum)
+  if pline =~ '}\s*$'
+    let ind -= (s:count_braces(pnum, 0) - (pline =~ '^\s*}' ? 1 : 0)) * shiftwidth()
+  endif
+
+  return ind
+endfunction
+
+endif
diff --git a/indent/lifelines.vim b/indent/lifelines.vim
new file mode 100644
index 000000000..b0c16ba58
--- /dev/null
+++ b/indent/lifelines.vim
@@ -0,0 +1,28 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lifelines') == -1
+
+" Vim indent file
+" Language:	LifeLines
+" Maintainer:	Patrick Texier <p.texier@orsennes.com>
+" Location:	<http://patrick.texier.free.fr/vim/indent/lifelines.vim>
+" Last Change:	2010 May 7
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+" LifeLines uses cindent without ; line terminator, C functions
+" declarations, C keywords, C++ formating
+setlocal cindent
+setlocal cinwords=""
+setlocal cinoptions+=+0
+setlocal cinoptions+=p0
+setlocal cinoptions+=i0
+setlocal cinoptions+=t0
+setlocal cinoptions+=*500
+
+let b:undo_indent = "setl cin< cino< cinw<"
+" vim: ts=8 sw=4
+
+endif
diff --git a/indent/liquid.vim b/indent/liquid.vim
new file mode 100644
index 000000000..60f9c6039
--- /dev/null
+++ b/indent/liquid.vim
@@ -0,0 +1,67 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
+
+" Vim indent file
+" Language:     Liquid
+" Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
+" Last Change:	2017 Jun 13
+
+if exists('b:did_indent')
+  finish
+endif
+
+set indentexpr=
+if exists('b:liquid_subtype')
+  exe 'runtime! indent/'.b:liquid_subtype.'.vim'
+else
+  runtime! indent/html.vim
+endif
+unlet! b:did_indent
+
+if &l:indentexpr == ''
+  if &l:cindent
+    let &l:indentexpr = 'cindent(v:lnum)'
+  else
+    let &l:indentexpr = 'indent(prevnonblank(v:lnum-1))'
+  endif
+endif
+let b:liquid_subtype_indentexpr = &l:indentexpr
+
+let b:did_indent = 1
+
+setlocal indentexpr=GetLiquidIndent()
+setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],o,O,!^F,=end,=endif,=endunless,=endifchanged,=endcase,=endfor,=endtablerow,=endcapture,=else,=elsif,=when,=empty
+
+" Only define the function once.
+if exists('*GetLiquidIndent')
+  finish
+endif
+
+function! s:count(string,pattern)
+  let string = substitute(a:string,'\C'.a:pattern,"\n",'g')
+  return strlen(substitute(string,"[^\n]",'','g'))
+endfunction
+
+function! GetLiquidIndent(...)
+  if a:0 && a:1 == '.'
+    let v:lnum = line('.')
+  elseif a:0 && a:1 =~ '^\d'
+    let v:lnum = a:1
+  endif
+  let vcol = col('.')
+  call cursor(v:lnum,1)
+  exe "let ind = ".b:liquid_subtype_indentexpr
+  let lnum = prevnonblank(v:lnum-1)
+  let line = getline(lnum)
+  let cline = getline(v:lnum)
+  let line  = substitute(line,'\C^\%(\s*{%\s*end\w*\s*%}\)\+','','')
+  let line .= matchstr(cline,'\C^\%(\s*{%\s*end\w*\s*%}\)\+')
+  let cline = substitute(cline,'\C^\%(\s*{%\s*end\w*\s*%}\)\+','','')
+  let sw = shiftwidth()
+  let ind += sw * s:count(line,'{%\s*\%(if\|elsif\|else\|unless\|ifchanged\|case\|when\|for\|empty\|tablerow\|capture\)\>')
+  let ind -= sw * s:count(line,'{%\s*end\%(if\|unless\|ifchanged\|case\|for\|tablerow\|capture\)\>')
+  let ind -= sw * s:count(cline,'{%\s*\%(elsif\|else\|when\|empty\)\>')
+  let ind -= sw * s:count(cline,'{%\s*end\w*$')
+  return ind
+endfunction
+
+endif
diff --git a/indent/lisp.vim b/indent/lisp.vim
new file mode 100644
index 000000000..13e0558a2
--- /dev/null
+++ b/indent/lisp.vim
@@ -0,0 +1,19 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lisp') == -1
+
+" Vim indent file
+" Language:	Lisp
+" Maintainer:    Sergey Khorev <sergey.khorev@gmail.com>
+" URL:		 http://sites.google.com/site/khorser/opensource/vim
+" Last Change:	2012 Jan 10
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+   finish
+endif
+let b:did_indent = 1
+
+setlocal ai nosi
+
+let b:undo_indent = "setl ai< si<"
+
+endif
diff --git a/indent/logtalk.vim b/indent/logtalk.vim
new file mode 100644
index 000000000..3ca147075
--- /dev/null
+++ b/indent/logtalk.vim
@@ -0,0 +1,68 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logtalk') == -1
+
+"  Maintainer:	Paulo Moura <pmoura@logtalk.org>
+"  Revised on:	2018.08.04
+"  Language:	Logtalk
+
+" This Logtalk indent file is a modified version of the Prolog
+" indent file written by Gergely Kontra
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+	finish
+endif
+
+let b:did_indent = 1
+
+setlocal indentexpr=GetLogtalkIndent()
+setlocal indentkeys-=:,0#
+setlocal indentkeys+=0%,-,0;,>,0)
+
+" Only define the function once.
+if exists("*GetLogtalkIndent")
+	finish
+endif
+
+function! GetLogtalkIndent()
+	" Find a non-blank line above the current line.
+	let pnum = prevnonblank(v:lnum - 1)
+	" Hit the start of the file, use zero indent.
+	if pnum == 0
+		return 0
+	endif
+	let line = getline(v:lnum)
+	let pline = getline(pnum)
+
+	let ind = indent(pnum)
+	" Previous line was comment -> use previous line's indent
+	if pline =~ '^\s*%'
+		retu ind
+	endif
+	" Check for entity opening directive on previous line
+	if pline =~ '^\s*:-\s\(object\|protocol\|category\)\ze(.*,$'
+		let ind = ind + shiftwidth()
+	" Check for clause head on previous line
+	elseif pline =~ ':-\s*\(%.*\)\?$'
+		let ind = ind + shiftwidth()
+	" Check for grammar rule head on previous line
+	elseif pline =~ '-->\s*\(%.*\)\?$'
+		let ind = ind + shiftwidth()
+	" Check for entity closing directive on previous line
+	elseif pline =~ '^\s*:-\send_\(object\|protocol\|category\)\.\(%.*\)\?$'
+		let ind = ind - shiftwidth()
+	" Check for end of clause on previous line
+	elseif pline =~ '\.\s*\(%.*\)\?$'
+		let ind = ind - shiftwidth()
+	endif
+	" Check for opening conditional on previous line
+	if pline =~ '^\s*\([(;]\|->\)' && pline !~ '\.\s*\(%.*\)\?$' && pline !~ '^.*\([)][,]\s*\(%.*\)\?$\)'
+		let ind = ind + shiftwidth()
+	endif
+	" Check for closing an unclosed paren, or middle ; or ->
+	if line =~ '^\s*\([);]\|->\)'
+		let ind = ind - shiftwidth()
+	endif
+	return ind
+endfunction
+
+endif
diff --git a/indent/mail.vim b/indent/mail.vim
new file mode 100644
index 000000000..6ecf607f6
--- /dev/null
+++ b/indent/mail.vim
@@ -0,0 +1,17 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mail') == -1
+
+" Vim indent file
+" Language:	Mail
+" Maintainer:	Bram Moolenaar
+" Last Change:	2009 Jun 03
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+" What works best is auto-indenting, disable other indenting.
+" For formatting see the ftplugin.
+setlocal autoindent nosmartindent nocindent indentexpr=
+
+endif
diff --git a/indent/mf.vim b/indent/mf.vim
new file mode 100644
index 000000000..b3f1dea8e
--- /dev/null
+++ b/indent/mf.vim
@@ -0,0 +1,10 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mf') == -1
+
+" METAFONT indent file
+" Language:    METAFONT
+" Maintainer:  Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Last Change: 2016 Oct 1
+
+runtime! indent/mp.vim
+
+endif
diff --git a/indent/mp.vim b/indent/mp.vim
new file mode 100644
index 000000000..76e9df227
--- /dev/null
+++ b/indent/mp.vim
@@ -0,0 +1,364 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mp') == -1
+
+" MetaPost indent file
+" Language:           MetaPost
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Eugene Minkovskii <emin@mccme.ru>
+" Last Change:        2016 Oct 2, 4:13pm
+" Version: 0.2
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetMetaPostIndent()
+setlocal indentkeys+==end,=else,=fi,=fill,0),0]
+
+let b:undo_indent = "setl indentkeys< indentexpr<"
+
+" Only define the function once.
+if exists("*GetMetaPostIndent")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+function GetMetaPostIndent()
+  let ignorecase_save = &ignorecase
+  try
+    let &ignorecase = 0
+    return GetMetaPostIndentIntern()
+  finally
+    let &ignorecase = ignorecase_save
+  endtry
+endfunc
+
+" Regexps {{{
+" Note: the next three variables are made global so that a user may add
+" further keywords.
+"
+" Example:
+"
+"    Put these in ~/.vim/after/indent/mp.vim
+"
+"    let g:mp_open_tag .= '\|\<begintest\>'
+"    let g:mp_close_tag .= '\|\<endtest\>'
+
+" Expressions starting indented blocks
+let g:mp_open_tag = ''
+      \ . '\<if\>'
+      \ . '\|\<else\%[if]\>'
+      \ . '\|\<for\%(\|ever\|suffixes\)\>'
+      \ . '\|\<begingroup\>'
+      \ . '\|\<\%(\|var\|primary\|secondary\|tertiary\)def\>'
+      \ . '\|^\s*\<begin\%(fig\|graph\|glyph\|char\|logochar\)\>'
+      \ . '\|[([{]'
+
+" Expressions ending indented blocks
+let g:mp_close_tag = ''
+      \ . '\<fi\>'
+      \ . '\|\<else\%[if]\>'
+      \ . '\|\<end\%(\|for\|group\|def\|fig\|char\|glyph\|graph\)\>'
+      \ . '\|[)\]}]'
+
+" Statements that may span multiple lines and are ended by a semicolon. To
+" keep this list short, statements that are unlikely to be very long or are
+" not very common (e.g., keywords like `interim` or `showtoken`) are not
+" included.
+"
+" The regex for assignments and equations (the last branch) is tricky, because
+" it must not match things like `for i :=`, `if a=b`, `def...=`, etc... It is
+" not perfect, but it works reasonably well.
+let g:mp_statement = ''
+      \ . '\<\%(\|un\|cut\)draw\>'
+      \ . '\|\<\%(\|un\)fill\%[draw]\>'
+      \ . '\|\<draw\%(dbl\)\=arrow\>'
+      \ . '\|\<clip\>'
+      \ . '\|\<addto\>'
+      \ . '\|\<save\>'
+      \ . '\|\<setbounds\>'
+      \ . '\|\<message\>'
+      \ . '\|\<errmessage\>'
+      \ . '\|\<errhelp\>'
+      \ . '\|\<fontmapline\>'
+      \ . '\|\<pickup\>'
+      \ . '\|\<show\>'
+      \ . '\|\<special\>'
+      \ . '\|\<write\>'
+      \ . '\|\%(^\|;\)\%([^;=]*\%('.g:mp_open_tag.'\)\)\@!.\{-}:\=='
+
+" A line ends with zero or more spaces, possibly followed by a comment.
+let s:eol = '\s*\%($\|%\)'
+" }}}
+
+" Auxiliary functions {{{
+" Returns 1 if (0-based) position immediately preceding `pos` in `line` is
+" inside a string or a comment; returns 0 otherwise.
+
+" This is the function that is called more often when indenting, so it is
+" critical that it is efficient. The method we use is significantly faster
+" than using syntax attributes, and more general (it does not require
+" syntax_items). It is also faster than using a single regex matching an even
+" number of quotes. It helps that MetaPost strings cannot span more than one
+" line and cannot contain escaped quotes.
+function! s:CommentOrString(line, pos)
+  let in_string = 0
+  let q = stridx(a:line, '"')
+  let c = stridx(a:line, '%')
+  while q >= 0 && q < a:pos
+    if c >= 0 && c < q
+      if in_string " Find next percent symbol
+        let c = stridx(a:line, '%', q + 1)
+      else " Inside comment
+        return 1
+      endif
+    endif
+    let in_string = 1 - in_string
+    let q = stridx(a:line, '"', q + 1) " Find next quote
+  endwhile
+  return in_string || (c >= 0 && c <= a:pos)
+endfunction
+
+" Find the first non-comment non-blank line before the current line.
+function! s:PrevNonBlankNonComment(lnum)
+  let l:lnum = prevnonblank(a:lnum - 1)
+  while getline(l:lnum) =~# '^\s*%'
+    let l:lnum = prevnonblank(l:lnum - 1)
+  endwhile
+  return l:lnum
+endfunction
+
+" Returns true if the last tag appearing in the line is an open tag; returns
+" false otherwise.
+function! s:LastTagIsOpen(line)
+  let o = s:LastValidMatchEnd(a:line, g:mp_open_tag, 0)
+  if o == - 1 | return v:false | endif
+  return s:LastValidMatchEnd(a:line, g:mp_close_tag, o) < 0
+endfunction
+
+" A simple, efficient and quite effective heuristics is used to test whether
+" a line should cause the next line to be indented: count the "opening tags"
+" (if, for, def, ...) in the line, count the "closing tags" (endif, endfor,
+" ...) in the line, and compute the difference. We call the result the
+" "weight" of the line. If the weight is positive, then the next line should
+" most likely be indented. Note that `else` and `elseif` are both opening and
+" closing tags, so they "cancel out" in almost all cases, the only exception
+" being a leading `else[if]`, which is counted as an opening tag, but not as
+" a closing tag (so that, for instance, a line containing a single `else:`
+" will have weight equal to one, not zero). We do not treat a trailing
+" `else[if]` in any special way, because lines ending with an open tag are
+" dealt with separately before this function is called (see
+" GetMetaPostIndentIntern()).
+"
+" Example:
+"
+"     forsuffixes $=a,b: if x.$ = y.$ : draw else: fill fi
+"       % This line will be indented because |{forsuffixes,if,else}| > |{else,fi}| (3 > 2)
+"     endfor
+
+function! s:Weight(line)
+  let [o, i] = [0, s:ValidMatchEnd(a:line, g:mp_open_tag, 0)]
+  while i > 0
+    let o += 1
+    let i = s:ValidMatchEnd(a:line, g:mp_open_tag, i)
+  endwhile
+  let [c, i] = [0, matchend(a:line, '^\s*\<else\%[if]\>')] " Skip a leading else[if]
+  let i = s:ValidMatchEnd(a:line, g:mp_close_tag, i)
+  while i > 0
+    let c += 1
+    let i = s:ValidMatchEnd(a:line, g:mp_close_tag, i)
+  endwhile
+  return o - c
+endfunction
+
+" Similar to matchend(), but skips strings and comments.
+" line: a String
+function! s:ValidMatchEnd(line, pat, start)
+  let i = matchend(a:line, a:pat, a:start)
+  while i > 0 && s:CommentOrString(a:line, i)
+    let i = matchend(a:line, a:pat, i)
+  endwhile
+  return i
+endfunction
+
+" Like s:ValidMatchEnd(), but returns the end position of the last (i.e.,
+" rightmost) match.
+function! s:LastValidMatchEnd(line, pat, start)
+  let last_found = -1
+  let i = matchend(a:line, a:pat, a:start)
+  while i > 0
+    if !s:CommentOrString(a:line, i)
+      let last_found = i
+    endif
+    let i = matchend(a:line, a:pat, i)
+  endwhile
+  return last_found
+endfunction
+
+function! s:DecreaseIndentOnClosingTag(curr_indent)
+  let cur_text = getline(v:lnum)
+  if cur_text =~# '^\s*\%('.g:mp_close_tag.'\)'
+    return max([a:curr_indent - shiftwidth(), 0])
+  endif
+  return a:curr_indent
+endfunction
+" }}}
+
+" Main function {{{
+"
+" Note: Every rule of indentation in MetaPost is very subjective. We might get
+" creative, but things get murky very soon (there are too many corner cases).
+" So, we provide a means for the user to decide what to do when this script
+" doesn't get it. We use a simple idea: use '%>', '%<' and '%=' to explicitly
+" control indentation. The '<' and '>' symbols may be repeated many times
+" (e.g., '%>>' will cause the next line to be indented twice).
+"
+" By using '%>...', '%<...' and '%=', the indentation the user wants is
+" preserved by commands like gg=G, even if it does not follow the rules of
+" this script.
+"
+" Example:
+"
+"    def foo =
+"        makepen(
+"            subpath(T-n,t) of r  %>
+"                shifted .5down   %>
+"                    --subpath(t,T) of r shifted .5up -- cycle   %<<<
+"        )
+"        withcolor black
+"    enddef
+"
+" The default indentation of the previous example would be:
+"
+"    def foo =
+"        makepen(
+"            subpath(T-n,t) of r
+"            shifted .5down
+"            --subpath(t,T) of r shifted .5up -- cycle
+"        )
+"        withcolor black
+"    enddef
+"
+" Personally, I prefer the latter, but anyway...
+function! GetMetaPostIndentIntern()
+  " Do not touch indentation inside verbatimtex/btex.. etex blocks.
+  if synIDattr(synID(v:lnum, 1, 1), "name") =~# '^mpTeXinsert$\|^tex\|^Delimiter'
+    return -1
+  endif
+
+  " This is the reference line relative to which the current line is indented
+  " (but see below).
+  let lnum = s:PrevNonBlankNonComment(v:lnum)
+
+  " At the start of the file use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  let prev_text = getline(lnum)
+
+  " User-defined overrides take precedence over anything else.
+  " See above for an example.
+  let j = match(prev_text, '%[<>=]')
+  if j > 0
+    let i = strlen(matchstr(prev_text, '%>\+', j)) - 1
+    if i > 0
+      return indent(lnum) + i * shiftwidth()
+    endif
+
+    let i = strlen(matchstr(prev_text, '%<\+', j)) - 1
+    if i > 0
+      return max([indent(lnum) - i * shiftwidth(), 0])
+    endif
+
+    if match(prev_text, '%=', j)
+      return indent(lnum)
+    endif
+  endif
+
+  " If the reference line ends with an open tag, indent.
+  "
+  " Example:
+  "
+  " if c:
+  "     0
+  " else:
+  "     1
+  " fi if c2: % Note that this line has weight equal to zero.
+  "     ...   % This line will be indented
+  if s:LastTagIsOpen(prev_text)
+    return s:DecreaseIndentOnClosingTag(indent(lnum) + shiftwidth())
+  endif
+
+  " Lines with a positive weight are unbalanced and should likely be indented.
+  "
+  " Example:
+  "
+  " def f = enddef for i = 1 upto 5: if x[i] > 0: 1 else: 2 fi
+  "     ... % This line will be indented (because of the unterminated `for`)
+  if s:Weight(prev_text) > 0
+    return s:DecreaseIndentOnClosingTag(indent(lnum) + shiftwidth())
+  endif
+
+  " Unterminated statements cause indentation to kick in.
+  "
+  " Example:
+  "
+  " draw unitsquare
+  "     withcolor black; % This line is indented because of `draw`.
+  " x := a + b + c
+  "     + d + e;         % This line is indented because of `:=`.
+  "
+  let i = s:LastValidMatchEnd(prev_text, g:mp_statement, 0)
+  if i >= 0 " Does the line contain a statement?
+    if s:ValidMatchEnd(prev_text, ';', i) < 0 " Is the statement unterminated?
+      return indent(lnum) + shiftwidth()
+    else
+      return s:DecreaseIndentOnClosingTag(indent(lnum))
+    endif
+  endif
+
+  " Deal with the special case of a statement spanning multiple lines. If the
+  " current reference line L ends with a semicolon, search backwards for
+  " another semicolon or a statement keyword. If the latter is found first,
+  " its line is used as the reference line for indenting the current line
+  " instead of L.
+  "
+  "  Example:
+  "
+  "  if cond:
+  "    draw if a: z0 else: z1 fi
+  "        shifted S
+  "        scaled T;      % L
+  "
+  "    for i = 1 upto 3:  % <-- Current line: this gets the same indent as `draw ...`
+  "
+  " NOTE: we get here only if L does not contain a statement (among those
+  " listed in g:mp_statement).
+  if s:ValidMatchEnd(prev_text, ';'.s:eol, 0) >= 0 " L ends with a semicolon
+    let stm_lnum = s:PrevNonBlankNonComment(lnum)
+    while stm_lnum > 0
+      let prev_text = getline(stm_lnum)
+      let sc_pos = s:LastValidMatchEnd(prev_text, ';', 0)
+      let stm_pos = s:ValidMatchEnd(prev_text, g:mp_statement, sc_pos)
+      if stm_pos > sc_pos
+        let lnum = stm_lnum
+        break
+      elseif sc_pos > stm_pos
+        break
+      endif
+      let stm_lnum = s:PrevNonBlankNonComment(stm_lnum)
+    endwhile
+  endif
+
+  return s:DecreaseIndentOnClosingTag(indent(lnum))
+endfunction
+" }}}
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim:sw=2:fdm=marker
+
+endif
diff --git a/indent/nsis.vim b/indent/nsis.vim
new file mode 100644
index 000000000..0ffa1b2ea
--- /dev/null
+++ b/indent/nsis.vim
@@ -0,0 +1,95 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nsis') == -1
+
+" Vim indent file
+" Language:		NSIS script
+" Maintainer:		Ken Takata
+" URL:			https://github.com/k-takata/vim-nsis
+" Last Change:		2018-01-21
+" Filenames:		*.nsi
+" License:		VIM License
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal nosmartindent
+setlocal noautoindent
+setlocal indentexpr=GetNsisIndent(v:lnum)
+setlocal indentkeys=!^F,o,O
+setlocal indentkeys+==~${Else,=~${EndIf,=~${EndUnless,=~${AndIf,=~${AndUnless,=~${OrIf,=~${OrUnless,=~${Case,=~${Default,=~${EndSelect,=~${EndSwith,=~${Loop,=~${Next,=~${MementoSectionEnd,=~FunctionEnd,=~SectionEnd,=~SectionGroupEnd,=~PageExEnd,0=~!macroend,0=~!if,0=~!else,0=~!endif
+
+if exists("*GetNsisIndent")
+  finish
+endif
+
+function! GetNsisIndent(lnum)
+  " If this line is explicitly joined: If the previous line was also joined,
+  " line it up with that one, otherwise add two 'shiftwidth'
+  if getline(a:lnum - 1) =~ '\\$'
+    if a:lnum > 1 && getline(a:lnum - 2) =~ '\\$'
+      return indent(a:lnum - 1)
+    endif
+    return indent(a:lnum - 1) + shiftwidth() * 2
+  endif
+
+  " Grab the current line, stripping comments.
+  let l:thisl = substitute(getline(a:lnum), '[;#].*$', '', '')
+  " Check if this line is a conditional preprocessor line.
+  let l:preproc = l:thisl =~? '^\s*!\%(if\|else\|endif\)'
+
+  " Grab the previous line, stripping comments.
+  " Skip preprocessor lines and continued lines.
+  let l:prevlnum = a:lnum
+  while 1
+    let l:prevlnum = prevnonblank(l:prevlnum - 1)
+    if l:prevlnum == 0
+      " top of file
+      return 0
+    endif
+    let l:prevl = substitute(getline(l:prevlnum), '[;#].*$', '', '')
+    let l:prevpreproc = l:prevl =~? '^\s*!\%(if\|else\|endif\)'
+    if l:preproc == l:prevpreproc && getline(l:prevlnum - 1) !~? '\\$'
+      break
+    endif
+  endwhile
+  let l:previ = indent(l:prevlnum)
+  let l:ind = l:previ
+
+  if l:preproc
+    " conditional preprocessor
+    if l:prevl =~? '^\s*!\%(if\%(\%(macro\)\?n\?def\)\?\|else\)\>'
+      let l:ind += shiftwidth()
+    endif
+    if l:thisl =~? '^\s*!\%(else\|endif\)\?\>'
+      let l:ind -= shiftwidth()
+    endif
+    return l:ind
+  endif
+
+  if l:prevl =~? '^\s*\%(\${\%(If\|IfNot\|Unless\|ElseIf\|ElseIfNot\|ElseUnless\|Else\|AndIf\|AndIfNot\|AndUnless\|OrIf\|OrIfNot\|OrUnless\|Select\|Case\|Case[2-5]\|CaseElse\|Default\|Switch\|Do\|DoWhile\|DoUntil\|For\|ForEach\|MementoSection\)}\|Function\>\|Section\>\|SectionGroup\|PageEx\>\|!macro\>\)'
+    " previous line opened a block
+    let l:ind += shiftwidth()
+  endif
+  if l:thisl =~? '^\s*\%(\${\%(ElseIf\|ElseIfNot\|ElseUnless\|Else\|EndIf\|EndUnless\|AndIf\|AndIfNot\|AndUnless\|OrIf\|OrIfNot\|OrUnless\|Loop\|LoopWhile\|LoopUntil\|Next\|MementoSectionEnd\)\>}\?\|FunctionEnd\>\|SectionEnd\>\|SectionGroupEnd\|PageExEnd\>\|!macroend\>\)'
+    " this line closed a block
+    let l:ind -= shiftwidth()
+  elseif l:thisl =~? '^\s*\${\%(Case\|Case[2-5]\|CaseElse\|Default\)\>}\?'
+    if l:prevl !~? '^\s*\${\%(Select\|Switch\)}'
+      let l:ind -= shiftwidth()
+    endif
+  elseif l:thisl =~? '^\s*\${\%(EndSelect\|EndSwitch\)\>}\?'
+    " this line closed a block
+    if l:prevl =~? '^\s*\${\%(Select\|Switch\)}'
+      let l:ind -= shiftwidth()
+    else
+      let l:ind -= shiftwidth() * 2
+    endif
+  endif
+
+  return l:ind
+endfunction
+
+" vim: ts=8 sw=2 sts=2
+
+endif
diff --git a/indent/occam.vim b/indent/occam.vim
new file mode 100644
index 000000000..9361bf483
--- /dev/null
+++ b/indent/occam.vim
@@ -0,0 +1,191 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'occam') == -1
+
+" Vim indent file
+" Language:	occam
+" Maintainer:	Mario Schweigler <ms44@kent.ac.uk>
+" Last Change:	23 April 2003
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+"{{{  Settings
+" Set the occam indent function
+setlocal indentexpr=GetOccamIndent()
+" Indent after new line and after initial colon
+setlocal indentkeys=o,O,0=:
+"}}}
+
+" Only define the function once
+if exists("*GetOccamIndent")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+"{{{  Indent definitions
+" Define carriage return indent
+let s:FirstLevelIndent = '^\C\s*\(IF\|ALT\|PRI\s\+ALT\|PAR\|SEQ\|PRI\s\+PAR\|WHILE\|VALOF\|CLAIM\|FORKING\)\>\|\(--.*\)\@<!\(\<PROC\>\|??\|\<CASE\>\s*\(--.*\)\=\_$\)'
+let s:FirstLevelNonColonEndIndent = '^\C\s*PROTOCOL\>\|\(--.*\)\@<!\<\(\(CHAN\|DATA\)\s\+TYPE\|FUNCTION\)\>'
+let s:SecondLevelIndent = '^\C\s*\(IF\|ALT\|PRI\s\+ALT\)\>\|\(--.*\)\@<!?\s*\<CASE\>\s*\(--.*\)\=\_$'
+let s:SecondLevelNonColonEndIndent = '\(--.*\)\@<!\<\(CHAN\|DATA\)\s\+TYPE\>'
+
+" Define colon indent
+let s:ColonIndent = '\(--.*\)\@<!\<PROC\>'
+let s:ColonNonColonEndIndent = '^\C\s*PROTOCOL\>\|\(--.*\)\@<!\<\(\(CHAN\|DATA\)\s\+TYPE\|FUNCTION\)\>'
+
+let s:ColonEnd = '\(--.*\)\@<!:\s*\(--.*\)\=$'
+let s:ColonStart = '^\s*:\s*\(--.*\)\=$'
+
+" Define comment
+let s:CommentLine = '^\s*--'
+"}}}
+
+"{{{  function GetOccamIndent()
+" Auxiliary function to get the correct indent for a line of occam code
+function GetOccamIndent()
+
+  " Ensure magic is on
+  let save_magic = &magic
+  setlocal magic
+
+  " Get reference line number
+  let linenum = prevnonblank(v:lnum - 1)
+  while linenum > 0 && getline(linenum) =~ s:CommentLine
+    let linenum = prevnonblank(linenum - 1)
+  endwhile
+
+  " Get current indent
+  let curindent = indent(linenum)
+
+  " Get current line
+  let line = getline(linenum)
+
+  " Get previous line number
+  let prevlinenum = prevnonblank(linenum - 1)
+  while prevlinenum > 0 && getline(prevlinenum) =~ s:CommentLine
+    let prevlinenum = prevnonblank(prevlinenum - 1)
+  endwhile
+
+  " Get previous line
+  let prevline = getline(prevlinenum)
+
+  " Colon indent
+  if getline(v:lnum) =~ s:ColonStart
+
+    let found = 0
+
+    while found < 1
+
+      if line =~ s:ColonStart
+	let found = found - 1
+      elseif line =~ s:ColonIndent || (line =~ s:ColonNonColonEndIndent && line !~ s:ColonEnd)
+	let found = found + 1
+      endif
+
+      if found < 1
+	let linenum = prevnonblank(linenum - 1)
+	if linenum > 0
+	  let line = getline(linenum)
+	else
+	  let found = 1
+	endif
+      endif
+
+    endwhile
+
+    if linenum > 0
+      let curindent = indent(linenum)
+    else
+      let colonline = getline(v:lnum)
+      let tabstr = ''
+      while strlen(tabstr) < &tabstop
+	let tabstr = ' ' . tabstr
+      endwhile
+      let colonline = substitute(colonline, '\t', tabstr, 'g')
+      let curindent = match(colonline, ':')
+    endif
+
+    " Restore magic
+    if !save_magic|setlocal nomagic|endif
+
+    return curindent
+  endif
+
+  if getline(v:lnum) =~ '^\s*:'
+    let colonline = getline(v:lnum)
+    let tabstr = ''
+    while strlen(tabstr) < &tabstop
+      let tabstr = ' ' . tabstr
+    endwhile
+    let colonline = substitute(colonline, '\t', tabstr, 'g')
+    let curindent = match(colonline, ':')
+
+    " Restore magic
+    if !save_magic|setlocal nomagic|endif
+
+    return curindent
+  endif
+
+  " Carriage return indenat
+  if line =~ s:FirstLevelIndent || (line =~ s:FirstLevelNonColonEndIndent && line !~ s:ColonEnd)
+	\ || (line !~ s:ColonStart && (prevline =~ s:SecondLevelIndent
+	\ || (prevline =~ s:SecondLevelNonColonEndIndent && prevline !~ s:ColonEnd)))
+    let curindent = curindent + shiftwidth()
+
+    " Restore magic
+    if !save_magic|setlocal nomagic|endif
+
+    return curindent
+  endif
+
+  " Commented line
+  if getline(prevnonblank(v:lnum - 1)) =~ s:CommentLine
+
+    " Restore magic
+    if !save_magic|setlocal nomagic|endif
+
+    return indent(prevnonblank(v:lnum - 1))
+  endif
+
+  " Look for previous second level IF / ALT / PRI ALT
+  let found = 0
+
+  while !found
+
+    if indent(prevlinenum) == curindent - shiftwidth()
+      let found = 1
+    endif
+
+    if !found
+      let prevlinenum = prevnonblank(prevlinenum - 1)
+      while prevlinenum > 0 && getline(prevlinenum) =~ s:CommentLine
+	let prevlinenum = prevnonblank(prevlinenum - 1)
+      endwhile
+      if prevlinenum == 0
+	let found = 1
+      endif
+    endif
+
+  endwhile
+
+  if prevlinenum > 0
+    if getline(prevlinenum) =~ s:SecondLevelIndent
+      let curindent = curindent + shiftwidth()
+    endif
+  endif
+
+  " Restore magic
+  if !save_magic|setlocal nomagic|endif
+
+  return curindent
+
+endfunction
+"}}}
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/indent/pascal.vim b/indent/pascal.vim
new file mode 100644
index 000000000..e112a84e1
--- /dev/null
+++ b/indent/pascal.vim
@@ -0,0 +1,232 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pascal') == -1
+
+" Vim indent file
+" Language:    Pascal
+" Maintainer:  Neil Carter <n.carter@swansea.ac.uk>
+" Created:     2004 Jul 13
+" Last Change: 2017 Jun 13
+"
+" This is version 2.0, a complete rewrite.
+"
+" For further documentation, see http://psy.swansea.ac.uk/staff/carter/vim/
+
+
+if exists("b:did_indent")
+	finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetPascalIndent(v:lnum)
+setlocal indentkeys&
+setlocal indentkeys+==end;,==const,==type,==var,==begin,==repeat,==until,==for
+setlocal indentkeys+==program,==function,==procedure,==object,==private
+setlocal indentkeys+==record,==if,==else,==case
+
+if exists("*GetPascalIndent")
+	finish
+endif
+
+
+function! s:GetPrevNonCommentLineNum( line_num )
+
+	" Skip lines starting with a comment
+	let SKIP_LINES = '^\s*\(\((\*\)\|\(\*\ \)\|\(\*)\)\|{\|}\)'
+
+	let nline = a:line_num
+	while nline > 0
+		let nline = prevnonblank(nline-1)
+		if getline(nline) !~? SKIP_LINES
+			break
+		endif
+	endwhile
+
+	return nline
+endfunction
+
+
+function! s:PurifyCode( line_num )
+	" Strip any trailing comments and whitespace
+	let pureline = 'TODO'
+	return pureline
+endfunction
+
+
+function! GetPascalIndent( line_num )
+
+	" Line 0 always goes at column 0
+	if a:line_num == 0
+		return 0
+	endif
+
+	let this_codeline = getline( a:line_num )
+
+
+	" SAME INDENT
+
+	" Middle of a three-part comment
+	if this_codeline =~ '^\s*\*'
+		return indent( a:line_num - 1)
+	endif
+
+
+	" COLUMN 1 ALWAYS
+
+	" Last line of the program
+	if this_codeline =~ '^\s*end\.'
+		return 0
+	endif
+
+	" Compiler directives, allowing "(*" and "{"
+	"if this_codeline =~ '^\s*\({\|(\*\)$\(IFDEF\|IFNDEF\|ELSE\|ENDIF\)'
+	if this_codeline =~ '^\s*\({\|(\*\)\$'
+		return 0
+	endif
+
+	" section headers
+	if this_codeline =~ '^\s*\(program\|procedure\|function\|type\)\>'
+		return 0
+	endif
+
+	" Subroutine separators, lines ending with "const" or "var"
+	if this_codeline =~ '^\s*\((\*\ _\+\ \*)\|\(const\|var\)\)$'
+		return 0
+	endif
+
+
+	" OTHERWISE, WE NEED TO LOOK FURTHER BACK...
+
+	let prev_codeline_num = s:GetPrevNonCommentLineNum( a:line_num )
+	let prev_codeline = getline( prev_codeline_num )
+	let indnt = indent( prev_codeline_num )
+
+
+	" INCREASE INDENT
+
+	" If the PREVIOUS LINE ended in these items, always indent
+	if prev_codeline =~ '\<\(type\|const\|var\)$'
+		return indnt + shiftwidth()
+	endif
+
+	if prev_codeline =~ '\<repeat$'
+		if this_codeline !~ '^\s*until\>'
+			return indnt + shiftwidth()
+		else
+			return indnt
+		endif
+	endif
+
+	if prev_codeline =~ '\<\(begin\|record\)$'
+		if this_codeline !~ '^\s*end\>'
+			return indnt + shiftwidth()
+		else
+			return indnt
+		endif
+	endif
+
+	" If the PREVIOUS LINE ended with these items, indent if not
+	" followed by "begin"
+	if prev_codeline =~ '\<\(\|else\|then\|do\)$' || prev_codeline =~ ':$'
+		if this_codeline !~ '^\s*begin\>'
+			return indnt + shiftwidth()
+		else
+			" If it does start with "begin" then keep the same indent
+			"return indnt + shiftwidth()
+			return indnt
+		endif
+	endif
+
+	" Inside a parameter list (i.e. a "(" without a ")"). ???? Considers
+	" only the line before the current one. TODO: Get it working for
+	" parameter lists longer than two lines.
+	if prev_codeline =~ '([^)]\+$'
+		return indnt + shiftwidth()
+	endif
+
+
+	" DECREASE INDENT
+
+	" Lines starting with "else", but not following line ending with
+	" "end".
+	if this_codeline =~ '^\s*else\>' && prev_codeline !~ '\<end$'
+		return indnt - shiftwidth()
+	endif
+
+	" Lines after a single-statement branch/loop.
+	" Two lines before ended in "then", "else", or "do"
+	" Previous line didn't end in "begin"
+	let prev2_codeline_num = s:GetPrevNonCommentLineNum( prev_codeline_num )
+	let prev2_codeline = getline( prev2_codeline_num )
+	if prev2_codeline =~ '\<\(then\|else\|do\)$' && prev_codeline !~ '\<begin$'
+		" If the next code line after a single statement branch/loop
+		" starts with "end", "except" or "finally", we need an
+		" additional unindentation.
+		if this_codeline =~ '^\s*\(end;\|except\|finally\|\)$'
+			" Note that we don't return from here.
+			return indnt - 2 * shiftwidth()
+		endif
+		return indnt - shiftwidth()
+	endif
+
+	" Lines starting with "until" or "end". This rule must be overridden
+	" by the one for "end" after a single-statement branch/loop. In
+	" other words that rule should come before this one.
+	if this_codeline =~ '^\s*\(end\|until\)\>'
+		return indnt - shiftwidth()
+	endif
+
+
+	" MISCELLANEOUS THINGS TO CATCH
+
+	" Most "begin"s will have been handled by now. Any remaining
+	" "begin"s on their own line should go in column 1.
+	if this_codeline =~ '^\s*begin$'
+		return 0
+	endif
+
+
+" ____________________________________________________________________
+" Object/Borland Pascal/Delphi Extensions
+"
+" Note that extended-pascal is handled here, unless it is simpler to
+" handle them in the standard-pascal section above.
+
+
+	" COLUMN 1 ALWAYS
+
+	" section headers at start of line.
+	if this_codeline =~ '^\s*\(interface\|implementation\|uses\|unit\)\>'
+		return 0
+	endif
+
+
+	" INDENT ONCE
+
+	" If the PREVIOUS LINE ended in these items, always indent.
+	if prev_codeline =~ '^\s*\(unit\|uses\|try\|except\|finally\|private\|protected\|public\|published\)$'
+		return indnt + shiftwidth()
+	endif
+
+	" ???? Indent "procedure" and "functions" if they appear within an
+	" class/object definition. But that means overriding standard-pascal
+	" rule where these words always go in column 1.
+
+
+	" UNINDENT ONCE
+
+	if this_codeline =~ '^\s*\(except\|finally\)$'
+		return indnt - shiftwidth()
+	endif
+
+	if this_codeline =~ '^\s*\(private\|protected\|public\|published\)$'
+		return indnt - shiftwidth()
+	endif
+
+
+" ____________________________________________________________________
+
+	" If nothing changed, return same indent.
+	return indnt
+endfunction
+
+
+endif
diff --git a/indent/postscr.vim b/indent/postscr.vim
new file mode 100644
index 000000000..04e91cc4a
--- /dev/null
+++ b/indent/postscr.vim
@@ -0,0 +1,72 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'postscr') == -1
+
+" PostScript indent file
+" Language:    PostScript
+" Maintainer:  Mike Williams <mrw@netcomuk.co.uk>
+" Last Change: 2nd July 2001
+"
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=PostscrIndentGet(v:lnum)
+setlocal indentkeys+=0],0=>>,0=%%,0=end,0=restore,0=grestore indentkeys-=:,0#,e
+
+" Catch multiple instantiations
+if exists("*PostscrIndentGet")
+  finish
+endif
+
+function! PostscrIndentGet(lnum)
+  " Find a non-empty non-comment line above the current line.
+  " Note: ignores DSC comments as well!
+  let lnum = a:lnum - 1
+  while lnum != 0
+    let lnum = prevnonblank(lnum)
+    if getline(lnum) !~ '^\s*%.*$'
+      break
+    endif
+    let lnum = lnum - 1
+  endwhile
+
+  " Hit the start of the file, use user indent.
+  if lnum == 0
+    return -1
+  endif
+
+  " Start with the indent of the previous line
+  let ind = indent(lnum)
+  let pline = getline(lnum)
+
+  " Indent for dicts, arrays, and saves with possible trailing comment
+  if pline =~ '\(begin\|<<\|g\=save\|{\|[\)\s*\(%.*\)\=$'
+    let ind = ind + shiftwidth()
+  endif
+
+  " Remove indent for popped dicts, and restores.
+  if pline =~ '\(end\|g\=restore\)\s*$'
+    let ind = ind - shiftwidth()
+
+  " Else handle immediate dedents of dicts, restores, and arrays.
+  elseif getline(a:lnum) =~ '\(end\|>>\|g\=restore\|}\|]\)'
+    let ind = ind - shiftwidth()
+
+  " Else handle DSC comments - always start of line.
+  elseif getline(a:lnum) =~ '^\s*%%'
+    let ind = 0
+  endif
+
+  " For now catch excessive left indents if they occur.
+  if ind < 0
+    let ind = -1
+  endif
+
+  return ind
+endfunction
+
+" vim:sw=2
+
+endif
diff --git a/indent/pov.vim b/indent/pov.vim
new file mode 100644
index 000000000..dca8d2e12
--- /dev/null
+++ b/indent/pov.vim
@@ -0,0 +1,88 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pov') == -1
+
+" Vim indent file
+" Language: PoV-Ray Scene Description Language
+" Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2017 Jun 13
+" URI: http://trific.ath.cx/Ftp/vim/indent/pov.vim
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+" Some preliminary settings.
+setlocal nolisp " Make sure lisp indenting doesn't supersede us.
+
+setlocal indentexpr=GetPoVRayIndent()
+setlocal indentkeys+==else,=end,0]
+
+" Only define the function once.
+if exists("*GetPoVRayIndent")
+  finish
+endif
+
+" Counts matches of a regexp <rexp> in line number <line>.
+" Doesn't count matches inside strings and comments (as defined by current
+" syntax).
+function! s:MatchCount(line, rexp)
+  let str = getline(a:line)
+  let i = 0
+  let n = 0
+  while i >= 0
+    let i = matchend(str, a:rexp, i)
+    if i >= 0 && synIDattr(synID(a:line, i, 0), "name") !~? "string\|comment"
+      let n = n + 1
+    endif
+  endwhile
+  return n
+endfunction
+
+" The main function.  Returns indent amount.
+function GetPoVRayIndent()
+  " If we are inside a comment (may be nested in obscure ways), give up
+  if synIDattr(synID(v:lnum, indent(v:lnum)+1, 0), "name") =~? "string\|comment"
+    return -1
+  endif
+
+  " Search backwards for the frist non-empty, non-comment line.
+  let plnum = prevnonblank(v:lnum - 1)
+  let plind = indent(plnum)
+  while plnum > 0 && synIDattr(synID(plnum, plind+1, 0), "name") =~? "comment"
+    let plnum = prevnonblank(plnum - 1)
+    let plind = indent(plnum)
+  endwhile
+
+  " Start indenting from zero
+  if plnum == 0
+    return 0
+  endif
+
+  " Analyse previous nonempty line.
+  let chg = 0
+  let chg = chg + s:MatchCount(plnum, '[[{(]')
+  let chg = chg + s:MatchCount(plnum, '#\s*\%(if\|ifdef\|ifndef\|switch\|while\|macro\|else\)\>')
+  let chg = chg - s:MatchCount(plnum, '#\s*end\>')
+  let chg = chg - s:MatchCount(plnum, '[]})]')
+  " Dirty hack for people writing #if and #else on the same line.
+  let chg = chg - s:MatchCount(plnum, '#\s*\%(if\|ifdef\|ifndef\|switch\)\>.*#\s*else\>')
+  " When chg > 0, then we opened groups and we should indent more, but when
+  " chg < 0, we closed groups and this already affected the previous line,
+  " so we should not dedent.  And when everything else fails, scream.
+  let chg = chg > 0 ? chg : 0
+
+  " Analyse current line
+  " FIXME: If we have to dedent, we should try to find the indentation of the
+  " opening line.
+  let cur = s:MatchCount(v:lnum, '^\s*\%(#\s*\%(end\|else\)\>\|[]})]\)')
+  if cur > 0
+    let final = plind + (chg - cur) * shiftwidth()
+  else
+    let final = plind + chg * shiftwidth()
+  endif
+
+  return final < 0 ? 0 : final
+endfunction
+
+endif
diff --git a/indent/pyrex.vim b/indent/pyrex.vim
new file mode 100644
index 000000000..c4662c319
--- /dev/null
+++ b/indent/pyrex.vim
@@ -0,0 +1,17 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pyrex') == -1
+
+" Vim indent file
+" Language:	Pyrex
+" Maintainer:	Marco Barisione <marco.bari@people.it>
+" URL:		http://marcobari.altervista.org/pyrex_vim.html
+" Last Change:	2005 Jun 24
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+" Use Python formatting rules
+runtime! indent/python.vim
+
+endif
diff --git a/indent/readline.vim b/indent/readline.vim
new file mode 100644
index 000000000..5c83059dd
--- /dev/null
+++ b/indent/readline.vim
@@ -0,0 +1,40 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'readline') == -1
+
+" Vim indent file
+" Language:             readline configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-12-20
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetReadlineIndent()
+setlocal indentkeys=!^F,o,O,=$else,=$endif
+setlocal nosmartindent
+
+if exists("*GetReadlineIndent")
+  finish
+endif
+
+function GetReadlineIndent()
+  let lnum = prevnonblank(v:lnum - 1)
+  if lnum == 0
+    return 0
+  endif
+
+  let ind = indent(lnum)
+
+  if getline(lnum) =~ '^\s*$\(if\|else\)\>'
+    let ind = ind + shiftwidth()
+  endif
+
+  if getline(v:lnum) =~ '^\s*$\(else\|endif\)\>'
+    let ind = ind - shiftwidth()
+  endif
+
+  return ind
+endfunction
+
+endif
diff --git a/indent/rmd.vim b/indent/rmd.vim
new file mode 100644
index 000000000..25ec7023c
--- /dev/null
+++ b/indent/rmd.vim
@@ -0,0 +1,70 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rmd') == -1
+
+" Vim indent file
+" Language:	Rmd
+" Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
+" Homepage:     https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Sun Aug 19, 2018  09:14PM
+
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+runtime indent/r.vim
+let s:RIndent = function(substitute(&indentexpr, "()", "", ""))
+let b:did_indent = 1
+
+setlocal indentkeys=0{,0},:,!^F,o,O,e
+setlocal indentexpr=GetRmdIndent()
+
+if exists("*GetRmdIndent")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+function s:GetMdIndent()
+  let pline = getline(v:lnum - 1)
+  let cline = getline(v:lnum)
+  if prevnonblank(v:lnum - 1) < v:lnum - 1 || cline =~ '^\s*[-\+\*]\s' || cline =~ '^\s*\d\+\.\s\+'
+    return indent(v:lnum)
+  elseif pline =~ '^\s*[-\+\*]\s'
+    return indent(v:lnum - 1) + 2
+  elseif pline =~ '^\s*\d\+\.\s\+'
+    return indent(v:lnum - 1) + 3
+  endif
+  return indent(prevnonblank(v:lnum - 1))
+endfunction
+
+function s:GetYamlIndent()
+  let pline = getline(v:lnum - 1)
+  if pline =~ ':\s*$'
+    return indent(v:lnum) + shiftwidth()
+  elseif pline =~ '^\s*- '
+    return indent(v:lnum) + 2
+  endif
+  return indent(prevnonblank(v:lnum - 1))
+endfunction
+
+function GetRmdIndent()
+  if getline(".") =~ '^[ \t]*```{r .*}$' || getline(".") =~ '^[ \t]*```$'
+    return 0
+  endif
+  if search('^[ \t]*```{r', "bncW") > search('^[ \t]*```$', "bncW")
+    return s:RIndent()
+  elseif v:lnum > 1 && search('^---$', "bnW") == 1 &&
+        \ (search('^---$', "nW") > v:lnum || search('^...$', "nW") > v:lnum)
+    return s:GetYamlIndent()
+  else
+    return s:GetMdIndent()
+  endif
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: sw=2
+
+endif
diff --git a/indent/rnoweb.vim b/indent/rnoweb.vim
new file mode 100644
index 000000000..0abe01281
--- /dev/null
+++ b/indent/rnoweb.vim
@@ -0,0 +1,51 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnoweb') == -1
+
+" Vim indent file
+" Language:	Rnoweb
+" Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
+" Homepage:     https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Fri Apr 15, 2016  10:58PM
+
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+runtime indent/tex.vim
+
+function! s:NoTeXIndent()
+  return indent(line("."))
+endfunction
+
+if &indentexpr == "" || &indentexpr == "GetRnowebIndent()"
+  let s:TeXIndent = function("s:NoTeXIndent")
+else
+  let s:TeXIndent = function(substitute(&indentexpr, "()", "", ""))
+endif
+
+unlet! b:did_indent
+runtime indent/r.vim
+let s:RIndent = function(substitute(&indentexpr, "()", "", ""))
+let b:did_indent = 1
+
+setlocal indentkeys=0{,0},!^F,o,O,e,},=\bibitem,=\item
+setlocal indentexpr=GetRnowebIndent()
+
+if exists("*GetRnowebIndent")
+  finish
+endif
+
+function GetRnowebIndent()
+  let curline = getline(".")
+  if curline =~ '^<<.*>>=$' || curline =~ '^\s*@$'
+    return 0
+  endif
+  if search("^<<", "bncW") > search("^@", "bncW")
+    return s:RIndent()
+  endif
+  return s:TeXIndent()
+endfunction
+
+" vim: sw=2
+
+endif
diff --git a/indent/rpl.vim b/indent/rpl.vim
new file mode 100644
index 000000000..190a83354
--- /dev/null
+++ b/indent/rpl.vim
@@ -0,0 +1,67 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
+
+" Vim indent file
+" Language:	RPL/2
+" Version:	0.2
+" Last Change:	2017 Jun 13
+" Maintainer:	BERTRAND Jo�l <rpl2@free.fr>
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal autoindent
+setlocal indentkeys+==~end,=~case,=~if,=~then,=~else,=~do,=~until,=~while,=~repeat,=~select,=~default,=~for,=~start,=~next,=~step,<<>,<>>
+
+" Define the appropriate indent function but only once
+setlocal indentexpr=RplGetFreeIndent()
+if exists("*RplGetFreeIndent")
+  finish
+endif
+
+let b:undo_indent = "set ai< indentkeys< indentexpr<"
+
+function RplGetIndent(lnum)
+  let ind = indent(a:lnum)
+  let prevline=getline(a:lnum)
+  " Strip tail comment
+  let prevstat=substitute(prevline, '!.*$', '', '')
+
+  " Add a shiftwidth to statements following if, iferr, then, else, elseif,
+  " case, select, default, do, until, while, repeat, for, start
+  if prevstat =~? '\<\(if\|iferr\|do\|while\)\>' && prevstat =~? '\<end\>'
+  elseif prevstat =~? '\(^\|\s\+\)<<\($\|\s\+\)' && prevstat =~? '\s\+>>\($\|\s\+\)'
+  elseif prevstat =~? '\<\(if\|iferr\|then\|else\|elseif\|select\|case\|do\|until\|while\|repeat\|for\|start\|default\)\>' || prevstat =~? '\(^\|\s\+\)<<\($\|\s\+\)'
+    let ind = ind + shiftwidth()
+  endif
+
+  " Subtract a shiftwidth from then, else, elseif, end, until, repeat, next,
+  " step
+  let line = getline(v:lnum)
+  if line =~? '^\s*\(then\|else\|elseif\|until\|repeat\|next\|step\|default\|end\)\>'
+    let ind = ind - shiftwidth()
+  elseif line =~? '^\s*>>\($\|\s\+\)'
+    let ind = ind - shiftwidth()
+  endif
+
+  return ind
+endfunction
+
+function RplGetFreeIndent()
+  " Find the previous non-blank line
+  let lnum = prevnonblank(v:lnum - 1)
+
+  " Use zero indent at the top of the file
+  if lnum == 0
+    return 0
+  endif
+
+  let ind=RplGetIndent(lnum)
+  return ind
+endfunction
+
+" vim:sw=2 tw=130
+
+endif
diff --git a/indent/rrst.vim b/indent/rrst.vim
new file mode 100644
index 000000000..9d346ce2e
--- /dev/null
+++ b/indent/rrst.vim
@@ -0,0 +1,51 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rrst') == -1
+
+" Vim indent file
+" Language:	Rrst
+" Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
+" Homepage:     https://github.com/jalvesaq/R-Vim-runtime
+" Last Change:	Tue Apr 07, 2015  04:38PM
+
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+runtime indent/r.vim
+let s:RIndent = function(substitute(&indentexpr, "()", "", ""))
+let b:did_indent = 1
+
+setlocal indentkeys=0{,0},:,!^F,o,O,e
+setlocal indentexpr=GetRrstIndent()
+
+if exists("*GetRrstIndent")
+  finish
+endif
+
+function GetRstIndent()
+  let pline = getline(v:lnum - 1)
+  let cline = getline(v:lnum)
+  if prevnonblank(v:lnum - 1) < v:lnum - 1 || cline =~ '^\s*[-\+\*]\s' || cline =~ '^\s*\d\+\.\s\+'
+    return indent(v:lnum)
+  elseif pline =~ '^\s*[-\+\*]\s'
+    return indent(v:lnum - 1) + 2
+  elseif pline =~ '^\s*\d\+\.\s\+'
+    return indent(v:lnum - 1) + 3
+  endif
+  return indent(prevnonblank(v:lnum - 1))
+endfunction
+
+function GetRrstIndent()
+  if getline(".") =~ '^\.\. {r .*}$' || getline(".") =~ '^\.\. \.\.$'
+    return 0
+  endif
+  if search('^\.\. {r', "bncW") > search('^\.\. \.\.$', "bncW")
+    return s:RIndent()
+  else
+    return GetRstIndent()
+  endif
+endfunction
+
+" vim: sw=2
+
+endif
diff --git a/indent/sas.vim b/indent/sas.vim
new file mode 100644
index 000000000..8fad46907
--- /dev/null
+++ b/indent/sas.vim
@@ -0,0 +1,142 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sas') == -1
+
+" Vim indent file
+" Language:     SAS
+" Maintainer:   Zhen-Huan Hu <wildkeny@gmail.com>
+" Version:      3.0.3
+" Last Change:  Jun 26, 2018
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetSASIndent()
+setlocal indentkeys+=;,=~data,=~proc,=~macro
+
+if exists("*GetSASIndent")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Regex that captures the start of a data/proc section
+let s:section_str = '\v%(^|;)\s*%(data|proc)>'
+" Regex that captures the end of a run-processing section
+let s:section_run = '\v%(^|;)\s*run\s*;'
+" Regex that captures the end of a data/proc section
+let s:section_end = '\v%(^|;)\s*%(quit|enddata)\s*;'
+
+" Regex that captures the start of a control block (anything inside a section)
+let s:block_str = '\v<%(do>%([^;]+<%(to|over|while)>[^;]+)=|%(compute|define\s+%(column|footer|header|style|table|tagset|crosstabs|statgraph)|edit|layout|method|select)>[^;]+|begingraph)\s*;'
+" Regex that captures the end of a control block (anything inside a section)
+let s:block_end = '\v<%(end|endcomp|endlayout|endgraph)\s*;'
+
+" Regex that captures the start of a macro
+let s:macro_str = '\v%(^|;)\s*\%macro>'
+" Regex that captures the end of a macro
+let s:macro_end = '\v%(^|;)\s*\%mend\s*;'
+
+" Regex that defines the end of the program
+let s:program_end = '\v%(^|;)\s*endsas\s*;'
+
+" List of procs supporting run-processing
+let s:run_processing_procs = [
+      \ 'catalog', 'chart', 'datasets', 'document', 'ds2', 'plot', 'sql',
+      \ 'gareabar', 'gbarline', 'gchart', 'gkpi', 'gmap', 'gplot', 'gradar', 'greplay', 'gslide', 'gtile',
+      \ 'anova', 'arima', 'catmod', 'factex', 'glm', 'model', 'optex', 'plan', 'reg',
+      \ 'iml',
+      \ ]
+
+" Find the line number of previous keyword defined by the regex
+function! s:PrevMatch(lnum, regex)
+  let prev_lnum = prevnonblank(a:lnum - 1)
+  while prev_lnum > 0
+    let prev_line = getline(prev_lnum)
+    if prev_line =~? a:regex
+      break
+    else
+      let prev_lnum = prevnonblank(prev_lnum - 1)
+    endif
+  endwhile
+  return prev_lnum
+endfunction
+
+" Main function
+function! GetSASIndent()
+  let prev_lnum = prevnonblank(v:lnum - 1)
+  if prev_lnum ==# 0
+    " Leave the indentation of the first line unchanged
+    return indent(1)
+  else
+    let prev_line = getline(prev_lnum)
+    " Previous non-blank line contains the start of a macro/section/block
+    " while not the end of a macro/section/block (at the same line)
+    if (prev_line =~? s:section_str && prev_line !~? s:section_run && prev_line !~? s:section_end) ||
+          \ (prev_line =~? s:block_str && prev_line !~? s:block_end) ||
+          \ (prev_line =~? s:macro_str && prev_line !~? s:macro_end)
+      let ind = indent(prev_lnum) + shiftwidth()
+    elseif prev_line =~? s:section_run && prev_line !~? s:section_end
+      let prev_section_str_lnum = s:PrevMatch(v:lnum, s:section_str)
+      let prev_section_end_lnum = max([
+            \ s:PrevMatch(v:lnum, s:section_end),
+            \ s:PrevMatch(v:lnum, s:macro_end  ),
+            \ s:PrevMatch(v:lnum, s:program_end)])
+      " Check if the section supports run-processing
+      if prev_section_end_lnum < prev_section_str_lnum &&
+            \ getline(prev_section_str_lnum) =~? '\v%(^|;)\s*proc\s+%(' .
+            \ join(s:run_processing_procs, '|') . ')>'
+        let ind = indent(prev_lnum) + shiftwidth()
+      else
+        let ind = indent(prev_lnum)
+      endif
+    else
+      let ind = indent(prev_lnum)
+    endif
+  endif
+  " Re-adjustments based on the inputs of the current line
+  let curr_line = getline(v:lnum)
+  if curr_line =~? s:program_end
+    " End of the program
+    " Same indentation as the first non-blank line
+    return indent(nextnonblank(1))
+  elseif curr_line =~? s:macro_end
+    " Current line is the end of a macro
+    " Match the indentation of the start of the macro
+    return indent(s:PrevMatch(v:lnum, s:macro_str))
+  elseif curr_line =~? s:block_end && curr_line !~? s:block_str
+    " Re-adjust if current line is the end of a block
+    " while not the beginning of a block (at the same line)
+    " Returning the indent of previous block start directly
+    " would not work due to nesting
+    let ind = ind - shiftwidth()
+  elseif curr_line =~? s:section_str || curr_line =~? s:section_run || curr_line =~? s:section_end
+    " Re-adjust if current line is the start/end of a section
+    " since the end of a section could be inexplicit
+    let prev_section_str_lnum = s:PrevMatch(v:lnum, s:section_str)
+    " Check if the previous section supports run-processing
+    if getline(prev_section_str_lnum) =~? '\v%(^|;)\s*proc\s+%(' .
+          \ join(s:run_processing_procs, '|') . ')>'
+      let prev_section_end_lnum = max([
+            \ s:PrevMatch(v:lnum, s:section_end),
+            \ s:PrevMatch(v:lnum, s:macro_end  ),
+            \ s:PrevMatch(v:lnum, s:program_end)])
+    else
+      let prev_section_end_lnum = max([
+            \ s:PrevMatch(v:lnum, s:section_end),
+            \ s:PrevMatch(v:lnum, s:section_run),
+            \ s:PrevMatch(v:lnum, s:macro_end  ),
+            \ s:PrevMatch(v:lnum, s:program_end)])
+    endif
+    if prev_section_end_lnum < prev_section_str_lnum
+      let ind = ind - shiftwidth()
+    endif
+  endif
+  return ind
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/indent/sass.vim b/indent/sass.vim
new file mode 100644
index 000000000..f0169e428
--- /dev/null
+++ b/indent/sass.vim
@@ -0,0 +1,42 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
+
+" Vim indent file
+" Language:	Sass
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Last Change:	2017 Jun 13
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal autoindent sw=2 et
+setlocal indentexpr=GetSassIndent()
+setlocal indentkeys=o,O,*<Return>,<:>,!^F
+
+" Only define the function once.
+if exists("*GetSassIndent")
+  finish
+endif
+
+let s:property = '^\s*:\|^\s*[[:alnum:]#{}-]\+\%(:\|\s*=\)'
+let s:extend = '^\s*\%(@extend\|@include\|+\)'
+
+function! GetSassIndent()
+  let lnum = prevnonblank(v:lnum-1)
+  let line = substitute(getline(lnum),'\s\+$','','')
+  let cline = substitute(substitute(getline(v:lnum),'\s\+$','',''),'^\s\+','','')
+  let lastcol = strlen(line)
+  let line = substitute(line,'^\s\+','','')
+  let indent = indent(lnum)
+  let cindent = indent(v:lnum)
+  if line !~ s:property && line !~ s:extend && cline =~ s:property
+    return indent + shiftwidth()
+  else
+    return -1
+  endif
+endfunction
+
+" vim:set sw=2:
+
+endif
diff --git a/indent/scheme.vim b/indent/scheme.vim
new file mode 100644
index 000000000..8faac9b86
--- /dev/null
+++ b/indent/scheme.vim
@@ -0,0 +1,18 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scheme') == -1
+
+" Vim indent file
+" Language: Scheme
+" Last Change: 2018 Jan 31
+" Maintainer: Evan Hanson <evhan@foldling.org>
+" Previous Maintainer: Sergey Khorev <sergey.khorev@gmail.com>
+" URL: https://foldling.org/vim/indent/scheme.vim
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+" Use the Lisp indenting
+runtime! indent/lisp.vim
+
+endif
diff --git a/indent/sdl.vim b/indent/sdl.vim
new file mode 100644
index 000000000..10d494dc1
--- /dev/null
+++ b/indent/sdl.vim
@@ -0,0 +1,97 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sdl') == -1
+
+" Vim indent file
+" Language:	SDL
+" Maintainer:	Michael Piefel <entwurf@piefel.de>
+" Last Change:	10 December 2011
+
+" Shamelessly stolen from the Vim-Script indent file
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetSDLIndent()
+setlocal indentkeys+==~end,=~state,*<Return>
+
+" Only define the function once.
+if exists("*GetSDLIndent")
+"  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+function! GetSDLIndent()
+  " Find a non-blank line above the current line.
+  let lnum = prevnonblank(v:lnum - 1)
+
+  " At the start of the file use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  let ind = indent(lnum)
+  let virtuality = '^\s*\(\(virtual\|redefined\|finalized\)\s\+\)\=\s*'
+
+  " Add a single space to comments which use asterisks
+  if getline(lnum) =~ '^\s*\*'
+    let ind = ind - 1
+  endif
+  if getline(v:lnum) =~ '^\s*\*'
+    let ind = ind + 1
+  endif
+
+  " Add a 'shiftwidth' after states, different blocks, decision (and alternatives), inputs
+  if (getline(lnum) =~? '^\s*\(start\|state\|system\|package\|connection\|channel\|alternative\|macro\|operator\|newtype\|select\|substructure\|decision\|generator\|refinement\|service\|method\|exceptionhandler\|asntype\|syntype\|value\|(.*):\|\(priority\s\+\)\=input\|provided\)'
+    \ || getline(lnum) =~? virtuality . '\(process\|procedure\|block\|object\)')
+    \ && getline(lnum) !~? 'end[[:alpha:]]\+;$'
+    let ind = ind + shiftwidth()
+  endif
+
+  " Subtract a 'shiftwidth' after states
+  if getline(lnum) =~? '^\s*\(stop\|return\>\|nextstate\)'
+    let ind = ind - shiftwidth()
+  endif
+
+  " Subtract a 'shiftwidth' on on end (uncompleted line)
+  if getline(v:lnum) =~? '^\s*end\>'
+    let ind = ind - shiftwidth()
+  endif
+
+  " Put each alternatives where the corresponding decision was
+  if getline(v:lnum) =~? '^\s*\((.*)\|else\):'
+    normal k
+    let ind = indent(searchpair('^\s*decision', '', '^\s*enddecision', 'bW',
+      \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "sdlString"'))
+  endif
+
+  " Put each state where the preceding state was
+  if getline(v:lnum) =~? '^\s*state\>'
+    let ind = indent(search('^\s*start', 'bW'))
+  endif
+
+  " Systems and packages are always in column 0
+  if getline(v:lnum) =~? '^\s*\(\(end\)\=system\|\(end\)\=package\)'
+    return 0
+  endif
+
+  " Put each end* where the corresponding begin was
+  if getline(v:lnum) =~? '^\s*end[[:alpha:]]'
+    normal k
+    let partner=matchstr(getline(v:lnum), '\(' . virtuality . 'end\)\@<=[[:alpha:]]\+')
+    let ind = indent(searchpair(virtuality . partner, '', '^\s*end' . partner, 'bW',
+      \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "sdlString"'))
+  endif
+
+  return ind
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:sw=2
+
+endif
diff --git a/indent/sml.vim b/indent/sml.vim
new file mode 100644
index 000000000..13b35a864
--- /dev/null
+++ b/indent/sml.vim
@@ -0,0 +1,221 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sml') == -1
+
+" Vim indent file
+" Language:     SML
+" Maintainer:	Saikat Guha <sg266@cornell.edu>
+" 				Hubert Chao <hc85@cornell.edu>
+" Original OCaml Version:
+" 				Jean-Francois Yuen  <jfyuen@ifrance.com>
+"               Mike Leary          <leary@nwlink.com>
+"               Markus Mottl        <markus@oefai.at>
+" OCaml URL:    http://www.oefai.at/~markus/vim/indent/ocaml.vim
+" Last Change:  2003 Jan 04	- Adapted to SML
+" 				2002 Nov 06 - Some fixes (JY)
+"               2002 Oct 28 - Fixed bug with indentation of ']' (MM)
+"               2002 Oct 22 - Major rewrite (JY)
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal expandtab
+setlocal indentexpr=GetSMLIndent()
+setlocal indentkeys+=0=and,0=else,0=end,0=handle,0=if,0=in,0=let,0=then,0=val,0=fun,0=\|,0=*),0)
+setlocal nolisp
+setlocal nosmartindent
+setlocal textwidth=80
+setlocal shiftwidth=2
+
+" Comment formatting
+if (has("comments"))
+  set comments=sr:(*,mb:*,ex:*)
+  set fo=cqort
+endif
+
+" Only define the function once.
+"if exists("*GetSMLIndent")
+"finish
+"endif
+
+" Define some patterns:
+let s:beflet = '^\s*\(initializer\|method\|try\)\|\(\<\(begin\|do\|else\|in\|then\|try\)\|->\|;\)\s*$'
+let s:letpat = '^\s*\(let\|type\|module\|class\|open\|exception\|val\|include\|external\)\>'
+let s:letlim = '\(\<\(sig\|struct\)\|;;\)\s*$'
+let s:lim = '^\s*\(exception\|external\|include\|let\|module\|open\|type\|val\)\>'
+let s:module = '\<\%(let\|sig\|struct\)\>'
+let s:obj = '^\s*\(constraint\|inherit\|initializer\|method\|val\)\>\|\<\(object\|object\s*(.*)\)\s*$'
+let s:type = '^\s*\%(let\|type\)\>.*='
+let s:val = '^\s*\(val\|external\)\>.*:'
+
+" Skipping pattern, for comments
+function! s:SkipPattern(lnum, pat)
+  let def = prevnonblank(a:lnum - 1)
+  while def > 0 && getline(def) =~ a:pat
+    let def = prevnonblank(def - 1)
+  endwhile
+  return def
+endfunction
+
+" Indent for ';;' to match multiple 'let'
+function! s:GetInd(lnum, pat, lim)
+  let llet = search(a:pat, 'bW')
+  let old = indent(a:lnum)
+  while llet > 0
+    let old = indent(llet)
+    let nb = s:SkipPattern(llet, '^\s*(\*.*\*)\s*$')
+    if getline(nb) =~ a:lim
+      return old
+    endif
+    let llet = search(a:pat, 'bW')
+  endwhile
+  return old
+endfunction
+
+" Indent pairs
+function! s:FindPair(pstart, pmid, pend)
+  call search(a:pend, 'bW')
+"  return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'))
+  let lno = searchpair(a:pstart, a:pmid, a:pend, 'bW', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"')
+  if lno == -1
+	return indent(lno)
+  else
+	return col(".") - 1
+  endif
+endfunction
+
+function! s:FindLet(pstart, pmid, pend)
+  call search(a:pend, 'bW')
+"  return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'))
+  let lno = searchpair(a:pstart, a:pmid, a:pend, 'bW', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"')
+  let moduleLine = getline(lno)
+  if lno == -1 || moduleLine =~ '^\s*\(fun\|structure\|signature\)\>'
+	return indent(lno)
+  else
+	return col(".") - 1
+  endif
+endfunction
+
+" Indent 'let'
+"function! s:FindLet(pstart, pmid, pend)
+"  call search(a:pend, 'bW')
+"  return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") =~ "^\\s*let\\>.*=.*\\<in\\s*$" || getline(prevnonblank(".") - 1) =~ "^\\s*let\\>.*=\\s*$\\|" . s:beflet'))
+"endfunction
+
+function! GetSMLIndent()
+  " Find a non-blank line above the current line.
+  let lnum = prevnonblank(v:lnum - 1)
+
+  " At the start of the file use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  let ind = indent(lnum)
+  let lline = getline(lnum)
+
+	" Return double 'shiftwidth' after lines matching:
+	if lline =~ '^\s*|.*=>\s*$'
+		return ind + 2 *shiftwidth()
+	elseif lline =~ '^\s*val\>.*=\s*$'
+		return ind + shiftwidth()
+	endif
+
+  let line = getline(v:lnum)
+
+	" Indent lines starting with 'end' to matching module
+	if line =~ '^\s*end\>'
+		return s:FindLet(s:module, '', '\<end\>')
+
+	" Match 'else' with 'if'
+	elseif line =~ '^\s*else\>'
+	  	if lline !~ '^\s*\(if\|else\|then\)\>'
+				return s:FindPair('\<if\>', '', '\<then\>')
+	  	else
+		  return ind
+		endif
+
+	" Match 'then' with 'if'
+	elseif line =~ '^\s*then\>'
+  	if lline !~ '^\s*\(if\|else\|then\)\>'
+		  return s:FindPair('\<if\>', '', '\<then\>')
+	else
+	  return ind
+	endif
+
+	" Indent if current line begins with ']'
+	elseif line =~ '^\s*\]'
+		return s:FindPair('\[','','\]')
+
+  " Indent current line starting with 'in' to last matching 'let'
+	elseif line =~ '^\s*in\>'
+		let ind = s:FindLet('\<let\>','','\<in\>')
+
+	" Indent from last matching module if line matches:
+	elseif line =~ '^\s*\(fun\|val\|open\|structure\|and\|datatype\|type\|exception\)\>'
+		cursor(lnum,1)
+  		let lastModule = indent(searchpair(s:module, '', '\<end\>', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'))
+		if lastModule == -1
+			return 0
+		else
+			return lastModule + shiftwidth()
+		endif
+
+	" Indent lines starting with '|' from matching 'case', 'handle'
+	elseif line =~ '^\s*|'
+		" cursor(lnum,1)
+		let lastSwitch = search('\<\(case\|handle\|fun\|datatype\)\>','bW')
+		let switchLine = getline(lastSwitch)
+		let switchLineIndent = indent(lastSwitch)
+		if lline =~ '^\s*|'
+		  return ind
+		endif
+		if switchLine =~ '\<case\>'
+			return col(".") + 2
+		elseif switchLine =~ '\<handle\>'
+			return switchLineIndent + shiftwidth()
+		elseif switchLine =~ '\<datatype\>'
+			call search('=')
+			return col(".") - 1
+		else
+			return switchLineIndent + 2
+		endif
+
+
+  " Indent if last line ends with 'sig', 'struct', 'let', 'then', 'else',
+  " 'in'
+  elseif lline =~ '\<\(sig\|struct\|let\|in\|then\|else\)\s*$'
+		let ind = ind + shiftwidth()
+
+  " Indent if last line ends with 'of', align from 'case'
+  elseif lline =~ '\<\(of\)\s*$'
+		call search('\<case\>',"bW")
+		let ind = col(".")+4
+
+	" Indent if current line starts with 'of'
+  elseif line =~ '^\s*of\>'
+		call search('\<case\>',"bW")
+		let ind = col(".")+1
+
+
+	" Indent if last line starts with 'fun', 'case', 'fn'
+	elseif lline =~ '^\s*\(fun\|fn\|case\)\>'
+		let ind = ind + shiftwidth()
+
+	endif
+
+	" Don't indent 'let' if last line started with 'fun', 'fn'
+	if line =~ '^\s*let\>'
+		if lline =~ '^\s*\(fun\|fn\)'
+			let ind = ind - shiftwidth()
+		endif
+  endif
+
+  return ind
+
+endfunction
+
+" vim:sw=2
+
+endif
diff --git a/indent/sshconfig.vim b/indent/sshconfig.vim
new file mode 100644
index 000000000..c25e297df
--- /dev/null
+++ b/indent/sshconfig.vim
@@ -0,0 +1,38 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshconfig') == -1
+
+" Vim indent file
+" Language: ssh config file
+" Maintainer: JasonKim <git@jasonk.me>
+" Last Change: 2020 May 16
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal autoindent
+setlocal indentexpr=GetSshconfigIndent(v:lnum)
+setlocal indentkeys=o,O,*<Return>,0=~host\ ,0=~match\ ,0#,!^F
+
+let b:undo_indent = "setlocal autoindent< indentexpr< indentkeys<"
+
+if exists("*GetSshconfigIndent")
+  finish
+endif
+
+function GetSshconfigIndent(lnum)
+  let sw = shiftwidth()
+  let prev_lnum = prevnonblank(a:lnum - 1)
+  let curr_lnum = a:lnum
+  let prev_line = getline(prev_lnum)
+  let curr_line = getline(curr_lnum)
+  if curr_line =~? '^\s*\(host\|match\)\s'
+    return 0
+  elseif prev_line =~? '^\s*\(host\|match\)\s'
+    return sw
+  else
+    return indent(prev_lnum)
+  endif
+endfunction
+
+endif
diff --git a/indent/systemverilog.vim b/indent/systemverilog.vim
new file mode 100644
index 000000000..82b277948
--- /dev/null
+++ b/indent/systemverilog.vim
@@ -0,0 +1,233 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemverilog') == -1
+
+" Vim indent file
+" Language:    SystemVerilog
+" Maintainer:  kocha <kocha.lsifrontend@gmail.com>
+" Last Change: 05-Feb-2017 by Bilal Wasim
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=SystemVerilogIndent()
+setlocal indentkeys=!^F,o,O,0),0},=begin,=end,=join,=endcase,=join_any,=join_none
+setlocal indentkeys+==endmodule,=endfunction,=endtask,=endspecify
+setlocal indentkeys+==endclass,=endpackage,=endsequence,=endclocking
+setlocal indentkeys+==endinterface,=endgroup,=endprogram,=endproperty,=endchecker
+setlocal indentkeys+==`else,=`endif
+
+" Only define the function once.
+if exists("*SystemVerilogIndent")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+function SystemVerilogIndent()
+
+  if exists('b:systemverilog_indent_width')
+    let offset = b:systemverilog_indent_width
+  else
+    let offset = shiftwidth()
+  endif
+  if exists('b:systemverilog_indent_modules')
+    let indent_modules = offset
+  else
+    let indent_modules = 0
+  endif
+
+  " Find a non-blank line above the current line.
+  let lnum = prevnonblank(v:lnum - 1)
+
+  " At the start of the file use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  let lnum2 = prevnonblank(lnum - 1)
+  let curr_line  = getline(v:lnum)
+  let last_line  = getline(lnum)
+  let last_line2 = getline(lnum2)
+  let ind  = indent(lnum)
+  let ind2 = indent(lnum - 1)
+  let offset_comment1 = 1
+  " Define the condition of an open statement
+  "   Exclude the match of //, /* or */
+  let sv_openstat = '\(\<or\>\|\([*/]\)\@<![*(,{><+-/%^&|!=?:]\([*/]\)\@!\)'
+  " Define the condition when the statement ends with a one-line comment
+  let sv_comment = '\(//.*\|/\*.*\*/\s*\)'
+  if exists('b:verilog_indent_verbose')
+    let vverb_str = 'INDENT VERBOSE:'
+    let vverb = 1
+  else
+    let vverb = 0
+  endif
+
+  " Indent accoding to last line
+  " End of multiple-line comment
+  if last_line =~ '\*/\s*$' && last_line !~ '/\*.\{-}\*/'
+    let ind = ind - offset_comment1
+    if vverb
+      echo vverb_str "De-indent after a multiple-line comment."
+    endif
+
+  " Indent after if/else/for/case/always/initial/specify/fork blocks
+  elseif last_line =~ '`\@<!\<\(if\|else\)\>' ||
+    \ last_line =~ '^\s*\<\(for\|case\%[[zx]]\|do\|foreach\|forever\|randcase\)\>' ||
+    \ last_line =~ '^\s*\<\(always\|always_comb\|always_ff\|always_latch\)\>' ||
+    \ last_line =~ '^\s*\<\(initial\|specify\|fork\|final\)\>'
+    if last_line !~ '\(;\|\<end\>\)\s*' . sv_comment . '*$' ||
+      \ last_line =~ '\(//\|/\*\).*\(;\|\<end\>\)\s*' . sv_comment . '*$'
+      let ind = ind + offset
+      if vverb | echo vverb_str "Indent after a block statement." | endif
+    endif
+  " Indent after function/task/class/package/sequence/clocking/
+  " interface/covergroup/property/checkerprogram blocks
+  elseif last_line =~ '^\s*\<\(function\|task\|class\|package\)\>' ||
+    \ last_line =~ '^\s*\<\(sequence\|clocking\|interface\)\>' ||
+    \ last_line =~ '^\s*\(\w\+\s*:\)\=\s*\<covergroup\>' ||
+    \ last_line =~ '^\s*\<\(property\|checker\|program\)\>'
+    if last_line !~ '\<end\>\s*' . sv_comment . '*$' ||
+      \ last_line =~ '\(//\|/\*\).*\(;\|\<end\>\)\s*' . sv_comment . '*$'
+      let ind = ind + offset
+      if vverb
+	echo vverb_str "Indent after function/task/class block statement."
+      endif
+    endif
+
+  " Indent after module/function/task/specify/fork blocks
+  elseif last_line =~ '^\s*\(\<extern\>\s*\)\=\<module\>'
+    let ind = ind + indent_modules
+    if vverb && indent_modules
+      echo vverb_str "Indent after module statement."
+    endif
+    if last_line =~ '[(,]\s*' . sv_comment . '*$' &&
+      \ last_line !~ '\(//\|/\*\).*[(,]\s*' . sv_comment . '*$'
+      let ind = ind + offset
+      if vverb
+	echo vverb_str "Indent after a multiple-line module statement."
+      endif
+    endif
+
+  " Indent after a 'begin' statement
+  elseif last_line =~ '\(\<begin\>\)\(\s*:\s*\w\+\)*' . sv_comment . '*$' &&
+    \ last_line !~ '\(//\|/\*\).*\(\<begin\>\)' &&
+    \ ( last_line2 !~ sv_openstat . '\s*' . sv_comment . '*$' ||
+    \ last_line2 =~ '^\s*[^=!]\+\s*:\s*' . sv_comment . '*$' )
+    let ind = ind + offset
+    if vverb | echo vverb_str "Indent after begin statement." | endif
+
+  " Indent after a '{' or a '('
+  elseif last_line =~ '[{(]' . sv_comment . '*$' &&
+    \ last_line !~ '\(//\|/\*\).*[{(]' &&
+    \ ( last_line2 !~ sv_openstat . '\s*' . sv_comment . '*$' ||
+    \ last_line2 =~ '^\s*[^=!]\+\s*:\s*' . sv_comment . '*$' )
+    let ind = ind + offset
+    if vverb | echo vverb_str "Indent after begin statement." | endif
+
+  " De-indent for the end of one-line block
+  elseif ( last_line !~ '\<begin\>' ||
+    \ last_line =~ '\(//\|/\*\).*\<begin\>' ) &&
+    \ last_line2 =~ '\<\(`\@<!if\|`\@<!else\|for\|always\|initial\|do\|foreach\|forever\|final\)\>.*' .
+      \ sv_comment . '*$' &&
+    \ last_line2 !~ '\(//\|/\*\).*\<\(`\@<!if\|`\@<!else\|for\|always\|initial\|do\|foreach\|forever\|final\)\>' &&
+    \ last_line2 !~ sv_openstat . '\s*' . sv_comment . '*$' &&
+    \ ( last_line2 !~ '\<begin\>' ||
+    \ last_line2 =~ '\(//\|/\*\).*\<begin\>' )
+    let ind = ind - offset
+    if vverb
+      echo vverb_str "De-indent after the end of one-line statement."
+    endif
+
+    " Multiple-line statement (including case statement)
+    " Open statement
+    "   Ident the first open line
+    elseif  last_line =~ sv_openstat . '\s*' . sv_comment . '*$' &&
+      \ last_line !~ '\(//\|/\*\).*' . sv_openstat . '\s*$' &&
+      \ last_line2 !~ sv_openstat . '\s*' . sv_comment . '*$'
+      let ind = ind + offset
+      if vverb | echo vverb_str "Indent after an open statement." | endif
+
+    " Close statement
+    "   De-indent for an optional close parenthesis and a semicolon, and only
+    "   if there exists precedent non-whitespace char
+    elseif last_line =~ ')*\s*;\s*' . sv_comment . '*$' &&
+      \ last_line !~ '^\s*)*\s*;\s*' . sv_comment . '*$' &&
+      \ last_line !~ '\(//\|/\*\).*\S)*\s*;\s*' . sv_comment . '*$' &&
+      \ ( last_line2 =~ sv_openstat . '\s*' . sv_comment . '*$' &&
+      \ last_line2 !~ ';\s*//.*$') &&
+      \ last_line2 !~ '^\s*' . sv_comment . '$'
+      let ind = ind - offset
+      if vverb | echo vverb_str "De-indent after a close statement." | endif
+
+  " `ifdef and `else
+  elseif last_line =~ '^\s*`\<\(ifdef\|else\)\>'
+    let ind = ind + offset
+    if vverb
+      echo vverb_str "Indent after a `ifdef or `else statement."
+    endif
+
+  endif
+
+  " Re-indent current line
+
+  " De-indent on the end of the block
+  " join/end/endcase/endfunction/endtask/endspecify
+  if curr_line =~ '^\s*\<\(join\|join_any\|join_none\|\|end\|endcase\|while\)\>' ||
+      \ curr_line =~ '^\s*\<\(endfunction\|endtask\|endspecify\|endclass\)\>' ||
+      \ curr_line =~ '^\s*\<\(endpackage\|endsequence\|endclocking\|endinterface\)\>' ||
+      \ curr_line =~ '^\s*\<\(endgroup\|endproperty\|endchecker\|endprogram\)\>' ||
+      \ curr_line =~ '^\s*}'
+    let ind = ind - offset
+    if vverb | echo vverb_str "De-indent the end of a block." | endif
+  elseif curr_line =~ '^\s*\<endmodule\>'
+    let ind = ind - indent_modules
+    if vverb && indent_modules
+      echo vverb_str "De-indent the end of a module."
+    endif
+
+  " De-indent on a stand-alone 'begin'
+  elseif curr_line =~ '^\s*\<begin\>'
+    if last_line !~ '^\s*\<\(function\|task\|specify\|module\|class\|package\)\>' ||
+      \ last_line !~ '^\s*\<\(sequence\|clocking\|interface\|covergroup\)\>' ||
+      \ last_line !~ '^\s*\<\(property\|checker\|program\)\>' &&
+      \ last_line !~ '^\s*\()*\s*;\|)\+\)\s*' . sv_comment . '*$' &&
+      \ ( last_line =~
+      \ '\<\(`\@<!if\|`\@<!else\|for\|case\%[[zx]]\|always\|initial\|do\|foreach\|forever\|randcase\|final\)\>' ||
+      \ last_line =~ ')\s*' . sv_comment . '*$' ||
+      \ last_line =~ sv_openstat . '\s*' . sv_comment . '*$' )
+      let ind = ind - offset
+      if vverb
+	echo vverb_str "De-indent a stand alone begin statement."
+      endif
+    endif
+
+  " De-indent after the end of multiple-line statement
+  elseif curr_line =~ '^\s*)' &&
+    \ ( last_line =~ sv_openstat . '\s*' . sv_comment . '*$' ||
+    \ last_line !~ sv_openstat . '\s*' . sv_comment . '*$' &&
+    \ last_line2 =~ sv_openstat . '\s*' . sv_comment . '*$' )
+    let ind = ind - offset
+    if vverb
+      echo vverb_str "De-indent the end of a multiple statement."
+    endif
+
+  " De-indent `else and `endif
+  elseif curr_line =~ '^\s*`\<\(else\|endif\)\>'
+    let ind = ind - offset
+    if vverb | echo vverb_str "De-indent `else and `endif statement." | endif
+
+  endif
+
+  " Return the indention
+  return ind
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:sw=2
+endif
diff --git a/indent/tcl.vim b/indent/tcl.vim
new file mode 100644
index 000000000..3ad7b4e18
--- /dev/null
+++ b/indent/tcl.vim
@@ -0,0 +1,105 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
+
+" Vim indent file
+" Language:	    	Tcl
+" Latest Update:  	Chris Heithoff <chrisheithoff@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2018-12-05
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetTclIndent()
+setlocal indentkeys=0{,0},!^F,o,O,0]
+setlocal nosmartindent
+
+if exists("*GetTclIndent")
+  finish
+endif
+
+function s:prevnonblanknoncomment(lnum)
+  let lnum = prevnonblank(a:lnum)
+  while lnum > 0
+    let line = getline(lnum)
+    if line !~ '^\s*\(#\|$\)'
+      break
+    endif
+    let lnum = prevnonblank(lnum - 1)
+  endwhile
+  return lnum
+endfunction
+
+function s:ends_with_backslash(lnum)
+  let line = getline(a:lnum)
+  if line =~ '\\\s*$'
+    return 1
+  else
+    return 0
+  endif
+endfunction 
+
+function s:count_braces(lnum, count_open)
+  let n_open = 0
+  let n_close = 0
+  let line = getline(a:lnum)
+  let pattern = '[{}]'
+  let i = match(line, pattern)
+  while i != -1
+    if synIDattr(synID(a:lnum, i + 1, 0), 'name') !~ 'tcl\%(Comment\|String\)'
+      if line[i] == '{'
+        let n_open += 1
+      elseif line[i] == '}'
+        if n_open > 0
+          let n_open -= 1
+        else
+          let n_close += 1
+        endif
+      endif
+    endif
+    let i = match(line, pattern, i + 1)
+  endwhile
+  return a:count_open ? n_open : n_close
+endfunction
+
+function GetTclIndent()
+  let line = getline(v:lnum)
+
+  " Get the line number of the previous non-blank or non-comment line.
+  let pnum = s:prevnonblanknoncomment(v:lnum - 1)
+  if pnum == 0
+    return 0
+  endif
+
+  " ..and the previous line before the previous line.
+  let pnum2 = s:prevnonblanknoncomment(pnum-1)
+
+  " Default indentation is to preserve the previous indentation.
+  let ind = indent(pnum)
+ 
+  " ...but if previous line introduces an open brace, then increase current line's indentation
+  if s:count_braces(pnum, 1) > 0
+    let ind += shiftwidth()
+  else
+    " Look for backslash line continuation on the previous two lines.
+    let slash1 = s:ends_with_backslash(pnum)
+    let slash2 = s:ends_with_backslash(pnum2)
+    if slash1 && !slash2
+      " If the previous line begins a line continuation.
+      let ind += shiftwidth()
+    elseif !slash1 && slash2
+      " If two lines ago was the end of a line continuation group of lines.
+      let ind -= shiftwidth()
+    endif
+  endif
+
+  " If the current line begins with a closed brace, then decrease the indentation by one.
+  if line =~ '^\s*}'
+    let ind -= shiftwidth()
+  endif
+  
+  return ind
+endfunction
+
+endif
diff --git a/indent/teraterm.vim b/indent/teraterm.vim
new file mode 100644
index 000000000..cde676899
--- /dev/null
+++ b/indent/teraterm.vim
@@ -0,0 +1,59 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'teraterm') == -1
+
+" Vim indent file
+" Language:	Tera Term Language (TTL)
+"		Based on Tera Term Version 4.100
+" Maintainer:	Ken Takata
+" URL:		https://github.com/k-takata/vim-teraterm
+" Last Change:	2018-08-31
+" Filenames:	*.ttl
+" License:	VIM License
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal nosmartindent
+setlocal noautoindent
+setlocal indentexpr=GetTeraTermIndent(v:lnum)
+setlocal indentkeys=!^F,o,O,e
+setlocal indentkeys+==elseif,=endif,=loop,=next,=enduntil,=endwhile
+
+if exists("*GetTeraTermIndent")
+  finish
+endif
+
+function! GetTeraTermIndent(lnum)
+  let l:prevlnum = prevnonblank(a:lnum-1)
+  if l:prevlnum == 0
+    " top of file
+    return 0
+  endif
+
+  " grab the previous and current line, stripping comments.
+  let l:prevl = substitute(getline(l:prevlnum), ';.*$', '', '')
+  let l:thisl = substitute(getline(a:lnum), ';.*$', '', '')
+  let l:previ = indent(l:prevlnum)
+
+  let l:ind = l:previ
+
+  if l:prevl =~ '^\s*if\>.*\<then\>'
+    " previous line opened a block
+    let l:ind += shiftwidth()
+  endif
+  if l:prevl =~ '^\s*\%(elseif\|else\|do\|until\|while\|for\)\>'
+    " previous line opened a block
+    let l:ind += shiftwidth()
+  endif
+  if l:thisl =~ '^\s*\%(elseif\|else\|endif\|enduntil\|endwhile\|loop\|next\)\>'
+    " this line closed a block
+    let l:ind -= shiftwidth()
+  endif
+
+  return l:ind
+endfunction
+
+" vim: ts=8 sw=2 sts=2
+
+endif
diff --git a/indent/tex.vim b/indent/tex.vim
new file mode 100644
index 000000000..54c45307f
--- /dev/null
+++ b/indent/tex.vim
@@ -0,0 +1,427 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
+
+" Vim indent file
+" Language:     LaTeX
+" Maintainer:   Yichao Zhou <broken.zhou AT gmail.com>
+" Created:      Sat, 16 Feb 2002 16:50:19 +0100
+" Version: 1.0.0
+"   Please email me if you found something I can do.  Comments, bug report and
+"   feature request are welcome.
+
+" Last Update:  {{{
+"               25th Sep 2002, by LH :
+"               (*) better support for the option
+"               (*) use some regex instead of several '||'.
+"               Oct 9th, 2003, by JT:
+"               (*) don't change indentation of lines starting with '%'
+"               2005/06/15, Moshe Kaminsky <kaminsky AT math.huji.ac.il>
+"               (*) New variables:
+"                   g:tex_items, g:tex_itemize_env, g:tex_noindent_env
+"               2011/3/6, by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Don't change indentation of lines starting with '%'
+"                   I don't see any code with '%' and it doesn't work properly
+"                   so I add some code.
+"               (*) New features: Add smartindent-like indent for "{}" and  "[]".
+"               (*) New variables: g:tex_indent_brace
+"               2011/9/25, by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Bug fix: smartindent-like indent for "[]"
+"               (*) New features: Align with "&".
+"               (*) New variable: g:tex_indent_and.
+"               2011/10/23 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Bug fix: improve the smartindent-like indent for "{}" and
+"               "[]".
+"               2012/02/27 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Bug fix: support default folding marker.
+"               (*) Indent with "&" is not very handy.  Make it not enable by
+"               default.
+"               2012/03/06 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Modify "&" behavior and make it default again.  Now "&"
+"               won't align when there are more then one "&" in the previous
+"               line.
+"               (*) Add indent "\left(" and "\right)"
+"               (*) Trust user when in "verbatim" and "lstlisting"
+"               2012/03/11 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Modify "&" so that only indent when current line start with
+"                   "&".
+"               2012/03/12 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Modify indentkeys.
+"               2012/03/18 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Add &cpo
+"               2013/05/02 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Fix problem about GetTeXIndent checker. Thank Albert Netymk
+"                   for reporting this.
+"               2014/06/23 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Remove the feature g:tex_indent_and because it is buggy.
+"               (*) If there is not any obvious indentation hints, we do not
+"                   alert our user's current indentation.
+"               (*) g:tex_indent_brace now only works if the open brace is the
+"                   last character of that line.
+"               2014/08/03 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Indent current line if last line has larger indentation
+"               2016/11/08 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Fix problems for \[ and \].  Thanks Bruno for reporting.
+"               2017/04/30 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Fix a bug between g:tex_noindent_env and g:tex_indent_items
+"                   Now g:tex_noindent_env='document\|verbatim\|itemize' (Emacs
+"                   style) is supported.  Thanks Miles Wheeler for reporting.
+"               2018/02/07 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Make indentation more smart in the normal mode
+"               2020/04/26 by Yichao Zhou <broken.zhou AT gmail.com>
+"               (*) Fix a bug related to \[ & \].  Thanks Manuel Boni for
+"               reporting.
+"
+" }}}
+
+" Document: {{{
+"
+" For proper latex experience, please put
+"         let g:tex_flavor = "latex"
+" into your vimrc.
+"
+" * g:tex_indent_brace
+"
+"   If this variable is unset or non-zero, it will use smartindent-like style
+"   for "{}" and "[]".  Now this only works if the open brace is the last
+"   character of that line.
+"
+"         % Example 1
+"         \usetikzlibrary{
+"           external
+"         }
+"
+"         % Example 2
+"         \tikzexternalize[
+"           prefix=tikz]
+"
+" * g:tex_indent_items
+"
+"   If this variable is set, item-environments are indented like Emacs does
+"   it, i.e., continuation lines are indented with a shiftwidth.
+"
+"              set                      unset
+"   ------------------------------------------------------
+"       \begin{itemize}            \begin{itemize}
+"         \item blablabla            \item blablabla
+"           bla bla bla              bla bla bla
+"         \item blablabla            \item blablabla
+"           bla bla bla              bla bla bla
+"       \end{itemize}              \end{itemize}
+"
+"
+" * g:tex_items
+"
+"   A list of tokens to be considered as commands for the beginning of an item
+"   command. The tokens should be separated with '\|'. The initial '\' should
+"   be escaped. The default is '\\bibitem\|\\item'.
+"
+" * g:tex_itemize_env
+"
+"   A list of environment names, separated with '\|', where the items (item
+"   commands matching g:tex_items) may appear. The default is
+"   'itemize\|description\|enumerate\|thebibliography'.
+"
+" * g:tex_noindent_env
+"
+"   A list of environment names. separated with '\|', where no indentation is
+"   required. The default is 'document\|verbatim'.
+" }}}
+
+" Only define the function once
+if exists("b:did_indent")
+    finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Define global variable {{{
+
+let b:did_indent = 1
+
+if !exists("g:tex_indent_items")
+    let g:tex_indent_items = 1
+endif
+if !exists("g:tex_indent_brace")
+    let g:tex_indent_brace = 1
+endif
+if !exists("g:tex_max_scan_line")
+    let g:tex_max_scan_line = 60
+endif
+if g:tex_indent_items
+    if !exists("g:tex_itemize_env")
+        let g:tex_itemize_env = 'itemize\|description\|enumerate\|thebibliography'
+    endif
+    if !exists('g:tex_items')
+        let g:tex_items = '\\bibitem\|\\item'
+    endif
+else
+    let g:tex_items = ''
+endif
+
+if !exists("g:tex_noindent_env")
+    let g:tex_noindent_env = 'document\|verbatim\|lstlisting'
+endif "}}}
+
+" VIM Setting " {{{
+setlocal autoindent
+setlocal nosmartindent
+setlocal indentexpr=GetTeXIndent()
+setlocal indentkeys&
+exec 'setlocal indentkeys+=[,(,{,),},],\&' . substitute(g:tex_items, '^\|\(\\|\)', ',=', 'g')
+let g:tex_items = '^\s*' . substitute(g:tex_items, '^\(\^\\s\*\)*', '', '')
+" }}}
+
+function! GetTeXIndent() " {{{
+    " Find a non-blank line above the current line.
+    let lnum = prevnonblank(v:lnum - 1)
+    let cnum = v:lnum
+
+    " Comment line is not what we need.
+    while lnum != 0 && getline(lnum) =~ '^\s*%'
+        let lnum = prevnonblank(lnum - 1)
+    endwhile
+
+    " At the start of the file use zero indent.
+    if lnum == 0
+        return 0
+    endif
+
+    let line = substitute(getline(lnum), '\s*%.*', '','g')     " last line
+    let cline = substitute(getline(v:lnum), '\s*%.*', '', 'g') " current line
+
+    let ccol = 1
+    while cline[ccol] =~ '\s'
+        let ccol += 1
+    endwhile
+
+    "  We are in verbatim, so do what our user what.
+    if synIDattr(synID(v:lnum, ccol, 1), "name") == "texZone"
+        if empty(cline)
+            return indent(lnum)
+        else
+            return indent(v:lnum)
+        endif
+    endif
+
+    if lnum == 0
+        return 0
+    endif
+
+    let ind = indent(lnum)
+    let stay = 1
+
+    " New code for comment: retain the indent of current line
+    if cline =~ '^\s*%'
+        return indent(v:lnum)
+    endif
+
+    " Add a 'shiftwidth' after beginning of environments.
+    " Don't add it for \begin{document} and \begin{verbatim}
+    " if line =~ '^\s*\\begin{\(.*\)}'  && line !~ 'verbatim'
+    " LH modification : \begin does not always start a line
+    " ZYC modification : \end after \begin won't cause wrong indent anymore
+    if line =~ '\\begin{.*}' 
+        if line !~ g:tex_noindent_env
+            let ind = ind + shiftwidth()
+            let stay = 0
+        endif
+
+        if g:tex_indent_items
+            " Add another sw for item-environments
+            if line =~ g:tex_itemize_env
+                let ind = ind + shiftwidth()
+                let stay = 0
+            endif
+        endif
+    endif
+
+    if cline =~ '\\end{.*}'
+        let retn = s:GetEndIndentation(v:lnum)
+        if retn != -1
+            return retn
+        endif
+    end
+    " Subtract a 'shiftwidth' when an environment ends
+    if cline =~ '\\end{.*}'
+                \ && cline !~ g:tex_noindent_env
+                \ && cline !~ '\\begin{.*}.*\\end{.*}'
+        if g:tex_indent_items
+            " Remove another sw for item-environments
+            if cline =~ g:tex_itemize_env
+                let ind = ind - shiftwidth()
+                let stay = 0
+            endif
+        endif
+
+        let ind = ind - shiftwidth()
+        let stay = 0
+    endif
+
+    if g:tex_indent_brace
+        if line =~ '[[{]$'
+            let ind += shiftwidth()
+            let stay = 0
+        endif
+
+        if cline =~ '^\s*\\\?[\]}]' && s:CheckPairedIsLastCharacter(v:lnum, ccol)
+            let ind -= shiftwidth()
+            let stay = 0
+        endif
+
+        if line !~ '^\s*\\\?[\]}]'
+            for i in range(1, strlen(line)-1)
+                let char = line[i]
+                if char == ']' || char == '}'
+                    if s:CheckPairedIsLastCharacter(lnum, i)
+                        let ind -= shiftwidth()
+                        let stay = 0
+                    endif
+                endif
+            endfor
+        endif
+    endif
+
+    " Special treatment for 'item'
+    " ----------------------------
+
+    if g:tex_indent_items
+        " '\item' or '\bibitem' itself:
+        if cline =~ g:tex_items
+            let ind = ind - shiftwidth()
+            let stay = 0
+        endif
+        " lines following to '\item' are intented once again:
+        if line =~ g:tex_items
+            let ind = ind + shiftwidth()
+            let stay = 0
+        endif
+    endif
+
+    if stay && mode() == 'i'
+        " If there is no obvious indentation hint, and indentation is triggered
+        " in insert mode, we trust our user.
+        if empty(cline)
+            return ind
+        else
+            return max([indent(v:lnum), s:GetLastBeginIndentation(v:lnum)])
+        endif
+    else
+        return ind
+    endif
+endfunction "}}}
+
+function! s:GetLastBeginIndentation(lnum) " {{{
+    let matchend = 1
+    for lnum in range(a:lnum-1, max([a:lnum - g:tex_max_scan_line, 1]), -1)
+        let line = getline(lnum)
+        if line =~ '\\end{.*}'
+            let matchend += 1
+        endif
+        if line =~ '\\begin{.*}'
+            let matchend -= 1
+        endif
+        if matchend == 0
+            if line =~ g:tex_noindent_env
+                return indent(lnum)
+            endif
+            if line =~ g:tex_itemize_env
+                return indent(lnum) + 2 * shiftwidth()
+            endif
+            return indent(lnum) + shiftwidth()
+        endif
+    endfor
+    return -1
+endfunction
+
+function! s:GetEndIndentation(lnum) " {{{
+    if getline(a:lnum) =~ '\\begin{.*}.*\\end{.*}'
+        return -1
+    endif
+
+    let min_indent = 100
+    let matchend = 1
+    for lnum in range(a:lnum-1, max([a:lnum-g:tex_max_scan_line, 1]), -1)
+        let line = getline(lnum)
+        if line =~ '\\end{.*}'
+            let matchend += 1
+        endif
+        if line =~ '\\begin{.*}'
+            let matchend -= 1
+        endif
+        if matchend == 0
+            return indent(lnum)
+        endif
+        if !empty(line)
+            let min_indent = min([min_indent, indent(lnum)])
+        endif
+    endfor
+    return min_indent - shiftwidth()
+endfunction
+
+" Most of the code is from matchparen.vim
+function! s:CheckPairedIsLastCharacter(lnum, col) "{{{
+    let c_lnum = a:lnum
+    let c_col = a:col+1
+
+    let line = getline(c_lnum)
+    if line[c_col-1] == '\'
+        let c_col = c_col + 1
+    endif
+    let c = line[c_col-1]
+
+    let plist = split(&matchpairs, '.\zs[:,]')
+    let i = index(plist, c)
+    if i < 0
+        return 0
+    endif
+
+    " Figure out the arguments for searchpairpos().
+    if i % 2 == 0
+        let s_flags = 'nW'
+        let c2 = plist[i + 1]
+    else
+        let s_flags = 'nbW'
+        let c2 = c
+        let c = plist[i - 1]
+    endif
+    if c == '['
+        let c = '\['
+        let c2 = '\]'
+    endif
+
+    " Find the match.  When it was just before the cursor move it there for a
+    " moment.
+    let save_cursor = winsaveview()
+    call cursor(c_lnum, c_col)
+
+    " When not in a string or comment ignore matches inside them.
+    " We match "escape" for special items, such as lispEscapeSpecial.
+    let s_skip ='synIDattr(synID(line("."), col("."), 0), "name") ' .
+                \ '=~?  "string\\|character\\|singlequote\\|escape\\|comment"'
+    execute 'if' s_skip '| let s_skip = 0 | endif'
+
+    let stopline = max([0, c_lnum - g:tex_max_scan_line])
+
+    " Limit the search time to 300 msec to avoid a hang on very long lines.
+    " This fails when a timeout is not supported.
+    try
+        let [m_lnum, m_col] = searchpairpos(c, '', c2, s_flags, s_skip, stopline, 100)
+    catch /E118/
+    endtry
+
+    call winrestview(save_cursor)
+
+    if m_lnum > 0
+        let line = getline(m_lnum)
+        return strlen(line) == m_col
+    endif
+
+    return 0
+endfunction "}}}
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: set sw=4 textwidth=80:
+
+endif
diff --git a/indent/tf.vim b/indent/tf.vim
new file mode 100644
index 000000000..ba22883c1
--- /dev/null
+++ b/indent/tf.vim
@@ -0,0 +1,76 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tf') == -1
+
+" Vim indent file
+" Language:     tf (TinyFugue)
+" Maintainer:   Christian J. Robinson <heptite@gmail.com>
+" URL:          http://www.vim.org/scripts/script.php?script_id=174
+" Last Change:  2017 Feb 25 
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetTFIndent()
+setlocal indentkeys-=0{,0} indentkeys-=0# indentkeys-=:
+setlocal indentkeys+==/endif,=/then,=/else,=/done,0;
+
+" Only define the function once:
+if exists("*GetTFIndent")
+  finish
+endif
+
+function GetTFIndent()
+	" Find a non-blank line above the current line:
+	let lnum = prevnonblank(v:lnum - 1)
+
+	" No indent for the start of the file:
+	if lnum == 0
+		return 0
+	endif
+
+	let ind = indent(lnum)
+	let line = getline(lnum)
+
+	" No indentation if the previous line didn't end with "\":
+	" (Could be annoying, but it lets you know if you made a mistake.)
+	if line !~ '\\$'
+		return 0
+	endif
+
+	if line =~ '\(/def.*\\\|/for.*\(%;\s*\)\@\<!\\\)$'
+		let ind = ind + shiftwidth()
+	elseif line =~ '\(/if\|/else\|/then\)'
+		if line !~ '/endif'
+			let ind = ind + shiftwidth()
+		endif
+	elseif line =~ '/while'
+		if line !~ '/done'
+			let ind = ind + shiftwidth()
+		endif
+	endif
+
+	let line = getline(v:lnum)
+
+	if line =~ '\(/else\|/endif\|/then\)'
+		if line !~ '/if'
+			let ind = ind - shiftwidth()
+		endif
+	elseif line =~ '/done'
+		if line !~ '/while'
+			let ind = ind - shiftwidth()
+		endif
+	endif
+
+	" Comments at the beginning of a line:
+	if line =~ '^\s*;'
+		let ind = 0
+	endif
+
+
+	return ind
+
+endfunction
+
+endif
diff --git a/indent/tilde.vim b/indent/tilde.vim
new file mode 100644
index 000000000..e23c9806e
--- /dev/null
+++ b/indent/tilde.vim
@@ -0,0 +1,40 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tilde') == -1
+
+"Description: Indent scheme for the tilde weblanguage
+"Author: Tobias Rundstr�m <tobi@tobi.nu>
+"URL: http://tilde.tildesoftware.net
+"Last Change: May  8 09:15:09 CEST 2002
+
+if exists ("b:did_indent")
+	finish
+endif
+
+let b:did_indent = 1
+
+setlocal autoindent
+setlocal indentexpr=GetTildeIndent(v:lnum)
+setlocal indentkeys=o,O,)
+
+if exists("*GetTildeIndent")
+	finish
+endif
+
+function GetTildeIndent(lnum)
+	let plnum = prevnonblank(v:lnum-1)
+
+	if plnum == 0
+		return 0
+	endif
+
+	if getline(v:lnum) =~ '^\s*\~\(endif\|else\|elseif\|end\)\>'
+		return indent(v:lnum) - shiftwidth()
+	endif
+
+	if getline(plnum) =~ '^\s*\~\(if\|foreach\|foreach_row\|xml_loop\|file_loop\|file_write\|file_append\|imap_loopsections\|imap_index\|imap_list\|ldap_search\|post_loopall\|post_loop\|file_loop\|sql_loop_num\|sql_dbmsselect\|search\|sql_loop\|post\|for\|function_define\|silent\|while\|setvalbig\|mail_create\|systempipe\|mail_send\|dual\|elseif\|else\)\>'
+		return indent(plnum) + shiftwidth()
+	else
+		return -1
+	endif
+endfunction
+
+endif
diff --git a/indent/treetop.vim b/indent/treetop.vim
new file mode 100644
index 000000000..13cb3e44f
--- /dev/null
+++ b/indent/treetop.vim
@@ -0,0 +1,42 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'treetop') == -1
+
+" Vim indent file
+" Language:             Treetop
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2011-03-14
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetTreetopIndent()
+setlocal indentkeys=0{,0},!^F,o,O,=end
+setlocal nosmartindent
+
+if exists("*GetTreetopIndent")
+  finish
+endif
+
+function GetTreetopIndent()
+  let pnum = prevnonblank(v:lnum - 1)
+  if pnum == 0
+    return 0
+  endif
+
+  let ind = indent(pnum)
+  let line = getline(pnum)
+
+  if line =~ '^\s*\%(grammar\|module\|rule\)\>'
+    let ind += shiftwidth()
+  endif
+
+  let line = getline(v:lnum)
+  if line =~ '^\s*end\>'
+    let ind -= shiftwidth()
+  end
+
+  retur ind
+endfunction
+
+endif
diff --git a/indent/verilog.vim b/indent/verilog.vim
new file mode 100644
index 000000000..43213a8dc
--- /dev/null
+++ b/indent/verilog.vim
@@ -0,0 +1,233 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilog') == -1
+
+" Language:     Verilog HDL
+" Maintainer:	Chih-Tsun Huang <cthuang@cs.nthu.edu.tw>
+" Last Change:	2017 Aug 25 by Chih-Tsun Huang
+" URL:		    http://www.cs.nthu.edu.tw/~cthuang/vim/indent/verilog.vim
+"
+" Credits:
+"   Suggestions for improvement, bug reports by
+"     Takuya Fujiwara <tyru.exe@gmail.com>
+"     Thilo Six <debian@Xk2c.de>
+"     Leo Butlero <lbutler@brocade.com>
+"
+" Buffer Variables:
+"     b:verilog_indent_modules : indenting after the declaration
+"				 of module blocks
+"     b:verilog_indent_width   : indenting width
+"     b:verilog_indent_verbose : verbose to each indenting
+"
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetVerilogIndent()
+setlocal indentkeys=!^F,o,O,0),=begin,=end,=join,=endcase
+setlocal indentkeys+==endmodule,=endfunction,=endtask,=endspecify
+setlocal indentkeys+==endconfig,=endgenerate,=endprimitive,=endtable
+setlocal indentkeys+==`else,=`elsif,=`endif
+
+" Only define the function once.
+if exists("*GetVerilogIndent")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+function GetVerilogIndent()
+
+  if exists('b:verilog_indent_width')
+    let offset = b:verilog_indent_width
+  else
+    let offset = shiftwidth()
+  endif
+  if exists('b:verilog_indent_modules')
+    let indent_modules = offset
+  else
+    let indent_modules = 0
+  endif
+
+  " Find a non-blank line above the current line.
+  let lnum = prevnonblank(v:lnum - 1)
+
+  " At the start of the file use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  let lnum2 = prevnonblank(lnum - 1)
+  let curr_line  = getline(v:lnum)
+  let last_line  = getline(lnum)
+  let last_line2 = getline(lnum2)
+  let ind  = indent(lnum)
+  let ind2 = indent(lnum - 1)
+  let offset_comment1 = 1
+  " Define the condition of an open statement
+  "   Exclude the match of //, /* or */
+  let vlog_openstat = '\(\<or\>\|\([*/]\)\@<![*(,{><+-/%^&|!=?:]\([*/]\)\@!\)'
+  " Define the condition when the statement ends with a one-line comment
+  let vlog_comment = '\(//.*\|/\*.*\*/\s*\)'
+  if exists('b:verilog_indent_verbose')
+    let vverb_str = 'INDENT VERBOSE:'
+    let vverb = 1
+  else
+    let vverb = 0
+  endif
+
+  " Indent accoding to last line
+  " End of multiple-line comment
+  if last_line =~ '\*/\s*$' && last_line !~ '/\*.\{-}\*/'
+    let ind = ind - offset_comment1
+    if vverb
+      echo vverb_str "De-indent after a multiple-line comment."
+    endif
+
+  " Indent after if/else/for/case/always/initial/specify/fork blocks
+  " Note: We exclude '`if' or '`else' and consider 'end else' 
+  "       'end if' is redundant here
+  elseif last_line =~ '^\s*\(end\)\=\s*`\@<!\<\(if\|else\)\>' ||
+    \ last_line =~ '^\s*\<\(for\|case\%[[zx]]\)\>' ||
+    \ last_line =~ '^\s*\<\(always\|initial\)\>' ||
+    \ last_line =~ '^\s*\<\(specify\|fork\)\>'
+    if last_line !~ '\(;\|\<end\>\)\s*' . vlog_comment . '*$' ||
+      \ last_line =~ '\(//\|/\*\).*\(;\|\<end\>\)\s*' . vlog_comment . '*$'
+      let ind = ind + offset
+      if vverb | echo vverb_str "Indent after a block statement." | endif
+    endif
+  " Indent after function/task/config/generate/primitive/table blocks
+  elseif last_line =~ '^\s*\<\(function\|task\|config\|generate\|primitive\|table\)\>'
+    if last_line !~ '\<end\>\s*' . vlog_comment . '*$' ||
+      \ last_line =~ '\(//\|/\*\).*\(;\|\<end\>\)\s*' . vlog_comment . '*$'
+      let ind = ind + offset
+      if vverb
+	echo vverb_str "Indent after function/task block statement."
+      endif
+    endif
+
+  " Indent after module/function/task/specify/fork blocks
+  elseif last_line =~ '^\s*\<module\>'
+    let ind = ind + indent_modules
+    if vverb && indent_modules
+      echo vverb_str "Indent after module statement."
+    endif
+    if last_line =~ '[(,]\s*' . vlog_comment . '*$' &&
+      \ last_line !~ '\(//\|/\*\).*[(,]\s*' . vlog_comment . '*$'
+      let ind = ind + offset
+      if vverb
+	echo vverb_str "Indent after a multiple-line module statement."
+      endif
+    endif
+
+  " Indent after a 'begin' statement
+  elseif last_line =~ '\(\<begin\>\)\(\s*:\s*\w\+\)*' . vlog_comment . '*$' &&
+    \ last_line !~ '\(//\|/\*\).*\(\<begin\>\)' &&
+    \ ( last_line2 !~ vlog_openstat . '\s*' . vlog_comment . '*$' ||
+    \ last_line2 =~ '^\s*[^=!]\+\s*:\s*' . vlog_comment . '*$' )
+    let ind = ind + offset
+    if vverb | echo vverb_str "Indent after begin statement." | endif
+
+  " De-indent for the end of one-line block
+  elseif ( last_line !~ '\<begin\>' ||
+    \ last_line =~ '\(//\|/\*\).*\<begin\>' ) &&
+    \ last_line2 =~ '\<\(`\@<!if\|`\@<!else\|for\|always\|initial\)\>.*' .
+      \ vlog_comment . '*$' &&
+    \ last_line2 !~
+      \ '\(//\|/\*\).*\<\(`\@<!if\|`\@<!else\|for\|always\|initial\)\>' &&
+    \ last_line2 !~ vlog_openstat . '\s*' . vlog_comment . '*$' &&
+    \ ( last_line2 !~ '\<begin\>' ||
+    \ last_line2 =~ '\(//\|/\*\).*\<begin\>' )
+    let ind = ind - offset
+    if vverb
+      echo vverb_str "De-indent after the end of one-line statement."
+    endif
+
+    " Multiple-line statement (including case statement)
+    " Open statement
+    "   Ident the first open line
+    elseif  last_line =~ vlog_openstat . '\s*' . vlog_comment . '*$' &&
+      \ last_line !~ '\(//\|/\*\).*' . vlog_openstat . '\s*$' &&
+      \ last_line2 !~ vlog_openstat . '\s*' . vlog_comment . '*$'
+      let ind = ind + offset
+      if vverb | echo vverb_str "Indent after an open statement." | endif
+
+    " Close statement
+    "   De-indent for an optional close parenthesis and a semicolon, and only
+    "   if there exists precedent non-whitespace char
+    elseif last_line =~ ')*\s*;\s*' . vlog_comment . '*$' &&
+      \ last_line !~ '^\s*)*\s*;\s*' . vlog_comment . '*$' &&
+      \ last_line !~ '\(//\|/\*\).*\S)*\s*;\s*' . vlog_comment . '*$' &&
+      \ ( last_line2 =~ vlog_openstat . '\s*' . vlog_comment . '*$' &&
+      \ last_line2 !~ ';\s*//.*$') &&
+      \ last_line2 !~ '^\s*' . vlog_comment . '$'
+      let ind = ind - offset
+      if vverb | echo vverb_str "De-indent after a close statement." | endif
+
+  " `ifdef or `ifndef or `elsif or `else
+  elseif last_line =~ '^\s*`\<\(ifn\?def\|elsif\|else\)\>'
+    let ind = ind + offset
+    if vverb
+      echo vverb_str "Indent after a `ifdef or `ifndef or `elsif or `else statement."
+    endif
+
+  endif
+
+  " Re-indent current line
+
+  " De-indent on the end of the block
+  " join/end/endcase/endfunction/endtask/endspecify
+  if curr_line =~ '^\s*\<\(join\|end\|endcase\)\>' ||
+    \ curr_line =~ '^\s*\<\(endfunction\|endtask\|endspecify\)\>' ||
+    \ curr_line =~ '^\s*\<\(endconfig\|endgenerate\|endprimitive\|endtable\)\>'
+    let ind = ind - offset
+    if vverb | echo vverb_str "De-indent the end of a block." | endif
+  elseif curr_line =~ '^\s*\<endmodule\>'
+    let ind = ind - indent_modules
+    if vverb && indent_modules
+      echo vverb_str "De-indent the end of a module."
+    endif
+
+  " De-indent on a stand-alone 'begin'
+  elseif curr_line =~ '^\s*\<begin\>'
+    if last_line !~ '^\s*\<\(function\|task\|specify\|module\|config\|generate\|primitive\|table\)\>' &&
+      \ last_line !~ '^\s*\()*\s*;\|)\+\)\s*' . vlog_comment . '*$' &&
+      \ ( last_line =~
+	\ '\<\(`\@<!if\|`\@<!else\|for\|case\%[[zx]]\|always\|initial\)\>' ||
+      \ last_line =~ ')\s*' . vlog_comment . '*$' ||
+      \ last_line =~ vlog_openstat . '\s*' . vlog_comment . '*$' )
+      let ind = ind - offset
+      if vverb
+	echo vverb_str "De-indent a stand alone begin statement."
+      endif
+    endif
+
+  " De-indent after the end of multiple-line statement
+  elseif curr_line =~ '^\s*)' &&
+    \ ( last_line =~ vlog_openstat . '\s*' . vlog_comment . '*$' ||
+    \ last_line !~ vlog_openstat . '\s*' . vlog_comment . '*$' &&
+    \ last_line2 =~ vlog_openstat . '\s*' . vlog_comment . '*$' )
+    let ind = ind - offset
+    if vverb
+      echo vverb_str "De-indent the end of a multiple statement."
+    endif
+
+  " De-indent `elsif or `else or `endif
+  elseif curr_line =~ '^\s*`\<\(elsif\|else\|endif\)\>'
+    let ind = ind - offset
+    if vverb | echo vverb_str "De-indent `elsif or `else or `endif statement." | endif
+
+  endif
+
+  " Return the indention
+  return ind
+endfunction
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:sw=2
+
+endif
diff --git a/indent/vhdl.vim b/indent/vhdl.vim
new file mode 100644
index 000000000..5e9bfd4e3
--- /dev/null
+++ b/indent/vhdl.vim
@@ -0,0 +1,439 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vhdl') == -1
+
+" VHDL indent ('93 syntax)
+" Language:    VHDL
+" Maintainer:  Gerald Lai <laigera+vim?gmail.com>
+" Version:     1.62
+" Last Change: 2017 Oct 17
+" URL:         http://www.vim.org/scripts/script.php?script_id=1450
+
+" only load this indent file when no other was loaded
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+" setup indent options for local VHDL buffer
+setlocal indentexpr=GetVHDLindent()
+setlocal indentkeys=!^F,o,O,0(,0)
+setlocal indentkeys+==~begin,=~end\ ,=~end\	,=~is,=~select,=~when
+setlocal indentkeys+==~if,=~then,=~elsif,=~else
+setlocal indentkeys+==~case,=~loop,=~for,=~generate,=~record,=~units,=~process,=~block,=~function,=~component,=~procedure
+setlocal indentkeys+==~architecture,=~configuration,=~entity,=~package
+
+" constants
+" not a comment
+let s:NC = '\%(--.*\)\@<!'
+" end of string
+let s:ES = '\s*\%(--.*\)\=$'
+" no "end" keyword in front
+let s:NE = '\%(\<end\s\+\)\@<!'
+
+" option to disable alignment of generic/port mappings
+if !exists("g:vhdl_indent_genportmap")
+  let g:vhdl_indent_genportmap = 1
+endif
+
+" option to disable alignment of right-hand side assignment "<=" statements
+if !exists("g:vhdl_indent_rhsassign")
+  let g:vhdl_indent_rhsassign = 1
+endif
+
+" only define indent function once
+if exists("*GetVHDLindent")
+  finish
+endif
+
+function GetVHDLindent()
+  " store current line & string
+  let curn = v:lnum
+  let curs = getline(curn)
+
+  " find previous line that is not a comment
+  let prevn = prevnonblank(curn - 1)
+  let prevs = getline(prevn)
+  while prevn > 0 && prevs =~ '^\s*--'
+    let prevn = prevnonblank(prevn - 1)
+    let prevs = getline(prevn)
+  endwhile
+  let prevs_noi = substitute(prevs, '^\s*', '', '')
+
+  " default indent starts as previous non-comment line's indent
+  let ind = prevn > 0 ? indent(prevn) : 0
+  " backup default
+  let ind2 = ind
+
+  " indent:   special; kill string so it would not affect other filters
+  " keywords: "report" + string
+  " where:    anywhere in current or previous line
+  let s0 = s:NC.'\<report\>\s*".*"'
+  if curs =~? s0
+    let curs = ""
+  endif
+  if prevs =~? s0
+    let prevs = ""
+  endif
+
+  " indent:   previous line's comment position, otherwise follow next non-comment line if possible
+  " keyword:  "--"
+  " where:    start of current line
+  if curs =~ '^\s*--'
+    let pn = curn - 1
+    let ps = getline(pn)
+    if curs =~ '^\s*--\s' && ps =~ '--'
+      return indent(pn) + stridx(substitute(ps, '^\s*', '', ''), '--')
+    else
+      " find nextnonblank line that is not a comment
+      let nn = nextnonblank(curn + 1)
+      let ns = getline(nn)
+      while nn > 0 && ns =~ '^\s*--'
+        let nn = nextnonblank(nn + 1)
+        let ns = getline(nn)
+      endwhile
+      let n = indent(nn)
+      return n != -1 ? n : ind
+    endif
+  endif
+
+  " ****************************************************************************************
+  " indent:   align generic variables & port names
+  " keywords: "procedure" + name, "generic", "map", "port" + "(", provided current line is part of mapping
+  " where:    anywhere in previous 2 lines
+  " find following previous non-comment line
+  let pn = prevnonblank(prevn - 1)
+  let ps = getline(pn)
+  while pn > 0 && ps =~ '^\s*--'
+    let pn = prevnonblank(pn - 1)
+    let ps = getline(pn)
+  endwhile
+  if (curs =~ '^\s*)' || curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*\((.*)\)*\s*\%(=>\s*\S\+\|:[^=]\@=\s*\%(\%(in\|out\|inout\|buffer\|linkage\)\>\|\s\+\)\)') && (prevs =~? s:NC.'\<\%(procedure\s\+\S\+\|generic\|map\|port\)\s*(\%(\s*\w\)\=' || (ps =~? s:NC.'\<\%(procedure\|generic\|map\|port\)'.s:ES && prevs =~ '^\s*('))
+    " align closing ")" with opening "("
+    if curs =~ '^\s*)'
+      return ind2 + stridx(prevs_noi, '(')
+    endif
+    let m = matchend(prevs_noi, '(\s*\ze\w')
+    if m != -1
+      return ind2 + m
+    else
+      if g:vhdl_indent_genportmap
+        return ind2 + stridx(prevs_noi, '(') + shiftwidth()
+      else
+        return ind2 + shiftwidth()
+      endif
+    endif
+  endif
+
+  " indent:   align conditional/select statement
+  " keywords: variable + "<=" without ";" ending
+  " where:    start of previous line
+  if prevs =~? '^\s*\S\+\s*<=[^;]*'.s:ES
+    if g:vhdl_indent_rhsassign
+      return ind2 + matchend(prevs_noi, '<=\s*\ze.')
+    else
+      return ind2 + shiftwidth()
+    endif
+  endif
+
+  " indent:   backtrace previous non-comment lines for next smaller or equal size indent
+  " keywords: "end" + "record", "units"
+  " where:    start of previous line
+  " keyword:  ")"
+  " where:    start of previous line
+  " keyword:  without "<=" + ";" ending
+  " where:    anywhere in previous line
+  " keyword:  "=>" + ")" ending, provided current line does not begin with ")"
+  " where:    anywhere in previous line
+  " _note_:   indent allowed to leave this filter
+  let m = 0
+  if prevs =~? '^\s*end\s\+\%(record\|units\)\>'
+    let m = 3
+  elseif prevs =~ '^\s*)'
+    let m = 1
+  elseif prevs =~ s:NC.'\%(<=.*\)\@<!;'.s:ES || (curs !~ '^\s*)' && prevs =~ s:NC.'=>.*'.s:NC.')'.s:ES)
+    let m = 2
+  endif
+
+  if m > 0
+    let pn = prevnonblank(prevn - 1)
+    let ps = getline(pn)
+    while pn > 0
+      let t = indent(pn)
+      if ps !~ '^\s*--' && (t < ind || (t == ind && m == 3))
+        " make sure one of these is true
+        " keywords: variable + "<=" without ";" ending
+        " where:    start of previous non-comment line
+        " keywords: "procedure", "generic", "map", "port"
+        " where:    anywhere in previous non-comment line
+        " keyword:  "("
+        " where:    start of previous non-comment line
+        if m < 3 && ps !~? '^\s*\S\+\s*<=[^;]*'.s:ES
+          if ps =~? s:NC.'\<\%(procedure\|generic\|map\|port\)\>' || ps =~ '^\s*('
+            let ind = t
+          endif
+          break
+        endif
+        let ind = t
+        if m > 1
+          " find following previous non-comment line
+          let ppn = prevnonblank(pn - 1)
+          let pps = getline(ppn)
+          while ppn > 0 && pps =~ '^\s*--'
+            let ppn = prevnonblank(ppn - 1)
+            let pps = getline(ppn)
+          endwhile
+          " indent:   follow
+          " keyword:  "select"
+          " where:    end of following previous non-comment line
+          " keyword:  "type"
+          " where:    start of following previous non-comment line
+          if m == 2
+            let s1 = s:NC.'\<select'.s:ES
+            if ps !~? s1 && pps =~? s1
+              let ind = indent(ppn)
+            endif
+          elseif m == 3
+            let s1 = '^\s*type\>'
+            if ps !~? s1 && pps =~? s1
+              let ind = indent(ppn)
+            endif
+          endif
+        endif
+        break
+      endif
+      let pn = prevnonblank(pn - 1)
+      let ps = getline(pn)
+    endwhile
+  endif
+
+  " indent:   follow indent of previous opening statement, otherwise -sw
+  " keyword:  "begin"
+  " where:    anywhere in current line
+  if curs =~? s:NC.'\<begin\>'
+    " find previous opening statement of
+    " keywords: "architecture", "block", "entity", "function", "generate", "procedure", "process"
+    let s2 = s:NC.s:NE.'\<\%(architecture\|block\|entity\|function\|generate\|procedure\|process\)\>'
+
+    let pn = prevnonblank(curn - 1)
+    let ps = getline(pn)
+    while pn > 0 && (ps =~ '^\s*--' || ps !~? s2)
+      let pn = prevnonblank(pn - 1)
+      let ps = getline(pn)
+
+      if (ps =~? s:NC.'\<begin\>')
+        return indent(pn) - shiftwidth()
+      endif
+    endwhile
+
+    if (pn == 0)
+      return ind - shiftwidth()
+    else
+      return indent(pn)
+    endif
+  endif
+
+  " indent:   +sw if previous line is previous opening statement
+  " keywords: "record", "units"
+  " where:    anywhere in current line
+  if curs =~? s:NC.s:NE.'\<\%(record\|units\)\>'
+    " find previous opening statement of
+    " keyword: "type"
+    let s3 = s:NC.s:NE.'\<type\>'
+    if curs !~? s3.'.*'.s:NC.'\<\%(record\|units\)\>.*'.s:ES && prevs =~? s3
+      let ind = ind + shiftwidth()
+    endif
+    return ind
+  endif
+
+  " ****************************************************************************************
+  " indent:   0
+  " keywords: "architecture", "configuration", "entity", "library", "package"
+  " where:    start of current line
+  if curs =~? '^\s*\%(architecture\|configuration\|entity\|library\|package\)\>'
+    return 0
+  endif
+
+  " indent:   maintain indent of previous opening statement
+  " keyword:  "is"
+  " where:    start of current line
+  " find previous opening statement of
+  " keywords: "architecture", "block", "configuration", "entity", "function", "package", "procedure", "process", "type"
+  if curs =~? '^\s*\<is\>' && prevs =~? s:NC.s:NE.'\<\%(architecture\|block\|configuration\|entity\|function\|package\|procedure\|process\|type\)\>'
+    return ind2
+  endif
+
+  " indent:   maintain indent of previous opening statement
+  " keyword:  "then"
+  " where:    start of current line
+  " find previous opening statement of
+  " keywords: "elsif", "if"
+  if curs =~? '^\s*\<then\>' && prevs =~? s:NC.'\%(\<elsif\>\|'.s:NE.'\<if\>\)'
+    return ind2
+  endif
+
+  " indent:   maintain indent of previous opening statement
+  " keyword:  "generate"
+  " where:    start of current line
+  " find previous opening statement of
+  " keywords: "for", "if"
+  if curs =~? '^\s*\<generate\>' && prevs =~? s:NC.s:NE.'\%(\%(\<wait\s\+\)\@<!\<for\|\<if\)\>'
+    return ind2
+  endif
+
+  " indent:   +sw
+  " keywords: "block", "process"
+  " removed:  "begin", "case", "elsif", "if", "loop", "record", "units", "while"
+  " where:    anywhere in previous line
+  if prevs =~? s:NC.s:NE.'\<\%(block\|process\)\>'
+    return ind + shiftwidth()
+  endif
+
+  " indent:   +sw
+  " keywords: "architecture", "configuration", "entity", "package"
+  " removed:  "component", "for", "when", "with"
+  " where:    start of previous line
+  if prevs =~? '^\s*\%(architecture\|configuration\|entity\|package\)\>'
+    return ind + shiftwidth()
+  endif
+
+  " indent:   +sw
+  " keyword:  "select"
+  " removed:  "generate", "is", "=>"
+  " where:    end of previous line
+  if prevs =~? s:NC.'\<select'.s:ES
+    return ind + shiftwidth()
+  endif
+
+  " indent:   +sw
+  " keyword:  "begin", "loop", "record", "units"
+  " where:    anywhere in previous line
+  " keyword:  "component", "else", "for"
+  " where:    start of previous line
+  " keyword:  "generate", "is", "then", "=>"
+  " where:    end of previous line
+  " _note_:   indent allowed to leave this filter
+  if prevs =~? s:NC.'\%(\<begin\>\|'.s:NE.'\<\%(loop\|record\|units\)\>\)' || prevs =~? '^\s*\%(component\|else\|for\)\>' || prevs =~? s:NC.'\%('.s:NE.'\<generate\|\<\%(is\|then\)\|=>\)'.s:ES
+    let ind = ind + shiftwidth()
+  endif
+
+  " ****************************************************************************************
+  " indent:   -sw
+  " keywords: "when", provided previous line does not begin with "when", does not end with "is"
+  " where:    start of current line
+  let s4 = '^\s*when\>'
+  if curs =~? s4
+    if prevs =~? s:NC.'\<is'.s:ES
+      return ind
+    elseif prevs !~? s4
+      return ind - shiftwidth()
+    else
+      return ind2
+    endif
+  endif
+
+  " indent:   -sw
+  " keywords: "else", "elsif", "end" + "block", "for", "function", "generate", "if", "loop", "procedure", "process", "record", "units"
+  " where:    start of current line
+  let s5 = 'block\|for\|function\|generate\|if\|loop\|procedure\|process\|record\|units'
+  if curs =~? '^\s*\%(else\|elsif\|end\s\+\%('.s5.'\)\)\>'
+    if prevs =~? '^\s*\%(elsif\|'.s5.'\)'
+      return ind
+    else
+      return ind - shiftwidth()
+    endif
+  endif
+
+  " indent:   backtrace previous non-comment lines
+  " keyword:  "end" + "case", "component"
+  " where:    start of current line
+  let m = 0
+  if curs =~? '^\s*end\s\+case\>'
+    let m = 1
+  elseif curs =~? '^\s*end\s\+component\>'
+    let m = 2
+  endif
+
+  if m > 0
+    " find following previous non-comment line
+    let pn = prevn
+    let ps = getline(pn)
+    while pn > 0
+      if ps !~ '^\s*--'
+        "indent:   -2sw
+        "keywords: "end" + "case"
+        "where:    start of previous non-comment line
+        "indent:   -sw
+        "keywords: "when"
+        "where:    start of previous non-comment line
+        "indent:   follow
+        "keywords: "case"
+        "where:    start of previous non-comment line
+        if m == 1
+          if ps =~? '^\s*end\s\+case\>'
+            return indent(pn) - 2 * shiftwidth()
+          elseif ps =~? '^\s*when\>'
+            return indent(pn) - shiftwidth()
+          elseif ps =~? '^\s*case\>'
+            return indent(pn)
+          endif
+        "indent:   follow
+        "keyword:  "component"
+        "where:    start of previous non-comment line
+        elseif m == 2
+          if ps =~? '^\s*component\>'
+            return indent(pn)
+          endif
+        endif
+      endif
+      let pn = prevnonblank(pn - 1)
+      let ps = getline(pn)
+    endwhile
+    return ind - shiftwidth()
+  endif
+
+  " indent:   -sw
+  " keyword:  ")"
+  " where:    start of current line
+  if curs =~ '^\s*)'
+    return ind - shiftwidth()
+  endif
+
+  " indent:   0
+  " keywords: "end" + "architecture", "configuration", "entity", "package"
+  " where:    start of current line
+  if curs =~? '^\s*end\s\+\%(architecture\|configuration\|entity\|package\)\>'
+    return 0
+  endif
+
+  " indent:   -sw
+  " keywords: "end" + identifier, ";"
+  " where:    start of current line
+  "if curs =~? '^\s*end\s\+\w\+\>'
+  if curs =~? '^\s*end\%(\s\|;'.s:ES.'\)'
+    return ind - shiftwidth()
+  endif
+
+  " ****************************************************************************************
+  " indent:   maintain indent of previous opening statement
+  " keywords: without "procedure", "generic", "map", "port" + ":" but not ":=" + "in", "out", "inout", "buffer", "linkage", variable & ":="
+  " where:    start of current line
+  if curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=]\@=\s*\%(\%(in\|out\|inout\|buffer\|linkage\)\>\|\w\+\s\+:=\)'
+    return ind2
+  endif
+
+  " ****************************************************************************************
+  " indent:     maintain indent of previous opening statement, corner case which
+  "             does not end in ;, but is part of a mapping
+  " keywords:   without "procedure", "generic", "map", "port" + ":" but not ":=", never + ;$ and
+  "             prevline without "procedure", "generic", "map", "port" + ":" but not ":=" + eventually ;$
+  " where:      start of current line
+  if curs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*[^;].*$'
+    if prevs =~? '^\s*\%(\<\%(procedure\|generic\|map\|port\)\>.*\)\@<!\w\+\s*\w*\s*:[^=].*;.*$'
+      return ind2
+    endif
+  endif
+
+  " return leftover filtered indent
+  return ind
+endfunction
+
+endif
diff --git a/indent/vim.vim b/indent/vim.vim
new file mode 100644
index 000000000..c819c64f9
--- /dev/null
+++ b/indent/vim.vim
@@ -0,0 +1,134 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vim') == -1
+
+" Vim indent file
+" Language:	Vim script
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2020 Sep 27
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetVimIndent()
+setlocal indentkeys+==end,=},=else,=cat,=finall,=END,0\\,0=\"\\\ 
+setlocal indentkeys-=0#
+
+let b:undo_indent = "setl indentkeys< indentexpr<"
+
+" Only define the function once.
+if exists("*GetVimIndent")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+function GetVimIndent()
+  let ignorecase_save = &ignorecase
+  try
+    let &ignorecase = 0
+    return GetVimIndentIntern()
+  finally
+    let &ignorecase = ignorecase_save
+  endtry
+endfunc
+
+let s:lineContPat = '^\s*\(\\\|"\\ \)'
+
+function GetVimIndentIntern()
+  " Find a non-blank line above the current line.
+  let lnum = prevnonblank(v:lnum - 1)
+
+  " If the current line doesn't start with '\' or '"\ ' and below a line that
+  " starts with '\' or '"\ ', use the indent of the line above it.
+  let cur_text = getline(v:lnum)
+  if cur_text !~ s:lineContPat
+    while lnum > 0 && getline(lnum) =~ s:lineContPat
+      let lnum = lnum - 1
+    endwhile
+  endif
+
+  " At the start of the file use zero indent.
+  if lnum == 0
+    return 0
+  endif
+  let prev_text = getline(lnum)
+
+  " Add a 'shiftwidth' after :if, :while, :try, :catch, :finally, :function
+  " and :else.  Add it three times for a line that starts with '\' or '"\ '
+  " after a line that doesn't (or g:vim_indent_cont if it exists).
+  let ind = indent(lnum)
+
+  " In heredoc indenting works completely differently.
+  if has('syntax_items') 
+    let syn_here = synIDattr(synID(v:lnum, 1, 1), "name")
+    if syn_here =~ 'vimLetHereDocStop'
+      " End of heredoc: use indent of matching start line
+      let lnum = v:lnum - 1
+      while lnum > 0
+	if synIDattr(synID(lnum, 1, 1), "name") !~ 'vimLetHereDoc'
+	  return indent(lnum)
+	endif
+	let lnum -= 1
+      endwhile
+      return 0
+    endif
+    if syn_here =~ 'vimLetHereDoc'
+      if synIDattr(synID(lnum, 1, 1), "name") !~ 'vimLetHereDoc'
+	" First line in heredoc: increase indent
+	return ind + shiftwidth()
+      endif
+      " Heredoc continues: no change in indent
+      return ind
+    endif
+  endif
+
+  if cur_text =~ s:lineContPat && v:lnum > 1 && prev_text !~ s:lineContPat
+    if exists("g:vim_indent_cont")
+      let ind = ind + g:vim_indent_cont
+    else
+      let ind = ind + shiftwidth() * 3
+    endif
+  elseif prev_text =~ '^\s*aug\%[roup]\s\+' && prev_text !~ '^\s*aug\%[roup]\s\+[eE][nN][dD]\>'
+    let ind = ind + shiftwidth()
+  else
+    " A line starting with :au does not increment/decrement indent.
+    if prev_text !~ '^\s*au\%[tocmd]'
+      let i = match(prev_text, '\(^\||\)\s*\(export\s\+\)\?\({\|\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\|finall\%[y]\|fu\%[nction]\|def\|el\%[seif]\)\>\)')
+      if i >= 0
+	let ind += shiftwidth()
+	if strpart(prev_text, i, 1) == '|' && has('syntax_items')
+	      \ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$'
+	  let ind -= shiftwidth()
+	endif
+      endif
+    endif
+  endif
+
+  " If the previous line contains an "end" after a pipe, but not in an ":au"
+  " command.  And not when there is a backslash before the pipe.
+  " And when syntax HL is enabled avoid a match inside a string.
+  let i = match(prev_text, '[^\\]|\s*\(ene\@!\)')
+  if i > 0 && prev_text !~ '^\s*au\%[tocmd]'
+    if !has('syntax_items') || synIDattr(synID(lnum, i + 2, 1), "name") !~ '\(Comment\|String\)$'
+      let ind = ind - shiftwidth()
+    endif
+  endif
+
+
+  " Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry,
+  " :endfun, :enddef, :else and :augroup END.
+  if cur_text =~ '^\s*\(ene\@!\|}\|cat\|finall\|el\|aug\%[roup]\s\+[eE][nN][dD]\)'
+    let ind = ind - shiftwidth()
+  endif
+
+  return ind
+endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim:sw=2
+
+endif
diff --git a/indent/vroom.vim b/indent/vroom.vim
new file mode 100644
index 000000000..9ed918c6e
--- /dev/null
+++ b/indent/vroom.vim
@@ -0,0 +1,25 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vroom') == -1
+
+" Vim indent file
+" Language:	Vroom (vim testing and executable documentation)
+" Maintainer:	David Barnett (https://github.com/google/vim-ft-vroom)
+" Last Change:	2014 Jul 23
+
+if exists('b:did_indent')
+  finish
+endif
+let b:did_indent = 1
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+
+let b:undo_indent = 'setlocal autoindent<'
+
+setlocal autoindent
+
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/indent/wast.vim b/indent/wast.vim
new file mode 100644
index 000000000..abc5bfbd4
--- /dev/null
+++ b/indent/wast.vim
@@ -0,0 +1,21 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wast') == -1
+
+" Vim indent file
+" Language:     WebAssembly
+" Maintainer:   rhysd <lin90162@yahoo.co.jp>
+" Last Change:  Jul 29, 2018
+" For bugs, patches and license go to https://github.com/rhysd/vim-wasm
+
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+" WebAssembly text format is S-expression. We can reuse LISP indentation
+" logic.
+setlocal indentexpr=lispindent('.')
+setlocal noautoindent nosmartindent
+
+let b:undo_indent = "setl lisp< indentexpr<"
+
+endif
diff --git a/indent/xhtml.vim b/indent/xhtml.vim
new file mode 100644
index 000000000..abe08ba3e
--- /dev/null
+++ b/indent/xhtml.vim
@@ -0,0 +1,16 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xhtml') == -1
+
+" Vim indent file
+" Language:	XHTML
+" Maintainer:	Bram Moolenaar <Bram@vim.org> (for now)
+" Last Change:	2005 Jun 24
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+" Handled like HTML for now.
+runtime! indent/html.vim
+
+endif
diff --git a/indent/xinetd.vim b/indent/xinetd.vim
new file mode 100644
index 000000000..4ee1a76f8
--- /dev/null
+++ b/indent/xinetd.vim
@@ -0,0 +1,59 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xinetd') == -1
+
+" Vim indent file
+" Language:             xinetd.conf(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-12-20
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetXinetdIndent()
+setlocal indentkeys=0{,0},!^F,o,O
+setlocal nosmartindent
+
+if exists("*GetXinetdIndent")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+function s:count_braces(lnum, count_open)
+  let n_open = 0
+  let n_close = 0
+  let line = getline(a:lnum)
+  let pattern = '[{}]'
+  let i = match(line, pattern)
+  while i != -1
+    if synIDattr(synID(a:lnum, i + 1, 0), 'name') !~ 'ld\%(Comment\|String\)'
+      if line[i] == '{'
+        let n_open += 1
+      elseif line[i] == '}'
+        if n_open > 0
+          let n_open -= 1
+        else
+          let n_close += 1
+        endif
+      endif
+    endif
+    let i = match(line, pattern, i + 1)
+  endwhile
+  return a:count_open ? n_open : n_close
+endfunction
+
+function GetXinetdIndent()
+  let pnum = prevnonblank(v:lnum - 1)
+  if pnum == 0
+    return 0
+  endif
+
+  return indent(pnum) + s:count_braces(pnum, 1) * shiftwidth()
+        \ - s:count_braces(v:lnum, 0) * shiftwidth()
+endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/indent/xsd.vim b/indent/xsd.vim
new file mode 100644
index 000000000..c12f73c79
--- /dev/null
+++ b/indent/xsd.vim
@@ -0,0 +1,17 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
+
+" Vim indent file
+" Language: 	.xsd files (XML Schema)
+" Maintainer:	Nobody
+" Last Change:	2005 Jun 09
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+" Use XML formatting rules
+runtime! indent/xml.vim
+
+
+endif
diff --git a/indent/xslt.vim b/indent/xslt.vim
new file mode 100644
index 000000000..e31f9aca7
--- /dev/null
+++ b/indent/xslt.vim
@@ -0,0 +1,17 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xslt') == -1
+
+" Vim indent file
+" Language:    XSLT .xslt files
+" Maintainer:  David Fishburn <fishburn@ianywhere.com>
+" Last Change: Wed May 14 2003 8:48:41 PM
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+" Use XML formatting rules
+runtime! indent/xml.vim
+
+
+endif
diff --git a/indent/yacc.vim b/indent/yacc.vim
new file mode 100644
index 000000000..9ebb7f497
--- /dev/null
+++ b/indent/yacc.vim
@@ -0,0 +1,45 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yacc') == -1
+
+" Vim indent file
+" Language:             YACC input file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-12-20
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+let b:did_indent = 1
+
+setlocal indentexpr=GetYaccIndent()
+setlocal indentkeys=!^F,o,O
+setlocal nosmartindent
+
+" Only define the function once.
+if exists("*GetYaccIndent")
+  finish
+endif
+
+function GetYaccIndent()
+  if v:lnum == 1
+    return 0
+  endif
+
+  let ind = indent(v:lnum - 1)
+  let line = getline(v:lnum - 1)
+
+  if line == ''
+    let ind = 0
+  elseif line =~ '^\w\+\s*:'
+    let ind = ind + matchend(line, '^\w\+\s*')
+  elseif line =~ '^\s*;'
+    let ind = 0
+  else
+    let ind = indent(v:lnum)
+  endif
+
+  return ind
+endfunction
+
+endif
diff --git a/indent/yaml.vim b/indent/yaml.vim
deleted file mode 100644
index c7fdebcff..000000000
--- a/indent/yaml.vim
+++ /dev/null
@@ -1,159 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
-
-" Vim indent file
-" Language:         YAML
-" Maintainer:       Nikolai Pavlov <zyx.vim@gmail.com>
-" Last Change:	    2019 Sep 28
-
-" Only load this indent file when no other was loaded.
-if exists('b:did_indent')
-  finish
-endif
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-let b:did_indent = 1
-
-setlocal indentexpr=GetYAMLIndent(v:lnum)
-setlocal indentkeys=!^F,o,O,0#,0},0],<:>,0-
-setlocal nosmartindent
-
-let b:undo_indent = 'setlocal indentexpr< indentkeys< smartindent<'
-
-" Only define the function once.
-if exists('*GetYAMLIndent')
-    finish
-endif
-
-function s:FindPrevLessIndentedLine(lnum, ...)
-    let prevlnum = prevnonblank(a:lnum-1)
-    let curindent = a:0 ? a:1 : indent(a:lnum)
-    while           prevlnum
-                \&&  indent(prevlnum) >=  curindent
-                \&& getline(prevlnum) !~# '^\s*#'
-        let prevlnum = prevnonblank(prevlnum-1)
-    endwhile
-    return prevlnum
-endfunction
-
-function s:FindPrevLEIndentedLineMatchingRegex(lnum, regex)
-    let plilnum = s:FindPrevLessIndentedLine(a:lnum, indent(a:lnum)+1)
-    while plilnum && getline(plilnum) !~# a:regex
-        let plilnum = s:FindPrevLessIndentedLine(plilnum)
-    endwhile
-    return plilnum
-endfunction
-
-let s:mapkeyregex='\v^\s*\#@!\S@=%(\''%([^'']|\''\'')*\'''.
-                \                 '|\"%([^"\\]|\\.)*\"'.
-                \                 '|%(%(\:\ )@!.)*)\:%(\ |$)'
-let s:liststartregex='\v^\s*%(\-%(\ |$))'
-
-let s:c_ns_anchor_char = '\v%([\n\r\uFEFF \t,[\]{}]@!\p)'
-let s:c_ns_anchor_name = s:c_ns_anchor_char.'+'
-let s:c_ns_anchor_property =  '\v\&'.s:c_ns_anchor_name
-
-let s:ns_word_char = '\v[[:alnum:]_\-]'
-let s:ns_tag_char  = '\v%(%\x\x|'.s:ns_word_char.'|[#/;?:@&=+$.~*''()])'
-let s:c_named_tag_handle     = '\v\!'.s:ns_word_char.'+\!'
-let s:c_secondary_tag_handle = '\v\!\!'
-let s:c_primary_tag_handle   = '\v\!'
-let s:c_tag_handle = '\v%('.s:c_named_tag_handle.
-            \            '|'.s:c_secondary_tag_handle.
-            \            '|'.s:c_primary_tag_handle.')'
-let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+'
-let s:c_non_specific_tag = '\v\!'
-let s:ns_uri_char  = '\v%(%\x\x|'.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])'
-let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>'
-let s:c_ns_tag_property = '\v'.s:c_verbatim_tag.
-            \               '\v|'.s:c_ns_shorthand_tag.
-            \               '\v|'.s:c_non_specific_tag
-
-let s:block_scalar_header = '\v[|>]%([+-]?[1-9]|[1-9]?[+-])?'
-
-function GetYAMLIndent(lnum)
-    if a:lnum == 1 || !prevnonblank(a:lnum-1)
-        return 0
-    endif
-
-    let prevlnum = prevnonblank(a:lnum-1)
-    let previndent = indent(prevlnum)
-
-    let line = getline(a:lnum)
-    if line =~# '^\s*#' && getline(a:lnum-1) =~# '^\s*#'
-        " Comment blocks should have identical indent
-        return previndent
-    elseif line =~# '^\s*[\]}]'
-        " Lines containing only closing braces should have previous indent
-        return indent(s:FindPrevLessIndentedLine(a:lnum))
-    endif
-
-    " Ignore comment lines when calculating indent
-    while getline(prevlnum) =~# '^\s*#'
-        let prevlnum = prevnonblank(prevlnum-1)
-        if !prevlnum
-            return previndent
-        endif
-    endwhile
-
-    let prevline = getline(prevlnum)
-    let previndent = indent(prevlnum)
-
-    " Any examples below assume that shiftwidth=2
-    if prevline =~# '\v[{[:]$|[:-]\ [|>][+\-]?%(\s+\#.*|\s*)$'
-        " Mapping key:
-        "     nested mapping: ...
-        "
-        " - {
-        "     key: [
-        "         list value
-        "     ]
-        " }
-        "
-        " - |-
-        "     Block scalar without indentation indicator
-        return previndent+shiftwidth()
-    elseif prevline =~# '\v[:-]\ [|>]%(\d+[+\-]?|[+\-]?\d+)%(\#.*|\s*)$'
-        " - |+2
-        "   block scalar with indentation indicator
-        "#^^ indent+2, not indent+shiftwidth
-        return previndent + str2nr(matchstr(prevline,
-                    \'\v([:-]\ [|>])@<=[+\-]?\d+%([+\-]?%(\s+\#.*|\s*)$)@='))
-    elseif prevline =~# '\v\"%([^"\\]|\\.)*\\$'
-        "    "Multiline string \
-        "     with escaped end"
-        let qidx = match(prevline, '\v\"%([^"\\]|\\.)*\\')
-        return virtcol([prevlnum, qidx+1])
-    elseif line =~# s:liststartregex
-        " List line should have indent equal to previous list line unless it was 
-        " caught by one of the previous rules
-        return indent(s:FindPrevLEIndentedLineMatchingRegex(a:lnum,
-                    \                                       s:liststartregex))
-    elseif line =~# s:mapkeyregex
-        " Same for line containing mapping key
-        let prevmapline = s:FindPrevLEIndentedLineMatchingRegex(a:lnum,
-                    \                                           s:mapkeyregex)
-        if getline(prevmapline) =~# '^\s*- '
-            return indent(prevmapline) + 2
-        else
-            return indent(prevmapline)
-        endif
-    elseif prevline =~# '^\s*- '
-        " - List with
-        "   multiline scalar
-        return previndent+2
-    elseif prevline =~# s:mapkeyregex . '\v\s*%(%('.s:c_ns_tag_property.
-                \                              '\v|'.s:c_ns_anchor_property.
-                \                              '\v|'.s:block_scalar_header.
-                \                             '\v)%(\s+|\s*%(\#.*)?$))*'
-        " Mapping with: value
-        "     that is multiline scalar
-        return previndent+shiftwidth()
-    endif
-    return previndent
-endfunction
-
-let &cpo = s:save_cpo
-
-endif
diff --git a/indent/zimbu.vim b/indent/zimbu.vim
new file mode 100644
index 000000000..203544017
--- /dev/null
+++ b/indent/zimbu.vim
@@ -0,0 +1,132 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zimbu') == -1
+
+" Vim indent file
+" Language:	Zimbu
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2016 Jan 25
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+   finish
+endif
+let b:did_indent = 1
+
+setlocal ai nolisp nocin
+setlocal indentexpr=GetZimbuIndent(v:lnum)
+setlocal indentkeys=0{,0},!^F,o,O,0=ELSE,0=ELSEIF,0=CASE,0=DEFAULT,0=FINALLY
+
+" We impose recommended defaults: no Tabs, 'shiftwidth' = 2
+setlocal sw=2 et
+
+let b:undo_indent = "setl et< sw< ai< indentkeys< indentexpr="
+
+" Only define the function once.
+if exists("*GetZimbuIndent")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Come here when loading the script the first time.
+
+let s:maxoff = 50	" maximum number of lines to look backwards for ()
+
+func GetZimbuIndent(lnum)
+  let prevLnum = prevnonblank(a:lnum - 1)
+  if prevLnum == 0
+    " This is the first non-empty line, use zero indent.
+    return 0
+  endif
+
+  " Taken from Python indenting:
+  " If the previous line is inside parenthesis, use the indent of the starting
+  " line.
+  " Trick: use the non-existing "dummy" variable to break out of the loop when
+  " going too far back.
+  call cursor(prevLnum, 1)
+  let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW',
+	  \ "line('.') < " . (prevLnum - s:maxoff) . " ? dummy :"
+	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
+	  \ . " =~ '\\(Comment\\|String\\|Char\\)$'")
+  if parlnum > 0
+    let plindent = indent(parlnum)
+    let plnumstart = parlnum
+  else
+    let plindent = indent(prevLnum)
+    let plnumstart = prevLnum
+  endif
+
+
+  " When inside parenthesis: If at the first line below the parenthesis add
+  " two 'shiftwidth', otherwise same as previous line.
+  " i = (a
+  "       + b
+  "       + c)
+  call cursor(a:lnum, 1)
+  let p = searchpair('(\|{\|\[', '', ')\|}\|\]', 'bW',
+	  \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
+	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
+	  \ . " =~ '\\(Comment\\|String\\|Char\\)$'")
+  if p > 0
+    if p == prevLnum
+      " When the start is inside parenthesis, only indent one 'shiftwidth'.
+      let pp = searchpair('(\|{\|\[', '', ')\|}\|\]', 'bW',
+	  \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
+	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
+	  \ . " =~ '\\(Comment\\|String\\|Char\\)$'")
+      if pp > 0
+	return indent(prevLnum) + shiftwidth()
+      endif
+      return indent(prevLnum) + shiftwidth() * 2
+    endif
+    if plnumstart == p
+      return indent(prevLnum)
+    endif
+    return plindent
+  endif
+
+  let prevline = getline(prevLnum)
+  let thisline = getline(a:lnum)
+
+  " If this line is not a comment and the previous one is then move the
+  " previous line further back.
+  if thisline !~ '^\s*#'
+    while prevline =~ '^\s*#'
+      let prevLnum = prevnonblank(prevLnum - 1)
+      if prevLnum == 0
+	" Only comment lines before this, no indent
+	return 0
+      endif
+      let prevline = getline(prevLnum)
+      let plindent = indent(prevLnum)
+    endwhile
+  endif
+
+  if prevline =~ '^\s*\(IF\|\|ELSEIF\|ELSE\|GENERATE_IF\|\|GENERATE_ELSEIF\|GENERATE_ELSE\|WHILE\|REPEAT\|TRY\|CATCH\|FINALLY\|FOR\|DO\|SWITCH\|CASE\|DEFAULT\|FUNC\|VIRTUAL\|ABSTRACT\|DEFINE\|REPLACE\|FINAL\|PROC\|MAIN\|NEW\|ENUM\|CLASS\|INTERFACE\|BITS\|MODULE\|SHARED\)\>'
+    let plindent += shiftwidth()
+  endif
+  if thisline =~ '^\s*\(}\|ELSEIF\>\|ELSE\>\|CATCH\|FINALLY\|GENERATE_ELSEIF\>\|GENERATE_ELSE\>\|UNTIL\>\)'
+    let plindent -= shiftwidth()
+  endif
+  if thisline =~ '^\s*\(CASE\>\|DEFAULT\>\)' && prevline !~ '^\s*SWITCH\>'
+    let plindent -= shiftwidth()
+  endif
+
+  " line up continued comment that started after some code
+  "   String something   # comment comment
+  "                      # comment
+  if a:lnum == prevLnum + 1 && thisline =~ '^\s*#' && prevline !~ '^\s*#'
+    let n = match(prevline, '#')
+    if n > 1
+      let plindent = n
+    endif
+  endif
+
+  return plindent
+endfunc
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/packages.yaml b/packages.yaml
index ec6579015..ade2bd83d 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -251,8 +251,13 @@ glob: '**/automake.vim'
 filetypes:
 - name: automake
   filenames:
-  - '[Mm]akefile.am'
+  - Makefile.am
+  - makefile.am
   - GNUmakefile.am
+  extensions:
+  - mak
+  - dsp
+  - mk
 ---
 name: asn
 remote: vim/vim:runtime
@@ -1611,6 +1616,7 @@ filetypes:
 ---
 name: terraform
 remote: hashivim/vim-terraform
+after: tf
 filetypes:
 - name: terraform
   extensions:
@@ -1983,3 +1989,3504 @@ filetypes:
   extensions:
   - hsc
   - hsm
+---
+name: dosbatch
+remote: vim/vim:runtime
+glob: "**/dosbatch.vim"
+filetypes:
+- name: dosbatch
+  patterns:
+  - pattern: "*.bat,*.sys"
+    description: Batch file for MSDOS.
+---
+name: bc
+remote: vim/vim:runtime
+glob: "**/bc.vim"
+filetypes:
+- name: bc
+  patterns:
+  - pattern: "*.bc"
+    description: BC calculator
+---
+name: bdf
+remote: vim/vim:runtime
+glob: "**/bdf.vim"
+filetypes:
+- name: bdf
+  patterns:
+  - pattern: "*.bdf"
+    description: BDF font
+---
+name: bib
+remote: vim/vim:runtime
+glob: "**/bib.vim"
+filetypes:
+- name: bib
+  patterns:
+  - pattern: "*.bib"
+    description: BibTeX bibliography database file
+---
+name: bst
+remote: vim/vim:runtime
+glob: "**/bst.vim"
+filetypes:
+- name: bst
+  patterns:
+  - pattern: "*.bst"
+    description: BibTeX Bibliography Style
+---
+name: named
+remote: vim/vim:runtime
+glob: "**/named.vim"
+filetypes:
+- name: named
+  patterns:
+  - pattern: named*.conf,rndc*.conf,rndc*.key
+    description: sudoedit uses namedXXXX.conf
+---
+name: bindzone
+remote: vim/vim:runtime
+glob: "**/bindzone.vim"
+filetypes:
+- name: bindzone
+  patterns:
+  - pattern: named.root
+    description: BIND zone
+  - pattern: "*/named/db.*,*/bind/db.*"
+---
+name: blank
+remote: vim/vim:runtime
+glob: "**/blank.vim"
+filetypes:
+- name: blank
+  patterns:
+  - pattern: "*.bl"
+    description: Blank
+---
+name: bsdl
+remote: vim/vim:runtime
+glob: "**/bsdl.vim"
+filetypes:
+- name: bsdl
+  patterns:
+  - pattern: "*bsd,*.bsdl"
+    description: BSDL
+---
+name: lpc
+remote: vim/vim:runtime
+glob: "**/lpc.vim"
+filetypes:
+- name: lpc
+  patterns:
+  - pattern: "*.lpc,*.ulpc"
+    description: C or lpc
+---
+name: calendar
+remote: vim/vim:runtime
+glob: "**/calendar.vim"
+filetypes:
+- name: calendar
+  patterns:
+  - pattern: calendar
+    description: Calendar
+  - pattern: "*/.calendar/*,*/share/calendar/*/calendar.*,*/share/calendar/calendar.*"
+---
+name: cs
+remote: vim/vim:runtime
+glob: "**/cs.vim"
+filetypes:
+- name: cs
+  patterns:
+  - pattern: "*.cs"
+    description: C#
+---
+name: csdl
+remote: vim/vim:runtime
+glob: "**/csdl.vim"
+filetypes:
+- name: csdl
+  patterns:
+  - pattern: "*.csdl"
+    description: CSDL
+---
+name: cabal
+remote: vim/vim:runtime
+glob: "**/cabal.vim"
+filetypes:
+- name: cabal
+  patterns:
+  - pattern: "*.cabal"
+    description: Cabal
+---
+name: cdrtoc
+remote: vim/vim:runtime
+glob: "**/cdrtoc.vim"
+filetypes:
+- name: cdrtoc
+  patterns:
+  - pattern: "*.toc"
+    description: Cdrdao TOC
+---
+name: cdrdaoconf
+remote: vim/vim:runtime
+glob: "**/cdrdaoconf.vim"
+filetypes:
+- name: cdrdaoconf
+  patterns:
+  - pattern: "*/etc/cdrdao.conf,*/etc/defaults/cdrdao,*/etc/default/cdrdao,.cdrdao"
+    description: Cdrdao config
+---
+name: cfengine
+remote: vim/vim:runtime
+glob: "**/cfengine.vim"
+filetypes:
+- name: cfengine
+  patterns:
+  - pattern: cfengine.conf
+    description: Cfengine
+---
+name: chaiscript
+remote: vim/vim:runtime
+glob: "**/chaiscript.vim"
+filetypes:
+- name: chaiscript
+  patterns:
+  - pattern: "*.chai"
+    description: ChaiScript
+---
+name: cdl
+remote: vim/vim:runtime
+glob: "**/cdl.vim"
+filetypes:
+- name: cdl
+  patterns:
+  - pattern: "*.cdl"
+    description: Comshare Dimension Definition Language
+---
+name: conaryrecipe
+remote: vim/vim:runtime
+glob: "**/conaryrecipe.vim"
+filetypes:
+- name: conaryrecipe
+  patterns:
+  - pattern: "*.recipe"
+    description: Conary Recipe
+---
+name: crm
+remote: vim/vim:runtime
+glob: "**/crm.vim"
+filetypes:
+- name: crm
+  patterns:
+  - pattern: "*.crm"
+    description: Controllable Regex Mutilator
+---
+name: cynpp
+remote: vim/vim:runtime
+glob: "**/cynpp.vim"
+filetypes:
+- name: cynpp
+  patterns:
+  - pattern: "*.cyn"
+    description: Cyn++
+---
+name: ch
+remote: vim/vim:runtime
+glob: "**/ch.vim"
+filetypes:
+- name: ch
+  patterns:
+  - pattern: "*.chf"
+    description: Ch (CHscript)
+---
+name: css
+remote: vim/vim:runtime
+glob: "**/css.vim"
+filetypes:
+- name: css
+  patterns:
+  - pattern: "*.css"
+    description: Cascading Style Sheets
+---
+name: cterm
+remote: vim/vim:runtime
+glob: "**/cterm.vim"
+filetypes:
+- name: cterm
+  patterns:
+  - pattern: "*.con"
+    description: Century Term Command Scripts (*.cmd too)
+---
+name: debchangelog
+remote: vim/vim:runtime
+glob: "**/debchangelog.vim"
+filetypes:
+- name: debchangelog
+  patterns:
+  - pattern: changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch
+---
+name: chill
+remote: vim/vim:runtime
+glob: "**/chill.vim"
+filetypes:
+- name: chill
+  patterns:
+  - pattern: "*..ch"
+    description: CHILL
+---
+name: chordpro
+remote: vim/vim:runtime
+glob: "**/chordpro.vim"
+filetypes:
+- name: chordpro
+  patterns:
+  - pattern: "*.chopro,*.crd,*.cho,*.crdpro,*.chordpro"
+    description: ChordPro
+---
+name: clean
+remote: vim/vim:runtime
+glob: "**/clean.vim"
+filetypes:
+- name: clean
+  patterns:
+  - pattern: "*.dcl,*.icl"
+    description: Clean
+---
+name: cl
+remote: vim/vim:runtime
+glob: "**/cl.vim"
+filetypes:
+- name: cl
+  patterns:
+  - pattern: "*.eni"
+    description: Clever
+---
+name: cmusrc
+remote: vim/vim:runtime
+glob: "**/cmusrc.vim"
+filetypes:
+- name: cmusrc
+  patterns:
+  - pattern: "*/.cmus/{autosave,rc,command-history,*.theme},*/cmus/{rc,*.theme}"
+    description: Cmusrc
+---
+name: cobol
+remote: vim/vim:runtime
+glob: "**/cobol.vim"
+filetypes:
+- name: cobol
+  patterns:
+  - pattern: "*.cbl,*.cob,*.lib"
+    description: Cobol
+---
+name: coco
+remote: vim/vim:runtime
+glob: "**/coco.vim"
+filetypes:
+- name: coco
+  patterns:
+  - pattern: "*.atg"
+    description: Coco/R
+---
+name: cf
+remote: vim/vim:runtime
+glob: "**/cf.vim"
+filetypes:
+- name: cf
+  patterns:
+  - pattern: "*.cfm,*.cfi,*.cfc"
+    description: Cold Fusion
+---
+name: config
+remote: vim/vim:runtime
+glob: "**/config.vim"
+filetypes:
+- name: config
+  patterns:
+  - pattern: configure.in,configure.ac
+    description: Configure scripts
+  - pattern: Pipfile
+    description: Pipenv Pipfiles
+  - pattern: "/etc/hostname.*"
+---
+name: cuda
+remote: vim/vim:runtime
+glob: "**/cuda.vim"
+filetypes:
+- name: cuda
+  patterns:
+  - pattern: "*.cu,*.cuh"
+    description: CUDA  Cumpute Unified Device Architecture
+---
+name: dockerfile
+remote: vim/vim:runtime
+glob: "**/dockerfile.vim"
+filetypes:
+- name: dockerfile
+  patterns:
+  - pattern: Containerfile,Dockerfile,*.Dockerfile
+    description: Dockerfile; Podman uses the same syntax with name Containerfile
+---
+name: dcd
+remote: vim/vim:runtime
+glob: "**/dcd.vim"
+filetypes:
+- name: dcd
+  patterns:
+  - pattern: "*.dcd"
+    description: WildPackets EtherPeek Decoder
+---
+name: eterm
+remote: vim/vim:runtime
+glob: "**/eterm.vim"
+filetypes:
+- name: eterm
+  patterns:
+  - pattern: "*Eterm/*.cfg"
+    description: Eterm
+---
+name: lynx
+remote: vim/vim:runtime
+glob: "**/lynx.vim"
+filetypes:
+- name: lynx
+  patterns:
+  - pattern: lynx.cfg
+    description: Lynx config files
+---
+name: quake
+remote: vim/vim:runtime
+glob: "**/quake.vim"
+filetypes:
+- name: quake
+  patterns:
+  - pattern: "*baseq[2-3]/*.cfg,*id1/*.cfg,*quake[1-3]/*.cfg"
+    description: Quake
+---
+name: cfg
+remote: vim/vim:runtime
+glob: "**/cfg.vim"
+filetypes:
+- name: cfg
+  patterns:
+  - pattern: "*.cfg"
+    description: Configure files
+  - pattern: "*.hgrc,*hgrc"
+    description: Mercurial config (looks like generic config file)
+---
+name: csp
+remote: vim/vim:runtime
+glob: "**/csp.vim"
+filetypes:
+- name: csp
+  patterns:
+  - pattern: "*.csp,*.fdr"
+    description: Communicating Sequential Processes
+---
+name: cupl
+remote: vim/vim:runtime
+glob: "**/cupl.vim"
+filetypes:
+- name: cupl
+  patterns:
+  - pattern: "*.pld"
+    description: CUPL logic description and simulation
+---
+name: cuplsim
+remote: vim/vim:runtime
+glob: "**/cuplsim.vim"
+filetypes:
+- name: cuplsim
+  patterns:
+  - pattern: "*.si"
+    description: CUPL logic description and simulation
+---
+name: debcontrol
+remote: vim/vim:runtime
+glob: "**/debcontrol.vim"
+filetypes:
+- name: debcontrol
+  patterns:
+  - pattern: "*/debian/control"
+    description: Debian Control
+---
+name: debcopyright
+remote: vim/vim:runtime
+glob: "**/debcopyright.vim"
+filetypes:
+- name: debcopyright
+  patterns:
+  - pattern: "*/debian/copyright"
+    description: Debian Copyright
+---
+name: debsources
+remote: vim/vim:runtime
+glob: "**/debsources.vim"
+filetypes:
+- name: debsources
+  patterns:
+  - pattern: "*/etc/apt/sources.list,*/etc/apt/sources.list.d/*.list"
+    description: Debian Sources.list
+---
+name: denyhosts
+remote: vim/vim:runtime
+glob: "**/denyhosts.vim"
+filetypes:
+- name: denyhosts
+  patterns:
+  - pattern: denyhosts.conf
+    description: Deny hosts
+---
+name: dnsmasq
+remote: vim/vim:runtime
+glob: "**/dnsmasq.vim"
+filetypes:
+- name: dnsmasq
+  patterns:
+  - pattern: "*/etc/dnsmasq.conf"
+    description: dnsmasq(8) configuration files
+  - pattern: "*/etc/dnsmasq.d/*"
+---
+name: desc
+remote: vim/vim:runtime
+glob: "**/desc.vim"
+filetypes:
+- name: desc
+  patterns:
+  - pattern: "*.desc"
+    description: ROCKLinux package description
+---
+name: desktop
+remote: vim/vim:runtime
+glob: "**/desktop.vim"
+filetypes:
+- name: desktop
+  patterns:
+  - pattern: "*.desktop,*.directory"
+    description: Desktop files
+---
+name: dictconf
+remote: vim/vim:runtime
+glob: "**/dictconf.vim"
+filetypes:
+- name: dictconf
+  patterns:
+  - pattern: dict.conf,.dictrc
+    description: Dict config
+---
+name: dictdconf
+remote: vim/vim:runtime
+glob: "**/dictdconf.vim"
+filetypes:
+- name: dictdconf
+  patterns:
+  - pattern: dictd.conf
+    description: Dictd config
+---
+name: diff
+remote: vim/vim:runtime
+glob: "**/diff.vim"
+filetypes:
+- name: diff
+  patterns:
+  - pattern: "*.diff,*.rej"
+    description: Diff files
+---
+name: dircolors
+remote: vim/vim:runtime
+glob: "**/dircolors.vim"
+filetypes:
+- name: dircolors
+  patterns:
+  - pattern: ".dir_colors,.dircolors,*/etc/DIR_COLORS"
+    description: Dircolors
+---
+name: dot
+remote: vim/vim:runtime
+glob: "**/dot.vim"
+filetypes:
+- name: dot
+  patterns:
+  - pattern: "*.dot,*.gv"
+    description: DOT
+---
+name: dylanlid
+remote: vim/vim:runtime
+glob: "**/dylanlid.vim"
+filetypes:
+- name: dylanlid
+  patterns:
+  - pattern: "*.lid"
+    description: Dylan - lid files
+---
+name: dylanintr
+remote: vim/vim:runtime
+glob: "**/dylanintr.vim"
+filetypes:
+- name: dylanintr
+  patterns:
+  - pattern: "*.intr"
+    description: Dylan - intr files (melange)
+---
+name: dylan
+remote: vim/vim:runtime
+glob: "**/dylan.vim"
+filetypes:
+- name: dylan
+  patterns:
+  - pattern: "*.dylan"
+    description: Dylan
+---
+name: def
+remote: vim/vim:runtime
+glob: "**/def.vim"
+filetypes:
+- name: def
+  patterns:
+  - pattern: "*.def"
+    description: Microsoft Module Definition
+---
+name: dracula
+remote: vim/vim:runtime
+glob: "**/dracula.vim"
+filetypes:
+- name: dracula
+  patterns:
+  - pattern: "*.drac,*.drc,*lvs,*lpe"
+    description: Dracula
+  - pattern: drac.*
+---
+name: datascript
+remote: vim/vim:runtime
+glob: "**/datascript.vim"
+filetypes:
+- name: datascript
+  patterns:
+  - pattern: "*.ds"
+    description: Datascript
+---
+name: dsl
+remote: vim/vim:runtime
+glob: "**/dsl.vim"
+filetypes:
+- name: dsl
+  patterns:
+  - pattern: "*.dsl"
+    description: dsl
+---
+name: dtd
+remote: vim/vim:runtime
+glob: "**/dtd.vim"
+filetypes:
+- name: dtd
+  patterns:
+  - pattern: "*.dtd"
+    description: DTD (Document Type Definition for XML)
+---
+name: dts
+remote: vim/vim:runtime
+glob: "**/dts.vim"
+filetypes:
+- name: dts
+  patterns:
+  - pattern: "*.dts,*.dtsi"
+    description: DTS/DSTI (device tree files)
+---
+name: edif
+remote: vim/vim:runtime
+glob: "**/edif.vim"
+filetypes:
+- name: edif
+  patterns:
+  - pattern: "*.ed\\(f\\|if\\|o\\)"
+---
+name: ecd
+remote: vim/vim:runtime
+glob: "**/ecd.vim"
+filetypes:
+- name: ecd
+  patterns:
+  - pattern: "*.ecd"
+    description: Embedix Component Description
+---
+name: elinks
+remote: vim/vim:runtime
+glob: "**/elinks.vim"
+filetypes:
+- name: elinks
+  patterns:
+  - pattern: elinks.conf
+    description: Elinks configuration
+---
+name: elmfilt
+remote: vim/vim:runtime
+glob: "**/elmfilt.vim"
+filetypes:
+- name: elmfilt
+  patterns:
+  - pattern: filter-rules
+    description: Elm Filter Rules file
+---
+name: esmtprc
+remote: vim/vim:runtime
+glob: "**/esmtprc.vim"
+filetypes:
+- name: esmtprc
+  patterns:
+  - pattern: "*esmtprc"
+    description: ESMTP rc file
+---
+name: esqlc
+remote: vim/vim:runtime
+glob: "**/esqlc.vim"
+filetypes:
+- name: esqlc
+  patterns:
+  - pattern: "*.ec,*.EC"
+    description: ESQL-C
+---
+name: esterel
+remote: vim/vim:runtime
+glob: "**/esterel.vim"
+filetypes:
+- name: esterel
+  patterns:
+  - pattern: "*.strl"
+    description: Esterel
+---
+name: csc
+remote: vim/vim:runtime
+glob: "**/csc.vim"
+filetypes:
+- name: csc
+  patterns:
+  - pattern: "*.csc"
+    description: Essbase script
+---
+name: exim
+remote: vim/vim:runtime
+glob: "**/exim.vim"
+filetypes:
+- name: exim
+  patterns:
+  - pattern: exim.conf
+    description: Exim
+---
+name: expect
+remote: vim/vim:runtime
+glob: "**/expect.vim"
+filetypes:
+- name: expect
+  patterns:
+  - pattern: "*.exp"
+    description: Expect
+---
+name: exports
+remote: vim/vim:runtime
+glob: "**/exports.vim"
+filetypes:
+- name: exports
+  patterns:
+  - pattern: exports
+    description: Exports
+---
+name: falcon
+remote: vim/vim:runtime
+glob: "**/falcon.vim"
+filetypes:
+- name: falcon
+  patterns:
+  - pattern: "*.fal"
+    description: Falcon
+---
+name: fan
+remote: vim/vim:runtime
+glob: "**/fan.vim"
+filetypes:
+- name: fan
+  patterns:
+  - pattern: "*.fan,*.fwt"
+    description: Fantom
+---
+name: factor
+remote: vim/vim:runtime
+glob: "**/factor.vim"
+filetypes:
+- name: factor
+  patterns:
+  - pattern: "*.factor"
+    description: Factor
+---
+name: fetchmail
+remote: vim/vim:runtime
+glob: "**/fetchmail.vim"
+filetypes:
+- name: fetchmail
+  patterns:
+  - pattern: ".fetchmailrc"
+    description: Fetchmail RC file
+---
+name: focexec
+remote: vim/vim:runtime
+glob: "**/focexec.vim"
+filetypes:
+- name: focexec
+  patterns:
+  - pattern: "*.fex,*.focexec"
+    description: Focus Executable
+---
+name: master
+remote: vim/vim:runtime
+glob: "**/master.vim"
+filetypes:
+- name: master
+  patterns:
+  - pattern: "*.mas,*.master"
+    description: Focus Master file (but not for auto.master)
+---
+name: reva
+remote: vim/vim:runtime
+glob: "**/reva.vim"
+filetypes:
+- name: reva
+  patterns:
+  - pattern: "*.frt"
+    description: Reva Forth
+---
+name: fortran
+remote: vim/vim:runtime
+glob: "**/fortran.vim"
+filetypes:
+- name: fortran
+  patterns:
+  - pattern: "*.f,*.for,*.fortran,*.fpp,*.ftn,*.f77,*.f90,*.f95,*.f03,*.f08"
+    description: Fortran
+---
+name: framescript
+remote: vim/vim:runtime
+glob: "**/framescript.vim"
+filetypes:
+- name: framescript
+  patterns:
+  - pattern: "*.fsl"
+    description: Framescript
+---
+name: fstab
+remote: vim/vim:runtime
+glob: "**/fstab.vim"
+filetypes:
+- name: fstab
+  patterns:
+  - pattern: fstab,mtab
+    description: FStab
+---
+name: gdb
+remote: vim/vim:runtime
+glob: "**/gdb.vim"
+filetypes:
+- name: gdb
+  patterns:
+  - pattern: ".gdbinit"
+    description: GDB command files
+---
+name: gdmo
+remote: vim/vim:runtime
+glob: "**/gdmo.vim"
+filetypes:
+- name: gdmo
+  patterns:
+  - pattern: "*.mo,*.gdmo"
+    description: GDMO
+---
+name: gedcom
+remote: vim/vim:runtime
+glob: "**/gedcom.vim"
+filetypes:
+- name: gedcom
+  patterns:
+  - pattern: "*.ged,lltxxxxx.txt"
+    description: Gedcom
+  - pattern: "*/tmp/lltmp*"
+---
+name: gkrellmrc
+remote: vim/vim:runtime
+glob: "**/gkrellmrc.vim"
+filetypes:
+- name: gkrellmrc
+  patterns:
+  - pattern: gkrellmrc,gkrellmrc_?
+    description: Gkrellmrc
+---
+name: gp
+remote: vim/vim:runtime
+glob: "**/gp.vim"
+filetypes:
+- name: gp
+  patterns:
+  - pattern: "*.gp,.gprc"
+    description: GP scripts (2.0 and onward)
+---
+name: gpg
+remote: vim/vim:runtime
+glob: "**/gpg.vim"
+filetypes:
+- name: gpg
+  patterns:
+  - pattern: "*/.gnupg/options,*/.gnupg/gpg.conf,*/usr/*/gnupg/options.skel"
+    description: GPG
+---
+name: gnash
+remote: vim/vim:runtime
+glob: "**/gnash.vim"
+filetypes:
+- name: gnash
+  patterns:
+  - pattern: gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc
+    description: gnash(1) configuration files
+---
+name: gitolite
+remote: vim/vim:runtime
+glob: "**/gitolite.vim"
+filetypes:
+- name: gitolite
+  patterns:
+  - pattern: gitolite.conf
+    description: Gitolite
+  - pattern: "*/gitolite-admin/conf/*"
+---
+name: grads
+remote: vim/vim:runtime
+glob: "**/grads.vim"
+filetypes:
+- name: grads
+  patterns:
+  - pattern: "*.gs"
+    description: GrADS scripts
+---
+name: gretl
+remote: vim/vim:runtime
+glob: "**/gretl.vim"
+filetypes:
+- name: gretl
+  patterns:
+  - pattern: "*.gretl"
+    description: Gretl
+---
+name: gsp
+remote: vim/vim:runtime
+glob: "**/gsp.vim"
+filetypes:
+- name: gsp
+  patterns:
+  - pattern: "*.gsp"
+    description: GNU Server Pages
+---
+name: group
+remote: vim/vim:runtime
+glob: "**/group.vim"
+filetypes:
+- name: group
+  patterns:
+  - pattern: "*/etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/etc/gshadow-,*/etc/gshadow.edit,*/var/backups/group.bak,*/var/backups/gshadow.bak"
+    description: Group file
+---
+name: gtkrc
+remote: vim/vim:runtime
+glob: "**/gtkrc.vim"
+filetypes:
+- name: gtkrc
+  patterns:
+  - pattern: ".gtkrc,gtkrc"
+    description: GTK RC
+  - pattern: ".gtkrc*,gtkrc*"
+---
+name: lhaskell
+remote: vim/vim:runtime
+glob: "**/lhaskell.vim"
+filetypes:
+- name: lhaskell
+  patterns:
+  - pattern: "*.lhs"
+    description: Haskell
+---
+name: chaskell
+remote: vim/vim:runtime
+glob: "**/chaskell.vim"
+filetypes:
+- name: chaskell
+  patterns:
+  - pattern: "*.chs"
+    description: Haskell
+---
+name: haste
+remote: vim/vim:runtime
+glob: "**/haste.vim"
+filetypes:
+- name: haste
+  patterns:
+  - pattern: "*.ht"
+    description: Haste
+---
+name: hastepreproc
+remote: vim/vim:runtime
+glob: "**/hastepreproc.vim"
+filetypes:
+- name: hastepreproc
+  patterns:
+  - pattern: "*.htpp"
+    description: Haste
+---
+name: hercules
+remote: vim/vim:runtime
+glob: "**/hercules.vim"
+filetypes:
+- name: hercules
+  patterns:
+  - pattern: "*.vc,*.ev,*.sum,*.errsum"
+    description: Hercules
+---
+name: hex
+remote: vim/vim:runtime
+glob: "**/hex.vim"
+filetypes:
+- name: hex
+  patterns:
+  - pattern: "*.hex,*.h32"
+    description: HEX (Intel)
+---
+name: hollywood
+remote: vim/vim:runtime
+glob: "**/hollywood.vim"
+filetypes:
+- name: hollywood
+  patterns:
+  - pattern: "*.hws"
+    description: Hollywood
+---
+name: tilde
+remote: vim/vim:runtime
+glob: "**/tilde.vim"
+filetypes:
+- name: tilde
+  patterns:
+  - pattern: "*.t.html"
+    description: Tilde (must be before HTML)
+---
+name: htmlm4
+remote: vim/vim:runtime
+glob: "**/htmlm4.vim"
+filetypes:
+- name: htmlm4
+  patterns:
+  - pattern: "*.html.m4"
+    description: HTML with M4
+---
+name: template
+remote: vim/vim:runtime
+glob: "**/template.vim"
+filetypes:
+- name: template
+  patterns:
+  - pattern: "*.tmpl"
+    description: Some template.  Used to be HTML Cheetah.
+---
+name: hostconf
+remote: vim/vim:runtime
+glob: "**/hostconf.vim"
+filetypes:
+- name: hostconf
+  patterns:
+  - pattern: "*/etc/host.conf"
+    description: Host config
+---
+name: hostsaccess
+remote: vim/vim:runtime
+glob: "**/hostsaccess.vim"
+filetypes:
+- name: hostsaccess
+  patterns:
+  - pattern: "*/etc/hosts.allow,*/etc/hosts.deny"
+    description: Hosts access
+---
+name: hb
+remote: vim/vim:runtime
+glob: "**/hb.vim"
+filetypes:
+- name: hb
+  patterns:
+  - pattern: "*.hb"
+    description: Hyper Builder
+---
+name: httest
+remote: vim/vim:runtime
+glob: "**/httest.vim"
+filetypes:
+- name: httest
+  patterns:
+  - pattern: "*.htt,*.htb"
+    description: Httest
+---
+name: icon
+remote: vim/vim:runtime
+glob: "**/icon.vim"
+filetypes:
+- name: icon
+  patterns:
+  - pattern: "*.icn"
+    description: Icon
+---
+name: msidl
+remote: vim/vim:runtime
+glob: "**/msidl.vim"
+filetypes:
+- name: msidl
+  patterns:
+  - pattern: "*.odl,*.mof"
+    description: MOF = WMI (Windows Management Instrumentation) Managed Object Format
+---
+name: icemenu
+remote: vim/vim:runtime
+glob: "**/icemenu.vim"
+filetypes:
+- name: icemenu
+  patterns:
+  - pattern: "*/.icewm/menu"
+    description: Icewm menu
+---
+name: indent
+remote: vim/vim:runtime
+glob: "**/indent.vim"
+filetypes:
+- name: indent
+  patterns:
+  - pattern: ".indent.pro"
+    description: Indent profile (must come before IDL *.pro!)
+  - pattern: indentrc
+    description: Indent RC
+---
+name: inform
+remote: vim/vim:runtime
+glob: "**/inform.vim"
+filetypes:
+- name: inform
+  patterns:
+  - pattern: "*.inf,*.INF"
+    description: Inform
+---
+name: initng
+remote: vim/vim:runtime
+glob: "**/initng.vim"
+filetypes:
+- name: initng
+  patterns:
+  - pattern: "*/etc/initng/*/*.i,*.ii"
+    description: Initng
+---
+name: upstreamdat
+remote: vim/vim:runtime
+glob: "**/upstreamdat.vim"
+filetypes:
+- name: upstreamdat
+  patterns:
+  - pattern: upstream.dat\c,upstream.*.dat\c,*.upstream.dat\c
+---
+name: upstreamlog
+remote: vim/vim:runtime
+glob: "**/upstreamlog.vim"
+filetypes:
+- name: upstreamlog
+  patterns:
+  - pattern: fdrupstream.log,upstream.log\c,upstream.*.log\c,*.upstream.log\c,UPSTREAM-*.log\c
+---
+name: upstreaminstalllog
+remote: vim/vim:runtime
+glob: "**/upstreaminstalllog.vim"
+filetypes:
+- name: upstreaminstalllog
+  patterns:
+  - pattern: upstreaminstall.log\c,upstreaminstall.*.log\c,*.upstreaminstall.log\c
+---
+name: usserverlog
+remote: vim/vim:runtime
+glob: "**/usserverlog.vim"
+filetypes:
+- name: usserverlog
+  patterns:
+  - pattern: usserver.log\c,usserver.*.log\c,*.usserver.log\c
+---
+name: usw2kagtlog
+remote: vim/vim:runtime
+glob: "**/usw2kagtlog.vim"
+filetypes:
+- name: usw2kagtlog
+  patterns:
+  - pattern: usw2kagt.log\c,usw2kagt.*.log\c,*.usw2kagt.log\c
+---
+name: ipfilter
+remote: vim/vim:runtime
+glob: "**/ipfilter.vim"
+filetypes:
+- name: ipfilter
+  patterns:
+  - pattern: ipf.conf,ipf6.conf,ipf.rules
+    description: Ipfilter
+---
+name: fgl
+remote: vim/vim:runtime
+glob: "**/fgl.vim"
+filetypes:
+- name: fgl
+  patterns:
+  - pattern: "*.4gl,*.4gh,*.m4gl"
+    description: Informix 4GL (source - canonical, include file, I4GL+M4 preproc.)
+---
+name: inittab
+remote: vim/vim:runtime
+glob: "**/inittab.vim"
+filetypes:
+- name: inittab
+  patterns:
+  - pattern: inittab
+    description: SysV Inittab
+---
+name: iss
+remote: vim/vim:runtime
+glob: "**/iss.vim"
+filetypes:
+- name: iss
+  patterns:
+  - pattern: "*.iss"
+    description: Inno Setup
+---
+name: j
+remote: vim/vim:runtime
+glob: "**/j.vim"
+filetypes:
+- name: j
+  patterns:
+  - pattern: "*.ijs"
+    description: J
+---
+name: jal
+remote: vim/vim:runtime
+glob: "**/jal.vim"
+filetypes:
+- name: jal
+  patterns:
+  - pattern: "*.jal,*.JAL"
+    description: JAL
+---
+name: jam
+remote: vim/vim:runtime
+glob: "**/jam.vim"
+filetypes:
+- name: jam
+  patterns:
+  - pattern: "*.jpl,*.jpr"
+    description: Jam
+  - pattern: Prl*.*,JAM*.*
+---
+name: java
+remote: vim/vim:runtime
+glob: "**/java.vim"
+filetypes:
+- name: java
+  patterns:
+  - pattern: "*.java,*.jav"
+    description: Java
+---
+name: javacc
+remote: vim/vim:runtime
+glob: "**/javacc.vim"
+filetypes:
+- name: javacc
+  patterns:
+  - pattern: "*.jj,*.jjt"
+    description: JavaCC
+---
+name: jsp
+remote: vim/vim:runtime
+glob: "**/jsp.vim"
+filetypes:
+- name: jsp
+  patterns:
+  - pattern: "*.jsp"
+    description: Java Server Pages
+---
+name: jproperties
+remote: vim/vim:runtime
+glob: "**/jproperties.vim"
+filetypes:
+- name: jproperties
+  patterns:
+  - pattern: "*.properties,*.properties_??,*.properties_??_??"
+    description: 'Java Properties resource file (note: doesn''t catch font.properties.pl)'
+  - pattern: "*.properties_??_??_*"
+---
+name: jess
+remote: vim/vim:runtime
+glob: "**/jess.vim"
+filetypes:
+- name: jess
+  patterns:
+  - pattern: "*.clp"
+    description: Jess
+---
+name: jgraph
+remote: vim/vim:runtime
+glob: "**/jgraph.vim"
+filetypes:
+- name: jgraph
+  patterns:
+  - pattern: "*.jgr"
+    description: Jgraph
+---
+name: jovial
+remote: vim/vim:runtime
+glob: "**/jovial.vim"
+filetypes:
+- name: jovial
+  patterns:
+  - pattern: "*.jov,*.j73,*.jovial"
+    description: Jovial
+---
+name: kix
+remote: vim/vim:runtime
+glob: "**/kix.vim"
+filetypes:
+- name: kix
+  patterns:
+  - pattern: "*.kix"
+    description: Kixtart
+---
+name: kwt
+remote: vim/vim:runtime
+glob: "**/kwt.vim"
+filetypes:
+- name: kwt
+  patterns:
+  - pattern: "*.k"
+    description: Kimwitu[++]
+---
+name: kivy
+remote: vim/vim:runtime
+glob: "**/kivy.vim"
+filetypes:
+- name: kivy
+  patterns:
+  - pattern: "*.kv"
+    description: Kivy
+---
+name: kscript
+remote: vim/vim:runtime
+glob: "**/kscript.vim"
+filetypes:
+- name: kscript
+  patterns:
+  - pattern: "*.ks"
+    description: KDE script
+---
+name: kconfig
+remote: vim/vim:runtime
+glob: "**/kconfig.vim"
+filetypes:
+- name: kconfig
+  patterns:
+  - pattern: Kconfig,Kconfig.debug
+    description: Kconfig
+  - pattern: Kconfig.*
+---
+name: lace
+remote: vim/vim:runtime
+glob: "**/lace.vim"
+filetypes:
+- name: lace
+  patterns:
+  - pattern: "*.ace,*.ACE"
+    description: Lace (ISE)
+---
+name: latte
+remote: vim/vim:runtime
+glob: "**/latte.vim"
+filetypes:
+- name: latte
+  patterns:
+  - pattern: "*.latte,*.lte"
+    description: Latte
+---
+name: limits
+remote: vim/vim:runtime
+glob: "**/limits.vim"
+filetypes:
+- name: limits
+  patterns:
+  - pattern: "*/etc/limits,*/etc/*limits.conf,*/etc/*limits.d/*.conf"
+    description: Limits
+---
+name: lprolog
+remote: vim/vim:runtime
+glob: "**/lprolog.vim"
+filetypes:
+- name: lprolog
+  patterns:
+  - pattern: "*.sig"
+    description: LambdaProlog (*.mod too, see Modsim)
+---
+name: ldif
+remote: vim/vim:runtime
+glob: "**/ldif.vim"
+filetypes:
+- name: ldif
+  patterns:
+  - pattern: "*.ldif"
+    description: LDAP LDIF
+---
+name: ld
+remote: vim/vim:runtime
+glob: "**/ld.vim"
+filetypes:
+- name: ld
+  patterns:
+  - pattern: "*.ld"
+    description: Ld loader
+---
+name: lex
+remote: vim/vim:runtime
+glob: "**/lex.vim"
+filetypes:
+- name: lex
+  patterns:
+  - pattern: "*.lex,*.l,*.lxx,*.l++"
+    description: Lex
+---
+name: libao
+remote: vim/vim:runtime
+glob: "**/libao.vim"
+filetypes:
+- name: libao
+  patterns:
+  - pattern: "*/etc/libao.conf,*/.libao"
+    description: Libao
+---
+name: sensors
+remote: vim/vim:runtime
+glob: "**/sensors.vim"
+filetypes:
+- name: sensors
+  patterns:
+  - pattern: "*/etc/sensors.conf,*/etc/sensors3.conf"
+    description: Libsensors
+---
+name: lftp
+remote: vim/vim:runtime
+glob: "**/lftp.vim"
+filetypes:
+- name: lftp
+  patterns:
+  - pattern: lftp.conf,.lftprc,*lftp/rc
+    description: LFTP
+---
+name: lifelines
+remote: vim/vim:runtime
+glob: "**/lifelines.vim"
+filetypes:
+- name: lifelines
+  patterns:
+  - pattern: "*.ll"
+    description: Lifelines (or Lex for C++!)
+---
+name: lilo
+remote: vim/vim:runtime
+glob: "**/lilo.vim"
+filetypes:
+- name: lilo
+  patterns:
+  - pattern: lilo.conf
+    description: 'Lilo: Linux loader'
+  - pattern: lilo.conf*
+---
+name: lisp
+remote: vim/vim:runtime
+glob: "**/lisp.vim"
+filetypes:
+- name: lisp
+  patterns:
+  - pattern: "*.lsp,*.lisp,*.el,*.cl,.emacs,.sawfishrc"
+    description: "*.jl was removed, it's also used for Julia, better skip than guess
+      wrong."
+  - pattern: sbclrc,.sbclrc
+    description: SBCL implementation of Common Lisp
+---
+name: liquid
+remote: vim/vim:runtime
+glob: "**/liquid.vim"
+filetypes:
+- name: liquid
+  patterns:
+  - pattern: "*.liquid"
+    description: Liquid
+---
+name: lite
+remote: vim/vim:runtime
+glob: "**/lite.vim"
+filetypes:
+- name: lite
+  patterns:
+  - pattern: "*.lite,*.lt"
+    description: Lite
+---
+name: litestep
+remote: vim/vim:runtime
+glob: "**/litestep.vim"
+filetypes:
+- name: litestep
+  patterns:
+  - pattern: "*/LiteStep/*/*.rc"
+    description: LiteStep RC files
+---
+name: loginaccess
+remote: vim/vim:runtime
+glob: "**/loginaccess.vim"
+filetypes:
+- name: loginaccess
+  patterns:
+  - pattern: "*/etc/login.access"
+    description: Login access
+---
+name: logindefs
+remote: vim/vim:runtime
+glob: "**/logindefs.vim"
+filetypes:
+- name: logindefs
+  patterns:
+  - pattern: "*/etc/login.defs"
+    description: Login defs
+---
+name: logtalk
+remote: vim/vim:runtime
+glob: "**/logtalk.vim"
+filetypes:
+- name: logtalk
+  patterns:
+  - pattern: "*.lgt"
+    description: Logtalk
+---
+name: lotos
+remote: vim/vim:runtime
+glob: "**/lotos.vim"
+filetypes:
+- name: lotos
+  patterns:
+  - pattern: "*.lot,*.lotos"
+    description: LOTOS
+---
+name: lout
+remote: vim/vim:runtime
+glob: "**/lout.vim"
+filetypes:
+- name: lout
+  patterns:
+  - pattern: "*.lou,*.lout"
+    description: 'Lout (also: *.lt)'
+---
+name: lsl
+remote: vim/vim:runtime
+glob: "**/lsl.vim"
+filetypes:
+- name: lsl
+  patterns:
+  - pattern: "*.lsl"
+    description: Linden Scripting Language (Second Life)
+---
+name: lss
+remote: vim/vim:runtime
+glob: "**/lss.vim"
+filetypes:
+- name: lss
+  patterns:
+  - pattern: "*.lss"
+    description: Lynx style file (or LotusScript!)
+---
+name: mgp
+remote: vim/vim:runtime
+glob: "**/mgp.vim"
+filetypes:
+- name: mgp
+  patterns:
+  - pattern: "*.mgp"
+    description: MaGic Point
+---
+name: mail
+remote: vim/vim:runtime
+glob: "**/mail.vim"
+filetypes:
+- name: mail
+  patterns:
+  - pattern: snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\\\{6\},neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml,{neo,}mutt[[:alnum:]._-]\\\{6\},reportbug-*
+---
+name: mailaliases
+remote: vim/vim:runtime
+glob: "**/mailaliases.vim"
+filetypes:
+- name: mailaliases
+  patterns:
+  - pattern: "*/etc/mail/aliases,*/etc/aliases"
+    description: Mail aliases
+---
+name: mailcap
+remote: vim/vim:runtime
+glob: "**/mailcap.vim"
+filetypes:
+- name: mailcap
+  patterns:
+  - pattern: ".mailcap,mailcap"
+    description: Mailcap configuration file
+---
+name: ist
+remote: vim/vim:runtime
+glob: "**/ist.vim"
+filetypes:
+- name: ist
+  patterns:
+  - pattern: "*.ist,*.mst"
+    description: MakeIndex
+---
+name: mallard
+remote: vim/vim:runtime
+glob: "**/mallard.vim"
+filetypes:
+- name: mallard
+  patterns:
+  - pattern: "*.page"
+    description: Mallard
+---
+name: man
+remote: vim/vim:runtime
+glob: "**/man.vim"
+filetypes:
+- name: man
+  patterns:
+  - pattern: "*.man"
+    description: Manpage
+---
+name: manconf
+remote: vim/vim:runtime
+glob: "**/manconf.vim"
+filetypes:
+- name: manconf
+  patterns:
+  - pattern: "*/etc/man.conf,man.config"
+    description: Man config
+---
+name: maple
+remote: vim/vim:runtime
+glob: "**/maple.vim"
+filetypes:
+- name: maple
+  patterns:
+  - pattern: "*.mv,*.mpl,*.mws"
+    description: Maple V
+---
+name: map
+remote: vim/vim:runtime
+glob: "**/map.vim"
+filetypes:
+- name: map
+  patterns:
+  - pattern: "*.map"
+    description: Map (UMN mapserver config file)
+---
+name: mel
+remote: vim/vim:runtime
+glob: "**/mel.vim"
+filetypes:
+- name: mel
+  patterns:
+  - pattern: "*.mel"
+    description: Maya Extension Language
+---
+name: hgcommit
+remote: vim/vim:runtime
+glob: "**/hgcommit.vim"
+filetypes:
+- name: hgcommit
+  patterns:
+  - pattern: hg-editor-*.txt
+    description: Mercurial (hg) commit file
+---
+name: messages
+remote: vim/vim:runtime
+glob: "**/messages.vim"
+filetypes:
+- name: messages
+  patterns:
+  - pattern: "*/log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.[0-9]*,-[0-9]*}"
+    description: Messages (logs mostly)
+---
+name: mf
+remote: vim/vim:runtime
+glob: "**/mf.vim"
+filetypes:
+- name: mf
+  patterns:
+  - pattern: "*.mf"
+    description: Metafont
+---
+name: mp
+remote: vim/vim:runtime
+glob: "**/mp.vim"
+filetypes:
+- name: mp
+  patterns:
+  - pattern: "*.mp"
+    description: MetaPost
+---
+name: mgl
+remote: vim/vim:runtime
+glob: "**/mgl.vim"
+filetypes:
+- name: mgl
+  patterns:
+  - pattern: "*.mgl"
+    description: MGL
+---
+name: mix
+remote: vim/vim:runtime
+glob: "**/mix.vim"
+filetypes:
+- name: mix
+  patterns:
+  - pattern: "*.mix,*.mixal"
+    description: MIX - Knuth assembly
+---
+name: mmp
+remote: vim/vim:runtime
+glob: "**/mmp.vim"
+filetypes:
+- name: mmp
+  patterns:
+  - pattern: "*.mmp"
+    description: Symbian meta-makefile definition (MMP)
+---
+name: modula2
+remote: vim/vim:runtime
+glob: "**/modula2.vim"
+filetypes:
+- name: modula2
+  patterns:
+  - pattern: "*.m2,*.DEF,*.MOD,*.mi"
+    description: Modula 2  (.md removed in favor of Markdown)
+---
+name: modula3
+remote: vim/vim:runtime
+glob: "**/modula3.vim"
+filetypes:
+- name: modula3
+  patterns:
+  - pattern: "*.[mi][3g]"
+    description: Modula 3 (.m3, .i3, .mg, .ig)
+---
+name: monk
+remote: vim/vim:runtime
+glob: "**/monk.vim"
+filetypes:
+- name: monk
+  patterns:
+  - pattern: "*.isc,*.monk,*.ssc,*.tsc"
+    description: Monk
+---
+name: moo
+remote: vim/vim:runtime
+glob: "**/moo.vim"
+filetypes:
+- name: moo
+  patterns:
+  - pattern: "*.moo"
+    description: MOO
+---
+name: modconf
+remote: vim/vim:runtime
+glob: "**/modconf.vim"
+filetypes:
+- name: modconf
+  patterns:
+  - pattern: "*/etc/modules.conf,*/etc/modules,*/etc/conf.modules"
+    description: Modconf
+  - pattern: "*/etc/modprobe.*"
+---
+name: mplayerconf
+remote: vim/vim:runtime
+glob: "**/mplayerconf.vim"
+filetypes:
+- name: mplayerconf
+  patterns:
+  - pattern: mplayer.conf,*/.mplayer/config
+    description: Mplayer config
+---
+name: srec
+remote: vim/vim:runtime
+glob: "**/srec.vim"
+filetypes:
+- name: srec
+  patterns:
+  - pattern: "*.s19,*.s28,*.s37,*.mot,*.srec"
+    description: Motorola S record
+---
+name: mrxvtrc
+remote: vim/vim:runtime
+glob: "**/mrxvtrc.vim"
+filetypes:
+- name: mrxvtrc
+  patterns:
+  - pattern: mrxvtrc,.mrxvtrc
+    description: Mrxvtrc
+---
+name: msql
+remote: vim/vim:runtime
+glob: "**/msql.vim"
+filetypes:
+- name: msql
+  patterns:
+  - pattern: "*.msql"
+    description: Msql
+---
+name: mysql
+remote: vim/vim:runtime
+glob: "**/mysql.vim"
+filetypes:
+- name: mysql
+  patterns:
+  - pattern: "*.mysql"
+    description: Mysql
+---
+name: muttrc
+remote: vim/vim:runtime
+glob: "**/muttrc.vim"
+filetypes:
+- name: muttrc
+  patterns:
+  - pattern: "*/etc/Muttrc.d/*,.mutt{ng,}rc*,*/.mutt{ng,}/mutt{ng,}rc*,mutt{ng,}rc*,Mutt{ng,}rc*"
+  - pattern: Mutt{ng,}rc
+    description: Mutt setup file (also for Muttng)
+---
+name: rc
+remote: vim/vim:runtime
+glob: "**/rc.vim"
+filetypes:
+- name: rc
+  patterns:
+  - pattern: "*.rc,*.rch"
+    description: M$ Resource files
+---
+name: mupad
+remote: vim/vim:runtime
+glob: "**/mupad.vim"
+filetypes:
+- name: mupad
+  patterns:
+  - pattern: "*.mu"
+    description: MuPAD source
+---
+name: mush
+remote: vim/vim:runtime
+glob: "**/mush.vim"
+filetypes:
+- name: mush
+  patterns:
+  - pattern: "*.mush"
+    description: Mush
+---
+name: n1ql
+remote: vim/vim:runtime
+glob: "**/n1ql.vim"
+filetypes:
+- name: n1ql
+  patterns:
+  - pattern: "*.n1ql,*.nql"
+    description: N1QL
+---
+name: nanorc
+remote: vim/vim:runtime
+glob: "**/nanorc.vim"
+filetypes:
+- name: nanorc
+  patterns:
+  - pattern: "*/etc/nanorc,*.nanorc"
+    description: Nano
+---
+name: natural
+remote: vim/vim:runtime
+glob: "**/natural.vim"
+filetypes:
+- name: natural
+  patterns:
+  - pattern: "*.NS[ACGLMNPS]"
+    description: Natural
+---
+name: neomuttrc
+remote: vim/vim:runtime
+glob: "**/neomuttrc.vim"
+filetypes:
+- name: neomuttrc
+  patterns:
+  - pattern: Neomuttrc
+    description: Noemutt setup file
+  - pattern: ".neomuttrc*,*/.neomutt/neomuttrc*,neomuttrc*,Neomuttrc*"
+---
+name: netrc
+remote: vim/vim:runtime
+glob: "**/netrc.vim"
+filetypes:
+- name: netrc
+  patterns:
+  - pattern: ".netrc"
+    description: Netrc
+---
+name: ninja
+remote: vim/vim:runtime
+glob: "**/ninja.vim"
+filetypes:
+- name: ninja
+  patterns:
+  - pattern: "*.ninja"
+    description: Ninja file
+---
+name: ncf
+remote: vim/vim:runtime
+glob: "**/ncf.vim"
+filetypes:
+- name: ncf
+  patterns:
+  - pattern: "*.ncf"
+    description: Novell netware batch files
+---
+name: nroff
+remote: vim/vim:runtime
+glob: "**/nroff.vim"
+filetypes:
+- name: nroff
+  patterns:
+  - pattern: "*.tr,*.nr,*.roff,*.tmac,*.mom"
+    description: Nroff/Troff (*.ms and *.t are checked below)
+  - pattern: tmac.*
+---
+name: nqc
+remote: vim/vim:runtime
+glob: "**/nqc.vim"
+filetypes:
+- name: nqc
+  patterns:
+  - pattern: "*.nqc"
+    description: Not Quite C
+---
+name: nsis
+remote: vim/vim:runtime
+glob: "**/nsis.vim"
+filetypes:
+- name: nsis
+  patterns:
+  - pattern: "*.nsi,*.nsh"
+    description: NSIS
+---
+name: occam
+remote: vim/vim:runtime
+glob: "**/occam.vim"
+filetypes:
+- name: occam
+  patterns:
+  - pattern: "*.occ"
+    description: Occam
+---
+name: omnimark
+remote: vim/vim:runtime
+glob: "**/omnimark.vim"
+filetypes:
+- name: omnimark
+  patterns:
+  - pattern: "*.xom,*.xin"
+    description: Omnimark
+---
+name: openroad
+remote: vim/vim:runtime
+glob: "**/openroad.vim"
+filetypes:
+- name: openroad
+  patterns:
+  - pattern: "*.or"
+    description: OpenROAD
+---
+name: opl
+remote: vim/vim:runtime
+glob: "**/opl.vim"
+filetypes:
+- name: opl
+  patterns:
+  - pattern: "*.[Oo][Pp][Ll]"
+    description: OPL
+---
+name: ora
+remote: vim/vim:runtime
+glob: "**/ora.vim"
+filetypes:
+- name: ora
+  patterns:
+  - pattern: "*.ora"
+    description: Oracle config file
+---
+name: pf
+remote: vim/vim:runtime
+glob: "**/pf.vim"
+filetypes:
+- name: pf
+  patterns:
+  - pattern: pf.conf
+    description: Packet filter conf
+---
+name: pamconf
+remote: vim/vim:runtime
+glob: "**/pamconf.vim"
+filetypes:
+- name: pamconf
+  patterns:
+  - pattern: "*/etc/pam.conf"
+    description: Pam conf
+  - pattern: "*/etc/pam.d/*"
+---
+name: pamenv
+remote: vim/vim:runtime
+glob: "**/pamenv.vim"
+filetypes:
+- name: pamenv
+  patterns:
+  - pattern: pam_env.conf,.pam_environment
+    description: Pam environment
+---
+name: papp
+remote: vim/vim:runtime
+glob: "**/papp.vim"
+filetypes:
+- name: papp
+  patterns:
+  - pattern: "*.papp,*.pxml,*.pxsl"
+    description: PApp
+---
+name: passwd
+remote: vim/vim:runtime
+glob: "**/passwd.vim"
+filetypes:
+- name: passwd
+  patterns:
+  - pattern: "*/etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak"
+    description: Password file
+---
+name: pascal
+remote: vim/vim:runtime
+glob: "**/pascal.vim"
+filetypes:
+- name: pascal
+  patterns:
+  - pattern: "*.pas"
+    description: Pascal (also *.p)
+  - pattern: "*.dpr"
+    description: Delphi or Lazarus program file
+---
+name: pdf
+remote: vim/vim:runtime
+glob: "**/pdf.vim"
+filetypes:
+- name: pdf
+  patterns:
+  - pattern: "*.pdf"
+    description: PDF
+---
+name: pcmk
+remote: vim/vim:runtime
+glob: "**/pcmk.vim"
+filetypes:
+- name: pcmk
+  patterns:
+  - pattern: "*.pcmk"
+    description: PCMK - HAE - crm configure edit
+---
+name: pike
+remote: vim/vim:runtime
+glob: "**/pike.vim"
+filetypes:
+- name: pike
+  patterns:
+  - pattern: "*.pike,*.pmod"
+    description: Pike and Cmod
+---
+name: cmod
+remote: vim/vim:runtime
+glob: "**/cmod.vim"
+filetypes:
+- name: cmod
+  patterns:
+  - pattern: "*.cmod"
+    description: Pike and Cmod
+---
+name: pinfo
+remote: vim/vim:runtime
+glob: "**/pinfo.vim"
+filetypes:
+- name: pinfo
+  patterns:
+  - pattern: "*/etc/pinforc,*/.pinforc"
+    description: Pinfo config
+---
+name: pilrc
+remote: vim/vim:runtime
+glob: "**/pilrc.vim"
+filetypes:
+- name: pilrc
+  patterns:
+  - pattern: "*.rcp"
+    description: Palm Resource compiler
+---
+name: pine
+remote: vim/vim:runtime
+glob: "**/pine.vim"
+filetypes:
+- name: pine
+  patterns:
+  - pattern: ".pinerc,pinerc,.pinercex,pinercex"
+    description: Pine config
+---
+name: pli
+remote: vim/vim:runtime
+glob: "**/pli.vim"
+filetypes:
+- name: pli
+  patterns:
+  - pattern: "*.pli,*.pl1"
+    description: PL/1, PL/I
+---
+name: plm
+remote: vim/vim:runtime
+glob: "**/plm.vim"
+filetypes:
+- name: plm
+  patterns:
+  - pattern: "*.plm,*.p36,*.pac"
+    description: 'PL/M (also: *.inp)'
+---
+name: plsql
+remote: vim/vim:runtime
+glob: "**/plsql.vim"
+filetypes:
+- name: plsql
+  patterns:
+  - pattern: "*.pls,*.plsql"
+    description: PL/SQL
+---
+name: plp
+remote: vim/vim:runtime
+glob: "**/plp.vim"
+filetypes:
+- name: plp
+  patterns:
+  - pattern: "*.plp"
+    description: PLP
+---
+name: po
+remote: vim/vim:runtime
+glob: "**/po.vim"
+filetypes:
+- name: po
+  patterns:
+  - pattern: "*.po,*.pot"
+    description: PO and PO template (GNU gettext)
+---
+name: pfmain
+remote: vim/vim:runtime
+glob: "**/pfmain.vim"
+filetypes:
+- name: pfmain
+  patterns:
+  - pattern: main.cf
+    description: Postfix main config
+---
+name: postscr
+remote: vim/vim:runtime
+glob: "**/postscr.vim"
+filetypes:
+- name: postscr
+  patterns:
+  - pattern: "*.ps,*.pfa,*.afm,*.eps,*.epsf,*.epsi,*.ai"
+    description: PostScript (+ font files, encapsulated PostScript, Adobe Illustrator)
+---
+name: ppd
+remote: vim/vim:runtime
+glob: "**/ppd.vim"
+filetypes:
+- name: ppd
+  patterns:
+  - pattern: "*.ppd"
+    description: PostScript Printer Description
+---
+name: pov
+remote: vim/vim:runtime
+glob: "**/pov.vim"
+filetypes:
+- name: pov
+  patterns:
+  - pattern: "*.pov"
+    description: Povray
+---
+name: povini
+remote: vim/vim:runtime
+glob: "**/povini.vim"
+filetypes:
+- name: povini
+  patterns:
+  - pattern: ".povrayrc"
+    description: Povray configuration
+---
+name: pccts
+remote: vim/vim:runtime
+glob: "**/pccts.vim"
+filetypes:
+- name: pccts
+  patterns:
+  - pattern: "*.g"
+    description: "u BufNewFile,BufRead *.g\t\t\tsetf antrl"
+---
+name: ppwiz
+remote: vim/vim:runtime
+glob: "**/ppwiz.vim"
+filetypes:
+- name: ppwiz
+  patterns:
+  - pattern: "*.it,*.ih"
+    description: PPWizard
+---
+name: obj
+remote: vim/vim:runtime
+glob: "**/obj.vim"
+filetypes:
+- name: obj
+  patterns:
+  - pattern: "*.obj"
+    description: 'TODO: is there a way to avoid MS-Windows Object files?'
+---
+name: proc
+remote: vim/vim:runtime
+glob: "**/proc.vim"
+filetypes:
+- name: proc
+  patterns:
+  - pattern: "*.pc"
+    description: Oracle Pro*C/C++
+---
+name: privoxy
+remote: vim/vim:runtime
+glob: "**/privoxy.vim"
+filetypes:
+- name: privoxy
+  patterns:
+  - pattern: "*.action"
+    description: Privoxy actions file
+---
+name: procmail
+remote: vim/vim:runtime
+glob: "**/procmail.vim"
+filetypes:
+- name: procmail
+  patterns:
+  - pattern: ".procmail,.procmailrc"
+    description: Procmail
+---
+name: psf
+remote: vim/vim:runtime
+glob: "**/psf.vim"
+filetypes:
+- name: psf
+  patterns:
+  - pattern: "*.psf"
+    description: Software Distributor Product Specification File (POSIX 1387.2-1995)
+---
+name: promela
+remote: vim/vim:runtime
+glob: "**/promela.vim"
+filetypes:
+- name: promela
+  patterns:
+  - pattern: "*.pml"
+    description: Promela
+---
+name: protocols
+remote: vim/vim:runtime
+glob: "**/protocols.vim"
+filetypes:
+- name: protocols
+  patterns:
+  - pattern: "*/etc/protocols"
+    description: Protocols
+---
+name: pyrex
+remote: vim/vim:runtime
+glob: "**/pyrex.vim"
+filetypes:
+- name: pyrex
+  patterns:
+  - pattern: "*.pyx,*.pxd"
+    description: Pyrex
+---
+name: radiance
+remote: vim/vim:runtime
+glob: "**/radiance.vim"
+filetypes:
+- name: radiance
+  patterns:
+  - pattern: "*.rad,*.mat"
+    description: Radiance
+---
+name: ratpoison
+remote: vim/vim:runtime
+glob: "**/ratpoison.vim"
+filetypes:
+- name: ratpoison
+  patterns:
+  - pattern: ".ratpoisonrc,ratpoisonrc"
+    description: Ratpoison config/command files
+---
+name: rcs
+remote: vim/vim:runtime
+glob: "**/rcs.vim"
+filetypes:
+- name: rcs
+  patterns:
+  - pattern: "*\\,v"
+---
+name: readline
+remote: vim/vim:runtime
+glob: "**/readline.vim"
+filetypes:
+- name: readline
+  patterns:
+  - pattern: ".inputrc,inputrc"
+    description: Readline
+---
+name: rib
+remote: vim/vim:runtime
+glob: "**/rib.vim"
+filetypes:
+- name: rib
+  patterns:
+  - pattern: "*.rib"
+    description: Renderman Interface Bytestream
+---
+name: rego
+remote: vim/vim:runtime
+glob: "**/rego.vim"
+filetypes:
+- name: rego
+  patterns:
+  - pattern: "*.rego"
+    description: Rego Policy Language
+---
+name: rexx
+remote: vim/vim:runtime
+glob: "**/rexx.vim"
+filetypes:
+- name: rexx
+  patterns:
+  - pattern: "*.rex,*.orx,*.rxo,*.rxj,*.jrexx,*.rexxj,*.rexx,*.testGroup,*.testUnit"
+    description: Rexx
+---
+name: rnoweb
+remote: vim/vim:runtime
+glob: "**/rnoweb.vim"
+filetypes:
+- name: rnoweb
+  patterns:
+  - pattern: "*.rnw,*.snw"
+    description: R noweb file
+---
+name: rmd
+remote: vim/vim:runtime
+glob: "**/rmd.vim"
+filetypes:
+- name: rmd
+  patterns:
+  - pattern: "*.rmd,*.smd"
+    description: R Markdown file
+---
+name: rrst
+remote: vim/vim:runtime
+glob: "**/rrst.vim"
+filetypes:
+- name: rrst
+  patterns:
+  - pattern: "*.rrst,*.srst"
+    description: R reStructuredText file
+---
+name: remind
+remote: vim/vim:runtime
+glob: "**/remind.vim"
+filetypes:
+- name: remind
+  patterns:
+  - pattern: ".reminders,*.remind,*.rem"
+    description: Remind
+  - pattern: ".reminders*"
+---
+name: resolv
+remote: vim/vim:runtime
+glob: "**/resolv.vim"
+filetypes:
+- name: resolv
+  patterns:
+  - pattern: resolv.conf
+    description: Resolv.conf
+---
+name: rnc
+remote: vim/vim:runtime
+glob: "**/rnc.vim"
+filetypes:
+- name: rnc
+  patterns:
+  - pattern: "*.rnc"
+    description: Relax NG Compact
+---
+name: rng
+remote: vim/vim:runtime
+glob: "**/rng.vim"
+filetypes:
+- name: rng
+  patterns:
+  - pattern: "*.rng"
+    description: Relax NG XML
+---
+name: rpl
+remote: vim/vim:runtime
+glob: "**/rpl.vim"
+filetypes:
+- name: rpl
+  patterns:
+  - pattern: "*.rpl"
+    description: RPL/2
+---
+name: robots
+remote: vim/vim:runtime
+glob: "**/robots.vim"
+filetypes:
+- name: robots
+  patterns:
+  - pattern: robots.txt
+    description: Robots.txt
+---
+name: rpcgen
+remote: vim/vim:runtime
+glob: "**/rpcgen.vim"
+filetypes:
+- name: rpcgen
+  patterns:
+  - pattern: "*.x"
+    description: Rpcgen
+---
+name: rtf
+remote: vim/vim:runtime
+glob: "**/rtf.vim"
+filetypes:
+- name: rtf
+  patterns:
+  - pattern: "*.rtf"
+    description: RTF
+---
+name: slang
+remote: vim/vim:runtime
+glob: "**/slang.vim"
+filetypes:
+- name: slang
+  patterns:
+  - pattern: "*.sl"
+    description: S-lang (or shader language, or SmallLisp)
+---
+name: samba
+remote: vim/vim:runtime
+glob: "**/samba.vim"
+filetypes:
+- name: samba
+  patterns:
+  - pattern: smb.conf
+    description: Samba config
+---
+name: sas
+remote: vim/vim:runtime
+glob: "**/sas.vim"
+filetypes:
+- name: sas
+  patterns:
+  - pattern: "*.sas"
+    description: SAS script
+---
+name: sass
+remote: vim/vim:runtime
+glob: "**/sass.vim"
+filetypes:
+- name: sass
+  patterns:
+  - pattern: "*.sass"
+    description: Sass
+---
+name: sather
+remote: vim/vim:runtime
+glob: "**/sather.vim"
+filetypes:
+- name: sather
+  patterns:
+  - pattern: "*.sa"
+    description: Sather
+---
+name: sbt
+remote: vim/vim:runtime
+glob: "**/sbt.vim"
+filetypes:
+- name: sbt
+  patterns:
+  - pattern: "*.sbt"
+    description: SBT - Scala Build Tool
+---
+name: scilab
+remote: vim/vim:runtime
+glob: "**/scilab.vim"
+filetypes:
+- name: scilab
+  patterns:
+  - pattern: "*.sci,*.sce"
+    description: Scilab
+---
+name: sd
+remote: vim/vim:runtime
+glob: "**/sd.vim"
+filetypes:
+- name: sd
+  patterns:
+  - pattern: "*.sd"
+    description: 'SD: Streaming Descriptors'
+---
+name: sdl
+remote: vim/vim:runtime
+glob: "**/sdl.vim"
+filetypes:
+- name: sdl
+  patterns:
+  - pattern: "*.sdl,*.pr"
+    description: SDL
+---
+name: sed
+remote: vim/vim:runtime
+glob: "**/sed.vim"
+filetypes:
+- name: sed
+  patterns:
+  - pattern: "*.sed"
+    description: sed
+---
+name: sieve
+remote: vim/vim:runtime
+glob: "**/sieve.vim"
+filetypes:
+- name: sieve
+  patterns:
+  - pattern: "*.siv,*.sieve"
+    description: Sieve (RFC 3028, 5228)
+---
+name: sm
+remote: vim/vim:runtime
+glob: "**/sm.vim"
+filetypes:
+- name: sm
+  patterns:
+  - pattern: sendmail.cf
+    description: Sendmail
+---
+name: services
+remote: vim/vim:runtime
+glob: "**/services.vim"
+filetypes:
+- name: services
+  patterns:
+  - pattern: "*/etc/services"
+    description: Services
+---
+name: slpconf
+remote: vim/vim:runtime
+glob: "**/slpconf.vim"
+filetypes:
+- name: slpconf
+  patterns:
+  - pattern: "*/etc/slp.conf"
+    description: Service Location config
+---
+name: slpreg
+remote: vim/vim:runtime
+glob: "**/slpreg.vim"
+filetypes:
+- name: slpreg
+  patterns:
+  - pattern: "*/etc/slp.reg"
+    description: Service Location registration
+---
+name: slpspi
+remote: vim/vim:runtime
+glob: "**/slpspi.vim"
+filetypes:
+- name: slpspi
+  patterns:
+  - pattern: "*/etc/slp.spi"
+    description: Service Location SPI
+---
+name: setserial
+remote: vim/vim:runtime
+glob: "**/setserial.vim"
+filetypes:
+- name: setserial
+  patterns:
+  - pattern: "*/etc/serial.conf"
+    description: Setserial config
+---
+name: catalog
+remote: vim/vim:runtime
+glob: "**/catalog.vim"
+filetypes:
+- name: catalog
+  patterns:
+  - pattern: catalog
+    description: SGML catalog file
+  - pattern: sgml.catalog*
+---
+name: scheme
+remote: vim/vim:runtime
+glob: "**/scheme.vim"
+filetypes:
+- name: scheme
+  patterns:
+  - pattern: "*.scm,*.ss,*.rkt"
+    description: Scheme
+---
+name: screen
+remote: vim/vim:runtime
+glob: "**/screen.vim"
+filetypes:
+- name: screen
+  patterns:
+  - pattern: ".screenrc,screenrc"
+    description: Screen RC
+---
+name: simula
+remote: vim/vim:runtime
+glob: "**/simula.vim"
+filetypes:
+- name: simula
+  patterns:
+  - pattern: "*.sim"
+    description: Simula
+---
+name: sinda
+remote: vim/vim:runtime
+glob: "**/sinda.vim"
+filetypes:
+- name: sinda
+  patterns:
+  - pattern: "*.sin,*.s85"
+    description: SINDA
+---
+name: sisu
+remote: vim/vim:runtime
+glob: "**/sisu.vim"
+filetypes:
+- name: sisu
+  patterns:
+  - pattern: "*.sst,*.ssm,*.ssi,*.-sst,*._sst,*.sst.meta,*.-sst.meta,*._sst.meta"
+    description: SiSU
+---
+name: skill
+remote: vim/vim:runtime
+glob: "**/skill.vim"
+filetypes:
+- name: skill
+  patterns:
+  - pattern: "*.il,*.ils,*.cdf"
+    description: SKILL
+---
+name: slrnrc
+remote: vim/vim:runtime
+glob: "**/slrnrc.vim"
+filetypes:
+- name: slrnrc
+  patterns:
+  - pattern: ".slrnrc"
+    description: SLRN
+---
+name: slrnsc
+remote: vim/vim:runtime
+glob: "**/slrnsc.vim"
+filetypes:
+- name: slrnsc
+  patterns:
+  - pattern: "*.score"
+    description: SLRN
+---
+name: st
+remote: vim/vim:runtime
+glob: "**/st.vim"
+filetypes:
+- name: st
+  patterns:
+  - pattern: "*.st"
+    description: Smalltalk (and TeX)
+---
+name: smarty
+remote: vim/vim:runtime
+glob: "**/smarty.vim"
+filetypes:
+- name: smarty
+  patterns:
+  - pattern: "*.tpl"
+    description: Smarty templates
+---
+name: smith
+remote: vim/vim:runtime
+glob: "**/smith.vim"
+filetypes:
+- name: smith
+  patterns:
+  - pattern: "*.smt,*.smith"
+    description: SMITH
+---
+name: snobol4
+remote: vim/vim:runtime
+glob: "**/snobol4.vim"
+filetypes:
+- name: snobol4
+  patterns:
+  - pattern: "*.sno,*.spt"
+    description: Snobol4 and spitbol
+---
+name: mib
+remote: vim/vim:runtime
+glob: "**/mib.vim"
+filetypes:
+- name: mib
+  patterns:
+  - pattern: "*.mib,*.my"
+    description: SNMP MIB files
+---
+name: hog
+remote: vim/vim:runtime
+glob: "**/hog.vim"
+filetypes:
+- name: hog
+  patterns:
+  - pattern: "*.hog,snort.conf,vision.conf"
+    description: Snort Configuration
+---
+name: spec
+remote: vim/vim:runtime
+glob: "**/spec.vim"
+filetypes:
+- name: spec
+  patterns:
+  - pattern: "*.spec"
+    description: Spec (Linux RPM)
+---
+name: spup
+remote: vim/vim:runtime
+glob: "**/spup.vim"
+filetypes:
+- name: spup
+  patterns:
+  - pattern: "*.speedup,*.spdata,*.spd"
+    description: Speedup (AspenTech plant simulator)
+---
+name: slice
+remote: vim/vim:runtime
+glob: "**/slice.vim"
+filetypes:
+- name: slice
+  patterns:
+  - pattern: "*.ice"
+    description: Slice
+---
+name: spice
+remote: vim/vim:runtime
+glob: "**/spice.vim"
+filetypes:
+- name: spice
+  patterns:
+  - pattern: "*.sp,*.spice"
+    description: Spice
+---
+name: spyce
+remote: vim/vim:runtime
+glob: "**/spyce.vim"
+filetypes:
+- name: spyce
+  patterns:
+  - pattern: "*.spy,*.spi"
+    description: Spyce
+---
+name: squid
+remote: vim/vim:runtime
+glob: "**/squid.vim"
+filetypes:
+- name: squid
+  patterns:
+  - pattern: squid.conf
+    description: Squid
+---
+name: sqlj
+remote: vim/vim:runtime
+glob: "**/sqlj.vim"
+filetypes:
+- name: sqlj
+  patterns:
+  - pattern: "*.sqlj"
+    description: SQLJ
+---
+name: sqr
+remote: vim/vim:runtime
+glob: "**/sqr.vim"
+filetypes:
+- name: sqr
+  patterns:
+  - pattern: "*.sqr,*.sqi"
+    description: SQR
+---
+name: sshconfig
+remote: vim/vim:runtime
+glob: "**/sshconfig.vim"
+filetypes:
+- name: sshconfig
+  patterns:
+  - pattern: ssh_config,*/.ssh/config,*/etc/ssh/ssh_config.d/*.conf
+    description: OpenSSH configuration
+---
+name: sshdconfig
+remote: vim/vim:runtime
+glob: "**/sshdconfig.vim"
+filetypes:
+- name: sshdconfig
+  patterns:
+  - pattern: sshd_config,*/etc/ssh/sshd_config.d/*.conf
+    description: OpenSSH server configuration
+---
+name: stata
+remote: vim/vim:runtime
+glob: "**/stata.vim"
+filetypes:
+- name: stata
+  patterns:
+  - pattern: "*.ado,*.do,*.imata,*.mata"
+    description: Stata
+---
+name: smcl
+remote: vim/vim:runtime
+glob: "**/smcl.vim"
+filetypes:
+- name: smcl
+  patterns:
+  - pattern: "*.hlp,*.ihlp,*.smcl"
+    description: SMCL
+---
+name: stp
+remote: vim/vim:runtime
+glob: "**/stp.vim"
+filetypes:
+- name: stp
+  patterns:
+  - pattern: "*.stp"
+    description: Stored Procedures
+---
+name: sml
+remote: vim/vim:runtime
+glob: "**/sml.vim"
+filetypes:
+- name: sml
+  patterns:
+  - pattern: "*.sml"
+    description: Standard ML
+---
+name: voscm
+remote: vim/vim:runtime
+glob: "**/voscm.vim"
+filetypes:
+- name: voscm
+  patterns:
+  - pattern: "*.cm"
+    description: Sratus VOS command macro
+---
+name: swiftgyb
+remote: vim/vim:runtime
+glob: "**/swiftgyb.vim"
+filetypes:
+- name: swiftgyb
+  patterns:
+  - pattern: "*.swift.gyb"
+    description: Swift
+---
+name: sil
+remote: vim/vim:runtime
+glob: "**/sil.vim"
+filetypes:
+- name: sil
+  patterns:
+  - pattern: "*.sil"
+    description: Swift Intermediate Language
+---
+name: sysctl
+remote: vim/vim:runtime
+glob: "**/sysctl.vim"
+filetypes:
+- name: sysctl
+  patterns:
+  - pattern: "*/etc/sysctl.conf,*/etc/sysctl.d/*.conf"
+    description: Sysctl
+---
+name: sdc
+remote: vim/vim:runtime
+glob: "**/sdc.vim"
+filetypes:
+- name: sdc
+  patterns:
+  - pattern: "*.sdc"
+    description: Synopsys Design Constraints
+---
+name: sudoers
+remote: vim/vim:runtime
+glob: "**/sudoers.vim"
+filetypes:
+- name: sudoers
+  patterns:
+  - pattern: "*/etc/sudoers,sudoers.tmp"
+    description: Sudoers
+---
+name: tags
+remote: vim/vim:runtime
+glob: "**/tags.vim"
+filetypes:
+- name: tags
+  patterns:
+  - pattern: tags
+    description: Tags
+---
+name: tak
+remote: vim/vim:runtime
+glob: "**/tak.vim"
+filetypes:
+- name: tak
+  patterns:
+  - pattern: "*.tak"
+    description: TAK
+---
+name: taskdata
+remote: vim/vim:runtime
+glob: "**/taskdata.vim"
+filetypes:
+- name: taskdata
+  patterns:
+  - pattern: "{pending,completed,undo}.data"
+    description: Task
+---
+name: taskedit
+remote: vim/vim:runtime
+glob: "**/taskedit.vim"
+filetypes:
+- name: taskedit
+  patterns:
+  - pattern: "*.task"
+    description: Task
+---
+name: tcl
+remote: vim/vim:runtime
+glob: "**/tcl.vim"
+filetypes:
+- name: tcl
+  patterns:
+  - pattern: "*.tcl,*.tk,*.itcl,*.itk,*.jacl"
+    description: Tcl (JACL too)
+---
+name: tli
+remote: vim/vim:runtime
+glob: "**/tli.vim"
+filetypes:
+- name: tli
+  patterns:
+  - pattern: "*.tli"
+    description: TealInfo
+---
+name: tsalt
+remote: vim/vim:runtime
+glob: "**/tsalt.vim"
+filetypes:
+- name: tsalt
+  patterns:
+  - pattern: "*.slt"
+    description: Telix Salt
+---
+name: teraterm
+remote: vim/vim:runtime
+glob: "**/teraterm.vim"
+filetypes:
+- name: teraterm
+  patterns:
+  - pattern: "*.ttl"
+    description: Tera Term Language
+---
+name: terminfo
+remote: vim/vim:runtime
+glob: "**/terminfo.vim"
+filetypes:
+- name: terminfo
+  patterns:
+  - pattern: "*.ti"
+    description: Terminfo
+---
+name: tex
+remote: vim/vim:runtime
+glob: "**/tex.vim"
+filetypes:
+- name: tex
+  patterns:
+  - pattern: "*.latex,*.sty,*.dtx,*.ltx,*.bbl"
+    description: TeX
+---
+name: context
+remote: vim/vim:runtime
+glob: "**/context.vim"
+filetypes:
+- name: context
+  patterns:
+  - pattern: "*.mkii,*.mkiv,*.mkvi"
+    description: ConTeXt
+---
+name: texinfo
+remote: vim/vim:runtime
+glob: "**/texinfo.vim"
+filetypes:
+- name: texinfo
+  patterns:
+  - pattern: "*.texinfo,*.texi,*.txi"
+    description: Texinfo
+---
+name: texmf
+remote: vim/vim:runtime
+glob: "**/texmf.vim"
+filetypes:
+- name: texmf
+  patterns:
+  - pattern: texmf.cnf
+    description: TeX configuration
+---
+name: tidy
+remote: vim/vim:runtime
+glob: "**/tidy.vim"
+filetypes:
+- name: tidy
+  patterns:
+  - pattern: ".tidyrc,tidyrc"
+    description: Tidy config
+---
+name: tf
+remote: vim/vim:runtime
+glob: "**/tf.vim"
+filetypes:
+- name: tf
+  patterns:
+  - pattern: "*.tf,.tfrc,tfrc"
+    description: TF mud client
+---
+name: tpp
+remote: vim/vim:runtime
+glob: "**/tpp.vim"
+filetypes:
+- name: tpp
+  patterns:
+  - pattern: "*.tpp"
+    description: TPP - Text Presentation Program
+---
+name: treetop
+remote: vim/vim:runtime
+glob: "**/treetop.vim"
+filetypes:
+- name: treetop
+  patterns:
+  - pattern: "*.treetop"
+    description: Treetop
+---
+name: trustees
+remote: vim/vim:runtime
+glob: "**/trustees.vim"
+filetypes:
+- name: trustees
+  patterns:
+  - pattern: trustees.conf
+    description: Trustees
+---
+name: tssgm
+remote: vim/vim:runtime
+glob: "**/tssgm.vim"
+filetypes:
+- name: tssgm
+  patterns:
+  - pattern: "*.tssgm"
+    description: TSS - Geometry
+---
+name: tssop
+remote: vim/vim:runtime
+glob: "**/tssop.vim"
+filetypes:
+- name: tssop
+  patterns:
+  - pattern: "*.tssop"
+    description: TSS - Optics
+---
+name: tsscl
+remote: vim/vim:runtime
+glob: "**/tsscl.vim"
+filetypes:
+- name: tsscl
+  patterns:
+  - pattern: "*.tsscl"
+    description: TSS - Command Line (temporary)
+---
+name: twig
+remote: vim/vim:runtime
+glob: "**/twig.vim"
+filetypes:
+- name: twig
+  patterns:
+  - pattern: "*.twig"
+    description: TWIG files
+---
+name: uil
+remote: vim/vim:runtime
+glob: "**/uil.vim"
+filetypes:
+- name: uil
+  patterns:
+  - pattern: "*.uit,*.uil"
+    description: Motif UIT/UIL files
+---
+name: udevconf
+remote: vim/vim:runtime
+glob: "**/udevconf.vim"
+filetypes:
+- name: udevconf
+  patterns:
+  - pattern: "*/etc/udev/udev.conf"
+    description: Udev conf
+---
+name: udevperm
+remote: vim/vim:runtime
+glob: "**/udevperm.vim"
+filetypes:
+- name: udevperm
+  patterns:
+  - pattern: "*/etc/udev/permissions.d/*.permissions"
+    description: Udev permissions
+---
+name: uc
+remote: vim/vim:runtime
+glob: "**/uc.vim"
+filetypes:
+- name: uc
+  patterns:
+  - pattern: "*.uc"
+    description: UnrealScript
+---
+name: updatedb
+remote: vim/vim:runtime
+glob: "**/updatedb.vim"
+filetypes:
+- name: updatedb
+  patterns:
+  - pattern: "*/etc/updatedb.conf"
+    description: Updatedb
+---
+name: upstart
+remote: vim/vim:runtime
+glob: "**/upstart.vim"
+filetypes:
+- name: upstart
+  patterns:
+  - pattern: "*/usr/share/upstart/*.conf,*/usr/share/upstart/*.override,*/etc/init/*.conf,*/etc/init/*.override,*/.init/*.conf,*/.init/*.override,*/.config/upstart/*.conf,*/.config/upstart/*.override"
+    description: Upstart (init(8)) config files
+---
+name: vera
+remote: vim/vim:runtime
+glob: "**/vera.vim"
+filetypes:
+- name: vera
+  patterns:
+  - pattern: "*.vr,*.vri,*.vrh"
+    description: Vera
+---
+name: verilog
+remote: vim/vim:runtime
+glob: "**/verilog.vim"
+filetypes:
+- name: verilog
+  patterns:
+  - pattern: "*.v"
+    description: Verilog HDL
+---
+name: verilogams
+remote: vim/vim:runtime
+glob: "**/verilogams.vim"
+filetypes:
+- name: verilogams
+  patterns:
+  - pattern: "*.va,*.vams"
+    description: Verilog-AMS HDL
+---
+name: systemverilog
+remote: vim/vim:runtime
+glob: "**/systemverilog.vim"
+filetypes:
+- name: systemverilog
+  patterns:
+  - pattern: "*.sv,*.svh"
+    description: SystemVerilog
+---
+name: vhdl
+remote: vim/vim:runtime
+glob: "**/vhdl.vim"
+filetypes:
+- name: vhdl
+  patterns:
+  - pattern: "*.hdl,*.vhd,*.vhdl,*.vbe,*.vst,*.vho"
+    description: VHDL
+  - pattern: "*.vhdl_[0-9]*"
+---
+name: vim
+remote: vim/vim:runtime
+glob: "**/vim.vim"
+filetypes:
+- name: vim
+  patterns:
+  - pattern: "*.vim,*.vba,.exrc,_exrc"
+    description: Vim script
+  - pattern: "*vimrc*"
+---
+name: viminfo
+remote: vim/vim:runtime
+glob: "**/viminfo.vim"
+filetypes:
+- name: viminfo
+  patterns:
+  - pattern: ".viminfo,_viminfo"
+    description: Viminfo file
+---
+name: vgrindefs
+remote: vim/vim:runtime
+glob: "**/vgrindefs.vim"
+filetypes:
+- name: vgrindefs
+  patterns:
+  - pattern: vgrindefs
+    description: Vgrindefs file
+---
+name: vrml
+remote: vim/vim:runtime
+glob: "**/vrml.vim"
+filetypes:
+- name: vrml
+  patterns:
+  - pattern: "*.wrl"
+    description: VRML V1.0c
+---
+name: vroom
+remote: vim/vim:runtime
+glob: "**/vroom.vim"
+filetypes:
+- name: vroom
+  patterns:
+  - pattern: "*.vroom"
+    description: Vroom (vim testing and executable documentation)
+---
+name: wast
+remote: vim/vim:runtime
+glob: "**/wast.vim"
+filetypes:
+- name: wast
+  patterns:
+  - pattern: "*.wast,*.wat"
+    description: WebAssembly
+---
+name: webmacro
+remote: vim/vim:runtime
+glob: "**/webmacro.vim"
+filetypes:
+- name: webmacro
+  patterns:
+  - pattern: "*.wm"
+    description: Webmacro
+---
+name: wget
+remote: vim/vim:runtime
+glob: "**/wget.vim"
+filetypes:
+- name: wget
+  patterns:
+  - pattern: ".wgetrc,wgetrc"
+    description: Wget config
+---
+name: wml
+remote: vim/vim:runtime
+glob: "**/wml.vim"
+filetypes:
+- name: wml
+  patterns:
+  - pattern: "*.wml"
+    description: Website MetaLanguage
+---
+name: winbatch
+remote: vim/vim:runtime
+glob: "**/winbatch.vim"
+filetypes:
+- name: winbatch
+  patterns:
+  - pattern: "*.wbt"
+    description: Winbatch
+---
+name: wsml
+remote: vim/vim:runtime
+glob: "**/wsml.vim"
+filetypes:
+- name: wsml
+  patterns:
+  - pattern: "*.wsml"
+    description: WSML
+---
+name: wvdial
+remote: vim/vim:runtime
+glob: "**/wvdial.vim"
+filetypes:
+- name: wvdial
+  patterns:
+  - pattern: wvdial.conf,.wvdialrc
+    description: WvDial
+---
+name: cvsrc
+remote: vim/vim:runtime
+glob: "**/cvsrc.vim"
+filetypes:
+- name: cvsrc
+  patterns:
+  - pattern: ".cvsrc"
+    description: CVS RC file
+---
+name: cvs
+remote: vim/vim:runtime
+glob: "**/cvs.vim"
+filetypes:
+- name: cvs
+  patterns:
+  - pattern: cvs\d\+
+---
+name: wsh
+remote: vim/vim:runtime
+glob: "**/wsh.vim"
+filetypes:
+- name: wsh
+  patterns:
+  - pattern: "*.ws[fc]"
+    description: Windows Scripting Host and Windows Script Component
+---
+name: xhtml
+remote: vim/vim:runtime
+glob: "**/xhtml.vim"
+filetypes:
+- name: xhtml
+  patterns:
+  - pattern: "*.xhtml,*.xht"
+    description: XHTML
+---
+name: xinetd
+remote: vim/vim:runtime
+glob: "**/xinetd.vim"
+filetypes:
+- name: xinetd
+  patterns:
+  - pattern: "*/etc/xinetd.conf"
+    description: Xinetd conf
+  - pattern: "*/etc/xinetd.d/*"
+---
+name: xdefaults
+remote: vim/vim:runtime
+glob: "**/xdefaults.vim"
+filetypes:
+- name: xdefaults
+  patterns:
+  - pattern: ".Xdefaults,.Xpdefaults,.Xresources,xdm-config,*.ad"
+    description: X resources file
+  - pattern: Xresources*,*/app-defaults/*,*/Xresources/*
+---
+name: xmath
+remote: vim/vim:runtime
+glob: "**/xmath.vim"
+filetypes:
+- name: xmath
+  patterns:
+  - pattern: "*.msc,*.msf"
+    description: Xmath
+---
+name: xmodmap
+remote: vim/vim:runtime
+glob: "**/xmodmap.vim"
+filetypes:
+- name: xmodmap
+  patterns:
+  - pattern: "*Xmodmap"
+    description: X11 xmodmap (also see below)
+  - pattern: "*xmodmap*"
+---
+name: xquery
+remote: vim/vim:runtime
+glob: "**/xquery.vim"
+filetypes:
+- name: xquery
+  patterns:
+  - pattern: "*.xq,*.xql,*.xqm,*.xquery,*.xqy"
+    description: Xquery
+---
+name: xsd
+remote: vim/vim:runtime
+glob: "**/xsd.vim"
+filetypes:
+- name: xsd
+  patterns:
+  - pattern: "*.xsd"
+    description: XSD
+---
+name: xslt
+remote: vim/vim:runtime
+glob: "**/xslt.vim"
+filetypes:
+- name: xslt
+  patterns:
+  - pattern: "*.xsl,*.xslt"
+    description: Xslt
+---
+name: yacc
+remote: vim/vim:runtime
+glob: "**/yacc.vim"
+filetypes:
+- name: yacc
+  patterns:
+  - pattern: "*.yy,*.yxx,*.y++"
+    description: Yacc
+---
+name: zimbu
+remote: vim/vim:runtime
+glob: "**/zimbu.vim"
+filetypes:
+- name: zimbu
+  patterns:
+  - pattern: "*.zu"
+    description: Zimbu
+---
+name: zimbutempl
+remote: vim/vim:runtime
+glob: "**/zimbutempl.vim"
+filetypes:
+- name: zimbutempl
+  patterns:
+  - pattern: "*.zut"
+    description: Zimbu Templates
+---
+name: z8a
+remote: vim/vim:runtime
+glob: "**/z8a.vim"
+filetypes:
+- name: z8a
+  patterns:
+  - pattern: "*.z8a"
+    description: Z80 assembler asz80
+---
+name: apachestyle
+remote: vim/vim:runtime
+glob: "**/apachestyle.vim"
+filetypes:
+- name: apachestyle
+  patterns:
+  - pattern: "*/etc/proftpd/*.conf*,*/etc/proftpd/conf.*/*,proftpd.conf*"
+---
+name: asterisk
+remote: vim/vim:runtime
+glob: "**/asterisk.vim"
+filetypes:
+- name: asterisk
+  patterns:
+  - pattern: "*asterisk/*.conf*"
+---
+name: asteriskvm
+remote: vim/vim:runtime
+glob: "**/asteriskvm.vim"
+filetypes:
+- name: asteriskvm
+  patterns:
+  - pattern: "*asterisk*/*voicemail.conf*"
+---
+name: bzr
+remote: vim/vim:runtime
+glob: "**/bzr.vim"
+filetypes:
+- name: bzr
+  patterns:
+  - pattern: bzr_log.*
+    description: Bazaar version control
+---
+name: crontab
+remote: vim/vim:runtime
+glob: "**/crontab.vim"
+filetypes:
+- name: crontab
+  patterns:
+  - pattern: crontab,crontab.*,*/etc/cron.d/*
+---
+name: fvwm
+remote: vim/vim:runtime
+glob: "**/fvwm.vim"
+filetypes:
+- name: fvwm
+  patterns:
+  - pattern: "*/.fvwm/*"
+---
+name: logcheck
+remote: vim/vim:runtime
+glob: "**/logcheck.vim"
+filetypes:
+- name: logcheck
+  patterns:
+  - pattern: "*/etc/logcheck/*.d*/*"
+---
+name: svn
+remote: vim/vim:runtime
+glob: "**/svn.vim"
+filetypes:
+- name: svn
+  patterns:
+  - pattern: svn-commit*.tmp
+    description: Subversion commit file
+---
+name: text
+remote: vim/vim:runtime
+glob: "**/text.vim"
+filetypes:
+- name: text
+  patterns:
+  - pattern: "*.text,README"
+    description: the "conf" type being used if there is a line starting with '#'.
+---
+name: pullrequest
+remote: vim/vim:runtime
+glob: "**/pullrequest.vim"
+filetypes:
+- name: pullrequest
+  patterns:
+  - pattern: PULLREQ_EDITMSG
diff --git a/scripts/build b/scripts/build
index 948da1150..deee269ef 100755
--- a/scripts/build
+++ b/scripts/build
@@ -108,6 +108,19 @@ def load_data()
 
   for package in packages
     for filetype in package["filetypes"]
+      if filetype["patterns"]
+        for pattern in filetype["patterns"]
+          for p in comma_expanson(pattern["pattern"])
+            if p.match(/^\*\.[^\*]+$/)
+              filetype["extensions"] ||= []
+              filetype["extensions"]  << p[2..-1]
+            else
+              filetype["filenames"] ||= []
+              filetype["filenames"]  << p
+            end
+          end
+        end
+      end
       if filetype["linguist"]
         if filetype["extensions"]
           raise "#{package["name"]} #{filetype["name"]}: extensions can't be set when linguist is defined"
@@ -460,9 +473,6 @@ def extract(packages)
         globs.each do |glob|
           Dir.glob("#{subdir}/#{glob}", base: subtree).each do |p|
             next unless File.file?("#{subtree}/#{p}")
-            if p.include?("samba")
-              raise package["name"]
-            end
             copy_file(package, "#{subtree}/#{p}", p)
           end
         end
diff --git a/scripts/import_vim b/scripts/import_vim
new file mode 100755
index 000000000..0cf9231c8
--- /dev/null
+++ b/scripts/import_vim
@@ -0,0 +1,122 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+
+def comma_expanson(s)
+  s.scan(/{[^{]+}|[^{]+/).map { |a| a[0] == "{" ? a : a.split(",", -1) }.reduce([]) do |a, b|
+    a.size > 0 ?
+      (b.is_a?(String) ?
+         a[0..-2] + [a[-1] + b] :
+         a[0..-2] + [a[-1] + b[0]] + b[1..-1]) :
+      [b].flatten
+  end
+end
+
+def import_autocommands
+  cmd = <<~EOF
+vim -es -u DEFAULTS -c 'exe("func! Capture() \\n redir => capture \\n silent autocmd filetypedetect BufRead \\n redir END \\n return capture \\n endfunc") | let a = Capture() | put =a | %print | :q!'
+  EOF
+  filetypes = Hash.new { |h, k| h[k] = [] }
+  autocommands = `#{cmd}`
+  for pattern, cmd in autocommands.scan(/^    ([^ ]+)\s*(.*)\n/)
+    cmd = cmd.strip
+
+    what = {}
+    if match = cmd.match(/^setf\s+(.*)$/)
+      what[:ft] = match[1]
+    elsif match = cmd.match(/^call s:StarSetf\(\'(.*)\'\)$/)
+      what[:ft] = match[1]
+    elsif match = cmd.match(/^set filetype=(.*)$/)
+      what[:ft] = match[1]
+    end
+
+    if what != {}
+      for p in comma_expanson(pattern.strip)
+        filetypes[what[:ft].strip] << p
+      end
+    end
+  end
+
+
+  filetypes
+end
+
+$with_special_char = /#{[".", ":", "{", "}", "[", "]", ",", "&", "*", "#", "?", "|", "-", "<", ">", "=", "!", "%", "@", "\\"].map { |e| Regexp.escape(e) }.join("|")}/
+def print_pattern(p)
+  if p.match($with_special_char)
+    p.gsub("'", "\\'")
+  end
+
+  return p
+end
+
+def generate_packages_entries(filetypes, comments)
+  entries = []
+
+  current_filetypes = YAML.load_stream(File.read('packages.yaml')).flat_map do |p|
+    p["filetypes"].map { |a| a["name"] }
+  end
+
+  for ft, patterns in filetypes
+    if current_filetypes.include?(ft)
+      next
+    end
+
+    output = {
+      "name" => ft,
+      "remote" => "vim/vim:runtime",
+      "glob" => "**/" + ft + ".vim",
+      "filetypes" => [{
+        "name" => ft,
+        "patterns" => []
+      }]
+    }
+    paths_with_comments = patterns.group_by { |p| (comments[ft] || {})[p] || "" }
+    for comment, paths in paths_with_comments
+      output["filetypes"][0]["patterns"] << {
+        "pattern" => paths.join(","),
+      }
+
+      if comment.strip.size > 0
+        output["filetypes"][0]["patterns"].last["description"] = comment
+      end
+    end
+    entries << YAML.dump(output)
+  end
+
+  return entries
+end
+
+filetypes = import_autocommands
+
+def fix_quotes(a)
+  a = a.gsub(/\\/) { '\\\\' }
+  a.scan(/^.*?"(.+?)"\n/m).each { |p| a[p[0]] = p[0].gsub('"') { '\\"'} }
+  a
+end
+
+def get_comments
+  comments_cmd = <<~'EOF'
+  awk '/^"/ { comment = $0; next } match($0, "(\\S+)\\s+setf (\\S*)$", a) { print "- filetype: \"" a[2] "\"\n  description: \"" substr(comment, 3) "\"\n  patterns: \"" a[1] "\"" }' 'tmp/vim/vim/runtime/filetype.vim'
+  EOF
+
+  comments = YAML.load(fix_quotes(`#{comments_cmd}`))
+
+  comments.reject! { |c| c["patterns"].strip == "" || c["patterns"].include?('\\') }
+  result = {}
+  comments = comments.flat_map do |c| 
+    result[c["filetype"]] ||= {}
+
+    for p in comma_expanson(c["patterns"])
+      result[c["filetype"]][p] = c["description"]
+    end
+  end
+  result
+end
+
+comments = get_comments()
+autocommands = import_autocommands()
+entries = generate_packages_entries(autocommands, comments)
+print(entries.join(""))
+
+
diff --git a/syntax/apachestyle.vim b/syntax/apachestyle.vim
new file mode 100644
index 000000000..0eb4015e9
--- /dev/null
+++ b/syntax/apachestyle.vim
@@ -0,0 +1,58 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apachestyle') == -1
+
+" Vim syntax file
+" Language:	Apache-Style configuration files (proftpd.conf/apache.conf/..)
+" Maintainer:	Ben RUBSON <ben.rubson@gmail.com>
+" Former Maintainer:	Christian Hammers <ch@westend.com>
+" ChangeLog:
+"	2017-12-17,ch
+"		correctly detect comments
+"	2001-05-04,ch
+"		adopted Vim 6.0 syntax style
+"	1999-10-28,ch
+"		initial release
+
+" The following formats are recognised:
+" Apache-style .conf
+"	# Comment
+"	Option	value
+"	Option	value1 value2
+"	Option = value1 value2 #not apache but also allowed
+"	<Section Name?>
+"		Option	value
+"		<SubSection Name?>
+"		</SubSection>
+"	</Section>
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+syn match  apOption	/^\s*[^ \t#<=]*/
+syn match  apComment	/^\s*#.*$/
+"syn match  apLastValue	/[^ \t<=#]*$/ contains=apComment	ugly
+
+" tags
+syn region apTag	start=/</ end=/>/ contains=apTagOption,apTagError
+" the following should originally be " [^<>]+" but this didn't work :(
+syn match  apTagOption	contained / [-\/_\.:*a-zA-Z0-9]\+/ms=s+1
+syn match  apTagError	contained /[^>]</ms=s+1
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link apComment	Comment
+hi def link apOption	Keyword
+"hi def link apLastValue	Identifier		ugly?
+hi def link apTag		Special
+hi def link apTagOption	Identifier
+hi def link apTagError	Error
+
+
+let b:current_syntax = "apachestyle"
+" vim: ts=8
+
+endif
diff --git a/syntax/asterisk.vim b/syntax/asterisk.vim
new file mode 100644
index 000000000..f29ae1198
--- /dev/null
+++ b/syntax/asterisk.vim
@@ -0,0 +1,92 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asterisk') == -1
+
+" Vim syntax file
+" Language:	Asterisk config file
+" Maintainer: 	Jean Aunis <jean.aunis@yahoo.fr>
+" Previous Maintainer:	brc007
+" Updated for 1.2 by Tilghman Lesher (Corydon76)
+" Last Change:	2015 Feb 27
+" version 0.4
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn sync clear
+syn sync fromstart
+
+syn keyword     asteriskTodo    TODO contained
+syn match       asteriskComment         ";.*" contains=asteriskTodo
+syn match       asteriskContext         "\[.\{-}\]"
+syn match       asteriskExten           "^\s*\zsexten\s*=>\?\s*[^,]\+\ze," contains=asteriskPattern nextgroup=asteriskPriority
+syn match       asteriskExten           "^\s*\zssame\s*=>\?\s*\ze" nextgroup=asteriskPriority
+syn match       asteriskExten           "^\s*\(register\|channel\|ignorepat\|include\|\(no\)\?load\)\s*=>\?"
+syn match       asteriskPattern         "_\(\[[[:alnum:]#*\-]\+\]\|[[:alnum:]#*]\)*\.\?" contained
+syn match       asteriskPattern         "[^A-Za-z0-9,]\zs[[:alnum:]#*]\+\ze" contained
+syn match       asteriskApp             ",\zs[a-zA-Z]\+\ze$"
+syn match       asteriskApp             ",\zs[a-zA-Z]\+\ze("
+" Digits plus oldlabel (newlabel)
+syn match       asteriskPriority        "\zs[[:digit:]]\+\(+[[:alpha:]][[:alnum:]_]*\)\?\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel
+" oldlabel plus digits (newlabel)
+syn match       asteriskPriority        "\zs[[:alpha:]][[:alnum:]_]*+[[:digit:]]\+\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel
+" s or n plus digits (newlabel)
+syn match       asteriskPriority        "\zs[sn]\(+[[:digit:]]\+\)\?\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel
+syn match       asteriskLabel           "(\zs[[:alpha:]][[:alnum:]]*\ze)" contained
+syn match       asteriskError           "^\s*#\s*[[:alnum:]]*"
+syn match       asteriskInclude         "^\s*#\s*\(include\|exec\)\s.*"
+syn match       asteriskVar             "\${_\{0,2}[[:alpha:]][[:alnum:]_]*\(:-\?[[:digit:]]\+\(:[[:digit:]]\+\)\?\)\?}"
+syn match       asteriskVar             "_\{0,2}[[:alpha:]][[:alnum:]_]*\ze="
+syn match       asteriskVarLen          "\${_\{0,2}[[:alpha:]][[:alnum:]_]*(.*)}" contains=asteriskVar,asteriskVarLen,asteriskExp
+syn match       asteriskVarLen          "(\zs[[:alpha:]][[:alnum:]_]*(.\{-})\ze=" contains=asteriskVar,asteriskVarLen,asteriskExp
+syn match       asteriskExp             "\$\[.\{-}\]" contains=asteriskVar,asteriskVarLen,asteriskExp
+syn match       asteriskCodecsPermit    "^\s*\(allow\|disallow\)\s*=\s*.*$" contains=asteriskCodecs
+syn match       asteriskCodecs          "\(g723\|gsm\|ulaw\|alaw\|g726\|adpcm\|slin\|lpc10\|g729\|speex\|ilbc\|all\s*$\)"
+syn match       asteriskError           "^\(type\|auth\|permit\|deny\|bindaddr\|host\)\s*=.*$"
+syn match       asteriskType            "^\zstype=\ze\<\(peer\|user\|friend\)\>$" contains=asteriskTypeType
+syn match       asteriskTypeType        "\<\(peer\|user\|friend\)\>" contained
+syn match       asteriskAuth            "^\zsauth\s*=\ze\s*\<\(md5\|rsa\|plaintext\)\>$" contains=asteriskAuthType
+syn match       asteriskAuthType        "\<\(md5\|rsa\|plaintext\)\>"
+syn match       asteriskAuth            "^\zs\(secret\|inkeys\|outkey\)\s*=\ze.*$"
+syn match       asteriskAuth            "^\(permit\|deny\)\s*=\s*\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\s*$" contains=asteriskIPRange
+syn match       asteriskIPRange         "\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}" contained
+syn match       asteriskIP              "\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}" contained
+syn match       asteriskHostname        "[[:alnum:]][[:alnum:]\-\.]*\.[[:alpha:]]{2,10}" contained
+syn match       asteriskPort            "\d\{1,5}" contained
+syn match       asteriskSetting         "^bindaddr\s*=\s*\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}$" contains=asteriskIP
+syn match       asteriskSetting         "^port\s*=\s*\d\{1,5}\s*$" contains=asteriskPort
+syn match       asteriskSetting         "^host\s*=\s*\(dynamic\|\(\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\)\|\([[:alnum:]][[:alnum:]\-\.]*\.[[:alpha:]]{2,10}\)\)" contains=asteriskIP,asteriskHostname
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link        asteriskComment		Comment
+hi def link        asteriskExten		String
+hi def link        asteriskContext         Preproc
+hi def link        asteriskPattern         Type
+hi def link        asteriskApp             Statement
+hi def link        asteriskInclude         Preproc
+hi def link        asteriskIncludeBad	Error
+hi def link        asteriskPriority        Preproc
+hi def link        asteriskLabel           Type
+hi def link        asteriskVar             String
+hi def link        asteriskVarLen          Function
+hi def link        asteriskExp             Type
+hi def link        asteriskCodecsPermit    Preproc
+hi def link        asteriskCodecs          String
+hi def link        asteriskType            Statement
+hi def link        asteriskTypeType        Type
+hi def link        asteriskAuth            String
+hi def link        asteriskAuthType        Type
+hi def link        asteriskIPRange         Identifier
+hi def link        asteriskIP              Identifier
+hi def link        asteriskPort            Identifier
+hi def link        asteriskHostname        Identifier
+hi def link        asteriskSetting         Statement
+hi def link        asteriskError           Error
+
+let b:current_syntax = "asterisk" 
+" vim: ts=8 sw=2
+
+
+endif
diff --git a/syntax/asteriskvm.vim b/syntax/asteriskvm.vim
new file mode 100644
index 000000000..8a4c079a1
--- /dev/null
+++ b/syntax/asteriskvm.vim
@@ -0,0 +1,55 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asteriskvm') == -1
+
+" Vim syntax file
+" Language:	Asterisk voicemail config file
+" Maintainer: Tilghman Lesher (Corydon76)
+" Last Change:	2006 Mar 21
+" version 0.2
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn sync clear
+syn sync fromstart
+
+
+syn keyword     asteriskvmTodo    TODO contained
+syn match       asteriskvmComment         ";.*" contains=asteriskvmTodo
+syn match       asteriskvmContext         "\[.\{-}\]"
+
+" ZoneMessages
+syn match       asteriskvmZone            "^[[:alnum:]]\+\s*=>\?\s*[[:alnum:]/_]\+|.*$" contains=zoneName,zoneDef
+syn match       zoneName                "=\zs[[:alnum:]/_]\+\ze" contained
+syn match       zoneDef                 "|\zs.*\ze$" contained
+
+syn match       asteriskvmSetting         "\<\(format\|serveremail\|minmessage\|maxmessage\|maxgreet\|skipms\|maxsilence\|silencethreshold\|maxlogins\)="
+syn match       asteriskvmSetting         "\<\(externnotify\|externpass\|directoryintro\|charset\|adsi\(fdn\|sec\|ver\)\|\(pager\)\?fromstring\|email\(subject\|body\|cmd\)\|tz\|cidinternalcontexts\|saydurationm\|dialout\|callback\)="
+syn match       asteriskvmSettingBool     "\<\(attach\|pbxskip\|usedirectory\|saycid\|sayduration\|sendvoicemail\|review\|operator\|envelope\|delete\|nextaftercmd\|forcename\|forcegreeting\)=\(yes\|no\|1\|0\|true\|false\|t\|f\)"
+
+" Individual mailbox definitions
+syn match       asteriskvmMailbox         "^[[:digit:]]\+\s*=>\?\s*[[:digit:]]\+\(,[^,]*\(,[^,]*\(,[^,]*\(,[^,]*\)\?\)\?\)\?\)\?" contains=mailboxEmail,asteriskvmSetting,asteriskvmSettingBool,comma
+syn match       mailboxEmail            ",\zs[^@=,]*@[[:alnum:]\-\.]\+\.[[:alpha:]]\{2,10}\ze" contains=comma
+syn match       comma                   "[,|]" contained
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link        asteriskvmComment Comment
+hi def link        asteriskvmContext         Identifier
+hi def link        asteriskvmZone            Type
+hi def link        zoneName                String
+hi def link        zoneDef                 String
+hi def link        asteriskvmSetting         Type
+hi def link        asteriskvmSettingBool     Type
+
+hi def link        asteriskvmMailbox         Statement
+hi def link        mailboxEmail            String
+
+let b:current_syntax = "asteriskvm"
+
+" vim: ts=8 sw=2
+
+
+endif
diff --git a/syntax/bc.vim b/syntax/bc.vim
new file mode 100644
index 000000000..c4c1acf7e
--- /dev/null
+++ b/syntax/bc.vim
@@ -0,0 +1,70 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bc') == -1
+
+" Vim syntax file
+" Language:	bc - An arbitrary precision calculator language
+" Maintainer:	Vladimir Scholtz <vlado@gjh.sk>
+" Last change:	2012 Jun 01
+" 		(Dominique Pelle added @Spell)
+" Available on:	www.gjh.sk/~vlado/bc.vim
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+" Keywords
+syn keyword bcKeyword if else while for break continue return limits halt quit
+syn keyword bcKeyword define
+syn keyword bcKeyword length read sqrt print
+
+" Variable
+syn keyword bcType auto
+
+" Constant
+syn keyword bcConstant scale ibase obase last
+syn keyword bcConstant BC_BASE_MAX BC_DIM_MAX BC_SCALE_MAX BC_STRING_MAX
+syn keyword bcConstant BC_ENV_ARGS BC_LINE_LENGTH
+
+" Any other stuff
+syn match bcIdentifier		"[a-z_][a-z0-9_]*"
+
+" String
+ syn match bcString		"\"[^"]*\"" contains=@Spell
+
+" Number
+syn match bcNumber		"[0-9]\+"
+
+" Comment
+syn match bcComment		"\#.*" contains=@Spell
+syn region bcComment		start="/\*" end="\*/" contains=@Spell
+
+" Parent ()
+syn cluster bcAll contains=bcList,bcIdentifier,bcNumber,bcKeyword,bcType,bcConstant,bcString,bcParentError
+syn region bcList		matchgroup=Delimiter start="(" skip="|.\{-}|" matchgroup=Delimiter end=")" contains=@bcAll
+syn region bcList		matchgroup=Delimiter start="\[" skip="|.\{-}|" matchgroup=Delimiter end="\]" contains=@bcAll
+syn match bcParenError			"]"
+syn match bcParenError			")"
+
+
+
+syn case match
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link bcKeyword		Statement
+hi def link bcType		Type
+hi def link bcConstant		Constant
+hi def link bcNumber		Number
+hi def link bcComment		Comment
+hi def link bcString		String
+hi def link bcSpecialChar		SpecialChar
+hi def link bcParenError		Error
+
+
+let b:current_syntax = "bc"
+" vim: ts=8
+
+endif
diff --git a/syntax/bdf.vim b/syntax/bdf.vim
new file mode 100644
index 000000000..b6c0cf0df
--- /dev/null
+++ b/syntax/bdf.vim
@@ -0,0 +1,101 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bdf') == -1
+
+" Vim syntax file
+" Language:             BDF font definition
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn region  bdfFontDefinition transparent matchgroup=bdfKeyword
+                              \ start='^STARTFONT\>' end='^ENDFONT\>'
+                              \ contains=bdfComment,bdfFont,bdfSize,
+                              \ bdfBoundingBox,bdfProperties,bdfChars,bdfChar
+
+syn match   bdfNumber         contained display
+                              \ '\<\%(\x\+\|[+-]\=\d\+\%(\.\d\+\)*\)'
+
+syn keyword bdfTodo           contained FIXME TODO XXX NOTE
+
+syn region  bdfComment        contained start='^COMMENT\>' end='$'
+                              \ contains=bdfTodo,@Spell
+
+syn region  bdfFont           contained matchgroup=bdfKeyword
+                              \ start='^FONT\>' end='$'
+
+syn region  bdfSize           contained transparent matchgroup=bdfKeyword
+                              \ start='^SIZE\>' end='$' contains=bdfNumber
+
+syn region  bdfBoundingBox    contained transparent matchgroup=bdfKeyword
+                              \ start='^FONTBOUNDINGBOX' end='$'
+                              \ contains=bdfNumber
+
+syn region  bdfProperties     contained transparent matchgroup=bdfKeyword
+                              \ start='^STARTPROPERTIES' end='^ENDPROPERTIES'
+                              \ contains=bdfNumber,bdfString,bdfProperty,
+                              \ bdfXProperty
+
+syn keyword bdfProperty       contained FONT_ASCENT FONT_DESCENT DEFAULT_CHAR
+syn match   bdfProperty       contained '^\S\+'
+
+syn keyword bdfXProperty      contained FONT_ASCENT FONT_DESCENT DEFAULT_CHAR
+                              \ FONTNAME_REGISTRY FOUNDRY FAMILY_NAME
+                              \ WEIGHT_NAME SLANT SETWIDTH_NAME PIXEL_SIZE
+                              \ POINT_SIZE RESOLUTION_X RESOLUTION_Y SPACING
+                              \ CHARSET_REGISTRY CHARSET_ENCODING COPYRIGHT
+                              \ ADD_STYLE_NAME WEIGHT RESOLUTION X_HEIGHT
+                              \ QUAD_WIDTH FONT AVERAGE_WIDTH
+
+syn region  bdfString         contained start=+"+ skip=+""+ end=+"+
+
+syn region  bdfChars          contained display transparent
+                              \ matchgroup=bdfKeyword start='^CHARS' end='$'
+                              \ contains=bdfNumber
+
+syn region  bdfChar           transparent matchgroup=bdfKeyword
+                              \ start='^STARTCHAR' end='^ENDCHAR'
+                              \ contains=bdfEncoding,bdfWidth,bdfAttributes,
+                              \ bdfBitmap
+
+syn region  bdfEncoding       contained transparent matchgroup=bdfKeyword
+                              \ start='^ENCODING' end='$' contains=bdfNumber
+
+syn region  bdfWidth          contained transparent matchgroup=bdfKeyword
+                              \ start='^SWIDTH\|DWIDTH\|BBX' end='$'
+                              \ contains=bdfNumber
+
+syn region  bdfAttributes     contained transparent matchgroup=bdfKeyword
+                              \ start='^ATTRIBUTES' end='$'
+
+syn keyword bdfBitmap         contained BITMAP
+
+if exists("bdf_minlines")
+  let b:bdf_minlines = bdf_minlines
+else
+  let b:bdf_minlines = 30
+endif
+exec "syn sync ccomment bdfChar minlines=" . b:bdf_minlines
+
+
+hi def link bdfKeyword        Keyword
+hi def link bdfNumber         Number
+hi def link bdfTodo           Todo
+hi def link bdfComment        Comment
+hi def link bdfFont           String
+hi def link bdfProperty       Identifier
+hi def link bdfXProperty      Identifier
+hi def link bdfString         String
+hi def link bdfChars          Keyword
+hi def link bdfBitmap         Keyword
+
+let b:current_syntax = "bdf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/bib.vim b/syntax/bib.vim
new file mode 100644
index 000000000..218638eb9
--- /dev/null
+++ b/syntax/bib.vim
@@ -0,0 +1,125 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bib') == -1
+
+" Vim syntax file
+" Language:	BibTeX (bibliographic database format for (La)TeX)
+" Maintainer:	Bernd Feige <Bernd.Feige@gmx.net>
+" Filenames:	*.bib
+" Last Change:	2017 Sep 29
+
+" Thanks to those who pointed out problems with this file or supplied fixes!
+
+" Initialization
+" ==============
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Ignore case
+syn case ignore
+
+" Keywords
+" ========
+syn keyword bibType contained	article book booklet conference inbook
+syn keyword bibType contained	incollection inproceedings manual
+syn keyword bibType contained	mastersthesis misc phdthesis
+syn keyword bibType contained	proceedings techreport unpublished
+syn keyword bibType contained	string preamble
+
+syn keyword bibEntryKw contained	address annote author booktitle chapter
+syn keyword bibEntryKw contained	crossref edition editor howpublished
+syn keyword bibEntryKw contained	institution journal key month note
+syn keyword bibEntryKw contained	number organization pages publisher
+syn keyword bibEntryKw contained	school series title type volume year
+
+" biblatex keywords, cf. http://mirrors.ctan.org/macros/latex/contrib/biblatex/doc/biblatex.pdf
+syn keyword bibType contained	mvbook bookinbook suppbook collection mvcollection suppcollection
+syn keyword bibType contained	online patent periodical suppperiodical mvproceedings reference
+syn keyword bibType contained	mvreference inreference report set thesis xdata customa customb
+syn keyword bibType contained	customc customd custome customf electronic www artwork audio bibnote
+syn keyword bibType contained	commentary image jurisdiction legislation legal letter movie music
+syn keyword bibType contained	performance review software standard video
+
+syn keyword bibEntryKw contained	abstract isbn issn keywords url
+syn keyword bibEntryKw contained	addendum afterwordannotation annotation annotator authortype
+syn keyword bibEntryKw contained	bookauthor bookpagination booksubtitle booktitleaddon
+syn keyword bibEntryKw contained	commentator date doi editora editorb editorc editortype
+syn keyword bibEntryKw contained	editoratype editorbtype editorctype eid entrysubtype
+syn keyword bibEntryKw contained	eprint eprintclass eprinttype eventdate eventtitle
+syn keyword bibEntryKw contained	eventtitleaddon file foreword holder indextitle
+syn keyword bibEntryKw contained	introduction isan ismn isrn issue issuesubtitle
+syn keyword bibEntryKw contained	issuetitle iswc journalsubtitle journaltitle label
+syn keyword bibEntryKw contained	language library location mainsubtitle maintitle
+syn keyword bibEntryKw contained	maintitleaddon nameaddon origdate origlanguage
+syn keyword bibEntryKw contained	origlocation origpublisher origtitle pagetotal
+syn keyword bibEntryKw contained	pagination part pubstate reprinttitle shortauthor
+syn keyword bibEntryKw contained	shorteditor shorthand shorthandintro shortjournal
+syn keyword bibEntryKw contained	shortseries shorttitle subtitle titleaddon translator
+syn keyword bibEntryKw contained	urldate venue version volumes entryset execute gender
+syn keyword bibEntryKw contained	langid langidopts ids indexsorttitle options presort
+syn keyword bibEntryKw contained	related relatedoptions relatedtype relatedstring
+syn keyword bibEntryKw contained	sortkey sortname sortshorthand sorttitle sortyear xdata
+syn keyword bibEntryKw contained	xref namea nameb namec nameatype namebtype namectype
+syn keyword bibEntryKw contained	lista listb listc listd liste listf usera userb userc
+syn keyword bibEntryKw contained	userd usere userf verba verbb verbc archiveprefix pdf
+syn keyword bibEntryKw contained	primaryclass
+
+" Non-standard:
+" AMS mref http://www.ams.org/mref
+syn keyword bibNSEntryKw contained	mrclass mrnumber mrreviewer fjournal coden
+
+" Clusters
+" ========
+syn cluster bibVarContents	contains=bibUnescapedSpecial,bibBrace,bibParen,bibMath
+" This cluster is empty but things can be added externally:
+"syn cluster bibCommentContents
+
+" Matches
+" =======
+syn match bibUnescapedSpecial contained /[^\\][%&]/hs=s+1
+syn match bibKey contained /\s*[^ \t}="]\+,/hs=s,he=e-1 nextgroup=bibField
+syn match bibVariable contained /[^{}," \t=]/
+syn region bibComment start=/./ end=/^\s*@/me=e-1 contains=@bibCommentContents nextgroup=bibEntry
+syn region bibMath contained start=/\(\\\)\@<!\$/ end=/\$/ skip=/\(\\\$\)/
+syn region bibQuote contained start=/"/ end=/"/ skip=/\(\\"\)/ contains=@bibVarContents
+syn region bibBrace contained start=/{/ end=/}/ skip=/\(\\[{}]\)/ contains=@bibVarContents
+syn region bibParen contained start=/(/ end=/)/ skip=/\(\\[()]\)/ contains=@bibVarContents
+syn region bibField contained start="\S\+\s*=\s*" end=/[}),]/me=e-1 contains=bibEntryKw,bibNSEntryKw,bibBrace,bibParen,bibQuote,bibVariable
+syn region bibEntryData contained start=/[{(]/ms=e+1 end=/[})]/me=e-1 contains=bibKey,bibField,bibComment3
+" Actually, 5.8 <= Vim < 6.0 would ignore the `fold' keyword anyway, but Vim<5.8 would produce
+" an error, so we explicitly distinguish versions with and without folding functionality:
+syn region bibEntry start=/@\S\+\s*[{(]/ end=/^\s*[})]/ transparent fold contains=bibType,bibEntryData nextgroup=bibComment
+syn region bibComment2 start=/@Comment\s*[{(]/ end=/^\s*[})]/me=e-1 contains=@bibCommentContents nextgroup=bibEntry
+" biblatex style comments inside a bibEntry
+syn match bibComment3 "%.*"
+
+" Synchronization
+" ===============
+syn sync match All grouphere bibEntry /^\s*@/
+syn sync maxlines=200
+syn sync minlines=50
+
+" Highlighting defaults
+" =====================
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link bibType	Identifier
+hi def link bibEntryKw	Statement
+hi def link bibNSEntryKw	PreProc
+hi def link bibKey		Special
+hi def link bibVariable	Constant
+hi def link bibUnescapedSpecial	Error
+hi def link bibComment	Comment
+hi def link bibComment2	Comment
+hi def link bibComment3	Comment
+
+let b:current_syntax = "bib"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/bindzone.vim b/syntax/bindzone.vim
new file mode 100644
index 000000000..c7e256463
--- /dev/null
+++ b/syntax/bindzone.vim
@@ -0,0 +1,101 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bindzone') == -1
+
+" Vim syntax file
+" Language:     BIND zone files (RFC 1035)
+" Maintainer:   Julian Mehnle <julian@mehnle.net>
+" URL:          http://www.mehnle.net/source/odds+ends/vim/syntax/
+" Last Change:  Thu 2011-07-16 20:42:00 UTC
+" 
+" Based on an earlier version by Вячеслав Горбанев (Slava Gorbanev), with
+" heavy modifications.
+" 
+" $Id: bindzone.vim 12 2011-07-16 21:09:57Z julian $
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+" Directives
+syn region      zoneRRecord     start=/^/ end=/$/ contains=zoneOwnerName,zoneSpecial,zoneTTL,zoneClass,zoneRRType,zoneComment,zoneUnknown
+
+syn match       zoneDirective   /^\$ORIGIN\s\+/   nextgroup=zoneOrigin,zoneUnknown
+syn match       zoneDirective   /^\$TTL\s\+/      nextgroup=zoneTTL,zoneUnknown
+syn match       zoneDirective   /^\$INCLUDE\s\+/  nextgroup=zoneText,zoneUnknown
+syn match       zoneDirective   /^\$GENERATE\s/
+
+syn match       zoneUnknown     contained /\S\+/
+
+syn match       zoneOwnerName   contained /^[^[:space:]!"#$%&'()*+,\/:;<=>?@[\]\^`{|}~]\+\(\s\|;\)\@=/ nextgroup=zoneTTL,zoneClass,zoneRRType skipwhite
+syn match       zoneOrigin      contained  /[^[:space:]!"#$%&'()*+,\/:;<=>?@[\]\^`{|}~]\+\(\s\|;\|$\)\@=/
+syn match       zoneDomain      contained  /[^[:space:]!"#$%&'()*+,\/:;<=>?@[\]\^`{|}~]\+\(\s\|;\|$\)\@=/
+
+syn match       zoneSpecial     contained /^[@*.]\s/
+syn match       zoneTTL         contained /\s\@<=\d[0-9WwDdHhMmSs]*\(\s\|$\)\@=/ nextgroup=zoneClass,zoneRRType skipwhite
+syn keyword     zoneClass       contained IN CHAOS CH HS HESIOD nextgroup=zoneRRType,zoneTTL skipwhite
+syn keyword     zoneRRType      contained A AAAA CERT CNAME DNAME DNSKEY DS HINFO LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM PTR RP RRSIG SSHFP SOA SPF SRV TLSA TXT nextgroup=zoneRData skipwhite
+syn match       zoneRData       contained /[^;]*/ contains=zoneDomain,zoneIPAddr,zoneIP6Addr,zoneText,zoneNumber,zoneParen,zoneUnknown
+
+syn match       zoneIPAddr      contained /\<[0-9]\{1,3}\(\.[0-9]\{1,3}\)\{,3}\>/
+
+"   Plain IPv6 address          IPv6-embedded-IPv4 address
+"   1111:2:3:4:5:6:7:8          1111:2:3:4:5:6:127.0.0.1
+syn match       zoneIP6Addr     contained /\<\(\x\{1,4}:\)\{6}\(\x\{1,4}:\x\{1,4}\|\([0-2]\?\d\{1,2}\.\)\{3}[0-2]\?\d\{1,2}\)\>/
+"   ::[...:]8                   ::[...:]127.0.0.1
+syn match       zoneIP6Addr     contained /\s\@<=::\(\(\x\{1,4}:\)\{,6}\x\{1,4}\|\(\x\{1,4}:\)\{,5}\([0-2]\?\d\{1,2}\.\)\{3}[0-2]\?\d\{1,2}\)\>/
+"   1111::[...:]8               1111::[...:]127.0.0.1
+syn match       zoneIP6Addr     contained /\<\(\x\{1,4}:\)\{1}:\(\(\x\{1,4}:\)\{,5}\x\{1,4}\|\(\x\{1,4}:\)\{,4}\([0-2]\?\d\{1,2}\.\)\{3}[0-2]\?\d\{1,2}\)\>/
+"   1111:2::[...:]8             1111:2::[...:]127.0.0.1
+syn match       zoneIP6Addr     contained /\<\(\x\{1,4}:\)\{2}:\(\(\x\{1,4}:\)\{,4}\x\{1,4}\|\(\x\{1,4}:\)\{,3}\([0-2]\?\d\{1,2}\.\)\{3}[0-2]\?\d\{1,2}\)\>/
+"   1111:2:3::[...:]8           1111:2:3::[...:]127.0.0.1
+syn match       zoneIP6Addr     contained /\<\(\x\{1,4}:\)\{3}:\(\(\x\{1,4}:\)\{,3}\x\{1,4}\|\(\x\{1,4}:\)\{,2}\([0-2]\?\d\{1,2}\.\)\{3}[0-2]\?\d\{1,2}\)\>/
+"   1111:2:3:4::[...:]8         1111:2:3:4::[...:]127.0.0.1
+syn match       zoneIP6Addr     contained /\<\(\x\{1,4}:\)\{4}:\(\(\x\{1,4}:\)\{,2}\x\{1,4}\|\(\x\{1,4}:\)\{,1}\([0-2]\?\d\{1,2}\.\)\{3}[0-2]\?\d\{1,2}\)\>/
+"   1111:2:3:4:5::[...:]8       1111:2:3:4:5::127.0.0.1
+syn match       zoneIP6Addr     contained /\<\(\x\{1,4}:\)\{5}:\(\(\x\{1,4}:\)\{,1}\x\{1,4}\|\([0-2]\?\d\{1,2}\.\)\{3}[0-2]\?\d\{1,2}\)\>/
+"   1111:2:3:4:5:6::8           -
+syn match       zoneIP6Addr     contained /\<\(\x\{1,4}:\)\{6}:\x\{1,4}\>/
+"   1111[:...]::                -
+syn match       zoneIP6Addr     contained /\<\(\x\{1,4}:\)\{1,7}:\(\s\|;\|$\)\@=/
+
+syn match       zoneText        contained /"\([^"\\]\|\\.\)*"\(\s\|;\|$\)\@=/
+syn match       zoneNumber      contained /\<[0-9]\+\(\s\|;\|$\)\@=/
+syn match       zoneSerial      contained /\<[0-9]\{9,10}\(\s\|;\|$\)\@=/
+
+syn match       zoneErrParen    /)/
+syn region      zoneParen       contained start="(" end=")" contains=zoneSerial,zoneTTL,zoneNumber,zoneComment
+syn match       zoneComment     /;.*/
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link zoneDirective    Macro
+
+hi def link zoneUnknown      Error
+
+hi def link zoneOrigin       Statement
+hi def link zoneOwnerName    Statement
+hi def link zoneDomain       Identifier
+
+hi def link zoneSpecial      Special
+hi def link zoneTTL          Constant
+hi def link zoneClass        Include
+hi def link zoneRRType       Type
+
+hi def link zoneIPAddr       Number
+hi def link zoneIP6Addr      Number
+hi def link zoneText         String
+hi def link zoneNumber       Number
+hi def link zoneSerial       Special
+
+hi def link zoneErrParen     Error
+hi def link zoneComment      Comment
+
+
+let b:current_syntax = "bindzone"
+
+" vim:sts=2 sw=2
+
+endif
diff --git a/syntax/blank.vim b/syntax/blank.vim
new file mode 100644
index 000000000..056f68557
--- /dev/null
+++ b/syntax/blank.vim
@@ -0,0 +1,43 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blank') == -1
+
+" Vim syntax file
+" Language:     Blank 1.4.1
+" Maintainer:   Rafal M. Sulejman <unefunge@friko2.onet.pl>
+" Last change:  2011 Dec 28 by Thilo Six
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case ignore
+
+" Blank instructions
+syn match blankInstruction "{[:;,\.+\-*$#@/\\`'"!\|><{}\[\]()?xspo\^&\~=_%]}"
+
+" Common strings
+syn match blankString "\~[^}]"
+
+" Numbers
+syn match blankNumber "\[[0-9]\+\]"
+
+syn case match
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link blankInstruction      Statement
+hi def link blankNumber	       Number
+hi def link blankString	       String
+
+
+let b:current_syntax = "blank"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/bsdl.vim b/syntax/bsdl.vim
new file mode 100644
index 000000000..10ca5b8f5
--- /dev/null
+++ b/syntax/bsdl.vim
@@ -0,0 +1,21 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bsdl') == -1
+
+" Vim syntax file
+" Language:	Boundary Scan Description Language (BSDL)
+" Maintainer:	Daniel Kho <daniel.kho@logik.haus>
+" Last Changed:	2020 Mar 19 by Daniel Kho
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+" Read in VHDL syntax files
+runtime! syntax/vhdl.vim
+unlet b:current_syntax
+
+let b:current_syntax = "bsdl"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/bst.vim b/syntax/bst.vim
new file mode 100644
index 000000000..a59618428
--- /dev/null
+++ b/syntax/bst.vim
@@ -0,0 +1,74 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bst') == -1
+
+" Vim syntax file
+" Language:     BibTeX Bibliography Style
+" Maintainer:   Tim Pope <vimNOSPAM@tpope.info>
+" Filenames:    *.bst
+" $Id: bst.vim,v 1.2 2007/05/05 18:24:42 vimboss Exp $
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+setlocal iskeyword=48-57,#,$,',.,A-Z,a-z
+
+syn case ignore
+
+syn match   bstString +"[^"]*\%("\|$\)+ contains=bstField,bstType,bstError
+" Highlight the last character of an unclosed string, but only when the cursor
+" is not beyond it (i.e., it is still being edited). Imperfect.
+syn match   bstError     '[^"]\%#\@!$' contained
+
+syn match   bstNumber         "#-\=\d\+\>"
+syn keyword bstNumber         entry.max$ global.max$
+syn match   bstComment        "%.*"
+
+syn keyword bstCommand        ENTRY FUNCTION INTEGERS MACRO STRINGS
+syn keyword bstCommand        READ EXECUTE ITERATE REVERSE SORT
+syn match   bstBuiltIn        "\s[-<>=+*]\|\s:="
+syn keyword bstBuiltIn        add.period$
+syn keyword bstBuiltIn        call.type$ change.case$ chr.to.int$ cite$
+syn keyword bstBuiltIn        duplicate$ empty$ format.name$
+syn keyword bstBuiltIn        if$ int.to.chr$ int.to.str$
+syn keyword bstBuiltIn        missing$
+syn keyword bstBuiltIn        newline$ num.names$
+syn keyword bstBuiltIn        pop$ preamble$ purify$ quote$
+syn keyword bstBuiltIn        skip$ stack$ substring$ swap$
+syn keyword bstBuiltIn        text.length$ text.prefix$ top$ type$
+syn keyword bstBuiltIn        warning$ while$ width$ write$
+syn match   bstIdentifier     "'\k*"
+syn keyword bstType           article book booklet conference
+syn keyword bstType           inbook incollection inproceedings
+syn keyword bstType           manual mastersthesis misc
+syn keyword bstType           phdthesis proceedings
+syn keyword bstType           techreport unpublished
+syn keyword bstField          abbr address annote author
+syn keyword bstField          booktitle chapter crossref comment
+syn keyword bstField          edition editor
+syn keyword bstField          howpublished institution journal key month
+syn keyword bstField          note number
+syn keyword bstField          organization
+syn keyword bstField          pages publisher
+syn keyword bstField          school series
+syn keyword bstField          title type
+syn keyword bstField          volume year
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link bstComment           Comment
+hi def link bstString            String
+hi def link bstCommand           PreProc
+hi def link bstBuiltIn           Statement
+hi def link bstField             Special
+hi def link bstNumber            Number
+hi def link bstType              Type
+hi def link bstIdentifier        Identifier
+hi def link bstError             Error
+
+let b:current_syntax = "bst"
+
+" vim:set ft=vim sts=4 sw=4:
+
+endif
diff --git a/syntax/bzr.vim b/syntax/bzr.vim
new file mode 100644
index 000000000..99db04d62
--- /dev/null
+++ b/syntax/bzr.vim
@@ -0,0 +1,54 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzr') == -1
+
+" Vim syntax file
+" Language:     Bazaar (bzr) commit file
+" Maintainer:   Dmitry Vasiliev <dima at hlabs dot org>
+" URL:          https://github.com/hdima/vim-scripts/blob/master/syntax/bzr.vim
+" Last Change:  2012-02-11
+" Filenames:    bzr_log.*
+" Version:      1.2.2
+"
+" Thanks:
+"
+"    Gioele Barabucci
+"       for idea of diff highlighting
+
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
+  finish
+endif
+
+if exists("bzr_highlight_diff")
+  syn include @Diff syntax/diff.vim
+endif
+
+syn match bzrRemoved   "^removed:$" contained
+syn match bzrAdded     "^added:$" contained
+syn match bzrRenamed   "^renamed:$" contained
+syn match bzrModified  "^modified:$" contained
+syn match bzrUnchanged "^unchanged:$" contained
+syn match bzrUnknown   "^unknown:$" contained
+syn cluster Statuses contains=bzrRemoved,bzrAdded,bzrRenamed,bzrModified,bzrUnchanged,bzrUnknown
+if exists("bzr_highlight_diff")
+  syn cluster Statuses add=@Diff
+endif
+syn region bzrRegion   start="^-\{14} This line and the following will be ignored -\{14}$" end="\%$" contains=@NoSpell,@Statuses
+
+" Synchronization.
+syn sync clear
+syn sync match bzrSync  grouphere bzrRegion "^-\{14} This line and the following will be ignored -\{14}$"me=s-1
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet.
+
+hi def link bzrRemoved    Constant
+hi def link bzrAdded      Identifier
+hi def link bzrModified   Special
+hi def link bzrRenamed    Special
+hi def link bzrUnchanged  Special
+hi def link bzrUnknown    Special
+
+
+let b:current_syntax = "bzr"
+
+endif
diff --git a/syntax/cabal-1.vim b/syntax/cabal-1.vim
new file mode 100644
index 000000000..7b9724bd5
--- /dev/null
+++ b/syntax/cabal-1.vim
@@ -0,0 +1,55 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
+
+" syntax highlighting for cabal
+"
+" author: raichoo (raichoo@googlemail.com)
+
+if version < 600
+  syn clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+syn match cabalLineComment "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contains=@Spell
+syn match cabalIdentifier "[A-Za-z\-]*" contained
+syn match cabalOperator "[<=>&|!]"
+syn match cabalColon ":" contained
+syn match cabalNumber "\<[0-9][0-9\.*]*\>"
+syn match cabalDelimiter "[,()]"
+syn keyword cabalBool True False
+syn keyword cabalConditional if else
+syn match cabalCompilerFlag "\s\+-[^ -][^ ]*"
+syn match cabalDocBulletPoint "^\s\+\*"
+syn match cabalDocHeadline "^\s\+=.*$"
+syn match cabalDocCode "^\s\+>.*$"
+syn match cabalDocNewline "^\s\+\.\s*$"
+syn match cabalSection "^\c\(executable\|library\|flag\|source-repository\|test-suite\|benchmark\)"
+syn match cabalEntry "^\s*[A-Za-z][a-zA-Z\-]*:" contains=cabalIdentifier,cabalColon
+
+syn region cabalDescription start="^\s*[dD]escription:" end="^\<" keepend
+  \ contains=
+  \ cabalEntry,
+  \ cabalLineComment,
+  \ cabalDocBulletPoint,
+  \ cabalDocHeadline,
+  \ cabalDocNewline,
+  \ cabalDocCode
+
+highlight def link cabalIdentifier Identifier
+highlight def link cabalLineComment Comment
+highlight def link cabalOperator Operator
+highlight def link cabalColon Operator
+highlight def link cabalNumber Number
+highlight def link cabalSection Structure
+highlight def link cabalDelimiter Delimiter
+highlight def link cabalBool Boolean
+highlight def link cabalCompilerFlag Macro
+highlight def link cabalConditional Conditional
+highlight def link cabalDocBulletPoint Structure
+highlight def link cabalDocHeadline Include
+highlight def link cabalDocNewline Operator
+highlight def link cabalDocCode Macro
+
+let b:current_syntax = "cabal"
+
+endif
diff --git a/syntax/cabal-2.vim b/syntax/cabal-2.vim
new file mode 100644
index 000000000..c4ef829f4
--- /dev/null
+++ b/syntax/cabal-2.vim
@@ -0,0 +1,245 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cabal') == -1
+
+" Vim syntax file
+" Language:     Haskell Cabal Build file
+" Author:	Vincent Berthoux <twinside@gmail.com>
+" Maintainer:   Marcin Szamotulski <profunctor@pm.me>
+" Previous Maintainer:	Vincent Berthoux <twinside@gmail.com>
+" File Types:   .cabal
+" Last Change:  15 May 2018
+" v1.5: Incorporated changes from
+"       https://github.com/sdiehl/haskell-vim-proto/blob/master/vim/syntax/cabal.vim
+"       Use `syn keyword` instead of `syn match`.
+"       Added cabalStatementRegion to limit matches of keywords, which fixes
+"       the highlighting of description's value.
+"       Added cabalVersionRegion to limit the scope of cabalVersionOperator
+"       and cabalVersion matches.
+"       Added cabalLanguage keyword.
+"       Added calbalTitle, cabalAuthor and cabalMaintainer syntax groups.
+"       Added ! and ^>= operators (calbal 2.0)
+"       Added build-type keywords
+" v1.4: Add benchmark support, thanks to Simon Meier
+" v1.3: Updated to the last version of cabal
+"       Added more highlighting for cabal function, true/false
+"       and version number. Also added missing comment highlighting.
+"       Cabal known compiler are highlighted too.
+"
+" V1.2: Added cpp-options which was missing. Feature implemented
+"       by GHC, found with a GHC warning, but undocumented. 
+"       Whatever...
+"
+" v1.1: Fixed operator problems and added ftdetect file
+"       (thanks to Sebastian Schwarz)
+"
+" v1.0: Cabal syntax in vimball format
+"       (thanks to Magnus Therning)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" this file uses line continuation
+let s:cpo_save = &cpo
+set cpo&vim
+
+" set iskeyword for this syntax script
+syn iskeyword @,48-57,192-255,-
+
+" Case sensitive matches
+syn case match
+
+syn keyword cabalConditional	if else
+syn keyword cabalFunction	os arche impl flag
+syn match cabalComment		/--.*$/
+
+" Case insensitive matches
+syn case ignore
+
+syn keyword cabalCategory contained
+	\ executable
+	\ library
+	\ benchmark
+	\ test-suite
+	\ source-repository
+	\ flag
+	\ custom-setup
+syn match cabalCategoryTitle contained /[^{]*\ze{\?/
+syn match cabalCategoryRegion
+	\ contains=cabalCategory,cabalCategoryTitle
+	\ nextgroup=cabalCategory skipwhite
+	\ /^\c\s*\(contained\|executable\|library\|benchmark\|test-suite\|source-repository\|flag\|custom-setup\)\+\s*\%(.*$\|$\)/
+syn keyword cabalTruth true false
+
+" cabalStatementRegion which limits the scope of cabalStatement keywords, this
+" way they are not highlighted in description.
+syn region cabalStatementRegion start=+^\s*\(--\)\@<!\k\+\s*:+ end=+:+
+syn keyword cabalStatement contained containedin=cabalStatementRegion
+	\ default-language
+	\ default-extensions
+	\ author
+	\ branch
+	\ bug-reports
+	\ build-depends
+	\ build-tools
+	\ build-type
+	\ buildable
+	\ c-sources
+	\ cabal-version
+	\ category
+	\ cc-options
+	\ copyright
+	\ cpp-options
+	\ data-dir
+	\ data-files
+	\ default
+	\ description
+	\ executable
+	\ exposed-modules
+	\ exposed
+	\ extensions
+	\ extra-tmp-files
+	\ extra-doc-files
+	\ extra-lib-dirs
+	\ extra-libraries
+	\ extra-source-files
+	\ exta-tmp-files
+	\ for example
+	\ frameworks
+	\ ghc-options
+	\ ghc-prof-options
+	\ ghc-shared-options
+	\ homepage
+	\ hs-source-dirs
+	\ hugs-options
+	\ include-dirs
+	\ includes
+	\ install-includes
+	\ ld-options
+	\ license
+	\ license-file
+	\ location
+	\ main-is
+	\ maintainer
+	\ manual
+	\ module
+	\ name
+	\ nhc98-options
+	\ other-extensions
+	\ other-modules
+	\ package-url
+	\ pkgconfig-depends
+	\ setup-depends
+	\ stability
+	\ subdir
+	\ synopsis
+	\ tag
+	\ tested-with
+	\ type
+	\ version
+	\ virtual-modules
+
+" operators and version operators
+syn match cabalOperator /&&\|||\|!/
+syn match cabalVersionOperator contained
+	\ /!\|==\|\^\?>=\|<=\|<\|>/
+" match version: `[%]\@<!` is to exclude `%20` in http addresses.
+syn match cabalVersion contained
+	\ /[%$_-]\@<!\<\d\+\%(\.\d\+\)*\%(\.\*\)\?\>/
+" cabalVersionRegion which limits the scope of cabalVersion pattern.
+syn match cabalVersionRegionA
+	\ contains=cabalVersionOperator,cabalVersion
+	\ keepend
+	\ /\%(==\|\^\?>=\|<=\|<\|>\)\s*\d\+\%(\.\d\+\)*\%(\.\*\)\?\>/
+" version inside `version: ...` 
+syn match cabalVersionRegionB
+	\ contains=cabalStatementRegion,cabalVersionOperator,cabalVersion
+	\ /^\s*\%(cabal-\)\?version\s*:.*$/
+
+syn keyword cabalLanguage Haskell98 Haskell2010
+
+" title region
+syn match cabalName contained /:\@<=.*/
+syn match cabalNameRegion
+	\ contains=cabalStatementRegion,cabalName
+	\ nextgroup=cabalStatementRegion
+	\ oneline
+	\ /^\c\s*name\s*:.*$/
+
+" author region
+syn match cabalAuthor contained /:\@<=.*/
+syn match cabalAuthorRegion
+	\ contains=cabalStatementRegion,cabalStatement,cabalAuthor
+	\ nextgroup=cabalStatementRegion
+	\ oneline
+	\ /^\c\s*author\s*:.*$/
+
+" maintainer region
+syn match cabalMaintainer contained /:\@<=.*/
+syn match cabalMaintainerRegion
+	\ contains=cabalStatementRegion,cabalStatement,cabalMaintainer
+	\ nextgroup=cabalStatementRegion
+	\ oneline
+	\ /^\c\s*maintainer\s*:.*$/
+
+" license region
+syn match cabalLicense contained /:\@<=.*/
+syn match cabalLicenseRegion
+	\ contains=cabalStatementRegion,cabalStatement,cabalLicense
+	\ nextgroup=cabalStatementRegion
+	\ oneline
+	\ /^\c\s*license\s*:.*$/
+
+" license-file region
+syn match cabalLicenseFile contained /:\@<=.*/
+syn match cabalLicenseFileRegion
+	\ contains=cabalStatementRegion,cabalStatement,cabalLicenseFile
+	\ nextgroup=cabalStatementRegion
+	\ oneline
+	\ /^\c\s*license-file\s*:.*$/
+
+" tested-with region with compilers and versions
+syn keyword cabalCompiler contained ghc nhc yhc hugs hbc helium jhc lhc
+syn match cabalTestedWithRegion
+	\ contains=cabalStatementRegion,cabalStatement,cabalCompiler,cabalVersionRegionA
+	\ nextgroup=cabalStatementRegion
+	\ oneline
+	\ /^\c\s*tested-with\s*:.*$/
+
+" build type keywords
+syn keyword cabalBuildType contained
+	\ simple custom configure
+syn match cabalBuildTypeRegion
+	\ contains=cabalStatementRegion,cabalStatement,cabalBuildType
+	\ nextgroup=cabalStatementRegion
+	\ /^\c\s*build-type\s*:.*$/
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+hi def link cabalName	      Title
+hi def link cabalAuthor	      Normal
+hi def link cabalMaintainer   Normal
+hi def link cabalCategoryTitle Title
+hi def link cabalLicense      Normal
+hi def link cabalLicenseFile  Normal
+hi def link cabalBuildType    Keyword
+hi def link cabalVersion      Number
+hi def link cabalTruth        Boolean
+hi def link cabalComment      Comment
+hi def link cabalStatement    Statement
+hi def link cabalLanguage     Type
+hi def link cabalCategory     Type
+hi def link cabalFunction     Function
+hi def link cabalConditional  Conditional
+hi def link cabalOperator     Operator
+hi def link cabalVersionOperator Operator
+hi def link cabalCompiler     Constant
+
+let b:current_syntax = "cabal"
+
+let &cpo = s:cpo_save
+unlet! s:cpo_save
+
+" vim: ts=8
+
+endif
diff --git a/syntax/cabal.vim b/syntax/cabal.vim
index 7b9724bd5..6cbc36137 100644
--- a/syntax/cabal.vim
+++ b/syntax/cabal.vim
@@ -1,55 +1,3 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-
-" syntax highlighting for cabal
-"
-" author: raichoo (raichoo@googlemail.com)
-
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-syn match cabalLineComment "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contains=@Spell
-syn match cabalIdentifier "[A-Za-z\-]*" contained
-syn match cabalOperator "[<=>&|!]"
-syn match cabalColon ":" contained
-syn match cabalNumber "\<[0-9][0-9\.*]*\>"
-syn match cabalDelimiter "[,()]"
-syn keyword cabalBool True False
-syn keyword cabalConditional if else
-syn match cabalCompilerFlag "\s\+-[^ -][^ ]*"
-syn match cabalDocBulletPoint "^\s\+\*"
-syn match cabalDocHeadline "^\s\+=.*$"
-syn match cabalDocCode "^\s\+>.*$"
-syn match cabalDocNewline "^\s\+\.\s*$"
-syn match cabalSection "^\c\(executable\|library\|flag\|source-repository\|test-suite\|benchmark\)"
-syn match cabalEntry "^\s*[A-Za-z][a-zA-Z\-]*:" contains=cabalIdentifier,cabalColon
-
-syn region cabalDescription start="^\s*[dD]escription:" end="^\<" keepend
-  \ contains=
-  \ cabalEntry,
-  \ cabalLineComment,
-  \ cabalDocBulletPoint,
-  \ cabalDocHeadline,
-  \ cabalDocNewline,
-  \ cabalDocCode
-
-highlight def link cabalIdentifier Identifier
-highlight def link cabalLineComment Comment
-highlight def link cabalOperator Operator
-highlight def link cabalColon Operator
-highlight def link cabalNumber Number
-highlight def link cabalSection Structure
-highlight def link cabalDelimiter Delimiter
-highlight def link cabalBool Boolean
-highlight def link cabalCompilerFlag Macro
-highlight def link cabalConditional Conditional
-highlight def link cabalDocBulletPoint Structure
-highlight def link cabalDocHeadline Include
-highlight def link cabalDocNewline Operator
-highlight def link cabalDocCode Macro
-
-let b:current_syntax = "cabal"
-
-endif
+" Polyglot metafile
+source <sfile>:h/cabal-1.vim
+source <sfile>:h/cabal-2.vim
diff --git a/syntax/calendar.vim b/syntax/calendar.vim
new file mode 100644
index 000000000..c9b6c3488
--- /dev/null
+++ b/syntax/calendar.vim
@@ -0,0 +1,114 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'calendar') == -1
+
+" Vim syntax file
+" Language:             calendar(1) input file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword calendarTodo          contained TODO FIXME XXX NOTE
+
+syn region  calendarComment       start='/\*' end='\*/'
+                                  \ contains=calendarTodo,@Spell
+
+syn region  calendarCppString     start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl
+                                  \ end=+"+ end='$' contains=calendarSpecial
+syn match   calendarSpecial       display contained '\\\%(x\x\+\|\o\{1,3}\|.\|$\)'
+syn match   calendarSpecial       display contained "\\\(u\x\{4}\|U\x\{8}\)"
+
+syn region  calendarPreCondit     start='^\s*#\s*\%(if\|ifdef\|ifndef\|elif\)\>'
+                                  \ skip='\\$' end='$'
+                                  \ contains=calendarComment,calendarCppString
+syn match   calendarPreCondit     display '^\s*#\s*\%(else\|endif\)\>'
+syn region  calendarCppOut        start='^\s*#\s*if\s\+0\+' end='.\@=\|$'
+                                  \ contains=calendarCppOut2
+syn region  calendarCppOut2       contained start='0'
+                                  \ end='^\s*#\s*\%(endif\|else\|elif\)\>'
+                                  \ contains=calendarSpaceError,calendarCppSkip
+syn region  calendarCppSkip       contained
+                                  \ start='^\s*#\s*\%(if\|ifdef\|ifndef\)\>'
+                                  \ skip='\\$' end='^\s*#\s*endif\>'
+                                  \ contains=calendarSpaceError,calendarCppSkip
+syn region  calendarIncluded      display contained start=+"+ skip=+\\\\\|\\"+
+                                  \ end=+"+
+syn match   calendarIncluded      display contained '<[^>]*>'
+syn match   calendarInclude       display '^\s*#\s*include\>\s*["<]'
+                                  \ contains=calendarIncluded
+syn cluster calendarPreProcGroup  contains=calendarPreCondit,calendarIncluded,
+                                  \ calendarInclude,calendarDefine,
+                                  \ calendarCppOut,calendarCppOut2,
+                                  \ calendarCppSkip,calendarString,
+                                  \ calendarSpecial,calendarTodo
+syn region  calendarDefine        start='^\s*#\s*\%(define\|undef\)\>'
+                                  \ skip='\\$' end='$'
+                                  \ contains=ALLBUT,@calendarPreProcGroup
+syn region  calendarPreProc       start='^\s*#\s*\%(pragma\|line\|warning\|warn\|error\)\>'
+                                  \ skip='\\$' end='$' keepend
+                                  \ contains=ALLBUT,@calendarPreProcGroup
+
+syn keyword calendarKeyword       CHARSET BODUN LANG
+syn case ignore
+syn keyword calendarKeyword       Easter Pashka
+syn case match
+
+syn case ignore
+syn match   calendarNumber        display '\<\d\+\>'
+syn keyword calendarMonth         Jan[uary] Feb[ruary] Mar[ch] Apr[il] May
+                                  \ Jun[e] Jul[y] Aug[ust] Sep[tember]
+                                  \ Oct[ober] Nov[ember] Dec[ember]
+syn match   calendarMonth         display '\<\%(Jan\|Feb\|Mar\|Apr\|May\|Jun\|Jul\|Aug\|Sep\|Oct\|Nov\|Dec\)\.'
+syn keyword calendarWeekday       Mon[day] Tue[sday] Wed[nesday] Thu[rsday]
+syn keyword calendarWeekday       Fri[day] Sat[urday] Sun[day]
+syn match   calendarWeekday       display '\<\%(Mon\|Tue\|Wed\|Thu\|Fri\|Sat\|Sun\)\.'
+                                  \ nextgroup=calendarWeekdayMod
+syn match   calendarWeekdayMod    display '[+-]\d\+\>'
+syn case match
+
+syn match   calendarTime          display '\<\%([01]\=\d\|2[0-3]\):[0-5]\d\%(:[0-5]\d\)\='
+syn match   calendarTime          display '\<\%(0\=[1-9]\|1[0-2]\):[0-5]\d\%(:[0-5]\d\)\=\s*[AaPp][Mm]'
+
+syn match calendarVariable        '\*'
+
+if exists("c_minlines")
+  let b:c_minlines = c_minlines
+else
+  if !exists("c_no_if0")
+    let b:c_minlines = 50       " #if 0 constructs can be long
+  else
+    let b:c_minlines = 15       " mostly for () constructs
+  endif
+endif
+exec "syn sync ccomment calendarComment minlines=" . b:c_minlines
+
+hi def link calendarTodo          Todo
+hi def link calendarComment       Comment
+hi def link calendarCppString     String
+hi def link calendarSpecial       SpecialChar
+hi def link calendarPreCondit     PreCondit
+hi def link calendarCppOut        Comment
+hi def link calendarCppOut2       calendarCppOut
+hi def link calendarCppSkip       calendarCppOut
+hi def link calendarIncluded      String
+hi def link calendarInclude       Include
+hi def link calendarDefine        Macro
+hi def link calendarPreProc       PreProc
+hi def link calendarKeyword       Keyword
+hi def link calendarNumber        Number
+hi def link calendarMonth         String
+hi def link calendarWeekday       String
+hi def link calendarWeekdayMod    Special
+hi def link calendarTime          Number
+hi def link calendarVariable      Identifier
+
+let b:current_syntax = "calendar"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/catalog.vim b/syntax/catalog.vim
new file mode 100644
index 000000000..2efff8e37
--- /dev/null
+++ b/syntax/catalog.vim
@@ -0,0 +1,34 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'catalog') == -1
+
+" Vim syntax file
+" Language:	sgml catalog file
+" Maintainer:	Johannes Zellner <johannes@zellner.org>
+" Last Change:	Fr, 04 Nov 2005 12:46:45 CET
+" Filenames:	/etc/sgml.catalog
+" $Id: catalog.vim,v 1.2 2005/11/23 21:11:10 vimboss Exp $
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+" strings
+syn region  catalogString start=+"+ skip=+\\\\\|\\"+ end=+"+ keepend
+syn region  catalogString start=+'+ skip=+\\\\\|\\'+ end=+'+ keepend
+
+syn region  catalogComment      start=+--+   end=+--+ contains=catalogTodo
+syn keyword catalogTodo		TODO FIXME XXX NOTE contained
+syn keyword catalogKeyword	DOCTYPE OVERRIDE PUBLIC DTDDECL ENTITY CATALOG
+
+
+" The default highlighting.
+hi def link catalogString		     String
+hi def link catalogComment		     Comment
+hi def link catalogTodo			     Todo
+hi def link catalogKeyword		     Statement
+
+let b:current_syntax = "catalog"
+
+endif
diff --git a/syntax/cdl.vim b/syntax/cdl.vim
new file mode 100644
index 000000000..125029c66
--- /dev/null
+++ b/syntax/cdl.vim
@@ -0,0 +1,82 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdl') == -1
+
+" Vim syntax file
+" Language: Comshare Dimension Definition Language
+" Maintainer:	Raul Segura Acevedo <raulseguraaceved@netscape.net>
+" Last change:	2016 Sep 20
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+sy case ignore
+sy sync fromstart
+sy keyword	cdlStatement	dimension hierarchy group grouphierarchy schedule class
+sy keyword	cdlType		add update file category main altername removeall required notrequired
+sy keyword	cdlConditional	if then elseif else endif and or not cons rpt xlt
+sy keyword	cdlFunction	ChildOf IChildOf LeafChildOf DescendantOf IDescendantOf LeafDescendantOf MemberIs CountOf
+
+sy keyword	cdlIdentifier	contained id name desc description xlttype precision symbol curr_ name group_name rate_name
+sy keyword	cdlIdentifier	contained xcheck endbal accounttype natsign consolidate formula pctown usage periodicity
+sy match	cdlIdentifier	contained 'child\s*name'
+sy match	cdlIdentifier	contained 'parent\s*name'
+sy match	cdlIdentifier	contained 'grp\s*description'
+sy match	cdlIdentifier	contained 'grpchild\s*name'
+sy match	cdlIdentifier	contained 'grpparent\s*name'
+sy match	cdlIdentifier	contained 'preceding\s*member'
+sy match	cdlIdentifier	contained 'unit\s*name'
+sy match	cdlIdentifier	contained 'unit\s*id'
+sy match	cdlIdentifier	contained 'schedule\s*name'
+sy match	cdlIdentifier	contained 'schedule\s*id'
+
+sy match	cdlString	/\[[^]]*]/	contains=cdlRestricted,cdlNotSupported
+sy match	cdlRestricted	contained /[&*,_]/
+" not supported
+sy match	cdlNotSupported	contained /[:"!']/
+
+sy keyword	cdlTodo		contained TODO FIXME XXX
+sy cluster	cdlCommentGroup contains=cdlTodo
+sy match	cdlComment	'//.*' contains=@cdlCommentGroup
+sy region	cdlComment	start="/\*" end="\*/" contains=@cdlCommentGroup fold
+sy match	cdlCommentE	"\*/"
+
+sy region	cdlParen	transparent start='(' end=')' contains=ALLBUT,cdlParenE,cdlRestricted,cdlNotSupported
+"sy region	cdlParen	transparent start='(' end=')' contains=cdlIdentifier,cdlComment,cdlParenWordE
+sy match	cdlParenE	")"
+"sy match	cdlParenWordE	contained "\k\+"
+
+sy keyword	cdlFxType	allocation downfoot expr xltgain
+"sy keyword	cdlFxType	contained allocation downfoot expr xltgain
+"sy region	cdlFx		transparent start='\k\+(' end=')' contains=cdlConditional,cdlFunction,cdlString,cdlComment,cdlFxType
+
+set foldmethod=expr
+set foldexpr=(getline(v:lnum+1)=~'{'\|\|getline(v:lnum)=~'//\\s\\*\\{5}.*table')?'>1':1
+%foldo!
+set foldmethod=manual
+let b:match_words='\<if\>:\<then\>:\<elseif\>:\<else\>:\<endif\>'
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link cdlStatement	Statement
+hi def link cdlType		Type
+hi def link cdlFxType	Type
+hi def link cdlIdentifier	Identifier
+hi def link cdlString	String
+hi def link cdlRestricted	WarningMsg
+hi def link cdlNotSupported	ErrorMsg
+hi def link cdlTodo		Todo
+hi def link cdlComment	Comment
+hi def link cdlCommentE	ErrorMsg
+hi def link cdlParenE	ErrorMsg
+hi def link cdlParenWordE	ErrorMsg
+hi def link cdlFunction	Function
+hi def link cdlConditional	Conditional
+
+
+let b:current_syntax = "cdl"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/cdrdaoconf.vim b/syntax/cdrdaoconf.vim
new file mode 100644
index 000000000..dd90437a6
--- /dev/null
+++ b/syntax/cdrdaoconf.vim
@@ -0,0 +1,143 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdrdaoconf') == -1
+
+" Vim syntax file
+" Language:             cdrdao(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-09-02
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword cdrdaoconfTodo
+      \ TODO FIXME XXX NOTE
+
+syn match   cdrdaoconfBegin
+      \ display
+      \ nextgroup=@cdrdaoconfKeyword,cdrdaoconfComment
+      \ '^'
+
+syn cluster cdrdaoconfKeyword
+      \ contains=cdrdaoconfIntegerKeyword,
+      \          cdrdaoconfDriverKeyword,
+      \          cdrdaoconfDeviceKeyword,
+      \          cdrdaoconfPathKeyword
+
+syn keyword cdrdaoconfIntegerKeyword
+      \ contained
+      \ nextgroup=cdrdaoconfIntegerDelimiter
+      \ write_speed
+      \ write_buffers
+      \ user_capacity
+      \ full_burn
+      \ read_speed
+      \ cddb_timeout
+
+syn keyword cdrdaoconfIntegerKeyword
+      \ contained
+      \ nextgroup=cdrdaoconfParanoiaModeDelimiter
+      \ read_paranoia_mode
+
+syn keyword cdrdaoconfDriverKeyword
+      \ contained
+      \ nextgroup=cdrdaoconfDriverDelimiter
+      \ write_driver
+      \ read_driver
+
+syn keyword cdrdaoconfDeviceKeyword
+      \ contained
+      \ nextgroup=cdrdaoconfDeviceDelimiter
+      \ write_device
+      \ read_device
+
+syn keyword cdrdaoconfPathKeyword
+      \ contained
+      \ nextgroup=cdrdaoconfPathDelimiter
+      \ cddb_directory
+      \ tmp_file_dir
+
+syn match   cdrdaoconfIntegerDelimiter
+      \ contained
+      \ nextgroup=cdrdaoconfInteger
+      \ skipwhite
+      \ ':'
+
+syn match   cdrdaoconfParanoiaModeDelimiter
+      \ contained
+      \ nextgroup=cdrdaoconfParanoiaMode
+      \ skipwhite
+      \ ':'
+
+syn match   cdrdaoconfDriverDelimiter
+      \ contained
+      \ nextgroup=cdrdaoconfDriver
+      \ skipwhite
+      \ ':'
+
+syn match   cdrdaoconfDeviceDelimiter
+      \ contained
+      \ nextgroup=cdrdaoconfDevice
+      \ skipwhite
+      \ ':'
+
+syn match   cdrdaoconfPathDelimiter
+      \ contained
+      \ nextgroup=cdrdaoconfPath
+      \ skipwhite
+      \ ':'
+
+syn match   cdrdaoconfInteger
+      \ contained
+      \ '\<\d\+\>'
+
+syn match   cdrdaoParanoiaMode
+      \ contained
+      \ '[0123]'
+
+syn match   cdrdaoconfDriver
+      \ contained
+      \ '\<\(cdd2600\|generic-mmc\%(-raw\)\=\|plextor\%(-scan\)\|ricoh-mp6200\|sony-cdu9\%(20\|48\)\|taiyo-yuden\|teac-cdr55\|toshiba\|yamaha-cdr10x\)\>'
+
+syn region  cdrdaoconfDevice
+      \ contained
+      \ matchgroup=cdrdaoconfDevice
+      \ start=+"+
+      \ end=+"+
+
+syn region  cdrdaoconfPath
+      \ contained
+      \ matchgroup=cdrdaoconfPath
+      \ start=+"+
+      \ end=+"+
+
+syn match   cdrdaoconfComment
+      \ contains=cdrdaoconfTodo,@Spell
+      \ '^.*#.*$'
+
+hi def link cdrdaoconfTodo              Todo
+hi def link cdrdaoconfComment           Comment
+hi def link cdrdaoconfKeyword           Keyword
+hi def link cdrdaoconfIntegerKeyword    cdrdaoconfKeyword
+hi def link cdrdaoconfDriverKeyword     cdrdaoconfKeyword
+hi def link cdrdaoconfDeviceKeyword     cdrdaoconfKeyword
+hi def link cdrdaoconfPathKeyword       cdrdaoconfKeyword
+hi def link cdrdaoconfDelimiter         Delimiter
+hi def link cdrdaoconfIntegerDelimiter  cdrdaoconfDelimiter
+hi def link cdrdaoconfDriverDelimiter   cdrdaoconfDelimiter
+hi def link cdrdaoconfDeviceDelimiter   cdrdaoconfDelimiter
+hi def link cdrdaoconfPathDelimiter     cdrdaoconfDelimiter
+hi def link cdrdaoconfInteger           Number
+hi def link cdrdaoconfParanoiaMode      Number
+hi def link cdrdaoconfDriver            Identifier
+hi def link cdrdaoconfDevice            cdrdaoconfPath
+hi def link cdrdaoconfPath              String
+
+let b:current_syntax = "cdrdaoconf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/cdrtoc.vim b/syntax/cdrtoc.vim
new file mode 100644
index 000000000..2dc80fb35
--- /dev/null
+++ b/syntax/cdrtoc.vim
@@ -0,0 +1,541 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdrtoc') == -1
+
+" Vim syntax file
+" Language:             cdrdao(1) TOC file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-05-10
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword cdrtocTodo
+      \ contained
+      \ TODO
+      \ FIXME
+      \ XXX
+      \ NOTE
+
+syn cluster cdrtocCommentContents
+      \ contains=
+      \   cdrtocTodo,
+      \   @Spell
+
+syn cluster cdrtocHeaderFollowsInitial
+      \ contains=
+      \   cdrtocHeaderCommentInitial,
+      \   cdrtocHeaderCatalog,
+      \   cdrtocHeaderTOCType,
+      \   cdrtocHeaderCDText,
+      \   cdrtocTrack
+
+syn match   cdrtocHeaderBegin
+      \ nextgroup=@cdrtocHeaderFollowsInitial
+      \ skipwhite skipempty
+      \ '\%^'
+
+let s:mmssff_pattern = '\%([0-5]\d\|\d\):\%([0-5]\d\|\d\):\%([0-6]\d\|7[0-5]\|\d\)\>'
+let s:byte_pattern = '\<\%([01]\=\d\{1,2}\|2\%([0-4]\d\|5[0-5]\)\)\>'
+let s:length_pattern = '\%(\%([0-5]\d\|\d\):\%([0-5]\d\|\d\):\%([0-6]\d\|7[0-5]\|\d\)\|\d\+\)\>'
+
+function s:def_comment(name, nextgroup)
+  execute 'syn match' a:name
+        \ 'nextgroup=' . a:nextgroup . ',' . a:name
+        \ 'skipwhite skipempty'
+        \ 'contains=@cdrtocCommentContents'
+        \ 'contained'
+        \ "'//.*$'"
+  execute 'hi def link' a:name 'cdrtocComment'
+endfunction
+
+function s:def_keywords(name, nextgroup, keywords)
+  let comment_group = a:name . 'FollowComment'
+  execute 'syn keyword' a:name
+        \ 'nextgroup=' . a:nextgroup . ',' . comment_group
+        \ 'skipwhite skipempty'
+        \ 'contained'
+        \ join(a:keywords)
+
+  call s:def_comment(comment_group, a:nextgroup)
+endfunction
+
+function s:def_keyword(name, nextgroup, keyword)
+  call s:def_keywords(a:name, a:nextgroup, [a:keyword])
+endfunction
+
+" NOTE: Pattern needs to escape any “@”s.
+function s:def_match(name, nextgroup, pattern)
+  let comment_group = a:name . 'FollowComment'
+  execute 'syn match' a:name
+        \ 'nextgroup=' . a:nextgroup . ',' . comment_group
+        \ 'skipwhite skipempty'
+        \ 'contained'
+        \ '@' . a:pattern . '@'
+
+  call s:def_comment(comment_group, a:nextgroup)
+endfunction
+
+function s:def_region(name, nextgroup, start, skip, end, matchgroup, contains)
+  let comment_group = a:name . 'FollowComment'
+  execute 'syn region' a:name
+        \ 'nextgroup=' . a:nextgroup . ',' . comment_group
+        \ 'skipwhite skipempty'
+        \ 'contained'
+        \ 'matchgroup=' . a:matchgroup
+        \ 'contains=' . a:contains
+        \ 'start=@' . a:start . '@'
+        \ (a:skip != "" ? ('skip=@' . a:skip . '@') : "")
+        \ 'end=@' . a:end . '@'
+
+  call s:def_comment(comment_group, a:nextgroup)
+endfunction
+
+call s:def_comment('cdrtocHeaderCommentInitial', '@cdrtocHeaderFollowsInitial')
+
+call s:def_keyword('cdrtocHeaderCatalog', 'cdrtocHeaderCatalogNumber', 'CATALOG')
+
+call s:def_match('cdrtocHeaderCatalogNumber', '@cdrtocHeaderFollowsInitial', '"\d\{13\}"')
+
+call s:def_keywords('cdrtocHeaderTOCType', '@cdrtocHeaderFollowsInitial', ['CD_DA', 'CD_ROM', 'CD_ROM_XA'])
+
+call s:def_keyword('cdrtocHeaderCDText', 'cdrtocHeaderCDTextStart', 'CD_TEXT')
+
+" TODO: Actually, language maps aren’t required by TocParser.g, but let’s keep
+" things simple (and in agreement with what the manual page says).
+call s:def_match('cdrtocHeaderCDTextStart', 'cdrtocHeaderCDTextLanguageMap', '{')
+
+call s:def_keyword('cdrtocHeaderCDTextLanguageMap', 'cdrtocHeaderLanguageMapStart', 'LANGUAGE_MAP')
+
+call s:def_match('cdrtocHeaderLanguageMapStart', 'cdrtocHeaderLanguageMapLanguageNumber', '{')
+
+call s:def_match('cdrtocHeaderLanguageMapLanguageNumber', 'cdrtocHeaderLanguageMapColon', '\<[0-7]\>')
+
+call s:def_match('cdrtocHeaderLanguageMapColon', 'cdrtocHeaderLanguageMapCountryCode,cdrtocHeaderLanguageMapCountryCodeName', ':')
+
+syn cluster cdrtocHeaderLanguageMapCountryCodeFollow
+      \ contains=
+      \   cdrtocHeaderLanguageMapLanguageNumber,
+      \   cdrtocHeaderLanguageMapEnd
+
+call s:def_match('cdrtocHeaderLanguageMapCountryCode',
+               \ '@cdrtocHeaderLanguageMapCountryCodeFollow',
+               \ s:byte_pattern)
+
+call s:def_keyword('cdrtocHeaderLanguageMapCountryCodeName',
+                 \ '@cdrtocHeaderLanguageMapCountryCodeFollow',
+                 \ 'EN')
+
+call s:def_match('cdrtocHeaderLanguageMapEnd',
+               \ 'cdrtocHeaderLanguage,cdrtocHeaderCDTextEnd',
+               \ '}')
+
+call s:def_keyword('cdrtocHeaderLanguage', 'cdrtocHeaderLanguageNumber', 'LANGUAGE')
+
+call s:def_match('cdrtocHeaderLanguageNumber', 'cdrtocHeaderLanguageStart', '\<[0-7]\>')
+
+call s:def_match('cdrtocHeaderLanguageStart',
+               \ 'cdrtocHeaderCDTextItem,cdrtocHeaderLanguageEnd',
+               \ '{')
+
+syn cluster cdrtocHeaderCDTextData
+      \ contains=
+      \   cdrtocHeaderCDTextDataString,
+      \   cdrtocHeaderCDTextDataBinaryStart
+
+call s:def_keywords('cdrtocHeaderCDTextItem',
+                  \ '@cdrtocHeaderCDTextData',
+                  \ ['TITLE', 'PERFORMER', 'SONGWRITER', 'COMPOSER',
+                  \  'ARRANGER', 'MESSAGE', 'DISC_ID', 'GENRE', 'TOC_INFO1',
+                  \  'TOC_INFO2', 'UPC_EAN', 'ISRC', 'SIZE_INFO'])
+
+call s:def_region('cdrtocHeaderCDTextDataString',
+                \ 'cdrtocHeaderCDTextItem,cdrtocHeaderLanguageEnd',
+                \ '"',
+                \ '\\\\\|\\"',
+                \ '"',
+                \ 'cdrtocHeaderCDTextDataStringDelimiters',
+                \ 'cdrtocHeaderCDTextDataStringSpecialChar')
+
+syn match   cdrtocHeaderCDTextDataStringSpecialChar
+      \ contained
+      \ display
+      \ '\\\%(\o\o\o\|["\\]\)'
+
+call s:def_match('cdrtocHeaderCDTextDataBinaryStart',
+               \ 'cdrtocHeaderCDTextDataBinaryInteger',
+               \ '{')
+
+call s:def_match('cdrtocHeaderCDTextDataBinaryInteger',
+               \ 'cdrtocHeaderCDTextDataBinarySeparator,cdrtocHeaderCDTextDataBinaryEnd',
+               \ s:byte_pattern)
+
+call s:def_match('cdrtocHeaderCDTextDataBinarySeparator',
+               \ 'cdrtocHeaderCDTextDataBinaryInteger',
+               \ ',')
+
+call s:def_match('cdrtocHeaderCDTextDataBinaryEnd',
+               \ 'cdrtocHeaderCDTextItem,cdrtocHeaderLanguageEnd',
+               \ '}')
+
+call s:def_match('cdrtocHeaderLanguageEnd',
+               \ 'cdrtocHeaderLanguage,cdrtocHeaderCDTextEnd',
+               \ '}')
+
+call s:def_match('cdrtocHeaderCDTextEnd',
+               \ 'cdrtocTrack',
+               \ '}')
+
+syn cluster cdrtocTrackFollow
+      \ contains=
+      \   @cdrtocTrackFlags,
+      \   cdrtocTrackCDText,
+      \   cdrtocTrackPregap,
+      \   @cdrtocTrackContents
+
+call s:def_keyword('cdrtocTrack', 'cdrtocTrackMode', 'TRACK')
+
+call s:def_keywords('cdrtocTrackMode',
+                  \ 'cdrtocTrackSubChannelMode,@cdrtocTrackFollow',
+                  \ ['AUDIO', 'MODE1', 'MODE1_RAW', 'MODE2', 'MODE2_FORM1',
+                  \  'MODE2_FORM2', 'MODE2_FORM_MIX', 'MODE2_RAW'])
+
+call s:def_keywords('cdrtocTrackSubChannelMode',
+                  \ '@cdrtocTrackFollow',
+                  \ ['RW', 'RW_RAW'])
+
+syn cluster cdrtocTrackFlags
+      \ contains=
+      \   cdrtocTrackFlagNo,
+      \   cdrtocTrackFlagCopy,
+      \   cdrtocTrackFlagPreEmphasis,
+      \   cdrtocTrackFlag
+
+call s:def_keyword('cdrtocTrackFlagNo',
+                 \ 'cdrtocTrackFlagCopy,cdrtocTrackFlagPreEmphasis',
+                 \ 'NO')
+
+call s:def_keyword('cdrtocTrackFlagCopy', '@cdrtocTrackFollow', 'COPY')
+
+call s:def_keyword('cdrtocTrackFlagPreEmphasis', '@cdrtocTrackFollow', 'PRE_EMPHASIS')
+
+call s:def_keywords('cdrtocTrackFlag',
+                  \ '@cdrtocTrackFollow',
+                  \ ['TWO_CHANNEL_AUDIO', 'FOUR_CHANNEL_AUDIO'])
+
+call s:def_keyword('cdrtocTrackFlag', 'cdrtocTrackISRC', 'ISRC')
+
+call s:def_match('cdrtocTrackISRC',
+               \ '@cdrtocTrackFollow',
+               \ '"[[:upper:][:digit:]]\{5}\d\{7}"')
+
+call s:def_keyword('cdrtocTrackCDText', 'cdrtocTrackCDTextStart', 'CD_TEXT')
+
+call s:def_match('cdrtocTrackCDTextStart', 'cdrtocTrackCDTextLanguage', '{')
+
+call s:def_keyword('cdrtocTrackCDTextLanguage', 'cdrtocTrackCDTextLanguageNumber', 'LANGUAGE')
+
+call s:def_match('cdrtocTrackCDTextLanguageNumber', 'cdrtocTrackCDTextLanguageStart', '\<[0-7]\>')
+
+call s:def_match('cdrtocTrackCDTextLanguageStart',
+               \ 'cdrtocTrackCDTextItem,cdrtocTrackCDTextLanguageEnd',
+               \ '{')
+
+syn cluster cdrtocTrackCDTextData
+      \ contains=
+      \   cdrtocTrackCDTextDataString,
+      \   cdrtocTrackCDTextDataBinaryStart
+
+call s:def_keywords('cdrtocTrackCDTextItem',
+                  \ '@cdrtocTrackCDTextData',
+                  \ ['TITLE', 'PERFORMER', 'SONGWRITER', 'COMPOSER', 'ARRANGER',
+                  \  'MESSAGE', 'ISRC'])
+
+call s:def_region('cdrtocTrackCDTextDataString',
+                \ 'cdrtocTrackCDTextItem,cdrtocTrackCDTextLanguageEnd',
+                \ '"',
+                \ '\\\\\|\\"',
+                \ '"',
+                \ 'cdrtocTrackCDTextDataStringDelimiters',
+                \ 'cdrtocTrackCDTextDataStringSpecialChar')
+
+syn match   cdrtocTrackCDTextDataStringSpecialChar
+      \ contained
+      \ display
+      \ '\\\%(\o\o\o\|["\\]\)'
+
+call s:def_match('cdrtocTrackCDTextDataBinaryStart',
+               \ 'cdrtocTrackCDTextDataBinaryInteger',
+               \ '{')
+
+call s:def_match('cdrtocTrackCDTextDataBinaryInteger',
+               \ 'cdrtocTrackCDTextDataBinarySeparator,cdrtocTrackCDTextDataBinaryEnd',
+               \ s:byte_pattern)
+
+call s:def_match('cdrtocTrackCDTextDataBinarySeparator',
+               \ 'cdrtocTrackCDTextDataBinaryInteger',
+               \ ',')
+
+call s:def_match('cdrtocTrackCDTextDataBinaryEnd',
+               \ 'cdrtocTrackCDTextItem,cdrtocTrackCDTextLanguageEnd',
+               \ '}')
+
+call s:def_match('cdrtocTrackCDTextLanguageEnd',
+               \ 'cdrtocTrackCDTextLanguage,cdrtocTrackCDTextEnd',
+               \ '}')
+
+call s:def_match('cdrtocTrackCDTextEnd',
+               \ 'cdrtocTrackPregap,@cdrtocTrackContents',
+               \ '}')
+
+call s:def_keyword('cdrtocTrackPregap', 'cdrtocTrackPregapMMSSFF', 'PREGAP')
+
+call s:def_match('cdrtocTrackPregapMMSSFF',
+               \ '@cdrtocTrackContents',
+               \ s:mmssff_pattern)
+
+syn cluster cdrtocTrackContents
+      \ contains=
+      \   cdrtocTrackSubTrack,
+      \   cdrtocTrackMarker
+
+syn cluster cdrtocTrackContentsFollow
+      \ contains=
+      \   @cdrtocTrackContents,
+      \   cdrtocTrackIndex,
+      \   cdrtocTrack
+
+call s:def_keywords('cdrtocTrackSubTrack',
+                  \ 'cdrtocTrackSubTrackFileFilename',
+                  \ ['FILE', 'AUDIOFILE'])
+
+call s:def_region('cdrtocTrackSubTrackFileFilename',
+                \ 'cdrtocTrackSubTrackFileStart',
+                \ '"',
+                \ '\\\\\|\\"',
+                \ '"',
+                \ 'cdrtocTrackSubTrackFileFilenameDelimiters',
+                \ 'cdrtocTrackSubTrackFileFilenameSpecialChar')
+
+syn match   cdrtocTrackSubTrackFileFilenameSpecialChar
+      \ contained
+      \ display
+      \ '\\\%(\o\o\o\|["\\]\)'
+
+call s:def_match('cdrtocTrackSubTrackFileStart',
+               \ 'cdrtocTrackSubTrackFileLength,@cdrtocTrackContentsFollow',
+               \ s:length_pattern)
+
+call s:def_match('cdrtocTrackSubTrackFileLength',
+               \ '@cdrtocTrackContentsFollow',
+               \ s:length_pattern)
+
+call s:def_keyword('cdrtocTrackSubTrack', 'cdrtocTrackContentDatafileFilename', 'DATAFILE')
+
+call s:def_region('cdrtocTrackSubTrackDatafileFilename',
+                \ 'cdrtocTrackSubTrackDatafileLength',
+                \ '"',
+                \ '\\\\\|\\"',
+                \ '"',
+                \ 'cdrtocTrackSubTrackDatafileFilenameDelimiters',
+                \ 'cdrtocTrackSubTrackDatafileFilenameSpecialChar')
+
+syn match   cdrtocTrackSubTrackdatafileFilenameSpecialChar
+      \ contained
+      \ display
+      \ '\\\%(\o\o\o\|["\\]\)'
+
+call s:def_match('cdrtocTrackDatafileLength',
+               \ '@cdrtocTrackContentsFollow',
+               \ s:length_pattern)
+
+call s:def_keyword('cdrtocTrackSubTrack', 'cdrtocTrackContentFifoFilename', 'DATAFILE')
+
+call s:def_region('cdrtocTrackSubTrackFifoFilename',
+                \ 'cdrtocTrackSubTrackFifoLength',
+                \ '"',
+                \ '\\\\\|\\"',
+                \ '"',
+                \ 'cdrtocTrackSubTrackFifoFilenameDelimiters',
+                \ 'cdrtocTrackSubTrackFifoFilenameSpecialChar')
+
+syn match   cdrtocTrackSubTrackdatafileFilenameSpecialChar
+      \ contained
+      \ display
+      \ '\\\%(\o\o\o\|["\\]\)'
+
+call s:def_match('cdrtocTrackFifoLength',
+               \ '@cdrtocTrackContentsFollow',
+               \ s:length_pattern)
+
+call s:def_keyword('cdrtocTrackSubTrack', 'cdrtocTrackSilenceLength', 'SILENCE')
+
+call s:def_match('cdrtocTrackSilenceLength',
+               \ '@cdrtocTrackContentsFollow',
+               \ s:length_pattern)
+
+call s:def_keyword('cdrtocTrackSubTrack',
+                 \ 'cdrtocTrackSubTrackZeroDataMode,' .
+                 \ 'cdrtocTrackSubTrackZeroDataSubChannelMode,' .
+                 \ 'cdrtocTrackSubTrackZeroDataLength',
+                 \ 'ZERO')
+
+call s:def_keywords('cdrtocTrackSubTrackZeroDataMode',
+                  \ 'cdrtocTrackSubTrackZeroSubChannelMode,cdrtocTrackSubTrackZeroDataLength',
+                  \ ['AUDIO', 'MODE1', 'MODE1_RAW', 'MODE2', 'MODE2_FORM1',
+                  \  'MODE2_FORM2', 'MODE2_FORM_MIX', 'MODE2_RAW'])
+
+call s:def_keywords('cdrtocTrackSubTrackZeroDataSubChannelMode',
+                  \ 'cdrtocTrackSubTrackZeroDataLength',
+                  \ ['RW', 'RW_RAW'])
+
+call s:def_match('cdrtocTrackSubTrackZeroDataLength',
+               \ '@cdrtocTrackContentsFollow',
+               \ s:length_pattern)
+
+call s:def_keyword('cdrtocTrackMarker',
+                 \ '@cdrtocTrackContentsFollow,cdrtocTrackMarkerStartMMSSFF',
+                 \ 'START')
+
+call s:def_match('cdrtocTrackMarkerStartMMSSFF',
+               \ '@cdrtocTrackContentsFollow',
+               \ s:mmssff_pattern)
+
+call s:def_keyword('cdrtocTrackMarker',
+                 \ '@cdrtocTrackContentsFollow,cdrtocTrackMarkerEndMMSSFF',
+                 \ 'END')
+
+call s:def_match('cdrtocTrackMarkerEndMMSSFF',
+               \ '@cdrtocTrackContentsFollow',
+               \ s:mmssff_pattern)
+
+call s:def_keyword('cdrtocTrackIndex', 'cdrtocTrackIndexMMSSFF', 'INDEX')
+
+call s:def_match('cdrtocTrackIndexMMSSFF',
+               \ 'cdrtocTrackIndex,cdrtocTrack',
+               \ s:mmssff_pattern)
+
+delfunction s:def_region
+delfunction s:def_match
+delfunction s:def_keyword
+delfunction s:def_keywords
+delfunction s:def_comment
+
+syn sync fromstart
+
+hi def link cdrtocKeyword                                  Keyword
+hi def link cdrtocHeaderKeyword                            cdrtocKeyword
+hi def link cdrtocHeaderCDText                             cdrtocHeaderKeyword
+hi def link cdrtocDelimiter                                Delimiter
+hi def link cdrtocCDTextDataBinaryEnd                      cdrtocDelimiter
+hi def link cdrtocHeaderCDTextDataBinaryEnd                cdrtocHeaderCDTextDataBinaryEnd
+hi def link cdrtocNumber                                   Number
+hi def link cdrtocCDTextDataBinaryInteger                  cdrtocNumber
+hi def link cdrtocHeaderCDTextDataBinaryInteger            cdrtocCDTextDataBinaryInteger
+hi def link cdrtocCDTextDataBinarySeparator                cdrtocDelimiter
+hi def link cdrtocHeaderCDTextDataBinarySeparator          cdrtocCDTextDataBinarySeparator
+hi def link cdrtocCDTextDataBinaryStart                    cdrtocDelimiter
+hi def link cdrtocHeaderCDTextDataBinaryStart              cdrtocCDTextDataBinaryStart
+hi def link cdrtocString                                   String
+hi def link cdrtocCDTextDataString                         cdrtocString
+hi def link cdrtocHeaderCDTextDataString                   cdrtocCDTextDataString
+hi def link cdrtocCDTextDataStringDelimiters               cdrtocDelimiter
+hi def link cdrtocHeaderCDTextDataStringDelimiters         cdrtocCDTextDataStringDelimiters
+hi def link cdrtocCDTextDataStringSpecialChar              SpecialChar
+hi def link cdrtocHeaderCDTextDataStringSpecialChar        cdrtocCDTextDataStringSpecialChar
+hi def link cdrtocCDTextEnd                                cdrtocDelimiter
+hi def link cdrtocHeaderCDTextEnd                          cdrtocCDTextEnd
+hi def link cdrtocType                                     Type
+hi def link cdrtocCDTextItem                               cdrtocType
+hi def link cdrtocHeaderCDTextItem                         cdrtocCDTextItem
+hi def link cdrtocHeaderCDTextLanguageMap                  cdrtocHeaderKeyword
+hi def link cdrtocCDTextStart                              cdrtocDelimiter
+hi def link cdrtocHeaderCDTextStart                        cdrtocCDTextStart
+hi def link cdrtocHeaderCatalog                            cdrtocHeaderKeyword
+hi def link cdrtocHeaderCatalogNumber                      cdrtocString
+hi def link cdrtocComment                                  Comment
+hi def link cdrtocHeaderCommentInitial                     cdrtocComment
+hi def link cdrtocHeaderLanguage                           cdrtocKeyword
+hi def link cdrtocLanguageEnd                              cdrtocDelimiter
+hi def link cdrtocHeaderLanguageEnd                        cdrtocLanguageEnd
+hi def link cdrtocHeaderLanguageMapColon                   cdrtocDelimiter
+hi def link cdrtocIdentifier                               Identifier
+hi def link cdrtocHeaderLanguageMapCountryCode             cdrtocNumber
+hi def link cdrtocHeaderLanguageMapCountryCodeName         cdrtocIdentifier
+hi def link cdrtocHeaderLanguageMapEnd                     cdrtocDelimiter
+hi def link cdrtocHeaderLanguageMapLanguageNumber          cdrtocNumber
+hi def link cdrtocHeaderLanguageMapStart                   cdrtocDelimiter
+hi def link cdrtocLanguageNumber                           cdrtocNumber
+hi def link cdrtocHeaderLanguageNumber                     cdrtocLanguageNumber
+hi def link cdrtocLanguageStart                            cdrtocDelimiter
+hi def link cdrtocHeaderLanguageStart                      cdrtocLanguageStart
+hi def link cdrtocHeaderTOCType                            cdrtocType
+hi def link cdrtocTodo                                     Todo
+hi def link cdrtocTrackKeyword                             cdrtocKeyword
+hi def link cdrtocTrack                                    cdrtocTrackKeyword
+hi def link cdrtocTrackCDText                              cdrtocTrackKeyword
+hi def link cdrtocTrackCDTextDataBinaryEnd                 cdrtocHeaderCDTextDataBinaryEnd
+hi def link cdrtocTrackCDTextDataBinaryInteger             cdrtocHeaderCDTextDataBinaryInteger
+hi def link cdrtocTrackCDTextDataBinarySeparator           cdrtocHeaderCDTextDataBinarySeparator
+hi def link cdrtocTrackCDTextDataBinaryStart               cdrtocHeaderCDTextDataBinaryStart
+hi def link cdrtocTrackCDTextDataString                    cdrtocHeaderCDTextDataString
+hi def link cdrtocTrackCDTextDataStringDelimiters          cdrtocCDTextDataStringDelimiters
+hi def link cdrtocTrackCDTextDataStringSpecialChar         cdrtocCDTextDataStringSpecialChar
+hi def link cdrtocTrackCDTextEnd                           cdrtocCDTextEnd
+hi def link cdrtocTrackCDTextItem                          cdrtocCDTextItem
+hi def link cdrtocTrackCDTextStart                         cdrtocCDTextStart
+hi def link cdrtocLength                                   cdrtocNumber
+hi def link cdrtocTrackDatafileLength                      cdrtocLength
+hi def link cdrtocTrackFifoLength                          cdrtocLength
+hi def link cdrtocPreProc                                  PreProc
+hi def link cdrtocTrackFlag                                cdrtocPreProc
+hi def link cdrtocTrackFlagCopy                            cdrtocTrackFlag
+hi def link cdrtocSpecial                                  Special
+hi def link cdrtocTrackFlagNo                              cdrtocSpecial
+hi def link cdrtocTrackFlagPreEmphasis                     cdrtocTrackFlag
+hi def link cdrtocTrackISRC                                cdrtocTrackFlag
+hi def link cdrtocTrackIndex                               cdrtocTrackKeyword
+hi def link cdrtocMMSSFF                                   cdrtocLength
+hi def link cdrtocTrackIndexMMSSFF                         cdrtocMMSSFF
+hi def link cdrtocTrackCDTextLanguage                      cdrtocTrackKeyword
+hi def link cdrtocTrackCDTextLanguageEnd                   cdrtocLanguageEnd
+hi def link cdrtocTrackCDTextLanguageNumber                cdrtocLanguageNumber
+hi def link cdrtocTrackCDTextLanguageStart                 cdrtocLanguageStart
+hi def link cdrtocTrackContents                            StorageClass
+hi def link cdrtocTrackMarker                              cdrtocTrackContents
+hi def link cdrtocTrackMarkerEndMMSSFF                     cdrtocMMSSFF
+hi def link cdrtocTrackMarkerStartMMSSFF                   cdrtocMMSSFF
+hi def link cdrtocTrackMode                                Type
+hi def link cdrtocTrackPregap                              cdrtocTrackContents
+hi def link cdrtocTrackPregapMMSSFF                        cdrtocMMSSFF
+hi def link cdrtocTrackSilenceLength                       cdrtocLength
+hi def link cdrtocTrackSubChannelMode                      cdrtocPreProc
+hi def link cdrtocTrackSubTrack                            cdrtocTrackContents
+hi def link cdrtocFilename                                 cdrtocString
+hi def link cdrtocTrackSubTrackDatafileFilename            cdrtocFilename
+hi def link cdrtocTrackSubTrackDatafileFilenameDelimiters  cdrtocTrackSubTrackDatafileFilename
+hi def link cdrtocSpecialChar                              SpecialChar
+hi def link cdrtocTrackSubTrackDatafileFilenameSpecialChar cdrtocSpecialChar
+hi def link cdrtocTrackSubTrackDatafileLength              cdrtocLength
+hi def link cdrtocTrackSubTrackFifoFilename                cdrtocFilename
+hi def link cdrtocTrackSubTrackFifoFilenameDelimiters      cdrtocTrackSubTrackFifoFilename
+hi def link cdrtocTrackSubTrackFifoFilenameSpecialChar     cdrtocSpecialChar
+hi def link cdrtocTrackSubTrackFifoLength                  cdrtocLength
+hi def link cdrtocTrackSubTrackFileFilename                cdrtocFilename
+hi def link cdrtocTrackSubTrackFileFilenameDelimiters      cdrtocTrackSubTrackFileFilename
+hi def link cdrtocTrackSubTrackFileFilenameSpecialChar     cdrtocSpecialChar
+hi def link cdrtocTrackSubTrackFileLength                  cdrtocLength
+hi def link cdrtocTrackSubTrackFileStart                   cdrtocLength
+hi def link cdrtocTrackSubTrackZeroDataLength              cdrtocLength
+hi def link cdrtocTrackSubTrackZeroDataMode                Type
+hi def link cdrtocTrackSubTrackZeroDataSubChannelMode      cdrtocPreProc
+hi def link cdrtocTrackSubTrackdatafileFilenameSpecialChar cdrtocSpecialChar
+
+let b:current_syntax = "cdrtoc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/cf.vim b/syntax/cf.vim
new file mode 100644
index 000000000..591f8c526
--- /dev/null
+++ b/syntax/cf.vim
@@ -0,0 +1,1022 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cf') == -1
+
+" Vim syntax file
+"
+" Language:     CFML (ColdFusion)
+" Author:       Ernst M. van der Linden <ernst.vanderlinden@ernestoz.com>
+" License:      The MIT License (MIT)
+"
+" Maintainer:   Ernst M. van der Linden <ernst.vanderlinden@ernestoz.com>
+" URL:          https://github.com/ernstvanderlinden/vim-coldfusion
+" Last Change:  2017 Nov 28
+"
+" Filenames:    *.cfc *.cfm
+
+" Quit when a syntax file was already loaded.
+if exists("b:current_syntax")
+  finish
+endif
+
+" Using line continuation here.
+let s:cpo_save=&cpo
+set cpo-=C
+
+sy sync fromstart
+" 20171126: disabled as we have fast computers now.
+"sy sync maxlines=2000
+sy case ignore
+
+" INCLUDES {{{
+sy include @sqlSyntax $VIMRUNTIME/syntax/sql.vim
+" 20161010: Disabled include html highlighting as it contains huge keywords
+" regex, so it will have impact on performance.  Use own simple SGML tag
+" coloring instead.
+"runtime! syntax/html.vim
+" / INCLUDES }}}
+
+" NUMBER {{{
+sy match cfmlNumber
+    \ "\v<\d+>"
+" / NUMBER }}}
+
+" EQUAL SIGN {{{
+sy match cfmlEqualSign
+    \ "\v\="
+" / EQUAL SIGN }}}
+
+" BOOLEAN {{{
+sy match cfmlBoolean
+    \ "\v<(true|false)>"
+" / BOOLEAN }}}
+
+" HASH SURROUNDED {{{
+sy region cfmlHashSurround
+  \ keepend
+  \ oneline
+  \ start="#"
+  \ end="#"
+  \ skip="##"
+    \ contains=
+      \@cfmlOperator,
+      \@cfmlPunctuation,
+      \cfmlBoolean,
+      \cfmlCoreKeyword,
+      \cfmlCoreScope,
+      \cfmlCustomKeyword,
+      \cfmlCustomScope,
+      \cfmlEqualSign,
+      \cfmlFunctionName,
+      \cfmlNumber
+" / HASH SURROUNDED }}}
+
+" OPERATOR {{{
+
+" OPERATOR - ARITHMETIC {{{
+" +7 -7
+" ++i --i
+" i++ i--
+" + - * / %
+" += -= *= /= %=
+" ^ mod
+sy match cfmlArithmeticOperator
+  \ "\v
+  \(\+|-)\ze\d
+  \|(\+\+|--)\ze\w
+  \|\w\zs(\+\+|--)
+  \|(\s(
+  \(\+|-|\*|\/|\%){1}\={,1}
+  \|\^
+  \|mod
+  \)\s)
+  \"
+" / OPERATOR - ARITHMETIC }}}
+
+" OPERATOR - BOOLEAN {{{
+" not and or xor eqv imp
+" ! && ||
+sy match cfmlBooleanOperator
+  \ "\v\s
+  \(not|and|or|xor|eqv|imp
+  \|\!|\&\&|\|\|
+  \)(\s|\))
+  \|\s\!\ze\w
+  \"
+" / OPERATOR - BOOLEAN }}}
+
+" OPERATOR - DECISION {{{
+"is|equal|eq
+"is not|not equal|neq
+"contains|does not contain
+"greater than|gt
+"less than|lt
+"greater than or equal to|gte|ge
+"less than or equal to|lte|le
+"==|!=|>|<|>=|<=
+sy match cfmlDecisionOperator
+  \ "\v\s
+  \(is|equal|eq
+  \|is not|not equal|neq
+  \|contains|does not contain
+  \|greater than|gt
+  \|less than|lt
+  \|greater than or equal to|gte|ge
+  \|less than or equal to|lte|le
+  \|(!|\<|\>|\=){1}\=
+  \|\<
+  \|\>
+  \)\s"
+" / OPERATOR - DECISION }}}
+
+" OPERATOR - STRING {{{
+" &
+" &=
+sy match cfmlStringOperator
+    \ "\v\s\&\={,1}\s"
+" / OPERATOR - STRING }}}
+
+" OPERATOR - TERNARY {{{
+" ? :
+sy match cfmlTernaryOperator
+  \ "\v\s
+  \\?|\:
+  \\s"
+" / OPERATOR - TERNARY }}}
+
+sy cluster cfmlOperator
+  \ contains=
+    \cfmlArithmeticOperator,
+    \cfmlBooleanOperator,
+    \cfmlDecisionOperator,
+    \cfmlStringOperator,
+    \cfmlTernaryOperator
+" / OPERATOR }}}
+
+" PARENTHESIS {{{
+sy cluster cfmlParenthesisRegionContains
+  \ contains=
+    \@cfmlAttribute,
+    \@cfmlComment,
+    \@cfmlFlowStatement,
+    \@cfmlOperator,
+    \@cfmlPunctuation,
+    \cfmlBoolean,
+    \cfmlBrace,
+    \cfmlCoreKeyword,
+    \cfmlCoreScope,
+    \cfmlCustomKeyword,
+    \cfmlCustomScope,
+    \cfmlEqualSign,
+    \cfmlFunctionName,
+    \cfmlNumber,
+    \cfmlStorageKeyword,
+    \cfmlStorageType
+
+sy region cfmlParenthesisRegion1
+  \ extend
+  \ matchgroup=cfmlParenthesis1
+  \ transparent
+  \ start=/(/
+  \ end=/)/
+  \ contains=
+    \cfmlParenthesisRegion2,
+    \@cfmlParenthesisRegionContains
+sy region cfmlParenthesisRegion2
+  \ matchgroup=cfmlParenthesis2
+  \ transparent
+  \ start=/(/
+  \ end=/)/
+  \ contains=
+    \cfmlParenthesisRegion3,
+    \@cfmlParenthesisRegionContains
+sy region cfmlParenthesisRegion3
+  \ matchgroup=cfmlParenthesis3
+  \ transparent
+  \ start=/(/
+  \ end=/)/
+  \ contains=
+    \cfmlParenthesisRegion1,
+    \@cfmlParenthesisRegionContains
+sy cluster cfmlParenthesisRegion
+  \ contains=
+    \cfmlParenthesisRegion1,
+    \cfmlParenthesisRegion2,
+    \cfmlParenthesisRegion3
+" / PARENTHESIS }}}
+
+" BRACE {{{
+sy match cfmlBrace
+    \ "{\|}"
+
+sy region cfmlBraceRegion
+  \ extend
+  \ fold
+  \ keepend
+  \ transparent
+  \ start="{"
+  \ end="}"
+" / BRACE }}}
+
+" PUNCTUATION {{{
+
+" PUNCTUATION - BRACKET {{{
+sy match cfmlBracket
+  \ "\(\[\|\]\)"
+  \ contained
+" / PUNCTUATION - BRACKET }}}
+
+" PUNCTUATION - CHAR {{{
+sy match cfmlComma ","
+sy match cfmlDot "\."
+sy match cfmlSemiColon ";"
+
+" / PUNCTUATION - CHAR }}}
+
+" PUNCTUATION - QUOTE {{{
+sy region cfmlSingleQuotedValue
+  \ matchgroup=cfmlSingleQuote
+  \ start=/'/
+  \ skip=/''/
+  \ end=/'/
+  \ contains=
+    \cfmlHashSurround
+
+sy region cfmlDoubleQuotedValue
+  \ matchgroup=cfmlDoubleQuote
+  \ start=/"/
+  \ skip=/""/
+  \ end=/"/
+  \ contains=
+    \cfmlHashSurround
+
+sy cluster cfmlQuotedValue
+  \ contains=
+    \cfmlDoubleQuotedValue,
+    \cfmlSingleQuotedValue
+
+sy cluster cfmlQuote
+  \ contains=
+    \cfmlDoubleQuote,
+    \cfmlSingleQuote
+" / PUNCTUATION - QUOTE }}}
+
+sy cluster cfmlPunctuation
+  \ contains=
+    \@cfmlQuote,
+    \@cfmlQuotedValue,
+    \cfmlBracket,
+    \cfmlComma,
+    \cfmlDot,
+    \cfmlSemiColon
+
+" / PUNCTUATION }}}
+
+" TAG START AND END {{{
+" tag start
+" <cf...>
+" s^^   e
+sy region cfmlTagStart
+  \ keepend
+  \ transparent
+  \ start="\c<cf_*"
+  \ end=">"
+\ contains=
+  \@cfmlAttribute,
+  \@cfmlComment,
+  \@cfmlOperator,
+  \@cfmlParenthesisRegion,
+  \@cfmlPunctuation,
+  \@cfmlQuote,
+  \@cfmlQuotedValue,
+  \cfmlAttrEqualSign,
+  \cfmlBoolean,
+  \cfmlBrace,
+  \cfmlCoreKeyword,
+  \cfmlCoreScope,
+  \cfmlCustomKeyword,
+  \cfmlCustomScope,
+  \cfmlEqualSign,
+  \cfmlFunctionName,
+  \cfmlNumber,
+  \cfmlStorageKeyword,
+  \cfmlStorageType,
+  \cfmlTagBracket,
+  \cfmlTagName
+
+" tag end
+" </cf...>
+" s^^^   e
+sy match cfmlTagEnd
+  \ transparent
+  \ "\c</cf_*[^>]*>"
+  \ contains=
+    \cfmlTagBracket,
+    \cfmlTagName
+
+" tag bracket
+" </...>
+" ^^   ^
+sy match cfmlTagBracket
+  \ contained
+  \ "\(<\|>\|\/\)"
+
+" tag name
+" <cf...>
+"  s^^^e
+sy match cfmlTagName
+  \ contained
+  \ "\v<\/*\zs\ccf\w*"
+" / TAG START AND END }}}
+
+" ATTRIBUTE NAME AND VALUE {{{
+sy match cfmlAttrName
+  \ contained
+  \ "\v(var\s)@<!\w+\ze\s*\=([^\=])+"
+
+sy match cfmlAttrValue
+  \ contained
+  \ "\v(\=\"*)\zs\s*\w*"
+
+sy match cfmlAttrEqualSign
+  \ contained
+  \ "\v\="
+
+sy cluster cfmlAttribute
+\ contains=
+  \@cfmlQuotedValue,
+  \cfmlAttrEqualSign,
+  \cfmlAttrName,
+  \cfmlAttrValue,
+  \cfmlCoreKeyword,
+  \cfmlCoreScope
+" / ATTRIBUTE NAME AND VALUE }}}
+
+" TAG REGION AND FOLDING {{{
+
+" CFCOMPONENT REGION AND FOLD {{{
+" <cfcomponent
+" s^^^^^^^^^^^
+" </cfcomponent>
+" ^^^^^^^^^^^^^e
+sy region cfmlComponentTagRegion
+  \ fold
+  \ keepend
+  \ transparent
+  \ start="\c<cfcomponent"
+  \ end="\c</cfcomponent>"
+
+" / CFCOMPONENT REGION AND FOLD }}}
+
+" CFFUNCTION REGION AND FOLD {{{
+" <cffunction
+" s^^^^^^^^^^
+" </cffunction>
+" ^^^^^^^^^^^^e
+sy region cfmlFunctionTagRegion
+  \ fold
+  \ keepend
+  \ transparent
+  \ start="\c<cffunction"
+  \ end="\c</cffunction>"
+" / CFFUNCTION REGION AND FOLD }}}
+
+" CFIF REGION AND FOLD {{{
+" <cfif
+" s^^^^
+" </cfif>
+" ^^^^^^e
+sy region cfmlIfTagRegion
+  \ fold
+  \ keepend
+  \ transparent
+  \ start="\c<cfif"
+  \ end="\c</cfif>"
+" / CFIF REGION AND FOLD }}}
+
+" CFLOOP REGION AND FOLD {{{
+" <cfloop
+" s^^^^^^
+" </cfloop>
+" ^^^^^^^^e
+sy region cfmlLoopTagRegion
+  \ fold
+  \ keepend
+  \ transparent
+  \ start="\c<cfloop"
+  \ end="\c</cfloop>"
+" / CFLOOP REGION AND FOLD }}}
+
+" CFOUTPUT REGION AND FOLD {{{
+" <cfoutput
+" s^^^^^^^^
+" </cfoutput>
+" ^^^^^^^^^^e
+sy region cfmlOutputTagRegion
+  \ fold
+  \ keepend
+  \ transparent
+  \ start="\c<cfoutput"
+  \ end="\c</cfoutput>"
+" / CFOUTPUT REGION AND FOLD }}}
+
+" CFQUERY REGION AND FOLD {{{
+" <cfquery
+" s^^^^^^^
+" </cfquery>
+" ^^^^^^^^^e
+        "\@cfmlSqlStatement,
+sy region cfmlQueryTagRegion
+  \ fold
+  \ keepend
+  \ transparent
+  \ start="\c<cfquery"
+  \ end="\c</cfquery>"
+  \ contains=
+    \@cfmlSqlStatement,
+    \cfmlTagStart,
+    \cfmlTagEnd,
+    \cfmlTagComment
+" / CFQUERY REGION AND FOLD }}}
+
+" SAVECONTENT REGION AND FOLD {{{
+" <savecontent
+" s^^^^^^^^^^^
+" </savecontent>
+" ^^^^^^^^^^^^^e
+sy region cfmlSavecontentTagRegion
+  \ fold
+  \ keepend
+  \ transparent
+  \ start="\c<cfsavecontent"
+  \ end="\c</cfsavecontent>"
+" / SAVECONTENT REGION AND FOLD }}}
+
+" CFSCRIPT REGION AND FOLD {{{
+" <cfscript>
+" s^^^^^^^^^
+" </cfscript>
+" ^^^^^^^^^^e
+"\cfmlCustomScope,
+sy region cfmlScriptTagRegion
+  \ fold
+  \ keepend
+  \ transparent
+  \ start="\c<cfscript>"
+  \ end="\c</cfscript>"
+  \ contains=
+    \@cfmlComment,
+    \@cfmlFlowStatement,
+    \cfmlHashSurround,
+    \@cfmlOperator,
+    \@cfmlParenthesisRegion,
+    \@cfmlPunctuation,
+    \cfmlBoolean,
+    \cfmlBrace,
+    \cfmlCoreKeyword,
+    \cfmlCoreScope,
+    \cfmlCustomKeyword,
+    \cfmlCustomScope,
+    \cfmlEqualSign,
+    \cfmlFunctionDefinition,
+    \cfmlFunctionName,
+    \cfmlNumber,
+    \cfmlOddFunction,
+    \cfmlStorageKeyword,
+    \cfmlTagEnd,
+    \cfmlTagStart
+" / CFSCRIPT REGION AND FOLD }}}
+
+" CFSWITCH REGION AND FOLD {{{
+" <cfswitch
+" s^^^^^^^^
+" </cfswitch>
+" ^^^^^^^^^^e
+sy region cfmlSwitchTagRegion
+  \ fold
+  \ keepend
+  \ transparent
+  \ start="\c<cfswitch"
+  \ end="\c</cfswitch>"
+" / CFSWITCH REGION AND FOLD }}}
+
+" CFTRANSACTION REGION AND FOLD {{{
+" <cftransaction
+" s^^^^^^^^^^^^^
+" </cftransaction>
+" ^^^^^^^^^^^^^^^e
+sy region cfmlTransactionTagRegion
+  \ fold
+  \ keepend
+  \ transparent
+  \ start="\c<cftransaction"
+  \ end="\c</cftransaction>"
+" / CFTRANSACTION REGION AND FOLD }}}
+
+" CUSTOM TAG REGION AND FOLD {{{
+" <cf_...>
+" s^^^   ^
+" </cf_...>
+" ^^^^^   e
+sy region cfmlCustomTagRegion
+  \ fold
+  \ keepend
+  \ transparent
+  \ start="\c<cf_[^>]*>"
+  \ end="\c</cf_[^>]*>"
+" / CUSTOM TAG REGION AND FOLD }}}
+
+" / TAG REGION AND FOLDING }}}
+
+" COMMENT {{{
+
+" COMMENT BLOCK {{{
+" /*...*/
+" s^   ^e
+sy region cfmlCommentBlock
+  \ keepend
+  \ start="/\*"
+  \ end="\*/"
+  \ contains=
+    \cfmlMetaData
+" / COMMENT BLOCK }}}
+
+" COMMENT LINE {{{
+" //...
+" s^
+sy match cfmlCommentLine
+        \ "\/\/.*"
+" / COMMENT LINE }}}
+
+sy cluster cfmlComment
+  \ contains=
+    \cfmlCommentBlock,
+    \cfmlCommentLine
+" / COMMENT }}}
+
+" TAG COMMENT {{{
+" <!---...--->
+" s^^^^   ^^^e
+sy region cfmlTagComment
+  \ keepend
+    \ start="<!---"
+    \ end="--->"
+    \ contains=
+      \cfmlTagComment
+" / TAG COMMENT }}}
+
+" FLOW STATEMENT {{{
+" BRANCH FLOW KEYWORD {{{
+sy keyword cfmlBranchFlowKeyword
+  \ break
+  \ continue
+  \ return
+
+" / BRANCH KEYWORD }}}
+
+" DECISION FLOW KEYWORD {{{
+sy keyword cfmlDecisionFlowKeyword
+  \ case
+  \ defaultcase
+  \ else
+  \ if
+  \ switch
+
+" / DECISION FLOW KEYWORD }}}
+
+" LOOP FLOW KEYWORD {{{
+sy keyword cfmlLoopFlowKeyword
+  \ do
+  \ for
+  \ in
+  \ while
+
+" / LOOP FLOW KEYWORD }}}
+
+" TRY FLOW KEYWORD {{{
+sy keyword cfmlTryFlowKeyword
+  \ catch
+  \ finally
+  \ rethrow
+  \ throw
+  \ try
+
+" / TRY FLOW KEYWORD }}}
+
+sy cluster cfmlFlowStatement
+  \ contains=
+    \cfmlBranchFlowKeyword,
+    \cfmlDecisionFlowKeyword,
+    \cfmlLoopFlowKeyword,
+    \cfmlTryFlowKeyword
+
+" / FLOW STATEMENT }}}
+
+" STORAGE KEYWORD {{{
+sy keyword cfmlStorageKeyword
+    \ var
+" / STORAGE KEYWORD }}}
+
+" STORAGE TYPE {{{
+sy match cfmlStorageType
+  \ contained
+  \ "\v<
+    \(any
+    \|array
+    \|binary
+    \|boolean
+    \|date
+    \|numeric
+    \|query
+    \|string
+    \|struct
+    \|uuid
+    \|void
+    \|xml
+  \){1}\ze(\s*\=)@!"
+" / STORAGE TYPE }}}
+
+" CORE KEYWORD {{{
+sy match cfmlCoreKeyword
+  \ "\v<
+    \(new
+    \|required
+    \)\ze\s"
+" / CORE KEYWORD }}}
+
+" CORE SCOPE {{{
+sy match cfmlCoreScope
+  \ "\v<
+    \(application
+    \|arguments
+    \|attributes
+    \|caller
+    \|cfcatch
+    \|cffile
+    \|cfhttp
+    \|cgi
+    \|client
+    \|cookie
+    \|form
+    \|local
+    \|request
+    \|server
+    \|session
+    \|super
+    \|this
+    \|thisTag
+    \|thread
+    \|variables
+    \|url
+    \){1}\ze(,|\.|\[|\)|\s)"
+" / CORE SCOPE }}}
+
+" SQL STATEMENT {{{
+sy cluster cfmlSqlStatement
+  \ contains=
+    \@cfmlParenthesisRegion,
+    \@cfmlQuote,
+    \@cfmlQuotedValue,
+    \@sqlSyntax,
+    \cfmlBoolean,
+    \cfmlDot,
+    \cfmlEqualSign,
+    \cfmlFunctionName,
+    \cfmlHashSurround,
+    \cfmlNumber
+" / SQL STATEMENT }}}
+
+" TAG IN SCRIPT {{{
+sy match cfmlTagNameInScript
+    \ "\vcf_*\w+\s*\ze\("
+" / TAG IN SCRIPT }}}
+
+" METADATA {{{
+sy region cfmlMetaData
+  \ contained
+  \ keepend
+  \ start="@\w\+"
+  \ end="$"
+  \ contains=
+    \cfmlMetaDataName
+
+sy match cfmlMetaDataName
+    \ contained
+    \ "@\w\+"
+" / METADATA }}}
+
+" COMPONENT DEFINITION {{{
+sy region cfmlComponentDefinition
+  \ start="component"
+  \ end="{"me=e-1
+  \ contains=
+    \@cfmlAttribute,
+    \cfmlComponentKeyword
+
+sy match cfmlComponentKeyword
+  \ contained
+  \ "\v<component>"
+" / COMPONENT DEFINITION }}}
+
+" INTERFACE DEFINITION {{{
+sy match cfmlInterfaceDefinition
+  \ "interface\s.*{"me=e-1
+  \ contains=
+    \cfmlInterfaceKeyword
+
+sy match cfmlInterfaceKeyword
+    \ contained
+    \ "\v<interface>"
+" / INTERFACE DEFINITION }}}
+
+" PROPERTY {{{
+sy region cfmlProperty
+  \ transparent
+  \ start="\v<property>"
+  \ end=";"me=e-1
+  \ contains=
+    \@cfmlQuotedValue,
+    \cfmlAttrEqualSign,
+    \cfmlAttrName,
+    \cfmlAttrValue,
+    \cfmlPropertyKeyword
+
+sy match cfmlPropertyKeyword
+        \ contained
+        \ "\v<property>"
+" / PROPERTY }}}
+
+" FUNCTION DEFINITION {{{
+sy match cfmlFunctionDefinition
+  \ "\v
+    \(<(public|private|package)\s){,1}
+    \(<
+      \(any
+      \|array
+      \|binary
+      \|boolean
+      \|date
+      \|numeric
+      \|query
+      \|string
+      \|struct
+      \|uuid
+      \|void
+      \|xml
+    \)\s){,1}
+  \<function\s\w+\s*\("me=e-1
+  \ contains=
+    \cfmlFunctionKeyword,
+    \cfmlFunctionModifier,
+    \cfmlFunctionName,
+    \cfmlFunctionReturnType
+
+" FUNCTION KEYWORD {{{
+sy match cfmlFunctionKeyword
+  \ contained
+  \ "\v<function>"
+" / FUNCTION KEYWORD }}}
+
+" FUNCTION MODIFIER {{{
+sy match cfmlFunctionModifier
+  \ contained
+    \ "\v<
+    \(public
+    \|private
+    \|package
+    \)>"
+" / FUNCTION MODIFIER }}}
+
+" FUNCTION RETURN TYPE {{{
+sy match cfmlFunctionReturnType
+  \ contained
+    \ "\v
+    \(any
+    \|array
+    \|binary
+    \|boolean
+    \|date
+    \|numeric
+    \|query
+    \|string
+    \|struct
+    \|uuid
+    \|void
+    \|xml
+    \)"
+" / FUNCTION RETURN TYPE }}}
+
+" FUNCTION NAME {{{
+" specific regex for core functions decreases performance
+" so use the same highlighting for both function types
+sy match cfmlFunctionName
+    \ "\v<(cf|if|elseif|throw)@!\w+\s*\ze\("
+" / FUNCTION NAME }}}
+
+" / FUNCTION DEFINITION }}}
+
+" ODD FUNCTION {{{
+sy region cfmlOddFunction
+  \ transparent
+  \ start="\v<
+    \(abort
+    \|exit
+    \|import
+    \|include
+    \|lock
+    \|pageencoding
+    \|param
+    \|savecontent
+    \|thread
+    \|transaction
+    \){1}"
+  \ end="\v(\{|;)"me=e-1
+  \ contains=
+    \@cfmlQuotedValue,
+    \cfmlAttrEqualSign,
+    \cfmlAttrName,
+    \cfmlAttrValue,
+    \cfmlCoreKeyword,
+    \cfmlOddFunctionKeyword,
+    \cfmlCoreScope
+
+" ODD FUNCTION KEYWORD {{{
+sy match cfmlOddFunctionKeyword
+  \ contained
+    \ "\v<
+    \(abort
+    \|exit
+    \|import
+    \|include
+    \|lock
+    \|pageencoding
+    \|param
+    \|savecontent
+    \|thread
+    \|transaction
+    \)\ze(\s|$|;)"
+" / ODD FUNCTION KEYWORD }}}
+
+" / ODD FUNCTION }}}
+
+" CUSTOM {{{
+
+" CUSTOM KEYWORD {{{
+sy match cfmlCustomKeyword
+  \ contained
+    \ "\v<
+    \(customKeyword1
+    \|customKeyword2
+    \|customKeyword3
+    \)>"
+" / CUSTOM KEYWORD }}}
+
+" CUSTOM SCOPE {{{
+sy match cfmlCustomScope
+  \ contained
+    \ "\v<
+    \(prc
+    \|rc
+    \|event
+    \|(\w+Service)
+    \){1}\ze(\.|\[)"
+" / CUSTOM SCOPE }}}
+
+" / CUSTOM }}}
+
+" SGML TAG START AND END {{{
+" SGML tag start
+" <...>
+" s^^^e
+sy region cfmlSGMLTagStart
+  \ keepend
+  \ transparent
+  \ start="\v(\<cf)@!\zs\<\w+"
+  \ end=">"
+  \ contains=
+    \@cfmlAttribute,
+    \@cfmlComment,
+    \@cfmlOperator,
+    \@cfmlParenthesisRegion,
+    \@cfmlPunctuation,
+    \@cfmlQuote,
+    \@cfmlQuotedValue,
+    \cfmlAttrEqualSign,
+    \cfmlBoolean,
+    \cfmlBrace,
+    \cfmlCoreKeyword,
+    \cfmlCoreScope,
+    \cfmlCustomKeyword,
+    \cfmlCustomScope,
+    \cfmlEqualSign,
+    \cfmlFunctionName,
+    \cfmlNumber,
+    \cfmlStorageKeyword,
+    \cfmlStorageType,
+    \cfmlTagBracket,
+    \cfmlSGMLTagName
+
+" SGML tag end
+" </...>
+" s^^^^e
+sy match cfmlSGMLTagEnd
+  \ transparent
+  \ "\v(\<\/cf)@!\zs\<\/\w+\>"
+  \ contains=
+    \cfmlTagBracket,
+    \cfmlSGMLTagName
+
+" SGML tag name
+" <...>
+" s^^^e
+sy match cfmlSGMLTagName
+  \ contained
+  \ "\v(\<\/*)\zs\w+"
+
+" / SGML TAG START AND END }}}
+
+" HIGHLIGHTING {{{
+
+hi link cfmlNumber Number
+hi link cfmlBoolean Boolean
+hi link cfmlEqualSign Keyword
+" HASH SURROUND
+hi link cfmlHash PreProc
+hi link cfmlHashSurround PreProc
+" OPERATOR
+hi link cfmlArithmeticOperator Function
+hi link cfmlBooleanOperator Function
+hi link cfmlDecisionOperator Function
+hi link cfmlStringOperator Function
+hi link cfmlTernaryOperator Function
+" PARENTHESIS
+hi link cfmlParenthesis1 Statement
+hi link cfmlParenthesis2 String
+hi link cfmlParenthesis3 Delimiter
+" BRACE
+hi link cfmlBrace PreProc
+" PUNCTUATION - BRACKET
+hi link cfmlBracket Statement
+" PUNCTUATION - CHAR
+hi link cfmlComma Comment
+hi link cfmlDot Comment
+hi link cfmlSemiColon Comment
+" PUNCTUATION - QUOTE
+hi link cfmlDoubleQuote String
+hi link cfmlDoubleQuotedValue String
+hi link cfmlSingleQuote String
+hi link cfmlSingleQuotedValue String
+" TAG START AND END
+hi link cfmlTagName Function
+hi link cfmlTagBracket Comment
+" ATTRIBUTE NAME AND VALUE
+hi link cfmlAttrName Type
+hi link cfmlAttrValue Special
+" COMMENT
+hi link cfmlCommentBlock Comment
+hi link cfmlCommentLine Comment
+hi link cfmlTagComment Comment
+" FLOW STATEMENT
+hi link cfmlDecisionFlowKeyword Conditional
+hi link cfmlLoopFlowKeyword Repeat
+hi link cfmlTryFlowKeyword Exception
+hi link cfmlBranchFlowKeyword Keyword
+" STORAGE KEYWORD
+hi link cfmlStorageKeyword Keyword
+" STORAGE TYPE
+hi link cfmlStorageType Keyword
+" CORE KEYWORD
+hi link cfmlCoreKeyword PreProc
+" CORE SCOPE
+hi link cfmlCoreScope Keyword
+" TAG IN SCRIPT
+hi link cfmlTagNameInScript Function
+" METADATA
+" meta data value = cfmlMetaData
+hi link cfmlMetaData String
+hi link cfmlMetaDataName Type
+" COMPONENT DEFINITION
+hi link cfmlComponentKeyword Keyword
+" INTERFACE DEFINITION
+hi link cfmlInterfaceKeyword Keyword
+" PROPERTY
+hi link cfmlPropertyKeyword Keyword
+" FUNCTION DEFINITION
+hi link cfmlFunctionKeyword Keyword
+hi link cfmlFunctionModifier Keyword
+hi link cfmlFunctionReturnType Keyword
+hi link cfmlFunctionName Function
+" ODD FUNCTION
+hi link cfmlOddFunctionKeyword Function
+" CUSTOM
+hi link cfmlCustomKeyword Keyword
+hi link cfmlCustomScope Structure
+" SGML TAG
+hi link cfmlSGMLTagName Ignore
+
+" / HIGHLIGHTING }}}
+
+let b:current_syntax = "cfml"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/cfg.vim b/syntax/cfg.vim
new file mode 100644
index 000000000..ff4272e37
--- /dev/null
+++ b/syntax/cfg.vim
@@ -0,0 +1,52 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cfg') == -1
+
+" Vim syntax file
+" Language:	Good old CFG files
+" Maintainer:	Igor N. Prischepoff (igor@tyumbit.ru, pri_igor@mail.ru)
+" Last change:	2012 Aug 11
+
+" quit when a syntax file was already loaded
+if exists ("b:current_syntax")
+    finish
+endif
+
+" case off
+syn case ignore
+syn keyword CfgOnOff  ON OFF YES NO TRUE FALSE  contained
+syn match UncPath "\\\\\p*" contained
+"Dos Drive:\Path
+syn match CfgDirectory "[a-zA-Z]:\\\p*" contained
+"Parameters
+syn match   CfgParams    ".\{0}="me=e-1 contains=CfgComment
+"... and their values (don't want to highlight '=' sign)
+syn match   CfgValues    "=.*"hs=s+1 contains=CfgDirectory,UncPath,CfgComment,CfgString,CfgOnOff
+
+" Sections
+syn match CfgSection	    "\[.*\]"
+syn match CfgSection	    "{.*}"
+
+" String
+syn match  CfgString	"\".*\"" contained
+syn match  CfgString    "'.*'"   contained
+
+" Comments (Everything before '#' or '//' or ';')
+syn match  CfgComment	"#.*"
+syn match  CfgComment	";.*"
+syn match  CfgComment	"\/\/.*"
+
+" Define the default hightlighting.
+" Only when an item doesn't have highlighting yet
+hi def link CfgOnOff     Label
+hi def link CfgComment	Comment
+hi def link CfgSection	Type
+hi def link CfgString	String
+hi def link CfgParams    Keyword
+hi def link CfgValues    Constant
+hi def link CfgDirectory Directory
+hi def link UncPath      Directory
+
+
+let b:current_syntax = "cfg"
+" vim:ts=8
+
+endif
diff --git a/syntax/ch.vim b/syntax/ch.vim
new file mode 100644
index 000000000..00f49e016
--- /dev/null
+++ b/syntax/ch.vim
@@ -0,0 +1,42 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ch') == -1
+
+" Vim syntax file
+" Language:     Ch
+" Maintainer:   SoftIntegration, Inc. <info@softintegration.com>
+" URL:		http://www.softintegration.com/download/vim/syntax/ch.vim
+" Last change:	2004 Sep 01
+"		Created based on cpp.vim
+"
+" Ch is a C/C++ interpreter with many high level extensions
+"
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Read the C syntax to start with
+runtime! syntax/c.vim
+unlet b:current_syntax
+
+" Ch extentions
+
+syn keyword	chStatement	new delete this foreach
+syn keyword	chAccess	public private
+syn keyword	chStorageClass	__declspec(global) __declspec(local)
+syn keyword	chStructure	class
+syn keyword	chType		string_t array
+
+" Default highlighting
+
+hi def link chAccess		chStatement
+hi def link chExceptions		Exception
+hi def link chStatement		Statement
+hi def link chType			Type
+hi def link chStructure		Structure
+
+let b:current_syntax = "ch"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/chaiscript.vim b/syntax/chaiscript.vim
new file mode 100644
index 000000000..7a84ec90c
--- /dev/null
+++ b/syntax/chaiscript.vim
@@ -0,0 +1,98 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chaiscript') == -1
+
+" Vim syntax file
+" Language:	ChaiScript
+" Maintainer:	Jason Turner <lefticus 'at' gmail com>
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+end
+
+syn case match
+
+" syncing method
+syn sync fromstart
+
+" Strings
+syn region chaiscriptString        start=+"+ end=+"+ skip=+\\\\\|\\"+ contains=chaiscriptSpecial,chaiscriptEval,@Spell
+
+" Escape characters
+syn match  chaiscriptSpecial       contained "\\[\\abfnrtv\'\"]\|\\\d\{,3}" 
+
+" String evals
+syn region chaiscriptEval          contained start="${" end="}" 
+ 
+" integer number
+syn match  chaiscriptNumber        "\<\d\+\>"
+
+" floating point number, with dot, optional exponent
+syn match  chaiscriptFloat         "\<\d\+\.\d*\%(e[-+]\=\d\+\)\=\>"
+
+" floating point number, starting with a dot, optional exponent
+syn match  chaiscriptFloat         "\.\d\+\%(e[-+]\=\d\+\)\=\>"
+
+" floating point number, without dot, with exponent
+syn match  chaiscriptFloat         "\<\d\+e[-+]\=\d\+\>"
+
+" Hex strings
+syn match  chaiscriptNumber        "\<0x\x\+\>"
+
+" Binary strings
+syn match  chaiscriptNumber        "\<0b[01]\+\>"
+
+" Various language features
+syn keyword chaiscriptCond         if else
+syn keyword chaiscriptRepeat       while for do
+syn keyword chaiscriptStatement    break continue return
+syn keyword chaiscriptExceptions   try catch throw
+
+"Keyword
+syn keyword chaiscriptKeyword      def true false attr
+
+"Built in types
+syn keyword chaiscriptType         fun var
+
+"Built in funcs, keep it simple
+syn keyword chaiscriptFunc         eval throw
+
+"Let's treat all backtick operator function lookups as built in too
+syn region  chaiscriptFunc         matchgroup=chaiscriptFunc start="`" end="`"
+
+" Account for the "[1..10]" syntax, treating it as an operator
+" Intentionally leaving out all of the normal, well known operators
+syn match   chaiscriptOperator     "\.\."
+
+" Guard seperator as an operator
+syn match   chaiscriptOperator     ":"
+
+" Comments
+syn match   chaiscriptComment      "//.*$" contains=@Spell
+syn region  chaiscriptComment      matchgroup=chaiscriptComment start="/\*" end="\*/" contains=@Spell
+
+
+
+hi def link chaiscriptExceptions	Exception
+hi def link chaiscriptKeyword		Keyword
+hi def link chaiscriptStatement		Statement
+hi def link chaiscriptRepeat		Repeat
+hi def link chaiscriptString		String
+hi def link chaiscriptNumber		Number
+hi def link chaiscriptFloat		Float
+hi def link chaiscriptOperator		Operator
+hi def link chaiscriptConstant		Constant
+hi def link chaiscriptCond		Conditional
+hi def link chaiscriptFunction		Function
+hi def link chaiscriptComment		Comment
+hi def link chaiscriptTodo		Todo
+hi def link chaiscriptError		Error
+hi def link chaiscriptSpecial		SpecialChar
+hi def link chaiscriptFunc		Identifier
+hi def link chaiscriptType		Type
+hi def link chaiscriptEval	        Special
+
+let b:current_syntax = "chaiscript"
+
+" vim: nowrap sw=2 sts=2 ts=8 noet
+
+endif
diff --git a/syntax/chaskell.vim b/syntax/chaskell.vim
new file mode 100644
index 000000000..e4d303d93
--- /dev/null
+++ b/syntax/chaskell.vim
@@ -0,0 +1,18 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chaskell') == -1
+
+" Vim syntax file
+" Language:	Haskell supporting c2hs binding hooks
+" Maintainer:	Armin Sander <armin@mindwalker.org>
+" Last Change:	2001 November 1
+"
+" 2001 November 1: Changed commands for sourcing haskell.vim
+
+" Enable binding hooks
+let b:hs_chs=1
+
+" Include standard Haskell highlighting
+runtime! syntax/haskell.vim
+
+" vim: ts=8
+
+endif
diff --git a/syntax/chill.vim b/syntax/chill.vim
new file mode 100644
index 000000000..6385bc013
--- /dev/null
+++ b/syntax/chill.vim
@@ -0,0 +1,182 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chill') == -1
+
+" Vim syntax file
+" Language:	CHILL
+" Maintainer:	YoungSang Yoon <image@lgic.co.kr>
+" Last change:	2004 Jan 21
+"
+
+" first created by image@lgic.co.kr & modified by paris@lgic.co.kr
+
+" CHILL (CCITT High Level Programming Language) is used for
+" developing software of ATM switch at LGIC (LG Information
+" & Communications LTd.)
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" A bunch of useful CHILL keywords
+syn keyword	chillStatement	goto GOTO return RETURN returns RETURNS
+syn keyword	chillLabel		CASE case ESAC esac
+syn keyword	chillConditional	if IF else ELSE elsif ELSIF switch SWITCH THEN then FI fi
+syn keyword	chillLogical	NOT not
+syn keyword	chillRepeat	while WHILE for FOR do DO od OD TO to
+syn keyword	chillProcess	START start STACKSIZE stacksize PRIORITY priority THIS this STOP stop
+syn keyword	chillBlock		PROC proc PROCESS process
+syn keyword	chillSignal	RECEIVE receive SEND send NONPERSISTENT nonpersistent PERSISTENT peristent SET set EVER ever
+
+syn keyword	chillTodo		contained TODO FIXME XXX
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match	chillSpecial	contained "\\x\x\+\|\\\o\{1,3\}\|\\.\|\\$"
+syn region	chillString	start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=chillSpecial
+syn match	chillCharacter	"'[^\\]'"
+syn match	chillSpecialCharacter "'\\.'"
+syn match	chillSpecialCharacter "'\\\o\{1,3\}'"
+
+"when wanted, highlight trailing white space
+if exists("chill_space_errors")
+  syn match	chillSpaceError	"\s*$"
+  syn match	chillSpaceError	" \+\t"me=e-1
+endif
+
+"catch errors caused by wrong parenthesis
+syn cluster	chillParenGroup	contains=chillParenError,chillIncluded,chillSpecial,chillTodo,chillUserCont,chillUserLabel,chillBitField
+syn region	chillParen		transparent start='(' end=')' contains=ALLBUT,@chillParenGroup
+syn match	chillParenError	")"
+syn match	chillInParen	contained "[{}]"
+
+"integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match	chillNumber		"\<\d\+\(u\=l\=\|lu\|f\)\>"
+"floating point number, with dot, optional exponent
+syn match	chillFloat		"\<\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, starting with a dot, optional exponent
+syn match	chillFloat		"\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+syn match	chillFloat		"\<\d\+e[-+]\=\d\+[fl]\=\>"
+"hex number
+syn match	chillNumber		"\<0x\x\+\(u\=l\=\|lu\)\>"
+"syn match chillIdentifier	"\<[a-z_][a-z0-9_]*\>"
+syn case match
+" flag an octal number with wrong digits
+syn match	chillOctalError	"\<0\o*[89]"
+
+if exists("chill_comment_strings")
+  " A comment can contain chillString, chillCharacter and chillNumber.
+  " But a "*/" inside a chillString in a chillComment DOES end the comment!  So we
+  " need to use a special type of chillString: chillCommentString, which also ends on
+  " "*/", and sees a "*" at the start of the line as comment again.
+  " Unfortunately this doesn't very well work for // type of comments :-(
+  syntax match	chillCommentSkip	contained "^\s*\*\($\|\s\+\)"
+  syntax region chillCommentString	contained start=+"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=chillSpecial,chillCommentSkip
+  syntax region chillComment2String	contained start=+"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=chillSpecial
+  syntax region chillComment	start="/\*" end="\*/" contains=chillTodo,chillCommentString,chillCharacter,chillNumber,chillFloat,chillSpaceError
+  syntax match  chillComment	"//.*" contains=chillTodo,chillComment2String,chillCharacter,chillNumber,chillSpaceError
+else
+  syn region	chillComment	start="/\*" end="\*/" contains=chillTodo,chillSpaceError
+  syn match	chillComment	"//.*" contains=chillTodo,chillSpaceError
+endif
+syntax match	chillCommentError	"\*/"
+
+syn keyword	chillOperator	SIZE size
+syn keyword	chillType		dcl DCL int INT char CHAR bool BOOL REF ref LOC loc INSTANCE instance
+syn keyword	chillStructure	struct STRUCT enum ENUM newmode NEWMODE synmode SYNMODE
+"syn keyword	chillStorageClass
+syn keyword	chillBlock		PROC proc END end
+syn keyword	chillScope		GRANT grant SEIZE seize
+syn keyword	chillEDML		select SELECT delete DELETE update UPDATE in IN seq SEQ WHERE where INSERT insert include INCLUDE exclude EXCLUDE
+syn keyword	chillBoolConst	true TRUE false FALSE
+
+syn region	chillPreCondit	start="^\s*#\s*\(if\>\|ifdef\>\|ifndef\>\|elif\>\|else\>\|endif\>\)" skip="\\$" end="$" contains=chillComment,chillString,chillCharacter,chillNumber,chillCommentError,chillSpaceError
+syn region	chillIncluded	contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match	chillIncluded	contained "<[^>]*>"
+syn match	chillInclude	"^\s*#\s*include\>\s*["<]" contains=chillIncluded
+"syn match chillLineSkip	"\\$"
+syn cluster	chillPreProcGroup	contains=chillPreCondit,chillIncluded,chillInclude,chillDefine,chillInParen,chillUserLabel
+syn region	chillDefine		start="^\s*#\s*\(define\>\|undef\>\)" skip="\\$" end="$" contains=ALLBUT,@chillPreProcGroup
+syn region	chillPreProc	start="^\s*#\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" contains=ALLBUT,@chillPreProcGroup
+
+" Highlight User Labels
+syn cluster	chillMultiGroup	contains=chillIncluded,chillSpecial,chillTodo,chillUserCont,chillUserLabel,chillBitField
+syn region	chillMulti		transparent start='?' end=':' contains=ALLBUT,@chillMultiGroup
+" Avoid matching foo::bar() in C++ by requiring that the next char is not ':'
+syn match	chillUserCont	"^\s*\I\i*\s*:$" contains=chillUserLabel
+syn match	chillUserCont	";\s*\I\i*\s*:$" contains=chillUserLabel
+syn match	chillUserCont	"^\s*\I\i*\s*:[^:]"me=e-1 contains=chillUserLabel
+syn match	chillUserCont	";\s*\I\i*\s*:[^:]"me=e-1 contains=chillUserLabel
+
+syn match	chillUserLabel	"\I\i*" contained
+
+" Avoid recognizing most bitfields as labels
+syn match	chillBitField	"^\s*\I\i*\s*:\s*[1-9]"me=e-1
+syn match	chillBitField	";\s*\I\i*\s*:\s*[1-9]"me=e-1
+
+syn match	chillBracket	contained "[<>]"
+if !exists("chill_minlines")
+  let chill_minlines = 15
+endif
+exec "syn sync ccomment chillComment minlines=" . chill_minlines
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link chillLabel	Label
+hi def link chillUserLabel	Label
+hi def link chillConditional	Conditional
+" hi def link chillConditional	term=bold ctermfg=red guifg=red gui=bold
+
+hi def link chillRepeat	Repeat
+hi def link chillProcess	Repeat
+hi def link chillSignal	Repeat
+hi def link chillCharacter	Character
+hi def link chillSpecialCharacter chillSpecial
+hi def link chillNumber	Number
+hi def link chillFloat	Float
+hi def link chillOctalError	chillError
+hi def link chillParenError	chillError
+hi def link chillInParen	chillError
+hi def link chillCommentError	chillError
+hi def link chillSpaceError	chillError
+hi def link chillOperator	Operator
+hi def link chillStructure	Structure
+hi def link chillBlock	Operator
+hi def link chillScope	Operator
+"hi def link chillEDML     term=underline ctermfg=DarkRed guifg=Red
+hi def link chillEDML	PreProc
+"hi def link chillBoolConst	term=bold ctermfg=brown guifg=brown
+hi def link chillBoolConst	Constant
+"hi def link chillLogical	term=bold ctermfg=brown guifg=brown
+hi def link chillLogical	Constant
+hi def link chillStorageClass	StorageClass
+hi def link chillInclude	Include
+hi def link chillPreProc	PreProc
+hi def link chillDefine	Macro
+hi def link chillIncluded	chillString
+hi def link chillError	Error
+hi def link chillStatement	Statement
+hi def link chillPreCondit	PreCondit
+hi def link chillType	Type
+hi def link chillCommentError	chillError
+hi def link chillCommentString chillString
+hi def link chillComment2String chillString
+hi def link chillCommentSkip	chillComment
+hi def link chillString	String
+hi def link chillComment	Comment
+" hi def link chillComment	term=None ctermfg=lightblue guifg=lightblue
+hi def link chillSpecial	SpecialChar
+hi def link chillTodo	Todo
+hi def link chillBlock	Statement
+"hi def link chillIdentifier	Identifier
+hi def link chillBracket	Delimiter
+
+
+let b:current_syntax = "chill"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/chordpro.vim b/syntax/chordpro.vim
new file mode 100644
index 000000000..e114f9a71
--- /dev/null
+++ b/syntax/chordpro.vim
@@ -0,0 +1,71 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chordpro') == -1
+
+" Vim syntax file
+" Language:     ChordPro (v. 3.6.2)
+" Maintainer:   Niels Bo Andersen <niels@niboan.dk>
+" Last Change:	2006 Apr 30
+" Remark:       Requires VIM version 6.00 or greater
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword+=-
+
+syn case ignore
+
+syn keyword chordproDirective contained
+  \ start_of_chorus soc end_of_chorus eoc new_song ns no_grid ng grid g
+  \ new_page np new_physical_page npp start_of_tab sot end_of_tab eot
+  \ column_break colb
+
+syn keyword chordproDirWithOpt contained
+  \ comment c comment_italic ci comment_box cb title t subtitle st define
+  \ textfont textsize chordfont chordsize columns col
+
+syn keyword chordproDefineKeyword contained base-fret frets
+
+syn match chordproDirMatch /{\w*}/ contains=chordproDirective contained transparent
+syn match chordproDirOptMatch /{\w*:/ contains=chordproDirWithOpt contained transparent
+
+" Workaround for a bug in VIM 6, which causes incorrect coloring of the first {
+if version < 700
+  syn region chordproOptions start=/{\w*:/ end=/}/ contains=chordproDirOptMatch contained transparent
+  syn region chordproOptions start=/{define:/ end=/}/ contains=chordproDirOptMatch, chordproDefineKeyword contained transparent
+else
+  syn region chordproOptions start=/{\w*:/hs=e+1 end=/}/he=s-1 contains=chordproDirOptMatch contained
+  syn region chordproOptions start=/{define:/hs=e+1 end=/}/he=s-1 contains=chordproDirOptMatch, chordproDefineKeyword contained
+endif
+
+syn region chordproTag start=/{/ end=/}/ contains=chordproDirMatch,chordproOptions oneline
+
+syn region chordproChord matchgroup=chordproBracket start=/\[/ end=/]/ oneline
+
+syn region chordproTab start=/{start_of_tab}\|{sot}/hs=e+1 end=/{end_of_tab}\|{eot}/he=s-1 contains=chordproTag,chordproComment keepend
+
+syn region chordproChorus start=/{start_of_chorus}\|{soc}/hs=e+1 end=/{end_of_chorus}\|{eoc}/he=s-1 contains=chordproTag,chordproChord,chordproComment keepend
+
+syn match chordproComment /^#.*/
+
+" Define the default highlighting.
+hi def link chordproDirective Statement
+hi def link chordproDirWithOpt Statement
+hi def link chordproOptions Special
+hi def link chordproChord Type
+hi def link chordproTag Constant
+hi def link chordproTab PreProc
+hi def link chordproComment Comment
+hi def link chordproBracket Constant
+hi def link chordproDefineKeyword Type
+hi def chordproChorus term=bold cterm=bold gui=bold
+
+let b:current_syntax = "chordpro"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/cl.vim b/syntax/cl.vim
new file mode 100644
index 000000000..3268d1e59
--- /dev/null
+++ b/syntax/cl.vim
@@ -0,0 +1,102 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cl') == -1
+
+" Vim syntax file
+" Language:		CL
+" 			(pronounced alphabetically: "Cee-El".
+" 			CL stands for Clever Language,
+" 			but the language is CL, not "Clever".
+" 			CL was created by Multibase, http://www.mbase.com.au)
+" Filename extensions:	*.ent
+"			*.eni
+" Maintainer:		Philip Uren	<philuSPAX@ieee.org> Remove SPAX spam block
+" Version:              6
+" Last Change:		Mar 06 2013
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+setlocal iskeyword=@,48-57,_,-
+
+syn case ignore
+
+syn sync lines=300
+
+"If/else/elsif/endif and while/wend mismatch errors
+syn match	clifError	"\<wend\>"
+syn match	clifError	"\<elsif\>"
+syn match	clifError	"\<else\>"
+syn match	clifError	"\<endif\>"
+
+syn match	clSpaceError	"\s\+$"
+
+" If and while regions
+syn region	clLoop		transparent matchgroup=clWhile start="\<while\>" matchgroup=clWhile end="\<wend\>" contains=ALLBUT,clBreak,clProcedure
+syn region	clIf		transparent matchgroup=clConditional start="\<if\>" matchgroup=clConditional end="\<endif\>"   contains=ALLBUT,clBreak,clProcedure
+
+" Make those TODO notes and debugging stand out!
+syn keyword	clTodo		contained	TODO BUG DEBUG FIX
+syn match	clNeedsWork	contained	"NEED[S]*\s\s*WORK"
+syn keyword	clDebug		contained	debug
+
+syn match	clComment	"#.*$"		contains=clTodo,clNeedsWork,@Spell
+syn region	clProcedure	oneline		start="^\s*[{}]" end="$"
+syn match	clInclude	"^\s*include\s.*"
+
+" We don't put "debug" in the clSetOptions;
+" we contain it in clSet so we can make it stand out.
+syn keyword	clSetOptions	transparent aauto abort align convert E fill fnum goback hangup justify null_exit output rauto rawprint rawdisplay repeat skip tab trim
+syn match	clSet		"^\s*set\s.*" contains=clSetOptions,clDebug
+
+syn match	clPreProc	"^\s*#P.*"
+
+syn keyword	clConditional	else elsif
+syn keyword	clWhile		continue endloop
+" 'break' needs to be a region so we can sync on it above.
+syn region	clBreak		oneline start="^\s*break" end="$"
+
+syn match	clOperator	"[!;|)(:.><+*=-]"
+
+syn match	clNumber	"\<\d\+\(u\=l\=\|lu\|f\)\>"
+
+syn region	clString	matchgroup=clQuote	start=+"+ end=+"+	skip=+\\"+ contains=@Spell
+syn region	clString	matchgroup=clQuote	start=+'+ end=+'+	skip=+\\'+ contains=@Spell
+
+syn keyword	clReserved	ERROR EXIT INTERRUPT LOCKED LREPLY MODE MCOL MLINE MREPLY NULL REPLY V1 V2 V3 V4 V5 V6 V7 V8 V9 ZERO BYPASS GOING_BACK AAUTO ABORT ABORT ALIGN BIGE CONVERT FNUM GOBACK HANGUP JUSTIFY NEXIT OUTPUT RAUTO RAWDISPLAY RAWPRINT REPEAT SKIP TAB TRIM LCOUNT PCOUNT PLINES SLINES SCOLS MATCH LMATCH
+
+syn keyword	clFunction	asc asize chr name random slen srandom day getarg getcgi getenv lcase scat sconv sdel skey smult srep substr sword trim ucase match
+
+syn keyword	clStatement	clear clear_eol clear_eos close copy create unique with where empty define define ldefine delay_form delete escape exit_block exit_do exit_process field fork format get getfile getnext getprev goto head join maintain message no_join on_eop on_key on_exit on_delete openin openout openapp pause popenin popenout popenio print put range read redisplay refresh restart_block screen select sleep text unlock write and not or do
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link clifError	Error
+hi def link clSpaceError	Error
+hi def link clWhile		Repeat
+hi def link clConditional	Conditional
+hi def link clDebug		Debug
+hi def link clNeedsWork	Todo
+hi def link clTodo		Todo
+hi def link clComment	Comment
+hi def link clProcedure	Procedure
+hi def link clBreak		Procedure
+hi def link clInclude	Include
+hi def link clSetOption	Statement
+hi def link clSet		Identifier
+hi def link clPreProc	PreProc
+hi def link clOperator	Operator
+hi def link clNumber		Number
+hi def link clString		String
+hi def link clQuote		Delimiter
+hi def link clReserved	Identifier
+hi def link clFunction	Function
+hi def link clStatement	Statement
+
+
+let b:current_syntax = "cl"
+
+" vim: ts=8 sw=8
+
+endif
diff --git a/syntax/clean.vim b/syntax/clean.vim
new file mode 100644
index 000000000..e618bf367
--- /dev/null
+++ b/syntax/clean.vim
@@ -0,0 +1,94 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clean') == -1
+
+" Vim syntax file
+" Language:		Clean
+" Author:		Pieter van Engelen <pietere@sci.kun.nl>
+" Co-Author:	Arthur van Leeuwen <arthurvl@sci.kun.nl>
+" Last Change:	2013 Oct 15 by Jurriën Stutterheim
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Some Clean-keywords
+syn keyword cleanConditional if case
+syn keyword cleanLabel let! with where in of
+syn keyword cleanSpecial Start
+syn keyword cleanKeyword infixl infixr infix
+syn keyword cleanBasicType Int Real Char Bool String
+syn keyword cleanSpecialType World ProcId Void Files File
+syn keyword cleanModuleSystem module implementation definition system
+syn keyword cleanTypeClass class instance export
+
+" Import highlighting
+syn region cleanIncludeRegion start="^\s*\(from\|import\|\s\+\(as\|qualified\)\)" end="\n" contains=cleanIncludeKeyword keepend
+syn keyword cleanIncludeKeyword contained from import as qualified
+
+" To do some Denotation Highlighting
+syn keyword cleanBoolDenot True False
+syn region cleanStringDenot start=+"+ skip=+\(\(\\\\\)\+\|\\"\)+ end=+"+ display
+syn match cleanCharDenot "'\(\\\\\|\\'\|[^'\\]\)\+'" display
+syn match cleanIntegerDenot "[\~+-]\?\<\(\d\+\|0[0-7]\+\|0x[0-9A-Fa-f]\+\)\>" display
+syn match cleanRealDenot "[\~+-]\?\d\+\.\d\+\(E[\~+-]\?\d\+\)\?" display
+
+" To highlight the use of lists, tuples and arrays
+syn region cleanList start="\[" end="\]" contains=ALL
+syn region cleanRecord start="{" end="}" contains=ALL
+syn region cleanArray start="{:" end=":}" contains=ALL
+syn match cleanTuple "([^=]*,[^=]*)" contains=ALL
+
+" To do some Comment Highlighting
+syn region cleanComment start="/\*"  end="\*/" contains=cleanComment,cleanTodo fold
+syn region cleanComment start="//.*" end="$" display contains=cleanTodo
+syn keyword cleanTodo TODO FIXME XXX contained
+
+" Now for some useful type definition recognition
+syn match cleanFuncTypeDef "\([a-zA-Z].*\|(\=[-~@#$%^?!+*<>\/|&=:]\+)\=\)\s*\(infix[lr]\=\)\=\s*\d\=\s*::.*->.*" contains=cleanSpecial,cleanBasicType,cleanSpecialType,cleanKeyword
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+ " Comments
+ hi def link cleanComment      Comment
+ " Constants and denotations
+ hi def link cleanStringDenot  String
+ hi def link cleanCharDenot    Character
+ hi def link cleanIntegerDenot Number
+ hi def link cleanBoolDenot    Boolean
+ hi def link cleanRealDenot    Float
+ " Identifiers
+ " Statements
+ hi def link cleanTypeClass    Keyword
+ hi def link cleanConditional  Conditional
+ hi def link cleanLabel		Label
+ hi def link cleanKeyword      Keyword
+ " Generic Preprocessing
+ hi def link cleanIncludeKeyword      Include
+ hi def link cleanModuleSystem PreProc
+ " Type
+ hi def link cleanBasicType    Type
+ hi def link cleanSpecialType  Type
+ hi def link cleanFuncTypeDef  Typedef
+ " Special
+ hi def link cleanSpecial      Special
+ hi def link cleanList			Special
+ hi def link cleanArray		Special
+ hi def link cleanRecord		Special
+ hi def link cleanTuple		Special
+ " Error
+ " Todo
+ hi def link cleanTodo         Todo
+
+
+let b:current_syntax = "clean"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=4
+
+endif
diff --git a/syntax/cmod.vim b/syntax/cmod.vim
new file mode 100644
index 000000000..7e5529c0a
--- /dev/null
+++ b/syntax/cmod.vim
@@ -0,0 +1,148 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmod') == -1
+
+" Vim syntax file
+" Language:		Cmod
+" Current Maintainer:	Stephen R. van den Berg <srb@cuci.nl>
+" Last Change:		2018 Jan 23
+" Version:      	2.9
+" Remark: Is used to edit Cmod files for Pike development.
+" Remark: Includes a highlighter for any embedded Autodoc format.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Read the C syntax to start with
+runtime! syntax/c.vim
+unlet b:current_syntax
+
+if !exists("c_autodoc")
+  " For embedded Autodoc documentation
+  syn include @cmodAutodoc <sfile>:p:h/autodoc.vim
+  unlet b:current_syntax
+endif
+
+" Supports rotating amongst several same-level preprocessor conditionals
+packadd! matchit
+let b:match_words = "({:}\\@1<=),^\s*#\s*\%(if\%(n\?def\)\|else\|el\%(se\)\?if\|endif\)\>"
+
+" Cmod extensions
+syn keyword cmodStatement	__INIT INIT EXIT GC_RECURSE GC_CHECK
+syn keyword cmodStatement	EXTRA OPTIMIZE RETURN
+syn keyword cmodStatement	ADD_EFUN ADD_EFUN2 ADD_FUNCTION
+syn keyword cmodStatement	MK_STRING MK_STRING_SVALUE CONSTANT_STRLEN
+
+syn keyword cmodStatement	SET_SVAL pop_n_elems pop_stack
+syn keyword cmodStatement	SIMPLE_ARG_TYPE_ERROR Pike_sp Pike_fp MKPCHARP
+syn keyword cmodStatement	SET_SVAL_TYPE REF_MAKE_CONST_STRING INC_PCHARP
+syn keyword cmodStatement	PTR_FROM_INT INHERIT_FROM_PTR
+syn keyword cmodStatement	DECLARE_CYCLIC BEGIN_CYCLIC END_CYCLIC
+syn keyword cmodStatement	UPDATE_LOCATION UNSAFE_IS_ZERO SAFE_IS_ZERO
+syn keyword cmodStatement	MKPCHARP_STR APPLY_MASTER current_storage
+syn keyword cmodStatement	PIKE_MAP_VARIABLE size_shift
+syn keyword cmodStatement	THREADS_ALLOW THREADS_DISALLOW
+
+syn keyword cmodStatement	add_integer_constant ref_push_object
+syn keyword cmodStatement	push_string apply_svalue free_svalue
+syn keyword cmodStatement	get_inherit_storage get_storage
+syn keyword cmodStatement	make_shared_binary_string push_int64
+syn keyword cmodStatement	begin_shared_string end_shared_string
+syn keyword cmodStatement	add_ref fast_clone_object clone_object
+syn keyword cmodStatement	push_undefined push_int ref_push_string
+syn keyword cmodStatement	free_string push_ulongest free_object
+syn keyword cmodStatement	convert_stack_top_to_bignum push_array
+syn keyword cmodStatement	push_object reduce_stack_top_bignum
+syn keyword cmodStatement	push_static_text apply_current
+syn keyword cmodStatement	assign_svalue free_program destruct_object
+syn keyword cmodStatement	start_new_program low_inherit stack_swap
+syn keyword cmodStatement	generic_error_program end_program
+syn keyword cmodStatement	free_array apply_external copy_mapping
+syn keyword cmodStatement	push_constant_text ref_push_mapping
+syn keyword cmodStatement	mapping_insert mapping_string_insert_string
+syn keyword cmodStatement	f_aggregate_mapping f_aggregate apply
+syn keyword cmodStatement	push_mapping push_svalue low_mapping_lookup
+syn keyword cmodStatement	assign_svalues_no_free f_add
+syn keyword cmodStatement	push_empty_string stack_dup assign_lvalue
+syn keyword cmodStatement	low_mapping_string_lookup allocate_mapping
+syn keyword cmodStatement	copy_shared_string make_shared_binary_string0
+syn keyword cmodStatement	f_call_function f_index f_utf8_to_string
+syn keyword cmodStatement	finish_string_builder init_string_builder
+syn keyword cmodStatement	reset_string_builder free_string_builder
+syn keyword cmodStatement	string_builder_putchar get_all_args
+syn keyword cmodStatement	add_shared_strings check_all_args
+syn keyword cmodStatement	do_inherit add_string_constant
+syn keyword cmodStatement	add_program_constant set_init_callback
+syn keyword cmodStatement	simple_mapping_string_lookup
+syn keyword cmodStatement	f_sprintf push_text string_has_null
+syn keyword cmodStatement	end_and_resize_shared_string
+
+syn keyword cmodStatement	args sp
+
+syn keyword cmodStatement	free
+
+syn keyword cmodConstant	ID_PROTECTED ID_FINAL PIKE_DEBUG
+syn keyword cmodConstant	NUMBER_NUMBER
+syn keyword cmodConstant	PIKE_T_INT PIKE_T_STRING PIKE_T_ARRAY
+syn keyword cmodConstant	PIKE_T_MULTISET PIKE_T_OBJECT PIKE_T_MAPPING
+syn keyword cmodConstant	NUMBER_UNDEFINED PIKE_T_PROGRAM PIKE_T_FUNCTION
+syn keyword cmodConstant	T_OBJECT T_STRING T_ARRAY T_MAPPING
+
+syn keyword cmodException	SET_ONERROR UNSET_ONERROR ONERROR
+syn keyword cmodException	CALL_AND_UNSET_ONERROR
+
+syn keyword cmodDebug		Pike_fatal Pike_error check_stack
+
+syn keyword cmodAccess		public protected private INHERIT
+syn keyword cmodAccess		CTYPE CVAR PIKEVAR PIKEFUN
+
+syn keyword cmodModifier	efun export flags optflags optfunc
+syn keyword cmodModifier	type rawtype errname name c_name prototype
+syn keyword cmodModifier	program_flags gc_trivial PMOD_EXPORT
+syn keyword cmodModifier	ATTRIBUTE noclone noinline
+syn keyword cmodModifier	tOr tFuncV tInt tMix tVoid tStr tMap tPrg
+syn keyword cmodModifier	tSetvar tArr tMult tMultiset
+syn keyword cmodModifier	tArray tMapping tString tSetvar tVar
+
+syn keyword cmodType		bool mapping string multiset array mixed
+syn keyword cmodType		object function program auto svalue
+syn keyword cmodType		bignum longest zero pike_string
+syn keyword cmodType		this this_program THIS INT_TYPE INT64 INT32
+syn keyword cmodType		p_wchar2 PCHARP p_wchar1 p_wchar0 MP_INT
+
+syn keyword cmodOperator	_destruct create __hash _sizeof _indices _values
+syn keyword cmodOperator	_is_type _sprintf _equal _m_delete _get_iterator
+syn keyword cmodOperator	_search _types _serialize _deserialize
+syn keyword cmodOperator	_size_object _random _sqrt TYPEOF SUBTYPEOF
+syn keyword cmodOperator	LIKELY UNLIKELY
+
+syn keyword cmodStructure	DECLARATIONS PIKECLASS DECLARE_STORAGE
+
+if !exists("c_autodoc")
+  syn match cmodAutodocReal display contained "\%(//\|[/ \t\v]\*\|^\*\)\@2<=!.*" contains=@cmodAutodoc containedin=cComment,cCommentL
+  syn cluster cCommentGroup add=cmodAutodocReal
+  syn cluster cPreProcGroup add=cmodAutodocReal
+endif
+
+" Default highlighting
+hi def link cmodAccess		Statement
+hi def link cmodOperator	Operator
+hi def link cmodStatement	Statement
+hi def link cmodConstant	Constant
+hi def link cmodModifier	Type
+hi def link cmodType		Type
+hi def link cmodStorageClass	StorageClass
+hi def link cmodStructure	Structure
+hi def link cmodException	Exception
+hi def link cmodDebug		Debug
+
+let b:current_syntax = "cmod"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/cmusrc.vim b/syntax/cmusrc.vim
new file mode 100644
index 000000000..1bcbd5693
--- /dev/null
+++ b/syntax/cmusrc.vim
@@ -0,0 +1,313 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmusrc') == -1
+
+" Vim syntax file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-06-17
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword+=-
+
+syn keyword cmusrcTodo          contained TODO FIXME XXX NOTE
+
+syn match   cmusrcComment       contained display '^\s*#.*$'
+
+syn match   cmusrcBegin         display '^'
+                                \ nextgroup=cmusrcKeyword,cmusrcComment
+                                \ skipwhite
+
+syn keyword cmusrcKeyword       contained add
+                                \ nextgroup=cmusrcAddSwitches,cmusrcURI
+                                \ skipwhite
+
+syn match   cmusrcAddSwitches   contained display '-[lpqQ]'
+                                \ nextgroup=cmusrcURI
+                                \ skipwhite
+
+syn match   cmusrcURI           contained display '.\+'
+
+syn keyword cmusrcKeyword       contained bind
+                                \ nextgroup=cmusrcBindSwitches,
+                                \           cmusrcBindContext
+                                \ skipwhite
+
+syn match   cmusrcBindSwitches  contained display '-[f]'
+                                \ nextgroup=cmusrcBindContext
+                                \ skipwhite
+
+syn keyword cmusrcBindContext   contained common library playlist queue
+                                \ browser filters
+                                \ nextgroup=cmusrcBindKey
+                                \ skipwhite
+
+syn match   cmusrcBindKey       contained display '\S\+'
+                                \ nextgroup=cmusrcKeyword
+                                \ skipwhite
+
+syn keyword cmusrcKeyword       contained browser-up colorscheme echo factivate
+                                \ filter invert player-next player-pause
+                                \ player-play player-prev player-stop quit
+                                \ refresh run search-next search-prev shuffle
+                                \ unmark win-activate win-add-l win-add-p
+                                \ win-add-Q win-add-q win-bottom win-down
+                                \ win-mv-after win-mv-before win-next
+                                \ win-page-down win-page-up win-remove
+                                \ win-sel-cur win-toggle win-top win-up
+                                \ win-update
+
+syn keyword cmusrcKeyword       contained cd
+                                \ nextgroup=cmusrcDirectory
+                                \ skipwhite
+
+syn match   cmusrcDirectory     contained display '.\+'
+
+syn keyword cmusrcKeyword       contained clear
+                                \ nextgroup=cmusrcClearSwitches
+
+syn match   cmusrcClearSwitches contained display '-[lpq]'
+
+syn keyword cmusrcKeyword       contained fset
+                                \ nextgroup=cmusrcFSetName
+                                \ skipwhite
+
+syn match   cmusrcFSetName      contained display '[^=]\+'
+                                \ nextgroup=cmusrcFSetEq
+
+syn match   cmusrcFSetEq        contained display '='
+                                \ nextgroup=cmusrcFilterExpr
+
+syn match   cmusrcFilterExpr    contained display '.\+'
+
+syn keyword cmusrcKeyword       contained load
+                                \ nextgroup=cmusrcLoadSwitches,cmusrcURI
+                                \ skipwhite
+
+syn match   cmusrcLoadSwitches  contained display '-[lp]'
+                                \ nextgroup=cmusrcURI
+                                \ skipwhite
+
+syn keyword cmusrcKeyword       contained mark
+                                \ nextgroup=cmusrcFilterExpr
+
+syn keyword cmusrcKeyword       contained save
+                                \ nextgroup=cmusrcSaveSwitches,cmusrcFile
+                                \ skipwhite
+
+syn match   cmusrcSaveSwitches  contained display '-[lp]'
+                                \ nextgroup=cmusrcFile
+                                \ skipwhite
+
+syn match   cmusrcFile          contained display '.\+'
+
+syn keyword cmusrcKeyword       contained seek
+                                \ nextgroup=cmusrcSeekOffset
+                                \ skipwhite
+
+syn match   cmusrcSeekOffset    contained display
+      \ '[+-]\=\%(\d\+[mh]\=\|\%(\%(0\=\d\|[1-5]\d\):\)\=\%(0\=\d\|[1-5]\d\):\%(0\=\d\|[1-5]\d\)\)'
+
+syn keyword cmusrcKeyword       contained set
+                                \ nextgroup=cmusrcOption
+                                \ skipwhite
+
+syn keyword cmusrcOption        contained auto_reshuffle confirm_run
+                                \ continue play_library play_sorted repeat
+                                \ show_hidden show_remaining_time shuffle
+                                \ nextgroup=cmusrcSetTest,cmusrcOptEqBoolean
+
+syn match   cmusrcSetTest       contained display '?'
+
+syn match   cmusrcOptEqBoolean  contained display '='
+                                \ nextgroup=cmusrcOptBoolean
+
+syn keyword cmusrcOptBoolean    contained true false
+
+syn keyword cmusrcOption        contained aaa_mode
+                                \ nextgroup=cmusrcOptEqAAA
+
+syn match   cmusrcOptEqAAA      contained display '='
+                                \ nextgroup=cmusrcOptAAA
+
+syn keyword cmusrcOptAAA        contained all artist album
+
+syn keyword cmusrcOption        contained buffer_seconds
+                                \ nextgroup=cmusrcOptEqNumber
+
+syn match   cmusrcOptEqNumber   contained display '='
+                                \ nextgroup=cmusrcOptNumber
+
+syn match   cmusrcOptNumber     contained display '\d\+'
+
+syn keyword cmusrcOption        contained altformat_current altformat_playlist
+                                \ altformat_title altformat_trackwin
+                                \ format_current format_playlist format_title
+                                \ format_trackwin
+                                \ nextgroup=cmusrcOptEqFormat
+
+syn match   cmusrcOptEqFormat   contained display '='
+                                \ nextgroup=cmusrcOptFormat
+
+syn match   cmusrcOptFormat     contained display '.\+'
+                                \ contains=cmusrcFormatSpecial
+
+syn match   cmusrcFormatSpecial contained display '%[0-]*\d*[alDntgydfF=%]'
+
+syn keyword cmusrcOption        contained color_cmdline_bg color_cmdline_fg
+                                \ color_error color_info color_separator
+                                \ color_statusline_bg color_statusline_fg
+                                \ color_titleline_bg color_titleline_fg
+                                \ color_win_bg color_win_cur
+                                \ color_win_cur_sel_bg color_win_cur_sel_fg
+                                \ color_win_dir color_win_fg
+                                \ color_win_inactive_cur_sel_bg
+                                \ color_win_inactive_cur_sel_fg
+                                \ color_win_inactive_sel_bg
+                                \ color_win_inactive_sel_fg
+                                \ color_win_sel_bg color_win_sel_fg
+                                \ color_win_title_bg color_win_title_fg
+                                \ nextgroup=cmusrcOptEqColor
+
+syn match   cmusrcOptEqColor    contained display '='
+                                \ nextgroup=@cmusrcOptColor
+
+syn cluster cmusrcOptColor      contains=cmusrcOptColorName,cmusrcOptColorValue
+
+syn keyword cmusrcOptColorName  contained default black red green yellow blue
+                                \ magenta cyan gray darkgray lightred lightred
+                                \ lightgreen lightyellow lightblue lightmagenta
+                                \ lightcyan white
+
+syn match   cmusrcOptColorValue contained display
+                        \ '-1\|0*\%(\d\|[1-9]\d\|1\d\d\|2\%([0-4]\d\|5[0-5]\)\)'
+
+syn keyword cmusrcOption        contained id3_default_charset output_plugin
+                                \ status_display_program
+                                \ nextgroup=cmusrcOptEqString
+
+syn match   cmusrcOption        contained
+                    \ '\%(dsp\|mixer\)\.\%(alsa\|oss\|sun\)\.\%(channel\|device\)'
+                    \ nextgroup=cmusrcOptEqString
+
+syn match   cmusrcOption        contained
+                    \ 'dsp\.ao\.\%(buffer_size\|driver\|wav_counter\|wav_dir\)'
+                    \ nextgroup=cmusrcOptEqString
+
+syn match   cmusrcOptEqString   contained display '='
+                                \ nextgroup=cmusrcOptString
+
+syn match   cmusrcOptString     contained display '.\+'
+
+syn keyword cmusrcOption        contained lib_sort pl_sort
+                                \ nextgroup=cmusrcOptEqSortKeys
+
+syn match   cmusrcOptEqSortKeys contained display '='
+                                \ nextgroup=cmusrcOptSortKeys
+
+syn keyword cmusrcOptSortKeys   contained artist album title tracknumber
+                                \ discnumber date genre filename
+                                \ nextgroup=cmusrcOptSortKeys
+                                \ skipwhite
+
+syn keyword cmusrcKeyword       contained showbind
+                                \ nextgroup=cmusrcSBindContext
+                                \ skipwhite
+
+syn keyword cmusrcSBindContext  contained common library playlist queue
+                                \ browser filters
+                                \ nextgroup=cmusrcSBindKey
+                                \ skipwhite
+
+syn match   cmusrcSBindKey      contained display '\S\+'
+
+syn keyword cmusrcKeyword       contained toggle
+                                \ nextgroup=cmusrcTogglableOpt
+                                \ skipwhite
+
+syn keyword cmusrcTogglableOpt  contained auto_reshuffle aaa_mode
+                                \ confirm_run continue play_library play_sorted
+                                \ repeat show_hidden show_remaining_time shuffle
+
+syn keyword cmusrcKeyword       contained unbind
+                                \ nextgroup=cmusrcUnbindSwitches,
+                                \           cmusrcSBindContext
+                                \ skipwhite
+
+syn match   cmusrcUnbindSwitches  contained display '-[f]'
+                                  \ nextgroup=cmusrcSBindContext
+                                  \ skipwhite
+
+syn keyword cmusrcKeyword       contained view
+                                \ nextgroup=cmusrcView
+                                \ skipwhite
+
+syn keyword cmusrcView          contained library playlist queue browser filters
+syn match   cmusrcView          contained display '[1-6]'
+
+syn keyword cmusrcKeyword       contained vol
+                                \ nextgroup=cmusrcVolume1
+                                \ skipwhite
+
+syn match   cmusrcVolume1       contained display '[+-]\=\d\+%'
+                                \ nextgroup=cmusrcVolume2
+                                \ skipwhite
+
+syn match   cmusrcVolume2       contained display '[+-]\=\d\+%'
+
+hi def link cmusrcTodo            Todo
+hi def link cmusrcComment         Comment
+hi def link cmusrcKeyword         Keyword
+hi def link cmusrcSwitches        Special
+hi def link cmusrcAddSwitches     cmusrcSwitches
+hi def link cmusrcURI             Normal
+hi def link cmusrcBindSwitches    cmusrcSwitches
+hi def link cmusrcContext         Type
+hi def link cmusrcBindContext     cmusrcContext
+hi def link cmusrcKey             String
+hi def link cmusrcBindKey         cmusrcKey
+hi def link cmusrcDirectory       Normal
+hi def link cmusrcClearSwitches   cmusrcSwitches
+hi def link cmusrcFSetName        PreProc
+hi def link cmusrcEq              Normal
+hi def link cmusrcFSetEq          cmusrcEq
+hi def link cmusrcFilterExpr      Normal
+hi def link cmusrcLoadSwitches    cmusrcSwitches
+hi def link cmusrcSaveSwitches    cmusrcSwitches
+hi def link cmusrcFile            Normal
+hi def link cmusrcSeekOffset      Number
+hi def link cmusrcOption          PreProc
+hi def link cmusrcSetTest         Normal
+hi def link cmusrcOptBoolean      Boolean
+hi def link cmusrcOptEqAAA        cmusrcEq
+hi def link cmusrcOptAAA          Identifier
+hi def link cmusrcOptEqNumber     cmusrcEq
+hi def link cmusrcOptNumber       Number
+hi def link cmusrcOptEqFormat     cmusrcEq
+hi def link cmusrcOptFormat       String
+hi def link cmusrcFormatSpecial   SpecialChar
+hi def link cmusrcOptEqColor      cmusrcEq
+hi def link cmusrcOptColor        Normal
+hi def link cmusrcOptColorName    cmusrcOptColor
+hi def link cmusrcOptColorValue   cmusrcOptColor
+hi def link cmusrcOptEqString     cmusrcEq
+hi def link cmusrcOptString       Normal
+hi def link cmusrcOptEqSortKeys   cmusrcEq
+hi def link cmusrcOptSortKeys     Identifier
+hi def link cmusrcSBindContext    cmusrcContext
+hi def link cmusrcSBindKey        cmusrcKey
+hi def link cmusrcTogglableOpt    cmusrcOption
+hi def link cmusrcUnbindSwitches  cmusrcSwitches
+hi def link cmusrcView            Normal
+hi def link cmusrcVolume1         Number
+hi def link cmusrcVolume2         Number
+
+let b:current_syntax = "cmusrc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/cobol.vim b/syntax/cobol.vim
new file mode 100644
index 000000000..d3a723f34
--- /dev/null
+++ b/syntax/cobol.vim
@@ -0,0 +1,264 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cobol') == -1
+
+" Vim syntax file
+" Language:     COBOL
+" Maintainer: Ankit Jain <ajatkj@yahoo.co.in>
+"     (formerly Tim Pope <vimNOSPAM@tpope.info>)
+"     (formerly Davyd Ondrejko <vondraco@columbus.rr.com>)
+"     (formerly Sitaram Chamarty <sitaram@diac.com> and
+"               James Mitchell <james_mitchell@acm.org>)
+" Last Change:    2019 Mar 22
+" Ankit Jain      22.03.2019     Changes & fixes:
+"                                1. Include inline comments
+"                                2. Use comment highlight for bad lines
+"                                3. Change certain 'keywords' to 'matches' 
+"                                for additional highlighting
+"                                4. Different highlighting for COPY, GO TO &
+"                                CALL lines
+"                                5. Fix for COMP keyword
+"                                6. Fix for PROCEDURE DIVISION highlighting
+"                                7. Highlight EXIT PROGRAM like STOP RUN
+"                                8. Highlight X & A in PIC clause
+"                                Tag: #C22032019
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" MOST important - else most of the keywords wont work!
+setlocal isk=@,48-57,-,_
+
+if !exists('g:cobol_inline_comment')
+   let g:cobol_inline_comment=0
+endif
+
+syn case ignore
+
+syn cluster cobolStart      contains=cobolAreaA,cobolAreaB,cobolComment,cobolCompiler
+syn cluster cobolAreaA      contains=cobolParagraph,cobolSection,cobolDivision
+"syn cluster cobolAreaB      contains=
+syn cluster cobolAreaAB     contains=cobolLine
+syn cluster cobolLine       contains=cobolReserved
+syn match   cobolMarker     "^\%( \{,5\}[^ ]\)\@=.\{,6}" nextgroup=@cobolStart
+syn match   cobolSpace      "^ \{6\}"  nextgroup=@cobolStart
+syn match   cobolAreaA      " \{1,4\}"  contained nextgroup=@cobolAreaA,@cobolAreaAB
+syn match   cobolAreaB      " \{5,\}\|- *" contained nextgroup=@cobolAreaB,@cobolAreaAB
+syn match   cobolComment    "[/*C].*$" contained
+syn match   cobolCompiler   "$.*$"     contained
+syn match   cobolLine       ".*$"      contained contains=cobolReserved,@cobolLine
+
+"#C22032019: Fix for PROCEDURE DIVISION USING highlighting, removed . from the
+"end of the regex
+"syn match   cobolDivision       \"[A-Z][A-Z0-9-]*[A-Z0-9]\s\+DIVISION\."he=e-1 contained contains=cobolDivisionName
+syn match   cobolDivision       "[A-Z][A-Z0-9-]*[A-Z0-9]\s\+DIVISION" contained contains=cobolDivisionName
+syn keyword cobolDivisionName   contained IDENTIFICATION ENVIRONMENT DATA PROCEDURE
+syn match   cobolSection        "[A-Z][A-Z0-9-]*[A-Z0-9]\s\+SECTION\."he=e-1  contained contains=cobolSectionName
+syn keyword cobolSectionName    contained CONFIGURATION INPUT-OUTPUT FILE WORKING-STORAGE LOCAL-STORAGE LINKAGE
+syn match   cobolParagraph      "\a[A-Z0-9-]*[A-Z0-9]\.\|\d[A-Z0-9-]*[A-Z]\."he=e-1             contained contains=cobolParagraphName
+syn keyword cobolParagraphName  contained PROGRAM-ID SOURCE-COMPUTER OBJECT-COMPUTER SPECIAL-NAMES FILE-CONTROL I-O-CONTROL
+
+
+"syn match cobolKeys "^\a\{1,6\}" contains=cobolReserved
+"#C22032019: Remove BY, REPLACING, PROGRAM, TO, IN from 'keyword' group and add
+"to 'match' group or other 'keyword' group
+syn keyword cobolReserved contained ACCEPT ACCESS ADD ADDRESS ADVANCING AFTER ALPHABET ALPHABETIC
+syn keyword cobolReserved contained ALPHABETIC-LOWER ALPHABETIC-UPPER ALPHANUMERIC ALPHANUMERIC-EDITED ALS
+syn keyword cobolReserved contained ALTERNATE AND ANY ARE AREA AREAS ASCENDING ASSIGN AT AUTHOR BEFORE BINARY
+syn keyword cobolReserved contained BLANK BLOCK BOTTOM CANCEL CBLL CD CF CH CHARACTER CHARACTERS CLASS
+syn keyword cobolReserved contained CLOCK-UNITS CLOSE COBOL CODE CODE-SET COLLATING COLUMN COMMA COMMON
+syn keyword cobolReserved contained COMMUNICATIONS COMPUTATIONAL COMPUTE CONTENT CONTINUE
+syn keyword cobolReserved contained CONTROL CONVERTING CORR CORRESPONDING COUNT CURRENCY DATE DATE-COMPILED
+syn keyword cobolReserved contained DATE-WRITTEN DAY DAY-OF-WEEK DE DEBUG-CONTENTS DEBUG-ITEM DEBUG-LINE
+syn keyword cobolReserved contained DEBUG-NAME DEBUG-SUB-1 DEBUG-SUB-2 DEBUG-SUB-3 DEBUGGING DECIMAL-POINT
+syn keyword cobolReserved contained DELARATIVES DELETE DELIMITED DELIMITER DEPENDING DESCENDING DESTINATION
+syn keyword cobolReserved contained DETAIL DISABLE DISPLAY DIVIDE DIVISION DOWN DUPLICATES DYNAMIC EGI ELSE EMI
+syn keyword cobolReserved contained ENABLE END-ADD END-COMPUTE END-DELETE END-DIVIDE END-EVALUATE END-IF
+syn keyword cobolReserved contained END-MULTIPLY END-OF-PAGE END-READ END-RECEIVE END-RETURN
+syn keyword cobolReserved contained END-REWRITE END-SEARCH END-START END-STRING END-SUBTRACT END-UNSTRING
+syn keyword cobolReserved contained END-WRITE EQUAL ERROR ESI EVALUATE EVERY EXCEPTION EXIT
+syn keyword cobolReserved contained EXTEND EXTERNAL FALSE FD FILLER FINAL FIRST FOOTING FOR FROM
+syn keyword cobolReserved contained GENERATE GIVING GLOBAL GREATER GROUP HEADING HIGH-VALUE HIGH-VALUES I-O
+syn keyword cobolReserved contained INDEX INDEXED INDICATE INITIAL INITIALIZE
+syn keyword cobolReserved contained INITIATE INPUT INSPECT INSTALLATION INTO IS JUST
+syn keyword cobolReserved contained JUSTIFIED KEY LABEL LAST LEADING LEFT LENGTH LOCK MEMORY
+syn keyword cobolReserved contained MERGE MESSAGE MODE MODULES MOVE MULTIPLE MULTIPLY NATIVE NEGATIVE NEXT NO NOT
+syn keyword cobolReserved contained NUMBER NUMERIC NUMERIC-EDITED OCCURS OF OFF OMITTED ON OPEN
+syn keyword cobolReserved contained OPTIONAL OR ORDER ORGANIZATION OTHER OUTPUT OVERFLOW PACKED-DECIMAL PADDING
+syn keyword cobolReserved contained PAGE PAGE-COUNTER PERFORM PF PH PIC PICTURE PLUS POINTER POSITION POSITIVE
+syn keyword cobolReserved contained PRINTING PROCEDURES PROCEDD PURGE QUEUE QUOTES
+syn keyword cobolReserved contained RANDOM RD READ RECEIVE RECORD RECORDS REDEFINES REEL REFERENCE REFERENCES
+syn keyword cobolReserved contained RELATIVE RELEASE REMAINDER REMOVAL REPLACE REPORT REPORTING
+syn keyword cobolReserved contained REPORTS RERUN RESERVE RESET RETURN RETURNING REVERSED REWIND REWRITE RF RH
+syn keyword cobolReserved contained RIGHT ROUNDED RUN SAME SD SEARCH SECTION SECURITY SEGMENT SEGMENT-LIMITED
+syn keyword cobolReserved contained SELECT SEND SENTENCE SEPARATE SEQUENCE SEQUENTIAL SET SIGN SIZE SORT
+syn keyword cobolReserved contained SORT-MERGE SOURCE STANDARD
+syn keyword cobolReserved contained STANDARD-1 STANDARD-2 START STATUS STOP STRING SUB-QUEUE-1 SUB-QUEUE-2
+syn keyword cobolReserved contained SUB-QUEUE-3 SUBTRACT SUM SUPPRESS SYMBOLIC SYNC SYNCHRONIZED TABLE TALLYING
+syn keyword cobolReserved contained TAPE TERMINAL TERMINATE TEST TEXT THAN THEN THROUGH THRU TIME TIMES TOP
+syn keyword cobolReserved contained TRAILING TRUE TYPE UNIT UNSTRING UNTIL UP UPON USAGE USE USING VALUE VALUES
+syn keyword cobolReserved contained VARYING WHEN WITH WORDS WRITE
+syn match   cobolReserved contained "\<CONTAINS\>"
+syn match   cobolReserved contained "\<\(IF\|INVALID\|END\|EOP\)\>"
+syn match   cobolReserved contained "\<ALL\>"
+" #C22032019: Add BY as match instead of keyword: BY not followed by ==
+syn match   cobolReserved contained "\<BY\>\s\+\(==\)\@!"
+syn match   cobolReserved contained "\<TO\>"
+
+syn cluster cobolLine     add=cobolConstant,cobolNumber,cobolPic
+syn keyword cobolConstant SPACE SPACES NULL ZERO ZEROES ZEROS LOW-VALUE LOW-VALUES
+
+" #C22032019: Fix for many pic clauses
+syn match   cobolNumber       "\<-\=\d*\.\=\d\+\>" contained
+" syn match   cobolPic		\"\<S*9\+\>" contained
+syn match   cobolPic		"\<S*9\+V*9*\>" contained
+syn match   cobolPic		"\<$*\.\=9\+\>" contained
+syn match   cobolPic		"\<Z*\.\=9\+\>" contained
+syn match   cobolPic		"\<V9\+\>" contained
+syn match   cobolPic		"\<9\+V\>" contained
+" syn match   cobolPic		\"\<-\+[Z9]\+\>" contained
+syn match   cobolPic		"\<-*[Z9]\+-*\>" contained
+" #C22032019: Add Z,X and A to cobolPic
+syn match   cobolPic		"\<[ZXA]\+\>" contained
+syn match   cobolTodo		"todo" contained containedin=cobolInlineComment,cobolComment
+
+" For MicroFocus or other inline comments, include this line.
+if g:cobol_inline_comment == 1
+   syn region  cobolInlineComment     start="*>" end="$" contains=cobolTodo,cobolMarker
+   syn cluster cobolLine       add=cobolInlineComment
+endif
+
+syn match   cobolBadLine      "[^ D\*$/-].*" contained
+
+" If comment mark somehow gets into column past Column 7.
+if g:cobol_inline_comment == 1
+   " #C22032019: It is a bad line only if * is not followed by > when inline
+   " comments enabled
+   syn match   cobolBadLine      "\s\+\*\(>\)\@!.*" contained
+else
+   syn match   cobolBadLine      "\s\+\*.*" contained
+endif
+syn cluster cobolStart        add=cobolBadLine
+
+" #C22032019: Different highlighting for GO TO statements
+" syn keyword cobolGoTo		GO GOTO
+syn keyword cobolGoTo		GOTO
+syn match cobolGoTo		/\<GO\>\s\+\<TO\>/
+syn match cobolGoToPara       /\<GO\>\s\+\<TO\>\s\+[A-Z0-9-]\+/ contains=cobolGoTo
+" #C22032019: Highlight copybook name and location in using different group
+" syn keyword cobolCopy		COPY
+syn match cobolCopy		"\<COPY\>\|\<IN\>"
+syn match cobolCopy           "\<REPLACING\>\s\+\(==\)\@="
+syn match cobolCopy           "\<BY\>\s\+\(==\)\@="
+syn match cobolCopyName       "\<COPY\>\s\+[A-Z0-9]\+\(\s\+\<IN\>\s\+[A-Z0-9]\+\)\?" contains=cobolCopy
+syn cluster cobolLine         add=cobolGoToPara,cobolCopyName
+
+" cobolBAD: things that are BAD NEWS!
+syn keyword cobolBAD		ALTER ENTER RENAMES
+
+syn cluster cobolLine       add=cobolGoTo,cobolCopy,cobolBAD,cobolWatch,cobolEXECs
+
+" cobolWatch: things that are important when trying to understand a program
+syn keyword cobolWatch		OCCURS DEPENDING VARYING BINARY COMP REDEFINES
+" #C22032019: Remove REPLACING from cobolWatch 'keyword' group and add to cobolCopy &
+"            cobolWatch 'match' group
+" syn keyword cobolWatch		REPLACING RUN
+syn keyword cobolWatch		RUN PROGRAM
+syn match   cobolWatch contained "\<REPLACING\>\s\+\(==\)\@!"
+" #C22032019: Look for word starting with COMP
+" syn match   cobolWatch		\"COMP-[123456XN]"
+syn match   cobolWatch		"\<COMP-[123456XN]"
+
+syn keyword cobolEXECs		EXEC END-EXEC
+
+
+syn cluster cobolAreaA      add=cobolDeclA
+syn cluster cobolAreaAB     add=cobolDecl
+syn match   cobolDeclA      "\(0\=1\|77\|78\) " contained nextgroup=cobolLine
+syn match   cobolDecl		"[1-4]\d " contained nextgroup=cobolLine
+syn match   cobolDecl		"0\=[2-9] " contained nextgroup=cobolLine
+syn match   cobolDecl		"66 " contained nextgroup=cobolLine
+
+syn match   cobolWatch		"88 " contained nextgroup=cobolLine
+
+"syn match   cobolBadID		"\k\+-\($\|[^-A-Z0-9]\)" contained
+
+syn cluster cobolLine       add=cobolCALLs,cobolString,cobolCondFlow
+" #C22032019: Changes for cobolCALLs group to include thru
+" syn keyword cobolCALLs		CALL END-CALL CANCEL GOBACK PERFORM END-PERFORM INVOKE
+syn keyword cobolCALLs		END-CALL CANCEL GOBACK PERFORM END-PERFORM INVOKE THRU
+" #C22032019: Highlight called program
+" syn match   cobolCALLs		\"EXIT \+PROGRAM"
+syn match   cobolCALLs		"\<CALL\>"
+syn match   cobolCALLProg     /\<CALL\>\s\+"\{0,1\}[A-Z0-9]\+"\{0,1\}/ contains=cobolCALLs
+syn match   cobolExtras       /\<VALUE \+\d\+\./hs=s+6,he=e-1
+syn cluster cobolLine         add=cobolCALLProg
+
+syn match   cobolString       /"[^"]*\("\|$\)/
+syn match   cobolString       /'[^']*\('\|$\)/
+
+"syn region  cobolLine        start="^.\{6}[ D-]" end="$" contains=ALL
+syn match   cobolIndicator   "\%7c[D-]" contained
+
+if exists("cobol_legacy_code")
+  syn region  cobolCondFlow     contains=ALLBUT,cobolLine start="\<\(IF\|INVALID\|END\|EOP\)\>" skip=/\('\|"\)[^"]\{-}\("\|'\|$\)/ end="\." keepend
+endif
+
+" many legacy sources have junk in columns 1-6: must be before others
+" Stuff after column 72 is in error - must be after all other "match" entries
+if exists("cobol_legacy_code")
+    syn match   cobolBadLine      "\%73c.*" containedin=ALLBUT,cobolComment
+else
+    " #C22032019: Use comment highlighting for bad lines 
+    " syn match   cobolBadLine      \"\%73c.*" containedin=ALL
+    syn match   cobolBadLine      "\%73c.*" containedin=ALL,cobolInlineComment,cobolComment
+endif
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link cobolBAD      Error
+hi def link cobolBadID    Error
+hi def link cobolBadLine  Error
+if exists("g:cobol_legacy_code")
+    hi def link cobolMarker   Comment
+else
+    hi def link cobolMarker   Error
+endif
+hi def link cobolCALLs          Function
+hi def link cobolCALLProg       Special
+hi def link cobolComment        Comment
+hi def link cobolInlineComment  Comment  
+hi def link cobolKeys           Comment
+hi def link cobolAreaB          Special
+hi def link cobolCompiler       PreProc
+hi def link cobolCondFlow       Special
+hi def link cobolCopy           PreProc
+hi def link cobolCopyName       Special
+hi def link cobolDeclA          cobolDecl
+hi def link cobolDecl           Type
+hi def link cobolExtras         Special
+hi def link cobolGoTo           Special
+hi def link cobolGoToPara       Function
+hi def link cobolConstant       Constant
+hi def link cobolNumber         Constant
+hi def link cobolPic            Constant
+hi def link cobolReserved       Statement
+hi def link cobolDivision       Label
+hi def link cobolSection        Label
+hi def link cobolParagraph      Label
+hi def link cobolDivisionName   Keyword
+hi def link cobolSectionName    Keyword
+hi def link cobolParagraphName  Keyword
+hi def link cobolString         Constant
+hi def link cobolTodo           Todo
+hi def link cobolWatch          Special
+hi def link cobolIndicator      Special
+hi def link cobolStart          Comment
+
+
+let b:current_syntax = "cobol"
+
+" vim: ts=6 nowrap
+
+endif
diff --git a/syntax/coco.vim b/syntax/coco.vim
new file mode 100644
index 000000000..298279ad7
--- /dev/null
+++ b/syntax/coco.vim
@@ -0,0 +1,36 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coco') == -1
+
+" Vim syntax file
+" Language:     Coco/R
+" Maintainer:   Ashish Shukla <wahjava@gmail.com>
+" Last Change:  2007 Aug 10
+" Remark:       Coco/R syntax partially implemented.
+" License:      Vim license
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+syn keyword cocoKeywords ANY CHARACTERS COMMENTS COMPILER CONTEXT END FROM IF IGNORE IGNORECASE NESTED PRAGMAS PRODUCTIONS SYNC TO TOKENS WEAK
+syn match   cocoUnilineComment    #//.*$#
+syn match   cocoIdentifier        /[[:alpha:]][[:alnum:]]*/
+syn region  cocoMultilineComment  start=#/[*]# end=#[*]/#
+syn region  cocoString            start=/"/ skip=/\\"\|\\\\/ end=/"/
+syn region  cocoCharacter         start=/'/ skip=/\\'\|\\\\/ end=/'/
+syn match   cocoOperator          /+\||\|\.\.\|-\|(\|)\|{\|}\|\[\|\]\|=\|<\|>/
+syn region  cocoProductionCode    start=/([.]/ end=/[.])/
+syn match   cocoPragma            /[$][[:alnum:]]*/
+
+hi def link cocoKeywords         Keyword
+hi def link cocoUnilineComment   Comment 
+hi def link cocoMultilineComment Comment
+hi def link cocoIdentifier       Identifier
+hi def link cocoString           String
+hi def link cocoCharacter        Character
+hi def link cocoOperator         Operator
+hi def link cocoProductionCode   Statement
+hi def link cocoPragma           Special
+
+
+endif
diff --git a/syntax/conaryrecipe.vim b/syntax/conaryrecipe.vim
new file mode 100644
index 000000000..1406c6867
--- /dev/null
+++ b/syntax/conaryrecipe.vim
@@ -0,0 +1,141 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'conaryrecipe') == -1
+
+" Vim syntax file
+" Language:	Conary Recipe
+" Maintainer:	rPath Inc <http://www.rpath.com>
+" Updated:	2007-12-08
+
+if exists("b:current_syntax")
+  finish
+endif
+
+runtime! syntax/python.vim
+
+syn keyword conarySFunction	mainDir addAction addSource addArchive addPatch
+syn keyword conarySFunction	addRedirect addSvnSnapshot addMercurialSnapshot
+syn keyword conarySFunction	addCvsSnapshot addGitSnapshot addBzrSnapshot
+
+syn keyword conaryGFunction	add addAll addNewGroup addReference createGroup
+syn keyword conaryGFunction	addNewGroup startGroup remove removeComponents
+syn keyword conaryGFunction	replace setByDefault setDefaultGroup 
+syn keyword conaryGFunction	setLabelPath addCopy setSearchPath AddAllFlags
+syn keyword conaryGFunction	GroupRecipe GroupReference TroveCacheWrapper
+syn keyword conaryGFunction	TroveCache buildGroups findTrovesForGroups
+syn keyword conaryGFunction	followRedirect processAddAllDirectives
+syn keyword conaryGFunction	processOneAddAllDirective removeDifferences
+syn keyword conaryGFunction	addTrovesToGroup addCopiedComponents
+syn keyword conaryGFunction	findAllWeakTrovesToRemove checkForRedirects
+syn keyword conaryGFunction	addPackagesForComponents getResolveSource
+syn keyword conaryGFunction	resolveGroupDependencies checkGroupDependencies
+syn keyword conaryGFunction	calcSizeAndCheckHashes findSourcesForGroup
+syn keyword conaryGFunction	addPostInstallScript addPostRollbackScript
+syn keyword conaryGFunction	addPostUpdateScript addPreUpdateScript
+syn keyword conaryGFunction	addTrove moveComponents copyComponents
+syn keyword conaryGFunction	removeItemsAlsoInNewGroup removeItemsAlsoInGroup
+syn keyword conaryGFunction	addResolveSource iterReplaceSpecs
+syn keyword conaryGFunction	setCompatibilityClass getLabelPath
+syn keyword conaryGFunction	getResolveTroveSpecs getSearchFlavor
+syn keyword conaryGFunction	getChildGroups getGroupMap
+
+syn keyword conaryBFunction 	Run Automake Configure ManualConfigure 
+syn keyword conaryBFunction 	Make MakeParallelSubdir MakeInstall
+syn keyword conaryBFunction 	MakePathsInstall CompilePython
+syn keyword conaryBFunction 	Ldconfig Desktopfile Environment SetModes
+syn keyword conaryBFunction 	Install Copy Move Symlink Link Remove Doc
+syn keyword conaryBFunction 	Create MakeDirs disableParallelMake
+syn keyword conaryBFunction 	ConsoleHelper Replace SGMLCatalogEntry
+syn keyword conaryBFunction 	XInetdService XMLCatalogEntry TestSuite
+syn keyword conaryBFunction	PythonSetup CMake Ant JavaCompile ClassPath
+syn keyword conaryBFunction	JavaDoc IncludeLicense MakeFIFO
+
+syn keyword conaryPFunction 	NonBinariesInBindirs FilesInMandir 
+syn keyword conaryPFunction 	ImproperlyShared CheckSonames CheckDestDir
+syn keyword conaryPFunction 	ComponentSpec PackageSpec 
+syn keyword conaryPFunction 	Config InitScript GconfSchema SharedLibrary
+syn keyword conaryPFunction 	ParseManifest MakeDevices DanglingSymlinks
+syn keyword conaryPFunction 	AddModes WarnWriteable IgnoredSetuid
+syn keyword conaryPFunction 	Ownership ExcludeDirectories
+syn keyword conaryPFunction 	BadFilenames BadInterpreterPaths ByDefault
+syn keyword conaryPFunction 	ComponentProvides ComponentRequires Flavor
+syn keyword conaryPFunction 	EnforceConfigLogBuildRequirements Group
+syn keyword conaryPFunction 	EnforceSonameBuildRequirements InitialContents
+syn keyword conaryPFunction 	FilesForDirectories LinkCount
+syn keyword conaryPFunction 	MakdeDevices NonMultilibComponent ObsoletePaths
+syn keyword conaryPFunction 	NonMultilibDirectories NonUTF8Filenames TagSpec
+syn keyword conaryPFunction 	Provides RequireChkconfig Requires TagHandler
+syn keyword conaryPFunction 	TagDescription Transient User UtilizeGroup
+syn keyword conaryPFunction 	WorldWritableExecutables UtilizeUser
+syn keyword conaryPFunction 	WarnWritable Strip CheckDesktopFiles
+syn keyword conaryPFunction	FixDirModes LinkType reportMissingBuildRequires
+syn keyword conaryPFunction	reportErrors FixupManpagePaths FixObsoletePaths
+syn keyword conaryPFunction	NonLSBPaths PythonEggs
+syn keyword conaryPFunction	EnforcePythonBuildRequirements
+syn keyword conaryPFunction	EnforceJavaBuildRequirements
+syn keyword conaryPFunction	EnforceCILBuildRequirements
+syn keyword conaryPFunction	EnforcePerlBuildRequirements
+syn keyword conaryPFunction	EnforceFlagBuildRequirements
+syn keyword conaryPFunction	FixupMultilibPaths ExecutableLibraries
+syn keyword conaryPFunction	NormalizeLibrarySymlinks NormalizeCompression
+syn keyword conaryPFunction	NormalizeManPages NormalizeInfoPages
+syn keyword conaryPFunction	NormalizeInitscriptLocation
+syn keyword conaryPFunction	NormalizeInitscriptContents
+syn keyword conaryPFunction	NormalizeAppDefaults NormalizeInterpreterPaths
+syn keyword conaryPFunction	NormalizePamConfig ReadableDocs
+syn keyword conaryPFunction	WorldWriteableExecutables NormalizePkgConfig
+syn keyword conaryPFunction	EtcConfig InstallBucket SupplementalGroup
+syn keyword conaryPFunction	FixBuilddirSymlink RelativeSymlinks
+
+" Most destdirPolicy aren't called from recipes, except for these
+syn keyword conaryPFunction	AutoDoc RemoveNonPackageFiles TestSuiteFiles
+syn keyword conaryPFunction	TestSuiteLinks
+
+syn match   conaryMacro		"%(\w\+)[sd]" contained
+syn match   conaryBadMacro	"%(\w*)[^sd]" contained " no final marker
+syn keyword conaryArches	contained x86 x86_64 alpha ia64 ppc ppc64 s390
+syn keyword conaryArches	contained sparc sparc64
+syn keyword conarySubArches	contained sse2 3dnow 3dnowext cmov i486 i586
+syn keyword conarySubArches	contained i686 mmx mmxext nx sse sse2
+syn keyword conaryBad		RPM_BUILD_ROOT EtcConfig InstallBucket subDir
+syn keyword conaryBad		RPM_OPT_FLAGS subdir 
+syn cluster conaryArchFlags 	contains=conaryArches,conarySubArches
+syn match   conaryArch		"Arch\.[a-z0-9A-Z]\+" contains=conaryArches,conarySubArches
+syn match   conaryArch		"Arch\.[a-z0-9A-Z]\+" contains=conaryArches,conarySubArches
+syn keyword conaryKeywords	name buildRequires version clearBuildReqs
+syn keyword conaryUseFlag	contained pcre tcpwrappers gcj gnat selinux pam 
+syn keyword conaryUseFlag	contained bootstrap python perl 
+syn keyword conaryUseFlag	contained readline gdbm emacs krb builddocs 
+syn keyword conaryUseFlag	contained alternatives tcl tk X gtk gnome qt
+syn keyword conaryUseFlag	contained xfce gd ldap sasl pie desktop ssl kde
+syn keyword conaryUseFlag	contained slang netpbm nptl ipv6 buildtests
+syn keyword conaryUseFlag	contained ntpl xen dom0 domU
+syn match   conaryUse		"Use\.[a-z0-9A-Z]\+" contains=conaryUseFlag
+
+" strings
+syn region pythonString		matchgroup=Normal start=+[uU]\='+ end=+'+ skip=+\\\\\|\\'+ contains=pythonEscape,conaryMacro,conaryBadMacro
+syn region pythonString		matchgroup=Normal start=+[uU]\="+ end=+"+ skip=+\\\\\|\\"+ contains=pythonEscape,conaryMacro,conaryBadMacro
+syn region pythonString		matchgroup=Normal start=+[uU]\="""+ end=+"""+ contains=pythonEscape,conaryMacro,conaryBadMacro
+syn region pythonString		matchgroup=Normal start=+[uU]\='''+ end=+'''+ contains=pythonEscape,conaryMacro,conaryBadMacro
+syn region pythonRawString	matchgroup=Normal start=+[uU]\=[rR]'+ end=+'+ skip=+\\\\\|\\'+ contains=conaryMacro,conaryBadMacro
+syn region pythonRawString	matchgroup=Normal start=+[uU]\=[rR]"+ end=+"+ skip=+\\\\\|\\"+ contains=conaryMacro,conaryBadMacro
+syn region pythonRawString	matchgroup=Normal start=+[uU]\=[rR]"""+ end=+"""+ contains=conaryMacro,conaryBadMacro
+syn region pythonRawString	matchgroup=Normal start=+[uU]\=[rR]'''+ end=+'''+ contains=conaryMacro,conaryBadMacro
+
+hi def link conaryMacro			Special
+hi def link conaryrecipeFunction	Function
+hi def link conaryError			Error
+hi def link conaryBFunction		conaryrecipeFunction
+hi def link conaryGFunction        	conaryrecipeFunction
+hi def link conarySFunction		Operator
+hi def link conaryPFunction		Typedef
+hi def link conaryFlags			PreCondit
+hi def link conaryArches		Special
+hi def link conarySubArches		Special
+hi def link conaryBad			conaryError
+hi def link conaryBadMacro		conaryError
+hi def link conaryKeywords		Special
+hi def link conaryUseFlag		Typedef
+
+let b:current_syntax = "conaryrecipe"
+
+
+endif
diff --git a/syntax/config.vim b/syntax/config.vim
new file mode 100644
index 000000000..a3eb138e0
--- /dev/null
+++ b/syntax/config.vim
@@ -0,0 +1,58 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'config') == -1
+
+" Vim syntax file
+" Language:		configure.in script: M4 with sh
+" Former Maintainer:	Christian Hammesr <ch@lathspell.westend.com>
+" Last Change:	2018 Feb 03
+" 				(patch from Yngve Inntjore Levinsen to detect AC_MSG)
+" 				(patch from Khym Chanur to add @Spell)
+" 				(patch from James McCoy to fix paren matching)
+
+" Well, I actually even do not know much about m4. This explains why there
+" is probably very much missing here, yet !
+" But I missed good highlighting when editing my GNU autoconf/automake
+" script, so I wrote this quick and dirty patch.
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" define the config syntax
+syn match   configdelimiter "[()\[\];,]"
+syn match   configoperator  "[=|&\*\+\<\>]"
+syn match   configcomment   "\(dnl.*\)\|\(#.*\)" contains=configDnl,@Spell
+syn match   configfunction  "\<[A-Z_][A-Z0-9_]*\>"
+syn match   confignumber    "[-+]\=\<\d\+\(\.\d*\)\=\>"
+syn keyword configDnl   	dnl contained
+syn keyword configkeyword   if then else fi test for in do done
+syn keyword configspecial   cat rm eval
+
+" This shortens the script, see syn-ext-match..
+syn region  configstring    start=+\z(["'`]\)+ skip=+\\\z1+ end=+\z1+ contains=@Spell
+
+" Anything inside AC_MSG_TYPE([...])  and AC_MSG_TYPE(...) is a string.
+syn region  configmsg matchgroup=configfunction start="AC_MSG_[A-Z]*\ze(\[" matchgroup=configdelimiter end="\])" contains=configdelimiter,@Spell
+syn region  configmsg matchgroup=configfunction start="AC_MSG_[A-Z]*\ze([^[]" matchgroup=configdelimiter end=")" contains=configdelimiter,@Spell
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link configdelimiter Delimiter
+hi def link configoperator  Operator
+hi def link configcomment   Comment
+hi def link configDnl  	 Comment
+hi def link configfunction  Function
+hi def link confignumber    Number
+hi def link configkeyword   Keyword
+hi def link configspecial   Special
+hi def link configstring    String
+hi def link configmsg       String
+
+
+let b:current_syntax = "config"
+
+" vim: ts=4
+
+endif
diff --git a/syntax/context.vim b/syntax/context.vim
new file mode 100644
index 000000000..433287dfa
--- /dev/null
+++ b/syntax/context.vim
@@ -0,0 +1,145 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
+
+" Vim syntax file
+" Language:           ConTeXt typesetting engine
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Nikolai Weibull <now@bitwi.se>
+" Latest Revision:    2016 Oct 16
+
+if exists("b:current_syntax")
+  finish
+endif
+
+runtime! syntax/plaintex.vim
+unlet b:current_syntax
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Dictionary of (filetype, group) pairs to highlight between \startGROUP \stopGROUP.
+let s:context_include = get(b:, 'context_include', get(g:, 'context_include', {'xml': 'XML'}))
+
+" For backward compatibility (g:context_include used to be a List)
+if type(s:context_include) ==# type([])
+  let g:context_metapost = (index(s:context_include, 'mp') != -1)
+  let s:context_include = filter(
+        \ {'c': 'C', 'javascript': 'JS', 'ruby': 'Ruby', 'xml': 'XML'},
+        \ { k,_ -> index(s:context_include, k) != -1 }
+        \ )
+endif
+
+syn iskeyword @,48-57,a-z,A-Z,192-255
+
+syn spell   toplevel
+
+" ConTeXt options, i.e., [...] blocks
+syn region  contextOptions    matchgroup=contextDelimiter start='\['  end=']\|\ze\\stop' skip='\\\[\|\\\]' contains=ALLBUT,contextBeginEndLua,@Spell
+
+" Highlight braces
+syn match   contextDelimiter  '[{}]'
+
+" Comments
+syn match   contextComment '\\\@<!\%(\\\\\)*\zs%.*$' display contains=initexTodo
+syn match   contextComment '^\s*%[CDM].*$'           display contains=initexTodo
+
+syn match   contextBlockDelim '\\\%(start\|stop\)\a\+' contains=@NoSpell
+
+syn region  contextEscaped    matchgroup=contextPreProc start='\\type\%(\s*\|\n\)*\z([^A-Za-z%]\)' end='\z1'
+syn region  contextEscaped    matchgroup=contextPreProc start='\\type\=\%(\s\|\n\)*{' end='}'
+syn region  contextEscaped    matchgroup=contextPreProc start='\\type\=\%(\s*\|\n\)*<<' end='>>'
+syn region  contextEscaped    matchgroup=contextPreProc
+                              \ start='\\start\z(\a*\%(typing\|typen\)\)'
+                              \ end='\\stop\z1' contains=plaintexComment keepend
+syn region  contextEscaped    matchgroup=contextPreProc start='\\\h\+Type\%(\s\|\n\)*{' end='}'
+syn region  contextEscaped    matchgroup=contextPreProc start='\\Typed\h\+\%(\s\|\n\)*{' end='}'
+
+syn match   contextBuiltin    display contains=@NoSpell
+      \ '\\\%(unprotect\|protect\|unexpanded\)\>'
+
+syn match   contextPreProc    '^\s*\\\%(start\|stop\)\=\%(component\|environment\|project\|product\)\>'
+                              \ contains=@NoSpell
+
+if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
+  let b:mp_metafun_macros = 1 " Highlight MetaFun keywords
+  syn include @mpTop          syntax/mp.vim
+  unlet b:current_syntax
+
+  syn region  contextMPGraphic  matchgroup=contextBlockDelim
+                                \ start='\\start\z(MP\%(clip\|code\|definitions\|drawing\|environment\|extensions\|inclusions\|initializations\|page\|\)\)\>.*$'
+                                \ end='\\stop\z1'
+                                \ contains=@mpTop,@NoSpell
+  syn region  contextMPGraphic  matchgroup=contextBlockDelim
+                                \ start='\\start\z(\%(\%[re]usable\|use\|unique\|static\)MPgraphic\|staticMPfigure\|uniqueMPpagegraphic\)\>.*$'
+                                \ end='\\stop\z1'
+                                \ contains=@mpTop,@NoSpell
+endif
+
+if get(b:, 'context_lua', get(g:, 'context_lua', 1))
+  syn include @luaTop          syntax/lua.vim
+  unlet b:current_syntax
+
+  syn region  contextLuaCode    matchgroup=contextBlockDelim
+                                \ start='\\startluacode\>'
+                                \ end='\\stopluacode\>' keepend
+                                \ contains=@luaTop,@NoSpell
+
+  syn match   contextDirectLua  "\\\%(directlua\|ctxlua\)\>\%(\s*%.*$\)\="
+                                \ nextgroup=contextBeginEndLua skipwhite skipempty
+                                \ contains=initexComment
+  syn region  contextBeginEndLua matchgroup=contextSpecial
+                                \ start="{" end="}" skip="\\[{}]"
+                                \ contained contains=@luaTop,@NoSpell
+endif
+
+for synname in keys(s:context_include)
+  execute 'syn include @' . synname . 'Top' 'syntax/' . synname . '.vim'
+  unlet b:current_syntax
+  execute 'syn region context' . s:context_include[synname] . 'Code'
+        \ 'matchgroup=contextBlockDelim'
+        \ 'start=+\\start' . s:context_include[synname] . '+'
+        \ 'end=+\\stop' . s:context_include[synname] . '+'
+        \ 'contains=@' . synname . 'Top,@NoSpell'
+endfor
+
+syn match   contextSectioning '\\\%(start\|stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>'
+                              \ contains=@NoSpell
+
+syn match   contextSpecial    '\\crlf\>\|\\par\>\|-\{2,3}\||[<>/]\=|'
+                              \ contains=@NoSpell
+syn match   contextSpecial    /\\[`'"]/
+syn match   contextSpecial    +\\char\%(\d\{1,3}\|'\o\{1,3}\|"\x\{1,2}\)\>+
+                              \ contains=@NoSpell
+syn match   contextSpecial    '\^\^.'
+syn match   contextSpecial    '`\%(\\.\|\^\^.\|.\)'
+
+syn match   contextStyle      '\\\%(em\|ss\|hw\|cg\|mf\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(CAP\|Cap\|cap\|Caps\|kap\|nocap\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(Word\|WORD\|Words\|WORDS\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(vi\{1,3}\|ix\|xi\{0,2}\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(tf\|b[si]\|s[cl]\|os\)\%(xx\|[xabcd]\)\=\>'
+                              \ contains=@NoSpell
+
+hi def link contextOptions    Typedef
+hi def link contextComment    Comment
+hi def link contextBlockDelim Keyword
+hi def link contextBuiltin    Keyword
+hi def link contextDelimiter  Delimiter
+hi def link contextEscaped    String
+hi def link contextPreProc    PreProc
+hi def link contextSectioning PreProc
+hi def link contextSpecial    Special
+hi def link contextType       Type
+hi def link contextStyle      contextType
+hi def link contextFont       contextType
+hi def link contextDirectLua  Keyword
+
+let b:current_syntax = "context"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/crm.vim b/syntax/crm.vim
new file mode 100644
index 000000000..a3d9db931
--- /dev/null
+++ b/syntax/crm.vim
@@ -0,0 +1,45 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crm') == -1
+
+" Vim syntax file
+" Language:             CRM114
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword crmTodo       contained TODO FIXME XXX NOTE
+
+syn region  crmComment    display oneline start='#' end='\\#'
+                          \ contains=crmTodo,@Spell
+
+syn match   crmVariable   display ':[*#@]:[^:]\{-1,}:'
+
+syn match   crmSpecial    display '\\\%(x\x\x\|o\o\o\o\|[]nrtabvf0>)};/\\]\)'
+
+syn keyword crmStatement  insert noop accept alius alter classify eval exit
+syn keyword crmStatement  fail fault goto hash intersect isolate input learn
+syn keyword crmStatement  liaf match output syscall trap union window
+
+syn region  crmRegex      start='/' skip='\\/' end='/' contains=crmVariable
+
+syn match   crmLabel      display '^\s*:[[:graph:]]\+:'
+
+hi def link crmTodo       Todo
+hi def link crmComment    Comment
+hi def link crmVariable   Identifier
+hi def link crmSpecial    SpecialChar
+hi def link crmStatement  Statement
+hi def link crmRegex      String
+hi def link crmLabel      Label
+
+let b:current_syntax = "crm"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/crontab.vim b/syntax/crontab.vim
new file mode 100644
index 000000000..aa6cb20d9
--- /dev/null
+++ b/syntax/crontab.vim
@@ -0,0 +1,71 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crontab') == -1
+
+" Vim syntax file
+" Language: crontab
+" Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
+" Original Maintainer: John Hoelzel johnh51@users.sourceforge.net
+" License: This file can be redistribued and/or modified under the same terms
+"   as Vim itself.
+" Filenames: /tmp/crontab.* used by "crontab -e"
+" Last Change: 2015-01-20
+"
+" crontab line format:
+" Minutes   Hours   Days   Months   Days_of_Week   Commands # comments
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+syntax match crontabNick "^\s*@\(reboot\|yearly\|annually\|monthly\|weekly\|daily\|midnight\|hourly\)\>" nextgroup=crontabCmd skipwhite
+
+syntax match crontabVar "^\s*\k\w*\s*="me=e-1
+
+syntax case ignore
+
+syntax match crontabMin "^\s*[-0-9/,.*]\+" nextgroup=crontabHr skipwhite
+syntax match crontabHr "\s[-0-9/,.*]\+" nextgroup=crontabDay skipwhite contained
+syntax match crontabDay "\s[-0-9/,.*]\+" nextgroup=crontabMnth skipwhite contained
+
+syntax match crontabMnth "\s[-a-z0-9/,.*]\+" nextgroup=crontabDow skipwhite contained
+syntax keyword crontabMnth12 contained jan feb mar apr may jun jul aug sep oct nov dec
+
+syntax match crontabDow "\s[-a-z0-9/,.*]\+" nextgroup=crontabCmd skipwhite contained
+syntax keyword crontabDow7 contained sun mon tue wed thu fri sat
+
+syntax region crontabCmd start="\S" end="$" skipwhite contained keepend contains=crontabPercent
+syntax match crontabCmnt "^\s*#.*" contains=@Spell
+syntax match crontabPercent "[^\\]%.*"lc=1 contained
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link crontabMin		Number
+hi def link crontabHr		PreProc
+hi def link crontabDay		Type
+
+hi def link crontabMnth		Number
+hi def link crontabMnth12		Number
+hi def link crontabMnthS		Number
+hi def link crontabMnthN		Number
+
+hi def link crontabDow		PreProc
+hi def link crontabDow7		PreProc
+hi def link crontabDowS		PreProc
+hi def link crontabDowN		PreProc
+
+hi def link crontabNick		Special
+hi def link crontabVar		Identifier
+hi def link crontabPercent		Special
+
+" comment out next line for to suppress unix commands coloring.
+hi def link crontabCmd		Statement
+
+hi def link crontabCmnt		Comment
+
+
+let b:current_syntax = "crontab"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/cs.vim b/syntax/cs.vim
new file mode 100644
index 000000000..c86c7a9b8
--- /dev/null
+++ b/syntax/cs.vim
@@ -0,0 +1,225 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
+
+" Vim syntax file
+" Language:            C#
+" Maintainer:          Nick Jensen <nickspoon@gmail.com>
+" Former Maintainers:  Anduin Withers <awithers@anduin.com>
+"                      Johannes Zellner <johannes@zellner.org>
+" Last Change:         2020-01-27
+" Filenames:           *.cs
+" License:             Vim (see :h license)
+" Repository:          https://github.com/nickspoons/vim-cs
+"
+" REFERENCES:
+" [1] ECMA TC39: C# Language Specification (WD13Oct01.doc)
+
+if exists('b:current_syntax')
+  finish
+endif
+
+let s:save_cpo = &cpoptions
+set cpoptions&vim
+
+
+syn keyword	csType	bool byte char decimal double float int long object sbyte short string T uint ulong ushort var void dynamic
+syn keyword	csStorage	delegate enum interface namespace struct
+syn keyword	csRepeat	break continue do for foreach goto return while
+syn keyword	csConditional	else if switch
+syn keyword	csLabel	case default
+syn match	csOperatorError	display +::+
+syn match	csGlobal	display +global::+
+" user labels (see [1] 8.6 Statements)
+syn match	csLabel	display +^\s*\I\i*\s*:\([^:]\)\@=+
+syn keyword	csModifier	abstract const extern internal override private protected public readonly sealed static virtual volatile
+syn keyword	csConstant	false null true
+syn keyword	csException	try catch finally throw when
+syn keyword	csLinq	ascending by descending equals from group in into join let on orderby select where
+syn keyword	csAsync	async await
+
+syn keyword	csUnspecifiedStatement	as base checked event fixed in is lock nameof operator out params ref sizeof stackalloc this unchecked unsafe using
+syn keyword	csUnsupportedStatement	add remove value
+syn keyword	csUnspecifiedKeyword	explicit implicit
+
+" Contextual Keywords
+syn match	csContextualStatement	/\<yield[[:space:]\n]\+\(return\|break\)/me=s+5
+syn match	csContextualStatement	/\<partial[[:space:]\n]\+\(class\|struct\|interface\)/me=s+7
+syn match	csContextualStatement	/\<\(get\|set\)\(;\|[[:space:]\n]*{\)/me=s+3
+syn match	csContextualStatement	/\<where\>[^:]\+:/me=s+5
+
+" Operators
+syn keyword	csTypeOf	typeof contained
+syn region	csTypeOfStatement	start="typeof(" end=")" contains=csType, csTypeOf
+
+" Punctuation
+syn match	csBraces	"[{}\[\]]" display
+syn match	csParens	"[()]" display
+syn match	csOpSymbols	"+\{1,2}" display
+syn match	csOpSymbols	"-\{1,2}" display
+syn match	csOpSymbols	"=\{1,2}" display
+syn match	csOpSymbols	">\{1,2}" display
+syn match	csOpSymbols	"<\{1,2}" display
+syn match	csOpSymbols	"[!><+\-*/]=" display
+syn match	csOpSymbols	"[!*/^]" display
+syn match	csOpSymbols	"=>" display
+syn match	csEndColon	";" display
+syn match	csLogicSymbols	"&&" display
+syn match	csLogicSymbols	"||" display
+syn match	csLogicSymbols	"?" display
+syn match	csLogicSymbols	":" display
+
+" Generics
+syn region	csGeneric	matchgroup=csGenericBraces start="<" end=">" oneline contains=csType,csGeneric,csUserType,csUserIdentifier,csUserInterface,csUserMethod
+
+" Comments
+"
+" PROVIDES: @csCommentHook
+syn keyword	csTodo	contained TODO FIXME XXX NOTE HACK TBD
+syn region	csComment	start="/\*"  end="\*/" contains=@csCommentHook,csTodo,@Spell
+syn match	csComment	"//.*$" contains=@csCommentHook,csTodo,@Spell
+
+" xml markup inside '///' comments
+syn cluster	xmlRegionHook	add=csXmlCommentLeader
+syn cluster	xmlCdataHook	add=csXmlCommentLeader
+syn cluster	xmlStartTagHook	add=csXmlCommentLeader
+syn keyword	csXmlTag	contained Libraries Packages Types Excluded ExcludedTypeName ExcludedLibraryName
+syn keyword	csXmlTag	contained ExcludedBucketName TypeExcluded Type TypeKind TypeSignature AssemblyInfo
+syn keyword	csXmlTag	contained AssemblyName AssemblyPublicKey AssemblyVersion AssemblyCulture Base
+syn keyword	csXmlTag	contained BaseTypeName Interfaces Interface InterfaceName Attributes Attribute
+syn keyword	csXmlTag	contained AttributeName Members Member MemberSignature MemberType MemberValue
+syn keyword	csXmlTag	contained ReturnValue ReturnType Parameters Parameter MemberOfPackage
+syn keyword	csXmlTag	contained ThreadingSafetyStatement Docs devdoc example overload remarks returns summary
+syn keyword	csXmlTag	contained threadsafe value internalonly nodoc exception param permission platnote
+syn keyword	csXmlTag	contained seealso b c i pre sub sup block code note paramref see subscript superscript
+syn keyword	csXmlTag	contained list listheader item term description altcompliant altmember
+
+syn cluster xmlTagHook add=csXmlTag
+
+syn match	csXmlCommentLeader	"///" contained
+syn match	csXmlComment	"///.*$" contains=csXmlCommentLeader,@csXml,@Spell keepend
+syn include	@csXml syntax/xml.vim
+hi def link	xmlRegion Comment
+
+" Since syntax/xml.vim contains `syn spell toplevel`, we need to set it back to `default` here.
+syn spell default
+
+" [1] 9.5 Pre-processing directives
+syn region	csPreCondit	start="^\s*#\s*\(define\|undef\|if\|elif\|else\|endif\|line\|error\|warning\)" skip="\\$" end="$" contains=csComment keepend
+syn region	csRegion	matchgroup=csPreCondit start="^\s*#\s*region.*$" end="^\s*#\s*endregion" transparent fold contains=TOP
+syn region	csSummary	start="^\s*/// <summary" end="^\%\(\s*///\)\@!" transparent fold keepend
+
+
+syn region	csClassType	start="@\@1<!\<class\>"hs=s+6 end="[:\n{]"me=e-1 contains=csClass
+" csUserType may be defined by user scripts/plugins - it should be contained in csNewType
+syn region	csNewType	start="@\@1<!\<new\>"hs=s+4 end="[;\n{(<\[]"me=e-1 contains=csNew,csUserType
+syn region	csIsType	start=" is "hs=s+4 end="[A-Za-z0-9]\+" oneline contains=csIsAs
+syn region	csIsType	start=" as "hs=s+4 end="[A-Za-z0-9]\+" oneline contains=csIsAs
+syn keyword	csNew	new contained
+syn keyword	csClass	class contained
+syn keyword	csIsAs	is as
+
+" Strings and constants
+syn match	csSpecialError	"\\." contained
+syn match	csSpecialCharError	"[^']" contained
+" [1] 9.4.4.4 Character literals
+syn match	csSpecialChar	+\\["\\'0abfnrtvx]+ contained display
+syn match	csUnicodeNumber	+\\u\x\{4}+ contained contains=csUnicodeSpecifier display
+syn match	csUnicodeNumber	+\\U\x\{8}+ contained contains=csUnicodeSpecifier display
+syn match	csUnicodeSpecifier	+\\[uU]+ contained display
+
+syn region	csString	matchgroup=csQuote start=+"+  end=+"+ end=+$+ extend contains=csSpecialChar,csSpecialError,csUnicodeNumber,@Spell
+syn match	csCharacter	"'[^']*'" contains=csSpecialChar,csSpecialCharError display
+syn match	csCharacter	"'\\''" contains=csSpecialChar display
+syn match	csCharacter	"'[^\\]'" display
+syn match	csNumber	"\<0[0-7]*[lL]\=\>" display
+syn match	csNumber	"\<0[xX]\x\+[lL]\=\>" display
+syn match	csNumber	"\<\d\+[lL]\=\>" display
+syn match	csNumber	"\<\d\+\.\d*\%\([eE][-+]\=\d\+\)\=[fFdD]\=" display
+syn match	csNumber	"\.\d\+\%\([eE][-+]\=\d\+\)\=[fFdD]\=" display
+syn match	csNumber	"\<\d\+[eE][-+]\=\d\+[fFdD]\=\>" display
+syn match	csNumber	"\<\d\+\%\([eE][-+]\=\d\+\)\=[fFdD]\>" display
+
+syn region	csInterpolatedString	matchgroup=csQuote start=+\$"+ end=+"+ end=+$+ extend contains=csInterpolation,csEscapedInterpolation,csSpecialChar,csSpecialError,csUnicodeNumber,@Spell
+
+syn region	csInterpolation	matchgroup=csInterpolationDelimiter start=+{+ end=+}+ keepend contained contains=@csAll,csBracketed,csInterpolationAlign,csInterpolationFormat
+syn match	csEscapedInterpolation	"{{" transparent contains=NONE display
+syn match	csEscapedInterpolation	"}}" transparent contains=NONE display
+syn region	csInterpolationAlign	matchgroup=csInterpolationAlignDel start=+,+ end=+}+ end=+:+me=e-1 contained contains=csNumber,csConstant,csCharacter,csParens,csOpSymbols,csString,csBracketed display
+syn match	csInterpolationFormat	+:[^}]\+}+ contained contains=csInterpolationFormatDel display
+syn match	csInterpolationAlignDel	+,+ contained display
+syn match	csInterpolationFormatDel	+:+ contained display
+
+syn region	csVerbatimString	matchgroup=csQuote start=+@"+ end=+"+ skip=+""+ extend contains=csVerbatimQuote,@Spell
+syn match	csVerbatimQuote	+""+ contained
+syn match	csQuoteError	+@$"+he=s+2,me=s+2
+
+syn region	csInterVerbString	matchgroup=csQuote start=+\$@"+ end=+"+ skip=+""+ extend contains=csInterpolation,csEscapedInterpolation,csSpecialChar,csSpecialError,csUnicodeNumber,csVerbatimQuote,@Spell
+
+syn region	csBracketed	matchgroup=csParens start=+(+ end=+)+ contained transparent contains=@csAll,csBracketed
+
+syn cluster	csAll	contains=csCharacter,csClassType,csComment,csContextualStatement,csEndColon,csInterpolatedString,csIsType,csLabel,csLogicSymbols,csNewType,csConstant,csNumber,csOpSymbols,csOperatorError,csParens,csPreCondit,csRegion,csString,csSummary,csType,csUnicodeNumber,csUnicodeSpecifier,csVerbatimString,csUserType,csUserIdentifier,csUserInterface,csUserMethod
+
+" The default highlighting.
+hi def link	csType	Type
+hi def link	csClassType	Type
+hi def link	csIsType	Type
+hi def link	csStorage	Structure
+hi def link	csClass	Structure
+hi def link	csRepeat	Repeat
+hi def link	csConditional	Conditional
+hi def link	csLabel	Label
+hi def link	csModifier	StorageClass
+hi def link	csConstant	Constant
+hi def link	csException	Exception
+hi def link	csTypeOf	Keyword
+hi def link	csTypeOfStatement	Typedef
+hi def link	csUnspecifiedStatement	Statement
+hi def link	csUnsupportedStatement	Statement
+hi def link	csUnspecifiedKeyword	Keyword
+hi def link	csNew	Statement
+hi def link	csLinq	Statement
+hi def link	csIsAs 	Keyword
+hi def link	csAsync	Keyword
+hi def link	csContextualStatement	Statement
+hi def link	csOperatorError	Error
+
+hi def link	csTodo	Todo
+hi def link	csComment	Comment
+
+hi def link	csOpSymbols	Operator
+hi def link	csLogicSymbols	Operator
+
+hi def link	csSpecialError	Error
+hi def link	csSpecialCharError	Error
+hi def link	csString	String
+hi def link	csQuote	String
+hi def link	csQuoteError	Error
+hi def link	csInterpolatedString	String
+hi def link	csVerbatimString	String
+hi def link	csInterVerbString	String
+hi def link	csVerbatimQuote	SpecialChar
+hi def link	csPreCondit	PreCondit
+hi def link	csCharacter	Character
+hi def link	csSpecialChar	SpecialChar
+hi def link	csNumber	Number
+hi def link	csUnicodeNumber	SpecialChar
+hi def link	csUnicodeSpecifier	SpecialChar
+hi def link	csInterpolationDelimiter	Delimiter
+hi def link	csInterpolationAlignDel	csInterpolationDelimiter
+hi def link	csInterpolationFormat	csInterpolationDelimiter
+hi def link	csInterpolationFormatDel	csInterpolationDelimiter
+
+hi def link	csGenericBraces	csBraces
+
+" xml markup
+hi def link	csXmlCommentLeader	Comment
+hi def link	csXmlComment	Comment
+hi def link	csXmlTag	Statement
+
+let b:current_syntax = 'cs'
+
+let &cpoptions = s:save_cpo
+unlet s:save_cpo
+
+" vim: vts=16,28
+
+endif
diff --git a/syntax/csc.vim b/syntax/csc.vim
new file mode 100644
index 000000000..07f538bb1
--- /dev/null
+++ b/syntax/csc.vim
@@ -0,0 +1,195 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csc') == -1
+
+" Vim syntax file
+" Language: Essbase script
+" Maintainer:	Raul Segura Acevedo <raulseguraaceved@netscape.net>
+" Last change:	2011 Dec 25 by Thilo Six
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" folds: fix/endfix and comments
+sy	region	EssFold start="\<Fix" end="EndFix" transparent fold
+
+sy	keyword	cscTodo contained TODO FIXME XXX
+
+" cscCommentGroup allows adding matches for special things in comments
+sy	cluster cscCommentGroup contains=cscTodo
+
+" Strings in quotes
+sy	match	cscError	'"'
+sy	match	cscString	'"[^"]*"'
+
+"when wanted, highlight trailing white space
+if exists("csc_space_errors")
+	if !exists("csc_no_trail_space_error")
+		sy	match	cscSpaceE	"\s\+$"
+	endif
+	if !exists("csc_no_tab_space_error")
+		sy	match	cscSpaceE	" \+\t"me=e-1
+	endif
+endif
+
+"catch errors caused by wrong parenthesis and brackets
+sy	cluster	cscParenGroup	contains=cscParenE,@cscCommentGroup,cscUserCont,cscBitField,cscFormat,cscNumber,cscFloat,cscOctal,cscNumbers,cscIfError,cscComW,cscCom,cscFormula,cscBPMacro
+sy	region	cscParen	transparent start='(' end=')' contains=ALLBUT,@cscParenGroup
+sy	match	cscParenE	")"
+
+"integer number, or floating point number without a dot and with "f".
+sy	case	ignore
+sy	match	cscNumbers	transparent "\<\d\|\.\d" contains=cscNumber,cscFloat,cscOctal
+sy	match	cscNumber	contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>"
+"hex number
+sy	match	cscNumber	contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
+" Flag the first zero of an octal number as something special
+sy	match	cscOctal	contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>"
+sy	match	cscFloat	contained "\d\+f"
+"floating point number, with dot, optional exponent
+sy	match	cscFloat	contained "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\="
+"floating point number, starting with a dot, optional exponent
+sy	match	cscFloat	contained "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+sy	match	cscFloat	contained "\d\+e[-+]\=\d\+[fl]\=\>"
+
+sy	region	cscComment	start="/\*" end="\*/" contains=@cscCommentGroup,cscSpaceE fold
+sy	match	cscCommentE	"\*/"
+
+sy	keyword	cscIfError	IF ELSE ENDIF ELSEIF
+sy	keyword	cscCondition	contained IF ELSE ENDIF ELSEIF
+sy	keyword	cscFunction	contained VARPER VAR UDA TRUNCATE SYD SUMRANGE SUM
+sy	keyword	cscFunction	contained STDDEVRANGE STDDEV SPARENTVAL SLN SIBLINGS SHIFT
+sy	keyword	cscFunction	contained SANCESTVAL RSIBLINGS ROUND REMAINDER RELATIVE PTD
+sy	keyword	cscFunction	contained PRIOR POWER PARENTVAL NPV NEXT MOD MINRANGE MIN
+sy	keyword	cscFunction	contained MDSHIFT MDPARENTVAL MDANCESTVAL MAXRANGE MAX MATCH
+sy	keyword	cscFunction	contained LSIBLINGS LEVMBRS LEV
+sy	keyword	cscFunction	contained ISUDA ISSIBLING ISSAMELEV ISSAMEGEN ISPARENT ISMBR
+sy	keyword	cscFunction	contained ISLEV ISISIBLING ISIPARENT ISIDESC ISICHILD ISIBLINGS
+sy	keyword	cscFunction	contained ISIANCEST ISGEN ISDESC ISCHILD ISANCEST ISACCTYPE
+sy	keyword	cscFunction	contained IRSIBLINGS IRR INTEREST INT ILSIBLINGS IDESCENDANTS
+sy	keyword	cscFunction	contained ICHILDREN IANCESTORS IALLANCESTORS
+sy	keyword	cscFunction	contained GROWTH GENMBRS GEN FACTORIAL DISCOUNT DESCENDANTS
+sy	keyword	cscFunction	contained DECLINE CHILDREN CURRMBRRANGE CURLEV CURGEN
+sy	keyword	cscFunction	contained COMPOUNDGROWTH COMPOUND AVGRANGE AVG ANCESTVAL
+sy	keyword	cscFunction	contained ANCESTORS ALLANCESTORS ACCUM ABS
+sy	keyword	cscFunction	contained @VARPER @VAR @UDA @TRUNCATE @SYD @SUMRANGE @SUM
+sy	keyword	cscFunction	contained @STDDEVRANGE @STDDEV @SPARENTVAL @SLN @SIBLINGS @SHIFT
+sy	keyword	cscFunction	contained @SANCESTVAL @RSIBLINGS @ROUND @REMAINDER @RELATIVE @PTD
+sy	keyword	cscFunction	contained @PRIOR @POWER @PARENTVAL @NPV @NEXT @MOD @MINRANGE @MIN
+sy	keyword	cscFunction	contained @MDSHIFT @MDPARENTVAL @MDANCESTVAL @MAXRANGE @MAX @MATCH
+sy	keyword	cscFunction	contained @LSIBLINGS @LEVMBRS @LEV
+sy	keyword	cscFunction	contained @ISUDA @ISSIBLING @ISSAMELEV @ISSAMEGEN @ISPARENT @ISMBR
+sy	keyword	cscFunction	contained @ISLEV @ISISIBLING @ISIPARENT @ISIDESC @ISICHILD @ISIBLINGS
+sy	keyword	cscFunction	contained @ISIANCEST @ISGEN @ISDESC @ISCHILD @ISANCEST @ISACCTYPE
+sy	keyword	cscFunction	contained @IRSIBLINGS @IRR @INTEREST @INT @ILSIBLINGS @IDESCENDANTS
+sy	keyword	cscFunction	contained @ICHILDREN @IANCESTORS @IALLANCESTORS
+sy	keyword	cscFunction	contained @GROWTH @GENMBRS @GEN @FACTORIAL @DISCOUNT @DESCENDANTS
+sy	keyword	cscFunction	contained @DECLINE @CHILDREN @CURRMBRRANGE @CURLEV @CURGEN
+sy	keyword	cscFunction	contained @COMPOUNDGROWTH @COMPOUND @AVGRANGE @AVG @ANCESTVAL
+sy	keyword	cscFunction	contained @ANCESTORS @ALLANCESTORS @ACCUM @ABS
+sy	match	cscFunction	contained "@"
+sy	match	cscError	"@\s*\a*" contains=cscFunction
+
+sy	match	cscStatement	"&"
+sy	keyword	cscStatement	AGG ARRAY VAR CCONV CLEARDATA DATACOPY
+
+sy	match	cscComE	contained "^\s*CALC.*"
+sy	match	cscComE	contained "^\s*CLEARBLOCK.*"
+sy	match	cscComE	contained "^\s*SET.*"
+sy	match	cscComE	contained "^\s*FIX"
+sy	match	cscComE	contained "^\s*ENDFIX"
+sy	match	cscComE	contained "^\s*ENDLOOP"
+sy	match	cscComE	contained "^\s*LOOP"
+" sy	keyword	cscCom	FIX ENDFIX LOOP ENDLOOP
+
+sy	match	cscComW	"^\s*CALC.*"
+sy	match	cscCom	"^\s*CALC\s*ALL"
+sy	match	cscCom	"^\s*CALC\s*AVERAGE"
+sy	match	cscCom	"^\s*CALC\s*DIM"
+sy	match	cscCom	"^\s*CALC\s*FIRST"
+sy	match	cscCom	"^\s*CALC\s*LAST"
+sy	match	cscCom	"^\s*CALC\s*TWOPASS"
+
+sy	match	cscComW	"^\s*CLEARBLOCK.*"
+sy	match	cscCom	"^\s*CLEARBLOCK\s\+ALL"
+sy	match	cscCom	"^\s*CLEARBLOCK\s\+UPPER"
+sy	match	cscCom	"^\s*CLEARBLOCK\s\+NONINPUT"
+
+sy	match	cscComW	"^\s*\<SET.*"
+sy	match	cscCom	"^\s*\<SET\s\+Commands"
+sy	match	cscCom	"^\s*\<SET\s\+AGGMISSG"
+sy	match	cscCom	"^\s*\<SET\s\+CACHE"
+sy	match	cscCom	"^\s*\<SET\s\+CALCHASHTBL"
+sy	match	cscCom	"^\s*\<SET\s\+CLEARUPDATESTATUS"
+sy	match	cscCom	"^\s*\<SET\s\+FRMLBOTTOMUP"
+sy	match	cscCom	"^\s*\<SET\s\+LOCKBLOCK"
+sy	match	cscCom	"^\s*\<SET\s\+MSG"
+sy	match	cscCom	"^\s*\<SET\s\+NOTICE"
+sy	match	cscCom	"^\s*\<SET\s\+UPDATECALC"
+sy	match	cscCom	"^\s*\<SET\s\+UPTOLOCAL"
+
+sy	keyword	cscBPMacro	contained !LoopOnAll !LoopOnLevel !LoopOnSelected
+sy	keyword	cscBPMacro	contained !CurrentMember !LoopOnDimensions !CurrentDimension
+sy	keyword	cscBPMacro	contained !CurrentOtherLoopDimension !LoopOnOtherLoopDimensions
+sy	keyword	cscBPMacro	contained !EndLoop !AllMembers !SelectedMembers !If !Else !EndIf
+sy	keyword	cscBPMacro	contained LoopOnAll LoopOnLevel LoopOnSelected
+sy	keyword	cscBPMacro	contained CurrentMember LoopOnDimensions CurrentDimension
+sy	keyword	cscBPMacro	contained CurrentOtherLoopDimension LoopOnOtherLoopDimensions
+sy	keyword	cscBPMacro	contained EndLoop AllMembers SelectedMembers If Else EndIf
+sy	match	cscBPMacro	contained	"!"
+sy	match	cscBPW	"!\s*\a*"	contains=cscBPmacro
+
+" when wanted, highlighting lhs members or erros in asignments (may lag the editing)
+if exists("csc_asignment")
+	sy	match	cscEqError	'\("[^"]*"\s*\|[^][\t !%()*+,--/:;<=>{}~]\+\s*\|->\s*\)*=\([^=]\@=\|$\)'
+	sy	region	cscFormula	transparent matchgroup=cscVarName start='\("[^"]*"\|[^][\t !%()*+,--/:;<=>{}~]\+\)\s*=\([^=]\@=\|\n\)' skip='"[^"]*"' end=';' contains=ALLBUT,cscFormula,cscFormulaIn,cscBPMacro,cscCondition
+	sy	region	cscFormulaIn	matchgroup=cscVarName transparent start='\("[^"]*"\|[^][\t !%()*+,--/:;<=>{}~]\+\)\(->\("[^"]*"\|[^][\t !%()*+,--/:;<=>{}~]\+\)\)*\s*=\([^=]\@=\|$\)' skip='"[^"]*"' end=';' contains=ALLBUT,cscFormula,cscFormulaIn,cscBPMacro,cscCondition contained
+	sy	match	cscEq	"=="
+endif
+
+if !exists("csc_minlines")
+	let csc_minlines = 50	" mostly for () constructs
+endif
+exec "sy sync ccomment cscComment minlines=" . csc_minlines
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi cscVarName term=bold ctermfg=9 gui=bold guifg=blue
+
+hi def link cscNumber	Number
+hi def link cscOctal	Number
+hi def link cscFloat	Float
+hi def link cscParenE	Error
+hi def link cscCommentE	Error
+hi def link cscSpaceE	Error
+hi def link cscError	Error
+hi def link cscString	String
+hi def link cscComment	Comment
+hi def link cscTodo		Todo
+hi def link cscStatement	Statement
+hi def link cscIfError	Error
+hi def link cscEqError	Error
+hi def link cscFunction	Statement
+hi def link cscCondition	Statement
+hi def link cscWarn		WarningMsg
+
+hi def link cscComE	Error
+hi def link cscCom	Statement
+hi def link cscComW	WarningMsg
+
+hi def link cscBPMacro	Identifier
+hi def link cscBPW		WarningMsg
+
+
+let b:current_syntax = "csc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/csdl.vim b/syntax/csdl.vim
new file mode 100644
index 000000000..33fc8fbd6
--- /dev/null
+++ b/syntax/csdl.vim
@@ -0,0 +1,540 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csdl') == -1
+
+" Vim syntax file
+" Language: Curated Stream Definition Language (CSDL)
+" Maintainer: Jacek Artymiak
+" Latest Revision: 25 February 2013
+
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword=.,@,48-57,_,192-255
+syn case ignore 
+
+syn match csdlKeyword "tag "
+syn match csdlKeyword "stream "
+syn match csdlKeyword "return "
+
+syn keyword csdlOperator contains
+syn match csdlOperator "cs contains"
+syn keyword csdlOperator substr
+syn match csdlOperator "cs substr"
+syn keyword csdlOperator contains_any
+syn match csdlOperator "cs contains_any"
+syn keyword csdlOperator any
+syn match csdlOperator "cs any"
+syn keyword csdlOperator contains_near
+syn match csdlOperator "cs contains_near"
+syn keyword csdlOperator exists
+syn keyword csdlOperator in
+syn keyword csdlOperator url_in
+syn match csdlOperator "=="
+syn match csdlOperator "!="
+syn match csdlOperator "cs =="
+syn match csdlOperator "cs !="
+syn match csdlOperator ">"
+syn match csdlOperator ">="
+syn match csdlOperator "<"
+syn match csdlOperator "<="
+syn keyword csdlOperator regex_partial
+syn keyword csdlOperator regex_exact
+syn keyword csdlOperator geo_box
+syn keyword csdlOperator geo_radius
+syn keyword csdlOperator geo_polygon
+
+syn keyword csdlLogicalOperator and
+syn keyword csdlLogicalOperator or
+syn keyword csdlLogicalOperator not
+
+syn match csdlTarget 'reddit\.title'
+syn match csdlTarget 'reddit\.content'
+syn match csdlTarget 'reddit\.contenttype'
+syn match csdlTarget 'reddit\.link'
+syn match csdlTarget 'reddit\.author\.name'
+syn match csdlTarget 'reddit\.author\.link'
+syn match csdlTarget 'reddit\.type'
+syn match csdlTarget 'reddit\.thread'
+syn match csdlTarget 'interaction\.type'
+syn match csdlTarget 'interaction\.title'
+syn match csdlTarget 'interaction\.content'
+syn match csdlTarget 'interaction\.source'
+syn match csdlTarget 'interaction\.geo'
+syn match csdlTarget 'interaction\.link'
+syn match csdlTarget 'interaction\.author\.username'
+syn match csdlTarget 'interaction\.author\.name'
+syn match csdlTarget 'interaction\.author\.id'
+syn match csdlTarget 'interaction\.author\.avatar'
+syn match csdlTarget 'interaction\.author\.link'
+syn match csdlTarget 'interaction\.sample'
+syn match csdlTarget 'links\.title'
+syn match csdlTarget 'links\.url'
+syn keyword csdlTarget links.normalized_url
+syn match csdlTarget 'links\.hops'
+syn match csdlTarget 'links\.code'
+syn match csdlTarget 'links\.domain'
+syn keyword csdlTarget links.retweet_count
+syn match csdlTarget 'links\.age'
+syn keyword csdlTarget links.meta.content_type
+syn match csdlTarget 'links\.meta\.charset'
+syn match csdlTarget 'links\.meta\.lang'
+syn match csdlTarget 'links\.meta\.keywords'
+syn match csdlTarget 'links\.meta\.description'
+syn match csdlTarget 'links\.meta\.newskeywords'
+syn match csdlTarget 'links\.meta\.standout'
+syn match csdlTarget 'links\.meta\.opengraph\.type'
+syn match csdlTarget 'links\.meta\.opengraph\.title'
+syn match csdlTarget 'links\.meta\.opengraph\.image'
+syn match csdlTarget 'links\.meta\.opengraph\.url'
+syn match csdlTarget 'links\.meta\.opengraph\.description'
+syn keyword csdlTarget links.meta.opengraph.site_name
+syn match csdlTarget 'links\.meta\.opengraph\.email'
+syn keyword csdlTarget links.meta.opengraph.phone_number
+syn keyword csdlTarget links.meta.opengraph.fax_number
+syn match csdlTarget 'links\.meta\.opengraph\.geo'
+syn keyword csdlTarget links.meta.opengraph.street_address
+syn match csdlTarget 'links\.meta\.opengraph\.locality'
+syn match csdlTarget 'links\.meta\.opengraph\.region'
+syn keyword csdlTarget links.meta.opengraph.postal_code
+syn match csdlTarget 'links\.meta\.opengraph\.activity'
+syn match csdlTarget 'links\.meta\.opengraph\.sport'
+syn match csdlTarget 'links\.meta\.opengraph\.bar'
+syn match csdlTarget 'links\.meta\.opengraph\.company'
+syn match csdlTarget 'links\.meta\.opengraph\.cafe'
+syn match csdlTarget 'links\.meta\.opengraph\.hotel'
+syn match csdlTarget 'links\.meta\.opengraph\.restaurant'
+syn match csdlTarget 'links\.meta\.opengraph\.cause'
+syn keyword csdlTarget links.meta.opengraph.sports_league
+syn keyword csdlTarget links.meta.opengraph.sports_team
+syn match csdlTarget 'links\.meta\.opengraph\.band'
+syn match csdlTarget 'links\.meta\.opengraph\.government'
+syn keyword csdlTarget links.meta.opengraph.non_profit
+syn match csdlTarget 'links\.meta\.opengraph\.school'
+syn match csdlTarget 'links\.meta\.opengraph\.university'
+syn match csdlTarget 'links\.meta\.opengraph\.actor'
+syn match csdlTarget 'links\.meta\.opengraph\.athlete'
+syn match csdlTarget 'links\.meta\.opengraph\.author'
+syn match csdlTarget 'links\.meta\.opengraph\.director'
+syn match csdlTarget 'links\.meta\.opengraph\.musician'
+syn match csdlTarget 'links\.meta\.opengraph\.politician'
+syn keyword csdlTarget links.meta.opengraph.public_figure
+syn match csdlTarget 'links\.meta\.opengraph\.city'
+syn match csdlTarget 'links\.meta\.opengraph\.country'
+syn match csdlTarget 'links\.meta\.opengraph\.landmark'
+syn keyword csdlTarget links.meta.opengraph.state_province
+syn match csdlTarget 'links\.meta\.opengraph\.album'
+syn match csdlTarget 'links\.meta\.opengraph\.book'
+syn match csdlTarget 'links\.meta\.opengraph\.drink'
+syn match csdlTarget 'links\.meta\.opengraph\.food'
+syn match csdlTarget 'links\.meta\.opengraph\.game'
+syn match csdlTarget 'links\.meta\.opengraph\.movie'
+syn match csdlTarget 'links\.meta\.opengraph\.product'
+syn match csdlTarget 'links\.meta\.opengraph\.song'
+syn keyword csdlTarget links.meta.opengraph.tv_show
+syn match csdlTarget 'links\.meta\.opengraph\.blog'
+syn match csdlTarget 'links\.meta\.opengraph\.website'
+syn match csdlTarget 'links\.meta\.opengraph\.article'
+syn match csdlTarget 'links\.meta\.twitter\.card'
+syn match csdlTarget 'links\.meta\.twitter\.site'
+syn keyword csdlTarget links.meta.twitter.site_id
+syn match csdlTarget 'links\.meta\.twitter\.creator'
+syn keyword csdlTarget links.meta.twitter.creator_id
+syn match csdlTarget 'links\.meta\.twitter\.url'
+syn match csdlTarget 'links\.meta\.twitter\.description'
+syn match csdlTarget 'links\.meta\.twitter\.title'
+syn match csdlTarget 'links\.meta\.twitter\.image'
+syn keyword csdlTarget links.meta.twitter.image_width
+syn keyword csdlTarget links.meta.twitter.image_height
+syn match csdlTarget 'links\.meta\.twitter\.player'
+syn keyword csdlTarget links.meta.twitter.player_width
+syn keyword csdlTarget links.meta.twitter.player_height
+syn keyword csdlTarget links.meta.twitter.player_stream
+syn keyword csdlTarget links.meta.twitter.player_stream_content_type
+syn match csdlTarget 'myspace\.link'
+syn match csdlTarget 'myspace\.content'
+syn match csdlTarget 'myspace\.contenttype'
+syn match csdlTarget 'myspace\.category'
+syn match csdlTarget 'myspace\.author\.username'
+syn match csdlTarget 'myspace\.author\.name'
+syn match csdlTarget 'myspace\.author\.id'
+syn match csdlTarget 'myspace\.author\.link'
+syn match csdlTarget 'myspace\.author\.avatar'
+syn match csdlTarget 'myspace\.geo'
+syn match csdlTarget 'myspace\.verb'
+syn match csdlTarget 'newscred\.type'
+syn match csdlTarget 'newscred\.article\.domain'
+syn match csdlTarget 'newscred\.video\.domain'
+syn match csdlTarget 'newscred\.article\.topics'
+syn match csdlTarget 'newscred\.video\.topics'
+syn match csdlTarget 'newscred\.article\.category'
+syn match csdlTarget 'newscred\.video\.category'
+syn match csdlTarget 'newscred\.article\.title'
+syn match csdlTarget 'newscred\.video\.title'
+syn match csdlTarget 'newscred\.article\.content'
+syn match csdlTarget 'newscred\.article\.fulltext'
+syn match csdlTarget 'newscred\.article\.authors'
+syn match csdlTarget 'newscred\.image\.caption'
+syn match csdlTarget 'newscred\.video\.caption'
+syn match csdlTarget 'newscred\.image\.attribution\.text'
+syn match csdlTarget 'newscred\.image\.attribution\.link'
+syn match csdlTarget 'newscred\.source\.name'
+syn match csdlTarget 'newscred\.source\.link'
+syn match csdlTarget 'newscred\.source\.domain'
+syn keyword csdlTarget newscred.source.media_type
+syn keyword csdlTarget newscred.source.company_type
+syn match csdlTarget 'newscred\.source\.country'
+syn match csdlTarget 'newscred\.source\.circulation'
+syn match csdlTarget 'newscred\.source\.founded'
+syn match csdlTarget 'imdb\.title'
+syn match csdlTarget 'imdb\.content'
+syn match csdlTarget 'imdb\.contenttype'
+syn match csdlTarget 'imdb\.link'
+syn match csdlTarget 'imdb\.author\.name'
+syn match csdlTarget 'imdb\.author\.link'
+syn match csdlTarget 'imdb\.type'
+syn match csdlTarget 'imdb\.thread'
+syn match csdlTarget 'amazon\.title'
+syn match csdlTarget 'amazon\.content'
+syn match csdlTarget 'amazon\.contenttype'
+syn match csdlTarget 'amazon\.link'
+syn match csdlTarget 'amazon\.author\.name'
+syn match csdlTarget 'amazon\.author\.link'
+syn match csdlTarget 'amazon\.type'
+syn match csdlTarget 'amazon\.thread'
+syn match csdlTarget 'salience\.content\.sentiment'
+syn match csdlTarget 'salience\.content\.topics'
+syn match csdlTarget 'salience\.title\.sentiment'
+syn match csdlTarget 'salience\.title\.topics'
+syn match csdlTarget 'salience\.content\.entities\.name'
+syn match csdlTarget 'salience\.content\.entities\.type'
+syn match csdlTarget 'salience\.title\.entities\.name'
+syn match csdlTarget 'salience\.title\.entities\.type'
+syn match csdlTarget 'klout\.score'
+syn match csdlTarget 'klout\.network'
+syn match csdlTarget 'klout\.amplification'
+syn keyword csdlTarget klout.true_reach
+syn match csdlTarget 'klout\.topics'
+syn match csdlTarget 'wikipedia\.author\.talk'
+syn match csdlTarget 'wikipedia\.author\.contributions'
+syn match csdlTarget 'wikipedia\.author\.username'
+syn match csdlTarget 'wikipedia\.body'
+syn match csdlTarget 'wikipedia\.title'
+syn match csdlTarget 'wikipedia\.images'
+syn match csdlTarget 'wikipedia\.categories'
+syn match csdlTarget 'wikipedia\.externallinks'
+syn match csdlTarget 'wikipedia\.ns'
+syn match csdlTarget 'wikipedia\.namespace'
+syn match csdlTarget 'wikipedia\.pageid'
+syn match csdlTarget 'wikipedia\.parentid'
+syn match csdlTarget 'wikipedia\.oldlen'
+syn match csdlTarget 'wikipedia\.newlen'
+syn match csdlTarget 'wikipedia\.changetype'
+syn match csdlTarget 'wikipedia\.diff\.from'
+syn match csdlTarget 'wikipedia\.diff\.to'
+syn match csdlTarget 'wikipedia\.diff\.changes\.added'
+syn match csdlTarget 'wikipedia\.diff\.changes\.removed'
+syn keyword csdlTarget demographic.twitter_activity
+syn match csdlTarget 'demographic\.location\.country'
+syn keyword csdlTarget demographic.location.us_state
+syn match csdlTarget 'demographic\.location\.city'
+syn match csdlTarget 'demographic\.type'
+syn match csdlTarget 'demographic\.sex'
+syn match csdlTarget 'demographic\.status\.relationship'
+syn match csdlTarget 'demographic\.status\.work'
+syn keyword csdlTarget demographic.likes_and_interests
+syn keyword csdlTarget demographic.first_language
+syn match csdlTarget 'demographic\.professions'
+syn match csdlTarget 'demographic\.services'
+syn keyword csdlTarget demographic.large_accounts_followed
+syn keyword csdlTarget demographic.age_range.start
+syn keyword csdlTarget demographic.age_range.end
+syn match csdlTarget 'demographic\.income\.start'
+syn match csdlTarget 'demographic\.income\.end'
+syn keyword csdlTarget demographic.main_street.dressed_by
+syn keyword csdlTarget demographic.main_street.shop_at
+syn keyword csdlTarget demographic.main_street.eat_and_drink_at
+syn match csdlTarget 'demographic\.accounts\.categories'
+syn match csdlTarget 'tumblr\.activity'
+syn match csdlTarget 'tumblr\.source\.blogid'
+syn match csdlTarget 'tumblr\.dest\.blogid'
+syn match csdlTarget 'tumblr\.dest\.postid'
+syn match csdlTarget 'tumblr\.root\.blogid'
+syn match csdlTarget 'tumblr\.root\.postid'
+syn match csdlTarget 'tumblr\.blogid'
+syn keyword csdlTarget tumblr.blog_name
+syn match csdlTarget 'tumblr\.type'
+syn match csdlTarget 'tumblr\.title'
+syn match csdlTarget 'tumblr\.body'
+syn match csdlTarget 'tumblr\.text'
+syn match csdlTarget 'tumblr\.tags'
+syn keyword csdlTarget tumblr.track_name
+syn match csdlTarget 'tumblr\.album'
+syn match csdlTarget 'tumblr\.link'
+syn match csdlTarget 'tumblr\.meta\.url'
+syn match csdlTarget 'tumblr\.meta\.type'
+syn match csdlTarget 'tumblr\.meta\.description'
+syn keyword csdlTarget tumblr.meta.likes_local
+syn keyword csdlTarget tumblr.meta.likes_global
+syn keyword csdlTarget tumblr.meta.reblogged_global
+syn match csdlTarget 'demographic\.gender'
+syn match csdlTarget 'flickr\.title'
+syn match csdlTarget 'flickr\.content'
+syn match csdlTarget 'flickr\.contenttype'
+syn match csdlTarget 'flickr\.link'
+syn match csdlTarget 'flickr\.author\.name'
+syn match csdlTarget 'flickr\.author\.link'
+syn match csdlTarget 'flickr\.author\.username'
+syn match csdlTarget 'flickr\.type'
+syn match csdlTarget 'flickr\.thread'
+syn match csdlTarget 'twitter\.text'
+syn match csdlTarget 'twitter\.source'
+syn match csdlTarget 'twitter\.mentions'
+syn keyword csdlTarget twitter.mention_ids
+syn match csdlTarget 'twitter\.links'
+syn match csdlTarget 'twitter\.domains'
+syn keyword csdlTarget twitter.in_reply_to_screen_name
+syn keyword csdlTarget twitter.in_reply_to_user_id
+syn keyword csdlTarget twitter.in_reply_to_status_id
+syn keyword csdlTarget twitter.filter_level
+syn match csdlTarget 'twitter\.lang'
+syn match csdlTarget 'twitter\.geo'
+syn match csdlTarget 'twitter\.user\.description'
+syn match csdlTarget 'twitter\.user\.location'
+syn keyword csdlTarget twitter.user.statuses_count
+syn keyword csdlTarget twitter.user.followers_count
+syn keyword csdlTarget twitter.user.follower_ratio
+syn keyword csdlTarget twitter.user.profile_age
+syn keyword csdlTarget twitter.user.friends_count
+syn keyword csdlTarget twitter.user.screen_name
+syn match csdlTarget 'twitter\.user\.lang'
+syn keyword csdlTarget twitter.user.time_zone
+syn match csdlTarget 'twitter\.user\.name'
+syn match csdlTarget 'twitter\.user\.id'
+syn keyword csdlTarget twitter.user.listed_count
+syn match csdlTarget 'twitter\.user\.url'
+syn match csdlTarget 'twitter\.user\.verified'
+syn keyword csdlTarget twitter.place.place_type
+syn match csdlTarget 'twitter\.place\.country'
+syn keyword csdlTarget twitter.place.country_code
+syn keyword csdlTarget twitter.place.full_name
+syn match csdlTarget 'twitter\.place\.name'
+syn match csdlTarget 'twitter\.place\.url'
+syn match csdlTarget 'twitter\.place\.attributes\.locality'
+syn match csdlTarget 'twitter\.place\.attributes\.region'
+syn keyword csdlTarget twitter.place.attributes.street_address
+syn match csdlTarget 'twitter\.status'
+syn match csdlTarget 'twitter\.retweet\.text'
+syn match csdlTarget 'twitter\.retweet\.elapsed'
+syn match csdlTarget 'twitter\.retweet\.source'
+syn keyword csdlTarget twitter.retweet.filter_level
+syn match csdlTarget 'twitter\.retweet\.lang'
+syn match csdlTarget 'twitter\.retweet\.user\.description'
+syn match csdlTarget 'twitter\.retweet\.user\.location'
+syn keyword csdlTarget twitter.retweet.user.statuses_count
+syn keyword csdlTarget twitter.retweet.user.followers_count
+syn keyword csdlTarget twitter.retweet.user.follower_ratio
+syn keyword csdlTarget twitter.retweet.user.profile_age
+syn keyword csdlTarget twitter.retweet.user.friends_count
+syn keyword csdlTarget twitter.retweet.user.screen_name
+syn match csdlTarget 'twitter\.retweet\.user\.lang'
+syn keyword csdlTarget twitter.retweet.user.time_zone
+syn match csdlTarget 'twitter\.retweet\.user\.name'
+syn match csdlTarget 'twitter\.retweet\.user\.id'
+syn keyword csdlTarget twitter.retweet.user.listed_count
+syn match csdlTarget 'twitter\.retweet\.user\.url'
+syn match csdlTarget 'twitter\.retweet\.user\.verified'
+syn match csdlTarget 'twitter\.retweeted\.id'
+syn match csdlTarget 'twitter\.retweeted\.source'
+syn keyword csdlTarget twitter.retweeted.in_reply_to_screen_name
+syn keyword csdlTarget twitter.retweeted.in_reply_to_user_id_str
+syn keyword csdlTarget twitter.retweeted.in_reply_to_status_id
+syn match csdlTarget 'twitter\.retweet\.count'
+syn match csdlTarget 'twitter\.retweet\.mentions'
+syn keyword csdlTarget twitter.retweet.mention_ids
+syn match csdlTarget 'twitter\.retweet\.links'
+syn match csdlTarget 'twitter\.retweet\.domains'
+syn match csdlTarget 'twitter\.retweeted\.user\.description'
+syn match csdlTarget 'twitter\.retweeted\.user\.location'
+syn keyword csdlTarget twitter.retweeted.user.statuses_count
+syn keyword csdlTarget twitter.retweeted.user.followers_count
+syn keyword csdlTarget twitter.retweeted.user.follower_ratio
+syn keyword csdlTarget twitter.retweeted.user.profile_age
+syn keyword csdlTarget twitter.retweeted.user.friends_count
+syn keyword csdlTarget twitter.retweeted.user.screen_name
+syn match csdlTarget 'twitter\.retweeted\.user\.lang'
+syn keyword csdlTarget twitter.retweeted.user.time_zone
+syn match csdlTarget 'twitter\.retweeted\.user\.name'
+syn match csdlTarget 'twitter\.retweeted\.user\.id'
+syn keyword csdlTarget twitter.retweeted.user.listed_count
+syn match csdlTarget 'twitter\.retweeted\.user\.url'
+syn match csdlTarget 'twitter\.retweeted\.user\.verified'
+syn match csdlTarget 'twitter\.retweeted\.geo'
+syn keyword csdlTarget twitter.retweeted.place.place_type
+syn match csdlTarget 'twitter\.retweeted\.place\.country'
+syn keyword csdlTarget twitter.retweeted.place.country_code
+syn keyword csdlTarget twitter.retweeted.place.full_name
+syn match csdlTarget 'twitter\.retweeted\.place\.name'
+syn match csdlTarget 'twitter\.retweeted\.place\.url'
+syn match csdlTarget 'twitter\.retweeted\.place\.attributes'
+syn match csdlTarget 'twitter\.hashtags'
+syn match csdlTarget 'twitter\.retweet\.hashtags'
+syn match csdlTarget 'twitter\.media\.type'
+syn keyword csdlTarget twitter.media.media_url
+syn keyword csdlTarget twitter.media.display_url
+syn match csdlTarget 'twitter\.retweet\.media\.type'
+syn keyword csdlTarget twitter.retweet.media.media_url
+syn keyword csdlTarget twitter.retweet.media.display_url
+syn match csdlTarget 'blog\.title'
+syn match csdlTarget 'blog\.content'
+syn match csdlTarget 'blog\.contenttype'
+syn match csdlTarget 'blog\.link'
+syn match csdlTarget 'blog\.domain'
+syn match csdlTarget 'blog\.author\.name'
+syn match csdlTarget 'blog\.author\.link'
+syn match csdlTarget 'blog\.author\.avatar'
+syn match csdlTarget 'blog\.author\.username'
+syn match csdlTarget 'blog\.type'
+syn match csdlTarget 'blog\.post\.link'
+syn match csdlTarget 'blog\.post\.title'
+syn match csdlTarget 'facebook\.author\.name'
+syn match csdlTarget 'facebook\.author\.link'
+syn match csdlTarget 'facebook\.author\.id'
+syn match csdlTarget 'facebook\.author\.avatar'
+syn match csdlTarget 'facebook\.message'
+syn match csdlTarget 'facebook\.description'
+syn match csdlTarget 'facebook\.caption'
+syn match csdlTarget 'facebook\.type'
+syn match csdlTarget 'facebook\.application'
+syn match csdlTarget 'facebook\.source'
+syn match csdlTarget 'facebook\.link'
+syn match csdlTarget 'facebook\.name'
+syn match csdlTarget 'facebook\.to\.names'
+syn match csdlTarget 'facebook\.to\.ids'
+syn match csdlTarget 'facebook\.og\.title'
+syn match csdlTarget 'facebook\.og\.location'
+syn match csdlTarget 'facebook\.og\.photos'
+syn match csdlTarget 'facebook\.og\.by'
+syn match csdlTarget 'facebook\.og\.description'
+syn match csdlTarget 'facebook\.og\.type'
+syn match csdlTarget 'facebook\.og\.length'
+syn match csdlTarget 'facebook\.likes\.count'
+syn match csdlTarget 'facebook\.likes\.names'
+syn match csdlTarget 'facebook\.likes\.ids'
+syn match csdlTarget 'topix\.title'
+syn match csdlTarget 'topix\.content'
+syn match csdlTarget 'topix\.contenttype'
+syn match csdlTarget 'topix\.link'
+syn match csdlTarget 'topix\.author\.name'
+syn match csdlTarget 'topix\.type'
+syn match csdlTarget 'topix\.thread'
+syn match csdlTarget 'topix\.author\.location'
+syn match csdlTarget 'bitly\.user\.agent'
+syn keyword csdlTarget bitly.url_hash
+syn match csdlTarget 'bitly\.share\.hash'
+syn match csdlTarget 'bitly\.cname'
+syn keyword csdlTarget bitly.referring_url
+syn keyword csdlTarget bitly.referring_domain
+syn match csdlTarget 'bitly\.url'
+syn match csdlTarget 'bitly\.domain'
+syn keyword csdlTarget bitly.country_code
+syn keyword csdlTarget bitly.geo_region_code
+syn match csdlTarget 'bitly\.country'
+syn keyword csdlTarget bitly.geo_region
+syn keyword csdlTarget bitly.geo_city
+syn match csdlTarget 'bitly\.geo'
+syn match csdlTarget 'bitly\.timezone'
+syn match csdlTarget 'trends\.type'
+syn match csdlTarget 'trends\.content'
+syn match csdlTarget 'trends\.source'
+syn match csdlTarget 'board\.title'
+syn match csdlTarget 'board\.content'
+syn match csdlTarget 'board\.contenttype'
+syn match csdlTarget 'board\.link'
+syn match csdlTarget 'board\.domain'
+syn match csdlTarget 'board\.author\.name'
+syn match csdlTarget 'board\.author\.link'
+syn match csdlTarget 'board\.author\.avatar'
+syn match csdlTarget 'board\.author\.username'
+syn match csdlTarget 'board\.type'
+syn match csdlTarget 'board\.thread'
+syn match csdlTarget 'board\.author\.location'
+syn match csdlTarget 'board\.author\.signature'
+syn match csdlTarget 'board\.author\.registered'
+syn match csdlTarget 'board\.author\.age'
+syn match csdlTarget 'board\.author\.gender'
+syn match csdlTarget 'video\.title'
+syn match csdlTarget 'video\.content'
+syn match csdlTarget 'video\.contenttype'
+syn match csdlTarget 'video\.domain'
+syn match csdlTarget 'video\.author\.name'
+syn match csdlTarget 'video\.author\.link'
+syn match csdlTarget 'video\.author\.avatar'
+syn match csdlTarget 'video\.author\.username'
+syn match csdlTarget 'video\.type'
+syn match csdlTarget 'video\.videolink'
+syn match csdlTarget 'video\.commentslink'
+syn match csdlTarget 'video\.duration'
+syn match csdlTarget 'video\.thumbnail'
+syn match csdlTarget 'video\.category'
+syn match csdlTarget 'video\.tags'
+syn match csdlTarget '2ch\.title'
+syn match csdlTarget '2ch\.content'
+syn match csdlTarget '2ch\.contenttype'
+syn match csdlTarget '2ch\.link'
+syn match csdlTarget '2ch\.author\.name'
+syn match csdlTarget '2ch\.type'
+syn match csdlTarget '2ch\.thread'
+syn match csdlTarget 'dailymotion\.title'
+syn match csdlTarget 'dailymotion\.content'
+syn match csdlTarget 'dailymotion\.contenttype'
+syn match csdlTarget 'dailymotion\.author\.link'
+syn match csdlTarget 'dailymotion\.author\.username'
+syn match csdlTarget 'dailymotion\.videolink'
+syn match csdlTarget 'dailymotion\.duration'
+syn match csdlTarget 'dailymotion\.thumbnail'
+syn match csdlTarget 'dailymotion\.category'
+syn match csdlTarget 'dailymotion\.tags'
+syn match csdlTarget 'language\.tag'
+syn match csdlTarget 'language\.confidence'
+syn match csdlTarget 'digg\.type'
+syn match csdlTarget 'digg\.user\.name'
+syn match csdlTarget 'digg\.user\.fullname'
+syn match csdlTarget 'digg\.user\.registered'
+syn match csdlTarget 'digg\.user\.profileviews'
+syn match csdlTarget 'digg\.user\.icon'
+syn match csdlTarget 'digg\.user\.links'
+syn match csdlTarget 'digg\.item\.status'
+syn match csdlTarget 'digg\.item\.description'
+syn match csdlTarget 'digg\.item\.title'
+syn match csdlTarget 'digg\.item\.diggs'
+syn match csdlTarget 'digg\.item\.comments'
+syn match csdlTarget 'digg\.item\.topic'
+syn match csdlTarget 'digg\.comment\.buries'
+syn match csdlTarget 'digg\.comment\.diggs'
+syn match csdlTarget 'digg\.comment\.text'
+syn match csdlTarget 'youtube\.title'
+syn match csdlTarget 'youtube\.content'
+syn match csdlTarget 'youtube\.contenttype'
+syn match csdlTarget 'youtube\.author\.name'
+syn match csdlTarget 'youtube\.author\.link'
+syn match csdlTarget 'youtube\.type'
+syn match csdlTarget 'youtube\.videolink'
+syn match csdlTarget 'youtube\.commentslink'
+syn match csdlTarget 'youtube\.duration'
+syn match csdlTarget 'youtube\.thumbnail'
+syn match csdlTarget 'youtube\.category'
+syn match csdlTarget 'youtube\.tags'
+
+syn match csdlComment "^\/\/.*$"
+syn match csdlComment "^\/\*.*$"
+syn match csdlComment "^.*\*\/$"
+
+highlight link csdlKeyword Statement
+highlight link csdlOperator Operator
+highlight link csdlLogicalOperator Operator
+highlight link csdlTarget Constant
+highlight link csdlComment Comment
+"
+let b:current_syntax = "csdl"
+
+endif
diff --git a/syntax/csp.vim b/syntax/csp.vim
new file mode 100644
index 000000000..e269b3f07
--- /dev/null
+++ b/syntax/csp.vim
@@ -0,0 +1,186 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csp') == -1
+
+" Vim syntax file
+" Language:	CSP (Communication Sequential Processes, using FDR input syntax)
+" Maintainer:	Jan Bredereke <brederek@tzi.de>
+" Version:	0.6.0
+" Last change:	Mon Mar 25, 2002
+" URL:		http://www.tzi.de/~brederek/vim/
+" Copying:	You may distribute and use this file freely, in the same
+"		way as the vim editor itself.
+"
+" To Do:	- Probably I missed some keywords or operators, please
+"		  fix them and notify me, the maintainer.
+"		- Currently, we do lexical highlighting only. It would be
+"		  nice to have more actual syntax checks, including
+"		  highlighting of wrong syntax.
+"		- The additional syntax for the RT-Tester (pseudo-comments)
+"		  should be optional.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" case is significant to FDR:
+syn case match
+
+" Block comments in CSP are between {- and -}
+syn region cspComment	start="{-"  end="-}" contains=cspTodo
+" Single-line comments start with --
+syn region cspComment	start="--"  end="$" contains=cspTodo,cspOldRttComment,cspSdlRttComment keepend
+
+" Numbers:
+syn match  cspNumber "\<\d\+\>"
+
+" Conditionals:
+syn keyword  cspConditional if then else
+
+" Operators on processes:
+" -> ? : ! ' ; /\ \ [] |~| [> & [[..<-..]] ||| [|..|] || [..<->..] ; : @ |||
+syn match  cspOperator "->"
+syn match  cspOperator "/\\"
+syn match  cspOperator "[^/]\\"lc=1
+syn match  cspOperator "\[\]"
+syn match  cspOperator "|\~|"
+syn match  cspOperator "\[>"
+syn match  cspOperator "\[\["
+syn match  cspOperator "\]\]"
+syn match  cspOperator "<-"
+syn match  cspOperator "|||"
+syn match  cspOperator "[^|]||[^|]"lc=1,me=e-1
+syn match  cspOperator "[^|{\~]|[^|}\~]"lc=1,me=e-1
+syn match  cspOperator "\[|"
+syn match  cspOperator "|\]"
+syn match  cspOperator "\[[^>]"me=e-1
+syn match  cspOperator "\]"
+syn match  cspOperator "<->"
+syn match  cspOperator "[?:!';@]"
+syn match  cspOperator "&"
+syn match  cspOperator "\."
+
+" (not on processes:)
+" syn match  cspDelimiter	"{|"
+" syn match  cspDelimiter	"|}"
+" syn match  cspDelimiter	"{[^-|]"me=e-1
+" syn match  cspDelimiter	"[^-|]}"lc=1
+
+" Keywords:
+syn keyword cspKeyword		length null head tail concat elem
+syn keyword cspKeyword		union inter diff Union Inter member card
+syn keyword cspKeyword		empty set Set Seq
+syn keyword cspKeyword		true false and or not within let
+syn keyword cspKeyword		nametype datatype diamond normal
+syn keyword cspKeyword		sbisim tau_loop_factor model_compress
+syn keyword cspKeyword		explicate
+syn match cspKeyword		"transparent"
+syn keyword cspKeyword		external chase prioritize
+syn keyword cspKeyword		channel Events
+syn keyword cspKeyword		extensions productions
+syn keyword cspKeyword		Bool Int
+
+" Reserved keywords:
+syn keyword cspReserved		attribute embed module subtype
+
+" Include:
+syn region cspInclude matchgroup=cspIncludeKeyword start="^include" end="$" keepend contains=cspIncludeArg
+syn region cspIncludeArg start='\s\+\"' end= '\"\s*' contained
+
+" Assertions:
+syn keyword cspAssert		assert deterministic divergence free deadlock
+syn keyword cspAssert		livelock
+syn match cspAssert		"\[T="
+syn match cspAssert		"\[F="
+syn match cspAssert		"\[FD="
+syn match cspAssert		"\[FD\]"
+syn match cspAssert		"\[F\]"
+
+" Types and Sets
+" (first char a capital, later at least one lower case, no trailing underscore):
+syn match cspType     "\<_*[A-Z][A-Z_0-9]*[a-z]\(\|[A-Za-z_0-9]*[A-Za-z0-9]\)\>"
+
+" Processes (all upper case, no trailing underscore):
+" (For identifiers that could be types or sets, too, this second rule set
+" wins.)
+syn match cspProcess		"\<[A-Z_][A-Z_0-9]*[A-Z0-9]\>"
+syn match cspProcess		"\<[A-Z_]\>"
+
+" reserved identifiers for tool output (ending in underscore):
+syn match cspReservedIdentifier	"\<[A-Za-z_][A-Za-z_0-9]*_\>"
+
+" ToDo markers:
+syn match cspTodo		"FIXME"	contained
+syn match cspTodo		"TODO"	contained
+syn match cspTodo		"!!!"	contained
+
+" RT-Tester pseudo comments:
+" (The now obsolete syntax:)
+syn match cspOldRttComment	"^--\$\$AM_UNDEF"lc=2		contained
+syn match cspOldRttComment	"^--\$\$AM_ERROR"lc=2		contained
+syn match cspOldRttComment	"^--\$\$AM_WARNING"lc=2		contained
+syn match cspOldRttComment	"^--\$\$AM_SET_TIMER"lc=2	contained
+syn match cspOldRttComment	"^--\$\$AM_RESET_TIMER"lc=2	contained
+syn match cspOldRttComment	"^--\$\$AM_ELAPSED_TIMER"lc=2	contained
+syn match cspOldRttComment	"^--\$\$AM_OUTPUT"lc=2		contained
+syn match cspOldRttComment	"^--\$\$AM_INPUT"lc=2		contained
+" (The current syntax:)
+syn region cspRttPragma matchgroup=cspRttPragmaKeyword start="^pragma\s\+" end="\s*$" oneline keepend contains=cspRttPragmaArg,cspRttPragmaSdl
+syn keyword cspRttPragmaArg	AM_ERROR AM_WARNING AM_SET_TIMER contained
+syn keyword cspRttPragmaArg	AM_RESET_TIMER AM_ELAPSED_TIMER  contained
+syn keyword cspRttPragmaArg	AM_OUTPUT AM_INPUT AM_INTERNAL   contained
+" the "SDL_MATCH" extension:
+syn region cspRttPragmaSdl	matchgroup=cspRttPragmaKeyword start="SDL_MATCH\s\+" end="\s*$" contains=cspRttPragmaSdlArg contained
+syn keyword cspRttPragmaSdlArg	TRANSLATE nextgroup=cspRttPragmaSdlTransName contained
+syn keyword cspRttPragmaSdlArg	PARAM SKIP OPTIONAL CHOICE ARRAY nextgroup=cspRttPragmaSdlName contained
+syn match cspRttPragmaSdlName	"\s*\S\+\s*" nextgroup=cspRttPragmaSdlTail contained
+syn region cspRttPragmaSdlTail  start="" end="\s*$" contains=cspRttPragmaSdlTailArg contained
+syn keyword cspRttPragmaSdlTailArg	SUBSET_USED DEFAULT_VALUE Present contained
+syn match cspRttPragmaSdlTransName	"\s*\w\+\s*" nextgroup=cspRttPragmaSdlTransTail contained
+syn region cspRttPragmaSdlTransTail  start="" end="\s*$" contains=cspRttPragmaSdlTransTailArg contained
+syn keyword cspRttPragmaSdlTransTailArg	sizeof contained
+syn match cspRttPragmaSdlTransTailArg	"\*" contained
+syn match cspRttPragmaSdlTransTailArg	"(" contained
+syn match cspRttPragmaSdlTransTailArg	")" contained
+
+" temporary syntax extension for commented-out "pragma SDL_MATCH":
+syn match cspSdlRttComment	"pragma\s\+SDL_MATCH\s\+" nextgroup=cspRttPragmaSdlArg contained
+
+syn sync lines=250
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default methods for highlighting.  Can be overridden later
+" (For vim version <=5.7, the command groups are defined in
+" $VIMRUNTIME/syntax/synload.vim )
+hi def link cspComment			Comment
+hi def link cspNumber			Number
+hi def link cspConditional			Conditional
+hi def link cspOperator			Delimiter
+hi def link cspKeyword			Keyword
+hi def link cspReserved			SpecialChar
+hi def link cspInclude			Error
+hi def link cspIncludeKeyword		Include
+hi def link cspIncludeArg			Include
+hi def link cspAssert			PreCondit
+hi def link cspType			Type
+hi def link cspProcess			Function
+hi def link cspTodo			Todo
+hi def link cspOldRttComment		Define
+hi def link cspRttPragmaKeyword		Define
+hi def link cspSdlRttComment		Define
+hi def link cspRttPragmaArg		Define
+hi def link cspRttPragmaSdlArg		Define
+hi def link cspRttPragmaSdlName		Default
+hi def link cspRttPragmaSdlTailArg		Define
+hi def link cspRttPragmaSdlTransName	Default
+hi def link cspRttPragmaSdlTransTailArg	Define
+hi def link cspReservedIdentifier	Error
+" (Currently unused vim method: Debug)
+
+
+let b:current_syntax = "csp"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/css.vim b/syntax/css.vim
new file mode 100644
index 000000000..9aa4af3f1
--- /dev/null
+++ b/syntax/css.vim
@@ -0,0 +1,657 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'css') == -1
+
+" Vim syntax file
+" Language:     Cascading Style Sheets
+" Previous Contributor List:
+"               Jules Wang      <w.jq0722@gmail.com>
+"               Claudio Fleiner <claudio@fleiner.com> (Maintainer)
+"               Yeti            (Add full CSS2, HTML4 support)
+"               Nikolai Weibull (Add CSS2 support)
+" URL:          https://github.com/jsit/css.vim
+" Maintainer:   Jay Sitter <jay@jaysitter.com>
+" Last Change:  2019 Jul. 29
+
+" quit when a syntax file was already loaded
+if !exists("main_syntax")
+  if exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax = 'css'
+elseif exists("b:current_syntax") && b:current_syntax == "css"
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case ignore
+
+" HTML4 tags
+syn keyword cssTagName abbr address area a b base
+syn keyword cssTagName bdo blockquote body br button
+syn keyword cssTagName caption cite code col colgroup dd del
+syn keyword cssTagName dfn div dl dt em fieldset form
+syn keyword cssTagName h1 h2 h3 h4 h5 h6 head hr html img i
+syn keyword cssTagName iframe input ins isindex kbd label legend li
+syn keyword cssTagName link map menu meta noscript ol optgroup
+syn keyword cssTagName option p param pre q s samp script small
+syn keyword cssTagName span strong sub sup tbody td
+syn keyword cssTagName textarea tfoot th thead title tr ul u var
+syn keyword cssTagName object svg
+syn match   cssTagName /\<select\>\|\<style\>\|\<table\>/
+
+" 34 HTML5 tags
+syn keyword cssTagName article aside audio bdi canvas command data
+syn keyword cssTagName datalist details dialog embed figcaption figure footer
+syn keyword cssTagName header hgroup keygen main mark menuitem meter nav
+syn keyword cssTagName output progress rt rp ruby section
+syn keyword cssTagName source summary time track video wbr
+
+" Tags not supported in HTML5
+" acronym applet basefont big center dir
+" font frame frameset noframes strike tt
+
+syn match cssTagName "\*"
+
+" selectors
+syn match cssSelectorOp "[,>+~]"
+syn match cssSelectorOp2 "[~|^$*]\?=" contained
+syn region cssAttributeSelector matchgroup=cssSelectorOp start="\[" end="]" contains=cssUnicodeEscape,cssSelectorOp2,cssStringQ,cssStringQQ
+
+" .class and #id
+syn match cssClassName "\.-\=[A-Za-z_][A-Za-z0-9_-]*" contains=cssClassNameDot
+syn match cssClassNameDot contained '\.'
+
+try
+syn match cssIdentifier "#[A-Za-z�-�_@][A-Za-z�-�0-9_@-]*"
+catch /^.*/
+syn match cssIdentifier "#[A-Za-z_@][A-Za-z0-9_@-]*"
+endtry
+
+" digits
+syn match cssValueInteger contained "[-+]\=\d\+" contains=cssUnitDecorators
+syn match cssValueNumber contained "[-+]\=\d\+\(\.\d*\)\=" contains=cssUnitDecorators
+syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=\(mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|dpi\|dppx\|dpcm\|fr\|vw\|vh\|vmin\|vmax\|ch\)\>" contains=cssUnitDecorators
+syn match cssValueLength contained "[-+]\=\d\+\(\.\d*\)\=%" contains=cssUnitDecorators
+syn match cssValueAngle contained "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\)\>" contains=cssUnitDecorators
+syn match cssValueTime contained "+\=\d\+\(\.\d*\)\=\(ms\|s\)\>" contains=cssUnitDecorators
+syn match cssValueFrequency contained "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)\>" contains=cssUnitDecorators
+
+" The 16 basic color names
+syn keyword cssColor contained aqua black blue fuchsia gray green lime maroon navy olive purple red silver teal yellow
+
+" 130 more color names
+syn keyword cssColor contained aliceblue antiquewhite aquamarine azure
+syn keyword cssColor contained beige bisque blanchedalmond blueviolet brown burlywood
+syn keyword cssColor contained cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan
+syn match cssColor contained /\<dark\(blue\|cyan\|goldenrod\|gray\|green\|grey\|khaki\)\>/
+syn match cssColor contained /\<dark\(magenta\|olivegreen\|orange\|orchid\|red\|salmon\|seagreen\)\>/
+syn match cssColor contained /\<darkslate\(blue\|gray\|grey\)\>/
+syn match cssColor contained /\<dark\(turquoise\|violet\)\>/
+syn keyword cssColor contained deeppink deepskyblue dimgray dimgrey dodgerblue firebrick
+syn keyword cssColor contained floralwhite forestgreen gainsboro ghostwhite gold
+syn keyword cssColor contained goldenrod greenyellow grey honeydew hotpink
+syn keyword cssColor contained indianred indigo ivory khaki lavender lavenderblush lawngreen
+syn keyword cssColor contained lemonchiffon limegreen linen magenta
+syn match cssColor contained /\<light\(blue\|coral\|cyan\|goldenrodyellow\|gray\|green\)\>/
+syn match cssColor contained /\<light\(grey\|pink\|salmon\|seagreen\|skyblue\|yellow\)\>/
+syn match cssColor contained /\<light\(slategray\|slategrey\|steelblue\)\>/
+syn match cssColor contained /\<medium\(aquamarine\|blue\|orchid\|purple\|seagreen\)\>/
+syn match cssColor contained /\<medium\(slateblue\|springgreen\|turquoise\|violetred\)\>/
+syn keyword cssColor contained midnightblue mintcream mistyrose moccasin navajowhite
+syn keyword cssColor contained oldlace olivedrab orange orangered orchid
+syn match cssColor contained /\<pale\(goldenrod\|green\|turquoise\|violetred\)\>/
+syn keyword cssColor contained papayawhip peachpuff peru pink plum powderblue
+syn keyword cssColor contained rosybrown royalblue rebeccapurple saddlebrown salmon
+syn keyword cssColor contained sandybrown seagreen seashell sienna skyblue slateblue
+syn keyword cssColor contained slategray slategrey snow springgreen steelblue tan
+syn keyword cssColor contained thistle tomato turquoise violet wheat
+syn keyword cssColor contained whitesmoke yellowgreen
+
+" FIXME: These are actually case-insensitive too, but (a) specs recommend using
+" mixed-case (b) it's hard to highlight the word `Background' correctly in
+" all situations
+syn case match
+syn keyword cssColor contained ActiveBorder ActiveCaption AppWorkspace ButtonFace ButtonHighlight ButtonShadow ButtonText CaptionText GrayText Highlight HighlightText InactiveBorder InactiveCaption InactiveCaptionText InfoBackground InfoText Menu MenuText Scrollbar ThreeDDarkShadow ThreeDFace ThreeDHighlight ThreeDLightShadow ThreeDShadow Window WindowFrame WindowText Background
+syn case ignore
+
+syn match cssImportant contained "!\s*important\>"
+syn match cssCustomProp contained "--[a-zA-Z0-9-_]*"
+
+syn match cssColor contained "\<transparent\>"
+syn match cssColor contained "\<currentColor\>"
+syn match cssColor contained "\<white\>"
+syn match cssColor contained "#\x\{3,4\}\>" contains=cssUnitDecorators
+syn match cssColor contained "#\x\{6\}\>" contains=cssUnitDecorators
+syn match cssColor contained "#\x\{8\}\>" contains=cssUnitDecorators
+
+syn region cssURL contained matchgroup=cssFunctionName start="\<\(uri\|url\|local\|format\)\s*(" end=")" contains=cssStringQ,cssStringQQ oneline
+syn region cssFunction contained matchgroup=cssFunctionName start="\<\(var\|calc\)\s*(" end=")" contains=cssCustomProp,cssValue.*,cssFunction,cssColor,cssStringQ,cssStringQQ oneline
+syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgb\|clip\|attr\|counter\|rect\|cubic-bezier\|steps\)\s*(" end=")" oneline  contains=cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma
+syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgba\|hsl\|hsla\|color-stop\|from\|to\)\s*(" end=")" oneline  contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma,cssFunction
+syn region cssFunction contained matchgroup=cssFunctionName start="\<\(linear-\|radial-\)\=\gradient\s*(" end=")" oneline  contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunction,cssGradientAttr,cssFunctionComma
+syn region cssFunction contained matchgroup=cssFunctionName start="\<\(matrix\(3d\)\=\|scale\(3d\|X\|Y\|Z\)\=\|translate\(3d\|X\|Y\|Z\)\=\|skew\(X\|Y\)\=\|rotate\(3d\|X\|Y\|Z\)\=\|perspective\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssValueAngle,cssFunctionComma
+syn region cssFunction contained matchgroup=cssFunctionName start="\<\(blur\|brightness\|contrast\|drop-shadow\|grayscale\|hue-rotate\|invert\|opacity\|saturate\|sepia\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssValueAngle,cssFunctionComma
+syn keyword cssGradientAttr contained top bottom left right cover center middle ellipse at
+syn match cssFunctionComma contained ","
+
+" Common Prop and Attr
+syn keyword cssCommonAttr contained auto none inherit all default normal
+syn keyword cssCommonAttr contained top bottom center stretch hidden visible
+syn match cssCommonAttr contained "\<\(max-\|min-\|fit-\)content\>"
+"------------------------------------------------
+" CSS Animations
+" http://www.w3.org/TR/css3-animations/
+syn match cssAnimationProp contained "\<animation\(-\(delay\|direction\|duration\|fill-mode\|name\|play-state\|timing-function\|iteration-count\)\)\=\>"
+
+" animation-direction attributes
+syn keyword cssAnimationAttr contained alternate reverse
+syn match cssAnimationAttr contained "\<alternate-reverse\>"
+
+" animation-fill-mode attributes
+syn keyword cssAnimationAttr contained forwards backwards both
+
+" animation-play-state attributes
+syn keyword cssAnimationAttr contained running paused
+
+" animation-iteration-count attributes
+syn keyword cssAnimationAttr contained infinite
+"------------------------------------------------
+"  CSS Backgrounds and Borders Module Level 3
+"  http://www.w3.org/TR/css3-background/
+syn match cssBackgroundProp contained "\<background\(-\(attachment\|clip\|color\|image\|origin\|position\|repeat\|size\)\)\=\>"
+" background-attachment attributes
+syn keyword cssBackgroundAttr contained scroll fixed local
+
+" background-position attributes
+syn keyword cssBackgroundAttr contained left center right top bottom
+
+" background-repeat attributes
+syn match cssBackgroundAttr contained "\<no-repeat\>"
+syn match cssBackgroundAttr contained "\<repeat\(-[xy]\)\=\>"
+
+" background-size attributes
+syn keyword cssBackgroundAttr contained cover contain
+
+syn match cssBorderProp contained "\<border\(-\(top\|right\|bottom\|left\)\)\=\(-\(width\|color\|style\)\)\=\>"
+syn match cssBorderProp contained "\<border\(-\(top\|bottom\)-\(left\|right\)\)\=-radius\>"
+syn match cssBorderProp contained "\<border-image\(-\(outset\|repeat\|slice\|source\|width\)\)\=\>"
+syn match cssBorderProp contained "\<box-decoration-break\>"
+syn match cssBorderProp contained "\<box-shadow\>"
+
+" border-image attributes
+syn keyword cssBorderAttr contained stretch round fill
+
+" border-style attributes
+syn keyword cssBorderAttr contained dotted dashed solid double groove ridge inset outset
+
+" border-width attributes
+syn keyword cssBorderAttr contained thin thick medium
+
+" box-decoration-break attributes
+syn keyword cssBorderAttr contained clone slice
+"------------------------------------------------
+
+syn match cssBoxProp contained "\<padding\(-\(top\|right\|bottom\|left\)\)\=\>"
+syn match cssBoxProp contained "\<margin\(-\(top\|right\|bottom\|left\)\)\=\>"
+syn match cssBoxProp contained "\<overflow\(-\(x\|y\|style\)\)\=\>"
+syn match cssBoxProp contained "\<rotation\(-point\)\=\>"
+syn keyword cssBoxAttr contained visible hidden scroll auto
+syn match cssBoxAttr contained "\<no-\(display\|content\)\>"
+
+syn keyword cssCascadeProp contained all
+syn keyword cssCascadeAttr contained initial unset revert
+
+syn keyword cssColorProp contained opacity
+syn match cssColorProp contained "\<color-profile\>"
+syn match cssColorProp contained "\<rendering-intent\>"
+
+
+syn match cssDimensionProp contained "\<\(min\|max\)-\(width\|height\)\>"
+syn keyword cssDimensionProp contained height
+syn keyword cssDimensionProp contained width
+
+" CSS Flexible Box Layout Module Level 1
+" http://www.w3.org/TR/css3-flexbox/
+" CSS Box Alignment Module Level 3
+" http://www.w3.org/TR/css-align-3/
+syn match cssFlexibleBoxProp contained "\<flex\(-\(direction\|wrap\|flow\|grow\|shrink\|basis\)\)\=\>"
+syn match cssFlexibleBoxProp contained "\<\(align\|justify\)\(-\(items\|self\|content\)\)\=\>"
+syn keyword cssFlexibleBoxProp contained order
+
+syn match cssFlexibleBoxAttr contained "\<\(row\|column\|wrap\)\(-reverse\)\=\>"
+syn keyword cssFlexibleBoxAttr contained nowrap stretch baseline center
+syn match cssFlexibleBoxAttr contained "\<flex\(-\(start\|end\)\)\=\>"
+syn match cssFlexibleBoxAttr contained "\<space\(-\(between\|around\)\)\=\>"
+
+" CSS Fonts Module Level 3
+" http://www.w3.org/TR/css-fonts-3/
+syn match cssFontProp contained "\<font\(-\(family\|\|feature-settings\|kerning\|language-override\|size\(-adjust\)\=\|stretch\|style\|synthesis\|variant\(-\(alternates\|caps\|east-asian\|ligatures\|numeric\|position\)\)\=\|weight\)\)\=\>"
+
+" font attributes
+syn keyword cssFontAttr contained icon menu caption
+syn match cssFontAttr contained "\<message-box\>"
+syn match cssFontAttr contained "\<status-bar\>"
+syn keyword cssFontAttr contained larger smaller
+syn match cssFontAttr contained "\<\(x\{1,2\}-\)\=\(large\|small\)\>"
+syn match cssFontAttr contained "\<small-\(caps\|caption\)\>"
+" font-family attributes
+syn match cssFontAttr contained "\<\(sans-\)\=serif\>"
+syn keyword cssFontAttr contained Antiqua Arial Black Book Charcoal Comic Courier Dingbats Gadget Geneva Georgia Grande Helvetica Impact Linotype Lucida MS Monaco Neue New Palatino Roboto Roman Symbol Tahoma Times Trebuchet Verdana Webdings Wingdings York Zapf
+syn keyword cssFontAttr contained cursive fantasy monospace
+" font-feature-settings attributes
+syn keyword cssFontAttr contained on off
+" font-stretch attributes
+syn match cssFontAttr contained "\<\(\(ultra\|extra\|semi\)-\)\=\(condensed\|expanded\)\>"
+" font-style attributes
+syn keyword cssFontAttr contained italic oblique
+" font-synthesis attributes
+syn keyword cssFontAttr contained weight style
+" font-weight attributes
+syn keyword cssFontAttr contained bold bolder lighter
+" TODO: font-variant-* attributes
+"------------------------------------------------
+
+" Webkit specific property/attributes
+syn match cssFontProp contained "\<font-smooth\>"
+syn match cssFontAttr contained "\<\(subpixel-\)\=\antialiased\>"
+
+
+" CSS Multi-column Layout Module
+" http://www.w3.org/TR/css3-multicol/
+syn match cssMultiColumnProp contained "\<break-\(after\|before\|inside\)\>"
+syn match cssMultiColumnProp contained "\<column-\(count\|fill\|gap\|rule\(-\(color\|style\|width\)\)\=\|span\|width\)\>"
+syn keyword cssMultiColumnProp contained columns
+syn keyword cssMultiColumnAttr contained balance medium
+syn keyword cssMultiColumnAttr contained always left right page column
+syn match cssMultiColumnAttr contained "\<avoid\(-\(page\|column\)\)\=\>"
+
+" http://www.w3.org/TR/css3-break/#page-break
+syn match cssMultiColumnProp contained "\<page\(-break-\(before\|after\|inside\)\)\=\>"
+
+" http://www.w3.org/TR/SVG11/interact.html
+syn match cssInteractProp contained "\<pointer-events\>"
+syn match cssInteractAttr contained "\<\(visible\)\=\(Painted\|Fill\|Stroke\)\=\>"
+
+" TODO find following items in w3c docs.
+syn keyword cssGeneratedContentProp contained quotes crop
+syn match cssGeneratedContentProp contained "\<counter-\(reset\|increment\)\>"
+syn match cssGeneratedContentProp contained "\<move-to\>"
+syn match cssGeneratedContentProp contained "\<page-policy\>"
+syn match cssGeneratedContentAttr contained "\<\(no-\)\=\(open\|close\)-quote\>"
+
+" https://www.w3.org/TR/css-grid-1/
+syn match cssGridProp contained "\<grid\>"
+syn match cssGridProp contained "\<grid-template\(-\(columns\|rows\|areas\)\)\=\>"
+syn match cssGridProp contained "\<grid-\(column\|row\)\(-\(start\|end\|gap\)\)\=\>"
+syn match cssGridProp contained "\<grid-\(area\|gap\)\>"
+syn match cssGridProp contained "\<grid-auto-\(flow\|rows\|columns\)\>"
+
+syn match cssHyerlinkProp contained "\<target\(-\(name\|new\|position\)\)\=\>"
+
+syn match cssListProp contained "\<list-style\(-\(type\|position\|image\)\)\=\>"
+syn match cssListAttr contained "\<\(lower\|upper\)-\(roman\|alpha\|greek\|latin\)\>"
+syn match cssListAttr contained "\<\(hiragana\|katakana\)\(-iroha\)\=\>"
+syn match cssListAttr contained "\<\(decimal\(-leading-zero\)\=\|cjk-ideographic\)\>"
+syn keyword cssListAttr contained disc circle square hebrew armenian georgian
+syn keyword cssListAttr contained inside outside
+
+syn keyword cssPositioningProp contained bottom clear clip display float left
+syn keyword cssPositioningProp contained position right top visibility
+syn match cssPositioningProp contained "\<z-index\>"
+syn keyword cssPositioningAttr contained block compact grid
+syn match cssPositioningAttr contained "\<table\(-\(row-group\|\(header\|footer\)-group\|row\|column\(-group\)\=\|cell\|caption\)\)\=\>"
+syn keyword cssPositioningAttr contained left right both
+syn match cssPositioningAttr contained "\<list-item\>"
+syn match cssPositioningAttr contained "\<inline\(-\(block\|box\|table\|grid\|flex\)\)\=\>"
+syn match cssPositioningAttr contained "\<flow\(-root\)\=\>"
+syn keyword cssPositioningAttr contained static relative absolute fixed subgrid
+
+syn keyword cssPrintAttr contained landscape portrait crop cross always
+
+syn match cssTableProp contained "\<\(caption-side\|table-layout\|border-collapse\|border-spacing\|empty-cells\)\>"
+syn keyword cssTableAttr contained fixed collapse separate show hide once always
+
+
+syn keyword cssTextProp contained color direction hyphens
+syn match cssTextProp "\<\(\(word\|letter\)-spacing\|text\(-\(decoration\|transform\|align\|index\|shadow\)\)\=\|vertical-align\|unicode-bidi\|line-height\)\>"
+syn match cssTextProp contained "\<text-\(justify\|outline\|warp\|align-last\|size-adjust\|rendering\|stroke\|indent\)\>"
+syn match cssTextProp contained "\<\(word\|line\)-break\|\(overflow\|word\)-wrap\>"
+syn match cssTextProp contained "\<white-space\>"
+syn match cssTextProp contained "\<hanging-punctuation\>"
+syn match cssTextProp contained "\<tab-size\>"
+syn match cssTextProp contained "\<punctuation-trim\>"
+syn match cssTextAttr contained "\<line-through\>"
+syn match cssTextAttr contained "\<\(text-\)\=\(top\|bottom\)\>"
+syn keyword cssTextAttr contained ltr rtl embed nowrap
+syn keyword cssTextAttr contained underline overline blink sub super middle
+syn keyword cssTextAttr contained capitalize uppercase lowercase
+syn keyword cssTextAttr contained justify baseline sub super
+syn keyword cssTextAttr contained optimizeLegibility optimizeSpeed geometricPrecision
+syn match cssTextAttr contained "\<pre\(-\(line\|wrap\)\)\=\>"
+syn match cssTextAttr contained "\<\(allow\|force\)-end\>"
+syn keyword cssTextAttr contained start end adjacent
+syn match cssTextAttr contained "\<inter-\(word\|ideographic\|cluster\)\>"
+syn keyword cssTextAttr contained distribute kashida first last
+syn keyword cssTextAttr contained clip ellipsis unrestricted suppress
+syn match cssTextAttr contained "\<break-all\>"
+syn match cssTextAttr contained "\<break-word\>"
+syn keyword cssTextAttr contained manual
+syn match cssTextAttr contained "\<bidi-override\>"
+
+syn match cssTransformProp contained "\<transform\(-\(origin\|style\)\)\=\>"
+syn match cssTransformProp contained "\<perspective\(-origin\)\=\>"
+syn match cssTransformProp contained "\<backface-visibility\>"
+
+" CSS Transitions
+" http://www.w3.org/TR/css3-transitions/
+syn match cssTransitionProp contained "\<transition\(-\(delay\|duration\|property\|timing-function\)\)\=\>"
+
+" transition-time-function attributes
+syn match cssTransitionAttr contained "\<linear\(-gradient\)\@!\>"
+syn match cssTransitionAttr contained "\<ease\(-\(in-out\|out\|in\)\)\=\>"
+syn match cssTransitionAttr contained "\<step\(-start\|-end\)\=\>"
+"------------------------------------------------
+" CSS Basic User Interface Module Level 3 (CSS3 UI)
+" http://www.w3.org/TR/css3-ui/
+syn match cssUIProp contained "\<box-sizing\>"
+syn match cssUIAttr contained "\<\(content\|padding\|border\)\(-box\)\=\>"
+
+syn keyword cssUIProp contained cursor
+syn match cssUIAttr contained "\<\(\([ns]\=[ew]\=\)\|col\|row\|nesw\|nwse\)-resize\>"
+syn keyword cssUIAttr contained crosshair help move pointer alias copy
+syn keyword cssUIAttr contained progress wait text cell move
+syn match cssUIAttr contained "\<context-menu\>"
+syn match cssUIAttr contained "\<no-drop\>"
+syn match cssUIAttr contained "\<not-allowed\>"
+syn match cssUIAttr contained "\<all-scroll\>"
+syn match cssUIAttr contained "\<\(vertical-\)\=text\>"
+syn match cssUIAttr contained "\<zoom\(-in\|-out\)\=\>"
+
+syn match cssUIProp contained "\<ime-mode\>"
+syn keyword cssUIAttr contained active inactive disabled
+
+syn match cssUIProp contained "\<nav-\(down\|index\|left\|right\|up\)\=\>"
+syn match cssUIProp contained "\<outline\(-\(width\|style\|color\|offset\)\)\=\>"
+syn keyword cssUIAttr contained invert
+
+syn keyword cssUIProp contained icon resize
+syn keyword cssUIAttr contained both horizontal vertical
+
+syn match cssUIProp contained "\<text-overflow\>"
+syn keyword cssUIAttr contained clip ellipsis
+
+syn match cssUIProp contained "\<image-rendering\>"
+syn keyword cssUIAttr contained pixellated
+syn match cssUIAttr contained "\<crisp-edges\>"
+
+"------------------------------------------------
+" Webkit/iOS specific attributes
+syn match cssUIAttr contained '\<preserve-3d\>'
+" IE specific attributes
+syn match cssIEUIAttr contained '\<bicubic\>'
+
+" Webkit/iOS specific properties
+syn match cssUIProp contained '\<tap-highlight-color\|user-select\|touch-callout\>'
+" IE specific properties
+syn match cssIEUIProp contained '\<interpolation-mode\|zoom\|filter\>'
+
+" Webkit/Firebox specific properties/attributes
+syn keyword cssUIProp contained appearance
+syn keyword cssUIAttr contained window button field icon document menu
+
+
+syn match cssAuralProp contained "\<\(pause\|cue\)\(-\(before\|after\)\)\=\>"
+syn match cssAuralProp contained "\<\(play-during\|speech-rate\|voice-family\|pitch\(-range\)\=\|speak\(-\(punctuation\|numeral\|header\)\)\=\)\>"
+syn keyword cssAuralProp contained volume during azimuth elevation stress richness
+syn match cssAuralAttr contained "\<\(x-\)\=\(soft\|loud\)\>"
+syn keyword cssAuralAttr contained silent
+syn match cssAuralAttr contained "\<spell-out\>"
+syn keyword cssAuralAttr contained non mix
+syn match cssAuralAttr contained "\<\(left\|right\)-side\>"
+syn match cssAuralAttr contained "\<\(far\|center\)-\(left\|center\|right\)\>"
+syn keyword cssAuralAttr contained leftwards rightwards behind
+syn keyword cssAuralAttr contained below level above lower higher
+syn match cssAuralAttr contained "\<\(x-\)\=\(slow\|fast\|low\|high\)\>"
+syn keyword cssAuralAttr contained faster slower
+syn keyword cssAuralAttr contained male female child code digits continuous
+
+" mobile text
+syn match cssMobileTextProp contained "\<text-size-adjust\>"
+
+syn keyword cssMediaProp contained width height orientation scan
+syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(\(device\)-\)\=aspect-ratio/
+syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-pixel-ratio/
+syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-\(height\|width\)/
+syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(height\|width\|resolution\|monochrome\|color\(-index\)\=\)/
+syn keyword cssMediaAttr contained portrait landscape progressive interlace
+syn match cssKeyFrameProp contained /\(\d\+\(\.\d\+\)\?%\|\(\<from\|to\>\)\)/ nextgroup=cssDefinition
+syn match cssPageMarginProp /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/ contained nextgroup=cssDefinition
+syn keyword cssPageProp contained content size
+syn keyword cssPageProp contained orphans widows
+syn keyword cssFontDescriptorProp contained src
+syn match cssFontDescriptorProp contained "\<unicode-range\>"
+" unicode-range attributes
+syn match cssFontDescriptorAttr contained "U+[0-9A-Fa-f?]\+"
+syn match cssFontDescriptorAttr contained "U+\x\+-\x\+"
+
+syn match cssBraces contained "[{}]"
+syn match cssError contained "{@<>"
+syn region cssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=cssTagName,cssAttributeSelector,cssClassName,cssIdentifier,cssAtRule,cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssCustomProp,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,cssNoise fold
+syn match cssBraceError "}"
+syn match cssAttrComma ","
+
+" Pseudo class
+" http://www.w3.org/TR/css3-selectors/
+syn match cssPseudoClass ":[A-Za-z0-9_-]*" contains=cssNoise,cssPseudoClassId,cssUnicodeEscape,cssVendor,cssPseudoClassFn
+syn keyword cssPseudoClassId contained link visited active hover before after left right
+syn keyword cssPseudoClassId contained root empty target enable disabled checked invalid
+syn match cssPseudoClassId contained "\<first-\(line\|letter\)\>"
+syn match cssPseudoClassId contained "\<\(first\|last\|only\)-\(of-type\|child\)\>"
+syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<\(not\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(" end=")" contains=cssStringQ,cssStringQQ
+" ------------------------------------
+" Vendor specific properties
+syn match cssPseudoClassId contained  "\<selection\>"
+syn match cssPseudoClassId contained  "\<focus\(-inner\)\=\>"
+syn match cssPseudoClassId contained  "\<\(input-\)\=placeholder\>"
+
+" Misc highlight groups
+syntax match cssUnitDecorators /\(#\|-\|+\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|ch\|rem\|vh\|vw\|vmin\|vmax\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)/ contained
+syntax match cssNoise contained /\(:\|;\|\/\)/
+
+" Comment
+syn region cssComment start="/\*" end="\*/" contains=@Spell fold
+
+syn match cssUnicodeEscape "\\\x\{1,6}\s\?"
+syn match cssSpecialCharQQ +\\\\\|\\"+ contained
+syn match cssSpecialCharQ +\\\\\|\\'+ contained
+syn region cssStringQQ start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=cssUnicodeEscape,cssSpecialCharQQ
+syn region cssStringQ start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=cssUnicodeEscape,cssSpecialCharQ
+
+" Vendor Prefix
+syn match cssVendor contained "-\(webkit\|moz\|o\|ms\)-"
+
+" Various CSS Hack characters
+" In earlier versions of IE (6 and 7), one can prefix property names
+" with a _ or * to isolate those definitions to particular versions of IE
+" This is purely decorative and therefore we assign to the same highlight
+" group to cssVendor, for more information:
+" http://www.paulirish.com/2009/browser-specific-css-hacks/
+syn match cssHacks contained /\(_\|*\)/
+
+" Attr Enhance
+" Some keywords are both Prop and Attr, so we have to handle them
+" cssPseudoClassId is hidden by cssAttrRegion, so we add it here. see #69
+syn region cssAttrRegion start=/:/ end=/\ze\(;\|)\|}\|{\)/ contained contains=cssPseudoClassId,css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise
+
+" Hack for transition
+" 'transition' has Props after ':'.
+syn region cssAttrRegion start=/transition\s*:/ end=/\ze\(;\|)\|}\)/ contained contains=css.*Prop,css.*Attr,cssColor,cssImportant,cssValue.*,cssFunction,cssString.*,cssURL,cssComment,cssUnicodeEscape,cssVendor,cssError,cssAttrComma,cssNoise
+
+syn match cssAtKeyword /@\(font-face\|media\|keyframes\|import\|charset\|namespace\|page\|supports\)/
+
+syn keyword cssAtRuleLogical only not and contained
+
+" @media
+" Reference: http://www.w3.org/TR/css3-mediaqueries/
+syn region cssAtRule start=/@media\>/ end=/\ze{/ skipwhite skipnl matchgroup=cssAtKeyword contains=cssMediaProp,cssValueLength,cssAtRuleLogical,cssValueInteger,cssMediaAttr,cssVendor,cssMediaType,cssComment,cssCustomProp,cssFunctionName nextgroup=cssDefinition
+syn keyword cssMediaType contained screen print aural braille embossed handheld projection tty tv speech all contained
+
+" @page
+" http://www.w3.org/TR/css3-page/
+syn region cssAtRule start=/@page\>/ end=/\ze{/ skipwhite skipnl matchgroup=cssAtKeyword contains=cssPagePseudo,cssComment nextgroup=cssDefinition
+syn match cssPagePseudo /:\(left\|right\|first\|blank\)/ contained skipwhite skipnl
+" @keyframe
+" http://www.w3.org/TR/css3-animations/#keyframes
+syn region cssAtRule start=/@\(-[a-z]\+-\)\=keyframes\>/ end=/\ze{/ skipwhite skipnl matchgroup=cssAtKeyword contains=cssVendor,cssComment nextgroup=cssDefinition
+
+syn region cssAtRule start=/@import\>/    end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssAtKeyword,cssURL,cssMediaProp,cssValueLength,cssAtRuleLogical,cssValueInteger,cssMediaAttr,cssMediaType
+syn region cssAtRule start=/@charset\>/   end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssAtKeyword
+syn region cssAtRule start=/@namespace\>/ end=/\ze;/ contains=cssStringQ,cssStringQQ,cssUnicodeEscape,cssComment,cssAtKeyword
+
+" @supports
+" https://www.w3.org/TR/css3-conditional/#at-supports
+syn region cssAtRule start=/@supports\>/ end=/\ze{/ skipwhite skipnl contains=cssAtRuleLogical,cssAttrRegion,css.*Prop,cssValue.*,cssVendor,cssAtKeyword,cssComment nextgroup=cssDefinition
+
+
+if main_syntax == "css"
+  syn sync minlines=10
+endif
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link cssComment Comment
+hi def link cssVendor Comment
+hi def link cssHacks Comment
+hi def link cssTagName Statement
+hi def link cssDeprecated Error
+hi def link cssSelectorOp Special
+hi def link cssSelectorOp2 Special
+hi def link cssAttrComma Special
+
+hi def link cssAnimationProp cssProp
+hi def link cssBackgroundProp cssProp
+hi def link cssBorderProp cssProp
+hi def link cssBoxProp cssProp
+hi def link cssCascadeProp cssProp
+hi def link cssColorProp cssProp
+hi def link cssContentForPagedMediaProp cssProp
+hi def link cssDimensionProp cssProp
+hi def link cssFlexibleBoxProp cssProp
+hi def link cssFontProp cssProp
+hi def link cssGeneratedContentProp cssProp
+hi def link cssGridProp cssProp
+hi def link cssHyerlinkProp cssProp
+hi def link cssInteractProp cssProp
+hi def link cssLineboxProp cssProp
+hi def link cssListProp cssProp
+hi def link cssMarqueeProp cssProp
+hi def link cssMultiColumnProp cssProp
+hi def link cssPagedMediaProp cssProp
+hi def link cssPositioningProp cssProp
+hi def link cssPrintProp cssProp
+hi def link cssRubyProp cssProp
+hi def link cssSpeechProp cssProp
+hi def link cssTableProp cssProp
+hi def link cssTextProp cssProp
+hi def link cssTransformProp cssProp
+hi def link cssTransitionProp cssProp
+hi def link cssUIProp cssProp
+hi def link cssIEUIProp cssProp
+hi def link cssAuralProp cssProp
+hi def link cssRenderProp cssProp
+hi def link cssMobileTextProp cssProp
+
+hi def link cssAnimationAttr cssAttr
+hi def link cssBackgroundAttr cssAttr
+hi def link cssBorderAttr cssAttr
+hi def link cssBoxAttr cssAttr
+hi def link cssContentForPagedMediaAttr cssAttr
+hi def link cssDimensionAttr cssAttr
+hi def link cssFlexibleBoxAttr cssAttr
+hi def link cssFontAttr cssAttr
+hi def link cssGeneratedContentAttr cssAttr
+hi def link cssGridAttr cssAttr
+hi def link cssHyerlinkAttr cssAttr
+hi def link cssInteractAttr cssAttr
+hi def link cssLineboxAttr cssAttr
+hi def link cssListAttr cssAttr
+hi def link cssMarginAttr cssAttr
+hi def link cssMarqueeAttr cssAttr
+hi def link cssMultiColumnAttr cssAttr
+hi def link cssPaddingAttr cssAttr
+hi def link cssPagedMediaAttr cssAttr
+hi def link cssPositioningAttr cssAttr
+hi def link cssGradientAttr cssAttr
+hi def link cssPrintAttr cssAttr
+hi def link cssRubyAttr cssAttr
+hi def link cssSpeechAttr cssAttr
+hi def link cssTableAttr cssAttr
+hi def link cssTextAttr cssAttr
+hi def link cssTransformAttr cssAttr
+hi def link cssTransitionAttr cssAttr
+hi def link cssUIAttr cssAttr
+hi def link cssIEUIAttr cssAttr
+hi def link cssAuralAttr cssAttr
+hi def link cssRenderAttr cssAttr
+hi def link cssCascadeAttr cssAttr
+hi def link cssCommonAttr cssAttr
+
+hi def link cssPseudoClassId PreProc
+hi def link cssPseudoClassLang Constant
+hi def link cssValueLength Number
+hi def link cssValueInteger Number
+hi def link cssValueNumber Number
+hi def link cssValueAngle Number
+hi def link cssValueTime Number
+hi def link cssValueFrequency Number
+hi def link cssFunction Constant
+hi def link cssURL String
+hi def link cssFunctionName Function
+hi def link cssFunctionComma Function
+hi def link cssColor Constant
+hi def link cssIdentifier Function
+hi def link cssAtRule Include
+hi def link cssAtKeyword PreProc
+hi def link cssImportant Special
+hi def link cssCustomProp Special
+hi def link cssBraces Function
+hi def link cssBraceError Error
+hi def link cssError Error
+hi def link cssUnicodeEscape Special
+hi def link cssStringQQ String
+hi def link cssStringQ String
+hi def link cssAttributeSelector String
+hi def link cssMediaType Special
+hi def link cssMediaComma Normal
+hi def link cssAtRuleLogical Statement
+hi def link cssMediaProp cssProp
+hi def link cssMediaAttr cssAttr
+hi def link cssPagePseudo PreProc
+hi def link cssPageMarginProp cssAtKeyword
+hi def link cssPageProp cssProp
+hi def link cssKeyFrameProp Constant
+hi def link cssFontDescriptor Special
+hi def link cssFontDescriptorProp cssProp
+hi def link cssFontDescriptorAttr cssAttr
+hi def link cssUnicodeRange Constant
+hi def link cssClassName Function
+hi def link cssClassNameDot Function
+hi def link cssProp StorageClass
+hi def link cssAttr Constant
+hi def link cssUnitDecorators Number
+hi def link cssNoise Noise
+
+let b:current_syntax = "css"
+
+if main_syntax == 'css'
+  unlet main_syntax
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+
+endif
diff --git a/syntax/cterm.vim b/syntax/cterm.vim
new file mode 100644
index 000000000..1fd031a1b
--- /dev/null
+++ b/syntax/cterm.vim
@@ -0,0 +1,181 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cterm') == -1
+
+" Vim syntax file
+" Language:	Century Term Command Script
+" Maintainer:	Sean M. McKee <mckee@misslink.net>
+" Last Change:	2002 Apr 13
+" Version Info: @(#)cterm.vim	1.7	97/12/15 09:23:14
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+"FUNCTIONS
+syn keyword ctermFunction	abort addcr addlf answer at attr batch baud
+syn keyword ctermFunction	break call capture cd cdelay charset cls color
+syn keyword ctermFunction	combase config commect copy cread
+syn keyword ctermFunction	creadint devprefix dialer dialog dimint
+syn keyword ctermFunction	dimlog dimstr display dtimeout dwait edit
+syn keyword ctermFunction	editor emulate erase escloop fcreate
+syn keyword ctermFunction	fflush fillchar flags flush fopen fread
+syn keyword ctermFunction	freadln fseek fwrite fwriteln get hangup
+syn keyword ctermFunction	help hiwait htime ignore init itime
+syn keyword ctermFunction	keyboard lchar ldelay learn lockfile
+syn keyword ctermFunction	locktime log login logout lowait
+syn keyword ctermFunction	lsend ltime memlist menu mkdir mode
+syn keyword ctermFunction	modem netdialog netport noerror pages parity
+syn keyword ctermFunction	pause portlist printer protocol quit rcv
+syn keyword ctermFunction	read readint readn redial release
+syn keyword ctermFunction	remote rename restart retries return
+syn keyword ctermFunction	rmdir rtime run runx scrollback send
+syn keyword ctermFunction	session set setcap setcolor setkey
+syn keyword ctermFunction	setsym setvar startserver status
+syn keyword ctermFunction	stime stopbits stopserver tdelay
+syn keyword ctermFunction	terminal time trans type usend version
+syn keyword ctermFunction	vi vidblink vidcard vidout vidunder wait
+syn keyword ctermFunction	wildsize wclose wopen wordlen wru wruchar
+syn keyword ctermFunction	xfer xmit xprot
+syn match ctermFunction		"?"
+"syn keyword ctermFunction	comment remark
+
+"END FUNCTIONS
+"INTEGER FUNCTIONS
+syn keyword ctermIntFunction	asc atod eval filedate filemode filesize ftell
+syn keyword ctermIntFunction	len termbits opsys pos sum time val mdmstat
+"END INTEGER FUNCTIONS
+
+"STRING FUNCTIONS
+syn keyword ctermStrFunction	cdate ctime chr chrdy chrin comin getenv
+syn keyword ctermStrFunction	gethomedir left midstr right str tolower
+syn keyword ctermStrFunction	toupper uniq comst exists feof hascolor
+
+"END STRING FUNCTIONS
+
+"PREDEFINED TERM VARIABLES R/W
+syn keyword ctermPreVarRW	f _escloop _filename _kermiteol _obufsiz
+syn keyword ctermPreVarRW	_port _rcvsync _cbaud _reval _turnchar
+syn keyword ctermPreVarRW	_txblksiz _txwindow _vmin _vtime _cparity
+syn keyword ctermPreVarRW	_cnumber false t true _cwordlen _cstopbits
+syn keyword ctermPreVarRW	_cmode _cemulate _cxprot _clogin _clogout
+syn keyword ctermPreVarRW	_cstartsrv _cstopsrv _ccmdfile _cwru
+syn keyword ctermPreVarRW	_cprotocol _captfile _cremark _combufsiz
+syn keyword ctermPreVarRW	logfile
+"END PREDEFINED TERM VARIABLES R/W
+
+"PREDEFINED TERM VARIABLES R/O
+syn keyword ctermPreVarRO	_1 _2 _3 _4 _5 _6 _7 _8 _9 _cursess
+syn keyword ctermPreVarRO	_lockfile _baud _errno _retval _sernum
+syn keyword ctermPreVarRO	_timeout _row _col _version
+"END PREDEFINED TERM VARIABLES R/O
+
+syn keyword ctermOperator not mod eq ne gt le lt ge xor and or shr not shl
+
+"SYMBOLS
+syn match   CtermSymbols	 "|"
+"syn keyword ctermOperators + - * / % = != > < >= <= & | ^ ! << >>
+"END SYMBOLS
+
+"STATEMENT
+syn keyword ctermStatement	off
+syn keyword ctermStatement	disk overwrite append spool none
+syn keyword ctermStatement	echo view wrap
+"END STATEMENT
+
+"TYPE
+"syn keyword ctermType
+"END TYPE
+
+"USERLIB FUNCTIONS
+"syn keyword ctermLibFunc
+"END USERLIB FUNCTIONS
+
+"LABEL
+syn keyword ctermLabel    case default
+"END LABEL
+
+"CONDITIONAL
+syn keyword ctermConditional on endon
+syn keyword ctermConditional proc endproc
+syn keyword ctermConditional for in do endfor
+syn keyword ctermConditional if else elseif endif iferror
+syn keyword ctermConditional switch endswitch
+syn keyword ctermConditional repeat until
+"END CONDITIONAL
+
+"REPEAT
+syn keyword ctermRepeat    while
+"END REPEAT
+
+" Function arguments (eg $1 $2 $3)
+syn match  ctermFuncArg	"\$[1-9]"
+
+syn keyword ctermTodo contained TODO
+
+syn match  ctermNumber		"\<\d\+\(u\=l\=\|lu\|f\)\>"
+"floating point number, with dot, optional exponent
+syn match  ctermNumber		"\<\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, starting with a dot, optional exponent
+syn match  ctermNumber		"\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+syn match  ctermNumber		"\<\d\+e[-+]\=\d\+[fl]\=\>"
+"hex number
+syn match  ctermNumber		"0x[0-9a-f]\+\(u\=l\=\|lu\)\>"
+
+syn match  ctermComment		"![^=].*$" contains=ctermTodo
+syn match  ctermComment		"!$"
+syn match  ctermComment		"\*.*$" contains=ctermTodo
+syn region  ctermComment	start="comment" end="$" contains=ctermTodo
+syn region  ctermComment	start="remark" end="$" contains=ctermTodo
+
+syn region ctermVar		start="\$("  end=")"
+
+" String and Character contstants
+" Highlight special characters (those which have a backslash) differently
+syn match   ctermSpecial		contained "\\\d\d\d\|\\."
+syn match   ctermSpecial		contained "\^."
+syn region  ctermString			start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=ctermSpecial,ctermVar,ctermSymbols
+syn match   ctermCharacter		"'[^\\]'"
+syn match   ctermSpecialCharacter	"'\\.'"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link ctermStatement		Statement
+hi def link ctermFunction		Statement
+hi def link ctermStrFunction	Statement
+hi def link ctermIntFunction	Statement
+hi def link ctermLabel		Statement
+hi def link ctermConditional	Statement
+hi def link ctermRepeat		Statement
+hi def link ctermLibFunc		UserDefFunc
+hi def link ctermType		Type
+hi def link ctermFuncArg		PreCondit
+
+hi def link ctermPreVarRO		PreCondit
+hi def link ctermPreVarRW		PreConditBold
+hi def link ctermVar		Type
+
+hi def link ctermComment		Comment
+
+hi def link ctermCharacter		SpecialChar
+hi def link ctermSpecial		Special
+hi def link ctermSpecialCharacter	SpecialChar
+hi def link ctermSymbols		Special
+hi def link ctermString		String
+hi def link ctermTodo		Todo
+hi def link ctermOperator		Statement
+hi def link ctermNumber		Number
+
+" redefine the colors
+"hi PreConditBold	term=bold ctermfg=1 cterm=bold guifg=Purple gui=bold
+"hi Special	term=bold ctermfg=6 guifg=SlateBlue gui=underline
+
+
+let b:current_syntax = "cterm"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/cuda.vim b/syntax/cuda.vim
new file mode 100644
index 000000000..50a7657a9
--- /dev/null
+++ b/syntax/cuda.vim
@@ -0,0 +1,69 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cuda') == -1
+
+" Vim syntax file
+" Language:	CUDA (NVIDIA Compute Unified Device Architecture)
+" Maintainer:	Timothy B. Terriberry <tterribe@users.sourceforge.net>
+" Last Change:	2018 Feb 06
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Read the C++ syntax to start with
+runtime! syntax/cpp.vim
+
+" CUDA extentions
+syn keyword cudaStorageClass	__device__ __global__ __host__
+syn keyword cudaStorageClass	__constant__ __shared__
+syn keyword cudaStorageClass	__inline__ __align__ __thread__
+"syn keyword cudaStorageClass	__import__ __export__ __location__
+syn keyword cudaStructure	template
+syn keyword cudaType		char1 char2 char3 char4
+syn keyword cudaType		uchar1 uchar2 uchar3 uchar4
+syn keyword cudaType		short1 short2 short3 short4
+syn keyword cudaType		ushort1 ushort2 ushort3 ushort4
+syn keyword cudaType		int1 int2 int3 int4
+syn keyword cudaType		uint1 uint2 uint3 uint4
+syn keyword cudaType		long1 long2 long3 long4
+syn keyword cudaType		ulong1 ulong2 ulong3 ulong4
+syn keyword cudaType		float1 float2 float3 float4
+syn keyword cudaType		ufloat1 ufloat2 ufloat3 ufloat4
+syn keyword cudaType		dim3 texture textureReference
+syn keyword cudaType		cudaError_t cudaDeviceProp cudaMemcpyKind
+syn keyword cudaType		cudaArray cudaChannelFormatKind
+syn keyword cudaType		cudaChannelFormatDesc cudaTextureAddressMode
+syn keyword cudaType		cudaTextureFilterMode cudaTextureReadMode
+syn keyword cudaVariable	gridDim blockIdx blockDim threadIdx
+syn keyword cudaConstant	__DEVICE_EMULATION__
+syn keyword cudaConstant	cudaSuccess
+" Many more errors are defined, but only these are listed in the maunal
+syn keyword cudaConstant	cudaErrorMemoryAllocation
+syn keyword cudaConstant	cudaErrorInvalidDevicePointer
+syn keyword cudaConstant	cudaErrorInvalidSymbol
+syn keyword cudaConstant	cudaErrorMixedDeviceExecution
+syn keyword cudaConstant	cudaMemcpyHostToHost
+syn keyword cudaConstant	cudaMemcpyHostToDevice
+syn keyword cudaConstant	cudaMemcpyDeviceToHost
+syn keyword cudaConstant	cudaMemcpyDeviceToDevice
+syn keyword cudaConstant	cudaReadModeElementType
+syn keyword cudaConstant	cudaReadModeNormalizedFloat
+syn keyword cudaConstant	cudaFilterModePoint
+syn keyword cudaConstant	cudaFilterModeLinear
+syn keyword cudaConstant	cudaAddressModeClamp
+syn keyword cudaConstant	cudaAddressModeWrap
+syn keyword cudaConstant	cudaChannelFormatKindSigned
+syn keyword cudaConstant	cudaChannelFormatKindUnsigned
+syn keyword cudaConstant	cudaChannelFormatKindFloat
+
+hi def link cudaStorageClass	StorageClass
+hi def link cudaStructure	Structure
+hi def link cudaType		Type
+hi def link cudaVariable	Identifier
+hi def link cudaConstant	Constant
+
+let b:current_syntax = "cuda"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/cupl.vim b/syntax/cupl.vim
new file mode 100644
index 000000000..609c50714
--- /dev/null
+++ b/syntax/cupl.vim
@@ -0,0 +1,128 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cupl') == -1
+
+" Vim syntax file
+" Language:	CUPL
+" Maintainer:	John Cook <johncook3@gmail.com>
+" Last Change:	2011 Dec 27
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" this language is oblivious to case.
+syn case ignore
+
+" A bunch of keywords
+syn keyword cuplHeader name partno date revision rev designer company nextgroup=cuplHeaderContents
+syn keyword cuplHeader assembly assy location device nextgroup=cuplHeaderContents
+
+syn keyword cuplTodo contained TODO XXX FIXME
+
+" cuplHeaderContents uses default highlighting except for numbers
+syn match cuplHeaderContents ".\+;"me=e-1 contains=cuplNumber contained
+
+" String contstants
+syn region cuplString start=+'+ end=+'+
+syn region cuplString start=+"+ end=+"+
+
+syn keyword cuplStatement append condition
+syn keyword cuplStatement default else
+syn keyword cuplStatement field fld format function fuse
+syn keyword cuplStatement group if jump loc
+syn keyword cuplStatement macro min node out
+syn keyword cuplStatement pin pinnode present table
+syn keyword cuplStatement sequence sequenced sequencejk sequencers sequencet
+
+syn keyword cuplFunction log2 log8 log16 log
+
+" Valid integer number formats (decimal, binary, octal, hex)
+syn match cuplNumber "\<[-+]\=[0-9]\+\>"
+syn match cuplNumber "'d'[0-9]\+\>"
+syn match cuplNumber "'b'[01x]\+\>"
+syn match cuplNumber "'o'[0-7x]\+\>"
+syn match cuplNumber "'h'[0-9a-fx]\+\>"
+
+" operators
+syn match cuplLogicalOperator "[!#&$]"
+syn match cuplArithmeticOperator "[-+*/%]"
+syn match cuplArithmeticOperator "\*\*"
+syn match cuplAssignmentOperator ":\=="
+syn match cuplEqualityOperator ":"
+syn match cuplTruthTableOperator "=>"
+
+" Signal extensions
+syn match cuplExtension "\.[as][pr]\>"
+syn match cuplExtension "\.oe\>"
+syn match cuplExtension "\.oemux\>"
+syn match cuplExtension "\.[dlsrjk]\>"
+syn match cuplExtension "\.ck\>"
+syn match cuplExtension "\.dq\>"
+syn match cuplExtension "\.ckmux\>"
+syn match cuplExtension "\.tec\>"
+syn match cuplExtension "\.cnt\>"
+
+syn match cuplRangeOperator "\.\." contained
+
+" match ranges like memadr:[0000..1FFF]
+" and highlight both the numbers and the .. operator
+syn match cuplNumberRange "\<\x\+\.\.\x\+\>" contains=cuplRangeOperator
+
+" match vectors of type [name3..0] (decimal numbers only)
+" but assign them no special highlighting except for the .. operator
+syn match cuplBitVector "\<\a\+\d\+\.\.\d\+\>" contains=cuplRangeOperator
+
+" other special characters
+syn match cuplSpecialChar "[\[\](){},;]"
+
+" directives
+" (define these after cuplOperator so $xxx overrides $)
+syn match cuplDirective "\$msg"
+syn match cuplDirective "\$macro"
+syn match cuplDirective "\$mend"
+syn match cuplDirective "\$repeat"
+syn match cuplDirective "\$repend"
+syn match cuplDirective "\$define"
+syn match cuplDirective "\$include"
+
+" multi-line comments
+syn region cuplComment start=+/\*+ end=+\*/+ contains=cuplNumber,cuplTodo
+
+syn sync minlines=1
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default highlighting.
+hi def link cuplHeader	cuplStatement
+hi def link cuplLogicalOperator	 cuplOperator
+hi def link cuplRangeOperator	 cuplOperator
+hi def link cuplArithmeticOperator cuplOperator
+hi def link cuplAssignmentOperator cuplOperator
+hi def link cuplEqualityOperator	 cuplOperator
+hi def link cuplTruthTableOperator cuplOperator
+hi def link cuplOperator	cuplStatement
+hi def link cuplFunction	cuplStatement
+hi def link cuplStatement Statement
+hi def link cuplNumberRange cuplNumber
+hi def link cuplNumber	  cuplString
+hi def link cuplString	String
+hi def link cuplComment	Comment
+hi def link cuplExtension   cuplSpecial
+hi def link cuplSpecialChar cuplSpecial
+hi def link cuplSpecial	Special
+hi def link cuplDirective PreProc
+hi def link cuplTodo	Todo
+
+
+let b:current_syntax = "cupl"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:ts=8
+
+endif
diff --git a/syntax/cuplsim.vim b/syntax/cuplsim.vim
new file mode 100644
index 000000000..fb1d4fc8e
--- /dev/null
+++ b/syntax/cuplsim.vim
@@ -0,0 +1,67 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cuplsim') == -1
+
+" Vim syntax file
+" Language:	CUPL simulation
+" Maintainer:	John Cook <john.cook@kla-tencor.com>
+" Last Change:	2001 Apr 25
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Read the CUPL syntax to start with
+runtime! syntax/cupl.vim
+unlet b:current_syntax
+
+" omit definition-specific stuff
+syn clear cuplStatement
+syn clear cuplFunction
+syn clear cuplLogicalOperator
+syn clear cuplArithmeticOperator
+syn clear cuplAssignmentOperator
+syn clear cuplEqualityOperator
+syn clear cuplTruthTableOperator
+syn clear cuplExtension
+
+" simulation order statement
+syn match  cuplsimOrder "order:" nextgroup=cuplsimOrderSpec skipempty
+syn region cuplsimOrderSpec start="." end=";"me=e-1 contains=cuplComment,cuplsimOrderFormat,cuplBitVector,cuplSpecialChar,cuplLogicalOperator,cuplCommaOperator contained
+
+" simulation base statement
+syn match   cuplsimBase "base:" nextgroup=cuplsimBaseSpec skipempty
+syn region  cuplsimBaseSpec start="." end=";"me=e-1 contains=cuplComment,cuplsimBaseType contained
+syn keyword cuplsimBaseType octal decimal hex contained
+
+" simulation vectors statement
+syn match cuplsimVectors "vectors:"
+
+" simulator format control
+syn match cuplsimOrderFormat "%\d\+\>" contained
+
+" simulator control
+syn match cuplsimStimulus "[10ckpx]\+"
+syn match cuplsimStimulus +'\(\x\|x\)\+'+
+syn match cuplsimOutput "[lhznx*]\+"
+syn match cuplsimOutput +"\x\+"+
+
+syn sync minlines=1
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" append to the highlighting links in cupl.vim
+" The default highlighting.
+hi def link cuplsimOrder		cuplStatement
+hi def link cuplsimBase		cuplStatement
+hi def link cuplsimBaseType	cuplStatement
+hi def link cuplsimVectors		cuplStatement
+hi def link cuplsimStimulus	cuplNumber
+hi def link cuplsimOutput		cuplNumber
+hi def link cuplsimOrderFormat	cuplNumber
+
+
+let b:current_syntax = "cuplsim"
+" vim:ts=8
+
+endif
diff --git a/syntax/cvs.vim b/syntax/cvs.vim
new file mode 100644
index 000000000..a83b74a58
--- /dev/null
+++ b/syntax/cvs.vim
@@ -0,0 +1,33 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cvs') == -1
+
+" Vim syntax file
+" Language:	CVS commit file
+" Maintainer:	Matt Dunford (zenmatic@gmail.com)
+" Last Change:	Sat Nov 24 23:25:11 CET 2001
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+syn region cvsLine start="^CVS: " end="$" contains=cvsFile,cvsCom,cvsFiles,cvsTag
+syn match cvsFile  contained " \t\(\(\S\+\) \)\+"
+syn match cvsTag   contained " Tag:"
+syn match cvsFiles contained "\(Added\|Modified\|Removed\) Files:"
+syn region cvsCom start="Committing in" end="$" contains=cvsDir contained extend keepend
+syn match cvsDir   contained "\S\+$"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link cvsLine		Comment
+hi def link cvsDir		cvsFile
+hi def link cvsFile		Constant
+hi def link cvsFiles		cvsCom
+hi def link cvsTag		cvsCom
+hi def link cvsCom		Statement
+
+
+let b:current_syntax = "cvs"
+
+endif
diff --git a/syntax/cvsrc.vim b/syntax/cvsrc.vim
new file mode 100644
index 000000000..ed12b5023
--- /dev/null
+++ b/syntax/cvsrc.vim
@@ -0,0 +1,43 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cvsrc') == -1
+
+" Vim syntax file
+" Language:             cvs(1) RC file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn region  cvsrcString   display oneline start=+"+ skip=+\\\\\|\\\\"+ end=+"+
+syn region  cvsrcString   display oneline start=+'+ skip=+\\\\\|\\\\'+ end=+'+
+
+syn match   cvsrcNumber   display '\<\d\+\>'
+
+syn match   cvsrcBegin    display '^' nextgroup=cvsrcCommand skipwhite
+
+syn region  cvsrcCommand  contained transparent matchgroup=cvsrcCommand
+                          \ start='add\|admin\|checkout\|commit\|cvs\|diff'
+                          \ start='export\|history\|import\|init\|log'
+                          \ start='rdiff\|release\|remove\|rtag\|status\|tag'
+                          \ start='update'
+                          \ end='$'
+                          \ contains=cvsrcOption,cvsrcString,cvsrcNumber
+                          \ keepend
+
+syn match   cvsrcOption   contained display '-\a\+'
+
+hi def link cvsrcString   String
+hi def link cvsrcNumber   Number
+hi def link cvsrcCommand  Keyword
+hi def link cvsrcOption   Identifier
+
+let b:current_syntax = "cvsrc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/cynpp.vim b/syntax/cynpp.vim
new file mode 100644
index 000000000..f64b0a694
--- /dev/null
+++ b/syntax/cynpp.vim
@@ -0,0 +1,54 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cynpp') == -1
+
+" Vim syntax file
+" Language:     Cyn++
+" Maintainer:   Phil Derrick <phild@forteds.com>
+" Last change:  2001 Sep 02
+"
+" Language Information
+"
+"		Cynpp (Cyn++) is a macro language to ease coding in Cynlib.
+"		Cynlib is a library of C++ classes to allow hardware
+"		modelling in C++. Combined with a simulation kernel,
+"		the compiled and linked executable forms a hardware
+"		simulation of the described design.
+"
+"		Cyn++ is designed to be HDL-like.
+"
+"		Further information can be found from www.forteds.com
+
+
+
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Read the Cynlib syntax to start with - this includes the C++ syntax
+runtime! syntax/cynlib.vim
+unlet b:current_syntax
+
+
+
+" Cyn++ extensions
+
+syn keyword     cynppMacro      Always EndAlways
+syn keyword     cynppMacro      Module EndModule
+syn keyword     cynppMacro      Initial EndInitial
+syn keyword     cynppMacro      Posedge Negedge Changed
+syn keyword     cynppMacro      At
+syn keyword     cynppMacro      Thread EndThread
+syn keyword     cynppMacro      Instantiate
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link cLabel		Label
+hi def link cynppMacro  Statement
+
+
+let b:current_syntax = "cynpp"
+
+endif
diff --git a/syntax/datascript.vim b/syntax/datascript.vim
new file mode 100644
index 000000000..b24aa9376
--- /dev/null
+++ b/syntax/datascript.vim
@@ -0,0 +1,106 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'datascript') == -1
+
+" Vim syntax file
+" Language:	DataScript
+" Maintainer:	Dominique Pelle <dominique.pelle@gmail.com>
+" Last Change:	2015 Jul 30
+"
+" DataScript is a formal language for modelling binary datatypes,
+" bitstreams or file formats. For more information, see:
+"
+" http://dstools.sourceforge.net/DataScriptLanguageOverview.html
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+syn keyword dsPackage      import package
+syn keyword dsType         bit bool string
+syn keyword dsType         int int8 int16 int32 int64
+syn keyword dsType         uint8 uint16 uint32 uint64
+syn keyword dsType         varint16 varint32 varint64
+syn keyword dsType         varuint16 varuint32 varuint64
+syn keyword dsType         leint16 leint32 leint64
+syn keyword dsType         leuint16 leuint32 leuint64
+syn keyword dsEndian       little big
+syn keyword dsAlign        align
+syn keyword dsLabel        case default
+syn keyword dsConditional  if condition
+syn keyword dsBoolean      true false
+syn keyword dsCompound     union choice on enum bitmask subtype explicit
+syn keyword dsKeyword      function return
+syn keyword dsOperator     sizeof bitsizeof lengthof is sum forall in
+syn keyword dsStorageClass const
+syn keyword dsTodo         contained TODO FIXME XXX
+syn keyword dsSql          sql sql_table sql_database sql_pragma sql_index
+syn keyword dsSql          sql_integer sql_metadata sql_key sql_virtual
+syn keyword dsSql          using reference_key foreign_key to
+
+" dsCommentGroup allows adding matches for special things in comments.
+syn cluster dsCommentGroup  contains=dsTodo
+
+syn match   dsOffset        display "^\s*[a-zA-Z_:\.][a-zA-Z0-9_:\.]*\s*:"
+
+syn match   dsNumber        display "\<\d\+\>"
+syn match   dsNumberHex     display "\<0[xX]\x\+\>"
+syn match   dsNumberBin     display "\<[01]\+[bB]\>" contains=dsBinaryB
+syn match   dsBinaryB       display contained "[bB]\>"
+syn match   dsOctal         display "\<0\o\+\>" contains=dsOctalZero
+syn match   dsOctalZero     display contained "\<0"
+
+syn match   dsOctalError    display "\<0\o*[89]\d*\>"
+
+syn match   dsCommentError      display "\*/"
+syn match   dsCommentStartError display "/\*"me=e-1 contained
+
+syn region   dsCommentL
+  \ start="//" skip="\\$" end="$" keepend
+  \ contains=@dsCommentGroup,@Spell
+syn region   dsComment
+  \ matchgroup=dsCommentStart start="/\*" end="\*/"
+  \ contains=@dsCommentGroup,dsCommentStartError,@Spell extend
+
+syn region  dsString
+  \ start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell
+
+syn sync ccomment dsComment
+
+" Define the default highlighting.
+hi def link dsType              Type
+hi def link dsEndian            StorageClass
+hi def link dsStorageClass      StorageClass
+hi def link dsAlign             Label
+hi def link dsLabel             Label
+hi def link dsOffset            Label
+hi def link dsSql               PreProc
+hi def link dsCompound          Structure
+hi def link dsConditional       Conditional
+hi def link dsBoolean           Boolean
+hi def link dsKeyword           Statement
+hi def link dsString            String
+hi def link dsNumber            Number
+hi def link dsNumberBin         Number
+hi def link dsBinaryB           Special
+hi def link dsOctal             Number
+hi def link dsOctalZero         Special
+hi def link dsOctalError        Error
+hi def link dsNumberHex         Number
+hi def link dsTodo              Todo
+hi def link dsOperator          Operator
+hi def link dsPackage           Include
+hi def link dsCommentError      Error
+hi def link dsCommentStartError Error
+hi def link dsCommentStart      dsComment
+hi def link dsCommentL          dsComment
+hi def link cCommentL           dsComment
+hi def link dsComment           Comment
+
+let b:current_syntax = "datascript"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/syntax/dcd.vim b/syntax/dcd.vim
new file mode 100644
index 000000000..4f26d0ba8
--- /dev/null
+++ b/syntax/dcd.vim
@@ -0,0 +1,55 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dcd') == -1
+
+" Vim syntax file
+" Language:	WildPackets EtherPeek Decoder (.dcd) file
+" Maintainer:	Christopher Shinn <christopher@lucent.com>
+" Last Change:	2003 Apr 25
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Keywords
+syn keyword dcdFunction		DCod TRTS TNXT CRLF
+syn match   dcdFunction		display "\(STR\)\#"
+syn keyword dcdLabel		LABL
+syn region  dcdLabel		start="[A-Z]" end=";"
+syn keyword dcdConditional	CEQU CNEQ CGTE CLTE CBIT CLSE
+syn keyword dcdConditional	LSTS LSTE LSTZ
+syn keyword dcdConditional	TYPE TTST TEQU TNEQ TGTE TLTE TBIT TLSE TSUB SKIP
+syn keyword dcdConditional	MARK WHOA
+syn keyword dcdConditional	SEQU SNEQ SGTE SLTE SBIT
+syn match   dcdConditional	display "\(CST\)\#" "\(TST\)\#"
+syn keyword dcdDisplay		HBIT DBIT BBIT
+syn keyword dcdDisplay		HBYT DBYT BBYT
+syn keyword dcdDisplay		HWRD DWRD BWRD
+syn keyword dcdDisplay		HLNG DLNG BLNG
+syn keyword dcdDisplay		D64B
+syn match   dcdDisplay		display "\(HEX\)\#" "\(CHR\)\#" "\(EBC\)\#"
+syn keyword dcdDisplay		HGLB DGLB BGLB
+syn keyword dcdDisplay		DUMP
+syn keyword dcdStatement	IPLG IPV6 ATLG AT03 AT01 ETHR TRNG PRTO PORT
+syn keyword dcdStatement	TIME OSTP PSTR CSTR NBNM DMPE FTPL CKSM FCSC
+syn keyword dcdStatement	GBIT GBYT GWRD GLNG
+syn keyword dcdStatement	MOVE ANDG ORRG NOTG ADDG SUBG MULG DIVG MODG INCR DECR
+syn keyword dcdSpecial		PRV1 PRV2 PRV3 PRV4 PRV5 PRV6 PRV7 PRV8
+
+" Comment
+syn region  dcdComment		start="\*" end="\;"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link dcdFunction		Identifier
+hi def link dcdLabel		Constant
+hi def link dcdConditional		Conditional
+hi def link dcdDisplay		Type
+hi def link dcdStatement		Statement
+hi def link dcdSpecial		Special
+hi def link dcdComment		Comment
+
+
+let b:current_syntax = "dcd"
+
+endif
diff --git a/syntax/debchangelog.vim b/syntax/debchangelog.vim
new file mode 100644
index 000000000..f36398bef
--- /dev/null
+++ b/syntax/debchangelog.vim
@@ -0,0 +1,80 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debchangelog') == -1
+
+" Vim syntax file
+" Language:    Debian changelog files
+" Maintainer:  Debian Vim Maintainers
+" Former Maintainers: Gerfried Fuchs <alfie@ist.org>
+"                     Wichert Akkerman <wakkerma@debian.org>
+" Last Change: 2020 Apr 27
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim
+
+" Standard syntax initialization
+if exists('b:current_syntax')
+  finish
+endif
+
+" Case doesn't matter for us
+syn case ignore
+
+let s:urgency='urgency=\(low\|medium\|high\|emergency\|critical\)\( [^[:space:],][^,]*\)\='
+let s:binNMU='binary-only=yes'
+
+let s:cpo = &cpo
+set cpo-=C
+let s:supported = [
+      \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
+      \ 'wheezy', 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
+      \ 'sid', 'rc-buggy',
+      \
+      \ 'trusty', 'xenial', 'bionic', 'eoan', 'focal', 'groovy', 'devel'
+      \ ]
+let s:unsupported = [
+      \ 'frozen', 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
+      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze',
+      \
+      \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
+      \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
+      \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
+      \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
+      \ 'disco'
+      \ ]
+let &cpo=s:cpo
+
+" Define some common expressions we can use later on
+syn match debchangelogName	contained "^[[:alnum:]][[:alnum:].+-]\+ "
+exe 'syn match debchangelogFirstKV	contained "; \('.s:urgency.'\|'.s:binNMU.'\)"'
+exe 'syn match debchangelogOtherKV	contained ", \('.s:urgency.'\|'.s:binNMU.'\)"'
+exe 'syn match debchangelogTarget	contained "\%( \%('.join(s:supported, '\|').'\)\>[-[:alnum:]]*\)\+"'
+exe 'syn match debchangelogUnsupportedTarget	contained "\%( \%('.join(s:unsupported, '\|').'\)\>[-[:alnum:]]*\)\+"'
+syn match debchangelogUnreleased	contained / UNRELEASED/
+syn match debchangelogVersion	contained "(.\{-})"
+syn match debchangelogCloses	contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
+syn match debchangelogLP	contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
+syn match debchangelogEmail	contained "[_=[:alnum:].+-]\+@[[:alnum:]./\-]\+"
+syn match debchangelogEmail	contained "<.\{-}>"
+
+" Define the entries that make up the changelog
+syn region debchangelogHeader start="^[^ ]" end="$" contains=debchangelogName,debchangelogFirstKV,debchangelogOtherKV,debchangelogTarget,debchangelogUnsupportedTarget,debchangelogUnreleased,debchangelogVersion,debchangelogBinNMU oneline
+syn region debchangelogFooter start="^ [^ ]" end="$" contains=debchangelogEmail oneline
+syn region debchangelogEntry start="^  " end="$" contains=debchangelogCloses,debchangelogLP oneline
+
+" Associate our matches and regions with pretty colours
+hi def link debchangelogHeader  Error
+hi def link debchangelogFooter  Identifier
+hi def link debchangelogEntry   Normal
+hi def link debchangelogCloses  Statement
+hi def link debchangelogLP      Statement
+hi def link debchangelogFirstKV Identifier
+hi def link debchangelogOtherKV Identifier
+hi def link debchangelogName    Comment
+hi def link debchangelogVersion Identifier
+hi def link debchangelogTarget  Identifier
+hi def link debchangelogUnsupportedTarget  Identifier
+hi def link debchangelogUnreleased WarningMsg
+hi def link debchangelogEmail   Special
+
+let b:current_syntax = 'debchangelog'
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/debcontrol.vim b/syntax/debcontrol.vim
new file mode 100644
index 000000000..74ea764d2
--- /dev/null
+++ b/syntax/debcontrol.vim
@@ -0,0 +1,147 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debcontrol') == -1
+
+" Vim syntax file
+" Language:    Debian control files
+" Maintainer:  Debian Vim Maintainers
+" Former Maintainers: Gerfried Fuchs <alfie@ist.org>
+"                     Wichert Akkerman <wakkerma@debian.org>
+" Last Change: 2018 Aug 11
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcontrol.vim
+
+" Standard syntax initialization
+if exists('b:current_syntax')
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Should match case except for the keys of each field
+syn case match
+
+syn iskeyword @,48-57,-,/
+
+" Everything that is not explicitly matched by the rules below
+syn match debcontrolElse "^.*$"
+
+" Common seperators
+syn match debControlComma ",[ \t]*"
+syn match debControlSpace "[ \t]"
+
+let s:kernels = ['linux', 'hurd', 'kfreebsd', 'knetbsd', 'kopensolaris', 'netbsd']
+let s:archs = [
+      \ 'alpha', 'amd64', 'armeb', 'armel', 'armhf', 'arm64', 'avr32', 'hppa'
+      \, 'i386', 'ia64', 'lpia', 'm32r', 'm68k', 'mipsel', 'mips64el', 'mips'
+      \, 'powerpcspe', 'powerpc', 'ppc64el', 'ppc64', 'riscv64', 's390x', 's390', 'sh3eb'
+      \, 'sh3', 'sh4eb', 'sh4', 'sh', 'sparc64', 'sparc', 'x32'
+      \ ]
+let s:pairs = [
+      \ 'hurd-i386', 'kfreebsd-i386', 'kfreebsd-amd64', 'knetbsd-i386'
+      \, 'kopensolaris-i386', 'netbsd-alpha', 'netbsd-i386'
+      \ ]
+
+" Define some common expressions we can use later on
+syn keyword debcontrolArchitecture contained all any
+exe 'syn keyword debcontrolArchitecture contained '. join(map(copy(s:kernels), {k,v -> v .'-any'}))
+exe 'syn keyword debcontrolArchitecture contained '. join(map(copy(s:archs), {k,v -> 'any-'.v}))
+exe 'syn keyword debcontrolArchitecture contained '. join(s:archs)
+exe 'syn keyword debcontrolArchitecture contained '. join(s:pairs)
+
+unlet s:kernels s:archs s:pairs
+
+let s:sections = [
+      \ 'admin', 'cli-mono', 'comm', 'database', 'debian-installer', 'debug'
+      \, 'devel', 'doc', 'editors', 'education', 'electronics', 'embedded'
+      \, 'fonts', 'games', 'gnome', 'gnustep', 'gnu-r', 'golang', 'graphics'
+      \, 'hamradio', 'haskell', 'httpd', 'interpreters', 'introspection'
+      \, 'java\%(script\)\=', 'kde', 'kernel', 'libs', 'libdevel', 'lisp'
+      \, 'localization', 'mail', 'math', 'metapackages', 'misc', 'net'
+      \, 'news', 'ocaml', 'oldlibs', 'otherosfs', 'perl', 'php', 'python'
+      \, 'ruby', 'rust', 'science', 'shells', 'sound', 'text', 'tex'
+      \, 'utils', 'vcs', 'video', 'web', 'x11', 'xfce', 'zope'
+      \ ]
+
+syn keyword debcontrolMultiArch contained no foreign allowed same
+syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
+syn keyword debcontrolPriority contained extra important optional required standard
+exe 'syn match debcontrolSection contained "\%(\%(contrib\|non-free\|non-US/main\|non-US/contrib\|non-US/non-free\|restricted\|universe\|multiverse\)/\)\=\%('.join(s:sections, '\|').'\)"'
+syn keyword debcontrolPackageType contained udeb deb
+syn match debcontrolVariable contained "\${.\{-}}"
+syn keyword debcontrolDmUpload contained yes
+syn keyword debcontrolYesNo contained yes no
+syn match debcontrolR3 contained "\<\%(no\|binary-targets\|[[:graph:]]\+/[[:graph:]]\+\%( \+[[:graph:]]\+/[[:graph:]]\+\)*\)\>"
+
+unlet s:sections
+
+" A URL (using the domain name definitions from RFC 1034 and 1738), right now
+" only enforce protocol and some sanity on the server/path part;
+syn match debcontrolHTTPUrl contained "\vhttps?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
+syn match debcontrolVcsSvn contained "\vsvn%(\+ssh)?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
+syn match debcontrolVcsCvs contained "\v%(\-d *)?:pserver:[^@]+\@[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?:/[^[:space:]]*%( [^[:space:]]+)?$"
+syn match debcontrolVcsGit contained "\v%(git|https?)://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?%(\s+-b\s+[^ ~^:?*[\\]+)?$"
+
+" An email address
+syn match	debcontrolEmail	"[_=[:alnum:]\.+-]\+@[[:alnum:]\./\-]\+"
+syn match	debcontrolEmail	"<.\{-}>"
+
+" #-Comments
+syn match debcontrolComment "^#.*$" contains=@Spell
+
+syn case ignore
+
+" Handle all fields from deb-src-control(5)
+
+" Fields for which we do strict syntax checking
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^Architecture: *" end="$" contains=debcontrolArchitecture,debcontrolSpace oneline
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^Multi-Arch: *" end="$" contains=debcontrolMultiArch oneline
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(Package\|Source\): *" end="$" contains=debcontrolName oneline
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^Priority: *" end="$" contains=debcontrolPriority oneline
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^Section: *" end="$" contains=debcontrolSection oneline
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XC-\)\=Package-Type: *" end="$" contains=debcontrolPackageType oneline
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^Homepage: *" end="$" contains=debcontrolHTTPUrl oneline keepend
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XS-\)\=Vcs-\%(Browser\|Arch\|Bzr\|Darcs\|Hg\): *" end="$" contains=debcontrolHTTPUrl oneline keepend
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XS-\)\=Vcs-Svn: *" end="$" contains=debcontrolVcsSvn,debcontrolHTTPUrl oneline keepend
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XS-\)\=Vcs-Cvs: *" end="$" contains=debcontrolVcsCvs oneline keepend
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XS-\)\=Vcs-Git: *" end="$" contains=debcontrolVcsGit oneline keepend
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^Rules-Requires-Root: *" end="$" contains=debcontrolR3 oneline
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(Build-\)\=Essential: *" end="$" contains=debcontrolYesNo oneline
+
+syn region debcontrolStrictField matchgroup=debcontrolDeprecatedKey start="^\%(XS-\)\=DM-Upload-Allowed: *" end="$" contains=debcontrolDmUpload oneline
+
+" Catch-all for the other legal fields
+syn region debcontrolField matchgroup=debcontrolKey start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\|\%(XS-\)\=Testsuite\%(-Triggers\)\=\|Build-Profiles\|Tag\|Subarchitecture\|Kernel-Version\|Installer-Menu-Item\): " end="$" contains=debcontrolVariable,debcontrolEmail oneline
+syn region debcontrolMultiField matchgroup=debcontrolKey start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Breaks\|Enhances\|Replaces\|Conflicts\|Provides\|Built-Using\|Uploaders\|X[SBC]\{0,3\}\%(Private-\)\=-[-a-zA-Z0-9]\+\): *" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolEmail,debcontrolVariable,debcontrolComment
+syn region debcontrolMultiFieldSpell matchgroup=debcontrolKey start="^Description: *" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolEmail,debcontrolVariable,debcontrolComment,@Spell
+
+" Associate our matches and regions with pretty colours
+hi def link debcontrolKey           Keyword
+hi def link debcontrolField         Normal
+hi def link debcontrolStrictField   Error
+hi def link debcontrolDeprecatedKey Error
+hi def link debcontrolMultiField    Normal
+hi def link debcontrolArchitecture  Normal
+hi def link debcontrolMultiArch     Normal
+hi def link debcontrolName          Normal
+hi def link debcontrolPriority      Normal
+hi def link debcontrolSection       Normal
+hi def link debcontrolPackageType   Normal
+hi def link debcontrolVariable      Identifier
+hi def link debcontrolEmail         Identifier
+hi def link debcontrolVcsSvn        Identifier
+hi def link debcontrolVcsCvs        Identifier
+hi def link debcontrolVcsGit        Identifier
+hi def link debcontrolHTTPUrl       Identifier
+hi def link debcontrolDmUpload      Identifier
+hi def link debcontrolYesNo         Identifier
+hi def link debcontrolR3            Identifier
+hi def link debcontrolComment       Comment
+hi def link debcontrolElse          Special
+
+let b:current_syntax = 'debcontrol'
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/debcopyright.vim b/syntax/debcopyright.vim
new file mode 100644
index 000000000..2f985b1bb
--- /dev/null
+++ b/syntax/debcopyright.vim
@@ -0,0 +1,37 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debcopyright') == -1
+
+" Vim syntax file
+" Language:    Debian copyright file
+" Maintainer:  Debian Vim Maintainers
+" Last Change: 2019 Sep 07
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcopyright.vim
+
+" Standard syntax initialization
+if exists('b:current_syntax')
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case match
+
+syn match debcopyrightUrl       "\vhttps?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
+syn match debcopyrightKey       "^\%(Format\|Upstream-Name\|Upstream-Contact\|Disclaimer\|Source\|Comment\|Files\|Copyright\|License\|Files-Excluded\%(-[-a-zA-Z0-9]\+\)\=\): *"
+syn match debcopyrightEmail     "[_=[:alnum:]\.+-]\+@[[:alnum:]\./\-]\+"
+syn match debcopyrightEmail     "<.\{-}>"
+syn match debcopyrightComment   "^#.*$" contains=@Spell
+
+hi def link debcopyrightUrl     Identifier
+hi def link debcopyrightKey     Keyword
+hi def link debcopyrightEmail   Identifier
+hi def link debcopyrightComment Comment
+
+let b:current_syntax = 'debcopyright'
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/debsources.vim b/syntax/debsources.vim
new file mode 100644
index 000000000..ec39b8b3c
--- /dev/null
+++ b/syntax/debsources.vim
@@ -0,0 +1,60 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debsources') == -1
+
+" Vim syntax file
+" Language:     Debian sources.list
+" Maintainer:   Debian Vim Maintainers
+" Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
+" Last Change: 2020 Apr 27
+" URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim
+
+" Standard syntax initialization
+if exists('b:current_syntax')
+  finish
+endif
+
+" case sensitive
+syn case match
+
+" A bunch of useful keywords
+syn match debsourcesKeyword        /\(deb-src\|deb\|main\|contrib\|non-free\|restricted\|universe\|multiverse\)/
+
+" Match comments
+syn match debsourcesComment        /#.*/  contains=@Spell
+
+let s:cpo = &cpo
+set cpo-=C
+let s:supported = [
+      \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
+      \ 'wheezy', 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
+      \ 'sid', 'rc-buggy',
+      \
+      \ 'trusty', 'xenial', 'bionic', 'eoan', 'focal', 'groovy', 'devel'
+      \ ]
+let s:unsupported = [
+      \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
+      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze',
+      \
+      \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
+      \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
+      \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
+      \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
+      \ 'disco'
+      \ ]
+let &cpo=s:cpo
+
+" Match uri's
+syn match debsourcesUri            '\(https\?://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' 	<>"]\+'
+exe 'syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\<\('. join(s:supported, '\|'). '\)\>\([-[:alnum:]_./]*\)+'
+exe 'syn match debsourcesUnsupportedDistrKeyword +\([[:alnum:]_./]*\)\<\('. join(s:unsupported, '\|') .'\)\>\([-[:alnum:]_./]*\)+'
+
+" Associate our matches and regions with pretty colours
+hi def link debsourcesLine                    Error
+hi def link debsourcesKeyword                 Statement
+hi def link debsourcesDistrKeyword            Type
+hi def link debsourcesUnsupportedDistrKeyword WarningMsg
+hi def link debsourcesComment                 Comment
+hi def link debsourcesUri                     Constant
+
+let b:current_syntax = 'debsources'
+
+endif
diff --git a/syntax/def.vim b/syntax/def.vim
new file mode 100644
index 000000000..413c4f3d8
--- /dev/null
+++ b/syntax/def.vim
@@ -0,0 +1,48 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'def') == -1
+
+" Vim syntax file
+" Language:	Microsoft Module-Definition (.def) File
+" Orig Author:	Rob Brady <robb@datatone.com>
+" Maintainer:	Wu Yongwei <wuyongwei@gmail.com>
+" Last Change:	$Date: 2007/10/02 13:51:24 $
+" $Revision: 1.2 $
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+syn match defComment	";.*"
+
+syn keyword defKeyword	LIBRARY STUB EXETYPE DESCRIPTION CODE WINDOWS DOS
+syn keyword defKeyword	RESIDENTNAME PRIVATE EXPORTS IMPORTS SEGMENTS
+syn keyword defKeyword	HEAPSIZE DATA
+syn keyword defStorage	LOADONCALL MOVEABLE DISCARDABLE SINGLE
+syn keyword defStorage	FIXED PRELOAD
+
+syn match   defOrdinal	"\s\+@\d\+"
+
+syn region  defString	start=+'+ end=+'+
+
+syn match   defNumber	"\d+"
+syn match   defNumber	"0x\x\+"
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link defComment	Comment
+hi def link defKeyword	Keyword
+hi def link defStorage	StorageClass
+hi def link defString	String
+hi def link defNumber	Number
+hi def link defOrdinal	Operator
+
+
+let b:current_syntax = "def"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/denyhosts.vim b/syntax/denyhosts.vim
new file mode 100644
index 000000000..b1e47785c
--- /dev/null
+++ b/syntax/denyhosts.vim
@@ -0,0 +1,293 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'denyhosts') == -1
+
+" Vim syntax file
+" Language:             denyhosts configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-06-25
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword denyhostsTodo
+      \ contained
+      \ TODO
+      \ FIXME
+      \ XXX
+      \ NOTE
+
+syn case ignore
+
+syn match   denyhostsComment
+      \ contained
+      \ display
+      \ '#.*'
+      \ contains=denyhostsTodo,
+      \          @Spell
+
+syn match   denyhostsBegin
+      \ display
+      \ '^'
+      \ nextgroup=@denyhostsSetting,
+      \           denyhostsComment
+      \ skipwhite
+
+syn cluster denyhostsSetting
+      \ contains=denyhostsStringSetting,
+      \          denyhostsBooleanSetting,
+      \          denyhostsPathSetting,
+      \          denyhostsNumericSetting,
+      \          denyhostsTimespecSetting,
+      \          denyhostsFormatSetting,
+      \          denyhostsRegexSetting
+
+syn keyword denyhostsStringSetting
+      \ contained
+      \ ADMIN_EMAIL
+      \ SMTP_HOST
+      \ SMTP_USERNAME
+      \ SMTP_PASSWORD
+      \ SMTP_FROM
+      \ SMTP_SUBJECT
+      \ BLOCK_SERVICE
+      \ nextgroup=denyhostsStringDelimiter
+      \ skipwhite
+
+syn keyword denyhostsBooleanSetting
+      \ contained
+      \ SUSPICIOUS_LOGIN_REPORT_ALLOWED_HOSTS
+      \ HOSTNAME_LOOKUP
+      \ SYSLOG_REPORT
+      \ RESET_ON_SUCCESS
+      \ SYNC_UPLOAD
+      \ SYNC_DOWNLOAD
+      \ ALLOWED_HOSTS_HOSTNAME_LOOKUP
+      \ nextgroup=denyhostsBooleanDelimiter
+      \ skipwhite
+
+syn keyword denyhostsPathSetting
+      \ contained
+      \ DAEMON_LOG
+      \ PLUGIN_DENY
+      \ PLUGIN_PURGE
+      \ SECURE_LOG
+      \ LOCK_FILE
+      \ HOSTS_DENY
+      \ WORK_DIR
+      \ nextgroup=denyhostsPathDelimiter
+      \ skipwhite
+
+syn keyword denyhostsNumericSetting
+      \ contained
+      \ SYNC_DOWNLOAD_THRESHOLD
+      \ SMTP_PORT
+      \ PURGE_THRESHOLD
+      \ DENY_THRESHOLD_INVALID
+      \ DENY_THRESHOLD_VALID
+      \ DENY_THRESHOLD_ROOT
+      \ DENY_THRESHOLD_RESTRICTED
+      \ nextgroup=denyhostsNumericDelimiter
+      \ skipwhite
+
+syn keyword denyhostsTimespecSetting
+      \ contained
+      \ DAEMON_SLEEP
+      \ DAEMON_PURGE
+      \ AGE_RESET_INVALID
+      \ AGE_RESET_VALID
+      \ AGE_RESET_ROOT
+      \ AGE_RESET_RESTRICTED
+      \ SYNC_INTERVAL
+      \ SYNC_DOWNLOAD_RESILIENCY
+      \ PURGE_DENY
+      \ nextgroup=denyhostsTimespecDelimiter
+      \ skipwhite
+
+syn keyword denyhostsFormatSetting
+      \ contained
+      \ DAEMON_LOG_TIME_FORMAT
+      \ DAEMON_LOG_MESSAGE_FORMAT
+      \ SMTP_DATE_FORMAT
+      \ nextgroup=denyhostsFormatDelimiter
+      \ skipwhite
+
+syn keyword denyhostsRegexSetting
+      \ contained
+      \ SSHD_FORMAT_REGEX
+      \ FAILED_ENTRY_REGEX
+      \ FAILED_ENTRY_REGEX2
+      \ FAILED_ENTRY_REGEX3
+      \ FAILED_ENTRY_REGEX4
+      \ FAILED_ENTRY_REGEX5
+      \ FAILED_ENTRY_REGEX6
+      \ FAILED_ENTRY_REGEX7
+      \ USERDEF_FAILED_ENTRY_REGEX
+      \ SUCCESSFUL_ENTRY_REGEX
+      \ nextgroup=denyhostsRegexDelimiter
+      \ skipwhite
+
+syn keyword denyhostURLSetting
+      \ contained
+      \ SYNC_SERVER
+      \ nextgroup=denyhostsURLDelimiter
+      \ skipwhite
+
+syn match   denyhostsStringDelimiter
+      \ contained
+      \ display
+      \ '[:=]'
+      \ nextgroup=denyhostsString
+      \ skipwhite
+
+syn match   denyhostsBooleanDelimiter
+      \ contained
+      \ display
+      \ '[:=]'
+      \ nextgroup=@denyhostsBoolean
+      \ skipwhite
+
+syn match   denyhostsPathDelimiter
+      \ contained
+      \ display
+      \ '[:=]'
+      \ nextgroup=denyhostsPath
+      \ skipwhite
+
+syn match   denyhostsNumericDelimiter
+      \ contained
+      \ display
+      \ '[:=]'
+      \ nextgroup=denyhostsNumber
+      \ skipwhite
+
+syn match   denyhostsTimespecDelimiter
+      \ contained
+      \ display
+      \ '[:=]'
+      \ nextgroup=denyhostsTimespec
+      \ skipwhite
+
+syn match   denyhostsFormatDelimiter
+      \ contained
+      \ display
+      \ '[:=]'
+      \ nextgroup=denyhostsFormat
+      \ skipwhite
+
+syn match   denyhostsRegexDelimiter
+      \ contained
+      \ display
+      \ '[:=]'
+      \ nextgroup=denyhostsRegex
+      \ skipwhite
+
+syn match   denyhostsURLDelimiter
+      \ contained
+      \ display
+      \ '[:=]'
+      \ nextgroup=denyhostsURL
+      \ skipwhite
+
+syn match   denyhostsString
+      \ contained
+      \ display
+      \ '.\+'
+
+syn cluster denyhostsBoolean
+      \ contains=denyhostsBooleanTrue,
+      \          denyhostsBooleanFalse
+
+syn match   denyhostsBooleanFalse
+      \ contained
+      \ display
+      \ '.\+'
+
+syn match   denyhostsBooleanTrue
+      \ contained
+      \ display
+      \ '\s*\%(1\|t\%(rue\)\=\|y\%(es\)\=\)\>\s*$'
+
+syn match   denyhostsPath
+      \ contained
+      \ display
+      \ '.\+'
+
+syn match   denyhostsNumber
+      \ contained
+      \ display
+      \ '\d\+\>'
+
+syn match   denyhostsTimespec
+      \ contained
+      \ display
+      \ '\d\+[mhdwy]\>'
+
+syn match   denyhostsFormat
+      \ contained
+      \ display
+      \ '.\+'
+      \ contains=denyhostsFormattingExpandos
+
+syn match   denyhostsFormattingExpandos
+      \ contained
+      \ display
+      \ '%.'
+
+syn match   denyhostsRegex
+      \ contained
+      \ display
+      \ '.\+'
+
+" TODO: Perhaps come up with a better regex here?  There should really be a
+" library for these kinds of generic regexes, that is, URLs, mail addresses, …
+syn match   denyhostsURL
+      \ contained
+      \ display
+      \ '.\+'
+
+hi def link denyhostsTodo               Todo
+hi def link denyhostsComment            Comment
+hi def link denyhostsSetting            Keyword
+hi def link denyhostsStringSetting      denyhostsSetting
+hi def link denyhostsBooleanSetting     denyhostsSetting
+hi def link denyhostsPathSetting        denyhostsSetting
+hi def link denyhostsNumericSetting     denyhostsSetting
+hi def link denyhostsTimespecSetting    denyhostsSetting
+hi def link denyhostsFormatSetting      denyhostsSetting
+hi def link denyhostsRegexSetting       denyhostsSetting
+hi def link denyhostURLSetting          denyhostsSetting
+hi def link denyhostsDelimiter          Normal
+hi def link denyhostsStringDelimiter    denyhostsDelimiter
+hi def link denyhostsBooleanDelimiter   denyhostsDelimiter
+hi def link denyhostsPathDelimiter      denyhostsDelimiter
+hi def link denyhostsNumericDelimiter   denyhostsDelimiter
+hi def link denyhostsTimespecDelimiter  denyhostsDelimiter
+hi def link denyhostsFormatDelimiter    denyhostsDelimiter
+hi def link denyhostsRegexDelimiter     denyhostsDelimiter
+hi def link denyhostsURLDelimiter       denyhostsDelimiter
+hi def link denyhostsString             String
+if exists('g:syntax_booleans_simple') || exists('b:syntax_booleans_simple')
+  hi def link denyhostsBoolean          Boolean
+  hi def link denyhostsBooleanFalse     denyhostsBoolean
+  hi def link denyhostsBooleanTrue      denyhostsBoolean
+else
+  hi def    denyhostsBooleanTrue        term=bold ctermfg=Green guifg=Green
+  hi def    denyhostsBooleanFalse       ctermfg=Red guifg=Red
+endif
+hi def link denyhostsPath               String
+hi def link denyhostsNumber             Number
+hi def link denyhostsTimespec           Number
+hi def link denyhostsFormat             String
+hi def link denyhostsFormattingExpandos Special
+hi def link denyhostsRegex              String
+hi def link denyhostsURL                String
+
+let b:current_syntax = "denyhosts"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/desc.vim b/syntax/desc.vim
new file mode 100644
index 000000000..990b0afb2
--- /dev/null
+++ b/syntax/desc.vim
@@ -0,0 +1,92 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'desc') == -1
+
+" Vim syntax file
+" Language:	T2 / ROCK Linux .desc
+" Maintainer:	René Rebe <rene@exactcode.de>, Piotr Esden-Tempski <esden@rocklinux.org>
+" Last Change:	2006 Aug 14
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" syntax definitions
+
+setl iskeyword+=-
+syn keyword descFlag DIETLIBC KAFFE JAIL NOPARALLEL FPIC-QUIRK LIBTOOL-WUIRK NO-LIBTOOL-FIX AUTOMAKE-QUIRK NO-AS-NEEDED NO-SSP KERNEL INIT LIBC CC CXX F77 KCC contained
+syn keyword descLicense Unknown GPL LGPL FDL MIT BSD OpenSource Free-to-use Commercial contained
+
+" tags
+syn match descTag /^\[\(COPY\)\]/
+syn match descTag /^\[\(I\|TITLE\)\]/
+syn match descTag /^\[\(T\|TEXT\)\]/ contained
+syn match descTag /^\[\(U\|URL\)\]/
+syn match descTag /^\[\(A\|AUTHOR\)\]/
+syn match descTag /^\[\(M\|MAINTAINER\)\]/
+syn match descTag /^\[\(C\|CATEGORY\)\]/ contained
+syn match descTag /^\[\(F\|FLAG\)\]/ contained
+syn match descTag /^\[\(E\|DEP\|DEPENDENCY\)\]/
+syn match descTag /^\[\(R\|ARCH\|ARCHITECTURE\)\]/
+syn match descTag /^\[\(L\|LICENSE\)\]/ contained
+syn match descTag /^\[\(S\|STATUS\)\]/
+syn match descTag /^\[\(O\|CONF\)\]/
+syn match descTag /^\[\(V\|VER\|VERSION\)\]/
+syn match descTag /^\[\(P\|PRI\|PRIORITY\)\]/ nextgroup=descInstall skipwhite
+syn match descTag /^\[\(D\|DOWN\|DOWNLOAD\)\]/ nextgroup=descSum skipwhite
+
+" misc
+syn match descUrl /\w\+:\/\/\S\+/
+syn match descCategory /\w\+\/\w\+/ contained
+syn match descEmail /<[\.A-Za-z0-9]\+@[\.A-Za-z0-9]\+>/
+
+" priority tag
+syn match descInstallX /X/ contained
+syn match descInstallO /O/ contained
+syn match descInstall /[OX]/ contained contains=descInstallX,descInstallO nextgroup=descStage skipwhite
+syn match descDash /-/ contained
+syn match descDigit /\d/ contained
+syn match descStage /[\-0][\-1][\-2][\-3][\-4][\-5][\-6][\-7][\-8][\-9]/ contained contains=descDash,descDigit nextgroup=descCompilePriority skipwhite
+syn match descCompilePriority /\d\{3}\.\d\{3}/ contained
+
+" download tag
+syn match descSum /\d\+/ contained nextgroup=descTarball skipwhite
+syn match descTarball /\S\+/ contained nextgroup=descUrl skipwhite
+
+
+" tag regions
+syn region descText start=/^\[\(T\|TEXT\)\]/ end=/$/ contains=descTag,descUrl,descEmail
+
+syn region descTagRegion start=/^\[\(C\|CATEGORY\)\]/ end=/$/ contains=descTag,descCategory
+
+syn region descTagRegion start=/^\[\(F\|FLAG\)\]/ end=/$/ contains=descTag,descFlag
+
+syn region descTagRegion start=/^\[\(L\|LICENSE\)\]/ end=/$/ contains=descTag,descLicense
+
+" Only when an item doesn't have highlighting yet
+
+hi def link descFlag		Identifier
+hi def link descLicense		Identifier
+hi def link descCategory		Identifier
+
+hi def link descTag		Type
+hi def link descUrl		Underlined
+hi def link descEmail		Underlined
+
+" priority tag colors
+hi def link descInstallX		Boolean
+hi def link descInstallO		Type
+hi def link descDash		Operator
+hi def link descDigit		Number
+hi def link descCompilePriority	Number
+
+" download tag colors
+hi def link descSum		Number
+hi def link descTarball		Underlined
+
+" tag region colors
+hi def link descText		Comment
+
+
+let b:current_syntax = "desc"
+
+endif
diff --git a/syntax/desktop.vim b/syntax/desktop.vim
new file mode 100644
index 000000000..a35e7e840
--- /dev/null
+++ b/syntax/desktop.vim
@@ -0,0 +1,271 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'desktop') == -1
+
+" Vim syntax file
+" Language: XDG desktop entry
+" Filenames: *.desktop, *.directory
+" Maintainer: Eisuke Kawashima ( e.kawaschima+vim AT gmail.com )
+" Previous Maintainer: Mikolaj Machowski ( mikmach AT wp DOT pl )
+" Last Change: 2020-06-11
+" Version Info: desktop.vim 1.5
+" References:
+" - https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.5.html (2020-04-27)
+" - https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-0.11.html (2006-02-07)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+syn case match
+
+" Variable {{{1
+" This syntax file can be used to all *nix configuration files similar to dos
+" ini format (eg. .xawtv, .radio, kde rc files) - this is default mode.
+" By default strict following of freedesktop.org standard is enforced.
+" To highlight nonstandard extensions that does not begin with X-, set
+"   let g:desktop_enable_nonstd = v:true
+" Note that this may cause wrong highlight.
+" To highlight KDE-reserved features, set
+"   let g:desktop_enable_kde = v:true
+" g:desktop_enable_kde follows g:desktop_enable_nonstd if not supplied
+
+if exists("g:desktop_enable_nonstd") && g:desktop_enable_nonstd
+  let s:desktop_enable_nonstd = v:true
+else
+  let s:desktop_enable_nonstd = v:false
+endif
+
+if exists("g:desktop_enable_kde") && g:desktop_enable_kde || s:desktop_enable_nonstd
+  let s:desktop_enable_kde = v:true
+else
+  let s:desktop_enable_kde = v:false
+endif
+
+" Comment {{{1
+syn match dtComment /^#.*$/
+
+" Error {{{1
+syn match dtError /\%(^\s.*\|\s\+$\)/
+
+" Group Header {{{1
+" ASCII printable characters except for brackets [ (0x5B) and ] (0x5D)
+syn match dtGroup /^\[[\x20-\x5A\x5C\x5E-\x7E]\+\]$/
+
+" Entries {{{1
+syn match dtDelim /=/ contained
+" lang_territory.codeset@modifier
+syn match dtLocaleSuffix
+      \ /\[\%(C\|POSIX\|[a-z]\{2,4}\%(_[A-Z0-9]\{2,3}\)\?\)\%(\.[A-Za-z0-9_-]\+\)\?\%(@[A-Za-z]\+\)\?\]\ze\s*=/
+      \ contained
+
+" Boolean Value {{{2
+syn match   dtBoolean
+      \ /^\%(DBusActivatable\|Hidden\|NoDisplay\|PrefersNonDefaultGPU\|StartupNotify\|Terminal\)\s*=\s*\%(true\|false\)/
+      \ contains=dtBooleanKey,dtDelim,dtBooleanValue transparent
+syn keyword dtBooleanKey
+      \ DBusActivatable Hidden NoDisplay PrefersNonDefaultGPU StartupNotify Terminal
+      \ contained nextgroup=dtDelim
+
+if s:desktop_enable_kde
+  syn match   dtBoolean
+        \ /^ReadOnly\s*=\s*\%(true\|false\)/
+        \ contains=dtBooleanKey,dtDelim,dtBooleanValue transparent
+  syn keyword dtBooleanKey
+        \ ReadOnly
+        \ contained nextgroup=dtDelim
+endif
+syn keyword dtBooleanValue true false contained
+
+" Numeric Value {{{2
+" icon theme
+syn match   dtNumeric /^\%(MaxSize\|MinSize\|Size\|Threshold\)\s*=\s*\d\+/ contains=dtNumericKey,dtDelim,dtNumericDecimal
+syn keyword dtNumericKey
+      \ MaxSize MinSize Size Threshold
+      \ contained nextgroup=dtDelim
+
+if s:desktop_enable_kde
+  syn match   dtNumeric /^InitialPreference\s*=\s*\d\+/ contains=dtNumericKey,dtDelim,dtNumericDecimal
+  syn keyword dtNumericKey
+        \ InitialPreference
+        \ contained nextgroup=dtDelim
+endif
+
+syn match   dtNumericDecimal /\<\d\+$/ contained
+
+" String Value {{{2
+syn match   dtString
+      \ /^\%(Actions\|Implements\|MimeType\|NotShowIn\|OnlyShowIn\|Path\|StartupWMClass\|URL\)\s*=.*\S/
+      \ contains=dtStringKey,dtDelim transparent
+syn keyword dtStringKey
+      \ Actions Implements MimeType NotShowIn OnlyShowIn Path StartupWMClass URL Version
+      \ contained nextgroup=dtDelim
+
+" icon theme
+syn match   dtString
+      \ /^\%(Context\|Directories\|Example\|Inherits\)\s*=.*\S/
+      \ contains=dtStringKey,dtDelim transparent
+syn keyword dtStringKey
+      \ Context Directories Example Inherits
+      \ contained nextgroup=dtDelim
+
+if s:desktop_enable_kde
+  syn match   dtString
+        \ /^\%(Dev\|DocPath\|FSType\|MountPoint\|ServiceTypes\)\s*=.*\S/
+        \ contains=dtStringKey,dtDelim transparent
+  syn keyword dtStringKey
+        \ Dev DocPath FSType MountPoint ServiceTypes
+        \ contained nextgroup=dtDelim
+endif
+
+" Categories {{{3
+" https://specifications.freedesktop.org/menu-spec/menu-spec-1.0.html#category-registry
+syn match   dtCategories /^Categories\s*=.\+\S/ contains=dtCategoriesKey,dtDelim,dtCategoriesValue transparent
+syn keyword dtCategoriesKey
+      \ Categories
+      \ contained nextgroup=dtDelim
+
+" Main Categories
+syn keyword dtCategoriesValue
+      \ Audio AudioVideo Development Education Game Graphics Network Office
+      \ Settings System Utility Video
+      \ contained
+
+" Additional Categories
+syn keyword dtCategoriesValue
+      \ BoardGame Chat Clock Geoscience Presentation 2DGraphics 3DGraphics
+      \ Accessibility ActionGame AdventureGame Amusement ArcadeGame Archiving
+      \ Art ArtificialIntelligence Astronomy AudioVideoEditing Biology
+      \ BlocksGame BoardGame Building Calculator Calendar CardGame Chart Chat
+      \ Chemistry Clock Compression ComputerScience ConsoleOnly Construction
+      \ ContactManagement Core DataVisualization Database Debugger
+      \ DesktopSettings Dialup Dictionary DiscBurning Documentation Economy
+      \ Electricity Electronics Email Emulator Engineering FileManager
+      \ FileTools FileTransfer Filesystem Finance FlowChart GNOME GTK
+      \ GUIDesigner Geography Geology Geoscience HamRadio HardwareSettings
+      \ History IDE IRCClient ImageProcessing InstantMessaging Java KDE
+      \ KidsGame Languages Literature LogicGame Math MedicalSoftware Midi
+      \ Mixer Monitor Motif Music News NumericalAnalysis OCR P2P PDA
+      \ PackageManager ParallelComputing Photography Physics Player
+      \ Presentation Printing Profiling ProjectManagement Publishing Qt
+      \ RasterGraphics Recorder RemoteAccess RevisionControl Robotics
+      \ RolePlaying Scanning Science Security Sequencer Simulation Sports
+      \ SportsGame Spreadsheet StrategyGame TV Telephony TelephonyTools
+      \ TerminalEmulator TextEditor TextTools Translation Tuner VectorGraphics
+      \ VideoConference Viewer WebBrowser WebDevelopment WordProcessor
+      \ contained
+
+" Reserved Category
+syn keyword dtCategoriesValue
+      \ Applet Screensaver Shell TrayIcon
+      \ contained
+
+" Exec/TryExec {{{3
+syn match   dtExec /^\%(Exec\|TryExec\)\s*=.\+\S/ contains=dtExecKey,dtDelim,dtExecParam transparent
+syn keyword dtExecKey
+      \ Exec TryExec
+      \ contained nextgroup=dtDelim
+" code for file(s), URL(s), etc
+syn match   dtExecParam  /\s\zs%[fFuUick]\ze\%(\W\|$\)/ contained
+
+" Type {{{3
+syn match   dtType /^Type\s*=\s*\S\+/ contains=dtTypeKey,dtDelim,dtTypeValue transparent
+syn keyword dtTypeKey
+      \ Type
+      \ contained nextgroup=dtDelim
+syn keyword dtTypeValue
+      \ Application Directory Link
+      \ contained
+
+if s:desktop_enable_kde
+  syn keyword dtTypeValue
+        \ FSDevice Service ServiceType
+        \ contained
+endif
+
+
+" Version {{{3
+syn match   dtVersion /^Version\s*=\s*\S\+/ contains=dtVersionKey,dtDelim,dtVersionValue transparent
+syn keyword dtVersionKey
+      \ Version
+      \ contained nextgroup=dtDelim
+syn match   dtVersionValue /[0-9]\+\%(\.[0-9]\+\)\{1,2}$/ contained
+
+" Localestring Value {{{2
+syn match   dtLocalestring
+      \ /^\%(Comment\|GenericName\|Keywords\|Name\)\%(\[.\{-}\]\)\?\s*=.*\S/
+      \ contains=dtLocalestringKey,dtLocaleSuffix,dtDelim transparent
+syn keyword dtLocalestringKey
+      \ Comment GenericName Keywords Name
+      \ contained nextgroup=dtLocaleSuffix,dtDelim skipwhite
+
+" Iconstring Value {{{2
+syn match   dtIconstring
+      \ /^Icon\s*=.*\S/
+      \ contains=dtIconstringKey,dtDelim transparent
+syn keyword dtIconstringKey
+      \ Icon
+      \ contained nextgroup=dtDelim skipwhite
+
+if s:desktop_enable_kde
+  syn match   dtIconstring
+        \ /^UnmountIcon\>\%(\[.\{-}\]\)\?\s*=.*\S/
+        \ contains=dtIconstringKey,dtLocaleSuffix,dtDelim transparent
+  syn keyword dtIconstringKey
+        \ UnmountIcon
+        \ contained nextgroup=dtLocaleSuffix,dtDelim skipwhite
+endif
+
+" X-Extension {{{2
+syn match   dtXExtension    /^X-[0-9A-Za-z-]*\%(\[.\{-}\]\)\?\s*=.*\S/
+      \ contains=dtXExtensionKey,dtLocaleSuffix,dtDelim transparent
+syn match   dtXExtensionKey /^X-[0-9A-Za-z-]*/ contained nextgroup=dtLocaleSuffix,dtDelim
+
+" non standard {{{2
+if s:desktop_enable_nonstd
+  syn match dtNonStdLabel    /^[0-9A-Za-z-]\+\%(\[.\{-}\]\)\?\s*=.*\S/
+        \ contains=dtNonStdLabelKey,dtLocaleSuffix,dtDelim transparent
+  syn match dtNonStdLabelKey /^[0-9A-Za-z-]\+/ contained nextgroup=dtLocaleSuffix,dtDelim
+endif
+
+" Highlight {{{1
+hi def link dtComment		Comment
+hi def link dtError		Error
+
+hi def link dtGroup		Special
+
+hi def link dtDelim		Delimiter
+hi def link dtLocaleSuffix	Identifier
+
+hi def link dtBooleanKey	Type
+hi def link dtBooleanValue	Boolean
+
+hi def link dtNumericKey	Type
+hi def link dtNumericDecimal	Number
+
+hi def link dtStringKey		Type
+hi def link dtCategoriesKey	Type
+hi def link dtCategoriesValue	Constant
+hi def link dtExecKey		Type
+hi def link dtExecParam		Special
+hi def link dtTypeKey		Type
+hi def link dtTypeValue		Constant
+hi def link dtVersionKey	Type
+hi def link dtVersionValue	Constant
+
+hi def link dtLocalestringKey	Type
+
+hi def link dtIconStringKey	Type
+
+hi def link dtXExtensionKey	Type
+
+hi def link dtNonStdLabelKey	Type
+
+" Clean Up {{{1
+let b:current_syntax = "desktop"
+let &cpo = s:cpo_save
+
+" vim:ts=8:sw=2:fdm=marker
+
+endif
diff --git a/syntax/dictconf.vim b/syntax/dictconf.vim
new file mode 100644
index 000000000..69727f71e
--- /dev/null
+++ b/syntax/dictconf.vim
@@ -0,0 +1,84 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictconf') == -1
+
+" Vim syntax file
+" Language:             dict(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword dictconfTodo        contained TODO FIXME XXX NOTE
+
+syn region  dictconfComment     display oneline start='#' end='$'
+                                \ contains=dictconfTodo,@Spell
+
+syn match   dictconfBegin       display '^'
+                                \ nextgroup=dictconfKeyword,dictconfComment
+                                \ skipwhite
+
+syn keyword dictconfKeyword     contained server
+                                \ nextgroup=dictconfServer skipwhite
+
+syn keyword dictconfKeyword     contained pager
+                                \ nextgroup=dictconfPager
+
+syn match   dictconfServer      contained display
+                                \ '[[:alnum:]_/.*-][[:alnum:]_/.*-]*'
+                                \ nextgroup=dictconfServerOptG skipwhite
+
+syn region  dictconfServer      contained display oneline
+                                \ start=+"+ skip=+""+ end=+"+
+                                \ nextgroup=dictconfServerOptG skipwhite
+
+syn region  dictconfServerOptG  contained transparent
+                                \ matchgroup=dictconfServerOptsD start='{'
+                                \ matchgroup=dictconfServerOptsD end='}'
+                                \ contains=dictconfServerOpts,dictconfComment
+
+syn keyword dictconfServerOpts  contained port
+                                \ nextgroup=dictconfNumber skipwhite
+
+syn keyword dictconfServerOpts  contained user
+                                \ nextgroup=dictconfUsername skipwhite
+
+syn match   dictconfUsername    contained display
+                                \ '[[:alnum:]_/.*-][[:alnum:]_/.*-]*'
+                                \ nextgroup=dictconfSecret skipwhite
+syn region  dictconfUsername    contained display oneline
+                                \ start=+"+ skip=+""+ end=+"+
+                                \ nextgroup=dictconfSecret skipwhite
+
+syn match   dictconfSecret      contained display
+                                \ '[[:alnum:]_/.*-][[:alnum:]_/.*-]*'
+syn region  dictconfSecret      contained display oneline
+                                \ start=+"+ skip=+""+ end=+"+
+
+syn match   dictconfNumber      contained '\<\d\+\>'
+
+syn match   dictconfPager       contained display
+                                \ '[[:alnum:]_/.*-][[:alnum:]_/.*-]*'
+syn region  dictconfPager       contained display oneline
+                                \ start=+"+ skip=+""+ end=+"+
+
+hi def link dictconfTodo        Todo
+hi def link dictconfComment     Comment
+hi def link dictconfKeyword     Keyword
+hi def link dictconfServer      String
+hi def link dictconfServerOptsD Delimiter
+hi def link dictconfServerOpts  Identifier
+hi def link dictconfUsername    String
+hi def link dictconfSecret      Special
+hi def link dictconfNumber      Number
+hi def link dictconfPager       String
+
+let b:current_syntax = "dictconf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/dictdconf.vim b/syntax/dictdconf.vim
new file mode 100644
index 000000000..c698fa81a
--- /dev/null
+++ b/syntax/dictdconf.vim
@@ -0,0 +1,150 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictdconf') == -1
+
+" Vim syntax file
+" Language:             dictd(8) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword dictdconfTodo        contained TODO FIXME XXX NOTE
+
+syn region  dictdconfComment    display oneline start='#' end='$'
+                                \ contains=dictdconfTodo,dictdconfSpecialC,
+                                \ @Spell
+
+syn keyword dictdconfSpecialC   LASTLINE
+
+syn match   dictdconfBegin      display '^'
+                                \ nextgroup=dictdconfKeyword,dictdconfComment
+                                \ skipwhite
+
+syn keyword dictdconfKeyword    contained access
+                                \ nextgroup=dictdconfAccessG skipwhite
+
+syn region  dictdconfAccessG    contained transparent
+                                \ matchgroup=dictdconfDelimiter start='{'
+                                \ matchgroup=dictdconfDelimiter end='}'
+                                \ contains=dictdconfAccess,dictdconfComment
+
+syn keyword dictdconfAccess     contained allow deny authonly user
+                                \ nextgroup=dictdconfString skipwhite
+
+syn keyword dictdconfKeyword    contained database
+                                \ nextgroup=dictdconfDatabase skipwhite
+
+syn match   dictdconfDatabase   contained display
+                                \ '[[:alnum:]_/.*-][[:alnum:]_/.*-]*'
+                                \ nextgroup=dictdconfSpecG skipwhite
+syn region  dictdconfDatabase   contained display oneline
+                                \ start=+"+ skip=+""\|\\\\\|\\"+ end=+"+
+                                \ nextgroup=dictdconfSpecG skipwhite
+
+syn region  dictdconfSpecG      contained transparent
+                                \ matchgroup=dictdconfDelimiter start='{'
+                                \ matchgroup=dictdconfDelimiter end='}'
+                                \ contains=dictdconfSpec,dictdconfAccess,
+                                \ dictdconfComment
+
+syn keyword dictdconfSpec       contained data index index_suffix index_word
+                                \ filter prefilter postfilter name info
+                                \ disable_strat
+                                \ nextgroup=dictdconfString skipwhite
+
+syn keyword dictdconfSpec       contained invisible
+
+syn keyword dictdconfKeyword    contained database_virtual
+                                \ nextgroup=dictdconfVDatabase skipwhite
+
+syn match   dictdconfVDatabase  contained display
+                                \ '[[:alnum:]_/.*-][[:alnum:]_/.*-]*'
+                                \ nextgroup=dictdconfVSpecG skipwhite
+syn region  dictdconfVDatabase   contained display oneline
+                                \ start=+"+ skip=+""\|\\\\\|\\"+ end=+"+
+                                \ nextgroup=dictdconfVSpecG skipwhite
+
+syn region  dictdconfVSpecG     contained transparent
+                                \ matchgroup=dictdconfDelimiter start='{'
+                                \ matchgroup=dictdconfDelimiter end='}'
+                                \ contains=dictdconfVSpec,dictdconfAccess,
+                                \ dictdconfComment
+
+syn keyword dictdconfVSpec      contained name info database_list disable_strat
+                                \ nextgroup=dictdconfString skipwhite
+
+syn keyword dictdconfVSpec      contained invisible
+
+syn keyword dictdconfKeyword    contained database_plugin
+                                \ nextgroup=dictdconfPDatabase skipwhite
+
+syn match   dictdconfPDatabase  contained display
+                                \ '[[:alnum:]_/.*-][[:alnum:]_/.*-]*'
+                                \ nextgroup=dictdconfPSpecG skipwhite
+syn region  dictdconfPDatabase   contained display oneline
+                                \ start=+"+ skip=+""\|\\\\\|\\"+ end=+"+
+                                \ nextgroup=dictdconfPSpecG skipwhite
+
+syn region  dictdconfPSpecG     contained transparent
+                                \ matchgroup=dictdconfDelimiter start='{'
+                                \ matchgroup=dictdconfDelimiter end='}'
+                                \ contains=dictdconfPSpec,dictdconfAccess,
+                                \ dictdconfComment
+
+syn keyword dictdconfPSpec      contained name info plugin data disable_strat
+                                \ nextgroup=dictdconfString skipwhite
+
+syn keyword dictdconfPSpec      contained invisible
+
+syn keyword dictdconfKeyword    contained database_exit
+
+syn keyword dictdconfKeyword    contained site
+                                \ nextgroup=dictdconfString skipwhite
+
+syn keyword dictdconfKeyword    contained user
+                                \ nextgroup=dictdconfUsername skipwhite
+
+syn match   dictdconfUsername   contained display
+                                \ '[[:alnum:]_/.*-][[:alnum:]_/.*-]*'
+                                \ nextgroup=dictdconfSecret skipwhite
+syn region  dictdconfUsername   contained display oneline
+                                \ start=+"+ skip=+""+ end=+"+
+                                \ nextgroup=dictdconfSecret skipwhite
+
+syn match   dictdconfSecret     contained display
+                                \ '[[:alnum:]_/.*-][[:alnum:]_/.*-]*'
+syn region  dictdconfSecret     contained display oneline
+                                \ start=+"+ skip=+""+ end=+"+
+
+syn match   dictdconfString     contained display
+                                \ '[[:alnum:]_/.*-][[:alnum:]_/.*-]*'
+syn region  dictdconfString     contained display oneline
+                                \ start=+"+ skip=+""\|\\\\\|\\"+ end=+"+
+
+hi def link dictdconfTodo       Todo
+hi def link dictdconfComment    Comment
+hi def link dictdconfSpecialC   Special
+hi def link dictdconfKeyword    Keyword
+hi def link dictdconfIdentifier Identifier
+hi def link dictdconfAccess     dictdconfIdentifier
+hi def link dictdconfDatabase   dictdconfString
+hi def link dictdconfSpec       dictdconfIdentifier
+hi def link dictdconfVDatabase  dictdconfDatabase
+hi def link dictdconfVSpec      dictdconfSpec
+hi def link dictdconfPDatabase  dictdconfDatabase
+hi def link dictdconfPSpec      dictdconfSpec
+hi def link dictdconfUsername   dictdconfString
+hi def link dictdconfSecret     Special
+hi def link dictdconfString     String
+hi def link dictdconfDelimiter  Delimiter
+
+let b:current_syntax = "dictdconf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/diff.vim b/syntax/diff.vim
new file mode 100644
index 000000000..02299ad75
--- /dev/null
+++ b/syntax/diff.vim
@@ -0,0 +1,386 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'diff') == -1
+
+" Vim syntax file
+" Language:	Diff (context or unified)
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+"               Translations by Jakson Alves de Aquino.
+" Last Change:	2016 Apr 02
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+scriptencoding utf-8
+
+syn match diffOnly	"^Only in .*"
+syn match diffIdentical	"^Files .* and .* are identical$"
+syn match diffDiffer	"^Files .* and .* differ$"
+syn match diffBDiffer	"^Binary files .* and .* differ$"
+syn match diffIsA	"^File .* is a .* while file .* is a .*"
+syn match diffNoEOL	"^\\ No newline at end of file .*"
+syn match diffCommon	"^Common subdirectories: .*"
+
+" Disable the translations by setting diff_translations to zero.
+if !exists("diff_translations") || diff_translations
+
+" ca
+syn match diffOnly	"^Només a .*"
+syn match diffIdentical	"^Els fitxers .* i .* són idèntics$"
+syn match diffDiffer	"^Els fitxers .* i .* difereixen$"
+syn match diffBDiffer	"^Els fitxers .* i .* difereixen$"
+syn match diffIsA	"^El fitxer .* és un .* mentre que el fitxer .* és un .*"
+syn match diffNoEOL	"^\\ No hi ha cap caràcter de salt de línia al final del fitxer"
+syn match diffCommon	"^Subdirectoris comuns: .* i .*"
+
+" cs
+syn match diffOnly	"^Pouze v .*"
+syn match diffIdentical	"^Soubory .* a .* jsou identické$"
+syn match diffDiffer	"^Soubory .* a .* jsou různé$"
+syn match diffBDiffer	"^Binární soubory .* a .* jsou rozdílné$"
+syn match diffBDiffer	"^Soubory .* a .* jsou různé$"
+syn match diffIsA	"^Soubor .* je .* pokud soubor .* je .*"
+syn match diffNoEOL	"^\\ Chybí znak konce řádku na konci souboru"
+syn match diffCommon	"^Společné podadresáře: .* a .*"
+
+" da
+syn match diffOnly	"^Kun i .*"
+syn match diffIdentical	"^Filerne .* og .* er identiske$"
+syn match diffDiffer	"^Filerne .* og .* er forskellige$"
+syn match diffBDiffer	"^Binære filer .* og .* er forskellige$"
+syn match diffIsA	"^Filen .* er en .* mens filen .* er en .*"
+syn match diffNoEOL	"^\\ Intet linjeskift ved filafslutning"
+syn match diffCommon	"^Identiske underkataloger: .* og .*"
+
+" de
+syn match diffOnly	"^Nur in .*"
+syn match diffIdentical	"^Dateien .* und .* sind identisch.$"
+syn match diffDiffer	"^Dateien .* und .* sind verschieden.$"
+syn match diffBDiffer	"^Binärdateien .* and .* sind verschieden.$"
+syn match diffBDiffer	"^Binärdateien .* und .* sind verschieden.$"
+syn match diffIsA	"^Datei .* ist ein .* während Datei .* ein .* ist.$"
+syn match diffNoEOL	"^\\ Kein Zeilenumbruch am Dateiende."
+syn match diffCommon	"^Gemeinsame Unterverzeichnisse: .* und .*.$"
+
+" el
+syn match diffOnly	"^Μόνο στο .*"
+syn match diffIdentical	"^Τα αρχεία .* καί .* είναι πανομοιότυπα$"
+syn match diffDiffer	"^Τα αρχεία .* και .* διαφέρουν$"
+syn match diffBDiffer	"^Τα αρχεία .* και .* διαφέρουν$"
+syn match diffIsA	"^Το αρχείο .* είναι .* ενώ το αρχείο .* είναι .*"
+syn match diffNoEOL	"^\\ Δεν υπάρχει χαρακτήρας νέας γραμμής στο τέλος του αρχείου"
+syn match diffCommon	"^Οι υποκατάλογοι .* και .* είναι ταυτόσημοι$"
+
+" eo
+syn match diffOnly	"^Nur en .*"
+syn match diffIdentical	"^Dosieroj .* kaj .* estas samaj$"
+syn match diffDiffer	"^Dosieroj .* kaj .* estas malsamaj$"
+syn match diffBDiffer	"^Dosieroj .* kaj .* estas malsamaj$"
+syn match diffIsA	"^Dosiero .* estas .*, dum dosiero .* estas .*"
+syn match diffNoEOL	"^\\ Mankas linifino ĉe fino de dosiero"
+syn match diffCommon	"^Komunaj subdosierujoj: .* kaj .*"
+
+" es
+syn match diffOnly	"^Sólo en .*"
+syn match diffIdentical	"^Los ficheros .* y .* son idénticos$"
+syn match diffDiffer	"^Los ficheros .* y .* son distintos$"
+syn match diffBDiffer	"^Los ficheros binarios .* y .* son distintos$"
+syn match diffIsA	"^El fichero .* es un .* mientras que el .* es un .*"
+syn match diffNoEOL	"^\\ No hay ningún carácter de nueva línea al final del fichero"
+syn match diffCommon	"^Subdirectorios comunes: .* y .*"
+
+" fi
+syn match diffOnly	"^Vain hakemistossa .*"
+syn match diffIdentical	"^Tiedostot .* ja .* ovat identtiset$"
+syn match diffDiffer	"^Tiedostot .* ja .* eroavat$"
+syn match diffBDiffer	"^Binääritiedostot .* ja .* eroavat$"
+syn match diffIsA	"^Tiedosto .* on .*, kun taas tiedosto .* on .*"
+syn match diffNoEOL	"^\\ Ei rivinvaihtoa tiedoston lopussa"
+syn match diffCommon	"^Yhteiset alihakemistot: .* ja .*"
+
+" fr
+syn match diffOnly	"^Seulement dans .*"
+syn match diffIdentical	"^Les fichiers .* et .* sont identiques.*"
+syn match diffDiffer	"^Les fichiers .* et .* sont différents.*"
+syn match diffBDiffer	"^Les fichiers binaires .* et .* sont différents.*"
+syn match diffIsA	"^Le fichier .* est un .* alors que le fichier .* est un .*"
+syn match diffNoEOL	"^\\ Pas de fin de ligne à la fin du fichier.*"
+syn match diffCommon	"^Les sous-répertoires .* et .* sont identiques.*"
+
+" ga
+syn match diffOnly	"^I .* amháin: .*"
+syn match diffIdentical	"^Is comhionann iad na comhaid .* agus .*"
+syn match diffDiffer	"^Tá difríocht idir na comhaid .* agus .*"
+syn match diffBDiffer	"^Tá difríocht idir na comhaid .* agus .*"
+syn match diffIsA	"^Tá comhad .* ina .* ach tá comhad .* ina .*"
+syn match diffNoEOL	"^\\ Gan líne nua ag an chomhadchríoch"
+syn match diffCommon	"^Fochomhadlanna i gcoitianta: .* agus .*"
+
+" gl
+syn match diffOnly	"^Só en .*"
+syn match diffIdentical	"^Os ficheiros .* e .* son idénticos$"
+syn match diffDiffer	"^Os ficheiros .* e .* son diferentes$"
+syn match diffBDiffer	"^Os ficheiros binarios .* e .* son diferentes$"
+syn match diffIsA	"^O ficheiro .* é un .* mentres que o ficheiro .* é un .*"
+syn match diffNoEOL	"^\\ Non hai un salto de liña na fin da liña"
+syn match diffCommon	"^Subdirectorios comúns: .* e .*"
+
+" he
+" ^.* are expansive patterns for long lines, so disabled unless we can match
+" some specific hebrew chars
+if search('\%u05d5\|\%u05d1', 'nw', '', 100)
+  syn match diffOnly	"^.*-ב קר אצמנ .*"
+  syn match diffIdentical	"^םיהז םניה .*-ו .* םיצבקה$"
+  syn match diffDiffer	"^הזמ הז םינוש `.*'-ו `.*' םיצבקה$"
+  syn match diffBDiffer	"^הזמ הז םינוש `.*'-ו `.*' םיירניב םיצבק$"
+  syn match diffIsA	"^.* .*-ל .* .* תוושהל ןתינ אל$"
+  syn match diffNoEOL	"^\\ ץבוקה ףוסב השד.-הרוש ות רס."
+  syn match diffCommon	"^.*-ו .* :תוהז תויקית-תת$"
+endif
+
+" hr
+syn match diffOnly	"^Samo u .*"
+syn match diffIdentical	"^Datoteke .* i .* su identične$"
+syn match diffDiffer	"^Datoteke .* i .* se razlikuju$"
+syn match diffBDiffer	"^Binarne datoteke .* i .* se razlikuju$"
+syn match diffIsA	"^Datoteka .* je .*, a datoteka .* je .*"
+syn match diffNoEOL	"^\\ Nema novog retka na kraju datoteke"
+syn match diffCommon	"^Uobičajeni poddirektoriji: .* i .*"
+
+" hu
+syn match diffOnly	"^Csak .* -ben: .*"
+syn match diffIdentical	"^.* és .* fájlok azonosak$"
+syn match diffDiffer	"^A(z) .* és a(z) .* fájlok különböznek$"
+syn match diffBDiffer	"^A(z) .* és a(z) .* fájlok különböznek$"
+syn match diffIsA	"^A(z) .* fájl egy .*, viszont a(z) .* fájl egy .*"
+syn match diffNoEOL	"^\\ Nincs újsor a fájl végén"
+syn match diffCommon	"^Közös alkönyvtárak: .* és .*"
+
+" id
+syn match diffOnly	"^Hanya dalam .*"
+syn match diffIdentical	"^File .* dan .* identik$"
+syn match diffDiffer	"^Berkas .* dan .* berbeda$"
+syn match diffBDiffer	"^File biner .* dan .* berbeda$"
+syn match diffIsA	"^File .* adalah .* sementara file .* adalah .*"
+syn match diffNoEOL	"^\\ Tidak ada baris-baru di akhir dari berkas"
+syn match diffCommon	"^Subdirektori sama: .* dan .*"
+
+" it
+syn match diffOnly	"^Solo in .*"
+syn match diffIdentical	"^I file .* e .* sono identici$"
+syn match diffDiffer	"^I file .* e .* sono diversi$"
+syn match diffBDiffer	"^I file .* e .* sono diversi$"
+syn match diffBDiffer	"^I file binari .* e .* sono diversi$"
+syn match diffIsA	"^File .* è un .* mentre file .* è un .*"
+syn match diffNoEOL	"^\\ Manca newline alla fine del file"
+syn match diffCommon	"^Sottodirectory in comune: .* e .*"
+
+" ja
+syn match diffOnly	"^.*だけに発見: .*"
+syn match diffIdentical	"^ファイル.*と.*は同一$"
+syn match diffDiffer	"^ファイル.*と.*は違います$"
+syn match diffBDiffer	"^バイナリー・ファイル.*と.*は違います$"
+syn match diffIsA	"^ファイル.*は.*、ファイル.*は.*"
+syn match diffNoEOL	"^\\ ファイル末尾に改行がありません"
+syn match diffCommon	"^共通の下位ディレクトリー: .*と.*"
+
+" ja DiffUtils 3.3
+syn match diffOnly	"^.* のみに存在: .*"
+syn match diffIdentical	"^ファイル .* と .* は同一です$"
+syn match diffDiffer	"^ファイル .* と .* は異なります$"
+syn match diffBDiffer	"^バイナリーファイル .* と.* は異なります$"
+syn match diffIsA	"^ファイル .* は .* です。一方、ファイル .* は .* です$"
+syn match diffNoEOL	"^\\ ファイル末尾に改行がありません"
+syn match diffCommon	"^共通のサブディレクトリー: .* と .*"
+
+" lv
+syn match diffOnly	"^Tikai iekš .*"
+syn match diffIdentical	"^Fails .* un .* ir identiski$"
+syn match diffDiffer	"^Faili .* un .* atšķiras$"
+syn match diffBDiffer	"^Faili .* un .* atšķiras$"
+syn match diffBDiffer	"^Binārie faili .* un .* atšķiras$"
+syn match diffIsA	"^Fails .* ir .* kamēr fails .* ir .*"
+syn match diffNoEOL	"^\\ Nav jaunu rindu faila beigās"
+syn match diffCommon	"^Kopējās apakšdirektorijas: .* un .*"
+
+" ms
+syn match diffOnly	"^Hanya dalam .*"
+syn match diffIdentical	"^Fail .* dan .* adalah serupa$"
+syn match diffDiffer	"^Fail .* dan .* berbeza$"
+syn match diffBDiffer	"^Fail .* dan .* berbeza$"
+syn match diffIsA	"^Fail .* adalah .* manakala fail .* adalah .*"
+syn match diffNoEOL	"^\\ Tiada baris baru pada penghujung fail"
+syn match diffCommon	"^Subdirektori umum: .* dan .*"
+
+" nl
+syn match diffOnly	"^Alleen in .*"
+syn match diffIdentical	"^Bestanden .* en .* zijn identiek$"
+syn match diffDiffer	"^Bestanden .* en .* zijn verschillend$"
+syn match diffBDiffer	"^Bestanden .* en .* zijn verschillend$"
+syn match diffBDiffer	"^Binaire bestanden .* en .* zijn verschillend$"
+syn match diffIsA	"^Bestand .* is een .* terwijl bestand .* een .* is$"
+syn match diffNoEOL	"^\\ Geen regeleindeteken (LF) aan einde van bestand"
+syn match diffCommon	"^Gemeenschappelijke submappen: .* en .*"
+
+" pl
+syn match diffOnly	"^Tylko w .*"
+syn match diffIdentical	"^Pliki .* i .* są identyczne$"
+syn match diffDiffer	"^Pliki .* i .* różnią się$"
+syn match diffBDiffer	"^Pliki .* i .* różnią się$"
+syn match diffBDiffer	"^Binarne pliki .* i .* różnią się$"
+syn match diffIsA	"^Plik .* jest .*, podczas gdy plik .* jest .*"
+syn match diffNoEOL	"^\\ Brak znaku nowej linii na końcu pliku"
+syn match diffCommon	"^Wspólne podkatalogi: .* i .*"
+
+" pt_BR
+syn match diffOnly	"^Somente em .*"
+syn match diffOnly	"^Apenas em .*"
+syn match diffIdentical	"^Os aquivos .* e .* são idênticos$"
+syn match diffDiffer	"^Os arquivos .* e .* são diferentes$"
+syn match diffBDiffer	"^Os arquivos binários .* e .* são diferentes$"
+syn match diffIsA	"^O arquivo .* é .* enquanto o arquivo .* é .*"
+syn match diffNoEOL	"^\\ Falta o caracter nova linha no final do arquivo"
+syn match diffCommon	"^Subdiretórios idênticos: .* e .*"
+
+" ro
+syn match diffOnly	"^Doar în .*"
+syn match diffIdentical	"^Fişierele .* şi .* sunt identice$"
+syn match diffDiffer	"^Fişierele .* şi .* diferă$"
+syn match diffBDiffer	"^Fişierele binare .* şi .* diferă$"
+syn match diffIsA	"^Fişierul .* este un .* pe când fişierul .* este un .*.$"
+syn match diffNoEOL	"^\\ Nici un element de linie nouă la sfârşitul fişierului"
+syn match diffCommon	"^Subdirectoare comune: .* şi .*.$"
+
+" ru
+syn match diffOnly	"^Только в .*"
+syn match diffIdentical	"^Файлы .* и .* идентичны$"
+syn match diffDiffer	"^Файлы .* и .* различаются$"
+syn match diffBDiffer	"^Файлы .* и .* различаются$"
+syn match diffIsA	"^Файл .* это .*, тогда как файл .* -- .*"
+syn match diffNoEOL	"^\\ В конце файла нет новой строки"
+syn match diffCommon	"^Общие подкаталоги: .* и .*"
+
+" sr
+syn match diffOnly	"^Само у .*"
+syn match diffIdentical	"^Датотеке „.*“ и „.*“ се подударају$"
+syn match diffDiffer	"^Датотеке .* и .* различите$"
+syn match diffBDiffer	"^Бинарне датотеке .* и .* различите$"
+syn match diffIsA	"^Датотека „.*“ је „.*“ док је датотека „.*“ „.*“$"
+syn match diffNoEOL	"^\\ Без новог реда на крају датотеке"
+syn match diffCommon	"^Заједнички поддиректоријуми: .* и .*"
+
+" sv
+syn match diffOnly	"^Endast i .*"
+syn match diffIdentical	"^Filerna .* och .* är lika$"
+syn match diffDiffer	"^Filerna .* och .* skiljer$"
+syn match diffBDiffer	"^Filerna .* och .* skiljer$"
+syn match diffIsA	"^Fil .* är en .* medan fil .* är en .*"
+syn match diffBDiffer	"^De binära filerna .* och .* skiljer$"
+syn match diffIsA	"^Filen .* är .* medan filen .* är .*"
+syn match diffNoEOL	"^\\ Ingen nyrad vid filslut"
+syn match diffCommon	"^Lika underkataloger: .* och .*"
+
+" tr
+syn match diffOnly	"^Yalnızca .*'da: .*"
+syn match diffIdentical	"^.* ve .* dosyaları birbirinin aynı$"
+syn match diffDiffer	"^.* ve .* dosyaları birbirinden farklı$"
+syn match diffBDiffer	"^.* ve .* dosyaları birbirinden farklı$"
+syn match diffBDiffer	"^İkili .* ve .* birbirinden farklı$"
+syn match diffIsA	"^.* dosyası, bir .*, halbuki .* dosyası bir .*"
+syn match diffNoEOL	"^\\ Dosya sonunda yenisatır yok."
+syn match diffCommon	"^Ortak alt dizinler: .* ve .*"
+
+" uk
+syn match diffOnly	"^Лише у .*"
+syn match diffIdentical	"^Файли .* та .* ідентичні$"
+syn match diffDiffer	"^Файли .* та .* відрізняються$"
+syn match diffBDiffer	"^Файли .* та .* відрізняються$"
+syn match diffBDiffer	"^Двійкові файли .* та .* відрізняються$"
+syn match diffIsA	"^Файл .* це .*, тоді як файл .* -- .*"
+syn match diffNoEOL	"^\\ Наприкінці файлу немає нового рядка"
+syn match diffCommon	"^Спільні підкаталоги: .* та .*"
+
+" vi
+syn match diffOnly	"^Chỉ trong .*"
+syn match diffIdentical	"^Hai tập tin .* và .* là bằng nhau.$"
+syn match diffIdentical	"^Cả .* và .* là cùng một tập tin$"
+syn match diffDiffer	"^Hai tập tin .* và .* là khác nhau.$"
+syn match diffBDiffer	"^Hai tập tin nhị phân .* và .* khác nhau$"
+syn match diffIsA	"^Tập tin .* là một .* trong khi tập tin .* là một .*.$"
+syn match diffBDiffer	"^Hai tập tin .* và .* là khác nhau.$"
+syn match diffIsA	"^Tập tin .* là một .* còn tập tin .* là một .*.$"
+syn match diffNoEOL	"^\\ Không có ký tự dòng mới tại kêt thức tập tin."
+syn match diffCommon	"^Thư mục con chung: .* và .*"
+
+" zh_CN
+syn match diffOnly	"^只在 .* 存在：.*"
+syn match diffIdentical	"^檔案 .* 和 .* 相同$"
+syn match diffDiffer	"^文件 .* 和 .* 不同$"
+syn match diffBDiffer	"^文件 .* 和 .* 不同$"
+syn match diffIsA	"^文件 .* 是.*而文件 .* 是.*"
+syn match diffNoEOL	"^\\ 文件尾没有 newline 字符"
+syn match diffCommon	"^.* 和 .* 有共同的子目录$"
+
+" zh_TW
+syn match diffOnly	"^只在 .* 存在：.*"
+syn match diffIdentical	"^檔案 .* 和 .* 相同$"
+syn match diffDiffer	"^檔案 .* 與 .* 不同$"
+syn match diffBDiffer	"^二元碼檔 .* 與 .* 不同$"
+syn match diffIsA	"^檔案 .* 是.*而檔案 .* 是.*"
+syn match diffNoEOL	"^\\ 檔案末沒有 newline 字元"
+syn match diffCommon	"^.* 和 .* 有共同的副目錄$"
+
+endif
+
+
+syn match diffRemoved	"^-.*"
+syn match diffRemoved	"^<.*"
+syn match diffAdded	"^+.*"
+syn match diffAdded	"^>.*"
+syn match diffChanged	"^! .*"
+
+syn match diffSubname	" @@..*"ms=s+3 contained
+syn match diffLine	"^@.*" contains=diffSubname
+syn match diffLine	"^\<\d\+\>.*"
+syn match diffLine	"^\*\*\*\*.*"
+syn match diffLine	"^---$"
+
+" Some versions of diff have lines like "#c#" and "#d#" (where # is a number)
+syn match diffLine	"^\d\+\(,\d\+\)\=[cda]\d\+\>.*"
+
+syn match diffFile	"^diff\>.*"
+syn match diffFile	"^+++ .*"
+syn match diffFile	"^Index: .*"
+syn match diffFile	"^==== .*"
+syn match diffOldFile	"^\*\*\* .*"
+syn match diffNewFile	"^--- .*"
+
+" Used by git
+syn match diffIndexLine	"^index \x\x\x\x.*"
+
+syn match diffComment	"^#.*"
+
+" Define the default highlighting.
+" Only used when an item doesn't have highlighting yet
+hi def link diffOldFile		diffFile
+hi def link diffNewFile		diffFile
+hi def link diffIndexLine	PreProc
+hi def link diffFile		Type
+hi def link diffOnly		Constant
+hi def link diffIdentical	Constant
+hi def link diffDiffer		Constant
+hi def link diffBDiffer		Constant
+hi def link diffIsA		Constant
+hi def link diffNoEOL		Constant
+hi def link diffCommon		Constant
+hi def link diffRemoved		Special
+hi def link diffChanged		PreProc
+hi def link diffAdded		Identifier
+hi def link diffLine		Statement
+hi def link diffSubname		PreProc
+hi def link diffComment		Comment
+
+let b:current_syntax = "diff"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/dircolors.vim b/syntax/dircolors.vim
new file mode 100644
index 000000000..00758289b
--- /dev/null
+++ b/syntax/dircolors.vim
@@ -0,0 +1,226 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dircolors') == -1
+
+" Vim syntax file
+" Language:        dircolors(1) input file
+" Maintainer:      Jan Larres <jan@majutsushi.net>
+" Previous Maintainer: Nikolai Weibull <now@bitwi.se>
+" Latest Revision: 2018-02-19
+
+if exists("b:current_syntax")
+    finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syntax keyword dircolorsTodo    FIXME TODO XXX NOTE contained
+
+syntax region  dircolorsComment start='#' end='$' contains=dircolorsTodo,@Spell
+
+syntax keyword dircolorsKeyword TERM LEFT LEFTCODE RIGHT RIGHTCODE END ENDCODE
+
+syntax keyword dircolorsKeyword NORMAL NORM FILE RESET DIR LNK LINK SYMLINK
+                              \ MULTIHARDLINK FIFO SOCK DOOR BLK CHR ORPHAN
+                              \ MISSING PIPE BLOCK CHR EXEC SETUID SETGID
+                              \ CAPABILITY STICKY_OTHER_WRITABLE
+                              \ OTHER_WRITABLE STICKY
+
+" Slackware only, ignored by GNU dircolors.
+syntax keyword dircolorsKeyword COLOR OPTIONS EIGHTBIT
+
+syntax match dircolorsExtension '^\s*\zs[.*]\S\+'
+
+syntax match dircolorsEscape '\\[abefnrtv?_\\^#]'
+syntax match dircolorsEscape '\\[0-9]\{3}'
+syntax match dircolorsEscape '\\x[0-9a-f]\{3}'
+
+if !has('gui_running') && &t_Co == ''
+    syntax match dircolorsNumber '\<\d\+\>'
+    highlight default link dircolorsNumber Number
+endif
+
+highlight default link dircolorsTodo      Todo
+highlight default link dircolorsComment   Comment
+highlight default link dircolorsKeyword   Keyword
+highlight default link dircolorsExtension Identifier
+highlight default link dircolorsEscape    Special
+
+function! s:set_guicolors() abort
+    let s:termguicolors = {}
+
+    let s:termguicolors[0]  = "Black"
+    let s:termguicolors[1]  = "DarkRed"
+    let s:termguicolors[2]  = "DarkGreen"
+    let s:termguicolors[3]  = "DarkYellow"
+    let s:termguicolors[4]  = "DarkBlue"
+    let s:termguicolors[5]  = "DarkMagenta"
+    let s:termguicolors[6]  = "DarkCyan"
+    let s:termguicolors[7]  = "Gray"
+    let s:termguicolors[8]  = "DarkGray"
+    let s:termguicolors[9]  = "Red"
+    let s:termguicolors[10] = "Green"
+    let s:termguicolors[11] = "Yellow"
+    let s:termguicolors[12] = "Blue"
+    let s:termguicolors[13] = "Magenta"
+    let s:termguicolors[14] = "Cyan"
+    let s:termguicolors[15] = "White"
+
+    let xterm_palette = ["00", "5f", "87", "af", "d7", "ff"]
+
+    let cur_col = 16
+
+    for r in xterm_palette
+        for g in xterm_palette
+            for b in xterm_palette
+                let s:termguicolors[cur_col] = '#' . r . g . b
+                let cur_col += 1
+            endfor
+        endfor
+    endfor
+
+    for i in range(24)
+        let g = i * 0xa + 8
+        let s:termguicolors[i + 232] = '#' . g . g . g
+    endfor
+endfunction
+
+function! s:get_hi_str(color, place) abort
+    if a:color >= 0 && a:color <= 255
+        if has('gui_running')
+            return ' gui' . a:place . '=' . s:termguicolors[a:color]
+        elseif a:color <= 7 || &t_Co == 256 || &t_Co == 88
+            return ' cterm' . a:place . '=' . a:color
+        endif
+    endif
+    return ''
+endfunction
+
+function! s:get_256color(colors) abort
+    if len(a:colors) >= 2 " May be fewer while editing
+        let [_five, color] = remove(a:colors, 0, 1)
+        if _five != '5' || color == ''
+            return -1
+        else
+            return str2nr(color)
+        endif
+    else
+        return -1
+    endif
+endfunction
+
+function! s:preview_color(linenr) abort
+    let line = getline(a:linenr)
+    let defline = matchlist(line, '^\v([A-Z_]+|[*.]\S+)\s+([0-9;]+)')
+    if empty(defline)
+        return
+    endif
+
+    let colordef = defline[2]
+
+    let colors = split(colordef, ';')
+
+    let hi_str = ''
+    let hi_attrs = []
+    while len(colors) > 0
+        let item = str2nr(remove(colors, 0))
+        if item == 1
+            call add(hi_attrs, 'bold')
+        elseif item == 3
+            call add(hi_attrs, 'italic')
+        elseif item == 4
+            call add(hi_attrs, 'underline')
+        elseif item == 7
+            call add(hi_attrs, 'inverse')
+        elseif item >= 30 && item <= 37
+            " ANSI SGR foreground color
+            let hi_str .= s:get_hi_str(item - 30, 'fg')
+        elseif item >= 40 && item <= 47
+            " ANSI SGR background color
+            let hi_str .= s:get_hi_str(item - 40, 'bg')
+        elseif item >= 90 && item <= 97
+            " ANSI SGR+8 foreground color (xterm 16-color support)
+            let hi_str .= s:get_hi_str(item - 82, 'fg')
+        elseif item >= 100 && item <= 107
+            " ANSI SGR+8 background color (xterm 16-color support)
+            let hi_str .= s:get_hi_str(item - 92, 'bg')
+        elseif item == 38
+            " Foreground for terminals with 88/256 color support
+            let color = s:get_256color(colors)
+            if color == -1
+                break
+            endif
+            let hi_str .= s:get_hi_str(color, 'fg')
+        elseif item == 48
+            " Background for terminals with 88/256 color support
+            let color = s:get_256color(colors)
+            if color == -1
+                break
+            endif
+            let hi_str .= s:get_hi_str(color, 'bg')
+        endif
+    endwhile
+
+    if hi_str == '' && empty(hi_attrs)
+        return
+    endif
+
+    " Check whether we have already defined this color
+    redir => s:currentmatch
+    silent! execute 'syntax list'
+    redir END
+
+    if s:currentmatch !~# '\/\\_s\\zs' . colordef . '\\ze\\_s\/'
+        " Append the buffer number to avoid problems with other dircolors
+        " buffers interfering
+        let bufnr = bufnr('%')
+        execute 'syntax match dircolorsColor' . b:dc_next_index . '_' . bufnr .
+              \ ' "\_s\zs' . colordef . '\ze\_s"'
+        let hi_attrs_str = ''
+        if !empty(hi_attrs)
+            if has('gui_running')
+                let hi_attrs_str = ' gui=' . join(hi_attrs, ',')
+            else
+                let hi_attrs_str = ' cterm=' . join(hi_attrs, ',')
+            endif
+        endif
+        execute 'highlight default dircolorsColor' . b:dc_next_index . '_' .
+              \ bufnr . hi_str . hi_attrs_str
+        let b:dc_next_index += 1
+    endif
+endfunction
+
+" Avoid accumulating too many definitions while editing
+function! s:reset_colors() abort
+    if b:dc_next_index > 0
+        let bufnr = bufnr('%')
+        for i in range(b:dc_next_index)
+            execute 'syntax clear dircolorsColor' . i . '_' . bufnr
+            execute 'highlight clear dircolorsColor' . i . '_' . bufnr
+        endfor
+        let b:dc_next_index = 0
+    endif
+
+    for linenr in range(1, line('$'))
+        call s:preview_color(linenr)
+    endfor
+endfunction
+
+let b:dc_next_index = 0
+
+if has('gui_running')
+    call s:set_guicolors()
+endif
+
+if has('gui_running') || &t_Co != ''
+    call s:reset_colors()
+
+    autocmd CursorMoved,CursorMovedI <buffer> call s:preview_color('.')
+    autocmd CursorHold,CursorHoldI   <buffer> call s:reset_colors()
+endif
+
+let b:current_syntax = "dircolors"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/dnsmasq.vim b/syntax/dnsmasq.vim
new file mode 100644
index 000000000..15f94343f
--- /dev/null
+++ b/syntax/dnsmasq.vim
@@ -0,0 +1,246 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dnsmasq') == -1
+
+" Vim syntax file
+" Maintainer:	Thilo Six
+" Contact:	vim-foo@xk2c-foo.de
+"		:3s+-foo++g
+" Description:	highlight dnsmasq configuration files
+" File:		runtime/syntax/dnsmasq.vim
+" Version:	2.76
+" Last Change:	2015 Sep 27
+" Modeline:	vim: ts=8:sw=2:sts=2:
+"
+" License:	VIM License
+"		Vim is Charityware, see ":help Uganda"
+"
+" Options:	You might want to add this to your vimrc:
+"
+"		if &background == "dark"
+"		    let dnsmasq_backrgound_light = 0
+"		else
+"		    let dnsmasq_backrgound_light = 1
+"		endif
+"
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax") || &compatible
+    finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if !exists("b:dnsmasq_backrgound_light")
+    if exists("dnsmasq_backrgound_light")
+	let b:dnsmasq_backrgound_light = dnsmasq_backrgound_light
+    else
+	let b:dnsmasq_backrgound_light = 0
+    endif
+endif
+
+
+" case on
+syn case match
+
+syn match   DnsmasqValues   "=.*"hs=s+1 contains=DnsmasqComment,DnsmasqSpecial
+syn match   DnsmasqSpecial  display '=\|@\|,\|!\|:'	  nextgroup=DnsmasqValues
+syn match   DnsmasqSpecial  "#"
+
+syn match   DnsmasqIPv4	    "\<\(\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\.\)\{3\}\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\>"	nextgroup=DnsmasqSubnet2,DnsmasqRange
+syn match   DnsmasqSubnet   "\<255.\(\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\.\)\{2\}\(25\_[0-5]\|2\_[0-4]\_[0-9]\|\_[01]\?\_[0-9]\_[0-9]\?\)\>"
+syn match   DnsmasqSubnet2  contained "\/\([0-4]\?[0-9]\)\>"
+syn match   DnsmasqRange    contained "-"
+syn match   DnsmasqMac	    "\<\(\x\x\?:\)\{5}\x\x\?"
+
+syn match   DnsmasqTime	    "\<\(\d\{1,3}\)[hm]\>"
+
+" String
+syn match   DnsmasqString   "\".*\""  contains=@Spell
+syn match   DnsmasqString   "'.*'"    contains=@Spell
+
+" Comments
+syn keyword DnsmasqTodo	    FIXME TODO XXX NOTE contained
+syn match   DnsmasqComment  "\(^\|\s\+\)#.*$"   contains=@Spell,DnsmasqTodo
+
+" highlight trailing spaces
+syn match   DnsmasqTrailSpace	   "[ \t]\+$"
+syn match   DnsmasqTrailSpace	   "[ \t]\+$" containedin=ALL
+
+syn match DnsmasqKeywordSpecial    "\<set\>:"me=e-1
+syn match DnsmasqKeywordSpecial    "\<tag\>:"me=e-1
+syn match DnsmasqKeywordSpecial    ",\<static\>"hs=s+1	  contains=DnsmasqSpecial
+syn match DnsmasqKeywordSpecial    ",\<infinite\>"hs=s+1  contains=DnsmasqSpecial
+syn match DnsmasqKeywordSpecial    "\<encap\>:"me=e-1
+syn match DnsmasqKeywordSpecial    "\<interface\>:"me=e-1
+syn match DnsmasqKeywordSpecial    "\<vi-encap\>:"me=e-1
+syn match DnsmasqKeywordSpecial    "\<net\>:"me=e-1
+syn match DnsmasqKeywordSpecial    "\<vendor\>:"me=e-1
+syn match DnsmasqKeywordSpecial    "\<opt\>:"me=e-1
+syn match DnsmasqKeywordSpecial    "\<option\>:"me=e-1
+syn match DnsmasqKeywordSpecial    ",\<ignore\>"hs=s+1	  contains=DnsmasqSpecial
+syn match DnsmasqKeywordSpecial    "\<id\>:"me=e-1
+
+syn match DnsmasqKeyword    "^\s*add-mac\>"
+syn match DnsmasqKeyword    "^\s*add-subnet\>"
+syn match DnsmasqKeyword    "^\s*addn-hosts\>"
+syn match DnsmasqKeyword    "^\s*address\>"
+syn match DnsmasqKeyword    "^\s*alias\>"
+syn match DnsmasqKeyword    "^\s*all-servers\>"
+syn match DnsmasqKeyword    "^\s*auth-zone\>"
+syn match DnsmasqKeyword    "^\s*bind-dynamic\>"
+syn match DnsmasqKeyword    "^\s*bind-interfaces\>"
+syn match DnsmasqKeyword    "^\s*bogus-nxdomain\>"
+syn match DnsmasqKeyword    "^\s*bogus-priv\>"
+syn match DnsmasqKeyword    "^\s*bootp-dynamic\>"
+syn match DnsmasqKeyword    "^\s*bridge-interface\>"
+syn match DnsmasqKeyword    "^\s*cache-size\>"
+syn match DnsmasqKeyword    "^\s*clear-on-reload\>"
+syn match DnsmasqKeyword    "^\s*cname\>"
+syn match DnsmasqKeyword    "^\s*conf-dir\>"
+syn match DnsmasqKeyword    "^\s*conf-file\>"
+syn match DnsmasqKeyword    "^\s*conntrack\>"
+syn match DnsmasqKeyword    "^\s*dhcp-alternate-port\>"
+syn match DnsmasqKeyword    "^\s*dhcp-authoritative\>"
+syn match DnsmasqKeyword    "^\s*dhcp-boot\>"
+syn match DnsmasqKeyword    "^\s*dhcp-broadcast\>"
+syn match DnsmasqKeyword    "^\s*dhcp-circuitid\>"
+syn match DnsmasqKeyword    "^\s*dhcp-client-update\>"
+syn match DnsmasqKeyword    "^\s*dhcp-duid\>"
+syn match DnsmasqKeyword    "^\s*dhcp-fqdn\>"
+syn match DnsmasqKeyword    "^\s*dhcp-generate-names\>"
+syn match DnsmasqKeyword    "^\s*dhcp-host\>"
+syn match DnsmasqKeyword    "^\s*dhcp-hostsfile\>"
+syn match DnsmasqKeyword    "^\s*dhcp-ignore\>"
+syn match DnsmasqKeyword    "^\s*dhcp-ignore-names\>"
+syn match DnsmasqKeyword    "^\s*dhcp-lease-max\>"
+syn match DnsmasqKeyword    "^\s*dhcp-leasefile\>"
+syn match DnsmasqKeyword    "^\s*dhcp-luascript\>"
+syn match DnsmasqKeyword    "^\s*dhcp-mac\>"
+syn match DnsmasqKeyword    "^\s*dhcp-match\>"
+syn match DnsmasqKeyword    "^\s*dhcp-no-override\>"
+syn match DnsmasqKeyword    "^\s*dhcp-option\>"
+syn match DnsmasqKeyword    "^\s*dhcp-option-force\>"
+syn match DnsmasqKeyword    "^\s*dhcp-optsfile\>"
+syn match DnsmasqKeyword    "^\s*dhcp-proxy\>"
+syn match DnsmasqKeyword    "^\s*dhcp-range\>"
+syn match DnsmasqKeyword    "^\s*dhcp-relay\>"
+syn match DnsmasqKeyword    "^\s*dhcp-remoteid\>"
+syn match DnsmasqKeyword    "^\s*dhcp-script\>"
+syn match DnsmasqKeyword    "^\s*dhcp-scriptuser\>"
+syn match DnsmasqKeyword    "^\s*dhcp-sequential-ip\>"
+syn match DnsmasqKeyword    "^\s*dhcp-subscrid\>"
+syn match DnsmasqKeyword    "^\s*dhcp-userclass\>"
+syn match DnsmasqKeyword    "^\s*dhcp-vendorclass\>"
+syn match DnsmasqKeyword    "^\s*dhcp-hostsdir\>"
+syn match DnsmasqKeyword    "^\s*dns-rr\>"
+syn match DnsmasqKeyword    "^\s*dnssec\>"
+syn match DnsmasqKeyword    "^\s*dnssec-check-unsigned\>"
+syn match DnsmasqKeyword    "^\s*dnssec-no-timecheck\>"
+syn match DnsmasqKeyword    "^\s*dnssec-timestamp\>"
+syn match DnsmasqKeyword    "^\s*dns-forward-max\>"
+syn match DnsmasqKeyword    "^\s*domain\>"
+syn match DnsmasqKeyword    "^\s*domain-needed\>"
+syn match DnsmasqKeyword    "^\s*edns-packet-max\>"
+syn match DnsmasqKeyword    "^\s*enable-dbus\>"
+syn match DnsmasqKeyword    "^\s*enable-ra\>"
+syn match DnsmasqKeyword    "^\s*enable-tftp\>"
+syn match DnsmasqKeyword    "^\s*except-interface\>"
+syn match DnsmasqKeyword    "^\s*expand-hosts\>"
+syn match DnsmasqKeyword    "^\s*filterwin2k\>"
+syn match DnsmasqKeyword    "^\s*group\>"
+syn match DnsmasqKeyword    "^\s*host-record\>"
+syn match DnsmasqKeyword    "^\s*interface\>"
+syn match DnsmasqKeyword    "^\s*interface-name\>"
+syn match DnsmasqKeyword    "^\s*ipset\>"
+syn match DnsmasqKeyword    "^\s*ignore-address\>"
+syn match DnsmasqKeyword    "^\s*keep-in-foreground\>"
+syn match DnsmasqKeyword    "^\s*leasefile-ro\>"
+syn match DnsmasqKeyword    "^\s*listen-address\>"
+syn match DnsmasqKeyword    "^\s*local\>"
+syn match DnsmasqKeyword    "^\s*localmx\>"
+syn match DnsmasqKeyword    "^\s*local-ttl\>"
+syn match DnsmasqKeyword    "^\s*local-service\>"
+syn match DnsmasqKeyword    "^\s*localise-queries\>"
+syn match DnsmasqKeyword    "^\s*log-async\>"
+syn match DnsmasqKeyword    "^\s*log-dhcp\>"
+syn match DnsmasqKeyword    "^\s*log-facility\>"
+syn match DnsmasqKeyword    "^\s*log-queries\>"
+syn match DnsmasqKeyword    "^\s*max-ttl\>"
+syn match DnsmasqKeyword    "^\s*max-cache-ttl\>"
+syn match DnsmasqKeyword    "^\s*min-cache-ttl\>"
+syn match DnsmasqKeyword    "^\s*min-port\>"
+syn match DnsmasqKeyword    "^\s*mx-host\>"
+syn match DnsmasqKeyword    "^\s*mx-target\>"
+syn match DnsmasqKeyword    "^\s*naptr-record\>"
+syn match DnsmasqKeyword    "^\s*neg-ttl\>"
+syn match DnsmasqKeyword    "^\s*no-daemon\>"
+syn match DnsmasqKeyword    "^\s*no-dhcp-interface\>"
+syn match DnsmasqKeyword    "^\s*no-hosts\>"
+syn match DnsmasqKeyword    "^\s*no-negcache\>"
+syn match DnsmasqKeyword    "^\s*no-ping\>"
+syn match DnsmasqKeyword    "^\s*no-poll\>"
+syn match DnsmasqKeyword    "^\s*no-resolv\>"
+syn match DnsmasqKeyword    "^\s*pid-file\>"
+syn match DnsmasqKeyword    "^\s*port\>"
+syn match DnsmasqKeyword    "^\s*proxy-dnssec\>"
+syn match DnsmasqKeyword    "^\s*ptr-record\>"
+syn match DnsmasqKeyword    "^\s*pxe-prompt\>"
+syn match DnsmasqKeyword    "^\s*pxe-service\>"
+syn match DnsmasqKeyword    "^\s*query-port\>"
+syn match DnsmasqKeyword    "^\s*quiet-ra\>"
+syn match DnsmasqKeyword    "^\s*quiet-dhcp\>"
+syn match DnsmasqKeyword    "^\s*quiet-dhcp6\>"
+syn match DnsmasqKeyword    "^\s*ra-param\>"
+syn match DnsmasqKeyword    "^\s*read-ethers\>"
+syn match DnsmasqKeyword    "^\s*rebind-domain-ok\>"
+syn match DnsmasqKeyword    "^\s*rebind-localhost-ok\>"
+syn match DnsmasqKeyword    "^\s*resolv-file\>"
+syn match DnsmasqKeyword    "^\s*rev-server\>"
+syn match DnsmasqKeyword    "^\s*selfmx\>"
+syn match DnsmasqKeyword    "^\s*server\>"
+syn match DnsmasqKeyword    "^\s*servers-file\>"
+syn match DnsmasqKeyword    "^\s*srv-host\>"
+syn match DnsmasqKeyword    "^\s*stop-dns-rebind\>"
+syn match DnsmasqKeyword    "^\s*strict-order\>"
+syn match DnsmasqKeyword    "^\s*synth-domain\>"
+syn match DnsmasqKeyword    "^\s*tag-if\>"
+syn match DnsmasqKeyword    "^\s*test\>"
+syn match DnsmasqKeyword    "^\s*tftp-max\>"
+syn match DnsmasqKeyword    "^\s*tftp-lowercase\>"
+syn match DnsmasqKeyword    "^\s*tftp-no-blocksize\>"
+syn match DnsmasqKeyword    "^\s*tftp-no-fail\>"
+syn match DnsmasqKeyword    "^\s*tftp-port-range\>"
+syn match DnsmasqKeyword    "^\s*tftp-root\>"
+syn match DnsmasqKeyword    "^\s*tftp-secure\>"
+syn match DnsmasqKeyword    "^\s*tftp-unique-root\>"
+syn match DnsmasqKeyword    "^\s*txt-record\>"
+syn match DnsmasqKeyword    "^\s*user\>"
+syn match DnsmasqKeyword    "^\s*version\>"
+
+
+if b:dnsmasq_backrgound_light == 1
+    hi def DnsmasqKeyword	ctermfg=DarkGreen guifg=DarkGreen
+else
+    hi def link DnsmasqKeyword  Keyword
+endif
+hi def link DnsmasqKeywordSpecial Type
+hi def link DnsmasqTodo		Todo
+hi def link DnsmasqSpecial	Constant
+hi def link DnsmasqIPv4		Identifier
+hi def link DnsmasqSubnet2	DnsmasqSubnet
+hi def link DnsmasqSubnet	DnsmasqMac
+hi def link DnsmasqRange	DnsmasqMac
+hi def link DnsmasqMac		Preproc
+hi def link DnsmasqTime		Preproc
+hi def link DnsmasqComment	Comment
+hi def link DnsmasqTrailSpace	DiffDelete
+hi def link DnsmasqString	Constant
+hi def link DnsmasqValues	Normal
+
+let b:current_syntax = "dnsmasq"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+
+endif
diff --git a/syntax/dosbatch.vim b/syntax/dosbatch.vim
new file mode 100644
index 000000000..5145062a2
--- /dev/null
+++ b/syntax/dosbatch.vim
@@ -0,0 +1,151 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosbatch') == -1
+
+" Vim syntax file
+" Language:	MSDOS batch file (with NT command extensions)
+" Maintainer:	Mike Williams <mrw@eandem.co.uk>
+" Filenames:    *.bat
+" Last Change:	6th September 2009
+" Web Page:     http://www.eandem.co.uk/mrw/vim
+"
+" Options Flags:
+" dosbatch_cmdextversion	- 1 = Windows NT, 2 = Windows 2000 [default]
+"
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Set default highlighting to Win2k
+if !exists("dosbatch_cmdextversion")
+  let dosbatch_cmdextversion = 2
+endif
+
+" DOS bat files are case insensitive but case preserving!
+syn case ignore
+
+syn keyword dosbatchTodo contained	TODO
+
+" Dosbat keywords
+syn keyword dosbatchStatement	goto call exit
+syn keyword dosbatchConditional	if else
+syn keyword dosbatchRepeat	for
+
+" Some operators - first lot are case sensitive!
+syn case match
+syn keyword dosbatchOperator    EQU NEQ LSS LEQ GTR GEQ
+syn case ignore
+syn match dosbatchOperator      "\s[-+\*/%!~]\s"
+syn match dosbatchOperator      "="
+syn match dosbatchOperator      "[-+\*/%]="
+syn match dosbatchOperator      "\s\(&\||\|^\|<<\|>>\)=\=\s"
+syn match dosbatchIfOperator    "if\s\+\(\(not\)\=\s\+\)\=\(exist\|defined\|errorlevel\|cmdextversion\)\="lc=2
+
+" String - using "'s is a convenience rather than a requirement outside of FOR
+syn match dosbatchString	"\"[^"]*\"" contains=dosbatchVariable,dosBatchArgument,dosbatchSpecialChar,@dosbatchNumber,@Spell
+syn match dosbatchString	"\<echo\([^)>|]\|\^\@<=[)>|]\)*"lc=4 contains=dosbatchVariable,dosbatchArgument,dosbatchSpecialChar,@dosbatchNumber,@Spell
+syn match dosbatchEchoOperator  "\<echo\s\+\(on\|off\)\s*$"lc=4
+
+" For embedded commands
+syn match dosbatchCmd		"(\s*'[^']*'"lc=1 contains=dosbatchString,dosbatchVariable,dosBatchArgument,@dosbatchNumber,dosbatchImplicit,dosbatchStatement,dosbatchConditional,dosbatchRepeat,dosbatchOperator
+
+" Numbers - surround with ws to not include in dir and filenames
+syn match dosbatchInteger       "[[:space:]=(/:,!~-]\d\+"lc=1
+syn match dosbatchHex		"[[:space:]=(/:,!~-]0x\x\+"lc=1
+syn match dosbatchBinary	"[[:space:]=(/:,!~-]0b[01]\+"lc=1
+syn match dosbatchOctal		"[[:space:]=(/:,!~-]0\o\+"lc=1
+syn cluster dosbatchNumber      contains=dosbatchInteger,dosbatchHex,dosbatchBinary,dosbatchOctal
+
+" Command line switches
+syn match dosbatchSwitch	"/\(\a\+\|?\)"
+
+" Various special escaped char formats
+syn match dosbatchSpecialChar   "\^[&|()<>^]"
+syn match dosbatchSpecialChar   "\$[a-hl-npqstv_$+]"
+syn match dosbatchSpecialChar   "%%"
+
+" Environment variables
+syn match dosbatchIdentifier    contained "\s\h\w*\>"
+syn match dosbatchVariable	"%\h\w*%"
+syn match dosbatchVariable	"%\h\w*:\*\=[^=]*=[^%]*%"
+syn match dosbatchVariable	"%\h\w*:\~[-]\=\d\+\(,[-]\=\d\+\)\=%" contains=dosbatchInteger
+syn match dosbatchVariable	"!\h\w*!"
+syn match dosbatchVariable	"!\h\w*:\*\=[^=]*=[^!]*!"
+syn match dosbatchVariable	"!\h\w*:\~[-]\=\d\+\(,[-]\=\d\+\)\=!" contains=dosbatchInteger
+syn match dosbatchSet		"\s\h\w*[+-]\==\{-1}" contains=dosbatchIdentifier,dosbatchOperator
+
+" Args to bat files and for loops, etc
+syn match dosbatchArgument	"%\(\d\|\*\)"
+syn match dosbatchArgument	"%[a-z]\>"
+if dosbatch_cmdextversion == 1
+  syn match dosbatchArgument	"%\~[fdpnxs]\+\(\($PATH:\)\=[a-z]\|\d\)\>"
+else
+  syn match dosbatchArgument	"%\~[fdpnxsatz]\+\(\($PATH:\)\=[a-z]\|\d\)\>"
+endif
+
+" Line labels
+syn match dosbatchLabel		"^\s*:\s*\h\w*\>"
+syn match dosbatchLabel		"\<\(goto\|call\)\s\+:\h\w*\>"lc=4
+syn match dosbatchLabel		"\<goto\s\+\h\w*\>"lc=4
+syn match dosbatchLabel		":\h\w*\>"
+
+" Comments - usual rem but also two colons as first non-space is an idiom
+syn match dosbatchComment	"^rem\($\|\s.*$\)"lc=3 contains=dosbatchTodo,dosbatchSpecialChar,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
+syn match dosbatchComment	"^@rem\($\|\s.*$\)"lc=4 contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
+syn match dosbatchComment	"\srem\($\|\s.*$\)"lc=4 contains=dosbatchTodo,dosbatchSpecialChar,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
+syn match dosbatchComment	"\s@rem\($\|\s.*$\)"lc=5 contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
+syn match dosbatchComment	"\s*:\s*:.*$" contains=dosbatchTodo,dosbatchSpecialChar,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
+
+" Comments in ()'s - still to handle spaces before rem
+syn match dosbatchComment	"(rem\([^)]\|\^\@<=)\)*"lc=4 contains=dosbatchTodo,@dosbatchNumber,dosbatchVariable,dosbatchArgument,@Spell
+
+syn keyword dosbatchImplicit    append assoc at attrib break cacls cd chcp chdir
+syn keyword dosbatchImplicit    chkdsk chkntfs cls cmd color comp compact convert copy
+syn keyword dosbatchImplicit    date del dir diskcomp diskcopy doskey echo endlocal
+syn keyword dosbatchImplicit    erase fc find findstr format ftype
+syn keyword dosbatchImplicit    graftabl help keyb label md mkdir mode more move
+syn keyword dosbatchImplicit    path pause popd print prompt pushd rd recover rem
+syn keyword dosbatchImplicit    ren rename replace restore rmdir set setlocal shift
+syn keyword dosbatchImplicit    sort start subst time title tree type ver verify
+syn keyword dosbatchImplicit    vol xcopy
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link dosbatchTodo		Todo
+
+hi def link dosbatchStatement	Statement
+hi def link dosbatchCommands	dosbatchStatement
+hi def link dosbatchLabel		Label
+hi def link dosbatchConditional	Conditional
+hi def link dosbatchRepeat		Repeat
+
+hi def link dosbatchOperator       Operator
+hi def link dosbatchEchoOperator   dosbatchOperator
+hi def link dosbatchIfOperator     dosbatchOperator
+
+hi def link dosbatchArgument	Identifier
+hi def link dosbatchIdentifier     Identifier
+hi def link dosbatchVariable	dosbatchIdentifier
+
+hi def link dosbatchSpecialChar	SpecialChar
+hi def link dosbatchString		String
+hi def link dosbatchNumber		Number
+hi def link dosbatchInteger	dosbatchNumber
+hi def link dosbatchHex		dosbatchNumber
+hi def link dosbatchBinary		dosbatchNumber
+hi def link dosbatchOctal		dosbatchNumber
+
+hi def link dosbatchComment	Comment
+hi def link dosbatchImplicit	Function
+
+hi def link dosbatchSwitch		Special
+
+hi def link dosbatchCmd		PreProc
+
+
+let b:current_syntax = "dosbatch"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/dot.vim b/syntax/dot.vim
new file mode 100644
index 000000000..cf8899c19
--- /dev/null
+++ b/syntax/dot.vim
@@ -0,0 +1,101 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dot') == -1
+
+" Vim syntax file
+" Language:     Dot
+" Filenames:    *.dot
+" Maintainer:   Markus Mottl  <markus.mottl@gmail.com>
+" URL:          http://www.ocaml.info/vim/syntax/dot.vim
+" Last Change:  2011 May 17 - improved identifier matching + two new keywords
+"               2001 May 04 - initial version
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Errors
+syn match    dotParErr     ")"
+syn match    dotBrackErr   "]"
+syn match    dotBraceErr   "}"
+
+" Enclosing delimiters
+syn region   dotEncl transparent matchgroup=dotParEncl start="(" matchgroup=dotParEncl end=")" contains=ALLBUT,dotParErr
+syn region   dotEncl transparent matchgroup=dotBrackEncl start="\[" matchgroup=dotBrackEncl end="\]" contains=ALLBUT,dotBrackErr
+syn region   dotEncl transparent matchgroup=dotBraceEncl start="{" matchgroup=dotBraceEncl end="}" contains=ALLBUT,dotBraceErr
+
+" Comments
+syn region   dotComment start="//" end="$" contains=dotComment,dotTodo
+syn region   dotComment start="/\*" end="\*/" contains=dotComment,dotTodo
+syn keyword  dotTodo contained TODO FIXME XXX
+
+" Strings
+syn region   dotString    start=+"+ skip=+\\\\\|\\"+ end=+"+
+
+" General keywords
+syn keyword  dotKeyword  digraph node edge subgraph
+
+" Graph attributes
+syn keyword  dotType center layers margin mclimit name nodesep nslimit
+syn keyword  dotType ordering page pagedir rank rankdir ranksep ratio
+syn keyword  dotType rotate size
+
+" Node attributes
+syn keyword  dotType distortion fillcolor fontcolor fontname fontsize
+syn keyword  dotType height layer orientation peripheries regular
+syn keyword  dotType shape shapefile sides skew width
+
+" Edge attributes
+syn keyword  dotType arrowhead arrowsize arrowtail constraint decorateP
+syn keyword  dotType dir headclip headlabel headport labelangle labeldistance
+syn keyword  dotType labelfontcolor labelfontname labelfontsize
+syn keyword  dotType minlen port_label_distance samehead sametail
+syn keyword  dotType tailclip taillabel tailport weight
+
+" Shared attributes (graphs, nodes, edges)
+syn keyword  dotType color
+
+" Shared attributes (graphs and edges)
+syn keyword  dotType bgcolor label URL
+
+" Shared attributes (nodes and edges)
+syn keyword  dotType fontcolor fontname fontsize layer style
+
+" Special chars
+syn match    dotKeyChar  "="
+syn match    dotKeyChar  ";"
+syn match    dotKeyChar  "->"
+
+" Identifier
+syn match    dotIdentifier /\<\w\+\(:\w\+\)\?\>/
+
+" Synchronization
+syn sync minlines=50
+syn sync maxlines=500
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link dotParErr	 Error
+hi def link dotBraceErr	 Error
+hi def link dotBrackErr	 Error
+
+hi def link dotComment	 Comment
+hi def link dotTodo	 Todo
+
+hi def link dotParEncl	 Keyword
+hi def link dotBrackEncl	 Keyword
+hi def link dotBraceEncl	 Keyword
+
+hi def link dotKeyword	 Keyword
+hi def link dotType	 Type
+hi def link dotKeyChar	 Keyword
+
+hi def link dotString	 String
+hi def link dotIdentifier	 Identifier
+
+
+let b:current_syntax = "dot"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/dracula.vim b/syntax/dracula.vim
new file mode 100644
index 000000000..a8feff9f9
--- /dev/null
+++ b/syntax/dracula.vim
@@ -0,0 +1,76 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dracula') == -1
+
+" Vim syntax file
+" Language:	Dracula
+" Maintainer:	Scott Bordelon <slb@artisan.com>
+" Last change:  Wed Apr 25 18:50:01 PDT 2001
+" Extensions:   drac.*,*.drac,*.drc,*.lvs,*.lpe
+" Comment:      Dracula is an industry-standard language created by CADENCE (a
+"		company specializing in Electronics Design Automation), for
+"		the purposes of Design Rule Checking, Layout vs. Schematic
+"		verification, and Layout Parameter Extraction.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Ignore case
+syn case ignore
+
+" A bunch of useful Dracula keywords
+
+"syn match   draculaIdentifier
+
+syn keyword draculaStatement   indisk primary outdisk printfile system
+syn keyword draculaStatement   mode scale resolution listerror keepdata
+syn keyword draculaStatement   datatype by lt gt output label range touch
+syn keyword draculaStatement   inside outside within overlap outlib
+syn keyword draculaStatement   schematic model unit parset
+syn match   draculaStatement   "flag-\(non45\|acuteangle\|offgrid\)"
+syn match   draculaStatement   "text-pri-only"
+syn match   draculaStatement   "[=&]"
+syn match   draculaStatement   "\[[^,]*\]"
+syn match   draculastatement   "^ *\(sel\|width\|ext\|enc\|area\|shrink\|grow\|length\)"
+syn match   draculastatement   "^ *\(or\|not\|and\|select\|size\|connect\|sconnect\|int\)"
+syn match   draculastatement   "^ *\(softchk\|stamp\|element\|parasitic cap\|attribute cap\)"
+syn match   draculastatement   "^ *\(flagnon45\|lextract\|equation\|lpeselect\|lpechk\|attach\)"
+syn match   draculaStatement   "\(temporary\|connect\)-layer"
+syn match   draculaStatement   "program-dir"
+syn match   draculaStatement   "status-command"
+syn match   draculaStatement   "batch-queue"
+syn match   draculaStatement   "cnames-csen"
+syn match   draculaStatement   "filter-lay-opt"
+syn match   draculaStatement   "filter-sch-opt"
+syn match   draculaStatement   "power-node"
+syn match   draculaStatement   "ground-node"
+syn match   draculaStatement   "subckt-name"
+
+syn match   draculaType		"\*description"
+syn match   draculaType		"\*input-layer"
+syn match   draculaType		"\*operation"
+syn match   draculaType		"\*end"
+
+syn match   draculaComment ";.*"
+
+syn match   draculaPreProc "^#.*"
+
+"Modify the following as needed.  The trade-off is performance versus
+"functionality.
+syn sync lines=50
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link draculaIdentifier Identifier
+hi def link draculaStatement  Statement
+hi def link draculaType       Type
+hi def link draculaComment    Comment
+hi def link draculaPreProc    PreProc
+
+
+let b:current_syntax = "dracula"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/dsl.vim b/syntax/dsl.vim
new file mode 100644
index 000000000..68872114a
--- /dev/null
+++ b/syntax/dsl.vim
@@ -0,0 +1,42 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dsl') == -1
+
+" Vim syntax file
+" Language:	DSSSL
+" Maintainer:	Johannes Zellner <johannes@zellner.org>
+" Last Change:	Tue, 27 Apr 2004 14:54:59 CEST
+" Filenames:	*.dsl
+" $Id: dsl.vim,v 1.1 2004/06/13 19:13:31 vimboss Exp $
+
+if exists("b:current_syntax") | finish | endif
+
+runtime syntax/xml.vim
+syn cluster xmlRegionHook add=dslRegion,dslComment
+syn cluster xmlCommentHook add=dslCond
+
+" EXAMPLE:
+"   <![ %output.html; [
+"     <!-- some comment -->
+"     (define html-manifest #f)
+"   ]]>
+"
+" NOTE: 'contains' the same as xmlRegion, except xmlTag / xmlEndTag
+syn region  dslCond matchgroup=dslCondDelim start="\[\_[^[]\+\[" end="]]" contains=xmlCdata,@xmlRegionCluster,xmlComment,xmlEntity,xmlProcessing,@xmlRegionHook
+
+" NOTE, that dslRegion and dslComment do both NOT have a 'contained'
+" argument, so this will also work in plain dsssl documents.
+
+syn region dslRegion matchgroup=Delimiter start=+(+ end=+)+ contains=dslRegion,dslString,dslComment
+syn match dslString +"\_[^"]*"+ contained
+syn match dslComment +;.*$+ contains=dslTodo
+syn keyword dslTodo contained TODO FIXME XXX display
+
+" The default highlighting.
+hi def link dslTodo		Todo
+hi def link dslString		String
+hi def link dslComment		Comment
+" compare the following with xmlCdataStart / xmlCdataEnd
+hi def link dslCondDelim	Type
+
+let b:current_syntax = "dsl"
+
+endif
diff --git a/syntax/dtd.vim b/syntax/dtd.vim
new file mode 100644
index 000000000..e78fb5e0c
--- /dev/null
+++ b/syntax/dtd.vim
@@ -0,0 +1,165 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dtd') == -1
+
+" Vim syntax file
+" Language: DTD (Document Type Definition for XML)
+" Maintainer: Christian Brabandt <cb@256bit.org>
+" Repository: https://github.com/chrisbra/vim-xml-ftplugin
+" Previous Maintainer: Johannes Zellner <johannes@zellner.org>
+" Author: Daniel Amyot <damyot@site.uottawa.ca>
+" Last Changed:	Sept 24, 2019
+" Filenames: *.dtd
+"
+" REFERENCES:
+"   http://www.w3.org/TR/html40/
+"   http://www.w3.org/TR/NOTE-html-970421
+"
+" TODO:
+"   - improve synchronizing.
+
+if exists("b:current_syntax")
+    finish
+endif
+let s:dtd_cpo_save = &cpo
+set cpo&vim
+
+if !exists("dtd_ignore_case")
+    " I prefer having the case takes into consideration.
+    syn case match
+else
+    syn case ignore
+endif
+
+
+" the following line makes the opening <! and
+" closing > highlighted using 'dtdFunction'.
+"
+" PROVIDES: @dtdTagHook
+"
+syn region dtdTag matchgroup=dtdFunction
+    \ start=+<!+ end=+>+ matchgroup=NONE
+    \ contains=dtdTag,dtdTagName,dtdError,dtdComment,dtdString,dtdAttrType,dtdAttrDef,dtdEnum,dtdParamEntityInst,dtdParamEntityDecl,dtdCard,@dtdTagHook
+
+if !exists("dtd_no_tag_errors")
+    " mark everything as an error which starts with a <!
+    " and is not overridden later. If this is annoying,
+    " it can be switched off by setting the variable
+    " dtd_no_tag_errors.
+    syn region dtdError contained start=+<!+lc=2 end=+>+
+endif
+
+" if this is a html like comment hightlight also
+" the opening <! and the closing > as Comment.
+syn region dtdComment		start=+<![ \t]*--+ end=+-->+ contains=dtdTodo,@Spell
+
+
+" proper DTD comment
+syn region dtdComment contained start=+--+ end=+--+ contains=dtdTodo,@Spell
+
+
+" Start tags (keywords). This is contained in dtdFunction.
+" Note that everything not contained here will be marked
+" as error.
+syn match dtdTagName contained +<!\(ATTLIST\|DOCTYPE\|ELEMENT\|ENTITY\|NOTATION\|SHORTREF\|USEMAP\|\[\)+lc=2,hs=s+2
+
+
+" wildcards and operators
+syn match  dtdCard contained "|"
+syn match  dtdCard contained ","
+" evenutally overridden by dtdEntity
+syn match  dtdCard contained "&"
+syn match  dtdCard contained "?"
+syn match  dtdCard contained "\*"
+syn match  dtdCard contained "+"
+
+" ...and finally, special cases.
+syn match  dtdCard      "ANY"
+syn match  dtdCard      "EMPTY"
+
+if !exists("dtd_no_param_entities")
+
+    " highlight parameter entity declarations
+    " and instances. Note that the closing `;'
+    " is optional.
+
+    " instances
+    syn region dtdParamEntityInst oneline matchgroup=dtdParamEntityPunct
+	\ start="%[-_a-zA-Z0-9.]\+"he=s+1,rs=s+1
+	\ skip=+[-_a-zA-Z0-9.]+
+	\ end=";\|\>"
+	\ matchgroup=NONE contains=dtdParamEntityPunct
+    syn match  dtdParamEntityPunct contained "\."
+
+    " declarations
+    " syn region dtdParamEntityDecl oneline matchgroup=dtdParamEntityDPunct start=+<!ENTITY % +lc=8 skip=+[-_a-zA-Z0-9.]+ matchgroup=NONE end="\>" contains=dtdParamEntityDPunct
+    syn match dtdParamEntityDecl +<!ENTITY % [-_a-zA-Z0-9.]*+lc=8 contains=dtdParamEntityDPunct
+    syn match  dtdParamEntityDPunct contained "%\|\."
+
+endif
+
+" &entities; compare with xml
+syn match   dtdEntity		      "&[^; \t]*;" contains=dtdEntityPunct
+syn match   dtdEntityPunct  contained "[&.;]"
+
+" Strings are between quotes
+syn region dtdString    start=+"+ skip=+\\\\\|\\"+  end=+"+ contains=dtdAttrDef,dtdAttrType,dtdEnum,dtdParamEntityInst,dtdEntity,dtdCard
+syn region dtdString    start=+'+ skip=+\\\\\|\\'+  end=+'+ contains=dtdAttrDef,dtdAttrType,dtdEnum,dtdParamEntityInst,dtdEntity,dtdCard
+
+" Enumeration of elements or data between parenthesis
+"
+" PROVIDES: @dtdEnumHook
+"
+syn region dtdEnum matchgroup=dtdType start="(" end=")" matchgroup=NONE contains=dtdEnum,dtdParamEntityInst,dtdCard,@dtdEnumHook
+
+"Attribute types
+syn keyword dtdAttrType NMTOKEN  ENTITIES  NMTOKENS  ID  CDATA
+syn keyword dtdAttrType IDREF  IDREFS
+" ENTITY has to treated special for not overriding <!ENTITY
+syn match   dtdAttrType +[^!]\<ENTITY+
+
+"Attribute Definitions
+syn match  dtdAttrDef   "#REQUIRED"
+syn match  dtdAttrDef   "#IMPLIED"
+syn match  dtdAttrDef   "#FIXED"
+
+syn case match
+" define some common keywords to mark TODO
+" and important sections inside comments.
+syn keyword dtdTodo contained TODO FIXME XXX
+
+syn sync lines=250
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default highlighting.
+hi def link dtdFunction		Function
+hi def link dtdTag		Normal
+hi def link dtdType		Type
+hi def link dtdAttrType		dtdType
+hi def link dtdAttrDef		dtdType
+hi def link dtdConstant		Constant
+hi def link dtdString		dtdConstant
+hi def link dtdEnum		dtdConstant
+hi def link dtdCard		dtdFunction
+
+hi def link dtdEntity		Statement
+hi def link dtdEntityPunct	dtdType
+hi def link dtdParamEntityInst	dtdConstant
+hi def link dtdParamEntityPunct	dtdType
+hi def link dtdParamEntityDecl	dtdType
+hi def link dtdParamEntityDPunct dtdComment
+
+hi def link dtdComment		Comment
+hi def link dtdTagName		Statement
+hi def link dtdError		Error
+hi def link dtdTodo		Todo
+
+
+let &cpo = s:dtd_cpo_save
+unlet s:dtd_cpo_save
+
+let b:current_syntax = "dtd"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/dts.vim b/syntax/dts.vim
new file mode 100644
index 000000000..4a7579666
--- /dev/null
+++ b/syntax/dts.vim
@@ -0,0 +1,34 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dts') == -1
+
+" Vim syntax file
+" Language:	dts/dtsi (device tree files)
+" Maintainer:	Daniel Mack <vim@zonque.org>
+" Last Change:	2013 Oct 20
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax region dtsComment        start="/\*"  end="\*/"
+syntax match  dtsReference      "&[[:alpha:][:digit:]_]\+"
+syntax region dtsBinaryProperty start="\[" end="\]" 
+syntax match  dtsStringProperty "\".*\""
+syntax match  dtsKeyword        "/.\{-1,\}/"
+syntax match  dtsLabel          "^[[:space:]]*[[:alpha:][:digit:]_]\+:"
+syntax match  dtsNode           /[[:alpha:][:digit:]-_]\+\(@[0-9a-fA-F]\+\|\)[[:space:]]*{/he=e-1
+syntax region dtsCellProperty   start="<" end=">" contains=dtsReference,dtsBinaryProperty,dtsStringProperty,dtsComment
+syntax region dtsCommentInner   start="/\*"  end="\*/"
+syntax match  dtsCommentLine    "//.*$"
+
+hi def link dtsCellProperty     Number
+hi def link dtsBinaryProperty   Number
+hi def link dtsStringProperty   String
+hi def link dtsKeyword          Include
+hi def link dtsLabel            Label
+hi def link dtsNode             Structure
+hi def link dtsReference        Macro
+hi def link dtsComment          Comment
+hi def link dtsCommentInner     Comment 
+hi def link dtsCommentLine      Comment
+
+endif
diff --git a/syntax/dylan.vim b/syntax/dylan.vim
new file mode 100644
index 000000000..acf802b98
--- /dev/null
+++ b/syntax/dylan.vim
@@ -0,0 +1,96 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylan') == -1
+
+" Vim syntax file
+" Language:	Dylan
+" Authors:	Justus Pendleton <justus@acm.org>
+"		Brent A. Fulgham <bfulgham@debian.org>
+" Last Change:	Fri Sep 29 13:45:55 PDT 2000
+"
+" This syntax file is based on the Haskell, Perl, Scheme, and C
+" syntax files.
+
+" Part 1:  Syntax definition
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+setlocal lisp
+
+" Highlight special characters (those that have backslashes) differently
+syn match	dylanSpecial		display contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)"
+
+" Keywords
+syn keyword	dylanBlock		afterwards begin block cleanup end
+syn keyword	dylanClassMods		abstract concrete primary inherited virtual
+syn keyword	dylanException		exception handler signal
+syn keyword	dylanParamDefs		method class function library macro interface
+syn keyword	dylanSimpleDefs		constant variable generic primary
+syn keyword	dylanOther		above below from by in instance local slot subclass then to
+syn keyword	dylanConditional	if when select case else elseif unless finally otherwise then
+syn keyword	dylanRepeat		begin for until while from to
+syn keyword	dylanStatement		define let
+syn keyword	dylanImport		use import export exclude rename create
+syn keyword	dylanMiscMods		open sealed domain singleton sideways inline functional
+
+" Matching rules for special forms
+syn match	dylanOperator		"\s[-!%&\*\+/=\?@\\^|~:]\+[-#!>%&:\*\+/=\?@\\^|~]*"
+syn match	dylanOperator		"\(\<[A-Z][a-zA-Z0-9_']*\.\)\=:[-!#$%&\*\+./=\?@\\^|~:]*"
+" Numbers
+syn match	dylanNumber		"\<[0-9]\+\>\|\<0[xX][0-9a-fA-F]\+\>\|\<0[oO][0-7]\+\>"
+syn match	dylanNumber		"\<[0-9]\+\.[0-9]\+\([eE][-+]\=[0-9]\+\)\=\>"
+" Booleans
+syn match	dylanBoolean		"#t\|#f"
+" Comments
+syn match	dylanComment		"//.*"
+syn region	dylanComment		start="/\*" end="\*/"
+" Strings
+syn region	dylanString		start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=dySpecial
+syn match	dylanCharacter		"'[^\\]'"
+" Constants, classes, and variables
+syn match	dylanConstant		"$\<[a-zA-Z0-9\-]\+\>"
+syn match	dylanClass		"<\<[a-zA-Z0-9\-]\+\>>"
+syn match	dylanVariable		"\*\<[a-zA-Z0-9\-]\+\>\*"
+" Preconditions
+syn region	dylanPrecondit		start="^\s*#\s*\(if\>\|else\>\|endif\>\)" skip="\\$" end="$"
+
+" These appear at the top of files (usually).  I like to highlight the whole line
+" so that the definition stands out.  They should probably really be keywords, but they
+" don't generally appear in the middle of a line of code.
+syn region	dylanHeader	start="^[Mm]odule:" end="^$"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link dylanBlock		PreProc
+hi def link dylanBoolean		Boolean
+hi def link dylanCharacter		Character
+hi def link dylanClass		Structure
+hi def link dylanClassMods		StorageClass
+hi def link dylanComment		Comment
+hi def link dylanConditional	Conditional
+hi def link dylanConstant		Constant
+hi def link dylanException		Exception
+hi def link dylanHeader		Macro
+hi def link dylanImport		Include
+hi def link dylanLabel		Label
+hi def link dylanMiscMods		StorageClass
+hi def link dylanNumber		Number
+hi def link dylanOther		Keyword
+hi def link dylanOperator		Operator
+hi def link dylanParamDefs		Keyword
+hi def link dylanPrecondit		PreCondit
+hi def link dylanRepeat		Repeat
+hi def link dylanSimpleDefs	Keyword
+hi def link dylanStatement		Macro
+hi def link dylanString		String
+hi def link dylanVariable		Identifier
+
+
+let b:current_syntax = "dylan"
+
+" vim:ts=8
+
+endif
diff --git a/syntax/dylanintr.vim b/syntax/dylanintr.vim
new file mode 100644
index 000000000..e8530a9ca
--- /dev/null
+++ b/syntax/dylanintr.vim
@@ -0,0 +1,43 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylanintr') == -1
+
+" Vim syntax file
+" Language:	Dylan
+" Authors:	Justus Pendleton <justus@acm.org>
+" Last Change:	Fri Sep 29 13:53:27 PDT 2000
+"
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+syn region	dylanintrInfo		matchgroup=Statement start="^" end=":" oneline
+syn match	dylanintrInterface	"define interface"
+syn match	dylanintrClass		"<.*>"
+syn region	dylanintrType		start=+"+ skip=+\\\\\|\\"+ end=+"+
+
+syn region	dylanintrIncluded	contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match	dylanintrIncluded	contained "<[^>]*>"
+syn match	dylanintrInclude	"^\s*#\s*include\>\s*["<]" contains=intrIncluded
+
+"syn keyword intrMods pointer struct
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link dylanintrInfo		Special
+hi def link dylanintrInterface	Operator
+hi def link dylanintrMods		Type
+hi def link dylanintrClass		StorageClass
+hi def link dylanintrType		Type
+hi def link dylanintrIncluded	String
+hi def link dylanintrInclude	Include
+
+
+let b:current_syntax = "dylanintr"
+
+" vim:ts=8
+
+endif
diff --git a/syntax/dylanlid.vim b/syntax/dylanlid.vim
new file mode 100644
index 000000000..cf44d1eea
--- /dev/null
+++ b/syntax/dylanlid.vim
@@ -0,0 +1,33 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylanlid') == -1
+
+" Vim syntax file
+" Language:	Dylan Library Interface Files
+" Authors:	Justus Pendleton <justus@acm.org>
+"		Brent Fulgham <bfulgham@debian.org>
+" Last Change:	Fri Sep 29 13:50:20 PDT 2000
+"
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+syn region	dylanlidInfo		matchgroup=Statement start="^" end=":" oneline
+syn region	dylanlidEntry		matchgroup=Statement start=":%" end="$" oneline
+
+syn sync	lines=50
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link dylanlidInfo		Type
+hi def link dylanlidEntry		String
+
+
+let b:current_syntax = "dylanlid"
+
+" vim:ts=8
+
+endif
diff --git a/syntax/ecd.vim b/syntax/ecd.vim
new file mode 100644
index 000000000..3f120981a
--- /dev/null
+++ b/syntax/ecd.vim
@@ -0,0 +1,48 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ecd') == -1
+
+" Vim syntax file
+" Language:	ecd (Embedix Component Description) files
+" Maintainer:	John Beppu <beppu@opensource.lineo.com>
+" URL:		http://opensource.lineo.com/~beppu/prose/ecd_vim.html
+" Last Change:	2001 Sep 27
+
+" An ECD file contains meta-data for packages in the Embedix Linux distro.
+" This syntax file was derived from apachestyle.vim
+" by Christian Hammers <ch@westend.com>
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+" specials
+syn match  ecdComment	"^\s*#.*"
+
+" options and values
+syn match  ecdAttr	"^\s*[a-zA-Z]\S*\s*[=].*$" contains=ecdAttrN,ecdAttrV
+syn match  ecdAttrN	contained "^.*="me=e-1
+syn match  ecdAttrV	contained "=.*$"ms=s+1
+
+" tags
+syn region ecdTag	start=+<+ end=+>+ contains=ecdTagN,ecdTagError
+syn match  ecdTagN	contained +<[/\s]*[-a-zA-Z0-9_]\++ms=s+1
+syn match  ecdTagError	contained "[^>]<"ms=s+1
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link ecdComment	Comment
+hi def link ecdAttr	Type
+hi def link ecdAttrN	Statement
+hi def link ecdAttrV	Value
+hi def link ecdTag		Function
+hi def link ecdTagN	Statement
+hi def link ecdTagError	Error
+
+
+let b:current_syntax = "ecd"
+" vim: ts=8
+
+endif
diff --git a/syntax/edif.vim b/syntax/edif.vim
new file mode 100644
index 000000000..dbea79d93
--- /dev/null
+++ b/syntax/edif.vim
@@ -0,0 +1,49 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'edif') == -1
+
+" Vim syntax file
+" Language:     EDIF (Electronic Design Interchange Format)
+" Maintainer:   Artem Zankovich <z_artem@hotbox.ru>
+" Last Change:  Oct 14, 2002
+"
+" Supported standarts are:
+"   ANSI/EIA Standard 548-1988 (EDIF Version 2 0 0)
+"   IEC 61690-1 (EDIF Version 3 0 0)
+"   IEC 61690-2 (EDIF Version 4 0 0)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword=48-57,-,+,A-Z,a-z,_,&
+
+syn region	edifList	matchgroup=Delimiter start="(" end=")" contains=edifList,edifKeyword,edifString,edifNumber
+
+" Strings
+syn match       edifInStringError    /%/ contained
+syn match       edifInString    /%\s*\d\+\s*%/ contained
+syn region      edifString      start=/"/ end=/"/ contains=edifInString,edifInStringError contained
+
+" Numbers
+syn match       edifNumber      "\<[-+]\=[0-9]\+\>"
+
+" Keywords
+syn match       edifKeyword     "(\@<=\s*[a-zA-Z&][a-zA-Z_0-9]*\>" contained
+
+syn match       edifError       ")"
+
+" synchronization
+syntax sync fromstart
+
+" Define the default highlighting.
+
+hi def link edifInString		SpecialChar
+hi def link edifKeyword		Keyword
+hi def link edifNumber		Number
+hi def link edifInStringError	edifError
+hi def link edifError		Error
+hi def link edifString		String
+
+let b:current_syntax = "edif"
+
+endif
diff --git a/syntax/elinks.vim b/syntax/elinks.vim
new file mode 100644
index 000000000..eb0d840f0
--- /dev/null
+++ b/syntax/elinks.vim
@@ -0,0 +1,192 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elinks') == -1
+
+" Vim syntax file
+" Language:             elinks(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-06-17
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword+=-
+
+syn keyword elinksTodo      contained TODO FIXME XXX NOTE
+
+syn region  elinksComment   display oneline start='#' end='$'
+                            \ contains=elinksTodo,@Spell
+
+syn match   elinksNumber    '\<\d\+\>'
+
+syn region  elinksString    start=+"+ skip=+\\\\\|\\"+ end=+"+
+                            \ contains=@elinksColor
+
+syn keyword elinksKeyword   set bind
+
+syn keyword elinksPrefix    bookmarks
+syn keyword elinksOptions   file_format
+
+syn keyword elinksPrefix    config
+syn keyword elinksOptions   comments indentation saving_style i18n
+                            \ saving_style_w show_template
+
+syn keyword elinksPrefix    connection ssl client_cert
+syn keyword elinksOptions   enable file cert_verify async_dns max_connections
+                            \ max_connections_to_host receive_timeout retries
+                            \ unrestartable_receive_timeout
+
+syn keyword elinksPrefix    cookies
+syn keyword elinksOptions   accept_policy max_age paranoid_security save resave
+
+syn keyword elinksPrefix    document browse accesskey forms images links
+syn keyword elinksPrefix    active_link colors search cache codepage colors
+syn keyword elinksPrefix    format memory download dump history global html
+syn keyword elinksPrefix    plain
+syn keyword elinksOptions   auto_follow priority auto_submit confirm_submit
+                            \ input_size show_formhist file_tags
+                            \ image_link_tagging image_link_prefix
+                            \ image_link_suffix show_as_links
+                            \ show_any_as_links background text enable_color
+                            \ bold invert underline color_dirs numbering
+                            \ use_tabindex number_keys_select_link
+                            \ wraparound case regex show_hit_top_bottom
+                            \ wraparound show_not_found margin_width refresh
+                            \ minimum_refresh_time scroll_margin scroll_step
+                            \ table_move_order size size cache_redirects
+                            \ ignore_cache_control assume force_assumed text
+                            \ background link vlink dirs allow_dark_on_black
+                            \ ensure_contrast use_document_colors directory
+                            \ set_original_time overwrite notify_bell
+                            \ codepage width enable max_items display_type
+                            \ write_interval keep_unhistory display_frames
+                            \ display_tables expand_table_columns display_subs
+                            \ display_sups link_display underline_links
+                            \ wrap_nbsp display_links compress_empty_lines
+
+syn keyword elinksPrefix    mime extension handler mailcap mimetypes type
+syn keyword elinksOptions   ask block program enable path ask description
+                            \ prioritize enable path default_type
+
+syn keyword elinksPrefix    protocol file cgi ftp proxy http bugs proxy
+syn keyword elinksPrefix    referer https proxy rewrite dumb smart
+syn keyword elinksOptions   path policy allow_special_files show_hidden_files
+                            \ try_encoding_extensions host anon_passwd
+                            \ use_pasv use_epsv accept_charset allow_blacklist
+                            \ broken_302_redirect post_no_keepalive http10
+                            \ host user passwd policy fake accept_language
+                            \ accept_ui_language trace user_agent host
+                            \ enable-dumb enable-smart
+
+syn keyword elinksPrefix    terminal
+syn keyword elinksOptions   type m11_hack utf_8_io restrict_852 block_cursor
+                            \ colors transparency underline charset
+
+syn keyword elinksPrefix    ui colors color mainmenu normal selected hotkey
+                            \ menu marked hotkey frame dialog generic
+                            \ frame scrollbar scrollbar-selected title text
+                            \ checkbox checkbox-label button button-selected
+                            \ field field-text meter shadow title title-bar
+                            \ title-text status status-bar status-text tabs
+                            \ unvisited normal loading separator searched mono
+syn keyword elinksOptions   text background
+
+syn keyword elinksPrefix    ui dialogs leds sessions tabs timer
+syn keyword elinksOptions   listbox_min_height shadows underline_hotkeys enable
+                            \ auto_save auto_restore auto_save_foldername
+                            \ homepage show_bar wraparound confirm_close
+                            \ enable duration action language show_status_bar
+                            \ show_title_bar startup_goto_dialog
+                            \ success_msgbox window_title
+
+syn keyword elinksOptions   secure_file_saving
+
+syn cluster elinksColor     contains=elinksColorBlack,elinksColorDarkRed,
+                            \ elinksColorDarkGreen,elinksColorDarkYellow,
+                            \ elinksColorDarkBlue,elinksColorDarkMagenta,
+                            \ elinksColorDarkCyan,elinksColorGray,
+                            \ elinksColorDarkGray,elinksColorRed,
+                            \ elinksColorGreen,elinksColorYellow,
+                            \ elinksColorBlue,elinksColorMagenta,
+                            \ elinksColorCyan,elinksColorWhite
+
+syn keyword elinksColorBlack        contained black
+syn keyword elinksColorDarkRed      contained darkred sandybrown maroon crimson
+                                    \ firebrick
+syn keyword elinksColorDarkGreen    contained darkgreen darkolivegreen
+                                    \ darkseagreen forestgreen
+                                    \ mediumspringgreen seagreen
+syn keyword elinksColorDarkYellow   contained brown blanchedalmond chocolate
+                                    \ darkorange darkgoldenrod orange rosybrown
+                                    \ saddlebrown peru olive olivedrab sienna
+syn keyword elinksColorDarkBlue     contained darkblue cadetblue cornflowerblue
+                                    \ darkslateblue deepskyblue midnightblue
+                                    \ royalblue steelblue navy
+syn keyword elinksColorDarkMagenta  contained darkmagenta mediumorchid
+                                    \ mediumpurple mediumslateblue slateblue
+                                    \ deeppink hotpink darkorchid orchid purple
+                                    \ indigo
+syn keyword elinksColorDarkCyan     contained darkcyan mediumaquamarine
+                                    \ mediumturquoise darkturquoise teal
+syn keyword elinksColorGray         contained silver dimgray lightslategray
+                                    \ slategray lightgrey burlywood plum tan
+                                    \ thistle
+syn keyword elinksColorDarkGray     contained gray darkgray darkslategray
+                                    \ darksalmon
+syn keyword elinksColorRed          contained red indianred orangered tomato
+                                    \ lightsalmon salmon coral lightcoral
+syn keyword elinksColorGreen        contained green greenyellow lawngreen
+                                    \ lightgreen lightseagreen limegreen
+                                    \ mediumseagreen springgreen yellowgreen
+                                    \ palegreen lime chartreuse
+syn keyword elinksColorYellow       contained yellow beige darkkhaki
+                                    \ lightgoldenrodyellow palegoldenrod gold
+                                    \ goldenrod khaki lightyellow
+syn keyword elinksColorBlue         contained blue aliceblue aqua aquamarine
+                                    \ azure dodgerblue lightblue lightskyblue
+                                    \ lightsteelblue mediumblue
+syn keyword elinksColorMagenta      contained magenta darkviolet blueviolet
+                                    \ lightpink mediumvioletred palevioletred
+                                    \ violet pink fuchsia
+syn keyword elinksColorCyan         contained cyan lightcyan powderblue skyblue
+                                    \ turquoise paleturquoise
+syn keyword elinksColorWhite        contained white antiquewhite floralwhite
+                                    \ ghostwhite navajowhite whitesmoke linen
+                                    \ lemonchiffon cornsilk lavender
+                                    \ lavenderblush seashell mistyrose ivory
+                                    \ papayawhip bisque gainsboro honeydew
+                                    \ mintcream moccasin oldlace peachpuff snow
+                                    \ wheat
+
+hi def link elinksTodo              Todo
+hi def link elinksComment           Comment
+hi def link elinksNumber            Number
+hi def link elinksString            String
+hi def link elinksKeyword           Keyword
+hi def link elinksPrefix            Identifier
+hi def link elinksOptions           Identifier
+hi def      elinksColorBlack        ctermfg=Black       guifg=Black
+hi def      elinksColorDarkRed      ctermfg=DarkRed     guifg=DarkRed
+hi def      elinksColorDarkGreen    ctermfg=DarkGreen   guifg=DarkGreen
+hi def      elinksColorDarkYellow   ctermfg=DarkYellow  guifg=DarkYellow
+hi def      elinksColorDarkBlue     ctermfg=DarkBlue    guifg=DarkBlue
+hi def      elinksColorDarkMagenta  ctermfg=DarkMagenta guifg=DarkMagenta
+hi def      elinksColorDarkCyan     ctermfg=DarkCyan    guifg=DarkCyan
+hi def      elinksColorGray         ctermfg=Gray        guifg=Gray
+hi def      elinksColorDarkGray     ctermfg=DarkGray    guifg=DarkGray
+hi def      elinksColorRed          ctermfg=Red         guifg=Red
+hi def      elinksColorGreen        ctermfg=Green       guifg=Green
+hi def      elinksColorYellow       ctermfg=Yellow      guifg=Yellow
+hi def      elinksColorBlue         ctermfg=Blue        guifg=Blue
+hi def      elinksColorMagenta      ctermfg=Magenta     guifg=Magenta
+hi def      elinksColorCyan         ctermfg=Cyan        guifg=Cyan
+hi def      elinksColorWhite        ctermfg=White       guifg=White
+
+let b:current_syntax = "elinks"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/elmfilt.vim b/syntax/elmfilt.vim
new file mode 100644
index 000000000..650bc65bf
--- /dev/null
+++ b/syntax/elmfilt.vim
@@ -0,0 +1,62 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elmfilt') == -1
+
+" Vim syntax file
+" Language:	Elm Filter rules
+" Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Last Change:	Aug 31, 2016
+" Version:	9
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_ELMFILT
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn cluster elmfiltIfGroup	contains=elmfiltCond,elmfiltOper,elmfiltOperKey,,elmfiltNumber,elmfiltOperKey
+
+syn match	elmfiltParenError	"[()]"
+syn match	elmfiltMatchError	"/"
+syn region	elmfiltIf	start="\<if\>" end="\<then\>"	contains=elmfiltParen,elmfiltParenError skipnl skipwhite nextgroup=elmfiltAction
+syn region	elmfiltParen	contained	matchgroup=Delimiter start="(" matchgroup=Delimiter end=")"	contains=elmfiltParen,@elmfiltIfGroup,elmfiltThenError
+syn region	elmfiltMatch	contained	matchgroup=Delimiter start="/" skip="\\/" matchgroup=Delimiter end="/"	skipnl skipwhite nextgroup=elmfiltOper,elmfiltOperKey
+syn match	elmfiltThenError	"\<then.*$"
+syn match	elmfiltComment	"^#.*$"		contains=@Spell
+
+syn keyword	elmfiltAction	contained	delete execute executec forward forwardc leave save savecopy skipnl skipwhite nextgroup=elmfiltString
+syn match	elmfiltArg	contained	"[^\\]%[&0-9dDhmrsSty&]"lc=1
+
+syn match	elmfiltOperKey	contained	"\<contains\>"			skipnl skipwhite nextgroup=elmfiltString
+syn match	elmfiltOperKey	contained	"\<matches\s"			nextgroup=elmfiltMatch,elmfiltSpaceError
+syn keyword	elmfiltCond	contained	cc bcc lines always subject sender from to lines received	skipnl skipwhite nextgroup=elmfiltString
+syn match	elmfiltNumber	contained	"\d\+"
+syn keyword	elmfiltOperKey	contained	and not				skipnl skipwhite nextgroup=elmfiltOper,elmfiltOperKey,elmfiltString
+syn match	elmfiltOper	contained	"\~"				skipnl skipwhite nextgroup=elmfiltMatch
+syn match	elmfiltOper	contained	"<=\|>=\|!=\|<\|<\|="		skipnl skipwhite nextgroup=elmfiltString,elmfiltCond,elmfiltOperKey
+syn region	elmfiltString	contained	start='"' skip='"\(\\\\\)*\\["%]' end='"'	contains=elmfiltArg skipnl skipwhite nextgroup=elmfiltOper,elmfiltOperKey,@Spell
+syn region	elmfiltString	contained	start="'" skip="'\(\\\\\)*\\['%]" end="'"	contains=elmfiltArg skipnl skipwhite nextgroup=elmfiltOper,elmfiltOperKey,@Spell
+syn match	elmfiltSpaceError	contained	"\s.*$"
+
+" Define the default highlighting.
+if !exists("skip_elmfilt_syntax_inits")
+
+  hi def link elmfiltAction	Statement
+  hi def link elmfiltArg	Special
+  hi def link elmfiltComment	Comment
+  hi def link elmfiltCond	Statement
+  hi def link elmfiltIf	Statement
+  hi def link elmfiltMatch	Special
+  hi def link elmfiltMatchError	Error
+  hi def link elmfiltNumber	Number
+  hi def link elmfiltOper	Operator
+  hi def link elmfiltOperKey	Type
+  hi def link elmfiltParenError	Error
+  hi def link elmfiltSpaceError	Error
+  hi def link elmfiltString	String
+  hi def link elmfiltThenError	Error
+
+endif
+
+let b:current_syntax = "elmfilt"
+" vim: ts=9
+
+endif
diff --git a/syntax/esmtprc.vim b/syntax/esmtprc.vim
new file mode 100644
index 000000000..9bd25923f
--- /dev/null
+++ b/syntax/esmtprc.vim
@@ -0,0 +1,35 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'esmtprc') == -1
+
+" Vim syntax file
+" Language:	Esmtp setup file (based on esmtp 0.5.0)
+" Maintainer:	Kornel Kielczewski <kornel@gazeta.pl>
+" Last Change:	16 Feb 2005
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+"All options
+syntax keyword	esmtprcOptions hostname username password starttls certificate_passphrase preconnect identity mda
+
+"All keywords
+syntax keyword esmtprcIdentifier default enabled disabled required
+
+"We're trying to be smarer than /."*@.*/ :)
+syntax match esmtprcAddress /[a-z0-9_.-]*[a-z0-9]\+@[a-z0-9_.-]*[a-z0-9]\+\.[a-z]\+/
+syntax match esmtprcFulladd /[a-z0-9_.-]*[a-z0-9]\+\.[a-z]\+:[0-9]\+/
+ 
+"String..
+syntax region esmtprcString start=/"/ end=/"/
+
+
+highlight link esmtprcOptions		Label
+highlight link esmtprcString 		String
+highlight link esmtprcAddress		Type
+highlight link esmtprcIdentifier 	Identifier
+highlight link esmtprcFulladd		Include
+
+let b:current_syntax = "esmtprc"
+
+endif
diff --git a/syntax/esqlc.vim b/syntax/esqlc.vim
new file mode 100644
index 000000000..c54802767
--- /dev/null
+++ b/syntax/esqlc.vim
@@ -0,0 +1,62 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'esqlc') == -1
+
+" Vim syntax file
+" Language:	ESQL-C
+" Maintainer:	Jonathan A. George <jageorge@tel.gte.com>
+" Last Change:	2001 May 09
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Read the C++ syntax to start with
+runtime! syntax/cpp.vim
+
+" ESQL-C extentions
+
+syntax keyword esqlcPreProc	EXEC SQL INCLUDE
+
+syntax case ignore
+
+syntax keyword esqlcPreProc	begin end declare section database open execute
+syntax keyword esqlcPreProc	prepare fetch goto continue found sqlerror work
+
+syntax keyword esqlcKeyword	access add as asc by check cluster column
+syntax keyword esqlcKeyword	compress connect current decimal
+syntax keyword esqlcKeyword	desc exclusive file from group
+syntax keyword esqlcKeyword	having identified immediate increment index
+syntax keyword esqlcKeyword	initial into is level maxextents mode modify
+syntax keyword esqlcKeyword	nocompress nowait of offline on online start
+syntax keyword esqlcKeyword	successful synonym table then to trigger uid
+syntax keyword esqlcKeyword	unique user validate values view whenever
+syntax keyword esqlcKeyword	where with option order pctfree privileges
+syntax keyword esqlcKeyword	public resource row rowlabel rownum rows
+syntax keyword esqlcKeyword	session share size smallint
+
+syntax keyword esqlcOperator	not and or
+syntax keyword esqlcOperator	in any some all between exists
+syntax keyword esqlcOperator	like escape
+syntax keyword esqlcOperator	intersect minus
+syntax keyword esqlcOperator	prior distinct
+syntax keyword esqlcOperator	sysdate
+
+syntax keyword esqlcStatement	alter analyze audit comment commit create
+syntax keyword esqlcStatement	delete drop explain grant insert lock noaudit
+syntax keyword esqlcStatement	rename revoke rollback savepoint select set
+syntax keyword esqlcStatement	truncate update
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link esqlcOperator	Operator
+hi def link esqlcStatement	Statement
+hi def link esqlcKeyword	esqlcSpecial
+hi def link esqlcSpecial	Special
+hi def link esqlcPreProc	PreProc
+
+
+let b:current_syntax = "esqlc"
+
+
+endif
diff --git a/syntax/esterel.vim b/syntax/esterel.vim
new file mode 100644
index 000000000..26afe3153
--- /dev/null
+++ b/syntax/esterel.vim
@@ -0,0 +1,82 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'esterel') == -1
+
+" Vim syntax file
+" Language:			ESTEREL
+" Maintainer:		Maurizio Tranchero <maurizio.tranchero@polito.it> - <maurizio.tranchero@gmail.com>
+" Credits:			Luca Necchi	<luca.necchi@polito.it>, Nikos Andrikos <nick.andrik@gmail.com>
+" First Release:	Tue May 17 23:49:39 CEST 2005
+" Last Change:		Tue May  6 13:29:56 CEST 2008
+" Version:			0.8
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" case is significant
+syn case ignore
+" Esterel Regions
+syn region esterelModule					start=/module/		end=/end module/	contains=ALLBUT,esterelModule
+syn region esterelLoop						start=/loop/		end=/end loop/		contains=ALLBUT,esterelModule
+syn region esterelAbort						start=/abort/		end=/when/			contains=ALLBUT,esterelModule
+syn region esterelAbort						start=/weak abort/	end=/when/			contains=ALLBUT,esterelModule
+syn region esterelEvery						start=/every/		end=/end every/		contains=ALLBUT,esterelModule
+syn region esterelIf						start=/if/			end=/end if/		contains=ALLBUT,esterelModule
+syn region esterelConcurrent	transparent start=/\[/			end=/\]/			contains=ALLBUT,esterelModule
+syn region esterelIfThen					start=/if/			end=/then/			oneline
+" Esterel Keywords
+syn keyword esterelIO			input output inputoutput constant
+syn keyword esterelBoolean		and or not xor xnor nor nand
+syn keyword esterelExpressions	mod pre
+syn keyword esterelStatement	nothing halt
+syn keyword esterelStatement	module signal sensor end
+syn keyword esterelStatement	every do loop abort weak
+syn keyword esterelStatement	emit present await
+syn keyword esterelStatement	pause when immediate
+syn keyword esterelStatement	if then else case
+syn keyword esterelStatement	var in  run  suspend
+syn keyword esterelStatement	repeat times combine with
+syn keyword esterelStatement	assert sustain
+" check what it is the following
+syn keyword esterelStatement	relation						
+syn keyword esterelFunctions	function procedure task
+syn keyword esterelSysCall		call trap exit exec
+" Esterel Types
+syn keyword esterelType 		integer float bolean
+" Esterel Comment
+syn match esterelComment		"%.*$"
+" Operators and special characters
+syn match esterelSpecial		":"
+syn match esterelSpecial		"<="
+syn match esterelSpecial		">="
+syn match esterelSpecial		"+"
+syn match esterelSpecial		"-"
+syn match esterelSpecial		"="
+syn match esterelSpecial		";"
+syn match esterelSpecial		"/"
+syn match esterelSpecial		"?"
+syn match esterelOperator		"\["
+syn match esterelOperator		"\]"
+syn match esterelOperator		":="
+syn match esterelOperator		"||"
+syn match esterelStatement		"\<\(if\|else\)\>"
+syn match esterelNone			"\<else\s\+if\>$"
+syn match esterelNone			"\<else\s\+if\>\s"
+
+" Class Linking
+
+hi def link esterelStatement		Statement
+hi def link esterelType			Type
+hi def link esterelComment		Comment
+hi def link esterelBoolean		Number
+hi def link esterelExpressions	Number
+hi def link esterelIO			String
+hi def link esterelOperator		Type
+hi def link esterelSysCall		Type
+hi def link esterelFunctions		Type
+hi def link esterelSpecial		Special
+
+
+let b:current_syntax = "esterel"
+
+endif
diff --git a/syntax/eterm.vim b/syntax/eterm.vim
new file mode 100644
index 000000000..459104826
--- /dev/null
+++ b/syntax/eterm.vim
@@ -0,0 +1,433 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'eterm') == -1
+
+" Vim syntax file
+" Language:             eterm(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-21
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword etermTodo             contained TODO FIXME XXX NOTE
+
+syn region  etermComment          display oneline start='^#' end='$'
+                                  \ contains=etermTodo,@Spell
+
+syn match   etermMagic            display '^<Eterm-[0-9.]\+>$'
+
+syn match   etermNumber           contained display '\<\(\d\+\|0x\x\{1,2}\)\>'
+
+syn region  etermString           contained display oneline start=+"+
+                                  \ skip=+\\"+ end=+"+
+
+syn keyword etermBoolean          contained on off true false yes no
+
+syn keyword etermPreProc          contained appname exec get put random version
+                                  \ include preproc
+
+syn keyword etermFunctions        contained copy exit kill nop paste save
+                                  \ scroll search spawn
+
+syn cluster etermGeneral          contains=etermComment,etermFunction,
+                                  \ etermPreProc
+
+syn keyword etermKeyMod           contained ctrl shift lock mod1 mod2 mod3 mod4
+                                  \ mod5 alt meta anymod
+syn keyword etermKeyMod           contained button1 button2 button3 button4
+                                  \ button5
+
+syn keyword etermColorOptions     contained video nextgroup=etermVideoOptions
+                                  \ skipwhite
+
+syn keyword etermVideoType        contained normal reverse
+
+syn keyword etermColorOptions     contained foreground background cursor
+                                  \ cursor_text pointer
+                                  \ nextgroup=etermColorType skipwhite
+
+syn keyword etermColorType        contained bd ul
+syn match   etermColorType        contained display '\<\%(\d\|1[0-5]\)'
+
+syn keyword etermColorOptions     contained color
+                                  \ nextgroup=etermColorNumber skipwhite
+
+syn keyword etermColorNumber      contained bd ul nextgroup=etermColorSpec
+                                  \ skipwhite
+syn match   etermColorNumber      contained display '\<\%(\d\|1[0-5]\)'
+                                  \ nextgroup=etermColorSpec skipwhite
+
+syn match   etermColorSpec        contained display '\S\+'
+
+syn region  etermColorContext     fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+color\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermColorOptions
+
+syn keyword etermAttrOptions      contained geometry nextgroup=etermGeometry
+                                  \ skipwhite
+
+syn match   etermGeometry         contained display '\d\+x\d++\d\++\d\+'
+
+syn keyword etermAttrOptions      contained scrollbar_type
+                                  \ nextgroup=etermScrollbarType skipwhite
+
+syn keyword etermScrollbarType    contained motif xterm next
+
+syn keyword etermAttrOptions      contained font nextgroup=etermFontType
+                                  \ skipwhite
+
+syn keyword etermFontType         contained bold nextgroup=etermFont skipwhite
+syn match   etermFontType         contained display '[0-5]' nextgroup=etermFont
+                                  \ skipwhite
+
+syn match   etermFont             contained display '\S\+'
+
+syn keyword etermFontType         contained default nextgroup=etermNumber
+                                  \ skipwhite
+
+syn keyword etermFontType         contained proportional nextgroup=etermBoolean
+                                  \ skipwhite
+
+syn keyword etermFontType         contained fx nextgroup=etermString skipwhite
+
+syn keyword etermAttrOptions      contained title name iconname
+                                  \ nextgroup=etermString skipwhite
+
+syn keyword etermAttrOptions      contained scrollbar_width desktop
+                                  \ nextgroup=etermNumber skipwhite
+
+syn region  etermAttrContext      fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+attributes\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermAttrOptions
+
+syn keyword etermIClassOptions    contained icon path nextgroup=etermString
+                                  \ skipwhite
+syn keyword etermIClassOptions    contained cache nextgroup=etermNumber
+                                  \ skipwhite
+syn keyword etermIClassOptions    contained anim nextgroup=etermNumber
+                                  \ skipwhite
+
+syn region  etermIClassContext    fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+imageclasses\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermImageContext,
+                                  \ etermIClassOptions
+
+syn keyword etermImageOptions     contained type nextgroup=etermImageType
+                                  \ skipwhite
+
+syn keyword etermImageTypes       contained background trough anchor up_arrow
+                                  \ left_arrow right_arrow menu menuitem
+                                  \ submenu button buttonbar down_arrow
+
+syn keyword etermImageOptions     contained mode nextgroup=etermImageModes
+                                  \ skipwhite
+
+syn keyword etermImageModes       contained image trans viewport auto solid
+                                  \ nextgroup=etermImageModesAllow skipwhite
+syn keyword etermImageModesAllow  contained allow nextgroup=etermImageModesR
+                                  \ skipwhite
+syn keyword etermImageModesR      contained image trans viewport auto solid
+
+syn keyword etermImageOptions     contained state nextgroup=etermImageState
+                                  \ skipwhite
+
+syn keyword etermImageState       contained normal selected clicked disabled
+
+syn keyword etermImageOptions     contained color nextgroup=etermImageColorFG
+                                  \ skipwhite
+
+syn keyword etermImageColorFG     contained '\S\+' nextgroup=etermImageColorBG
+                                  \ skipwhite
+
+syn keyword etermImageColorBG     contained '\S\+'
+
+syn keyword etermImageOptions     contained file nextgroup=etermString
+                                  \ skipwhite
+
+syn keyword etermImageOptions     contained geom nextgroup=etermImageGeom
+                                  \ skipwhite
+
+syn match   etermImageGeom        contained display
+                                  \ '\s\+\%(\d\+x\d\++\d\++\d\+\)\=:\%(\%(tie\|scale\|hscale\|vscale\|propscale\)d\=\)\='
+
+syn keyword etermImageOptions     contained cmod colormod
+                                  \ nextgroup=etermImageCmod skipwhite
+
+syn keyword etermImageCmod        contained image red green blue
+                                  \ nextgroup=etermImageBrightness skipwhite
+
+syn match   etermImageBrightness  contained display '\<\(\d\+\|0x\x\{1,2}\)\>'
+                                  \ nextgroup=etermImageContrast skipwhite
+
+syn match   etermImageContrast    contained display '\<\(\d\+\|0x\x\{1,2}\)\>'
+                                  \ nextgroup=etermImageGamma skipwhite
+
+syn match   etermImageGamma       contained display '\<\(\d\+\|0x\x\{1,2}\)\>'
+                                  \ nextgroup=etermImageGamma skipwhite
+
+syn region  etermImageOptions     contained display oneline
+                                  \ matchgroup=etermImageOptions
+                                  \ start='border\|bevel\%(\s\+\%(up\|down\)\)\|padding'
+                                  \ end='$' contains=etermNumber
+
+syn region  etermImageContext     contained fold transparent
+                                  \ matchgroup=etermContext
+                                  \ start='^\s*begin\s\+image\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermImageOptions
+
+syn keyword etermMenuItemOptions  contained action
+                                  \ nextgroup=etermMenuItemAction skipwhite
+
+syn keyword etermMenuItemAction   contained string echo submenu script
+                                  \ nextgroup=etermString skipwhite
+
+syn keyword etermMenuItemAction   contained separator
+
+syn keyword etermMenuItemOptions  contained text rtext nextgroup=etermString
+                                  \ skipwhite
+
+syn region  etermMenuItemContext  contained fold transparent
+                                  \ matchgroup=etermContext
+                                  \ start='^\s*begin\s\+menuitem\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermMenuItemOptions
+
+syn keyword etermMenuOptions      contained title nextgroup=etermString
+                                  \ skipwhite
+
+syn keyword etermMenuOptions      contained font_name nextgroup=etermFont
+                                  \ skipwhite
+
+syn match   etermMenuOptions      contained display '\<sep\>\|-'
+
+syn region  etermMenuContext      fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+menu\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermMenuOptions,
+                                  \ etermMenuItemContext
+
+syn keyword etermBind             contained bind nextgroup=etermBindMods
+                                  \ skipwhite
+
+syn keyword etermBindMods         contained ctrl shift lock mod1 mod2 mod3 mod4
+                                  \ mod5 alt meta anymod
+                                  \ nextgroup=etermBindMods skipwhite
+
+syn keyword etermBindTo           contained to nextgroup=etermBindType
+                                  \ skipwhite
+
+syn keyword etermBindType         contained string echo menu script
+                                  \ nextgroup=etermBindParam skipwhite
+
+syn match   etermBindParam        contained display '\S\+'
+
+syn region  etermActionsContext   fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+actions\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermActionsOptions
+
+syn keyword etermButtonOptions    contained font nextgroup=etermFont skipwhite
+syn keyword etermButtonOptions    contained visible nextgroup=etermBoolean
+                                  \ skipwhite
+syn keyword etermButtonOptions    contained dock nextgroup=etermDockOption
+                                  \ skipwhite
+
+syn keyword etermDockOption       contained top bottom no
+
+syn keyword etermButton           contained button nextgroup=etermButtonText
+                                  \ skipwhite
+
+syn region  etermButtonText       contained display oneline start=+"+
+                                  \ skip=+\\"+ end=+"+
+                                  \ nextgroup=etermButtonIcon skipwhite
+
+syn keyword etermButtonIcon       contained icon nextgroup=etermButtonIconFile
+                                  \ skipwhite
+
+syn keyword etermButtonIconFile   contained '\S\+' nextgroup=etermButtonAction
+                                  \ skipwhite
+
+syn keyword etermButtonAction     contained action nextgroup=etermBindType
+                                  \ skipwhite
+
+syn region  etermButtonContext    fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+button_bar\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermButtonOptions
+
+syn keyword etermMultiOptions     contained encoding nextgroup=etermEncoding
+                                  \ skipwhite
+
+syn keyword etermEncoding         eucj sjis euckr big5 gb
+syn match   etermEncoding         display 'iso-10646'
+
+syn keyword etermMultiOptions     contained font nextgroup=etermFontType
+                                  \ skipwhite
+
+syn region  etermMultiContext     fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+multichar\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermMultiOptions
+
+syn keyword etermXimOptions       contained input_method
+                                  \ nextgroup=etermInputMethod skipwhite
+
+syn match   etermInputMethod      contained display '\S+'
+
+syn keyword etermXimOptions       contained preedit_type
+                                  \ nextgroup=etermPreeditType skipwhite
+
+syn keyword etermPreeditType      contained OverTheSpot OffTheSpot Root
+
+syn region  etermXimContext       fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+xim\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermXimOptions
+
+syn keyword etermTogOptions       contained map_alert visual_bell login_shell
+                                  \ scrollbar utmp_logging meta8 iconic
+                                  \ no_input home_on_output home_on_input
+                                  \ scrollbar_floating scrollbar_right
+                                  \ scrollbar_popup borderless double_buffer
+                                  \ no_cursor pause xterm_select select_line
+                                  \ select_trailing_spaces report_as_keysyms
+                                  \ itrans immotile_trans buttonbar
+                                  \ resize_gravity nextgroup=etermBoolean
+                                  \ skipwhite
+
+syn region  etermTogContext       fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+toggles\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermTogOptions
+
+syn keyword etermKeyboardOptions  contained smallfont_key bigfont_key keysym
+                                  \ nextgroup=etermKeysym skipwhite
+
+syn keyword etermKeysym           contained '\S\+' nextgroup=etermString
+                                  \ skipwhite
+
+syn keyword etermKeyboardOptions  contained meta_mod alt_mod numlock_mod
+                                  \ nextgroup=etermNumber skipwhite
+
+syn keyword etermKeyboardOptions  contained greek app_keypad app_cursor
+                                  \ nextgroup=etermBoolean skipwhite
+
+syn region  etermKeyboardContext  fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+keyboard\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermKeyboardOptions
+
+syn keyword etermMiscOptions      contained print_pipe cut_chars finished_title
+                                  \ finished_text term_name exec
+                                  \ nextgroup=etermString skipwhite
+
+syn keyword etermMiscOptions      contained save_lines min_anchor_size
+                                  \ border_width line_space
+
+syn region  etermMiscContext      fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+misc\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermMiscOptions
+
+syn keyword etermEScreenOptions   contained url nextgroup=etermURL skipwhite
+
+syn match   etermURL              contained display
+                                  \ '\<\%(screen\|twin\)://\%([^@:/]\+\%(@[^:/]\+\%(:[^/]\+\)\=\)\=\)\=/\S\+'
+
+syn keyword etermEScreenOptions   contained firewall
+
+syn keyword etermEScreenOptions   contained delay nextgroup=etermNumber
+                                  \ skipwhite
+
+syn keyword etermEScreenOptions   contained bbar_font nextgroup=etermFont
+                                  \ skipwhite
+
+syn keyword etermEScreenOptions   contained bbar_dock nextgroup=etermDockOption
+                                  \ skipwhite
+
+syn region  etermEScreenContext   fold transparent matchgroup=etermContext
+                                  \ start='^\s*begin\s\+escreen\>'
+                                  \ end='^\s*end\>'
+                                  \ contains=@etermGeneral,etermEScreenOptions
+
+if exists("eterm_minlines")
+  let b:eterm_minlines = eterm_minlines
+else
+  let b:eterm_minlines = 50
+endif
+exec "syn sync minlines=" . b:eterm_minlines
+
+hi def link etermTodo             Todo
+hi def link etermComment          Comment
+hi def link etermMagic            PreProc
+hi def link etermNumber           Number
+hi def link etermString           String
+hi def link etermBoolean          Boolean
+hi def link etermPreProc          PreProc
+hi def link etermFunctions        Function
+hi def link etermKeyMod           Constant
+hi def link etermOption           Keyword
+hi def link etermColorOptions     etermOption
+hi def link etermColor            String
+hi def link etermVideoType        Type
+hi def link etermColorType        Type
+hi def link etermColorNumber      Number
+hi def link etermColorSpec        etermColor
+hi def link etermContext          Keyword
+hi def link etermAttrOptions      etermOption
+hi def link etermGeometry         String
+hi def link etermScrollbarType    Type
+hi def link etermFontType         Type
+hi def link etermIClassOptions    etermOption
+hi def link etermImageOptions     etermOption
+hi def link etermImageTypes       Type
+hi def link etermImageModes       Type
+hi def link etermImageModesAllow  Keyword
+hi def link etermImageModesR      Type
+hi def link etermImageState       Keyword
+hi def link etermImageColorFG     etermColor
+hi def link etermImageColorBG     etermColor
+hi def link etermImageGeom        String
+hi def link etermImageCmod        etermOption
+hi def link etermImageBrightness  Number
+hi def link etermImageContrast    Number
+hi def link etermImageGamma       Number
+hi def link etermMenuItemOptions  etermOption
+hi def link etermMenuItemAction   Keyword
+hi def link etermMenuOptions      etermOption
+hi def link etermBind             Keyword
+hi def link etermBindMods         Identifier
+hi def link etermBindTo           Keyword
+hi def link etermBindType         Type
+hi def link etermBindParam        String
+hi def link etermButtonOptions    etermOption
+hi def link etermDockOption       etermOption
+hi def link etermButtonText       String
+hi def link etermButtonIcon       String
+hi def link etermButtonIconFile   String
+hi def link etermButtonAction     Keyword
+hi def link etermMultiOptions     etermOption
+hi def link etermEncoding         Identifier
+hi def link etermXimOptions       etermOption
+hi def link etermInputMethod      Identifier
+hi def link etermPreeditType      Type
+hi def link etermTogOptions       etermOption
+hi def link etermKeyboardOptions  etermOption
+hi def link etermKeysym           Constant
+hi def link etermMiscOptions      etermOption
+hi def link etermEScreenOptions   etermOption
+hi def link etermURL              Identifier
+
+let b:current_syntax = "eterm"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/exim.vim b/syntax/exim.vim
new file mode 100644
index 000000000..371a3aa4c
--- /dev/null
+++ b/syntax/exim.vim
@@ -0,0 +1,109 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'exim') == -1
+
+" Vim syntax file
+" This is a GENERATED FILE. Please always refer to source file at the URI below.
+" Language: Exim configuration file exim.conf
+" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2002-10-15
+" URL: http://trific.ath.cx/Ftp/vim/syntax/exim.vim
+
+" Setup
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+syn case match
+
+" Base constructs
+syn match eximComment "^\s*#.*$" contains=eximFixme
+syn match eximComment "\s#.*$" contains=eximFixme
+syn keyword eximFixme FIXME TODO XXX NOT contained
+syn keyword eximConstant true false yes no
+syn match eximNumber "\<\d\+[KM]\?\>"
+syn match eximNumber "\<0[xX]\x\+\>"
+syn match eximNumber "\<\d\+\(\.\d\{,3}\)\?\>"
+syn match eximTime "\<\(\d\+[wdhms]\)\+\>"
+syn match eximSpecialChar "\\[\\nrt]\|\\\o\{1,3}\|\\x\x\{1,2}"
+syn region eximMacroDefinition matchgroup=eximMacroName start="^[A-Z]\i*\s*=" end="$" skip="\\\s*$" transparent
+
+syn match eximDriverName "\<\(aliasfile\|appendfile\|autoreply\|domainlist\|forwardfile\|ipliteral\|iplookup\|lmtp\|localuser\|lookuphost\|pipe\|queryprogram\|smartuser\|smtp\)\>"
+syn match eximTransport "^\s*\i\+:"
+
+" Options
+syn keyword eximEnd end
+syn keyword eximKeyword accept_8bitmime accept_timeout admin_groups allow_mx_to_ip always_bcc auth_always_advertise auth_hosts auth_over_tls_hosts auto_thaw bi_command check_log_inodes check_log_space check_spool_inodes check_spool_space collapse_source_routes daemon_smtp_port daemon_smtp_service debug_level delay_warning delay_warning_condition deliver_load_max deliver_queue_load_max delivery_date_remove dns_again_means_nonexist dns_check_names dns_check_names_pattern dns_retrans dns_ipv4_lookup dns_retry envelope_to_remove errmsg_text errmsg_file errors_address errors_copy errors_reply_to exim_group exim_path exim_user extract_addresses_remove_arguments finduser_retries forbid_domain_literals freeze_tell_mailmaster gecos_name gecos_pattern headers_check_syntax headers_checks_fail headers_sender_verify headers_sender_verify_errmsg helo_accept_junk_hosts helo_strict_syntax helo_verify hold_domains host_accept_relay host_auth_accept_relay host_lookup host_reject host_reject_recipients hosts_treat_as_local ignore_errmsg_errors ignore_errmsg_errors_after ignore_fromline_hosts ignore_fromline_local keep_malformed kill_ip_options ldap_default_servers local_domains local_domains_include_host local_domains_include_host_literals local_from_check local_from_prefix local_from_suffix local_interfaces localhost_number locally_caseless log_all_parents log_arguments log_file_path log_incoming_port log_ip_options log_level log_queue_run_level log_received_recipients log_received_sender log_refused_recipients log_rewrites log_sender_on_delivery log_smtp_confirmation log_smtp_connections log_smtp_syntax_errors log_subject lookup_open_max max_username_length message_body_visible message_filter message_filter_directory_transport message_filter_directory2_transport message_filter_file_transport message_filter_group message_filter_pipe_transport message_filter_reply_transport message_filter_user message_id_header_text message_size_limit message_size_limit_count_recipients move_frozen_messages mysql_servers never_users nobody_group nobody_user percent_hack_domains perl_at_start perl_startup pgsql_servers pid_file_path preserve_message_logs primary_hostname print_topbitchars prod_requires_admin prohibition_message qualify_domain qualify_recipient queue_list_requires_admin queue_only queue_only_file queue_only_load queue_remote_domains queue_run_in_order queue_run_max queue_smtp_domains rbl_domains rbl_hosts rbl_log_headers rbl_log_rcpt_count rbl_reject_recipients rbl_warn_header received_header_text received_headers_max receiver_try_verify receiver_unqualified_hosts receiver_verify receiver_verify_addresses receiver_verify_hosts receiver_verify_senders recipients_max recipients_max_reject recipients_reject_except recipients_reject_except_senders refuse_ip_options relay_domains relay_domains_include_local_mx relay_match_host_or_sender remote_max_parallel remote_sort retry_data_expire retry_interval_max return_path_remove return_size_limit rfc1413_hosts rfc1413_query_timeout security sender_address_relay sender_address_relay_hosts sender_reject sender_reject_recipients sender_try_verify sender_unqualified_hosts sender_verify sender_verify_batch sender_verify_callback_domains sender_verify_callback_timeout sender_verify_fixup sender_verify_hosts sender_verify_hosts_callback sender_verify_max_retry_rate sender_verify_reject smtp_accept_keepalive smtp_accept_max smtp_accept_max_per_host smtp_accept_queue smtp_accept_queue_per_connection smtp_accept_reserve smtp_banner smtp_check_spool_space smtp_connect_backlog smtp_etrn_command smtp_etrn_hosts smtp_etrn_serialize smtp_expn_hosts smtp_load_reserve smtp_receive_timeout smtp_reserve_hosts smtp_verify split_spool_directory spool_directory strip_excess_angle_brackets strip_trailing_dot syslog_timestamp timeout_frozen_after timestamps_utc timezone tls_advertise_hosts tls_certificate tls_dhparam tls_host_accept_relay tls_hosts tls_log_cipher tls_log_peerdn tls_privatekey tls_verify_certificates tls_verify_ciphers tls_verify_hosts trusted_groups trusted_users unknown_login unknown_username untrusted_set_sender uucp_from_pattern uucp_from_sender warnmsg_file
+syn keyword eximKeyword no_accept_8bitmime no_allow_mx_to_ip no_always_bcc no_auth_always_advertise no_collapse_source_routes no_delivery_date_remove no_dns_check_names no_envelope_to_remove no_extract_addresses_remove_arguments no_forbid_domain_literals no_freeze_tell_mailmaster no_headers_check_syntax no_headers_checks_fail no_headers_sender_verify no_headers_sender_verify_errmsg no_helo_strict_syntax no_ignore_errmsg_errors no_ignore_fromline_local no_kill_ip_options no_local_domains_include_host no_local_domains_include_host_literals no_local_from_check no_locally_caseless no_log_all_parents no_log_arguments no_log_incoming_port no_log_ip_options no_log_received_recipients no_log_received_sender no_log_refused_recipients no_log_rewrites no_log_sender_on_delivery no_log_smtp_confirmation no_log_smtp_connections no_log_smtp_syntax_errors no_log_subject no_message_size_limit_count_recipients no_move_frozen_messages no_preserve_message_logs no_print_topbitchars no_prod_requires_admin no_queue_list_requires_admin no_queue_only no_rbl_log_headers no_rbl_log_rcpt_count no_rbl_reject_recipients no_receiver_try_verify no_receiver_verify no_recipients_max_reject no_refuse_ip_options no_relay_domains_include_local_mx no_relay_match_host_or_sender no_return_path_remove no_sender_try_verify no_sender_verify no_sender_verify_batch no_sender_verify_fixup no_sender_verify_reject no_smtp_accept_keepalive no_smtp_check_spool_space no_smtp_etrn_serialize no_smtp_verify no_split_spool_directory no_strip_excess_angle_brackets no_strip_trailing_dot no_syslog_timestamp no_timestamps_utc no_tls_log_cipher no_tls_log_peerdn no_untrusted_set_sender
+syn keyword eximKeyword not_accept_8bitmime not_allow_mx_to_ip not_always_bcc not_auth_always_advertise not_collapse_source_routes not_delivery_date_remove not_dns_check_names not_envelope_to_remove not_extract_addresses_remove_arguments not_forbid_domain_literals not_freeze_tell_mailmaster not_headers_check_syntax not_headers_checks_fail not_headers_sender_verify not_headers_sender_verify_errmsg not_helo_strict_syntax not_ignore_errmsg_errors not_ignore_fromline_local not_kill_ip_options not_local_domains_include_host not_local_domains_include_host_literals not_local_from_check not_locally_caseless not_log_all_parents not_log_arguments not_log_incoming_port not_log_ip_options not_log_received_recipients not_log_received_sender not_log_refused_recipients not_log_rewrites not_log_sender_on_delivery not_log_smtp_confirmation not_log_smtp_connections not_log_smtp_syntax_errors not_log_subject not_message_size_limit_count_recipients not_move_frozen_messages not_preserve_message_logs not_print_topbitchars not_prod_requires_admin not_queue_list_requires_admin not_queue_only not_rbl_log_headers not_rbl_log_rcpt_count not_rbl_reject_recipients not_receiver_try_verify not_receiver_verify not_recipients_max_reject not_refuse_ip_options not_relay_domains_include_local_mx not_relay_match_host_or_sender not_return_path_remove not_sender_try_verify not_sender_verify not_sender_verify_batch not_sender_verify_fixup not_sender_verify_reject not_smtp_accept_keepalive not_smtp_check_spool_space not_smtp_etrn_serialize not_smtp_verify not_split_spool_directory not_strip_excess_angle_brackets not_strip_trailing_dot not_syslog_timestamp not_timestamps_utc not_tls_log_cipher not_tls_log_peerdn not_untrusted_set_sender
+syn keyword eximKeyword body_only debug_print delivery_date_add driver envelope_to_add headers_add headers_only headers_remove headers_rewrite message_size_limit return_path return_path_add shadow_condition shadow_transport transport_filter
+syn keyword eximKeyword no_body_only no_delivery_date_add no_envelope_to_add no_headers_only no_return_path_add
+syn keyword eximKeyword not_body_only not_delivery_date_add not_envelope_to_add not_headers_only not_return_path_add
+syn keyword eximKeyword allow_fifo allow_symlink batch batch_max bsmtp bsmtp_helo check_group check_owner check_string create_directory create_file current_directory directory directory_mode escape_string file file_format file_must_exist from_hack group lock_fcntl_timeout lock_interval lock_retries lockfile_mode lockfile_timeout maildir_format maildir_retries maildir_tag mailstore_format mailstore_prefix mailstore_suffix mbx_format mode mode_fail_narrower notify_comsat prefix quota quota_filecount quota_is_inclusive quota_size_regex quota_warn_message quota_warn_threshold require_lockfile retry_use_local_part suffix use_crlf use_fcntl_lock use_lockfile use_mbx_lock user
+syn keyword eximKeyword no_allow_fifo no_allow_symlink no_bsmtp_helo no_check_group no_check_owner no_create_directory no_file_must_exist no_from_hack no_maildir_format no_mailstore_format no_mbx_format no_mode_fail_narrower no_notify_comsat no_quota_is_inclusive no_require_lockfile no_retry_use_local_part no_use_crlf no_use_fcntl_lock no_use_lockfile no_use_mbx_lock
+syn keyword eximKeyword not_allow_fifo not_allow_symlink not_bsmtp_helo not_check_group not_check_owner not_create_directory not_file_must_exist not_from_hack not_maildir_format not_mailstore_format not_mbx_format not_mode_fail_narrower not_notify_comsat not_quota_is_inclusive not_require_lockfile not_retry_use_local_part not_use_crlf not_use_fcntl_lock not_use_lockfile not_use_mbx_lock
+syn keyword eximKeyword bcc cc file file_expand file_optional from group headers initgroups log mode once once_file_size once_repeat reply_to return_message subject text to user
+syn keyword eximKeyword no_file_expand no_file_optional no_initgroups no_return_message
+syn keyword eximKeyword not_file_expand not_file_optional not_initgroups not_return_message
+syn keyword eximKeyword batch batch_max command group initgroups retry_use_local_part timeout user
+syn keyword eximKeyword no_initgroups
+syn keyword eximKeyword not_initgroups
+syn keyword eximKeyword allow_commands batch batch_max bsmtp bsmtp_helo check_string command current_directory environment escape_string freeze_exec_fail from_hack group home_directory ignore_status initgroups log_defer_output log_fail_output log_output max_output path pipe_as_creator prefix restrict_to_path retry_use_local_part return_fail_output return_output suffix temp_errors timeout umask use_crlf use_shell user
+syn keyword eximKeyword no_bsmtp_helo no_freeze_exec_fail no_from_hack no_ignore_status no_log_defer_output no_log_fail_output no_log_output no_pipe_as_creator no_restrict_to_path no_return_fail_output no_return_output no_use_crlf no_use_shell
+syn keyword eximKeyword not_bsmtp_helo not_freeze_exec_fail not_from_hack not_ignore_status not_log_defer_output not_log_fail_output not_log_output not_pipe_as_creator not_restrict_to_path not_return_fail_output not_return_output not_use_crlf not_use_shell
+syn keyword eximKeyword allow_localhost authenticate_hosts batch_max command_timeout connect_timeout data_timeout delay_after_cutoff dns_qualify_single dns_search_parents fallback_hosts final_timeout gethostbyname helo_data hosts hosts_avoid_tls hosts_require_tls hosts_override hosts_max_try hosts_randomize interface keepalive max_rcpt multi_domain mx_domains port protocol retry_include_ip_address serialize_hosts service size_addition tls_certificate tls_privatekey tls_verify_certificates tls_verify_ciphers
+syn keyword eximKeyword no_allow_localhost no_delay_after_cutoff no_dns_qualify_single no_dns_search_parents no_gethostbyname no_hosts_override no_hosts_randomize no_keepalive no_multi_domain no_retry_include_ip_address
+syn keyword eximKeyword not_allow_localhost not_delay_after_cutoff not_dns_qualify_single not_dns_search_parents not_gethostbyname not_hosts_override not_hosts_randomize not_keepalive not_multi_domain not_retry_include_ip_address
+syn keyword eximKeyword condition debug_print domains driver errors_to fail_verify fail_verify_recipient fail_verify_sender fallback_hosts group headers_add headers_remove initgroups local_parts more require_files senders transport unseen user verify verify_only verify_recipient verify_sender
+syn keyword eximKeyword no_fail_verify no_fail_verify_recipient no_fail_verify_sender no_initgroups no_more no_unseen no_verify no_verify_only no_verify_recipient no_verify_sender
+syn keyword eximKeyword not_fail_verify not_fail_verify_recipient not_fail_verify_sender not_initgroups not_more not_unseen not_verify not_verify_only not_verify_recipient not_verify_sender
+syn keyword eximKeyword current_directory expn home_directory new_director prefix prefix_optional suffix suffix_optional
+syn keyword eximKeyword no_expn no_prefix_optional no_suffix_optional
+syn keyword eximKeyword not_expn not_prefix_optional not_suffix_optional
+syn keyword eximKeyword check_ancestor directory_transport directory2_transport file_transport forbid_file forbid_include forbid_pipe freeze_missing_include hide_child_in_errmsg modemask one_time owners owngroups pipe_transport qualify_preserve_domain rewrite skip_syntax_errors syntax_errors_text syntax_errors_to
+syn keyword eximKeyword no_check_ancestor no_forbid_file no_forbid_include no_forbid_pipe no_freeze_missing_include no_hide_child_in_errmsg no_one_time no_qualify_preserve_domain no_rewrite no_skip_syntax_errors
+syn keyword eximKeyword not_check_ancestor not_forbid_file not_forbid_include not_forbid_pipe not_freeze_missing_include not_hide_child_in_errmsg not_one_time not_qualify_preserve_domain not_rewrite not_skip_syntax_errors
+syn keyword eximKeyword expand file forbid_special include_domain optional queries query search_type
+syn keyword eximKeyword no_expand no_forbid_special no_include_domain no_optional
+syn keyword eximKeyword not_expand not_forbid_special not_include_domain not_optional
+syn keyword eximKeyword allow_system_actions check_group check_local_user data file file_directory filter forbid_filter_existstest forbid_filter_logwrite forbid_filter_lookup forbid_filter_perl forbid_filter_reply ignore_eacces ignore_enotdir match_directory reply_transport seteuid
+syn keyword eximKeyword no_allow_system_actions no_check_local_user no_forbid_filter_reply no_forbid_filter_existstest no_forbid_filter_logwrite no_forbid_filter_lookup no_forbid_filter_perl no_forbid_filter_reply no_ignore_eacces no_ignore_enotdir no_seteuid
+syn keyword eximKeyword not_allow_system_actions not_check_local_user not_forbid_filter_reply not_forbid_filter_existstest not_forbid_filter_logwrite not_forbid_filter_lookup not_forbid_filter_perl not_forbid_filter_reply not_ignore_eacces not_ignore_enotdir not_seteuid
+syn keyword eximKeyword match_directory
+syn keyword eximKeyword directory_transport directory2_transport file_transport forbid_file forbid_pipe hide_child_in_errmsg new_address panic_expansion_fail pipe_transport qualify_preserve_domain rewrite
+syn keyword eximKeyword no_forbid_file no_forbid_pipe no_hide_child_in_errmsg no_panic_expansion_fail no_qualify_preserve_domain no_rewrite
+syn keyword eximKeyword not_forbid_file not_forbid_pipe not_hide_child_in_errmsg not_panic_expansion_fail not_qualify_preserve_domain not_rewrite
+syn keyword eximKeyword ignore_target_hosts pass_on_timeout self translate_ip_address
+syn keyword eximKeyword no_pass_on_timeout
+syn keyword eximKeyword not_pass_on_timeout
+syn keyword eximKeyword host_find_failed hosts_randomize modemask owners owngroups qualify_single route_file route_list route_queries route_query search_parents search_type
+syn keyword eximKeyword no_hosts_randomize no_qualify_single no_search_parents
+syn keyword eximKeyword not_hosts_randomize not_qualify_single not_search_parents
+syn keyword eximKeyword hosts optional port protocol query reroute response_pattern service timeout
+syn keyword eximKeyword no_optional
+syn keyword eximKeyword not_optional
+syn keyword eximKeyword check_secondary_mx gethostbyname mx_domains qualify_single rewrite_headers search_parents widen_domains
+syn keyword eximKeyword no_check_secondary_mx no_gethostbyname no_qualify_single no_search_parents
+syn keyword eximKeyword not_check_secondary_mx not_gethostbyname not_qualify_single not_search_parents
+syn keyword eximKeyword command command_group command_user current_directory timeout
+syn keyword eximKeyword driver public_name server_set_id server_mail_auth_condition
+syn keyword eximKeyword server_prompts server_condition client_send
+syn keyword eximKeyword server_secret client_name client_secret
+
+" Define the default highlighting
+
+hi def link eximComment Comment
+hi def link eximFixme Todo
+hi def link eximEnd Keyword
+hi def link eximNumber Number
+hi def link eximDriverName Constant
+hi def link eximConstant Constant
+hi def link eximTime Constant
+hi def link eximKeyword Type
+hi def link eximSpecialChar Special
+hi def link eximMacroName Preproc
+hi def link eximTransport Identifier
+
+
+let b:current_syntax = "exim"
+
+endif
diff --git a/syntax/expect.vim b/syntax/expect.vim
new file mode 100644
index 000000000..b80ff528e
--- /dev/null
+++ b/syntax/expect.vim
@@ -0,0 +1,107 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'expect') == -1
+
+" Vim syntax file
+" Language:	Expect
+" Maintainer:	Ralph Jennings <knowbudy@oro.net>
+" Last Change:	2012 Jun 01
+" 		(Dominique Pelle added @Spell)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Reserved Expect variable prefixes.
+syn match   expectVariables "\$exp[a-zA-Z0-9_]*\|\$inter[a-zA-Z0-9_]*"
+syn match   expectVariables "\$spawn[a-zA-Z0-9_]*\|\$timeout[a-zA-Z0-9_]*"
+
+" Normal Expect variables.
+syn match   expectVariables "\$env([^)]*)"
+syn match   expectVariables "\$any_spawn_id\|\$argc\|\$argv\d*"
+syn match   expectVariables "\$user_spawn_id\|\$spawn_id\|\$timeout"
+
+" Expect variable arrays.
+syn match   expectVariables "\$\(expect\|interact\)_out([^)]*)"			contains=expectOutVar
+
+" User defined variables.
+syn match   expectVariables "\$[a-zA-Z_][a-zA-Z0-9_]*"
+
+" Reserved Expect command prefixes.
+syn match   expectCommand    "exp_[a-zA-Z0-9_]*"
+
+" Normal Expect commands.
+syn keyword expectStatement	close debug disconnect
+syn keyword expectStatement	exit exp_continue exp_internal exp_open
+syn keyword expectStatement	exp_pid exp_version
+syn keyword expectStatement	fork inter_return interpreter
+syn keyword expectStatement	log_file log_user match_max overlay
+syn keyword expectStatement	parity remove_nulls return
+syn keyword expectStatement	send send_error send_log send_user
+syn keyword expectStatement	sleep spawn strace stty system
+syn keyword expectStatement	timestamp trace trap wait
+
+" Tcl commands recognized and used by Expect.
+syn keyword expectCommand		proc
+syn keyword expectConditional	if else
+syn keyword expectRepeat		while for foreach
+
+" Expect commands with special arguments.
+syn keyword expectStatement	expect expect_after expect_background			nextgroup=expectExpectOpts
+syn keyword expectStatement	expect_before expect_user interact			nextgroup=expectExpectOpts
+
+syn match   expectSpecial contained  "\\."
+
+" Options for "expect", "expect_after", "expect_background",
+" "expect_before", "expect_user", and "interact".
+syn keyword expectExpectOpts	default eof full_buffer null return timeout
+
+syn keyword expectOutVar  contained  spawn_id seconds seconds_total
+syn keyword expectOutVar  contained  string start end buffer
+
+" Numbers (Tcl style).
+syn case ignore
+  syn match  expectNumber	"\<\d\+\(u\=l\=\|lu\|f\)\>"
+  "floating point number, with dot, optional exponent
+  syn match  expectNumber	"\<\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=\>"
+  "floating point number, starting with a dot, optional exponent
+  syn match  expectNumber	"\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+  "floating point number, without dot, with exponent
+  syn match  expectNumber	"\<\d\+e[-+]\=\d\+[fl]\=\>"
+  "hex number
+  syn match  expectNumber	"0x[0-9a-f]\+\(u\=l\=\|lu\)\>"
+  "syn match  expectIdentifier	"\<[a-z_][a-z0-9_]*\>"
+syn case match
+
+syn region  expectString	start=+"+  end=+"+  contains=@Spell,expectVariables,expectSpecial
+
+" Are these really comments in Expect? (I never use it, so I'm just guessing).
+syn keyword expectTodo		contained TODO
+syn match   expectComment	"#.*$" contains=@Spell,expectTodo
+syn match   expectSharpBang	"\%^#!.*"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link expectSharpBang	PreProc
+hi def link expectVariables	Special
+hi def link expectCommand		Function
+hi def link expectStatement	Statement
+hi def link expectConditional	Conditional
+hi def link expectRepeat		Repeat
+hi def link expectExpectOpts	Keyword
+hi def link expectOutVar		Special
+hi def link expectSpecial		Special
+hi def link expectNumber		Number
+
+hi def link expectString		String
+
+hi def link expectComment		Comment
+hi def link expectTodo		Todo
+"hi def link expectIdentifier	Identifier
+
+
+let b:current_syntax = "expect"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/exports.vim b/syntax/exports.vim
new file mode 100644
index 000000000..834cab5af
--- /dev/null
+++ b/syntax/exports.vim
@@ -0,0 +1,62 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'exports') == -1
+
+" Vim syntax file
+" Language:	exports
+" Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Last Change:	Aug 31, 2016
+" Version:	8
+" Notes:		This file includes both SysV and BSD 'isms
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_EXPORTS
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Options: -word
+syn keyword exportsKeyOptions contained	alldirs	nohide	ro	wsync
+syn keyword exportsKeyOptions contained	kerb	o	rw
+syn match exportsOptError contained	"[a-z]\+"
+
+" Settings: word=
+syn keyword exportsKeySettings contained	access	anon	root	rw
+syn match exportsSetError contained	"[a-z]\+"
+
+" OptSet: -word=
+syn keyword exportsKeyOptSet contained	mapall	maproot	mask	network
+syn match exportsOptSetError contained	"[a-z]\+"
+
+" options and settings
+syn match exportsSettings	"[a-z]\+="  contains=exportsKeySettings,exportsSetError
+syn match exportsOptions	"-[a-z]\+"  contains=exportsKeyOptions,exportsOptError
+syn match exportsOptSet	"-[a-z]\+=" contains=exportsKeyOptSet,exportsOptSetError
+
+" Separators
+syn match exportsSeparator	"[,:]"
+
+" comments
+syn match exportsComment	"^\s*#.*$"	contains=@Spell
+
+" Define the default highlighting.
+if !exists("skip_exports_syntax_inits")
+
+  hi def link exportsKeyOptSet	exportsKeySettings
+  hi def link exportsOptSet	exportsSettings
+
+  hi def link exportsComment	Comment
+  hi def link exportsKeyOptions	Type
+  hi def link exportsKeySettings	Keyword
+  hi def link exportsOptions	Constant
+  hi def link exportsSeparator	Constant
+  hi def link exportsSettings	Constant
+
+  hi def link exportsOptError	Error
+  hi def link exportsOptSetError	Error
+  hi def link exportsSetError	Error
+
+endif
+
+let b:current_syntax = "exports"
+" vim: ts=10
+
+endif
diff --git a/syntax/falcon.vim b/syntax/falcon.vim
new file mode 100644
index 000000000..2723461d1
--- /dev/null
+++ b/syntax/falcon.vim
@@ -0,0 +1,201 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'falcon') == -1
+
+" Vim syntax file
+" Language:     Falcon
+" Maintainer:   Steven Oliver <oliver.steven@gmail.com>
+" Website:      http://github.com/steveno/vim-files/blob/master/syntax/falcon.vim
+" Credits:      Thanks the ruby.vim authors, I borrowed a lot!
+"               Thanks to the lisp authors for the rainbow code!
+" -------------------------------------------------------------------------------
+
+" When wanted, highlight the trailing whitespace.
+if exists("c_space_errors")
+    if !exists("c_no_trail_space_error")
+        syn match falconSpaceError "\s\+$"
+    endif
+
+    if !exists("c_no_tab_space_error")
+        syn match falconSpaceError " \+\t"me=e-1
+    endif
+endif
+
+" Symbols
+syn match falconSymbol "\(;\|,\|\.\)"
+syn match falconSymbolOther "\(#\|@\)" display
+
+" Operators
+syn match falconOperator "\(+\|-\|\*\|/\|=\|<\|>\|\*\*\|!=\|\~=\)"
+syn match falconOperator "\(<=\|>=\|=>\|\.\.\|<<\|>>\|\"\)"
+
+" Clusters
+syn region falconSymbol start="[]})\"':]\@<!:\"" end="\"" skip="\\\\\|\\\"" contains=@falconStringSpecial fold
+syn case match
+
+" Keywords
+syn keyword falconKeyword all allp any anyp as attributes brigade cascade catch choice class const
+syn keyword falconKeyword continue def directive do list dropping enum eq eval exit export from function
+syn keyword falconKeyword give global has hasnt in init innerfunc lambda launch launch len List list
+syn keyword falconKeyword load notin object pass print printl provides raise return self sender static to
+syn keyword falconKeyword try xamp
+
+" Error Type Keywords
+syn keyword falconKeyword CloneError CodeError Error InterruprtedError IoError MathError
+syn keyword falconKeyword ParamError RangeError SyntaxError TraceStep TypeError
+
+" Todo
+syn keyword falconTodo DEBUG FIXME NOTE TODO XXX
+
+" Conditionals
+syn keyword falconConditional and case default else end if iff
+syn keyword falconConditional elif or not switch select
+syn match   falconConditional "end\s\if"
+
+" Loops
+syn keyword falconRepeat break for loop forfirst forlast formiddle while
+
+" Booleans
+syn keyword falconBool true false
+
+" Constants
+syn keyword falconConst PI E nil
+syn match   falconConstant  "\%(\%([.@$]\@<!\.\)\@<!\<\|::\)\_s*\zs\u\w*\%(\>\|::\)\@=\%(\s*(\)\@!"
+
+" Comments
+syn match falconCommentSkip contained "^\s*\*\($\|\s\+\)"
+syn region falconComment start="/\*" end="\*/" contains=@falconCommentGroup,falconSpaceError,falconTodo
+syn region falconCommentL start="//" end="$" keepend contains=@falconCommentGroup,falconSpaceError,falconTodo
+syn match falconSharpBang "\%^#!.*" display
+syn sync ccomment falconComment
+
+" Numbers
+syn match falconNumbers transparent "\<[+-]\=\d\|[+-]\=\.\d" contains=falconIntLiteral,falconFloatLiteral,falconHexadecimal,falconOctal
+syn match falconNumbersCom contained transparent "\<[+-]\=\d\|[+-]\=\.\d" contains=falconIntLiteral,falconFloatLiteral,falconHexadecimal,falconOctal
+syn match falconHexadecimal contained "\<0x\x\+\>"
+syn match falconOctal contained "\<0\o\+\>"
+syn match falconIntLiteral contained "[+-]\<d\+\(\d\+\)\?\>"
+syn match falconFloatLiteral contained "[+-]\=\d\+\.\d*"
+syn match falconFloatLiteral contained "[+-]\=\d*\.\d*"
+
+" Includes
+syn keyword falconInclude load import
+
+" Expression Substitution and Backslash Notation
+syn match falconStringEscape "\\\\\|\\[abefnrstv]\|\\\o\{1,3}\|\\x\x\{1,2}" contained display
+syn match falconStringEscape "\%(\\M-\\C-\|\\C-\\M-\|\\M-\\c\|\\c\\M-\|\\c\|\\C-\|\\M-\)\%(\\\o\{1,3}\|\\x\x\{1,2}\|\\\=\S\)" contained display
+syn region falconSymbol start="[]})\"':]\@<!:\"" end="\"" skip="\\\\\|\\\"" contains=falconStringEscape fold
+
+" Normal String and Shell Command Output
+syn region falconString matchgroup=falconStringDelimiter start="\"" end="\"" skip="\\\\\|\\\"" contains=falconStringEscape fold
+syn region falconString matchgroup=falconStringDelimiter start="'" end="'" skip="\\\\\|\\'" fold
+syn region falconString matchgroup=falconStringDelimiter start="`" end="`" skip="\\\\\|\\`" contains=falconStringEscape fold
+
+" Generalized Single Quoted String, Symbol and Array of Strings
+syn region falconString matchgroup=falconStringDelimiter start="%[qw]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)"  end="\z1" skip="\\\\\|\\\z1" fold
+syn region falconString matchgroup=falconStringDelimiter start="%[qw]{" end="}" skip="\\\\\|\\}" fold contains=falconDelimEscape
+syn region falconString matchgroup=falconStringDelimiter start="%[qw]<" end=">" skip="\\\\\|\\>" fold contains=falconDelimEscape
+syn region falconString matchgroup=falconStringDelimiter start="%[qw]\[" end="\]" skip="\\\\\|\\\]" fold contains=falconDelimEscape
+syn region falconString matchgroup=falconStringDelimiter start="%[qw](" end=")" skip="\\\\\|\\)" fold contains=falconDelimEscape
+syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" fold
+syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s]{" end="}" skip="\\\\\|\\}" fold contains=falconDelimEscape
+syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s]<" end=">" skip="\\\\\|\\>" fold contains=falconDelimEscape
+syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s]\[" end="\]" skip="\\\\\|\\\]" fold contains=falconDelimEscape
+syn region falconSymbol matchgroup=falconSymbolDelimiter start="%[s](" end=")" skip="\\\\\|\\)" fold contains=falconDelimEscape
+
+" Generalized Double Quoted String and Array of Strings and Shell Command Output
+syn region falconString matchgroup=falconStringDelimiter start="%\z([~`!@#$%^&*_\-+|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=falconStringEscape fold
+syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=falconStringEscape fold
+syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\={" end="}" skip="\\\\\|\\}" contains=falconStringEscape,falconDelimEscape fold
+syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\=<" end=">" skip="\\\\\|\\>" contains=falconStringEscape,falconDelimEscape fold
+syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\=\[" end="\]" skip="\\\\\|\\\]" contains=falconStringEscape,falconDelimEscape fold
+syn region falconString matchgroup=falconStringDelimiter start="%[QWx]\=(" end=")" skip="\\\\\|\\)" contains=falconStringEscape,falconDelimEscape fold
+
+syn region falconString start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<\z(\h\w*\)\ze+hs=s+2 matchgroup=falconStringDelimiter end=+^\z1$+ contains=falconStringEscape fold keepend
+syn region falconString start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<"\z([^"]*\)"\ze+hs=s+2  matchgroup=falconStringDelimiter end=+^\z1$+ contains=falconStringEscape fold keepend
+syn region falconString start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<'\z([^']*\)'\ze+hs=s+2  matchgroup=falconStringDelimiter end=+^\z1$+ fold keepend
+syn region falconString start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<`\z([^`]*\)`\ze+hs=s+2  matchgroup=falconStringDelimiter end=+^\z1$+ contains=falconStringEscape fold keepend
+
+syn region falconString start=+\%(\%(class\s*\|\%([]}).]\|::\)\)\_s*\|\w\)\@<!<<-\z(\h\w*\)\ze+hs=s+3 matchgroup=falconStringDelimiter end=+^\s*\zs\z1$+ contains=falconStringEscape fold keepend
+syn region falconString start=+\%(\%(class\s*\|\%([]}).]\|::\)\)\_s*\|\w\)\@<!<<-"\z([^"]*\)"\ze+hs=s+3  matchgroup=falconStringDelimiter end=+^\s*\zs\z1$+ contains=falconStringEscape fold keepend
+syn region falconString start=+\%(\%(class\s*\|\%([]}).]\|::\)\)\_s*\|\w\)\@<!<<-'\z([^']*\)'\ze+hs=s+3  matchgroup=falconStringDelimiter end=+^\s*\zs\z1$+ fold keepend
+syn region falconString start=+\%(\%(class\s*\|\%([]}).]\|::\)\)\_s*\|\w\)\@<!<<-`\z([^`]*\)`\ze+hs=s+3  matchgroup=falconStringDelimiter end=+^\s*\zs\z1$+ contains=falconStringEscape fold keepend
+
+" Falcon rainbox to highlight parens in varying colors
+if exists("g:falcon_rainbow") && g:falcon_rainbow != 0
+    syn region falconParen0           matchgroup=hlLevel0 start="`\=(" end=")" skip="|.\{-}|" contains=@falconListCluster,falconParen1
+    syn region falconParen1 contained matchgroup=hlLevel1 start="`\=(" end=")" skip="|.\{-}|" contains=@falconListCluster,falconParen2
+    syn region falconParen2 contained matchgroup=hlLevel2 start="`\=(" end=")" skip="|.\{-}|" contains=@falconListCluster,falconParen3
+    syn region falconParen3 contained matchgroup=hlLevel3 start="`\=(" end=")" skip="|.\{-}|" contains=@falconListCluster,falconParen4
+    syn region falconParen4 contained matchgroup=hlLevel4 start="`\=(" end=")" skip="|.\{-}|" contains=@falconListCluster,falconParen5
+    syn region falconParen5 contained matchgroup=hlLevel5 start="`\=(" end=")" skip="|.\{-}|" contains=@falconListCluster,falconParen6
+    syn region falconParen6 contained matchgroup=hlLevel6 start="`\=(" end=")" skip="|.\{-}|" contains=@falconListCluster,falconParen7
+    syn region falconParen7 contained matchgroup=hlLevel7 start="`\=(" end=")" skip="|.\{-}|" contains=@falconListCluster,falconParen8
+    syn region falconParen8 contained matchgroup=hlLevel8 start="`\=(" end=")" skip="|.\{-}|" contains=@falconListCluster,falconParen9
+    syn region falconParen9 contained matchgroup=hlLevel9 start="`\=(" end=")" skip="|.\{-}|" contains=@falconListCluster,falconParen0
+endif
+
+" Setup the colors for the rainbox
+if exists("g:falcon_rainbow") && g:falcon_rainbow != 0
+    if &bg == "dark"
+        hi def hlLevel0 ctermfg=red         guifg=red1
+        hi def hlLevel1 ctermfg=yellow      guifg=orange1
+        hi def hlLevel2 ctermfg=green       guifg=yellow1
+        hi def hlLevel3 ctermfg=cyan        guifg=greenyellow
+        hi def hlLevel4 ctermfg=magenta     guifg=green1
+        hi def hlLevel5 ctermfg=red         guifg=springgreen1
+        hi def hlLevel6 ctermfg=yellow      guifg=cyan1
+        hi def hlLevel7 ctermfg=green       guifg=slateblue1
+        hi def hlLevel8 ctermfg=cyan        guifg=magenta1
+        hi def hlLevel9 ctermfg=magenta     guifg=purple1
+    else
+        hi def hlLevel0 ctermfg=red         guifg=red3
+        hi def hlLevel1 ctermfg=darkyellow  guifg=orangered3
+        hi def hlLevel2 ctermfg=darkgreen   guifg=orange2
+        hi def hlLevel3 ctermfg=blue        guifg=yellow3
+        hi def hlLevel4 ctermfg=darkmagenta guifg=olivedrab4
+        hi def hlLevel5 ctermfg=red         guifg=green4
+        hi def hlLevel6 ctermfg=darkyellow  guifg=paleturquoise3
+        hi def hlLevel7 ctermfg=darkgreen   guifg=deepskyblue4
+        hi def hlLevel8 ctermfg=blue        guifg=darkslateblue
+        hi def hlLevel9 ctermfg=darkmagenta guifg=darkviolet
+    endif
+endif
+
+" Syntax Synchronizing
+syn sync minlines=10 maxlines=100
+
+" Define the default highlighting
+if !exists("did_falcon_syn_inits")
+
+    hi def link falconKeyword          Keyword
+    hi def link falconCommentString    String
+    hi def link falconTodo             Todo
+    hi def link falconConditional      Keyword
+    hi def link falconRepeat           Repeat
+    hi def link falconcommentSkip      Comment
+    hi def link falconComment          Comment
+    hi def link falconCommentL         Comment
+    hi def link falconConst            Constant
+    hi def link falconConstants        Constant
+    hi def link falconOperator         Operator
+    hi def link falconSymbol           Normal
+    hi def link falconSpaceError       Error
+    hi def link falconHexadecimal      Number
+    hi def link falconOctal            Number
+    hi def link falconIntLiteral       Number
+    hi def link falconFloatLiteral     Float
+    hi def link falconStringEscape     Special
+    hi def link falconStringDelimiter  Delimiter
+    hi def link falconString           String
+    hi def link falconBool             Constant
+    hi def link falconSharpBang        PreProc
+    hi def link falconInclude          Include
+    hi def link falconSymbol           Constant
+    hi def link falconSymbolOther      Delimiter
+endif
+
+let b:current_syntax = "falcon"
+
+" vim: set sw=4 sts=4 et tw=80 :
+
+
+endif
diff --git a/syntax/fan.vim b/syntax/fan.vim
new file mode 100644
index 000000000..f22c89c98
--- /dev/null
+++ b/syntax/fan.vim
@@ -0,0 +1,136 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fan') == -1
+
+" Vim syntax file
+" Language:     Fantom
+" Maintainer:   Kamil Toman <kamil.toman@gmail.com>
+" Last Change:  2010 May 27
+" Based on Java syntax file by Claudio Fleiner <claudio@fleiner.com>
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" keyword definitions
+syn keyword fanExternal	        using native
+syn keyword fanError		goto void serializable volatile
+syn keyword fanConditional	if else switch
+syn keyword fanRepeat		do while for foreach each
+syn keyword fanBoolean		true false
+syn keyword fanConstant 	null
+syn keyword fanTypedef		this super
+syn keyword fanOperator	        new is isnot as
+syn keyword fanLongOperator     plus minus mult div mod get set slice lshift rshift and or xor inverse negate increment decrement equals compare
+syn keyword fanType		Void Bool Int Float Decimal Str Duration Uri Type Range List Map Obj
+syn keyword fanStatement	return
+syn keyword fanStorageClass	static const final
+syn keyword fanSlot      	virtual override once
+syn keyword fanField      	readonly
+syn keyword fanExceptions	throw try catch finally
+syn keyword fanAssert		assert
+syn keyword fanTypedef		class enum mixin
+syn match   fanFacet            "@[_a-zA-Z][_a-zA-Z0-9_]*\>"
+syn keyword fanBranch		break continue
+syn keyword fanScopeDecl	public internal protected private abstract
+
+if exists("fan_space_errors")
+  if !exists("fan_no_trail_space_error")
+    syn match   fanSpaceError  "\s\+$"
+  endif
+  if !exists("fan_no_tab_space_error")
+    syn match   fanSpaceError  " \+\t"me=e-1
+  endif
+endif
+
+syn region  fanLabelRegion     transparent matchgroup=fanLabel start="\<case\>" matchgroup=NONE end=":" contains=fanNumber,fanCharacter
+syn keyword fanLabel		default
+syn keyword fanLabel		case
+
+" The following cluster contains all fan groups except the contained ones
+syn cluster fanTop add=fanExternal,fanError,fanConditional,fanRepeat,fanBoolean,fanConstant,fanTypedef,fanOperator,fanLongOperator,fanType,fanType,fanStatement,fanStorageClass,fanSlot,fanField,fanExceptions,fanAssert,fanClassDecl,fanTypedef,fanFacet,fanBranch,fanScopeDecl,fanLabelRegion,fanLabel
+
+" Comments
+syn keyword fanTodo		 contained TODO FIXME XXX
+syn region  fanComment		 start="/\*"  end="\*/" contains=@fanCommentSpecial,fanTodo,fanComment,@Spell
+syn match   fanCommentStar      contained "^\s*\*[^/]"me=e-1
+syn match   fanCommentStar      contained "^\s*\*$"
+syn match   fanLineComment      "//.*" contains=@fanCommentSpecial2,fanTodo,@Spell
+syn match   fanDocComment       "\*\*.*" contains=@fanCommentSpecial2,fanTodo,@Spell
+hi def link fanCommentString fanString
+hi def link fanComment2String fanString
+hi def link fanCommentCharacter fanCharacter
+
+syn cluster fanTop add=fanComment,fanLineComment,fanDocComment
+
+" match the special comment /**/
+syn match   fanComment		 "/\*\*/"
+
+" Strings and constants
+syn match   fanSpecialError    	 	contained "\\."
+syn match   fanSpecialCharError 	contained "[^']"
+syn match   fanSpecialChar      	contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\|\$\)"
+syn match   fanStringSubst      	contained "\$[A-Za-z][A-Za-z_.]*"
+syn match   fanStringSubst      	contained "\${[^}]*}"
+syn region  fanString		start=+"+ end=+"+ contains=fanSpecialChar,fanSpecialError,fanStringSubst,@Spell
+syn region  fanTripleString	start=+"""+ end=+"""+ contains=fanSpecialChar,fanSpecialError,fanStringSubst,@Spell
+syn region  fanDSL		start=+<|+ end=+|>+ 
+syn match   fanUri		 "`[^`]*`"
+syn match   fanCharacter	 "'[^']*'" contains=fanSpecialChar,fanSpecialCharError
+syn match   fanCharacter	 "'\\''" contains=fanSpecialChar
+syn match   fanCharacter	 "'[^\\]'"
+syn match   fanNumber		 "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
+syn match   fanNumber		 "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
+syn match   fanNumber		 "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
+syn match   fanNumber		 "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
+
+syn cluster fanTop add=fanString,fanCharacter,fanNumber,fanSpecial,fanStringError
+
+" The default highlighting.
+hi def link fanBranch			Conditional
+hi def link fanLabel			Label
+hi def link fanUserLabel		Label
+hi def link fanConditional		Conditional
+hi def link fanRepeat			Repeat
+hi def link fanExceptions		Exception
+hi def link fanAssert			Statement
+hi def link fanStorageClass		StorageClass
+hi def link fanSlot        		StorageClass
+hi def link fanField        		StorageClass
+hi def link fanScopeDecl		StorageClass
+hi def link fanBoolean		Boolean
+hi def link fanSpecial		Special
+hi def link fanSpecialError		Error
+hi def link fanSpecialCharError	Error
+hi def link fanTripleString		String
+hi def link fanString			String
+hi def link fanDSL			String
+hi def link fanCharacter		String
+hi def link fanStringSubst		Identifier
+hi def link fanUri			SpecialChar
+hi def link fanSpecialChar		SpecialChar
+hi def link fanNumber			Number
+hi def link fanError			Error
+hi def link fanStringError		Error
+hi def link fanStatement		Statement
+hi def link fanOperator		Operator
+hi def link fanLongOperator		Operator
+hi def link fanComment		Comment
+hi def link fanDocComment		Comment
+hi def link fanLineComment		Comment
+hi def link fanConstant		Constant
+hi def link fanTypedef		Typedef
+hi def link fanTodo			Todo
+hi def link fanFacet                  PreProc
+
+hi def link fanCommentTitle		SpecialComment
+hi def link fanCommentStar		SpecialComment
+hi def link fanType			Identifier
+hi def link fanExternal		Include
+
+hi def link fanSpaceError		Error
+
+let b:current_syntax = "fan"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/fetchmail.vim b/syntax/fetchmail.vim
new file mode 100644
index 000000000..b2843c162
--- /dev/null
+++ b/syntax/fetchmail.vim
@@ -0,0 +1,79 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fetchmail') == -1
+
+" Vim syntax file
+" Language:             fetchmail(1) RC File
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword fetchmailTodo       contained FIXME TODO XXX NOTE
+
+syn region  fetchmailComment    start='#' end='$' contains=fetchmailTodo,@Spell
+
+syn match   fetchmailNumber     display '\<\d\+\>'
+
+syn region  fetchmailString     start=+"+ skip=+\\\\\|\\"+ end=+"+
+                                \ contains=fetchmailStringEsc
+syn region  fetchmailString     start=+'+ skip=+\\\\\|\\'+ end=+'+
+                                \ contains=fetchmailStringEsc
+
+syn match   fetchmailStringEsc  contained '\\\([ntb]\|0\d*\|x\x\+\)'
+
+syn region  fetchmailKeyword    transparent matchgroup=fetchmailKeyword
+                                \ start='\<poll\|skip\|defaults\>'
+                                \ end='\<poll\|skip\|defaults\>'
+                                \ contains=ALLBUT,fetchmailOptions,fetchmailSet
+
+syn keyword fetchmailServerOpts contained via proto[col] local[domains] port
+                                \ auth[enticate] timeout envelope qvirtual aka
+                                \ interface monitor plugin plugout dns
+                                \ checkalias uidl interval netsec principal
+                                \ esmtpname esmtppassword
+                                \ sslcertck sslcertpath sslfingerprint
+syn match   fetchmailServerOpts contained '\<no\_s\+\(envelope\|dns\|checkalias\|uidl\)'
+
+syn keyword fetchmailUserOpts   contained user[name] is to pass[word] ssl
+                                \ sslcert sslkey sslproto folder smtphost
+                                \ fetchdomains smtpaddress smtpname antispam
+                                \ mda bsmtp preconnect postconnect keep flush
+                                \ fetchall rewrite stripcr forcecr pass8bits
+                                \ dropstatus dropdelivered mimedecode idle
+                                \ limit warnings batchlimit fetchlimit expunge
+                                \ tracepolls properties
+syn match   fetchmailUserOpts   contained '\<no\_s\+\(keep\|flush\|fetchall\|rewrite\|stripcr\|forcecr\|pass8bits\|dropstatus\|dropdelivered\|mimedecode\|noidle\)'
+
+syn keyword fetchmailSpecial    contained here there
+
+syn keyword fetchmailNoise      and with has wants options
+syn match   fetchmailNoise      display '[:;,]'
+
+syn keyword fetchmailSet        nextgroup=fetchmailOptions skipwhite skipnl set
+
+syn keyword fetchmailOptions    daemon postmaster bouncemail spambounce logfile
+                                \ idfile syslog nosyslog properties
+syn match   fetchmailOptions    '\<no\_s\+\(bouncemail\|spambounce\)'
+
+hi def link fetchmailComment    Comment
+hi def link fetchmailTodo       Todo
+hi def link fetchmailNumber     Number
+hi def link fetchmailString     String
+hi def link fetchmailStringEsc  SpecialChar
+hi def link fetchmailKeyword    Keyword
+hi def link fetchmailServerOpts Identifier
+hi def link fetchmailUserOpts   Identifier
+hi def link fetchmailSpecial    Special
+hi def link fetchmailSet        Keyword
+hi def link fetchmailOptions    Identifier
+
+let b:current_syntax = "fetchmail"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/fgl.vim b/syntax/fgl.vim
new file mode 100644
index 000000000..a1e03f645
--- /dev/null
+++ b/syntax/fgl.vim
@@ -0,0 +1,138 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fgl') == -1
+
+" Vim syntax file
+" Language:	Informix 4GL
+" Maintainer:	Rafal M. Sulejman <rms@poczta.onet.pl>
+" Update:	26 Sep 2002
+" Changes:
+" - Dynamic 4GL/FourJs/4GL 7.30 pseudo comment directives (Julian Bridle)
+" - Conditionally allow case insensitive keywords (Julian Bridle)
+"
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if exists("fgl_ignore_case")
+  syntax case ignore
+else
+  syntax case match
+endif
+syn keyword fglKeyword ABORT ABS ABSOLUTE ACCEPT ACCESS ACOS ADD AFTER ALL
+syn keyword fglKeyword ALLOCATE ALTER AND ANSI ANY APPEND ARG_VAL ARRAY ARR_COUNT
+syn keyword fglKeyword ARR_CURR AS ASC ASCENDING ASCII ASIN AT ATAN ATAN2 ATTACH
+syn keyword fglKeyword ATTRIBUTE ATTRIBUTES AUDIT AUTHORIZATION AUTO AUTONEXT AVERAGE AVG
+syn keyword fglKeyword BEFORE BEGIN BETWEEN BLACK BLINK BLUE BOLD BORDER BOTH BOTTOM
+syn keyword fglKeyword BREAK BUFFERED BY BYTE
+syn keyword fglKeyword CALL CASCADE CASE CHAR CHARACTER CHARACTER_LENGTH CHAR_LENGTH
+syn keyword fglKeyword CHECK CLASS_ORIGIN CLEAR CLIPPED CLOSE CLUSTER COLOR
+syn keyword fglKeyword COLUMN COLUMNS COMMAND COMMENT COMMENTS COMMIT COMMITTED
+syn keyword fglKeyword COMPOSITES COMPRESS CONCURRENT CONNECT CONNECTION
+syn keyword fglKeyword CONNECTION_ALIAS CONSTRAINED CONSTRAINT CONSTRAINTS CONSTRUCT
+syn keyword fglKeyword CONTINUE CONTROL COS COUNT CREATE CURRENT CURSOR CYAN
+syn keyword fglKeyword DATA DATABASE DATASKIP DATE DATETIME DAY DBA DBINFO DBSERVERNAME
+syn keyword fglKeyword DEALLOCATE DEBUG DEC DECIMAL DECLARE DEFAULT DEFAULTS DEFER
+syn keyword fglKeyword DEFERRED DEFINE DELETE DELIMITER DELIMITERS DESC DESCENDING
+syn keyword fglKeyword DESCRIBE DESCRIPTOR DETACH DIAGNOSTICS DIM DIRTY DISABLED
+syn keyword fglKeyword DISCONNECT DISPLAY DISTINCT DISTRIBUTIONS DO DORMANT DOUBLE
+syn keyword fglKeyword DOWN DOWNSHIFT DROP
+syn keyword fglKeyword EACH ELIF ELSE ENABLED END ENTRY ERROR ERRORLOG ERR_GET
+syn keyword fglKeyword ERR_PRINT ERR_QUIT ESC ESCAPE EVERY EXCEPTION EXCLUSIVE
+syn keyword fglKeyword EXEC EXECUTE EXISTS EXIT EXP EXPLAIN EXPRESSION EXTEND EXTENT
+syn keyword fglKeyword EXTERN EXTERNAL
+syn keyword fglKeyword F1 F10 F11 F12 F13 F14 F15 F16 F17 F18 F19 F2 F20 F21 F22 F23
+syn keyword fglKeyword F24 F25 F26 F27 F28 F29 F3 F30 F31 F32 F33 F34 F35 F36 F37 F38
+syn keyword fglKeyword F39 F4 F40 F41 F42 F43 F44 F45 F46 F47 F48 F49 F5 F50 F51 F52
+syn keyword fglKeyword F53 F54 F55 F56 F57 F58 F59 F6 F60 F61 F62 F63 F64 F7 F8 F9
+syn keyword fglKeyword FALSE FETCH FGL_GETENV FGL_KEYVAL FGL_LASTKEY FIELD FIELD_TOUCHED
+syn keyword fglKeyword FILE FILLFACTOR FILTERING FINISH FIRST FLOAT FLUSH FOR
+syn keyword fglKeyword FOREACH FOREIGN FORM FORMAT FORMONLY FORTRAN FOUND FRACTION
+syn keyword fglKeyword FRAGMENT FREE FROM FUNCTION GET_FLDBUF GLOBAL GLOBALS GO GOTO
+syn keyword fglKeyword GRANT GREEN GROUP HAVING HEADER HELP HEX HIDE HIGH HOLD HOUR
+syn keyword fglKeyword IDATA IF ILENGTH IMMEDIATE IN INCLUDE INDEX INDEXES INDICATOR
+syn keyword fglKeyword INFIELD INIT INITIALIZE INPUT INSERT INSTRUCTIONS INT INTEGER
+syn keyword fglKeyword INTERRUPT INTERVAL INTO INT_FLAG INVISIBLE IS ISAM ISOLATION
+syn keyword fglKeyword ITYPE
+syn keyword fglKeyword KEY LABEL
+syn keyword fglKeyword LANGUAGE LAST LEADING LEFT LENGTH LET LIKE LINE
+syn keyword fglKeyword LINENO LINES LOAD LOCATE LOCK LOG LOG10 LOGN LONG LOW
+syn keyword fglKeyword MAGENTA MAIN MARGIN MATCHES MAX MDY MEDIUM MEMORY MENU MESSAGE
+syn keyword fglKeyword MESSAGE_LENGTH MESSAGE_TEXT MIN MINUTE MOD MODE MODIFY MODULE
+syn keyword fglKeyword MONEY MONTH MORE
+syn keyword fglKeyword NAME NCHAR NEED NEW NEXT NEXTPAGE NO NOCR NOENTRY NONE NORMAL
+syn keyword fglKeyword NOT NOTFOUND NULL NULLABLE NUMBER NUMERIC NUM_ARGS NVARCHAR
+syn keyword fglKeyword OCTET_LENGTH OF OFF OLD ON ONLY OPEN OPTIMIZATION OPTION OPTIONS
+syn keyword fglKeyword OR ORDER OTHERWISE OUTER OUTPUT
+syn keyword fglKeyword PAGE PAGENO PAUSE PDQPRIORITY PERCENT PICTURE PIPE POW PRECISION
+syn keyword fglKeyword PREPARE PREVIOUS PREVPAGE PRIMARY PRINT PRINTER PRIOR PRIVATE
+syn keyword fglKeyword PRIVILEGES PROCEDURE PROGRAM PROMPT PUBLIC PUT
+syn keyword fglKeyword QUIT QUIT_FLAG
+syn keyword fglKeyword RAISE RANGE READ READONLY REAL RECORD RECOVER RED REFERENCES
+syn keyword fglKeyword REFERENCING REGISTER RELATIVE REMAINDER REMOVE RENAME REOPTIMIZATION
+syn keyword fglKeyword REPEATABLE REPORT REQUIRED RESOLUTION RESOURCE RESTRICT
+syn keyword fglKeyword RESUME RETURN RETURNED_SQLSTATE RETURNING REVERSE REVOKE RIGHT
+syn keyword fglKeyword ROBIN ROLE ROLLBACK ROLLFORWARD ROOT ROUND ROW ROWID ROWIDS
+syn keyword fglKeyword ROWS ROW_COUNT RUN
+syn keyword fglKeyword SCALE SCHEMA SCREEN SCROLL SCR_LINE SECOND SECTION SELECT
+syn keyword fglKeyword SERIAL SERIALIZABLE SERVER_NAME SESSION SET SET_COUNT SHARE
+syn keyword fglKeyword SHORT SHOW SITENAME SIZE SIZEOF SKIP SLEEP SMALLFLOAT SMALLINT
+syn keyword fglKeyword SOME SPACE SPACES SQL SQLAWARN SQLCA SQLCODE SQLERRD SQLERRM
+syn keyword fglKeyword SQLERROR SQLERRP SQLSTATE SQLWARNING SQRT STABILITY START
+syn keyword fglKeyword STARTLOG STATIC STATISTICS STATUS STDEV STEP STOP STRING STRUCT
+syn keyword fglKeyword SUBCLASS_ORIGIN SUM SWITCH SYNONYM SYSTEM
+syn keyword fglKeyword SysBlobs SysChecks SysColAuth SysColDepend SysColumns
+syn keyword fglKeyword SysConstraints SysDefaults SysDepend SysDistrib SysFragAuth
+syn keyword fglKeyword SysFragments SysIndexes SysObjState SysOpClstr SysProcAuth
+syn keyword fglKeyword SysProcBody SysProcPlan SysProcedures SysReferences SysRoleAuth
+syn keyword fglKeyword SysSynTable SysSynonyms SysTabAuth SysTables SysTrigBody
+syn keyword fglKeyword SysTriggers SysUsers SysViews SysViolations
+syn keyword fglKeyword TAB TABLE TABLES TAN TEMP TEXT THEN THROUGH THRU TIME TO
+syn keyword fglKeyword TODAY TOP TOTAL TRACE TRAILER TRAILING TRANSACTION TRIGGER
+syn keyword fglKeyword TRIGGERS TRIM TRUE TRUNC TYPE TYPEDEF
+syn keyword fglKeyword UNCOMMITTED UNCONSTRAINED UNDERLINE UNION UNIQUE UNITS UNLOAD
+syn keyword fglKeyword UNLOCK UNSIGNED UP UPDATE UPSHIFT USER USING
+syn keyword fglKeyword VALIDATE VALUE VALUES VARCHAR VARIABLES VARIANCE VARYING
+syn keyword fglKeyword VERIFY VIEW VIOLATIONS
+syn keyword fglKeyword WAIT WAITING WARNING WEEKDAY WHEN WHENEVER WHERE WHILE WHITE
+syn keyword fglKeyword WINDOW WITH WITHOUT WORDWRAP WORK WRAP WRITE
+syn keyword fglKeyword YEAR YELLOW
+syn keyword fglKeyword ZEROFILL
+
+" Strings and characters:
+syn region fglString		start=+"+  skip=+\\\\\|\\"+  end=+"+
+syn region fglString		start=+'+  skip=+\\\\\|\\"+  end=+'+
+
+" Numbers:
+syn match fglNumber		"-\=\<[0-9]*\.\=[0-9_]\>"
+
+" Comments:
+syn region fglComment    start="{"  end="}"
+syn match fglComment	"--.*"
+syn match fglComment	"#.*"
+
+" Not a comment even though it looks like one (Dynamic 4GL/FourJs directive)
+syn match fglSpecial	"--#"
+syn match fglSpecial	"--@"
+
+syn sync ccomment fglComment
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link fglComment	Comment
+"hi def link fglKeyword	fglSpecial
+hi def link fglKeyword	fglStatement
+hi def link fglNumber	Number
+hi def link fglOperator	fglStatement
+hi def link fglSpecial	Special
+hi def link fglStatement	Statement
+hi def link fglString	String
+hi def link fglType	Type
+
+
+let b:current_syntax = "fgl"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/focexec.vim b/syntax/focexec.vim
new file mode 100644
index 000000000..18b191889
--- /dev/null
+++ b/syntax/focexec.vim
@@ -0,0 +1,92 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'focexec') == -1
+
+" Vim syntax file
+" Language:	Focus Executable
+" Maintainer:	Rob Brady <robb@datatone.com>
+" Last Change:	$Date: 2004/06/13 15:38:04 $
+" URL:		http://www.datatone.com/~robb/vim/syntax/focexec.vim
+" $Revision: 1.1 $
+
+" this is a very simple syntax file - I will be improving it
+" one thing is how to do computes
+" I don't like that &vars and FUSE() functions highlight to the same color
+" I think some of these things should get different hilights -
+"  should MODIFY commands look different than TABLE?
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+" A bunch of useful keywords
+syn keyword focexecTable	TABLE SUM BY ACROSS END PRINT HOLD LIST NOPRINT
+syn keyword focexecTable	SUBFOOT SUBHEAD HEADING FOOTING PAGE-BREAK AS
+syn keyword focexecTable	WHERE AND OR NOSPLIT FORMAT
+syn keyword focexecModify	MODIFY DATA ON FIXFORM PROMPT MATCH COMPUTE
+syn keyword focexecModify	GOTO CASE ENDCASE TYPE NOMATCH REJECT INCLUDE
+syn keyword focexecModify	CONTINUE FROM
+syn keyword focexecNormal	CHECK FILE CREATE EX SET IF FILEDEF DEFINE
+syn keyword focexecNormal	REBUILD IF RECORDLIMIT FI EQ JOIN
+syn keyword focexecJoin		IN TO
+syn keyword focexecFileDef	DISK
+syn keyword focexecSet		MSG ALL
+syn match   focexecDash		"-RUN"
+syn match   focexecDash		"-PROMPT"
+syn match   focexecDash		"-WINFORM"
+
+" String and Character constants
+syn region  focexecString1	start=+"+ end=+"+
+syn region  focexecString2	start=+'+ end=+'+
+
+"amper variables
+syn match   focexecAmperVar	"&&\=[A-Z_]\+"
+
+"fuse functions
+syn keyword focexecFuse GETUSER GETUSR WHOAMI FEXERR ASIS GETTOK UPCASE LOCASE
+syn keyword focexecFuse SUBSTR TODAY TODAYI POSIT HHMMSS BYTVAL EDAUT1 BITVAL
+syn keyword focexecFuse BITSON FGETENV FPUTENV HEXBYT SPAWN YM YMI JULDAT
+syn keyword focexecFuse JULDATI DOWK DOWKI DOWKLI CHGDAT CHGDATI FTOA ATODBL
+syn keyword focexecFuse SOUNDEX RJUST REVERSE PARAG OVRLAY LJUST CTRFLD CTRAN
+syn keyword focexecFuse CHKFMT ARGLEN GREGDT GREGDTI DTYMD DTYMDI DTDMY DTDMYI
+syn keyword focexecFuse DTYDM DTYDMI DTMYD DTMYDI DTDYM DTDYMI DAYMD DAYMDI
+syn keyword focexecFuse DAMDY DAMDYI DADMY DADMYI AYM AYMI AYMD AYMDI CHKPCK
+syn keyword focexecFuse IMOD FMOD DMOD PCKOUT EXP BAR SPELLNM SPELLNUM RTCIVP
+syn keyword focexecFuse PRDUNI PRDNOR RDNORM RDUNIF LCWORD ITOZ RLPHLD IBIPRO
+syn keyword focexecFuse IBIPRW IBIPRC IBIPRU IBIRCP PTHDAT ITOPACK ITONUM
+syn keyword focexecFuse DSMEXEC DSMEVAL DSMERRC MSMEXEC MSMEVAL MSMERRC EXTDXI
+syn keyword focexecFuse BAANHASH EDAYSI DTOG GTOD HSETPT HPART HTIME HNAME
+syn keyword focexecFuse HADD HDIFF HDATE HGETC HCNVRT HDTTM HMIDNT TEMPPATH
+syn keyword focexecFuse DATEADD DATEDIF DATEMOV DATECVT EURHLD EURXCH FINDFOC
+syn keyword focexecFuse FERRMES CNCTUSR CURRPATH USERPATH SYSTEM ASKYN
+syn keyword focexecFuse FUSEMENU POPEDIT POPFILE
+
+syn match   focexecNumber	"\<\d\+\>"
+syn match   focexecNumber	"\<\d\+\.\d*\>"
+
+syn match   focexecComment	"-\*.*"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link focexecString1		String
+hi def link focexecString2		String
+hi def link focexecNumber		Number
+hi def link focexecComment		Comment
+hi def link focexecTable		Keyword
+hi def link focexecModify		Keyword
+hi def link focexecNormal		Keyword
+hi def link focexecSet		Keyword
+hi def link focexecDash		Keyword
+hi def link focexecFileDef		Keyword
+hi def link focexecJoin		Keyword
+hi def link focexecAmperVar	Identifier
+hi def link focexecFuse		Function
+
+
+let b:current_syntax = "focexec"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/fortran.vim b/syntax/fortran.vim
new file mode 100644
index 000000000..087620c0a
--- /dev/null
+++ b/syntax/fortran.vim
@@ -0,0 +1,542 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
+
+" Vim syntax file
+" Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
+" Version:	102
+" Last Change:	2020 Apr 20
+" Patched By:	Eisuke Kawashima
+" Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
+" Usage:	For instructions, do :help fortran-syntax from Vim
+" Credits:
+"  Version 0.1 for Fortran 95 was created (April 2000) by Ajit Thakkar from the
+"  Fortran 77 syntax file by Mario Eusebio and Preben Guldberg.
+"  Since then, useful suggestions and contributions have been made, in order, by:
+"  Andrej Panjkov, Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile,
+"  Walter Dieudonn�, Alexander Wagner, Roman Bertle, Charles Rendleman,
+"  Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, Jan Hermann,
+"  Stefano Zaghi, Vishnu V. Krishnan, Judica�l Grasset, and Takuma Yoshida
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Choose fortran_dialect using the priority:
+" source file directive > buffer-local value > global value > file extension
+" first try using directive in first three lines of file
+let b:fortran_retype = getline(1)." ".getline(2)." ".getline(3)
+if b:fortran_retype =~? '\<fortran_dialect\s*=\s*F\>'
+  let b:fortran_dialect = "F"
+elseif b:fortran_retype =~? '\<fortran_dialect\s*=\s*f08\>'
+  let b:fortran_dialect = "f08"
+elseif !exists("b:fortran_dialect")
+  if exists("g:fortran_dialect") && g:fortran_dialect =~# '\<F\|f08\>'
+    " try global variable
+    let b:fortran_dialect = g:fortran_dialect
+  else         " nothing found, so use default
+    let b:fortran_dialect = "f08"
+  endif
+endif
+unlet! b:fortran_retype
+" make sure buffer-local value is not invalid
+if b:fortran_dialect !~# '\<F\|f08\>'
+  let b:fortran_dialect = "f08"
+endif
+
+" Choose between fixed and free source form if this hasn't been done yet
+if !exists("b:fortran_fixed_source")
+  if b:fortran_dialect == "F"
+    " F requires free source form
+    let b:fortran_fixed_source = 0
+  elseif exists("fortran_free_source")
+    " User guarantees free source form for all fortran files
+    let b:fortran_fixed_source = 0
+  elseif exists("fortran_fixed_source")
+    " User guarantees fixed source form for all fortran files
+    let b:fortran_fixed_source = 1
+  elseif expand("%:e") =~? '^f\%(90\|95\|03\|08\)$'
+    " Free-form file extension defaults as in Intel ifort, gcc(gfortran), NAG, Pathscale, and Cray compilers
+    let b:fortran_fixed_source = 0
+  elseif expand("%:e") =~? '^\%(f\|f77\|for\)$'
+    " Fixed-form file extension defaults
+    let b:fortran_fixed_source = 1
+  else
+    " Modern fortran still allows both free and fixed source form.
+    " Assume fixed source form unless signs of free source form
+    " are detected in the first five columns of the first s:lmax lines.
+    " Detection becomes more accurate and time-consuming if more lines
+    " are checked. Increase the limit below if you keep lots of comments at
+    " the very top of each file and you have a fast computer.
+    let s:lmax = 500
+    if ( s:lmax > line("$") )
+      let s:lmax = line("$")
+    endif
+    let b:fortran_fixed_source = 1
+    let s:ln=1
+    while s:ln <= s:lmax
+      let s:test = strpart(getline(s:ln),0,5)
+      if s:test !~ '^[Cc*]' && s:test !~ '^ *[!#]' && s:test =~ '[^ 0-9\t]' && s:test !~ '^[ 0-9]*\t'
+        let b:fortran_fixed_source = 0
+        break
+      endif
+      let s:ln = s:ln + 1
+    endwhile
+    unlet! s:lmax s:ln s:test
+  endif
+endif
+
+syn case ignore
+
+if b:fortran_fixed_source == 1
+  syn match fortranConstructName	"^\s\{6,}\zs\a\w*\ze\s*:"
+else
+  syn match fortranConstructName	"^\s*\zs\a\w*\ze\s*:"
+endif
+if exists("fortran_more_precise")
+  syn match fortranConstructName "\(\<end\s*do\s\+\)\@11<=\a\w*"
+  syn match fortranConstructName "\(\<end\s*if\s\+\)\@11<=\a\w*"
+  syn match fortranConstructName "\(\<end\s*select\s\+\)\@15<=\a\w*"
+endif
+
+syn match fortranUnitHeader	"\<end\>"
+syn match fortranType		"\<character\>"
+syn match fortranType		"\<complex\>"
+syn match fortranType		"\<integer\>"
+syn keyword fortranType		intrinsic
+syn match fortranType		"\<implicit\>"
+syn keyword fortranStructure	dimension
+syn keyword fortranStorageClass	parameter save
+syn match fortranUnitHeader	"\<subroutine\>"
+syn keyword fortranCall		call
+syn match fortranUnitHeader	"\<function\>"
+syn match fortranUnitHeader	"\<program\>"
+syn match fortranUnitHeader	"\<block\>"
+syn keyword fortranKeyword	return stop
+syn keyword fortranConditional	else then
+syn match fortranConditional	"\<if\>"
+syn match fortranConditionalOb	"\<if\s*(.*)\s*\d\+\s*,\s*\d\+\s*,\s*\d\+\s*$"
+syn match fortranRepeat		"\<do\>"
+
+syn keyword fortranTodo		contained todo fixme
+
+"Catch errors caused by too many right parentheses
+syn region fortranParen transparent start="(" end=")" contains=ALLBUT,fortranParenError,@fortranCommentGroup,cIncluded,@spell
+syn match  fortranParenError   ")"
+
+syn match fortranOperator	"\.\s*n\=eqv\s*\."
+syn match fortranOperator	"\.\s*\(and\|or\|not\)\s*\."
+syn match fortranOperator	"\(+\|-\|/\|\*\)"
+syn match fortranTypeOb		"\<character\s*\*"
+
+syn match fortranBoolean	"\.\s*\(true\|false\)\s*\."
+
+syn keyword fortranReadWrite	backspace close endfile inquire open print read rewind write
+
+"If tabs are allowed then the left margin checks do not work
+if exists("fortran_have_tabs")
+  syn match fortranTab		"\t"  transparent
+else
+  syn match fortranTab		"\t"
+endif
+
+syn keyword fortranIO		access blank direct exist file fmt form formatted iostat name named nextrec number opened rec recl sequential status unformatted unit
+
+syn keyword fortranIntrinsicR		alog alog10 amax0 amax1 amin0 amin1 amod cabs ccos cexp clog csin csqrt dabs dacos dasin datan datan2 dcos dcosh ddim dexp dint dlog dlog10 dmax1 dmin1 dmod dnint dsign dsin dsinh dsqrt dtan dtanh float iabs idim idint idnint ifix isign max0 max1 min0 min1 sngl
+
+" Intrinsics provided by some vendors
+syn keyword fortranExtraIntrinsic	algama cdabs cdcos cdexp cdlog cdsin cdsqrt cqabs cqcos cqexp cqlog cqsin cqsqrt dcmplx dconjg derf derfc dfloat dgamma dimag dlgama iqint qabs qacos qasin qatan qatan2 qcmplx qconjg qcos qcosh qdim qerf qerfc qexp qgamma qimag qlgama qlog qlog10 qmax1 qmin1 qmod qnint qsign qsin qsinh qsqrt qtan qtanh
+
+syn keyword fortranIntrinsic	abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh
+syn match fortranIntrinsic	"\<len\s*[(,]"me=s+3
+syn match fortranIntrinsic	"\<real\s*("me=s+4
+syn match fortranType		"\<implicit\s\+real"
+syn match fortranType		"^\s*real\>"
+syn match fortranIntrinsic	"\<logical\s*("me=s+7
+syn match fortranType		"\<implicit\s\+logical"
+syn match fortranType		"^\s*logical\>"
+
+"Numbers of various sorts
+" Integers
+syn match fortranNumber	display "\<\d\+\(_\a\w*\)\=\>"
+" floating point number, without a decimal point
+syn match fortranFloatIll	display	"\<\d\+[deq][-+]\=\d\+\(_\a\w*\)\=\>"
+" floating point number, starting with a decimal point
+syn match fortranFloatIll	display	"\.\d\+\([deq][-+]\=\d\+\)\=\(_\a\w*\)\=\>"
+" floating point number, no digits after decimal
+syn match fortranFloatIll	display	"\<\d\+\.\([deq][-+]\=\d\+\)\=\(_\a\w*\)\=\>"
+" floating point number, D or Q exponents
+syn match fortranFloatIll	display	"\<\d\+\.\d\+\([dq][-+]\=\d\+\)\=\(_\a\w*\)\=\>"
+" floating point number
+syn match fortranFloat	display	"\<\d\+\.\d\+\(e[-+]\=\d\+\)\=\(_\a\w*\)\=\>"
+" Numbers in formats
+syn match fortranFormatSpec	display	"\d*f\d\+\.\d\+"
+syn match fortranFormatSpec	display	"\d*e[sn]\=\d\+\.\d\+\(e\d+\>\)\="
+syn match fortranFormatSpec	display	"\d*\(d\|q\|g\)\d\+\.\d\+\(e\d+\)\="
+syn match fortranFormatSpec	display	"\d\+x\>"
+" The next match cannot be used because it would pick up identifiers as well
+" syn match fortranFormatSpec	display	"\<\(a\|i\)\d\+"
+
+" Numbers as labels
+syn match fortranLabelNumber	display	"^\d\{1,5}\s"me=e-1
+syn match fortranLabelNumber	display	"^ \d\{1,4}\s"ms=s+1,me=e-1
+syn match fortranLabelNumber	display	"^  \d\{1,3}\s"ms=s+2,me=e-1
+syn match fortranLabelNumber	display	"^   \d\d\=\s"ms=s+3,me=e-1
+syn match fortranLabelNumber	display	"^    \d\s"ms=s+4,me=e-1
+
+if exists("fortran_more_precise")
+  " Numbers as targets
+  syn match fortranTarget	display	"\(\<if\s*(.\+)\s*\)\@<=\(\d\+\s*,\s*\)\{2}\d\+\>"
+  syn match fortranTarget	display	"\(\<do\s\+\)\@11<=\d\+\>"
+  syn match fortranTarget	display	"\(\<go\s*to\s*(\=\)\@11<=\(\d\+\s*,\s*\)*\d\+\>"
+endif
+
+syn keyword fortranTypeR	external
+syn keyword fortranIOR		format
+syn match fortranKeywordR	"\<continue\>"
+syn match fortranKeyword	"^\s*\d\+\s\+continue\>"
+syn match fortranKeyword  	"\<go\s*to\>"
+syn match fortranKeywordDel  	"\<go\s*to\ze\s\+.*,\s*(.*$"
+syn match fortranKeywordOb  	"\<go\s*to\ze\s*(\d\+.*$"
+syn region fortranStringR	start=+'+ end=+'+ contains=fortranContinueMark,fortranLeftMargin,fortranSerialNumber
+syn keyword fortranIntrinsicR	dim lge lgt lle llt mod
+syn keyword fortranKeywordDel	assign pause
+
+syn match fortranType           "\<type\>"
+syn keyword fortranType	        none
+
+syn keyword fortranStructure	private public intent optional
+syn keyword fortranStructure	pointer target allocatable
+syn keyword fortranStorageClass	in out
+syn match fortranStorageClass	"\<kind\s*="me=s+4
+syn match fortranStorageClass	"\<len\s*="me=s+3
+
+syn match fortranUnitHeader	"\<module\>"
+syn match fortranUnitHeader	"\<submodule\>"
+syn keyword fortranUnitHeader	use only contains
+syn keyword fortranUnitHeader	result operator assignment
+syn match fortranUnitHeader	"\<interface\>"
+syn match fortranUnitHeader	"\<recursive\>"
+syn keyword fortranKeyword	allocate deallocate nullify cycle exit
+syn match fortranConditional	"\<select\>"
+syn keyword fortranConditional	case default where elsewhere
+
+syn match fortranOperator	"\(\(>\|<\)=\=\|==\|/=\|=\)"
+syn match fortranOperator	"=>"
+
+syn region fortranString	start=+"+ end=+"+	contains=fortranLeftMargin,fortranContinueMark,fortranSerialNumber
+syn keyword fortranIO		pad position action delim readwrite
+syn keyword fortranIO		eor advance nml
+
+syn keyword fortranIntrinsic	adjustl adjustr all allocated any associated bit_size btest ceiling count cshift date_and_time digits dot_product eoshift epsilon exponent floor fraction huge iand ibclr ibits ibset ieor ior ishft ishftc lbound len_trim matmul maxexponent maxloc maxval merge minexponent minloc minval modulo mvbits nearest pack precision present product radix random_number random_seed range repeat reshape rrspacing
+syn keyword fortranIntrinsic	scale scan selected_int_kind selected_real_kind set_exponent shape size spacing spread sum system_clock tiny transpose trim ubound unpack verify
+syn match fortranIntrinsic		"\<not\>\(\s*\.\)\@!"me=s+3
+syn match fortranIntrinsic	"\<kind\>\s*[(,]"me=s+4
+
+syn match  fortranUnitHeader	"\<end\s*function"
+syn match  fortranUnitHeader	"\<end\s*interface"
+syn match  fortranUnitHeader	"\<end\s*module"
+syn match  fortranUnitHeader	"\<end\s*submodule"
+syn match  fortranUnitHeader	"\<end\s*program"
+syn match  fortranUnitHeader	"\<end\s*subroutine"
+syn match  fortranUnitHeader	"\<end\s*block"
+syn match  fortranRepeat	"\<end\s*do"
+syn match  fortranConditional	"\<end\s*where"
+syn match  fortranConditional	"\<select\s*case"
+syn match  fortranConditional	"\<end\s*select"
+syn match  fortranType	"\<end\s*type"
+syn match  fortranType	"\<in\s*out"
+
+syn keyword fortranType	        procedure
+syn match  fortranType	        "\<module\ze\s\+procedure\>"
+syn keyword fortranIOR		namelist
+syn keyword fortranConditionalR	while
+syn keyword fortranIntrinsicR	achar iachar transfer
+
+syn keyword fortranInclude		include
+syn keyword fortranStorageClassR	sequence
+
+syn match   fortranConditional	"\<end\s*if"
+syn match   fortranIO		contains=fortranOperator "\<e\(nd\|rr\)\s*=\s*\d\+"
+syn match   fortranConditional	"\<else\s*if"
+
+syn keyword fortranUnitHeaderOb	entry
+syn match fortranTypeR		display "double\s\+precision"
+syn match fortranTypeR		display "double\s\+complex"
+syn match fortranUnitHeaderR	display "block\s\+data"
+syn keyword fortranStorageClassR	common equivalence data
+syn keyword fortranIntrinsicR	dble dprod
+syn match   fortranOperatorR	"\.\s*[gl][et]\s*\."
+syn match   fortranOperatorR	"\.\s*\(eq\|ne\)\s*\."
+
+syn keyword fortranRepeat		forall
+syn match fortranRepeat		"\<end\s*forall"
+syn keyword fortranIntrinsic	null cpu_time
+syn match fortranType			"\<elemental\>"
+syn match fortranType			"\<pure\>"
+syn match fortranType			"\<impure\>"
+if exists("fortran_more_precise")
+  syn match fortranConstructName "\(\<end\s*forall\s\+\)\@15<=\a\w*\>"
+endif
+
+if b:fortran_dialect == "f08"
+  " F2003
+  syn keyword fortranIntrinsic        command_argument_count get_command get_command_argument get_environment_variable is_iostat_end is_iostat_eor move_alloc new_line selected_char_kind same_type_as extends_type_of
+  " ISO_C_binding
+  syn keyword fortranConstant         c_null_char c_alert c_backspace c_form_feed c_new_line c_carriage_return c_horizontal_tab c_vertical_tab
+  syn keyword fortranConstant         c_int c_short c_long c_long_long c_signed_char c_size_t c_int8_t c_int16_t c_int32_t c_int64_t c_int_least8_t c_int_least16_t c_int_least32_t c_int_least64_t c_int_fast8_t c_int_fast16_t c_int_fast32_t c_int_fast64_t c_intmax_t C_intptr_t c_float c_double c_long_double c_float_complex c_double_complex c_long_double_complex c_bool c_char c_null_ptr c_null_funptr
+  syn keyword fortranIntrinsic        iso_c_binding c_loc c_funloc c_associated  c_f_pointer c_f_procpointer
+  syn keyword fortranType             c_ptr c_funptr
+  " ISO_Fortran_env
+  syn keyword fortranConstant         iso_fortran_env character_storage_size error_unit file_storage_size input_unit iostat_end iostat_eor numeric_storage_size output_unit
+  " IEEE_arithmetic
+  syn keyword fortranIntrinsic        ieee_arithmetic ieee_support_underflow_control ieee_get_underflow_mode ieee_set_underflow_mode
+
+  syn keyword fortranReadWrite	flush wait
+  syn keyword fortranIO 	      decimal round iomsg
+  syn keyword fortranType             asynchronous nopass non_overridable pass protected volatile extends import
+  syn keyword fortranType             non_intrinsic value bind deferred generic final enumerator
+  syn match fortranType               "\<abstract\>"
+  syn match fortranType               "\<class\>"
+  syn match fortranType               "\<associate\>"
+  syn match fortranType               "\<end\s*associate"
+  syn match fortranType               "\<enum\s*,\s*bind\s*(\s*c\s*)"
+  syn match fortranType               "\<end\s*enum"
+  syn match fortranConditional	"\<select\s*type"
+  syn match fortranConditional        "\<type\s*is\>"
+  syn match fortranConditional        "\<class\s*is\>"
+  syn match fortranUnitHeader         "\<abstract\s*interface\>"
+  syn match fortranOperator           "\([\|]\)"
+
+  " F2008
+  syn keyword fortranIntrinsic        acosh asinh atanh bessel_j0 bessel_j1 bessel_jn bessel_y0 bessel_y1 bessel_yn erf erfc erfc_scaled gamma log_gamma hypot norm2
+  syn keyword fortranIntrinsic        atomic_define atomic_ref execute_command_line leadz trailz storage_size merge_bits
+  syn keyword fortranIntrinsic        bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image
+  syn keyword fortranIO               newunit
+  syn keyword fortranType             contiguous
+  syn keyword fortranRepeat           concurrent
+
+" CUDA fortran
+  syn match fortranTypeCUDA           "\<attributes\>"
+  syn keyword fortranTypeCUDA         host global device value
+  syn keyword fortranTypeCUDA         shared constant pinned texture
+  syn keyword fortranTypeCUDA         dim1 dim2 dim3 dim4
+  syn keyword fortranTypeCUDA         cudadeviceprop cuda_count_kind cuda_stream_kind
+  syn keyword fortranTypeCUDA         cudaEvent cudaFuncAttributes cudaArrayPtr
+  syn keyword fortranTypeCUDA         cudaSymbol cudaChannelFormatDesc cudaPitchedPtr
+  syn keyword fortranTypeCUDA         cudaExtent cudaMemcpy3DParms
+  syn keyword fortranTypeCUDA         cudaFuncCachePreferNone cudaFuncCachePreferShared
+  syn keyword fortranTypeCUDA         cudaFuncCachePreferL1 cudaLimitStackSize
+  syn keyword fortranTypeCUDA         cudaLimitPrintfSize cudaLimitMallocHeapSize
+  syn keyword fortranTypeCUDA         cudaSharedMemBankSizeDefault cudaSharedMemBankSizeFourByte cudaSharedMemBankSizeEightByte
+  syn keyword fortranTypeCUDA         cudaEventDefault cudaEventBlockingSync cudaEventDisableTiming
+  syn keyword fortranTypeCUDA         cudaMemcpyHostToDevice cudaMemcpyDeviceToHost
+  syn keyword fortranTypeCUDA         cudaMemcpyDeviceToDevice
+  syn keyword fortranTypeCUDA         cudaErrorNotReady cudaSuccess cudaErrorInvalidValue
+  syn keyword fortranTypeCUDA         c_devptr
+
+  syn match fortranStringCUDA         "blockidx%[xyz]"
+  syn match fortranStringCUDA         "blockdim%[xyz]"
+  syn match fortranStringCUDA         "griddim%[xyz]"
+  syn match fortranStringCUDA         "threadidx%[xyz]"
+
+  syn keyword fortranIntrinsicCUDA    warpsize syncthreads syncthreads_and syncthreads_count syncthreads_or threadfence threadfence_block threadfence_system gpu_time allthreads anythread ballot
+  syn keyword fortranIntrinsicCUDA    atomicadd atomicsub atomicmax atomicmin atomicand atomicor atomicxor atomicexch atomicinc atomicdec atomiccas sizeof __shfl __shfl_up __shfl_down __shfl_xor
+  syn keyword fortranIntrinsicCUDA    cudaChooseDevice cudaDeviceGetCacheConfig cudaDeviceGetLimit cudaDeviceGetSharedMemConfig cudaDeviceReset cudaDeviceSetCacheConfig cudaDeviceSetLimit cudaDeviceSetSharedMemConfig cudaDeviceSynchronize cudaGetDevice cudaGetDeviceCount cudaGetDeviceProperties cudaSetDevice cudaSetDeviceFlags cudaSetValidDevices
+  syn keyword fortranIntrinsicCUDA    cudaThreadExit cudaThreadSynchronize cudaGetLastError cudaGetErrorString cudaPeekAtLastError cudaStreamCreate cudaStreamDestroy cudaStreamQuery cudaStreamSynchronize cudaStreamWaitEvent cudaEventCreate cudaEventCreateWithFlags cudaEventDestroy cudaEventElapsedTime cudaEventQuery cudaEventRecord cudaEventSynchronize
+  syn keyword fortranIntrinsicCUDA    cudaFuncGetAttributes cudaFuncSetCacheConfig cudaFuncSetSharedMemConfig cudaSetDoubleForDevice cudaSetDoubleForHost cudaFree cudaFreeArray cudaFreeHost cudaGetSymbolAddress cudaGetSymbolSize
+  syn keyword fortranIntrinsicCUDA    cudaHostAlloc cudaHostGetDevicePointer cudaHostGetFlags cudaHostRegister cudaHostUnregister cudaMalloc cudaMallocArray cudaMallocHost cudaMallocPitch cudaMalloc3D cudaMalloc3DArray
+  syn keyword fortranIntrinsicCUDA    cudaMemcpy cudaMemcpyArraytoArray cudaMemcpyAsync cudaMemcpyFromArray cudaMemcpyFromSymbol cudaMemcpyFromSymbolAsync cudaMemcpyPeer cudaMemcpyPeerAsync cudaMemcpyToArray cudaMemcpyToSymbol cudaMemcpyToSymbolAsync cudaMemcpy2D cudaMemcpy2DArrayToArray cudaMemcpy2DAsync cudaMemcpy2DFromArray cudaMemcpy2DToArray cudaMemcpy3D cudaMemcpy3DAsync
+  syn keyword fortranIntrinsicCUDA    cudaMemGetInfo cudaMemset cudaMemset2D cudaMemset3D cudaDeviceCanAccessPeer cudaDeviceDisablePeerAccess cudaDeviceEnablePeerAccess cudaPointerGetAttributes cudaDriverGetVersion cudaRuntimeGetVersion
+
+  syn region none matchgroup=fortranType start="<<<" end=">>>" contains=ALLBUT,none
+endif
+
+syn cluster fortranCommentGroup contains=fortranTodo
+
+if (b:fortran_fixed_source == 1)
+  if !exists("fortran_have_tabs")
+    "Flag items beyond column 72
+    syn match fortranSerialNumber	excludenl "^.\{73,}$"lc=72
+    "Flag left margin errors
+    syn match fortranLabelError	"^.\{-,4}[^0-9 ]" contains=fortranTab
+    syn match fortranLabelError	"^.\{4}\d\S"
+  endif
+  syn match fortranComment		excludenl "^[!c*].*$" contains=@fortranCommentGroup,@spell
+  syn match fortranLeftMargin		transparent "^ \{5}"
+  syn match fortranContinueMark		display "^.\{5}\S"lc=5
+else
+  syn match fortranContinueMark		display "&"
+endif
+
+syn match fortranComment	excludenl "!.*$" contains=@fortranCommentGroup,@spell
+syn match fortranOpenMP		excludenl 		"^\s*!\$\(OMP\)\=&\=\s.*$"
+
+"cpp is often used with Fortran
+syn match	cPreProc		"^\s*#\s*\(define\|ifdef\)\>.*"
+syn match	cPreProc		"^\s*#\s*\(elif\|if\)\>.*"
+syn match	cPreProc		"^\s*#\s*\(ifndef\|undef\)\>.*"
+syn match	cPreCondit		"^\s*#\s*\(else\|endif\)\>.*"
+syn region	cIncluded	contained start=+"[^("]+ skip=+\\\\\|\\"+ end=+"+ contains=fortranLeftMargin,fortranContinueMark,fortranSerialNumber
+"syn region	cIncluded	        contained start=+"[^("]+ skip=+\\\\\|\\"+ end=+"+
+syn match	cIncluded		contained "<[^>]*>"
+syn match	cInclude		"^\s*#\s*include\>\s*["<]" contains=cIncluded
+
+"Synchronising limits assume that comment and continuation lines are not mixed
+if exists("fortran_fold") || exists("fortran_more_precise")
+  syn sync fromstart
+elseif (b:fortran_fixed_source == 0)
+  syn sync linecont "&" minlines=30
+else
+  syn sync minlines=30
+endif
+
+if exists("fortran_fold")
+
+  if (b:fortran_fixed_source == 1)
+    syn region fortranProgram transparent fold keepend start="^\s*program\s\+\z(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\(program\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranModule
+    syn region fortranModule transparent fold keepend start="^\s*submodule\s\+(\a\w*\s*\(:\a\w*\s*\)*)\s*\z\(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\(submodule\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranProgram,fortranModule
+    syn region fortranModule transparent fold keepend start="^\s*module\s\+\(procedure\)\@!\z(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\(module\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranProgram
+    syn region fortranFunction transparent fold keepend extend start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*\(\(\(real \|integer \|logical \|complex \|double \s*precision \)\s*\((\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\|type\s\+(\s*\w\+\s*) \|character \((\(\s*len\s*=\)\=\s*\d\+\s*)\|(\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\=\s*function\s\+\z(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\($\|function\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
+    syn region fortranSubroutine transparent fold keepend extend start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*subroutine\s\+\z(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\($\|subroutine\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
+    syn region fortranBlockData transparent fold keepend start="\<block\s*data\(\s\+\z(\a\w*\)\)\=" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\($\|block\s*data\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
+    syn region fortranAssociate transparent fold keepend start="^\s*\<associate\s\+" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*associate" contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction
+    syn region fortranInterface transparent fold keepend extend start="^\s*\(abstract \)\=\s*interface\>" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*interface\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
+    syn region fortranTypeDef transparent fold keepend extend start="^\s*type\s*\(,\s*\(public\|private\|abstract\)\)\=\s*::" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*type\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock,fortranInterface
+  else
+    syn region fortranProgram transparent fold keepend start="^\s*program\s\+\z(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\(program\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranModule
+    syn region fortranModule transparent fold keepend start="^\s*submodule\s\+(\a\w*\s*\(:\a\w*\s*\)*)\s*\z\(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\(submodule\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranProgram,fortranModule
+    syn region fortranModule transparent fold keepend start="^\s*module\s\+\(procedure\)\@!\z(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\(module\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranProgram
+    syn region fortranFunction transparent fold keepend extend start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*\(\(\(real \|integer \|logical \|complex \|double \s*precision \)\s*\((\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\|type\s\+(\s*\w\+\s*) \|character \((\(\s*len\s*=\)\=\s*\d\+\s*)\|(\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\=\s*function\s\+\z(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\($\|function\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
+    syn region fortranSubroutine transparent fold keepend extend start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*subroutine\s\+\z(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\($\|subroutine\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
+    syn region fortranBlockData transparent fold keepend start="\<block\s*data\(\s\+\z(\a\w*\)\)\=" skip="^\s*[!#].*$" excludenl end="\<end\s*\($\|block\s*data\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
+    syn region fortranAssociate transparent fold keepend start="^\s*\<associate\s\+" skip="^\s*[!#].*$" excludenl end="\<end\s*associate" contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction
+    syn region fortranInterface transparent fold keepend extend start="^\s*\(abstract \)\=\s*interface\>" skip="^\s*[!#].*$" excludenl end="\<end\s*interface\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
+    syn region fortranTypeDef transparent fold keepend extend start="^\s*type\s*\(,\s*\(public\|private\|abstract\)\)\=\s*::" skip="^\s*[!#].*$" excludenl end="\<end\s*type\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock,fortranInterface
+  endif
+
+  if exists("fortran_fold_conditionals")
+    if (b:fortran_fixed_source == 1)
+      syn region fortran77Loop transparent fold keepend start="\<do\s\+\z(\d\+\)" end="^\s*\z1\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+      syn region fortran90Loop transparent fold keepend extend start="\(\<end\s\+\)\@<!\<do\(\s\+\a\|\s*$\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*do\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+      syn region fortranIfBlock transparent fold keepend extend start="\(\<e\(nd\|lse\)\s\+\)\@<!\<if\s*(.\+)\s*then\>" skip="^\([!c*]\|\s*#\).*$" end="\<end\s*if\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+      syn region fortranCase transparent fold keepend extend start="\<select\s*\(case\|type\)\>" skip="^\([!c*]\|\s*#\).*$" end="\<end\s*select\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+    else
+      syn region fortran77Loop transparent fold keepend start="\<do\s\+\z(\d\+\)" end="^\s*\z1\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+      syn region fortran90Loop transparent fold keepend extend start="\(\<end\s\+\)\@<!\<do\(\s\+\a\|\s*$\)" skip="^\s*[!#].*$" excludenl end="\<end\s*do\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+      syn region fortranIfBlock transparent fold keepend extend start="\(\<e\(nd\|lse\)\s\+\)\@<!\<if\s*(\(.\|&\s*\n\)\+)\(\s\|&\s*\n\)*then\>" skip="^\s*[!#].*$" end="\<end\s*if\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+      syn region fortranCase transparent fold keepend extend start="\<select\s*\(case\|type\)\>" skip="^\s*[!#].*$" end="\<end\s*select\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+    endif
+  endif
+
+  if exists("fortran_fold_multilinecomments")
+    if (b:fortran_fixed_source == 1)
+      syn match fortranMultiLineComments transparent fold "\(^[!c*].*\(\n\|\%$\)\)\{4,}" contains=ALLBUT,fortranMultiCommentLines
+    else
+      syn match fortranMultiLineComments transparent fold "\(^\s*!.*\(\n\|\%$\)\)\{4,}" contains=ALLBUT,fortranMultiCommentLines
+    endif
+  endif
+endif
+
+" Define the default highlighting.
+" The default highlighting differs for each dialect.
+" Transparent groups:
+" fortranParen, fortranLeftMargin
+" fortranProgram, fortranModule, fortranSubroutine, fortranFunction,
+" fortranBlockData
+" fortran77Loop, fortran90Loop, fortranIfBlock, fortranCase
+" fortranMultiCommentLines
+hi def link fortranKeyword 	Keyword
+hi def link fortranConstructName	Identifier
+hi def link fortranConditional	Conditional
+hi def link fortranRepeat	Repeat
+hi def link fortranTodo		Todo
+hi def link fortranContinueMark	Special
+hi def link fortranString	String
+hi def link fortranNumber	Number
+hi def link fortranOperator	Operator
+hi def link fortranBoolean	Boolean
+hi def link fortranLabelError	Error
+hi def link fortranObsolete	Todo
+hi def link fortranType		Type
+hi def link fortranStructure	Type
+hi def link fortranStorageClass	StorageClass
+hi def link fortranCall		Function
+hi def link fortranUnitHeader	fortranPreCondit
+hi def link fortranReadWrite	Keyword
+hi def link fortranIO		Keyword
+hi def link fortranIntrinsic	Function
+hi def link fortranConstant	Constant
+
+" To stop deleted & obsolescent features being highlighted as Todo items,
+" comment out the next 5 lines and uncomment the 5 lines after that
+hi def link fortranUnitHeaderOb    fortranObsolete
+hi def link fortranKeywordOb       fortranObsolete
+hi def link fortranConditionalOb   fortranObsolete
+hi def link fortranTypeOb          fortranObsolete
+hi def link fortranKeywordDel      fortranObsolete
+"hi def link fortranUnitHeaderOb    fortranUnitHeader
+"hi def link fortranKeywordOb       fortranKeyword
+"hi def link fortranConditionalOb   fortranConditional
+"hi def link fortranTypeOb          fortranType
+"hi def link fortranKeywordDel      fortranKeyword
+
+if b:fortran_dialect == "F"
+  hi! def link fortranIntrinsicR	fortranObsolete
+  hi! def link fortranUnitHeaderR	fortranObsolete
+  hi! def link fortranTypeR		fortranObsolete
+  hi! def link fortranStorageClassR	fortranObsolete
+  hi! def link fortranOperatorR 	fortranObsolete
+  hi! def link fortranInclude   	fortranObsolete
+  hi! def link fortranLabelNumber	fortranObsolete
+  hi! def link fortranTarget	        fortranObsolete
+  hi! def link fortranFloatIll	        fortranObsolete
+  hi! def link fortranIOR		fortranObsolete
+  hi! def link fortranKeywordR	        fortranObsolete
+  hi! def link fortranStringR	        fortranObsolete
+  hi! def link fortranConditionalR	fortranObsolete
+else
+  hi! def link fortranIntrinsicR	fortranIntrinsic
+  hi! def link fortranUnitHeaderR	fortranPreCondit
+  hi! def link fortranTypeR		fortranType
+  hi! def link fortranStorageClassR	fortranStorageClass
+  hi! def link fortranOperatorR	        fortranOperator
+  hi! def link fortranInclude	        Include
+  hi! def link fortranLabelNumber	Special
+  hi! def link fortranTarget	        Special
+  hi! def link fortranFloatIll	        fortranFloat
+  hi! def link fortranIOR		fortranIO
+  hi! def link fortranKeywordR	        fortranKeyword
+  hi! def link fortranStringR	        fortranString
+  hi! def link fortranConditionalR	fortranConditional
+endif
+
+" CUDA
+hi def link fortranIntrinsicCUDA        fortranIntrinsic
+hi def link fortranTypeCUDA             fortranType
+hi def link fortranStringCUDA           fortranString
+
+hi def link fortranFormatSpec	Identifier
+hi def link fortranFloat	Float
+hi def link fortranPreCondit	PreCondit
+hi def link cIncluded		fortranString
+hi def link cInclude		Include
+hi def link cPreProc		PreProc
+hi def link cPreCondit		PreCondit
+hi def link fortranOpenMP       PreProc
+hi def link fortranParenError	Error
+hi def link fortranComment	Comment
+hi def link fortranSerialNumber	Todo
+hi def link fortranTab		Error
+
+" Uncomment the next line if you use extra intrinsics provided by vendors
+"hi def link fortranExtraIntrinsic	Function
+
+let b:current_syntax = "fortran"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8 tw=132
+
+endif
diff --git a/syntax/framescript.vim b/syntax/framescript.vim
new file mode 100644
index 000000000..720f1d4a2
--- /dev/null
+++ b/syntax/framescript.vim
@@ -0,0 +1,495 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'framescript') == -1
+
+" Vim syntax file
+" Language:             FrameScript v4.0
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-02-22
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match   framescriptOperator
+      \ '[+*/%=-]\|[><]=\=\|#[&|]'
+
+syn keyword framescriptTodo
+      \ contained
+      \ TODO FIXME XXX NOTE
+
+syn cluster framescriptCommentGroup
+      \ contains=
+      \   framescriptTodo,
+      \   @Spell
+
+syn match   framescriptComment
+      \ display
+      \ contains=@framescriptCommentGroup
+      \ '//.*$'
+
+syn region  framescriptComment
+      \ contains=@framescriptCommentGroup
+      \ matchgroup=framescriptCommentStart
+      \ start='/\*'
+      \ end='\*/'
+
+syn case ignore
+
+syn match   framescriptInclude
+      \ display
+      \ contains=framescriptIncluded
+      \ "^\s*<#Include\>\s*'"
+
+syn region  framescriptIncluded
+      \ contained
+      \ display
+      \ start=+'+
+      \ skip=+\\\\\|\\'+
+      \ end=+'+
+
+syn match   framescriptNumbers
+      \ display
+      \ transparent
+      \ contains=
+      \   framescriptInteger,
+      \   framescriptReal,
+      \   framescriptMetric,
+      \   framescriptCharacter
+      \ '\<\d\|\.\d'
+
+syn keyword framescriptBoolean
+      \ True False
+
+syn match   framescriptInteger
+      \ contained
+      \ display
+      \ '\d\+\>'
+
+syn match   framescriptInteger
+      \ contained
+      \ display
+      \ '\x\+H\>'
+
+syn match   framescriptInteger
+      \ contained
+      \ display
+      \ '[01]\+B\>'
+
+syn match   framescriptReal
+      \ contained
+      \ display
+      \ '\d\+\.\d*\|\.\d\+\>'
+
+syn match   framescriptMetric
+      \ contained
+      \ display
+      \ '\%(\d\+\%(\.\d*\)\=\|\.\d\+\)\%(pts\|in\|"\|cm\|mm\|pica\)\>'
+
+syn match   framescriptCharacter
+      \ contained
+      \ display
+      \ '\d\+S\>'
+
+syn region  framescriptString
+      \ contains=framescriptStringSpecialChar,@Spell
+      \ start=+'+
+      \ skip=+\\\\\|\\'+
+      \ end=+'+
+
+syn match   framescriptStringSpecialChar
+      \ contained
+      \ display
+      \ "\\[\\']"
+
+syn keyword framescriptConstant
+      \ BackSlash
+      \ CharCR
+      \ CharLF
+      \ CharTAB
+      \ ClientDir
+      \ ClientName
+      \ FslVersionMajor
+      \ FslVersionMinor
+      \ InstallName
+      \ InstalledScriptList
+      \ MainScript
+      \ NULL
+      \ ObjEndOffset
+      \ ProductRevision
+      \ Quote
+      \ ThisScript
+
+syn keyword framescriptOperator
+      \ not
+      \ and
+      \ or
+
+syn keyword framescriptSessionVariables
+      \ ErrorCode
+      \ ErrorMsg
+      \ DeclareVarMode
+      \ PlatformEncodingMode
+
+syn keyword framescriptStructure
+      \ Event
+      \ EndEvent
+
+syn keyword framescriptStatement
+      \ Sub
+      \ EndSub
+      \ Run
+      \ Function
+      \ EndFunction
+      \ Set
+      \ Add
+      \ Apply
+      \ CallClient
+      \ Close
+      \ Copy
+      \ Cut
+      \ DialogBox
+      \ Delete
+      \ Demote
+      \ Display
+      \ DocCompare
+      \ Export
+      \ Find
+      \ LeaveLoop
+      \ LeaveScript
+      \ LeaveSub
+      \ LoopNext
+      \ Merge
+      \ MsgBox
+      \ Paste
+      \ PopClipboard
+      \ PushClipboard
+      \ Read
+      \ Replace
+      \ Return
+      \ Sort
+      \ Split
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptApplySubStatement skipwhite skipempty
+      \ Apply
+
+syn keyword framescriptApplySubStatement
+      \ contained
+      \ Pagelayout
+      \ TextProperties
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptClearSubStatement skipwhite skipempty
+      \ Clear
+
+syn keyword framescriptClearSubStatement
+      \ contained
+      \ ChangeBars
+      \ Text
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptCloseSubStatement skipwhite skipempty
+      \ Close
+
+syn keyword framescriptCloseSubStatement
+      \ contained
+      \ Book
+      \ Document
+      \ TextFile
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptExecSubStatement skipwhite skipempty
+      \ Exec
+
+syn keyword framescriptExecSubStatement
+      \ contained
+      \ Compile
+      \ Script
+      \ Wait
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptExecuteSubStatement skipwhite skipempty
+      \ Execute
+
+syn keyword framescriptExecuteSubStatement
+      \ contained
+      \ FrameCommand
+      \ Hypertext
+      \ StartUndoCheckPoint
+      \ EndUndoCheckPoint
+      \ ClearUndoHistory
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptGenerateSubStatement skipwhite skipempty
+      \ Generate
+
+syn keyword framescriptGenerateSubStatement
+      \ contained
+      \ Bookfile
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptGetSubStatement skipwhite skipempty
+      \ Get
+
+syn keyword framescriptGetSubStatement
+      \ contained
+      \ Member
+      \ Object
+      \ String
+      \ TextList
+      \ TextProperties
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptImportSubStatement skipwhite skipempty
+      \ Import
+
+syn keyword framescriptImportSubStatement
+      \ contained
+      \ File
+      \ Formats
+      \ ElementDefs
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptInstallSubStatement skipwhite skipempty
+      \ Install
+      \ Uninstall
+
+syn keyword framescriptInstallSubStatement
+      \ contained
+      \ ChangeBars
+      \ Text
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptNewSubStatement skipwhite skipempty
+      \ New
+
+syn keyword framescriptNewSubStatement
+      \ contained
+      \ AFrame
+      \ Footnote
+      \ Marker
+      \ TiApiClient
+      \ Variable
+      \ XRef
+      \ FormatChangeList
+      \ FormatRule
+      \ FmtRuleClause
+      \ Arc
+      \ Ellipse
+      \ Flow
+      \ Group
+      \ Inset
+      \ Line
+      \ Math
+      \ Polygon
+      \ Polyline
+      \ Rectangle
+      \ RoundRect
+      \ TextFrame
+      \ Textline
+      \ UnanchoredFrame
+      \ Command
+      \ Menu
+      \ MenuItemSeparator
+      \ Book
+      \ CharacterFormat
+      \ Color
+      \ ConditionFormat
+      \ ElementDef
+      \ FormatChangeList
+      \ MarkerType
+      \ MasterPage
+      \ ParagraphFormat
+      \ PgfFmt
+      \ ReferencePAge
+      \ RulingFormat
+      \ TableFormat
+      \ VariableFormat
+      \ XRefFormat
+      \ BodyPage
+      \ BookComponent
+      \ Paragraph
+      \ Element
+      \ Attribute
+      \ AttributeDef
+      \ AttributeList
+      \ AttributeDefList
+      \ ElementLoc
+      \ ElementRange
+      \ Table
+      \ TableRows
+      \ TableCols
+      \ Text
+      \ Integer
+      \ Real
+      \ Metric
+      \ String
+      \ Object
+      \ TextLoc
+      \ TextRange
+      \ IntList
+      \ UIntList
+      \ MetricList
+      \ StringList
+      \ PointList
+      \ TabList
+      \ PropertyList
+      \ LibVar
+      \ ScriptVar
+      \ SubVar
+      \ TextFile
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptOpenSubStatement skipwhite skipempty
+      \ Open
+
+syn keyword framescriptOpenSubStatement
+      \ contained
+      \ Document
+      \ Book
+      \ TextFile
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptPrintSubStatement skipwhite skipempty
+      \ Print
+
+syn keyword framescriptPrintSubStatement
+      \ contained
+      \ Document
+      \ Book
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptQuitSubStatement skipwhite skipempty
+      \ Quit
+
+syn keyword framescriptQuitSubStatement
+      \ contained
+      \ Session
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptRemoveSubStatement skipwhite skipempty
+      \ Remove
+
+syn keyword framescriptRemoveSubStatement
+      \ contained
+      \ Attribute
+      \ CommandObject
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptSaveSubStatement skipwhite skipempty
+      \ Save
+
+syn keyword framescriptSaveSubStatement
+      \ contained
+      \ Document
+      \ Book
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptSelectSubStatement skipwhite skipempty
+      \ Select
+
+syn keyword framescriptSelectSubStatement
+      \ contained
+      \ TableCells
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptStraddleSubStatement skipwhite skipempty
+      \ Straddle
+
+syn keyword framescriptStraddleSubStatement
+      \ contained
+      \ TableCells
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptUpdateSubStatement skipwhite skipempty
+      \ Update
+
+syn keyword framescriptUpdateSubStatement
+      \ contained
+      \ ReDisplay
+      \ Formatting
+      \ Hyphenating
+      \ ResetEquationsSettings
+      \ ResetRefFrames
+      \ RestartPgfNums
+      \ TextInset
+      \ Variables
+      \ XRefs
+      \ Book
+
+syn keyword framescriptStatement
+      \ nextgroup=framescriptWriteSubStatement skipwhite skipempty
+      \ Write
+
+syn keyword framescriptUpdateSubStatement
+      \ contained
+      \ Console
+      \ Display
+
+syn keyword framescriptRepeat
+      \ Loop
+      \ EndLoop
+
+syn keyword framescriptConditional
+      \ If
+      \ ElseIf
+      \ Else
+      \ EndIf
+
+syn keyword framescriptType
+      \ Local
+      \ GlobalVar
+
+let b:framescript_minlines = exists("framescript_minlines")
+                         \ ? framescript_minlines : 15
+exec "syn sync ccomment framescriptComment minlines=" . b:framescript_minlines
+
+hi def link framescriptTodo                 Todo
+hi def link framescriptComment              Comment
+hi def link framescriptCommentStart         framescriptComment
+hi def link framescriptInclude              Include
+hi def link framescriptIncluded             String
+hi def link framescriptBoolean              Boolean
+hi def link framescriptNumber               Number
+hi def link framescriptInteger              framescriptNumber
+hi def link framescriptReal                 framescriptNumber
+hi def link framescriptMetric               framescriptNumber
+hi def link framescriptCharacter            framescriptNumber
+hi def link framescriptString               String
+hi def link framescriptStringSpecialChar    SpecialChar
+hi def link framescriptConstant             Constant
+hi def link framescriptOperator             None
+hi def link framescriptSessionVariables     PreProc
+hi def link framescriptStructure            Structure
+hi def link framescriptStatement            Statement
+hi def link framescriptSubStatement         Type
+hi def link framescriptApplySubStatement    framescriptSubStatement
+hi def link framescriptClearSubStatement    framescriptSubStatement
+hi def link framescriptCloseSubStatement    framescriptSubStatement
+hi def link framescriptExecSubStatement     framescriptSubStatement
+hi def link framescriptExecuteSubStatement  framescriptSubStatement
+hi def link framescriptGenerateSubStatement framescriptSubStatement
+hi def link framescriptGetSubStatement      framescriptSubStatement
+hi def link framescriptImportSubStatement   framescriptSubStatement
+hi def link framescriptInstallSubStatement  framescriptSubStatement
+hi def link framescriptNewSubStatement      framescriptSubStatement
+hi def link framescriptOpenSubStatement     framescriptSubStatement
+hi def link framescriptPrintSubStatement    framescriptSubStatement
+hi def link framescriptQuitSubStatement     framescriptSubStatement
+hi def link framescriptRemoveSubStatement   framescriptSubStatement
+hi def link framescriptSaveSubStatement     framescriptSubStatement
+hi def link framescriptSelectSubStatement   framescriptSubStatement
+hi def link framescriptStraddleSubStatement framescriptSubStatement
+hi def link framescriptUpdateSubStatement   framescriptSubStatement
+hi def link framescriptRepeat               Repeat
+hi def link framescriptConditional          Conditional
+hi def link framescriptType                 Type
+
+let b:current_syntax = "framescript"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/fstab.vim b/syntax/fstab.vim
new file mode 100644
index 000000000..256f2d041
--- /dev/null
+++ b/syntax/fstab.vim
@@ -0,0 +1,295 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fstab') == -1
+
+" Vim syntax file
+" Language: fstab file
+" Maintainer: Radu Dineiu <radu.dineiu@gmail.com>
+" URL: https://raw.github.com/rid9/vim-fstab/master/fstab.vim
+" Last Change: 2020 Aug 06
+" Version: 1.4
+"
+" Credits:
+"   David Necas (Yeti) <yeti@physics.muni.cz>
+"   Stefano Zacchiroli <zack@debian.org>
+"   Georgi Georgiev <chutz@gg3.net>
+"   James Vega <jamessan@debian.org>
+"   Elias Probst <mail@eliasprobst.eu>
+
+" Options:
+"   let fstab_unknown_fs_errors = 1
+"     highlight unknown filesystems as errors
+"
+"   let fstab_unknown_device_errors = 0
+"     do not highlight unknown devices as errors
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" General
+syn cluster fsGeneralCluster contains=fsComment
+syn match fsComment /\s*#.*/ contains=@Spell
+syn match fsOperator /[,=:#]/
+
+" Device
+syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
+syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
+syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts devtmpfs sysfs usbfs
+syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
+syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
+syn keyword fsDeviceKeyword contained PARTLABEL nextgroup=fsDevicePARTLABEL
+syn keyword fsDeviceKeyword contained PARTUUID nextgroup=fsDevicePARTUUID
+syn keyword fsDeviceKeyword contained sshfs nextgroup=fsDeviceSshfs
+syn match fsDeviceKeyword contained /^[a-zA-Z0-9.\-]\+\ze:/
+syn match fsDeviceLabel contained /=[^ \t]\+/hs=s+1 contains=fsOperator
+syn match fsDeviceUUID contained /=[^ \t]\+/hs=s+1 contains=fsOperator
+syn match fsDevicePARTLABEL contained /=[^ \t]\+/hs=s+1 contains=fsOperator
+syn match fsDevicePARTUUID contained /=[^ \t]\+/hs=s+1 contains=fsOperator
+syn match fsDeviceSshfs contained /#[_=[:alnum:]\.\/+-]\+@[a-z0-9._-]\+\a\{2}:[^ \t]\+/hs=s+1 contains=fsOperator
+
+" Mount Point
+syn cluster fsMountPointCluster contains=fsMountPointKeyword,fsMountPointError
+syn match fsMountPointError /\%([^ \ta-zA-Z0-9_\/#@\.-]\|\s\+\zs\w\{-}\ze\s\)/ contained
+syn keyword fsMountPointKeyword contained none swap
+
+" Type
+syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
+syn match fsTypeUnknown /\s\+\zs\w\+/ contained
+syn keyword fsTypeKeyword contained adfs ados affs anon_inodefs atfs audiofs auto autofs bdev befs bfs btrfs binfmt_misc cd9660 cfs cgroup cifs coda configfs cpuset cramfs devfs devpts devtmpfs e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse fuseblk fusectl hfs hpfs hugetlbfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix mqueue msdos ncpfs nfs nfsd nilfs2 none ntfs null nwfs overlay ovlfs pipefs portal proc procfs pstore ptyfs qnx4 reiserfs ramfs romfs securityfs shm smbfs squashfs sockfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xenfs xfs zisofs
+
+" Options
+" -------
+" Options: General
+syn cluster fsOptionsCluster contains=fsOperator,fsOptionsGeneral,fsOptionsKeywords,fsTypeUnknown
+syn match fsOptionsNumber /\d\+/
+syn match fsOptionsNumberOctal /[0-8]\+/
+syn match fsOptionsString /[a-zA-Z0-9_-]\+/
+syn keyword fsOptionsYesNo yes no
+syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
+syn keyword fsOptionsSize 512 1024 2048
+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand norelatime nosuid nosymfollow nouser owner rbind rdonly relatime remount ro rq rw suid suiddir supermount sw sync union update user users wxallowed xx nofail failok
+syn match fsOptionsGeneral /_netdev/
+
+" Options: adfs
+syn match fsOptionsKeywords contained /\<\%([ug]id\|o\%(wn\|th\)mask\)=/ nextgroup=fsOptionsNumber
+
+" Options: affs
+syn match fsOptionsKeywords contained /\<\%(set[ug]id\|mode\|reserved\)=/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<\%(prefix\|volume\|root\)=/ nextgroup=fsOptionsString
+syn match fsOptionsKeywords contained /\<bs=/ nextgroup=fsOptionsSize
+syn keyword fsOptionsKeywords contained protect usemp verbose
+
+" Options: btrfs
+syn match fsOptionsKeywords contained /\<\%(subvol\|subvolid\|subvolrootid\|device\|compress\|compress-force\|fatal_errors\)=/ nextgroup=fsOptionsString
+syn match fsOptionsKeywords contained /\<\%(max_inline\|alloc_start\|thread_pool\|metadata_ratio\|check_int_print_mask\)=/ nextgroup=fsOptionsNumber
+syn keyword fsOptionsKeywords contained degraded nodatasum nodatacow nobarrier ssd ssd_spread noacl notreelog flushoncommit space_cache nospace_cache clear_cache user_subvol_rm_allowed autodefrag inode_cache enospc_debug recovery check_int check_int_data skip_balance discard
+
+" Options: cd9660
+syn keyword fsOptionsKeywords contained extatt gens norrip nostrictjoilet
+
+" Options: devpts
+" -- everything already defined
+
+" Options: ext2
+syn match fsOptionsKeywords contained /\<check=*/ nextgroup=@fsOptionsCheckCluster
+syn match fsOptionsKeywords contained /\<errors=/ nextgroup=fsOptionsExt2Errors
+syn match fsOptionsKeywords contained /\<\%(res[gu]id\|sb\)=/ nextgroup=fsOptionsNumber
+syn keyword fsOptionsExt2Check contained none normal strict
+syn keyword fsOptionsExt2Errors contained continue panic
+syn match fsOptionsExt2Errors contained /\<remount-ro\>/
+syn keyword fsOptionsKeywords contained acl bsddf minixdf debug grpid bsdgroups minixdf nocheck nogrpid oldalloc orlov sysvgroups nouid32 nobh user_xattr nouser_xattr
+
+" Options: ext3
+syn match fsOptionsKeywords contained /\<journal=/ nextgroup=fsOptionsExt3Journal
+syn match fsOptionsKeywords contained /\<data=/ nextgroup=fsOptionsExt3Data
+syn match fsOptionsKeywords contained /\<commit=/ nextgroup=fsOptionsNumber
+syn keyword fsOptionsExt3Journal contained update inum
+syn keyword fsOptionsExt3Data contained journal ordered writeback
+syn keyword fsOptionsKeywords contained noload user_xattr nouser_xattr acl
+
+" Options: ext4
+syn match fsOptionsKeywords contained /\<journal=/ nextgroup=fsOptionsExt4Journal
+syn match fsOptionsKeywords contained /\<data=/ nextgroup=fsOptionsExt4Data
+syn match fsOptionsKeywords contained /\<barrier=/ nextgroup=fsOptionsExt4Barrier
+syn match fsOptionsKeywords contained /\<journal_dev=/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<resuid=/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<resgid=/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<sb=/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<commit=/ nextgroup=fsOptionsNumber
+syn keyword fsOptionsExt4Journal contained update inum
+syn keyword fsOptionsExt4Data contained journal ordered writeback
+syn match fsOptionsExt4Barrier /[0-1]/
+syn keyword fsOptionsKeywords contained noload extents orlov oldalloc user_xattr nouser_xattr acl noacl reservation noreservation bsddf minixdf check=none nocheck debug grpid nogroupid sysvgroups bsdgroups quota noquota grpquota usrquota bh nobh
+
+" Options: fat
+syn match fsOptionsKeywords contained /\<blocksize=/ nextgroup=fsOptionsSize
+syn match fsOptionsKeywords contained /\<\%([dfu]mask\|codepage\)=/ nextgroup=fsOptionsNumberOctal
+syn match fsOptionsKeywords contained /\%(cvf_\%(format\|option\)\|iocharset\)=/ nextgroup=fsOptionsString
+syn match fsOptionsKeywords contained /\<check=/ nextgroup=@fsOptionsCheckCluster
+syn match fsOptionsKeywords contained /\<conv=*/ nextgroup=fsOptionsConv
+syn match fsOptionsKeywords contained /\<fat=/ nextgroup=fsOptionsFatType
+syn match fsOptionsKeywords contained /\<dotsOK=/ nextgroup=fsOptionsYesNo
+syn keyword fsOptionsFatCheck contained r n s relaxed normal strict
+syn keyword fsOptionsConv contained b t a binary text auto
+syn keyword fsOptionsFatType contained 12 16 32
+syn keyword fsOptionsKeywords contained quiet sys_immutable showexec dots nodots
+
+" Options: hfs
+syn match fsOptionsKeywords contained /\<\%(creator|type\)=/ nextgroup=fsOptionsString
+syn match fsOptionsKeywords contained /\<\%(dir\|file\|\)_umask=/ nextgroup=fsOptionsNumberOctal
+syn match fsOptionsKeywords contained /\<\%(session\|part\)=/ nextgroup=fsOptionsNumber
+
+" Options: ffs
+syn keyword fsOptionsKeyWords contained noperm softdep
+
+" Options: hpfs
+syn match fsOptionsKeywords contained /\<case=/ nextgroup=fsOptionsHpfsCase
+syn keyword fsOptionsHpfsCase contained lower asis
+
+" Options: iso9660
+syn match fsOptionsKeywords contained /\<map=/ nextgroup=fsOptionsIsoMap
+syn match fsOptionsKeywords contained /\<block=/ nextgroup=fsOptionsSize
+syn match fsOptionsKeywords contained /\<\%(session\|sbsector\)=/ nextgroup=fsOptionsNumber
+syn keyword fsOptionsIsoMap contained n o a normal off acorn
+syn keyword fsOptionsKeywords contained norock nojoilet unhide cruft
+syn keyword fsOptionsConv contained m mtext
+
+" Options: jfs
+syn keyword fsOptionsKeywords nointegrity integrity
+
+" Options: nfs
+syn match fsOptionsKeywords contained /\<\%(rsize\|wsize\|timeo\|retrans\|acregmin\|acregmax\|acdirmin\|acdirmax\|actimeo\|retry\|port\|mountport\|mounthost\|mountprog\|mountvers\|nfsprog\|nfsvers\|namelen\)=/ nextgroup=fsOptionsString
+syn keyword fsOptionsKeywords contained bg fg soft hard intr cto ac tcp udp lock nobg nofg nosoft nohard nointr noposix nocto noac notcp noudp nolock
+
+" Options: ntfs
+syn match fsOptionsKeywords contained /\<\%(posix=*\|uni_xlate=\)/ nextgroup=fsOptionsNumber
+syn keyword fsOptionsKeywords contained utf8
+
+" Options: proc
+" -- everything already defined
+
+" Options: reiserfs
+syn match fsOptionsKeywords contained /\<hash=/ nextgroup=fsOptionsReiserHash
+syn match fsOptionsKeywords contained /\<resize=/ nextgroup=fsOptionsNumber
+syn keyword fsOptionsReiserHash contained rupasov tea r5 detect
+syn keyword fsOptionsKeywords contained hashed_relocation noborder nolog notail no_unhashed_relocation replayonly
+
+" Options: sshfs
+syn match fsOptionsKeywords contained /\<\%(BatchMode\|ChallengeResponseAuthentication\|CheckHostIP\|ClearAllForwardings\|Compression\|EnableSSHKeysign\|ForwardAgent\|ForwardX11\|ForwardX11Trusted\|GatewayPorts\|GSSAPIAuthentication\|GSSAPIDelegateCredentials\|HashKnownHosts\|HostbasedAuthentication\|IdentitiesOnly\|NoHostAuthenticationForLocalhost\|PasswordAuthentication\|PubkeyAuthentication\|RhostsRSAAuthentication\|RSAAuthentication\|TCPKeepAlive\|UsePrivilegedPort\|cache\)=/ nextgroup=fsOptionsYesNo
+syn match fsOptionsKeywords contained /\<\%(ControlMaster\|StrictHostKeyChecking\|VerifyHostKeyDNS\)=/ nextgroup=fsOptionsSshYesNoAsk
+syn match fsOptionsKeywords contained /\<\%(AddressFamily\|BindAddress\|Cipher\|Ciphers\|ControlPath\|DynamicForward\|EscapeChar\|GlobalKnownHostsFile\|HostKeyAlgorithms\|HostKeyAlias\|HostName\|IdentityFile\|KbdInteractiveDevices\|LocalForward\|LogLevel\|MACs\|PreferredAuthentications\|Protocol\|ProxyCommand\|RemoteForward\|RhostsAuthentication\|SendEnv\|SmartcardDevice\|User\|UserKnownHostsFile\|XAuthLocation\|comment\|workaround\|idmap\|ssh_command\|sftp_server\|fsname\)=/ nextgroup=fsOptionsString
+syn match fsOptionsKeywords contained /\<\%(CompressionLevel\|ConnectionAttempts\|ConnectTimeout\|NumberOfPasswordPrompts\|Port\|ServerAliveCountMax\|ServerAliveInterval\|cache_timeout\|cache_X_timeout\|ssh_protocol\|directport\|max_read\|umask\|uid\|gid\|entry_timeout\|negative_timeout\|attr_timeout\)=/ nextgroup=fsOptionsNumber
+syn keyword fsOptionsKeywords contained reconnect sshfs_sync no_readahead sshfs_debug transform_symlinks allow_other allow_root nonempty default_permissions large_read hard_remove use_ino readdir_ino direct_io kernel_cache
+syn keyword fsOptionsSshYesNoAsk contained yes no ask
+
+" Options: subfs
+syn match fsOptionsKeywords contained /\<fs=/ nextgroup=fsOptionsString
+syn keyword fsOptionsKeywords contained procuid
+
+" Options: swap
+syn match fsOptionsKeywords contained /\<pri=/ nextgroup=fsOptionsNumber
+
+" Options: tmpfs
+syn match fsOptionsKeywords contained /\<nr_\%(blocks\|inodes\)=/ nextgroup=fsOptionsNumber
+
+" Options: udf
+syn match fsOptionsKeywords contained /\<\%(anchor\|partition\|lastblock\|fileset\|rootdir\)=/ nextgroup=fsOptionsString
+syn keyword fsOptionsKeywords contained unhide undelete strict novrs
+
+" Options: ufs
+syn match fsOptionsKeywords contained /\<ufstype=/ nextgroup=fsOptionsUfsType
+syn match fsOptionsKeywords contained /\<onerror=/ nextgroup=fsOptionsUfsError
+syn keyword fsOptionsUfsType contained old hp 44bsd sun sunx86 nextstep openstep
+syn match fsOptionsUfsType contained /\<nextstep-cd\>/
+syn keyword fsOptionsUfsError contained panic lock umount repair
+
+" Options: usbfs
+syn match fsOptionsKeywords contained /\<\%(dev\|bus\|list\)\%(id\|gid\)=/ nextgroup=fsOptionsNumber
+syn match fsOptionsKeywords contained /\<\%(dev\|bus\|list\)mode=/ nextgroup=fsOptionsNumberOctal
+
+" Options: vfat
+syn keyword fsOptionsKeywords contained nonumtail posix utf8
+syn match fsOptionsKeywords contained /shortname=/ nextgroup=fsOptionsVfatShortname
+syn keyword fsOptionsVfatShortname contained lower win95 winnt mixed
+
+" Options: xfs
+syn match fsOptionsKeywords contained /\%(biosize\|logbufs\|logbsize\|logdev\|rtdev\|sunit\|swidth\)=/ nextgroup=fsOptionsString
+syn keyword fsOptionsKeywords contained dmapi xdsm noalign noatime noquota norecovery osyncisdsync quota usrquota uqnoenforce grpquota gqnoenforce
+
+" Frequency / Pass No.
+syn cluster fsFreqPassCluster contains=fsFreqPassNumber,fsFreqPassError
+syn match fsFreqPassError /\s\+\zs\%(\D.*\|\S.*\|\d\+\s\+[^012]\)\ze/ contained
+syn match fsFreqPassNumber /\d\+\s\+[012]\s*/ contained
+
+" Groups
+syn match fsDevice /^\s*\zs.\{-1,}\s/me=e-1 nextgroup=fsMountPoint contains=@fsDeviceCluster,@fsGeneralCluster
+syn match fsMountPoint /\s\+.\{-}\s/me=e-1 nextgroup=fsType contains=@fsMountPointCluster,@fsGeneralCluster contained
+syn match fsType /\s\+.\{-}\s/me=e-1 nextgroup=fsOptions contains=@fsTypeCluster,@fsGeneralCluster contained
+syn match fsOptions /\s\+.\{-}\s/me=e-1 nextgroup=fsFreqPass contains=@fsOptionsCluster,@fsGeneralCluster contained
+syn match fsFreqPass /\s\+.\{-}$/ contains=@fsFreqPassCluster,@fsGeneralCluster contained
+
+" Whole line comments
+syn match fsCommentLine /^#.*$/ contains=@Spell
+
+hi def link fsOperator Operator
+hi def link fsComment Comment
+hi def link fsCommentLine Comment
+
+hi def link fsTypeKeyword Type
+hi def link fsDeviceKeyword Identifier
+hi def link fsDeviceLabel String
+hi def link fsDeviceUUID String
+hi def link fsDevicePARTLABEL String
+hi def link fsDevicePARTUUID String
+hi def link fsDeviceSshfs String
+hi def link fsFreqPassNumber Number
+
+if exists('fstab_unknown_fs_errors') && fstab_unknown_fs_errors == 1
+	hi def link fsTypeUnknown Error
+endif
+
+if !exists('fstab_unknown_device_errors') || fstab_unknown_device_errors == 1
+	hi def link fsDeviceError Error
+endif
+
+hi def link fsMountPointError Error
+hi def link fsMountPointKeyword Keyword
+hi def link fsFreqPassError Error
+
+hi def link fsOptionsGeneral Type
+hi def link fsOptionsKeywords Keyword
+hi def link fsOptionsNumber Number
+hi def link fsOptionsNumberOctal Number
+hi def link fsOptionsString String
+hi def link fsOptionsSize Number
+hi def link fsOptionsExt2Check String
+hi def link fsOptionsExt2Errors String
+hi def link fsOptionsExt3Journal String
+hi def link fsOptionsExt3Data String
+hi def link fsOptionsExt4Journal String
+hi def link fsOptionsExt4Data String
+hi def link fsOptionsExt4Barrier Number
+hi def link fsOptionsFatCheck String
+hi def link fsOptionsConv String
+hi def link fsOptionsFatType Number
+hi def link fsOptionsYesNo String
+hi def link fsOptionsHpfsCase String
+hi def link fsOptionsIsoMap String
+hi def link fsOptionsReiserHash String
+hi def link fsOptionsSshYesNoAsk String
+hi def link fsOptionsUfsType String
+hi def link fsOptionsUfsError String
+
+hi def link fsOptionsVfatShortname String
+
+let b:current_syntax = "fstab"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8 ft=vim
+
+endif
diff --git a/syntax/fvwm.vim b/syntax/fvwm.vim
new file mode 100644
index 000000000..9cd7cbc6e
--- /dev/null
+++ b/syntax/fvwm.vim
@@ -0,0 +1,646 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fvwm') == -1
+
+" Vim syntax file for Fvwm-2.5.22
+" Language:		Fvwm{1,2} configuration file
+" Maintainer:		Gautam Iyer <gi1242@users.sourceforge.net>
+" Previous Maintainer:	Haakon Riiser <hakonrk@fys.uio.no>
+" Last Change:		Sat 29 Sep 2007 11:08:34 AM PDT
+"
+" Thanks to David Necas (Yeti) for adding Fvwm 2.4 support.
+"
+" 2006-05-09 gi1242: Rewrote fvwm2 syntax completely. Also since fvwm1 is now
+" mostly obsolete, made the syntax file pick fvwm2 syntax by default.
+
+if exists("b:current_syntax")
+    finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+" Fvwm configuration files are case insensitive
+syn case ignore
+
+" Identifiers in Fvwm can contain most characters, so we only
+" include the most common ones here.
+setlocal iskeyword=_,-,+,.,a-z,A-Z,48-57
+
+" Syntax items common to fvwm1 and fvwm2 config files
+syn cluster fvwmConstants	contains=fvwmEnvVar,fvwmNumber
+syn match   fvwmEnvVar		"\$\w\+"
+syn match   fvwmNumber		'\v<(\d+|0x[0-9a-f]+)>' 
+
+syn match   fvwmModConf		nextgroup=fvwmModArg	"\v^\s*\*\a+"
+syn region  fvwmModArg		contained contains=fvwmString,fvwmRGBValue
+				\ start='.' skip='\\$' end='$'
+
+syn region  fvwmString		contains=fvwmBackslash start='"'
+				\ matchgroup=fvwmBackslash skip='\v\\"' end='"'
+syn region  fvwmString		contains=fvwmBackslash start='`'
+				\ matchgroup=fvwmBackslash skip='\v\\`' end='`'
+syn region  fvwmString		contains=fvwmBackslash start="'"
+				\ matchgroup=fvwmBackslash skip="\v\\'" end="'"
+syn match   fvwmBackslash	contained '\\[^"'`]'
+
+syn match   fvwmRGBValue	"#\x\{3}"
+syn match   fvwmRGBValue	"#\x\{6}"
+syn match   fvwmRGBValue	"#\x\{9}"
+syn match   fvwmRGBValue	"#\x\{12}"
+syn match   fvwmRGBValue	"rgb:\x\{1,4}/\x\{1,4}/\x\{1,4}"
+
+syn region  fvwmComment		contains=@Spell
+				\ start='^\s*#\s' skip='\\$' end='$'
+syn region  fvwmComment		start="\v^\s*#(\S|$)" skip='\\$' end='$'
+
+if (exists("b:fvwm_version") && b:fvwm_version == 1)
+	    \ || (exists("use_fvwm_1") && use_fvwm_1)
+
+    "
+    " Syntax highlighting for Fvwm1 files.
+    "
+
+    " Moved from common syntax items
+    syn match   fvwmModule	"\<Module\s\+\w\+"he=s+6
+    syn keyword fvwmExec	Exec
+    syn match   fvwmPath	"\<IconPath\s.*$"lc=8 contains=fvwmEnvVar
+    syn match   fvwmPath	"\<ModulePath\s.*$"lc=10 contains=fvwmEnvVar
+    syn match   fvwmPath	"\<PixmapPath\s.*$"lc=10 contains=fvwmEnvVar
+    syn match   fvwmKey		"\<Key\s\+\w\+"he=s+3
+
+    " fvwm1 specific items
+    syn match  fvwmEnvVar	"\$(\w\+)"
+    syn match  fvwmWhitespace	contained "\s\+"
+    syn region fvwmStyle	oneline keepend
+				\ contains=fvwmString,fvwmKeyword,fvwmWhiteSpace
+				\ matchgroup=fvwmFunction
+				\ start="^\s*Style\>"hs=e-5 end="$"
+
+    syn keyword fvwmFunction	AppsBackingStore AutoRaise BackingStore Beep
+				\ BoundaryWidth ButtonStyle CenterOnCirculate
+				\ CirculateDown CirculateHit CirculateSkip
+				\ CirculateSkipIcons CirculateUp ClickTime
+				\ ClickToFocus Close Cursor CursorMove
+				\ DecorateTransients Delete Desk DeskTopScale
+				\ DeskTopSize Destroy DontMoveOff
+				\ EdgeResistance EdgeScroll EndFunction
+				\ EndMenu EndPopup Focus Font Function
+				\ GotoPage HiBackColor HiForeColor Icon
+				\ IconBox IconFont Iconify IconPath Key
+				\ Lenience Lower Maximize MenuBackColor
+				\ MenuForeColor MenuStippleColor Module
+				\ ModulePath Mouse Move MWMBorders MWMButtons
+				\ MWMDecorHints MWMFunctionHints
+				\ MWMHintOverride MWMMenus NoBorder
+				\ NoBoundaryWidth Nop NoPPosition NoTitle
+				\ OpaqueMove OpaqueResize Pager PagerBackColor
+				\ PagerFont PagerForeColor PagingDefault
+				\ PixmapPath Popup Quit Raise RaiseLower
+				\ RandomPlacement Refresh Resize Restart
+				\ SaveUnders Scroll SloppyFocus SmartPlacement
+				\ StartsOnDesk StaysOnTop StdBackColor
+				\ StdForeColor Stick Sticky StickyBackColor
+				\ StickyForeColor StickyIcons
+				\ StubbornIconPlacement StubbornIcons
+				\ StubbornPlacement SuppressIcons Title
+				\ TogglePage Wait Warp WindowFont WindowList
+				\ WindowListSkip WindowsDesk WindowShade
+				\ XORvalue
+
+    " These keywords are only used after the "Style" command.  To avoid
+    " name collision with several commands, they are contained.
+    syn keyword fvwmKeyword	contained
+				\ BackColor BorderWidth BoundaryWidth Button
+				\ CirculateHit CirculateSkip Color DoubleClick
+				\ ForeColor Handles HandleWidth Icon IconTitle
+				\ NoBorder NoBoundaryWidth NoButton NoHandles
+				\ NoIcon NoIconTitle NoTitle Slippery
+				\ StartIconic StartNormal StartsAnyWhere
+				\ StartsOnDesk StaysOnTop StaysPut Sticky
+				\ Title WindowListHit WindowListSkip
+
+" elseif (exists("b:fvwm_version") && b:fvwm_version == 2)
+" 	    \ || (exists("use_fvwm_2") && use_fvwm_2)
+else
+
+    "
+    " Syntax highlighting for fvwm2 files.
+    "
+    syn match   fvwmEnvVar	"\${\w\+}"
+    syn match   fvwmEnvVar	"\$\[[^]]\+\]"
+    syn match   fvwmEnvVar	"\$[$0-9*]"
+
+    syn match   fvwmDef		contains=fvwmMenuString,fvwmWhitespace
+				\ '^\s*+\s*".\{-}"'
+    syn region  fvwmMenuString	contains=fvwmIcon,fvwmShortcutKey
+				\ start='^\s*+\s*\zs"' skip='\v\\\\|\\\"' end='"'
+    syn region	fvwmIcon	contained start='\v\%\%@!' end='%'
+    syn match   fvwmShortcutKey	contained "&."
+
+    syn keyword fvwmModuleName	FvwmAnimate FvwmAudio FvwmAuto FvwmBacker
+				\ FvwmBanner FvwmButtons FvwmCascade
+				\ FvwmCommandS FvwmConsole FvwmConsoleC
+				\ FvwmCpp FvwmDebug FvwmDragWell FvwmEvent
+				\ FvwmForm FvwmGtkDebug FvwmIconBox
+				\ FvwmIconMan FvwmIdent FvwmM4 FvwmPager
+				\ FvwmPerl FvwmProxy FvwmRearrange FvwmSave
+				\ FvwmSaveDesk FvwmScript FvwmScroll FvwmTabs
+				\ FvwmTalk FvwmTaskBar FvwmTheme FvwmTile
+				\ FvwmWharf FvwmWindowMenu FvwmWinList
+
+    " Obsolete fvwmModuleName: FvwmTheme
+
+    syn keyword fvwmKeyword	AddToMenu ChangeMenuStyle CopyMenuStyle
+				\ DestroyMenu DestroyMenuStyle Menu
+				\ Popup TearMenuOff Title BugOpts BusyCursor
+				\ ClickTime ColorLimit ColormapFocus
+				\ DefaultColors DefaultColorset DefaultFont
+				\ DefaultIcon DefaultLayers Deschedule Emulate
+				\ EscapeFunc FakeClick FakeKeypress GlobalOpts
+				\ HilightColor HilightColorset IconFont
+				\ PrintInfo Repeat Schedule State WindowFont
+				\ XSync XSynchronize AnimatedMove
+				\ HideGeometryWindow Layer Lower Move
+				\ MoveToDesk MoveThreshold MoveToPage
+				\ MoveToScreen OpaqueMoveSize PlaceAgain Raise
+				\ RaiseLower ResizeMaximize ResizeMove
+				\ ResizeMoveMaximize RestackTransients
+				\ SetAnimation SnapAttraction SnapGrid
+				\ WindowsDesk XorPixmap XorValue CursorMove
+				\ FlipFocus Focus WarpToWindow Close Delete
+				\ Destroy Iconify Recapture RecaptureWindow
+				\ Refresh RefreshWindow Stick StickAcrossPages
+				\ StickAcrossDesks WindowShade
+				\ WindowShadeAnimate IgnoreModifiers
+				\ EdgeCommand EdgeLeaveCommand GnomeButton
+				\ Stroke StrokeFunc FocusStyle DestroyStyle
+				\ DestroyWindowStyle UpdateStyles AddToDecor
+				\ BorderStyle ChangeDecor DestroyDecor
+				\ UpdateDecor DesktopName DeskTopSize
+				\ EdgeResistance EdgeScroll EdgeThickness
+				\ EwmhBaseStruts EWMHNumberOfDesktops
+				\ GotoDeskAndPage GotoPage Scroll Xinerama
+				\ XineramaPrimaryScreen XineramaSls
+				\ XineramaSlsSize XineramaSlsScreens AddToFunc
+				\ Beep DestroyFunc Echo Exec ExecUseShell
+				\ Function Nop PipeRead Read SetEnv Silent
+				\ UnsetEnv Wait DestroyModuleConfig KillModule
+				\ Module ModuleListenOnly ModuleSynchronous
+				\ ModuleTimeout SendToModule Quit QuitScreen
+				\ QuitSession Restart SaveSession
+				\ SaveQuitSession KeepRc NoWindow Break
+				\ CleanupColorsets EchoFuncDefinition
+
+    " Conditional commands
+    syn keyword fvwmKeyword	nextgroup=fvwmCondition skipwhite
+				\ All Any Current Next None Pick PointerWindow
+				\ Prev ThisWindow
+    syn keyword fvwmKeyword	nextgroup=fvwmDirection skipwhite
+				\ Direction
+    syn keyword fvwmDirection	contained nextgroup=fvwmDirection skipwhite
+				\ FromPointer
+    syn keyword fvwmDirection	contained nextgroup=fvwmCondition skipwhite
+				\ North Northeast East Southeast South
+				\ Southwest West Northwest Center
+    syn region	fvwmCondition	contained contains=fvwmCondNames,fvwmString
+				\ matchgroup=fvwmKeyword start='(' skip=','
+				\ end=')'
+    syn keyword fvwmCondNames	contained
+				\ AcceptsFocus AnyScreen CirculateHit
+				\ CirculateHitIcon CirculateHitShaded Closable
+				\ CurrentDesk CurrentGlobalPage
+				\ CurrentGlobalPageAnyDesk CurrentPage
+				\ CurrentPageAnyDesk CurrentScreen FixedSize
+				\ Focused HasHandles HasPointer Iconic
+				\ Iconifiable Maximizable Maximized
+				\ Overlapped PlacedByButton PlacedByButton3
+				\ PlacedByFvwm Raised Shaded Sticky
+				\ StickyAcrossDesks StickyAcrossPages
+				\ Transient Visible StickyIcon
+				\ StickyAcrossPagesIcon StickyAcrossDesksIcon
+
+    syn keyword fvwmCondNames	contained skipwhite nextgroup=@fvwmConstants
+				\ State Layer
+
+    " Test
+    syn keyword fvwmKeyword	nextgroup=fvwmTCond skipwhite
+				\ Test
+    syn region	fvwmTCond	contained contains=fvwmTCNames,fvwmString
+				\ matchgroup=fvwmKeyword start='(' end=')'
+    syn keyword	fvwmTCNames	contained
+				\ Version EnvIsSet EnvMatch EdgeHasPointer
+				\ EdgeIsActive Start Init Restart Exit Quit
+				\ ToRestart True False F R W X I
+    
+    " TestRc
+    syn keyword fvwmKeyword	nextgroup=fvwmTRCond skipwhite
+				\ TestRc
+    syn region	fvwmTRCond	contained contains=fvwmTRNames,fvwmNumber
+				\ matchgroup=fvwmKeyword start='(' end=')'
+    syn keyword	fvwmTRNames	contained NoMatch Match Error Break
+
+    " Colorsets
+    syn keyword fvwmKeyword	nextgroup=fvwmCSArgs	skipwhite
+				\ ColorSet
+    syn region	fvwmCSArgs	contained transparent contains=fvwmCSNames,@fvwmConstants,fvwmString,fvwmRGBValue,fvwmGradient
+		\ start='.' skip='\\$' end='$'
+    syn keyword	fvwmCSNames	contained
+				\ fg Fore Foreground bg Back Background hi
+				\ Hilite Hilight sh Shade Shadow fgsh Pixmap
+				\ TiledPixmap AspectPixmap RootTransparent
+				\ Shape TiledShape AspectShape Tint fgTint
+				\ bgTint Alpha fgAlpha Dither IconTint
+				\ IconAlpha NoShape Plain Translucent
+    syn match	fvwmCSNames	contained	'\v<Transparent>'
+    syn match	fvwmGradient	contained	'\v<[HVDBSCRY]Gradient>'
+
+    " Styles
+    syn keyword fvwmKeyword	nextgroup=fvwmStyleArgs skipwhite
+				\ Style WindowStyle
+    syn region	fvwmStyleArgs	contained transparent contains=fvwmStyleNames,@fvwmConstants,fvwmString,fvwmRGBValue
+				\ start='.' skip='\\$' end='$'
+    syn keyword	fvwmStyleNames	contained
+				\ BorderWidth HandleWidth NoIcon Icon MiniIcon
+				\ IconBox IconGrid IconFill IconSize NoTitle
+				\ Title TitleAtBottom TitleAtLeft TitleAtRight
+				\ TitleAtTop LeftTitleRotatedCW
+				\ LeftTitleRotatedCCW RightTitleRotatedCCW
+				\ RightTitleRotatedCW TopTitleRotated
+				\ TopTitleNotRotated BottomTitleRotated
+				\ BottomTitleNotRotated UseTitleDecorRotation
+				\ StippledTitle StippledTitleOff
+				\ IndexedWindowName ExactWindowName
+				\ IndexedIconName ExactIconName Borders
+				\ NoHandles Handles WindowListSkip
+				\ WindowListHit CirculateSkip CirculateHit
+				\ CirculateSkipShaded CirculateHitShaded Layer
+				\ StaysOnTop StaysOnBottom StaysPut Sticky
+				\ Slippery StickyAcrossPages StickyAcrossDesks
+				\ StartIconic StartNormal Color ForeColor
+				\ BackColor Colorset HilightFore HilightBack
+				\ HilightColorset BorderColorset
+				\ HilightBorderColorset IconTitleColorset
+				\ HilightIconTitleColorset
+				\ IconBackgroundColorset IconTitleRelief
+				\ IconBackgroundRelief IconBackgroundPadding
+				\ Font IconFont StartsOnDesk StartsOnPage
+				\ StartsAnyWhere StartsOnScreen
+				\ ManualPlacementHonorsStartsOnPage
+				\ ManualPlacementIgnoresStartsOnPage
+				\ CaptureHonorsStartsOnPage
+				\ CaptureIgnoresStartsOnPage
+				\ RecaptureHonorsStartsOnPage
+				\ RecaptureIgnoresStartsOnPage
+				\ StartsOnPageIncludesTransients
+				\ StartsOnPageIgnoresTransients IconTitle
+				\ NoIconTitle MwmButtons FvwmButtons MwmBorder
+				\ FvwmBorder MwmDecor NoDecorHint MwmFunctions
+				\ NoFuncHint HintOverride NoOverride NoButton
+				\ Button ResizeHintOverride NoResizeOverride
+				\ OLDecor NoOLDecor GNOMEUseHints
+				\ GNOMEIgnoreHints StickyIcon SlipperyIcon
+				\ StickyAcrossPagesIcon StickyAcrossDesksIcon
+				\ ManualPlacement CascadePlacement
+				\ MinOverlapPlacement
+				\ MinOverlapPercentPlacement
+				\ TileManualPlacement TileCascadePlacement
+				\ MinOverlapPlacementPenalties
+				\ MinOverlapPercentPlacementPenalties
+				\ DecorateTransient NakedTransient
+				\ DontRaiseTransient RaiseTransient
+				\ DontLowerTransient LowerTransient
+				\ DontStackTransientParent
+				\ StackTransientParent SkipMapping ShowMapping
+				\ ScatterWindowGroups KeepWindowGroupsOnDesk
+				\ UseDecor UseStyle NoPPosition UsePPosition
+				\ NoUSPosition UseUSPosition
+				\ NoTransientPPosition UseTransientPPosition
+				\ NoTransientUSPosition UseTransientUSPosition
+				\ NoIconPosition UseIconPosition Lenience
+				\ NoLenience ClickToFocus SloppyFocus
+				\ MouseFocus FocusFollowsMouse NeverFocus
+				\ ClickToFocusPassesClickOff
+				\ ClickToFocusPassesClick
+				\ ClickToFocusRaisesOff ClickToFocusRaises
+				\ MouseFocusClickRaises
+				\ MouseFocusClickRaisesOff GrabFocus
+				\ GrabFocusOff GrabFocusTransientOff
+				\ GrabFocusTransient FPFocusClickButtons
+				\ FPFocusClickModifiers
+				\ FPSortWindowlistByFocus FPClickRaisesFocused
+				\ FPClickDecorRaisesFocused
+				\ FPClickIconRaisesFocused
+				\ FPClickRaisesUnfocused
+				\ FPClickDecorRaisesUnfocused
+				\ FPClickIconRaisesUnfocused FPClickToFocus
+				\ FPClickDecorToFocus FPClickIconToFocus
+				\ FPEnterToFocus FPLeaveToUnfocus
+				\ FPFocusByProgram FPFocusByFunction
+				\ FPFocusByFunctionWarpPointer FPLenient
+				\ FPPassFocusClick FPPassRaiseClick
+				\ FPIgnoreFocusClickMotion
+				\ FPIgnoreRaiseClickMotion
+				\ FPAllowFocusClickFunction
+				\ FPAllowRaiseClickFunction FPGrabFocus
+				\ FPGrabFocusTransient FPOverrideGrabFocus
+				\ FPReleaseFocus FPReleaseFocusTransient
+				\ FPOverrideReleaseFocus StartsLowered
+				\ StartsRaised IgnoreRestack AllowRestack
+				\ FixedPosition VariablePosition
+				\ FixedUSPosition VariableUSPosition
+				\ FixedPPosition VariablePPosition FixedSize
+				\ VariableSize FixedUSSize VariableUSSize
+				\ FixedPSize VariablePSize Closable
+				\ Iconifiable Maximizable
+				\ AllowMaximizeFixedSize IconOverride
+				\ NoIconOverride NoActiveIconOverride
+				\ DepressableBorder FirmBorder MaxWindowSize
+				\ IconifyWindowGroups IconifyWindowGroupsOff
+				\ ResizeOpaque ResizeOutline BackingStore
+				\ BackingStoreOff BackingStoreWindowDefault
+				\ Opacity ParentalRelativity SaveUnder
+				\ SaveUnderOff WindowShadeShrinks
+				\ WindowShadeScrolls WindowShadeSteps
+				\ WindowShadeAlwaysLazy WindowShadeBusy
+				\ WindowShadeLazy EWMHDonateIcon
+				\ EWMHDontDonateIcon EWMHDonateMiniIcon
+				\ EWMHDontDonateMiniIcon EWMHMiniIconOverride
+				\ EWMHNoMiniIconOverride
+				\ EWMHUseStackingOrderHints
+				\ EWMHIgnoreStackingOrderHints
+				\ EWMHIgnoreStateHints EWMHUseStateHints
+				\ EWMHIgnoreStrutHints EWMHIgnoreWindowType
+				\ EWMHUseStrutHints
+				\ EWMHMaximizeIgnoreWorkingArea
+				\ EWMHMaximizeUseWorkingArea
+				\ EWMHMaximizeUseDynamicWorkingArea
+				\ EWMHPlacementIgnoreWorkingArea
+				\ EWMHPlacementUseWorkingArea
+				\ EWMHPlacementUseDynamicWorkingArea
+				\ MoveByProgramMethod Unmanaged State
+				\ StippledIconTitle StickyStippledTitle
+				\ StickyStippledIconTitle
+				\ PositionPlacement
+				\ UnderMousePlacementHonorsStartsOnPage
+				\ UnderMousePlacementIgnoresStartsOnPage
+				\ MinOverlapPlacementPenalties
+				\ MinOverlapPercentPlacementPenalties
+				\ MinWindowSize StartShaded
+
+    " Cursor styles
+    syn keyword fvwmKeyword	nextgroup=fvwmCursorStyle skipwhite
+				\ CursorStyle
+    syn case match
+    syn keyword fvwmCursorStyle	contained
+				\ POSITION TITLE DEFAULT SYS MOVE RESIZE WAIT
+				\ MENU SELECT DESTROY TOP RIGHT BOTTOM LEFT
+				\ TOP_LEFT TOP_RIGHT BOTTOM_LEFT BOTTOM_RIGHT
+				\ TOP_EDGE RIGHT_EDGE BOTTOM_EDGE LEFT_EDGE
+				\ ROOT STROKE
+    syn case ignore
+
+    " Menu style
+    syn keyword fvwmKeyword	nextgroup=fvwmMStyleArgs skipwhite
+				\ MenuStyle
+    syn region	fvwmMStyleArgs	contained transparent contains=fvwmMStyleNames,@fvwmConstants,fvwmString,fvwmGradient,fvwmRGBValue
+				\ start='.' skip='\\$' end='$'
+    syn keyword	fvwmMStyleNames	contained
+				\ Fvwm Mwm Win BorderWidth Foreground
+				\ Background Greyed HilightBack HilightBackOff
+				\ ActiveFore ActiveForeOff MenuColorset
+				\ ActiveColorset GreyedColorset Hilight3DThick
+				\ Hilight3DThin Hilight3DOff
+				\ Hilight3DThickness Animation AnimationOff
+				\ Font MenuFace PopupDelay PopupOffset
+				\ TitleWarp TitleWarpOff TitleUnderlines0
+				\ TitleUnderlines1 TitleUnderlines2
+				\ SeparatorsLong SeparatorsShort
+				\ TrianglesSolid TrianglesRelief
+				\ PopupImmediately PopupDelayed
+				\ PopdownImmediately PopdownDelayed
+				\ PopupActiveArea DoubleClickTime SidePic
+				\ SideColor PopupAsRootMenu PopupAsSubmenu
+				\ PopupIgnore PopupClose RemoveSubmenus
+				\ HoldSubmenus SubmenusRight SubmenusLeft
+				\ SelectOnRelease ItemFormat
+				\ VerticalItemSpacing VerticalTitleSpacing
+				\ AutomaticHotkeys AutomaticHotkeysOff
+				\ TitleFont TitleColorset HilightTitleBack
+
+    " Button style
+    syn keyword fvwmKeyword	nextgroup=fvwmBNum	skipwhite
+				\ ButtonStyle AddButtonStyle
+    syn match	fvwmBNum	contained
+				\ nextgroup=fvwmBState,fvwmBStyleArgs skipwhite 
+				\ '\v<([0-9]|All|Left|Right|Reset)>'
+    syn keyword	fvwmBState	contained nextgroup=fvwmBStyleArgs skipwhite
+				\ ActiveUp ActiveDown InactiveUp InactiveDown
+				\ Active Inactive ToggledActiveUp
+				\ ToggledActiveDown ToggledInactiveUp
+				\ ToggledInactiveDown ToggledActive
+				\ ToggledInactive AllNormal AllToggled
+				\ AllActive AllInactive AllUp AllDown
+    syn region	fvwmBStyleArgs	contained contains=fvwmBStyleFlags,fvwmBStyleNames,fvwmGradient,fvwmRGBValue,@fvwmConstants,fvwmString
+				\ start='\S' skip='\\$' end='$'
+    syn keyword	fvwmBStyleNames	contained
+				\ Simple Default Solid Colorset Vector Pixmap
+				\ AdjustedPixmap ShrunkPixmap StretchedPixmap
+				\ TiledPixmap MiniIcon
+    syn keyword fvwmBStyleFlags	contained
+				\ Raised Sunk Flat UseTitleStyle
+				\ UseBorderStyle
+
+    " Border style
+    syn keyword fvwmKeyword	skipwhite nextgroup=fvwmBdState,fvwmBdStyleArgs
+				\ BorderStyle
+    syn keyword	fvwmBdState	contained skipwhite nextgroup=fvwmBdStyleArgs
+				\ Active Inactive
+    syn region	fvwmBdStyleArgs	contained contains=fvwmBdStyNames,fvwmBdStyFlags
+				\ start='\S' skip='\\$' end='$'
+    syn keyword	fvwmBdStyNames	contained
+				\ TiledPixmap Colorset
+    syn keyword	fvwmBdStyFlags	contained
+				\ HiddenHandles NoInset Raised Sunk Flat
+
+    " Title styles
+    syn keyword	fvwmKeyword	skipwhite nextgroup=fvwmTState,fvwmTStyleArgs
+				\ TitleStyle AddTitleStyle
+    syn keyword	fvwmTState	contained skipwhite nextgroup=fvwmTStyleArgs
+				\ ActiveUp ActiveDown InactiveUp InactiveDown
+				\ Active Inactive ToggledActiveUp
+				\ ToggledActiveDown ToggledInactiveUp
+				\ ToggledInactiveDown ToggledActive
+				\ ToggledInactive AllNormal AllToggled
+				\ AllActive AllInactive AllUp AllDown
+    syn region	fvwmTStyleArgs	contained contains=fvwmBStyleNames,fvwmTStyleNames,fvwmMPmapNames,fvwmTStyleFlags,fvwmGradient,fvwmRGBValue,@fvwmConstants
+				\ start='\S' skip='\\$' end='$'
+    syn keyword	fvwmTStyleNames	contained
+				\ MultiPixmap
+    syn keyword fvwmTStyleNames	contained
+				\ LeftJustified Centered RightJustified Height
+				\ MinHeight
+    syn keyword	fvwmMPmapNames	contained
+				\ Main LeftMain RightMain UnderText LeftOfText
+				\ RightOfText LeftEnd RightEnd Buttons
+				\ LeftButtons RightButtons
+    syn keyword	fvwmTStyleFlags	contained
+				\ Raised Flat Sunk
+
+    " Button state
+    syn keyword fvwmKeyword	nextgroup=fvwmBStateArgs
+				\ ButtonState
+    syn region	fvwmBStateArgs	contained contains=fvwmBStateTF,fvwmBStateNames
+				\ start='.' skip='\\$' end='$'
+    syn keyword	fvwmBStateNames	contained ActiveDown Inactive InactiveDown
+    syn keyword fvwmBStateTF	contained True False
+
+    " Paths
+    syn keyword fvwmKeyword	nextgroup=fvwmPath	skipwhite
+				\ IconPath ImagePath LocalePath PixmapPath
+				\ ModulePath 
+    syn match	fvwmPath	contained contains=fvwmEnvVar '\v.+$'
+
+    " Window list command
+    syn keyword fvwmKeyword	nextgroup=fvwmWLArgs skipwhite
+				\ WindowList
+    syn region	fvwmWLArgs	contained
+		\ contains=fvwmCondition,@fvwmConstants,fvwmString,fvwmWLOpts
+		\ start='.' skip='\\$' end='$'
+    syn keyword fvwmWLOpts	contained
+				\ Geometry NoGeometry NoGeometryWithInfo
+				\ NoDeskNum NoNumInDeskTitle
+				\ NoCurrentDeskTitle MaxLabelWidth width
+				\ TitleForAllDesks Function funcname Desk
+				\ desknum CurrentDesk NoIcons Icons OnlyIcons
+				\ NoNormal Normal OnlyNormal NoSticky Sticky
+				\ OnlySticky NoStickyAcrossPages
+				\ StickyAcrossPages OnlyStickyAcrossPages
+				\ NoStickyAcrossDesks StickyAcrossDesks
+				\ OnlyStickyAcrossDesks NoOnTop OnTop
+				\ OnlyOnTop NoOnBottom OnBottom OnlyOnBottom
+				\ Layer UseListSkip OnlyListSkip NoDeskSort
+				\ ReverseOrder CurrentAtEnd IconifiedAtEnd
+				\ UseIconName Alphabetic NotAlphabetic
+				\ SortByResource SortByClass NoHotkeys
+				\ SelectOnRelease
+
+    syn keyword fvwmSpecialFn	StartFunction InitFunction RestartFunction
+				\ ExitFunction SessionInitFunction
+				\ SessionRestartFunction SessionExitFunction
+				\ MissingSubmenuFunction WindowListFunc
+
+    syn keyword fvwmKeyword	skipwhite nextgroup=fvwmKeyWin,fvwmKeyName
+				\ Key PointerKey
+    syn region	fvwmKeyWin	contained skipwhite nextgroup=fvwmKeyName
+				\ start='(' end=')'
+    syn case match
+    syn match	fvwmKeyName	contained skipwhite nextgroup=fvwmKeyContext
+				\ '\v<([a-zA-Z0-9]|F\d+|KP_\d)>'
+    syn keyword fvwmKeyName	contained skipwhite nextgroup=fvwmKeyContext
+				\ BackSpace Begin Break Cancel Clear Delete
+				\ Down End Escape Execute Find Help Home
+				\ Insert KP_Add KP_Begin KP_Decimal KP_Delete
+				\ KP_Divide KP_Down KP_End KP_Enter KP_Equal
+				\ KP_Home KP_Insert KP_Left KP_Multiply
+				\ KP_Next KP_Page_Down KP_Page_Up KP_Prior
+				\ KP_Right KP_Separator KP_Space KP_Subtract
+				\ KP_Tab KP_Up Left Linefeed Menu Mode_switch
+				\ Next Num_Lock Page_Down Page_Up Pause Print
+				\ Prior Redo Return Right script_switch
+				\ Scroll_Lock Select Sys_Req Tab Undo Up space
+				\ exclam quotedbl numbersign dollar percent
+				\ ampersand apostrophe quoteright parenleft
+				\ parenright asterisk plus comma minus period
+				\ slash colon semicolon less equal greater
+				\ question at bracketleft backslash
+				\ bracketright asciicircum underscore grave
+				\ quoteleft braceleft bar braceright
+				\ asciitilde
+
+    syn match	fvwmKeyContext	contained skipwhite nextgroup=fvwmKeyMods
+				\ '\v<[][RWDTS_F<^>vI0-9AM-]+>'
+    syn match	fvwmKeyMods	contained '\v[NCSMLA1-5]+'
+    syn case ignore
+
+    syn keyword	fvwmKeyword	skipwhite nextgroup=fvwmMouseWin,fvwmMouseButton
+				\ Mouse
+    syn region	fvwmMouseWin	contained skipwhite nextgroup=fvwmMouseButton
+				\ start='(' end=')'
+    syn match	fvwmMouseButton	contained skipwhite nextgroup=fvwmKeyContext
+				\ '[0-5]'
+endif
+
+" Define syntax highlighting groups
+
+"
+" Common highlighting groups
+"
+hi def link fvwmComment		Comment
+hi def link fvwmEnvVar		Macro
+hi def link fvwmNumber		Number
+hi def link fvwmKeyword		Keyword
+hi def link fvwmPath		Constant
+hi def link fvwmModConf		Macro
+hi def link fvwmRGBValue	Constant
+hi def link fvwmString		String
+hi def link fvwmBackslash	SpecialChar
+
+
+"
+" Highlighting groups for fvwm1 specific items
+"
+hi def link fvwmExec		fvwmKeyword
+hi def link fvwmKey		fvwmKeyword
+hi def link fvwmModule		fvwmKeyword
+hi def link fvwmFunction	Function
+
+"
+" Highlighting groups for fvwm2 specific items
+"
+hi def link fvwmSpecialFn	Type
+hi def link fvwmCursorStyle	fvwmStyleNames
+hi def link fvwmStyleNames	Identifier
+hi def link fvwmMStyleNames	fvwmStyleNames
+hi def link fvwmCSNames		fvwmStyleNames
+hi def link fvwmGradient	fvwmStyleNames
+hi def link fvwmCondNames	fvwmStyleNames
+hi def link fvwmTCNames		fvwmStyleNames
+hi def link fvwmTRNames		fvwmStyleNames
+hi def link fvwmWLOpts		fvwmStyleNames
+
+hi def link fvwmBNum		Number
+hi def link fvwmBState		Type
+hi def link fvwmBStyleNames	fvwmStyleNames
+hi def link fvwmBStyleFlags	Special
+
+hi def link fvwmBStateTF	Constant
+hi def link fvwmBStateNames	fvwmStyleNames
+
+hi def link fvwmBdState		fvwmBState
+hi def link fvwmBdStyNames	fvwmStyleNames
+hi def link fvwmBdStyFlags	fvwmBStyleFlags
+
+hi def link fvwmTState		fvwmBState
+hi def link fvwmTStyleNames	fvwmStyleNames
+hi def link fvwmMPmapNames	fvwmBStyleFlags
+hi def link fvwmTStyleFlags	fvwmBStyleFlags
+
+hi def link fvwmDirection	fvwmBStyleFlags
+
+hi def link fvwmKeyWin		Constant
+hi def link fvwmMouseWin	fvwmKeyWin
+hi def link fvwmKeyName		Special
+hi def link fvwmKeyContext	fvwmKeyName
+hi def link fvwmKeyMods		fvwmKeyName
+hi def link fvwmMouseButton	fvwmKeyName
+
+hi def link fvwmMenuString	String
+hi def link fvwmIcon		Type
+hi def link fvwmShortcutKey	SpecialChar
+
+hi def link fvwmModuleName	Function
+
+let b:current_syntax = "fvwm"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/syntax/gdb.vim b/syntax/gdb.vim
new file mode 100644
index 000000000..a99d6b887
--- /dev/null
+++ b/syntax/gdb.vim
@@ -0,0 +1,107 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdb') == -1
+
+" Vim syntax file
+" Language:	GDB command files
+" Maintainer:	Claudio Fleiner <claudio@fleiner.com>
+" URL:		http://www.fleiner.com/vim/syntax/gdb.vim
+" Last Change:	2012 Oct 05
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword gdbInfo contained address architecture args breakpoints catch common copying dcache
+syn keyword gdbInfo contained display files float frame functions handle line
+syn keyword gdbInfo contained locals program registers scope set sharedlibrary signals
+syn keyword gdbInfo contained source sources stack symbol target terminal threads
+syn keyword gdbInfo contained syn keyword tracepoints types udot variables warranty watchpoints
+syn match gdbInfo contained "all-registers"
+
+
+syn keyword gdbStatement contained actions apply attach awatch backtrace break bt call catch cd clear collect commands
+syn keyword gdbStatement contained complete condition continue delete detach directory disable disassemble display down
+syn keyword gdbStatement contained echo else enable end file finish frame handle hbreak help if ignore
+syn keyword gdbStatement contained inspect jump kill list load maintenance make next nexti ni output overlay
+syn keyword gdbStatement contained passcount path print printf ptype pwd quit rbreak remote return run rwatch
+syn keyword gdbStatement contained search section set sharedlibrary shell show si signal source step stepi stepping
+syn keyword gdbStatement contained stop target tbreak tdump tfind thbreak thread tp trace tstart tstatus tstop
+syn keyword gdbStatement contained tty undisplay unset until up watch whatis where while ws x
+syn match gdbFuncDef "\<define\>.*"
+syn match gdbStatmentContainer "^\s*\S\+" contains=gdbStatement,gdbFuncDef
+syn match gdbStatement "^\s*info" nextgroup=gdbInfo skipwhite skipempty
+
+" some commonly used abbreviations
+syn keyword gdbStatement c disp undisp disas p
+
+syn region gdbDocument matchgroup=gdbFuncDef start="\<document\>.*$" matchgroup=gdbFuncDef end="^end\s*$"
+
+syn match gdbStatement "\<add-shared-symbol-files\>"
+syn match gdbStatement "\<add-symbol-file\>"
+syn match gdbStatement "\<core-file\>"
+syn match gdbStatement "\<dont-repeat\>"
+syn match gdbStatement "\<down-silently\>"
+syn match gdbStatement "\<exec-file\>"
+syn match gdbStatement "\<forward-search\>"
+syn match gdbStatement "\<reverse-search\>"
+syn match gdbStatement "\<save-tracepoints\>"
+syn match gdbStatement "\<select-frame\>"
+syn match gdbStatement "\<symbol-file\>"
+syn match gdbStatement "\<up-silently\>"
+syn match gdbStatement "\<while-stepping\>"
+
+syn keyword gdbSet annotate architecture args check complaints confirm editing endian
+syn keyword gdbSet environment gnutarget height history language listsize print prompt
+syn keyword gdbSet radix remotebaud remotebreak remotecache remotedebug remotedevice remotelogbase
+syn keyword gdbSet remotelogfile remotetimeout remotewritesize targetdebug variable verbose
+syn keyword gdbSet watchdog width write
+syn match gdbSet "\<auto-solib-add\>"
+syn match gdbSet "\<solib-absolute-prefix\>"
+syn match gdbSet "\<solib-search-path\>"
+syn match gdbSet "\<stop-on-solib-events\>"
+syn match gdbSet "\<symbol-reloading\>"
+syn match gdbSet "\<input-radix\>"
+syn match gdbSet "\<demangle-style\>"
+syn match gdbSet "\<output-radix\>"
+
+syn match gdbComment "^\s*#.*" contains=@Spell
+
+syn match gdbVariable "\$\K\k*"
+
+" Strings and constants
+syn region  gdbString		start=+"+  skip=+\\\\\|\\"+  end=+"+ contains=@Spell
+syn match   gdbCharacter	"'[^']*'" contains=gdbSpecialChar,gdbSpecialCharError
+syn match   gdbCharacter	"'\\''" contains=gdbSpecialChar
+syn match   gdbCharacter	"'[^\\]'"
+syn match   gdbNumber		"\<[0-9_]\+\>"
+syn match   gdbNumber		"\<0x[0-9a-fA-F_]\+\>"
+
+
+if !exists("gdb_minlines")
+  let gdb_minlines = 10
+endif
+exec "syn sync ccomment gdbComment minlines=" . gdb_minlines
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+hi def link gdbFuncDef	Function
+hi def link gdbComment	Comment
+hi def link gdbStatement	Statement
+hi def link gdbString	String
+hi def link gdbCharacter	Character
+hi def link gdbVariable	Identifier
+hi def link gdbSet		Constant
+hi def link gdbInfo	Type
+hi def link gdbDocument	Special
+hi def link gdbNumber	Number
+
+let b:current_syntax = "gdb"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/gdmo.vim b/syntax/gdmo.vim
new file mode 100644
index 000000000..134e7069e
--- /dev/null
+++ b/syntax/gdmo.vim
@@ -0,0 +1,87 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdmo') == -1
+
+" Vim syntax file
+" Language:	GDMO
+"		(ISO-10165-4; Guidelines for the Definition of Managed Object)
+" Maintainer:	Gyuman (Chester) Kim <violkim@gmail.com>
+" URL:		http://classicalprogrammer.wikidot.com/local--files/vim-syntax-file-for-gdmo/gdmo.vim
+" Last change:	8th June, 2011
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" keyword definitions
+syn match   gdmoCategory      "MANAGED\s\+OBJECT\s\+CLASS"
+syn keyword gdmoCategory      NOTIFICATION ATTRIBUTE BEHAVIOUR PACKAGE ACTION
+syn match   gdmoCategory      "NAME\s\+BINDING"
+syn match   gdmoRelationship  "DERIVED\s\+FROM"
+syn match   gdmoRelationship  "SUPERIOR\s\+OBJECT\s\+CLASS"
+syn match   gdmoRelationship  "SUBORDINATE\s\+OBJECT\s\+CLASS"
+syn match   gdmoExtension     "AND\s\+SUBCLASSES"
+syn match   gdmoDefinition    "DEFINED\s\+AS"
+syn match   gdmoDefinition    "REGISTERED\s\+AS"
+syn match   gdmoExtension     "ORDER\s\+BY"
+syn match   gdmoReference     "WITH\s\+ATTRIBUTE"
+syn match   gdmoReference     "WITH\s\+INFORMATION\s\+SYNTAX"
+syn match   gdmoReference     "WITH\s\+REPLY\s\+SYNTAX"
+syn match   gdmoReference     "WITH\s\+ATTRIBUTE\s\+SYNTAX"
+syn match   gdmoExtension     "AND\s\+ATTRIBUTE\s\+IDS"
+syn match   gdmoExtension     "MATCHES\s\+FOR"
+syn match   gdmoReference     "CHARACTERIZED\s\+BY"
+syn match   gdmoReference     "CONDITIONAL\s\+PACKAGES"
+syn match   gdmoExtension     "PRESENT\s\+IF"
+syn match   gdmoExtension     "DEFAULT\s\+VALUE"
+syn match   gdmoExtension     "PERMITTED\s\+VALUES"
+syn match   gdmoExtension     "REQUIRED\s\+VALUES"
+syn match   gdmoExtension     "NAMED\s\+BY"
+syn keyword gdmoReference     ATTRIBUTES NOTIFICATIONS ACTIONS
+syn keyword gdmoExtension     DELETE CREATE
+syn keyword gdmoExtension     EQUALITY SUBSTRINGS ORDERING
+syn match   gdmoExtension     "REPLACE-WITH-DEFAULT"
+syn match   gdmoExtension     "GET"
+syn match   gdmoExtension     "GET-REPLACE"
+syn match   gdmoExtension     "ADD-REMOVE"
+syn match   gdmoExtension     "WITH-REFERENCE-OBJECT"
+syn match   gdmoExtension     "WITH-AUTOMATIC-INSTANCE-NAMING"
+syn match   gdmoExtension     "ONLY-IF-NO-CONTAINED-OBJECTS"
+
+
+" Strings and constants
+syn match   gdmoSpecial		contained "\\\d\d\d\|\\."
+syn region  gdmoString		start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=gdmoSpecial
+syn match   gdmoCharacter	  "'[^\\]'"
+syn match   gdmoSpecialCharacter  "'\\.'"
+syn match   gdmoNumber		  "0[xX][0-9a-fA-F]\+\>"
+syn match   gdmoLineComment       "--.*"
+syn match   gdmoLineComment       "--.*--"
+
+syn match gdmoDefinition "^\s*[a-zA-Z][-a-zA-Z0-9_.\[\] \t{}]* *::="me=e-3
+syn match gdmoBraces     "[{}]"
+
+syn sync ccomment gdmoComment
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link gdmoCategory	      Structure
+hi def link gdmoRelationship     Macro
+hi def link gdmoDefinition       Statement
+hi def link gdmoReference	      Type
+hi def link gdmoExtension	      Operator
+hi def link gdmoBraces	      Function
+hi def link gdmoSpecial	      Special
+hi def link gdmoString	      String
+hi def link gdmoCharacter	      Character
+hi def link gdmoSpecialCharacter gdmoSpecial
+hi def link gdmoComment	      Comment
+hi def link gdmoLineComment      gdmoComment
+hi def link gdmoType	      Type
+
+
+let b:current_syntax = "gdmo"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/gedcom.vim b/syntax/gedcom.vim
new file mode 100644
index 000000000..45e27a121
--- /dev/null
+++ b/syntax/gedcom.vim
@@ -0,0 +1,57 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gedcom') == -1
+
+" Vim syntax file
+" Language:	Gedcom
+" Maintainer:	Paul Johnson (pjcj@transeda.com)
+" Version 1.059 - 23rd December 1999
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax case match
+
+syntax keyword gedcom_record ABBR ADDR ADOP ADR1 ADR2 AFN AGE AGNC ALIA ANCE
+syntax keyword gedcom_record ANCI ANUL ASSO AUTH BAPL BAPM BARM BASM BIRT BLES
+syntax keyword gedcom_record BLOB BURI CALN CAST CAUS CENS CHAN CHAR CHIL CHR
+syntax keyword gedcom_record CHRA CITY CONC CONF CONL CONT COPR CORP CREM CTRY
+syntax keyword gedcom_record DATA DEAT DESC DESI DEST DIV DIVF DSCR EDUC EMIG
+syntax keyword gedcom_record ENDL ENGA EVEN FAM FAMC FAMF FAMS FCOM FILE FORM
+syntax keyword gedcom_record GEDC GIVN GRAD HEAD HUSB IDNO IMMI INDI LANG MARB
+syntax keyword gedcom_record MARC MARL MARR MARS MEDI NATI NATU NCHI NICK NMR
+syntax keyword gedcom_record NOTE NPFX NSFX OBJE OCCU ORDI ORDN PAGE PEDI PHON
+syntax keyword gedcom_record PLAC POST PROB PROP PUBL QUAY REFN RELA RELI REPO
+syntax keyword gedcom_record RESI RESN RETI RFN RIN ROLE SEX SLGC SLGS SOUR
+syntax keyword gedcom_record SPFX SSN STAE STAT SUBM SUBN SURN TEMP TEXT TIME
+syntax keyword gedcom_record TITL TRLR TYPE VERS WIFE WILL
+syntax keyword gedcom_record DATE nextgroup=gedcom_date
+syntax keyword gedcom_record NAME nextgroup=gedcom_name
+
+syntax case ignore
+
+syntax region gedcom_id start="@" end="@" oneline contains=gedcom_ii, gedcom_in
+syntax match gedcom_ii "\I\+" contained nextgroup=gedcom_in
+syntax match gedcom_in "\d\+" contained
+syntax region gedcom_name start="" end="$" skipwhite oneline contains=gedcom_cname, gedcom_surname contained
+syntax match gedcom_cname "\i\+" contained
+syntax match gedcom_surname "/\(\i\|\s\)*/" contained
+syntax match gedcom_date "\d\{1,2}\s\+\(jan\|feb\|mar\|apr\|may\|jun\|jul\|aug\|sep\|oct\|nov\|dec\)\s\+\d\+"
+syntax match gedcom_date ".*" contained
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link gedcom_record Statement
+hi def link gedcom_id Comment
+hi def link gedcom_ii PreProc
+hi def link gedcom_in Type
+hi def link gedcom_name PreProc
+hi def link gedcom_cname Type
+hi def link gedcom_surname Identifier
+hi def link gedcom_date Constant
+
+
+let b:current_syntax = "gedcom"
+
+endif
diff --git a/syntax/gitolite.vim b/syntax/gitolite.vim
new file mode 100644
index 000000000..1cbd62601
--- /dev/null
+++ b/syntax/gitolite.vim
@@ -0,0 +1,98 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitolite') == -1
+
+" Vim syntax file
+" Language:	gitolite configuration
+" URL:		https://github.com/sitaramc/gitolite/blob/master/contrib/vim/syntax/gitolite.vim
+"	(https://raw.githubusercontent.com/sitaramc/gitolite/master/contrib/vim/syntax/gitolite.vim)
+" Maintainer:	Sitaram Chamarty <sitaramc@gmail.com>
+" (former Maintainer:	Teemu Matilainen <teemu.matilainen@iki.fi>)
+" Last Change:	2017 Oct 05
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" this seems to be the best way, for now.
+syntax sync fromstart
+
+" ---- common stuff
+
+syn match   gitoliteGroup           '@\S\+'
+
+syn match   gitoliteComment         '#.*' contains=gitoliteTodo
+syn keyword gitoliteTodo            TODO FIXME XXX NOT contained
+
+" ---- main section
+
+" catch template-data syntax appearing outside template-data section
+syn match   gitoliteRepoError       '^\s*repo.*='
+syn match   gitoliteRepoError       '^\s*\S\+\s*='  " this gets overridden later when first word is a perm, don't worry
+
+" normal gitolite group and repo lines
+syn match   gitoliteGroupLine       '^\s*@\S\+\s*=\s*\S.*$' contains=gitoliteGroup,gitoliteComment
+syn match   gitoliteRepoLine        '^\s*repo\s\+[^=]*$' contains=gitoliteRepo,gitoliteGroup,gitoliteComment
+syn keyword gitoliteRepo            repo contained
+
+syn keyword gitoliteSpecialRepo     CREATOR
+
+" normal gitolite rule lines
+syn match   gitoliteRuleLine        '^\s*\(-\|C\|R\|RW+\?C\?D\?\)\s[^#]*' contains=gitoliteRule,gitoliteCreateRule,gitoliteDenyRule,gitoliteRefex,gitoliteUsers,gitoliteGroup
+syn match   gitoliteRule            '\(^\s*\)\@<=\(-\|C\|R\|RW+\?C\?D\?\)\s\@=' contained
+syn match   gitoliteRefex           '\(^\s*\(-\|R\|RW+\?C\?D\?\)\s\+\)\@<=\S.\{-}\(\s*=\)\@=' contains=gitoliteSpecialRefex
+syn match   gitoliteSpecialRefex    'NAME/'
+syn match   gitoliteSpecialRefex    '/USER/'
+syn match   gitoliteCreateRule      '\(^\s*C\s.*=\s*\)\@<=\S[^#]*[^# ]' contained contains=gitoliteGroup
+syn match   gitoliteDenyRule        '\(^\s*-\s.*=\s*\)\@<=\S[^#]*[^# ]' contained
+
+" normal gitolite config (and similar) lines
+syn match   gitoliteConfigLine      '^\s*\(config\|option\|include\|subconf\)\s[^#]*' contains=gitoliteConfigKW,gitoliteConfigKey,gitoliteConfigVal,gitoliteComment
+syn keyword gitoliteConfigKW        config option include subconf contained
+syn match   gitoliteConfigKey       '\(\(config\|option\)\s\+\)\@<=[^ =]*' contained
+syn match   gitoliteConfigVal       '\(=\s*\)\@<=\S.*' contained
+
+" ---- template-data section
+
+syn region  gitoliteTemplateLine    matchgroup=PreProc start='^=begin template-data$' end='^=end$' contains=gitoliteTplRepoLine,gitoliteTplRoleLine,gitoliteGroup,gitoliteComment,gitoliteTplError
+
+syn match   gitoliteTplRepoLine     '^\s*repo\s\+\S.*=.*' contained contains=gitoliteTplRepo,gitoliteTplTemplates,gitoliteGroup
+syn keyword gitoliteTplRepo         repo contained
+syn match   gitoliteTplTemplates    '\(=\s*\)\@<=\S.*' contained contains=gitoliteGroup,gitoliteComment
+
+syn match   gitoliteTplRoleLine     '^\s*\S\+\s*=\s*.*' contained contains=gitoliteTplRole,gitoliteGroup,gitoliteComment
+syn match   gitoliteTplRole         '\S\+\s*='he=e-1 contained
+
+" catch normal gitolite rules appearing in template-data section
+syn match   gitoliteTplError        '^\s*repo[^=]*$' contained
+syn match   gitoliteTplError        '^\s*\(-\|R\|RW+\?C\?D\?\)\s'he=e-1 contained
+syn match   gitoliteTplError        '^\s*\(config\|option\|include\|subconf\)\s'he=e-1 contained
+syn match   gitoliteTplError        '^\s*@\S\+\s*=' contained contains=NONE
+
+hi def link gitoliteGroup           Identifier
+hi def link gitoliteComment         Comment
+hi def link gitoliteTodo            ToDo
+hi def link gitoliteRepoError       Error
+hi def link gitoliteGroupLine       PreProc
+hi def link gitoliteRepo            Keyword
+hi def link gitoliteSpecialRepo     PreProc
+hi def link gitoliteRule            Keyword
+hi def link gitoliteCreateRule      PreProc
+hi def link gitoliteDenyRule        WarningMsg
+hi def link gitoliteRefex           Constant
+hi def link gitoliteSpecialRefex    PreProc
+hi def link gitoliteConfigKW        Keyword
+hi def link gitoliteConfigKey       Identifier
+hi def link gitoliteConfigVal       String
+hi def link gitoliteTplRepo         Keyword
+hi def link gitoliteTplTemplates    Constant
+hi def link gitoliteTplRole         Constant
+hi def link gitoliteTplError        Error
+
+let b:current_syntax = "gitolite"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/gkrellmrc.vim b/syntax/gkrellmrc.vim
new file mode 100644
index 000000000..899f914ac
--- /dev/null
+++ b/syntax/gkrellmrc.vim
@@ -0,0 +1,79 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gkrellmrc') == -1
+
+" Vim syntax file
+" This is a GENERATED FILE. Please always refer to source file at the URI below.
+" Language: gkrellm theme files `gkrellmrc'
+" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2003-04-30
+" URL: http://trific.ath.cx/Ftp/vim/syntax/gkrellmrc.vim
+
+" Setup
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+setlocal iskeyword=_,-,a-z,A-Z,48-57
+
+syn case match
+
+" Base constructs
+syn match gkrellmrcComment "#.*$" contains=gkrellmrcFixme
+syn keyword gkrellmrcFixme FIXME TODO XXX NOT contained
+syn region gkrellmrcString start=+"+ skip=+\\\\\|\\"+ end=+"+ oneline
+syn match gkrellmrcNumber "^-\=\(\d\+\)\=\.\=\d\+"
+syn match gkrellmrcNumber "\W-\=\(\d\+\)\=\.\=\d\+"lc=1
+syn keyword gkrellmrcConstant none
+syn match gkrellmrcRGBColor "#\(\x\{12}\|\x\{9}\|\x\{6}\|\x\{3}\)\>"
+
+" Keywords
+syn keyword gkrellmrcBuiltinExt cpu_nice_color cpu_nice_grid_color krell_depth krell_expand krell_left_margin krell_right_margin krell_x_hot krell_yoff mem_krell_buffers_depth mem_krell_buffers_expand mem_krell_buffers_x_hot mem_krell_buffers_yoff mem_krell_cache_depth mem_krell_cache_expand mem_krell_cache_x_hot mem_krell_cache_yoff sensors_bg_volt timer_bg_timer
+syn keyword gkrellmrcGlobal allow_scaling author chart_width_ref theme_alternatives
+syn keyword gkrellmrcSetCmd set_image_border set_integer set_string
+syn keyword gkrellmrcGlobal bg_slider_meter_border bg_slider_panel_border
+syn keyword gkrellmrcGlobal frame_bottom_height frame_left_width frame_right_width frame_top_height frame_left_chart_overlap frame_right_chart_overlap frame_left_panel_overlap frame_right_panel_overlap frame_left_spacer_overlap frame_right_spacer_overlap spacer_overlap_off cap_images_off
+syn keyword gkrellmrcGlobal frame_bottom_border frame_left_border frame_right_border frame_top_border spacer_top_border spacer_bottom_border frame_left_chart_border frame_right_chart_border frame_left_panel_border frame_right_panel_border
+syn keyword gkrellmrcGlobal chart_in_color chart_in_color_grid chart_out_color chart_out_color_grid
+syn keyword gkrellmrcGlobal bg_separator_height bg_grid_mode
+syn keyword gkrellmrcGlobal rx_led_x rx_led_y tx_led_x tx_led_y
+syn keyword gkrellmrcGlobal decal_mail_frames decal_mail_delay
+syn keyword gkrellmrcGlobal decal_alarm_frames decal_warn_frames
+syn keyword gkrellmrcGlobal krell_slider_depth krell_slider_expand krell_slider_x_hot
+syn keyword gkrellmrcGlobal button_panel_border button_meter_border
+syn keyword gkrellmrcGlobal large_font normal_font small_font
+syn keyword gkrellmrcGlobal spacer_bottom_height spacer_top_height spacer_bottom_height_chart spacer_top_height_chart spacer_bottom_height_meter spacer_top_height_meter
+syn keyword gkrellmrcExpandMode left right bar-mode left-scaled right-scaled bar-mode-scaled
+syn keyword gkrellmrcMeterName apm cal clock fs host mail mem swap timer sensors uptime
+syn keyword gkrellmrcChartName cpu proc disk inet and net
+syn match gkrellmrcSpecialClassName "\*"
+syn keyword gkrellmrcStyleCmd StyleMeter StyleChart StylePanel
+syn keyword gkrellmrcStyleItem textcolor alt_textcolor font alt_font transparency border label_position margin margins left_margin right_margin top_margin bottom_margin krell_depth krell_yoff krell_x_hot krell_expand krell_left_margin krell_right_margin
+
+" Define the default highlighting
+
+hi def link gkrellmrcComment Comment
+hi def link gkrellmrcFixme Todo
+
+hi def link gkrellmrcString gkrellmrcConstant
+hi def link gkrellmrcNumber gkrellmrcConstant
+hi def link gkrellmrcRGBColor gkrellmrcConstant
+hi def link gkrellmrcExpandMode gkrellmrcConstant
+hi def link gkrellmrcConstant Constant
+
+hi def link gkrellmrcMeterName gkrellmrcClass
+hi def link gkrellmrcChartName gkrellmrcClass
+hi def link gkrellmrcSpecialClassName gkrellmrcClass
+hi def link gkrellmrcClass Type
+
+hi def link gkrellmrcGlobal gkrellmrcItem
+hi def link gkrellmrcBuiltinExt gkrellmrcItem
+hi def link gkrellmrcStyleItem gkrellmrcItem
+hi def link gkrellmrcItem Function
+
+hi def link gkrellmrcSetCmd Special
+hi def link gkrellmrcStyleCmd Statement
+
+
+let b:current_syntax = "gkrellmrc"
+
+endif
diff --git a/syntax/gnash.vim b/syntax/gnash.vim
new file mode 100644
index 000000000..b424b8e23
--- /dev/null
+++ b/syntax/gnash.vim
@@ -0,0 +1,100 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gnash') == -1
+
+" Vim syntax file
+" Maintainer: 	Thilo Six
+" Contact:	<vim-dev at vim dot org>
+"		http://www.vim.org/maillist.php#vim-dev
+"
+" Description: 	highlight gnash configuration files
+"		http://www.gnu.org/software/gnash/manual/gnashuser.html#gnashrc
+" File:		runtime/syntax/gnash.vim
+" Last Change: 	2012 May 19
+" Modeline:	vim: ts=8:sw=2:sts=2:
+"
+" Credits:	derived from Nikolai Weibulls readline.vim
+"
+" License:	VIM License
+"		Vim is Charityware, see ":help Uganda"
+"
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax") || &compatible
+    finish
+endif
+
+syn case match
+syn keyword GnashTodo	    contained TODO FIXME XXX NOTE
+
+" Comments
+syn match   GnashComment    "^#.*$"   contains=@Spell,GnashTodo
+syn match   GnashComment    "\s#.*$"  contains=@Spell,GnashTodo
+
+syn match   GnashNumber	    display '\<\d\+\>'
+
+syn case ignore
+syn keyword GnashOn	    ON YES TRUE
+syn keyword GnashOff	    OFF NO FALSE
+
+syn match GnashSet	    '^\s*set\>'
+syn match GnashSet	    '^\s*append\>'
+
+syn match GnashKeyword	    '\<CertDir\>'
+syn match GnashKeyword      '\<ASCodingErrorsVerbosity\>'
+syn match GnashKeyword      '\<CertFile\>'
+syn match GnashKeyword      '\<EnableExtensions\>'
+syn match GnashKeyword      '\<HWAccel\>'
+syn match GnashKeyword      '\<LCShmKey\>'
+syn match GnashKeyword      '\<LocalConnection\>'
+syn match GnashKeyword      '\<MalformedSWFVerbosity\>'
+syn match GnashKeyword      '\<Renderer\>'
+syn match GnashKeyword      '\<RootCert\>'
+syn match GnashKeyword      '\<SOLReadOnly\>'
+syn match GnashKeyword      '\<SOLSafeDir\>'
+syn match GnashKeyword      '\<SOLreadonly\>'
+syn match GnashKeyword      '\<SOLsafedir\>'
+syn match GnashKeyword      '\<StartStopped\>'
+syn match GnashKeyword      '\<StreamsTimeout\>'
+syn match GnashKeyword      '\<URLOpenerFormat\>'
+syn match GnashKeyword      '\<XVideo\>'
+syn match GnashKeyword      '\<actionDump\>'
+syn match GnashKeyword      '\<blacklist\>'
+syn match GnashKeyword      '\<debugger\>'
+syn match GnashKeyword      '\<debuglog\>'
+syn match GnashKeyword      '\<delay\>'
+syn match GnashKeyword      '\<enableExtensions\>'
+syn match GnashKeyword      '\<flashSystemManufacturer\>'
+syn match GnashKeyword      '\<flashSystemOS\>'
+syn match GnashKeyword      '\<flashVersionString\>'
+syn match GnashKeyword      '\<ignoreFSCommand\>'
+syn match GnashKeyword      '\<ignoreShowMenu\>'
+syn match GnashKeyword      '\<insecureSSL\>'
+syn match GnashKeyword      '\<localSandboxPath\>'
+syn match GnashKeyword      '\<localdomain\>'
+syn match GnashKeyword      '\<localhost\>'
+syn match GnashKeyword      '\<microphoneDevice\>'
+syn match GnashKeyword      '\<parserDump\>'
+syn match GnashKeyword      '\<pluginsound\>'
+syn match GnashKeyword      '\<quality\>'
+syn match GnashKeyword      '\<solLocalDomain\>'
+syn match GnashKeyword      '\<sound\>'
+syn match GnashKeyword      '\<splashScreen\>'
+syn match GnashKeyword      '\<startStopped\>'
+syn match GnashKeyword      '\<streamsTimeout\>'
+syn match GnashKeyword      '\<urlOpenerFormat\>'
+syn match GnashKeyword      '\<verbosity\>'
+syn match GnashKeyword      '\<webcamDevice\>'
+syn match GnashKeyword      '\<whitelist\>'
+syn match GnashKeyword      '\<writelog\>'
+
+hi def link GnashOn	    Identifier
+hi def link GnashOff	    Preproc
+hi def link GnashComment    Comment
+hi def link GnashTodo	    Todo
+hi def link GnashNumber	    Type
+hi def link GnashSet	    String
+hi def link GnashKeyword    Keyword
+
+let b:current_syntax = "gnash"
+
+
+endif
diff --git a/syntax/gp.vim b/syntax/gp.vim
new file mode 100644
index 000000000..cf2c18c2b
--- /dev/null
+++ b/syntax/gp.vim
@@ -0,0 +1,87 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gp') == -1
+
+" Vim syntax file
+" Language:	gp (version 2.5)
+" Maintainer:	Karim Belabas <Karim.Belabas@math.u-bordeaux.fr>
+" Last change:	2012 Jan 08
+" URL:		http://pari.math.u-bordeaux.fr
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" control statements
+syntax keyword gpStatement	break return next
+syntax keyword gpConditional	if
+syntax keyword gpRepeat		until while for fordiv forell forprime 
+syntax keyword gpRepeat		forsubgroup forstep forvec
+" storage class
+syntax keyword gpScope		my local global
+" defaults
+syntax keyword gpInterfaceKey	breakloop colors compatible
+syntax keyword gpInterfaceKey	datadir debug debugfiles debugmem 
+syntax keyword gpInterfaceKey	echo factor_add_primes factor_proven format 
+syntax keyword gpInterfaceKey	graphcolormap graphcolors
+syntax keyword gpInterfaceKey	help histfile histsize 
+syntax keyword gpInterfaceKey	lines linewrap log logfile new_galois_format
+syntax keyword gpInterfaceKey	output parisize path prettyprinter primelimit
+syntax keyword gpInterfaceKey	prompt prompt_cont psfile 
+syntax keyword gpInterfaceKey	readline realprecision recover 
+syntax keyword gpInterfaceKey	secure seriesprecision simplify strictmatch
+syntax keyword gpInterfaceKey	TeXstyle timer
+
+syntax match gpInterface	"^\s*\\[a-z].*"
+syntax keyword gpInterface	default
+syntax keyword gpInput		read input
+
+" functions
+syntax match gpFunRegion "^\s*[a-zA-Z][_a-zA-Z0-9]*(.*)\s*=\s*[^ \t=]"me=e-1 contains=gpFunction,gpArgs
+syntax match gpFunRegion "^\s*[a-zA-Z][_a-zA-Z0-9]*(.*)\s*=\s*$" contains=gpFunction,gpArgs
+syntax match gpArgs contained "[a-zA-Z][_a-zA-Z0-9]*"
+syntax match gpFunction contained "^\s*[a-zA-Z][_a-zA-Z0-9]*("me=e-1
+
+" String and Character constants
+" Highlight special (backslash'ed) characters differently
+syntax match  gpSpecial contained "\\[ent\\]"
+syntax region gpString  start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=gpSpecial
+
+"comments
+syntax region gpComment	start="/\*"  end="\*/" contains=gpTodo
+syntax match  gpComment "\\\\.*" contains=gpTodo
+syntax keyword gpTodo contained	TODO
+syntax sync ccomment gpComment minlines=10
+
+"catch errors caused by wrong parenthesis
+syntax region gpParen		transparent start='(' end=')' contains=ALLBUT,gpParenError,gpTodo,gpFunction,gpArgs,gpSpecial
+syntax match gpParenError	")"
+syntax match gpInParen contained "[{}]"
+
+
+hi def link gpConditional		Conditional
+hi def link gpRepeat		Repeat
+hi def link gpError		Error
+hi def link gpParenError		gpError
+hi def link gpInParen		gpError
+hi def link gpStatement		Statement
+hi def link gpString		String
+hi def link gpComment		Comment
+hi def link gpInterface		Type
+hi def link gpInput		Type
+hi def link gpInterfaceKey		Statement
+hi def link gpFunction		Function
+hi def link gpScope		Type
+" contained ones
+hi def link gpSpecial		Special
+hi def link gpTodo			Todo
+hi def link gpArgs			Type
+
+let b:current_syntax = "gp"
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/gpg.vim b/syntax/gpg.vim
new file mode 100644
index 000000000..b6e9578a1
--- /dev/null
+++ b/syntax/gpg.vim
@@ -0,0 +1,109 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gpg') == -1
+
+" Vim syntax file
+" Language:             gpg(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2010-10-14
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword+=-
+
+syn keyword gpgTodo     contained FIXME TODO XXX NOTE
+
+syn region  gpgComment  contained display oneline start='#' end='$'
+                        \ contains=gpgTodo,gpgID,@Spell
+
+syn match   gpgID       contained display '\<\(0x\)\=\x\{8,}\>'
+
+syn match   gpgBegin    display '^' skipwhite nextgroup=gpgComment,gpgOption,gpgCommand
+
+syn keyword gpgCommand  contained skipwhite nextgroup=gpgArg
+                        \ check-sigs decrypt decrypt-files delete-key
+                        \ delete-secret-and-public-key delete-secret-key
+                        \ edit-key encrypt-files export export-all
+                        \ export-ownertrust export-secret-keys
+                        \ export-secret-subkeys fast-import fingerprint
+                        \ gen-prime gen-random import import-ownertrust
+                        \ list-keys list-public-keys list-secret-keys
+                        \ list-sigs lsign-key nrsign-key print-md print-mds
+                        \ recv-keys search-keys send-keys sign-key verify
+                        \ verify-files
+syn keyword gpgCommand  contained skipwhite nextgroup=gpgArgError
+                        \ check-trustdb clearsign desig-revoke detach-sign
+                        \ encrypt gen-key gen-revoke help list-packets
+                        \ rebuild-keydb-caches sign store symmetric
+                        \ update-trustdb version warranty
+
+syn keyword gpgOption   contained skipwhite nextgroup=gpgArg
+                        \ attribute-fd cert-digest-algo charset cipher-algo
+                        \ command-fd comment completes-needed compress
+                        \ compress-algo debug default-cert-check-level
+                        \ default-key default-preference-list
+                        \ default-recipient digest-algo disable-cipher-algo
+                        \ disable-pubkey-algo encrypt-to exec-path
+                        \ export-options group homedir import-options
+                        \ keyring keyserver keyserver-options load-extension
+                        \ local-user logger-fd marginals-needed max-cert-depth
+                        \ notation-data options output override-session-key
+                        \ passphrase-fd personal-cipher-preferences
+                        \ personal-compress-preferences
+                        \ personal-digest-preferences photo-viewer
+                        \ recipient s2k-cipher-algo s2k-digest-algo s2k-mode
+                        \ secret-keyring set-filename set-policy-url status-fd
+                        \ trusted-key verify-options keyid-format list-options
+syn keyword gpgOption   contained skipwhite nextgroup=gpgArgError
+                        \ allow-freeform-uid allow-non-selfsigned-uid
+                        \ allow-secret-key-import always-trust
+                        \ armor ask-cert-expire ask-sig-expire
+                        \ auto-check-trustdb batch debug-all default-comment
+                        \ default-recipient-self dry-run emit-version
+                        \ emulate-md-encode-bug enable-special-filenames
+                        \ escape-from-lines expert fast-list-mode
+                        \ fixed-list-mode for-your-eyes-only
+                        \ force-mdc force-v3-sigs force-v4-certs
+                        \ gpg-agent-info ignore-crc-error ignore-mdc-error
+                        \ ignore-time-conflict ignore-valid-from interactive
+                        \ list-only lock-multiple lock-never lock-once
+                        \ merge-only no no-allow-non-selfsigned-uid
+                        \ no-armor no-ask-cert-expire no-ask-sig-expire
+                        \ no-auto-check-trustdb no-batch no-comment
+                        \ no-default-keyring no-default-recipient
+                        \ no-encrypt-to no-expensive-trust-checks
+                        \ no-expert no-for-your-eyes-only no-force-v3-sigs
+                        \ no-force-v4-certs no-greeting no-literal
+                        \ no-mdc-warning no-options no-permission-warning
+                        \ no-pgp2 no-pgp6 no-pgp7 no-random-seed-file
+                        \ no-secmem-warning no-show-notation no-show-photos
+                        \ no-show-policy-url no-sig-cache no-sig-create-check
+                        \ no-sk-comments no-tty no-utf8-strings no-verbose
+                        \ no-version not-dash-escaped openpgp pgp2
+                        \ pgp6 pgp7 preserve-permissions quiet rfc1991
+                        \ set-filesize show-keyring show-notation show-photos
+                        \ show-policy-url show-session-key simple-sk-checksum
+                        \ sk-comments skip-verify textmode throw-keyid
+                        \ try-all-secrets use-agent use-embedded-filename
+                        \ utf8-strings verbose with-colons with-fingerprint
+                        \ with-key-data yes
+
+syn match   gpgArg      contained display '\S\+\(\s\+\S\+\)*' contains=gpgID
+syn match   gpgArgError contained display '\S\+\(\s\+\S\+\)*'
+
+hi def link gpgComment  Comment
+hi def link gpgTodo     Todo
+hi def link gpgID       Number
+hi def link gpgOption   Keyword
+hi def link gpgCommand  Error
+hi def link gpgArgError Error
+
+let b:current_syntax = "gpg"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/grads.vim b/syntax/grads.vim
new file mode 100644
index 000000000..bb8f4b337
--- /dev/null
+++ b/syntax/grads.vim
@@ -0,0 +1,77 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'grads') == -1
+
+" Vim syntax file
+" Language:	grads (GrADS scripts)
+" Maintainer:	Stefan Fronzek (sfronzek at gmx dot net)
+" Last change: 13 Feb 2004
+
+" Grid Analysis and Display System (GrADS); http://grads.iges.org/grads
+" This syntax file defines highlighting for only very few features of
+" the GrADS scripting language.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" GrADS is entirely case-insensitive.
+syn case ignore
+
+" The keywords
+
+syn keyword gradsStatement	if else endif break exit return
+syn keyword gradsStatement	while endwhile say prompt pull function
+syn keyword gradsStatement subwrd sublin substr read write close
+" String
+
+syn region gradsString		start=+'+ end=+'+
+
+" Integer number
+syn match  gradsNumber		"[+-]\=\<[0-9]\+\>"
+
+" Operator
+
+"syn keyword gradsOperator	| ! % & != >=
+"syn match gradsOperator		"[^\.]not[^a-zA-Z]"
+
+" Variables
+
+syn keyword gradsFixVariables	lat lon lev result rec rc
+syn match gradsglobalVariables	"_[a-zA-Z][a-zA-Z0-9]*"
+syn match gradsVariables		"[a-zA-Z][a-zA-Z0-9]*"
+syn match gradsConst		"#[A-Z][A-Z_]+"
+
+" Comments
+
+syn match gradsComment	"\*.*"
+
+" Typical Typos
+
+" for C programmers:
+" syn match gradsTypos	"=="
+" syn match gradsTypos	"!="
+
+" Define the default highlighting.
+" Only when an item doesn't hgs highlighting+yet
+
+hi def link gradsStatement		Statement
+
+hi def link gradsString		String
+hi def link gradsNumber		Number
+
+hi def link gradsFixVariables	Special
+hi def link gradsVariables		Identifier
+hi def link gradsglobalVariables	Special
+hi def link gradsConst		Special
+
+hi def link gradsClassMethods	Function
+
+hi def link gradsOperator		Operator
+hi def link gradsComment		Comment
+
+hi def link gradsTypos		Error
+
+
+let b:current_syntax = "grads"
+
+endif
diff --git a/syntax/gretl.vim b/syntax/gretl.vim
new file mode 100644
index 000000000..7378015b0
--- /dev/null
+++ b/syntax/gretl.vim
@@ -0,0 +1,89 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gretl') == -1
+
+" Vim syntax file
+" Language:	gretl (http://gretl.sf.net)
+" Maintainer:	Vaidotas Zemlys <zemlys@gmail.com>
+" Last Change:  2006 Apr 30
+" Filenames:	*.inp *.gretl
+" URL:	http://uosis.mif.vu.lt/~zemlys/vim-syntax/gretl.vim
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword=@,48-57,_,.
+
+syn case match
+
+" Constant
+" string enclosed in double quotes
+syn region gString start=/"/ skip=/\\\\\|\\"/ end=/"/
+" number with no fractional part or exponent
+syn match gNumber /\d\+/
+" floating point number with integer and fractional parts and optional exponent
+syn match gFloat /\d\+\.\d*\([Ee][-+]\=\d\+\)\=/
+" floating point number with no integer part and optional exponent
+syn match gFloat /\.\d\+\([Ee][-+]\=\d\+\)\=/
+" floating point number with no fractional part and optional exponent
+syn match gFloat /\d\+[Ee][-+]\=\d\+/
+
+" Gretl commands
+syn keyword gCommands add addobs addto adf append ar arch arma break boxplot chow coeffsum coint coint2 corc corr corrgm criteria critical cusum data delete diff else end endif endloop eqnprint equation estimate fcast fcasterr fit freq function funcerr garch genr gnuplot graph hausman hccm help hilu hsk hurst if import include info kpss label labels lad lags ldiff leverage lmtest logistic logit logs loop mahal meantest mle modeltab mpols multiply nls nulldata ols omit omitfrom open outfile panel pca pergm plot poisson pooled print printf probit pvalue pwe quit remember rename reset restrict rhodiff rmplot run runs scatters sdiff set setobs setmiss shell sim smpl spearman square store summary system tabprint testuhat tobit transpos tsls var varlist vartest vecm vif wls 
+
+"Gretl genr functions
+syn keyword gGenrFunc log exp sin cos tan atan diff ldiff sdiff mean sd min max sort int ln coeff abs rho sqrt sum nobs firstobs lastobs normal uniform stderr cum missing ok misszero corr vcv var sst cov median zeromiss pvalue critical obsnum mpow dnorm cnorm gamma lngamma resample hpfilt bkfilt fracdiff varnum isvector islist nelem 
+
+" Identifier
+" identifier with leading letter and optional following keyword characters
+syn match gIdentifier /\a\k*/
+
+"  Variable with leading $
+syn match gVariable /\$\k*/
+" Arrow
+syn match gArrow /<-/
+
+" Special
+syn match gDelimiter /[,;:]/
+
+" Error
+syn region gRegion matchgroup=Delimiter start=/(/ matchgroup=Delimiter end=/)/ transparent contains=ALLBUT,rError,rBraceError,rCurlyError,gBCstart,gBCend
+syn region gRegion matchgroup=Delimiter start=/{/ matchgroup=Delimiter end=/}/ transparent contains=ALLBUT,rError,rBraceError,rParenError
+syn region gRegion matchgroup=Delimiter start=/\[/ matchgroup=Delimiter end=/]/ transparent contains=ALLBUT,rError,rCurlyError,rParenError
+syn match gError      /[)\]}]/
+syn match gBraceError /[)}]/ contained
+syn match gCurlyError /[)\]]/ contained
+syn match gParenError /[\]}]/ contained
+
+" Comment
+syn match gComment /#.*/
+syn match gBCstart /(\*/
+syn match gBCend /\*)/
+
+syn region gBlockComment matchgroup=gCommentStart start="(\*" end="\*)"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+hi def link gComment      Comment
+hi def link gCommentStart Comment
+hi def link gBlockComment Comment
+hi def link gString       String
+hi def link gNumber       Number
+hi def link gBoolean      Boolean
+hi def link gFloat        Float
+hi def link gCommands     Repeat	
+hi def link gGenrFunc     Type
+hi def link gDelimiter    Delimiter
+hi def link gError        Error
+hi def link gBraceError   Error
+hi def link gCurlyError   Error
+hi def link gParenError   Error
+hi def link gIdentifier   Normal
+hi def link gVariable     Identifier
+hi def link gArrow	       Repeat
+
+let b:current_syntax="gretl"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/group.vim b/syntax/group.vim
new file mode 100644
index 000000000..a0dba966a
--- /dev/null
+++ b/syntax/group.vim
@@ -0,0 +1,56 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'group') == -1
+
+" Vim syntax file
+" Language:             group(5) user group file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2012-08-05
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match   groupBegin          display '^' nextgroup=groupName
+
+syn match   groupName           contained display '[^:]\+'
+                                \ nextgroup=groupPasswordColon
+
+syn match   groupPasswordColon  contained display ':'
+                                \ nextgroup=groupPassword,groupShadow
+
+syn match   groupPassword       contained display '[^:]*'
+                                \ nextgroup=groupGIDColon
+
+syn match   groupShadow         contained display '[x*]' nextgroup=groupGIDColon
+
+syn match   groupGIDColon       contained display ':' nextgroup=groupGID
+
+syn match   groupGID            contained display '\d*'
+                                \ nextgroup=groupUserListColon
+
+syn match   groupUserListColon  contained display ':' nextgroup=groupUserList
+
+syn match   groupUserList       contained '[^,]\+'
+                                \ nextgroup=groupUserListSep
+
+syn match   groupUserListSep    contained display ',' nextgroup=groupUserList
+
+hi def link groupDelimiter      Normal
+hi def link groupName           Identifier
+hi def link groupPasswordColon  groupDelimiter
+hi def link groupPassword       Number
+hi def link groupShadow         Special
+hi def link groupGIDColon       groupDelimiter
+hi def link groupGID            Number
+hi def link groupUserListColon  groupDelimiter
+hi def link groupUserList       Identifier
+hi def link groupUserListSep    groupDelimiter
+
+let b:current_syntax = "group"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/gsp.vim b/syntax/gsp.vim
new file mode 100644
index 000000000..03c604048
--- /dev/null
+++ b/syntax/gsp.vim
@@ -0,0 +1,58 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gsp') == -1
+
+" Vim syntax file
+" Language:	GSP - GNU Server Pages (v. 0.86)
+" Created By:	Nathaniel Harward nharward@yahoo.com
+" Last Changed: 2012 Jan 08 by Thilo Six
+" Filenames:    *.gsp
+" URL:		http://www.constructicon.com/~nharward/vim/syntax/gsp.vim
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'gsp'
+endif
+
+" Source HTML syntax
+runtime! syntax/html.vim
+unlet b:current_syntax
+
+syn case match
+
+" Include Java syntax
+syn include @gspJava syntax/java.vim
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Add <java> as an HTML tag name along with its args
+syn keyword htmlTagName contained java
+syn keyword htmlArg     contained type file page
+
+" Redefine some HTML things to include (and highlight) gspInLine code in
+" places where it's likely to be found
+syn region htmlString contained start=+"+ end=+"+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc,gspInLine
+syn region htmlString contained start=+'+ end=+'+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc,gspInLine
+syn match  htmlValue  contained "=[\t ]*[^'" \t>][^ \t>]*"hs=s+1 contains=javaScriptExpression,@htmlPreproc,gspInLine
+syn region htmlEndTag		start=+</+    end=+>+ contains=htmlTagN,htmlTagError,gspInLine
+syn region htmlTag		start=+<[^/]+ end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster,gspInLine
+syn match  htmlTagN   contained +<\s*[-a-zA-Z0-9]\++hs=s+1 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster,gspInLine
+syn match  htmlTagN   contained +</\s*[-a-zA-Z0-9]\++hs=s+2 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster,gspInLine
+
+" Define the GSP java code blocks
+syn region  gspJavaBlock start="<java\>[^>]*\>" end="</java>"me=e-7 contains=@gspJava,htmlTag
+syn region  gspInLine    matchgroup=htmlError start="`" end="`" contains=@gspJava
+
+let b:current_syntax = "gsp"
+
+if main_syntax == 'gsp'
+  unlet main_syntax
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/gtkrc.vim b/syntax/gtkrc.vim
new file mode 100644
index 000000000..beebd233a
--- /dev/null
+++ b/syntax/gtkrc.vim
@@ -0,0 +1,130 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gtkrc') == -1
+
+" Vim syntax file
+" This is a GENERATED FILE. Please always refer to source file at the URI below.
+" Language: Gtk+ theme files `gtkrc'
+" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2002-10-31
+" URL: http://trific.ath.cx/Ftp/vim/syntax/gtkrc.vim
+
+" Setup
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+setlocal iskeyword=_,-,a-z,A-Z,48-57
+
+syn case match
+
+" Base constructs
+syn match gtkrcComment "#.*$" contains=gtkrcFixme
+syn keyword gtkrcFixme FIXME TODO XXX NOT contained
+syn region gtkrcACString start=+"+ skip=+\\\\\|\\"+ end=+"+ oneline contains=gtkrcWPathSpecial,gtkrcClassName,gtkrcClassNameGnome contained
+syn region gtkrcBString start=+"+ skip=+\\\\\|\\"+ end=+"+ oneline contains=gtkrcKeyMod contained
+syn region gtkrcString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=gtkrcStockName,gtkrcPathSpecial,gtkrcRGBColor
+syn match gtkrcPathSpecial "<parent>" contained
+syn match gtkrcWPathSpecial "[*?.]" contained
+syn match gtkrcNumber "^\(\d\+\)\=\.\=\d\+"
+syn match gtkrcNumber "\W\(\d\+\)\=\.\=\d\+"lc=1
+syn match gtkrcRGBColor "#\(\x\{12}\|\x\{9}\|\x\{6}\|\x\{3}\)" contained
+syn cluster gtkrcPRIVATE add=gtkrcFixme,gtkrcPathSpecial,gtkrcWPathSpecial,gtkrcRGBColor,gtkrcACString
+
+" Keywords
+syn keyword gtkrcInclude include
+syn keyword gtkrcPathSet module_path pixmap_path
+syn keyword gtkrcTop binding style
+syn keyword gtkrcTop widget widget_class nextgroup=gtkrcACString skipwhite
+syn keyword gtkrcTop class nextgroup=gtkrcACString skipwhite
+syn keyword gtkrcBind bind nextgroup=gtkrcBString skipwhite
+syn keyword gtkrcStateName NORMAL INSENSITIVE PRELIGHT ACTIVE SELECTED
+syn keyword gtkrcPriorityName HIGHEST RC APPLICATION GTK LOWEST
+syn keyword gtkrcPriorityName highest rc application gtk lowest
+syn keyword gtkrcTextDirName LTR RTL
+syn keyword gtkrcStyleKeyword fg bg fg_pixmap bg_pixmap bg_text base font font_name fontset stock text
+syn match gtkrcKeyMod "<\(alt\|ctrl\|control\|mod[1-5]\|release\|shft\|shift\)>" contained
+syn cluster gtkrcPRIVATE add=gtkrcKeyMod
+
+" Enums and engine words
+syn keyword gtkrcKeyword engine image
+syn keyword gtkrcImage arrow_direction border detail file gap_border gap_end_border gap_end_file gap_file gap_side gap_side gap_start_border gap_start_file orientation overlay_border overlay_file overlay_stretch recolorable shadow state stretch thickness
+syn keyword gtkrcConstant TRUE FALSE NONE IN OUT LEFT RIGHT TOP BOTTOM UP DOWN VERTICAL HORIZONTAL ETCHED_IN ETCHED_OUT
+syn keyword gtkrcFunction function nextgroup=gtkrcFunctionEq skipwhite
+syn match gtkrcFunctionEq "=" nextgroup=gtkrcFunctionName contained skipwhite
+syn keyword gtkrcFunctionName ARROW BOX BOX_GAP CHECK CROSS DIAMOND EXTENSION FLAT_BOX FOCUS HANDLE HLINE OPTION OVAL POLYGON RAMP SHADOW SHADOW_GAP SLIDER STRING TAB VLINE contained
+syn cluster gtkrcPRIVATE add=gtkrcFunctionName,gtkrcFunctionEq
+
+" Class names
+syn keyword gtkrcClassName GtkAccelLabel GtkAdjustment GtkAlignment GtkArrow GtkAspectFrame GtkBin GtkBox GtkButton GtkButtonBox GtkCList GtkCTree GtkCalendar GtkCheckButton GtkCheckMenuItem GtkColorSelection GtkColorSelectionDialog GtkCombo GtkContainer GtkCurve GtkData GtkDialog GtkDrawingArea GtkEditable GtkEntry GtkEventBox GtkFileSelection GtkFixed GtkFontSelection GtkFontSelectionDialog GtkFrame GtkGammaCurve GtkHBox GtkHButtonBox GtkHPaned GtkHRuler GtkHScale GtkHScrollbar GtkHSeparator GtkHandleBox GtkImage GtkImageMenuItem GtkInputDialog GtkInvisible GtkItem GtkItemFactory GtkLabel GtkLayout GtkList GtkListItem GtkMenu GtkMenuBar GtkMenuItem GtkMenuShell GtkMessageDialog GtkMisc GtkNotebook GtkObject GtkOptionMenu GtkPacker GtkPaned GtkPixmap GtkPlug GtkPreview GtkProgress GtkProgressBar GtkRadioButton GtkRadioMenuItem GtkRange GtkRuler GtkScale GtkScrollbar GtkScrolledWindow GtkSeparatorMenuItem GtkSocket GtkSpinButton GtkStatusbar GtkTable GtkTearoffMenuItem GtkText GtkTextBuffer GtkTextMark GtkTextTag GtkTextView GtkTipsQuery GtkToggleButton GtkToolbar GtkTooltips GtkTree GtkTreeView GtkTreeItem GtkVBox GtkVButtonBox GtkVPaned GtkVRuler GtkVScale GtkVScrollbar GtkVSeparator GtkViewport GtkWidget GtkWindow GtkWindowGroup contained
+syn keyword gtkrcClassName AccelLabel Adjustment Alignment Arrow AspectFrame Bin Box Button ButtonBox CList CTree Calendar CheckButton CheckMenuItem ColorSelection ColorSelectionDialog Combo Container Curve Data Dialog DrawingArea Editable Entry EventBox FileSelection Fixed FontSelection FontSelectionDialog Frame GammaCurve HBox HButtonBox HPaned HRuler HScale HScrollbar HSeparator HandleBox Image ImageMenuItem InputDialog Invisible Item ItemFactory Label Layout List ListItem Menu MenuBar MenuItem MenuShell MessageDialog Misc Notebook Object OptionMenu Packer Paned Pixmap Plug Preview Progress ProgressBar RadioButton RadioMenuItem Range Ruler Scale Scrollbar ScrolledWindow SeparatorMenuItem Socket SpinButton Statusbar Table TearoffMenuItem Text TextBuffer TextMark TextTag TextView TipsQuery ToggleButton Toolbar Tooltips Tree TreeView TreeItem VBox VButtonBox VPaned VRuler VScale VScrollbar VSeparator Viewport Widget Window WindowGroup contained
+syn keyword gtkrcClassNameGnome GnomeAbout GnomeAnimator GnomeApp GnomeAppBar GnomeCalculator GnomeCanvas GnomeCanvasEllipse GnomeCanvasGroup GnomeCanvasImage GnomeCanvasItem GnomeCanvasLine GnomeCanvasPolygon GnomeCanvasRE GnomeCanvasRect GnomeCanvasText GnomeCanvasWidget GnomeClient GnomeColorPicker GnomeDEntryEdit GnomeDateEdit GnomeDialog GnomeDock GnomeDockBand GnomeDockItem GnomeDockLayout GnomeDruid GnomeDruidPage GnomeDruidPageFinish GnomeDruidPageStandard GnomeDruidPageStart GnomeEntry GnomeFileEntry GnomeFontPicker GnomeFontSelector GnomeHRef GnomeIconEntry GnomeIconList GnomeIconSelection GnomeIconTextItem GnomeLess GnomeMDI GnomeMDIChild GnomeMDIGenericChild GnomeMessageBox GnomeNumberEntry GnomePaperSelector GnomePixmap GnomePixmapEntry GnomeProcBar GnomePropertyBox GnomeScores GnomeSpell GnomeStock GtkClock GtkDial GtkPixmapMenuItem GtkTed contained
+syn cluster gtkrcPRIVATE add=gtkrcClassName,gtkrcClassNameGnome
+
+" Stock item names
+syn keyword gtkrcStockName gtk-add gtk-apply gtk-bold gtk-cancel gtk-cdrom gtk-clear gtk-close gtk-convert gtk-copy gtk-cut gtk-delete gtk-dialog-error gtk-dialog-info gtk-dialog-question gtk-dialog-warning gtk-dnd gtk-dnd-multiple gtk-execute gtk-find gtk-find-and-replace gtk-floppy gtk-goto-bottom gtk-goto-first gtk-goto-last gtk-goto-top gtk-go-back gtk-go-down gtk-go-forward gtk-go-up gtk-help gtk-home gtk-index gtk-italic gtk-jump-to gtk-justify-center gtk-justify-fill gtk-justify-left gtk-justify-right gtk-missing-image gtk-new gtk-no gtk-ok gtk-open gtk-paste gtk-preferences gtk-print gtk-print-preview gtk-properties gtk-quit gtk-redo gtk-refresh gtk-remove gtk-revert-to-saved gtk-save gtk-save-as gtk-select-color gtk-select-font gtk-sort-ascending gtk-sort-descending gtk-spell-check gtk-stop gtk-strikethrough gtk-undelete gtk-underline gtk-undo gtk-yes gtk-zoom-100 gtk-zoom-fit gtk-zoom-in gtk-zoom-out contained
+syn cluster gtkrcPRIVATE add=gtkrcStockName
+
+" Gtk Settings
+syn keyword gtkrcSettingsName gtk-double-click-time gtk-cursor-blink gtk-cursor-blink-time gtk-split-cursor gtk-theme-name gtk-key-theme-name gtk-menu-bar-accel gtk-dnd-drag-threshold gtk-font-name gtk-color-palette gtk-entry-select-on-focus gtk-can-change-accels gtk-toolbar-style gtk-toolbar-icon-size
+syn cluster gtkrcPRIVATE add=gtkrcSettingsName
+
+" Catch errors caused by wrong parenthesization
+syn region gtkrcParen start='(' end=')' transparent contains=ALLBUT,gtkrcParenError,@gtkrcPRIVATE
+syn match gtkrcParenError ")"
+syn region gtkrcBrace start='{' end='}' transparent contains=ALLBUT,gtkrcBraceError,@gtkrcPRIVATE
+syn match gtkrcBraceError "}"
+syn region gtkrcBracket start='\[' end=']' transparent contains=ALLBUT,gtkrcBracketError,@gtkrcPRIVATE
+syn match gtkrcBracketError "]"
+
+" Synchronization
+syn sync minlines=50
+syn sync match gtkrcSyncClass groupthere NONE "^\s*class\>"
+
+" Define the default highlighting
+
+hi def link gtkrcComment Comment
+hi def link gtkrcFixme Todo
+
+hi def link gtkrcInclude Preproc
+
+hi def link gtkrcACString gtkrcString
+hi def link gtkrcBString gtkrcString
+hi def link gtkrcString String
+hi def link gtkrcNumber Number
+hi def link gtkrcStateName gtkrcConstant
+hi def link gtkrcPriorityName gtkrcConstant
+hi def link gtkrcTextDirName gtkrcConstant
+hi def link gtkrcSettingsName Function
+hi def link gtkrcStockName Function
+hi def link gtkrcConstant Constant
+
+hi def link gtkrcPathSpecial gtkrcSpecial
+hi def link gtkrcWPathSpecial gtkrcSpecial
+hi def link gtkrcRGBColor gtkrcSpecial
+hi def link gtkrcKeyMod gtkrcSpecial
+hi def link gtkrcSpecial Special
+
+hi def link gtkrcTop gtkrcKeyword
+hi def link gtkrcPathSet gtkrcKeyword
+hi def link gtkrcStyleKeyword gtkrcKeyword
+hi def link gtkrcFunction gtkrcKeyword
+hi def link gtkrcBind gtkrcKeyword
+hi def link gtkrcKeyword Keyword
+
+hi def link gtkrcClassNameGnome gtkrcGtkClass
+hi def link gtkrcClassName gtkrcGtkClass
+hi def link gtkrcFunctionName gtkrcGtkClass
+hi def link gtkrcGtkClass Type
+
+hi def link gtkrcImage gtkrcOtherword
+hi def link gtkrcOtherword Function
+
+hi def link gtkrcParenError gtkrcError
+hi def link gtkrcBraceError gtkrcError
+hi def link gtkrcBracketError gtkrcError
+hi def link gtkrcError Error
+
+
+let b:current_syntax = "gtkrc"
+
+endif
diff --git a/syntax/haste.vim b/syntax/haste.vim
new file mode 100644
index 000000000..0368fd305
--- /dev/null
+++ b/syntax/haste.vim
@@ -0,0 +1,146 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haste') == -1
+
+" Vim syntax file
+" Language:	HASTE - a language for VLSI IC programming
+" Maintainer:	M. Tranchero - maurizio.tranchero?gmail.com
+" Credits:	some parts have been taken from vhdl, verilog, and C syntax
+"		files
+" Version:	0.9
+" Last Change:	0.9 improvement of haste numbers detection
+" Change:	0.8 error matching for wrong hierarchical connections 
+" Change:	0.7 added more rules to highlight pre-processor directives
+
+" HASTE
+if exists("b:current_syntax")
+    finish
+endif
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" case is significant
+syn case match
+
+" HASTE keywords
+syn keyword hasteStatement act alias arb array begin bitvec 
+syn keyword hasteStatement bitwidth boolvec broad case
+syn keyword hasteStatement cast chan const dataprobe do edge
+syn keyword hasteStatement else end export false ff fi file
+syn keyword hasteStatement fit for forever func if import
+syn keyword hasteStatement inprobe is les main narb narrow
+syn keyword hasteStatement negedge od of or outprobe pas
+syn keyword hasteStatement posedge probe proc ram ramreg
+syn keyword hasteStatement repeat rom romreg sample sel si
+syn keyword hasteStatement sign sizeof skip stop then true
+syn keyword hasteStatement type until var wait wire
+syn keyword hasteFutureExt Z ffe partial 
+syn keyword hasteVerilog   buf reg while 
+
+" Special match for "if", "or", and "else" since "else if"
+" and other "else+if" combination shouldn't be highlighted.
+" The right keyword is "or" 
+syn match   hasteStatement	"\<\(if\|then\|else\|fi\)\>"
+syn match   hasteNone		"\<else\s\+if\>$"
+syn match   hasteNone		"\<else\s\+if\>\s"
+syn match   hasteNone		"\<elseif\>\s"
+syn match   hasteNone		"\<elsif\>\s"
+syn match   hasteStatement	"\<\(case\|is\|si\)\>"
+syn match   hasteStatement	"\<\(repeat\|until\)\>"
+syn match   hasteStatement	"\<\(forever\|do\|od\)\>"
+syn match   hasteStatement	"\<\(for\|do\|od\)\>"
+syn match   hasteStatement	"\<\(do\|or\|od\)\>"
+syn match   hasteStatement	"\<\(sel\|les\)\>"
+syn match   hasteError		"\<\d\+[_a-zA-Z]\+\>"
+syn match   hasteError		"\(\([[:alnum:]]\+\s*(\s\+\|)\s*,\)\)\s*\([[:alnum:]]\+\s*(\)"
+
+" Predifined Haste types
+syn keyword hasteType bool
+
+" Values for standard Haste types
+" syn match hasteVector "\'[0L1HXWZU\-\?]\'"
+
+syn match  hasteVector "0b\"[01_]\+\""
+syn match  hasteVector "0x\"[0-9a-f_]\+\""
+syn match  hasteCharacter "'.'"
+" syn region hasteString start=+"+  end=+"+
+syn match  hasteIncluded	display contained "<[^>]*>"
+syn match  hasteIncluded	display contained "<[^"]*>"
+syn region hasteInclude	start="^\s*#include\>\s*" end="$" contains=hasteIncluded,hasteString
+
+" integer numbers
+syn match hasteNumber "\d\+\^[[:alnum:]]*[-+]\{0,1\}[[:alnum:]]*"
+syn match hasteNumber "-\=\<\d\+\(\^[+\-]\=\d\+\)\>"
+syn match hasteNumber "-\=\<\d\+\>"
+" syn match hasteNumber "0*2#[01_]\+#\(\^[+\-]\=\d\+\)\="
+" syn match hasteNumber "0*16#[0-9a-f_]\+#\(\^[+\-]\=\d\+\)\="
+" operators
+syn keyword hasteSeparators	& , . \| 
+syn keyword hasteExecution	\|\| ; @
+syn keyword hasteOperator	:= ? ! :
+syn keyword hasteTypeConstr	"[" << >> .. "]" ~
+syn keyword hasteExprOp		< <= >= > = # <> + - * == ##
+syn keyword hasteMisc		( ) 0x 0b
+"
+syn match   hasteSeparators	"[&:\|,.]"
+syn match   hasteOperator	":="
+syn match   hasteOperator	":"
+syn match   hasteOperator	"?"
+syn match   hasteOperator	"!"
+syn match   hasteExecution	"||"
+syn match   hasteExecution	";"
+syn match   hasteExecution	"@"
+syn match   hasteType		"\[\["
+syn match   hasteType		"\]\]"
+syn match   hasteType		"<<"
+syn match   hasteType		">>"
+syn match   hasteExprOp		"<"
+syn match   hasteExprOp		"<="
+syn match   hasteExprOp		">="
+syn match   hasteExprOp		">"
+syn match   hasteExprOp		"<>"
+syn match   hasteExprOp		"="
+syn match   hasteExprOp		"=="
+syn match   hasteExprOp		"##"
+" syn match   hasteExprOp		"#"
+syn match   hasteExprOp		"*"
+syn match   hasteExprOp		"+"
+
+syn region  hasteComment start="/\*" end="\*/" contains=@Spell
+syn region  hasteComment start="{" end="}" contains=@Spell
+syn match   hasteComment "//.*" contains=@Spell
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+hi def link hasteSpecial	Special
+hi def link hasteStatement	Statement
+hi def link hasteCharacter	String
+hi def link hasteString		String
+hi def link hasteVector		String
+hi def link hasteBoolean	String
+hi def link hasteComment	Comment
+hi def link hasteNumber		String
+hi def link hasteTime		String
+hi def link hasteType		Type
+hi def link hasteGlobal		Error
+hi def link hasteError		Error
+hi def link hasteAttribute	Type
+"
+hi def link hasteSeparators	Special
+hi def link hasteExecution	Special
+hi def link hasteTypeConstr	Special
+hi def link hasteOperator	Type
+hi def link hasteExprOp		Type
+hi def link hasteMisc		String
+hi def link hasteFutureExt 	Error
+hi def link hasteVerilog	Error
+hi def link hasteDefine		Macro
+hi def link hasteInclude	Include
+" hi def link hastePreProc	Preproc
+" hi def link hastePreProcVar	Special
+
+let b:current_syntax = "haste"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/hastepreproc.vim b/syntax/hastepreproc.vim
new file mode 100644
index 000000000..db8bd237d
--- /dev/null
+++ b/syntax/hastepreproc.vim
@@ -0,0 +1,42 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hastepreproc') == -1
+
+" Vim syntax file
+" Language:	Haste preprocessor files 
+" Maintainer:	M. Tranchero - maurizio.tranchero@gmail.com
+" Credits:	some parts have been taken from vhdl, verilog, and C syntax
+"		files
+" Version:	0.5
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+" Read the haste syntax to start with
+runtime! syntax/haste.vim
+unlet b:current_syntax
+
+" case is significant
+syn case match
+
+" C pre-processor directives
+syn match  hastepreprocVar 	display "\$[[:alnum:]_]*"
+syn region hastepreprocVar	start="\${" end="}" contains=hastepreprocVar
+"
+"syn region hastepreproc		start="#\[\s*tg[:alnum:]*" end="]#" contains=hastepreprocVar,hastepreproc,hastepreprocError,@Spell
+syn region hastepreproc		start="#\[\s*\(\|tgfor\|tgif\)" end="$" contains=hastepreprocVar,hastepreproc,@Spell
+syn region hastepreproc		start="}\s\(else\)\s{" end="$" contains=hastepreprocVar,hastepreproc,@Spell
+syn region hastepreproc		start="^\s*#\s*\(ifndef\|ifdef\|else\|endif\)\>" end="$" contains=@hastepreprocGroup,@Spell
+syn region hastepreproc		start="\s*##\s*\(define\|undef\)\>" end="$" contains=@hastepreprocGroup,@Spell
+syn match hastepreproc		"}\{0,1}\s*]#"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+hi def link hastepreproc	Preproc
+hi def link hastepreprocVar	Special
+hi def link hastepreprocError	Error
+
+let b:current_syntax = "hastepreproc"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/hb.vim b/syntax/hb.vim
new file mode 100644
index 000000000..6a3eacd2f
--- /dev/null
+++ b/syntax/hb.vim
@@ -0,0 +1,93 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hb') == -1
+
+" Vim syntax file
+" Language:	Hyper Builder
+" Maintainer:	Alejandro Forero Cuervo
+" URL:		http://bachue.com/hb/vim/syntax/hb.vim
+" Last Change:	2012 Jan 08 by Thilo Six
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Read the HTML syntax to start with
+"syn include @HTMLStuff <sfile>:p:h/htmlhb.vim
+
+"this would be nice but we are supposed not to do it
+"set mps=<:>
+
+"syn region  HBhtmlString contained start=+"+ end=+"+ contains=htmlSpecialChar
+"syn region  HBhtmlString contained start=+'+ end=+'+ contains=htmlSpecialChar
+
+"syn match   htmlValue    contained "=[\t ]*[^'" \t>][^ \t>]*"
+
+syn match   htmlSpecialChar "&[^;]*;" contained
+
+syn match   HBhtmlTagSk  contained "[A-Za-z]*"
+
+syn match   HBhtmlTagS   contained "<\s*\(hb\s*\.\s*\(sec\|min\|hour\|day\|mon\|year\|input\|html\|time\|getcookie\|streql\|url-enc\)\|wall\s*\.\s*\(show\|info\|id\|new\|rm\|count\)\|auth\s*\.\s*\(chk\|add\|find\|user\)\|math\s*\.\s*exp\)\s*\([^.A-Za-z0-9]\|$\)" contains=HBhtmlTagSk transparent
+
+syn match   HBhtmlTagN   contained "[A-Za-z0-9\/\-]\+"
+
+syn match   HBhtmlTagB   contained "<\s*[A-Za-z0-9\/\-]\+\(\s*\.\s*[A-Za-z0-9\/\-]\+\)*" contains=HBhtmlTagS,HBhtmlTagN
+
+syn region  HBhtmlTag contained start=+<+ end=+>+ contains=HBhtmlTagB,HBDirectiveError
+
+syn match HBFileName ".*" contained
+
+syn match HBDirectiveKeyword	":\s*\(include\|lib\|set\|out\)\s\+" contained
+
+syn match HBDirectiveError	"^:.*$" contained
+
+"syn match HBDirectiveBlockEnd "^:\s*$" contained
+
+"syn match HBDirectiveOutHead "^:\s*out\s\+\S\+.*" contained contains=HBDirectiveKeyword,HBFileName
+
+"syn match HBDirectiveSetHead "^:\s*set\s\+\S\+.*" contained contains=HBDirectiveKeyword,HBFileName
+
+syn match HBInvalidLine "^.*$"
+
+syn match HBDirectiveInclude "^:\s*include\s\+\S\+.*$" contains=HBFileName,HBDirectiveKeyword
+
+syn match HBDirectiveLib "^:\s*lib\s\+\S\+.*$" contains=HBFileName,HBDirectiveKeyword
+
+syn region HBText matchgroup=HBDirectiveKeyword start=/^:\(set\|out\)\s*\S\+.*$/ end=/^:\s*$/ contains=HBDirectiveError,htmlSpecialChar,HBhtmlTag keepend
+
+"syn match HBLine "^:.*$" contains=HBDirectiveInclude,HBDirectiveLib,HBDirectiveError,HBDirectiveSet,HBDirectiveOut
+
+syn match HBComment "^#.*$"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link HBhtmlString			 String
+hi def link HBhtmlTagN			 Function
+hi def link htmlSpecialChar		 String
+
+hi def link HBInvalidLine Error
+hi def link HBFoobar Comment
+hi HBFileName guibg=lightgray guifg=black
+hi def link HBDirectiveError Error
+hi def link HBDirectiveBlockEnd HBDirectiveKeyword
+hi HBDirectiveKeyword guibg=lightgray guifg=darkgreen
+hi def link HBComment Comment
+hi def link HBhtmlTagSk Statement
+
+
+syn sync match Normal grouphere NONE "^:\s*$"
+syn sync match Normal grouphere NONE "^:\s*lib\s\+[^ \t]\+$"
+syn sync match Normal grouphere NONE "^:\s*include\s\+[^ \t]\+$"
+"syn sync match Block  grouphere HBDirectiveSet "^#:\s*set\s\+[^ \t]\+"
+"syn sync match Block  grouphere HBDirectiveOut "^#:\s*out\s\+[^ \t]\+"
+
+let b:current_syntax = "hb"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/hercules.vim b/syntax/hercules.vim
new file mode 100644
index 000000000..e0fc737a4
--- /dev/null
+++ b/syntax/hercules.vim
@@ -0,0 +1,123 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hercules') == -1
+
+" Vim syntax file
+" Language:	Hercules
+" Maintainer:	Dana Edwards <Dana_Edwards@avanticorp.com>
+" Extensions:   *.vc,*.ev,*.rs
+" Last change:  Nov. 9, 2001
+" Comment:      Hercules physical IC design verification software ensures
+"		that an IC's physical design matches its logical design and
+"		satisfies manufacturing rules.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Ignore case
+syn case ignore
+
+" Hercules runset sections
+syn keyword   herculesType	  header assign_property alias assign
+syn keyword   herculesType	  options preprocess_options
+syn keyword   herculesType	  explode_options technology_options
+syn keyword   herculesType	  drc_options database_options
+syn keyword   herculesType	  text_options lpe_options evaccess_options
+syn keyword   herculesType	  check_point compare_group environment
+syn keyword   herculesType	  grid_check include layer_stats load_group
+syn keyword   herculesType	  restart run_only self_intersect set snap
+syn keyword   herculesType	  system variable waiver
+
+" Hercules commands
+syn keyword   herculesStatement   attach_property boolean cell_extent
+syn keyword   herculesStatement   common_hierarchy connection_points
+syn keyword   herculesStatement   copy data_filter alternate delete
+syn keyword   herculesStatement   explode explode_all fill_pattern find_net
+syn keyword   herculesStatement   flatten
+syn keyword   herculesStatement   level negate polygon_features push
+syn keyword   herculesStatement   rectangles relocate remove_overlap reverse select
+syn keyword   herculesStatement   select_cell select_contains select_edge select_net size
+syn keyword   herculesStatement   text_polygon text_property vertex area cut
+syn keyword   herculesStatement   density enclose external inside_edge
+syn keyword   herculesStatement   internal notch vectorize center_to_center
+syn keyword   herculesStatement   length mask_align moscheck rescheck
+syn keyword   herculesStatement   analysis buildsub init_lpe_db capacitor
+syn keyword   herculesStatement   device gendev nmos pmos diode npn pnp
+syn keyword   herculesStatement   resistor set_param save_property
+syn keyword   herculesStatement   connect disconnect text  text_boolean
+syn keyword   herculesStatement   replace_text create_ports label graphics
+syn keyword   herculesStatement   save_netlist_database lpe_stats netlist
+syn keyword   herculesStatement   spice graphics_property graphics_netlist
+syn keyword   herculesStatement   write_milkyway multi_rule_enclose
+syn keyword   herculesStatement   if error_property equate compare
+syn keyword   herculesStatement   antenna_fix c_thru dev_connect_check
+syn keyword   herculesStatement   dev_net_count device_count net_filter
+syn keyword   herculesStatement   net_path_check ratio process_text_opens
+
+" Hercules keywords
+syn keyword   herculesStatement   black_box_file block compare_dir equivalence
+syn keyword   herculesStatement   format gdsin_dir group_dir group_dir_usage
+syn keyword   herculesStatement   inlib layout_path outlib output_format
+syn keyword   herculesStatement   output_layout_path schematic schematic_format
+syn keyword   herculesStatement   scheme_file output_block else
+syn keyword   herculesStatement   and or not xor andoverlap inside outside by to
+syn keyword   herculesStatement   with connected connected_all texted_with texted
+syn keyword   herculesStatement   by_property cutting edge_touch enclosing inside
+syn keyword   herculesStatement   inside_hole interact touching vertex
+
+" Hercules comments
+syn region    herculesComment		start="/\*" skip="/\*" end="\*/" contains=herculesTodo
+syn match     herculesComment		"//.*" contains=herculesTodo
+
+" Preprocessor directives
+syn match     herculesPreProc "^#.*"
+syn match     herculesPreProc "^@.*"
+syn match     herculesPreProc "macros"
+
+" Hercules COMMENT option
+syn match     herculesCmdCmnt "comment.*=.*"
+
+" Spacings, Resolutions, Ranges, Ratios, etc.
+syn match     herculesNumber	      "-\=\<[0-9]\+L\=\>\|0[xX][0-9]\+\>"
+
+" Parenthesis sanity checker
+syn region    herculesZone       matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" transparent contains=ALLBUT,herculesError,herculesBraceError,herculesCurlyError
+syn region    herculesZone       matchgroup=Delimiter start="{" matchgroup=Delimiter end="}" transparent contains=ALLBUT,herculesError,herculesBraceError,herculesParenError
+syn region    herculesZone       matchgroup=Delimiter start="\[" matchgroup=Delimiter end="]" transparent contains=ALLBUT,herculesError,herculesCurlyError,herculesParenError
+syn match     herculesError      "[)\]}]"
+syn match     herculesBraceError "[)}]"  contained
+syn match     herculesCurlyError "[)\]]" contained
+syn match     herculesParenError "[\]}]" contained
+
+" Hercules output format
+"syn match  herculesOutput "([0-9].*)"
+"syn match  herculesOutput "([0-9].*\;.*)"
+syn match     herculesOutput "perm\s*=.*(.*)"
+syn match     herculesOutput "temp\s*=\s*"
+syn match     herculesOutput "error\s*=\s*(.*)"
+
+"Modify the following as needed.  The trade-off is performance versus functionality.
+syn sync      lines=100
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link herculesStatement  Statement
+hi def link herculesType       Type
+hi def link herculesComment    Comment
+hi def link herculesPreProc    PreProc
+hi def link herculesTodo       Todo
+hi def link herculesOutput     Include
+hi def link herculesCmdCmnt    Identifier
+hi def link herculesNumber     Number
+hi def link herculesBraceError herculesError
+hi def link herculesCurlyError herculesError
+hi def link herculesParenError herculesError
+hi def link herculesError      Error
+
+
+let b:current_syntax = "hercules"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/hex.vim b/syntax/hex.vim
new file mode 100644
index 000000000..62e51f962
--- /dev/null
+++ b/syntax/hex.vim
@@ -0,0 +1,93 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hex') == -1
+
+" Vim syntax file
+" Language:	Intel HEX
+" Maintainer:	Markus Heidelberg <markus.heidelberg@web.de>
+" Previous version:	Sams Ricahrd <sams@ping.at>
+" Last Change:	2015 Feb 24
+
+" Each record (line) is built as follows:
+"
+"    field       digits          states
+"
+"  +----------+
+"  | start    |  1 (':')         hexRecStart
+"  +----------+
+"  | count    |  2               hexDataByteCount
+"  +----------+
+"  | address  |  4               hexNoAddress, hexDataAddress, (hexAddressFieldUnknown)
+"  +----------+
+"  | type     |  2               hexRecType, (hexRecTypeUnknown)
+"  +----------+
+"  | data     |  0..510          hexDataOdd, hexDataEven, hexExtendedAddress, hexStartAddress, (hexDataFieldUnknown, hexDataUnexpected)
+"  +----------+
+"  | checksum |  2               hexChecksum
+"  +----------+
+"
+" States in parentheses in the upper format description indicate that they
+" should not appear in a valid file.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match hexRecStart "^:"
+
+syn match hexDataByteCount "^:[0-9a-fA-F]\{2}" contains=hexRecStart nextgroup=hexAddress
+
+syn match hexAddress "[0-9a-fA-F]\{4}" transparent contained nextgroup=hexRecTypeUnknown,hexRecType
+" The address field groups include the record type field in the last 2
+" characters, the proper match for highlighting follows below.
+syn match hexAddressFieldUnknown "^:[0-9a-fA-F]\{8}"      contains=hexDataByteCount nextgroup=hexDataFieldUnknown,hexChecksum
+syn match hexDataAddress         "^:[0-9a-fA-F]\{6}00"    contains=hexDataByteCount nextgroup=hexDataOdd,hexChecksum
+syn match hexNoAddress           "^:[0-9a-fA-F]\{6}01"    contains=hexDataByteCount nextgroup=hexDataUnexpected,hexChecksum
+syn match hexNoAddress           "^:[0-9a-fA-F]\{6}0[24]" contains=hexDataByteCount nextgroup=hexExtendedAddress
+syn match hexNoAddress           "^:[0-9a-fA-F]\{6}0[35]" contains=hexDataByteCount nextgroup=hexStartAddress
+
+syn match hexRecTypeUnknown "[0-9a-fA-F]\{2}" contained
+syn match hexRecType        "0[0-5]"          contained
+
+syn match hexDataFieldUnknown "[0-9a-fA-F]\{2}" contained nextgroup=hexDataFieldUnknown,hexChecksum
+" alternating highlight per byte for easier reading
+syn match hexDataOdd          "[0-9a-fA-F]\{2}" contained nextgroup=hexDataEven,hexChecksum
+syn match hexDataEven         "[0-9a-fA-F]\{2}" contained nextgroup=hexDataOdd,hexChecksum
+" data bytes which should not exist
+syn match hexDataUnexpected   "[0-9a-fA-F]\{2}" contained nextgroup=hexDataUnexpected,hexChecksum
+" Data digit pair regex usage also results in only highlighting the checksum
+" if the number of data characters is even.
+
+" special data fields
+syn match hexExtendedAddress "[0-9a-fA-F]\{4}" contained nextgroup=hexDataUnexpected,hexChecksum
+syn match hexStartAddress    "[0-9a-fA-F]\{8}" contained nextgroup=hexDataUnexpected,hexChecksum
+
+syn match hexChecksum "[0-9a-fA-F]\{2}$" contained
+
+" Folding Data Records below an Extended Segment/Linear Address Record
+syn region hexExtAdrBlock start="^:[0-9a-fA-F]\{7}[24]" skip="^:[0-9a-fA-F]\{7}0" end="^:"me=s-1 fold transparent
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default methods for highlighting. Can be overridden later
+hi def link hexRecStart            hexRecType
+hi def link hexDataByteCount       Constant
+hi def hexAddressFieldUnknown term=italic cterm=italic gui=italic
+hi def link hexDataAddress         Comment
+hi def link hexNoAddress           DiffAdd
+hi def link hexRecTypeUnknown      hexRecType
+hi def link hexRecType             WarningMsg
+hi def hexDataFieldUnknown    term=italic cterm=italic gui=italic
+hi def hexDataOdd             term=bold cterm=bold gui=bold
+hi def hexDataEven            term=NONE cterm=NONE gui=NONE
+hi def link hexDataUnexpected      Error
+hi def link hexExtendedAddress     hexDataAddress
+hi def link hexStartAddress        hexDataAddress
+hi def link hexChecksum            DiffChange
+
+
+let b:current_syntax = "hex"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/hgcommit.vim b/syntax/hgcommit.vim
new file mode 100644
index 000000000..a57ccafaf
--- /dev/null
+++ b/syntax/hgcommit.vim
@@ -0,0 +1,31 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hgcommit') == -1
+
+" Vim syntax file
+" Language:	hg (Mercurial) commit file
+" Maintainer:	Ken Takata <kentkt at csc dot jp>
+" Last Change:	2012 Aug 23
+" Filenames:	hg-editor-*.txt
+" License:	VIM License
+" URL:		https://github.com/k-takata/hg-vim
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match hgcommitComment "^HG:.*$"             contains=@NoSpell
+syn match hgcommitUser    "^HG: user: \zs.*$"   contains=@NoSpell contained containedin=hgcommitComment
+syn match hgcommitBranch  "^HG: branch \zs.*$"  contains=@NoSpell contained containedin=hgcommitComment
+syn match hgcommitAdded   "^HG: \zsadded .*$"   contains=@NoSpell contained containedin=hgcommitComment
+syn match hgcommitChanged "^HG: \zschanged .*$" contains=@NoSpell contained containedin=hgcommitComment
+syn match hgcommitRemoved "^HG: \zsremoved .*$" contains=@NoSpell contained containedin=hgcommitComment
+
+hi def link hgcommitComment Comment
+hi def link hgcommitUser    String
+hi def link hgcommitBranch  String
+hi def link hgcommitAdded   Identifier
+hi def link hgcommitChanged Special
+hi def link hgcommitRemoved Constant
+
+let b:current_syntax = "hgcommit"
+
+endif
diff --git a/syntax/hog.vim b/syntax/hog.vim
new file mode 100644
index 000000000..95a09fd53
--- /dev/null
+++ b/syntax/hog.vim
@@ -0,0 +1,212 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hog') == -1
+
+" Vim syntax file
+" Language: hog (Snort.conf + .rules)
+" Maintainer: Victor Roemer, <vroemer@badsec.org>.
+" Last Change: 2019 Sep 22
+"              2012 Oct 24  -> Originalish release
+"              2019 Sep 22  -> included PR 3069
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+setlocal iskeyword-=:
+setlocal iskeyword+=-
+syn case ignore
+
+" Hog ruletype crap
+syn keyword     HogRuleType       ruletype nextgroup=HogRuleTypeName skipwhite
+syn match       HogRuleTypeName   "[[:alnum:]_]\+" contained nextgroup=HogRuleTypeBody skipwhite
+syn region      HogRuleTypeBody   start="{" end="}" contained contains=HogRuleTypeType,HogOutput fold
+syn keyword     HogRuleTypeType   type contained
+
+" Hog Configurables
+syn keyword     HogPreproc    preprocessor nextgroup=HogConfigName skipwhite
+syn keyword     HogConfig     config nextgroup=HogConfigName skipwhite
+syn keyword     HogOutput     output nextgroup=HogConfigName skipwhite
+syn match       HogConfigName "[[:alnum:]_-]\+" contained nextgroup=HogConfigOpts skipwhite
+syn region      HogConfigOpts start=":" skip="\\.\{-}$\|^\s*#.\{-}$\|^\s*$" end="$" fold keepend contained contains=HogSpecial,HogNumber,HogIPAddr,HogVar,HogComment
+
+" Event filter's and threshold's
+syn region      HogEvFilter         start="event_filter\|threshold" skip="\\.\{-}$\|^\s*#.\{-}$\|^\s*$" end="$" fold transparent keepend contains=HogEvFilterKeyword,HogEvFilterOptions,HogComment
+syn keyword     HogEvFilterKeyword  skipwhite event_filter threshold
+syn keyword     HogEvFilterOptions  skipwhite type nextgroup=HogEvFilterTypes
+syn keyword     HogEvFilterTypes    skipwhite limit threshold both contained
+syn keyword     HogEvFilterOptions  skipwhite track nextgroup=HogEvFilterTrack
+syn keyword     HogEvFilterTrack    skipwhite by_src by_dst contained
+syn keyword     HogEvFilterOptions  skipwhite gen_id sig_id count seconds nextgroup=HogNumber
+
+" Suppressions
+syn region      HogEvFilter         start="suppress" skip="\\.\{-}$\|^\s*#.\{-}$\|^\s*$" end="$" fold transparent keepend contains=HogSuppressKeyword,HogComment
+syn keyword     HogSuppressKeyword  skipwhite suppress
+syn keyword     HogSuppressOptions  skipwhite gen_id sig_id nextgroup=HogNumber
+syn keyword     HogSuppressOptions  skipwhite track nextgroup=HogEvFilterTrack
+syn keyword     HogSuppressOptions  skipwhite ip nextgroup=HogIPAddr
+
+" Attribute table
+syn keyword     HogAttribute        attribute_table nextgroup=HogAttributeFile
+syn match       HogAttributeFile    contained ".*$" contains=HogVar,HogAttributeType,HogComment
+syn keyword     HogAttributeType    filename
+
+" Hog includes
+syn keyword     HogInclude    include nextgroup=HogIncludeFile skipwhite
+syn match       HogIncludeFile ".*$" contained contains=HogVar,HogComment
+
+" Hog dynamic libraries
+syn keyword     HogDylib      dynamicpreprocessor dynamicengine dynamicdetection nextgroup=HogDylibFile skipwhite
+syn match       HogDylibFile  "\s.*$" contained contains=HogVar,HogDylibType,HogComment
+syn keyword     HogDylibType  directory file contained
+
+" Variable dereferenced with '$'
+syn match       HogVar        "\$[[:alnum:]_]\+"
+
+", Variables declared with 'var'
+syn keyword     HogVarType    var nextgroup=HogVarSet skipwhite
+syn match       HogVarSet     "[[:alnum:]_]\+" display contained nextgroup=HogVarValue skipwhite
+syn match       HogVarValue   ".*$" contained contains=HogString,HogNumber,HogVar,HogComment
+
+" Variables declared with 'ipvar'
+syn keyword     HogIPVarType  ipvar nextgroup=HogIPVarSet skipwhite
+syn match       HogIPVarSet   "[[:alnum:]_]\+" display contained nextgroup=HogIPVarList,HogSpecial skipwhite
+syn region      HogIPVarList  start="\[" end="]" contains=HogIPVarList,HogIPAddr,HogVar,HogOpNot
+
+" Variables declared with 'portvar'
+syn keyword     HogPortVarType portvar nextgroup=HogPortVarSet skipwhite
+syn match       HogPortVarSet "[[:alnum:]_]\+" display contained nextgroup=HogPortVarList,HogPort,HogOpRange,HogOpNot,HogSpecial skipwhite
+syn region      HogPortVarList start="\[" end="]" contains=HogPortVarList,HogVar,HogOpNot,HogPort,HogOpRange,HogOpNot
+syn match       HogPort       "\<\%(\d\+\|any\)\>" display contains=HogOpRange nextgroup=HogOpRange
+
+" Generic stuff
+syn match       HogIPAddr     contained "\<\%(\d\{1,3}\(\.\d\{1,3}\)\{3}\|any\)\>" nextgroup=HogIPCidr
+syn match       HogIPAddr     contained "\<\d\{1,3}\(\.\d\{1,3}\)\{3}\>" nextgroup=HogIPCidr
+syn match       HogIPCidr     contained "\/\([0-2][0-9]\=\|3[0-2]\=\)"
+syn region      HogHexEsc     contained start='|' end='|' oneline
+syn region      HogString     contained start='"' end='"' extend oneline contains=HogHexEsc
+syn match       HogNumber     contained display "\<\d\+\>"
+syn match       HogNumber     contained display "\<\d\+\>"
+syn match       HogNumber     contained display "0x\x\+\>"
+syn keyword     HogSpecial    contained true false yes no default all any
+syn keyword     HogSpecialAny contained any
+syn match       HogOpNot      "!" contained
+syn match       HogOpRange    ":" contained
+
+" Rules
+syn keyword     HogRuleAction     activate alert drop block dynamic log pass reject sdrop sblock skipwhite nextgroup=HogRuleProto,HogRuleBlock
+syn keyword     HogRuleProto      ip tcp tcp-pkt tcp-stream udp icmp http ftp tls smb dns dcerpc ssh smtp imap msn modbus dnp3 enip nfs ikev2 ntp skipwhite contained nextgroup=HogRuleSrcIP
+syn match       HogRuleSrcIP      "\S\+" transparent skipwhite contained contains=HogIPVarList,HogIPAddr,HogVar,HogOpNot nextgroup=HogRuleSrcPort
+syn match       HogRuleSrcPort    "\S\+" transparent skipwhite contained contains=HogPortVarList,HogVar,HogPort,HogOpRange,HogOpNot nextgroup=HogRuleDir
+syn match       HogRuleDir        "->\|<>" skipwhite contained nextgroup=HogRuleDstIP
+syn match       HogRuleDstIP      "\S\+" transparent skipwhite contained contains=HogIPVarList,HogIPAddr,HogVar,HogOpNot nextgroup=HogRuleDstPort
+syn match       HogRuleDstPort    "\S\+" transparent skipwhite contained contains=HogPortVarList,HogVar,HogPort,HogOpRange,HogOpNot nextgroup=HogRuleBlock
+syn region      HogRuleBlock      start="(" end=")" transparent skipwhite contained contains=HogRuleOption,HogComment fold
+",HogString,HogComment,HogVar,HogOptNot
+"syn region      HogRuleOption     start="\<gid\|sid\|rev\|depth\|offset\|distance\|within\>" end="\ze;" skipwhite contained contains=HogNumber
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP msg gid sid rev classtype priority metadata target content nocase rawbytes
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP depth startswith offset distance within http_client_body http_cookie http_raw_cookie http_header
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP http_raw_header http_request_line http_method http_uri http_raw_uri http_protocol http_response_line http_stat_code http_stat_msg
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP http_user_agent http_accept http_accept_enc http_accept_lang http_connection http_content_type http_content_len
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP http_referer http_start http_header_names http_server_body http_host http_raw_host
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP filename fileext filemagic filestore filemd5 filesha1 filesha256 filesize
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP dns_query tls_cert_subject tls_cert_issuer tls_cert_serial tls_cert_fingerprint
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP tls_sni tls_cert_notbefore tls_cert_notafter tls_cert_expired tls_cert_valid
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP tls.version tls.subject tls.issuerdn tls.fingerprint tls.store ja3_hash ja3_string
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP modbus dnp3_func dnp3_ind dnp3_obj dnp3_data enip_command cip_service
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP app-layer-protocol app-layer-event xbits iprep lua luajit
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP fast_pattern prefilter uricontent urilen isdataat pcre pkt_data file_data base64_decode base64_data
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP byte_test byte_jump byte_extract ftpdata_command ftpbounce asn1 cvs dce_iface dce_opnum dce_stub_data
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP sip_method sip_stat_code sip_header sip_body gtp_type gtp_info gtp_version ssl_version
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP ssl_state fragoffset ttl tos id ipopts geoip fragbits dsize flags flow flowbits flowint seq ack window
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP itype icode icmp_id icmp_seq rpc ip_proto sameip stream_reassemble stream_size
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP logto session resp react tag activates activated_by count replace detection_filter
+syn keyword     HogRuleOption   skipwhite contained nextgroup=HogRuleSROP threshold reference sd_pattern file_type file_group
+
+syn region      HogRuleSROP     start=':' end=";" transparent keepend contained contains=HogRuleChars,HogString,HogNumber
+syn match       HogRuleChars    "\%(\k\|\.\|?\|=\|/\|%\|&\)\+" contained
+syn match       HogURLChars     "\%(\.\|?\|=\)\+" contained
+
+" Hog File Type Rules
+syn match       HogFileType   /^\s*file.*$/ transparent contains=HogFileTypeOpt,HogFileFROP
+syn keyword     HogFileTypeOpt  skipwhite contained nextgroup=HogRuleFROP file type ver category id rev content offset msg group 
+syn region      HogFileFROP  start=':' end=";" transparent keepend contained contains=NotASemicoln
+syn match       NotASemiColn   ".*$" contained
+
+
+" Comments
+syn keyword HogTodo   XXX TODO NOTE contained
+syn match   HogTodo   "Step\s\+#\=\d\+" contained
+syn region HogComment start="#" end="$" contains=HogTodo,@Spell
+
+syn case match
+
+if !exists("hog_minlines")
+    let hog_minlines = 100
+endif
+exec "syn sync minlines=" . hog_minlines
+
+hi link HogRuleType           Statement
+hi link HogRuleTypeName       Type
+hi link HogRuleTypeType       Keyword
+
+hi link HogPreproc            Statement
+hi link HogConfig             Statement
+hi link HogOutput             Statement
+hi link HogConfigName         Type
+
+"hi link HogEvFilter
+hi link HogEvFilterKeyword    Statement
+hi link HogSuppressKeyword    Statement
+hi link HogEvFilterTypes      Constant
+hi link HogEvFilterTrack      Constant
+
+hi link HogAttribute          Statement
+hi link HogAttributeFile      String
+hi link HogAttributeType      Statement
+
+hi link HogInclude            Statement
+hi link HogIncludeFile        String
+
+hi link HogDylib              Statement
+hi link HogDylibType          Statement
+hi link HogDylibFile          String
+
+" Variables
+" var
+hi link HogVar                Identifier
+hi link HogVarType            Keyword
+hi link HogVarSet             Identifier
+hi link HogVarValue           String
+" ipvar
+hi link HogIPVarType          Keyword
+hi link HogIPVarSet           Identifier
+" portvar
+hi link HogPortVarType         Keyword
+hi link HogPortVarSet          Identifier
+hi link HogPort                Constant
+
+hi link HogTodo               Todo
+hi link HogComment            Comment
+hi link HogString             String
+hi link HogHexEsc             PreProc
+hi link HogNumber             Number
+hi link HogSpecial            Constant
+hi link HogSpecialAny         Constant
+hi link HogIPAddr             Constant
+hi link HogIPCidr             Constant
+hi link HogOpNot              Operator
+hi link HogOpRange            Operator
+
+hi link HogRuleAction         Statement
+hi link HogRuleProto          Identifier
+hi link HogRuleDir            Operator
+hi link HogRuleOption         Keyword
+hi link HogRuleChars           String 
+
+hi link HogFileType    HogRuleAction
+hi link HogFileTypeOpt HogRuleOption
+hi link NotASemiColn     HogRuleChars
+
+let b:current_syntax = "hog"
+
+endif
diff --git a/syntax/hollywood.vim b/syntax/hollywood.vim
new file mode 100644
index 000000000..cf3345f4b
--- /dev/null
+++ b/syntax/hollywood.vim
@@ -0,0 +1,185 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hollywood') == -1
+
+" Vim syntax file
+" Language:     Hollywood 8.0	
+" Maintainer:	Tom Crecelius <holly@net-eclipse.net>
+" First Author:	Tom Crecelius <holly@net-eclipse.net>
+" Last Change:	2018 May 18
+" Highlighting Issues: 
+" Depending on your colour schema, Strings or Comments might be highlighted in
+" a way, you don't like. If so, try one of the following settings after
+" opening a hollywood script:
+"
+" :hi link hwString MoreMsg 
+" :hi link hwString NonText
+" :hi link hwString String
+"
+" and for comments:
+"
+" :hi link hwComment MoreMsg
+" :hi link hwComment NonText
+" :hi link hwComment Comment
+"
+" Remember the setting you like and change the corresponding definition at
+" the bottom of this file.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if !exists("hw_version")
+  let hw_version = 8
+  let hw_subversion = 0
+elseif !exists("hw_subversion")
+  let hw_subversion = 0
+endif
+
+syn case match
+
+" syncing method
+syn sync minlines=100
+
+" catch errors caused by wrong parenthesis and wrong curly brackets or
+" keywords placed outside their respective blocks
+syn region hwParen      transparent  start='(' end=')' contains=ALLBUT,hwParenError,hwTodo,hwSpecial,hwIfEndIf,hwElseIf,hwElse,hwBlock,hwLoopBlock,hwIn,hwStatement,hwStep,hwFallThrough,hwLineStatement
+syn region hwTableBlock transparent matchgroup=hwTable start="{" end="}" contains=ALLBUT,hwBraceError,hwTodo,hwSpecial,hwIfEndIf,hwElseIf,hwElse,hwBlock,hwLoopBlock,hwIn,hwStatement,hwStep,hwFallThrough,hwLineStatement
+
+syn match  hwParenError ")"
+syn match  hwBraceError "}"
+syn match  hwError "\<\%(If\|End\|Else\|ElseIf\|Then\|Until\|In\|EndIf\|EndSwitch\|FallThrough\|Case\|Default\|Wend\|Until\|Forever\)\>"
+
+" Function ... End
+syn region hwFunctionBlock transparent matchgroup=hwFunction start="\<Function\>" end="\<EndFunction\>" contains=ALLBUT,hwTodo,hwSpecial,hwElseIf,hwElse,hwIn,hwStep,hwFallThrough,hwLineStatement
+
+" If .. Then
+syn region hwIfThen transparent matchgroup=hwCond start="\<If\>" end="\<Then\>\{-}"me=e-4 skipwhite skipempty
+" Then ... Else
+syn region hwThenElse transparent matchgroup=hwCond start="\<Then\>" end="$" end="\<Else\>" contains=ALLBUT,hwTodo,hwSpecial,hwIn,hwStep,hwLineStatement,hwIfEndIf,hwElseEndif,hwIfThen,hwThenElse skipwhite skipempty
+
+" If .. EndIf
+syn region hwIfEndIf transparent matchgroup=hwCond start="\<If\>\(\(.\{-}Then.\{-}\)\@!\)" end="\<EndIf\>" contains=ALLBUT,hwTodo,hwSpecial,hwIn,hwStep,hwLineStatement skipwhite skipempty
+" Else ... EndIf 
+syn region hwElseEndIf contained transparent matchgroup=hwCond start="\<Else\>" end="\<EndIf\>"me=e-5 contains=ALLBUT,hwTodo,hwSpecial,hwElseIf,hwElseEndIf,hwIn,hwStep,hwFallThrough,hwLineStatement
+
+" Then 
+"syn keyword hwLineStatement Then contained
+" Forever
+syn keyword hwLineStatement Forever contained
+" Do
+syn keyword hwLineStatement Do contained
+" ElseIf
+syn keyword hwElseIf ElseIf contained
+
+
+" Switch ... EndSwitch
+syn region hwSwitchEnd transparent matchgroup=hwCond start="\<Switch\>" end="\<EndSwitch\>" contains=hwCase,hwDefCase skipwhite skipempty
+
+" Case ... :
+syn region hwCase transparent matchgroup=hwCond start="\<Case\>" end="\<EndSwitch\>"me=e-9 end="\<Default\>:"me=e-8 end="\<Case\>"me=e-4 contains=ALLBUT,hwTodo,hwSpecial,hwElseIf,hwElseEndIf,hwLineStatement,hwIn,hwStep skipwhite skipempty
+" Default:
+syn region hwDefCase transparent matchgroup=hwCond start="\<Default\>" end="\<EndSwitch\>"me=e-9 contains=ALLBUT,hwTodo,hwSpecial,hwElseIf,hwElseEndIf,hwIn,hwStep,hwCase,hwDefCase,hwFallThrough,hwLineStatement skipwhite skipempty
+
+syn keyword hwFallThrough contained FallThrough
+
+" Block ... EndBlock
+syn region hwBlock transparent matchgroup=hwStatement start="\<Block\>" end="\<EndBlock\>"  contains=ALLBUT,hwTodo,hwSpecial,hwElseIf,hwElse,hwIn,hwStep,hwLineStatement
+
+" Repeat ... Until/Forever
+syn region hwLoopBlock transparent matchgroup=hwRepeat start="\<Repeat\>" end="\<Forever\>" end="\<Until\>"   contains=ALLBUT,hwTodo,hwSpecial,hwElseIf,hwElse,hwIn,hwStep,hwLineStatement
+
+" While ... Wend/Do
+syn region hwLoopBlock transparent matchgroup=hwRepeat start="\<While\>" end="\<Do\>" end="\<Wend\>" contains=ALLBUT,hwTodo,hwSpecial,hwElseIf,hwElse,hwIn,hwStep,hwLineStatement skipwhite skipempty
+
+" For .. To 
+syn region hwForTo transparent matchgroup=hwRepeat start="\<For\>" end="\<To\>"me=e-2 skipwhite skipempty nextgroup=hwToNext
+
+" To .. Next
+syn region hwToNext transparent matchgroup=hwRepeat start="\<To\>" end="\<Next\>"   contains=ALLBUT,hwTodo,hwSpecial,hwElseIf,hwElse,hwIn,hwLineStatement skipwhite skipempty
+
+syn keyword hwStep contained Step
+syn keyword hwIn contained In
+
+" other keywords
+syn keyword hwStatement Return Break Continue
+syn keyword hwStatement Goto Gosub Dim DimStr Const Local Global
+syn match hwLabel "::\I\i*::"
+syn match hwOperator "\%(&\|\*\|+\|-\|\.\||\|//\|/\|:\|<\|=\|>\|<>\|<=\|=>\|\^\|\~\|\\\|\<And\>\|\<Not\>\|\<Or\>\)"
+syn keyword hwConstant Nil
+syn keyword hwConstant True False
+" predefined preprocessing commands
+syn match hwPreProcessor "@\<\%(BGPIC\|BRUSH\|ANIM\|SPRITE\|SAMPLE\|MUSIC\|FILE\|FONT\|VIDEO\|VERSION\|APPTITLE\|APPAUTHOR\|APPCOPYRIGHT\|APPDESCRIPTION\|APPVERSION\|APPICON\|BACKFILL\|SCREEN\|DISPLAY\|INCLUDE\|OPTIONS\|REQUIRE\|MENU\|APPIDENTIFIER\|WARNING\|ERROR\|IF\|ELSEIF\|ELSE\|ENDIF\)\>"ms=s+1
+" predefined constants
+syn match hwConstant "#\<\%(ERR_PORTNOTAVAIL\|SEEK_END\|ERR_CREATESHORTCUT\|PURPLE\|ERR_ALLOCCHANNEL\|PRGTYPE_SCRIPT\|ERR_NORETVAL\|ERR_DDRECVIDEO\|ERR_FINDPATH\|LANGUAGE_RUNDI\|ERR_STRINGCST\|COUNTRY_COLOMBIA\|LANGUAGE_KOREAN\|ERR_USERABORT\|ERR_WENDWOWHILE\|FONT\|FILEATTR_WRITE_OTH\|ERR_MODIFYABGPIC\|COUNTRY_DRCONGO\|LANGUAGE_KIRGHIZ\|LANGUAGE_ROMANSH\|FILEATTR_EXECUTE_GRP\|ERR_READVIDEOPIXELS\|SCROLLTOP\|ERR_ANIMDISK\|COUNTRY_IVORYCOAST\|LANGUAGE_GUJARATI\|SHORT\|COUNTRY_SOUTHAFRICA\|VIDEO\|ERR_BLKWOENDBLK\|ERR_WRONGHEX\|SPRITE_VS_BRUSH\|LANGUAGE_HIRIMOTU\|ZOOMSOUTHEAST\|COUNTRY_SLOVAKIA\|COUNTRY_GIBRALTAR\|ERR_INVALIDDATE\|RTS_ON\|PIXELZOOM1\|ATTRFRAMEDELAY\|AQUA\|ATTRFONTSCALABLE\|FILEATTR_NORMAL\|COUNTRY_ALBANIA\|COUNTRY_JAMAICA\|FONTWEIGHT_MEDIUM\|ERR_MALFORMPAT1\|COUNTRY_FRENCHGUIANA\|ERR_MAXPARAMS\|ERR_FORWONEXT\|COUNTRY_CONGO\|COUNTRY_GAMBIA\|UPNDOWN\|COUNTRY_ANDORRA\|BRUSH\|ERR_SELECTALPHACHANNEL\|MODLCOMMAND\|CLIENT\|COUNTRY_TRINIDADANDTOBAGO\|DIRECTORY\|LANGUAGE_ESPERANTO\|ATTRRAWHEIGHT\|COUNTRY_DENMARK\|FILETYPE_SOUND\|CLIPBOARD_TEXT\|LANGUAGE_FULAH\|ATTRPOSITION\|PLUGINCAPS_CONVERT\|ERR_APPLETVERSION\|COUNTRY_VANUATU\|COUNTDIRECTORIES\|ATTRNOHIDE\|VSTRIPES64\|AMIGAICON_SETPOSITION\|PUSHBOTTOM\|ERR_BACKFILL\|COUNTRY_MOROCCO\|ERR_FILEFORMAT\|COUNTRY_CHILE\|ATTRHOSTSCALEY\|ERR_AHI\|HW_VERSION\|ERR_ALRDYDECLRD\|ATTRRAWWIDTH\|ERR_PIXELFORMAT\|IMGFMT_PLUGIN\|LANGUAGE_HEBREW\|ERR_SETMENU\|ERR_NOLAYERS\|CRUSHTOP\|ERR_MAXLINES\|ATTRHASMASK\|LEFT\|ERR_SELECTANIM\|WALLPAPERLEFT\|TEXTOBJECT\|ERR_AFILEPROP\|LANGUAGE_CZECH\|LANGUAGE_XHOSA\|ERR_PIPE\|LANGUAGE_MANX\|ERR_EXECUTE\|ERR_ENDDOUBLEBUFFER\|ATTRGROUP\|ERR_NAMETOOLONG\|ATTRBORDERRIGHT\|COUNTRY_BOSNIAANDHERZEGOVINA\|ATTRMARGINRIGHT\|RTS_OFF\|LANGUAGE_MARSHALLESE\|LANGUAGE_AZERBAIJANI\|LANGUAGE_TAHITIAN\|JOINMITER\|ATTRNOCLOSE\|REQICON_WARNING\|ERR_NOTPROTRACKER\|LANGUAGE_LAO\|ERR_EMPTYPATH\|ERR_NOCALLBACK\|COUNTRY_UGANDA\|ERR_READFUNC\|IMGFMT_UNKNOWN\|ADF_ANIM\|ERR_LAYERSWITCH\|ERR_RECVCLOSED\|ERR_CTRLSTRUCT\|ERR_TABLEOVERFLOW\|SCROLLBOTTOM\|VSTRIPES\|ERR_VAREXPECTED\|ERR_NOTIGER\|BEEPSYSTEM\|ERR_LOWFREQ\|COUNTFILES\|COUNTRY_MONACO\|BLUE\|ERR_VFONT\|STRUDEL\|REQ_GALLERY\|ERR_NOCOORDCST\|MENU\|HSTRIPES64\|COUNTRY_COCOSISLANDS\|LANGUAGE_SOUTHNDEBELE\|COUNTRY_FALKLANDISLANDS\|COUNTRY_UAE\|LANGUAGE_KANNADA\|ERR_VIDRECMULTI\|FILETYPE_VIDEO\|LANGUAGE_ESTONIAN\|COUNTRY_CAYMANISLANDS\|ERR_BADINTEGER\|MONO16\|COUNTRY_CAMEROON\|COUNTRY_GUAM\|ERR_DISPLAYDESKTOP\|ERR_SETENV\|ERR_INTERNAL\|MASKVISIBLE\|ERR_OPENFONT\|LANGUAGE_WELSH\|ATTRRAWXPOS\|LANGUAGE_THAI\|ATTRHOSTMONITORS\|LANGUAGE_GALICIAN\|COUNTRY_GUATEMALA\|ATTRYPOS\|COUNTRY_UZBEKISTAN\|ERR_ELSEIFAFTERELSE\|MODRCONTROL\|BAUD_4800\|JOYDOWNRIGHT\|COUNTRY_LUXEMBOURG\|COUNTRY_MOZAMBIQUE\|ERR_PAKFORMAT\|LANGUAGE_TAJIK\|LANGUAGE_PANJABI\|ERR_MISSINGFIELD\|PLUGINCAPS_LIBRARY\|ERR_FUNCARGS\|LANGUAGE_MALAY\|COUNTRY_PORTUGAL\|COUNTRY_JAPAN\|ERR_ICONPARMS\|COUNTRY_NEWCALEDONIA\|REMOVELAYER\|MOVEWINDOW\|ATTRFONTASCENDER\|PLUGINCAPS_DIRADAPTER\|ERR_VARLENGTH\|ATTRSIZEABLE\|ERR_SENDUNKNOWN\|MENUITEM_RADIO\|COUNTRY_BELIZE\|ERR_LABELDOUBLE\|QUADRECT\|VBLINDS8\|ERR_UNKNOWNCMD\|SCROLLEAST\|ONBUTTONCLICKALL\|RECTNORTHEAST\|FONTWEIGHT_EXTRABOLD\|COUNTRY_SAINTKITTSANDNEVIS\|ERR_CLOSEDDISPLAY\|PLUGINCAPS_SAVEANIM\|ERR_WINDOW\|LANGUAGE_ZHUANG\|CAPROUND\|ERR_OUTOFRANGE\|REQ_CAMERA\|ERR_WARPOS\|COUNTRY_ELSALVADOR\|ERR_GROUPNAMEUSED\|COUNTRY_GUYANA\|ERR_ALREADYASYNC\|COUNTRY_PALESTINE\|DISPMODE_FAKEFULLSCREEN\|ERR_SYNTAXLEVELS\|ERR_BADPLATFORM\|ERR_VERSION\|ATTRVISIBLE\|HSTRETCHCENTER\|COUNTRY_REUNION\|COUNTRY_INDIA\|STRETCHLEFT\|ERR_ZERODIVISION\|LANGUAGE_NORTHERNSAMI\|SIMPLEBUTTON\|ERR_FINDMENU\|ERR_EMPTYOBJ\|LANGUAGE_BIHARI\|LANGUAGE_LIMBURGAN\|LANGUAGE_BOSNIAN\|ERR_SYSTOOOLD\|ERR_WRITEJPEG\|STOP_1\|COPYFILE_OVERWRITE\|ERR_REVDWORD\|PLUGINCAPS_ANIM\|ERR_ASSERTFAILED\|ERR_BRACEOPEN\|ERR_NEEDMORPHOS2\|BLACK\|LANGUAGE_SWEDISH\|ERR_DBLENCODING\|COPYFILE_STATUS\|ERR_WRONGOPCST\|ERR_BADIP\|ERR_UNKNOWNSEQ\|LANGUAGE_LUXEMBOURGISH\|ERR_WITHWOENDWITH\|ERR_LABINIF\|LANGUAGE_TATAR\|ERR_VIDEOLAYERDRV\|ERR_LEGACYPTMOD\|ERR_SAVEPNG\|NOTRANSPARENCY\|ATTRMASKMODE\|LANGUAGE_VENDA\|ERR_NEWHWPLUGIN\|LANGUAGE_LATIN\|LANGUAGE_EWE\|MENUITEM_TOGGLE\|ERR_BRACKETOPEN\|JOYUP\|COUNTRY_SENEGAL\|LANGUAGE_CHURCHSLAVIC\|ERR_ZLIBIO\|RECTBACKNORTHWEST\|MOVELIST\|ERR_TEXTARG\|ONBUTTONOVER\|VIDDRV_HOLLYWOOD\|IMGFMT_JPEG\|REQ_MULTISELECT\|COUNTRY_NIGERIA\|LANGUAGE_GUARANI\|LANGUAGE_POLISH\|ERR_ICONSTANDARD\|REQ_HIDEICONS\|LANGUAGE_CORSICAN\|DISPMODE_MODEREQUESTER\|ERR_NOABSPATH\|LANGUAGE_GERMAN\|ERR_RANDOMIZE\|ERR_ARGS\|PLUGINCAPS_AUDIOADAPTER\|IMAGETYPE_VECTOR\|LANGUAGE_GREEK\|COUNTRY_HOLYSEE\|COUNTRY_NORTHKOREA\|LANGUAGE_MALAYALAM\|COUNTRY_BOTSWANA\|LANGUAGE_CREE\|ATTRNUMENTRIES\|REQICON_ERROR\|IMGFMT_GIF\|FTPBINARY\|WORD\|VIDDRV_OS\|ATTRDURATION\|LANGUAGE_AKAN\|ERR_FTPERROR\|PLUGINCAPS_VIDEO\|ERR_EXAMINE\|HSTRIPES8\|COUNTRY_OMAN\|CIRCLE\|ERR_BRUSHLINK\|ERR_STREAMASSAMPLE\|ERR_DISPLAYSIZE\|ERR_WRONGFLOAT\|PLUGINCAPS_FILEADAPTER\|ERR_UNSUPPORTEDFEAT\|DISPLAY\|ERR_MUSPAUSED\|INTEGER\|COUNTRY_BOLIVIA\|ERR_RECVTIMEOUT\|ATTRMONITOR\|LANGUAGE_INUKTITUT\|ATTRPAUSED\|LANGUAGE_LITHUANIAN\|DATEYEAR\|JOYUPRIGHT\|ERR_LAYERSOFF\|ERR_EMPTYSCRIPT\|LIGHTUSERDATA\|ERR_FINDTIMER\|ALPHACHANNEL\|LANGUAGE_WALLOON\|ERR_ADFWRONGDISP\|ERR_HTTPERROR\|ERR_REWINDDIR\|ERR_LOCKEDOBJ\|COUNTRY_NEPAL\|HSTRIPES2\|RECTSOUTH\|ERR_UNKPROTOCOL\|COUNTRY_CANADA\|COUNTRY_VENEZUELA\|COUNTRY_MALDIVES\|ERR_SQBRACKETCLOSE\|ERR_HTTPTE\|VSTRIPES2\|COUNTRY_NORWAY\|ERR_FIRSTPREPROC\|SNAPDESKTOP\|LANGUAGE_FINNISH\|COUNTRY_TURKEY\|LANGUAGE_VIETNAMESE\|VBLINDS64\|ERR_FONTFORMAT\|ERR_PIXELRANGE\|LANGUAGE_AVESTAN\|ERR_SYSIMAGE\|BIGSINE\|CLIPBOARD_EMPTY\|ERR_WRONGCLIPREG\|AMIGAICON_NONE\|FONTWEIGHT_EXTRABLACK\|LANGUAGE_IDO\|ATTRFORMAT\|ERR_FUNCJMP\|PARITY_NONE\|ATTRHOSTDEPTH\|ERR_RENDERCALLBACK\|ERR_FINDPORT\|LANGUAGE_NEPALI\|COUNTRY_AMERICANSAMOA\|ERR_MISSINGSEPARTR\|MODRALT\|COUNTRY_BESISLANDS\|LANGUAGE_AVARIC\|ERR_VIDNOTPAUSED\|TOPOUT\|ERR_VALUEEXPECTED\|ERR_WRONGUSAGE\|TURNDOWNLEFT\|ERR_ICONDIMS\|LANGUAGE_HAUSA\|ERR_TRANSBGMOBILE\|SEEK_CURRENT\|ERR_MONITORRANGE\|COUNTRY_FAROEISLANDS\|SHAPE\|COUNTRY_SOLOMONISLANDS\|NAVY\|ERR_PREPROCSYM\|COUNTRY_GEORGIA\|LANGUAGE_OSSETIAN\|ERR_THREAD\|DATA_5\|ERR_INISYNTAX\|ERR_MUSFMTSUPPORT\|LANGUAGE_YIDDISH\|ATTRLAYERS\|SMOOTHOUT\|LANGUAGE_KONGO\|COUNTRY_KYRGYZSTAN\|ATTRDOUBLEBUFFER\|TOP\|ERR_SYSBUTTON\|ERR_DATATYPESAVE\|COUNTRY_LIBYA\|ERR_FUNCWOENDFUNC\|ANIMSTREAM\|ATTRUSERDATA\|LANGUAGE_NORTHNDEBELE\|UDPCLIENT\|ERR_MUSNOTPLYNG\|FILEATTR_READ_OTH\|ERR_EVNTEXPCTED\|ERR_BADDIMENSIONS\|ATTROUTPUTDEVICE\|LANGUAGE_BULGARIAN\|LANGUAGE_SPANISH\|DISPMODE_FULLSCREENSCALE\|LANGUAGE_INTERLINGUE\|FASTSPEED\|ERR_NODISPMODES\|LANGUAGE_CHAMORRO\|ATTRACTIVE\|COUNTRY_TOGO\|INACTIVEWINDOW\|ERR_CREATEEVENT\|COUNTRY_SAUDIARABIA\|FILEATTR_EXECUTE_OTH\|IPAUTO\|SHDWNORTHEAST\|MEMORY\|ERR_XF86VIDMODEEXT\|ARC\|TIMER\|COUNTRY_ICELAND\|FUCHSIA\|NETWORKUDP\|ERR_FINDCLIPREGION\|NETWORKSERVER\|NETWORKCONNECTION\|ATTRFONTNAME\|UDPOBJECT\|ERR_UNTERMINTDSTR\|LANGUAGE_NORWEGIANNYNORSK\|RECTBACKCENTER\|COUNTRY_BANGLADESH\|UPLOADFILE_RESPONSE\|COUNTRY_ITALY\|MASKINVISIBLE\|UPLOADFILE_STATUS\|ERR_FOREVERWOREPEAT\|STRETCHBOTTOM\|STRETCHRIGHT\|MOVEFILE_COPY\|FTPASCII\|RECEIVELINE\|RECEIVEBYTES\|ERR_DRAWPATH\|ATTRFONTAA\|VSTRANGEPUSH\|ERR_BADBASE64\|ERR_NOCLIPREG\|SCROLLNORTHWEST\|RECEIVEALL\|ERR_PLUGINARCH\|DTR_OFF\|HEXNUMERICAL\|FLOW_XON_XOFF\|ERR_LAYERSUPPORT2\|FLOW_HARDWARE\|LANGUAGE_GAELIC\|FLOW_OFF\|COUNTRY_ANTARCTICA\|ERR_REQAUTH\|STOP_2\|SERIF\|ERR_FINDANIM\|PARITY_ODD\|DATA_8\|VSTRIPES32\|COUNTRY_FRANCE\|DATA_6\|BAUD_460800\|HKEY_CURRENT_USER\|COUNTRY_BELARUS\|BAUD_115200\|BAUD_57600\|BAUD_38400\|BAUD_19200\|VSTRIPES4\|COUNTRY_ALANDISLANDS\|LANGUAGE_UKRAINIAN\|ERR_ICONSIZE\|BAUD_9600\|COUNTRY_SYRIA\|COUNTRY_NICARAGUA\|COUNTRY_PERU\|ERR_SIGNAL\|BAUD_2400\|JOYDOWN\|BAUD_300\|FILLRULEEVENODD\|ERR_COMMODITY\|ERR_UNKNOWN\|LANGUAGE_CORNISH\|FONTWEIGHT_LIGHT\|ERR_BAD8SVX\|ONBUTTONOVERALL\|CROSSFADE\|CAPSQUARE\|CAPBUTT\|ERR_STRORNUM\|LANGUAGE_SINDHI\|BEEPQUESTION\|JOINBEVEL\|ERR_PLUGINDOUBLET\|JOINROUND\|LANGUAGE_WESTERNFRISIAN\|ERR_PROTMETATABLE\|LANGUAGE_TURKISH\|BOTTOM\|ZOOMNORTH\|ERR_DATATYPEALPHA\|ERR_FINDUDPOBJECT\|SUN\|TURNDOWNRIGHT\|UDPSERVER\|MODRCOMMAND\|LANGUAGE_SWATI\|COUNTRY_MALAWI\|KEEPASPRAT\|DEFAULTICON\|LANGUAGE_TONGA\|ERR_NUMCALLBACK\|STRING\|ATTRPITCH\|ERR_ELSEWOIF\|COUNTRY_SAMOA\|LANGUAGE_PASHTO\|CARDTOP\|DENSITY_NONE\|ITALIC\|PLUGINCAPS_DISPLAYADAPTER\|FILEATTR_READ_USR\|LANGUAGE_UIGHUR\|ERR_EMPTYTABLE\|COUNTRY_CAPEVERDE\|ERR_FGRABVIDSTATE\|ERR_LOCK2\|LANGUAGE_ICELANDIC\|LIME\|ATTRCURSUBSONG\|CENTER\|ERR_VECGFXPLUGIN\|THREAD\|SLIDERIGHT\|NORMALSPEED\|SELMODE_LAYERS\|SLIDELEFT\|HLOWFLIPCOIN\|HFLIPCOIN\|VLOWFLIPCOIN\|ERR_INVCAPIDX\|VFLIPCOIN\|ASYNCDRAW\|ERR_INCOMPATBRUSH\|RECTBACKWEST\|FILEATTR_WRITE_USR\|ATTRONSCREEN\|CRUSHRIGHT\|LANGUAGE_BRETON\|ERR_REPEATWOUNTIL\|ERR_NOLOOP\|ATTRDISPLAY\|ERR_FILENOTFOUND\|ATTRDENSITY\|ERR_GETMONITORINFO\|ERR_POINTERFORMAT\|ZOOMIN\|PIXELZOOM2\|HSTRANGEPUSH\|FILEATTR_SYSTEM\|ERR_COLORSPACE\|LANGUAGE_ZULU\|ATTRHOSTWIDTH\|LANGUAGE_SANGO\|ERR_SOCKET\|STAR\|ERR_FINDBUTTON\|CLOCKWIPE\|FILLCOLOR\|USELAYERPOSITION\|LANGUAGE_BELARUSIAN\|COUNTRY_MICRONESIA\|COPYFILE_UNPROTECT\|DISSOLVE\|UNDERLINED\|WATER4\|COUNTRY_BURKINAFASO\|LANGUAGE_LINGALA\|WATER3\|MASK\|ATTRNOMODESWITCH\|ERR_SETFILEATTR\|LANGUAGE_KASHMIRI\|FILEATTR_HIDDEN\|DELETEFILE_UNPROTECT\|COUNTRY_CUBA\|HKEY_USERS\|ATTRKEYBOARD\|COUNTBOTH\|ROLLLEFT\|HSTRIPES\|CRUSHBOTTOM\|RECTBACKSOUTHWEST\|LANGUAGE_TSONGA\|RECTBACKSOUTH\|ERR_DIFFDEPTH\|RECTBACKSOUTHEAST\|RECTBACKEAST\|ERR_TRIALLIMIT\|ERR_FINDMOVE\|ERR_SCREEN\|ERR_FINDPLUGIN\|LANGUAGE_ITALIAN\|ERR_MULTIBGPIC\|ERR_BADLAYERTYPE\|JUSTIFIED\|ERR_ADDAPPWIN\|LANGUAGE_NAURU\|ERR_UNKNOWNFILTER\|RECTBACKNORTHEAST\|JOYDOWNLEFT\|RECTBACKNORTH\|WALLPAPERTOP\|ROLLTOP\|ERR_NOFALLTHROUGH\|BRUSH_VS_BOX\|USERDATA\|RANDOMPARAMETER\|IMAGETYPE_RASTER\|NATIVE\|DIAGONAL\|COUNTRY_SUDAN\|PUZZLE\|ERR_ENDIFWOIF\|ERR_MEM\|ERR_OPENSERIAL\|PUSHRIGHT\|NEXTFRAME\|DOSTYPE_FILE\|PUSHLEFT\|ERR_SORTFUNC\|ENCODING_ISO8859_1\|VOPENGATE\|ERR_XFIXES\|HCLOSEGATE\|ZOOMSOUTHWEST\|HOPENGATE\|VFLOWRIGHT\|ERR_BADBYTECODE\|VFLOWLEFT\|HFLOWBOTTOM\|HFLOWTOP\|ERR_DLOPEN\|ZOOMNORTHWEST\|ZOOMWEST\|ERR_NODOUBLEBUFFER\|ZOOMSOUTH\|ZOOMEAST\|ZOOMNORTHEAST\|COUNTRY_UK\|ZOOMCENTER\|ERR_FINDMEMBLK\|ERR_BGPICBUTTON\|VSTRETCHCENTER\|ERR_FREEABGPIC\|STRETCHTOP\|SCROLLNORTHEAST\|ATTRFUNCTION\|ERR_TABLEINDEX\|ERR_MULDISMOBILE\|COUNTRY_INDONESIA\|SCROLLSOUTHEAST\|NOCOLOR\|ERR_SELECTBGPIC2\|JOYUPLEFT\|MASKAND\|CLIPBOARD_SOUND\|SCROLLSOUTH\|SCROLLNORTH\|ERR_NOMENU\|ERR_NOANMLAYER\|SCROLLWEST\|ERR_CHANNELRANGE\|ERR_STRTABLEARG\|SCROLLRIGHT\|SCROLLLEFT\|RECTNORTHWEST\|ERR_BEGINREFRESH\|COUNTRY_SPAIN\|RECTSOUTHWEST\|COUNTRY_PHILIPPINES\|RECTSOUTHEAST\|ERR_LOADSOUND\|RECTEAST\|RECTNORTH\|LANGUAGE_ARABIC\|COUNTRY_JORDAN\|RECTCENTER\|ERR_TRANSBRUSH\|BLEND\|ERR_PLUGINVER\|RANDOMEFFECT\|FILLRULEWINDING\|ANMFMT_GIF\|VLINES\|ERR_LABINFOR\|DISPMODE_SYSTEMSCALE\|VLINES2\|ERR_NOARGBVISUAL\|COUNTRY_YEMEN\|HSTRIPES32\|ERR_SAVESAMPLE\|ERR_CHRCSTEMPTY\|LANGUAGE_CATALAN\|ERR_SEEK\|SANS\|LANGUAGE_JAVANESE\|ATTRLAYERID\|ERR_BRACECLOSE\|ERR_CONSOLEARG\|ATTRXPOS\|PLUGINCAPS_REQUESTERADAPTER\|REVEALRIGHT\|ERR_FINDFONT2\|REVEALLEFT\|LANGUAGE_DUTCH\|ERR_CHRCSTLEN\|HCLOSECURTAIN\|ERR_SELECTBGPIC\|ERR_MAGICKEY\|SELMODE_COMBO\|HOPENCURTAIN\|ERR_ZLIBSTREAM\|CARDBOTTOM\|VBLINDS16\|HBLINDS128\|HBLINDS64\|DURATION_SHORT\|COUNTRY_GREECE\|COUNTRY_MARSHALLISLANDS\|LANGUAGE_KAZAKH\|ERR_BADCONSTANT\|MODLCONTROL\|HBLINDS16\|COUNTRY_NAURU\|HBLINDS8\|SILVER\|DATA_7\|DAMPED\|ATTRORIENTATION\|COUNTRY_UNKNOWN\|COUNTRY_CZECHREPUBLIC\|LANGUAGE_INDONESIAN\|LANGUAGE_NAVAJO\|ERR_NOBLOCKBREAK\|ERR_8OR16BITONLY\|BOLD\|VSTRIPES8\|ERR_FUNCEXPECTED\|COUNTRY_AZERBAIJAN\|COUNTRY_KAZAKHSTAN\|ERR_FINDFONT\|QUARTERS\|WATER1\|HSTRIPES4\|COUNTRY_BRUNEI\|VOPENCURTAIN\|MONO8\|ERR_ICONENTRY\|PLUGINCAPS_VECTOR\|ATTRFIXED\|ALPHABETICAL\|VANILLACOPY\|MASKOR\|MASKXOR\|ERR_STAT\|SMPFMT_WAVE\|HSPLIT\|LANGUAGE_ABKHAZIAN\|COUNTRY_GABON\|ERR_ADDSYSEVENT\|ERR_INTEXPECTED\|COUNTRY_ECUADOR\|STEREO16\|ERR_UPDATEICON\|ERR_LABELDECLA\|MENUITEM_DISABLED\|ERR_FILEEXIST\|LANGUAGE_DIVEHI\|ATTRHOSTTASKBAR\|ERR_FINDOBJECTDATA\|ERR_BADENCODING\|ERR_GTK\|DENSITY_MEDIUM\|DENSITY_LOW\|VSPLIT\|ORIENTATION_LANDSCAPEREV\|TEAL\|ERR_COMMENTSTRUCT\|ORIENTATION_LANDSCAPE\|ERR_FT2\|ORIENTATION_PORTRAITREV\|DATELOCALNATIVE\|ERR_MAXLOCALS\|POLYGON\|BRUSHPART\|COUNTRY_CHINA\|ORIENTATION_NONE\|ERR_FIELDINIT\|CLIPREGION\|ERR_DELETEFILE\|LANGUAGE_SLOVENIAN\|SCALEMODE_LAYER\|MILLISECONDS\|COUNTRY_MALI\|SCALEMODE_AUTO\|LAYERBUTTON\|ERR_LOADICON\|COUNTRY_AUSTRIA\|ERR_NOFUNCTION\|COUNTRY_MALTA\|HLINES\|ERR_NUMSTRCMP\|ERR_SQBRACKETOPEN\|ERR_MODIFYABG\|LANGUAGE_GEORGIAN\|DISPMODE_ASK\|ERR_READRANGE\|ERR_UNTILWOREPEAT\|DISPMODE_WINDOWED\|FONTWEIGHT_REGULAR\|LANGUAGE_QUECHUA\|DISPSTATE_MINIMIZED\|DISPSTATE_CLOSED\|DISPSTATE_OPEN\|ERR_FREECURPOINTER\|DEINTERLACE_DOUBLE\|DEINTERLACE_DEFAULT\|ENCODING_AMIGA\|ENCODING_UTF8\|ENCODING_RAW\|FONTSLANT_OBLIQUE\|ERR_STRTOOSHORT\|ANMFMT_MJPEG\|ERR_CLIPWRITE\|FONTSLANT_ROMAN\|PERMREQ_READEXTERNAL\|TURNDOWNBOTTOM\|FONTWEIGHT_HEAVY\|ATTRPLAYING\|FONTWEIGHT_ULTRABOLD\|LANGUAGE_RUSSIAN\|FONTWEIGHT_BOLD\|FONTWEIGHT_DEMIBOLD\|REQICON_QUESTION\|COUNTRY_TANZANIA\|COUNTRY_SAINTBARTHELEMY\|DISPMODE_FULLSCREEN\|FONTWEIGHT_NORMAL\|ERR_GUIGFX\|ERR_LOADFRAME\|HIDELAYER\|COUNTRY_SAOTOMEANDPRINCIPE\|FONTWEIGHT_ULTRALIGHT\|ERR_GRABSCREEN\|SPIRAL\|FONTWEIGHT_THIN\|FONTENGINE_INBUILT\|COUNTRY_TIMOR\|ATTRDRIVER\|MONOSPACE\|ERR_SYNTAXERROR\|PRGTYPE_APPLET\|COUNTRY_URUGUAY\|PARITY_EVEN\|COUNTRY_ERITREA\|MODE_READ\|LANGUAGE_CENTRALKHMER\|ERR_SHORTIF\|BITMAP_DEFAULT\|ERR_ESCREPLACE\|ERR_FINDMUSIC\|ERR_MEMCODE\|ATTRMENU\|ERR_DISPMINIMIZED\|JOYNODIR\|ATTRMODE\|ERR_FINDDISPLAY\|ERR_BADWAVE\|LANGUAGE_PERSIAN\|SHDWSOUTHWEST\|ERR_ADDTASK\|ERR_NAMEUSED\|ERR_CLIPREAD\|LANGUAGE_TSWANA\|ATTRBORDERBOTTOM\|SPRITE\|ERR_DOUBLEMENU\|ERR_TOKENEXPECTED\|EDGE\|FILLTEXTURE\|IO_BUFFERED\|ERR_JAVAMETHOD\|GRAY\|NUMERICAL\|ERR_VFONTTYPE\|COUNTRY_LIECHTENSTEIN\|COUNTRY_GHANA\|ERR_LAYERSON\|LANGUAGE_BASQUE\|SERIAL\|ALL\|ERR_SELECTMASK\|COUNTRY_CYPRUS\|LANGUAGE_MAORI\|ERR_DBTRANSWIN\|ATTRID\|ERR_NUMBEREXPECTED\|ANTIALIAS\|SCROLLSOUTHWEST\|ERR_PLUGINSUPPORT\|ERR_WRONGID\|COUNTRY_SRILANKA\|ERR_SENDTIMEOUT\|ERR_EQUALEXPECTED\|ERR_SERIALIO\|COUNTRY_LESOTHO\|ERR_CREATEDOCKY\|ERR_INITSERIAL\|COUNTRY_SLOVENIA\|COUNTRY_AFGHANISTAN\|ERR_FUNCDECLA\|HW_REVISION\|ERR_MALFORMPAT2\|ERR_RENDERER\|COUNTRY_KUWAIT\|ERR_SURFACE\|ERR_FINDARRAY\|ERR_MULTIDISPLAYS\|ERR_TEXTSYNTAX\|ERR_ICONVECTOR\|ERR_BRACKETCLOSE\|SELMODE_NORMAL\|SCALEMODE_NONE\|LANGUAGE_KINYARWANDA\|ERR_CORETEXT\|COUNTRY_MONTENEGRO\|ERR_VIDEOINIT\|LANGUAGE_LUBAKATANGA\|ERR_TRIALINCLUDE\|ERR_READFILE\|ERR_TRIALSAVEVID\|ERR_ATSUI\|ERR_TRIALCOMPILE\|ERR_RADIOTOGGLEMENU\|LANGUAGE_MALAGASY\|COUNTRY_ALGERIA\|ERR_TABEXPECTED3\|LANGUAGE_TIBETAN\|ERR_ELSETWICE\|ERR_FINDSELECTOR\|ERR_FRAMEGRABBER\|ERR_COREFOUNDATION\|COUNTRY_HONDURAS\|ERR_FINDICON\|FILEATTR_READONLY\|ERR_INVALIDUTF8ARG\|ERR_DIFFENCODING\|COUNTRY_BARBADOS\|ERR_INVALIDUTF8\|ERR_INVREPLACE\|ERR_COMPLEXPATTERN\|ERR_AMIGAGUIDE\|LANGUAGE_AFRIKAANS\|ERR_LINKPLUGIN\|ERR_STACK\|MASKVANILLACOPY\|MODE_READWRITE\|ERR_FILESIZE\|ERR_MUSPLAYING\|ERR_VIDNOTPLAYING\|COUNTRY_DJIBOUTI\|ERR_ALLOCMASK\|ERR_ALLOCALPHA\|ERR_KEYFILE\|ERR_VISUALINFO\|ERR_FINDCLIENT\|ERR_SENDDATA\|LANGUAGE_NDONGA\|COUNTRY_DOMINICANREPUBLIC\|ERR_UNEXPECTEDSYM\|ERR_FULLSCREEN\|ERR_SCREENMODE\|ATTRBORDERLEFT\|COUNTRY_SWEDEN\|ERR_TFIMAGE\|ERR_LOCKBMAP\|ERR_FINDMONITOR\|COUNTRY_ROMANIA\|ATTRCURSORX\|ERR_NOCONTEXTMENU\|ERR_ACCELERATOR\|ERR_VECTORBRUSH\|FILEATTR_ARCHIVE\|ERR_ENDWITHWOWITH\|ERR_CONTEXTMENU\|SHDWNORTH\|SHDWNORTHWEST\|ERR_EMPTYMENUTREE\|ERR_FINDMENUITEM\|COUNTRY_RUSSIA\|ERR_DEFFONT\|ERR_CREATEMENU\|ANIM\|COUNTRY_ETHIOPIA\|ERR_MENUCOMPLEXITY\|MODLALT\|ERR_WRONGCMDRECVIDEO\|ERR_REGISTRYWRITE\|HIDEBRUSH\|ERR_SENDMESSAGE\|COUNTRY_LIBERIA\|ERR_FINDAPPLICATION\|ERR_NEEDAPPLICATION\|ERR_COORDSRANGE\|JOYRIGHT\|ERR_UNKNOWNATTR\|ERR_APPLICATION\|COUNTRY_FIJI\|ERR_SEEKFILE\|ERR_TABLEDECLA\|ERR_FINDDIR\|AMIGAICON_DRAWER\|COUNTRY_COMOROS\|ERR_MODIFYSPRITE\|STEREO8\|ERR_DDMOBILE\|ERR_HWBMCLOSEDISP\|ERR_HWDBFREEDISP\|BOTTOMOUT\|ERR_FINDBGPIC\|ERR_RETWOGOSUB\|ERR_BITMAP\|ERR_REQUIREPLUGIN\|ERR_DISPLAYADAPTERSUPPORT\|ERR_SOCKNAME\|RED\|ERR_SCRPIXFMT\|PI\|ERR_FINDSPRITE\|LANGUAGE_OJIBWA\|ERR_REQUIREFIELD\|COUNTRY_TAJIKISTAN\|ERR_WRITEONLY\|ERR_VIDLAYERFUNC\|ERR_VIDSTOPPED\|ERR_VIDEOLAYER\|ERR_CMDASVAR\|ERR_REGCLASS\|AMIGAICON_TOOL\|RECTWEST\|ERR_FINDACTIVITY\|ERR_JAVA\|ERR_UDEXPECTED\|LANGUAGE_CHICHEWA\|ERR_NOMIMEVIEWER\|ACTIVEWINDOW\|FILEATTR_SCRIPT\|ERR_GETSHORTCUT\|IMGFMT_PNG\|LAYER_VS_BOX\|LANGUAGE_MALTESE\|ATTRXSERVER\|ERR_CREATEICON\|LANGUAGE_DANISH\|ERR_SATFREEDISP\|ERR_PERCENTFORMATSTR\|COUNTRY_BELGIUM\|ERR_VIDPLAYING\|ERR_VIDPAUSED\|SECONDS\|ERR_SAVERALPHA\|ATTRMAXWIDTH\|ERR_HWBRUSHFUNC\|COUNTRY_ARGENTINA\|LANGUAGE_TIGRINYA\|SLOWSPEED\|LANGUAGE_NORWEGIAN\|ERR_HWBRUSH\|COUNTRY_BENIN\|DENSITY_HIGH\|ERR_PLUGINSYMBOL\|BARS\|ERR_UNKNOWNSMPOUT\|ERR_SAVEANIM\|ERR_FINDPOINTER\|ERR_UNKNOWNANMOUT\|LANGUAGE_FRENCH\|ERR_SAVEIMAGE\|ATTRSCALEMODE\|ERR_UNKNOWNIMGOUT\|CONICAL\|ERR_NOFMBHANDLER\|ERR_NOMUSICCB\|FILETYPE_ANIM\|LANGUAGE_SOMALI\|ATTRFONTSIZE\|COUNTRY_PARAGUAY\|COUNTRY_TURKMENISTAN\|ERR_SEEKFORMAT\|ERR_DBVIDEOLAYER\|LANGUAGE_IRISH\|COUNTRY_MAYOTTE\|ERR_BADCALLBACKRET\|YELLOW\|ERR_MODIFYPSMP\|DELETEFILE_STATUS\|ERR_DSOUNDNOTIPOS\|ERR_READONLY\|ERR_MOBILE\|ERR_MONITORFULLSCREEN\|ERR_WRONGDTYPE\|COUNTRY_CHAD\|LINEAR\|ONKEYDOWNALL\|ERR_INVNEXTKEY\|WHITE\|ATTRSIZE\|ATTRMAXHEIGHT\|ERR_FINDSERIAL\|LITTLEENDIAN\|ERR_NOCOLON\|ERR_LOADPLUGIN\|ERR_VIDEOTRANS\|COUNTRY_TUNISIA\|ERR_WRITE\|COUNTRY_PALAU\|ERR_SELECTBG\|ERR_VIDEOFRAME\|LANGUAGE_BURMESE\|SWISS\|COUNTRY_GREENLAND\|ERR_VIDATTACHED\|PLOT\|ERR_SOCKOPT\|ERR_QUICKTIME\|LANGUAGE_ARMENIAN\|REQICON_INFORMATION\|ERR_OLDAPPLET\|ERR_LOADVIDEO\|ERR_MOVEFILE\|ERR_ENDBLKWOBLK\|ERR_NOTENOUGHPIXELS\|ATTRSCALEHEIGHT\|LANGUAGE_SAMOAN\|VCLOSECURTAIN\|COUNTRY_IRELAND\|ERR_OPENAUDIO\|ERR_NOFILTERNAME\|ATTRMAXIMIZED\|ADF_FX\|COUNTRY_SAINTVINCENT\|RECEIVEDATA_PACKET\|COUNTRY_ARUBA\|ERR_UNSETENV\|ERR_ALSAPCM\|ERR_XCURSOR\|LANGUAGE_ALBANIAN\|HLINES2\|LANGUAGE_KURDISH\|ERR_CREATEGC\|ERR_TOOSMALL2\|COUNTRY_TUVALU\|BIGENDIAN\|LANGUAGE_GREENLANDIC\|ERR_UPLOADFORBIDDEN\|ERR_DINPUT\|TICKS\|ERR_NOCOMPRESS\|ERR_BADURL\|ERR_NOLOOPCONT\|ERR_HOSTNAME\|ERR_PEERNAME\|DOUBLE\|ERR_FINDSERVER\|ERR_OPENSOCKET\|ATTRHOSTSCALE\|ERR_XDISPLAY\|ERR_TFVBRUSH\|ERR_TOOMANYARGS\|DATELOCAL\|ERR_DEMO\|ERR_NOJOYATPORT\|COUNTRY_USA\|ERR_RENDERADLAYER\|ERR_OPENLIB\|COUNTRY_EGYPT\|DTR_ON\|FADE\|COUNTRY_MARTINIQUE\|HKEY_CLASSES_ROOT\|ERR_NOACCESS\|ERR_TFVBGPICBRUSH\|ERR_CLOSEFILE\|ERR_BGPICTYPE\|LANGUAGE_AFAR\|ERR_DEMO2\|VCLOSEGATE\|ERR_LINKFONT\|ERR_FTPAUTH\|ERR_WRONGSPRITESIZE\|ERR_SPRITELINK\|ERR_ADFFREEDISP\|ERR_MONITORDIR\|ERR_REGISTRYREAD\|ERR_REMADLAYER\|ERR_FINDINTERVAL\|ATTRSTATE\|ERR_FINDLAYER\|FONTSLANT_ITALIC\|ERR_SCALEBGPIC\|SHDWSOUTHEAST\|ERR_CLIPOPEN\|ERR_BRUSHTYPE\|ERR_CLIPFORMAT\|ERR_LOADPICTURE2\|ERR_OPENSOUND2\|ATTRZPOS\|ERR_OPENANIM2\|ERR_NEEDOS41\|LANGUAGE_JAPANESE\|ERR_TABEXPECTED\|ATTRTEXT\|ERR_FINDBRUSH\|COUNTRY_BRAZIL\|COUNTRY_SINGAPORE\|LANGUAGE_SANSKRIT\|ERR_ADDAPPICON\|LOWERCURVE\|ERR_FREEADISPLAY\|ERR_ARRAYDECLA\|ERR_SMODEALPHA\|ERR_FINDANIMSTREAM\|ATTRSCALEWIDTH\|ERR_MODIFYAANIM\|CLIPBOARD_UNKNOWN\|ERR_FONTPATH\|COUNTRY_BAHAMAS\|ERR_NEGCOORDS\|ERR_JOYSTICK\|ERR_CASECST\|LANGUAGE_TAGALOG\|LANGUAGE_KANURI\|COUNTRY_PITCAIRN\|NONE\|ERR_WRONGVSTRATEGY\|ERR_APPLET\|ERR_VIDEOSTRATEGY\|ERR_READTABLE\|COUNTRY_SWAZILAND\|BEEPWARNING\|BOUNCE\|LANGUAGE_SLOVAK\|LANGUAGE_SERBIAN\|ERR_FINDASYNCDRAW\|ERR_SPRITEONSCREEN2\|ERR_NOHWFUNC\|ERR_POINTERIMG\|ERR_MUSNOTPLYNG2\|ERR_NODISLAYERS\|ERR_NUMCONCAT\|COUNTRY_PUERTORICO\|ERR_DDAUTOSCALE\|ERR_DIRECTSHOW\|ATTRALPHAINTENSITY\|FILLNONE\|SHDWSOUTH\|ERR_ZLIBVERSION\|IMGFMT_BMP\|LANGUAGE_BENGALI\|COUNTRY_HAITI\|COUNTRY_GRENADA\|VBLINDS128\|ERR_TABCALLBACK\|FILETYPE_IMAGE\|BOOLEAN\|ERR_TEXTCONVERT\|ERR_MSGPORT\|ERR_LOADPICTURE\|VSTRIPES16\|ERR_SEMAPHORE\|ERR_MASKNALPHA\|ERR_TIMER\|PRINT\|ERR_HEXPOINT\|ERR_NODIRPATTERN\|ONBUTTONRIGHTCLICKALL\|ERR_NOTXTLAYER\|ERR_STRCALLBACK\|ERR_CONCAT\|ERR_COMPLEXWHILE\|REQ_NORMAL\|ERR_NOCHANNEL\|FONTWEIGHT_EXTRALIGHT\|COUNTRY_FRENCHPOLYNESIA\|FILEATTR_PURE\|ERR_SETFILEDATE\|HSTRIPES16\|COUNTRY_SEYCHELLES\|ERR_DEMO3\|COUNTRY_HONGKONG\|FASTMEMORY\|ERR_KEYNOTFOUND\|FONTWEIGHT_BOOK\|ERR_DATATYPESAVE2\|ERR_ZLIBDATA\|TEXTOUT\|ATTRCOUNT\|SHDWWEST\|ERR_RENAME\|ERR_CMPUNSUPPORTED\|COUNTRY_MAURITIUS\|ERR_DSOUNDPLAY\|ERR_UNIMPLCMD\|AMIGAICON_DISK\|ERR_NOREXX\|COUNTRY_LAOS\|LANGUAGE_ENGLISH\|ERR_ANTIALIAS\|ERR_MENUATTACHED\|COUNTRY_MAURITANIA\|LANGUAGE_TAMIL\|ERR_UNKTEXTFMT\|ERR_NOTADIR\|ERR_REQUIRETAGFMT\|COUNTRY_CROATIA\|ERR_CACHEERROR\|ERR_TASKSETUP\|LANGUAGE_YORUBA\|ERR_CSTDOUBLEDEF\|NATIVEENDIAN\|ATTRNUMFRAMES\|ATTRSTANDARD\|LANGUAGE_SICHUANYI\|LANGUAGE_WOLOF\|LANGUAGE_SHONA\|ONKEYDOWN\|VOID\|COUNTRY_NIUE\|ERR_UNKNOWNMUSFMT\|ATTRSPRITES\|ERR_MIXMUSMOD\|ERR_SEEKRANGE\|COUNTRY_NEWZEALAND\|LANGUAGE_PALI\|FILLGRADIENT\|ERR_NOKEYWORDS\|ERR_UNKNOWNTAG\|COUNTRY_MYANMAR\|STDPTR_BUSY\|RIGHTOUT\|COUNTRY_JERSEY\|MOVEFILE_UNPROTECT\|IPUNKNOWN\|ERR_FUNCREMOVED\|MENUITEM_SELECTED\|COUNTRY_NORFOLKISLAND\|ERR_OPENANIM\|CHIPMEMORY\|COUNTRY_MADAGASCAR\|ERR_NUMTABLEARG\|ATTRCLIPREGION\|LANGUAGE_SUNDANESE\|ERR_TOOMANYCAPTURES\|ERR_NOALPHA\|ERR_BADSIGNATURE\|ERR_BADUPVALUES\|FILEATTR_DELETE_USR\|COUNTRY_LATVIA\|REQ_SAVEMODE\|ERR_VMMISMATCH\|ERR_NUMEXPECTED\|ERR_UNEXPECTEDEOF\|ERR_UNKNOWNCOND\|ERR_STRINGEXPECTED\|DURATION_LONG\|LANGUAGE_GANDA\|PRGTYPE_PROGRAM\|COUNTRY_CENTRALAFRICANREPUBLIC\|CLIPBOARD_IMAGE\|ERR_LOCK\|ERR_INVINSERT\|ERR_LAYERSUPPORT\|LANGUAGE_ASSAMESE\|COUNTRY_ANTIGUAANDBARBUDA\|FLOAT\|COUNTRY_RWANDA\|FILEATTR_READ_GRP\|LANGUAGE_TELUGU\|COUNTRY_GUINEABISSAU\|JOYLEFT\|SHDWEAST\|BGPIC\|ERR_VARSYNTAX\|ATTRNUMSUBSONGS\|PLUGINCAPS_TIMERADAPTER\|ERR_UNMPARENTHESES\|ERR_ERRORCALLED\|ERR_PERCENTFORMAT\|COUNTRY_GERMANY\|LANGUAGE_BISLAMA\|UNDO\|ERR_FINDFILE\|LANGUAGE_URDU\|PLUGINCAPS_REQUIRE\|SINE\|ERR_FINDTEXTOBJECT\|LANGUAGE_AMHARIC\|REVEALTOP\|COUNTRY_SAINTLUCIA\|ERR_DIRLOCK\|MODE_WRITE\|LANGUAGE_TURKMEN\|ERR_VIDRECTRANS\|LINE\|COUNTRY_NAMIBIA\|FILETYPEFLAGS_SAVE\|LANGUAGE_SARDINIAN\|ERR_NOMASKBRUSH\|ERR_MUSNOTPAUSED\|IPV4\|ERR_UNKNUMFMT\|ERR_DOUBLEDECLA\|ERR_INVPATCAP\|LANGUAGE_HUNGARIAN\|COUNTRY_MONTSERRAT\|LANGUAGE_FAROESE\|LANGUAGE_DZONGKHA\|ERR_LOOPRANGE\|ATTRHASALPHA\|ERR_ENDSWCHWOSWCH\|POINTER\|COUNTRY_BOUVETISLAND\|BYTE\|FILE\|ATTRRAWYPOS\|FONTWEIGHT_ULTRABLACK\|ERR_EXETYPE\|ERR_UNBALANCEDPAT\|COUNTRY_NIGER\|EOF\|ERR_LABMAINBLK\|RIGHT\|LANGUAGE_KUANYAMA\|KEEPPOSITION\|ERR_BRUSHSIZE\|LANGUAGE_KIKUYU\|CLOSEWINDOW\|ERR_CREATEPORT\|ZOOMOUT\|ERR_MODIFYABR\|IMGFMT_TIFF\|ERR_MISSINGPARAMTR\|NORMAL\|STDPTR_CUSTOM\|ERR_MEMRANGE\|LEFTOUT\|LANGUAGE_CHECHEN\|COUNTRY_BERMUDA\|MOVEFILE_DELETE\|SPRITE_VS_BOX\|LANGUAGE_BASHKIR\|ERR_SPRITEONSCREEN\|ERR_SETADAPTER\|LANGUAGE_INUPIAQ\|ALPHANUMERICAL\|COUNTRY_MACEDONIA\|COUNTRY_KENYA\|COUNTRY_PAKISTAN\|BGPICPART\|IO_UNBUFFERED\|FILETYPEFLAGS_ALPHA\|COUNTRY_ZAMBIA\|ERR_STREXPECTED\|ATTRTITLE\|UPPERCURVE\|ERR_MEMCST\|ERR_SELECTBRUSH\|ERR_NOTRANSPARENCY\|COUNTRY_SWITZERLAND\|ERR_INTERNAL1\|LANGUAGE_SINHALA\|ERR_UNKNOWNSEC\|ATTRCANSEEK\|COUNTRY_ISRAEL\|COUNTRY_SANMARINO\|VECTORPATH\|ERR_PLUGINTYPE\|ERR_CONFIG2\|ERR_SWCHWOENDSWCH\|DOUBLEBUFFER\|ERR_TABLEORNIL\|DOSTYPE_DIRECTORY\|MAROON\|ATTRBORDERTOP\|SAMPLE\|ATTRBGPIC\|PLUGINCAPS_SAVESAMPLE\|ERR_SCREENSIZE\|AMIGAICON_PROJECT\|SNAPDISPLAY\|COUNTRY_GUINEA\|SHADOW\|ERR_MAXUPVALS\|ORIENTATION_PORTRAIT\|COUNTRY_CAMBODIA\|ERR_TABEXPECTED2\|ERR_NOCHAR\|ERR_DSOUNDNOTIFY\|ERR_UNFINISHEDCAPTURE\|ATTRBITRATE\|ERR_NOCOMMA\|ERR_IFWOENDIF\|STDPTR_SYSTEM\|LANGUAGE_IGBO\|HKEY_CURRENT_CONFIG\|LANGUAGE_INTERLINGUA\|AMIGAICON_SHOW\|IPV6\|ERR_CONFIG\|ERR_COMPLEXEXPR\|ERR_FINDSAMPLE\|MODLSHIFT\|ERR_ENDFUNCWOFUNC\|PLUGINCAPS_IMAGE\|UDPNONE\|LANGUAGE_OROMO\|ERR_NEEDCOMPOSITE\|ATTRBORDERLESS\|ERR_SETFILECOMMENT\|LANGUAGE_MARATHI\|ERR_LFSYNTAX\|COUNTRY_BULGARIA\|ERR_FINDTIMEOUT\|ERR_RECVUNKNOWN\|ERR_RENDER\|ERR_CREATEDIR\|WATER2\|SLIDETOP\|ERR_PALSCREEN\|CRUSHLEFT\|COUNTRY_UKRAINE\|RADIAL\|ERR_WRONGOP\|COUNTRY_CURACAO\|ERR_NOCONSTANTS\|COUNTRY_IRAN\|FONTWEIGHT_BLACK\|REVEALBOTTOM\|ERR_PLAYERCOMP\|COUNTRY_PANAMA\|COUNTRY_ARMENIA\|INSERTBRUSH\|LANGUAGE_KOMI\|DATEDAY\|TABLE\|ATTRHARDWARE\|ONBUTTONRIGHTCLICK\|AMIGAICON_HIDE\|ERR_OPENSOUND\|SIZEWINDOW\|ATTRHOSTSCALEX\|FONTENGINE_NATIVE\|COUNTRY_IRAQ\|COUNTRY_ISLEOFMAN\|NUMBER\|HOLLYWOOD\|COUNTRY_SERBIA\|AMIGAICON_SETTITLE\|ERR_NEXTWOFOR\|FUNCTION\|ERR_GETDISKOBJ\|MODRSHIFT\|ERR_WRITEFILE\|LANGUAGE_ARAGONESE\|FILEATTR_WRITE_GRP\|LANGUAGE_UNKNOWN\|ERR_KICKSTART\|ERR_KEYWORD\|PLUGINCAPS_SAVEIMAGE\|FREESPACE\|COUNTRY_BHUTAN\|ERR_AUDIOCONVERTER\|TIMEOUT\|PERMREQ_WRITEEXTERNAL\|ERR_FINDCST\|ATTRTYPE\|ATTRHOSTTITLEBARHEIGHT\|ERR_TEXTURE\|OLIVE\|ERR_SATELLITE\|USEDSPACE\|LANGUAGE_HAITIAN\|COUNTRY_SOUTHSUDAN\|ERR_LABINWHILE\|COUNTRY_BAHRAIN\|ERR_WHILEWOWEND\|LANGUAGE_CROATIAN\|LANGUAGE_TWI\|ERR_NOAPPLET\|COUNTRY_QATAR\|ONBUTTONCLICK\|PUSHTOP\|ERR_READ\|BOX\|ADF_MOVEOBJECT\|COUNTRY_COSTARICA\|COUNTRY_POLAND\|ERR_NONE\|INTERVAL\|SLIDEBOTTOM\|HBLINDS32\|LANGUAGE_CHUVASH\|VBLINDS32\|BEEPINFORMATION\|COUNTRY_NETHERLANDS\|BEEPERROR\|FILETYPEFLAGS_FPS\|ATTRADAPTER\|COUNTRY_TONGA\|LANGUAGE_HINDI\|ERR_UNKNOWNMIMETYPE\|ERR_ANIMFRAME\|ERR_NOSPRITES\|IMGFMT_NATIVE\|LAYER\|MUSIC\|COUNTRY_LITHUANIA\|PLUGINCAPS_SOUND\|ELLIPSE\|COUNTRY_VIETNAM\|LANGUAGE_NORWEGIANBOKMAL\|ERR_IMAGEERROR\|REQICON_NONE\|FONTWEIGHT_SEMIBOLD\|SNAPWINDOW\|ATTRLOADER\|ATTRCURFRAME\|LANGUAGE_PORTUGUESE\|NEXTFRAME2\|COUNTRY_SURINAME\|ATTRXDPI\|LANGUAGE_CHINESE\|DATEMONTH\|ATTRMARGINLEFT\|COUNTRY_SOMALIA\|ERR_CONITEMS\|LANGUAGE_FIJIAN\|COUNTRY_SIERRALEONE\|LANGUAGE_OCCITAN\|LANGUAGE_SOUTHERNSOTHO\|COUNTRY_DOMINICA\|LANGUAGE_HERERO\|LANGUAGE_SWAHILI\|COUNTRY_PAPUANEWGUINEA\|COUNTRY_COOKISLANDS\|ATTRFONTDESCENDER\|COUNTRY_HUNGARY\|ERR_MODIFYSPRITE2\|DEFAULTSPEED\|TRUETYPE_DEFAULT\|LANGUAGE_AYMARA\|COUNTRY_MONGOLIA\|ATTRCURSORY\|COUNTRY_MOLDOVA\|COUNTRY_MEXICO\|ERR_PUBSCREEN\|ERR_LAYERRANGE\|ATTRLAYERSON\|DOWNLOADFILE_STATUS\|NIL\|COUNTRY_MALAYSIA\|LONG\|COUNTRY_MACAO\|LANGUAGE_LATVIAN\|COUNTRY_LEBANON\|SERVER\|COUNTRY_SOUTHKOREA\|COUNTRY_KIRIBATI\|COUNTRY_ESTONIA\|COUNTRY_ANGUILLA\|COUNTRY_TAIWAN\|ERR_TAGEXPECTED\|ATTRHEIGHT\|ERR_TFVBRUSHBGPIC\|ATTRYDPI\|COUNTRY_EQUATORIALGUINEA\|DATETIME\|LANGUAGE_BAMBARA\|EVENTHANDLER\|ATTRPOINTER\|FILETYPEFLAGS_QUALITY\|ERR_FINDVIDEO\|TURNDOWNTOP\|COUNTRY_CHRISTMASISLAND\|COUNTRY_BURUNDI\|COUNTRY_FINLAND\|ERR_MISSINGBRACKET\|LANGUAGE_ORIYA\|LANGUAGE_MONGOLIAN\|COUNTRY_THAILAND\|HKEY_LOCAL_MACHINE\|ATTRTRANSPARENTCOLOR\|COUNTRY_AUSTRALIA\|LANGUAGE_UZBEK\|ERR_SMPRANGE\|ATTRHOSTHEIGHT\|LANGUAGE_ROMANIAN\|LANGUAGE_MACEDONIAN\|COUNTRY_ANGOLA\|SEEK_BEGINNING\|IMGFMT_ILBM\|COUNTRY_GUADELOUPE\|DATEUTC\|ERR_REXXERR\|ATTRWIDTH\|FILEATTR_EXECUTE_USR\|COUNTRY_SAINTHELENA\|ICON\|ERR_LABINFUNC\|ATTRPUBSCREEN\|COUNTRY_GUERNSEY\|ERR_FINDLAYERDATA\|GREEN\|ERR_MISSINGOPBRACK\|HW_AMIGA\|HW_MACOS\|HW_LINUX\|HW_WINDOWS\|HW_ANDROID\|HW_IOS\|HW_LITTLE_ENDIAN\|HW_64BIT\|HW_AMIGAOS4\|HW_MORPHOS\|HW_AROS\|HW_WARPOS\|HW_AMIGAOS3\)\>"
+
+" Hollywood Functions
+syn keyword hwFunction LowerStr UpperStr Val StrStr UnrightStr UnleftStr Chr MidStr RightStr LeftStr FindStr AddStr HexStr Asc StrLen ReplaceStr BinStr SplitStr PadNum StrToArray TrimStr ToString ToNumber UnmidStr CountStr InsertStr RepeatStr MD5Str CRC32Str FormatStr PatternFindStr PatternReplaceStr Eval PatternFindStrDirect PatternFindStrShort ArrayToStr Base64Str ToUserData ByteOffset CharOffset CharWidth ValidateStr ConvertStr ReverseStr ByteLen IsAlNum IsAlpha IsCntrl IsDigit IsGraph IsLower IsPrint IsPunct IsSpace IsUpper IsXDigit CompareStr ByteAsc ByteChr StartsWith EndsWith StripStr EmptyStr ByteVal ByteStrStr Abs Sin Cos Tan ASin ACos ATan ATan2 Ceil Floor Mod FrExp LdExp Sqrt Min Max Log Ld Ln Exp Deg Pow Rad Rnd RndF Add Sub Div Mul Round Int Frac Shr Shl Rt Wrap Limit BitSet BitTest BitClear BitXor BitComplement Sgn Sar Ror Rol Cast Hypot EndianSwap RndStrong Red Green Blue RGB ARGB MovePointer HidePointer SetPointer ShowPointer GetAttribute GetPen VWait SetFPSLimit GetFPSLimit IsPicture GetRealColor SaveSnapshot MixRGB CreateClipRegion SetClipRegion FreeClipRegion CreatePointer FreePointer AsyncDrawFrame CancelAsyncDraw FinishAsyncDraw DumpVideoTime GetRandomColor SetDrawTagsDefault BeginRefresh EndRefresh Intersection Box Plot Ellipse Line Circle Polygon SetFillStyle ReadPixel Cls Arc SetFormStyle SetLineWidth GetFillStyle GetFormStyle GetLineWidth MoveBrush MoveAnim MoveTextObject MoveLayer MoveSprite OpenFile Eof ReadChr ReadLine ReadString Seek WriteChr WriteLine WriteString Exists FileSize PathPart FilePart MakeDirectory GetVolumeInfo DeleteFile Execute Run ChangeDirectory GetVolumeName CloseFile ReadDirectory FullPath CopyFile Rename IsDirectory CRC32 WriteShort WriteInt WriteFloat ReadShort ReadInt ReadFloat FilePos MatchPattern FlushFile SetIOMode GetFileAttributes SetFileAttributes GetTempFileName FileLength CompressFile DecompressFile OpenDirectory CloseDirectory NextDirectoryEntry WriteFunction ReadFunction DefineVirtualFile ReadTable WriteTable GetCurrentDirectory ApplyPatch DefineVirtualFileFromString UndefineVirtualStringFile FileToString StringToFile GetEnv SetEnv UnsetEnv MD5 FileLines FileAttributes GetAsset ReadByte WriteByte ReadBytes WriteBytes DirectoryItems MoveFile UseCarriageReturn HaveVolume GetDirectoryEntry RewindDirectory CountDirectoryEntries MonitorDirectory WaitLeftMouse WaitRightMouse WaitKeyDown IsKeyDown WhileRightMouseDown WhileMouseDown WhileKeyDown IsLeftMouse IsRightMouse BreakWhileMouseOn SetEventTimeout GetEventCode LeftMouseQuit EscapeQuit CtrlCQuit EnableEvent DisableEvent RemoveButton RemoveKeyDown ModifyButton ModifyKeyDown WhileMouseOn CreateButton CreateKeyDown FreeEventCache ClearEvents CheckEvent WaitEvent MouseX MouseY MakeButton DeleteButton DisableButton EnableButton InstallEventHandler SetInterval SetTimeout ClearInterval ClearTimeout ChangeInterval DumpButtons WaitMidMouse IsMidMouse ResetKeyStates JoyDir JoyFire CountJoysticks BreakEventHandler CheckEvents CreatePort SendMessage ShowKeyboard HideKeyboard Wait OpenCatalog CloseCatalog GetCatalogString GetDate GetTime GetWeekday GetDateNum GetTimer PauseTimer ResumeTimer StartTimer StopTimer SystemRequest GetMemoryInfo End GetErrorName Sort DebugStr DebugVal DebugPrint ExitOnError GetLastError DebugOutput GetType IIf InsertItem RemoveItem ListItems StringRequest Unpack SetMetaTable GetMetaTable RawEqual RawGet RawSet GCInfo CollectGarbage Error WaitTimer FileRequest PathRequest IPairs Pairs NextItem GetVersion GetCommandLine GetProgramInfo ResetTimer GetConstant SetClipboard GetClipboard PeekClipboard ClearClipboard CompareDates OpenURL CopyTable FontRequest ListRequest ColorRequest GetSystemLanguage GetSystemCountry DebugPrompt GetFileArgument Assert ForEach ForEachI Concat GetObjectType GetObjectData SetObjectData ClearObjectData CopyObjectData HaveObjectData GetObjects RaiseOnError HaveObject GetPlugins IsNil HaveItem DisablePlugin EnablePlugin LoadPlugin HavePlugin GetSystemInfo LegacyControl DisableLineHook EnableLineHook IncreasePointer DecreasePointer GetApplicationInfo DebugPrintNR TableItems IsTableEmpty LoadPrefs SavePrefs DeletePrefs IsUnicode GetTimestamp GetCountryInfo GetLanguageInfo GetTimeZone TimestampToDate DateToTimestamp ParseDate MakeDate DateToUTC UTCToDate ValidateDate Pack ConsolePrint ConsolePrintNR ConsolePrompt Beep ShowNotification GetIconProperties SetIconProperties SetWBIcon OpenAmigaGuide CloseAmigaGuide ShowRinghioMessage GetApplicationList SendApplicationMessage ChangeApplicationIcon ReadRegistryKey WriteRegistryKey CreateShortcut SetTrayIcon GetShortcutPath ShowToast PerformSelector OpenResourceMonitor CloseResourceMonitor ImageRequest PermissionRequest Vibrate CallJavaMethod Undo EnableLayers DisableLayers SwapLayers InsertLayer ShowLayer HideLayer RemoveLayer SetLayerTransparency SetLayerLight SetLayerTint AddMove ClearMove DoMove FreeLayers NextFrame SetLayerName Collision DumpLayers ScaleLayer RotateLayer SetLayerStyle GetLayerStyle TransformLayer SetLayerAnchor LayerExists SetLayerZPos TranslateLayer SelectLayer CreateLayer ModifyLayerFrames GetLayerAtPos SetLayerShadow SetLayerFilter SetLayerBorder LayerToFront LayerToBack PlayLayer StopLayer PauseLayer ResumeLayer SeekLayer SetLayerVolume RemoveLayers SetFont SetFontColor TextHeight TextWidth ResetTabs AddTab Locate SetMargins SetFontStyle Print NPrint TextOut CreateTextObject DisplayTextObject FreeTextObject InKeyStr TextExtent ScaleTextObject CopyTextObject RotateTextObject OpenFont CloseFont UseFont GetAvailableFonts FreeGlyphCache SetDefaultEncoding AddFontPath GetKerningPair GetDefaultEncoding GetFontColor GetFontStyle PlayAnim FreeAnim ScaleAnim PlayAnimDisk LoadAnimFrame LoadAnim IsAnim CreateAnim CopyAnim GetAnimFrame DisplayAnimFrame ModifyAnimFrames SelectAnim SaveAnim BeginAnimStream WriteAnimFrame FinishAnimStream SetAnimFrameDelay ChangeDisplaySize SetTitle MoveDisplay HideDisplay ShowDisplay SetDisplayAttributes CreateDisplay FreeDisplay OpenDisplay CloseDisplay SelectDisplay ActivateDisplay ChangeDisplayMode GetDisplayModes GetMonitors CreateMenu FreeMenu SelectMenuItem DeselectMenuItem IsMenuItemSelected DisableMenuItem EnableMenuItem IsMenuItemDisabled GetPubScreens ShowScreen HideScreen SetScreenTitle GetFrontScreen SetSubtitle FreeSample LoadSample IsSound GetPatternPosition GetSongPosition PlaySubsong WaitPatternPosition WaitSongPosition WaitSampleEnd IsSamplePlaying SetVolume SetPitch SetPanning StopSample PlaySample SetMasterVolume IsSample CreateSample OpenMusic CloseMusic PlayMusic StopMusic PauseMusic ResumeMusic SeekMusic SetMusicVolume IsMusic IsMusicPlaying PlayModule StopModule PauseModule ResumeModule LoadModule FreeModule IsModule SaveSample GetSampleData CreateMusic FillMusicBuffer MixSample CopySample InsertSample FlushMusicBuffer IsChannelPlaying HaveFreeChannel StopChannel GetChannels SetChannelVolume OpenAudio CloseAudio ForceSound CreateBrush DisplayBrush DisplayBrushPart ScaleBrush FreeBrush TintBrush ReplaceColors InvertBrush FlipBrush MixBrush BrushToGray RotateBrush GetBrushLink SelectBrush CopyBrush SetBrushTransparency LoadBrush SelectMask SetMaskMode SaveBrush SelectAlphaChannel SetAlphaIntensity DeleteAlphaChannel CropBrush InvertMask InvertAlphaChannel FloodFill DeleteMask BeginDoubleBuffer EndDoubleBuffer Flip ConvertToBrush GrabDesktop TransformBrush TrimBrush RasterizeBrush BlurBrush EmbossBrush EdgeBrush SharpenBrush SolarizeBrush GammaBrush ContrastBrush ModulateBrush SepiaToneBrush CharcoalBrush SwirlBrush PixelateBrush BrushToMonochrome ChangeBrushTransparency CreateShadowBrush CreateBorderBrush WaterRippleBrush OilPaintBrush BrushToRGBArray RGBArrayToBrush PerspectiveDistortBrush ArcDistortBrush PolarDistortBrush BarrelDistortBrush CreateGradientBrush CreateTexturedBrush ReadBrushPixel WriteBrushPixel QuantizeBrush ReduceAlphaChannel IsBrushEmpty DisplayBGPic DisplayBGPicPart ScaleBGPic CreateGradientBGPic CreateRainbowBGPic CreateTexturedBGPic BrushToBGPic BGPicToBrush CreateBGPic FreeBGPic LoadBGPic SelectBGPic EndSelect CopyBGPic DisplayBrushFX DisplayTextObjectFX DisplayTransitionFX DisplayBGPicPartFX UndoFX ShowLayerFX HideLayerFX RemoveLayerFX GetRandomFX ClearScreen CreateSprite DisplaySprite RemoveSprite FreeSprite LoadSprite ScaleSprite CopySprite FlipSprite RemoveSprites SetSpriteZPos AllocMem FreeMem Poke Peek FillMem CopyMem ReadMem WriteMem DumpMem MemToTable TableToMem GetMemPointer GetMemString AllocMemFromPointer AllocMemFromVirtualFile MoveTo LineTo CurveTo RelMoveTo RelLineTo RelCurveTo DrawPath StartPath StartSubPath ClosePath AddArcToPath AddCircleToPath AddEllipseToPath AddBoxToPath SetLineJoin SetLineCap SetDash SetFillRule FreePath ClearPath IsPathEmpty GetCurrentPoint GetPathExtents CopyPath AppendPath AddTextToPath TranslatePath NormalizePath ForcePathUse SetVectorEngine PathItems PathToBrush GetFillRule GetLineJoin GetLineCap GetDash SetMiterLimit GetMiterLimit CreateIcon FreeIcon LoadIcon SaveIcon AddIconImage RemoveIconImage SetStandardIconImage OpenSerialPort CloseSerialPort ReadSerialData WriteSerialData FlushSerialPort SetBaudRate SetStopBits SetDataBits SetParity SetFlowControl SetDTR SetRTS GetBaudRate GetStopBits GetDataBits GetParity GetFlowControl GetDTR GetRTS PollSerialQueue ClearSerialQueue OpenConnection CloseConnection CreateServer CloseServer SendData ReceiveData GetConnectionIP GetConnectionPort GetHostName ToIP ToHostName DownloadFile UploadFile SetNetworkTimeout GetLocalIP GetLocalPort CreateUDPObject CloseUDPObject SendUDPData ReceiveUDPData IsOnline GetMACAddress GetConnectionProtocol GetLocalProtocol SetNetworkProtocol ResolveHostName OpenVideo CloseVideo PlayVideo StopVideo PauseVideo ResumeVideo SeekVideo IsVideo SetVideoSize SetVideoPosition SetVideoVolume GetVideoFrame IsVideoPlaying ForceVideoMode ForceVideoDriver DumpVideo DisplayVideoFrame SendRexxCommand RunRexxScript CreateRexxPort
+
+" user-defined constants
+syn match hwUserConstant "#\<\u\+\>"
+" user-defined functions
+syn match hwUserFunction "\<p_\w\{-1,}\>("me=e-1
+
+" Comments
+syn keyword hwTodo      contained TODO FIXME XXX
+syn match  hwComment    ";.*$" contains=hwTodo,@Spell
+syn region hwComment    matchgroup=hwComment start="/\*" end="\*/"  contains=hwTodo,@Spell
+
+
+" Strings
+syn match  hwSpecial contained #\\[\\abfnrtvz'"]\|\\x[[:xdigit:]]\{2}\|\\[[:digit:]]\{,3}#
+syn region hwString  start=+'+hs=s+1 end=+'+he=e-1 skip=+\\\\\|\\'+ contains=hwSpecial,@Spell
+syn region hwString  start=+"+hs=s+1 end=+"+he=e-1 skip=+\\\\\|\\"+ contains=hwSpecial,@Spell
+
+" integer number
+syn match hwNumber "\<\d\+\>"
+" floating point number, with dot, optional exponent
+syn match hwNumber  "\<\d\+\.\d*\%([eE][-+]\=\d\+\)\=\>"
+" floating point number, starting with a dot, optional exponent
+syn match hwNumber  "\.\d\+\%([eE][-+]\=\d\+\)\=\>"
+" floating point number, without dot, with exponent
+syn match hwNumber  "\<\d\+[eE][-+]\=\d\+\>"
+
+" hex numbers
+syn match hwNumber "\<0[xX]\x\+\>"
+syn match hwNumber "\<0[xX][[:xdigit:].]\+\%([pP][-+]\=\d\+\)\=\>"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+hi def link hwPreProcessor	PreProc
+hi def link hwStatement		Statement
+hi def link hwFallThrough	Statement
+hi def link hwRepeat		Repeat
+hi def link hwFor		Repeat
+hi def link hwString		PmenuSel
+hi def link hwNumber		Number
+hi def link hwOperator		Operator
+hi def link hwStep		Operator
+hi def link hwIn		Operator
+hi def link hwUserConstant	Constant
+hi def link hwConstant		Constant
+hi def link hwLineStatement	Conditional
+hi def link hwCond		Conditional
+hi def link hwElseIf		Conditional
+hi def link hwFunction		Function
+hi def link hwUserFunction	Function
+hi def link hwComment		MoreMsg
+hi def link hwTodo		Todo
+hi def link hwTable		Structure
+hi def link hwError		Error
+hi def link hwParenError	Error
+hi def link hwBraceError	Error
+hi def link hwSpecial		SpecialChar
+hi def link hwLabel		Label
+
+
+let b:current_syntax = "hollywood"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: et ts=8 sw=2
+
+endif
diff --git a/syntax/hostconf.vim b/syntax/hostconf.vim
new file mode 100644
index 000000000..bf69bf7df
--- /dev/null
+++ b/syntax/hostconf.vim
@@ -0,0 +1,151 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hostconf') == -1
+
+" Vim syntax file
+" Language:             host.conf(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-06-25
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword hostconfTodo
+      \ contained
+      \ TODO
+      \ FIXME
+      \ XXX
+      \ NOTE
+
+syn match   hostconfComment
+      \ display
+      \ contained
+      \ '\s*#.*'
+      \ contains=hostconfTodo,
+      \          @Spell
+
+syn match   hostconfBegin
+      \ display
+      \ '^'
+      \ nextgroup=hostconfComment,hostconfKeyword
+      \ skipwhite
+
+syn keyword hostconfKeyword
+      \ contained
+      \ order
+      \ nextgroup=hostconfLookupOrder
+      \ skipwhite
+
+let s:orders = ['bind', 'hosts', 'nis']
+
+function s:permute_suffixes(list)
+  if empty(a:list)
+    return []
+  elseif len(a:list) == 1
+    return a:list[0]
+  else
+    let i = 0
+    let n = len(a:list)
+    let sub_permutations = []
+    while i < n
+      let list_copy = copy(a:list)
+      let removed = list_copy[i]
+      call remove(list_copy, i)
+      call add(sub_permutations, [removed, s:permute_suffixes(list_copy)])
+      let i += 1
+    endwhile
+    return sub_permutations
+  endif
+endfunction
+
+function s:generate_suffix_groups(list_of_order_of_orders, context, trailing_context)
+  for order_of_orders in a:list_of_order_of_orders
+    let order = order_of_orders[0]
+    let trailing_context = a:trailing_context . toupper(order[0]) . order[1:]
+    let nextgroup = 'hostconfLookupOrder' . trailing_context
+    let nextgroup_delimiter = nextgroup . 'Delimiter'
+    let group = 'hostconfLookupOrder' . a:context
+    execute 'syn keyword' group 'contained' order 'nextgroup=' . nextgroup_delimiter 'skipwhite'
+    execute 'syn match' nextgroup_delimiter 'contained display "," nextgroup=' . nextgroup 'skipwhite'
+    if a:context != ""
+      execute 'hi def link' group 'hostconfLookupOrder'
+    endif
+    execute 'hi def link' nextgroup_delimiter 'hostconfLookupOrderDelimiter'
+    let context = trailing_context
+    if type(order_of_orders[1]) == type([])
+      call s:generate_suffix_groups(order_of_orders[1], context, trailing_context)
+    else
+      execute 'syn keyword hostconfLookupOrder' . context 'contained' order_of_orders[-1]
+      execute 'hi def link hostconfLookupOrder' . context 'hostconfLookupOrder'
+    endif
+  endfor
+endfunction
+
+call s:generate_suffix_groups(s:permute_suffixes(s:orders), "", "")
+
+delfunction s:generate_suffix_groups
+delfunction s:permute_suffixes
+
+syn keyword hostconfKeyword
+      \ contained
+      \ trim
+      \ nextgroup=hostconfDomain
+      \ skipwhite
+
+syn match   hostconfDomain
+      \ contained
+      \ '\.[^:;,[:space:]]\+'
+      \ nextgroup=hostconfDomainDelimiter
+      \ skipwhite
+
+syn match   hostconfDomainDelimiter
+      \ contained
+      \ display
+      \ '[:;,]'
+      \ nextgroup=hostconfDomain
+      \ skipwhite
+
+syn keyword hostconfKeyword
+      \ contained
+      \ multi
+      \ nospoof
+      \ spoofalert
+      \ reorder
+      \ nextgroup=hostconfBoolean
+      \ skipwhite
+
+syn keyword hostconfBoolean
+      \ contained
+      \ on
+      \ off
+
+syn keyword hostconfKeyword
+      \ contained
+      \ spoof
+      \ nextgroup=hostconfSpoofValue
+      \ skipwhite
+
+syn keyword hostconfSpoofValue
+      \ contained
+      \ off
+      \ nowarn
+      \ warn
+
+hi def link hostconfTodo                  Todo
+hi def link hostconfComment               Comment
+hi def link hostconfKeyword               Keyword
+hi def link hostconfLookupOrder           Identifier
+hi def link hostconfLookupOrderDelimiter  Delimiter
+hi def link hostconfDomain                String
+hi def link hostconfDomainDelimiter       Delimiter
+hi def link hostconfBoolean               Boolean
+hi def link hostconfSpoofValue            hostconfBoolean
+
+let b:current_syntax = "hostconf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/hostsaccess.vim b/syntax/hostsaccess.vim
new file mode 100644
index 000000000..aab22b0eb
--- /dev/null
+++ b/syntax/hostsaccess.vim
@@ -0,0 +1,27 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hostsaccess') == -1
+
+" Vim syntax file
+" Language:	hosts.deny, hosts.allow configuration files
+" Maintainer:	Thilo Six <T.Six@gmx.de>
+" Last Change:	2011 May 01
+" Derived From: conf.vim
+" Credits:	Bram Moolenaar
+"
+" This file is there to get at least a minimal highlighting.
+" A later version may be improved.
+
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" For a starter we just use conf.vim for highlighting
+runtime! syntax/conf.vim
+unlet b:current_syntax
+
+
+let b:current_syntax = "hostsaccess"
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/htmlm4.vim b/syntax/htmlm4.vim
new file mode 100644
index 000000000..60c02ea9e
--- /dev/null
+++ b/syntax/htmlm4.vim
@@ -0,0 +1,35 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmlm4') == -1
+
+" Vim syntax file
+" Language:	HTML and M4
+" Maintainer:	Claudio Fleiner <claudio@fleiner.com>
+" URL:		http://www.fleiner.com/vim/syntax/htmlm4.vim
+" Last Change:	2001 Apr 30
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" we define it here so that included files can test for it
+if !exists("main_syntax")
+  let main_syntax='htmlm4'
+endif
+
+runtime! syntax/html.vim
+unlet b:current_syntax
+syn case match
+
+runtime! syntax/m4.vim
+
+unlet b:current_syntax
+syn cluster htmlPreproc add=@m4Top
+syn cluster m4StringContents add=htmlTag,htmlEndTag
+
+let b:current_syntax = "htmlm4"
+
+if main_syntax == 'htmlm4'
+  unlet main_syntax
+endif
+
+endif
diff --git a/syntax/icemenu.vim b/syntax/icemenu.vim
new file mode 100644
index 000000000..2f454bfc5
--- /dev/null
+++ b/syntax/icemenu.vim
@@ -0,0 +1,38 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'icemenu') == -1
+
+" Vim syntax file
+" Language:	Icewm Menu
+" Maintainer:	James Mahler <James.Mahler@gmail.com>
+" Last Change:	Fri Apr  1 15:13:48 EST 2005
+" Extensions:	~/.icewm/menu
+" Comment:	Icewm is a lightweight window manager.  This adds syntax
+"		highlighting when editing your user's menu file (~/.icewm/menu).
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+" not case sensitive
+syntax case ignore
+
+" icons .xpm .png and .gif
+syntax match _icon /"\=\/.*\.xpm"\=/
+syntax match _icon /"\=\/.*\.png"\=/
+syntax match _icon /"\=\/.*\.gif"\=/
+syntax match _icon /"\-"/
+
+" separator
+syntax keyword _rules separator
+
+" prog and menu
+syntax keyword _ids menu prog
+
+" highlights
+highlight link _rules Underlined
+highlight link _ids Type
+highlight link _icon Special
+
+let b:current_syntax = "IceMenu"
+
+endif
diff --git a/syntax/icon.vim b/syntax/icon.vim
new file mode 100644
index 000000000..de5c021d7
--- /dev/null
+++ b/syntax/icon.vim
@@ -0,0 +1,203 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'icon') == -1
+
+" Vim syntax file
+" Language:	Icon
+" Maintainer:	Wendell Turner <wendell@adsi-m4.com>
+" URL:		ftp://ftp.halcyon.com/pub/users/wturner/icon.vim
+" Last Change:	2003 May 11
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn keyword  iconFunction   abs acos any args asin atan bal
+syn keyword  iconFunction   callout center char chdir close collect copy
+syn keyword  iconFunction   cos cset delay delete detab display dtor
+syn keyword  iconFunction   entab errorclear exit exp find flush function
+syn keyword  iconFunction   get getch getche getenv iand icom image
+syn keyword  iconFunction   insert integer ior ishift ixor kbhit key
+syn keyword  iconFunction   left list loadfunc log many map match
+syn keyword  iconFunction   member move name numeric open ord pop
+syn keyword  iconFunction   pos proc pull push put read reads
+syn keyword  iconFunction   real remove rename repl reverse right rtod
+syn keyword  iconFunction   runerr save seek seq set sin sort
+syn keyword  iconFunction   sortf sqrt stop string system tab table
+syn keyword  iconFunction   tan trim type upto variable where write writes
+
+" Keywords
+syn match iconKeyword "&allocated"
+syn match iconKeyword "&ascii"
+syn match iconKeyword "&clock"
+syn match iconKeyword "&collections"
+syn match iconKeyword "&cset"
+syn match iconKeyword "&current"
+syn match iconKeyword "&date"
+syn match iconKeyword "&dateline"
+syn match iconKeyword "&digits"
+syn match iconKeyword "&dump"
+syn match iconKeyword "&e"
+syn match iconKeyword "&error"
+syn match iconKeyword "&errornumber"
+syn match iconKeyword "&errortext"
+syn match iconKeyword "&errorvalue"
+syn match iconKeyword "&errout"
+syn match iconKeyword "&fail"
+syn match iconKeyword "&features"
+syn match iconKeyword "&file"
+syn match iconKeyword "&host"
+syn match iconKeyword "&input"
+syn match iconKeyword "&lcase"
+syn match iconKeyword "&letters"
+syn match iconKeyword "&level"
+syn match iconKeyword "&line"
+syn match iconKeyword "&main"
+syn match iconKeyword "&null"
+syn match iconKeyword "&output"
+syn match iconKeyword "&phi"
+syn match iconKeyword "&pi"
+syn match iconKeyword "&pos"
+syn match iconKeyword "&progname"
+syn match iconKeyword "&random"
+syn match iconKeyword "&regions"
+syn match iconKeyword "&source"
+syn match iconKeyword "&storage"
+syn match iconKeyword "&subject"
+syn match iconKeyword "&time"
+syn match iconKeyword "&trace"
+syn match iconKeyword "&ucase"
+syn match iconKeyword "&version"
+
+" Reserved words
+syn keyword iconReserved break by case create default do
+syn keyword iconReserved else end every fail if
+syn keyword iconReserved initial link next not of
+syn keyword iconReserved procedure repeat return suspend
+syn keyword iconReserved then to until while
+
+" Storage class reserved words
+syn keyword	iconStorageClass	global static local record
+
+syn keyword	iconTodo	contained TODO FIXME XXX BUG
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match iconSpecial contained "\\x\x\{2}\|\\\o\{3\}\|\\[bdeflnrtv\"\'\\]\|\\^c[a-zA-Z0-9]\|\\$"
+syn region	iconString	start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=iconSpecial
+syn region	iconCset	start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=iconSpecial
+syn match	iconCharacter	"'[^\\]'"
+
+" not sure about these
+"syn match	iconSpecialCharacter "'\\[bdeflnrtv]'"
+"syn match	iconSpecialCharacter "'\\\o\{3\}'"
+"syn match	iconSpecialCharacter "'\\x\x\{2}'"
+"syn match	iconSpecialCharacter "'\\^c\[a-zA-Z0-9]'"
+
+"when wanted, highlight trailing white space
+if exists("icon_space_errors")
+  syn match	iconSpaceError	"\s*$"
+  syn match	iconSpaceError	" \+\t"me=e-1
+endif
+
+"catch errors caused by wrong parenthesis
+syn cluster	iconParenGroup contains=iconParenError,iconIncluded,iconSpecial,iconTodo,iconUserCont,iconUserLabel,iconBitField
+
+syn region	iconParen	transparent start='(' end=')' contains=ALLBUT,@iconParenGroup
+syn match	iconParenError	")"
+syn match	iconInParen	contained "[{}]"
+
+
+syn case ignore
+
+"integer number, or floating point number without a dot
+syn match	iconNumber		"\<\d\+\>"
+
+"floating point number, with dot, optional exponent
+syn match	iconFloat		"\<\d\+\.\d*\(e[-+]\=\d\+\)\=\>"
+
+"floating point number, starting with a dot, optional exponent
+syn match	iconFloat		"\.\d\+\(e[-+]\=\d\+\)\=\>"
+
+"floating point number, without dot, with exponent
+syn match	iconFloat		"\<\d\+e[-+]\=\d\+\>"
+
+"radix number
+syn match	iconRadix		"\<\d\{1,2}[rR][a-zA-Z0-9]\+\>"
+
+
+" syn match iconIdentifier	"\<[a-z_][a-z0-9_]*\>"
+
+syn case match
+
+" Comment
+syn match	iconComment	"#.*" contains=iconTodo,iconSpaceError
+
+syn region	iconPreCondit start="^\s*$\s*\(if\>\|ifdef\>\|ifndef\>\|elif\>\|else\>\|endif\>\)" skip="\\$" end="$" contains=iconComment,iconString,iconCharacter,iconNumber,iconCommentError,iconSpaceError
+
+syn region	iconIncluded	contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match	iconIncluded	contained "<[^>]*>"
+syn match	iconInclude	"^\s*$\s*include\>\s*["<]" contains=iconIncluded
+"syn match iconLineSkip	"\\$"
+
+syn cluster	iconPreProcGroup contains=iconPreCondit,iconIncluded,iconInclude,iconDefine,iconInParen,iconUserLabel
+
+syn region	iconDefine	start="^\s*$\s*\(define\>\|undef\>\)" skip="\\$" end="$" contains=ALLBUT,@iconPreProcGroup
+
+"wt:syn region	iconPreProc "start="^\s*#\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" "end="$" contains=ALLBUT,@iconPreProcGroup
+
+" Highlight User Labels
+
+" syn cluster	iconMultiGroup contains=iconIncluded,iconSpecial,iconTodo,iconUserCont,iconUserLabel,iconBitField
+
+if !exists("icon_minlines")
+  let icon_minlines = 15
+endif
+exec "syn sync ccomment iconComment minlines=" . icon_minlines
+
+" Define the default highlighting.
+
+" Only when an item doesn't have highlighting
+
+" The default methods for highlighting.  Can be overridden later
+
+" hi def link iconSpecialCharacter	iconSpecial
+
+hi def link iconOctalError		iconError
+hi def link iconParenError		iconError
+hi def link iconInParen		iconError
+hi def link iconCommentError	iconError
+hi def link iconSpaceError		iconError
+hi def link iconCommentError	iconError
+hi def link iconIncluded		iconString
+hi def link iconCommentString	iconString
+hi def link iconComment2String	iconString
+hi def link iconCommentSkip	iconComment
+
+hi def link iconUserLabel		Label
+hi def link iconCharacter		Character
+hi def link iconNumber			Number
+hi def link iconRadix			Number
+hi def link iconFloat			Float
+hi def link iconInclude		Include
+hi def link iconPreProc		PreProc
+hi def link iconDefine			Macro
+hi def link iconError			Error
+hi def link iconStatement		Statement
+hi def link iconPreCondit		PreCondit
+hi def link iconString			String
+hi def link iconCset			String
+hi def link iconComment		Comment
+hi def link iconSpecial		SpecialChar
+hi def link iconTodo			Todo
+hi def link iconStorageClass	StorageClass
+hi def link iconFunction		Statement
+hi def link iconReserved		Label
+hi def link iconKeyword		Operator
+
+"hi def link iconIdentifier	Identifier
+
+
+let b:current_syntax = "icon"
+
+
+endif
diff --git a/syntax/indent.vim b/syntax/indent.vim
new file mode 100644
index 000000000..8d305c85a
--- /dev/null
+++ b/syntax/indent.vim
@@ -0,0 +1,156 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'indent') == -1
+
+" Vim syntax file
+" Language:             indent(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2010-01-23
+"   indent_is_bsd:      If exists, will change somewhat to match BSD implementation
+"
+" TODO:     is the deny-all (a la lilo.vim nice or no?)...
+"       irritating to be wrong to the last char...
+"       would be sweet if right until one char fails
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword+=-,+
+
+syn match   indentError   '\S\+'
+
+syn keyword indentTodo    contained TODO FIXME XXX NOTE
+
+syn region  indentComment start='/\*' end='\*/'
+                          \ contains=indentTodo,@Spell
+syn region  indentComment start='//' skip='\\$' end='$'
+                          \ contains=indentTodo,@Spell
+
+if !exists("indent_is_bsd")
+  syn match indentOptions '-i\|--indentation-level\|-il\|--indent-level'
+                        \ nextgroup=indentNumber skipwhite skipempty
+endif
+syn match   indentOptions '-\%(bli\|c\%([bl]i\|[dip]\)\=\|di\=\|ip\=\|lc\=\|pp\=i\|sbi\|ts\|-\%(brace-indent\|comment-indentation\|case-brace-indentation\|declaration-comment-column\|continuation-indentation\|case-indentation\|else-endif-column\|line-comments-indentation\|declaration-indentation\|indent-level\|parameter-indentation\|line-length\|comment-line-length\|paren-indentation\|preprocessor-indentation\|struct-brace-indentation\|tab-size\)\)'
+                        \ nextgroup=indentNumber skipwhite skipempty
+
+syn match   indentNumber  display contained '\d\+\>'
+
+syn match   indentOptions '-T'
+                        \ nextgroup=indentIdent skipwhite skipempty
+
+syn match   indentIdent   display contained '\h\w*\>'
+
+syn keyword indentOptions -bacc --blank-lines-after-ifdefs
+                        \ -bad --blank-lines-after-declarations
+                        \ -badp --blank-lines-after-procedure-declarations
+                        \ -bap --blank-lines-after-procedures
+                        \ -bbb --blank-lines-before-block-comments
+                        \ -bbo --break-before-boolean-operator
+                        \ -bc --blank-lines-after-commas
+                        \ -bfda --break-function-decl-args
+                        \ -bfde --break-function-decl-args-end
+                        \ -bl --braces-after-if-line
+                        \ -blf --braces-after-func-def-line
+                        \ -bls --braces-after-struct-decl-line
+                        \ -br --braces-on-if-line
+                        \ -brf --braces-on-func-def-line
+                        \ -brs --braces-on-struct-decl-line
+                        \ -bs --Bill-Shannon --blank-before-sizeof
+                        \ -c++ --c-plus-plus
+                        \ -cdb --comment-delimiters-on-blank-lines
+                        \ -cdw --cuddle-do-while
+                        \ -ce --cuddle-else
+                        \ -cs --space-after-cast
+                        \ -dj --left-justify-declarations
+                        \ -eei --extra-expression-indentation
+                        \ -fc1 --format-first-column-comments
+                        \ -fca --format-all-comments
+                        \ -gnu --gnu-style
+                        \ -h --help --usage
+                        \ -hnl --honour-newlines
+                        \ -kr --k-and-r-style --kernighan-and-ritchie --kernighan-and-ritchie-style
+                        \ -lp --continue-at-parentheses
+                        \ -lps --leave-preprocessor-space
+                        \ -nbacc --no-blank-lines-after-ifdefs
+                        \ -nbad --no-blank-lines-after-declarations
+                        \ -nbadp --no-blank-lines-after-procedure-declarations
+                        \ -nbap --no-blank-lines-after-procedures
+                        \ -nbbb --no-blank-lines-before-block-comments
+                        \ -nbbo --break-after-boolean-operator
+                        \ -nbc --no-blank-lines-after-commas
+                        \ -nbfda --dont-break-function-decl-args
+                        \ -nbfde --dont-break-function-decl-args-end
+                        \ -nbs --no-Bill-Shannon --no-blank-before-sizeof
+                        \ -ncdb --no-comment-delimiters-on-blank-lines
+                        \ -ncdw --dont-cuddle-do-while
+                        \ -nce --dont-cuddle-else
+                        \ -ncs --no-space-after-casts
+                        \ -ndj --dont-left-justify-declarations
+                        \ -neei --no-extra-expression-indentation
+                        \ -nfc1 --dont-format-first-column-comments
+                        \ -nfca --dont-format-comments
+                        \ -nhnl --ignore-newlines
+                        \ -nip --dont-indent-parameters --no-parameter-indentation
+                        \ -nlp --dont-line-up-parentheses
+                        \ -nlps --remove-preprocessor-space
+                        \ -npcs --no-space-after-function-call-names
+                        \ -npmt
+                        \ -npro --ignore-profile
+                        \ -nprs --no-space-after-parentheses
+                        \ -npsl --dont-break-procedure-type
+                        \ -nsaf --no-space-after-for
+                        \ -nsai --no-space-after-if
+                        \ -nsaw --no-space-after-while
+                        \ -nsc --dont-star-comments
+                        \ -nsob --leave-optional-blank-lines
+                        \ -nss --dont-space-special-semicolon
+                        \ -nut --no-tabs
+                        \ -nv --no-verbosity
+                        \ -o --output
+                        \ -o --output-file
+                        \ -orig --berkeley --berkeley-style --original --original-style
+                        \ -pcs --space-after-procedure-calls
+                        \ -pmt --preserve-mtime
+                        \ -prs --space-after-parentheses
+                        \ -psl --procnames-start-lines
+                        \ -saf --space-after-for
+                        \ -sai --space-after-if
+                        \ -saw --space-after-while
+                        \ -sc --start-left-side-of-comments
+                        \ -sob --swallow-optional-blank-lines
+                        \ -ss --space-special-semicolon
+                        \ -st --standard-output
+                        \ -ut --use-tabs
+                        \ -v --verbose
+                        \ -version --version
+                        \ -linux --linux-style
+
+if exists("indent_is_bsd")
+  syn keyword indentOptions -ip -ei -nei
+endif
+
+if exists("c_minlines")
+  let b:c_minlines = c_minlines
+else
+  if !exists("c_no_if0")
+    let b:c_minlines = 50       " #if 0 constructs can be long
+  else
+    let b:c_minlines = 15       " mostly for () constructs
+  endif
+endif
+
+hi def link indentError   Error
+hi def link indentComment Comment
+hi def link indentTodo    Todo
+hi def link indentOptions Keyword
+hi def link indentNumber  Number
+hi def link indentIdent   Identifier
+
+let b:current_syntax = "indent"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/inform.vim b/syntax/inform.vim
new file mode 100644
index 000000000..a2f2fac4a
--- /dev/null
+++ b/syntax/inform.vim
@@ -0,0 +1,396 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'inform') == -1
+
+" Vim syntax file
+" Language:     Inform
+" Maintainer:   Stephen Thomas (stephen@gowarthomas.com)
+" URL:		http://www.gowarthomas.com/informvim
+" Last Change:  2006 April 20
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" A bunch of useful Inform keywords.  First, case insensitive stuff
+
+syn case ignore
+
+syn keyword informDefine Constant
+
+syn keyword informType Array Attribute Class Nearby
+syn keyword informType Object Property String Routine
+syn match   informType "\<Global\>"
+
+syn keyword informInclude Import Include Link Replace System_file
+
+syn keyword informPreCondit End Endif Ifdef Ifndef Iftrue Iffalse Ifv3 Ifv5
+syn keyword informPreCondit Ifnot
+
+syn keyword informPreProc Abbreviate Default Fake_action Lowstring
+syn keyword informPreProc Message Release Serial Statusline Stub Switches
+syn keyword informPreProc Trace Zcharacter
+
+syn region  informGlobalRegion matchgroup=informType start="\<Global\>" matchgroup=NONE skip=+!.*$\|".*"\|'.*'+ end=";" contains=ALLBUT,informGramPreProc,informPredicate,informGrammar,informAsm,informAsmObsolete
+
+syn keyword informGramPreProc contained Verb Extend
+
+if !exists("inform_highlight_simple")
+  syn keyword informLibAttrib absent animate clothing concealed container
+  syn keyword informLibAttrib door edible enterable female general light
+  syn keyword informLibAttrib lockable locked male moved neuter on open
+  syn keyword informLibAttrib openable pluralname proper scenery scored
+  syn keyword informLibAttrib static supporter switchable talkable
+  syn keyword informLibAttrib visited workflag worn
+  syn match informLibAttrib "\<transparent\>"
+
+  syn keyword informLibProp e_to se_to s_to sw_to w_to nw_to n_to ne_to
+  syn keyword informLibProp u_to d_to in_to out_to before after life
+  syn keyword informLibProp door_to with_key door_dir invent plural
+  syn keyword informLibProp add_to_scope list_together react_before
+  syn keyword informLibProp react_after grammar orders initial when_open
+  syn keyword informLibProp when_closed when_on when_off description
+  syn keyword informLibProp describe article cant_go found_in time_left
+  syn keyword informLibProp number time_out daemon each_turn capacity
+  syn keyword informLibProp name short_name short_name_indef parse_name
+  syn keyword informLibProp articles inside_description
+  if !exists("inform_highlight_old")
+    syn keyword informLibProp compass_look before_implicit
+    syn keyword informLibProp ext_initialise ext_messages
+  endif
+
+  syn keyword informLibObj e_obj se_obj s_obj sw_obj w_obj nw_obj n_obj
+  syn keyword informLibObj ne_obj u_obj d_obj in_obj out_obj compass
+  syn keyword informLibObj thedark selfobj player location second actor
+  syn keyword informLibObj noun
+  if !exists("inform_highlight_old")
+    syn keyword informLibObj LibraryExtensions
+  endif
+
+  syn keyword informLibRoutine Achieved AfterRoutines AddToScope
+  syn keyword informLibRoutine AllowPushDir Banner ChangeDefault
+  syn keyword informLibRoutine ChangePlayer CommonAncestor DictionaryLookup
+  syn keyword informLibRoutine DisplayStatus DoMenu DrawStatusLine
+  syn keyword informLibRoutine EnglishNumber HasLightSource GetGNAOfObject
+  syn keyword informLibRoutine IndirectlyContains IsSeeThrough Locale
+  syn keyword informLibRoutine LoopOverScope LTI_Insert MoveFloatingObjects
+  syn keyword informLibRoutine NextWord NextWordStopped NounDomain
+  syn keyword informLibRoutine ObjectIsUntouchable OffersLight ParseToken
+  syn keyword informLibRoutine PlaceInScope PlayerTo PrintShortName
+  syn keyword informLibRoutine PronounNotice ScopeWithin SetPronoun SetTime
+  syn keyword informLibRoutine StartDaemon StartTimer StopDaemon StopTimer
+  syn keyword informLibRoutine TestScope TryNumber UnsignedCompare
+  syn keyword informLibRoutine WordAddress WordInProperty WordLength
+  syn keyword informLibRoutine WriteListFrom YesOrNo ZRegion RunRoutines
+  syn keyword informLibRoutine AfterLife AfterPrompt Amusing BeforeParsing
+  syn keyword informLibRoutine ChooseObjects DarkToDark DeathMessage
+  syn keyword informLibRoutine GamePostRoutine GamePreRoutine Initialise
+  syn keyword informLibRoutine InScope LookRoutine NewRoom ParseNoun
+  syn keyword informLibRoutine ParseNumber ParserError PrintRank PrintVerb
+  syn keyword informLibRoutine PrintTaskName TimePasses UnknownVerb
+  if exists("inform_highlight_glulx")
+     syn keyword informLibRoutine  IdentifyGlkObject HandleGlkEvent
+     syn keyword informLibRoutine  InitGlkWindow
+  endif
+  if !exists("inform_highlight_old")
+     syn keyword informLibRoutine  KeyCharPrimitive KeyDelay ClearScreen
+     syn keyword informLibRoutine  MoveCursor MainWindow StatusLineHeight
+     syn keyword informLibRoutine  ScreenWidth ScreenHeight SetColour
+     syn keyword informLibRoutine  DecimalNumber PrintToBuffer Length
+     syn keyword informLibRoutine  UpperCase LowerCase PrintCapitalised
+     syn keyword informLibRoutine  Cap Centre
+     if exists("inform_highlight_glulx")
+	syn keyword informLibRoutine  PrintAnything PrintAnyToArray
+     endif
+  endif
+
+  syn keyword informLibAction  Quit Restart Restore Verify Save
+  syn keyword informLibAction  ScriptOn ScriptOff Pronouns Score
+  syn keyword informLibAction  Fullscore LMode1 LMode2 LMode3
+  syn keyword informLibAction  NotifyOn NotifyOff Version Places
+  syn keyword informLibAction  Objects TraceOn TraceOff TraceLevel
+  syn keyword informLibAction  ActionsOn ActionsOff RoutinesOn
+  syn keyword informLibAction  RoutinesOff TimersOn TimersOff
+  syn keyword informLibAction  CommandsOn CommandsOff CommandsRead
+  syn keyword informLibAction  Predictable XPurloin XAbstract XTree
+  syn keyword informLibAction  Scope Goto Gonear Inv InvTall InvWide
+  syn keyword informLibAction  Take Drop Remove PutOn Insert Transfer
+  syn keyword informLibAction  Empty Enter Exit GetOff Go Goin Look
+  syn keyword informLibAction  Examine Search Give Show Unlock Lock
+  syn keyword informLibAction  SwitchOn SwitchOff Open Close Disrobe
+  syn keyword informLibAction  Wear Eat Yes No Burn Pray Wake
+  syn keyword informLibAction  WakeOther Consult Kiss Think Smell
+  syn keyword informLibAction  Listen Taste Touch Dig Cut Jump
+  syn keyword informLibAction  JumpOver Tie Drink Fill Sorry Strong
+  syn keyword informLibAction  Mild Attack Swim Swing Blow Rub Set
+  syn keyword informLibAction  SetTo WaveHands Wave Pull Push PushDir
+  syn keyword informLibAction  Turn Squeeze LookUnder ThrowAt Tell
+  syn keyword informLibAction  Answer Buy Ask AskFor Sing Climb Wait
+  syn keyword informLibAction  Sleep LetGo Receive ThrownAt Order
+  syn keyword informLibAction  TheSame PluralFound Miscellany Prompt
+  syn keyword informLibAction  ChangesOn ChangesOff Showverb Showobj
+  syn keyword informLibAction  EmptyT VagueGo
+  if exists("inform_highlight_glulx")
+     syn keyword informLibAction  GlkList
+  endif
+
+  syn keyword informLibVariable keep_silent deadflag action special_number
+  syn keyword informLibVariable consult_from consult_words etype verb_num
+  syn keyword informLibVariable verb_word the_time real_location c_style
+  syn keyword informLibVariable parser_one parser_two listing_together wn
+  syn keyword informLibVariable parser_action scope_stage scope_reason
+  syn keyword informLibVariable action_to_be menu_item item_name item_width
+  syn keyword informLibVariable lm_o lm_n inventory_style task_scores
+  syn keyword informLibVariable inventory_stage
+
+  syn keyword informLibConst AMUSING_PROVIDED DEBUG Headline MAX_CARRIED
+  syn keyword informLibConst MAX_SCORE MAX_TIMERS NO_PLACES NUMBER_TASKS
+  syn keyword informLibConst OBJECT_SCORE ROOM_SCORE SACK_OBJECT Story
+  syn keyword informLibConst TASKS_PROVIDED WITHOUT_DIRECTIONS
+  syn keyword informLibConst NEWLINE_BIT INDENT_BIT FULLINV_BIT ENGLISH_BIT
+  syn keyword informLibConst RECURSE_BIT ALWAYS_BIT TERSE_BIT PARTINV_BIT
+  syn keyword informLibConst DEFART_BIT WORKFLAG_BIT ISARE_BIT CONCEAL_BIT
+  syn keyword informLibConst PARSING_REASON TALKING_REASON EACHTURN_REASON
+  syn keyword informLibConst REACT_BEFORE_REASON REACT_AFTER_REASON
+  syn keyword informLibConst TESTSCOPE_REASON LOOPOVERSCOPE_REASON
+  syn keyword informLibConst STUCK_PE UPTO_PE NUMBER_PE CANTSEE_PE TOOLIT_PE
+  syn keyword informLibConst NOTHELD_PE MULTI_PE MMULTI_PE VAGUE_PE EXCEPT_PE
+  syn keyword informLibConst ANIMA_PE VERB_PE SCENERY_PE ITGONE_PE
+  syn keyword informLibConst JUNKAFTER_PE TOOFEW_PE NOTHING_PE ASKSCOPE_PE
+  if !exists("inform_highlight_old")
+     syn keyword informLibConst WORDSIZE TARGET_ZCODE TARGET_GLULX
+     syn keyword informLibConst LIBRARY_PARSER LIBRARY_VERBLIB LIBRARY_GRAMMAR
+     syn keyword informLibConst LIBRARY_ENGLISH NO_SCORE START_MOVE
+     syn keyword informLibConst CLR_DEFAULT CLR_BLACK CLR_RED CLR_GREEN
+     syn keyword informLibConst CLR_YELLOW CLR_BLUE CLR_MAGENTA CLR_CYAN
+     syn keyword informLibConst CLR_WHITE CLR_PURPLE CLR_AZURE
+     syn keyword informLibConst WIN_ALL WIN_MAIN WIN_STATUS
+  endif
+endif
+
+" Now the case sensitive stuff.
+
+syntax case match
+
+syn keyword informSysFunc child children elder indirect parent random
+syn keyword informSysFunc sibling younger youngest metaclass
+if exists("inform_highlight_glulx")
+  syn keyword informSysFunc glk
+endif
+
+syn keyword informSysConst adjectives_table actions_table classes_table
+syn keyword informSysConst identifiers_table preactions_table version_number
+syn keyword informSysConst largest_object strings_offset code_offset
+syn keyword informSysConst dict_par1 dict_par2 dict_par3
+syn keyword informSysConst actual_largest_object static_memory_offset
+syn keyword informSysConst array_names_offset readable_memory_offset
+syn keyword informSysConst cpv__start cpv__end ipv__start ipv__end
+syn keyword informSysConst array__start array__end lowest_attribute_number
+syn keyword informSysConst highest_attribute_number attribute_names_array
+syn keyword informSysConst lowest_property_number highest_property_number
+syn keyword informSysConst property_names_array lowest_action_number
+syn keyword informSysConst highest_action_number action_names_array
+syn keyword informSysConst lowest_fake_action_number highest_fake_action_number
+syn keyword informSysConst fake_action_names_array lowest_routine_number
+syn keyword informSysConst highest_routine_number routines_array
+syn keyword informSysConst routine_names_array routine_flags_array
+syn keyword informSysConst lowest_global_number highest_global_number globals_array
+syn keyword informSysConst global_names_array global_flags_array
+syn keyword informSysConst lowest_array_number highest_array_number arrays_array
+syn keyword informSysConst array_names_array array_flags_array lowest_constant_number
+syn keyword informSysConst highest_constant_number constants_array constant_names_array
+syn keyword informSysConst lowest_class_number highest_class_number class_objects_array
+syn keyword informSysConst lowest_object_number highest_object_number
+if !exists("inform_highlight_old")
+  syn keyword informSysConst sys_statusline_flag
+endif
+
+syn keyword informConditional default else if switch
+
+syn keyword informRepeat break continue do for objectloop until while
+
+syn keyword informStatement box font give inversion jump move new_line
+syn keyword informStatement print print_ret quit read remove restore return
+syn keyword informStatement rfalse rtrue save spaces string style
+
+syn keyword informOperator roman reverse bold underline fixed on off to
+syn keyword informOperator near from
+
+syn keyword informKeyword dictionary symbols objects verbs assembly
+syn keyword informKeyword expressions lines tokens linker on off alias long
+syn keyword informKeyword additive score time string table
+syn keyword informKeyword with private has class error fatalerror
+syn keyword informKeyword warning self
+if !exists("inform_highlight_old")
+  syn keyword informKeyword buffer
+endif
+
+syn keyword informMetaAttrib remaining create destroy recreate copy call
+syn keyword informMetaAttrib print_to_array
+
+syn keyword informPredicate has hasnt in notin ofclass or
+syn keyword informPredicate provides
+
+syn keyword informGrammar contained noun held multi multiheld multiexcept
+syn keyword informGrammar contained multiinside creature special number
+syn keyword informGrammar contained scope topic reverse meta only replace
+syn keyword informGrammar contained first last
+
+syn keyword informKeywordObsolete contained initial data initstr
+
+syn keyword informTodo contained TODO
+
+" Assembly language mnemonics must be preceded by a '@'.
+
+syn match informAsmContainer "@\s*\k*" contains=informAsm,informAsmObsolete
+
+if exists("inform_highlight_glulx")
+  syn keyword informAsm contained nop add sub mul div mod neg bitand bitor
+  syn keyword informAsm contained bitxor bitnot shiftl sshiftr ushiftr jump jz
+  syn keyword informAsm contained jnz jeq jne jlt jge jgt jle jltu jgeu jgtu
+  syn keyword informAsm contained jleu call return catch throw tailcall copy
+  syn keyword informAsm contained copys copyb sexs sexb aload aloads aloadb
+  syn keyword informAsm contained aloadbit astore astores astoreb astorebit
+  syn keyword informAsm contained stkcount stkpeek stkswap stkroll stkcopy
+  syn keyword informAsm contained streamchar streamnum streamstr gestalt
+  syn keyword informAsm contained debugtrap getmemsize setmemsize jumpabs
+  syn keyword informAsm contained random setrandom quit verify restart save
+  syn keyword informAsm contained restore saveundo restoreundo protect glk
+  syn keyword informAsm contained getstringtbl setstringtbl getiosys setiosys
+  syn keyword informAsm contained linearsearch binarysearch linkedsearch
+  syn keyword informAsm contained callf callfi callfii callfiii
+else
+  syn keyword informAsm contained je jl jg dec_chk inc_chk jin test or and
+  syn keyword informAsm contained test_attr set_attr clear_attr store
+  syn keyword informAsm contained insert_obj loadw loadb get_prop
+  syn keyword informAsm contained get_prop_addr get_next_prop add sub mul div
+  syn keyword informAsm contained mod call storew storeb put_prop sread
+  syn keyword informAsm contained print_num random push pull
+  syn keyword informAsm contained split_window set_window output_stream
+  syn keyword informAsm contained input_stream sound_effect jz get_sibling
+  syn keyword informAsm contained get_child get_parent get_prop_len inc dec
+  syn keyword informAsm contained remove_obj print_obj ret jump
+  syn keyword informAsm contained load not rtrue rfalse print
+  syn keyword informAsm contained print_ret nop save restore restart
+  syn keyword informAsm contained ret_popped pop quit new_line show_status
+  syn keyword informAsm contained verify call_2s call_vs aread call_vs2
+  syn keyword informAsm contained erase_window erase_line set_cursor get_cursor
+  syn keyword informAsm contained set_text_style buffer_mode read_char
+  syn keyword informAsm contained scan_table call_1s call_2n set_colour throw
+  syn keyword informAsm contained call_vn call_vn2 tokenise encode_text
+  syn keyword informAsm contained copy_table print_table check_arg_count
+  syn keyword informAsm contained call_1n catch piracy log_shift art_shift
+  syn keyword informAsm contained set_font save_undo restore_undo draw_picture
+  syn keyword informAsm contained picture_data erase_picture set_margins
+  syn keyword informAsm contained move_window window_size window_style
+  syn keyword informAsm contained get_wind_prop scroll_window pop_stack
+  syn keyword informAsm contained read_mouse mouse_window push_stack
+  syn keyword informAsm contained put_wind_prop print_form make_menu
+  syn keyword informAsm contained picture_table
+  if !exists("inform_highlight_old")
+     syn keyword informAsm contained check_unicode print_unicode
+  endif
+  syn keyword informAsmObsolete contained print_paddr print_addr print_char
+endif
+
+" Handling for different versions of VIM.
+
+setlocal iskeyword+=$
+command -nargs=+ SynDisplay syntax <args> display
+
+" Grammar sections.
+
+syn region informGrammarSection matchgroup=informGramPreProc start="\<Verb\|Extend\>" skip=+".*"+ end=";"he=e-1 contains=ALLBUT,informAsm
+
+" Special character forms.
+
+SynDisplay match informBadAccent contained "@[^{[:digit:]]\D"
+SynDisplay match informBadAccent contained "@{[^}]*}"
+SynDisplay match informAccent contained "@:[aouAOUeiyEI]"
+SynDisplay match informAccent contained "@'[aeiouyAEIOUY]"
+SynDisplay match informAccent contained "@`[aeiouAEIOU]"
+SynDisplay match informAccent contained "@\^[aeiouAEIOU]"
+SynDisplay match informAccent contained "@\~[anoANO]"
+SynDisplay match informAccent contained "@/[oO]"
+SynDisplay match informAccent contained "@ss\|@<<\|@>>\|@oa\|@oA\|@ae\|@AE\|@cc\|@cC"
+SynDisplay match informAccent contained "@th\|@et\|@Th\|@Et\|@LL\|@oe\|@OE\|@!!\|@??"
+SynDisplay match informAccent contained "@{\x\{1,4}}"
+SynDisplay match informBadStrUnicode contained "@@\D"
+SynDisplay match informStringUnicode contained "@@\d\+"
+SynDisplay match informStringCode contained "@\d\d"
+
+" String and Character constants.  Ordering is important here.
+syn region informString start=+"+ skip=+\\\\+ end=+"+ contains=informAccent,informStringUnicode,informStringCode,informBadAccent,informBadStrUnicode
+syn region informDictString start="'" end="'" contains=informAccent,informBadAccent
+SynDisplay match informBadDictString "''"
+SynDisplay match informDictString "'''"
+
+" Integer numbers: decimal, hexadecimal and binary.
+SynDisplay match informNumber "\<\d\+\>"
+SynDisplay match informNumber "\<\$\x\+\>"
+SynDisplay match informNumber "\<\$\$[01]\+\>"
+
+" Comments
+syn match informComment "!.*" contains=informTodo
+
+" Syncronization
+syn sync match informSyncStringEnd grouphere NONE /"[;,]\s*$/
+syn sync match informSyncRoutineEnd grouphere NONE /][;,]\s*$/
+syn sync match informSyncCommentEnd grouphere NONE /^\s*!.*$/
+syn sync match informSyncRoutine groupthere informGrammarSection "\<Verb\|Extend\>"
+syn sync maxlines=500
+
+delcommand SynDisplay
+
+" The default highlighting.
+
+hi def link informDefine		Define
+hi def link informType		Type
+hi def link informInclude		Include
+hi def link informPreCondit	PreCondit
+hi def link informPreProc		PreProc
+hi def link informGramPreProc	PreProc
+hi def link informAsm		Special
+if !exists("inform_suppress_obsolete")
+hi def link informAsmObsolete		informError
+hi def link informKeywordObsolete	informError
+else
+hi def link informAsmObsolete		Special
+hi def link informKeywordObsolete	Keyword
+endif
+hi def link informPredicate	Operator
+hi def link informSysFunc		Identifier
+hi def link informSysConst		Identifier
+hi def link informConditional	Conditional
+hi def link informRepeat		Repeat
+hi def link informStatement	Statement
+hi def link informOperator		Operator
+hi def link informKeyword		Keyword
+hi def link informGrammar		Keyword
+hi def link informDictString	String
+hi def link informNumber		Number
+hi def link informError		Error
+hi def link informString		String
+hi def link informComment		Comment
+hi def link informAccent		Special
+hi def link informStringUnicode	Special
+hi def link informStringCode	Special
+hi def link informTodo		Todo
+if !exists("inform_highlight_simple")
+hi def link informLibAttrib	Identifier
+hi def link informLibProp	Identifier
+hi def link informLibObj		Identifier
+hi def link informLibRoutine	Identifier
+hi def link informLibVariable	Identifier
+hi def link informLibConst	Identifier
+hi def link informLibAction	Identifier
+endif
+hi def link informBadDictString	informError
+hi def link informBadAccent	informError
+hi def link informBadStrUnicode	informError
+
+
+let b:current_syntax = "inform"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/initng.vim b/syntax/initng.vim
new file mode 100644
index 000000000..2e1d8a453
--- /dev/null
+++ b/syntax/initng.vim
@@ -0,0 +1,95 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'initng') == -1
+
+" Vim syntax file
+" Language:	initng .i files
+" Maintainer:	Elan Ruusam�e <glen@pld-linux.org>
+" URL:		http://glen.alkohol.ee/pld/initng/
+" License:	GPL v2
+" Version:	0.13
+" Last Change:	$Date: 2007/05/05 17:17:40 $
+"
+" Syntax highlighting for initng .i files. Inherits from sh.vim and adds
+" in the hiliting to start/stop {} blocks. Requires vim 6.3 or later.
+
+if &compatible || v:version < 603
+	finish
+endif
+
+if exists("b:current_syntax")
+	finish
+endif
+
+syn case match
+
+let is_bash = 1
+unlet! b:current_syntax
+syn include @shTop syntax/sh.vim
+
+syn region	initngService			matchgroup=initngServiceHeader start="^\s*\(service\|virtual\|daemon\|class\|cron\)\s\+\(\(\w\|[-/*]\)\+\(\s\+:\s\+\(\w\|[-/*]\)\+\)\?\)\s\+{" end="}" contains=@initngServiceCluster
+syn cluster initngServiceCluster	contains=initngComment,initngAction,initngServiceOption,initngServiceHeader,initngDelim,initngVariable
+
+syn region	initngAction			matchgroup=initngActionHeader start="^\s*\(script start\|script stop\|script run\)\s*=\s*{" end="}" contains=@initngActionCluster
+syn cluster initngActionCluster		contains=@shTop
+
+syn match	initngDelim				/[{}]/	contained
+
+syn region	initngString			start=/"/ end=/"/ skip=/\\"/
+
+" option = value
+syn match	initngServiceOption		/.\+\s*=.\+;/ contains=initngServiceKeywords,initngSubstMacro contained
+" option without value
+syn match	initngServiceOption		/\w\+;/ contains=initngServiceKeywords,initngSubstMacro contained
+
+" options with value
+syn keyword	initngServiceKeywords	also_stop need use nice setuid contained
+syn keyword	initngServiceKeywords	delay chdir suid sgid start_pause env_file env_parse pid_file pidfile contained
+syn keyword	initngServiceKeywords	pid_of up_when_pid_set stdout stderr syncron just_before contained
+syn keyword	initngServiceKeywords	provide lockfile daemon_stops_badly contained
+syn match	initngServiceKeywords	/\(script\|exec\(_args\)\?\) \(start\|stop\|daemon\)/ contained
+syn match	initngServiceKeywords	/env\s\+\w\+/ contained
+
+" rlimits
+syn keyword	initngServiceKeywords	rlimit_cpu_hard rlimit_core_soft contained
+
+" single options
+syn keyword	initngServiceKeywords	last respawn network_provider require_network require_file critical forks contained
+" cron options
+syn keyword	initngServiceKeywords	hourly contained
+syn match	initngVariable			/\${\?\w\+\}\?/
+
+" Substituted @foo@ macros:
+" ==========
+syn match	initngSubstMacro		/@[^@]\+@/	contained
+syn cluster initngActionCluster		add=initngSubstMacro
+syn cluster shCommandSubList		add=initngSubstMacro
+
+" Comments:
+" ==========
+syn cluster	initngCommentGroup		contains=initngTodo,@Spell
+syn keyword	initngTodo				TODO FIXME XXX contained
+syn match	initngComment			/#.*$/ contains=@initngCommentGroup
+
+" install_service #macros
+" TODO: syntax check for ifd-endd pairs
+" ==========
+syn region	initngDefine			start="^#\(endd\|elsed\|exec\|ifd\|endexec\|endd\)\>" skip="\\$" end="$" end="#"me=s-1
+syn cluster shCommentGroup			add=initngDefine
+syn cluster initngCommentGroup		add=initngDefine
+
+hi def link	initngComment			Comment
+hi def link initngTodo				Todo
+
+hi def link	initngString			String
+hi def link initngServiceKeywords	Define
+
+hi def link	initngServiceHeader		Keyword
+hi def link	initngActionHeader		Type
+hi def link initngDelim				Delimiter
+
+hi def link	initngVariable			PreProc
+hi def link	initngSubstMacro		Comment
+hi def link	initngDefine			Macro
+
+let b:current_syntax = "initng"
+
+endif
diff --git a/syntax/inittab.vim b/syntax/inittab.vim
new file mode 100644
index 000000000..35be2f20c
--- /dev/null
+++ b/syntax/inittab.vim
@@ -0,0 +1,66 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'inittab') == -1
+
+" Vim syntax file
+" Language: SysV-compatible init process control file `inittab'
+" Maintainer: Donovan Keohane <donovan.keohane@gmail.com>
+" Previous Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2019-11-19
+
+" Setup
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+" Base constructs
+syn match inittabError "[^:]\+:"me=e-1 contained
+syn match inittabError "[^:]\+$" contained
+syn match inittabComment "^[#:].*$" contains=inittabFixme
+syn match inittabComment "#.*$" contained contains=inittabFixme
+syn keyword inittabFixme FIXME TODO XXX NOT
+
+" Shell
+syn region inittabShString start=+"+ end=+"+ skip=+\\\\\|\\\"+ contained
+syn region inittabShString start=+'+ end=+'+ contained
+syn match inittabShOption "\s[-+][[:alnum:]]\+"ms=s+1 contained
+syn match inittabShOption "\s--[:alnum:][-[:alnum:]]*"ms=s+1 contained
+syn match inittabShCommand "\S\+" contained
+syn cluster inittabSh add=inittabShOption,inittabShString,inittabShCommand
+
+" Keywords
+syn keyword inittabActionName respawn wait once boot bootwait off ondemand sysinit powerwait powerfail powerokwait powerfailnow ctrlaltdel kbrequest initdefault contained
+
+" Line parser
+syn match inittabId "^[[:alnum:]~]\{1,4}" nextgroup=inittabColonRunLevels,inittabError
+syn match inittabColonRunLevels ":" contained nextgroup=inittabRunLevels,inittabColonAction,inittabError
+syn match inittabRunLevels "[0-6A-Ca-cSs]\+" contained nextgroup=inittabColonAction,inittabError
+syn match inittabColonAction ":" contained nextgroup=inittabAction,inittabError
+syn match inittabAction "\w\+" contained nextgroup=inittabColonProcess,inittabError contains=inittabActionName
+syn match inittabColonProcess ":" contained nextgroup=inittabProcessPlus,inittabProcess,inittabError
+syn match inittabProcessPlus "+" contained nextgroup=inittabProcess,inittabError
+syn region inittabProcess start="\S" end="$" transparent oneline contained contains=@inittabSh,inittabComment
+
+" Define the default highlighting
+
+hi def link inittabComment Comment
+hi def link inittabFixme Todo
+hi def link inittabActionName Type
+hi def link inittabError Error
+hi def link inittabId Identifier
+hi def link inittabRunLevels Special
+
+hi def link inittabColonProcess inittabColon
+hi def link inittabColonAction inittabColon
+hi def link inittabColonRunLevels inittabColon
+hi def link inittabColon PreProc
+
+hi def link inittabShString String
+hi def link inittabShOption Special
+hi def link inittabShCommand Statement
+
+
+let b:current_syntax = "inittab"
+
+endif
diff --git a/syntax/ipfilter.vim b/syntax/ipfilter.vim
new file mode 100644
index 000000000..1924b0663
--- /dev/null
+++ b/syntax/ipfilter.vim
@@ -0,0 +1,58 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ipfilter') == -1
+
+" ipfilter syntax file
+" Language: ipfilter configuration file
+" Maintainer: Hendrik Scholz <hendrik@scholz.net>
+" Last Change: 2005 Jan 27
+"
+" http://www.wormulon.net/files/misc/ipfilter.vim
+"
+" This will also work for OpenBSD pf but there might be some tags that are
+" not correctly identified.
+" Please send comments to hendrik@scholz.net
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Comment
+syn match	IPFComment	/#.*$/	contains=ipfTodo
+syn keyword	IPFTodo		TODO XXX FIXME contained
+
+syn keyword IPFActionBlock	block
+syn keyword IPFActionPass	pass
+syn keyword	IPFProto	tcp udp icmp
+syn keyword	IPFSpecial	quick log first
+" how could we use keyword for words with '-' ?
+syn match	IPFSpecial	/return-rst/
+syn match	IPFSpecial	/dup-to/
+"syn match	IPFSpecial	/icmp-type unreach/
+syn keyword IPFAny		all any
+syn match	IPFIPv4		/\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
+syn match	IPFNetmask	/\/\d\+/
+
+" service name constants
+syn keyword IPFService	auth bgp domain finger ftp http https ident
+syn keyword IPFService	imap irc isakmp kerberos mail nameserver nfs
+syn keyword IPFService	nntp ntp pop3 portmap pptp rpcbind rsync smtp
+syn keyword IPFService	snmp snmptrap socks ssh sunrpc syslog telnet
+syn keyword IPFService	tftp www
+
+" Comment
+hi def link IPFComment	Comment
+hi def link IPFTodo		Todo
+
+hi def link IPFService	Constant
+
+hi def link IPFAction	Type
+hi def link ipfActionBlock	String
+hi def link ipfActionPass	Type
+hi def link IPFSpecial	Statement
+hi def link IPFIPv4		Label
+hi def link IPFNetmask	String
+hi def link IPFAny		Statement
+hi def link IPFProto	Identifier
+
+
+endif
diff --git a/syntax/iss.vim b/syntax/iss.vim
new file mode 100644
index 000000000..de0b8e86f
--- /dev/null
+++ b/syntax/iss.vim
@@ -0,0 +1,140 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'iss') == -1
+
+" Vim syntax file
+" Language:             Inno Setup File (iss file) and My InnoSetup extension
+" Maintainer:           Jason Mills (jmills@cs.mun.ca)
+" Previous Maintainer:  Dominique St�phan (dominique@mggen.com)
+" Last Change:          2019 Sep 27
+"
+" Todo:
+"  - The paramter String: is matched as flag string (because of case ignore).
+"  - Pascal scripting syntax is not recognized.
+"  - Embedded double quotes confuse string matches. e.g. "asfd""asfa"
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" shut case off
+syn case ignore
+
+" Preprocessor
+syn region issPreProc start="^\s*#" end="$"
+
+" Section
+syn region issSection	start="\[" end="\]"
+
+" Label in the [Setup] Section
+syn match  issDirective	"^[^=]\+="
+
+" URL
+syn match  issURL	"http[s]\=:\/\/.*$"
+
+" Parameters used for any section.
+" syn match  issParam"[^: ]\+:"
+syn match  issParam	"Name:"
+syn match  issParam	"MinVersion:\|OnlyBelowVersion:\|Languages:"
+syn match  issParam	"Source:\|DestDir:\|DestName:\|CopyMode:"
+syn match  issParam	"Attribs:\|Permissions:\|FontInstall:\|Flags:"
+syn match  issParam	"FileName:\|Parameters:\|WorkingDir:\|HotKey:\|Comment:"
+syn match  issParam	"IconFilename:\|IconIndex:"
+syn match  issParam	"Section:\|Key:\|String:"
+syn match  issParam	"Root:\|SubKey:\|ValueType:\|ValueName:\|ValueData:"
+syn match  issParam	"RunOnceId:"
+syn match  issParam	"Type:\|Excludes:"
+syn match  issParam	"Components:\|Description:\|GroupDescription:\|Types:\|ExtraDiskSpaceRequired:"
+syn match  issParam	"StatusMsg:\|RunOnceId:\|Tasks:"
+syn match  issParam	"MessagesFile:\|LicenseFile:\|InfoBeforeFile:\|InfoAfterFile:"
+
+syn match  issComment	"^\s*;.*$" contains=@Spell
+
+" folder constant
+syn match  issFolder	"{[^{]*}" contains=@NoSpell
+
+" string
+syn region issString	start=+"+ end=+"+ contains=issFolder,@Spell
+
+" [Dirs]
+syn keyword issDirsFlags deleteafterinstall uninsalwaysuninstall uninsneveruninstall
+
+" [Files]
+syn keyword issFilesCopyMode normal onlyifdoesntexist alwaysoverwrite alwaysskipifsameorolder dontcopy
+syn keyword issFilesAttribs readonly hidden system
+syn keyword issFilesPermissions full modify readexec
+syn keyword issFilesFlags allowunsafefiles comparetimestampalso confirmoverwrite deleteafterinstall
+syn keyword issFilesFlags dontcopy dontverifychecksum external fontisnttruetype ignoreversion 
+syn keyword issFilesFlags isreadme onlyifdestfileexists onlyifdoesntexist overwritereadonly 
+syn keyword issFilesFlags promptifolder recursesubdirs regserver regtypelib restartreplace
+syn keyword issFilesFlags sharedfile skipifsourcedoesntexist sortfilesbyextension touch 
+syn keyword issFilesFlags uninsremovereadonly uninsrestartdelete uninsneveruninstall
+syn keyword issFilesFlags replacesameversion nocompression noencryption noregerror
+
+
+" [Icons]
+syn keyword issIconsFlags closeonexit createonlyiffileexists dontcloseonexit 
+syn keyword issIconsFlags runmaximized runminimized uninsneveruninstall useapppaths
+
+" [INI]
+syn keyword issINIFlags createkeyifdoesntexist uninsdeleteentry uninsdeletesection uninsdeletesectionifempty
+
+" [Registry]
+syn keyword issRegRootKey   HKCR HKCU HKLM HKU HKCC
+syn keyword issRegValueType none string expandsz multisz dword binary
+syn keyword issRegFlags createvalueifdoesntexist deletekey deletevalue dontcreatekey 
+syn keyword issRegFlags preservestringtype noerror uninsclearvalue 
+syn keyword issRegFlags uninsdeletekey uninsdeletekeyifempty uninsdeletevalue
+
+" [Run] and [UninstallRun]
+syn keyword issRunFlags hidewizard nowait postinstall runhidden runmaximized
+syn keyword issRunFlags runminimized shellexec skipifdoesntexist skipifnotsilent 
+syn keyword issRunFlags skipifsilent unchecked waituntilidle
+
+" [Types]
+syn keyword issTypesFlags iscustom
+
+" [Components]
+syn keyword issComponentsFlags dontinheritcheck exclusive fixed restart disablenouninstallwarning
+
+" [UninstallDelete] and [InstallDelete]
+syn keyword issInstallDeleteType files filesandordirs dirifempty
+
+" [Tasks]
+syn keyword issTasksFlags checkedonce dontinheritcheck exclusive restart unchecked 
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default methods for highlighting.  Can be overridden later
+hi def link issSection	Special
+hi def link issComment	Comment
+hi def link issDirective	Type
+hi def link issParam	Type
+hi def link issFolder	Special
+hi def link issString	String
+hi def link issURL	Include
+hi def link issPreProc	PreProc 
+
+hi def link issDirsFlags		Keyword
+hi def link issFilesCopyMode	Keyword
+hi def link issFilesAttribs	Keyword
+hi def link issFilesPermissions	Keyword
+hi def link issFilesFlags		Keyword
+hi def link issIconsFlags		Keyword
+hi def link issINIFlags		Keyword
+hi def link issRegRootKey		Keyword
+hi def link issRegValueType	Keyword
+hi def link issRegFlags		Keyword
+hi def link issRunFlags		Keyword
+hi def link issTypesFlags		Keyword
+hi def link issComponentsFlags	Keyword
+hi def link issInstallDeleteType	Keyword
+hi def link issTasksFlags		Keyword
+
+
+let b:current_syntax = "iss"
+
+" vim:ts=8
+
+endif
diff --git a/syntax/ist.vim b/syntax/ist.vim
new file mode 100644
index 000000000..75579b2e7
--- /dev/null
+++ b/syntax/ist.vim
@@ -0,0 +1,62 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ist') == -1
+
+" Vim syntax file
+" Language:	Makeindex style file, *.ist
+" Maintainer:	Peter Meszaros <pmeszaros@effice.hu>
+" Last Change:	2012 Jan 08 by Thilo Six
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword=$,@,48-57,_
+
+syn case ignore
+syn keyword IstInpSpec  actual  arg_close arg_open encap       escape
+syn keyword IstInpSpec  keyword level     quote    range_close range_open
+syn keyword IstInpSpec  page_compositor
+
+syn keyword IstOutSpec	preamble	 postamble	  setpage_prefix   setpage_suffix   group_skip
+syn keyword IstOutSpec	headings_flag	 heading_prefix   heading_suffix
+syn keyword IstOutSpec	lethead_flag	 lethead_prefix   lethead_suffix
+syn keyword IstOutSpec	symhead_positive symhead_negative numhead_positive numhead_negative
+syn keyword IstOutSpec	item_0		 item_1		  item_2	   item_01
+syn keyword IstOutSpec	item_x1		 item_12	  item_x2
+syn keyword IstOutSpec	delim_0		 delim_1	  delim_2
+syn keyword IstOutSpec	delim_n		 delim_r	  delim_t
+syn keyword IstOutSpec	encap_prefix	 encap_infix	  encap_suffix
+syn keyword IstOutSpec	line_max	 indent_space	  indent_length
+syn keyword IstOutSpec	suffix_2p	 suffix_3p	  suffix_mp
+
+syn region  IstString	   matchgroup=IstDoubleQuote start=+"+ skip=+\\"+ end=+"+ contains=IstSpecial
+syn match   IstCharacter   "'.'"
+syn match   IstNumber	   "\d\+"
+syn match   IstComment	   "^[\t ]*%.*$"	 contains=IstTodo
+syn match   IstSpecial	   "\\\\\|{\|}\|#\|\\n"  contained
+syn match   IstTodo	   "DEBUG\|TODO"	 contained
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link IstInpSpec	Type
+hi def link IstOutSpec	Identifier
+hi def link IstString	String
+hi def link IstNumber	Number
+hi def link IstComment	Comment
+hi def link IstTodo	Todo
+hi def link IstSpecial	Special
+hi def link IstDoubleQuote	Label
+hi def link IstCharacter	Label
+
+
+let b:current_syntax = "ist"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/j.vim b/syntax/j.vim
new file mode 100644
index 000000000..1a2e07ee7
--- /dev/null
+++ b/syntax/j.vim
@@ -0,0 +1,150 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'j') == -1
+
+" Vim syntax file
+" Language:	J
+" Maintainer:	David Bürgin <dbuergin@gluet.ch>
+" URL:		https://gitlab.com/glts/vim-j
+" Last Change:	2019-11-12
+
+if exists('b:current_syntax')
+  finish
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+syntax case match
+syntax sync minlines=100
+
+syntax cluster jStdlibItems contains=jStdlibNoun,jStdlibAdverb,jStdlibConjunction,jStdlibVerb
+syntax cluster jPrimitiveItems contains=jNoun,jAdverb,jConjunction,jVerb,jCopula
+
+syntax match jControl /\<\%(assert\|break\|case\|catch[dt]\=\|continue\|do\|else\%(if\)\=\|end\|fcase\|for\|if\|return\|select\|throw\|try\|whil\%(e\|st\)\)\./
+syntax match jControl /\<\%(for\|goto\|label\)_\a\k*\./
+
+" Standard library names. A few names need to be defined with ":syntax match"
+" because they would otherwise take precedence over the corresponding jControl
+" and jDefineExpression items.
+syntax keyword jStdlibNoun ARGV BINPATH CR CRLF DEL Debug EAV EMPTY FF FHS IF64 IFBE IFIOS IFJA IFJHS IFJNET IFQT IFRASPI IFUNIX IFWIN IFWINCE IFWINE IFWOW64 JB01 JBOXED JCHAR JCHAR2 JCHAR4 JCMPX JFL JINT JLIB JPTR JSB JSIZES JSTR JSTR2 JSTR4 JTYPES JVERSION LF LF2 LIBFILE TAB UNAME UNXLIB dbhelp libjqt
+syntax keyword jStdlibAdverb define each every fapplylines inv inverse items leaf rows rxapply rxmerge table
+syntax keyword jStdlibConjunction bind cuts def on
+syntax keyword jStdlibVerb AND Endian IFDEF OR XOR abspath anddf android_exec_am android_exec_host android_getdisplaymetrics andunzip apply boxopen boxxopen bx calendar cd cdcb cder cderx cdf charsub chopstring clear coclass cocreate cocurrent codestroy coerase cofind cofindv cofullname coinfo coinsert compare coname conames conew conl conouns conounsx copath copathnl copathnlx coreset costate cut cutLF cutopen cutpara datatype dbctx dbcut dberm dberr dbg dbinto dbjmp dblocals dblxq dblxs dbnxt dbout dbover dbq dbr dbret dbrr dbrrx dbrun dbs dbsig dbsq dbss dbst dbstack dbstk dbstop dbstopme dbstopnext dbstops dbtrace dbview deb debc delstring detab dfh dir dircompare dircompares dirfind dirpath dirss dirssrplc dirtree dirused dlb dltb dltbs dquote drop dropafter dropto dtb dtbs echo empty endian erase evtloop exit expand f2utf8 fappend fappends fboxname fc fcompare fcompares fcopynew fdir ferase fetch fexist fexists fgets file2url fixdotdot fliprgb fmakex foldpara foldtext fpathcreate fpathname fputs fread freadblock freadr freads frename freplace fsize fss fssrplc fstamp fstringreplace ftype fview fwrite fwritenew fwrites getalpha getargs getdate getenv getqtbin hfd hostpathsep ic install iospath isatty isotimestamp isutf16 isutf8 jcwdpath joinstring jpath jpathsep jsystemdefs launch list ljust load loadd mema memf memr memu memw nameclass namelist names nc nl pick quote require rjust rplc rxE rxall rxcomp rxcut rxeq rxerror rxfirst rxfree rxfrom rxhandles rxin rxindex rxinfo rxmatch rxmatches rxrplc rxutf8 script scriptd scripts setalpha setbreak shell show sign sminfo smoutput sort split splitnostring splitstring ss startupandroid stderr stdin stdout stringreplace symdat symget symset take takeafter taketo timespacex timestamp timex tmoutput toCRLF toHOST toJ todate todayno tolist tolower topara toupper tsdiff tsrep tstamp type ucp ucpcount undquote unxlib usleep utf8 uucp valdate wcsize weekday weeknumber weeksinyear winpathsep xedit
+syntax match jStdlibNoun /\<\%(adverb\|conjunction\|dyad\|monad\|noun\|verb\)\>/
+syntax match jStdlibVerb /\<\%(Note\|\%(assert\|break\|do\)\.\@!\)\>/
+
+" Numbers. Matching J numbers is difficult. In fact, the job cannot be done
+" with regular expressions alone. Below is a sketch of the pattern used. It
+" accepts most well-formed numbers and rejects most of the ill-formed ones.
+" See http://www.jsoftware.com/help/dictionary/dcons.htm for reference.
+"
+" "double1" and "double2" patterns:
+"     (_?\d+(\.\d*)?|_\.\d+)([eE]_?\d+)?
+"     (_?\d+(\.\d*)?|_\.\d+|\.\d+)([eE]_?\d+)?
+"
+" "rational1" and "rational2" patterns:
+"     \k<double1>(r\k<double2>)?|__?
+"     \k<double2>(r\k<double2>)?|__?
+"
+" "complex1" and "complex2" patterns:
+"     \k<rational1>((j|a[dr])\k<rational2>)?
+"     \k<rational2>((j|a[dr])\k<rational2>)?
+"
+" "basevalue" pattern:
+"     _?[0-9a-z]+(\.[0-9a-z]*)?|_?\.[0-9a-z]+
+"
+" all numbers:
+"     \b\k<complex1>([px]\k<complex2>)?(b\k<basevalue>)?(?![0-9A-Za-z_.])
+syntax match jNumber /\<_\.[0-9A-Za-z_.]\@!/
+syntax match jNumber /\<_\=\d\+x[0-9A-Za-z_.]\@!/
+syntax match jNumber /\<\%(__\=r_\=\d\+\|_\=\d\+r__\=\)[0-9A-Za-z_.]\@!/
+syntax match jNumber /\<\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\%(\%(j\|a[dr]\)\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\)\=\%([px]\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\%(\%(j\|a[dr]\)\%(\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\%(r\%(_\=\d\+\%(\.\d*\)\=\|_\.\d\+\|\.\d\+\)\%([eE]_\=\d\+\)\=\)\=\|__\=\)\)\=\)\=\%(b\%(_\=[0-9a-z]\+\%(\.[0-9a-z]*\)\=\|_\=\.[0-9a-z]\+\)\)\=[0-9A-Za-z_.]\@!/
+
+syntax region jString oneline start=/'/ skip=/''/ end=/'/
+
+syntax keyword jArgument contained x y u v m n
+
+" Primitives. Order is significant both within the patterns and among
+" ":syntax match" statements. Refer to "Parts of speech" in the J dictionary.
+syntax match jNoun /\<a[.:]/
+syntax match jAdverb /[}~]\|[/\\]\.\=\|\<\%([Mbft]\.\|t:\)/
+syntax match jConjunction /"\|`:\=\|[.:@&][.:]\=\|&\.:\|\<\%([dDHT]\.\|[DLS]:\)/
+syntax match jVerb /[=!\]]\|[\^?]\.\=\|[;[]:\=\|{\.\|[_/\\]:\|[<>+*\-%$|,#][.:]\=\|[~}"][.:]\|{\%[::]\|\<\%([ACeEiIjLor]\.\|p\.\.\=\|[ipqsux]:\|0:\|_\=[1-9]:\)/
+syntax match jCopula /=[.:]/
+syntax match jConjunction /;\.\|\^:\|![.:]/
+
+" Explicit noun definition. The difficulty is that the define expression can
+" occur in the middle of a line but the jNounDefine region must only start on
+" the next line. The trick is to split the problem into two regions and link
+" them with "nextgroup=". The fold wrapper provides syntax folding.
+syntax region jNounDefineFold
+    \ matchgroup=NONE start=/\%(\%(\%(^\s*Note\)\|\<\%(0\|noun\)\s\+\%(\:\s*0\|def\s\+0\|define\)\)\>\)\@=/
+    \ keepend matchgroup=NONE end=/^\s*)\s*$/
+    \ contains=jNounDefineStart
+    \ fold
+syntax region jNounDefineStart
+    \ matchgroup=jDefineExpression start=/\%(\%(^\s*Note\)\|\<\%(0\|noun\)\s\+\%(\:\s*0\|def\s\+0\|define\)\)\>/
+    \ keepend matchgroup=NONE end=/$/
+    \ contains=@jStdlibItems,@jPrimitiveItems,jNumber,jString,jParenGroup,jParen,jComment
+    \ contained oneline skipempty nextgroup=jDefineEnd,jNounDefine
+" These two items must have "contained", which allows them to match only after
+" jNounDefineStart thanks to the "nextgroup=" above.
+syntax region jNounDefine
+    \ matchgroup=NONE start=/^/
+    \ matchgroup=jDefineEnd end=/^\s*)\s*$/
+    \ contained
+" This match is necessary in case of an empty noun definition
+syntax match jDefineEnd contained /^\s*)\s*$/
+
+" Explicit verb, adverb, and conjunction definition
+syntax region jDefine
+    \ matchgroup=jDefineExpression start=/\<\%([1-4]\|13\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\>/
+    \ matchgroup=jDefineEnd end=/^\s*)\s*$/
+    \ contains=jControl,@jStdlibItems,@jPrimitiveItems,jNumber,jString,jArgument,jParenGroup,jParen,jComment,jDefineMonadDyad
+    \ fold
+syntax match jDefineMonadDyad contained /^\s*:\s*$/
+
+" Paired parentheses. When a jDefineExpression such as "3 : 0" is
+" parenthesised it will erroneously extend jParenGroup to span over the whole
+" definition body. This situation receives a special treatment here.
+syntax match jParen /(\%(\s*\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\s*)\)\@=/
+syntax match jParen contained /\%((\s*\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\s*\)\@<=)/
+syntax region jParenGroup
+    \ matchgroup=jParen start=/(\%(\s*\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\>\)\@!/
+    \ matchgroup=jParen end=/)/
+    \ oneline transparent
+
+syntax keyword jTodo contained TODO FIXME XXX
+syntax match jComment /\<NB\..*$/ contains=jTodo,@Spell
+
+syntax match jSharpBang /\%^#!.*$/
+
+highlight default link jControl           Statement
+highlight default link jStdlibNoun        Identifier
+highlight default link jStdlibAdverb      Function
+highlight default link jStdlibConjunction Function
+highlight default link jStdlibVerb        Function
+highlight default link jString            String
+highlight default link jNumber            Number
+highlight default link jNoun              Constant
+highlight default link jAdverb            Normal
+highlight default link jConjunction       Normal
+highlight default link jVerb              Normal
+highlight default link jCopula            Normal
+highlight default link jArgument          Identifier
+highlight default link jParen             Delimiter
+
+highlight default link jDefineExpression  Define
+highlight default link jDefineMonadDyad   Delimiter
+highlight default link jDefineEnd         Delimiter
+highlight default link jNounDefine        Normal
+
+highlight default link jTodo              Todo
+highlight default link jComment           Comment
+highlight default link jSharpBang         PreProc
+
+let b:current_syntax = 'j'
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif
diff --git a/syntax/jal.vim b/syntax/jal.vim
new file mode 100644
index 000000000..fa24ffd92
--- /dev/null
+++ b/syntax/jal.vim
@@ -0,0 +1,240 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jal') == -1
+
+" Vim syntax file
+" Language:	JAL
+" Version: 0.1
+" Last Change:	2003 May 11
+" Maintainer:  Mark Gross <mark@thegnar.org>
+" This is a syntax definition for the JAL language.
+" It is based on the Source Forge compiler source code.
+" https://sourceforge.net/projects/jal/
+"
+" TODO test.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+syn sync lines=250
+
+syn keyword picTodo NOTE TODO XXX contained
+
+syn match picIdentifier "[a-z_$][a-z0-9_$]*"
+syn match picLabel      "^[A-Z_$][A-Z0-9_$]*"
+syn match picLabel      "^[A-Z_$][A-Z0-9_$]*:"me=e-1
+
+syn match picASCII      "A\='.'"
+syn match picBinary     "B'[0-1]\+'"
+syn match picDecimal    "D'\d\+'"
+syn match picDecimal    "\d\+"
+syn match picHexadecimal "0x\x\+"
+syn match picHexadecimal "H'\x\+'"
+syn match picHexadecimal "[0-9]\x*h"
+syn match picOctal      "O'[0-7]\o*'"
+
+syn match picComment    ";.*" contains=picTodo
+
+syn region picString    start=+"+ end=+"+
+
+syn keyword picRegister indf tmr0 pcl status fsr port_a port_b port_c port_d port_e x84_eedata x84_eeadr pclath intcon
+syn keyword picRegister f877_tmr1l   f877_tmr1h   f877_t1con   f877_t2con   f877_ccpr1l  f877_ccpr1h  f877_ccp1con
+syn keyword picRegister f877_pir1    f877_pir2    f877_pie1    f877_adcon1  f877_adcon0  f877_pr2     f877_adresl  f877_adresh
+syn keyword picRegister f877_eeadr   f877_eedath  f877_eeadrh  f877_eedata  f877_eecon1  f877_eecon2  f628_EECON2
+syn keyword picRegister f877_rcsta   f877_txsta   f877_spbrg   f877_txreg   f877_rcreg   f628_EEDATA  f628_EEADR   f628_EECON1
+
+" Register --- bits
+" STATUS
+syn keyword picRegisterPart status_c status_dc status_z status_pd
+syn keyword picRegisterPart status_to status_rp0 status_rp1 status_irp
+
+" pins
+syn keyword picRegisterPart pin_a0 pin_a1 pin_a2 pin_a3 pin_a4 pin_a5
+syn keyword picRegisterPart pin_b0 pin_b1 pin_b2 pin_b3 pin_b4 pin_b5 pin_b6 pin_b7
+syn keyword picRegisterPart pin_c0 pin_c1 pin_c2 pin_c3 pin_c4 pin_c5 pin_c6 pin_c7
+syn keyword picRegisterPart pin_d0 pin_d1 pin_d2 pin_d3 pin_d4 pin_d5 pin_d6 pin_d7
+syn keyword picRegisterPart pin_e0 pin_e1 pin_e2
+
+syn keyword picPortDir port_a_direction  port_b_direction  port_c_direction  port_d_direction  port_e_direction
+
+syn match picPinDir "pin_a[012345]_direction"
+syn match picPinDir "pin_b[01234567]_direction"
+syn match picPinDir "pin_c[01234567]_direction"
+syn match picPinDir "pin_d[01234567]_direction"
+syn match picPinDir "pin_e[012]_direction"
+
+
+" INTCON
+syn keyword picRegisterPart intcon_gie intcon_eeie intcon_peie intcon_t0ie intcon_inte
+syn keyword picRegisterPart intcon_rbie intcon_t0if intcon_intf intcon_rbif
+
+" TIMER
+syn keyword picRegisterPart t1ckps1 t1ckps0 t1oscen t1sync tmr1cs tmr1on tmr1ie tmr1if
+
+"cpp bits
+syn keyword picRegisterPart ccp1x ccp1y
+
+" adcon bits
+syn keyword picRegisterPart adcon0_go adcon0_ch0 adcon0_ch1 adcon0_ch2
+
+" EECON
+syn keyword picRegisterPart  eecon1_rd eecon1_wr eecon1_wren eecon1_wrerr eecon1_eepgd
+syn keyword picRegisterPart f628_eecon1_rd f628_eecon1_wr f628_eecon1_wren f628_eecon1_wrerr
+
+" usart
+syn keyword picRegisterPart tx9 txen sync brgh tx9d
+syn keyword picRegisterPart spen rx9 cren ferr oerr rx9d
+syn keyword picRegisterPart TXIF RCIF
+
+" OpCodes...
+syn keyword picOpcode addlw andlw call clrwdt goto iorlw movlw option retfie retlw return sleep sublw tris
+syn keyword picOpcode xorlw addwf andwf clrf clrw comf decf decfsz incf incfsz retiw iorwf movf movwf nop
+syn keyword picOpcode rlf rrf subwf swapf xorwf bcf bsf btfsc btfss skpz skpnz setz clrz skpc skpnc setc clrc
+syn keyword picOpcode skpdc skpndc setdc clrdc movfw tstf bank page HPAGE mullw mulwf cpfseq cpfsgt cpfslt banka bankb
+
+
+syn keyword jalBoolean		true false
+syn keyword jalBoolean		off on
+syn keyword jalBit		high low
+syn keyword jalConstant		Input Output all_input all_output
+syn keyword jalConditional	if else then elsif end if
+syn keyword jalLabel		goto
+syn keyword jalRepeat		for while forever loop
+syn keyword jalStatement	procedure function
+syn keyword jalStatement	return end volatile const var
+syn keyword jalType		bit byte
+
+syn keyword jalModifier		interrupt assembler asm put get
+syn keyword jalStatement	out in is begin at
+syn keyword jalDirective	pragma jump_table target target_clock target_chip name error test assert
+syn keyword jalPredefined       hs xt rc lp internal 16c84 16f84 16f877 sx18 sx28 12c509a 12c508
+syn keyword jalPredefined       12ce674 16f628 18f252 18f242 18f442 18f452 12f629 12f675 16f88
+syn keyword jalPredefined	16f876 16f873 sx_12 sx18 sx28 pic_12 pic_14 pic_16
+
+syn keyword jalDirective chip osc clock  fuses  cpu watchdog powerup protection
+
+syn keyword jalFunction		bank_0 bank_1 bank_2 bank_3 bank_4 bank_5 bank_6 bank_7 trisa trisb trisc trisd trise
+syn keyword jalFunction		_trisa_flush _trisb_flush _trisc_flush _trisd_flush _trise_flush
+
+syn keyword jalPIC		local idle_loop
+
+syn region  jalAsm		matchgroup=jalAsmKey start="\<assembler\>" end="\<end assembler\>" contains=jalComment,jalPreProc,jalLabel,picIdentifier, picLabel,picASCII,picDecimal,picHexadecimal,picOctal,picComment,picString,picRegister,picRigisterPart,picOpcode,picDirective,jalPIC
+syn region  jalAsm		matchgroup=jalAsmKey start="\<asm\>" end=/$/ contains=jalComment,jalPreProc,jalLabel,picIdentifier, picLabel,picASCII,picDecimal,picHexadecimal,picOctal,picComment,picString,picRegister,picRigisterPart,picOpcode,picDirective,jalPIC
+
+syn region  jalPsudoVars matchgroup=jalPsudoVarsKey start="\<'put\>" end="/<is/>"  contains=jalComment
+
+syn match  jalStringEscape	contained "#[12][0-9]\=[0-9]\="
+syn match   jalIdentifier		"\<[a-zA-Z_][a-zA-Z0-9_]*\>"
+syn match   jalSymbolOperator		"[+\-/*=]"
+syn match   jalSymbolOperator		"!"
+syn match   jalSymbolOperator		"<"
+syn match   jalSymbolOperator		">"
+syn match   jalSymbolOperator		"<="
+syn match   jalSymbolOperator		">="
+syn match   jalSymbolOperator		"!="
+syn match   jalSymbolOperator		"=="
+syn match   jalSymbolOperator		"<<"
+syn match   jalSymbolOperator		">>"
+syn match   jalSymbolOperator		"|"
+syn match   jalSymbolOperator		"&"
+syn match   jalSymbolOperator		"%"
+syn match   jalSymbolOperator		"?"
+syn match   jalSymbolOperator		"[()]"
+syn match   jalSymbolOperator		"[\^.]"
+syn match   jalLabel			"[\^]*:"
+
+syn match  jalNumber		"-\=\<\d[0-9_]\+\>"
+syn match  jalHexNumber		"0x[0-9A-Fa-f_]\+\>"
+syn match  jalBinNumber		"0b[01_]\+\>"
+
+" String
+"wrong strings
+syn region  jalStringError matchgroup=jalStringError start=+"+ end=+"+ end=+$+ contains=jalStringEscape
+
+"right strings
+syn region  jalString matchgroup=jalString start=+'+ end=+'+ oneline contains=jalStringEscape
+" To see the start and end of strings:
+syn region  jalString matchgroup=jalString start=+"+ end=+"+ oneline contains=jalStringEscapeGPC
+
+syn keyword jalTodo contained	TODO
+syn region jalComment		start=/-- /  end=/$/ oneline contains=jalTodo
+syn region jalComment		start=/--\t/  end=/$/ oneline contains=jalTodo
+syn match  jalComment		/--\_$/
+syn region jalPreProc		start="include"  end=/$/ contains=JalComment,jalToDo
+
+
+if exists("jal_no_tabs")
+	syn match jalShowTab "\t"
+endif
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link jalAcces		jalStatement
+hi def link jalBoolean		Boolean
+hi def link jalBit			Boolean
+hi def link jalComment		Comment
+hi def link jalConditional		Conditional
+hi def link jalConstant		Constant
+hi def link jalDelimiter		Identifier
+hi def link jalDirective		PreProc
+hi def link jalException		Exception
+hi def link jalFloat		Float
+hi def link jalFunction		Function
+hi def link jalPsudoVarsKey	Function
+hi def link jalLabel		Label
+hi def link jalMatrixDelimiter	Identifier
+hi def link jalModifier		Type
+hi def link jalNumber		Number
+hi def link jalBinNumber		Number
+hi def link jalHexNumber		Number
+hi def link jalOperator		Operator
+hi def link jalPredefined		Constant
+hi def link jalPreProc		PreProc
+hi def link jalRepeat		Repeat
+hi def link jalStatement		Statement
+hi def link jalString		String
+hi def link jalStringEscape	Special
+hi def link jalStringEscapeGPC	Special
+hi def link jalStringError		Error
+hi def link jalStruct		jalStatement
+hi def link jalSymbolOperator	jalOperator
+hi def link jalTodo		Todo
+hi def link jalType		Type
+hi def link jalUnclassified	Statement
+hi def link jalAsm			Assembler
+hi def link jalError		Error
+hi def link jalAsmKey		Statement
+hi def link jalPIC			Statement
+
+hi def link jalShowTab		Error
+
+hi def link picTodo		Todo
+hi def link picComment		Comment
+hi def link picDirective		Statement
+hi def link picLabel		Label
+hi def link picString		String
+
+hi def link picOpcode		Keyword
+hi def link picRegister		Structure
+hi def link picRegisterPart	Special
+hi def link picPinDir		SPecial
+hi def link picPortDir		SPecial
+
+hi def link picASCII		String
+hi def link picBinary		Number
+hi def link picDecimal		Number
+hi def link picHexadecimal		Number
+hi def link picOctal		Number
+
+hi def link picIdentifier		Identifier
+
+
+
+let b:current_syntax = "jal"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/jam.vim b/syntax/jam.vim
new file mode 100644
index 000000000..4ce35d574
--- /dev/null
+++ b/syntax/jam.vim
@@ -0,0 +1,244 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jam') == -1
+
+" Vim syntax file
+" Language:	JAM
+" Maintainer:	Ralf Lemke (ralflemk@t-online.de)
+" Last change:	2012 Jan 08 by Thilo Six
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword=@,48-57,_,-
+
+" A bunch of useful jam keywords
+syn keyword	jamStatement	break call dbms flush global include msg parms proc public receive return send unload vars
+syn keyword	jamConditional	if else
+syn keyword	jamRepeat	for while next step
+
+syn keyword	jamTodo		contained TODO FIXME XXX
+syn keyword	jamDBState1	alias binary catquery close close_all_connections column_names connection continue continue_bottom continue_down continue_top continue_up
+syn keyword	jamDBState2	     cursor declare engine execute format occur onentry onerror onexit sql start store unique with
+syn keyword	jamSQLState1	all alter and any avg between by count create current data database delete distinct drop exists fetch from grant group
+syn keyword	jamSQLState2	having index insert into like load max min of open order revoke rollback runstats select set show stop sum synonym table to union update values view where bundle
+
+syn keyword     jamLibFunc1     dm_bin_create_occur dm_bin_delete_occur dm_bin_get_dlength dm_bin_get_occur dm_bin_length dm_bin_max_occur dm_bin_set_dlength dm_convert_empty dm_cursor_connection dm_cursor_consistent dm_cursor_engine dm_dbi_init dm_dbms dm_dbms_noexp dm_disable_styles dm_enable_styles dm_exec_sql dm_expand dm_free_sql_info dm_gen_change_execute_using dm_gen_change_select_from dm_gen_change_select_group_by dm_gen_change_select_having dm_gen_change_select_list dm_gen_change_select_order_by dm_gen_change_select_suffix dm_gen_change_select_where dm_gen_get_tv_alias dm_gen_sql_info
+
+syn keyword     jamLibFunc2     dm_get_db_conn_handle dm_get_db_cursor_handle dm_get_driver_option dm_getdbitext dm_init dm_is_connection dm_is_cursor dm_is_engine dm_odb_preserves_cursor dm_reset dm_set_driver_option dm_set_max_fetches dm_set_max_rows_per_fetch dm_set_tm_clear_fast dm_val_relative sm_adjust_area sm_allget sm_amt_format sm_e_amt_format sm_i_amt_format sm_n_amt_format sm_o_amt_format sm_append_bundle_data sm_append_bundle_done sm_append_bundle_item sm_d_at_cur sm_l_at_cur sm_r_at_cur sm_mw_attach_drawing_func sm_mwn_attach_drawing_func sm_mwe_attach_drawing_func sm_xm_attach_drawing_func sm_xmn_attach_drawing_func sm_xme_attach_drawing_func sm_backtab sm_bel sm_bi_comparesm_bi_copy sm_bi_initialize sm_bkrect sm_c_off sm_c_on sm_c_vis sm_calc sm_cancel sm_ckdigit sm_cl_all_mdts sm_cl_unprot sm_clear_array sm_n_clear_array sm_1clear_array sm_n_1clear_array sm_close_window sm_com_load_picture sm_com_QueryInterface sm_com_result sm_com_result_msg sm_com_set_handler sm_copyarray sm_n_copyarray sm_create_bundle
+
+syn keyword     jamLibFunc3     sm_d_msg_line sm_dblval sm_e_dblval sm_i_dblval sm_n_dblval sm_o_dblval sm_dd_able sm_dde_client_connect_cold sm_dde_client_connect_hot sm_dde_client_connect_warm sm_dde_client_disconnect sm_dde_client_off sm_dde_client_on sm_dde_client_paste_link_cold sm_dde_client_paste_link_hot sm_dde_client_paste_link_warm sm_dde_client_request sm_dde_execute sm_dde_install_notify sm_dde_poke sm_dde_server_off sm_dde_server_on sm_delay_cursor sm_deselect sm_dicname sm_disp_off sm_dlength sm_e_dlength sm_i_dlength sm_n_dlength sm_o_dlength sm_do_uinstalls sm_i_doccur sm_o_doccur sm_drawingarea sm_xm_drawingarea sm_dtofield sm_e_dtofield sm_i_dtofield sm_n_dtofield sm_o_dtofield sm_femsg sm_ferr_reset sm_fi_path sm_file_copy sm_file_exists sm_file_move sm_file_remove sm_fi_open sm_fi_path sm_filebox sm_filetypes sm_fio_a2f sm_fio_close sm_fio_editor sm_fio_error sm_fio_error_set sm_fio_f2a sm_fio_getc sm_fio_gets sm_fio_handle sm_fio_open sm_fio_putc sm_fio_puts sm_fio_rewind sm_flush sm_d_form sm_l_form
+
+syn keyword     jamLibFunc4     sm_r_form sm_formlist sm_fptr sm_e_fptr sm_i_fptr sm_n_fptr sm_o_fptr sm_fqui_msg sm_fquiet_err sm_free_bundle sm_ftog sm_e_ftog sm_i_ftog sm_n_ftog sm_o_ftog sm_fval sm_e_fval sm_i_fval sm_n_fval sm_o_fval sm_i_get_bi_data sm_o_get_bi_data sm_get_bundle_data sm_get_bundle_item_count sm_get_bundle_occur_count sm_get_next_bundle_name sm_i_get_tv_bi_data sm_o_get_tv_bi_data sm_getfield sm_e_getfield sm_i_getfield sm_n_getfield sm_o_getfield sm_getkey sm_gofield sm_e_gofield sm_i_gofield sm_n_gofield sm_o_gofield sm_gtof sm_gval sm_i_gtof sm_n_gval sm_hlp_by_name sm_home sm_inimsg sm_initcrt sm_jinitcrt sm_jxinitcrt sm_input sm_inquire sm_install sm_intval sm_e_intval sm_i_intval sm_n_intval sm_o_intval sm_i_ioccur sm_o_ioccur sm_is_bundle sm_is_no sm_e_is_no sm_i_is_no sm_n_is_no sm_o_is_no sm_is_yes sm_e_is_yes sm_i_is_yes sm_n_is_yes sm_o_is_yes sm_isabort sm_iset sm_issv sm_itofield sm_e_itofield sm_i_itofield sm_n_itofield sm_o_itofield sm_jclose sm_jfilebox sm_jform sm_djplcall sm_jplcall
+
+syn keyword     jamLibFunc5     sm_sjplcall sm_jplpublic sm_jplunload sm_jtop sm_jwindow sm_key_integer sm_keyfilter sm_keyhit sm_keyinit sm_n_keyinit sm_keylabel sm_keyoption sm_l_close sm_l_open sm_l_open_syslib sm_last sm_launch sm_h_ldb_fld_get sm_n_ldb_fld_get sm_h_ldb_n_fld_get sm_n_ldb_n_fld_get sm_h_ldb_fld_store sm_n_ldb_fld_store sm_h_ldb_n_fld_store sm_n_ldb_n_fld_store sm_ldb_get_active sm_ldb_get_inactive sm_ldb_get_next_active sm_ldb_get_next_inactive sm_ldb_getfield sm_i_ldb_getfield sm_n_ldb_getfield sm_o_ldb_getfield sm_ldb_h_getfield sm_i_ldb_h_getfield sm_n_ldb_h_getfield sm_o_ldb_h_getfield sm_ldb_handle sm_ldb_init sm_ldb_is_loaded sm_ldb_load sm_ldb_name sm_ldb_next_handle sm_ldb_pop sm_ldb_push sm_ldb_putfield sm_i_ldb_putfield sm_n_ldb_putfield sm_o_ldb_putfield sm_ldb_h_putfield sm_i_ldb_h_putfield sm_n_ldb_h_putfield sm_o_ldb_h_putfield sm_ldb_state_get sm_ldb_h_state_get sm_ldb_state_set sm_ldb_h_state_set sm_ldb_unload sm_ldb_h_unload sm_leave sm_list_objects_count sm_list_objects_end sm_list_objects_next
+
+syn keyword     jamLibFunc6     sm_list_objects_start sm_lngval sm_e_lngval sm_i_lngval sm_n_lngval sm_o_lngval sm_load_screen sm_log sm_lstore sm_ltofield sm_e_ltofield sm_i_ltofield sm_n_ltofield sm_o_ltofield sm_m_flush sm_menu_bar_error sm_menu_change sm_menu_create sm_menu_delete sm_menu_get_int sm_menu_get_str sm_menu_install sm_menu_remove sm_message_box sm_mncrinit6 sm_mnitem_change sm_n_mnitem_change sm_mnitem_create sm_n_mnitem_create sm_mnitem_delete sm_n_mnitem_delete sm_mnitem_get_int sm_n_mnitem_get_int sm_mnitem_get_str sm_n_mnitem_get_str sm_mnscript_load sm_mnscript_unload sm_ms_inquire sm_msg sm_msg_del sm_msg_get sm_msg_read sm_d_msg_read sm_n_msg_read sm_msgfind sm_mts_CreateInstance sm_mts_CreateProperty sm_mts_CreatePropertyGroup sm_mts_DisableCommit sm_mts_EnableCommit sm_mts_GetPropertyValue sm_mts_IsCallerInRole sm_mts_IsInTransaction sm_mts_IsSecurityEnabled sm_mts_PutPropertyValue sm_mts_SetAbort sm_mts_SetComplete sm_mus_time sm_mw_get_client_wnd sm_mw_get_cmd_show sm_mw_get_frame_wnd sm_mw_get_instance
+
+syn keyword     jamLibFunc7     sm_mw_get_prev_instance sm_mw_PrintScreen sm_next_sync sm_nl sm_null sm_e_null sm_i_null sm_n_null sm_o_null sm_obj_call sm_obj_copy sm_obj_copy_id sm_obj_create sm_obj_delete sm_obj_delete_id sm_obj_get_property sm_obj_onerror sm_obj_set_property sm_obj_sort sm_obj_sort_auto sm_occur_no sm_off_gofield sm_e_off_gofield sm_i_off_gofield sm_n_off_gofield sm_o_off_gofield sm_option sm_optmnu_id sm_pinquire sm_popup_at_cur sm_prop_error sm_prop_get_int sm_prop_get_str sm_prop_get_dbl sm_prop_get_x_int sm_prop_get_x_str sm_prop_get_x_dbl sm_prop_get_m_int sm_prop_get_m_str sm_prop_get_m_dbl sm_prop_id sm_prop_name_to_id sm_prop_set_int sm_prop_set_str sm_prop_set_dbl sm_prop_set_x_int sm_prop_set_x_str sm_prop_set_x_dbl sm_prop_set_m_int sm_prop_set_m_str sm_prop_set_m_dbl sm_pset sm_putfield sm_e_putfield sm_i_putfield sm_n_putfield sm_o_putfield sm_raise_exception sm_receive sm_receive_args sm_rescreen sm_resetcrt sm_jresetcrt sm_jxresetcrt sm_resize sm_restore_data sm_return sm_return_args sm_rmformlist sm_rs_data
+
+syn keyword     jamLibFunc8     sm_rw_error_message sm_rw_play_metafile sm_rw_runreport sm_s_val sm_save_data sm_sdtime sm_select sm_send sm_set_help sm_setbkstat sm_setsibling sm_setstatus sm_sh_off sm_shell sm_shrink_to_fit sm_slib_error sm_slib_install sm_slib_load sm_soption sm_strip_amt_ptr sm_e_strip_amt_ptr sm_i_strip_amt_ptr sm_n_strip_amt_ptr sm_o_strip_amt_ptr sm_sv_data sm_sv_free sm_svscreen sm_tab sm_tm_clear sm_tm_clear_model_events sm_tm_command sm_tm_command_emsgset sm_tm_command_errset sm_tm_continuation_validity sm_tm_dbi_checker sm_tm_error sm_tm_errorlog sm_tm_event sm_tm_event_name sm_tm_failure_message sm_tm_handling sm_tm_inquire sm_tm_iset sm_tm_msg_count_error sm_tm_msg_emsg sm_tm_msg_error sm_tm_old_bi_context sm_tm_pcopy sm_tm_pinquire sm_tm_pop_model_event sm_tm_pset sm_tm_push_model_event sm_tmpnam sm_tp_exec sm_tp_free_arg_buf sm_tp_gen_insert sm_tp_gen_sel_return sm_tp_gen_sel_where sm_tp_gen_val_link sm_tp_gen_val_return sm_tp_get_svc_alias sm_tp_get_tux_callid sm_translatecoords sm_tst_all_mdts
+
+syn keyword     jamLibFunc9     sm_udtime sm_ungetkey sm_unload_screen sm_unsvscreen sm_upd_select sm_validate sm_n_validate sm_vinit sm_n_vinit sm_wcount sm_wdeselect sm_web_get_cookie sm_web_invoke_url sm_web_log_error sm_web_save_global sm_web_set_cookie sm_web_unsave_all_globals sm_web_unsave_global sm_mw_widget sm_mwe_widget sm_mwn_widget sm_xm_widget sm_xme_widget sm_xmn_widget sm_win_shrink sm_d_window sm_d_at_cur sm_l_window sm_l_at_cur sm_r_window sm_r_at_cur sm_winsize sm_wrotate sm_wselect sm_n_wselect sm_ww_length sm_n_ww_length sm_ww_read sm_n_ww_read sm_ww_write sm_n_ww_write sm_xlate_table sm_xm_get_base_window sm_xm_get_display
+
+syn keyword     jamVariable1    SM_SCCS_ID SM_ENTERTERM SM_MALLOC SM_CANCEL SM_BADTERM SM_FNUM SM_DZERO SM_EXPONENT SM_INVDATE SM_MATHERR SM_FRMDATA SM_NOFORM SM_FRMERR SM_BADKEY SM_DUPKEY SM_ERROR SM_SP1 SM_SP2 SM_RENTRY SM_MUSTFILL SM_AFOVRFLW SM_TOO_FEW_DIGITS  SM_CKDIGIT SM_HITANY SM_NOHELP SM_MAXHELP SM_OUTRANGE SM_ENTERTERM1 SM_SYSDATE SM_DATFRM SM_DATCLR SM_DATINV SM_KSDATA SM_KSERR SM_KSNONE SM_KSMORE SM_DAYA1 SM_DAYA2 SM_DAYA3 SM_DAYA4 SM_DAYA5 SM_DAYA6 SM_DAYA7 SM_DAYL1 SM_DAYL2 SM_DAYL3 SM_DAYL4 SM_DAYL5 SM_DAYL6 SM_DAYL7 SM_MNSCR_LOAD SM_MENU_INSTALL SM_INSTDEFSCRL SM_INSTSCROLL SM_MOREDATA SM_READY SM_WAIT SM_YES SM_NO SM_NOTEMP SM_FRMHELP SM_FILVER SM_ONLYONE SM_WMSMOVE SM_WMSSIZE SM_WMSOFF SM_LPRINT SM_FMODE SM_NOFILE SM_NOSECTN SM_FFORMAT SM_FREAD SM_RX1 SM_RX2 SM_RX3 SM_TABLOOK SM_MISKET SM_ILLKET SM_ILLBRA SM_MISDBLKET SM_ILLDBLKET SM_ILLDBLBRA SM_ILL_RIGHT SM_ILLELSE SM_NUMBER SM_EOT SM_BREAK SM_NOARGS SM_BIGVAR SM_EXCESS SM_EOL SM_FILEIO SM_FOR SM_RCURLY SM_NONAME SM_1JPL_ERR SM_2JPL_ERR SM_3JPL_ERR
+
+syn keyword     jamVariable2    SM_JPLATCH SM_FORMAT SM_DESTINATION SM_ORAND SM_ORATOR SM_ILL_LEFT SM_MISSPARENS SM_ILLCLOSE_COMM SM_FUNCTION SM_EQUALS SM_MISMATCH SM_QUOTE SM_SYNTAX SM_NEXT SM_VERB_UNKNOWN SM_JPLFORM SM_NOT_LOADED SM_GA_FLG SM_GA_CHAR SM_GA_ARG SM_GA_DIG SM_NOFUNC SM_BADPROTO SM_JPLPUBLIC SM_NOCOMPILE SM_NULLEDIT SM_RP_NULL SM_DBI_NOT_INST SM_NOTJY SM_MAXLIB SM_FL_FLLIB SM_TPI_NOT_INST SM_RW_NOT_INST SM_MONA1 SM_MONA2 SM_MONA3 SM_MONA4 SM_MONA5 SM_MONA6 SM_MONA7 SM_MONA8 SM_MONA9 SM_MONA10 SM_MONA11 SM_MONA12 SM_MONL1 SM_MONL2 SM_MONL3 SM_MONL4 SM_MONL5 SM_MONL6 SM_MONL7 SM_MONL8 SM_MONL9 SM_MONL10 SM_MONL11 SM_MONL12 SM_AM SM_PM SM_0DEF_DTIME SM_1DEF_DTIME SM_2DEF_DTIME SM_3DEF_DTIME SM_4DEF_DTIME SM_5DEF_DTIME SM_6DEF_DTIME SM_7DEF_DTIME SM_8DEF_DTIME SM_9DEF_DTIME SM_CALC_DATE SM_BAD_DIGIT SM_BAD_YN SM_BAD_ALPHA SM_BAD_NUM SM_BAD_ALPHNUM SM_DECIMAL SM_1STATS SM_VERNO SM_DIG_ERR SM_YN_ERR SM_LET_ERR SM_NUM_ERR SM_ANUM_ERR SM_REXP_ERR SM_POSN_ERR SM_FBX_OPEN SM_FBX_WINDOW SM_FBX_SIBLING SM_OPENDIR
+
+syn keyword     jamVariable3    SM_GETFILES SM_CHDIR SM_GETCWD SM_UNCLOSED_COMM SM_MB_OKLABEL SM_MB_CANCELLABEL SM_MB_YESLABEL SM_MB_NOLABEL SM_MB_RETRYLABEL SM_MB_IGNORELABEL SM_MB_ABORTLABEL SM_MB_HELPLABEL SM_MB_STOP SM_MB_QUESTION SM_MB_WARNING SM_MB_INFORMATION SM_MB_YESALLLABEL SM_0MN_CURRDEF SM_1MN_CURRDEF SM_2MN_CURRDEF SM_0DEF_CURR SM_1DEF_CURR SM_2DEF_CURR SM_3DEF_CURR SM_4DEF_CURR SM_5DEF_CURR SM_6DEF_CURR SM_7DEF_CURR SM_8DEF_CURR SM_9DEF_CURR SM_SEND_SYNTAX SM_SEND_ITEM SM_SEND_INVALID_BUNDLE SM_RECEIVE_SYNTAX SM_RECEIVE_ITEM_NUMBER SM_RECEIVE_OVERFLOW SM_RECEIVE_ITEM SM_SYNCH_RECEIVE SM_EXEC_FAIL SM_DYNA_HELP_NOT_AVAIL SM_DLL_LOAD_ERR SM_DLL_UNRESOLVED SM_DLL_VERSION_ERR SM_DLL_OPTION_ERR SM_DEMOERR SM_MB_OKALLLABEL SM_MB_NOALLLABEL SM_BADPROP SM_BETWEEN SM_ATLEAST SM_ATMOST SM_PR_ERROR SM_PR_OBJID SM_PR_OBJECT SM_PR_ITEM SM_PR_PROP SM_PR_PROP_ITEM SM_PR_PROP_VAL SM_PR_CONVERT SM_PR_OBJ_TYPE SM_PR_RANGE SM_PR_NO_SET SM_PR_BYND_SCRN SM_PR_WW_SCROLL SM_PR_NO_SYNC SM_PR_TOO_BIG SM_PR_BAD_MASK SM_EXEC_MEM_ERR
+
+syn keyword     jamVariable4    SM_EXEC_NO_PROG SM_PR_NO_KEYSTRUCT SM_REOPEN_AS_SLIB SM_REOPEN_THE_SLIB SM_ERRLIB SM_WARNLIB SM_LIB_DOWNGRADE SM_OLDER SM_NEWER SM_UPGRADE SM_LIB_READONLY SM_LOPEN_ERR SM_LOPEN_WARN SM_MLOPEN_CREAT SM_MLOPEN_INIT SM_LIB_ERR SM_LIB_ISOLATE SM_LIB_NO_ERR SM_LIB_REC_ERR SM_LIB_FATAL_ERR SM_LIB_LERR_FILE SM_LIB_LERR_NOTLIB SM_LIB_LERR_BADVERS SM_LIB_LERR_FORMAT SM_LIB_LERR_BADCM SM_LIB_LERR_LOCK SM_LIB_LERR_RESERVED SM_LIB_LERR_READONLY SM_LIB_LERR_NOENTRY SM_LIB_LERR_BUSY SM_LIB_LERR_ROVERS SM_LIB_LERR_DEFAULT SM_LIB_BADCM SM_LIB_LERR_NEW SM_STANDALONE_MODE SM_FEATURE_RESTRICT FM_CH_LOST FM_JPL_PROMPT FM_YR4 FM_YR2 FM_MON FM_MON2 FM_DATE FM_DATE2 FM_HOUR FM_HOUR2 FM_MIN FM_MIN2 FM_SEC FM_SEC2 FM_YRDAY FM_AMPM FM_DAYA FM_DAYL FM_MONA FM_MONL FM_0MN_DEF_DT FM_1MN_DEF_DT FM_2MN_DEF_DT FM_DAY JM_QTERMINATE JM_HITSPACE JM_HITACK JM_NOJWIN UT_MEMERR UT_P_OPT UT_V_OPT UT_E_BINOPT UT_NO_INPUT UT_SECLONG UT_1FNAME UT_SLINE UT_FILE UT_ERROR UT_WARNING UT_MISSEQ UT_VOPT UT_M2_DESCR
+
+syn keyword     jamVariable5    UT_M2_PROGNAME UT_M2_USAGE UT_M2_O_OPT UT_M2_COM UT_M2_BADTAG UT_M2_MSSQUOT UT_M2_AFTRQUOT UT_M2_DUPSECT UT_M2_BADUCLSS UT_M2_USECPRFX UT_M2_MPTYUSCT UT_M2_DUPMSGTG UT_M2_TOOLONG UT_M2_LONG UT_K2_DESCR UT_K2_PROGNAME UT_K2_USAGE UT_K2_MNEM UT_K2_NKEYDEF UT_K2_DUPKEY UT_K2_NOTFOUND UT_K2_1FNAME UT_K2_VOPT UT_K2_EXCHAR UT_V2_DESCR UT_V2_PROGNAME UT_V2_USAGE UT_V2_SLINE UT_V2_SEQUAL UT_V2_SVARNAME UT_V2_SNAME UT_V2_VOPT UT_V2_1REQ UT_CB_DESCR UT_CB_PROGNAME UT_CB_USAGE UT_CB_VOPT UT_CB_MIEXT UT_CB_AEXT UT_CB_UNKNOWN UT_CB_ISCHEME UT_CB_BKFGS UT_CB_ABGS UT_CB_REC UT_CB_GUI UT_CB_CONT UT_CB_CONTFG UT_CB_AFILE UT_CB_LEFT_QUOTE UT_CB_NO_EQUAL UT_CB_EXTRA_EQ UT_CB_BAD_LHS UT_CB_BAD_RHS UT_CB_BAD_QUOTED UT_CB_FILE UT_CB_FILE_LINE UT_CB_DUP_ALIAS UT_CB_LINE_LOOP UT_CB_BAD_STYLE UT_CB_DUP_STYLE UT_CB_NO_SECT UT_CB_DUP_SCHEME DM_ERROR DM_NODATABASE DM_NOTLOGGEDON DM_ALREADY_ON DM_ARGS_NEEDED DM_LOGON_DENIED DM_BAD_ARGS DM_BAD_CMD DM_NO_MORE_ROWS DM_ABORTED DM_NO_CURSOR DM_MANY_CURSORS DM_KEYWORD
+
+syn keyword     jamVariable6    DM_INVALID_DATE DM_COMMIT DM_ROLLBACK DM_PARSE_ERROR DM_BIND_COUNT DM_BIND_VAR DM_DESC_COL DM_FETCH DM_NO_NAME DM_END_OF_PROC DM_NOCONNECTION DM_NOTSUPPORTED DM_TRAN_PEND DM_NO_TRANSACTION DM_ALREADY_INIT DM_INIT_ERROR DM_MAX_DEPTH DM_NO_PARENT DM_NO_CHILD DM_MODALITY_NOT_FOUND DM_NATIVE_NO_SUPPORT DM_NATIVE_CANCEL DM_TM_ALREADY DM_TM_IN_PROGRESS DM_TM_CLOSE_ERROR DM_TM_BAD_MODE DM_TM_BAD_CLOSE_ACTION DM_TM_INTERNAL DM_TM_MODEL_INTERNAL DM_TM_NO_ROOT DM_TM_NO_TRANSACTION DM_TM_INITIAL_MODE DM_TM_PARENT_NAME DM_TM_BAD_MEMBER DM_TM_FLD_NAM_LEN DM_TM_NO_PARENT DM_TM_BAD_REQUEST DM_TM_CANNOT_GEN_SQL DM_TM_CANNOT_EXEC_SQL DM_TM_DBI_ERROR DM_TM_DISCARD_ALL DM_TM_DISCARD_LATEST DM_TM_CALL_ERROR DM_TM_CALL_TYPE DM_TM_HOOK_MODEL DM_TM_ROOT_NAME DM_TM_TV_INVALID DM_TM_COL_NOT_FOUND DM_TM_BAD_LINK DM_TM_HOOK_MODEL_ERROR DM_TM_ONE_ROW DM_TM_SOME_ROWS DM_TM_GENERAL DM_TM_NO_HOOK DM_TM_NOSET DM_TM_TBLNAME DM_TM_PRIMARY_KEY DM_TM_INCOMPLETE_KEY DM_TM_CMD_MODE DM_TM_NO_SUCH_CMD DM_TM_NO_SUCH_SCOPE
+
+syn keyword     jamVariable7    DM_TM_NO_SUCH_TV DM_TM_EVENT_LOOP DM_TM_UNSUPPORTED DM_TM_NO_MODEL DM_TM_SYNCH_SV DM_TM_WRONG_FORM  DM_TM_VC_FIELD DM_TM_VC_DATE DM_TM_VC_TYPE DM_TM_BAD_CONTINUE DM_JDB_OUT_OF_MEMORY DM_JDB_DUPTABLEALIAS DM_JDB_DUPCURSORNAME DM_JDB_NODB DM_JDB_BINDCOUNT DM_JDB_NO_MORE_ROWS DM_JDB_AMBIGUOUS_COLUMN_REF DM_JDB_UNRESOLVED_COLUMN_REF DM_JDB_TABLE_READ_WRITE_CONFLICT DM_JDB_SYNTAX_ERROR DM_JDB_DUP_COLUMN_ASSIGNMENT DM_JDB_NO_MSG_FILE DM_JDB_NO_MSG DM_JDB_NOT_IMPLEMENTED DM_JDB_AGGREGATE_NOT_ALLOWED DM_JDB_TYPE_MISMATCH DM_JDB_NO_CURRENT_ROW DM_JDB_DB_CORRUPT DM_JDB_BUF_OVERFLOW DM_JDB_FILE_IO_ERR DM_JDB_BAD_HANDLE DM_JDB_DUP_TNAME DM_JDB_INVALID_TABLE_OP DM_JDB_TABLE_NOT_FOUND DM_JDB_CONVERSION_FAILED DM_JDB_INVALID_COLUMN_LIST DM_JDB_TABLE_OPEN DM_JDB_BAD_INPUT DM_JDB_DATATYPE_OVERFLOW DM_JDB_DATABASE_EXISTS DM_JDB_DATABASE_OPEN DM_JDB_DUP_CNAME DM_JDB_TMPDATABASE_ERR DM_JDB_INVALID_VALUES_COUNT DM_JDB_INVALID_COLUMN_COUNT DM_JDB_MAX_RECLEN_EXCEEDED DM_JDB_END_OF_GROUP
+
+syn keyword     jamVariable8    TP_EXC_INVALID_CLIENT_COMMAND  TP_EXC_INVALID_CLIENT_OPTION  TP_EXC_INVALID_COMMAND TP_EXC_INVALID_COMMAND_SYNTAX TP_EXC_INVALID_CONNECTION TP_EXC_INVALID_CONTEXT TP_EXC_INVALID_FORWARD TP_EXC_INVALID_JAM_VARIABLE_REF  TP_EXC_INVALID_MONITOR_COMMAND TP_EXC_INVALID_MONITOR_OPTION TP_EXC_INVALID_OPTION TP_EXC_INVALID_OPTION_VALUE  TP_EXC_INVALID_SERVER_COMMAND TP_EXC_INVALID_SERVER_OPTION TP_EXC_INVALID_SERVICE TP_EXC_INVALID_TRANSACTION TP_EXC_JIF_ACCESS_FAILED TP_EXC_JIF_LOWER_VERSION TP_EXC_LOGFILE_ERROR TP_EXC_MONITOR_ERROR TP_EXC_NO_OUTSIDE_TRANSACTION TP_EXC_NO_OUTSTANDING_CALLS TP_EXC_NO_OUTSTANDING_MESSAGE TP_EXC_NO_SERVICES_ADVERTISED TP_EXC_NO_SIGNALS TP_EXC_NONTRANSACTIONAL_SERVICE TP_EXC_NONTRANSACTIONAL_ACTION TP_EXC_OUT_OF_MEMORY TP_EXC_POSTING_FAILED TP_EXC_PERMISSION_DENIED  TP_EXC_REQUEST_LIMIT TP_EXC_ROLLBACK_COMMITTED  TP_EXC_ROLLBACK_FAILED TP_EXC_SERVICE_FAILED TP_EXC_SERVICE_NOT_IN_JIF  TP_EXC_SERVICE_PROTOCOL_ERROR  TP_EXC_SUBSCRIPTION_LIMIT
+
+syn keyword     jamVariable9    TP_EXC_SUBSCRIPTION_MATCH TP_EXC_SVC_ADVERTISE_LIMIT TP_EXC_SVC_WORK_OUTSTANDING TP_EXC_SVCROUTINE_MISSING TP_EXC_SVRINIT_WORK_OUTSTANDING TP_EXC_TIMEOUT TP_EXC_TRANSACTION_LIMIT TP_EXC_UNLOAD_FAILED TP_EXC_UNSUPPORTED_BUFFER TP_EXC_UNSUPPORTED_BUF_W_SUBT TP_EXC_USER_ABORT TP_EXC_WORK_OUTSTANDING TP_EXC_XA_CLOSE_FAILED TP_EXC_XA_OPEN_FAILED TP_EXC_QUEUE_BAD_MSGID TP_EXC_QUEUE_BAD_NAMESPACE TP_EXC_QUEUE_BAD_QUEUE TP_EXC_QUEUE_CANT_START_TRAN TP_EXC_QUEUE_FULL TP_EXC_QUEUE_MSG_IN_USE TP_EXC_QUEUE_NO_MSG TP_EXC_QUEUE_NOT_IN_QSPACE TP_EXC_QUEUE_RSRC_NOT_OPEN TP_EXC_QUEUE_SPACE_NOT_IN_JIF TP_EXC_QUEUE_TRAN_ABORTED TP_EXC_QUEUE_TRAN_ABSENT TP_EXC_QUEUE_UNEXPECTED TP_EXC_DCE_LOGIN_REQUIRED TP_EXC_ENC_CELL_NAME_REQUIRED TP_EXC_ENC_CONN_INFO_DIFFS TP_EXC_ENC_SVC_REGISTRY_ERROR TP_INVALID_START_ROUTINE TP_JIF_NOT_FOUND TP_JIF_OPEN_ERROR TP_NO_JIF TP_NO_MONITORS_ERROR TP_NO_SESSIONS_ERROR TP_NO_START_ROUTINE TP_ADV_SERVICE TP_ADV_SERVICE_IN_GROUP  TP_PRE_SVCHDL_WINOPEN_FAILED
+
+syn keyword     jamVariable10   PV_YES PV_NO TRUE FALSE TM_TRAN_NAME
+
+" jamCommentGroup allows adding matches for special things in comments
+syn cluster	jamCommentGroup	contains=jamTodo
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match	jamSpecial	contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)"
+if !exists("c_no_utf")
+  syn match	jamSpecial	contained "\\\(u\x\{4}\|U\x\{8}\)"
+endif
+if exists("c_no_cformat")
+  syn region	jamString		start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial
+else
+  syn match	jamFormat		"%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([diuoxXfeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
+  syn match	jamFormat		"%%" contained
+  syn region	jamString		start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat
+  hi link jamFormat jamSpecial
+endif
+syn match	jamCharacter	"L\='[^\\]'"
+syn match	jamCharacter	"L'[^']*'" contains=jamSpecial
+syn match	jamSpecialError	"L\='\\[^'\"?\\abfnrtv]'"
+syn match	jamSpecialCharacter "L\='\\['\"?\\abfnrtv]'"
+syn match	jamSpecialCharacter "L\='\\\o\{1,3}'"
+syn match	jamSpecialCharacter "'\\x\x\{1,2}'"
+syn match	jamSpecialCharacter "L'\\x\x\+'"
+
+"catch errors caused by wrong parenthesis and brackets
+syn cluster	jamParenGroup	contains=jamParenError,jamIncluded,jamSpecial,@jamCommentGroup,jamUserCont,jamUserLabel,jamBitField,jamCommentSkip,jamOctalZero,jamCppOut,jamCppOut2,jamCppSkip,jamFormat,jamNumber,jamFloat,jamOctal,jamOctalError,jamNumbersCom
+
+syn region	jamParen		transparent start='(' end=')' contains=ALLBUT,@jamParenGroup,jamErrInBracket
+syn match	jamParenError	"[\])]"
+syn match	jamErrInParen	contained "[\]{}]"
+syn region	jamBracket	transparent start='\[' end=']' contains=ALLBUT,@jamParenGroup,jamErrInParen
+syn match	jamErrInBracket	contained "[);{}]"
+
+"integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match	jamNumbers	transparent "\<\d\|\,\d" contains=jamNumber,jamFloat,jamOctalError,jamOctal
+" Same, but without octal error (for comments)
+syn match	jamNumbersCom	contained transparent "\<\d\|\,\d" contains=jamNumber,jamFloat,jamOctal
+syn match	jamNumber		contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>"
+"hex number
+syn match	jamNumber		contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
+" Flag the first zero of an octal number as something special
+syn match	jamOctal		contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>" contains=cOctalZero
+syn match	jamOctalZero	contained "\<0"
+syn match	jamFloat		contained "\d\+f"
+"floating point number, with dot, optional exponent
+syn match	jamFloat		contained "\d\+\,\d*\(e[-+]\=\d\+\)\=[fl]\="
+"floating point number, starting with a dot, optional exponent
+syn match	jamFloat		contained "\,\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+syn match	jamFloat		contained "\d\+e[-+]\=\d\+[fl]\=\>"
+" flag an octal number with wrong digits
+syn match	jamOctalError	contained "0\o*[89]\d*"
+syn case match
+
+syntax match	jamOperator1	"\#\#"
+syntax match	jamOperator6	"/"
+syntax match	jamOperator2	"+"
+syntax match	jamOperator3	"*"
+syntax match	jamOperator4	"-"
+syntax match	jamOperator5	"|"
+syntax match	jamOperator6	"/"
+syntax match	jamOperator7	"&"
+syntax match	jamOperator8	":"
+syntax match	jamOperator9	"<"
+syntax match	jamOperator10	">"
+syntax match	jamOperator11	"!"
+syntax match	jamOperator12	"%"
+syntax match	jamOperator13	"^"
+syntax match	jamOperator14	"@"
+
+syntax match	jamCommentL	"//"
+
+if exists("jam_comment_strings")
+  " A comment can contain jamString, jamCharacter and jamNumber.
+  " But a "*/" inside a jamString in a jamComment DOES end the comment!  So we
+  " need to use a special type of jamString: jamCommentString, which also ends on
+  " "*/", and sees a "*" at the start of the line as comment again.
+  " Unfortunately this doesn't very well work for // type of comments :-(
+  syntax match	jamCommentSkip	contained "^\s*\*\($\|\s\+\)"
+  syntax region jamCommentString	contained start=+L\="+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=jamSpecial,jamCommentSkip
+  syntax region jamComment2String	contained start=+L\="+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=jamSpecial
+  syntax region  jamCommentL	start="//" skip="\\$" end="$" keepend contains=@jamCommentGroup,jamComment2String,jamCharacter,jamNumbersCom,jamSpaceError
+  syntax region  jamCommentL2		  start="^#\|^\s\+\#" skip="\\$" end="$" keepend contains=@jamCommentGroup,jamComment2String,jamCharacter,jamNumbersCom,jamSpaceError
+  syntax region jamComment	start="/\*" end="\*/" contains=@jamCommentGroup,jamCommentString,jamCharacter,jamNumbersCom,jamSpaceError
+else
+  syn region	jamCommentL	start="//" skip="\\$" end="$" keepend contains=@jamCommentGroup,jamSpaceError
+  syn region	jamCommentL2      start="^\#\|^\s\+\#" skip="\\$" end="$" keepend contains=@jamCommentGroup,jamSpaceError
+  syn region	jamComment	start="/\*" end="\*/" contains=@jamCommentGroup,jamSpaceError
+endif
+
+" keep a // comment separately, it terminates a preproc. conditional
+syntax match	jamCommentError	"\*/"
+
+syntax match    jamOperator3Error   "*/"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link jamCommentL		jamComment
+hi def link jamCommentL2		jamComment
+hi def link jamOperator3Error	jamError
+hi def link jamConditional	Conditional
+hi def link jamRepeat		Repeat
+hi def link jamCharacter		Character
+hi def link jamSpecialCharacter	jamSpecial
+hi def link jamNumber		Number
+hi def link jamParenError	jamError
+hi def link jamErrInParen	jamError
+hi def link jamErrInBracket	jamError
+hi def link jamCommentError	jamError
+hi def link jamSpaceError	jamError
+hi def link jamSpecialError	jamError
+hi def link jamOperator1		jamOperator
+hi def link jamOperator2		jamOperator
+hi def link jamOperator3		jamOperator
+hi def link jamOperator4		jamOperator
+hi def link jamOperator5		jamOperator
+hi def link jamOperator6		jamOperator
+hi def link jamOperator7		jamOperator
+hi def link jamOperator8		jamOperator
+hi def link jamOperator9		jamOperator
+hi def link jamOperator10	jamOperator
+hi def link jamOperator11	jamOperator
+hi def link jamOperator12	jamOperator
+hi def link jamOperator13	jamOperator
+hi def link jamOperator14	jamOperator
+hi def link jamError		Error
+hi def link jamStatement		Statement
+hi def link jamPreCondit		PreCondit
+hi def link jamCommentError	jamError
+hi def link jamCommentString	jamString
+hi def link jamComment2String	jamString
+hi def link jamCommentSkip	jamComment
+hi def link jamString		String
+hi def link jamComment		Comment
+hi def link jamSpecial		SpecialChar
+hi def link jamTodo		Todo
+hi def link jamCppSkip		jamCppOut
+hi def link jamCppOut2		jamCppOut
+hi def link jamCppOut		Comment
+hi def link jamDBState1		Identifier
+hi def link jamDBState2		Identifier
+hi def link jamSQLState1		jamSQL
+hi def link jamSQLState2		jamSQL
+hi def link jamLibFunc1		jamLibFunc
+hi def link jamLibFunc2		jamLibFunc
+hi def link jamLibFunc3		jamLibFunc
+hi def link jamLibFunc4		jamLibFunc
+hi def link jamLibFunc5		jamLibFunc
+hi def link jamLibFunc6		jamLibFunc
+hi def link jamLibFunc7		jamLibFunc
+hi def link jamLibFunc8		jamLibFunc
+hi def link jamLibFunc9		jamLibFunc
+hi def link jamVariable1		jamVariablen
+hi def link jamVariable2		jamVariablen
+hi def link jamVariable3		jamVariablen
+hi def link jamVariable4		jamVariablen
+hi def link jamVariable5		jamVariablen
+hi def link jamVariable6		jamVariablen
+hi def link jamVariable7		jamVariablen
+hi def link jamVariable8		jamVariablen
+hi def link jamVariable9		jamVariablen
+hi def link jamVariable10	jamVariablen
+hi def link jamVariablen		Constant
+hi def link jamSQL		Type
+hi def link jamLibFunc		PreProc
+hi def link jamOperator		Special
+
+
+let b:current_syntax = "jam"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/java.vim b/syntax/java.vim
new file mode 100644
index 000000000..cd1bf69e1
--- /dev/null
+++ b/syntax/java.vim
@@ -0,0 +1,359 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'java') == -1
+
+" Vim syntax file
+" Language:	Java
+" Maintainer:	Claudio Fleiner <claudio@fleiner.com>
+" URL:          https://github.com/fleiner/vim/blob/master/runtime/syntax/java.vim
+" Last Change:	2018 July 26
+
+" Please check :help java.vim for comments on some of the options available.
+
+" quit when a syntax file was already loaded
+if !exists("main_syntax")
+  if exists("b:current_syntax")
+    finish
+  endif
+  " we define it here so that included files can test for it
+  let main_syntax='java'
+  syn region javaFold start="{" end="}" transparent fold
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" some characters that cannot be in a java program (outside a string)
+syn match javaError "[\\@`]"
+syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|\*\/"
+
+syn match javaOK "\.\.\."
+
+" use separate name so that it can be deleted in javacc.vim
+syn match   javaError2 "#\|=<"
+hi def link javaError2 javaError
+
+" keyword definitions
+syn keyword javaExternal	native package
+syn match javaExternal		"\<import\>\(\s\+static\>\)\?"
+syn keyword javaError		goto const
+syn keyword javaConditional	if else switch
+syn keyword javaRepeat		while for do
+syn keyword javaBoolean		true false
+syn keyword javaConstant	null
+syn keyword javaTypedef		this super
+syn keyword javaOperator	var new instanceof
+syn keyword javaType		boolean char byte short int long float double
+syn keyword javaType		void
+syn keyword javaStatement	return
+syn keyword javaStorageClass	static synchronized transient volatile final strictfp serializable
+syn keyword javaExceptions	throw try catch finally
+syn keyword javaAssert		assert
+syn keyword javaMethodDecl	synchronized throws
+syn keyword javaClassDecl	extends implements interface
+" to differentiate the keyword class from MyClass.class we use a match here
+syn match   javaTypedef		"\.\s*\<class\>"ms=s+1
+syn keyword javaClassDecl	enum
+syn match   javaClassDecl	"^class\>"
+syn match   javaClassDecl	"[^.]\s*\<class\>"ms=s+1
+syn match   javaAnnotation	"@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>" contains=javaString
+syn match   javaClassDecl	"@interface\>"
+syn keyword javaBranch		break continue nextgroup=javaUserLabelRef skipwhite
+syn match   javaUserLabelRef	"\k\+" contained
+syn match   javaVarArg		"\.\.\."
+syn keyword javaScopeDecl	public protected private abstract
+
+" Java Modules(Since Java 9, for "module-info.java" file)
+if fnamemodify(bufname("%"), ":t") == "module-info.java"
+    syn keyword javaModuleStorageClass	module transitive
+    syn keyword javaModuleStmt		open requires exports opens uses provides
+    syn keyword javaModuleExternal	to with
+    syn cluster javaTop add=javaModuleStorageClass,javaModuleStmt,javaModuleExternal
+endif
+
+if exists("java_highlight_java_lang_ids")
+  let java_highlight_all=1
+endif
+if exists("java_highlight_all")  || exists("java_highlight_java")  || exists("java_highlight_java_lang")
+  " java.lang.*
+  syn match javaLangClass "\<System\>"
+  syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException
+  syn cluster javaTop add=javaR_JavaLang
+  syn cluster javaClasses add=javaR_JavaLang
+  hi def link javaR_JavaLang javaR_Java
+  syn keyword javaC_JavaLang Process RuntimePermission StringKeySet CharacterData01 Class ThreadLocal ThreadLocalMap CharacterData0E Package Character StringCoding Long ProcessImpl ProcessEnvironment Short AssertionStatusDirectives 1PackageInfoProxy UnicodeBlock InheritableThreadLocal AbstractStringBuilder StringEnvironment ClassLoader ConditionalSpecialCasing CharacterDataPrivateUse StringBuffer StringDecoder Entry StringEntry WrappedHook StringBuilder StrictMath State ThreadGroup Runtime CharacterData02 MethodArray Object CharacterDataUndefined Integer Gate Boolean Enum Variable Subset StringEncoder Void Terminator CharsetSD IntegerCache CharacterCache Byte CharsetSE Thread SystemClassLoaderAction CharacterDataLatin1 StringValues StackTraceElement Shutdown ShortCache String ConverterSD ByteCache Lock EnclosingMethodInfo Math Float Value Double SecurityManager LongCache ProcessBuilder StringEntrySet Compiler Number UNIXProcess ConverterSE ExternalData CaseInsensitiveComparator CharacterData00 NativeLibrary
+  syn cluster javaTop add=javaC_JavaLang
+  syn cluster javaClasses add=javaC_JavaLang
+  hi def link javaC_JavaLang javaC_Java
+  syn keyword javaE_JavaLang IncompatibleClassChangeError InternalError UnknownError ClassCircularityError AssertionError ThreadDeath IllegalAccessError NoClassDefFoundError ClassFormatError UnsupportedClassVersionError NoSuchFieldError VerifyError ExceptionInInitializerError InstantiationError LinkageError NoSuchMethodError Error UnsatisfiedLinkError StackOverflowError AbstractMethodError VirtualMachineError OutOfMemoryError
+  syn cluster javaTop add=javaE_JavaLang
+  syn cluster javaClasses add=javaE_JavaLang
+  hi def link javaE_JavaLang javaE_Java
+  syn keyword javaX_JavaLang CloneNotSupportedException Exception NoSuchMethodException IllegalAccessException NoSuchFieldException Throwable InterruptedException ClassNotFoundException InstantiationException
+  syn cluster javaTop add=javaX_JavaLang
+  syn cluster javaClasses add=javaX_JavaLang
+  hi def link javaX_JavaLang javaX_Java
+
+  hi def link javaR_Java javaR_
+  hi def link javaC_Java javaC_
+  hi def link javaE_Java javaE_
+  hi def link javaX_Java javaX_
+  hi def link javaX_		     javaExceptions
+  hi def link javaR_		     javaExceptions
+  hi def link javaE_		     javaExceptions
+  hi def link javaC_		     javaConstant
+
+  syn keyword javaLangObject clone equals finalize getClass hashCode
+  syn keyword javaLangObject notify notifyAll toString wait
+  hi def link javaLangObject		     javaConstant
+  syn cluster javaTop add=javaLangObject
+endif
+
+if filereadable(expand("<sfile>:p:h")."/javaid.vim")
+  source <sfile>:p:h/javaid.vim
+endif
+
+if exists("java_space_errors")
+  if !exists("java_no_trail_space_error")
+    syn match	javaSpaceError	"\s\+$"
+  endif
+  if !exists("java_no_tab_space_error")
+    syn match	javaSpaceError	" \+\t"me=e-1
+  endif
+endif
+
+syn region  javaLabelRegion	transparent matchgroup=javaLabel start="\<case\>" matchgroup=NONE end=":" contains=javaNumber,javaCharacter,javaString
+syn match   javaUserLabel	"^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=javaLabel
+syn keyword javaLabel		default
+
+" highlighting C++ keywords as errors removed, too many people find it
+" annoying.  Was: if !exists("java_allow_cpp_keywords")
+
+" The following cluster contains all java groups except the contained ones
+syn cluster javaTop add=javaExternal,javaError,javaError,javaBranch,javaLabelRegion,javaLabel,javaConditional,javaRepeat,javaBoolean,javaConstant,javaTypedef,javaOperator,javaType,javaType,javaStatement,javaStorageClass,javaAssert,javaExceptions,javaMethodDecl,javaClassDecl,javaClassDecl,javaClassDecl,javaScopeDecl,javaError,javaError2,javaUserLabel,javaLangObject,javaAnnotation,javaVarArg
+
+
+" Comments
+syn keyword javaTodo		 contained TODO FIXME XXX
+if exists("java_comment_strings")
+  syn region  javaCommentString    contained start=+"+ end=+"+ end=+$+ end=+\*/+me=s-1,he=s-1 contains=javaSpecial,javaCommentStar,javaSpecialChar,@Spell
+  syn region  javaComment2String   contained start=+"+	end=+$\|"+  contains=javaSpecial,javaSpecialChar,@Spell
+  syn match   javaCommentCharacter contained "'\\[^']\{1,6\}'" contains=javaSpecialChar
+  syn match   javaCommentCharacter contained "'\\''" contains=javaSpecialChar
+  syn match   javaCommentCharacter contained "'[^\\]'"
+  syn cluster javaCommentSpecial add=javaCommentString,javaCommentCharacter,javaNumber
+  syn cluster javaCommentSpecial2 add=javaComment2String,javaCommentCharacter,javaNumber
+endif
+syn region  javaComment		 start="/\*"  end="\*/" contains=@javaCommentSpecial,javaTodo,@Spell
+syn match   javaCommentStar	 contained "^\s*\*[^/]"me=e-1
+syn match   javaCommentStar	 contained "^\s*\*$"
+syn match   javaLineComment	 "//.*" contains=@javaCommentSpecial2,javaTodo,@Spell
+hi def link javaCommentString javaString
+hi def link javaComment2String javaString
+hi def link javaCommentCharacter javaCharacter
+
+syn cluster javaTop add=javaComment,javaLineComment
+
+if !exists("java_ignore_javadoc") && main_syntax != 'jsp'
+  syntax case ignore
+  " syntax coloring for javadoc comments (HTML)
+  syntax include @javaHtml <sfile>:p:h/html.vim
+  unlet b:current_syntax
+  " HTML enables spell checking for all text that is not in a syntax item. This
+  " is wrong for Java (all identifiers would be spell-checked), so it's undone
+  " here.
+  syntax spell default
+
+  syn region  javaDocComment	start="/\*\*"  end="\*/" keepend contains=javaCommentTitle,@javaHtml,javaDocTags,javaDocSeeTag,javaTodo,@Spell
+  syn region  javaCommentTitle	contained matchgroup=javaDocComment start="/\*\*"   matchgroup=javaCommentTitle keepend end="\.$" end="\.[ \t\r<&]"me=e-1 end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1 contains=@javaHtml,javaCommentStar,javaTodo,@Spell,javaDocTags,javaDocSeeTag
+
+  syn region javaDocTags	 contained start="{@\(code\|link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}"
+  syn match  javaDocTags	 contained "@\(param\|exception\|throws\|since\)\s\+\S\+" contains=javaDocParam
+  syn match  javaDocParam	 contained "\s\S\+"
+  syn match  javaDocTags	 contained "@\(version\|author\|return\|deprecated\|serial\|serialField\|serialData\)\>"
+  syn region javaDocSeeTag	 contained matchgroup=javaDocTags start="@see\s\+" matchgroup=NONE end="\_."re=e-1 contains=javaDocSeeTagParam
+  syn match  javaDocSeeTagParam  contained @"\_[^"]\+"\|<a\s\+\_.\{-}</a>\|\(\k\|\.\)*\(#\k\+\((\_[^)]\+)\)\=\)\=@ extend
+  syntax case match
+endif
+
+" match the special comment /**/
+syn match   javaComment		 "/\*\*/"
+
+" Strings and constants
+syn match   javaSpecialError	 contained "\\."
+syn match   javaSpecialCharError contained "[^']"
+syn match   javaSpecialChar	 contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\)"
+syn region  javaString		start=+"+ end=+"+ end=+$+ contains=javaSpecialChar,javaSpecialError,@Spell
+" next line disabled, it can cause a crash for a long line
+"syn match   javaStringError	  +"\([^"\\]\|\\.\)*$+
+syn match   javaCharacter	 "'[^']*'" contains=javaSpecialChar,javaSpecialCharError
+syn match   javaCharacter	 "'\\''" contains=javaSpecialChar
+syn match   javaCharacter	 "'[^\\]'"
+syn match   javaNumber		 "\<\(0[bB][0-1]\+\|0[0-7]*\|0[xX]\x\+\|\d\(\d\|_\d\)*\)[lL]\=\>"
+syn match   javaNumber		 "\(\<\d\(\d\|_\d\)*\.\(\d\(\d\|_\d\)*\)\=\|\.\d\(\d\|_\d\)*\)\([eE][-+]\=\d\(\d\|_\d\)*\)\=[fFdD]\="
+syn match   javaNumber		 "\<\d\(\d\|_\d\)*[eE][-+]\=\d\(\d\|_\d\)*[fFdD]\=\>"
+syn match   javaNumber		 "\<\d\(\d\|_\d\)*\([eE][-+]\=\d\(\d\|_\d\)*\)\=[fFdD]\>"
+
+" unicode characters
+syn match   javaSpecial "\\u\d\{4\}"
+
+syn cluster javaTop add=javaString,javaCharacter,javaNumber,javaSpecial,javaStringError
+
+if exists("java_highlight_functions")
+  if java_highlight_functions == "indent"
+    syn match  javaFuncDef "^\(\t\| \{8\}\)[_$a-zA-Z][_$a-zA-Z0-9_. \[\]<>]*([^-+*/]*)" contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses,javaAnnotation
+    syn region javaFuncDef start=+^\(\t\| \{8\}\)[$_a-zA-Z][$_a-zA-Z0-9_. \[\]<>]*([^-+*/]*,\s*+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses,javaAnnotation
+    syn match  javaFuncDef "^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]<>]*([^-+*/]*)" contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses,javaAnnotation
+    syn region javaFuncDef start=+^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]<>]*([^-+*/]*,\s*+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses,javaAnnotation
+  else
+    " This line catches method declarations at any indentation>0, but it assumes
+    " two things:
+    "	1. class names are always capitalized (ie: Button)
+    "	2. method names are never capitalized (except constructors, of course)
+    "syn region javaFuncDef start=+^\s\+\(\(public\|protected\|private\|static\|abstract\|final\|native\|synchronized\)\s\+\)*\(\(void\|boolean\|char\|byte\|short\|int\|long\|float\|double\|\([A-Za-z_][A-Za-z0-9_$]*\.\)*[A-Z][A-Za-z0-9_$]*\)\(<[^>]*>\)\=\(\[\]\)*\s\+[a-z][A-Za-z0-9_$]*\|[A-Z][A-Za-z0-9_$]*\)\s*([^0-9]+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,javaComment,javaLineComment,@javaClasses
+    syn region javaFuncDef start=+^\s\+\(\(public\|protected\|private\|static\|abstract\|final\|native\|synchronized\)\s\+\)*\(<.*>\s\+\)\?\(\(void\|boolean\|char\|byte\|short\|int\|long\|float\|double\|\([A-Za-z_][A-Za-z0-9_$]*\.\)*[A-Z][A-Za-z0-9_$]*\)\(<[^(){}]*>\)\=\(\[\]\)*\s\+[a-z][A-Za-z0-9_$]*\|[A-Z][A-Za-z0-9_$]*\)\s*(+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,javaComment,javaLineComment,@javaClasses,javaAnnotation
+  endif
+  syn match javaLambdaDef "[a-zA-Z_][a-zA-Z0-9_]*\s*->"
+  syn match  javaBraces  "[{}]"
+  syn cluster javaTop add=javaFuncDef,javaBraces,javaLambdaDef
+endif
+
+if exists("java_highlight_debug")
+
+  " Strings and constants
+  syn match   javaDebugSpecial		contained "\\\d\d\d\|\\."
+  syn region  javaDebugString		contained start=+"+  end=+"+  contains=javaDebugSpecial
+  syn match   javaDebugStringError	+"\([^"\\]\|\\.\)*$+
+  syn match   javaDebugCharacter	contained "'[^\\]'"
+  syn match   javaDebugSpecialCharacter contained "'\\.'"
+  syn match   javaDebugSpecialCharacter contained "'\\''"
+  syn match   javaDebugNumber		contained "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
+  syn match   javaDebugNumber		contained "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
+  syn match   javaDebugNumber		contained "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
+  syn match   javaDebugNumber		contained "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
+  syn keyword javaDebugBoolean		contained true false
+  syn keyword javaDebugType		contained null this super
+  syn region javaDebugParen  start=+(+ end=+)+ contained contains=javaDebug.*,javaDebugParen
+
+  " to make this work you must define the highlighting for these groups
+  syn match javaDebug "\<System\.\(out\|err\)\.print\(ln\)*\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
+  syn match javaDebug "\<p\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
+  syn match javaDebug "[A-Za-z][a-zA-Z0-9_]*\.printStackTrace\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
+  syn match javaDebug "\<trace[SL]\=\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
+
+  syn cluster javaTop add=javaDebug
+
+  hi def link javaDebug		 Debug
+  hi def link javaDebugString		 DebugString
+  hi def link javaDebugStringError	 javaError
+  hi def link javaDebugType		 DebugType
+  hi def link javaDebugBoolean		 DebugBoolean
+  hi def link javaDebugNumber		 Debug
+  hi def link javaDebugSpecial		 DebugSpecial
+  hi def link javaDebugSpecialCharacter DebugSpecial
+  hi def link javaDebugCharacter	 DebugString
+  hi def link javaDebugParen		 Debug
+
+  hi def link DebugString		 String
+  hi def link DebugSpecial		 Special
+  hi def link DebugBoolean		 Boolean
+  hi def link DebugType		 Type
+endif
+
+if exists("java_mark_braces_in_parens_as_errors")
+  syn match javaInParen		 contained "[{}]"
+  hi def link javaInParen	javaError
+  syn cluster javaTop add=javaInParen
+endif
+
+" catch errors caused by wrong parenthesis
+syn region  javaParenT	transparent matchgroup=javaParen  start="(" end=")" contains=@javaTop,javaParenT1
+syn region  javaParenT1 transparent matchgroup=javaParen1 start="(" end=")" contains=@javaTop,javaParenT2 contained
+syn region  javaParenT2 transparent matchgroup=javaParen2 start="(" end=")" contains=@javaTop,javaParenT  contained
+syn match   javaParenError	 ")"
+" catch errors caused by wrong square parenthesis
+syn region  javaParenT	transparent matchgroup=javaParen  start="\[" end="\]" contains=@javaTop,javaParenT1
+syn region  javaParenT1 transparent matchgroup=javaParen1 start="\[" end="\]" contains=@javaTop,javaParenT2 contained
+syn region  javaParenT2 transparent matchgroup=javaParen2 start="\[" end="\]" contains=@javaTop,javaParenT  contained
+syn match   javaParenError	 "\]"
+
+hi def link javaParenError	javaError
+
+if exists("java_highlight_functions")
+   syn match javaLambdaDef "([a-zA-Z0-9_<>\[\], \t]*)\s*->"
+   " needs to be defined after the parenthesis error catcher to work
+endif
+
+if !exists("java_minlines")
+  let java_minlines = 10
+endif
+exec "syn sync ccomment javaComment minlines=" . java_minlines
+
+" The default highlighting.
+hi def link javaLambdaDef		Function
+hi def link javaFuncDef		Function
+hi def link javaVarArg			Function
+hi def link javaBraces			Function
+hi def link javaBranch			Conditional
+hi def link javaUserLabelRef		javaUserLabel
+hi def link javaLabel			Label
+hi def link javaUserLabel		Label
+hi def link javaConditional		Conditional
+hi def link javaRepeat			Repeat
+hi def link javaExceptions		Exception
+hi def link javaAssert			Statement
+hi def link javaStorageClass		StorageClass
+hi def link javaMethodDecl		javaStorageClass
+hi def link javaClassDecl		javaStorageClass
+hi def link javaScopeDecl		javaStorageClass
+
+hi def link javaBoolean		Boolean
+hi def link javaSpecial		Special
+hi def link javaSpecialError		Error
+hi def link javaSpecialCharError	Error
+hi def link javaString			String
+hi def link javaCharacter		Character
+hi def link javaSpecialChar		SpecialChar
+hi def link javaNumber			Number
+hi def link javaError			Error
+hi def link javaStringError		Error
+hi def link javaStatement		Statement
+hi def link javaOperator		Operator
+hi def link javaComment		Comment
+hi def link javaDocComment		Comment
+hi def link javaLineComment		Comment
+hi def link javaConstant		Constant
+hi def link javaTypedef		Typedef
+hi def link javaTodo			Todo
+hi def link javaAnnotation		PreProc
+
+hi def link javaCommentTitle		SpecialComment
+hi def link javaDocTags		Special
+hi def link javaDocParam		Function
+hi def link javaDocSeeTagParam		Function
+hi def link javaCommentStar		javaComment
+
+hi def link javaType			Type
+hi def link javaExternal		Include
+
+hi def link htmlComment		Special
+hi def link htmlCommentPart		Special
+hi def link javaSpaceError		Error
+
+if fnamemodify(bufname("%"), ":t") == "module-info.java"
+    hi def link javaModuleStorageClass	StorageClass
+    hi def link javaModuleStmt		Statement
+    hi def link javaModuleExternal	Include
+endif
+
+let b:current_syntax = "java"
+
+if main_syntax == 'java'
+  unlet main_syntax
+endif
+
+let b:spell_options="contained"
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8
+
+endif
diff --git a/syntax/javacc.vim b/syntax/javacc.vim
new file mode 100644
index 000000000..5d932bae1
--- /dev/null
+++ b/syntax/javacc.vim
@@ -0,0 +1,69 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javacc') == -1
+
+" Vim syntax file
+" Language:	JavaCC, a Java Compiler Compiler written by JavaSoft
+" Maintainer:	Claudio Fleiner <claudio@fleiner.com>
+" URL:		http://www.fleiner.com/vim/syntax/javacc.vim
+" Last Change:	2012 Oct 05
+
+" Uses java.vim, and adds a few special things for JavaCC Parser files.
+" Those files usually have the extension  *.jj
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" source the java.vim file
+runtime! syntax/java.vim
+unlet b:current_syntax
+
+"remove catching errors caused by wrong parenthesis (does not work in javacc
+"files) (first define them in case they have not been defined in java)
+syn match	javaParen "--"
+syn match	javaParenError "--"
+syn match	javaInParen "--"
+syn match	javaError2 "--"
+syn clear	javaParen
+syn clear	javaParenError
+syn clear	javaInParen
+syn clear	javaError2
+
+" remove function definitions (they look different) (first define in
+" in case it was not defined in java.vim)
+"syn match javaFuncDef "--"
+syn clear javaFuncDef
+syn match javaFuncDef "[$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*)[ \t]*:" contains=javaType
+
+syn keyword javaccPackages options DEBUG_PARSER DEBUG_LOOKAHEAD DEBUG_TOKEN_MANAGER
+syn keyword javaccPackages COMMON_TOKEN_ACTION IGNORE_CASE CHOICE_AMBIGUITY_CHECK
+syn keyword javaccPackages OTHER_AMBIGUITY_CHECK STATIC LOOKAHEAD ERROR_REPORTING
+syn keyword javaccPackages USER_TOKEN_MANAGER  USER_CHAR_STREAM JAVA_UNICODE_ESCAPE
+syn keyword javaccPackages UNICODE_INPUT JDK_VERSION
+syn match javaccPackages "PARSER_END([^)]*)"
+syn match javaccPackages "PARSER_BEGIN([^)]*)"
+syn match javaccSpecToken "<EOF>"
+" the dot is necessary as otherwise it will be matched as a keyword.
+syn match javaccSpecToken ".LOOKAHEAD("ms=s+1,me=e-1
+syn match javaccToken "<[^> \t]*>"
+syn keyword javaccActionToken TOKEN SKIP MORE SPECIAL_TOKEN
+syn keyword javaccError DEBUG IGNORE_IN_BNF
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+hi def link javaccSpecToken Statement
+hi def link javaccActionToken Type
+hi def link javaccPackages javaScopeDecl
+hi def link javaccToken String
+hi def link javaccError Error
+
+let b:current_syntax = "javacc"
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8
+
+endif
diff --git a/syntax/jess.vim b/syntax/jess.vim
new file mode 100644
index 000000000..5a15286dc
--- /dev/null
+++ b/syntax/jess.vim
@@ -0,0 +1,148 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jess') == -1
+
+" Vim syntax file
+" Language:	Jess
+" Maintainer:	Paul Baleme <pbaleme@mail.com>
+" Last change:	September 14, 2000
+" Based on lisp.vim by : Dr. Charles E. Campbell, Jr.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword=42,43,45,47-58,60-62,64-90,97-122,_
+
+" Lists
+syn match	jessSymbol	![^()'`,"; \t]\+!	contained
+syn match	jessBarSymbol	!|..\{-}|!		contained
+syn region	jessList matchgroup=Delimiter start="(" skip="|.\{-}|" matchgroup=Delimiter end=")" contains=jessAtom,jessBQList,jessConcat,jessDeclaration,jessList,jessNumber,jessSymbol,jessSpecial,jessFunc,jessKey,jessAtomMark,jessString,jessComment,jessBarSymbol,jessAtomBarSymbol,jessVar
+syn region	jessBQList	matchgroup=PreProc   start="`("	skip="|.\{-}|" matchgroup=PreProc   end=")" contains=jessAtom,jessBQList,jessConcat,jessDeclaration,jessList,jessNumber,jessSpecial,jessSymbol,jessFunc,jessKey,jessVar,jessAtomMark,jessString,jessComment,jessBarSymbol,jessAtomBarSymbol
+
+" Atoms
+syn match	jessAtomMark	"'"
+syn match	jessAtom	"'("me=e-1	contains=jessAtomMark	nextgroup=jessAtomList
+syn match	jessAtom	"'[^ \t()]\+"	contains=jessAtomMark
+syn match	jessAtomBarSymbol	!'|..\{-}|!	contains=jessAtomMark
+syn region	jessAtom	start=+'"+	skip=+\\"+ end=+"+
+syn region	jessAtomList	matchgroup=Special start="("	skip="|.\{-}|" matchgroup=Special end=")"	contained contains=jessAtomList,jessAtomNmbr0,jessString,jessComment,jessAtomBarSymbol
+syn match	jessAtomNmbr	"\<[0-9]\+"			contained
+
+" Standard jess Functions and Macros
+syn keyword jessFunc    *   +   **	-   /   <   >   <=  >=  <>  =
+syn keyword jessFunc    long	    longp
+syn keyword jessFunc    abs	    agenda	      and
+syn keyword jessFunc    assert	    assert-string       bag
+syn keyword jessFunc    batch	    bind	      bit-and
+syn keyword jessFunc    bit-not	    bit-or	      bload
+syn keyword jessFunc    bsave	    build	      call
+syn keyword jessFunc    clear	    clear-storage       close
+syn keyword jessFunc    complement$     context	      count-query-results
+syn keyword jessFunc    create$
+syn keyword jessFunc    delete$	    div
+syn keyword jessFunc    do-backward-chaining	      e
+syn keyword jessFunc    engine	    eq	      eq*
+syn keyword jessFunc    eval	    evenp	      exit
+syn keyword jessFunc    exp	    explode$	      external-addressp
+syn keyword jessFunc    fact-slot-value facts	      fetch
+syn keyword jessFunc    first$	    float	      floatp
+syn keyword jessFunc    foreach	    format	      gensym*
+syn keyword jessFunc    get	    get-fact-duplication
+syn keyword jessFunc    get-member	    get-multithreaded-io
+syn keyword jessFunc    get-reset-globals	      get-salience-evaluation
+syn keyword jessFunc    halt	    if	      implode$
+syn keyword jessFunc    import	    insert$	      integer
+syn keyword jessFunc    integerp	    intersection$       jess-version-number
+syn keyword jessFunc    jess-version-string	      length$
+syn keyword jessFunc    lexemep	    list-function$      load-facts
+syn keyword jessFunc    load-function   load-package	      log
+syn keyword jessFunc    log10	    lowcase	      matches
+syn keyword jessFunc    max	    member$	      min
+syn keyword jessFunc    mod	    modify	      multifieldp
+syn keyword jessFunc    neq	    new	      not
+syn keyword jessFunc    nth$	    numberp	      oddp
+syn keyword jessFunc    open	    or	      pi
+syn keyword jessFunc    ppdeffunction   ppdefglobal	      ddpefrule
+syn keyword jessFunc    printout	    random	      read
+syn keyword jessFunc    readline	    replace$	      reset
+syn keyword jessFunc    rest$	    retract	      retract-string
+syn keyword jessFunc    return	    round	      rules
+syn keyword jessFunc    run	    run-query	      run-until-halt
+syn keyword jessFunc    save-facts	    set	      set-fact-duplication
+syn keyword jessFunc    set-factory     set-member	      set-multithreaded-io
+syn keyword jessFunc    set-node-index-hash	      set-reset-globals
+syn keyword jessFunc    set-salience-evaluation	      set-strategy
+syn keyword jessFunc    setgen	    show-deffacts       show-deftemplates
+syn keyword jessFunc    show-jess-listeners	      socket
+syn keyword jessFunc    sqrt	    store	      str-cat
+syn keyword jessFunc    str-compare     str-index	      str-length
+syn keyword jessFunc    stringp	    sub-string	      subseq$
+syn keyword jessFunc    subsetp	    sym-cat	      symbolp
+syn keyword jessFunc    system	    throw	      time
+syn keyword jessFunc    try	    undefadvice	      undefinstance
+syn keyword jessFunc    undefrule	    union$	      unwatch
+syn keyword jessFunc    upcase	    view	      watch
+syn keyword jessFunc    while
+syn match   jessFunc	"\<c[ad]\+r\>"
+
+" jess Keywords (modifiers)
+syn keyword jessKey	    defglobal	  deffunction	    defrule
+syn keyword jessKey	    deffacts
+syn keyword jessKey	    defadvice	  defclass	    definstance
+
+" Standard jess Variables
+syn region	jessVar	start="?"	end="[^a-zA-Z0-9]"me=e-1
+
+" Strings
+syn region	jessString	start=+"+	skip=+\\"+ end=+"+
+
+" Shared with Declarations, Macros, Functions
+"syn keyword	jessDeclaration
+
+syn match	jessNumber	"[0-9]\+"
+
+syn match	jessSpecial	"\*[a-zA-Z_][a-zA-Z_0-9-]*\*"
+syn match	jessSpecial	!#|[^()'`,"; \t]\+|#!
+syn match	jessSpecial	!#x[0-9a-fA-F]\+!
+syn match	jessSpecial	!#o[0-7]\+!
+syn match	jessSpecial	!#b[01]\+!
+syn match	jessSpecial	!#\\[ -\~]!
+syn match	jessSpecial	!#[':][^()'`,"; \t]\+!
+syn match	jessSpecial	!#([^()'`,"; \t]\+)!
+
+syn match	jessConcat	"\s\.\s"
+syntax match	jessParenError	")"
+
+" Comments
+syn match	jessComment	";.*$"
+
+" synchronization
+syn sync lines=100
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link jessAtomNmbr	jessNumber
+hi def link jessAtomMark	jessMark
+
+hi def link jessAtom		Identifier
+hi def link jessAtomBarSymbol	Special
+hi def link jessBarSymbol	Special
+hi def link jessComment	Comment
+hi def link jessConcat	Statement
+hi def link jessDeclaration	Statement
+hi def link jessFunc		Statement
+hi def link jessKey		Type
+hi def link jessMark		Delimiter
+hi def link jessNumber	Number
+hi def link jessParenError	Error
+hi def link jessSpecial	Type
+hi def link jessString	String
+hi def link jessVar		Identifier
+
+
+let b:current_syntax = "jess"
+
+" vim: ts=18
+
+endif
diff --git a/syntax/jgraph.vim b/syntax/jgraph.vim
new file mode 100644
index 000000000..5bc5caaac
--- /dev/null
+++ b/syntax/jgraph.vim
@@ -0,0 +1,49 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jgraph') == -1
+
+" Vim syntax file
+" Language:	jgraph (graph plotting utility)
+" Maintainer:	Jonas Munsin jmunsin@iki.fi
+" Last Change:	2003 May 04
+" this syntax file is not yet complete
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+" comments
+syn region	jgraphComment	start="(\* " end=" \*)"
+
+syn keyword	jgraphCmd	newcurve newgraph marktype
+syn keyword	jgraphType	xaxis yaxis
+
+syn keyword	jgraphType	circle box diamond triangle x cross ellipse
+syn keyword	jgraphType	xbar ybar text postscript eps none general
+
+syn keyword	jgraphType	solid dotted dashed longdash dotdash dodotdash
+syn keyword	jgraphType	dotdotdashdash pts
+
+"integer number, or floating point number without a dot. - or no -
+syn match  jgraphNumber		 "\<-\=\d\+\>"
+"floating point number, with dot - or no -
+syn match  jgraphNumber		 "\<-\=\d\+\.\d*\>"
+"floating point number, starting with a dot - or no -
+syn match  jgraphNumber		 "\-\=\.\d\+\>"
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link jgraphComment	Comment
+hi def link jgraphCmd	Identifier
+hi def link jgraphType	Type
+hi def link jgraphNumber	Number
+
+
+
+let b:current_syntax = "jgraph"
+
+endif
diff --git a/syntax/jovial.vim b/syntax/jovial.vim
new file mode 100644
index 000000000..a3c31f6f1
--- /dev/null
+++ b/syntax/jovial.vim
@@ -0,0 +1,114 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jovial') == -1
+
+" Vim syntax file
+" Language: JOVIAL J73
+" Version: 1.2
+" Maintainer: Paul McGinnis <paulmcg@aol.com>
+" Last Change: 2011/06/17
+" Remark: Based on MIL-STD-1589C for JOVIAL J73 language
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+syn keyword jovialTodo TODO FIXME XXX contained
+
+" JOVIAL beads - first digit is number of bits, [0-9A-V] is the bit value
+" representing 0-31 (for 5 bits on the bead)
+syn match jovialBitConstant "[1-5]B'[0-9A-V]'"
+
+syn match jovialNumber "\<\d\+\>"
+
+syn match jovialFloat "\d\+E[-+]\=\d\+"
+syn match jovialFloat "\d\+\.\d*\(E[-+]\=\d\+\)\="
+syn match jovialFloat "\.\d\+\(E[-+]\=\d\+\)\="
+
+syn region jovialComment start=/"/ end=/"/ contains=jovialTodo
+syn region jovialComment start=/%/ end=/%/ contains=jovialTodo
+
+" JOVIAL variable names. This rule is to prevent conflicts with strings.
+" Handle special case where ' character can be part of a JOVIAL variable name.
+syn match jovialIdentifier "[A-Z\$][A-Z0-9'\$]\+"
+
+syn region jovialString start="\s*'" skip=/''/ end=/'/ oneline
+
+" JOVIAL compiler directives -- see Section 9 in MIL-STD-1589C
+syn region jovialPreProc start="\s*![A-Z]\+" end=/;/
+
+syn keyword jovialOperator AND OR NOT XOR EQV MOD
+
+" See Section 2.1 in MIL-STD-1589C for data types
+syn keyword jovialType ITEM B C P V
+syn match jovialType "\<S\(,R\|,T\|,Z\)\=\>"
+syn match jovialType "\<U\(,R\|,T\|,Z\)\=\>"
+syn match jovialType "\<F\(,R\|,T\|,Z\)\=\>"
+syn match jovialType "\<A\(,R\|,T\|,Z\)\=\>"
+
+syn keyword jovialStorageClass STATIC CONSTANT PARALLEL BLOCK N M D W
+
+syn keyword jovialStructure TABLE STATUS
+
+syn keyword jovialConstant NULL
+
+syn keyword jovialBoolean FALSE TRUE
+
+syn keyword jovialTypedef TYPE
+
+syn keyword jovialStatement ABORT BEGIN BY BYREF BYRES BYVAL CASE COMPOOL
+syn keyword jovialStatement DEF DEFAULT DEFINE ELSE END EXIT FALLTHRU FOR
+syn keyword jovialStatement GOTO IF INLINE INSTANCE LABEL LIKE OVERLAY POS
+syn keyword jovialStatement PROC PROGRAM REC REF RENT REP RETURN START STOP
+syn keyword jovialStatement TERM THEN WHILE
+
+" JOVIAL extensions, see section 8.2.2 in MIL-STD-1589C
+syn keyword jovialStatement CONDITION ENCAPSULATION EXPORTS FREE HANDLER IN INTERRUPT NEW
+syn keyword jovialStatement PROTECTED READONLY REGISTER SIGNAL TO UPDATE WITH WRITEONLY ZONE
+
+" implementation specific constants and functions, see section 1.4 in MIL-STD-1589C
+syn keyword jovialConstant BITSINBYTE BITSINWORD LOCSINWORD
+syn keyword jovialConstant BYTESINWORD BITSINPOINTER INTPRECISION
+syn keyword jovialConstant FLOATPRECISION FIXEDPRECISION FLOATRADIX
+syn keyword jovialConstant MAXFLOATPRECISION MAXFIXEDPRECISION
+syn keyword jovialConstant MAXINTSIZE MAXBYTES MAXBITS
+syn keyword jovialConstant MAXTABLESIZE MAXSTOP MINSTOP MAXSIGDIGITS
+syn keyword jovialFunction BYTEPOS MAXINT MININT
+syn keyword jovialFunction IMPLFLOATPRECISION IMPLFIXEDPRECISION IMPLINTSIZE
+syn keyword jovialFunction MINSIZE MINFRACTION MINSCALE MINRELPRECISION
+syn keyword jovialFunction MAXFLOAT MINFLOAT FLOATRELPRECISION
+syn keyword jovialFunction FLOATUNDERFLOW MAXFIXED MINFIXED
+
+" JOVIAL built-in functions
+syn keyword jovialFunction LOC NEXT BIT BYTE SHIFTL SHIFTR ABS SGN BITSIZE
+syn keyword jovialFunction BYTESIZE WORDSIZE LBOUND UBOUND NWDSEN FIRST
+syn keyword jovialFunction LAST NENT
+
+" Define the default highlighting.
+hi def link jovialBitConstant Number
+hi def link jovialBoolean Boolean
+hi def link jovialComment Comment
+hi def link jovialConstant Constant
+hi def link jovialFloat Float
+hi def link jovialFunction Function
+" No color highlighting for JOVIAL identifiers. See above,
+" this is to prevent confusion with JOVIAL strings
+"hi def link jovialIdentifier Identifier
+hi def link jovialNumber Number
+hi def link jovialOperator Operator
+hi def link jovialPreProc PreProc
+hi def link jovialStatement Statement
+hi def link jovialStorageClass StorageClass
+hi def link jovialString String
+hi def link jovialStructure Structure
+hi def link jovialTodo Todo
+hi def link jovialType Type
+hi def link jovialTypedef Typedef
+
+
+let b:current_syntax = "jovial"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/jproperties.vim b/syntax/jproperties.vim
new file mode 100644
index 000000000..cbf55597f
--- /dev/null
+++ b/syntax/jproperties.vim
@@ -0,0 +1,139 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jproperties') == -1
+
+" Vim syntax file
+" Language:	Java Properties resource file (*.properties[_*])
+" Maintainer:	Simon Baldwin <simonb@sco.com>
+" Last change:	26th Mar 2000
+
+" =============================================================================
+
+" Optional and tuning variables:
+
+" jproperties_lines
+" -----------------
+"   Set a value for the sync block that we use to find long continuation lines
+"   in properties; the value is already large - if you have larger continuation
+"   sets you may need to increase it further - if not, and you find editing is
+"   slow, reduce the value of jproperties_lines.
+if !exists("jproperties_lines")
+	let jproperties_lines = 256
+endif
+
+" jproperties_strict_syntax
+" -------------------------
+"   Most properties files assign values with "id=value" or "id:value".  But,
+"   strictly, the Java properties parser also allows "id value", "id", and
+"   even more bizarrely "=value", ":value", " value", and so on.  These latter
+"   ones, however, are rarely used, if ever, and handling them in the high-
+"   lighting can obscure errors in the more normal forms.  So, in practice
+"   we take special efforts to pick out only "id=value" and "id:value" forms
+"   by default.  If you want strict compliance, set jproperties_strict_syntax
+"   to non-zero (and good luck).
+if !exists("jproperties_strict_syntax")
+	let jproperties_strict_syntax = 0
+endif
+
+" jproperties_show_messages
+" -------------------------
+"   If this properties file contains messages for use with MessageFormat,
+"   setting a non-zero value will highlight them.  Messages are of the form
+"   "{...}".  Highlighting doesn't go to the pains of picking apart what is
+"   in the format itself - just the basics for now.
+if !exists("jproperties_show_messages")
+	let jproperties_show_messages = 0
+endif
+
+" =============================================================================
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" switch case sensitivity off
+syn case ignore
+
+" set the block
+exec "syn sync lines=" . jproperties_lines
+
+" switch between 'normal' and 'strict' syntax
+if jproperties_strict_syntax != 0
+
+	" an assignment is pretty much any non-empty line at this point,
+	" trying to not think about continuation lines
+	syn match   jpropertiesAssignment	"^\s*[^[:space:]]\+.*$" contains=jpropertiesIdentifier
+
+	" an identifier is anything not a space character, pretty much; it's
+	" followed by = or :, or space or tab.  Or end-of-line.
+	syn match   jpropertiesIdentifier	"[^=:[:space:]]*" contained nextgroup=jpropertiesDelimiter
+
+	" treat the delimiter specially to get colours right
+	syn match   jpropertiesDelimiter	"\s*[=:[:space:]]\s*" contained nextgroup=jpropertiesString
+
+	" catch the bizarre case of no identifier; a special case of delimiter
+	syn match   jpropertiesEmptyIdentifier	"^\s*[=:]\s*" nextgroup=jpropertiesString
+else
+
+	" here an assignment is id=value or id:value, and we conveniently
+	" ignore continuation lines for the present
+	syn match   jpropertiesAssignment	"^\s*[^=:[:space:]]\+\s*[=:].*$" contains=jpropertiesIdentifier
+
+	" an identifier is anything not a space character, pretty much; it's
+	" always followed by = or :, and we find it in an assignment
+	syn match   jpropertiesIdentifier	"[^=:[:space:]]\+" contained nextgroup=jpropertiesDelimiter
+
+	" treat the delimiter specially to get colours right; this time the
+	" delimiter must contain = or :
+	syn match   jpropertiesDelimiter	"\s*[=:]\s*" contained nextgroup=jpropertiesString
+endif
+
+" a definition is all up to the last non-\-terminated line; strictly, Java
+" properties tend to ignore leading whitespace on all lines of a multi-line
+" definition, but we don't look for that here (because it's a major hassle)
+syn region  jpropertiesString		start="" skip="\\$" end="$" contained contains=jpropertiesSpecialChar,jpropertiesError,jpropertiesSpecial
+
+" {...} is a Java Message formatter - add a minimal recognition of these
+" if required
+if jproperties_show_messages != 0
+	syn match   jpropertiesSpecial		"{[^}]*}\{-1,\}" contained
+	syn match   jpropertiesSpecial		"'{" contained
+	syn match   jpropertiesSpecial		"''" contained
+endif
+
+" \uABCD are unicode special characters
+syn match   jpropertiesSpecialChar	"\\u\x\{1,4}" contained
+
+" ...and \u not followed by a hex digit is an error, though the properties
+" file parser won't issue an error on it, just set something wacky like zero
+syn match   jpropertiesError		"\\u\X\{1,4}" contained
+syn match   jpropertiesError		"\\u$"me=e-1 contained
+
+" other things of note are the \t,r,n,\, and the \ preceding line end
+syn match   jpropertiesSpecial		"\\[trn\\]" contained
+syn match   jpropertiesSpecial		"\\\s" contained
+syn match   jpropertiesSpecial		"\\$" contained
+
+" comments begin with # or !, and persist to end of line; put here since
+" they may have been caught by patterns above us
+syn match   jpropertiesComment		"^\s*[#!].*$" contains=jpropertiesTODO
+syn keyword jpropertiesTodo		TODO FIXME XXX contained
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link jpropertiesComment	Comment
+hi def link jpropertiesTodo		Todo
+hi def link jpropertiesIdentifier	Identifier
+hi def link jpropertiesString	String
+hi def link jpropertiesExtendString	String
+hi def link jpropertiesCharacter	Character
+hi def link jpropertiesSpecial	Special
+hi def link jpropertiesSpecialChar	SpecialChar
+hi def link jpropertiesError	Error
+
+
+let b:current_syntax = "jproperties"
+
+" vim:ts=8
+
+endif
diff --git a/syntax/jsp.vim b/syntax/jsp.vim
new file mode 100644
index 000000000..247a51b43
--- /dev/null
+++ b/syntax/jsp.vim
@@ -0,0 +1,72 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsp') == -1
+
+" Vim syntax file
+" Language:	JSP (Java Server Pages)
+" Maintainer:	Rafael Garcia-Suarez <rgarciasuarez@free.fr>
+" URL:		http://rgarciasuarez.free.fr/vim/syntax/jsp.vim
+" Last change:	2004 Feb 02
+" Credits : Patch by Darren Greaves (recognizes <jsp:...> tags)
+"	    Patch by Thomas Kimpton (recognizes jspExpr inside HTML tags)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'jsp'
+endif
+
+" Source HTML syntax
+runtime! syntax/html.vim
+unlet b:current_syntax
+
+" Next syntax items are case-sensitive
+syn case match
+
+" Include Java syntax
+syn include @jspJava syntax/java.vim
+
+syn region jspScriptlet matchgroup=jspTag start=/<%/  keepend end=/%>/ contains=@jspJava
+syn region jspComment			  start=/<%--/	      end=/--%>/
+syn region jspDecl	matchgroup=jspTag start=/<%!/ keepend end=/%>/ contains=@jspJava
+syn region jspExpr	matchgroup=jspTag start=/<%=/ keepend end=/%>/ contains=@jspJava
+syn region jspDirective			  start=/<%@/	      end=/%>/ contains=htmlString,jspDirName,jspDirArg
+
+syn keyword jspDirName contained include page taglib
+syn keyword jspDirArg contained file uri prefix language extends import session buffer autoFlush
+syn keyword jspDirArg contained isThreadSafe info errorPage contentType isErrorPage
+syn region jspCommand			  start=/<jsp:/ start=/<\/jsp:/ keepend end=/>/ end=/\/>/ contains=htmlString,jspCommandName,jspCommandArg
+syn keyword jspCommandName contained include forward getProperty plugin setProperty useBean param params fallback
+syn keyword jspCommandArg contained id scope class type beanName page flush name value property
+syn keyword jspCommandArg contained code codebase name archive align height
+syn keyword jspCommandArg contained width hspace vspace jreversion nspluginurl iepluginurl
+
+" Redefine htmlTag so that it can contain jspExpr
+syn clear htmlTag
+syn region htmlTag start=+<[^/%]+ end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster,jspExpr,javaScript
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+" java.vim has redefined htmlComment highlighting
+hi def link htmlComment	 Comment
+hi def link htmlCommentPart Comment
+" Be consistent with html highlight settings
+hi def link jspComment	 htmlComment
+hi def link jspTag		 htmlTag
+hi def link jspDirective	 jspTag
+hi def link jspDirName	 htmlTagName
+hi def link jspDirArg	 htmlArg
+hi def link jspCommand	 jspTag
+hi def link jspCommandName  htmlTagName
+hi def link jspCommandArg	 htmlArg
+
+if main_syntax == 'jsp'
+  unlet main_syntax
+endif
+
+let b:current_syntax = "jsp"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/kconfig.vim b/syntax/kconfig.vim
new file mode 100644
index 000000000..86ed9ff4d
--- /dev/null
+++ b/syntax/kconfig.vim
@@ -0,0 +1,743 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kconfig') == -1
+
+" Vim syntax file
+" Maintainer:           Christian Brabandt <cb@256bit.org>
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2015-05-29
+" License:              Vim (see :h license)
+" Repository:		https://github.com/chrisbra/vim-kconfig
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if exists("g:kconfig_syntax_heavy")
+
+syn match   kconfigBegin              '^' nextgroup=kconfigKeyword
+                                      \ skipwhite
+
+syn keyword kconfigTodo               contained TODO FIXME XXX NOTE
+
+syn match   kconfigComment            display '#.*$' contains=kconfigTodo
+
+syn keyword kconfigKeyword            config nextgroup=kconfigSymbol
+                                      \ skipwhite
+
+syn keyword kconfigKeyword            menuconfig nextgroup=kconfigSymbol
+                                      \ skipwhite
+
+syn keyword kconfigKeyword            comment menu mainmenu
+                                      \ nextgroup=kconfigKeywordPrompt
+                                      \ skipwhite
+
+syn keyword kconfigKeyword            choice
+                                      \ nextgroup=@kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn keyword kconfigKeyword            endmenu endchoice
+
+syn keyword kconfigPreProc            source
+                                      \ nextgroup=kconfigPath
+                                      \ skipwhite
+
+" TODO: This is a hack.  The who .*Expr stuff should really be generated so
+" that we can reuse it for various nextgroups.
+syn keyword kconfigConditional        if endif
+                                      \ nextgroup=@kconfigConfigOptionIfExpr
+                                      \ skipwhite
+
+syn match   kconfigKeywordPrompt      '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigPath               '"[^"\\]*\%(\\.[^"\\]*\)*"\|\S\+'
+                                      \ contained
+
+syn match   kconfigSymbol             '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+" FIXME: There is – probably – no reason to cluster these instead of just
+" defining them in the same group.
+syn cluster kconfigConfigOptions      contains=kconfigTypeDefinition,
+                                      \        kconfigInputPrompt,
+                                      \        kconfigDefaultValue,
+                                      \        kconfigDependencies,
+                                      \        kconfigReverseDependencies,
+                                      \        kconfigNumericalRanges,
+                                      \        kconfigHelpText,
+                                      \        kconfigDefBool,
+                                      \        kconfigOptional
+
+syn keyword kconfigTypeDefinition     bool boolean tristate string hex int
+                                      \ contained
+                                      \ nextgroup=kconfigTypeDefPrompt,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigTypeDefPrompt      '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigTypeDefPrompt      "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn keyword kconfigInputPrompt        prompt
+                                      \ contained
+                                      \ nextgroup=kconfigPromptPrompt
+                                      \ skipwhite
+
+syn match   kconfigPromptPrompt       '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigPromptPrompt       "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn keyword   kconfigDefaultValue     default
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionExpr
+                                      \ skipwhite
+
+syn match   kconfigDependencies       'depends on\|requires'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionIfExpr
+                                      \ skipwhite
+
+syn keyword kconfigReverseDependencies select
+                                      \ contained
+                                      \ nextgroup=@kconfigRevDepSymbol
+                                      \ skipwhite
+
+syn cluster kconfigRevDepSymbol       contains=kconfigRevDepCSymbol,
+                                      \        kconfigRevDepNCSymbol
+
+syn match   kconfigRevDepCSymbol      '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigRevDepCSymbol      "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigRevDepNCSymbol     '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn keyword kconfigNumericalRanges    range
+                                      \ contained
+                                      \ nextgroup=@kconfigRangeSymbol
+                                      \ skipwhite
+
+syn cluster kconfigRangeSymbol        contains=kconfigRangeCSymbol,
+                                      \        kconfigRangeNCSymbol
+
+syn match   kconfigRangeCSymbol       '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=@kconfigRangeSymbol2
+                                      \ skipwhite skipnl
+
+syn match   kconfigRangeCSymbol       "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=@kconfigRangeSymbol2
+                                      \ skipwhite skipnl
+
+syn match   kconfigRangeNCSymbol      '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=@kconfigRangeSymbol2
+                                      \ skipwhite skipnl
+
+syn cluster kconfigRangeSymbol2       contains=kconfigRangeCSymbol2,
+                                      \        kconfigRangeNCSymbol2
+
+syn match   kconfigRangeCSymbol2      "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigRangeNCSymbol2     '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn region  kconfigHelpText           contained
+      \ matchgroup=kconfigConfigOption
+      \ start='\%(help\|---help---\)\ze\s*\n\z(\s\+\)'
+      \ skip='^$'
+      \ end='^\z1\@!'
+      \ nextgroup=@kconfigConfigOptions
+      \ skipwhite skipnl
+
+" XXX: Undocumented
+syn keyword kconfigDefBool            def_bool
+                                      \ contained
+                                      \ nextgroup=@kconfigDefBoolSymbol
+                                      \ skipwhite
+
+syn cluster kconfigDefBoolSymbol      contains=kconfigDefBoolCSymbol,
+                                      \        kconfigDefBoolNCSymbol
+
+syn match   kconfigDefBoolCSymbol     '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigDefBoolCSymbol     "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigDefBoolNCSymbol    '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+" XXX: This is actually only a valid option for “choice”, but treating it
+" specially would require a lot of extra groups.
+syn keyword kconfigOptional           optional
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn keyword kconfigConfigOptionIf     if
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionIfExpr
+                                      \ skipwhite
+
+syn cluster kconfigConfigOptionIfExpr contains=@kconfigConfOptIfExprSym,
+                                      \        kconfigConfOptIfExprNeg,
+                                      \        kconfigConfOptIfExprGroup
+
+syn cluster kconfigConfOptIfExprSym   contains=kconfigConfOptIfExprCSym,
+                                      \        kconfigConfOptIfExprNCSym
+
+syn match   kconfigConfOptIfExprCSym  '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptions,
+                                      \           kconfigConfOptIfExprAnd,
+                                      \           kconfigConfOptIfExprOr,
+                                      \           kconfigConfOptIfExprEq,
+                                      \           kconfigConfOptIfExprNEq
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptIfExprCSym  "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptions,
+                                      \           kconfigConfOptIfExprAnd,
+                                      \           kconfigConfOptIfExprOr,
+                                      \           kconfigConfOptIfExprEq,
+                                      \           kconfigConfOptIfExprNEq
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptIfExprNCSym '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptions,
+                                      \           kconfigConfOptIfExprAnd,
+                                      \           kconfigConfOptIfExprOr,
+                                      \           kconfigConfOptIfExprEq,
+                                      \           kconfigConfOptIfExprNEq
+                                      \ skipwhite skipnl
+
+syn cluster kconfigConfOptIfExprSym2  contains=kconfigConfOptIfExprCSym2,
+                                      \        kconfigConfOptIfExprNCSym2
+
+syn match   kconfigConfOptIfExprEq    '='
+                                      \ contained
+                                      \ nextgroup=@kconfigConfOptIfExprSym2
+                                      \ skipwhite
+
+syn match   kconfigConfOptIfExprNEq   '!='
+                                      \ contained
+                                      \ nextgroup=@kconfigConfOptIfExprSym2
+                                      \ skipwhite
+
+syn match   kconfigConfOptIfExprCSym2 "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptions,
+                                      \           kconfigConfOptIfExprAnd,
+                                      \           kconfigConfOptIfExprOr
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptIfExprNCSym2 '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptions,
+                                      \           kconfigConfOptIfExprAnd,
+                                      \           kconfigConfOptIfExprOr
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptIfExprNeg   '!'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionIfExpr
+                                      \ skipwhite
+
+syn match   kconfigConfOptIfExprAnd   '&&'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionIfExpr
+                                      \ skipwhite
+
+syn match   kconfigConfOptIfExprOr    '||'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionIfExpr
+                                      \ skipwhite
+
+syn match   kconfigConfOptIfExprGroup '('
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionIfGExp
+                                      \ skipwhite
+
+" TODO: hm, this kind of recursion doesn't work right.  We need another set of
+" expressions that have kconfigConfigOPtionIfGExp as nextgroup and a matcher
+" for '(' that sets it all off.
+syn cluster kconfigConfigOptionIfGExp contains=@kconfigConfOptIfGExpSym,
+                                      \        kconfigConfOptIfGExpNeg,
+                                      \        kconfigConfOptIfExprGroup
+
+syn cluster kconfigConfOptIfGExpSym   contains=kconfigConfOptIfGExpCSym,
+                                      \        kconfigConfOptIfGExpNCSym
+
+syn match   kconfigConfOptIfGExpCSym  '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigIf,
+                                      \           kconfigConfOptIfGExpAnd,
+                                      \           kconfigConfOptIfGExpOr,
+                                      \           kconfigConfOptIfGExpEq,
+                                      \           kconfigConfOptIfGExpNEq
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptIfGExpCSym  "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigIf,
+                                      \           kconfigConfOptIfGExpAnd,
+                                      \           kconfigConfOptIfGExpOr,
+                                      \           kconfigConfOptIfGExpEq,
+                                      \           kconfigConfOptIfGExpNEq
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptIfGExpNCSym '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=kconfigConfOptIfExprGrpE,
+                                      \           kconfigConfOptIfGExpAnd,
+                                      \           kconfigConfOptIfGExpOr,
+                                      \           kconfigConfOptIfGExpEq,
+                                      \           kconfigConfOptIfGExpNEq
+                                      \ skipwhite skipnl
+
+syn cluster kconfigConfOptIfGExpSym2  contains=kconfigConfOptIfGExpCSym2,
+                                      \        kconfigConfOptIfGExpNCSym2
+
+syn match   kconfigConfOptIfGExpEq    '='
+                                      \ contained
+                                      \ nextgroup=@kconfigConfOptIfGExpSym2
+                                      \ skipwhite
+
+syn match   kconfigConfOptIfGExpNEq   '!='
+                                      \ contained
+                                      \ nextgroup=@kconfigConfOptIfGExpSym2
+                                      \ skipwhite
+
+syn match   kconfigConfOptIfGExpCSym2 '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=kconfigConfOptIfExprGrpE,
+                                      \           kconfigConfOptIfGExpAnd,
+                                      \           kconfigConfOptIfGExpOr
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptIfGExpCSym2 "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=kconfigConfOptIfExprGrpE,
+                                      \           kconfigConfOptIfGExpAnd,
+                                      \           kconfigConfOptIfGExpOr
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptIfGExpNCSym2 '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=kconfigConfOptIfExprGrpE,
+                                      \           kconfigConfOptIfGExpAnd,
+                                      \           kconfigConfOptIfGExpOr
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptIfGExpNeg   '!'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionIfGExp
+                                      \ skipwhite
+
+syn match   kconfigConfOptIfGExpAnd   '&&'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionIfGExp
+                                      \ skipwhite
+
+syn match   kconfigConfOptIfGExpOr    '||'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionIfGExp
+                                      \ skipwhite
+
+syn match   kconfigConfOptIfExprGrpE  ')'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptions,
+                                      \           kconfigConfOptIfExprAnd,
+                                      \           kconfigConfOptIfExprOr
+                                      \ skipwhite skipnl
+
+
+syn cluster kconfigConfigOptionExpr   contains=@kconfigConfOptExprSym,
+                                      \        kconfigConfOptExprNeg,
+                                      \        kconfigConfOptExprGroup
+
+syn cluster kconfigConfOptExprSym     contains=kconfigConfOptExprCSym,
+                                      \        kconfigConfOptExprNCSym
+
+syn match   kconfigConfOptExprCSym    '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           kconfigConfOptExprAnd,
+                                      \           kconfigConfOptExprOr,
+                                      \           kconfigConfOptExprEq,
+                                      \           kconfigConfOptExprNEq,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptExprCSym    "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           kconfigConfOptExprAnd,
+                                      \           kconfigConfOptExprOr,
+                                      \           kconfigConfOptExprEq,
+                                      \           kconfigConfOptExprNEq,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptExprNCSym   '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           kconfigConfOptExprAnd,
+                                      \           kconfigConfOptExprOr,
+                                      \           kconfigConfOptExprEq,
+                                      \           kconfigConfOptExprNEq,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn cluster kconfigConfOptExprSym2    contains=kconfigConfOptExprCSym2,
+                                      \        kconfigConfOptExprNCSym2
+
+syn match   kconfigConfOptExprEq      '='
+                                      \ contained
+                                      \ nextgroup=@kconfigConfOptExprSym2
+                                      \ skipwhite
+
+syn match   kconfigConfOptExprNEq     '!='
+                                      \ contained
+                                      \ nextgroup=@kconfigConfOptExprSym2
+                                      \ skipwhite
+
+syn match   kconfigConfOptExprCSym2   '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           kconfigConfOptExprAnd,
+                                      \           kconfigConfOptExprOr,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptExprCSym2   "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           kconfigConfOptExprAnd,
+                                      \           kconfigConfOptExprOr,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptExprNCSym2  '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           kconfigConfOptExprAnd,
+                                      \           kconfigConfOptExprOr,
+                                      \           @kconfigConfigOptions
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptExprNeg     '!'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionExpr
+                                      \ skipwhite
+
+syn match   kconfigConfOptExprAnd     '&&'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionExpr
+                                      \ skipwhite
+
+syn match   kconfigConfOptExprOr      '||'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionExpr
+                                      \ skipwhite
+
+syn match   kconfigConfOptExprGroup   '('
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionGExp
+                                      \ skipwhite
+
+syn cluster kconfigConfigOptionGExp   contains=@kconfigConfOptGExpSym,
+                                      \        kconfigConfOptGExpNeg,
+                                      \        kconfigConfOptGExpGroup
+
+syn cluster kconfigConfOptGExpSym     contains=kconfigConfOptGExpCSym,
+                                      \        kconfigConfOptGExpNCSym
+
+syn match   kconfigConfOptGExpCSym    '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=kconfigConfOptExprGrpE,
+                                      \           kconfigConfOptGExpAnd,
+                                      \           kconfigConfOptGExpOr,
+                                      \           kconfigConfOptGExpEq,
+                                      \           kconfigConfOptGExpNEq
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptGExpCSym    "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=kconfigConfOptExprGrpE,
+                                      \           kconfigConfOptGExpAnd,
+                                      \           kconfigConfOptGExpOr,
+                                      \           kconfigConfOptGExpEq,
+                                      \           kconfigConfOptGExpNEq
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptGExpNCSym   '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=kconfigConfOptExprGrpE,
+                                      \           kconfigConfOptGExpAnd,
+                                      \           kconfigConfOptGExpOr,
+                                      \           kconfigConfOptGExpEq,
+                                      \           kconfigConfOptGExpNEq
+                                      \ skipwhite skipnl
+
+syn cluster kconfigConfOptGExpSym2    contains=kconfigConfOptGExpCSym2,
+                                      \        kconfigConfOptGExpNCSym2
+
+syn match   kconfigConfOptGExpEq      '='
+                                      \ contained
+                                      \ nextgroup=@kconfigConfOptGExpSym2
+                                      \ skipwhite
+
+syn match   kconfigConfOptGExpNEq     '!='
+                                      \ contained
+                                      \ nextgroup=@kconfigConfOptGExpSym2
+                                      \ skipwhite
+
+syn match   kconfigConfOptGExpCSym2   '"[^"\\]*\%(\\.[^"\\]*\)*"'
+                                      \ contained
+                                      \ nextgroup=kconfigConfOptExprGrpE,
+                                      \           kconfigConfOptGExpAnd,
+                                      \           kconfigConfOptGExpOr
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptGExpCSym2   "'[^'\\]*\%(\\.[^'\\]*\)*'"
+                                      \ contained
+                                      \ nextgroup=kconfigConfOptExprGrpE,
+                                      \           kconfigConfOptGExpAnd,
+                                      \           kconfigConfOptGExpOr
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptGExpNCSym2  '\<\k\+\>'
+                                      \ contained
+                                      \ nextgroup=kconfigConfOptExprGrpE,
+                                      \           kconfigConfOptGExpAnd,
+                                      \           kconfigConfOptGExpOr
+                                      \ skipwhite skipnl
+
+syn match   kconfigConfOptGExpNeg     '!'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionGExp
+                                      \ skipwhite
+
+syn match   kconfigConfOptGExpAnd     '&&'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionGExp
+                                      \ skipwhite
+
+syn match   kconfigConfOptGExpOr      '||'
+                                      \ contained
+                                      \ nextgroup=@kconfigConfigOptionGExp
+                                      \ skipwhite
+
+syn match   kconfigConfOptExprGrpE    ')'
+                                      \ contained
+                                      \ nextgroup=kconfigConfigOptionIf,
+                                      \           kconfigConfOptExprAnd,
+                                      \           kconfigConfOptExprOr
+                                      \ skipwhite skipnl
+
+syn sync minlines=50
+
+hi def link kconfigTodo                 Todo
+hi def link kconfigComment              Comment
+hi def link kconfigKeyword              Keyword
+hi def link kconfigPreProc              PreProc
+hi def link kconfigConditional          Conditional
+hi def link kconfigPrompt               String
+hi def link kconfigKeywordPrompt        kconfigPrompt
+hi def link kconfigPath                 String
+hi def link kconfigSymbol               String
+hi def link kconfigConstantSymbol       Constant
+hi def link kconfigConfigOption         Type
+hi def link kconfigTypeDefinition       kconfigConfigOption
+hi def link kconfigTypeDefPrompt        kconfigPrompt
+hi def link kconfigInputPrompt          kconfigConfigOption
+hi def link kconfigPromptPrompt         kconfigPrompt
+hi def link kconfigDefaultValue         kconfigConfigOption
+hi def link kconfigDependencies         kconfigConfigOption
+hi def link kconfigReverseDependencies  kconfigConfigOption
+hi def link kconfigRevDepCSymbol        kconfigConstantSymbol
+hi def link kconfigRevDepNCSymbol       kconfigSymbol
+hi def link kconfigNumericalRanges      kconfigConfigOption
+hi def link kconfigRangeCSymbol         kconfigConstantSymbol
+hi def link kconfigRangeNCSymbol        kconfigSymbol
+hi def link kconfigRangeCSymbol2        kconfigConstantSymbol
+hi def link kconfigRangeNCSymbol2       kconfigSymbol
+hi def link kconfigHelpText             Normal
+hi def link kconfigDefBool              kconfigConfigOption
+hi def link kconfigDefBoolCSymbol       kconfigConstantSymbol
+hi def link kconfigDefBoolNCSymbol      kconfigSymbol
+hi def link kconfigOptional             kconfigConfigOption
+hi def link kconfigConfigOptionIf       Conditional
+hi def link kconfigConfOptIfExprCSym    kconfigConstantSymbol
+hi def link kconfigConfOptIfExprNCSym   kconfigSymbol
+hi def link kconfigOperator             Operator
+hi def link kconfigConfOptIfExprEq      kconfigOperator
+hi def link kconfigConfOptIfExprNEq     kconfigOperator
+hi def link kconfigConfOptIfExprCSym2   kconfigConstantSymbol
+hi def link kconfigConfOptIfExprNCSym2  kconfigSymbol
+hi def link kconfigConfOptIfExprNeg     kconfigOperator
+hi def link kconfigConfOptIfExprAnd     kconfigOperator
+hi def link kconfigConfOptIfExprOr      kconfigOperator
+hi def link kconfigDelimiter            Delimiter
+hi def link kconfigConfOptIfExprGroup   kconfigDelimiter
+hi def link kconfigConfOptIfGExpCSym    kconfigConstantSymbol
+hi def link kconfigConfOptIfGExpNCSym   kconfigSymbol
+hi def link kconfigConfOptIfGExpEq      kconfigOperator
+hi def link kconfigConfOptIfGExpNEq     kconfigOperator
+hi def link kconfigConfOptIfGExpCSym2   kconfigConstantSymbol
+hi def link kconfigConfOptIfGExpNCSym2  kconfigSymbol
+hi def link kconfigConfOptIfGExpNeg     kconfigOperator
+hi def link kconfigConfOptIfGExpAnd     kconfigOperator
+hi def link kconfigConfOptIfGExpOr      kconfigOperator
+hi def link kconfigConfOptIfExprGrpE    kconfigDelimiter
+hi def link kconfigConfOptExprCSym      kconfigConstantSymbol
+hi def link kconfigConfOptExprNCSym     kconfigSymbol
+hi def link kconfigConfOptExprEq        kconfigOperator
+hi def link kconfigConfOptExprNEq       kconfigOperator
+hi def link kconfigConfOptExprCSym2     kconfigConstantSymbol
+hi def link kconfigConfOptExprNCSym2    kconfigSymbol
+hi def link kconfigConfOptExprNeg       kconfigOperator
+hi def link kconfigConfOptExprAnd       kconfigOperator
+hi def link kconfigConfOptExprOr        kconfigOperator
+hi def link kconfigConfOptExprGroup     kconfigDelimiter
+hi def link kconfigConfOptGExpCSym      kconfigConstantSymbol
+hi def link kconfigConfOptGExpNCSym     kconfigSymbol
+hi def link kconfigConfOptGExpEq        kconfigOperator
+hi def link kconfigConfOptGExpNEq       kconfigOperator
+hi def link kconfigConfOptGExpCSym2     kconfigConstantSymbol
+hi def link kconfigConfOptGExpNCSym2    kconfigSymbol
+hi def link kconfigConfOptGExpNeg       kconfigOperator
+hi def link kconfigConfOptGExpAnd       kconfigOperator
+hi def link kconfigConfOptGExpOr        kconfigOperator
+hi def link kconfigConfOptExprGrpE      kconfigConfOptIfExprGroup
+
+else
+
+syn keyword kconfigTodo               contained TODO FIXME XXX NOTE
+
+syn match   kconfigComment            display '#.*$' contains=kconfigTodo
+
+syn keyword kconfigKeyword            config menuconfig comment mainmenu
+
+syn keyword kconfigConditional        menu endmenu choice endchoice if endif
+
+syn keyword kconfigPreProc            source
+                                      \ nextgroup=kconfigPath
+                                      \ skipwhite
+
+syn keyword kconfigTriState           y m n
+
+syn match   kconfigSpecialChar        contained '\\.'
+syn match   kconfigSpecialChar        '\\$'
+
+syn region  kconfigPath               matchgroup=kconfigPath
+                                      \ start=+"+ skip=+\\\\\|\\\"+ end=+"+
+                                      \ contains=kconfigSpecialChar
+
+syn region  kconfigPath               matchgroup=kconfigPath
+                                      \ start=+'+ skip=+\\\\\|\\\'+ end=+'+
+                                      \ contains=kconfigSpecialChar
+
+syn match   kconfigPath               '\S\+'
+                                      \ contained
+
+syn region  kconfigString             matchgroup=kconfigString
+                                      \ start=+"+ skip=+\\\\\|\\\"+ end=+"+
+                                      \ contains=kconfigSpecialChar
+
+syn region  kconfigString             matchgroup=kconfigString
+                                      \ start=+'+ skip=+\\\\\|\\\'+ end=+'+
+                                      \ contains=kconfigSpecialChar
+
+syn keyword kconfigType               bool boolean tristate string hex int
+
+syn keyword kconfigOption             prompt default requires select range
+                                      \ optional
+syn match   kconfigOption             'depends\%( on\)\='
+
+syn keyword kconfigMacro              def_bool def_tristate
+
+syn region  kconfigHelpText
+      \ matchgroup=kconfigOption
+      \ start='\%(help\|---help---\)\ze\s*\n\z(\s\+\)'
+      \ skip='^$'
+      \ end='^\z1\@!'
+
+syn sync    match kconfigSyncHelp     grouphere kconfigHelpText 'help\|---help---'
+
+hi def link kconfigTodo         Todo
+hi def link kconfigComment      Comment
+hi def link kconfigKeyword      Keyword
+hi def link kconfigConditional  Conditional
+hi def link kconfigPreProc      PreProc
+hi def link kconfigTriState     Boolean
+hi def link kconfigSpecialChar  SpecialChar
+hi def link kconfigPath         String
+hi def link kconfigString       String
+hi def link kconfigType         Type
+hi def link kconfigOption       Identifier
+hi def link kconfigHelpText     Normal
+hi def link kconfigmacro        Macro
+
+endif
+
+let b:current_syntax = "kconfig"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/kivy.vim b/syntax/kivy.vim
new file mode 100644
index 000000000..3a7159c39
--- /dev/null
+++ b/syntax/kivy.vim
@@ -0,0 +1,40 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kivy') == -1
+
+" Vim syntax file
+" Language:    Kivy
+" Maintainer:  Corey Prophitt <prophitt.corey@gmail.com>
+" Last Change: May 29th, 2014
+" Version:     1
+" URL:         http://kivy.org/
+
+if exists("b:current_syntax")
+    finish
+endif
+
+" Load Python syntax first (Python can be used within Kivy)
+syn include @pyth $VIMRUNTIME/syntax/python.vim
+
+" Kivy language rules can be found here
+"   http://kivy.org/docs/guide/lang.html
+
+" Define Kivy syntax
+syn match kivyPreProc   /#:.*/
+syn match kivyComment   /#.*/
+syn match kivyRule      /<\I\i*\(,\s*\I\i*\)*>:/
+syn match kivyAttribute /\<\I\i*\>/ nextgroup=kivyValue
+
+syn region kivyValue start=":" end=/$/  contains=@pyth skipwhite
+
+syn region kivyAttribute matchgroup=kivyIdent start=/[\a_][\a\d_]*:/ end=/$/ contains=@pyth skipwhite
+
+hi def link kivyPreproc   PreProc
+hi def link kivyComment   Comment
+hi def link kivyRule      Function
+hi def link kivyIdent     Statement
+hi def link kivyAttribute Label
+
+let b:current_syntax = "kivy"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/kix.vim b/syntax/kix.vim
new file mode 100644
index 000000000..bc27e8397
--- /dev/null
+++ b/syntax/kix.vim
@@ -0,0 +1,174 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kix') == -1
+
+" Vim syntax file
+" Language:	KixTart 95, Kix2001 Windows script language http://kixtart.org/
+" Maintainer:	Richard Howarth <rhowarth@sgb.co.uk>
+" Last Change:	2003 May 11
+" URL:		http://www.howsoft.demon.co.uk/
+
+" KixTart files identified by *.kix extension.
+
+" Amendment History:
+" 26 April 2001: RMH
+"    Removed development comments from distro version
+"    Renamed "Kix*" to "kix*" for consistancy
+"    Changes made in preperation for VIM version 5.8/6.00
+
+" TODO:
+"	Handle arrays highlighting
+"	Handle object highlighting
+" The next two may not be possible:
+"	Work out how to error too many "(", i.e. (() should be an error.
+"	Similarly, "if" without "endif" and similar constructs should error.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+syn case match
+syn keyword kixTODO		TODO FIX XXX contained
+
+" Case insensitive language.
+syn case ignore
+
+" Kix statements
+syn match   kixStatement	"?"
+syn keyword kixStatement	beep big break
+syn keyword kixStatement	call cd cls color cookie1 copy
+syn keyword kixStatement	del dim display
+syn keyword kixStatement	exit
+syn keyword kixStatement	flushkb
+syn keyword kixStatement	get gets global go gosub goto
+syn keyword kixStatement	md
+syn keyword kixStatement	password play
+syn keyword kixStatement	quit
+syn keyword kixStatement	rd return run
+syn keyword kixStatement	set setl setm settime shell sleep small
+syn keyword kixStatement	use
+
+" Kix2001
+syn keyword kixStatement	debug function endfunction redim
+
+" Simple variables
+syn match   kixNotVar		"\$\$\|@@\|%%" transparent contains=NONE
+syn match   kixLocalVar		"\$\w\+"
+syn match   kixMacro		"@\w\+"
+syn match   kixEnvVar		"%\w\+"
+
+" Destination labels
+syn match   kixLabel		":\w\+\>"
+
+" Identify strings, trap unterminated strings
+syn match   kixStringError      +".*\|'.*+
+syn region  kixDoubleString	oneline start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=kixLocalVar,kixMacro,kixEnvVar,kixNotVar
+syn region  kixSingleString	oneline start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=kixLocalVar,kixMacro,kixEnvVar,kixNotVar
+
+" Operators
+syn match   kixOperator		"+\|-\|\*\|/\|=\|&\||"
+syn keyword kixOperator		and or
+" Kix2001
+syn match   kixOperator		"=="
+syn keyword kixOperator		not
+
+" Numeric constants
+syn match   kixInteger		"-\=\<\d\+\>" contains=NONE
+syn match   kixFloat		"-\=\.\d\+\>\|-\=\<\d\+\.\d\+\>" contains=NONE
+
+" Hex numeric constants
+syn match   kixHex		"\&\x\+\>" contains=NONE
+
+" Other contants
+" Kix2001
+syn keyword kixConstant		on off
+
+" Comments
+syn match   kixComment		";.*$" contains=kixTODO
+
+" Trap unmatched parenthesis
+syn match   kixParenCloseError	")"
+syn region  kixParen		oneline transparent start="(" end=")" contains=ALLBUT,kixParenCloseError
+
+" Functions (Builtin + UDF)
+syn match   kixFunction		"\w\+("he=e-1,me=e-1 contains=ALL
+
+" Trap unmatched brackets
+syn match   kixBrackCloseError	"\]"
+syn region  kixBrack		transparent start="\[" end="\]" contains=ALLBUT,kixBrackCloseError
+
+" Clusters for ALLBUT shorthand
+syn cluster kixIfBut		contains=kixIfError,kixSelectOK,kixDoOK,kixWhileOK,kixForEachOK,kixForNextOK
+syn cluster kixSelectBut	contains=kixSelectError,kixIfOK,kixDoOK,kixWhileOK,kixForEachOK,kixForNextOK
+syn cluster kixDoBut		contains=kixDoError,kixSelectOK,kixIfOK,kixWhileOK,kixForEachOK,kixForNextOK
+syn cluster kixWhileBut		contains=kixWhileError,kixSelectOK,kixIfOK,kixDoOK,kixForEachOK,kixForNextOK
+syn cluster kixForEachBut	contains=kixForEachError,kixSelectOK,kixIfOK,kixDoOK,kixForNextOK,kixWhileOK
+syn cluster kixForNextBut	contains=kixForNextError,kixSelectOK,kixIfOK,kixDoOK,kixForEachOK,kixWhileOK
+" Condtional construct errors.
+syn match   kixIfError		"\<if\>\|\<else\>\|\<endif\>"
+syn match   kixIfOK		contained "\<if\>\|\<else\>\|\<endif\>"
+syn region  kixIf		transparent matchgroup=kixIfOK start="\<if\>" end="\<endif\>" contains=ALLBUT,@kixIfBut
+syn match   kixSelectError	"\<select\>\|\<case\>\|\<endselect\>"
+syn match   kixSelectOK		contained "\<select\>\|\<case\>\|\<endselect\>"
+syn region  kixSelect		transparent matchgroup=kixSelectOK start="\<select\>" end="\<endselect\>" contains=ALLBUT,@kixSelectBut
+
+" Program control constructs.
+syn match   kixDoError		"\<do\>\|\<until\>"
+syn match   kixDoOK		contained "\<do\>\|\<until\>"
+syn region  kixDo		transparent matchgroup=kixDoOK start="\<do\>" end="\<until\>" contains=ALLBUT,@kixDoBut
+syn match   kixWhileError	"\<while\>\|\<loop\>"
+syn match   kixWhileOK		contained "\<while\>\|\<loop\>"
+syn region  kixWhile		transparent matchgroup=kixWhileOK start="\<while\>" end="\<loop\>" contains=ALLBUT,@kixWhileBut
+syn match   kixForNextError	"\<for\>\|\<to\>\|\<step\>\|\<next\>"
+syn match   kixForNextOK	contained "\<for\>\|\<to\>\|\<step\>\|\<next\>"
+syn region  kixForNext		transparent matchgroup=kixForNextOK start="\<for\>" end="\<next\>" contains=ALLBUT,@kixForBut
+syn match   kixForEachError	"\<for each\>\|\<in\>\|\<next\>"
+syn match   kixForEachOK	contained "\<for each\>\|\<in\>\|\<next\>"
+syn region  kixForEach		transparent matchgroup=kixForEachOK start="\<for each\>" end="\<next\>" contains=ALLBUT,@kixForEachBut
+
+" Expressions
+syn match   kixExpression	"<\|>\|<=\|>=\|<>"
+
+
+" Default highlighting.
+" Set default highlight only if it doesn't already have a value.
+
+hi def link kixDoubleString		String
+hi def link kixSingleString		String
+hi def link kixStatement		Statement
+hi def link kixRepeat		Repeat
+hi def link kixComment		Comment
+hi def link kixBuiltin		Function
+hi def link kixLocalVar		Special
+hi def link kixMacro			Special
+hi def link kixEnvVar		Special
+hi def link kixLabel			Type
+hi def link kixFunction		Function
+hi def link kixInteger		Number
+hi def link kixHex			Number
+hi def link kixFloat			Number
+hi def link kixOperator		Operator
+hi def link kixExpression		Operator
+
+hi def link kixParenCloseError	Error
+hi def link kixBrackCloseError	Error
+hi def link kixStringError		Error
+
+hi def link kixWhileError		Error
+hi def link kixWhileOK		Conditional
+hi def link kixDoError		Error
+hi def link kixDoOK			Conditional
+hi def link kixIfError		Error
+hi def link kixIfOK			Conditional
+hi def link kixSelectError		Error
+hi def link kixSelectOK		Conditional
+hi def link kixForNextError		Error
+hi def link kixForNextOK		Conditional
+hi def link kixForEachError		Error
+hi def link kixForEachOK		Conditional
+
+
+let b:current_syntax = "kix"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/kscript.vim b/syntax/kscript.vim
new file mode 100644
index 000000000..84d6126d3
--- /dev/null
+++ b/syntax/kscript.vim
@@ -0,0 +1,61 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kscript') == -1
+
+" Vim syntax file
+" Language:	kscript
+" Maintainer:	Thomas Capricelli <orzel@yalbi.com>
+" URL:		http://aquila.rezel.enst.fr/thomas/vim/kscript.vim
+" CVS:		$Id: kscript.vim,v 1.1 2004/06/13 17:40:02 vimboss Exp $
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn keyword	kscriptPreCondit	import from
+
+syn keyword	kscriptHardCoded	print println connect length arg mid upper lower isEmpty toInt toFloat findApplication
+syn keyword	kscriptConditional	if else switch
+syn keyword	kscriptRepeat		while for do foreach
+syn keyword	kscriptExceptions	emit catch raise try signal
+syn keyword	kscriptFunction		class struct enum
+syn keyword	kscriptConst		FALSE TRUE false true
+syn keyword	kscriptStatement	return delete
+syn keyword	kscriptLabel		case default
+syn keyword	kscriptStorageClass	const
+syn keyword	kscriptType		in out inout var
+
+syn keyword	kscriptTodo		contained TODO FIXME XXX
+
+syn region	kscriptComment		start="/\*" end="\*/" contains=kscriptTodo
+syn match	kscriptComment		"//.*" contains=kscriptTodo
+syn match	kscriptComment		"#.*$" contains=kscriptTodo
+
+syn region	kscriptString		start=+'+  end=+'+ skip=+\\\\\|\\'+
+syn region	kscriptString		start=+"+  end=+"+ skip=+\\\\\|\\"+
+syn region	kscriptString		start=+"""+  end=+"""+
+syn region	kscriptString		start=+'''+  end=+'''+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link kscriptConditional		Conditional
+hi def link kscriptRepeat			Repeat
+hi def link kscriptExceptions		Statement
+hi def link kscriptFunction		Function
+hi def link kscriptConst			Constant
+hi def link kscriptStatement		Statement
+hi def link kscriptLabel			Label
+hi def link kscriptStorageClass		StorageClass
+hi def link kscriptType			Type
+hi def link kscriptTodo			Todo
+hi def link kscriptComment		Comment
+hi def link kscriptString			String
+hi def link kscriptPreCondit		PreCondit
+hi def link kscriptHardCoded		Statement
+
+
+let b:current_syntax = "kscript"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/kwt.vim b/syntax/kwt.vim
new file mode 100644
index 000000000..7f4c4e8c8
--- /dev/null
+++ b/syntax/kwt.vim
@@ -0,0 +1,74 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kwt') == -1
+
+" Vim syntax file
+" Language:	kimwitu++
+" Maintainer:	Michael Piefel <entwurf@piefel.de>
+" Last Change:	2 May 2001
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+" Read the C++ syntax to start with
+runtime! syntax/cpp.vim
+unlet b:current_syntax
+
+" kimwitu++ extentions
+
+" Don't stop at eol, messes around with CPP mode, but gives line spanning
+" strings in unparse rules
+syn region cCppString		start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat
+syn keyword cType		integer real casestring nocasestring voidptr list
+syn keyword cType		uview rview uview_enum rview_enum
+
+" avoid unparsing rule sth:view being scanned as label
+syn clear   cUserCont
+syn match   cUserCont		"^\s*\I\i*\s*:$" contains=cUserLabel contained
+syn match   cUserCont		";\s*\I\i*\s*:$" contains=cUserLabel contained
+syn match   cUserCont		"^\s*\I\i*\s*:[^:]"me=e-1 contains=cUserLabel contained
+syn match   cUserCont		";\s*\I\i*\s*:[^:]"me=e-1 contains=cUserLabel contained
+
+" highlight phylum decls
+syn match   kwtPhylum		"^\I\i*:$"
+syn match   kwtPhylum		"^\I\i*\s*{\s*\(!\|\I\)\i*\s*}\s*:$"
+
+syn keyword kwtStatement	with foreach afterforeach provided
+syn match kwtDecl		"%\(uviewvar\|rviewvar\)"
+syn match kwtDecl		"^%\(uview\|rview\|ctor\|dtor\|base\|storageclass\|list\|attr\|member\|option\)"
+syn match kwtOption		"no-csgio\|no-unparse\|no-rewrite\|no-printdot\|no-hashtables\|smart-pointer\|weak-pointer"
+syn match kwtSep		"^%}$"
+syn match kwtSep		"^%{\(\s\+\I\i*\)*$"
+syn match kwtCast		"\<phylum_cast\s*<"me=e-1
+syn match kwtCast		"\<phylum_cast\s*$"
+
+
+" match views, remove paren error in brackets
+syn clear cErrInBracket
+syn match cErrInBracket		contained ")"
+syn match kwtViews		"\(\[\|<\)\@<=[ [:alnum:]_]\{-}:"
+
+" match rule bodies
+syn region kwtUnpBody		transparent keepend extend fold start="->\s*\[" start="^\s*\[" skip="\$\@<!{\_.\{-}\$\@<!}" end="\s]\s\=;\=$" end="^]\s\=;\=$" end="}]\s\=;\=$"
+syn region kwtRewBody		transparent keepend extend fold start="->\s*<" start="^\s*<" end="\s>\s\=;\=$" end="^>\s\=;\=$"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link kwtStatement	cppStatement
+hi def link kwtDecl	cppStatement
+hi def link kwtCast	cppStatement
+hi def link kwtSep	Delimiter
+hi def link kwtViews	Label
+hi def link kwtPhylum	Type
+hi def link kwtOption	PreProc
+"hi def link cText	Comment
+
+
+syn sync lines=300
+
+let b:current_syntax = "kwt"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/lace.vim b/syntax/lace.vim
new file mode 100644
index 000000000..084d51871
--- /dev/null
+++ b/syntax/lace.vim
@@ -0,0 +1,126 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lace') == -1
+
+" Vim syntax file
+" Language:		lace
+" Maintainer:	Jocelyn Fiat <utilities@eiffel.com>
+" Last Change:	2001 May 09
+
+" Copyright Interactive Software Engineering, 1998
+" You are free to use this file as you please, but
+" if you make a change or improvement you must send
+" it to the maintainer at <utilities@eiffel.com>
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" LACE is case insensitive, but the style guide lines are not.
+
+if !exists("lace_case_insensitive")
+	syn case match
+else
+	syn case ignore
+endif
+
+" A bunch of useful LACE keywords
+syn keyword laceTopStruct		system root default option visible cluster
+syn keyword laceTopStruct		external generate end
+syn keyword laceOptionClause	collect assertion debug optimize trace
+syn keyword laceOptionClause	profile inline precompiled multithreaded
+syn keyword laceOptionClause	exception_trace dead_code_removal
+syn keyword laceOptionClause	array_optimization
+syn keyword laceOptionClause	inlining_size inlining
+syn keyword laceOptionClause	console_application dynamic_runtime
+syn keyword laceOptionClause	line_generation
+syn keyword laceOptionMark		yes no all
+syn keyword laceOptionMark		require ensure invariant loop check
+syn keyword laceClusterProp		use include exclude
+syn keyword laceAdaptClassName	adapt ignore rename as
+syn keyword laceAdaptClassName	creation export visible
+syn keyword laceExternal		include_path object makefile
+
+" Operators
+syn match   laceOperator		"\$"
+syn match   laceBrackets		"[[\]]"
+syn match   laceExport			"[{}]"
+
+" Constants
+syn keyword laceBool		true false
+syn keyword laceBool		True False
+syn region  laceString		start=+"+ skip=+%"+ end=+"+ contains=laceEscape,laceStringError
+syn match   laceEscape		contained "%[^/]"
+syn match   laceEscape		contained "%/\d\+/"
+syn match   laceEscape		contained "^[ \t]*%"
+syn match   laceEscape		contained "%[ \t]*$"
+syn match   laceStringError	contained "%/[^0-9]"
+syn match   laceStringError	contained "%/\d\+[^0-9/]"
+syn match   laceStringError	"'\(%[^/]\|%/\d\+/\|[^'%]\)\+'"
+syn match   laceCharacter	"'\(%[^/]\|%/\d\+/\|[^'%]\)'" contains=laceEscape
+syn match   laceNumber		"-\=\<\d\+\(_\d\+\)*\>"
+syn match   laceNumber		"\<[01]\+[bB]\>"
+syn match   laceNumber		"-\=\<\d\+\(_\d\+\)*\.\(\d\+\(_\d\+\)*\)\=\([eE][-+]\=\d\+\(_\d\+\)*\)\="
+syn match   laceNumber		"-\=\.\d\+\(_\d\+\)*\([eE][-+]\=\d\+\(_\d\+\)*\)\="
+syn match   laceComment		"--.*" contains=laceTodo
+
+
+syn case match
+
+" Case sensitive stuff
+
+syn keyword laceTodo		TODO XXX FIXME
+syn match	laceClassName	"\<[A-Z][A-Z0-9_]*\>"
+syn match	laceCluster		"[a-zA-Z][a-zA-Z0-9_]*\s*:"
+syn match	laceCluster		"[a-zA-Z][a-zA-Z0-9_]*\s*(\s*[a-zA-Z][a-zA-Z0-9_]*\s*)\s*:"
+
+" Catch mismatched parentheses
+syn match laceParenError	")"
+syn match laceBracketError	"\]"
+syn region laceGeneric		transparent matchgroup=laceBrackets start="\[" end="\]" contains=ALLBUT,laceBracketError
+syn region laceParen		transparent start="(" end=")" contains=ALLBUT,laceParenError
+
+" Should suffice for even very long strings and expressions
+syn sync lines=40
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link laceTopStruct			PreProc
+
+hi def link laceOptionClause		Statement
+hi def link laceOptionMark			Constant
+hi def link laceClusterProp		Label
+hi def link laceAdaptClassName		Label
+hi def link laceExternal			Statement
+hi def link laceCluster			ModeMsg
+
+hi def link laceEscape				Special
+
+hi def link laceBool				Boolean
+hi def link laceString				String
+hi def link laceCharacter			Character
+hi def link laceClassName			Type
+hi def link laceNumber				Number
+
+hi def link laceOperator			Special
+hi def link laceArray				Special
+hi def link laceExport				Special
+hi def link laceCreation			Special
+hi def link laceBrackets			Special
+hi def link laceConstraint			Special
+
+hi def link laceComment			Comment
+
+hi def link laceError				Error
+hi def link laceStringError		Error
+hi def link laceParenError			Error
+hi def link laceBracketError		Error
+hi def link laceTodo				Todo
+
+
+let b:current_syntax = "lace"
+
+" vim: ts=4
+
+endif
diff --git a/syntax/latte.vim b/syntax/latte.vim
new file mode 100644
index 000000000..1dea60cfa
--- /dev/null
+++ b/syntax/latte.vim
@@ -0,0 +1,85 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latte') == -1
+
+" Vim syntax file
+" Language:	Latte
+" Maintainer:	Nick Moffitt, <nick@zork.net>
+" Last Change:	14 June, 2000
+"
+" Notes:
+" I based this on the TeX and Scheme syntax files (but mostly scheme).
+" See http://www.latte.org for info on the language.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match latteError "[{}\\]"
+syn match latteOther "\\{"
+syn match latteOther "\\}"
+syn match latteOther "\\\\"
+
+setlocal iskeyword=33,43,45,48-57,63,65-90,95,97-122,_
+
+syn region latteVar matchgroup=SpecialChar start=!\\[A-Za-z_]!rs=s+1 end=![^A-Za-z0-9?!+_-]!me=e-1 contains=ALLBUT,latteNumber,latteOther
+syn region latteVar matchgroup=SpecialChar start=!\\[=\&][A-Za-z_]!rs=s+2 end=![^A-Za-z0-9?!+_-]!me=e-1 contains=ALLBUT,latteNumber,latteOther
+syn region latteString	start=+\\"+ skip=+\\\\"+ end=+\\"+
+
+syn region latteGroup	matchgroup=Delimiter start="{" skip="\\[{}]" matchgroup=Delimiter end="}" contains=ALLBUT,latteSyntax
+
+syn region latteUnquote matchgroup=Delimiter start="\\,{" skip="\\[{}]" matchgroup=Delimiter end="}" contains=ALLBUT,latteSyntax
+syn region latteSplice matchgroup=Delimiter start="\\,@{" skip="\\[{}]" matchgroup=Delimiter end="}" contains=ALLBUT,latteSyntax
+syn region latteQuote matchgroup=Delimiter start="\\'{" skip="\\[{}]" matchgroup=Delimiter end="}"
+syn region latteQuote matchgroup=Delimiter start="\\`{" skip="\\[{}]" matchgroup=Delimiter end="}" contains=latteUnquote,latteSplice
+
+syn match  latteOperator   '\\/'
+syn match  latteOperator   '='
+
+syn match  latteComment	"\\;.*$"
+
+" This was gathered by slurping in the index.
+
+syn keyword latteSyntax __FILE__ __latte-version__ contained
+syn keyword latteSyntax _bal-tag _pre _tag add and append apply back contained
+syn keyword latteSyntax caar cadr car cdar cddr cdr ceil compose contained
+syn keyword latteSyntax concat cons def defmacro divide downcase contained
+syn keyword latteSyntax empty? equal? error explode file-contents contained
+syn keyword latteSyntax floor foreach front funcall ge?  getenv contained
+syn keyword latteSyntax greater-equal? greater? group group? gt? html contained
+syn keyword latteSyntax if include lambda le? length less-equal? contained
+syn keyword latteSyntax less? let lmap load-file load-library lt?  macro contained
+syn keyword latteSyntax member?  modulo multiply not nth operator? contained
+syn keyword latteSyntax or ordinary quote process-output push-back contained
+syn keyword latteSyntax push-front quasiquote quote random rdc reverse contained
+syn keyword latteSyntax set!  snoc splicing unquote strict-html4 contained
+syn keyword latteSyntax string-append string-ge?  string-greater-equal? contained
+syn keyword latteSyntax string-greater?  string-gt?  string-le? contained
+syn keyword latteSyntax string-less-equal?  string-less?  string-lt? contained
+syn keyword latteSyntax string?  subseq substr subtract  contained
+syn keyword latteSyntax upcase useless warn while zero?  contained
+
+
+" If it's good enough for scheme...
+
+syn sync match matchPlace grouphere NONE "^[^ \t]"
+" ... i.e. synchronize on a line that starts at the left margin
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link latteSyntax		Statement
+hi def link latteVar			Function
+
+hi def link latteString		String
+hi def link latteQuote			String
+
+hi def link latteDelimiter		Delimiter
+hi def link latteOperator		Operator
+
+hi def link latteComment		Comment
+hi def link latteError			Error
+
+
+let b:current_syntax = "latte"
+
+endif
diff --git a/syntax/ld.vim b/syntax/ld.vim
new file mode 100644
index 000000000..4646b0aa8
--- /dev/null
+++ b/syntax/ld.vim
@@ -0,0 +1,85 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ld') == -1
+
+" Vim syntax file
+" Language:             ld(1) script
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword ldTodo          contained TODO FIXME XXX NOTE
+
+syn region  ldComment       start='/\*' end='\*/' contains=ldTodo,@Spell
+
+syn region  ldFileName      start=+"+ end=+"+
+
+syn keyword ldPreProc       SECTIONS MEMORY OVERLAY PHDRS VERSION INCLUDE
+syn match   ldPreProc       '\<VERS_\d\+\.\d\+'
+
+syn keyword ldFunction      ABSOLUTE ADDR ALIGN BLOCK DATA_SEGMENT_ALIGN
+                            \ DATA_SEGMENT_END DATA_SEGMENT_RELRO_END DEFINED
+                            \ LOADADDR MAX MIN NEXT SIZEOF SIZEOF_HEADERS
+                            \ sizeof_headers
+
+syn keyword ldKeyword       ENTRY INPUT GROUP OUTPUT
+                            \ SEARCH_DIR STARTUP OUTPUT_FORMAT TARGET
+                            \ ASSERT EXTERN FORCE_COMMON_ALLOCATION
+                            \ INHIBIT_COMMON_ALLOCATION NOCROSSREFS OUTPUT_ARCH
+                            \ PROVIDE EXCLUDE_FILE SORT KEEP FILL
+                            \ CREATE_OBJECT_SYMBOLS CONSTRUCTORS SUBALIGN
+                            \ FILEHDR AT __asm__ ABSOLUTE
+
+syn keyword ldDataType      BYTE SHORT LONG QUAD SQUAD
+syn keyword ldOutputType    NOLOAD DSECT COPY INFO OVERLAY
+syn keyword ldPTType        PT_NULL PT_LOAD PT_DYNAMIC PT_INTERP
+                            \ PT_NOTE PT_SHLIB PT_PHDR
+
+syn keyword ldSpecial       COMMON
+syn match   ldSpecial       '/DISCARD/'
+
+syn keyword ldIdentifier    ORIGIN LENGTH
+
+syn match   ldSpecSections  '\.'
+syn match   ldSections      '\.\S\+'
+syn match   ldSpecSections  '\.\%(text\|data\|bss\|symver\)\>'
+
+syn match   ldNumber        display '\<0[xX]\x\+\>'
+syn match   ldNumber        display '\d\+[KM]\>' contains=ldNumberMult
+syn match   ldNumberMult    display '\(\d\+\)\@<=[KM]\>'
+syn match   ldOctal         contained display '\<0\o\+\>'
+                            \ contains=ldOctalZero
+syn match   ldOctalZero     contained display '\<0'
+syn match   ldOctalError    contained display '\<0\o*[89]\d*\>'
+
+
+hi def link ldTodo          Todo
+hi def link ldComment       Comment
+hi def link ldFileName      String
+hi def link ldPreProc       PreProc
+hi def link ldFunction      Identifier
+hi def link ldKeyword       Keyword
+hi def link ldType          Type
+hi def link ldDataType      ldType
+hi def link ldOutputType    ldType
+hi def link ldPTType        ldType
+hi def link ldSpecial       Special
+hi def link ldIdentifier    Identifier
+hi def link ldSections      Constant
+hi def link ldSpecSections  Special
+hi def link ldNumber        Number
+hi def link ldNumberMult    PreProc
+hi def link ldOctal         ldNumber
+hi def link ldOctalZero     PreProc
+hi def link ldOctalError    Error
+
+let b:current_syntax = "ld"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/ldif.vim b/syntax/ldif.vim
new file mode 100644
index 000000000..ac73f285e
--- /dev/null
+++ b/syntax/ldif.vim
@@ -0,0 +1,37 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ldif') == -1
+
+" Vim syntax file
+" Language:	LDAP LDIF
+" Maintainer:	Zak Johnson <zakj@nox.cx>
+" Last Change:	2003-12-30
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn sync minlines=10 linebreaks=1
+
+syn match ldifAttribute /^[^ #][^:]*/ contains=ldifOption display
+syn match ldifOption /;[^:]\+/ contained contains=ldifPunctuation display
+syn match ldifPunctuation /;/ contained display
+
+syn region ldifStringValue matchgroup=ldifPunctuation start=/: /  end=/\_$/ skip=/\n /
+syn region ldifBase64Value matchgroup=ldifPunctuation start=/:: / end=/\_$/ skip=/\n /
+syn region ldifFileValue   matchgroup=ldifPunctuation start=/:< / end=/\_$/ skip=/\n /
+
+syn region ldifComment start=/^#/ end=/\_$/ skip=/\n /
+
+
+hi def link ldifAttribute		Type
+hi def link ldifOption		Identifier
+hi def link ldifPunctuation	Normal
+hi def link ldifStringValue	String
+hi def link ldifBase64Value	Special
+hi def link ldifFileValue		Special
+hi def link ldifComment		Comment
+
+
+let b:current_syntax = "ldif"
+
+endif
diff --git a/syntax/lex.vim b/syntax/lex.vim
new file mode 100644
index 000000000..15ca5e010
--- /dev/null
+++ b/syntax/lex.vim
@@ -0,0 +1,192 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lex') == -1
+
+" Vim syntax file
+" Language:	Lex and Flex
+" Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Contributor:	Robert A. van Engelen <engelen@acm.org>
+" Last Change:	Apr 24, 2020
+" Version:	18
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Read the C++ syntax to start with
+let s:Cpath= fnameescape(expand("<sfile>:p:h")."/cpp.vim")
+if !filereadable(s:Cpath)
+ for s:Cpath in split(globpath(&rtp,"syntax/cpp.vim"),"\n")
+  if filereadable(fnameescape(s:Cpath))
+   let s:Cpath= fnameescape(s:Cpath)
+   break
+  endif
+ endfor
+endif
+exe "syn include @lexCcode ".s:Cpath
+
+" --- ========= ---
+" --- Lex stuff ---
+" --- ========= ---
+
+" Definitions
+" %%
+" Rules
+" %%
+" User Code
+"
+" --- ======= ---
+" --- Example ---
+" --- ======= ---
+"
+"   // this is a valid lex file
+"   // indented initial code block
+"   #include <stdlib.h>
+" %{
+" // initial code block
+" #include <stdio.h>
+" const char *sep = "";
+" %}
+" %option outfile="scanner.c" noyywrap nodefault
+" %x COMMENT
+" id      [A-Za-z_][A-Za-z0-9_]*
+" %%
+"   // indented initial action code block
+"   printf("BEGIN");
+" {id}    printf("%s%s", sep, yytext); sep = "";
+" .       |
+" \n      { sep = "\n"; }
+" "/*"    { BEGIN COMMENT; }
+" "//".*  { }
+" <COMMENT>{
+" "*/"    { BEGIN INITIAL; }
+" .|\n    
+" }
+" <*><<EOF>> { // end of file
+"              printf("\nEND\n");
+"              yyterminate();
+"            }
+" %%
+" void scan()
+" {
+"   while (yylex())
+"     continue;
+" }
+" /* main program */
+" int main()
+" { 
+"   scan();
+" }   
+
+" Definitions Section with initial code blocks, abbreviations, options, states
+if has("folding")
+ syn region lexAbbrvBlock	fold	start="^\S"	end="^\ze%%"	skipnl	nextgroup=lexPatBlock	contains=lexOptions,lexAbbrv,lexInitialCodeBlock,lexInclude,lexAbbrvComment,lexStartState
+else
+ syn region lexAbbrvBlock		start="^\S"	end="^\ze%%"	skipnl	nextgroup=lexPatBlock	contains=lexOptions,lexAbbrv,lexInitialCodeBlock,lexInclude,lexAbbrvComment,lexStartState
+endif
+syn match  lexOptions		"^%\a\+\(\s.*\|[^{]*\)$"				contains=lexOptionsEq,lexPatString,lexSlashQuote,lexBrace,lexSlashBrace
+syn match  lexOptionsEq		"="					skipwhite	contained
+syn match  lexAbbrv		"^\I\i*\s"me=e-1			skipwhite	contained	nextgroup=lexAbbrvPat
+syn match  lexAbbrvPat		"\s\S.*$"lc=1						contained	contains=lexPatAbbrv,lexPatString,lexSlashQuote,lexBrace,lexSlashBrace	nextgroup=lexAbbrv,lexInclude
+syn match  lexStartState	"^%\(xs\?\|s\)\(t\(a\(t\(e\?\)\?\)\?\)\?\)\?\(\s\+\I\i*\)\+\s*$"	contained	contains=lexStartStateCmd
+syn match  lexStartStateCmd	'^%\(xs\?\|s\)\(t\(a\(t\(e\?\)\?\)\?\)\?\)\?'	contained
+if has("folding")
+ syn region lexInitialCodeBlock	fold				start="^\s\+"	end="^\S"me=e-1			contains=@lexCcode
+ syn region lexInclude		fold	matchgroup=lexSep	start="^%\a*{"	end="^%\?}"	contained	contains=@lexCcode,lexCFunctions
+ syn region lexAbbrvComment	fold				start="^\s*//"	end="$"		contains=@Spell
+ syn region lexAbbrvComment	fold				start="^\s*/\*"	end="\*/"	contains=@Spell
+else
+ syn region lexInitialCodeBlock					start="^\s\+"	end="^\S"me=e-1			contains=@lexCcode
+ syn region lexInclude			matchgroup=lexSep	start="^%\a*{"	end="^%\?}"	contained	contains=@lexCcode,lexCFunctions
+ syn region lexAbbrvComment					start="^\s*//"	end="$"		contains=@Spell
+ syn region lexAbbrvComment					start="^\s*/\*"	end="\*/"	contains=@Spell
+endif
+
+" Rules Section with patterns and actions
+if has("folding")
+ syn region lexPatBlock		fold	matchgroup=Todo		start="^%%"	matchgroup=Todo		end="^\ze%%"	skipnl	skipwhite	nextgroup=lexFinalCodeBlock	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatSep,lexPatInclude
+ syn region lexPat		fold				start="\S"	skip="\\\\\|\\\s"	end="\ze\(\s*$\|\s\+\(\h\|{\W\|{$\|[-+*]\|//\|/\*\)\)"	skipwhite	contained nextgroup=lexMorePat,lexPatSep,lexPatEnd	contains=lexPatTag,lexPatString,lexSlashQuote,lexPatAbbrv,lexBrace,lexSlashBrace
+ syn region lexPatInclude	fold	matchgroup=lexSep	start="^%{"	end="^%}"	contained	contains=@lexCcode
+ syn region lexBrace		fold	matchgroup=Character	start="\["	skip="\\.\|\[:\a\+:\]\|\[\.\a\+\.\]\|\[=.=\]"	end="\]"	contained
+ syn region lexPatString	fold	matchgroup=String	start=+"+	skip=+\\\\\|\\"+	matchgroup=String	end=+"+	contained
+else
+ syn region lexPatBlock			matchgroup=Todo		start="^%%"	matchgroup=Todo		end="^\ze%%"	skipnl	skipwhite	nextgroup=lexFinalCodeBlock	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatSep,lexPatInclude
+ syn region lexPat						start="\S"	skip="\\\\\|\\\s"	end="\ze\(\s*$\|\s\+\(\h\|{\W\|{$\|[-+*]\|//\|/\*\)\)"	skipwhite	contained nextgroup=lexMorePat,lexPatSep,lexPatEnd	contains=lexPatTag,lexPatString,lexSlashQuote,lexPatAbbrv,lexBrace,lexSlashBrace
+ syn region lexPatInclude		matchgroup=lexSep	start="^%{"	end="^%}"	contained	contains=@lexCcode
+ syn region lexBrace			matchgroup=Character	start="\["	skip="\\.\|\[:\a\+:\]\|\[\.\a\+\.\]\|\[=.=\]"	end="\]"	contained
+ syn region lexPatString		matchgroup=String	start=+"+	skip=+\\\\\|\\"+	matchgroup=String	end=+"+	contained
+endif
+syn match  lexPatAbbrv		"{\I\i*}"hs=s+1,he=e-1					contained
+syn match  lexPatTag		"^<\^\?\(\I\i*\|\*\)\(,\^\?\(\I\i*\|\*\)\)*>"		contained	nextgroup=lexPat,lexMorePat,lexPatSep,lexPatEnd
+syn match  lexPatTagZone	"^<\^\?\(\I\i*\|\*\)\(,\^\?\(\I\i*\|\*\)\)*>\s*{$"me=e-1	contained	nextgroup=lexPatTagZoneStart
+
+if has("folding")
+ syn region lexPatTagZoneStart	fold	matchgroup=lexPatTag	start='{$'	end='^}'	skipnl	skipwhite	contained	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatSep,lexPatInclude
+ syn region lexPatComment	fold	start="//"	end="$"		skipnl	contained	contains=cTodo	skipwhite	nextgroup=lexPatComment,lexPat,@Spell
+ syn region lexPatComment	fold	start="/\*"	end="\*/"	skipnl	contained	contains=cTodo	skipwhite	nextgroup=lexPatComment,lexPat,@Spell
+else
+ syn region lexPatTagZoneStart		matchgroup=lexPatTag		start='{'	end='^}'	skipnl	skipwhitecontained	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatSep,lexPatInclude
+ syn region lexPatComment		start="//"	end="$"		skipnl	contained	contains=cTodo	skipwhite	nextgroup=lexPatComment,lexPat,@Spell
+ syn region lexPatComment		start="/\*"	end="\*/"	skipnl	contained	contains=cTodo	skipwhite	nextgroup=lexPatComment,lexPat,@Spell
+endif
+syn match  lexPatEnd		"\s*$"				skipnl	contained
+syn match  lexPatCodeLine	"[^{\[].*"				contained	contains=@lexCcode,lexCFunctions
+syn match  lexMorePat		"\s*|\s*$"			skipnl	contained	nextgroup=lexPat,lexPatTag,lexPatComment
+syn match  lexPatSep		"\s\+"					contained	nextgroup=lexMorePat,lexPatCode,lexPatCodeLine
+syn match  lexSlashQuote	+\(\\\\\)*\\"+				contained
+syn match  lexSlashBrace	+\(\\\\\)*\\\[+				contained
+if has("folding")
+ syn region lexPatCode		fold	matchgroup=Delimiter	start="{"	end="}"	skipnl	contained	contains=@lexCcode,lexCFunctions
+else
+ syn region lexPatCode			matchgroup=Delimiter	start="{"	end="}"	skipnl	contained	contains=@lexCcode,lexCFunctions
+endif
+
+" User Code Section with final code block
+syn region lexFinalCodeBlock	matchgroup=Todo	start="^%%"	end="\%$"	contained	contains=@lexCcode
+
+" Lex macros which may appear in C/C++ code blocks
+syn keyword lexCFunctions	BEGIN	ECHO	REJECT	yytext	YYText	yyleng	YYLeng	yymore	yyless	yywrap	yylook
+syn keyword lexCFunctions	yyrestart	yyterminate	yylineno	yycolumno	yyin	yyout
+syn keyword lexCFunctions	input	unput	output		winput		wunput		woutput
+syn keyword lexCFunctions	yyinput	yyunput	yyoutput	yywinput	yywunput	yywoutput
+
+" <c.vim> includes several ALLBUTs; these have to be treated so as to exclude lex* groups
+syn cluster cParenGroup		add=lex.*
+syn cluster cDefineGroup	add=lex.*
+syn cluster cPreProcGroup	add=lex.*
+syn cluster cMultiGroup		add=lex.*
+
+" Synchronization
+syn sync clear
+syn sync minlines=500
+syn sync match lexSyncPat	grouphere  lexPatBlock	"^%[a-zA-Z]"
+syn sync match lexSyncPat	groupthere lexPatBlock	"^<$"
+syn sync match lexSyncPat	groupthere lexPatBlock	"^%%"
+
+" The default highlighting.
+if !exists("skip_lex_syntax_inits")
+ hi def link lexAbbrvComment	lexPatComment
+ hi def link lexAbbrvPat	lexPat
+ hi def link lexAbbrv		Special
+ hi def link lexBrace		lexPat
+ hi def link lexCFunctions	PreProc
+ hi def link lexMorePat		Special
+ hi def link lexOptions		PreProc
+ hi def link lexOptionsEq	Operator
+ hi def link lexPatComment	Comment
+ hi def link lexPat		Function
+ hi def link lexPatString	lexPat
+ hi def link lexPatAbbrv	Special
+ hi def link lexPatTag		Statement
+ hi def link lexPatTagZone	lexPatTag
+ hi def link lexSep		Delimiter
+ hi def link lexSlashQuote	lexPat
+ hi def link lexSlashBrace	lexPat
+ hi def link lexStartState	lexPatTag
+ hi def link lexStartStateCmd	Special
+endif
+
+let b:current_syntax = "lex"
+
+" vim:ts=8
+
+endif
diff --git a/syntax/lftp.vim b/syntax/lftp.vim
new file mode 100644
index 000000000..b70595537
--- /dev/null
+++ b/syntax/lftp.vim
@@ -0,0 +1,156 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lftp') == -1
+
+" Vim syntax file
+" Language:             lftp(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-06-17
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword+=-
+
+syn region  lftpComment         display oneline start='#' end='$'
+                                \ contains=lftpTodo,@Spell
+
+syn keyword lftpTodo            contained TODO FIXME XXX NOTE
+
+syn region  lftpString          contained display
+                                \ start=+"+ skip=+\\$\|\\"+ end=+"+ end=+$+
+
+syn match   lftpNumber          contained display '\<\d\+\(\.\d\+\)\=\>'
+
+syn keyword lftpBoolean         contained yes no on off true false
+
+syn keyword lftpInterval        contained infinity inf never forever
+syn match   lftpInterval        contained '\<\(\d\+\(\.\d\+\)\=[dhms]\)\+\>'
+
+syn keyword lftpKeywords        alias anon at bookmark cache cat cd chmod close
+                                \ cls command debug du echo exit fg find get
+                                \ get1 glob help history jobs kill lcd lftp
+                                \ lpwd ls mget mirror mkdir module more mput
+                                \ mrm mv nlist open pget put pwd queue quote
+                                \ reget recls rels renlist repeat reput rm
+                                \ rmdir scache site source suspend user version
+                                \ wait zcat zmore
+
+syn region  lftpSet             matchgroup=lftpKeywords
+                                \ start="set" end=";" end="$"
+                                \ contains=lftpString,lftpNumber,lftpBoolean,
+                                \ lftpInterval,lftpSettingsPrefix,lftpSettings
+syn match   lftpSettingsPrefix  contained '\<\%(bmk\|cache\|cmd\|color\|dns\):'
+syn match   lftpSettingsPrefix  contained '\<\%(file\|fish\|ftp\|hftp\):'
+syn match   lftpSettingsPrefix  contained '\<\%(http\|https\|mirror\|module\):'
+syn match   lftpSettingsPrefix  contained '\<\%(net\|sftp\|ssl\|xfer\):'
+" bmk:
+syn keyword lftpSettings        contained save-p[asswords]
+" cache:
+syn keyword lftpSettings        contained cache-em[pty-listings] en[able]
+                                \ exp[ire] siz[e]
+" cmd:
+syn keyword lftpSettings        contained at[-exit] cls-c[ompletion-default]
+                                \ cls-d[efault] cs[h-history]
+                                \ default-p[rotocol] default-t[itle]
+syn keyword lftpSettings        contained fai[l-exit] in[teractive]
+                                \ lo[ng-running] ls[-default] mo[ve-background]
+                                \ prom[pt]
+                                \ rem[ote-completion]
+                                \ save-c[wd-history] save-r[l-history]
+                                \ set-t[erm-status] statu[s-interval]
+                                \ te[rm-status] verb[ose] verify-h[ost]
+                                \ verify-path verify-path[-cached]
+" color:
+syn keyword lftpSettings        contained dir[-colors] use-c[olor]
+" dns:
+syn keyword lftpSettings        contained S[RV-query] cache-en[able]
+                                \ cache-ex[pire] cache-s[ize]
+                                \ fat[al-timeout] o[rder] use-fo[rk]
+" file:
+syn keyword lftpSettings        contained ch[arset]
+" fish:
+syn keyword lftpSettings        contained connect[-program] sh[ell]
+" ftp:
+syn keyword lftpSettings        contained acct anon-p[ass] anon-u[ser]
+                                \ au[to-sync-mode] b[ind-data-socket]
+                                \ ch[arset] cli[ent] dev[ice-prefix]
+                                \ fi[x-pasv-address] fxp-f[orce]
+                                \ fxp-p[assive-source] h[ome] la[ng]
+                                \ list-e[mpty-ok] list-o[ptions]
+                                \ nop[-interval] pas[sive-mode]
+                                \ port-i[pv4] port-r[ange] prox[y]
+                                \ rest-l[ist] rest-s[tor]
+                                \ retry-530 retry-530[-anonymous]
+                                \ sit[e-group] skey-a[llow]
+                                \ skey-f[orce] ssl-allow
+                                \ ssl-allow[-anonymous] ssl-au[th]
+                                \ ssl-f[orce] ssl-protect-d[ata]
+                                \ ssl-protect-l[ist] stat-[interval]
+                                \ sy[nc-mode] timez[one] use-a[bor]
+                                \ use-fe[at] use-fx[p] use-hf[tp]
+                                \ use-mdtm use-mdtm[-overloaded]
+                                \ use-ml[sd] use-p[ret] use-q[uit]
+                                \ use-site-c[hmod] use-site-i[dle]
+                                \ use-site-u[time] use-siz[e]
+                                \ use-st[at] use-te[lnet-iac]
+                                \ verify-a[ddress] verify-p[ort]
+                                \ w[eb-mode]
+" hftp:
+syn keyword lftpSettings        contained w[eb-mode] cache prox[y]
+                                \ use-au[thorization] use-he[ad] use-ty[pe]
+" http:
+syn keyword lftpSettings        contained accept accept-c[harset]
+                                \ accept-l[anguage] cache coo[kie]
+                                \ pos[t-content-type] prox[y]
+                                \ put-c[ontent-type] put-m[ethod] ref[erer]
+                                \ set-c[ookies] user[-agent]
+" https:
+syn keyword lftpSettings        contained prox[y]
+" mirror:
+syn keyword lftpSettings        contained exc[lude-regex] o[rder]
+                                \ parallel-d[irectories]
+                                \ parallel-t[ransfer-count] use-p[get-n]
+" module:
+syn keyword lftpSettings        contained pat[h]
+" net:
+syn keyword lftpSettings        contained connection-l[imit]
+                                \ connection-t[akeover] id[le] limit-m[ax]
+                                \ limit-r[ate] limit-total-m[ax]
+                                \ limit-total-r[ate] max-ret[ries] no-[proxy]
+                                \ pe[rsist-retries] reconnect-interval-b[ase]
+                                \ reconnect-interval-ma[x]
+                                \ reconnect-interval-mu[ltiplier]
+                                \ socket-bind-ipv4 socket-bind-ipv6
+                                \ socket-bu[ffer] socket-m[axseg] timeo[ut]
+" sftp:
+syn keyword lftpSettings        contained connect[-program]
+                                \ max-p[ackets-in-flight] prot[ocol-version]
+                                \ ser[ver-program] size-r[ead] size-w[rite]
+" ssl:
+syn keyword lftpSettings        contained ca-f[ile] ca-p[ath] ce[rt-file]
+                                \ crl-f[ile] crl-p[ath] k[ey-file]
+                                \ verify-c[ertificate]
+" xfer:
+syn keyword lftpSettings        contained clo[bber] dis[k-full-fatal]
+                                \ eta-p[eriod] eta-t[erse] mak[e-backup]
+                                \ max-red[irections] ra[te-period]
+
+hi def link lftpComment         Comment
+hi def link lftpTodo            Todo
+hi def link lftpString          String
+hi def link lftpNumber          Number
+hi def link lftpBoolean         Boolean
+hi def link lftpInterval        Number
+hi def link lftpKeywords        Keyword
+hi def link lftpSettingsPrefix  PreProc
+hi def link lftpSettings        Type
+
+let b:current_syntax = "lftp"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/lhaskell.vim b/syntax/lhaskell.vim
new file mode 100644
index 000000000..c1dacf1f8
--- /dev/null
+++ b/syntax/lhaskell.vim
@@ -0,0 +1,127 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lhaskell') == -1
+
+" Vim syntax file
+" Language:		Haskell with literate comments, Bird style,
+"			TeX style and plain text surrounding
+"			\begin{code} \end{code} blocks
+" Maintainer:		Haskell Cafe mailinglist <haskell-cafe@haskell.org>
+" Original Author:	Arthur van Leeuwen <arthurvl@cs.uu.nl>
+" Last Change:		2010 Apr 11
+" Version:		1.04
+"
+" Thanks to Ian Lynagh for thoughtful comments on initial versions and
+" for the inspiration for writing this in the first place.
+"
+" This style guesses as to the type of markup used in a literate haskell
+" file and will highlight (La)TeX markup if it finds any
+" This behaviour can be overridden, both glabally and locally using
+" the lhs_markup variable or b:lhs_markup variable respectively.
+"
+" lhs_markup	    must be set to either  tex	or  none  to indicate that
+"		    you always want (La)TeX highlighting or no highlighting
+"		    must not be set to let the highlighting be guessed
+" b:lhs_markup	    must be set to eiterh  tex	or  none  to indicate that
+"		    you want (La)TeX highlighting or no highlighting for
+"		    this particular buffer
+"		    must not be set to let the highlighting be guessed
+"
+"
+" 2004 February 18: New version, based on Ian Lynagh's TeX guessing
+"		    lhaskell.vim, cweb.vim, tex.vim, sh.vim and fortran.vim
+" 2004 February 20: Cleaned up the guessing and overriding a bit
+" 2004 February 23: Cleaned up syntax highlighting for \begin{code} and
+"		    \end{code}, added some clarification to the attributions
+" 2008 July 1:      Removed % from guess list, as it totally breaks plain
+"                   text markup guessing
+" 2009 April 29:    Fixed highlighting breakage in TeX mode, 
+"                   thanks to Kalman Noel
+"
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" First off, see if we can inherit a user preference for lhs_markup
+if !exists("b:lhs_markup")
+    if exists("lhs_markup")
+	if lhs_markup =~ '\<\%(tex\|none\)\>'
+	    let b:lhs_markup = matchstr(lhs_markup,'\<\%(tex\|none\)\>')
+	else
+	    echohl WarningMsg | echo "Unknown value of lhs_markup" | echohl None
+	    let b:lhs_markup = "unknown"
+	endif
+    else
+	let b:lhs_markup = "unknown"
+    endif
+else
+    if b:lhs_markup !~ '\<\%(tex\|none\)\>'
+	let b:lhs_markup = "unknown"
+    endif
+endif
+
+" Remember where the cursor is, and go to upperleft
+let s:oldline=line(".")
+let s:oldcolumn=col(".")
+call cursor(1,1)
+
+" If no user preference, scan buffer for our guess of the markup to
+" highlight. We only differentiate between TeX and plain markup, where
+" plain is not highlighted. The heuristic for finding TeX markup is if
+" one of the following occurs anywhere in the file:
+"   - \documentclass
+"   - \begin{env}       (for env != code)
+"   - \part, \chapter, \section, \subsection, \subsubsection, etc
+if b:lhs_markup == "unknown"
+    if search('\\documentclass\|\\begin{\(code}\)\@!\|\\\(sub\)*section\|\\chapter|\\part','W') != 0
+	let b:lhs_markup = "tex"
+    else
+	let b:lhs_markup = "plain"
+    endif
+endif
+
+" If user wants us to highlight TeX syntax or guess thinks it's TeX, read it.
+if b:lhs_markup == "tex"
+    runtime! syntax/tex.vim
+    unlet b:current_syntax
+    " Tex.vim removes "_" from 'iskeyword', but we need it for Haskell.
+    setlocal isk+=_
+    syntax cluster lhsTeXContainer contains=tex.*Zone,texAbstract
+else
+    syntax cluster lhsTeXContainer contains=.*
+endif
+
+" Literate Haskell is Haskell in between text, so at least read Haskell
+" highlighting
+syntax include @haskellTop syntax/haskell.vim
+
+syntax region lhsHaskellBirdTrack start="^>" end="\%(^[^>]\)\@=" contains=@haskellTop,lhsBirdTrack containedin=@lhsTeXContainer
+syntax region lhsHaskellBeginEndBlock start="^\\begin{code}\s*$" matchgroup=NONE end="\%(^\\end{code}.*$\)\@=" contains=@haskellTop,beginCodeBegin containedin=@lhsTeXContainer
+
+syntax match lhsBirdTrack "^>" contained
+
+syntax match beginCodeBegin "^\\begin" nextgroup=beginCodeCode contained
+syntax region beginCodeCode  matchgroup=texDelimiter start="{" end="}"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link lhsBirdTrack Comment
+
+hi def link beginCodeBegin	      texCmdName
+hi def link beginCodeCode	      texSection
+
+
+" Restore cursor to original position, as it may have been disturbed
+" by the searches in our guessing code
+call cursor (s:oldline, s:oldcolumn)
+
+unlet s:oldline
+unlet s:oldcolumn
+
+let b:current_syntax = "lhaskell"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/libao.vim b/syntax/libao.vim
new file mode 100644
index 000000000..01ad1dd55
--- /dev/null
+++ b/syntax/libao.vim
@@ -0,0 +1,31 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'libao') == -1
+
+" Vim syntax file
+" Language:             libao.conf(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword libaoTodo     contained TODO FIXME XXX NOTE
+
+syn region  libaoComment  display oneline start='^\s*#' end='$'
+                          \ contains=libaoTodo,@Spell
+
+syn keyword libaoKeyword  default_driver
+
+hi def link libaoTodo     Todo
+hi def link libaoComment  Comment
+hi def link libaoKeyword  Keyword
+
+let b:current_syntax = "libao"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/lifelines.vim b/syntax/lifelines.vim
new file mode 100644
index 000000000..05ac1cf8b
--- /dev/null
+++ b/syntax/lifelines.vim
@@ -0,0 +1,158 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lifelines') == -1
+
+" Vim syntax file
+" Language:	LifeLines (v 3.0.62) <http://lifelines.sourceforge.net>
+" Maintainer:	Patrick Texier <p.texier@orsennes.com>
+" Location:	<http://patrick.texier.free.fr/vim/syntax/lifelines.vim>
+" Last Change:	2010 May 7
+
+" option to highlight error obsolete statements
+" add the following line to your .vimrc file :
+" let lifelines_deprecated = 1
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" A bunch of useful LifeLines keywords 3.0.62
+
+syn keyword	lifelinesDecl		char_encoding require option include
+syn keyword	lifelinesStatement	set
+syn keyword	lifelinesUser		getindi geindiset getfam getint getstr choosechild
+syn keyword	lifelinesUser		chooseindi choosespouse choosesubset menuchoose
+syn keyword	lifelinesUser		choosefam 
+syn keyword	lifelinesProc		proc func return call
+syn keyword	lifelinesInclude	include
+syn keyword	lifelinesDef		global
+syn keyword	lifelinesConditional	if else elsif switch
+syn keyword	lifelinesRepeat		continue break while
+syn keyword	lifelinesLogical	and or not eq ne lt gt le ge strcmp eqstr nestr
+syn keyword	lifelinesArithm		add sub mul div mod exp neg incr decr
+syn keyword	lifelinesArithm		cos sin tan arccos arcsin arctan
+syn keyword	lifelinesArithm		deg2dms dms2deg spdist
+syn keyword	lifelinesIndi		name fullname surname givens trimname birth
+syn keyword	lifelinesIndi		death burial baptism
+syn keyword	lifelinesIndi		father mother nextsib prevsib sex male female
+syn keyword	lifelinesIndi		pn nspouses nfamilies parents title key
+syn keyword	lifelinesIndi		soundex inode root indi firstindi nextindi
+syn keyword	lifelinesIndi		previndi spouses families forindi indiset
+syn keyword	lifelinesIndi		addtoset deletefromset  union intersect
+syn keyword	lifelinesIndi		difference parentset childset spouseset siblingset
+syn keyword	lifelinesIndi		ancestorset descendentset descendantset uniqueset
+syn keyword	lifelinesIndi		namesort keysort valuesort genindiset getindiset
+syn keyword	lifelinesIndi		forindiset lastindi writeindi
+syn keyword	lifelinesIndi		inset
+syn keyword	lifelinesFam		marriage husband wife nchildren firstchild
+syn keyword	lifelinesFam		lastchild fnode fam firstfam nextfam lastfam
+syn keyword	lifelinesFam		prevfam children forfam writefam
+syn keyword	lifelinesFam		fathers mothers Parents
+syn keyword	lifelinesList		list empty length enqueue dequeue requeue
+syn keyword	lifelinesList		push pop setel getel forlist inlist dup clear
+syn keyword	lifelinesTable		table insert lookup
+syn keyword	lifelinesGedcom		xref tag value parent child sibling savenode
+syn keyword	lifelinesGedcom		fornodes traverse createnode addnode 
+syn keyword	lifelinesGedcom		detachnode foreven fornotes forothr forsour
+syn keyword	lifelinesGedcom		reference dereference getrecord
+syn keyword	lifelinesGedcom		gengedcomstrong 
+syn keyword	lifelinesFunct		date place year long short gettoday dayformat
+syn keyword	lifelinesFunct		monthformat dateformat extractdate eraformat
+syn keyword	lifelinesFunct		complexdate complexformat complexpic datepic
+syn keyword	lifelinesFunct		extractnames extractplaces extracttokens lower
+syn keyword	lifelinesFunct		yearformat
+syn keyword	lifelinesFunct		upper capitalize trim rjustify 
+syn keyword 	lifelinesFunct		concat strconcat strlen substring index
+syn keyword	lifelinesFunct		titlecase gettext
+syn keyword	lifelinesFunct		d card ord alpha roman strsoundex strtoint
+syn keyword	lifelinesFunct		atoi linemode pagemod col row pos pageout nl
+syn keyword	lifelinesFunct		sp qt newfile outfile copyfile print lock unlock test
+syn keyword	lifelinesFunct		database version system stddate program
+syn keyword	lifelinesFunct		pvalue pagemode level extractdatestr debug
+syn keyword	lifelinesFunct		f float int free getcol getproperty heapused
+syn keyword 	lifelinesFunct		sort rsort
+syn keyword	lifelinesFunct		deleteel
+syn keyword	lifelinesFunct		bytecode convertcode setlocale
+" New dates functions (since 3.0.51)
+syn keyword	lifelinesFunct		jd2date date2jd dayofweek setdate
+
+" options to highlight as error obsolete statements
+" please read ll-reportmanual.
+
+if exists("lifelines_deprecated")
+	syn keyword lifelinesError	getintmsg getindimsg getstrmsg
+	syn keyword lifelinesError	gengedcom gengedcomweak deletenode
+	syn keyword lifelinesError	save strsave
+	syn keyword lifelinesError	lengthset
+	if version >= 700
+		let g:omni_syntax_group_exclude_lifelines = 'lifelinesError'
+	endif
+else
+	syn keyword lifelinesUser	getintmsg getindimsg getstrmsg
+	syn keyword lifelinesGedcom	gengedcom gengedcomweak deletenode
+	syn keyword lifelinesFunct	save strsave
+	syn keyword lifelinesIndi	lengthset
+endif
+
+syn region	lifelinesString	start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=lifelinesSpecial
+
+syn match	lifelinesSpecial	"\\\(\\\|\(n\|t\)\)" contained
+
+syn keyword	lifelinesTodo		contained TODO FIXME XXX
+syn region	lifelinesComment	start="/\*"  end="\*/" contains=lifelinesTodo
+
+" integers
+syn match	lifelinesNumber	"-\=\<\d\+\>"
+"floats, with dot
+syn match	lifelinesNumber	"-\=\<\d\+\.\d*\>"
+"floats, starting with a dot
+syn match	lifelinesNumber	"-\=\.\d\+\>"
+
+" folding using {}
+syn region lifelinesFoldBlock	start="{" end="}" transparent fold
+
+"catch errors caused by wrong parenthesis
+"adapted from original c.vim written by Bram Moolenaar
+
+syn cluster	lifelinesParenGroup	contains=lifelinesParenError
+syn region	lifelinesParen		transparent start='(' end=')' contains=ALLBUT,@lifelinesParenGroup
+syn match	lifelinesParenError	")"
+syn match	lifelinesErrInParen	contained "[{}]"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+
+hi def link lifelinesConditional	Conditional
+hi def link lifelinesArithm	Operator
+hi def link lifelinesLogical	Conditional
+hi def link lifelinesInclude	Include
+hi def link lifelinesComment	Comment
+hi def link lifelinesStatement	Statement
+hi def link lifelinesUser		Statement
+hi def link lifelinesFunct		Statement
+hi def link lifelinesTable		Statement
+hi def link lifelinesGedcom	Statement
+hi def link lifelinesList		Statement
+hi def link lifelinesRepeat	Repeat
+hi def link lifelinesFam		Statement
+hi def link lifelinesIndi		Statement
+hi def link lifelinesProc		Statement
+hi def link lifelinesDef		Statement
+hi def link lifelinesString	String
+hi def link lifelinesSpecial	Special
+hi def link lifelinesNumber	Number
+hi def link lifelinesParenError	Error
+hi def link lifelinesErrInParen	Error
+hi def link lifelinesError		Error
+hi def link lifelinesTodo		Todo
+hi def link lifelinesDecl		PreProc
+
+
+let b:current_syntax = "lifelines"
+
+" vim: ts=8 sw=4
+
+endif
diff --git a/syntax/lilo.vim b/syntax/lilo.vim
new file mode 100644
index 000000000..daa364dff
--- /dev/null
+++ b/syntax/lilo.vim
@@ -0,0 +1,178 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilo') == -1
+
+" Vim syntax file
+" Language: lilo configuration (lilo.conf)
+" Maintainer: Niels Horn <niels.horn@gmail.com>
+" Previous Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2010-02-03
+
+" Setup
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword=@,48-57,.,-,_
+
+syn case ignore
+
+" Base constructs
+syn match liloError "\S\+"
+syn match liloComment "#.*$"
+syn match liloEnviron "\$\w\+" contained
+syn match liloEnviron "\${[^}]\+}" contained
+syn match liloDecNumber "\d\+" contained
+syn match liloHexNumber "0[xX]\x\+" contained
+syn match liloDecNumberP "\d\+p\=" contained
+syn match liloSpecial contained "\\\(\"\|\\\|$\)"
+syn region liloString start=+"+ skip=+\\\\\|\\"+ end=+"+ contained contains=liloSpecial,liloEnviron
+syn match liloLabel :[^ "]\+: contained contains=liloSpecial,liloEnviron
+syn region liloPath start=+[$/]+ skip=+\\\\\|\\ \|\\$"+ end=+ \|$+ contained contains=liloSpecial,liloEnviron
+syn match liloDecNumberList "\(\d\|,\)\+" contained contains=liloDecNumber
+syn match liloDecNumberPList "\(\d\|[,p]\)\+" contained contains=liloDecNumberP,liloDecNumber
+syn region liloAnything start=+[^[:space:]#]+ skip=+\\\\\|\\ \|\\$+ end=+ \|$+ contained contains=liloSpecial,liloEnviron,liloString
+
+" Path
+syn keyword liloOption backup bitmap boot disktab force-backup keytable map message nextgroup=liloEqPath,liloEqPathComment,liloError skipwhite skipempty
+syn keyword liloKernelOpt initrd root nextgroup=liloEqPath,liloEqPathComment,liloError skipwhite skipempty
+syn keyword liloImageOpt path loader table nextgroup=liloEqPath,liloEqPathComment,liloError skipwhite skipempty
+syn keyword liloDiskOpt partition nextgroup=liloEqPath,liloEqPathComment,liloError skipwhite skipempty
+
+" Other
+syn keyword liloOption menu-scheme raid-extra-boot serial install nextgroup=liloEqAnything,liloEqAnythingComment,liloError skipwhite skipempty
+syn keyword liloOption bios-passes-dl nextgroup=liloEqAnything,liloEqAnythingComment,liloError skipwhite skipempty
+syn keyword liloOption default label alias wmdefault nextgroup=liloEqLabelString,liloEqLabelStringComment,liloError skipwhite skipempty
+syn keyword liloKernelOpt ramdisk nextgroup=liloEqAnything,liloEqAnythingComment,liloError skipwhite skipempty
+syn keyword liloImageOpt password range nextgroup=liloEqAnything,liloEqAnythingComment,liloError skipwhite skipempty
+syn keyword liloDiskOpt set type nextgroup=liloEqAnything,liloEqAnythingComment,liloError skipwhite skipempty
+
+" Symbolic
+syn keyword liloKernelOpt vga nextgroup=liloEqVga,liloEqVgaComment,liloError skipwhite skipempty
+
+" Number
+syn keyword liloOption delay timeout verbose nextgroup=liloEqDecNumber,liloEqDecNumberComment,liloError skipwhite skipempty
+syn keyword liloDiskOpt sectors heads cylinders start nextgroup=liloEqDecNumber,liloEqDecNumberComment,liloError skipwhite skipempty
+
+" String
+syn keyword liloOption menu-title nextgroup=liloEqString,liloEqStringComment,liloError skipwhite skipempty
+syn keyword liloKernelOpt append addappend nextgroup=liloEqString,liloEqStringComment,liloError skipwhite skipempty
+syn keyword liloImageOpt fallback literal nextgroup=liloEqString,liloEqStringComment,liloError skipwhite skipempty
+
+" Hex number
+syn keyword liloImageOpt map-drive to boot-as nextgroup=liloEqHexNumber,liloEqHexNumberComment,liloError skipwhite skipempty
+syn keyword liloDiskOpt bios normal hidden nextgroup=liloEqNumber,liloEqNumberComment,liloError skipwhite skipempty
+
+" Number list
+syn keyword liloOption bmp-colors nextgroup=liloEqNumberList,liloEqNumberListComment,liloError skipwhite skipempty
+
+" Number list, some of the numbers followed by p
+syn keyword liloOption bmp-table bmp-timer nextgroup=liloEqDecNumberPList,liloEqDecNumberPListComment,liloError skipwhite skipempty
+
+" Flag
+syn keyword liloOption compact fix-table geometric ignore-table lba32 linear mandatory nowarn prompt
+syn keyword liloOption bmp-retain el-torito-bootable-CD large-memory suppress-boot-time-BIOS-data
+syn keyword liloKernelOpt read-only read-write
+syn keyword liloImageOpt bypass lock mandatory optional restricted single-key unsafe
+syn keyword liloImageOpt master-boot wmwarn wmdisable
+syn keyword liloDiskOpt change activate deactivate inaccessible reset
+
+" Image
+syn keyword liloImage image other nextgroup=liloEqPath,liloEqPathComment,liloError skipwhite skipempty
+syn keyword liloDisk disk nextgroup=liloEqPath,liloEqPathComment,liloError skipwhite skipempty
+syn keyword liloChRules change-rules
+
+" Vga keywords
+syn keyword liloVgaKeyword ask ext extended normal contained
+
+" Comment followed by equal sign and ...
+syn match liloEqPathComment "#.*$" contained nextgroup=liloEqPath,liloEqPathComment,liloError skipwhite skipempty
+syn match liloEqVgaComment "#.*$" contained nextgroup=liloEqVga,liloEqVgaComment,liloError skipwhite skipempty
+syn match liloEqNumberComment "#.*$" contained nextgroup=liloEqNumber,liloEqNumberComment,liloError skipwhite skipempty
+syn match liloEqDecNumberComment "#.*$" contained nextgroup=liloEqDecNumber,liloEqDecNumberComment,liloError skipwhite skipempty
+syn match liloEqHexNumberComment "#.*$" contained nextgroup=liloEqHexNumber,liloEqHexNumberComment,liloError skipwhite skipempty
+syn match liloEqStringComment "#.*$" contained nextgroup=liloEqString,liloEqStringComment,liloError skipwhite skipempty
+syn match liloEqLabelStringComment "#.*$" contained nextgroup=liloEqLabelString,liloEqLabelStringComment,liloError skipwhite skipempty
+syn match liloEqNumberListComment "#.*$" contained nextgroup=liloEqNumberList,liloEqNumberListComment,liloError skipwhite skipempty
+syn match liloEqDecNumberPListComment "#.*$" contained nextgroup=liloEqDecNumberPList,liloEqDecNumberPListComment,liloError skipwhite skipempty
+syn match liloEqAnythingComment "#.*$" contained nextgroup=liloEqAnything,liloEqAnythingComment,liloError skipwhite skipempty
+
+" Equal sign followed by ...
+syn match liloEqPath "=" contained nextgroup=liloPath,liloPathComment,liloError skipwhite skipempty
+syn match liloEqVga "=" contained nextgroup=liloVgaKeyword,liloHexNumber,liloDecNumber,liloVgaComment,liloError skipwhite skipempty
+syn match liloEqNumber "=" contained nextgroup=liloDecNumber,liloHexNumber,liloNumberComment,liloError skipwhite skipempty
+syn match liloEqDecNumber "=" contained nextgroup=liloDecNumber,liloDecNumberComment,liloError skipwhite skipempty
+syn match liloEqHexNumber "=" contained nextgroup=liloHexNumber,liloHexNumberComment,liloError skipwhite skipempty
+syn match liloEqString "=" contained nextgroup=liloString,liloStringComment,liloError skipwhite skipempty
+syn match liloEqLabelString "=" contained nextgroup=liloString,liloLabel,liloLabelStringComment,liloError skipwhite skipempty
+syn match liloEqNumberList "=" contained nextgroup=liloDecNumberList,liloDecNumberListComment,liloError skipwhite skipempty
+syn match liloEqDecNumberPList "=" contained nextgroup=liloDecNumberPList,liloDecNumberPListComment,liloError skipwhite skipempty
+syn match liloEqAnything "=" contained nextgroup=liloAnything,liloAnythingComment,liloError skipwhite skipempty
+
+" Comment followed by ...
+syn match liloPathComment "#.*$" contained nextgroup=liloPath,liloPathComment,liloError skipwhite skipempty
+syn match liloVgaComment "#.*$" contained nextgroup=liloVgaKeyword,liloHexNumber,liloVgaComment,liloError skipwhite skipempty
+syn match liloNumberComment "#.*$" contained nextgroup=liloDecNumber,liloHexNumber,liloNumberComment,liloError skipwhite skipempty
+syn match liloDecNumberComment "#.*$" contained nextgroup=liloDecNumber,liloDecNumberComment,liloError skipwhite skipempty
+syn match liloHexNumberComment "#.*$" contained nextgroup=liloHexNumber,liloHexNumberComment,liloError skipwhite skipempty
+syn match liloStringComment "#.*$" contained nextgroup=liloString,liloStringComment,liloError skipwhite skipempty
+syn match liloLabelStringComment "#.*$" contained nextgroup=liloString,liloLabel,liloLabelStringComment,liloError skipwhite skipempty
+syn match liloDecNumberListComment "#.*$" contained nextgroup=liloDecNumberList,liloDecNumberListComment,liloError skipwhite skipempty
+syn match liloDecNumberPListComment "#.*$" contained nextgroup=liloDecNumberPList,liloDecNumberPListComment,liloError skipwhite skipempty
+syn match liloAnythingComment "#.*$" contained nextgroup=liloAnything,liloAnythingComment,liloError skipwhite skipempty
+
+" Define the default highlighting
+
+hi def link liloEqPath             liloEquals
+hi def link liloEqWord             liloEquals
+hi def link liloEqVga              liloEquals
+hi def link liloEqDecNumber        liloEquals
+hi def link liloEqHexNumber        liloEquals
+hi def link liloEqNumber           liloEquals
+hi def link liloEqString           liloEquals
+hi def link liloEqAnything         liloEquals
+hi def link liloEquals             Special
+
+hi def link liloError              Error
+
+hi def link liloEqPathComment      liloComment
+hi def link liloEqVgaComment       liloComment
+hi def link liloEqDecNumberComment liloComment
+hi def link liloEqHexNumberComment liloComment
+hi def link liloEqStringComment    liloComment
+hi def link liloEqAnythingComment  liloComment
+hi def link liloPathComment        liloComment
+hi def link liloVgaComment         liloComment
+hi def link liloDecNumberComment   liloComment
+hi def link liloHexNumberComment   liloComment
+hi def link liloNumberComment      liloComment
+hi def link liloStringComment      liloComment
+hi def link liloAnythingComment    liloComment
+hi def link liloComment            Comment
+
+hi def link liloDiskOpt            liloOption
+hi def link liloKernelOpt          liloOption
+hi def link liloImageOpt           liloOption
+hi def link liloOption             Keyword
+
+hi def link liloDecNumber          liloNumber
+hi def link liloHexNumber          liloNumber
+hi def link liloDecNumberP         liloNumber
+hi def link liloNumber             Number
+hi def link liloString             String
+hi def link liloPath               Constant
+
+hi def link liloSpecial            Special
+hi def link liloLabel              Title
+hi def link liloDecNumberList      Special
+hi def link liloDecNumberPList     Special
+hi def link liloAnything           Normal
+hi def link liloEnviron            Identifier
+hi def link liloVgaKeyword         Identifier
+hi def link liloImage              Type
+hi def link liloChRules            Preproc
+hi def link liloDisk               Preproc
+
+
+let b:current_syntax = "lilo"
+
+endif
diff --git a/syntax/limits.vim b/syntax/limits.vim
new file mode 100644
index 000000000..1f62582fe
--- /dev/null
+++ b/syntax/limits.vim
@@ -0,0 +1,48 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'limits') == -1
+
+" Vim syntax file
+" Language:             limits(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword limitsTodo    contained TODO FIXME XXX NOTE
+
+syn region  limitsComment display oneline start='^\s*#' end='$'
+                          \ contains=limitsTodo,@Spell
+
+syn match   limitsBegin   display '^'
+                          \ nextgroup=limitsUser,limitsDefault,limitsComment
+                          \ skipwhite
+
+syn match   limitsUser    contained '[^ \t#*]\+'
+                          \ nextgroup=limitsLimit,limitsDeLimit skipwhite
+
+syn match   limitsDefault contained '*'
+                          \ nextgroup=limitsLimit,limitsDeLimit skipwhite
+
+syn match   limitsLimit   contained '[ACDFMNRSTUKLP]' nextgroup=limitsNumber
+syn match   limitsDeLimit contained '-'
+
+syn match   limitsNumber  contained '\d\+\>' nextgroup=limitsLimit skipwhite
+
+hi def link limitsTodo    Todo
+hi def link limitsComment Comment
+hi def link limitsUser    Keyword
+hi def link limitsDefault Macro
+hi def link limitsLimit   Identifier
+hi def link limitsDeLimit Special
+hi def link limitsNumber  Number
+
+let b:current_syntax = "limits"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/liquid.vim b/syntax/liquid.vim
new file mode 100644
index 000000000..f69b77a5f
--- /dev/null
+++ b/syntax/liquid.vim
@@ -0,0 +1,142 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
+
+" Vim syntax file
+" Language:     Liquid
+" Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
+" Filenames:    *.liquid
+" Last Change:	2013 May 30
+
+if exists('b:current_syntax')
+  finish
+endif
+
+if !exists('main_syntax')
+  let main_syntax = 'liquid'
+endif
+
+if !exists('g:liquid_default_subtype')
+  let g:liquid_default_subtype = 'html'
+endif
+
+if !exists('b:liquid_subtype') && main_syntax == 'liquid'
+  let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
+  let b:liquid_subtype = matchstr(s:lines,'liquid_subtype=\zs\w\+')
+  if b:liquid_subtype == ''
+    let b:liquid_subtype = matchstr(&filetype,'^liquid\.\zs\w\+')
+  endif
+  if b:liquid_subtype == ''
+    let b:liquid_subtype = matchstr(substitute(expand('%:t'),'\c\%(\.liquid\)\+$','',''),'\.\zs\w\+$')
+  endif
+  if b:liquid_subtype == ''
+    let b:liquid_subtype = g:liquid_default_subtype
+  endif
+endif
+
+if exists('b:liquid_subtype') && b:liquid_subtype != ''
+  exe 'runtime! syntax/'.b:liquid_subtype.'.vim'
+  unlet! b:current_syntax
+endif
+
+syn case match
+
+if exists('b:liquid_subtype') && b:liquid_subtype != 'yaml'
+  " YAML Front Matter
+  syn include @liquidYamlTop syntax/yaml.vim
+  unlet! b:current_syntax
+  syn region liquidYamlHead start="\%^---$" end="^---\s*$" keepend contains=@liquidYamlTop,@Spell
+endif
+
+if !exists('g:liquid_highlight_types')
+  let g:liquid_highlight_types = []
+endif
+
+if !exists('s:subtype')
+  let s:subtype = exists('b:liquid_subtype') ? b:liquid_subtype : ''
+
+  for s:type in map(copy(g:liquid_highlight_types),'matchstr(v:val,"[^=]*$")')
+    if s:type =~ '\.'
+      let b:{matchstr(s:type,'[^.]*')}_subtype = matchstr(s:type,'\.\zs.*')
+    endif
+    exe 'syn include @liquidHighlight'.substitute(s:type,'\.','','g').' syntax/'.matchstr(s:type,'[^.]*').'.vim'
+    unlet! b:current_syntax
+  endfor
+  unlet! s:type
+
+  if s:subtype == ''
+    unlet! b:liquid_subtype
+  else
+    let b:liquid_subtype = s:subtype
+  endif
+  unlet s:subtype
+endif
+
+syn region  liquidStatement  matchgroup=liquidDelimiter start="{%" end="%}" contains=@liquidStatement containedin=ALLBUT,@liquidExempt keepend
+syn region  liquidExpression matchgroup=liquidDelimiter start="{{" end="}}" contains=@liquidExpression  containedin=ALLBUT,@liquidExempt keepend
+syn region  liquidComment    matchgroup=liquidDelimiter start="{%\s*comment\s*%}" end="{%\s*endcomment\s*%}" contains=liquidTodo,@Spell containedin=ALLBUT,@liquidExempt keepend
+syn region  liquidRaw        matchgroup=liquidDelimiter start="{%\s*raw\s*%}" end="{%\s*endraw\s*%}" contains=TOP,@liquidExempt containedin=ALLBUT,@liquidExempt keepend
+
+syn cluster liquidExempt contains=liquidStatement,liquidExpression,liquidComment,liquidRaw,@liquidStatement,liquidYamlHead
+syn cluster liquidStatement contains=liquidConditional,liquidRepeat,liquidKeyword,@liquidExpression
+syn cluster liquidExpression contains=liquidOperator,liquidString,liquidNumber,liquidFloat,liquidBoolean,liquidNull,liquidEmpty,liquidPipe,liquidForloop
+
+syn keyword liquidKeyword highlight nextgroup=liquidTypeHighlight skipwhite contained
+syn keyword liquidKeyword endhighlight contained
+syn region liquidHighlight start="{%\s*highlight\s\+\w\+\s*%}" end="{% endhighlight %}" keepend
+
+for s:type in g:liquid_highlight_types
+  exe 'syn match liquidTypeHighlight "\<'.matchstr(s:type,'[^=]*').'\>" contained'
+  exe 'syn region liquidHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\..*','','').' start="{%\s*highlight\s\+'.matchstr(s:type,'[^=]*').'\s*%}" end="{% endhighlight %}" keepend contains=@liquidHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\.','','g')
+endfor
+unlet! s:type
+
+syn region liquidString matchgroup=liquidQuote start=+"+ end=+"+ contained
+syn region liquidString matchgroup=liquidQuote start=+'+ end=+'+ contained
+syn match liquidNumber "-\=\<\d\+\>" contained
+syn match liquidFloat "-\=\<\d\+\>\.\.\@!\%(\d\+\>\)\=" contained
+syn keyword liquidBoolean true false contained
+syn keyword liquidNull null nil contained
+syn match liquidEmpty "\<empty\>" contained
+
+syn keyword liquidOperator and or not contained
+syn match liquidPipe '|' contained skipwhite nextgroup=liquidFilter
+
+syn keyword liquidFilter date capitalize downcase upcase first last join sort size strip_html strip_newlines newline_to_br replace replace_first remove remove_first truncate truncatewords prepend append minus plus times divided_by contained
+
+syn keyword liquidConditional if elsif else endif unless endunless case when endcase ifchanged endifchanged contained
+syn keyword liquidRepeat      for endfor tablerow endtablerow in contained
+syn match   liquidRepeat      "\%({%\s*\)\@<=empty\>" contained
+syn keyword liquidKeyword     assign cycle include with contained
+
+syn keyword liquidForloop forloop nextgroup=liquidForloopDot contained
+syn match liquidForloopDot "\." nextgroup=liquidForloopAttribute contained
+syn keyword liquidForloopAttribute length index index0 rindex rindex0 first last contained
+
+syn keyword liquidTablerowloop tablerowloop nextgroup=liquidTablerowloopDot contained
+syn match liquidTablerowloopDot "\." nextgroup=liquidTableForloopAttribute contained
+syn keyword liquidTablerowloopAttribute length index index0 col col0 index0 rindex rindex0 first last col_first col_last contained
+
+hi def link liquidDelimiter             PreProc
+hi def link liquidComment               Comment
+hi def link liquidTypeHighlight         Type
+hi def link liquidConditional           Conditional
+hi def link liquidRepeat                Repeat
+hi def link liquidKeyword               Keyword
+hi def link liquidOperator              Operator
+hi def link liquidString                String
+hi def link liquidQuote                 Delimiter
+hi def link liquidNumber                Number
+hi def link liquidFloat                 Float
+hi def link liquidEmpty                 liquidNull
+hi def link liquidNull                  liquidBoolean
+hi def link liquidBoolean               Boolean
+hi def link liquidFilter                Function
+hi def link liquidForloop               Identifier
+hi def link liquidForloopAttribute      Identifier
+
+let b:current_syntax = 'liquid'
+
+if exists('main_syntax') && main_syntax == 'liquid'
+  unlet main_syntax
+endif
+
+endif
diff --git a/syntax/lisp.vim b/syntax/lisp.vim
new file mode 100644
index 000000000..d27e43a65
--- /dev/null
+++ b/syntax/lisp.vim
@@ -0,0 +1,624 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lisp') == -1
+
+" Vim syntax file
+" Language:    Lisp
+" Maintainer:  Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Last Change: Jul 11, 2019
+" Version:     30
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_LISP
+"
+"  Thanks to F Xavier Noria for a list of 978 Common Lisp symbols taken from HyperSpec
+"  Clisp additions courtesy of http://clisp.cvs.sourceforge.net/*checkout*/clisp/clisp/emacs/lisp.vim
+
+" ---------------------------------------------------------------------
+"  Load Once: {{{1
+if exists("b:current_syntax")
+ finish
+endif
+
+if exists("g:lisp_isk")
+ exe "setl isk=".g:lisp_isk
+elseif (v:version == 704 && has("patch-7.4.1142")) || v:version > 704
+ syn iskeyword 38,42,43,45,47-58,60-62,64-90,97-122,_
+else
+ setl isk=38,42,43,45,47-58,60-62,64-90,97-122,_
+endif
+
+if exists("g:lispsyntax_ignorecase") || exists("g:lispsyntax_clisp")
+ set ignorecase
+endif
+
+" ---------------------------------------------------------------------
+" Clusters: {{{1
+syn cluster			lispAtomCluster		contains=lispAtomBarSymbol,lispAtomList,lispAtomNmbr0,lispComment,lispDecl,lispFunc,lispLeadWhite
+syn cluster			lispBaseListCluster	contains=lispAtom,lispAtomBarSymbol,lispAtomMark,lispBQList,lispBarSymbol,lispComment,lispConcat,lispDecl,lispFunc,lispKey,lispList,lispNumber,lispEscapeSpecial,lispSymbol,lispVar,lispLeadWhite
+if exists("g:lisp_instring")
+ syn cluster			lispListCluster		contains=@lispBaseListCluster,lispString,lispInString,lispInStringString
+else
+ syn cluster			lispListCluster		contains=@lispBaseListCluster,lispString
+endif
+
+syn case ignore
+
+" ---------------------------------------------------------------------
+" Lists: {{{1
+syn match lispSymbol	contained	![^()'`,"; \t]\+!
+syn match lispBarSymbol	contained	!|..\{-}|!
+if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
+ syn region lispParen0           matchgroup=hlLevel0 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen1
+ syn region lispParen1 contained matchgroup=hlLevel1 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen2
+ syn region lispParen2 contained matchgroup=hlLevel2 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen3
+ syn region lispParen3 contained matchgroup=hlLevel3 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen4
+ syn region lispParen4 contained matchgroup=hlLevel4 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen5
+ syn region lispParen5 contained matchgroup=hlLevel5 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen6
+ syn region lispParen6 contained matchgroup=hlLevel6 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen7
+ syn region lispParen7 contained matchgroup=hlLevel7 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen8
+ syn region lispParen8 contained matchgroup=hlLevel8 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen9
+ syn region lispParen9 contained matchgroup=hlLevel9 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen0
+else
+ syn region lispList			matchgroup=lispParen start="("   skip="|.\{-}|"			matchgroup=lispParen end=")"	contains=@lispListCluster
+ syn region lispBQList			matchgroup=PreProc   start="`("  skip="|.\{-}|"			matchgroup=PreProc   end=")"		contains=@lispListCluster
+endif
+
+" ---------------------------------------------------------------------
+" Atoms: {{{1
+syn match lispAtomMark			"'"
+syn match lispAtom			"'("me=e-1			contains=lispAtomMark	nextgroup=lispAtomList
+syn match lispAtom			"'[^ \t()]\+"			contains=lispAtomMark
+syn match lispAtomBarSymbol		!'|..\{-}|!			contains=lispAtomMark
+syn region lispAtom			start=+'"+			skip=+\\"+ end=+"+
+syn region lispAtomList			contained			matchgroup=Special start="("	skip="|.\{-}|" matchgroup=Special end=")"	contains=@lispAtomCluster,lispString,lispEscapeSpecial
+syn match lispAtomNmbr			contained			"\<\d\+"
+syn match lispLeadWhite			contained			"^\s\+"
+
+" ---------------------------------------------------------------------
+" Standard Lisp Functions and Macros: {{{1
+syn keyword lispFunc		<				find-method				pprint-indent
+syn keyword lispFunc		<=				find-package				pprint-linear
+syn keyword lispFunc		=				find-restart				pprint-logical-block
+syn keyword lispFunc		>				find-symbol				pprint-newline
+syn keyword lispFunc		>=				finish-output				pprint-pop
+syn keyword lispFunc		-				first					pprint-tab
+syn keyword lispFunc		/				fixnum					pprint-tabular
+syn keyword lispFunc		/=				flet					prin1
+syn keyword lispFunc		//				float					prin1-to-string
+syn keyword lispFunc		///				float-digits				princ
+syn keyword lispFunc		*				floating-point-inexact			princ-to-string
+syn keyword lispFunc		**				floating-point-invalid-operation	print
+syn keyword lispFunc		***				floating-point-overflow			print-not-readable
+syn keyword lispFunc		+				floating-point-underflow		print-not-readable-object
+syn keyword lispFunc		++				floatp					print-object
+syn keyword lispFunc		+++				float-precision				print-unreadable-object
+syn keyword lispFunc		1-				float-radix				probe-file
+syn keyword lispFunc		1+				float-sign				proclaim
+syn keyword lispFunc		abort				floor					prog
+syn keyword lispFunc		abs				fmakunbound				prog*
+syn keyword lispFunc		access				force-output				prog1
+syn keyword lispFunc		acons				format					prog2
+syn keyword lispFunc		acos				formatter				progn
+syn keyword lispFunc		acosh				fourth					program-error
+syn keyword lispFunc		add-method			fresh-line				progv
+syn keyword lispFunc		adjoin				fround					provide
+syn keyword lispFunc		adjustable-array-p		ftruncate				psetf
+syn keyword lispFunc		adjust-array			ftype					psetq
+syn keyword lispFunc		allocate-instance		funcall					push
+syn keyword lispFunc		alpha-char-p			function				pushnew
+syn keyword lispFunc		alphanumericp			function-keywords			putprop
+syn keyword lispFunc		and				function-lambda-expression		quote
+syn keyword lispFunc		append				functionp				random
+syn keyword lispFunc		apply				gbitp					random-state
+syn keyword lispFunc		applyhook			gcd					random-state-p
+syn keyword lispFunc		apropos				generic-function			rassoc
+syn keyword lispFunc		apropos-list			gensym					rassoc-if
+syn keyword lispFunc		aref				gentemp					rassoc-if-not
+syn keyword lispFunc		arithmetic-error		get					ratio
+syn keyword lispFunc		arithmetic-error-operands	get-decoded-time			rational
+syn keyword lispFunc		arithmetic-error-operation	get-dispatch-macro-character		rationalize
+syn keyword lispFunc		array				getf					rationalp
+syn keyword lispFunc		array-dimension			gethash					read
+syn keyword lispFunc		array-dimension-limit		get-internal-real-time			read-byte
+syn keyword lispFunc		array-dimensions		get-internal-run-time			read-char
+syn keyword lispFunc		array-displacement		get-macro-character			read-char-no-hang
+syn keyword lispFunc		array-element-type		get-output-stream-string		read-delimited-list
+syn keyword lispFunc		array-has-fill-pointer-p	get-properties				reader-error
+syn keyword lispFunc		array-in-bounds-p		get-setf-expansion			read-eval-print
+syn keyword lispFunc		arrayp				get-setf-method				read-from-string
+syn keyword lispFunc		array-rank			get-universal-time			read-line
+syn keyword lispFunc		array-rank-limit		go					read-preserving-whitespace
+syn keyword lispFunc		array-row-major-index		graphic-char-p				read-sequence
+syn keyword lispFunc		array-total-size		handler-bind				readtable
+syn keyword lispFunc		array-total-size-limit		handler-case				readtable-case
+syn keyword lispFunc		ash				hash-table				readtablep
+syn keyword lispFunc		asin				hash-table-count			real
+syn keyword lispFunc		asinh				hash-table-p				realp
+syn keyword lispFunc		assert				hash-table-rehash-size			realpart
+syn keyword lispFunc		assoc				hash-table-rehash-threshold		reduce
+syn keyword lispFunc		assoc-if			hash-table-size				reinitialize-instance
+syn keyword lispFunc		assoc-if-not			hash-table-test				rem
+syn keyword lispFunc		atan				host-namestring				remf
+syn keyword lispFunc		atanh				identity				remhash
+syn keyword lispFunc		atom				if					remove
+syn keyword lispFunc		base-char			if-exists				remove-duplicates
+syn keyword lispFunc		base-string			ignorable				remove-if
+syn keyword lispFunc		bignum				ignore					remove-if-not
+syn keyword lispFunc		bit				ignore-errors				remove-method
+syn keyword lispFunc		bit-and				imagpart				remprop
+syn keyword lispFunc		bit-andc1			import					rename-file
+syn keyword lispFunc		bit-andc2			incf					rename-package
+syn keyword lispFunc		bit-eqv				initialize-instance			replace
+syn keyword lispFunc		bit-ior				inline					require
+syn keyword lispFunc		bit-nand			in-package				rest
+syn keyword lispFunc		bit-nor				in-package				restart
+syn keyword lispFunc		bit-not				input-stream-p				restart-bind
+syn keyword lispFunc		bit-orc1			inspect					restart-case
+syn keyword lispFunc		bit-orc2			int-char				restart-name
+syn keyword lispFunc		bit-vector			integer					return
+syn keyword lispFunc		bit-vector-p			integer-decode-float			return-from
+syn keyword lispFunc		bit-xor				integer-length				revappend
+syn keyword lispFunc		block				integerp				reverse
+syn keyword lispFunc		boole				interactive-stream-p			room
+syn keyword lispFunc		boole-1				intern					rotatef
+syn keyword lispFunc		boole-2				internal-time-units-per-second		round
+syn keyword lispFunc		boolean				intersection				row-major-aref
+syn keyword lispFunc		boole-and			invalid-method-error			rplaca
+syn keyword lispFunc		boole-andc1			invoke-debugger				rplacd
+syn keyword lispFunc		boole-andc2			invoke-restart				safety
+syn keyword lispFunc		boole-c1			invoke-restart-interactively		satisfies
+syn keyword lispFunc		boole-c2			isqrt					sbit
+syn keyword lispFunc		boole-clr			keyword					scale-float
+syn keyword lispFunc		boole-eqv			keywordp				schar
+syn keyword lispFunc		boole-ior			labels					search
+syn keyword lispFunc		boole-nand			lambda					second
+syn keyword lispFunc		boole-nor			lambda-list-keywords			sequence
+syn keyword lispFunc		boole-orc1			lambda-parameters-limit			serious-condition
+syn keyword lispFunc		boole-orc2			last					set
+syn keyword lispFunc		boole-set			lcm					set-char-bit
+syn keyword lispFunc		boole-xor			ldb					set-difference
+syn keyword lispFunc		both-case-p			ldb-test				set-dispatch-macro-character
+syn keyword lispFunc		boundp				ldiff					set-exclusive-or
+syn keyword lispFunc		break				least-negative-double-float		setf
+syn keyword lispFunc		broadcast-stream		least-negative-long-float		set-macro-character
+syn keyword lispFunc		broadcast-stream-streams	least-negative-normalized-double-float	set-pprint-dispatch
+syn keyword lispFunc		built-in-class			least-negative-normalized-long-float	setq
+syn keyword lispFunc		butlast				least-negative-normalized-short-float	set-syntax-from-char
+syn keyword lispFunc		byte				least-negative-normalized-single-float	seventh
+syn keyword lispFunc		byte-position			least-negative-short-float		shadow
+syn keyword lispFunc		byte-size			least-negative-single-float		shadowing-import
+syn keyword lispFunc		call-arguments-limit		least-positive-double-float		shared-initialize
+syn keyword lispFunc		call-method			least-positive-long-float		shiftf
+syn keyword lispFunc		call-next-method		least-positive-normalized-double-float	short-float
+syn keyword lispFunc		capitalize			least-positive-normalized-long-float	short-float-epsilon
+syn keyword lispFunc		car				least-positive-normalized-short-float	short-float-negative-epsilon
+syn keyword lispFunc		case				least-positive-normalized-single-float	short-site-name
+syn keyword lispFunc		catch				least-positive-short-float		signal
+syn keyword lispFunc		ccase				least-positive-single-float		signed-byte
+syn keyword lispFunc		cdr				length					signum
+syn keyword lispFunc		ceiling				let					simple-array
+syn keyword lispFunc		cell-error			let*					simple-base-string
+syn keyword lispFunc		cell-error-name			lisp					simple-bit-vector
+syn keyword lispFunc		cerror				lisp-implementation-type		simple-bit-vector-p
+syn keyword lispFunc		change-class			lisp-implementation-version		simple-condition
+syn keyword lispFunc		char				list					simple-condition-format-arguments
+syn keyword lispFunc		char<				list*					simple-condition-format-control
+syn keyword lispFunc		char<=				list-all-packages			simple-error
+syn keyword lispFunc		char=				listen					simple-string
+syn keyword lispFunc		char>				list-length				simple-string-p
+syn keyword lispFunc		char>=				listp					simple-type-error
+syn keyword lispFunc		char/=				load					simple-vector
+syn keyword lispFunc		character			load-logical-pathname-translations	simple-vector-p
+syn keyword lispFunc		characterp			load-time-value				simple-warning
+syn keyword lispFunc		char-bit			locally					sin
+syn keyword lispFunc		char-bits			log					single-flaot-epsilon
+syn keyword lispFunc		char-bits-limit			logand					single-float
+syn keyword lispFunc		char-code			logandc1				single-float-epsilon
+syn keyword lispFunc		char-code-limit			logandc2				single-float-negative-epsilon
+syn keyword lispFunc		char-control-bit		logbitp					sinh
+syn keyword lispFunc		char-downcase			logcount				sixth
+syn keyword lispFunc		char-equal			logeqv					sleep
+syn keyword lispFunc		char-font			logical-pathname			slot-boundp
+syn keyword lispFunc		char-font-limit			logical-pathname-translations		slot-exists-p
+syn keyword lispFunc		char-greaterp			logior					slot-makunbound
+syn keyword lispFunc		char-hyper-bit			lognand					slot-missing
+syn keyword lispFunc		char-int			lognor					slot-unbound
+syn keyword lispFunc		char-lessp			lognot					slot-value
+syn keyword lispFunc		char-meta-bit			logorc1					software-type
+syn keyword lispFunc		char-name			logorc2					software-version
+syn keyword lispFunc		char-not-equal			logtest					some
+syn keyword lispFunc		char-not-greaterp		logxor					sort
+syn keyword lispFunc		char-not-lessp			long-float				space
+syn keyword lispFunc		char-super-bit			long-float-epsilon			special
+syn keyword lispFunc		char-upcase			long-float-negative-epsilon		special-form-p
+syn keyword lispFunc		check-type			long-site-name				special-operator-p
+syn keyword lispFunc		cis				loop					speed
+syn keyword lispFunc		class				loop-finish				sqrt
+syn keyword lispFunc		class-name			lower-case-p				stable-sort
+syn keyword lispFunc		class-of			machine-instance			standard
+syn keyword lispFunc		clear-input			machine-type				standard-char
+syn keyword lispFunc		clear-output			machine-version				standard-char-p
+syn keyword lispFunc		close				macroexpand				standard-class
+syn keyword lispFunc		clrhash				macroexpand-1				standard-generic-function
+syn keyword lispFunc		code-char			macroexpand-l				standard-method
+syn keyword lispFunc		coerce				macro-function				standard-object
+syn keyword lispFunc		commonp				macrolet				step
+syn keyword lispFunc		compilation-speed		make-array				storage-condition
+syn keyword lispFunc		compile				make-array				store-value
+syn keyword lispFunc		compiled-function		make-broadcast-stream			stream
+syn keyword lispFunc		compiled-function-p		make-char				stream-element-type
+syn keyword lispFunc		compile-file			make-concatenated-stream		stream-error
+syn keyword lispFunc		compile-file-pathname		make-condition				stream-error-stream
+syn keyword lispFunc		compiler-let			make-dispatch-macro-character		stream-external-format
+syn keyword lispFunc		compiler-macro			make-echo-stream			streamp
+syn keyword lispFunc		compiler-macro-function		make-hash-table				streamup
+syn keyword lispFunc		complement			make-instance				string
+syn keyword lispFunc		complex				make-instances-obsolete			string<
+syn keyword lispFunc		complexp			make-list				string<=
+syn keyword lispFunc		compute-applicable-methods	make-load-form				string=
+syn keyword lispFunc		compute-restarts		make-load-form-saving-slots		string>
+syn keyword lispFunc		concatenate			make-method				string>=
+syn keyword lispFunc		concatenated-stream		make-package				string/=
+syn keyword lispFunc		concatenated-stream-streams	make-pathname				string-capitalize
+syn keyword lispFunc		cond				make-random-state			string-char
+syn keyword lispFunc		condition			make-sequence				string-char-p
+syn keyword lispFunc		conjugate			make-string				string-downcase
+syn keyword lispFunc		cons				make-string-input-stream		string-equal
+syn keyword lispFunc		consp				make-string-output-stream		string-greaterp
+syn keyword lispFunc		constantly			make-symbol				string-left-trim
+syn keyword lispFunc		constantp			make-synonym-stream			string-lessp
+syn keyword lispFunc		continue			make-two-way-stream			string-not-equal
+syn keyword lispFunc		control-error			makunbound				string-not-greaterp
+syn keyword lispFunc		copy-alist			map					string-not-lessp
+syn keyword lispFunc		copy-list			mapc					stringp
+syn keyword lispFunc		copy-pprint-dispatch		mapcan					string-right-strim
+syn keyword lispFunc		copy-readtable			mapcar					string-right-trim
+syn keyword lispFunc		copy-seq			mapcon					string-stream
+syn keyword lispFunc		copy-structure			maphash					string-trim
+syn keyword lispFunc		copy-symbol			map-into				string-upcase
+syn keyword lispFunc		copy-tree			mapl					structure
+syn keyword lispFunc		cos				maplist					structure-class
+syn keyword lispFunc		cosh				mask-field				structure-object
+syn keyword lispFunc		count				max					style-warning
+syn keyword lispFunc		count-if			member					sublim
+syn keyword lispFunc		count-if-not			member-if				sublis
+syn keyword lispFunc		ctypecase			member-if-not				subseq
+syn keyword lispFunc		debug				merge					subsetp
+syn keyword lispFunc		decf				merge-pathname				subst
+syn keyword lispFunc		declaim				merge-pathnames				subst-if
+syn keyword lispFunc		declaration			method					subst-if-not
+syn keyword lispFunc		declare				method-combination			substitute
+syn keyword lispFunc		decode-float			method-combination-error		substitute-if
+syn keyword lispFunc		decode-universal-time		method-qualifiers			substitute-if-not
+syn keyword lispFunc		defclass			min					subtypep
+syn keyword lispFunc		defconstant			minusp					svref
+syn keyword lispFunc		defgeneric			mismatch				sxhash
+syn keyword lispFunc		define-compiler-macro		mod					symbol
+syn keyword lispFunc		define-condition		most-negative-double-float		symbol-function
+syn keyword lispFunc		define-method-combination	most-negative-fixnum			symbol-macrolet
+syn keyword lispFunc		define-modify-macro		most-negative-long-float		symbol-name
+syn keyword lispFunc		define-setf-expander		most-negative-short-float		symbolp
+syn keyword lispFunc		define-setf-method		most-negative-single-float		symbol-package
+syn keyword lispFunc		define-symbol-macro		most-positive-double-float		symbol-plist
+syn keyword lispFunc		defmacro			most-positive-fixnum			symbol-value
+syn keyword lispFunc		defmethod			most-positive-long-float		synonym-stream
+syn keyword lispFunc		defpackage			most-positive-short-float		synonym-stream-symbol
+syn keyword lispFunc		defparameter			most-positive-single-float		sys
+syn keyword lispFunc		defsetf				muffle-warning				system
+syn keyword lispFunc		defstruct			multiple-value-bind			t
+syn keyword lispFunc		deftype				multiple-value-call			tagbody
+syn keyword lispFunc		defun				multiple-value-list			tailp
+syn keyword lispFunc		defvar				multiple-value-prog1			tan
+syn keyword lispFunc		delete				multiple-value-seteq			tanh
+syn keyword lispFunc		delete-duplicates		multiple-value-setq			tenth
+syn keyword lispFunc		delete-file			multiple-values-limit			terpri
+syn keyword lispFunc		delete-if			name-char				the
+syn keyword lispFunc		delete-if-not			namestring				third
+syn keyword lispFunc		delete-package			nbutlast				throw
+syn keyword lispFunc		denominator			nconc					time
+syn keyword lispFunc		deposit-field			next-method-p				trace
+syn keyword lispFunc		describe			nil					translate-logical-pathname
+syn keyword lispFunc		describe-object			nintersection				translate-pathname
+syn keyword lispFunc		destructuring-bind		ninth					tree-equal
+syn keyword lispFunc		digit-char			no-applicable-method			truename
+syn keyword lispFunc		digit-char-p			no-next-method				truncase
+syn keyword lispFunc		directory			not					truncate
+syn keyword lispFunc		directory-namestring		notany					two-way-stream
+syn keyword lispFunc		disassemble			notevery				two-way-stream-input-stream
+syn keyword lispFunc		division-by-zero		notinline				two-way-stream-output-stream
+syn keyword lispFunc		do				nreconc					type
+syn keyword lispFunc		do*				nreverse				typecase
+syn keyword lispFunc		do-all-symbols			nset-difference				type-error
+syn keyword lispFunc		documentation			nset-exclusive-or			type-error-datum
+syn keyword lispFunc		do-exeternal-symbols		nstring					type-error-expected-type
+syn keyword lispFunc		do-external-symbols		nstring-capitalize			type-of
+syn keyword lispFunc		dolist				nstring-downcase			typep
+syn keyword lispFunc		do-symbols			nstring-upcase				unbound-slot
+syn keyword lispFunc		dotimes				nsublis					unbound-slot-instance
+syn keyword lispFunc		double-float			nsubst					unbound-variable
+syn keyword lispFunc		double-float-epsilon		nsubst-if				undefined-function
+syn keyword lispFunc		double-float-negative-epsilon	nsubst-if-not				unexport
+syn keyword lispFunc		dpb				nsubstitute				unintern
+syn keyword lispFunc		dribble				nsubstitute-if				union
+syn keyword lispFunc		dynamic-extent			nsubstitute-if-not			unless
+syn keyword lispFunc		ecase				nth					unread
+syn keyword lispFunc		echo-stream			nthcdr					unread-char
+syn keyword lispFunc		echo-stream-input-stream	nth-value				unsigned-byte
+syn keyword lispFunc		echo-stream-output-stream	null					untrace
+syn keyword lispFunc		ed				number					unuse-package
+syn keyword lispFunc		eighth				numberp					unwind-protect
+syn keyword lispFunc		elt				numerator				update-instance-for-different-class
+syn keyword lispFunc		encode-universal-time		nunion					update-instance-for-redefined-class
+syn keyword lispFunc		end-of-file			oddp					upgraded-array-element-type
+syn keyword lispFunc		endp				open					upgraded-complex-part-type
+syn keyword lispFunc		enough-namestring		open-stream-p				upper-case-p
+syn keyword lispFunc		ensure-directories-exist	optimize				use-package
+syn keyword lispFunc		ensure-generic-function		or					user
+syn keyword lispFunc		eq				otherwise				user-homedir-pathname
+syn keyword lispFunc		eql				output-stream-p				use-value
+syn keyword lispFunc		equal				package					values
+syn keyword lispFunc		equalp				package-error				values-list
+syn keyword lispFunc		error				package-error-package			variable
+syn keyword lispFunc		etypecase			package-name				vector
+syn keyword lispFunc		eval				package-nicknames			vectorp
+syn keyword lispFunc		evalhook			packagep				vector-pop
+syn keyword lispFunc		eval-when			package-shadowing-symbols		vector-push
+syn keyword lispFunc		evenp				package-used-by-list			vector-push-extend
+syn keyword lispFunc		every				package-use-list			warn
+syn keyword lispFunc		exp				pairlis					warning
+syn keyword lispFunc		export				parse-error				when
+syn keyword lispFunc		expt				parse-integer				wild-pathname-p
+syn keyword lispFunc		extended-char			parse-namestring			with-accessors
+syn keyword lispFunc		fboundp				pathname				with-compilation-unit
+syn keyword lispFunc		fceiling			pathname-device				with-condition-restarts
+syn keyword lispFunc		fdefinition			pathname-directory			with-hash-table-iterator
+syn keyword lispFunc		ffloor				pathname-host				with-input-from-string
+syn keyword lispFunc		fifth				pathname-match-p			with-open-file
+syn keyword lispFunc		file-author			pathname-name				with-open-stream
+syn keyword lispFunc		file-error			pathnamep				with-output-to-string
+syn keyword lispFunc		file-error-pathname		pathname-type				with-package-iterator
+syn keyword lispFunc		file-length			pathname-version			with-simple-restart
+syn keyword lispFunc		file-namestring			peek-char				with-slots
+syn keyword lispFunc		file-position			phase					with-standard-io-syntax
+syn keyword lispFunc		file-stream			pi					write
+syn keyword lispFunc		file-string-length		plusp					write-byte
+syn keyword lispFunc		file-write-date			pop					write-char
+syn keyword lispFunc		fill				position				write-line
+syn keyword lispFunc		fill-pointer			position-if				write-sequence
+syn keyword lispFunc		find				position-if-not				write-string
+syn keyword lispFunc		find-all-symbols		pprint					write-to-string
+syn keyword lispFunc		find-class			pprint-dispatch				yes-or-no-p
+syn keyword lispFunc		find-if				pprint-exit-if-list-exhausted		y-or-n-p
+syn keyword lispFunc		find-if-not			pprint-fill				zerop
+
+syn match   lispFunc		"\<c[ad]\+r\>"
+if exists("g:lispsyntax_clisp")
+  " CLISP FFI:
+  syn match lispFunc	"\<\(ffi:\)\?with-c-\(place\|var\)\>"
+  syn match lispFunc	"\<\(ffi:\)\?with-foreign-\(object\|string\)\>"
+  syn match lispFunc	"\<\(ffi:\)\?default-foreign-\(language\|library\)\>"
+  syn match lispFunc	"\<\([us]_\?\)\?\(element\|deref\|cast\|slot\|validp\)\>"
+  syn match lispFunc	"\<\(ffi:\)\?set-foreign-pointer\>"
+  syn match lispFunc	"\<\(ffi:\)\?allocate-\(deep\|shallow\)\>"
+  syn match lispFunc	"\<\(ffi:\)\?c-lines\>"
+  syn match lispFunc	"\<\(ffi:\)\?foreign-\(value\|free\|variable\|function\|object\)\>"
+  syn match lispFunc	"\<\(ffi:\)\?foreign-address\(-null\|unsigned\)\?\>"
+  syn match lispFunc	"\<\(ffi:\)\?undigned-foreign-address\>"
+  syn match lispFunc	"\<\(ffi:\)\?c-var-\(address\|object\)\>"
+  syn match lispFunc	"\<\(ffi:\)\?typeof\>"
+  syn match lispFunc	"\<\(ffi:\)\?\(bit\)\?sizeof\>"
+" CLISP Macros, functions et al:
+  syn match lispFunc	"\<\(ext:\)\?with-collect\>"
+  syn match lispFunc	"\<\(ext:\)\?letf\*\?\>"
+  syn match lispFunc	"\<\(ext:\)\?finalize\>\>"
+  syn match lispFunc	"\<\(ext:\)\?memoized\>"
+  syn match lispFunc	"\<\(ext:\)\?getenv\>"
+  syn match lispFunc	"\<\(ext:\)\?convert-string-\(to\|from\)-bytes\>"
+  syn match lispFunc	"\<\(ext:\)\?ethe\>"
+  syn match lispFunc	"\<\(ext:\)\?with-gensyms\>"
+  syn match lispFunc	"\<\(ext:\)\?open-http\>"
+  syn match lispFunc	"\<\(ext:\)\?string-concat\>"
+  syn match lispFunc	"\<\(ext:\)\?with-http-\(in\|out\)put\>"
+  syn match lispFunc	"\<\(ext:\)\?with-html-output\>"
+  syn match lispFunc	"\<\(ext:\)\?expand-form\>"
+  syn match lispFunc	"\<\(ext:\)\?\(without-\)\?package-lock\>"
+  syn match lispFunc	"\<\(ext:\)\?re-export\>"
+  syn match lispFunc	"\<\(ext:\)\?saveinitmem\>"
+  syn match lispFunc	"\<\(ext:\)\?\(read\|write\)-\(integer\|float\)\>"
+  syn match lispFunc	"\<\(ext:\)\?\(read\|write\)-\(char\|byte\)-sequence\>"
+  syn match lispFunc	"\<\(custom:\)\?\*system-package-list\*\>"
+  syn match lispFunc	"\<\(custom:\)\?\*ansi\*\>"
+endif
+
+" ---------------------------------------------------------------------
+" Lisp Keywords (modifiers): {{{1
+syn keyword lispKey		:abort				:from-end			:overwrite
+syn keyword lispKey		:adjustable			:gensym				:predicate
+syn keyword lispKey		:append				:host				:preserve-whitespace
+syn keyword lispKey		:array				:if-does-not-exist		:pretty
+syn keyword lispKey		:base				:if-exists			:print
+syn keyword lispKey		:case				:include			:print-function
+syn keyword lispKey		:circle				:index				:probe
+syn keyword lispKey		:conc-name			:inherited			:radix
+syn keyword lispKey		:constructor			:initial-contents		:read-only
+syn keyword lispKey		:copier				:initial-element		:rehash-size
+syn keyword lispKey		:count				:initial-offset			:rehash-threshold
+syn keyword lispKey		:create				:initial-value			:rename
+syn keyword lispKey		:default			:input				:rename-and-delete
+syn keyword lispKey		:defaults			:internal			:size
+syn keyword lispKey		:device				:io				:start
+syn keyword lispKey		:direction			:junk-allowed			:start1
+syn keyword lispKey		:directory			:key				:start2
+syn keyword lispKey		:displaced-index-offset		:length				:stream
+syn keyword lispKey		:displaced-to			:level				:supersede
+syn keyword lispKey		:element-type			:name				:test
+syn keyword lispKey		:end				:named				:test-not
+syn keyword lispKey		:end1				:new-version			:type
+syn keyword lispKey		:end2				:nicknames			:use
+syn keyword lispKey		:error				:output				:verbose
+syn keyword lispKey		:escape				:output-file			:version
+syn keyword lispKey		:external
+" defpackage arguments
+syn keyword lispKey	:documentation	:shadowing-import-from	:modern		:export
+syn keyword lispKey	:case-sensitive	:case-inverted		:shadow		:import-from	:intern
+" lambda list keywords
+syn keyword lispKey	&allow-other-keys	&aux		&body
+syn keyword lispKey	&environment	&key			&optional	&rest		&whole
+" make-array argument
+syn keyword lispKey	:fill-pointer
+" readtable-case values
+syn keyword lispKey	:upcase		:downcase		:preserve	:invert
+" eval-when situations
+syn keyword lispKey	:load-toplevel	:compile-toplevel	:execute
+" ANSI Extended LOOP:
+syn keyword lispKey	:while      :until       :for         :do       :if          :then         :else     :when      :unless :in
+syn keyword lispKey	:across     :finally     :collect     :nconc    :maximize    :minimize     :sum
+syn keyword lispKey	:and        :with        :initially   :append   :into        :count        :end      :repeat
+syn keyword lispKey	:always     :never       :thereis     :from     :to          :upto         :downto   :below
+syn keyword lispKey	:above      :by          :on          :being    :each        :the          :hash-key :hash-keys
+syn keyword lispKey	:hash-value :hash-values :using       :of-type  :upfrom      :downfrom
+if exists("g:lispsyntax_clisp")
+  " CLISP FFI:
+  syn keyword lispKey	:arguments  :return-type :library     :full     :malloc-free
+  syn keyword lispKey	:none       :alloca      :in          :out      :in-out      :stdc-stdcall :stdc     :c
+  syn keyword lispKey	:language   :built-in    :typedef     :external
+  syn keyword lispKey	:fini       :init-once   :init-always
+endif
+
+" ---------------------------------------------------------------------
+" Standard Lisp Variables: {{{1
+syn keyword lispVar		*applyhook*			*load-pathname*			*print-pprint-dispatch*
+syn keyword lispVar		*break-on-signals*		*load-print*			*print-pprint-dispatch*
+syn keyword lispVar		*break-on-signals*		*load-truename*			*print-pretty*
+syn keyword lispVar		*break-on-warnings*		*load-verbose*			*print-radix*
+syn keyword lispVar		*compile-file-pathname*		*macroexpand-hook*		*print-readably*
+syn keyword lispVar		*compile-file-pathname*		*modules*			*print-right-margin*
+syn keyword lispVar		*compile-file-truename*		*package*			*print-right-margin*
+syn keyword lispVar		*compile-file-truename*		*print-array*			*query-io*
+syn keyword lispVar		*compile-print*			*print-base*			*random-state*
+syn keyword lispVar		*compile-verbose*		*print-case*			*read-base*
+syn keyword lispVar		*compile-verbose*		*print-circle*			*read-default-float-format*
+syn keyword lispVar		*debug-io*			*print-escape*			*read-eval*
+syn keyword lispVar		*debugger-hook*			*print-gensym*			*read-suppress*
+syn keyword lispVar		*default-pathname-defaults*	*print-length*			*readtable*
+syn keyword lispVar		*error-output*			*print-level*			*standard-input*
+syn keyword lispVar		*evalhook*			*print-lines*			*standard-output*
+syn keyword lispVar		*features*			*print-miser-width*		*terminal-io*
+syn keyword lispVar		*gensym-counter*		*print-miser-width*		*trace-output*
+
+" ---------------------------------------------------------------------
+" Strings: {{{1
+syn region			lispString			start=+"+ skip=+\\\\\|\\"+ end=+"+	contains=@Spell
+if exists("g:lisp_instring")
+ syn region			lispInString			keepend matchgroup=Delimiter start=+"(+rs=s+1 skip=+|.\{-}|+ matchgroup=Delimiter end=+)"+ contains=@lispBaseListCluster,lispInStringString
+ syn region			lispInStringString		start=+\\"+ skip=+\\\\+ end=+\\"+ contained
+endif
+
+" ---------------------------------------------------------------------
+" Shared with Xlisp, Declarations, Macros, Functions: {{{1
+syn keyword lispDecl		defmacro			do-all-symbols		labels
+syn keyword lispDecl		defsetf				do-external-symbols	let
+syn keyword lispDecl		deftype				do-symbols		locally
+syn keyword lispDecl		defun				dotimes			macrolet
+syn keyword lispDecl		do*				flet			multiple-value-bind
+if exists("g:lispsyntax_clisp")
+  " CLISP FFI:
+  syn match lispDecl	"\<\(ffi:\)\?def-c-\(var\|const\|enum\|type\|struct\)\>"
+  syn match lispDecl	"\<\(ffi:\)\?def-call-\(out\|in\)\>"
+  syn match lispDecl	"\<\(ffi:\)\?c-\(function\|struct\|pointer\|string\)\>"
+  syn match lispDecl	"\<\(ffi:\)\?c-ptr\(-null\)\?\>"
+  syn match lispDecl	"\<\(ffi:\)\?c-array\(-ptr\|-max\)\?\>"
+  syn match lispDecl	"\<\(ffi:\)\?[us]\?\(char\|short\|int\|long\)\>"
+  syn match lispDecl	"\<\(win32:\|w32\)\?d\?word\>"
+  syn match lispDecl	"\<\([us]_\?\)\?int\(8\|16\|32\|64\)\(_t\)\?\>"
+  syn keyword lispDecl	size_t off_t time_t handle
+endif
+
+" ---------------------------------------------------------------------
+" Numbers: supporting integers and floating point numbers {{{1
+syn match lispNumber		"-\=\(\.\d\+\|\d\+\(\.\d*\)\=\)\([dDeEfFlL][-+]\=\d\+\)\="
+syn match lispNumber		"-\=\(\d\+/\d\+\)"
+
+syn match lispEscapeSpecial		"\*\w[a-z_0-9-]*\*"
+syn match lispEscapeSpecial		!#|[^()'`,"; \t]\+|#!
+syn match lispEscapeSpecial		!#x\x\+!
+syn match lispEscapeSpecial		!#o\o\+!
+syn match lispEscapeSpecial		!#b[01]\+!
+syn match lispEscapeSpecial		!#\\[ -}\~]!
+syn match lispEscapeSpecial		!#[':][^()'`,"; \t]\+!
+syn match lispEscapeSpecial		!#([^()'`,"; \t]\+)!
+syn match lispEscapeSpecial		!#\\\%(Space\|Newline\|Tab\|Page\|Rubout\|Linefeed\|Return\|Backspace\)!
+syn match lispEscapeSpecial		"\<+[a-zA-Z_][a-zA-Z_0-9-]*+\>"
+
+syn match lispConcat		"\s\.\s"
+syn match lispParenError	")"
+
+" ---------------------------------------------------------------------
+" Comments: {{{1
+syn cluster lispCommentGroup	contains=lispTodo,@Spell
+syn match   lispComment		";.*$"				contains=@lispCommentGroup
+syn region  lispCommentRegion	start="#|" end="|#"		contains=lispCommentRegion,@lispCommentGroup
+syn keyword lispTodo		contained			combak			combak:			todo			todo:
+
+" ---------------------------------------------------------------------
+" Synchronization: {{{1
+syn sync lines=100
+
+" ---------------------------------------------------------------------
+" Define Highlighting: {{{1
+if !exists("skip_lisp_syntax_inits")
+
+  hi def link lispCommentRegion		lispComment
+  hi def link lispAtomNmbr		lispNumber
+  hi def link lispAtomMark		lispMark
+  hi def link lispInStringString	lispString
+
+  hi def link lispAtom			Identifier
+  hi def link lispAtomBarSymbol		Special
+  hi def link lispBarSymbol		Special
+  hi def link lispComment		Comment
+  hi def link lispConcat		Statement
+  hi def link lispDecl			Statement
+  hi def link lispFunc			Statement
+  hi def link lispKey			Type
+  hi def link lispMark			Delimiter
+  hi def link lispNumber		Number
+  hi def link lispParenError		Error
+  hi def link lispEscapeSpecial		Type
+  hi def link lispString		String
+  hi def link lispTodo			Todo
+  hi def link lispVar			Statement
+
+  if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
+   if &bg == "dark"
+    hi def hlLevel0 ctermfg=red		guifg=red1
+    hi def hlLevel1 ctermfg=yellow	guifg=orange1
+    hi def hlLevel2 ctermfg=green	guifg=yellow1
+    hi def hlLevel3 ctermfg=cyan	guifg=greenyellow
+    hi def hlLevel4 ctermfg=magenta	guifg=green1
+    hi def hlLevel5 ctermfg=red		guifg=springgreen1
+    hi def hlLevel6 ctermfg=yellow	guifg=cyan1
+    hi def hlLevel7 ctermfg=green	guifg=slateblue1
+    hi def hlLevel8 ctermfg=cyan	guifg=magenta1
+    hi def hlLevel9 ctermfg=magenta	guifg=purple1
+   else
+    hi def hlLevel0 ctermfg=red		guifg=red3
+    hi def hlLevel1 ctermfg=darkyellow	guifg=orangered3
+    hi def hlLevel2 ctermfg=darkgreen	guifg=orange2
+    hi def hlLevel3 ctermfg=blue	guifg=yellow3
+    hi def hlLevel4 ctermfg=darkmagenta	guifg=olivedrab4
+    hi def hlLevel5 ctermfg=red		guifg=green4
+    hi def hlLevel6 ctermfg=darkyellow	guifg=paleturquoise3
+    hi def hlLevel7 ctermfg=darkgreen	guifg=deepskyblue4
+    hi def hlLevel8 ctermfg=blue	guifg=darkslateblue
+    hi def hlLevel9 ctermfg=darkmagenta	guifg=darkviolet
+   endif
+  else
+    hi def link lispParen Delimiter
+  endif
+
+endif
+
+let b:current_syntax = "lisp"
+
+" ---------------------------------------------------------------------
+" vim: ts=8 nowrap fdm=marker
+
+endif
diff --git a/syntax/lite.vim b/syntax/lite.vim
new file mode 100644
index 000000000..f54fa61d8
--- /dev/null
+++ b/syntax/lite.vim
@@ -0,0 +1,172 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lite') == -1
+
+" Vim syntax file
+" Language:	lite
+" Maintainer:	Lutz Eymers <ixtab@polzin.com>
+" URL:		http://www.isp.de/data/lite.vim
+" Email:	Subject: send syntax_vim.tgz
+" Last Change:	2001 Mai 01
+"
+" Options	lite_sql_query = 1 for SQL syntax highligthing inside strings
+"		lite_minlines = x     to sync at least x lines backwards
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'lite'
+endif
+
+if main_syntax == 'lite'
+  if exists("lite_sql_query")
+    if lite_sql_query == 1
+      syn include @liteSql <sfile>:p:h/sql.vim
+      unlet b:current_syntax
+    endif
+  endif
+endif
+
+if main_syntax == 'msql'
+  if exists("msql_sql_query")
+    if msql_sql_query == 1
+      syn include @liteSql <sfile>:p:h/sql.vim
+      unlet b:current_syntax
+    endif
+  endif
+endif
+
+syn cluster liteSql remove=sqlString,sqlComment
+
+syn case match
+
+" Internal Variables
+syn keyword liteIntVar ERRMSG contained
+
+" Comment
+syn region liteComment		start="/\*" end="\*/" contains=liteTodo
+
+" Function names
+syn keyword liteFunctions  echo printf fprintf open close read
+syn keyword liteFunctions  readln readtok
+syn keyword liteFunctions  split strseg chop tr sub substr
+syn keyword liteFunctions  test unlink umask chmod mkdir chdir rmdir
+syn keyword liteFunctions  rename truncate link symlink stat
+syn keyword liteFunctions  sleep system getpid getppid kill
+syn keyword liteFunctions  time ctime time2unixtime unixtime2year
+syn keyword liteFunctions  unixtime2year unixtime2month unixtime2day
+syn keyword liteFunctions  unixtime2hour unixtime2min unixtime2sec
+syn keyword liteFunctions  strftime
+syn keyword liteFunctions  getpwnam getpwuid
+syn keyword liteFunctions  gethostbyname gethostbyaddress
+syn keyword liteFunctions  urlEncode setContentType includeFile
+syn keyword liteFunctions  msqlConnect msqlClose msqlSelectDB
+syn keyword liteFunctions  msqlQuery msqlStoreResult msqlFreeResult
+syn keyword liteFunctions  msqlFetchRow msqlDataSeek msqlListDBs
+syn keyword liteFunctions  msqlListTables msqlInitFieldList msqlListField
+syn keyword liteFunctions  msqlFieldSeek msqlNumRows msqlEncode
+syn keyword liteFunctions  exit fatal typeof
+syn keyword liteFunctions  crypt addHttpHeader
+
+" Conditional
+syn keyword liteConditional  if else
+
+" Repeat
+syn keyword liteRepeat  while
+
+" Operator
+syn keyword liteStatement  break return continue
+
+" Operator
+syn match liteOperator  "[-+=#*]"
+syn match liteOperator  "/[^*]"me=e-1
+syn match liteOperator  "\$"
+syn match liteRelation  "&&"
+syn match liteRelation  "||"
+syn match liteRelation  "[!=<>]="
+syn match liteRelation  "[<>]"
+
+" Identifier
+syn match  liteIdentifier "$\h\w*" contains=liteIntVar,liteOperator
+syn match  liteGlobalIdentifier "@\h\w*" contains=liteIntVar
+
+" Include
+syn keyword liteInclude  load
+
+" Define
+syn keyword liteDefine  funct
+
+" Type
+syn keyword liteType  int uint char real
+
+" String
+syn region liteString  keepend matchgroup=None start=+"+  skip=+\\\\\|\\"+  end=+"+ contains=liteIdentifier,liteSpecialChar,@liteSql
+
+" Number
+syn match liteNumber  "-\=\<\d\+\>"
+
+" Float
+syn match liteFloat  "\(-\=\<\d+\|-\=\)\.\d\+\>"
+
+" SpecialChar
+syn match liteSpecialChar "\\[abcfnrtv\\]" contained
+
+syn match liteParentError "[)}\]]"
+
+" Todo
+syn keyword liteTodo TODO Todo todo contained
+
+" dont syn #!...
+syn match liteExec "^#!.*$"
+
+" Parents
+syn cluster liteInside contains=liteComment,liteFunctions,liteIdentifier,liteGlobalIdentifier,liteConditional,liteRepeat,liteStatement,liteOperator,liteRelation,liteType,liteString,liteNumber,liteFloat,liteParent
+
+syn region liteParent matchgroup=Delimiter start="(" end=")" contains=@liteInside
+syn region liteParent matchgroup=Delimiter start="{" end="}" contains=@liteInside
+syn region liteParent matchgroup=Delimiter start="\[" end="\]" contains=@liteInside
+
+" sync
+if main_syntax == 'lite'
+  if exists("lite_minlines")
+    exec "syn sync minlines=" . lite_minlines
+  else
+    syn sync minlines=100
+  endif
+endif
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link liteComment		Comment
+hi def link liteString		String
+hi def link liteNumber		Number
+hi def link liteFloat		Float
+hi def link liteIdentifier	Identifier
+hi def link liteGlobalIdentifier	Identifier
+hi def link liteIntVar		Identifier
+hi def link liteFunctions		Function
+hi def link liteRepeat		Repeat
+hi def link liteConditional	Conditional
+hi def link liteStatement		Statement
+hi def link liteType		Type
+hi def link liteInclude		Include
+hi def link liteDefine		Define
+hi def link liteSpecialChar	SpecialChar
+hi def link liteParentError	liteError
+hi def link liteError		Error
+hi def link liteTodo		Todo
+hi def link liteOperator		Operator
+hi def link liteRelation		Operator
+
+
+let b:current_syntax = "lite"
+
+if main_syntax == 'lite'
+  unlet main_syntax
+endif
+
+" vim: ts=8
+
+endif
diff --git a/syntax/litestep.vim b/syntax/litestep.vim
new file mode 100644
index 000000000..eecb04ccf
--- /dev/null
+++ b/syntax/litestep.vim
@@ -0,0 +1,273 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'litestep') == -1
+
+" Vim syntax file
+" Language:             LiteStep RC file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-02-22
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword litestepTodo
+      \ contained
+      \ TODO FIXME XXX NOTE
+
+syn match   litestepComment
+      \ contained display contains=litestepTodo,@Spell
+      \ ';.*$'
+
+syn case ignore
+
+syn cluster litestepBeginnings
+      \ contains=
+      \   litestepComment,
+      \   litestepPreProc,
+      \   litestepMultiCommandStart,
+      \   litestepBangCommandStart,
+      \   litestepGenericDirective
+
+syn match   litestepGenericDirective
+      \ contained display
+      \ '\<\h\w\+\>'
+
+syn match   litestepBeginning
+      \ nextgroup=@litestepBeginnings skipwhite
+      \ '^'
+
+syn keyword litestepPreProc
+      \ contained
+      \ Include
+      \ If
+      \ ElseIf
+      \ Else
+      \ EndIf
+
+syn cluster litestepMultiCommands
+      \ contains=
+      \   litestepMultiCommand
+
+syn match   litestepMultiCommandStart
+      \ nextgroup=@litestepMultiCommands
+      \ '\*'
+
+syn match   litestepMultiCommand
+      \ contained display
+      \ '\<\h\w\+\>'
+
+syn cluster litestepVariables
+      \ contains=
+      \   litestepBuiltinFolderVariable,
+      \   litestepBuiltinConditionalVariable,
+      \   litestepBuiltinResourceVariable,
+      \   litestepBuiltinGUIDFolderMappingVariable,
+      \   litestepVariable
+
+syn region litestepVariableExpansion
+      \ display oneline transparent
+      \ contains=
+      \   @litestepVariables,
+      \   litestepNumber,
+      \   litestepMathOperator
+      \ matchgroup=litestepVariableExpansion
+      \ start='\$'
+      \ end='\$'
+
+syn match litestepNumber
+      \ display
+      \ '\<\d\+\>'
+
+syn region litestepString
+      \ display oneline contains=litestepVariableExpansion
+      \ start=+"+ end=+"+
+
+" TODO: unsure about this one.
+syn region litestepSubValue
+      \ display oneline contains=litestepVariableExpansion
+      \ start=+'+ end=+'+
+
+syn keyword litestepBoolean
+      \ true
+      \ false
+
+"syn keyword litestepLine
+"      \ ?
+
+"syn match   litestepColor
+"      \ display
+"      \ '\<\x\+\>'
+
+syn match   litestepRelationalOperator
+      \ display
+      \ '=\|<[>=]\=\|>=\='
+
+syn keyword litestepLogicalOperator
+      \ and
+      \ or
+      \ not
+
+syn match   litestepMathOperator
+      \ contained display
+      \ '[+*/-]'
+
+syn keyword litestepBuiltinDirective
+      \ LoadModule
+      \ LSNoStartup
+      \ LSAutoHideModules
+      \ LSNoShellWarning
+      \ LSSetAsShell
+      \ LSUseSystemDDE
+      \ LSDisableTrayService
+      \ LSImageFolder
+      \ ThemeAuthor
+      \ ThemeName
+
+syn keyword litestepDeprecatedBuiltinDirective
+      \ LSLogLevel
+      \ LSLogFile
+
+syn match   litestepVariable
+      \ contained display
+      \ '\<\h\w\+\>'
+
+syn keyword litestepBuiltinFolderVariable
+      \ contained
+      \ AdminToolsDir
+      \ CommonAdminToolsDir
+      \ CommonDesktopDir
+      \ CommonFavorites
+      \ CommonPrograms
+      \ CommonStartMenu
+      \ CommonStartup
+      \ Cookies
+      \ Desktop
+      \ DesktopDir
+      \ DocumentsDir
+      \ Favorites
+      \ Fonts
+      \ History
+      \ Internet
+      \ InternetCache
+      \ LitestepDir
+      \ Nethood
+      \ Printhood
+      \ Programs
+      \ QuickLaunch
+      \ Recent
+      \ Sendto
+      \ Startmenu
+      \ Startup
+      \ Templates
+      \ WinDir
+      \ LitestepDir
+
+syn keyword litestepBuiltinConditionalVariable
+      \ contained
+      \ Win2000
+      \ Win95
+      \ Win98
+      \ Win9X
+      \ WinME
+      \ WinNT
+      \ WinNT4
+      \ WinXP
+
+syn keyword litestepBuiltinResourceVariable
+      \ contained
+      \ CompileDate
+      \ ResolutionX
+      \ ResolutionY
+      \ UserName
+
+syn keyword litestepBuiltinGUIDFolderMappingVariable
+      \ contained
+      \ AdminTools
+      \ BitBucket
+      \ Controls
+      \ Dialup
+      \ Documents
+      \ Drives
+      \ Network
+      \ NetworkAndDialup
+      \ Printers
+      \ Scheduled
+
+syn cluster litestepBangs
+      \ contains=
+      \   litestepBuiltinBang,
+      \   litestepBang
+
+syn match   litestepBangStart
+      \ nextgroup=@litestepBangs
+      \ '!'
+
+syn match   litestepBang
+      \ contained display
+      \ '\<\h\w\+\>'
+
+syn keyword litestepBuiltinBang
+      \ contained
+      \ About
+      \ Alert
+      \ CascadeWindows
+      \ Confirm
+      \ Execute
+      \ Gather
+      \ HideModules
+      \ LogOff
+      \ MinimizeWindows
+      \ None
+      \ Quit
+      \ Recycle
+      \ Refresh
+      \ Reload
+      \ ReloadModule
+      \ RestoreWindows
+      \ Run
+      \ ShowModules
+      \ Shutdown
+      \ Switchuser
+      \ TileWindowsH
+      \ TileWindowsV
+      \ ToggleModules
+      \ UnloadModule
+
+hi def link litestepTodo                              Todo
+hi def link litestepComment                           Comment
+hi def link litestepDirective                         Keyword
+hi def link litestepGenericDirective                  litestepDirective
+hi def link litestepPreProc                           PreProc
+hi def link litestepMultiCommandStart                 litestepPreProc
+hi def link litestepMultiCommand                      litestepDirective
+hi def link litestepDelimiter                         Delimiter
+hi def link litestepVariableExpansion                 litestepDelimiter
+hi def link litestepNumber                            Number
+hi def link litestepString                            String
+hi def link litestepSubValue                          litestepString
+hi def link litestepBoolean                           Boolean
+"hi def link litestepLine 
+"hi def link litestepColor                             Type
+hi def link litestepOperator                          Operator
+hi def link litestepRelationalOperator                litestepOperator
+hi def link litestepLogicalOperator                   litestepOperator
+hi def link litestepMathOperator                      litestepOperator
+hi def link litestepBuiltinDirective                  litestepDirective
+hi def link litestepDeprecatedBuiltinDirective        Error
+hi def link litestepVariable                          Identifier
+hi def link litestepBuiltinFolderVariable             Identifier
+hi def link litestepBuiltinConditionalVariable        Identifier
+hi def link litestepBuiltinResourceVariable           Identifier
+hi def link litestepBuiltinGUIDFolderMappingVariable  Identifier
+hi def link litestepBangStart                         litestepPreProc
+hi def link litestepBang                              litestepDirective
+hi def link litestepBuiltinBang                       litestepBang
+
+let b:current_syntax = "litestep"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/loginaccess.vim b/syntax/loginaccess.vim
new file mode 100644
index 000000000..26880e7ae
--- /dev/null
+++ b/syntax/loginaccess.vim
@@ -0,0 +1,100 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'loginaccess') == -1
+
+" Vim syntax file
+" Language:             login.access(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword loginaccessTodo           contained TODO FIXME XXX NOTE
+
+syn region  loginaccessComment        display oneline start='^#' end='$'
+                                      \ contains=loginaccessTodo,@Spell
+
+syn match   loginaccessBegin          display '^'
+                                      \ nextgroup=loginaccessPermission,
+                                      \ loginaccessComment skipwhite
+
+syn match   loginaccessPermission     contained display '[^#]'
+                                      \ contains=loginaccessPermError
+                                      \ nextgroup=loginaccessUserSep
+
+syn match   loginaccessPermError      contained display '[^+-]'
+
+syn match   loginaccessUserSep        contained display ':'
+                                      \ nextgroup=loginaccessUsers,
+                                      \ loginaccessAllUsers,
+                                      \ loginaccessExceptUsers
+
+syn match   loginaccessUsers          contained display '[^, \t:]\+'
+                                      \ nextgroup=loginaccessUserIntSep,
+                                      \ loginaccessOriginSep
+
+syn match   loginaccessAllUsers       contained display '\<ALL\>'
+                                      \ nextgroup=loginaccessUserIntSep,
+                                      \ loginaccessOriginSep
+
+syn match   loginaccessLocalUsers     contained display '\<LOCAL\>'
+                                      \ nextgroup=loginaccessUserIntSep,
+                                      \ loginaccessOriginSep
+
+syn match   loginaccessExceptUsers    contained display '\<EXCEPT\>'
+                                      \ nextgroup=loginaccessUserIntSep,
+                                      \ loginaccessOriginSep
+
+syn match   loginaccessUserIntSep     contained display '[, \t]'
+                                      \ nextgroup=loginaccessUsers,
+                                      \ loginaccessAllUsers,
+                                      \ loginaccessExceptUsers
+
+syn match   loginaccessOriginSep      contained display ':'
+                                      \ nextgroup=loginaccessOrigins,
+                                      \ loginaccessAllOrigins,
+                                      \ loginaccessExceptOrigins
+
+syn match   loginaccessOrigins        contained display '[^, \t]\+'
+                                      \ nextgroup=loginaccessOriginIntSep
+
+syn match   loginaccessAllOrigins     contained display '\<ALL\>'
+                                      \ nextgroup=loginaccessOriginIntSep
+
+syn match   loginaccessLocalOrigins   contained display '\<LOCAL\>'
+                                      \ nextgroup=loginaccessOriginIntSep
+
+syn match   loginaccessExceptOrigins  contained display '\<EXCEPT\>'
+                                      \ nextgroup=loginaccessOriginIntSep
+
+syn match   loginaccessOriginIntSep   contained display '[, \t]'
+                                      \ nextgroup=loginaccessOrigins,
+                                      \ loginaccessAllOrigins,
+                                      \ loginaccessExceptOrigins
+
+hi def link loginaccessTodo           Todo
+hi def link loginaccessComment        Comment
+hi def link loginaccessPermission     Type
+hi def link loginaccessPermError      Error
+hi def link loginaccessUserSep        Delimiter
+hi def link loginaccessUsers          Identifier
+hi def link loginaccessAllUsers       Macro
+hi def link loginaccessLocalUsers     Macro
+hi def link loginaccessExceptUsers    Operator
+hi def link loginaccessUserIntSep     loginaccessUserSep
+hi def link loginaccessOriginSep      loginaccessUserSep
+hi def link loginaccessOrigins        Identifier
+hi def link loginaccessAllOrigins     Macro
+hi def link loginaccessLocalOrigins   Macro
+hi def link loginaccessExceptOrigins  loginaccessExceptUsers
+hi def link loginaccessOriginIntSep   loginaccessUserSep
+
+let b:current_syntax = "loginaccess"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/logindefs.vim b/syntax/logindefs.vim
new file mode 100644
index 000000000..cebeabeb0
--- /dev/null
+++ b/syntax/logindefs.vim
@@ -0,0 +1,178 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logindefs') == -1
+
+" Vim syntax file
+" Language:             login.defs(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2010-11-29
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match   logindefsBegin          display '^'
+                                    \ nextgroup=
+                                    \   logindefsComment,
+                                    \   @logindefsKeyword
+                                    \ skipwhite
+
+syn region  logindefsComment        display oneline start='^\s*#' end='$'
+                                    \ contains=logindefsTodo,@Spell
+
+syn keyword logindefsTodo           contained TODO FIXME XXX NOTE
+
+syn cluster logindefsKeyword        contains=
+                                    \ logindefsBooleanKeyword,
+                                    \ logindefsEncryptKeyword,
+                                    \ logindefsNumberKeyword,
+                                    \ logindefsPathKeyword,
+                                    \ logindefsPathsKeyword,
+                                    \ logindefsStringKeyword
+
+syn keyword logindefsBooleanKeyword contained
+                                    \ CHFN_AUTH
+                                    \ CHSH_AUTH
+                                    \ CREATE_HOME
+                                    \ DEFAULT_HOME
+                                    \ FAILLOG_ENAB
+                                    \ LASTLOG_ENAB
+                                    \ LOG_OK_LOGINS
+                                    \ LOG_UNKFAIL_ENAB
+                                    \ MAIL_CHECK_ENAB
+                                    \ MD5_CRYPT_ENAB
+                                    \ OBSCURE_CHECKS_ENAB
+                                    \ PASS_ALWAYS_WARN
+                                    \ PORTTIME_CHECKS_ENAB
+                                    \ QUOTAS_ENAB
+                                    \ SU_WHEEL_ONLY
+                                    \ SYSLOG_SG_ENAB
+                                    \ SYSLOG_SU_ENAB
+                                    \ USERGROUPS_ENAB
+                                    \ nextgroup=logindefsBoolean skipwhite
+
+syn keyword logindefsBoolean        contained yes no
+
+syn keyword logindefsEncryptKeyword contained
+                                    \ ENCRYPT_METHOD
+                                    \ nextgroup=logindefsEncryptMethod skipwhite
+
+syn keyword logindefsEncryptMethod  contained
+                                    \ DES
+                                    \ MD5
+                                    \ SHA256
+                                    \ SHA512
+
+syn keyword logindefsNumberKeyword  contained
+                                    \ ERASECHAR
+                                    \ FAIL_DELAY
+                                    \ GID_MAX
+                                    \ GID_MIN
+                                    \ KILLCHAR
+                                    \ LOGIN_RETRIES
+                                    \ LOGIN_TIMEOUT
+                                    \ MAX_MEMBERS_PER_GROUP
+                                    \ PASS_CHANGE_TRIES
+                                    \ PASS_MAX_DAYS
+                                    \ PASS_MIN_DAYS
+                                    \ PASS_WARN_AGE
+                                    \ PASS_MAX_LEN
+                                    \ PASS_MIN_LEN
+                                    \ SHA_CRYPT_MAX_ROUNDS
+                                    \ SHA_CRYPT_MIN_ROUNDS
+                                    \ SYS_GID_MAX
+                                    \ SYS_GID_MIN
+                                    \ SYS_UID_MAX
+                                    \ SYS_UID_MIN
+                                    \ UID_MAX
+                                    \ UID_MIN
+                                    \ ULIMIT
+                                    \ UMASK
+                                    \ nextgroup=@logindefsNumber skipwhite
+
+syn cluster logindefsNumber         contains=
+                                    \ logindefsDecimal,
+                                    \ logindefsHex,
+                                    \ logindefsOctal,
+                                    \ logindefsOctalError
+
+syn match   logindefsDecimal        contained '\<\d\+\>'
+
+syn match   logindefsHex            contained display '\<0x\x\+\>'
+
+syn match   logindefsOctal          contained display '\<0\o\+\>'
+                                    \ contains=logindefsOctalZero
+syn match   logindefsOctalZero      contained display '\<0'
+
+syn match   logindefsOctalError     contained display '\<0\o*[89]\d*\>'
+
+syn keyword logindefsPathKeyword    contained
+                                    \ ENVIRON_FILE
+                                    \ FAKE_SHELL
+                                    \ FTMP_FILE
+                                    \ HUSHLOGIN_FILE
+                                    \ ISSUE_FILE
+                                    \ MAIL_DIR
+                                    \ MAIL_FILE
+                                    \ NOLOGINS_FILE
+                                    \ SULOG_FILE
+                                    \ TTYTYPE_FILE
+                                    \ nextgroup=logindefsPath skipwhite
+
+syn match   logindefsPath           contained '[[:graph:]]\+'
+
+syn keyword logindefsPathsKeyword   contained
+                                    \ CONSOLE
+                                    \ ENV_PATH
+                                    \ ENV_SUPATH
+                                    \ MOTD_FILE
+                                    \ nextgroup=logindefsPaths skipwhite
+
+syn match   logindefsPaths          contained '[^:]\+'
+                                    \ nextgroup=logindefsPathDelim
+
+syn match   logindefsPathDelim      contained ':' nextgroup=logindefsPaths
+
+syn keyword logindefsStringKeyword  contained
+                                    \ CHFN_RESTRICT
+                                    \ CONSOLE_GROUPS
+                                    \ ENV_HZ
+                                    \ ENV_TZ
+                                    \ LOGIN_STRING
+                                    \ SU_NAME
+                                    \ TTYGROUP
+                                    \ TTYPERM
+                                    \ USERDEL_CMD
+                                    \ nextgroup=logindefsString skipwhite
+
+syn match   logindefsString         contained '[[:graph:]]\+'
+
+hi def link logindefsComment        Comment
+hi def link logindefsTodo           Todo
+hi def link logindefsKeyword        Keyword
+hi def link logindefsBooleanKeyword logindefsKeyword
+hi def link logindefsEncryptKeyword logindefsKeyword
+hi def link logindefsNumberKeyword  logindefsKeyword
+hi def link logindefsPathKeyword    logindefsKeyword
+hi def link logindefsPathsKeyword   logindefsKeyword
+hi def link logindefsStringKeyword  logindefsKeyword
+hi def link logindefsBoolean        Boolean
+hi def link logindefsEncryptMethod  Type
+hi def link logindefsNumber         Number
+hi def link logindefsDecimal        logindefsNumber
+hi def link logindefsHex            logindefsNumber
+hi def link logindefsOctal          logindefsNumber
+hi def link logindefsOctalZero      PreProc
+hi def link logindefsOctalError     Error
+hi def link logindefsPath           String
+hi def link logindefsPaths          logindefsPath
+hi def link logindefsPathDelim      Delimiter
+hi def link logindefsString         String
+
+let b:current_syntax = "logindefs"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/logtalk.vim b/syntax/logtalk.vim
new file mode 100644
index 000000000..86cea6939
--- /dev/null
+++ b/syntax/logtalk.vim
@@ -0,0 +1,458 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logtalk') == -1
+
+" Vim syntax file
+"
+" Language:	Logtalk
+" Maintainer:	Paulo Moura <pmoura@logtalk.org>
+" Last Change:	August 3, 2018
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Logtalk is case sensitive:
+
+syn case match
+
+
+" Logtalk variables
+
+syn match   logtalkVariable		"\<\(\u\|_\)\(\w\)*\>"
+
+
+" Logtalk clause functor
+
+syn match	logtalkOperator		":-"
+
+
+" Logtalk quoted atoms and strings
+
+syn region	logtalkString		start=+"+	skip=+\\"+	end=+"+
+syn region	logtalkAtom		start=+'+	skip=+\\'+	end=+'+		contains=logtalkEscapeSequence
+
+syn match	logtalkEscapeSequence	contained	"\\\([\\abfnrtv\"\']\|\(x[a-fA-F0-9]\+\|[0-7]\+\)\\\)"
+
+
+" Logtalk message sending operators
+
+syn match	logtalkOperator		"::"
+syn match	logtalkOperator		":"
+syn match	logtalkOperator		"\^\^"
+
+
+" Logtalk external call
+
+syn region	logtalkExtCall		matchgroup=logtalkExtCallTag		start="{"		matchgroup=logtalkExtCallTag		end="}"		contains=ALL
+
+
+" Logtalk opening entity directives
+
+syn region	logtalkOpenEntityDir	matchgroup=logtalkOpenEntityDirTag	start=":- object("	matchgroup=logtalkOpenEntityDirTag	end=")\."	contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkString,logtalkAtom,logtalkEntityRel,logtalkLineComment
+syn region	logtalkOpenEntityDir	matchgroup=logtalkOpenEntityDirTag	start=":- protocol("	matchgroup=logtalkOpenEntityDirTag	end=")\."	contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel,logtalkLineComment
+syn region	logtalkOpenEntityDir	matchgroup=logtalkOpenEntityDirTag	start=":- category("	matchgroup=logtalkOpenEntityDirTag	end=")\."	contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkEntityRel,logtalkLineComment
+
+
+" Logtalk closing entity directives
+
+syn match	logtalkCloseEntityDir	":- end_object\."
+syn match	logtalkCloseEntityDir	":- end_protocol\."
+syn match	logtalkCloseEntityDir	":- end_category\."
+
+
+" Logtalk entity relations
+
+syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="instantiates("	matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkString,logtalkAtom	contained
+syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="specializes("	matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkString,logtalkAtom	contained
+syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="extends("	matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkString,logtalkAtom	contained
+syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="imports("	matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkString,logtalkAtom	contained
+syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="implements("	matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkString,logtalkAtom	contained
+syn region	logtalkEntityRel	matchgroup=logtalkEntityRelTag	start="complements("	matchgroup=logtalkEntityRelTag	end=")"		contains=logtalkEntity,logtalkVariable,logtalkNumber,logtalkOperator,logtalkString,logtalkAtom	contained
+
+
+" Logtalk directives
+
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- if("			matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- elif("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn match	logtalkDirTag		":- else\."
+syn match	logtalkDirTag		":- endif\."
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- alias("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- coinductive("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- encoding("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- initialization("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- info("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- mode("		matchgroup=logtalkDirTag	end=")\."	contains=logtalkOperator, logtalkAtom
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- dynamic("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn match	logtalkDirTag		":- built_in\."
+syn match	logtalkDirTag		":- dynamic\."
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- discontiguous("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- multifile("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- public("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- protected("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- private("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- meta_predicate("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- meta_non_terminal("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- op("			matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- set_logtalk_flag("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- synchronized("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn match	logtalkDirTag		":- synchronized\."
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- uses("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn match	logtalkDirTag		":- threaded\."
+
+
+" Prolog directives
+
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- ensure_loaded("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- include("     	matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- set_prolog_flag("	matchgroup=logtalkDirTag	end=")\."	contains=ALL
+
+
+" Module directives
+
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- module("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- export("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- reexport("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+syn region	logtalkDir		matchgroup=logtalkDirTag	start=":- use_module("		matchgroup=logtalkDirTag	end=")\."	contains=ALL
+
+
+" Logtalk built-in predicates
+
+syn match	logtalkBuiltIn		"\<\(abolish\|c\(reate\|urrent\)\)_\(object\|protocol\|category\)\ze("
+
+syn match	logtalkBuiltIn		"\<\(object\|protocol\|category\)_property\ze("
+
+syn match	logtalkBuiltIn		"\<co\(mplements_object\|nforms_to_protocol\)\ze("
+syn match	logtalkBuiltIn		"\<extends_\(object\|protocol\|category\)\ze("
+syn match	logtalkBuiltIn		"\<imp\(orts_category\|lements_protocol\)\ze("
+syn match	logtalkBuiltIn		"\<\(instantiat\|specializ\)es_class\ze("
+
+syn match	logtalkBuiltIn		"\<\(abolish\|define\)_events\ze("
+syn match	logtalkBuiltIn		"\<current_event\ze("
+
+syn match	logtalkBuiltIn		"\<\(create\|current\|set\)_logtalk_flag\ze("
+
+syn match	logtalkBuiltIn		"\<logtalk_\(compile\|l\(ibrary_path\|oad\|oad_context\)\|make\(_target_action\)\?\)\ze("
+syn match	logtalkBuiltIn		"\<logtalk_make\>"
+
+syn match	logtalkBuiltIn		"\<\(for\|retract\)all\ze("
+
+syn match	logtalkBuiltIn		"\<threaded\(_\(call\|once\|ignore\|exit\|peek\|wait\|notify\)\)\?\ze("
+syn match	logtalkBuiltIn		"\<threaded_engine\(_\(create\|destroy\|self\|next\|next_reified\|yield\|post\|fetch\)\)\?\ze("
+
+
+" Logtalk built-in methods
+
+syn match	logtalkBuiltInMethod	"\<context\ze("
+syn match	logtalkBuiltInMethod	"\<parameter\ze("
+syn match	logtalkBuiltInMethod	"\<se\(lf\|nder\)\ze("
+syn match	logtalkBuiltInMethod	"\<this\ze("
+
+syn match	logtalkBuiltInMethod	"\<current_predicate\ze("
+syn match	logtalkBuiltInMethod	"\<predicate_property\ze("
+
+syn match	logtalkBuiltInMethod	"\<a\(bolish\|ssert\(a\|z\)\)\ze("
+syn match	logtalkBuiltInMethod	"\<clause\ze("
+syn match	logtalkBuiltInMethod	"\<retract\(all\)\?\ze("
+
+syn match	logtalkBuiltInMethod	"\<\(bag\|set\)of\ze("
+syn match	logtalkBuiltInMethod	"\<f\(ind\|or\)all\ze("
+
+syn match	logtalkBuiltInMethod	"\<before\ze("
+syn match	logtalkBuiltInMethod	"\<after\ze("
+
+syn match	logtalkBuiltInMethod	"\<forward\ze("
+
+syn match	logtalkBuiltInMethod	"\<expand_\(goal\|term\)\ze("
+syn match	logtalkBuiltInMethod	"\<\(goal\|term\)_expansion\ze("
+syn match	logtalkBuiltInMethod	"\<phrase\ze("
+
+
+" Mode operators
+
+syn match	logtalkOperator		"?"
+syn match	logtalkOperator		"@"
+
+
+" Control constructs
+
+syn match	logtalkKeyword		"\<true\>"
+syn match	logtalkKeyword		"\<fail\>"
+syn match	logtalkKeyword		"\<false\>"
+syn match	logtalkKeyword		"\<ca\(ll\|tch\)\ze("
+syn match	logtalkOperator		"!"
+" syn match	logtalkOperator		","
+syn match	logtalkOperator		";"
+syn match	logtalkOperator		"-->"
+syn match	logtalkOperator		"->"
+syn match	logtalkKeyword		"\<throw\ze("
+syn match	logtalkKeyword		"\<\(instantiation\|system\)_error\>"
+syn match	logtalkKeyword		"\<\(type\|domain\|existence\|permission\|representation\|evaluation\|resource\|syntax\)_error\ze("
+
+
+" Term unification
+
+syn match	logtalkOperator		"="
+syn match	logtalkKeyword		"\<subsumes_term\ze("
+syn match	logtalkKeyword		"\<unify_with_occurs_check\ze("
+syn match	logtalkOperator		"\\="
+
+
+" Term testing
+
+syn match	logtalkKeyword		"\<var\ze("
+syn match	logtalkKeyword		"\<atom\(ic\)\?\ze("
+syn match	logtalkKeyword		"\<integer\ze("
+syn match	logtalkKeyword		"\<float\ze("
+syn match	logtalkKeyword		"\<c\(allable\|ompound\)\ze("
+syn match	logtalkKeyword		"\<n\(onvar\|umber\)\ze("
+syn match	logtalkKeyword		"\<ground\ze("
+syn match	logtalkKeyword		"\<acyclic_term\ze("
+
+
+" Term comparison
+
+syn match	logtalkKeyword		"\<compare\ze("
+syn match	logtalkOperator		"@=<"
+syn match	logtalkOperator		"=="
+syn match	logtalkOperator		"\\=="
+syn match	logtalkOperator		"@<"
+syn match	logtalkOperator		"@>"
+syn match	logtalkOperator		"@>="
+
+
+" Term creation and decomposition
+
+syn match	logtalkKeyword		"\<functor\ze("
+syn match	logtalkKeyword		"\<arg\ze("
+syn match	logtalkOperator		"=\.\."
+syn match	logtalkKeyword		"\<copy_term\ze("
+syn match	logtalkKeyword		"\<numbervars\ze("
+syn match	logtalkKeyword		"\<term_variables\ze("
+
+
+" Predicate aliases
+
+syn match	logtalkOperator		"\<as\>"
+
+
+" Arithmetic evaluation
+
+syn match	logtalkOperator		"\<is\>"
+
+
+" Arithmetic comparison
+
+syn match	logtalkOperator		"=:="
+syn match	logtalkOperator		"=\\="
+syn match	logtalkOperator		"<"
+syn match	logtalkOperator		"=<"
+syn match	logtalkOperator		">"
+syn match	logtalkOperator		">="
+
+
+" Stream selection and control
+
+syn match	logtalkKeyword		"\<\(curren\|se\)t_\(in\|out\)put\ze("
+syn match	logtalkKeyword		"\<open\ze("
+syn match	logtalkKeyword		"\<close\ze("
+syn match	logtalkKeyword		"\<flush_output\ze("
+syn match	logtalkKeyword		"\<flush_output\>"
+syn match	logtalkKeyword		"\<stream_property\ze("
+syn match	logtalkKeyword		"\<at_end_of_stream\ze("
+syn match	logtalkKeyword		"\<at_end_of_stream\>"
+syn match	logtalkKeyword		"\<set_stream_position\ze("
+
+
+" Character and byte input/output
+
+syn match	logtalkKeyword		"\<\(get\|p\(eek\|ut\)\)_\(c\(har\|ode\)\|byte\)\ze("
+syn match	logtalkKeyword		"\<nl\ze("
+syn match	logtalkKeyword		"\<nl\>"
+
+
+" Term input/output
+
+syn match	logtalkKeyword		"\<read\(_term\)\?\ze("
+syn match	logtalkKeyword		"\<write\(q\|_\(canonical\|term\)\)\?\ze("
+syn match	logtalkKeyword		"\<\(current_\)\?op\ze("
+syn match	logtalkKeyword		"\<\(current_\)\?char_conversion\ze("
+
+
+" Logic and control
+
+syn match	logtalkOperator		"\\+"
+syn match	logtalkKeyword		"\<ignore\ze("
+syn match	logtalkKeyword		"\<once\ze("
+syn match	logtalkKeyword		"\<repeat\>"
+
+
+" Atomic term processing
+
+syn match	logtalkKeyword		"\<atom_\(length\|c\(hars\|o\(ncat\|des\)\)\)\ze("
+syn match	logtalkKeyword		"\<sub_atom\ze("
+syn match	logtalkKeyword		"\<char_code\ze("
+syn match	logtalkKeyword		"\<number_c\(har\|ode\)s\ze("
+
+
+" Implementation defined hooks functions
+
+syn match	logtalkKeyword		"\<\(curren\|se\)t_prolog_flag\ze("
+syn match	logtalkKeyword		"\<halt\ze("
+syn match	logtalkKeyword		"\<halt\>"
+
+
+" Sorting
+
+syn match	logtalkKeyword		"\<\(key\)\?sort\ze("
+
+
+" Evaluable functors
+
+syn match	logtalkOperator		"+"
+syn match	logtalkOperator		"-"
+syn match	logtalkOperator		"\*"
+syn match	logtalkOperator		"//"
+syn match	logtalkOperator		"/"
+syn match	logtalkKeyword		"\<div\ze("
+syn match	logtalkKeyword		"\<r\(ound\|em\)\ze("
+syn match	logtalkKeyword		"\<e\>"
+syn match	logtalkKeyword		"\<pi\>"
+syn match	logtalkKeyword		"\<div\>"
+syn match	logtalkKeyword		"\<rem\>"
+syn match	logtalkKeyword		"\<m\(ax\|in\|od\)\ze("
+syn match	logtalkKeyword		"\<mod\>"
+syn match	logtalkKeyword		"\<abs\ze("
+syn match	logtalkKeyword		"\<sign\ze("
+syn match	logtalkKeyword		"\<flo\(or\|at\(_\(integer\|fractional\)_part\)\?\)\ze("
+syn match	logtalkKeyword		"\<t\(an\|runcate\)\ze("
+syn match	logtalkKeyword		"\<ceiling\ze("
+
+
+" Other arithemtic functors
+
+syn match	logtalkOperator		"\*\*"
+syn match	logtalkKeyword		"\<s\(in\|qrt\)\ze("
+syn match	logtalkKeyword		"\<cos\ze("
+syn match	logtalkKeyword		"\<a\(cos\|sin\|tan\|tan2\)\ze("
+syn match	logtalkKeyword		"\<exp\ze("
+syn match	logtalkKeyword		"\<log\ze("
+
+
+" Bitwise functors
+
+syn match	logtalkOperator		">>"
+syn match	logtalkOperator		"<<"
+syn match	logtalkOperator		"/\\"
+syn match	logtalkOperator		"\\/"
+syn match	logtalkOperator		"\\"
+syn match	logtalkKeyword		"\<xor\ze("
+
+
+" Logtalk list operator
+
+syn match	logtalkOperator		"|"
+
+
+" Logtalk existential quantifier operator
+
+syn match	logtalkOperator		"\^"
+
+
+" Logtalk numbers 
+
+syn match	logtalkNumber		"\<\d\+\>"
+syn match	logtalkNumber		"\<\d\+\.\d\+\>"
+syn match	logtalkNumber		"\<\d\+[eE][-+]\=\d\+\>"
+syn match	logtalkNumber		"\<\d\+\.\d\+[eE][-+]\=\d\+\>"
+syn match	logtalkNumber		"\<0'[\\]\?.\|0''\|0'\"\>"
+syn match	logtalkNumber		"\<0b[0-1]\+\>"
+syn match	logtalkNumber		"\<0o\o\+\>"
+syn match	logtalkNumber		"\<0x\x\+\>"
+
+
+" Logtalk end-of-clause
+
+syn match	logtalkOperator		"\."
+
+
+" Logtalk comments
+
+syn region	logtalkBlockComment	start="/\*"	end="\*/"	fold
+syn match	logtalkLineComment	"%.*"
+
+syn cluster	logtalkComment		contains=logtalkBlockComment,logtalkLineComment
+
+
+" Logtalk conditional compilation folding
+
+syn region logtalkIfContainer transparent keepend extend start=":- if(" end=":- endif\." containedin=ALLBUT,@logtalkComment contains=NONE
+syn region logtalkIf transparent fold keepend start=":- if(" end=":- \(else\.\|elif(\)"ms=s-1,me=s-1 contained containedin=logtalkIfContainer nextgroup=logtalkElseIf,logtalkElse contains=TOP
+syn region logtalkElseIf transparent fold keepend start=":- elif(" end=":- \(else\.\|elif(\)"ms=s-1,me=s-1 contained containedin=logtalkIfContainer nextgroup=logtalkElseIf,logtalkElse contains=TOP
+syn region logtalkElse transparent fold keepend start=":- else\." end=":- endif\." contained containedin=logtalkIfContainer contains=TOP
+
+
+
+" Logtalk entity folding
+
+syn region logtalkEntity transparent fold keepend start=":- object(" end=":- end_object\." contains=ALL
+syn region logtalkEntity transparent fold keepend start=":- protocol(" end=":- end_protocol\." contains=ALL
+syn region logtalkEntity transparent fold keepend start=":- category(" end=":- end_category\." contains=ALL
+
+
+syn sync ccomment logtalkBlockComment maxlines=50
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link logtalkBlockComment	Comment
+hi def link logtalkLineComment	Comment
+
+hi def link logtalkOpenEntityDir	Normal
+hi def link logtalkOpenEntityDirTag	PreProc
+
+hi def link logtalkIfContainer	PreProc
+hi def link logtalkIf		PreProc
+hi def link logtalkElseIf		PreProc
+hi def link logtalkElse		PreProc
+
+hi def link logtalkEntity		Normal
+
+hi def link logtalkEntityRel	Normal
+hi def link logtalkEntityRelTag	PreProc
+
+hi def link logtalkCloseEntityDir	PreProc
+
+hi def link logtalkDir		Normal
+hi def link logtalkDirTag		PreProc
+
+hi def link logtalkAtom		String
+hi def link logtalkString		String
+hi def link logtalkEscapeSequence	SpecialChar
+
+hi def link logtalkNumber		Number
+
+hi def link logtalkKeyword		Keyword
+
+hi def link logtalkBuiltIn		Keyword
+hi def link logtalkBuiltInMethod	Keyword
+
+hi def link logtalkOperator		Operator
+
+hi def link logtalkExtCall		Normal
+hi def link logtalkExtCallTag	Operator
+
+hi def link logtalkVariable		Identifier
+
+
+
+let b:current_syntax = "logtalk"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/lotos.vim b/syntax/lotos.vim
new file mode 100644
index 000000000..639c70416
--- /dev/null
+++ b/syntax/lotos.vim
@@ -0,0 +1,73 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lotos') == -1
+
+" Vim syntax file
+" Language:	LOTOS (Language Of Temporal Ordering Specifications, IS8807)
+" Maintainer:	Daniel Amyot <damyot@csi.uottawa.ca>
+" Last Change:	Wed Aug 19 1998
+" URL:		http://lotos.csi.uottawa.ca/~damyot/vim/lotos.vim
+" This file is an adaptation of pascal.vim by Mario Eusebio
+" I'm not sure I understand all of the syntax highlight language,
+" but this file seems to do the job for standard LOTOS.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+"Comments in LOTOS are between (* and *)
+syn region lotosComment	start="(\*"  end="\*)" contains=lotosTodo
+
+"Operators [], [...], >>, ->, |||, |[...]|, ||, ;, !, ?, :, =, ,, :=
+syn match  lotosDelimiter       "[][]"
+syn match  lotosDelimiter	">>"
+syn match  lotosDelimiter	"->"
+syn match  lotosDelimiter	"\[>"
+syn match  lotosDelimiter	"[|;!?:=,]"
+
+"Regular keywords
+syn keyword lotosStatement	specification endspec process endproc
+syn keyword lotosStatement	where behaviour behavior
+syn keyword lotosStatement      any let par accept choice hide of in
+syn keyword lotosStatement	i stop exit noexit
+
+"Operators from the Abstract Data Types in IS8807
+syn keyword lotosOperator	eq ne succ and or xor implies iff
+syn keyword lotosOperator	not true false
+syn keyword lotosOperator	Insert Remove IsIn NotIn Union Ints
+syn keyword lotosOperator	Minus Includes IsSubsetOf
+syn keyword lotosOperator	lt le ge gt 0
+
+"Sorts in IS8807
+syn keyword lotosSort		Boolean Bool FBoolean FBool Element
+syn keyword lotosSort		Set String NaturalNumber Nat HexString
+syn keyword lotosSort		HexDigit DecString DecDigit
+syn keyword lotosSort		OctString OctDigit BitString Bit
+syn keyword lotosSort		Octet OctetString
+
+"Keywords for ADTs
+syn keyword lotosType	type endtype library endlib sorts formalsorts
+syn keyword lotosType	eqns formaleqns opns formalopns forall ofsort is
+syn keyword lotosType   for renamedby actualizedby sortnames opnnames
+syn keyword lotosType   using
+
+syn sync lines=250
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link lotosStatement		Statement
+hi def link lotosProcess		Label
+hi def link lotosOperator		Operator
+hi def link lotosSort		Function
+hi def link lotosType		Type
+hi def link lotosComment		Comment
+hi def link lotosDelimiter		String
+
+
+let b:current_syntax = "lotos"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/lout.vim b/syntax/lout.vim
new file mode 100644
index 000000000..872d30948
--- /dev/null
+++ b/syntax/lout.vim
@@ -0,0 +1,139 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lout') == -1
+
+" Vim syntax file
+" Language:    Lout
+" Maintainer:  Christian V. J. Br�ssow <cvjb@cvjb.de>
+" Last Change: So 12 Feb 2012 15:15:03 CET
+" Filenames:   *.lout,*.lt
+" URL:         http://www.cvjb.de/comp/vim/lout.vim
+
+" $Id: lout.vim,v 1.4 2012/02/12 15:16:17 bruessow Exp $
+"
+" Lout: Basser Lout document formatting system.
+
+" Many Thanks to...
+" 
+" 2012-02-12:
+" Thilo Six <T.Six at gmx dot de> send a patch for cpoptions.
+" See the discussion at http://thread.gmane.org/gmane.editors.vim.devel/32151
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+let s:cpo_save=&cpo
+set cpo&vim
+
+" Lout is case sensitive
+syn case match
+
+" Synchronization, I know it is a huge number, but normal texts can be
+" _very_ long ;-)
+syn sync lines=1000
+
+" Characters allowed in keywords
+" I don't know if 128-255 are allowed in ANS-FORHT
+setlocal iskeyword=@,48-57,.,@-@,_,192-255
+
+" Some special keywords
+syn keyword loutTodo contained TODO lout Lout LOUT
+syn keyword loutDefine def macro
+
+" Some big structures
+syn keyword loutKeyword @Begin @End @Figure @Tab
+syn keyword loutKeyword @Book @Doc @Document @Report
+syn keyword loutKeyword @Introduction @Abstract @Appendix
+syn keyword loutKeyword @Chapter @Section @BeginSections @EndSections
+
+" All kind of Lout keywords
+syn match loutFunction '\<@[^ \t{}]\+\>'
+
+" Braces -- Don`t edit these lines!
+syn match loutMBraces '[{}]'
+syn match loutIBraces '[{}]'
+syn match loutBBrace '[{}]'
+syn match loutBIBraces '[{}]'
+syn match loutHeads '[{}]'
+
+" Unmatched braces.
+syn match loutBraceError '}'
+
+" End of multi-line definitions, like @Document, @Report and @Book.
+syn match loutEOmlDef '^//$'
+
+" Grouping of parameters and objects.
+syn region loutObject transparent matchgroup=Delimiter start='{' matchgroup=Delimiter end='}' contains=ALLBUT,loutBraceError
+
+" The NULL object has a special meaning
+syn keyword loutNULL {}
+
+" Comments
+syn region loutComment start='\#' end='$' contains=loutTodo
+
+" Double quotes
+syn region loutSpecial start=+"+ skip=+\\\\\|\\"+ end=+"+
+
+" ISO-LATIN-1 characters created with @Char, or Adobe symbols
+" created with @Sym
+syn match loutSymbols '@\(\(Char\)\|\(Sym\)\)\s\+[A-Za-z]\+'
+
+" Include files
+syn match loutInclude '@IncludeGraphic\s\+\k\+'
+syn region loutInclude start='@\(\(SysInclude\)\|\(IncludeGraphic\)\|\(Include\)\)\s*{' end='}'
+
+" Tags
+syn match loutTag '@\(\(Tag\)\|\(PageMark\)\|\(PageOf\)\|\(NumberOf\)\)\s\+\k\+'
+syn region loutTag start='@Tag\s*{' end='}'
+
+" Equations
+syn match loutMath '@Eq\s\+\k\+'
+syn region loutMath matchgroup=loutMBraces start='@Eq\s*{' matchgroup=loutMBraces end='}' contains=ALLBUT,loutBraceError
+"
+" Fonts
+syn match loutItalic '@I\s\+\k\+'
+syn region loutItalic matchgroup=loutIBraces start='@I\s*{' matchgroup=loutIBraces end='}' contains=ALLBUT,loutBraceError
+syn match loutBold '@B\s\+\k\+'
+syn region loutBold matchgroup=loutBBraces start='@B\s*{' matchgroup=loutBBraces end='}' contains=ALLBUT,loutBraceError
+syn match loutBoldItalic '@BI\s\+\k\+'
+syn region loutBoldItalic matchgroup=loutBIBraces start='@BI\s*{' matchgroup=loutBIBraces end='}' contains=ALLBUT,loutBraceError
+syn region loutHeadings matchgroup=loutHeads start='@\(\(Title\)\|\(Caption\)\)\s*{' matchgroup=loutHeads end='}' contains=ALLBUT,loutBraceError
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default methods for highlighting. Can be overrriden later.
+hi def link loutTodo Todo
+hi def link loutDefine Define
+hi def link loutEOmlDef Define
+hi def link loutFunction Function
+hi def link loutBraceError Error
+hi def link loutNULL Special
+hi def link loutComment Comment
+hi def link loutSpecial Special
+hi def link loutSymbols Character
+hi def link loutInclude Include
+hi def link loutKeyword Keyword
+hi def link loutTag Tag
+hi def link loutMath Number
+
+hi def link loutMBraces loutMath
+hi loutItalic term=italic cterm=italic gui=italic
+hi def link loutIBraces loutItalic
+hi loutBold term=bold cterm=bold gui=bold
+hi def link loutBBraces loutBold
+hi loutBoldItalic term=bold,italic cterm=bold,italic gui=bold,italic
+hi def link loutBIBraces loutBoldItalic
+hi loutHeadings term=bold cterm=bold guifg=indianred
+hi def link loutHeads loutHeadings
+
+
+let b:current_syntax = "lout"
+
+let &cpo=s:cpo_save
+unlet s:cpo_save
+
+" vim:ts=8:sw=4:nocindent:smartindent:
+
+endif
diff --git a/syntax/lpc.vim b/syntax/lpc.vim
new file mode 100644
index 000000000..24bbe796e
--- /dev/null
+++ b/syntax/lpc.vim
@@ -0,0 +1,451 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lpc') == -1
+
+" Vim syntax file
+" Language:	LPC
+" Maintainer:	Shizhu Pan <poet@mudbuilder.net>
+" URL:		http://poet.tomud.com/pub/lpc.vim.bz2
+" Last Change:	2016 Aug 31
+" Comments:	If you are using Vim 6.2 or later, see :h lpc.vim for
+"		file type recognizing, if not, you had to use modeline.
+
+
+" Nodule: This is the start nodule. {{{1
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Nodule: Keywords {{{1
+
+" LPC keywords
+" keywords should always be highlighted so "contained" is not used.
+syn cluster	lpcKeywdGrp	contains=lpcConditional,lpcLabel,lpcOperator,lpcRepeat,lpcStatement,lpcModifier,lpcReserved
+
+syn keyword	lpcConditional	if else switch
+syn keyword	lpcLabel	case default
+syn keyword	lpcOperator	catch efun in inherit
+syn keyword	lpcRepeat	do for foreach while
+syn keyword	lpcStatement	break continue return
+
+syn match	lpcEfunError	/efun[^:]/ display
+
+" Illegal to use keyword as function
+" It's not working, maybe in the next version.
+syn keyword	lpcKeywdError	contained if for foreach return switch while
+
+" These are keywords only because they take lvalue or type as parameter,
+" so these keywords should only be used as function but cannot be names of
+" user-defined functions.
+syn keyword	lpcKeywdFunc	new parse_command sscanf time_expression
+
+" Nodule: Type and modifiers {{{1
+
+" Type names list.
+
+" Special types
+syn keyword	lpcType		void mixed unknown
+" Scalar/Value types.
+syn keyword	lpcType		int float string
+" Pointer types.
+syn keyword	lpcType		array buffer class function mapping object
+" Other types.
+if exists("lpc_compat_32")
+    syn keyword     lpcType	    closure status funcall
+else
+    syn keyword     lpcError	    closure status
+    syn keyword     lpcType	    multiset
+endif
+
+" Type modifier.
+syn keyword	lpcModifier	nomask private public
+syn keyword	lpcModifier	varargs virtual
+
+" sensible modifiers
+if exists("lpc_pre_v22")
+    syn keyword	lpcReserved	nosave protected ref
+    syn keyword	lpcModifier	static
+else
+    syn keyword	lpcError	static
+    syn keyword	lpcModifier	nosave protected ref
+endif
+
+" Nodule: Applies {{{1
+
+" Match a function declaration or function pointer
+syn match	lpcApplyDecl	excludenl /->\h\w*(/me=e-1 contains=lpcApplies transparent display
+
+" We should note that in func_spec.c the efun definition syntax is so
+" complicated that I use such a long regular expression to describe.
+syn match	lpcLongDecl	excludenl /\(\s\|\*\)\h\+\s\h\+(/me=e-1 contains=@lpcEfunGroup,lpcType,@lpcKeywdGrp transparent display
+
+" this is form for all functions
+" ->foo() form had been excluded
+syn match	lpcFuncDecl	excludenl /\h\w*(/me=e-1 contains=lpcApplies,@lpcEfunGroup,lpcKeywdError transparent display
+
+" The (: :) parenthesis or $() forms a function pointer
+syn match	lpcFuncName	/(:\s*\h\+\s*:)/me=e-1 contains=lpcApplies,@lpcEfunGroup transparent display contained
+syn match	lpcFuncName	/(:\s*\h\+,/ contains=lpcApplies,@lpcEfunGroup transparent display contained
+syn match	lpcFuncName	/\$(\h\+)/ contains=lpcApplies,@lpcEfunGroup transparent display contained
+
+" Applies list.
+"       system applies
+syn keyword     lpcApplies      contained __INIT clean_up create destructor heart_beat id init move_or_destruct reset
+"       interactive
+syn keyword     lpcApplies      contained catch_tell logon net_dead process_input receive_message receive_snoop telnet_suboption terminal_type window_size write_prompt
+"       master applies
+syn keyword     lpcApplies      contained author_file compile_object connect crash creator_file domain_file epilog error_handler flag get_bb_uid get_root_uid get_save_file_name log_error make_path_absolute object_name preload privs_file retrieve_ed_setup save_ed_setup slow_shutdown
+syn keyword     lpcApplies      contained valid_asm valid_bind valid_compile_to_c valid_database valid_hide valid_link valid_object valid_override valid_read valid_save_binary valid_seteuid valid_shadow valid_socket valid_write
+"       parsing
+syn keyword     lpcApplies      contained inventory_accessible inventory_visible is_living parse_command_adjectiv_id_list parse_command_adjective_id_list parse_command_all_word parse_command_id_list parse_command_plural_id_list parse_command_prepos_list parse_command_users parse_get_environment parse_get_first_inventory parse_get_next_inventory parser_error_message
+
+
+" Nodule: Efuns {{{1
+
+syn cluster	lpcEfunGroup	contains=lpc_efuns,lpcOldEfuns,lpcNewEfuns,lpcKeywdFunc
+
+" Compat32 efuns
+if exists("lpc_compat_32")
+    syn keyword lpc_efuns	contained closurep heart_beat_info m_delete m_values m_indices query_once_interactive strstr
+else
+    syn match   lpcErrFunc	/#`\h\w*/
+    " Shell compatible first line comment.
+    syn region	lpcCommentFunc	start=/^#!/ end=/$/
+endif
+
+" pre-v22 efuns which are removed in newer versions.
+syn keyword     lpcOldEfuns     contained tail dump_socket_status
+
+" new efuns after v22 should be added here!
+syn keyword     lpcNewEfuns     contained socket_status
+
+" LPC efuns list.
+" DEBUG efuns Not included.
+" New efuns should NOT be added to this list, see v22 efuns above.
+" Efuns list {{{2
+syn keyword     lpc_efuns       contained acos add_action all_inventory all_previous_objects allocate allocate_buffer allocate_mapping apply arrayp asin atan author_stats
+syn keyword     lpc_efuns       contained bind break_string bufferp
+syn keyword     lpc_efuns       contained cache_stats call_other call_out call_out_info call_stack capitalize catch ceil check_memory children classp clear_bit clone_object clonep command commands copy cos cp crc32 crypt ctime
+syn keyword     lpc_efuns       contained db_close db_commit db_connect db_exec db_fetch db_rollback db_status debug_info debugmalloc debug_message deep_inherit_list deep_inventory destruct disable_commands disable_wizard domain_stats dumpallobj dump_file_descriptors dump_prog
+syn keyword     lpc_efuns       contained each ed ed_cmd ed_start enable_commands enable_wizard environment error errorp eval_cost evaluate exec exp explode export_uid external_start
+syn keyword     lpc_efuns       contained fetch_variable file_length file_name file_size filter filter_array filter_mapping find_call_out find_living find_object find_player first_inventory floatp floor flush_messages function_exists function_owner function_profile functionp functions
+syn keyword     lpc_efuns       contained generate_source get_char get_config get_dir geteuid getuid
+syn keyword     lpc_efuns       contained heart_beats
+syn keyword     lpc_efuns       contained id_matrix implode in_edit in_input inherit_list inherits input_to interactive intp
+syn keyword     lpc_efuns       contained keys
+syn keyword     lpc_efuns       contained link living livings load_object localtime log log10 lookat_rotate lower_case lpc_info
+syn keyword     lpc_efuns       contained malloc_check malloc_debug malloc_status map map_array map_delete map_mapping mapp master match_path max_eval_cost member_array memory_info memory_summary message mkdir moncontrol move_object mud_status
+syn keyword     lpc_efuns       contained named_livings network_stats next_bit next_inventory notify_fail nullp
+syn keyword     lpc_efuns       contained objectp objects oldcrypt opcprof origin
+syn keyword     lpc_efuns       contained parse_add_rule parse_add_synonym parse_command parse_dump parse_init parse_my_rules parse_refresh parse_remove parse_sentence pluralize pointerp pow present previous_object printf process_string process_value program_info
+syn keyword     lpc_efuns       contained query_ed_mode query_heart_beat query_host_name query_idle query_ip_name query_ip_number query_ip_port query_load_average query_notify_fail query_privs query_replaced_program query_shadowing query_snoop query_snooping query_verb
+syn keyword     lpc_efuns       contained random read_buffer read_bytes read_file receive reclaim_objects refs regexp reg_assoc reload_object remove_action remove_call_out remove_interactive remove_shadow rename repeat_string replace_program replace_string replaceable reset_eval_cost resolve restore_object restore_variable rm rmdir rotate_x rotate_y rotate_z rusage
+syn keyword     lpc_efuns       contained save_object save_variable say scale set_author set_bit set_eval_limit set_heart_beat set_hide set_light set_living_name set_malloc_mask set_privs set_reset set_this_player set_this_user seteuid shadow shallow_inherit_list shout shutdown sin sizeof snoop socket_accept socket_acquire socket_address socket_bind socket_close socket_connect socket_create socket_error socket_listen socket_release socket_write sort_array sprintf sqrt stat store_variable strcmp stringp strlen strsrch
+syn keyword     lpc_efuns       contained tan tell_object tell_room terminal_colour test_bit this_interactive this_object this_player this_user throw time to_float to_int trace traceprefix translate typeof
+syn keyword     lpc_efuns       contained undefinedp unique_array unique_mapping upper_case uptime userp users
+syn keyword     lpc_efuns       contained values variables virtualp
+syn keyword     lpc_efuns       contained wizardp write write_buffer write_bytes write_file
+
+" Nodule: Constants {{{1
+
+" LPC Constants.
+" like keywords, constants are always highlighted, be careful to choose only
+" the constants we used to add to this list.
+syn keyword     lpcConstant     __ARCH__ __COMPILER__ __DIR__ __FILE__ __OPTIMIZATION__ __PORT__ __VERSION__
+"       Defines in options.h are all predefined in LPC sources surrounding by
+"       two underscores. Do we need to include all of that?
+syn keyword     lpcConstant     __SAVE_EXTENSION__ __HEARTBEAT_INTERVAL__
+"       from the documentation we know that these constants remains only for
+"       backward compatibility and should not be used any more.
+syn keyword     lpcConstant     HAS_ED HAS_PRINTF HAS_RUSAGE HAS_DEBUG_LEVEL
+syn keyword     lpcConstant     MUD_NAME F__THIS_OBJECT
+
+" Nodule: Todo for this file.  {{{1
+
+" TODO : need to check for LPC4 syntax and other series of LPC besides
+" v22, b21 and l32, if you had a good idea, contact me at poet@mudbuilder.net
+" and I will be appreciated about that.
+
+" Notes about some FAQ:
+"
+" About variables : We adopts the same behavior for C because almost all the
+" LPC programmers are also C programmers, so we don't need separate settings
+" for C and LPC. That is the reason why I don't change variables like
+" "c_no_utf"s to "lpc_no_utf"s.
+"
+" Copy : Some of the following seems to be copied from c.vim but not quite
+" the same in details because the syntax for C and LPC is different.
+"
+" Color scheme : this syntax file had been thouroughly tested to work well
+" for all of the dark-backgrounded color schemes Vim has provided officially,
+" and it should be quite Ok for all of the bright-backgrounded color schemes,
+" of course it works best for the color scheme that I am using, download it
+" from http://poet.tomud.com/pub/ps_color.vim.bz2 if you want to try it.
+"
+
+" Nodule: String and Character {{{1
+
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match	lpcSpecial	display contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)"
+if !exists("c_no_utf")
+  syn match	lpcSpecial	display contained "\\\(u\x\{4}\|U\x\{8}\)"
+endif
+
+" LPC version of sprintf() format,
+syn match	lpcFormat	display "%\(\d\+\)\=[-+ |=#@:.]*\(\d\+\)\=\('\I\+'\|'\I*\\'\I*'\)\=[OsdicoxXf]" contained
+syn match	lpcFormat	display "%%" contained
+syn region	lpcString	start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=lpcSpecial,lpcFormat
+" lpcCppString: same as lpcString, but ends at end of line
+syn region	lpcCppString	start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=lpcSpecial,lpcFormat
+
+" LPC preprocessor for the text formatting short cuts
+" Thanks to Dr. Charles E. Campbell <cec@gryphon.gsfc.nasa.gov>
+"	he suggests the best way to do this.
+syn region	lpcTextString	start=/@\z(\h\w*\)$/ end=/^\z1/ contains=lpcSpecial
+syn region	lpcArrayString	start=/@@\z(\h\w*\)$/ end=/^\z1/ contains=lpcSpecial
+
+" Character
+syn match	lpcCharacter	"L\='[^\\]'"
+syn match	lpcCharacter	"L'[^']*'" contains=lpcSpecial
+syn match	lpcSpecialError	"L\='\\[^'\"?\\abefnrtv]'"
+syn match	lpcSpecialCharacter "L\='\\['\"?\\abefnrtv]'"
+syn match	lpcSpecialCharacter display "L\='\\\o\{1,3}'"
+syn match	lpcSpecialCharacter display "'\\x\x\{1,2}'"
+syn match	lpcSpecialCharacter display "L'\\x\x\+'"
+
+" Nodule: White space {{{1
+
+" when wanted, highlight trailing white space
+if exists("c_space_errors")
+  if !exists("c_no_trail_space_error")
+    syn match	lpcSpaceError	display excludenl "\s\+$"
+  endif
+  if !exists("c_no_tab_space_error")
+    syn match	lpcSpaceError	display " \+\t"me=e-1
+  endif
+endif
+
+" Nodule: Parenthesis and brackets {{{1
+
+" catch errors caused by wrong parenthesis and brackets
+syn cluster	lpcParenGroup	contains=lpcParenError,lpcIncluded,lpcSpecial,lpcCommentSkip,lpcCommentString,lpcComment2String,@lpcCommentGroup,lpcCommentStartError,lpcUserCont,lpcUserLabel,lpcBitField,lpcCommentSkip,lpcOctalZero,lpcCppOut,lpcCppOut2,lpcCppSkip,lpcFormat,lpcNumber,lpcFloat,lpcOctal,lpcOctalError,lpcNumbersCom
+syn region	lpcParen	transparent start='(' end=')' contains=ALLBUT,@lpcParenGroup,lpcCppParen,lpcErrInBracket,lpcCppBracket,lpcCppString,@lpcEfunGroup,lpcApplies,lpcKeywdError
+" lpcCppParen: same as lpcParen but ends at end-of-line; used in lpcDefine
+syn region	lpcCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@lpcParenGroup,lpcErrInBracket,lpcParen,lpcBracket,lpcString,@lpcEfunGroup,lpcApplies,lpcKeywdError
+syn match	lpcParenError	display ")"
+syn match	lpcParenError	display "\]"
+" for LPC:
+" Here we should consider the array ({ }) parenthesis and mapping ([ ])
+" parenthesis and multiset (< >) parenthesis.
+syn match	lpcErrInParen	display contained "[^^]{"ms=s+1
+syn match	lpcErrInParen	display contained "\(}\|\]\)[^)]"me=e-1
+syn region	lpcBracket	transparent start='\[' end=']' contains=ALLBUT,@lpcParenGroup,lpcErrInParen,lpcCppParen,lpcCppBracket,lpcCppString,@lpcEfunGroup,lpcApplies,lpcFuncName,lpcKeywdError
+" lpcCppBracket: same as lpcParen but ends at end-of-line; used in lpcDefine
+syn region	lpcCppBracket	transparent start='\[' skip='\\$' excludenl end=']' end='$' contained contains=ALLBUT,@lpcParenGroup,lpcErrInParen,lpcParen,lpcBracket,lpcString,@lpcEfunGroup,lpcApplies,lpcFuncName,lpcKeywdError
+syn match	lpcErrInBracket	display contained "[);{}]"
+
+" Nodule: Numbers {{{1
+
+" integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match	lpcNumbers	display transparent "\<\d\|\.\d" contains=lpcNumber,lpcFloat,lpcOctalError,lpcOctal
+" Same, but without octal error (for comments)
+syn match	lpcNumbersCom	display contained transparent "\<\d\|\.\d" contains=lpcNumber,lpcFloat,lpcOctal
+syn match	lpcNumber	display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>"
+" hex number
+syn match	lpcNumber	display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
+" Flag the first zero of an octal number as something special
+syn match	lpcOctal	display contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>" contains=lpcOctalZero
+syn match	lpcOctalZero	display contained "\<0"
+syn match	lpcFloat	display contained "\d\+f"
+" floating point number, with dot, optional exponent
+syn match	lpcFloat	display contained "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\="
+" floating point number, starting with a dot, optional exponent
+syn match	lpcFloat	display contained "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+" floating point number, without dot, with exponent
+syn match	lpcFloat	display contained "\d\+e[-+]\=\d\+[fl]\=\>"
+" flag an octal number with wrong digits
+syn match	lpcOctalError	display contained "0\o*[89]\d*"
+syn case match
+
+" Nodule: Comment string {{{1
+
+" lpcCommentGroup allows adding matches for special things in comments
+syn keyword	lpcTodo		contained TODO FIXME XXX
+syn cluster	lpcCommentGroup	contains=lpcTodo
+
+if exists("c_comment_strings")
+  " A comment can contain lpcString, lpcCharacter and lpcNumber.
+  syntax match	lpcCommentSkip	contained "^\s*\*\($\|\s\+\)"
+  syntax region lpcCommentString	contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=lpcSpecial,lpcCommentSkip
+  syntax region lpcComment2String	contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=lpcSpecial
+  syntax region  lpcCommentL	start="//" skip="\\$" end="$" keepend contains=@lpcCommentGroup,lpcComment2String,lpcCharacter,lpcNumbersCom,lpcSpaceError
+  syntax region lpcComment	matchgroup=lpcCommentStart start="/\*" matchgroup=NONE end="\*/" contains=@lpcCommentGroup,lpcCommentStartError,lpcCommentString,lpcCharacter,lpcNumbersCom,lpcSpaceError
+else
+  syn region	lpcCommentL	start="//" skip="\\$" end="$" keepend contains=@lpcCommentGroup,lpcSpaceError
+  syn region	lpcComment	matchgroup=lpcCommentStart start="/\*" matchgroup=NONE end="\*/" contains=@lpcCommentGroup,lpcCommentStartError,lpcSpaceError
+endif
+" keep a // comment separately, it terminates a preproc. conditional
+syntax match	lpcCommentError	display "\*/"
+syntax match	lpcCommentStartError display "/\*"me=e-1 contained
+
+" Nodule: Pre-processor {{{1
+
+syn region	lpcPreCondit	start="^\s*#\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" end="//"me=s-1 contains=lpcComment,lpcCppString,lpcCharacter,lpcCppParen,lpcParenError,lpcNumbers,lpcCommentError,lpcSpaceError
+syn match	lpcPreCondit	display "^\s*#\s*\(else\|endif\)\>"
+if !exists("c_no_if0")
+  syn region	lpcCppOut		start="^\s*#\s*if\s\+0\+\>" end=".\|$" contains=lpcCppOut2
+  syn region	lpcCppOut2	contained start="0" end="^\s*#\s*\(endif\>\|else\>\|elif\>\)" contains=lpcSpaceError,lpcCppSkip
+  syn region	lpcCppSkip	contained start="^\s*#\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*#\s*endif\>" contains=lpcSpaceError,lpcCppSkip
+endif
+syn region	lpcIncluded	display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match	lpcIncluded	display contained "<[^>]*>"
+syn match	lpcInclude	display "^\s*#\s*include\>\s*["<]" contains=lpcIncluded
+syn match lpcLineSkip	"\\$"
+syn cluster	lpcPreProcGroup	contains=lpcPreCondit,lpcIncluded,lpcInclude,lpcDefine,lpcErrInParen,lpcErrInBracket,lpcUserLabel,lpcSpecial,lpcOctalZero,lpcCppOut,lpcCppOut2,lpcCppSkip,lpcFormat,lpcNumber,lpcFloat,lpcOctal,lpcOctalError,lpcNumbersCom,lpcString,lpcCommentSkip,lpcCommentString,lpcComment2String,@lpcCommentGroup,lpcCommentStartError,lpcParen,lpcBracket,lpcMulti,lpcKeywdError
+syn region	lpcDefine	start="^\s*#\s*\(define\|undef\)\>" skip="\\$" end="$" end="//"me=s-1 contains=ALLBUT,@lpcPreProcGroup
+
+if exists("lpc_pre_v22")
+    syn region	lpcPreProc	start="^\s*#\s*\(pragma\>\|echo\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@lpcPreProcGroup
+else
+    syn region	lpcPreProc	start="^\s*#\s*\(pragma\>\|echo\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@lpcPreProcGroup
+endif
+
+" Nodule: User labels {{{1
+
+" Highlight Labels
+" User labels in LPC is not allowed, only "case x" and "default" is supported
+syn cluster	lpcMultiGroup	contains=lpcIncluded,lpcSpecial,lpcCommentSkip,lpcCommentString,lpcComment2String,@lpcCommentGroup,lpcCommentStartError,lpcUserCont,lpcUserLabel,lpcBitField,lpcOctalZero,lpcCppOut,lpcCppOut2,lpcCppSkip,lpcFormat,lpcNumber,lpcFloat,lpcOctal,lpcOctalError,lpcNumbersCom,lpcCppParen,lpcCppBracket,lpcCppString,lpcKeywdError
+syn region	lpcMulti		transparent start='\(case\|default\|public\|protected\|private\)' skip='::' end=':' contains=ALLBUT,@lpcMultiGroup
+
+syn cluster	lpcLabelGroup	contains=lpcUserLabel
+syn match	lpcUserCont	display "^\s*lpc:$" contains=@lpcLabelGroup
+
+" Don't want to match anything
+syn match	lpcUserLabel	display "lpc" contained
+
+" Nodule: Initializations {{{1
+
+if exists("c_minlines")
+  let b:c_minlines = c_minlines
+else
+  if !exists("c_no_if0")
+    let b:c_minlines = 50	" #if 0 constructs can be long
+  else
+    let b:c_minlines = 15	" mostly for () constructs
+  endif
+endif
+exec "syn sync ccomment lpcComment minlines=" . b:c_minlines
+
+" Make sure these options take place since we no longer depend on file type
+" plugin for C
+setlocal cindent
+setlocal fo-=t fo+=croql
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+
+" Win32 can filter files in the browse dialog
+if has("gui_win32") && !exists("b:browsefilter")
+    let b:browsefilter = "LPC Source Files (*.c *.d *.h)\t*.c;*.d;*.h\n" .
+	\ "LPC Data Files (*.scr *.o *.dat)\t*.scr;*.o;*.dat\n" .
+	\ "Text Documentation (*.txt)\t*.txt\n" .
+	\ "All Files (*.*)\t*.*\n"
+endif
+
+" Nodule: Highlight links {{{1
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link lpcModifier		lpcStorageClass
+
+hi def link lpcQuotedFmt		lpcFormat
+hi def link lpcFormat		lpcSpecial
+hi def link lpcCppString		lpcString	" Cpp means
+					      " C Pre-Processor
+hi def link lpcCommentL		lpcComment
+hi def link lpcCommentStart	lpcComment
+hi def link lpcUserLabel		lpcLabel
+hi def link lpcSpecialCharacter	lpcSpecial
+hi def link lpcOctal		lpcPreProc
+hi def link lpcOctalZero		lpcSpecial  " LPC will treat octal numbers
+					  " as decimals, programmers should
+					  " be aware of that.
+hi def link lpcEfunError		lpcError
+hi def link lpcKeywdError		lpcError
+hi def link lpcOctalError		lpcError
+hi def link lpcParenError		lpcError
+hi def link lpcErrInParen		lpcError
+hi def link lpcErrInBracket	lpcError
+hi def link lpcCommentError	lpcError
+hi def link lpcCommentStartError	lpcError
+hi def link lpcSpaceError		lpcError
+hi def link lpcSpecialError	lpcError
+hi def link lpcErrFunc		lpcError
+
+if exists("lpc_pre_v22")
+    hi def link lpcOldEfuns	lpc_efuns
+    hi def link lpcNewEfuns	lpcError
+else
+    hi def link lpcOldEfuns	lpcReserved
+    hi def link lpcNewEfuns	lpc_efuns
+endif
+hi def link lpc_efuns		lpcFunction
+
+hi def link lpcReserved		lpcPreProc
+hi def link lpcTextString		lpcString   " This should be preprocessors, but
+hi def link lpcArrayString		lpcPreProc  " let's make some difference
+					  " between text and array
+
+hi def link lpcIncluded		lpcString
+hi def link lpcCommentString	lpcString
+hi def link lpcComment2String	lpcString
+hi def link lpcCommentSkip		lpcComment
+hi def link lpcCommentFunc		lpcComment
+
+hi def link lpcCppSkip		lpcCppOut
+hi def link lpcCppOut2		lpcCppOut
+hi def link lpcCppOut		lpcComment
+
+" Standard type below
+hi def link lpcApplies		Special
+hi def link lpcCharacter		Character
+hi def link lpcComment		Comment
+hi def link lpcConditional		Conditional
+hi def link lpcConstant		Constant
+hi def link lpcDefine		Macro
+hi def link lpcError		Error
+hi def link lpcFloat		Float
+hi def link lpcFunction		Function
+hi def link lpcIdentifier		Identifier
+hi def link lpcInclude		Include
+hi def link lpcLabel		Label
+hi def link lpcNumber		Number
+hi def link lpcOperator		Operator
+hi def link lpcPreCondit		PreCondit
+hi def link lpcPreProc		PreProc
+hi def link lpcRepeat		Repeat
+hi def link lpcStatement		Statement
+hi def link lpcStorageClass	StorageClass
+hi def link lpcString		String
+hi def link lpcStructure		Structure
+hi def link lpcSpecial		LineNr
+hi def link lpcTodo		Todo
+hi def link lpcType		Type
+
+
+" Nodule: This is the end nodule. {{{1
+
+let b:current_syntax = "lpc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:ts=8:nosta:sw=2:ai:si:
+" vim600:set fdm=marker: }}}1
+
+endif
diff --git a/syntax/lprolog.vim b/syntax/lprolog.vim
new file mode 100644
index 000000000..d6eabbd86
--- /dev/null
+++ b/syntax/lprolog.vim
@@ -0,0 +1,128 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lprolog') == -1
+
+" Vim syntax file
+" Language:     LambdaProlog (Teyjus)
+" Filenames:    *.mod *.sig
+" Maintainer:   Markus Mottl  <markus.mottl@gmail.com>
+" URL:          http://www.ocaml.info/vim/syntax/lprolog.vim
+" Last Change:  2006 Feb 05
+"               2001 Apr 26 - Upgraded for new Vim version
+"               2000 Jun  5 - Initial release
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Lambda Prolog is case sensitive.
+syn case match
+
+syn match   lprologBrackErr    "\]"
+syn match   lprologParenErr    ")"
+
+syn cluster lprologContained contains=lprologTodo,lprologModuleName,lprologTypeNames,lprologTypeName
+
+" Enclosing delimiters
+syn region  lprologEncl transparent matchgroup=lprologKeyword start="(" matchgroup=lprologKeyword end=")" contains=ALLBUT,@lprologContained,lprologParenErr
+syn region  lprologEncl transparent matchgroup=lprologKeyword start="\[" matchgroup=lprologKeyword end="\]" contains=ALLBUT,@lprologContained,lprologBrackErr
+
+" General identifiers
+syn match   lprologIdentifier  "\<\(\w\|[-+*/\\^<>=`'~?@#$&!_]\)*\>"
+syn match   lprologVariable    "\<\(\u\|_\)\(\w\|[-+*/\\^<>=`'~?@#$&!]\)*\>"
+
+syn match   lprologOperator  "/"
+
+" Comments
+syn region  lprologComment  start="/\*" end="\*/" contains=lprologComment,lprologTodo
+syn region  lprologComment  start="%" end="$" contains=lprologTodo
+syn keyword lprologTodo  contained TODO FIXME XXX
+
+syn match   lprologInteger  "\<\d\+\>"
+syn match   lprologReal     "\<\(\d\+\)\=\.\d+\>"
+syn region  lprologString   start=+"+ skip=+\\\\\|\\"+ end=+"+
+
+" Clause definitions
+syn region  lprologClause start="^\w\+" end=":-\|\."
+
+" Modules
+syn region  lprologModule matchgroup=lprologKeyword start="^\<module\>" matchgroup=lprologKeyword end="\."
+
+" Types
+syn match   lprologKeyword "^\<type\>" skipwhite nextgroup=lprologTypeNames
+syn region  lprologTypeNames matchgroup=lprologBraceErr start="\<\w\+\>" matchgroup=lprologKeyword end="\." contained contains=lprologTypeName,lprologOperator
+syn match   lprologTypeName "\<\w\+\>" contained
+
+" Keywords
+syn keyword lprologKeyword  end import accumulate accum_sig
+syn keyword lprologKeyword  local localkind closed sig
+syn keyword lprologKeyword  kind exportdef useonly
+syn keyword lprologKeyword  infixl infixr infix prefix
+syn keyword lprologKeyword  prefixr postfix postfixl
+
+syn keyword lprologSpecial  pi sigma is true fail halt stop not
+
+" Operators
+syn match   lprologSpecial ":-"
+syn match   lprologSpecial "->"
+syn match   lprologSpecial "=>"
+syn match   lprologSpecial "\\"
+syn match   lprologSpecial "!"
+
+syn match   lprologSpecial ","
+syn match   lprologSpecial ";"
+syn match   lprologSpecial "&"
+
+syn match   lprologOperator "+"
+syn match   lprologOperator "-"
+syn match   lprologOperator "*"
+syn match   lprologOperator "\~"
+syn match   lprologOperator "\^"
+syn match   lprologOperator "<"
+syn match   lprologOperator ">"
+syn match   lprologOperator "=<"
+syn match   lprologOperator ">="
+syn match   lprologOperator "::"
+syn match   lprologOperator "="
+
+syn match   lprologOperator "\."
+syn match   lprologOperator ":"
+syn match   lprologOperator "|"
+
+syn match   lprologCommentErr  "\*/"
+
+syn sync minlines=50
+syn sync maxlines=500
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link lprologComment     Comment
+hi def link lprologTodo	    Todo
+
+hi def link lprologKeyword     Keyword
+hi def link lprologSpecial     Special
+hi def link lprologOperator    Operator
+hi def link lprologIdentifier  Normal
+
+hi def link lprologInteger     Number
+hi def link lprologReal	    Number
+hi def link lprologString	    String
+
+hi def link lprologCommentErr  Error
+hi def link lprologBrackErr    Error
+hi def link lprologParenErr    Error
+
+hi def link lprologModuleName  Special
+hi def link lprologTypeName    Identifier
+
+hi def link lprologVariable    Keyword
+hi def link lprologAtom	    Normal
+hi def link lprologClause	    Type
+
+
+let b:current_syntax = "lprolog"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/lsl.vim b/syntax/lsl.vim
new file mode 100644
index 000000000..5065e1795
--- /dev/null
+++ b/syntax/lsl.vim
@@ -0,0 +1,281 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lsl') == -1
+
+" Vim syntax file
+" Language:	Linden Scripting Language
+" Maintainer:	Timo Frenay <timo@frenay.net>
+" Last Change:	2012 Apr 30
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+" Initializations
+syn case match
+
+" Keywords
+syn keyword lslKeyword default do else for if jump return state while
+
+" Types
+syn keyword lslType float integer key list quaternion rotation string vector
+
+" Labels
+syn match lslLabel +@\h\w*+ display
+
+" Constants
+syn keyword lslConstant
+\ ACTIVE AGENT AGENT_ALWAYS_RUN AGENT_ATTACHMENTS AGENT_AWAY AGENT_BUSY
+\ AGENT_CROUCHING AGENT_FLYING AGENT_IN_AIR AGENT_MOUSELOOK AGENT_ON_OBJECT
+\ AGENT_SCRIPTED AGENT_SITTING AGENT_TYPING AGENT_WALKING ALL_SIDES ANIM_ON
+\ ATTACH_BACK ATTACH_BELLY ATTACH_CHEST ATTACH_CHIN ATTACH_HEAD
+\ ATTACH_HUD_BOTTOM ATTACH_HUD_BOTTOM_LEFT ATTACH_HUD_BOTTOM_RIGHT
+\ ATTACH_HUD_CENTER_1 ATTACH_HUD_CENTER_2 ATTACH_HUD_TOP_CENTER
+\ ATTACH_HUD_TOP_LEFT ATTACH_HUD_TOP_RIGHT ATTACH_LEAR ATTACH_LEYE ATTACH_LFOOT
+\ ATTACH_LHAND ATTACH_LHIP ATTACH_LLARM ATTACH_LLLEG ATTACH_LPEC
+\ ATTACH_LSHOULDER ATTACH_LUARM ATTACH_LULEG ATTACH_MOUTH ATTACH_NOSE
+\ ATTACH_PELVIS ATTACH_REAR ATTACH_REYE ATTACH_RFOOT ATTACH_RHAND ATTACH_RHIP
+\ ATTACH_RLARM ATTACH_RLLEG ATTACH_RPEC ATTACH_RSHOULDER ATTACH_RUARM
+\ ATTACH_RULEG CAMERA_ACTIVE CAMERA_BEHINDNESS_ANGLE CAMERA_BEHINDNESS_LAG
+\ CAMERA_DISTANCE CAMERA_FOCUS CAMERA_FOCUS_LAG CAMERA_FOCUS_LOCKED
+\ CAMERA_FOCUS_OFFSET CAMERA_FOCUS_THRESHOLD CAMERA_PITCH CAMERA_POSITION
+\ CAMERA_POSITION_LAG CAMERA_POSITION_LOCKED CAMERA_POSITION_THRESHOLD
+\ CHANGED_ALLOWED_DROP CHANGED_COLOR CHANGED_INVENTORY CHANGED_LINK
+\ CHANGED_OWNER CHANGED_REGION CHANGED_SCALE CHANGED_SHAPE CHANGED_TELEPORT
+\ CHANGED_TEXTURE CLICK_ACTION_BUY CLICK_ACTION_NONE CLICK_ACTION_OPEN
+\ CLICK_ACTION_OPEN_MEDIA CLICK_ACTION_PAY CLICK_ACTION_PLAY CLICK_ACTION_SIT
+\ CLICK_ACTION_TOUCH CONTROL_BACK CONTROL_DOWN CONTROL_FWD CONTROL_LBUTTON
+\ CONTROL_LEFT CONTROL_ML_LBUTTON CONTROL_RIGHT CONTROL_ROT_LEFT
+\ CONTROL_ROT_RIGHT CONTROL_UP DATA_BORN DATA_NAME DATA_ONLINE DATA_PAYINFO
+\ DATA_RATING DATA_SIM_POS DATA_SIM_RATING DATA_SIM_STATUS DEBUG_CHANNEL
+\ DEG_TO_RAD EOF FALSE HTTP_BODY_MAXLENGTH HTTP_BODY_TRUNCATED HTTP_METHOD
+\ HTTP_MIMETYPE HTTP_VERIFY_CERT INVENTORY_ALL INVENTORY_ANIMATION
+\ INVENTORY_BODYPART INVENTORY_CLOTHING INVENTORY_GESTURE INVENTORY_LANDMARK
+\ INVENTORY_NONE INVENTORY_NOTECARD INVENTORY_OBJECT INVENTORY_SCRIPT
+\ INVENTORY_SOUND INVENTORY_TEXTURE LAND_LARGE_BRUSH LAND_LEVEL LAND_LOWER
+\ LAND_MEDIUM_BRUSH LAND_NOISE LAND_RAISE LAND_REVERT LAND_SMALL_BRUSH
+\ LAND_SMOOTH LINK_ALL_CHILDREN LINK_ALL_OTHERS LINK_ROOT LINK_SET LINK_THIS
+\ LIST_STAT_GEOMETRIC_MEAN LIST_STAT_MAX LIST_STAT_MEAN LIST_STAT_MEDIAN
+\ LIST_STAT_MIN LIST_STAT_NUM_COUNT LIST_STAT_RANGE LIST_STAT_STD_DEV
+\ LIST_STAT_SUM LIST_STAT_SUM_SQUARES LOOP MASK_BASE MASK_EVERYONE MASK_GROUP
+\ MASK_NEXT MASK_OWNER NULL_KEY OBJECT_CREATOR OBJECT_DESC OBJECT_GROUP
+\ OBJECT_NAME OBJECT_OWNER OBJECT_POS OBJECT_ROT OBJECT_UNKNOWN_DETAIL
+\ OBJECT_VELOCITY PARCEL_COUNT_GROUP PARCEL_COUNT_OTHER PARCEL_COUNT_OWNER
+\ PARCEL_COUNT_SELECTED PARCEL_COUNT_TEMP PARCEL_COUNT_TOTAL PARCEL_DETAILS_AREA
+\ PARCEL_DETAILS_DESC PARCEL_DETAILS_GROUP PARCEL_DETAILS_NAME
+\ PARCEL_DETAILS_OWNER PARCEL_FLAG_ALLOW_ALL_OBJECT_ENTRY
+\ PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS PARCEL_FLAG_ALLOW_CREATE_OBJECTS
+\ PARCEL_FLAG_ALLOW_DAMAGE PARCEL_FLAG_ALLOW_FLY
+\ PARCEL_FLAG_ALLOW_GROUP_OBJECT_ENTRY PARCEL_FLAG_ALLOW_GROUP_SCRIPTS
+\ PARCEL_FLAG_ALLOW_LANDMARK PARCEL_FLAG_ALLOW_SCRIPTS
+\ PARCEL_FLAG_ALLOW_TERRAFORM PARCEL_FLAG_LOCAL_SOUND_ONLY
+\ PARCEL_FLAG_RESTRICT_PUSHOBJECT PARCEL_FLAG_USE_ACCESS_GROUP
+\ PARCEL_FLAG_USE_ACCESS_LIST PARCEL_FLAG_USE_BAN_LIST
+\ PARCEL_FLAG_USE_LAND_PASS_LIST PARCEL_MEDIA_COMMAND_AGENT
+\ PARCEL_MEDIA_COMMAND_AUTO_ALIGN PARCEL_MEDIA_COMMAND_DESC
+\ PARCEL_MEDIA_COMMAND_LOOP PARCEL_MEDIA_COMMAND_LOOP_SET
+\ PARCEL_MEDIA_COMMAND_PAUSE PARCEL_MEDIA_COMMAND_PLAY PARCEL_MEDIA_COMMAND_SIZE
+\ PARCEL_MEDIA_COMMAND_STOP PARCEL_MEDIA_COMMAND_TEXTURE
+\ PARCEL_MEDIA_COMMAND_TIME PARCEL_MEDIA_COMMAND_TYPE
+\ PARCEL_MEDIA_COMMAND_UNLOAD PARCEL_MEDIA_COMMAND_URL PASSIVE
+\ PAYMENT_INFO_ON_FILE PAYMENT_INFO_USED PAY_DEFAULT PAY_HIDE PERM_ALL PERM_COPY
+\ PERM_MODIFY PERM_MOVE PERM_TRANSFER PERMISSION_ATTACH PERMISSION_CHANGE_LINKS
+\ PERMISSION_CONTROL_CAMERA PERMISSION_DEBIT PERMISSION_TAKE_CONTROLS
+\ PERMISSION_TRACK_CAMERA PERMISSION_TRIGGER_ANIMATION PI PI_BY_TWO PING_PONG
+\ PRIM_BUMP_BARK PRIM_BUMP_BLOBS PRIM_BUMP_BRICKS PRIM_BUMP_BRIGHT
+\ PRIM_BUMP_CHECKER PRIM_BUMP_CONCRETE PRIM_BUMP_DARK PRIM_BUMP_DISKS
+\ PRIM_BUMP_GRAVEL PRIM_BUMP_LARGETILE PRIM_BUMP_NONE PRIM_BUMP_SHINY
+\ PRIM_BUMP_SIDING PRIM_BUMP_STONE PRIM_BUMP_STUCCO PRIM_BUMP_SUCTION
+\ PRIM_BUMP_TILE PRIM_BUMP_WEAVE PRIM_BUMP_WOOD PRIM_CAST_SHADOWS PRIM_COLOR
+\ PRIM_FLEXIBLE PRIM_FULLBRIGHT PRIM_HOLE_CIRCLE PRIM_HOLE_DEFAULT
+\ PRIM_HOLE_SQUARE PRIM_HOLE_TRIANGLE PRIM_MATERIAL PRIM_MATERIAL_FLESH
+\ PRIM_MATERIAL_GLASS PRIM_MATERIAL_LIGHT PRIM_MATERIAL_METAL
+\ PRIM_MATERIAL_PLASTIC PRIM_MATERIAL_RUBBER PRIM_MATERIAL_STONE
+\ PRIM_MATERIAL_WOOD PRIM_PHANTOM PRIM_PHYSICS PRIM_POINT_LIGHT PRIM_POSITION
+\ PRIM_ROTATION PRIM_SCULPT_TYPE_CYLINDER PRIM_SCULPT_TYPE_PLANE
+\ PRIM_SCULPT_TYPE_SPHERE PRIM_SCULPT_TYPE_TORUS PRIM_SHINY_HIGH PRIM_SHINY_LOW
+\ PRIM_SHINY_MEDIUM PRIM_SHINY_NONE PRIM_SIZE PRIM_TEMP_ON_REZ PRIM_TEXGEN
+\ PRIM_TEXGEN_DEFAULT PRIM_TEXGEN_PLANAR PRIM_TEXTURE PRIM_TYPE PRIM_TYPE_BOX
+\ PRIM_TYPE_BOX PRIM_TYPE_CYLINDER PRIM_TYPE_CYLINDER PRIM_TYPE_LEGACY
+\ PRIM_TYPE_PRISM PRIM_TYPE_PRISM PRIM_TYPE_RING PRIM_TYPE_SCULPT
+\ PRIM_TYPE_SPHERE PRIM_TYPE_SPHERE PRIM_TYPE_TORUS PRIM_TYPE_TORUS
+\ PRIM_TYPE_TUBE PRIM_TYPE_TUBE PSYS_PART_BEAM_MASK PSYS_PART_BOUNCE_MASK
+\ PSYS_PART_DEAD_MASK PSYS_PART_EMISSIVE_MASK PSYS_PART_END_ALPHA
+\ PSYS_PART_END_COLOR PSYS_PART_END_SCALE PSYS_PART_FLAGS
+\ PSYS_PART_FOLLOW_SRC_MASK PSYS_PART_FOLLOW_VELOCITY_MASK
+\ PSYS_PART_INTERP_COLOR_MASK PSYS_PART_INTERP_SCALE_MASK PSYS_PART_MAX_AGE
+\ PSYS_PART_RANDOM_ACCEL_MASK PSYS_PART_RANDOM_VEL_MASK PSYS_PART_START_ALPHA
+\ PSYS_PART_START_COLOR PSYS_PART_START_SCALE PSYS_PART_TARGET_LINEAR_MASK
+\ PSYS_PART_TARGET_POS_MASK PSYS_PART_TRAIL_MASK PSYS_PART_WIND_MASK
+\ PSYS_SRC_ACCEL PSYS_SRC_ANGLE_BEGIN PSYS_SRC_ANGLE_END
+\ PSYS_SRC_BURST_PART_COUNT PSYS_SRC_BURST_RADIUS PSYS_SRC_BURST_RATE
+\ PSYS_SRC_BURST_SPEED_MAX PSYS_SRC_BURST_SPEED_MIN PSYS_SRC_INNERANGLE
+\ PSYS_SRC_MAX_AGE PSYS_SRC_OMEGA PSYS_SRC_OUTERANGLE PSYS_SRC_PATTERN
+\ PSYS_SRC_PATTERN_ANGLE PSYS_SRC_PATTERN_ANGLE_CONE
+\ PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY PSYS_SRC_PATTERN_DROP
+\ PSYS_SRC_PATTERN_EXPLODE PSYS_SRC_TARGET_KEY PSYS_SRC_TEXTURE PUBLIC_CHANNEL
+\ RAD_TO_DEG REGION_FLAG_ALLOW_DAMAGE REGION_FLAG_ALLOW_DIRECT_TELEPORT
+\ REGION_FLAG_BLOCK_FLY REGION_FLAG_BLOCK_TERRAFORM
+\ REGION_FLAG_DISABLE_COLLISIONS REGION_FLAG_DISABLE_PHYSICS
+\ REGION_FLAG_FIXED_SUN REGION_FLAG_RESTRICT_PUSHOBJECT REGION_FLAG_SANDBOX
+\ REMOTE_DATA_CHANNEL REMOTE_DATA_REPLY REMOTE_DATA_REQUEST REVERSE ROTATE SCALE
+\ SCRIPTED SMOOTH SQRT2 STATUS_BLOCK_GRAB STATUS_CAST_SHADOWS STATUS_DIE_AT_EDGE
+\ STATUS_PHANTOM STATUS_PHYSICS STATUS_RETURN_AT_EDGE STATUS_ROTATE_X
+\ STATUS_ROTATE_Y STATUS_ROTATE_Z STATUS_SANDBOX STRING_TRIM STRING_TRIM_HEAD
+\ STRING_TRIM_TAIL TRUE TWO_PI TYPE_FLOAT TYPE_INTEGER TYPE_INVALID TYPE_KEY
+\ TYPE_ROTATION TYPE_STRING TYPE_VECTOR VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY
+\ VEHICLE_ANGULAR_DEFLECTION_TIMESCALE VEHICLE_ANGULAR_FRICTION_TIMESCALE
+\ VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE VEHICLE_ANGULAR_MOTOR_DIRECTION
+\ VEHICLE_ANGULAR_MOTOR_TIMESCALE VEHICLE_BANKING_EFFICIENCY VEHICLE_BANKING_MIX
+\ VEHICLE_BANKING_TIMESCALE VEHICLE_BUOYANCY VEHICLE_FLAG_CAMERA_DECOUPLED
+\ VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT VEHICLE_FLAG_HOVER_TERRAIN_ONLY
+\ VEHICLE_FLAG_HOVER_UP_ONLY VEHICLE_FLAG_HOVER_WATER_ONLY
+\ VEHICLE_FLAG_LIMIT_MOTOR_UP VEHICLE_FLAG_LIMIT_ROLL_ONLY
+\ VEHICLE_FLAG_MOUSELOOK_BANK VEHICLE_FLAG_MOUSELOOK_STEER
+\ VEHICLE_FLAG_NO_DEFLECTION_UP VEHICLE_HOVER_EFFICIENCY VEHICLE_HOVER_HEIGHT
+\ VEHICLE_HOVER_TIMESCALE VEHICLE_LINEAR_DEFLECTION_EFFICIENCY
+\ VEHICLE_LINEAR_DEFLECTION_TIMESCALE VEHICLE_LINEAR_FRICTION_TIMESCALE
+\ VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE VEHICLE_LINEAR_MOTOR_TIMESCALE
+\ VEHICLE_LINEAR_MOTOR_DIRECTION VEHICLE_LINEAR_MOTOR_OFFSET
+\ VEHICLE_REFERENCE_FRAME VEHICLE_TYPE_AIRPLANE VEHICLE_TYPE_BALLOON
+\ VEHICLE_TYPE_BOAT VEHICLE_TYPE_CAR VEHICLE_TYPE_NONE VEHICLE_TYPE_SLED
+\ VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY VEHICLE_VERTICAL_ATTRACTION_TIMESCALE
+\ ZERO_ROTATION ZERO_VECTOR
+
+" Events
+syn keyword lslEvent
+\ attach at_rot_target at_target changed collision collision_end collision_start
+\ control dataserver email http_response land_collision land_collision_end
+\ land_collision_start link_message listen money moving_end moving_start
+\ not_at_rot_target no_sensor object_rez on_rez remote_data run_time_permissions
+\ sensor state_entry state_exit timer touch touch_end touch_start not_at_target
+
+" Functions
+syn keyword lslFunction
+\ llAbs llAcos llAddToLandBanList llAddToLandPassList llAdjustSoundVolume
+\ llAllowInventoryDrop llAngleBetween llApplyImpulse llApplyRotationalImpulse
+\ llAsin llAtan2 llAttachToAvatar llAvatarOnSitTarget llAxes2Rot llAxisAngle2Rot
+\ llBase64ToInteger llBase64ToString llBreakAllLinks llBreakLink llCSV2List
+\ llCeil llClearCameraParams llCloseRemoteDataChannel llCloud llCollisionFilter
+\ llCollisionSound llCollisionSprite llCos llCreateLink llDeleteSubList
+\ llDeleteSubString llDetachFromAvatar llDetectedGrab llDetectedGroup
+\ llDetectedKey llDetectedLinkNumber llDetectedName llDetectedOwner
+\ llDetectedPos llDetectedRot llDetectedType llDetectedVel llDialog llDie
+\ llDumpList2String llEdgeOfWorld llEjectFromLand llEmail llEscapeURL
+\ llEuler2Rot llFabs llFloor llForceMouselook llFrand llGetAccel llGetAgentInfo
+\ llGetAgentSize llGetAlpha llGetAndResetTime llGetAnimation llGetAnimationList
+\ llGetAttached llGetBoundingBox llGetCameraPos llGetCameraRot llGetCenterOfMass
+\ llGetColor llGetCreator llGetDate llGetEnergy llGetForce llGetFreeMemory
+\ llGetGMTclock llGetGeometricCenter llGetInventoryCreator llGetInventoryKey
+\ llGetInventoryName llGetInventoryNumber llGetInventoryPermMask
+\ llGetInventoryType llGetKey llGetLandOwnerAt llGetLinkKey llGetLinkName
+\ llGetLinkNumber llGetListEntryType llGetListLength llGetLocalPos llGetLocalRot
+\ llGetMass llGetNextEmail llGetNotecardLine llGetNumberOfNotecardLines
+\ llGetNumberOfPrims llGetNumberOfSides llGetObjectDesc llGetObjectDetails
+\ llGetObjectMass llGetObjectName llGetObjectPermMask llGetObjectPrimCount
+\ llGetOmega llGetOwner llGetOwnerKey llGetParcelDetails llGetParcelFlags
+\ llGetParcelMaxPrims llGetParcelPrimCount llGetParcelPrimOwners
+\ llGetPermissions llGetPermissionsKey llGetPos llGetPrimitiveParams
+\ llGetRegionCorner llGetRegionFPS llGetRegionFlags llGetRegionName
+\ llGetRegionTimeDilation llGetRootPosition llGetRootRotation llGetRot
+\ llGetScale llGetScriptName llGetScriptState llGetSimulatorHostname
+\ llGetStartParameter llGetStatus llGetSubString llGetSunDirection llGetTexture
+\ llGetTextureOffset llGetTextureRot llGetTextureScale llGetTime llGetTimeOfDay
+\ llGetTimestamp llGetTorque llGetUnixTime llGetVel llGetWallclock
+\ llGiveInventory llGiveInventoryList llGiveMoney llGodLikeRezObject llGround
+\ llGroundContour llGroundNormal llGroundRepel llGroundSlope llHTTPRequest
+\ llInsertString llInstantMessage llIntegerToBase64 llKey2Name llList2CSV
+\ llList2Float llList2Integer llList2Key llList2List llList2ListStrided
+\ llList2Rot llList2String llList2Vector llListFindList llListInsertList
+\ llListRandomize llListReplaceList llListSort llListStatistics llListen
+\ llListenControl llListenRemove llLoadURL llLog llLog10 llLookAt llLoopSound
+\ llLoopSoundMaster llLoopSoundSlave llMD5String llMakeExplosion llMakeFire
+\ llMakeFountain llMakeSmoke llMapDestination llMessageLinked llMinEventDelay
+\ llModPow llModifyLand llMoveToTarget llOffsetTexture llOpenRemoteDataChannel
+\ llOverMyLand llOwnerSay llParcelMediaCommandList llParcelMediaQuery
+\ llParseString2List llParseStringKeepNulls llParticleSystem llPassCollisions
+\ llPassTouches llPlaySound llPlaySoundSlave llPointAt llPow llPreloadSound
+\ llPushObject llRefreshPrimURL llRegionSay llReleaseCamera llReleaseControls
+\ llRemoteDataReply llRemoteDataSetRegion llRemoteLoadScript
+\ llRemoteLoadScriptPin llRemoveFromLandBanList llRemoveFromLandPassList
+\ llRemoveInventory llRemoveVehicleFlags llRequestAgentData
+\ llRequestInventoryData llRequestPermissions llRequestSimulatorData
+\ llResetLandBanList llResetLandPassList llResetOtherScript llResetScript
+\ llResetTime llRezAtRoot llRezObject llRot2Angle llRot2Axis llRot2Euler
+\ llRot2Fwd llRot2Left llRot2Up llRotBetween llRotLookAt llRotTarget
+\ llRotTargetRemove llRotateTexture llRound llSameGroup llSay llScaleTexture
+\ llScriptDanger llSendRemoteData llSensor llSensorRemove llSensorRepeat
+\ llSetAlpha llSetBuoyancy llSetCameraAtOffset llSetCameraEyeOffset
+\ llSetCameraParams llSetClickAction llSetColor llSetDamage llSetForce
+\ llSetForceAndTorque llSetHoverHeight llSetInventoryPermMask llSetLinkAlpha
+\ llSetLinkColor llSetLinkPrimitiveParams llSetLinkTexture llSetLocalRot
+\ llSetObjectDesc llSetObjectName llSetObjectPermMask llSetParcelMusicURL
+\ llSetPayPrice llSetPos llSetPrimURL llSetPrimitiveParams
+\ llSetRemoteScriptAccessPin llSetRot llSetScale llSetScriptState llSetSitText
+\ llSetSoundQueueing llSetSoundRadius llSetStatus llSetText llSetTexture
+\ llSetTextureAnim llSetTimerEvent llSetTorque llSetTouchText llSetVehicleFlags
+\ llSetVehicleFloatParam llSetVehicleRotationParam llSetVehicleType
+\ llSetVehicleVectorParam llShout llSin llSitTarget llSleep llSound
+\ llSoundPreload llSqrt llStartAnimation llStopAnimation llStopHover
+\ llStopLookAt llStopMoveToTarget llStopPointAt llStopSound llStringLength
+\ llStringToBase64 llStringTrim llSubStringIndex llTakeCamera llTakeControls
+\ llTan llTarget llTargetOmega llTargetRemove llTeleportAgentHome llToLower
+\ llToUpper llTriggerSound llTriggerSoundLimited llUnSit llUnescapeURL llVecDist
+\ llVecMag llVecNorm llVolumeDetect llWater llWhisper llWind llXorBase64Strings
+\ llXorBase64StringsCorrect
+
+" Operators
+syn match lslOperator +[-!%&*+/<=>^|~]+ display
+
+" Numbers
+syn match lslNumber +-\=\%(\<\d\+\|\%(\<\d\+\)\=\.\d\+\)\%([Ee][-+]\=\d\+\)\=\>\|\<0x\x\+\>+ display
+
+" Vectors and rotations
+syn match lslVectorRot +<[-\t +.0-9A-Za-z_]\+\%(,[-\t +.0-9A-Za-z_]\+\)\{2,3}>+ contains=lslNumber display
+
+" Vector and rotation properties
+syn match lslProperty +\.\@<=[sxyz]\>+ display
+
+" Strings
+syn region lslString start=+"+ skip=+\\.+ end=+"+ contains=lslSpecialChar,@Spell
+syn match lslSpecialChar +\\.+ contained display
+
+" Keys
+syn match lslKey +"\x\{8}-\x\{4}-\x\{4}-\x\{4}-\x\{12}"+ display
+
+" Parentheses, braces and brackets
+syn match lslBlock +[][(){}]+ display
+
+" Typecast operators
+syn match lslTypecast +(\%(float\|integer\|key\|list\|quaternion\|rotation\|string\|vector\))+ contains=lslType display
+
+" Comments
+syn match lslComment +//.*+ contains=@Spell
+
+" Define the default highlighting.
+hi def link lslKeyword      Keyword
+hi def link lslType         Type
+hi def link lslLabel        Label
+hi def link lslConstant     Constant
+hi def link lslEvent        PreProc
+hi def link lslFunction     Function
+hi def link lslOperator     Operator
+hi def link lslNumber       Number
+hi def link lslVectorRot    Special
+hi def link lslProperty     Identifier
+hi def link lslString       String
+hi def link lslSpecialChar  SpecialChar
+hi def link lslKey          Special
+hi def link lslBlock        Special
+hi def link lslTypecast     Operator
+hi def link lslComment      Comment
+
+let b:current_syntax = "lsl"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim: ts=8
+
+endif
diff --git a/syntax/lss.vim b/syntax/lss.vim
new file mode 100644
index 000000000..f2a170cef
--- /dev/null
+++ b/syntax/lss.vim
@@ -0,0 +1,127 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lss') == -1
+
+" Vim syntax file
+" Language:	Lynx 2.7.1 style file
+" Maintainer:	Scott Bigham <dsb@killerbunnies.org>
+" Last Change:	2004 Oct 06
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" This setup is probably atypical for a syntax highlighting file, because
+" most of it is not really intended to be overrideable.  Instead, the
+" highlighting is supposed to correspond to the highlighting specified by
+" the .lss file entries themselves; ie. the "bold" keyword should be bold,
+" the "red" keyword should be red, and so forth.  The exceptions to this
+" are comments, of course, and the initial keyword identifying the affected
+" element, which will inherit the usual Identifier highlighting.
+
+syn match lssElement "^[^:]\+" nextgroup=lssMono
+
+syn match lssMono ":[^:]\+" contained nextgroup=lssFgColor contains=lssReverse,lssUnderline,lssBold,lssStandout
+
+syn keyword	lssBold		bold		contained
+syn keyword	lssReverse	reverse		contained
+syn keyword	lssUnderline	underline	contained
+syn keyword	lssStandout	standout	contained
+
+syn match lssFgColor ":[^:]\+" contained nextgroup=lssBgColor contains=lssRedFg,lssBlueFg,lssGreenFg,lssBrownFg,lssMagentaFg,lssCyanFg,lssLightgrayFg,lssGrayFg,lssBrightredFg,lssBrightgreenFg,lssYellowFg,lssBrightblueFg,lssBrightmagentaFg,lssBrightcyanFg
+
+syn case ignore
+syn keyword	lssRedFg		red		contained
+syn keyword	lssBlueFg		blue		contained
+syn keyword	lssGreenFg		green		contained
+syn keyword	lssBrownFg		brown		contained
+syn keyword	lssMagentaFg		magenta		contained
+syn keyword	lssCyanFg		cyan		contained
+syn keyword	lssLightgrayFg		lightgray	contained
+syn keyword	lssGrayFg		gray		contained
+syn keyword	lssBrightredFg		brightred	contained
+syn keyword	lssBrightgreenFg	brightgreen	contained
+syn keyword	lssYellowFg		yellow		contained
+syn keyword	lssBrightblueFg		brightblue	contained
+syn keyword	lssBrightmagentaFg	brightmagenta	contained
+syn keyword	lssBrightcyanFg		brightcyan	contained
+syn case match
+
+syn match lssBgColor ":[^:]\+" contained contains=lssRedBg,lssBlueBg,lssGreenBg,lssBrownBg,lssMagentaBg,lssCyanBg,lssLightgrayBg,lssGrayBg,lssBrightredBg,lssBrightgreenBg,lssYellowBg,lssBrightblueBg,lssBrightmagentaBg,lssBrightcyanBg,lssWhiteBg
+
+syn case ignore
+syn keyword	lssRedBg		red		contained
+syn keyword	lssBlueBg		blue		contained
+syn keyword	lssGreenBg		green		contained
+syn keyword	lssBrownBg		brown		contained
+syn keyword	lssMagentaBg		magenta		contained
+syn keyword	lssCyanBg		cyan		contained
+syn keyword	lssLightgrayBg		lightgray	contained
+syn keyword	lssGrayBg		gray		contained
+syn keyword	lssBrightredBg		brightred	contained
+syn keyword	lssBrightgreenBg	brightgreen	contained
+syn keyword	lssYellowBg		yellow		contained
+syn keyword	lssBrightblueBg		brightblue	contained
+syn keyword	lssBrightmagentaBg	brightmagenta	contained
+syn keyword	lssBrightcyanBg		brightcyan	contained
+syn keyword	lssWhiteBg		white		contained
+syn case match
+
+syn match lssComment "#.*$"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+hi def link lssComment Comment
+hi def link lssElement Identifier
+
+hi def lssBold		term=bold cterm=bold
+hi def lssReverse		term=reverse cterm=reverse
+hi def lssUnderline		term=underline cterm=underline
+hi def lssStandout		term=standout cterm=standout
+
+hi def lssRedFg		ctermfg=red
+hi def lssBlueFg		ctermfg=blue
+hi def lssGreenFg		ctermfg=green
+hi def lssBrownFg		ctermfg=brown
+hi def lssMagentaFg		ctermfg=magenta
+hi def lssCyanFg		ctermfg=cyan
+hi def lssGrayFg		ctermfg=gray
+if $COLORTERM == "rxvt"
+  " On rxvt's, bright colors are activated by setting the bold attribute.
+  hi def lssLightgrayFg	ctermfg=gray cterm=bold
+  hi def lssBrightredFg	ctermfg=red cterm=bold
+  hi def lssBrightgreenFg	ctermfg=green cterm=bold
+  hi def lssYellowFg		ctermfg=yellow cterm=bold
+  hi def lssBrightblueFg	ctermfg=blue cterm=bold
+  hi def lssBrightmagentaFg	ctermfg=magenta cterm=bold
+  hi def lssBrightcyanFg	ctermfg=cyan cterm=bold
+else
+  hi def lssLightgrayFg	ctermfg=lightgray
+  hi def lssBrightredFg	ctermfg=lightred
+  hi def lssBrightgreenFg	ctermfg=lightgreen
+  hi def lssYellowFg		ctermfg=yellow
+  hi def lssBrightblueFg	ctermfg=lightblue
+  hi def lssBrightmagentaFg	ctermfg=lightmagenta
+  hi def lssBrightcyanFg	ctermfg=lightcyan
+endif
+
+hi def lssRedBg		ctermbg=red
+hi def lssBlueBg		ctermbg=blue
+hi def lssGreenBg		ctermbg=green
+hi def lssBrownBg		ctermbg=brown
+hi def lssMagentaBg		ctermbg=magenta
+hi def lssCyanBg		ctermbg=cyan
+hi def lssLightgrayBg		ctermbg=lightgray
+hi def lssGrayBg		ctermbg=gray
+hi def lssBrightredBg		ctermbg=lightred
+hi def lssBrightgreenBg	ctermbg=lightgreen
+hi def lssYellowBg		ctermbg=yellow
+hi def lssBrightblueBg	ctermbg=lightblue
+hi def lssBrightmagentaBg	ctermbg=lightmagenta
+hi def lssBrightcyanBg	ctermbg=lightcyan
+hi def lssWhiteBg		ctermbg=white ctermfg=black
+
+let b:current_syntax = "lss"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/lynx.vim b/syntax/lynx.vim
new file mode 100644
index 000000000..4dfe92051
--- /dev/null
+++ b/syntax/lynx.vim
@@ -0,0 +1,144 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lynx') == -1
+
+" Vim syntax file
+" Language:	Lynx configuration file (lynx.cfg)
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2013 Jun 20
+
+" Lynx 2.8.7
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match lynxStart "^" transparent skipwhite nextgroup=lynxOption
+
+syn match lynxComment "\(^\|\s\+\)#.*$" contains=lynxTodo
+
+syn keyword lynxTodo TODO NOTE FIXME XXX contained
+
+syn match lynxDelimiter ":" skipwhite nextgroup=lynxBoolean,lynxNumber,lynxNone,lynxRCOption
+
+syn case ignore
+syn keyword lynxBoolean TRUE FALSE ON OFF contained
+syn keyword lynxNone    NONE		  contained
+syn case match
+
+syn match lynxNumber "-\=\<\d\+\>" contained
+
+"{{{ Options
+syn case ignore
+syn keyword lynxOption ACCEPT_ALL_COOKIES ALERTSECS ALWAYS_RESUBMIT_POSTS
+	\ ALWAYS_TRUSTED_EXEC ANONFTP_PASSWORD ASSUMED_COLOR
+	\ ASSUMED_DOC_CHARSET_CHOICE ASSUME_CHARSET ASSUME_LOCAL_CHARSET
+	\ ASSUME_UNREC_CHARSET AUTO_SESSION AUTO_UNCACHE_DIRLISTS BAD_HTML
+	\ BIBP_BIBHOST BIBP_GLOBAL_SERVER BLOCK_MULTI_BOOKMARKS BOLD_H1
+	\ BOLD_HEADERS BOLD_NAME_ANCHORS BOOKMARK_FILE BROKEN_FTP_EPSV
+	\ BROKEN_FTP_RETR BZIP2_PATH CASE_SENSITIVE_ALWAYS_ON
+	\ CASE_SENSITIVE_SEARCHING CHARACTER_SET CHARSETS_DIRECTORY
+	\ CHARSET_SWITCH_RULES CHECKMAIL CHMOD_PATH COLLAPSE_BR_TAGS COLOR
+	\ COLOR_STYLE COMPRESS_PATH CONNECT_TIMEOUT COOKIE_ACCEPT_DOMAINS
+	\ COOKIE_FILE COOKIE_LOOSE_INVALID_DOMAINS
+	\ COOKIE_QUERY_INVALID_DOMAINS COOKIE_REJECT_DOMAINS COOKIE_SAVE_FILE
+	\ COOKIE_STRICT_INVALID_DOMAINS COPY_PATH CSO_PROXY CSWING_PATH
+	\ DEBUGSECS DEFAULT_BOOKMARK_FILE DEFAULT_CACHE_SIZE DEFAULT_COLORS
+	\ DEFAULT_EDITOR DEFAULT_INDEX_FILE DEFAULT_KEYPAD_MODE
+	\ DEFAULT_KEYPAD_MODE_IS_NUMBERS_AS_ARROWS DEFAULT_USER_MODE
+	\ DEFAULT_VIRTUAL_MEMORY_SIZE DELAYSECS DIRED_MENU DIR_LIST_ORDER
+	\ DIR_LIST_STYLE DISPLAY DISPLAY_CHARSET_CHOICE DOWNLOADER EMACS_KEYS
+	\ EMACS_KEYS_ALWAYS_ON ENABLE_LYNXRC ENABLE_SCROLLBACK EXTERNAL
+	\ FILE_EDITOR FILE_SORTING_METHOD FINGER_PROXY FOCUS_WINDOW
+	\ FORCE_8BIT_TOUPPER FORCE_COOKIE_PROMPT FORCE_EMPTY_HREFLESS_A
+	\ FORCE_SSL_COOKIES_SECURE FORCE_SSL_PROMPT FORMS_OPTIONS FTP_FORMAT
+	\ FTP_PASSIVE FTP_PROXY GLOBAL_EXTENSION_MAP GLOBAL_MAILCAP
+	\ GOPHER_PROXY GOTOBUFFER GZIP_PATH HELPFILE HIDDEN_LINK_MARKER
+	\ HISTORICAL_COMMENTS HTMLSRC_ATTRNAME_XFORM HTMLSRC_TAGNAME_XFORM
+	\ HTTPS_PROXY HTTP_PROXY INCLUDE INFLATE_PATH INFOSECS INSTALL_PATH
+	\ JUMPBUFFER JUMPFILE JUMP_PROMPT JUSTIFY JUSTIFY_MAX_VOID_PERCENT
+	\ KBLAYOUT KEYBOARD_LAYOUT KEYMAP KEYPAD_MODE
+	\ LEFTARROW_IN_TEXTFIELD_PROMPT LINEEDIT_MODE LIST_FORMAT
+	\ LIST_NEWS_DATES LIST_NEWS_NUMBERS LOCALE_CHARSET LOCALHOST_ALIAS
+	\ LOCAL_DOMAIN LOCAL_EXECUTION_LINKS_ALWAYS_ON
+	\ LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE LYNXCGI_DOCUMENT_ROOT
+	\ LYNXCGI_ENVIRONMENT LYNX_HOST_NAME LYNX_SIG_FILE MAIL_ADRS
+	\ MAIL_SYSTEM_ERROR_LOGGING MAKE_LINKS_FOR_ALL_IMAGES
+	\ MAKE_PSEUDO_ALTS_FOR_INLINES MAX_COOKIES_BUFFER MAX_COOKIES_DOMAIN
+	\ MAX_COOKIES_GLOBAL MESSAGESECS MINIMAL_COMMENTS MKDIR_PATH
+	\ MULTI_BOOKMARK MULTI_BOOKMARK_SUPPORT MV_PATH NCR_IN_BOOKMARKS
+	\ NESTED_TABLES NEWSPOST_PROXY NEWSREPLY_PROXY NEWS_CHUNK_SIZE
+	\ NEWS_MAX_CHUNK NEWS_POSTING NEWS_PROXY NNTPSERVER NNTP_PROXY
+	\ NONRESTARTING_SIGWINCH NO_DOT_FILES NO_FILE_REFERER
+	\ NO_FORCED_CORE_DUMP NO_FROM_HEADER NO_ISMAP_IF_USEMAP NO_MARGINS
+	\ NO_PAUSE NO_PROXY NO_REFERER_HEADER NO_TABLE_CENTER NO_TITLE
+	\ NUMBER_FIELDS_ON_LEFT NUMBER_LINKS_ON_LEFT OUTGOING_MAIL_CHARSET
+	\ PARTIAL PARTIAL_THRES PERSISTENT_COOKIES PERSONAL_EXTENSION_MAP
+	\ PERSONAL_MAILCAP PERSONAL_MAIL_ADDRESS POSITIONABLE_EDITOR
+	\ PREFERRED_CHARSET PREFERRED_ENCODING PREFERRED_LANGUAGE
+	\ PREFERRED_MEDIA_TYPES PREPEND_BASE_TO_SOURCE
+	\ PREPEND_CHARSET_TO_SOURCE PRETTYSRC PRETTYSRC_SPEC
+	\ PRETTYSRC_VIEW_NO_ANCHOR_NUMBERING PRINTER QUIT_DEFAULT_YES RAW_MODE
+	\ READ_TIMEOUT REFERER_WITH_QUERY REPLAYSECS REUSE_TEMPFILES
+	\ RLOGIN_PATH RM_PATH RMDIR_PATH RULE RULESFILE
+	\ RUN_ALL_EXECUTION_LINKS RUN_EXECUTION_LINKS_LOCAL SAVE_SPACE
+	\ SCAN_FOR_BURIED_NEWS_REFS SCREEN_SIZE SCROLLBAR SCROLLBAR_ARROW
+	\ SEEK_FRAG_AREA_IN_CUR SEEK_FRAG_MAP_IN_CUR SELECT_POPUPS
+	\ SEND_USERAGENT SESSION_FILE SESSION_LIMIT SET_COOKIES SETFONT_PATH
+	\ SHOW_COLOR SHOW_CURSOR SHOW_DOTFILES SHOW_KB_NAME SHOW_KB_RATE
+	\ SNEWSPOST_PROXY SNEWSREPLY_PROXY SNEWS_PROXY SOFT_DQUOTES
+	\ SOURCE_CACHE SOURCE_CACHE_FOR_ABORTED SSL_CERT_FILE STARTFILE
+	\ STATUS_BUFFER_SIZE STRIP_DOTDOT_URLS SUBSTITUTE_UNDERSCORES
+	\ SUB_BOOKMARKS SUFFIX SUFFIX_ORDER SYSLOG_REQUESTED_URLS SYSLOG_TEXT
+	\ SYSTEM_EDITOR SYSTEM_MAIL SYSTEM_MAIL_FLAGS TAGSOUP TAR_PATH
+	\ TELNET_PATH TEXTFIELDS_NEED_ACTIVATION TIMEOUT TN3270_PATH
+	\ TOUCH_PATH TRIM_INPUT_FIELDS TRUSTED_EXEC TRUSTED_LYNXCGI
+	\ UNCOMPRESS_PATH UNDERLINE_LINKS UNZIP_PATH UPLOADER
+	\ URL_DOMAIN_PREFIXES URL_DOMAIN_SUFFIXES USERAGENT USER_MODE
+	\ USE_FIXED_RECORDS USE_MOUSE USE_SELECT_POPUPS UUDECODE_PATH
+	\ VERBOSE_IMAGES VIEWER VISITED_LINKS VI_KEYS VI_KEYS_ALWAYS_ON
+	\ WAIS_PROXY XHTML_PARSING XLOADIMAGE_COMMAND ZCAT_PATH ZIP_PATH
+	\ contained nextgroup=lynxDelimiter
+syn keyword lynxRCOption accept_all_cookies assume_charset auto_session
+	\ bookmark_file case_sensitive_searching character_set
+	\ cookie_accept_domains cookie_file cookie_loose_invalid_domains
+	\ cookie_query_invalid_domains cookie_reject_domains
+	\ cookie_strict_invalid_domains dir_list_style display emacs_keys
+	\ file_editor file_sorting_method force_cookie_prompt force_ssl_prompt
+	\ ftp_passive kblayout keypad_mode lineedit_mode locale_charset
+	\ make_links_for_all_images make_pseudo_alts_for_inlines
+	\ multi_bookmark no_pause personal_mail_address preferred_charset
+	\ preferred_encoding preferred_language preferred_media_types raw_mode
+	\ run_all_execution_links run_execution_links_on_local_files scrollbar
+	\ select_popups send_useragent session_file set_cookies show_color
+	\ show_cursor show_dotfiles show_kb_rate sub_bookmarks tagsoup
+	\ underline_links user_mode useragent verbose_images vi_keys
+	\ visited_links
+	\ contained nextgroup=lynxDelimiter
+syn case match
+" }}}
+
+" cfg2html.pl formatting directives
+syn match lynxFormatDir  "^\.h\d\s.*$"
+syn match lynxFormatDir  "^\.\(ex\|nf\)\(\s\+\d\+\)\=$"
+syn match lynxFormatDir  "^\.fi$"
+
+hi def link lynxBoolean		Boolean
+hi def link lynxComment		Comment
+hi def link lynxDelimiter	Special
+hi def link lynxFormatDir	Special
+hi def link lynxNone		Constant
+hi def link lynxNumber		Number
+hi def link lynxOption		Identifier
+hi def link lynxRCOption	lynxOption
+hi def link lynxTodo		Todo
+
+let b:current_syntax = "lynx"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8 fdm=marker:
+
+endif
diff --git a/syntax/mail.vim b/syntax/mail.vim
new file mode 100644
index 000000000..41a4a860e
--- /dev/null
+++ b/syntax/mail.vim
@@ -0,0 +1,116 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mail') == -1
+
+" Vim syntax file
+" Language:		Mail file
+" Previous Maintainer:	Felix von Leitner <leitner@math.fu-berlin.de>
+" Maintainer:		GI <a@b.c>, where a='gi1242+vim', b='gmail', c='com'
+" Last Change:		Wed 14 Aug 2013 08:24:52 AM PDT
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" The mail header is recognized starting with a "keyword:" line and ending
+" with an empty line or other line that can't be in the header. All lines of
+" the header are highlighted. Headers of quoted messages (quoted with >) are
+" also highlighted.
+
+" Syntax clusters
+syn cluster mailHeaderFields	contains=mailHeaderKey,mailSubject,mailHeaderEmail,@mailLinks
+syn cluster mailLinks		contains=mailURL,mailEmail
+syn cluster mailQuoteExps	contains=mailQuoteExp1,mailQuoteExp2,mailQuoteExp3,mailQuoteExp4,mailQuoteExp5,mailQuoteExp6
+
+syn case match
+" For "From " matching case is required. The "From " is not matched in quoted
+" emails
+" According to RFC 2822 any printable ASCII character can appear in a field
+" name, except ':'.
+syn region	mailHeader	contains=@mailHeaderFields,@NoSpell start="^From .*\d\d\d\d$" skip="^\s" end="\v^[!-9;-~]*([^!-~]|$)"me=s-1 fold
+syn match	mailHeaderKey	contained contains=mailEmail,@NoSpell "^From\s.*\d\d\d\d$"
+
+" Nothing else depends on case. 
+syn case ignore
+
+" Headers in properly quoted (with "> " or ">") emails are matched
+syn region	mailHeader	keepend contains=@mailHeaderFields,@mailQuoteExps,@NoSpell start="^\z(\(> \?\)*\)\v(newsgroups|x-([a-z\-])*|path|xref|message-id|from|((in-)?reply-)?to|b?cc|subject|return-path|received|date|replied):" skip="^\z1\s" end="\v^\z1[!-9;-~]*([^!-~]|$)"me=s-1 end="\v^\z1@!"me=s-1 end="\v^\z1(\> ?)+"me=s-1 fold
+
+" Usenet headers
+syn match	mailHeaderKey	contained contains=mailHeaderEmail,mailEmail,@NoSpell "\v(^(\> ?)*)@<=(Newsgroups|Followup-To|Message-ID|Supersedes|Control):.*$"
+
+
+syn region	mailHeaderKey	contained contains=mailHeaderEmail,mailEmail,@mailQuoteExps,@NoSpell start="\v(^(\> ?)*)@<=(to|b?cc):" skip=",$" end="$"
+syn match	mailHeaderKey	contained contains=mailHeaderEmail,mailEmail,@NoSpell "\v(^(\> ?)*)@<=(from|reply-to):.*$" fold
+syn match	mailHeaderKey	contained contains=@NoSpell "\v(^(\> ?)*)@<=date:"
+syn match	mailSubject	contained "\v^subject:.*$" fold
+syn match	mailSubject	contained contains=@NoSpell "\v(^(\> ?)+)@<=subject:.*$"
+
+" Anything in the header between < and > is an email address
+syn match	mailHeaderEmail	contained contains=@NoSpell "<.\{-}>"
+
+" Mail Signatures. (Begin with "-- ", end with change in quote level)
+syn region	mailSignature	keepend contains=@mailLinks,@mailQuoteExps start="^--\s$" end="^$" end="^\(> \?\)\+"me=s-1 fold
+syn region	mailSignature	keepend contains=@mailLinks,@mailQuoteExps,@NoSpell start="^\z(\(> \?\)\+\)--\s$" end="^\z1$" end="^\z1\@!"me=s-1 end="^\z1\(> \?\)\+"me=s-1 fold
+
+" Treat verbatim Text special.
+syn region	mailVerbatim	contains=@NoSpell keepend start="^#v+$" end="^#v-$" fold 
+syn region	mailVerbatim	contains=@mailQuoteExps,@NoSpell keepend start="^\z(\(> \?\)\+\)#v+$" end="\z1#v-$" fold 
+
+" URLs start with a known protocol or www,web,w3.
+syn match mailURL contains=@NoSpell `\v<(((https?|ftp|gopher)://|(mailto|file|news):)[^' 	<>"]+|(www|web|w3)[a-z0-9_-]*\.[a-z0-9._-]+\.[^' 	<>"]+)[a-z0-9/]`
+syn match mailEmail contains=@NoSpell "\v[_=a-z\./+0-9-]+\@[a-z0-9._-]+\a{2}"
+
+" Make sure quote markers in regions (header / signature) have correct color
+syn match mailQuoteExp1	contained "\v^(\> ?)"
+syn match mailQuoteExp2	contained "\v^(\> ?){2}"
+syn match mailQuoteExp3	contained "\v^(\> ?){3}"
+syn match mailQuoteExp4	contained "\v^(\> ?){4}"
+syn match mailQuoteExp5	contained "\v^(\> ?){5}"
+syn match mailQuoteExp6	contained "\v^(\> ?){6}"
+
+" Even and odd quoted lines. Order is important here!
+syn region	mailQuoted6	keepend contains=mailVerbatim,mailHeader,@mailLinks,mailSignature,@NoSpell start="^\z(\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{5}\([a-z]\+>\|[]|}>]\)\)" end="^\z1\@!" fold
+syn region	mailQuoted5	keepend contains=mailQuoted6,mailVerbatim,mailHeader,@mailLinks,mailSignature,@NoSpell start="^\z(\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{4}\([a-z]\+>\|[]|}>]\)\)" end="^\z1\@!" fold
+syn region	mailQuoted4	keepend contains=mailQuoted5,mailQuoted6,mailVerbatim,mailHeader,@mailLinks,mailSignature,@NoSpell start="^\z(\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{3}\([a-z]\+>\|[]|}>]\)\)" end="^\z1\@!" fold
+syn region	mailQuoted3	keepend contains=mailQuoted4,mailQuoted5,mailQuoted6,mailVerbatim,mailHeader,@mailLinks,mailSignature,@NoSpell start="^\z(\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{2}\([a-z]\+>\|[]|}>]\)\)" end="^\z1\@!" fold
+syn region	mailQuoted2	keepend contains=mailQuoted3,mailQuoted4,mailQuoted5,mailQuoted6,mailVerbatim,mailHeader,@mailLinks,mailSignature,@NoSpell start="^\z(\(\([a-z]\+>\|[]|}>]\)[ \t]*\)\{1}\([a-z]\+>\|[]|}>]\)\)" end="^\z1\@!" fold
+syn region	mailQuoted1	keepend contains=mailQuoted2,mailQuoted3,mailQuoted4,mailQuoted5,mailQuoted6,mailVerbatim,mailHeader,@mailLinks,mailSignature,@NoSpell start="^\z([a-z]\+>\|[]|}>]\)" end="^\z1\@!" fold
+
+" Need to sync on the header. Assume we can do that within 100 lines
+if exists("mail_minlines")
+    exec "syn sync minlines=" . mail_minlines
+else
+    syn sync minlines=100
+endif
+
+" Define the default highlighting.
+hi def link mailVerbatim	Special
+hi def link mailHeader		Statement
+hi def link mailHeaderKey	Type
+hi def link mailSignature	PreProc
+hi def link mailHeaderEmail	mailEmail
+hi def link mailEmail		Special
+hi def link mailURL		String
+hi def link mailSubject		Title
+hi def link mailQuoted1		Comment
+hi def link mailQuoted3		mailQuoted1
+hi def link mailQuoted5		mailQuoted1
+hi def link mailQuoted2		Identifier
+hi def link mailQuoted4		mailQuoted2
+hi def link mailQuoted6		mailQuoted2
+hi def link mailQuoteExp1	mailQuoted1
+hi def link mailQuoteExp2	mailQuoted2
+hi def link mailQuoteExp3	mailQuoted3
+hi def link mailQuoteExp4	mailQuoted4
+hi def link mailQuoteExp5	mailQuoted5
+hi def link mailQuoteExp6	mailQuoted6
+
+let b:current_syntax = "mail"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/mailaliases.vim b/syntax/mailaliases.vim
new file mode 100644
index 000000000..af00b7832
--- /dev/null
+++ b/syntax/mailaliases.vim
@@ -0,0 +1,75 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mailaliases') == -1
+
+" Vim syntax file
+" Language:             aliases(5) local alias database file
+" Previous Maintainer:  Nikolai Weibull <nikolai@bitwi.se>
+" Latest Revision:      2008-04-14
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword mailaliasesTodo         contained TODO FIXME XXX NOTE
+
+syn region  mailaliasesComment      display oneline start='^\s*#' end='$'
+                                    \ contains=mailaliasesTodo,@Spell
+
+syn match   mailaliasesBegin        display '^'
+                                    \ nextgroup=mailaliasesName,
+                                    \ mailaliasesComment
+
+syn match   mailaliasesName         contained '[[:alnum:]\._-]\+'
+                                    \ nextgroup=mailaliasesColon
+
+syn region  mailaliasesName         contained oneline start=+"+
+                                    \ skip=+\\\\\|\\"+ end=+"+
+                                    \ nextgroup=mailaliasesColon
+
+syn match   mailaliasesColon        contained ':'
+                                    \ nextgroup=@mailaliasesValue
+                                    \ skipwhite skipnl
+
+syn cluster mailaliasesValue        contains=mailaliasesValueAddress,
+                                    \ mailaliasesValueFile,
+                                    \ mailaliasesValueCommand,
+                                    \ mailaliasesValueInclude
+
+syn match   mailaliasesValueAddress contained '[^ \t/|,]\+'
+                                    \ nextgroup=mailaliasesValueSep
+                                    \ skipwhite skipnl
+
+syn match   mailaliasesValueFile    contained '/[^,]*'
+                                    \ nextgroup=mailaliasesValueSep
+                                    \ skipwhite skipnl
+
+syn match   mailaliasesValueCommand contained '|[^,]*'
+                                    \ nextgroup=mailaliasesValueSep
+                                    \ skipwhite skipnl
+
+syn match   mailaliasesValueInclude contained ':include:[^,]*'
+                                    \ nextgroup=mailaliasesValueSep
+                                    \ skipwhite skipnl
+
+syn match   mailaliasesValueSep     contained ','
+                                    \ nextgroup=@mailaliasesValue
+                                    \ skipwhite skipnl
+
+hi def link mailaliasesTodo         Todo
+hi def link mailaliasesComment      Comment
+hi def link mailaliasesName         Identifier
+hi def link mailaliasesColon        Delimiter
+hi def link mailaliasesValueAddress String
+hi def link mailaliasesValueFile    String
+hi def link mailaliasesValueCommand String
+hi def link mailaliasesValueInclude PreProc
+hi def link mailaliasesValueSep     Delimiter
+
+let b:current_syntax = "mailaliases"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/mailcap.vim b/syntax/mailcap.vim
new file mode 100644
index 000000000..bb2432b09
--- /dev/null
+++ b/syntax/mailcap.vim
@@ -0,0 +1,39 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mailcap') == -1
+
+" Vim syntax file
+" Language:	Mailcap configuration file
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2013 Jun 01
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match  mailcapComment "^#.*"
+
+syn region mailcapString start=+"+ end=+"+ contains=mailcapSpecial oneline
+
+syn match  mailcapDelimiter "\\\@<!;"
+
+syn match  mailcapSpecial "\\\@<!%[nstF]"
+syn match  mailcapSpecial "\\\@<!%{[^}]*}"
+
+syn case ignore
+syn match  mailcapFlag	    "\(=\s*\)\@<!\<\(needsterminal\|copiousoutput\|x-\w\+\)\>"
+syn match  mailcapFieldname "\<\(compose\|composetyped\|print\|edit\|test\|x11-bitmap\|nametemplate\|textualnewlines\|description\|x-\w+\)\>\ze\s*="
+syn match  mailcapTypeField "^\(text\|image\|audio\|video\|application\|message\|multipart\|model\|x-[[:graph:]]\+\)\(/\(\*\|[[:graph:]]\+\)\)\=\ze\s*;"
+syn case match
+
+hi def link mailcapComment	Comment
+hi def link mailcapDelimiter	Delimiter
+hi def link mailcapFlag		Statement
+hi def link mailcapFieldname	Statement
+hi def link mailcapSpecial	Identifier
+hi def link mailcapTypeField	Type
+hi def link mailcapString	String
+
+let b:current_syntax = "mailcap"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/mallard.vim b/syntax/mallard.vim
new file mode 100644
index 000000000..9c8e9844b
--- /dev/null
+++ b/syntax/mallard.vim
@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mallard') == -1
+
+" Vim syntax file
+" Language:    Mallard
+" Maintainer:  Jaromir Hradilek <jhradilek@gmail.com>
+" URL:         https://github.com/jhradilek/vim-syntax
+" Last Change: 11 February 2013
+" Description: A syntax file for the Mallard markup language according to
+"              Mallard 1.0 DRAFT as of 2013-02-11.
+
+if exists("b:current_syntax")
+  finish
+endif
+
+do Syntax xml
+syn cluster xmlTagHook add=mallardTagName
+syn spell toplevel
+syn case match
+
+syn keyword mallardTagName app cite cmd code col colgroup comment contained
+syn keyword mallardTagName credit desc em email example figure contained
+syn keyword mallardTagName file gui guiseq info input item key contained
+syn keyword mallardTagName keyseq license link links list listing contained
+syn keyword mallardTagName media name note output p page quote contained
+syn keyword mallardTagName revision screen section span steps contained
+syn keyword mallardTagName subtitle synopsis sys table tbody td contained
+syn keyword mallardTagName terms tfoot thead title tr tree var contained
+syn keyword mallardTagName years contained
+
+syn region mallardComment start="<comment\>" end="</comment>"me=e-10 contains=xmlTag,xmlNamespace,xmlTagName,xmlEndTag,xmlRegion,xmlEntity,@Spell keepend
+syn region mallardEmphasis start="<em\>" end="</em>"me=e-5 contains=xmlTag,xmlNamespace,xmlTagName,xmlEndTag,xmlRegion,xmlEntity,@Spell keepend
+syn region mallardTitle start="<title\>" end="</title>"me=e-8 contains=xmlTag,xmlNamespace,xmlTagName,xmlEndTag,xmlRegion,xmlEntity,@Spell keepend
+
+hi def link mallardComment  Comment
+hi def link mallardTagName  Statement
+hi def link mallardTitle    Title
+hi def mallardEmphasis term=italic cterm=italic gui=italic
+
+let b:current_syntax = "mallard"
+
+endif
diff --git a/syntax/man.vim b/syntax/man.vim
new file mode 100644
index 000000000..c607f0e43
--- /dev/null
+++ b/syntax/man.vim
@@ -0,0 +1,60 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'man') == -1
+
+" Vim syntax file
+" Language:	Man page
+" Maintainer:	Jason Franklin <vim@justemail.net>
+" Previous Maintainer:	SungHyun Nam <goweol@gmail.com>
+" Previous Maintainer:	Gautam H. Mudunuri <gmudunur@informatica.com>
+" Version Info:
+" Last Change:	2020 Sep 19
+
+" Additional highlighting by Johannes Tanzler <johannes.tanzler@aon.at>:
+"	* manSubHeading
+"	* manSynopsis (only for sections 2 and 3)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Get the CTRL-H syntax to handle backspaced text
+runtime! syntax/ctrlh.vim
+
+syn case ignore
+
+syn match  manReference       "\f\+([1-9][a-z]\=)"
+syn match  manSectionHeading  "^\a.*$"
+syn match  manSubHeading      "^\s\{3\}\a.*$"
+syn match  manOptionDesc      "^\s*[+-][a-z0-9]\S*"
+syn match  manLongOptionDesc  "^\s*--[a-z0-9-]\S*"
+" syn match  manHistory		"^[a-z].*last change.*$"
+
+syn match manHeader '\%1l.*'
+exe 'syn match manFooter ''\%' . line('$') . 'l.*'''
+
+if getline(1) =~ '^[a-zA-Z_]\+([23])'
+  syntax include @cCode <sfile>:p:h/c.vim
+  syn match manCFuncDefinition  display "\<\h\w*\>\s*("me=e-1 contained
+  syn region manSynopsis start="^SYNOPSIS"hs=s+8 end="^\u\+\s*$"me=e-12 keepend contains=manSectionHeading,@cCode,manCFuncDefinition
+endif
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link manHeader Title
+hi def link manFooter PreProc
+
+hi def link manSectionHeading  Statement
+hi def link manOptionDesc	    Constant
+hi def link manLongOptionDesc  Constant
+hi def link manReference	    PreProc
+hi def link manSubHeading      Function
+hi def link manCFuncDefinition Function
+
+
+let b:current_syntax = "man"
+
+" vim:ts=8 sts=2 sw=2:
+
+endif
diff --git a/syntax/manconf.vim b/syntax/manconf.vim
new file mode 100644
index 000000000..6d7d808d4
--- /dev/null
+++ b/syntax/manconf.vim
@@ -0,0 +1,121 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'manconf') == -1
+
+" Vim syntax file
+" Language:             man.conf(5) - man configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword manconfTodo         contained TODO FIXME XXX NOTE
+
+syn region  manconfComment      display oneline start='^#' end='$'
+                                \ contains=manconfTodo,@Spell
+
+if !has("win32") && $OSTYPE =~   'bsd'
+  syn match   manconfBegin      display '^'
+                                \ nextgroup=manconfKeyword,manconfSection,
+                                \ manconfComment skipwhite
+
+  syn keyword manconfKeyword    contained _build _crunch
+                                \ nextgroup=manconfExtCmd skipwhite
+
+  syn keyword manconfKeyword    contained _suffix
+                                \ nextgroup=manconfExt skipwhite
+
+  syn keyword manconfKeyword    contained _crunch
+
+  syn keyword manconfKeyword    contained _subdir _version _whatdb
+                                \ nextgroup=manconfPaths skipwhite
+
+  syn match   manconfExtCmd     contained display '\.\S\+'
+                                \ nextgroup=manconfPaths skipwhite
+
+  syn match   manconfSection    contained '[^#_ \t]\S*'
+                                \ nextgroup=manconfPaths skipwhite
+
+  syn keyword manconfSection    contained _default
+                                \ nextgroup=manconfPaths skipwhite
+
+  syn match   manconfPaths      contained display '\S\+'
+                                \ nextgroup=manconfPaths skipwhite
+
+  syn match   manconfExt        contained display '\.\S\+'
+
+  hi def link manconfExtCmd     Type
+  hi def link manconfSection    Identifier
+  hi def link manconfPaths      String
+else
+  syn match   manconfBegin      display '^'
+                                \ nextgroup=manconfBoolean,manconfKeyword,
+                                \ manconfDecompress,manconfComment skipwhite
+
+  syn keyword manconfBoolean    contained FSSTND FHS NOAUTOPATH NOCACHE
+
+  syn keyword manconfKeyword    contained MANBIN
+                                \ nextgroup=manconfPath skipwhite
+
+  syn keyword manconfKeyword    contained MANPATH MANPATH_MAP
+                                \ nextgroup=manconfFirstPath skipwhite
+
+  syn keyword manconfKeyword    contained APROPOS WHATIS TROFF NROFF JNROFF EQN
+                                \ NEQN JNEQN TBL COL REFER PIC VGRIND GRAP
+                                \ PAGER BROWSER HTMLPAGER CMP CAT COMPRESS
+                                \ DECOMPRESS MANDEFOPTIONS
+                                \ nextgroup=manconfCommand skipwhite
+
+  syn keyword manconfKeyword    contained COMPRESS_EXT
+                                \ nextgroup=manconfExt skipwhite
+
+  syn keyword manconfKeyword    contained MANSECT
+                                \ nextgroup=manconfManSect skipwhite
+
+  syn match   manconfPath       contained display '\S\+'
+
+  syn match   manconfFirstPath  contained display '\S\+'
+                                \ nextgroup=manconfSecondPath skipwhite
+
+  syn match   manconfSecondPath contained display '\S\+'
+
+  syn match   manconfCommand    contained display '\%(/[^/ \t]\+\)\+'
+                                \ nextgroup=manconfCommandOpt skipwhite
+
+  syn match   manconfCommandOpt contained display '\S\+'
+                                \ nextgroup=manconfCommandOpt skipwhite
+
+  syn match   manconfExt        contained display '\.\S\+'
+
+  syn match   manconfManSect    contained '[^:]\+' nextgroup=manconfManSectSep
+
+  syn match   manconfManSectSep contained ':' nextgroup=manconfManSect
+
+  syn match   manconfDecompress contained '\.\S\+'
+                                \ nextgroup=manconfCommand skipwhite
+
+  hi def link manconfBoolean    Boolean
+  hi def link manconfPath       String
+  hi def link manconfFirstPath  manconfPath
+  hi def link manconfSecondPath manconfPath
+  hi def link manconfCommand    String
+  hi def link manconfCommandOpt Special
+  hi def link manconfManSect    Identifier
+  hi def link manconfManSectSep Delimiter
+  hi def link manconfDecompress Type
+endif
+
+hi def link manconfTodo         Todo
+hi def link manconfComment      Comment
+hi def link manconfKeyword      Keyword
+hi def link manconfExt          Type
+
+let b:current_syntax = "manconf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/maple.vim b/syntax/maple.vim
new file mode 100644
index 000000000..1391e3fb7
--- /dev/null
+++ b/syntax/maple.vim
@@ -0,0 +1,626 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'maple') == -1
+
+" Vim syntax file
+" Language:	Maple V (based on release 4)
+" Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Last Change:	Mar 26, 2019
+" Version:	17
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_MAPLE
+"
+" Package Function Selection: {{{1
+" Because there are a lot of packages, and because of the potential for namespace
+" clashes, this version of <maple.vim> needs the user to select which, if any,
+" package functions should be highlighted.  Select your packages and put into your
+" <.vimrc> none or more of the lines following let ...=1 lines:
+"
+"   if exists("mvpkg_all")
+"    ...
+"   endif
+"
+" *OR* let mvpkg_all=1
+
+" This syntax file contains all the keywords and top-level packages of Maple 9.5
+" but only the contents of packages of Maple V Release 4, and the top-level
+" routines of Release 4.  <Jacques Carette - carette@mcmaster.ca>
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Iskeyword Effects: {{{1
+if (v:version == 704 && has("patch-7.4.1142")) || v:version > 704
+ syn iskeyword $,48-57,_,a-z,@-Z
+else
+ setl isk=$,48-57,_,a-z,@-Z
+endif
+
+" Package Selection: {{{1
+" allow user to simply select all packages for highlighting
+if exists("mvpkg_all")
+  let mv_DEtools    = 1
+  let mv_Galois     = 1
+  let mv_GaussInt   = 1
+  let mv_LREtools   = 1
+  let mv_combinat   = 1
+  let mv_combstruct = 1
+  let mv_difforms   = 1
+  let mv_finance    = 1
+  let mv_genfunc    = 1
+  let mv_geometry   = 1
+  let mv_grobner    = 1
+  let mv_group      = 1
+  let mv_inttrans   = 1
+  let mv_liesymm    = 1
+  let mv_linalg     = 1
+  let mv_logic      = 1
+  let mv_networks   = 1
+  let mv_numapprox  = 1
+  let mv_numtheory  = 1
+  let mv_orthopoly  = 1
+  let mv_padic      = 1
+  let mv_plots      = 1
+  let mv_plottools  = 1
+  let mv_powseries  = 1
+  let mv_process    = 1
+  let mv_simplex    = 1
+  let mv_stats      = 1
+  let mv_student    = 1
+  let mv_sumtools   = 1
+  let mv_tensor     = 1
+  let mv_totorder   = 1
+endif
+
+" Parenthesis/curly/brace sanity checker: {{{1
+syn case match
+
+" parenthesis/curly/brace sanity checker
+syn region mvZone	matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" transparent contains=ALLBUT,mvError,mvBraceError,mvCurlyError
+syn region mvZone	matchgroup=Delimiter start="{" matchgroup=Delimiter end="}" transparent contains=ALLBUT,mvError,mvBraceError,mvParenError
+syn region mvZone	matchgroup=Delimiter start="\[" matchgroup=Delimiter end="]" transparent contains=ALLBUT,mvError,mvCurlyError,mvParenError
+syn match  mvError		"[)\]}]"
+syn match  mvBraceError	"[)}]"	contained
+syn match  mvCurlyError	"[)\]]"	contained
+syn match  mvParenError	"[\]}]"	contained
+syn match  mvComma		"[,;:]"
+syn match  mvSemiError	"[;:]"	contained
+syn match  mvDcolon		"::"
+
+" Maple Packages, updated for Maple 9.5
+syn keyword mvPackage	algcurves	ArrayTools	Cache	codegen
+syn keyword mvPackage	CodeGeneration	CodeTools	combinat	combstruct
+syn keyword mvPackage	ContextMenu	CurveFitting	DEtools	diffalg
+syn keyword mvPackage	difforms	DiscreteTransforms	Domains	ExternalCalling
+syn keyword mvPackage	FileTools	finance	GaussInt	genfunc
+syn keyword mvPackage	geom3d	geometry	gfun	Groebner
+syn keyword mvPackage	group	hashmset	IntegerRelations	inttrans
+syn keyword mvPackage	LargeExpressions	LibraryTools	liesymm	linalg
+syn keyword mvPackage	LinearAlgebra	LinearFunctionalSystems	LinearOperators
+syn keyword mvPackage	ListTools	Logic	LREtools	Maplets
+syn keyword mvPackage	MathematicalFunctions	MathML	Matlab
+syn keyword mvPackage	MatrixPolynomialAlgebra	MmaTranslator	networks
+syn keyword mvPackage	numapprox	numtheory	Optimization	OreTools
+syn keyword mvPackage	Ore_algebra	OrthogonalSeries	orthopoly	padic
+syn keyword mvPackage	PDEtools	plots	plottools	PolynomialIdeals
+syn keyword mvPackage	PolynomialTools	powseries	process	QDifferenceEquations
+syn keyword mvPackage	RandomTools	RationalNormalForms	RealDomain	RootFinding
+syn keyword mvPackage	ScientificConstants	ScientificErrorAnalysis	simplex
+syn keyword mvPackage	Slode	SNAP	Sockets	SoftwareMetrics
+syn keyword mvPackage	SolveTools	Spread	stats	StringTools
+syn keyword mvPackage	Student	student	sumtools	SumTools
+syn keyword mvPackage	tensor	TypeTools	Units	VariationalCalculus
+syn keyword mvPackage	VectorCalculus	Worksheet	XMLTools
+
+" Language Support: {{{1
+syn keyword mvTodo	contained	COMBAK	FIXME	TODO	XXX
+if exists("g:mapleversion") && g:mapleversion < 9
+ syn region  mvString	start=+`+ skip=+``+ end=+`+	keepend	contains=mvTodo,@Spell
+ syn region  mvString	start=+"+ skip=+""+ end=+"+	keepend	contains=@Spell
+ syn region  mvDelayEval	start=+'+ end=+'+	keepend contains=ALLBUT,mvError,mvBraceError,mvCurlyError,mvParenError,mvSemiError
+ syn match   mvVarAssign	"[a-zA-Z_][a-zA-Z_0-9]*[ \t]*:=" contains=mvAssign
+ syn match   mvAssign	":="	contained
+else
+ syn region  mvName		start=+`+ skip=+``+ end=+`+	keepend	contains=mvTodo
+ syn region  mvString	start=+"+ skip=+""+ end=+"+	keepend	contains=@Spell
+ syn region  mvDelayEval	start=+'+ end=+'+	keepend contains=ALLBUT,mvError,mvBraceError,mvCurlyError,mvParenError
+ syn match   mvDelim		"[;:]"	display
+ syn match   mvAssign	":="
+endif
+
+" Lower-Priority Operators: {{{1
+syn match mvOper	"\."
+
+" Number handling: {{{1
+syn match mvNumber	"\<\d\+"		" integer
+ syn match mvNumber	"[-+]\=\.\d\+"		" . integer
+syn match mvNumber	"\<\d\+\.\d\+"		" integer . integer
+syn match mvNumber	"\<\d\+\."		" integer .
+syn match mvNumber	"\<\d\+\.\."	contains=mvRange	" integer ..
+
+syn match mvNumber	"\<\d\+e[-+]\=\d\+"		" integer e [-+] integer
+syn match mvNumber	"[-+]\=\.\d\+e[-+]\=\d\+"	" . integer e [-+] integer
+syn match mvNumber	"\<\d\+\.\d*e[-+]\=\d\+"	" integer . [integer] e [-+] integer
+
+syn match mvNumber	"[-+]\d\+"		" integer
+syn match mvNumber	"[-+]\d\+\.\d\+"		" integer . integer
+syn match mvNumber	"[-+]\d\+\."		" integer .
+syn match mvNumber	"[-+]\d\+\.\."	contains=mvRange	" integer ..
+
+syn match mvNumber	"[-+]\d\+e[-+]\=\d\+"	" integer e [-+] integer
+syn match mvNumber	"[-+]\d\+\.\d*e[-+]\=\d\+"	" integer . [integer] e [-+] integer
+
+syn match mvRange	"\.\."
+
+" Operators: {{{1
+syn keyword mvOper	and not or xor implies union intersect subset minus mod
+syn match   mvOper	"<>\|[<>]=\|[<>]\|="
+syn match   mvOper	"&+\|&-\|&\*\|&\/\|&"
+syn match   mvError	"\.\.\."
+
+" MapleV Statements: ? statement {{{1
+
+" MapleV Statements: ? statement
+" Split into booleans, conditionals, operators, repeat-logic, etc
+syn keyword mvBool	true	false	FAIL
+syn keyword mvCond	elif	else	fi	if	then
+syn match   mvCond	"end\s\+if"
+
+syn keyword mvRepeat	by	for	in	to
+syn keyword mvRepeat	do	from	od	while
+syn match   mvRepeat	"end\s\+do"
+
+syn keyword mvSpecial	NULL
+syn match   mvSpecial	"\[\]\|{}"
+
+if exists("g:mapleversion") && g:mapleversion < 9
+ syn keyword mvStatement	Order	fail	options	read	save
+ syn keyword mvStatement	break	local	point	remember	stop
+ syn keyword mvStatement	done	mod	proc	restart	with
+ syn keyword mvStatement	end	mods	quit	return
+ syn keyword mvStatement	error	next
+else
+ syn keyword mvStatement	option	options	read	save
+ syn keyword mvStatement	break	local	remember	stop
+ syn keyword mvStatement	done	mod	proc	restart
+ syn keyword mvStatement	end	mods	quit	return
+ syn keyword mvStatement	error	next	try	catch
+ syn keyword mvStatement	finally	assuming	global	export
+ syn keyword mvStatement	module	description	use
+endif
+
+" Builtin Constants: ? constants {{{1
+syn keyword mvConstant	Catalan	I	gamma	infinity
+syn keyword mvConstant	Pi
+
+" Comments:  DEBUG, if in a comment, is specially highlighted. {{{1
+syn keyword mvDebug	contained	DEBUG
+syn cluster mvCommentGroup	contains=mvTodo,mvDebug,@Spell
+syn match mvComment "#.*$"	contains=@mvCommentGroup
+
+" Basic Library Functions: ? index[function]
+syn keyword mvLibrary $	@	@@	ERROR
+syn keyword mvLibrary AFactor	KelvinHer	arctan	factor	log	rhs
+syn keyword mvLibrary AFactors	KelvinKei	arctanh	factors	log10	root
+syn keyword mvLibrary AiryAi	KelvinKer	argument	fclose	lprint	roots
+syn keyword mvLibrary AiryBi	LambertW	array	feof	map	round
+syn keyword mvLibrary AngerJ	Lcm	assign	fflush	map2	rsolve
+syn keyword mvLibrary Berlekamp	LegendreE	assigned	filepos	match	savelib
+syn keyword mvLibrary BesselI	LegendreEc	asspar	fixdiv	matrix	scanf
+syn keyword mvLibrary BesselJ	LegendreEc1	assume	float	max	searchtext
+syn keyword mvLibrary BesselK	LegendreF	asubs	floor	maximize	sec
+syn keyword mvLibrary BesselY	LegendreKc	asympt	fnormal	maxnorm	sech
+syn keyword mvLibrary Beta	LegendreKc1	attribute	fopen	maxorder	select
+syn keyword mvLibrary C	LegendrePi	bernstein	forget	member	seq
+syn keyword mvLibrary Chi	LegendrePic	branches	fortran	min	series
+syn keyword mvLibrary Ci	LegendrePic1	bspline	fprintf	minimize	setattribute
+syn keyword mvLibrary CompSeq	Li	cat	frac	minpoly	shake
+syn keyword mvLibrary Content	Linsolve	ceil	freeze	modp	showprofile
+syn keyword mvLibrary D	MOLS	chrem	fremove	modp1	showtime
+syn keyword mvLibrary DESol	Maple_floats	close	frontend	modp2	sign
+syn keyword mvLibrary Det	MeijerG	close	fscanf	modpol	signum
+syn keyword mvLibrary Diff	Norm	coeff	fsolve	mods	simplify
+syn keyword mvLibrary Dirac	Normal	coeffs	galois	msolve	sin
+syn keyword mvLibrary DistDeg	Nullspace	coeftayl	gc	mtaylor	singular
+syn keyword mvLibrary Divide	Power	collect	gcd	mul	sinh
+syn keyword mvLibrary Ei	Powmod	combine	gcdex	nextprime	sinterp
+syn keyword mvLibrary Eigenvals	Prem	commutat	genpoly	nops	solve
+syn keyword mvLibrary EllipticCE	Primfield	comparray	harmonic	norm	sort
+syn keyword mvLibrary EllipticCK	Primitive	compoly	has	normal	sparse
+syn keyword mvLibrary EllipticCPi	Primpart	conjugate	hasfun	numboccur	spline
+syn keyword mvLibrary EllipticE	ProbSplit	content	hasoption	numer	split
+syn keyword mvLibrary EllipticF	Product	convergs	hastype	op	splits
+syn keyword mvLibrary EllipticK	Psi	convert	heap	open	sprem
+syn keyword mvLibrary EllipticModulus	Quo	coords	history	optimize	sprintf
+syn keyword mvLibrary EllipticNome	RESol	copy	hypergeom	order	sqrfree
+syn keyword mvLibrary EllipticPi	Randpoly	cos	iFFT	parse	sqrt
+syn keyword mvLibrary Eval	Randprime	cosh	icontent	pclose	sscanf
+syn keyword mvLibrary Expand	Ratrecon	cost	identity	pclose	ssystem
+syn keyword mvLibrary FFT	Re	cot	igcd	pdesolve	stack
+syn keyword mvLibrary Factor	Rem	coth	igcdex	piecewise	sturm
+syn keyword mvLibrary Factors	Resultant	csc	ilcm	plot	sturmseq
+syn keyword mvLibrary FresnelC	RootOf	csch	ilog	plot3d	subs
+syn keyword mvLibrary FresnelS	Roots	csgn	ilog10	plotsetup	subsop
+syn keyword mvLibrary Fresnelf	SPrem	dawson	implicitdiff	pochhammer	substring
+syn keyword mvLibrary Fresnelg	Searchtext	define	indets	pointto	sum
+syn keyword mvLibrary Frobenius	Shi	degree	index	poisson	surd
+syn keyword mvLibrary GAMMA	Si	denom	indexed	polar	symmdiff
+syn keyword mvLibrary GaussAGM	Smith	depends	indices	polylog	symmetric
+syn keyword mvLibrary Gaussejord	Sqrfree	diagonal	inifcn	polynom	system
+syn keyword mvLibrary Gausselim	Ssi	diff	ininame	powmod	table
+syn keyword mvLibrary Gcd	StruveH	dilog	initialize	prem	tan
+syn keyword mvLibrary Gcdex	StruveL	dinterp	insert	prevprime	tanh
+syn keyword mvLibrary HankelH1	Sum	disassemble	int	primpart	testeq
+syn keyword mvLibrary HankelH2	Svd	discont	interface	print	testfloat
+syn keyword mvLibrary Heaviside	TEXT	discrim	interp	printf	thaw
+syn keyword mvLibrary Hermite	Trace	dismantle	invfunc	procbody	thiele
+syn keyword mvLibrary Im	WeberE	divide	invztrans	procmake	time
+syn keyword mvLibrary Indep	WeierstrassP	dsolve	iostatus	product	translate
+syn keyword mvLibrary Interp	WeierstrassPPrime	eliminate	iperfpow	proot	traperror
+syn keyword mvLibrary Inverse	WeierstrassSigma	ellipsoid	iquo	property	trigsubs
+syn keyword mvLibrary Irreduc	WeierstrassZeta	entries	iratrecon	protect	trunc
+syn keyword mvLibrary Issimilar	Zeta	eqn	irem	psqrt	type
+syn keyword mvLibrary JacobiAM	abs	erf	iroot	quo	typematch
+syn keyword mvLibrary JacobiCD	add	erfc	irreduc	radnormal	unames
+syn keyword mvLibrary JacobiCN	addcoords	eulermac	iscont	radsimp	unapply
+syn keyword mvLibrary JacobiCS	addressof	eval	isdifferentiable	rand	unassign
+syn keyword mvLibrary JacobiDC	algebraic	evala	isolate	randomize	unload
+syn keyword mvLibrary JacobiDN	algsubs	evalapply	ispoly	randpoly	unprotect
+syn keyword mvLibrary JacobiDS	alias	evalb	isqrfree	range	updatesR4
+syn keyword mvLibrary JacobiNC	allvalues	evalc	isqrt	rationalize	userinfo
+syn keyword mvLibrary JacobiND	anames	evalf	issqr	ratrecon	value
+syn keyword mvLibrary JacobiNS	antisymm	evalfint	latex	readbytes	vector
+syn keyword mvLibrary JacobiSC	applyop	evalgf	lattice	readdata	verify
+syn keyword mvLibrary JacobiSD	arccos	evalhf	lcm	readlib	whattype
+syn keyword mvLibrary JacobiSN	arccosh	evalm	lcoeff	readline	with
+syn keyword mvLibrary JacobiTheta1	arccot	evaln	leadterm	readstat	writebytes
+syn keyword mvLibrary JacobiTheta2	arccoth	evalr	length	realroot	writedata
+syn keyword mvLibrary JacobiTheta3	arccsc	exp	lexorder	recipoly	writeline
+syn keyword mvLibrary JacobiTheta4	arccsch	expand	lhs	rem	writestat
+syn keyword mvLibrary JacobiZeta	arcsec	expandoff	limit	remove	writeto
+syn keyword mvLibrary KelvinBei	arcsech	expandon	ln	residue	zip
+syn keyword mvLibrary KelvinBer	arcsin	extract	lnGAMMA	resultant	ztrans
+syn keyword mvLibrary KelvinHei	arcsinh
+
+
+" ==  PACKAGES  ======================================================= {{{1
+" Note: highlighting of package functions is now user-selectable by package.
+
+" Package: DEtools     differential equations tools {{{2
+if exists("mv_DEtools")
+  syn keyword mvPkg_DEtools	DEnormal	Dchangevar	autonomous	dfieldplot	reduceOrder	untranslate
+  syn keyword mvPkg_DEtools	DEplot	PDEchangecoords	convertAlg	indicialeq	regularsp	varparam
+  syn keyword mvPkg_DEtools	DEplot3d	PDEplot	convertsys	phaseportrait	translate
+endif
+
+" Package: Domains: create domains of computation {{{2
+if exists("mv_Domains")
+endif
+
+" Package: GF: Galois Fields {{{2
+if exists("mv_GF")
+  syn keyword mvPkg_Galois	galois
+endif
+
+" Package: GaussInt: Gaussian Integers {{{2
+if exists("mv_GaussInt")
+  syn keyword mvPkg_GaussInt	GIbasis	GIfactor	GIissqr	GInorm	GIquadres	GIsmith
+  syn keyword mvPkg_GaussInt	GIchrem	GIfactors	GIlcm	GInormal	GIquo	GIsqrfree
+  syn keyword mvPkg_GaussInt	GIdivisor	GIgcd	GImcmbine	GIorder	GIrem	GIsqrt
+  syn keyword mvPkg_GaussInt	GIfacpoly	GIgcdex	GInearest	GIphi	GIroots	GIunitnormal
+  syn keyword mvPkg_GaussInt	GIfacset	GIhermite	GInodiv	GIprime	GIsieve
+endif
+
+" Package: LREtools: manipulate linear recurrence relations {{{2
+if exists("mv_LREtools")
+  syn keyword mvPkg_LREtools	REcontent	REprimpart	REtodelta	delta	hypergeomsols	ratpolysols
+  syn keyword mvPkg_LREtools	REcreate	REreduceorder	REtoproc	dispersion	polysols	shift
+  syn keyword mvPkg_LREtools	REplot	REtoDE	constcoeffsol
+endif
+
+" Package: combinat: combinatorial functions {{{2
+if exists("mv_combinat")
+  syn keyword mvPkg_combinat	Chi	composition	graycode	numbcomb	permute	randperm
+  syn keyword mvPkg_combinat	bell	conjpart	inttovec	numbcomp	powerset	stirling1
+  syn keyword mvPkg_combinat	binomial	decodepart	lastpart	numbpart	prevpart	stirling2
+  syn keyword mvPkg_combinat	cartprod	encodepart	multinomial	numbperm	randcomb	subsets
+  syn keyword mvPkg_combinat	character	fibonacci	nextpart	partition	randpart	vectoint
+  syn keyword mvPkg_combinat	choose	firstpart
+endif
+
+" Package: combstruct: combinatorial structures {{{2
+if exists("mv_combstruct")
+  syn keyword mvPkg_combstruct	allstructs	draw	iterstructs	options	specification	structures
+  syn keyword mvPkg_combstruct	count	finished	nextstruct
+endif
+
+" Package: difforms: differential forms {{{2
+if exists("mv_difforms")
+  syn keyword mvPkg_difforms	const	defform	formpart	parity	scalarpart	wdegree
+  syn keyword mvPkg_difforms	d	form	mixpar	scalar	simpform	wedge
+endif
+
+" Package: finance: financial mathematics {{{2
+if exists("mv_finance")
+  syn keyword mvPkg_finance	amortization	cashflows	futurevalue	growingperpetuity	mv_finance	presentvalue
+  syn keyword mvPkg_finance	annuity	effectiverate	growingannuity	levelcoupon	perpetuity	yieldtomaturity
+  syn keyword mvPkg_finance	blackscholes
+endif
+
+" Package: genfunc: rational generating functions {{{2
+if exists("mv_genfunc")
+  syn keyword mvPkg_genfunc	rgf_charseq	rgf_expand	rgf_hybrid	rgf_pfrac	rgf_sequence	rgf_term
+  syn keyword mvPkg_genfunc	rgf_encode	rgf_findrecur	rgf_norm	rgf_relate	rgf_simp	termscale
+endif
+
+" Package: geometry: Euclidean geometry {{{2
+if exists("mv_geometry")
+  syn keyword mvPkg_geometry	circle	dsegment	hyperbola	parabola	segment	triangle
+  syn keyword mvPkg_geometry	conic	ellipse	line	point	square
+endif
+
+" Package: grobner: Grobner bases {{{2
+if exists("mv_grobner")
+  syn keyword mvPkg_grobner	finduni	gbasis	leadmon	normalf	solvable	spoly
+  syn keyword mvPkg_grobner	finite	gsolve
+endif
+
+" Package: group: permutation and finitely-presented groups {{{2
+if exists("mv_group")
+  syn keyword mvPkg_group	DerivedS	areconjugate	cosets	grouporder	issubgroup	permrep
+  syn keyword mvPkg_group	LCS	center	cosrep	inter	mulperms	pres
+  syn keyword mvPkg_group	NormalClosure	centralizer	derived	invperm	normalizer	subgrel
+  syn keyword mvPkg_group	RandElement	convert	grelgroup	isabelian	orbit	type
+  syn keyword mvPkg_group	Sylow	core	groupmember	isnormal	permgroup
+endif
+
+" Package: inttrans: integral transforms {{{2
+if exists("mv_inttrans")
+  syn keyword mvPkg_inttrans	addtable	fouriercos	hankel	invfourier	invlaplace	mellin
+  syn keyword mvPkg_inttrans	fourier	fouriersin	hilbert	invhilbert	laplace
+endif
+
+" Package: liesymm: Lie symmetries {{{2
+if exists("mv_liesymm")
+  syn keyword mvPkg_liesymm	&^	TD	depvars	getform	mixpar	vfix
+  syn keyword mvPkg_liesymm	&mod	annul	determine	hasclosure	prolong	wcollect
+  syn keyword mvPkg_liesymm	Eta	autosimp	dvalue	hook	reduce	wdegree
+  syn keyword mvPkg_liesymm	Lie	close	extvars	indepvars	setup	wedgeset
+  syn keyword mvPkg_liesymm	Lrank	d	getcoeff	makeforms	translate	wsubs
+endif
+
+" Package: linalg: Linear algebra {{{2
+if exists("mv_linalg")
+  syn keyword mvPkg_linalg	GramSchmidt	coldim	equal	indexfunc	mulcol	singval
+  syn keyword mvPkg_linalg	JordanBlock	colspace	exponential	innerprod	multiply	smith
+  syn keyword mvPkg_linalg	LUdecomp	colspan	extend	intbasis	norm	stack
+  syn keyword mvPkg_linalg	QRdecomp	companion	ffgausselim	inverse	normalize	submatrix
+  syn keyword mvPkg_linalg	addcol	cond	fibonacci	ismith	orthog	subvector
+  syn keyword mvPkg_linalg	addrow	copyinto	forwardsub	issimilar	permanent	sumbasis
+  syn keyword mvPkg_linalg	adjoint	crossprod	frobenius	iszero	pivot	swapcol
+  syn keyword mvPkg_linalg	angle	curl	gausselim	jacobian	potential	swaprow
+  syn keyword mvPkg_linalg	augment	definite	gaussjord	jordan	randmatrix	sylvester
+  syn keyword mvPkg_linalg	backsub	delcols	geneqns	kernel	randvector	toeplitz
+  syn keyword mvPkg_linalg	band	delrows	genmatrix	laplacian	rank	trace
+  syn keyword mvPkg_linalg	basis	det	grad	leastsqrs	references	transpose
+  syn keyword mvPkg_linalg	bezout	diag	hadamard	linsolve	row	vandermonde
+  syn keyword mvPkg_linalg	blockmatrix	diverge	hermite	matadd	rowdim	vecpotent
+  syn keyword mvPkg_linalg	charmat	dotprod	hessian	matrix	rowspace	vectdim
+  syn keyword mvPkg_linalg	charpoly	eigenval	hilbert	minor	rowspan	vector
+  syn keyword mvPkg_linalg	cholesky	eigenvect	htranspose	minpoly	scalarmul	wronskian
+  syn keyword mvPkg_linalg	col	entermatrix	ihermite
+endif
+
+" Package: logic: Boolean logic {{{2
+if exists("mv_logic")
+  syn keyword mvPkg_logic	MOD2	bsimp	distrib	environ	randbool	tautology
+  syn keyword mvPkg_logic	bequal	canon	dual	frominert	satisfy	toinert
+endif
+
+" Package: networks: graph networks {{{2
+if exists("mv_networks")
+  syn keyword mvPkg_networks	acycpoly	connect	dinic	graph	mincut	show
+  syn keyword mvPkg_networks	addedge	connectivity	djspantree	graphical	mindegree	shrink
+  syn keyword mvPkg_networks	addvertex	contract	dodecahedron	gsimp	neighbors	span
+  syn keyword mvPkg_networks	adjacency	countcuts	draw	gunion	new	spanpoly
+  syn keyword mvPkg_networks	allpairs	counttrees	duplicate	head	octahedron	spantree
+  syn keyword mvPkg_networks	ancestor	cube	edges	icosahedron	outdegree	tail
+  syn keyword mvPkg_networks	arrivals	cycle	ends	incidence	path	tetrahedron
+  syn keyword mvPkg_networks	bicomponents	cyclebase	eweight	incident	petersen	tuttepoly
+  syn keyword mvPkg_networks	charpoly	daughter	flow	indegree	random	vdegree
+  syn keyword mvPkg_networks	chrompoly	degreeseq	flowpoly	induce	rank	vertices
+  syn keyword mvPkg_networks	complement	delete	fundcyc	isplanar	rankpoly	void
+  syn keyword mvPkg_networks	complete	departures	getlabel	maxdegree	shortpathtree	vweight
+  syn keyword mvPkg_networks	components	diameter	girth
+endif
+
+" Package: numapprox: numerical approximation {{{2
+if exists("mv_numapprox")
+  syn keyword mvPkg_numapprox	chebdeg	chebsort	fnorm	laurent	minimax	remez
+  syn keyword mvPkg_numapprox	chebmult	chebyshev	hornerform	laurent	pade	taylor
+  syn keyword mvPkg_numapprox	chebpade	confracform	infnorm	minimax
+endif
+
+" Package: numtheory: number theory {{{2
+if exists("mv_numtheory")
+  syn keyword mvPkg_numtheory	B	cyclotomic	invcfrac	mcombine	nthconver	primroot
+  syn keyword mvPkg_numtheory	F	divisors	invphi	mersenne	nthdenom	quadres
+  syn keyword mvPkg_numtheory	GIgcd	euler	isolve	minkowski	nthnumer	rootsunity
+  syn keyword mvPkg_numtheory	J	factorEQ	isprime	mipolys	nthpow	safeprime
+  syn keyword mvPkg_numtheory	L	factorset	issqrfree	mlog	order	sigma
+  syn keyword mvPkg_numtheory	M	fermat	ithprime	mobius	pdexpand	sq2factor
+  syn keyword mvPkg_numtheory	bernoulli	ifactor	jacobi	mroot	phi	sum2sqr
+  syn keyword mvPkg_numtheory	bigomega	ifactors	kronecker	msqrt	pprimroot	tau
+  syn keyword mvPkg_numtheory	cfrac	imagunit	lambda	nearestp	prevprime	thue
+  syn keyword mvPkg_numtheory	cfracpol	index	legendre	nextprime
+endif
+
+" Package: orthopoly: orthogonal polynomials {{{2
+if exists("mv_orthopoly")
+  syn keyword mvPkg_orthopoly	G	H	L	P	T	U
+endif
+
+" Package: padic: p-adic numbers {{{2
+if exists("mv_padic")
+  syn keyword mvPkg_padic	evalp	function	orderp	ratvaluep	rootp	valuep
+  syn keyword mvPkg_padic	expansion	lcoeffp	ordp
+endif
+
+" Package: plots: graphics package {{{2
+if exists("mv_plots")
+  syn keyword mvPkg_plots	animate	coordplot3d	gradplot3d	listplot3d	polarplot	setoptions3d
+  syn keyword mvPkg_plots	animate3d	cylinderplot	implicitplot	loglogplot	polygonplot	spacecurve
+  syn keyword mvPkg_plots	changecoords	densityplot	implicitplot3d	logplot	polygonplot3d	sparsematrixplot
+  syn keyword mvPkg_plots	complexplot	display	inequal	matrixplot	polyhedraplot	sphereplot
+  syn keyword mvPkg_plots	complexplot3d	display3d	listcontplot	odeplot	replot	surfdata
+  syn keyword mvPkg_plots	conformal	fieldplot	listcontplot3d	pareto	rootlocus	textplot
+  syn keyword mvPkg_plots	contourplot	fieldplot3d	listdensityplot	pointplot	semilogplot	textplot3d
+  syn keyword mvPkg_plots	contourplot3d	gradplot	listplot	pointplot3d	setoptions	tubeplot
+  syn keyword mvPkg_plots	coordplot
+endif
+
+" Package: plottools: basic graphical objects {{{2
+if exists("mv_plottools")
+  syn keyword mvPkg_plottools	arc	curve	dodecahedron	hyperbola	pieslice	semitorus
+  syn keyword mvPkg_plottools	arrow	cutin	ellipse	icosahedron	point	sphere
+  syn keyword mvPkg_plottools	circle	cutout	ellipticArc	line	polygon	tetrahedron
+  syn keyword mvPkg_plottools	cone	cylinder	hemisphere	octahedron	rectangle	torus
+  syn keyword mvPkg_plottools	cuboid	disk	hexahedron
+endif
+
+" Package: powseries: formal power series {{{2
+if exists("mv_powseries")
+  syn keyword mvPkg_powseries	compose	multiply	powcreate	powlog	powsolve	reversion
+  syn keyword mvPkg_powseries	evalpow	negative	powdiff	powpoly	powsqrt	subtract
+  syn keyword mvPkg_powseries	inverse	powadd	powexp	powseries	quotient	tpsform
+  syn keyword mvPkg_powseries	multconst	powcos	powint	powsin
+endif
+
+" Package: process: (Unix)-multi-processing {{{2
+if exists("mv_process")
+  syn keyword mvPkg_process	block	fork	pclose	pipe	popen	wait
+  syn keyword mvPkg_process	exec	kill
+endif
+
+" Package: simplex: linear optimization {{{2
+if exists("mv_simplex")
+  syn keyword mvPkg_simplex	NONNEGATIVE	cterm	dual	maximize	pivoteqn	setup
+  syn keyword mvPkg_simplex	basis	define_zero	equality	minimize	pivotvar	standardize
+  syn keyword mvPkg_simplex	convexhull	display	feasible	pivot	ratio
+endif
+
+" Package: stats: statistics {{{2
+if exists("mv_stats")
+  syn keyword mvPkg_stats	anova	describe	fit	random	statevalf	statplots
+endif
+
+" Package: student: student calculus {{{2
+if exists("mv_student")
+  syn keyword mvPkg_student	D	Product	distance	isolate	middlesum	rightsum
+  syn keyword mvPkg_student	Diff	Sum	equate	leftbox	midpoint	showtangent
+  syn keyword mvPkg_student	Doubleint	Tripleint	extrema	leftsum	minimize	simpson
+  syn keyword mvPkg_student	Int	changevar	integrand	makeproc	minimize	slope
+  syn keyword mvPkg_student	Limit	combine	intercept	maximize	powsubs	trapezoid
+  syn keyword mvPkg_student	Lineint	completesquare	intparts	middlebox	rightbox	value
+  syn keyword mvPkg_student	Point
+endif
+
+" Package: sumtools: indefinite and definite sums {{{2
+if exists("mv_sumtools")
+  syn keyword mvPkg_sumtools	Hypersum	extended_gosper	hyperrecursion	hyperterm	sumrecursion	sumtohyper
+  syn keyword mvPkg_sumtools	Sumtohyper	gosper	hypersum	simpcomb
+endif
+
+" Package: tensor: tensor computations and General Relativity {{{2
+if exists("mv_tensor")
+  syn keyword mvPkg_tensor	Christoffel1	Riemann	connexF	display_allGR	get_compts	partial_diff
+  syn keyword mvPkg_tensor	Christoffel2	RiemannF	contract	dual	get_rank	permute_indices
+  syn keyword mvPkg_tensor	Einstein	Weyl	convertNP	entermetric	invars	petrov
+  syn keyword mvPkg_tensor	Jacobian	act	cov_diff	exterior_diff	invert	prod
+  syn keyword mvPkg_tensor	Killing_eqns	antisymmetrize	create	exterior_prod	lin_com	raise
+  syn keyword mvPkg_tensor	Levi_Civita	change_basis	d1metric	frame	lower	symmetrize
+  syn keyword mvPkg_tensor	Lie_diff	commutator	d2metric	geodesic_eqns	npcurve	tensorsGR
+  syn keyword mvPkg_tensor	Ricci	compare	directional_diff	get_char	npspin	transform
+  syn keyword mvPkg_tensor	Ricciscalar	conj	displayGR
+endif
+
+" Package: totorder: total orders on names {{{2
+if exists("mv_totorder")
+  syn keyword mvPkg_totorder	forget	init	ordering	tassume	tis
+endif
+" =====================================================================
+
+" Highlighting: Define the default highlighting. {{{1
+" Only when an item doesn't have highlighting yet
+if !exists("skip_maplev_syntax_inits")
+
+  " Maple->Maple Links {{{2
+  hi def link mvBraceError	mvError
+  hi def link mvCurlyError	mvError
+  hi def link mvDebug		mvTodo
+  hi def link mvParenError	mvError
+  hi def link mvPkg_DEtools	mvPkgFunc
+  hi def link mvPkg_Galois	mvPkgFunc
+  hi def link mvPkg_GaussInt	mvPkgFunc
+  hi def link mvPkg_LREtools	mvPkgFunc
+  hi def link mvPkg_combinat	mvPkgFunc
+  hi def link mvPkg_combstruct	mvPkgFunc
+  hi def link mvPkg_difforms	mvPkgFunc
+  hi def link mvPkg_finance	mvPkgFunc
+  hi def link mvPkg_genfunc	mvPkgFunc
+  hi def link mvPkg_geometry	mvPkgFunc
+  hi def link mvPkg_grobner	mvPkgFunc
+  hi def link mvPkg_group	mvPkgFunc
+  hi def link mvPkg_inttrans	mvPkgFunc
+  hi def link mvPkg_liesymm	mvPkgFunc
+  hi def link mvPkg_linalg	mvPkgFunc
+  hi def link mvPkg_logic	mvPkgFunc
+  hi def link mvPkg_networks	mvPkgFunc
+  hi def link mvPkg_numapprox	mvPkgFunc
+  hi def link mvPkg_numtheory	mvPkgFunc
+  hi def link mvPkg_orthopoly	mvPkgFunc
+  hi def link mvPkg_padic	mvPkgFunc
+  hi def link mvPkg_plots	mvPkgFunc
+  hi def link mvPkg_plottools	mvPkgFunc
+  hi def link mvPkg_powseries	mvPkgFunc
+  hi def link mvPkg_process	mvPkgFunc
+  hi def link mvPkg_simplex	mvPkgFunc
+  hi def link mvPkg_stats	mvPkgFunc
+  hi def link mvPkg_student	mvPkgFunc
+  hi def link mvPkg_sumtools	mvPkgFunc
+  hi def link mvPkg_tensor	mvPkgFunc
+  hi def link mvPkg_totorder	mvPkgFunc
+  hi def link mvRange		mvOper
+  hi def link mvSemiError	mvError
+  hi def link mvDelim		Delimiter
+
+  " Maple->Standard Links {{{2
+  hi def link mvAssign		Delimiter
+  hi def link mvBool		Boolean
+  hi def link mvComma		Delimiter
+  hi def link mvComment		Comment
+  hi def link mvCond		Conditional
+  hi def link mvConstant		Number
+  hi def link mvDelayEval	Label
+  hi def link mvDcolon		Delimiter
+  hi def link mvError		Error
+  hi def link mvLibrary		Statement
+  hi def link mvNumber		Number
+  hi def link mvOper		Operator
+  hi def link mvAssign		Delimiter
+  hi def link mvPackage		Type
+  hi def link mvPkgFunc		Function
+  hi def link mvPktOption	Special
+  hi def link mvRepeat		Repeat
+  hi def link mvSpecial		Special
+  hi def link mvStatement	Statement
+  hi def link mvName		String
+  hi def link mvString		String
+  hi def link mvTodo		Todo
+
+endif
+
+" Current Syntax: {{{1
+let b:current_syntax = "maple"
+" vim: ts=20 fdm=marker
+
+endif
diff --git a/syntax/master.vim b/syntax/master.vim
new file mode 100644
index 000000000..a13b4c635
--- /dev/null
+++ b/syntax/master.vim
@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'master') == -1
+
+" Vim syntax file
+" Language:	Focus Master File
+" Maintainer:	Rob Brady <robb@datatone.com>
+" Last Change:	$Date: 2004/06/13 15:54:03 $
+" URL: http://www.datatone.com/~robb/vim/syntax/master.vim
+" $Revision: 1.1 $
+
+" this is a very simple syntax file - I will be improving it
+" add entire DEFINE syntax
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+" A bunch of useful keywords
+syn keyword masterKeyword	FILENAME SUFFIX SEGNAME SEGTYPE PARENT FIELDNAME
+syn keyword masterKeyword	FIELD ALIAS USAGE INDEX MISSING ON
+syn keyword masterKeyword	FORMAT CRFILE CRKEY
+syn keyword masterDefine	DEFINE DECODE EDIT
+syn region  masterString	start=+"+  end=+"+
+syn region  masterString	start=+'+  end=+'+
+syn match   masterComment	"\$.*"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link masterKeyword Keyword
+hi def link masterComment Comment
+hi def link masterString  String
+
+
+let b:current_syntax = "master"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/mel.vim b/syntax/mel.vim
new file mode 100644
index 000000000..f06355e1f
--- /dev/null
+++ b/syntax/mel.vim
@@ -0,0 +1,112 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mel') == -1
+
+" Vim syntax file
+" Language:	MEL (Maya Extension Language)
+" Maintainer:	Robert Minsk <egbert@centropolisfx.com>
+" Last Change:	May 27 1999
+" Based on:	Bram Moolenaar <Bram@vim.org> C syntax file
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" when wanted, highlight trailing white space and spaces before tabs
+if exists("mel_space_errors")
+  sy match	melSpaceError	"\s\+$"
+  sy match	melSpaceError	" \+\t"me=e-1
+endif
+
+" A bunch of usefull MEL keyworks
+sy keyword	melBoolean	true false yes no on off
+
+sy keyword	melFunction	proc
+sy match	melIdentifier	"\$\(\a\|_\)\w*"
+
+sy keyword	melStatement	break continue return
+sy keyword	melConditional	if else switch
+sy keyword	melRepeat	while for do in
+sy keyword	melLabel	case default
+sy keyword	melOperator	size eval env exists whatIs
+sy keyword	melKeyword	alias
+sy keyword	melException	catch error warning
+
+sy keyword	melInclude	source
+
+sy keyword	melType		int float string vector matrix
+sy keyword	melStorageClass	global
+
+sy keyword	melDebug	trace
+
+sy keyword	melTodo		contained TODO FIXME XXX
+
+" MEL data types
+sy match	melCharSpecial	contained "\\[ntr\\"]"
+sy match	melCharError	contained "\\[^ntr\\"]"
+
+sy region	melString	start=+"+ skip=+\\"+ end=+"+ contains=melCharSpecial,melCharError
+
+sy case ignore
+sy match	melInteger	"\<\d\+\(e[-+]\=\d\+\)\=\>"
+sy match	melFloat	"\<\d\+\(e[-+]\=\d\+\)\=f\>"
+sy match	melFloat	"\<\d\+\.\d*\(e[-+]\=\d\+\)\=f\=\>"
+sy match	melFloat	"\.\d\+\(e[-+]\=\d\+\)\=f\=\>"
+sy case match
+
+sy match	melCommaSemi	contained "[,;]"
+sy region	melMatrixVector	start=/<</ end=/>>/ contains=melInteger,melFloat,melIdentifier,melCommaSemi
+
+sy cluster	melGroup	contains=melFunction,melStatement,melConditional,melLabel,melKeyword,melStorageClass,melTODO,melCharSpecial,melCharError,melCommaSemi
+
+" catch errors caused by wrong parenthesis
+sy region	melParen	transparent start='(' end=')' contains=ALLBUT,@melGroup,melParenError,melInParen
+sy match	melParenError	")"
+sy match	melInParen	contained "[{}]"
+
+" comments
+sy region	melComment	start="/\*" end="\*/" contains=melTodo,melSpaceError
+sy match	melComment	"//.*" contains=melTodo,melSpaceError
+sy match	melCommentError "\*/"
+
+sy region	melQuestionColon matchgroup=melConditional transparent start='?' end=':' contains=ALLBUT,@melGroup
+
+if !exists("mel_minlines")
+  let mel_minlines=15
+endif
+exec "sy sync ccomment melComment minlines=" . mel_minlines
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link melBoolean	Boolean
+hi def link melFunction	Function
+hi def link melIdentifier	Identifier
+hi def link melStatement	Statement
+hi def link melConditional Conditional
+hi def link melRepeat	Repeat
+hi def link melLabel	Label
+hi def link melOperator	Operator
+hi def link melKeyword	Keyword
+hi def link melException	Exception
+hi def link melInclude	Include
+hi def link melType	Type
+hi def link melStorageClass StorageClass
+hi def link melDebug	Debug
+hi def link melTodo	Todo
+hi def link melCharSpecial SpecialChar
+hi def link melString	String
+hi def link melInteger	Number
+hi def link melFloat	Float
+hi def link melMatrixVector Float
+hi def link melComment	Comment
+hi def link melError	Error
+hi def link melSpaceError	melError
+hi def link melCharError	melError
+hi def link melParenError	melError
+hi def link melInParen	melError
+hi def link melCommentError melError
+
+
+let b:current_syntax = "mel"
+
+endif
diff --git a/syntax/messages.vim b/syntax/messages.vim
new file mode 100644
index 000000000..50819a1e1
--- /dev/null
+++ b/syntax/messages.vim
@@ -0,0 +1,77 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'messages') == -1
+
+" Vim syntax file
+" Language:         /var/log/messages file
+" Maintainer:       Yakov Lerner <iler.ml@gmail.com>
+" Latest Revision:  2008-06-29
+" Changes:          2008-06-29 support for RFC3339 tuimestamps James Vega
+" 		    2016 Jan 19: messagesDate changed by Bram
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match   messagesBegin       display '^' nextgroup=messagesDate,messagesDateRFC3339
+
+syn match   messagesDate        contained display '[[:lower:][:upper:]][[:lower:][:upper:]][[:lower:][:upper:]] [ 0-9]\d *'
+                                \ nextgroup=messagesHour
+
+syn match   messagesHour        contained display '\d\d:\d\d:\d\d\s*'
+                                \ nextgroup=messagesHost
+
+syn match   messagesDateRFC3339 contained display '\d\{4}-\d\d-\d\d'
+                                \ nextgroup=messagesRFC3339T
+
+syn match   messagesRFC3339T    contained display '\cT'
+                                \ nextgroup=messagesHourRFC3339
+
+syn match   messagesHourRFC3339 contained display '\c\d\d:\d\d:\d\d\(\.\d\+\)\=\([+-]\d\d:\d\d\|Z\)'
+                                \ nextgroup=messagesHost
+
+syn match   messagesHost        contained display '\S*\s*'
+                                \ nextgroup=messagesLabel
+
+syn match   messagesLabel       contained display '\s*[^:]*:\s*'
+                                \ nextgroup=messagesText contains=messagesKernel,messagesPID
+
+syn match   messagesPID         contained display '\[\zs\d\+\ze\]'
+
+syn match   messagesKernel      contained display 'kernel:'
+
+
+syn match   messagesIP          '\d\+\.\d\+\.\d\+\.\d\+'
+
+syn match   messagesURL         '\w\+://\S\+'
+
+syn match   messagesText        contained display '.*'
+                                \ contains=messagesNumber,messagesIP,messagesURL,messagesError
+
+syn match   messagesNumber      contained '0x[0-9a-fA-F]*\|\[<[0-9a-f]\+>\]\|\<\d[0-9a-fA-F]*'
+
+syn match   messagesError       contained '\c.*\<\(FATAL\|ERROR\|ERRORS\|FAILED\|FAILURE\).*'
+
+
+hi def link messagesDate        Constant
+hi def link messagesHour        Type
+hi def link messagesDateRFC3339 Constant
+hi def link messagesHourRFC3339 Type
+hi def link messagesRFC3339T    Normal
+hi def link messagesHost        Identifier
+hi def link messagesLabel       Operator
+hi def link messagesPID         Constant
+hi def link messagesKernel      Special
+hi def link messagesError       ErrorMsg
+hi def link messagesIP          Constant
+hi def link messagesURL         Underlined
+hi def link messagesText        Normal
+hi def link messagesNumber      Number
+
+let b:current_syntax = "messages"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/mf.vim b/syntax/mf.vim
new file mode 100644
index 000000000..916da2f27
--- /dev/null
+++ b/syntax/mf.vim
@@ -0,0 +1,299 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mf') == -1
+
+" Vim syntax file
+" Language:           METAFONT
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Andreas Scherer <andreas.scherer@pobox.com>
+" Last Change:        2016 Oct 1
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn iskeyword @,_
+
+" METAFONT 'primitives' as defined in chapter 25 of 'The METAFONTbook'
+" Page 210: 'boolean expressions'
+syn keyword mfBoolExp        and charexists false known not odd or true unknown
+
+" Page 210: 'numeric expression'
+syn keyword mfNumExp         ASCII angle cosd directiontime floor hex length
+syn keyword mfNumExp         mexp mlog normaldeviate oct sind sqrt totalweight
+syn keyword mfNumExp         turningnumber uniformdeviate xpart xxpart xypart
+syn keyword mfNumExp         ypart yxpart yypart
+
+" Page 211: 'internal quantities'
+syn keyword mfInternal       autorounding boundarychar charcode chardp chardx
+syn keyword mfInternal       chardy charext charht charic charwd day designsize
+syn keyword mfInternal       fillin fontmaking granularity hppp jobname month
+syn keyword mfInternal       pausing proofing showstopping smoothing time
+syn keyword mfInternal       tracingcapsules tracingchoices tracingcommands
+syn keyword mfInternal       tracingedges tracingequations tracingmacros
+syn keyword mfInternal       tracingonline tracingoutput tracingpens
+syn keyword mfInternal       tracingrestores tracingspecs tracingstats
+syn keyword mfInternal       tracingtitles turningcheck vppp warningcheck
+syn keyword mfInternal       xoffset year yoffset
+
+" Page 212: 'pair expressions'
+syn keyword mfPairExp        of penoffset point postcontrol precontrol rotated
+syn keyword mfPairExp        scaled shifted slanted transformed xscaled yscaled
+syn keyword mfPairExp        zscaled
+
+" Page 213: 'path expressions'
+syn keyword mfPathExp        atleast controls curl cycle makepath reverse
+syn keyword mfPathExp        subpath tension
+
+" Page 214: 'pen expressions'
+syn keyword mfPenExp         makepen nullpen pencircle
+
+" Page 214: 'picture expressions'
+syn keyword mfPicExp         nullpicture
+
+" Page 214: 'string expressions'
+syn keyword mfStringExp      char decimal readstring str substring
+
+" Page 217: 'commands and statements'
+syn keyword mfCommand        addto also at batchmode contour cull delimiters
+syn keyword mfCommand        display doublepath dropping dump end errhelp
+syn keyword mfCommand        errmessage errorstopmode everyjob from interim
+syn keyword mfCommand        inwindow keeping let message newinternal
+syn keyword mfCommand        nonstopmode numspecial openwindow outer randomseed
+syn keyword mfCommand        save scrollmode shipout show showdependencies
+syn keyword mfCommand        showstats showtoken showvariable special to withpen
+syn keyword mfCommand        withweight
+
+" Page 56: 'types'
+syn keyword mfType           boolean numeric pair path pen picture string
+syn keyword mfType           transform
+
+" Page 155: 'grouping'
+syn keyword mfStatement      begingroup endgroup
+
+" Page 165: 'definitions'
+syn keyword mfDefinition     def enddef expr primary primarydef secondary
+syn keyword mfDefinition     secondarydef suffix tertiary tertiarydef text
+syn keyword mfDefinition     vardef
+
+" Page 169: 'conditions and loops'
+syn keyword mfCondition      else elseif endfor exitif fi for forever
+syn keyword mfCondition      forsuffixes if step until
+
+" Other primitives listed in the index
+syn keyword mfPrimitive      charlist endinput expandafter extensible fontdimen
+syn keyword mfPrimitive      headerbyte inner input intersectiontimes kern
+syn keyword mfPrimitive      ligtable quote scantokens skipto
+
+" Implicit suffix parameters
+syn match   mfSuffixParam    "@#\|#@\|@"
+
+" These are just tags, but given their special status, we
+" highlight them as variables
+syn keyword mfVariable       x y
+
+" Keywords defined by plain.mf (defined on pp.262-278)
+if get(g:, "plain_mf_macros", 1)
+  syn keyword mfDef          addto_currentpicture beginchar capsule_def
+  syn keyword mfDef          change_width clear_pen_memory clearit clearpen
+  syn keyword mfDef          clearxy culldraw cullit cutdraw
+  syn keyword mfDef          define_blacker_pixels define_corrected_pixels
+  syn keyword mfDef          define_good_x_pixels define_good_y_pixels
+  syn keyword mfDef          define_horizontal_corrected_pixels define_pixels
+  syn keyword mfDef          define_whole_blacker_pixels define_whole_pixels
+  syn keyword mfDef          define_whole_vertical_blacker_pixels
+  syn keyword mfDef          define_whole_vertical_pixels downto draw drawdot
+  syn keyword mfDef          endchar erase exitunless fill filldraw fix_units
+  syn keyword mfDef          flex font_coding_scheme font_extra_space
+  syn keyword mfDef          font_identifier font_normal_shrink
+  syn keyword mfDef          font_normal_space font_normal_stretch font_quad
+  syn keyword mfDef          font_size font_slant font_x_height gfcorners gobble
+  syn keyword mfDef          hide imagerules interact italcorr killtext
+  syn keyword mfDef          loggingall lowres_fix makebox makegrid maketicks
+  syn keyword mfDef          mode_def mode_setup nodisplays notransforms numtok
+  syn keyword mfDef          openit penrazor pensquare penstroke pickup
+  syn keyword mfDef          proofoffset proofrule range reflectedabout
+  syn keyword mfDef          rotatedaround screenchars screenrule screenstrokes
+  syn keyword mfDef          shipit showit smode stop superellipse takepower
+  syn keyword mfDef          tracingall tracingnone undraw undrawdot unfill
+  syn keyword mfDef          unfilldraw upto z
+  syn match   mfDef          "???"
+  syn keyword mfVardef       bot byte ceiling counterclockwise cutoff decr dir
+  syn keyword mfVardef       direction directionpoint grayfont hround incr
+  syn keyword mfVardef       interpath inverse labelfont labels lft magstep
+  " Note: nodot is not a vardef, it is used as in makelabel.lft.nodot("5",z5)
+  " (METAFONT only)
+  syn keyword mfVardef       makelabel max min nodot penlabels penpos
+  syn keyword mfVardef       proofrulethickness round rt savepen slantfont solve
+  syn keyword mfVardef       tensepath titlefont top unitvector vround whatever
+  syn match   mpVardef       "\<good\.\%(x\|y\|lft\|rt\|top\|bot\)\>"
+  syn keyword mfPrimaryDef   div dotprod gobbled mod
+  syn keyword mfSecondaryDef intersectionpoint
+  syn keyword mfTertiaryDef  softjoin thru
+  syn keyword mfNewInternal  blacker currentwindow displaying eps epsilon
+  syn keyword mfNewInternal  infinity join_radius number_of_modes o_correction
+  syn keyword mfNewInternal  pen_bot pen_lft pen_rt pen_top pixels_per_inch
+  syn keyword mfNewInternal  screen_cols screen_rows tolerance
+  " Predefined constants
+  syn keyword mfConstant     base_name base_version blankpicture ditto down
+  syn keyword mfConstant     fullcircle halfcircle identity left lowres origin
+  syn keyword mfConstant     penspeck proof quartercircle right rulepen smoke
+  syn keyword mfConstant     unitpixel unitsquare up
+  " Other predefined variables
+  syn keyword mfVariable     aspect_ratio currentpen extra_beginchar
+  syn keyword mfVariable     extra_endchar currentpen_path currentpicture
+  syn keyword mfVariable     currenttransform d extra_setup h localfont mag mode
+  syn keyword mfVariable     mode_name w
+  " let statements:
+  syn keyword mfnumExp       abs
+  syn keyword mfPairExp      rotatedabout
+  syn keyword mfCommand      bye relax
+endif
+
+" By default, METAFONT loads modes.mf, too
+if get(g:, "plain_mf_modes", 1)
+  syn keyword mfConstant     APSSixMed AgfaFourZeroZero AgfaThreeFourZeroZero
+  syn keyword mfConstant     AtariNineFive AtariNineSix AtariSLMEightZeroFour
+  syn keyword mfConstant     AtariSMOneTwoFour CItohEightFiveOneZero
+  syn keyword mfConstant     CItohThreeOneZero CanonBJCSixZeroZero CanonCX
+  syn keyword mfConstant     CanonEX CanonLBPLX CanonLBPTen CanonSX ChelgraphIBX
+  syn keyword mfConstant     CompugraphicEightSixZeroZero
+  syn keyword mfConstant     CompugraphicNineSixZeroZero DD DEClarge DECsmall
+  syn keyword mfConstant     DataDiscNew EightThree EpsonAction
+  syn keyword mfConstant     EpsonLQFiveZeroZeroLo EpsonLQFiveZeroZeroMed
+  syn keyword mfConstant     EpsonMXFX EpsonSQEightSevenZero EpsonStylusPro
+  syn keyword mfConstant     EpsonStylusProHigh EpsonStylusProLow
+  syn keyword mfConstant     EpsonStylusProMed FourFour GThreefax HPDeskJet
+  syn keyword mfConstant     HPLaserJetIIISi IBMFourTwoFiveZero IBMFourTwoOneSix
+  syn keyword mfConstant     IBMFourTwoThreeZero IBMFourZeroOneNine
+  syn keyword mfConstant     IBMFourZeroThreeNine IBMFourZeroTwoNine
+  syn keyword mfConstant     IBMProPrinter IBMSixOneFiveFour IBMSixSixSevenZero
+  syn keyword mfConstant     IBMThreeEightOneTwo IBMThreeEightTwoZero
+  syn keyword mfConstant     IBMThreeOneNineThree IBMThreeOneSevenNine
+  syn keyword mfConstant     IBMUlfHolleberg LASevenFive LNOthreR LNOthree
+  syn keyword mfConstant     LNZeroOne LNZeroThree LPSFourZero LPSTwoZero
+  syn keyword mfConstant     LexmarkFourZeroThreeNine LexmarkOptraR
+  syn keyword mfConstant     LexmarkOptraS LinotypeLThreeThreeZero
+  syn keyword mfConstant     LinotypeOneZeroZero LinotypeOneZeroZeroLo
+  syn keyword mfConstant     LinotypeThreeZeroZeroHi MacTrueSize NeXTprinter
+  syn keyword mfConstant     NeXTscreen NecTwoZeroOne Newgen NineOne
+  syn keyword mfConstant     OCESixSevenFiveZeroPS OneTwoZero OneZeroZero
+  syn keyword mfConstant     PrintwareSevenTwoZeroIQ Prism QMSOneSevenTwoFive
+  syn keyword mfConstant     QMSOneSevenZeroZero QMSTwoFourTwoFive RicohA
+  syn keyword mfConstant     RicohFortyEighty RicohFourZeroEightZero RicohLP
+  syn keyword mfConstant     SparcPrinter StarNLOneZero VAXstation VTSix
+  syn keyword mfConstant     VarityperFiveZeroSixZeroW
+  syn keyword mfConstant     VarityperFourThreeZeroZeroHi
+  syn keyword mfConstant     VarityperFourThreeZeroZeroLo
+  syn keyword mfConstant     VarityperFourTwoZeroZero VarityperSixZeroZero
+  syn keyword mfConstant     XeroxDocutech XeroxEightSevenNineZero
+  syn keyword mfConstant     XeroxFourZeroFiveZero XeroxNineSevenZeroZero
+  syn keyword mfConstant     XeroxPhaserSixTwoZeroZeroDP XeroxThreeSevenZeroZero
+  syn keyword mfConstant     Xerox_world agfafzz agfatfzz amiga aps apssixhi
+  syn keyword mfConstant     aselect atariezf atarinf atarins atariotf bitgraph
+  syn keyword mfConstant     bjtenex bjtzzex bjtzzl bjtzzs boise canonbjc
+  syn keyword mfConstant     canonex canonlbp cg cgl cgnszz citohtoz corona crs
+  syn keyword mfConstant     cthreeten cx datadisc declarge decsmall deskjet
+  syn keyword mfConstant     docutech dover dp dpdfezzz eighthre elvira epscszz
+  syn keyword mfConstant     epsdraft epsdrft epsdrftl epsfast epsfastl epshi
+  syn keyword mfConstant     epslo epsmed epsmedl epson epsonact epsonfx epsonl
+  syn keyword mfConstant     epsonlo epsonlol epsonlq epsonsq epstylus epstylwr
+  syn keyword mfConstant     epstyplo epstypmd epstypml epstypro epswlo epswlol
+  syn keyword mfConstant     esphi fourfour gpx gtfax gtfaxhi gtfaxl gtfaxlo
+  syn keyword mfConstant     gtfaxlol help hifax highfax hplaser hprugged ibm_a
+  syn keyword mfConstant     ibmd ibmega ibmegal ibmfzon ibmfztn ibmpp ibmppl
+  syn keyword mfConstant     ibmsoff ibmteot ibmtetz ibmtont ibmtosn ibmtosnl
+  syn keyword mfConstant     ibmvga ibx imagen imagewriter itoh itohl itohtoz
+  syn keyword mfConstant     itohtozl iw jetiiisi kyocera laserjet laserjetfive
+  syn keyword mfConstant     laserjetfivemp laserjetfour laserjetfourthousand
+  syn keyword mfConstant     laserjetfourzerozerozero laserjethi laserjetlo
+  syn keyword mfConstant     laserjettwoonezerozero
+  syn keyword mfConstant     laserjettwoonezerozerofastres lasermaster
+  syn keyword mfConstant     laserwriter lasf lexmarkr lexmarks lexmarku
+  syn keyword mfConstant     linohalf linohi linolo linolttz linoone linosuper
+  syn keyword mfConstant     linothree linothreelo linotzzh ljfive ljfivemp
+  syn keyword mfConstant     ljfour ljfzzz ljfzzzfr ljlo ljtozz ljtozzfr lmaster
+  syn keyword mfConstant     lnotr lnzo lps lpstz lqhires lqlores lqmed lqmedl
+  syn keyword mfConstant     lqmedres lview lviewl lwpro macmag mactrue modes_mf
+  syn keyword mfConstant     ncd nec nechi neclm nectzo newdd newddl nexthi
+  syn keyword mfConstant     nextscreen nextscrn nineone nullmode ocessfz
+  syn keyword mfConstant     okidata okidatal okifourten okifte okihi onetz
+  syn keyword mfConstant     onezz pcprevw pcscreen phaser phaserfs phasertf
+  syn keyword mfConstant     phasertfl phasertl pixpt printware prntware
+  syn keyword mfConstant     proprinter qms qmsesz qmsostf qmsoszz qmstftf ricoh
+  syn keyword mfConstant     ricoha ricohlp ricohsp sherpa sparcptr starnlt
+  syn keyword mfConstant     starnltl styletwo stylewr stylewri stylewriter sun
+  syn keyword mfConstant     supre swtwo toshiba ultre varityper vs vtftzz
+  syn keyword mfConstant     vtftzzhi vtftzzlo vtfzszw vtszz xpstzz xpstzzl
+  syn keyword mfConstant     xrxesnz xrxfzfz xrxnszz xrxtszz
+  syn keyword mfDef          BCPL_string coding_scheme font_face_byte
+  syn keyword mfDef          font_family landscape
+  syn keyword mfDef          mode_extra_info mode_help mode_param
+  syn keyword mfNewInternal  blacker_min
+endif
+
+" Some other basic macro names, e.g., from cmbase, logo, etc.
+if get(g:, "other_mf_macros", 1)
+  syn keyword mfDef          beginlogochar
+  syn keyword mfDef          font_setup
+  syn keyword mfPrimitive    generate
+endif
+
+" Numeric tokens
+syn match     mfNumeric      "[-]\=\d\+"
+syn match     mfNumeric      "[-]\=\.\d\+"
+syn match     mfNumeric      "[-]\=\d\+\.\d\+"
+
+" METAFONT lengths
+syn match     mfLength       "\<\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\>"
+syn match     mfLength       "[-]\=\d\+\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\#\="
+syn match     mfLength       "[-]\=\.\d\+\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\#\="
+syn match     mfLength       "[-]\=\d\+\.\d\+\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\#\="
+
+" String constants
+syn match     mfOpenString   /"[^"]*/
+syn region    mfString       oneline keepend start=+"+ end=+"+
+
+" Comments:
+syn keyword   mfTodoComment  contained TODO FIXME XXX DEBUG NOTE
+syn match     mfComment      "%.*$" contains=mfTodoComment,@Spell
+
+" synchronizing
+syn sync maxlines=50
+
+" Define the default highlighting
+hi def link mfBoolExp      Statement
+hi def link mfNumExp       Statement
+hi def link mfPairExp      Statement
+hi def link mfPathExp      Statement
+hi def link mfPenExp       Statement
+hi def link mfPicExp       Statement
+hi def link mfStringExp    Statement
+hi def link mfInternal     Identifier
+hi def link mfCommand      Statement
+hi def link mfType         Type
+hi def link mfStatement    Statement
+hi def link mfDefinition   Statement
+hi def link mfCondition    Conditional
+hi def link mfPrimitive    Statement
+hi def link mfDef          Function
+hi def link mfVardef       mfDef
+hi def link mfPrimaryDef   mfDef
+hi def link mfSecondaryDef mfDef
+hi def link mfTertiaryDef  mfDef
+hi def link mfCoord        Identifier
+hi def link mfPoint        Identifier
+hi def link mfNumeric      Number
+hi def link mfLength       Number
+hi def link mfComment      Comment
+hi def link mfString       String
+hi def link mfOpenString   Todo
+hi def link mfSuffixParam  Label
+hi def link mfNewInternal  mfInternal
+hi def link mfVariable     Identifier
+hi def link mfConstant     Constant
+hi def link mfTodoComment  Todo
+
+let b:current_syntax = "mf"
+
+" vim:sw=2
+
+endif
diff --git a/syntax/mgl.vim b/syntax/mgl.vim
new file mode 100644
index 000000000..72f4be371
--- /dev/null
+++ b/syntax/mgl.vim
@@ -0,0 +1,121 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mgl') == -1
+
+" Vim syntax file
+" Language:	MGL
+" Version: 1.0
+" Last Change:	2006 Feb 21
+" Maintainer:  Gero Kuhlmann <gero@gkminix.han.de>
+"
+" $Id: mgl.vim,v 1.1 2006/02/21 22:08:20 vimboss Exp $
+"
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+
+syn sync lines=250
+
+syn keyword mglBoolean		true false
+syn keyword mglConditional	if else then
+syn keyword mglConstant		nil
+syn keyword mglPredefined	maxint
+syn keyword mglLabel		case goto label
+syn keyword mglOperator		to downto in of with
+syn keyword mglOperator		and not or xor div mod
+syn keyword mglRepeat		do for repeat while to until
+syn keyword mglStatement	procedure function break continue return restart
+syn keyword mglStatement	program begin end const var type
+syn keyword mglStruct		record
+syn keyword mglType		integer string char boolean char ipaddr array
+
+
+" String
+if !exists("mgl_one_line_string")
+  syn region  mglString matchgroup=mglString start=+'+ end=+'+ contains=mglStringEscape
+  syn region  mglString matchgroup=mglString start=+"+ end=+"+ contains=mglStringEscapeGPC
+else
+  "wrong strings
+  syn region  mglStringError matchgroup=mglStringError start=+'+ end=+'+ end=+$+ contains=mglStringEscape
+  syn region  mglStringError matchgroup=mglStringError start=+"+ end=+"+ end=+$+ contains=mglStringEscapeGPC
+  "right strings
+  syn region  mglString matchgroup=mglString start=+'+ end=+'+ oneline contains=mglStringEscape
+  syn region  mglString matchgroup=mglString start=+"+ end=+"+ oneline contains=mglStringEscapeGPC
+end
+syn match   mglStringEscape	contained "''"
+syn match   mglStringEscapeGPC	contained '""'
+
+
+if exists("mgl_symbol_operator")
+  syn match   mglSymbolOperator		"[+\-/*=\%]"
+  syn match   mglSymbolOperator		"[<>]=\="
+  syn match   mglSymbolOperator		"<>"
+  syn match   mglSymbolOperator		":="
+  syn match   mglSymbolOperator		"[()]"
+  syn match   mglSymbolOperator		"\.\."
+  syn match   mglMatrixDelimiter	"(."
+  syn match   mglMatrixDelimiter	".)"
+  syn match   mglMatrixDelimiter	"[][]"
+endif
+
+syn match  mglNumber	"-\=\<\d\+\>"
+syn match  mglHexNumber	"\$[0-9a-fA-F]\+\>"
+syn match  mglCharacter	"\#[0-9]\+\>"
+syn match  mglIpAddr	"[0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\>"
+
+syn region mglComment	start="(\*"  end="\*)"
+syn region mglComment	start="{"  end="}"
+syn region mglComment	start="//"  end="$"
+
+if !exists("mgl_no_functions")
+  syn keyword mglFunction	dispose new
+  syn keyword mglFunction	get load print select
+  syn keyword mglFunction	odd pred succ
+  syn keyword mglFunction	chr ord abs sqr
+  syn keyword mglFunction	exit
+  syn keyword mglOperator	at timeout
+endif
+
+
+syn region mglPreProc	start="(\*\$"  end="\*)"
+syn region mglPreProc	start="{\$"  end="}"
+
+syn keyword mglException	try except raise
+syn keyword mglPredefined	exception
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link mglBoolean		Boolean
+hi def link mglComment		Comment
+hi def link mglConditional		Conditional
+hi def link mglConstant		Constant
+hi def link mglException		Exception
+hi def link mglFunction		Function
+hi def link mglLabel		Label
+hi def link mglMatrixDelimiter	Identifier
+hi def link mglNumber		Number
+hi def link mglHexNumber		Number
+hi def link mglCharacter		Number
+hi def link mglIpAddr		Number
+hi def link mglOperator		Operator
+hi def link mglPredefined		mglFunction
+hi def link mglPreProc		PreProc
+hi def link mglRepeat		Repeat
+hi def link mglStatement		Statement
+hi def link mglString		String
+hi def link mglStringEscape	Special
+hi def link mglStringEscapeGPC	Special
+hi def link mglStringError		Error
+hi def link mglStruct		mglStatement
+hi def link mglSymbolOperator	mglOperator
+hi def link mglType		Type
+
+
+
+let b:current_syntax = "mgl"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/mgp.vim b/syntax/mgp.vim
new file mode 100644
index 000000000..3ba57850f
--- /dev/null
+++ b/syntax/mgp.vim
@@ -0,0 +1,73 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mgp') == -1
+
+" Vim syntax file
+" Language:     mgp - MaGic Point
+" Maintainer:   Gerfried Fuchs <alfie@ist.org>
+" Filenames:    *.mgp
+" Last Change:  25 Apr 2001
+" URL:		http://alfie.ist.org/vim/syntax/mgp.vim
+"
+" Comments are very welcome - but please make sure that you are commenting on
+" the latest version of this file.
+" SPAM is _NOT_ welcome - be ready to be reported!
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+
+syn match mgpLineSkip "\\$"
+
+" all the commands that are currently recognized
+syn keyword mgpCommand contained size fore back bgrad left leftfill center
+syn keyword mgpCommand contained right shrink lcutin rcutin cont xfont vfont
+syn keyword mgpCommand contained tfont tmfont tfont0 bar image newimage
+syn keyword mgpCommand contained prefix icon bimage default tab vgap hgap
+syn keyword mgpCommand contained pause mark again system filter endfilter
+syn keyword mgpCommand contained vfcap tfdir deffont font embed endembed
+syn keyword mgpCommand contained noop pcache include
+
+" charset is not yet supported :-)
+" syn keyword mgpCommand contained charset
+
+syn region mgpFile     contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match mgpValue     contained "\d\+"
+syn match mgpSize      contained "\d\+x\d\+"
+syn match mgpLine      +^%.*$+ contains=mgpCommand,mgpFile,mgpSize,mgpValue
+
+" Comments
+syn match mgpPercent   +^%%.*$+
+syn match mgpHash      +^#.*$+
+
+" these only work alone
+syn match mgpPage      +^%page$+
+syn match mgpNoDefault +^%nodefault$+
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link mgpLineSkip	Special
+
+hi def link mgpHash	mgpComment
+hi def link mgpPercent	mgpComment
+hi def link mgpComment	Comment
+
+hi def link mgpCommand	Identifier
+
+hi def link mgpLine	Type
+
+hi def link mgpFile	String
+hi def link mgpSize	Number
+hi def link mgpValue	Number
+
+hi def link mgpPage	mgpDefine
+hi def link mgpNoDefault	mgpDefine
+hi def link mgpDefine	Define
+
+
+let b:current_syntax = "mgp"
+
+endif
diff --git a/syntax/mib.vim b/syntax/mib.vim
new file mode 100644
index 000000000..5a9d4f120
--- /dev/null
+++ b/syntax/mib.vim
@@ -0,0 +1,61 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mib') == -1
+
+" Vim syntax file
+" Language:        Vim syntax file for SNMPv1 and SNMPv2 MIB and SMI files
+" Maintainer:      Martin Smat <msmat@post.cz>
+" Original Author: David Pascoe <pascoedj@spamcop.net>
+" Written:     	   Wed Jan 28 14:37:23 GMT--8:00 1998
+" Last Changed:    Mon Mar 23 2010
+
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword=@,48-57,_,128-167,224-235,-
+
+syn keyword mibImplicit ACCESS ANY AUGMENTS BEGIN BIT BITS BOOLEAN CHOICE
+syn keyword mibImplicit COMPONENTS CONTACT-INFO DEFINITIONS DEFVAL
+syn keyword mibImplicit DESCRIPTION DISPLAY-HINT END ENTERPRISE EXTERNAL FALSE
+syn keyword mibImplicit FROM GROUP IMPLICIT IMPLIED IMPORTS INDEX
+syn keyword mibImplicit LAST-UPDATED MANDATORY-GROUPS MAX-ACCESS
+syn keyword mibImplicit MIN-ACCESS MODULE MODULE-COMPLIANCE MODULE-IDENTITY
+syn keyword mibImplicit NOTIFICATION-GROUP NOTIFICATION-TYPE NOTIFICATIONS
+syn keyword mibImplicit NULL OBJECT-GROUP OBJECT-IDENTITY OBJECT-TYPE
+syn keyword mibImplicit OBJECTS OF OPTIONAL ORGANIZATION REFERENCE
+syn keyword mibImplicit REVISION SEQUENCE SET SIZE STATUS SYNTAX
+syn keyword mibImplicit TEXTUAL-CONVENTION TRAP-TYPE TRUE UNITS VARIABLES
+syn keyword mibImplicit WRITE-SYNTAX
+syn keyword mibValue accessible-for-notify current DisplayString
+syn keyword mibValue deprecated mandatory not-accessible obsolete optional
+syn keyword mibValue read-create read-only read-write write-only INTEGER
+syn keyword mibValue Counter Gauge IpAddress OCTET STRING experimental mib-2
+syn keyword mibValue TimeTicks RowStatus TruthValue UInteger32 snmpModules
+syn keyword mibValue Integer32 Counter32 TestAndIncr TimeStamp InstancePointer
+syn keyword mibValue OBJECT IDENTIFIER Gauge32 AutonomousType Counter64
+syn keyword mibValue PhysAddress TimeInterval MacAddress StorageType RowPointer
+syn keyword mibValue TDomain TAddress ifIndex
+
+" Epilogue SMI extensions
+syn keyword mibEpilogue FORCE-INCLUDE EXCLUDE cookie get-function set-function
+syn keyword mibEpilogue test-function get-function-async set-function-async
+syn keyword mibEpilogue test-function-async next-function next-function-async
+syn keyword mibEpilogue leaf-name
+syn keyword mibEpilogue DEFAULT contained
+
+syn match  mibOperator  "::="
+syn match  mibComment   "\ *--.\{-}\(--\|$\)"
+syn match  mibNumber    "\<['0-9a-fA-FhH]*\>"
+syn region mibDescription start="\"" end="\"" contains=DEFAULT
+
+hi def link mibImplicit	     Statement
+hi def link mibOperator      Statement
+hi def link mibComment       Comment
+hi def link mibConstants     String
+hi def link mibNumber        Number
+hi def link mibDescription   Identifier
+hi def link mibEpilogue	     SpecialChar
+hi def link mibValue         Structure
+
+let b:current_syntax = "mib"
+
+endif
diff --git a/syntax/mix.vim b/syntax/mix.vim
new file mode 100644
index 000000000..59a92f7c7
--- /dev/null
+++ b/syntax/mix.vim
@@ -0,0 +1,88 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mix') == -1
+
+" Vim syntax file
+" Language:	MIX (Donald Knuth's assembly language used in TAOCP)
+" Maintainer:	Wu Yongwei <wuyongwei@gmail.com>
+" Filenames:	*.mixal *.mix
+" Last Change:  2017-11-26 15:21:36 +0800
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case ignore
+
+" Special processing of ALF directive: implementations vary whether quotation
+" marks are needed
+syn match mixAlfParam		#\s\{1,2\}"\?[^"]\{,5\}"\?# contains=mixString nextgroup=mixEndComment contained
+
+" Region for parameters
+syn match mixParam		#[-+*/:=0-9a-z,()"]\+# contains=mixIdentifier,mixSpecial,mixNumber,mixString,mixLabel nextgroup=mixEndComment contained
+
+" Comment at the line end
+syn match mixEndComment		".*" contains=mixRegister contained
+
+" Identifier; must go before literals
+syn match mixIdentifier		"[a-z0-9_]\+" contained
+
+" Literals
+syn match mixSpecial		"[-+*/:=]" contained
+syn match mixNumber		"[0-9]\+\>" contained
+syn region mixString		start=+"+ skip=+\\"+ end=+"+ contained
+
+" Labels
+syn match mixLabel		"^[a-z0-9_]\{,10\}\s\+" nextgroup=mixAlfSpecial,mixOpcode,mixDirective
+syn match mixLabel		"[0-9][BF]" contained
+
+" Comments
+syn match mixComment		"^\*.*" contains=mixRegister
+
+" Directives
+syn keyword mixDirective 	ORIG EQU CON END nextgroup=mixParam contained skipwhite
+syn keyword mixDirective 	ALF nextgroup=mixAlfParam contained
+
+" Opcodes
+syn keyword mixOpcode	NOP HLT NUM CHAR FLOT FIX nextgroup=mixEndComment contained
+syn keyword mixOpcode	FADD FSUB FMUL FDIV FCMP MOVE ADD SUB MUL DIV IOC IN OUT JRED JBUS JMP JSJ JOV JNOV JL JE JG JLE JNE JGE SLA SRA SLAX SRAX SLC SRC nextgroup=mixParam contained skipwhite
+syn keyword mixOpcode	SLB SRB JAE JAO JXE JXO nextgroup=mixParam contained skipwhite
+
+syn match mixOpcode	"LD[AX1-6]N\?\>" nextgroup=mixParam contained skipwhite
+syn match mixOpcode	"ST[AX1-6JZ]\>" nextgroup=mixParam contained skipwhite
+syn match mixOpcode	"EN[TN][AX1-6]\>" nextgroup=mixParam contained skipwhite
+syn match mixOpcode	"INC[AX1-6]\>" nextgroup=mixParam contained skipwhite
+syn match mixOpcode	"DEC[AX1-6]\>" nextgroup=mixParam contained skipwhite
+syn match mixOpcode	"CMP[AX1-6]\>" nextgroup=mixParam contained skipwhite
+syn match mixOpcode	"J[AX1-6]N\?[NZP]\>" nextgroup=mixParam contained skipwhite
+
+" Switch back to being case sensitive
+syn case match
+
+" Registers (only to be used in comments now)
+syn keyword mixRegister	rA rX rI1 rI2 rI3 rI4 rI5 rI6 rJ contained
+
+" The default highlighting
+hi def link mixRegister		Special
+hi def link mixLabel		Define
+hi def link mixComment		Comment
+hi def link mixEndComment	Comment
+hi def link mixDirective	Keyword
+hi def link mixOpcode		Keyword
+
+hi def link mixSpecial		Special
+hi def link mixNumber		Number
+hi def link mixString		String
+hi def link mixAlfParam		String
+hi def link mixIdentifier	Identifier
+
+let b:current_syntax = "mix"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8
+
+endif
diff --git a/syntax/mmp.vim b/syntax/mmp.vim
new file mode 100644
index 000000000..9ed55a97f
--- /dev/null
+++ b/syntax/mmp.vim
@@ -0,0 +1,53 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mmp') == -1
+
+" Vim syntax file
+" Language:	Symbian meta-makefile definition (MMP)
+" Maintainer:	Ron Aaron <ron@ronware.org>
+" Last Change:	2007/11/07
+" URL: http://ronware.org/wiki/vim/mmp
+" Filetypes:	*.mmp
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+syn match mmpComment	"//.*"
+syn region mmpComment start="/\*" end="\*\/"
+
+syn keyword mmpKeyword	aif asspabi assplibrary aaspexports baseaddress
+syn keyword mmpKeyword	debuglibrary deffile document epocheapsize
+syn keyword mmpKeyword	epocprocesspriority epocstacksize exportunfrozen
+syn keyword mmpStorage	lang library linkas macro nostrictdef option
+syn keyword mmpStorage	resource source sourcepath srcdbg startbitmap
+syn keyword mmpStorage	start end staticlibrary strictdepend systeminclude
+syn keyword mmpStorage	systemresource target targettype targetpath uid
+syn keyword mmpStorage	userinclude win32_library
+
+syn match mmpIfdef	"\#\(include\|ifdef\|ifndef\|if\|endif\|else\|elif\)"
+
+syn match   mmpNumber	"\d+"
+syn match   mmpNumber	"0x\x\+"
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+if !exists("did_mmp_syntax_inits")
+  let did_mmp_syntax_inits=1
+
+  hi def link mmpComment	Comment
+  hi def link mmpKeyword	Keyword
+  hi def link mmpStorage	StorageClass
+  hi def link mmpString	String
+  hi def link mmpNumber	Number
+  hi def link mmpOrdinal	Operator
+  hi def link mmpIfdef	PreCondit
+endif
+
+let b:current_syntax = "mmp"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/modconf.vim b/syntax/modconf.vim
new file mode 100644
index 000000000..42b0e97d9
--- /dev/null
+++ b/syntax/modconf.vim
@@ -0,0 +1,48 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'modconf') == -1
+
+" Vim syntax file
+" Language:             modules.conf(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-10-25
+
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword+=-
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword modconfTodo         FIXME TODO XXX NOTE
+
+syn region  modconfComment      start='#' skip='\\$' end='$'
+                                \ contains=modconfTodo,@Spell
+
+syn keyword modconfConditional  if else elseif endif
+
+syn keyword modconfPreProc      alias define include keep prune
+                                \ post-install post-remove pre-install
+                                \ pre-remove persistdir blacklist
+
+syn keyword modconfKeyword      add above below install options probe probeall
+                                \ remove
+
+syn keyword modconfIdentifier   depfile insmod_opt path generic_stringfile
+                                \ pcimapfile isapnpmapfile usbmapfile
+                                \ parportmapfile ieee1394mapfile pnpbiosmapfile
+syn match   modconfIdentifier   'path\[[^]]\+\]'
+
+hi def link modconfTodo         Todo
+hi def link modconfComment      Comment
+hi def link modconfConditional  Conditional
+hi def link modconfPreProc      PreProc
+hi def link modconfKeyword      Keyword
+hi def link modconfIdentifier   Identifier
+
+let b:current_syntax = "modconf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/modula2.vim b/syntax/modula2.vim
new file mode 100644
index 000000000..3f0bf04af
--- /dev/null
+++ b/syntax/modula2.vim
@@ -0,0 +1,77 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'modula2') == -1
+
+" Vim syntax file
+" Language:	Modula 2
+" Maintainer:	pf@artcom0.north.de (Peter Funk)
+"   based on original work of Bram Moolenaar <Bram@vim.org>
+" Last Change:	2001 May 09
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Don't ignore case (Modula-2 is case significant). This is the default in vim
+
+" Especially emphasize headers of procedures and modules:
+syn region modula2Header matchgroup=modula2Header start="PROCEDURE " end="(" contains=modula2Ident oneline
+syn region modula2Header matchgroup=modula2Header start="MODULE " end=";" contains=modula2Ident oneline
+syn region modula2Header matchgroup=modula2Header start="BEGIN (\*" end="\*)" contains=modula2Ident oneline
+syn region modula2Header matchgroup=modula2Header start="END " end=";" contains=modula2Ident oneline
+syn region modula2Keyword start="END" end=";" contains=ALLBUT,modula2Ident oneline
+
+" Some very important keywords which should be emphasized more than others:
+syn keyword modula2AttKeyword CONST EXIT HALT RETURN TYPE VAR
+" All other keywords in alphabetical order:
+syn keyword modula2Keyword AND ARRAY BY CASE DEFINITION DIV DO ELSE
+syn keyword modula2Keyword ELSIF EXPORT FOR FROM IF IMPLEMENTATION IMPORT
+syn keyword modula2Keyword IN LOOP MOD NOT OF OR POINTER QUALIFIED RECORD
+syn keyword modula2Keyword SET THEN TO UNTIL WHILE WITH
+
+syn keyword modula2Type ADDRESS BITSET BOOLEAN CARDINAL CHAR INTEGER REAL WORD
+syn keyword modula2StdFunc ABS CAP CHR DEC EXCL INC INCL ORD SIZE TSIZE VAL
+syn keyword modula2StdConst FALSE NIL TRUE
+" The following may be discussed, since NEW and DISPOSE are some kind of
+" special builtin macro functions:
+syn keyword modula2StdFunc NEW DISPOSE
+" The following types are added later on and may be missing from older
+" Modula-2 Compilers (they are at least missing from the original report
+" by N.Wirth from March 1980 ;-)  Highlighting should apply nevertheless:
+syn keyword modula2Type BYTE LONGCARD LONGINT LONGREAL PROC SHORTCARD SHORTINT
+" same note applies to min and max, which were also added later to m2:
+syn keyword modula2StdFunc MAX MIN
+" The underscore was originally disallowed in m2 ids, it was also added later:
+syn match   modula2Ident " [A-Z,a-z][A-Z,a-z,0-9,_]*" contained
+
+" Comments may be nested in Modula-2:
+syn region modula2Comment start="(\*" end="\*)" contains=modula2Comment,modula2Todo
+syn keyword modula2Todo	contained TODO FIXME XXX
+
+" Strings
+syn region modula2String start=+"+ end=+"+
+syn region modula2String start="'" end="'"
+syn region modula2Set start="{" end="}"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link modula2Ident		Identifier
+hi def link modula2StdConst	Boolean
+hi def link modula2Type		Identifier
+hi def link modula2StdFunc		Identifier
+hi def link modula2Header		Type
+hi def link modula2Keyword		Statement
+hi def link modula2AttKeyword	PreProc
+hi def link modula2Comment		Comment
+" The following is just a matter of taste (you want to try this instead):
+" hi modula2Comment term=bold ctermfg=DarkBlue guifg=Blue gui=bold
+hi def link modula2Todo		Todo
+hi def link modula2String		String
+hi def link modula2Set		String
+
+
+let b:current_syntax = "modula2"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/modula3.vim b/syntax/modula3.vim
new file mode 100644
index 000000000..520d8ac5f
--- /dev/null
+++ b/syntax/modula3.vim
@@ -0,0 +1,63 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'modula3') == -1
+
+" Vim syntax file
+" Language:	Modula-3
+" Maintainer:	Timo Pedersen <dat97tpe@ludat.lth.se>
+" Last Change:	2001 May 10
+
+" Basic things only...
+" Based on the modula 2 syntax file
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Modula-3 is case-sensitive
+" syn case ignore
+
+" Modula-3 keywords
+syn keyword modula3Keyword ABS ADDRES ADR ADRSIZE AND ANY
+syn keyword modula3Keyword ARRAY AS BITS BITSIZE BOOLEAN BRANDED BY BYTESIZE
+syn keyword modula3Keyword CARDINAL CASE CEILING CHAR CONST DEC DEFINITION
+syn keyword modula3Keyword DISPOSE DIV
+syn keyword modula3Keyword EVAL EXIT EXCEPT EXCEPTION
+syn keyword modula3Keyword EXIT EXPORTS EXTENDED FALSE FINALLY FIRST FLOAT
+syn keyword modula3Keyword FLOOR FROM GENERIC IMPORT
+syn keyword modula3Keyword IN INC INTEGER ISTYPE LAST LOCK
+syn keyword modula3Keyword LONGREAL LOOPHOLE MAX METHOD MIN MOD MUTEX
+syn keyword modula3Keyword NARROW NEW NIL NOT NULL NUMBER OF OR ORD RAISE
+syn keyword modula3Keyword RAISES READONLY REAL RECORD REF REFANY
+syn keyword modula3Keyword RETURN ROOT
+syn keyword modula3Keyword ROUND SET SUBARRAY TEXT TRUE TRUNC TRY TYPE
+syn keyword modula3Keyword TYPECASE TYPECODE UNSAFE UNTRACED VAL VALUE VAR WITH
+
+" Special keywords, block delimiters etc
+syn keyword modula3Block PROCEDURE FUNCTION MODULE INTERFACE REPEAT THEN
+syn keyword modula3Block BEGIN END OBJECT METHODS OVERRIDES RECORD REVEAL
+syn keyword modula3Block WHILE UNTIL DO TO IF FOR ELSIF ELSE LOOP
+
+" Comments
+syn region modula3Comment start="(\*" end="\*)"
+
+" Strings
+syn region modula3String start=+"+ end=+"+
+syn region modula3String start=+'+ end=+'+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default methods for highlighting.  Can be overridden later
+hi def link modula3Keyword	Statement
+hi def link modula3Block		PreProc
+hi def link modula3Comment	Comment
+hi def link modula3String		String
+
+
+let b:current_syntax = "modula3"
+
+"I prefer to use this...
+"set ai
+"vim: ts=8
+
+endif
diff --git a/syntax/monk.vim b/syntax/monk.vim
new file mode 100644
index 000000000..af828968d
--- /dev/null
+++ b/syntax/monk.vim
@@ -0,0 +1,221 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'monk') == -1
+
+" Vim syntax file
+" Language: Monk (See-Beyond Technologies)
+" Maintainer: Mike Litherland <litherm@ccf.org>
+" Last Change: 2012 Feb 03 by Thilo Six
+
+" This syntax file is good enough for my needs, but others
+" may desire more features.  Suggestions and bug reports
+" are solicited by the author (above).
+
+" Originally based on the Scheme syntax file by:
+
+" Maintainer:	Dirk van Deun <dvandeun@poboxes.com>
+" Last Change:	April 30, 1998
+
+" In fact it's almost identical. :)
+
+" The original author's notes:
+" This script incorrectly recognizes some junk input as numerals:
+" parsing the complete system of Scheme numerals using the pattern
+" language is practically impossible: I did a lax approximation.
+
+" Initializing:
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case ignore
+
+" Fascist highlighting: everything that doesn't fit the rules is an error...
+
+syn match	monkError	oneline    ![^ \t()";]*!
+syn match	monkError	oneline    ")"
+
+" Quoted and backquoted stuff
+
+syn region monkQuoted matchgroup=Delimiter start="['`]" end=![ \t()";]!me=e-1 contains=ALLBUT,monkStruc,monkSyntax,monkFunc
+
+syn region monkQuoted matchgroup=Delimiter start="['`](" matchgroup=Delimiter end=")" contains=ALLBUT,monkStruc,monkSyntax,monkFunc
+syn region monkQuoted matchgroup=Delimiter start="['`]#(" matchgroup=Delimiter end=")" contains=ALLBUT,monkStruc,monkSyntax,monkFunc
+
+syn region monkStrucRestricted matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" contains=ALLBUT,monkStruc,monkSyntax,monkFunc
+syn region monkStrucRestricted matchgroup=Delimiter start="#(" matchgroup=Delimiter end=")" contains=ALLBUT,monkStruc,monkSyntax,monkFunc
+
+syn region monkUnquote matchgroup=Delimiter start="," end=![ \t()";]!me=e-1 contains=ALLBUT,monkStruc,monkSyntax,monkFunc
+syn region monkUnquote matchgroup=Delimiter start=",@" end=![ \t()";]!me=e-1 contains=ALLBUT,monkStruc,monkSyntax,monkFunc
+
+syn region monkUnquote matchgroup=Delimiter start=",(" end=")" contains=ALLBUT,monkStruc,monkSyntax,monkFunc
+syn region monkUnquote matchgroup=Delimiter start=",@(" end=")" contains=ALLBUT,monkStruc,monkSyntax,monkFunc
+
+syn region monkUnquote matchgroup=Delimiter start=",#(" end=")" contains=ALLBUT,monkStruc,monkSyntax,monkFunc
+syn region monkUnquote matchgroup=Delimiter start=",@#(" end=")" contains=ALLBUT,monkStruc,monkSyntax,monkFunc
+
+" R5RS Scheme Functions and Syntax:
+
+setlocal iskeyword=33,35-39,42-58,60-90,94,95,97-122,126,_
+
+syn keyword monkSyntax lambda and or if cond case define let let* letrec
+syn keyword monkSyntax begin do delay set! else =>
+syn keyword monkSyntax quote quasiquote unquote unquote-splicing
+syn keyword monkSyntax define-syntax let-syntax letrec-syntax syntax-rules
+
+syn keyword monkFunc not boolean? eq? eqv? equal? pair? cons car cdr set-car!
+syn keyword monkFunc set-cdr! caar cadr cdar cddr caaar caadr cadar caddr
+syn keyword monkFunc cdaar cdadr cddar cdddr caaaar caaadr caadar caaddr
+syn keyword monkFunc cadaar cadadr caddar cadddr cdaaar cdaadr cdadar cdaddr
+syn keyword monkFunc cddaar cddadr cdddar cddddr null? list? list length
+syn keyword monkFunc append reverse list-ref memq memv member assq assv assoc
+syn keyword monkFunc symbol? symbol->string string->symbol number? complex?
+syn keyword monkFunc real? rational? integer? exact? inexact? = < > <= >=
+syn keyword monkFunc zero? positive? negative? odd? even? max min + * - / abs
+syn keyword monkFunc quotient remainder modulo gcd lcm numerator denominator
+syn keyword monkFunc floor ceiling truncate round rationalize exp log sin cos
+syn keyword monkFunc tan asin acos atan sqrt expt make-rectangular make-polar
+syn keyword monkFunc real-part imag-part magnitude angle exact->inexact
+syn keyword monkFunc inexact->exact number->string string->number char=?
+syn keyword monkFunc char-ci=? char<? char-ci<? char>? char-ci>? char<=?
+syn keyword monkFunc char-ci<=? char>=? char-ci>=? char-alphabetic? char?
+syn keyword monkFunc char-numeric? char-whitespace? char-upper-case?
+syn keyword monkFunc char-lower-case?
+syn keyword monkFunc char->integer integer->char char-upcase char-downcase
+syn keyword monkFunc string? make-string string string-length string-ref
+syn keyword monkFunc string-set! string=? string-ci=? string<? string-ci<?
+syn keyword monkFunc string>? string-ci>? string<=? string-ci<=? string>=?
+syn keyword monkFunc string-ci>=? substring string-append vector? make-vector
+syn keyword monkFunc vector vector-length vector-ref vector-set! procedure?
+syn keyword monkFunc apply map for-each call-with-current-continuation
+syn keyword monkFunc call-with-input-file call-with-output-file input-port?
+syn keyword monkFunc output-port? current-input-port current-output-port
+syn keyword monkFunc open-input-file open-output-file close-input-port
+syn keyword monkFunc close-output-port eof-object? read read-char peek-char
+syn keyword monkFunc write display newline write-char call/cc
+syn keyword monkFunc list-tail string->list list->string string-copy
+syn keyword monkFunc string-fill! vector->list list->vector vector-fill!
+syn keyword monkFunc force with-input-from-file with-output-to-file
+syn keyword monkFunc char-ready? load transcript-on transcript-off eval
+syn keyword monkFunc dynamic-wind port? values call-with-values
+syn keyword monkFunc monk-report-environment null-environment
+syn keyword monkFunc interaction-environment
+
+" Keywords specific to STC's implementation
+
+syn keyword monkFunc $event-clear $event-parse $event->string $make-event-map
+syn keyword monkFunc $resolve-event-definition change-pattern copy copy-strip
+syn keyword monkFunc count-data-children count-map-children count-rep data-map
+syn keyword monkFunc duplicate duplicate-strip file-check file-lookup get
+syn keyword monkFunc insert list-lookup node-has-data? not-verify path?
+syn keyword monkFunc path-defined-as-repeating? path-nodeclear path-nodedepth
+syn keyword monkFunc path-nodename path-nodeparentname path->string path-valid?
+syn keyword monkFunc regex string->path timestamp uniqueid verify
+
+" Keywords from the Monk function library (from e*Gate 4.1 programmers ref)
+syn keyword monkFunc allcap? capitalize char-punctuation? char-substitute
+syn keyword monkFunc char-to-char conv count-used-children degc->degf
+syn keyword monkFunc diff-two-dates display-error empty-string? fail_id
+syn keyword monkFunc fail_id_if fail_translation fail_translation_if
+syn keyword monkFunc find-get-after find-get-before get-timestamp julian-date?
+syn keyword monkFunc julian->standard leap-year? map-string not-empty-string?
+syn keyword monkFunc standard-date? standard->julian string-begins-with?
+syn keyword monkFunc string-contains? string-ends-with? string-search-from-left
+syn keyword monkFunc string-search-from-right string->ssn strip-punct
+syn keyword monkFunc strip-string substring=? symbol-table-get symbol-table-put
+syn keyword monkFunc trim-string-left trim-string-right valid-decimal?
+syn keyword monkFunc valid-integer? verify-type
+
+" Writing out the complete description of Scheme numerals without
+" using variables is a day's work for a trained secretary...
+" This is a useful lax approximation:
+
+syn match	monkNumber	oneline    "[-#+0-9.][-#+/0-9a-f@i.boxesfdl]*"
+syn match	monkError	oneline    ![-#+0-9.][-#+/0-9a-f@i.boxesfdl]*[^-#+/0-9a-f@i.boxesfdl \t()";][^ \t()";]*!
+
+syn match	monkOther	oneline    ![+-][ \t()";]!me=e-1
+syn match	monkOther	oneline    ![+-]$!
+" ... so that a single + or -, inside a quoted context, would not be
+" interpreted as a number (outside such contexts, it's a monkFunc)
+
+syn match	monkDelimiter	oneline    !\.[ \t()";]!me=e-1
+syn match	monkDelimiter	oneline    !\.$!
+" ... and a single dot is not a number but a delimiter
+
+" Simple literals:
+
+syn match	monkBoolean	oneline    "#[tf]"
+syn match	monkError	oneline    !#[tf][^ \t()";]\+!
+
+syn match	monkChar	oneline    "#\\"
+syn match	monkChar	oneline    "#\\."
+syn match	monkError	oneline    !#\\.[^ \t()";]\+!
+syn match	monkChar	oneline    "#\\space"
+syn match	monkError	oneline    !#\\space[^ \t()";]\+!
+syn match	monkChar	oneline    "#\\newline"
+syn match	monkError	oneline    !#\\newline[^ \t()";]\+!
+
+" This keeps all other stuff unhighlighted, except *stuff* and <stuff>:
+
+syn match	monkOther	oneline    ,[a-z!$%&*/:<=>?^_~][-a-z!$%&*/:<=>?^_~0-9+.@]*,
+syn match	monkError	oneline    ,[a-z!$%&*/:<=>?^_~][-a-z!$%&*/:<=>?^_~0-9+.@]*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t()";]\+[^ \t()";]*,
+
+syn match	monkOther	oneline    "\.\.\."
+syn match	monkError	oneline    !\.\.\.[^ \t()";]\+!
+" ... a special identifier
+
+syn match	monkConstant	oneline    ,\*[-a-z!$%&*/:<=>?^_~0-9+.@]*\*[ \t()";],me=e-1
+syn match	monkConstant	oneline    ,\*[-a-z!$%&*/:<=>?^_~0-9+.@]*\*$,
+syn match	monkError	oneline    ,\*[-a-z!$%&*/:<=>?^_~0-9+.@]*\*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t()";]\+[^ \t()";]*,
+
+syn match	monkConstant	oneline    ,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>[ \t()";],me=e-1
+syn match	monkConstant	oneline    ,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>$,
+syn match	monkError	oneline    ,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>[^-a-z!$%&*/:<=>?^_~0-9+.@ \t()";]\+[^ \t()";]*,
+
+" Monk input and output structures
+syn match	monkSyntax	oneline    "\(\~input\|\[I\]->\)[^ \t]*"
+syn match	monkFunc	oneline    "\(\~output\|\[O\]->\)[^ \t]*"
+
+" Non-quoted lists, and strings:
+
+syn region monkStruc matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" contains=ALL
+syn region monkStruc matchgroup=Delimiter start="#(" matchgroup=Delimiter end=")" contains=ALL
+
+syn region	monkString	start=+"+  skip=+\\[\\"]+ end=+"+
+
+" Comments:
+
+syn match	monkComment	";.*$"
+
+" Synchronization and the wrapping up...
+
+syn sync match matchPlace grouphere NONE "^[^ \t]"
+" ... i.e. synchronize on a line that starts at the left margin
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link monkSyntax		Statement
+hi def link monkFunc		Function
+
+hi def link monkString		String
+hi def link monkChar		Character
+hi def link monkNumber		Number
+hi def link monkBoolean		Boolean
+
+hi def link monkDelimiter	Delimiter
+hi def link monkConstant	Constant
+
+hi def link monkComment		Comment
+hi def link monkError		Error
+
+
+let b:current_syntax = "monk"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/moo.vim b/syntax/moo.vim
new file mode 100644
index 000000000..076788e6a
--- /dev/null
+++ b/syntax/moo.vim
@@ -0,0 +1,177 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moo') == -1
+
+" Vim syntax file
+" Language:	MOO
+" Maintainer:	Timo Frenay <timo@frenay.net>
+" Last Change:	2001 Oct 06
+" Note:		Requires Vim 6.0 or above
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Initializations
+syn case ignore
+
+" C-style comments
+syn match mooUncommentedError display ~\*/~
+syn match mooCStyleCommentError display ~/\ze\*~ contained
+syn region mooCStyleComment matchgroup=mooComment start=~/\*~ end=~\*/~ contains=mooCStyleCommentError
+
+" Statements
+if exists("moo_extended_cstyle_comments")
+  syn match mooIdentifier display ~\%(\%(/\*.\{-}\*/\s*\)*\)\@>\<\h\w*\>~ contained transparent contains=mooCStyleComment,@mooKeyword,mooType,mooVariable
+else
+  syn match mooIdentifier display ~\<\h\w*\>~ contained transparent contains=@mooKeyword,mooType,mooVariable
+endif
+syn keyword mooStatement break continue else elseif endfor endfork endif endtry endwhile finally for if try
+syn keyword mooStatement except fork while nextgroup=mooIdentifier skipwhite
+syn keyword mooStatement return nextgroup=mooString skipwhite
+
+" Operators
+syn keyword mooOperatorIn in
+
+" Error constants
+syn keyword mooAny ANY
+syn keyword mooErrorConstant E_ARGS E_INVARG E_DIV E_FLOAT E_INVIND E_MAXREC E_NACC E_NONE E_PERM E_PROPNF E_QUOTA E_RANGE E_RECMOVE E_TYPE E_VARNF E_VERBNF
+
+" Builtin variables
+syn match mooType display ~\<\%(ERR\|FLOAT\|INT\|LIST\|NUM\|OBJ\|STR\)\>~
+syn match mooVariable display ~\<\%(args\%(tr\)\=\|caller\|dobj\%(str\)\=\|iobj\%(str\)\=\|player\|prepstr\|this\|verb\)\>~
+
+" Strings
+syn match mooStringError display ~[^\t -[\]-~]~ contained
+syn match mooStringSpecialChar display ~\\["\\]~ contained
+if !exists("moo_no_regexp")
+  " Regular expressions
+  syn match mooRegexp display ~%%~ contained containedin=mooString,mooRegexpParentheses transparent contains=NONE
+  syn region mooRegexpParentheses display matchgroup=mooRegexpOr start=~%(~ skip=~%%~ end=~%)~ contained containedin=mooString,mooRegexpParentheses transparent oneline
+  syn match mooRegexpOr display ~%|~ contained containedin=mooString,mooRegexpParentheses
+endif
+if !exists("moo_no_pronoun_sub")
+  " Pronoun substitutions
+  syn match mooPronounSub display ~%%~ contained containedin=mooString transparent contains=NONE
+  syn match mooPronounSub display ~%[#dilnopqrst]~ contained containedin=mooString
+  syn match mooPronounSub display ~%\[#[dilnt]\]~ contained containedin=mooString
+  syn match mooPronounSub display ~%(\h\w*)~ contained containedin=mooString
+  syn match mooPronounSub display ~%\[[dilnt]\h\w*\]~ contained containedin=mooString
+  syn match mooPronounSub display ~%<\%([dilnt]:\)\=\a\+>~ contained containedin=mooString
+endif
+if exists("moo_unmatched_quotes")
+  syn region mooString matchgroup=mooStringError start=~"~ end=~$~ contains=@mooStringContents keepend
+  syn region mooString start=~"~ skip=~\\.~ end=~"~ contains=@mooStringContents oneline keepend
+else
+  syn region mooString start=~"~ skip=~\\.~ end=~"\|$~ contains=@mooStringContents keepend
+endif
+
+" Numbers and object numbers
+syn match mooNumber display ~\%(\%(\<\d\+\)\=\.\d\+\|\<\d\+\)\%(e[+\-]\=\d\+\)\=\>~
+syn match mooObject display ~#-\=\d\+\>~
+
+" Properties and verbs
+if exists("moo_builtin_properties")
+  "Builtin properties
+  syn keyword mooBuiltinProperty contents f location name owner programmer r w wizard contained containedin=mooPropRef
+endif
+if exists("moo_extended_cstyle_comments")
+  syn match mooPropRef display ~\.\s*\%(\%(/\*.\{-}\*/\s*\)*\)\@>\h\w*\>~ transparent contains=mooCStyleComment,@mooKeyword
+  syn match mooVerbRef display ~:\s*\%(\%(/\*.\{-}\*/\s*\)*\)\@>\h\w*\>~ transparent contains=mooCStyleComment,@mooKeyword
+else
+  syn match mooPropRef display ~\.\s*\h\w*\>~ transparent contains=@mooKeyword
+  syn match mooVerbRef display ~:\s*\h\w*\>~ transparent contains=@mooKeyword
+endif
+
+" Builtin functions, core properties and core verbs
+if exists("moo_extended_cstyle_comments")
+  syn match mooBuiltinFunction display ~\<\h\w*\s*\%(\%(/\*.\{-}\*/\s*\)*\)\@>\ze(~ contains=mooCStyleComment
+  syn match mooCorePropOrVerb display ~\$\s*\%(\%(/\*.\{-}\*/\s*\)*\)\@>\%(in\>\)\@!\h\w*\>~ contains=mooCStyleComment,@mooKeyword
+else
+  syn match mooBuiltinFunction display ~\<\h\w*\s*\ze(~ contains=NONE
+  syn match mooCorePropOrVerb display ~\$\s*\%(in\>\)\@!\h\w*\>~ contains=@mooKeyword
+endif
+if exists("moo_unknown_builtin_functions")
+  syn match mooUnknownBuiltinFunction ~\<\h\w*\>~ contained containedin=mooBuiltinFunction contains=mooKnownBuiltinFunction
+  " Known builtin functions as of version 1.8.1 of the server
+  " Add your own extensions to this group if you like
+  syn keyword mooKnownBuiltinFunction abs acos add_property add_verb asin atan binary_hash boot_player buffered_output_length callers caller_perms call_function ceil children chparent clear_property connected_players connected_seconds connection_name connection_option connection_options cos cosh create crypt ctime db_disk_size decode_binary delete_property delete_verb disassemble dump_database encode_binary equal eval exp floatstr floor flush_input force_input function_info idle_seconds index is_clear_property is_member is_player kill_task length listappend listdelete listen listeners listinsert listset log log10 match max max_object memory_usage min move notify object_bytes open_network_connection output_delimiters parent pass players properties property_info queued_tasks queue_info raise random read recycle renumber reset_max_object resume rindex rmatch seconds_left server_log server_version setadd setremove set_connection_option set_player_flag set_property_info set_task_perms set_verb_args set_verb_code set_verb_info shutdown sin sinh sqrt strcmp string_hash strsub substitute suspend tan tanh task_id task_stack ticks_left time tofloat toint toliteral tonum toobj tostr trunc typeof unlisten valid value_bytes value_hash verbs verb_args verb_code verb_info contained
+endif
+
+"�Enclosed expressions
+syn match mooUnenclosedError display ~[')\]|}]~
+syn match mooParenthesesError display ~[';\]|}]~ contained
+syn region mooParentheses start=~(~ end=~)~ transparent contains=@mooEnclosedContents,mooParenthesesError
+syn match mooBracketsError display ~[');|}]~ contained
+syn region mooBrackets start=~\[~ end=~\]~ transparent contains=@mooEnclosedContents,mooBracketsError
+syn match mooBracesError display ~[');\]|]~ contained
+syn region mooBraces start=~{~ end=~}~ transparent contains=@mooEnclosedContents,mooBracesError
+syn match mooQuestionError display ~[');\]}]~ contained
+syn region mooQuestion start=~?~ end=~|~ transparent contains=@mooEnclosedContents,mooQuestionError
+syn match mooCatchError display ~[);\]|}]~ contained
+syn region mooCatch matchgroup=mooExclamation start=~`~ end=~'~ transparent contains=@mooEnclosedContents,mooCatchError,mooExclamation
+if exists("moo_extended_cstyle_comments")
+  syn match mooExclamation display ~[\t !%&(*+,\-/<=>?@[^`{|]\@<!\s*\%(\%(/\*.\{-}\*/\s*\)*\)\@>!=\@!~ contained contains=mooCStyleComment
+else
+  syn match mooExclamation display ~[\t !%&(*+,\-/<=>?@[^`{|]\@<!\s*!=\@!~ contained
+endif
+
+" Comments
+syn match mooCommentSpecialChar display ~\\["\\]~ contained transparent contains=NONE
+syn match mooComment ~[\t !%&*+,\-/<=>?@^|]\@<!\s*"\([^\"]\|\\.\)*"\s*;~ contains=mooStringError,mooCommentSpecialChar
+
+" Non-code
+syn region mooNonCode start=~^\s*@\<~ end=~$~
+syn match mooNonCode display ~^\.$~
+syn match mooNonCode display ~^\s*\d\+:~he=e-1
+
+" Overriding matches
+syn match mooRangeOperator display ~\.\.~ transparent contains=NONE
+syn match mooOrOperator display ~||~ transparent contains=NONE
+if exists("moo_extended_cstyle_comments")
+  syn match mooScattering ~[,{]\@<=\s*\%(\%(/\*.\{-}\*/\s*\)*\)\@>?~ transparent contains=mooCStyleComment
+else
+  syn match mooScattering ~[,{]\@<=\s*?~ transparent contains=NONE
+endif
+
+" Clusters
+syn cluster mooKeyword contains=mooStatement,mooOperatorIn,mooAny,mooErrorConstant
+syn cluster mooStringContents contains=mooStringError,mooStringSpecialChar
+syn cluster mooEnclosedContents contains=TOP,mooUnenclosedError,mooComment,mooNonCode
+
+" Define the default highlighting.
+hi def link mooUncommentedError Error
+hi def link mooCStyleCommentError Error
+hi def link mooCStyleComment Comment
+hi def link mooStatement Statement
+hi def link mooOperatorIn Operator
+hi def link mooAny Constant " link this to Keyword if you want
+hi def link mooErrorConstant Constant
+hi def link mooType Type
+hi def link mooVariable Type
+hi def link mooStringError Error
+hi def link mooStringSpecialChar SpecialChar
+hi def link mooRegexpOr SpecialChar
+hi def link mooPronounSub SpecialChar
+hi def link mooString String
+hi def link mooNumber Number
+hi def link mooObject Number
+hi def link mooBuiltinProperty Type
+hi def link mooBuiltinFunction Function
+hi def link mooUnknownBuiltinFunction Error
+hi def link mooKnownBuiltinFunction Function
+hi def link mooCorePropOrVerb Identifier
+hi def link mooUnenclosedError Error
+hi def link mooParenthesesError Error
+hi def link mooBracketsError Error
+hi def link mooBracesError Error
+hi def link mooQuestionError Error
+hi def link mooCatchError Error
+hi def link mooExclamation Exception
+hi def link mooComment Comment
+hi def link mooNonCode PreProc
+
+let b:current_syntax = "moo"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/mp.vim b/syntax/mp.vim
new file mode 100644
index 000000000..754c4441b
--- /dev/null
+++ b/syntax/mp.vim
@@ -0,0 +1,773 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mp') == -1
+
+" Vim syntax file
+" Language:           MetaPost
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Andreas Scherer <andreas.scherer@pobox.com>
+" Last Change:        2016 Oct 14
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_sav = &cpo
+set cpo&vim
+
+if exists("g:plain_mf_macros")
+  let s:plain_mf_macros = g:plain_mf_macros
+endif
+if exists("g:plain_mf_modes")
+  let s:plain_mf_modes = g:plain_mf_modes
+endif
+if exists("g:other_mf_macros")
+  let s:other_mf_macros = g:other_mf_macros
+endif
+
+let g:plain_mf_macros = 0 " plain.mf has no special meaning for MetaPost
+let g:plain_mf_modes  = 0 " No METAFONT modes
+let g:other_mf_macros = 0 " cmbase.mf, logo.mf, ... neither
+
+" Read the METAFONT syntax to start with
+runtime! syntax/mf.vim
+unlet b:current_syntax " Necessary for syn include below
+
+" Restore the value of existing global variables
+if exists("s:plain_mf_macros")
+  let g:plain_mf_macros = s:plain_mf_macros
+else
+  unlet g:plain_mf_macros
+endif
+if exists("s:plain_mf_modes")
+  let g:plain_mf_modes = s:plain_mf_modes
+else
+  unlet g:plain_mf_modes
+endif
+if exists("s:other_mf_macros")
+  let g:other_mf_macros = s:other_mf_macros
+else
+  unlet g:other_mf_macros
+endif
+
+" Use TeX highlighting inside verbatimtex/btex... etex
+syn include @MPTeX syntax/tex.vim
+unlet b:current_syntax
+" These are defined as keywords rather than using matchgroup
+" in order to make them available to syntaxcomplete.
+syn keyword mpTeXdelim       btex etex verbatimtex contained
+syn region mpTeXinsert
+      \ start=/\<verbatimtex\>\|\<btex\>/rs=e+1
+      \ end=/\<etex\>/re=s-1 keepend
+      \ contains=@MPTeX,mpTeXdelim
+
+" iskeyword must be set after the syn include above, because tex.vim sets `syn
+" iskeyword`. Note that keywords do not contain numbers (numbers are
+" subscripts)
+syntax iskeyword @,_
+
+" MetaPost primitives not found in METAFONT
+syn keyword mpBoolExp        bounded clipped filled stroked textual arclength
+syn keyword mpNumExp         arctime blackpart bluepart colormodel cyanpart
+syn keyword mpNumExp         fontsize greenpart greypart magentapart redpart
+syn keyword mpPairExp        yellowpart llcorner lrcorner ulcorner urcorner
+" envelope is seemingly undocumented, but it exists since mpost 1.003.
+" The syntax is: envelope <polygonal pen> of <path primary>. For example,
+"     path p;
+"     p := envelope pensquare of (up--left);
+" (Thanks to Daniel H. Luecking for the example!)
+syn keyword mpPathExp        envelope pathpart
+syn keyword mpPenExp         penpart
+syn keyword mpPicExp         dashpart glyph infont
+syn keyword mpStringExp      fontpart readfrom textpart
+syn keyword mpType           cmykcolor color rgbcolor
+" Other MetaPost primitives listed in the manual
+syn keyword mpPrimitive      mpxbreak within
+" Internal quantities not found in METAFONT
+" (Table 6 in MetaPost: A User's Manual)
+syn keyword mpInternal       defaultcolormodel hour minute linecap linejoin
+syn keyword mpInternal       miterlimit mpprocset mpversion numberprecision
+syn keyword mpInternal       numbersystem outputfilename outputformat
+syn keyword mpInternal       outputformatoptions outputtemplate prologues
+syn keyword mpInternal       restoreclipcolor tracinglostchars troffmode
+syn keyword mpInternal       truecorners
+" List of commands not found in METAFONT (from MetaPost: A User's Manual)
+syn keyword mpCommand        clip closefrom dashed filenametemplate fontmapfile
+syn keyword mpCommand        fontmapline setbounds withcmykcolor withcolor
+syn keyword mpCommand        withgreyscale withoutcolor withpostscript
+syn keyword mpCommand        withprescript withrgbcolor write
+" METAFONT internal variables not found in MetaPost
+syn keyword notDefined       autorounding chardx chardy fillin granularity
+syn keyword notDefined       proofing smoothing tracingedges tracingpens
+syn keyword notDefined       turningcheck xoffset yoffset
+" Suffix defined only in METAFONT:
+syn keyword notDefined       nodot
+" Other not implemented primitives (see MetaPost: A User's Manual, §C.1)
+syn keyword notDefined       cull display openwindow numspecial totalweight
+syn keyword notDefined       withweight
+
+" Keywords defined by plain.mp
+if get(g:, "plain_mp_macros", 1) || get(g:, "mp_metafun_macros", 0)
+  syn keyword mpDef          beginfig clear_pen_memory clearit clearpen clearpen
+  syn keyword mpDef          clearxy colorpart cutdraw downto draw drawarrow
+  syn keyword mpDef          drawdblarrow drawdot drawoptions endfig erase
+  syn keyword mpDef          exitunless fill filldraw flex gobble hide interact
+  syn keyword mpDef          label loggingall makelabel numtok penstroke pickup
+  syn keyword mpDef          range reflectedabout rotatedaround shipit
+  syn keyword mpDef          stop superellipse takepower tracingall tracingnone
+  syn keyword mpDef          undraw undrawdot unfill unfilldraw upto
+  syn match   mpDef          "???"
+  syn keyword mpVardef       arrowhead bbox bot buildcycle byte ceiling center
+  syn keyword mpVardef       counterclockwise decr dir direction directionpoint
+  syn keyword mpVardef       dotlabel dotlabels image incr interpath inverse
+  syn keyword mpVardef       labels lft magstep max min penlabels penpos round
+  syn keyword mpVardef       rt savepen solve tensepath thelabel top unitvector
+  syn keyword mpVardef       whatever z
+  syn keyword mpPrimaryDef   div dotprod gobbled mod
+  syn keyword mpSecondaryDef intersectionpoint
+  syn keyword mpTertiaryDef  cutafter cutbefore softjoin thru
+  syn keyword mpNewInternal  ahangle ahlength bboxmargin beveled butt defaultpen
+  syn keyword mpNewInternal  defaultscale dotlabeldiam eps epsilon infinity
+  syn keyword mpNewInternal  join_radius labeloffset mitered pen_bot pen_lft
+  syn keyword mpNewInternal  pen_rt pen_top rounded squared tolerance
+  " Predefined constants
+  syn keyword mpConstant     EOF background base_name base_version black
+  syn keyword mpConstant     blankpicture blue ditto down evenly fullcircle
+  syn keyword mpConstant     green halfcircle identity left origin penrazor
+  syn keyword mpConstant     penspeck pensquare quartercircle red right
+  syn keyword mpConstant     unitsquare up white withdots
+  " Other predefined variables
+  syn keyword mpVariable     currentpen currentpen_path currentpicture cuttings
+  syn keyword mpVariable     defaultfont extra_beginfig extra_endfig
+  syn match   mpVariable     /\<\%(laboff\|labxf\|labyf\)\>/
+  syn match   mpVariable     /\<\%(laboff\|labxf\|labyf\)\.\%(lft\|rt\|bot\|top\|ulft\|urt\|llft\|lrt\)\>/
+  " let statements:
+  syn keyword mpnumExp       abs
+  syn keyword mpDef          rotatedabout
+  syn keyword mpCommand      bye relax
+  " on and off are not technically keywords, but it is nice to highlight them
+  " inside dashpattern().
+  syn keyword mpOnOff        off on contained
+  syn keyword mpDash         dashpattern contained
+  syn region  mpDashPattern
+        \ start="dashpattern\s*"
+        \ end=")"he=e-1
+        \ contains=mfNumeric,mfLength,mpOnOff,mpDash
+endif
+
+" Keywords defined by mfplain.mp
+if get(g:, "mfplain_mp_macros", 0)
+  syn keyword mpDef          beginchar capsule_def change_width
+  syn keyword mpDef          define_blacker_pixels define_corrected_pixels
+  syn keyword mpDef          define_good_x_pixels define_good_y_pixels
+  syn keyword mpDef          define_horizontal_corrected_pixels define_pixels
+  syn keyword mpDef          define_whole_blacker_pixels define_whole_pixels
+  syn keyword mpDef          define_whole_vertical_blacker_pixels
+  syn keyword mpDef          define_whole_vertical_pixels endchar
+  syn keyword mpDef          font_coding_scheme font_extra_space font_identifier
+  syn keyword mpDef          font_normal_shrink font_normal_space
+  syn keyword mpDef          font_normal_stretch font_quad font_size font_slant
+  syn keyword mpDef          font_x_height italcorr labelfont lowres_fix makebox
+  syn keyword mpDef          makegrid maketicks mode_def mode_setup proofrule
+  syn keyword mpDef          smode
+  syn keyword mpVardef       hround proofrulethickness vround
+  syn keyword mpNewInternal  blacker o_correction
+  syn keyword mpVariable     extra_beginchar extra_endchar extra_setup rulepen
+  " plus some no-ops, also from mfplain.mp
+  syn keyword mpDef          cull cullit gfcorners imagerules nodisplays
+  syn keyword mpDef          notransforms openit proofoffset screenchars
+  syn keyword mpDef          screenrule screenstrokes showit
+  syn keyword mpVardef       grayfont slantfont titlefont
+  syn keyword mpVariable     currenttransform
+  syn keyword mpConstant     unitpixel
+  " These are not listed in the MetaPost manual, and some are ignored by
+  " MetaPost, but are nonetheless defined in mfplain.mp
+  syn keyword mpDef          killtext
+  syn match   mpVardef       "\<good\.\%(x\|y\|lft\|rt\|top\|bot\)\>"
+  syn keyword mpVariable     aspect_ratio localfont mag mode mode_name
+  syn keyword mpVariable     proofcolor
+  syn keyword mpConstant     lowres proof smoke
+  syn keyword mpNewInternal  autorounding bp_per_pixel granularity
+  syn keyword mpNewInternal  number_of_modes proofing smoothing turningcheck
+endif
+
+" Keywords defined by all base macro packages:
+" - (r)boxes.mp
+" - format.mp
+" - graph.mp
+" - marith.mp
+" - sarith.mp
+" - string.mp
+" - TEX.mp
+if get(g:, "other_mp_macros", 1)
+  " boxes and rboxes
+  syn keyword mpDef          boxjoin drawboxed drawboxes drawunboxed
+  syn keyword mpNewInternal  circmargin defaultdx defaultdy rbox_radius
+  syn keyword mpVardef       boxit bpath circleit fixpos fixsize generic_declare
+  syn keyword mpVardef       generic_redeclare generisize pic rboxit str_prefix
+  " format
+  syn keyword mpVardef       Mformat format init_numbers roundd
+  syn keyword mpVariable     Fe_base Fe_plus
+  syn keyword mpConstant     Ten_to
+  " graph
+  syn keyword mpDef          Gfor Gxyscale OUT auto begingraph endgraph gdata
+  syn keyword mpDef          gdraw gdrawarrow gdrawdblarrow gfill plot
+  syn keyword mpVardef       augment autogrid frame gdotlabel glabel grid itick
+  syn keyword mpVardef       otick
+  syn keyword mpVardef       Mreadpath setcoords setrange
+  syn keyword mpNewInternal  Gmarks Gminlog Gpaths linear log
+  syn keyword mpVariable     Autoform Gemarks Glmarks Gumarks
+  syn keyword mpConstant     Gtemplate
+  syn match   mpVariable     /Gmargin\.\%(low\|high\)/
+  " marith
+  syn keyword mpVardef       Mabs Meform Mexp Mexp_str Mlog Mlog_Str Mlog_str
+  syn keyword mpPrimaryDef   Mdiv Mmul
+  syn keyword mpSecondaryDef Madd Msub
+  syn keyword mpTertiaryDef  Mleq
+  syn keyword mpNewInternal  Mten Mzero
+  " sarith
+  syn keyword mpVardef       Sabs Scvnum
+  syn keyword mpPrimaryDef   Sdiv Smul
+  syn keyword mpSecondaryDef Sadd Ssub
+  syn keyword mpTertiaryDef  Sleq Sneq
+  " string
+  syn keyword mpVardef       cspan isdigit loptok
+  " TEX
+  syn keyword mpVardef       TEX TEXPOST TEXPRE
+endif
+
+" Up to date as of 23-Sep-2016.
+if get(b:, 'mp_metafun_macros', get(g:, 'mp_metafun_macros', 0))
+  " Highlight TeX keywords (for use in ConTeXt documents)
+  syn match   mpTeXKeyword  '\\[a-zA-Z@]\+'
+
+  " These keywords have been added manually.
+  syn keyword mpPrimitive runscript
+
+  " The following MetaFun keywords have been extracted automatically from
+  " ConTeXt source code. They include all "public" macros (where a macro is
+  " considered public if and only if it does not start with _, mfun_, mlib_, or
+  " do_, and it does not end with _), all "public" unsaved variables, and all
+  " `let` statements.
+
+  " mp-abck.mpiv
+  syn keyword mpDef          abck_grid_line anchor_box box_found boxfilloptions
+  syn keyword mpDef          boxgridoptions boxlineoptions draw_multi_pars
+  syn keyword mpDef          draw_multi_side draw_multi_side_path freeze_box
+  syn keyword mpDef          initialize_box initialize_box_pos
+  syn keyword mpDef          multi_side_draw_options show_multi_kind
+  syn keyword mpDef          show_multi_pars
+  syn keyword mpVardef       abck_baseline_grid abck_draw_path abck_graphic_grid
+  syn keyword mpVariable     boxdashtype boxfilloffset boxfilltype
+  syn keyword mpVariable     boxgriddirection boxgriddistance boxgridshift
+  syn keyword mpVariable     boxgridtype boxgridwidth boxlineoffset
+  syn keyword mpVariable     boxlineradius boxlinetype boxlinewidth multikind
+  syn keyword mpConstant     context_abck
+  " mp-apos.mpiv
+  syn keyword mpDef          anch_sidebars_draw boxfilloptions boxlineoptions
+  syn keyword mpDef          connect_positions
+  syn keyword mpConstant     context_apos
+  " mp-asnc.mpiv
+  syn keyword mpDef          FlushSyncTasks ProcessSyncTask ResetSyncTasks
+  syn keyword mpDef          SetSyncColor SetSyncThreshold SyncTask
+  syn keyword mpVardef       PrepareSyncTasks SyncBox TheSyncColor
+  syn keyword mpVardef       TheSyncThreshold
+  syn keyword mpVariable     CurrentSyncClass NOfSyncPaths SyncColor
+  syn keyword mpVariable     SyncLeftOffset SyncPaths SyncTasks SyncThreshold
+  syn keyword mpVariable     SyncThresholdMethod SyncWidth
+  syn keyword mpConstant     context_asnc
+  " mp-back.mpiv
+  syn keyword mpDef          some_double_back some_hash
+  syn keyword mpVariable     back_nillcolor
+  syn keyword mpConstant     context_back
+  " mp-bare.mpiv
+  syn keyword mpVardef       colordecimals rawtextext
+  syn keyword mpPrimaryDef   infont
+  syn keyword mpConstant     context_bare
+  " mp-base.mpiv
+  " This is essentially plain.mp with only a few keywords added
+  syn keyword mpNumExp       graypart
+  syn keyword mpType         graycolor greycolor
+  syn keyword mpConstant     cyan magenta yellow
+  " mp-butt.mpiv
+  syn keyword mpDef          predefinedbutton some_button
+  syn keyword mpConstant     context_butt
+  " mp-char.mpiv
+  syn keyword mpDef          flow_begin_chart flow_begin_sub_chart
+  syn keyword mpDef          flow_chart_draw_comment flow_chart_draw_exit
+  syn keyword mpDef          flow_chart_draw_label flow_chart_draw_text
+  syn keyword mpDef          flow_clip_chart flow_collapse_points
+  syn keyword mpDef          flow_connect_bottom_bottom flow_connect_bottom_left
+  syn keyword mpDef          flow_connect_bottom_right flow_connect_bottom_top
+  syn keyword mpDef          flow_connect_left_bottom flow_connect_left_left
+  syn keyword mpDef          flow_connect_left_right flow_connect_left_top
+  syn keyword mpDef          flow_connect_right_bottom flow_connect_right_left
+  syn keyword mpDef          flow_connect_right_right flow_connect_right_top
+  syn keyword mpDef          flow_connect_top_bottom flow_connect_top_left
+  syn keyword mpDef          flow_connect_top_right flow_connect_top_top
+  syn keyword mpDef          flow_draw_connection flow_draw_connection_point
+  syn keyword mpDef          flow_draw_midpoint flow_draw_shape
+  syn keyword mpDef          flow_draw_test_area flow_draw_test_shape
+  syn keyword mpDef          flow_draw_test_shapes flow_end_chart
+  syn keyword mpDef          flow_end_sub_chart flow_flush_connections
+  syn keyword mpDef          flow_flush_picture flow_flush_pictures
+  syn keyword mpDef          flow_flush_shape flow_flush_shapes
+  syn keyword mpDef          flow_initialize_grid flow_new_chart flow_new_shape
+  syn keyword mpDef          flow_scaled_to_grid flow_show_connection
+  syn keyword mpDef          flow_show_connections flow_show_shapes
+  syn keyword mpDef          flow_xy_offset flow_y_pos
+  syn keyword mpVardef       flow_connection_path flow_down_on_grid
+  syn keyword mpVardef       flow_down_to_grid flow_i_point flow_left_on_grid
+  syn keyword mpVardef       flow_left_to_grid flow_offset
+  syn keyword mpVardef       flow_points_initialized flow_right_on_grid
+  syn keyword mpVardef       flow_right_to_grid flow_smooth_connection
+  syn keyword mpVardef       flow_trim_points flow_trimmed flow_up_on_grid
+  syn keyword mpVardef       flow_up_to_grid flow_valid_connection
+  syn keyword mpVardef       flow_x_on_grid flow_xy_bottom flow_xy_left
+  syn keyword mpVardef       flow_xy_on_grid flow_xy_right flow_xy_top
+  syn keyword mpVardef       flow_y_on_grid
+  syn keyword mpVariable     flow_arrowtip flow_chart_background_color
+  syn keyword mpVariable     flow_chart_offset flow_comment_offset
+  syn keyword mpVariable     flow_connection_arrow_size
+  syn keyword mpVariable     flow_connection_dash_size
+  syn keyword mpVariable     flow_connection_line_color
+  syn keyword mpVariable     flow_connection_line_width
+  syn keyword mpVariable     flow_connection_smooth_size flow_connections
+  syn keyword mpVariable     flow_cpath flow_dash_pattern flow_dashline
+  syn keyword mpVariable     flow_exit_offset flow_forcevalid flow_grid_height
+  syn keyword mpVariable     flow_grid_width flow_label_offset flow_max_x
+  syn keyword mpVariable     flow_max_y flow_peepshape flow_reverse_connection
+  syn keyword mpVariable     flow_reverse_y flow_shape_action flow_shape_archive
+  syn keyword mpVariable     flow_shape_decision flow_shape_down
+  syn keyword mpVariable     flow_shape_fill_color flow_shape_height
+  syn keyword mpVariable     flow_shape_left flow_shape_line_color
+  syn keyword mpVariable     flow_shape_line_width flow_shape_loop
+  syn keyword mpVariable     flow_shape_multidocument flow_shape_node
+  syn keyword mpVariable     flow_shape_procedure flow_shape_product
+  syn keyword mpVariable     flow_shape_right flow_shape_singledocument
+  syn keyword mpVariable     flow_shape_subprocedure flow_shape_up
+  syn keyword mpVariable     flow_shape_wait flow_shape_width
+  syn keyword mpVariable     flow_show_all_points flow_show_con_points
+  syn keyword mpVariable     flow_show_mid_points flow_showcrossing flow_smooth
+  syn keyword mpVariable     flow_touchshape flow_xypoint flow_zfactor
+  syn keyword mpConstant     context_flow
+  " mp-chem.mpiv
+  syn keyword mpDef          chem_init_all chem_reset chem_start_structure
+  syn keyword mpDef          chem_transformed
+  syn keyword mpVardef       chem_ad chem_adj chem_align chem_arrow chem_au
+  syn keyword mpVardef       chem_b chem_bb chem_bd chem_bw chem_c chem_cc
+  syn keyword mpVardef       chem_ccd chem_cd chem_crz chem_cz chem_dash chem_db
+  syn keyword mpVardef       chem_diff chem_dir chem_do chem_dr chem_draw
+  syn keyword mpVardef       chem_drawarrow chem_eb chem_ed chem_ep chem_er
+  syn keyword mpVardef       chem_es chem_et chem_fill chem_hb chem_init_some
+  syn keyword mpVardef       chem_label chem_ldb chem_ldd chem_line chem_lr
+  syn keyword mpVardef       chem_lrb chem_lrbd chem_lrd chem_lrh chem_lrn
+  syn keyword mpVardef       chem_lrt chem_lrz chem_lsr chem_lsub chem_mark
+  syn keyword mpVardef       chem_marked chem_mid chem_mids chem_midz chem_mir
+  syn keyword mpVardef       chem_mov chem_move chem_number chem_oe chem_off
+  syn keyword mpVardef       chem_pb chem_pe chem_r chem_r_fragment chem_rb
+  syn keyword mpVardef       chem_rbd chem_rd chem_rdb chem_rdd chem_restore
+  syn keyword mpVardef       chem_rh chem_rm chem_rn chem_rot chem_rr chem_rrb
+  syn keyword mpVardef       chem_rrbd chem_rrd chem_rrh chem_rrn chem_rrt
+  syn keyword mpVardef       chem_rrz chem_rsr chem_rsub chem_rt chem_rz chem_s
+  syn keyword mpVardef       chem_save chem_sb chem_sd chem_set chem_sr chem_ss
+  syn keyword mpVardef       chem_start_component chem_stop_component
+  syn keyword mpVardef       chem_stop_structure chem_sub chem_symbol chem_tb
+  syn keyword mpVardef       chem_text chem_z chem_zln chem_zlt chem_zn chem_zrn
+  syn keyword mpVardef       chem_zrt chem_zt
+  syn keyword mpVariable     chem_mark_pair chem_stack_mirror chem_stack_origin
+  syn keyword mpVariable     chem_stack_p chem_stack_previous
+  syn keyword mpVariable     chem_stack_rotation chem_trace_boundingbox
+  syn keyword mpVariable     chem_trace_nesting chem_trace_text
+  syn keyword mpConstant     context_chem
+  " mp-core.mpiv
+  syn keyword mpDef          FlushSyncTasks ProcessSyncTask
+  syn keyword mpDef          RegisterLocalTextArea RegisterPlainTextArea
+  syn keyword mpDef          RegisterRegionTextArea RegisterTextArea
+  syn keyword mpDef          ResetLocalTextArea ResetSyncTasks ResetTextAreas
+  syn keyword mpDef          SaveTextAreas SetSyncColor SetSyncThreshold
+  syn keyword mpDef          SyncTask anchor_box box_found boxfilloptions
+  syn keyword mpDef          boxgridoptions boxlineoptions collapse_multi_pars
+  syn keyword mpDef          draw_box draw_multi_pars draw_par freeze_box
+  syn keyword mpDef          initialize_area initialize_area_par initialize_box
+  syn keyword mpDef          initialize_box_pos initialize_par
+  syn keyword mpDef          prepare_multi_pars relocate_multipars save_multipar
+  syn keyword mpDef          set_par_line_height show_multi_pars show_par
+  syn keyword mpDef          simplify_multi_pars sort_multi_pars
+  syn keyword mpVardef       InsideSavedTextArea InsideSomeSavedTextArea
+  syn keyword mpVardef       InsideSomeTextArea InsideTextArea PrepareSyncTasks
+  syn keyword mpVardef       SyncBox TextAreaH TextAreaW TextAreaWH TextAreaX
+  syn keyword mpVardef       TextAreaXY TextAreaY TheSyncColor TheSyncThreshold
+  syn keyword mpVardef       baseline_grid graphic_grid multi_par_at_top
+  syn keyword mpVariable     CurrentSyncClass NOfSavedTextAreas
+  syn keyword mpVariable     NOfSavedTextColumns NOfSyncPaths NOfTextAreas
+  syn keyword mpVariable     NOfTextColumns PlainTextArea RegionTextArea
+  syn keyword mpVariable     SavedTextColumns SyncColor SyncLeftOffset SyncPaths
+  syn keyword mpVariable     SyncTasks SyncThreshold SyncThresholdMethod
+  syn keyword mpVariable     SyncWidth TextAreas TextColumns
+  syn keyword mpVariable     auto_multi_par_hsize boxdashtype boxfilloffset
+  syn keyword mpVariable     boxfilltype boxgriddirection boxgriddistance
+  syn keyword mpVariable     boxgridshift boxgridtype boxgridwidth boxlineradius
+  syn keyword mpVariable     boxlinetype boxlinewidth check_multi_par_chain
+  syn keyword mpVariable     compensate_multi_par_topskip
+  syn keyword mpVariable     enable_multi_par_fallback force_multi_par_chain
+  syn keyword mpVariable     ignore_multi_par_page last_multi_par_shift lefthang
+  syn keyword mpVariable     local_multi_par_area multi_column_first_page_hack
+  syn keyword mpVariable     multi_par_pages multiloc multilocs multipar
+  syn keyword mpVariable     multipars multiref multirefs nofmultipars
+  syn keyword mpVariable     obey_multi_par_hang obey_multi_par_more
+  syn keyword mpVariable     one_piece_multi_par par_hang_after par_hang_indent
+  syn keyword mpVariable     par_indent par_left_skip par_line_height
+  syn keyword mpVariable     par_right_skip par_start_pos par_stop_pos
+  syn keyword mpVariable     par_strut_depth par_strut_height ppos righthang
+  syn keyword mpVariable     snap_multi_par_tops somehang span_multi_column_pars
+  syn keyword mpVariable     use_multi_par_region
+  syn keyword mpConstant     context_core
+  syn keyword LET            anchor_area anchor_par draw_area
+  " mp-cows.mpiv
+  syn keyword mpConstant     context_cows cow
+  " mp-crop.mpiv
+  syn keyword mpDef          page_marks_add_color page_marks_add_lines
+  syn keyword mpDef          page_marks_add_marking page_marks_add_number
+  syn keyword mpVardef       crop_color crop_gray crop_marks_cmyk
+  syn keyword mpVardef       crop_marks_cmykrgb crop_marks_gray crop_marks_lines
+  syn keyword mpVariable     crop_colors more page
+  syn keyword mpConstant     context_crop
+  " mp-figs.mpiv
+  syn keyword mpDef          naturalfigure registerfigure
+  syn keyword mpVardef       figuredimensions figureheight figuresize
+  syn keyword mpVardef       figurewidth
+  syn keyword mpConstant     context_figs
+  " mp-fobg.mpiv
+  syn keyword mpDef          DrawFoFrame
+  syn keyword mpVardef       equalpaths
+  syn keyword mpPrimaryDef   inset outset
+  syn keyword mpVariable     FoBackground FoBackgroundColor FoFrame FoLineColor
+  syn keyword mpVariable     FoLineStyle FoLineWidth FoSplit
+  syn keyword mpConstant     FoAll FoBottom FoDash FoDotted FoDouble FoGroove
+  syn keyword mpConstant     FoHidden FoInset FoLeft FoMedium FoNoColor FoNone
+  syn keyword mpConstant     FoOutset FoRidge FoRight FoSolid FoThick FoThin
+  syn keyword mpConstant     FoTop context_fobg
+  " mp-form.mpiv
+  syn keyword mpConstant     context_form
+  " mp-func.mpiv
+  syn keyword mpDef          constructedfunction constructedpairs
+  syn keyword mpDef          constructedpath curvedfunction curvedpairs
+  syn keyword mpDef          curvedpath function pathconnectors straightfunction
+  syn keyword mpDef          straightpairs straightpath
+  syn keyword mpConstant     context_func
+  " mp-grap.mpiv
+  syn keyword mpDef          Gfor OUT auto begingraph circles crosses diamonds
+  syn keyword mpDef          downtriangles endgraph gdata gdraw gdrawarrow
+  syn keyword mpDef          gdrawdblarrow gfill graph_addto
+  syn keyword mpDef          graph_addto_currentpicture graph_comma
+  syn keyword mpDef          graph_coordinate_multiplication graph_draw
+  syn keyword mpDef          graph_draw_label graph_errorbar_text graph_fill
+  syn keyword mpDef          graph_generate_exponents
+  syn keyword mpDef          graph_generate_label_position
+  syn keyword mpDef          graph_generate_numbers graph_label_location
+  syn keyword mpDef          graph_scan_mark graph_scan_marks graph_setbounds
+  syn keyword mpDef          graph_suffix graph_tick_label
+  syn keyword mpDef          graph_with_pen_and_color graph_withlist
+  syn keyword mpDef          graph_xyscale lefttriangles makefunctionpath plot
+  syn keyword mpDef          plotsymbol points rainbow righttriangles smoothpath
+  syn keyword mpDef          squares stars uptriangles witherrorbars
+  syn keyword mpVardef       addtopath augment autogrid constant_fit
+  syn keyword mpVardef       constant_function det escaped_format exp
+  syn keyword mpVardef       exponential_fit exponential_function format
+  syn keyword mpVardef       formatted frame functionpath gaussian_fit
+  syn keyword mpVardef       gaussian_function gdotlabel glabel graph_Feform
+  syn keyword mpVardef       graph_Meform graph_arrowhead_extent graph_bounds
+  syn keyword mpVardef       graph_clear_bounds
+  syn keyword mpVardef       graph_convert_user_path_to_internal graph_cspan
+  syn keyword mpVardef       graph_draw_arrowhead graph_error graph_errorbars
+  syn keyword mpVardef       graph_exp graph_factor_and_exponent_to_string
+  syn keyword mpVardef       graph_gridline_picture graph_is_null
+  syn keyword mpVardef       graph_label_convert_user_to_internal graph_loptok
+  syn keyword mpVardef       graph_match_exponents graph_mlog
+  syn keyword mpVardef       graph_modified_exponent_ypart graph_pair_adjust
+  syn keyword mpVardef       graph_picture_conversion graph_post_draw
+  syn keyword mpVardef       graph_read_line graph_readpath graph_remap
+  syn keyword mpVardef       graph_scan_path graph_select_exponent_mark
+  syn keyword mpVardef       graph_select_mark graph_set_bounds
+  syn keyword mpVardef       graph_set_default_bounds graph_shapesize
+  syn keyword mpVardef       graph_stash_label graph_tick_mark_spacing
+  syn keyword mpVardef       graph_unknown_pair_bbox grid isdigit itick
+  syn keyword mpVardef       linear_fit linear_function ln logten lorentzian_fit
+  syn keyword mpVardef       lorentzian_function otick polynomial_fit
+  syn keyword mpVardef       polynomial_function power_law_fit
+  syn keyword mpVardef       power_law_function powten setcoords setrange
+  syn keyword mpVardef       sortpath strfmt tick varfmt
+  syn keyword mpNewInternal  Mzero doubleinfinity graph_log_minimum
+  syn keyword mpNewInternal  graph_minimum_number_of_marks largestmantissa
+  syn keyword mpNewInternal  linear lntwo log mlogten singleinfinity
+  syn keyword mpVariable     Autoform determinant fit_chi_squared
+  syn keyword mpVariable     graph_errorbar_picture graph_exp_marks
+  syn keyword mpVariable     graph_frame_pair_a graph_frame_pair_b
+  syn keyword mpVariable     graph_lin_marks graph_log_marks graph_modified_bias
+  syn keyword mpVariable     graph_modified_higher graph_modified_lower
+  syn keyword mpVariable     graph_shape r_s resistance_color resistance_name
+  syn keyword mpConstant     context_grap
+  " mp-grid.mpiv
+  syn keyword mpDef          hlingrid hloggrid vlingrid vloggrid
+  syn keyword mpVardef       hlinlabel hlintext hlogtext linlin linlinpath
+  syn keyword mpVardef       linlog linlogpath loglin loglinpath loglog
+  syn keyword mpVardef       loglogpath processpath vlinlabel vlintext vlogtext
+  syn keyword mpVariable     fmt_initialize fmt_pictures fmt_precision
+  syn keyword mpVariable     fmt_separator fmt_zerocheck grid_eps
+  syn keyword mpConstant     context_grid
+  " mp-grph.mpiv
+  syn keyword mpDef          beginfig begingraphictextfig data_mpo_file
+  syn keyword mpDef          data_mpy_file doloadfigure draw endfig
+  syn keyword mpDef          endgraphictextfig fill fixedplace graphictext
+  syn keyword mpDef          loadfigure new_graphictext normalwithshade number
+  syn keyword mpDef          old_graphictext outlinefill protectgraphicmacros
+  syn keyword mpDef          resetfig reversefill withdrawcolor withfillcolor
+  syn keyword mpDef          withshade
+  syn keyword mpVariable     currentgraphictext figureshift
+  syn keyword mpConstant     context_grph
+  " mp-idea.mpiv
+  syn keyword mpVardef       bcomponent ccomponent gcomponent mcomponent
+  syn keyword mpVardef       rcomponent somecolor ycomponent
+  " mp-luas.mpiv
+  syn keyword mpDef          luacall message
+  syn keyword mpVardef       MP lua lualist
+  syn keyword mpConstant     context_luas
+  " mp-mlib.mpiv
+  syn keyword mpDef          autoalign bitmapimage circular_shade cmyk comment
+  syn keyword mpDef          defineshade eofill eofillup externalfigure figure
+  syn keyword mpDef          fillup label linear_shade multitonecolor namedcolor
+  syn keyword mpDef          nofill onlayer passarrayvariable passvariable
+  syn keyword mpDef          plain_label register resolvedcolor scantokens
+  syn keyword mpDef          set_circular_vector set_linear_vector shaded
+  syn keyword mpDef          spotcolor startpassingvariable stoppassingvariable
+  syn keyword mpDef          thelabel transparent[] usemetafunlabels
+  syn keyword mpDef          useplainlabels withcircularshade withlinearshade
+  syn keyword mpDef          withmask withproperties withshadecenter
+  syn keyword mpDef          withshadecolors withshadedirection withshadedomain
+  syn keyword mpDef          withshadefactor withshadefraction withshadeorigin
+  syn keyword mpDef          withshaderadius withshadestep withshadetransform
+  syn keyword mpDef          withshadevector withtransparency
+  syn keyword mpVardef       anchored checkbounds checkedbounds
+  syn keyword mpVardef       define_circular_shade define_linear_shade dotlabel
+  syn keyword mpVardef       escaped_format fmttext fontsize format formatted
+  syn keyword mpVardef       installlabel onetimefmttext onetimetextext
+  syn keyword mpVardef       outlinetext plain_thelabel properties rawfmttext
+  syn keyword mpVardef       rawtexbox rawtextext rule strfmt strut texbox
+  syn keyword mpVardef       textext thefmttext thelabel thetexbox thetextext
+  syn keyword mpVardef       tostring transparency_alternative_to_number
+  syn keyword mpVardef       validtexbox varfmt verbatim
+  syn keyword mpPrimaryDef   asgroup infont normalinfont shadedinto
+  syn keyword mpPrimaryDef   shownshadecenter shownshadedirection
+  syn keyword mpPrimaryDef   shownshadeorigin shownshadevector withshade
+  syn keyword mpPrimaryDef   withshademethod
+  syn keyword mpNewInternal  colorburntransparent colordodgetransparent
+  syn keyword mpNewInternal  colortransparent darkentransparent
+  syn keyword mpNewInternal  differencetransparent exclusiontransparent
+  syn keyword mpNewInternal  hardlighttransparent huetransparent
+  syn keyword mpNewInternal  lightentransparent luminositytransparent
+  syn keyword mpNewInternal  multiplytransparent normaltransparent
+  syn keyword mpNewInternal  overlaytransparent saturationtransparent
+  syn keyword mpNewInternal  screentransparent shadefactor softlighttransparent
+  syn keyword mpNewInternal  textextoffset
+  syn keyword mpType         property transparency
+  syn keyword mpVariable     currentoutlinetext shadeddown shadedleft
+  syn keyword mpVariable     shadedright shadedup shadeoffset trace_shades
+  syn keyword mpConstant     context_mlib
+  " mp-page.mpiv
+  syn keyword mpDef          BoundCoverAreas BoundPageAreas Enlarged FakeRule
+  syn keyword mpDef          FakeWord LoadPageState OverlayBox RuleColor
+  syn keyword mpDef          SetAreaVariables SetPageArea SetPageBackPage
+  syn keyword mpDef          SetPageCoverPage SetPageField SetPageFrontPage
+  syn keyword mpDef          SetPageHsize SetPageHstep SetPageLocation
+  syn keyword mpDef          SetPagePage SetPageSpine SetPageVariables
+  syn keyword mpDef          SetPageVsize SetPageVstep StartCover StartPage
+  syn keyword mpDef          StopCover StopPage SwapPageState innerenlarged
+  syn keyword mpDef          llEnlarged lrEnlarged outerenlarged ulEnlarged
+  syn keyword mpDef          urEnlarged
+  syn keyword mpVardef       BackPageHeight BackPageWidth BackSpace BaseLineSkip
+  syn keyword mpVardef       BodyFontSize BottomDistance BottomHeight
+  syn keyword mpVardef       BottomSpace CoverHeight CoverWidth CurrentColumn
+  syn keyword mpVardef       CurrentHeight CurrentWidth CutSpace EmWidth
+  syn keyword mpVardef       ExHeight FooterDistance FooterHeight
+  syn keyword mpVardef       FrontPageHeight FrontPageWidth HSize HeaderDistance
+  syn keyword mpVardef       HeaderHeight InPageBody InnerEdgeDistance
+  syn keyword mpVardef       InnerEdgeWidth InnerMarginDistance InnerMarginWidth
+  syn keyword mpVardef       InnerSpaceWidth LastPageNumber LayoutColumnDistance
+  syn keyword mpVardef       LayoutColumnWidth LayoutColumns LeftEdgeDistance
+  syn keyword mpVardef       LeftEdgeWidth LeftMarginDistance LeftMarginWidth
+  syn keyword mpVardef       LineHeight MakeupHeight MakeupWidth NOfColumns
+  syn keyword mpVardef       NOfPages OnOddPage OnRightPage OuterEdgeDistance
+  syn keyword mpVardef       OuterEdgeWidth OuterMarginDistance OuterMarginWidth
+  syn keyword mpVardef       OuterSpaceWidth OverlayDepth OverlayHeight
+  syn keyword mpVardef       OverlayLineWidth OverlayOffset OverlayWidth
+  syn keyword mpVardef       PageDepth PageFraction PageNumber PageOffset
+  syn keyword mpVardef       PaperBleed PaperHeight PaperWidth PrintPaperHeight
+  syn keyword mpVardef       PrintPaperWidth RealPageNumber RightEdgeDistance
+  syn keyword mpVardef       RightEdgeWidth RightMarginDistance RightMarginWidth
+  syn keyword mpVardef       SpineHeight SpineWidth StrutDepth StrutHeight
+  syn keyword mpVardef       TextHeight TextWidth TopDistance TopHeight TopSkip
+  syn keyword mpVardef       TopSpace VSize defaultcolormodel
+  syn keyword mpVariable     Area BackPage CoverPage CurrentLayout Field
+  syn keyword mpVariable     FrontPage HorPos Hsize Hstep Location Page
+  syn keyword mpVariable     PageStateAvailable RuleDepth RuleDirection
+  syn keyword mpVariable     RuleFactor RuleH RuleHeight RuleOffset RuleOption
+  syn keyword mpVariable     RuleThickness RuleV RuleWidth Spine VerPos Vsize
+  syn keyword mpVariable     Vstep
+  syn keyword mpConstant     context_page
+  " mp-shap.mpiv
+  syn keyword mpDef          drawline drawshape some_shape
+  syn keyword mpDef          start_predefined_shape_definition
+  syn keyword mpDef          stop_predefined_shape_definition
+  syn keyword mpVardef       drawpredefinedline drawpredefinedshape
+  syn keyword mpVardef       some_shape_path
+  syn keyword mpVariable     predefined_shapes predefined_shapes_xradius
+  syn keyword mpVariable     predefined_shapes_xxradius
+  syn keyword mpVariable     predefined_shapes_yradius
+  syn keyword mpVariable     predefined_shapes_yyradius
+  syn keyword mpConstant     context_shap
+  " mp-step.mpiv
+  syn keyword mpDef          initialize_step_variables midbottomboundary
+  syn keyword mpDef          midtopboundary step_begin_cell step_begin_chart
+  syn keyword mpDef          step_cell_ali step_cell_bot step_cell_top
+  syn keyword mpDef          step_cells step_end_cell step_end_chart
+  syn keyword mpDef          step_text_bot step_text_mid step_text_top
+  syn keyword mpDef          step_texts
+  syn keyword mpVariable     cell_distance_x cell_distance_y cell_fill_color
+  syn keyword mpVariable     cell_line_color cell_line_width cell_offset
+  syn keyword mpVariable     chart_align chart_category chart_vertical
+  syn keyword mpVariable     line_distance line_height line_line_color
+  syn keyword mpVariable     line_line_width line_offset nofcells
+  syn keyword mpVariable     text_distance_set text_fill_color text_line_color
+  syn keyword mpVariable     text_line_width text_offset
+  syn keyword mpConstant     context_cell
+  " mp-symb.mpiv
+  syn keyword mpDef          finishglyph prepareglyph
+  syn keyword mpConstant     lefttriangle midbar onebar righttriangle sidebar
+  syn keyword mpConstant     sublefttriangle subrighttriangle twobar
+  " mp-text.mpiv
+  syn keyword mpDef          build_parshape
+  syn keyword mpVardef       found_point
+  syn keyword mpVariable     trace_parshape
+  syn keyword mpConstant     context_text
+  " mp-tool.mpiv
+  syn keyword mpCommand      dump
+  syn keyword mpDef          addbackground b_color beginglyph break centerarrow
+  syn keyword mpDef          clearxy condition data_mpd_file detaileddraw
+  syn keyword mpDef          detailpaths dowithpath draw drawboundary
+  syn keyword mpDef          drawboundingbox drawcontrollines drawcontrolpoints
+  syn keyword mpDef          drawfill draworigin drawpath drawpathonly
+  syn keyword mpDef          drawpathwithpoints drawpoint drawpointlabels
+  syn keyword mpDef          drawpoints drawticks drawwholepath drawxticks
+  syn keyword mpDef          drawyticks endglyph fill finishsavingdata g_color
+  syn keyword mpDef          inner_boundingbox job_name leftarrow loadmodule
+  syn keyword mpDef          midarrowhead naturalizepaths newboolean newcolor
+  syn keyword mpDef          newnumeric newpair newpath newpicture newstring
+  syn keyword mpDef          newtransform normalcolors normaldraw normalfill
+  syn keyword mpDef          normalwithcolor outer_boundingbox pop_boundingbox
+  syn keyword mpDef          popboundingbox popcurrentpicture push_boundingbox
+  syn keyword mpDef          pushboundingbox pushcurrentpicture r_color readfile
+  syn keyword mpDef          recolor redraw refill register_dirty_chars
+  syn keyword mpDef          remapcolor remapcolors remappedcolor reprocess
+  syn keyword mpDef          resetarrows resetcolormap resetdrawoptions
+  syn keyword mpDef          resolvedcolor restroke retext rightarrow savedata
+  syn keyword mpDef          saveoptions scale_currentpicture set_ahlength
+  syn keyword mpDef          set_grid showgrid startplaincompatibility
+  syn keyword mpDef          startsavingdata stopplaincompatibility
+  syn keyword mpDef          stopsavingdata stripe_path_a stripe_path_n undashed
+  syn keyword mpDef          undrawfill untext visualizeddraw visualizedfill
+  syn keyword mpDef          visualizepaths withcolor withgray
+  syn keyword mpDef          xscale_currentpicture xshifted
+  syn keyword mpDef          xyscale_currentpicture yscale_currentpicture
+  syn keyword mpDef          yshifted
+  syn keyword mpVardef       acos acosh anglebetween area arrowhead
+  syn keyword mpVardef       arrowheadonpath arrowpath asciistring asin asinh
+  syn keyword mpVardef       atan basiccolors bbheight bbwidth bcomponent
+  syn keyword mpVardef       blackcolor bottomboundary boundingbox c_phantom
+  syn keyword mpVardef       ccomponent center cleanstring colorcircle
+  syn keyword mpVardef       colordecimals colordecimalslist colorlike colorpart
+  syn keyword mpVardef       colortype complementary complemented copylist cos
+  syn keyword mpVardef       cosh cot cotd curved ddddecimal dddecimal ddecimal
+  syn keyword mpVardef       decorated drawarrowpath epsed exp freedotlabel
+  syn keyword mpVardef       freelabel gcomponent getunstringed grayed greyed
+  syn keyword mpVardef       hsvtorgb infinite innerboundingbox interpolated inv
+  syn keyword mpVardef       invcos inverted invsin invtan laddered leftboundary
+  syn keyword mpVardef       leftpath leftrightpath listsize listtocurves
+  syn keyword mpVardef       listtolines ln log mcomponent new_on_grid
+  syn keyword mpVardef       outerboundingbox paired pen_size penpoint phantom
+  syn keyword mpVardef       pointarrow pow punked rangepath rcomponent
+  syn keyword mpVardef       redecorated repathed rightboundary rightpath
+  syn keyword mpVardef       rotation roundedsquare set_inner_boundingbox
+  syn keyword mpVardef       set_outer_boundingbox setunstringed shapedlist
+  syn keyword mpVardef       simplified sin sinh sortlist sqr straightpath tan
+  syn keyword mpVardef       tand tanh tensecircle thefreelabel topboundary
+  syn keyword mpVardef       tripled undecorated unitvector unspiked unstringed
+  syn keyword mpVardef       whitecolor ycomponent
+  syn keyword mpPrimaryDef   along blownup bottomenlarged cornered crossed
+  syn keyword mpPrimaryDef   enlarged enlonged leftenlarged llenlarged llmoved
+  syn keyword mpPrimaryDef   lrenlarged lrmoved on paralleled randomized
+  syn keyword mpPrimaryDef   randomizedcontrols randomshifted rightenlarged
+  syn keyword mpPrimaryDef   shortened sized smoothed snapped softened squeezed
+  syn keyword mpPrimaryDef   stretched superellipsed topenlarged ulenlarged
+  syn keyword mpPrimaryDef   ulmoved uncolored urenlarged urmoved xsized
+  syn keyword mpPrimaryDef   xstretched xyscaled xysized ysized ystretched zmod
+  syn keyword mpSecondaryDef anglestriped intersection_point numberstriped
+  syn keyword mpSecondaryDef peepholed
+  syn keyword mpTertiaryDef  cutends
+  syn keyword mpNewInternal  ahdimple ahvariant anglelength anglemethod
+  syn keyword mpNewInternal  angleoffset charscale cmykcolormodel graycolormodel
+  syn keyword mpNewInternal  greycolormodel maxdimensions metapostversion
+  syn keyword mpNewInternal  nocolormodel rgbcolormodel striped_normal_inner
+  syn keyword mpNewInternal  striped_normal_outer striped_reverse_inner
+  syn keyword mpNewInternal  striped_reverse_outer
+  syn keyword mpType         grayscale greyscale quadruplet triplet
+  syn keyword mpVariable     ahfactor collapse_data color_map drawoptionsfactor
+  syn keyword mpVariable     freedotlabelsize freelabeloffset grid grid_full
+  syn keyword mpVariable     grid_h grid_left grid_nx grid_ny grid_w grid_x
+  syn keyword mpVariable     grid_y intersection_found originlength
+  syn keyword mpVariable     plain_compatibility_data pointlabelfont
+  syn keyword mpVariable     pointlabelscale refillbackground savingdata
+  syn keyword mpVariable     savingdatadone swappointlabels ticklength tickstep
+  syn keyword mpConstant     CRLF DQUOTE PERCENT SPACE bcircle context_tool crlf
+  syn keyword mpConstant     darkblue darkcyan darkgray darkgreen darkmagenta
+  syn keyword mpConstant     darkred darkyellow downtriangle dquote freesquare
+  syn keyword mpConstant     fulldiamond fullsquare fulltriangle lcircle
+  syn keyword mpConstant     lefttriangle lightgray llcircle lltriangle lrcircle
+  syn keyword mpConstant     lrtriangle mpversion nocolor noline oddly
+  syn keyword mpConstant     originpath percent rcircle righttriangle space
+  syn keyword mpConstant     tcircle triangle ulcircle ultriangle unitcircle
+  syn keyword mpConstant     unitdiamond unittriangle uptriangle urcircle
+  syn keyword mpConstant     urtriangle
+endif " MetaFun macros
+
+" Define the default highlighting
+hi def link mpTeXdelim     mpPrimitive
+hi def link mpBoolExp      mfBoolExp
+hi def link mpNumExp       mfNumExp
+hi def link mpPairExp      mfPairExp
+hi def link mpPathExp      mfPathExp
+hi def link mpPenExp       mfPenExp
+hi def link mpPicExp       mfPicExp
+hi def link mpStringExp    mfStringExp
+hi def link mpInternal     mfInternal
+hi def link mpCommand      mfCommand
+hi def link mpType         mfType
+hi def link mpPrimitive    mfPrimitive
+hi def link mpDef          mfDef
+hi def link mpVardef       mpDef
+hi def link mpPrimaryDef   mpDef
+hi def link mpSecondaryDef mpDef
+hi def link mpTertiaryDef  mpDef
+hi def link mpNewInternal  mpInternal
+hi def link mpVariable     mfVariable
+hi def link mpConstant     mfConstant
+hi def link mpOnOff        mpPrimitive
+hi def link mpDash         mpPrimitive
+hi def link mpTeXKeyword   Identifier
+
+let b:current_syntax = "mp"
+
+let &cpo = s:cpo_sav
+unlet! s:cpo_sav
+
+" vim:sw=2
+
+endif
diff --git a/syntax/mplayerconf.vim b/syntax/mplayerconf.vim
new file mode 100644
index 000000000..1971260b6
--- /dev/null
+++ b/syntax/mplayerconf.vim
@@ -0,0 +1,132 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mplayerconf') == -1
+
+" Vim syntax file
+" Language:             mplayer(1) configuration file
+" Maintainer:           Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2015-01-24
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword+=-
+
+syn keyword mplayerconfTodo     contained TODO FIXME XXX NOTE
+
+syn region mplayerconfComment   display oneline start='#' end='$'
+                                \ contains=mplayerconfTodo,@Spell
+
+syn keyword mplayerconfPreProc  include
+
+syn keyword mplayerconfBoolean  yes no true false
+
+syn match   mplayerconfNumber   '\<\d\+\>'
+
+syn keyword mplayerconfOption   hardframedrop nomouseinput bandwidth dumpstream
+                                \ rtsp-stream-over-tcp tv overlapsub
+                                \ sub-bg-alpha subfont-outline unicode format
+                                \ vo edl cookies fps zrfd af-adv nosound
+                                \ audio-density passlogfile vobsuboutindex autoq
+                                \ autosync benchmark colorkey nocolorkey edlout
+                                \ enqueue fixed-vo framedrop h identify input
+                                \ lircconf list-options loop menu menu-cfg
+                                \ menu-root nojoystick nolirc nortc playlist
+                                \ quiet really-quiet shuffle skin slave
+                                \ softsleep speed sstep use-stdin aid alang
+                                \ audio-demuxer audiofile audiofile-cache
+                                \ cdrom-device cache cdda channels chapter
+                                \ cookies-file demuxer dumpaudio dumpfile
+                                \ dumpvideo dvbin dvd-device dvdangle forceidx
+                                \ frames hr-mp3-seek idx ipv4-only-proxy
+                                \ loadidx mc mf ni nobps noextbased
+                                \ passwd prefer-ipv4 prefer-ipv6 rawaudio
+                                \ rawvideo saveidx sb srate ss tskeepbroken
+                                \ tsprog tsprobe user user-agent vid vivo
+                                \ dumpjacosub dumpmicrodvdsub dumpmpsub dumpsami
+                                \ dumpsrtsub dumpsub ffactor flip-hebrew font
+                                \ forcedsubsonly fribidi-charset ifo noautosub
+                                \ osdlevel sid slang spuaa spualign spugauss
+                                \ sub sub-bg-color sub-demuxer sub-fuzziness
+                                \ sub-no-text-pp subalign subcc subcp subdelay
+                                \ subfile subfont-autoscale subfont-blur
+                                \ subfont-encoding subfont-osd-scale
+                                \ subfont-text-scale subfps subpos subwidth
+                                \ utf8 vobsub vobsubid abs ao aofile aop delay
+                                \ mixer nowaveheader aa bpp brightness contrast
+                                \ dfbopts display double dr dxr2 fb fbmode
+                                \ fbmodeconfig forcexv fs fsmode-dontuse fstype
+                                \ geometry guiwid hue jpeg monitor-dotclock
+                                \ monitor-hfreq monitor-vfreq monitoraspect
+                                \ nograbpointer nokeepaspect noxv ontop panscan
+                                \ rootwin saturation screenw stop-xscreensaver
+                                \ vm vsync wid xineramascreen z zrbw zrcrop
+                                \ zrdev zrhelp zrnorm zrquality zrvdec zrxdoff
+                                \ ac af afm aspect flip lavdopts noaspect
+                                \ noslices novideo oldpp pp pphelp ssf stereo
+                                \ sws vc vfm x xvidopts xy y zoom vf vop
+                                \ audio-delay audio-preload endpos ffourcc
+                                \ include info noautoexpand noskip o oac of
+                                \ ofps ovc skiplimit v vobsubout vobsuboutid
+                                \ lameopts lavcopts nuvopts xvidencopts a52drc
+                                \ adapter af-add af-clr af-del af-pre
+                                \ allow-dangerous-playlist-parsing ass
+                                \ ass-border-color ass-bottom-margin ass-color
+                                \ ass-font-scale ass-force-style ass-hinting
+                                \ ass-line-spacing ass-styles ass-top-margin
+                                \ ass-use-margins ausid bluray-angle
+                                \ bluray-device border border-pos-x border-pos-y
+                                \ cache-min cache-seek-min capture codecpath
+                                \ codecs-file correct-pts crash-debug
+                                \ doubleclick-time dvd-speed edl-backward-delay
+                                \ edl-start-pts embeddedfonts fafmttag
+                                \ field-dominance fontconfig force-avi-aspect
+                                \ force-key-frames frameno-file fullscreen gamma
+                                \ gui gui-include gui-wid heartbeat-cmd
+                                \ heartbeat-interval hr-edl-seek
+                                \ http-header-fields idle ignore-start
+                                \ key-fifo-size list-properties menu-chroot
+                                \ menu-keepdir menu-startup mixer-channel
+                                \ monitor-orientation monitorpixelaspect
+                                \ mouse-movements msgcharset msgcolor msglevel
+                                \ msgmodule name noar nocache noconfig
+                                \ noconsolecontrols nocorrect-pts nodouble
+                                \ noedl-start-pts noencodedups
+                                \ noflip-hebrew-commas nogui noidx noodml
+                                \ nostop-xscreensaver nosub noterm-osd
+                                \ osd-duration osd-fractions panscanrange
+                                \ pausing playing-msg priority profile
+                                \ progbar-align psprobe pvr radio referrer
+                                \ refreshrate reuse-socket rtc rtc-device
+                                \ rtsp-destination rtsp-port
+                                \ rtsp-stream-over-http screenh show-profile
+                                \ softvol softvol-max sub-paths subfont
+                                \ term-osd-esc title tvscan udp-ip udp-master
+                                \ udp-port udp-seek-threshold udp-slave
+                                \ unrarexec use-filedir-conf use-filename-title
+                                \ vf-add vf-clr vf-del vf-pre volstep volume
+                                \ zrhdec zrydoff
+
+syn region  mplayerconfString   display oneline start=+"+ end=+"+
+syn region  mplayerconfString   display oneline start=+'+ end=+'+
+
+syn region  mplayerconfProfile  display oneline start='^\s*\[' end='\]'
+
+hi def link mplayerconfTodo     Todo
+hi def link mplayerconfComment  Comment
+hi def link mplayerconfPreProc  PreProc
+hi def link mplayerconfBoolean  Boolean
+hi def link mplayerconfNumber   Number
+hi def link mplayerconfOption   Keyword
+hi def link mplayerconfString   String
+hi def link mplayerconfProfile  Special
+
+let b:current_syntax = "mplayerconf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/mrxvtrc.vim b/syntax/mrxvtrc.vim
new file mode 100644
index 000000000..1b77e9c71
--- /dev/null
+++ b/syntax/mrxvtrc.vim
@@ -0,0 +1,286 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mrxvtrc') == -1
+
+" Description	: Vim syntax file for mrxvtrc (for mrxvt-0.5.0 and up)
+" Created	: Wed 26 Apr 2006 01:20:53 AM CDT
+" Modified	: Thu 02 Feb 2012 08:37:45 PM EST
+" Maintainer	: GI <a@b.c>, where a='gi1242+vim', b='gmail', c='com'
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case match
+
+" Errors
+syn match	mrxvtrcError	contained	'\v\S+'
+
+" Comments
+syn match	mrxvtrcComment	contains=@Spell '^\s*[!#].*$'
+syn match	mrxvtrcComment	'\v^\s*[#!]\s*\w+[.*]\w+.*:.*'
+
+"
+" Options.
+"
+syn match	mrxvtrcClass	'\v^\s*\w+[.*]'
+	    \ nextgroup=mrxvtrcOptions,mrxvtrcProfile,@mrxvtrcPOpts,mrxvtrcError
+
+" Boolean options
+syn keyword	mrxvtrcOptions	contained nextgroup=mrxvtrcBColon,mrxvtrcError
+				\ highlightTabOnBell syncTabTitle hideTabbar
+				\ autohideTabbar bottomTabbar hideButtons
+				\ syncTabIcon veryBoldFont maximized
+				\ fullscreen reverseVideo loginShell
+				\ jumpScroll scrollBar scrollbarRight
+				\ scrollbarFloating scrollTtyOutputInhibit
+				\ scrollTtyKeypress transparentForce
+				\ transparentScrollbar transparentMenubar
+				\ transparentTabbar tabUsePixmap utmpInhibit
+				\ visualBell mapAlert meta8
+				\ mouseWheelScrollPage multibyte_cursor
+				\ tripleclickwords showMenu xft xftNomFont
+				\ xftSlowOutput xftAntialias xftHinting
+				\ xftAutoHint xftGlobalAdvance cmdAllTabs
+				\ protectSecondary thai borderLess
+				\ overrideRedirect broadcast smartResize
+				\ pointerBlank cursorBlink noSysConfig
+				\ disableMacros linuxHomeEndKey sessionMgt
+				\ boldColors smoothResize useFifo veryBright
+syn match	mrxvtrcOptions	contained nextgroup=mrxvtrcBColon,mrxvtrcError
+				\ '\v<transparent>'
+syn match	mrxvtrcBColon	contained skipwhite
+				\ nextgroup=mrxvtrcBoolVal,mrxvtrcError ':'
+syn case ignore
+syn keyword	mrxvtrcBoolVal	contained skipwhite nextgroup=mrxvtrcError
+				\ 0 1 yes no on off true false
+syn case match
+
+" Color options
+syn keyword	mrxvtrcOptions	contained nextgroup=mrxvtrcCColon,mrxvtrcError
+				\ ufBackground textShadow tabForeground
+				\ itabForeground tabBackground itabBackground
+				\ scrollColor troughColor highlightColor
+				\ cursorColor cursorColor2 pointerColor
+				\ borderColor tintColor
+syn match	mrxvtrcOptions	contained nextgroup=mrxvtrcCColon,mrxvtrcError
+				\ '\v<color([0-9]|1[0-5]|BD|UL|RV)>'
+syn match	mrxvtrcCColon	contained skipwhite
+				\ nextgroup=mrxvtrcColorVal ':'
+syn match	mrxvtrcColorVal	contained skipwhite nextgroup=mrxvtrcError
+				\ '\v#[0-9a-fA-F]{6}'
+
+" Numeric options
+syn keyword	mrxvtrcOptions	contained nextgroup=mrxvtrcNColon,mrxvtrcError
+				\ maxTabWidth minVisibleTabs
+				\ scrollbarThickness xftmSize xftSize desktop
+				\ externalBorder internalBorder lineSpace
+				\ pointerBlankDelay cursorBlinkInterval
+				\ shading backgroundFade bgRefreshInterval
+				\ fading opacity opacityDegree xftPSize
+syn match	mrxvtrcNColon	contained skipwhite
+				\ nextgroup=mrxvtrcNumVal,mrxvtrcError ':'
+syn match	mrxvtrcNumVal	contained skipwhite nextgroup=mrxvtrcError
+				\ '\v[+-]?<(0[0-7]+|\d+|0x[0-9a-f]+)>'
+
+" String options
+syn keyword	mrxvtrcOptions	contained nextgroup=mrxvtrcSColon,mrxvtrcError
+				\ tabTitle termName title clientName iconName
+				\ bellCommand backspaceKey deleteKey
+				\ printPipe cutChars answerbackString
+				\ smClientID geometry path boldFont xftFont
+				\ xftmFont xftPFont inputMethod
+				\ greektoggle_key menu menubarPixmap
+				\ scrollbarPixmap tabbarPixmap appIcon
+				\ multichar_encoding initProfileList
+syn match	mrxvtrcOptions	contained nextgroup=mrxvtrcSColon,mrxvtrcError
+				\ '\v<m?font[1-5]?>'
+syn match	mrxvtrcSColon	contained skipwhite nextgroup=mrxvtrcStrVal ':'
+syn match	mrxvtrcStrVal	contained '\v\S.*'
+
+" Profile options
+syn cluster	mrxvtrcPOpts	contains=mrxvtrcPSOpts,mrxvtrcPCOpts,mrxvtrcPNOpts
+syn match	mrxvtrcProfile	contained nextgroup=@mrxvtrcPOpts,mrxvtrcError
+				\ '\vprofile\d+\.'
+syn keyword	mrxvtrcPSOpts	contained nextgroup=mrxvtrcSColon,mrxvtrcError
+				\ tabTitle command holdExitText holdExitTitle
+				\ Pixmap workingDirectory titleFormat
+				\ winTitleFormat
+syn keyword	mrxvtrcPCOpts	contained nextgroup=mrxvtrcCColon,mrxvtrcError
+				\ background foreground
+syn keyword	mrxvtrcPNOpts	contained nextgroup=mrxvtrcNColon,mrxvtrcError
+				\ holdExit saveLines
+
+" scrollbarStyle
+syn match	mrxvtrcOptions	contained skipwhite
+				\ nextgroup=mrxvtrcSBstyle,mrxvtrcError
+				\ '\v<scrollbarStyle:'
+syn keyword	mrxvtrcSBstyle	contained skipwhite nextgroup=mrxvtrcError
+				\ plain xterm rxvt next sgi
+
+" scrollbarAlign
+syn match	mrxvtrcOptions	contained skipwhite
+				\ nextgroup=mrxvtrcSBalign,mrxvtrcError
+				\ '\v<scrollbarAlign:'
+syn keyword	mrxvtrcSBalign	contained skipwhite nextgroup=mrxvtrcError
+				\ top bottom
+
+" textShadowMode
+syn match	mrxvtrcOptions	contained skipwhite
+				\ nextgroup=mrxvtrcTSmode,mrxvtrcError
+				\ '\v<textShadowMode:'
+syn keyword	mrxvtrcTSmode	contained skipwhite nextgroup=mrxvtrcError
+				\ none top bottom left right topleft topright
+				\ botleft botright
+
+" greek_keyboard
+syn match	mrxvtrcOptions	contained skipwhite
+				\ nextgroup=mrxvtrcGrkKbd,mrxvtrcError
+				\ '\v<greek_keyboard:'
+syn keyword	mrxvtrcGrkKbd	contained skipwhite nextgroup=mrxvtrcError
+				\ iso ibm
+
+" xftWeight
+syn match	mrxvtrcOptions	contained skipwhite
+				\ nextgroup=mrxvtrcXftWt,mrxvtrcError
+				\ '\v<(xftWeight|xftBoldWeight):'
+syn keyword	mrxvtrcXftWt	contained skipwhite nextgroup=mrxvtrcError
+				\ light medium demibold bold black
+
+" xftSlant
+syn match	mrxvtrcOptions	contained skipwhite
+				\ nextgroup=mrxvtrcXftSl,mrxvtrcError
+				\ '\v<xftSlant:'
+syn keyword	mrxvtrcXftSl	contained skipwhite nextgroup=mrxvtrcError
+				\ roman italic oblique
+
+" xftWidth
+syn match	mrxvtrcOptions	contained skipwhite
+				\ nextgroup=mrxvtrcXftWd,mrxvtrcError
+				\ '\v<xftWidth:'
+syn keyword	mrxvtrcXftWd	contained skipwhite nextgroup=mrxvtrcError
+				\ ultracondensed ultraexpanded
+				\ condensed expanded normal
+
+" xftRGBA
+syn match	mrxvtrcOptions	contained skipwhite
+				\ nextgroup=mrxvtrcXftHt,mrxvtrcError
+				\ '\v<xftRGBA:'
+syn keyword	mrxvtrcXftHt	contained skipwhite nextgroup=mrxvtrcError
+				\ rgb bgr vrgb vbgr none
+
+" preeditType
+syn match	mrxvtrcOptions	contained skipwhite
+				\ nextgroup=mrxvtrcPedit,mrxvtrcError
+				\ '\v<preeditType:'
+syn keyword	mrxvtrcPedit	contained skipwhite nextgroup=mrxvtrcError
+				\ OverTheSpot OffTheSpot Root
+
+" modifier
+syn match	mrxvtrcOptions	contained skipwhite
+				\ nextgroup=mrxvtrcMod,mrxvtrcError
+				\ '\v<modifier:'
+syn keyword	mrxvtrcMod	contained skipwhite nextgroup=mrxvtrcError
+				\ alt meta hyper super mod1 mod2 mod3 mod4 mod5
+
+" selectStyle
+syn match	mrxvtrcOptions	contained skipwhite
+				\ nextgroup=mrxvtrcSelSty,mrxvtrcError
+				\ '\v<selectStyle:'
+syn keyword	mrxvtrcSelSty	contained skipwhite nextgroup=mrxvtrcError
+				\ old oldword
+
+
+"
+" Macros
+"
+syn keyword	mrxvtrcOptions	contained nextgroup=mrxvtrcKey,mrxvtrcError
+				\ macro
+syn case ignore
+syn match	mrxvtrcKey	contained skipwhite
+			    \ nextgroup=mrxvtrcMacro,mrxvtrcError
+			    \ '\v\.((primary|add|ctrl|alt|meta|shift)\+)*\w+:'
+syn case match
+
+" Macros without arguments
+syn keyword	mrxvtrcMacro	contained skipwhite nextgroup=mrxvtrcError
+				\ Dummy Copy Paste ToggleVeryBold
+				\ ToggleTransparency ToggleBroadcast
+				\ ToggleHold SetTitle ToggleMacros
+				\ ToggleFullscreen Raise
+
+" Macros with a string argument
+syn keyword	mrxvtrcMacro	contained skipwhite nextgroup=mrxvtrcStrVal
+				\ Esc Str Exec Scroll PrintScreen SaveConfig
+
+" Macros with a numeric argument
+syn keyword	mrxvtrcMacro	contained skipwhite
+				\ nextgroup=mrxvtrcNumVal,mrxvtrcError
+				\ Close GotoTab MoveTab ResizeFont UseFifo
+
+" NewTab macro
+syn keyword	mrxvtrcMacro	contained skipwhite
+				\ nextgroup=mrxvtrcTitle,mrxvtrcShell,mrxvtrcCmd
+				\ NewTab
+syn region	mrxvtrcTitle	contained oneline skipwhite
+				\ nextgroup=mrxvtrcShell,mrxvtrcCmd
+				\ start='"' end='"'
+syn match	mrxvtrcShell	contained nextgroup=mrxvtrcCmd '!' 
+syn match	mrxvtrcCmd	contained '\v[^!" \t].*'
+
+" ToggleSubwin macro
+syn keyword	mrxvtrcMacro	contained skipwhite
+				\ nextgroup=mrxvtrcSubwin,mrxvtrcError
+				\ ToggleSubwin
+syn match	mrxvtrcSubwin	contained skipwhite nextgroup=mrxvtrcError
+				\ '\v[-+]?[bmst]>'
+
+"
+" Highlighting groups
+"
+hi def link mrxvtrcError	Error
+hi def link mrxvtrcComment	Comment
+
+hi def link mrxvtrcClass	Statement
+hi def link mrxvtrcOptions	mrxvtrcClass
+hi def link mrxvtrcBColon	mrxvtrcClass
+hi def link mrxvtrcCColon	mrxvtrcClass
+hi def link mrxvtrcNColon	mrxvtrcClass
+hi def link mrxvtrcSColon	mrxvtrcClass
+hi def link mrxvtrcProfile	mrxvtrcClass
+hi def link mrxvtrcPSOpts	mrxvtrcClass
+hi def link mrxvtrcPCOpts	mrxvtrcClass
+hi def link mrxvtrcPNOpts	mrxvtrcClass
+
+hi def link mrxvtrcBoolVal	Boolean
+hi def link mrxvtrcStrVal	String
+hi def link mrxvtrcColorVal	Constant
+hi def link mrxvtrcNumVal	Number
+
+hi def link mrxvtrcSBstyle	mrxvtrcStrVal
+hi def link mrxvtrcSBalign	mrxvtrcStrVal
+hi def link mrxvtrcTSmode	mrxvtrcStrVal
+hi def link mrxvtrcGrkKbd	mrxvtrcStrVal
+hi def link mrxvtrcXftWt	mrxvtrcStrVal
+hi def link mrxvtrcXftSl	mrxvtrcStrVal
+hi def link mrxvtrcXftWd	mrxvtrcStrVal
+hi def link mrxvtrcXftHt	mrxvtrcStrVal
+hi def link mrxvtrcPedit	mrxvtrcStrVal
+hi def link mrxvtrcMod		mrxvtrcStrVal
+hi def link mrxvtrcSelSty	mrxvtrcStrVal
+
+hi def link mrxvtrcMacro	Identifier
+hi def link mrxvtrcKey		mrxvtrcClass
+hi def link mrxvtrcTitle	mrxvtrcStrVal
+hi def link mrxvtrcShell	Special
+hi def link mrxvtrcCmd		PreProc
+hi def link mrxvtrcSubwin	mrxvtrcStrVal
+
+let b:current_syntax = "mrxvtrc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/msidl.vim b/syntax/msidl.vim
new file mode 100644
index 000000000..8a09710a9
--- /dev/null
+++ b/syntax/msidl.vim
@@ -0,0 +1,88 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'msidl') == -1
+
+" Vim syntax file
+" Language:     MS IDL (Microsoft dialect of Interface Description Language)
+" Maintainer:   Vadim Zeitlin <vadim@wxwindows.org>
+" Last Change:  2012 Feb 12 by Thilo Six
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Misc basic
+syn match   msidlId		"[a-zA-Z][a-zA-Z0-9_]*"
+syn match   msidlUUID		"{\?[[:xdigit:]]\{8}-\([[:xdigit:]]\{4}-\)\{3}[[:xdigit:]]\{12}}\?"
+syn region  msidlString		start=/"/  skip=/\\\(\\\\\)*"/	end=/"/
+syn match   msidlLiteral	"\d\+\(\.\d*\)\="
+syn match   msidlLiteral	"\.\d\+"
+syn match   msidlSpecial	contained "[]\[{}:]"
+
+" Comments
+syn keyword msidlTodo		contained TODO FIXME XXX
+syn region  msidlComment	start="/\*"  end="\*/" contains=msidlTodo
+syn match   msidlComment	"//.*" contains=msidlTodo
+syn match   msidlCommentError	"\*/"
+
+" C style Preprocessor
+syn region  msidlIncluded	contained start=+"+  skip=+\\\(\\\\\)*"+  end=+"+
+syn match   msidlIncluded	contained "<[^>]*>"
+syn match   msidlInclude	"^[ \t]*#[ \t]*include\>[ \t]*["<]" contains=msidlIncluded,msidlString
+syn region  msidlPreCondit	start="^[ \t]*#[ \t]*\(if\>\|ifdef\>\|ifndef\>\|elif\>\|else\>\|endif\>\)"  skip="\\$"	end="$" contains=msidlComment,msidlCommentError
+syn region  msidlDefine		start="^[ \t]*#[ \t]*\(define\>\|undef\>\)" skip="\\$" end="$" contains=msidlLiteral, msidlString
+
+" Attributes
+syn keyword msidlAttribute      contained in out propget propput propputref retval
+syn keyword msidlAttribute      contained aggregatable appobject binadable coclass control custom default defaultbind defaultcollelem defaultvalue defaultvtable dispinterface displaybind dual entry helpcontext helpfile helpstring helpstringdll hidden id immediatebind lcid library licensed nonbrowsable noncreatable nonextensible oleautomation optional object public readonly requestedit restricted source string uidefault usesgetlasterror vararg version
+syn match   msidlAttribute      /uuid(.*)/he=s+4 contains=msidlUUID
+syn match   msidlAttribute      /helpstring(.*)/he=s+10 contains=msidlString
+syn region  msidlAttributes     start="\[" end="]" keepend contains=msidlSpecial,msidlString,msidlAttribute,msidlComment,msidlCommentError
+
+" Keywords
+syn keyword msidlEnum		enum
+syn keyword msidlImport		import importlib
+syn keyword msidlStruct		interface library coclass
+syn keyword msidlTypedef	typedef
+
+" Types
+syn keyword msidlStandardType   byte char double float hyper int long short void wchar_t
+syn keyword msidlStandardType   BOOL BSTR HRESULT VARIANT VARIANT_BOOL
+syn region  msidlSafeArray      start="SAFEARRAY(" end=")" contains=msidlStandardType
+
+syn sync lines=50
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link msidlInclude		Include
+hi def link msidlPreProc		PreProc
+hi def link msidlPreCondit		PreCondit
+hi def link msidlDefine		Macro
+hi def link msidlIncluded		String
+hi def link msidlString		String
+hi def link msidlComment		Comment
+hi def link msidlTodo		Todo
+hi def link msidlSpecial		SpecialChar
+hi def link msidlLiteral		Number
+hi def link msidlUUID		Number
+
+hi def link msidlImport		Include
+hi def link msidlEnum		StorageClass
+hi def link msidlStruct		Structure
+hi def link msidlTypedef		Typedef
+hi def link msidlAttribute		StorageClass
+
+hi def link msidlStandardType	Type
+hi def link msidlSafeArray		Type
+
+
+let b:current_syntax = "msidl"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vi: set ts=8 sw=4:
+
+endif
diff --git a/syntax/msql.vim b/syntax/msql.vim
new file mode 100644
index 000000000..2728724de
--- /dev/null
+++ b/syntax/msql.vim
@@ -0,0 +1,87 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'msql') == -1
+
+" Vim syntax file
+" Language:	msql
+" Maintainer:	Lutz Eymers <ixtab@polzin.com>
+" URL:		http://www.isp.de/data/msql.vim
+" Email:	Subject: send syntax_vim.tgz
+" Last Change:	2001 May 10
+"
+" Options	msql_sql_query = 1 for SQL syntax highligthing inside strings
+"		msql_minlines = x     to sync at least x lines backwards
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'msql'
+endif
+
+runtime! syntax/html.vim
+unlet b:current_syntax
+
+syn cluster htmlPreproc add=msqlRegion
+
+syn case match
+
+" Internal Variables
+syn keyword msqlIntVar ERRMSG contained
+
+" Env Variables
+syn keyword msqlEnvVar SERVER_SOFTWARE SERVER_NAME SERVER_URL GATEWAY_INTERFACE contained
+syn keyword msqlEnvVar SERVER_PROTOCOL SERVER_PORT REQUEST_METHOD PATH_INFO  contained
+syn keyword msqlEnvVar PATH_TRANSLATED SCRIPT_NAME QUERY_STRING REMOTE_HOST contained
+syn keyword msqlEnvVar REMOTE_ADDR AUTH_TYPE REMOTE_USER CONTEN_TYPE  contained
+syn keyword msqlEnvVar CONTENT_LENGTH HTTPS HTTPS_KEYSIZE HTTPS_SECRETKEYSIZE  contained
+syn keyword msqlEnvVar HTTP_ACCECT HTTP_USER_AGENT HTTP_IF_MODIFIED_SINCE  contained
+syn keyword msqlEnvVar HTTP_FROM HTTP_REFERER contained
+
+" Inlclude lLite
+syn include @msqlLite <sfile>:p:h/lite.vim
+
+" Msql Region
+syn region msqlRegion matchgroup=Delimiter start="<!$" start="<![^!->D]" end=">" contains=@msqlLite,msql.*
+
+" sync
+if exists("msql_minlines")
+  exec "syn sync minlines=" . msql_minlines
+else
+  syn sync minlines=100
+endif
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link msqlComment		Comment
+hi def link msqlString		String
+hi def link msqlNumber		Number
+hi def link msqlFloat		Float
+hi def link msqlIdentifier	Identifier
+hi def link msqlGlobalIdentifier	Identifier
+hi def link msqlIntVar		Identifier
+hi def link msqlEnvVar		Identifier
+hi def link msqlFunctions		Function
+hi def link msqlRepeat		Repeat
+hi def link msqlConditional	Conditional
+hi def link msqlStatement		Statement
+hi def link msqlType		Type
+hi def link msqlInclude		Include
+hi def link msqlDefine		Define
+hi def link msqlSpecialChar	SpecialChar
+hi def link msqlParentError	Error
+hi def link msqlTodo		Todo
+hi def link msqlOperator		Operator
+hi def link msqlRelation		Operator
+
+
+let b:current_syntax = "msql"
+
+if main_syntax == 'msql'
+  unlet main_syntax
+endif
+
+" vim: ts=8
+
+endif
diff --git a/syntax/mupad.vim b/syntax/mupad.vim
new file mode 100644
index 000000000..9e102149d
--- /dev/null
+++ b/syntax/mupad.vim
@@ -0,0 +1,287 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mupad') == -1
+
+" Vim syntax file
+" Language:    MuPAD source
+" Maintainer:  Dave Silvia <dsilvia@mchsi.com>
+" Filenames:   *.mu
+" Date:        6/30/2004
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Set default highlighting to Win2k
+if !exists("mupad_cmdextversion")
+  let mupad_cmdextversion = 2
+endif
+
+syn case match
+
+syn match mupadComment	"//\p*$"
+syn region mupadComment	start="/\*"	end="\*/"
+
+syn region mupadString	start="\""	skip=/\\"/	end="\""
+
+syn match mupadOperator		"(\|)\|:=\|::\|:\|;"
+" boolean
+syn keyword mupadOperator	and	or	not	xor
+syn match mupadOperator		"==>\|\<=\>"
+
+" Informational
+syn keyword mupadSpecial		FILEPATH	NOTEBOOKFILE	NOTEBOOKPATH
+" Set-able, e.g., DIGITS:=10
+syn keyword mupadSpecial		DIGITS		HISTORY		LEVEL
+syn keyword mupadSpecial		MAXLEVEL	MAXDEPTH	ORDER
+syn keyword mupadSpecial		TEXTWIDTH
+" Set-able, e.g., PRETTYPRINT:=TRUE
+syn keyword mupadSpecial		PRETTYPRINT
+" Set-able, e.g., LIBPATH:="C:\\MuPAD Pro\\mylibdir" or LIBPATH:="/usr/MuPAD Pro/mylibdir"
+syn keyword mupadSpecial		LIBPATH		PACKAGEPATH
+syn keyword mupadSpecial		READPATH	TESTPATH	WRITEPATH
+" Symbols and Constants
+syn keyword mupadDefine		FAIL		NIL
+syn keyword mupadDefine		TRUE		FALSE		UNKNOWN
+syn keyword mupadDefine		complexInfinity		infinity
+syn keyword mupadDefine		C_	CATALAN	E	EULER	I	PI	Q_	R_
+syn keyword mupadDefine		RD_INF	RD_NINF	undefined	unit	universe	Z_
+" print() directives
+syn keyword mupadDefine		Unquoted	NoNL	KeepOrder	Typeset
+" domain specifics
+syn keyword mupadStatement	domain	begin	end_domain	end
+syn keyword mupadIdentifier	inherits	category	axiom	info	doc interface
+" basic programming statements
+syn keyword mupadStatement	proc	begin	end_proc
+syn keyword mupadUnderlined	name	local	option	save
+syn keyword mupadConditional	if	then	elif	else	end_if
+syn keyword mupadConditional	case	of	do	break	end_case
+syn keyword mupadRepeat		for	do	next	break	end_for
+syn keyword mupadRepeat		while	do	next break end_while
+syn keyword mupadRepeat		repeat	next break until	end_repeat
+" domain packages/libraries
+syn keyword mupadType			detools	import	linalg	numeric	numlib	plot	polylib
+syn match mupadType				'\<DOM_\w*\>'
+
+"syn keyword mupadFunction	contains
+" Functions dealing with prime numbers
+syn keyword mupadFunction	phi	invphi	mersenne	nextprime	numprimedivisors
+syn keyword mupadFunction	pollard	prevprime	primedivisors
+" Functions operating on Lists, Matrices, Sets, ...
+syn keyword mupadFunction	array	_index
+" Evaluation
+syn keyword mupadFunction	float contains
+" stdlib
+syn keyword mupadFunction	_exprseq	_invert	_lazy_and	_lazy_or	_negate
+syn keyword mupadFunction	_stmtseq	_invert	intersect	minus		union
+syn keyword mupadFunction	Ci	D	Ei	O	Re	Im	RootOf	Si
+syn keyword mupadFunction	Simplify
+syn keyword mupadFunction	abs	airyAi	airyBi	alias	unalias	anames	append
+syn keyword mupadFunction	arcsin	arccos	arctan	arccsc	arcsec	arccot
+syn keyword mupadFunction	arcsinh	arccosh	arctanh	arccsch	arcsech	arccoth
+syn keyword mupadFunction	arg	args	array	assert	assign	assignElements
+syn keyword mupadFunction	assume	assuming	asympt	bernoulli
+syn keyword mupadFunction	besselI	besselJ	besselK	besselY	beta	binomial	bool
+syn keyword mupadFunction	bytes	card
+syn keyword mupadFunction	ceil	floor	round	trunc
+syn keyword mupadFunction	coeff	coerce	collect	combine	copyClosure
+syn keyword mupadFunction	conjugate	content	context	contfrac
+syn keyword mupadFunction	debug	degree	degreevec	delete	_delete	denom
+syn keyword mupadFunction	densematrix	diff	dilog	dirac	discont	div	_div
+syn keyword mupadFunction	divide	domtype	doprint	erf	erfc	error	eval	evalassign
+syn keyword mupadFunction	evalp	exp	expand	export	unexport	expose	expr
+syn keyword mupadFunction	expr2text	external	extnops	extop	extsubsop
+syn keyword mupadFunction	fact	fact2	factor	fclose	finput	fname	fopen	fprint
+syn keyword mupadFunction	fread	ftextinput	readbitmap	readdata	pathname
+syn keyword mupadFunction	protocol	read	readbytes	write	writebytes
+syn keyword mupadFunction	float	frac	frame	_frame	frandom	freeze	unfreeze
+syn keyword mupadFunction	funcenv	gamma	gcd	gcdex	genident	genpoly
+syn keyword mupadFunction	getpid	getprop	ground	has	hastype	heaviside	help
+syn keyword mupadFunction	history	hold	hull	hypergeom	icontent	id
+syn keyword mupadFunction	ifactor	igamma	igcd	igcdex	ilcm	in	_in
+syn keyword mupadFunction	indets	indexval	info	input	int	int2text
+syn keyword mupadFunction	interpolate	interval	irreducible	is
+syn keyword mupadFunction	isprime	isqrt	iszero	ithprime	kummerU	lambertW
+syn keyword mupadFunction	last	lasterror	lcm	lcoeff	ldegree	length
+syn keyword mupadFunction	level	lhs	rhs	limit	linsolve	lllint
+syn keyword mupadFunction	lmonomial	ln	loadmod	loadproc	log	lterm
+syn keyword mupadFunction	match	map	mapcoeffs	maprat	matrix	max	min
+syn keyword mupadFunction	mod	modp	mods	monomials	multcoeffs	new
+syn keyword mupadFunction	newDomain	_next	nextprime	nops
+syn keyword mupadFunction	norm	normal	nterms	nthcoeff	nthmonomial	nthterm
+syn keyword mupadFunction	null	numer	ode	op	operator	package
+syn keyword mupadFunction	pade	partfrac	patchlevel	pdivide
+syn keyword mupadFunction	piecewise	plot	plotfunc2d	plotfunc3d
+syn keyword mupadFunction	poly	poly2list	polylog	powermod	print
+syn keyword mupadFunction	product	protect	psi	quit	_quit	radsimp	random	rationalize
+syn keyword mupadFunction	rec	rectform	register	reset	return	revert
+syn keyword mupadFunction	rewrite	select	series	setuserinfo	share	sign	signIm
+syn keyword mupadFunction	simplify
+syn keyword mupadFunction	sin	cos	tan	csc	sec	cot
+syn keyword mupadFunction	sinh	cosh	tanh	csch	sech	coth
+syn keyword mupadFunction	slot	solve
+syn keyword mupadFunction	pdesolve	matlinsolve	matlinsolveLU	toeplitzSolve
+syn keyword mupadFunction	vandermondeSolve	fsolve	odesolve	odesolve2
+syn keyword mupadFunction	polyroots	polysysroots	odesolveGeometric
+syn keyword mupadFunction	realroot	realroots	mroots	lincongruence
+syn keyword mupadFunction	msqrts
+syn keyword mupadFunction	sort	split	sqrt	strmatch	strprint
+syn keyword mupadFunction	subs	subset	subsex	subsop	substring	sum
+syn keyword mupadFunction	surd	sysname	sysorder	system	table	taylor	tbl2text
+syn keyword mupadFunction	tcoeff	testargs	testeq	testtype	text2expr
+syn keyword mupadFunction	text2int	text2list	text2tbl	rtime	time
+syn keyword mupadFunction	traperror	type	unassume	unit	universe
+syn keyword mupadFunction	unloadmod	unprotect	userinfo	val	version
+syn keyword mupadFunction	warning	whittakerM	whittakerW	zeta	zip
+
+" graphics  plot::
+syn keyword mupadFunction	getDefault	setDefault	copy	modify	Arc2d	Arrow2d
+syn keyword mupadFunction	Arrow3d	Bars2d	Bars3d	Box	Boxplot	Circle2d	Circle3d
+syn keyword mupadFunction	Cone	Conformal	Curve2d	Curve3d	Cylinder	Cylindrical
+syn keyword mupadFunction	Density	Ellipse2d	Function2d	Function3d	Hatch
+syn keyword mupadFunction	Histogram2d	HOrbital	Implicit2d	Implicit3d
+syn keyword mupadFunction	Inequality	Iteration	Line2d	Line3d	Lsys	Matrixplot
+syn keyword mupadFunction	MuPADCube	Ode2d	Ode3d	Parallelogram2d	Parallelogram3d
+syn keyword mupadFunction	Piechart2d	Piechart3d	Point2d	Point3d	Polar
+syn keyword mupadFunction	Polygon2d	Polygon3d	Raster	Rectangle	Sphere
+syn keyword mupadFunction	Ellipsoid	Spherical	Sum	Surface	SurfaceSet
+syn keyword mupadFunction	SurfaceSTL	Tetrahedron	Hexahedron	Octahedron
+syn keyword mupadFunction	Dodecahedron	Icosahedron	Text2d	Text3d	Tube	Turtle
+syn keyword mupadFunction	VectorField2d	XRotate	ZRotate	Canvas	CoordinateSystem2d
+syn keyword mupadFunction	CoordinateSystem3d	Group2d	Group3d	Scene2d	Scene3d	ClippingBox
+syn keyword mupadFunction	Rotate2d	Rotate3d	Scale2d	Scale3d	Transform2d
+syn keyword mupadFunction	Transform3d	Translate2d	Translate3d	AmbientLight
+syn keyword mupadFunction	Camera	DistantLight	PointLight	SpotLight
+
+" graphics Attributes
+" graphics  Output Attributes
+syn keyword mupadIdentifier	OutputFile	OutputOptions
+" graphics  Defining Attributes
+syn keyword mupadIdentifier	Angle	AngleRange	AngleBegin	AngleEnd
+syn keyword mupadIdentifier	Area	Axis	AxisX	AxisY	AxisZ	Base	Top
+syn keyword mupadIdentifier	BaseX	TopX	BaseY	TopY	BaseZ	TopZ
+syn keyword mupadIdentifier	BaseRadius	TopRadius	Cells
+syn keyword mupadIdentifier	Center	CenterX	CenterY	CenterZ
+syn keyword mupadIdentifier	Closed	ColorData	CommandList	Contours	CoordinateType
+syn keyword mupadIdentifier	Data	DensityData	DensityFunction	From	To
+syn keyword mupadIdentifier	FromX	ToX	FromY	ToY	FromZ	ToZ
+syn keyword mupadIdentifier	Function	FunctionX	FunctionY	FunctionZ
+syn keyword mupadIdentifier	Function1	Function2	Baseline
+syn keyword mupadIdentifier	Generations	RotationAngle	IterationRules	StartRule StepLength
+syn keyword mupadIdentifier	TurtleRules	Ground	Heights	Moves	Inequalities
+syn keyword mupadIdentifier	InputFile	Iterations	StartingPoint
+syn keyword mupadIdentifier	LineColorFunction	FillColorFunction
+syn keyword mupadIdentifier	Matrix2d	Matrix3d
+syn keyword mupadIdentifier	MeshList	MeshListType	MeshListNormals
+syn keyword mupadIdentifier	MagneticQuantumNumber	MomentumQuantumNumber	PrincipalQuantumNumber
+syn keyword mupadIdentifier	Name	Normal	NormalX	NormalY	NormalZ
+syn keyword mupadIdentifier	ParameterName	ParameterBegin	ParameterEnd	ParameterRange
+syn keyword mupadIdentifier	Points2d	Points3d	Radius	RadiusFunction
+syn keyword mupadIdentifier	Position	PositionX	PositionY	PositionZ
+syn keyword mupadIdentifier	Scale	ScaleX	ScaleY	ScaleZ Shift	ShiftX	ShiftY	ShiftZ
+syn keyword mupadIdentifier	SemiAxes	SemiAxisX	SemiAxisY	SemiAxisZ
+syn keyword mupadIdentifier	Tangent1	Tangent1X	Tangent1Y	Tangent1Z
+syn keyword mupadIdentifier	Tangent2	Tangent2X	Tangent2Y	Tangent2Z
+syn keyword mupadIdentifier	Text	TextOrientation	TextRotation
+syn keyword mupadIdentifier	UName	URange	UMin	UMax	VName	VRange	VMin	VMax
+syn keyword mupadIdentifier	XName	XRange	XMin	XMax	YName	YRange	YMin	YMax
+syn keyword mupadIdentifier	ZName	ZRange	ZMin	ZMax	ViewingBox
+syn keyword mupadIdentifier	ViewingBoxXMin	ViewingBoxXMax	ViewingBoxXRange
+syn keyword mupadIdentifier	ViewingBoxYMin	ViewingBoxYMax	ViewingBoxYRange
+syn keyword mupadIdentifier	ViewingBoxZMin	ViewingBoxZMax	ViewingBoxZRange
+syn keyword mupadIdentifier	Visible
+" graphics  Axis Attributes
+syn keyword mupadIdentifier	Axes	AxesInFront	AxesLineColor	AxesLineWidth
+syn keyword mupadIdentifier	AxesOrigin	AxesOriginX	AxesOriginY	AxesOriginZ
+syn keyword mupadIdentifier	AxesTips	AxesTitleAlignment
+syn keyword mupadIdentifier	AxesTitleAlignmentX	AxesTitleAlignmentY	AxesTitleAlignmentZ
+syn keyword mupadIdentifier	AxesTitles	XAxisTitle	YAxisTitle	ZAxisTitle
+syn keyword mupadIdentifier	AxesVisible	XAxisVisible	YAxisVisible	ZAxisVisible
+syn keyword mupadIdentifier	YAxisTitleOrientation
+" graphics  Tick Marks Attributes
+syn keyword mupadIdentifier	TicksAnchor	XTicksAnchor	YTicksAnchor	ZTicksAnchor
+syn keyword mupadIdentifier	TicksAt	XTicksAt	YTicksAt	ZTicksAt
+syn keyword mupadIdentifier	TicksBetween	XTicksBetween	YTicksBetween	ZTicksBetween
+syn keyword mupadIdentifier	TicksDistance	XTicksDistance	YTicksDistance	ZTicksDistance
+syn keyword mupadIdentifier	TicksNumber	XTicksNumber	YTicksNumber	ZTicksNumber
+syn keyword mupadIdentifier	TicksVisible	XTicksVisible	YTicksVisible	ZTicksVisible
+syn keyword mupadIdentifier	TicksLength	TicksLabelStyle
+syn keyword mupadIdentifier	XTicksLabelStyle	YTicksLabelStyle	ZTicksLabelStyle
+syn keyword mupadIdentifier	TicksLabelsVisible
+syn keyword mupadIdentifier	XTicksLabelsVisible	YTicksLabelsVisible	ZTicksLabelsVisible
+" graphics  Grid Lines Attributes
+syn keyword mupadIdentifier	GridInFront	GridLineColor	SubgridLineColor
+syn keyword mupadIdentifier	GridLineStyle	SubgridLineStyle GridLineWidth	SubgridLineWidth
+syn keyword mupadIdentifier	GridVisible	XGridVisible	YGridVisible	ZGridVisible
+syn keyword mupadIdentifier	SubgridVisible	XSubgridVisible	YSubgridVisible	ZSubgridVisible
+" graphics  Animation Attributes
+syn keyword mupadIdentifier	Frames	TimeRange	TimeBegin	TimeEnd
+syn keyword mupadIdentifier	VisibleAfter	VisibleBefore	VisibleFromTo
+syn keyword mupadIdentifier	VisibleAfterEnd	VisibleBeforeBegin
+" graphics  Annotation Attributes
+syn keyword mupadIdentifier	Footer	Header	FooterAlignment	HeaderAlignment
+syn keyword mupadIdentifier	HorizontalAlignment	TitleAlignment	VerticalAlignment
+syn keyword mupadIdentifier	Legend	LegendEntry	LegendText
+syn keyword mupadIdentifier	LegendAlignment	LegendPlacement	LegendVisible
+syn keyword mupadIdentifier	Title	Titles
+syn keyword mupadIdentifier	TitlePosition	TitlePositionX	TitlePositionY	TitlePositionZ
+" graphics  Layout Attributes
+syn keyword mupadIdentifier	Bottom	Left	Height	Width	Layout	Rows	Columns
+syn keyword mupadIdentifier	Margin	BottomMargin	TopMargin	LeftMargin	RightMargin
+syn keyword mupadIdentifier	OutputUnits	Spacing
+" graphics  Calculation Attributes
+syn keyword mupadIdentifier	AdaptiveMesh	DiscontinuitySearch	Mesh	SubMesh
+syn keyword mupadIdentifier	UMesh	USubMesh	VMesh	VSubMesh
+syn keyword mupadIdentifier	XMesh	XSubMesh	YMesh	YSubMesh	Zmesh
+" graphics  Camera and Lights Attributes
+syn keyword mupadIdentifier	CameraCoordinates	CameraDirection
+syn keyword mupadIdentifier	CameraDirectionX	CameraDirectionY	CameraDirectionZ
+syn keyword mupadIdentifier	FocalPoint	FocalPointX	FocalPointY	FocalPointZ
+syn keyword mupadIdentifier	LightColor	Lighting	LightIntensity	OrthogonalProjection
+syn keyword mupadIdentifier	SpotAngle	ViewingAngle
+syn keyword mupadIdentifier	Target	TargetX	TargetY	TargetZ
+" graphics  Presentation Style and Fonts Attributes
+syn keyword mupadIdentifier	ArrowLength
+syn keyword mupadIdentifier	AxesTitleFont	FooterFont	HeaderFont	LegendFont
+syn keyword mupadIdentifier	TextFont	TicksLabelFont	TitleFont
+syn keyword mupadIdentifier	BackgroundColor	BackgroundColor2	BackgroundStyle
+syn keyword mupadIdentifier	BackgroundTransparent	Billboarding	BorderColor	BorderWidth
+syn keyword mupadIdentifier	BoxCenters	BoxWidths	DrawMode Gap	XGap	YGap
+syn keyword mupadIdentifier	Notched	NotchWidth	Scaling	YXRatio	ZXRatio
+syn keyword mupadIdentifier	VerticalAsymptotesVisible	VerticalAsymptotesStyle
+syn keyword mupadIdentifier	VerticalAsymptotesColor	VerticalAsymptotesWidth
+" graphics  Line Style Attributes
+syn keyword mupadIdentifier	LineColor	LineColor2	LineColorType	LineStyle
+syn keyword mupadIdentifier	LinesVisible	ULinesVisible	VLinesVisible	XLinesVisible
+syn keyword mupadIdentifier	YLinesVisible	LineWidth	MeshVisible
+" graphics  Point Style Attributes
+syn keyword mupadIdentifier	PointColor	PointSize	PointStyle	PointsVisible
+" graphics  Surface Style Attributes
+syn keyword mupadIdentifier	BarStyle	Shadows	Color	Colors	FillColor	FillColor2
+syn keyword mupadIdentifier	FillColorTrue	FillColorFalse	FillColorUnknown	FillColorType
+syn keyword mupadIdentifier	Filled	FillPattern	FillPatterns	FillStyle
+syn keyword mupadIdentifier	InterpolationStyle	Shading	UseNormals
+" graphics  Arrow Style Attributes
+syn keyword mupadIdentifier	TipAngle	TipLength	TipStyle	TubeDiameter
+syn keyword mupadIdentifier	Tubular
+" graphics  meta-documentation Attributes
+syn keyword mupadIdentifier	objectGroupsListed
+
+
+hi def link mupadComment		Comment
+hi def link mupadString		String
+hi def link mupadOperator		Operator
+hi def link mupadSpecial		Special
+hi def link mupadStatement		Statement
+hi def link mupadUnderlined	Underlined
+hi def link mupadConditional	Conditional
+hi def link mupadRepeat		Repeat
+hi def link mupadFunction		Function
+hi def link mupadType		Type
+hi def link mupadDefine		Define
+hi def link mupadIdentifier	Identifier
+
+
+" TODO  More comprehensive listing.
+
+endif
diff --git a/syntax/mush.vim b/syntax/mush.vim
new file mode 100644
index 000000000..33fc883c9
--- /dev/null
+++ b/syntax/mush.vim
@@ -0,0 +1,219 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mush') == -1
+
+" MUSHcode syntax file
+" Maintainer: Rick Bird <nveid@nveid.com>
+" Based on vim Syntax file by: Bek Oberin <gossamer@tertius.net.au>
+" Last Updated: Fri Nov 04 20:28:15 2005
+"
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+
+" regular mush functions
+
+syntax keyword mushFunction contained @@ abs accent accname acos add after align
+syntax keyword mushFunction contained allof alphamax alphamin and andflags
+syntax keyword mushFunction contained andlflags andlpowers andpowers ansi aposs art
+syntax keyword mushFunction contained asin atan atan2 atrlock attrcnt band baseconv
+syntax keyword mushFunction contained beep before blank2tilde bnand bnot bor bound
+syntax keyword mushFunction contained brackets break bxor cand cansee capstr case
+syntax keyword mushFunction contained caseall cat ceil center checkpass children
+syntax keyword mushFunction contained chr clone cmds cnetpost comp con config conn
+syntax keyword mushFunction contained controls convsecs convtime convutcsecs cor
+syntax keyword mushFunction contained cos create ctime ctu dec decrypt default
+syntax keyword mushFunction contained delete die dig digest dist2d dist3d div
+syntax keyword mushFunction contained division divscope doing downdiv dynhelp e
+syntax keyword mushFunction contained edefault edit element elements elist elock
+syntax keyword mushFunction contained emit empire empower encrypt endtag entrances
+syntax keyword mushFunction contained eq escape etimefmt eval exit exp extract fdiv
+syntax keyword mushFunction contained filter filterbool findable first firstof
+syntax keyword mushFunction contained flags flip floor floordiv fmod fold
+syntax keyword mushFunction contained folderstats followers following foreach
+syntax keyword mushFunction contained fraction fullname functions get get_eval grab
+syntax keyword mushFunction contained graball grep grepi gt gte hasattr hasattrp
+syntax keyword mushFunction contained hasattrpval hasattrval hasdivpower hasflag
+syntax keyword mushFunction contained haspower haspowergroup hastype height hidden
+syntax keyword mushFunction contained home host hostname html idle idlesecs
+syntax keyword mushFunction contained idle_average idle_times idle_total if ifelse
+syntax keyword mushFunction contained ilev iname inc index indiv indivall insert
+syntax keyword mushFunction contained inum ipaddr isdaylight isdbref isint isnum
+syntax keyword mushFunction contained isword itemize items iter itext last lattr
+syntax keyword mushFunction contained lcon lcstr ldelete ldivisions left lemit
+syntax keyword mushFunction contained level lexits lflags link list lit ljust lmath
+syntax keyword mushFunction contained ln lnum loc localize locate lock loctree log
+syntax keyword mushFunction contained lparent lplayers lports lpos lsearch lsearchr
+syntax keyword mushFunction contained lstats lt lte lthings lvcon lvexits lvplayers
+syntax keyword mushFunction contained lvthings lwho mail maildstats mailfrom
+syntax keyword mushFunction contained mailfstats mailstats mailstatus mailsubject
+syntax keyword mushFunction contained mailtime map match matchall max mean median
+syntax keyword mushFunction contained member merge mid min mix mod modulo modulus
+syntax keyword mushFunction contained money mtime mudname mul munge mwho name nand
+syntax keyword mushFunction contained nattr ncon nearby neq nexits next nor not
+syntax keyword mushFunction contained nplayers nsemit nslemit nsoemit nspemit
+syntax keyword mushFunction contained nsremit nszemit nthings null num nvcon
+syntax keyword mushFunction contained nvexits nvplayers nvthings obj objeval objid
+syntax keyword mushFunction contained objmem oemit ooref open or ord orflags
+syntax keyword mushFunction contained orlflags orlpowers orpowers owner parent
+syntax keyword mushFunction contained parse pcreate pemit pi pickrand playermem
+syntax keyword mushFunction contained pmatch poll ports pos poss power powergroups
+syntax keyword mushFunction contained powers powover program prompt pueblo quitprog
+syntax keyword mushFunction contained quota r rand randword recv regedit regeditall
+syntax keyword mushFunction contained regeditalli regediti regmatch regmatchi
+syntax keyword mushFunction contained regrab regraball regraballi regrabi regrep
+syntax keyword mushFunction contained regrepi remainder remit remove repeat replace
+syntax keyword mushFunction contained rest restarts restarttime reswitch
+syntax keyword mushFunction contained reswitchall reswitchalli reswitchi reverse
+syntax keyword mushFunction contained revwords right rjust rloc rnum room root
+syntax keyword mushFunction contained round s scan scramble search secs secure sent
+syntax keyword mushFunction contained set setdiff setinter setq setr setunion sha0
+syntax keyword mushFunction contained shl shr shuffle sign signal sin sort sortby
+syntax keyword mushFunction contained soundex soundlike soundslike space spellnum
+syntax keyword mushFunction contained splice sql sqlescape sqrt squish ssl
+syntax keyword mushFunction contained starttime stats stddev step strcat strinsert
+syntax keyword mushFunction contained stripaccents stripansi strlen strmatch
+syntax keyword mushFunction contained strreplace sub subj switch switchall t table
+syntax keyword mushFunction contained tag tagwrap tan tel terminfo textfile
+syntax keyword mushFunction contained tilde2blank time timefmt timestring tr
+syntax keyword mushFunction contained trigger trim trimpenn trimtiny trunc type u
+syntax keyword mushFunction contained ucstr udefault ufun uldefault ulocal updiv
+syntax keyword mushFunction contained utctime v vadd val valid vcross vdim vdot
+syntax keyword mushFunction contained version visible vmag vmax vmin vmul vsub
+syntax keyword mushFunction contained vtattr vtcount vtcreate vtdestroy vtlcon
+syntax keyword mushFunction contained vtloc vtlocate vtmaster vtname vtref vttel
+syntax keyword mushFunction contained vunit wait where width wipe wordpos words
+syntax keyword mushFunction contained wrap xcon xexits xget xor xplayers xthings
+syntax keyword mushFunction contained xvcon xvexits xvplayers xvthings zemit zfun
+syntax keyword mushFunction contained zmwho zone zwho
+
+" only highligh functions when they have an in-bracket immediately after
+syntax match mushFunctionBrackets  "\i*(" contains=mushFunction
+"
+" regular mush commands
+syntax keyword mushAtCommandList contained @ALLHALT @ALLQUOTA @ASSERT @ATRCHOWN @ATRLOCK @ATTRIBUTE @BOOT 
+syntax keyword mushAtCommandList contained @BREAK @CEMIT @CHANNEL @CHAT @CHOWN @CHOWNALL @CHZONE @CHZONEALL 
+syntax keyword mushAtCommandList contained @CLOCK @CLONE @COBJ @COMMAND @CONFIG @CPATTR @CREATE @CRPLOG @DBCK
+syntax keyword mushAtCommandList contained @DECOMPILE @DESTROY @DIG @DISABLE @DIVISION @DOING @DOLIST @DRAIN 
+syntax keyword mushAtCommandList contained @DUMP @EDIT @ELOCK @EMIT @EMPOWER @ENABLE @ENTRANCES @EUNLOCK @FIND 
+syntax keyword mushAtCommandList contained @FIRSTEXIT @FLAG @FORCE @FUNCTION @EDIT @GREP @HALT @HIDE @HOOK @KICK 
+syntax keyword mushAtCommandList contained @LEMIT @LEVEL @LINK @LIST @LISTMOTD @LOCK @LOG @LOGWIPE @LSET @MAIL @MALIAS 
+syntax keyword mushAtCommandList contained @MAP @MOTD @MVATTR @NAME @NEWPASSWORD @NOTIFY @NSCEMIT @NSEMIT @NSLEMIT 
+syntax keyword mushAtCommandList contained @NSOEMIT @NSPEMIT @NSPEMIT @NSREMIT @NSZEMIT @NUKE @OEMIT @OPEN @PARENT @PASSWORD
+syntax keyword mushAtCommandList contained @PCREATE @PEMIT @POLL @POOR @POWERLEVEL @PROGRAM @PROMPT @PS @PURGE @QUOTA 
+syntax keyword mushAtCommandList contained @READCACHE @RECYCLE @REJECTMOTD @REMIT @RESTART @SCAN @SEARCH @SELECT @SET 
+syntax keyword mushAtCommandList contained @SHUTDOWN @SITELOCK @SNOOP @SQL @SQUOTA @STATS @SWITCH @SWEEP @SWITCH @TELEPORT 
+syntax keyword mushAtCommandList contained @TRIGGER @ULOCK @UNDESTROY @UNLINK @UNLOCK @UNRECYCLE @UPTIME @UUNLOCK @VERB 
+syntax keyword mushAtCommandList contained @VERSION @WAIT @WALL @WARNINGS @WCHECK @WHEREIS @WIPE @ZCLONE @ZEMIT
+syntax match mushCommand  "@\i\I*" contains=mushAtCommandList
+
+
+syntax keyword mushCommand AHELP ANEWS ATTRIB_SET BRIEF BRIEF BUY CHANGES DESERT
+syntax keyword mushCommand DISMISS DROP EMPTY ENTER EXAMINE FOLLOW GET GIVE GOTO 
+syntax keyword mushCommand HELP HUH_COMMAND INVENTORY INVENTORY LOOK LEAVE LOOK
+syntax keyword mushCommand GOTO NEWS PAGE PAGE POSE RULES SAY SCORE SEMIPOSE 
+syntax keyword mushCommand SPECIALNEWS TAKE TEACH THINK UNFOLLOW USE WHISPER WHISPER
+syntax keyword mushCommand WARN_ON_MISSING WHISPER WITH
+
+syntax match mushSpecial     "\*\|!\|=\|-\|\\\|+"
+syntax match mushSpecial2 contained     "\*"
+
+syn region    mushString         start=+L\="+ skip=+\\\\\|\\"+ end=+"+ contains=mushSpecial,mushSpecial2,@Spell
+
+
+syntax match mushIdentifier   "&[^ ]\+"
+
+syntax match mushVariable   "%r\|%t\|%cr\|%[A-Za-z0-9]\+\|%#\|##\|here"
+
+" numbers
+syntax match mushNumber	+[0-9]\++
+
+" A comment line starts with a or # or " at the start of the line
+" or an @@
+syntax keyword mushTodo contained	TODO FIXME XXX
+syntax cluster mushCommentGroup contains=mushTodo
+syntax match	mushComment	"^\s*@@.*$"	contains=mushTodo
+syntax match mushComment "^#[^define|^ifdef|^else|^pragma|^ifndef|^echo|^elif|^undef|^warning].*$" contains=mushTodo
+syntax match mushComment "^#$" contains=mushTodo
+syntax region mushComment        matchgroup=mushCommentStart start="/@@" end="@@/" contains=@mushCommentGroup,mushCommentStartError,mushCommentString,@Spell
+syntax region mushCommentString  contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+@@/+me=s-1 contains=mushCommentSkip
+syntax match  mushCommentSkip    contained "^\s*@@\($\|\s\+\)"
+
+
+syntax match mushCommentStartError display "/@@"me=e-1 contained
+
+" syntax match	mushComment	+^".*$+	contains=mushTodo
+" Work on this one
+" syntax match	mushComment	+^#.*$+	contains=mushTodo
+
+syn region      mushPreCondit      start="^\s*\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" end="//"me=s-1 contains=mushComment
+syn match       mushPreCondit      display "^\s*\(%:\|#\)\s*\(else\|endif\)\>"
+
+syn cluster     mushPreProcGroup   contains=mushPreCondit,mushIncluded,mushInclude,mushDefine,mushSpecial,mushString,mushCommentSkip,mushCommentString,@mushCommentGroup,mushCommentStartError
+
+syn region      mushIncluded       display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match       mushIncluded       display contained "<[^>]*>"
+syn match       mushInclude        display "^\s*\(%:\|#\)\s*include\>\s*["<]" contains=mushIncluded
+syn region	mushDefine		start="^\s*\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" end="//"me=s-1 contains=ALLBUT,@mushPreProcGroup,@Spell
+syn region	mushPreProc	start="^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@mushPreProcGroup
+
+
+syntax region	mushFuncBoundaries start="\[" end="\]" contains=mushFunction,mushFlag,mushAttributes,mushNumber,mushCommand,mushVariable,mushSpecial2
+
+" FLAGS
+syntax keyword mushFlag PLAYER ABODE BUILDER CHOWN_OK DARK FLOATING
+syntax keyword mushFlag GOING HAVEN INHERIT JUMP_OK KEY LINK_OK MONITOR
+syntax keyword mushFlag NOSPOOF OPAQUE QUIET STICKY TRACE UNFINDABLE VISUAL
+syntax keyword mushFlag WIZARD PARENT_OK ZONE AUDIBLE CONNECTED DESTROY_OK
+syntax keyword mushFlag ENTER_OK HALTED IMMORTAL LIGHT MYOPIC PUPPET TERSE
+syntax keyword mushFlag ROBOT SAFE TRANSPARENT VERBOSE CONTROL_OK COMMANDS
+
+syntax keyword mushAttribute aahear aclone aconnect adesc adfail adisconnect
+syntax keyword mushAttribute adrop aefail aenter afail agfail ahear akill
+syntax keyword mushAttribute aleave alfail alias amhear amove apay arfail
+syntax keyword mushAttribute asucc atfail atport aufail ause away charges
+syntax keyword mushAttribute cost desc dfail drop ealias efail enter fail
+syntax keyword mushAttribute filter forwardlist gfail idesc idle infilter
+syntax keyword mushAttribute inprefix kill lalias last lastsite leave lfail
+syntax keyword mushAttribute listen move odesc odfail odrop oefail oenter
+syntax keyword mushAttribute ofail ogfail okill oleave olfail omove opay
+syntax keyword mushAttribute orfail osucc otfail otport oufail ouse oxenter
+syntax keyword mushAttribute oxleave oxtport pay prefix reject rfail runout
+syntax keyword mushAttribute semaphore sex startup succ tfail tport ufail
+syntax keyword mushAttribute use va vb vc vd ve vf vg vh vi vj vk vl vm vn
+syntax keyword mushAttribute vo vp vq vr vs vt vu vv vw vx vy vz
+
+
+
+" The default methods for highlighting.  Can be overridden later
+hi def link mushAttribute  Constant
+hi def link mushCommand    Function
+hi def link mushNumber     Number
+hi def link mushSetting    PreProc
+hi def link mushFunction   Statement
+hi def link mushVariable   Identifier
+hi def link mushSpecial    Special
+hi def link mushTodo       Todo
+hi def link mushFlag       Special
+hi def link mushIdentifier Identifier
+hi def link mushDefine     Macro
+hi def link mushPreProc    PreProc
+hi def link mushPreProcGroup PreProc 
+hi def link mushPreCondit PreCondit
+hi def link mushIncluded cString
+hi def link mushInclude Include
+
+
+
+" Comments
+hi def link mushCommentStart mushComment
+hi def link mushComment    Comment
+hi def link mushCommentString mushString
+
+
+
+let b:current_syntax = "mush"
+
+" mush: ts=17
+
+endif
diff --git a/syntax/muttrc.vim b/syntax/muttrc.vim
new file mode 100644
index 000000000..167fe636b
--- /dev/null
+++ b/syntax/muttrc.vim
@@ -0,0 +1,825 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'muttrc') == -1
+
+" Vim syntax file
+" Language:	Mutt setup files
+" Original:	Preben 'Peppe' Guldberg <peppe-vim@wielders.org>
+" Maintainer:	Kyle Wheeler <kyle-muttrc.vim@memoryhole.net>
+" Last Change:	21 May 2018
+
+" This file covers mutt version 1.10.0
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Set the keyword characters
+setlocal isk=@,48-57,_,-
+
+" handling optional variables
+if !exists("use_mutt_sidebar")
+  let use_mutt_sidebar=0
+endif
+
+syn match muttrcComment		"^# .*$" contains=@Spell
+syn match muttrcComment		"^#[^ ].*$"
+syn match muttrcComment		"^#$"
+syn match muttrcComment		"[^\\]#.*$"lc=1
+
+" Escape sequences (back-tick and pipe goes here too)
+syn match muttrcEscape		+\\[#tnr"'Cc ]+
+syn match muttrcEscape		+[`|]+
+syn match muttrcEscape		+\\$+
+
+" The variables takes the following arguments
+"syn match  muttrcString		contained "=\s*[^ #"'`]\+"lc=1 contains=muttrcEscape
+syn region muttrcString		contained keepend start=+"+ms=e skip=+\\"+ end=+"+ contains=muttrcEscape,muttrcCommand,muttrcAction,muttrcShellString
+syn region muttrcString		contained keepend start=+'+ms=e skip=+\\'+ end=+'+ contains=muttrcEscape,muttrcCommand,muttrcAction
+syn match muttrcStringNL	contained skipwhite skipnl "\s*\\$" nextgroup=muttrcString,muttrcStringNL
+
+syn region muttrcShellString	matchgroup=muttrcEscape keepend start=+`+ skip=+\\`+ end=+`+ contains=muttrcVarStr,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcCommand
+
+syn match  muttrcRXChars	contained /[^\\][][.*?+]\+/hs=s+1
+syn match  muttrcRXChars	contained /[][|()][.*?+]*/
+syn match  muttrcRXChars	contained /['"]^/ms=s+1
+syn match  muttrcRXChars	contained /$['"]/me=e-1
+syn match  muttrcRXChars	contained /\\/
+" Why does muttrcRXString2 work with one \ when muttrcRXString requires two?
+syn region muttrcRXString	contained skipwhite start=+'+ skip=+\\'+ end=+'+ contains=muttrcRXChars
+syn region muttrcRXString	contained skipwhite start=+"+ skip=+\\"+ end=+"+ contains=muttrcRXChars
+syn region muttrcRXString	contained skipwhite start=+[^ 	"'^]+ skip=+\\\s+ end=+\s+re=e-1 contains=muttrcRXChars
+" For some reason, skip refuses to match backslashes here...
+syn region muttrcRXString	contained matchgroup=muttrcRXChars skipwhite start=+\^+ end=+[^\\]\s+re=e-1 contains=muttrcRXChars
+syn region muttrcRXString	contained matchgroup=muttrcRXChars skipwhite start=+\^+ end=+$\s+ contains=muttrcRXChars
+syn region muttrcRXString2	contained skipwhite start=+'+ skip=+\'+ end=+'+ contains=muttrcRXChars
+syn region muttrcRXString2	contained skipwhite start=+"+ skip=+\"+ end=+"+ contains=muttrcRXChars
+
+" these must be kept synchronized with muttrcRXString, but are intended for
+" muttrcRXHooks
+syn region muttrcRXHookString	contained keepend skipwhite start=+'+ skip=+\\'+ end=+'+ contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
+syn region muttrcRXHookString	contained keepend skipwhite start=+"+ skip=+\\"+ end=+"+ contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
+syn region muttrcRXHookString	contained keepend skipwhite start=+[^ 	"'^]+ skip=+\\\s+ end=+\s+re=e-1 contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
+syn region muttrcRXHookString	contained keepend skipwhite start=+\^+ end=+[^\\]\s+re=e-1 contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
+syn region muttrcRXHookString	contained keepend matchgroup=muttrcRXChars skipwhite start=+\^+ end=+$\s+ contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
+syn match muttrcRXHookStringNL contained skipwhite skipnl "\s*\\$" nextgroup=muttrcRXHookString,muttrcRXHookStringNL
+
+" these are exclusively for args lists (e.g. -rx pat pat pat ...)
+syn region muttrcRXPat		contained keepend skipwhite start=+'+ skip=+\\'+ end=+'\s*+ contains=muttrcRXString nextgroup=muttrcRXPat
+syn region muttrcRXPat		contained keepend skipwhite start=+"+ skip=+\\"+ end=+"\s*+ contains=muttrcRXString nextgroup=muttrcRXPat
+syn match muttrcRXPat		contained /[^-'"#!]\S\+/ skipwhite contains=muttrcRXChars nextgroup=muttrcRXPat
+syn match muttrcRXDef 		contained "-rx\s\+" skipwhite nextgroup=muttrcRXPat
+
+syn match muttrcSpecial		+\(['"]\)!\1+
+
+syn match muttrcSetStrAssignment contained skipwhite /=\s*\%(\\\?\$\)\?[0-9A-Za-z_-]\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcVariable,muttrcEscapedVariable
+syn region muttrcSetStrAssignment contained skipwhite keepend start=+=\s*"+hs=s+1 end=+"+ skip=+\\"+ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcString
+syn region muttrcSetStrAssignment contained skipwhite keepend start=+=\s*'+hs=s+1 end=+'+ skip=+\\'+ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcString
+syn match muttrcSetBoolAssignment contained skipwhite /=\s*\\\?\$\w\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcVariable,muttrcEscapedVariable
+syn match muttrcSetBoolAssignment contained skipwhite /=\s*\%(yes\|no\)/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn match muttrcSetBoolAssignment contained skipwhite /=\s*"\%(yes\|no\)"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn match muttrcSetBoolAssignment contained skipwhite /=\s*'\%(yes\|no\)'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn match muttrcSetQuadAssignment contained skipwhite /=\s*\\\?\$\w\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcVariable,muttrcEscapedVariable
+syn match muttrcSetQuadAssignment contained skipwhite /=\s*\%(ask-\)\?\%(yes\|no\)/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn match muttrcSetQuadAssignment contained skipwhite /=\s*"\%(ask-\)\?\%(yes\|no\)"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn match muttrcSetQuadAssignment contained skipwhite /=\s*'\%(ask-\)\?\%(yes\|no\)'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn match muttrcSetNumAssignment contained skipwhite /=\s*\\\?\$\w\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcVariable,muttrcEscapedVariable
+syn match muttrcSetNumAssignment contained skipwhite /=\s*\d\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn match muttrcSetNumAssignment contained skipwhite /=\s*"\d\+"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn match muttrcSetNumAssignment contained skipwhite /=\s*'\d\+'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+" Now catch some email addresses and headers (purified version from mail.vim)
+syn match muttrcEmail		"[a-zA-Z0-9._-]\+@[a-zA-Z0-9./-]\+"
+syn match muttrcHeader		"\<\c\%(From\|To\|C[Cc]\|B[Cc][Cc]\|Reply-To\|Subject\|Return-Path\|Received\|Date\|Replied\|Attach\)\>:\="
+
+syn match   muttrcKeySpecial	contained +\%(\\[Cc'"]\|\^\|\\[01]\d\{2}\)+
+syn match   muttrcKey		contained "\S\+"			contains=muttrcKeySpecial,muttrcKeyName
+syn region  muttrcKey		contained start=+"+ skip=+\\\\\|\\"+ end=+"+	contains=muttrcKeySpecial,muttrcKeyName
+syn region  muttrcKey		contained start=+'+ skip=+\\\\\|\\'+ end=+'+	contains=muttrcKeySpecial,muttrcKeyName
+syn match   muttrcKeyName	contained "\<f\%(\d\|10\)\>"
+syn match   muttrcKeyName	contained "\\[trne]"
+syn match   muttrcKeyName	contained "\c<\%(BackSpace\|BackTab\|Delete\|Down\|End\|Enter\|Esc\|Home\|Insert\|Left\|PageDown\|PageUp\|Return\|Right\|Space\|Tab\|Up\)>"
+syn match   muttrcKeyName	contained "<F[0-9]\+>"
+
+syn keyword muttrcVarBool	skipwhite contained 
+			\ allow_8bit allow_ansi arrow_cursor ascii_chars askbcc askcc attach_split
+			\ auto_tag autoedit beep beep_new bounce_delivered braille_friendly
+			\ browser_abbreviate_mailboxes change_folder_next check_mbox_size check_new
+			\ collapse_unread confirmappend confirmcreate crypt_autoencrypt crypt_autopgp
+			\ crypt_autosign crypt_autosmime crypt_confirmhook crypt_opportunistic_encrypt
+			\ crypt_replyencrypt crypt_replysign crypt_replysignencrypted crypt_timestamp
+			\ crypt_use_gpgme crypt_use_pka delete_untag digest_collapse duplicate_threads
+			\ edit_hdrs edit_headers encode_from envelope_from fast_reply fcc_clear
+			\ flag_safe followup_to force_name forw_decode forw_decrypt forw_quote
+			\ forward_decode forward_decrypt forward_quote hdrs header
+			\ header_color_partial help hidden_host hide_limited hide_missing
+			\ hide_thread_subject hide_top_limited hide_top_missing history_remove_dups
+			\ honor_disposition idn_decode idn_encode ignore_linear_white_space
+			\ ignore_list_reply_to imap_check_subscribed imap_list_subscribed imap_passive
+			\ imap_peek imap_servernoise implicit_autoview include_onlyfirst keep_flagged
+			\ mail_check_recent mail_check_stats mailcap_sanitize maildir_check_cur
+			\ maildir_header_cache_verify maildir_trash mark_old markers menu_move_off
+			\ menu_scroll message_cache_clean meta_key metoo mh_purge mime_forward_decode
+			\ mime_type_query_first narrow_tree pager_stop pgp_auto_decode
+			\ pgp_auto_traditional pgp_autoencrypt pgp_autoinline pgp_autosign
+			\ pgp_check_exit pgp_create_traditional pgp_ignore_subkeys pgp_long_ids
+			\ pgp_replyencrypt pgp_replyinline pgp_replysign pgp_replysignencrypted
+			\ pgp_retainable_sigs pgp_self_encrypt pgp_self_encrypt_as pgp_show_unusable
+			\ pgp_strict_enc pgp_use_gpg_agent pipe_decode pipe_split pop_auth_try_all
+			\ pop_last postpone_encrypt postpone_encrypt_as print_decode print_split
+			\ prompt_after read_only reflow_space_quotes reflow_text reflow_wrap
+			\ reply_self resolve resume_draft_files resume_edited_draft_files
+			\ reverse_alias reverse_name reverse_realname rfc2047_parameters save_address
+			\ save_empty save_name score sidebar_folder_indent sidebar_new_mail_only
+			\ sidebar_next_new_wrap sidebar_short_path sidebar_sort sidebar_visible
+			\ sig_dashes sig_on_top smart_wrap smime_ask_cert_label
+			\ smime_decrypt_use_default_key smime_is_default smime_self_encrypt
+			\ smime_self_encrypt_as sort_re ssl_force_tls ssl_use_sslv2 ssl_use_sslv3
+			\ ssl_use_tlsv1 ssl_usesystemcerts ssl_verify_dates ssl_verify_host
+			\ ssl_verify_partial_chains status_on_top strict_mime strict_threads suspend
+			\ text_flowed thorough_search thread_received tilde ts_enabled uncollapse_jump
+			\ use_8bitmime use_domain use_envelope_from use_from use_idn use_ipv6
+			\ uncollapse_new user_agent wait_key weed wrap_search write_bcc
+			\ nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+syn keyword muttrcVarBool	skipwhite contained 
+			\ noallow_8bit noallow_ansi noarrow_cursor noascii_chars noaskbcc noaskcc
+			\ noattach_split noauto_tag noautoedit nobeep nobeep_new nobounce_delivered
+			\ nobraille_friendly nobrowser_abbreviate_mailboxes nochange_folder_next
+			\ nocheck_mbox_size nocheck_new nocollapse_unread noconfirmappend
+			\ noconfirmcreate nocrypt_autoencrypt nocrypt_autopgp nocrypt_autosign
+			\ nocrypt_autosmime nocrypt_confirmhook nocrypt_opportunistic_encrypt
+			\ nocrypt_replyencrypt nocrypt_replysign nocrypt_replysignencrypted
+			\ nocrypt_timestamp nocrypt_use_gpgme nocrypt_use_pka nodelete_untag
+			\ nodigest_collapse noduplicate_threads noedit_hdrs noedit_headers
+			\ noencode_from noenvelope_from nofast_reply nofcc_clear noflag_safe
+			\ nofollowup_to noforce_name noforw_decode noforw_decrypt noforw_quote
+			\ noforward_decode noforward_decrypt noforward_quote nohdrs noheader
+			\ noheader_color_partial nohelp nohidden_host nohide_limited nohide_missing
+			\ nohide_thread_subject nohide_top_limited nohide_top_missing
+			\ nohistory_remove_dups nohonor_disposition noidn_decode noidn_encode
+			\ noignore_linear_white_space noignore_list_reply_to noimap_check_subscribed
+			\ noimap_list_subscribed noimap_passive noimap_peek noimap_servernoise
+			\ noimplicit_autoview noinclude_onlyfirst nokeep_flagged nomail_check_recent
+			\ nomail_check_stats nomailcap_sanitize nomaildir_check_cur
+			\ nomaildir_header_cache_verify nomaildir_trash nomark_old nomarkers
+			\ nomenu_move_off nomenu_scroll nomessage_cache_clean nometa_key nometoo
+			\ nomh_purge nomime_forward_decode nomime_type_query_first nonarrow_tree
+			\ nopager_stop nopgp_auto_decode nopgp_auto_traditional nopgp_autoencrypt
+			\ nopgp_autoinline nopgp_autosign nopgp_check_exit nopgp_create_traditional
+			\ nopgp_ignore_subkeys nopgp_long_ids nopgp_replyencrypt nopgp_replyinline
+			\ nopgp_replysign nopgp_replysignencrypted nopgp_retainable_sigs
+			\ nopgp_self_encrypt nopgp_self_encrypt_as nopgp_show_unusable
+			\ nopgp_strict_enc nopgp_use_gpg_agent nopipe_decode nopipe_split
+			\ nopop_auth_try_all nopop_last nopostpone_encrypt nopostpone_encrypt_as
+			\ noprint_decode noprint_split noprompt_after noread_only
+			\ noreflow_space_quotes noreflow_text noreflow_wrap noreply_self noresolve
+			\ noresume_draft_files noresume_edited_draft_files noreverse_alias
+			\ noreverse_name noreverse_realname norfc2047_parameters nosave_address
+			\ nosave_empty nosave_name noscore nosidebar_folder_indent
+			\ nosidebar_new_mail_only nosidebar_next_new_wrap nosidebar_short_path
+			\ nosidebar_sort nosidebar_visible nosig_dashes nosig_on_top nosmart_wrap
+			\ nosmime_ask_cert_label nosmime_decrypt_use_default_key nosmime_is_default
+			\ nosmime_self_encrypt nosmime_self_encrypt_as nosort_re nossl_force_tls
+			\ nossl_use_sslv2 nossl_use_sslv3 nossl_use_tlsv1 nossl_usesystemcerts
+			\ nossl_verify_dates nossl_verify_host nossl_verify_partial_chains
+			\ nostatus_on_top nostrict_mime nostrict_threads nosuspend notext_flowed
+			\ nothorough_search nothread_received notilde nots_enabled nouncollapse_jump
+			\ nouse_8bitmime nouse_domain nouse_envelope_from nouse_from nouse_idn
+			\ nouse_ipv6 nouncollapse_new nouser_agent nowait_key noweed nowrap_search
+			\ nowrite_bcc
+			\ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+syn keyword muttrcVarBool	skipwhite contained
+			\ invallow_8bit invallow_ansi invarrow_cursor invascii_chars invaskbcc
+			\ invaskcc invattach_split invauto_tag invautoedit invbeep invbeep_new
+			\ invbounce_delivered invbraille_friendly invbrowser_abbreviate_mailboxes
+			\ invchange_folder_next invcheck_mbox_size invcheck_new invcollapse_unread
+			\ invconfirmappend invconfirmcreate invcrypt_autoencrypt invcrypt_autopgp
+			\ invcrypt_autosign invcrypt_autosmime invcrypt_confirmhook
+			\ invcrypt_opportunistic_encrypt invcrypt_replyencrypt invcrypt_replysign
+			\ invcrypt_replysignencrypted invcrypt_timestamp invcrypt_use_gpgme
+			\ invcrypt_use_pka invdelete_untag invdigest_collapse invduplicate_threads
+			\ invedit_hdrs invedit_headers invencode_from invenvelope_from invfast_reply
+			\ invfcc_clear invflag_safe invfollowup_to invforce_name invforw_decode
+			\ invforw_decrypt invforw_quote invforward_decode invforward_decrypt
+			\ invforward_quote invhdrs invheader invheader_color_partial invhelp
+			\ invhidden_host invhide_limited invhide_missing invhide_thread_subject
+			\ invhide_top_limited invhide_top_missing invhistory_remove_dups
+			\ invhonor_disposition invidn_decode invidn_encode
+			\ invignore_linear_white_space invignore_list_reply_to
+			\ invimap_check_subscribed invimap_list_subscribed invimap_passive
+			\ invimap_peek invimap_servernoise invimplicit_autoview invinclude_onlyfirst
+			\ invkeep_flagged invmail_check_recent invmail_check_stats invmailcap_sanitize
+			\ invmaildir_check_cur invmaildir_header_cache_verify invmaildir_trash
+			\ invmark_old invmarkers invmenu_move_off invmenu_scroll
+			\ invmessage_cache_clean invmeta_key invmetoo invmh_purge
+			\ invmime_forward_decode invmime_type_query_first invnarrow_tree invpager_stop
+			\ invpgp_auto_decode invpgp_auto_traditional invpgp_autoencrypt
+			\ invpgp_autoinline invpgp_autosign invpgp_check_exit
+			\ invpgp_create_traditional invpgp_ignore_subkeys invpgp_long_ids
+			\ invpgp_replyencrypt invpgp_replyinline invpgp_replysign
+			\ invpgp_replysignencrypted invpgp_retainable_sigs invpgp_self_encrypt
+			\ invpgp_self_encrypt_as invpgp_show_unusable invpgp_strict_enc
+			\ invpgp_use_gpg_agent invpipe_decode invpipe_split invpop_auth_try_all
+			\ invpop_last invpostpone_encrypt invpostpone_encrypt_as invprint_decode
+			\ invprint_split invprompt_after invread_only invreflow_space_quotes
+			\ invreflow_text invreflow_wrap invreply_self invresolve invresume_draft_files
+			\ invresume_edited_draft_files invreverse_alias invreverse_name
+			\ invreverse_realname invrfc2047_parameters invsave_address invsave_empty
+			\ invsave_name invscore invsidebar_folder_indent invsidebar_new_mail_only
+			\ invsidebar_next_new_wrap invsidebar_short_path invsidebar_sort
+			\ invsidebar_visible invsig_dashes invsig_on_top invsmart_wrap
+			\ invsmime_ask_cert_label invsmime_decrypt_use_default_key invsmime_is_default
+			\ invsmime_self_encrypt invsmime_self_encrypt_as invsort_re invssl_force_tls
+			\ invssl_use_sslv2 invssl_use_sslv3 invssl_use_tlsv1 invssl_usesystemcerts
+			\ invssl_verify_dates invssl_verify_host invssl_verify_partial_chains
+			\ invstatus_on_top invstrict_mime invstrict_threads invsuspend invtext_flowed
+			\ invthorough_search invthread_received invtilde invts_enabled
+			\ invuncollapse_jump invuse_8bitmime invuse_domain invuse_envelope_from
+			\ invuse_from invuse_idn invuse_ipv6 invuncollapse_new invuser_agent
+			\ invwait_key invweed invwrap_search invwrite_bcc
+			\ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+syn keyword muttrcVarQuad	skipwhite contained
+			\ abort_nosubject abort_unmodified abort_noattach bounce copy crypt_verify_sig
+			\ delete fcc_attach forward_edit honor_followup_to include mime_forward
+			\ mime_forward_rest mime_fwd move pgp_mime_auto pgp_verify_sig pop_delete
+			\ pop_reconnect postpone print quit recall reply_to ssl_starttls
+			\ nextgroup=muttrcSetQuadAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+syn keyword muttrcVarQuad	skipwhite contained
+			\ noabort_nosubject noabort_unmodified noabort_noattach nobounce nocopy
+			\ nocrypt_verify_sig nodelete nofcc_attach noforward_edit nohonor_followup_to
+			\ noinclude nomime_forward nomime_forward_rest nomime_fwd nomove
+			\ nopgp_mime_auto nopgp_verify_sig nopop_delete nopop_reconnect nopostpone
+			\ noprint noquit norecall noreply_to nossl_starttls
+			\ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+syn keyword muttrcVarQuad	skipwhite contained
+			\ invabort_nosubject invabort_unmodified invabort_noattach invbounce invcopy
+			\ invcrypt_verify_sig invdelete invfcc_attach invforward_edit
+			\ invhonor_followup_to invinclude invmime_forward invmime_forward_rest
+			\ invmime_fwd invmove invpgp_mime_auto invpgp_verify_sig invpop_delete
+			\ invpop_reconnect invpostpone invprint invquit invrecall invreply_to
+			\ invssl_starttls
+			\ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+syn keyword muttrcVarNum	skipwhite contained
+			\ connect_timeout error_history history imap_keepalive imap_pipeline_depth
+			\ imap_poll_timeout mail_check mail_check_stats_interval menu_context net_inc
+			\ pager_context pager_index_lines pgp_timeout pop_checkinterval read_inc
+			\ save_history score_threshold_delete score_threshold_flag
+			\ score_threshold_read search_context sendmail_wait sidebar_width sleep_time
+			\ smime_timeout ssl_min_dh_prime_bits time_inc timeout wrap wrap_headers
+			\ wrapmargin write_inc
+			\ nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+syn match muttrcFormatErrors contained /%./
+
+syn match muttrcStrftimeEscapes contained /%[AaBbCcDdeFGgHhIjklMmnpRrSsTtUuVvWwXxYyZz+%]/
+syn match muttrcStrftimeEscapes contained /%E[cCxXyY]/
+syn match muttrcStrftimeEscapes contained /%O[BdeHImMSuUVwWy]/
+
+syn region muttrcIndexFormatStr	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcIndexFormatEscapes,muttrcIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcIndexFormatStr	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcIndexFormatEscapes,muttrcIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcQueryFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcQueryFormatEscapes,muttrcQueryFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcAliasFormatStr	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcAliasFormatEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcAliasFormatStr	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcAliasFormatEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcAttachFormatStr	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcAttachFormatEscapes,muttrcAttachFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcAttachFormatStr	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcAttachFormatEscapes,muttrcAttachFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcComposeFormatStr	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcComposeFormatEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcComposeFormatStr	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcComposeFormatEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcFolderFormatStr	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcFolderFormatEscapes,muttrcFolderFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcFolderFormatStr	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcFolderFormatEscapes,muttrcFolderFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcMixFormatStr	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcMixFormatEscapes,muttrcMixFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcMixFormatStr	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcMixFormatEscapes,muttrcMixFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcPGPFormatStr	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPGPFormatEscapes,muttrcPGPFormatConditionals,muttrcFormatErrors,muttrcPGPTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcPGPFormatStr	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPGPFormatEscapes,muttrcPGPFormatConditionals,muttrcFormatErrors,muttrcPGPTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcPGPCmdFormatStr	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPGPCmdFormatEscapes,muttrcPGPCmdFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcPGPCmdFormatStr	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPGPCmdFormatEscapes,muttrcPGPCmdFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcStatusFormatStr	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcStatusFormatEscapes,muttrcStatusFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcStatusFormatStr	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcStatusFormatEscapes,muttrcStatusFormatConditionals,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcPGPGetKeysFormatStr	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPGPGetKeysFormatEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcPGPGetKeysFormatStr	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPGPGetKeysFormatEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcSmimeFormatStr	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcSmimeFormatEscapes,muttrcSmimeFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcSmimeFormatStr	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcSmimeFormatEscapes,muttrcSmimeFormatConditionals,muttrcVariable,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcStrftimeFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcStrftimeEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn region muttrcStrftimeFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcStrftimeEscapes,muttrcFormatErrors nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+" The following info was pulled from hdr_format_str in hdrline.c
+syn match muttrcIndexFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[aAbBcCdDeEfFHilLmMnNOPsStTuvXyYZ%]/
+syn match muttrcIndexFormatEscapes contained /%[>|*]./
+syn match muttrcIndexFormatConditionals contained /%?[EFHlLMNOXyY]?/ nextgroup=muttrcFormatConditionals2
+" The following info was pulled from alias_format_str in addrbook.c
+syn match muttrcAliasFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[afnrt%]/
+" The following info was pulled from query_format_str in query.c
+syn match muttrcQueryFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[acent%]/
+syn match muttrcQueryFormatConditionals contained /%?[e]?/ nextgroup=muttrcFormatConditionals2
+" The following info was pulled from mutt_attach_fmt in recvattach.c
+syn match muttrcAttachFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[CcDdeFfImMnQstTuX%]/
+syn match muttrcAttachFormatEscapes contained /%[>|*]./
+syn match muttrcAttachFormatConditionals contained /%?[CcdDefInmMQstTuX]?/ nextgroup=muttrcFormatConditionals2
+syn match muttrcFormatConditionals2 contained /[^?]*?/
+" The following info was pulled from compose_format_str in compose.c
+syn match muttrcComposeFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[ahlv%]/
+syn match muttrcComposeFormatEscapes contained /%[>|*]./
+" The following info was pulled from folder_format_str in browser.c
+syn match muttrcFolderFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[CDdfFglNstu%]/
+syn match muttrcFolderFormatEscapes contained /%[>|*]./
+syn match muttrcFolderFormatConditionals contained /%?[N]?/
+" The following info was pulled from mix_entry_fmt in remailer.c
+syn match muttrcMixFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[ncsa%]/
+syn match muttrcMixFormatConditionals contained /%?[ncsa]?/
+" The following info was pulled from crypt_entry_fmt in crypt-gpgme.c 
+" and pgp_entry_fmt in pgpkey.c (note that crypt_entry_fmt supports 
+" 'p', but pgp_entry_fmt does not).
+syn match muttrcPGPFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[nkualfctp%]/
+syn match muttrcPGPFormatConditionals contained /%?[nkualfct]?/
+" The following info was pulled from _mutt_fmt_pgp_command in 
+" pgpinvoke.c
+syn match muttrcPGPCmdFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[pfsar%]/
+syn match muttrcPGPCmdFormatConditionals contained /%?[pfsar]?/ nextgroup=muttrcFormatConditionals2
+" The following info was pulled from status_format_str in status.c
+syn match muttrcStatusFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[bdfFhlLmMnopPRrsStuvV%]/
+syn match muttrcStatusFormatEscapes contained /%[>|*]./
+syn match muttrcStatusFormatConditionals contained /%?[bdFlLmMnoptuV]?/ nextgroup=muttrcFormatConditionals2
+" This matches the documentation, but directly contradicts the code 
+" (according to the code, this should be identical to the 
+" muttrcPGPCmdFormatEscapes
+syn match muttrcPGPGetKeysFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[r%]/
+" The following info was pulled from _mutt_fmt_smime_command in 
+" smime.c
+syn match muttrcSmimeFormatEscapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?[Cciskaf%]/
+syn match muttrcSmimeFormatConditionals contained /%?[Cciskaf]?/ nextgroup=muttrcFormatConditionals2
+
+syn region muttrcTimeEscapes contained start=+%{+ end=+}+ contains=muttrcStrftimeEscapes
+syn region muttrcTimeEscapes contained start=+%\[+ end=+\]+ contains=muttrcStrftimeEscapes
+syn region muttrcTimeEscapes contained start=+%(+ end=+)+ contains=muttrcStrftimeEscapes
+syn region muttrcTimeEscapes contained start=+%<+ end=+>+ contains=muttrcStrftimeEscapes
+syn region muttrcPGPTimeEscapes contained start=+%\[+ end=+\]+ contains=muttrcStrftimeEscapes
+
+syn keyword muttrcVarStr	contained skipwhite attribution index_format message_format pager_format nextgroup=muttrcVarEqualsIdxFmt
+syn match muttrcVarEqualsIdxFmt contained skipwhite "=" nextgroup=muttrcIndexFormatStr
+syn keyword muttrcVarStr	contained skipwhite alias_format nextgroup=muttrcVarEqualsAliasFmt
+syn match muttrcVarEqualsAliasFmt contained skipwhite "=" nextgroup=muttrcAliasFormatStr
+syn keyword muttrcVarStr	contained skipwhite attach_format nextgroup=muttrcVarEqualsAttachFmt
+syn match muttrcVarEqualsAttachFmt contained skipwhite "=" nextgroup=muttrcAttachFormatStr
+syn keyword muttrcVarStr	contained skipwhite compose_format nextgroup=muttrcVarEqualsComposeFmt
+syn match muttrcVarEqualsComposeFmt contained skipwhite "=" nextgroup=muttrcComposeFormatStr
+syn keyword muttrcVarStr	contained skipwhite folder_format nextgroup=muttrcVarEqualsFolderFmt
+syn match muttrcVarEqualsFolderFmt contained skipwhite "=" nextgroup=muttrcFolderFormatStr
+syn keyword muttrcVarStr	contained skipwhite mix_entry_format nextgroup=muttrcVarEqualsMixFmt
+syn match muttrcVarEqualsMixFmt contained skipwhite "=" nextgroup=muttrcMixFormatStr
+syn keyword muttrcVarStr	contained skipwhite pgp_entry_format nextgroup=muttrcVarEqualsPGPFmt
+syn match muttrcVarEqualsPGPFmt contained skipwhite "=" nextgroup=muttrcPGPFormatStr
+syn keyword muttrcVarStr	contained skipwhite query_format nextgroup=muttrcVarEqualsQueryFmt
+syn match muttrcVarEqualsQueryFmt contained skipwhite "=" nextgroup=muttrcQueryFormatStr
+syn keyword muttrcVarStr	contained skipwhite pgp_decode_command pgp_verify_command pgp_decrypt_command pgp_clearsign_command pgp_sign_command pgp_encrypt_sign_command pgp_encrypt_only_command pgp_import_command pgp_export_command pgp_verify_key_command pgp_list_secring_command pgp_list_pubring_command nextgroup=muttrcVarEqualsPGPCmdFmt
+syn match muttrcVarEqualsPGPCmdFmt contained skipwhite "=" nextgroup=muttrcPGPCmdFormatStr
+syn keyword muttrcVarStr	contained skipwhite ts_icon_format ts_status_format status_format nextgroup=muttrcVarEqualsStatusFmt
+syn match muttrcVarEqualsStatusFmt contained skipwhite "=" nextgroup=muttrcStatusFormatStr
+syn keyword muttrcVarStr	contained skipwhite pgp_getkeys_command nextgroup=muttrcVarEqualsPGPGetKeysFmt
+syn match muttrcVarEqualsPGPGetKeysFmt contained skipwhite "=" nextgroup=muttrcPGPGetKeysFormatStr
+syn keyword muttrcVarStr	contained skipwhite smime_decrypt_command smime_verify_command smime_verify_opaque_command smime_sign_command smime_sign_opaque_command smime_encrypt_command smime_pk7out_command smime_get_cert_command smime_get_signer_cert_command smime_import_cert_command smime_get_cert_email_command nextgroup=muttrcVarEqualsSmimeFmt
+syn match muttrcVarEqualsSmimeFmt contained skipwhite "=" nextgroup=muttrcSmimeFormatStr
+syn keyword muttrcVarStr	contained skipwhite date_format nextgroup=muttrcVarEqualsStrftimeFmt
+syn match muttrcVarEqualsStrftimeFmt contained skipwhite "=" nextgroup=muttrcStrftimeFormatStr
+
+syn match muttrcVPrefix		contained /[?&]/ nextgroup=muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+syn match muttrcVarStr		contained skipwhite 'my_[a-zA-Z0-9_]\+' nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn keyword muttrcVarStr	contained skipwhite
+			\ abort_noattach_regexp alias_file assumed_charset attach_charset attach_sep
+			\ attribution_locale certificate_file charset config_charset content_type
+			\ default_hook display_filter dotlock_program dsn_notify dsn_return editor
+		        \ entropy_file envelope_from_address escape folder forw_format
+		        \ forward_attribution_intro forward_attribution_trailer forward_format from gecos_mask
+		        \ hdr_format header_cache header_cache_compress header_cache_pagesize history_file
+		        \ hostname imap_authenticators imap_delim_chars imap_headers imap_idle imap_login
+		        \ imap_pass imap_user indent_str indent_string ispell locale mailcap_path
+		        \ mark_macro_prefix mask mbox mbox_type message_cachedir mh_seq_flagged mh_seq_replied
+		        \ mh_seq_unseen mime_type_query_command mixmaster msg_format new_mail_command pager
+		        \ pgp_default_key pgp_decryption_okay pgp_good_sign pgp_mime_signature_description
+		        \ pgp_mime_signature_filename pgp_sign_as pgp_sort_keys pipe_sep pop_authenticators
+		        \ pop_host pop_pass pop_user post_indent_str post_indent_string postpone_encrypt_as
+		        \ postponed preconnect print_cmd print_command query_command quote_regexp realname
+		        \ record reply_regexp send_charset sendmail shell sidebar_delim sidebar_delim_chars
+		        \ sidebar_divider_char sidebar_format sidebar_indent_string sidebar_sort_method
+		        \ signature simple_search smileys smime_ca_location smime_certificates
+		        \ smime_default_key smime_encrypt_with smime_keys smime_sign_as smime_sign_digest_alg
+		        \ smtp_authenticators smtp_pass smtp_url sort sort_alias sort_aux sort_browser
+		        \ spam_separator spoolfile ssl_ca_certificates_file ssl_ciphers ssl_client_cert
+		        \ status_chars tmpdir to_chars trash ts_icon_format ts_status_format tunnel visual
+			\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+" Present in 1.4.2.1 (pgp_create_traditional was a bool then)
+syn keyword muttrcVarBool	contained skipwhite imap_force_ssl noimap_force_ssl invimap_force_ssl nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+"syn keyword muttrcVarQuad	contained pgp_create_traditional nopgp_create_traditional invpgp_create_traditional
+syn keyword muttrcVarStr	contained skipwhite alternates nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+syn keyword muttrcMenu		contained alias attach browser compose editor index pager postpone pgp mix query generic
+syn match muttrcMenuList "\S\+" contained contains=muttrcMenu
+syn match muttrcMenuCommas /,/ contained
+
+syn keyword muttrcHooks		contained skipwhite account-hook charset-hook iconv-hook message-hook folder-hook mbox-hook save-hook fcc-hook fcc-save-hook send-hook send2-hook reply-hook crypt-hook
+
+syn keyword muttrcCommand	skipwhite
+			\ alternative_order auto_view exec hdr_order iconv-hook ignore mailboxes
+			\ mailto_allow mime_lookup my_hdr pgp-hook push score sidebar_whitelist source
+			\ unalternative_order unalternative_order unauto_view ungroup unhdr_order
+			\ unignore unmailboxes unmailto_allow unmime_lookup unmono unmy_hdr unscore
+			\ unsidebar_whitelist
+syn keyword muttrcCommand	skipwhite charset-hook nextgroup=muttrcRXString
+syn keyword muttrcCommand	skipwhite unhook nextgroup=muttrcHooks
+
+syn keyword muttrcCommand 	skipwhite spam nextgroup=muttrcSpamPattern
+syn region muttrcSpamPattern	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPattern nextgroup=muttrcString,muttrcStringNL
+syn region muttrcSpamPattern	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPattern nextgroup=muttrcString,muttrcStringNL
+
+syn keyword muttrcCommand 	skipwhite nospam nextgroup=muttrcNoSpamPattern
+syn region muttrcNoSpamPattern	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPattern
+syn region muttrcNoSpamPattern	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPattern
+
+syn match muttrcAttachmentsMimeType contained "[*a-z0-9_-]\+/[*a-z0-9._-]\+\s*" skipwhite nextgroup=muttrcAttachmentsMimeType
+syn match muttrcAttachmentsFlag contained "[+-]\%([AI]\|inline\|attachment\)\s\+" skipwhite nextgroup=muttrcAttachmentsMimeType
+syn match muttrcAttachmentsLine "^\s*\%(un\)\?attachments\s\+" skipwhite nextgroup=muttrcAttachmentsFlag
+
+syn match muttrcUnHighlightSpace contained "\%(\s\+\|\\$\)"
+
+syn keyword muttrcAsterisk	contained *
+syn keyword muttrcListsKeyword	lists skipwhite nextgroup=muttrcGroupDef,muttrcComment
+syn keyword muttrcListsKeyword	unlists skipwhite nextgroup=muttrcAsterisk,muttrcComment
+
+syn keyword muttrcSubscribeKeyword	subscribe nextgroup=muttrcGroupDef,muttrcComment
+syn keyword muttrcSubscribeKeyword	unsubscribe nextgroup=muttrcAsterisk,muttrcComment
+
+syn keyword muttrcAlternateKeyword contained alternates unalternates
+syn region muttrcAlternatesLine keepend start=+^\s*\%(un\)\?alternates\s+ skip=+\\$+ end=+$+ contains=muttrcAlternateKeyword,muttrcGroupDef,muttrcRXPat,muttrcUnHighlightSpace,muttrcComment
+
+" muttrcVariable includes a prefix because partial strings are considered
+" valid.
+syn match muttrcVariable	contained "\\\@<![a-zA-Z_-]*\$[a-zA-Z_-]\+" contains=muttrcVariableInner
+syn match muttrcVariableInner	contained "\$[a-zA-Z_-]\+"
+syn match muttrcEscapedVariable	contained "\\\$[a-zA-Z_-]\+"
+
+syn match muttrcBadAction	contained "[^<>]\+" contains=muttrcEmail
+syn match muttrcFunction	contained "\<\%(attach\|bounce\|copy\|delete\|display\|flag\|forward\|mark\|parent\|pipe\|postpone\|print\|purge\|recall\|resend\|root\|save\|send\|tag\|undelete\)-message\>"
+syn match muttrcFunction	contained "\<\%(delete\|next\|previous\|read\|tag\|break\|undelete\)-thread\>"
+syn match muttrcFunction	contained "\<link-threads\>"
+syn match muttrcFunction	contained "\<\%(backward\|capitalize\|downcase\|forward\|kill\|upcase\)-word\>"
+syn match muttrcFunction	contained "\<\%(delete\|filter\|first\|last\|next\|pipe\|previous\|print\|save\|select\|tag\|undelete\)-entry\>"
+syn match muttrcFunction	contained "\<attach-\%(file\|key\)\>"
+syn match muttrcFunction	contained "\<change-\%(dir\|folder\|folder-readonly\)\>"
+syn match muttrcFunction	contained "\<check-\%(new\|traditional-pgp\)\>"
+syn match muttrcFunction	contained "\<current-\%(bottom\|middle\|top\)\>"
+syn match muttrcFunction	contained "\<decode-\%(copy\|save\)\>"
+syn match muttrcFunction	contained "\<delete-\%(char\|pattern\|subthread\)\>"
+syn match muttrcFunction	contained "\<display-\%(address\|toggle-weed\)\>"
+syn match muttrcFunction	contained "\<echo\>"
+syn match muttrcFunction	contained "\<edit\%(-\%(bcc\|cc\|description\|encoding\|fcc\|file\|from\|headers\|label\|mime\|reply-to\|subject\|to\|type\)\)\?\>"
+syn match muttrcFunction	contained "\<enter-\%(command\|mask\)\>"
+syn match muttrcFunction	contained "\<error-history\>"
+syn match muttrcFunction	contained "\<half-\%(up\|down\)\>"
+syn match muttrcFunction	contained "\<history-\%(up\|down\|search\)\>"
+syn match muttrcFunction	contained "\<kill-\%(eol\|eow\|line\)\>"
+syn match muttrcFunction	contained "\<next-\%(line\|new\%(-then-unread\)\?\|page\|subthread\|undeleted\|unread\|unread-mailbox\)\>"
+syn match muttrcFunction	contained "\<previous-\%(line\|new\%(-then-unread\)\?\|page\|subthread\|undeleted\|unread\)\>"
+syn match muttrcFunction	contained "\<search\%(-\%(next\|opposite\|reverse\|toggle\)\)\?\>"
+syn match muttrcFunction	contained "\<show-\%(limit\|version\)\>"
+syn match muttrcFunction	contained "\<sort-\%(mailbox\|reverse\)\>"
+syn match muttrcFunction	contained "\<tag-\%(pattern\|\%(sub\)\?thread\|prefix\%(-cond\)\?\)\>"
+syn match muttrcFunction	contained "\<end-cond\>"
+syn match muttrcFunction	contained "\<sidebar-\%(next\|next-new\|open\|page-down\|page-up\|prev\|prev-new\|toggle-visible\)\>"
+syn match muttrcFunction	contained "\<toggle-\%(mailboxes\|new\|quoted\|subscribed\|unlink\|write\)\>"
+syn match muttrcFunction	contained "\<undelete-\%(pattern\|subthread\)\>"
+syn match muttrcFunction	contained "\<collapse-\%(parts\|thread\|all\)\>"
+syn match muttrcFunction	contained "\<rename-attachment\>"
+syn match muttrcFunction	contained "\<subjectrx\>"
+syn match muttrcFunction	contained "\<\%(un\)\?setenv\>"
+syn match muttrcFunction	contained "\<view-\%(attach\|attachments\|file\|mailcap\|name\|text\)\>"
+syn match muttrcFunction	contained "\<\%(backspace\|backward-char\|bol\|bottom\|bottom-page\|buffy-cycle\|clear-flag\|complete\%(-query\)\?\|copy-file\|create-alias\|detach-file\|eol\|exit\|extract-keys\|\%(imap-\)\?fetch-mail\|forget-passphrase\|forward-char\|group-reply\|help\|ispell\|jump\|limit\|list-reply\|mail\|mail-key\|mark-as-new\|middle-page\|new-mime\|noop\|pgp-menu\|query\|query-append\|quit\|quote-char\|read-subthread\|redraw-screen\|refresh\|rename-file\|reply\|select-new\|set-flag\|shell-escape\|skip-quoted\|sort\|subscribe\|sync-mailbox\|top\|top-page\|transpose-chars\|unsubscribe\|untag-pattern\|verify-key\|what-key\|write-fcc\)\>"
+syn keyword muttrcFunction	contained imap-logout-all
+if use_mutt_sidebar == 1
+    syn match muttrcFunction    contained "\<sidebar-\%(prev\|next\|open\|scroll-up\|scroll-down\)"
+endif
+syn match muttrcAction		contained "<[^>]\{-}>" contains=muttrcBadAction,muttrcFunction,muttrcKeyName
+
+syn keyword muttrcCommand	set     skipwhite nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn keyword muttrcCommand	unset   skipwhite nextgroup=muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn keyword muttrcCommand	reset   skipwhite nextgroup=muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn keyword muttrcCommand	toggle  skipwhite nextgroup=muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+" First, functions that take regular expressions:
+syn match  muttrcRXHookNot	contained /!\s*/ skipwhite nextgroup=muttrcRXHookString,muttrcRXHookStringNL
+syn match  muttrcRXHooks	/\<\%(account\|folder\)-hook\>/ skipwhite nextgroup=muttrcRXHookNot,muttrcRXHookString,muttrcRXHookStringNL
+
+" Now, functions that take patterns
+syn match muttrcPatHookNot	contained /!\s*/ skipwhite nextgroup=muttrcPattern
+syn match muttrcPatHooks	/\<\%(mbox\|crypt\)-hook\>/ skipwhite nextgroup=muttrcPatHookNot,muttrcPattern
+syn match muttrcPatHooks	/\<\%(message\|reply\|send\|send2\|save\|\|fcc\%(-save\)\?\)-hook\>/ skipwhite nextgroup=muttrcPatHookNot,muttrcOptPattern
+
+syn match muttrcBindFunction	contained /\S\+\>/ skipwhite contains=muttrcFunction
+syn match muttrcBindFunctionNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcBindFunction,muttrcBindFunctionNL
+syn match muttrcBindKey		contained /\S\+/ skipwhite contains=muttrcKey nextgroup=muttrcBindFunction,muttrcBindFunctionNL
+syn match muttrcBindKeyNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcBindKey,muttrcBindKeyNL
+syn match muttrcBindMenuList	contained /\S\+/ skipwhite contains=muttrcMenu,muttrcMenuCommas nextgroup=muttrcBindKey,muttrcBindKeyNL
+syn match muttrcBindMenuListNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcBindMenuList,muttrcBindMenuListNL
+syn keyword muttrcCommand	skipwhite bind nextgroup=muttrcBindMenuList,muttrcBindMenuListNL
+
+syn region muttrcMacroDescr	contained keepend skipwhite start=+\s*\S+ms=e skip=+\\ + end=+ \|$+me=s
+syn region muttrcMacroDescr	contained keepend skipwhite start=+'+ms=e skip=+\\'+ end=+'+me=s
+syn region muttrcMacroDescr	contained keepend skipwhite start=+"+ms=e skip=+\\"+ end=+"+me=s
+syn match muttrcMacroDescrNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
+syn region muttrcMacroBody	contained skipwhite start="\S" skip='\\ \|\\$' end=' \|$' contains=muttrcEscape,muttrcSet,muttrcUnset,muttrcReset,muttrcToggle,muttrcCommand,muttrcAction nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
+syn region muttrcMacroBody matchgroup=Type contained skipwhite start=+'+ms=e skip=+\\'+ end=+'\|\%(\%(\\\\\)\@<!$\)+me=s contains=muttrcEscape,muttrcSet,muttrcUnset,muttrcReset,muttrcToggle,muttrcSpam,muttrcNoSpam,muttrcCommand,muttrcAction,muttrcVariable nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
+syn region muttrcMacroBody matchgroup=Type contained skipwhite start=+"+ms=e skip=+\\"+ end=+"\|\%(\%(\\\\\)\@<!$\)+me=s contains=muttrcEscape,muttrcSet,muttrcUnset,muttrcReset,muttrcToggle,muttrcSpam,muttrcNoSpam,muttrcCommand,muttrcAction,muttrcVariable nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
+syn match muttrcMacroBodyNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcMacroBody,muttrcMacroBodyNL
+syn match muttrcMacroKey	contained /\S\+/ skipwhite contains=muttrcKey nextgroup=muttrcMacroBody,muttrcMacroBodyNL
+syn match muttrcMacroKeyNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcMacroKey,muttrcMacroKeyNL
+syn match muttrcMacroMenuList	contained /\S\+/ skipwhite contains=muttrcMenu,muttrcMenuCommas nextgroup=muttrcMacroKey,muttrcMacroKeyNL
+syn match muttrcMacroMenuListNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcMacroMenuList,muttrcMacroMenuListNL
+syn keyword muttrcCommand	skipwhite macro	nextgroup=muttrcMacroMenuList,muttrcMacroMenuListNL
+
+syn match muttrcAddrContent	contained "[a-zA-Z0-9._-]\+@[a-zA-Z0-9./-]\+\s*" skipwhite contains=muttrcEmail nextgroup=muttrcAddrContent
+syn region muttrcAddrContent	contained start=+'+ end=+'\s*+ skip=+\\'+ skipwhite contains=muttrcEmail nextgroup=muttrcAddrContent
+syn region muttrcAddrContent	contained start=+"+ end=+"\s*+ skip=+\\"+ skipwhite contains=muttrcEmail nextgroup=muttrcAddrContent
+syn match muttrcAddrDef 	contained "-addr\s\+" skipwhite nextgroup=muttrcAddrContent
+
+syn match muttrcGroupFlag	contained "-group"
+syn region muttrcGroupDef	contained start="-group\s\+" skip="\\$" end="\s" skipwhite keepend contains=muttrcGroupFlag,muttrcUnHighlightSpace
+
+syn keyword muttrcGroupKeyword	contained group ungroup
+syn region muttrcGroupLine	keepend start=+^\s*\%(un\)\?group\s+ skip=+\\$+ end=+$+ contains=muttrcGroupKeyword,muttrcGroupDef,muttrcAddrDef,muttrcRXDef,muttrcUnHighlightSpace,muttrcComment
+
+syn match muttrcAliasGroupName	contained /\w\+/ skipwhite nextgroup=muttrcAliasGroupDef,muttrcAliasKey,muttrcAliasNL
+syn match muttrcAliasGroupDefNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcAliasGroupName,muttrcAliasGroupDefNL
+syn match muttrcAliasGroupDef	contained /\s*-group/ skipwhite nextgroup=muttrcAliasGroupName,muttrcAliasGroupDefNL contains=muttrcGroupFlag
+syn match muttrcAliasComma	contained /,/ skipwhite nextgroup=muttrcAliasEmail,muttrcAliasEncEmail,muttrcAliasNameNoParens,muttrcAliasENNL
+syn match muttrcAliasEmail	contained /\S\+@\S\+/ contains=muttrcEmail nextgroup=muttrcAliasName,muttrcAliasNameNL skipwhite
+syn match muttrcAliasEncEmail	contained /<[^>]\+>/ contains=muttrcEmail nextgroup=muttrcAliasComma
+syn match muttrcAliasEncEmailNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcAliasEncEmail,muttrcAliasEncEmailNL
+syn match muttrcAliasNameNoParens contained /[^<(@]\+\s\+/ nextgroup=muttrcAliasEncEmail,muttrcAliasEncEmailNL
+syn region muttrcAliasName	contained matchgroup=Type start=/(/ end=/)/ skipwhite
+syn match muttrcAliasNameNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcAliasName,muttrcAliasNameNL
+syn match muttrcAliasENNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcAliasEmail,muttrcAliasEncEmail,muttrcAliasNameNoParens,muttrcAliasENNL
+syn match muttrcAliasKey	contained /\s*[^- \t]\S\+/ skipwhite nextgroup=muttrcAliasEmail,muttrcAliasEncEmail,muttrcAliasNameNoParens,muttrcAliasENNL
+syn match muttrcAliasNL		contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcAliasGroupDef,muttrcAliasKey,muttrcAliasNL
+syn keyword muttrcCommand	skipwhite alias nextgroup=muttrcAliasGroupDef,muttrcAliasKey,muttrcAliasNL
+
+syn match muttrcUnAliasKey	contained "\s*\w\+\s*" skipwhite nextgroup=muttrcUnAliasKey,muttrcUnAliasNL
+syn match muttrcUnAliasNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcUnAliasKey,muttrcUnAliasNL
+syn keyword muttrcCommand	skipwhite unalias nextgroup=muttrcUnAliasKey,muttrcUnAliasNL
+
+syn match muttrcSimplePat contained "!\?\^\?[~][ADEFgGklNOpPQRSTuUvV=$]"
+syn match muttrcSimplePat contained "!\?\^\?[~][mnXz]\s*\%([<>-][0-9]\+[kM]\?\|[0-9]\+[kM]\?[-]\%([0-9]\+[kM]\?\)\?\)"
+syn match muttrcSimplePat contained "!\?\^\?[~][dr]\s*\%(\%(-\?[0-9]\{1,2}\%(/[0-9]\{1,2}\%(/[0-9]\{2}\%([0-9]\{2}\)\?\)\?\)\?\%([+*-][0-9]\+[ymwd]\)*\)\|\%(\%([0-9]\{1,2}\%(/[0-9]\{1,2}\%(/[0-9]\{2}\%([0-9]\{2}\)\?\)\?\)\?\%([+*-][0-9]\+[ymwd]\)*\)-\%([0-9]\{1,2}\%(/[0-9]\{1,2}\%(/[0-9]\{2}\%([0-9]\{2}\)\?\)\?\)\?\%([+*-][0-9]\+[ymwd]\)\?\)\?\)\|\%([<>=][0-9]\+[ymwd]\)\|\%(`[^`]\+`\)\|\%(\$[a-zA-Z0-9_-]\+\)\)" contains=muttrcShellString,muttrcVariable
+syn match muttrcSimplePat contained "!\?\^\?[~][bBcCefhHiLstxy]\s*" nextgroup=muttrcSimplePatRXContainer
+syn match muttrcSimplePat contained "!\?\^\?[%][bBcCefhHiLstxy]\s*" nextgroup=muttrcSimplePatString
+syn match muttrcSimplePat contained "!\?\^\?[=][bcCefhHiLstxy]\s*" nextgroup=muttrcSimplePatString
+syn region muttrcSimplePat contained keepend start=+!\?\^\?[~](+ end=+)+ contains=muttrcSimplePat
+"syn match muttrcSimplePat contained /'[^~=%][^']*/ contains=muttrcRXString
+syn region muttrcSimplePatString contained keepend start=+"+ end=+"+ skip=+\\"+
+syn region muttrcSimplePatString contained keepend start=+'+ end=+'+ skip=+\\'+
+syn region muttrcSimplePatString contained keepend start=+[^ 	"']+ skip=+\\ + end=+\s+re=e-1
+syn region muttrcSimplePatRXContainer contained keepend start=+"+ end=+"+ skip=+\\"+ contains=muttrcRXString
+syn region muttrcSimplePatRXContainer contained keepend start=+'+ end=+'+ skip=+\\'+ contains=muttrcRXString
+syn region muttrcSimplePatRXContainer contained keepend start=+[^ 	"']+ skip=+\\ + end=+\s+re=e-1 contains=muttrcRXString
+syn match muttrcSimplePatMetas contained /[(|)]/
+
+syn match muttrcOptSimplePat contained skipwhite /[~=%!(^].*/ contains=muttrcSimplePat,muttrcSimplePatMetas
+syn match muttrcOptSimplePat contained skipwhite /[^~=%!(^].*/ contains=muttrcRXString
+syn region muttrcOptPattern contained matchgroup=Type keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcOptSimplePat,muttrcUnHighlightSpace nextgroup=muttrcString,muttrcStringNL
+syn region muttrcOptPattern contained matchgroup=Type keepend skipwhite start=+'+ skip=+\\'+ end=+'+ contains=muttrcOptSimplePat,muttrcUnHighlightSpace nextgroup=muttrcString,muttrcStringNL
+syn region muttrcOptPattern contained keepend skipwhite start=+[~](+ end=+)+ skip=+\\)+ contains=muttrcSimplePat nextgroup=muttrcString,muttrcStringNL
+syn match muttrcOptPattern contained skipwhite /[~][A-Za-z]/ contains=muttrcSimplePat nextgroup=muttrcString,muttrcStringNL
+syn match muttrcOptPattern contained skipwhite /[.]/ nextgroup=muttrcString,muttrcStringNL
+" Keep muttrcPattern and muttrcOptPattern synchronized
+syn region muttrcPattern contained matchgroup=Type keepend skipwhite start=+"+ skip=+\\"+ end=+"+ contains=muttrcSimplePat,muttrcUnHighlightSpace,muttrcSimplePatMetas
+syn region muttrcPattern contained matchgroup=Type keepend skipwhite start=+'+ skip=+\\'+ end=+'+ contains=muttrcSimplePat,muttrcUnHighlightSpace,muttrcSimplePatMetas
+syn region muttrcPattern contained keepend skipwhite start=+[~](+ end=+)+ skip=+\\)+ contains=muttrcSimplePat
+syn region muttrcPattern contained keepend skipwhite start=+[~][<>](+ end=+)+ skip=+\\)+ contains=muttrcSimplePat
+syn match muttrcPattern contained skipwhite /[~][A-Za-z]/ contains=muttrcSimplePat
+syn match muttrcPattern contained skipwhite /[.]/
+syn region muttrcPatternInner contained keepend start=+"[~=%!(^]+ms=s+1 skip=+\\"+ end=+"+me=e-1 contains=muttrcSimplePat,muttrcUnHighlightSpace,muttrcSimplePatMetas
+syn region muttrcPatternInner contained keepend start=+'[~=%!(^]+ms=s+1 skip=+\\'+ end=+'+me=e-1 contains=muttrcSimplePat,muttrcUnHighlightSpace,muttrcSimplePatMetas
+
+" Colour definitions takes object, foreground and background arguments (regexps excluded).
+syn match muttrcColorMatchCount	contained "[0-9]\+"
+syn match muttrcColorMatchCountNL contained skipwhite skipnl "\s*\\$" nextgroup=muttrcColorMatchCount,muttrcColorMatchCountNL
+syn region muttrcColorRXPat	contained start=+\s*'+ skip=+\\'+ end=+'\s*+ keepend skipwhite contains=muttrcRXString2 nextgroup=muttrcColorMatchCount,muttrcColorMatchCountNL
+syn region muttrcColorRXPat	contained start=+\s*"+ skip=+\\"+ end=+"\s*+ keepend skipwhite contains=muttrcRXString2 nextgroup=muttrcColorMatchCount,muttrcColorMatchCountNL
+syn keyword muttrcColorField	skipwhite contained
+			\ attachment body bold error hdrdefault header index indicator markers message
+			\ normal prompt quoted search sidebar-divider sidebar-flagged sidebar-highlight
+			\ sidebar-indicator sidebar-new sidebar-spoolfile signature status tilde tree
+			\ underline
+syn match   muttrcColorField	contained "\<quoted\d\=\>"
+if use_mutt_sidebar == 1
+    syn keyword muttrcColorField contained sidebar_new
+endif
+syn keyword muttrcColor	contained black blue cyan default green magenta red white yellow
+syn keyword muttrcColor	contained brightblack brightblue brightcyan brightdefault brightgreen brightmagenta brightred brightwhite brightyellow
+syn match   muttrcColor	contained "\<\%(bright\)\=color\d\{1,3}\>"
+" Now for the structure of the color line
+syn match muttrcColorRXNL	contained skipnl "\s*\\$" nextgroup=muttrcColorRXPat,muttrcColorRXNL
+syn match muttrcColorBG 	contained /\s*[$]\?\w\+/ contains=muttrcColor,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcColorRXPat,muttrcColorRXNL
+syn match muttrcColorBGNL	contained skipnl "\s*\\$" nextgroup=muttrcColorBG,muttrcColorBGNL
+syn match muttrcColorFG 	contained /\s*[$]\?\w\+/ contains=muttrcColor,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcColorBG,muttrcColorBGNL
+syn match muttrcColorFGNL	contained skipnl "\s*\\$" nextgroup=muttrcColorFG,muttrcColorFGNL
+syn match muttrcColorContext 	contained /\s*[$]\?\w\+/ contains=muttrcColorField,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcColorFG,muttrcColorFGNL
+syn match muttrcColorNL 	contained skipnl "\s*\\$" nextgroup=muttrcColorContext,muttrcColorNL
+syn match muttrcColorKeyword	contained /^\s*color\s\+/ nextgroup=muttrcColorContext,muttrcColorNL
+syn region muttrcColorLine keepend start=/^\s*color\s\+\%(index\|header\)\@!/ skip=+\\$+ end=+$+ contains=muttrcColorKeyword,muttrcComment,muttrcUnHighlightSpace
+" Now for the structure of the color index line
+syn match muttrcPatternNL	contained skipnl "\s*\\$" nextgroup=muttrcPattern,muttrcPatternNL
+syn match muttrcColorBGI	contained /\s*[$]\?\w\+\s*/ contains=muttrcColor,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcPattern,muttrcPatternNL
+syn match muttrcColorBGNLI	contained skipnl "\s*\\$" nextgroup=muttrcColorBGI,muttrcColorBGNLI
+syn match muttrcColorFGI	contained /\s*[$]\?\w\+/ contains=muttrcColor,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcColorBGI,muttrcColorBGNLI
+syn match muttrcColorFGNLI	contained skipnl "\s*\\$" nextgroup=muttrcColorFGI,muttrcColorFGNLI
+syn match muttrcColorContextI	contained /\s*\<index\>/ contains=muttrcUnHighlightSpace nextgroup=muttrcColorFGI,muttrcColorFGNLI
+syn match muttrcColorNLI	contained skipnl "\s*\\$" nextgroup=muttrcColorContextI,muttrcColorNLI
+syn match muttrcColorKeywordI	contained skipwhite /\<color\>/ nextgroup=muttrcColorContextI,muttrcColorNLI
+syn region muttrcColorLine keepend skipwhite start=/\<color\s\+index\>/ skip=+\\$+ end=+$+ contains=muttrcColorKeywordI,muttrcComment,muttrcUnHighlightSpace
+" Now for the structure of the color header line
+syn match muttrcRXPatternNL	contained skipnl "\s*\\$" nextgroup=muttrcRXString,muttrcRXPatternNL
+syn match muttrcColorBGH	contained /\s*[$]\?\w\+\s*/ contains=muttrcColor,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcRXString,muttrcRXPatternNL
+syn match muttrcColorBGNLH	contained skipnl "\s*\\$" nextgroup=muttrcColorBGH,muttrcColorBGNLH
+syn match muttrcColorFGH	contained /\s*[$]\?\w\+/ contains=muttrcColor,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcColorBGH,muttrcColorBGNLH
+syn match muttrcColorFGNLH	contained skipnl "\s*\\$" nextgroup=muttrcColorFGH,muttrcColorFGNLH
+syn match muttrcColorContextH	contained /\s*\<header\>/ contains=muttrcUnHighlightSpace nextgroup=muttrcColorFGH,muttrcColorFGNLH
+syn match muttrcColorNLH	contained skipnl "\s*\\$" nextgroup=muttrcColorContextH,muttrcColorNLH
+syn match muttrcColorKeywordH	contained skipwhite /\<color\>/ nextgroup=muttrcColorContextH,muttrcColorNLH
+syn region muttrcColorLine keepend skipwhite start=/\<color\s\+header\>/ skip=+\\$+ end=+$+ contains=muttrcColorKeywordH,muttrcComment,muttrcUnHighlightSpace
+" And now color's brother:
+syn region muttrcUnColorPatterns contained skipwhite start=+\s*'+ end=+'+ skip=+\\'+ contains=muttrcPattern nextgroup=muttrcUnColorPatterns,muttrcUnColorPatNL
+syn region muttrcUnColorPatterns contained skipwhite start=+\s*"+ end=+"+ skip=+\\"+ contains=muttrcPattern nextgroup=muttrcUnColorPatterns,muttrcUnColorPatNL
+syn match muttrcUnColorPatterns contained skipwhite /\s*[^'"\s]\S\*/ contains=muttrcPattern nextgroup=muttrcUnColorPatterns,muttrcUnColorPatNL
+syn match muttrcUnColorPatNL	contained skipwhite skipnl /\s*\\$/ nextgroup=muttrcUnColorPatterns,muttrcUnColorPatNL
+syn match muttrcUnColorAll	contained skipwhite /[*]/
+syn match muttrcUnColorAPNL	contained skipwhite skipnl /\s*\\$/ nextgroup=muttrcUnColorPatterns,muttrcUnColorAll,muttrcUnColorAPNL
+syn match muttrcUnColorIndex	contained skipwhite /\s*index\s\+/ nextgroup=muttrcUnColorPatterns,muttrcUnColorAll,muttrcUnColorAPNL
+syn match muttrcUnColorIndexNL	contained skipwhite skipnl /\s*\\$/ nextgroup=muttrcUnColorIndex,muttrcUnColorIndexNL
+syn match muttrcUnColorKeyword	contained skipwhite /^\s*uncolor\s\+/ nextgroup=muttrcUnColorIndex,muttrcUnColorIndexNL
+syn region muttrcUnColorLine keepend start=+^\s*uncolor\s+ skip=+\\$+ end=+$+ contains=muttrcUnColorKeyword,muttrcComment,muttrcUnHighlightSpace
+
+" Mono are almost like color (ojects inherited from color)
+syn keyword muttrcMonoAttrib	contained bold none normal reverse standout underline
+syn keyword muttrcMono		contained mono		skipwhite nextgroup=muttrcColorField
+syn match   muttrcMonoLine	"^\s*mono\s\+\S\+"	skipwhite nextgroup=muttrcMonoAttrib contains=muttrcMono
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link muttrcComment		Comment
+hi def link muttrcEscape		SpecialChar
+hi def link muttrcRXChars		SpecialChar
+hi def link muttrcString		String
+hi def link muttrcRXString		String
+hi def link muttrcRXString2	String
+hi def link muttrcSpecial		Special
+hi def link muttrcHooks		Type
+hi def link muttrcGroupFlag	Type
+hi def link muttrcGroupDef		Macro
+hi def link muttrcAddrDef		muttrcGroupFlag
+hi def link muttrcRXDef		muttrcGroupFlag
+hi def link muttrcRXPat		String
+hi def link muttrcAliasGroupName	Macro
+hi def link muttrcAliasKey	        Identifier
+hi def link muttrcUnAliasKey	Identifier
+hi def link muttrcAliasEncEmail	Identifier
+hi def link muttrcAliasParens	Type
+hi def link muttrcSetNumAssignment	Number
+hi def link muttrcSetBoolAssignment	Boolean
+hi def link muttrcSetQuadAssignment	Boolean
+hi def link muttrcSetStrAssignment	String
+hi def link muttrcEmail		Special
+hi def link muttrcVariableInner	Special
+hi def link muttrcEscapedVariable	String
+hi def link muttrcHeader		Type
+hi def link muttrcKeySpecial	SpecialChar
+hi def link muttrcKey		Type
+hi def link muttrcKeyName		SpecialChar
+hi def link muttrcVarBool		Identifier
+hi def link muttrcVarQuad		Identifier
+hi def link muttrcVarNum		Identifier
+hi def link muttrcVarStr		Identifier
+hi def link muttrcMenu		Identifier
+hi def link muttrcCommand		Keyword
+hi def link muttrcMacroDescr	String
+hi def link muttrcAction		Macro
+hi def link muttrcBadAction	Error
+hi def link muttrcBindFunction	Error
+hi def link muttrcBindMenuList	Error
+hi def link muttrcFunction		Macro
+hi def link muttrcGroupKeyword	muttrcCommand
+hi def link muttrcGroupLine	Error
+hi def link muttrcSubscribeKeyword	muttrcCommand
+hi def link muttrcSubscribeLine	Error
+hi def link muttrcListsKeyword	muttrcCommand
+hi def link muttrcListsLine	Error
+hi def link muttrcAlternateKeyword	muttrcCommand
+hi def link muttrcAlternatesLine	Error
+hi def link muttrcAttachmentsLine	muttrcCommand
+hi def link muttrcAttachmentsFlag	Type
+hi def link muttrcAttachmentsMimeType	String
+hi def link muttrcColorLine	Error
+hi def link muttrcColorContext	Error
+hi def link muttrcColorContextI	Identifier
+hi def link muttrcColorContextH	Identifier
+hi def link muttrcColorKeyword	muttrcCommand
+hi def link muttrcColorKeywordI	muttrcColorKeyword
+hi def link muttrcColorKeywordH	muttrcColorKeyword
+hi def link muttrcColorField	Identifier
+hi def link muttrcColor		Type
+hi def link muttrcColorFG		Error
+hi def link muttrcColorFGI		Error
+hi def link muttrcColorFGH		Error
+hi def link muttrcColorBG		Error
+hi def link muttrcColorBGI		Error
+hi def link muttrcColorBGH		Error
+hi def link muttrcMonoAttrib	muttrcColor
+hi def link muttrcMono		muttrcCommand
+hi def link muttrcSimplePat	Identifier
+hi def link muttrcSimplePatString	Macro
+hi def link muttrcSimplePatMetas	Special
+hi def link muttrcPattern		Error
+hi def link muttrcUnColorLine	Error
+hi def link muttrcUnColorKeyword	muttrcCommand
+hi def link muttrcUnColorIndex	Identifier
+hi def link muttrcShellString	muttrcEscape
+hi def link muttrcRXHooks		muttrcCommand
+hi def link muttrcRXHookNot	Type
+hi def link muttrcPatHooks		muttrcCommand
+hi def link muttrcPatHookNot	Type
+hi def link muttrcFormatConditionals2 Type
+hi def link muttrcIndexFormatStr	muttrcString
+hi def link muttrcIndexFormatEscapes muttrcEscape
+hi def link muttrcIndexFormatConditionals muttrcFormatConditionals2
+hi def link muttrcAliasFormatStr	muttrcString
+hi def link muttrcAliasFormatEscapes muttrcEscape
+hi def link muttrcAttachFormatStr	muttrcString
+hi def link muttrcAttachFormatEscapes muttrcEscape
+hi def link muttrcAttachFormatConditionals muttrcFormatConditionals2
+hi def link muttrcComposeFormatStr	muttrcString
+hi def link muttrcComposeFormatEscapes muttrcEscape
+hi def link muttrcFolderFormatStr	muttrcString
+hi def link muttrcFolderFormatEscapes muttrcEscape
+hi def link muttrcFolderFormatConditionals muttrcFormatConditionals2
+hi def link muttrcMixFormatStr	muttrcString
+hi def link muttrcMixFormatEscapes muttrcEscape
+hi def link muttrcMixFormatConditionals muttrcFormatConditionals2
+hi def link muttrcPGPFormatStr	muttrcString
+hi def link muttrcPGPFormatEscapes muttrcEscape
+hi def link muttrcPGPFormatConditionals muttrcFormatConditionals2
+hi def link muttrcPGPCmdFormatStr	muttrcString
+hi def link muttrcPGPCmdFormatEscapes muttrcEscape
+hi def link muttrcPGPCmdFormatConditionals muttrcFormatConditionals2
+hi def link muttrcStatusFormatStr	muttrcString
+hi def link muttrcStatusFormatEscapes muttrcEscape
+hi def link muttrcStatusFormatConditionals muttrcFormatConditionals2
+hi def link muttrcPGPGetKeysFormatStr	muttrcString
+hi def link muttrcPGPGetKeysFormatEscapes muttrcEscape
+hi def link muttrcSmimeFormatStr	muttrcString
+hi def link muttrcSmimeFormatEscapes muttrcEscape
+hi def link muttrcSmimeFormatConditionals muttrcFormatConditionals2
+hi def link muttrcTimeEscapes	muttrcEscape
+hi def link muttrcPGPTimeEscapes	muttrcEscape
+hi def link muttrcStrftimeEscapes	Type
+hi def link muttrcStrftimeFormatStr muttrcString
+hi def link muttrcFormatErrors Error
+
+hi def link muttrcBindFunctionNL	SpecialChar
+hi def link muttrcBindKeyNL	SpecialChar
+hi def link muttrcBindMenuListNL	SpecialChar
+hi def link muttrcMacroDescrNL	SpecialChar
+hi def link muttrcMacroBodyNL	SpecialChar
+hi def link muttrcMacroKeyNL	SpecialChar
+hi def link muttrcMacroMenuListNL	SpecialChar
+hi def link muttrcColorMatchCountNL SpecialChar
+hi def link muttrcColorNL		SpecialChar
+hi def link muttrcColorRXNL	SpecialChar
+hi def link muttrcColorBGNL	SpecialChar
+hi def link muttrcColorFGNL	SpecialChar
+hi def link muttrcAliasNameNL	SpecialChar
+hi def link muttrcAliasENNL	SpecialChar
+hi def link muttrcAliasNL		SpecialChar
+hi def link muttrcUnAliasNL	SpecialChar
+hi def link muttrcAliasGroupDefNL	SpecialChar
+hi def link muttrcAliasEncEmailNL	SpecialChar
+hi def link muttrcPatternNL	SpecialChar
+hi def link muttrcUnColorPatNL	SpecialChar
+hi def link muttrcUnColorAPNL	SpecialChar
+hi def link muttrcUnColorIndexNL	SpecialChar
+hi def link muttrcStringNL		SpecialChar
+
+
+let b:current_syntax = "muttrc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+"EOF	vim: ts=8 noet tw=100 sw=8 sts=0 ft=vim
+
+endif
diff --git a/syntax/mysql.vim b/syntax/mysql.vim
new file mode 100644
index 000000000..60068c66d
--- /dev/null
+++ b/syntax/mysql.vim
@@ -0,0 +1,292 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mysql') == -1
+
+" Vim syntax file
+" Language:     mysql
+" Maintainer:   Kenneth J. Pronovici <pronovic@ieee.org>
+" Last Change:  $LastChangedDate: 2016-04-11 10:31:04 -0500 (Mon, 11 Apr 2016) $
+" Filenames:    *.mysql
+" URL:          ftp://cedar-solutions.com/software/mysql.vim
+" Note:         The definitions below are taken from the mysql user manual as of April 2002, for version 3.23
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Always ignore case
+syn case ignore
+
+" General keywords which don't fall into other categories
+syn keyword mysqlKeyword         action add after aggregate all alter as asc auto_increment avg_row_length
+syn keyword mysqlKeyword         both by
+syn keyword mysqlKeyword         cascade change character check checksum column columns comment constraint create cross
+syn keyword mysqlKeyword         current_date current_time current_timestamp
+syn keyword mysqlKeyword         data database databases day day_hour day_minute day_second
+syn keyword mysqlKeyword         default delayed delay_key_write delete desc describe distinct distinctrow drop
+syn keyword mysqlKeyword         enclosed escape escaped explain
+syn keyword mysqlKeyword         fields file first flush for foreign from full function
+syn keyword mysqlKeyword         global grant grants group
+syn keyword mysqlKeyword         having heap high_priority hosts hour hour_minute hour_second
+syn keyword mysqlKeyword         identified ignore index infile inner insert insert_id into isam
+syn keyword mysqlKeyword         join
+syn keyword mysqlKeyword         key keys kill last_insert_id leading left limit lines load local lock logs long
+syn keyword mysqlKeyword         low_priority
+syn keyword mysqlKeyword         match max_rows middleint min_rows minute minute_second modify month myisam
+syn keyword mysqlKeyword         natural no
+syn keyword mysqlKeyword         on optimize option optionally order outer outfile
+syn keyword mysqlKeyword         pack_keys partial password primary privileges procedure process processlist
+syn keyword mysqlKeyword         read references reload rename replace restrict returns revoke right row rows
+syn keyword mysqlKeyword         second select show shutdown soname sql_big_result sql_big_selects sql_big_tables sql_log_off
+syn keyword mysqlKeyword         sql_log_update sql_low_priority_updates sql_select_limit sql_small_result sql_warnings starting
+syn keyword mysqlKeyword         status straight_join string
+syn keyword mysqlKeyword         table tables temporary terminated to trailing type
+syn keyword mysqlKeyword         unique unlock unsigned update usage use using
+syn keyword mysqlKeyword         values varbinary variables varying
+syn keyword mysqlKeyword         where with write
+syn keyword mysqlKeyword         year_month
+syn keyword mysqlKeyword         zerofill
+
+" Special values
+syn keyword mysqlSpecial         false null true
+
+" Strings (single- and double-quote)
+syn region mysqlString           start=+"+  skip=+\\\\\|\\"+  end=+"+
+syn region mysqlString           start=+'+  skip=+\\\\\|\\'+  end=+'+
+
+" Numbers and hexidecimal values
+syn match mysqlNumber            "-\=\<[0-9]*\>"
+syn match mysqlNumber            "-\=\<[0-9]*\.[0-9]*\>"
+syn match mysqlNumber            "-\=\<[0-9][0-9]*e[+-]\=[0-9]*\>"
+syn match mysqlNumber            "-\=\<[0-9]*\.[0-9]*e[+-]\=[0-9]*\>"
+syn match mysqlNumber            "\<0x[abcdefABCDEF0-9]*\>"
+
+" User variables
+syn match mysqlVariable          "@\a*[A-Za-z0-9]*\([._]*[A-Za-z0-9]\)*"
+
+" Escaped column names
+syn match mysqlEscaped           "`[^`]*`"
+
+" Comments (c-style, mysql-style and modified sql-style)
+syn region mysqlComment          start="/\*"  end="\*/"
+syn match mysqlComment           "#.*"
+syn match mysqlComment           "--\_s.*"
+syn sync ccomment mysqlComment
+
+" Column types
+"
+" This gets a bit ugly.  There are two different problems we have to
+" deal with.
+"
+" The first problem is that some keywords like 'float' can be used
+" both with and without specifiers, i.e. 'float', 'float(1)' and
+" 'float(@var)' are all valid.  We have to account for this and we
+" also have to make sure that garbage like floatn or float_(1) is not
+" highlighted.
+"
+" The second problem is that some of these keywords are included in
+" function names.  For instance, year() is part of the name of the
+" dayofyear() function, and the dec keyword (no parenthesis) is part of
+" the name of the decode() function.
+
+syn keyword mysqlType            tinyint smallint mediumint int integer bigint
+syn keyword mysqlType            date datetime time bit bool
+syn keyword mysqlType            tinytext mediumtext longtext text
+syn keyword mysqlType            tinyblob mediumblob longblob blob
+syn region mysqlType             start="float\W" end="."me=s-1
+syn region mysqlType             start="float$" end="."me=s-1
+syn region mysqlType             start="float(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="double\W" end="."me=s-1
+syn region mysqlType             start="double$" end="."me=s-1
+syn region mysqlType             start="double(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="double precision\W" end="."me=s-1
+syn region mysqlType             start="double precision$" end="."me=s-1
+syn region mysqlType             start="double precision(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="real\W" end="."me=s-1
+syn region mysqlType             start="real$" end="."me=s-1
+syn region mysqlType             start="real(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="numeric(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="dec\W" end="."me=s-1
+syn region mysqlType             start="dec$" end="."me=s-1
+syn region mysqlType             start="dec(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="decimal\W" end="."me=s-1
+syn region mysqlType             start="decimal$" end="."me=s-1
+syn region mysqlType             start="decimal(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="\Wtimestamp\W" end="."me=s-1
+syn region mysqlType             start="\Wtimestamp$" end="."me=s-1
+syn region mysqlType             start="\Wtimestamp(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="^timestamp\W" end="."me=s-1
+syn region mysqlType             start="^timestamp$" end="."me=s-1
+syn region mysqlType             start="^timestamp(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="\Wyear(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="^year(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="char(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="varchar(" end=")" contains=mysqlNumber,mysqlVariable
+syn region mysqlType             start="enum(" end=")" contains=mysqlString,mysqlVariable
+syn region mysqlType             start="\Wset(" end=")" contains=mysqlString,mysqlVariable
+syn region mysqlType             start="^set(" end=")" contains=mysqlString,mysqlVariable
+
+" Logical, string and  numeric operators
+syn keyword mysqlOperator        between not and or is in like regexp rlike binary exists
+syn region mysqlOperator         start="isnull(" end=")" contains=ALL
+syn region mysqlOperator         start="coalesce(" end=")" contains=ALL
+syn region mysqlOperator         start="interval(" end=")" contains=ALL
+
+" Control flow functions
+syn keyword mysqlFlow            case when then else end
+syn region mysqlFlow             start="ifnull("   end=")"  contains=ALL
+syn region mysqlFlow             start="nullif("   end=")"  contains=ALL
+syn region mysqlFlow             start="if("       end=")"  contains=ALL
+
+" General Functions
+"
+" I'm leery of just defining keywords for functions, since according to the MySQL manual:
+"
+"     Function names do not clash with table or column names. For example, ABS is a
+"     valid column name. The only restriction is that for a function call, no spaces
+"     are allowed between the function name and the `(' that follows it.
+"
+" This means that if I want to highlight function names properly, I have to use a
+" region to define them, not just a keyword.  This will probably cause the syntax file
+" to load more slowly, but at least it will be 'correct'.
+
+syn region mysqlFunction         start="abs(" end=")" contains=ALL
+syn region mysqlFunction         start="acos(" end=")" contains=ALL
+syn region mysqlFunction         start="adddate(" end=")" contains=ALL
+syn region mysqlFunction         start="ascii(" end=")" contains=ALL
+syn region mysqlFunction         start="asin(" end=")" contains=ALL
+syn region mysqlFunction         start="atan(" end=")" contains=ALL
+syn region mysqlFunction         start="atan2(" end=")" contains=ALL
+syn region mysqlFunction         start="avg(" end=")" contains=ALL
+syn region mysqlFunction         start="benchmark(" end=")" contains=ALL
+syn region mysqlFunction         start="bin(" end=")" contains=ALL
+syn region mysqlFunction         start="bit_and(" end=")" contains=ALL
+syn region mysqlFunction         start="bit_count(" end=")" contains=ALL
+syn region mysqlFunction         start="bit_or(" end=")" contains=ALL
+syn region mysqlFunction         start="ceiling(" end=")" contains=ALL
+syn region mysqlFunction         start="character_length(" end=")" contains=ALL
+syn region mysqlFunction         start="char_length(" end=")" contains=ALL
+syn region mysqlFunction         start="concat(" end=")" contains=ALL
+syn region mysqlFunction         start="concat_ws(" end=")" contains=ALL
+syn region mysqlFunction         start="connection_id(" end=")" contains=ALL
+syn region mysqlFunction         start="conv(" end=")" contains=ALL
+syn region mysqlFunction         start="cos(" end=")" contains=ALL
+syn region mysqlFunction         start="cot(" end=")" contains=ALL
+syn region mysqlFunction         start="count(" end=")" contains=ALL
+syn region mysqlFunction         start="curdate(" end=")" contains=ALL
+syn region mysqlFunction         start="curtime(" end=")" contains=ALL
+syn region mysqlFunction         start="date_add(" end=")" contains=ALL
+syn region mysqlFunction         start="date_format(" end=")" contains=ALL
+syn region mysqlFunction         start="date_sub(" end=")" contains=ALL
+syn region mysqlFunction         start="dayname(" end=")" contains=ALL
+syn region mysqlFunction         start="dayofmonth(" end=")" contains=ALL
+syn region mysqlFunction         start="dayofweek(" end=")" contains=ALL
+syn region mysqlFunction         start="dayofyear(" end=")" contains=ALL
+syn region mysqlFunction         start="decode(" end=")" contains=ALL
+syn region mysqlFunction         start="degrees(" end=")" contains=ALL
+syn region mysqlFunction         start="elt(" end=")" contains=ALL
+syn region mysqlFunction         start="encode(" end=")" contains=ALL
+syn region mysqlFunction         start="encrypt(" end=")" contains=ALL
+syn region mysqlFunction         start="exp(" end=")" contains=ALL
+syn region mysqlFunction         start="export_set(" end=")" contains=ALL
+syn region mysqlFunction         start="extract(" end=")" contains=ALL
+syn region mysqlFunction         start="field(" end=")" contains=ALL
+syn region mysqlFunction         start="find_in_set(" end=")" contains=ALL
+syn region mysqlFunction         start="floor(" end=")" contains=ALL
+syn region mysqlFunction         start="format(" end=")" contains=ALL
+syn region mysqlFunction         start="from_days(" end=")" contains=ALL
+syn region mysqlFunction         start="from_unixtime(" end=")" contains=ALL
+syn region mysqlFunction         start="get_lock(" end=")" contains=ALL
+syn region mysqlFunction         start="greatest(" end=")" contains=ALL
+syn region mysqlFunction         start="group_unique_users(" end=")" contains=ALL
+syn region mysqlFunction         start="hex(" end=")" contains=ALL
+syn region mysqlFunction         start="inet_aton(" end=")" contains=ALL
+syn region mysqlFunction         start="inet_ntoa(" end=")" contains=ALL
+syn region mysqlFunction         start="instr(" end=")" contains=ALL
+syn region mysqlFunction         start="lcase(" end=")" contains=ALL
+syn region mysqlFunction         start="least(" end=")" contains=ALL
+syn region mysqlFunction         start="length(" end=")" contains=ALL
+syn region mysqlFunction         start="load_file(" end=")" contains=ALL
+syn region mysqlFunction         start="locate(" end=")" contains=ALL
+syn region mysqlFunction         start="log(" end=")" contains=ALL
+syn region mysqlFunction         start="log10(" end=")" contains=ALL
+syn region mysqlFunction         start="lower(" end=")" contains=ALL
+syn region mysqlFunction         start="lpad(" end=")" contains=ALL
+syn region mysqlFunction         start="ltrim(" end=")" contains=ALL
+syn region mysqlFunction         start="make_set(" end=")" contains=ALL
+syn region mysqlFunction         start="master_pos_wait(" end=")" contains=ALL
+syn region mysqlFunction         start="max(" end=")" contains=ALL
+syn region mysqlFunction         start="md5(" end=")" contains=ALL
+syn region mysqlFunction         start="mid(" end=")" contains=ALL
+syn region mysqlFunction         start="min(" end=")" contains=ALL
+syn region mysqlFunction         start="mod(" end=")" contains=ALL
+syn region mysqlFunction         start="monthname(" end=")" contains=ALL
+syn region mysqlFunction         start="now(" end=")" contains=ALL
+syn region mysqlFunction         start="oct(" end=")" contains=ALL
+syn region mysqlFunction         start="octet_length(" end=")" contains=ALL
+syn region mysqlFunction         start="ord(" end=")" contains=ALL
+syn region mysqlFunction         start="period_add(" end=")" contains=ALL
+syn region mysqlFunction         start="period_diff(" end=")" contains=ALL
+syn region mysqlFunction         start="pi(" end=")" contains=ALL
+syn region mysqlFunction         start="position(" end=")" contains=ALL
+syn region mysqlFunction         start="pow(" end=")" contains=ALL
+syn region mysqlFunction         start="power(" end=")" contains=ALL
+syn region mysqlFunction         start="quarter(" end=")" contains=ALL
+syn region mysqlFunction         start="radians(" end=")" contains=ALL
+syn region mysqlFunction         start="rand(" end=")" contains=ALL
+syn region mysqlFunction         start="release_lock(" end=")" contains=ALL
+syn region mysqlFunction         start="repeat(" end=")" contains=ALL
+syn region mysqlFunction         start="reverse(" end=")" contains=ALL
+syn region mysqlFunction         start="round(" end=")" contains=ALL
+syn region mysqlFunction         start="rpad(" end=")" contains=ALL
+syn region mysqlFunction         start="rtrim(" end=")" contains=ALL
+syn region mysqlFunction         start="sec_to_time(" end=")" contains=ALL
+syn region mysqlFunction         start="session_user(" end=")" contains=ALL
+syn region mysqlFunction         start="sign(" end=")" contains=ALL
+syn region mysqlFunction         start="sin(" end=")" contains=ALL
+syn region mysqlFunction         start="soundex(" end=")" contains=ALL
+syn region mysqlFunction         start="space(" end=")" contains=ALL
+syn region mysqlFunction         start="sqrt(" end=")" contains=ALL
+syn region mysqlFunction         start="std(" end=")" contains=ALL
+syn region mysqlFunction         start="stddev(" end=")" contains=ALL
+syn region mysqlFunction         start="strcmp(" end=")" contains=ALL
+syn region mysqlFunction         start="subdate(" end=")" contains=ALL
+syn region mysqlFunction         start="substring(" end=")" contains=ALL
+syn region mysqlFunction         start="substring_index(" end=")" contains=ALL
+syn region mysqlFunction         start="subtime(" end=")" contains=ALL
+syn region mysqlFunction         start="sum(" end=")" contains=ALL
+syn region mysqlFunction         start="sysdate(" end=")" contains=ALL
+syn region mysqlFunction         start="system_user(" end=")" contains=ALL
+syn region mysqlFunction         start="tan(" end=")" contains=ALL
+syn region mysqlFunction         start="time_format(" end=")" contains=ALL
+syn region mysqlFunction         start="time_to_sec(" end=")" contains=ALL
+syn region mysqlFunction         start="to_days(" end=")" contains=ALL
+syn region mysqlFunction         start="trim(" end=")" contains=ALL
+syn region mysqlFunction         start="ucase(" end=")" contains=ALL
+syn region mysqlFunction         start="unique_users(" end=")" contains=ALL
+syn region mysqlFunction         start="unix_timestamp(" end=")" contains=ALL
+syn region mysqlFunction         start="upper(" end=")" contains=ALL
+syn region mysqlFunction         start="user(" end=")" contains=ALL
+syn region mysqlFunction         start="version(" end=")" contains=ALL
+syn region mysqlFunction         start="week(" end=")" contains=ALL
+syn region mysqlFunction         start="weekday(" end=")" contains=ALL
+syn region mysqlFunction         start="yearweek(" end=")" contains=ALL
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link mysqlKeyword            Statement
+hi def link mysqlSpecial            Special
+hi def link mysqlString             String
+hi def link mysqlNumber             Number
+hi def link mysqlVariable           Identifier
+hi def link mysqlComment            Comment
+hi def link mysqlType               Type
+hi def link mysqlOperator           Statement
+hi def link mysqlFlow               Statement
+hi def link mysqlFunction           Function
+
+
+let b:current_syntax = "mysql"
+
+
+endif
diff --git a/syntax/n1ql.vim b/syntax/n1ql.vim
new file mode 100644
index 000000000..c9f55282d
--- /dev/null
+++ b/syntax/n1ql.vim
@@ -0,0 +1,438 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'n1ql') == -1
+
+" Vim syntax file
+" Language:    N1QL / Couchbase Server
+" Maintainer:  Eugene Ciurana <n1ql AT cime.net>
+" Version:     1.0
+" Source:      https://github.com/pr3d4t0r/n1ql-vim-syntax
+"
+" License:     Vim is Charityware.  n1ql.vim syntax is Charityware.
+"              (c) Copyright 2017 by Eugene Ciurana / pr3d4t0r.  Licensed
+"              under the standard VIM LICENSE - Vim command :help uganda.txt
+"              for details.
+"
+" Questions, comments:  <n1ql AT cime.net>
+"                       https://ciurana.eu/pgp, https://keybase.io/pr3d4t0r
+"
+" vim: set fileencoding=utf-8:
+
+
+if exists("b:current_syntax")
+  finish
+endif
+
+
+syn case ignore
+
+syn keyword n1qlSpecial DATASTORES
+syn keyword n1qlSpecial DUAL
+syn keyword n1qlSpecial FALSE
+syn keyword n1qlSpecial INDEXES
+syn keyword n1qlSpecial KEYSPACES
+syn keyword n1qlSpecial MISSING
+syn keyword n1qlSpecial NAMESPACES
+syn keyword n1qlSpecial NULL
+syn keyword n1qlSpecial TRUE
+
+
+"
+" *** keywords ***
+"
+syn keyword n1qlKeyword ALL
+syn keyword n1qlKeyword ANY
+syn keyword n1qlKeyword ASC
+syn keyword n1qlKeyword BEGIN
+syn keyword n1qlKeyword BETWEEN
+syn keyword n1qlKeyword BREAK
+syn keyword n1qlKeyword BUCKET
+syn keyword n1qlKeyword CALL
+syn keyword n1qlKeyword CASE
+syn keyword n1qlKeyword CAST
+syn keyword n1qlKeyword CLUSTER
+syn keyword n1qlKeyword COLLATE
+syn keyword n1qlKeyword COLLECTION
+syn keyword n1qlKeyword CONNECT
+syn keyword n1qlKeyword CONTINUE
+syn keyword n1qlKeyword CORRELATE
+syn keyword n1qlKeyword COVER
+syn keyword n1qlKeyword DATABASE
+syn keyword n1qlKeyword DATASET
+syn keyword n1qlKeyword DATASTORE
+syn keyword n1qlKeyword DECLARE
+syn keyword n1qlKeyword DECREMENT
+syn keyword n1qlKeyword DERIVED
+syn keyword n1qlKeyword DESC
+syn keyword n1qlKeyword DESCRIBE
+syn keyword n1qlKeyword DO
+syn keyword n1qlKeyword EACH
+syn keyword n1qlKeyword ELEMENT
+syn keyword n1qlKeyword ELSE
+syn keyword n1qlKeyword END
+syn keyword n1qlKeyword EVERY
+syn keyword n1qlKeyword EXCLUDE
+syn keyword n1qlKeyword EXISTS
+syn keyword n1qlKeyword FETCH
+syn keyword n1qlKeyword FIRST
+syn keyword n1qlKeyword FLATTEN
+syn keyword n1qlKeyword FOR
+syn keyword n1qlKeyword FORCE
+syn keyword n1qlKeyword FROM
+syn keyword n1qlKeyword FUNCTION
+syn keyword n1qlKeyword GROUP
+syn keyword n1qlKeyword GSI
+syn keyword n1qlKeyword HAVING
+syn keyword n1qlKeyword IF
+syn keyword n1qlKeyword IGNORE
+syn keyword n1qlKeyword INCLUDE
+syn keyword n1qlKeyword INCREMENT
+syn keyword n1qlKeyword INDEX
+syn keyword n1qlKeyword INITIAL
+syn keyword n1qlKeyword INLINE
+syn keyword n1qlKeyword INNER
+syn keyword n1qlKeyword INTO
+syn keyword n1qlKeyword KEY
+syn keyword n1qlKeyword KEYS
+syn keyword n1qlKeyword KEYSPACE
+syn keyword n1qlKeyword KNOWN
+syn keyword n1qlKeyword LAST
+syn keyword n1qlKeyword LET
+syn keyword n1qlKeyword LETTING
+syn keyword n1qlKeyword LIMIT
+syn keyword n1qlKeyword LOOP
+syn keyword n1qlKeyword LSM
+syn keyword n1qlKeyword MAP
+syn keyword n1qlKeyword MAPPING
+syn keyword n1qlKeyword MATCHED
+syn keyword n1qlKeyword MATERIALIZED
+syn keyword n1qlKeyword MERGE
+syn keyword n1qlKeyword NAMESPACE
+syn keyword n1qlKeyword NEST
+syn keyword n1qlKeyword OPTION
+syn keyword n1qlKeyword ORDER
+syn keyword n1qlKeyword OUTER
+syn keyword n1qlKeyword OVER
+syn keyword n1qlKeyword PARSE
+syn keyword n1qlKeyword PARTITION
+syn keyword n1qlKeyword PASSWORD
+syn keyword n1qlKeyword PATH
+syn keyword n1qlKeyword POOL
+syn keyword n1qlKeyword PRIMARY
+syn keyword n1qlKeyword PRIVATE
+syn keyword n1qlKeyword PRIVILEGE
+syn keyword n1qlKeyword PROCEDURE
+syn keyword n1qlKeyword PUBLIC
+syn keyword n1qlKeyword REALM
+syn keyword n1qlKeyword REDUCE
+syn keyword n1qlKeyword RETURN
+syn keyword n1qlKeyword RETURNING
+syn keyword n1qlKeyword ROLE
+syn keyword n1qlKeyword SATISFIES
+syn keyword n1qlKeyword SCHEMA
+syn keyword n1qlKeyword SELF
+syn keyword n1qlKeyword SEMI
+syn keyword n1qlKeyword SHOW
+syn keyword n1qlKeyword START
+syn keyword n1qlKeyword STATISTICS
+syn keyword n1qlKeyword SYSTEM
+syn keyword n1qlKeyword THEN
+syn keyword n1qlKeyword TRANSACTION
+syn keyword n1qlKeyword TRIGGER
+syn keyword n1qlKeyword UNDER
+syn keyword n1qlKeyword UNKNOWN
+syn keyword n1qlKeyword UNSET
+syn keyword n1qlKeyword USE
+syn keyword n1qlKeyword USER
+syn keyword n1qlKeyword USING
+syn keyword n1qlKeyword VALIDATE
+syn keyword n1qlKeyword VALUE
+syn keyword n1qlKeyword VALUED
+syn keyword n1qlKeyword VALUES
+syn keyword n1qlKeyword VIEW
+syn keyword n1qlKeyword WHEN
+syn keyword n1qlKeyword WHERE
+syn keyword n1qlKeyword WHILE
+syn keyword n1qlKeyword WITHIN
+syn keyword n1qlKeyword WORK
+
+
+"
+" *** functions ***
+"
+syn keyword n1qlOperator ABS
+syn keyword n1qlOperator ACOS
+syn keyword n1qlOperator ARRAY_AGG
+syn keyword n1qlOperator ARRAY_APPEND
+syn keyword n1qlOperator ARRAY_AVG
+syn keyword n1qlOperator ARRAY_CONCAT
+syn keyword n1qlOperator ARRAY_CONTAINS
+syn keyword n1qlOperator ARRAY_COUNT
+syn keyword n1qlOperator ARRAY_DISTINCT
+syn keyword n1qlOperator ARRAY_FLATTEN
+syn keyword n1qlOperator ARRAY_IFNULL
+syn keyword n1qlOperator ARRAY_INSERT
+syn keyword n1qlOperator ARRAY_INTERSECT
+syn keyword n1qlOperator ARRAY_LENGTH
+syn keyword n1qlOperator ARRAY_MAX
+syn keyword n1qlOperator ARRAY_MIN
+syn keyword n1qlOperator ARRAY_POSITION
+syn keyword n1qlOperator ARRAY_PREPEND
+syn keyword n1qlOperator ARRAY_PUT
+syn keyword n1qlOperator ARRAY_RANGE
+syn keyword n1qlOperator ARRAY_REMOVE
+syn keyword n1qlOperator ARRAY_REPEAT
+syn keyword n1qlOperator ARRAY_REPLACE
+syn keyword n1qlOperator ARRAY_REVERSE
+syn keyword n1qlOperator ARRAY_SORT
+syn keyword n1qlOperator ARRAY_START
+syn keyword n1qlOperator ARRAY_SUM
+syn keyword n1qlOperator ARRAY_SYMDIFF
+syn keyword n1qlOperator ARRAY_UNION
+syn keyword n1qlOperator ASIN
+syn keyword n1qlOperator ATAN
+syn keyword n1qlOperator ATAN2
+syn keyword n1qlOperator AVG
+syn keyword n1qlOperator BASE64
+syn keyword n1qlOperator BASE64_DECODE
+syn keyword n1qlOperator BASE64_ENCODE
+syn keyword n1qlOperator CEIL
+syn keyword n1qlOperator CLOCK_LOCAL
+syn keyword n1qlOperator CLOCK_STR
+syn keyword n1qlOperator CLOCK_TZ
+syn keyword n1qlOperator CLOCK_UTC
+syn keyword n1qlOperator CLOCL_MILLIS
+syn keyword n1qlOperator CONTAINS
+syn keyword n1qlOperator COS
+syn keyword n1qlOperator COUNT
+syn keyword n1qlOperator DATE_ADD_MILLIS
+syn keyword n1qlOperator DATE_ADD_STR
+syn keyword n1qlOperator DATE_DIFF_MILLIS
+syn keyword n1qlOperator DATE_DIFF_STR
+syn keyword n1qlOperator DATE_FORMAT_STR
+syn keyword n1qlOperator DATE_PART_MILLIS
+syn keyword n1qlOperator DATE_PART_STR
+syn keyword n1qlOperator DATE_RANGE_MILLIS
+syn keyword n1qlOperator DATE_RANGE_STR
+syn keyword n1qlOperator DATE_TRUC_STR
+syn keyword n1qlOperator DATE_TRUNC_MILLIS
+syn keyword n1qlOperator DECODE_JSON
+syn keyword n1qlOperator DEGREES
+syn keyword n1qlOperator DURATION_TO_STR
+syn keyword n1qlOperator E
+syn keyword n1qlOperator ENCODED_SIZE
+syn keyword n1qlOperator ENCODE_JSON
+syn keyword n1qlOperator EXP
+syn keyword n1qlOperator FLOOR
+syn keyword n1qlOperator GREATEST
+syn keyword n1qlOperator IFINF
+syn keyword n1qlOperator IFMISSING
+syn keyword n1qlOperator IFMISSINGORNULL
+syn keyword n1qlOperator IFNAN
+syn keyword n1qlOperator IFNANORINF
+syn keyword n1qlOperator IFNULL
+syn keyword n1qlOperator INITCAP
+syn keyword n1qlOperator ISARRAY
+syn keyword n1qlOperator ISATOM
+syn keyword n1qlOperator ISBOOLEAN
+syn keyword n1qlOperator ISNUMBER
+syn keyword n1qlOperator ISOBJECT
+syn keyword n1qlOperator ISSTRING
+syn keyword n1qlOperator LEAST
+syn keyword n1qlOperator LENGTH
+syn keyword n1qlOperator LN
+syn keyword n1qlOperator LOG
+syn keyword n1qlOperator LOWER
+syn keyword n1qlOperator LTRIM
+syn keyword n1qlOperator MAX
+syn keyword n1qlOperator META
+syn keyword n1qlOperator MILLIS
+syn keyword n1qlOperator MILLIS_TO_LOCAL
+syn keyword n1qlOperator MILLIS_TO_STR
+syn keyword n1qlOperator MILLIS_TO_TZ
+syn keyword n1qlOperator MILLIS_TO_UTC
+syn keyword n1qlOperator MILLIS_TO_ZONE_NAME
+syn keyword n1qlOperator MIN
+syn keyword n1qlOperator MISSINGIF
+syn keyword n1qlOperator NANIF
+syn keyword n1qlOperator NEGINFIF
+syn keyword n1qlOperator NOW_LOCAL
+syn keyword n1qlOperator NOW_MILLIS
+syn keyword n1qlOperator NOW_STR
+syn keyword n1qlOperator NOW_TZ
+syn keyword n1qlOperator NOW_UTC
+syn keyword n1qlOperator NULLIF
+syn keyword n1qlOperator OBJECT_ADD
+syn keyword n1qlOperator OBJECT_CONCAT
+syn keyword n1qlOperator OBJECT_INNER_PAIRS
+syn keyword n1qlOperator OBJECT_INNER_VALUES
+syn keyword n1qlOperator OBJECT_LENGTH
+syn keyword n1qlOperator OBJECT_NAMES
+syn keyword n1qlOperator OBJECT_PAIRS
+syn keyword n1qlOperator OBJECT_PUT
+syn keyword n1qlOperator OBJECT_REMOVE
+syn keyword n1qlOperator OBJECT_RENAME
+syn keyword n1qlOperator OBJECT_REPLACE
+syn keyword n1qlOperator OBJECT_UNWRAP
+syn keyword n1qlOperator OBJECT_VALUES
+syn keyword n1qlOperator PI
+syn keyword n1qlOperator POLY_LENGTH
+syn keyword n1qlOperator POSINIF
+syn keyword n1qlOperator POSITION
+syn keyword n1qlOperator POWER
+syn keyword n1qlOperator RADIANS
+syn keyword n1qlOperator RANDOM
+syn keyword n1qlOperator REGEXP_CONTAINS
+syn keyword n1qlOperator REGEXP_LIKE
+syn keyword n1qlOperator REGEXP_POSITION
+syn keyword n1qlOperator REGEXP_REPLACE
+syn keyword n1qlOperator REPEAT
+syn keyword n1qlOperator REPLACE
+syn keyword n1qlOperator REVERSE
+syn keyword n1qlOperator ROUND
+syn keyword n1qlOperator RTRIM
+syn keyword n1qlOperator SIGN
+syn keyword n1qlOperator SIN
+syn keyword n1qlOperator SPLIT
+syn keyword n1qlOperator SQRT
+syn keyword n1qlOperator STR_TO_DURATION
+syn keyword n1qlOperator STR_TO_MILLIS
+syn keyword n1qlOperator STR_TO_TZ
+syn keyword n1qlOperator STR_TO_UTC
+syn keyword n1qlOperator STR_TO_ZONE_NAME
+syn keyword n1qlOperator SUBSTR
+syn keyword n1qlOperator SUFFIXES
+syn keyword n1qlOperator SUM
+syn keyword n1qlOperator TAN
+syn keyword n1qlOperator TITLE
+syn keyword n1qlOperator TOARRAY
+syn keyword n1qlOperator TOATOM
+syn keyword n1qlOperator TOBOOLEAN
+syn keyword n1qlOperator TOKENS
+syn keyword n1qlOperator TONUMBER
+syn keyword n1qlOperator TOOBJECT
+syn keyword n1qlOperator TOSTRING
+syn keyword n1qlOperator TRIM
+syn keyword n1qlOperator TRUNC
+syn keyword n1qlOperator TYPE
+syn keyword n1qlOperator UPPER
+syn keyword n1qlOperator UUID
+syn keyword n1qlOperator WEEKDAY_MILLIS
+syn keyword n1qlOperator WEEKDAY_STR
+
+
+"
+" *** operators ***
+"
+syn keyword n1qlOperator AND
+syn keyword n1qlOperator AS
+syn keyword n1qlOperator BY
+syn keyword n1qlOperator DISTINCT
+syn keyword n1qlOperator EXCEPT
+syn keyword n1qlOperator ILIKE
+syn keyword n1qlOperator IN
+syn keyword n1qlOperator INTERSECT
+syn keyword n1qlOperator IS
+syn keyword n1qlOperator JOIN
+syn keyword n1qlOperator LEFT
+syn keyword n1qlOperator LIKE
+syn keyword n1qlOperator MINUS
+syn keyword n1qlOperator NEST
+syn keyword n1qlOperator NESTING
+syn keyword n1qlOperator NOT
+syn keyword n1qlOperator OFFSET
+syn keyword n1qlOperator ON
+syn keyword n1qlOperator OR
+syn keyword n1qlOperator OUT
+syn keyword n1qlOperator RIGHT
+syn keyword n1qlOperator SOME
+syn keyword n1qlOperator TO
+syn keyword n1qlOperator UNION
+syn keyword n1qlOperator UNIQUE
+syn keyword n1qlOperator UNNEST
+syn keyword n1qlOperator VIA
+syn keyword n1qlOperator WITH
+syn keyword n1qlOperator XOR
+
+
+"
+" *** statements ***
+"
+syn keyword n1qlStatement ALTER
+syn keyword n1qlStatement ANALYZE
+syn keyword n1qlStatement BUILD
+syn keyword n1qlStatement COMMIT
+syn keyword n1qlStatement CREATE
+syn keyword n1qlStatement DELETE
+syn keyword n1qlStatement DROP
+syn keyword n1qlStatement EXECUTE
+syn keyword n1qlStatement EXPLAIN
+syn keyword n1qlStatement GRANT
+syn keyword n1qlStatement INFER
+syn keyword n1qlStatement INSERT
+syn keyword n1qlStatement MERGE
+syn keyword n1qlStatement PREPARE
+syn keyword n1qlStatement RENAME
+syn keyword n1qlStatement REVOKE
+syn keyword n1qlStatement ROLLBACK
+syn keyword n1qlStatement SELECT
+syn keyword n1qlStatement SET
+syn keyword n1qlStatement TRUNCATE
+syn keyword n1qlStatement UPDATE
+syn keyword n1qlStatement UPSERT
+
+
+"
+" *** types ***
+"
+syn keyword n1qlType ARRAY
+syn keyword n1qlType BINARY
+syn keyword n1qlType BOOLEAN
+syn keyword n1qlType NUMBER
+syn keyword n1qlType OBJECT
+syn keyword n1qlType RAW
+syn keyword n1qlType STRING
+
+
+"
+" *** strings and characters ***
+"
+syn region n1qlString start=+"+  skip=+\\\\\|\\"+  end=+"+
+syn region n1qlString start=+'+  skip=+\\\\\|\\'+  end=+'+
+syn region n1qlBucketSpec start=+`+  skip=+\\\\\|\\'+  end=+`+
+
+
+"
+" *** numbers ***
+"
+syn match n1qlNumber        "-\=\<\d*\.\=[0-9_]\>"
+
+
+"
+" *** comments ***
+"
+syn region n1qlComment start="/\*"  end="\*/" contains=n1qlTODO
+syn match n1qlComment  "--.*$" contains=n1qlTODO
+syn sync ccomment      n1qlComment
+
+
+"
+" *** TODO ***
+"
+syn keyword n1qlTODO contained TODO FIXME XXX DEBUG NOTE
+
+
+"
+" *** enable ***
+"
+hi def link n1qlBucketSpec Underlined
+hi def link n1qlComment    Comment
+hi def link n1qlKeyword    Macro
+hi def link n1qlOperator   Function
+hi def link n1qlSpecial    Special
+hi def link n1qlStatement  Statement
+hi def link n1qlString     String
+hi def link n1qlTODO       Todo
+hi def link n1qlType       Type
+
+let b:current_syntax = "n1ql"
+
+endif
diff --git a/syntax/named.vim b/syntax/named.vim
new file mode 100644
index 000000000..508f7ec7d
--- /dev/null
+++ b/syntax/named.vim
@@ -0,0 +1,233 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'named') == -1
+
+" Vim syntax file
+" Language:	BIND configuration file
+" Maintainer:	Nick Hibma <nick@van-laarhoven.org>
+" Last Change:	2019 Oct 08
+" Filenames:	named.conf, rndc.conf
+" Location:	http://www.van-laarhoven.org/vim/syntax/named.vim
+"
+" Previously maintained by glory hump <rnd@web-drive.ru> and updated by Marcin
+" Dalecki.
+"
+" This file could do with a lot of improvements, so comments are welcome.
+" Please submit the named.conf (segment) with any comments.
+"
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+setlocal iskeyword=.,-,48-58,A-Z,a-z,_
+
+syn sync match namedSync grouphere NONE "^(zone|controls|acl|key)"
+
+let s:save_cpo = &cpo
+set cpo-=C
+
+" BIND configuration file
+
+syn match	namedComment	"//.*"
+syn match	namedComment	"#.*"
+syn region	namedComment	start="/\*" end="\*/"
+syn region	namedString	start=/"/ end=/"/ contained
+" --- omitted trailing semicolon
+syn match	namedError	/[^;{#]$/
+
+" --- top-level keywords
+
+syn keyword	namedInclude	include nextgroup=namedString skipwhite
+syn keyword	namedKeyword	acl key nextgroup=namedIntIdent skipwhite
+syn keyword	namedKeyword	server nextgroup=namedIdentifier skipwhite
+syn keyword	namedKeyword	controls nextgroup=namedSection skipwhite
+syn keyword	namedKeyword	trusted-keys nextgroup=namedIntSection skipwhite
+syn keyword	namedKeyword	logging nextgroup=namedLogSection skipwhite
+syn keyword	namedKeyword	options nextgroup=namedOptSection skipwhite
+syn keyword	namedKeyword	zone nextgroup=namedZoneString skipwhite
+
+" --- Identifier: name of following { ... } Section
+syn match	namedIdentifier	contained /\k\+/ nextgroup=namedSection skipwhite
+" --- IntIdent: name of following IntSection
+syn match	namedIntIdent	contained /"\=\k\+"\=/ nextgroup=namedIntSection skipwhite
+
+" --- Section: { ... } clause
+syn region	namedSection	contained start=+{+ end=+};+ contains=namedSection,namedIntKeyword
+
+" --- IntSection: section that does not contain other sections
+syn region	namedIntSection	contained start=+{+ end=+}+ contains=namedIntKeyword,namedError,namedComment
+
+" --- IntKeyword: keywords contained within `{ ... }' sections only
+" + these keywords are contained within `key' and `acl' sections
+syn keyword	namedIntKeyword	contained key algorithm
+syn keyword	namedIntKeyword	contained secret nextgroup=namedString skipwhite
+
+" + these keywords are contained within `server' section only
+syn keyword	namedIntKeyword	contained bogus support-ixfr nextgroup=namedBool,namedNotBool skipwhite
+syn keyword	namedIntKeyword	contained transfers nextgroup=namedNumber,namedNotNumber skipwhite
+syn keyword	namedIntKeyword	contained transfer-format
+syn keyword	namedIntKeyword	contained keys nextgroup=namedIntSection skipwhite
+
+" + these keywords are contained within `controls' section only
+syn keyword	namedIntKeyword	contained inet nextgroup=namedIPaddr,namedIPerror skipwhite
+syn keyword	namedIntKeyword	contained unix nextgroup=namedString skipwhite
+syn keyword	namedIntKeyword	contained port perm owner group nextgroup=namedNumber,namedNotNumber skipwhite
+syn keyword	namedIntKeyword	contained allow nextgroup=namedIntSection skipwhite
+
+" + these keywords are contained within `update-policy' section only
+syn keyword	namedIntKeyword	contained grant nextgroup=namedString skipwhite
+syn keyword	namedIntKeyword	contained name self subdomain wildcard nextgroup=namedString skipwhite
+syn keyword	namedIntKeyword	TXT A PTR NS SOA A6 CNAME MX ANY skipwhite
+
+" --- options
+syn region	namedOptSection	contained start=+{+ end=+};+ contains=namedOption,namedCNOption,namedComment,namedParenError
+
+syn keyword	namedOption	contained version directory
+\		nextgroup=namedString skipwhite
+syn keyword	namedOption	contained named-xfer dump-file pid-file
+\		nextgroup=namedString skipwhite
+syn keyword	namedOption	contained mem-statistics-file statistics-file
+\		nextgroup=namedString skipwhite
+syn keyword	namedOption	contained auth-nxdomain deallocate-on-exit
+\		nextgroup=namedBool,namedNotBool skipwhite
+syn keyword	namedOption	contained dialup fake-iquery fetch-glue
+\		nextgroup=namedBool,namedNotBool skipwhite
+syn keyword	namedOption	contained has-old-clients host-statistics
+\		nextgroup=namedBool,namedNotBool skipwhite
+syn keyword	namedOption	contained maintain-ixfr-base multiple-cnames
+\		nextgroup=namedBool,namedNotBool skipwhite
+syn keyword	namedOption	contained notify recursion rfc2308-type1
+\		nextgroup=namedBool,namedNotBool skipwhite
+syn keyword	namedOption	contained use-id-pool treat-cr-as-space
+\		nextgroup=namedBool,namedNotBool skipwhite
+syn keyword	namedOption	contained also-notify forwarders
+\		nextgroup=namedIPlist skipwhite
+syn keyword	namedOption	contained forward check-names
+syn keyword	namedOption	contained allow-query allow-transfer allow-recursion
+\		nextgroup=namedAML skipwhite
+syn keyword	namedOption	contained blackhole listen-on
+\		nextgroup=namedIntSection skipwhite
+syn keyword	namedOption	contained lame-ttl max-transfer-time-in
+\		nextgroup=namedNumber,namedNotNumber skipwhite
+syn keyword	namedOption	contained max-ncache-ttl min-roots
+\		nextgroup=namedNumber,namedNotNumber skipwhite
+syn keyword	namedOption	contained serial-queries transfers-in
+\		nextgroup=namedNumber,namedNotNumber skipwhite
+syn keyword	namedOption	contained transfers-out transfers-per-ns
+syn keyword	namedOption	contained transfer-format
+syn keyword	namedOption	contained transfer-source
+\		nextgroup=namedIPaddr,namedIPerror skipwhite
+syn keyword	namedOption	contained max-ixfr-log-size
+\		nextgroup=namedNumber,namedNotNumber skipwhite
+syn keyword	namedOption	contained coresize datasize files stacksize
+syn keyword	namedOption	contained cleaning-interval interface-interval statistics-interval heartbeat-interval
+\		nextgroup=namedNumber,namedNotNumber skipwhite
+syn keyword	namedOption	contained topology sortlist rrset-order
+\		nextgroup=namedIntSection skipwhite
+
+syn match	namedOption	contained /\<query-source\s\+.*;/he=s+12 contains=namedQSKeywords
+syn keyword	namedQSKeywords	contained address port
+syn match	namedCNOption	contained /\<check-names\s\+.*;/he=s+11 contains=namedCNKeywords
+syn keyword	namedCNKeywords	contained fail warn ignore master slave response
+
+" --- logging facilities
+syn region	namedLogSection	contained start=+{+ end=+};+ contains=namedLogOption
+syn keyword	namedLogOption	contained channel nextgroup=namedIntIdent skipwhite
+syn keyword	namedLogOption	contained category nextgroup=namedIntIdent skipwhite
+syn keyword	namedIntKeyword	contained syslog null versions size severity
+syn keyword	namedIntKeyword	contained file nextgroup=namedString skipwhite
+syn keyword	namedIntKeyword	contained print-category print-severity print-time nextgroup=namedBool,namedNotBool skipwhite
+
+" --- zone section
+syn region	namedZoneString	contained oneline start=+"+ end=+"+ skipwhite
+\		contains=namedDomain,namedIllegalDom
+\		nextgroup=namedZoneClass,namedZoneSection
+syn keyword	namedZoneClass	contained in hs hesiod chaos
+\		IN HS HESIOD CHAOS
+\		nextgroup=namedZoneSection skipwhite
+
+syn region	namedZoneSection	contained start=+{+ end=+};+ contains=namedZoneOpt,namedCNOption,namedComment,namedMasters,namedParenError
+syn keyword	namedZoneOpt	contained file ixfr-base
+\		nextgroup=namedString skipwhite
+syn keyword	namedZoneOpt	contained notify dialup
+\		nextgroup=namedBool,namedNotBool skipwhite
+syn keyword	namedZoneOpt	contained pubkey forward
+syn keyword	namedZoneOpt	contained max-transfer-time-in
+\		nextgroup=namedNumber,namedNotNumber skipwhite
+syn keyword	namedZoneOpt	contained type nextgroup=namedZoneType skipwhite
+syn keyword	namedZoneType	contained master slave stub forward hint
+
+syn keyword	namedZoneOpt	contained masters forwarders
+\		nextgroup=namedIPlist skipwhite
+syn region	namedIPlist	contained start=+{+ end=+};+ contains=namedIPaddr,namedIPerror,namedParenError,namedComment
+syn keyword	namedZoneOpt	contained allow-update allow-query allow-transfer
+\		nextgroup=namedAML skipwhite
+syn keyword	namedZoneOpt	contained update-policy
+\		nextgroup=namedIntSection skipwhite
+
+" --- boolean parameter
+syn match	namedNotBool	contained "[^ 	;]\+"
+syn keyword	namedBool	contained yes no true false 1 0
+
+" --- number parameter
+syn match	namedNotNumber	contained "[^ 	0-9;]\+"
+syn match	namedNumber	contained "\d\+"
+
+" --- address match list
+syn region	namedAML	contained start=+{+ end=+};+ contains=namedParenError,namedComment,namedString
+
+" --- IPs & Domains
+syn match	namedIPaddr	contained /\<[0-9]\{1,3}\(\.[0-9]\{1,3}\)\{3};/he=e-1
+syn match	namedDomain	contained /\<[0-9A-Za-z][-0-9A-Za-z.]\+\>/ nextgroup=namedSpareDot
+syn match	namedDomain	contained /"\."/ms=s+1,me=e-1
+syn match	namedSpareDot	contained /\./
+
+" --- syntax errors
+syn match	namedIllegalDom	contained /"\S*[^-A-Za-z0-9.[:space:]]\S*"/ms=s+1,me=e-1
+syn match	namedIPerror	contained /\<\S*[^0-9.[:space:];]\S*/
+syn match	namedEParenError	contained +{+
+syn match	namedParenError	+}\([^;]\|$\)+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link namedComment	Comment
+hi def link namedInclude	Include
+hi def link namedKeyword	Keyword
+hi def link namedIntKeyword	Keyword
+hi def link namedIdentifier	Identifier
+hi def link namedIntIdent	Identifier
+
+hi def link namedString	String
+hi def link namedBool	Type
+hi def link namedNotBool	Error
+hi def link namedNumber	Number
+hi def link namedNotNumber	Error
+
+hi def link namedOption	namedKeyword
+hi def link namedLogOption	namedKeyword
+hi def link namedCNOption	namedKeyword
+hi def link namedQSKeywords	Type
+hi def link namedCNKeywords	Type
+hi def link namedLogCategory	Type
+hi def link namedIPaddr	Number
+hi def link namedDomain	Identifier
+hi def link namedZoneOpt	namedKeyword
+hi def link namedZoneType	Type
+hi def link namedParenError	Error
+hi def link namedEParenError	Error
+hi def link namedIllegalDom	Error
+hi def link namedIPerror	Error
+hi def link namedSpareDot	Error
+hi def link namedError	Error
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+let b:current_syntax = "named"
+
+" vim: ts=17
+
+endif
diff --git a/syntax/nanorc.vim b/syntax/nanorc.vim
new file mode 100644
index 000000000..079e4bfeb
--- /dev/null
+++ b/syntax/nanorc.vim
@@ -0,0 +1,247 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nanorc') == -1
+
+" Vim syntax file
+" Language:             nanorc(5) - GNU nano configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword nanorcTodo          contained TODO FIXME XXX NOTE
+
+syn region  nanorcComment       display oneline start='^\s*#' end='$'
+                                \ contains=nanorcTodo,@Spell
+
+syn match   nanorcBegin         display '^'
+                                \ nextgroup=nanorcKeyword,nanorcComment
+                                \ skipwhite
+
+syn keyword nanorcKeyword       contained set unset
+                                \ nextgroup=nanorcBoolOption,
+                                \ nanorcStringOption,nanorcNumberOption
+                                \ skipwhite
+
+syn keyword nanorcKeyword       contained syntax
+                                \ nextgroup=nanorcSynGroupName skipwhite
+
+syn keyword nanorcKeyword       contained color
+                                \ nextgroup=@nanorcFGColor skipwhite
+
+syn keyword nanorcBoolOption    contained autoindent backup const cut
+                                \ historylog morespace mouse multibuffer
+                                \ noconvert nofollow nohelp nowrap preserve
+                                \ rebinddelete regexp smarthome smooth suspend
+                                \ tempfile view
+
+syn keyword nanorcStringOption  contained backupdir brackets operatingdir
+                                \ punct quotestr speller whitespace
+                                \ nextgroup=nanorcString skipwhite
+
+syn keyword nanorcNumberOption  contained fill tabsize
+                                \ nextgroup=nanorcNumber skipwhite
+
+syn region  nanorcSynGroupName  contained display oneline start=+"+
+                                \ end=+"\ze\%([[:blank:]]\|$\)+
+                                \ nextgroup=nanorcRegexes skipwhite
+
+syn match   nanorcString        contained display '".*"'
+
+syn region  nanorcRegexes       contained display oneline start=+"+
+                                \ end=+"\ze\%([[:blank:]]\|$\)+
+                                \ nextgroup=nanorcRegexes skipwhite
+
+syn match   nanorcNumber        contained display '[+-]\=\<\d\+\>'
+
+syn cluster nanorcFGColor       contains=nanorcFGWhite,nanorcFGBlack,
+                                \ nanorcFGRed,nanorcFGBlue,nanorcFGGreen,
+                                \ nanorcFGYellow,nanorcFGMagenta,nanorcFGCyan,
+                                \ nanorcFGBWhite,nanorcFGBBlack,nanorcFGBRed,
+                                \ nanorcFGBBlue,nanorcFGBGreen,nanorcFGBYellow,
+                                \ nanorcFGBMagenta,nanorcFGBCyan
+
+syn keyword nanorcFGWhite       contained white
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGBlack       contained black
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGRed         contained red
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGBlue        contained blue
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGGreen       contained green
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGYellow      contained yellow
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGMagenta     contained magenta
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGCyan        contained cyan
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGBWhite      contained brightwhite
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGBBlack      contained brightblack
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGBRed        contained brightred
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGBBlue       contained brightblue
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGBGreen      contained brightgreen
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGBYellow     contained brightyellow
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGBMagenta    contained brightmagenta
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn keyword nanorcFGBCyan       contained brightcyan
+                                \ nextgroup=@nanorcFGSpec skipwhite
+
+syn cluster nanorcBGColor       contains=nanorcBGWhite,nanorcBGBlack,
+                                \ nanorcBGRed,nanorcBGBlue,nanorcBGGreen,
+                                \ nanorcBGYellow,nanorcBGMagenta,nanorcBGCyan,
+                                \ nanorcBGBWhite,nanorcBGBBlack,nanorcBGBRed,
+                                \ nanorcBGBBlue,nanorcBGBGreen,nanorcBGBYellow,
+                                \ nanorcBGBMagenta,nanorcBGBCyan
+
+syn keyword nanorcBGWhite       contained white
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGBlack       contained black
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGRed         contained red
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGBlue        contained blue
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGGreen       contained green
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGYellow      contained yellow
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGMagenta     contained magenta
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGCyan        contained cyan
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGBWhite      contained brightwhite
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGBBlack      contained brightblack
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGBRed        contained brightred
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGBBlue       contained brightblue
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGBGreen      contained brightgreen
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGBYellow     contained brightyellow
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGBMagenta    contained brightmagenta
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn keyword nanorcBGBCyan       contained brightcyan
+                                \ nextgroup=@nanorcBGSpec skipwhite
+
+syn match   nanorcBGColorSep    contained ',' nextgroup=@nanorcBGColor
+
+syn cluster nanorcFGSpec        contains=nanorcBGColorSep,nanorcRegexes,
+                                \ nanorcStartRegion
+
+syn cluster nanorcBGSpec        contains=nanorcRegexes,nanorcStartRegion
+
+syn keyword nanorcStartRegion   contained start nextgroup=nanorcStartRegionEq
+
+syn match   nanorcStartRegionEq contained '=' nextgroup=nanorcRegion
+
+syn region  nanorcRegion        contained display oneline start=+"+
+                                \ end=+"\ze\%([[:blank:]]\|$\)+
+                                \ nextgroup=nanorcEndRegion skipwhite
+
+syn keyword nanorcEndRegion     contained end nextgroup=nanorcStartRegionEq
+
+syn match   nanorcEndRegionEq   contained '=' nextgroup=nanorcRegex
+
+syn region  nanorcRegex         contained display oneline start=+"+
+                                \ end=+"\ze\%([[:blank:]]\|$\)+
+
+hi def link nanorcTodo          Todo
+hi def link nanorcComment       Comment
+hi def link nanorcKeyword       Keyword
+hi def link nanorcBoolOption    Identifier
+hi def link nanorcStringOption  Identifier
+hi def link nanorcNumberOption  Identifier
+hi def link nanorcSynGroupName  String
+hi def link nanorcString        String
+hi def link nanorcRegexes       nanorcString
+hi def link nanorcNumber        Number
+hi def      nanorcFGWhite       ctermfg=Gray guifg=Gray
+hi def      nanorcFGBlack       ctermfg=Black guifg=Black
+hi def      nanorcFGRed         ctermfg=DarkRed guifg=DarkRed
+hi def      nanorcFGBlue        ctermfg=DarkBlue guifg=DarkBlue
+hi def      nanorcFGGreen       ctermfg=DarkGreen guifg=DarkGreen
+hi def      nanorcFGYellow      ctermfg=Brown guifg=Brown
+hi def      nanorcFGMagenta     ctermfg=DarkMagenta guifg=DarkMagenta
+hi def      nanorcFGCyan        ctermfg=DarkCyan guifg=DarkCyan
+hi def      nanorcFGBWhite      ctermfg=White guifg=White
+hi def      nanorcFGBBlack      ctermfg=DarkGray guifg=DarkGray
+hi def      nanorcFGBRed        ctermfg=Red guifg=Red
+hi def      nanorcFGBBlue       ctermfg=Blue guifg=Blue
+hi def      nanorcFGBGreen      ctermfg=Green guifg=Green
+hi def      nanorcFGBYellow     ctermfg=Yellow guifg=Yellow
+hi def      nanorcFGBMagenta    ctermfg=Magenta guifg=Magenta
+hi def      nanorcFGBCyan       ctermfg=Cyan guifg=Cyan
+hi def link nanorcBGColorSep    Normal
+hi def      nanorcBGWhite       ctermbg=Gray guibg=Gray
+hi def      nanorcBGBlack       ctermbg=Black guibg=Black
+hi def      nanorcBGRed         ctermbg=DarkRed guibg=DarkRed
+hi def      nanorcBGBlue        ctermbg=DarkBlue guibg=DarkBlue
+hi def      nanorcBGGreen       ctermbg=DarkGreen guibg=DarkGreen
+hi def      nanorcBGYellow      ctermbg=Brown guibg=Brown
+hi def      nanorcBGMagenta     ctermbg=DarkMagenta guibg=DarkMagenta
+hi def      nanorcBGCyan        ctermbg=DarkCyan guibg=DarkCyan
+hi def      nanorcBGBWhite      ctermbg=White guibg=White
+hi def      nanorcBGBBlack      ctermbg=DarkGray guibg=DarkGray
+hi def      nanorcBGBRed        ctermbg=Red guibg=Red
+hi def      nanorcBGBBlue       ctermbg=Blue guibg=Blue
+hi def      nanorcBGBGreen      ctermbg=Green guibg=Green
+hi def      nanorcBGBYellow     ctermbg=Yellow guibg=Yellow
+hi def      nanorcBGBMagenta    ctermbg=Magenta guibg=Magenta
+hi def      nanorcBGBCyan       ctermbg=Cyan guibg=Cyan
+hi def link nanorcStartRegion   Type
+hi def link nanorcStartRegionEq Operator
+hi def link nanorcRegion        nanorcString
+hi def link nanorcEndRegion     Type
+hi def link nanorcEndRegionEq   Operator
+hi def link nanorcRegex         nanoRegexes
+
+let b:current_syntax = "nanorc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/natural.vim b/syntax/natural.vim
new file mode 100644
index 000000000..54f5e670c
--- /dev/null
+++ b/syntax/natural.vim
@@ -0,0 +1,205 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'natural') == -1
+
+" Vim syntax file
+"
+" Language:	NATURAL
+" Version:	2.1.0.5
+" Maintainer:	Marko von Oppen <marko@von-oppen.com>
+" Last Changed:	2012-02-05 18:50:43
+" Support:	http://www.von-oppen.com/
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+setlocal iskeyword+=-,*,#,+,_,/
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" NATURAL is case insensitive
+syntax case ignore
+
+" preprocessor
+syn keyword naturalInclude	include nextgroup=naturalObjName skipwhite
+
+" define data
+syn keyword naturalKeyword	define data end-define
+syn keyword naturalKeyword	independent global parameter local redefine view
+syn keyword naturalKeyword	const[ant] init initial
+
+" loops
+syn keyword naturalLoop		read end-read end-work find end-find histogram end-histogram
+syn keyword naturalLoop		end-all sort end-sort sorted descending ascending
+syn keyword naturalRepeat	repeat end-repeat while until for step end-for
+syn keyword naturalKeyword	in file with field starting from ending at thru by isn where
+syn keyword naturalError	on error end-error
+syn keyword naturalKeyword	accept reject end-enddata number unique retain as release
+syn keyword naturalKeyword	start end-start break end-break physical page top sequence
+syn keyword naturalKeyword	end-toppage end-endpage end-endfile before processing
+syn keyword naturalKeyword	end-before
+
+" conditionals
+syn keyword naturalConditional	if then else end-if end-norec
+syn keyword naturalConditional	decide end-decide value when condition none any
+
+" assignment / calculation
+syn keyword naturalKeyword	reset assign move left right justified compress to into edited
+syn keyword naturalKeyword	add subtract multiply divide compute name
+syn keyword naturalKeyword	all giving remainder rounded leaving space numeric
+syn keyword naturalKeyword	examine full replace giving separate delimiter modified
+syn keyword naturalKeyword	suspend identical suppress
+
+" program flow
+syn keyword naturalFlow		callnat fetch return enter escape bottom top stack formatted
+syn keyword naturalFlow		command call
+syn keyword naturalflow		end-subroutine routine
+
+" file operations
+syn keyword naturalKeyword	update store get delete end transaction work once close
+
+" other keywords
+syn keyword naturalKeyword	first every of no record[s] found ignore immediate
+syn keyword naturalKeyword	set settime key control stop terminate
+
+" in-/output
+syn keyword naturalKeyword	write display input reinput notitle nohdr map newpage
+syn keyword naturalKeyword	alarm text help eject index window base size
+syn keyword naturalKeyword	format printer skip lines
+
+" functions
+syn keyword naturalKeyword	abs atn cos exp frac int log sgn sin sqrt tan val old
+syn keyword naturalKeyword	pos
+
+" report mode keywords
+syn keyword naturalRMKeyword	same loop obtain indexed do doend
+
+" Subroutine name
+syn keyword naturalFlow		perform subroutine nextgroup=naturalFunction skipwhite
+syn match   naturalFunction	"\<[a-z][-_a-z0-9]*\>"
+
+syn keyword naturalFlow		using nextgroup=naturalKeyword,naturalObjName skipwhite
+syn match   naturalObjName	"\<[a-z][-_a-z0-9]\{,7}\>"
+
+" Labels
+syn match   naturalLabel	"\<[+#a-z][-_#a-z0-9]*\."
+syn match   naturalRef		"\<[+#a-z][-_#a-z0-9]*\>\.\<[+#a-z][*]\=[-_#a-z0-9]*\>"
+
+" mark keyword special handling
+syn keyword naturalKeyword	mark nextgroup=naturalMark skipwhite
+syn match   naturalMark		"\<\*[a-z][-_#.a-z0-9]*\>"
+
+" System variables
+syn match   naturalSysVar	"\<\*[a-z][-a-z0-9]*\>"
+
+"integer number, or floating point number without a dot.
+syn match   naturalNumber	"\<-\=\d\+\>"
+"floating point number, with dot
+syn match   naturalNumber	"\<-\=\d\+\.\d\+\>"
+"floating point number, starting with a dot
+syn match   naturalNumber	"\.\d\+"
+
+" Formats in write statement
+syn match   naturalFormat	"\<\d\+[TX]\>"
+
+" String and Character contstants
+syn match   naturalString	"H'\x\+'"
+syn region  naturalString	start=+"+ end=+"+
+syn region  naturalString	start=+'+ end=+'+
+
+" Type definition
+syn match   naturalAttribute	"\<[-a-z][a-z]=[-a-z0-9_\.,]\+\>"
+syn match   naturalType		contained "\<[ABINP]\d\+\(,\d\+\)\=\>"
+syn match   naturalType		contained "\<[CL]\>"
+
+" "TODO" / other comments
+syn keyword naturalTodo		contained todo test
+syn match   naturalCommentMark	contained "[a-z][^ \t/:|]*\(\s[^ \t/:'"|]\+\)*:\s"he=e-1
+
+" comments
+syn region  naturalComment	start="/\*" end="$" contains=naturalTodo,naturalLineRef,naturalCommentMark
+syn region  naturalComment	start="^\*[ *]" end="$" contains=naturalTodo,naturalLineRef,naturalCommentMark
+syn region  naturalComment	start="^\d\{4} \*[\ \*]"lc=5 end="$" contains=naturalTodo,naturalLineRef,naturalCommentMark
+syn match   naturalComment	"^\*$"
+syn match   naturalComment	"^\d\{4} \*$"lc=5
+" /* is legal syntax in parentheses e.g. "#ident(label./*)"
+syn region  naturalPComment	contained start="/\*\s*[^),]"  end="$" contains=naturalTodo,naturalLineRef,naturalCommentMark
+
+" operators
+syn keyword naturalOperator	and or not eq ne gt lt ge le mask scan modified
+
+" constants
+syn keyword naturalBoolean	true false
+syn match   naturalLineNo	"^\d\{4}"
+
+" identifiers
+syn match   naturalIdent	"\<[+#a-z][-_#a-z0-9]*\>[^\.']"me=e-1
+syn match   naturalIdent	"\<[+#a-z][-_#a-z0-9]*$"
+syn match   naturalLegalIdent	"[+#a-z][-_#a-z0-9]*/[-_#a-z0-9]*"
+
+" parentheses
+syn region  naturalPar		matchgroup=naturalParGui start="(" end=")" contains=naturalLabel,naturalRef,naturalOperator,@naturalConstant,naturalType,naturalSysVar,naturalPar,naturalLineNo,naturalPComment
+syn match   naturalLineRef	"(\d\{4})"
+
+" build syntax groups
+syntax cluster naturalConstant	contains=naturalString,naturalNumber,naturalAttribute,naturalBoolean
+
+" folding
+if v:version >= 600
+  set foldignore=*
+endif
+
+
+" The default methods for highlighting.  Can be overridden later
+
+" Constants
+hi def link naturalFormat		Constant
+hi def link naturalAttribute	Constant
+hi def link naturalNumber		Number
+hi def link naturalString		String
+hi def link naturalBoolean		Boolean
+
+" All kinds of keywords
+hi def link naturalConditional	Conditional
+hi def link naturalRepeat		Repeat
+hi def link naturalLoop		Repeat
+hi def link naturalFlow		Keyword
+hi def link naturalError		Keyword
+hi def link naturalKeyword		Keyword
+hi def link naturalOperator	Operator
+hi def link naturalParGui		Operator
+
+" Labels
+hi def link naturalLabel		Label
+hi def link naturalRefLabel	Label
+
+" Comments
+hi def link naturalPComment	Comment
+hi def link naturalComment		Comment
+hi def link naturalTodo		Todo
+hi def link naturalCommentMark	PreProc
+
+hi def link naturalInclude		Include
+hi def link naturalSysVar		Identifier
+hi def link naturalLineNo		LineNr
+hi def link naturalLineRef		Error
+hi def link naturalSpecial		Special
+hi def link naturalComKey		Todo
+
+" illegal things
+hi def link naturalRMKeyword	Error
+hi def link naturalLegalIdent	Error
+
+hi def link naturalType		Type
+hi def link naturalFunction	Function
+hi def link naturalObjName		PreProc
+
+
+let b:current_syntax = "natural"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:set ts=8 sw=8 noet ft=vim list:
+
+endif
diff --git a/syntax/ncf.vim b/syntax/ncf.vim
new file mode 100644
index 000000000..6e60e0d64
--- /dev/null
+++ b/syntax/ncf.vim
@@ -0,0 +1,251 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ncf') == -1
+
+" Vim syntax file
+" Language:     Novell "NCF" Batch File
+" Maintainer:   Jonathan J. Miner <miner@doit.wisc.edu>
+" Last Change:	Tue, 04 Sep 2001 16:20:33 CDT
+" $Id: ncf.vim,v 1.1 2004/06/13 16:31:58 vimboss Exp $
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+syn case ignore
+
+syn keyword ncfCommands		mount load unload
+syn keyword ncfBoolean		on off
+syn keyword ncfCommands		set nextgroup=ncfSetCommands
+syn keyword ncfTimeTypes	Reference Primary Secondary Single
+syn match ncfLoad       "\(unl\|l\)oad .*"lc=4 contains=ALLBUT,Error
+syn match ncfMount      "mount .*"lc=5 contains=ALLBUT,Error
+
+syn match ncfComment    "^\ *rem.*$"
+syn match ncfComment    "^\ *;.*$"
+syn match ncfComment    "^\ *#.*$"
+
+syn match ncfSearchPath "search \(add\|del\) " nextgroup=ncfPath
+syn match ncfPath       "\<[^: ]\+:\([A-Za-z0-9._]\|\\\)*\>"
+syn match ncfServerName "^file server name .*$"
+syn match ncfIPXNet     "^ipx internal net"
+
+" String
+syn region ncfString    start=+"+  end=+"+
+syn match ncfContString "= \(\(\.\{0,1}\(OU=\|O=\)\{0,1}[A-Z_]\+\)\+;\{0,1}\)\+"lc=2
+
+syn match ncfHexNumber  "\<\d\(\d\+\|[A-F]\+\)*\>"
+syn match ncfNumber     "\<\d\+\.\{0,1}\d*\>"
+syn match ncfIPAddr     "\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}"
+syn match ncfTime       "\(+|=\)\{0,1}\d\{1,2}:\d\{1,2}:\d\{1,2}"
+syn match ncfDSTTime    "([^ ]\+ [^ ]\+ \(FIRST\|LAST\)\s*\d\{1,2}:\d\{1,2}:\d\{1,2} \(AM\|PM\))"
+syn match ncfTimeZone   "[A-Z]\{3}\d[A-Z]\{3}"
+
+syn match ncfLogins     "^\([Dd]is\|[Ee]n\)able login[s]*"
+syn match ncfScript     "[^ ]*\.ncf"
+
+"  SET Commands that take a Number following
+syn match ncfSetCommandsNum "\(Alert Message Nodes\)\s*="
+syn match ncfSetCommandsNum "\(Auto Restart After Abend\)\s*="
+syn match ncfSetCommandsNum "\(Auto Restart After Abend Delay Time\)\s*="
+syn match ncfSetCommandsNum "\(Compression Daily Check Starting Hour\)\s*="
+syn match ncfSetCommandsNum "\(Compression Daily Check Stop Hour\)\s*="
+syn match ncfSetCommandsNum "\(Concurrent Remirror Requests\)\s*="
+syn match ncfSetCommandsNum "\(Convert Compressed to Uncompressed Option\)\s*="
+syn match ncfSetCommandsNum "\(Days Untouched Before Compression\)\s*="
+syn match ncfSetCommandsNum "\(Decompress Free Space Warning Interval\)\s*="
+syn match ncfSetCommandsNum "\(Decompress Percent Disk Space Free to Allow Commit\)\s*="
+syn match ncfSetCommandsNum "\(Deleted Files Compression Option\)\s*="
+syn match ncfSetCommandsNum "\(Directory Cache Allocation Wait Time\)\s*="
+syn match ncfSetCommandsNum "\(Enable IPX Checksums\)\s*="
+syn match ncfSetCommandsNum "\(Garbage Collection Interval\)\s*="
+syn match ncfSetCommandsNum "\(IPX NetBIOS Replication Option\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Concurrent Compressions\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Concurrent Directory Cache Writes\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Concurrent Disk Cache Writes\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Directory Cache Buffers\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Extended Attributes per File or Path\)\s*="
+syn match ncfSetCommandsNum "\(Maximum File Locks\)\s*="
+syn match ncfSetCommandsNum "\(Maximum File Locks Per Connection\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Interrupt Events\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Number of Directory Handles\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Number of Internal Directory Handles\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Outstanding NCP Searches\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Packet Receive Buffers\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Physical Receive Packet Size\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Record Locks\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Record Locks Per Connection\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Service Processes\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Subdirectory Tree Depth\)\s*="
+syn match ncfSetCommandsNum "\(Maximum Transactions\)\s*="
+syn match ncfSetCommandsNum "\(Minimum Compression Percentage Gain\)\s*="
+syn match ncfSetCommandsNum "\(Minimum Directory Cache Buffers\)\s*="
+syn match ncfSetCommandsNum "\(Minimum File Cache Buffers\)\s*="
+syn match ncfSetCommandsNum "\(Minimum File Cache Report Threshold\)\s*="
+syn match ncfSetCommandsNum "\(Minimum Free Memory for Garbage Collection\)\s*="
+syn match ncfSetCommandsNum "\(Minimum Packet Receive Buffers\)\s*="
+syn match ncfSetCommandsNum "\(Minimum Service Processes\)\s*="
+syn match ncfSetCommandsNum "\(NCP Packet Signature Option\)\s*="
+syn match ncfSetCommandsNum "\(NDS Backlink Interval\)\s*="
+syn match ncfSetCommandsNum "\(NDS Client NCP Retries\)\s*="
+syn match ncfSetCommandsNum "\(NDS External Reference Life Span\)\s*="
+syn match ncfSetCommandsNum "\(NDS Inactivity Synchronization Interval\)\s*="
+syn match ncfSetCommandsNum "\(NDS Janitor Interval\)\s*="
+syn match ncfSetCommandsNum "\(New Service Process Wait Time\)\s*="
+syn match ncfSetCommandsNum "\(Number of Frees for Garbage Collection\)\s*="
+syn match ncfSetCommandsNum "\(Number of Watchdog Packets\)\s*="
+syn match ncfSetCommandsNum "\(Pseudo Preemption Count\)\s*="
+syn match ncfSetCommandsNum "\(Read Ahead LRU Sitting Time Threshold\)\s*="
+syn match ncfSetCommandsNum "\(Remirror Block Size\)\s*="
+syn match ncfSetCommandsNum "\(Reserved Buffers Below 16 Meg\)\s*="
+syn match ncfSetCommandsNum "\(Server Log File Overflow Size\)\s*="
+syn match ncfSetCommandsNum "\(Server Log File State\)\s*="
+syn match ncfSetCommandsNum "\(SMP Polling Count\)\s*="
+syn match ncfSetCommandsNum "\(SMP Stack Size\)\s*="
+syn match ncfSetCommandsNum "\(TIMESYNC Polling Count\)\s*="
+syn match ncfSetCommandsNum "\(TIMESYNC Polling Interval\)\s*="
+syn match ncfSetCommandsNum "\(TIMESYNC Synchronization Radius\)\s*="
+syn match ncfSetCommandsNum "\(TIMESYNC Write Value\)\s*="
+syn match ncfSetCommandsNum "\(Volume Log File Overflow Size\)\s*="
+syn match ncfSetCommandsNum "\(Volume Log File State\)\s*="
+syn match ncfSetCommandsNum "\(Volume Low Warning Reset Threshold\)\s*="
+syn match ncfSetCommandsNum "\(Volume Low Warning Threshold\)\s*="
+syn match ncfSetCommandsNum "\(Volume TTS Log File Overflow Size\)\s*="
+syn match ncfSetCommandsNum "\(Volume TTS Log File State\)\s*="
+syn match ncfSetCommandsNum "\(Worker Thread Execute In a Row Count\)\s*="
+
+" SET Commands that take a Boolean (ON/OFF)
+
+syn match ncfSetCommandsBool "\(Alloc Memory Check Flag\)\s*="
+syn match ncfSetCommandsBool "\(Allow Audit Passwords\)\s*="
+syn match ncfSetCommandsBool "\(Allow Change to Client Rights\)\s*="
+syn match ncfSetCommandsBool "\(Allow Deletion of Active Directories\)\s*="
+syn match ncfSetCommandsBool "\(Allow Invalid Pointers\)\s*="
+syn match ncfSetCommandsBool "\(Allow LIP\)\s*="
+syn match ncfSetCommandsBool "\(Allow Unencrypted Passwords\)\s*="
+syn match ncfSetCommandsBool "\(Allow Unowned Files To Be Extended\)\s*="
+syn match ncfSetCommandsBool "\(Auto Register Memory Above 16 Megabytes\)\s*="
+syn match ncfSetCommandsBool "\(Auto TTS Backout Flag\)\s*="
+syn match ncfSetCommandsBool "\(Automatically Repair Bad Volumes\)\s*="
+syn match ncfSetCommandsBool "\(Check Equivalent to Me\)\s*="
+syn match ncfSetCommandsBool "\(Command Line Prompt Default Choice\)\s*="
+syn match ncfSetCommandsBool "\(Console Display Watchdog Logouts\)\s*="
+syn match ncfSetCommandsBool "\(Daylight Savings Time Status\)\s*="
+syn match ncfSetCommandsBool "\(Developer Option\)\s*="
+syn match ncfSetCommandsBool "\(Display Incomplete IPX Packet Alerts\)\s*="
+syn match ncfSetCommandsBool "\(Display Lost Interrupt Alerts\)\s*="
+syn match ncfSetCommandsBool "\(Display NCP Bad Component Warnings\)\s*="
+syn match ncfSetCommandsBool "\(Display NCP Bad Length Warnings\)\s*="
+syn match ncfSetCommandsBool "\(Display Old API Names\)\s*="
+syn match ncfSetCommandsBool "\(Display Relinquish Control Alerts\)\s*="
+syn match ncfSetCommandsBool "\(Display Spurious Interrupt Alerts\)\s*="
+syn match ncfSetCommandsBool "\(Enable Deadlock Detection\)\s*="
+syn match ncfSetCommandsBool "\(Enable Disk Read After Write Verify\)\s*="
+syn match ncfSetCommandsBool "\(Enable File Compression\)\s*="
+syn match ncfSetCommandsBool "\(Enable IO Handicap Attribute\)\s*="
+syn match ncfSetCommandsBool "\(Enable SECURE.NCF\)\s*="
+syn match ncfSetCommandsBool "\(Fast Volume Mounts\)\s*="
+syn match ncfSetCommandsBool "\(Global Pseudo Preemption\)\s*="
+syn match ncfSetCommandsBool "\(Halt System on Invalid Parameters\)\s*="
+syn match ncfSetCommandsBool "\(Ignore Disk Geometry\)\s*="
+syn match ncfSetCommandsBool "\(Immediate Purge of Deleted Files\)\s*="
+syn match ncfSetCommandsBool "\(NCP File Commit\)\s*="
+syn match ncfSetCommandsBool "\(NDS Trace File Length to Zero\)\s*="
+syn match ncfSetCommandsBool "\(NDS Trace to File\)\s*="
+syn match ncfSetCommandsBool "\(NDS Trace to Screen\)\s*="
+syn match ncfSetCommandsBool "\(New Time With Daylight Savings Time Status\)\s*="
+syn match ncfSetCommandsBool "\(Read Ahead Enabled\)\s*="
+syn match ncfSetCommandsBool "\(Read Fault Emulation\)\s*="
+syn match ncfSetCommandsBool "\(Read Fault Notification\)\s*="
+syn match ncfSetCommandsBool "\(Reject NCP Packets with Bad Components\)\s*="
+syn match ncfSetCommandsBool "\(Reject NCP Packets with Bad Lengths\)\s*="
+syn match ncfSetCommandsBool "\(Replace Console Prompt with Server Name\)\s*="
+syn match ncfSetCommandsBool "\(Reply to Get Nearest Server\)\s*="
+syn match ncfSetCommandsBool "\(SMP Developer Option\)\s*="
+syn match ncfSetCommandsBool "\(SMP Flush Processor Cache\)\s*="
+syn match ncfSetCommandsBool "\(SMP Intrusive Abend Mode\)\s*="
+syn match ncfSetCommandsBool "\(SMP Memory Protection\)\s*="
+syn match ncfSetCommandsBool "\(Sound Bell for Alerts\)\s*="
+syn match ncfSetCommandsBool "\(TIMESYNC Configured Sources\)\s*="
+syn match ncfSetCommandsBool "\(TIMESYNC Directory Tree Mode\)\s*="
+syn match ncfSetCommandsBool "\(TIMESYNC Hardware Clock\)\s*="
+syn match ncfSetCommandsBool "\(TIMESYNC RESET\)\s*="
+syn match ncfSetCommandsBool "\(TIMESYNC Restart Flag\)\s*="
+syn match ncfSetCommandsBool "\(TIMESYNC Service Advertising\)\s*="
+syn match ncfSetCommandsBool "\(TIMESYNC Write Parameters\)\s*="
+syn match ncfSetCommandsBool "\(TTS Abort Dump Flag\)\s*="
+syn match ncfSetCommandsBool "\(Upgrade Low Priority Threads\)\s*="
+syn match ncfSetCommandsBool "\(Volume Low Warn All Users\)\s*="
+syn match ncfSetCommandsBool "\(Write Fault Emulation\)\s*="
+syn match ncfSetCommandsBool "\(Write Fault Notification\)\s*="
+
+" Set Commands that take a "string" -- NOT QUOTED
+
+syn match ncfSetCommandsStr "\(Default Time Server Type\)\s*="
+syn match ncfSetCommandsStr "\(SMP NetWare Kernel Mode\)\s*="
+syn match ncfSetCommandsStr "\(Time Zone\)\s*="
+syn match ncfSetCommandsStr "\(TIMESYNC ADD Time Source\)\s*="
+syn match ncfSetCommandsStr "\(TIMESYNC REMOVE Time Source\)\s*="
+syn match ncfSetCommandsStr "\(TIMESYNC Time Source\)\s*="
+syn match ncfSetCommandsStr "\(TIMESYNC Type\)\s*="
+
+" SET Commands that take a "Time"
+
+syn match ncfSetCommandsTime "\(Command Line Prompt Time Out\)\s*="
+syn match ncfSetCommandsTime "\(Delay Before First Watchdog Packet\)\s*="
+syn match ncfSetCommandsTime "\(Delay Between Watchdog Packets\)\s*="
+syn match ncfSetCommandsTime "\(Directory Cache Buffer NonReferenced Delay\)\s*="
+syn match ncfSetCommandsTime "\(Dirty Directory Cache Delay Time\)\s*="
+syn match ncfSetCommandsTime "\(Dirty Disk Cache Delay Time\)\s*="
+syn match ncfSetCommandsTime "\(File Delete Wait Time\)\s*="
+syn match ncfSetCommandsTime "\(Minimum File Delete Wait Time\)\s*="
+syn match ncfSetCommandsTime "\(Mirrored Devices Are Out of Sync Message Frequency\)\s*="
+syn match ncfSetCommandsTime "\(New Packet Receive Buffer Wait Time\)\s*="
+syn match ncfSetCommandsTime "\(TTS Backout File Truncation Wait Time\)\s*="
+syn match ncfSetCommandsTime "\(TTS UnWritten Cache Wait Time\)\s*="
+syn match ncfSetCommandsTime "\(Turbo FAT Re-Use Wait Time\)\s*="
+syn match ncfSetCommandsTime "\(Daylight Savings Time Offset\)\s*="
+
+syn match ncfSetCommandsTimeDate "\(End of Daylight Savings Time\)\s*="
+syn match ncfSetCommandsTimeDate "\(Start of Daylight Savings Time\)\s*="
+
+syn match ncfSetCommandsBindCon "\(Bindery Context\)\s*=" nextgroup=ncfContString
+
+syn cluster ncfSetCommands contains=ncfSetCommandsNum,ncfSetCommandsBool,ncfSetCommandsStr,ncfSetCommandsTime,ncfSetCommandsTimeDate,ncfSetCommandsBindCon
+
+
+if exists("ncf_highlight_unknowns")
+    syn match Error "[^ \t]*" contains=ALL
+endif
+
+
+" The default methods for highlighting.  Can be overridden later
+hi def link ncfCommands		Statement
+hi def link ncfSetCommands	ncfCommands
+hi def link ncfLogins		ncfCommands
+hi def link ncfString		String
+hi def link ncfContString	ncfString
+hi def link ncfComment		Comment
+hi def link ncfImplicit		Type
+hi def link ncfBoolean		Boolean
+hi def link ncfScript		Identifier
+hi def link ncfNumber		Number
+hi def link ncfIPAddr		ncfNumber
+hi def link ncfHexNumber		ncfNumber
+hi def link ncfTime		ncfNumber
+hi def link ncfDSTTime		ncfNumber
+hi def link ncfPath		Constant
+hi def link ncfServerName	Special
+hi def link ncfIPXNet		ncfServerName
+hi def link ncfTimeTypes		Constant
+hi def link ncfSetCommandsNum	   ncfSetCommands
+hi def link ncfSetCommandsBool	   ncfSetCommands
+hi def link ncfSetCommandsStr	   ncfSetCommands
+hi def link ncfSetCommandsTime	   ncfSetCommands
+hi def link ncfSetCommandsTimeDate  ncfSetCommands
+hi def link ncfSetCommandsBindCon   ncfSetCommands
+
+
+
+let b:current_syntax = "ncf"
+
+endif
diff --git a/syntax/neomuttrc.vim b/syntax/neomuttrc.vim
new file mode 100644
index 000000000..363b811a9
--- /dev/null
+++ b/syntax/neomuttrc.vim
@@ -0,0 +1,865 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'neomuttrc') == -1
+
+" Vim syntax file
+" Language:	NeoMutt setup files
+" Maintainer:	Richard Russon <rich@flatcap.org>
+" Previous Maintainer:	Guillaume Brogi <gui-gui@netcourrier.com>
+" Last Change:	2020-06-21
+" Original version based on syntax/muttrc.vim
+
+" This file covers NeoMutt 2020-06-19
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Set the keyword characters
+setlocal isk=@,48-57,_,-
+
+" handling optional variables
+syntax match muttrcComment	"^# .*$" contains=@Spell
+syntax match muttrcComment	"^#[^ ].*$"
+syntax match muttrcComment	"^#$"
+syntax match muttrcComment	"[^\\]#.*$"lc=1
+
+" Escape sequences (back-tick and pipe goes here too)
+syntax match muttrcEscape	+\\[#tnr"'Cc ]+
+syntax match muttrcEscape	+[`|]+
+syntax match muttrcEscape	+\\$+
+
+" The variables takes the following arguments
+syntax region muttrcString	contained keepend start=+"+ms=e skip=+\\"+ end=+"+ contains=muttrcEscape,muttrcCommand,muttrcAction,muttrcShellString
+syntax region muttrcString	contained keepend start=+'+ms=e skip=+\\'+ end=+'+ contains=muttrcEscape,muttrcCommand,muttrcAction
+syntax match muttrcStringNL	contained skipwhite skipnl "\s*\\$" nextgroup=muttrcString,muttrcStringNL
+
+syntax region muttrcShellString	matchgroup=muttrcEscape keepend start=+`+ skip=+\\`+ end=+`+ contains=muttrcVarStr,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcCommand
+
+syntax match  muttrcRXChars	contained /[^\\][][.*?+]\+/hs=s+1
+syntax match  muttrcRXChars	contained /[][|()][.*?+]*/
+syntax match  muttrcRXChars	contained /['"]^/ms=s+1
+syntax match  muttrcRXChars	contained /$['"]/me=e-1
+syntax match  muttrcRXChars	contained /\\/
+" Why does muttrcRXString2 work with one \ when muttrcRXString requires two?
+syntax region muttrcRXString	contained skipwhite start=+'+ skip=+\\'+ end=+'+ contains=muttrcRXChars
+syntax region muttrcRXString	contained skipwhite start=+"+ skip=+\\"+ end=+"+ contains=muttrcRXChars
+syntax region muttrcRXString	contained skipwhite start=+[^	 "'^]+ skip=+\\\s+ end=+\s+re=e-1 contains=muttrcRXChars
+" For some reason, skip refuses to match backslashes here...
+syntax region muttrcRXString	contained matchgroup=muttrcRXChars skipwhite start=+\^+ end=+[^\\]\s+re=e-1 contains=muttrcRXChars
+syntax region muttrcRXString	contained matchgroup=muttrcRXChars skipwhite start=+\^+ end=+$\s+ contains=muttrcRXChars
+syntax region muttrcRXString2	contained skipwhite start=+'+ skip=+\'+ end=+'+ contains=muttrcRXChars
+syntax region muttrcRXString2	contained skipwhite start=+"+ skip=+\"+ end=+"+ contains=muttrcRXChars
+
+" these must be kept synchronized with muttrcRXString, but are intended for muttrcRXHooks
+syntax region muttrcRXHookString	contained keepend skipwhite start=+'+ skip=+\\'+ end=+'+ contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
+syntax region muttrcRXHookString	contained keepend skipwhite start=+"+ skip=+\\"+ end=+"+ contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
+syntax region muttrcRXHookString	contained keepend skipwhite start=+[^	 "'^]+ skip=+\\\s+ end=+\s+re=e-1 contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
+syntax region muttrcRXHookString	contained keepend skipwhite start=+\^+ end=+[^\\]\s+re=e-1 contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
+syntax region muttrcRXHookString	contained keepend matchgroup=muttrcRXChars skipwhite start=+\^+ end=+$\s+ contains=muttrcRXString nextgroup=muttrcString,muttrcStringNL
+syntax match muttrcRXHookStringNL	contained skipwhite skipnl "\s*\\$" nextgroup=muttrcRXHookString,muttrcRXHookStringNL
+
+" these are exclusively for args lists (e.g. -rx pat pat pat ...)
+syntax region muttrcRXPat	contained keepend skipwhite start=+'+ skip=+\\'+ end=+'\s*+ contains=muttrcRXString nextgroup=muttrcRXPat
+syntax region muttrcRXPat	contained keepend skipwhite start=+"+ skip=+\\"+ end=+"\s*+ contains=muttrcRXString nextgroup=muttrcRXPat
+syntax match muttrcRXPat	contained /[^-'"#!]\S\+/ skipwhite contains=muttrcRXChars nextgroup=muttrcRXPat
+syntax match muttrcRXDef	contained "-rx\s\+" skipwhite nextgroup=muttrcRXPat
+
+syntax match muttrcSpecial	+\(['"]\)!\1+
+
+syntax match muttrcSetStrAssignment contained skipwhite /=\s*\%(\\\?\$\)\?[0-9A-Za-z_-]\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcVariable,muttrcEscapedVariable
+syntax region muttrcSetStrAssignment contained skipwhite keepend start=+=\s*"+hs=s+1 end=+"+ skip=+\\"+ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcString
+syntax region muttrcSetStrAssignment contained skipwhite keepend start=+=\s*'+hs=s+1 end=+'+ skip=+\\'+ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcString
+syntax match muttrcSetBoolAssignment contained skipwhite /=\s*\\\?\$\w\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcVariable,muttrcEscapedVariable
+syntax match muttrcSetBoolAssignment contained skipwhite /=\s*\%(yes\|no\)/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax match muttrcSetBoolAssignment contained skipwhite /=\s*"\%(yes\|no\)"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax match muttrcSetBoolAssignment contained skipwhite /=\s*'\%(yes\|no\)'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax match muttrcSetQuadAssignment contained skipwhite /=\s*\\\?\$\w\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcVariable,muttrcEscapedVariable
+syntax match muttrcSetQuadAssignment contained skipwhite /=\s*\%(ask-\)\?\%(yes\|no\)/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax match muttrcSetQuadAssignment contained skipwhite /=\s*"\%(ask-\)\?\%(yes\|no\)"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax match muttrcSetQuadAssignment contained skipwhite /=\s*'\%(ask-\)\?\%(yes\|no\)'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax match muttrcSetNumAssignment contained skipwhite /=\s*\\\?\$\w\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr contains=muttrcVariable,muttrcEscapedVariable
+syntax match muttrcSetNumAssignment contained skipwhite /=\s*\d\+/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax match muttrcSetNumAssignment contained skipwhite /=\s*"\d\+"/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax match muttrcSetNumAssignment contained skipwhite /=\s*'\d\+'/hs=s+1 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+" Now catch some email addresses and headers (purified version from mail.vim)
+syntax match muttrcEmail	"[a-zA-Z0-9._-]\+@[a-zA-Z0-9./-]\+"
+syntax match muttrcHeader	"\<\c\%(From\|To\|C[Cc]\|B[Cc][Cc]\|Reply-To\|Subject\|Return-Path\|Received\|Date\|Replied\|Attach\)\>:\="
+
+syntax match   muttrcKeySpecial	contained +\%(\\[Cc'"]\|\^\|\\[01]\d\{2}\)+
+syntax match   muttrcKey	contained "\S\+"			contains=muttrcKeySpecial,muttrcKeyName
+syntax region  muttrcKey	contained start=+"+ skip=+\\\\\|\\"+ end=+"+	contains=muttrcKeySpecial,muttrcKeyName
+syntax region  muttrcKey	contained start=+'+ skip=+\\\\\|\\'+ end=+'+	contains=muttrcKeySpecial,muttrcKeyName
+syntax match   muttrcKeyName	contained "\\[trne]"
+syntax match   muttrcKeyName	contained "\c<\%(BackSpace\|BackTab\|Delete\|Down\|End\|Enter\|Esc\|Home\|Insert\|Left\|Next\|PageDown\|PageUp\|Return\|Right\|Space\|Tab\|Up\)>"
+syntax match   muttrcKeyName	contained "\c<F\d\+>"
+
+syntax match muttrcFormatErrors contained /%./
+
+syntax match muttrcStrftimeEscapes contained /%[AaBbCcDdeFGgHhIjklMmnpRrSsTtUuVvWwXxYyZz+%]/
+syntax match muttrcStrftimeEscapes contained /%E[cCxXyY]/
+syntax match muttrcStrftimeEscapes contained /%O[BdeHImMSuUVwWy]/
+
+syntax region muttrcAliasFormatStr      contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcAliasFormatEscapes,muttrcAliasFormatConditionals,muttrcFormatErrors                             nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcAliasFormatStr      contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcAliasFormatEscapes,muttrcAliasFormatConditionals,muttrcFormatErrors                             nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcAttachFormatStr     contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcAttachFormatEscapes,muttrcAttachFormatConditionals,muttrcFormatErrors                           nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcAttachFormatStr     contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcAttachFormatEscapes,muttrcAttachFormatConditionals,muttrcFormatErrors                           nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcComposeFormatStr    contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcComposeFormatEscapes,muttrcComposeFormatConditionals,muttrcFormatErrors                         nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcComposeFormatStr    contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcComposeFormatEscapes,muttrcComposeFormatConditionals,muttrcFormatErrors                         nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcFolderFormatStr     contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcFolderFormatEscapes,muttrcFolderFormatConditionals,muttrcFormatErrors                           nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcFolderFormatStr     contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcFolderFormatEscapes,muttrcFolderFormatConditionals,muttrcFormatErrors                           nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcGroupIndexFormatStr contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcGroupIndexFormatEscapes,muttrcGroupIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcGroupIndexFormatStr contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcGroupIndexFormatEscapes,muttrcGroupIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcIndexFormatStr      contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcIndexFormatEscapes,muttrcIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes           nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcIndexFormatStr      contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcIndexFormatEscapes,muttrcIndexFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes           nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcMixFormatStr        contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcMixFormatEscapes,muttrcMixFormatConditionals,muttrcFormatErrors                                 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcMixFormatStr        contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcMixFormatEscapes,muttrcMixFormatConditionals,muttrcFormatErrors                                 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcPGPCmdFormatStr     contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPGPCmdFormatEscapes,muttrcPGPCmdFormatConditionals,muttrcVariable,muttrcFormatErrors            nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcPGPCmdFormatStr     contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPGPCmdFormatEscapes,muttrcPGPCmdFormatConditionals,muttrcVariable,muttrcFormatErrors            nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcPGPFormatStr        contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPGPFormatEscapes,muttrcPGPFormatConditionals,muttrcFormatErrors,muttrcPGPTimeEscapes            nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcPGPFormatStr        contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPGPFormatEscapes,muttrcPGPFormatConditionals,muttrcFormatErrors,muttrcPGPTimeEscapes            nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcQueryFormatStr      contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcQueryFormatEscapes,muttrcQueryFormatConditionals,muttrcFormatErrors                             nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcQueryFormatStr      contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcQueryFormatEscapes,muttrcQueryFormatConditionals,muttrcFormatErrors                             nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcSidebarFormatStr    contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcSidebarFormatEscapes,muttrcSidebarFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes       nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcSidebarFormatStr    contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcSidebarFormatEscapes,muttrcSidebarFormatConditionals,muttrcFormatErrors,muttrcTimeEscapes       nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcSmimeFormatStr      contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcSmimeFormatEscapes,muttrcSmimeFormatConditionals,muttrcVariable,muttrcFormatErrors              nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcSmimeFormatStr      contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcSmimeFormatEscapes,muttrcSmimeFormatConditionals,muttrcVariable,muttrcFormatErrors              nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcStatusFormatStr     contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcStatusFormatEscapes,muttrcStatusFormatConditionals,muttrcFormatErrors                           nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcStatusFormatStr     contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcStatusFormatEscapes,muttrcStatusFormatConditionals,muttrcFormatErrors                           nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcStrftimeFormatStr   contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcStrftimeEscapes,muttrcFormatErrors                                                              nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax region muttrcStrftimeFormatStr   contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcStrftimeEscapes,muttrcFormatErrors                                                              nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+" Format escapes and conditionals
+syntax match muttrcFormatConditionals2 contained /[^?]*?/
+function! s:escapesConditionals(baseName, sequence, padding, conditional)
+	exec 'syntax match muttrc' . a:baseName . 'Escapes contained /%\%(\%(-\?[0-9]\+\)\?\%(\.[0-9]\+\)\?\)\?[:_]\?\%(' . a:sequence . '\|%\)/'
+	if a:padding
+		exec 'syntax match muttrc' . a:baseName . 'Escapes contained /%[>|*]./'
+	endif
+	if a:conditional
+		exec 'syntax match muttrc' . a:baseName . 'Conditionals contained /%?\%(' . a:sequence . '\)?/ nextgroup=muttrcFormatConditionals2'
+	else
+		exec 'syntax match muttrc' . a:baseName . 'Conditionals contained /%?\%(' . a:sequence . '\)?/'
+	endif
+endfunction
+
+" CHECKED 2020-06-21
+" Ref: alias_format_str() in alias/dlgalias.c
+call s:escapesConditionals('AliasFormat', '[acfnrt]', 1, 0)
+" Ref: attach_format_str() in recvattach.c
+call s:escapesConditionals('AttachFormat', '[CcDdeFfIMmnQsTtuX]', 1, 1)
+" Ref: compose_format_str() in compose.c
+call s:escapesConditionals('ComposeFormat', '[ahlv]', 1, 1)
+" Ref: folder_format_str() in browser.c
+call s:escapesConditionals('FolderFormat', '[CDdFfgilmNnstu]', 1, 0)
+" Ref: group_index_format_str() in browser.c
+call s:escapesConditionals('GroupIndexFormat', '[CdfMNns]', 1, 1)
+" Ref: index_format_str() in hdrline.c
+call s:escapesConditionals('IndexFormat', '[AaBbCDdEefgHIiJKLlMmNnOPqRrSsTtuvWXxYyZ(<[{]\|@\i\+@\|G[a-zA-Z]\+\|Fp\=\|z[cst]\|cr\=', 1, 1)
+" Ref: mix_format_str() in remailer.c
+call s:escapesConditionals('MixFormat', '[acns]', 1, 0)
+" Ref: pgp_command_format_str() in ncrypt/pgpinvoke.c
+call s:escapesConditionals('PGPCmdFormat', '[afprs]', 0, 1)
+" Ref: crypt_format_str() in ncrypt/crypt_gpgme.c
+" Ref: pgp_entry_format_str() in ncrypt/pgpkey.c
+" Note: crypt_format_str() supports 'p', but pgp_entry_fmt() does not
+call s:escapesConditionals('PGPFormat', '[AaCcFfKkLlnptu[]', 0, 0)
+" Ref: query_format_str() in alias/dlgquery.c
+call s:escapesConditionals('QueryFormat', '[acent]', 1, 1)
+" Ref: sidebar_format_str() in sidebar.c
+call s:escapesConditionals('SidebarFormat', '[!BDdFLNnorStZ]', 1, 1)
+" Ref: smime_command_format_str() in ncrypt/smime.c
+call s:escapesConditionals('SmimeFormat', '[aCcdfiks]', 0, 1)
+" Ref: status_format_str() in status.c
+call s:escapesConditionals('StatusFormat', '[bDdFfhLlMmnoPpRrSstuVv]', 1, 1)
+
+syntax region muttrcPGPTimeEscapes contained start=+%\[+ end=+\]+ contains=muttrcStrftimeEscapes
+syntax region muttrcTimeEscapes    contained start=+%(+  end=+)+  contains=muttrcStrftimeEscapes
+syntax region muttrcTimeEscapes    contained start=+%<+  end=+>+  contains=muttrcStrftimeEscapes
+syntax region muttrcTimeEscapes    contained start=+%\[+ end=+\]+ contains=muttrcStrftimeEscapes
+syntax region muttrcTimeEscapes    contained start=+%{+  end=+}+  contains=muttrcStrftimeEscapes
+
+syntax match muttrcVarEqualsAliasFmt      contained skipwhite "=" nextgroup=muttrcAliasFormatStr
+syntax match muttrcVarEqualsAttachFmt     contained skipwhite "=" nextgroup=muttrcAttachFormatStr
+syntax match muttrcVarEqualsComposeFmt    contained skipwhite "=" nextgroup=muttrcComposeFormatStr
+syntax match muttrcVarEqualsFolderFmt     contained skipwhite "=" nextgroup=muttrcFolderFormatStr
+syntax match muttrcVarEqualsGrpIdxFmt     contained skipwhite "=" nextgroup=muttrcGroupIndexFormatStr
+syntax match muttrcVarEqualsIdxFmt        contained skipwhite "=" nextgroup=muttrcIndexFormatStr
+syntax match muttrcVarEqualsMixFmt        contained skipwhite "=" nextgroup=muttrcMixFormatStr
+syntax match muttrcVarEqualsPGPCmdFmt     contained skipwhite "=" nextgroup=muttrcPGPCmdFormatStr
+syntax match muttrcVarEqualsPGPFmt        contained skipwhite "=" nextgroup=muttrcPGPFormatStr
+syntax match muttrcVarEqualsQueryFmt      contained skipwhite "=" nextgroup=muttrcQueryFormatStr
+syntax match muttrcVarEqualsSdbFmt        contained skipwhite "=" nextgroup=muttrcSidebarFormatStr
+syntax match muttrcVarEqualsSmimeFmt      contained skipwhite "=" nextgroup=muttrcSmimeFormatStr
+syntax match muttrcVarEqualsStatusFmt     contained skipwhite "=" nextgroup=muttrcStatusFormatStr
+syntax match muttrcVarEqualsStrftimeFmt   contained skipwhite "=" nextgroup=muttrcStrftimeFormatStr
+
+syntax match muttrcVPrefix contained /[?&]/ nextgroup=muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+" CHECKED 2020-06-21
+" List of the different screens in mutt (see Menus in keymap.c)
+syntax keyword muttrcMenu contained alias attach browser compose editor generic index key_select_pgp key_select_smime mix pager pgp postpone query smime
+syntax match muttrcMenuList "\S\+" contained contains=muttrcMenu
+syntax match muttrcMenuCommas /,/ contained
+
+syntax region muttrcSpamPattern	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPattern nextgroup=muttrcString,muttrcStringNL
+syntax region muttrcSpamPattern	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPattern nextgroup=muttrcString,muttrcStringNL
+
+syntax region muttrcNoSpamPattern	contained skipwhite keepend start=+'+ skip=+\\'+ end=+'+ contains=muttrcPattern
+syntax region muttrcNoSpamPattern	contained skipwhite keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcPattern
+
+syntax match muttrcAttachmentsMimeType contained "[*a-z0-9_-]\+/[*a-z0-9._-]\+\s*" skipwhite nextgroup=muttrcAttachmentsMimeType
+syntax match muttrcAttachmentsFlag contained "[+-]\%([AI]\|inline\|attachment\)\s\+" skipwhite nextgroup=muttrcAttachmentsMimeType
+syntax match muttrcAttachmentsLine "^\s*\%(un\)\?attachments\s\+" skipwhite nextgroup=muttrcAttachmentsFlag
+
+syntax match muttrcUnHighlightSpace contained "\%(\s\+\|\\$\)"
+
+syntax keyword muttrcAsterisk	contained *
+
+syntax keyword muttrcListsKeyword	lists skipwhite nextgroup=muttrcGroupDef,muttrcComment
+syntax keyword muttrcListsKeyword	unlists skipwhite nextgroup=muttrcAsterisk,muttrcComment
+
+syntax keyword muttrcSubscribeKeyword	subscribe skipwhite nextgroup=muttrcGroupDef,muttrcComment
+syntax keyword muttrcSubscribeKeyword	unsubscribe skipwhite nextgroup=muttrcAsterisk,muttrcComment
+
+syntax keyword muttrcAlternateKeyword contained alternates unalternates
+syntax region muttrcAlternatesLine keepend start=+^\s*\%(un\)\?alternates\s+ skip=+\\$+ end=+$+ contains=muttrcAlternateKeyword,muttrcGroupDef,muttrcRXPat,muttrcUnHighlightSpace,muttrcComment
+
+" muttrcVariable includes a prefix because partial strings are considered valid.
+syntax match muttrcVariable	contained "\\\@<![a-zA-Z_-]*\$[a-zA-Z_-]\+" contains=muttrcVariableInner
+syntax match muttrcVariableInner	contained "\$[a-zA-Z_-]\+"
+syntax match muttrcEscapedVariable	contained "\\\$[a-zA-Z_-]\+"
+
+syntax match muttrcBadAction	contained "[^<>]\+" contains=muttrcEmail
+syntax match muttrcAction		contained "<[^>]\{-}>" contains=muttrcBadAction,muttrcFunction,muttrcKeyName
+
+" CHECKED 2020-06-21
+" First, functions that take regular expressions:
+syntax match  muttrcRXHookNot	contained /!\s*/ skipwhite nextgroup=muttrcRXHookString,muttrcRXHookStringNL
+syntax match  muttrcRXHooks	/\<\%(account\|append\|close\|crypt\|folder\|mbox\|open\|pgp\)-hook\>/ skipwhite nextgroup=muttrcRXHookNot,muttrcRXHookString,muttrcRXHookStringNL
+
+" Now, functions that take patterns
+syntax match muttrcPatHookNot	contained /!\s*/ skipwhite nextgroup=muttrcPattern
+syntax match muttrcPatHooks	/\<\%(charset\|iconv\|index-format\)-hook\>/ skipwhite nextgroup=muttrcPatHookNot,muttrcPattern
+syntax match muttrcPatHooks	/\<\%(message\|reply\|send\|send2\|save\|fcc\|fcc-save\)-hook\>/ skipwhite nextgroup=muttrcPatHookNot,muttrcOptPattern
+
+" Global hooks that take a command
+syntax keyword muttrcHooks skipwhite shutdown-hook startup-hook timeout-hook nextgroup=muttrcCommand
+
+syntax match muttrcBindFunction	contained /\S\+\>/ skipwhite contains=muttrcFunction
+syntax match muttrcBindFunctionNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcBindFunction,muttrcBindFunctionNL
+syntax match muttrcBindKey		contained /\S\+/ skipwhite contains=muttrcKey nextgroup=muttrcBindFunction,muttrcBindFunctionNL
+syntax match muttrcBindKeyNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcBindKey,muttrcBindKeyNL
+syntax match muttrcBindMenuList	contained /\S\+/ skipwhite contains=muttrcMenu,muttrcMenuCommas nextgroup=muttrcBindKey,muttrcBindKeyNL
+syntax match muttrcBindMenuListNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcBindMenuList,muttrcBindMenuListNL
+
+syntax region muttrcMacroDescr	contained keepend skipwhite start=+\s*\S+ms=e skip=+\\ + end=+ \|$+me=s
+syntax region muttrcMacroDescr	contained keepend skipwhite start=+'+ms=e skip=+\\'+ end=+'+me=s
+syntax region muttrcMacroDescr	contained keepend skipwhite start=+"+ms=e skip=+\\"+ end=+"+me=s
+syntax match muttrcMacroDescrNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
+syntax region muttrcMacroBody	contained skipwhite start="\S" skip='\\ \|\\$' end=' \|$' contains=muttrcEscape,muttrcSet,muttrcUnset,muttrcReset,muttrcToggle,muttrcCommand,muttrcAction nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
+syntax region muttrcMacroBody	matchgroup=Type contained skipwhite start=+'+ms=e skip=+\\'+ end=+'\|\%(\%(\\\\\)\@<!$\)+me=s contains=muttrcEscape,muttrcSet,muttrcUnset,muttrcReset,muttrcToggle,muttrcSpam,muttrcNoSpam,muttrcCommand,muttrcAction,muttrcVariable nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
+syntax region muttrcMacroBody	matchgroup=Type contained skipwhite start=+"+ms=e skip=+\\"+ end=+"\|\%(\%(\\\\\)\@<!$\)+me=s contains=muttrcEscape,muttrcSet,muttrcUnset,muttrcReset,muttrcToggle,muttrcSpam,muttrcNoSpam,muttrcCommand,muttrcAction,muttrcVariable nextgroup=muttrcMacroDescr,muttrcMacroDescrNL
+syntax match muttrcMacroBodyNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcMacroBody,muttrcMacroBodyNL
+syntax match muttrcMacroKey	contained /\S\+/ skipwhite contains=muttrcKey nextgroup=muttrcMacroBody,muttrcMacroBodyNL
+syntax match muttrcMacroKeyNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcMacroKey,muttrcMacroKeyNL
+syntax match muttrcMacroMenuList	contained /\S\+/ skipwhite contains=muttrcMenu,muttrcMenuCommas nextgroup=muttrcMacroKey,muttrcMacroKeyNL
+syntax match muttrcMacroMenuListNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcMacroMenuList,muttrcMacroMenuListNL
+
+syntax match muttrcAddrContent	contained "[a-zA-Z0-9._-]\+@[a-zA-Z0-9./-]\+\s*" skipwhite contains=muttrcEmail nextgroup=muttrcAddrContent
+syntax region muttrcAddrContent	contained start=+'+ end=+'\s*+ skip=+\\'+ skipwhite contains=muttrcEmail nextgroup=muttrcAddrContent
+syntax region muttrcAddrContent	contained start=+"+ end=+"\s*+ skip=+\\"+ skipwhite contains=muttrcEmail nextgroup=muttrcAddrContent
+syntax match muttrcAddrDef	contained "-addr\s\+" skipwhite nextgroup=muttrcAddrContent
+
+syntax match muttrcGroupFlag	contained "-group"
+syntax region muttrcGroupDef	contained start="-group\s\+" skip="\\$" end="\s" skipwhite keepend contains=muttrcGroupFlag,muttrcUnHighlightSpace
+
+syntax keyword muttrcGroupKeyword	contained group ungroup
+syntax region muttrcGroupLine	keepend start=+^\s*\%(un\)\?group\s+ skip=+\\$+ end=+$+ contains=muttrcGroupKeyword,muttrcGroupDef,muttrcAddrDef,muttrcRXDef,muttrcUnHighlightSpace,muttrcComment
+
+syntax match muttrcAliasGroupName	contained /\w\+/ skipwhite nextgroup=muttrcAliasGroupDef,muttrcAliasKey,muttrcAliasNL
+syntax match muttrcAliasGroupDefNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcAliasGroupName,muttrcAliasGroupDefNL
+syntax match muttrcAliasGroupDef	contained /\s*-group/ skipwhite nextgroup=muttrcAliasGroupName,muttrcAliasGroupDefNL contains=muttrcGroupFlag
+syntax match muttrcAliasComma	contained /,/ skipwhite nextgroup=muttrcAliasEmail,muttrcAliasEncEmail,muttrcAliasNameNoParens,muttrcAliasENNL
+syntax match muttrcAliasEmail	contained /\S\+@\S\+/ contains=muttrcEmail nextgroup=muttrcAliasName,muttrcAliasNameNL skipwhite
+syntax match muttrcAliasEncEmail	contained /<[^>]\+>/ contains=muttrcEmail nextgroup=muttrcAliasComma
+syntax match muttrcAliasEncEmailNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcAliasEncEmail,muttrcAliasEncEmailNL
+syntax match muttrcAliasNameNoParens contained /[^<(@]\+\s\+/ nextgroup=muttrcAliasEncEmail,muttrcAliasEncEmailNL
+syntax region muttrcAliasName	contained matchgroup=Type start=/(/ end=/)/ skipwhite
+syntax match muttrcAliasNameNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcAliasName,muttrcAliasNameNL
+syntax match muttrcAliasENNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcAliasEmail,muttrcAliasEncEmail,muttrcAliasNameNoParens,muttrcAliasENNL
+syntax match muttrcAliasKey	contained /\s*[^- \t]\S\+/ skipwhite nextgroup=muttrcAliasEmail,muttrcAliasEncEmail,muttrcAliasNameNoParens,muttrcAliasENNL
+syntax match muttrcAliasNL		contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcAliasGroupDef,muttrcAliasKey,muttrcAliasNL
+
+syntax match muttrcUnAliasKey	contained "\s*\w\+\s*" skipwhite nextgroup=muttrcUnAliasKey,muttrcUnAliasNL
+syntax match muttrcUnAliasNL	contained /\s*\\$/ skipwhite skipnl nextgroup=muttrcUnAliasKey,muttrcUnAliasNL
+
+" CHECKED 2020-06-21
+" List of letters in Flags in pattern.c
+" Parameter: none
+syntax match muttrcSimplePat contained "!\?\^\?[~][ADEFGgklNOPpQRSTuUvV#$=]"
+" Parameter: range
+syntax match muttrcSimplePat contained "!\?\^\?[~][mnXz]\s*\%([<>-][0-9]\+[kM]\?\|[0-9]\+[kM]\?[-]\%([0-9]\+[kM]\?\)\?\)"
+" Parameter: date
+syntax match muttrcSimplePat contained "!\?\^\?[~][dr]\s*\%(\%(-\?[0-9]\{1,2}\%(/[0-9]\{1,2}\%(/[0-9]\{2}\%([0-9]\{2}\)\?\)\?\)\?\%([+*-][0-9]\+[ymwd]\)*\)\|\%(\%([0-9]\{1,2}\%(/[0-9]\{1,2}\%(/[0-9]\{2}\%([0-9]\{2}\)\?\)\?\)\?\%([+*-][0-9]\+[ymwd]\)*\)-\%([0-9]\{1,2}\%(/[0-9]\{1,2}\%(/[0-9]\{2}\%([0-9]\{2}\)\?\)\?\)\?\%([+*-][0-9]\+[ymwd]\)\?\)\?\)\|\%([<>=][0-9]\+[ymwd]\)\|\%(`[^`]\+`\)\|\%(\$[a-zA-Z0-9_-]\+\)\)" contains=muttrcShellString,muttrcVariable
+" Parameter: regex
+syntax match muttrcSimplePat contained "!\?\^\?[~][BbCcefHhIiLMstwxYy]\s*" nextgroup=muttrcSimplePatRXContainer
+" Parameter: pattern
+syntax match muttrcSimplePat contained "!\?\^\?[%][bBcCefhHiLstxy]\s*" nextgroup=muttrcSimplePatString
+" Parameter: pattern
+syntax match muttrcSimplePat contained "!\?\^\?[=][bcCefhHiLstxy]\s*" nextgroup=muttrcSimplePatString
+syntax region muttrcSimplePat contained keepend start=+!\?\^\?[~](+ end=+)+ contains=muttrcSimplePat
+
+"syn match muttrcSimplePat contained /'[^~=%][^']*/ contains=muttrcRXString
+syntax region muttrcSimplePatString contained keepend start=+"+ end=+"+ skip=+\\"+
+syntax region muttrcSimplePatString contained keepend start=+'+ end=+'+ skip=+\\'+
+syntax region muttrcSimplePatString contained keepend start=+[^	 "']+ skip=+\\ + end=+\s+re=e-1
+syntax region muttrcSimplePatRXContainer contained keepend start=+"+ end=+"+ skip=+\\"+ contains=muttrcRXString
+syntax region muttrcSimplePatRXContainer contained keepend start=+'+ end=+'+ skip=+\\'+ contains=muttrcRXString
+syntax region muttrcSimplePatRXContainer contained keepend start=+[^	 "']+ skip=+\\ + end=+\s+re=e-1 contains=muttrcRXString
+syntax match muttrcSimplePatMetas contained /[(|)]/
+
+syntax match muttrcOptSimplePat contained skipwhite /[~=%!(^].*/ contains=muttrcSimplePat,muttrcSimplePatMetas
+syntax match muttrcOptSimplePat contained skipwhite /[^~=%!(^].*/ contains=muttrcRXString
+syntax region muttrcOptPattern contained matchgroup=Type keepend start=+"+ skip=+\\"+ end=+"+ contains=muttrcOptSimplePat,muttrcUnHighlightSpace nextgroup=muttrcString,muttrcStringNL
+syntax region muttrcOptPattern contained matchgroup=Type keepend skipwhite start=+'+ skip=+\\'+ end=+'+ contains=muttrcOptSimplePat,muttrcUnHighlightSpace nextgroup=muttrcString,muttrcStringNL
+syntax region muttrcOptPattern contained keepend skipwhite start=+[~](+ end=+)+ skip=+\\)+ contains=muttrcSimplePat nextgroup=muttrcString,muttrcStringNL
+syntax match muttrcOptPattern contained skipwhite /[~][A-Za-z]/ contains=muttrcSimplePat nextgroup=muttrcString,muttrcStringNL
+syntax match muttrcOptPattern contained skipwhite /[.]/ nextgroup=muttrcString,muttrcStringNL
+" Keep muttrcPattern and muttrcOptPattern synchronized
+syntax region muttrcPattern contained matchgroup=Type keepend skipwhite start=+"+ skip=+\\"+ end=+"+ contains=muttrcSimplePat,muttrcUnHighlightSpace,muttrcSimplePatMetas
+syntax region muttrcPattern contained matchgroup=Type keepend skipwhite start=+'+ skip=+\\'+ end=+'+ contains=muttrcSimplePat,muttrcUnHighlightSpace,muttrcSimplePatMetas
+syntax region muttrcPattern contained keepend skipwhite start=+[~](+ end=+)+ skip=+\\)+ contains=muttrcSimplePat
+syntax match muttrcPattern contained skipwhite /[~][A-Za-z]/ contains=muttrcSimplePat
+syntax match muttrcPattern contained skipwhite /[.]/
+syntax region muttrcPatternInner contained keepend start=+"[~=%!(^]+ms=s+1 skip=+\\"+ end=+"+me=e-1 contains=muttrcSimplePat,muttrcUnHighlightSpace,muttrcSimplePatMetas
+syntax region muttrcPatternInner contained keepend start=+'[~=%!(^]+ms=s+1 skip=+\\'+ end=+'+me=e-1 contains=muttrcSimplePat,muttrcUnHighlightSpace,muttrcSimplePatMetas
+
+" Colour definitions takes object, foreground and background arguments (regexps excluded).
+syntax match muttrcColorMatchCount	contained "[0-9]\+"
+syntax match muttrcColorMatchCountNL contained skipwhite skipnl "\s*\\$" nextgroup=muttrcColorMatchCount,muttrcColorMatchCountNL
+syntax region muttrcColorRXPat	contained start=+\s*'+ skip=+\\'+ end=+'\s*+ keepend skipwhite contains=muttrcRXString2 nextgroup=muttrcColorMatchCount,muttrcColorMatchCountNL
+syntax region muttrcColorRXPat	contained start=+\s*"+ skip=+\\"+ end=+"\s*+ keepend skipwhite contains=muttrcRXString2 nextgroup=muttrcColorMatchCount,muttrcColorMatchCountNL
+syntax keyword muttrcColor	contained black blue cyan default green magenta red white yellow
+syntax keyword muttrcColor	contained brightblack brightblue brightcyan brightdefault brightgreen brightmagenta brightred brightwhite brightyellow
+syntax match   muttrcColor	contained "\<\%(bright\)\=color\d\{1,3}\>"
+" Now for the structure of the color line
+syntax match muttrcColorRXNL	contained skipnl "\s*\\$" nextgroup=muttrcColorRXPat,muttrcColorRXNL
+syntax match muttrcColorBG	contained /\s*[$]\?\w\+/ contains=muttrcColor,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcColorRXPat,muttrcColorRXNL
+syntax match muttrcColorBGNL	contained skipnl "\s*\\$" nextgroup=muttrcColorBG,muttrcColorBGNL
+syntax match muttrcColorFG	contained /\s*[$]\?\w\+/ contains=muttrcColor,muttrcVariable,muttrcUnHighlightSpace nextgroup=muttrcColorBG,muttrcColorBGNL
+syntax match muttrcColorFGNL	contained skipnl "\s*\\$" nextgroup=muttrcColorFG,muttrcColorFGNL
+syntax match muttrcColorContext	contained /\s*[$]\?\w\+/ contains=muttrcColorField,muttrcVariable,muttrcUnHighlightSpace,muttrcColorCompose nextgroup=muttrcColorFG,muttrcColorFGNL
+syntax match muttrcColorNL	contained skipnl "\s*\\$" nextgroup=muttrcColorContext,muttrcColorNL,muttrcColorCompose
+syntax match muttrcColorKeyword	contained /^\s*color\s\+/ nextgroup=muttrcColorContext,muttrcColorNL,muttrcColorCompose
+" And now color's brother:
+syntax region muttrcUnColorPatterns contained skipwhite start=+\s*'+ end=+'+ skip=+\\'+ contains=muttrcPattern nextgroup=muttrcUnColorPatterns,muttrcUnColorPatNL
+syntax region muttrcUnColorPatterns contained skipwhite start=+\s*"+ end=+"+ skip=+\\"+ contains=muttrcPattern nextgroup=muttrcUnColorPatterns,muttrcUnColorPatNL
+syntax match muttrcUnColorPatterns contained skipwhite /\s*[^'"\s]\S\*/ contains=muttrcPattern nextgroup=muttrcUnColorPatterns,muttrcUnColorPatNL
+syntax match muttrcUnColorPatNL	contained skipwhite skipnl /\s*\\$/ nextgroup=muttrcUnColorPatterns,muttrcUnColorPatNL
+syntax match muttrcUnColorAll	contained skipwhite /[*]/
+syntax match muttrcUnColorAPNL	contained skipwhite skipnl /\s*\\$/ nextgroup=muttrcUnColorPatterns,muttrcUnColorAll,muttrcUnColorAPNL
+syntax match muttrcUnColorIndex	contained skipwhite /\s*index\s\+/ nextgroup=muttrcUnColorPatterns,muttrcUnColorAll,muttrcUnColorAPNL
+syntax match muttrcUnColorIndexNL	contained skipwhite skipnl /\s*\\$/ nextgroup=muttrcUnColorIndex,muttrcUnColorIndexNL
+syntax match muttrcUnColorKeyword	contained skipwhite /^\s*uncolor\s\+/ nextgroup=muttrcUnColorIndex,muttrcUnColorIndexNL
+syntax region muttrcUnColorLine keepend start=+^\s*uncolor\s+ skip=+\\$+ end=+$+ contains=muttrcUnColorKeyword,muttrcComment,muttrcUnHighlightSpace
+
+syntax keyword muttrcMonoAttrib	contained bold none normal reverse standout underline
+syntax keyword muttrcMono	contained mono		skipwhite nextgroup=muttrcColorField,muttrcColorCompose
+syntax match   muttrcMonoLine	"^\s*mono\s\+\S\+"	skipwhite nextgroup=muttrcMonoAttrib contains=muttrcMono
+
+" CHECKED 2020-06-21
+" List of fields in Fields in color.c
+syntax keyword muttrcColorField skipwhite contained
+	\ attachment attach_headers body bold error hdrdefault header index index_author
+	\ index_collapsed index_date index_flags index_label index_number index_size index_subject
+	\ index_tag index_tags indicator markers message normal options progress prompt quoted
+	\ search sidebar_divider sidebar_flagged sidebar_highlight sidebar_indicator sidebar_new
+	\ sidebar_ordinary sidebar_spoolfile sidebar_unread signature status tilde tree underline
+	\ warning nextgroup=muttrcColor
+
+syntax match   muttrcColorField	contained "\<quoted\d\=\>"
+
+syntax match muttrcColorCompose skipwhite contained /\s*compose\s*/ nextgroup=muttrcColorComposeField
+
+" CHECKED 2020-06-21
+" List of fields in ComposeFields in color.c
+syntax keyword muttrcColorComposeField skipwhite contained
+	\ header security_both security_encrypt security_none security_sign
+	\ nextgroup=muttrcColorFG,muttrcColorFGNL
+syntax region muttrcColorLine keepend start=/^\s*color\s\+/ skip=+\\$+ end=+$+ contains=muttrcColorKeyword,muttrcComment,muttrcUnHighlightSpace
+
+function! s:boolQuadGen(type, vars, deprecated)
+	let l:novars = copy(a:vars)
+	call map(l:novars, '"no" . v:val')
+	let l:invvars = copy(a:vars)
+	call map(l:invvars, '"inv" . v:val')
+
+	let l:orig_type = copy(a:type)
+	if a:deprecated
+		let l:type = 'Deprecated' . a:type
+		exec 'syntax keyword muttrcVar' . l:type . ' ' . join(a:vars)
+		exec 'syntax keyword muttrcVar' . l:type . ' ' . join(l:novars)
+		exec 'syntax keyword muttrcVar' . l:type . ' ' . join(l:invvars)
+	else
+		let l:type = a:type
+		exec 'syntax keyword muttrcVar' . l:type . ' skipwhite contained ' . join(a:vars) . ' nextgroup=muttrcSet' . l:orig_type . 'Assignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr'
+		exec 'syntax keyword muttrcVar' . l:type . ' skipwhite contained ' . join(l:novars) . ' nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr'
+		exec 'syntax keyword muttrcVar' . l:type . ' skipwhite contained ' . join(l:invvars) . ' nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr'
+	endif
+
+endfunction
+
+" CHECKED 2020-06-21
+" List of DT_BOOL in MuttVars in mutt_config.c
+call s:boolQuadGen('Bool', [
+	\ 'abort_backspace', 'allow_8bit', 'allow_ansi', 'arrow_cursor', 'ascii_chars', 'askbcc',
+	\ 'askcc', 'ask_follow_up', 'ask_x_comment_to', 'attach_save_without_prompting',
+	\ 'attach_split', 'autocrypt', 'autocrypt_reply', 'autoedit', 'auto_subscribe', 'auto_tag',
+	\ 'beep', 'beep_new', 'bounce_delivered', 'braille_friendly',
+	\ 'browser_abbreviate_mailboxes', 'change_folder_next', 'check_mbox_size', 'check_new',
+	\ 'collapse_all', 'collapse_flagged', 'collapse_unread', 'confirmappend', 'confirmcreate',
+	\ 'crypt_autoencrypt', 'crypt_autopgp', 'crypt_autosign', 'crypt_autosmime',
+	\ 'crypt_confirmhook', 'crypt_opportunistic_encrypt',
+	\ 'crypt_opportunistic_encrypt_strong_keys', 'crypt_protected_headers_read',
+	\ 'crypt_protected_headers_save', 'crypt_protected_headers_write', 'crypt_replyencrypt',
+	\ 'crypt_replysign', 'crypt_replysignencrypted', 'crypt_timestamp', 'crypt_use_gpgme',
+	\ 'crypt_use_pka', 'delete_untag', 'digest_collapse', 'duplicate_threads', 'edit_headers',
+	\ 'encode_from', 'fast_reply', 'fcc_before_send', 'fcc_clear', 'flag_safe', 'followup_to',
+	\ 'force_name', 'forward_decode', 'forward_decrypt', 'forward_quote', 'forward_references',
+	\ 'hdrs', 'header', 'header_color_partial', 'help', 'hidden_host', 'hide_limited',
+	\ 'hide_missing', 'hide_thread_subject', 'hide_top_limited', 'hide_top_missing',
+	\ 'history_remove_dups', 'honor_disposition', 'idn_decode', 'idn_encode',
+	\ 'ignore_list_reply_to', 'imap_check_subscribed', 'imap_condstore', 'imap_deflate',
+	\ 'imap_idle', 'imap_list_subscribed', 'imap_passive', 'imap_peek', 'imap_qresync',
+	\ 'imap_rfc5161', 'imap_servernoise', 'implicit_autoview', 'include_encrypted',
+	\ 'include_onlyfirst', 'keep_flagged', 'mailcap_sanitize', 'maildir_check_cur',
+	\ 'maildir_header_cache_verify', 'maildir_trash', 'mail_check_recent', 'mail_check_stats',
+	\ 'markers', 'mark_old', 'menu_move_off', 'menu_scroll', 'message_cache_clean', 'meta_key',
+	\ 'metoo', 'mh_purge', 'mime_forward_decode', 'mime_subject', 'mime_type_query_first',
+	\ 'narrow_tree', 'nm_record', 'nntp_listgroup', 'nntp_load_description', 'pager_stop',
+	\ 'pgp_autoinline', 'pgp_auto_decode', 'pgp_check_exit', 'pgp_check_gpg_decrypt_status_fd',
+	\ 'pgp_ignore_subkeys', 'pgp_long_ids', 'pgp_replyinline', 'pgp_retainable_sigs',
+	\ 'pgp_self_encrypt', 'pgp_show_unusable', 'pgp_strict_enc', 'pgp_use_gpg_agent',
+	\ 'pipe_decode', 'pipe_split', 'pop_auth_try_all', 'pop_last', 'postpone_encrypt',
+	\ 'print_decode', 'print_split', 'prompt_after', 'read_only', 'reflow_space_quotes',
+	\ 'reflow_text', 'reply_self', 'reply_with_xorig', 'resolve', 'resume_draft_files',
+	\ 'resume_edited_draft_files', 'reverse_alias', 'reverse_name', 'reverse_realname',
+	\ 'rfc2047_parameters', 'save_address', 'save_empty', 'save_name', 'save_unsubscribed',
+	\ 'score', 'show_new_news', 'show_only_unread', 'sidebar_folder_indent',
+	\ 'sidebar_new_mail_only', 'sidebar_next_new_wrap', 'sidebar_non_empty_mailbox_only',
+	\ 'sidebar_on_right', 'sidebar_short_path', 'sidebar_visible', 'sig_dashes', 'sig_on_top',
+	\ 'size_show_bytes', 'size_show_fractions', 'size_show_mb', 'size_units_on_left',
+	\ 'smart_wrap', 'smime_ask_cert_label', 'smime_decrypt_use_default_key', 'smime_is_default',
+	\ 'smime_self_encrypt', 'sort_re', 'ssl_force_tls', 'ssl_usesystemcerts', 'ssl_use_sslv2',
+	\ 'ssl_use_sslv3', 'ssl_use_tlsv1', 'ssl_use_tlsv1_1', 'ssl_use_tlsv1_2', 'ssl_use_tlsv1_3',
+	\ 'ssl_verify_dates', 'ssl_verify_host', 'ssl_verify_partial_chains', 'status_on_top',
+	\ 'strict_threads', 'suspend', 'text_flowed', 'thorough_search', 'thread_received', 'tilde',
+	\ 'ts_enabled', 'uncollapse_jump', 'uncollapse_new', 'user_agent', 'use_8bitmime',
+	\ 'use_domain', 'use_envelope_from', 'use_from', 'use_ipv6', 'virtual_spoolfile',
+	\ 'wait_key', 'weed', 'wrap_search', 'write_bcc', 'x_comment_to'
+	\ ], 0)
+
+" CHECKED 2020-06-21
+" Deprecated Bools
+" List of DT_SYNONYM or DT_DEPRECATED Bools in MuttVars in mutt_config.c
+call s:boolQuadGen('Bool', [
+	\ 'edit_hdrs', 'envelope_from', 'forw_decode', 'forw_decrypt', 'forw_quote',
+	\ 'header_cache_compress', 'ignore_linear_white_space', 'pgp_autoencrypt', 'pgp_autosign',
+	\ 'pgp_auto_traditional', 'pgp_create_traditional', 'pgp_replyencrypt', 'pgp_replysign',
+	\ 'pgp_replysignencrypted', 'xterm_set_titles'
+	\ ], 1)
+
+" CHECKED 2020-06-21
+" List of DT_QUAD in MuttVars in mutt_config.c
+call s:boolQuadGen('Quad', [
+	\ 'abort_noattach', 'abort_nosubject', 'abort_unmodified', 'bounce', 'catchup_newsgroup',
+	\ 'copy', 'crypt_verify_sig', 'delete', 'fcc_attach', 'followup_to_poster',
+	\ 'forward_attachments', 'forward_edit', 'honor_followup_to', 'include', 'mime_forward',
+	\ 'mime_forward_rest', 'move', 'pgp_mime_auto', 'pop_delete', 'pop_reconnect', 'postpone',
+	\ 'post_moderated', 'print', 'quit', 'recall', 'reply_to', 'ssl_starttls', 
+	\ ], 0)
+
+" CHECKED 2020-06-21
+" Deprecated Quads
+" List of DT_SYNONYM or DT_DEPRECATED Quads in MuttVars in mutt_config.c
+call s:boolQuadGen('Quad', [
+	\ 'mime_fwd', 'pgp_encrypt_self', 'pgp_verify_sig', 'smime_encrypt_self'
+	\ ], 1)
+
+" CHECKED 2020-06-21
+" List of DT_NUMBER or DT_LONG in MuttVars in mutt_config.c
+syntax keyword muttrcVarNum	skipwhite contained
+	\ connect_timeout debug_level header_cache_compress_level history
+	\ imap_fetch_chunk_size imap_keepalive imap_pipeline_depth imap_poll_timeout mail_check
+	\ mail_check_stats_interval menu_context net_inc nm_db_limit nm_open_timeout
+	\ nm_query_window_current_position nm_query_window_duration nntp_context nntp_poll
+	\ pager_context pager_index_lines pgp_timeout pop_checkinterval read_inc reflow_wrap
+	\ save_history score_threshold_delete score_threshold_flag score_threshold_read
+	\ search_context sendmail_wait sidebar_component_depth sidebar_width skip_quoted_offset
+	\ sleep_time smime_timeout ssl_min_dh_prime_bits timeout time_inc toggle_quoted_show_levels
+	\ wrap wrap_headers write_inc
+	\ nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax keyword muttrcVarDeprecatedNum	contained skipwhite
+	\ header_cache_pagesize wrapmargin
+	\ nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+" CHECKED 2020-06-21
+" List of DT_STRING in MuttVars in mutt_config.c
+" Special cases first, and all the rest at the end
+" Formats themselves must be updated in their respective groups
+" See s:escapesConditionals
+syntax match muttrcVarStr	contained skipwhite 'my_[a-zA-Z0-9_]\+' nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax keyword muttrcVarStr	contained skipwhite alias_format nextgroup=muttrcVarEqualsAliasFmt
+syntax keyword muttrcVarStr	contained skipwhite attach_format nextgroup=muttrcVarEqualsAttachFmt
+syntax keyword muttrcVarStr	contained skipwhite compose_format nextgroup=muttrcVarEqualsComposeFmt
+syntax keyword muttrcVarStr	contained skipwhite folder_format vfolder_format nextgroup=muttrcVarEqualsFolderFmt
+syntax keyword muttrcVarStr	contained skipwhite attribution forward_format index_format message_format pager_format nextgroup=muttrcVarEqualsIdxFmt
+syntax keyword muttrcVarStr	contained skipwhite mix_entry_format nextgroup=muttrcVarEqualsMixFmt
+syntax keyword muttrcVarStr	contained skipwhite
+	\ pgp_clearsign_command pgp_decode_command pgp_decrypt_command
+	\ pgp_encrypt_only_command pgp_encrypt_sign_command pgp_export_command pgp_getkeys_command
+	\ pgp_import_command pgp_list_pubring_command pgp_list_secring_command
+	\ pgp_sign_command pgp_verify_command pgp_verify_key_command
+	\ nextgroup=muttrcVarEqualsPGPCmdFmt
+syntax keyword muttrcVarStr	contained skipwhite pgp_entry_format nextgroup=muttrcVarEqualsPGPFmt
+syntax keyword muttrcVarStr	contained skipwhite query_format nextgroup=muttrcVarEqualsQueryFmt
+syntax keyword muttrcVarStr	contained skipwhite
+	\ smime_decrypt_command smime_encrypt_command smime_get_cert_command
+	\ smime_get_cert_email_command smime_get_signer_cert_command
+	\ smime_import_cert_command smime_pk7out_command smime_sign_command
+	\ smime_verify_command smime_verify_opaque_command
+	\ nextgroup=muttrcVarEqualsSmimeFmt
+syntax keyword muttrcVarStr	contained skipwhite status_format ts_icon_format ts_status_format nextgroup=muttrcVarEqualsStatusFmt
+syntax keyword muttrcVarStr	contained skipwhite date_format nextgroup=muttrcVarEqualsStrftimeFmt
+syntax keyword muttrcVarStr	contained skipwhite group_index_format nextgroup=muttrcVarEqualsGrpIdxFmt
+syntax keyword muttrcVarStr	contained skipwhite sidebar_format nextgroup=muttrcVarEqualsSdbFmt
+syntax keyword muttrcVarStr	contained skipwhite
+	\ abort_key arrow_string assumed_charset attach_charset attach_sep attribution_locale
+	\ autocrypt_acct_format charset config_charset content_type crypt_protected_headers_subject
+	\ default_hook dsn_notify dsn_return empty_subject escape forward_attribution_intro
+	\ forward_attribution_trailer header_cache_backend header_cache_compress_method hidden_tags
+	\ hostname imap_authenticators imap_delim_chars imap_headers imap_login imap_pass imap_user
+	\ indent_string mailcap_path mark_macro_prefix mh_seq_flagged mh_seq_replied mh_seq_unseen
+	\ newsgroups_charset news_server nm_default_url nm_exclude_tags nm_flagged_tag nm_query_type
+	\ nm_query_window_current_search nm_query_window_timebase nm_record_tags nm_replied_tag
+	\ nm_unread_tag nntp_authenticators nntp_pass nntp_user pgp_default_key pgp_sign_as pipe_sep
+	\ pop_authenticators pop_host pop_pass pop_user postpone_encrypt_as post_indent_string
+	\ preconnect preferred_languages realname send_charset show_multipart_alternative
+	\ sidebar_delim_chars sidebar_divider_char sidebar_indent_string simple_search
+	\ smime_default_key smime_encrypt_with smime_sign_as smime_sign_digest_alg
+	\ smtp_authenticators smtp_pass smtp_url smtp_user spam_separator ssl_ciphers
+	\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+" Deprecated strings
+syntax keyword muttrcVarDeprecatedStr
+	\ abort_noattach_regexp attach_keyword forw_format hdr_format indent_str msg_format
+	\ nm_default_uri pgp_self_encrypt_as post_indent_str print_cmd quote_regexp reply_regexp
+	\ smime_self_encrypt_as xterm_icon xterm_title
+
+" CHECKED 2020-06-21
+" List of DT_ADDRESS
+syntax keyword muttrcVarStr	contained skipwhite envelope_from_address from nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+" List of DT_ENUM
+syntax keyword muttrcVarStr	contained skipwhite mbox_type nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+" List of DT_MBTABLE
+syntax keyword muttrcVarStr	contained skipwhite crypt_chars flag_chars from_chars status_chars to_chars nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+" CHECKED 2020-06-21
+" List of DT_PATH
+syntax keyword muttrcVarStr	contained skipwhite
+	\ alias_file attach_save_dir autocrypt_dir certificate_file debug_file
+	\ entropy_file folder header_cache history_file mbox message_cachedir newsrc
+	\ news_cache_dir postponed record signature smime_ca_location
+	\ smime_certificates smime_keys spoolfile ssl_ca_certificates_file
+	\ ssl_client_cert tmpdir trash
+	\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+" List of DT_COMMAND (excluding pgp_*_command and smime_*_command)
+syntax keyword muttrcVarStr	contained skipwhite
+	\ display_filter editor inews ispell mixmaster new_mail_command pager
+	\ print_command query_command sendmail shell visual external_search_command
+	\ imap_oauth_refresh_command pop_oauth_refresh_command
+	\ mime_type_query_command smtp_oauth_refresh_command tunnel
+	\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+" CHECKED 2020-06-21
+" List of DT_REGEX
+syntax keyword muttrcVarStr	contained skipwhite
+	\ abort_noattach_regex gecos_mask mask pgp_decryption_okay pgp_good_sign
+	\ quote_regex reply_regex smileys
+	\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+" List of DT_SORT
+syntax keyword muttrcVarStr	contained skipwhite
+	\ pgp_sort_keys sidebar_sort_method sort sort_alias sort_aux sort_browser
+	\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+
+" CHECKED 2020-06-21
+" List of commands in Commands in mutt_config.c
+" Remember to remove hooks, they have already been dealt with
+syntax keyword muttrcCommand	skipwhite alias nextgroup=muttrcAliasGroupDef,muttrcAliasKey,muttrcAliasNL
+syntax keyword muttrcCommand	skipwhite bind nextgroup=muttrcBindMenuList,muttrcBindMenuListNL
+syntax keyword muttrcCommand	skipwhite exec nextgroup=muttrcFunction
+syntax keyword muttrcCommand	skipwhite macro nextgroup=muttrcMacroMenuList,muttrcMacroMenuListNL
+syntax keyword muttrcCommand	skipwhite nospam nextgroup=muttrcNoSpamPattern
+syntax keyword muttrcCommand	skipwhite set unset reset toggle nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syntax keyword muttrcCommand	skipwhite spam nextgroup=muttrcSpamPattern
+syntax keyword muttrcCommand	skipwhite unalias nextgroup=muttrcUnAliasKey,muttrcUnAliasNL
+syntax keyword muttrcCommand	skipwhite unhook nextgroup=muttrcHooks
+syntax keyword muttrcCommand	skipwhite
+	\ alternative_order attachments auto_view finish hdr_order ifdef ifndef
+	\ ignore lua lua-source mailboxes mailto_allow mime_lookup my_hdr push score
+	\ setenv sidebar_whitelist source subjectrx subscribe-to tag-formats
+	\ tag-transforms unalternative_order unattachments unauto_view uncolor
+	\ unhdr_order unignore unmailboxes unmailto_allow unmime_lookup unmono
+	\ unmy_hdr unscore unsetenv unsidebar_whitelist unsubjectrx unsubscribe-from
+	\ unvirtual-mailboxes virtual-mailboxes named-mailboxes
+	\ echo unbind unmacro
+
+function! s:genFunctions(functions)
+	for f in a:functions
+		exec 'syntax match muttrcFunction contained "\<' . l:f . '\>"'
+	endfor
+endfunction
+
+" CHECKED 2020-06-21
+" List of functions in functions.c
+" Note: 'noop' is included but is elsewhere in the source
+call s:genFunctions(['noop',
+	\ 'accept', 'append', 'attach-file', 'attach-key', 'attach-message', 'attach-news-message',
+	\ 'autocrypt-acct-menu', 'autocrypt-menu', 'backspace', 'backward-char', 'backward-word',
+	\ 'bol', 'bottom-page', 'bottom', 'bounce-message', 'break-thread', 'buffy-cycle',
+	\ 'buffy-list', 'capitalize-word', 'catchup', 'chain-next', 'chain-prev', 'change-dir',
+	\ 'change-folder-readonly', 'change-folder', 'change-newsgroup-readonly',
+	\ 'change-newsgroup', 'change-vfolder', 'check-new', 'check-stats',
+	\ 'check-traditional-pgp', 'clear-flag', 'collapse-all', 'collapse-parts',
+	\ 'collapse-thread', 'complete-query', 'complete', 'compose-to-sender', 'copy-file',
+	\ 'copy-message', 'create-account', 'create-alias', 'create-mailbox', 'current-bottom',
+	\ 'current-middle', 'current-top', 'decode-copy', 'decode-save', 'decrypt-copy',
+	\ 'decrypt-save', 'delete-account', 'delete-char', 'delete-entry', 'delete-mailbox',
+	\ 'delete-message', 'delete-pattern', 'delete-subthread', 'delete-thread', 'delete',
+	\ 'descend-directory', 'detach-file', 'display-address', 'display-filename',
+	\ 'display-message', 'display-toggle-weed', 'downcase-word', 'edit-bcc', 'edit-cc',
+	\ 'edit-description', 'edit-encoding', 'edit-fcc', 'edit-file', 'edit-followup-to',
+	\ 'edit-from', 'edit-headers', 'edit-label', 'edit-language', 'edit-message', 'edit-mime',
+	\ 'edit-newsgroups', 'edit-or-view-raw-message', 'edit-raw-message', 'edit-reply-to',
+	\ 'edit-subject', 'edit-to', 'edit-type', 'edit-x-comment-to', 'edit', 'end-cond',
+	\ 'enter-command', 'enter-mask', 'entire-thread', 'eol', 'exit', 'extract-keys',
+	\ 'fetch-mail', 'filter-entry', 'first-entry', 'flag-message', 'followup-message',
+	\ 'forget-passphrase', 'forward-char', 'forward-message', 'forward-to-group',
+	\ 'forward-word', 'get-attachment', 'get-children', 'get-message', 'get-parent',
+	\ 'goto-folder', 'goto-parent', 'group-alternatives', 'group-chat-reply',
+	\ 'group-multilingual', 'group-reply', 'half-down', 'half-up', 'help', 'history-down',
+	\ 'history-search', 'history-up', 'imap-fetch-mail', 'imap-logout-all', 'insert', 'ispell',
+	\ 'jump', 'kill-eol', 'kill-eow', 'kill-line', 'kill-word', 'last-entry',
+	\ 'limit-current-thread', 'limit', 'link-threads', 'list-reply', 'mail-key',
+	\ 'mailbox-cycle', 'mailbox-list', 'mail', 'mark-as-new', 'mark-message', 'middle-page',
+	\ 'mix', 'modify-labels-then-hide', 'modify-labels', 'modify-tags-then-hide',
+	\ 'modify-tags', 'move-down', 'move-up', 'new-mime', 'next-entry', 'next-line',
+	\ 'next-new-then-unread', 'next-new', 'next-page', 'next-subthread', 'next-thread',
+	\ 'next-undeleted', 'next-unread-mailbox', 'next-unread', 'parent-message', 'pgp-menu',
+	\ 'pipe-entry', 'pipe-message', 'post-message', 'postpone-message', 'previous-entry',
+	\ 'previous-line', 'previous-new-then-unread', 'previous-new', 'previous-page',
+	\ 'previous-subthread', 'previous-thread', 'previous-undeleted', 'previous-unread',
+	\ 'print-entry', 'print-message', 'purge-message', 'purge-thread', 'quasi-delete',
+	\ 'query-append', 'query', 'quit', 'quote-char', 'read-subthread', 'read-thread',
+	\ 'recall-message', 'reconstruct-thread', 'redraw-screen', 'refresh', 'reload-active',
+	\ 'rename-attachment', 'rename-file', 'rename-mailbox', 'reply', 'resend-message',
+	\ 'root-message', 'save-entry', 'save-message', 'search-next', 'search-opposite',
+	\ 'search-reverse', 'search-toggle', 'search', 'select-entry', 'select-new',
+	\ 'send-message', 'set-flag', 'shell-escape', 'show-limit', 'show-log-messages',
+	\ 'show-version', 'sidebar-next-new', 'sidebar-first', 'sidebar-last', 'sidebar-next',
+	\ 'sidebar-open', 'sidebar-page-down', 'sidebar-page-up', 'sidebar-prev-new',
+	\ 'sidebar-prev', 'sidebar-toggle-virtual', 'sidebar-toggle-visible', 'skip-quoted',
+	\ 'smime-menu', 'sort-mailbox', 'sort-reverse', 'sort', 'subscribe-pattern',
+	\ 'sync-mailbox', 'tag-entry', 'tag-message', 'tag-pattern', 'tag-prefix-cond',
+	\ 'tag-prefix', 'tag-subthread', 'tag-thread', 'toggle-active', 'toggle-disposition',
+	\ 'toggle-mailboxes', 'toggle-new', 'toggle-prefer-encrypt', 'toggle-quoted',
+	\ 'toggle-read', 'toggle-recode', 'toggle-subscribed', 'toggle-unlink', 'toggle-write',
+	\ 'top-page', 'top', 'transpose-chars', 'uncatchup', 'undelete-entry', 'undelete-message',
+	\ 'undelete-pattern', 'undelete-subthread', 'undelete-thread', 'unsubscribe-pattern',
+	\ 'untag-pattern', 'upcase-word', 'update-encoding', 'verify-key',
+	\ 'vfolder-from-query-readonly', 'vfolder-from-query', 'vfolder-window-backward',
+	\ 'vfolder-window-forward', 'view-attachments', 'view-attach', 'view-file', 'view-mailcap',
+	\ 'view-name', 'view-raw-message', 'view-text', 'what-key', 'write-fcc'
+	\ ])
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+highlight def link muttrcSetBoolAssignment		Boolean
+highlight def link muttrcSetQuadAssignment		Boolean
+
+highlight def link muttrcComment			Comment
+
+highlight def link muttrcAlternatesLine			Error
+highlight def link muttrcBadAction			Error
+highlight def link muttrcBindFunction			Error
+highlight def link muttrcBindMenuList			Error
+highlight def link muttrcColorBG			Error
+highlight def link muttrcColorBGH			Error
+highlight def link muttrcColorBGI			Error
+highlight def link muttrcColorContext			Error
+highlight def link muttrcColorFG			Error
+highlight def link muttrcColorFGH			Error
+highlight def link muttrcColorFGI			Error
+highlight def link muttrcColorLine			Error
+highlight def link muttrcFormatErrors			Error
+highlight def link muttrcGroupLine			Error
+highlight def link muttrcListsLine			Error
+highlight def link muttrcPattern			Error
+highlight def link muttrcSubscribeLine			Error
+highlight def link muttrcUnColorLine			Error
+highlight def link muttrcVarDeprecatedBool		Error
+highlight def link muttrcVarDeprecatedQuad		Error
+highlight def link muttrcVarDeprecatedStr		Error
+
+highlight def link muttrcAliasEncEmail			Identifier
+highlight def link muttrcAliasKey			Identifier
+highlight def link muttrcColorCompose			Identifier
+highlight def link muttrcColorComposeField		Identifier
+highlight def link muttrcColorContextH			Identifier
+highlight def link muttrcColorContextI			Identifier
+highlight def link muttrcColorField			Identifier
+highlight def link muttrcMenu				Identifier
+highlight def link muttrcSimplePat			Identifier
+highlight def link muttrcUnAliasKey			Identifier
+highlight def link muttrcUnColorIndex			Identifier
+highlight def link muttrcVarBool			Identifier
+highlight def link muttrcVarNum				Identifier
+highlight def link muttrcVarQuad			Identifier
+highlight def link muttrcVarStr				Identifier
+
+highlight def link muttrcCommand			Keyword
+
+highlight def link muttrcAction				Macro
+highlight def link muttrcAliasGroupName			Macro
+highlight def link muttrcFunction			Macro
+highlight def link muttrcGroupDef			Macro
+highlight def link muttrcSimplePatString		Macro
+
+highlight def link muttrcMonoAttrib			muttrcColor
+
+highlight def link muttrcAlternateKeyword		muttrcCommand
+highlight def link muttrcAttachmentsLine		muttrcCommand
+highlight def link muttrcColorKeyword			muttrcCommand
+highlight def link muttrcGroupKeyword			muttrcCommand
+highlight def link muttrcListsKeyword			muttrcCommand
+highlight def link muttrcMono				muttrcCommand
+highlight def link muttrcPatHooks			muttrcCommand
+highlight def link muttrcRXHooks			muttrcCommand
+highlight def link muttrcSubscribeKeyword		muttrcCommand
+highlight def link muttrcUnColorKeyword			muttrcCommand
+
+highlight def link muttrcAliasFormatEscapes		muttrcEscape
+highlight def link muttrcAttachFormatEscapes		muttrcEscape
+highlight def link muttrcComposeFormatEscapes		muttrcEscape
+highlight def link muttrcFolderFormatEscapes		muttrcEscape
+highlight def link muttrcGroupIndexFormatEscapes	muttrcEscape
+highlight def link muttrcIndexFormatEscapes		muttrcEscape
+highlight def link muttrcMixFormatEscapes		muttrcEscape
+highlight def link muttrcPGPCmdFormatEscapes		muttrcEscape
+highlight def link muttrcPGPFormatEscapes		muttrcEscape
+highlight def link muttrcPGPTimeEscapes			muttrcEscape
+highlight def link muttrcQueryFormatEscapes		muttrcEscape
+highlight def link muttrcShellString			muttrcEscape
+highlight def link muttrcSidebarFormatEscapes		muttrcEscape
+highlight def link muttrcSmimeFormatEscapes		muttrcEscape
+highlight def link muttrcStatusFormatEscapes		muttrcEscape
+highlight def link muttrcTimeEscapes			muttrcEscape
+
+highlight def link muttrcAliasFormatConditionals	muttrcFormatConditionals2
+highlight def link muttrcAttachFormatConditionals	muttrcFormatConditionals2
+highlight def link muttrcComposeFormatConditionals	muttrcFormatConditionals2
+highlight def link muttrcFolderFormatConditionals	muttrcFormatConditionals2
+highlight def link muttrcIndexFormatConditionals	muttrcFormatConditionals2
+highlight def link muttrcMixFormatConditionals		muttrcFormatConditionals2
+highlight def link muttrcPGPCmdFormatConditionals	muttrcFormatConditionals2
+highlight def link muttrcPGPFormatConditionals		muttrcFormatConditionals2
+highlight def link muttrcSmimeFormatConditionals	muttrcFormatConditionals2
+highlight def link muttrcStatusFormatConditionals	muttrcFormatConditionals2
+
+highlight def link muttrcAddrDef			muttrcGroupFlag
+highlight def link muttrcRXDef				muttrcGroupFlag
+
+highlight def link muttrcAliasFormatStr			muttrcString
+highlight def link muttrcAttachFormatStr		muttrcString
+highlight def link muttrcComposeFormatStr		muttrcString
+highlight def link muttrcFolderFormatStr		muttrcString
+highlight def link muttrcGroupIndexFormatStr            muttrcString
+highlight def link muttrcIndexFormatStr			muttrcString
+highlight def link muttrcMixFormatStr			muttrcString
+highlight def link muttrcPGPCmdFormatStr		muttrcString
+highlight def link muttrcPGPFormatStr			muttrcString
+highlight def link muttrcQueryFormatStr			muttrcString
+highlight def link muttrcSidebarFormatStr		muttrcString
+highlight def link muttrcSmimeFormatStr			muttrcString
+highlight def link muttrcStatusFormatStr		muttrcString
+highlight def link muttrcStrftimeFormatStr		muttrcString
+
+highlight def link muttrcSetNumAssignment		Number
+
+highlight def link muttrcEmail				Special
+highlight def link muttrcSimplePatMetas			Special
+highlight def link muttrcSpecial			Special
+highlight def link muttrcVariableInner			Special
+
+highlight def link muttrcAliasEncEmailNL		SpecialChar
+highlight def link muttrcAliasENNL			SpecialChar
+highlight def link muttrcAliasGroupDefNL		SpecialChar
+highlight def link muttrcAliasNameNL			SpecialChar
+highlight def link muttrcAliasNL			SpecialChar
+highlight def link muttrcBindFunctionNL			SpecialChar
+highlight def link muttrcBindKeyNL			SpecialChar
+highlight def link muttrcBindMenuListNL			SpecialChar
+highlight def link muttrcColorBGNL			SpecialChar
+highlight def link muttrcColorFGNL			SpecialChar
+highlight def link muttrcColorMatchCountNL		SpecialChar
+highlight def link muttrcColorNL			SpecialChar
+highlight def link muttrcColorRXNL			SpecialChar
+highlight def link muttrcEscape				SpecialChar
+highlight def link muttrcKeyName			SpecialChar
+highlight def link muttrcKeySpecial			SpecialChar
+highlight def link muttrcMacroBodyNL			SpecialChar
+highlight def link muttrcMacroDescrNL			SpecialChar
+highlight def link muttrcMacroKeyNL			SpecialChar
+highlight def link muttrcMacroMenuListNL		SpecialChar
+highlight def link muttrcPatternNL			SpecialChar
+highlight def link muttrcRXChars			SpecialChar
+highlight def link muttrcStringNL			SpecialChar
+highlight def link muttrcUnAliasNL			SpecialChar
+highlight def link muttrcUnColorAPNL			SpecialChar
+highlight def link muttrcUnColorIndexNL			SpecialChar
+highlight def link muttrcUnColorPatNL			SpecialChar
+
+highlight def link muttrcAttachmentsMimeType		String
+highlight def link muttrcEscapedVariable		String
+highlight def link muttrcMacroDescr			String
+highlight def link muttrcRXPat				String
+highlight def link muttrcRXString			String
+highlight def link muttrcRXString2			String
+highlight def link muttrcSetStrAssignment		String
+highlight def link muttrcString				String
+
+highlight def link muttrcAliasParens			Type
+highlight def link muttrcAttachmentsFlag		Type
+highlight def link muttrcColor				Type
+highlight def link muttrcFormatConditionals2		Type
+highlight def link muttrcGroupFlag			Type
+highlight def link muttrcHeader				Type
+highlight def link muttrcHooks				Type
+highlight def link muttrcKey				Type
+highlight def link muttrcPatHookNot			Type
+highlight def link muttrcRXHookNot			Type
+highlight def link muttrcStrftimeEscapes		Type
+
+let b:current_syntax = "neomuttrc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8 noet tw=100 sw=8 sts=0 ft=vim isk+=-
+
+endif
diff --git a/syntax/netrc.vim b/syntax/netrc.vim
new file mode 100644
index 000000000..f9cdd890a
--- /dev/null
+++ b/syntax/netrc.vim
@@ -0,0 +1,56 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'netrc') == -1
+
+" Vim syntax file
+" Language:             netrc(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2010-01-03
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword netrcKeyword    machine nextgroup=netrcMachine skipwhite skipnl
+syn keyword netrcKeyword    account
+                          \ login
+                          \ nextgroup=netrcLogin,netrcSpecial skipwhite skipnl
+syn keyword netrcKeyword    password nextgroup=netrcPassword skipwhite skipnl
+syn keyword netrcKeyword    default
+syn keyword netrcKeyword    macdef
+                          \ nextgroup=netrcInit,netrcMacroName skipwhite skipnl
+syn region  netrcMacro      contained start='.' end='^$'
+
+syn match   netrcMachine    contained display '\S\+'
+syn match   netrcMachine    contained display '"[^\\"]*\(\\.[^\\"]*\)*"'
+syn match   netrcLogin      contained display '\S\+'
+syn match   netrcLogin      contained display '"[^\\"]*\(\\.[^\\"]*\)*"'
+syn match   netrcPassword   contained display '\S\+'
+syn match   netrcPassword   contained display '"[^\\"]*\(\\.[^\\"]*\)*"'
+syn match   netrcMacroName  contained display '\S\+'
+                          \ nextgroup=netrcMacro skipwhite skipnl
+syn match   netrcMacroName  contained display '"[^\\"]*\(\\.[^\\"]*\)*"'
+                          \ nextgroup=netrcMacro skipwhite skipnl
+
+syn keyword netrcSpecial    contained anonymous
+syn match   netrcInit       contained '\<init$'
+                          \ nextgroup=netrcMacro skipwhite skipnl
+
+syn sync fromstart
+
+hi def link netrcKeyword    Keyword
+hi def link netrcMacro      PreProc
+hi def link netrcMachine    Identifier
+hi def link netrcLogin      String
+hi def link netrcPassword   String
+hi def link netrcMacroName  String
+hi def link netrcSpecial    Special
+hi def link netrcInit       Special
+
+let b:current_syntax = "netrc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/ninja.vim b/syntax/ninja.vim
new file mode 100644
index 000000000..4a06b9f5d
--- /dev/null
+++ b/syntax/ninja.vim
@@ -0,0 +1,91 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ninja') == -1
+
+" ninja build file syntax.
+" Language: ninja build file as described at
+"           http://ninja-build.org/manual.html
+" Version: 1.5
+" Last Change: 2018/04/05
+" Maintainer: Nicolas Weber <nicolasweber@gmx.de>
+" Version 1.5 of this script is in the upstream vim repository and will be
+" included in the next vim release. If you change this, please send your change
+" upstream.
+
+" ninja lexer and parser are at
+" https://github.com/ninja-build/ninja/blob/master/src/lexer.in.cc
+" https://github.com/ninja-build/ninja/blob/master/src/manifest_parser.cc
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case match
+
+" Comments are only matched when the # is at the beginning of the line (with
+" optional whitespace), as long as the prior line didn't end with a $
+" continuation.
+syn match ninjaComment /\(\$\n\)\@<!\_^\s*#.*$/  contains=@Spell
+
+" Toplevel statements are the ones listed here and
+" toplevel variable assignments (ident '=' value).
+" lexer.in.cc, ReadToken() and manifest_parser.cc, Parse()
+syn match ninjaKeyword "^build\>"
+syn match ninjaKeyword "^rule\>"
+syn match ninjaKeyword "^pool\>"
+syn match ninjaKeyword "^default\>"
+syn match ninjaKeyword "^include\>"
+syn match ninjaKeyword "^subninja\>"
+
+" Both 'build' and 'rule' begin a variable scope that ends
+" on the first line without indent. 'rule' allows only a
+" limited set of magic variables, 'build' allows general
+" let assignments.
+" manifest_parser.cc, ParseRule()
+syn region ninjaRule start="^rule" end="^\ze\S" contains=TOP transparent
+syn keyword ninjaRuleCommand contained containedin=ninjaRule command
+                                     \ deps depfile description generator
+                                     \ pool restat rspfile rspfile_content
+
+syn region ninjaPool start="^pool" end="^\ze\S" contains=TOP transparent
+syn keyword ninjaPoolCommand contained containedin=ninjaPool  depth
+
+" Strings are parsed as follows:
+" lexer.in.cc, ReadEvalString()
+" simple_varname = [a-zA-Z0-9_-]+;
+" varname = [a-zA-Z0-9_.-]+;
+" $$ -> $
+" $\n -> line continuation
+" '$ ' -> escaped space
+" $simple_varname -> variable
+" ${varname} -> variable
+
+syn match   ninjaDollar "\$\$"
+syn match   ninjaWrapLineOperator "\$$"
+syn match   ninjaSimpleVar "\$[a-zA-Z0-9_-]\+"
+syn match   ninjaVar       "\${[a-zA-Z0-9_.-]\+}"
+
+" operators are:
+" variable assignment =
+" rule definition :
+" implicit dependency |
+" order-only dependency ||
+syn match ninjaOperator "\(=\|:\||\|||\)\ze\s"
+
+hi def link ninjaComment Comment
+hi def link ninjaKeyword Keyword
+hi def link ninjaRuleCommand Statement
+hi def link ninjaPoolCommand Statement
+hi def link ninjaDollar ninjaOperator
+hi def link ninjaWrapLineOperator ninjaOperator
+hi def link ninjaOperator Operator
+hi def link ninjaSimpleVar ninjaVar
+hi def link ninjaVar Identifier
+
+let b:current_syntax = "ninja"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/nqc.vim b/syntax/nqc.vim
new file mode 100644
index 000000000..ca8b10012
--- /dev/null
+++ b/syntax/nqc.vim
@@ -0,0 +1,369 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nqc') == -1
+
+" Vim syntax file
+" Language:	NQC - Not Quite C, for LEGO mindstorms
+"		NQC homepage: http://www.enteract.com/~dbaum/nqc/
+" Maintainer:	Stefan Scherer <stefan@enotes.de>
+" Last Change:	2001 May 10
+" URL:		http://www.enotes.de/twiki/pub/Home/LegoMindstorms/nqc.vim
+" Filenames:	.nqc
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Statements
+syn keyword	nqcStatement	break return continue start stop abs sign
+syn keyword     nqcStatement	sub task
+syn keyword     nqcLabel	case default
+syn keyword	nqcConditional	if else switch
+syn keyword	nqcRepeat	while for do until repeat
+
+" Scout and RCX2
+syn keyword	nqcEvents	acquire catch monitor
+
+" types and classes
+syn keyword	nqcType		int true false void
+syn keyword	nqcStorageClass	asm const inline
+
+
+
+" Sensors --------------------------------------------
+" Input Sensors
+syn keyword     nqcConstant	SENSOR_1 SENSOR_2 SENSOR_3
+
+" Types for SetSensorType()
+syn keyword     nqcConstant	SENSOR_TYPE_TOUCH SENSOR_TYPE_TEMPERATURE
+syn keyword     nqcConstant	SENSOR_TYPE_LIGHT SENSOR_TYPE_ROTATION
+syn keyword     nqcConstant	SENSOR_LIGHT SENSOR_TOUCH
+
+" Modes for SetSensorMode()
+syn keyword     nqcConstant	SENSOR_MODE_RAW SENSOR_MODE_BOOL
+syn keyword     nqcConstant	SENSOR_MODE_EDGE SENSOR_MODE_PULSE
+syn keyword     nqcConstant	SENSOR_MODE_PERCENT SENSOR_MODE_CELSIUS
+syn keyword     nqcConstant	SENSOR_MODE_FAHRENHEIT SENSOR_MODE_ROTATION
+
+" Sensor configurations for SetSensor()
+syn keyword     nqcConstant	SENSOR_TOUCH SENSOR_LIGHT SENSOR_ROTATION
+syn keyword     nqcConstant	SENSOR_CELSIUS SENSOR_FAHRENHEIT SENSOR_PULSE
+syn keyword     nqcConstant	SENSOR_EDGE
+
+" Functions - All
+syn keyword	nqcFunction	ClearSensor
+syn keyword	nqcFunction	SensorValue SensorType
+
+" Functions - RCX
+syn keyword	nqcFunction	SetSensor SetSensorType
+syn keyword	nqcFunction	SensorValueBool
+
+" Functions - RCX, CyberMaster
+syn keyword	nqcFunction	SetSensorMode SensorMode
+
+" Functions - RCX, Scout
+syn keyword	nqcFunction	SensorValueRaw
+
+" Functions - Scout
+syn keyword	nqcFunction	SetSensorLowerLimit SetSensorUpperLimit
+syn keyword	nqcFunction	SetSensorHysteresis CalibrateSensor
+
+
+" Outputs --------------------------------------------
+" Outputs for On(), Off(), etc.
+syn keyword     nqcConstant	OUT_A OUT_B OUT_C
+
+" Modes for SetOutput()
+syn keyword     nqcConstant	OUT_ON OUT_OFF OUT_FLOAT
+
+" Directions for SetDirection()
+syn keyword     nqcConstant	OUT_FWD OUT_REV OUT_TOGGLE
+
+" Output power for SetPower()
+syn keyword     nqcConstant	OUT_LOW OUT_HALF OUT_FULL
+
+" Functions - All
+syn keyword	nqcFunction	SetOutput SetDirection SetPower OutputStatus
+syn keyword	nqcFunction	On Off Float Fwd Rev Toggle
+syn keyword	nqcFunction	OnFwd OnRev OnFor
+
+" Functions - RXC2, Scout
+syn keyword	nqcFunction	SetGlobalOutput SetGlobalDirection SetMaxPower
+syn keyword	nqcFunction	GlobalOutputStatus
+
+
+" Sound ----------------------------------------------
+" Sounds for PlaySound()
+syn keyword     nqcConstant	SOUND_CLICK SOUND_DOUBLE_BEEP SOUND_DOWN
+syn keyword     nqcConstant	SOUND_UP SOUND_LOW_BEEP SOUND_FAST_UP
+
+" Functions - All
+syn keyword	nqcFunction	PlaySound PlayTone
+
+" Functions - RCX2, Scout
+syn keyword	nqcFunction	MuteSound UnmuteSound ClearSound
+syn keyword	nqcFunction	SelectSounds
+
+
+" LCD ------------------------------------------------
+" Modes for SelectDisplay()
+syn keyword     nqcConstant	DISPLAY_WATCH DISPLAY_SENSOR_1 DISPLAY_SENSOR_2
+syn keyword     nqcConstant	DISPLAY_SENSOR_3 DISPLAY_OUT_A DISPLAY_OUT_B
+syn keyword     nqcConstant	DISPLAY_OUT_C
+" RCX2
+syn keyword     nqcConstant	DISPLAY_USER
+
+" Functions - RCX
+syn keyword	nqcFunction	SelectDisplay
+" Functions - RCX2
+syn keyword	nqcFunction	SetUserDisplay
+
+
+" Communication --------------------------------------
+" Messages - RCX, Scout ------------------------------
+" Tx power level for SetTxPower()
+syn keyword     nqcConstant	TX_POWER_LO TX_POWER_HI
+
+" Functions - RCX, Scout
+syn keyword	nqcFunction	Message ClearMessage SendMessage SetTxPower
+
+" Serial - RCX2 --------------------------------------
+" for SetSerialComm()
+syn keyword     nqcConstant	SERIAL_COMM_DEFAULT SERIAL_COMM_4800
+syn keyword     nqcConstant	SERIAL_COMM_DUTY25 SERIAL_COMM_76KHZ
+
+" for SetSerialPacket()
+syn keyword     nqcConstant	SERIAL_PACKET_DEFAULT SERIAL_PACKET_PREAMBLE
+syn keyword     nqcConstant	SERIAL_PACKET_NEGATED SERIAL_PACKET_CHECKSUM
+syn keyword     nqcConstant	SERIAL_PACKET_RCX
+
+" Functions - RCX2
+syn keyword	nqcFunction	SetSerialComm SetSerialPacket SetSerialData
+syn keyword	nqcFunction	SerialData SendSerial
+
+" VLL - Scout ----------------------------------------
+" Functions - Scout
+syn keyword	nqcFunction	SendVLL
+
+
+" Timers ---------------------------------------------
+" Functions - All
+syn keyword	nqcFunction	ClearTimer Timer
+
+" Functions - RCX2
+syn keyword	nqcFunction	SetTimer FastTimer
+
+
+" Counters -------------------------------------------
+" Functions - RCX2, Scout
+syn keyword	nqcFunction	ClearCounter IncCounter DecCounter Counter
+
+
+" Access Control -------------------------------------
+syn keyword     nqcConstant	ACQUIRE_OUT_A ACQUIRE_OUT_B ACQUIRE_OUT_C
+syn keyword     nqcConstant	ACQUIRE_SOUND
+" RCX2 only
+syn keyword     nqcConstant	ACQUIRE_USER_1 ACQUIRE_USER_2 ACQUIRE_USER_3
+syn keyword     nqcConstant	ACQUIRE_USER_4
+
+" Functions - RCX2, Scout
+syn keyword	nqcFunction	SetPriority
+
+
+" Events ---------------------------------------------
+" RCX2 Events
+syn keyword     nqcConstant	EVENT_TYPE_PRESSED EVENT_TYPE_RELEASED
+syn keyword     nqcConstant	EVENT_TYPE_PULSE EVENT_TYPE_EDGE
+syn keyword     nqcConstant	EVENT_TYPE_FAST_CHANGE EVENT_TYPE_LOW
+syn keyword     nqcConstant	EVENT_TYPE_NORMAL EVENT_TYPE_HIGH
+syn keyword     nqcConstant	EVENT_TYPE_CLICK EVENT_TYPE_DOUBLECLICK
+syn keyword     nqcConstant	EVENT_TYPE_MESSAGE
+
+" Scout Events
+syn keyword     nqcConstant	EVENT_1_PRESSED EVENT_1_RELEASED
+syn keyword     nqcConstant	EVENT_2_PRESSED EVENT_2_RELEASED
+syn keyword     nqcConstant	EVENT_LIGHT_HIGH EVENT_LIGHT_NORMAL
+syn keyword     nqcConstant	EVENT_LIGHT_LOW EVENT_LIGHT_CLICK
+syn keyword     nqcConstant	EVENT_LIGHT_DOUBLECLICK EVENT_COUNTER_0
+syn keyword     nqcConstant	EVENT_COUNTER_1 EVENT_TIMER_0 EVENT_TIMER_1
+syn keyword     nqcConstant	EVENT_TIMER_2 EVENT_MESSAGE
+
+" Functions - RCX2, Scout
+syn keyword	nqcFunction	ActiveEvents Event
+
+" Functions - RCX2
+syn keyword	nqcFunction	CurrentEvents
+syn keyword	nqcFunction	SetEvent ClearEvent ClearAllEvents EventState
+syn keyword	nqcFunction	CalibrateEvent SetUpperLimit UpperLimit
+syn keyword	nqcFunction	SetLowerLimit LowerLimit SetHysteresis
+syn keyword	nqcFunction	Hysteresis
+syn keyword	nqcFunction	SetClickTime ClickTime SetClickCounter
+syn keyword	nqcFunction	ClickCounter
+
+" Functions - Scout
+syn keyword	nqcFunction	SetSensorClickTime SetCounterLimit
+syn keyword	nqcFunction	SetTimerLimit
+
+
+" Data Logging ---------------------------------------
+" Functions - RCX
+syn keyword	nqcFunction	CreateDatalog AddToDatalog
+syn keyword	nqcFunction	UploadDatalog
+
+
+" General Features -----------------------------------
+" Functions - All
+syn keyword	nqcFunction	Wait StopAllTasks Random
+syn keyword	nqcFunction	SetSleepTime SleepNow
+
+" Functions - RCX
+syn keyword	nqcFunction	Program Watch SetWatch
+
+" Functions - RCX2
+syn keyword	nqcFunction	SetRandomSeed SelectProgram
+syn keyword	nqcFunction	BatteryLevel FirmwareVersion
+
+" Functions - Scout
+" Parameters for SetLight()
+syn keyword     nqcConstant	LIGHT_ON LIGHT_OFF
+syn keyword	nqcFunction	SetScoutRules ScoutRules SetScoutMode
+syn keyword	nqcFunction	SetEventFeedback EventFeedback SetLight
+
+" additional CyberMaster defines
+syn keyword     nqcConstant	OUT_L OUT_R OUT_X
+syn keyword     nqcConstant	SENSOR_L SENSOR_M SENSOR_R
+" Functions - CyberMaster
+syn keyword	nqcFunction	Drive OnWait OnWaitDifferent
+syn keyword	nqcFunction	ClearTachoCounter TachoCount TachoSpeed
+syn keyword	nqcFunction	ExternalMotorRunning AGC
+
+
+
+" nqcCommentGroup allows adding matches for special things in comments
+syn keyword	nqcTodo		contained TODO FIXME XXX
+syn cluster	nqcCommentGroup	contains=nqcTodo
+
+"when wanted, highlight trailing white space
+if exists("nqc_space_errors")
+  if !exists("nqc_no_trail_space_error")
+    syn match	nqcSpaceError	display excludenl "\s\+$"
+  endif
+  if !exists("nqc_no_tab_space_error")
+    syn match	nqcSpaceError	display " \+\t"me=e-1
+  endif
+endif
+
+"catch errors caused by wrong parenthesis and brackets
+syn cluster	nqcParenGroup	contains=nqcParenError,nqcIncluded,nqcCommentSkip,@nqcCommentGroup,nqcCommentStartError,nqcCommentSkip,nqcCppOut,nqcCppOut2,nqcCppSkip,nqcNumber,nqcFloat,nqcNumbers
+if exists("nqc_no_bracket_error")
+  syn region	nqcParen	transparent start='(' end=')' contains=ALLBUT,@nqcParenGroup,nqcCppParen
+  " nqcCppParen: same as nqcParen but ends at end-of-line; used in nqcDefine
+  syn region	nqcCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@nqcParenGroup,nqcParen
+  syn match	nqcParenError	display ")"
+  syn match	nqcErrInParen	display contained "[{}]"
+else
+  syn region	nqcParen		transparent start='(' end=')' contains=ALLBUT,@nqcParenGroup,nqcCppParen,nqcErrInBracket,nqcCppBracket
+  " nqcCppParen: same as nqcParen but ends at end-of-line; used in nqcDefine
+  syn region	nqcCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@nqcParenGroup,nqcErrInBracket,nqcParen,nqcBracket
+  syn match	nqcParenError	display "[\])]"
+  syn match	nqcErrInParen	display contained "[\]{}]"
+  syn region	nqcBracket	transparent start='\[' end=']' contains=ALLBUT,@nqcParenGroup,nqcErrInParen,nqcCppParen,nqcCppBracket
+  " nqcCppBracket: same as nqcParen but ends at end-of-line; used in nqcDefine
+  syn region	nqcCppBracket	transparent start='\[' skip='\\$' excludenl end=']' end='$' contained contains=ALLBUT,@nqcParenGroup,nqcErrInParen,nqcParen,nqcBracket
+  syn match	nqcErrInBracket	display contained "[);{}]"
+endif
+
+"integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match	nqcNumbers	display transparent "\<\d\|\.\d" contains=nqcNumber,nqcFloat
+" Same, but without octal error (for comments)
+syn match	nqcNumber	display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>"
+"hex number
+syn match	nqcNumber	display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
+" Flag the first zero of an octal number as something special
+syn match	nqcFloat	display contained "\d\+f"
+"floating point number, with dot, optional exponent
+syn match	nqcFloat	display contained "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\="
+"floating point number, starting with a dot, optional exponent
+syn match	nqcFloat	display contained "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+syn match	nqcFloat	display contained "\d\+e[-+]\=\d\+[fl]\=\>"
+" flag an octal number with wrong digits
+syn case match
+
+syn region	nqcCommentL	start="//" skip="\\$" end="$" keepend contains=@nqcCommentGroup,nqcSpaceError
+syn region	nqcComment	matchgroup=nqcCommentStart start="/\*" matchgroup=NONE end="\*/" contains=@nqcCommentGroup,nqcCommentStartError,nqcSpaceError
+
+" keep a // comment separately, it terminates a preproc. conditional
+syntax match	nqcCommentError	display "\*/"
+syntax match	nqcCommentStartError display "/\*" contained
+
+
+
+
+
+syn region	nqcPreCondit	start="^\s*#\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" end="//"me=s-1 contains=nqcComment,nqcCharacter,nqcCppParen,nqcParenError,nqcNumbers,nqcCommentError,nqcSpaceError
+syn match	nqcPreCondit	display "^\s*#\s*\(else\|endif\)\>"
+if !exists("nqc_no_if0")
+  syn region	nqcCppOut		start="^\s*#\s*if\s\+0\>" end=".\|$" contains=nqcCppOut2
+  syn region	nqcCppOut2	contained start="0" end="^\s*#\s*\(endif\>\|else\>\|elif\>\)" contains=nqcSpaceError,nqcCppSkip
+  syn region	nqcCppSkip	contained start="^\s*#\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*#\s*endif\>" contains=nqcSpaceError,nqcCppSkip
+endif
+syn region	nqcIncluded	display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match	nqcInclude	display "^\s*#\s*include\>\s*["]" contains=nqcIncluded
+"syn match nqcLineSkip	"\\$"
+syn cluster	nqcPreProcGroup	contains=nqcPreCondit,nqcIncluded,nqcInclude,nqcDefine,nqcErrInParen,nqcErrInBracket,nqcCppOut,nqcCppOut2,nqcCppSkip,nqcNumber,nqcFloat,nqcNumbers,nqcCommentSkip,@nqcCommentGroup,nqcCommentStartError,nqcParen,nqcBracket
+syn region	nqcDefine	start="^\s*#\s*\(define\|undef\)\>" skip="\\$" end="$" contains=ALLBUT,@nqcPreProcGroup
+syn region	nqcPreProc	start="^\s*#\s*\(pragma\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@nqcPreProcGroup
+
+if !exists("nqc_minlines")
+  if !exists("nqc_no_if0")
+    let nqc_minlines = 50	    " #if 0 constructs can be long
+  else
+    let nqc_minlines = 15	    " mostly for () constructs
+  endif
+endif
+exec "syn sync ccomment nqcComment minlines=" . nqc_minlines
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default methods for highlighting.  Can be overridden later
+hi def link nqcLabel		Label
+hi def link nqcConditional		Conditional
+hi def link nqcRepeat		Repeat
+hi def link nqcCharacter		Character
+hi def link nqcNumber		Number
+hi def link nqcFloat		Float
+hi def link nqcFunction		Function
+hi def link nqcParenError		nqcError
+hi def link nqcErrInParen		nqcError
+hi def link nqcErrInBracket	nqcError
+hi def link nqcCommentL		nqcComment
+hi def link nqcCommentStart	nqcComment
+hi def link nqcCommentError	nqcError
+hi def link nqcCommentStartError	nqcError
+hi def link nqcSpaceError		nqcError
+hi def link nqcStorageClass	StorageClass
+hi def link nqcInclude		Include
+hi def link nqcPreProc		PreProc
+hi def link nqcDefine		Macro
+hi def link nqcIncluded		String
+hi def link nqcError		Error
+hi def link nqcStatement		Statement
+hi def link nqcEvents		Statement
+hi def link nqcPreCondit		PreCondit
+hi def link nqcType		Type
+hi def link nqcConstant		Constant
+hi def link nqcCommentSkip		nqcComment
+hi def link nqcComment		Comment
+hi def link nqcTodo		Todo
+hi def link nqcCppSkip		nqcCppOut
+hi def link nqcCppOut2		nqcCppOut
+hi def link nqcCppOut		Comment
+
+
+let b:current_syntax = "nqc"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/nroff.vim b/syntax/nroff.vim
new file mode 100644
index 000000000..f295c6cd5
--- /dev/null
+++ b/syntax/nroff.vim
@@ -0,0 +1,253 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nroff') == -1
+
+" VIM syntax file
+" Language:	nroff/groff
+" Maintainer:	Pedro Alejandro L�pez-Valencia <palopezv@gmail.com>
+" URL:		http://vorbote.wordpress.com/
+" Last Change:	2012 Feb 2
+"
+" {{{1 Acknowledgements
+"
+" ACKNOWLEDGEMENTS:
+"
+" My thanks to J�r�me Pl�t <Jerome.Plut@ens.fr>, who was the
+" creator and maintainer of this syntax file for several years.
+" May I be as good at it as he has been.
+"
+" {{{1 Todo
+"
+" TODO:
+"
+" * Write syntax highlighting files for the preprocessors,
+"	and integrate with nroff.vim.
+"
+"
+" {{{1 Start syntax highlighting.
+"
+" quit when a syntax file was already loaded
+"
+if exists("b:current_syntax")
+	finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+"
+" {{{1 plugin settings...
+"
+" {{{2 enable spacing error highlighting
+"
+if exists("nroff_space_errors")
+	syn match nroffError /\s\+$/
+	syn match nroffSpaceError /[.,:;!?]\s\{2,}/
+endif
+"
+"
+" {{{1 Special file settings
+"
+" {{{2  ms exdented paragraphs are not in the default paragraphs list.
+"
+setlocal paragraphs+=XP
+"
+" {{{2 Activate navigation to preporcessor sections.
+"
+if exists("b:preprocs_as_sections")
+	setlocal sections=EQTSPS[\ G1GS
+endif
+
+" {{{1 Escape sequences
+" ------------------------------------------------------------
+
+syn match nroffEscChar /\\[CN]/ nextgroup=nroffEscCharArg
+syn match nroffEscape /\\[*fgmnYV]/ nextgroup=nroffEscRegPar,nroffEscRegArg
+syn match nroffEscape /\\s[+-]\=/ nextgroup=nroffSize
+syn match nroffEscape /\\[$AbDhlLRvxXZ]/ nextgroup=nroffEscPar,nroffEscArg
+
+syn match nroffEscRegArg /./ contained
+syn match nroffEscRegArg2 /../ contained
+syn match nroffEscRegPar /(/ contained nextgroup=nroffEscRegArg2
+syn match nroffEscArg /./ contained
+syn match nroffEscArg2 /../ contained
+syn match nroffEscPar /(/ contained nextgroup=nroffEscArg2
+syn match nroffSize /\((\d\)\=\d/ contained
+
+syn region nroffEscCharArg start=/'/ end=/'/ contained
+syn region nroffEscArg start=/'/ end=/'/ contained contains=nroffEscape,@nroffSpecial
+
+if exists("b:nroff_is_groff")
+	syn region nroffEscRegArg matchgroup=nroffEscape start=/\[/ end=/\]/ contained oneline
+	syn region nroffSize matchgroup=nroffEscape start=/\[/ end=/\]/ contained
+endif
+
+syn match nroffEscape /\\[adprtu{}]/
+syn match nroffEscape /\\$/
+syn match nroffEscape /\\\$[@*]/
+
+" {{{1 Strings and special characters
+" ------------------------------------------------------------
+
+syn match nroffSpecialChar /\\[\\eE?!-]/
+syn match nroffSpace "\\[&%~|^0)/,]"
+syn match nroffSpecialChar /\\(../
+
+if exists("b:nroff_is_groff")
+	syn match nroffSpecialChar /\\\[[^]]*]/
+	syn region nroffPreserve  matchgroup=nroffSpecialChar start=/\\?/ end=/\\?/ oneline
+endif
+
+syn region nroffPreserve matchgroup=nroffSpecialChar start=/\\!/ end=/$/ oneline
+
+syn cluster nroffSpecial contains=nroffSpecialChar,nroffSpace
+
+
+syn region nroffString start=/"/ end=/"/ skip=/\\$/ contains=nroffEscape,@nroffSpecial contained
+syn region nroffString start=/'/ end=/'/ skip=/\\$/ contains=nroffEscape,@nroffSpecial contained
+
+
+" {{{1 Numbers and units
+" ------------------------------------------------------------
+syn match nroffNumBlock /[0-9.]\a\=/ contained contains=nroffNumber
+syn match nroffNumber /\d\+\(\.\d*\)\=/ contained nextgroup=nroffUnit,nroffBadChar
+syn match nroffNumber /\.\d\+)/ contained nextgroup=nroffUnit,nroffBadChar
+syn match nroffBadChar /./ contained
+syn match nroffUnit /[icpPszmnvMu]/ contained
+
+
+" {{{1 Requests
+" ------------------------------------------------------------
+
+" Requests begin with . or ' at the beginning of a line, or
+" after .if or .ie.
+
+syn match nroffReqLeader /^[.']/	nextgroup=nroffReqName skipwhite
+syn match nroffReqLeader /[.']/	contained nextgroup=nroffReqName skipwhite
+
+if exists("b:nroff_is_groff")
+"
+" GNU troff allows long request names
+"
+	syn match nroffReqName /[^\t \\\[?]\+/ contained nextgroup=nroffReqArg
+else
+	syn match nroffReqName /[^\t \\\[?]\{1,2}/ contained nextgroup=nroffReqArg
+endif
+
+syn region nroffReqArg start=/\S/ skip=/\\$/ end=/$/ contained contains=nroffEscape,@nroffSpecial,nroffString,nroffError,nroffSpaceError,nroffNumBlock,nroffComment
+
+" {{{2 Conditional: .if .ie .el
+syn match nroffReqName /\(if\|ie\)/ contained nextgroup=nroffCond skipwhite
+syn match nroffReqName /el/ contained nextgroup=nroffReqLeader skipwhite
+syn match nroffCond /\S\+/ contained nextgroup=nroffReqLeader skipwhite
+
+" {{{2 String definition: .ds .as
+syn match nroffReqname /[da]s/ contained nextgroup=nroffDefIdent skipwhite
+syn match nroffDefIdent /\S\+/ contained nextgroup=nroffDefinition skipwhite
+syn region nroffDefinition matchgroup=nroffSpecialChar start=/"/ matchgroup=NONE end=/\\"/me=e-2 skip=/\\$/ start=/\S/ end=/$/ contained contains=nroffDefSpecial
+syn match nroffDefSpecial /\\$/ contained
+syn match nroffDefSpecial /\\\((.\)\=./ contained
+
+if exists("b:nroff_is_groff")
+	syn match nroffDefSpecial /\\\[[^]]*]/ contained
+endif
+
+" {{{2 Macro definition: .de .am, also diversion: .di
+syn match nroffReqName /\(d[ei]\|am\)/ contained nextgroup=nroffIdent skipwhite
+syn match nroffIdent /[^[?( \t]\+/ contained
+if exists("b:nroff_is_groff")
+	syn match nroffReqName /als/ contained nextgroup=nroffIdent skipwhite
+endif
+
+" {{{2 Register definition: .rn .rr
+syn match nroffReqName /[rn]r/ contained nextgroup=nroffIdent skipwhite
+if exists("b:nroff_is_groff")
+	syn match nroffReqName /\(rnn\|aln\)/ contained nextgroup=nroffIdent skipwhite
+endif
+
+
+" {{{1 eqn/tbl/pic
+" ------------------------------------------------------------
+" <jp>
+" XXX: write proper syntax highlight for eqn / tbl / pic ?
+" <jp />
+
+syn region nroffEquation start=/^\.\s*EQ\>/ end=/^\.\s*EN\>/
+syn region nroffTable start=/^\.\s*TS\>/ end=/^\.\s*TE\>/
+syn region nroffPicture start=/^\.\s*PS\>/ end=/^\.\s*PE\>/
+syn region nroffRefer start=/^\.\s*\[\>/ end=/^\.\s*\]\>/
+syn region nroffGrap start=/^\.\s*G1\>/ end=/^\.\s*G2\>/
+syn region nroffGremlin start=/^\.\s*GS\>/ end=/^\.\s*GE|GF\>/
+
+" {{{1 Comments
+" ------------------------------------------------------------
+
+syn region nroffIgnore start=/^[.']\s*ig/ end=/^['.]\s*\./
+syn match nroffComment /\(^[.']\s*\)\=\\".*/ contains=nroffTodo
+syn match nroffComment /^'''.*/  contains=nroffTodo
+
+if exists("b:nroff_is_groff")
+	syn match nroffComment "\\#.*$" contains=nroffTodo
+endif
+
+syn keyword nroffTodo TODO XXX FIXME contained
+
+" {{{1 Hilighting
+" ------------------------------------------------------------
+"
+
+"
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+"
+
+hi def link nroffEscChar nroffSpecialChar
+hi def link nroffEscCharAr nroffSpecialChar
+hi def link nroffSpecialChar SpecialChar
+hi def link nroffSpace Delimiter
+
+hi def link nroffEscRegArg2 nroffEscRegArg
+hi def link nroffEscRegArg nroffIdent
+
+hi def link nroffEscArg2 nroffEscArg
+hi def link nroffEscPar nroffEscape
+
+hi def link nroffEscRegPar nroffEscape
+hi def link nroffEscArg nroffEscape
+hi def link nroffSize nroffEscape
+hi def link nroffEscape Preproc
+
+hi def link nroffIgnore Comment
+hi def link nroffComment Comment
+hi def link nroffTodo Todo
+
+hi def link nroffReqLeader nroffRequest
+hi def link nroffReqName nroffRequest
+hi def link nroffRequest Statement
+hi def link nroffCond PreCondit
+hi def link nroffDefIdent nroffIdent
+hi def link nroffIdent Identifier
+
+hi def link nroffEquation PreProc
+hi def link nroffTable PreProc
+hi def link nroffPicture PreProc
+hi def link nroffRefer PreProc
+hi def link nroffGrap PreProc
+hi def link nroffGremlin PreProc
+
+hi def link nroffNumber Number
+hi def link nroffBadChar nroffError
+hi def link nroffSpaceError nroffError
+hi def link nroffError Error
+
+hi def link nroffPreserve String
+hi def link nroffString String
+hi def link nroffDefinition String
+hi def link nroffDefSpecial Special
+
+
+let b:current_syntax = "nroff"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim600: set fdm=marker fdl=2:
+
+endif
diff --git a/syntax/nsis.vim b/syntax/nsis.vim
new file mode 100644
index 000000000..39d02cfdc
--- /dev/null
+++ b/syntax/nsis.vim
@@ -0,0 +1,686 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nsis') == -1
+
+" Vim syntax file
+" Language:		NSIS script, for version of NSIS 3.03 and later
+" Maintainer:		Ken Takata
+" URL:			https://github.com/k-takata/vim-nsis
+" Previous Maintainer:	Alex Jakushev <Alex.Jakushev@kemek.lt>
+" Last Change:		2018-10-02
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case ignore
+
+
+"Pseudo definitions
+syn match nsisLine nextgroup=@nsisPseudoStatement skipwhite "^"
+syn cluster nsisPseudoStatement	contains=nsisFirstComment,nsisLocalLabel,nsisGlobalLabel
+syn cluster nsisPseudoStatement add=nsisDefine,nsisPreCondit,nsisMacro,nsisInclude,nsisSystem
+syn cluster nsisPseudoStatement add=nsisAttribute,nsisCompiler,nsisVersionInfo,nsisInstruction,nsisStatement
+
+"COMMENTS (4.1)
+syn keyword nsisTodo	todo attention note fixme readme
+syn region nsisComment	start="[;#]" end="$" contains=nsisTodo,nsisLineContinuation,@Spell oneline
+syn region nsisComment	start=".\@1<=/\*" end="\*/" contains=nsisTodo,@Spell
+syn region nsisFirstComment  start="/\*" end="\*/" contained contains=nsisTodo,@Spell skipwhite
+			\ nextgroup=@nsisPseudoStatement
+
+syn match nsisLineContinuation	"\\$"
+
+"STRINGS (4.1)
+syn region nsisString	start=/"/ end=/"/ contains=@nsisStringItems,@Spell
+syn region nsisString	start=/'/ end=/'/ contains=@nsisStringItems,@Spell
+syn region nsisString	start=/`/ end=/`/ contains=@nsisStringItems,@Spell
+
+syn cluster nsisStringItems	contains=nsisPreprocSubst,nsisPreprocLangStr,nsisPreprocEnvVar,nsisUserVar,nsisSysVar,nsisRegistry,nsisLineContinuation
+
+"NUMBERS (4.1)
+syn match nsisNumber		"\<[1-9]\d*\>"
+syn match nsisNumber		"\<0x\x\+\>"
+syn match nsisNumber		"\<0\o*\>"
+
+"STRING REPLACEMENT (5.4, 4.9.15.2, 5.3.1)
+syn region nsisPreprocSubst	start="\${" end="}" contains=nsisPreprocSubst,nsisPreprocLangStr,nsisPreprocEnvVar
+syn region nsisPreprocLangStr	start="\$(" end=")" contains=nsisPreprocSubst,nsisPreprocLangStr,nsisPreprocEnvVar
+syn region nsisPreprocEnvVar	start="\$%" end="%" contains=nsisPreprocSubst,nsisPreprocLangStr,nsisPreprocEnvVar
+
+"VARIABLES (4.2.2)
+syn match nsisUserVar		"$\d"
+syn match nsisUserVar		"$R\d"
+syn match nsisSysVar		"$INSTDIR"
+syn match nsisSysVar		"$OUTDIR"
+syn match nsisSysVar		"$CMDLINE"
+syn match nsisSysVar		"$LANGUAGE"
+"CONSTANTS (4.2.3)
+syn match nsisSysVar		"$PROGRAMFILES"
+syn match nsisSysVar		"$PROGRAMFILES32"
+syn match nsisSysVar		"$PROGRAMFILES64"
+syn match nsisSysVar		"$COMMONFILES"
+syn match nsisSysVar		"$COMMONFILES32"
+syn match nsisSysVar		"$COMMONFILES64"
+syn match nsisSysVar		"$DESKTOP"
+syn match nsisSysVar		"$EXEDIR"
+syn match nsisSysVar		"$EXEFILE"
+syn match nsisSysVar		"$EXEPATH"
+syn match nsisSysVar		"${NSISDIR}"
+syn match nsisSysVar		"$WINDIR"
+syn match nsisSysVar		"$SYSDIR"
+syn match nsisSysVar		"$TEMP"
+syn match nsisSysVar		"$STARTMENU"
+syn match nsisSysVar		"$SMPROGRAMS"
+syn match nsisSysVar		"$SMSTARTUP"
+syn match nsisSysVar		"$QUICKLAUNCH"
+syn match nsisSysVar		"$DOCUMENTS"
+syn match nsisSysVar		"$SENDTO"
+syn match nsisSysVar		"$RECENT"
+syn match nsisSysVar		"$FAVORITES"
+syn match nsisSysVar		"$MUSIC"
+syn match nsisSysVar		"$PICTURES"
+syn match nsisSysVar		"$VIDEOS"
+syn match nsisSysVar		"$NETHOOD"
+syn match nsisSysVar		"$FONTS"
+syn match nsisSysVar		"$TEMPLATES"
+syn match nsisSysVar		"$APPDATA"
+syn match nsisSysVar		"$LOCALAPPDATA"
+syn match nsisSysVar		"$PRINTHOOD"
+syn match nsisSysVar		"$INTERNET_CACHE"
+syn match nsisSysVar		"$COOKIES"
+syn match nsisSysVar		"$HISTORY"
+syn match nsisSysVar		"$PROFILE"
+syn match nsisSysVar		"$ADMINTOOLS"
+syn match nsisSysVar		"$RESOURCES"
+syn match nsisSysVar		"$RESOURCES_LOCALIZED"
+syn match nsisSysVar		"$CDBURN_AREA"
+syn match nsisSysVar		"$HWNDPARENT"
+syn match nsisSysVar		"$PLUGINSDIR"
+syn match nsisSysVar		"$\\r"
+syn match nsisSysVar		"$\\n"
+syn match nsisSysVar		"$\\t"
+syn match nsisSysVar		"$\$"
+syn match nsisSysVar		"$\\["'`]"
+
+"LABELS (4.3)
+syn match nsisLocalLabel	contained "[^-+!$0-9;"'#. \t/*][^ \t:;#]*:\ze\%($\|[ \t;#]\|\/\*\)"
+syn match nsisGlobalLabel	contained "\.[^-+!$0-9;"'# \t/*][^ \t:;#]*:\ze\%($\|[ \t;#]\|\/\*\)"
+
+"CONSTANTS
+syn keyword nsisBoolean		contained true false
+syn keyword nsisOnOff		contained on off
+
+syn keyword nsisRegistry	contained HKCR HKLM HKCU HKU HKCC HKDD HKPD SHCTX
+syn keyword nsisRegistry	contained HKCR32 HKCR64 HKCU32 HKCU64 HKLM32 HKLM64
+syn keyword nsisRegistry	contained HKEY_CLASSES_ROOT HKEY_LOCAL_MACHINE HKEY_CURRENT_USER HKEY_USERS
+syn keyword nsisRegistry	contained HKEY_CLASSES_ROOT32 HKEY_CLASSES_ROOT64
+syn keyword nsisRegistry	contained HKEY_CURRENT_USER32 HKEY_CURRENT_USER64
+syn keyword nsisRegistry	contained HKEY_LOCAL_MACHINE32 HKEY_LOCAL_MACHINE64
+syn keyword nsisRegistry	contained HKEY_CURRENT_CONFIG HKEY_DYN_DATA HKEY_PERFORMANCE_DATA
+syn keyword nsisRegistry	contained SHELL_CONTEXT
+
+
+" common options
+syn cluster nsisAnyOpt		contains=nsisComment,nsisLineContinuation,nsisPreprocSubst,nsisPreprocLangStr,nsisPreprocEnvVar,nsisUserVar,nsisSysVar,nsisString,nsisNumber
+syn region nsisBooleanOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisBoolean
+syn region nsisOnOffOpt		contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisOnOff
+syn region nsisLangOpt		contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisLangKwd
+syn match nsisLangKwd		contained "/LANG\>"
+syn region nsisFontOpt		contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisFontKwd
+syn match nsisFontKwd		contained "/\%(ITALIC\|UNDERLINE\|STRIKE\)\>"
+
+"STATEMENTS - pages (4.5)
+syn keyword nsisStatement	contained Page UninstPage nextgroup=nsisPageOpt skipwhite
+syn region nsisPageOpt		contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisPageKwd
+syn keyword nsisPageKwd		contained custom license components directory instfiles uninstConfirm
+syn match nsisPageKwd		contained "/ENABLECANCEL\>"
+
+syn keyword nsisStatement	contained PageEx nextgroup=nsisPageExOpt skipwhite
+syn region nsisPageExOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisPageExKwd
+syn match nsisPageExKwd		contained "\<\%(un\.\)\?\%(custom\|license\|components\|directory\|instfiles\|uninstConfirm\)\>"
+
+syn keyword nsisStatement	contained PageExEnd PageCallbacks
+
+"STATEMENTS - sections (4.6.1)
+syn keyword nsisStatement	contained AddSize SectionEnd SectionGroupEnd
+
+syn keyword nsisStatement	contained Section nextgroup=nsisSectionOpt skipwhite
+syn region nsisSectionOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSectionKwd
+syn match nsisSectionKwd	contained "/o\>"
+
+syn keyword nsisStatement	contained SectionIn nextgroup=nsisSectionInOpt skipwhite
+syn region nsisSectionInOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSectionInKwd
+syn keyword nsisSectionInKwd	contained RO
+
+syn keyword nsisStatement	contained SectionGroup nextgroup=nsisSectionGroupOpt skipwhite
+syn region nsisSectionGroupOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSectionGroupKwd
+syn match nsisSectionGroupKwd	contained "/e\>"
+
+"STATEMENTS - functions (4.7.1)
+syn keyword nsisStatement	contained Function FunctionEnd
+
+
+"STATEMENTS - LogicLib.nsh
+syn match nsisStatement		"${If}"
+syn match nsisStatement		"${IfNot}"
+syn match nsisStatement		"${Unless}"
+syn match nsisStatement		"${ElseIf}"
+syn match nsisStatement		"${ElseIfNot}"
+syn match nsisStatement		"${ElseUnless}"
+syn match nsisStatement		"${Else}"
+syn match nsisStatement		"${EndIf}"
+syn match nsisStatement		"${EndUnless}"
+syn match nsisStatement		"${AndIf}"
+syn match nsisStatement		"${AndIfNot}"
+syn match nsisStatement		"${AndUnless}"
+syn match nsisStatement		"${OrIf}"
+syn match nsisStatement		"${OrIfNot}"
+syn match nsisStatement		"${OrUnless}"
+syn match nsisStatement		"${IfThen}"
+syn match nsisStatement		"${IfNotThen}"
+syn match nsisStatement		"${||\?}" nextgroup=@nsisPseudoStatement skipwhite
+syn match nsisStatement		"${IfCmd}" nextgroup=@nsisPseudoStatement skipwhite
+syn match nsisStatement		"${Select}"
+syn match nsisStatement		"${Case}"
+syn match nsisStatement		"${Case[2-5]}"
+syn match nsisStatement		"${CaseElse}"
+syn match nsisStatement		"${Default}"
+syn match nsisStatement		"${EndSelect}"
+syn match nsisStatement		"${Switch}"
+syn match nsisStatement		"${EndSwitch}"
+syn match nsisStatement		"${Break}"
+syn match nsisStatement		"${Do}"
+syn match nsisStatement		"${DoWhile}"
+syn match nsisStatement		"${DoUntil}"
+syn match nsisStatement		"${ExitDo}"
+syn match nsisStatement		"${Continue}"
+syn match nsisStatement		"${Loop}"
+syn match nsisStatement		"${LoopWhile}"
+syn match nsisStatement		"${LoopUntil}"
+syn match nsisStatement		"${For}"
+syn match nsisStatement		"${ForEach}"
+syn match nsisStatement		"${ExitFor}"
+syn match nsisStatement		"${Next}"
+"STATEMENTS - Memento.nsh
+syn match nsisStatement		"${MementoSection}"
+syn match nsisStatement		"${MementoSectionEnd}"
+
+
+"USER VARIABLES (4.2.1)
+syn keyword nsisInstruction	contained Var nextgroup=nsisVarOpt skipwhite
+syn region nsisVarOpt		contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisVarKwd
+syn match nsisVarKwd		contained "/GLOBAL\>"
+
+"INSTALLER ATTRIBUTES (4.8.1)
+syn keyword nsisAttribute	contained Caption ChangeUI CheckBitmap CompletedText ComponentText
+syn keyword nsisAttribute	contained DetailsButtonText DirText DirVar
+syn keyword nsisAttribute	contained FileErrorText Icon InstallButtonText
+syn keyword nsisAttribute	contained InstallDir InstProgressFlags
+syn keyword nsisAttribute	contained LicenseData LicenseText
+syn keyword nsisAttribute	contained MiscButtonText Name OutFile
+syn keyword nsisAttribute	contained SpaceTexts SubCaption UninstallButtonText UninstallCaption
+syn keyword nsisAttribute	contained UninstallIcon UninstallSubCaption UninstallText
+
+syn keyword nsisAttribute	contained AddBrandingImage nextgroup=nsisAddBrandingImageOpt skipwhite
+syn region nsisAddBrandingImageOpt  contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisAddBrandingImageKwd
+syn keyword nsisAddBrandingImageKwd contained left right top bottom width height
+
+syn keyword nsisAttribute	contained nextgroup=nsisBooleanOpt skipwhite
+			\ AllowRootDirInstall AutoCloseWindow
+
+syn keyword nsisAttribute	contained BGFont nextgroup=nsisFontOpt skipwhite
+
+syn keyword nsisAttribute	contained BGGradient nextgroup=nsisBGGradientOpt skipwhite
+syn region nsisBGGradientOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisBGGradientKwd
+syn keyword nsisBGGradientKwd	contained off
+
+syn keyword nsisAttribute	contained BrandingText nextgroup=nsisBrandingTextOpt skipwhite
+syn region nsisBrandingTextOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisBrandingTextKwd
+syn match nsisBrandingTextKwd	contained "/TRIM\%(LEFT\|RIGHT\|CENTER\)\>"
+
+syn keyword nsisAttribute	contained CRCCheck nextgroup=nsisCRCCheckOpt skipwhite
+syn region nsisCRCCheckOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisCRCCheckKwd
+syn keyword nsisCRCCheckKwd	contained on off force
+
+syn keyword nsisAttribute	contained DirVerify nextgroup=nsisDirVerifyOpt skipwhite
+syn region nsisDirVerifyOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisDirVerifyKwd
+syn keyword nsisDirVerifyKwd	contained auto leave
+
+syn keyword nsisAttribute	contained InstallColors nextgroup=nsisInstallColorsOpt skipwhite
+syn region nsisInstallColorsOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisInstallColorsKwd
+syn match nsisInstallColorsKwd	contained "/windows\>"
+
+syn keyword nsisAttribute	contained InstallDirRegKey nextgroup=nsisRegistryOpt skipwhite
+
+syn keyword nsisAttribute	contained InstType nextgroup=nsisInstTypeOpt skipwhite
+syn region nsisInstTypeOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisInstTypeKwd
+syn match nsisInstTypeKwd	contained "/\%(NOCUSTOM\|CUSTOMSTRING\|COMPONENTSONLYONCUSTOM\)\>"
+
+syn keyword nsisAttribute	contained LicenseBkColor nextgroup=nsisLicenseBkColorOpt skipwhite
+syn region nsisLicenseBkColorOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisLicenseBkColorKwd
+syn match nsisLicenseBkColorKwd  contained "/\%(gray\|windows\)\>"
+
+syn keyword nsisAttribute	contained LicenseForceSelection nextgroup=nsisLicenseForceSelectionOpt skipwhite
+syn region nsisLicenseForceSelectionOpt  contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisLicenseForceSelectionKwd
+syn keyword nsisLicenseForceSelectionKwd contained checkbox radiobuttons off
+
+syn keyword nsisAttribute	contained ManifestDPIAware nextgroup=nsisManifestDPIAwareOpt skipwhite
+syn region nsisManifestDPIAwareOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisManifestDPIAwareKwd
+syn keyword nsisManifestDPIAwareKwd	contained notset true false
+
+syn keyword nsisAttribute	contained ManifestSupportedOS nextgroup=nsisManifestSupportedOSOpt skipwhite
+syn region nsisManifestSupportedOSOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisManifestSupportedOSKwd
+syn match nsisManifestSupportedOSKwd	contained "\<\%(none\|all\|WinVista\|Win7\|Win8\|Win8\.1\|Win10\)\>"
+
+syn keyword nsisAttribute	contained RequestExecutionLevel nextgroup=nsisRequestExecutionLevelOpt skipwhite
+syn region nsisRequestExecutionLevelOpt  contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisRequestExecutionLevelKwd
+syn keyword nsisRequestExecutionLevelKwd contained none user highest admin
+
+syn keyword nsisAttribute	contained SetFont nextgroup=nsisLangOpt skipwhite
+
+syn keyword nsisAttribute	contained nextgroup=nsisShowInstDetailsOpt skipwhite
+			\ ShowInstDetails ShowUninstDetails
+syn region nsisShowInstDetailsOpt  contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisShowInstDetailsKwd
+syn keyword nsisShowInstDetailsKwd contained hide show nevershow
+
+syn keyword nsisAttribute	contained SilentInstall nextgroup=nsisSilentInstallOpt skipwhite
+syn region nsisSilentInstallOpt	 contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSilentInstallKwd
+syn keyword nsisSilentInstallKwd contained normal silent silentlog
+
+syn keyword nsisAttribute	contained SilentUnInstall nextgroup=nsisSilentUnInstallOpt skipwhite
+syn region nsisSilentUnInstallOpt  contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSilentUnInstallKwd
+syn keyword nsisSilentUnInstallKwd contained normal silent
+
+syn keyword nsisAttribute	contained nextgroup=nsisOnOffOpt skipwhite
+			\ WindowIcon XPStyle
+
+"COMPILER FLAGS (4.8.2)
+syn keyword nsisCompiler	contained nextgroup=nsisOnOffOpt skipwhite
+			\ AllowSkipFiles SetDatablockOptimize SetDateSave
+
+syn keyword nsisCompiler	contained FileBufSize SetCompressorDictSize
+
+syn keyword nsisCompiler	contained SetCompress nextgroup=nsisSetCompressOpt skipwhite
+syn region nsisSetCompressOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetCompressKwd
+syn keyword nsisSetCompressKwd  contained auto force off
+
+syn keyword nsisCompiler	contained SetCompressor nextgroup=nsisSetCompressorOpt skipwhite
+syn region nsisSetCompressorOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetCompressorKwd
+syn keyword nsisSetCompressorKwd  contained zlib bzip2 lzma
+syn match nsisSetCompressorKwd	contained "/\%(SOLID\|FINAL\)"
+
+syn keyword nsisCompiler	contained SetOverwrite nextgroup=nsisSetOverwriteOpt skipwhite
+syn region nsisSetOverwriteOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetOverwriteKwd
+syn keyword nsisSetOverwriteKwd	contained on off try ifnewer ifdiff lastused
+
+syn keyword nsisCompiler	contained Unicode nextgroup=nsisBooleanOpt skipwhite
+
+"VERSION INFORMATION (4.8.3)
+syn keyword nsisVersionInfo	contained VIAddVersionKey nextgroup=nsisLangOpt skipwhite
+
+syn keyword nsisVersionInfo	contained VIProductVersion VIFileVersion
+
+
+"FUNCTIONS - basic (4.9.1)
+syn keyword nsisInstruction	contained Delete Rename nextgroup=nsisDeleteOpt skipwhite
+syn region nsisDeleteOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisDeleteKwd
+syn match nsisDeleteKwd		contained "/REBOOTOK\>"
+
+syn keyword nsisInstruction	contained Exec ExecWait SetOutPath
+
+syn keyword nsisInstruction	contained ExecShell ExecShellWait nextgroup=nsisExecShellOpt skipwhite
+syn region nsisExecShellOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisExecShellKwd
+syn keyword nsisExecShellKwd	contained SW_SHOWDEFAULT SW_SHOWNORMAL SW_SHOWMAXIMIZED SW_SHOWMINIMIZED SW_HIDE
+syn match nsisExecShellKwd	contained "/INVOKEIDLIST\>"
+
+syn keyword nsisInstruction	contained File nextgroup=nsisFileOpt skipwhite
+syn region nsisFileOpt		contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisFileKwd
+syn match nsisFileKwd		contained "/\%(nonfatal\|[arx]\|oname\)\>"
+
+syn keyword nsisInstruction	contained ReserveFile nextgroup=nsisReserveFileOpt skipwhite
+syn region nsisReserveFileOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisReserveFileKwd
+syn match nsisReserveFileKwd	contained "/\%(nonfatal\|[rx]\|plugin\)\>"
+
+syn keyword nsisInstruction	contained RMDir nextgroup=nsisRMDirOpt skipwhite
+syn region nsisRMDirOpt		contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisRMDirKwd
+syn match nsisRMDirKwd		contained "/\%(REBOOTOK\|r\)\>"
+
+
+"FUNCTIONS - registry & ini (4.9.2)
+syn keyword nsisInstruction	contained DeleteINISec DeleteINIStr FlushINI ReadINIStr WriteINIStr
+syn keyword nsisInstruction	contained ExpandEnvStrings ReadEnvStr
+
+syn keyword nsisInstruction	contained DeleteRegKey nextgroup=nsisDeleteRegKeyOpt skipwhite
+syn region nsisDeleteRegKeyOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisDeleteRegKeyKwd,nsisRegistry
+syn match nsisDeleteRegKeyKwd	contained "/ifempty\>"
+
+syn keyword nsisInstruction	contained nextgroup=nsisRegistryOpt skipwhite
+			\ DeleteRegValue EnumRegKey EnumRegValue ReadRegDWORD ReadRegStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegStr
+syn region nsisRegistryOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisRegistry
+
+syn keyword nsisInstruction	contained WriteRegMultiStr nextgroup=nsisWriteRegMultiStrOpt skipwhite
+syn region nsisWriteRegMultiStrOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisRegistry,nsisWriteRegMultiStrKwd
+syn match nsisWriteRegMultiStrKwd  contained "/REGEDIT5\>"
+
+syn keyword nsisInstruction	contained SetRegView nextgroup=nsisSetRegViewOpt skipwhite
+syn region nsisSetRegViewOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetRegViewKwd
+syn keyword nsisSetRegViewKwd	contained default lastused
+
+"FUNCTIONS - general purpose (4.9.3)
+syn keyword nsisInstruction	contained CallInstDLL CreateDirectory GetDLLVersion
+syn keyword nsisInstruction	contained GetDLLVersionLocal GetFileTime GetFileTimeLocal
+syn keyword nsisInstruction	contained GetTempFileName SearchPath RegDLL UnRegDLL
+
+syn keyword nsisInstruction	contained CopyFiles nextgroup=nsisCopyFilesOpt skipwhite
+syn region nsisCopyFilesOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisCopyFilesKwd
+syn match nsisCopyFilesKwd	contained "/\%(SILENT\|FILESONLY\)\>"
+
+syn keyword nsisInstruction	contained CreateShortcut nextgroup=nsisCreateShortcutOpt skipwhite
+syn region nsisCreateShortcutOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisCreateShortcutKwd
+syn match nsisCreateShortcutKwd	 contained "/NoWorkingDir\>"
+
+syn keyword nsisInstruction	contained GetFullPathName nextgroup=nsisGetFullPathNameOpt skipwhite
+syn region nsisGetFullPathNameOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisGetFullPathNameKwd
+syn match nsisGetFullPathNameKwd  contained "/SHORT\>"
+
+syn keyword nsisInstruction	contained SetFileAttributes nextgroup=nsisSetFileAttributesOpt skipwhite
+syn region nsisSetFileAttributesOpt  contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisFileAttrib
+syn keyword nsisFileAttrib	contained NORMAL ARCHIVE HIDDEN OFFLINE READONLY SYSTEM TEMPORARY
+syn keyword nsisFileAttrib	contained FILE_ATTRIBUTE_NORMAL FILE_ATTRIBUTE_ARCHIVE FILE_ATTRIBUTE_HIDDEN
+syn keyword nsisFileAttrib	contained FILE_ATTRIBUTE_OFFLINE FILE_ATTRIBUTE_READONLY FILE_ATTRIBUTE_SYSTEM
+syn keyword nsisFileAttrib	contained FILE_ATTRIBUTE_TEMPORARY
+
+"FUNCTIONS - Flow Control (4.9.4)
+syn keyword nsisInstruction	contained Abort Call ClearErrors GetCurrentAddress
+syn keyword nsisInstruction	contained GetFunctionAddress GetLabelAddress Goto
+syn keyword nsisInstruction	contained IfAbort IfErrors IfFileExists IfRebootFlag IfSilent
+syn keyword nsisInstruction	contained IntCmp IntCmpU Int64Cmp Int64CmpU IntPtrCmp IntPtrCmpU
+syn keyword nsisInstruction	contained Return Quit SetErrors StrCmp StrCmpS
+
+syn keyword nsisInstruction	contained MessageBox nextgroup=nsisMessageBoxOpt skipwhite
+syn region nsisMessageBoxOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisMessageBox
+syn keyword nsisMessageBox	contained MB_OK MB_OKCANCEL MB_ABORTRETRYIGNORE MB_RETRYCANCEL MB_YESNO MB_YESNOCANCEL
+syn keyword nsisMessageBox	contained MB_ICONEXCLAMATION MB_ICONINFORMATION MB_ICONQUESTION MB_ICONSTOP MB_USERICON
+syn keyword nsisMessageBox	contained MB_TOPMOST MB_SETFOREGROUND MB_RIGHT MB_RTLREADING
+syn keyword nsisMessageBox	contained MB_DEFBUTTON1 MB_DEFBUTTON2 MB_DEFBUTTON3 MB_DEFBUTTON4
+syn keyword nsisMessageBox	contained IDABORT IDCANCEL IDIGNORE IDNO IDOK IDRETRY IDYES
+syn match nsisMessageBox	contained "/SD\>"
+
+"FUNCTIONS - File and directory i/o instructions (4.9.5)
+syn keyword nsisInstruction	contained FileClose FileOpen FileRead FileReadUTF16LE
+syn keyword nsisInstruction	contained FileReadByte FileReadWord FileSeek FileWrite
+syn keyword nsisInstruction	contained FileWriteByte FileWriteWord
+syn keyword nsisInstruction	contained FindClose FindFirst FindNext
+
+syn keyword nsisInstruction	contained FileWriteUTF16LE nextgroup=nsisFileWriteUTF16LEOpt skipwhite
+syn region nsisFileWriteUTF16LEOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisFileWriteUTF16LEKwd
+syn match nsisFileWriteUTF16LEKwd  contained "/BOM\>"
+
+"FUNCTIONS - Uninstaller instructions (4.9.6)
+syn keyword nsisInstruction	contained WriteUninstaller
+
+"FUNCTIONS - Misc instructions (4.9.7)
+syn keyword nsisInstruction	contained GetErrorLevel GetInstDirError InitPluginsDir Nop
+syn keyword nsisInstruction	contained SetErrorLevel Sleep
+
+syn keyword nsisInstruction	contained SetShellVarContext nextgroup=nsisSetShellVarContextOpt skipwhite
+syn region nsisSetShellVarContextOpt  contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetShellVarContextKwd
+syn keyword nsisSetShellVarContextKwd contained current all
+
+"FUNCTIONS - String manipulation support (4.9.8)
+syn keyword nsisInstruction	contained StrCpy StrLen
+
+"FUNCTIONS - Stack support (4.9.9)
+syn keyword nsisInstruction	contained Exch Push Pop
+
+"FUNCTIONS - Integer manipulation support (4.9.10)
+syn keyword nsisInstruction	contained IntFmt Int64Fmt IntOp IntPtrOp
+
+"FUNCTIONS - Rebooting support (4.9.11)
+syn keyword nsisInstruction	contained Reboot SetRebootFlag
+
+"FUNCTIONS - Install logging instructions (4.9.12)
+syn keyword nsisInstruction	contained LogSet nextgroup=nsisOnOffOpt skipwhite
+syn keyword nsisInstruction	contained LogText
+
+"FUNCTIONS - Section management instructions (4.9.13)
+syn keyword nsisInstruction	contained SectionSetFlags SectionGetFlags SectionSetText
+syn keyword nsisInstruction	contained SectionGetText SectionSetInstTypes SectionGetInstTypes
+syn keyword nsisInstruction	contained SectionSetSize SectionGetSize SetCurInstType GetCurInstType
+syn keyword nsisInstruction	contained InstTypeSetText InstTypeGetText
+
+"FUNCTIONS - User Interface Instructions (4.9.14)
+syn keyword nsisInstruction	contained BringToFront DetailPrint EnableWindow
+syn keyword nsisInstruction	contained FindWindow GetDlgItem HideWindow IsWindow
+syn keyword nsisInstruction	contained ShowWindow
+
+syn keyword nsisInstruction	contained CreateFont nextgroup=nsisFontOpt skipwhite
+
+syn keyword nsisInstruction	contained nextgroup=nsisBooleanOpt skipwhite
+			\ LockWindow SetAutoClose
+
+syn keyword nsisInstruction	contained SendMessage nextgroup=nsisSendMessageOpt skipwhite
+syn region nsisSendMessageOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSendMessageKwd
+syn match nsisSendMessageKwd	contained "/TIMEOUT\>"
+
+syn keyword nsisInstruction	contained SetBrandingImage nextgroup=nsisSetBrandingImageOpt skipwhite
+syn region nsisSetBrandingImageOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetBrandingImageKwd
+syn match nsisSetBrandingImageKwd  contained "/\%(IMGID\|RESIZETOFIT\)\>"
+
+syn keyword nsisInstruction	contained SetDetailsView nextgroup=nsisSetDetailsViewOpt skipwhite
+syn region nsisSetDetailsViewOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetDetailsViewKwd
+syn keyword nsisSetDetailsViewKwd	contained show hide
+
+syn keyword nsisInstruction	contained SetDetailsPrint nextgroup=nsisSetDetailsPrintOpt skipwhite
+syn region nsisSetDetailsPrintOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetDetailsPrintKwd
+syn keyword nsisSetDetailsPrintKwd	contained none listonly textonly both lastused
+
+syn keyword nsisInstruction	contained SetCtlColors nextgroup=nsisSetCtlColorsOpt skipwhite
+syn region nsisSetCtlColorsOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetCtlColorsKwd
+syn match nsisSetCtlColorsKwd	contained "/BRANDING\>"
+
+syn keyword nsisInstruction	contained SetSilent nextgroup=nsisSetSilentOpt skipwhite
+syn region nsisSetSilentOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSetSilentKwd
+syn keyword nsisSetSilentKwd	contained silent normal
+
+
+"FUNCTIONS - Multiple Languages Instructions (4.9.15)
+syn keyword nsisInstruction	contained LoadLanguageFile LangString LicenseLangString
+
+
+"SPECIAL FUNCTIONS - install (4.7.2.1)
+syn match nsisCallback		"\.onGUIInit"
+syn match nsisCallback		"\.onInit"
+syn match nsisCallback		"\.onInstFailed"
+syn match nsisCallback		"\.onInstSuccess"
+syn match nsisCallback		"\.onGUIEnd"
+syn match nsisCallback		"\.onMouseOverSection"
+syn match nsisCallback		"\.onRebootFailed"
+syn match nsisCallback		"\.onSelChange"
+syn match nsisCallback		"\.onUserAbort"
+syn match nsisCallback		"\.onVerifyInstDir"
+
+"SPECIAL FUNCTIONS - uninstall (4.7.2.2)
+syn match nsisCallback		"un\.onGUIInit"
+syn match nsisCallback		"un\.onInit"
+syn match nsisCallback		"un\.onUninstFailed"
+syn match nsisCallback		"un\.onUninstSuccess"
+syn match nsisCallback		"un\.onGUIEnd"
+syn match nsisCallback		"un\.onRebootFailed"
+syn match nsisCallback		"un\.onSelChange"
+syn match nsisCallback		"un\.onUserAbort"
+
+
+"COMPILER UTILITY (5.1)
+syn match nsisInclude		contained "!include\>" nextgroup=nsisIncludeOpt skipwhite
+syn region nsisIncludeOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisIncludeKwd
+syn match nsisIncludeKwd	contained "/\%(NONFATAL\|CHARSET\)\>"
+
+syn match nsisSystem		contained "!addincludedir\>"
+
+syn match nsisSystem		contained "!addplugindir\>" nextgroup=nsisAddplugindirOpt skipwhite
+syn region nsisAddplugindirOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisAddplugindirKwd
+syn match nsisAddplugindirKwd	contained "/\%(x86-ansi\|x86-unicode\)\>"
+
+syn match nsisSystem		contained "!appendfile\>" nextgroup=nsisAppendfileOpt skipwhite
+syn region nsisAppendfileOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisAppendfileKwd
+syn match nsisAppendfileKwd	contained "/\%(CHARSET\|RawNL\)\>"
+
+syn match nsisSystem		contained "!cd\>"
+
+syn match nsisSystem		contained "!delfile\>" nextgroup=nsisDelfileOpt skipwhite
+syn region nsisDelfileOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisDelfileKwd
+syn match nsisDelfileKwd	contained "/nonfatal\>"
+
+syn match nsisSystem		contained "!echo\>"
+syn match nsisSystem		contained "!error\>"
+syn match nsisSystem		contained "!execute\>"
+syn match nsisSystem		contained "!makensis\>"
+syn match nsisSystem		contained "!packhdr\>"
+syn match nsisSystem		contained "!finalize\>"
+syn match nsisSystem		contained "!system\>"
+syn match nsisSystem		contained "!tempfile\>"
+syn match nsisSystem		contained "!getdllversion\>"
+syn match nsisSystem		contained "!gettlbversion\>"
+syn match nsisSystem		contained "!warning\>"
+
+syn match nsisSystem		contained "!pragma\>" nextgroup=nsisPragmaOpt skipwhite
+syn region nsisPragmaOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisPragmaKwd
+syn keyword nsisPragmaKwd	contained enable disable default push pop
+
+syn match nsisSystem		contained "!verbose\>" nextgroup=nsisVerboseOpt skipwhite
+syn region nsisVerboseOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisVerboseKwd
+syn keyword nsisVerboseKwd	contained push pop
+
+"PREPROCESSOR (5.4)
+syn match nsisDefine		contained "!define\>" nextgroup=nsisDefineOpt skipwhite
+syn region nsisDefineOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisDefineKwd
+syn match nsisDefineKwd		contained "/\%(ifndef\|redef\|date\|utcdate\|math\|file\)\>"
+
+syn match nsisDefine		contained "!undef\>"
+syn match nsisPreCondit		contained "!ifdef\>"
+syn match nsisPreCondit		contained "!ifndef\>"
+
+syn match nsisPreCondit		contained "!if\>" nextgroup=nsisIfOpt skipwhite
+syn region nsisIfOpt		contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisIfKwd
+syn match nsisIfKwd		contained "/FileExists\>"
+
+syn match nsisPreCondit		contained "!ifmacrodef\>"
+syn match nsisPreCondit		contained "!ifmacrondef\>"
+syn match nsisPreCondit		contained "!else\>"
+syn match nsisPreCondit		contained "!endif\>"
+syn match nsisMacro		contained "!insertmacro\>"
+syn match nsisMacro		contained "!macro\>"
+syn match nsisMacro		contained "!macroend\>"
+syn match nsisMacro		contained "!macroundef\>"
+
+syn match nsisMacro		contained "!searchparse\>" nextgroup=nsisSearchparseOpt skipwhite
+syn region nsisSearchparseOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSearchparseKwd
+syn match nsisSearchparseKwd	contained "/\%(ignorecase\|noerrors\|file\)\>"
+
+syn match nsisMacro		contained "!searchreplace\>" nextgroup=nsisSearchreplaceOpt skipwhite
+syn region nsisSearchreplaceOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSearchreplaceKwd
+syn match nsisSearchreplaceKwd	contained "/ignorecase\>"
+
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link nsisInstruction		Function
+hi def link nsisComment			Comment
+hi def link nsisFirstComment		Comment
+hi def link nsisLocalLabel		Label
+hi def link nsisGlobalLabel		Label
+hi def link nsisStatement		Statement
+hi def link nsisString			String
+hi def link nsisBoolean			Boolean
+hi def link nsisOnOff			Boolean
+hi def link nsisFontKwd			Constant
+hi def link nsisLangKwd			Constant
+hi def link nsisPageKwd			Constant
+hi def link nsisPageExKwd		Constant
+hi def link nsisSectionKwd		Constant
+hi def link nsisSectionInKwd		Constant
+hi def link nsisSectionGroupKwd		Constant
+hi def link nsisVarKwd			Constant
+hi def link nsisAddBrandingImageKwd	Constant
+hi def link nsisBGGradientKwd		Constant
+hi def link nsisBrandingTextKwd		Constant
+hi def link nsisCRCCheckKwd		Constant
+hi def link nsisDirVerifyKwd		Constant
+hi def link nsisInstallColorsKwd	Constant
+hi def link nsisInstTypeKwd		Constant
+hi def link nsisLicenseBkColorKwd	Constant
+hi def link nsisLicenseForceSelectionKwd Constant
+hi def link nsisManifestDPIAwareKwd	Constant
+hi def link nsisManifestSupportedOSKwd	Constant
+hi def link nsisRequestExecutionLevelKwd Constant
+hi def link nsisShowInstDetailsKwd	Constant
+hi def link nsisSilentInstallKwd	Constant
+hi def link nsisSilentUnInstallKwd	Constant
+hi def link nsisSetCompressKwd		Constant
+hi def link nsisSetCompressorKwd	Constant
+hi def link nsisSetOverwriteKwd		Constant
+hi def link nsisDeleteKwd		Constant
+hi def link nsisExecShellKwd		Constant
+hi def link nsisFileKwd			Constant
+hi def link nsisReserveFileKwd		Constant
+hi def link nsisRMDirKwd		Constant
+hi def link nsisDeleteRegKeyKwd		Constant
+hi def link nsisWriteRegMultiStrKwd	Constant
+hi def link nsisSetRegViewKwd		Constant
+hi def link nsisCopyFilesKwd		Constant
+hi def link nsisCreateShortcutKwd	Constant
+hi def link nsisGetFullPathNameKwd	Constant
+hi def link nsisFileAttrib		Constant
+hi def link nsisMessageBox		Constant
+hi def link nsisFileWriteUTF16LEKwd	Constant
+hi def link nsisSetShellVarContextKwd	Constant
+hi def link nsisSendMessageKwd		Constant
+hi def link nsisSetBrandingImageKwd	Constant
+hi def link nsisSetDetailsViewKwd	Constant
+hi def link nsisSetDetailsPrintKwd	Constant
+hi def link nsisSetCtlColorsKwd		Constant
+hi def link nsisSetSilentKwd		Constant
+hi def link nsisRegistry		Identifier
+hi def link nsisNumber			Number
+hi def link nsisError			Error
+hi def link nsisUserVar			Identifier
+hi def link nsisSysVar			Identifier
+hi def link nsisAttribute		Type
+hi def link nsisCompiler		Type
+hi def link nsisVersionInfo		Type
+hi def link nsisTodo			Todo
+hi def link nsisCallback		Identifier
+" preprocessor commands
+hi def link nsisPreprocSubst		PreProc
+hi def link nsisPreprocLangStr		PreProc
+hi def link nsisPreprocEnvVar		PreProc
+hi def link nsisDefine			Define
+hi def link nsisMacro			Macro
+hi def link nsisPreCondit		PreCondit
+hi def link nsisInclude			Include
+hi def link nsisSystem			PreProc
+hi def link nsisLineContinuation	Special
+hi def link nsisIncludeKwd		Constant
+hi def link nsisAddplugindirKwd		Constant
+hi def link nsisAppendfileKwd		Constant
+hi def link nsisDelfileKwd		Constant
+hi def link nsisPragmaKwd		Constant
+hi def link nsisVerboseKwd		Constant
+hi def link nsisDefineKwd		Constant
+hi def link nsisIfKwd			Constant
+hi def link nsisSearchparseKwd		Constant
+hi def link nsisSearchreplaceKwd	Constant
+
+
+let b:current_syntax = "nsis"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/obj.vim b/syntax/obj.vim
new file mode 100644
index 000000000..3d335d095
--- /dev/null
+++ b/syntax/obj.vim
@@ -0,0 +1,87 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'obj') == -1
+
+" Vim syntax file
+" Language:	3D wavefront's obj file
+" Maintainer:	Vincent Berthoux <twinside@gmail.com>
+" File Types:	.obj (used in 3D)
+" Last Change:  2010 May 18
+"
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match       objError        "^\a\+"
+
+syn match       objKeywords     "^cstype\s"
+syn match       objKeywords     "^ctech\s"
+syn match       objKeywords     "^stech\s"
+syn match       objKeywords     "^deg\s"
+syn match       objKeywords     "^curv\(2\?\)\s"
+syn match       objKeywords     "^parm\s"
+syn match       objKeywords     "^surf\s"
+syn match       objKeywords     "^end\s"
+syn match       objKeywords     "^bzp\s"
+syn match       objKeywords     "^bsp\s"
+syn match       objKeywords     "^res\s"
+syn match       objKeywords     "^cdc\s"
+syn match       objKeywords     "^con\s"
+
+syn match       objKeywords     "^shadow_obj\s"
+syn match       objKeywords     "^trace_obj\s"
+syn match       objKeywords     "^usemap\s"
+syn match       objKeywords     "^lod\s"
+syn match       objKeywords     "^maplib\s"
+syn match       objKeywords     "^d_interp\s"
+syn match       objKeywords     "^c_interp\s"
+syn match       objKeywords     "^bevel\s"
+syn match       objKeywords     "^mg\s"
+syn match       objKeywords     "^s\s"
+syn match       objKeywords     "^con\s"
+syn match       objKeywords     "^trim\s"
+syn match       objKeywords     "^hole\s"
+syn match       objKeywords     "^scrv\s"
+syn match       objKeywords     "^sp\s"
+syn match       objKeywords     "^step\s"
+syn match       objKeywords     "^bmat\s"
+syn match       objKeywords     "^csh\s"
+syn match       objKeywords     "^call\s"
+
+syn match       objComment      "^#.*"
+syn match       objVertex       "^v\s"
+syn match       objFace         "^f\s"
+syn match       objVertice      "^vt\s"
+syn match       objNormale      "^vn\s"
+syn match       objGroup        "^g\s.*"
+syn match       objMaterial     "^usemtl\s.*"
+syn match       objInclude      "^mtllib\s.*"
+
+syn match       objFloat        "-\?\d\+\.\d\+\(e\(+\|-\)\d\+\)\?"
+syn match       objInt          "\d\+"
+syn match       objIndex        "\d\+\/\d*\/\d*"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link objError           Error
+hi def link objComment         Comment
+hi def link objInclude         PreProc
+hi def link objFloat           Float
+hi def link objInt             Number
+hi def link objGroup           Structure
+hi def link objIndex           Constant
+hi def link objMaterial        Label
+
+hi def link objVertex          Keyword
+hi def link objNormale         Keyword
+hi def link objVertice         Keyword
+hi def link objFace            Keyword
+hi def link objKeywords        Keyword
+
+
+
+let b:current_syntax = "obj"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/occam.vim b/syntax/occam.vim
new file mode 100644
index 000000000..dc42ecf42
--- /dev/null
+++ b/syntax/occam.vim
@@ -0,0 +1,120 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'occam') == -1
+
+" Vim syntax file
+" Language:	occam
+" Copyright:	Fred Barnes <frmb2@kent.ac.uk>, Mario Schweigler <ms44@kent.ac.uk>
+" Maintainer:	Mario Schweigler <ms44@kent.ac.uk>
+" Last Change:	24 May 2003
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+"{{{  Settings
+" Set shift width for indent
+setlocal shiftwidth=2
+" Set the tab key size to two spaces
+setlocal softtabstop=2
+" Let tab keys always be expanded to spaces
+setlocal expandtab
+
+" Dots are valid in occam identifiers
+setlocal iskeyword+=.
+"}}}
+
+syn case match
+
+syn keyword occamType		BYTE BOOL INT INT16 INT32 INT64 REAL32 REAL64 ANY
+syn keyword occamType		CHAN DATA OF TYPE TIMER INITIAL VAL PORT MOBILE PLACED
+syn keyword occamType		PROCESSOR PACKED RECORD PROTOCOL SHARED ROUND TRUNC
+
+syn keyword occamStructure	SEQ PAR IF ALT PRI FORKING PLACE AT
+
+syn keyword occamKeyword	PROC IS TRUE FALSE SIZE RECURSIVE REC
+syn keyword occamKeyword	RETYPES RESHAPES STEP FROM FOR RESCHEDULE STOP SKIP FORK
+syn keyword occamKeyword	FUNCTION VALOF RESULT ELSE CLONE CLAIM
+syn keyword occamBoolean	TRUE FALSE
+syn keyword occamRepeat		WHILE
+syn keyword occamConditional	CASE
+syn keyword occamConstant	MOSTNEG MOSTPOS
+
+syn match occamBrackets		/\[\|\]/
+syn match occamParantheses	/(\|)/
+
+syn keyword occamOperator	AFTER TIMES MINUS PLUS INITIAL REM AND OR XOR NOT
+syn keyword occamOperator	BITAND BITOR BITNOT BYTESIN OFFSETOF
+
+syn match occamOperator		/::\|:=\|?\|!/
+syn match occamOperator		/<\|>\|+\|-\|\*\|\/\|\\\|=\|\~/
+syn match occamOperator		/@\|\$\$\|%\|&&\|<&\|&>\|<\]\|\[>\|\^/
+
+syn match occamSpecialChar	/\M**\|*'\|*"\|*#\(\[0-9A-F\]\+\)/ contained
+syn match occamChar		/\M\L\='\[^*\]'/
+syn match occamChar		/L'[^']*'/ contains=occamSpecialChar
+
+syn case ignore
+syn match occamTodo		/\<todo\>:\=/ contained
+syn match occamNote		/\<note\>:\=/ contained
+syn case match
+syn keyword occamNote		NOT contained
+
+syn match occamComment		/--.*/ contains=occamCommentTitle,occamTodo,occamNote
+syn match occamCommentTitle	/--\s*\u\a*\(\s\+\u\a*\)*:/hs=s+2 contained contains=occamTodo,occamNote
+syn match occamCommentTitle	/--\s*KROC-LIBRARY\(\.so\|\.a\)\=\s*$/hs=s+2 contained
+syn match occamCommentTitle	/--\s*\(KROC-OPTIONS:\|RUN-PARAMETERS:\)/hs=s+2 contained
+
+syn match occamIdentifier	/\<[A-Z.][A-Z.0-9]*\>/
+syn match occamFunction		/\<[A-Za-z.][A-Za-z0-9.]*\>/ contained
+
+syn match occamPPIdentifier	/##.\{-}\>/
+
+syn region occamString		start=/"/ skip=/\M*"/ end=/"/ contains=occamSpecialChar
+syn region occamCharString	start=/'/ end=/'/ contains=occamSpecialChar
+
+syn match occamNumber		/\<\d\+\(\.\d\+\(E\(+\|-\)\d\+\)\=\)\=/
+syn match occamNumber		/-\d\+\(\.\d\+\(E\(+\|-\)\d\+\)\=\)\=/
+syn match occamNumber		/#\(\d\|[A-F]\)\+/
+syn match occamNumber		/-#\(\d\|[A-F]\)\+/
+
+syn keyword occamCDString	SHARED EXTERNAL DEFINED NOALIAS NOUSAGE NOT contained
+syn keyword occamCDString	FILE LINE PROCESS.PRIORITY OCCAM2.5 contained
+syn keyword occamCDString	USER.DEFINED.OPERATORS INITIAL.DECL MOBILES contained
+syn keyword occamCDString	BLOCKING.SYSCALLS VERSION NEED.QUAD.ALIGNMENT contained
+syn keyword occamCDString	TARGET.CANONICAL TARGET.CPU TARGET.OS TARGET.VENDOR contained
+syn keyword occamCDString	TRUE FALSE AND OR contained
+syn match occamCDString		/<\|>\|=\|(\|)/ contained
+
+syn region occamCDirective	start=/#\(USE\|INCLUDE\|PRAGMA\|DEFINE\|UNDEFINE\|UNDEF\|IF\|ELIF\|ELSE\|ENDIF\|WARNING\|ERROR\|RELAX\)\>/ end=/$/ contains=occamString,occamComment,occamCDString
+
+
+hi def link occamType Type
+hi def link occamKeyword Keyword
+hi def link occamComment Comment
+hi def link occamCommentTitle PreProc
+hi def link occamTodo Todo
+hi def link occamNote Todo
+hi def link occamString String
+hi def link occamCharString String
+hi def link occamNumber Number
+hi def link occamCDirective PreProc
+hi def link occamCDString String
+hi def link occamPPIdentifier PreProc
+hi def link occamBoolean Boolean
+hi def link occamSpecialChar SpecialChar
+hi def link occamChar Character
+hi def link occamStructure Structure
+hi def link occamIdentifier Identifier
+hi def link occamConstant Constant
+hi def link occamOperator Operator
+hi def link occamFunction Ignore
+hi def link occamRepeat Repeat
+hi def link occamConditional Conditional
+hi def link occamBrackets Type
+hi def link occamParantheses Delimiter
+
+
+let b:current_syntax = "occam"
+
+
+endif
diff --git a/syntax/omnimark.vim b/syntax/omnimark.vim
new file mode 100644
index 000000000..315bfb78a
--- /dev/null
+++ b/syntax/omnimark.vim
@@ -0,0 +1,110 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'omnimark') == -1
+
+" Vim syntax file
+" Language:	Omnimark
+" Maintainer:	Paul Terray <mailto:terray@4dconcept.fr>
+" Last Change:	11 Oct 2000
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword=@,48-57,_,128-167,224-235,-
+
+syn keyword omnimarkKeywords	ACTIVATE AGAIN
+syn keyword omnimarkKeywords	CATCH CLEAR CLOSE COPY COPY-CLEAR CROSS-TRANSLATE
+syn keyword omnimarkKeywords	DEACTIVATE DECLARE DECREMENT DEFINE DISCARD DIVIDE DO DOCUMENT-END DOCUMENT-START DONE DTD-START
+syn keyword omnimarkKeywords	ELEMENT ELSE ESCAPE EXIT
+syn keyword omnimarkKeywords	FAIL FIND FIND-END FIND-START FORMAT
+syn keyword omnimarkKeywords	GROUP
+syn keyword omnimarkKeywords	HALT HALT-EVERYTHING
+syn keyword omnimarkKeywords	IGNORE IMPLIED INCLUDE INCLUDE-END INCLUDE-START INCREMENT INPUT
+syn keyword omnimarkKeywords	JOIN
+syn keyword omnimarkKeywords	LINE-END LINE-START LOG LOOKAHEAD
+syn keyword omnimarkKeywords	MACRO
+syn keyword omnimarkKeywords	MACRO-END MARKED-SECTION MARKUP-COMMENT MARKUP-ERROR MARKUP-PARSER MASK MATCH MINUS MODULO
+syn keyword omnimarkKeywords	NEW NEWLINE NEXT
+syn keyword omnimarkKeywords	OPEN OUTPUT OUTPUT-TO OVER
+syn keyword omnimarkKeywords	PROCESS PROCESS-END PROCESS-START PROCESSING-INSTRUCTION PROLOG-END PROLOG-IN-ERROR PUT
+syn keyword omnimarkKeywords	REMOVE REOPEN REPEAT RESET RETHROW RETURN
+syn keyword omnimarkKeywords	WHEN WHITE-SPACE
+syn keyword omnimarkKeywords	SAVE SAVE-CLEAR SCAN SELECT SET SGML SGML-COMMENT SGML-DECLARATION-END SGML-DTD SGML-DTDS SGML-ERROR SGML-IN SGML-OUT SGML-PARSE SGML-PARSER SHIFT SUBMIT SUCCEED SUPPRESS
+syn keyword omnimarkKeywords	SYSTEM-CALL
+syn keyword omnimarkKeywords	TEST-SYSTEM THROW TO TRANSLATE
+syn keyword omnimarkKeywords	UC UL UNLESS UP-TRANSLATE
+syn keyword omnimarkKeywords	XML-PARSE
+
+syn keyword omnimarkCommands	ACTIVE AFTER ANCESTOR AND ANOTHER ARG AS ATTACHED ATTRIBUTE ATTRIBUTES
+syn keyword omnimarkCommands	BASE BEFORE BINARY BINARY-INPUT BINARY-MODE BINARY-OUTPUT BREAK-WIDTH BUFFER BY
+syn keyword omnimarkCommands	CASE CHILDREN CLOSED COMPILED-DATE COMPLEMENT CONREF CONTENT CONTEXT-TRANSLATE COUNTER CREATED CREATING CREATOR CURRENT
+syn keyword omnimarkCommands	DATA-ATTRIBUTE DATA-ATTRIBUTES DATA-CONTENT DATA-LETTERS DATE DECLARED-CONREF DECLARED-CURRENT DECLARED-DEFAULTED DECLARED-FIXED DECLARED-IMPLIED DECLARED-REQUIRED
+syn keyword omnimarkCommands	DEFAULT-ENTITY DEFAULTED DEFAULTING DELIMITER DIFFERENCE DIRECTORY DOCTYPE DOCUMENT DOCUMENT-ELEMENT DOMAIN-FREE DOWN-TRANSLATE DTD DTD-END DTDS
+syn keyword omnimarkCommands	ELEMENTS ELSEWHERE EMPTY ENTITIES ENTITY EPILOG-START EQUAL EXCEPT EXISTS EXTERNAL EXTERNAL-DATA-ENTITY EXTERNAL-ENTITY EXTERNAL-FUNCTION EXTERNAL-OUTPUT-FUNCTION
+syn keyword omnimarkCommands	EXTERNAL-TEXT-ENTITY
+syn keyword omnimarkCommands	FALSE FILE FUNCTION FUNCTION-LIBRARY
+syn keyword omnimarkCommands	GENERAL GLOBAL GREATER-EQUAL GREATER-THAN GROUPS
+syn keyword omnimarkCommands	HAS HASNT HERALDED-NAMES
+syn keyword omnimarkCommands	ID ID-CHECKING IDREF IDREFS IN IN-LIBRARY INCLUSION INITIAL INITIAL-SIZE INSERTION-BREAK INSTANCE INTERNAL INVALID-DATA IS ISNT ITEM
+syn keyword omnimarkCommands	KEY KEYED
+syn keyword omnimarkCommands	LAST LASTMOST LC LENGTH LESS-EQUAL LESS-THAN LETTERS LIBRARY LITERAL LOCAL
+syn keyword omnimarkCommands	MATCHES MIXED MODIFIABLE
+syn keyword omnimarkCommands	NAME NAME-LETTERS NAMECASE NAMED NAMES NDATA-ENTITY NEGATE NESTED-REFERENTS NMTOKEN NMTOKENS NO NO-DEFAULT-IO NON-CDATA NON-IMPLIED NON-SDATA NOT NOTATION NUMBER-OF NUMBERS
+syn keyword omnimarkCommands	NUTOKEN NUTOKENS
+syn keyword omnimarkCommands	OCCURRENCE OF OPAQUE OPTIONAL OR
+syn keyword omnimarkCommands	PARAMETER PARENT PAST PATTERN PLUS PREPARENT PREVIOUS PROPER PUBLIC
+syn keyword omnimarkCommands	READ-ONLY READABLE REFERENT REFERENTS REFERENTS-ALLOWED REFERENTS-DISPLAYED REFERENTS-NOT-ALLOWED REMAINDER REPEATED REPLACEMENT-BREAK REVERSED
+syn keyword omnimarkCommands	SILENT-REFERENT SIZE SKIP SOURCE SPECIFIED STATUS STREAM SUBDOC-ENTITY SUBDOCUMENT SUBDOCUMENTS SUBELEMENT SWITCH SYMBOL SYSTEM
+syn keyword omnimarkCommands	TEXT-MODE THIS TIMES TOKEN TRUE
+syn keyword omnimarkCommands	UNANCHORED UNATTACHED UNION USEMAP USING
+syn keyword omnimarkCommands	VALUE VALUED VARIABLE
+syn keyword omnimarkCommands	WITH WRITABLE
+syn keyword omnimarkCommands	XML XML-DTD XML-DTDS
+syn keyword omnimarkCommands	YES
+syn keyword omnimarkCommands	#ADDITIONAL-INFO #APPINFO #CAPACITY #CHARSET #CLASS #COMMAND-LINE-NAMES #CONSOLE #CURRENT-INPUT #CURRENT-OUTPUT #DATA #DOCTYPE #DOCUMENT #DTD #EMPTY #ERROR #ERROR-CODE
+syn keyword omnimarkCommands	#FILE-NAME #FIRST #GROUP #IMPLIED #ITEM #LANGUAGE-VERSION #LAST #LIBPATH #LIBRARY #LIBVALUE #LINE-NUMBER #MAIN-INPUT #MAIN-OUTPUT #MARKUP-ERROR-COUNT #MARKUP-ERROR-TOTAL
+syn keyword omnimarkCommands	#MARKUP-PARSER #MARKUP-WARNING-COUNT #MARKUP-WARNING-TOTAL #MESSAGE #NONE #OUTPUT #PLATFORM-INFO #PROCESS-INPUT #PROCESS-OUTPUT #RECOVERY-INFO #SGML #SGML-ERROR-COUNT
+syn keyword omnimarkCommands	#SGML-ERROR-TOTAL #SGML-WARNING-COUNT #SGML-WARNING-TOTAL #SUPPRESS #SYNTAX #!
+
+syn keyword omnimarkPatterns	ANY ANY-TEXT
+syn keyword omnimarkPatterns	BLANK
+syn keyword omnimarkPatterns	CDATA CDATA-ENTITY CONTENT-END CONTENT-START
+syn keyword omnimarkPatterns	DIGIT
+syn keyword omnimarkPatterns	LETTER
+syn keyword omnimarkPatterns	NUMBER
+syn keyword omnimarkPatterns	PCDATA
+syn keyword omnimarkPatterns	RCDATA
+syn keyword omnimarkPatterns	SDATA SDATA-ENTITY SPACE
+syn keyword omnimarkPatterns	TEXT
+syn keyword omnimarkPatterns	VALUE-END VALUE-START
+syn keyword omnimarkPatterns	WORD-END WORD-START
+
+syn region  omnimarkComment	start=";" end="$"
+
+" strings
+syn region  omnimarkString		matchgroup=Normal start=+'+  end=+'+ skip=+%'+ contains=omnimarkEscape
+syn region  omnimarkString		matchgroup=Normal start=+"+  end=+"+ skip=+%"+ contains=omnimarkEscape
+syn match  omnimarkEscape contained +%.+
+syn match  omnimarkEscape contained +%[0-9][0-9]#+
+
+"syn sync maxlines=100
+syn sync minlines=2000
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link omnimarkCommands		Statement
+hi def link omnimarkKeywords		Identifier
+hi def link omnimarkString		String
+hi def link omnimarkPatterns		Macro
+"  hi def link omnimarkNumber			Number
+hi def link omnimarkComment		Comment
+hi def link omnimarkEscape		Special
+
+
+let b:current_syntax = "omnimark"
+
+" vim: ts=8
+
+
+endif
diff --git a/syntax/openroad.vim b/syntax/openroad.vim
new file mode 100644
index 000000000..1e5730cc5
--- /dev/null
+++ b/syntax/openroad.vim
@@ -0,0 +1,256 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'openroad') == -1
+
+" Vim syntax file
+" Language:		CA-OpenROAD
+" Maintainer:	Luis Moreno <lmoreno@eresmas.net>
+" Last change:	2001 Jun 12
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+syntax case ignore
+
+" Keywords
+"
+syntax keyword openroadKeyword	ABORT ALL ALTER AND ANY AS ASC AT AVG BEGIN
+syntax keyword openroadKeyword	BETWEEN BY BYREF CALL CALLFRAME CALLPROC CASE
+syntax keyword openroadKeyword	CLEAR CLOSE COMMIT CONNECT CONTINUE COPY COUNT
+syntax keyword openroadKeyword	CREATE CURRENT DBEVENT DECLARE DEFAULT DELETE
+syntax keyword openroadKeyword	DELETEROW DESC DIRECT DISCONNECT DISTINCT DO
+syntax keyword openroadKeyword	DROP ELSE ELSEIF END ENDCASE ENDDECLARE ENDFOR
+syntax keyword openroadKeyword	ENDIF ENDLOOP ENDWHILE ESCAPE EXECUTE EXISTS
+syntax keyword openroadKeyword	EXIT FETCH FIELD FOR FROM GOTOFRAME GRANT GROUP
+syntax keyword openroadKeyword	HAVING IF IMMEDIATE IN INDEX INITIALISE
+syntax keyword openroadKeyword	INITIALIZE INQUIRE_INGRES INQUIRE_SQL INSERT
+syntax keyword openroadKeyword	INSERTROW INSTALLATION INTEGRITY INTO KEY LIKE
+syntax keyword openroadKeyword	LINK MAX MESSAGE METHOD MIN MODE MODIFY NEXT
+syntax keyword openroadKeyword	NOECHO NOT NULL OF ON OPEN OPENFRAME OR ORDER
+syntax keyword openroadKeyword	PERMIT PROCEDURE PROMPT QUALIFICATION RAISE
+syntax keyword openroadKeyword	REGISTER RELOCATE REMOVE REPEAT REPEATED RESUME
+syntax keyword openroadKeyword	RETURN RETURNING REVOKE ROLE ROLLBACK RULE SAVE
+syntax keyword openroadKeyword	SAVEPOINT SELECT SET SLEEP SOME SUM SYSTEM TABLE
+syntax keyword openroadKeyword	THEN TO TRANSACTION UNION UNIQUE UNTIL UPDATE
+syntax keyword openroadKeyword	VALUES VIEW WHERE WHILE WITH WORK
+
+syntax keyword openroadTodo contained	TODO
+
+" Catch errors caused by wrong parenthesis
+"
+syntax cluster	openroadParenGroup	contains=openroadParenError,openroadTodo
+syntax region	openroadParen		transparent start='(' end=')' contains=ALLBUT,@openroadParenGroup
+syntax match	openroadParenError	")"
+highlight link	openroadParenError	cError
+
+" Numbers
+"
+syntax match	openroadNumber		"\<[0-9]\+\>"
+
+" String
+"
+syntax region	openroadString		start=+'+  end=+'+
+
+" Operators, Data Types and Functions
+"
+syntax match	openroadOperator	/[\+\-\*\/=\<\>;\(\)]/
+
+syntax keyword	openroadType		ARRAY BYTE CHAR DATE DECIMAL FLOAT FLOAT4
+syntax keyword	openroadType		FLOAT8 INT1 INT2 INT4 INTEGER INTEGER1
+syntax keyword	openroadType		INTEGER2 INTEGER4 MONEY OBJECT_KEY
+syntax keyword	openroadType		SECURITY_LABEL SMALLINT TABLE_KEY VARCHAR
+
+syntax keyword	openroadFunc		IFNULL
+
+" System Classes
+"
+syntax keyword	openroadClass	ACTIVEFIELD ANALOGFIELD APPFLAG APPSOURCE
+syntax keyword	openroadClass	ARRAYOBJECT ATTRIBUTEOBJECT BARFIELD
+syntax keyword	openroadClass	BITMAPOBJECT BOXTRIM BREAKSPEC BUTTONFIELD
+syntax keyword	openroadClass	CELLATTRIBUTE CHOICEBITMAP CHOICEDETAIL
+syntax keyword	openroadClass	CHOICEFIELD CHOICEITEM CHOICELIST CLASS
+syntax keyword	openroadClass	CLASSSOURCE COLUMNCROSS COLUMNFIELD
+syntax keyword	openroadClass	COMPOSITEFIELD COMPSOURCE CONTROLBUTTON
+syntax keyword	openroadClass	CROSSTABLE CURSORBITMAP CURSOROBJECT DATASTREAM
+syntax keyword	openroadClass	DATEOBJECT DBEVENTOBJECT DBSESSIONOBJECT
+syntax keyword	openroadClass	DISPLAYFORM DYNEXPR ELLIPSESHAPE ENTRYFIELD
+syntax keyword	openroadClass	ENUMFIELD EVENT EXTOBJECT EXTOBJFIELD
+syntax keyword	openroadClass	FIELDOBJECT FLEXIBLEFORM FLOATOBJECT FORMFIELD
+syntax keyword	openroadClass	FRAMEEXEC FRAMEFORM FRAMESOURCE FREETRIM
+syntax keyword	openroadClass	GHOSTEXEC GHOSTSOURCE IMAGEFIELD IMAGETRIM
+syntax keyword	openroadClass	INTEGEROBJECT LISTFIELD LISTVIEWCOLATTR
+syntax keyword	openroadClass	LISTVIEWFIELD LONGBYTEOBJECT LONGVCHAROBJECT
+syntax keyword	openroadClass	MATRIXFIELD MENUBAR MENUBUTTON MENUFIELD
+syntax keyword	openroadClass	MENUGROUP MENUITEM MENULIST MENUSEPARATOR
+syntax keyword	openroadClass	MENUSTACK MENUTOGGLE METHODEXEC METHODOBJECT
+syntax keyword	openroadClass	MONEYOBJECT OBJECT OPTIONFIELD OPTIONMENU
+syntax keyword	openroadClass	PALETTEFIELD POPUPBUTTON PROC4GLSOURCE PROCEXEC
+syntax keyword	openroadClass	PROCHANDLE QUERYCOL QUERYOBJECT QUERYPARM
+syntax keyword	openroadClass	QUERYTABLE RADIOFIELD RECTANGLESHAPE ROWCROSS
+syntax keyword	openroadClass	SCALARFIELD SCOPE SCROLLBARFIELD SEGMENTSHAPE
+syntax keyword	openroadClass	SESSIONOBJECT SHAPEFIELD SLIDERFIELD SQLSELECT
+syntax keyword	openroadClass	STACKFIELD STRINGOBJECT SUBFORM TABBAR
+syntax keyword	openroadClass	TABFIELD TABFOLDER TABLEFIELD TABPAGE
+syntax keyword	openroadClass	TOGGLEFIELD TREE TREENODE TREEVIEWFIELD
+syntax keyword	openroadClass	USERCLASSOBJECT USEROBJECT VIEWPORTFIELD
+
+" System Events
+"
+syntax keyword	openroadEvent	CHILDCLICK CHILDCLICKPOINT CHILDCOLLAPSED
+syntax keyword	openroadEvent	CHILDDETAILS CHILDDOUBLECLICK CHILDDRAGBOX
+syntax keyword	openroadEvent	CHILDDRAGSEGMENT CHILDENTRY CHILDEXIT
+syntax keyword	openroadEvent	CHILDEXPANDED CHILDHEADERCLICK CHILDMOVED
+syntax keyword	openroadEvent	CHILDPROPERTIES CHILDRESIZED CHILDSCROLL
+syntax keyword	openroadEvent	CHILDSELECT CHILDSELECTIONCHANGED CHILDSETVALUE
+syntax keyword	openroadEvent	CHILDUNSELECT CHILDVALIDATE CLICK CLICKPOINT
+syntax keyword	openroadEvent	COLLAPSED DBEVENT DETAILS DOUBLECLICK DRAGBOX
+syntax keyword	openroadEvent	DRAGSEGMENT ENTRY EXIT EXPANDED EXTCLASSEVENT
+syntax keyword	openroadEvent	FRAMEACTIVATE FRAMEDEACTIVATE HEADERCLICK
+syntax keyword	openroadEvent	INSERTROW LABELCHANGED MOVED PAGEACTIVATED
+syntax keyword	openroadEvent	PAGECHANGED PAGEDEACTIVATED PROPERTIES RESIZED
+syntax keyword	openroadEvent	SCROLL SELECT SELECTIONCHANGED SETVALUE
+syntax keyword	openroadEvent	TERMINATE UNSELECT USEREVENT VALIDATE
+syntax keyword	openroadEvent	WINDOWCLOSE WINDOWICON WINDOWMOVED WINDOWRESIZED
+syntax keyword	openroadEvent	WINDOWVISIBLE
+
+" System Constants
+"
+syntax keyword	openroadConst	BF_BMP BF_GIF BF_SUNRASTER BF_TIFF
+syntax keyword	openroadConst	BF_WINDOWCURSOR BF_WINDOWICON BF_XBM
+syntax keyword	openroadConst	CC_BACKGROUND CC_BLACK CC_BLUE CC_BROWN CC_CYAN
+syntax keyword	openroadConst	CC_DEFAULT_1 CC_DEFAULT_10 CC_DEFAULT_11
+syntax keyword	openroadConst	CC_DEFAULT_12 CC_DEFAULT_13 CC_DEFAULT_14
+syntax keyword	openroadConst	CC_DEFAULT_15 CC_DEFAULT_16 CC_DEFAULT_17
+syntax keyword	openroadConst	CC_DEFAULT_18 CC_DEFAULT_19 CC_DEFAULT_2
+syntax keyword	openroadConst	CC_DEFAULT_20 CC_DEFAULT_21 CC_DEFAULT_22
+syntax keyword	openroadConst	CC_DEFAULT_23 CC_DEFAULT_24 CC_DEFAULT_25
+syntax keyword	openroadConst	CC_DEFAULT_26 CC_DEFAULT_27 CC_DEFAULT_28
+syntax keyword	openroadConst	CC_DEFAULT_29 CC_DEFAULT_3 CC_DEFAULT_30
+syntax keyword	openroadConst	CC_DEFAULT_4 CC_DEFAULT_5 CC_DEFAULT_6
+syntax keyword	openroadConst	CC_DEFAULT_7 CC_DEFAULT_8 CC_DEFAULT_9
+syntax keyword	openroadConst	CC_FOREGROUND CC_GRAY CC_GREEN CC_LIGHT_BLUE
+syntax keyword	openroadConst	CC_LIGHT_BROWN	CC_LIGHT_CYAN CC_LIGHT_GRAY
+syntax keyword	openroadConst	CC_LIGHT_GREEN CC_LIGHT_ORANGE CC_LIGHT_PINK
+syntax keyword	openroadConst	CC_LIGHT_PURPLE CC_LIGHT_RED CC_LIGHT_YELLOW
+syntax keyword	openroadConst	CC_MAGENTA CC_ORANGE CC_PALE_BLUE CC_PALE_BROWN
+syntax keyword	openroadConst	CC_PALE_CYAN CC_PALE_GRAY CC_PALE_GREEN
+syntax keyword	openroadConst	CC_PALE_ORANGE CC_PALE_PINK CC_PALE_PURPLE
+syntax keyword	openroadConst	CC_PALE_RED CC_PALE_YELLOW CC_PINK CC_PURPLE
+syntax keyword	openroadConst	CC_RED CC_SYS_ACTIVEBORDER CC_SYS_ACTIVECAPTION
+syntax keyword	openroadConst	CC_SYS_APPWORKSPACE CC_SYS_BACKGROUND
+syntax keyword	openroadConst	CC_SYS_BTNFACE CC_SYS_BTNSHADOW CC_SYS_BTNTEXT
+syntax keyword	openroadConst	CC_SYS_CAPTIONTEXT CC_SYS_GRAYTEXT
+syntax keyword	openroadConst	CC_SYS_HIGHLIGHT CC_SYS_HIGHLIGHTTEXT
+syntax keyword	openroadConst	CC_SYS_INACTIVEBORDER CC_SYS_INACTIVECAPTION
+syntax keyword	openroadConst	CC_SYS_INACTIVECAPTIONTEXT CC_SYS_MENU
+syntax keyword	openroadConst	CC_SYS_MENUTEXT CC_SYS_SCROLLBAR CC_SYS_SHADOW
+syntax keyword	openroadConst	CC_SYS_WINDOW CC_SYS_WINDOWFRAME
+syntax keyword	openroadConst	CC_SYS_WINDOWTEXT CC_WHITE CC_YELLOW
+syntax keyword	openroadConst	CL_INVALIDVALUE CP_BOTH CP_COLUMNS CP_NONE
+syntax keyword	openroadConst	CP_ROWS CS_CLOSED CS_CURRENT CS_NOCURRENT
+syntax keyword	openroadConst	CS_NO_MORE_ROWS CS_OPEN CS_OPEN_CACHED DC_BW
+syntax keyword	openroadConst	DC_COLOR DP_AUTOSIZE_FIELD DP_CLIP_IMAGE
+syntax keyword	openroadConst	DP_SCALE_IMAGE_H DP_SCALE_IMAGE_HW
+syntax keyword	openroadConst	DP_SCALE_IMAGE_W DS_CONNECTED DS_DISABLED
+syntax keyword	openroadConst	DS_DISCONNECTED DS_INGRES_DBMS DS_NO_DBMS
+syntax keyword	openroadConst	DS_ORACLE_DBMS DS_SQLSERVER_DBMS DV_NULL
+syntax keyword	openroadConst	DV_STRING DV_SYSTEM EH_NEXT_HANDLER EH_RESUME
+syntax keyword	openroadConst	EH_RETRY EP_INTERACTIVE EP_NONE EP_OUTPUT
+syntax keyword	openroadConst	ER_FAIL ER_NAMEEXISTS ER_OK ER_OUTOFRANGE
+syntax keyword	openroadConst	ER_ROWNOTFOUND ER_USER1 ER_USER10 ER_USER2
+syntax keyword	openroadConst	ER_USER3 ER_USER4 ER_USER5 ER_USER6 ER_USER7
+syntax keyword	openroadConst	ER_USER8 ER_USER9 FALSE FA_BOTTOMCENTER
+syntax keyword	openroadConst	FA_BOTTOMLEFT FA_BOTTOMRIGHT FA_CENTER
+syntax keyword	openroadConst	FA_CENTERLEFT FA_CENTERRIGHT FA_DEFAULT FA_NONE
+syntax keyword	openroadConst	FA_TOPCENTER FA_TOPLEFT FA_TOPRIGHT
+syntax keyword	openroadConst	FB_CHANGEABLE FB_CLICKPOINT FB_DIMMED FB_DRAGBOX
+syntax keyword	openroadConst	FB_DRAGSEGMENT FB_FLEXIBLE FB_INVISIBLE
+syntax keyword	openroadConst	FB_LANDABLE FB_MARKABLE FB_RESIZEABLE
+syntax keyword	openroadConst	FB_VIEWABLE FB_VISIBLE FC_LOWER FC_NONE FC_UPPER
+syntax keyword	openroadConst	FM_QUERY FM_READ FM_UPDATE FM_USER1 FM_USER2
+syntax keyword	openroadConst	FM_USER3 FO_DEFAULT FO_HORIZONTAL FO_VERTICAL
+syntax keyword	openroadConst	FP_BITMAP FP_CLEAR FP_CROSSHATCH FP_DARKSHADE
+syntax keyword	openroadConst	FP_DEFAULT FP_HORIZONTAL FP_LIGHTSHADE FP_SHADE
+syntax keyword	openroadConst	FP_SOLID FP_VERTICAL FT_NOTSETVALUE FT_SETVALUE
+syntax keyword	openroadConst	FT_TABTO FT_TAKEFOCUS GF_BOTTOM GF_DEFAULT
+syntax keyword	openroadConst	GF_LEFT GF_RIGHT GF_TOP HC_DOUBLEQUOTE
+syntax keyword	openroadConst	HC_FORMFEED HC_NEWLINE HC_QUOTE HC_SPACE HC_TAB
+syntax keyword	openroadConst	HV_CONTENTS HV_CONTEXT HV_HELPONHELP HV_KEY
+syntax keyword	openroadConst	HV_QUIT LS_3D LS_DASH LS_DASHDOT LS_DASHDOTDOT
+syntax keyword	openroadConst	LS_DEFAULT LS_DOT LS_SOLID LW_DEFAULT
+syntax keyword	openroadConst	LW_EXTRATHIN LW_MAXIMUM LW_MIDDLE LW_MINIMUM
+syntax keyword	openroadConst	LW_NOLINE LW_THICK LW_THIN LW_VERYTHICK
+syntax keyword	openroadConst	LW_VERYTHIN MB_DISABLED MB_ENABLED MB_INVISIBLE
+syntax keyword	openroadConst	MB_MOVEABLE MT_ERROR MT_INFO MT_NONE MT_WARNING
+syntax keyword	openroadConst	OP_APPEND OP_NONE OS3D OS_DEFAULT OS_SHADOW
+syntax keyword	openroadConst	OS_SOLID PU_CANCEL PU_OK QS_ACTIVE QS_INACTIVE
+syntax keyword	openroadConst	QS_SETCOL QY_ARRAY QY_CACHE QY_CURSOR QY_DIRECT
+syntax keyword	openroadConst	RC_CHILDSELECTED RC_DOWN RC_END RC_FIELDFREED
+syntax keyword	openroadConst	RC_FIELDORPHANED RC_GROUPSELECT RC_HOME RC_LEFT
+syntax keyword	openroadConst	RC_MODECHANGED RC_MOUSECLICK RC_MOUSEDRAG
+syntax keyword	openroadConst	RC_NEXT RC_NOTAPPLICABLE RC_PAGEDOWN RC_PAGEUP
+syntax keyword	openroadConst	RC_PARENTSELECTED RC_PREVIOUS RC_PROGRAM
+syntax keyword	openroadConst	RC_RESUME RC_RETURN RC_RIGHT RC_ROWDELETED
+syntax keyword	openroadConst	RC_ROWINSERTED RC_ROWSALLDELETED RC_SELECT
+syntax keyword	openroadConst	RC_TFSCROLL RC_TOGGLESELECT RC_UP RS_CHANGED
+syntax keyword	openroadConst	RS_DELETED RS_NEW RS_UNCHANGED RS_UNDEFINED
+syntax keyword	openroadConst	SK_CLOSE SK_COPY SK_CUT SK_DELETE SK_DETAILS
+syntax keyword	openroadConst	SK_DUPLICATE SK_FIND SK_GO SK_HELP SK_NEXT
+syntax keyword	openroadConst	SK_NONE SK_PASTE SK_PROPS SK_QUIT SK_REDO
+syntax keyword	openroadConst	SK_SAVE SK_TFDELETEALLROWS SK_TFDELETEROW
+syntax keyword	openroadConst	SK_TFFIND SK_TFINSERTROW SK_UNDO SP_APPSTARTING
+syntax keyword	openroadConst	SP_ARROW SP_CROSS SP_IBEAM SP_ICON SP_NO
+syntax keyword	openroadConst	SP_SIZE SP_SIZENESW SP_SIZENS SP_SIZENWSE
+syntax keyword	openroadConst	SP_SIZEWE SP_UPARROW SP_WAIT SY_NT SY_OS2
+syntax keyword	openroadConst	SY_UNIX SY_VMS SY_WIN95 TF_COURIER TF_HELVETICA
+syntax keyword	openroadConst	TF_LUCIDA TF_MENUDEFAULT TF_NEWCENTURY TF_SYSTEM
+syntax keyword	openroadConst	TF_TIMESROMAN TRUE UE_DATAERROR UE_EXITED
+syntax keyword	openroadConst	UE_NOTACTIVE UE_PURGED UE_RESUMED UE_UNKNOWN
+syntax keyword	openroadConst	WI_MOTIF WI_MSWIN32 WI_MSWINDOWS WI_NONE WI_PM
+syntax keyword	openroadConst	WP_FLOATING WP_INTERACTIVE WP_PARENTCENTERED
+syntax keyword	openroadConst	WP_PARENTRELATIVE WP_SCREENCENTERED
+syntax keyword	openroadConst	WP_SCREENRELATIVE WV_ICON WV_INVISIBLE
+syntax keyword	openroadConst	WV_UNREALIZED WV_VISIBLE
+
+" System Variables
+"
+syntax keyword	openroadVar		CurFrame CurProcedure CurMethod CurObject
+
+" Identifiers
+"
+syntax match	openroadIdent	/[a-zA-Z_][a-zA-Z_]*![a-zA-Z_][a-zA-Z_]*/
+
+" Comments
+"
+if exists("openroad_comment_strings")
+	syntax match openroadCommentSkip	contained "^\s*\*\($\|\s\+\)"
+	syntax region openroadCommentString	contained start=+"+ skip=+\\\\\|\\"+ end=+"+ end="$"
+	syntax region openroadComment		start="/\*" end="\*/" contains=openroadCommentString,openroadCharacter,openroadNumber
+	syntax match openroadComment		"//.*" contains=openroadComment2String,openroadCharacter,openroadNumber
+else
+	syn region openroadComment			start="/\*" end="\*/"
+	syn match openroadComment			"//.*"
+endif
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+"
+
+hi def link openroadKeyword	Statement
+hi def link openroadNumber	Number
+hi def link openroadString	String
+hi def link openroadComment	Comment
+hi def link openroadOperator	Operator
+hi def link openroadType		Type
+hi def link openroadFunc		Special
+hi def link openroadClass	Type
+hi def link openroadEvent	Statement
+hi def link openroadConst	Constant
+hi def link openroadVar		Identifier
+hi def link openroadIdent	Identifier
+hi def link openroadTodo		Todo
+
+
+let b:current_syntax = "openroad"
+
+endif
diff --git a/syntax/opl.vim b/syntax/opl.vim
new file mode 100644
index 000000000..fcf3eb51e
--- /dev/null
+++ b/syntax/opl.vim
@@ -0,0 +1,93 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opl') == -1
+
+" Vim syntax file
+" Language:	OPL
+" Maintainer:	Czo <Olivier.Sirol@lip6.fr>
+" Last Change:	2012 Feb 03 by Thilo Six
+" $Id: opl.vim,v 1.1 2004/06/13 17:34:11 vimboss Exp $
+
+" Open Psion Language... (EPOC16/EPOC32)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" case is not significant
+syn case ignore
+
+" A bunch of useful OPL keywords
+syn keyword OPLStatement proc endp abs acos addr adjustalloc alert alloc app
+syn keyword OPLStatement append appendsprite asc asin at atan back beep
+syn keyword OPLStatement begintrans bookmark break busy byref cache
+syn keyword OPLStatement cachehdr cacherec cachetidy call cancel caption
+syn keyword OPLStatement changesprite chr$ clearflags close closesprite cls
+syn keyword OPLStatement cmd$ committrans compact compress const continue
+syn keyword OPLStatement copy cos count create createsprite cursor
+syn keyword OPLStatement datetosecs datim$ day dayname$ days daystodate
+syn keyword OPLStatement dbuttons dcheckbox dchoice ddate declare dedit
+syn keyword OPLStatement deditmulti defaultwin deg delete dfile dfloat
+syn keyword OPLStatement dialog diaminit diampos dinit dir$ dlong do dow
+syn keyword OPLStatement dposition drawsprite dtext dtime dxinput edit else
+syn keyword OPLStatement elseif enda endif endv endwh entersend entersend0
+syn keyword OPLStatement eof erase err err$ errx$ escape eval exist exp ext
+syn keyword OPLStatement external find findfield findlib first fix$ flags
+syn keyword OPLStatement flt font freealloc gat gborder gbox gbutton
+syn keyword OPLStatement gcircle gclock gclose gcls gcolor gcopy gcreate
+syn keyword OPLStatement gcreatebit gdrawobject gellipse gen$ get get$
+syn keyword OPLStatement getcmd$ getdoc$ getevent getevent32 geteventa32
+syn keyword OPLStatement geteventc getlibh gfill gfont ggmode ggrey gheight
+syn keyword OPLStatement gidentity ginfo ginfo32 ginvert giprint glineby
+syn keyword OPLStatement glineto gloadbit gloadfont global gmove gorder
+syn keyword OPLStatement goriginx goriginy goto gotomark gpatt gpeekline
+syn keyword OPLStatement gpoly gprint gprintb gprintclip grank gsavebit
+syn keyword OPLStatement gscroll gsetpenwidth gsetwin gstyle gtmode gtwidth
+syn keyword OPLStatement gunloadfont gupdate guse gvisible gwidth gx
+syn keyword OPLStatement gxborder gxprint gy hex$ hour iabs icon if include
+syn keyword OPLStatement input insert int intf intrans key key$ keya keyc
+syn keyword OPLStatement killmark kmod last lclose left$ len lenalloc
+syn keyword OPLStatement linklib ln loadlib loadm loc local lock log lopen
+syn keyword OPLStatement lower$ lprint max mcard mcasc mean menu mid$ min
+syn keyword OPLStatement minit minute mkdir modify month month$ mpopup
+syn keyword OPLStatement newobj newobjh next notes num$ odbinfo off onerr
+syn keyword OPLStatement open openr opx os parse$ path pause peek pi
+syn keyword OPLStatement pointerfilter poke pos position possprite print
+syn keyword OPLStatement put rad raise randomize realloc recsize rename
+syn keyword OPLStatement rept$ return right$ rmdir rnd rollback sci$ screen
+syn keyword OPLStatement screeninfo second secstodate send setdoc setflags
+syn keyword OPLStatement setname setpath sin space sqr statuswin
+syn keyword OPLStatement statwininfo std stop style sum tan testevent trap
+syn keyword OPLStatement type uadd unloadlib unloadm until update upper$
+syn keyword OPLStatement use usr usr$ usub val var vector week while year
+" syn keyword OPLStatement rem
+
+
+syn match  OPLNumber		"\<\d\+\>"
+syn match  OPLNumber		"\<\d\+\.\d*\>"
+syn match  OPLNumber		"\.\d\+\>"
+
+syn region  OPLString		start=+"+   end=+"+
+syn region  OPLComment		start="REM[\t ]" end="$"
+syn match   OPLMathsOperator    "-\|=\|[:<>+\*^/\\]"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link OPLStatement		Statement
+hi def link OPLNumber		Number
+hi def link OPLString		String
+hi def link OPLComment		Comment
+hi def link OPLMathsOperator	Conditional
+"  hi def link OPLError		Error
+
+
+let b:current_syntax = "opl"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/ora.vim b/syntax/ora.vim
new file mode 100644
index 000000000..c8a43affd
--- /dev/null
+++ b/syntax/ora.vim
@@ -0,0 +1,468 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ora') == -1
+
+" Vim syntax file
+" Language:	Oracle config files (.ora) (Oracle 8i, ver. 8.1.5)
+" Maintainer:	Sandor Kopanyi <sandor.kopanyi@mailbox.hu>
+" Url:		<->
+" Last Change:	2003 May 11
+
+" * the keywords are listed by file (sqlnet.ora, listener.ora, etc.)
+" * the parathesis-checking is made at the beginning for all keywords
+" * possible values are listed also
+" * there are some overlappings (e.g. METHOD is mentioned both for
+"   sqlnet-ora and tnsnames.ora; since will not cause(?) problems
+"   is easier to follow separately each file's keywords)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'ora'
+endif
+
+syn case ignore
+
+"comments
+syn match oraComment "\#.*"
+
+" catch errors caused by wrong parenthesis
+syn region  oraParen transparent start="(" end=")" contains=@oraAll,oraParen
+syn match   oraParenError ")"
+
+" strings
+syn region  oraString start=+"+ end=+"+
+
+"common .ora staff
+
+"common protocol parameters
+syn keyword oraKeywordGroup   ADDRESS ADDRESS_LIST
+syn keyword oraKeywordGroup   DESCRIPTION_LIST DESCRIPTION
+"all protocols
+syn keyword oraKeyword	      PROTOCOL
+syn keyword oraValue	      ipc tcp nmp
+"Bequeath
+syn keyword oraKeyword	      PROGRAM ARGV0 ARGS
+"IPC
+syn keyword oraKeyword	      KEY
+"Named Pipes
+syn keyword oraKeyword	      SERVER PIPE
+"LU6.2
+syn keyword oraKeyword	      LU_NAME LLU LOCAL_LU LLU_NAME LOCAL_LU_NAME
+syn keyword oraKeyword	      MODE MDN
+syn keyword oraKeyword	      PLU PARTNER_LU_NAME PLU_LA PARTNER_LU_LOCAL_ALIAS
+syn keyword oraKeyword	      TP_NAME TPN
+"SPX
+syn keyword oraKeyword	      SERVICE
+"TCP/IP and TCP/IP with SSL
+syn keyword oraKeyword	      HOST PORT
+
+"misc. keywords I've met but didn't find in manual (maybe they are deprecated?)
+syn keyword oraKeywordGroup COMMUNITY_LIST
+syn keyword oraKeyword	    COMMUNITY NAME DEFAULT_ZONE
+syn keyword oraValue	    tcpcom
+
+"common values
+syn keyword oraValue	    yes no on off true false null all none ok
+"word 'world' is used a lot...
+syn keyword oraModifier       world
+
+"misc. common keywords
+syn keyword oraKeyword      TRACE_DIRECTORY TRACE_LEVEL TRACE_FILE
+
+
+"sqlnet.ora
+syn keyword oraKeywordPref  NAMES NAMESCTL
+syn keyword oraKeywordPref  OSS SOURCE SQLNET TNSPING
+syn keyword oraKeyword      AUTOMATIC_IPC BEQUEATH_DETACH DAEMON TRACE_MASK
+syn keyword oraKeyword      DISABLE_OOB
+syn keyword oraKeyword      LOG_DIRECTORY_CLIENT LOG_DIRECTORY_SERVER
+syn keyword oraKeyword      LOG_FILE_CLIENT LOG_FILE_SERVER
+syn keyword oraKeyword      DCE PREFIX DEFAULT_DOMAIN DIRECTORY_PATH
+syn keyword oraKeyword      INITIAL_RETRY_TIMEOUT MAX_OPEN_CONNECTIONS
+syn keyword oraKeyword      MESSAGE_POOL_START_SIZE NIS META_MAP
+syn keyword oraKeyword      PASSWORD PREFERRED_SERVERS REQUEST_RETRIES
+syn keyword oraKeyword      INTERNAL_ENCRYPT_PASSWORD INTERNAL_USE
+syn keyword oraKeyword      NO_INITIAL_SERVER NOCONFIRM
+syn keyword oraKeyword      SERVER_PASSWORD TRACE_UNIQUE MY_WALLET
+syn keyword oraKeyword      LOCATION DIRECTORY METHOD METHOD_DATA
+syn keyword oraKeyword      SQLNET_ADDRESS
+syn keyword oraKeyword      AUTHENTICATION_SERVICES
+syn keyword oraKeyword      AUTHENTICATION_KERBEROS5_SERVICE
+syn keyword oraKeyword      AUTHENTICATION_GSSAPI_SERVICE
+syn keyword oraKeyword      CLIENT_REGISTRATION
+syn keyword oraKeyword      CRYPTO_CHECKSUM_CLIENT CRYPTO_CHECKSUM_SERVER
+syn keyword oraKeyword      CRYPTO_CHECKSUM_TYPES_CLIENT CRYPTO_CHECKSUM_TYPES_SERVER
+syn keyword oraKeyword      CRYPTO_SEED
+syn keyword oraKeyword      ENCRYPTION_CLIENT ENCRYPTION_SERVER
+syn keyword oraKeyword      ENCRYPTION_TYPES_CLIENT ENCRYPTION_TYPES_SERVER
+syn keyword oraKeyword      EXPIRE_TIME
+syn keyword oraKeyword      IDENTIX_FINGERPRINT_DATABASE IDENTIX_FINGERPRINT_DATABASE_USER
+syn keyword oraKeyword      IDENTIX_FINGERPRINT_DATABASE_PASSWORD IDENTIX_FINGERPRINT_METHOD
+syn keyword oraKeyword      KERBEROS5_CC_NAME KERBEROS5_CLOCKSKEW KERBEROS5_CONF
+syn keyword oraKeyword      KERBEROS5_KEYTAB KERBEROS5_REALMS
+syn keyword oraKeyword      RADIUS_ALTERNATE RADIUS_ALTERNATE_PORT RADIUS_ALTERNATE_RETRIES
+syn keyword oraKeyword      RADIUS_AUTHENTICATION_TIMEOUT RADIUS_AUTHENTICATION
+syn keyword oraKeyword      RADIUS_AUTHENTICATION_INTERFACE RADIUS_AUTHENTICATION_PORT
+syn keyword oraKeyword      RADIUS_AUTHENTICATION_RETRIES RADIUS_AUTHENTICATION_TIMEOUT
+syn keyword oraKeyword      RADIUS_CHALLENGE_RESPONSE RADIUS_SECRET RADIUS_SEND_ACCOUNTING
+syn keyword oraKeyword      SSL_CLIENT_AUTHENTICATION SSL_CIPHER_SUITES SSL_VERSION
+syn keyword oraKeyword      TRACE_DIRECTORY_CLIENT TRACE_DIRECTORY_SERVER
+syn keyword oraKeyword      TRACE_FILE_CLIENT TRACE_FILE_SERVER
+syn keyword oraKeyword      TRACE_LEVEL_CLIENT TRACE_LEVEL_SERVER
+syn keyword oraKeyword      TRACE_UNIQUE_CLIENT
+syn keyword oraKeyword      USE_CMAN USE_DEDICATED_SERVER
+syn keyword oraValue	    user admin support
+syn keyword oraValue	    accept accepted reject rejected requested required
+syn keyword oraValue	    md5 rc4_40 rc4_56 rc4_128 des des_40
+syn keyword oraValue	    tnsnames onames hostname dce nis novell
+syn keyword oraValue	    file oracle
+syn keyword oraValue	    oss
+syn keyword oraValue	    beq nds nts kerberos5 securid cybersafe identix dcegssapi radius
+syn keyword oraValue	    undetermined
+
+"tnsnames.ora
+syn keyword oraKeywordGroup CONNECT_DATA FAILOVER_MODE
+syn keyword oraKeyword      FAILOVER LOAD_BALANCE SOURCE_ROUTE TYPE_OF_SERVICE
+syn keyword oraKeyword      BACKUP TYPE METHOD GLOBAL_NAME HS
+syn keyword oraKeyword      INSTANCE_NAME RDB_DATABASE SDU SERVER
+syn keyword oraKeyword      SERVICE_NAME SERVICE_NAMES SID
+syn keyword oraKeyword      HANDLER_NAME EXTPROC_CONNECTION_DATA
+syn keyword oraValue	    session select basic preconnect dedicated shared
+
+"listener.ora
+syn keyword oraKeywordGroup SID_LIST SID_DESC PRESPAWN_LIST PRESPAWN_DESC
+syn match   oraKeywordGroup "SID_LIST_\w*"
+syn keyword oraKeyword      PROTOCOL_STACK PRESENTATION SESSION
+syn keyword oraKeyword      GLOBAL_DBNAME ORACLE_HOME PROGRAM SID_NAME
+syn keyword oraKeyword      PRESPAWN_MAX POOL_SIZE TIMEOUT
+syn match   oraKeyword      "CONNECT_TIMEOUT_\w*"
+syn match   oraKeyword      "LOG_DIRECTORY_\w*"
+syn match   oraKeyword      "LOG_FILE_\w*"
+syn match   oraKeyword      "PASSWORDS_\w*"
+syn match   oraKeyword      "STARTUP_WAIT_TIME_\w*"
+syn match   oraKeyword      "STARTUP_WAITTIME_\w*"
+syn match   oraKeyword      "TRACE_DIRECTORY_\w*"
+syn match   oraKeyword      "TRACE_FILE_\w*"
+syn match   oraKeyword      "TRACE_LEVEL_\w*"
+syn match   oraKeyword      "USE_PLUG_AND_PLAY_\w*"
+syn keyword oraValue	    ttc giop ns raw
+
+"names.ora
+syn keyword oraKeywordGroup ADDRESSES ADMIN_REGION
+syn keyword oraKeywordGroup DEFAULT_FORWARDERS FORWARDER_LIST FORWARDER
+syn keyword oraKeywordGroup DOMAIN_HINTS HINT_DESC HINT_LIST
+syn keyword oraKeywordGroup DOMAINS DOMAIN_LIST DOMAIN
+syn keyword oraKeywordPref  NAMES
+syn keyword oraKeyword      EXPIRE REFRESH REGION RETRY USERID VERSION
+syn keyword oraKeyword      AUTHORITY_REQUIRED CONNECT_TIMEOUT
+syn keyword oraKeyword      AUTO_REFRESH_EXPIRE AUTO_REFRESH_RETRY
+syn keyword oraKeyword      CACHE_CHECKPOINT_FILE CACHE_CHECKPOINT_INTERVAL
+syn keyword oraKeyword      CONFIG_CHECKPOINT_FILE DEFAULT_FORWARDERS_ONLY
+syn keyword oraKeyword      HINT FORWARDING_AVAILABLE FORWARDING_DESIRED
+syn keyword oraKeyword      KEEP_DB_OPEN
+syn keyword oraKeyword      LOG_DIRECTORY LOG_FILE LOG_STATS_INTERVAL LOG_UNIQUE
+syn keyword oraKeyword      MAX_OPEN_CONNECTIONS MAX_REFORWARDS
+syn keyword oraKeyword      MESSAGE_POOL_START_SIZE
+syn keyword oraKeyword      NO_MODIFY_REQUESTS NO_REGION_DATABASE
+syn keyword oraKeyword      PASSWORD REGION_CHECKPOINT_FILE
+syn keyword oraKeyword      RESET_STATS_INTERVAL SAVE_CONFIG_ON_STOP
+syn keyword oraKeyword      SERVER_NAME TRACE_FUNC TRACE_UNIQUE
+
+"cman.ora
+syn keyword oraKeywordGroup   CMAN CMAN_ADMIN CMAN_PROFILE PARAMETER_LIST
+syn keyword oraKeywordGroup   CMAN_RULES RULES_LIST RULE
+syn keyword oraKeyword	      ANSWER_TIMEOUT AUTHENTICATION_LEVEL LOG_LEVEL
+syn keyword oraKeyword	      MAX_FREELIST_BUFFERS MAXIMUM_CONNECT_DATA MAXIMUM_RELAYS
+syn keyword oraKeyword	      RELAY_STATISTICS SHOW_TNS_INFO TRACING
+syn keyword oraKeyword	      USE_ASYNC_CALL SRC DST SRV ACT
+
+"protocol.ora
+syn match oraKeyword	      "\w*\.EXCLUDED_NODES"
+syn match oraKeyword	      "\w*\.INVITED_NODES"
+syn match oraKeyword	      "\w*\.VALIDNODE_CHECKING"
+syn keyword oraKeyword	      TCP NODELAY
+
+
+
+
+"---------------------------------------
+"init.ora
+
+"common values
+syn keyword oraValue	      nested_loops merge hash unlimited
+
+"init params
+syn keyword oraKeyword	      O7_DICTIONARY_ACCESSIBILITY ALWAYS_ANTI_JOIN ALWAYS_SEMI_JOIN
+syn keyword oraKeyword	      AQ_TM_PROCESSES ARCH_IO_SLAVES AUDIT_FILE_DEST AUDIT_TRAIL
+syn keyword oraKeyword	      BACKGROUND_CORE_DUMP BACKGROUND_DUMP_DEST
+syn keyword oraKeyword	      BACKUP_TAPE_IO_SLAVES BITMAP_MERGE_AREA_SIZE
+syn keyword oraKeyword	      BLANK_TRIMMING BUFFER_POOL_KEEP BUFFER_POOL_RECYCLE
+syn keyword oraKeyword	      COMMIT_POINT_STRENGTH COMPATIBLE CONTROL_FILE_RECORD_KEEP_TIME
+syn keyword oraKeyword	      CONTROL_FILES CORE_DUMP_DEST CPU_COUNT
+syn keyword oraKeyword	      CREATE_BITMAP_AREA_SIZE CURSOR_SPACE_FOR_TIME
+syn keyword oraKeyword	      DB_BLOCK_BUFFERS DB_BLOCK_CHECKING DB_BLOCK_CHECKSUM
+syn keyword oraKeyword	      DB_BLOCK_LRU_LATCHES DB_BLOCK_MAX_DIRTY_TARGET
+syn keyword oraKeyword	      DB_BLOCK_SIZE DB_DOMAIN
+syn keyword oraKeyword	      DB_FILE_DIRECT_IO_COUNT DB_FILE_MULTIBLOCK_READ_COUNT
+syn keyword oraKeyword	      DB_FILE_NAME_CONVERT DB_FILE_SIMULTANEOUS_WRITES
+syn keyword oraKeyword	      DB_FILES DB_NAME DB_WRITER_PROCESSES
+syn keyword oraKeyword	      DBLINK_ENCRYPT_LOGIN DBWR_IO_SLAVES
+syn keyword oraKeyword	      DELAYED_LOGGING_BLOCK_CLEANOUTS DISCRETE_TRANSACTIONS_ENABLED
+syn keyword oraKeyword	      DISK_ASYNCH_IO DISTRIBUTED_TRANSACTIONS
+syn keyword oraKeyword	      DML_LOCKS ENQUEUE_RESOURCES ENT_DOMAIN_NAME EVENT
+syn keyword oraKeyword	      FAST_START_IO_TARGET FAST_START_PARALLEL_ROLLBACK
+syn keyword oraKeyword	      FIXED_DATE FREEZE_DB_FOR_FAST_INSTANCE_RECOVERY
+syn keyword oraKeyword	      GC_DEFER_TIME GC_FILES_TO_LOCKS GC_RELEASABLE_LOCKS GC_ROLLBACK_LOCKS
+syn keyword oraKeyword	      GLOBAL_NAMES HASH_AREA_SIZE
+syn keyword oraKeyword	      HASH_JOIN_ENABLED HASH_MULTIBLOCK_IO_COUNT
+syn keyword oraKeyword	      HI_SHARED_MEMORY_ADDRESS HS_AUTOREGISTER
+syn keyword oraKeyword	      IFILE
+syn keyword oraKeyword	      INSTANCE_GROUPS INSTANCE_NAME INSTANCE_NUMBER
+syn keyword oraKeyword	      JAVA_POOL_SIZE JOB_QUEUE_INTERVAL JOB_QUEUE_PROCESSES LARGE_POOL_SIZE
+syn keyword oraKeyword	      LICENSE_MAX_SESSIONS LICENSE_MAX_USERS LICENSE_SESSIONS_WARNING
+syn keyword oraKeyword	      LM_LOCKS LM_PROCS LM_RESS
+syn keyword oraKeyword	      LOCAL_LISTENER LOCK_NAME_SPACE LOCK_SGA LOCK_SGA_AREAS
+syn keyword oraKeyword	      LOG_ARCHIVE_BUFFER_SIZE LOG_ARCHIVE_BUFFERS LOG_ARCHIVE_DEST
+syn match   oraKeyword	      "LOG_ARCHIVE_DEST_\(1\|2\|3\|4\|5\)"
+syn match   oraKeyword	      "LOG_ARCHIVE_DEST_STATE_\(1\|2\|3\|4\|5\)"
+syn keyword oraKeyword	      LOG_ARCHIVE_DUPLEX_DEST LOG_ARCHIVE_FORMAT LOG_ARCHIVE_MAX_PROCESSES
+syn keyword oraKeyword	      LOG_ARCHIVE_MIN_SUCCEED_DEST LOG_ARCHIVE_START
+syn keyword oraKeyword	      LOG_BUFFER LOG_CHECKPOINT_INTERVAL LOG_CHECKPOINT_TIMEOUT
+syn keyword oraKeyword	      LOG_CHECKPOINTS_TO_ALERT LOG_FILE_NAME_CONVERT
+syn keyword oraKeyword	      MAX_COMMIT_PROPAGATION_DELAY MAX_DUMP_FILE_SIZE
+syn keyword oraKeyword	      MAX_ENABLED_ROLES MAX_ROLLBACK_SEGMENTS
+syn keyword oraKeyword	      MTS_DISPATCHERS MTS_MAX_DISPATCHERS MTS_MAX_SERVERS MTS_SERVERS
+syn keyword oraKeyword	      NLS_CALENDAR NLS_COMP NLS_CURRENCY NLS_DATE_FORMAT
+syn keyword oraKeyword	      NLS_DATE_LANGUAGE NLS_DUAL_CURRENCY NLS_ISO_CURRENCY NLS_LANGUAGE
+syn keyword oraKeyword	      NLS_NUMERIC_CHARACTERS NLS_SORT NLS_TERRITORY
+syn keyword oraKeyword	      OBJECT_CACHE_MAX_SIZE_PERCENT OBJECT_CACHE_OPTIMAL_SIZE
+syn keyword oraKeyword	      OPEN_CURSORS OPEN_LINKS OPEN_LINKS_PER_INSTANCE
+syn keyword oraKeyword	      OPS_ADMINISTRATION_GROUP
+syn keyword oraKeyword	      OPTIMIZER_FEATURES_ENABLE OPTIMIZER_INDEX_CACHING
+syn keyword oraKeyword	      OPTIMIZER_INDEX_COST_ADJ OPTIMIZER_MAX_PERMUTATIONS
+syn keyword oraKeyword	      OPTIMIZER_MODE OPTIMIZER_PERCENT_PARALLEL
+syn keyword oraKeyword	      OPTIMIZER_SEARCH_LIMIT
+syn keyword oraKeyword	      ORACLE_TRACE_COLLECTION_NAME ORACLE_TRACE_COLLECTION_PATH
+syn keyword oraKeyword	      ORACLE_TRACE_COLLECTION_SIZE ORACLE_TRACE_ENABLE
+syn keyword oraKeyword	      ORACLE_TRACE_FACILITY_NAME ORACLE_TRACE_FACILITY_PATH
+syn keyword oraKeyword	      OS_AUTHENT_PREFIX OS_ROLES
+syn keyword oraKeyword	      PARALLEL_ADAPTIVE_MULTI_USER PARALLEL_AUTOMATIC_TUNING
+syn keyword oraKeyword	      PARALLEL_BROADCAST_ENABLED PARALLEL_EXECUTION_MESSAGE_SIZE
+syn keyword oraKeyword	      PARALLEL_INSTANCE_GROUP PARALLEL_MAX_SERVERS
+syn keyword oraKeyword	      PARALLEL_MIN_PERCENT PARALLEL_MIN_SERVERS
+syn keyword oraKeyword	      PARALLEL_SERVER PARALLEL_SERVER_INSTANCES PARALLEL_THREADS_PER_CPU
+syn keyword oraKeyword	      PARTITION_VIEW_ENABLED PLSQL_V2_COMPATIBILITY
+syn keyword oraKeyword	      PRE_PAGE_SGA PROCESSES
+syn keyword oraKeyword	      QUERY_REWRITE_ENABLED QUERY_REWRITE_INTEGRITY
+syn keyword oraKeyword	      RDBMS_SERVER_DN READ_ONLY_OPEN_DELAYED RECOVERY_PARALLELISM
+syn keyword oraKeyword	      REMOTE_DEPENDENCIES_MODE REMOTE_LOGIN_PASSWORDFILE
+syn keyword oraKeyword	      REMOTE_OS_AUTHENT REMOTE_OS_ROLES
+syn keyword oraKeyword	      REPLICATION_DEPENDENCY_TRACKING
+syn keyword oraKeyword	      RESOURCE_LIMIT RESOURCE_MANAGER_PLAN
+syn keyword oraKeyword	      ROLLBACK_SEGMENTS ROW_LOCKING SERIAL _REUSE SERVICE_NAMES
+syn keyword oraKeyword	      SESSION_CACHED_CURSORS SESSION_MAX_OPEN_FILES SESSIONS
+syn keyword oraKeyword	      SHADOW_CORE_DUMP
+syn keyword oraKeyword	      SHARED_MEMORY_ADDRESS SHARED_POOL_RESERVED_SIZE SHARED_POOL_SIZE
+syn keyword oraKeyword	      SORT_AREA_RETAINED_SIZE SORT_AREA_SIZE SORT_MULTIBLOCK_READ_COUNT
+syn keyword oraKeyword	      SQL92_SECURITY SQL_TRACE STANDBY_ARCHIVE_DEST
+syn keyword oraKeyword	      STAR_TRANSFORMATION_ENABLED TAPE_ASYNCH_IO THREAD
+syn keyword oraKeyword	      TIMED_OS_STATISTICS TIMED_STATISTICS
+syn keyword oraKeyword	      TRANSACTION_AUDITING TRANSACTIONS TRANSACTIONS_PER_ROLLBACK_SEGMENT
+syn keyword oraKeyword	      USE_INDIRECT_DATA_BUFFERS USER_DUMP_DEST
+syn keyword oraKeyword	      UTL_FILE_DIR
+syn keyword oraKeywordObs     ALLOW_PARTIAL_SN_RESULTS B_TREE_BITMAP_PLANS
+syn keyword oraKeywordObs     BACKUP_DISK_IO_SLAVES CACHE_SIZE_THRESHOLD
+syn keyword oraKeywordObs     CCF_IO_SIZE CLEANUP_ROLLBACK_ENTRIES
+syn keyword oraKeywordObs     CLOSE_CACHED_OPEN_CURSORS COMPATIBLE_NO_RECOVERY
+syn keyword oraKeywordObs     COMPLEX_VIEW_MERGING
+syn keyword oraKeywordObs     DB_BLOCK_CHECKPOINT_BATCH DB_BLOCK_LRU_EXTENDED_STATISTICS
+syn keyword oraKeywordObs     DB_BLOCK_LRU_STATISTICS
+syn keyword oraKeywordObs     DISTRIBUTED_LOCK_TIMEOUT DISTRIBUTED_RECOVERY_CONNECTION_HOLD_TIME
+syn keyword oraKeywordObs     FAST_FULL_SCAN_ENABLED GC_LATCHES GC_LCK_PROCS
+syn keyword oraKeywordObs     LARGE_POOL_MIN_ALLOC LGWR_IO_SLAVES
+syn keyword oraKeywordObs     LOG_BLOCK_CHECKSUM LOG_FILES
+syn keyword oraKeywordObs     LOG_SIMULTANEOUS_COPIES LOG_SMALL_ENTRY_MAX_SIZE
+syn keyword oraKeywordObs     MAX_TRANSACTION_BRANCHES
+syn keyword oraKeywordObs     MTS_LISTENER_ADDRESS MTS_MULTIPLE_LISTENERS
+syn keyword oraKeywordObs     MTS_RATE_LOG_SIZE MTS_RATE_SCALE MTS_SERVICE
+syn keyword oraKeywordObs     OGMS_HOME OPS_ADMIN_GROUP
+syn keyword oraKeywordObs     PARALLEL_DEFAULT_MAX_INSTANCES PARALLEL_MIN_MESSAGE_POOL
+syn keyword oraKeywordObs     PARALLEL_SERVER_IDLE_TIME PARALLEL_TRANSACTION_RESOURCE_TIMEOUT
+syn keyword oraKeywordObs     PUSH_JOIN_PREDICATE REDUCE_ALARM ROW_CACHE_CURSORS
+syn keyword oraKeywordObs     SEQUENCE_CACHE_ENTRIES SEQUENCE_CACHE_HASH_BUCKETS
+syn keyword oraKeywordObs     SHARED_POOL_RESERVED_MIN_ALLOC
+syn keyword oraKeywordObs     SORT_DIRECT_WRITES SORT_READ_FAC SORT_SPACEMAP_SIZE
+syn keyword oraKeywordObs     SORT_WRITE_BUFFER_SIZE SORT_WRITE_BUFFERS
+syn keyword oraKeywordObs     SPIN_COUNT TEMPORARY_TABLE_LOCKS USE_ISM
+syn keyword oraValue	      db os full partial mandatory optional reopen enable defer
+syn keyword oraValue	      always default intent disable dml plsql temp_disable
+syn match   oravalue	      "Arabic Hijrah"
+syn match   oravalue	      "English Hijrah"
+syn match   oravalue	      "Gregorian"
+syn match   oravalue	      "Japanese Imperial"
+syn match   oravalue	      "Persian"
+syn match   oravalue	      "ROC Official"
+syn match   oravalue	      "Thai Buddha"
+syn match   oravalue	      "8.0.0"
+syn match   oravalue	      "8.0.3"
+syn match   oravalue	      "8.0.4"
+syn match   oravalue	      "8.1.3"
+syn match oraModifier	      "archived log"
+syn match oraModifier	      "backup corruption"
+syn match oraModifier	      "backup datafile"
+syn match oraModifier	      "backup piece  "
+syn match oraModifier	      "backup redo log"
+syn match oraModifier	      "backup set"
+syn match oraModifier	      "copy corruption"
+syn match oraModifier	      "datafile copy"
+syn match oraModifier	      "deleted object"
+syn match oraModifier	      "loghistory"
+syn match oraModifier	      "offline range"
+
+"undocumented init params
+"up to 7.2 (inclusive)
+syn keyword oraKeywordUndObs  _latch_spin_count _trace_instance_termination
+syn keyword oraKeywordUndObs  _wakeup_timeout _lgwr_async_write
+"7.3
+syn keyword oraKeywordUndObs  _standby_lock_space_name _enable_dba_locking
+"8.0.5
+syn keyword oraKeywordUnd     _NUMA_instance_mapping _NUMA_pool_size
+syn keyword oraKeywordUnd     _advanced_dss_features _affinity_on _all_shared_dblinks
+syn keyword oraKeywordUnd     _allocate_creation_order _allow_resetlogs_corruption
+syn keyword oraKeywordUnd     _always_star_transformation _bump_highwater_mark_count
+syn keyword oraKeywordUnd     _column_elimination_off _controlfile_enqueue_timeout
+syn keyword oraKeywordUnd     _corrupt_blocks_on_stuck_recovery _corrupted_rollback_segments
+syn keyword oraKeywordUnd     _cr_deadtime _cursor_db_buffers_pinned
+syn keyword oraKeywordUnd     _db_block_cache_clone _db_block_cache_map _db_block_cache_protect
+syn keyword oraKeywordUnd     _db_block_hash_buckets _db_block_hi_priority_batch_size
+syn keyword oraKeywordUnd     _db_block_max_cr_dba _db_block_max_scan_cnt
+syn keyword oraKeywordUnd     _db_block_med_priority_batch_size _db_block_no_idle_writes
+syn keyword oraKeywordUnd     _db_block_write_batch _db_handles _db_handles_cached
+syn keyword oraKeywordUnd     _db_large_dirty_queue _db_no_mount_lock
+syn keyword oraKeywordUnd     _db_writer_histogram_statistics _db_writer_scan_depth
+syn keyword oraKeywordUnd     _db_writer_scan_depth_decrement _db_writer_scan_depth_increment
+syn keyword oraKeywordUnd     _disable_incremental_checkpoints
+syn keyword oraKeywordUnd     _disable_latch_free_SCN_writes_via_32cas
+syn keyword oraKeywordUnd     _disable_latch_free_SCN_writes_via_64cas
+syn keyword oraKeywordUnd     _disable_logging _disable_ntlog_events
+syn keyword oraKeywordUnd     _dss_cache_flush _dynamic_stats_threshold
+syn keyword oraKeywordUnd     _enable_cscn_caching _enable_default_affinity
+syn keyword oraKeywordUnd     _enqueue_debug_multi_instance _enqueue_hash
+syn keyword oraKeywordUnd     _enqueue_hash_chain_latches _enqueue_locks
+syn keyword oraKeywordUnd     _fifth_spare_parameter _first_spare_parameter _fourth_spare_parameter
+syn keyword oraKeywordUnd     _gc_class_locks _groupby_nopushdown_cut_ratio
+syn keyword oraKeywordUnd     _idl_conventional_index_maintenance _ignore_failed_escalates
+syn keyword oraKeywordUnd     _init_sql_file
+syn keyword oraKeywordUnd     _io_slaves_disabled _ioslave_batch_count _ioslave_issue_count
+syn keyword oraKeywordUnd     _kgl_bucket_count _kgl_latch_count _kgl_multi_instance_invalidation
+syn keyword oraKeywordUnd     _kgl_multi_instance_lock _kgl_multi_instance_pin
+syn keyword oraKeywordUnd     _latch_miss_stat_sid _latch_recovery_alignment _latch_wait_posting
+syn keyword oraKeywordUnd     _lm_ast_option _lm_direct_sends _lm_dlmd_procs _lm_domains _lm_groups
+syn keyword oraKeywordUnd     _lm_non_fault_tolerant _lm_send_buffers _lm_statistics _lm_xids
+syn keyword oraKeywordUnd     _log_blocks_during_backup _log_buffers_debug _log_checkpoint_recovery_check
+syn keyword oraKeywordUnd     _log_debug_multi_instance _log_entry_prebuild_threshold _log_io_size
+syn keyword oraKeywordUnd     _log_space_errors
+syn keyword oraKeywordUnd     _max_exponential_sleep _max_sleep_holding_latch
+syn keyword oraKeywordUnd     _messages _minimum_giga_scn _mts_load_constants _nested_loop_fudge
+syn keyword oraKeywordUnd     _no_objects _no_or_expansion
+syn keyword oraKeywordUnd     _number_cached_attributes _offline_rollback_segments _open_files_limit
+syn keyword oraKeywordUnd     _optimizer_undo_changes
+syn keyword oraKeywordUnd     _oracle_trace_events _oracle_trace_facility_version
+syn keyword oraKeywordUnd     _ordered_nested_loop _parallel_server_sleep_time
+syn keyword oraKeywordUnd     _passwordfile_enqueue_timeout _pdml_slaves_diff_part
+syn keyword oraKeywordUnd     _plsql_dump_buffer_events _predicate_elimination_enabled
+syn keyword oraKeywordUnd     _project_view_columns
+syn keyword oraKeywordUnd     _px_broadcast_fudge_factor _px_broadcast_trace _px_dop_limit_degree
+syn keyword oraKeywordUnd     _px_dop_limit_threshold _px_kxfr_granule_allocation _px_kxib_tracing
+syn keyword oraKeywordUnd     _release_insert_threshold _reuse_index_loop
+syn keyword oraKeywordUnd     _rollback_segment_count _rollback_segment_initial
+syn keyword oraKeywordUnd     _row_cache_buffer_size _row_cache_instance_locks
+syn keyword oraKeywordUnd     _save_escalates _scn_scheme
+syn keyword oraKeywordUnd     _second_spare_parameter _session_idle_bit_latches
+syn keyword oraKeywordUnd     _shared_session_sort_fetch_buffer _single_process
+syn keyword oraKeywordUnd     _small_table_threshold _sql_connect_capability_override
+syn keyword oraKeywordUnd     _sql_connect_capability_table
+syn keyword oraKeywordUnd     _test_param_1 _test_param_2 _test_param_3
+syn keyword oraKeywordUnd     _third_spare_parameter _tq_dump_period
+syn keyword oraKeywordUnd     _trace_archive_dest _trace_archive_start _trace_block_size
+syn keyword oraKeywordUnd     _trace_buffers_per_process _trace_enabled _trace_events
+syn keyword oraKeywordUnd     _trace_file_size _trace_files_public _trace_flushing _trace_write_batch_size
+syn keyword oraKeywordUnd     _upconvert_from_ast _use_vector_post _wait_for_sync _walk_insert_threshold
+"dunno which version; may be 8.1.x, may be obsoleted
+syn keyword oraKeywordUndObs  _arch_io_slaves _average_dirties_half_life _b_tree_bitmap_plans
+syn keyword oraKeywordUndObs  _backup_disk_io_slaves _backup_io_pool_size
+syn keyword oraKeywordUndObs  _cleanup_rollback_entries _close_cached_open_cursors
+syn keyword oraKeywordUndObs  _compatible_no_recovery _complex_view_merging
+syn keyword oraKeywordUndObs  _cpu_to_io _cr_server
+syn keyword oraKeywordUndObs  _db_aging_cool_count _db_aging_freeze_cr _db_aging_hot_criteria
+syn keyword oraKeywordUndObs  _db_aging_stay_count _db_aging_touch_time
+syn keyword oraKeywordUndObs  _db_percent_hot_default _db_percent_hot_keep _db_percent_hot_recycle
+syn keyword oraKeywordUndObs  _db_writer_chunk_writes _db_writer_max_writes
+syn keyword oraKeywordUndObs  _dbwr_async_io _dbwr_tracing
+syn keyword oraKeywordUndObs  _defer_multiple_waiters _discrete_transaction_enabled
+syn keyword oraKeywordUndObs  _distributed_lock_timeout _distributed_recovery _distribited_recovery_
+syn keyword oraKeywordUndObs  _domain_index_batch_size _domain_index_dml_batch_size
+syn keyword oraKeywordUndObs  _enable_NUMA_optimization _enable_block_level_transaction_recovery
+syn keyword oraKeywordUndObs  _enable_list_io _enable_multiple_sampling
+syn keyword oraKeywordUndObs  _fairness_treshold _fast_full_scan_enabled _foreground_locks
+syn keyword oraKeywordUndObs  _full_pwise_join_enabled _gc_latches _gc_lck_procs
+syn keyword oraKeywordUndObs  _high_server_treshold _index_prefetch_factor _kcl_debug
+syn keyword oraKeywordUndObs  _kkfi_trace _large_pool_min_alloc _lazy_freelist_close _left_nested_loops_random
+syn keyword oraKeywordUndObs  _lgwr_async_io _lgwr_io_slaves _lock_sga_areas
+syn keyword oraKeywordUndObs  _log_archive_buffer_size _log_archive_buffers _log_simultaneous_copies
+syn keyword oraKeywordUndObs  _low_server_treshold _max_transaction_branches
+syn keyword oraKeywordUndObs  _mts_rate_log_size _mts_rate_scale
+syn keyword oraKeywordUndObs  _mview_cost_rewrite _mview_rewrite_2
+syn keyword oraKeywordUndObs  _ncmb_readahead_enabled _ncmb_readahead_tracing
+syn keyword oraKeywordUndObs  _ogms_home
+syn keyword oraKeywordUndObs  _parallel_adaptive_max_users _parallel_default_max_instances
+syn keyword oraKeywordUndObs  _parallel_execution_message_align _parallel_fake_class_pct
+syn keyword oraKeywordUndObs  _parallel_load_bal_unit _parallel_load_balancing
+syn keyword oraKeywordUndObs  _parallel_min_message_pool _parallel_recovery_stopat
+syn keyword oraKeywordUndObs  _parallel_server_idle_time _parallelism_cost_fudge_factor
+syn keyword oraKeywordUndObs  _partial_pwise_join_enabled _pdml_separate_gim _push_join_predicate
+syn keyword oraKeywordUndObs  _px_granule_size _px_index_sampling _px_load_publish_interval
+syn keyword oraKeywordUndObs  _px_max_granules_per_slave _px_min_granules_per_slave _px_no_stealing
+syn keyword oraKeywordUndObs  _row_cache_cursors _serial_direct_read _shared_pool_reserved_min_alloc
+syn keyword oraKeywordUndObs  _sort_space_for_write_buffers _spin_count _system_trig_enabled
+syn keyword oraKeywordUndObs  _trace_buffer_flushes _trace_cr_buffer_creates _trace_multi_block_reads
+syn keyword oraKeywordUndObs  _transaction_recovery_servers _use_ism _yield_check_interval
+
+
+syn cluster oraAll add=oraKeyword,oraKeywordGroup,oraKeywordPref,oraKeywordObs,oraKeywordUnd,oraKeywordUndObs
+syn cluster oraAll add=oraValue,oraModifier,oraString,oraSpecial,oraComment
+
+"==============================================================================
+" highlighting
+
+" Only when an item doesn't have highlighting yet
+
+hi def link oraKeyword	  Statement		"usual keywords
+hi def link oraKeywordGroup  Type			"keywords which group other keywords
+hi def link oraKeywordPref   oraKeywordGroup	"keywords which act as prefixes
+hi def link oraKeywordObs	  Todo			"obsolete keywords
+hi def link oraKeywordUnd	  PreProc		"undocumented keywords
+hi def link oraKeywordUndObs oraKeywordObs		"undocumented obsolete keywords
+hi def link oraValue	  Identifier		"values, like true or false
+hi def link oraModifier	  oraValue		"modifies values
+hi def link oraString	  String		"strings
+
+hi def link oraSpecial	  Special		"special characters
+hi def link oraError	  Error			"errors
+hi def link oraParenError	  oraError		"errors caused by mismatching parantheses
+
+hi def link oraComment	  Comment		"comments
+
+
+
+let b:current_syntax = "ora"
+
+if main_syntax == 'ora'
+  unlet main_syntax
+endif
+
+" vim: ts=8
+
+endif
diff --git a/syntax/pamconf.vim b/syntax/pamconf.vim
new file mode 100644
index 000000000..3f6155da2
--- /dev/null
+++ b/syntax/pamconf.vim
@@ -0,0 +1,135 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pamconf') == -1
+
+" Vim syntax file
+" Language:             pam(8) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2020/08/04
+" Changes By:		Haochen Tong
+
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let s:has_service_field = exists("b:pamconf_has_service_field")
+      \ ? b:pamconf_has_service_field
+      \ : expand('%:t') == 'pam.conf' ? 1 : 0
+
+syn match   pamconfType             '-\?[[:alpha:]]\+'
+                                    \ contains=pamconfTypeKeyword
+                                    \ nextgroup=pamconfControl,
+                                    \ pamconfTypeLineCont skipwhite
+
+syn keyword pamconfTypeKeyword      contained account auth password session
+
+if s:has_service_field
+    syn match   pamconfService          '^[[:graph:]]\+'
+                                        \ nextgroup=pamconfType,
+                                        \ pamconfServiceLineCont skipwhite
+
+    syn match   pamconfServiceLineCont  contained '\\$'
+                                        \ nextgroup=pamconfType,
+                                        \ pamconfServiceLineCont skipwhite skipnl
+endif
+
+syn keyword pamconfTodo             contained TODO FIXME XXX NOTE
+
+syn region  pamconfComment          display oneline start='#' end='$'
+                                    \ contains=pamconfTodo,@Spell
+
+syn match   pamconfTypeLineCont     contained '\\$'
+                                    \ nextgroup=pamconfControl,
+                                    \ pamconfTypeLineCont skipwhite skipnl
+
+syn keyword pamconfControl          contained requisite required sufficient
+                                    \ optional include substack
+                                    \ nextgroup=pamconfMPath,
+                                    \ pamconfControlLineContH skipwhite
+
+syn match   pamconfControlBegin     '\[' nextgroup=pamconfControlValues,
+                                    \ pamconfControlLineCont skipwhite
+
+syn match   pamconfControlLineCont  contained '\\$'
+                                    \ nextgroup=pamconfControlValues,
+                                    \ pamconfControlLineCont skipwhite skipnl
+
+syn keyword pamconfControlValues    contained success open_err symbol_err
+                                    \ service_err system_err buf_err
+                                    \ perm_denied auth_err cred_insufficient
+                                    \ authinfo_unavail user_unknown maxtries
+                                    \ new_authtok_reqd acct_expired session_err
+                                    \ cred_unavail cred_expired cred_err
+                                    \ no_module_data conv_err authtok_err
+                                    \ authtok_recover_err authtok_lock_busy
+                                    \ authtok_disable_aging try_again ignore
+                                    \ abort authtok_expired module_unknown
+                                    \ bad_item and default
+                                    \ nextgroup=pamconfControlValueEq
+
+syn match   pamconfControlValueEq   contained '='
+                                    \ nextgroup=pamconfControlActionN,
+                                    \           pamconfControlAction
+
+syn match   pamconfControlActionN   contained '\d\+\>'
+                                    \ nextgroup=pamconfControlValues,
+                                    \ pamconfControlLineCont,pamconfControlEnd
+                                    \ skipwhite
+syn keyword pamconfControlAction    contained ignore bad die ok done reset
+                                    \ nextgroup=pamconfControlValues,
+                                    \ pamconfControlLineCont,pamconfControlEnd
+                                    \ skipwhite
+
+syn match   pamconfControlEnd       contained '\]'
+                                    \ nextgroup=pamconfMPath,
+                                    \ pamconfControlLineContH skipwhite
+
+syn match   pamconfControlLineContH contained '\\$'
+                                    \ nextgroup=pamconfMPath,
+                                    \ pamconfControlLineContH skipwhite skipnl
+
+syn match   pamconfMPath            contained '\S\+'
+                                    \ nextgroup=pamconfMPathLineCont,
+                                    \ pamconfArgs skipwhite
+
+syn match   pamconfArgs             contained '\S\+'
+                                    \ nextgroup=pamconfArgsLineCont,
+                                    \ pamconfArgs skipwhite
+
+syn match   pamconfMPathLineCont    contained '\\$'
+                                    \ nextgroup=pamconfMPathLineCont,
+                                    \ pamconfArgs skipwhite skipnl
+
+syn match   pamconfArgsLineCont     contained '\\$'
+                                    \ nextgroup=pamconfArgsLineCont,
+                                    \ pamconfArgs skipwhite skipnl
+
+hi def link pamconfTodo             Todo
+hi def link pamconfComment          Comment
+hi def link pamconfService          Statement
+hi def link pamconfServiceLineCont  Special
+hi def link pamconfType             Special
+hi def link pamconfTypeKeyword      Type
+hi def link pamconfTypeLineCont     pamconfServiceLineCont
+hi def link pamconfControl          Macro
+hi def link pamconfControlBegin     Delimiter
+hi def link pamconfControlLineContH pamconfServiceLineCont
+hi def link pamconfControlLineCont  pamconfServiceLineCont
+hi def link pamconfControlValues    Identifier
+hi def link pamconfControlValueEq   Operator
+hi def link pamconfControlActionN   Number
+hi def link pamconfControlAction    Identifier
+hi def link pamconfControlEnd       Delimiter
+hi def link pamconfMPath            String
+hi def link pamconfMPathLineCont    pamconfServiceLineCont
+hi def link pamconfArgs             Normal
+hi def link pamconfArgsLineCont     pamconfServiceLineCont
+
+let b:current_syntax = "pamconf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/pamenv.vim b/syntax/pamenv.vim
new file mode 100644
index 000000000..ac6e91298
--- /dev/null
+++ b/syntax/pamenv.vim
@@ -0,0 +1,32 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pamenv') == -1
+
+" Vim syntax file
+" Language:             pam_env.conf(5) configuration file
+" Latest Revision:      2020-05-10
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn keyword     pamenvTodo              contained TODO FIXME XXX NOTE
+syn region      pamenvComment           start='^#' end='$' display oneline contains=pamenvTodo,@Spells
+
+syn match       pamenvVars              '^[A-Z_][A-Z_0-9]*' nextgroup=pamenvKeywords skipwhite
+
+syn keyword     pamenvKeywords          contained DEFAULT OVERRIDE nextgroup=pamenvVarEq
+
+syn match       pamenvVarEq             contained '=' nextgroup=pamenvValue,pamenvValueWithQuote
+
+syn match       pamenvValue             contained '[^ \t]*' skipwhite nextgroup=pamenvKeywords
+syn region      pamenvValueWithQuote    contained start='"' end='"' skipwhite nextgroup=pamenvKeywords
+
+hi def link     pamenvTodo              Todo
+hi def link     pamenvComment           Comment
+hi def link     pamenvKeywords          Keyword
+hi def link     pamenvVars              Identifier
+hi def link     pamenvValue             String
+hi def link     pamenvValueWithQuote    String
+
+let b:current_syntax = "pamenv"
+
+endif
diff --git a/syntax/papp.vim b/syntax/papp.vim
new file mode 100644
index 000000000..24efa4441
--- /dev/null
+++ b/syntax/papp.vim
@@ -0,0 +1,80 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'papp') == -1
+
+" Vim syntax file for the "papp" file format (_p_erl _app_lication)
+"
+" Language:	papp
+" Maintainer:	Marc Lehmann <pcg@goof.com>
+" Last Change:	2009 Nov 11
+" Filenames:    *.papp *.pxml *.pxsl
+" URL:		http://papp.plan9.de/
+
+" You can set the "papp_include_html" variable so that html will be
+" rendered as such inside phtml sections (in case you actually put html
+" there - papp does not require that). Also, rendering html tends to keep
+" the clutter high on the screen - mixing three languages is difficult
+" enough(!). PS: it is also slow.
+
+" pod is, btw, allowed everywhere, which is actually wrong :(
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" source is basically xml, with included html (this is common) and perl bits
+runtime! syntax/xml.vim
+unlet b:current_syntax
+
+if exists("papp_include_html")
+  syn include @PAppHtml syntax/html.vim
+  unlet b:current_syntax
+  syntax spell default  " added by Bram
+endif
+
+syn include @PAppPerl syntax/perl.vim
+
+syn cluster xmlFoldCluster add=papp_perl,papp_xperl,papp_phtml,papp_pxml,papp_perlPOD
+
+" preprocessor commands
+syn region papp_prep matchgroup=papp_prep start="^#\s*\(if\|elsif\)" end="$" keepend contains=@perlExpr contained
+syn match papp_prep /^#\s*\(else\|endif\|??\).*$/ contained
+" translation entries
+syn region papp_gettext start=/__"/ end=/"/ contained contains=@papp_perlInterpDQ
+syn cluster PAppHtml add=papp_gettext,papp_prep
+
+" add special, paired xperl, perl and phtml tags
+syn region papp_perl  matchgroup=xmlTag start="<perl>"  end="</perl>"  contains=papp_CDATAp,@PAppPerl keepend
+syn region papp_xperl matchgroup=xmlTag start="<xperl>" end="</xperl>" contains=papp_CDATAp,@PAppPerl keepend
+syn region papp_phtml matchgroup=xmlTag start="<phtml>" end="</phtml>" contains=papp_CDATAh,papp_ph_perl,papp_ph_html,papp_ph_hint,@PAppHtml keepend
+syn region papp_pxml  matchgroup=xmlTag start="<pxml>"	end="</pxml>"  contains=papp_CDATAx,papp_ph_perl,papp_ph_xml,papp_ph_xint	     keepend
+syn region papp_perlPOD start="^=[a-z]" end="^=cut" contains=@Pod,perlTodo keepend
+
+" cdata sections
+syn region papp_CDATAp matchgroup=xmlCdataDecl start="<!\[CDATA\[" end="\]\]>" contains=@PAppPerl					 contained keepend
+syn region papp_CDATAh matchgroup=xmlCdataDecl start="<!\[CDATA\[" end="\]\]>" contains=papp_ph_perl,papp_ph_html,papp_ph_hint,@PAppHtml contained keepend
+syn region papp_CDATAx matchgroup=xmlCdataDecl start="<!\[CDATA\[" end="\]\]>" contains=papp_ph_perl,papp_ph_xml,papp_ph_xint		 contained keepend
+
+syn region papp_ph_perl matchgroup=Delimiter start="<[:?]" end="[:?]>"me=e-2 nextgroup=papp_ph_html contains=@PAppPerl		     contained keepend
+syn region papp_ph_html matchgroup=Delimiter start=":>"    end="<[:?]"me=e-2 nextgroup=papp_ph_perl contains=@PAppHtml		     contained keepend
+syn region papp_ph_hint matchgroup=Delimiter start="?>"    end="<[:?]"me=e-2 nextgroup=papp_ph_perl contains=@perlInterpDQ,@PAppHtml contained keepend
+syn region papp_ph_xml	matchgroup=Delimiter start=":>"    end="<[:?]"me=e-2 nextgroup=papp_ph_perl contains=			     contained keepend
+syn region papp_ph_xint matchgroup=Delimiter start="?>"    end="<[:?]"me=e-2 nextgroup=papp_ph_perl contains=@perlInterpDQ	     contained keepend
+
+" synchronization is horrors!
+syn sync clear
+syn sync match pappSync grouphere papp_CDATAh "</\(perl\|xperl\|phtml\|macro\|module\)>"
+syn sync match pappSync grouphere papp_CDATAh "^# *\(if\|elsif\|else\|endif\)"
+syn sync match pappSync grouphere papp_CDATAh "</\(tr\|td\|table\|hr\|h1\|h2\|h3\)>"
+syn sync match pappSync grouphere NONE	      "</\=\(module\|state\|macro\)>"
+
+syn sync maxlines=300
+syn sync minlines=5
+
+" The default highlighting.
+
+hi def link papp_prep		preCondit
+hi def link papp_gettext	String
+
+let b:current_syntax = "papp"
+
+endif
diff --git a/syntax/pascal.vim b/syntax/pascal.vim
new file mode 100644
index 000000000..90ab2abeb
--- /dev/null
+++ b/syntax/pascal.vim
@@ -0,0 +1,364 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pascal') == -1
+
+" Vim syntax file
+" Language:	Pascal
+" Version: 2.8
+" Last Change:	2004/10/17 17:47:30
+" Maintainer:  Xavier Cr�gut <xavier.cregut@enseeiht.fr>
+" Previous Maintainer:	Mario Eusebio <bio@dq.fct.unl.pt>
+
+" Contributors: Tim Chase <tchase@csc.com>,
+"	Stas Grabois <stsi@vtrails.com>,
+"	Mazen NEIFER <mazen.neifer.2001@supaero.fr>,
+"	Klaus Hast <Klaus.Hast@arcor.net>,
+"	Austin Ziegler <austin@halostatue.ca>,
+"	Markus Koenig <markus@stber-koenig.de>
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+
+syn case ignore
+syn sync lines=250
+
+syn keyword pascalBoolean	true false
+syn keyword pascalConditional	if else then
+syn keyword pascalConstant	nil maxint
+syn keyword pascalLabel		case goto label
+syn keyword pascalOperator	and div downto in mod not of or packed with
+syn keyword pascalRepeat	do for do repeat while to until
+syn keyword pascalStatement	procedure function
+syn keyword pascalStatement	program begin end const var type
+syn keyword pascalStruct	record
+syn keyword pascalType		array boolean char integer file pointer real set
+syn keyword pascalType		string text variant
+
+
+    " 20011222az: Added new items.
+syn keyword pascalTodo contained	TODO FIXME XXX DEBUG NOTE
+
+    " 20010723az: When wanted, highlight the trailing whitespace -- this is
+    " based on c_space_errors; to enable, use "pascal_space_errors".
+if exists("pascal_space_errors")
+    if !exists("pascal_no_trail_space_error")
+        syn match pascalSpaceError "\s\+$"
+    endif
+    if !exists("pascal_no_tab_space_error")
+        syn match pascalSpaceError " \+\t"me=e-1
+    endif
+endif
+
+
+
+" String
+if !exists("pascal_one_line_string")
+  syn region  pascalString matchgroup=pascalString start=+'+ end=+'+ contains=pascalStringEscape
+  if exists("pascal_gpc")
+    syn region  pascalString matchgroup=pascalString start=+"+ end=+"+ contains=pascalStringEscapeGPC
+  else
+    syn region  pascalStringError matchgroup=pascalStringError start=+"+ end=+"+ contains=pascalStringEscape
+  endif
+else
+  "wrong strings
+  syn region  pascalStringError matchgroup=pascalStringError start=+'+ end=+'+ end=+$+ contains=pascalStringEscape
+  if exists("pascal_gpc")
+    syn region  pascalStringError matchgroup=pascalStringError start=+"+ end=+"+ end=+$+ contains=pascalStringEscapeGPC
+  else
+    syn region  pascalStringError matchgroup=pascalStringError start=+"+ end=+"+ end=+$+ contains=pascalStringEscape
+  endif
+
+  "right strings
+  syn region  pascalString matchgroup=pascalString start=+'+ end=+'+ oneline contains=pascalStringEscape
+  " To see the start and end of strings:
+  " syn region  pascalString matchgroup=pascalStringError start=+'+ end=+'+ oneline contains=pascalStringEscape
+  if exists("pascal_gpc")
+    syn region  pascalString matchgroup=pascalString start=+"+ end=+"+ oneline contains=pascalStringEscapeGPC
+  else
+    syn region  pascalStringError matchgroup=pascalStringError start=+"+ end=+"+ oneline contains=pascalStringEscape
+  endif
+end
+syn match   pascalStringEscape		contained "''"
+syn match   pascalStringEscapeGPC	contained '""'
+
+
+" syn match   pascalIdentifier		"\<[a-zA-Z_][a-zA-Z0-9_]*\>"
+
+
+if exists("pascal_symbol_operator")
+  syn match   pascalSymbolOperator      "[+\-/*=]"
+  syn match   pascalSymbolOperator      "[<>]=\="
+  syn match   pascalSymbolOperator      "<>"
+  syn match   pascalSymbolOperator      ":="
+  syn match   pascalSymbolOperator      "[()]"
+  syn match   pascalSymbolOperator      "\.\."
+  syn match   pascalSymbolOperator       "[\^.]"
+  syn match   pascalMatrixDelimiter	"[][]"
+  "if you prefer you can highlight the range
+  "syn match  pascalMatrixDelimiter	"[\d\+\.\.\d\+]"
+endif
+
+syn match  pascalNumber		"-\=\<\d\+\>"
+syn match  pascalFloat		"-\=\<\d\+\.\d\+\>"
+syn match  pascalFloat		"-\=\<\d\+\.\d\+[eE]-\=\d\+\>"
+syn match  pascalHexNumber	"\$[0-9a-fA-F]\+\>"
+
+if exists("pascal_no_tabs")
+  syn match pascalShowTab "\t"
+endif
+
+syn region pascalComment	start="(\*\|{"  end="\*)\|}" contains=pascalTodo,pascalSpaceError
+
+
+if !exists("pascal_no_functions")
+  " array functions
+  syn keyword pascalFunction	pack unpack
+
+  " memory function
+  syn keyword pascalFunction	Dispose New
+
+  " math functions
+  syn keyword pascalFunction	Abs Arctan Cos Exp Ln Sin Sqr Sqrt
+
+  " file functions
+  syn keyword pascalFunction	Eof Eoln Write Writeln
+  syn keyword pascalPredefined	Input Output
+
+  if exists("pascal_traditional")
+    " These functions do not seem to be defined in Turbo Pascal
+    syn keyword pascalFunction	Get Page Put 
+  endif
+
+  " ordinal functions
+  syn keyword pascalFunction	Odd Pred Succ
+
+  " transfert functions
+  syn keyword pascalFunction	Chr Ord Round Trunc
+endif
+
+
+if !exists("pascal_traditional")
+
+  syn keyword pascalStatement	constructor destructor implementation inherited
+  syn keyword pascalStatement	interface unit uses
+  syn keyword pascalModifier	absolute assembler external far forward inline
+  syn keyword pascalModifier	interrupt near virtual 
+  syn keyword pascalAcces	private public 
+  syn keyword pascalStruct	object 
+  syn keyword pascalOperator	shl shr xor
+
+  syn region pascalPreProc	start="(\*\$"  end="\*)" contains=pascalTodo
+  syn region pascalPreProc	start="{\$"  end="}"
+
+  syn region  pascalAsm		matchgroup=pascalAsmKey start="\<asm\>" end="\<end\>" contains=pascalComment,pascalPreProc
+
+  syn keyword pascalType	ShortInt LongInt Byte Word
+  syn keyword pascalType	ByteBool WordBool LongBool
+  syn keyword pascalType	Cardinal LongWord
+  syn keyword pascalType	Single Double Extended Comp
+  syn keyword pascalType	PChar
+
+
+  if !exists ("pascal_fpc")
+    syn keyword pascalPredefined	Result
+  endif
+
+  if exists("pascal_fpc")
+    syn region pascalComment        start="//" end="$" contains=pascalTodo,pascalSpaceError
+    syn keyword pascalStatement	fail otherwise operator
+    syn keyword pascalDirective	popstack
+    syn keyword pascalPredefined self
+    syn keyword pascalType	ShortString AnsiString WideString
+  endif
+
+  if exists("pascal_gpc")
+    syn keyword pascalType	SmallInt
+    syn keyword pascalType	AnsiChar
+    syn keyword pascalType	PAnsiChar
+  endif
+
+  if exists("pascal_delphi")
+    syn region pascalComment	start="//"  end="$" contains=pascalTodo,pascalSpaceError
+    syn keyword pascalType	SmallInt Int64
+    syn keyword pascalType	Real48 Currency
+    syn keyword pascalType	AnsiChar WideChar
+    syn keyword pascalType	ShortString AnsiString WideString
+    syn keyword pascalType	PAnsiChar PWideChar
+    syn match  pascalFloat	"-\=\<\d\+\.\d\+[dD]-\=\d\+\>"
+    syn match  pascalStringEscape	contained "#[12][0-9]\=[0-9]\="
+    syn keyword pascalStruct	class dispinterface
+    syn keyword pascalException	try except raise at on finally
+    syn keyword pascalStatement	out
+    syn keyword pascalStatement	library package 
+    syn keyword pascalStatement	initialization finalization uses exports
+    syn keyword pascalStatement	property out resourcestring threadvar
+    syn keyword pascalModifier	contains
+    syn keyword pascalModifier	overridden reintroduce abstract
+    syn keyword pascalModifier	override export dynamic name message
+    syn keyword pascalModifier	dispid index stored default nodefault readonly
+    syn keyword pascalModifier	writeonly implements overload requires resident
+    syn keyword pascalAcces	protected published automated
+    syn keyword pascalDirective	register pascal cvar cdecl stdcall safecall
+    syn keyword pascalOperator	as is
+  endif
+
+  if exists("pascal_no_functions")
+    "syn keyword pascalModifier	read write
+    "may confuse with Read and Write functions.  Not easy to handle.
+  else
+    " control flow functions
+    syn keyword pascalFunction	Break Continue Exit Halt RunError
+
+    " ordinal functions
+    syn keyword pascalFunction	Dec Inc High Low
+
+    " math functions
+    syn keyword pascalFunction	Frac Int Pi
+
+    " string functions
+    syn keyword pascalFunction	Concat Copy Delete Insert Length Pos Str Val
+
+    " memory function
+    syn keyword pascalFunction	FreeMem GetMem MaxAvail MemAvail
+
+    " pointer and address functions
+    syn keyword pascalFunction	Addr Assigned CSeg DSeg Ofs Ptr Seg SPtr SSeg
+
+    " misc functions
+    syn keyword pascalFunction	Exclude FillChar Hi Include Lo Move ParamCount
+    syn keyword pascalFunction	ParamStr Random Randomize SizeOf Swap TypeOf
+    syn keyword pascalFunction	UpCase
+
+    " predefined variables
+    syn keyword pascalPredefined ErrorAddr ExitCode ExitProc FileMode FreeList
+    syn keyword pascalPredefined FreeZero HeapEnd HeapError HeapOrg HeapPtr
+    syn keyword pascalPredefined InOutRes OvrCodeList OvrDebugPtr OvrDosHandle
+    syn keyword pascalPredefined OvrEmsHandle OvrHeapEnd OvrHeapOrg OvrHeapPtr
+    syn keyword pascalPredefined OvrHeapSize OvrLoadList PrefixSeg RandSeed
+    syn keyword pascalPredefined SaveInt00 SaveInt02 SaveInt1B SaveInt21
+    syn keyword pascalPredefined SaveInt23 SaveInt24 SaveInt34 SaveInt35
+    syn keyword pascalPredefined SaveInt36 SaveInt37 SaveInt38 SaveInt39
+    syn keyword pascalPredefined SaveInt3A SaveInt3B SaveInt3C SaveInt3D
+    syn keyword pascalPredefined SaveInt3E SaveInt3F SaveInt75 SegA000 SegB000
+    syn keyword pascalPredefined SegB800 SelectorInc StackLimit Test8087
+
+    " file functions
+    syn keyword pascalFunction	Append Assign BlockRead BlockWrite ChDir Close
+    syn keyword pascalFunction	Erase FilePos FileSize Flush GetDir IOResult
+    syn keyword pascalFunction	MkDir Read Readln Rename Reset Rewrite RmDir
+    syn keyword pascalFunction	Seek SeekEof SeekEoln SetTextBuf Truncate
+
+    " crt unit
+    syn keyword pascalFunction	AssignCrt ClrEol ClrScr Delay DelLine GotoXY
+    syn keyword pascalFunction	HighVideo InsLine KeyPressed LowVideo NormVideo
+    syn keyword pascalFunction	NoSound ReadKey Sound TextBackground TextColor
+    syn keyword pascalFunction	TextMode WhereX WhereY Window
+    syn keyword pascalPredefined CheckBreak CheckEOF CheckSnow DirectVideo
+    syn keyword pascalPredefined LastMode TextAttr WindMin WindMax
+    syn keyword pascalFunction BigCursor CursorOff CursorOn
+    syn keyword pascalConstant Black Blue Green Cyan Red Magenta Brown
+    syn keyword pascalConstant LightGray DarkGray LightBlue LightGreen
+    syn keyword pascalConstant LightCyan LightRed LightMagenta Yellow White
+    syn keyword pascalConstant Blink ScreenWidth ScreenHeight bw40
+    syn keyword pascalConstant co40 bw80 co80 mono
+    syn keyword pascalPredefined TextChar 
+
+    " DOS unit
+    syn keyword pascalFunction	AddDisk DiskFree DiskSize DosExitCode DosVersion
+    syn keyword pascalFunction	EnvCount EnvStr Exec Expand FindClose FindFirst
+    syn keyword pascalFunction	FindNext FSearch FSplit GetCBreak GetDate
+    syn keyword pascalFunction	GetEnv GetFAttr GetFTime GetIntVec GetTime
+    syn keyword pascalFunction	GetVerify Intr Keep MSDos PackTime SetCBreak
+    syn keyword pascalFunction	SetDate SetFAttr SetFTime SetIntVec SetTime
+    syn keyword pascalFunction	SetVerify SwapVectors UnPackTime
+    syn keyword pascalConstant	FCarry FParity FAuxiliary FZero FSign FOverflow
+    syn keyword pascalConstant	Hidden Sysfile VolumeId Directory Archive
+    syn keyword pascalConstant	AnyFile fmClosed fmInput fmOutput fmInout
+    syn keyword pascalConstant	TextRecNameLength TextRecBufSize
+    syn keyword pascalType	ComStr PathStr DirStr NameStr ExtStr SearchRec
+    syn keyword pascalType	FileRec TextBuf TextRec Registers DateTime
+    syn keyword pascalPredefined DosError
+
+    "Graph Unit
+    syn keyword pascalFunction	Arc Bar Bar3D Circle ClearDevice ClearViewPort
+    syn keyword pascalFunction	CloseGraph DetectGraph DrawPoly Ellipse
+    syn keyword pascalFunction	FillEllipse FillPoly FloodFill GetArcCoords
+    syn keyword pascalFunction	GetAspectRatio GetBkColor GetColor
+    syn keyword pascalFunction	GetDefaultPalette GetDriverName GetFillPattern
+    syn keyword pascalFunction	GetFillSettings GetGraphMode GetImage
+    syn keyword pascalFunction	GetLineSettings GetMaxColor GetMaxMode GetMaxX
+    syn keyword pascalFunction	GetMaxY GetModeName GetModeRange GetPalette
+    syn keyword pascalFunction	GetPaletteSize GetPixel GetTextSettings
+    syn keyword pascalFunction	GetViewSettings GetX GetY GraphDefaults
+    syn keyword pascalFunction	GraphErrorMsg GraphResult ImageSize InitGraph
+    syn keyword pascalFunction	InstallUserDriver InstallUserFont Line LineRel
+    syn keyword pascalFunction	LineTo MoveRel MoveTo OutText OutTextXY
+    syn keyword pascalFunction	PieSlice PutImage PutPixel Rectangle
+    syn keyword pascalFunction	RegisterBGIDriver RegisterBGIFont
+    syn keyword pascalFunction	RestoreCRTMode Sector SetActivePage
+    syn keyword pascalFunction	SetAllPallette SetAspectRatio SetBkColor
+    syn keyword pascalFunction	SetColor SetFillPattern SetFillStyle
+    syn keyword pascalFunction	SetGraphBufSize SetGraphMode SetLineStyle
+    syn keyword pascalFunction	SetPalette SetRGBPalette SetTextJustify
+    syn keyword pascalFunction	SetTextStyle SetUserCharSize SetViewPort
+    syn keyword pascalFunction	SetVisualPage SetWriteMode TextHeight TextWidth
+    syn keyword pascalType	ArcCoordsType FillPatternType FillSettingsType
+    syn keyword pascalType	LineSettingsType PaletteType PointType
+    syn keyword pascalType	TextSettingsType ViewPortType
+
+    " string functions
+    syn keyword pascalFunction	StrAlloc StrBufSize StrCat StrComp StrCopy
+    syn keyword pascalFunction	StrDispose StrECopy StrEnd StrFmt StrIComp
+    syn keyword pascalFunction	StrLCat StrLComp StrLCopy StrLen StrLFmt
+    syn keyword pascalFunction	StrLIComp StrLower StrMove StrNew StrPas
+    syn keyword pascalFunction	StrPCopy StrPLCopy StrPos StrRScan StrScan
+    syn keyword pascalFunction	StrUpper
+  endif
+
+endif
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link pascalAcces		pascalStatement
+hi def link pascalBoolean		Boolean
+hi def link pascalComment		Comment
+hi def link pascalConditional	Conditional
+hi def link pascalConstant		Constant
+hi def link pascalDelimiter	Identifier
+hi def link pascalDirective	pascalStatement
+hi def link pascalException	Exception
+hi def link pascalFloat		Float
+hi def link pascalFunction		Function
+hi def link pascalLabel		Label
+hi def link pascalMatrixDelimiter	Identifier
+hi def link pascalModifier		Type
+hi def link pascalNumber		Number
+hi def link pascalOperator		Operator
+hi def link pascalPredefined	pascalStatement
+hi def link pascalPreProc		PreProc
+hi def link pascalRepeat		Repeat
+hi def link pascalSpaceError	Error
+hi def link pascalStatement	Statement
+hi def link pascalString		String
+hi def link pascalStringEscape	Special
+hi def link pascalStringEscapeGPC	Special
+hi def link pascalStringError	Error
+hi def link pascalStruct		pascalStatement
+hi def link pascalSymbolOperator	pascalOperator
+hi def link pascalTodo		Todo
+hi def link pascalType		Type
+hi def link pascalUnclassified	pascalStatement
+"  hi def link pascalAsm		Assembler
+hi def link pascalError		Error
+hi def link pascalAsmKey		pascalStatement
+hi def link pascalShowTab		Error
+
+
+
+let b:current_syntax = "pascal"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/passwd.vim b/syntax/passwd.vim
new file mode 100644
index 000000000..c63bdc836
--- /dev/null
+++ b/syntax/passwd.vim
@@ -0,0 +1,75 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'passwd') == -1
+
+" Vim syntax file
+" Language:             passwd(5) password file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-10-03
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match   passwdBegin         display '^' nextgroup=passwdAccount
+
+syn match   passwdAccount       contained display '[^:]\+'
+                                \ nextgroup=passwdPasswordColon
+
+syn match   passwdPasswordColon contained display ':'
+                                \ nextgroup=passwdPassword,passwdShadow
+
+syn match   passwdPassword      contained display '[^:]\+'
+                                \ nextgroup=passwdUIDColon
+
+syn match   passwdShadow        contained display '[x*!]'
+                                \ nextgroup=passwdUIDColon
+
+syn match   passwdUIDColon      contained display ':' nextgroup=passwdUID
+
+syn match   passwdUID           contained display '\d\{0,10}'
+                                \ nextgroup=passwdGIDColon
+
+syn match   passwdGIDColon      contained display ':' nextgroup=passwdGID
+
+syn match   passwdGID           contained display '\d\{0,10}'
+                                \ nextgroup=passwdGecosColon
+
+syn match   passwdGecosColon    contained display ':' nextgroup=passwdGecos
+
+syn match   passwdGecos         contained display '[^:]*'
+                                \ nextgroup=passwdDirColon
+
+syn match   passwdDirColon      contained display ':' nextgroup=passwdDir
+
+syn match   passwdDir           contained display '/[^:]*'
+                                \ nextgroup=passwdShellColon
+
+syn match   passwdShellColon    contained display ':'
+                                \ nextgroup=passwdShell
+
+syn match   passwdShell         contained display '.*'
+
+hi def link passwdColon         Normal
+hi def link passwdAccount       Identifier
+hi def link passwdPasswordColon passwdColon
+hi def link passwdPassword      Number
+hi def link passwdShadow        Special
+hi def link passwdUIDColon      passwdColon
+hi def link passwdUID           Number
+hi def link passwdGIDColon      passwdColon
+hi def link passwdGID           Number
+hi def link passwdGecosColon    passwdColon
+hi def link passwdGecos         Comment
+hi def link passwdDirColon      passwdColon
+hi def link passwdDir           Type
+hi def link passwdShellColon    passwdColon
+hi def link passwdShell         Operator
+
+let b:current_syntax = "passwd"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/pccts.vim b/syntax/pccts.vim
new file mode 100644
index 000000000..d28574b4f
--- /dev/null
+++ b/syntax/pccts.vim
@@ -0,0 +1,93 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pccts') == -1
+
+" Vim syntax file
+" Language:	PCCTS
+" Maintainer:	Scott Bigham <dsb@killerbunnies.org>
+" Last Change:	10 Aug 1999
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Read the C++ syntax to start with
+syn include @cppTopLevel syntax/cpp.vim
+
+syn region pcctsAction matchgroup=pcctsDelim start="<<" end=">>?\=" contains=@cppTopLevel,pcctsRuleRef
+
+syn region pcctsArgBlock matchgroup=pcctsDelim start="\(>\s*\)\=\[" end="\]" contains=@cppTopLevel,pcctsRuleRef
+
+syn region pcctsString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=pcctsSpecialChar
+syn match  pcctsSpecialChar "\\\\\|\\\"" contained
+
+syn region pcctsComment start="/\*" end="\*/" contains=cTodo
+syn match  pcctsComment "//.*$" contains=cTodo
+
+syn region pcctsDirective start="^\s*#header\s\+<<" end=">>" contains=pcctsAction keepend
+syn match  pcctsDirective "^\s*#parser\>.*$" contains=pcctsString,pcctsComment
+syn match  pcctsDirective "^\s*#tokdefs\>.*$" contains=pcctsString,pcctsComment
+syn match  pcctsDirective "^\s*#token\>.*$" contains=pcctsString,pcctsAction,pcctsTokenName,pcctsComment
+syn region pcctsDirective start="^\s*#tokclass\s\+[A-Z]\i*\s\+{" end="}" contains=pcctsString,pcctsTokenName
+syn match  pcctsDirective "^\s*#lexclass\>.*$" contains=pcctsTokenName
+syn region pcctsDirective start="^\s*#errclass\s\+[^{]\+\s\+{" end="}" contains=pcctsString,pcctsTokenName
+syn match pcctsDirective "^\s*#pred\>.*$" contains=pcctsTokenName,pcctsAction
+
+syn cluster pcctsInRule contains=pcctsString,pcctsRuleName,pcctsTokenName,pcctsAction,pcctsArgBlock,pcctsSubRule,pcctsLabel,pcctsComment
+
+syn region pcctsRule start="\<[a-z][A-Za-z0-9_]*\>\(\s*\[[^]]*\]\)\=\(\s*>\s*\[[^]]*\]\)\=\s*:" end=";" contains=@pcctsInRule
+
+syn region pcctsSubRule matchgroup=pcctsDelim start="(" end=")\(+\|\*\|?\(\s*=>\)\=\)\=" contains=@pcctsInRule contained
+syn region pcctsSubRule matchgroup=pcctsDelim start="{" end="}" contains=@pcctsInRule contained
+
+syn match pcctsRuleName  "\<[a-z]\i*\>" contained
+syn match pcctsTokenName "\<[A-Z]\i*\>" contained
+
+syn match pcctsLabel "\<\I\i*:\I\i*" contained contains=pcctsLabelHack,pcctsRuleName,pcctsTokenName
+syn match pcctsLabel "\<\I\i*:\"\([^\\]\|\\.\)*\"" contained contains=pcctsLabelHack,pcctsString
+syn match pcctsLabelHack "\<\I\i*:" contained
+
+syn match pcctsRuleRef "\$\I\i*\>" contained
+syn match pcctsRuleRef "\$\d\+\(\.\d\+\)\>" contained
+
+syn keyword pcctsClass     class   nextgroup=pcctsClassName skipwhite
+syn match   pcctsClassName "\<\I\i*\>" contained nextgroup=pcctsClassBlock skipwhite skipnl
+syn region pcctsClassBlock start="{" end="}" contained contains=pcctsRule,pcctsComment,pcctsDirective,pcctsAction,pcctsException,pcctsExceptionHandler
+
+syn keyword pcctsException exception nextgroup=pcctsExceptionRuleRef skipwhite
+syn match pcctsExceptionRuleRef "\[\I\i*\]" contained contains=pcctsExceptionID
+syn match pcctsExceptionID "\I\i*" contained
+syn keyword pcctsExceptionHandler	catch default
+syn keyword pcctsExceptionHandler	NoViableAlt NoSemViableAlt
+syn keyword pcctsExceptionHandler	MismatchedToken
+
+syn sync clear
+syn sync match pcctsSyncAction grouphere pcctsAction "<<"
+syn sync match pcctsSyncAction "<<\([^>]\|>[^>]\)*>>"
+syn sync match pcctsSyncRule grouphere pcctsRule "\<[a-z][A-Za-z0-9_]*\>\s*\[[^]]*\]\s*:"
+syn sync match pcctsSyncRule grouphere pcctsRule "\<[a-z][A-Za-z0-9_]*\>\(\s*\[[^]]*\]\)\=\s*>\s*\[[^]]*\]\s*:"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link pcctsDelim		Special
+hi def link pcctsTokenName		Identifier
+hi def link pcctsRuleName		Statement
+hi def link pcctsLabelHack		Label
+hi def link pcctsDirective		PreProc
+hi def link pcctsString		String
+hi def link pcctsComment		Comment
+hi def link pcctsClass		Statement
+hi def link pcctsClassName		Identifier
+hi def link pcctsException		Statement
+hi def link pcctsExceptionHandler	Keyword
+hi def link pcctsExceptionRuleRef	pcctsDelim
+hi def link pcctsExceptionID	Identifier
+hi def link pcctsRuleRef		Identifier
+hi def link pcctsSpecialChar	SpecialChar
+
+
+let b:current_syntax = "pccts"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/pdf.vim b/syntax/pdf.vim
new file mode 100644
index 000000000..621ccacda
--- /dev/null
+++ b/syntax/pdf.vim
@@ -0,0 +1,77 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pdf') == -1
+
+" Vim syntax file
+" Language:	PDF
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.info>
+" Last Change:	2007 Dec 16
+
+if exists("b:current_syntax")
+    finish
+endif
+
+if !exists("main_syntax")
+    let main_syntax = 'pdf'
+endif
+
+syn include @pdfXML syntax/xml.vim
+
+syn case match
+
+syn cluster pdfObjects contains=pdfBoolean,pdfConstant,pdfNumber,pdfFloat,pdfName,pdfHexString,pdfString,pdfArray,pdfHash,pdfReference,pdfComment
+syn keyword pdfBoolean  true false contained
+syn keyword pdfConstant null       contained
+syn match   pdfNumber "[+-]\=\<\d\+\>"
+syn match   pdfFloat   "[+-]\=\<\%(\d\+\.\|\d*\.\d\+\)\>" contained
+
+syn match   pdfNameError "#\X\|#\x\X\|#00" contained containedin=pdfName
+syn match   pdfSpecialChar "#\x\x" contained containedin=pdfName
+syn match   pdfName   "/[^[:space:]\[\](){}<>/]*"   contained
+syn match   pdfHexError  "[^[:space:][:xdigit:]<>]" contained
+"syn match   pdfHexString "<\s*\x[^<>]*\x\s*>"    contained contains=pdfHexError
+"syn match   pdfHexString "<\s*\x\=\s*>"          contained
+syn region  pdfHexString matchgroup=pdfDelimiter start="<<\@!" end=">" contained contains=pdfHexError
+syn match   pdfStringError "\\."      contained containedin=pdfString
+syn match   pdfSpecialChar "\\\%(\o\{1,3\}\|[nrtbf()\\]\)"  contained containedin=pdfString
+syn region  pdfString matchgroup=pdfDelimiter start="\\\@<!(" end="\\\@<!)" contains=pdfString
+
+syn region  pdfArray  matchgroup=pdfOperator start="\[" end="\]" contains=@pdfObjects contained
+syn region  pdfHash   matchgroup=pdfOperator start="<<" end=">>" contains=@pdfObjects contained
+syn match   pdfReference "\<\d\+\s\+\d\+\s\+R\>"
+"syn keyword pdfOperator R contained containedin=pdfReference
+
+syn region  pdfObject matchgroup=pdfType start="\<obj\>"     end="\<endobj\>" contains=@pdfObjects
+syn region  pdfObject matchgroup=pdfType start="\<obj\r\=\n" end="\<endobj\>" contains=@pdfObjects fold
+
+" Do these twice.  The ones with only newlines are foldable
+syn region  pdfStream matchgroup=pdfType start="\<stream\r\=\n" end="endstream\s*\%(\r\|\n\|\r\n\)" contained containedin=pdfObject
+syn region  pdfXMLStream matchgroup=pdfType start="\<stream\r\=\n\_s*\%(<?\)\@=" end="endstream\s*\%(\r\|\n\|\r\n\)" contained containedin=pdfObject contains=@pdfXML
+syn region  pdfStream matchgroup=pdfType start="\<stream\n" end="endstream\s*\%(\r\|\n\|\r\n\)" contained containedin=pdfObject fold
+syn region  pdfXMLStream matchgroup=pdfType start="\<stream\n\_s*\%(<?\)\@=" end="endstream\s*\%(\r\|\n\|\r\n\)" contained containedin=pdfObject contains=@pdfXML fold
+
+syn region  pdfPreProc start="\<xref\%(\r\|\n\|\r\n\)" end="^trailer\%(\r\|\n\|\r\n\)" skipwhite skipempty nextgroup=pdfHash contains=pdfNumber fold
+syn keyword pdfPreProc startxref
+syn match   pdfComment  "%.*\%(\r\|\n\)" contains=pdfPreProc
+syn match   pdfPreProc  "^%\%(%EOF\|PDF-\d\.\d\)\(\r\|\n\)"
+
+hi def link pdfOperator     Operator
+hi def link pdfNumber       Number
+hi def link pdfFloat        Float
+hi def link pdfBoolean      Boolean
+hi def link pdfConstant     Constant
+hi def link pdfName         Identifier
+hi def link pdfNameError    pdfStringError
+hi def link pdfHexString    pdfString
+hi def link pdfHexError     pdfStringError
+hi def link pdfString       String
+hi def link pdfStringError  Error
+hi def link pdfSpecialChar  SpecialChar
+hi def link pdfDelimiter    Delimiter
+hi def link pdfType         Type
+hi def link pdfReference    Tag
+hi def link pdfStream       NonText
+hi def link pdfPreProc      PreProc
+hi def link pdfComment      Comment
+
+let b:current_syntax = "pdf"
+
+endif
diff --git a/syntax/pf.vim b/syntax/pf.vim
new file mode 100644
index 000000000..11b78662b
--- /dev/null
+++ b/syntax/pf.vim
@@ -0,0 +1,337 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pf') == -1
+
+" pf syntax file
+" Language:        OpenBSD packet filter configuration (pf.conf)
+" Original Author: Camiel Dobbelaar <cd@sentia.nl>
+" Maintainer:      Lauri Tirkkonen <lotheac@iki.fi>
+" Last Change:     2018 Jul 16
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let b:current_syntax = "pf"
+setlocal foldmethod=syntax
+syn iskeyword @,48-57,_,-,+
+syn sync fromstart
+
+syn cluster	pfNotLS		contains=pfTodo,pfVarAssign
+syn keyword	pfCmd		anchor antispoof block include match pass queue
+syn keyword	pfCmd		queue set table
+syn match	pfCmd		/^\s*load\sanchor\>/
+syn keyword	pfTodo		TODO XXX contained
+syn keyword	pfWildAddr	any no-route urpf-failed self
+syn match	pfComment	/#.*$/ contains=pfTodo
+syn match	pfCont		/\\$/
+syn match	pfErrClose	/}/
+syn match	pfIPv4		/\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
+syn match	pfIPv6		/[a-fA-F0-9:]*::[a-fA-F0-9:.]*/
+syn match	pfIPv6		/[a-fA-F0-9:]\+:[a-fA-F0-9:]\+:[a-fA-F0-9:.]\+/
+syn match	pfNetmask	/\/\d\+/
+syn match	pfNum		/[a-zA-Z0-9_:.]\@<!\d\+[a-zA-Z0-9_:.]\@!/
+syn match	pfTable		/<\s*[a-zA-Z0-9_:][a-zA-Z0-9_:.-]*\s*>/
+syn match	pfVar		/$[a-zA-Z][a-zA-Z0-9_]*/
+syn match	pfVarAssign	/^\s*[a-zA-Z][a-zA-Z0-9_]*\s*=/me=e-1
+syn region	pfFold1		start=/^#\{1}>/ end=/^#\{1,3}>/me=s-1 transparent fold
+syn region	pfFold2		start=/^#\{2}>/ end=/^#\{2,3}>/me=s-1 transparent fold
+syn region	pfFold3		start=/^#\{3}>/ end=/^#\{3}>/me=s-1 transparent fold
+syn region	pfList		start=/{/ end=/}/ transparent contains=ALLBUT,pfErrClose,@pfNotLS
+syn region	pfString	start=/"/ skip=/\\"/ end=/"/ contains=pfIPv4,pfIPv6,pfNetmask,pfTable,pfVar
+syn region	pfString	start=/'/ skip=/\\'/ end=/'/ contains=pfIPv4,pfIPv6,pfNetmask,pfTable,pfVar
+
+hi def link pfCmd	Statement
+hi def link pfComment	Comment
+hi def link pfCont	Statement
+hi def link pfErrClose	Error
+hi def link pfIPv4	Type
+hi def link pfIPv6	Type
+hi def link pfNetmask	Constant
+hi def link pfNum	Constant
+hi def link pfService	Constant
+hi def link pfString	String
+hi def link pfTable	Identifier
+hi def link pfTodo	Todo
+hi def link pfVar	Identifier
+hi def link pfVarAssign	Identifier
+hi def link pfWildAddr	Type
+
+" from OpenBSD src/etc/services r1.95
+syn keyword	pfService	802-11-iapp
+syn keyword	pfService	Microsoft-SQL-Monitor
+syn keyword	pfService	Microsoft-SQL-Server
+syn keyword	pfService	NeXTStep
+syn keyword	pfService	NextStep
+syn keyword	pfService	afpovertcp
+syn keyword	pfService	afs3-bos
+syn keyword	pfService	afs3-callback
+syn keyword	pfService	afs3-errors
+syn keyword	pfService	afs3-fileserver
+syn keyword	pfService	afs3-kaserver
+syn keyword	pfService	afs3-prserver
+syn keyword	pfService	afs3-rmtsys
+syn keyword	pfService	afs3-update
+syn keyword	pfService	afs3-vlserver
+syn keyword	pfService	afs3-volser
+syn keyword	pfService	amt-redir-tcp
+syn keyword	pfService	amt-redir-tls
+syn keyword	pfService	amt-soap-http
+syn keyword	pfService	amt-soap-https
+syn keyword	pfService	asf-rmcp
+syn keyword	pfService	at-echo
+syn keyword	pfService	at-nbp
+syn keyword	pfService	at-rtmp
+syn keyword	pfService	at-zis
+syn keyword	pfService	auth
+syn keyword	pfService	authentication
+syn keyword	pfService	bfd-control
+syn keyword	pfService	bfd-echo
+syn keyword	pfService	bftp
+syn keyword	pfService	bgp
+syn keyword	pfService	bgpd
+syn keyword	pfService	biff
+syn keyword	pfService	bootpc
+syn keyword	pfService	bootps
+syn keyword	pfService	canna
+syn keyword	pfService	cddb
+syn keyword	pfService	cddbp
+syn keyword	pfService	chargen
+syn keyword	pfService	chat
+syn keyword	pfService	cmd
+syn keyword	pfService	cmip-agent
+syn keyword	pfService	cmip-man
+syn keyword	pfService	comsat
+syn keyword	pfService	conference
+syn keyword	pfService	conserver
+syn keyword	pfService	courier
+syn keyword	pfService	csnet-ns
+syn keyword	pfService	cso-ns
+syn keyword	pfService	cvspserver
+syn keyword	pfService	daap
+syn keyword	pfService	datametrics
+syn keyword	pfService	daytime
+syn keyword	pfService	dhcpd-sync
+syn keyword	pfService	dhcpv6-client
+syn keyword	pfService	dhcpv6-server
+syn keyword	pfService	discard
+syn keyword	pfService	domain
+syn keyword	pfService	echo
+syn keyword	pfService	efs
+syn keyword	pfService	eklogin
+syn keyword	pfService	ekshell
+syn keyword	pfService	ekshell2
+syn keyword	pfService	epmap
+syn keyword	pfService	eppc
+syn keyword	pfService	exec
+syn keyword	pfService	finger
+syn keyword	pfService	ftp
+syn keyword	pfService	ftp-data
+syn keyword	pfService	git
+syn keyword	pfService	gopher
+syn keyword	pfService	gre-in-udp
+syn keyword	pfService	gre-udp-dtls
+syn keyword	pfService	hostname
+syn keyword	pfService	hostnames
+syn keyword	pfService	hprop
+syn keyword	pfService	http
+syn keyword	pfService	https
+syn keyword	pfService	hunt
+syn keyword	pfService	hylafax
+syn keyword	pfService	iapp
+syn keyword	pfService	icb
+syn keyword	pfService	ident
+syn keyword	pfService	imap
+syn keyword	pfService	imap2
+syn keyword	pfService	imap3
+syn keyword	pfService	imaps
+syn keyword	pfService	ingreslock
+syn keyword	pfService	ipp
+syn keyword	pfService	iprop
+syn keyword	pfService	ipsec-msft
+syn keyword	pfService	ipsec-nat-t
+syn keyword	pfService	ipx
+syn keyword	pfService	irc
+syn keyword	pfService	isakmp
+syn keyword	pfService	iscsi
+syn keyword	pfService	isisd
+syn keyword	pfService	iso-tsap
+syn keyword	pfService	kauth
+syn keyword	pfService	kdc
+syn keyword	pfService	kerberos
+syn keyword	pfService	kerberos-adm
+syn keyword	pfService	kerberos-iv
+syn keyword	pfService	kerberos-sec
+syn keyword	pfService	kerberos_master
+syn keyword	pfService	kf
+syn keyword	pfService	kip
+syn keyword	pfService	klogin
+syn keyword	pfService	kpasswd
+syn keyword	pfService	kpop
+syn keyword	pfService	krb524
+syn keyword	pfService	krb_prop
+syn keyword	pfService	krbupdate
+syn keyword	pfService	krcmd
+syn keyword	pfService	kreg
+syn keyword	pfService	kshell
+syn keyword	pfService	kx
+syn keyword	pfService	l2tp
+syn keyword	pfService	ldap
+syn keyword	pfService	ldaps
+syn keyword	pfService	ldp
+syn keyword	pfService	link
+syn keyword	pfService	login
+syn keyword	pfService	mail
+syn keyword	pfService	mdns
+syn keyword	pfService	mdnsresponder
+syn keyword	pfService	microsoft-ds
+syn keyword	pfService	ms-sql-m
+syn keyword	pfService	ms-sql-s
+syn keyword	pfService	msa
+syn keyword	pfService	msp
+syn keyword	pfService	mtp
+syn keyword	pfService	mysql
+syn keyword	pfService	name
+syn keyword	pfService	nameserver
+syn keyword	pfService	netbios-dgm
+syn keyword	pfService	netbios-ns
+syn keyword	pfService	netbios-ssn
+syn keyword	pfService	netnews
+syn keyword	pfService	netplan
+syn keyword	pfService	netrjs
+syn keyword	pfService	netstat
+syn keyword	pfService	netwall
+syn keyword	pfService	newdate
+syn keyword	pfService	nextstep
+syn keyword	pfService	nfs
+syn keyword	pfService	nfsd
+syn keyword	pfService	nicname
+syn keyword	pfService	nnsp
+syn keyword	pfService	nntp
+syn keyword	pfService	ntalk
+syn keyword	pfService	ntp
+syn keyword	pfService	null
+syn keyword	pfService	openwebnet
+syn keyword	pfService	ospf6d
+syn keyword	pfService	ospfapi
+syn keyword	pfService	ospfd
+syn keyword	pfService	photuris
+syn keyword	pfService	pop2
+syn keyword	pfService	pop3
+syn keyword	pfService	pop3pw
+syn keyword	pfService	pop3s
+syn keyword	pfService	poppassd
+syn keyword	pfService	portmap
+syn keyword	pfService	postgresql
+syn keyword	pfService	postoffice
+syn keyword	pfService	pptp
+syn keyword	pfService	presence
+syn keyword	pfService	printer
+syn keyword	pfService	prospero
+syn keyword	pfService	prospero-np
+syn keyword	pfService	puppet
+syn keyword	pfService	pwdgen
+syn keyword	pfService	qotd
+syn keyword	pfService	quote
+syn keyword	pfService	radacct
+syn keyword	pfService	radius
+syn keyword	pfService	radius-acct
+syn keyword	pfService	rdp
+syn keyword	pfService	readnews
+syn keyword	pfService	remotefs
+syn keyword	pfService	resource
+syn keyword	pfService	rfb
+syn keyword	pfService	rfe
+syn keyword	pfService	rfs
+syn keyword	pfService	rfs_server
+syn keyword	pfService	ripd
+syn keyword	pfService	ripng
+syn keyword	pfService	rje
+syn keyword	pfService	rkinit
+syn keyword	pfService	rlp
+syn keyword	pfService	routed
+syn keyword	pfService	router
+syn keyword	pfService	rpc
+syn keyword	pfService	rpcbind
+syn keyword	pfService	rsync
+syn keyword	pfService	rtelnet
+syn keyword	pfService	rtsp
+syn keyword	pfService	sa-msg-port
+syn keyword	pfService	sane-port
+syn keyword	pfService	sftp
+syn keyword	pfService	shell
+syn keyword	pfService	sieve
+syn keyword	pfService	silc
+syn keyword	pfService	sink
+syn keyword	pfService	sip
+syn keyword	pfService	smtp
+syn keyword	pfService	smtps
+syn keyword	pfService	smux
+syn keyword	pfService	snmp
+syn keyword	pfService	snmp-trap
+syn keyword	pfService	snmptrap
+syn keyword	pfService	snpp
+syn keyword	pfService	socks
+syn keyword	pfService	source
+syn keyword	pfService	spamd
+syn keyword	pfService	spamd-cfg
+syn keyword	pfService	spamd-sync
+syn keyword	pfService	spooler
+syn keyword	pfService	spop3
+syn keyword	pfService	ssdp
+syn keyword	pfService	ssh
+syn keyword	pfService	submission
+syn keyword	pfService	sunrpc
+syn keyword	pfService	supdup
+syn keyword	pfService	supfiledbg
+syn keyword	pfService	supfilesrv
+syn keyword	pfService	support
+syn keyword	pfService	svn
+syn keyword	pfService	svrloc
+syn keyword	pfService	swat
+syn keyword	pfService	syslog
+syn keyword	pfService	syslog-tls
+syn keyword	pfService	systat
+syn keyword	pfService	tacacs
+syn keyword	pfService	tacas+
+syn keyword	pfService	talk
+syn keyword	pfService	tap
+syn keyword	pfService	tcpmux
+syn keyword	pfService	telnet
+syn keyword	pfService	tempo
+syn keyword	pfService	tftp
+syn keyword	pfService	time
+syn keyword	pfService	timed
+syn keyword	pfService	timeserver
+syn keyword	pfService	timserver
+syn keyword	pfService	tsap
+syn keyword	pfService	ttylink
+syn keyword	pfService	ttytst
+syn keyword	pfService	ub-dns-control
+syn keyword	pfService	ulistserv
+syn keyword	pfService	untp
+syn keyword	pfService	usenet
+syn keyword	pfService	users
+syn keyword	pfService	uucp
+syn keyword	pfService	uucp-path
+syn keyword	pfService	uucpd
+syn keyword	pfService	vnc
+syn keyword	pfService	vxlan
+syn keyword	pfService	wais
+syn keyword	pfService	webster
+syn keyword	pfService	who
+syn keyword	pfService	whod
+syn keyword	pfService	whois
+syn keyword	pfService	www
+syn keyword	pfService	x400
+syn keyword	pfService	x400-snd
+syn keyword	pfService	xcept
+syn keyword	pfService	xdmcp
+syn keyword	pfService	xmpp-bosh
+syn keyword	pfService	xmpp-client
+syn keyword	pfService	xmpp-server
+syn keyword	pfService	z3950
+syn keyword	pfService	zabbix-agent
+syn keyword	pfService	zabbix-trapper
+syn keyword	pfService	zebra
+syn keyword	pfService	zebrasrv
+
+endif
diff --git a/syntax/pfmain.vim b/syntax/pfmain.vim
new file mode 100644
index 000000000..9ef352881
--- /dev/null
+++ b/syntax/pfmain.vim
@@ -0,0 +1,1839 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pfmain') == -1
+
+" Vim syntax file
+" Language:	Postfix main.cf configuration
+" Maintainer:	KELEMEN Peter <Peter dot Kelemen at cern dot ch>
+" Last Updates:	Anton Shestakov, Hong Xu
+" Last Change:	2015 Feb 10
+" Version:	0.40
+" URL:		http://cern.ch/fuji/vim/syntax/pfmain.vim
+" Comment:	Based on Postfix 2.12/3.0 postconf.5.html.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+setlocal iskeyword=@,48-57,_,-
+
+syntax case match
+syntax sync minlines=1
+
+syntax keyword pfmainConf 2bounce_notice_recipient
+syntax keyword pfmainConf access_map_defer_code
+syntax keyword pfmainConf access_map_reject_code
+syntax keyword pfmainConf address_verify_cache_cleanup_interval
+syntax keyword pfmainConf address_verify_default_transport
+syntax keyword pfmainConf address_verify_local_transport
+syntax keyword pfmainConf address_verify_map
+syntax keyword pfmainConf address_verify_negative_cache
+syntax keyword pfmainConf address_verify_negative_expire_time
+syntax keyword pfmainConf address_verify_negative_refresh_time
+syntax keyword pfmainConf address_verify_poll_count
+syntax keyword pfmainConf address_verify_poll_delay
+syntax keyword pfmainConf address_verify_positive_expire_time
+syntax keyword pfmainConf address_verify_positive_refresh_time
+syntax keyword pfmainConf address_verify_relay_transport
+syntax keyword pfmainConf address_verify_relayhost
+syntax keyword pfmainConf address_verify_sender
+syntax keyword pfmainConf address_verify_sender_dependent_default_transport_maps
+syntax keyword pfmainConf address_verify_sender_dependent_relayhost_maps
+syntax keyword pfmainConf address_verify_sender_ttl
+syntax keyword pfmainConf address_verify_service_name
+syntax keyword pfmainConf address_verify_transport_maps
+syntax keyword pfmainConf address_verify_virtual_transport
+syntax keyword pfmainConf alias_database
+syntax keyword pfmainConf alias_maps
+syntax keyword pfmainConf allow_mail_to_commands
+syntax keyword pfmainConf allow_mail_to_files
+syntax keyword pfmainConf allow_min_user
+syntax keyword pfmainConf allow_percent_hack
+syntax keyword pfmainConf allow_untrusted_routing
+syntax keyword pfmainConf alternate_config_directories
+syntax keyword pfmainConf always_add_missing_headers
+syntax keyword pfmainConf always_bcc
+syntax keyword pfmainConf anvil_rate_time_unit
+syntax keyword pfmainConf anvil_status_update_time
+syntax keyword pfmainConf append_at_myorigin
+syntax keyword pfmainConf append_dot_mydomain
+syntax keyword pfmainConf application_event_drain_time
+syntax keyword pfmainConf authorized_flush_users
+syntax keyword pfmainConf authorized_mailq_users
+syntax keyword pfmainConf authorized_submit_users
+syntax keyword pfmainConf authorized_verp_clients
+syntax keyword pfmainConf backwards_bounce_logfile_compatibility
+syntax keyword pfmainConf berkeley_db_create_buffer_size
+syntax keyword pfmainConf berkeley_db_read_buffer_size
+syntax keyword pfmainConf best_mx_transport
+syntax keyword pfmainConf biff
+syntax keyword pfmainConf body_checks
+syntax keyword pfmainConf body_checks_size_limit
+syntax keyword pfmainConf bounce_notice_recipient
+syntax keyword pfmainConf bounce_queue_lifetime
+syntax keyword pfmainConf bounce_service_name
+syntax keyword pfmainConf bounce_size_limit
+syntax keyword pfmainConf bounce_template_file
+syntax keyword pfmainConf broken_sasl_auth_clients
+syntax keyword pfmainConf canonical_classes
+syntax keyword pfmainConf canonical_maps
+syntax keyword pfmainConf cleanup_service_name
+syntax keyword pfmainConf command_directory
+syntax keyword pfmainConf command_execution_directory
+syntax keyword pfmainConf command_expansion_filter
+syntax keyword pfmainConf command_time_limit
+syntax keyword pfmainConf compatibility_level
+syntax keyword pfmainConf config_directory
+syntax keyword pfmainConf confirm_delay_cleared
+syntax keyword pfmainConf connection_cache_protocol_timeout
+syntax keyword pfmainConf connection_cache_service_name
+syntax keyword pfmainConf connection_cache_status_update_time
+syntax keyword pfmainConf connection_cache_ttl_limit
+syntax keyword pfmainConf content_filter
+syntax keyword pfmainConf cyrus_sasl_config_path
+syntax keyword pfmainConf daemon_directory
+syntax keyword pfmainConf daemon_table_open_error_is_fatal
+syntax keyword pfmainConf daemon_timeout
+syntax keyword pfmainConf data_directory
+syntax keyword pfmainConf debug_peer_level
+syntax keyword pfmainConf debug_peer_list
+syntax keyword pfmainConf debugger_command
+syntax keyword pfmainConf default_database_type
+syntax keyword pfmainConf default_delivery_slot_cost
+syntax keyword pfmainConf default_delivery_slot_discount
+syntax keyword pfmainConf default_delivery_slot_loan
+syntax keyword pfmainConf default_delivery_status_filter
+syntax keyword pfmainConf default_destination_concurrency_failed_cohort_limit
+syntax keyword pfmainConf default_destination_concurrency_limit
+syntax keyword pfmainConf default_destination_concurrency_negative_feedback
+syntax keyword pfmainConf default_destination_concurrency_positive_feedback
+syntax keyword pfmainConf default_destination_rate_delay
+syntax keyword pfmainConf default_destination_recipient_limit
+syntax keyword pfmainConf default_extra_recipient_limit
+syntax keyword pfmainConf default_filter_nexthop
+syntax keyword pfmainConf default_minimum_delivery_slots
+syntax keyword pfmainConf default_privs
+syntax keyword pfmainConf default_process_limit
+syntax keyword pfmainConf default_rbl_reply
+syntax keyword pfmainConf default_recipient_limit
+syntax keyword pfmainConf default_recipient_refill_delay
+syntax keyword pfmainConf default_recipient_refill_limit
+syntax keyword pfmainConf default_transport
+syntax keyword pfmainConf default_verp_delimiters
+syntax keyword pfmainConf defer_code
+syntax keyword pfmainConf defer_service_name
+syntax keyword pfmainConf defer_transports
+syntax keyword pfmainConf delay_logging_resolution_limit
+syntax keyword pfmainConf delay_notice_recipient
+syntax keyword pfmainConf delay_warning_time
+syntax keyword pfmainConf deliver_lock_attempts
+syntax keyword pfmainConf deliver_lock_delay
+syntax keyword pfmainConf destination_concurrency_feedback_debug
+syntax keyword pfmainConf detect_8bit_encoding_header
+syntax keyword pfmainConf disable_dns_lookups
+syntax keyword pfmainConf disable_mime_input_processing
+syntax keyword pfmainConf disable_mime_output_conversion
+syntax keyword pfmainConf disable_verp_bounces
+syntax keyword pfmainConf disable_vrfy_command
+syntax keyword pfmainConf dnsblog_reply_delay
+syntax keyword pfmainConf dnsblog_service_name
+syntax keyword pfmainConf dont_remove
+syntax keyword pfmainConf double_bounce_sender
+syntax keyword pfmainConf duplicate_filter_limit
+syntax keyword pfmainConf empty_address_default_transport_maps_lookup_key
+syntax keyword pfmainConf empty_address_recipient
+syntax keyword pfmainConf empty_address_relayhost_maps_lookup_key
+syntax keyword pfmainConf enable_errors_to
+syntax keyword pfmainConf enable_long_queue_ids
+syntax keyword pfmainConf enable_original_recipient
+syntax keyword pfmainConf error_notice_recipient
+syntax keyword pfmainConf error_service_name
+syntax keyword pfmainConf execution_directory_expansion_filter
+syntax keyword pfmainConf expand_owner_alias
+syntax keyword pfmainConf export_environment
+syntax keyword pfmainConf extract_recipient_limit
+syntax keyword pfmainConf fallback_relay
+syntax keyword pfmainConf fallback_transport
+syntax keyword pfmainConf fallback_transport_maps
+syntax keyword pfmainConf fast_flush_domains
+syntax keyword pfmainConf fast_flush_purge_time
+syntax keyword pfmainConf fast_flush_refresh_time
+syntax keyword pfmainConf fault_injection_code
+syntax keyword pfmainConf flush_service_name
+syntax keyword pfmainConf fork_attempts
+syntax keyword pfmainConf fork_delay
+syntax keyword pfmainConf forward_expansion_filter
+syntax keyword pfmainConf forward_path
+syntax keyword pfmainConf frozen_delivered_to
+syntax keyword pfmainConf hash_queue_depth
+syntax keyword pfmainConf hash_queue_names
+syntax keyword pfmainConf header_address_token_limit
+syntax keyword pfmainConf header_checks
+syntax keyword pfmainConf header_size_limit
+syntax keyword pfmainConf helpful_warnings
+syntax keyword pfmainConf home_mailbox
+syntax keyword pfmainConf hopcount_limit
+syntax keyword pfmainConf html_directory
+syntax keyword pfmainConf ignore_mx_lookup_error
+syntax keyword pfmainConf import_environment
+syntax keyword pfmainConf in_flow_delay
+syntax keyword pfmainConf inet_interfaces
+syntax keyword pfmainConf inet_protocols
+syntax keyword pfmainConf initial_destination_concurrency
+syntax keyword pfmainConf internal_mail_filter_classes
+syntax keyword pfmainConf invalid_hostname_reject_code
+syntax keyword pfmainConf ipc_idle
+syntax keyword pfmainConf ipc_timeout
+syntax keyword pfmainConf ipc_ttl
+syntax keyword pfmainConf line_length_limit
+syntax keyword pfmainConf lmdb_map_size
+syntax keyword pfmainConf lmtp_address_preference
+syntax keyword pfmainConf lmtp_address_verify_target
+syntax keyword pfmainConf lmtp_assume_final
+syntax keyword pfmainConf lmtp_bind_address
+syntax keyword pfmainConf lmtp_bind_address6
+syntax keyword pfmainConf lmtp_body_checks
+syntax keyword pfmainConf lmtp_cache_connection
+syntax keyword pfmainConf lmtp_cname_overrides_servername
+syntax keyword pfmainConf lmtp_connect_timeout
+syntax keyword pfmainConf lmtp_connection_cache_destinations
+syntax keyword pfmainConf lmtp_connection_cache_on_demand
+syntax keyword pfmainConf lmtp_connection_cache_time_limit
+syntax keyword pfmainConf lmtp_connection_reuse_count_limit
+syntax keyword pfmainConf lmtp_connection_reuse_time_limit
+syntax keyword pfmainConf lmtp_data_done_timeout
+syntax keyword pfmainConf lmtp_data_init_timeout
+syntax keyword pfmainConf lmtp_data_xfer_timeout
+syntax keyword pfmainConf lmtp_defer_if_no_mx_address_found
+syntax keyword pfmainConf lmtp_delivery_status_filter
+syntax keyword pfmainConf lmtp_destination_concurrency_limit
+syntax keyword pfmainConf lmtp_destination_recipient_limit
+syntax keyword pfmainConf lmtp_discard_lhlo_keyword_address_maps
+syntax keyword pfmainConf lmtp_discard_lhlo_keywords
+syntax keyword pfmainConf lmtp_dns_reply_filter
+syntax keyword pfmainConf lmtp_dns_resolver_options
+syntax keyword pfmainConf lmtp_dns_support_level
+syntax keyword pfmainConf lmtp_enforce_tls
+syntax keyword pfmainConf lmtp_generic_maps
+syntax keyword pfmainConf lmtp_header_checks
+syntax keyword pfmainConf lmtp_host_lookup
+syntax keyword pfmainConf lmtp_lhlo_name
+syntax keyword pfmainConf lmtp_lhlo_timeout
+syntax keyword pfmainConf lmtp_line_length_limit
+syntax keyword pfmainConf lmtp_mail_timeout
+syntax keyword pfmainConf lmtp_mime_header_checks
+syntax keyword pfmainConf lmtp_mx_address_limit
+syntax keyword pfmainConf lmtp_mx_session_limit
+syntax keyword pfmainConf lmtp_nested_header_checks
+syntax keyword pfmainConf lmtp_per_record_deadline
+syntax keyword pfmainConf lmtp_pix_workaround_delay_time
+syntax keyword pfmainConf lmtp_pix_workaround_maps
+syntax keyword pfmainConf lmtp_pix_workaround_threshold_time
+syntax keyword pfmainConf lmtp_pix_workarounds
+syntax keyword pfmainConf lmtp_quit_timeout
+syntax keyword pfmainConf lmtp_quote_rfc821_envelope
+syntax keyword pfmainConf lmtp_randomize_addresses
+syntax keyword pfmainConf lmtp_rcpt_timeout
+syntax keyword pfmainConf lmtp_reply_filter
+syntax keyword pfmainConf lmtp_rset_timeout
+syntax keyword pfmainConf lmtp_sasl_auth_cache_name
+syntax keyword pfmainConf lmtp_sasl_auth_cache_time
+syntax keyword pfmainConf lmtp_sasl_auth_enable
+syntax keyword pfmainConf lmtp_sasl_auth_soft_bounce
+syntax keyword pfmainConf lmtp_sasl_mechanism_filter
+syntax keyword pfmainConf lmtp_sasl_password_maps
+syntax keyword pfmainConf lmtp_sasl_path
+syntax keyword pfmainConf lmtp_sasl_security_options
+syntax keyword pfmainConf lmtp_sasl_tls_security_options
+syntax keyword pfmainConf lmtp_sasl_tls_verified_security_options
+syntax keyword pfmainConf lmtp_sasl_type
+syntax keyword pfmainConf lmtp_send_dummy_mail_auth
+syntax keyword pfmainConf lmtp_send_xforward_command
+syntax keyword pfmainConf lmtp_sender_dependent_authentication
+syntax keyword pfmainConf lmtp_skip_5xx_greeting
+syntax keyword pfmainConf lmtp_skip_quit_response
+syntax keyword pfmainConf lmtp_starttls_timeout
+syntax keyword pfmainConf lmtp_tcp_port
+syntax keyword pfmainConf lmtp_tls_CAfile
+syntax keyword pfmainConf lmtp_tls_CApath
+syntax keyword pfmainConf lmtp_tls_block_early_mail_reply
+syntax keyword pfmainConf lmtp_tls_cert_file
+syntax keyword pfmainConf lmtp_tls_ciphers
+syntax keyword pfmainConf lmtp_tls_dcert_file
+syntax keyword pfmainConf lmtp_tls_dkey_file
+syntax keyword pfmainConf lmtp_tls_eccert_file
+syntax keyword pfmainConf lmtp_tls_eckey_file
+syntax keyword pfmainConf lmtp_tls_enforce_peername
+syntax keyword pfmainConf lmtp_tls_exclude_ciphers
+syntax keyword pfmainConf lmtp_tls_fingerprint_cert_match
+syntax keyword pfmainConf lmtp_tls_fingerprint_digest
+syntax keyword pfmainConf lmtp_tls_force_insecure_host_tlsa_lookup
+syntax keyword pfmainConf lmtp_tls_key_file
+syntax keyword pfmainConf lmtp_tls_loglevel
+syntax keyword pfmainConf lmtp_tls_mandatory_ciphers
+syntax keyword pfmainConf lmtp_tls_mandatory_exclude_ciphers
+syntax keyword pfmainConf lmtp_tls_mandatory_protocols
+syntax keyword pfmainConf lmtp_tls_note_starttls_offer
+syntax keyword pfmainConf lmtp_tls_per_site
+syntax keyword pfmainConf lmtp_tls_policy_maps
+syntax keyword pfmainConf lmtp_tls_protocols
+syntax keyword pfmainConf lmtp_tls_scert_verifydepth
+syntax keyword pfmainConf lmtp_tls_secure_cert_match
+syntax keyword pfmainConf lmtp_tls_security_level
+syntax keyword pfmainConf lmtp_tls_session_cache_database
+syntax keyword pfmainConf lmtp_tls_session_cache_timeout
+syntax keyword pfmainConf lmtp_tls_trust_anchor_file
+syntax keyword pfmainConf lmtp_tls_verify_cert_match
+syntax keyword pfmainConf lmtp_use_tls
+syntax keyword pfmainConf lmtp_xforward_timeout
+syntax keyword pfmainConf local_command_shell
+syntax keyword pfmainConf local_delivery_status_filter
+syntax keyword pfmainConf local_destination_concurrency_limit
+syntax keyword pfmainConf local_destination_recipient_limit
+syntax keyword pfmainConf local_header_rewrite_clients
+syntax keyword pfmainConf local_recipient_maps
+syntax keyword pfmainConf local_transport
+syntax keyword pfmainConf luser_relay
+syntax keyword pfmainConf mail_name
+syntax keyword pfmainConf mail_owner
+syntax keyword pfmainConf mail_release_date
+syntax keyword pfmainConf mail_spool_directory
+syntax keyword pfmainConf mail_version
+syntax keyword pfmainConf mailbox_command
+syntax keyword pfmainConf mailbox_command_maps
+syntax keyword pfmainConf mailbox_delivery_lock
+syntax keyword pfmainConf mailbox_size_limit
+syntax keyword pfmainConf mailbox_transport
+syntax keyword pfmainConf mailbox_transport_maps
+syntax keyword pfmainConf mailq_path
+syntax keyword pfmainConf manpage_directory
+syntax keyword pfmainConf maps_rbl_domains
+syntax keyword pfmainConf maps_rbl_reject_code
+syntax keyword pfmainConf masquerade_classes
+syntax keyword pfmainConf masquerade_domains
+syntax keyword pfmainConf masquerade_exceptions
+syntax keyword pfmainConf master_service_disable
+syntax keyword pfmainConf max_idle
+syntax keyword pfmainConf max_use
+syntax keyword pfmainConf maximal_backoff_time
+syntax keyword pfmainConf maximal_queue_lifetime
+syntax keyword pfmainConf message_drop_headers
+syntax keyword pfmainConf message_reject_characters
+syntax keyword pfmainConf message_size_limit
+syntax keyword pfmainConf message_strip_characters
+syntax keyword pfmainConf meta_directory
+syntax keyword pfmainConf milter_command_timeout
+syntax keyword pfmainConf milter_connect_macros
+syntax keyword pfmainConf milter_connect_timeout
+syntax keyword pfmainConf milter_content_timeout
+syntax keyword pfmainConf milter_data_macros
+syntax keyword pfmainConf milter_default_action
+syntax keyword pfmainConf milter_end_of_data_macros
+syntax keyword pfmainConf milter_end_of_header_macros
+syntax keyword pfmainConf milter_header_checks
+syntax keyword pfmainConf milter_helo_macros
+syntax keyword pfmainConf milter_macro_daemon_name
+syntax keyword pfmainConf milter_macro_v
+syntax keyword pfmainConf milter_mail_macros
+syntax keyword pfmainConf milter_protocol
+syntax keyword pfmainConf milter_rcpt_macros
+syntax keyword pfmainConf milter_unknown_command_macros
+syntax keyword pfmainConf mime_boundary_length_limit
+syntax keyword pfmainConf mime_header_checks
+syntax keyword pfmainConf mime_nesting_limit
+syntax keyword pfmainConf minimal_backoff_time
+syntax keyword pfmainConf multi_instance_directories
+syntax keyword pfmainConf multi_instance_enable
+syntax keyword pfmainConf multi_instance_group
+syntax keyword pfmainConf multi_instance_name
+syntax keyword pfmainConf multi_instance_wrapper
+syntax keyword pfmainConf multi_recipient_bounce_reject_code
+syntax keyword pfmainConf mydestination
+syntax keyword pfmainConf mydomain
+syntax keyword pfmainConf myhostname
+syntax keyword pfmainConf mynetworks
+syntax keyword pfmainConf mynetworks_style
+syntax keyword pfmainConf myorigin
+syntax keyword pfmainConf nested_header_checks
+syntax keyword pfmainConf newaliases_path
+syntax keyword pfmainConf non_fqdn_reject_code
+syntax keyword pfmainConf non_smtpd_milters
+syntax keyword pfmainConf notify_classes
+syntax keyword pfmainConf nullmx_reject_code
+syntax keyword pfmainConf owner_request_special
+syntax keyword pfmainConf parent_domain_matches_subdomains
+syntax keyword pfmainConf permit_mx_backup_networks
+syntax keyword pfmainConf pickup_service_name
+syntax keyword pfmainConf pipe_delivery_status_filter
+syntax keyword pfmainConf plaintext_reject_code
+syntax keyword pfmainConf postmulti_control_commands
+syntax keyword pfmainConf postmulti_start_commands
+syntax keyword pfmainConf postmulti_stop_commands
+syntax keyword pfmainConf postscreen_access_list
+syntax keyword pfmainConf postscreen_bare_newline_action
+syntax keyword pfmainConf postscreen_bare_newline_enable
+syntax keyword pfmainConf postscreen_bare_newline_ttl
+syntax keyword pfmainConf postscreen_blacklist_action
+syntax keyword pfmainConf postscreen_cache_cleanup_interval
+syntax keyword pfmainConf postscreen_cache_map
+syntax keyword pfmainConf postscreen_cache_retention_time
+syntax keyword pfmainConf postscreen_client_connection_count_limit
+syntax keyword pfmainConf postscreen_command_count_limit
+syntax keyword pfmainConf postscreen_command_filter
+syntax keyword pfmainConf postscreen_command_time_limit
+syntax keyword pfmainConf postscreen_disable_vrfy_command
+syntax keyword pfmainConf postscreen_discard_ehlo_keyword_address_maps
+syntax keyword pfmainConf postscreen_discard_ehlo_keywords
+syntax keyword pfmainConf postscreen_dnsbl_action
+syntax keyword pfmainConf postscreen_dnsbl_reply_map
+syntax keyword pfmainConf postscreen_dnsbl_sites
+syntax keyword pfmainConf postscreen_dnsbl_threshold
+syntax keyword pfmainConf postscreen_dnsbl_timeout
+syntax keyword pfmainConf postscreen_dnsbl_ttl
+syntax keyword pfmainConf postscreen_dnsbl_whitelist_threshold
+syntax keyword pfmainConf postscreen_enforce_tls
+syntax keyword pfmainConf postscreen_expansion_filter
+syntax keyword pfmainConf postscreen_forbidden_commands
+syntax keyword pfmainConf postscreen_greet_action
+syntax keyword pfmainConf postscreen_greet_banner
+syntax keyword pfmainConf postscreen_greet_ttl
+syntax keyword pfmainConf postscreen_greet_wait
+syntax keyword pfmainConf postscreen_helo_required
+syntax keyword pfmainConf postscreen_non_smtp_command_action
+syntax keyword pfmainConf postscreen_non_smtp_command_enable
+syntax keyword pfmainConf postscreen_non_smtp_command_ttl
+syntax keyword pfmainConf postscreen_pipelining_action
+syntax keyword pfmainConf postscreen_pipelining_enable
+syntax keyword pfmainConf postscreen_pipelining_ttl
+syntax keyword pfmainConf postscreen_post_queue_limit
+syntax keyword pfmainConf postscreen_pre_queue_limit
+syntax keyword pfmainConf postscreen_reject_footer
+syntax keyword pfmainConf postscreen_tls_security_level
+syntax keyword pfmainConf postscreen_upstream_proxy_protocol
+syntax keyword pfmainConf postscreen_upstream_proxy_timeout
+syntax keyword pfmainConf postscreen_use_tls
+syntax keyword pfmainConf postscreen_watchdog_timeout
+syntax keyword pfmainConf postscreen_whitelist_interfaces
+syntax keyword pfmainConf prepend_delivered_header
+syntax keyword pfmainConf process_id
+syntax keyword pfmainConf process_id_directory
+syntax keyword pfmainConf process_name
+syntax keyword pfmainConf propagate_unmatched_extensions
+syntax keyword pfmainConf proxy_interfaces
+syntax keyword pfmainConf proxy_read_maps
+syntax keyword pfmainConf proxy_write_maps
+syntax keyword pfmainConf proxymap_service_name
+syntax keyword pfmainConf proxywrite_service_name
+syntax keyword pfmainConf qmgr_clog_warn_time
+syntax keyword pfmainConf qmgr_daemon_timeout
+syntax keyword pfmainConf qmgr_fudge_factor
+syntax keyword pfmainConf qmgr_ipc_timeout
+syntax keyword pfmainConf qmgr_message_active_limit
+syntax keyword pfmainConf qmgr_message_recipient_limit
+syntax keyword pfmainConf qmgr_message_recipient_minimum
+syntax keyword pfmainConf qmqpd_authorized_clients
+syntax keyword pfmainConf qmqpd_client_port_logging
+syntax keyword pfmainConf qmqpd_error_delay
+syntax keyword pfmainConf qmqpd_timeout
+syntax keyword pfmainConf queue_directory
+syntax keyword pfmainConf queue_file_attribute_count_limit
+syntax keyword pfmainConf queue_minfree
+syntax keyword pfmainConf queue_run_delay
+syntax keyword pfmainConf queue_service_name
+syntax keyword pfmainConf rbl_reply_maps
+syntax keyword pfmainConf readme_directory
+syntax keyword pfmainConf receive_override_options
+syntax keyword pfmainConf recipient_bcc_maps
+syntax keyword pfmainConf recipient_canonical_classes
+syntax keyword pfmainConf recipient_canonical_maps
+syntax keyword pfmainConf recipient_delimiter
+syntax keyword pfmainConf reject_code
+syntax keyword pfmainConf reject_tempfail_action
+syntax keyword pfmainConf relay_clientcerts
+syntax keyword pfmainConf relay_destination_concurrency_limit
+syntax keyword pfmainConf relay_destination_recipient_limit
+syntax keyword pfmainConf relay_domains
+syntax keyword pfmainConf relay_domains_reject_code
+syntax keyword pfmainConf relay_recipient_maps
+syntax keyword pfmainConf relay_transport
+syntax keyword pfmainConf relayhost
+syntax keyword pfmainConf relocated_maps
+syntax keyword pfmainConf remote_header_rewrite_domain
+syntax keyword pfmainConf require_home_directory
+syntax keyword pfmainConf reset_owner_alias
+syntax keyword pfmainConf resolve_dequoted_address
+syntax keyword pfmainConf resolve_null_domain
+syntax keyword pfmainConf resolve_numeric_domain
+syntax keyword pfmainConf rewrite_service_name
+syntax keyword pfmainConf sample_directory
+syntax keyword pfmainConf send_cyrus_sasl_authzid
+syntax keyword pfmainConf sender_based_routing
+syntax keyword pfmainConf sender_bcc_maps
+syntax keyword pfmainConf sender_canonical_classes
+syntax keyword pfmainConf sender_canonical_maps
+syntax keyword pfmainConf sender_dependent_default_transport_maps
+syntax keyword pfmainConf sender_dependent_relayhost_maps
+syntax keyword pfmainConf sendmail_fix_line_endings
+syntax keyword pfmainConf sendmail_path
+syntax keyword pfmainConf service_throttle_time
+syntax keyword pfmainConf setgid_group
+syntax keyword pfmainConf shlib_directory
+syntax keyword pfmainConf show_user_unknown_table_name
+syntax keyword pfmainConf showq_service_name
+syntax keyword pfmainConf smtp_address_preference
+syntax keyword pfmainConf smtp_address_verify_target
+syntax keyword pfmainConf smtp_always_send_ehlo
+syntax keyword pfmainConf smtp_bind_address
+syntax keyword pfmainConf smtp_bind_address6
+syntax keyword pfmainConf smtp_body_checks
+syntax keyword pfmainConf smtp_cname_overrides_servername
+syntax keyword pfmainConf smtp_connect_timeout
+syntax keyword pfmainConf smtp_connection_cache_destinations
+syntax keyword pfmainConf smtp_connection_cache_on_demand
+syntax keyword pfmainConf smtp_connection_cache_time_limit
+syntax keyword pfmainConf smtp_connection_reuse_count_limit
+syntax keyword pfmainConf smtp_connection_reuse_time_limit
+syntax keyword pfmainConf smtp_data_done_timeout
+syntax keyword pfmainConf smtp_data_init_timeout
+syntax keyword pfmainConf smtp_data_xfer_timeout
+syntax keyword pfmainConf smtp_defer_if_no_mx_address_found
+syntax keyword pfmainConf smtp_delivery_status_filter
+syntax keyword pfmainConf smtp_destination_concurrency_limit
+syntax keyword pfmainConf smtp_destination_recipient_limit
+syntax keyword pfmainConf smtp_discard_ehlo_keyword_address_maps
+syntax keyword pfmainConf smtp_discard_ehlo_keywords
+syntax keyword pfmainConf smtp_dns_reply_filter
+syntax keyword pfmainConf smtp_dns_resolver_options
+syntax keyword pfmainConf smtp_dns_support_level
+syntax keyword pfmainConf smtp_enforce_tls
+syntax keyword pfmainConf smtp_fallback_relay
+syntax keyword pfmainConf smtp_generic_maps
+syntax keyword pfmainConf smtp_header_checks
+syntax keyword pfmainConf smtp_helo_name
+syntax keyword pfmainConf smtp_helo_timeout
+syntax keyword pfmainConf smtp_host_lookup
+syntax keyword pfmainConf smtp_line_length_limit
+syntax keyword pfmainConf smtp_mail_timeout
+syntax keyword pfmainConf smtp_mime_header_checks
+syntax keyword pfmainConf smtp_mx_address_limit
+syntax keyword pfmainConf smtp_mx_session_limit
+syntax keyword pfmainConf smtp_nested_header_checks
+syntax keyword pfmainConf smtp_never_send_ehlo
+syntax keyword pfmainConf smtp_per_record_deadline
+syntax keyword pfmainConf smtp_pix_workaround_delay_time
+syntax keyword pfmainConf smtp_pix_workaround_maps
+syntax keyword pfmainConf smtp_pix_workaround_threshold_time
+syntax keyword pfmainConf smtp_pix_workarounds
+syntax keyword pfmainConf smtp_quit_timeout
+syntax keyword pfmainConf smtp_quote_rfc821_envelope
+syntax keyword pfmainConf smtp_randomize_addresses
+syntax keyword pfmainConf smtp_rcpt_timeout
+syntax keyword pfmainConf smtp_reply_filter
+syntax keyword pfmainConf smtp_rset_timeout
+syntax keyword pfmainConf smtp_sasl_auth_cache_name
+syntax keyword pfmainConf smtp_sasl_auth_cache_time
+syntax keyword pfmainConf smtp_sasl_auth_enable
+syntax keyword pfmainConf smtp_sasl_auth_soft_bounce
+syntax keyword pfmainConf smtp_sasl_mechanism_filter
+syntax keyword pfmainConf smtp_sasl_password_maps
+syntax keyword pfmainConf smtp_sasl_path
+syntax keyword pfmainConf smtp_sasl_security_options
+syntax keyword pfmainConf smtp_sasl_tls_security_options
+syntax keyword pfmainConf smtp_sasl_tls_verified_security_options
+syntax keyword pfmainConf smtp_sasl_type
+syntax keyword pfmainConf smtp_send_dummy_mail_auth
+syntax keyword pfmainConf smtp_send_xforward_command
+syntax keyword pfmainConf smtp_sender_dependent_authentication
+syntax keyword pfmainConf smtp_skip_4xx_greeting
+syntax keyword pfmainConf smtp_skip_5xx_greeting
+syntax keyword pfmainConf smtp_skip_quit_response
+syntax keyword pfmainConf smtp_starttls_timeout
+syntax keyword pfmainConf smtp_tls_CAfile
+syntax keyword pfmainConf smtp_tls_CApath
+syntax keyword pfmainConf smtp_tls_block_early_mail_reply
+syntax keyword pfmainConf smtp_tls_cert_file
+syntax keyword pfmainConf smtp_tls_cipherlist
+syntax keyword pfmainConf smtp_tls_ciphers
+syntax keyword pfmainConf smtp_tls_dcert_file
+syntax keyword pfmainConf smtp_tls_dkey_file
+syntax keyword pfmainConf smtp_tls_eccert_file
+syntax keyword pfmainConf smtp_tls_eckey_file
+syntax keyword pfmainConf smtp_tls_enforce_peername
+syntax keyword pfmainConf smtp_tls_exclude_ciphers
+syntax keyword pfmainConf smtp_tls_fingerprint_cert_match
+syntax keyword pfmainConf smtp_tls_fingerprint_digest
+syntax keyword pfmainConf smtp_tls_force_insecure_host_tlsa_lookup
+syntax keyword pfmainConf smtp_tls_key_file
+syntax keyword pfmainConf smtp_tls_loglevel
+syntax keyword pfmainConf smtp_tls_mandatory_ciphers
+syntax keyword pfmainConf smtp_tls_mandatory_exclude_ciphers
+syntax keyword pfmainConf smtp_tls_mandatory_protocols
+syntax keyword pfmainConf smtp_tls_note_starttls_offer
+syntax keyword pfmainConf smtp_tls_per_site
+syntax keyword pfmainConf smtp_tls_policy_maps
+syntax keyword pfmainConf smtp_tls_protocols
+syntax keyword pfmainConf smtp_tls_scert_verifydepth
+syntax keyword pfmainConf smtp_tls_secure_cert_match
+syntax keyword pfmainConf smtp_tls_security_level
+syntax keyword pfmainConf smtp_tls_session_cache_database
+syntax keyword pfmainConf smtp_tls_session_cache_timeout
+syntax keyword pfmainConf smtp_tls_trust_anchor_file
+syntax keyword pfmainConf smtp_tls_verify_cert_match
+syntax keyword pfmainConf smtp_tls_wrappermode
+syntax keyword pfmainConf smtp_use_tls
+syntax keyword pfmainConf smtp_xforward_timeout
+syntax keyword pfmainConf smtpd_authorized_verp_clients
+syntax keyword pfmainConf smtpd_authorized_xclient_hosts
+syntax keyword pfmainConf smtpd_authorized_xforward_hosts
+syntax keyword pfmainConf smtpd_banner
+syntax keyword pfmainConf smtpd_client_connection_count_limit
+syntax keyword pfmainConf smtpd_client_connection_rate_limit
+syntax keyword pfmainConf smtpd_client_event_limit_exceptions
+syntax keyword pfmainConf smtpd_client_message_rate_limit
+syntax keyword pfmainConf smtpd_client_new_tls_session_rate_limit
+syntax keyword pfmainConf smtpd_client_port_logging
+syntax keyword pfmainConf smtpd_client_recipient_rate_limit
+syntax keyword pfmainConf smtpd_client_restrictions
+syntax keyword pfmainConf smtpd_command_filter
+syntax keyword pfmainConf smtpd_data_restrictions
+syntax keyword pfmainConf smtpd_delay_open_until_valid_rcpt
+syntax keyword pfmainConf smtpd_delay_reject
+syntax keyword pfmainConf smtpd_discard_ehlo_keyword_address_maps
+syntax keyword pfmainConf smtpd_discard_ehlo_keywords
+syntax keyword pfmainConf smtpd_dns_reply_filter
+syntax keyword pfmainConf smtpd_end_of_data_restrictions
+syntax keyword pfmainConf smtpd_enforce_tls
+syntax keyword pfmainConf smtpd_error_sleep_time
+syntax keyword pfmainConf smtpd_etrn_restrictions
+syntax keyword pfmainConf smtpd_expansion_filter
+syntax keyword pfmainConf smtpd_forbidden_commands
+syntax keyword pfmainConf smtpd_hard_error_limit
+syntax keyword pfmainConf smtpd_helo_required
+syntax keyword pfmainConf smtpd_helo_restrictions
+syntax keyword pfmainConf smtpd_history_flush_threshold
+syntax keyword pfmainConf smtpd_junk_command_limit
+syntax keyword pfmainConf smtpd_log_access_permit_actions
+syntax keyword pfmainConf smtpd_milters
+syntax keyword pfmainConf smtpd_noop_commands
+syntax keyword pfmainConf smtpd_null_access_lookup_key
+syntax keyword pfmainConf smtpd_peername_lookup
+syntax keyword pfmainConf smtpd_per_record_deadline
+syntax keyword pfmainConf smtpd_policy_service_default_action
+syntax keyword pfmainConf smtpd_policy_service_max_idle
+syntax keyword pfmainConf smtpd_policy_service_max_ttl
+syntax keyword pfmainConf smtpd_policy_service_request_limit
+syntax keyword pfmainConf smtpd_policy_service_retry_delay
+syntax keyword pfmainConf smtpd_policy_service_timeout
+syntax keyword pfmainConf smtpd_policy_service_try_limit
+syntax keyword pfmainConf smtpd_proxy_ehlo
+syntax keyword pfmainConf smtpd_proxy_filter
+syntax keyword pfmainConf smtpd_proxy_options
+syntax keyword pfmainConf smtpd_proxy_timeout
+syntax keyword pfmainConf smtpd_recipient_limit
+syntax keyword pfmainConf smtpd_recipient_overshoot_limit
+syntax keyword pfmainConf smtpd_recipient_restrictions
+syntax keyword pfmainConf smtpd_reject_footer
+syntax keyword pfmainConf smtpd_reject_unlisted_recipient
+syntax keyword pfmainConf smtpd_reject_unlisted_sender
+syntax keyword pfmainConf smtpd_relay_restrictions
+syntax keyword pfmainConf smtpd_restriction_classes
+syntax keyword pfmainConf smtpd_sasl_application_name
+syntax keyword pfmainConf smtpd_sasl_auth_enable
+syntax keyword pfmainConf smtpd_sasl_authenticated_header
+syntax keyword pfmainConf smtpd_sasl_exceptions_networks
+syntax keyword pfmainConf smtpd_sasl_local_domain
+syntax keyword pfmainConf smtpd_sasl_path
+syntax keyword pfmainConf smtpd_sasl_security_options
+syntax keyword pfmainConf smtpd_sasl_service
+syntax keyword pfmainConf smtpd_sasl_tls_security_options
+syntax keyword pfmainConf smtpd_sasl_type
+syntax keyword pfmainConf smtpd_sender_login_maps
+syntax keyword pfmainConf smtpd_sender_restrictions
+syntax keyword pfmainConf smtpd_service_name
+syntax keyword pfmainConf smtpd_soft_error_limit
+syntax keyword pfmainConf smtpd_starttls_timeout
+syntax keyword pfmainConf smtpd_timeout
+syntax keyword pfmainConf smtpd_tls_CAfile
+syntax keyword pfmainConf smtpd_tls_CApath
+syntax keyword pfmainConf smtpd_tls_always_issue_session_ids
+syntax keyword pfmainConf smtpd_tls_ask_ccert
+syntax keyword pfmainConf smtpd_tls_auth_only
+syntax keyword pfmainConf smtpd_tls_ccert_verifydepth
+syntax keyword pfmainConf smtpd_tls_cert_file
+syntax keyword pfmainConf smtpd_tls_cipherlist
+syntax keyword pfmainConf smtpd_tls_ciphers
+syntax keyword pfmainConf smtpd_tls_dcert_file
+syntax keyword pfmainConf smtpd_tls_dh1024_param_file
+syntax keyword pfmainConf smtpd_tls_dh512_param_file
+syntax keyword pfmainConf smtpd_tls_dkey_file
+syntax keyword pfmainConf smtpd_tls_eccert_file
+syntax keyword pfmainConf smtpd_tls_eckey_file
+syntax keyword pfmainConf smtpd_tls_eecdh_grade
+syntax keyword pfmainConf smtpd_tls_exclude_ciphers
+syntax keyword pfmainConf smtpd_tls_fingerprint_digest
+syntax keyword pfmainConf smtpd_tls_key_file
+syntax keyword pfmainConf smtpd_tls_loglevel
+syntax keyword pfmainConf smtpd_tls_mandatory_ciphers
+syntax keyword pfmainConf smtpd_tls_mandatory_exclude_ciphers
+syntax keyword pfmainConf smtpd_tls_mandatory_protocols
+syntax keyword pfmainConf smtpd_tls_protocols
+syntax keyword pfmainConf smtpd_tls_received_header
+syntax keyword pfmainConf smtpd_tls_req_ccert
+syntax keyword pfmainConf smtpd_tls_security_level
+syntax keyword pfmainConf smtpd_tls_session_cache_database
+syntax keyword pfmainConf smtpd_tls_session_cache_timeout
+syntax keyword pfmainConf smtpd_tls_wrappermode
+syntax keyword pfmainConf smtpd_upstream_proxy_protocol
+syntax keyword pfmainConf smtpd_upstream_proxy_timeout
+syntax keyword pfmainConf smtpd_use_tls
+syntax keyword pfmainConf smtputf8_autodetect_classes
+syntax keyword pfmainConf smtputf8_enable
+syntax keyword pfmainConf soft_bounce
+syntax keyword pfmainConf stale_lock_time
+syntax keyword pfmainConf stress
+syntax keyword pfmainConf strict_7bit_headers
+syntax keyword pfmainConf strict_8bitmime
+syntax keyword pfmainConf strict_8bitmime_body
+syntax keyword pfmainConf strict_mailbox_ownership
+syntax keyword pfmainConf strict_mime_encoding_domain
+syntax keyword pfmainConf strict_rfc821_envelopes
+syntax keyword pfmainConf strict_smtputf8
+syntax keyword pfmainConf sun_mailtool_compatibility
+syntax keyword pfmainConf swap_bangpath
+syntax keyword pfmainConf syslog_facility
+syntax keyword pfmainConf syslog_name
+syntax keyword pfmainConf tcp_windowsize
+syntax keyword pfmainConf tls_append_default_CA
+syntax keyword pfmainConf tls_daemon_random_bytes
+syntax keyword pfmainConf tls_dane_digest_agility
+syntax keyword pfmainConf tls_dane_digests
+syntax keyword pfmainConf tls_dane_trust_anchor_digest_enable
+syntax keyword pfmainConf tls_disable_workarounds
+syntax keyword pfmainConf tls_eecdh_strong_curve
+syntax keyword pfmainConf tls_eecdh_ultra_curve
+syntax keyword pfmainConf tls_export_cipherlist
+syntax keyword pfmainConf tls_high_cipherlist
+syntax keyword pfmainConf tls_legacy_public_key_fingerprints
+syntax keyword pfmainConf tls_low_cipherlist
+syntax keyword pfmainConf tls_medium_cipherlist
+syntax keyword pfmainConf tls_null_cipherlist
+syntax keyword pfmainConf tls_preempt_cipherlist
+syntax keyword pfmainConf tls_random_bytes
+syntax keyword pfmainConf tls_random_exchange_name
+syntax keyword pfmainConf tls_random_prng_update_period
+syntax keyword pfmainConf tls_random_reseed_period
+syntax keyword pfmainConf tls_random_source
+syntax keyword pfmainConf tls_session_ticket_cipher
+syntax keyword pfmainConf tls_ssl_options
+syntax keyword pfmainConf tls_wildcard_matches_multiple_labels
+syntax keyword pfmainConf tlsmgr_service_name
+syntax keyword pfmainConf tlsproxy_enforce_tls
+syntax keyword pfmainConf tlsproxy_service_name
+syntax keyword pfmainConf tlsproxy_tls_CAfile
+syntax keyword pfmainConf tlsproxy_tls_CApath
+syntax keyword pfmainConf tlsproxy_tls_always_issue_session_ids
+syntax keyword pfmainConf tlsproxy_tls_ask_ccert
+syntax keyword pfmainConf tlsproxy_tls_ccert_verifydepth
+syntax keyword pfmainConf tlsproxy_tls_cert_file
+syntax keyword pfmainConf tlsproxy_tls_ciphers
+syntax keyword pfmainConf tlsproxy_tls_dcert_file
+syntax keyword pfmainConf tlsproxy_tls_dh1024_param_file
+syntax keyword pfmainConf tlsproxy_tls_dh512_param_file
+syntax keyword pfmainConf tlsproxy_tls_dkey_file
+syntax keyword pfmainConf tlsproxy_tls_eccert_file
+syntax keyword pfmainConf tlsproxy_tls_eckey_file
+syntax keyword pfmainConf tlsproxy_tls_eecdh_grade
+syntax keyword pfmainConf tlsproxy_tls_exclude_ciphers
+syntax keyword pfmainConf tlsproxy_tls_fingerprint_digest
+syntax keyword pfmainConf tlsproxy_tls_key_file
+syntax keyword pfmainConf tlsproxy_tls_loglevel
+syntax keyword pfmainConf tlsproxy_tls_mandatory_ciphers
+syntax keyword pfmainConf tlsproxy_tls_mandatory_exclude_ciphers
+syntax keyword pfmainConf tlsproxy_tls_mandatory_protocols
+syntax keyword pfmainConf tlsproxy_tls_protocols
+syntax keyword pfmainConf tlsproxy_tls_req_ccert
+syntax keyword pfmainConf tlsproxy_tls_security_level
+syntax keyword pfmainConf tlsproxy_tls_session_cache_timeout
+syntax keyword pfmainConf tlsproxy_use_tls
+syntax keyword pfmainConf tlsproxy_watchdog_timeout
+syntax keyword pfmainConf trace_service_name
+syntax keyword pfmainConf transport_delivery_slot_cost
+syntax keyword pfmainConf transport_delivery_slot_discount
+syntax keyword pfmainConf transport_delivery_slot_loan
+syntax keyword pfmainConf transport_destination_concurrency_failed_cohort_limit
+syntax keyword pfmainConf transport_destination_concurrency_limit
+syntax keyword pfmainConf transport_destination_concurrency_negative_feedback
+syntax keyword pfmainConf transport_destination_concurrency_positive_feedback
+syntax keyword pfmainConf transport_destination_rate_delay
+syntax keyword pfmainConf transport_destination_recipient_limit
+syntax keyword pfmainConf transport_extra_recipient_limit
+syntax keyword pfmainConf transport_initial_destination_concurrency
+syntax keyword pfmainConf transport_maps
+syntax keyword pfmainConf transport_minimum_delivery_slots
+syntax keyword pfmainConf transport_recipient_limit
+syntax keyword pfmainConf transport_recipient_refill_delay
+syntax keyword pfmainConf transport_recipient_refill_limit
+syntax keyword pfmainConf transport_retry_time
+syntax keyword pfmainConf transport_time_limit
+syntax keyword pfmainConf trigger_timeout
+syntax keyword pfmainConf undisclosed_recipients_header
+syntax keyword pfmainConf unknown_address_reject_code
+syntax keyword pfmainConf unknown_address_tempfail_action
+syntax keyword pfmainConf unknown_client_reject_code
+syntax keyword pfmainConf unknown_helo_hostname_tempfail_action
+syntax keyword pfmainConf unknown_hostname_reject_code
+syntax keyword pfmainConf unknown_local_recipient_reject_code
+syntax keyword pfmainConf unknown_relay_recipient_reject_code
+syntax keyword pfmainConf unknown_virtual_alias_reject_code
+syntax keyword pfmainConf unknown_virtual_mailbox_reject_code
+syntax keyword pfmainConf unverified_recipient_defer_code
+syntax keyword pfmainConf unverified_recipient_reject_code
+syntax keyword pfmainConf unverified_recipient_reject_reason
+syntax keyword pfmainConf unverified_recipient_tempfail_action
+syntax keyword pfmainConf unverified_sender_defer_code
+syntax keyword pfmainConf unverified_sender_reject_code
+syntax keyword pfmainConf unverified_sender_reject_reason
+syntax keyword pfmainConf unverified_sender_tempfail_action
+syntax keyword pfmainConf verp_delimiter_filter
+syntax keyword pfmainConf virtual_alias_address_length_limit
+syntax keyword pfmainConf virtual_alias_domains
+syntax keyword pfmainConf virtual_alias_expansion_limit
+syntax keyword pfmainConf virtual_alias_maps
+syntax keyword pfmainConf virtual_alias_recursion_limit
+syntax keyword pfmainConf virtual_delivery_status_filter
+syntax keyword pfmainConf virtual_destination_concurrency_limit
+syntax keyword pfmainConf virtual_destination_recipient_limit
+syntax keyword pfmainConf virtual_gid_maps
+syntax keyword pfmainConf virtual_mailbox_base
+syntax keyword pfmainConf virtual_mailbox_domains
+syntax keyword pfmainConf virtual_mailbox_limit
+syntax keyword pfmainConf virtual_mailbox_lock
+syntax keyword pfmainConf virtual_mailbox_maps
+syntax keyword pfmainConf virtual_maps
+syntax keyword pfmainConf virtual_minimum_uid
+syntax keyword pfmainConf virtual_transport
+syntax keyword pfmainConf virtual_uid_maps
+syntax match pfmainRef "$\<2bounce_notice_recipient\>"
+syntax match pfmainRef "$\<access_map_defer_code\>"
+syntax match pfmainRef "$\<access_map_reject_code\>"
+syntax match pfmainRef "$\<address_verify_cache_cleanup_interval\>"
+syntax match pfmainRef "$\<address_verify_default_transport\>"
+syntax match pfmainRef "$\<address_verify_local_transport\>"
+syntax match pfmainRef "$\<address_verify_map\>"
+syntax match pfmainRef "$\<address_verify_negative_cache\>"
+syntax match pfmainRef "$\<address_verify_negative_expire_time\>"
+syntax match pfmainRef "$\<address_verify_negative_refresh_time\>"
+syntax match pfmainRef "$\<address_verify_poll_count\>"
+syntax match pfmainRef "$\<address_verify_poll_delay\>"
+syntax match pfmainRef "$\<address_verify_positive_expire_time\>"
+syntax match pfmainRef "$\<address_verify_positive_refresh_time\>"
+syntax match pfmainRef "$\<address_verify_relay_transport\>"
+syntax match pfmainRef "$\<address_verify_relayhost\>"
+syntax match pfmainRef "$\<address_verify_sender\>"
+syntax match pfmainRef "$\<address_verify_sender_dependent_default_transport_maps\>"
+syntax match pfmainRef "$\<address_verify_sender_dependent_relayhost_maps\>"
+syntax match pfmainRef "$\<address_verify_sender_ttl\>"
+syntax match pfmainRef "$\<address_verify_service_name\>"
+syntax match pfmainRef "$\<address_verify_transport_maps\>"
+syntax match pfmainRef "$\<address_verify_virtual_transport\>"
+syntax match pfmainRef "$\<alias_database\>"
+syntax match pfmainRef "$\<alias_maps\>"
+syntax match pfmainRef "$\<allow_mail_to_commands\>"
+syntax match pfmainRef "$\<allow_mail_to_files\>"
+syntax match pfmainRef "$\<allow_min_user\>"
+syntax match pfmainRef "$\<allow_percent_hack\>"
+syntax match pfmainRef "$\<allow_untrusted_routing\>"
+syntax match pfmainRef "$\<alternate_config_directories\>"
+syntax match pfmainRef "$\<always_add_missing_headers\>"
+syntax match pfmainRef "$\<always_bcc\>"
+syntax match pfmainRef "$\<anvil_rate_time_unit\>"
+syntax match pfmainRef "$\<anvil_status_update_time\>"
+syntax match pfmainRef "$\<append_at_myorigin\>"
+syntax match pfmainRef "$\<append_dot_mydomain\>"
+syntax match pfmainRef "$\<application_event_drain_time\>"
+syntax match pfmainRef "$\<authorized_flush_users\>"
+syntax match pfmainRef "$\<authorized_mailq_users\>"
+syntax match pfmainRef "$\<authorized_submit_users\>"
+syntax match pfmainRef "$\<authorized_verp_clients\>"
+syntax match pfmainRef "$\<backwards_bounce_logfile_compatibility\>"
+syntax match pfmainRef "$\<berkeley_db_create_buffer_size\>"
+syntax match pfmainRef "$\<berkeley_db_read_buffer_size\>"
+syntax match pfmainRef "$\<best_mx_transport\>"
+syntax match pfmainRef "$\<biff\>"
+syntax match pfmainRef "$\<body_checks\>"
+syntax match pfmainRef "$\<body_checks_size_limit\>"
+syntax match pfmainRef "$\<bounce_notice_recipient\>"
+syntax match pfmainRef "$\<bounce_queue_lifetime\>"
+syntax match pfmainRef "$\<bounce_service_name\>"
+syntax match pfmainRef "$\<bounce_size_limit\>"
+syntax match pfmainRef "$\<bounce_template_file\>"
+syntax match pfmainRef "$\<broken_sasl_auth_clients\>"
+syntax match pfmainRef "$\<canonical_classes\>"
+syntax match pfmainRef "$\<canonical_maps\>"
+syntax match pfmainRef "$\<cleanup_service_name\>"
+syntax match pfmainRef "$\<command_directory\>"
+syntax match pfmainRef "$\<command_execution_directory\>"
+syntax match pfmainRef "$\<command_expansion_filter\>"
+syntax match pfmainRef "$\<command_time_limit\>"
+syntax match pfmainRef "$\<compatibility_level\>"
+syntax match pfmainRef "$\<config_directory\>"
+syntax match pfmainRef "$\<confirm_delay_cleared\>"
+syntax match pfmainRef "$\<connection_cache_protocol_timeout\>"
+syntax match pfmainRef "$\<connection_cache_service_name\>"
+syntax match pfmainRef "$\<connection_cache_status_update_time\>"
+syntax match pfmainRef "$\<connection_cache_ttl_limit\>"
+syntax match pfmainRef "$\<content_filter\>"
+syntax match pfmainRef "$\<cyrus_sasl_config_path\>"
+syntax match pfmainRef "$\<daemon_directory\>"
+syntax match pfmainRef "$\<daemon_table_open_error_is_fatal\>"
+syntax match pfmainRef "$\<daemon_timeout\>"
+syntax match pfmainRef "$\<data_directory\>"
+syntax match pfmainRef "$\<debug_peer_level\>"
+syntax match pfmainRef "$\<debug_peer_list\>"
+syntax match pfmainRef "$\<debugger_command\>"
+syntax match pfmainRef "$\<default_database_type\>"
+syntax match pfmainRef "$\<default_delivery_slot_cost\>"
+syntax match pfmainRef "$\<default_delivery_slot_discount\>"
+syntax match pfmainRef "$\<default_delivery_slot_loan\>"
+syntax match pfmainRef "$\<default_delivery_status_filter\>"
+syntax match pfmainRef "$\<default_destination_concurrency_failed_cohort_limit\>"
+syntax match pfmainRef "$\<default_destination_concurrency_limit\>"
+syntax match pfmainRef "$\<default_destination_concurrency_negative_feedback\>"
+syntax match pfmainRef "$\<default_destination_concurrency_positive_feedback\>"
+syntax match pfmainRef "$\<default_destination_rate_delay\>"
+syntax match pfmainRef "$\<default_destination_recipient_limit\>"
+syntax match pfmainRef "$\<default_extra_recipient_limit\>"
+syntax match pfmainRef "$\<default_filter_nexthop\>"
+syntax match pfmainRef "$\<default_minimum_delivery_slots\>"
+syntax match pfmainRef "$\<default_privs\>"
+syntax match pfmainRef "$\<default_process_limit\>"
+syntax match pfmainRef "$\<default_rbl_reply\>"
+syntax match pfmainRef "$\<default_recipient_limit\>"
+syntax match pfmainRef "$\<default_recipient_refill_delay\>"
+syntax match pfmainRef "$\<default_recipient_refill_limit\>"
+syntax match pfmainRef "$\<default_transport\>"
+syntax match pfmainRef "$\<default_verp_delimiters\>"
+syntax match pfmainRef "$\<defer_code\>"
+syntax match pfmainRef "$\<defer_service_name\>"
+syntax match pfmainRef "$\<defer_transports\>"
+syntax match pfmainRef "$\<delay_logging_resolution_limit\>"
+syntax match pfmainRef "$\<delay_notice_recipient\>"
+syntax match pfmainRef "$\<delay_warning_time\>"
+syntax match pfmainRef "$\<deliver_lock_attempts\>"
+syntax match pfmainRef "$\<deliver_lock_delay\>"
+syntax match pfmainRef "$\<destination_concurrency_feedback_debug\>"
+syntax match pfmainRef "$\<detect_8bit_encoding_header\>"
+syntax match pfmainRef "$\<disable_dns_lookups\>"
+syntax match pfmainRef "$\<disable_mime_input_processing\>"
+syntax match pfmainRef "$\<disable_mime_output_conversion\>"
+syntax match pfmainRef "$\<disable_verp_bounces\>"
+syntax match pfmainRef "$\<disable_vrfy_command\>"
+syntax match pfmainRef "$\<dnsblog_reply_delay\>"
+syntax match pfmainRef "$\<dnsblog_service_name\>"
+syntax match pfmainRef "$\<dont_remove\>"
+syntax match pfmainRef "$\<double_bounce_sender\>"
+syntax match pfmainRef "$\<duplicate_filter_limit\>"
+syntax match pfmainRef "$\<empty_address_default_transport_maps_lookup_key\>"
+syntax match pfmainRef "$\<empty_address_recipient\>"
+syntax match pfmainRef "$\<empty_address_relayhost_maps_lookup_key\>"
+syntax match pfmainRef "$\<enable_errors_to\>"
+syntax match pfmainRef "$\<enable_long_queue_ids\>"
+syntax match pfmainRef "$\<enable_original_recipient\>"
+syntax match pfmainRef "$\<error_notice_recipient\>"
+syntax match pfmainRef "$\<error_service_name\>"
+syntax match pfmainRef "$\<execution_directory_expansion_filter\>"
+syntax match pfmainRef "$\<expand_owner_alias\>"
+syntax match pfmainRef "$\<export_environment\>"
+syntax match pfmainRef "$\<extract_recipient_limit\>"
+syntax match pfmainRef "$\<fallback_relay\>"
+syntax match pfmainRef "$\<fallback_transport\>"
+syntax match pfmainRef "$\<fallback_transport_maps\>"
+syntax match pfmainRef "$\<fast_flush_domains\>"
+syntax match pfmainRef "$\<fast_flush_purge_time\>"
+syntax match pfmainRef "$\<fast_flush_refresh_time\>"
+syntax match pfmainRef "$\<fault_injection_code\>"
+syntax match pfmainRef "$\<flush_service_name\>"
+syntax match pfmainRef "$\<fork_attempts\>"
+syntax match pfmainRef "$\<fork_delay\>"
+syntax match pfmainRef "$\<forward_expansion_filter\>"
+syntax match pfmainRef "$\<forward_path\>"
+syntax match pfmainRef "$\<frozen_delivered_to\>"
+syntax match pfmainRef "$\<hash_queue_depth\>"
+syntax match pfmainRef "$\<hash_queue_names\>"
+syntax match pfmainRef "$\<header_address_token_limit\>"
+syntax match pfmainRef "$\<header_checks\>"
+syntax match pfmainRef "$\<header_size_limit\>"
+syntax match pfmainRef "$\<helpful_warnings\>"
+syntax match pfmainRef "$\<home_mailbox\>"
+syntax match pfmainRef "$\<hopcount_limit\>"
+syntax match pfmainRef "$\<html_directory\>"
+syntax match pfmainRef "$\<ignore_mx_lookup_error\>"
+syntax match pfmainRef "$\<import_environment\>"
+syntax match pfmainRef "$\<in_flow_delay\>"
+syntax match pfmainRef "$\<inet_interfaces\>"
+syntax match pfmainRef "$\<inet_protocols\>"
+syntax match pfmainRef "$\<initial_destination_concurrency\>"
+syntax match pfmainRef "$\<internal_mail_filter_classes\>"
+syntax match pfmainRef "$\<invalid_hostname_reject_code\>"
+syntax match pfmainRef "$\<ipc_idle\>"
+syntax match pfmainRef "$\<ipc_timeout\>"
+syntax match pfmainRef "$\<ipc_ttl\>"
+syntax match pfmainRef "$\<line_length_limit\>"
+syntax match pfmainRef "$\<lmdb_map_size\>"
+syntax match pfmainRef "$\<lmtp_address_preference\>"
+syntax match pfmainRef "$\<lmtp_address_verify_target\>"
+syntax match pfmainRef "$\<lmtp_assume_final\>"
+syntax match pfmainRef "$\<lmtp_bind_address\>"
+syntax match pfmainRef "$\<lmtp_bind_address6\>"
+syntax match pfmainRef "$\<lmtp_body_checks\>"
+syntax match pfmainRef "$\<lmtp_cache_connection\>"
+syntax match pfmainRef "$\<lmtp_cname_overrides_servername\>"
+syntax match pfmainRef "$\<lmtp_connect_timeout\>"
+syntax match pfmainRef "$\<lmtp_connection_cache_destinations\>"
+syntax match pfmainRef "$\<lmtp_connection_cache_on_demand\>"
+syntax match pfmainRef "$\<lmtp_connection_cache_time_limit\>"
+syntax match pfmainRef "$\<lmtp_connection_reuse_count_limit\>"
+syntax match pfmainRef "$\<lmtp_connection_reuse_time_limit\>"
+syntax match pfmainRef "$\<lmtp_data_done_timeout\>"
+syntax match pfmainRef "$\<lmtp_data_init_timeout\>"
+syntax match pfmainRef "$\<lmtp_data_xfer_timeout\>"
+syntax match pfmainRef "$\<lmtp_defer_if_no_mx_address_found\>"
+syntax match pfmainRef "$\<lmtp_delivery_status_filter\>"
+syntax match pfmainRef "$\<lmtp_destination_concurrency_limit\>"
+syntax match pfmainRef "$\<lmtp_destination_recipient_limit\>"
+syntax match pfmainRef "$\<lmtp_discard_lhlo_keyword_address_maps\>"
+syntax match pfmainRef "$\<lmtp_discard_lhlo_keywords\>"
+syntax match pfmainRef "$\<lmtp_dns_reply_filter\>"
+syntax match pfmainRef "$\<lmtp_dns_resolver_options\>"
+syntax match pfmainRef "$\<lmtp_dns_support_level\>"
+syntax match pfmainRef "$\<lmtp_enforce_tls\>"
+syntax match pfmainRef "$\<lmtp_generic_maps\>"
+syntax match pfmainRef "$\<lmtp_header_checks\>"
+syntax match pfmainRef "$\<lmtp_host_lookup\>"
+syntax match pfmainRef "$\<lmtp_lhlo_name\>"
+syntax match pfmainRef "$\<lmtp_lhlo_timeout\>"
+syntax match pfmainRef "$\<lmtp_line_length_limit\>"
+syntax match pfmainRef "$\<lmtp_mail_timeout\>"
+syntax match pfmainRef "$\<lmtp_mime_header_checks\>"
+syntax match pfmainRef "$\<lmtp_mx_address_limit\>"
+syntax match pfmainRef "$\<lmtp_mx_session_limit\>"
+syntax match pfmainRef "$\<lmtp_nested_header_checks\>"
+syntax match pfmainRef "$\<lmtp_per_record_deadline\>"
+syntax match pfmainRef "$\<lmtp_pix_workaround_delay_time\>"
+syntax match pfmainRef "$\<lmtp_pix_workaround_maps\>"
+syntax match pfmainRef "$\<lmtp_pix_workaround_threshold_time\>"
+syntax match pfmainRef "$\<lmtp_pix_workarounds\>"
+syntax match pfmainRef "$\<lmtp_quit_timeout\>"
+syntax match pfmainRef "$\<lmtp_quote_rfc821_envelope\>"
+syntax match pfmainRef "$\<lmtp_randomize_addresses\>"
+syntax match pfmainRef "$\<lmtp_rcpt_timeout\>"
+syntax match pfmainRef "$\<lmtp_reply_filter\>"
+syntax match pfmainRef "$\<lmtp_rset_timeout\>"
+syntax match pfmainRef "$\<lmtp_sasl_auth_cache_name\>"
+syntax match pfmainRef "$\<lmtp_sasl_auth_cache_time\>"
+syntax match pfmainRef "$\<lmtp_sasl_auth_enable\>"
+syntax match pfmainRef "$\<lmtp_sasl_auth_soft_bounce\>"
+syntax match pfmainRef "$\<lmtp_sasl_mechanism_filter\>"
+syntax match pfmainRef "$\<lmtp_sasl_password_maps\>"
+syntax match pfmainRef "$\<lmtp_sasl_path\>"
+syntax match pfmainRef "$\<lmtp_sasl_security_options\>"
+syntax match pfmainRef "$\<lmtp_sasl_tls_security_options\>"
+syntax match pfmainRef "$\<lmtp_sasl_tls_verified_security_options\>"
+syntax match pfmainRef "$\<lmtp_sasl_type\>"
+syntax match pfmainRef "$\<lmtp_send_dummy_mail_auth\>"
+syntax match pfmainRef "$\<lmtp_send_xforward_command\>"
+syntax match pfmainRef "$\<lmtp_sender_dependent_authentication\>"
+syntax match pfmainRef "$\<lmtp_skip_5xx_greeting\>"
+syntax match pfmainRef "$\<lmtp_skip_quit_response\>"
+syntax match pfmainRef "$\<lmtp_starttls_timeout\>"
+syntax match pfmainRef "$\<lmtp_tcp_port\>"
+syntax match pfmainRef "$\<lmtp_tls_CAfile\>"
+syntax match pfmainRef "$\<lmtp_tls_CApath\>"
+syntax match pfmainRef "$\<lmtp_tls_block_early_mail_reply\>"
+syntax match pfmainRef "$\<lmtp_tls_cert_file\>"
+syntax match pfmainRef "$\<lmtp_tls_ciphers\>"
+syntax match pfmainRef "$\<lmtp_tls_dcert_file\>"
+syntax match pfmainRef "$\<lmtp_tls_dkey_file\>"
+syntax match pfmainRef "$\<lmtp_tls_eccert_file\>"
+syntax match pfmainRef "$\<lmtp_tls_eckey_file\>"
+syntax match pfmainRef "$\<lmtp_tls_enforce_peername\>"
+syntax match pfmainRef "$\<lmtp_tls_exclude_ciphers\>"
+syntax match pfmainRef "$\<lmtp_tls_fingerprint_cert_match\>"
+syntax match pfmainRef "$\<lmtp_tls_fingerprint_digest\>"
+syntax match pfmainRef "$\<lmtp_tls_force_insecure_host_tlsa_lookup\>"
+syntax match pfmainRef "$\<lmtp_tls_key_file\>"
+syntax match pfmainRef "$\<lmtp_tls_loglevel\>"
+syntax match pfmainRef "$\<lmtp_tls_mandatory_ciphers\>"
+syntax match pfmainRef "$\<lmtp_tls_mandatory_exclude_ciphers\>"
+syntax match pfmainRef "$\<lmtp_tls_mandatory_protocols\>"
+syntax match pfmainRef "$\<lmtp_tls_note_starttls_offer\>"
+syntax match pfmainRef "$\<lmtp_tls_per_site\>"
+syntax match pfmainRef "$\<lmtp_tls_policy_maps\>"
+syntax match pfmainRef "$\<lmtp_tls_protocols\>"
+syntax match pfmainRef "$\<lmtp_tls_scert_verifydepth\>"
+syntax match pfmainRef "$\<lmtp_tls_secure_cert_match\>"
+syntax match pfmainRef "$\<lmtp_tls_security_level\>"
+syntax match pfmainRef "$\<lmtp_tls_session_cache_database\>"
+syntax match pfmainRef "$\<lmtp_tls_session_cache_timeout\>"
+syntax match pfmainRef "$\<lmtp_tls_trust_anchor_file\>"
+syntax match pfmainRef "$\<lmtp_tls_verify_cert_match\>"
+syntax match pfmainRef "$\<lmtp_use_tls\>"
+syntax match pfmainRef "$\<lmtp_xforward_timeout\>"
+syntax match pfmainRef "$\<local_command_shell\>"
+syntax match pfmainRef "$\<local_delivery_status_filter\>"
+syntax match pfmainRef "$\<local_destination_concurrency_limit\>"
+syntax match pfmainRef "$\<local_destination_recipient_limit\>"
+syntax match pfmainRef "$\<local_header_rewrite_clients\>"
+syntax match pfmainRef "$\<local_recipient_maps\>"
+syntax match pfmainRef "$\<local_transport\>"
+syntax match pfmainRef "$\<luser_relay\>"
+syntax match pfmainRef "$\<mail_name\>"
+syntax match pfmainRef "$\<mail_owner\>"
+syntax match pfmainRef "$\<mail_release_date\>"
+syntax match pfmainRef "$\<mail_spool_directory\>"
+syntax match pfmainRef "$\<mail_version\>"
+syntax match pfmainRef "$\<mailbox_command\>"
+syntax match pfmainRef "$\<mailbox_command_maps\>"
+syntax match pfmainRef "$\<mailbox_delivery_lock\>"
+syntax match pfmainRef "$\<mailbox_size_limit\>"
+syntax match pfmainRef "$\<mailbox_transport\>"
+syntax match pfmainRef "$\<mailbox_transport_maps\>"
+syntax match pfmainRef "$\<mailq_path\>"
+syntax match pfmainRef "$\<manpage_directory\>"
+syntax match pfmainRef "$\<maps_rbl_domains\>"
+syntax match pfmainRef "$\<maps_rbl_reject_code\>"
+syntax match pfmainRef "$\<masquerade_classes\>"
+syntax match pfmainRef "$\<masquerade_domains\>"
+syntax match pfmainRef "$\<masquerade_exceptions\>"
+syntax match pfmainRef "$\<master_service_disable\>"
+syntax match pfmainRef "$\<max_idle\>"
+syntax match pfmainRef "$\<max_use\>"
+syntax match pfmainRef "$\<maximal_backoff_time\>"
+syntax match pfmainRef "$\<maximal_queue_lifetime\>"
+syntax match pfmainRef "$\<message_drop_headers\>"
+syntax match pfmainRef "$\<message_reject_characters\>"
+syntax match pfmainRef "$\<message_size_limit\>"
+syntax match pfmainRef "$\<message_strip_characters\>"
+syntax match pfmainRef "$\<meta_directory\>"
+syntax match pfmainRef "$\<milter_command_timeout\>"
+syntax match pfmainRef "$\<milter_connect_macros\>"
+syntax match pfmainRef "$\<milter_connect_timeout\>"
+syntax match pfmainRef "$\<milter_content_timeout\>"
+syntax match pfmainRef "$\<milter_data_macros\>"
+syntax match pfmainRef "$\<milter_default_action\>"
+syntax match pfmainRef "$\<milter_end_of_data_macros\>"
+syntax match pfmainRef "$\<milter_end_of_header_macros\>"
+syntax match pfmainRef "$\<milter_header_checks\>"
+syntax match pfmainRef "$\<milter_helo_macros\>"
+syntax match pfmainRef "$\<milter_macro_daemon_name\>"
+syntax match pfmainRef "$\<milter_macro_v\>"
+syntax match pfmainRef "$\<milter_mail_macros\>"
+syntax match pfmainRef "$\<milter_protocol\>"
+syntax match pfmainRef "$\<milter_rcpt_macros\>"
+syntax match pfmainRef "$\<milter_unknown_command_macros\>"
+syntax match pfmainRef "$\<mime_boundary_length_limit\>"
+syntax match pfmainRef "$\<mime_header_checks\>"
+syntax match pfmainRef "$\<mime_nesting_limit\>"
+syntax match pfmainRef "$\<minimal_backoff_time\>"
+syntax match pfmainRef "$\<multi_instance_directories\>"
+syntax match pfmainRef "$\<multi_instance_enable\>"
+syntax match pfmainRef "$\<multi_instance_group\>"
+syntax match pfmainRef "$\<multi_instance_name\>"
+syntax match pfmainRef "$\<multi_instance_wrapper\>"
+syntax match pfmainRef "$\<multi_recipient_bounce_reject_code\>"
+syntax match pfmainRef "$\<mydestination\>"
+syntax match pfmainRef "$\<mydomain\>"
+syntax match pfmainRef "$\<myhostname\>"
+syntax match pfmainRef "$\<mynetworks\>"
+syntax match pfmainRef "$\<mynetworks_style\>"
+syntax match pfmainRef "$\<myorigin\>"
+syntax match pfmainRef "$\<nested_header_checks\>"
+syntax match pfmainRef "$\<newaliases_path\>"
+syntax match pfmainRef "$\<non_fqdn_reject_code\>"
+syntax match pfmainRef "$\<non_smtpd_milters\>"
+syntax match pfmainRef "$\<notify_classes\>"
+syntax match pfmainRef "$\<nullmx_reject_code\>"
+syntax match pfmainRef "$\<owner_request_special\>"
+syntax match pfmainRef "$\<parent_domain_matches_subdomains\>"
+syntax match pfmainRef "$\<permit_mx_backup_networks\>"
+syntax match pfmainRef "$\<pickup_service_name\>"
+syntax match pfmainRef "$\<pipe_delivery_status_filter\>"
+syntax match pfmainRef "$\<plaintext_reject_code\>"
+syntax match pfmainRef "$\<postmulti_control_commands\>"
+syntax match pfmainRef "$\<postmulti_start_commands\>"
+syntax match pfmainRef "$\<postmulti_stop_commands\>"
+syntax match pfmainRef "$\<postscreen_access_list\>"
+syntax match pfmainRef "$\<postscreen_bare_newline_action\>"
+syntax match pfmainRef "$\<postscreen_bare_newline_enable\>"
+syntax match pfmainRef "$\<postscreen_bare_newline_ttl\>"
+syntax match pfmainRef "$\<postscreen_blacklist_action\>"
+syntax match pfmainRef "$\<postscreen_cache_cleanup_interval\>"
+syntax match pfmainRef "$\<postscreen_cache_map\>"
+syntax match pfmainRef "$\<postscreen_cache_retention_time\>"
+syntax match pfmainRef "$\<postscreen_client_connection_count_limit\>"
+syntax match pfmainRef "$\<postscreen_command_count_limit\>"
+syntax match pfmainRef "$\<postscreen_command_filter\>"
+syntax match pfmainRef "$\<postscreen_command_time_limit\>"
+syntax match pfmainRef "$\<postscreen_disable_vrfy_command\>"
+syntax match pfmainRef "$\<postscreen_discard_ehlo_keyword_address_maps\>"
+syntax match pfmainRef "$\<postscreen_discard_ehlo_keywords\>"
+syntax match pfmainRef "$\<postscreen_dnsbl_action\>"
+syntax match pfmainRef "$\<postscreen_dnsbl_reply_map\>"
+syntax match pfmainRef "$\<postscreen_dnsbl_sites\>"
+syntax match pfmainRef "$\<postscreen_dnsbl_threshold\>"
+syntax match pfmainRef "$\<postscreen_dnsbl_timeout\>"
+syntax match pfmainRef "$\<postscreen_dnsbl_ttl\>"
+syntax match pfmainRef "$\<postscreen_dnsbl_whitelist_threshold\>"
+syntax match pfmainRef "$\<postscreen_enforce_tls\>"
+syntax match pfmainRef "$\<postscreen_expansion_filter\>"
+syntax match pfmainRef "$\<postscreen_forbidden_commands\>"
+syntax match pfmainRef "$\<postscreen_greet_action\>"
+syntax match pfmainRef "$\<postscreen_greet_banner\>"
+syntax match pfmainRef "$\<postscreen_greet_ttl\>"
+syntax match pfmainRef "$\<postscreen_greet_wait\>"
+syntax match pfmainRef "$\<postscreen_helo_required\>"
+syntax match pfmainRef "$\<postscreen_non_smtp_command_action\>"
+syntax match pfmainRef "$\<postscreen_non_smtp_command_enable\>"
+syntax match pfmainRef "$\<postscreen_non_smtp_command_ttl\>"
+syntax match pfmainRef "$\<postscreen_pipelining_action\>"
+syntax match pfmainRef "$\<postscreen_pipelining_enable\>"
+syntax match pfmainRef "$\<postscreen_pipelining_ttl\>"
+syntax match pfmainRef "$\<postscreen_post_queue_limit\>"
+syntax match pfmainRef "$\<postscreen_pre_queue_limit\>"
+syntax match pfmainRef "$\<postscreen_reject_footer\>"
+syntax match pfmainRef "$\<postscreen_tls_security_level\>"
+syntax match pfmainRef "$\<postscreen_upstream_proxy_protocol\>"
+syntax match pfmainRef "$\<postscreen_upstream_proxy_timeout\>"
+syntax match pfmainRef "$\<postscreen_use_tls\>"
+syntax match pfmainRef "$\<postscreen_watchdog_timeout\>"
+syntax match pfmainRef "$\<postscreen_whitelist_interfaces\>"
+syntax match pfmainRef "$\<prepend_delivered_header\>"
+syntax match pfmainRef "$\<process_id\>"
+syntax match pfmainRef "$\<process_id_directory\>"
+syntax match pfmainRef "$\<process_name\>"
+syntax match pfmainRef "$\<propagate_unmatched_extensions\>"
+syntax match pfmainRef "$\<proxy_interfaces\>"
+syntax match pfmainRef "$\<proxy_read_maps\>"
+syntax match pfmainRef "$\<proxy_write_maps\>"
+syntax match pfmainRef "$\<proxymap_service_name\>"
+syntax match pfmainRef "$\<proxywrite_service_name\>"
+syntax match pfmainRef "$\<qmgr_clog_warn_time\>"
+syntax match pfmainRef "$\<qmgr_daemon_timeout\>"
+syntax match pfmainRef "$\<qmgr_fudge_factor\>"
+syntax match pfmainRef "$\<qmgr_ipc_timeout\>"
+syntax match pfmainRef "$\<qmgr_message_active_limit\>"
+syntax match pfmainRef "$\<qmgr_message_recipient_limit\>"
+syntax match pfmainRef "$\<qmgr_message_recipient_minimum\>"
+syntax match pfmainRef "$\<qmqpd_authorized_clients\>"
+syntax match pfmainRef "$\<qmqpd_client_port_logging\>"
+syntax match pfmainRef "$\<qmqpd_error_delay\>"
+syntax match pfmainRef "$\<qmqpd_timeout\>"
+syntax match pfmainRef "$\<queue_directory\>"
+syntax match pfmainRef "$\<queue_file_attribute_count_limit\>"
+syntax match pfmainRef "$\<queue_minfree\>"
+syntax match pfmainRef "$\<queue_run_delay\>"
+syntax match pfmainRef "$\<queue_service_name\>"
+syntax match pfmainRef "$\<rbl_reply_maps\>"
+syntax match pfmainRef "$\<readme_directory\>"
+syntax match pfmainRef "$\<receive_override_options\>"
+syntax match pfmainRef "$\<recipient_bcc_maps\>"
+syntax match pfmainRef "$\<recipient_canonical_classes\>"
+syntax match pfmainRef "$\<recipient_canonical_maps\>"
+syntax match pfmainRef "$\<recipient_delimiter\>"
+syntax match pfmainRef "$\<reject_code\>"
+syntax match pfmainRef "$\<reject_tempfail_action\>"
+syntax match pfmainRef "$\<relay_clientcerts\>"
+syntax match pfmainRef "$\<relay_destination_concurrency_limit\>"
+syntax match pfmainRef "$\<relay_destination_recipient_limit\>"
+syntax match pfmainRef "$\<relay_domains\>"
+syntax match pfmainRef "$\<relay_domains_reject_code\>"
+syntax match pfmainRef "$\<relay_recipient_maps\>"
+syntax match pfmainRef "$\<relay_transport\>"
+syntax match pfmainRef "$\<relayhost\>"
+syntax match pfmainRef "$\<relocated_maps\>"
+syntax match pfmainRef "$\<remote_header_rewrite_domain\>"
+syntax match pfmainRef "$\<require_home_directory\>"
+syntax match pfmainRef "$\<reset_owner_alias\>"
+syntax match pfmainRef "$\<resolve_dequoted_address\>"
+syntax match pfmainRef "$\<resolve_null_domain\>"
+syntax match pfmainRef "$\<resolve_numeric_domain\>"
+syntax match pfmainRef "$\<rewrite_service_name\>"
+syntax match pfmainRef "$\<sample_directory\>"
+syntax match pfmainRef "$\<send_cyrus_sasl_authzid\>"
+syntax match pfmainRef "$\<sender_based_routing\>"
+syntax match pfmainRef "$\<sender_bcc_maps\>"
+syntax match pfmainRef "$\<sender_canonical_classes\>"
+syntax match pfmainRef "$\<sender_canonical_maps\>"
+syntax match pfmainRef "$\<sender_dependent_default_transport_maps\>"
+syntax match pfmainRef "$\<sender_dependent_relayhost_maps\>"
+syntax match pfmainRef "$\<sendmail_fix_line_endings\>"
+syntax match pfmainRef "$\<sendmail_path\>"
+syntax match pfmainRef "$\<service_throttle_time\>"
+syntax match pfmainRef "$\<setgid_group\>"
+syntax match pfmainRef "$\<shlib_directory\>"
+syntax match pfmainRef "$\<show_user_unknown_table_name\>"
+syntax match pfmainRef "$\<showq_service_name\>"
+syntax match pfmainRef "$\<smtp_address_preference\>"
+syntax match pfmainRef "$\<smtp_address_verify_target\>"
+syntax match pfmainRef "$\<smtp_always_send_ehlo\>"
+syntax match pfmainRef "$\<smtp_bind_address\>"
+syntax match pfmainRef "$\<smtp_bind_address6\>"
+syntax match pfmainRef "$\<smtp_body_checks\>"
+syntax match pfmainRef "$\<smtp_cname_overrides_servername\>"
+syntax match pfmainRef "$\<smtp_connect_timeout\>"
+syntax match pfmainRef "$\<smtp_connection_cache_destinations\>"
+syntax match pfmainRef "$\<smtp_connection_cache_on_demand\>"
+syntax match pfmainRef "$\<smtp_connection_cache_time_limit\>"
+syntax match pfmainRef "$\<smtp_connection_reuse_count_limit\>"
+syntax match pfmainRef "$\<smtp_connection_reuse_time_limit\>"
+syntax match pfmainRef "$\<smtp_data_done_timeout\>"
+syntax match pfmainRef "$\<smtp_data_init_timeout\>"
+syntax match pfmainRef "$\<smtp_data_xfer_timeout\>"
+syntax match pfmainRef "$\<smtp_defer_if_no_mx_address_found\>"
+syntax match pfmainRef "$\<smtp_delivery_status_filter\>"
+syntax match pfmainRef "$\<smtp_destination_concurrency_limit\>"
+syntax match pfmainRef "$\<smtp_destination_recipient_limit\>"
+syntax match pfmainRef "$\<smtp_discard_ehlo_keyword_address_maps\>"
+syntax match pfmainRef "$\<smtp_discard_ehlo_keywords\>"
+syntax match pfmainRef "$\<smtp_dns_reply_filter\>"
+syntax match pfmainRef "$\<smtp_dns_resolver_options\>"
+syntax match pfmainRef "$\<smtp_dns_support_level\>"
+syntax match pfmainRef "$\<smtp_enforce_tls\>"
+syntax match pfmainRef "$\<smtp_fallback_relay\>"
+syntax match pfmainRef "$\<smtp_generic_maps\>"
+syntax match pfmainRef "$\<smtp_header_checks\>"
+syntax match pfmainRef "$\<smtp_helo_name\>"
+syntax match pfmainRef "$\<smtp_helo_timeout\>"
+syntax match pfmainRef "$\<smtp_host_lookup\>"
+syntax match pfmainRef "$\<smtp_line_length_limit\>"
+syntax match pfmainRef "$\<smtp_mail_timeout\>"
+syntax match pfmainRef "$\<smtp_mime_header_checks\>"
+syntax match pfmainRef "$\<smtp_mx_address_limit\>"
+syntax match pfmainRef "$\<smtp_mx_session_limit\>"
+syntax match pfmainRef "$\<smtp_nested_header_checks\>"
+syntax match pfmainRef "$\<smtp_never_send_ehlo\>"
+syntax match pfmainRef "$\<smtp_per_record_deadline\>"
+syntax match pfmainRef "$\<smtp_pix_workaround_delay_time\>"
+syntax match pfmainRef "$\<smtp_pix_workaround_maps\>"
+syntax match pfmainRef "$\<smtp_pix_workaround_threshold_time\>"
+syntax match pfmainRef "$\<smtp_pix_workarounds\>"
+syntax match pfmainRef "$\<smtp_quit_timeout\>"
+syntax match pfmainRef "$\<smtp_quote_rfc821_envelope\>"
+syntax match pfmainRef "$\<smtp_randomize_addresses\>"
+syntax match pfmainRef "$\<smtp_rcpt_timeout\>"
+syntax match pfmainRef "$\<smtp_reply_filter\>"
+syntax match pfmainRef "$\<smtp_rset_timeout\>"
+syntax match pfmainRef "$\<smtp_sasl_auth_cache_name\>"
+syntax match pfmainRef "$\<smtp_sasl_auth_cache_time\>"
+syntax match pfmainRef "$\<smtp_sasl_auth_enable\>"
+syntax match pfmainRef "$\<smtp_sasl_auth_soft_bounce\>"
+syntax match pfmainRef "$\<smtp_sasl_mechanism_filter\>"
+syntax match pfmainRef "$\<smtp_sasl_password_maps\>"
+syntax match pfmainRef "$\<smtp_sasl_path\>"
+syntax match pfmainRef "$\<smtp_sasl_security_options\>"
+syntax match pfmainRef "$\<smtp_sasl_tls_security_options\>"
+syntax match pfmainRef "$\<smtp_sasl_tls_verified_security_options\>"
+syntax match pfmainRef "$\<smtp_sasl_type\>"
+syntax match pfmainRef "$\<smtp_send_dummy_mail_auth\>"
+syntax match pfmainRef "$\<smtp_send_xforward_command\>"
+syntax match pfmainRef "$\<smtp_sender_dependent_authentication\>"
+syntax match pfmainRef "$\<smtp_skip_4xx_greeting\>"
+syntax match pfmainRef "$\<smtp_skip_5xx_greeting\>"
+syntax match pfmainRef "$\<smtp_skip_quit_response\>"
+syntax match pfmainRef "$\<smtp_starttls_timeout\>"
+syntax match pfmainRef "$\<smtp_tls_CAfile\>"
+syntax match pfmainRef "$\<smtp_tls_CApath\>"
+syntax match pfmainRef "$\<smtp_tls_block_early_mail_reply\>"
+syntax match pfmainRef "$\<smtp_tls_cert_file\>"
+syntax match pfmainRef "$\<smtp_tls_cipherlist\>"
+syntax match pfmainRef "$\<smtp_tls_ciphers\>"
+syntax match pfmainRef "$\<smtp_tls_dcert_file\>"
+syntax match pfmainRef "$\<smtp_tls_dkey_file\>"
+syntax match pfmainRef "$\<smtp_tls_eccert_file\>"
+syntax match pfmainRef "$\<smtp_tls_eckey_file\>"
+syntax match pfmainRef "$\<smtp_tls_enforce_peername\>"
+syntax match pfmainRef "$\<smtp_tls_exclude_ciphers\>"
+syntax match pfmainRef "$\<smtp_tls_fingerprint_cert_match\>"
+syntax match pfmainRef "$\<smtp_tls_fingerprint_digest\>"
+syntax match pfmainRef "$\<smtp_tls_force_insecure_host_tlsa_lookup\>"
+syntax match pfmainRef "$\<smtp_tls_key_file\>"
+syntax match pfmainRef "$\<smtp_tls_loglevel\>"
+syntax match pfmainRef "$\<smtp_tls_mandatory_ciphers\>"
+syntax match pfmainRef "$\<smtp_tls_mandatory_exclude_ciphers\>"
+syntax match pfmainRef "$\<smtp_tls_mandatory_protocols\>"
+syntax match pfmainRef "$\<smtp_tls_note_starttls_offer\>"
+syntax match pfmainRef "$\<smtp_tls_per_site\>"
+syntax match pfmainRef "$\<smtp_tls_policy_maps\>"
+syntax match pfmainRef "$\<smtp_tls_protocols\>"
+syntax match pfmainRef "$\<smtp_tls_scert_verifydepth\>"
+syntax match pfmainRef "$\<smtp_tls_secure_cert_match\>"
+syntax match pfmainRef "$\<smtp_tls_security_level\>"
+syntax match pfmainRef "$\<smtp_tls_session_cache_database\>"
+syntax match pfmainRef "$\<smtp_tls_session_cache_timeout\>"
+syntax match pfmainRef "$\<smtp_tls_trust_anchor_file\>"
+syntax match pfmainRef "$\<smtp_tls_verify_cert_match\>"
+syntax match pfmainRef "$\<smtp_tls_wrappermode\>"
+syntax match pfmainRef "$\<smtp_use_tls\>"
+syntax match pfmainRef "$\<smtp_xforward_timeout\>"
+syntax match pfmainRef "$\<smtpd_authorized_verp_clients\>"
+syntax match pfmainRef "$\<smtpd_authorized_xclient_hosts\>"
+syntax match pfmainRef "$\<smtpd_authorized_xforward_hosts\>"
+syntax match pfmainRef "$\<smtpd_banner\>"
+syntax match pfmainRef "$\<smtpd_client_connection_count_limit\>"
+syntax match pfmainRef "$\<smtpd_client_connection_rate_limit\>"
+syntax match pfmainRef "$\<smtpd_client_event_limit_exceptions\>"
+syntax match pfmainRef "$\<smtpd_client_message_rate_limit\>"
+syntax match pfmainRef "$\<smtpd_client_new_tls_session_rate_limit\>"
+syntax match pfmainRef "$\<smtpd_client_port_logging\>"
+syntax match pfmainRef "$\<smtpd_client_recipient_rate_limit\>"
+syntax match pfmainRef "$\<smtpd_client_restrictions\>"
+syntax match pfmainRef "$\<smtpd_command_filter\>"
+syntax match pfmainRef "$\<smtpd_data_restrictions\>"
+syntax match pfmainRef "$\<smtpd_delay_open_until_valid_rcpt\>"
+syntax match pfmainRef "$\<smtpd_delay_reject\>"
+syntax match pfmainRef "$\<smtpd_discard_ehlo_keyword_address_maps\>"
+syntax match pfmainRef "$\<smtpd_discard_ehlo_keywords\>"
+syntax match pfmainRef "$\<smtpd_dns_reply_filter\>"
+syntax match pfmainRef "$\<smtpd_end_of_data_restrictions\>"
+syntax match pfmainRef "$\<smtpd_enforce_tls\>"
+syntax match pfmainRef "$\<smtpd_error_sleep_time\>"
+syntax match pfmainRef "$\<smtpd_etrn_restrictions\>"
+syntax match pfmainRef "$\<smtpd_expansion_filter\>"
+syntax match pfmainRef "$\<smtpd_forbidden_commands\>"
+syntax match pfmainRef "$\<smtpd_hard_error_limit\>"
+syntax match pfmainRef "$\<smtpd_helo_required\>"
+syntax match pfmainRef "$\<smtpd_helo_restrictions\>"
+syntax match pfmainRef "$\<smtpd_history_flush_threshold\>"
+syntax match pfmainRef "$\<smtpd_junk_command_limit\>"
+syntax match pfmainRef "$\<smtpd_log_access_permit_actions\>"
+syntax match pfmainRef "$\<smtpd_milters\>"
+syntax match pfmainRef "$\<smtpd_noop_commands\>"
+syntax match pfmainRef "$\<smtpd_null_access_lookup_key\>"
+syntax match pfmainRef "$\<smtpd_peername_lookup\>"
+syntax match pfmainRef "$\<smtpd_per_record_deadline\>"
+syntax match pfmainRef "$\<smtpd_policy_service_default_action\>"
+syntax match pfmainRef "$\<smtpd_policy_service_max_idle\>"
+syntax match pfmainRef "$\<smtpd_policy_service_max_ttl\>"
+syntax match pfmainRef "$\<smtpd_policy_service_request_limit\>"
+syntax match pfmainRef "$\<smtpd_policy_service_retry_delay\>"
+syntax match pfmainRef "$\<smtpd_policy_service_timeout\>"
+syntax match pfmainRef "$\<smtpd_policy_service_try_limit\>"
+syntax match pfmainRef "$\<smtpd_proxy_ehlo\>"
+syntax match pfmainRef "$\<smtpd_proxy_filter\>"
+syntax match pfmainRef "$\<smtpd_proxy_options\>"
+syntax match pfmainRef "$\<smtpd_proxy_timeout\>"
+syntax match pfmainRef "$\<smtpd_recipient_limit\>"
+syntax match pfmainRef "$\<smtpd_recipient_overshoot_limit\>"
+syntax match pfmainRef "$\<smtpd_recipient_restrictions\>"
+syntax match pfmainRef "$\<smtpd_reject_footer\>"
+syntax match pfmainRef "$\<smtpd_reject_unlisted_recipient\>"
+syntax match pfmainRef "$\<smtpd_reject_unlisted_sender\>"
+syntax match pfmainRef "$\<smtpd_relay_restrictions\>"
+syntax match pfmainRef "$\<smtpd_restriction_classes\>"
+syntax match pfmainRef "$\<smtpd_sasl_application_name\>"
+syntax match pfmainRef "$\<smtpd_sasl_auth_enable\>"
+syntax match pfmainRef "$\<smtpd_sasl_authenticated_header\>"
+syntax match pfmainRef "$\<smtpd_sasl_exceptions_networks\>"
+syntax match pfmainRef "$\<smtpd_sasl_local_domain\>"
+syntax match pfmainRef "$\<smtpd_sasl_path\>"
+syntax match pfmainRef "$\<smtpd_sasl_security_options\>"
+syntax match pfmainRef "$\<smtpd_sasl_service\>"
+syntax match pfmainRef "$\<smtpd_sasl_tls_security_options\>"
+syntax match pfmainRef "$\<smtpd_sasl_type\>"
+syntax match pfmainRef "$\<smtpd_sender_login_maps\>"
+syntax match pfmainRef "$\<smtpd_sender_restrictions\>"
+syntax match pfmainRef "$\<smtpd_service_name\>"
+syntax match pfmainRef "$\<smtpd_soft_error_limit\>"
+syntax match pfmainRef "$\<smtpd_starttls_timeout\>"
+syntax match pfmainRef "$\<smtpd_timeout\>"
+syntax match pfmainRef "$\<smtpd_tls_CAfile\>"
+syntax match pfmainRef "$\<smtpd_tls_CApath\>"
+syntax match pfmainRef "$\<smtpd_tls_always_issue_session_ids\>"
+syntax match pfmainRef "$\<smtpd_tls_ask_ccert\>"
+syntax match pfmainRef "$\<smtpd_tls_auth_only\>"
+syntax match pfmainRef "$\<smtpd_tls_ccert_verifydepth\>"
+syntax match pfmainRef "$\<smtpd_tls_cert_file\>"
+syntax match pfmainRef "$\<smtpd_tls_cipherlist\>"
+syntax match pfmainRef "$\<smtpd_tls_ciphers\>"
+syntax match pfmainRef "$\<smtpd_tls_dcert_file\>"
+syntax match pfmainRef "$\<smtpd_tls_dh1024_param_file\>"
+syntax match pfmainRef "$\<smtpd_tls_dh512_param_file\>"
+syntax match pfmainRef "$\<smtpd_tls_dkey_file\>"
+syntax match pfmainRef "$\<smtpd_tls_eccert_file\>"
+syntax match pfmainRef "$\<smtpd_tls_eckey_file\>"
+syntax match pfmainRef "$\<smtpd_tls_eecdh_grade\>"
+syntax match pfmainRef "$\<smtpd_tls_exclude_ciphers\>"
+syntax match pfmainRef "$\<smtpd_tls_fingerprint_digest\>"
+syntax match pfmainRef "$\<smtpd_tls_key_file\>"
+syntax match pfmainRef "$\<smtpd_tls_loglevel\>"
+syntax match pfmainRef "$\<smtpd_tls_mandatory_ciphers\>"
+syntax match pfmainRef "$\<smtpd_tls_mandatory_exclude_ciphers\>"
+syntax match pfmainRef "$\<smtpd_tls_mandatory_protocols\>"
+syntax match pfmainRef "$\<smtpd_tls_protocols\>"
+syntax match pfmainRef "$\<smtpd_tls_received_header\>"
+syntax match pfmainRef "$\<smtpd_tls_req_ccert\>"
+syntax match pfmainRef "$\<smtpd_tls_security_level\>"
+syntax match pfmainRef "$\<smtpd_tls_session_cache_database\>"
+syntax match pfmainRef "$\<smtpd_tls_session_cache_timeout\>"
+syntax match pfmainRef "$\<smtpd_tls_wrappermode\>"
+syntax match pfmainRef "$\<smtpd_upstream_proxy_protocol\>"
+syntax match pfmainRef "$\<smtpd_upstream_proxy_timeout\>"
+syntax match pfmainRef "$\<smtpd_use_tls\>"
+syntax match pfmainRef "$\<smtputf8_autodetect_classes\>"
+syntax match pfmainRef "$\<smtputf8_enable\>"
+syntax match pfmainRef "$\<soft_bounce\>"
+syntax match pfmainRef "$\<stale_lock_time\>"
+syntax match pfmainRef "$\<stress\>"
+syntax match pfmainRef "$\<strict_7bit_headers\>"
+syntax match pfmainRef "$\<strict_8bitmime\>"
+syntax match pfmainRef "$\<strict_8bitmime_body\>"
+syntax match pfmainRef "$\<strict_mailbox_ownership\>"
+syntax match pfmainRef "$\<strict_mime_encoding_domain\>"
+syntax match pfmainRef "$\<strict_rfc821_envelopes\>"
+syntax match pfmainRef "$\<strict_smtputf8\>"
+syntax match pfmainRef "$\<sun_mailtool_compatibility\>"
+syntax match pfmainRef "$\<swap_bangpath\>"
+syntax match pfmainRef "$\<syslog_facility\>"
+syntax match pfmainRef "$\<syslog_name\>"
+syntax match pfmainRef "$\<tcp_windowsize\>"
+syntax match pfmainRef "$\<tls_append_default_CA\>"
+syntax match pfmainRef "$\<tls_daemon_random_bytes\>"
+syntax match pfmainRef "$\<tls_dane_digest_agility\>"
+syntax match pfmainRef "$\<tls_dane_digests\>"
+syntax match pfmainRef "$\<tls_dane_trust_anchor_digest_enable\>"
+syntax match pfmainRef "$\<tls_disable_workarounds\>"
+syntax match pfmainRef "$\<tls_eecdh_strong_curve\>"
+syntax match pfmainRef "$\<tls_eecdh_ultra_curve\>"
+syntax match pfmainRef "$\<tls_export_cipherlist\>"
+syntax match pfmainRef "$\<tls_high_cipherlist\>"
+syntax match pfmainRef "$\<tls_legacy_public_key_fingerprints\>"
+syntax match pfmainRef "$\<tls_low_cipherlist\>"
+syntax match pfmainRef "$\<tls_medium_cipherlist\>"
+syntax match pfmainRef "$\<tls_null_cipherlist\>"
+syntax match pfmainRef "$\<tls_preempt_cipherlist\>"
+syntax match pfmainRef "$\<tls_random_bytes\>"
+syntax match pfmainRef "$\<tls_random_exchange_name\>"
+syntax match pfmainRef "$\<tls_random_prng_update_period\>"
+syntax match pfmainRef "$\<tls_random_reseed_period\>"
+syntax match pfmainRef "$\<tls_random_source\>"
+syntax match pfmainRef "$\<tls_session_ticket_cipher\>"
+syntax match pfmainRef "$\<tls_ssl_options\>"
+syntax match pfmainRef "$\<tls_wildcard_matches_multiple_labels\>"
+syntax match pfmainRef "$\<tlsmgr_service_name\>"
+syntax match pfmainRef "$\<tlsproxy_enforce_tls\>"
+syntax match pfmainRef "$\<tlsproxy_service_name\>"
+syntax match pfmainRef "$\<tlsproxy_tls_CAfile\>"
+syntax match pfmainRef "$\<tlsproxy_tls_CApath\>"
+syntax match pfmainRef "$\<tlsproxy_tls_always_issue_session_ids\>"
+syntax match pfmainRef "$\<tlsproxy_tls_ask_ccert\>"
+syntax match pfmainRef "$\<tlsproxy_tls_ccert_verifydepth\>"
+syntax match pfmainRef "$\<tlsproxy_tls_cert_file\>"
+syntax match pfmainRef "$\<tlsproxy_tls_ciphers\>"
+syntax match pfmainRef "$\<tlsproxy_tls_dcert_file\>"
+syntax match pfmainRef "$\<tlsproxy_tls_dh1024_param_file\>"
+syntax match pfmainRef "$\<tlsproxy_tls_dh512_param_file\>"
+syntax match pfmainRef "$\<tlsproxy_tls_dkey_file\>"
+syntax match pfmainRef "$\<tlsproxy_tls_eccert_file\>"
+syntax match pfmainRef "$\<tlsproxy_tls_eckey_file\>"
+syntax match pfmainRef "$\<tlsproxy_tls_eecdh_grade\>"
+syntax match pfmainRef "$\<tlsproxy_tls_exclude_ciphers\>"
+syntax match pfmainRef "$\<tlsproxy_tls_fingerprint_digest\>"
+syntax match pfmainRef "$\<tlsproxy_tls_key_file\>"
+syntax match pfmainRef "$\<tlsproxy_tls_loglevel\>"
+syntax match pfmainRef "$\<tlsproxy_tls_mandatory_ciphers\>"
+syntax match pfmainRef "$\<tlsproxy_tls_mandatory_exclude_ciphers\>"
+syntax match pfmainRef "$\<tlsproxy_tls_mandatory_protocols\>"
+syntax match pfmainRef "$\<tlsproxy_tls_protocols\>"
+syntax match pfmainRef "$\<tlsproxy_tls_req_ccert\>"
+syntax match pfmainRef "$\<tlsproxy_tls_security_level\>"
+syntax match pfmainRef "$\<tlsproxy_tls_session_cache_timeout\>"
+syntax match pfmainRef "$\<tlsproxy_use_tls\>"
+syntax match pfmainRef "$\<tlsproxy_watchdog_timeout\>"
+syntax match pfmainRef "$\<trace_service_name\>"
+syntax match pfmainRef "$\<transport_delivery_slot_cost\>"
+syntax match pfmainRef "$\<transport_delivery_slot_discount\>"
+syntax match pfmainRef "$\<transport_delivery_slot_loan\>"
+syntax match pfmainRef "$\<transport_destination_concurrency_failed_cohort_limit\>"
+syntax match pfmainRef "$\<transport_destination_concurrency_limit\>"
+syntax match pfmainRef "$\<transport_destination_concurrency_negative_feedback\>"
+syntax match pfmainRef "$\<transport_destination_concurrency_positive_feedback\>"
+syntax match pfmainRef "$\<transport_destination_rate_delay\>"
+syntax match pfmainRef "$\<transport_destination_recipient_limit\>"
+syntax match pfmainRef "$\<transport_extra_recipient_limit\>"
+syntax match pfmainRef "$\<transport_initial_destination_concurrency\>"
+syntax match pfmainRef "$\<transport_maps\>"
+syntax match pfmainRef "$\<transport_minimum_delivery_slots\>"
+syntax match pfmainRef "$\<transport_recipient_limit\>"
+syntax match pfmainRef "$\<transport_recipient_refill_delay\>"
+syntax match pfmainRef "$\<transport_recipient_refill_limit\>"
+syntax match pfmainRef "$\<transport_retry_time\>"
+syntax match pfmainRef "$\<transport_time_limit\>"
+syntax match pfmainRef "$\<trigger_timeout\>"
+syntax match pfmainRef "$\<undisclosed_recipients_header\>"
+syntax match pfmainRef "$\<unknown_address_reject_code\>"
+syntax match pfmainRef "$\<unknown_address_tempfail_action\>"
+syntax match pfmainRef "$\<unknown_client_reject_code\>"
+syntax match pfmainRef "$\<unknown_helo_hostname_tempfail_action\>"
+syntax match pfmainRef "$\<unknown_hostname_reject_code\>"
+syntax match pfmainRef "$\<unknown_local_recipient_reject_code\>"
+syntax match pfmainRef "$\<unknown_relay_recipient_reject_code\>"
+syntax match pfmainRef "$\<unknown_virtual_alias_reject_code\>"
+syntax match pfmainRef "$\<unknown_virtual_mailbox_reject_code\>"
+syntax match pfmainRef "$\<unverified_recipient_defer_code\>"
+syntax match pfmainRef "$\<unverified_recipient_reject_code\>"
+syntax match pfmainRef "$\<unverified_recipient_reject_reason\>"
+syntax match pfmainRef "$\<unverified_recipient_tempfail_action\>"
+syntax match pfmainRef "$\<unverified_sender_defer_code\>"
+syntax match pfmainRef "$\<unverified_sender_reject_code\>"
+syntax match pfmainRef "$\<unverified_sender_reject_reason\>"
+syntax match pfmainRef "$\<unverified_sender_tempfail_action\>"
+syntax match pfmainRef "$\<verp_delimiter_filter\>"
+syntax match pfmainRef "$\<virtual_alias_address_length_limit\>"
+syntax match pfmainRef "$\<virtual_alias_domains\>"
+syntax match pfmainRef "$\<virtual_alias_expansion_limit\>"
+syntax match pfmainRef "$\<virtual_alias_maps\>"
+syntax match pfmainRef "$\<virtual_alias_recursion_limit\>"
+syntax match pfmainRef "$\<virtual_delivery_status_filter\>"
+syntax match pfmainRef "$\<virtual_destination_concurrency_limit\>"
+syntax match pfmainRef "$\<virtual_destination_recipient_limit\>"
+syntax match pfmainRef "$\<virtual_gid_maps\>"
+syntax match pfmainRef "$\<virtual_mailbox_base\>"
+syntax match pfmainRef "$\<virtual_mailbox_domains\>"
+syntax match pfmainRef "$\<virtual_mailbox_limit\>"
+syntax match pfmainRef "$\<virtual_mailbox_lock\>"
+syntax match pfmainRef "$\<virtual_mailbox_maps\>"
+syntax match pfmainRef "$\<virtual_maps\>"
+syntax match pfmainRef "$\<virtual_minimum_uid\>"
+syntax match pfmainRef "$\<virtual_transport\>"
+syntax match pfmainRef "$\<virtual_uid_maps\>"
+
+syntax keyword pfmainWord accept
+syntax keyword pfmainWord all
+syntax keyword pfmainWord always
+syntax keyword pfmainWord check_address_map
+syntax keyword pfmainWord check_ccert_access
+syntax keyword pfmainWord check_client_a_access
+syntax keyword pfmainWord check_client_access
+syntax keyword pfmainWord check_client_mx_access
+syntax keyword pfmainWord check_client_ns_access
+syntax keyword pfmainWord check_etrn_access
+syntax keyword pfmainWord check_helo_a_access
+syntax keyword pfmainWord check_helo_access
+syntax keyword pfmainWord check_helo_mx_access
+syntax keyword pfmainWord check_helo_ns_access
+syntax keyword pfmainWord check_policy_service
+syntax keyword pfmainWord check_recipient_a_access
+syntax keyword pfmainWord check_recipient_access
+syntax keyword pfmainWord check_recipient_maps
+syntax keyword pfmainWord check_recipient_mx_access
+syntax keyword pfmainWord check_recipient_ns_access
+syntax keyword pfmainWord check_relay_domains
+syntax keyword pfmainWord check_reverse_client_hostname_a_access
+syntax keyword pfmainWord check_reverse_client_hostname_access
+syntax keyword pfmainWord check_reverse_client_hostname_mx_access
+syntax keyword pfmainWord check_reverse_client_hostname_ns_access
+syntax keyword pfmainWord check_sasl_access
+syntax keyword pfmainWord check_sender_a_access
+syntax keyword pfmainWord check_sender_access
+syntax keyword pfmainWord check_sender_mx_access
+syntax keyword pfmainWord check_sender_ns_access
+syntax keyword pfmainWord class
+syntax keyword pfmainWord client_address
+syntax keyword pfmainWord client_port
+syntax keyword pfmainWord dane
+syntax keyword pfmainWord dane-only
+syntax keyword pfmainWord defer
+syntax keyword pfmainWord defer_if_permit
+syntax keyword pfmainWord defer_if_reject
+syntax keyword pfmainWord defer_unauth_destination
+syntax keyword pfmainWord disabled
+syntax keyword pfmainWord dns
+syntax keyword pfmainWord dnssec
+syntax keyword pfmainWord drop
+syntax keyword pfmainWord dunno
+syntax keyword pfmainWord enabled
+syntax keyword pfmainWord encrypt
+syntax keyword pfmainWord enforce
+syntax keyword pfmainWord envelope_recipient
+syntax keyword pfmainWord envelope_sender
+syntax keyword pfmainWord export
+syntax keyword pfmainWord fingerprint
+syntax keyword pfmainWord header_recipient
+syntax keyword pfmainWord header_sender
+syntax keyword pfmainWord high
+syntax keyword pfmainWord host
+syntax keyword pfmainWord ignore
+syntax keyword pfmainWord ipv4
+syntax keyword pfmainWord ipv6
+syntax keyword pfmainWord localtime
+syntax keyword pfmainWord low
+syntax keyword pfmainWord may
+syntax keyword pfmainWord maybe
+syntax keyword pfmainWord medium
+syntax keyword pfmainWord native
+syntax keyword pfmainWord never
+syntax keyword pfmainWord no_address_mappings
+syntax keyword pfmainWord no_header_body_checks
+syntax keyword pfmainWord no_header_reply
+syntax keyword pfmainWord no_milters
+syntax keyword pfmainWord no_unknown_recipient_checks
+syntax keyword pfmainWord none
+syntax keyword pfmainWord null
+syntax keyword pfmainWord off
+syntax keyword pfmainWord on
+syntax keyword pfmainWord permit
+syntax keyword pfmainWord permit_auth_destination
+syntax keyword pfmainWord permit_dnswl_client
+syntax keyword pfmainWord permit_inet_interfaces
+syntax keyword pfmainWord permit_mx_backup
+syntax keyword pfmainWord permit_mynetworks
+syntax keyword pfmainWord permit_naked_ip_address
+syntax keyword pfmainWord permit_rhswl_client
+syntax keyword pfmainWord permit_sasl_authenticated
+syntax keyword pfmainWord permit_tls_all_clientcerts
+syntax keyword pfmainWord permit_tls_clientcerts
+syntax keyword pfmainWord quarantine
+syntax keyword pfmainWord reject
+syntax keyword pfmainWord reject_authenticated_sender_login_mismatch
+syntax keyword pfmainWord reject_invalid_helo_hostname
+syntax keyword pfmainWord reject_invalid_hostname
+syntax keyword pfmainWord reject_known_sender_login_mismatch
+syntax keyword pfmainWord reject_maps_rbl
+syntax keyword pfmainWord reject_multi_recipient_bounce
+syntax keyword pfmainWord reject_non_fqdn_helo_hostname
+syntax keyword pfmainWord reject_non_fqdn_hostname
+syntax keyword pfmainWord reject_non_fqdn_recipient
+syntax keyword pfmainWord reject_non_fqdn_sender
+syntax keyword pfmainWord reject_plaintext_session
+syntax keyword pfmainWord reject_rbl
+syntax keyword pfmainWord reject_rbl_client
+syntax keyword pfmainWord reject_rhsbl_client
+syntax keyword pfmainWord reject_rhsbl_helo
+syntax keyword pfmainWord reject_rhsbl_recipient
+syntax keyword pfmainWord reject_rhsbl_reverse_client
+syntax keyword pfmainWord reject_rhsbl_sender
+syntax keyword pfmainWord reject_sender_login_mismatch
+syntax keyword pfmainWord reject_unauth_destination
+syntax keyword pfmainWord reject_unauth_pipelining
+syntax keyword pfmainWord reject_unauthenticated_sender_login_mismatch
+syntax keyword pfmainWord reject_unknown_address
+syntax keyword pfmainWord reject_unknown_client
+syntax keyword pfmainWord reject_unknown_client_hostname
+syntax keyword pfmainWord reject_unknown_forward_client_hostname
+syntax keyword pfmainWord reject_unknown_helo_hostname
+syntax keyword pfmainWord reject_unknown_hostname
+syntax keyword pfmainWord reject_unknown_recipient_domain
+syntax keyword pfmainWord reject_unknown_reverse_client_hostname
+syntax keyword pfmainWord reject_unknown_sender_domain
+syntax keyword pfmainWord reject_unlisted_recipient
+syntax keyword pfmainWord reject_unlisted_sender
+syntax keyword pfmainWord reject_unverified_recipient
+syntax keyword pfmainWord reject_unverified_sender
+syntax keyword pfmainWord secure
+syntax keyword pfmainWord server_name
+syntax keyword pfmainWord sleep
+syntax keyword pfmainWord smtpd_access_maps
+syntax keyword pfmainWord speed_adjust
+syntax keyword pfmainWord strong
+syntax keyword pfmainWord subnet
+syntax keyword pfmainWord tempfail
+syntax keyword pfmainWord ultra
+syntax keyword pfmainWord warn_if_reject
+syntax keyword pfmainWord CRYPTOPRO_TLSEXT_BUG
+syntax keyword pfmainWord DONT_INSERT_EMPTY_FRAGMENTS
+syntax keyword pfmainWord LEGACY_SERVER_CONNECT
+syntax keyword pfmainWord MICROSOFT_BIG_SSLV3_BUFFER
+syntax keyword pfmainWord MICROSOFT_SESS_ID_BUG
+syntax keyword pfmainWord MSIE_SSLV2_RSA_PADDING
+syntax keyword pfmainWord NETSCAPE_CHALLENGE_BUG
+syntax keyword pfmainWord NETSCAPE_REUSE_CIPHER_CHANGE_BUG
+syntax keyword pfmainWord SSLEAY_080_CLIENT_DH_BUG
+syntax keyword pfmainWord SSLREF2_REUSE_CERT_TYPE_BUG
+syntax keyword pfmainWord TLS_BLOCK_PADDING_BUG
+syntax keyword pfmainWord TLS_D5_BUG
+syntax keyword pfmainWord TLS_ROLLBACK_BUG
+
+syntax keyword pfmainDict	btree cidr environ hash nis pcre proxy regexp sdbm static tcp unix
+syntax keyword pfmainQueueDir	incoming active deferred corrupt hold
+syntax keyword pfmainTransport	smtp lmtp unix local relay uucp virtual
+syntax keyword pfmainLock	fcntl flock dotlock
+syntax keyword pfmainAnswer	yes no
+
+syntax match pfmainComment	"#.*$"
+syntax match pfmainNumber	"\<\d\+\>"
+syntax match pfmainTime		"\<\d\+[hmsd]\>"
+syntax match pfmainIP		"\<\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\>"
+syntax match pfmainVariable	"\$\w\+" contains=pfmainRef
+
+syntax match pfmainSpecial	"\<alias\>"
+syntax match pfmainSpecial	"\<canonical\>"
+syntax match pfmainSpecial	"\<forward\>"
+syntax match pfmainSpecial	"\<generic\>"
+syntax match pfmainSpecial	"\<include\>"
+syntax match pfmainSpecial	"\<virtual\>"
+
+syntax match pfmainSpecial	"\<delay_dotcrlf\>"
+syntax match pfmainSpecial	"\<disable_esmtp\>"
+
+syntax match pfmainSpecial	"\<res_defnames\>"
+syntax match pfmainSpecial	"\<res_dnsrch\>"
+
+syntax match pfmainSpecial	"\<command\>"
+syntax match pfmainSpecial	"\<file\>"
+
+syntax match pfmainSpecial	"\<forward_secrecy\>"
+syntax match pfmainSpecial	"\<mutual_auth\>"
+syntax match pfmainSpecial	"\<noactive\>"
+syntax match pfmainSpecial	"\<noanonymous\>"
+syntax match pfmainSpecial	"\<nodictionary\>"
+syntax match pfmainSpecial	"\<noplaintext\>"
+
+syntax match pfmainSpecial	"\<bounce\>"
+syntax match pfmainSpecial	"\<2bounce\>"
+syntax match pfmainSpecial	"\<data\>"
+syntax match pfmainSpecial	"\<delay\>"
+syntax match pfmainSpecial	"\<policy\>"
+syntax match pfmainSpecial	"\<protocol\>"
+syntax match pfmainSpecial	"\<resource\>"
+syntax match pfmainSpecial	"\<software\>"
+
+syntax match pfmainSpecial	"\<cleanup\>"
+syntax match pfmainSpecial	"\<cyrus\>"
+syntax match pfmainSpecial	"\<error\>"
+syntax match pfmainSpecial	"\<flush\>"
+syntax match pfmainSpecial	"\<notify\>"
+syntax match pfmainSpecial	"\<pickup\>"
+syntax match pfmainSpecial	"\<postdrop\>"
+syntax match pfmainSpecial	"\<qmgr\>"
+syntax match pfmainSpecial	"\<qmqpd\>"
+syntax match pfmainSpecial	"\<rewrite\>"
+syntax match pfmainSpecial	"\<scache\>"
+syntax match pfmainSpecial	"\<sendmail\>"
+syntax match pfmainSpecial	"\<showq\>"
+syntax match pfmainSpecial	"\<smtpd\>"
+syntax match pfmainSpecial	"\<trace\>"
+syntax match pfmainSpecial	"\<verify\>"
+
+
+hi def link pfmainConf	Statement
+hi def link pfmainRef	PreProc
+hi def link pfmainWord	identifier
+
+hi def link pfmainDict	Type
+hi def link pfmainQueueDir	Constant
+hi def link pfmainTransport	Constant
+hi def link pfmainLock	Constant
+hi def link pfmainAnswer	Constant
+
+hi def link pfmainComment	Comment
+hi def link pfmainNumber	Number
+hi def link pfmainTime	Number
+hi def link pfmainIP		Number
+hi def link pfmainVariable	Error
+hi def link pfmainSpecial	Special
+
+
+let b:current_syntax = "pfmain"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/pike.vim b/syntax/pike.vim
new file mode 100644
index 000000000..ffbdb362d
--- /dev/null
+++ b/syntax/pike.vim
@@ -0,0 +1,390 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pike') == -1
+
+" Vim syntax file
+" Language:		Pike
+" Maintainer:		Stephen R. van den Berg <srb@cuci.nl>
+" Maintainer of previous implementation: Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
+" Last Change:		2018 Jan 28
+" Version:		2.9
+" Remark: Derived from the C-syntax; fixed several bugs in the C-syntax
+" Remark: and extended it with the Pike syntax.
+" Remark: Includes a highlighter for all Pike types of parenthesis errors.
+" Remark: Includes a highlighter for SQL on multiline strings.
+" Remark: Includes a highlighter for any embedded Autodoc format.
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" For multiline strings, try formatting them as SQL
+syn include @pikeSQL <sfile>:p:h/sqloracle.vim
+unlet b:current_syntax
+
+" For embedded Autodoc documentation (WIP)
+syn include @pikeAutodoc <sfile>:p:h/autodoc.vim
+unlet b:current_syntax
+
+syn case match
+
+" Supports array, multiset, mapping multi-character delimiter matching
+" Supports rotating amongst several same-level preprocessor conditionals
+packadd! matchit
+let b:match_words = "({:}\\@1<=),(\\[:]\\@1<=),(<:>\\@1<=),^\s*#\s*\%(if\%(n\?def\)\|else\|el\%(se\)\?if\|endif\)\>"
+
+" A bunch of useful Pike keywords
+syn keyword	pikeDebug	gauge backtrace describe_backtrace werror _Static_assert static_assert
+syn keyword	pikeException	error catch throw
+syn keyword	pikeLabel	case default break return continue
+syn keyword	pikeConditional	if else switch
+syn keyword	pikeRepeat	while for foreach do
+
+syn keyword pikePredef RegGetKeyNames RegGetValue RegGetValues
+syn keyword pikePredef __automap__ __empty_program
+syn keyword pikePredef __handle_sprintf_format __parse_pike_type _disable_threads
+syn keyword pikePredef _do_call_outs _exit _gdb_breakpoint
+syn keyword pikePredef abs access acos acosh add_constant alarm all_constants
+syn keyword pikePredef array_sscanf asin asinh atan atan2 atanh atexit
+syn keyword pikePredef basetype call_function call_out call_out_info cd ceil
+syn keyword pikePredef combine_path combine_path_nt
+syn keyword pikePredef combine_path_unix compile copy_value cos cosh cpp crypt
+syn keyword pikePredef ctime decode_value delay encode_value encode_value_canonic
+syn keyword pikePredef enumerate errno exece exit exp file_stat file_truncate
+syn keyword pikePredef filesystem_stat find_call_out floor fork function_name
+syn keyword pikePredef function_object function_program gc
+syn keyword pikePredef get_active_compilation_handler get_active_error_handler
+syn keyword pikePredef get_all_groups get_all_users get_dir get_groups_for_user
+syn keyword pikePredef get_iterator get_profiling_info get_weak_flag getcwd
+syn keyword pikePredef getgrgid getgrnam gethrdtime gethrtime gethrvtime getpid
+syn keyword pikePredef getpwnam getpwuid getxattr glob gmtime has_index has_prefix
+syn keyword pikePredef has_suffix has_value hash hash_7_0 hash_7_4 hash_8_0
+syn keyword pikePredef hash_value kill limit listxattr load_module localtime
+syn keyword pikePredef log lower_case master max min mkdir mktime mv
+syn keyword pikePredef object_program pow query_num_arg random_seed
+syn keyword pikePredef remove_call_out removexattr replace_master rm round
+syn keyword pikePredef set_priority set_weak_flag setxattr sgn signal signame
+syn keyword pikePredef signum sin sinh sleep sort sprintf sqrt sscanf strerror
+syn keyword pikePredef string_filter_non_unicode string_to_unicode string_to_utf8
+syn keyword pikePredef tan tanh time trace types ualarm unicode_to_string
+syn keyword pikePredef upper_case utf8_to_string version
+
+syn keyword pikePredef write lock try_lock
+syn keyword pikePredef MutexKey Timestamp Date Time TimeTZ Interval Inet Range
+syn keyword pikePredef Null null inf nan
+
+syn keyword	pikeTodo		contained TODO FIXME XXX
+
+" Match parengroups: allows for highlighting indices of mappings and
+" highlighting semicolons that are out of place due to a paren imbalance
+syn cluster	pikePreShort	contains=pikeDefine,pikePreProc,pikeCppOutWrapper,pikeCppInWrapper,pikePreCondit,pikePreConditMatch
+syn cluster	pikeExprGroup	contains=pikeMappIndex,@pikeStmt,pikeNest,@pikeBadGroup,pikeSoftCast
+syn match	pikeWord	transparent contained /[^()'"[\]{},;:]\+/ contains=ALLBUT,@pikePreProcGroup,@pikeExprGroup
+syn match	pikeFirstWord	transparent display contained /^\s*#[^()'"[\]{},;:]\+/ contains=@pikePreShort
+syn cluster	pikeMappElm	contains=pikeMappIndex,@pikeStmt
+syn cluster	pikeStmt	contains=pikeFirstWord,pikeCharacter,pikeString,pikeMlString,pikeWord,pikeNest
+syn cluster     pikeBadGroup	contains=pikeBadPClose,pikeBadAClose,pikeBadBClose,pikeBadSPClose,pikeBadSAClose,pikeBadSBClose,pikeBadSClose,pikeBadSPAClose,pikeBadSBAClose
+syn match	pikeBadPClose	display contained "[}\]]"
+syn match	pikeBadAClose	display contained "[)\]]"
+syn match	pikeBadBClose	display contained "[)}]"
+syn match	pikeBadSPClose	display contained "[;}\]]"
+syn match	pikeBadSAClose	display contained "[;)\]]"
+syn match	pikeBadSPAClose	display contained "[;\]]"
+syn match	pikeBadSBAClose	display contained "[;}]"
+syn match	pikeBadSClose	display contained "[;)}\]]"
+syn region	pikeNest	transparent start="(\@1<!{" end="}" contains=@pikeStmt,pikeUserLabel,pikeBadAClose
+syn region	pikeNest	transparent start="\%(\<for\%(each\)\?\s\?\)\@8<!([[{<]\@!" end=")" contains=@pikeStmt,pikeBadSPClose
+syn region	pikeNest	transparent start="\%(\<for\%(each\)\?\s\?\)\@8<=(" end=")" contains=@pikeStmt,pikeBadPClose
+syn region	pikeNest	transparent start="(\@1<!\[" end="]" contains=@pikeStmt,pikeBadSBClose
+syn region	pikeNest	transparent start="(\zs\[" end="])" contains=@pikeMappElm,pikeBadSBAClose
+" For some reason specifying a matchgroup on the pikeNest below makes it
+" override the shorter variant; consider it a kludge, no idea why it works
+syn region	pikeNest	transparent matchgroup=pikeSoftCast start=%(\zs\[[ \t\v\r\n.a-zA-Z0-9_():,|]\+])\@!% end=")" contains=@pikeStmt
+syn region	pikeNest	transparent start="(\zs{" end="})" contains=@pikeStmt,pikeBadSPAClose
+syn region	pikeNest	transparent start="(\zs<" end=">)" contains=@pikeStmt,pikeBadSPClose keepend
+
+" It's easy to accidentally add a space after a backslash that was intended
+" for line continuation.  Some compilers allow it, which makes it
+" unpredictable and should be avoided.
+syn match	pikeBadContinuation contained "\\\s\+$"
+
+" pikeCommentGroup allows adding matches for special things in comments
+syn cluster	pikeCommentGroup	contains=pikeTodo,pikeBadContinuation
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match	pikeSpecial	display contained "\\\%(x\x*\|d\d*\|\o\+\|u\x\{4}\|U\x\{8}\|[abefnrtv]\|$\)"
+
+" ISO C11 or ISO C++ 11
+if !exists("c_no_cformat")
+  " Highlight % items in strings.
+  syn match	pikeFormat		display "%\%(\d\+\$\)\=[-+' #0*]*\%(\d*\|\*\|\*\d\+\$\)\%(\.\%(\d*\|\*\|\*\d\+\$\)\)\=\%([hlLjzt]\|ll\|hh\)\=\%([aAbdiuoxXDOUfFeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
+  syn match	pikeFormat		display "%%" contained
+  syn region 	pikeString		start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=pikeSpecial,pikeDelimiterDQ,pikeFormat,@Spell keepend
+  syn region	pikeMlString	start=+#"+ skip=+\\\\\|\\"+ end=+"+ contains=pikeSpecial,pikeFormat,pikeDelimiterDQ,@Spell,pikeEmbeddedString keepend
+else
+  syn region 	pikeString		start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=pikeSpecial,pikeDelimiterDQ,@Spell
+  syn region	pikeMlString	transparent start=+#"+ skip=+\\\\\|\\"+ end=+"+ contains=pikeSpecial,pikeDelimiterDQ,@Spell,pikeEmbeddedString keepend
+endif
+
+" Use SQL-syntax highlighting in multiline string if it starts with
+" a standard SQL keyword
+syn case ignore
+" FIXME Use explicit newline match to cover up a bug in the regexp engine
+" If the kludge is not used, the match will only start unless at least a space
+" follows the initial doublequote on the first line (or the keyword is on
+" the first line).
+syn region	pikeEmbeddedString	contained start=+\%(#"\n\?\)\@2<=\_s*\%(SELECT\|INSERT\|UPDATE\|DELETE\|WITH\|CREATE\|DROP\|ALTER\)\>+ skip=+\\\\\|\\"+ end=+[\\#]\@1<!"+ contains=@pikeSQL,pikeBindings keepend
+syn case match
+
+syn match	pikeBindings	display contained ":\@1<!:\I\i*"
+
+syn match	pikeCharacter	"'[^\\']'" contains=pikeDelimiterSQ
+syn match	pikeCharacter	"'[^']*'" contains=pikeSpecial,pikeDelimiterSQ
+syn match	pikeSpecialError	"'\\[^'\"?\\abefnrtv]'"
+syn match	pikeDelimiterDQ	display +"+ contained
+syn match	pikeDelimiterSQ	display +'+ contained
+
+"when wanted, highlight trailing white space
+if exists("c_space_errors")
+  if !exists("c_no_trail_space_error")
+    syn match	pikeSpaceError	display excludenl "\s\+$"
+  endif
+  if !exists("c_no_tab_space_error")
+    syn match	pikeSpaceError	display " \+\ze\t"
+  endif
+endif
+
+"integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match	pikeNumbers	display transparent "\<\d\|\.\d" contains=pikeNumber,pikeFloat,pikeOctalError,pikeOctal
+" Same, but without octal error (for comments)
+syn match	pikeNumbersCom	display contained transparent "\<\d\|\.\d" contains=pikeNumber,pikeFloat,pikeOctal
+syn match	pikeNumber		display contained "\<\d\+\%(u\=l\{0,2}\|ll\=u\)\>"
+"hex number
+syn match	pikeNumber		display contained "\<0x\x\+\%(u\=l\{0,2}\|ll\=u\)\>"
+" Flag the first zero of an octal number as something special
+syn match	pikeOctal		display contained "\<0\o\+\%(u\=l\{0,2}\|ll\=u\)\>" contains=pikeOctalZero
+syn match	pikeOctalZero	display contained "\<0"
+"floating point number, with dot, optional exponent
+syn match	pikeFloat		display contained "\<\d\+\%(f\|\.[0-9.]\@!\d*\%(e[-+]\=\d\+\)\=[fl]\=\)"
+"floating point number, starting with a dot, optional exponent
+syn match	pikeFloat		display contained "[0-9.]\@1<!\.\d\+\%(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+syn match	pikeFloat		display contained "\<\d\+e[-+]\=\d\+[fl]\=\>"
+
+"hexadecimal floating point number, two variants, with exponent
+syn match	pikeFloat		display contained "\<0x\%(\x\+\.\?\|\x*\.\x\+\)p[-+]\=\d\+[fl]\=\>"
+
+" flag an octal number with wrong digits
+syn match	pikeOctalError	display contained "\<0\o*[89]\d*"
+syn case match
+
+if exists("c_comment_strings")
+  " A comment can contain pikeString, pikeCharacter and pikeNumber.
+  " But a "*/" inside a pikeString in a pikeComment DOES end the comment!  So we
+  " need to use a special type of pikeString: pikeCommentString, which also ends on
+  " "*/", and sees a "*" at the start of the line as comment again.
+  " Unfortunately this doesn't very well work for // type of comments :-(
+  syn match	pikeCommentSkip	contained "^\s*\*\%($\|\s\+\)"
+  syn region pikeCommentString	contained start=+\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+\ze\*/+ contains=pikeSpecial,pikeCommentSkip
+  syn region pikeComment2String	contained start=+\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=pikeSpecial
+  syn region  pikeCommentL	start="//" skip="\\$" end="$" keepend contains=@pikeCommentGroup,pikeComment2String,pikeCharacter,pikeNumbersCom,pikeSpaceError,@Spell containedin=pikeWord,pikeFirstWord
+  if exists("c_no_comment_fold")
+    " Use "extend" here to have preprocessor lines not terminate halfway a
+    " comment.
+    syn region pikeComment	matchgroup=pikeCommentStart start="/\*" end="\*/" contains=@pikeCommentGroup,pikeCommentStartError,pikeCommentString,pikeCharacter,pikeNumbersCom,pikeSpaceError,@Spell extend containedin=pikeWord,pikeFirstWord
+  else
+    syn region pikeComment	matchgroup=pikeCommentStart start="/\*" end="\*/" contains=@pikeCommentGroup,pikeCommentStartError,pikeCommentString,pikeCharacter,pikeNumbersCom,pikeSpaceError,@Spell fold extend containedin=pikeWord,pikeFirstWord
+  endif
+else
+  syn region	pikeCommentL	start="//" skip="\\$" end="$" keepend contains=@pikeCommentGroup,pikeSpaceError,@Spell containedin=pikeWord,pikeFirstWord
+  if exists("c_no_comment_fold")
+    syn region	pikeComment	matchgroup=pikeCommentStart start="/\*" end="\*/" contains=@pikeCommentGroup,pikeCommentStartError,pikeSpaceError,@Spell extend containedin=pikeWord,pikeFirstWord
+  else
+    syn region	pikeComment	matchgroup=pikeCommentStart start="/\*" end="\*/" contains=@pikeCommentGroup,pikeCommentStartError,pikeSpaceError,@Spell fold extend containedin=pikeWord,pikeFirstWord
+  endif
+endif
+" keep a // comment separately, it terminates a preproc. conditional
+syn match	pikeCommentError	display "\*/"
+syn match	pikeCommentStartError display "/\ze\*" contained
+
+syn keyword	pikeOperator	sizeof
+syn keyword	pikeOperator	typeof _typeof _refs
+syn keyword	pikeOperator	zero_type intp stringp arrayp mappingp multisetp
+syn keyword	pikeOperator	objectp functionp programp callablep destructedp
+syn keyword	pikeOperator	object_variablep undefinedp
+syn keyword	pikeOperator	allocate equal
+syn keyword	pikeOperator	aggregate aggregate_mapping aggregate_multiset
+syn keyword	pikeOperator	map filter search replace reverse column rows
+syn keyword	pikeOperator	indices values mkmapping mkmultiset m_delete sort
+syn keyword	pikeOperator	m_delete destruct
+syn keyword	pikeOperator	create _destruct _sprintf cast _encode _decode
+syn keyword     pikeOperator    __hash _sizeof _values _indices __INIT _equal
+syn keyword     pikeOperator    _is_type _m_delete _get_iterator _search
+syn keyword     pikeOperator    _serialize _deserialize _sqrt _types _random
+syn keyword     pikeOperator    _size_object
+
+syn keyword	pikeType		int void
+syn keyword	pikeType		float
+syn keyword	pikeType		bool string array mapping multiset mixed
+syn keyword	pikeType		object function program auto
+
+syn keyword	pikeType		this this_object this_program
+syn keyword	pikeType		sprintf_args sprintf_format sprintf_result
+syn keyword	pikeType		strict_sprintf_format
+
+syn keyword	pikeStructure		class enum typedef inherit import
+syn keyword	pikeTypedef		typedef
+syn keyword	pikeStorageClass	private protected public constant final variant
+syn keyword	pikeStorageClass	optional inline extern static __deprecated__ lambda
+
+syn keyword pikeConstant __LINE__ __FILE__ __DIR__ __DATE__ __TIME__
+syn keyword pikeConstant __AUTO_BIGNUM__ __NT__
+syn keyword pikeConstant __BUILD__ __COUNTER__ _MAJOR__ __MINOR__ __VERSION__
+syn keyword pikeConstant __REAL_BUILD__ _REAL_MAJOR__ __REAL_MINOR__
+syn keyword pikeConstant __REAL_VERSION__ __PIKE__ UNDEFINED
+
+" These should actually only be parsed in preprocessor conditionals
+syn keyword pikeCppOperator contained defined constant efun _Pragma
+
+syn keyword pikeBoolean true false
+
+syn match       pikeCppPrefix	display "^\s*\zs#\s*[a-z]\+" contained
+syn region	pikePreCondit	start="^\s*#\s*\%(if\%(n\?def\)\?\|el\%(se\)\?if\)\>" skip="\\$" end="$" transparent keepend contains=pikeString,pikeCharacter,pikeNumbers,pikeCommentError,pikeSpaceError,pikeCppOperator,pikeCppPrefix
+syn match	pikePreConditMatch	display "^\s*\zs#\s*\%(else\|endif\)\>"
+if !exists("c_no_if0")
+  syn cluster	pikeCppOutInGroup	contains=pikeCppInIf,pikeCppInElse,pikeCppInElse2,pikeCppOutIf,pikeCppOutIf2,pikeCppOutElse,pikeCppInSkip,pikeCppOutSkip
+  syn region	pikeCppOutWrapper	start="^\s*\zs#\s*if\s\+0\+\s*\%($\|//\|/\*\|&\)" end=".\@=\|$" contains=pikeCppOutIf,pikeCppOutElse,@NoSpell fold
+  syn region	pikeCppOutIf	contained start="0\+" matchgroup=pikeCppOutWrapper end="^\s*#\s*endif\>" contains=pikeCppOutIf2,pikeCppOutElse
+  if !exists("c_no_if0_fold")
+    syn region	pikeCppOutIf2	contained matchgroup=pikeCppOutWrapper start="0\+" end="^\ze\s*#\s*\%(else\>\|el\%(se\)\?if\s\+\%(0\+\s*\%($\|//\|/\*\|&\)\)\@!\|endif\>\)" contains=pikeSpaceError,pikeCppOutSkip,@Spell fold
+  else
+    syn region	pikeCppOutIf2	contained matchgroup=pikeCppOutWrapper start="0\+" end="^\ze\s*#\s*\%(else\>\|el\%(se\)\?if\s\+\%(0\+\s*\%($\|//\|/\*\|&\)\)\@!\|endif\>\)" contains=pikeSpaceError,pikeCppOutSkip,@Spell
+  endif
+  syn region	pikeCppOutElse	contained matchgroup=pikeCppOutWrapper start="^\s*#\s*\%(else\|el\%(se\)\?if\)" end="^\s*#\s*endif\>" contains=TOP,pikePreCondit
+  syn region	pikeCppInWrapper	start="^\s*\zs#\s*if\s\+0*[1-9]\d*\s*\%($\|//\|/\*\||\)" end=".\@=\|$" contains=pikeCppInIf,pikeCppInElse fold
+  syn region	pikeCppInIf	contained matchgroup=pikeCppInWrapper start="\d\+" end="^\s*#\s*endif\>" contains=TOP,pikePreCondit
+  if !exists("c_no_if0_fold")
+    syn region	pikeCppInElse	contained start="^\s*#\s*\%(else\>\|el\%(se\)\?if\s\+\%(0*[1-9]\d*\s*\%($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=pikeCppInIf contains=pikeCppInElse2 fold
+  else
+    syn region	pikeCppInElse	contained start="^\s*#\s*\%(else\>\|el\%(se\)\?if\s\+\%(0*[1-9]\d*\s*\%($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=pikeCppInIf contains=pikeCppInElse2
+  endif
+  syn region	pikeCppInElse2	contained matchgroup=pikeCppInWrapper start="^\s*#\s*\%(else\|el\%(se\)\?if\)\%([^/]\|/[^/*]\)*" end="^\ze\s*#\s*endif\>" contains=pikeSpaceError,pikeCppOutSkip,@Spell
+  syn region	pikeCppOutSkip	contained start="^\s*#\s*if\%(n\?def\)\?\>" skip="\\$" end="^\s*#\s*endif\>" contains=pikeSpaceError,pikeCppOutSkip
+  syn region	pikeCppInSkip	contained matchgroup=pikeCppInWrapper start="^\s*#\s*\%(if\s\+\%(\d\+\s*\%($\|//\|/\*\||\|&\)\)\@!\|ifn\?def\>\)" skip="\\$" end="^\s*#\s*endif\>" containedin=pikeCppOutElse,pikeCppInIf,pikeCppInSkip contains=TOP,pikePreProc
+endif
+syn region	pikeIncluded	display contained start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=pikeDelimiterDQ keepend
+syn match	pikeIncluded	display contained "<[^>]*>"
+syn match	pikeInclude	display "^\s*\zs#\s*include\>\s*["<]" contains=pikeIncluded
+syn cluster	pikePreProcGroup	contains=pikeIncluded,pikeInclude,pikeEmbeddedString,pikeCppOutWrapper,pikeCppInWrapper,@pikeCppOutInGroup,pikeFormat,pikeMlString,pikeCommentStartError,@pikeBadGroup,pikeWord
+syn region	pikeDefine		start="^\s*\zs#\s*\%(define\|undef\)\>" skip="\\$" end="$" keepend contains=@pikeStmt,@pikeBadGroup
+syn region	pikePreProc	start="^\s*\zs#\s*\%(pragma\|charset\|pike\|require\|string\|line\|warning\|error\)\>" skip="\\$" end="$" transparent keepend contains=pikeString,pikeCharacter,pikeNumbers,pikeCommentError,pikeSpaceError,pikeCppOperator,pikeCppPrefix,@Spell,pikeConstant
+
+syn match	pikeAutodocReal	display contained "\%(//\|[/ \t\v]\*\|^\*\)\@2<=!.*" contains=@pikeAutodoc containedin=pikeComment,pikeCommentL
+syn cluster pikeCommentGroup add=pikeAutodocReal
+syn cluster pikePreProcGroup add=pikeAutodocReal
+
+" Highlight User Labels
+" Avoid matching foo::bar() in C++ by requiring that the next char is not ':'
+syn match	pikeUserLabel	display "\%(^\|[{};]\)\zs\I\i*\s*\ze:\%([^:]\|$\)" contained contains=NONE
+syn match	pikeUserLabel	display "\%(\<\%(break\|continue\)\_s\+\)\@10<=\I\i*" contained contains=NONE
+syn match	pikeUserLabel	display "\%(\<case\)\@5<=\s\+[^<()[\]{},;:]\+\ze::\@!" contained contains=pikeDelimiterDQ,pikeDelimiterSQ
+
+syn match	pikeMappIndex	display contained "[^<()[\]{},;:]\+\ze::\@!" contains=pikeDelimiterDQ,pikeDelimiterSQ
+syn match	pikeSoftCast	display contained "\[[ \t\v\r\n.a-zA-Z0-9_():,|\+]" contains=NONE
+
+if exists("c_minlines")
+  let b:c_minlines = c_minlines
+else
+  if !exists("c_no_if0")
+    let b:c_minlines = 400	" #if 0 constructs can be long
+  else
+    let b:c_minlines = 200	" mostly for multiline strings
+  endif
+endif
+exec "syn sync ccomment pikeComment minlines=" . b:c_minlines
+syn sync match pikeMlStringSync grouphere pikeMlString +^[^"#]\+#\"+
+syn sync match pikeAutodocSync grouphere pikeCommentL "^\s*//!"
+
+" Define the default highlighting.
+" Only used when an item doesn't have highlighting yet
+hi def link pikeFormat		SpecialChar
+hi def link pikeMlString	String
+hi def link pikeCommentL	Comment
+hi def link pikeCommentStart	Comment
+hi def link pikeLabel		Label
+hi def link pikeUserLabel	Identifier
+hi def link pikeConditional	Conditional
+hi def link pikeRepeat		Repeat
+hi def link pikeCharacter	Character
+hi def link pikeDelimiterDQ	Delimiter
+hi def link pikeDelimiterSQ	Delimiter
+hi def link pikeNumber		Number
+hi def link pikeOctal		Number
+hi def link pikeOctalZero	PreProc	 " link this to Error if you want
+hi def link pikeFloat		Float
+hi def link pikeOctalError	Error
+hi def link pikeCommentError	Error
+hi def link pikeCommentStartError	Error
+hi def link pikeSpaceError	Error
+hi def link pikeSpecialError	Error
+hi def link pikeOperator	Operator
+hi def link pikeCppOperator	Operator
+hi def link pikeStructure	Structure
+hi def link pikeTypedef		Typedef
+hi def link pikeStorageClass	StorageClass
+hi def link pikeInclude		Include
+hi def link pikeCppPrefix	PreCondit
+hi def link pikePreProc		PreProc
+hi def link pikeDefine		Macro
+hi def link pikeIncluded	String
+hi def link pikeError		Error
+hi def link pikeDebug		Debug
+hi def link pikeException	Exception
+hi def link pikeStatement	Statement
+hi def link pikeType		Type
+hi def link pikeConstant	Constant
+hi def link pikeBoolean		Boolean
+hi def link pikeCommentString	String
+hi def link pikeComment2String	String
+hi def link pikeCommentSkip	Comment
+hi def link pikeString		String
+hi def link pikeComment		Comment
+hi def link pikeSpecial		SpecialChar
+hi def link pikeTodo		Todo
+hi def link pikeBadContinuation	Error
+
+hi def link pikeCppInWrapper	PreCondit
+hi def link pikeCppOutWrapper	PreCondit
+hi def link pikePreConditMatch	PreCondit
+
+hi def link pikeCppOutSkip	Comment
+hi def link pikeCppInElse2	Comment
+hi def link pikeCppOutIf2	Comment
+hi def link pikeCppOut		Comment
+
+hi def link pikePredef		Statement
+hi def link pikeBindings	Identifier
+hi def link pikeMappIndex	Identifier
+hi def link pikeSoftCast	Type
+hi def link pikeBadGroup	Error
+hi def link pikeBadPClose	Error
+hi def link pikeBadAClose	Error
+hi def link pikeBadBClose	Error
+hi def link pikeBadSPClose	Error
+hi def link pikeBadSAClose	Error
+hi def link pikeBadSBClose	Error
+hi def link pikeBadSPAClose	Error
+hi def link pikeBadSBAClose	Error
+hi def link pikeBadSClose	Error
+
+let b:current_syntax = "pike"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/pilrc.vim b/syntax/pilrc.vim
new file mode 100644
index 000000000..fdb80ca05
--- /dev/null
+++ b/syntax/pilrc.vim
@@ -0,0 +1,140 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pilrc') == -1
+
+" Vim syntax file
+" Language:	pilrc - a resource compiler for Palm OS development
+" Maintainer:	Brian Schau <brian@schau.com>
+" Last change:	2003 May 11
+" Available on:	http://www.schau.com/pilrcvim/pilrc.vim
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+syn case ignore
+
+" Notes: TRANSPARENT, FONT and FONT ID are defined in the specials
+"	 section below.   Beware of the order of the specials!
+"	 Look in the syntax.txt and usr_27.txt files in vim\vim{version}\doc
+"	 directory for regexps etc.
+
+" Keywords - basic
+syn keyword pilrcKeyword ALERT APPLICATION APPLICATIONICONNAME AREA
+syn keyword pilrcKeyword BITMAP BITMAPCOLOR BITMAPCOLOR16 BITMAPCOLOR16K
+syn keyword pilrcKeyword BITMAPFAMILY BITMAPFAMILYEX BITMAPFAMILYSPECIAL
+syn keyword pilrcKeyword BITMAPGREY BITMAPGREY16 BITMAPSCREENFAMILY
+syn keyword pilrcKeyword BOOTSCREENFAMILY BUTTON BUTTONS BYTELIST
+syn keyword pilrcKeyword CATEGORIES CHECKBOX COUNTRYLOCALISATION
+syn keyword pilrcKeyword DATA
+syn keyword pilrcKeyword FEATURE FIELD FONTINDEX FORM FORMBITMAP
+syn keyword pilrcKeyword GADGET GENERATEHEADER
+syn keyword pilrcKeyword GRAFFITIINPUTAREA GRAFFITISTATEINDICATOR
+syn keyword pilrcKeyword HEX
+syn keyword pilrcKeyword ICON ICONFAMILY ICONFAMILYEX INTEGER
+syn keyword pilrcKeyword KEYBOARD
+syn keyword pilrcKeyword LABEL LAUNCHERCATEGORY LIST LONGWORDLIST
+syn keyword pilrcKeyword MENU MENUITEM MESSAGE  MIDI
+syn keyword pilrcKeyword PALETTETABLE POPUPLIST POPUPTRIGGER
+syn keyword pilrcKeyword PULLDOWN PUSHBUTTON
+syn keyword pilrcKeyword REPEATBUTTON RESETAUTOID
+syn keyword pilrcKeyword SCROLLBAR SELECTORTRIGGER SLIDER SMALLICON
+syn keyword pilrcKeyword SMALLICONFAMILY SMALLICONFAMILYEX STRING STRINGTABLE
+syn keyword pilrcKeyword TABLE TITLE TRANSLATION TRAP
+syn keyword pilrcKeyword VERSION
+syn keyword pilrcKeyword WORDLIST
+
+" Types
+syn keyword pilrcType AT AUTOSHIFT
+syn keyword pilrcType BACKGROUNDID BITMAPID BOLDFRAME BPP
+syn keyword pilrcType CHECKED COLORTABLE COLUMNS COLUMNWIDTHS COMPRESS
+syn keyword pilrcType COMPRESSBEST COMPRESSPACKBITS COMPRESSRLE COMPRESSSCANLINE
+syn keyword pilrcType CONFIRMATION COUNTRY CREATOR CURRENCYDECIMALPLACES
+syn keyword pilrcType CURRENCYNAME CURRENCYSYMBOL CURRENCYUNIQUESYMBOL
+syn keyword pilrcType DATEFORMAT DAYLIGHTSAVINGS DEFAULTBTNID DEFAULTBUTTON
+syn keyword pilrcType DENSITY DISABLED DYNAMICSIZE
+syn keyword pilrcType EDITABLE ENTRY ERROR EXTENDED
+syn keyword pilrcType FEEDBACK FILE FONTID FORCECOMPRESS FRAME
+syn keyword pilrcType GRAFFITI GRAPHICAL GROUP
+syn keyword pilrcType HASSCROLLBAR HELPID
+syn keyword pilrcType ID INDEX INFORMATION
+syn keyword pilrcType KEYDOWNCHR KEYDOWNKEYCODE KEYDOWNMODIFIERS
+syn keyword pilrcType LANGUAGE LEFTALIGN LEFTANCHOR LONGDATEFORMAT
+syn keyword pilrcType MAX MAXCHARS MEASUREMENTSYSTEM MENUID MIN LOCALE
+syn keyword pilrcType MINUTESWESTOFGMT MODAL MULTIPLELINES
+syn keyword pilrcType NAME NOCOLORTABLE NOCOMPRESS NOFRAME NONEDITABLE
+syn keyword pilrcType NONEXTENDED NONUSABLE NOSAVEBEHIND NUMBER NUMBERFORMAT
+syn keyword pilrcType NUMERIC
+syn keyword pilrcType PAGESIZE
+syn keyword pilrcType RECTFRAME RIGHTALIGN RIGHTANCHOR ROWS
+syn keyword pilrcType SAVEBEHIND SEARCH SCREEN SELECTEDBITMAPID SINGLELINE
+syn keyword pilrcType THUMBID TRANSPARENTINDEX TIMEFORMAT
+syn keyword pilrcType UNDERLINED USABLE
+syn keyword pilrcType VALUE VERTICAL VISIBLEITEMS
+syn keyword pilrcType WARNING WEEKSTARTDAY
+
+" Country
+syn keyword pilrcCountry Australia Austria Belgium Brazil Canada Denmark
+syn keyword pilrcCountry Finland France Germany HongKong Iceland Indian
+syn keyword pilrcCountry Indonesia Ireland Italy Japan Korea Luxembourg Malaysia
+syn keyword pilrcCountry Mexico Netherlands NewZealand Norway Philippines
+syn keyword pilrcCountry RepChina Singapore Spain Sweden Switzerland Thailand
+syn keyword pilrcCountry Taiwan UnitedKingdom UnitedStates
+
+" Language
+syn keyword pilrcLanguage English French German Italian Japanese Spanish
+
+" String
+syn match pilrcString "\"[^"]*\""
+
+" Number
+syn match pilrcNumber "\<0x\x\+\>"
+syn match pilrcNumber "\<\d\+\>"
+
+" Comment
+syn region pilrcComment start="/\*" end="\*/"
+syn region pilrcComment start="//" end="$"
+
+" Constants
+syn keyword pilrcConstant AUTO AUTOID BOTTOM CENTER PREVBOTTOM PREVHEIGHT
+syn keyword pilrcConstant PREVLEFT PREVRIGHT PREVTOP PREVWIDTH RIGHT
+syn keyword pilrcConstant SEPARATOR
+
+" Identifier
+syn match pilrcIdentifier "\<\h\w*\>"
+
+" Specials
+syn match pilrcType "\<FONT\>"
+syn match pilrcKeyword "\<FONT\>\s*\<ID\>"
+syn match pilrcType "\<TRANSPARENT\>"
+
+" Function
+syn keyword pilrcFunction BEGIN END
+
+" Include
+syn match pilrcInclude "\#include"
+syn match pilrcInclude "\#define"
+syn keyword pilrcInclude equ
+syn keyword pilrcInclude package
+syn region pilrcInclude start="public class" end="}"
+
+syn sync ccomment pilrcComment
+
+
+" The default methods for highlighting
+hi def link pilrcKeyword		Statement
+hi def link pilrcType		Type
+hi def link pilrcError		Error
+hi def link pilrcCountry		SpecialChar
+hi def link pilrcLanguage		SpecialChar
+hi def link pilrcString		SpecialChar
+hi def link pilrcNumber		Number
+hi def link pilrcComment		Comment
+hi def link pilrcConstant		Constant
+hi def link pilrcFunction		Function
+hi def link pilrcInclude		SpecialChar
+hi def link pilrcIdentifier		Number
+
+
+let b:current_syntax = "pilrc"
+
+endif
diff --git a/syntax/pine.vim b/syntax/pine.vim
new file mode 100644
index 000000000..5bc607b76
--- /dev/null
+++ b/syntax/pine.vim
@@ -0,0 +1,359 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pine') == -1
+
+" Vim syntax file
+" Language:	Pine (email program) run commands
+" Maintainer:	David Pascoe <pascoedj@spamcop.net>
+" Last Change:	Thu Feb 27 10:18:48 WST 2003, update for pine 4.53
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword=@,48-57,_,128-167,224-235,-
+
+syn keyword pineConfig addrbook-sort-rule
+syn keyword pineConfig address-book
+syn keyword pineConfig addressbook-formats
+syn keyword pineConfig alt-addresses
+syn keyword pineConfig bugs-additional-data
+syn keyword pineConfig bugs-address
+syn keyword pineConfig bugs-fullname
+syn keyword pineConfig character-set
+syn keyword pineConfig color-style
+syn keyword pineConfig compose-mime
+syn keyword pineConfig composer-wrap-column
+syn keyword pineConfig current-indexline-style
+syn keyword pineConfig cursor-style
+syn keyword pineConfig customized-hdrs
+syn keyword pineConfig debug-memory
+syn keyword pineConfig default-composer-hdrs
+syn keyword pineConfig default-fcc
+syn keyword pineConfig default-saved-msg-folder
+syn keyword pineConfig disable-these-authenticators
+syn keyword pineConfig disable-these-drivers
+syn keyword pineConfig display-filters
+syn keyword pineConfig download-command
+syn keyword pineConfig download-command-prefix
+syn keyword pineConfig editor
+syn keyword pineConfig elm-style-save
+syn keyword pineConfig empty-header-message
+syn keyword pineConfig fcc-name-rule
+syn keyword pineConfig feature-level
+syn keyword pineConfig feature-list
+syn keyword pineConfig file-directory
+syn keyword pineConfig folder-collections
+syn keyword pineConfig folder-extension
+syn keyword pineConfig folder-sort-rule
+syn keyword pineConfig font-char-set
+syn keyword pineConfig font-name
+syn keyword pineConfig font-size
+syn keyword pineConfig font-style
+syn keyword pineConfig forced-abook-entry
+syn keyword pineConfig form-letter-folder
+syn keyword pineConfig global-address-book
+syn keyword pineConfig goto-default-rule
+syn keyword pineConfig header-in-reply
+syn keyword pineConfig image-viewer
+syn keyword pineConfig inbox-path
+syn keyword pineConfig incoming-archive-folders
+syn keyword pineConfig incoming-folders
+syn keyword pineConfig incoming-startup-rule
+syn keyword pineConfig index-answered-background-color
+syn keyword pineConfig index-answered-foreground-color
+syn keyword pineConfig index-deleted-background-color
+syn keyword pineConfig index-deleted-foreground-color
+syn keyword pineConfig index-format
+syn keyword pineConfig index-important-background-color
+syn keyword pineConfig index-important-foreground-color
+syn keyword pineConfig index-new-background-color
+syn keyword pineConfig index-new-foreground-color
+syn keyword pineConfig index-recent-background-color
+syn keyword pineConfig index-recent-foreground-color
+syn keyword pineConfig index-to-me-background-color
+syn keyword pineConfig index-to-me-foreground-color
+syn keyword pineConfig index-unseen-background-color
+syn keyword pineConfig index-unseen-foreground-color
+syn keyword pineConfig initial-keystroke-list
+syn keyword pineConfig kblock-passwd-count
+syn keyword pineConfig keylabel-background-color
+syn keyword pineConfig keylabel-foreground-color
+syn keyword pineConfig keyname-background-color
+syn keyword pineConfig keyname-foreground-color
+syn keyword pineConfig last-time-prune-questioned
+syn keyword pineConfig last-version-used
+syn keyword pineConfig ldap-servers
+syn keyword pineConfig literal-signature
+syn keyword pineConfig local-address
+syn keyword pineConfig local-fullname
+syn keyword pineConfig mail-check-interval
+syn keyword pineConfig mail-directory
+syn keyword pineConfig mailcap-search-path
+syn keyword pineConfig mimetype-search-path
+syn keyword pineConfig new-version-threshold
+syn keyword pineConfig news-active-file-path
+syn keyword pineConfig news-collections
+syn keyword pineConfig news-spool-directory
+syn keyword pineConfig newsrc-path
+syn keyword pineConfig nntp-server
+syn keyword pineConfig normal-background-color
+syn keyword pineConfig normal-foreground-color
+syn keyword pineConfig old-style-reply
+syn keyword pineConfig operating-dir
+syn keyword pineConfig patterns
+syn keyword pineConfig patterns-filters
+syn keyword pineConfig patterns-filters2
+syn keyword pineConfig patterns-indexcolors
+syn keyword pineConfig patterns-other
+syn keyword pineConfig patterns-roles
+syn keyword pineConfig patterns-scores
+syn keyword pineConfig patterns-scores2
+syn keyword pineConfig personal-name
+syn keyword pineConfig personal-print-category
+syn keyword pineConfig personal-print-command
+syn keyword pineConfig postponed-folder
+syn keyword pineConfig print-font-char-set
+syn keyword pineConfig print-font-name
+syn keyword pineConfig print-font-size
+syn keyword pineConfig print-font-style
+syn keyword pineConfig printer
+syn keyword pineConfig prompt-background-color
+syn keyword pineConfig prompt-foreground-color
+syn keyword pineConfig pruned-folders
+syn keyword pineConfig pruning-rule
+syn keyword pineConfig quote1-background-color
+syn keyword pineConfig quote1-foreground-color
+syn keyword pineConfig quote2-background-color
+syn keyword pineConfig quote2-foreground-color
+syn keyword pineConfig quote3-background-color
+syn keyword pineConfig quote3-foreground-color
+syn keyword pineConfig read-message-folder
+syn keyword pineConfig remote-abook-history
+syn keyword pineConfig remote-abook-metafile
+syn keyword pineConfig remote-abook-validity
+syn keyword pineConfig reply-indent-string
+syn keyword pineConfig reply-leadin
+syn keyword pineConfig reverse-background-color
+syn keyword pineConfig reverse-foreground-color
+syn keyword pineConfig rsh-command
+syn keyword pineConfig rsh-open-timeout
+syn keyword pineConfig rsh-path
+syn keyword pineConfig save-by-sender
+syn keyword pineConfig saved-msg-name-rule
+syn keyword pineConfig scroll-margin
+syn keyword pineConfig selectable-item-background-color
+syn keyword pineConfig selectable-item-foreground-color
+syn keyword pineConfig sending-filters
+syn keyword pineConfig sendmail-path
+syn keyword pineConfig show-all-characters
+syn keyword pineConfig signature-file
+syn keyword pineConfig smtp-server
+syn keyword pineConfig sort-key
+syn keyword pineConfig speller
+syn keyword pineConfig ssh-command
+syn keyword pineConfig ssh-open-timeout
+syn keyword pineConfig ssh-path
+syn keyword pineConfig standard-printer
+syn keyword pineConfig status-background-color
+syn keyword pineConfig status-foreground-color
+syn keyword pineConfig status-message-delay
+syn keyword pineConfig suggest-address
+syn keyword pineConfig suggest-fullname
+syn keyword pineConfig tcp-open-timeout
+syn keyword pineConfig tcp-query-timeout
+syn keyword pineConfig tcp-read-warning-timeout
+syn keyword pineConfig tcp-write-warning-timeout
+syn keyword pineConfig threading-display-style
+syn keyword pineConfig threading-expanded-character
+syn keyword pineConfig threading-index-style
+syn keyword pineConfig threading-indicator-character
+syn keyword pineConfig threading-lastreply-character
+syn keyword pineConfig title-background-color
+syn keyword pineConfig title-foreground-color
+syn keyword pineConfig titlebar-color-style
+syn keyword pineConfig upload-command
+syn keyword pineConfig upload-command-prefix
+syn keyword pineConfig url-viewers
+syn keyword pineConfig use-only-domain-name
+syn keyword pineConfig user-domain
+syn keyword pineConfig user-id
+syn keyword pineConfig user-id
+syn keyword pineConfig user-input-timeout
+syn keyword pineConfig viewer-hdr-colors
+syn keyword pineConfig viewer-hdrs
+syn keyword pineConfig viewer-overlap
+syn keyword pineConfig window-position
+
+syn keyword pineOption allow-changing-from
+syn keyword pineOption allow-talk
+syn keyword pineOption alternate-compose-menu
+syn keyword pineOption assume-slow-link
+syn keyword pineOption auto-move-read-msgs
+syn keyword pineOption auto-open-next-unread
+syn keyword pineOption auto-unzoom-after-apply
+syn keyword pineOption auto-zoom-after-select
+syn keyword pineOption cache-remote-pinerc
+syn keyword pineOption check-newmail-when-quitting
+syn keyword pineOption combined-addrbook-display
+syn keyword pineOption combined-folder-display
+syn keyword pineOption combined-subdirectory-display
+syn keyword pineOption compose-cut-from-cursor
+syn keyword pineOption compose-maps-delete-key-to-ctrl-d
+syn keyword pineOption compose-rejects-unqualified-addrs
+syn keyword pineOption compose-send-offers-first-filter
+syn keyword pineOption compose-sets-newsgroup-without-confirm
+syn keyword pineOption confirm-role-even-for-default
+syn keyword pineOption continue-tab-without-confirm
+syn keyword pineOption delete-skips-deleted
+syn keyword pineOption disable-2022-jp-conversions
+syn keyword pineOption disable-busy-alarm
+syn keyword pineOption disable-charset-conversions
+syn keyword pineOption disable-config-cmd
+syn keyword pineOption disable-keyboard-lock-cmd
+syn keyword pineOption disable-keymenu
+syn keyword pineOption disable-password-caching
+syn keyword pineOption disable-password-cmd
+syn keyword pineOption disable-pipes-in-sigs
+syn keyword pineOption disable-pipes-in-templates
+syn keyword pineOption disable-roles-setup-cmd
+syn keyword pineOption disable-roles-sig-edit
+syn keyword pineOption disable-roles-template-edit
+syn keyword pineOption disable-sender
+syn keyword pineOption disable-shared-namespaces
+syn keyword pineOption disable-signature-edit-cmd
+syn keyword pineOption disable-take-last-comma-first
+syn keyword pineOption enable-8bit-esmtp-negotiation
+syn keyword pineOption enable-8bit-nntp-posting
+syn keyword pineOption enable-aggregate-command-set
+syn keyword pineOption enable-alternate-editor-cmd
+syn keyword pineOption enable-alternate-editor-implicitly
+syn keyword pineOption enable-arrow-navigation
+syn keyword pineOption enable-arrow-navigation-relaxed
+syn keyword pineOption enable-background-sending
+syn keyword pineOption enable-bounce-cmd
+syn keyword pineOption enable-cruise-mode
+syn keyword pineOption enable-cruise-mode-delete
+syn keyword pineOption enable-delivery-status-notification
+syn keyword pineOption enable-dot-files
+syn keyword pineOption enable-dot-folders
+syn keyword pineOption enable-exit-via-lessthan-command
+syn keyword pineOption enable-fast-recent-test
+syn keyword pineOption enable-flag-cmd
+syn keyword pineOption enable-flag-screen-implicitly
+syn keyword pineOption enable-full-header-and-text
+syn keyword pineOption enable-full-header-cmd
+syn keyword pineOption enable-goto-in-file-browser
+syn keyword pineOption enable-incoming-folders
+syn keyword pineOption enable-jump-shortcut
+syn keyword pineOption enable-lame-list-mode
+syn keyword pineOption enable-mail-check-cue
+syn keyword pineOption enable-mailcap-param-substitution
+syn keyword pineOption enable-mouse-in-xterm
+syn keyword pineOption enable-msg-view-addresses
+syn keyword pineOption enable-msg-view-attachments
+syn keyword pineOption enable-msg-view-forced-arrows
+syn keyword pineOption enable-msg-view-urls
+syn keyword pineOption enable-msg-view-web-hostnames
+syn keyword pineOption enable-newmail-in-xterm-icon
+syn keyword pineOption enable-partial-match-lists
+syn keyword pineOption enable-print-via-y-command
+syn keyword pineOption enable-reply-indent-string-editing
+syn keyword pineOption enable-rules-under-take
+syn keyword pineOption enable-search-and-replace
+syn keyword pineOption enable-sigdashes
+syn keyword pineOption enable-suspend
+syn keyword pineOption enable-tab-completion
+syn keyword pineOption enable-take-export
+syn keyword pineOption enable-tray-icon
+syn keyword pineOption enable-unix-pipe-cmd
+syn keyword pineOption enable-verbose-smtp-posting
+syn keyword pineOption expanded-view-of-addressbooks
+syn keyword pineOption expanded-view-of-distribution-lists
+syn keyword pineOption expanded-view-of-folders
+syn keyword pineOption expose-hidden-config
+syn keyword pineOption expunge-only-manually
+syn keyword pineOption expunge-without-confirm
+syn keyword pineOption expunge-without-confirm-everywhere
+syn keyword pineOption fcc-on-bounce
+syn keyword pineOption fcc-only-without-confirm
+syn keyword pineOption fcc-without-attachments
+syn keyword pineOption include-attachments-in-reply
+syn keyword pineOption include-header-in-reply
+syn keyword pineOption include-text-in-reply
+syn keyword pineOption ldap-result-to-addrbook-add
+syn keyword pineOption mark-fcc-seen
+syn keyword pineOption mark-for-cc
+syn keyword pineOption news-approximates-new-status
+syn keyword pineOption news-deletes-across-groups
+syn keyword pineOption news-offers-catchup-on-close
+syn keyword pineOption news-post-without-validation
+syn keyword pineOption news-read-in-newsrc-order
+syn keyword pineOption next-thread-without-confirm
+syn keyword pineOption old-growth
+syn keyword pineOption pass-control-characters-as-is
+syn keyword pineOption prefer-plain-text
+syn keyword pineOption preserve-start-stop-characters
+syn keyword pineOption print-formfeed-between-messages
+syn keyword pineOption print-includes-from-line
+syn keyword pineOption print-index-enabled
+syn keyword pineOption print-offers-custom-cmd-prompt
+syn keyword pineOption quell-attachment-extra-prompt
+syn keyword pineOption quell-berkeley-format-timezone
+syn keyword pineOption quell-content-id
+syn keyword pineOption quell-dead-letter-on-cancel
+syn keyword pineOption quell-empty-directories
+syn keyword pineOption quell-extra-post-prompt
+syn keyword pineOption quell-folder-internal-msg
+syn keyword pineOption quell-imap-envelope-update
+syn keyword pineOption quell-lock-failure-warnings
+syn keyword pineOption quell-maildomain-warning
+syn keyword pineOption quell-news-envelope-update
+syn keyword pineOption quell-partial-fetching
+syn keyword pineOption quell-ssl-largeblocks
+syn keyword pineOption quell-status-message-beeping
+syn keyword pineOption quell-timezone-comment-when-sending
+syn keyword pineOption quell-user-lookup-in-passwd-file
+syn keyword pineOption quit-without-confirm
+syn keyword pineOption reply-always-uses-reply-to
+syn keyword pineOption save-aggregates-copy-sequence
+syn keyword pineOption save-will-advance
+syn keyword pineOption save-will-not-delete
+syn keyword pineOption save-will-quote-leading-froms
+syn keyword pineOption scramble-message-id
+syn keyword pineOption select-without-confirm
+syn keyword pineOption selectable-item-nobold
+syn keyword pineOption separate-folder-and-directory-entries
+syn keyword pineOption show-cursor
+syn keyword pineOption show-plain-text-internally
+syn keyword pineOption show-selected-in-boldface
+syn keyword pineOption signature-at-bottom
+syn keyword pineOption single-column-folder-list
+syn keyword pineOption slash-collapses-entire-thread
+syn keyword pineOption spell-check-before-sending
+syn keyword pineOption store-window-position-in-config
+syn keyword pineOption strip-from-sigdashes-on-reply
+syn keyword pineOption tab-visits-next-new-message-only
+syn keyword pineOption termdef-takes-precedence
+syn keyword pineOption thread-index-shows-important-color
+syn keyword pineOption try-alternative-authentication-driver-first
+syn keyword pineOption unselect-will-not-advance
+syn keyword pineOption use-current-dir
+syn keyword pineOption use-function-keys
+syn keyword pineOption use-sender-not-x-sender
+syn keyword pineOption use-subshell-for-suspend
+syn keyword pineOption vertical-folder-list
+
+syn match  pineComment  "^#.*$"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link pineConfig	Type
+hi def link pineComment	Comment
+hi def link pineOption	Macro
+
+let b:current_syntax = "pine"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/pinfo.vim b/syntax/pinfo.vim
new file mode 100644
index 000000000..80c08406c
--- /dev/null
+++ b/syntax/pinfo.vim
@@ -0,0 +1,114 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pinfo') == -1
+
+" Vim syntax file
+" Language:             pinfo(1) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-06-17
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword+=-
+
+syn case ignore
+
+syn keyword pinfoTodo             contained FIXME TODO XXX NOTE
+
+syn region  pinfoComment          start='^#' end='$' contains=pinfoTodo,@Spell
+
+syn keyword pinfoOptions          MANUAL CUT-MAN-HEADERS CUT-EMPTY-MAN-LINES
+                                  \ RAW-FILENAME APROPOS
+                                  \ DONT-HANDLE-WITHOUT-TAG-TABLE HTTPVIEWER
+                                  \ FTPVIEWER MAILEDITOR PRINTUTILITY MANLINKS
+                                  \ INFOPATH MAN-OPTIONS STDERR-REDIRECTION
+                                  \ LONG-MANUAL-LINKS FILTER-0xB7
+                                  \ QUIT-CONFIRMATION QUIT-CONFIRM-DEFAULT
+                                  \ CLEAR-SCREEN-AT-EXIT CALL-READLINE-HISTORY
+                                  \ HIGHLIGHTREGEXP SAFE-USER SAFE-GROUP
+
+syn keyword pinfoColors           COL_NORMAL COL_TOPLINE COL_BOTTOMLINE
+                                  \ COL_MENU COL_MENUSELECTED COL_NOTE
+                                  \ COL_NOTESELECTED COL_URL COL_URLSELECTED
+                                  \ COL_INFOHIGHLIGHT COL_MANUALBOLD
+                                  \ COL_MANUALITALIC COL_SEARCHHIGHLIGHT
+
+syn keyword pinfoColorDefault     COLOR_DEFAULT
+syn keyword pinfoColorBold        BOLD
+syn keyword pinfoColorNoBold      NO_BOLD
+syn keyword pinfoColorBlink       BLINK
+syn keyword pinfoColorNoBlink     NO_BLINK
+syn keyword pinfoColorBlack       COLOR_BLACK
+syn keyword pinfoColorRed         COLOR_RED
+syn keyword pinfoColorGreen       COLOR_GREEN
+syn keyword pinfoColorYellow      COLOR_YELLOW
+syn keyword pinfoColorBlue        COLOR_BLUE
+syn keyword pinfoColorMagenta     COLOR_MAGENTA
+syn keyword pinfoColorCyan        COLOR_CYAN
+syn keyword pinfoColorWhite       COLOR_WHITE
+
+syn keyword pinfoKeys             KEY_TOTALSEARCH_1 KEY_TOTALSEARCH_2
+                                  \ KEY_SEARCH_1 KEY_SEARCH_2
+                                  \ KEY_SEARCH_AGAIN_1 KEY_SEARCH_AGAIN_2
+                                  \ KEY_GOTO_1 KEY_GOTO_2 KEY_PREVNODE_1
+                                  \ KEY_PREVNODE_2 KEY_NEXTNODE_1
+                                  \ KEY_NEXTNODE_2 KEY_UP_1 KEY_UP_2 KEY_END_1
+                                  \ KEY_END_2 KEY_PGDN_1 KEY_PGDN_2
+                                  \ KEY_PGDN_AUTO_1 KEY_PGDN_AUTO_2 KEY_HOME_1
+                                  \ KEY_HOME_2 KEY_PGUP_1 KEY_PGUP_2
+                                  \ KEY_PGUP_AUTO_1 KEY_PGUP_AUTO_2 KEY_DOWN_1
+                                  \ KEY_DOWN_2 KEY_TOP_1 KEY_TOP_2 KEY_BACK_1
+                                  \ KEY_BACK_2 KEY_FOLLOWLINK_1
+                                  \ KEY_FOLLOWLINK_2 KEY_REFRESH_1
+                                  \ KEY_REFRESH_2 KEY_SHELLFEED_1
+                                  \ KEY_SHELLFEED_2 KEY_QUIT_1 KEY_QUIT_2
+                                  \ KEY_GOLINE_1 KEY_GOLINE_2 KEY_PRINT_1
+                                  \ KEY_PRINT_2 KEY_DIRPAGE_1 KEY_DIRPAGE_2
+                                  \ KEY_TWODOWN_1 KEY_TWODOWN_2 KEY_TWOUP_1
+                                  \ KEY_TWOUP_2
+
+syn keyword pinfoSpecialKeys      KEY_BREAK KEY_DOWN KEY_UP KEY_LEFT KEY_RIGHT
+                                  \ KEY_DOWN KEY_HOME KEY_BACKSPACE KEY_NPAGE
+                                  \ KEY_PPAGE KEY_END KEY_IC KEY_DC
+syn region  pinfoSpecialKeys      matchgroup=pinfoSpecialKeys transparent
+                                  \ start=+KEY_\%(F\|CTRL\|ALT\)(+ end=+)+
+syn region  pinfoSimpleKey        start=+'+ skip=+\\'+ end=+'+
+                                  \ contains=pinfoSimpleKeyEscape
+syn match   pinfoSimpleKeyEscape  +\\[\\nt']+
+syn match   pinfoKeycode          '\<\d\+\>'
+
+syn keyword pinfoConstants        TRUE FALSE YES NO
+
+hi def link pinfoTodo             Todo
+hi def link pinfoComment          Comment
+hi def link pinfoOptions          Keyword
+hi def link pinfoColors           Keyword
+hi def link pinfoColorDefault     Normal
+hi def link pinfoSpecialKeys      SpecialChar
+hi def link pinfoSimpleKey        String
+hi def link pinfoSimpleKeyEscape  SpecialChar
+hi def link pinfoKeycode          Number
+hi def link pinfoConstants        Constant
+hi def link pinfoKeys             Keyword
+hi def      pinfoColorBold        cterm=bold
+hi def      pinfoColorNoBold      cterm=none
+hi def      pinfoColorBlink       cterm=inverse
+hi def      pinfoColorNoBlink     cterm=none
+hi def      pinfoColorBlack       ctermfg=Black       guifg=Black
+hi def      pinfoColorRed         ctermfg=DarkRed     guifg=DarkRed
+hi def      pinfoColorGreen       ctermfg=DarkGreen   guifg=DarkGreen
+hi def      pinfoColorYellow      ctermfg=DarkYellow  guifg=DarkYellow
+hi def      pinfoColorBlue        ctermfg=DarkBlue    guifg=DarkBlue
+hi def      pinfoColorMagenta     ctermfg=DarkMagenta guifg=DarkMagenta
+hi def      pinfoColorCyan        ctermfg=DarkCyan    guifg=DarkCyan
+hi def      pinfoColorWhite       ctermfg=LightGray   guifg=LightGray
+
+let b:current_syntax = "pinfo"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/pli.vim b/syntax/pli.vim
new file mode 100644
index 000000000..904a10569
--- /dev/null
+++ b/syntax/pli.vim
@@ -0,0 +1,270 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pli') == -1
+
+" Vim syntax file
+" Modified from  http://plnet.org/files/vim/
+" using keywords from http://www.kednos.com/pli/docs/reference_manual/6291pro_contents.html
+"    2012-11-13 Alan Thompson
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+syn case ignore
+
+" Todo.
+syn keyword pl1Todo TODO FIXME XXX DEBUG NOTE
+
+" pl1CommentGroup allows adding matches for special things in comments
+" 20010723az: Added this so that these could be matched in comments...  
+syn cluster pl1CommentGroup contains=pl1Todo
+
+syn match   pl1Garbage        "[^ \t()]"
+syn match   pl1Identifier     "[a-z][a-z0-9$_#]*"
+syn match   pl1HostIdentifier ":[a-z][a-z0-9$_#]*"
+
+" 20010723az: When wanted, highlight the trailing whitespace -- this is
+" based on c_space_errors 
+if exists("c_space_errors")
+    if !exists("c_no_trail_space_error")
+        syn match pl1SpaceError "\s\+$"
+    endif
+    if !exists("c_no_tab_space_error")
+        syn match pl1SpaceError " \+\t"me=e-1
+    endif
+endif
+
+" Symbols.  
+syn match   pl1Symbol         "\(;\|,\|\.\)"
+syn match   pl1PreProcSym     "%"
+
+" Operators.
+syn match   pl1Operator       "\(&\|:\|!\|+\|-\|\*\|/\|=\|<\|>\|@\|\*\*\|!=\|\~=\)"
+syn match   pl1Operator       "\(\^\|\^=\|<=\|>=\|:=\|=>\|\.\.\|||\|<<\|>>\|\"\)"
+
+" Attributes
+syn keyword pl1Attribute BACKWARDS BUFFERED BUF CONNECTED CONN CONSTANT EVENT
+syn keyword pl1Attribute EXCLUSIVE EXCL FORMAT GENERIC IRREDUCIBLE IRRED LOCAL
+syn keyword pl1Attribute REDUCIBLE RED TASK TRANSIENT UNBUFFERED UNBUF ALIGNED ANY
+syn keyword pl1Attribute AREA AUTOMATIC AUTO BASED BUILTIN CONDITION COND CONTROLLED
+syn keyword pl1Attribute CTL DEFINED DEF DIRECT ENVIRONMENT ENV EXTERNAL EXT FILE
+syn keyword pl1Attribute GLOBALDEF GLOBALREF INITIAL INIT INPUT INTERNAL INT KEYED
+syn keyword pl1Attribute LABEL LIKE LIST MEMBER NONVARYING NONVAR OPTIONAL OPTIONS
+syn keyword pl1Attribute OUTPUT PARAMETER PARM PICTURE PIC POSITION POS PRECISION
+syn keyword pl1Attribute PREC PRINT READONLY RECORD REFER RETURNS SEQUENTIAL SEQL
+syn keyword pl1Attribute STATIC STREAM STRUCTURE TRUNCATE UNALIGNED UNAL UNION UPDATE
+syn keyword pl1Attribute VARIABLE VARYING VAR COMPLEX CPLX REAL BINARY BIN BIT
+syn keyword pl1Attribute CHARACTER CHAR DECIMAL DEC DESCRIPTOR DESC DIMENSION DIM
+syn keyword pl1Attribute FIXED FLOAT OFFSET POINTER PTR REFERENCE VALUE VAL 
+
+" Functions
+syn keyword pl1Function AFTER ALL ANY BEFORE COMPLETION CPLN CONJG COUNT
+syn keyword pl1Function CURRENTSTORAGE CSTG DATAFIELD DECAT DOT ERF ERFC IMAG
+syn keyword pl1Function ONCOUNT ONFIELD ONLOC POLY PRIORITY REPEAT SAMEKEY STATUS
+syn keyword pl1Function STORAGE STG ABS ACOS ACTUALCOUNT ADD ADDR ADDREL ALLOCATION
+syn keyword pl1Function ALLOCN ASIN ATAN ATAND ATANH BOOL BYTE BYTESIZE CEIL COLLATE
+syn keyword pl1Function COPY COS COSD COSH DATE DATETIME DECODE DISPLAY DIVIDE EMPTY
+syn keyword pl1Function ENCODE ERROR EVERY EXP EXTEND FLOOR FLUSH FREE HBOUND HIGH
+syn keyword pl1Function INDEX INFORM INT LBOUND LENGTH LINE LINENO LOG LOG10 LOG2
+syn keyword pl1Function LOW LTRIM MAX MAXLENGTH MIN MOD MULTIPLY NEXT_VOLUME NULL
+syn keyword pl1Function ONARGSLIST ONCHAR ONCODE ONFILE ONKEY ONSOURCE PAGENO POSINT
+syn keyword pl1Function PRESENT PROD RANK RELEASE RESIGNAL REVERSE REWIND ROUND
+syn keyword pl1Function RTRIM SEARCH SIGN SIN SIND SINH SIZE SOME SPACEBLOCK SQRT
+syn keyword pl1Function STRING SUBSTR SUBTRACT SUM TAN TAND TANH TIME TRANSLATE TRIM
+syn keyword pl1Function TRUNC UNSPEC VALID VARIANT VERIFY WARN 
+
+" Other keywords
+syn keyword pl1Other ATTENTION ATTN C CONVERSION CONV DATA NAME NOCONVERSION
+syn keyword pl1Other NOCONV NOFIXEDOVERFLOW NOFOFL NOOVERFLOW NOSIZE
+syn keyword pl1Other NOSTRINGRANGE NOSTRG NOSTRINGSIZE NOSTRZ NOSUBSCRIPTRANGE
+syn keyword pl1Other NOSUBRG NOZERODIVIDE NOZDIV OVERFLOW OFL PENDING RECORD
+syn keyword pl1Other REENTRANT SIZE STRINGRANGE STRG STRINGSIZE STRZ
+syn keyword pl1Other SUBSCRIPTRANGE SUBRG TRANSMIT A ANYCONDITION APPEND B B1 B2
+syn keyword pl1Other B3 B4 BACKUP_DATE BATCH BLOCK_BOUNDARY_FORMAT BLOCK_IO
+syn keyword pl1Other BLOCK_SIZE BUCKET_SIZE BY CANCEL_CONTROL_O
+syn keyword pl1Other CARRIAGE_RETURN_FORMAT COLUMN COL CONTIGUOUS
+syn keyword pl1Other CONTIGUOUS_BEST_TRY CONVERSION CONV CREATION_DATE
+syn keyword pl1Other CURRENT_POSITION DEFAULT_FILE_NAME DEFERRED_WRITE E EDIT
+syn keyword pl1Other ENDFILE ENDPAGE EXPIRATION_DATE EXTENSION_SIZE F FAST_DELETE
+syn keyword pl1Other FILE_ID FILE_ID_TO FILE_SIZE FINISH FIXEDOVERFLOW FOFL
+syn keyword pl1Other FIXED_CONTROL_FROM FIXED_CONTROL_SIZE FIXED_CONTROL_SIZE_TO
+syn keyword pl1Other FIXED_CONTROL_TO FIXED_LENGTH_RECORDS FROM GROUP_PROTECTION
+syn keyword pl1Other IDENT IGNORE_LINE_MARKS IN INDEXED INDEX_NUMBER INITIAL_FILL
+syn keyword pl1Other INTO KEY KEYFROM KEYTO LINESIZE LOCK_ON_READ LOCK_ON_WRITE
+syn keyword pl1Other MAIN MANUAL_UNLOCKING MATCH_GREATER MATCH_GREATER_EQUAL
+syn keyword pl1Other MATCH_NEXT MATCH_NEXT_EQUAL MAXIMUM_RECORD_NUMBER
+syn keyword pl1Other MAXIMUM_RECORD_SIZE MULTIBLOCK_COUNT MULTIBUFFER_COUNT
+syn keyword pl1Other NOLOCK NONEXISTENT_RECORD NONRECURSIVE NO_ECHO NO_FILTER
+syn keyword pl1Other NO_SHARE OVERFLOW OFL OWNER_GROUP OWNER_ID OWNER_MEMBER
+syn keyword pl1Other OWNER_PROTECTION P PAGE PAGESIZE PRINTER_FORMAT PROMPT
+syn keyword pl1Other PURGE_TYPE_AHEAD R READ_AHEAD READ_CHECK READ_REGARDLESS
+syn keyword pl1Other RECORD_ID RECORD_ID_ACCESS RECORD_ID_TO RECURSIVE REPEAT
+syn keyword pl1Other RETRIEVAL_POINTERS REVISION_DATE REWIND_ON_CLOSE
+syn keyword pl1Other REWIND_ON_OPEN SCALARVARYING SET SHARED_READ SHARED_WRITE
+syn keyword pl1Other SKIP SPOOL STORAGE STRINGRANGE STRG SUBSCRIPTRANGE SUBRG
+syn keyword pl1Other SUPERSEDE SYSIN SYSPRINT SYSTEM_PROTECTION TAB TEMPORARY
+syn keyword pl1Other TIMEOUT_PERIOD TITLE TO UNDEFINEDFILE UNDF UNDERFLOW UFL
+syn keyword pl1Other UNTIL USER_OPEN VAXCONDITION WAIT_FOR_RECORD WHILE
+syn keyword pl1Other WORLD_PROTECTION WRITE_BEHIND WRITE_CHECK X ZERODIVIDE ZDIV 
+
+" PreProcessor keywords
+syn keyword pl1PreProc ACTIVATE DEACTIVATE DECLARE DCL DICTIONARY DO END ERROR
+syn keyword pl1PreProc FATAL GOTO IF INCLUDE INFORM LIST NOLIST PAGE PROCEDURE PROC
+syn keyword pl1PreProc REPLACE RETURN SBTTL TITLE WARN THEN ELSE 
+
+" Statements
+syn keyword pl1Statement CALL SUB ENTRY BY NAME CASE CHECK COPY DEFAULT DFT DELAY
+syn keyword pl1Statement DESCRIPTORS DISPLAY EXIT FETCH HALT IGNORE LIST LOCATE
+syn keyword pl1Statement NOCHECK NOLOCK NONE ORDER RANGE RELEASE REORDER REPLY SNAP
+syn keyword pl1Statement SYSTEM TAB UNLOCK WAIT ALLOCATE ALLOC BEGIN CALL CLOSE
+syn keyword pl1Statement DECLARE DCL DELETE DO ELSE END FORMAT GET GOTO GO TO IF
+syn keyword pl1Statement LEAVE NORESCAN ON OPEN OTHERWISE OTHER PROCEDURE PROC PUT
+syn keyword pl1Statement READ RESCAN RETURN REVERT REWRITE SELECT SIGNAL SNAP
+syn keyword pl1Statement STATEMENT STOP SYSTEM THEN WHEN WRITE 
+
+" PL1's own keywords
+" syn match   pl1Keyword "\<END\>"
+" syn match   pl1Keyword "\.COUNT\>"hs=s+1
+" syn match   pl1Keyword "\.EXISTS\>"hs=s+1
+" syn match   pl1Keyword "\.FIRST\>"hs=s+1
+" syn match   pl1Keyword "\.LAST\>"hs=s+1
+" syn match   pl1Keyword "\.DELETE\>"hs=s+1
+" syn match   pl1Keyword "\.PREV\>"hs=s+1
+" syn match   pl1Keyword "\.NEXT\>"hs=s+1
+
+if exists("pl1_highlight_triggers")
+    syn keyword pl1Trigger  INSERTING UPDATING DELETING
+endif
+
+" Conditionals.
+syn keyword pl1Conditional ELSIF ELSE IF
+syn match   pl1Conditional "\<END\s\+IF\>"
+
+" Loops.
+syn keyword pl1Repeat FOR LOOP WHILE FORALL
+syn match   pl1Repeat "\<END\s\+LOOP\>"
+
+" Various types of comments.
+" 20010723az: Added the ability to treat strings within comments just like
+" C does.
+if exists("c_comment_strings")
+    syntax match pl1CommentSkip contained "^\s*\*\($\|\s\+\)"
+    syntax region pl1CommentString contained start=+L\="+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=pl1CommentSkip
+    syntax region pl1Comment2String contained start=+L\="+ skip=+\\\\\|\\"+ end=+"+ end="$"
+    syntax region pl1CommentL start="--" skip="\\$" end="$" keepend contains=@pl1CommentGroup,pl1Comment2String,pl1CharLiteral,pl1BooleanLiteral,pl1NumbersCom,pl1SpaceError
+    syntax region pl1Comment start="/\*" end="\*/" contains=@pl1CommentGroup,pl1Comment2String,pl1CharLiteral,pl1BooleanLiteral,pl1NumbersCom,pl1SpaceError
+else
+    syntax region pl1CommentL start="--" skip="\\$" end="$" keepend contains=@pl1CommentGroup,pl1SpaceError
+    syntax region pl1Comment start="/\*" end="\*/" contains=@pl1CommentGroup,pl1SpaceError
+endif
+
+" 20010723az: These are the old comment commands ... commented out.
+" syn match   pl1Comment    "--.*$" contains=pl1Todo
+" syn region  pl1Comment    start="/\*" end="\*/" contains=pl1Todo
+syn sync ccomment pl1Comment
+syn sync ccomment pl1CommentL
+
+" To catch unterminated string literals.
+syn match   pl1StringError    "'.*$"
+
+" Various types of literals.
+" 20010723az: Added stuff for comment matching.
+syn match pl1Numbers transparent "\<[+-]\=\d\|[+-]\=\.\d" contains=pl1IntLiteral,pl1FloatLiteral
+syn match pl1NumbersCom contained transparent "\<[+-]\=\d\|[+-]\=\.\d" contains=pl1IntLiteral,pl1FloatLiteral
+syn match pl1IntLiteral contained "[+-]\=\d\+"
+syn match pl1FloatLiteral contained "[+-]\=\d\+\.\d*"
+syn match pl1FloatLiteral contained "[+-]\=\d*\.\d*"
+"syn match pl1FloatLiteral "[+-]\=\([0-9]*\.[0-9]\+\|[0-9]\+\.[0-9]\+\)\(e[+-]\=[0-9]\+\)\="
+syn match   pl1CharLiteral    "'[^']'"
+syn match   pl1StringLiteral  "'\([^']\|''\)*'"
+syn keyword pl1BooleanLiteral TRUE FALSE NULL
+
+" The built-in types.
+syn keyword pl1Storage ANYDATA ANYTYPE BFILE BINARY_INTEGER BLOB BOOLEAN
+syn keyword pl1Storage BYTE CHAR CHARACTER CLOB CURSOR DATE DAY DEC DECIMAL
+syn keyword pl1Storage DOUBLE DSINTERVAL_UNCONSTRAINED FLOAT HOUR
+syn keyword pl1Storage INT INTEGER INTERVAL LOB LONG MINUTE
+syn keyword pl1Storage MLSLABEL MONTH NATURAL NATURALN NCHAR NCHAR_CS NCLOB
+syn keyword pl1Storage NUMBER NUMERIC NVARCHAR PLS_INT PLS_INTEGER
+syn keyword pl1Storage POSITIVE POSITIVEN PRECISION RAW REAL RECORD
+syn keyword pl1Storage SECOND SIGNTYPE SMALLINT STRING SYS_REFCURSOR TABLE TIME
+syn keyword pl1Storage TIMESTAMP TIMESTAMP_UNCONSTRAINED
+syn keyword pl1Storage TIMESTAMP_TZ_UNCONSTRAINED
+syn keyword pl1Storage TIMESTAMP_LTZ_UNCONSTRAINED UROWID VARCHAR
+syn keyword pl1Storage VARCHAR2 YEAR YMINTERVAL_UNCONSTRAINED ZONE
+
+" A type-attribute is really a type.
+" 20020916bp: Removed leading part of pattern to avoid highlighting the
+"             object
+syn match   pl1TypeAttribute  "%\(TYPE\|ROWTYPE\)\>"
+
+" All other attributes.
+syn match   pl1Attribute "%\(BULK_EXCEPTIONS\|BULK_ROWCOUNT\|ISOPEN\|FOUND\|NOTFOUND\|ROWCOUNT\)\>"
+
+" Catch errors caused by wrong parentheses and brackets
+" 20010723az: significantly more powerful than the values -- commented out
+" below the replaced values. This adds the C functionality to PL/SQL.
+syn cluster pl1ParenGroup contains=pl1ParenError,@pl1CommentGroup,pl1CommentSkip,pl1IntLiteral,pl1FloatLiteral,pl1NumbersCom
+if exists("c_no_bracket_error")
+    syn region pl1Paren transparent start='(' end=')' contains=ALLBUT,@pl1ParenGroup
+    syn match pl1ParenError ")"
+    syn match pl1ErrInParen contained "[{}]"
+else
+    syn region pl1Paren transparent start='(' end=')' contains=ALLBUT,@pl1ParenGroup,pl1ErrInBracket
+    syn match pl1ParenError "[\])]"
+    syn match pl1ErrInParen contained "[{}]"
+    syn region pl1Bracket transparent start='\[' end=']' contains=ALLBUT,@pl1ParenGroup,pl1ErrInParen
+    syn match pl1ErrInBracket contained "[);{}]"
+endif
+" syn region pl1Paren       transparent start='(' end=')' contains=ALLBUT,pl1ParenError
+" syn match pl1ParenError   ")"
+
+" Syntax Synchronizing
+syn sync minlines=10 maxlines=100
+
+" Define the default highlighting.
+" Only when and item doesn't have highlighting yet.
+
+hi def link pl1Attribute       Macro
+hi def link pl1BlockError      Error
+hi def link pl1BooleanLiteral  Boolean
+hi def link pl1CharLiteral     Character
+hi def link pl1Comment         Comment
+hi def link pl1CommentL        Comment
+hi def link pl1Conditional     Conditional
+hi def link pl1Error           Error
+hi def link pl1ErrInBracket    Error
+hi def link pl1ErrInBlock      Error
+hi def link pl1ErrInParen      Error
+hi def link pl1Exception       Function
+hi def link pl1FloatLiteral    Float
+hi def link pl1Function        Function
+hi def link pl1Garbage         Error
+hi def link pl1HostIdentifier  Label
+hi def link pl1Identifier      Normal
+hi def link pl1IntLiteral      Number
+hi def link pl1Operator        Operator
+hi def link pl1Paren           Normal
+hi def link pl1ParenError      Error
+hi def link pl1SpaceError      Error
+hi def link pl1Pseudo          PreProc
+hi def link pl1PreProc         PreProc
+hi def link pl1PreProcSym      PreProc
+hi def link pl1Keyword         Keyword
+hi def link pl1Other           Keyword
+hi def link pl1Repeat          Repeat
+hi def link pl1Statement       Keyword
+hi def link pl1Storage         StorageClass
+hi def link pl1StringError     Error
+hi def link pl1StringLiteral   String
+hi def link pl1CommentString   String
+hi def link pl1Comment2String  String
+hi def link pl1Symbol          Normal
+hi def link pl1Trigger         Function
+hi def link pl1TypeAttribute   StorageClass
+hi def link pl1Todo            Todo
+
+
+let b:current_syntax = "pl1"
+
+endif
diff --git a/syntax/plm.vim b/syntax/plm.vim
new file mode 100644
index 000000000..e58996dbd
--- /dev/null
+++ b/syntax/plm.vim
@@ -0,0 +1,138 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plm') == -1
+
+" Vim syntax file
+" Language:	PL/M
+" Maintainer:	Philippe Coulonges <cphil@cphil.net>
+" Last change:	2003 May 11
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" PL/M is a case insensitive language
+syn case ignore
+
+syn keyword plmTodo contained	TODO FIXME XXX
+
+" String
+syn region  plmString		start=+'+  end=+'+
+
+syn match   plmOperator		"[@=\+\-\*\/\<\>]"
+
+syn match   plmIdentifier	"\<[a-zA-Z_][a-zA-Z0-9_]*\>"
+
+syn match   plmDelimiter	"[();,]"
+
+syn region  plmPreProc		start="^\s*\$\s*" skip="\\$" end="$"
+
+" FIXME : No Number support for floats, as I'm working on an embedded
+" project that doesn't use any.
+syn match   plmNumber		"-\=\<\d\+\>"
+syn match   plmNumber		"\<[0-9a-fA-F]*[hH]*\>"
+
+" If you don't like tabs
+"syn match plmShowTab "\t"
+"syn match plmShowTabc "\t"
+
+"when wanted, highlight trailing white space
+if exists("c_space_errors")
+  syn match	plmSpaceError	"\s*$"
+  syn match	plmSpaceError	" \+\t"me=e-1
+endif
+
+"
+  " Use the same control variable as C language for I believe
+  " users will want the same behavior
+if exists("c_comment_strings")
+  " FIXME : don't work fine with c_comment_strings set,
+  "	    which I don't care as I don't use
+
+  " A comment can contain plmString, plmCharacter and plmNumber.
+  " But a "*/" inside a plmString in a plmComment DOES end the comment!  So we
+  " need to use a special type of plmString: plmCommentString, which also ends on
+  " "*/", and sees a "*" at the start of the line as comment again.
+  syntax match	plmCommentSkip	contained "^\s*\*\($\|\s\+\)"
+  syntax region plmCommentString	contained start=+"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=plmSpecial,plmCommentSkip
+  syntax region plmComment2String	contained start=+"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=plmSpecial
+  syntax region plmComment	start="/\*" end="\*/" contains=plmTodo,plmCommentString,plmCharacter,plmNumber,plmFloat,plmSpaceError
+  syntax match  plmComment	"//.*" contains=plmTodo,plmComment2String,plmCharacter,plmNumber,plmSpaceError
+else
+  syn region	plmComment	start="/\*" end="\*/" contains=plmTodo,plmSpaceError
+  syn match	plmComment	"//.*" contains=plmTodo,plmSpaceError
+endif
+
+syntax match	plmCommentError	"\*/"
+
+syn keyword plmReserved	ADDRESS AND AT BASED BY BYTE CALL CASE
+syn keyword plmReserved DATA DECLARE DISABLE DO DWORD
+syn keyword plmReserved	ELSE ENABLE END EOF EXTERNAL
+syn keyword plmReserved GO GOTO HALT IF INITIAL INTEGER INTERRUPT
+syn keyword plmReserved LABEL LITERALLY MINUS MOD NOT OR
+syn keyword plmReserved PLUS POINTER PROCEDURE PUBLIC
+syn keyword plmReserved REAL REENTRANT RETURN SELECTOR STRUCTURE
+syn keyword plmReserved THEN TO WHILE WORD XOR
+syn keyword plm386Reserved CHARINT HWORD LONGINT OFFSET QWORD SHORTINT
+
+syn keyword plmBuiltIn ABS ADJUSTRPL BLOCKINPUT BLOCKINWORD BLOCKOUTPUT
+syn keyword plmBuiltIn BLOCKOUTWORD BUILPTR CARRY CAUSEINTERRUPT CMPB
+syn keyword plmBuiltIn CMPW DEC DOUBLE FINDB FINDRB FINDRW FINDW FIX
+syn keyword plmBuiltIn FLAGS FLOAT GETREALERROR HIGH IABS INITREALMATHUNIT
+syn keyword plmBuiltIn INPUT INT INWORD LAST LOCKSET LENGTH LOW MOVB MOVE
+syn keyword plmBuiltIn MOVRB MOVRW MOVW NIL OUTPUT OUTWORD RESTOREREALSTATUS
+syn keyword plmBuiltIn ROL ROR SAL SAVEREALSTATUS SCL SCR SELECTOROF SETB
+syn keyword plmBuiltIn SETREALMODE SETW SHL SHR SIGN SIGNED SIZE SKIPB
+syn keyword plmBuiltIn SKIPRB SKIPRW SKIPW STACKBASE STACKPTR TIME SIZE
+syn keyword plmBuiltIn UNSIGN XLAT ZERO
+syn keyword plm386BuiltIn INTERRUPT SETINTERRUPT
+syn keyword plm286BuiltIn CLEARTASKSWITCHEDFLAG GETACCESSRIGHTS
+syn keyword plm286BuiltIn GETSEGMENTLIMIT LOCALTABLE MACHINESTATUS
+syn keyword plm286BuiltIn OFFSETOF PARITY RESTOREGLOBALTABLE
+syn keyword plm286BuiltIn RESTOREINTERRUPTTABLE SAVEGLOBALTABLE
+syn keyword plm286BuiltIn SAVEINTERRUPTTABLE SEGMENTREADABLE
+syn keyword plm286BuiltIn SEGMENTWRITABLE TASKREGISTER WAITFORINTERRUPT
+syn keyword plm386BuiltIn CONTROLREGISTER DEBUGREGISTER FINDHW
+syn keyword plm386BuiltIn FINDRHW INHWORD MOVBIT MOVRBIT MOVHW MOVRHW
+syn keyword plm386BuiltIn OUTHWORD SCANBIT SCANRBIT SETHW SHLD SHRD
+syn keyword plm386BuiltIn SKIPHW SKIPRHW TESTREGISTER
+syn keyword plm386w16BuiltIn BLOCKINDWORD BLOCKOUTDWORD CMPD FINDD
+syn keyword plm386w16BuiltIn FINDRD INDWORD MOVD MOVRD OUTDWORD
+syn keyword plm386w16BuiltIn SETD SKIPD SKIPRD
+
+syn sync lines=50
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default methods for highlighting.  Can be overridden later
+"  hi def link plmLabel			Label
+"  hi def link plmConditional		Conditional
+"  hi def link plmRepeat			Repeat
+hi def link plmTodo			Todo
+hi def link plmNumber			Number
+hi def link plmOperator			Operator
+hi def link plmDelimiter			Operator
+"hi def link plmShowTab			Error
+"hi def link plmShowTabc			Error
+hi def link plmIdentifier			Identifier
+hi def link plmBuiltIn			Statement
+hi def link plm286BuiltIn			Statement
+hi def link plm386BuiltIn			Statement
+hi def link plm386w16BuiltIn		Statement
+hi def link plmReserved			Statement
+hi def link plm386Reserved			Statement
+hi def link plmPreProc			PreProc
+hi def link plmCommentError		plmError
+hi def link plmCommentString		plmString
+hi def link plmComment2String		plmString
+hi def link plmCommentSkip			plmComment
+hi def link plmString			String
+hi def link plmComment			Comment
+
+
+let b:current_syntax = "plm"
+
+" vim: ts=8 sw=2
+
+
+endif
diff --git a/syntax/plp.vim b/syntax/plp.vim
new file mode 100644
index 000000000..6246b0b20
--- /dev/null
+++ b/syntax/plp.vim
@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plp') == -1
+
+" Vim syntax file
+" Language:	PLP (Perl in HTML)
+" Maintainer:	Juerd <juerd@juerd.nl>
+" Last Change:	2003 Apr 25
+" Cloned From:	aspperl.vim
+
+" Add to filetype.vim the following line (without quote sign):
+" au BufNewFile,BufRead *.plp setf plp
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'perlscript'
+endif
+
+runtime! syntax/html.vim
+unlet b:current_syntax
+syn include @PLPperl syntax/perl.vim
+
+syn cluster htmlPreproc add=PLPperlblock
+
+syn keyword perlControl PLP_END
+syn keyword perlStatementInclude include Include
+syn keyword perlStatementFiles ReadFile WriteFile Counter
+syn keyword perlStatementScalar Entity AutoURL DecodeURI EncodeURI
+
+syn cluster PLPperlcode contains=perlStatement.*,perlFunction,perlOperator,perlVarPlain,perlVarNotInMatches,perlShellCommand,perlFloat,perlNumber,perlStringUnexpanded,perlString,perlQQ,perlControl,perlConditional,perlRepeat,perlComment,perlPOD,perlHereDoc,perlPackageDecl,perlElseIfError,perlFiledescRead,perlMatch
+
+syn region  PLPperlblock keepend matchgroup=Delimiter start=+<:=\=+ end=+:>+ transparent contains=@PLPperlcode
+
+syn region  PLPinclude keepend matchgroup=Delimiter start=+<(+ end=+)>+
+
+let b:current_syntax = "plp"
+
+
+endif
diff --git a/syntax/plsql.vim b/syntax/plsql.vim
new file mode 100644
index 000000000..6797cd720
--- /dev/null
+++ b/syntax/plsql.vim
@@ -0,0 +1,268 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plsql') == -1
+
+" Vim syntax file
+" Language: Oracle Procedureal SQL (PL/SQL)
+" Maintainer: Jeff Lanzarotta (jefflanzarotta at yahoo dot com)
+" Original Maintainer: C. Laurence Gonsalves (clgonsal@kami.com)
+" URL: http://lanzarotta.tripod.com/vim/syntax/plsql.vim.zip
+" Last Change: September 18, 2002
+" History: Geoff Evans & Bill Pribyl (bill at plnet dot org)
+"		Added 9i keywords.
+"	   Austin Ziegler (austin at halostatue dot ca)
+"		Added 8i+ features.
+"
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Todo.
+syn keyword plsqlTodo TODO FIXME XXX DEBUG NOTE
+syn cluster plsqlCommentGroup contains=plsqlTodo
+
+syn case ignore
+
+syn match   plsqlGarbage "[^ \t()]"
+syn match   plsqlIdentifier "[a-z][a-z0-9$_#]*"
+syn match   plsqlHostIdentifier ":[a-z][a-z0-9$_#]*"
+
+" When wanted, highlight the trailing whitespace.
+if exists("c_space_errors")
+  if !exists("c_no_trail_space_error")
+    syn match plsqlSpaceError "\s\+$"
+  endif
+
+  if !exists("c_no_tab_space_error")
+    syn match plsqlSpaceError " \+\t"me=e-1
+  endif
+endif
+
+" Symbols.
+syn match   plsqlSymbol "\(;\|,\|\.\)"
+
+" Operators.
+syn match   plsqlOperator "\(+\|-\|\*\|/\|=\|<\|>\|@\|\*\*\|!=\|\~=\)"
+syn match   plsqlOperator "\(^=\|<=\|>=\|:=\|=>\|\.\.\|||\|<<\|>>\|\"\)"
+
+" Some of Oracle's SQL keywords.
+syn keyword plsqlSQLKeyword ABORT ACCESS ACCESSED ADD AFTER ALL ALTER AND ANY
+syn keyword plsqlSQLKeyword AS ASC ATTRIBUTE AUDIT AUTHORIZATION AVG BASE_TABLE
+syn keyword plsqlSQLKeyword BEFORE BETWEEN BY CASCADE CAST CHECK CLUSTER
+syn keyword plsqlSQLKeyword CLUSTERS COLAUTH COLUMN COMMENT COMPRESS CONNECT
+syn keyword plsqlSQLKeyword CONSTRAINT CRASH CREATE CURRENT DATA DATABASE
+syn keyword plsqlSQLKeyword DATA_BASE DBA DEFAULT DELAY DELETE DESC DISTINCT
+syn keyword plsqlSQLKeyword DROP DUAL ELSE EXCLUSIVE EXISTS EXTENDS EXTRACT
+syn keyword plsqlSQLKeyword FILE FORCE FOREIGN FROM GRANT GROUP HAVING HEAP
+syn keyword plsqlSQLKeyword IDENTIFIED IDENTIFIER IMMEDIATE IN INCLUDING
+syn keyword plsqlSQLKeyword INCREMENT INDEX INDEXES INITIAL INSERT INSTEAD
+syn keyword plsqlSQLKeyword INTERSECT INTO INVALIDATE IS ISOLATION KEY LIBRARY
+syn keyword plsqlSQLKeyword LIKE LOCK MAXEXTENTS MINUS MODE MODIFY MULTISET
+syn keyword plsqlSQLKeyword NESTED NOAUDIT NOCOMPRESS NOT NOWAIT OF OFF OFFLINE
+syn keyword plsqlSQLKeyword ON ONLINE OPERATOR OPTION OR ORDER ORGANIZATION
+syn keyword plsqlSQLKeyword PCTFREE PRIMARY PRIOR PRIVATE PRIVILEGES PUBLIC
+syn keyword plsqlSQLKeyword QUOTA RELEASE RENAME REPLACE RESOURCE REVOKE ROLLBACK
+syn keyword plsqlSQLKeyword ROW ROWLABEL ROWS SCHEMA SELECT SEPARATE SESSION SET
+syn keyword plsqlSQLKeyword SHARE SIZE SPACE START STORE SUCCESSFUL SYNONYM
+syn keyword plsqlSQLKeyword SYSDATE TABLE TABLES TABLESPACE TEMPORARY TO TREAT
+syn keyword plsqlSQLKeyword TRIGGER TRUNCATE UID UNION UNIQUE UNLIMITED UPDATE
+syn keyword plsqlSQLKeyword USE USER VALIDATE VALUES VIEW WHENEVER WHERE WITH
+
+" PL/SQL's own keywords.
+syn keyword plsqlKeyword AGENT AND ANY ARRAY ASSIGN AS AT AUTHID BEGIN BODY BY
+syn keyword plsqlKeyword BULK C CASE CHAR_BASE CHARSETFORM CHARSETID CLOSE
+syn keyword plsqlKeyword COLLECT CONSTANT CONSTRUCTOR CONTEXT CURRVAL DECLARE
+syn keyword plsqlKeyword DVOID EXCEPTION EXCEPTION_INIT EXECUTE EXIT FETCH
+syn keyword plsqlKeyword FINAL FUNCTION GOTO HASH IMMEDIATE IN INDICATOR
+syn keyword plsqlKeyword INSTANTIABLE IS JAVA LANGUAGE LIBRARY MAP MAXLEN
+syn keyword plsqlKeyword MEMBER NAME NEW NOCOPY NUMBER_BASE OBJECT OCICOLL
+syn keyword plsqlKeyword OCIDATE OCIDATETIME OCILOBLOCATOR OCINUMBER OCIRAW
+syn keyword plsqlKeyword OCISTRING OF OPAQUE OPEN OR ORDER OTHERS OUT
+syn keyword plsqlKeyword OVERRIDING PACKAGE PARALLEL_ENABLE PARAMETERS
+syn keyword plsqlKeyword PARTITION PIPELINED PRAGMA PROCEDURE RAISE RANGE REF
+syn keyword plsqlKeyword RESULT RETURN REVERSE ROWTYPE SB1 SELF SHORT SIZE_T
+syn keyword plsqlKeyword SQL SQLCODE SQLERRM STATIC STRUCT SUBTYPE TDO THEN
+syn keyword plsqlKeyword TABLE TIMEZONE_ABBR TIMEZONE_HOUR TIMEZONE_MINUTE
+syn keyword plsqlKeyword TIMEZONE_REGION TYPE UNDER UNSIGNED USING VARIANCE
+syn keyword plsqlKeyword VARRAY VARYING WHEN WRITE
+syn match   plsqlKeyword "\<END\>"
+syn match   plsqlKeyword "\.COUNT\>"hs=s+1
+syn match   plsqlKeyword "\.EXISTS\>"hs=s+1
+syn match   plsqlKeyword "\.FIRST\>"hs=s+1
+syn match   plsqlKeyword "\.LAST\>"hs=s+1
+syn match   plsqlKeyword "\.DELETE\>"hs=s+1
+syn match   plsqlKeyword "\.PREV\>"hs=s+1
+syn match   plsqlKeyword "\.NEXT\>"hs=s+1
+
+" PL/SQL functions.
+syn keyword plsqlFunction ABS ACOS ADD_MONTHS ASCII ASCIISTR ASIN ATAN ATAN2
+syn keyword plsqlFunction BFILENAME BITAND CEIL CHARTOROWID CHR COALESCE
+syn keyword plsqlFunction COMMIT COMMIT_CM COMPOSE CONCAT  CONVERT  COS COSH
+syn keyword plsqlFunction COUNT CUBE CURRENT_DATE CURRENT_TIME CURRENT_TIMESTAMP
+syn keyword plsqlFunction DBTIMEZONE DECODE DECOMPOSE DEREF DUMP EMPTY_BLOB
+syn keyword plsqlFunction EMPTY_CLOB EXISTS EXP FLOOR FROM_TZ GETBND GLB
+syn keyword plsqlFunction GREATEST GREATEST_LB GROUPING HEXTORAW  INITCAP
+syn keyword plsqlFunction INSTR INSTR2 INSTR4 INSTRB INSTRC ISNCHAR LAST_DAY
+syn keyword plsqlFunction LEAST LEAST_UB LENGTH LENGTH2 LENGTH4 LENGTHB LENGTHC
+syn keyword plsqlFunction LN LOCALTIME LOCALTIMESTAMP LOG LOWER LPAD
+syn keyword plsqlFunction LTRIM LUB MAKE_REF MAX MIN MOD MONTHS_BETWEEN
+syn keyword plsqlFunction NCHARTOROWID NCHR NEW_TIME NEXT_DAY NHEXTORAW
+syn keyword plsqlFunction NLS_CHARSET_DECL_LEN NLS_CHARSET_ID NLS_CHARSET_NAME
+syn keyword plsqlFunction NLS_INITCAP NLS_LOWER NLSSORT NLS_UPPER NULLFN NULLIF
+syn keyword plsqlFunction NUMTODSINTERVAL NUMTOYMINTERVAL NVL POWER
+syn keyword plsqlFunction RAISE_APPLICATION_ERROR RAWTOHEX RAWTONHEX REF
+syn keyword plsqlFunction REFTOHEX REPLACE ROLLBACK_NR ROLLBACK_SV ROLLUP ROUND
+syn keyword plsqlFunction ROWIDTOCHAR ROWIDTONCHAR ROWLABEL RPAD RTRIM
+syn keyword plsqlFunction SAVEPOINT SESSIONTIMEZONE SETBND SET_TRANSACTION_USE
+syn keyword plsqlFunction SIGN SIN SINH SOUNDEX SQLCODE SQLERRM SQRT STDDEV
+syn keyword plsqlFunction SUBSTR SUBSTR2 SUBSTR4 SUBSTRB SUBSTRC SUM
+syn keyword plsqlFunction SYS_AT_TIME_ZONE SYS_CONTEXT SYSDATE SYS_EXTRACT_UTC
+syn keyword plsqlFunction SYS_GUID SYS_LITERALTODATE SYS_LITERALTODSINTERVAL
+syn keyword plsqlFunction SYS_LITERALTOTIME SYS_LITERALTOTIMESTAMP
+syn keyword plsqlFunction SYS_LITERALTOTZTIME SYS_LITERALTOTZTIMESTAMP
+syn keyword plsqlFunction SYS_LITERALTOYMINTERVAL SYS_OVER__DD SYS_OVER__DI
+syn keyword plsqlFunction SYS_OVER__ID SYS_OVER_IID SYS_OVER_IIT
+syn keyword plsqlFunction SYS_OVER__IT SYS_OVER__TI SYS_OVER__TT
+syn keyword plsqlFunction SYSTIMESTAMP TAN TANH TO_ANYLOB TO_BLOB TO_CHAR
+syn keyword plsqlFunction TO_CLOB TO_DATE TO_DSINTERVAL TO_LABEL TO_MULTI_BYTE
+syn keyword plsqlFunction TO_NCHAR TO_NCLOB TO_NUMBER TO_RAW TO_SINGLE_BYTE
+syn keyword plsqlFunction TO_TIME TO_TIMESTAMP TO_TIMESTAMP_TZ TO_TIME_TZ
+syn keyword plsqlFunction TO_YMINTERVAL TRANSLATE TREAT TRIM TRUNC TZ_OFFSET UID
+syn keyword plsqlFunction UNISTR UPPER UROWID USER USERENV VALUE VARIANCE
+syn keyword plsqlFunction VSIZE WORK XOR
+syn match   plsqlFunction "\<SYS\$LOB_REPLICATION\>"
+
+" PL/SQL Exceptions
+syn keyword plsqlException ACCESS_INTO_NULL CASE_NOT_FOUND COLLECTION_IS_NULL
+syn keyword plsqlException CURSOR_ALREADY_OPEN DUP_VAL_ON_INDEX INVALID_CURSOR
+syn keyword plsqlException INVALID_NUMBER LOGIN_DENIED NO_DATA_FOUND
+syn keyword plsqlException NOT_LOGGED_ON PROGRAM_ERROR ROWTYPE_MISMATCH
+syn keyword plsqlException SELF_IS_NULL STORAGE_ERROR SUBSCRIPT_BEYOND_COUNT
+syn keyword plsqlException SUBSCRIPT_OUTSIDE_LIMIT SYS_INVALID_ROWID
+syn keyword plsqlException TIMEOUT_ON_RESOURCE TOO_MANY_ROWS VALUE_ERROR
+syn keyword plsqlException ZERO_DIVIDE
+
+" Oracle Pseudo Colums.
+syn keyword plsqlPseudo CURRVAL LEVEL NEXTVAL ROWID ROWNUM
+
+if exists("plsql_highlight_triggers")
+  syn keyword plsqlTrigger INSERTING UPDATING DELETING
+endif
+
+" Conditionals.
+syn keyword plsqlConditional ELSIF ELSE IF
+syn match   plsqlConditional "\<END\s\+IF\>"
+
+" Loops.
+syn keyword plsqlRepeat FOR LOOP WHILE FORALL
+syn match   plsqlRepeat "\<END\s\+LOOP\>"
+
+" Various types of comments.
+if exists("c_comment_strings")
+  syntax match plsqlCommentSkip contained "^\s*\*\($\|\s\+\)"
+  syntax region plsqlCommentString contained start=+L\="+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=plsqlCommentSkip
+  syntax region plsqlComment2String contained start=+L\="+ skip=+\\\\\|\\"+ end=+"+ end="$"
+  syntax region plsqlCommentL start="--" skip="\\$" end="$" keepend contains=@plsqlCommentGroup,plsqlComment2String,plsqlCharLiteral,plsqlBooleanLiteral,plsqlNumbersCom,plsqlSpaceError
+  syntax region plsqlComment start="/\*" end="\*/" contains=@plsqlCommentGroup,plsqlComment2String,plsqlCharLiteral,plsqlBooleanLiteral,plsqlNumbersCom,plsqlSpaceError
+else
+  syntax region plsqlCommentL start="--" skip="\\$" end="$" keepend contains=@plsqlCommentGroup,plsqlSpaceError
+  syntax region plsqlComment start="/\*" end="\*/" contains=@plsqlCommentGroup,plsqlSpaceError
+endif
+
+syn sync ccomment plsqlComment
+syn sync ccomment plsqlCommentL
+
+" To catch unterminated string literals.
+syn match   plsqlStringError "'.*$"
+
+" Various types of literals.
+syn match   plsqlNumbers transparent "\<[+-]\=\d\|[+-]\=\.\d" contains=plsqlIntLiteral,plsqlFloatLiteral
+syn match   plsqlNumbersCom contained transparent "\<[+-]\=\d\|[+-]\=\.\d" contains=plsqlIntLiteral,plsqlFloatLiteral
+syn match   plsqlIntLiteral contained "[+-]\=\d\+"
+syn match   plsqlFloatLiteral contained "[+-]\=\d\+\.\d*"
+syn match   plsqlFloatLiteral contained "[+-]\=\d*\.\d*"
+syn match   plsqlCharLiteral    "'[^']'"
+syn match   plsqlStringLiteral  "'\([^']\|''\)*'"
+syn keyword plsqlBooleanLiteral TRUE FALSE NULL
+
+" The built-in types.
+syn keyword plsqlStorage ANYDATA ANYTYPE BFILE BINARY_INTEGER BLOB BOOLEAN
+syn keyword plsqlStorage BYTE CHAR CHARACTER CLOB CURSOR DATE DAY DEC DECIMAL
+syn keyword plsqlStorage DOUBLE DSINTERVAL_UNCONSTRAINED FLOAT HOUR
+syn keyword plsqlStorage INT INTEGER INTERVAL LOB LONG MINUTE
+syn keyword plsqlStorage MLSLABEL MONTH NATURAL NATURALN NCHAR NCHAR_CS NCLOB
+syn keyword plsqlStorage NUMBER NUMERIC NVARCHAR PLS_INT PLS_INTEGER
+syn keyword plsqlStorage POSITIVE POSITIVEN PRECISION RAW REAL RECORD
+syn keyword plsqlStorage SECOND SIGNTYPE SMALLINT STRING SYS_REFCURSOR TABLE TIME
+syn keyword plsqlStorage TIMESTAMP TIMESTAMP_UNCONSTRAINED
+syn keyword plsqlStorage TIMESTAMP_TZ_UNCONSTRAINED
+syn keyword plsqlStorage TIMESTAMP_LTZ_UNCONSTRAINED UROWID VARCHAR
+syn keyword plsqlStorage VARCHAR2 YEAR YMINTERVAL_UNCONSTRAINED ZONE
+
+" A type-attribute is really a type.
+syn match plsqlTypeAttribute  "%\(TYPE\|ROWTYPE\)\>"
+
+" All other attributes.
+syn match plsqlAttribute "%\(BULK_EXCEPTIONS\|BULK_ROWCOUNT\|ISOPEN\|FOUND\|NOTFOUND\|ROWCOUNT\)\>"
+
+" This'll catch mis-matched close-parens.
+syn cluster plsqlParenGroup contains=plsqlParenError,@plsqlCommentGroup,plsqlCommentSkip,plsqlIntLiteral,plsqlFloatLiteral,plsqlNumbersCom
+if exists("c_no_bracket_error")
+  syn region plsqlParen transparent start='(' end=')' contains=ALLBUT,@plsqlParenGroup
+  syn match plsqlParenError ")"
+  syn match plsqlErrInParen contained "[{}]"
+else
+  syn region plsqlParen transparent start='(' end=')' contains=ALLBUT,@plsqlParenGroup,plsqlErrInBracket
+  syn match plsqlParenError "[\])]"
+  syn match plsqlErrInParen contained "[{}]"
+  syn region plsqlBracket transparent start='\[' end=']' contains=ALLBUT,@plsqlParenGroup,plsqlErrInParen
+  syn match plsqlErrInBracket contained "[);{}]"
+endif
+
+" Syntax Synchronizing
+syn sync minlines=10 maxlines=100
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet.
+
+hi def link plsqlAttribute		Macro
+hi def link plsqlBlockError	Error
+hi def link plsqlBooleanLiteral	Boolean
+hi def link plsqlCharLiteral	Character
+hi def link plsqlComment		Comment
+hi def link plsqlCommentL		Comment
+hi def link plsqlConditional	Conditional
+hi def link plsqlError		Error
+hi def link plsqlErrInBracket	Error
+hi def link plsqlErrInBlock	Error
+hi def link plsqlErrInParen	Error
+hi def link plsqlException		Function
+hi def link plsqlFloatLiteral	Float
+hi def link plsqlFunction		Function
+hi def link plsqlGarbage		Error
+hi def link plsqlHostIdentifier	Label
+hi def link plsqlIdentifier	Normal
+hi def link plsqlIntLiteral	Number
+hi def link plsqlOperator		Operator
+hi def link plsqlParen		Normal
+hi def link plsqlParenError	Error
+hi def link plsqlSpaceError	Error
+hi def link plsqlPseudo		PreProc
+hi def link plsqlKeyword		Keyword
+hi def link plsqlRepeat		Repeat
+hi def link plsqlStorage		StorageClass
+hi def link plsqlSQLKeyword	Function
+hi def link plsqlStringError	Error
+hi def link plsqlStringLiteral	String
+hi def link plsqlCommentString	String
+hi def link plsqlComment2String	String
+hi def link plsqlSymbol		Normal
+hi def link plsqlTrigger		Function
+hi def link plsqlTypeAttribute	StorageClass
+hi def link plsqlTodo		Todo
+
+
+let b:current_syntax = "plsql"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/po.vim b/syntax/po.vim
new file mode 100644
index 000000000..f615205b7
--- /dev/null
+++ b/syntax/po.vim
@@ -0,0 +1,137 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'po') == -1
+
+" Vim syntax file
+" Language:	po (gettext)
+" Maintainer:	Dwayne Bailey <dwayne@translate.org.za>
+" Last Change:	2015 Jun 07
+" Contributors: Dwayne Bailey (Most advanced syntax highlighting)
+"               Leonardo Fontenelle (Spell checking)
+"               Nam SungHyun <namsh@kldp.org> (Original maintainer)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+syn sync minlines=10
+
+" Identifiers
+syn match  poStatementMsgCTxt "^msgctxt"
+syn match  poStatementMsgidplural "^msgid_plural" contained
+syn match  poPluralCaseN "[0-9]" contained
+syn match  poStatementMsgstr "^msgstr\(\[[0-9]\]\)" contains=poPluralCaseN
+
+" Simple HTML and XML highlighting
+syn match  poHtml "<\_[^<>]\+>" contains=poHtmlTranslatables,poLineBreak
+syn match  poHtmlNot +"<[^<]\+>"+ms=s+1,me=e-1
+syn region poHtmlTranslatables start=+\(abbr\|alt\|content\|summary\|standby\|title\)=\\"+ms=e-1 end=+\\"+ contained contains=@Spell
+syn match poLineBreak +"\n"+ contained
+
+" Translation blocks
+syn region     poMsgCTxt	matchgroup=poStatementMsgCTxt start=+^msgctxt "+rs=e-1 matchgroup=poStringCTxt end=+^msgid "+me=s-1 contains=poStringCTxt
+syn region     poMsgID	matchgroup=poStatementMsgid start=+^msgid "+rs=e-1 matchgroup=poStringID end=+^msgstr\(\|\[[\]0\[]\]\) "+me=s-1 contains=poStringID,poStatementMsgidplural,poStatementMsgid
+syn region     poMsgSTR	matchgroup=poStatementMsgstr start=+^msgstr\(\|\[[\]0\[]\]\) "+rs=e-1 matchgroup=poStringSTR end=+\n\n+me=s-1 contains=poStringSTR,poStatementMsgstr
+syn region poStringCTxt	start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn region poStringID	start=+"+ skip=+\\\\\|\\"+ end=+"+ contained 
+                            \ contains=poSpecial,poFormat,poCommentKDE,poPluralKDE,poKDEdesktopFile,poHtml,poAcceleratorId,poHtmlNot,poVariable
+syn region poStringSTR	start=+"+ skip=+\\\\\|\\"+ end=+"+ contained 
+                            \ contains=@Spell,poSpecial,poFormat,poHeaderItem,poCommentKDEError,poHeaderUndefined,poPluralKDEError,poMsguniqError,poKDEdesktopFile,poHtml,poAcceleratorStr,poHtmlNot,poVariable
+
+" Header and Copyright
+syn match     poHeaderItem "\(Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|Language\|MIME-Version\|Content-Type\|Content-Transfer-Encoding\|Plural-Forms\|X-Generator\): " contained
+syn match     poHeaderUndefined "\(PACKAGE VERSION\|YEAR-MO-DA HO:MI+ZONE\|FULL NAME <EMAIL@ADDRESS>\|LANGUAGE <LL@li.org>\|CHARSET\|ENCODING\|INTEGER\|EXPRESSION\)" contained
+syn match     poCopyrightUnset "SOME DESCRIPTIVE TITLE\|FIRST AUTHOR <EMAIL@ADDRESS>, YEAR\|Copyright (C) YEAR Free Software Foundation, Inc\|YEAR THE PACKAGE\'S COPYRIGHT HOLDER\|PACKAGE" contained
+
+" Translation comment block including: translator comment, automatic coments, flags and locations
+syn match     poComment "^#.*$"
+syn keyword   poFlagFuzzy fuzzy contained
+syn match     poCommentTranslator "^# .*$" contains=poCopyrightUnset
+syn match     poCommentAutomatic "^#\..*$" 
+syn match     poCommentSources	"^#:.*$"
+syn match     poCommentFlags "^#,.*$" contains=poFlagFuzzy
+syn match     poDiffOld '\(^#| "[^{]*+}\|{+[^}]*+}\|{+[^}]*\|"$\)' contained
+syn match     poDiffNew '\(^#| "[^{]*-}\|{-[^}]*-}\|{-[^}]*\|"$\)' contained
+syn match     poCommentDiff "^#|.*$" contains=poDiffOld,poDiffNew
+
+" Translations (also includes header fields as they appear in a translation msgstr)
+syn region poCommentKDE	  start=+"_: +ms=s+1 end="\\n" end="\"\n^msgstr"me=s-1 contained
+syn region poCommentKDEError  start=+"\(\|\s\+\)_:+ms=s+1 end="\\n" end=+"\n\n+me=s-1 contained
+syn match  poPluralKDE   +"_n: +ms=s+1 contained
+syn region poPluralKDEError   start=+"\(\|\s\+\)_n:+ms=s+1 end="\"\n\n"me=s-1 contained
+syn match  poSpecial	contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)"
+syn match  poFormat	"%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([diuoxXfeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
+syn match  poFormat	"%%" contained
+
+" msguniq and msgcat conflicts
+syn region poMsguniqError matchgroup=poMsguniqErrorMarkers  start="#-#-#-#-#"  end='#\("\n"\|\)-\("\n"\|\)#\("\n"\|\)-\("\n"\|\)#\("\n"\|\)-\("\n"\|\)#\("\n"\|\)-\("\n"\|\)#\("\n"\|\)\\n' contained
+
+" Obsolete messages
+syn match poObsolete "^#\~.*$" 
+
+" KDE Name= handling
+syn match poKDEdesktopFile "\"\(Name\|Comment\|GenericName\|Description\|Keywords\|About\)="ms=s+1,me=e-1
+
+" Accelerator keys - this messes up if the preceding or following char is a multibyte unicode char
+syn match poAcceleratorId  contained "[^&_~][&_~]\(\a\|\d\)[^:]"ms=s+1,me=e-1 
+syn match poAcceleratorStr  contained "[^&_~][&_~]\(\a\|\d\)[^:]"ms=s+1,me=e-1 contains=@Spell
+
+" Variables simple
+syn match poVariable contained "%\d"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link poCommentSources    PreProc
+hi def link poComment	     Comment
+hi def link poCommentAutomatic  Comment
+hi def link poCommentTranslator Comment
+hi def link poCommentFlags      Special
+hi def link poCommentDiff       Comment
+hi def link poCopyrightUnset    Todo
+hi def link poFlagFuzzy         Todo
+hi def link poDiffOld           Todo
+hi def link poDiffNew          Special
+hi def link poObsolete         Comment
+
+hi def link poStatementMsgid   Statement
+hi def link poStatementMsgstr  Statement
+hi def link poStatementMsgidplural  Statement
+hi def link poStatementMsgCTxt Statement
+hi def link poPluralCaseN      Constant
+
+hi def link poStringCTxt	    Comment
+hi def link poStringID	    String
+hi def link poStringSTR	    String
+hi def link poCommentKDE       Comment
+hi def link poCommentKDEError  Error
+hi def link poPluralKDE        Comment
+hi def link poPluralKDEError   Error
+hi def link poHeaderItem       Identifier
+hi def link poHeaderUndefined  Todo
+hi def link poKDEdesktopFile   Identifier
+
+hi def link poHtml              Identifier
+hi def link poHtmlNot           String
+hi def link poHtmlTranslatables String
+hi def link poLineBreak         String
+
+hi def link poFormat	    poSpecial
+hi def link poSpecial	    Special
+hi def link poAcceleratorId    Special
+hi def link poAcceleratorStr   Special
+hi def link poVariable         Special
+
+hi def link poMsguniqError        Special
+hi def link poMsguniqErrorMarkers Comment
+
+
+let b:current_syntax = "po"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim:set ts=8 sts=2 sw=2 noet:
+
+endif
diff --git a/syntax/postscr.vim b/syntax/postscr.vim
new file mode 100644
index 000000000..3062adcc0
--- /dev/null
+++ b/syntax/postscr.vim
@@ -0,0 +1,784 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'postscr') == -1
+
+" Vim syntax file
+" Language:     PostScript - all Levels, selectable
+" Maintainer:   Mike Williams <mrw@eandem.co.uk>
+" Filenames:    *.ps,*.eps
+" Last Change:  31st October 2007
+" URL:          http://www.eandem.co.uk/mrw/vim
+"
+" Options Flags:
+" postscr_level                 - language level to use for highligting (1, 2, or 3)
+" postscr_display               - include display PS operators
+" postscr_ghostscript           - include GS extensions
+" postscr_fonts                 - highlight standard font names (a lot for PS 3)
+" postscr_encodings             - highlight encoding names (there are a lot)
+" postscr_andornot_binary       - highlight and, or, and not as binary operators (not logical)
+"
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" PostScript is case sensitive
+syn case match
+
+" Keyword characters - all 7-bit ASCII bar PS delimiters and ws
+setlocal iskeyword=33-127,^(,^),^<,^>,^[,^],^{,^},^/,^%
+
+" Yer trusty old TODO highlghter!
+syn keyword postscrTodo contained  TODO
+
+" Comment
+syn match postscrComment        "%.*$" contains=postscrTodo,@Spell
+" DSC comment start line (NB: defines DSC level, not PS level!)
+syn match postscrDSCComment    	"^%!PS-Adobe-\d\+\.\d\+\s*.*$"
+" DSC comment line (no check on possible comments - another language!)
+syn match postscrDSCComment    	"^%%\u\+.*$" contains=@postscrString,@postscrNumber,@Spell
+" DSC continuation line (no check that previous line is DSC comment)
+syn match  postscrDSCComment    "^%%+ *.*$" contains=@postscrString,@postscrNumber,@Spell
+
+" Names
+syn match postscrName           "\k\+"
+
+" Identifiers
+syn match postscrIdentifierError "/\{1,2}[[:space:]\[\]{}]"me=e-1
+syn match postscrIdentifier     "/\{1,2}\k\+" contains=postscrConstant,postscrBoolean,postscrCustConstant
+
+" Numbers
+syn case ignore
+" In file hex data - usually complete lines
+syn match postscrHex            "^[[:xdigit:]][[:xdigit:][:space:]]*$"
+"syn match postscrHex            "\<\x\{2,}\>"
+" Integers
+syn match postscrInteger        "\<[+-]\=\d\+\>"
+" Radix
+syn match postscrRadix          "\d\+#\x\+\>"
+" Reals - upper and lower case e is allowed
+syn match postscrFloat          "[+-]\=\d\+\.\>"
+syn match postscrFloat          "[+-]\=\d\+\.\d*\(e[+-]\=\d\+\)\=\>"
+syn match postscrFloat          "[+-]\=\.\d\+\(e[+-]\=\d\+\)\=\>"
+syn match postscrFloat          "[+-]\=\d\+e[+-]\=\d\+\>"
+syn cluster postscrNumber       contains=postscrInteger,postscrRadix,postscrFloat
+syn case match
+
+" Escaped characters
+syn match postscrSpecialChar    contained "\\[nrtbf\\()]"
+syn match postscrSpecialCharError contained "\\[^nrtbf\\()]"he=e-1
+" Escaped octal characters
+syn match postscrSpecialChar    contained "\\\o\{1,3}"
+
+" Strings
+" ASCII strings
+syn region postscrASCIIString   start=+(+ end=+)+ skip=+([^)]*)+ contains=postscrSpecialChar,postscrSpecialCharError,@Spell
+syn match postscrASCIIStringError ")"
+" Hex strings
+syn match postscrHexCharError   contained "[^<>[:xdigit:][:space:]]"
+syn region postscrHexString     start=+<\($\|[^<]\)+ end=+>+ contains=postscrHexCharError
+syn match postscrHexString      "<>"
+" ASCII85 strings
+syn match postscrASCII85CharError contained "[^<>\~!-uz[:space:]]"
+syn region postscrASCII85String start=+<\~+ end=+\~>+ contains=postscrASCII85CharError
+syn cluster postscrString       contains=postscrASCIIString,postscrHexString,postscrASCII85String
+
+
+" Set default highlighting to level 2 - most common at the moment
+if !exists("postscr_level")
+  let postscr_level = 2
+endif
+
+
+" PS level 1 operators - common to all levels (well ...)
+
+" Stack operators
+syn keyword postscrOperator     pop exch dup copy index roll clear count mark cleartomark counttomark
+
+" Math operators
+syn keyword postscrMathOperator add div idiv mod mul sub abs neg ceiling floor round truncate sqrt atan cos
+syn keyword postscrMathOperator sin exp ln log rand srand rrand
+
+" Array operators
+syn match postscrOperator       "[\[\]{}]"
+syn keyword postscrOperator     array length get put getinterval putinterval astore aload copy
+syn keyword postscrRepeat       forall
+
+" Dictionary operators
+syn keyword postscrOperator     dict maxlength begin end def load store known where currentdict
+syn keyword postscrOperator     countdictstack dictstack cleardictstack internaldict
+syn keyword postscrConstant     $error systemdict userdict statusdict errordict
+
+" String operators
+syn keyword postscrOperator     string anchorsearch search token
+
+" Logic operators
+syn keyword postscrLogicalOperator eq ne ge gt le lt and not or
+if exists("postscr_andornot_binaryop")
+  syn keyword postscrBinaryOperator and or not
+else
+  syn keyword postscrLogicalOperator and not or
+endif
+syn keyword postscrBinaryOperator xor bitshift
+syn keyword postscrBoolean      true false
+
+" PS Type names
+syn keyword postscrConstant     arraytype booleantype conditiontype dicttype filetype fonttype gstatetype
+syn keyword postscrConstant     integertype locktype marktype nametype nulltype operatortype
+syn keyword postscrConstant     packedarraytype realtype savetype stringtype
+
+" Control operators
+syn keyword postscrConditional  if ifelse
+syn keyword postscrRepeat       for repeat loop
+syn keyword postscrOperator     exec exit stop stopped countexecstack execstack quit
+syn keyword postscrProcedure    start
+
+" Object operators
+syn keyword postscrOperator     type cvlit cvx xcheck executeonly noaccess readonly rcheck wcheck cvi cvn cvr
+syn keyword postscrOperator     cvrs cvs
+
+" File operators
+syn keyword postscrOperator     file closefile read write readhexstring writehexstring readstring writestring
+syn keyword postscrOperator     bytesavailable flush flushfile resetfile status run currentfile print
+syn keyword postscrOperator     stack pstack readline deletefile setfileposition fileposition renamefile
+syn keyword postscrRepeat       filenameforall
+syn keyword postscrProcedure    = ==
+
+" VM operators
+syn keyword postscrOperator     save restore
+
+" Misc operators
+syn keyword postscrOperator     bind null usertime executive echo realtime
+syn keyword postscrConstant     product revision serialnumber version
+syn keyword postscrProcedure    prompt
+
+" GState operators
+syn keyword postscrOperator     gsave grestore grestoreall initgraphics setlinewidth setlinecap currentgray
+syn keyword postscrOperator     currentlinejoin setmiterlimit currentmiterlimit setdash currentdash setgray
+syn keyword postscrOperator     sethsbcolor currenthsbcolor setrgbcolor currentrgbcolor currentlinewidth
+syn keyword postscrOperator     currentlinecap setlinejoin setcmykcolor currentcmykcolor
+
+" Device gstate operators
+syn keyword postscrOperator     setscreen currentscreen settransfer currenttransfer setflat currentflat
+syn keyword postscrOperator     currentblackgeneration setblackgeneration setundercolorremoval
+syn keyword postscrOperator     setcolorscreen currentcolorscreen setcolortransfer currentcolortransfer
+syn keyword postscrOperator     currentundercolorremoval
+
+" Matrix operators
+syn keyword postscrOperator     matrix initmatrix identmatrix defaultmatrix currentmatrix setmatrix translate
+syn keyword postscrOperator     concat concatmatrix transform dtransform itransform idtransform invertmatrix
+syn keyword postscrOperator     scale rotate
+
+" Path operators
+syn keyword postscrOperator     newpath currentpoint moveto rmoveto lineto rlineto arc arcn arcto curveto
+syn keyword postscrOperator     closepath flattenpath reversepath strokepath charpath clippath pathbbox
+syn keyword postscrOperator     initclip clip eoclip rcurveto
+syn keyword postscrRepeat       pathforall
+
+" Painting operators
+syn keyword postscrOperator     erasepage fill eofill stroke image imagemask colorimage
+
+" Device operators
+syn keyword postscrOperator     showpage copypage nulldevice
+
+" Character operators
+syn keyword postscrProcedure    findfont
+syn keyword postscrConstant     FontDirectory ISOLatin1Encoding StandardEncoding
+syn keyword postscrOperator     definefont scalefont makefont setfont currentfont show ashow
+syn keyword postscrOperator     stringwidth kshow setcachedevice
+syn keyword postscrOperator     setcharwidth widthshow awidthshow findencoding cshow rootfont setcachedevice2
+
+" Interpreter operators
+syn keyword postscrOperator     vmstatus cachestatus setcachelimit
+
+" PS constants
+syn keyword postscrConstant     contained Gray Red Green Blue All None DeviceGray DeviceRGB
+
+" PS Filters
+syn keyword postscrConstant     contained ASCIIHexDecode ASCIIHexEncode ASCII85Decode ASCII85Encode LZWDecode
+syn keyword postscrConstant     contained RunLengthDecode RunLengthEncode SubFileDecode NullEncode
+syn keyword postscrConstant     contained GIFDecode PNGDecode LZWEncode
+
+" PS JPEG filter dictionary entries
+syn keyword postscrConstant     contained DCTEncode DCTDecode Colors HSamples VSamples QuantTables QFactor
+syn keyword postscrConstant     contained HuffTables ColorTransform
+
+" PS CCITT filter dictionary entries
+syn keyword postscrConstant     contained CCITTFaxEncode CCITTFaxDecode Uncompressed K EndOfLine
+syn keyword postscrConstant     contained Columns Rows EndOfBlock Blacks1 DamagedRowsBeforeError
+syn keyword postscrConstant     contained EncodedByteAlign
+
+" PS Form dictionary entries
+syn keyword postscrConstant     contained FormType XUID BBox Matrix PaintProc Implementation
+
+" PS Errors
+syn keyword postscrProcedure    handleerror
+syn keyword postscrConstant     contained  configurationerror dictfull dictstackunderflow dictstackoverflow
+syn keyword postscrConstant     contained  execstackoverflow interrupt invalidaccess
+syn keyword postscrConstant     contained  invalidcontext invalidexit invalidfileaccess invalidfont
+syn keyword postscrConstant     contained  invalidid invalidrestore ioerror limitcheck nocurrentpoint
+syn keyword postscrConstant     contained  rangecheck stackoverflow stackunderflow syntaxerror timeout
+syn keyword postscrConstant     contained  typecheck undefined undefinedfilename undefinedresource
+syn keyword postscrConstant     contained  undefinedresult unmatchedmark unregistered VMerror
+
+if exists("postscr_fonts")
+" Font names
+  syn keyword postscrConstant   contained Symbol Times-Roman Times-Italic Times-Bold Times-BoldItalic
+  syn keyword postscrConstant   contained Helvetica Helvetica-Oblique Helvetica-Bold Helvetica-BoldOblique
+  syn keyword postscrConstant   contained Courier Courier-Oblique Courier-Bold Courier-BoldOblique
+endif
+
+
+if exists("postscr_display")
+" Display PS only operators
+  syn keyword postscrOperator   currentcontext fork join detach lock monitor condition wait notify yield
+  syn keyword postscrOperator   viewclip eoviewclip rectviewclip initviewclip viewclippath deviceinfo
+  syn keyword postscrOperator   sethalftonephase currenthalftonephase wtranslation defineusername
+endif
+
+" PS Character encoding names
+if exists("postscr_encodings")
+" Common encoding names
+  syn keyword postscrConstant   contained .notdef
+
+" Standard and ISO encoding names
+  syn keyword postscrConstant   contained space exclam quotedbl numbersign dollar percent ampersand quoteright
+  syn keyword postscrConstant   contained parenleft parenright asterisk plus comma hyphen period slash zero
+  syn keyword postscrConstant   contained one two three four five six seven eight nine colon semicolon less
+  syn keyword postscrConstant   contained equal greater question at
+  syn keyword postscrConstant   contained bracketleft backslash bracketright asciicircum underscore quoteleft
+  syn keyword postscrConstant   contained braceleft bar braceright asciitilde
+  syn keyword postscrConstant   contained exclamdown cent sterling fraction yen florin section currency
+  syn keyword postscrConstant   contained quotesingle quotedblleft guillemotleft guilsinglleft guilsinglright
+  syn keyword postscrConstant   contained fi fl endash dagger daggerdbl periodcentered paragraph bullet
+  syn keyword postscrConstant   contained quotesinglbase quotedblbase quotedblright guillemotright ellipsis
+  syn keyword postscrConstant   contained perthousand questiondown grave acute circumflex tilde macron breve
+  syn keyword postscrConstant   contained dotaccent dieresis ring cedilla hungarumlaut ogonek caron emdash
+  syn keyword postscrConstant   contained AE ordfeminine Lslash Oslash OE ordmasculine ae dotlessi lslash
+  syn keyword postscrConstant   contained oslash oe germandbls
+" The following are valid names, but are used as short procedure names in generated PS!
+" a b c d e f g h i j k l m n o p q r s t u v w x y z
+" A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
+
+" Symbol encoding names
+  syn keyword postscrConstant   contained universal existential suchthat asteriskmath minus
+  syn keyword postscrConstant   contained congruent Alpha Beta Chi Delta Epsilon Phi Gamma Eta Iota theta1
+  syn keyword postscrConstant   contained Kappa Lambda Mu Nu Omicron Pi Theta Rho Sigma Tau Upsilon sigma1
+  syn keyword postscrConstant   contained Omega Xi Psi Zeta therefore perpendicular
+  syn keyword postscrConstant   contained radicalex alpha beta chi delta epsilon phi gamma eta iota phi1
+  syn keyword postscrConstant   contained kappa lambda mu nu omicron pi theta rho sigma tau upsilon omega1
+  syn keyword postscrConstant   contained Upsilon1 minute lessequal infinity club diamond heart spade
+  syn keyword postscrConstant   contained arrowboth arrowleft arrowup arrowright arrowdown degree plusminus
+  syn keyword postscrConstant   contained second greaterequal multiply proportional partialdiff divide
+  syn keyword postscrConstant   contained notequal equivalence approxequal arrowvertex arrowhorizex
+  syn keyword postscrConstant   contained aleph Ifraktur Rfraktur weierstrass circlemultiply circleplus
+  syn keyword postscrConstant   contained emptyset intersection union propersuperset reflexsuperset notsubset
+  syn keyword postscrConstant   contained propersubset reflexsubset element notelement angle gradient
+  syn keyword postscrConstant   contained registerserif copyrightserif trademarkserif radical dotmath
+  syn keyword postscrConstant   contained logicalnot logicaland logicalor arrowdblboth arrowdblleft arrowdblup
+  syn keyword postscrConstant   contained arrowdblright arrowdbldown omega xi psi zeta similar carriagereturn
+  syn keyword postscrConstant   contained lozenge angleleft registersans copyrightsans trademarksans summation
+  syn keyword postscrConstant   contained parenlefttp parenleftex parenleftbt bracketlefttp bracketleftex
+  syn keyword postscrConstant   contained bracketleftbt bracelefttp braceleftmid braceleftbt braceex euro
+  syn keyword postscrConstant   contained angleright integral integraltp integralex integralbt parenrighttp
+  syn keyword postscrConstant   contained parenrightex parenrightbt bracketrighttp bracketrightex
+  syn keyword postscrConstant   contained bracketrightbt bracerighttp bracerightmid bracerightbt
+
+" ISO Latin1 encoding names
+  syn keyword postscrConstant   contained brokenbar copyright registered twosuperior threesuperior
+  syn keyword postscrConstant   contained onesuperior onequarter onehalf threequarters
+  syn keyword postscrConstant   contained Agrave Aacute Acircumflex Atilde Adieresis Aring Ccedilla Egrave
+  syn keyword postscrConstant   contained Eacute Ecircumflex Edieresis Igrave Iacute Icircumflex Idieresis
+  syn keyword postscrConstant   contained Eth Ntilde Ograve Oacute Ocircumflex Otilde Odieresis Ugrave Uacute
+  syn keyword postscrConstant   contained Ucircumflex Udieresis Yacute Thorn
+  syn keyword postscrConstant   contained agrave aacute acircumflex atilde adieresis aring ccedilla egrave
+  syn keyword postscrConstant   contained eacute ecircumflex edieresis igrave iacute icircumflex idieresis
+  syn keyword postscrConstant   contained eth ntilde ograve oacute ocircumflex otilde odieresis ugrave uacute
+  syn keyword postscrConstant   contained ucircumflex udieresis yacute thorn ydieresis
+  syn keyword postscrConstant   contained zcaron exclamsmall Hungarumlautsmall dollaroldstyle dollarsuperior
+  syn keyword postscrConstant   contained ampersandsmall Acutesmall parenleftsuperior parenrightsuperior
+  syn keyword postscrConstant   contained twodotenleader onedotenleader zerooldstyle oneoldstyle twooldstyle
+  syn keyword postscrConstant   contained threeoldstyle fouroldstyle fiveoldstyle sixoldstyle sevenoldstyle
+  syn keyword postscrConstant   contained eightoldstyle nineoldstyle commasuperior
+  syn keyword postscrConstant   contained threequartersemdash periodsuperior questionsmall asuperior bsuperior
+  syn keyword postscrConstant   contained centsuperior dsuperior esuperior isuperior lsuperior msuperior
+  syn keyword postscrConstant   contained nsuperior osuperior rsuperior ssuperior tsuperior ff ffi ffl
+  syn keyword postscrConstant   contained parenleftinferior parenrightinferior Circumflexsmall hyphensuperior
+  syn keyword postscrConstant   contained Gravesmall Asmall Bsmall Csmall Dsmall Esmall Fsmall Gsmall Hsmall
+  syn keyword postscrConstant   contained Ismall Jsmall Ksmall Lsmall Msmall Nsmall Osmall Psmall Qsmall
+  syn keyword postscrConstant   contained Rsmall Ssmall Tsmall Usmall Vsmall Wsmall Xsmall Ysmall Zsmall
+  syn keyword postscrConstant   contained colonmonetary onefitted rupiah Tildesmall exclamdownsmall
+  syn keyword postscrConstant   contained centoldstyle Lslashsmall Scaronsmall Zcaronsmall Dieresissmall
+  syn keyword postscrConstant   contained Brevesmall Caronsmall Dotaccentsmall Macronsmall figuredash
+  syn keyword postscrConstant   contained hypheninferior Ogoneksmall Ringsmall Cedillasmall questiondownsmall
+  syn keyword postscrConstant   contained oneeighth threeeighths fiveeighths seveneighths onethird twothirds
+  syn keyword postscrConstant   contained zerosuperior foursuperior fivesuperior sixsuperior sevensuperior
+  syn keyword postscrConstant   contained eightsuperior ninesuperior zeroinferior oneinferior twoinferior
+  syn keyword postscrConstant   contained threeinferior fourinferior fiveinferior sixinferior seveninferior
+  syn keyword postscrConstant   contained eightinferior nineinferior centinferior dollarinferior periodinferior
+  syn keyword postscrConstant   contained commainferior Agravesmall Aacutesmall Acircumflexsmall
+  syn keyword postscrConstant   contained Atildesmall Adieresissmall Aringsmall AEsmall Ccedillasmall
+  syn keyword postscrConstant   contained Egravesmall Eacutesmall Ecircumflexsmall Edieresissmall Igravesmall
+  syn keyword postscrConstant   contained Iacutesmall Icircumflexsmall Idieresissmall Ethsmall Ntildesmall
+  syn keyword postscrConstant   contained Ogravesmall Oacutesmall Ocircumflexsmall Otildesmall Odieresissmall
+  syn keyword postscrConstant   contained OEsmall Oslashsmall Ugravesmall Uacutesmall Ucircumflexsmall
+  syn keyword postscrConstant   contained Udieresissmall Yacutesmall Thornsmall Ydieresissmall Black Bold Book
+  syn keyword postscrConstant   contained Light Medium Regular Roman Semibold
+
+" Sundry standard and expert encoding names
+  syn keyword postscrConstant   contained trademark Scaron Ydieresis Zcaron scaron softhyphen overscore
+  syn keyword postscrConstant   contained graybox Sacute Tcaron Zacute sacute tcaron zacute Aogonek Scedilla
+  syn keyword postscrConstant   contained Zdotaccent aogonek scedilla Lcaron lcaron zdotaccent Racute Abreve
+  syn keyword postscrConstant   contained Lacute Cacute Ccaron Eogonek Ecaron Dcaron Dcroat Nacute Ncaron
+  syn keyword postscrConstant   contained Ohungarumlaut Rcaron Uring Uhungarumlaut Tcommaaccent racute abreve
+  syn keyword postscrConstant   contained lacute cacute ccaron eogonek ecaron dcaron dcroat nacute ncaron
+  syn keyword postscrConstant   contained ohungarumlaut rcaron uring uhungarumlaut tcommaaccent Gbreve
+  syn keyword postscrConstant   contained Idotaccent gbreve blank apple
+endif
+
+
+" By default level 3 includes all level 2 operators
+if postscr_level == 2 || postscr_level == 3
+" Dictionary operators
+  syn match postscrL2Operator     "\(<<\|>>\)"
+  syn keyword postscrL2Operator   undef
+  syn keyword postscrConstant   globaldict shareddict
+
+" Device operators
+  syn keyword postscrL2Operator   setpagedevice currentpagedevice
+
+" Path operators
+  syn keyword postscrL2Operator   rectclip setbbox uappend ucache upath ustrokepath arct
+
+" Painting operators
+  syn keyword postscrL2Operator   rectfill rectstroke ufill ueofill ustroke
+
+" Array operators
+  syn keyword postscrL2Operator   currentpacking setpacking packedarray
+
+" Misc operators
+  syn keyword postscrL2Operator   languagelevel
+
+" Insideness operators
+  syn keyword postscrL2Operator   infill ineofill instroke inufill inueofill inustroke
+
+" GState operators
+  syn keyword postscrL2Operator   gstate setgstate currentgstate setcolor
+  syn keyword postscrL2Operator   setcolorspace currentcolorspace setstrokeadjust currentstrokeadjust
+  syn keyword postscrL2Operator   currentcolor
+
+" Device gstate operators
+  syn keyword postscrL2Operator   sethalftone currenthalftone setoverprint currentoverprint
+  syn keyword postscrL2Operator   setcolorrendering currentcolorrendering
+
+" Character operators
+  syn keyword postscrL2Constant   GlobalFontDirectory SharedFontDirectory
+  syn keyword postscrL2Operator   glyphshow selectfont
+  syn keyword postscrL2Operator   addglyph undefinefont xshow xyshow yshow
+
+" Pattern operators
+  syn keyword postscrL2Operator   makepattern setpattern execform
+
+" Resource operators
+  syn keyword postscrL2Operator   defineresource undefineresource findresource resourcestatus
+  syn keyword postscrL2Repeat     resourceforall
+
+" File operators
+  syn keyword postscrL2Operator   filter printobject writeobject setobjectformat currentobjectformat
+
+" VM operators
+  syn keyword postscrL2Operator   currentshared setshared defineuserobject execuserobject undefineuserobject
+  syn keyword postscrL2Operator   gcheck scheck startjob currentglobal setglobal
+  syn keyword postscrConstant   UserObjects
+
+" Interpreter operators
+  syn keyword postscrL2Operator   setucacheparams setvmthreshold ucachestatus setsystemparams
+  syn keyword postscrL2Operator   setuserparams currentuserparams setcacheparams currentcacheparams
+  syn keyword postscrL2Operator   currentdevparams setdevparams vmreclaim currentsystemparams
+
+" PS2 constants
+  syn keyword postscrConstant   contained DeviceCMYK Pattern Indexed Separation Cyan Magenta Yellow Black
+  syn keyword postscrConstant   contained CIEBasedA CIEBasedABC CIEBasedDEF CIEBasedDEFG
+
+" PS2 $error dictionary entries
+  syn keyword postscrConstant   contained newerror errorname command errorinfo ostack estack dstack
+  syn keyword postscrConstant   contained recordstacks binary
+
+" PS2 Category dictionary
+  syn keyword postscrConstant   contained DefineResource UndefineResource FindResource ResourceStatus
+  syn keyword postscrConstant   contained ResourceForAll Category InstanceType ResourceFileName
+
+" PS2 Category names
+  syn keyword postscrConstant   contained Font Encoding Form Pattern ProcSet ColorSpace Halftone
+  syn keyword postscrConstant   contained ColorRendering Filter ColorSpaceFamily Emulator IODevice
+  syn keyword postscrConstant   contained ColorRenderingType FMapType FontType FormType HalftoneType
+  syn keyword postscrConstant   contained ImageType PatternType Category Generic
+
+" PS2 pagedevice dictionary entries
+  syn keyword postscrConstant   contained PageSize MediaColor MediaWeight MediaType InputAttributes ManualFeed
+  syn keyword postscrConstant   contained OutputType OutputAttributes NumCopies Collate Duplex Tumble
+  syn keyword postscrConstant   contained Separations HWResolution Margins NegativePrint MirrorPrint
+  syn keyword postscrConstant   contained CutMedia AdvanceMedia AdvanceDistance ImagingBBox
+  syn keyword postscrConstant   contained Policies Install BeginPage EndPage PolicyNotFound PolicyReport
+  syn keyword postscrConstant   contained ManualSize OutputFaceUp Jog
+  syn keyword postscrConstant   contained Bind BindDetails Booklet BookletDetails CollateDetails
+  syn keyword postscrConstant   contained DeviceRenderingInfo ExitJamRecovery Fold FoldDetails Laminate
+  syn keyword postscrConstant   contained ManualFeedTimeout Orientation OutputPage
+  syn keyword postscrConstant   contained PostRenderingEnhance PostRenderingEnhanceDetails
+  syn keyword postscrConstant   contained PreRenderingEnhance PreRenderingEnhanceDetails
+  syn keyword postscrConstant   contained Signature SlipSheet Staple StapleDetails Trim
+  syn keyword postscrConstant   contained ProofSet REValue PrintQuality ValuesPerColorComponent AntiAlias
+
+" PS2 PDL resource entries
+  syn keyword postscrConstant   contained Selector LanguageFamily LanguageVersion
+
+" PS2 halftone dictionary entries
+  syn keyword postscrConstant   contained HalftoneType HalftoneName
+  syn keyword postscrConstant   contained AccurateScreens ActualAngle Xsquare Ysquare AccurateFrequency
+  syn keyword postscrConstant   contained Frequency SpotFunction Angle Width Height Thresholds
+  syn keyword postscrConstant   contained RedFrequency RedSpotFunction RedAngle RedWidth RedHeight
+  syn keyword postscrConstant   contained GreenFrequency GreenSpotFunction GreenAngle GreenWidth GreenHeight
+  syn keyword postscrConstant   contained BlueFrequency BlueSpotFunction BlueAngle BlueWidth BlueHeight
+  syn keyword postscrConstant   contained GrayFrequency GrayAngle GraySpotFunction GrayWidth GrayHeight
+  syn keyword postscrConstant   contained GrayThresholds BlueThresholds GreenThresholds RedThresholds
+  syn keyword postscrConstant   contained TransferFunction
+
+" PS2 CSR dictionaries
+  syn keyword postscrConstant   contained RangeA DecodeA MatrixA RangeABC DecodeABC MatrixABC BlackPoint
+  syn keyword postscrConstant   contained RangeLMN DecodeLMN MatrixLMN WhitePoint RangeDEF DecodeDEF RangeHIJ
+  syn keyword postscrConstant   contained RangeDEFG DecodeDEFG RangeHIJK Table
+
+" PS2 CRD dictionaries
+  syn keyword postscrConstant   contained ColorRenderingType EncodeLMB EncodeABC RangePQR MatrixPQR
+  syn keyword postscrConstant   contained AbsoluteColorimetric RelativeColorimetric Saturation Perceptual
+  syn keyword postscrConstant   contained TransformPQR RenderTable
+
+" PS2 Pattern dictionary
+  syn keyword postscrConstant   contained PatternType PaintType TilingType XStep YStep
+
+" PS2 Image dictionary
+  syn keyword postscrConstant   contained ImageType ImageMatrix MultipleDataSources DataSource
+  syn keyword postscrConstant   contained BitsPerComponent Decode Interpolate
+
+" PS2 Font dictionaries
+  syn keyword postscrConstant   contained FontType FontMatrix FontName FontInfo LanguageLevel WMode Encoding
+  syn keyword postscrConstant   contained UniqueID StrokeWidth Metrics Metrics2 CDevProc CharStrings Private
+  syn keyword postscrConstant   contained FullName Notice version ItalicAngle isFixedPitch UnderlinePosition
+  syn keyword postscrConstant   contained FMapType Encoding FDepVector PrefEnc EscChar ShiftOut ShiftIn
+  syn keyword postscrConstant   contained WeightVector Blend $Blend CIDFontType sfnts CIDSystemInfo CodeMap
+  syn keyword postscrConstant   contained CMap CIDFontName CIDSystemInfo UIDBase CIDDevProc CIDCount
+  syn keyword postscrConstant   contained CIDMapOffset FDArray FDBytes GDBytes GlyphData GlyphDictionary
+  syn keyword postscrConstant   contained SDBytes SubrMapOffset SubrCount BuildGlyph CIDMap FID MIDVector
+  syn keyword postscrConstant   contained Ordering Registry Supplement CMapName CMapVersion UIDOffset
+  syn keyword postscrConstant   contained SubsVector UnderlineThickness FamilyName FontBBox CurMID
+  syn keyword postscrConstant   contained Weight
+
+" PS2 User paramters
+  syn keyword postscrConstant   contained MaxFontItem MinFontCompress MaxUPathItem MaxFormItem MaxPatternItem
+  syn keyword postscrConstant   contained MaxScreenItem MaxOpStack MaxDictStack MaxExecStack MaxLocalVM
+  syn keyword postscrConstant   contained VMReclaim VMThreshold
+
+" PS2 System paramters
+  syn keyword postscrConstant   contained SystemParamsPassword StartJobPassword BuildTime ByteOrder RealFormat
+  syn keyword postscrConstant   contained MaxFontCache CurFontCache MaxOutlineCache CurOutlineCache
+  syn keyword postscrConstant   contained MaxUPathCache CurUPathCache MaxFormCache CurFormCache
+  syn keyword postscrConstant   contained MaxPatternCache CurPatternCache MaxScreenStorage CurScreenStorage
+  syn keyword postscrConstant   contained MaxDisplayList CurDisplayList
+
+" PS2 LZW Filters
+  syn keyword postscrConstant   contained Predictor
+
+" Paper Size operators
+  syn keyword postscrL2Operator   letter lettersmall legal ledger 11x17 a4 a3 a4small b5 note
+
+" Paper Tray operators
+  syn keyword postscrL2Operator   lettertray legaltray ledgertray a3tray a4tray b5tray 11x17tray
+
+" SCC compatibility operators
+  syn keyword postscrL2Operator   sccbatch sccinteractive setsccbatch setsccinteractive
+
+" Page duplexing operators
+  syn keyword postscrL2Operator   duplexmode firstside newsheet setduplexmode settumble tumble
+
+" Device compatability operators
+  syn keyword postscrL2Operator   devdismount devformat devmount devstatus
+  syn keyword postscrL2Repeat     devforall
+
+" Imagesetter compatability operators
+  syn keyword postscrL2Operator   accuratescreens checkscreen pagemargin pageparams setaccuratescreens setpage
+  syn keyword postscrL2Operator   setpagemargin setpageparams
+
+" Misc compatability operators
+  syn keyword postscrL2Operator   appletalktype buildtime byteorder checkpassword defaulttimeouts diskonline
+  syn keyword postscrL2Operator   diskstatus manualfeed manualfeedtimeout margins mirrorprint pagecount
+  syn keyword postscrL2Operator   pagestackorder printername processcolors sethardwareiomode setjobtimeout
+  syn keyword postscrL2Operator   setpagestockorder setprintername setresolution doprinterrors dostartpage
+  syn keyword postscrL2Operator   hardwareiomode initializedisk jobname jobtimeout ramsize realformat resolution
+  syn keyword postscrL2Operator   setdefaulttimeouts setdoprinterrors setdostartpage setdosysstart
+  syn keyword postscrL2Operator   setuserdiskpercent softwareiomode userdiskpercent waittimeout
+  syn keyword postscrL2Operator   setsoftwareiomode dosysstart emulate setmargins setmirrorprint
+
+endif " PS2 highlighting
+
+if postscr_level == 3
+" Shading operators
+  syn keyword postscrL3Operator setsmoothness currentsmoothness shfill
+
+" Clip operators
+  syn keyword postscrL3Operator clipsave cliprestore
+
+" Pagedevive operators
+  syn keyword postscrL3Operator setpage setpageparams
+
+" Device gstate operators
+  syn keyword postscrL3Operator findcolorrendering
+
+" Font operators
+  syn keyword postscrL3Operator composefont
+
+" PS LL3 Output device resource entries
+  syn keyword postscrConstant   contained DeviceN TrappingDetailsType
+
+" PS LL3 pagdevice dictionary entries
+  syn keyword postscrConstant   contained DeferredMediaSelection ImageShift InsertSheet LeadingEdge MaxSeparations
+  syn keyword postscrConstant   contained MediaClass MediaPosition OutputDevice PageDeviceName PageOffset ProcessColorModel
+  syn keyword postscrConstant   contained RollFedMedia SeparationColorNames SeparationOrder Trapping TrappingDetails
+  syn keyword postscrConstant   contained TraySwitch UseCIEColor
+  syn keyword postscrConstant   contained ColorantDetails ColorantName ColorantType NeutralDensity TrappingOrder
+  syn keyword postscrConstant   contained ColorantSetName
+
+" PS LL3 trapping dictionary entries
+  syn keyword postscrConstant   contained BlackColorLimit BlackDensityLimit BlackWidth ColorantZoneDetails
+  syn keyword postscrConstant   contained SlidingTrapLimit StepLimit TrapColorScaling TrapSetName TrapWidth
+  syn keyword postscrConstant   contained ImageResolution ImageToObjectTrapping ImageTrapPlacement
+  syn keyword postscrConstant   contained StepLimit TrapColorScaling Enabled ImageInternalTrapping
+
+" PS LL3 filters and entries
+  syn keyword postscrConstant   contained ReusableStreamDecode CloseSource CloseTarget UnitSize LowBitFirst
+  syn keyword postscrConstant   contained FlateEncode FlateDecode DecodeParams Intent AsyncRead
+
+" PS LL3 halftone dictionary entries
+  syn keyword postscrConstant   contained Height2 Width2
+
+" PS LL3 function dictionary entries
+  syn keyword postscrConstant   contained FunctionType Domain Range Order BitsPerSample Encode Size C0 C1 N
+  syn keyword postscrConstant   contained Functions Bounds
+
+" PS LL3 image dictionary entries
+  syn keyword postscrConstant   contained InterleaveType MaskDict DataDict MaskColor
+
+" PS LL3 Pattern and shading dictionary entries
+  syn keyword postscrConstant   contained Shading ShadingType Background ColorSpace Coords Extend Function
+  syn keyword postscrConstant   contained VerticesPerRow BitsPerCoordinate BitsPerFlag
+
+" PS LL3 image dictionary entries
+  syn keyword postscrConstant   contained XOrigin YOrigin UnpaintedPath PixelCopy
+
+" PS LL3 colorrendering procedures
+  syn keyword postscrProcedure  GetHalftoneName GetPageDeviceName GetSubstituteCRD
+
+" PS LL3 CIDInit procedures
+  syn keyword postscrProcedure  beginbfchar beginbfrange begincidchar begincidrange begincmap begincodespacerange
+  syn keyword postscrProcedure  beginnotdefchar beginnotdefrange beginrearrangedfont beginusematrix
+  syn keyword postscrProcedure  endbfchar endbfrange endcidchar endcidrange endcmap endcodespacerange
+  syn keyword postscrProcedure  endnotdefchar endnotdefrange endrearrangedfont endusematrix
+  syn keyword postscrProcedure  StartData usefont usecmp
+
+" PS LL3 Trapping procedures
+  syn keyword postscrProcedure  settrapparams currenttrapparams settrapzone
+
+" PS LL3 BitmapFontInit procedures
+  syn keyword postscrProcedure  removeall removeglyphs
+
+" PS LL3 Font names
+  if exists("postscr_fonts")
+    syn keyword postscrConstant contained AlbertusMT AlbertusMT-Italic AlbertusMT-Light Apple-Chancery Apple-ChanceryCE
+    syn keyword postscrConstant contained AntiqueOlive-Roman AntiqueOlive-Italic AntiqueOlive-Bold AntiqueOlive-Compact
+    syn keyword postscrConstant contained AntiqueOliveCE-Roman AntiqueOliveCE-Italic AntiqueOliveCE-Bold AntiqueOliveCE-Compact
+    syn keyword postscrConstant contained ArialMT Arial-ItalicMT Arial-LightMT Arial-BoldMT Arial-BoldItalicMT
+    syn keyword postscrConstant contained ArialCE ArialCE-Italic ArialCE-Light ArialCE-Bold ArialCE-BoldItalic
+    syn keyword postscrConstant contained AvantGarde-Book AvantGarde-BookOblique AvantGarde-Demi AvantGarde-DemiOblique
+    syn keyword postscrConstant contained AvantGardeCE-Book AvantGardeCE-BookOblique AvantGardeCE-Demi AvantGardeCE-DemiOblique
+    syn keyword postscrConstant contained Bodoni Bodoni-Italic Bodoni-Bold Bodoni-BoldItalic Bodoni-Poster Bodoni-PosterCompressed
+    syn keyword postscrConstant contained BodoniCE BodoniCE-Italic BodoniCE-Bold BodoniCE-BoldItalic BodoniCE-Poster BodoniCE-PosterCompressed
+    syn keyword postscrConstant contained Bookman-Light Bookman-LightItalic Bookman-Demi Bookman-DemiItalic
+    syn keyword postscrConstant contained BookmanCE-Light BookmanCE-LightItalic BookmanCE-Demi BookmanCE-DemiItalic
+    syn keyword postscrConstant contained Carta Chicago ChicagoCE Clarendon Clarendon-Light Clarendon-Bold
+    syn keyword postscrConstant contained ClarendonCE ClarendonCE-Light ClarendonCE-Bold CooperBlack CooperBlack-Italic
+    syn keyword postscrConstant contained Copperplate-ThirtyTwoBC CopperPlate-ThirtyThreeBC Coronet-Regular CoronetCE-Regular
+    syn keyword postscrConstant contained CourierCE CourierCE-Oblique CourierCE-Bold CourierCE-BoldOblique
+    syn keyword postscrConstant contained Eurostile Eurostile-Bold Eurostile-ExtendedTwo Eurostile-BoldExtendedTwo
+    syn keyword postscrConstant contained Eurostile EurostileCE-Bold EurostileCE-ExtendedTwo EurostileCE-BoldExtendedTwo
+    syn keyword postscrConstant contained Geneva GenevaCE GillSans GillSans-Italic GillSans-Bold GillSans-BoldItalic GillSans-BoldCondensed
+    syn keyword postscrConstant contained GillSans-Light GillSans-LightItalic GillSans-ExtraBold
+    syn keyword postscrConstant contained GillSansCE-Roman GillSansCE-Italic GillSansCE-Bold GillSansCE-BoldItalic GillSansCE-BoldCondensed
+    syn keyword postscrConstant contained GillSansCE-Light GillSansCE-LightItalic GillSansCE-ExtraBold
+    syn keyword postscrConstant contained Goudy Goudy-Italic Goudy-Bold Goudy-BoldItalic Goudy-ExtraBould
+    syn keyword postscrConstant contained HelveticaCE HelveticaCE-Oblique HelveticaCE-Bold HelveticaCE-BoldOblique
+    syn keyword postscrConstant contained Helvetica-Condensed Helvetica-Condensed-Oblique Helvetica-Condensed-Bold Helvetica-Condensed-BoldObl
+    syn keyword postscrConstant contained HelveticaCE-Condensed HelveticaCE-Condensed-Oblique HelveticaCE-Condensed-Bold
+    syn keyword postscrConstant contained HelveticaCE-Condensed-BoldObl Helvetica-Narrow Helvetica-Narrow-Oblique Helvetica-Narrow-Bold
+    syn keyword postscrConstant contained Helvetica-Narrow-BoldOblique HelveticaCE-Narrow HelveticaCE-Narrow-Oblique HelveticaCE-Narrow-Bold
+    syn keyword postscrConstant contained HelveticaCE-Narrow-BoldOblique HoeflerText-Regular HoeflerText-Italic HoeflerText-Black
+    syn keyword postscrConstant contained HoeflerText-BlackItalic HoeflerText-Ornaments HoeflerTextCE-Regular HoeflerTextCE-Italic
+    syn keyword postscrConstant contained HoeflerTextCE-Black HoeflerTextCE-BlackItalic
+    syn keyword postscrConstant contained JoannaMT JoannaMT-Italic JoannaMT-Bold JoannaMT-BoldItalic
+    syn keyword postscrConstant contained JoannaMTCE JoannaMTCE-Italic JoannaMTCE-Bold JoannaMTCE-BoldItalic
+    syn keyword postscrConstant contained LetterGothic LetterGothic-Slanted LetterGothic-Bold LetterGothic-BoldSlanted
+    syn keyword postscrConstant contained LetterGothicCE LetterGothicCE-Slanted LetterGothicCE-Bold LetterGothicCE-BoldSlanted
+    syn keyword postscrConstant contained LubalinGraph-Book LubalinGraph-BookOblique LubalinGraph-Demi LubalinGraph-DemiOblique
+    syn keyword postscrConstant contained LubalinGraphCE-Book LubalinGraphCE-BookOblique LubalinGraphCE-Demi LubalinGraphCE-DemiOblique
+    syn keyword postscrConstant contained Marigold Monaco MonacoCE MonaLisa-Recut Oxford Symbol Tekton
+    syn keyword postscrConstant contained NewCennturySchlbk-Roman NewCenturySchlbk-Italic NewCenturySchlbk-Bold NewCenturySchlbk-BoldItalic
+    syn keyword postscrConstant contained NewCenturySchlbkCE-Roman NewCenturySchlbkCE-Italic NewCenturySchlbkCE-Bold
+    syn keyword postscrConstant contained NewCenturySchlbkCE-BoldItalic NewYork NewYorkCE
+    syn keyword postscrConstant contained Optima Optima-Italic Optima-Bold Optima-BoldItalic
+    syn keyword postscrConstant contained OptimaCE OptimaCE-Italic OptimaCE-Bold OptimaCE-BoldItalic
+    syn keyword postscrConstant contained Palatino-Roman Palatino-Italic Palatino-Bold Palatino-BoldItalic
+    syn keyword postscrConstant contained PalatinoCE-Roman PalatinoCE-Italic PalatinoCE-Bold PalatinoCE-BoldItalic
+    syn keyword postscrConstant contained StempelGaramond-Roman StempelGaramond-Italic StempelGaramond-Bold StempelGaramond-BoldItalic
+    syn keyword postscrConstant contained StempelGaramondCE-Roman StempelGaramondCE-Italic StempelGaramondCE-Bold StempelGaramondCE-BoldItalic
+    syn keyword postscrConstant contained TimesCE-Roman TimesCE-Italic TimesCE-Bold TimesCE-BoldItalic
+    syn keyword postscrConstant contained TimesNewRomanPSMT TimesNewRomanPS-ItalicMT TimesNewRomanPS-BoldMT TimesNewRomanPS-BoldItalicMT
+    syn keyword postscrConstant contained TimesNewRomanCE TimesNewRomanCE-Italic TimesNewRomanCE-Bold TimesNewRomanCE-BoldItalic
+    syn keyword postscrConstant contained Univers Univers-Oblique Univers-Bold Univers-BoldOblique
+    syn keyword postscrConstant contained UniversCE-Medium UniversCE-Oblique UniversCE-Bold UniversCE-BoldOblique
+    syn keyword postscrConstant contained Univers-Light Univers-LightOblique UniversCE-Light UniversCE-LightOblique
+    syn keyword postscrConstant contained Univers-Condensed Univers-CondensedOblique Univers-CondensedBold Univers-CondensedBoldOblique
+    syn keyword postscrConstant contained UniversCE-Condensed UniversCE-CondensedOblique UniversCE-CondensedBold UniversCE-CondensedBoldOblique
+    syn keyword postscrConstant contained Univers-Extended Univers-ExtendedObl Univers-BoldExt Univers-BoldExtObl
+    syn keyword postscrConstant contained UniversCE-Extended UniversCE-ExtendedObl UniversCE-BoldExt UniversCE-BoldExtObl
+    syn keyword postscrConstant contained Wingdings-Regular ZapfChancery-MediumItalic ZapfChanceryCE-MediumItalic ZapfDingBats
+  endif " Font names
+
+endif " PS LL3 highlighting
+
+
+if exists("postscr_ghostscript")
+  " GS gstate operators
+  syn keyword postscrGSOperator   .setaccuratecurves .currentaccuratecurves .setclipoutside
+  syn keyword postscrGSOperator   .setdashadapt .currentdashadapt .setdefaultmatrix .setdotlength
+  syn keyword postscrGSOperator   .currentdotlength .setfilladjust2 .currentfilladjust2
+  syn keyword postscrGSOperator   .currentclipoutside .setcurvejoin .currentcurvejoin
+  syn keyword postscrGSOperator   .setblendmode .currentblendmode .setopacityalpha .currentopacityalpha .setshapealpha .currentshapealpha
+  syn keyword postscrGSOperator   .setlimitclamp .currentlimitclamp .setoverprintmode .currentoverprintmode
+
+  " GS path operators
+  syn keyword postscrGSOperator   .dashpath .rectappend
+
+  " GS painting operators
+  syn keyword postscrGSOperator   .setrasterop .currentrasterop .setsourcetransparent
+  syn keyword postscrGSOperator   .settexturetransparent .currenttexturetransparent
+  syn keyword postscrGSOperator   .currentsourcetransparent
+
+  " GS character operators
+  syn keyword postscrGSOperator   .charboxpath .type1execchar %Type1BuildChar %Type1BuildGlyph
+
+  " GS mathematical operators
+  syn keyword postscrGSMathOperator arccos arcsin
+
+  " GS dictionary operators
+  syn keyword postscrGSOperator   .dicttomark .forceput .forceundef .knownget .setmaxlength
+
+  " GS byte and string operators
+  syn keyword postscrGSOperator   .type1encrypt .type1decrypt
+  syn keyword postscrGSOperator   .bytestring .namestring .stringmatch
+
+  " GS relational operators (seem like math ones to me!)
+  syn keyword postscrGSMathOperator max min
+
+  " GS file operators
+  syn keyword postscrGSOperator   findlibfile unread writeppmfile
+  syn keyword postscrGSOperator   .filename .fileposition .peekstring .unread
+
+  " GS vm operators
+  syn keyword postscrGSOperator   .forgetsave
+
+  " GS device operators
+  syn keyword postscrGSOperator   copydevice .getdevice makeimagedevice makewordimagedevice copyscanlines
+  syn keyword postscrGSOperator   setdevice currentdevice getdeviceprops putdeviceprops flushpage
+  syn keyword postscrGSOperator   finddevice findprotodevice .getbitsrect
+
+  " GS misc operators
+  syn keyword postscrGSOperator   getenv .makeoperator .setdebug .oserrno .oserror .execn
+
+  " GS rendering stack operators
+  syn keyword postscrGSOperator   .begintransparencygroup .discardtransparencygroup .endtransparencygroup
+  syn keyword postscrGSOperator   .begintransparencymask .discardtransparencymask .endtransparencymask .inittransparencymask
+  syn keyword postscrGSOperator   .settextknockout .currenttextknockout
+
+  " GS filters
+  syn keyword postscrConstant   contained BCPEncode BCPDecode eexecEncode eexecDecode PCXDecode
+  syn keyword postscrConstant   contained PixelDifferenceEncode PixelDifferenceDecode
+  syn keyword postscrConstant   contained PNGPredictorDecode TBCPEncode TBCPDecode zlibEncode
+  syn keyword postscrConstant   contained zlibDecode PNGPredictorEncode PFBDecode
+  syn keyword postscrConstant   contained MD5Encode
+
+  " GS filter keys
+  syn keyword postscrConstant   contained InitialCodeLength FirstBitLowOrder BlockData DecodedByteAlign
+
+  " GS device parameters
+  syn keyword postscrConstant   contained BitsPerPixel .HWMargins HWSize Name GrayValues
+  syn keyword postscrConstant   contained ColorValues TextAlphaBits GraphicsAlphaBits BufferSpace
+  syn keyword postscrConstant   contained OpenOutputFile PageCount BandHeight BandWidth BandBufferSpace
+  syn keyword postscrConstant   contained ViewerPreProcess GreenValues BlueValues OutputFile
+  syn keyword postscrConstant   contained MaxBitmap RedValues
+
+endif " GhostScript highlighting
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link postscrComment         Comment
+
+hi def link postscrConstant        Constant
+hi def link postscrString          String
+hi def link postscrASCIIString     postscrString
+hi def link postscrHexString       postscrString
+hi def link postscrASCII85String   postscrString
+hi def link postscrNumber          Number
+hi def link postscrInteger         postscrNumber
+hi def link postscrHex             postscrNumber
+hi def link postscrRadix           postscrNumber
+hi def link postscrFloat           Float
+hi def link postscrBoolean         Boolean
+
+hi def link postscrIdentifier      Identifier
+hi def link postscrProcedure       Function
+
+hi def link postscrName            Statement
+hi def link postscrConditional     Conditional
+hi def link postscrRepeat          Repeat
+hi def link postscrL2Repeat        postscrRepeat
+hi def link postscrOperator        Operator
+hi def link postscrL1Operator      postscrOperator
+hi def link postscrL2Operator      postscrOperator
+hi def link postscrL3Operator      postscrOperator
+hi def link postscrMathOperator    postscrOperator
+hi def link postscrLogicalOperator postscrOperator
+hi def link postscrBinaryOperator  postscrOperator
+
+hi def link postscrDSCComment      SpecialComment
+hi def link postscrSpecialChar     SpecialChar
+
+hi def link postscrTodo            Todo
+
+hi def link postscrError           Error
+hi def link postscrSpecialCharError postscrError
+hi def link postscrASCII85CharError postscrError
+hi def link postscrHexCharError    postscrError
+hi def link postscrASCIIStringError postscrError
+hi def link postscrIdentifierError postscrError
+
+if exists("postscr_ghostscript")
+hi def link postscrGSOperator      postscrOperator
+hi def link postscrGSMathOperator  postscrMathOperator
+else
+hi def link postscrGSOperator      postscrError
+hi def link postscrGSMathOperator  postscrError
+endif
+
+
+let b:current_syntax = "postscr"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/pov.vim b/syntax/pov.vim
new file mode 100644
index 000000000..13c7fb47b
--- /dev/null
+++ b/syntax/pov.vim
@@ -0,0 +1,148 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pov') == -1
+
+" Vim syntax file
+" Language: PoV-Ray(tm) 3.7 Scene Description Language
+" Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2011-04-23
+" Required Vim Version: 6.0
+
+" Setup
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+" Top level stuff
+syn keyword povCommands global_settings
+syn keyword povObjects array atmosphere background bicubic_patch blob box camera component cone cubic cylinder disc fog height_field isosurface julia_fractal lathe light_group light_source mesh mesh2 object ovus parametric pattern photons plane poly polygon polynomial prism quadric quartic rainbow sky_sphere smooth_triangle sor sphere sphere_sweep spline superellipsoid text torus triangle
+syn keyword povCSG clipped_by composite contained_by difference intersection merge union
+syn keyword povAppearance interior material media texture interior_texture texture_list
+syn keyword povGlobalSettings ambient_light assumed_gamma charset hf_gray_16 irid_wavelength max_intersections max_trace_level number_of_waves radiosity noise_generator
+syn keyword povTransform inverse matrix rotate scale translate transform
+
+" Descriptors
+syn keyword povDescriptors finish inside_vector normal pigment uv_mapping uv_vectors vertex_vectors
+syn keyword povDescriptors adc_bailout always_sample brightness count error_bound distance_maximum gray_threshold load_file low_error_factor maximum_reuse max_sample media minimum_reuse mm_per_unit nearest_count normal pretrace_end pretrace_start recursion_limit save_file
+syn keyword povDescriptors color colour rgb rgbt rgbf rgbft srgb srgbf srgbt srgbft
+syn match povDescriptors "\<\(red\|green\|blue\|gray\)\>"
+syn keyword povDescriptors bump_map color_map colour_map image_map material_map pigment_map quick_color quick_colour normal_map texture_map image_pattern pigment_pattern
+syn keyword povDescriptors ambient brilliance conserve_energy crand diffuse fresnel irid metallic phong phong_size refraction reflection reflection_exponent roughness specular subsurface
+syn keyword povDescriptors cylinder fisheye mesh_camera omnimax orthographic panoramic perspective spherical ultra_wide_angle
+syn keyword povDescriptors agate aoi average brick boxed bozo bumps cells checker crackle cylindrical dents facets function gradient granite hexagon julia leopard magnet mandel marble onion pavement planar quilted radial ripples slope spherical spiral1 spiral2 spotted square tiles tile2 tiling toroidal triangular waves wood wrinkles
+syn keyword povDescriptors density_file
+syn keyword povDescriptors area_light shadowless spotlight parallel
+syn keyword povDescriptors absorption confidence density emission intervals ratio samples scattering variance
+syn keyword povDescriptors distance fog_alt fog_offset fog_type turb_depth
+syn keyword povDescriptors b_spline bezier_spline cubic_spline evaluate face_indices form linear_spline max_gradient natural_spline normal_indices normal_vectors quadratic_spline uv_indices
+syn keyword povDescriptors target
+
+" Modifiers
+syn keyword povModifiers caustics dispersion dispersion_samples fade_color fade_colour fade_distance fade_power ior
+syn keyword povModifiers bounded_by double_illuminate hierarchy hollow no_shadow open smooth sturm threshold water_level
+syn keyword povModifiers importance no_radiosity
+syn keyword povModifiers hypercomplex max_iteration precision quaternion slice
+syn keyword povModifiers conic_sweep linear_sweep
+syn keyword povModifiers flatness type u_steps v_steps
+syn keyword povModifiers aa_level aa_threshold adaptive area_illumination falloff jitter looks_like media_attenuation media_interaction method point_at radius tightness
+syn keyword povModifiers angle aperture bokeh blur_samples confidence direction focal_point h_angle location look_at right sky up v_angle variance
+syn keyword povModifiers all bump_size gamma interpolate map_type once premultiplied slope_map use_alpha use_color use_colour use_index
+syn match povModifiers "\<\(filter\|transmit\)\>"
+syn keyword povModifiers black_hole agate_turb brick_size control0 control1 cubic_wave density_map flip frequency interpolate inverse lambda metric mortar octaves offset omega phase poly_wave ramp_wave repeat scallop_wave sine_wave size strength triangle_wave thickness turbulence turb_depth type warp
+syn keyword povModifiers eccentricity extinction
+syn keyword povModifiers arc_angle falloff_angle width
+syn keyword povModifiers accuracy all_intersections altitude autostop circular collect coords cutaway_textures dist_exp expand_thresholds exponent exterior gather global_lights major_radius max_trace no_bump_scale no_image no_reflection orient orientation pass_through precompute projected_through range_divider solid spacing split_union tolerance
+
+" Words not marked `reserved' in documentation, but...
+syn keyword povBMPType alpha exr gif hdr iff jpeg pgm png pot ppm sys tga tiff
+syn keyword povFontType ttf contained
+syn keyword povDensityType df3 contained
+syn keyword povCharset ascii utf8 contained
+
+" Math functions on floats, vectors and strings
+syn keyword povFunctions abs acos acosh asc asin asinh atan atan2 atanh bitwise_and bitwise_or bitwise_xor ceil cos cosh defined degrees dimensions dimension_size div exp file_exists floor inside int internal ln log max min mod pow prod radians rand seed select sin sinh sqrt strcmp strlen sum tan tanh val vdot vlength vstr vturbulence
+syn keyword povFunctions min_extent max_extent trace vcross vrotate vaxis_rotate vnormalize vturbulence
+syn keyword povFunctions chr concat datetime now substr str strupr strlwr
+syn keyword povJuliaFunctions acosh asinh atan cosh cube pwr reciprocal sinh sqr tanh
+
+" Specialities
+syn keyword povConsts clock clock_delta clock_on final_clock final_frame frame_number initial_clock initial_frame input_file_name image_width image_height false no off on pi true version yes
+syn match povConsts "\<[tuvxyz]\>"
+syn match povDotItem "\.\@<=\(blue\|green\|gray\|filter\|red\|transmit\|hf\|t\|u\|v\|x\|y\|z\)\>" display
+
+" Comments
+syn region povComment start="/\*" end="\*/" contains=povTodo,povComment
+syn match povComment "//.*" contains=povTodo
+syn match povCommentError "\*/"
+syn sync ccomment povComment
+syn sync minlines=50
+syn keyword povTodo TODO FIXME XXX NOT contained
+syn cluster povPRIVATE add=povTodo
+
+" Language directives
+syn match povConditionalDir "#\s*\(else\|end\|for\|if\|ifdef\|ifndef\|switch\|while\)\>"
+syn match povLabelDir "#\s*\(break\|case\|default\|range\)\>"
+syn match povDeclareDir "#\s*\(declare\|default\|local\|macro\|undef\|version\)\>" nextgroup=povDeclareOption skipwhite
+syn keyword povDeclareOption deprecated once contained nextgroup=povDeclareOption skipwhite
+syn match povIncludeDir "#\s*include\>"
+syn match povFileDir "#\s*\(fclose\|fopen\|read\|write\)\>"
+syn keyword povFileDataType uint8 sint8 unit16be uint16le sint16be sint16le sint32le sint32be
+syn match povMessageDir "#\s*\(debug\|error\|render\|statistics\|warning\)\>"
+syn region povFileOpen start="#\s*fopen\>" skip=+"[^"]*"+ matchgroup=povOpenType end="\<\(read\|write\|append\)\>" contains=ALLBUT,PovParenError,PovBraceError,@PovPRIVATE transparent keepend
+
+" Literal strings
+syn match povSpecialChar "\\u\x\{4}\|\\\d\d\d\|\\." contained
+syn region povString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=povSpecialChar oneline
+syn cluster povPRIVATE add=povSpecialChar
+
+" Catch errors caused by wrong parenthesization
+syn region povParen start='(' end=')' contains=ALLBUT,povParenError,@povPRIVATE transparent
+syn match povParenError ")"
+syn region povBrace start='{' end='}' contains=ALLBUT,povBraceError,@povPRIVATE transparent
+syn match povBraceError "}"
+
+" Numbers
+syn match povNumber "\(^\|\W\)\@<=[+-]\=\(\d\+\)\=\.\=\d\+\([eE][+-]\=\d\+\)\="
+
+" Define the default highlighting
+hi def link povComment Comment
+hi def link povTodo Todo
+hi def link povNumber Number
+hi def link povString String
+hi def link povFileOpen Constant
+hi def link povConsts Constant
+hi def link povDotItem povSpecial
+hi def link povBMPType povSpecial
+hi def link povCharset povSpecial
+hi def link povDensityType povSpecial
+hi def link povFontType povSpecial
+hi def link povOpenType povSpecial
+hi def link povSpecialChar povSpecial
+hi def link povSpecial Special
+hi def link povConditionalDir PreProc
+hi def link povLabelDir PreProc
+hi def link povDeclareDir Define
+hi def link povDeclareOption Define
+hi def link povIncludeDir Include
+hi def link povFileDir PreProc
+hi def link povFileDataType Special
+hi def link povMessageDir Debug
+hi def link povAppearance povDescriptors
+hi def link povObjects povDescriptors
+hi def link povGlobalSettings povDescriptors
+hi def link povDescriptors Type
+hi def link povJuliaFunctions PovFunctions
+hi def link povModifiers povFunctions
+hi def link povFunctions Function
+hi def link povCommands Operator
+hi def link povTransform Operator
+hi def link povCSG Operator
+hi def link povParenError povError
+hi def link povBraceError povError
+hi def link povCommentError povError
+hi def link povError Error
+
+let b:current_syntax = "pov"
+
+endif
diff --git a/syntax/povini.vim b/syntax/povini.vim
new file mode 100644
index 000000000..56830e470
--- /dev/null
+++ b/syntax/povini.vim
@@ -0,0 +1,60 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'povini') == -1
+
+" Vim syntax file
+" Language: PoV-Ray(tm) 3.7 configuration/initialization files
+" Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2011-04-24
+" Required Vim Version: 6.0
+
+" Setup
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+" Syntax
+syn match poviniInclude "^\s*[^[+-;]\S*\s*$" contains=poviniSection
+syn match poviniLabel "^.\{-1,}\ze=" transparent contains=poviniKeyword nextgroup=poviniBool,poviniNumber
+syn keyword poviniBool On Off True False Yes No
+syn match poviniNumber "\<\d*\.\=\d\+\>"
+syn keyword poviniKeyword Clock Initial_Frame Final_Frame Frame_Final Frame_Step Initial_Clock Final_Clock Subset_Start_Frame Subset_End_Frame Cyclic_Animation Clockless_Animation Real_Time_Raytracing Field_Render Odd_Field Work_Threads
+syn keyword poviniKeyword Width Height Start_Column Start_Row End_Column End_Row Test_Abort Test_Abort_Count Continue_Trace Create_Ini
+syn keyword poviniKeyword Display Video_Mode Palette Display_Gamma Pause_When_Done Verbose Draw_Vistas Preview_Start_Size Preview_End_Size Render_Block_Size Render_Block_Step Render_Pattern Max_Image_Buffer_Memory
+syn keyword poviniKeyword Output_to_File Output_File_Type Output_Alpha Bits_Per_Color Output_File_Name Buffer_Output Buffer_Size Dither Dither_Method File_Gamma
+syn keyword poviniKeyword BSP_Base BSP_Child BSP_Isect BSP_Max BSP_Miss
+syn keyword poviniKeyword Histogram_Type Histogram_Grid_Size Histogram_Name
+syn keyword poviniKeyword Input_File_Name Include_Header Library_Path Version
+syn keyword poviniKeyword Debug_Console Fatal_Console Render_Console Statistic_Console Warning_Console All_Console Debug_File Fatal_File Render_File Statistic_File Warning_File All_File Warning_Level
+syn keyword poviniKeyword Quality Bounding Bounding_Method Bounding_Threshold Light_Buffer Vista_Buffer Remove_Bounds Split_Unions Antialias Sampling_Method Antialias_Threshold Jitter Jitter_Amount Antialias_Depth Antialias_Gamma
+syn keyword poviniKeyword Pre_Scene_Return Pre_Frame_Return Post_Scene_Return Post_Frame_Return User_Abort_Return Fatal_Error_Return
+syn keyword poviniKeyword Radiosity Radiosity_File_Name Radiosity_From_File Radiosity_To_File Radiosity_Vain_Pretrace High_Reproducibility
+syn match poviniShellOut "^\s*\(Pre_Scene_Command\|Pre_Frame_Command\|Post_Scene_Command\|Post_Frame_Command\|User_Abort_Command\|Fatal_Error_Command\)\>" nextgroup=poviniShellOutEq skipwhite
+syn match poviniShellOutEq "=" nextgroup=poviniShellOutRHS skipwhite contained
+syn match poviniShellOutRHS "[^;]\+" skipwhite contained contains=poviniShellOutSpecial
+syn match poviniShellOutSpecial "%[osnkhw%]" contained
+syn keyword poviniDeclare Declare
+syn match poviniComment ";.*$"
+syn match poviniOption "^\s*[+-]\S*"
+syn match poviniIncludeLabel "^\s*Include_INI\s*=" nextgroup=poviniIncludedFile skipwhite
+syn match poviniIncludedFile "[^;]\+" contains=poviniSection contained
+syn region poviniSection start="\[" end="\]"
+
+" Define the default highlighting
+hi def link poviniSection Special
+hi def link poviniComment Comment
+hi def link poviniDeclare poviniKeyword
+hi def link poviniShellOut poviniKeyword
+hi def link poviniIncludeLabel poviniKeyword
+hi def link poviniKeyword Type
+hi def link poviniShellOutSpecial Special
+hi def link poviniIncludedFile poviniInclude
+hi def link poviniInclude Include
+hi def link poviniOption Keyword
+hi def link poviniBool Constant
+hi def link poviniNumber Number
+
+let b:current_syntax = "povini"
+
+endif
diff --git a/syntax/ppd.vim b/syntax/ppd.vim
new file mode 100644
index 000000000..6ef1b6c93
--- /dev/null
+++ b/syntax/ppd.vim
@@ -0,0 +1,39 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ppd') == -1
+
+" Vim syntax file
+" Language:	PPD (PostScript printer description) file
+" Maintainer:	Bjoern Jacke <bjacke@suse.de>
+" Last Change:	2001-10-06
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+
+syn match	ppdComment	"^\*%.*"
+syn match	ppdDef		"\*[a-zA-Z0-9]\+"
+syn match	ppdDefine	"\*[a-zA-Z0-9\-_]\+:"
+syn match	ppdUI		"\*[a-zA-Z]*\(Open\|Close\)UI"
+syn match	ppdUIGroup	"\*[a-zA-Z]*\(Open\|Close\)Group"
+syn match	ppdGUIText	"/.*:"
+syn match	ppdContraints	"^*UIConstraints:"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+
+hi def link ppdComment		Comment
+hi def link ppdDefine		Statement
+hi def link ppdUI			Function
+hi def link ppdUIGroup		Function
+hi def link ppdDef			String
+hi def link ppdGUIText		Type
+hi def link ppdContraints		Special
+
+
+let b:current_syntax = "ppd"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/ppwiz.vim b/syntax/ppwiz.vim
new file mode 100644
index 000000000..43510efdb
--- /dev/null
+++ b/syntax/ppwiz.vim
@@ -0,0 +1,88 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ppwiz') == -1
+
+" Vim syntax file
+" Language:     PPWizard (preprocessor by Dennis Bareis)
+" Maintainer:   Stefan Schwarzer <s.schwarzer@ndh.net>
+" URL:			http://www.ndh.net/home/sschwarzer/download/ppwiz.vim
+" Last Change:  2003 May 11
+" Filename:     ppwiz.vim
+
+" Remove old syntax stuff
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+if !exists("ppwiz_highlight_defs")
+    let ppwiz_highlight_defs = 1
+endif
+
+if !exists("ppwiz_with_html")
+    let ppwiz_with_html = 1
+endif
+
+" comments
+syn match   ppwizComment  "^;.*$"
+syn match   ppwizComment  ";;.*$"
+" HTML
+if ppwiz_with_html > 0
+    syn region ppwizHTML  start="<" end=">" contains=ppwizArg,ppwizMacro
+    syn match  ppwizHTML  "\&\w\+;"
+endif
+" define, evaluate etc.
+if ppwiz_highlight_defs == 1
+    syn match  ppwizDef   "^\s*\#\S\+\s\+\S\+" contains=ALL
+    syn match  ppwizDef   "^\s*\#\(if\|else\|endif\)" contains=ALL
+    syn match  ppwizDef   "^\s*\#\({\|break\|continue\|}\)" contains=ALL
+" elseif ppwiz_highlight_defs == 2
+"     syn region ppwizDef   start="^\s*\#" end="[^\\]$" end="^$" keepend contains=ALL
+else
+    syn region ppwizDef   start="^\s*\#" end="[^\\]$" end="^$" keepend contains=ppwizCont
+endif
+syn match   ppwizError    "\s.\\$"
+syn match   ppwizCont     "\s\([+\-%]\|\)\\$"
+" macros to execute
+syn region  ppwizMacro    start="<\$" end=">" contains=@ppwizArgVal,ppwizCont
+" macro arguments
+syn region  ppwizArg      start="{" end="}" contains=ppwizEqual,ppwizString
+syn match   ppwizEqual    "=" contained
+syn match   ppwizOperator "<>\|=\|<\|>" contained
+" standard variables (builtin)
+syn region  ppwizStdVar   start="<?[^?]" end=">" contains=@ppwizArgVal
+" Rexx variables
+syn region  ppwizRexxVar  start="<??" end=">" contains=@ppwizArgVal
+" Constants
+syn region  ppwizString   start=+"+ end=+"+ contained contains=ppwizMacro,ppwizArg,ppwizHTML,ppwizCont,ppwizStdVar,ppwizRexxVar
+syn region  ppwizString   start=+'+ end=+'+ contained contains=ppwizMacro,ppwizArg,ppwizHTML,ppwizCont,ppwizStdVar,ppwizRexxVar
+syn match   ppwizInteger  "\d\+" contained
+
+" Clusters
+syn cluster ppwizArgVal add=ppwizString,ppwizInteger
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link ppwizSpecial  Special
+hi def link ppwizEqual    ppwizSpecial
+hi def link ppwizOperator ppwizSpecial
+hi def link ppwizComment  Comment
+hi def link ppwizDef      PreProc
+hi def link ppwizMacro    Statement
+hi def link ppwizArg      Identifier
+hi def link ppwizStdVar   Identifier
+hi def link ppwizRexxVar  Identifier
+hi def link ppwizString   Constant
+hi def link ppwizInteger  Constant
+hi def link ppwizCont     ppwizSpecial
+hi def link ppwizError    Error
+hi def link ppwizHTML     Type
+
+
+let b:current_syntax = "ppwiz"
+
+" vim: ts=4
+
+
+endif
diff --git a/syntax/privoxy.vim b/syntax/privoxy.vim
new file mode 100644
index 000000000..9911eb372
--- /dev/null
+++ b/syntax/privoxy.vim
@@ -0,0 +1,75 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'privoxy') == -1
+
+" Vim syntax file
+" Language:	Privoxy actions file
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" URL:		http://gus.gscit.monash.edu.au/~djkea2/vim/syntax/privoxy.vim
+" Last Change:	2007 Mar 30
+
+" Privoxy 3.0.6
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword=@,48-57,_,-
+
+syn keyword privoxyTodo		 contained TODO FIXME XXX NOTE
+syn match   privoxyComment "#.*" contains=privoxyTodo,@Spell
+
+syn region privoxyActionLine matchgroup=privoxyActionLineDelimiter start="^\s*\zs{" end="}\ze\s*$"
+	\ contains=privoxyEnabledPrefix,privoxyDisabledPrefix
+
+syn match privoxyEnabledPrefix	"\%(^\|\s\|{\)\@<=+\l\@=" nextgroup=privoxyAction,privoxyFilterAction contained
+syn match privoxyDisabledPrefix "\%(^\|\s\|{\)\@<=-\l\@=" nextgroup=privoxyAction,privoxyFilterAction contained
+
+syn match privoxyAction "\%(add-header\|block\|content-type-overwrite\|crunch-client-header\|crunch-if-none-match\)\>" contained
+syn match privoxyAction "\%(crunch-incoming-cookies\|crunch-outgoing-cookies\|crunch-server-header\|deanimate-gifs\)\>" contained
+syn match privoxyAction "\%(downgrade-http-version\|fast-redirects\|filter-client-headers\|filter-server-headers\)\>" contained
+syn match privoxyAction "\%(filter\|force-text-mode\|handle-as-empty-document\|handle-as-image\)\>" contained
+syn match privoxyAction "\%(hide-accept-language\|hide-content-disposition\|hide-forwarded-for-headers\)\>" contained
+syn match privoxyAction "\%(hide-from-header\|hide-if-modified-since\|hide-referrer\|hide-user-agent\|inspect-jpegs\)\>" contained
+syn match privoxyAction "\%(kill-popups\|limit-connect\|overwrite-last-modified\|prevent-compression\|redirect\)\>" contained
+syn match privoxyAction "\%(send-vanilla-wafer\|send-wafer\|session-cookies-only\|set-image-blocker\)\>" contained
+syn match privoxyAction "\%(treat-forbidden-connects-like-blocks\)\>"
+
+syn match privoxyFilterAction "filter{[^}]*}" contained contains=privoxyFilterArg,privoxyActionBraces
+syn match privoxyActionBraces "[{}]" contained
+syn keyword privoxyFilterArg js-annoyances js-events html-annoyances content-cookies refresh-tags unsolicited-popups all-popups
+	\ img-reorder banners-by-size banners-by-link webbugs tiny-textforms jumping-windows frameset-borders demoronizer
+	\ shockwave-flash quicktime-kioskmode fun crude-parental ie-exploits site-specifics no-ping google yahoo msn blogspot
+	\ x-httpd-php-to-html html-to-xml xml-to-html hide-tor-exit-notation contained
+
+" Alternative spellings
+syn match privoxyAction "\%(kill-popup\|hide-referer\|prevent-keeping-cookies\)\>" contained
+
+" Pre-3.0 compatibility
+syn match privoxyAction "\%(no-cookie-read\|no-cookie-set\|prevent-reading-cookies\|prevent-setting-cookies\)\>" contained
+syn match privoxyAction "\%(downgrade\|hide-forwarded\|hide-from\|image\|image-blocker\|no-compression\)\>" contained
+syn match privoxyAction "\%(no-cookies-keep\|no-cookies-read\|no-cookies-set\|no-popups\|vanilla-wafer\|wafer\)\>" contained
+
+syn match privoxySetting "\<for-privoxy-version\>"
+
+syn match privoxyHeader "^\s*\zs{{\%(alias\|settings\)}}\ze\s*$"
+
+hi def link privoxyAction		Identifier
+hi def link privoxyFilterAction		Identifier
+hi def link privoxyActionLineDelimiter	Delimiter
+hi def link privoxyDisabledPrefix	SpecialChar
+hi def link privoxyEnabledPrefix	SpecialChar
+hi def link privoxyHeader		PreProc
+hi def link privoxySetting		Identifier
+hi def link privoxyFilterArg		Constant
+
+hi def link privoxyComment		Comment
+hi def link privoxyTodo			Todo
+
+let b:current_syntax = "privoxy"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/procmail.vim b/syntax/procmail.vim
new file mode 100644
index 000000000..4386f0c19
--- /dev/null
+++ b/syntax/procmail.vim
@@ -0,0 +1,58 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'procmail') == -1
+
+" Vim syntax file
+" Language:	Procmail definition file
+" Maintainer:	Melchior FRANZ <mfranz@aon.at>
+" Last Change:	2003 Aug 14
+" Author:	Sonia Heimann
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match   procmailComment      "#.*$" contains=procmailTodo
+syn keyword   procmailTodo      contained Todo TBD
+
+syn region  procmailString       start=+"+  skip=+\\"+  end=+"+
+syn region  procmailString       start=+'+  skip=+\\'+  end=+'+
+
+syn region procmailVarDeclRegion start="^\s*[a-zA-Z0-9_]\+\s*="hs=e-1 skip=+\\$+ end=+$+ contains=procmailVar,procmailVarDecl,procmailString
+syn match procmailVarDecl contained "^\s*[a-zA-Z0-9_]\+"
+syn match procmailVar "$[a-zA-Z0-9_]\+"
+
+syn match procmailCondition contained "^\s*\*.*"
+
+syn match procmailActionFolder contained "^\s*[-_a-zA-Z0-9/]\+"
+syn match procmailActionVariable contained "^\s*$[a-zA-Z_]\+"
+syn region procmailActionForward start=+^\s*!+ skip=+\\$+ end=+$+
+syn region procmailActionPipe start=+^\s*|+ skip=+\\$+ end=+$+
+syn region procmailActionNested start=+^\s*{+ end=+^\s*}+ contains=procmailRecipe,procmailComment,procmailVarDeclRegion
+
+syn region procmailRecipe start=+^\s*:.*$+ end=+^\s*\($\|}\)+me=e-1 contains=procmailComment,procmailCondition,procmailActionFolder,procmailActionVariable,procmailActionForward,procmailActionPipe,procmailActionNested,procmailVarDeclRegion
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link procmailComment Comment
+hi def link procmailTodo    Todo
+
+hi def link procmailRecipe   Statement
+"hi def link procmailCondition   Statement
+
+hi def link procmailActionFolder	procmailAction
+hi def link procmailActionVariable procmailAction
+hi def link procmailActionForward	procmailAction
+hi def link procmailActionPipe	procmailAction
+hi def link procmailAction		Function
+hi def link procmailVar		Identifier
+hi def link procmailVarDecl	Identifier
+
+hi def link procmailString String
+
+
+let b:current_syntax = "procmail"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/promela.vim b/syntax/promela.vim
new file mode 100644
index 000000000..e32a71b18
--- /dev/null
+++ b/syntax/promela.vim
@@ -0,0 +1,57 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'promela') == -1
+
+" Vim syntax file
+" Language:			ProMeLa
+" Maintainer:		Maurizio Tranchero <maurizio.tranchero@polito.it> - <maurizio.tranchero@gmail.com>
+" First Release:	Mon Oct 16 08:49:46 CEST 2006
+" Last Change:		Thu Aug 7 21:22:48 CEST 2008
+" Version:			0.5
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" case is significant
+" syn case ignore
+" ProMeLa Keywords
+syn keyword promelaStatement	proctype if else while chan do od fi break goto unless
+syn keyword promelaStatement	active assert label atomic
+syn keyword promelaFunctions	skip timeout run
+syn keyword promelaTodo         contained TODO
+" ProMeLa Types
+syn keyword promelaType			bit bool byte short int
+" Operators and special characters
+syn match promelaOperator	"!"
+syn match promelaOperator	"?"
+syn match promelaOperator	"->"
+syn match promelaOperator	"="
+syn match promelaOperator	"+"
+syn match promelaOperator	"*"
+syn match promelaOperator	"/"
+syn match promelaOperator	"-"
+syn match promelaOperator	"<"
+syn match promelaOperator	">"
+syn match promelaOperator	"<="
+syn match promelaOperator	">="
+syn match promelaSpecial	"\["
+syn match promelaSpecial	"\]"
+syn match promelaSpecial	";"
+syn match promelaSpecial	"::"
+" ProMeLa Comments
+syn region promelaComment start="/\*" end="\*/" contains=promelaTodo,@Spell
+syn match  promelaComment "//.*" contains=promelaTodo,@Spell
+
+" Class Linking
+hi def link promelaStatement    Statement
+hi def link promelaType	        Type
+hi def link promelaComment      Comment
+hi def link promelaOperator	    Type
+hi def link promelaSpecial      Special
+hi def link promelaFunctions    Special
+hi def link promelaString		String
+hi def link promelaTodo	        Todo
+
+let b:current_syntax = "promela"
+
+endif
diff --git a/syntax/protocols.vim b/syntax/protocols.vim
new file mode 100644
index 000000000..275c5a09b
--- /dev/null
+++ b/syntax/protocols.vim
@@ -0,0 +1,48 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protocols') == -1
+
+" Vim syntax file
+" Language:             protocols(5) - Internet protocols definition file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match   protocolsBegin    display '^'
+                              \ nextgroup=protocolsName,protocolsComment
+
+syn match   protocolsName     contained display '[[:graph:]]\+'
+                              \ nextgroup=protocolsPort skipwhite
+
+syn match   protocolsPort     contained display '\d\+'
+                              \ nextgroup=protocolsAliases,protocolsComment
+                              \ skipwhite
+
+syn match   protocolsAliases  contained display '\S\+'
+                              \ nextgroup=protocolsAliases,protocolsComment
+                              \ skipwhite
+
+syn keyword protocolsTodo     contained TODO FIXME XXX NOTE
+
+syn region  protocolsComment  display oneline start='#' end='$'
+                              \ contains=protocolsTodo,@Spell
+
+hi def link protocolsTodo      Todo
+hi def link protocolsComment   Comment
+hi def link protocolsName      Identifier
+hi def link protocolsPort      Number
+hi def link protocolsPPDiv     Delimiter
+hi def link protocolsPPDivDepr Error
+hi def link protocolsProtocol  Type
+hi def link protocolsAliases   Macro
+
+let b:current_syntax = "protocols"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/psf.vim b/syntax/psf.vim
new file mode 100644
index 000000000..a76e8cfc4
--- /dev/null
+++ b/syntax/psf.vim
@@ -0,0 +1,95 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'psf') == -1
+
+" Vim syntax file
+" Language:	Software Distributor product specification file
+"		(POSIX 1387.2-1995).
+" Maintainer:	Rex Barzee <rex_barzee@hp.com>
+" Last change:	25 Apr 2001
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Product specification files are case sensitive
+syn case match
+
+syn keyword psfObject bundle category control_file depot distribution
+syn keyword psfObject end file fileset host installed_software media
+syn keyword psfObject product root subproduct vendor
+
+syn match  psfUnquotString +[^"# 	][^#]*+ contained
+syn region psfQuotString   start=+"+ skip=+\\"+ end=+"+ contained
+
+syn match  psfObjTag    "\<[-_+A-Z0-9a-z]\+\(\.[-_+A-Z0-9a-z]\+\)*" contained
+syn match  psfAttAbbrev ",\<\(fa\|fr\|[aclqrv]\)\(<\|>\|<=\|>=\|=\|==\)[^,]\+" contained
+syn match  psfObjTags   "\<[-_+A-Z0-9a-z]\+\(\.[-_+A-Z0-9a-z]\+\)*\(\s\+\<[-_+A-Z0-9a-z]\+\(\.[-_+A-Z0-9a-z]\+\)*\)*" contained
+
+syn match  psfNumber    "\<\d\+\>" contained
+syn match  psfFloat     "\<\d\+\>\(\.\<\d\+\>\)*" contained
+
+syn match  psfLongDate  "\<\d\d\d\d\d\d\d\d\d\d\d\d\.\d\d\>" contained
+
+syn keyword psfState    available configured corrupt installed transient contained
+syn keyword psfPState   applied committed superseded contained
+
+syn keyword psfBoolean  false true contained
+
+
+"Some of the attributes covered by attUnquotString and attQuotString:
+" architecture category_tag control_directory copyright
+" create_date description directory file_permissions install_source
+" install_type location machine_type mod_date number os_name os_release
+" os_version pose_as_os_name pose_as_os_release readme revision
+" share_link title vendor_tag
+syn region psfAttUnquotString matchgroup=psfAttrib start=~^\s*[^# 	]\+\s\+[^#" 	]~rs=e-1 contains=psfUnquotString,psfComment end=~$~ keepend oneline
+
+syn region psfAttQuotString matchgroup=psfAttrib start=~^\s*[^# 	]\+\s\+"~rs=e-1 contains=psfQuotString,psfComment skip=~\\"~ matchgroup=psfQuotString end=~"~ keepend
+
+
+" These regions are defined in attempt to do syntax checking for some
+" of the attributes.
+syn region psfAttTag matchgroup=psfAttrib start="^\s*tag\s\+" contains=psfObjTag,psfComment end="$" keepend oneline
+
+syn region psfAttSpec matchgroup=psfAttrib start="^\s*\(ancestor\|applied_patches\|applied_to\|contents\|corequisites\|exrequisites\|prerequisites\|software_spec\|supersedes\|superseded_by\)\s\+" contains=psfObjTag,psfAttAbbrev,psfComment end="$" keepend
+
+syn region psfAttTags matchgroup=psfAttrib start="^\s*all_filesets\s\+" contains=psfObjTags,psfComment end="$" keepend
+
+syn region psfAttNumber matchgroup=psfAttrib start="^\s*\(compressed_size\|instance_id\|media_sequence_number\|sequence_number\|size\)\s\+" contains=psfNumber,psfComment end="$" keepend oneline
+
+syn region psfAttTime matchgroup=psfAttrib start="^\s*\(create_time\|ctime\|mod_time\|mtime\|timestamp\)\s\+" contains=psfNumber,psfComment end="$" keepend oneline
+
+syn region psfAttFloat matchgroup=psfAttrib start="^\s*\(data_model_revision\|layout_version\)\s\+" contains=psfFloat,psfComment end="$" keepend oneline
+
+syn region psfAttLongDate matchgroup=psfAttrib start="^\s*install_date\s\+" contains=psfLongDate,psfComment end="$" keepend oneline
+
+syn region psfAttState matchgroup=psfAttrib start="^\s*\(state\)\s\+" contains=psfState,psfComment end="$" keepend oneline
+
+syn region psfAttPState matchgroup=psfAttrib start="^\s*\(patch_state\)\s\+" contains=psfPState,psfComment end="$" keepend oneline
+
+syn region psfAttBoolean matchgroup=psfAttrib start="^\s*\(is_kernel\|is_locatable\|is_patch\|is_protected\|is_reboot\|is_reference\|is_secure\|is_sparse\)\s\+" contains=psfBoolean,psfComment end="$" keepend oneline
+
+syn match  psfComment "#.*$"
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link psfObject       Statement
+hi def link psfAttrib       Type
+hi def link psfQuotString   String
+hi def link psfObjTag       Identifier
+hi def link psfAttAbbrev    PreProc
+hi def link psfObjTags      Identifier
+
+hi def link psfComment      Comment
+
+
+" Long descriptions and copyrights confuse the syntax highlighting, so
+" force vim to backup at least 100 lines before the top visible line
+" looking for a sync location.
+syn sync lines=100
+
+let b:current_syntax = "psf"
+
+endif
diff --git a/syntax/pyrex.vim b/syntax/pyrex.vim
new file mode 100644
index 000000000..c90163ac8
--- /dev/null
+++ b/syntax/pyrex.vim
@@ -0,0 +1,55 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pyrex') == -1
+
+" Vim syntax file
+" Language:	Pyrex
+" Maintainer:	Marco Barisione <marco.bari@people.it>
+" URL:		http://marcobari.altervista.org/pyrex_vim.html
+" Last Change:	2009 Nov 09
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Read the Python syntax to start with
+runtime! syntax/python.vim
+unlet b:current_syntax
+
+" Pyrex extentions
+syn keyword pyrexStatement      cdef typedef ctypedef sizeof
+syn keyword pyrexType		int long short float double char object void
+syn keyword pyrexType		signed unsigned
+syn keyword pyrexStructure	struct union enum
+syn keyword pyrexInclude	include cimport
+syn keyword pyrexAccess		public private property readonly extern
+" If someome wants Python's built-ins highlighted probably he
+" also wants Pyrex's built-ins highlighted
+if exists("python_highlight_builtins") || exists("pyrex_highlight_builtins")
+    syn keyword pyrexBuiltin    NULL
+endif
+
+" This deletes "from" from the keywords and re-adds it as a
+" match with lower priority than pyrexForFrom
+syn clear   pythonInclude
+syn keyword pythonInclude     import
+syn match   pythonInclude     "from"
+
+" With "for[^:]*\zsfrom" VIM does not match "for" anymore, so
+" I used the slower "\@<=" form
+syn match   pyrexForFrom        "\(for[^:]*\)\@<=from"
+
+" Default highlighting
+hi def link pyrexStatement		Statement
+hi def link pyrexType		Type
+hi def link pyrexStructure		Structure
+hi def link pyrexInclude		PreCondit
+hi def link pyrexAccess		pyrexStatement
+if exists("python_highlight_builtins") || exists("pyrex_highlight_builtins")
+hi def link pyrexBuiltin	Function
+endif
+hi def link pyrexForFrom		Statement
+
+
+let b:current_syntax = "pyrex"
+
+endif
diff --git a/syntax/quake.vim b/syntax/quake.vim
new file mode 100644
index 000000000..34d553bbc
--- /dev/null
+++ b/syntax/quake.vim
@@ -0,0 +1,174 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'quake') == -1
+
+" Vim syntax file
+" Language:             Quake[1-3] configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-06-17
+"               quake_is_quake1 - the syntax is to be used for quake1 configs
+"               quake_is_quake2 - the syntax is to be used for quake2 configs
+"               quake_is_quake3 - the syntax is to be used for quake3 configs
+" Credits:              Tomasz Kalkosinski wrote the original quake3Colors stuff
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword+=-,+
+
+syn keyword quakeTodo         contained TODO FIXME XXX NOTE
+
+syn region  quakeComment      display oneline start='//' end='$' end=';'
+                              \ keepend contains=quakeTodo,@Spell
+
+syn region  quakeString       display oneline start=+"+ skip=+\\\\\|\\"+
+                              \ end=+"\|$+ contains=quakeNumbers,
+                              \ @quakeCommands,@quake3Colors
+
+syn case ignore
+
+syn match quakeNumbers        display transparent '\<-\=\d\|\.\d'
+                              \ contains=quakeNumber,quakeFloat,
+                              \ quakeOctalError,quakeOctal
+syn match quakeNumber         contained display '\d\+\>'
+syn match quakeFloat          contained display '\d\+\.\d*'
+syn match quakeFloat          contained display '\.\d\+\>'
+
+if exists("quake_is_quake1") || exists("quake_is_quake2")
+  syn match quakeOctal        contained display '0\o\+\>'
+                              \ contains=quakeOctalZero
+  syn match quakeOctalZero    contained display '\<0'
+  syn match quakeOctalError   contained display '0\o*[89]\d*'
+endif
+
+syn cluster quakeCommands     contains=quakeCommand,quake1Command,
+                              \ quake12Command,Quake2Command,Quake23Command,
+                              \ Quake3Command
+
+syn keyword quakeCommand      +attack +back +forward +left +lookdown +lookup
+syn keyword quakeCommand      +mlook +movedown +moveleft +moveright +moveup
+syn keyword quakeCommand      +right +speed +strafe -attack -back bind
+syn keyword quakeCommand      bindlist centerview clear connect cvarlist dir
+syn keyword quakeCommand      disconnect dumpuser echo error exec -forward
+syn keyword quakeCommand      god heartbeat joy_advancedupdate kick kill
+syn keyword quakeCommand      killserver -left -lookdown -lookup map
+syn keyword quakeCommand      messagemode messagemode2 -mlook modellist
+syn keyword quakeCommand      -movedown -moveleft -moveright -moveup play
+syn keyword quakeCommand      quit rcon reconnect record -right say say_team
+syn keyword quakeCommand      screenshot serverinfo serverrecord serverstop
+syn keyword quakeCommand      set sizedown sizeup snd_restart soundinfo
+syn keyword quakeCommand      soundlist -speed spmap status -strafe stopsound
+syn keyword quakeCommand      toggleconsole unbind unbindall userinfo pause
+syn keyword quakeCommand      vid_restart viewpos wait weapnext weapprev
+
+if exists("quake_is_quake1")
+  syn keyword quake1Command   sv
+endif
+
+if exists("quake_is_quake1") || exists("quake_is_quake2")
+  syn keyword quake12Command  +klook alias cd impulse link load save
+  syn keyword quake12Command  timerefresh changing info loading
+  syn keyword quake12Command  pingservers playerlist players score
+endif
+
+if exists("quake_is_quake2")
+  syn keyword quake2Command   cmd demomap +use condump download drop gamemap
+  syn keyword quake2Command   give gun_model setmaster sky sv_maplist wave
+  syn keyword quake2Command   cmdlist gameversiona gun_next gun_prev invdrop
+  syn keyword quake2Command   inven invnext invnextp invnextw invprev
+  syn keyword quake2Command   invprevp invprevw invuse menu_addressbook
+  syn keyword quake2Command   menu_credits menu_dmoptions menu_game
+  syn keyword quake2Command   menu_joinserver menu_keys menu_loadgame
+  syn keyword quake2Command   menu_main menu_multiplayer menu_options
+  syn keyword quake2Command   menu_playerconfig menu_quit menu_savegame
+  syn keyword quake2Command   menu_startserver menu_video
+  syn keyword quake2Command   notarget precache prog togglechat vid_front
+  syn keyword quake2Command   weaplast
+endif
+
+if exists("quake_is_quake2") || exists("quake_is_quake3")
+  syn keyword quake23Command  imagelist modellist path z_stats
+endif
+
+if exists("quake_is_quake3")
+  syn keyword quake3Command   +info +scores +zoom addbot arena banClient
+  syn keyword quake3Command   banUser callteamvote callvote changeVectors
+  syn keyword quake3Command   cinematic clientinfo clientkick cmd cmdlist
+  syn keyword quake3Command   condump configstrings crash cvar_restart devmap
+  syn keyword quake3Command   fdir follow freeze fs_openedList Fs_pureList
+  syn keyword quake3Command   Fs_referencedList gfxinfo globalservers
+  syn keyword quake3Command   hunk_stats in_restart -info levelshot
+  syn keyword quake3Command   loaddeferred localservers map_restart mem_info
+  syn keyword quake3Command   messagemode3 messagemode4 midiinfo model music
+  syn keyword quake3Command   modelist net_restart nextframe nextskin noclip
+  syn keyword quake3Command   notarget ping prevframe prevskin reset restart
+  syn keyword quake3Command   s_disable_a3d s_enable_a3d s_info s_list s_stop
+  syn keyword quake3Command   scanservers -scores screenshotJPEG sectorlist
+  syn keyword quake3Command   serverstatus seta setenv sets setu setviewpos
+  syn keyword quake3Command   shaderlist showip skinlist spdevmap startOribt
+  syn keyword quake3Command   stats stopdemo stoprecord systeminfo togglemenu
+  syn keyword quake3Command   tcmd team teamtask teamvote tell tell_attacker
+  syn keyword quake3Command   tell_target testgun testmodel testshader toggle
+  syn keyword quake3Command   touchFile vminfo vmprofile vmtest vosay
+  syn keyword quake3Command   vosay_team vote votell vsay vsay_team vstr
+  syn keyword quake3Command   vtaunt vtell vtell_attacker vtell_target weapon
+  syn keyword quake3Command   writeconfig -zoom
+  syn match   quake3Command   display "\<[+-]button\(\d\|1[0-4]\)\>"
+endif
+
+if exists("quake_is_quake3")
+  syn cluster quake3Colors    contains=quake3Red,quake3Green,quake3Yellow,
+                              \ quake3Blue,quake3Cyan,quake3Purple,quake3White,
+                              \ quake3Orange,quake3Grey,quake3Black,quake3Shadow
+
+  syn region quake3Red        contained start=+\^1+hs=e+1 end=+[$^"\n]+he=e-1
+  syn region quake3Green      contained start=+\^2+hs=e+1 end=+[$^"\n]+he=e-1
+  syn region quake3Yellow     contained start=+\^3+hs=e+1 end=+[$^"\n]+he=e-1
+  syn region quake3Blue       contained start=+\^4+hs=e+1 end=+[$^"\n]+he=e-1
+  syn region quake3Cyan       contained start=+\^5+hs=e+1 end=+[$^"\n]+he=e-1
+  syn region quake3Purple     contained start=+\^6+hs=e+1 end=+[$^"\n]+he=e-1
+  syn region quake3White      contained start=+\^7+hs=e+1 end=+[$^"\n]+he=e-1
+  syn region quake3Orange     contained start=+\^8+hs=e+1 end=+[$^\"\n]+he=e-1
+  syn region quake3Grey       contained start=+\^9+hs=e+1 end=+[$^"\n]+he=e-1
+  syn region quake3Black      contained start=+\^0+hs=e+1 end=+[$^"\n]+he=e-1
+  syn region quake3Shadow     contained start=+\^[Xx]+hs=e+1 end=+[$^"\n]+he=e-1
+endif
+
+hi def link quakeComment      Comment
+hi def link quakeTodo         Todo
+hi def link quakeString       String
+hi def link quakeNumber       Number
+hi def link quakeOctal        Number
+hi def link quakeOctalZero    PreProc
+hi def link quakeFloat        Number
+hi def link quakeOctalError   Error
+hi def link quakeCommand      quakeCommands
+hi def link quake1Command     quakeCommands
+hi def link quake12Command    quakeCommands
+hi def link quake2Command     quakeCommands
+hi def link quake23Command    quakeCommands
+hi def link quake3Command     quakeCommands
+hi def link quakeCommands     Keyword
+
+if exists("quake_is_quake3")
+  hi quake3Red                ctermfg=Red         guifg=Red
+  hi quake3Green              ctermfg=Green       guifg=Green
+  hi quake3Yellow             ctermfg=Yellow      guifg=Yellow
+  hi quake3Blue               ctermfg=Blue        guifg=Blue
+  hi quake3Cyan               ctermfg=Cyan        guifg=Cyan
+  hi quake3Purple             ctermfg=DarkMagenta guifg=Purple
+  hi quake3White              ctermfg=White       guifg=White
+  hi quake3Black              ctermfg=Black       guifg=Black
+  hi quake3Orange             ctermfg=Brown       guifg=Orange
+  hi quake3Grey               ctermfg=LightGrey   guifg=LightGrey
+  hi quake3Shadow             cterm=underline     gui=underline
+endif
+
+let b:current_syntax = "quake"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/radiance.vim b/syntax/radiance.vim
new file mode 100644
index 000000000..245d46723
--- /dev/null
+++ b/syntax/radiance.vim
@@ -0,0 +1,146 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'radiance') == -1
+
+" Vim syntax file
+" Language:     Radiance Scene Description
+" Maintainer:   Georg Mischler <schorsch@schorsch.com>
+" Last change:  26. April. 2001
+
+" Radiance is a lighting simulation software package written
+" by Gregory Ward-Larson ("the computer artist formerly known
+" as Greg Ward"), then at LBNL.
+"
+" http://radsite.lbl.gov/radiance/HOME.html
+"
+" Of course, there is also information available about it
+" from http://www.schorsch.com/
+
+
+" We take a minimalist approach here, highlighting just the
+" essential properties of each object, its type and ID, as well as
+" comments, external command names and the null-modifier "void".
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" all printing characters except '#' and '!' are valid in names.
+setlocal iskeyword=\",$-~
+
+" The null-modifier
+syn keyword radianceKeyword void
+
+" The different kinds of scene description object types
+" Reference types
+syn keyword radianceExtraType contained alias instance
+" Surface types
+syn keyword radianceSurfType contained ring polygon sphere bubble
+syn keyword radianceSurfType contained cone cup cylinder tube source
+" Emitting material types
+syn keyword radianceLightType contained light glow illum spotlight
+" Material types
+syn keyword radianceMatType contained mirror mist prism1 prism2
+syn keyword radianceMatType contained metal plastic trans
+syn keyword radianceMatType contained metal2 plastic2 trans2
+syn keyword radianceMatType contained metfunc plasfunc transfunc
+syn keyword radianceMatType contained metdata plasdata transdata
+syn keyword radianceMatType contained dielectric interface glass
+syn keyword radianceMatType contained BRTDfunc antimatter
+" Pattern modifier types
+syn keyword radiancePatType contained colorfunc brightfunc
+syn keyword radiancePatType contained colordata colorpict brightdata
+syn keyword radiancePatType contained colortext brighttext
+" Texture modifier types
+syn keyword radianceTexType contained texfunc texdata
+" Mixture types
+syn keyword radianceMixType contained mixfunc mixdata mixpict mixtext
+
+
+" Each type name is followed by an ID.
+" This doesn't work correctly if the id is one of the type names of the
+" same class (which is legal for radiance), in which case the id will get
+" type color as well, and the int count (or alias reference) gets id color.
+
+syn region radianceID start="\<alias\>"      end="\<\k*\>" contains=radianceExtraType
+syn region radianceID start="\<instance\>"   end="\<\k*\>" contains=radianceExtraType
+
+syn region radianceID start="\<source\>"     end="\<\k*\>" contains=radianceSurfType
+syn region radianceID start="\<ring\>"	     end="\<\k*\>" contains=radianceSurfType
+syn region radianceID start="\<polygon\>"    end="\<\k*\>" contains=radianceSurfType
+syn region radianceID start="\<sphere\>"     end="\<\k*\>" contains=radianceSurfType
+syn region radianceID start="\<bubble\>"     end="\<\k*\>" contains=radianceSurfType
+syn region radianceID start="\<cone\>"	     end="\<\k*\>" contains=radianceSurfType
+syn region radianceID start="\<cup\>"	     end="\<\k*\>" contains=radianceSurfType
+syn region radianceID start="\<cylinder\>"   end="\<\k*\>" contains=radianceSurfType
+syn region radianceID start="\<tube\>"	     end="\<\k*\>" contains=radianceSurfType
+
+syn region radianceID start="\<light\>"      end="\<\k*\>" contains=radianceLightType
+syn region radianceID start="\<glow\>"	     end="\<\k*\>" contains=radianceLightType
+syn region radianceID start="\<illum\>"      end="\<\k*\>" contains=radianceLightType
+syn region radianceID start="\<spotlight\>"  end="\<\k*\>" contains=radianceLightType
+
+syn region radianceID start="\<mirror\>"     end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<mist\>"	     end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<prism1\>"     end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<prism2\>"     end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<metal\>"      end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<plastic\>"    end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<trans\>"      end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<metal2\>"     end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<plastic2\>"   end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<trans2\>"     end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<metfunc\>"    end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<plasfunc\>"   end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<transfunc\>"  end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<metdata\>"    end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<plasdata\>"   end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<transdata\>"  end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<dielectric\>" end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<interface\>"  end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<glass\>"      end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<BRTDfunc\>"   end="\<\k*\>" contains=radianceMatType
+syn region radianceID start="\<antimatter\>" end="\<\k*\>" contains=radianceMatType
+
+syn region radianceID start="\<colorfunc\>"  end="\<\k*\>" contains=radiancePatType
+syn region radianceID start="\<brightfunc\>" end="\<\k*\>" contains=radiancePatType
+syn region radianceID start="\<colordata\>"  end="\<\k*\>" contains=radiancePatType
+syn region radianceID start="\<brightdata\>" end="\<\k*\>" contains=radiancePatType
+syn region radianceID start="\<colorpict\>"  end="\<\k*\>" contains=radiancePatType
+syn region radianceID start="\<colortext\>"  end="\<\k*\>" contains=radiancePatType
+syn region radianceID start="\<brighttext\>" end="\<\k*\>" contains=radiancePatType
+
+syn region radianceID start="\<texfunc\>"    end="\<\k*\>" contains=radianceTexType
+syn region radianceID start="\<texdata\>"    end="\<\k*\>" contains=radianceTexType
+
+syn region radianceID start="\<mixfunc\>"    end="\<\k*\>" contains=radianceMixType
+syn region radianceID start="\<mixdata\>"    end="\<\k*\>" contains=radianceMixType
+syn region radianceID start="\<mixtext\>"    end="\<\k*\>" contains=radianceMixType
+
+" external commands (generators, xform et al.)
+syn match radianceCommand "^\s*!\s*[^\s]\+\>"
+
+" The usual suspects
+syn keyword radianceTodo contained TODO XXX
+syn match radianceComment "#.*$" contains=radianceTodo
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+hi def link radianceKeyword	Keyword
+hi def link radianceExtraType	Type
+hi def link radianceSurfType	Type
+hi def link radianceLightType	Type
+hi def link radianceMatType	Type
+hi def link radiancePatType	Type
+hi def link radianceTexType	Type
+hi def link radianceMixType	Type
+hi def link radianceComment	Comment
+hi def link radianceCommand	Function
+hi def link radianceID		String
+hi def link radianceTodo		Todo
+
+let b:current_syntax = "radiance"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/ratpoison.vim b/syntax/ratpoison.vim
new file mode 100644
index 000000000..9719e6381
--- /dev/null
+++ b/syntax/ratpoison.vim
@@ -0,0 +1,271 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ratpoison') == -1
+
+" Vim syntax file
+" Language:	Ratpoison configuration/commands file ( /etc/ratpoisonrc ~/.ratpoisonrc )
+" Maintainer:	Magnus Woldrich <m@japh.se>
+" URL:		http://github.com/trapd00r/vim-syntax-ratpoison
+" Last Change:	2011 Apr 11
+" Previous Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match   ratpoisonComment	"^\s*#.*$"		contains=ratpoisonTodo
+
+syn keyword ratpoisonTodo	TODO NOTE FIXME XXX	contained
+
+syn case ignore
+syn keyword ratpoisonBooleanArg	on off			contained
+syn case match
+
+syn keyword ratpoisonCommandArg abort addhook alias banish chdir		contained
+syn keyword ratpoisonCommandArg clrunmanaged cnext colon compat cother		contained
+syn keyword ratpoisonCommandArg cprev curframe dedicate definekey delete	contained
+syn keyword ratpoisonCommandArg delkmap describekey echo escape exec		contained
+syn keyword ratpoisonCommandArg fdump focus focusdown focuslast focusleft	contained
+syn keyword ratpoisonCommandArg focusprev focusright focusup frestore fselect	contained
+syn keyword ratpoisonCommandArg gdelete getenv getsel gmerge gmove		contained
+syn keyword ratpoisonCommandArg gnew gnewbg gnext gprev gravity			contained
+syn keyword ratpoisonCommandArg groups gselect help hsplit inext		contained
+syn keyword ratpoisonCommandArg info iother iprev kill lastmsg			contained
+syn keyword ratpoisonCommandArg license link listhook meta msgwait		contained
+syn keyword ratpoisonCommandArg newkmap newwm next nextscreen number		contained
+syn keyword ratpoisonCommandArg only other prev prevscreen prompt		contained
+syn keyword ratpoisonCommandArg putsel quit ratclick rathold ratrelwarp		contained
+syn keyword ratpoisonCommandArg ratwarp readkey redisplay redo remhook		contained
+syn keyword ratpoisonCommandArg remove resize restart rudeness sdump		contained
+syn keyword ratpoisonCommandArg select set setenv sfdump shrink			contained
+syn keyword ratpoisonCommandArg source sselect startup_message time title	contained
+syn keyword ratpoisonCommandArg tmpwm unalias undefinekey undo unmanage		contained
+syn keyword ratpoisonCommandArg unsetenv verbexec version vsplit warp		contained
+syn keyword ratpoisonCommandArg windows						contained
+
+syn match   ratpoisonGravityArg "\<\(n\|north\)\>"	contained
+syn match   ratpoisonGravityArg "\<\(nw\|northwest\)\>"	contained
+syn match   ratpoisonGravityArg "\<\(ne\|northeast\)\>"	contained
+syn match   ratpoisonGravityArg "\<\(w\|west\)\>"	contained
+syn match   ratpoisonGravityArg "\<\(c\|center\)\>"	contained
+syn match   ratpoisonGravityArg "\<\(e\|east\)\>"	contained
+syn match   ratpoisonGravityArg "\<\(s\|south\)\>"	contained
+syn match   ratpoisonGravityArg "\<\(sw\|southwest\)\>"	contained
+syn match   ratpoisonGravityArg "\<\(se\|southeast\)\>"	contained
+syn case match
+
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(F[1-9][0-9]\=\|\(\a\|\d\)\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(space\|exclam\|quotedbl\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(numbersign\|dollar\|percent\|ampersand\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(apostrophe\|quoteright\|parenleft\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(parenright\|asterisk\|plus\|comma\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(minus\|period\|slash\|colon\|semicolon\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(less\|equal\|greater\|question\|at\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(bracketleft\|backslash\|bracketright\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(asciicircum\|underscore\|grave\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(quoteleft\|braceleft\|bar\|braceright\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(asciitilde\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(BackSpace\|Tab\|Linefeed\|Clear\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(Return\|Pause\|Scroll_Lock\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(Sys_Req\|Escape\|Delete\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(Home\|Left\|Up\|Right\|Down\|Prior\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(Page_Up\|Next\|Page_Down\|End\|Begin\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(Select\|Print\|Execute\|Insert\|Undo\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(Redo\|Menu\|Find\|Cancel\|Help\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=\(Break\|Mode_switch\|script_switch\|Num_Lock\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=KP_\(Space\|Tab\|Enter\|F[1234]\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=KP_\(Home\|Left\|Up\|Right\|Down\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=KP_\(Prior\|Page_Up\|Next\|Page_Down\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=KP_\(End\|Begin\|Insert\|Delete\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=KP_\(Equal\|Multiply\|Add\|Separator\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+syn match   ratpoisonKeySeqArg  "\<\([CMASH]\(-[CMASH]\)\{,4}-\)\=KP_\(Subtract\|Decimal\|Divide\|\d\)\>" contained nextgroup=ratpoisonCommandArg skipwhite
+
+syn match   ratpoisonHookArg    "\<\(key\|switchwin\|switchframe\|switchgroup\|quit\|restart\)\>" contained
+
+syn match   ratpoisonNumberArg  "\<\d\+\>"	contained nextgroup=ratpoisonNumberArg skipwhite
+
+syn keyword ratpoisonSetArg	barborder	contained nextgroup=ratpoisonNumberArg
+syn keyword ratpoisonSetArg	bargravity	contained nextgroup=ratpoisonGravityArg
+syn keyword ratpoisonSetArg	barpadding	contained nextgroup=ratpoisonNumberArg
+syn keyword ratpoisonSetArg	bgcolor
+syn keyword ratpoisonSetArg	border		contained nextgroup=ratpoisonNumberArg
+syn keyword ratpoisonSetArg	fgcolor
+syn keyword ratpoisonSetArg	fwcolor
+syn keyword ratpoisonSetArg	bwcolor
+syn keyword ratpoisonSetArg	historysize
+syn keyword ratpoisonSetArg	historycompaction
+syn keyword ratpoisonSetArg	historyexpansion
+syn keyword ratpoisonSetArg	topkmap
+syn keyword ratpoisonSetArg	barinpadding
+syn keyword ratpoisonSetArg	font
+syn keyword ratpoisonSetArg	framesels
+syn keyword ratpoisonSetArg	inputwidth	contained nextgroup=ratpoisonNumberArg
+syn keyword ratpoisonSetArg	maxsizegravity	contained nextgroup=ratpoisonGravityArg
+syn keyword ratpoisonSetArg	padding		contained nextgroup=ratpoisonNumberArg
+syn keyword ratpoisonSetArg	resizeunit	contained nextgroup=ratpoisonNumberArg
+syn keyword ratpoisonSetArg	transgravity	contained nextgroup=ratpoisonGravityArg
+syn keyword ratpoisonSetArg	waitcursor	contained nextgroup=ratpoisonNumberArg
+syn keyword ratpoisonSetArg	winfmt		contained nextgroup=ratpoisonWinFmtArg
+syn keyword ratpoisonSetArg	wingravity	contained nextgroup=ratpoisonGravityArg
+syn keyword ratpoisonSetArg	winliststyle	contained nextgroup=ratpoisonWinListArg
+syn keyword ratpoisonSetArg	winname		contained nextgroup=ratpoisonWinNameArg
+
+syn match   ratpoisonWinFmtArg  "%[nstacil]"			contained nextgroup=ratpoisonWinFmtArg skipwhite
+
+syn match   ratpoisonWinListArg "\<\(row\|column\)\>"		contained
+
+syn match   ratpoisonWinNameArg "\<\(name\|title\|class\)\>"	contained
+
+syn match   ratpoisonDefCommand		"^\s*set\s*"			nextgroup=ratpoisonSetArg
+syn match   ratpoisonDefCommand		"^\s*defbarborder\s*"		nextgroup=ratpoisonNumberArg
+syn match   ratpoisonDefCommand		"^\s*defbargravity\s*"		nextgroup=ratpoisonGravityArg
+syn match   ratpoisonDefCommand		"^\s*defbarpadding\s*"		nextgroup=ratpoisonNumberArg
+syn match   ratpoisonDefCommand		"^\s*defbgcolor\s*"
+syn match   ratpoisonDefCommand		"^\s*defborder\s*"		nextgroup=ratpoisonNumberArg
+syn match   ratpoisonDefCommand		"^\s*deffgcolor\s*"
+syn match   ratpoisonDefCommand		"^\s*deffont\s*"
+syn match   ratpoisonDefCommand		"^\s*defframesels\s*"
+syn match   ratpoisonDefCommand		"^\s*definputwidth\s*"		nextgroup=ratpoisonNumberArg
+syn match   ratpoisonDefCommand		"^\s*defmaxsizegravity\s*"	nextgroup=ratpoisonGravityArg
+syn match   ratpoisonDefCommand		"^\s*defpadding\s*"		nextgroup=ratpoisonNumberArg
+syn match   ratpoisonDefCommand		"^\s*defresizeunit\s*"		nextgroup=ratpoisonNumberArg
+syn match   ratpoisonDefCommand		"^\s*deftransgravity\s*"	nextgroup=ratpoisonGravityArg
+syn match   ratpoisonDefCommand		"^\s*defwaitcursor\s*"		nextgroup=ratpoisonNumberArg
+syn match   ratpoisonDefCommand		"^\s*defwinfmt\s*"		nextgroup=ratpoisonWinFmtArg
+syn match   ratpoisonDefCommand		"^\s*defwingravity\s*"		nextgroup=ratpoisonGravityArg
+syn match   ratpoisonDefCommand		"^\s*defwinliststyle\s*"	nextgroup=ratpoisonWinListArg
+syn match   ratpoisonDefCommand		"^\s*defwinname\s*"		nextgroup=ratpoisonWinNameArg
+syn match   ratpoisonDefCommand		"^\s*msgwait\s*"		nextgroup=ratpoisonNumberArg
+
+syn match   ratpoisonStringCommand	"^\s*\zsaddhook\ze\s*"		nextgroup=ratpoisonHookArg
+syn match   ratpoisonStringCommand	"^\s*\zsalias\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsbind\ze\s*"		nextgroup=ratpoisonKeySeqArg
+syn match   ratpoisonStringCommand	"^\s*\zschdir\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zscolon\ze\s*"		nextgroup=ratpoisonCommandArg
+syn match   ratpoisonStringCommand	"^\s*\zsdedicate\ze\s*"		nextgroup=ratpoisonNumberArg
+syn match   ratpoisonStringCommand	"^\s*\zsdefinekey\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsdelkmap\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsdescribekey\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsecho\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsescape\ze\s*"		nextgroup=ratpoisonKeySeqArg
+syn match   ratpoisonStringCommand	"^\s*\zsexec\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsfdump\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsfrestore\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsgdelete\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsgetenv\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsgravity\ze\s*"		nextgroup=ratpoisonGravityArg
+syn match   ratpoisonStringCommand	"^\s*\zsgselect\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zslink\ze\s*"		nextgroup=ratpoisonKeySeqArg
+syn match   ratpoisonStringCommand	"^\s*\zslisthook\ze\s*"		nextgroup=ratpoisonHookArg
+syn match   ratpoisonStringCommand	"^\s*\zsnewkmap\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsnewwm\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsnumber\ze\s*"		nextgroup=ratpoisonNumberArg
+syn match   ratpoisonStringCommand	"^\s*\zsprompt\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsratwarp\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsratrelwarp\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsratclick\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsrathold\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsreadkey\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsremhook\ze\s*"		nextgroup=ratpoisonHookArg
+syn match   ratpoisonStringCommand	"^\s*\zsresize\ze\s*"		nextgroup=ratpoisonNumberArg
+syn match   ratpoisonStringCommand	"^\s*\zsrudeness\ze\s*"		nextgroup=ratpoisonNumberArg
+syn match   ratpoisonStringCommand	"^\s*\zsselect\ze\s*"		nextgroup=ratpoisonNumberArg
+syn match   ratpoisonStringCommand	"^\s*\zssetenv\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zssource\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zssselect\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsstartup_message\ze\s*"	nextgroup=ratpoisonBooleanArg
+syn match   ratpoisonStringCommand	"^\s*\zstitle\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zstmpwm\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsunalias\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsunbind\ze\s*"		nextgroup=ratpoisonKeySeqArg
+syn match   ratpoisonStringCommand	"^\s*\zsundefinekey\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsunmanage\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsunsetenv\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zsverbexec\ze\s*"
+syn match   ratpoisonStringCommand	"^\s*\zswarp\ze\s*"		nextgroup=ratpoisonBooleanArg
+
+syn match   ratpoisonVoidCommand	"^\s*\zsabort\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsbanish\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsclrunmanaged\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zscnext\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zscompat\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zscother\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zscprev\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zscurframe\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsdelete\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsfocusdown\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsfocuslast\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsfocusleft\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsfocusprev\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsfocusright\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsfocusup\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsfocus\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsfselect\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsgetsel\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsgmerge\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsgmove\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsgnewbg\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsgnew\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsgnext\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsgprev\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsgroups\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zshelp\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zshsplit\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsinext\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsinfo\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsiother\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsiprev\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zskill\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zslastmsg\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zslicense\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsmeta\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsnextscreen\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsnext\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsonly\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsother\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsprevscreen\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsprev\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsputsel\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsquit\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsredisplay\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsredo\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsremove\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsrestart\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zssdump\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zssfdump\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsshrink\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zssplit\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zstime\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsundo\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsversion\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zsvsplit\ze\s*$"
+syn match   ratpoisonVoidCommand	"^\s*\zswindows\ze\s*$"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link ratpoisonBooleanArg	Boolean
+hi def link ratpoisonCommandArg	Keyword
+hi def link ratpoisonComment	Comment
+hi def link ratpoisonDefCommand	Identifier
+hi def link ratpoisonGravityArg	Constant
+hi def link ratpoisonKeySeqArg	Special
+hi def link ratpoisonNumberArg	Number
+hi def link ratpoisonSetArg	Keyword
+hi def link ratpoisonStringCommand	Identifier
+hi def link ratpoisonTodo		Todo
+hi def link ratpoisonVoidCommand	Identifier
+hi def link ratpoisonWinFmtArg	Special
+hi def link ratpoisonWinNameArg	Constant
+hi def link ratpoisonWinListArg	Constant
+
+
+let b:current_syntax = "ratpoison"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/rc.vim b/syntax/rc.vim
new file mode 100644
index 000000000..e20a43f92
--- /dev/null
+++ b/syntax/rc.vim
@@ -0,0 +1,194 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rc') == -1
+
+" Vim syntax file
+" Language:	M$ Resource files (*.rc)
+" Maintainer:	Christian Brabandt
+" Last Change:	2015-05-29
+" Repository:   https://github.com/chrisbra/vim-rc-syntax
+" License:	Vim (see :h license)
+" Previous Maintainer:	Heiko Erhardt <Heiko.Erhardt@munich.netsurf.de>
+
+" This file is based on the c.vim
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Common RC keywords
+syn keyword rcLanguage LANGUAGE
+
+syn keyword rcMainObject TEXTINCLUDE VERSIONINFO BITMAP ICON CURSOR CURSOR
+syn keyword rcMainObject MENU ACCELERATORS TOOLBAR DIALOG
+syn keyword rcMainObject STRINGTABLE MESSAGETABLE RCDATA DLGINIT DESIGNINFO
+
+syn keyword rcSubObject POPUP MENUITEM SEPARATOR
+syn keyword rcSubObject CONTROL LTEXT CTEXT RTEXT EDITTEXT
+syn keyword rcSubObject BUTTON PUSHBUTTON DEFPUSHBUTTON GROUPBOX LISTBOX COMBOBOX
+syn keyword rcSubObject FILEVERSION PRODUCTVERSION FILEFLAGSMASK FILEFLAGS FILEOS
+syn keyword rcSubObject FILETYPE FILESUBTYPE
+
+syn keyword rcCaptionParam CAPTION
+syn keyword rcParam CHARACTERISTICS CLASS STYLE EXSTYLE VERSION FONT
+
+syn keyword rcStatement BEGIN END BLOCK VALUE
+
+syn keyword rcCommonAttribute PRELOAD LOADONCALL FIXED MOVEABLE DISCARDABLE PURE IMPURE
+
+syn keyword rcAttribute WS_OVERLAPPED WS_POPUP WS_CHILD WS_MINIMIZE WS_VISIBLE WS_DISABLED WS_CLIPSIBLINGS
+syn keyword rcAttribute WS_CLIPCHILDREN WS_MAXIMIZE WS_CAPTION WS_BORDER WS_DLGFRAME WS_VSCROLL WS_HSCROLL
+syn keyword rcAttribute WS_SYSMENU WS_THICKFRAME WS_GROUP WS_TABSTOP WS_MINIMIZEBOX WS_MAXIMIZEBOX WS_TILED
+syn keyword rcAttribute WS_ICONIC WS_SIZEBOX WS_TILEDWINDOW WS_OVERLAPPEDWINDOW WS_POPUPWINDOW WS_CHILDWINDOW
+syn keyword rcAttribute WS_EX_DLGMODALFRAME WS_EX_NOPARENTNOTIFY WS_EX_TOPMOST WS_EX_ACCEPTFILES
+syn keyword rcAttribute WS_EX_TRANSPARENT WS_EX_MDICHILD WS_EX_TOOLWINDOW WS_EX_WINDOWEDGE WS_EX_CLIENTEDGE
+syn keyword rcAttribute WS_EX_CONTEXTHELP WS_EX_RIGHT WS_EX_LEFT WS_EX_RTLREADING WS_EX_LTRREADING
+syn keyword rcAttribute WS_EX_LEFTSCROLLBAR WS_EX_RIGHTSCROLLBAR WS_EX_CONTROLPARENT WS_EX_STATICEDGE
+syn keyword rcAttribute WS_EX_APPWINDOW WS_EX_OVERLAPPEDWINDOW WS_EX_PALETTEWINDOW
+syn keyword rcAttribute ES_LEFT ES_CENTER ES_RIGHT ES_MULTILINE ES_UPPERCASE ES_LOWERCASE ES_PASSWORD
+syn keyword rcAttribute ES_AUTOVSCROLL ES_AUTOHSCROLL ES_NOHIDESEL ES_OEMCONVERT ES_READONLY ES_WANTRETURN
+syn keyword rcAttribute ES_NUMBER
+syn keyword rcAttribute BS_PUSHBUTTON BS_DEFPUSHBUTTON BS_CHECKBOX BS_AUTOCHECKBOX BS_RADIOBUTTON BS_3STATE
+syn keyword rcAttribute BS_AUTO3STATE BS_GROUPBOX BS_USERBUTTON BS_AUTORADIOBUTTON BS_OWNERDRAW BS_LEFTTEXT
+syn keyword rcAttribute BS_TEXT BS_ICON BS_BITMAP BS_LEFT BS_RIGHT BS_CENTER BS_TOP BS_BOTTOM BS_VCENTER
+syn keyword rcAttribute BS_PUSHLIKE BS_MULTILINE BS_NOTIFY BS_FLAT BS_RIGHTBUTTON
+syn keyword rcAttribute SS_LEFT SS_CENTER SS_RIGHT SS_ICON SS_BLACKRECT SS_GRAYRECT SS_WHITERECT
+syn keyword rcAttribute SS_BLACKFRAME SS_GRAYFRAME SS_WHITEFRAME SS_USERITEM SS_SIMPLE SS_LEFTNOWORDWRAP
+syn keyword rcAttribute SS_OWNERDRAW SS_BITMAP SS_ENHMETAFILE SS_ETCHEDHORZ SS_ETCHEDVERT SS_ETCHEDFRAME
+syn keyword rcAttribute SS_TYPEMASK SS_NOPREFIX SS_NOTIFY SS_CENTERIMAGE SS_RIGHTJUST SS_REALSIZEIMAGE
+syn keyword rcAttribute SS_SUNKEN SS_ENDELLIPSIS SS_PATHELLIPSIS SS_WORDELLIPSIS SS_ELLIPSISMASK
+syn keyword rcAttribute DS_ABSALIGN DS_SYSMODAL DS_LOCALEDIT DS_SETFONT DS_MODALFRAME DS_NOIDLEMSG
+syn keyword rcAttribute DS_SETFOREGROUND DS_3DLOOK DS_FIXEDSYS DS_NOFAILCREATE DS_CONTROL DS_CENTER
+syn keyword rcAttribute DS_CENTERMOUSE DS_CONTEXTHELP
+syn keyword rcAttribute LBS_NOTIFY LBS_SORT LBS_NOREDRAW LBS_MULTIPLESEL LBS_OWNERDRAWFIXED
+syn keyword rcAttribute LBS_OWNERDRAWVARIABLE LBS_HASSTRINGS LBS_USETABSTOPS LBS_NOINTEGRALHEIGHT
+syn keyword rcAttribute LBS_MULTICOLUMN LBS_WANTKEYBOARDINPUT LBS_EXTENDEDSEL LBS_DISABLENOSCROLL
+syn keyword rcAttribute LBS_NODATA LBS_NOSEL LBS_STANDARD
+syn keyword rcAttribute CBS_SIMPLE CBS_DROPDOWN CBS_DROPDOWNLIST CBS_OWNERDRAWFIXED CBS_OWNERDRAWVARIABLE
+syn keyword rcAttribute CBS_AUTOHSCROLL CBS_OEMCONVERT CBS_SORT CBS_HASSTRINGS CBS_NOINTEGRALHEIGHT
+syn keyword rcAttribute CBS_DISABLENOSCROLL CBS_UPPERCASE CBS_LOWERCASE
+syn keyword rcAttribute SBS_HORZ SBS_VERT SBS_TOPALIGN SBS_LEFTALIGN SBS_BOTTOMALIGN SBS_RIGHTALIGN
+syn keyword rcAttribute SBS_SIZEBOXTOPLEFTALIGN SBS_SIZEBOXBOTTOMRIGHTALIGN SBS_SIZEBOX SBS_SIZEGRIP
+syn keyword rcAttribute CCS_TOP CCS_NOMOVEY CCS_BOTTOM CCS_NORESIZE CCS_NOPARENTALIGN CCS_ADJUSTABLE
+syn keyword rcAttribute CCS_NODIVIDER
+syn keyword rcAttribute LVS_ICON LVS_REPORT LVS_SMALLICON LVS_LIST LVS_TYPEMASK LVS_SINGLESEL LVS_SHOWSELALWAYS
+syn keyword rcAttribute LVS_SORTASCENDING LVS_SORTDESCENDING LVS_SHAREIMAGELISTS LVS_NOLABELWRAP
+syn keyword rcAttribute LVS_EDITLABELS LVS_OWNERDATA LVS_NOSCROLL LVS_TYPESTYLEMASK  LVS_ALIGNTOP LVS_ALIGNLEFT
+syn keyword rcAttribute LVS_ALIGNMASK LVS_OWNERDRAWFIXED LVS_NOCOLUMNHEADER LVS_NOSORTHEADER LVS_AUTOARRANGE
+syn keyword rcAttribute TVS_HASBUTTONS TVS_HASLINES TVS_LINESATROOT TVS_EDITLABELS TVS_DISABLEDRAGDROP
+syn keyword rcAttribute TVS_SHOWSELALWAYS
+syn keyword rcAttribute TCS_FORCEICONLEFT TCS_FORCELABELLEFT TCS_TABS TCS_BUTTONS TCS_SINGLELINE TCS_MULTILINE
+syn keyword rcAttribute TCS_RIGHTJUSTIFY TCS_FIXEDWIDTH TCS_RAGGEDRIGHT TCS_FOCUSONBUTTONDOWN
+syn keyword rcAttribute TCS_OWNERDRAWFIXED TCS_TOOLTIPS TCS_FOCUSNEVER
+syn keyword rcAttribute ACS_CENTER ACS_TRANSPARENT ACS_AUTOPLAY
+syn keyword rcStdId IDI_APPLICATION IDI_HAND IDI_QUESTION IDI_EXCLAMATION IDI_ASTERISK IDI_WINLOGO IDI_WINLOGO
+syn keyword rcStdId IDI_WARNING IDI_ERROR IDI_INFORMATION
+syn keyword rcStdId IDCANCEL IDABORT IDRETRY IDIGNORE IDYES IDNO IDCLOSE IDHELP IDC_STATIC
+
+" Common RC keywords
+
+" Common RC keywords
+syn keyword rcTodo contained	TODO FIXME XXX
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match rcSpecial contained	"\\[0-7][0-7][0-7]\=\|\\."
+syn region rcString		start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=rcSpecial
+syn match rcCharacter		"'[^\\]'"
+syn match rcSpecialCharacter	"'\\.'"
+syn match rcSpecialCharacter	"'\\[0-7][0-7]'"
+syn match rcSpecialCharacter	"'\\[0-7][0-7][0-7]'"
+
+"catch errors caused by wrong parenthesis
+syn region rcParen		transparent start='(' end=')' contains=ALLBUT,rcParenError,rcIncluded,rcSpecial,rcTodo
+syn match rcParenError		")"
+syn match rcInParen contained	"[{}]"
+
+"integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match rcNumber		"\<\d\+\(u\=l\=\|lu\|f\)\>"
+"floating point number, with dot, optional exponent
+syn match rcFloat		"\<\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, starting with a dot, optional exponent
+syn match rcFloat		"\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+syn match rcFloat		"\<\d\+e[-+]\=\d\+[fl]\=\>"
+"hex number
+syn match rcNumber		"\<0x[0-9a-f]\+\(u\=l\=\|lu\)\>"
+"syn match rcIdentifier	"\<[a-z_][a-z0-9_]*\>"
+syn case match
+" flag an octal number with wrong digits
+syn match rcOctalError		"\<0[0-7]*[89]"
+
+if exists("rc_comment_strings")
+  " A comment can contain rcString, rcCharacter and rcNumber.
+  " But a "*/" inside a rcString in a rcComment DOES end the comment!  So we
+  " need to use a special type of rcString: rcCommentString, which also ends on
+  " "*/", and sees a "*" at the start of the line as comment again.
+  " Unfortunately this doesn't very well work for // type of comments :-(
+  syntax match rcCommentSkip	contained "^\s*\*\($\|\s\+\)"
+  syntax region rcCommentString	contained start=+"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=rcSpecial,rcCommentSkip
+  syntax region rcComment2String	contained start=+"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=rcSpecial
+  syntax region rcComment	start="/\*" end="\*/" contains=rcTodo,rcCommentString,rcCharacter,rcNumber,rcFloat
+  syntax match  rcComment	"//.*" contains=rcTodo,rcComment2String,rcCharacter,rcNumber
+else
+  syn region rcComment		start="/\*" end="\*/" contains=rcTodo
+  syn match rcComment		"//.*" contains=rcTodo
+endif
+syntax match rcCommentError	"\*/"
+
+syn region rcPreCondit	start="^\s*#\s*\(if\>\|ifdef\>\|ifndef\>\|elif\>\|else\>\|endif\>\)" skip="\\$" end="$" contains=rcComment,rcString,rcCharacter,rcNumber,rcCommentError
+syn region rcIncluded contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match rcIncluded contained "<[^>]*>"
+syn match rcInclude		"^\s*#\s*include\>\s*["<]" contains=rcIncluded
+"syn match rcLineSkip	"\\$"
+syn region rcDefine		start="^\s*#\s*\(define\>\|undef\>\)" skip="\\$" end="$" contains=ALLBUT,rcPreCondit,rcIncluded,rcInclude,rcDefine,rcInParen
+syn region rcPreProc		start="^\s*#\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" contains=ALLBUT,rcPreCondit,rcIncluded,rcInclude,rcDefine,rcInParen
+
+syn sync ccomment rcComment minlines=10
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link rcCharacter	Character
+hi def link rcSpecialCharacter rcSpecial
+hi def link rcNumber	Number
+hi def link rcFloat	Float
+hi def link rcOctalError	rcError
+hi def link rcParenError	rcError
+hi def link rcInParen	rcError
+hi def link rcCommentError	rcError
+hi def link rcInclude	Include
+hi def link rcPreProc	PreProc
+hi def link rcDefine	Macro
+hi def link rcIncluded	rcString
+hi def link rcError	Error
+hi def link rcPreCondit	PreCondit
+hi def link rcCommentString rcString
+hi def link rcComment2String rcString
+hi def link rcCommentSkip	rcComment
+hi def link rcString	String
+hi def link rcComment	Comment
+hi def link rcSpecial	SpecialChar
+hi def link rcTodo	Todo
+
+hi def link rcAttribute	rcCommonAttribute
+hi def link rcStdId	rcStatement
+hi def link rcStatement	Statement
+
+" Default color overrides
+hi def rcLanguage	term=reverse ctermbg=Red ctermfg=Yellow guibg=Red guifg=Yellow
+hi def rcMainObject	term=underline ctermfg=Blue guifg=Blue
+hi def rcSubObject	ctermfg=Green guifg=Green
+hi def rcCaptionParam	term=underline ctermfg=DarkGreen guifg=Green
+hi def rcParam	ctermfg=DarkGreen guifg=DarkGreen
+hi def rcStatement	ctermfg=DarkGreen guifg=DarkGreen
+hi def rcCommonAttribute	ctermfg=Brown guifg=Brown
+
+"hi def link rcIdentifier	Identifier
+
+
+let b:current_syntax = "rc"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/rcs.vim b/syntax/rcs.vim
new file mode 100644
index 000000000..65ac8092d
--- /dev/null
+++ b/syntax/rcs.vim
@@ -0,0 +1,67 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rcs') == -1
+
+" Vim syntax file
+" Language:     RCS file
+" Maintainer:   Dmitry Vasiliev <dima at hlabs dot org>
+" URL:          https://github.com/hdima/vim-scripts/blob/master/syntax/rcs.vim
+" Last Change:  2012-02-11
+" Filenames:    *,v
+" Version:      1.12
+
+" Options:
+"   rcs_folding = 1   For folding strings
+
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
+  finish
+endif
+
+" RCS file must end with a newline.
+syn match rcsEOFError   ".\%$" containedin=ALL
+
+" Keywords.
+syn keyword rcsKeyword  head branch access symbols locks strict
+syn keyword rcsKeyword  comment expand date author state branches
+syn keyword rcsKeyword  next desc log
+syn keyword rcsKeyword  text nextgroup=rcsTextStr skipwhite skipempty
+
+" Revision numbers and dates.
+syn match rcsNumber "\<[0-9.]\+\>" display
+
+" Strings.
+if exists("rcs_folding") && has("folding")
+  " Folded strings.
+  syn region rcsString  matchgroup=rcsString start="@" end="@" skip="@@" fold contains=rcsSpecial
+  syn region rcsTextStr matchgroup=rcsTextStr start="@" end="@" skip="@@" fold contained contains=rcsSpecial,rcsDiffLines
+else
+  syn region rcsString  matchgroup=rcsString start="@" end="@" skip="@@" contains=rcsSpecial
+  syn region rcsTextStr matchgroup=rcsTextStr start="@" end="@" skip="@@" contained contains=rcsSpecial,rcsDiffLines
+endif
+syn match rcsSpecial    "@@" contained
+syn match rcsDiffLines  "[da]\d\+ \d\+$" contained
+
+" Synchronization.
+syn sync clear
+if exists("rcs_folding") && has("folding")
+  syn sync fromstart
+else
+  " We have incorrect folding if following sync patterns is turned on.
+  syn sync match rcsSync    grouphere rcsString "[0-9.]\+\(\s\|\n\)\+log\(\s\|\n\)\+@"me=e-1
+  syn sync match rcsSync    grouphere rcsTextStr "@\(\s\|\n\)\+text\(\s\|\n\)\+@"me=e-1
+endif
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet.
+
+hi def link rcsKeyword     Keyword
+hi def link rcsNumber      Identifier
+hi def link rcsString      String
+hi def link rcsTextStr     String
+hi def link rcsSpecial     Special
+hi def link rcsDiffLines   Special
+hi def link rcsEOFError    Error
+
+
+let b:current_syntax = "rcs"
+
+endif
diff --git a/syntax/readline.vim b/syntax/readline.vim
new file mode 100644
index 000000000..e4a0971ce
--- /dev/null
+++ b/syntax/readline.vim
@@ -0,0 +1,415 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'readline') == -1
+
+" Vim syntax file
+" Language:             readline(3) configuration file
+" Maintainer:           Daniel Moch <daniel@danielmoch.com>
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2018-07-26
+"                       Add new functions for Readline 7 / Bash 4.4
+"                       (credit: Github user bewuethr)
+
+if exists('b:current_syntax')
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword+=-
+
+syn match   readlineKey         contained
+                              \ '\S'
+                              \ nextgroup=readlineKeyTerminator
+
+syn match   readlineBegin       display '^'
+                              \ nextgroup=readlineComment,
+                              \           readlineConditional,
+                              \           readlineInclude,
+                              \           readlineKeyName,
+                              \           readlineKey,
+                              \           readlineKeySeq,
+                              \           readlineKeyword
+                              \ skipwhite
+
+syn region  readlineComment     contained display oneline
+                                \ start='#'
+                                \ end='$'
+                                \ contains=readlineTodo,
+                                \          @Spell
+
+syn keyword readlineTodo        contained
+                              \ TODO
+                              \ FIXME
+                              \ XXX
+                              \ NOTE
+
+syn match   readlineConditional contained
+                              \ '$if\>'
+                              \ nextgroup=readlineTest,
+                              \           readlineTestApp
+                              \ skipwhite
+
+syn keyword readlineTest        contained
+                              \ mode
+                              \ nextgroup=readlineTestModeEq
+
+syn match   readlineTestModeEq  contained
+                              \ '='
+                              \ nextgroup=readlineEditingMode
+
+syn keyword readlineTest        contained
+                              \ term
+                              \ nextgroup=readlineTestTermEq
+
+syn match   readlineTestTermEq  contained
+                              \ '='
+                              \ nextgroup=readlineTestTerm
+
+syn match   readlineTestTerm    contained
+                              \ '\S\+'
+
+syn match   readlineTestApp     contained
+                              \ '\S\+'
+
+syn match   readlineConditional contained display
+                              \ '$\%(else\|endif\)\>'
+
+syn match   readlineInclude     contained display
+                              \ '$include\>'
+                              \ nextgroup=readlinePath
+
+syn match   readlinePath        contained display
+                              \ '.\+'
+
+syn case ignore
+syn match   readlineKeyName     contained display
+                              \ nextgroup=readlineKeySeparator,
+                              \           readlineKeyTerminator
+                              \ '\%(Control\|Del\|Esc\|Escape\|LFD\|Meta\|Newline\|Ret\|Return\|Rubout\|Space\|Spc\|Tab\)'
+syn case match
+
+syn match   readlineKeySeparator  contained
+                                \ '-'
+                                \ nextgroup=readlineKeyName,
+                                \           readlineKey
+
+syn match   readlineKeyTerminator contained
+                                \ ':'
+                                \ nextgroup=readlineFunction
+                                \ skipwhite
+
+syn region  readlineKeySeq     contained display oneline
+                              \ start=+"+
+                              \ skip=+\\\\\|\\"+
+                              \ end=+"+
+                              \ contains=readlineKeyEscape
+                              \ nextgroup=readlineKeyTerminator
+
+syn match   readlineKeyEscape   contained display
+                              \ +\\\([CM]-\|[e\\"'abdfnrtv]\|\o\{3}\|x\x\{2}\)+
+
+syn keyword readlineKeyword     contained
+                              \ set
+                              \ nextgroup=readlineVariable
+                              \ skipwhite
+
+syn keyword readlineVariable    contained
+                              \ nextgroup=readlineBellStyle
+                              \ skipwhite
+                              \ bell-style
+
+syn keyword readlineVariable    contained
+                              \ nextgroup=readlineBoolean
+                              \ skipwhite
+                              \ bind-tty-special-chars
+                              \ blink-matching-paren
+                              \ colored-completion-prefix
+                              \ colored-stats
+                              \ completion-ignore-case
+                              \ completion-map-case
+                              \ convert-meta
+                              \ disable-completion
+                              \ echo-control-characters
+                              \ enable-bracketed-paste
+                              \ enable-keypad
+                              \ enable-meta-key
+                              \ expand-tilde
+                              \ history-preserve-point
+                              \ horizontal-scroll-mode
+                              \ input-meta
+                              \ meta-flag
+                              \ mark-directories
+                              \ mark-modified-lines
+                              \ mark-symlinked-directories
+                              \ match-hidden-files
+                              \ menu-complete-display-prefix
+                              \ output-meta
+                              \ page-completions
+                              \ print-completions-horizontally
+                              \ revert-all-at-newline
+                              \ show-all-if-ambiguous
+                              \ show-all-if-unmodified
+                              \ show-mode-in-prompt
+                              \ skip-completed-text
+                              \ visible-stats
+
+syn keyword readlineVariable    contained
+                              \ nextgroup=readlineString
+                              \ skipwhite
+                              \ comment-begin
+                              \ isearch-terminators
+                              \ vi-cmd-mode-string
+                              \ vi-ins-mode-string
+                              \ emacs-mode-string
+
+syn keyword readlineVariable    contained
+                              \ nextgroup=readlineNumber
+                              \ skipwhite
+                              \ completion-display-width
+                              \ completion-prefix-display-length
+                              \ completion-query-items
+                              \ history-size
+                              \ keyseq-timeout
+
+syn keyword readlineVariable    contained
+                              \ nextgroup=readlineEditingMode
+                              \ skipwhite
+                              \ editing-mode
+
+syn keyword readlineVariable    contained
+                              \ nextgroup=readlineKeymap
+                              \ skipwhite
+                              \ keymap
+
+syn keyword readlineBellStyle   contained
+                              \ audible
+                              \ visible
+                              \ none
+
+syn case ignore
+syn keyword readlineBoolean     contained
+                              \ on
+                              \ off
+syn case match
+
+syn region  readlineString      contained display oneline
+                              \ matchgroup=readlineStringDelimiter
+                              \ start=+"+
+                              \ skip=+\\\\\|\\"+
+                              \ end=+"+
+
+syn match   readlineNumber      contained display
+                              \ '[+-]\d\+\>'
+
+syn keyword readlineEditingMode contained
+                              \ emacs
+                              \ vi
+
+syn match   readlineKeymap      contained display
+                              \ 'emacs\%(-\%(standard\|meta\|ctlx\)\)\=\|vi\%(-\%(move\|command\|insert\)\)\='
+
+syn keyword readlineFunction    contained
+                              \ beginning-of-line
+                              \ end-of-line
+                              \ forward-char
+                              \ backward-char
+                              \ forward-word
+                              \ backward-word
+                              \ clear-screen
+                              \ redraw-current-line
+                              \
+                              \ accept-line
+                              \ previous-history
+                              \ next-history
+                              \ beginning-of-history
+                              \ end-of-history
+                              \ reverse-search-history
+                              \ forward-search-history
+                              \ non-incremental-reverse-search-history
+                              \ non-incremental-forward-search-history
+                              \ history-search-forward
+                              \ history-search-backward
+                              \ yank-nth-arg
+                              \ yank-last-arg
+                              \
+                              \ delete-char
+                              \ backward-delete-char
+                              \ forward-backward-delete-char
+                              \ quoted-insert
+                              \ tab-insert
+                              \ self-insert
+                              \ transpose-chars
+                              \ transpose-words
+                              \ upcase-word
+                              \ downcase-word
+                              \ capitalize-word
+                              \ overwrite-mode
+                              \
+                              \ kill-line
+                              \ backward-kill-line
+                              \ unix-line-discard
+                              \ kill-whole-line
+                              \ kill-word
+                              \ backward-kill-word
+                              \ unix-word-rubout
+                              \ unix-filename-rubout
+                              \ delete-horizontal-space
+                              \ kill-region
+                              \ copy-region-as-kill
+                              \ copy-backward-word
+                              \ copy-forward-word
+                              \ yank
+                              \ yank-pop
+                              \
+                              \ digit-argument
+                              \ universal-argument
+                              \
+                              \ complete
+                              \ possible-completions
+                              \ insert-completions
+                              \ menu-complete
+                              \ menu-complete-backward
+                              \ delete-char-or-list
+                              \
+                              \ start-kbd-macro
+                              \ end-kbd-macro
+                              \ call-last-kbd-macro
+                              \ print-last-kbd-macro
+                              \
+                              \ re-read-init-file
+                              \ abort
+                              \ do-uppercase-version
+                              \ prefix-meta
+                              \ undo
+                              \ revert-line
+                              \ tilde-expand
+                              \ set-mark
+                              \ exchange-point-and-mark
+                              \ character-search
+                              \ character-search-backward
+                              \ skip-csi-sequence
+                              \ insert-comment
+                              \ dump-functions
+                              \ dump-variables
+                              \ dump-macros
+                              \ emacs-editing-mode
+                              \ vi-editing-mode
+                              \
+                              \ vi-eof-maybe
+                              \ vi-movement-mode
+                              \ vi-undo
+                              \ vi-match
+                              \ vi-tilde-expand
+                              \ vi-complete
+                              \ vi-char-search
+                              \ vi-redo
+                              \ vi-search
+                              \ vi-arg-digit
+                              \ vi-append-eol
+                              \ vi-prev-word
+                              \ vi-change-to
+                              \ vi-delete-to
+                              \ vi-end-word
+                              \ vi-char-search
+                              \ vi-fetch-history
+                              \ vi-insert-beg
+                              \ vi-search-again
+                              \ vi-put
+                              \ vi-replace
+                              \ vi-subst
+                              \ vi-char-search
+                              \ vi-next-word
+                              \ vi-yank-to
+                              \ vi-first-print
+                              \ vi-yank-arg
+                              \ vi-goto-mark
+                              \ vi-append-mode
+                              \ vi-prev-word
+                              \ vi-change-to
+                              \ vi-delete-to
+                              \ vi-end-word
+                              \ vi-char-search
+                              \ vi-insert-mode
+                              \ vi-set-mark
+                              \ vi-search-again
+                              \ vi-put
+                              \ vi-change-char
+                              \ vi-subst
+                              \ vi-char-search
+                              \ vi-undo
+                              \ vi-next-word
+                              \ vi-delete
+                              \ vi-yank-to
+                              \ vi-column
+                              \ vi-change-case
+
+if exists("readline_has_bash")
+  syn keyword readlineFunction  contained
+                              \ shell-forward-word
+                              \ shell-backward-word
+                              \ shell-expand-line
+                              \ history-expand-line
+                              \ magic-space
+                              \ alias-expand-line
+                              \ history-and-alias-expand-line
+                              \ insert-last-argument
+                              \ operate-and-get-next
+                              \ forward-backward-delete-char
+                              \ shell-kill-word
+                              \ shell-backward-kill-word
+                              \ delete-char-or-list
+                              \ complete-filename
+                              \ possible-filename-completions
+                              \ complete-username
+                              \ possible-username-completions
+                              \ complete-variable
+                              \ possible-variable-completions
+                              \ complete-hostname
+                              \ possible-hostname-completions
+                              \ complete-command
+                              \ possible-command-completions
+                              \ dynamic-complete-history
+                              \ dabbrev-expand
+                              \ complete-into-braces
+                              \ glob-expand-word
+                              \ glob-list-expansions
+                              \ display-shell-version
+                              \ glob-complete-word
+                              \ edit-and-execute-command
+endif
+
+hi def link readlineKey           readlineKeySeq
+hi def link readlineComment       Comment
+hi def link readlineTodo          Todo
+hi def link readlineConditional   Conditional
+hi def link readlineTest          Type
+hi def link readlineDelimiter     Delimiter
+hi def link readlineTestModeEq    readlineEq
+hi def link readlineTestTermEq    readlineEq
+hi def link readlineTestTerm      readlineString
+hi def link readlineTestAppEq     readlineEq
+hi def link readlineTestApp       readlineString
+hi def link readlineInclude       Include
+hi def link readlinePath          String
+hi def link readlineKeyName       SpecialChar
+hi def link readlineKeySeparator  readlineKeySeq
+hi def link readlineKeyTerminator readlineDelimiter
+hi def link readlineKeySeq        String
+hi def link readlineKeyEscape     SpecialChar
+hi def link readlineKeyword       Keyword
+hi def link readlineVariable      Identifier
+hi def link readlineBellStyle     Constant
+hi def link readlineBoolean       Boolean
+hi def link readlineString        String
+hi def link readlineStringDelimiter readlineString
+hi def link readlineNumber        Number
+hi def link readlineEditingMode   Constant
+hi def link readlineKeymap        Constant
+hi def link readlineFunction      Function
+
+let b:current_syntax = 'readline'
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/rego.vim b/syntax/rego.vim
new file mode 100644
index 000000000..6a4fdec03
--- /dev/null
+++ b/syntax/rego.vim
@@ -0,0 +1,93 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rego') == -1
+
+" Vim syntax file
+" Language: rego policy language
+" Maintainer: Matt Dunford (zenmatic@gmail.com)
+" URL:        https://github.com/zenmatic/vim-syntax-rego
+" Last Change: 2019 Dec 12
+
+" https://www.openpolicyagent.org/docs/latest/policy-language/
+
+" quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+syn case match
+
+syn keyword regoDirective package import allow deny
+syn keyword regoKeywords as default else false not null true with some
+
+syn keyword regoFuncAggregates count sum product max min sort all any
+syn match regoFuncArrays "\<array\.\(concat\|slice\)\>"
+syn keyword regoFuncSets intersection union
+
+syn keyword regoFuncStrings concat /\<contains\>/ endswith format_int indexof lower replace split sprintf startswith substring trim trim_left trim_prefix trim_right trim_suffix trim_space upper
+syn match regoFuncStrings2 "\<strings\.replace_n\>"
+syn match regoFuncStrings3 "\<contains\>"
+
+syn keyword regoFuncRegex re_match
+syn match regoFuncRegex2 "\<regex\.\(split\|globs_match\|template_match\|find_n\|find_all_string_submatch_n\)\>"
+
+syn match regoFuncGlob "\<glob\.\(match\|quote_meta\)\>"
+syn match regoFuncUnits "\<units\.parse_bytes\>"
+syn keyword regoFuncTypes is_number is_string is_boolean is_array is_set is_object is_null type_name
+syn match regoFuncEncoding1 "\<\(base64\|base64url\)\.\(encode\|decode\)\>"
+syn match regoFuncEncoding2 "\<urlquery\.\(encode\|decode\|encode_object\)\>"
+syn match regoFuncEncoding3 "\<\(json\|yaml\)\.\(marshal\|unmarshal\)\>"
+syn match regoFuncTokenSigning "\<io\.jwt\.\(encode_sign_raw\|encode_sign\)\>"
+syn match regoFuncTokenVerification "\<io\.jwt\.\(verify_rs256\|verify_ps256\|verify_es256\|verify_hs256\|decode\|decode_verify\)\>"
+syn match regoFuncTime "\<time\.\(now_ns\|parse_ns\|parse_rfc3339_ns\|parse_duration_ns\|date\|clock\|weekday\)\>"
+syn match regoFuncCryptography "\<crypto\.x509\.parse_certificates\>"
+syn keyword regoFuncGraphs walk
+syn match regoFuncHttp "\<http\.send\>"
+syn match regoFuncNet "\<net\.\(cidr_contains\|cidr_intersects\)\>"
+syn match regoFuncRego "\<rego\.parse_module\>"
+syn match regoFuncOpa "\<opa\.runtime\>"
+syn keyword regoFuncDebugging trace
+
+hi def link regoDirective Statement
+hi def link regoKeywords Statement
+hi def link regoFuncAggregates Statement
+hi def link regoFuncArrays Statement
+hi def link regoFuncSets Statement
+hi def link regoFuncStrings Statement
+hi def link regoFuncStrings2 Statement
+hi def link regoFuncStrings3 Statement
+hi def link regoFuncRegex Statement
+hi def link regoFuncRegex2 Statement
+hi def link regoFuncGlob Statement
+hi def link regoFuncUnits Statement
+hi def link regoFuncTypes Statement
+hi def link regoFuncEncoding1 Statement
+hi def link regoFuncEncoding2 Statement
+hi def link regoFuncEncoding3 Statement
+hi def link regoFuncTokenSigning Statement
+hi def link regoFuncTokenVerification Statement
+hi def link regoFuncTime Statement
+hi def link regoFuncCryptography Statement
+hi def link regoFuncGraphs Statement
+hi def link regoFuncHttp Statement
+hi def link regoFuncNet Statement
+hi def link regoFuncRego Statement
+hi def link regoFuncOpa Statement
+hi def link regoFuncDebugging Statement
+
+" https://www.openpolicyagent.org/docs/latest/policy-language/#strings
+syn region      regoString            start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn region      regoRawString         start=+`+ end=+`+
+
+hi def link     regoString            String
+hi def link     regoRawString         String
+
+" Comments; their contents
+syn keyword     regoTodo              contained TODO FIXME XXX BUG
+syn cluster     regoCommentGroup      contains=regoTodo
+syn region      regoComment           start="#" end="$" contains=@regoCommentGroup,@Spell
+
+hi def link     regoComment           Comment
+hi def link     regoTodo              Todo
+
+let b:current_syntax = 'rego'
+
+endif
diff --git a/syntax/remind.vim b/syntax/remind.vim
new file mode 100644
index 000000000..a63b978fc
--- /dev/null
+++ b/syntax/remind.vim
@@ -0,0 +1,77 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'remind') == -1
+
+" Vim syntax file
+" Language:	Remind
+" Maintainer:	Davide Alberani <da@erlug.linux.it>
+" Last Change:	02 Nov 2015
+" Version:	0.7
+" URL:		http://ismito.it/vim/syntax/remind.vim
+"
+" Remind is a sophisticated calendar and alarm program.
+" You can download remind from:
+"   https://www.roaringpenguin.com/products/remind
+"
+" Changelog
+" version 0.7: updated email and link
+" version 0.6: added THROUGH keyword (courtesy of Ben Orchard)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" shut case off.
+syn case ignore
+
+syn keyword remindCommands	REM OMIT SET FSET UNSET
+syn keyword remindExpiry	UNTIL FROM SCANFROM SCAN WARN SCHED THROUGH
+syn keyword remindTag		PRIORITY TAG
+syn keyword remindTimed		AT DURATION
+syn keyword remindMove		ONCE SKIP BEFORE AFTER
+syn keyword remindSpecial	INCLUDE INC BANNER PUSH-OMIT-CONTEXT PUSH CLEAR-OMIT-CONTEXT CLEAR POP-OMIT-CONTEXT POP COLOR
+syn keyword remindRun		MSG MSF RUN CAL SATISFY SPECIAL PS PSFILE SHADE MOON
+syn keyword remindConditional	IF ELSE ENDIF IFTRIG
+syn keyword remindDebug		DEBUG DUMPVARS DUMP ERRMSG FLUSH PRESERVE
+syn match remindComment		"#.*$"
+syn region remindString		start=+'+ end=+'+ skip=+\\\\\|\\'+ oneline
+syn region remindString		start=+"+ end=+"+ skip=+\\\\\|\\"+ oneline
+syn match remindVar		"\$[_a-zA-Z][_a-zA-Z0-9]*"
+syn match remindSubst		"%[^ ]"
+syn match remindAdvanceNumber	"\(\*\|+\|-\|++\|--\)[0-9]\+"
+" XXX: use different separators for dates and times?
+syn match remindDateSeparators	"[/:@\.-]" contained
+syn match remindTimes		"[0-9]\{1,2}[:\.][0-9]\{1,2}" contains=remindDateSeparators
+" XXX: why not match only valid dates?  Ok, checking for 'Feb the 30' would
+"       be impossible, but at least check for valid months and times.
+syn match remindDates		"'[0-9]\{4}[/-][0-9]\{1,2}[/-][0-9]\{1,2}\(@[0-9]\{1,2}[:\.][0-9]\{1,2}\)\?'" contains=remindDateSeparators
+" This will match trailing whitespaces that seem to break rem2ps.
+" Courtesy of Michael Dunn.
+syn match remindWarning		display excludenl "\S\s\+$"ms=s+1
+
+
+
+hi def link remindCommands		Function
+hi def link remindExpiry		Repeat
+hi def link remindTag		Label
+hi def link remindTimed		Statement
+hi def link remindMove		Statement
+hi def link remindSpecial		Include
+hi def link remindRun		Function
+hi def link remindConditional	Conditional
+hi def link remindComment		Comment
+hi def link remindTimes		String
+hi def link remindString		String
+hi def link remindDebug		Debug
+hi def link remindVar		Identifier
+hi def link remindSubst		Constant
+hi def link remindAdvanceNumber	Number
+hi def link remindDateSeparators	Comment
+hi def link remindDates		String
+hi def link remindWarning		Error
+
+
+let b:current_syntax = "remind"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/resolv.vim b/syntax/resolv.vim
new file mode 100644
index 000000000..a847a7d78
--- /dev/null
+++ b/syntax/resolv.vim
@@ -0,0 +1,123 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'resolv') == -1
+
+" Vim syntax file
+" Language: resolver configuration file
+" Maintainer: Radu Dineiu <radu.dineiu@gmail.com>
+" URL: https://raw.github.com/rid9/vim-resolv/master/resolv.vim
+" Last Change: 2020 Mar 10
+" Version: 1.4
+"
+" Credits:
+"   David Necas (Yeti) <yeti@physics.muni.cz>
+"   Stefano Zacchiroli <zack@debian.org>
+"   DJ Lucas <dj@linuxfromscratch.org>
+"
+" Changelog:
+"   - 1.4: Added IPv6 support for sortlist.
+"   - 1.3: Added IPv6 support for IPv4 dot-decimal notation.
+"   - 1.2: Added new options.
+"   - 1.1: Added IPv6 support.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+" Errors, comments and operators
+syn match resolvError /./
+syn match resolvComment /\s*[#;].*$/
+syn match resolvOperator /[\/:]/ contained
+
+" IP
+syn cluster resolvIPCluster contains=resolvIPError,resolvIPSpecial
+syn match resolvIPError /\%(\d\{4,}\|25[6-9]\|2[6-9]\d\|[3-9]\d\{2}\)[\.0-9]*/ contained
+syn match resolvIPSpecial /\%(127\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\)/ contained
+
+" General
+syn match resolvIP contained /\%(\d\{1,4}\.\)\{3}\d\{1,4}/ contains=@resolvIPCluster
+syn match resolvIPNetmask contained /\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\%(\%(\d\{1,4}\.\)\{,3}\d\{1,4}\)\)\?/ contains=resolvOperator,@resolvIPCluster
+syn match resolvHostname contained /\w\{-}\.[-0-9A-Za-z_\.]*/
+
+" Nameserver IPv4
+syn match resolvIPNameserver contained /\%(\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\s\|$\)\)\+/ contains=@resolvIPCluster
+
+" Nameserver IPv6
+syn match resolvIPNameserver contained /\<\%(\x\{1,4}:\)\{6}\%(\x\{1,4}:\x\{1,4}\)\>/
+syn match resolvIPNameserver contained /\s\@<=::\%(\x\{1,4}:\)\{,6}\x\{1,4}\>/
+syn match resolvIPNameserver contained /\s\@<=::\%(\x\{1,4}:\)\{,5}\%(\d\{1,4}\.\)\{3}\d\{1,4}\>/
+syn match resolvIPNameserver contained /\<\%(\x\{1,4}:\)\{1}:\%(\x\{1,4}:\)\{,5}\x\{1,4}\>/
+syn match resolvIPNameserver contained /\<\%(\x\{1,4}:\)\{1}:\%(\x\{1,4}:\)\{,4}\%(\d\{1,4}\.\)\{3}\d\{1,4}\>/
+syn match resolvIPNameserver contained /\<\%(\x\{1,4}:\)\{2}:\%(\x\{1,4}:\)\{,4}\x\{1,4}\>/
+syn match resolvIPNameserver contained /\<\%(\x\{1,4}:\)\{2}:\%(\x\{1,4}:\)\{,3}\%(\d\{1,4}\.\)\{3}\d\{1,4}\>/
+syn match resolvIPNameserver contained /\<\%(\x\{1,4}:\)\{3}:\%(\x\{1,4}:\)\{,3}\x\{1,4}\>/
+syn match resolvIPNameserver contained /\<\%(\x\{1,4}:\)\{3}:\%(\x\{1,4}:\)\{,2}\%(\d\{1,4}\.\)\{3}\d\{1,4}\>/
+syn match resolvIPNameserver contained /\<\%(\x\{1,4}:\)\{4}:\%(\x\{1,4}:\)\{,2}\x\{1,4}\>/
+syn match resolvIPNameserver contained /\<\%(\x\{1,4}:\)\{4}:\%(\x\{1,4}:\)\{,1}\%(\d\{1,4}\.\)\{3}\d\{1,4}\>/
+syn match resolvIPNameserver contained /\<\%(\x\{1,4}:\)\{5}:\%(\d\{1,4}\.\)\{3}\d\{1,4}\>/
+syn match resolvIPNameserver contained /\<\%(\x\{1,4}:\)\{6}:\x\{1,4}\>/
+syn match resolvIPNameserver contained /\<\%(\x\{1,4}:\)\{1,7}:\%(\s\|;\|$\)\@=/
+
+" Search hostname
+syn match resolvHostnameSearch contained /\%(\%([-0-9A-Za-z_]\+\.\)*[-0-9A-Za-z_]\+\.\?\%(\s\|$\)\)\+/
+
+" Sortlist IPv4
+syn match resolvIPNetmaskSortList contained /\%(\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\%(\%(\d\{1,4}\.\)\{,3}\d\{1,4}\)\)\?\%(\s\|$\)\)\+/ contains=resolvOperator,@resolvIPCluster
+
+" Sortlist IPv6
+syn match resolvIPNetmaskSortList contained /\<\%(\x\{1,4}:\)\{6}\%(\x\{1,4}:\x\{1,4}\)\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\s\@<=::\%(\x\{1,4}:\)\{,6}\x\{1,4}\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\s\@<=::\%(\x\{1,4}:\)\{,5}\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\<\%(\x\{1,4}:\)\{1}:\%(\x\{1,4}:\)\{,5}\x\{1,4}\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\<\%(\x\{1,4}:\)\{1}:\%(\x\{1,4}:\)\{,4}\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\<\%(\x\{1,4}:\)\{2}:\%(\x\{1,4}:\)\{,4}\x\{1,4}\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\<\%(\x\{1,4}:\)\{2}:\%(\x\{1,4}:\)\{,3}\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\<\%(\x\{1,4}:\)\{3}:\%(\x\{1,4}:\)\{,3}\x\{1,4}\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\<\%(\x\{1,4}:\)\{3}:\%(\x\{1,4}:\)\{,2}\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\<\%(\x\{1,4}:\)\{4}:\%(\x\{1,4}:\)\{,2}\x\{1,4}\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\<\%(\x\{1,4}:\)\{4}:\%(\x\{1,4}:\)\{,1}\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\<\%(\x\{1,4}:\)\{5}:\%(\d\{1,4}\.\)\{3}\d\{1,4}\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\<\%(\x\{1,4}:\)\{6}:\x\{1,4}\%(\/\d\{1,3}\)\?\>/
+syn match resolvIPNetmaskSortList contained /\<\%(\x\{1,4}:\)\{1,7}:\%(\s\|;\|$\)\@=\%(\/\d\{1,3}\)\?/
+
+" Identifiers
+syn match resolvNameserver /^\s*nameserver\>/ nextgroup=resolvIPNameserver skipwhite
+syn match resolvLwserver /^\s*lwserver\>/ nextgroup=resolvIPNameserver skipwhite
+syn match resolvDomain /^\s*domain\>/ nextgroup=resolvHostname skipwhite
+syn match resolvSearch /^\s*search\>/ nextgroup=resolvHostnameSearch skipwhite
+syn match resolvSortList /^\s*sortlist\>/ nextgroup=resolvIPNetmaskSortList skipwhite
+syn match resolvOptions /^\s*options\>/ nextgroup=resolvOption skipwhite
+
+" Options
+syn match resolvOption /\<\%(debug\|no_tld_query\|no-tld-query\|rotate\|no-check-names\|inet6\|ip6-bytestring\|\%(no-\)\?ip6-dotint\|edns0\|single-request\%(-reopen\)\?\|use-vc\)\>/ contained nextgroup=resolvOption skipwhite
+syn match resolvOption /\<\%(ndots\|timeout\|attempts\):\d\+\>/ contained contains=resolvOperator nextgroup=resolvOption skipwhite
+
+" Additional errors
+syn match resolvError /^search .\{257,}/
+
+hi def link resolvIP Number
+hi def link resolvIPNetmask Number
+hi def link resolvHostname String
+hi def link resolvOption String
+
+hi def link resolvIPNameserver Number
+hi def link resolvHostnameSearch String
+hi def link resolvIPNetmaskSortList Number
+
+hi def link resolvNameServer Identifier
+hi def link resolvLwserver Identifier
+hi def link resolvDomain Identifier
+hi def link resolvSearch Identifier
+hi def link resolvSortList Identifier
+hi def link resolvOptions Identifier
+
+hi def link resolvComment Comment
+hi def link resolvOperator Operator
+hi def link resolvError Error
+hi def link resolvIPError Error
+hi def link resolvIPSpecial Special
+
+let b:current_syntax = "resolv"
+
+" vim: ts=8 ft=vim
+
+endif
diff --git a/syntax/reva.vim b/syntax/reva.vim
new file mode 100644
index 000000000..e8ff0c730
--- /dev/null
+++ b/syntax/reva.vim
@@ -0,0 +1,195 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reva') == -1
+
+" Vim syntax file
+" Language:	Reva Forth
+" Version:	2011.2
+" Last Change:	2019 Sep 27
+" Maintainer:	Ron Aaron <ron@ronware.org>
+" URL:		http://ronware.org/reva/
+" Filetypes:	*.rf *.frt
+" NOTE: 	You should also have the ftplugin/reva.vim file to set 'isk'
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+   finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn clear
+
+" Synchronization method
+syn sync ccomment
+syn sync maxlines=100
+
+
+syn case ignore
+" Some special, non-FORTH keywords
+"syn keyword revaTodo contained todo fixme bugbug todo: bugbug: note:
+syn match revaTodo contained '\(todo\|fixme\|bugbug\|note\)[:]*'
+syn match revaTodo contained 'copyright\(\s(c)\)\=\(\s[0-9]\{2,4}\)\='
+
+syn match revaHelpDesc '\S.*' contained
+syn match revaHelpStuff '\<\(def\|stack\|ctx\|ver\|os\|related\):\s.*'
+syn region revaHelpStuff start='\<desc:\>' end='^\S' contains=revaHelpDesc
+syn region revaEOF start='\<|||\>' end='{$}' contains=revaHelpStuff
+
+
+syn case match
+" basic mathematical and logical operators
+syn keyword revaoperators + - * / mod /mod negate abs min max umin umax
+syn keyword revaoperators and or xor not invert 1+ 1-
+syn keyword revaoperators m+ */ */mod m* um* m*/ um/mod fm/mod sm/rem
+syn keyword revaoperators d+ d- dnegate dabs dmin dmax > < = >> << u< <>
+
+
+" stack manipulations
+syn keyword revastack drop nip dup over tuck swap rot -rot ?dup pick roll
+syn keyword revastack 2drop 2nip 2dup 2over 2swap 2rot 3drop
+syn keyword revastack >r r> r@ rdrop
+" syn keyword revastack sp@ sp! rp@ rp!
+
+" address operations
+syn keyword revamemory @ ! +! c@ c! 2@ 2! align aligned allot allocate here free resize
+syn keyword revaadrarith chars char+ cells cell+ cell cell- 2cell+ 2cell- 3cell+ 4cell+
+syn keyword revamemblks move fill
+
+" conditionals
+syn keyword revacond if else then =if >if <if <>if if0  ;; catch throw
+
+" iterations
+syn keyword revaloop while repeat until again
+syn keyword revaloop do loop i j leave  unloop skip more
+
+" new words
+syn match revaColonDef '\<noname:\|\<:\s+' contains=revaComment
+syn keyword revaEndOfColonDef ; ;inline
+syn keyword revadefine constant constant, variable create variable,
+syn keyword revadefine user value to +to defer! defer@ defer is does> immediate
+syn keyword revadefine compile literal ' [']
+
+" Built in words
+com! -nargs=+ Builtin syn keyword revaBuiltin <args>
+Builtin execute ahead interp bye >body here pad words make
+Builtin accept close cr creat delete ekey emit fsize ioerr key?
+Builtin mtime open/r open/rw read rename seek space spaces stat
+Builtin tell type type_ write (seek) (argv) (save) 0; 0drop;
+Builtin >class >lz >name >xt alias alias: appname argc asciiz, asciizl,
+Builtin body> clamp depth disassemble findprev fnvhash getenv here,
+Builtin iterate last! last@ later link lz> lzmax os parse/ peek
+Builtin peek-n pop prior push put rp@ rpick save setenv slurp
+Builtin stack-empty? stack-iterate stack-size stack: THROW_BADFUNC
+Builtin THROW_BADLIB THROW_GENERIC used xt>size z,
+Builtin +lplace +place -chop /char /string bounds c+lplace c+place
+Builtin chop cmp cmpi count lc lcount lplace place quote rsplit search split
+Builtin zcount zt \\char
+Builtin chdir g32 k32 u32 getcwd getpid hinst osname stdin stdout
+Builtin (-lib) (bye) (call) (else) (find) (func) (here) (if (lib) (s0) (s^)
+Builtin (to~) (while) >in >rel ?literal appstart cold compiling? context? d0 default_class
+Builtin defer? dict dolstr dostr find-word h0 if) interp isa onexit
+Builtin onstartup pdoes pop>ebx prompt rel> rp0 s0 src srcstr state str0 then,> then> tib
+Builtin tp vector vector! word? xt? .ver revaver revaver# && '' 'constant 'context
+Builtin 'create 'defer 'does 'forth 'inline 'macro 'macront 'notail 'value 'variable
+Builtin (.r) (context) (create) (header) (hide) (inline) (p.r) (words~) (xfind)
+Builtin ++ -- , -2drop -2nip -link -swap . .2x .classes .contexts .funcs .libs .needs .r
+Builtin .rs .x 00; 0do 0if 1, 2, 3, 2* 2/ 2constant 2variable 3dup 4dup ;then >base >defer
+Builtin >rr ? ?do @execute @rem appdir argv as back base base! between chain cleanup-libs
+Builtin cmove> context?? ctrl-c ctx>name data: defer: defer@def dictgone do_cr eleave
+Builtin endcase endof eval exception exec false find func: header heapgone help help/
+Builtin hex# hide inline{ last lastxt lib libdir literal, makeexename mnotail ms ms@
+Builtin newclass noop nosavedict notail nul of off on p: padchar parse parseln
+Builtin parsews rangeof rdepth remains reset reva revaused rol8 rr> scratch setclass sp
+Builtin strof super> temp time&date true turnkey? undo vfunc: w! w@
+Builtin xchg xchg2 xfind xt>name xwords { {{ }} }  _+ _1+ _1- pathsep case \||
+" p[ [''] [ [']
+
+
+" debugging
+syn keyword revadebug .s dump see
+
+" basic character operations
+" syn keyword revaCharOps (.) CHAR EXPECT FIND WORD TYPE -TRAILING EMIT KEY
+" syn keyword revaCharOps KEY? TIB CR
+" syn match revaCharOps '\<char\s\S\s'
+" syn match revaCharOps '\<\[char\]\s\S\s'
+" syn region revaCharOps start=+."\s+ skip=+\\"+ end=+"+
+
+" char-number conversion
+syn keyword revaconversion s>d >digit digit> >single >double >number >float
+
+" contexts
+syn keyword revavocs forth macro inline
+syn keyword revavocs context:
+syn match revavocs /\<\~[^~ ]*/
+syn match revavocs /[^~ ]*\~\>/
+
+" numbers
+syn keyword revamath decimal hex base binary octal
+syn match revainteger '\<-\=[0-9.]*[0-9.]\+\>'
+" recognize hex and binary numbers, the '$' and '%' notation is for greva
+syn match revainteger '\<\$\x*\x\+\>' " *1* --- dont't mess
+syn match revainteger '\<\x*\d\x*\>'  " *2* --- this order!
+syn match revainteger '\<%[0-1]*[0-1]\+\>'
+syn match revainteger "\<'.\>"
+
+" Strings
+" syn region revaString start=+\.\?\"+ end=+"+ end=+$+
+syn region revaString start=/"/ skip=/\\"/ end=/"/
+
+" Comments
+syn region revaComment start='\\S\s' end='.*' contains=revaTodo
+syn match revaComment '\.(\s[^)]\{-})' contains=revaTodo
+syn region revaComment start='(\s' skip='\\)' end=')' contains=revaTodo
+syn match revaComment '(\s[^\-]*\-\-[^\-]\{-})' contains=revaTodo
+syn match revaComment '\<|\s.*$' contains=revaTodo
+syn match revaColonDef '\<:m\?\s*[^ \t]\+\>' contains=revaComment
+
+" Include files
+syn match revaInclude '\<\(include\|needs\)\s\+\S\+'
+
+
+" Define the default highlighting.
+if !exists("did_reva_syntax_inits")
+    let did_reva_syntax_inits=1
+    " The default methods for highlighting. Can be overridden later.
+    hi def link revaEOF cIf0
+    hi def link revaHelpStuff  special
+    hi def link revaHelpDesc Comment
+    hi def link revaTodo Todo
+    hi def link revaOperators Operator
+    hi def link revaMath Number
+    hi def link revaInteger Number
+    hi def link revaStack Special
+    hi def link revaFStack Special
+    hi def link revaSP Special
+    hi def link revaMemory Operator
+    hi def link revaAdrArith Function
+    hi def link revaMemBlks Function
+    hi def link revaCond Conditional
+    hi def link revaLoop Repeat
+    hi def link revaColonDef Define
+    hi def link revaEndOfColonDef Define
+    hi def link revaDefine Define
+    hi def link revaDebug Debug
+    hi def link revaCharOps Character
+    hi def link revaConversion String
+    hi def link revaForth Statement
+    hi def link revaVocs Statement
+    hi def link revaString String
+    hi def link revaComment Comment
+    hi def link revaClassDef Define
+    hi def link revaEndOfClassDef Define
+    hi def link revaObjectDef Define
+    hi def link revaEndOfObjectDef Define
+    hi def link revaInclude Include
+    hi def link revaBuiltin Keyword
+endif
+
+let b:current_syntax = "reva"
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8:sw=4:nocindent:smartindent:
+
+endif
diff --git a/syntax/rexx.vim b/syntax/rexx.vim
new file mode 100644
index 000000000..642e4305d
--- /dev/null
+++ b/syntax/rexx.vim
@@ -0,0 +1,322 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rexx') == -1
+
+" Vim syntax file
+" Language:	Rexx
+" Maintainer:	Thomas Geulig <geulig@nentec.de>
+" Last Change:  2012 Sep 14, added support for new ooRexx 4.0 features
+" URL:		http://www.geulig.de/vim/rexx.vim
+" Special Thanks to Dan Sharp <dwsharp@hotmail.com> and Rony G. Flatscher
+" <Rony.Flatscher@wu-wien.ac.at> for comments and additions
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+" add to valid identifier chars
+setlocal iskeyword+=.
+setlocal iskeyword+=!
+setlocal iskeyword+=?
+
+" ---rgf, position important: must be before comments etc. !
+syn match rexxOperator "[=|\/\\\+\*\[\],;:<>&\~%\-]"
+
+" rgf syn match rexxIdentifier        "\<[a-zA-Z\!\?_]\([a-zA-Z0-9._?!]\)*\>"
+syn match rexxIdentifier        "\<\K\k*\>"
+syn match rexxEnvironmentSymbol "\<\.\k\+\>"
+
+" A Keyword is the first symbol in a clause.  A clause begins at the start
+" of a line or after a semicolon.  THEN, ELSE, OTHERWISE, and colons are always
+" followed by an implied semicolon.
+syn match rexxClause "\(^\|;\|:\|then \|else \|when \|otherwise \)\s*\S*" contains=ALLBUT,rexxParse2,rexxRaise2,rexxForward2
+
+" Considered keywords when used together in a phrase and begin a clause
+syn match rexxParse "\<parse\s*\(\(upper\|lower\|caseless\)\s*\)\?\(arg\|linein\|pull\|source\|var\|\<value\>\|version\)\>" containedin=rexxClause contains=rexxParse2
+syn match rexxParse2 "\<with\>" containedin=rexxParse
+
+syn match rexxKeyword contained "\<numeric \(digits\|form \(scientific\|engineering\|value\)\|fuzz\)\>"
+syn match rexxKeyword contained "\<\(address\|trace\)\( value\)\?\>"
+syn match rexxKeyword contained "\<procedure\(\s*expose\)\?\>"
+
+syn match rexxKeyword contained "\<\(do\|loop\)\>\(\s\+label\s\+\k*\)\?\(\s\+forever\)\?\>"
+syn match rexxKeyword contained "\<use\>\s*\(strict\s*\)\?\<arg\>"
+
+" Another keyword phrase, separated to aid highlighting in rexxFunction
+syn match rexxRegularCallSignal contained "\<\(call\|signal\)\s\(\s*on\>\|\s*off\>\)\@!\(\k\+\ze\|\ze(\)\(\s*\|;\|$\|(\)"
+syn region rexxLabel contained start="\<\(call\|signal\)\>\s*\zs\(\k*\|(\)" end="\ze\(\s*\|;\|$\|(\)" containedin=rexxRegularCallSignal
+
+syn match rexxExceptionHandling contained "\<\(call\|signal\)\>\s\+\<\(on\|off\)\>.*\(;\|$\)" contains=rexxComment
+
+" hilite label given after keyword "name"
+syn match rexxLabel "name\s\+\zs\k\+\ze" containedin=rexxExceptionHandling
+" hilite condition name (serves as label)
+syn match rexxLabel "\<\(call\|signal\)\>\s\+\<\(on\|off\)\>\s*\zs\k\+\ze\s*\(;\|$\)" containedin=rexxExceptionHandling
+" user exception handling, hilite user defined name
+syn region rexxLabel contained start="user\s\+\zs\k" end="\ze\(\s\|;\|$\)" containedin=rexxExceptionHandling
+
+" Considered keywords when they begin a clause
+syn match rexxKeywordStatements "\<\(arg\|catch\|do\|drop\|end\|exit\|expose\|finally\|forward\|if\|interpret\|iterate\|leave\|loop\|nop\)\>"
+syn match rexxKeywordStatements "\<\(options\|pull\|push\|queue\|raise\|reply\|return\|say\|select\|trace\)\>"
+
+" Conditional keywords starting a new statement
+syn match rexxConditional "\<\(then\|else\|when\|otherwise\)\(\s*\|;\|\_$\|\)\>" contains=rexxKeywordStatements
+
+" Conditional phrases
+syn match rexxLoopKeywords "\<\(to\|by\|for\|until\|while\|over\)\>" containedin=doLoopSelectLabelRegion
+
+" must be after Conditional phrases!
+syn match doLoopSelectLabelRegion "\<\(do\|loop\|select\)\>\s\+\(label\s\+\)\?\(\s\+\k\+\s\+\zs\<over\>\)\?\k*\(\s\+forever\)\?\(\s\|;\|$\)" contains=doLoopSelectLabelRegion,rexxStartValueAssignment,rexxLoopKeywords
+
+" color label's name
+syn match rexxLabel2 "\<\(do\|loop\|select\)\>\s\+label\s\+\zs\k*\ze" containedin=doLoopSelectLabelRegion
+
+" make sure control variable is normal
+" TODO: re-activate ?
+"rgf syn match rexxControlVariable        "\<\(do\|loop\)\>\(\s\+label\s\+\k*\)\?\s\+\zs.*\ze\s\+\<over\>" containedin=doLoopSelectLabelRegion
+
+" make sure control variable assignment is normal
+syn match rexxStartValueAssignment       "\<\(do\|loop\)\>\(\s\+label\s\+\k*\)\?\s\+\zs.*\ze\(=.*\)\?\s\+\<to\>" containedin=doLoopSelectLabelRegion
+
+" highlight label name
+syn match endIterateLeaveLabelRegion "\<\(end\|leave\|iterate\)\>\(\s\+\K\k*\)" contains=rexxLabel2
+syn match rexxLabel2 "\<\(end\|leave\|iterate\)\>\s\+\zs\k*\ze" containedin=endIterateLeaveLabelRegion
+
+" Guard statement
+syn match rexxGuard "\(^\|;\|:\)\s*\<guard\>\s\+\<\(on\|off\)\>"
+
+" Trace statement
+syn match rexxTrace "\(^\|;\|:\)\s*\<trace\>\s\+\<\K\k*\>"
+
+" Raise statement
+" syn match rexxRaise "\(^\|;\|:\)\s\+\<raise\>\s*\<\(propagate\|error\|failure\|syntax\|user\)\>\?" contains=rexxRaise2
+syn match rexxRaise "\(^\|;\|:\)\s*\<raise\>\s*\<\(propagate\|error\|failure\|syntax\|user\)\>\?" contains=rexxRaise2
+syn match rexxRaise2 "\<\(additional\|array\|description\|exit\|propagate\|return\)\>" containedin=rexxRaise
+
+" Forward statement
+syn match rexxForward  "\(^\|;\|:\)\<forward\>\s*" contains=rexxForward2
+syn match rexxForward2 "\<\(arguments\|array\|continue\|message\|class\|to\)\>" contained
+
+" Functions/Procedures
+syn match rexxFunction 	"\<\<[a-zA-Z\!\?_]\k*\>("me=e-1
+syn match rexxFunction "[()]"
+
+" String constants
+syn region rexxString	start=+"+ skip=+""+ end=+"\(x\|b\)\?+ oneline
+syn region rexxString	start=+'+ skip=+''+ end=+'\(x\|b\)\?+ oneline
+
+syn region rexxParen transparent start='(' end=')' contains=ALLBUT,rexxParenError,rexxTodo,rexxLabel,rexxKeyword
+" Catch errors caused by wrong parenthesis
+syn match rexxParenError	 ")"
+syn match rexxInParen		"[\\[\\]{}]"
+
+" Comments
+syn region	rexxComment	start="/\*"	end="\*/" contains=rexxTodo,rexxComment
+syn match	rexxCommentError "\*/"
+syn region	rexxLineComment	start="--"	end="\_$" oneline
+
+" Highlight User Labels
+" check for labels between comments, labels stated in a statement in the middle of a line
+syn match rexxLabel		 "\(\_^\|;\)\s*\(\/\*.*\*\/\)*\s*\k\+\s*\(\/\*.*\*\/\)*\s*:"me=e-1 contains=rexxTodo,rexxComment
+
+syn keyword rexxTodo contained	TODO FIXME XXX
+
+" ooRexx messages
+syn region rexxMessageOperator start="\(\~\|\~\~\)" end="\(\S\|\s\)"me=e-1
+syn match rexxMessage "\(\~\|\~\~\)\s*\<\.*[a-zA-Z]\([a-zA-Z0-9._?!]\)*\>" contains=rexxMessageOperator
+
+" line continuations, take care of (line-)comments after it
+syn match rexxLineContinue ",\ze\s*\(--.*\|\/\*.*\)*$"
+
+" the following is necessary, otherwise three consecutive dashes will cause it to highlight the first one
+syn match rexxLineContinue "-\ze-\@!\s*\(--.*\|\s*\/\*.*\)\?$"
+
+" Special Variables
+syn keyword rexxSpecialVariable  sigl rc result self super
+syn keyword rexxSpecialVariable  .environment .error .input .local .methods .output .rs .stderr .stdin .stdout .stdque
+
+" Constants
+syn keyword rexxConst .true .false .nil .endOfLine .line .context
+
+" Rexx numbers
+" int like number
+syn match rexxNumber '\d\+' contained
+syn match rexxNumber '[-+]\s*\d\+' contained
+
+" Floating point number with decimal
+syn match rexxNumber '\d\+\.\d*' contained
+syn match rexxNumber '[-+]\s*\d\+\.\d*' contained
+
+" Floating point like number with E
+syn match rexxNumber '[-+]\s*\d*[eE][\-+]\d\+' contained
+syn match rexxNumber '\d*[eE][\-+]\d\+' contained
+
+" Floating point like number with E and decimal point (+,-)
+syn match rexxNumber '[-+]\s*\d*\.\d*[eE][\-+]\d\+' contained
+syn match rexxNumber '\d*\.\d*[eE][\-+]\d\+' contained
+
+
+" ooRexx builtin classes (as of version 3.2.0, fall 2007), first define dot to be o.k. in keywords
+syn keyword rexxBuiltinClass .Alarm .ArgUtil .Array .Bag .CaselessColumnComparator
+syn keyword rexxBuiltinClass .CaselessComparator .CaselessDescendingComparator .CircularQueue
+syn keyword rexxBuiltinClass .Class .Collection .ColumnComparator .Comparable .Comparator
+syn keyword rexxBuiltinClass .DateTime .DescendingComparator .Directory .File .InputOutputStream
+syn keyword rexxBuiltinClass .InputStream .InvertingComparator .List .MapCollection
+syn keyword rexxBuiltinClass .Message .Method .Monitor .MutableBuffer .Object
+syn keyword rexxBuiltinClass .OrderedCollection .OutputStream .Package .Properties .Queue
+syn keyword rexxBuiltinClass .RegularExpression .Relation .RexxContext .RexxQueue .Routine
+syn keyword rexxBuiltinClass .Set .SetCollection .Stem .Stream
+syn keyword rexxBuiltinClass .StreamSupplier .String .Supplier .Table .TimeSpan
+
+" Windows-only classes
+syn keyword rexxBuiltinClass .AdvancedControls .AnimatedButton .BaseDialog .ButtonControl
+syn keyword rexxBuiltinClass .CategoryDialog .CheckBox .CheckList .ComboBox .DialogControl
+syn keyword rexxBuiltinClass .DialogExtensions .DlgArea .DlgAreaU .DynamicDialog
+syn keyword rexxBuiltinClass .EditControl .InputBox .IntegerBox .ListBox .ListChoice
+syn keyword rexxBuiltinClass .ListControl .MenuObject .MessageExtensions .MultiInputBox
+syn keyword rexxBuiltinClass .MultiListChoice .OLEObject .OLEVariant
+syn keyword rexxBuiltinClass .PasswordBox .PlainBaseDialog .PlainUserDialog
+syn keyword rexxBuiltinClass .ProgressBar .ProgressIndicator .PropertySheet .RadioButton
+syn keyword rexxBuiltinClass .RcDialog .ResDialog .ScrollBar .SingleSelection .SliderControl
+syn keyword rexxBuiltinClass .StateIndicator .StaticControl .TabControl .TimedMessage
+syn keyword rexxBuiltinClass .TreeControl .UserDialog .VirtualKeyCodes .WindowBase
+syn keyword rexxBuiltinClass .WindowExtensions .WindowObject .WindowsClassesBase .WindowsClipboard
+syn keyword rexxBuiltinClass .WindowsEventLog .WindowsManager .WindowsProgramManager .WindowsRegistry
+
+" BSF4ooRexx classes
+syn keyword rexxBuiltinClass .BSF .bsf.dialog .bsf_proxy
+syn keyword rexxBuiltinClass .UNO .UNO_ENUM .UNO_CONSTANTS .UNO_PROPERTIES
+
+" ooRexx directives, ---rgf location important, otherwise directives in top of file not matched!
+syn region rexxClassDirective     start="::\s*class\s*"ms=e+1    end="\ze\(\s\|;\|$\)"
+syn region rexxMethodDirective    start="::\s*method\s*"ms=e+1   end="\ze\(\s\|;\|$\)"
+syn region rexxRequiresDirective  start="::\s*requires\s*"ms=e+1 end="\ze\(\s\|;\|$\)"
+syn region rexxRoutineDirective   start="::\s*routine\s*"ms=e+1  end="\ze\(\s\|;\|$\)"
+syn region rexxAttributeDirective start="::\s*attribute\s*"ms=e+1  end="\ze\(\s\|;\|$\)"
+" rgf, 2012-09-09
+syn region rexxOptionsDirective   start="::\s*options\s*"ms=e+1  end="\ze\(\s\|;\|$\)"
+syn region rexxConstantDirective  start="::\s*constant\s*"ms=e+1  end="\ze\(\s\|;\|$\)"
+
+syn region rexxDirective start="\(^\|;\)\s*::\s*\w\+"  end="\($\|;\)" contains=rexxString,rexxNumber,rexxComment,rexxLineComment,rexxClassDirective,rexxMethodDirective,rexxRoutineDirective,rexxRequiresDirective,rexxAttributeDirective,rexxOptionsDirective,rexxConstantDirective keepend
+
+syn match rexxOptionsDirective2 "\<\(digits\|form\|fuzz\|trace\)\>" containedin = rexxOptionsDirective3
+syn region rexxOptionsDirective3 start="\(^\|;\)\s*::\s*options\s"ms=e+1  end="\($\|;\)" contains=rexxString,rexxNumber,rexxVariable,rexxComment,rexxLineComment containedin = rexxDirective
+
+
+syn region rexxVariable start="\zs\<\(\.\)\@!\K\k\+\>\ze\s*\(=\|,\|)\|%\|\]\|\\\||\|&\|+=\|-=\|<\|>\)" end="\(\_$\|.\)"me=e-1
+syn match rexxVariable "\(=\|,\|)\|%\|\]\|\\\||\|&\|+=\|-=\|<\|>\)\s*\zs\K\k*\ze"
+
+" rgf, 2007-07-22: unfortunately, the entire region is colored (not only the
+" patterns), hence useless (vim 7.0)! (syntax-docs hint that that should work)
+" attempt: just colorize the parenthesis in matching colors, keep content
+"          transparent to keep the formatting already done to it!
+" TODO: test on 7.3
+" syn region par1 matchgroup=par1 start="(" matchgroup=par1 end=")" transparent contains=par2
+" syn region par2 matchgroup=par2 start="(" matchgroup=par2 end=")" transparent contains=par3 contained
+" syn region par3 matchgroup=par3 start="(" matchgroup=par3 end=")" transparent contains=par4 contained
+" syn region par4 matchgroup=par4 start="(" matchgroup=par4 end=")" transparent contains=par5 contained
+" syn region par5 matchgroup=par5 start="(" matchgroup=par5 end=")" transparent contains=par1 contained
+
+" this will colorize the entire region, removing any colorizing already done!
+" syn region par1 matchgroup=par1 start="(" end=")" contains=par2
+" syn region par2 matchgroup=par2 start="(" end=")" contains=par3 contained
+" syn region par3 matchgroup=par3 start="(" end=")" contains=par4 contained
+" syn region par4 matchgroup=par4 start="(" end=")" contains=par5 contained
+" syn region par5 matchgroup=par5 start="(" end=")" contains=par1 contained
+
+hi par1 ctermfg=red 		guifg=red          "guibg=grey
+hi par2 ctermfg=blue 		guifg=blue         "guibg=grey
+hi par3 ctermfg=darkgreen 	guifg=darkgreen    "guibg=grey
+hi par4 ctermfg=darkyellow	guifg=darkyellow   "guibg=grey
+hi par5 ctermfg=darkgrey 	guifg=darkgrey     "guibg=grey
+
+" line continuation (trailing comma or single dash)
+syn sync linecont "\(,\|-\ze-\@!\)\ze\s*\(--.*\|\/\*.*\)*$"
+
+" if !exists("rexx_minlines")
+"   let rexx_minlines = 500
+" endif
+" exec "syn sync ccomment rexxComment minlines=" . rexx_minlines
+
+" always scan from start, PCs have long become to be powerful enough for that
+exec "syn sync fromstart"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" make binary and hex strings stand out
+hi rexxStringConstant term=bold,underline ctermfg=5 cterm=bold guifg=darkMagenta gui=bold
+
+hi def link rexxLabel2		Function
+hi def link doLoopSelectLabelRegion	rexxKeyword
+hi def link endIterateLeaveLabelRegion	rexxKeyword
+hi def link rexxLoopKeywords	rexxKeyword " Todo
+
+hi def link rexxNumber		Normal "DiffChange
+"  hi def link rexxIdentifier		DiffChange
+
+hi def link rexxRegularCallSignal	Statement
+hi def link rexxExceptionHandling	Statement
+
+hi def link rexxLabel		Function
+hi def link rexxCharacter		Character
+hi def link rexxParenError		rexxError
+hi def link rexxInParen		rexxError
+hi def link rexxCommentError	rexxError
+hi def link rexxError		Error
+hi def link rexxKeyword		Statement
+hi def link rexxKeywordStatements	Statement
+
+hi def link rexxFunction		Function
+hi def link rexxString		String
+hi def link rexxComment		Comment
+hi def link rexxTodo		Todo
+hi def link rexxSpecialVariable	Special
+hi def link rexxConditional	rexxKeyword
+
+hi def link rexxOperator		Operator
+hi def link rexxMessageOperator	rexxOperator
+hi def link rexxLineComment	Comment
+
+hi def link rexxLineContinue	WildMenu
+
+hi def link rexxDirective		rexxKeyword
+hi def link rexxClassDirective	Type
+hi def link rexxMethodDirective	rexxFunction
+hi def link rexxAttributeDirective	rexxFunction
+hi def link rexxRequiresDirective	Include
+hi def link rexxRoutineDirective	rexxFunction
+
+" rgf, 2012-09-09
+hi def link rexxOptionsDirective	rexxFunction
+hi def link rexxOptionsDirective2  rexxOptionsDirective
+hi def link rexxOptionsDirective3  Normal " rexxOptionsDirective
+
+hi def link rexxConstantDirective	rexxFunction
+
+hi def link rexxConst		Constant
+hi def link rexxTypeSpecifier	Type
+hi def link rexxBuiltinClass	rexxTypeSpecifier
+
+hi def link rexxEnvironmentSymbol  rexxConst
+hi def link rexxMessage		rexxFunction
+
+hi def link rexxParse              rexxKeyword
+hi def link rexxParse2             rexxParse
+
+hi def link rexxGuard              rexxKeyword
+hi def link rexxTrace              rexxKeyword
+
+hi def link rexxRaise              rexxKeyword
+hi def link rexxRaise2             rexxRaise
+
+hi def link rexxForward            rexxKeyword
+hi def link rexxForward2           rexxForward
+
+
+let b:current_syntax = "rexx"
+
+"vim: ts=8
+
+endif
diff --git a/syntax/rib.vim b/syntax/rib.vim
new file mode 100644
index 000000000..2d1ceaddb
--- /dev/null
+++ b/syntax/rib.vim
@@ -0,0 +1,66 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rib') == -1
+
+" Vim syntax file
+" Language:	Renderman Interface Bytestream
+" Maintainer:	Andrew Bromage <ajb@spamcop.net>
+" Last Change:	2003 May 11
+"
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+" Comments
+syn match   ribLineComment      "#.*$"
+syn match   ribStructureComment "##.*$"
+
+syn case ignore
+syn match   ribCommand	       /[A-Z][a-zA-Z]*/
+syn case match
+
+syn region  ribString	       start=/"/ skip=/\\"/ end=/"/
+
+syn match   ribStructure	"[A-Z][a-zA-Z]*Begin\>\|[A-Z][a-zA-Z]*End"
+syn region  ribSectionFold	start="FrameBegin" end="FrameEnd" fold transparent keepend extend
+syn region  ribSectionFold	start="WorldBegin" end="WorldEnd" fold transparent keepend extend
+syn region  ribSectionFold	start="TransformBegin" end="TransformEnd" fold transparent keepend extend
+syn region  ribSectionFold	start="AttributeBegin" end="AttributeEnd" fold transparent keepend extend
+syn region  ribSectionFold	start="MotionBegin" end="MotionEnd" fold transparent keepend extend
+syn region  ribSectionFold	start="SolidBegin" end="SolidEnd" fold transparent keepend extend
+syn region  ribSectionFold	start="ObjectBegin" end="ObjectEnd" fold transparent keepend extend
+
+syn sync    fromstart
+
+"integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match	ribNumbers	  display transparent "[-]\=\<\d\|\.\d" contains=ribNumber,ribFloat
+syn match	ribNumber	  display contained "[-]\=\d\+\>"
+"floating point number, with dot, optional exponent
+syn match	ribFloat	  display contained "[-]\=\d\+\.\d*\(e[-+]\=\d\+\)\="
+"floating point number, starting with a dot, optional exponent
+syn match	ribFloat	  display contained "[-]\=\.\d\+\(e[-+]\=\d\+\)\=\>"
+"floating point number, without dot, with exponent
+syn match	ribFloat	  display contained "[-]\=\d\+e[-+]\d\+\>"
+syn case match
+
+
+hi def link ribStructure		Structure
+hi def link ribCommand		Statement
+
+hi def link ribStructureComment	SpecialComment
+hi def link ribLineComment		Comment
+
+hi def link ribString		String
+hi def link ribNumber		Number
+hi def link ribFloat		Float
+
+
+
+let b:current_syntax = "rib"
+
+" Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
+
+endif
diff --git a/syntax/rmd.vim b/syntax/rmd.vim
new file mode 100644
index 000000000..521998aea
--- /dev/null
+++ b/syntax/rmd.vim
@@ -0,0 +1,122 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rmd') == -1
+
+" markdown Text with R statements
+" Language: markdown with R code chunks
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change: Thu Apr 18, 2019  09:17PM
+"
+"   For highlighting pandoc extensions to markdown like citations and TeX and
+"   many other advanced features like folding of markdown sections, it is
+"   recommended to install the vim-pandoc filetype plugin as well as the
+"   vim-pandoc-syntax filetype plugin from https://github.com/vim-pandoc.
+
+
+if exists("b:current_syntax")
+  finish
+endif
+
+" Configuration if not using pandoc syntax:
+" Add syntax highlighting of YAML header
+let g:rmd_syn_hl_yaml = get(g:, 'rmd_syn_hl_yaml', 1)
+" Add syntax highlighting of citation keys
+let g:rmd_syn_hl_citations = get(g:, 'rmd_syn_hl_citations', 1)
+" Highlight the header of the chunk of R code
+let g:rmd_syn_hl_chunk = get(g:, 'g:rmd_syn_hl_chunk', 0)
+
+" Pandoc-syntax has more features, but it is slower.
+" https://github.com/vim-pandoc/vim-pandoc-syntax
+let g:pandoc#syntax#codeblocks#embeds#langs = get(g:, 'pandoc#syntax#codeblocks#embeds#langs', ['r'])
+runtime syntax/pandoc.vim
+if exists("b:current_syntax")
+  " Fix recognition of R code
+  syn region pandocDelimitedCodeBlock_r start=/^```{r\>.*}$/ end=/^```$/ contained containedin=pandocDelimitedCodeBlock contains=@R
+  syn region rmdrInline matchgroup=rmdInlineDelim start="`r "  end="`" contains=@R containedin=pandocLaTeXRegion,yamlFlowString keepend
+  hi def link rmdInlineDelim Delimiter
+  let b:current_syntax = "rmd"
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" R chunks will not be highlighted by syntax/markdown because their headers
+" follow a non standard pattern: "```{lang" instead of "^```lang".
+" Make a copy of g:markdown_fenced_languages to highlight the chunks later:
+if exists('g:markdown_fenced_languages')
+  if !exists('g:rmd_fenced_languages')
+    let g:rmd_fenced_languages = deepcopy(g:markdown_fenced_languages)
+    let g:markdown_fenced_languages = []
+  endif
+else
+  let g:rmd_fenced_languages = ['r']
+endif
+
+runtime syntax/markdown.vim
+
+" Now highlight chunks:
+for s:type in g:rmd_fenced_languages
+  if s:type =~ '='
+    let s:ft = substitute(s:type, '.*=', '', '')
+    let s:nm = substitute(s:type, '=.*', '', '')
+  else
+    let s:ft = s:type
+    let s:nm  = s:type
+  endif
+  unlet! b:current_syntax
+  exe 'syn include @Rmd'.s:nm.' syntax/'.s:ft.'.vim'
+  if g:rmd_syn_hl_chunk
+    exe 'syn region rmd'.s:nm.'ChunkDelim matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>" matchgroup=rmdCodeDelim end="}$" keepend containedin=rmd'.s:nm.'Chunk contains=@Rmd'.s:nm
+    exe 'syn region rmd'.s:nm.'Chunk start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=rmd'.s:nm.'ChunkDelim,@Rmd'.s:nm
+  else
+    exe 'syn region rmd'.s:nm.'Chunk matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=@Rmd'.s:nm
+  endif
+  exe 'syn region rmd'.s:nm.'Inline matchgroup=rmdInlineDelim start="`'.s:nm.' "  end="`" contains=@Rmd'.s:nm.' keepend'
+endfor
+unlet! s:type
+
+hi def link rmdInlineDelim Delimiter
+hi def link rmdCodeDelim Delimiter
+
+" You don't need this if either your markdown/syntax.vim already highlights
+" the YAML header or you are writing standard markdown
+if g:rmd_syn_hl_yaml
+  " Minimum highlighting of yaml header
+  syn match rmdYamlFieldTtl /^\s*\zs\w*\ze:/ contained
+  syn match rmdYamlFieldTtl /^\s*-\s*\zs\w*\ze:/ contained
+  syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start='"' skip='\\"' end='"' contains=yamlEscape,rmdrInline contained
+  syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start="'" skip="''"  end="'" contains=yamlSingleEscape,rmdrInline contained
+  syn match  yamlEscape contained '\\\%([\\"abefnrtv\^0_ NLP\n]\|x\x\x\|u\x\{4}\|U\x\{8}\)'
+  syn match  yamlSingleEscape contained "''"
+  syn region pandocYAMLHeader matchgroup=rmdYamlBlockDelim start=/\%(\%^\|\_^\s*\n\)\@<=\_^-\{3}\ze\n.\+/ end=/^\([-.]\)\1\{2}$/ keepend contains=rmdYamlFieldTtl,yamlFlowString
+  hi def link rmdYamlBlockDelim Delimiter
+  hi def link rmdYamlFieldTtl Identifier
+  hi def link yamlFlowString String
+endif
+
+" You don't need this if either your markdown/syntax.vim already highlights
+" citations or you are writing standard markdown
+if g:rmd_syn_hl_citations
+  " From vim-pandoc-syntax
+  " parenthetical citations
+  syn match pandocPCite /\^\@<!\[[^\[\]]\{-}-\{0,1}@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*.\{-}\]/ contains=pandocEmphasis,pandocStrong,pandocLatex,pandocCiteKey,@Spell,pandocAmpersandEscape display
+  " in-text citations with location
+  syn match pandocICite /@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*\s\[.\{-1,}\]/ contains=pandocCiteKey,@Spell display
+  " cite keys
+  syn match pandocCiteKey /\(-\=@[[:alnum:]_][[:alnum:]à-öø-ÿÀ-ÖØ-ß_:.#$%&\-+?<>~\/]*\)/ containedin=pandocPCite,pandocICite contains=@NoSpell display
+  syn match pandocCiteAnchor /[-@]/ contained containedin=pandocCiteKey display
+  syn match pandocCiteLocator /[\[\]]/ contained containedin=pandocPCite,pandocICite
+  hi def link pandocPCite Operator
+  hi def link pandocICite Operator
+  hi def link pandocCiteKey Label
+  hi def link pandocCiteAnchor Operator
+  hi def link pandocCiteLocator Operator
+endif
+
+let b:current_syntax = "rmd"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/rnc.vim b/syntax/rnc.vim
new file mode 100644
index 000000000..df6ba30c5
--- /dev/null
+++ b/syntax/rnc.vim
@@ -0,0 +1,72 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnc') == -1
+
+" Vim syntax file
+" Language:             Relax NG compact syntax
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-06-17
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal iskeyword+=-,.
+
+syn keyword rncTodo         contained TODO FIXME XXX NOTE
+
+syn region  rncComment      display oneline start='^\s*#' end='$'
+                            \ contains=rncTodo,@Spell
+
+syn match   rncOperator     display '[-|,&+?*~]'
+syn match   rncOperator     display '\%(|&\)\=='
+syn match   rncOperator     display '>>'
+
+syn match   rncNamespace    display '\<\k\+:'
+
+syn match   rncQuoted       display '\\\k\+\>'
+
+syn match   rncSpecial      display '\\x{\x\+}'
+
+syn region rncAnnotation    transparent start='\[' end='\]'
+                            \ contains=ALLBUT,rncComment,rncTodo
+
+syn region  rncLiteral      display oneline start=+"+ end=+"+
+                            \ contains=rncSpecial
+syn region  rncLiteral      display oneline start=+'+ end=+'+
+syn region  rncLiteral      display oneline start=+"""+ end=+"""+
+                            \ contains=rncSpecial
+syn region  rncLiteral      display oneline start=+'''+ end=+'''+
+
+syn match   rncDelimiter    display '[{},()]'
+
+syn keyword rncKeyword      datatypes default div empty external grammar
+syn keyword rncKeyword      include inherit list mixed name namespace
+syn keyword rncKeyword      notAllowed parent start string text token
+
+syn match   rncIdentifier   display '\k\+\_s*\%(=\|&=\||=\)\@='
+                            \ nextgroup=rncOperator
+syn keyword rncKeyword      element attribute
+                            \ nextgroup=rncIdName skipwhite skipempty
+syn match   rncIdName       contained '\k\+'
+
+hi def link rncTodo         Todo
+hi def link rncComment      Comment
+hi def link rncOperator     Operator
+hi def link rncNamespace    Identifier
+hi def link rncQuoted       Special
+hi def link rncSpecial      SpecialChar
+hi def link rncAnnotation   Special
+hi def link rncLiteral      String
+hi def link rncDelimiter    Delimiter
+hi def link rncKeyword      Keyword
+hi def link rncIdentifier   Identifier
+hi def link rncIdName       Identifier
+
+let b:current_syntax = "rnc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/rng.vim b/syntax/rng.vim
new file mode 100644
index 000000000..ba681ef3b
--- /dev/null
+++ b/syntax/rng.vim
@@ -0,0 +1,29 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rng') == -1
+
+" Vim syntax file
+" Language:    RELAX NG
+" Maintainer:  Jaromir Hradilek <jhradilek@gmail.com>
+" URL:         https://github.com/jhradilek/vim-rng
+" Last Change: 25 March 2013
+" Description: A syntax file for RELAX NG, a schema language for XML
+
+if exists('b:current_syntax')
+  finish
+endif
+
+do Syntax xml
+syn spell toplevel
+syn cluster xmlTagHook add=rngTagName
+syn case match
+
+syn keyword rngTagName anyName attribute choice data define div contained
+syn keyword rngTagName element empty except externalRef grammar contained
+syn keyword rngTagName group include interleave list mixed name contained
+syn keyword rngTagName notAllowed nsName oneOrMore optional param contained
+syn keyword rngTagName parentRef ref start text value zeroOrMore contained
+
+hi def link rngTagName Statement
+
+let b:current_syntax = 'rng'
+
+endif
diff --git a/syntax/rnoweb-1.vim b/syntax/rnoweb-1.vim
new file mode 100644
index 000000000..f3058c7eb
--- /dev/null
+++ b/syntax/rnoweb-1.vim
@@ -0,0 +1,60 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
+
+" Vim syntax file
+" Language:    R noweb Files
+" Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
+" Last Change: 2007 M�r 30
+" Version:     0.8
+" SVN:	       $Id: rnoweb.vim 69 2007-03-30 08:55:36Z ranke $
+" Remarks:     - This file is inspired by the proposal of 
+"				 Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br>
+"			     http://www.ime.usp.br/~feferraz/en/sweavevim.html
+"
+
+" Version Clears: {{{1
+" For version 5.x: Clear all syntax items
+" For version 6.x and 7.x: Quit when a syntax file was already loaded
+if version < 600 
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif 
+
+syn case match
+
+" Extension of Tex clusters {{{1
+runtime syntax/tex.vim
+unlet b:current_syntax
+
+syn cluster texMatchGroup add=@rnoweb
+syn cluster texEnvGroup add=@rnoweb
+syn cluster texFoldGroup add=@rnoweb
+syn cluster texDocGroup		add=@rnoweb
+syn cluster texPartGroup		add=@rnoweb
+syn cluster texChapterGroup		add=@rnoweb
+syn cluster texSectionGroup		add=@rnoweb
+syn cluster texSubSectionGroup		add=@rnoweb
+syn cluster texSubSubSectionGroup	add=@rnoweb
+syn cluster texParaGroup		add=@rnoweb
+
+" Highlighting of R code using an existing r.vim syntax file if available {{{1
+syn include @rnowebR syntax/r.vim
+syn region rnowebChunk matchgroup=rnowebDelimiter start="^<<.*>>=" matchgroup=rnowebDelimiter end="^@" contains=@rnowebR,rnowebChunkReference,rnowebChunk fold keepend
+syn match rnowebChunkReference "^<<.*>>$" contained
+syn region rnowebSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter end="}" contains=@rnowebR
+
+" Sweave options command {{{1
+syn region rnowebSweaveopts matchgroup=Delimiter start="\\SweaveOpts{" matchgroup=Delimiter end="}"
+
+" rnoweb Cluster {{{1
+syn cluster rnoweb contains=rnowebChunk,rnowebChunkReference,rnowebDelimiter,rnowebSexpr,rnowebSweaveopts
+
+" Highlighting {{{1
+hi def link rnowebDelimiter	Delimiter
+hi def link rnowebSweaveOpts Statement
+hi def link rnowebChunkReference Delimiter
+
+let   b:current_syntax = "rnoweb"
+" vim: foldmethod=marker:
+
+endif
diff --git a/syntax/rnoweb-2.vim b/syntax/rnoweb-2.vim
new file mode 100644
index 000000000..17a656dd3
--- /dev/null
+++ b/syntax/rnoweb-2.vim
@@ -0,0 +1,56 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnoweb') == -1
+
+" Vim syntax file
+" Language:    R noweb Files
+" Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
+" Last Change: Thu Apr 05, 2018  11:06PM
+" Version:     0.9.1
+" Remarks:     - This file is inspired by the proposal of 
+"                Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br>
+"                http://www.ime.usp.br/~feferraz/en/sweavevim.html
+"
+
+if exists("b:current_syntax")
+  finish
+endif 
+
+syn case match
+
+" Extension of Tex clusters {{{1
+runtime syntax/tex.vim
+unlet! b:current_syntax
+
+syn cluster texMatchGroup add=@rnoweb
+syn cluster texMathMatchGroup add=rnowebSexpr
+syn cluster texMathZoneGroup add=rnowebSexpr
+syn cluster texEnvGroup add=@rnoweb
+syn cluster texFoldGroup add=@rnoweb
+syn cluster texDocGroup add=@rnoweb
+syn cluster texPartGroup add=@rnoweb
+syn cluster texChapterGroup add=@rnoweb
+syn cluster texSectionGroup add=@rnoweb
+syn cluster texSubSectionGroup add=@rnoweb
+syn cluster texSubSubSectionGroup add=@rnoweb
+syn cluster texParaGroup add=@rnoweb
+
+" Highlighting of R code using an existing r.vim syntax file if available {{{1
+syn include @rnowebR syntax/r.vim
+syn region rnowebChunk matchgroup=rnowebDelimiter start="^<<.*>>=" matchgroup=rnowebDelimiter end="^@" contains=@rnowebR,rnowebChunkReference,rnowebChunk fold keepend
+syn match rnowebChunkReference "^<<.*>>$" contained
+syn region rnowebSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter end="}" contains=@rnowebR contained
+
+" Sweave options command {{{1
+syn region rnowebSweaveopts matchgroup=Delimiter start="\\SweaveOpts{" matchgroup=Delimiter end="}"
+
+" rnoweb Cluster {{{1
+syn cluster rnoweb contains=rnowebChunk,rnowebChunkReference,rnowebDelimiter,rnowebSexpr,rnowebSweaveopts
+
+" Highlighting {{{1
+hi def link rnowebDelimiter	Delimiter
+hi def link rnowebSweaveOpts Statement
+hi def link rnowebChunkReference Delimiter
+
+let   b:current_syntax = "rnoweb"
+" vim: foldmethod=marker:
+
+endif
diff --git a/syntax/rnoweb.vim b/syntax/rnoweb.vim
index f3058c7eb..7a61f3246 100644
--- a/syntax/rnoweb.vim
+++ b/syntax/rnoweb.vim
@@ -1,60 +1,3 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
-
-" Vim syntax file
-" Language:    R noweb Files
-" Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
-" Last Change: 2007 M�r 30
-" Version:     0.8
-" SVN:	       $Id: rnoweb.vim 69 2007-03-30 08:55:36Z ranke $
-" Remarks:     - This file is inspired by the proposal of 
-"				 Fernando Henrique Ferraz Pereira da Rosa <feferraz@ime.usp.br>
-"			     http://www.ime.usp.br/~feferraz/en/sweavevim.html
-"
-
-" Version Clears: {{{1
-" For version 5.x: Clear all syntax items
-" For version 6.x and 7.x: Quit when a syntax file was already loaded
-if version < 600 
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif 
-
-syn case match
-
-" Extension of Tex clusters {{{1
-runtime syntax/tex.vim
-unlet b:current_syntax
-
-syn cluster texMatchGroup add=@rnoweb
-syn cluster texEnvGroup add=@rnoweb
-syn cluster texFoldGroup add=@rnoweb
-syn cluster texDocGroup		add=@rnoweb
-syn cluster texPartGroup		add=@rnoweb
-syn cluster texChapterGroup		add=@rnoweb
-syn cluster texSectionGroup		add=@rnoweb
-syn cluster texSubSectionGroup		add=@rnoweb
-syn cluster texSubSubSectionGroup	add=@rnoweb
-syn cluster texParaGroup		add=@rnoweb
-
-" Highlighting of R code using an existing r.vim syntax file if available {{{1
-syn include @rnowebR syntax/r.vim
-syn region rnowebChunk matchgroup=rnowebDelimiter start="^<<.*>>=" matchgroup=rnowebDelimiter end="^@" contains=@rnowebR,rnowebChunkReference,rnowebChunk fold keepend
-syn match rnowebChunkReference "^<<.*>>$" contained
-syn region rnowebSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter end="}" contains=@rnowebR
-
-" Sweave options command {{{1
-syn region rnowebSweaveopts matchgroup=Delimiter start="\\SweaveOpts{" matchgroup=Delimiter end="}"
-
-" rnoweb Cluster {{{1
-syn cluster rnoweb contains=rnowebChunk,rnowebChunkReference,rnowebDelimiter,rnowebSexpr,rnowebSweaveopts
-
-" Highlighting {{{1
-hi def link rnowebDelimiter	Delimiter
-hi def link rnowebSweaveOpts Statement
-hi def link rnowebChunkReference Delimiter
-
-let   b:current_syntax = "rnoweb"
-" vim: foldmethod=marker:
-
-endif
+" Polyglot metafile
+source <sfile>:h/rnoweb-1.vim
+source <sfile>:h/rnoweb-2.vim
diff --git a/syntax/robots.vim b/syntax/robots.vim
new file mode 100644
index 000000000..1bd377209
--- /dev/null
+++ b/syntax/robots.vim
@@ -0,0 +1,61 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'robots') == -1
+
+" Vim syntax file
+" Language:	"Robots.txt" files
+" Robots.txt files indicate to WWW robots which parts of a web site should not be accessed.
+" Maintainer:	Dominique St�phan (dominique@mggen.com)
+" URL: http://www.mggen.com/vim/syntax/robots.zip
+" Last change:	2001 May 09
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+
+" shut case off
+syn case ignore
+
+" Comment
+syn match  robotsComment	"#.*$" contains=robotsUrl,robotsMail,robotsString
+
+" Star * (means all spiders)
+syn match  robotsStar		"\*"
+
+" :
+syn match  robotsDelimiter	":"
+
+
+" The keywords
+" User-agent
+syn match  robotsAgent		"^[Uu][Ss][Ee][Rr]\-[Aa][Gg][Ee][Nn][Tt]"
+" Disallow
+syn match  robotsDisallow	"^[Dd][Ii][Ss][Aa][Ll][Ll][Oo][Ww]"
+
+" Disallow: or User-Agent: and the rest of the line before an eventual comment
+synt match robotsLine		"\(^[Uu][Ss][Ee][Rr]\-[Aa][Gg][Ee][Nn][Tt]\|^[Dd][Ii][Ss][Aa][Ll][Ll][Oo][Ww]\):[^#]*"	contains=robotsAgent,robotsDisallow,robotsStar,robotsDelimiter
+
+" Some frequent things in comments
+syn match  robotsUrl		"http[s]\=://\S*"
+syn match  robotsMail		"\S*@\S*"
+syn region robotsString		start=+L\="+ skip=+\\\\\|\\"+ end=+"+
+
+
+hi def link robotsComment		Comment
+hi def link robotsAgent		Type
+hi def link robotsDisallow		Statement
+hi def link robotsLine		Special
+hi def link robotsStar		Operator
+hi def link robotsDelimiter	Delimiter
+hi def link robotsUrl		String
+hi def link robotsMail		String
+hi def link robotsString		String
+
+
+
+let b:current_syntax = "robots"
+
+" vim: ts=8 sw=2
+
+
+endif
diff --git a/syntax/rpcgen.vim b/syntax/rpcgen.vim
new file mode 100644
index 000000000..f15e6564a
--- /dev/null
+++ b/syntax/rpcgen.vim
@@ -0,0 +1,50 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpcgen') == -1
+
+" Vim syntax file
+" Language:	rpcgen
+" Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Last Change:	Aug 31, 2016
+" Version:	13
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_RPCGEN
+
+if exists("b:current_syntax")
+  finish
+endif
+
+" Read the C syntax to start with
+runtime! syntax/c.vim
+
+syn keyword rpcProgram	program				skipnl skipwhite nextgroup=rpcProgName
+syn match   rpcProgName	contained	"\<\i\I*\>"	skipnl skipwhite nextgroup=rpcProgZone
+syn region  rpcProgZone	contained	matchgroup=Delimiter start="{" matchgroup=Delimiter end="}\s*=\s*\(\d\+\|0x[23]\x\{7}\)\s*;"me=e-1 contains=rpcVersion,cComment,rpcProgNmbrErr
+syn keyword rpcVersion	contained	version		skipnl skipwhite nextgroup=rpcVersName
+syn match   rpcVersName	contained	"\<\i\I*\>"	skipnl skipwhite nextgroup=rpcVersZone
+syn region  rpcVersZone	contained	matchgroup=Delimiter start="{" matchgroup=Delimiter end="}\s*=\s*\d\+\s*;"me=e-1 contains=cType,cStructure,cStorageClass,rpcDecl,rpcProcNmbr,cComment
+syn keyword rpcDecl	contained	string
+syn match   rpcProcNmbr	contained	"=\s*\d\+;"me=e-1
+syn match   rpcProgNmbrErr contained	"=\s*0x[^23]\x*"ms=s+1
+syn match   rpcPassThru			"^\s*%.*$"
+
+" Define the default highlighting.
+if !exists("skip_rpcgen_syntax_inits")
+
+  hi def link rpcProgName	rpcName
+  hi def link rpcProgram	rpcStatement
+  hi def link rpcVersName	rpcName
+  hi def link rpcVersion	rpcStatement
+
+  hi def link rpcDecl	cType
+  hi def link rpcPassThru	cComment
+
+  hi def link rpcName	Special
+  hi def link rpcProcNmbr	Delimiter
+  hi def link rpcProgNmbrErr	Error
+  hi def link rpcStatement	Statement
+
+endif
+
+let b:current_syntax = "rpcgen"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/rpl.vim b/syntax/rpl.vim
new file mode 100644
index 000000000..fa052971b
--- /dev/null
+++ b/syntax/rpl.vim
@@ -0,0 +1,487 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
+
+" Vim syntax file
+" Language:	RPL/2
+" Version:	0.15.15 against RPL/2 version 4.00pre7i
+" Last Change:	2012 Feb 03 by Thilo Six
+" Maintainer:	Jo�l BERTRAND <rpl2@free.fr>
+" URL:		http://www.makalis.fr/~bertrand/rpl2/download/vim/indent/rpl.vim
+" Credits:	Nothing
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Keyword characters (not used)
+" set iskeyword=33-127
+
+" Case sensitive
+syntax case match
+
+" Constants
+syntax match rplConstant	   "\(^\|\s\+\)\(e\|i\)\ze\($\|\s\+\)"
+
+" Any binary number
+syntax match rplBinaryError	   "\(^\|\s\+\)#\s*\S\+b\ze"
+syntax match rplBinary		   "\(^\|\s\+\)#\s*[01]\+b\ze\($\|\s\+\)"
+syntax match rplOctalError	   "\(^\|\s\+\)#\s*\S\+o\ze"
+syntax match rplOctal		   "\(^\|\s\+\)#\s*\o\+o\ze\($\|\s\+\)"
+syntax match rplDecimalError	   "\(^\|\s\+\)#\s*\S\+d\ze"
+syntax match rplDecimal		   "\(^\|\s\+\)#\s*\d\+d\ze\($\|\s\+\)"
+syntax match rplHexadecimalError   "\(^\|\s\+\)#\s*\S\+h\ze"
+syntax match rplHexadecimal	   "\(^\|\s\+\)#\s*\x\+h\ze\($\|\s\+\)"
+
+" Case unsensitive
+syntax case ignore
+
+syntax match rplControl		   "\(^\|\s\+\)abort\ze\($\|\s\+\)"
+syntax match rplControl		   "\(^\|\s\+\)kill\ze\($\|\s\+\)"
+syntax match rplControl		   "\(^\|\s\+\)cont\ze\($\|\s\+\)"
+syntax match rplControl		   "\(^\|\s\+\)halt\ze\($\|\s\+\)"
+syntax match rplControl		   "\(^\|\s\+\)cmlf\ze\($\|\s\+\)"
+syntax match rplControl		   "\(^\|\s\+\)sst\ze\($\|\s\+\)"
+
+syntax match rplConstant	   "\(^\|\s\+\)pi\ze\($\|\s\+\)"
+
+syntax match rplStatement	   "\(^\|\s\+\)return\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)last\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)syzeval\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)wait\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)type\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)kind\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)eval\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)use\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)remove\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)external\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)dup\([2n]\|\)\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)drop\([2n]\|\)\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)depth\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)roll\(d\|\)\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)pick\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)rot\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)swap\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)over\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)clear\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)warranty\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)copyright\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)convert\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)date\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)time\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)mem\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)clmf\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)->num\ze\($\|\s\+\)"
+syntax match rplStatement	   "\(^\|\s\+\)help\ze\($\|\s\+\)"
+
+syntax match rplStorage		   "\(^\|\s\+\)get\(i\|r\|c\|\)\ze\($\|\s\+\)"
+syntax match rplStorage		   "\(^\|\s\+\)put\(i\|r\|c\|\)\ze\($\|\s\+\)"
+syntax match rplStorage		   "\(^\|\s\+\)rcl\ze\($\|\s\+\)"
+syntax match rplStorage		   "\(^\|\s\+\)purge\ze\($\|\s\+\)"
+syntax match rplStorage		   "\(^\|\s\+\)sinv\ze\($\|\s\+\)"
+syntax match rplStorage		   "\(^\|\s\+\)sneg\ze\($\|\s\+\)"
+syntax match rplStorage		   "\(^\|\s\+\)sconj\ze\($\|\s\+\)"
+syntax match rplStorage		   "\(^\|\s\+\)steq\ze\($\|\s\+\)"
+syntax match rplStorage		   "\(^\|\s\+\)rceq\ze\($\|\s\+\)"
+syntax match rplStorage		   "\(^\|\s\+\)vars\ze\($\|\s\+\)"
+syntax match rplStorage		   "\(^\|\s\+\)clusr\ze\($\|\s\+\)"
+syntax match rplStorage		   "\(^\|\s\+\)sto\([+-/\*]\|\)\ze\($\|\s\+\)"
+
+syntax match rplAlgConditional	   "\(^\|\s\+\)ift\(e\|\)\ze\($\|\s\+\)"
+
+syntax match rplOperator	   "\(^\|\s\+\)and\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)\(x\|\)or\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)not\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)same\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)==\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)<=\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)=<\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)=>\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)>=\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)<>\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)>\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)<\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)[+-]\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)[/\*]\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)\^\ze\($\|\s\+\)"
+syntax match rplOperator	   "\(^\|\s\+\)\*\*\ze\($\|\s\+\)"
+
+syntax match rplBoolean		   "\(^\|\s\+\)true\ze\($\|\s\+\)"
+syntax match rplBoolean		   "\(^\|\s\+\)false\ze\($\|\s\+\)"
+
+syntax match rplReadWrite	   "\(^\|\s\+\)store\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)recall\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)\(\|wf\|un\)lock\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)open\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)close\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)delete\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)create\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)format\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)rewind\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)backspace\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)\(\|re\)write\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)read\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)inquire\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)sync\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)append\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)suppress\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)seek\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)pr\(1\|int\|st\|stc\|lcd\|var\|usr\|md\)\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)paper\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)cr\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)erase\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)disp\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)input\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)prompt\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)key\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)cllcd\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)\(\|re\)draw\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)drax\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)indep\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)depnd\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)res\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)axes\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)label\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)pmin\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)pmax\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)centr\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)persist\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)title\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)\(slice\|auto\|log\|\)scale\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)eyept\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)\(p\|s\)par\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)function\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)polar\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)scatter\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)plotter\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)wireframe\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)parametric\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)slice\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)\*w\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)\*h\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)\*d\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)\*s\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)->lcd\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)lcd->\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)edit\ze\($\|\s\+\)"
+syntax match rplReadWrite	   "\(^\|\s\+\)visit\ze\($\|\s\+\)"
+
+syntax match rplIntrinsic	   "\(^\|\s\+\)abs\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)arg\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)conj\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)re\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)im\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)mant\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)xpon\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)ceil\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)fact\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)fp\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)floor\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)inv\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)ip\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)max\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)min\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)mod\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)neg\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)relax\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)sign\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)sq\(\|rt\)\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)xroot\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)cos\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)sin\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)tan\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)tg\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)a\(\|rc\)cos\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)a\(\|rc\)sin\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)atan\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)arctg\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|a\)cosh\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|a\)sinh\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|a\)tanh\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|arg\)th\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)arg[cst]h\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|a\)log\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)ln\(\|1\)\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)exp\(\|m\)\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)trn\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)con\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)idn\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)rdm\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)rsd\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)cnrm\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)cross\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)d[eo]t\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)[cr]swp\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)rci\(j\|\)\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(in\|de\)cr\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)bessel\ze\($\|\s\+\)"
+
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|g\)egvl\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|g\)\(\|l\|r\)egv\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)rnrm\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(std\|fix\|sci\|eng\)\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(rad\|deg\)\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|n\)rand\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)rdz\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|i\)fft\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(dec\|bin\|oct\|hex\)\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)rclf\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)stof\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)[cs]f\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)chr\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)num\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)pos\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)sub\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)size\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(st\|rc\)ws\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(r\|s\)\(r\|l\)\(\|b\)\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)as\(r\|l\)\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(int\|der\)\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)stos\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|r\)cls\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)drws\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)scls\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)ns\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)tot\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)mean\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|p\)sdev\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|p\)var\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)maxs\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)mins\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|p\)cov\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)cols\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)s\(x\(\|y\|2\)\|y\(\|2\)\)\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(x\|y\)col\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)corr\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)utp[cfnt]\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)comb\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)perm\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)\(\|p\)lu\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)[lu]chol\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)schur\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)%\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)%ch\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)%t\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)hms->\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)->hms\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)hms+\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)hms-\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)d->r\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)r->d\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)b->r\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)r->b\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)c->r\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)r->c\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)r->p\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)p->r\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)str->\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)->str\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)array->\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)->array\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)list->\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)->list\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)s+\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)s-\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)col-\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)col+\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)row-\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)row+\ze\($\|\s\+\)"
+syntax match rplIntrinsic	   "\(^\|\s\+\)->q\ze\($\|\s\+\)"
+
+syntax match rplObsolete	   "\(^\|\s\+\)arry->\ze\($\|\s\+\)"hs=e-5
+syntax match rplObsolete	   "\(^\|\s\+\)->arry\ze\($\|\s\+\)"hs=e-5
+
+" Conditional structures
+syntax match rplConditionalError   "\(^\|\s\+\)case\ze\($\|\s\+\)"hs=e-3
+syntax match rplConditionalError   "\(^\|\s\+\)then\ze\($\|\s\+\)"hs=e-3
+syntax match rplConditionalError   "\(^\|\s\+\)else\ze\($\|\s\+\)"hs=e-3
+syntax match rplConditionalError   "\(^\|\s\+\)elseif\ze\($\|\s\+\)"hs=e-5
+syntax match rplConditionalError   "\(^\|\s\+\)end\ze\($\|\s\+\)"hs=e-2
+syntax match rplConditionalError   "\(^\|\s\+\)\(step\|next\)\ze\($\|\s\+\)"hs=e-3
+syntax match rplConditionalError   "\(^\|\s\+\)until\ze\($\|\s\+\)"hs=e-4
+syntax match rplConditionalError   "\(^\|\s\+\)repeat\ze\($\|\s\+\)"hs=e-5
+syntax match rplConditionalError   "\(^\|\s\+\)default\ze\($\|\s\+\)"hs=e-6
+
+" FOR/(CYCLE)/(EXIT)/NEXT
+" FOR/(CYCLE)/(EXIT)/STEP
+" START/(CYCLE)/(EXIT)/NEXT
+" START/(CYCLE)/(EXIT)/STEP
+syntax match rplCycle              "\(^\|\s\+\)\(cycle\|exit\)\ze\($\|\s\+\)"
+syntax region rplForNext matchgroup=rplRepeat start="\(^\|\s\+\)\(for\|start\)\ze\($\|\s\+\)" end="\(^\|\s\+\)\(next\|step\)\ze\($\|\s\+\)" contains=ALL keepend extend
+
+" ELSEIF/END
+syntax region rplElseifEnd matchgroup=rplConditional start="\(^\|\s\+\)elseif\ze\($\|\s\+\)" end="\(^\|\s\+\)end\ze\($\|\s\+\)" contained contains=ALLBUT,rplElseEnd keepend
+
+" ELSE/END
+syntax region rplElseEnd matchgroup=rplConditional start="\(^\|\s\+\)else\ze\($\|\s\+\)" end="\(^\|\s\+\)end\ze\($\|\s\+\)" contained contains=ALLBUT,rplElseEnd,rplThenEnd,rplElseifEnd keepend
+
+" THEN/END
+syntax region rplThenEnd matchgroup=rplConditional start="\(^\|\s\+\)then\ze\($\|\s\+\)" end="\(^\|\s\+\)end\ze\($\|\s\+\)" contained containedin=rplIfEnd contains=ALLBUT,rplThenEnd keepend
+
+" IF/END
+syntax region rplIfEnd matchgroup=rplConditional start="\(^\|\s\+\)if\(err\|\)\ze\($\|\s\+\)" end="\(^\|\s\+\)end\ze\($\|\s\+\)" contains=ALLBUT,rplElseEnd,rplElseifEnd keepend extend
+" if end is accepted !
+" select end too !
+
+" CASE/THEN
+syntax region rplCaseThen matchgroup=rplConditional start="\(^\|\s\+\)case\ze\($\|\s\+\)" end="\(^\|\s\+\)then\ze\($\|\s\+\)" contains=ALLBUT,rplCaseThen,rplCaseEnd,rplThenEnd keepend extend contained containedin=rplCaseEnd
+
+" CASE/END
+syntax region rplCaseEnd matchgroup=rplConditional start="\(^\|\s\+\)case\ze\($\|\s\+\)" end="\(^\|\s\+\)end\ze\($\|\s\+\)" contains=ALLBUT,rplCaseEnd,rplThenEnd,rplElseEnd keepend extend contained containedin=rplSelectEnd
+
+" DEFAULT/END
+syntax region rplDefaultEnd matchgroup=rplConditional start="\(^\|\s\+\)default\ze\($\|\s\+\)" end="\(^\|\s\+\)end\ze\($\|\s\+\)" contains=ALLBUT,rplDefaultEnd keepend contained containedin=rplSelectEnd
+
+" SELECT/END
+syntax region rplSelectEnd matchgroup=rplConditional start="\(^\|\s\+\)select\ze\($\|\s\+\)" end="\(^\|\s\+\)end\ze\($\|\s\+\)" contains=ALLBUT,rplThenEnd keepend extend
+" select end is accepted !
+
+" DO/UNTIL/END
+syntax region rplUntilEnd matchgroup=rplConditional start="\(^\|\s\+\)until\ze\($\|\s\+\)" end="\(^\|\s\+\)\zsend\ze\($\|\s\+\)" contains=ALLBUT,rplUntilEnd contained containedin=rplDoUntil extend keepend
+syntax region rplDoUntil matchgroup=rplConditional start="\(^\|\s\+\)do\ze\($\|\s\+\)" end="\(^\|\s\+\)until\ze\($\|\s\+\)" contains=ALL keepend extend
+
+" WHILE/REPEAT/END
+syntax region rplRepeatEnd matchgroup=rplConditional start="\(^\|\s\+\)repeat\ze\($\|\s\+\)" end="\(^\|\s\+\)\zsend\ze\($\|\s\+\)" contains=ALLBUT,rplRepeatEnd contained containedin=rplWhileRepeat extend keepend
+syntax region rplWhileRepeat matchgroup=rplConditional start="\(^\|\s\+\)while\ze\($\|\s\+\)" end="\(^\|\s\+\)repeat\ze\($\|\s\+\)" contains=ALL keepend extend
+
+" Comments
+syntax match rplCommentError "\*/"
+syntax region rplCommentString contained start=+"+ end=+"+ end=+\*/+me=s-1
+syntax region rplCommentLine start="\(^\|\s\+\)//\ze" skip="\\$" end="$" contains=NONE keepend extend
+syntax region rplComment start="\(^\|\s\+\)/\*\ze" end="\*/" contains=rplCommentString keepend extend
+
+" Catch errors caused by too many right parentheses
+syntax region rplParen transparent start="(" end=")" contains=ALLBUT,rplParenError,rplComplex,rplIncluded keepend extend
+syntax match rplParenError ")"
+
+" Subroutines
+" Catch errors caused by too many right '>>'
+syntax match rplSubError "\(^\|\s\+\)>>\ze\($\|\s\+\)"hs=e-1
+syntax region rplSub matchgroup=rplSubDelimitor start="\(^\|\s\+\)<<\ze\($\|\s\+\)" end="\(^\|\s\+\)>>\ze\($\|\s\+\)" contains=ALLBUT,rplSubError,rplIncluded,rplDefaultEnd,rplStorageSub keepend extend
+
+" Expressions
+syntax region rplExpr start="\(^\|\s\+\)'" end="'\ze\($\|\s\+\)" contains=rplParen,rplParenError
+
+" Local variables
+syntax match rplStorageError "\(^\|\s\+\)->\ze\($\|\s\+\)"hs=e-1
+syntax region rplStorageSub matchgroup=rplStorage start="\(^\|\s\+\)<<\ze\($\|\s\+\)" end="\(^\|\s\+\)>>\ze\($\|\s\+\)" contains=ALLBUT,rplSubError,rplIncluded,rplDefaultEnd,rplStorageExpr contained containedin=rplLocalStorage keepend extend
+syntax region rplStorageExpr matchgroup=rplStorage start="\(^\|\s\+\)'" end="'\ze\($\|\s\+\)" contains=rplParen,rplParenError extend contained containedin=rplLocalStorage
+syntax region rplLocalStorage matchgroup=rplStorage start="\(^\|\s\+\)->\ze\($\|\s\+\)" end="\(^\|\s\+\)\(<<\ze\($\|\s\+\)\|'\)" contains=rplStorageSub,rplStorageExpr,rplComment,rplCommentLine keepend extend
+
+" Catch errors caused by too many right brackets
+syntax match rplArrayError "\]"
+syntax match rplArray "\]" contained containedin=rplArray
+syntax region rplArray matchgroup=rplArray start="\[" end="\]" contains=ALLBUT,rplArrayError keepend extend
+
+" Catch errors caused by too many right '}'
+syntax match rplListError "}"
+syntax match rplList "}" contained containedin=rplList
+syntax region rplList matchgroup=rplList start="{" end="}" contains=ALLBUT,rplListError,rplIncluded keepend extend
+
+" cpp is used by RPL/2
+syntax match rplPreProc   "\_^#\s*\(define\|undef\)\>"
+syntax match rplPreProc   "\_^#\s*\(warning\|error\)\>"
+syntax match rplPreCondit "\_^#\s*\(if\|ifdef\|ifndef\|elif\|else\|endif\)\>"
+syntax match rplIncluded contained "\<<\s*\S*\s*>\>"
+syntax match rplInclude   "\_^#\s*include\>\s*["<]" contains=rplIncluded,rplString
+"syntax match rplExecPath  "\%^\_^#!\s*\S*"
+syntax match rplExecPath  "\%^\_^#!\p*\_$"
+
+" Any integer
+syntax match rplInteger    "\(^\|\s\+\)[-+]\=\d\+\ze\($\|\s\+\)"
+
+" Floating point number
+" [S][ip].[fp]
+syntax match rplFloat       "\(^\|\s\+\)[-+]\=\(\d*\)\=[\.,]\(\d*\)\=\ze\($\|\s\+\)" contains=ALLBUT,rplPoint,rplSign
+" [S]ip[.fp]E[S]exp
+syntax match rplFloat       "\(^\|\s\+\)[-+]\=\d\+\([\.,]\d*\)\=[eE]\([-+]\)\=\d\+\ze\($\|\s\+\)" contains=ALLBUT,rplPoint,rplSign
+" [S].fpE[S]exp
+syntax match rplFloat       "\(^\|\s\+\)[-+]\=\(\d*\)\=[\.,]\d\+[eE]\([-+]\)\=\d\+\ze\($\|\s\+\)" contains=ALLBUT,rplPoint,rplSign
+syntax match rplPoint      "\<[\.,]\>"
+syntax match rplSign       "\<[+-]\>"
+
+" Complex number
+" (x,y)
+syntax match rplComplex    "\(^\|\s\+\)([-+]\=\(\d*\)\=\.\=\d*\([eE][-+]\=\d\+\)\=\s*,\s*[-+]\=\(\d*\)\=\.\=\d*\([eE][-+]\=\d\+\)\=)\ze\($\|\s\+\)"
+" (x.y)
+syntax match rplComplex    "\(^\|\s\+\)([-+]\=\(\d*\)\=,\=\d*\([eE][-+]\=\d\+\)\=\s*\.\s*[-+]\=\(\d*\)\=,\=\d*\([eE][-+]\=\d\+\)\=)\ze\($\|\s\+\)"
+
+" Strings
+syntax match rplStringGuilles       "\\\""
+syntax match rplStringAntislash     "\\\\"
+syntax region rplString start=+\(^\|\s\+\)"+ end=+"\ze\($\|\s\+\)+ contains=rplStringGuilles,rplStringAntislash
+
+syntax match rplTab "\t"  transparent
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default highlighting.
+
+hi def link rplControl		Statement
+hi def link rplStatement		Statement
+hi def link rplAlgConditional	Conditional
+hi def link rplConditional		Repeat
+hi def link rplConditionalError	Error
+hi def link rplRepeat		Repeat
+hi def link rplCycle		Repeat
+hi def link rplUntil		Repeat
+hi def link rplIntrinsic		Special
+hi def link rplStorage		StorageClass
+hi def link rplStorageExpr		StorageClass
+hi def link rplStorageError	Error
+hi def link rplReadWrite		rplIntrinsic
+
+hi def link rplOperator		Operator
+
+hi def link rplList		Special
+hi def link rplArray		Special
+hi def link rplConstant		Identifier
+hi def link rplExpr		Type
+
+hi def link rplString		String
+hi def link rplStringGuilles	String
+hi def link rplStringAntislash	String
+
+hi def link rplBinary		Boolean
+hi def link rplOctal		Boolean
+hi def link rplDecimal		Boolean
+hi def link rplHexadecimal		Boolean
+hi def link rplInteger		Number
+hi def link rplFloat		Float
+hi def link rplComplex		Float
+hi def link rplBoolean		Identifier
+
+hi def link rplObsolete		Todo
+
+hi def link rplPreCondit		PreCondit
+hi def link rplInclude		Include
+hi def link rplIncluded		rplString
+hi def link rplInclude		Include
+hi def link rplExecPath		Include
+hi def link rplPreProc		PreProc
+hi def link rplComment		Comment
+hi def link rplCommentLine		Comment
+hi def link rplCommentString	Comment
+hi def link rplSubDelimitor	rplStorage
+hi def link rplCommentError	Error
+hi def link rplParenError		Error
+hi def link rplSubError		Error
+hi def link rplArrayError		Error
+hi def link rplListError		Error
+hi def link rplTab			Error
+hi def link rplBinaryError		Error
+hi def link rplOctalError		Error
+hi def link rplDecimalError	Error
+hi def link rplHexadecimalError	Error
+
+
+let b:current_syntax = "rpl"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8 tw=132
+
+endif
diff --git a/syntax/rrst.vim b/syntax/rrst.vim
new file mode 100644
index 000000000..f6d3dc236
--- /dev/null
+++ b/syntax/rrst.vim
@@ -0,0 +1,47 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rrst') == -1
+
+" reStructured Text with R statements
+" Language: reST with R code chunks
+" Maintainer: Alex Zvoleff, azvoleff@mail.sdsu.edu
+" Homepage: https://github.com/jalvesaq/R-Vim-runtime
+" Last Change: Thu Apr 05, 2018  11:06PM
+"
+" CONFIGURATION:
+"   To highlight chunk headers as R code, put in your vimrc:
+"   let rrst_syn_hl_chunk = 1
+
+if exists("b:current_syntax")
+  finish
+endif
+
+" load all of the rst info
+runtime syntax/rst.vim
+unlet! b:current_syntax
+
+" load all of the r syntax highlighting rules into @R
+syntax include @R syntax/r.vim
+
+" highlight R chunks
+if exists("g:rrst_syn_hl_chunk")
+  " highlight R code inside chunk header
+  syntax match rrstChunkDelim "^\.\. {r" contained
+  syntax match rrstChunkDelim "}$" contained
+else
+  syntax match rrstChunkDelim "^\.\. {r .*}$" contained
+endif
+syntax match rrstChunkDelim "^\.\. \.\.$" contained
+syntax region rrstChunk start="^\.\. {r.*}$" end="^\.\. \.\.$" contains=@R,rrstChunkDelim keepend transparent fold
+
+" also highlight in-line R code
+syntax match rrstInlineDelim "`" contained
+syntax match rrstInlineDelim ":r:" contained
+syntax region rrstInline start=":r: *`" skip=/\\\\\|\\`/ end="`" contains=@R,rrstInlineDelim keepend
+
+hi def link rrstChunkDelim Special
+hi def link rrstInlineDelim Special
+
+let b:current_syntax = "rrst"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/rtf.vim b/syntax/rtf.vim
new file mode 100644
index 000000000..d67574d2d
--- /dev/null
+++ b/syntax/rtf.vim
@@ -0,0 +1,79 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rtf') == -1
+
+" Vim syntax file
+" Language:	Rich Text Format
+"		"*.rtf" files
+"
+" The Rich Text Format (RTF) Specification is a method of encoding formatted
+" text and graphics for easy transfer between applications.
+" .hlp (windows help files) use compiled rtf files
+" rtf documentation at http://night.primate.wisc.edu/software/RTF/
+"
+" Maintainer:	Dominique St�phan (dominique@mggen.com)
+" URL: http://www.mggen.com/vim/syntax/rtf.zip
+" Last change:	2001 Mai 02
+
+" TODO: render underline, italic, bold
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" case on (all controls must be lower case)
+syn case match
+
+" Control Words
+syn match rtfControlWord	"\\[a-z]\+[\-]\=[0-9]*"
+
+" New Control Words (not in the 1987 specifications)
+syn match rtfNewControlWord	"\\\*\\[a-z]\+[\-]\=[0-9]*"
+
+" Control Symbol : any \ plus a non alpha symbol, *, \, { and } and '
+syn match rtfControlSymbol	"\\[^a-zA-Z\*\{\}\\']"
+
+" { } and \ are special characters, to use them
+" we add a backslash \
+syn match rtfCharacter		"\\\\"
+syn match rtfCharacter		"\\{"
+syn match rtfCharacter		"\\}"
+" Escaped characters (for 8 bytes characters upper than 127)
+syn match rtfCharacter		"\\'[A-Za-z0-9][A-Za-z0-9]"
+" Unicode
+syn match rtfUnicodeCharacter	"\\u[0-9][0-9]*"
+
+" Color values, we will put this value in Red, Green or Blue
+syn match rtfRed		"\\red[0-9][0-9]*"
+syn match rtfGreen		"\\green[0-9][0-9]*"
+syn match rtfBlue		"\\blue[0-9][0-9]*"
+
+" Some stuff for help files
+syn match rtfFootNote "[#$K+]{\\footnote.*}" contains=rtfControlWord,rtfNewControlWord
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+
+hi def link rtfControlWord		Statement
+hi def link rtfNewControlWord	Special
+hi def link rtfControlSymbol	Constant
+hi def link rtfCharacter		Character
+hi def link rtfUnicodeCharacter	SpecialChar
+hi def link rtfFootNote		Comment
+
+" Define colors for the syntax file
+hi rtfRed	      term=underline cterm=underline ctermfg=DarkRed gui=underline guifg=DarkRed
+hi rtfGreen	      term=underline cterm=underline ctermfg=DarkGreen gui=underline guifg=DarkGreen
+hi rtfBlue	      term=underline cterm=underline ctermfg=DarkBlue gui=underline guifg=DarkBlue
+
+hi def link rtfRed	rtfRed
+hi def link rtfGreen	rtfGreen
+hi def link rtfBlue	rtfBlue
+
+
+
+let b:current_syntax = "rtf"
+
+" vim:ts=8
+
+endif
diff --git a/syntax/samba.vim b/syntax/samba.vim
new file mode 100644
index 000000000..9d481ac3d
--- /dev/null
+++ b/syntax/samba.vim
@@ -0,0 +1,122 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'samba') == -1
+
+" Vim syntax file
+" Language:	samba configuration files (smb.conf)
+" Maintainer:	Rafael Garcia-Suarez <rgarciasuarez@free.fr>
+" URL:		http://rgarciasuarez.free.fr/vim/syntax/samba.vim
+" Last change:	2009 Aug 06
+"
+"               New maintainer wanted!
+"
+" Don't forget to run your config file through testparm(1)!
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+syn match sambaParameter /^[a-zA-Z \t]\+=/ contains=sambaKeyword
+syn match sambaSection /^\s*\[[a-zA-Z0-9_\-.$ ]\+\]/
+syn match sambaMacro /%[SPugUGHvhmLMNpRdaITD]/
+syn match sambaMacro /%$([a-zA-Z0-9_]\+)/
+syn match sambaComment /^\s*[;#].*/
+syn match sambaContinue /\\$/
+syn keyword sambaBoolean true false yes no
+
+" Keywords for Samba 2.0.5a
+syn keyword sambaKeyword contained account acl action add address admin aliases
+syn keyword sambaKeyword contained allow alternate always announce anonymous
+syn keyword sambaKeyword contained archive as auto available bind blocking
+syn keyword sambaKeyword contained bmpx break browsable browse browseable ca
+syn keyword sambaKeyword contained cache case casesignames cert certDir
+syn keyword sambaKeyword contained certFile change char character chars chat
+syn keyword sambaKeyword contained ciphers client clientcert code coding
+syn keyword sambaKeyword contained command comment compatibility config
+syn keyword sambaKeyword contained connections contention controller copy
+syn keyword sambaKeyword contained create deadtime debug debuglevel default
+syn keyword sambaKeyword contained delete deny descend dfree dir directory
+syn keyword sambaKeyword contained disk dns domain domains dont dos dot drive
+syn keyword sambaKeyword contained driver encrypt encrypted equiv exec fake
+syn keyword sambaKeyword contained file files filetime filetimes filter follow
+syn keyword sambaKeyword contained force fstype getwd group groups guest
+syn keyword sambaKeyword contained hidden hide home homedir hosts include
+syn keyword sambaKeyword contained interfaces interval invalid keepalive
+syn keyword sambaKeyword contained kernel key ldap length level level2 limit
+syn keyword sambaKeyword contained links list lm load local location lock
+syn keyword sambaKeyword contained locking locks log logon logons logs lppause
+syn keyword sambaKeyword contained lpq lpresume lprm machine magic mangle
+syn keyword sambaKeyword contained mangled mangling map mask master max mem
+syn keyword sambaKeyword contained message min mode modes mux name names
+syn keyword sambaKeyword contained netbios nis notify nt null offset ok ole
+syn keyword sambaKeyword contained only open oplock oplocks options order os
+syn keyword sambaKeyword contained output packet page panic passwd password
+syn keyword sambaKeyword contained passwords path permissions pipe port ports
+syn keyword sambaKeyword contained postexec postscript prediction preexec
+syn keyword sambaKeyword contained prefered preferred preload preserve print
+syn keyword sambaKeyword contained printable printcap printer printers
+syn keyword sambaKeyword contained printing program protocol proxy public
+syn keyword sambaKeyword contained queuepause queueresume raw read readonly
+syn keyword sambaKeyword contained realname remote require resign resolution
+syn keyword sambaKeyword contained resolve restrict revalidate rhosts root
+syn keyword sambaKeyword contained script security sensitive server servercert
+syn keyword sambaKeyword contained service services set share shared short
+syn keyword sambaKeyword contained size smb smbrun socket space ssl stack stat
+syn keyword sambaKeyword contained status strict string strip suffix support
+syn keyword sambaKeyword contained symlinks sync syslog system time timeout
+syn keyword sambaKeyword contained times timestamp to trusted ttl unix update
+syn keyword sambaKeyword contained use user username users valid version veto
+syn keyword sambaKeyword contained volume wait wide wins workgroup writable
+syn keyword sambaKeyword contained write writeable xmit
+
+" New keywords for Samba 2.0.6
+syn keyword sambaKeyword contained hook hires pid uid close rootpreexec
+
+" New keywords for Samba 2.0.7
+syn keyword sambaKeyword contained utmp wtmp hostname consolidate
+syn keyword sambaKeyword contained inherit source environment
+
+" New keywords for Samba 2.2.0
+syn keyword sambaKeyword contained addprinter auth browsing deleteprinter
+syn keyword sambaKeyword contained enhanced enumports filemode gid host jobs
+syn keyword sambaKeyword contained lanman msdfs object os2 posix processes
+syn keyword sambaKeyword contained scope separator shell show smbd template
+syn keyword sambaKeyword contained total vfs winbind wizard
+
+" New keywords for Samba 2.2.1
+syn keyword sambaKeyword contained large obey pam readwrite restrictions
+syn keyword sambaKeyword contained unreadable
+
+" New keywords for Samba 2.2.2 - 2.2.4
+syn keyword sambaKeyword contained acls allocate bytes count csc devmode
+syn keyword sambaKeyword contained disable dn egd entropy enum extensions mmap
+syn keyword sambaKeyword contained policy spin spoolss
+
+" Since Samba 3.0.2
+syn keyword sambaKeyword contained abort afs algorithmic backend
+syn keyword sambaKeyword contained charset cups defer display
+syn keyword sambaKeyword contained enable idmap kerberos lookups
+syn keyword sambaKeyword contained methods modules nested NIS ntlm NTLMv2
+syn keyword sambaKeyword contained objects paranoid partners passdb
+syn keyword sambaKeyword contained plaintext prefix primary private
+syn keyword sambaKeyword contained profile quota realm replication
+syn keyword sambaKeyword contained reported rid schannel sendfile sharing
+syn keyword sambaKeyword contained shutdown signing special spnego
+syn keyword sambaKeyword contained store unknown unwriteable
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+hi def link sambaParameter Normal
+hi def link sambaKeyword   Type
+hi def link sambaSection   Statement
+hi def link sambaMacro     PreProc
+hi def link sambaComment   Comment
+hi def link sambaContinue  Operator
+hi def link sambaBoolean   Constant
+
+let b:current_syntax = "samba"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/sas.vim b/syntax/sas.vim
new file mode 100644
index 000000000..1ae23c7fe
--- /dev/null
+++ b/syntax/sas.vim
@@ -0,0 +1,269 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sas') == -1
+
+" Vim syntax file
+" Language:     SAS
+" Maintainer:   Zhen-Huan Hu <wildkeny@gmail.com>
+" Original Maintainer: James Kidd <james.kidd@covance.com>
+" Version:      3.0.0
+" Last Change:  Aug 26, 2017
+"
+" 2017 Mar 7
+"
+" Upgrade version number to 3.0. Improvements include:
+" - Improve sync speed
+" - Largely enhance precision
+" - Update keywords in the latest SAS (as of Mar 2017)
+" - Add syntaxes for date/time constants
+" - Add syntax for data lines
+" - Add (back) syntax for TODO in comments
+"
+" 2017 Feb 9
+"
+" Add syntax folding 
+"
+" 2016 Oct 10
+"
+" Add highlighting for functions
+"
+" 2016 Sep 14
+"
+" Change the implementation of syntaxing
+" macro function names so that macro parameters same
+" as SAS keywords won't be highlighted
+" (Thank Joug Raw for the suggestion)
+" Add section highlighting:
+" - Use /** and **/ to define a section
+" - It functions the same as a comment but
+"   with different highlighting
+"
+" 2016 Jun 14
+"
+" Major changes so upgrade version number to 2.0
+" Overhaul the entire script (again). Improvements include:
+" - Higher precision
+" - Faster synchronization
+" - Separate color for control statements
+" - Highlight hash and java objects
+" - Highlight macro variables in double quoted strings
+" - Update all syntaxes based on SAS 9.4
+" - Add complete SAS/GRAPH and SAS/STAT procedure syntaxes
+" - Add Proc TEMPLATE and GTL syntaxes
+" - Add complete DS2 syntaxes
+" - Add basic IML syntaxes
+" - Many other improvements and bug fixes
+" Drop support for VIM version < 600
+
+if version < 600
+  syntax clear
+elseif exists('b:current_syntax')
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case ignore
+
+" Basic SAS syntaxes
+syn keyword sasOperator and eq ge gt in le lt ne not of or
+syn keyword sasReserved _all_ _automatic_ _char_ _character_ _data_ _infile_ _last_ _n_ _name_ _null_ _num_ _numeric_ _temporary_ _user_ _webout_
+" Strings
+syn region sasString start=+'+ skip=+''+ end=+'+ contains=@Spell
+syn region sasString start=+"+ skip=+""+ end=+"+ contains=sasMacroVariable,@Spell
+" Constants
+syn match sasNumber /\v<\d+%(\.\d+)=%(>|e[\-+]=\d+>)/ display
+syn match sasDateTime /\v(['"])\d{2}%(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d{2}%(\d{2})=:\d{2}:\d{2}%(:\d{2})=%(am|pm)\1dt>/ display
+syn match sasDateTime /\v(['"])\d{2}%(jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\d{2}%(\d{2})=\1d>/ display
+syn match sasDateTime /\v(['"])\d{2}:\d{2}%(:\d{2})=%(am|pm)\1t>/ display
+" Comments
+syn keyword sasTodo todo tbd fixme contained
+syn region sasComment start='/\*' end='\*/' contains=sasTodo
+syn region sasComment start='\v%(^|;)\s*\zs\%=\*' end=';'me=s-1 contains=sasTodo
+syn region sasSectLbl matchgroup=sasSectLblEnds start='/\*\*\s*' end='\s*\*\*/' concealends
+" Macros
+syn match sasMacroVariable '\v\&+\w+%(\.\w+)=' display
+syn match sasMacroReserved '\v\%%(abort|by|copy|display|do|else|end|global|goto|if|include|input|let|list|local|macro|mend|put|return|run|symdel|syscall|sysexec|syslput|sysrput|then|to|until|window|while)>' display
+syn region sasMacroFunction matchgroup=sasMacroFunctionName start='\v\%\w+\ze\(' end=')'he=s-1 contains=@sasBasicSyntax,sasMacroFunction
+syn region sasMacroFunction matchgroup=sasMacroFunctionName start='\v\%q=sysfunc\ze\(' end=')'he=s-1 contains=@sasBasicSyntax,sasMacroFunction,sasDataStepFunction
+" Syntax cluster for basic SAS syntaxes
+syn cluster sasBasicSyntax contains=sasOperator,sasReserved,sasNumber,sasDateTime,sasString,sasComment,sasMacroReserved,sasMacroFunction,sasMacroVariable,sasSectLbl
+
+" Formats
+syn match sasFormat '\v\$\w+\.' display contained
+syn match sasFormat '\v<\w+\.%(\d+>)=' display contained
+syn region sasFormatContext start='.' end=';'me=s-1 contained contains=@sasBasicSyntax,sasFormat
+
+" Define global statements that can be accessed out of data step or procedures
+syn keyword sasGlobalStatementKeyword catname dm endsas filename footnote footnote1 footnote2 footnote3 footnote4 footnote5 footnote6 footnote7 footnote8 footnote9 footnote10 missing libname lock ods options page quit resetline run sasfile skip sysecho title title1 title2 title3 title4 title5 title6 title7 title8 title9 title10 contained
+syn keyword sasGlobalStatementODSKeyword chtml csvall docbook document escapechar epub epub2 epub3 exclude excel graphics html html3 html5 htmlcss imode listing markup output package path pcl pdf preferences phtml powerpoint printer proclabel proctitle ps results rtf select show tagsets trace usegopt verify wml contained
+syn match sasGlobalStatement '\v%(^|;)\s*\zs\h\w*>' display transparent contains=sasGlobalStatementKeyword
+syn match sasGlobalStatement '\v%(^|;)\s*\zsods>' display transparent contains=sasGlobalStatementKeyword nextgroup=sasGlobalStatementODSKeyword skipwhite skipnl skipempty
+
+" Data step statements, 9.4
+syn keyword sasDataStepFunctionName abs addr addrlong airy allcomb allperm anyalnum anyalpha anycntrl anydigit anyfirst anygraph anylower anyname anyprint anypunct anyspace anyupper anyxdigit arcos arcosh arsin arsinh artanh atan atan2 attrc attrn band beta betainv blackclprc blackptprc blkshclprc blkshptprc blshift bnot bor brshift bxor byte cat catq cats catt catx cdf ceil ceilz cexist char choosec choosen cinv close cmiss cnonct coalesce coalescec collate comb compare compbl compfuzz compged complev compound compress constant convx convxp cos cosh cot count countc countw csc css cumipmt cumprinc curobs cv daccdb daccdbsl daccsl daccsyd dacctab dairy datdif date datejul datepart datetime day dclose dcreate depdb depdbsl depsl depsyd deptab dequote deviance dhms dif digamma dim dinfo divide dnum dopen doptname doptnum dosubl dread dropnote dsname dsncatlgd dur durp effrate envlen erf erfc euclid exist exp fact fappend fclose fcol fcopy fdelete fetch fetchobs fexist fget fileexist filename fileref finance find findc findw finfo finv fipname fipnamel fipstate first floor floorz fmtinfo fnonct fnote fopen foptname foptnum fpoint fpos fput fread frewind frlen fsep fuzz fwrite gaminv gamma garkhclprc garkhptprc gcd geodist geomean geomeanz getoption getvarc getvarn graycode harmean harmeanz hbound hms holiday holidayck holidaycount holidayname holidaynx holidayny holidaytest hour htmldecode htmlencode ibessel ifc ifn index indexc indexw input inputc inputn int intcindex intck intcycle intfit intfmt intget intindex intnx intrr intseas intshift inttest intz iorcmsg ipmt iqr irr jbessel juldate juldate7 kurtosis lag largest lbound lcm lcomb left length lengthc lengthm lengthn lexcomb lexcombi lexperk lexperm lfact lgamma libname libref log log1px log10 log2 logbeta logcdf logistic logpdf logsdf lowcase lperm lpnorm mad margrclprc margrptprc max md5 mdy mean median min minute missing mod modexist module modulec modulen modz month mopen mort msplint mvalid contained
+syn keyword sasDataStepFunctionName n netpv nliteral nmiss nomrate normal notalnum notalpha notcntrl notdigit note notfirst notgraph notlower notname notprint notpunct notspace notupper notxdigit npv nvalid nwkdom open ordinal pathname pctl pdf peek peekc peekclong peeklong perm pmt point poisson ppmt probbeta probbnml probbnrm probchi probf probgam probhypr probit probmc probnegb probnorm probt propcase prxchange prxmatch prxparen prxparse prxposn ptrlongadd put putc putn pvp qtr quantile quote ranbin rancau rand ranexp rangam range rank rannor ranpoi rantbl rantri ranuni rename repeat resolve reverse rewind right rms round rounde roundz saving savings scan sdf sec second sha256 sha256hex sha256hmachex sign sin sinh skewness sleep smallest soapweb soapwebmeta soapwipservice soapwipsrs soapws soapwsmeta soundex spedis sqrt squantile std stderr stfips stname stnamel strip subpad substr substrn sum sumabs symexist symget symglobl symlocal sysexist sysget sysmsg sysparm sysprocessid sysprocessname sysprod sysrc system tan tanh time timepart timevalue tinv tnonct today translate transtrn tranwrd trigamma trim trimn trunc tso typeof tzoneid tzonename tzoneoff tzones2u tzoneu2s uniform upcase urldecode urlencode uss uuidgen var varfmt varinfmt varlabel varlen varname varnum varray varrayx vartype verify vformat vformatd vformatdx vformatn vformatnx vformatw vformatwx vformatx vinarray vinarrayx vinformat vinformatd vinformatdx vinformatn vinformatnx vinformatw vinformatwx vinformatx vlabel vlabelx vlength vlengthx vname vnamex vtype vtypex vvalue vvaluex week weekday whichc whichn wto year yieldp yrdif yyq zipcity zipcitydistance zipfips zipname zipnamel zipstate contained
+syn keyword sasDataStepCallRoutineName allcomb allcombi allperm cats catt catx compcost execute graycode is8601_convert label lexcomb lexcombi lexperk lexperm logistic missing module poke pokelong prxchange prxdebug prxfree prxnext prxposn prxsubstr ranbin rancau rancomb ranexp rangam rannor ranperk ranperm ranpoi rantbl rantri ranuni scan set sleep softmax sortc sortn stdize streaminit symput symputx system tanh tso vname vnext wto contained
+syn region sasDataStepFunctionContext start='(' end=')' contained contains=@sasBasicSyntax,sasDataStepFunction
+syn region sasDataStepFunctionFormatContext start='(' end=')' contained contains=@sasBasicSyntax,sasDataStepFunction,sasFormat
+syn match sasDataStepFunction '\v<\w+\ze\(' contained contains=sasDataStepFunctionName,sasDataStepCallRoutineName nextgroup=sasDataStepFunctionContext
+syn match sasDataStepFunction '\v%(input|put)\ze\(' contained contains=sasDataStepFunctionName nextgroup=sasDataStepFunctionFormatContext
+syn keyword sasDataStepHashMethodName add check clear definedata definedone definekey delete do_over equals find find_next find_prev first has_next has_prev last next output prev ref remove removedup replace replacedup reset_dup setcur sum sumdup contained
+syn region sasDataStepHashMethodContext start='(' end=')' contained contains=@sasBasicSyntax,sasDataStepFunction
+syn match sasDataStepHashMethod '\v\.\w+\ze\(' contained contains=sasDataStepHashMethodName nextgroup=sasDataStepHashMethodContext
+syn keyword sasDataStepHashAttributeName item_size num_items contained
+syn match sasDataStepHashAttribute '\v\.\w+>\ze\_[^(]' display contained contains=sasDataStepHashAttributeName
+syn keyword sasDataStepControl continue do end go goto if leave link otherwise over return select to until when while contained
+syn keyword sasDataStepControl else then contained nextgroup=sasDataStepStatementKeyword skipwhite skipnl skipempty
+syn keyword sasDataStepHashOperator _new_ contained
+syn keyword sasDataStepStatementKeyword abort array attrib by call cards cards4 datalines datalines4 dcl declare delete describe display drop error execute file format infile informat input keep label length lines lines4 list lostcard merge modify output put putlog redirect remove rename replace retain set stop update where window contained
+syn keyword sasDataStepStatementHashKeyword hash hiter javaobj contained
+syn match sasDataStepStatement '\v%(^|;)\s*\zs\h\w*>' display contained contains=sasDataStepStatementKeyword,sasGlobalStatementKeyword
+syn match sasDataStepStatement '\v%(^|;)\s*\zs%(dcl|declare)>' display contained contains=sasDataStepStatementKeyword nextgroup=sasDataStepStatementHashKeyword skipwhite skipnl skipempty
+syn match sasDataStepStatement '\v%(^|;)\s*\zsods>' display contained contains=sasGlobalStatementKeyword nextgroup=sasGlobalStatementODSKeyword skipwhite skipnl skipempty
+syn match sasDataStepStatement '\v%(^|;)\s*\zs%(format|informat|input|put)>' display contained contains=sasDataStepStatementKeyword nextgroup=sasFormatContext skipwhite skipnl skipempty
+syn match sasDataStepStatement '\v%(^|;)\s*\zs%(cards|datalines|lines)4=\s*;' display contained contains=sasDataStepStatementKeyword nextgroup=sasDataLine skipwhite skipnl skipempty
+syn region sasDataLine start='^' end='^\s*;'me=s-1 contained
+syn region sasDataStep matchgroup=sasSectionKeyword start='\v%(^|;)\s*\zsdata>' end='\v%(^|;)\s*%(run|data|proc|endsas)>'me=s-1 fold contains=@sasBasicSyntax,@sasDataStepSyntax
+syn cluster sasDataStepSyntax contains=sasDataStepFunction,sasDataStepHashOperator,sasDataStepHashAttribute,sasDataStepHashMethod,sasDataStepControl,sasDataStepStatement
+
+" Procedures, base SAS, 9.4
+syn keyword sasProcStatementKeyword abort age append array attrib audit block break by calid cdfplot change checkbox class classlev column compute contents copy create datarow dbencoding define delete deletefunc deletesubr delimiter device dialog dur endcomp exact exchange exclude explore fin fmtlib fontfile fontpath format formats freq function getnames guessingrows hbar hdfs histogram holidur holifin holistart holivar id idlabel informat inset invalue item key keylabel keyword label line link listfunc listsubr mapmiss mapreduce mean menu messages meta modify opentype outargs outdur outfin output outstart pageby partial picture pie pig plot ppplot printer probplot profile prompter qqplot radiobox ranks rbreak rbutton rebuild record remove rename repair report roptions save select selection separator source star start statistics struct submenu subroutine sum sumby table tables test text trantab truetype type1 types value var vbar ways weight where with write contained
+syn match sasProcStatement '\v%(^|;)\s*\zs\h\w*>' display contained contains=sasProcStatementKeyword,sasGlobalStatementKeyword
+syn match sasProcStatement '\v%(^|;)\s*\zsods>' display contained contains=sasGlobalStatementKeyword nextgroup=sasGlobalStatementODSKeyword skipwhite skipnl skipempty
+syn match sasProcStatement '\v%(^|;)\s*\zs%(format|informat)>' display contained contains=sasProcStatementKeyword nextgroup=sasFormatContext skipwhite skipnl skipempty
+syn region sasProc matchgroup=sasSectionKeyword start='\v%(^|;)\s*\zsproc%(\s+\h\w*)=>' end='\v%(^|;)\s*%(run|data|proc|endsas)>'me=s-1 fold contains=@sasBasicSyntax,sasDataStepFunction,sasProcStatement
+syn region sasProc matchgroup=sasSectionKeyword start='\v%(^|;)\s*\zsproc\s+%(catalog|chart|datasets|document|plot)>' end='\v%(^|;)\s*%(quit|data|proc|endsas)>'me=s-1 fold contains=@sasBasicSyntax,sasDataStepFunction,sasProcStatement
+
+" Procedures, SAS/GRAPH, 9.4
+syn keyword sasGraphProcStatementKeyword add area axis bar block bubble2 byline cc ccopy cdef cdelete chart cmap choro copy delete device dial donut exclude flow format fs goptions gout grid group hbar hbar3d hbullet hslider htrafficlight id igout label legend list modify move nobyline note pattern pie pie3d plot plot2 preview prism quit rename replay select scatter speedometer star surface symbol tc tcopy tdef tdelete template tile toggle treplay vbar vbar3d vtrafficlight vbullet vslider where contained
+syn match sasGraphProcStatement '\v%(^|;)\s*\zs\h\w*>' display contained contains=sasGraphProcStatementKeyword,sasGlobalStatementKeyword
+syn match sasGraphProcStatement '\v%(^|;)\s*\zsformat>' display contained contains=sasGraphProcStatementKeyword nextgroup=sasFormatContext skipwhite skipnl skipempty
+syn region sasGraphProc matchgroup=sasSectionKeyword start='\v%(^|;)\s*\zsproc\s+%(g3d|g3grid|ganno|gcontour|gdevice|geocode|gfont|ginside|goptions|gproject|greduce|gremove|mapimport)>' end='\v%(^|;)\s*%(run|data|proc|endsas)>'me=s-1 fold contains=@sasBasicSyntax,sasDataStepFunction,sasGraphProcStatement
+syn region sasGraphProc matchgroup=sasSectionKeyword start='\v%(^|;)\s*\zsproc\s+%(gareabar|gbarline|gchart|gkpi|gmap|gplot|gradar|greplay|gslide|gtile)>' end='\v%(^|;)\s*%(quit|data|proc|endsas)>'me=s-1 fold contains=@sasBasicSyntax,sasDataStepFunction,sasGraphProcStatement
+
+" Procedures, SAS/STAT, 14.1
+syn keyword sasAnalyticalProcStatementKeyword absorb add array assess baseline bayes beginnodata bivar bootstrap bounds by cdfplot cells class cluster code compute condition contrast control coordinates copy cosan cov covtest coxreg der design determ deviance direct directions domain effect effectplot effpart em endnodata equality estimate exact exactoptions factor factors fcs filter fitindex format freq fwdlink gender grid group grow hazardratio height hyperprior id impjoint inset insetgroup invar invlink ippplot lincon lineqs lismod lmtests location logistic loglin lpredplot lsmeans lsmestimate manova matings matrix mcmc mean means missmodel mnar model modelaverage modeleffects monotone mstruct mtest multreg name nlincon nloptions oddsratio onecorr onesamplefreq onesamplemeans onewayanova outfiles output paired pairedfreq pairedmeans parameters parent parms partial partition path pathdiagram pcov performance plot population poststrata power preddist predict predpplot priors process probmodel profile prune pvar ram random ratio reference refit refmodel renameparm repeated replicate repweights response restore restrict retain reweight ridge rmsstd roc roccontrast rules samplesize samplingunit seed size scale score selection show simtests simulate slice std stderr store strata structeq supplementary table tables test testclass testfreq testfunc testid time transform treatments trend twosamplefreq twosamplemeans towsamplesurvival twosamplewilcoxon uds units univar var variance varnames weight where with zeromodel contained
+syn match sasAnalyticalProcStatement '\v%(^|;)\s*\zs\h\w*>' display contained contains=sasAnalyticalProcStatementKeyword,sasGlobalStatementKeyword
+syn match sasAnalyticalProcStatement '\v%(^|;)\s*\zsods>' display contained contains=sasGlobalStatementKeyword nextgroup=sasGlobalStatementODSKeyword skipwhite skipnl skipempty
+syn match sasAnalyticalProcStatement '\v%(^|;)\s*\zsformat>' display contained contains=sasAnalyticalProcStatementKeyword nextgroup=sasFormatContext skipwhite skipnl skipempty
+syn region sasAnalyticalProc matchgroup=sasSectionKeyword start='\v%(^|;)\s*\zsproc\s+%(aceclus|adaptivereg|bchoice|boxplot|calis|cancorr|candisc|cluster|corresp|discrim|distance|factor|fastclus|fmm|freq|gam|gampl|gee|genmod|glimmix|glmmod|glmpower|glmselect|hpcandisc|hpfmm|hpgenselect|hplmixed|hplogistic|hpmixed|hpnlmod|hppls|hpprincomp|hpquantselect|hpreg|hpsplit|iclifetest|icphreg|inbreed|irt|kde|krige2d|lattice|lifereg|lifetest|loess|logistic|mcmc|mds|mi|mianalyze|mixed|modeclus|multtest|nested|nlin|nlmixed|npar1way|orthoreg|phreg|plm|pls|power|princomp|prinqual|probit|quantlife|quantreg|quantselect|robustreg|rsreg|score|seqdesign|seqtest|sim2d|simnormal|spp|stdize|stdrate|stepdisc|surveyfreq|surveyimpute|surveylogistic|surveymeans|surveyphreg|surveyreg|surveyselect|tpspline|transreg|tree|ttest|varclus|varcomp|variogram)>' end='\v%(^|;)\s*%(run|data|proc|endsas)>'me=s-1 fold contains=@sasBasicSyntax,sasDataStepControl,sasDataStepFunction,sasAnalyticalProcStatement
+syn region sasAnalyticalProc matchgroup=sasSectionKeyword start='\v%(^|;)\s*\zsproc\s+%(anova|arima|catmod|factex|glm|model|optex|plan|reg)>' end='\v%(^|;)\s*%(quit|data|proc|endsas)>'me=s-1 fold contains=@sasBasicSyntax,sasDataStepControl,sasDataStepFunction,sasAnalyticalProcStatement
+
+" Procedures, ODS graphics, 9.4
+syn keyword sasODSGraphicsProcStatementKeyword band block bubble by colaxis compare dattrvar density dot dropline dynamic ellipse ellipseparm format fringe gradlegend hbar hbarbasic hbarparm hbox heatmap heatmapparm highlow histogram hline inset keylegend label lineparm loess matrix needle parent panelby pbspline plot polygon refline reg rowaxis scatter series spline step style styleattrs symbolchar symbolimage text vbar vbarbasic vbarparm vbox vector vline waterfall where xaxis x2axis yaxis y2axis yaxistable contained
+syn match sasODSGraphicsProcStatement '\v%(^|;)\s*\zs\h\w*>' display contained contains=sasODSGraphicsProcStatementKeyword,sasGlobalStatementKeyword
+syn match sasODSGraphicsProcStatement '\v%(^|;)\s*\zsods>' display contained contains=sasGlobalStatementKeyword nextgroup=sasGlobalStatementODSKeyword skipwhite skipnl skipempty
+syn match sasODSGraphicsProcStatement '\v%(^|;)\s*\zsformat>' display contained contains=sasODSGraphicsProcStatementKeyword nextgroup=sasFormatContext skipwhite skipnl skipempty
+syn region sasODSGraphicsProc matchgroup=sasSectionKeyword start='\v%(^|;)\s*\zsproc\s+%(sgdesign|sgpanel|sgplot|sgrender|sgscatter)>' end='\v%(^|;)\s*%(run|data|proc|endsas)>'me=s-1 fold contains=@sasBasicSyntax,sasDataStepFunction,sasODSGraphicsProcStatement
+
+" Proc TEMPLATE, 9.4
+syn keyword sasProcTemplateClause as into
+syn keyword sasProcTemplateStatementKeyword block break cellstyle class close column compute continue define delete delstream do done dynamic edit else end eval flush footer header import iterate link list mvar ndent next nmvar notes open path put putl putlog putq putstream putvars replace set source stop style test text text2 text3 translate trigger unblock unset xdent contained
+syn keyword sasProcTemplateStatementComplexKeyword cellvalue column crosstabs event footer header statgraph style table tagset contained
+syn keyword sasProcTemplateGTLStatementKeyword axislegend axistable bandplot barchart barchartparm begingraph beginpolygon beginpolyline bihistogram3dparm blockplot boxplot boxplotparm bubbleplot continuouslegend contourplotparm dendrogram discretelegend drawarrow drawimage drawline drawoval drawrectangle drawtext dropline ellipse ellipseparm endgraph endinnermargin endlayout endpolygon endpolyline endsidebar entry entryfootnote entrytitle fringeplot heatmap heatmapparm highlowplot histogram histogramparm innermargin layout legenditem legendtextitems linechart lineparm loessplot mergedlegend modelband needleplot pbsplineplot polygonplot referenceline regressionplot scatterplot seriesplot sidebar stepplot surfaceplotparm symbolchar symbolimage textplot vectorplot waterfallchart contained
+syn keyword sasProcTemplateGTLComplexKeyword datalattice datapanel globallegend gridded lattice overlay overlayequated overlay3d region contained
+syn match sasProcTemplateStatement '\v%(^|;)\s*\zs\h\w*>' display contained contains=sasProcTemplateStatementKeyword,sasProcTemplateGTLStatementKeyword,sasGlobalStatementKeyword
+syn match sasProcTemplateStatement '\v%(^|;)\s*\zsdefine>' display contained contains=sasProcTemplateStatementKeyword nextgroup=sasProcTemplateStatementComplexKeyword skipwhite skipnl skipempty
+syn match sasProcTemplateStatement '\v%(^|;)\s*\zslayout>' display contained contains=sasProcTemplateGTLStatementKeyword nextgroup=sasProcTemplateGTLComplexKeyword skipwhite skipnl skipempty
+syn match sasProcTemplateStatement '\v%(^|;)\s*\zsods>' display contained contains=sasGlobalStatementKeyword nextgroup=sasGlobalStatementODSKeyword skipwhite skipnl skipempty
+syn region sasProcTemplate matchgroup=sasSectionKeyword start='\v%(^|;)\s*\zsproc\s+template>' end='\v%(^|;)\s*%(run|data|proc|endsas)>'me=s-1 fold contains=@sasBasicSyntax,sasProcTemplateClause,sasProcTemplateStatement
+
+" Proc SQL, 9.4
+syn keyword sasProcSQLFunctionName avg count css cv freq max mean median min n nmiss prt range std stderr sum sumwgt t uss var contained
+syn region sasProcSQLFunctionContext start='(' end=')' contained contains=@sasBasicSyntax,sasProcSQLFunction
+syn match sasProcSQLFunction '\v<\w+\ze\(' contained contains=sasProcSQLFunctionName,sasDataStepFunctionName nextgroup=sasProcSQLFunctionContext
+syn keyword sasProcSQLClause add asc between by calculated cascade case check connection constraint cross desc distinct drop else end escape except exists foreign from full group having in inner intersect into is join key left libname like modify natural newline notrim null on order outer primary references restrict right separated set then to trimmed union unique user using values when where contained
+syn keyword sasProcSQLClause as contained nextgroup=sasProcSQLStatementKeyword skipwhite skipnl skipempty
+syn keyword sasProcSQLStatementKeyword connect delete disconnect execute insert reset select update validate contained
+syn keyword sasProcSQLStatementComplexKeyword alter create describe drop contained nextgroup=sasProcSQLStatementNextKeyword skipwhite skipnl skipempty
+syn keyword sasProcSQLStatementNextKeyword index table view contained
+syn match sasProcSQLStatement '\v%(^|;)\s*\zs\h\w*>' display contained contains=sasProcSQLStatementKeyword,sasGlobalStatementKeyword
+syn match sasProcSQLStatement '\v%(^|;)\s*\zs%(alter|create|describe|drop)>' display contained contains=sasProcSQLStatementComplexKeyword nextgroup=sasProcSQLStatementNextKeyword skipwhite skipnl skipempty
+syn match sasProcSQLStatement '\v%(^|;)\s*\zsvalidate>' display contained contains=sasProcSQLStatementKeyword nextgroup=sasProcSQLStatementKeyword,sasProcSQLStatementComplexKeyword skipwhite skipnl skipempty
+syn match sasProcSQLStatement '\v%(^|;)\s*\zsods>' display contained contains=sasGlobalStatementKeyword nextgroup=sasGlobalStatementODSKeyword skipwhite skipnl skipempty 
+syn region sasProcSQL matchgroup=sasSectionKeyword start='\v%(^|;)\s*\zsproc\s+sql>' end='\v%(^|;)\s*%(quit|data|proc|endsas)>'me=s-1 fold contains=@sasBasicSyntax,sasProcSQLFunction,sasProcSQLClause,sasProcSQLStatement
+
+" SAS/DS2, 9.4
+syn keyword sasDS2FunctionName abs anyalnum anyalpha anycntrl anydigit anyfirst anygraph anylower anyname anyprint anypunct anyspace anyupper anyxdigit arcos arcosh arsin arsinh artanh atan atan2 band beta betainv blackclprc blackptprc blkshclprc blkshptprc blshift bnot bor brshift bxor byte cat cats catt catx ceil ceilz choosec choosen cmp cmpt coalesce coalescec comb compare compbl compfuzz compound compress constant convx convxp cos cosh count countc countw css cumipmt cumprinc cv datdif date datejul datepart datetime day dequote deviance dhms dif digamma dim divide dur durp effrate erf erfc exp fact find findc findw floor floorz fmtinfo fuzz gaminv gamma garkhclprc garkhptprc gcd geodist geomean geomeanz harmean harmeanz hbound hms holiday hour index indexc indexw inputc inputn int intcindex intck intcycle intdt intfit intget intindex intnest intnx intrr intseas intshift inttest intts intz ipmt iqr irr juldate juldate7 kcount kstrcat kstrip kupdate kupdates kurtosis lag largest lbound lcm left length lengthc lengthm lengthn lgamma log logbeta log10 log1px log2 lowcase mad margrclprc margrptprc max md5 mdy mean median min minute missing mod modz month mort n ndims netpv nmiss nomrate notalnum notalpha notcntrl notdigit notfirst notgraph notlower notname notprint notpunct notspace notupper notxdigit npv null nwkdom ordinal pctl perm pmt poisson power ppmt probbeta probbnml probbnrm probchi probdf probf probgam probhypr probit probmc probmed probnegb probnorm probt prxchange prxmatch prxparse prxposn put pvp qtr quote ranbin rancau rand ranexp rangam range rank rannor ranpoi rantbl rantri ranuni repeat reverse right rms round rounde roundz savings scan sec second sha256hex sha256hmachex sign sin sinh skewness sleep smallest sqlexec sqrt std stderr streaminit strip substr substrn sum sumabs tan tanh time timepart timevalue tinv to_date to_double to_time to_timestamp today translate transtrn tranwrd trigamma trim trimn trunc uniform upcase uss uuidgen var verify vformat vinarray vinformat vlabel vlength vname vtype week weekday whichc whichn year yieldp yrdif yyq contained
+syn region sasDS2FunctionContext start='(' end=')' contained contains=@sasBasicSyntax,sasDS2Function
+syn match sasDS2Function '\v<\w+\ze\(' contained contains=sasDS2FunctionName nextgroup=sasDS2FunctionContext
+syn keyword sasDS2Control continue data dcl declare do drop else end enddata endpackage endthread from go goto if leave method otherwise package point return select then thread to until when while contained
+syn keyword sasDS2StatementKeyword array by forward keep merge output put rename retain set stop vararray varlist contained
+syn keyword sasDS2StatementComplexKeyword package thread contained
+syn match sasDS2Statement '\v%(^|;)\s*\zs\h\w*>' display contained contains=sasDS2StatementKeyword,sasGlobalStatementKeyword
+syn match sasDS2Statement '\v%(^|;)\s*\zs%(dcl|declare|drop)>' display contained contains=sasDS2StatementKeyword nextgroup=sasDS2StatementComplexKeyword skipwhite skipnl skipempty
+syn match sasDS2Statement '\v%(^|;)\s*\zsods>' display contained contains=sasGlobalStatementKeyword nextgroup=sasGlobalStatementODSKeyword skipwhite skipnl skipempty
+syn region sasDS2 matchgroup=sasSectionKeyword start='\v%(^|;)\s*\zsproc\s+ds2>' end='\v%(^|;)\s*%(quit|data|proc|endsas)>'me=s-1 fold contains=@sasBasicSyntax,sasDS2Function,sasDS2Control,sasDS2Statement
+
+" SAS/IML, 14.1
+syn keyword sasIMLFunctionName abs all allcomb allperm any apply armasim bin blankstr block branks bspline btran byte char choose col colvec concat contents convexit corr corr2cov countmiss countn countunique cov cov2corr covlag cshape cusum cuprod cv cvexhull datasets design designf det diag dif dimension distance do duration echelon eigval eigvec element exp expmatrix expandgrid fft forward froot full gasetup geomean ginv hadamard half hankel harmean hdir hermite homogen i ifft insert int inv invupdt isempty isskipped j jroot kurtosis lag length loc log logabsdet mad magic mahalanobis max mean median min mod moduleic modulein name ncol ndx2sub nleng norm normal nrow num opscal orpol parentname palette polyroot prod product pv quartile rancomb randdirichlet randfun randmultinomial randmvt randnormal randwishart ranperk ranperm range rank ranktie rates ratio remove repeat root row rowcat rowcatc rowvec rsubstr sample setdif shape shapecol skewness solve sparse splinev spot sqrsym sqrt sqrvech ssq standard std storage sub2ndx substr sum sweep symsqr t toeplitz trace trisolv type uniform union unique uniqueby value var vecdiag vech xmult xsect yield contained
+syn keyword sasIMLCallRoutineName appcort armacov armalik bar box change comport delete eigen execute exportdatasettor exportmatrixtor farmacov farmafit farmalik farmasim fdif gaend gagetmem gagetval gainit gareeval garegen gasetcro gasetmut gasetobj gasetsel gblkvp gblkvpd gclose gdelete gdraw gdrawl geneig ggrid ginclude gopen gpie gpiexy gpoint gpoly gport gportpop gportstk gscale gscript gset gshow gsorth gstart gstop gstrlen gtext gvtext gwindow gxaxis gyaxis heatmapcont heatmapdisc histogram importdatasetfromr importmatrixfromr ipf itsolver kalcvf kalcvs kaldff kaldfs lav lcp lms lp lpsolve lts lupdt marg maxqform mcd milpsolve modulei mve nlpcg nlpdd nlpfdd nlpfea nlphqn nlplm nlpnms nlpnra nlpnrr nlpqn nlpqua nlptr ode odsgraph ortvec pgraf push qntl qr quad queue randgen randseed rdodt rupdt rename rupdt rzlind scatter seq seqscale seqshift seqscale seqshift series solvelin sort sortndx sound spline splinec svd tabulate tpspline tpsplnev tsbaysea tsdecomp tsmlocar tsmlomar tsmulmar tspears tspred tsroot tstvcar tsunimar valset varmacov varmalik varmasim vnormal vtsroot wavft wavget wavift wavprint wavthrsh contained
+syn region sasIMLFunctionContext start='(' end=')' contained contains=@sasBasicSyntax,sasIMLFunction
+syn match sasIMLFunction '\v<\w+\ze\(' contained contains=sasIMLFunctionName,sasDataStepFunction nextgroup=sasIMLFunctionContext
+syn keyword sasIMLControl abort by do else end finish goto if link pause quit resume return run start stop then to until while contained
+syn keyword sasIMLStatementKeyword append call close closefile create delete display edit file find force free index infile input list load mattrib print purge read remove replace reset save setin setout show sort store summary use window contained
+syn match sasIMLStatement '\v%(^|;)\s*\zs\h\w*>' display contained contains=sasIMLStatementKeyword,sasGlobalStatementKeyword
+syn match sasIMLStatement '\v%(^|;)\s*\zsods>' display contained contains=sasGlobalStatementKeyword nextgroup=sasGlobalStatementODSKeyword skipwhite skipnl skipempty
+syn region sasIML matchgroup=sasSectionKeyword start='\v%(^|;)\s*\zsproc\s+iml>' end='\v%(^|;)\s*%(quit|data|proc|endsas)>'me=s-1 fold contains=@sasBasicSyntax,sasIMLFunction,sasIMLControl,sasIMLStatement
+
+" Macro definition
+syn region sasMacro start='\v\%macro>' end='\v\%mend>' fold keepend contains=@sasBasicSyntax,@sasDataStepSyntax,sasDataStep,sasProc,sasODSGraphicsProc,sasGraphProc,sasAnalyticalProc,sasProcTemplate,sasProcSQL,sasDS2,sasIML
+
+" Define default highlighting
+hi def link sasComment Comment
+hi def link sasTodo Delimiter
+hi def link sasSectLbl Title
+hi def link sasSectLblEnds Comment
+hi def link sasNumber Number
+hi def link sasDateTime Constant
+hi def link sasString String
+hi def link sasDataStepControl Keyword
+hi def link sasProcTemplateClause Keyword
+hi def link sasProcSQLClause Keyword
+hi def link sasDS2Control Keyword
+hi def link sasIMLControl Keyword
+hi def link sasOperator Operator
+hi def link sasGlobalStatementKeyword Statement
+hi def link sasGlobalStatementODSKeyword Statement
+hi def link sasSectionKeyword Statement
+hi def link sasDataStepFunctionName Function
+hi def link sasDataStepCallRoutineName Function
+hi def link sasDataStepStatementKeyword Statement
+hi def link sasDataStepStatementHashKeyword Statement
+hi def link sasDataStepHashOperator Operator
+hi def link sasDataStepHashMethodName Function
+hi def link sasDataStepHashAttributeName Identifier
+hi def link sasProcStatementKeyword Statement
+hi def link sasODSGraphicsProcStatementKeyword Statement
+hi def link sasGraphProcStatementKeyword Statement
+hi def link sasAnalyticalProcStatementKeyword Statement
+hi def link sasProcTemplateStatementKeyword Statement
+hi def link sasProcTemplateStatementComplexKeyword Statement
+hi def link sasProcTemplateGTLStatementKeyword Statement
+hi def link sasProcTemplateGTLComplexKeyword Statement
+hi def link sasProcSQLFunctionName Function
+hi def link sasProcSQLStatementKeyword Statement
+hi def link sasProcSQLStatementComplexKeyword Statement
+hi def link sasProcSQLStatementNextKeyword Statement
+hi def link sasDS2FunctionName Function
+hi def link sasDS2StatementKeyword Statement
+hi def link sasIMLFunctionName Function
+hi def link sasIMLCallRoutineName Function
+hi def link sasIMLStatementKeyword Statement
+hi def link sasMacroReserved PreProc
+hi def link sasMacroVariable Define
+hi def link sasMacroFunctionName Define
+hi def link sasDataLine SpecialChar
+hi def link sasFormat SpecialChar
+hi def link sasReserved Special
+
+" Syncronize from beginning to keep large blocks from losing
+" syntax coloring while moving through code.
+syn sync fromstart
+
+let b:current_syntax = "sas"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/sass.vim b/syntax/sass.vim
new file mode 100644
index 000000000..4a49026fd
--- /dev/null
+++ b/syntax/sass.vim
@@ -0,0 +1,109 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
+
+" Vim syntax file
+" Language:	Sass
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Filenames:	*.sass
+" Last Change:	2019 Dec 05
+
+if exists("b:current_syntax")
+  finish
+endif
+
+runtime! syntax/css.vim
+
+syn case ignore
+
+syn cluster sassCssProperties contains=cssFontProp,cssFontDescriptorProp,cssColorProp,cssTextProp,cssBoxProp,cssGeneratedContentProp,cssPagingProp,cssUIProp,cssRenderProp,cssAuralProp,cssTableProp
+syn cluster sassCssAttributes contains=css.*Attr,sassEndOfLineComment,scssComment,cssValue.*,cssColor,cssURL,sassDefault,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssRenderProp
+
+syn region sassDefinition matchgroup=cssBraces start="{" end="}" contains=TOP
+
+syn match sassProperty "\%([{};]\s*\|^\)\@<=\%([[:alnum:]-]\|#{[^{}]*}\)\+\s*:" contains=css.*Prop skipwhite nextgroup=sassCssAttribute contained containedin=sassDefinition
+syn match sassProperty "^\s*\zs\s\%(\%([[:alnum:]-]\|#{[^{}]*}\)\+\s*:\|:[[:alnum:]-]\+\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassCssAttribute
+syn match sassProperty "^\s*\zs\s\%(:\=[[:alnum:]-]\+\s*=\)"hs=s+1 contains=css.*Prop skipwhite nextgroup=sassCssAttribute
+syn match sassCssAttribute +\%("\%([^"]\|\\"\)*"\|'\%([^']\|\\'\)*'\|#{[^{}]*}\|[^{};]\)*+ contained contains=@sassCssAttributes,sassVariable,sassFunction,sassInterpolation
+syn match sassFlag "!\%(default\|global\|optional\)\>" contained
+syn match sassVariable "$[[:alnum:]_-]\+"
+syn match sassVariableAssignment "\%([!$][[:alnum:]_-]\+\s*\)\@<=\%(||\)\==" nextgroup=sassCssAttribute skipwhite
+syn match sassVariableAssignment "\%([!$][[:alnum:]_-]\+\s*\)\@<=:" nextgroup=sassCssAttribute skipwhite
+
+syn match sassFunction "\<\%(rgb\|rgba\|red\|green\|blue\|mix\)\>(\@=" contained
+syn match sassFunction "\<\%(hsl\|hsla\|hue\|saturation\|lightness\|adjust-hue\|lighten\|darken\|saturate\|desaturate\|grayscale\|complement\)\>(\@=" contained
+syn match sassFunction "\<\%(alpha\|opacity\|rgba\|opacify\|fade-in\|transparentize\|fade-out\)\>(\@=" contained
+syn match sassFunction "\<\%(unquote\|quote\)\>(\@=" contained
+syn match sassFunction "\<\%(percentage\|round\|ceil\|floor\|abs\)\>(\@=" contained
+syn match sassFunction "\<\%(type-of\|unit\|unitless\|comparable\)\>(\@=" contained
+
+syn region sassInterpolation matchgroup=sassInterpolationDelimiter start="#{" end="}" contains=@sassCssAttributes,sassVariable,sassFunction containedin=cssStringQ,cssStringQQ,cssPseudoClass,sassProperty
+
+syn match sassMixinName "[[:alnum:]_-]\+" contained nextgroup=sassCssAttribute
+syn match sassMixin  "^="               nextgroup=sassMixinName skipwhite
+syn match sassMixin  "\%([{};]\s*\|^\s*\)\@<=@mixin"   nextgroup=sassMixinName skipwhite
+syn match sassMixing "^\s\+\zs+"        nextgroup=sassMixinName
+syn match sassMixing "\%([{};]\s*\|^\s*\)\@<=@include" nextgroup=sassMixinName skipwhite
+syn match sassExtend "\%([{};]\s*\|^\s*\)\@<=@extend"
+
+syn match sassFunctionName "[[:alnum:]_-]\+" contained nextgroup=sassCssAttribute
+syn match sassFunctionDecl "\%([{};]\s*\|^\s*\)\@<=@function"   nextgroup=sassFunctionName skipwhite
+syn match sassReturn "\%([{};]\s*\|^\s*\)\@<=@return"
+
+syn match sassEscape     "^\s*\zs\\"
+syn match sassIdChar     "#[[:alnum:]_-]\@=" nextgroup=sassId
+syn match sassId         "[[:alnum:]_-]\+" contained
+syn match sassClassChar  "\.[[:alnum:]_-]\@=" nextgroup=sassClass
+syn match sassPlaceholder "\%([{};]\s*\|^\s*\)\@<=%"   nextgroup=sassClass
+syn match sassClass      "[[:alnum:]_-]\+" contained
+syn match sassAmpersand  "&"
+
+" TODO: Attribute namespaces
+" TODO: Arithmetic (including strings and concatenation)
+
+syn region sassMediaQuery matchgroup=sassMedia start="@media" end="[{};]\@=\|$" contains=sassMediaOperators
+syn keyword sassMediaOperators and not only contained
+syn region sassCharset start="@charset" end=";\|$" contains=scssComment,cssStringQ,cssStringQQ,cssURL,cssUnicodeEscape,cssMediaType
+syn region sassInclude start="@import" end=";\|$" contains=scssComment,cssStringQ,cssStringQQ,cssURL,cssUnicodeEscape,cssMediaType
+syn region sassDebugLine end=";\|$" matchgroup=sassDebug start="@debug\>" contains=@sassCssAttributes,sassVariable,sassFunction
+syn region sassWarnLine end=";\|$" matchgroup=sassWarn start="@warn\>" contains=@sassCssAttributes,sassVariable,sassFunction
+syn region sassControlLine matchgroup=sassControl start="@\%(if\|else\%(\s\+if\)\=\|while\|for\|each\)\>" end="[{};]\@=\|$" contains=sassFor,@sassCssAttributes,sassVariable,sassFunction
+syn keyword sassFor from to through in contained
+
+syn keyword sassTodo        FIXME NOTE TODO OPTIMIZE XXX contained
+syn region  sassComment     start="^\z(\s*\)//"  end="^\%(\z1 \)\@!" contains=sassTodo,@Spell
+syn region  sassCssComment  start="^\z(\s*\)/\*" end="^\%(\z1 \)\@!" contains=sassTodo,@Spell
+syn match   sassEndOfLineComment "//.*" contains=sassComment,sassTodo,@Spell
+
+hi def link sassEndOfLineComment        sassComment
+hi def link sassCssComment              sassComment
+hi def link sassComment                 Comment
+hi def link sassFlag                    cssImportant
+hi def link sassVariable                Identifier
+hi def link sassFunction                Function
+hi def link sassMixing                  PreProc
+hi def link sassMixin                   PreProc
+hi def link sassPlaceholder             sassClassChar
+hi def link sassExtend                  PreProc
+hi def link sassFunctionDecl            PreProc
+hi def link sassReturn                  PreProc
+hi def link sassTodo                    Todo
+hi def link sassCharset                 PreProc
+hi def link sassMedia                   PreProc
+hi def link sassMediaOperators          PreProc
+hi def link sassInclude                 Include
+hi def link sassDebug                   sassControl
+hi def link sassWarn                    sassControl
+hi def link sassControl                 PreProc
+hi def link sassFor                     PreProc
+hi def link sassEscape                  Special
+hi def link sassIdChar                  Special
+hi def link sassClassChar               Special
+hi def link sassInterpolationDelimiter  Delimiter
+hi def link sassAmpersand               Character
+hi def link sassId                      Identifier
+hi def link sassClass                   Type
+
+let b:current_syntax = "sass"
+
+" vim:set sw=2:
+
+endif
diff --git a/syntax/sather.vim b/syntax/sather.vim
new file mode 100644
index 000000000..9c3d4504b
--- /dev/null
+++ b/syntax/sather.vim
@@ -0,0 +1,96 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sather') == -1
+
+" Vim syntax file
+" Language:	Sather/pSather
+" Maintainer:	Claudio Fleiner <claudio@fleiner.com>
+" URL:		http://www.fleiner.com/vim/syntax/sather.vim
+" Last Change:	2003 May 11
+
+" Sather is a OO-language developped at the International Computer Science
+" Institute (ICSI) in Berkeley, CA. pSather is a parallel extension to Sather.
+" Homepage: http://www.icsi.berkeley.edu/~sather
+" Sather files use .sa as suffix
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" keyword definitions
+syn keyword satherExternal	 extern
+syn keyword satherBranch	 break continue
+syn keyword satherLabel		 when then
+syn keyword satherConditional	 if else elsif end case typecase assert with
+syn match satherConditional	 "near$"
+syn match satherConditional	 "far$"
+syn match satherConditional	 "near *[^(]"he=e-1
+syn match satherConditional	 "far *[^(]"he=e-1
+syn keyword satherSynchronize	 lock guard sync
+syn keyword satherRepeat	 loop parloop do
+syn match satherRepeat		 "while!"
+syn match satherRepeat		 "break!"
+syn match satherRepeat		 "until!"
+syn keyword satherBoolValue	 true false
+syn keyword satherValue		 self here cluster
+syn keyword satherOperator	 new "== != & ^ | && ||
+syn keyword satherOperator	 and or not
+syn match satherOperator	 "[#!]"
+syn match satherOperator	 ":-"
+syn keyword satherType		 void attr where
+syn match satherType	       "near *("he=e-1
+syn match satherType	       "far *("he=e-1
+syn keyword satherStatement	 return
+syn keyword satherStorageClass	 static const
+syn keyword satherExceptions	 try raise catch
+syn keyword satherMethodDecl	 is pre post
+syn keyword satherClassDecl	 abstract value class include
+syn keyword satherScopeDecl	 public private readonly
+
+
+syn match   satherSpecial	    contained "\\\d\d\d\|\\."
+syn region  satherString	    start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=satherSpecial
+syn match   satherCharacter	    "'[^\\]'"
+syn match   satherSpecialCharacter  "'\\.'"
+syn match   satherNumber	  "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
+syn match   satherCommentSkip	  contained "^\s*\*\($\|\s\+\)"
+syn region  satherComment2String  contained start=+"+  skip=+\\\\\|\\"+  end=+$\|"+  contains=satherSpecial
+syn match   satherComment	  "--.*" contains=satherComment2String,satherCharacter,satherNumber
+
+
+syn sync ccomment satherComment
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link satherBranch		satherStatement
+hi def link satherLabel		satherStatement
+hi def link satherConditional	satherStatement
+hi def link satherSynchronize	satherStatement
+hi def link satherRepeat		satherStatement
+hi def link satherExceptions	satherStatement
+hi def link satherStorageClass	satherDeclarative
+hi def link satherMethodDecl	satherDeclarative
+hi def link satherClassDecl	satherDeclarative
+hi def link satherScopeDecl	satherDeclarative
+hi def link satherBoolValue	satherValue
+hi def link satherSpecial		satherValue
+hi def link satherString		satherValue
+hi def link satherCharacter	satherValue
+hi def link satherSpecialCharacter satherValue
+hi def link satherNumber		satherValue
+hi def link satherStatement	Statement
+hi def link satherOperator		Statement
+hi def link satherComment		Comment
+hi def link satherType		Type
+hi def link satherValue		String
+hi def link satherString		String
+hi def link satherSpecial		String
+hi def link satherCharacter	String
+hi def link satherDeclarative	Type
+hi def link satherExternal		PreCondit
+
+let b:current_syntax = "sather"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/scheme.vim b/syntax/scheme.vim
new file mode 100644
index 000000000..c8430939b
--- /dev/null
+++ b/syntax/scheme.vim
@@ -0,0 +1,468 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scheme') == -1
+
+" Vim syntax file
+" Language: Scheme (R7RS)
+" Last Change: 2018-01-06
+" Author: Evan Hanson <evhan@foldling.org>
+" Maintainer: Evan Hanson <evhan@foldling.org>
+" Previous Author: Dirk van Deun <dirk@igwe.vub.ac.be>
+" Previous Maintainer: Sergey Khorev <sergey.khorev@gmail.com>
+" URL: https://foldling.org/vim/syntax/scheme.vim
+
+if exists('b:current_syntax')
+  finish
+endif
+
+let s:cpo = &cpo
+set cpo&vim
+
+syn match schemeParentheses "[^ '`\t\n()\[\]";]\+"
+syn match schemeParentheses "[)\]]"
+
+syn match schemeIdentifier /[^ '`\t\n()\[\]"|;][^ '`\t\n()\[\]"|;]*/
+
+syn region schemeQuote matchgroup=schemeData start=/'[`']*/ end=/[ \t\n()\[\]";]/me=e-1
+syn region schemeQuote matchgroup=schemeData start=/'['`]*"/ skip=/\\[\\"]/ end=/"/
+syn region schemeQuote matchgroup=schemeData start=/'['`]*|/ skip=/\\[\\|]/ end=/|/
+syn region schemeQuote matchgroup=schemeData start=/'['`]*#\?(/ end=/)/ contains=ALLBUT,schemeQuasiquote,schemeQuasiquoteForm,schemeUnquote,schemeForm,schemeDatumCommentForm,schemeImport,@schemeImportCluster,@schemeSyntaxCluster
+
+syn region schemeQuasiquote matchgroup=schemeData start=/`['`]*/ end=/[ \t\n()\[\]";]/me=e-1
+syn region schemeQuasiquote matchgroup=schemeData start=/`['`]*#\?(/ end=/)/ contains=ALLBUT,schemeQuote,schemeQuoteForm,schemeForm,schemeDatumCommentForm,schemeImport,@schemeImportCluster,@schemeSyntaxCluster
+
+syn region schemeUnquote matchgroup=schemeParentheses start=/,/ end=/[ `'\t\n\[\]()";]/me=e-1 contained contains=ALLBUT,schemeDatumCommentForm,@schemeImportCluster
+syn region schemeUnquote matchgroup=schemeParentheses start=/,@/ end=/[ `'\t\n\[\]()";]/me=e-1 contained contains=ALLBUT,schemeDatumCommentForm,@schemeImportCluster
+syn region schemeUnquote matchgroup=schemeParentheses start=/,(/ end=/)/ contained contains=ALLBUT,schemeDatumCommentForm,@schemeImportCluster
+syn region schemeUnquote matchgroup=schemeParentheses start=/,@(/ end=/)/ contained contains=ALLBUT,schemeDatumCommentForm,@schemeImportCluster
+
+syn region schemeQuoteForm matchgroup=schemeData start=/(/ end=/)/ contained contains=ALLBUT,schemeQuasiquote,schemeQuasiquoteForm,schemeUnquote,schemeForm,schemeDatumCommentForm,schemeImport,@schemeImportCluster,@schemeSyntaxCluster
+syn region schemeQuasiquoteForm matchgroup=schemeData start=/(/ end=/)/ contained contains=ALLBUT,schemeQuote,schemeForm,schemeDatumCommentForm,schemeImport,@schemeImportCluster,@schemeSyntaxCluster
+
+syn region schemeString start=/\(\\\)\@<!"/ skip=/\\[\\"]/ end=/"/
+syn region schemeSymbol start=/\(\\\)\@<!|/ skip=/\\[\\|]/ end=/|/
+
+syn match schemeNumber /\(#[dbeio]\)*[+\-]*\([0-9]\+\|inf.0\|nan.0\)\(\/\|\.\)\?[0-9+\-@\ilns]*\>/
+syn match schemeNumber /#x[+\-]*[0-9a-fA-F]\+\>/
+
+syn match schemeBoolean /#t\(rue\)\?/
+syn match schemeBoolean /#f\(alse\)\?/
+
+syn match schemeCharacter /#\\.[^ `'\t\n\[\]()]*/
+syn match schemeCharacter /#\\x[0-9a-fA-F]\+/
+
+syn match schemeComment /;.*$/
+
+syn region schemeMultilineComment start=/#|/ end=/|#/ contains=schemeMultilineComment
+
+syn region schemeForm matchgroup=schemeParentheses start="(" end=")" contains=ALLBUT,schemeUnquote,schemeDatumCommentForm,@schemeImportCluster
+syn region schemeForm matchgroup=schemeParentheses start="\[" end="\]" contains=ALLBUT,schemeUnquote,schemeDatumCommentForm,@schemeImportCluster
+
+syn region schemeVector matchgroup=schemeData start="#(" end=")" contains=ALLBUT,schemeQuasiquote,schemeQuasiquoteForm,schemeUnquote,schemeForm,schemeDatumCommentForm,schemeImport,@schemeImportCluster,@schemeSyntaxCluster
+syn region schemeVector matchgroup=schemeData start="#[fsu]\d\+(" end=")" contains=schemeNumber,schemeComment,schemeDatumComment
+
+if exists('g:is_chicken') || exists('b:is_chicken')
+  syn region schemeImport matchgroup=schemeImport start="\(([ \t\n]*\)\@<=\(import\|import-syntax\|use\|require-extension\)\(-for-syntax\)\?\>" end=")"me=e-1 contained contains=schemeImportForm,schemeIdentifier,schemeComment,schemeDatumComment
+else
+  syn region schemeImport matchgroup=schemeImport start="\(([ \t\n]*\)\@<=\(import\)\>" end=")"me=e-1 contained contains=schemeImportForm,schemeIdentifier,schemeComment,schemeDatumComment
+endif
+
+syn match   schemeImportKeyword "\(([ \t\n]*\)\@<=\(except\|only\|prefix\|rename\|srfi\)\>"
+syn region  schemeImportForm matchgroup=schemeParentheses start="(" end=")" contained contains=schemeIdentifier,schemeComment,schemeDatumComment,@schemeImportCluster
+syn cluster schemeImportCluster contains=schemeImportForm,schemeImportKeyword
+
+syn region schemeDatumComment matchgroup=schemeDatumComment start=/#;[ \t\n`']*/ end=/[ \t\n()\[\]";]/me=e-1
+syn region schemeDatumComment matchgroup=schemeDatumComment start=/#;[ \t\n`']*"/ skip=/\\[\\"]/ end=/"/
+syn region schemeDatumComment matchgroup=schemeDatumComment start=/#;[ \t\n`']*|/ skip=/\\[\\|]/ end=/|/
+syn region schemeDatumComment matchgroup=schemeDatumComment start=/#;[ \t\n`']*\(#\([usf]\d\+\)\?\)\?(/ end=/)/ contains=schemeDatumCommentForm
+syn region schemeDatumCommentForm start="(" end=")" contained contains=schemeDatumCommentForm
+
+syn cluster schemeSyntaxCluster contains=schemeFunction,schemeKeyword,schemeSyntax,schemeExtraSyntax,schemeLibrarySyntax,schemeSyntaxSyntax
+
+syn keyword schemeLibrarySyntax define-library
+syn keyword schemeLibrarySyntax export
+syn keyword schemeLibrarySyntax include
+syn keyword schemeLibrarySyntax include-ci
+syn keyword schemeLibrarySyntax include-library-declarations
+syn keyword schemeLibrarySyntax library
+syn keyword schemeLibrarySyntax cond-expand
+
+syn keyword schemeSyntaxSyntax define-syntax
+syn keyword schemeSyntaxSyntax let-syntax
+syn keyword schemeSyntaxSyntax letrec-syntax
+syn keyword schemeSyntaxSyntax syntax-rules
+
+syn keyword schemeSyntax =>
+syn keyword schemeSyntax and
+syn keyword schemeSyntax begin
+syn keyword schemeSyntax case
+syn keyword schemeSyntax case-lambda
+syn keyword schemeSyntax cond
+syn keyword schemeSyntax define
+syn keyword schemeSyntax define-record-type
+syn keyword schemeSyntax define-values
+syn keyword schemeSyntax delay
+syn keyword schemeSyntax delay-force
+syn keyword schemeSyntax do
+syn keyword schemeSyntax else
+syn keyword schemeSyntax guard
+syn keyword schemeSyntax if
+syn keyword schemeSyntax lambda
+syn keyword schemeSyntax let
+syn keyword schemeSyntax let*
+syn keyword schemeSyntax let*-values
+syn keyword schemeSyntax let-values
+syn keyword schemeSyntax letrec
+syn keyword schemeSyntax letrec*
+syn keyword schemeSyntax or
+syn keyword schemeSyntax parameterize
+syn keyword schemeSyntax quasiquote
+syn keyword schemeSyntax quote
+syn keyword schemeSyntax set!
+syn keyword schemeSyntax unless
+syn keyword schemeSyntax unquote
+syn keyword schemeSyntax unquote-splicing
+syn keyword schemeSyntax when
+
+syn keyword schemeFunction *
+syn keyword schemeFunction +
+syn keyword schemeFunction -
+syn keyword schemeFunction /
+syn keyword schemeFunction <
+syn keyword schemeFunction <=
+syn keyword schemeFunction =
+syn keyword schemeFunction >
+syn keyword schemeFunction >=
+syn keyword schemeFunction abs
+syn keyword schemeFunction acos
+syn keyword schemeFunction acos
+syn keyword schemeFunction angle
+syn keyword schemeFunction append
+syn keyword schemeFunction apply
+syn keyword schemeFunction asin
+syn keyword schemeFunction assoc
+syn keyword schemeFunction assq
+syn keyword schemeFunction assv
+syn keyword schemeFunction atan
+syn keyword schemeFunction binary-port?
+syn keyword schemeFunction boolean=?
+syn keyword schemeFunction boolean?
+syn keyword schemeFunction bytevector
+syn keyword schemeFunction bytevector-append
+syn keyword schemeFunction bytevector-append
+syn keyword schemeFunction bytevector-copy
+syn keyword schemeFunction bytevector-copy!
+syn keyword schemeFunction bytevector-length
+syn keyword schemeFunction bytevector-u8-ref
+syn keyword schemeFunction bytevector-u8-set!
+syn keyword schemeFunction bytevector?
+syn keyword schemeFunction caaaar
+syn keyword schemeFunction caaadr
+syn keyword schemeFunction caaar
+syn keyword schemeFunction caadar
+syn keyword schemeFunction caaddr
+syn keyword schemeFunction caadr
+syn keyword schemeFunction caar
+syn keyword schemeFunction cadaar
+syn keyword schemeFunction cadadr
+syn keyword schemeFunction cadar
+syn keyword schemeFunction caddar
+syn keyword schemeFunction cadddr
+syn keyword schemeFunction caddr
+syn keyword schemeFunction cadr
+syn keyword schemeFunction call-with-current-continuation
+syn keyword schemeFunction call-with-input-file
+syn keyword schemeFunction call-with-output-file
+syn keyword schemeFunction call-with-port
+syn keyword schemeFunction call-with-values
+syn keyword schemeFunction call/cc
+syn keyword schemeFunction car
+syn keyword schemeFunction cdaaar
+syn keyword schemeFunction cdaadr
+syn keyword schemeFunction cdaar
+syn keyword schemeFunction cdadar
+syn keyword schemeFunction cdaddr
+syn keyword schemeFunction cdadr
+syn keyword schemeFunction cdar
+syn keyword schemeFunction cddaar
+syn keyword schemeFunction cddadr
+syn keyword schemeFunction cddar
+syn keyword schemeFunction cdddar
+syn keyword schemeFunction cddddr
+syn keyword schemeFunction cdddr
+syn keyword schemeFunction cddr
+syn keyword schemeFunction cdr
+syn keyword schemeFunction ceiling
+syn keyword schemeFunction char->integer
+syn keyword schemeFunction char-alphabetic?
+syn keyword schemeFunction char-ci<=?
+syn keyword schemeFunction char-ci<?
+syn keyword schemeFunction char-ci=?
+syn keyword schemeFunction char-ci>=?
+syn keyword schemeFunction char-ci>?
+syn keyword schemeFunction char-downcase
+syn keyword schemeFunction char-foldcase
+syn keyword schemeFunction char-lower-case?
+syn keyword schemeFunction char-numeric?
+syn keyword schemeFunction char-ready?
+syn keyword schemeFunction char-upcase
+syn keyword schemeFunction char-upper-case?
+syn keyword schemeFunction char-whitespace?
+syn keyword schemeFunction char<=?
+syn keyword schemeFunction char<?
+syn keyword schemeFunction char=?
+syn keyword schemeFunction char>=?
+syn keyword schemeFunction char>?
+syn keyword schemeFunction char?
+syn keyword schemeFunction close-input-port
+syn keyword schemeFunction close-output-port
+syn keyword schemeFunction close-port
+syn keyword schemeFunction command-line
+syn keyword schemeFunction complex?
+syn keyword schemeFunction cons
+syn keyword schemeFunction cos
+syn keyword schemeFunction current-error-port
+syn keyword schemeFunction current-input-port
+syn keyword schemeFunction current-jiffy
+syn keyword schemeFunction current-output-port
+syn keyword schemeFunction current-second
+syn keyword schemeFunction delete-file
+syn keyword schemeFunction denominator
+syn keyword schemeFunction digit-value
+syn keyword schemeFunction display
+syn keyword schemeFunction dynamic-wind
+syn keyword schemeFunction emergency-exit
+syn keyword schemeFunction environment
+syn keyword schemeFunction eof-object
+syn keyword schemeFunction eof-object?
+syn keyword schemeFunction eq?
+syn keyword schemeFunction equal?
+syn keyword schemeFunction eqv?
+syn keyword schemeFunction error
+syn keyword schemeFunction error-object-irritants
+syn keyword schemeFunction error-object-message
+syn keyword schemeFunction error-object?
+syn keyword schemeFunction eval
+syn keyword schemeFunction even?
+syn keyword schemeFunction exact
+syn keyword schemeFunction exact->inexact
+syn keyword schemeFunction exact-integer-sqrt
+syn keyword schemeFunction exact-integer?
+syn keyword schemeFunction exact?
+syn keyword schemeFunction exit
+syn keyword schemeFunction exp
+syn keyword schemeFunction expt
+syn keyword schemeFunction features
+syn keyword schemeFunction file-error?
+syn keyword schemeFunction file-exists?
+syn keyword schemeFunction finite?
+syn keyword schemeFunction floor
+syn keyword schemeFunction floor-quotient
+syn keyword schemeFunction floor-remainder
+syn keyword schemeFunction floor/
+syn keyword schemeFunction flush-output-port
+syn keyword schemeFunction for-each
+syn keyword schemeFunction force
+syn keyword schemeFunction gcd
+syn keyword schemeFunction get-environment-variable
+syn keyword schemeFunction get-environment-variables
+syn keyword schemeFunction get-output-bytevector
+syn keyword schemeFunction get-output-string
+syn keyword schemeFunction imag-part
+syn keyword schemeFunction inexact
+syn keyword schemeFunction inexact->exact
+syn keyword schemeFunction inexact?
+syn keyword schemeFunction infinite?
+syn keyword schemeFunction input-port-open?
+syn keyword schemeFunction input-port?
+syn keyword schemeFunction integer->char
+syn keyword schemeFunction integer?
+syn keyword schemeFunction interaction-environment
+syn keyword schemeFunction jiffies-per-second
+syn keyword schemeFunction lcm
+syn keyword schemeFunction length
+syn keyword schemeFunction list
+syn keyword schemeFunction list->string
+syn keyword schemeFunction list->vector
+syn keyword schemeFunction list-copy
+syn keyword schemeFunction list-ref
+syn keyword schemeFunction list-set!
+syn keyword schemeFunction list-tail
+syn keyword schemeFunction list?
+syn keyword schemeFunction load
+syn keyword schemeFunction log
+syn keyword schemeFunction magnitude
+syn keyword schemeFunction make-bytevector
+syn keyword schemeFunction make-list
+syn keyword schemeFunction make-parameter
+syn keyword schemeFunction make-polar
+syn keyword schemeFunction make-promise
+syn keyword schemeFunction make-rectangular
+syn keyword schemeFunction make-string
+syn keyword schemeFunction make-vector
+syn keyword schemeFunction map
+syn keyword schemeFunction max
+syn keyword schemeFunction member
+syn keyword schemeFunction memq
+syn keyword schemeFunction memv
+syn keyword schemeFunction min
+syn keyword schemeFunction modulo
+syn keyword schemeFunction nan?
+syn keyword schemeFunction negative?
+syn keyword schemeFunction newline
+syn keyword schemeFunction not
+syn keyword schemeFunction null-environment
+syn keyword schemeFunction null?
+syn keyword schemeFunction number->string
+syn keyword schemeFunction number?
+syn keyword schemeFunction numerator
+syn keyword schemeFunction odd?
+syn keyword schemeFunction open-binary-input-file
+syn keyword schemeFunction open-binary-output-file
+syn keyword schemeFunction open-input-bytevector
+syn keyword schemeFunction open-input-file
+syn keyword schemeFunction open-input-string
+syn keyword schemeFunction open-output-bytevector
+syn keyword schemeFunction open-output-file
+syn keyword schemeFunction open-output-string
+syn keyword schemeFunction output-port-open?
+syn keyword schemeFunction output-port?
+syn keyword schemeFunction pair?
+syn keyword schemeFunction peek-char
+syn keyword schemeFunction peek-u8
+syn keyword schemeFunction port?
+syn keyword schemeFunction positive?
+syn keyword schemeFunction procedure?
+syn keyword schemeFunction promise?
+syn keyword schemeFunction quotient
+syn keyword schemeFunction raise
+syn keyword schemeFunction raise-continuable
+syn keyword schemeFunction rational?
+syn keyword schemeFunction rationalize
+syn keyword schemeFunction read
+syn keyword schemeFunction read-bytevector
+syn keyword schemeFunction read-bytevector!
+syn keyword schemeFunction read-char
+syn keyword schemeFunction read-error?
+syn keyword schemeFunction read-line
+syn keyword schemeFunction read-string
+syn keyword schemeFunction read-u8
+syn keyword schemeFunction real-part
+syn keyword schemeFunction real?
+syn keyword schemeFunction remainder
+syn keyword schemeFunction reverse
+syn keyword schemeFunction round
+syn keyword schemeFunction scheme-report-environment
+syn keyword schemeFunction set-car!
+syn keyword schemeFunction set-cdr!
+syn keyword schemeFunction sin
+syn keyword schemeFunction sqrt
+syn keyword schemeFunction square
+syn keyword schemeFunction string
+syn keyword schemeFunction string->list
+syn keyword schemeFunction string->number
+syn keyword schemeFunction string->symbol
+syn keyword schemeFunction string->utf8
+syn keyword schemeFunction string->vector
+syn keyword schemeFunction string-append
+syn keyword schemeFunction string-ci<=?
+syn keyword schemeFunction string-ci<?
+syn keyword schemeFunction string-ci=?
+syn keyword schemeFunction string-ci>=?
+syn keyword schemeFunction string-ci>?
+syn keyword schemeFunction string-copy
+syn keyword schemeFunction string-copy!
+syn keyword schemeFunction string-downcase
+syn keyword schemeFunction string-fill!
+syn keyword schemeFunction string-foldcase
+syn keyword schemeFunction string-for-each
+syn keyword schemeFunction string-length
+syn keyword schemeFunction string-map
+syn keyword schemeFunction string-ref
+syn keyword schemeFunction string-set!
+syn keyword schemeFunction string-upcase
+syn keyword schemeFunction string<=?
+syn keyword schemeFunction string<?
+syn keyword schemeFunction string=?
+syn keyword schemeFunction string>=?
+syn keyword schemeFunction string>?
+syn keyword schemeFunction string?
+syn keyword schemeFunction substring
+syn keyword schemeFunction symbol->string
+syn keyword schemeFunction symbol=?
+syn keyword schemeFunction symbol?
+syn keyword schemeFunction syntax-error
+syn keyword schemeFunction tan
+syn keyword schemeFunction textual-port?
+syn keyword schemeFunction transcript-off
+syn keyword schemeFunction transcript-on
+syn keyword schemeFunction truncate
+syn keyword schemeFunction truncate-quotient
+syn keyword schemeFunction truncate-remainder
+syn keyword schemeFunction truncate/
+syn keyword schemeFunction u8-ready?
+syn keyword schemeFunction utf8->string
+syn keyword schemeFunction values
+syn keyword schemeFunction vector
+syn keyword schemeFunction vector->list
+syn keyword schemeFunction vector->string
+syn keyword schemeFunction vector-append
+syn keyword schemeFunction vector-copy
+syn keyword schemeFunction vector-copy!
+syn keyword schemeFunction vector-fill!
+syn keyword schemeFunction vector-for-each
+syn keyword schemeFunction vector-length
+syn keyword schemeFunction vector-map
+syn keyword schemeFunction vector-ref
+syn keyword schemeFunction vector-set!
+syn keyword schemeFunction vector?
+syn keyword schemeFunction with-exception-handler
+syn keyword schemeFunction with-input-from-file
+syn keyword schemeFunction with-output-to-file
+syn keyword schemeFunction write
+syn keyword schemeFunction write-bytevector
+syn keyword schemeFunction write-char
+syn keyword schemeFunction write-shared
+syn keyword schemeFunction write-simple
+syn keyword schemeFunction write-string
+syn keyword schemeFunction write-u8
+syn keyword schemeFunction zero?
+
+hi def link schemeBoolean Boolean
+hi def link schemeCharacter Character
+hi def link schemeComment Comment
+hi def link schemeConstant Constant
+hi def link schemeData Delimiter
+hi def link schemeDatumComment Comment
+hi def link schemeDatumCommentForm Comment
+hi def link schemeDelimiter Delimiter
+hi def link schemeError Error
+hi def link schemeExtraSyntax Underlined
+hi def link schemeFunction Function
+hi def link schemeIdentifier Normal
+hi def link schemeImport PreProc
+hi def link schemeImportKeyword PreProc
+hi def link schemeKeyword Type
+hi def link schemeLibrarySyntax PreProc
+hi def link schemeMultilineComment Comment
+hi def link schemeNumber Number
+hi def link schemeParentheses Normal
+hi def link schemeQuasiquote Delimiter
+hi def link schemeQuote Delimiter
+hi def link schemeSpecialSyntax Special
+hi def link schemeString String
+hi def link schemeSymbol Normal
+hi def link schemeSyntax Statement
+hi def link schemeSyntaxSyntax PreProc
+hi def link schemeTypeSyntax Type
+
+let b:did_scheme_syntax = 1
+
+if exists('b:is_chicken') || exists('g:is_chicken')
+  exe 'ru! syntax/chicken.vim'
+endif
+
+unlet b:did_scheme_syntax
+let b:current_syntax = 'scheme'
+let &cpo = s:cpo
+unlet s:cpo
+
+endif
diff --git a/syntax/scilab.vim b/syntax/scilab.vim
new file mode 100644
index 000000000..033aa21d8
--- /dev/null
+++ b/syntax/scilab.vim
@@ -0,0 +1,106 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scilab') == -1
+
+"
+" Vim syntax file
+" Language   :	Scilab
+" Maintainer :	Benoit Hamelin
+" File type  :	*.sci (see :help filetype)
+" History
+"	28jan2002	benoith		0.1		Creation.  Adapted from matlab.vim.
+"	04feb2002	benoith		0.5		Fixed bugs with constant highlighting.
+"
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+
+" Reserved words.
+syn keyword scilabStatement			abort clear clearglobal end exit global mode predef quit resume
+syn keyword scilabStatement			return
+syn keyword scilabFunction			function endfunction funptr
+syn keyword scilabPredicate			null iserror isglobal
+syn keyword scilabKeyword			typename
+syn keyword scilabDebug				debug pause what where whereami whereis who whos
+syn keyword scilabRepeat			for while break
+syn keyword scilabConditional		if then else elseif
+syn keyword scilabMultiplex			select case
+
+" Reserved constants.
+syn match scilabConstant			"\(%\)[0-9A-Za-z?!#$]\+"
+syn match scilabBoolean				"\(%\)[FTft]\>"
+
+" Delimiters and operators.
+syn match scilabDelimiter			"[][;,()]"
+syn match scilabComparison			"[=~]="
+syn match scilabComparison			"[<>]=\="
+syn match scilabComparison			"<>"
+syn match scilabLogical				"[&|~]"
+syn match scilabAssignment			"="
+syn match scilabArithmetic			"[+-]"
+syn match scilabArithmetic			"\.\=[*/\\]\.\="
+syn match scilabArithmetic			"\.\=^"
+syn match scilabRange				":"
+syn match scilabMlistAccess			"\."
+
+syn match scilabLineContinuation	"\.\{2,}"
+
+syn match scilabTransposition		"[])a-zA-Z0-9?!_#$.]'"lc=1
+
+" Comments and tools.
+syn keyword scilabTodo				TODO todo FIXME fixme TBD tbd	contained
+syn match scilabComment				"//.*$"	contains=scilabTodo
+
+" Constants.
+syn match scilabNumber				"[0-9]\+\(\.[0-9]*\)\=\([DEde][+-]\=[0-9]\+\)\="
+syn match scilabNumber				"\.[0-9]\+\([DEde][+-]\=[0-9]\+\)\="
+syn region scilabString				start=+'+ skip=+''+ end=+'+		oneline
+syn region scilabString				start=+"+ end=+"+				oneline
+
+" Identifiers.
+syn match scilabIdentifier			"\<[A-Za-z?!_#$][A-Za-z0-9?!_#$]*\>"
+syn match scilabOverload			"%[A-Za-z0-9?!_#$]\+_[A-Za-z0-9?!_#$]\+"
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link scilabStatement				Statement
+hi def link scilabFunction				Keyword
+hi def link scilabPredicate				Keyword
+hi def link scilabKeyword				Keyword
+hi def link scilabDebug					Debug
+hi def link scilabRepeat				Repeat
+hi def link scilabConditional			Conditional
+hi def link scilabMultiplex				Conditional
+
+hi def link scilabConstant				Constant
+hi def link scilabBoolean				Boolean
+
+hi def link scilabDelimiter				Delimiter
+hi def link scilabMlistAccess			Delimiter
+hi def link scilabComparison			Operator
+hi def link scilabLogical				Operator
+hi def link scilabAssignment			Operator
+hi def link scilabArithmetic			Operator
+hi def link scilabRange					Operator
+hi def link scilabLineContinuation		Underlined
+hi def link scilabTransposition			Operator
+
+hi def link scilabTodo					Todo
+hi def link scilabComment				Comment
+
+hi def link scilabNumber				Number
+hi def link scilabString				String
+
+hi def link scilabIdentifier			Identifier
+hi def link scilabOverload				Special
+
+
+let b:current_syntax = "scilab"
+
+"EOF	vim: ts=4 noet tw=100 sw=4 sts=0
+
+endif
diff --git a/syntax/screen.vim b/syntax/screen.vim
new file mode 100644
index 000000000..b3fe603fc
--- /dev/null
+++ b/syntax/screen.vim
@@ -0,0 +1,264 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'screen') == -1
+
+" Vim syntax file
+" Language:             screen(1) configuration file
+" Maintainer:           Dmitri Vereshchagin <dmitri.vereshchagin@gmail.com>
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2015-09-24
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match   screenEscape    '\\.'
+
+syn keyword screenTodo      contained TODO FIXME XXX NOTE
+
+syn region  screenComment   display oneline start='#' end='$'
+                          \ contains=screenTodo,@Spell
+
+syn region  screenString    display oneline start=+"+ skip=+\\"+ end=+"+
+                          \ contains=screenVariable,screenSpecial
+
+syn region  screenLiteral   display oneline start=+'+ skip=+\\'+ end=+'+
+
+syn match   screenVariable  contained display '$\%(\h\w*\|{\h\w*}\)'
+
+syn keyword screenBoolean   on off
+
+syn match   screenNumbers   display '\<\d\+\>'
+
+syn match   screenSpecials  contained
+                          \ '%\%([%aAdDhlmMstuwWyY?:{]\|[0-9]*n\|0?cC\)'
+
+syn keyword screenCommands
+                          \ acladd
+                          \ aclchg
+                          \ acldel
+                          \ aclgrp
+                          \ aclumask
+                          \ activity
+                          \ addacl
+                          \ allpartial
+                          \ altscreen
+                          \ at
+                          \ attrcolor
+                          \ autodetach
+                          \ autonuke
+                          \ backtick
+                          \ bce
+                          \ bd_bc_down
+                          \ bd_bc_left
+                          \ bd_bc_right
+                          \ bd_bc_up
+                          \ bd_bell
+                          \ bd_braille_table
+                          \ bd_eightdot
+                          \ bd_info
+                          \ bd_link
+                          \ bd_lower_left
+                          \ bd_lower_right
+                          \ bd_ncrc
+                          \ bd_port
+                          \ bd_scroll
+                          \ bd_skip
+                          \ bd_start_braille
+                          \ bd_type
+                          \ bd_upper_left
+                          \ bd_upper_right
+                          \ bd_width
+                          \ bell
+                          \ bell_msg
+                          \ bind
+                          \ bindkey
+                          \ blanker
+                          \ blankerprg
+                          \ break
+                          \ breaktype
+                          \ bufferfile
+                          \ bumpleft
+                          \ bumpright
+                          \ c1
+                          \ caption
+                          \ chacl
+                          \ charset
+                          \ chdir
+                          \ cjkwidth
+                          \ clear
+                          \ collapse
+                          \ colon
+                          \ command
+                          \ compacthist
+                          \ console
+                          \ copy
+                          \ crlf
+                          \ debug
+                          \ defautonuke
+                          \ defbce
+                          \ defbreaktype
+                          \ defc1
+                          \ defcharset
+                          \ defencoding
+                          \ defescape
+                          \ defflow
+                          \ defgr
+                          \ defhstatus
+                          \ defkanji
+                          \ deflog
+                          \ deflogin
+                          \ defmode
+                          \ defmonitor
+                          \ defmousetrack
+                          \ defnonblock
+                          \ defobuflimit
+                          \ defscrollback
+                          \ defshell
+                          \ defsilence
+                          \ defslowpaste
+                          \ defutf8
+                          \ defwrap
+                          \ defwritelock
+                          \ defzombie
+                          \ detach
+                          \ digraph
+                          \ dinfo
+                          \ displays
+                          \ dumptermcap
+                          \ echo
+                          \ encoding
+                          \ escape
+                          \ eval
+                          \ exec
+                          \ fit
+                          \ flow
+                          \ focus
+                          \ focusminsize
+                          \ gr
+                          \ group
+                          \ hardcopy
+                          \ hardcopy_append
+                          \ hardcopydir
+                          \ hardstatus
+                          \ height
+                          \ help
+                          \ history
+                          \ hstatus
+                          \ idle
+                          \ ignorecase
+                          \ info
+                          \ kanji
+                          \ kill
+                          \ lastmsg
+                          \ layout
+                          \ license
+                          \ lockscreen
+                          \ log
+                          \ logfile
+                          \ login
+                          \ logtstamp
+                          \ mapdefault
+                          \ mapnotnext
+                          \ maptimeout
+                          \ markkeys
+                          \ maxwin
+                          \ meta
+                          \ monitor
+                          \ mousetrack
+                          \ msgminwait
+                          \ msgwait
+                          \ multiuser
+                          \ nethack
+                          \ next
+                          \ nonblock
+                          \ number
+                          \ obuflimit
+                          \ only
+                          \ other
+                          \ partial
+                          \ password
+                          \ paste
+                          \ pastefont
+                          \ pow_break
+                          \ pow_detach
+                          \ pow_detach_msg
+                          \ prev
+                          \ printcmd
+                          \ process
+                          \ quit
+                          \ readbuf
+                          \ readreg
+                          \ redisplay
+                          \ register
+                          \ remove
+                          \ removebuf
+                          \ rendition
+                          \ reset
+                          \ resize
+                          \ screen
+                          \ scrollback
+                          \ select
+                          \ sessionname
+                          \ setenv
+                          \ setsid
+                          \ shell
+                          \ shelltitle
+                          \ silence
+                          \ silencewait
+                          \ sleep
+                          \ slowpaste
+                          \ sorendition
+                          \ sort
+                          \ source
+                          \ split
+                          \ startup_message
+                          \ stuff
+                          \ su
+                          \ suspend
+                          \ term
+                          \ termcap
+                          \ termcapinfo
+                          \ terminfo
+                          \ time
+                          \ title
+                          \ umask
+                          \ unbindall
+                          \ unsetenv
+                          \ utf8
+                          \ vbell
+                          \ vbell_msg
+                          \ vbellwait
+                          \ verbose
+                          \ version
+                          \ wall
+                          \ width
+                          \ windowlist
+                          \ windows
+                          \ wrap
+                          \ writebuf
+                          \ writelock
+                          \ xoff
+                          \ xon
+                          \ zmodem
+                          \ zombie
+                          \ zombie_timeout
+
+hi def link screenEscape    Special
+hi def link screenComment   Comment
+hi def link screenTodo      Todo
+hi def link screenString    String
+hi def link screenLiteral   String
+hi def link screenVariable  Identifier
+hi def link screenBoolean   Boolean
+hi def link screenNumbers   Number
+hi def link screenSpecials  Special
+hi def link screenCommands  Keyword
+
+let b:current_syntax = "screen"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/sd.vim b/syntax/sd.vim
new file mode 100644
index 000000000..9b220b72a
--- /dev/null
+++ b/syntax/sd.vim
@@ -0,0 +1,75 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sd') == -1
+
+" Language: streaming descriptor file
+" Maintainer: Puria Nafisi Azizi (pna) <pna@netstudent.polito.it>
+" License: This file can be redistribued and/or modified under the same terms
+"   as Vim itself.
+" URL: http://netstudent.polito.it/vim_syntax/
+" Last Change: 2012 Feb 03 by Thilo Six
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+        finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Always ignore case
+syn case ignore
+
+" Comments
+syn match sdComment /\s*[#;].*$/
+
+" IP Adresses
+syn cluster sdIPCluster contains=sdIPError,sdIPSpecial
+syn match sdIPError /\%(\d\{4,}\|25[6-9]\|2[6-9]\d\|[3-9]\d\{2}\)[\.0-9]*/ contained
+syn match sdIPSpecial /\%(127\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\)/ contained
+syn match sdIP contained /\%(\d\{1,4}\.\)\{3}\d\{1,4}/ contains=@sdIPCluster
+
+" Statements
+syn keyword sdStatement AGGREGATE AUDIO_CHANNELS
+syn keyword sdStatement BYTE_PER_PCKT BIT_PER_SAMPLE BITRATE
+syn keyword sdStatement CLOCK_RATE CODING_TYPE CREATOR
+syn match sdStatement /^\s*CODING_TYPE\>/ nextgroup=sdCoding skipwhite
+syn match sdStatement /^\s*ENCODING_NAME\>/ nextgroup=sdEncoding skipwhite
+syn keyword sdStatement FILE_NAME FRAME_LEN FRAME_RATE FORCE_FRAME_RATE
+syn keyword sdStatement LICENSE
+syn match sdStatement /^\s*MEDIA_SOURCE\>/ nextgroup=sdSource skipwhite
+syn match sdStatement /^\s*MULTICAST\>/ nextgroup=sdIP skipwhite
+syn keyword sdStatement PAYLOAD_TYPE PKT_LEN PRIORITY
+syn keyword sdStatement SAMPLE_RATE
+syn keyword sdStatement TITLE TWIN
+syn keyword sdStatement VERIFY
+
+" Known Options
+syn keyword sdEncoding H26L MPV MP2T MP4V-ES
+syn keyword sdCoding FRAME SAMPLE
+syn keyword sdSource STORED LIVE
+
+"Specials
+syn keyword sdSpecial TRUE FALSE NULL
+syn keyword sdDelimiter STREAM STREAM_END
+syn match sdError /^search .\{257,}/
+
+
+hi def link sdIP Number
+hi def link sdHostname Type
+hi def link sdEncoding Identifier
+hi def link sdCoding Identifier
+hi def link sdSource Identifier
+hi def link sdComment Comment
+hi def link sdIPError Error
+hi def link sdError Error
+hi def link sdStatement Statement
+hi def link sdIPSpecial Special
+hi def link sdSpecial Special
+hi def link sdDelimiter Delimiter
+
+
+let b:current_syntax = "sd"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/sdc.vim b/syntax/sdc.vim
new file mode 100644
index 000000000..286482ff6
--- /dev/null
+++ b/syntax/sdc.vim
@@ -0,0 +1,45 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sdc') == -1
+
+" Vim syntax file
+" Language:     SDC - Synopsys Design Constraints
+" Maintainer:   Maurizio Tranchero - maurizio.tranchero@gmail.com
+" Last Change:  Thu Mar  25 17:35:16 CET 2009
+" Credits:      based on TCL Vim syntax file
+" Version:	0.3
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Read the TCL syntax to start with
+runtime! syntax/tcl.vim
+
+" SDC-specific keywords
+syn keyword sdcCollections	foreach_in_collection
+syn keyword sdcObjectsQuery	get_clocks get_ports
+syn keyword sdcObjectsInfo	get_point_info get_node_info get_path_info
+syn keyword sdcObjectsInfo	get_timing_paths set_attribute
+syn keyword sdcConstraints	set_false_path
+syn keyword sdcNonIdealities	set_min_delay set_max_delay
+syn keyword sdcNonIdealities	set_input_delay set_output_delay
+syn keyword sdcNonIdealities	set_load set_min_capacitance set_max_capacitance
+syn keyword sdcCreateOperations	create_clock create_timing_netlist update_timing_netlist
+
+" command flags highlighting
+syn match sdcFlags		"[[:space:]]-[[:alpha:]]*\>"
+
+" Define the default highlighting.
+hi def link sdcCollections      Repeat
+hi def link sdcObjectsInfo      Operator
+hi def link sdcCreateOperations	Operator
+hi def link sdcObjectsQuery	Operator
+hi def link sdcConstraints	Operator
+hi def link sdcNonIdealities	Operator
+hi def link sdcFlags		Special
+
+let b:current_syntax = "sdc"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/sdl.vim b/syntax/sdl.vim
new file mode 100644
index 000000000..7d31fba06
--- /dev/null
+++ b/syntax/sdl.vim
@@ -0,0 +1,157 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sdl') == -1
+
+" Vim syntax file
+" Language:	SDL
+" Maintainer:	Michael Piefel <entwurf@piefel.de>
+" Last Change:	2 May 2001
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+if !exists("sdl_2000")
+    syntax case ignore
+endif
+
+" A bunch of useful SDL keywords
+syn keyword sdlStatement	task else nextstate
+syn keyword sdlStatement	in out with from interface
+syn keyword sdlStatement	to via env and use
+syn keyword sdlStatement	process procedure block system service type
+syn keyword sdlStatement	endprocess endprocedure endblock endsystem
+syn keyword sdlStatement	package endpackage connection endconnection
+syn keyword sdlStatement	channel endchannel connect
+syn keyword sdlStatement	synonym dcl signal gate timer signallist signalset
+syn keyword sdlStatement	create output set reset call
+syn keyword sdlStatement	operators literals
+syn keyword sdlStatement	active alternative any as atleast constants
+syn keyword sdlStatement	default endalternative endmacro endoperator
+syn keyword sdlStatement	endselect endsubstructure external
+syn keyword sdlStatement	if then fi for import macro macrodefinition
+syn keyword sdlStatement	macroid mod nameclass nodelay not operator or
+syn keyword sdlStatement	parent provided referenced rem
+syn keyword sdlStatement	select spelling substructure xor
+syn keyword sdlNewState		state endstate
+syn keyword sdlInput		input start stop return none save priority
+syn keyword sdlConditional	decision enddecision join
+syn keyword sdlVirtual		virtual redefined finalized adding inherits
+syn keyword sdlExported		remote exported export
+
+if !exists("sdl_no_96")
+    syn keyword sdlStatement	all axioms constant endgenerator endrefinement endservice
+    syn keyword sdlStatement	error fpar generator literal map noequality ordering
+    syn keyword sdlStatement	refinement returns revealed reverse service signalroute
+    syn keyword sdlStatement	view viewed
+    syn keyword sdlExported	imported
+endif
+
+if exists("sdl_2000")
+    syn keyword sdlStatement	abstract aggregation association break choice composition
+    syn keyword sdlStatement	continue endmethod handle method
+    syn keyword sdlStatement	ordered private protected public
+    syn keyword sdlException	exceptionhandler endexceptionhandler onexception
+    syn keyword sdlException	catch new raise
+    " The same in uppercase
+    syn keyword sdlStatement	TASK ELSE NEXTSTATE
+    syn keyword sdlStatement	IN OUT WITH FROM INTERFACE
+    syn keyword sdlStatement	TO VIA ENV AND USE
+    syn keyword sdlStatement	PROCESS PROCEDURE BLOCK SYSTEM SERVICE TYPE
+    syn keyword sdlStatement	ENDPROCESS ENDPROCEDURE ENDBLOCK ENDSYSTEM
+    syn keyword sdlStatement	PACKAGE ENDPACKAGE CONNECTION ENDCONNECTION
+    syn keyword sdlStatement	CHANNEL ENDCHANNEL CONNECT
+    syn keyword sdlStatement	SYNONYM DCL SIGNAL GATE TIMER SIGNALLIST SIGNALSET
+    syn keyword sdlStatement	CREATE OUTPUT SET RESET CALL
+    syn keyword sdlStatement	OPERATORS LITERALS
+    syn keyword sdlStatement	ACTIVE ALTERNATIVE ANY AS ATLEAST CONSTANTS
+    syn keyword sdlStatement	DEFAULT ENDALTERNATIVE ENDMACRO ENDOPERATOR
+    syn keyword sdlStatement	ENDSELECT ENDSUBSTRUCTURE EXTERNAL
+    syn keyword sdlStatement	IF THEN FI FOR IMPORT MACRO MACRODEFINITION
+    syn keyword sdlStatement	MACROID MOD NAMECLASS NODELAY NOT OPERATOR OR
+    syn keyword sdlStatement	PARENT PROVIDED REFERENCED REM
+    syn keyword sdlStatement	SELECT SPELLING SUBSTRUCTURE XOR
+    syn keyword sdlNewState	STATE ENDSTATE
+    syn keyword sdlInput	INPUT START STOP RETURN NONE SAVE PRIORITY
+    syn keyword sdlConditional	DECISION ENDDECISION JOIN
+    syn keyword sdlVirtual	VIRTUAL REDEFINED FINALIZED ADDING INHERITS
+    syn keyword sdlExported	REMOTE EXPORTED EXPORT
+
+    syn keyword sdlStatement	ABSTRACT AGGREGATION ASSOCIATION BREAK CHOICE COMPOSITION
+    syn keyword sdlStatement	CONTINUE ENDMETHOD ENDOBJECT ENDVALUE HANDLE METHOD OBJECT
+    syn keyword sdlStatement	ORDERED PRIVATE PROTECTED PUBLIC
+    syn keyword sdlException	EXCEPTIONHANDLER ENDEXCEPTIONHANDLER ONEXCEPTION
+    syn keyword sdlException	CATCH NEW RAISE
+endif
+
+" String and Character contstants
+" Highlight special characters (those which have a backslash) differently
+syn match   sdlSpecial		contained "\\\d\d\d\|\\."
+syn region  sdlString		start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=cSpecial
+syn region  sdlString		start=+'+  skip=+''+  end=+'+
+
+" No, this doesn't happen, I just wanted to scare you. SDL really allows all
+" these characters for identifiers; fortunately, keywords manage without them.
+" set iskeyword=@,48-57,_,192-214,216-246,248-255,-
+
+syn region sdlComment		start="/\*"  end="\*/"
+syn region sdlComment		start="comment"  end=";"
+syn region sdlComment		start="--" end="--\|$"
+syn match  sdlCommentError	"\*/"
+
+syn keyword sdlOperator		present
+syn keyword sdlType		integer real natural duration pid boolean time
+syn keyword sdlType		character charstring ia5string
+syn keyword sdlType		self now sender offspring
+syn keyword sdlStructure	asntype endasntype syntype endsyntype struct
+
+if !exists("sdl_no_96")
+    syn keyword sdlStructure	newtype endnewtype
+endif
+
+if exists("sdl_2000")
+    syn keyword sdlStructure	object endobject value endvalue
+    " The same in uppercase
+    syn keyword sdlStructure	OBJECT ENDOBJECT VALUE ENDVALUE
+    syn keyword sdlOperator	PRESENT
+    syn keyword sdlType		INTEGER NATURAL DURATION PID BOOLEAN TIME
+    syn keyword sdlType		CHARSTRING IA5STRING
+    syn keyword sdlType		SELF NOW SENDER OFFSPRING
+    syn keyword sdlStructure	ASNTYPE ENDASNTYPE SYNTYPE ENDSYNTYPE STRUCT
+endif
+
+" ASN.1 in SDL
+syn case match
+syn keyword sdlType		SET OF BOOLEAN INTEGER REAL BIT OCTET
+syn keyword sdlType		SEQUENCE CHOICE
+syn keyword sdlType		STRING OBJECT IDENTIFIER NULL
+
+syn sync ccomment sdlComment
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+command -nargs=+ Hi     hi def <args>
+
+hi def link sdlException	Label
+hi def link sdlConditional	sdlStatement
+hi def link sdlVirtual		sdlStatement
+hi def link sdlExported		sdlFlag
+hi def link sdlCommentError	sdlError
+hi def link sdlOperator		Operator
+hi def link sdlStructure	sdlType
+Hi	    sdlStatement	term=bold ctermfg=4 guifg=Blue
+Hi	    sdlFlag		term=bold ctermfg=4 guifg=Blue gui=italic
+Hi	    sdlNewState		term=italic ctermfg=2 guifg=Magenta gui=underline
+Hi	    sdlInput		term=bold guifg=Red
+hi def link sdlType		Type
+hi def link sdlString		String
+hi def link sdlComment		Comment
+hi def link sdlSpecial		Special
+hi def link sdlError		Error
+
+delcommand Hi
+
+let b:current_syntax = "sdl"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/sed.vim b/syntax/sed.vim
new file mode 100644
index 000000000..2e4690c7b
--- /dev/null
+++ b/syntax/sed.vim
@@ -0,0 +1,114 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sed') == -1
+
+" Vim syntax file
+" Language:	sed
+" Maintainer:	Haakon Riiser <hakonrk@fys.uio.no>
+" URL:		http://folk.uio.no/hakonrk/vim/syntax/sed.vim
+" Last Change:	2010 May 29
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+syn match sedError	"\S"
+
+syn match sedWhitespace "\s\+" contained
+syn match sedSemicolon	";"
+syn match sedAddress	"[[:digit:]$]"
+syn match sedAddress	"\d\+\~\d\+"
+syn region sedAddress   matchgroup=Special start="[{,;]\s*/\(\\/\)\="lc=1 skip="[^\\]\(\\\\\)*\\/" end="/I\=" contains=sedTab,sedRegexpMeta
+syn region sedAddress   matchgroup=Special start="^\s*/\(\\/\)\=" skip="[^\\]\(\\\\\)*\\/" end="/I\=" contains=sedTab,sedRegexpMeta
+syn match sedComment	"^\s*#.*$"
+syn match sedFunction	"[dDgGhHlnNpPqQx=]\s*\($\|;\)" contains=sedSemicolon,sedWhitespace
+syn match sedLabel	":[^;]*"
+syn match sedLineCont	"^\(\\\\\)*\\$" contained
+syn match sedLineCont	"[^\\]\(\\\\\)*\\$"ms=e contained
+syn match sedSpecial	"[{},!]"
+if exists("highlight_sedtabs")
+    syn match sedTab	"\t" contained
+endif
+
+" Append/Change/Insert
+syn region sedACI	matchgroup=sedFunction start="[aci]\\$" matchgroup=NONE end="^.*$" contains=sedLineCont,sedTab
+
+syn region sedBranch	matchgroup=sedFunction start="[bt]" matchgroup=sedSemicolon end=";\|$" contains=sedWhitespace
+syn region sedRW	matchgroup=sedFunction start="[rw]" matchgroup=sedSemicolon end=";\|$" contains=sedWhitespace
+
+" Substitution/transform with various delimiters
+syn region sedFlagwrite	    matchgroup=sedFlag start="w" matchgroup=sedSemicolon end=";\|$" contains=sedWhitespace contained
+syn match sedFlag	    "[[:digit:]gpI]*w\=" contains=sedFlagwrite contained
+syn match sedRegexpMeta	    "[.*^$]" contained
+syn match sedRegexpMeta	    "\\." contains=sedTab contained
+syn match sedRegexpMeta	    "\[.\{-}\]" contains=sedTab contained
+syn match sedRegexpMeta	    "\\{\d\*,\d*\\}" contained
+syn match sedRegexpMeta	    "\\(.\{-}\\)" contains=sedTab contained
+syn match sedReplaceMeta    "&\|\\\($\|.\)" contains=sedTab contained
+
+" Metacharacters: $ * . \ ^ [ ~
+" @ is used as delimiter and treated on its own below
+let __at = char2nr("@")
+let __sed_i = char2nr(" ") " ASCII: 32, EBCDIC: 64
+if has("ebcdic")
+    let __sed_last = 255
+else
+    let __sed_last = 126
+endif
+let __sed_metacharacters = '$*.\^[~'
+while __sed_i <= __sed_last
+    let __sed_delimiter = escape(nr2char(__sed_i), __sed_metacharacters)
+	if __sed_i != __at
+	    exe 'syn region sedAddress matchgroup=Special start=@\\'.__sed_delimiter.'\(\\'.__sed_delimiter.'\)\=@ skip=@[^\\]\(\\\\\)*\\'.__sed_delimiter.'@ end=@'.__sed_delimiter.'I\=@ contains=sedTab'
+	    exe 'syn region sedRegexp'.__sed_i  'matchgroup=Special start=@'.__sed_delimiter.'\(\\\\\|\\'.__sed_delimiter.'\)*@ skip=@[^\\'.__sed_delimiter.']\(\\\\\)*\\'.__sed_delimiter.'@ end=@'.__sed_delimiter.'@me=e-1 contains=sedTab,sedRegexpMeta keepend contained nextgroup=sedReplacement'.__sed_i
+	    exe 'syn region sedReplacement'.__sed_i 'matchgroup=Special start=@'.__sed_delimiter.'\(\\\\\|\\'.__sed_delimiter.'\)*@ skip=@[^\\'.__sed_delimiter.']\(\\\\\)*\\'.__sed_delimiter.'@ end=@'.__sed_delimiter.'@ contains=sedTab,sedReplaceMeta keepend contained nextgroup=sedFlag'
+	endif
+    let __sed_i = __sed_i + 1
+endwhile
+syn region sedAddress matchgroup=Special start=+\\@\(\\@\)\=+ skip=+[^\\]\(\\\\\)*\\@+ end=+@I\=+ contains=sedTab,sedRegexpMeta
+syn region sedRegexp64 matchgroup=Special start=+@\(\\\\\|\\@\)*+ skip=+[^\\@]\(\\\\\)*\\@+ end=+@+me=e-1 contains=sedTab,sedRegexpMeta keepend contained nextgroup=sedReplacement64
+syn region sedReplacement64 matchgroup=Special start=+@\(\\\\\|\\@\)*+ skip=+[^\\@]\(\\\\\)*\\@+ end=+@+ contains=sedTab,sedReplaceMeta keepend contained nextgroup=sedFlag
+
+" Since the syntax for the substituion command is very similar to the
+" syntax for the transform command, I use the same pattern matching
+" for both commands.  There is one problem -- the transform command
+" (y) does not allow any flags.  To save memory, I ignore this problem.
+syn match sedST	"[sy]" nextgroup=sedRegexp\d\+
+
+
+hi def link sedAddress		Macro
+hi def link sedACI		NONE
+hi def link sedBranch		Label
+hi def link sedComment		Comment
+hi def link sedDelete		Function
+hi def link sedError		Error
+hi def link sedFlag		Type
+hi def link sedFlagwrite		Constant
+hi def link sedFunction		Function
+hi def link sedLabel		Label
+hi def link sedLineCont		Special
+hi def link sedPutHoldspc	Function
+hi def link sedReplaceMeta	Special
+hi def link sedRegexpMeta	Special
+hi def link sedRW		Constant
+hi def link sedSemicolon		Special
+hi def link sedST		Function
+hi def link sedSpecial		Special
+hi def link sedWhitespace	NONE
+if exists("highlight_sedtabs")
+hi def link sedTab		Todo
+endif
+let __sed_i = char2nr(" ") " ASCII: 32, EBCDIC: 64
+while __sed_i <= __sed_last
+exe "hi def link sedRegexp".__sed_i		"Macro"
+exe "hi def link sedReplacement".__sed_i	"NONE"
+let __sed_i = __sed_i + 1
+endwhile
+
+
+unlet __sed_i __sed_last __sed_delimiter __sed_metacharacters
+
+let b:current_syntax = "sed"
+
+" vim: sts=4 sw=4 ts=8
+
+endif
diff --git a/syntax/sensors.vim b/syntax/sensors.vim
new file mode 100644
index 000000000..e0c1185a0
--- /dev/null
+++ b/syntax/sensors.vim
@@ -0,0 +1,56 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensors') == -1
+
+" Vim syntax file
+" Language:             sensors.conf(5) - libsensors configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword sensorsTodo         contained TODO FIXME XXX NOTE
+
+syn region  sensorsComment      display oneline start='#' end='$'
+                                \ contains=sensorsTodo,@Spell
+
+
+syn keyword sensorsKeyword      bus chip label compute ignore set
+
+syn region  sensorsName         display oneline
+                                \ start=+"+ skip=+\\\\\|\\"+ end=+"+
+                                \ contains=sensorsNameSpecial
+syn match   sensorsName         display '\w\+'
+
+syn match   sensorsNameSpecial  display '\\["\\rnt]'
+
+syn match   sensorsLineContinue '\\$'
+
+syn match   sensorsNumber       display '\d*.\d\+\>'
+
+syn match   sensorsRealWorld    display '@'
+
+syn match   sensorsOperator     display '[+*/-]'
+
+syn match   sensorsDelimiter    display '[()]'
+
+hi def link sensorsTodo         Todo
+hi def link sensorsComment      Comment
+hi def link sensorsKeyword      Keyword
+hi def link sensorsName         String
+hi def link sensorsNameSpecial  SpecialChar
+hi def link sensorsLineContinue Special
+hi def link sensorsNumber       Number
+hi def link sensorsRealWorld    Identifier
+hi def link sensorsOperator     Normal
+hi def link sensorsDelimiter    Normal
+
+let b:current_syntax = "sensors"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/services.vim b/syntax/services.vim
new file mode 100644
index 000000000..5e4debd93
--- /dev/null
+++ b/syntax/services.vim
@@ -0,0 +1,58 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'services') == -1
+
+" Vim syntax file
+" Language:             services(5) - Internet network services list
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match   servicesBegin     display '^'
+                              \ nextgroup=servicesName,servicesComment
+
+syn match   servicesName      contained display '[[:graph:]]\+'
+                              \ nextgroup=servicesPort skipwhite
+
+syn match   servicesPort      contained display '\d\+'
+                              \ nextgroup=servicesPPDiv,servicesPPDivDepr
+                              \ skipwhite
+
+syn match   servicesPPDiv     contained display '/'
+                              \ nextgroup=servicesProtocol skipwhite
+
+syn match   servicesPPDivDepr contained display ','
+                              \ nextgroup=servicesProtocol skipwhite
+
+syn match   servicesProtocol  contained display '\S\+'
+                              \ nextgroup=servicesAliases,servicesComment
+                              \ skipwhite
+
+syn match   servicesAliases   contained display '\S\+'
+                              \ nextgroup=servicesAliases,servicesComment
+                              \ skipwhite
+
+syn keyword servicesTodo      contained TODO FIXME XXX NOTE
+
+syn region  servicesComment   display oneline start='#' end='$'
+                              \ contains=servicesTodo,@Spell
+
+hi def link servicesTodo      Todo
+hi def link servicesComment   Comment
+hi def link servicesName      Identifier
+hi def link servicesPort      Number
+hi def link servicesPPDiv     Delimiter
+hi def link servicesPPDivDepr Error
+hi def link servicesProtocol  Type
+hi def link servicesAliases   Macro
+
+let b:current_syntax = "services"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/setserial.vim b/syntax/setserial.vim
new file mode 100644
index 000000000..63939544e
--- /dev/null
+++ b/syntax/setserial.vim
@@ -0,0 +1,124 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'setserial') == -1
+
+" Vim syntax file
+" Language:             setserial(8) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match   setserialBegin      display '^'
+                                \ nextgroup=setserialDevice,setserialComment
+                                \ skipwhite
+
+syn match   setserialDevice     contained display '\%(/[^ \t/]*\)\+'
+                                \ nextgroup=setserialParameter skipwhite
+
+syn keyword setserialParameter  contained port irq baud_base divisor
+                                \ close_delay closing_wait rx_trigger
+                                \ tx_trigger flow_off flow_on rx_timeout
+                                \ nextgroup=setserialNumber skipwhite
+
+syn keyword setserialParameter  contained uart
+                                \ nextgroup=setserialUARTType skipwhite
+
+syn keyword setserialParameter  contained autoconfig auto_irq skip_test
+                                \ spd_hi spd_vhi spd_shi spd_warp spd_cust
+                                \ spd_normal sak fourport session_lockout
+                                \ pgrp_lockout hup_notify split_termios
+                                \ callout_nohup low_latency
+                                \ nextgroup=setserialParameter skipwhite
+
+syn match   setserialParameter  contained display
+                                \ '\^\%(auto_irq\|skip_test\|sak\|fourport\)'
+                                \ contains=setserialNegation
+                                \ nextgroup=setserialParameter skipwhite
+
+syn match   setserialParameter  contained display
+                                \ '\^\%(session_lockout\|pgrp_lockout\)'
+                                \ contains=setserialNegation
+                                \ nextgroup=setserialParameter skipwhite
+
+syn match   setserialParameter  contained display
+                                \ '\^\%(hup_notify\|split_termios\)'
+                                \ contains=setserialNegation
+                                \ nextgroup=setserialParameter skipwhite
+
+syn match   setserialParameter  contained display
+                                \ '\^\%(callout_nohup\|low_latency\)'
+                                \ contains=setserialNegation
+                                \ nextgroup=setserialParameter skipwhite
+
+syn keyword setserialParameter  contained set_multiport
+                                \ nextgroup=setserialMultiport skipwhite
+
+syn match   setserialNumber     contained display '\<\d\+\>'
+                                \ nextgroup=setserialParameter skipwhite
+syn match   setserialNumber     contained display '0x\x\+'
+                                \ nextgroup=setserialParameter skipwhite
+
+syn keyword setserialUARTType   contained none
+
+syn match   setserialUARTType   contained display
+                                \ '8250\|16[4789]50\|16550A\=\|16650\%(V2\)\='
+                                \ nextgroup=setserialParameter skipwhite
+
+syn match   setserialUARTType   contained display '166[59]4'
+                                \ nextgroup=setserialParameter skipwhite
+
+syn match   setserialNegation   contained display '\^'
+
+syn match   setserialMultiport  contained '\<port\d\+\>'
+                                \ nextgroup=setserialPort skipwhite
+
+syn match   setserialPort       contained display '\<\d\+\>'
+                                \ nextgroup=setserialMask skipwhite
+syn match   setserialPort       contained display '0x\x\+'
+                                \ nextgroup=setserialMask skipwhite
+
+syn match   setserialMask       contained '\<mask\d\+\>'
+                                \ nextgroup=setserialBitMask skipwhite
+
+syn match   setserialBitMask    contained display '\<\d\+\>'
+                                \ nextgroup=setserialMatch skipwhite
+syn match   setserialBitMask    contained display '0x\x\+'
+                                \ nextgroup=setserialMatch skipwhite
+
+syn match   setserialMatch      contained '\<match\d\+\>'
+                                \ nextgroup=setserialMatchBits skipwhite
+
+syn match   setserialMatchBits  contained display '\<\d\+\>'
+                                \ nextgroup=setserialMultiport skipwhite
+syn match   setserialMatchBits  contained display '0x\x\+'
+                                \ nextgroup=setserialMultiport skipwhite
+
+syn keyword setserialTodo       contained TODO FIXME XXX NOTE
+
+syn region  setserialComment    display oneline start='^\s*#' end='$'
+                                \ contains=setserialTodo,@Spell
+
+hi def link setserialTodo       Todo
+hi def link setserialComment    Comment
+hi def link setserialDevice     Normal
+hi def link setserialParameter  Identifier
+hi def link setserialNumber     Number
+hi def link setserialUARTType   Type
+hi def link setserialNegation   Operator
+hi def link setserialMultiport  Type
+hi def link setserialPort       setserialNumber
+hi def link setserialMask       Type
+hi def link setserialBitMask    setserialNumber
+hi def link setserialMatch      Type
+hi def link setserialMatchBits  setserialNumber
+
+let b:current_syntax = "setserial"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/sieve.vim b/syntax/sieve.vim
new file mode 100644
index 000000000..21a8e1e89
--- /dev/null
+++ b/syntax/sieve.vim
@@ -0,0 +1,59 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sieve') == -1
+
+" Vim syntax file
+" Language:             Sieve filtering language input file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-10-25
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword sieveTodo         contained TODO FIXME XXX NOTE
+
+syn region  sieveComment      start='/\*' end='\*/' contains=sieveTodo,@Spell
+syn region  sieveComment      display oneline start='#' end='$'
+                              \ contains=sieveTodo,@Spell
+
+syn case ignore
+
+syn match   sieveTag          display ':\h\w*'
+
+syn match   sieveNumber       display '\<\d\+[KMG]\=\>'
+
+syn match   sieveSpecial      display '\\["\\]'
+
+syn region  sieveString       start=+"+ skip=+\\\\\|\\"+ end=+"+
+                              \ contains=sieveSpecial
+syn region  sieveString       start='text:' end='\n.\n'
+
+syn keyword sieveConditional  if elsif else
+syn keyword sieveTest         address allof anyof envelope exists false header
+                              \ not size true
+syn keyword sievePreProc      require stop
+syn keyword sieveAction       reject fileinto redirect keep discard
+syn keyword sieveKeyword      vacation
+
+syn case match
+
+hi def link sieveTodo        Todo
+hi def link sieveComment     Comment
+hi def link sieveTag         Type
+hi def link sieveNumber      Number
+hi def link sieveSpecial     Special
+hi def link sieveString      String
+hi def link sieveConditional Conditional
+hi def link sieveTest        Keyword
+hi def link sievePreProc     PreProc
+hi def link sieveAction      Function
+hi def link sieveKeyword     Keyword
+
+let b:current_syntax = "sieve"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/sil.vim b/syntax/sil.vim
new file mode 100644
index 000000000..e1d55231d
--- /dev/null
+++ b/syntax/sil.vim
@@ -0,0 +1,182 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sil') == -1
+
+" This source file is part of the Swift.org open source project
+"
+" Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+" Licensed under Apache License v2.0 with Runtime Library Exception
+"
+" See https://swift.org/LICENSE.txt for license information
+" See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+"
+" Vim syntax file
+" Language: sil
+"
+" Vim maintainer: Emir SARI <bitigchi@me.com>
+
+if exists("b:current_syntax")
+    finish
+endif
+
+let s:keepcpo = &cpo
+set cpo&vim
+
+syn keyword silStage skipwhite nextgroup=silStages
+      \ sil_stage
+syn keyword silStages
+      \ canonical
+      \ raw
+
+syn match silIdentifier skipwhite
+      \ /@\<[A-Za-z_0-9]\+\>/
+
+syn match silConvention skipwhite
+      \ /$\?@convention/
+syn region silConvention contained contains=silConventions
+      \ start="@convention(" end=")"
+syn keyword silConventions
+      \ block
+      \ c
+      \ method
+      \ objc_method
+      \ thick
+      \ thin
+      \ witness_method
+
+syn match silFunctionType skipwhite
+      \ /@\(\<autoreleased\>\|\<callee_guaranteed\>\|\<callee_owned\>\|\<error\>\|\<guaranteed\>\|\<in\>\|\<in_constant\>\|\<in_guaranteed\>\|\<inout\>\|\<inout_aliasable\>\|\<noescape\>\|\<out\>\|\<owned\>\)/
+syn match silMetatypeType skipwhite
+      \ /@\(\<thick\>\|\<thin\>\|\<objc\>\)/
+
+" TODO: handle [tail_elems sil-type * sil-operand]
+syn region silAttribute contains=silAttributes
+      \ start="\[" end="\]"
+syn keyword silAttributes contained containedin=silAttribute
+      \ abort
+      \ deinit
+      \ delegatingself
+      \ derivedself
+      \ derivedselfonly
+      \ dynamic
+      \ exact
+      \ init
+      \ modify
+      \ mutating
+      \ objc
+      \ open
+      \ read
+      \ rootself
+      \ stack
+      \ static
+      \ strict
+      \ unknown
+      \ unsafe
+      \ var
+
+syn keyword swiftImport import skipwhite nextgroup=swiftImportModule
+syn match swiftImportModule /\<[A-Za-z_][A-Za-z_0-9]*\>/ contained nextgroup=swiftImportComponent
+syn match swiftImportComponent /\.\<[A-Za-z_][A-Za-z_0-9]*\>/ contained nextgroup=swiftImportComponent
+
+syn region swiftComment start="/\*" end="\*/" contains=swiftComment,swiftTodo
+syn region swiftLineComment start="//" end="$" contains=swiftTodo
+
+syn match swiftLineComment   /^#!.*/
+syn match swiftTypeName  /\<[A-Z][a-zA-Z_0-9]*\>/
+syn match swiftDecimal /\<[-]\?[0-9]\+\>/
+syn match swiftDecimal /\<[-+]\?[0-9]\+\>/
+
+syn match swiftTypeName /\$\*\<\?[A-Z][a-zA-Z0-9_]*\>/
+syn match swiftVarName /%\<[A-z[a-z_0-9]\+\(#[0-9]\+\)\?\>/
+
+syn keyword swiftKeyword break case continue default do else for if in static switch repeat return where while skipwhite
+
+syn keyword swiftKeyword sil internal thunk skipwhite
+syn keyword swiftKeyword public hidden private shared public_external hidden_external skipwhite
+syn keyword swiftKeyword getter setter allocator initializer enumelt destroyer globalaccessor objc skipwhite
+syn keyword swiftKeyword alloc_global alloc_stack alloc_ref alloc_ref_dynamic alloc_box alloc_existential_box alloc_value_buffer dealloc_stack dealloc_box dealloc_existential_box dealloc_ref dealloc_partial_ref dealloc_value_buffer skipwhite
+syn keyword swiftKeyword debug_value debug_value_addr skipwhite
+syn keyword swiftKeyword load load_unowned store assign mark_uninitialized mark_function_escape copy_addr destroy_addr index_addr index_raw_pointer bind_memory to skipwhite
+syn keyword swiftKeyword strong_retain strong_release strong_retain_unowned ref_to_unowned unowned_to_ref unowned_retain unowned_release load_weak store_unowned store_weak fix_lifetime autorelease_value set_deallocating is_unique is_escaping_closure skipwhite
+syn keyword swiftKeyword function_ref integer_literal float_literal string_literal global_addr skipwhite
+syn keyword swiftKeyword class_method super_method witness_method objc_method objc_super_method skipwhite
+syn keyword swiftKeyword partial_apply builtin skipwhite
+syn keyword swiftApplyKeyword apply try_apply skipwhite
+syn keyword swiftKeyword metatype value_metatype existential_metatype skipwhite
+syn keyword swiftKeyword retain_value release_value retain_value_addr release_value_addr tuple tuple_extract tuple_element_addr struct struct_extract struct_element_addr ref_element_addr skipwhite
+syn keyword swiftKeyword init_enum_data_addr unchecked_enum_data unchecked_take_enum_data_addr inject_enum_addr skipwhite
+syn keyword swiftKeyword init_existential_addr init_existential_value init_existential_metatype deinit_existential_addr deinit_existential_value open_existential_addr open_existential_box open_existential_box_value open_existential_metatype init_existential_ref open_existential_ref open_existential_value skipwhite
+syn keyword swiftKeyword upcast address_to_pointer pointer_to_address pointer_to_thin_function unchecked_addr_cast unchecked_ref_cast unchecked_ref_cast_addr ref_to_raw_pointer ref_to_bridge_object ref_to_unmanaged unmanaged_to_ref raw_pointer_to_ref skipwhite
+syn keyword swiftKeyword convert_function thick_to_objc_metatype thin_function_to_pointer objc_to_thick_metatype thin_to_thick_function unchecked_ref_bit_cast unchecked_trivial_bit_cast bridge_object_to_ref bridge_object_to_word unchecked_bitwise_cast skipwhite
+syn keyword swiftKeyword objc_existential_metatype_to_object objc_metatype_to_object objc_protocol skipwhite
+syn keyword swiftKeyword unconditional_checked_cast unconditional_checked_cast_addr unconditional_checked_cast_value skipwhite
+syn keyword swiftKeyword cond_fail skipwhite
+syn keyword swiftKeyword unreachable return throw br cond_br switch_value select_enum select_enum_addr select_value switch_enum switch_enum_addr dynamic_method_br checked_cast_br checked_cast_value_br checked_cast_addr_br skipwhite
+syn keyword swiftKeyword project_box project_existential_box project_value_buffer project_block_storage init_block_storage_header copy_block mark_dependence skipwhite
+
+syn keyword swiftTypeDefinition class extension protocol struct typealias enum skipwhite nextgroup=swiftTypeName
+syn region swiftTypeAttributes start="\[" end="\]" skipwhite contained nextgroup=swiftTypeName
+syn match swiftTypeName /\<[A-Za-z_][A-Za-z_0-9\.]*\>/ contained nextgroup=swiftTypeParameters
+
+syn region swiftTypeParameters start="<" end=">" skipwhite contained
+
+syn keyword swiftFuncDefinition func skipwhite nextgroup=swiftFuncAttributes,swiftFuncName,swiftOperator
+syn region swiftFuncAttributes start="\[" end="\]" skipwhite contained nextgroup=swiftFuncName,swiftOperator
+syn match swiftFuncName /\<[A-Za-z_][A-Za-z_0-9]*\>/ skipwhite contained nextgroup=swiftTypeParameters
+syn keyword swiftFuncKeyword subscript init destructor nextgroup=swiftTypeParameters
+
+syn keyword swiftVarDefinition var skipwhite nextgroup=swiftVarName
+syn keyword swiftVarDefinition let skipwhite nextgroup=swiftVarName
+syn match swiftVarName /\<[A-Za-z_][A-Za-z_0-9]*\>/ skipwhite contained
+
+syn keyword swiftDefinitionModifier static
+
+syn match swiftImplicitVarName /\$\<[A-Za-z_0-9]\+\>/
+
+hi def link swiftImport Include
+hi def link swiftImportModule Title
+hi def link swiftImportComponent Identifier
+hi def link swiftApplyKeyword Statement
+hi def link swiftKeyword Statement
+hi def link swiftTypeDefinition Define
+hi def link swiftTypeName Type
+hi def link swiftTypeParameters Special
+hi def link swiftTypeAttributes PreProc
+hi def link swiftFuncDefinition Define
+hi def link swiftDefinitionModifier Define
+hi def link swiftFuncName Function
+hi def link swiftFuncAttributes PreProc
+hi def link swiftFuncKeyword Function
+hi def link swiftVarDefinition Define
+hi def link swiftVarName Identifier
+hi def link swiftImplicitVarName Identifier
+hi def link swiftIdentifierKeyword Identifier
+hi def link swiftTypeDeclaration Delimiter
+hi def link swiftBoolean Boolean
+hi def link swiftString String
+hi def link swiftInterpolation Special
+hi def link swiftComment Comment
+hi def link swiftLineComment Comment
+hi def link swiftDecimal Number
+hi def link swiftHex Number
+hi def link swiftOct Number
+hi def link swiftBin Number
+hi def link swiftOperator Function
+hi def link swiftChar Character
+hi def link swiftLabel Label
+hi def link swiftNew Operator
+
+hi def link silStage Special
+hi def link silStages Type
+hi def link silConvention Special
+hi def link silConventionParameter Special
+hi def link silConventions Type
+hi def link silIdentifier Identifier
+hi def link silFunctionType Special
+hi def link silMetatypeType Special
+hi def link silAttribute PreProc
+
+let b:current_syntax = "sil"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/syntax/simula.vim b/syntax/simula.vim
new file mode 100644
index 000000000..2806cfe79
--- /dev/null
+++ b/syntax/simula.vim
@@ -0,0 +1,91 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'simula') == -1
+
+" Vim syntax file
+" Language:	Simula
+" Maintainer:	Haakon Riiser <hakonrk@fys.uio.no>
+" URL:		http://folk.uio.no/hakonrk/vim/syntax/simula.vim
+" Last Change:	2001 May 15
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+" No case sensitivity in Simula
+syn case	ignore
+
+syn match	simulaComment		"^%.*$" contains=simulaTodo
+syn region	simulaComment		start="!\|\<comment\>" end=";" contains=simulaTodo
+
+" Text between the keyword 'end' and either a semicolon or one of the
+" keywords 'end', 'else', 'when' or 'otherwise' is also a comment
+syn region	simulaComment		start="\<end\>"lc=3 matchgroup=Statement end=";\|\<\(end\|else\|when\|otherwise\)\>"
+
+syn match	simulaCharError		"'.\{-2,}'"
+syn match	simulaCharacter		"'.'"
+syn match	simulaCharacter		"'!\d\{-}!'" contains=simulaSpecialChar
+syn match	simulaString		'".\{-}"' contains=simulaSpecialChar,simulaTodo
+
+syn keyword	simulaBoolean		true false
+syn keyword	simulaCompound		begin end
+syn keyword	simulaConditional	else if otherwise then until when
+syn keyword	simulaConstant		none notext
+syn keyword	simulaFunction		procedure
+syn keyword	simulaOperator		eq eqv ge gt imp in is le lt ne new not qua
+syn keyword	simulaRepeat		while for
+syn keyword	simulaReserved		activate after at before delay go goto label prior reactivate switch to
+syn keyword	simulaStatement		do inner inspect step this
+syn keyword	simulaStorageClass	external hidden name protected value
+syn keyword	simulaStructure		class
+syn keyword	simulaType		array boolean character integer long real short text virtual
+syn match	simulaAssigned		"\<\h\w*\s*\((.*)\)\=\s*:\(=\|-\)"me=e-2
+syn match	simulaOperator		"[&:=<>+\-*/]"
+syn match	simulaOperator		"\<and\(\s\+then\)\=\>"
+syn match	simulaOperator		"\<or\(\s\+else\)\=\>"
+syn match	simulaReferenceType	"\<ref\s*(.\{-})"
+syn match	simulaSemicolon		";"
+syn match	simulaSpecial		"[(),.]"
+syn match	simulaSpecialCharErr	"!\d\{-4,}!" contained
+syn match	simulaSpecialCharErr	"!!" contained
+syn match	simulaSpecialChar	"!\d\{-}!" contains=simulaSpecialCharErr contained
+syn match	simulaTodo		"xxx\+" contained
+
+" Integer number (or float without `.')
+syn match	simulaNumber		"-\=\<\d\+\>"
+" Real with optional exponent
+syn match	simulaReal		"-\=\<\d\+\(\.\d\+\)\=\(&&\=[+-]\=\d\+\)\=\>"
+" Real starting with a `.', optional exponent
+syn match	simulaReal		"-\=\.\d\+\(&&\=[+-]\=\d\+\)\=\>"
+
+
+hi def link simulaAssigned		Identifier
+hi def link simulaBoolean		Boolean
+hi def link simulaCharacter		Character
+hi def link simulaCharError		Error
+hi def link simulaComment		Comment
+hi def link simulaCompound		Statement
+hi def link simulaConditional		Conditional
+hi def link simulaConstant		Constant
+hi def link simulaFunction		Function
+hi def link simulaNumber			Number
+hi def link simulaOperator		Operator
+hi def link simulaReal			Float
+hi def link simulaReferenceType		Type
+hi def link simulaRepeat			Repeat
+hi def link simulaReserved		Error
+hi def link simulaSemicolon		Statement
+hi def link simulaSpecial		Special
+hi def link simulaSpecialChar		SpecialChar
+hi def link simulaSpecialCharErr		Error
+hi def link simulaStatement		Statement
+hi def link simulaStorageClass		StorageClass
+hi def link simulaString			String
+hi def link simulaStructure		Structure
+hi def link simulaTodo			Todo
+hi def link simulaType			Type
+
+
+let b:current_syntax = "simula"
+" vim: sts=4 sw=4 ts=8
+
+endif
diff --git a/syntax/sinda.vim b/syntax/sinda.vim
new file mode 100644
index 000000000..b2b4ce091
--- /dev/null
+++ b/syntax/sinda.vim
@@ -0,0 +1,133 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sinda') == -1
+
+" Vim syntax file
+" Language:     sinda85, sinda/fluint input file
+" Maintainer:   Adrian Nagle, anagle@ball.com
+" Last Change:  2003 May 11
+" Filenames:    *.sin
+" URL:		http://www.naglenet.org/vim/syntax/sinda.vim
+" MAIN URL:     http://www.naglenet.org/vim/
+
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+
+
+" Ignore case
+syn case ignore
+
+
+
+"
+"
+" Begin syntax definitions for sinda input and output files.
+"
+
+" Force free-form fortran format
+let fortran_free_source=1
+
+" Load FORTRAN syntax file
+runtime! syntax/fortran.vim
+unlet b:current_syntax
+
+
+
+" Define keywords for SINDA
+syn keyword sindaMacro    BUILD BUILDF DEBON DEBOFF DEFMOD FSTART FSTOP
+
+syn keyword sindaOptions  TITLE PPSAVE RSI RSO OUTPUT SAVE QMAP USER1 USER2
+syn keyword sindaOptions  MODEL PPOUT NOLIST MLINE NODEBUG DIRECTORIES
+syn keyword sindaOptions  DOUBLEPR
+
+syn keyword sindaRoutine  FORWRD FWDBCK STDSTL FASTIC
+
+syn keyword sindaControl  ABSZRO ACCELX ACCELY ACCELZ ARLXCA ATMPCA
+syn keyword sindaControl  BACKUP CSGFAC DRLXCA DTIMEH DTIMEI DTIMEL
+syn keyword sindaControl  DTIMES DTMPCA EBALNA EBALSA EXTLIM ITEROT
+syn keyword sindaControl  ITERXT ITHOLD NLOOPS NLOOPT OUTPUT OPEITR
+syn keyword sindaControl  PATMOS SIGMA TIMEO TIMEND UID
+
+syn keyword sindaSubRoutine  ASKERS ADARIN ADDARY ADDMOD ARINDV
+syn keyword sindaSubRoutine  RYINV ARYMPY ARYSUB ARYTRN BAROC
+syn keyword sindaSubRoutine  BELACC BNDDRV BNDGET CHENNB CHGFLD
+syn keyword sindaSubRoutine  CHGLMP CHGSUC CHGVOL CHKCHL CHKCHP
+syn keyword sindaSubRoutine  CNSTAB COMBAL COMPLQ COMPRS CONTRN
+syn keyword sindaSubRoutine  CPRINT CRASH CRVINT CRYTRN CSIFLX
+syn keyword sindaSubRoutine  CVTEMP D11CYL C11DAI D11DIM D11MCY
+syn keyword sindaSubRoutine  D11MDA D11MDI D11MDT D12CYL D12MCY
+syn keyword sindaSubRoutine  D12MDA D1D1DA D1D1IM D1D1WM D1D2DA
+syn keyword sindaSubRoutine  D1D2WM D1DEG1 D1DEG2 D1DG1I D1IMD1
+syn keyword sindaSubRoutine  D1IMIM D1IMWM D1M1DA D1M2MD D1M2WM
+syn keyword sindaSubRoutine  D1MDG1 D1MDG2 D2D1WM D1DEG1 D2DEG2
+syn keyword sindaSubRoutine  D2D2
+
+syn keyword sindaIdentifier  BIV CAL DIM DIV DPM DPV DTV GEN PER PIV PIM
+syn keyword sindaIdentifier  SIM SIV SPM SPV TVS TVD
+
+
+
+" Define matches for SINDA
+syn match  sindaFortran     "^F[0-9 ]"me=e-1
+syn match  sindaMotran      "^M[0-9 ]"me=e-1
+
+syn match  sindaComment     "^C.*$"
+syn match  sindaComment     "^R.*$"
+syn match  sindaComment     "\$.*$"
+
+syn match  sindaHeader      "^header[^,]*"
+
+syn match  sindaIncludeFile "include \+[^ ]\+"hs=s+8 contains=fortranInclude
+
+syn match  sindaMacro       "^PSTART"
+syn match  sindaMacro       "^PSTOP"
+syn match  sindaMacro       "^FAC"
+
+syn match  sindaInteger     "-\=\<[0-9]*\>"
+syn match  sindaFloat       "-\=\<[0-9]*\.[0-9]*"
+syn match  sindaScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
+
+syn match  sindaEndData		 "^END OF DATA"
+
+if exists("thermal_todo")
+  execute 'syn match  sindaTodo ' . '"^'.thermal_todo.'.*$"'
+else
+  syn match  sindaTodo     "^?.*$"
+endif
+
+
+
+" Define the default highlighting
+" Only when an item doesn't have highlighting yet
+
+hi def link sindaMacro		Macro
+hi def link sindaOptions		Special
+hi def link sindaRoutine		Type
+hi def link sindaControl		Special
+hi def link sindaSubRoutine	Function
+hi def link sindaIdentifier	Identifier
+
+hi def link sindaFortran		PreProc
+hi def link sindaMotran		PreProc
+
+hi def link sindaComment		Comment
+hi def link sindaHeader		Typedef
+hi def link sindaIncludeFile	Type
+hi def link sindaInteger		Number
+hi def link sindaFloat		Float
+hi def link sindaScientific	Float
+
+hi def link sindaEndData		Macro
+
+hi def link sindaTodo		Todo
+
+
+
+let b:current_syntax = "sinda"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/sisu.vim b/syntax/sisu.vim
new file mode 100644
index 000000000..d67a14c92
--- /dev/null
+++ b/syntax/sisu.vim
@@ -0,0 +1,279 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sisu') == -1
+
+" SiSU Vim syntax file
+" SiSU Maintainer: Ralph Amissah <ralph.amissah@gmail.com>
+" SiSU Markup:     SiSU (sisu-5.6.7)
+" Last Change:     2017 Jun 22
+" URL: <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
+"      <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
+"(originally looked at Ruby Vim by Mirko Nasato)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+let s:cpo_save = &cpo
+set cpo&vim
+
+"% "Errors:
+syn match sisu_error contains=sisu_link,sisu_error_wspace "<![^ei]\S\+!>"
+
+"% "Markers Identifiers:
+if !exists("sisu_no_identifiers")
+  syn match   sisu_mark_endnote                                           "\~^"
+  syn match   sisu_break               contains=@NoSpell                  " \\\\\( \|$\)\|<br>\|<br />"
+  syn match   sisu_control             contains=@NoSpell                  "^\(-\\\\-\|=\\\\=\|-\.\.-\|<:p[bn]>\)\s*$"
+  syn match   sisu_control             contains=@NoSpell                  "^<:\(bo\|---\)>\s*$"
+  syn match   sisu_marktail            contains=@NoSpell                  "^--[+~-]#\s*$"
+  syn match   sisu_marktail                                               "[~-]#"
+  syn match   sisu_control                                                "\""
+  syn match   sisu_underline                                              "\(^\| \)_[a-zA-Z0-9]\+_\([ .,]\|$\)"
+  syn match   sisu_number              contains=@NoSpell                  "[0-9a-f]\{32\}\|[0-9a-f]\{64\}"
+  syn match   sisu_link                contains=@NoSpell                  "\(_\?https\?://\|\.\.\/\)\S\+"
+  syn match   sisu_link                                                   " \*\~\S\+"
+  syn match   sisu_require             contains=@NoSpell                  "^<<\s*[a-zA-Z0-9^./_-]\+\.ss[it]$"
+  syn match   sisu_structure                                              "^:A\~$"
+
+"% "Document Sub Headers:
+  syn match   sisu_sub_header_title                                       "^\s\+:\(subtitle\|short\|edition\|language\|lang_char\|note\):\s" "group=sisu_header_content
+  syn match   sisu_sub_header_creator                                     "^\s\+:\(author\|editor\|contributor\|illustrator\|photographer\|translator\|digitized_by\|prepared_by\|audio\|video\):\s"                               " &hon &institution
+  syn match   sisu_sub_header_rights                                      "^\s\+:\(copyright\|text\|translation\|illustrations\|photographs\|preparation\|digitization\|audio\|video\|license\|all\):\s"                   " access_rights license
+  syn match   sisu_sub_header_classify                                    "^\s\+:\(topic_register\|keywords\|subject\|dewey\|loc\):\s"
+  syn match   sisu_sub_header_identifier                                  "^\s\+:\(oclc\|isbn\):\s"
+  syn match   sisu_sub_header_date                                        "^\s\+:\(added_to_site\|available\|created\|issued\|modified\|published\|valid\|translated\|original_publication\):\s"
+  syn match   sisu_sub_header_original                                    "^\s\+:\(publisher\|date\|language\|lang_char\|institution\|nationality\|source\):\s"
+  syn match   sisu_sub_header_make                                        "^\s\+:\(headings\|num_top\|breaks\|language\|italics\|bold\|emphasis\|substitute\|omit\|plaintext_wrap\|texpdf_font_mono\|texpdf_font\|stamp\|promo\|ad\|manpage\|home_button_text\|home_button_image\|cover_image\|footer\):\s"
+  syn match   sisu_sub_header_notes                                       "^\s\+:\(description\|abstract\|comment\|coverage\|relation\|source\|history\|type\|format\|prefix\|prefix_[ab]\|suffix\):\s"
+  syn match   sisu_within_index_ignore                                    "\S\+[:;]\(\s\+\|$\)"
+  syn match   sisu_within_index                                           "[:|;]\|+\d\+"
+
+"% "semantic markers: (ignore)
+  syn match   sisu_sem_marker                                             ";{\|};[a-z._]*[a-z]"
+  syn match   sisu_sem_marker_block                                       "\([a-z][a-z._]*\|\):{\|}:[a-z._]*[a-z]"
+  syn match   sisu_sem_ex_marker                                          ";\[\|\];[a-z._]*[a-z]"
+  syn match   sisu_sem_ex_marker_block                                    "\([a-z][a-z._]*\|\):\[\|\]:[a-z._]*[a-z]"
+  syn match   sisu_sem_block contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_mark_endnote,sisu_content_endnote "\([a-z]*\):{[^}].\{-}}:\1"
+  syn match   sisu_sem_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker ";{[^}].\{-}};[a-z]\+"
+  syn match   sisu_sem_ex_block contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_mark_endnote,sisu_content_endnote "\([a-z]*\):\[[^}].\{-}\]:\1"
+  syn match   sisu_sem_ex_content contains=sisu_error,sisu_error_wspace,sisu_content_alt,sisu_link,sisu_linked,sisu_break,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker ";\[[^}].\{-}\];[a-z]\+"
+endif
+
+"% "URLs Numbers And ASCII Codes:
+syn match   sisu_number                              "\<\(0x\x\+\|0b[01]\+\|0\o\+\|0\.\d\+\|0\|[1-9][\.0-9_]*\)\>"
+syn match   sisu_number                              "?\(\\M-\\C-\|\\c\|\\C-\|\\M-\)\=\(\\\o\{3}\|\\x\x\{2}\|\\\=\w\)"
+
+"% "Tuned Error: (is error if not already matched)
+syn match sisu_error             contains=sisu_error "[\~/\*!_]{\|}[\~/\*!_]"
+syn match sisu_error             contains=sisu_error "<a href\|</a>]"
+
+"% "Simple Paired Enclosed Markup:
+"url/link
+syn region sisu_link contains=sisu_error,sisu_error_wspace matchgroup=sisu_action start="^<<\s*|[a-zA-Z0-9^._-]\+|@|[a-zA-Z0-9^._-]\+|"rs=s+2 end="$"
+
+"% "Document Header:
+" title
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_title matchgroup=sisu_header start="^[@]title:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+" creator
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_creator matchgroup=sisu_header start="^[@]creator:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+" dates
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_date matchgroup=sisu_header start="^[@]date:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+" publisher
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_publisher matchgroup=sisu_header start="^[@]publisher:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+" rights
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_rights matchgroup=sisu_header start="^[@]rights:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+" classify document
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_classify matchgroup=sisu_header start="^[@]classify:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+" identifier document
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_identifier matchgroup=sisu_header start="^[@]identifier:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+" original language (depreciated)
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_original matchgroup=sisu_header start="^[@]original:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+" notes
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_notes matchgroup=sisu_header start="^[@]notes:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+" links of interest
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_linked,sisu_sub_header_links matchgroup=sisu_header start="^[@]links:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+" make, processing instructions
+syn region sisu_header_content contains=sisu_error,sisu_comment,sisu_break,sisu_link,sisu_sub_header_make matchgroup=sisu_header start="^[@]make:[+-]\?\(\s\|\n\)"rs=e-1 end="\n$"
+
+"% "Headings:
+syn region sisu_heading contains=sisu_mark_endnote,sisu_content_endnote,sisu_marktail,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_ocn,sisu_error,sisu_error_wspace matchgroup=sisu_structure start="^\([1-4]\|:\?[A-D]\)\~\(\S\+\|[^-]\)" end="$"
+
+"% "Block Group Text:
+" table
+syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^table{.\+" end="}table"
+" table
+syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^```\s\+table" end="^```\(\s\|$\)"
+syn region sisu_content_alt contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^{\(t\|table\)\(\~h\)\?\(\sc[0-9]\+;\)\?[0-9; ]*}" end="\n$"
+" block, group, poem, alt
+syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^\z(block\|group\|poem\|alt\){" end="^}\z1"
+syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^```\s\+\(block\|group\|poem\|alt\)" end="^```\(\s\|$\)"
+" box
+syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^box\(\.[a-z]\+\)\?{" end="^}box"
+syn region sisu_content_alt contains=sisu_mark_endnote,sisu_content_endnote,sisu_link,sisu_mark,sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_contain start="^```\s\+\box\(\.[a-z]\+\)\?" end="^```\(\s\|$\)"
+" code
+syn region sisu_content_alt contains=sisu_error,@NoSpell matchgroup=sisu_contain start="^code\(\.[a-z][0-9a-z_]\+\)\?{" end="^}code"
+syn region sisu_content_alt contains=sisu_error,@NoSpell matchgroup=sisu_contain start="^```\s\+code\(\.[a-z][0-9a-z_]\+\)\?" end="^```\(\s\|$\)"
+" quote
+syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_contain start="^```\s\+quote" end="^```\(\s\|$\)"
+
+"% "Endnotes:
+" regular endnote or asterisk or plus sign endnote
+syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker matchgroup=sisu_mark_endnote start="\~{[*+]*" end="}\~" skip="\n"
+" numbered asterisk or plus sign endnote
+syn region sisu_content_endnote contains=sisu_link,sisu_strikeout,sisu_underline,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break,sisu_sem_block,sisu_sem_content,sisu_sem_marker matchgroup=sisu_mark_endnote start="\~\[[*+]*" end="\]\~" skip="\n"
+" endnote content marker (for binary content marking)
+syn region sisu_content_endnote contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_link,sisu_identifier,sisu_error,sisu_error_wspace,sisu_mark,sisu_break matchgroup=sisu_mark_endnote start="\^\~" end="\n$"
+
+"% "Links And Images:
+" image with url link (and possibly footnote of url)
+syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="}\(https\?:/\/\|:\|\.\.\/\|#\)\S\+" oneline
+" sisu outputs, short notation
+syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_sem_block,sisu_error matchgroup=sisu_link start="{\(\~^\s\)\?" end="\[[1-5][sS]*\]}\S\+\.ss[tm]" oneline
+" image
+syn region sisu_linked contains=sisu_fontface,sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_link start="{" end="}image" oneline
+
+"% "Some Line Operations:
+" bold line
+syn region sisu_bold contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^!_ " end=" \\\\\|$"
+" indent and bullet paragraph
+syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\) " end="$"
+" indent and bullet (bold start) paragraph
+syn region sisu_bold contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_\([1-9*]\|[1-9]\*\)!_\? " end=" \\\\\|$"
+" hanging indent paragraph [proposed]
+syn region sisu_normal contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_[0-9]\?_[0-9] " end="$"
+" hanging indent (bold start/ definition) paragraph [proposed]
+syn region sisu_bold contains=sisu_fontface,sisu_bold,sisu_control,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_sem_block,sisu_sem_content,sisu_sem_marker_block,sisu_sem_marker,sisu_sem_ex_marker_block,sisu_sem_ex_marker,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^_[0-9]\?_[0-9]!_\? " end=" \\\\\|$"
+" list numbering
+syn region sisu_normal contains=sisu_strikeout,sisu_identifier,sisu_content_endnote,sisu_mark_endnote,sisu_link,sisu_linked,sisu_error,sisu_error_wspace matchgroup=sisu_markpara start="^\(#[ 1]\|_# \)" end="$"
+
+"% "Font Face Curly Brackets:
+"syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_sem start="\S\+:{" end="}:[^<>,.!?:; ]\+" oneline
+" book index:
+syn region sisu_index contains=sisu_within_index_ignore,sisu_within_index matchgroup=sisu_index_block start="^={" end="}"
+" emphasis:
+syn region sisu_bold contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\*{" end="}\*"
+" bold:
+syn region sisu_bold contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="!{" end="}!"
+" underscore:
+syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="_{" end="}_"
+" italics:
+syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="/{" end="}/"
+" added:
+syn region sisu_underline contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="+{" end="}+"
+" superscript:
+syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="\^{" end="}\^"
+" subscript:
+syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start=",{" end="},"
+" monospace:
+syn region sisu_identifier contains=sisu_strikeout,sisu_number,sisu_bold,sisu_control,sisu_identifier,sisu_error matchgroup=sisu_fontface start="#{" end="}#"
+" strikethrough:
+syn region sisu_strikeout contains=sisu_error matchgroup=sisu_fontface start="-{" end="}-"
+
+"% "Single Words Bold Italicise Etc: (depreciated)
+syn region sisu_bold contains=sisu_error matchgroup=sisu_bold start="\([ (]\|^\)\*[^\|{\n\~\\]"hs=e-1 end="\*"he=e-0 skip="[a-zA-Z0-9']" oneline
+syn region sisu_identifier contains=sisu_error matchgroup=sisu_content_alt start="\([ ]\|^\)/[^{ \|\n\\]"hs=e-1 end="/\[ \.\]" skip="[a-zA-Z0-9']" oneline
+"misc
+syn region sisu_identifier contains=sisu_error matchgroup=sisu_fontface start="\^[^ {\|\n\\]"rs=s+1 end="\^[ ,.;:'})\\\n]" skip="[a-zA-Z0-9']" oneline
+
+"% "Expensive Mode:
+if !exists("sisu_no_expensive")
+else " not Expensive
+  syn region  sisu_content_alt  matchgroup=sisu_control start="^\s*def\s" matchgroup=NONE end="[?!]\|\>" skip="\.\|\(::\)" oneline
+endif " Expensive?
+
+"% "Headers And Headings: (Document Instructions)
+syn match sisu_control contains=sisu_error,sisu_error_wspace "4\~! \S\+"
+syn region  sisu_markpara contains=sisu_error,sisu_error_wspace start="^=begin" end="^=end.*$"
+
+"% "Errors:
+syn match sisu_error_wspace contains=sisu_error_wspace "^\s\+[^:]"
+syn match sisu_error_wspace contains=sisu_error_wspace "\s\s\+"
+syn match sisu_error_wspace contains=sisu_error_wspace "\s\+$"
+syn match sisu_error contains=sisu_error_wspace "\t\+"
+syn match sisu_error contains=sisu_error,sisu_error_wspace "\([^ (][_\\]\||[^ (}]\)https\?:\S\+"
+syn match sisu_error contains=sisu_error "_\?https\?:\S\+[}><]"
+syn match sisu_error contains=sisu_error "\([!*/_\+,^]\){\([^(\}\1)]\)\{-}\n$"
+syn match sisu_error contains=sisu_error "^[\~]{[^{]\{-}\n$"
+syn match sisu_error contains=sisu_error "\s\+.{{"
+syn match sisu_error contains=sisu_error "^\~\s*$"
+syn match sisu_error contains=sisu_error "^0\~.*"
+syn match sisu_error contains=sisu_error "^[1-9]\~\s*$"
+syn match sisu_error contains=sisu_error "^[1-9]\~\S\+\s*$"
+syn match sisu_error contains=sisu_error "[^{]\~\^[^ \)]"
+syn match sisu_error contains=sisu_error "\~\^\s\+\.\s*"
+syn match sisu_error contains=sisu_error "{\~^\S\+"
+syn match sisu_error contains=sisu_error "[_/\*!^]{[ .,:;?><]*}[_/\*!^]"
+syn match sisu_error contains=sisu_error "[^ (\"'(\[][_/\*!]{\|}[_/\*!][a-zA-Z0-9)\]\"']"
+syn match sisu_error contains=sisu_error "<dir>"
+"errors for filetype sisu, though not error in 'metaverse':
+syn match sisu_error contains=sisu_error,sisu_match,sisu_strikeout,sisu_contain,sisu_content_alt,sisu_mark,sisu_break,sisu_number "<[a-zA-Z\/]\+>"
+syn match sisu_error  "/\?<\([biu]\)>[^(</\1>)]\{-}\n$"
+
+"% "Error Exceptions:
+syn match sisu_control "\n$" "contains=ALL
+"syn match sisu_control " //"
+syn match sisu_error   "%{"
+syn match sisu_error   "<br>_\?https\?:\S\+\|_\?https\?:\S\+<br>"
+syn match sisu_error   "[><]_\?https\?:\S\+\|_\?https\?:\S\+[><]"
+syn match sisu_comment "^%\{1,2\}.\+"
+
+"% "Definitions Default Highlighting:
+hi def link sisu_normal                Normal
+hi def link sisu_bold                  Statement
+hi def link sisu_header                PreProc
+hi def link sisu_header_content        Normal
+hi def link sisu_sub_header_title      Statement
+hi def link sisu_sub_header_creator    Statement
+hi def link sisu_sub_header_date       Statement
+hi def link sisu_sub_header_publisher  Statement
+hi def link sisu_sub_header_rights     Statement
+hi def link sisu_sub_header_classify   Statement
+hi def link sisu_sub_header_identifier Statement
+hi def link sisu_sub_header_original   Statement
+hi def link sisu_sub_header_links      Statement
+hi def link sisu_sub_header_notes      Statement
+hi def link sisu_sub_header_make       Statement
+hi def link sisu_heading               Title
+hi def link sisu_structure             Operator
+hi def link sisu_contain               Include
+hi def link sisu_mark_endnote          Delimiter
+hi def link sisu_require               NonText
+hi def link sisu_link                  NonText
+hi def link sisu_linked                String
+hi def link sisu_fontface              Delimiter
+hi def link sisu_strikeout             DiffDelete
+hi def link sisu_content_alt           Special
+hi def link sisu_sem_content           SpecialKey
+hi def link sisu_sem_block             Special
+hi def link sisu_sem_marker            Visual
+"hi def link sisu_sem_marker            Structure
+hi def link sisu_sem_marker_block      MatchParen
+hi def link sisu_sem_ex_marker         FoldColumn
+hi def link sisu_sem_ex_marker_block   Folded
+hi def link sisu_sem_ex_content        Comment
+"hi def link sisu_sem_ex_content        SpecialKey
+hi def link sisu_sem_ex_block          Comment
+hi def link sisu_index                 SpecialKey
+hi def link sisu_index_block           Visual
+hi def link sisu_content_endnote       Special
+hi def link sisu_control               Delimiter
+hi def link sisu_within_index          Delimiter
+hi def link sisu_within_index_ignore   SpecialKey
+hi def link sisu_ocn                   Include
+hi def link sisu_number                Number
+hi def link sisu_identifier            Function
+hi def link sisu_underline             Underlined
+hi def link sisu_markpara              Include
+hi def link sisu_marktail              Include
+hi def link sisu_mark                  Identifier
+hi def link sisu_break                 Structure
+hi def link sisu_html                  Type
+hi def link sisu_action                Identifier
+hi def link sisu_comment               Comment
+hi def link sisu_error_sem_marker      Error
+hi def link sisu_error_wspace          Error
+hi def link sisu_error                 Error
+let b:current_syntax = "sisu"
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/skill.vim b/syntax/skill.vim
new file mode 100644
index 000000000..cddbb41a4
--- /dev/null
+++ b/syntax/skill.vim
@@ -0,0 +1,553 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'skill') == -1
+
+" Vim syntax file
+" Language:		SKILL
+" Maintainer:	Toby Schaffer <jtschaff@eos.ncsu.edu>
+" Last Change:	2003 May 11
+" Comments:		SKILL is a Lisp-like programming language for use in EDA
+"				tools from Cadence Design Systems. It allows you to have
+"				a programming environment within the Cadence environment
+"				that gives you access to the complete tool set and design
+"				database. This file also defines syntax highlighting for
+"				certain Design Framework II interface functions.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn keyword skillConstants			t nil unbound
+
+" enumerate all the SKILL reserved words/functions
+syn match skillFunction     "(abs\>"hs=s+1
+syn match skillFunction     "\<abs("he=e-1
+syn match skillFunction     "(a\=cos\>"hs=s+1
+syn match skillFunction     "\<a\=cos("he=e-1
+syn match skillFunction     "(add1\>"hs=s+1
+syn match skillFunction     "\<add1("he=e-1
+syn match skillFunction     "(addDefstructClass\>"hs=s+1
+syn match skillFunction     "\<addDefstructClass("he=e-1
+syn match skillFunction     "(alias\>"hs=s+1
+syn match skillFunction     "\<alias("he=e-1
+syn match skillFunction     "(alphalessp\>"hs=s+1
+syn match skillFunction     "\<alphalessp("he=e-1
+syn match skillFunction     "(alphaNumCmp\>"hs=s+1
+syn match skillFunction     "\<alphaNumCmp("he=e-1
+syn match skillFunction     "(append1\=\>"hs=s+1
+syn match skillFunction     "\<append1\=("he=e-1
+syn match skillFunction     "(apply\>"hs=s+1
+syn match skillFunction     "\<apply("he=e-1
+syn match skillFunction     "(arrayp\>"hs=s+1
+syn match skillFunction     "\<arrayp("he=e-1
+syn match skillFunction     "(arrayref\>"hs=s+1
+syn match skillFunction     "\<arrayref("he=e-1
+syn match skillFunction     "(a\=sin\>"hs=s+1
+syn match skillFunction     "\<a\=sin("he=e-1
+syn match skillFunction     "(assoc\>"hs=s+1
+syn match skillFunction     "\<assoc("he=e-1
+syn match skillFunction     "(ass[qv]\>"hs=s+1
+syn match skillFunction     "\<ass[qv]("he=e-1
+syn match skillFunction     "(a\=tan\>"hs=s+1
+syn match skillFunction     "\<a\=tan("he=e-1
+syn match skillFunction     "(ato[fim]\>"hs=s+1
+syn match skillFunction     "\<ato[fim]("he=e-1
+syn match skillFunction     "(bcdp\>"hs=s+1
+syn match skillFunction     "\<bcdp("he=e-1
+syn match skillKeywords     "(begin\>"hs=s+1
+syn match skillKeywords     "\<begin("he=e-1
+syn match skillFunction     "(booleanp\>"hs=s+1
+syn match skillFunction     "\<booleanp("he=e-1
+syn match skillFunction     "(boundp\>"hs=s+1
+syn match skillFunction     "\<boundp("he=e-1
+syn match skillFunction     "(buildString\>"hs=s+1
+syn match skillFunction     "\<buildString("he=e-1
+syn match skillFunction     "(c[ad]{1,3}r\>"hs=s+1
+syn match skillFunction     "\<c[ad]{1,3}r("he=e-1
+syn match skillConditional  "(caseq\=\>"hs=s+1
+syn match skillConditional  "\<caseq\=("he=e-1
+syn match skillFunction     "(ceiling\>"hs=s+1
+syn match skillFunction     "\<ceiling("he=e-1
+syn match skillFunction     "(changeWorkingDir\>"hs=s+1
+syn match skillFunction     "\<changeWorkingDir("he=e-1
+syn match skillFunction     "(charToInt\>"hs=s+1
+syn match skillFunction     "\<charToInt("he=e-1
+syn match skillFunction     "(clearExitProcs\>"hs=s+1
+syn match skillFunction     "\<clearExitProcs("he=e-1
+syn match skillFunction     "(close\>"hs=s+1
+syn match skillFunction     "\<close("he=e-1
+syn match skillFunction     "(compareTime\>"hs=s+1
+syn match skillFunction     "\<compareTime("he=e-1
+syn match skillFunction     "(compress\>"hs=s+1
+syn match skillFunction     "\<compress("he=e-1
+syn match skillFunction     "(concat\>"hs=s+1
+syn match skillFunction     "\<concat("he=e-1
+syn match skillConditional  "(cond\>"hs=s+1
+syn match skillConditional  "\<cond("he=e-1
+syn match skillFunction     "(cons\>"hs=s+1
+syn match skillFunction     "\<cons("he=e-1
+syn match skillFunction     "(copy\>"hs=s+1
+syn match skillFunction     "\<copy("he=e-1
+syn match skillFunction     "(copyDefstructDeep\>"hs=s+1
+syn match skillFunction     "\<copyDefstructDeep("he=e-1
+syn match skillFunction     "(createDir\>"hs=s+1
+syn match skillFunction     "\<createDir("he=e-1
+syn match skillFunction     "(csh\>"hs=s+1
+syn match skillFunction     "\<csh("he=e-1
+syn match skillKeywords     "(declare\>"hs=s+1
+syn match skillKeywords     "\<declare("he=e-1
+syn match skillKeywords     "(declare\(N\|SQN\)\=Lambda\>"hs=s+1
+syn match skillKeywords     "\<declare\(N\|SQN\)\=Lambda("he=e-1
+syn match skillKeywords     "(defmacro\>"hs=s+1
+syn match skillKeywords     "\<defmacro("he=e-1
+syn match skillKeywords     "(defprop\>"hs=s+1
+syn match skillKeywords     "\<defprop("he=e-1
+syn match skillKeywords     "(defstruct\>"hs=s+1
+syn match skillKeywords     "\<defstruct("he=e-1
+syn match skillFunction     "(defstructp\>"hs=s+1
+syn match skillFunction     "\<defstructp("he=e-1
+syn match skillKeywords     "(defun\>"hs=s+1
+syn match skillKeywords     "\<defun("he=e-1
+syn match skillKeywords     "(defUserInitProc\>"hs=s+1
+syn match skillKeywords     "\<defUserInitProc("he=e-1
+syn match skillKeywords     "(defvar\>"hs=s+1
+syn match skillKeywords     "\<defvar("he=e-1
+syn match skillFunction     "(delete\(Dir\|File\)\>"hs=s+1
+syn match skillKeywords     "\<delete\(Dir\|File\)("he=e-1
+syn match skillFunction     "(display\>"hs=s+1
+syn match skillFunction     "\<display("he=e-1
+syn match skillFunction     "(drain\>"hs=s+1
+syn match skillFunction     "\<drain("he=e-1
+syn match skillFunction     "(dtpr\>"hs=s+1
+syn match skillFunction     "\<dtpr("he=e-1
+syn match skillFunction     "(ed\(i\|l\|it\)\=\>"hs=s+1
+syn match skillFunction     "\<ed\(i\|l\|it\)\=("he=e-1
+syn match skillFunction     "(envobj\>"hs=s+1
+syn match skillFunction     "\<envobj("he=e-1
+syn match skillFunction     "(equal\>"hs=s+1
+syn match skillFunction     "\<equal("he=e-1
+syn match skillFunction     "(eqv\=\>"hs=s+1
+syn match skillFunction     "\<eqv\=("he=e-1
+syn match skillFunction     "(err\>"hs=s+1
+syn match skillFunction     "\<err("he=e-1
+syn match skillFunction     "(error\>"hs=s+1
+syn match skillFunction     "\<error("he=e-1
+syn match skillFunction     "(errset\>"hs=s+1
+syn match skillFunction     "\<errset("he=e-1
+syn match skillFunction     "(errsetstring\>"hs=s+1
+syn match skillFunction     "\<errsetstring("he=e-1
+syn match skillFunction     "(eval\>"hs=s+1
+syn match skillFunction     "\<eval("he=e-1
+syn match skillFunction     "(evalstring\>"hs=s+1
+syn match skillFunction     "\<evalstring("he=e-1
+syn match skillFunction     "(evenp\>"hs=s+1
+syn match skillFunction     "\<evenp("he=e-1
+syn match skillFunction     "(exists\>"hs=s+1
+syn match skillFunction     "\<exists("he=e-1
+syn match skillFunction     "(exit\>"hs=s+1
+syn match skillFunction     "\<exit("he=e-1
+syn match skillFunction     "(exp\>"hs=s+1
+syn match skillFunction     "\<exp("he=e-1
+syn match skillFunction     "(expandMacro\>"hs=s+1
+syn match skillFunction     "\<expandMacro("he=e-1
+syn match skillFunction     "(file\(Length\|Seek\|Tell\|TimeModified\)\>"hs=s+1
+syn match skillFunction     "\<file\(Length\|Seek\|Tell\|TimeModified\)("he=e-1
+syn match skillFunction     "(fixp\=\>"hs=s+1
+syn match skillFunction     "\<fixp\=("he=e-1
+syn match skillFunction     "(floatp\=\>"hs=s+1
+syn match skillFunction     "\<floatp\=("he=e-1
+syn match skillFunction     "(floor\>"hs=s+1
+syn match skillFunction     "\<floor("he=e-1
+syn match skillRepeat       "(for\(all\|each\)\=\>"hs=s+1
+syn match skillRepeat       "\<for\(all\|each\)\=("he=e-1
+syn match skillFunction     "([fs]\=printf\>"hs=s+1
+syn match skillFunction     "\<[fs]\=printf("he=e-1
+syn match skillFunction     "(f\=scanf\>"hs=s+1
+syn match skillFunction     "\<f\=scanf("he=e-1
+syn match skillFunction     "(funobj\>"hs=s+1
+syn match skillFunction     "\<funobj("he=e-1
+syn match skillFunction     "(gc\>"hs=s+1
+syn match skillFunction     "\<gc("he=e-1
+syn match skillFunction     "(gensym\>"hs=s+1
+syn match skillFunction     "\<gensym("he=e-1
+syn match skillFunction     "(get\(_pname\|_string\)\=\>"hs=s+1
+syn match skillFunction     "\<get\(_pname\|_string\)\=("he=e-1
+syn match skillFunction     "(getc\(har\)\=\>"hs=s+1
+syn match skillFunction     "\<getc\(har\)\=("he=e-1
+syn match skillFunction     "(getCurrentTime\>"hs=s+1
+syn match skillFunction     "\<getCurrentTime("he=e-1
+syn match skillFunction     "(getd\>"hs=s+1
+syn match skillFunction     "\<getd("he=e-1
+syn match skillFunction     "(getDirFiles\>"hs=s+1
+syn match skillFunction     "\<getDirFiles("he=e-1
+syn match skillFunction     "(getFnWriteProtect\>"hs=s+1
+syn match skillFunction     "\<getFnWriteProtect("he=e-1
+syn match skillFunction     "(getRunType\>"hs=s+1
+syn match skillFunction     "\<getRunType("he=e-1
+syn match skillFunction     "(getInstallPath\>"hs=s+1
+syn match skillFunction     "\<getInstallPath("he=e-1
+syn match skillFunction     "(getqq\=\>"hs=s+1
+syn match skillFunction     "\<getqq\=("he=e-1
+syn match skillFunction     "(gets\>"hs=s+1
+syn match skillFunction     "\<gets("he=e-1
+syn match skillFunction     "(getShellEnvVar\>"hs=s+1
+syn match skillFunction     "\<getShellEnvVar("he=e-1
+syn match skillFunction     "(getSkill\(Path\|Version\)\>"hs=s+1
+syn match skillFunction     "\<getSkill\(Path\|Version\)("he=e-1
+syn match skillFunction     "(getVarWriteProtect\>"hs=s+1
+syn match skillFunction     "\<getVarWriteProtect("he=e-1
+syn match skillFunction     "(getVersion\>"hs=s+1
+syn match skillFunction     "\<getVersion("he=e-1
+syn match skillFunction     "(getWarn\>"hs=s+1
+syn match skillFunction     "\<getWarn("he=e-1
+syn match skillFunction     "(getWorkingDir\>"hs=s+1
+syn match skillFunction     "\<getWorkingDir("he=e-1
+syn match skillRepeat       "(go\>"hs=s+1
+syn match skillRepeat       "\<go("he=e-1
+syn match skillConditional  "(if\>"hs=s+1
+syn match skillConditional  "\<if("he=e-1
+syn keyword skillConditional then else
+syn match skillFunction     "(index\>"hs=s+1
+syn match skillFunction     "\<index("he=e-1
+syn match skillFunction     "(infile\>"hs=s+1
+syn match skillFunction     "\<infile("he=e-1
+syn match skillFunction     "(inportp\>"hs=s+1
+syn match skillFunction     "\<inportp("he=e-1
+syn match skillFunction     "(in\(Scheme\|Skill\)\>"hs=s+1
+syn match skillFunction     "\<in\(Scheme\|Skill\)("he=e-1
+syn match skillFunction     "(instring\>"hs=s+1
+syn match skillFunction     "\<instring("he=e-1
+syn match skillFunction     "(integerp\>"hs=s+1
+syn match skillFunction     "\<integerp("he=e-1
+syn match skillFunction     "(intToChar\>"hs=s+1
+syn match skillFunction     "\<intToChar("he=e-1
+syn match skillFunction     "(is\(Callable\|Dir\|Executable\|File\|FileEncrypted\|FileName\|Link\|Macro\|Writable\)\>"hs=s+1
+syn match skillFunction     "\<is\(Callable\|Dir\|Executable\|File\|FileEncrypted\|FileName\|Link\|Macro\|Writable\)("he=e-1
+syn match skillKeywords     "(n\=lambda\>"hs=s+1
+syn match skillKeywords     "\<n\=lambda("he=e-1
+syn match skillKeywords     "(last\>"hs=s+1
+syn match skillKeywords     "\<last("he=e-1
+syn match skillFunction     "(lconc\>"hs=s+1
+syn match skillFunction     "\<lconc("he=e-1
+syn match skillFunction     "(length\>"hs=s+1
+syn match skillFunction     "\<length("he=e-1
+syn match skillKeywords     "(let\>"hs=s+1
+syn match skillKeywords     "\<let("he=e-1
+syn match skillFunction     "(lineread\(string\)\=\>"hs=s+1
+syn match skillFunction     "\<lineread\(string\)\=("he=e-1
+syn match skillKeywords     "(list\>"hs=s+1
+syn match skillKeywords     "\<list("he=e-1
+syn match skillFunction     "(listp\>"hs=s+1
+syn match skillFunction     "\<listp("he=e-1
+syn match skillFunction     "(listToVector\>"hs=s+1
+syn match skillFunction     "\<listToVector("he=e-1
+syn match skillFunction     "(loadi\=\>"hs=s+1
+syn match skillFunction     "\<loadi\=("he=e-1
+syn match skillFunction     "(loadstring\>"hs=s+1
+syn match skillFunction     "\<loadstring("he=e-1
+syn match skillFunction     "(log\>"hs=s+1
+syn match skillFunction     "\<log("he=e-1
+syn match skillFunction     "(lowerCase\>"hs=s+1
+syn match skillFunction     "\<lowerCase("he=e-1
+syn match skillFunction     "(makeTable\>"hs=s+1
+syn match skillFunction     "\<makeTable("he=e-1
+syn match skillFunction     "(makeTempFileName\>"hs=s+1
+syn match skillFunction     "\<makeTempFileName("he=e-1
+syn match skillFunction     "(makeVector\>"hs=s+1
+syn match skillFunction     "\<makeVector("he=e-1
+syn match skillFunction     "(map\(c\|can\|car\|list\)\>"hs=s+1
+syn match skillFunction     "\<map\(c\|can\|car\|list\)("he=e-1
+syn match skillFunction     "(max\>"hs=s+1
+syn match skillFunction     "\<max("he=e-1
+syn match skillFunction     "(measureTime\>"hs=s+1
+syn match skillFunction     "\<measureTime("he=e-1
+syn match skillFunction     "(member\>"hs=s+1
+syn match skillFunction     "\<member("he=e-1
+syn match skillFunction     "(mem[qv]\>"hs=s+1
+syn match skillFunction     "\<mem[qv]("he=e-1
+syn match skillFunction     "(min\>"hs=s+1
+syn match skillFunction     "\<min("he=e-1
+syn match skillFunction     "(minusp\>"hs=s+1
+syn match skillFunction     "\<minusp("he=e-1
+syn match skillFunction     "(mod\(ulo\)\=\>"hs=s+1
+syn match skillFunction     "\<mod\(ulo\)\=("he=e-1
+syn match skillKeywords     "([mn]\=procedure\>"hs=s+1
+syn match skillKeywords     "\<[mn]\=procedure("he=e-1
+syn match skillFunction     "(ncon[cs]\>"hs=s+1
+syn match skillFunction     "\<ncon[cs]("he=e-1
+syn match skillFunction     "(needNCells\>"hs=s+1
+syn match skillFunction     "\<needNCells("he=e-1
+syn match skillFunction     "(negativep\>"hs=s+1
+syn match skillFunction     "\<negativep("he=e-1
+syn match skillFunction     "(neq\(ual\)\=\>"hs=s+1
+syn match skillFunction     "\<neq\(ual\)\=("he=e-1
+syn match skillFunction     "(newline\>"hs=s+1
+syn match skillFunction     "\<newline("he=e-1
+syn match skillFunction     "(nindex\>"hs=s+1
+syn match skillFunction     "\<nindex("he=e-1
+syn match skillFunction     "(not\>"hs=s+1
+syn match skillFunction     "\<not("he=e-1
+syn match skillFunction     "(nth\(cdr\|elem\)\=\>"hs=s+1
+syn match skillFunction     "\<nth\(cdr\|elem\)\=("he=e-1
+syn match skillFunction     "(null\>"hs=s+1
+syn match skillFunction     "\<null("he=e-1
+syn match skillFunction     "(numberp\>"hs=s+1
+syn match skillFunction     "\<numberp("he=e-1
+syn match skillFunction     "(numOpenFiles\>"hs=s+1
+syn match skillFunction     "\<numOpenFiles("he=e-1
+syn match skillFunction     "(oddp\>"hs=s+1
+syn match skillFunction     "\<oddp("he=e-1
+syn match skillFunction     "(onep\>"hs=s+1
+syn match skillFunction     "\<onep("he=e-1
+syn match skillFunction     "(otherp\>"hs=s+1
+syn match skillFunction     "\<otherp("he=e-1
+syn match skillFunction     "(outfile\>"hs=s+1
+syn match skillFunction     "\<outfile("he=e-1
+syn match skillFunction     "(outportp\>"hs=s+1
+syn match skillFunction     "\<outportp("he=e-1
+syn match skillFunction     "(pairp\>"hs=s+1
+syn match skillFunction     "\<pairp("he=e-1
+syn match skillFunction     "(parseString\>"hs=s+1
+syn match skillFunction     "\<parseString("he=e-1
+syn match skillFunction     "(plist\>"hs=s+1
+syn match skillFunction     "\<plist("he=e-1
+syn match skillFunction     "(plusp\>"hs=s+1
+syn match skillFunction     "\<plusp("he=e-1
+syn match skillFunction     "(portp\>"hs=s+1
+syn match skillFunction     "\<portp("he=e-1
+syn match skillFunction     "(p\=print\>"hs=s+1
+syn match skillFunction     "\<p\=print("he=e-1
+syn match skillFunction     "(prependInstallPath\>"hs=s+1
+syn match skillFunction     "\<prependInstallPath("he=e-1
+syn match skillFunction     "(printl\(ev\|n\)\>"hs=s+1
+syn match skillFunction     "\<printl\(ev\|n\)("he=e-1
+syn match skillFunction     "(procedurep\>"hs=s+1
+syn match skillFunction     "\<procedurep("he=e-1
+syn match skillKeywords     "(prog[12n]\=\>"hs=s+1
+syn match skillKeywords     "\<prog[12n]\=("he=e-1
+syn match skillFunction     "(putd\>"hs=s+1
+syn match skillFunction     "\<putd("he=e-1
+syn match skillFunction     "(putpropq\{,2}\>"hs=s+1
+syn match skillFunction     "\<putpropq\{,2}("he=e-1
+syn match skillFunction     "(random\>"hs=s+1
+syn match skillFunction     "\<random("he=e-1
+syn match skillFunction     "(read\>"hs=s+1
+syn match skillFunction     "\<read("he=e-1
+syn match skillFunction     "(readString\>"hs=s+1
+syn match skillFunction     "\<readString("he=e-1
+syn match skillFunction     "(readTable\>"hs=s+1
+syn match skillFunction     "\<readTable("he=e-1
+syn match skillFunction     "(realp\>"hs=s+1
+syn match skillFunction     "\<realp("he=e-1
+syn match skillFunction     "(regExit\(After\|Before\)\>"hs=s+1
+syn match skillFunction     "\<regExit\(After\|Before\)("he=e-1
+syn match skillFunction     "(remainder\>"hs=s+1
+syn match skillFunction     "\<remainder("he=e-1
+syn match skillFunction     "(remdq\=\>"hs=s+1
+syn match skillFunction     "\<remdq\=("he=e-1
+syn match skillFunction     "(remExitProc\>"hs=s+1
+syn match skillFunction     "\<remExitProc("he=e-1
+syn match skillFunction     "(remove\>"hs=s+1
+syn match skillFunction     "\<remove("he=e-1
+syn match skillFunction     "(remprop\>"hs=s+1
+syn match skillFunction     "\<remprop("he=e-1
+syn match skillFunction     "(remq\>"hs=s+1
+syn match skillFunction     "\<remq("he=e-1
+syn match skillKeywords     "(return\>"hs=s+1
+syn match skillKeywords     "\<return("he=e-1
+syn match skillFunction     "(reverse\>"hs=s+1
+syn match skillFunction     "\<reverse("he=e-1
+syn match skillFunction     "(rexCompile\>"hs=s+1
+syn match skillFunction     "\<rexCompile("he=e-1
+syn match skillFunction     "(rexExecute\>"hs=s+1
+syn match skillFunction     "\<rexExecute("he=e-1
+syn match skillFunction     "(rexMagic\>"hs=s+1
+syn match skillFunction     "\<rexMagic("he=e-1
+syn match skillFunction     "(rexMatchAssocList\>"hs=s+1
+syn match skillFunction     "\<rexMatchAssocList("he=e-1
+syn match skillFunction     "(rexMatchList\>"hs=s+1
+syn match skillFunction     "\<rexMatchList("he=e-1
+syn match skillFunction     "(rexMatchp\>"hs=s+1
+syn match skillFunction     "\<rexMatchp("he=e-1
+syn match skillFunction     "(rexReplace\>"hs=s+1
+syn match skillFunction     "\<rexReplace("he=e-1
+syn match skillFunction     "(rexSubstitute\>"hs=s+1
+syn match skillFunction     "\<rexSubstitute("he=e-1
+syn match skillFunction     "(rindex\>"hs=s+1
+syn match skillFunction     "\<rindex("he=e-1
+syn match skillFunction     "(round\>"hs=s+1
+syn match skillFunction     "\<round("he=e-1
+syn match skillFunction     "(rplac[ad]\>"hs=s+1
+syn match skillFunction     "\<rplac[ad]("he=e-1
+syn match skillFunction     "(schemeTopLevelEnv\>"hs=s+1
+syn match skillFunction     "\<schemeTopLevelEnv("he=e-1
+syn match skillFunction     "(set\>"hs=s+1
+syn match skillFunction     "\<set("he=e-1
+syn match skillFunction     "(setarray\>"hs=s+1
+syn match skillFunction     "\<setarray("he=e-1
+syn match skillFunction     "(setc[ad]r\>"hs=s+1
+syn match skillFunction     "\<setc[ad]r("he=e-1
+syn match skillFunction     "(setFnWriteProtect\>"hs=s+1
+syn match skillFunction     "\<setFnWriteProtect("he=e-1
+syn match skillFunction     "(setof\>"hs=s+1
+syn match skillFunction     "\<setof("he=e-1
+syn match skillFunction     "(setplist\>"hs=s+1
+syn match skillFunction     "\<setplist("he=e-1
+syn match skillFunction     "(setq\>"hs=s+1
+syn match skillFunction     "\<setq("he=e-1
+syn match skillFunction     "(setShellEnvVar\>"hs=s+1
+syn match skillFunction     "\<setShellEnvVar("he=e-1
+syn match skillFunction     "(setSkillPath\>"hs=s+1
+syn match skillFunction     "\<setSkillPath("he=e-1
+syn match skillFunction     "(setVarWriteProtect\>"hs=s+1
+syn match skillFunction     "\<setVarWriteProtect("he=e-1
+syn match skillFunction     "(sh\(ell\)\=\>"hs=s+1
+syn match skillFunction     "\<sh\(ell\)\=("he=e-1
+syn match skillFunction     "(simplifyFilename\>"hs=s+1
+syn match skillFunction     "\<simplifyFilename("he=e-1
+syn match skillFunction     "(sort\(car\)\=\>"hs=s+1
+syn match skillFunction     "\<sort\(car\)\=("he=e-1
+syn match skillFunction     "(sqrt\>"hs=s+1
+syn match skillFunction     "\<sqrt("he=e-1
+syn match skillFunction     "(srandom\>"hs=s+1
+syn match skillFunction     "\<srandom("he=e-1
+syn match skillFunction     "(sstatus\>"hs=s+1
+syn match skillFunction     "\<sstatus("he=e-1
+syn match skillFunction     "(strn\=cat\>"hs=s+1
+syn match skillFunction     "\<strn\=cat("he=e-1
+syn match skillFunction     "(strn\=cmp\>"hs=s+1
+syn match skillFunction     "\<strn\=cmp("he=e-1
+syn match skillFunction     "(stringp\>"hs=s+1
+syn match skillFunction     "\<stringp("he=e-1
+syn match skillFunction     "(stringTo\(Function\|Symbol\|Time\)\>"hs=s+1
+syn match skillFunction     "\<stringTo\(Function\|Symbol\|Time\)("he=e-1
+syn match skillFunction     "(strlen\>"hs=s+1
+syn match skillFunction     "\<strlen("he=e-1
+syn match skillFunction     "(sub1\>"hs=s+1
+syn match skillFunction     "\<sub1("he=e-1
+syn match skillFunction     "(subst\>"hs=s+1
+syn match skillFunction     "\<subst("he=e-1
+syn match skillFunction     "(substring\>"hs=s+1
+syn match skillFunction     "\<substring("he=e-1
+syn match skillFunction     "(sxtd\>"hs=s+1
+syn match skillFunction     "\<sxtd("he=e-1
+syn match skillFunction     "(symbolp\>"hs=s+1
+syn match skillFunction     "\<symbolp("he=e-1
+syn match skillFunction     "(symbolToString\>"hs=s+1
+syn match skillFunction     "\<symbolToString("he=e-1
+syn match skillFunction     "(symeval\>"hs=s+1
+syn match skillFunction     "\<symeval("he=e-1
+syn match skillFunction     "(symstrp\>"hs=s+1
+syn match skillFunction     "\<symstrp("he=e-1
+syn match skillFunction     "(system\>"hs=s+1
+syn match skillFunction     "\<system("he=e-1
+syn match skillFunction     "(tablep\>"hs=s+1
+syn match skillFunction     "\<tablep("he=e-1
+syn match skillFunction     "(tableToList\>"hs=s+1
+syn match skillFunction     "\<tableToList("he=e-1
+syn match skillFunction     "(tailp\>"hs=s+1
+syn match skillFunction     "\<tailp("he=e-1
+syn match skillFunction     "(tconc\>"hs=s+1
+syn match skillFunction     "\<tconc("he=e-1
+syn match skillFunction     "(timeToString\>"hs=s+1
+syn match skillFunction     "\<timeToString("he=e-1
+syn match skillFunction     "(timeToTm\>"hs=s+1
+syn match skillFunction     "\<timeToTm("he=e-1
+syn match skillFunction     "(tmToTime\>"hs=s+1
+syn match skillFunction     "\<tmToTime("he=e-1
+syn match skillFunction     "(truncate\>"hs=s+1
+syn match skillFunction     "\<truncate("he=e-1
+syn match skillFunction     "(typep\=\>"hs=s+1
+syn match skillFunction     "\<typep\=("he=e-1
+syn match skillFunction     "(unalias\>"hs=s+1
+syn match skillFunction     "\<unalias("he=e-1
+syn match skillConditional  "(unless\>"hs=s+1
+syn match skillConditional  "\<unless("he=e-1
+syn match skillFunction     "(upperCase\>"hs=s+1
+syn match skillFunction     "\<upperCase("he=e-1
+syn match skillFunction     "(vector\(ToList\)\=\>"hs=s+1
+syn match skillFunction     "\<vector\(ToList\)\=("he=e-1
+syn match skillFunction     "(warn\>"hs=s+1
+syn match skillFunction     "\<warn("he=e-1
+syn match skillConditional  "(when\>"hs=s+1
+syn match skillConditional  "\<when("he=e-1
+syn match skillRepeat       "(while\>"hs=s+1
+syn match skillRepeat       "\<while("he=e-1
+syn match skillFunction     "(write\>"hs=s+1
+syn match skillFunction     "\<write("he=e-1
+syn match skillFunction     "(writeTable\>"hs=s+1
+syn match skillFunction     "\<writeTable("he=e-1
+syn match skillFunction     "(xcons\>"hs=s+1
+syn match skillFunction     "\<xcons("he=e-1
+syn match skillFunction     "(zerop\>"hs=s+1
+syn match skillFunction     "\<zerop("he=e-1
+syn match skillFunction     "(zxtd\>"hs=s+1
+syn match skillFunction     "\<zxtd("he=e-1
+
+" DFII procedural interface routines
+
+" CDF functions
+syn match skillcdfFunctions			"(cdf\u\a\+\>"hs=s+1
+syn match skillcdfFunctions			"\<cdf\u\a\+("he=e-1
+" graphic editor functions
+syn match skillgeFunctions			"(ge\u\a\+\>"hs=s+1
+syn match skillgeFunctions			"\<ge\u\a\+("he=e-1
+" human interface functions
+syn match skillhiFunctions			"(hi\u\a\+\>"hs=s+1
+syn match skillhiFunctions			"\<hi\u\a\+("he=e-1
+" layout editor functions
+syn match skillleFunctions			"(le\u\a\+\>"hs=s+1
+syn match skillleFunctions			"\<le\u\a\+("he=e-1
+" database|design editor|design flow functions
+syn match skilldbefFunctions		"(d[bef]\u\a\+\>"hs=s+1
+syn match skilldbefFunctions		"\<d[bef]\u\a\+("he=e-1
+" design management & design data services functions
+syn match skillddFunctions			"(dd[s]\=\u\a\+\>"hs=s+1
+syn match skillddFunctions			"\<dd[s]\=\u\a\+("he=e-1
+" parameterized cell functions
+syn match skillpcFunctions			"(pc\u\a\+\>"hs=s+1
+syn match skillpcFunctions			"\<pc\u\a\+("he=e-1
+" tech file functions
+syn match skilltechFunctions		"(\(tech\|tc\)\u\a\+\>"hs=s+1
+syn match skilltechFunctions		"\<\(tech\|tc\)\u\a\+("he=e-1
+
+" strings
+syn region skillString				start=+"+ skip=+\\"+ end=+"+
+
+syn keyword skillTodo contained		TODO FIXME XXX
+syn keyword skillNote contained		NOTE IMPORTANT
+
+" comments are either C-style or begin with a semicolon
+syn region skillComment				start="/\*" end="\*/" contains=skillTodo,skillNote
+syn match skillComment				";.*" contains=skillTodo,skillNote
+syn match skillCommentError			"\*/"
+
+syn sync ccomment skillComment minlines=10
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link skillcdfFunctions	Function
+hi def link skillgeFunctions		Function
+hi def link skillhiFunctions		Function
+hi def link skillleFunctions		Function
+hi def link skilldbefFunctions	Function
+hi def link skillddFunctions		Function
+hi def link skillpcFunctions		Function
+hi def link skilltechFunctions	Function
+hi def link skillConstants		Constant
+hi def link skillFunction		Function
+hi def link skillKeywords		Statement
+hi def link skillConditional		Conditional
+hi def link skillRepeat			Repeat
+hi def link skillString			String
+hi def link skillTodo			Todo
+hi def link skillNote			Todo
+hi def link skillComment			Comment
+hi def link skillCommentError	Error
+
+
+let b:current_syntax = "skill"
+
+" vim: ts=4
+
+endif
diff --git a/syntax/slang.vim b/syntax/slang.vim
new file mode 100644
index 000000000..48f209b73
--- /dev/null
+++ b/syntax/slang.vim
@@ -0,0 +1,93 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slang') == -1
+
+" Vim syntax file
+" Language:	S-Lang
+" Maintainer:	Jan Hlavacek <lahvak@math.ohio-state.edu>
+" Last Change:	980216
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn keyword slangStatement	break return continue EXECUTE_ERROR_BLOCK
+syn match slangStatement	"\<X_USER_BLOCK[0-4]\>"
+syn keyword slangLabel		case
+syn keyword slangConditional	!if if else switch
+syn keyword slangRepeat		while for _for loop do forever
+syn keyword slangDefinition	define typedef variable struct
+syn keyword slangOperator	or and andelse orelse shr shl xor not
+syn keyword slangBlock		EXIT_BLOCK ERROR_BLOCK
+syn match slangBlock		"\<USER_BLOCK[0-4]\>"
+syn keyword slangConstant	NULL
+syn keyword slangType		Integer_Type Double_Type Complex_Type String_Type Struct_Type Ref_Type Null_Type Array_Type DataType_Type
+
+syn match slangOctal		"\<0\d\+\>" contains=slangOctalError
+syn match slangOctalError	"[89]\+" contained
+syn match slangHex		"\<0[xX][0-9A-Fa-f]*\>"
+syn match slangDecimal		"\<[1-9]\d*\>"
+syn match slangFloat		"\<\d\+\."
+syn match slangFloat		"\<\d\+\.\d\+\([Ee][-+]\=\d\+\)\=\>"
+syn match slangFloat		"\<\d\+\.[Ee][-+]\=\d\+\>"
+syn match slangFloat		"\<\d\+[Ee][-+]\=\d\+\>"
+syn match slangFloat		"\.\d\+\([Ee][-+]\=\d\+\)\=\>"
+syn match slangImaginary	"\.\d\+\([Ee][-+]\=\d*\)\=[ij]\>"
+syn match slangImaginary	"\<\d\+\(\.\d*\)\=\([Ee][-+]\=\d\+\)\=[ij]\>"
+
+syn region slangString oneline start='"' end='"' skip='\\"'
+syn match slangCharacter	"'[^\\]'"
+syn match slangCharacter	"'\\.'"
+syn match slangCharacter	"'\\[0-7]\{1,3}'"
+syn match slangCharacter	"'\\d\d\{1,3}'"
+syn match slangCharacter	"'\\x[0-7a-fA-F]\{1,2}'"
+
+syn match slangDelim		"[][{};:,]"
+syn match slangOperator		"[-%+/&*=<>|!~^@]"
+
+"catch errors caused by wrong parenthesis
+syn region slangParen	matchgroup=slangDelim transparent start='(' end=')' contains=ALLBUT,slangParenError
+syn match slangParenError	")"
+
+syn match slangComment		"%.*$"
+syn keyword slangOperator	sizeof
+
+syn region slangPreCondit start="^\s*#\s*\(ifdef\>\|ifndef\>\|iftrue\>\|ifnfalse\>\|iffalse\>\|ifntrue\>\|if\$\|ifn\$\|\|elif\>\|else\>\|endif\>\)" skip="\\$" end="$" contains=cComment,slangString,slangCharacter,slangNumber
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link slangDefinition	Type
+hi def link slangBlock		slangDefinition
+hi def link slangLabel		Label
+hi def link slangConditional	Conditional
+hi def link slangRepeat		Repeat
+hi def link slangCharacter	Character
+hi def link slangFloat		Float
+hi def link slangImaginary	Float
+hi def link slangDecimal		slangNumber
+hi def link slangOctal		slangNumber
+hi def link slangHex		slangNumber
+hi def link slangNumber		Number
+hi def link slangParenError	Error
+hi def link slangOctalError	Error
+hi def link slangOperator		Operator
+hi def link slangStructure	Structure
+hi def link slangInclude		Include
+hi def link slangPreCondit	PreCondit
+hi def link slangError		Error
+hi def link slangStatement	Statement
+hi def link slangType		Type
+hi def link slangString		String
+hi def link slangConstant		Constant
+hi def link slangRangeArray	slangConstant
+hi def link slangComment		Comment
+hi def link slangSpecial		SpecialChar
+hi def link slangTodo		Todo
+hi def link slangDelim		Delimiter
+
+
+let b:current_syntax = "slang"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/slice.vim b/syntax/slice.vim
new file mode 100644
index 000000000..8a158ee0a
--- /dev/null
+++ b/syntax/slice.vim
@@ -0,0 +1,82 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slice') == -1
+
+" Vim syntax file
+" Language:	Slice (ZeroC's Specification Language for Ice)
+" Maintainer:	Morel Bodin <slice06@nym.hush.com>
+" Last Change:	2005 Dec 03
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" The Slice keywords
+
+syn keyword sliceType	    bool byte double float int long short string void
+syn keyword sliceQualifier  const extends idempotent implements local nonmutating out throws
+syn keyword sliceConstruct  class enum exception dictionary interface module LocalObject Object sequence struct
+syn keyword sliceQualifier  const extends idempotent implements local nonmutating out throws
+syn keyword sliceBoolean    false true
+
+" Include directives
+syn region  sliceIncluded    display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match   sliceIncluded   display contained "<[^>]*>"
+syn match   sliceInclude    display "^\s*#\s*include\>\s*["<]" contains=sliceIncluded
+
+" Double-include guards
+syn region  sliceGuard      start="^#\(define\|ifndef\|endif\)" end="$"
+
+" Strings and characters
+syn region sliceString		start=+"+  end=+"+
+
+" Numbers (shamelessly ripped from c.vim, only slightly modified)
+"integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match   sliceNumbers    display transparent "\<\d\|\.\d" contains=sliceNumber,sliceFloat,sliceOctal
+syn match   sliceNumber     display contained "\d\+"
+"hex number
+syn match   sliceNumber     display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
+" Flag the first zero of an octal number as something special
+syn match   sliceOctal      display contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>" contains=sliceOctalZero
+syn match   sliceOctalZero  display contained "\<0"
+syn match   sliceFloat      display contained "\d\+f"
+"floating point number, with dot, optional exponent
+syn match   sliceFloat      display contained "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\="
+"floating point number, starting with a dot, optional exponent
+syn match   sliceFloat      display contained "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+syn match   sliceFloat      display contained "\d\+e[-+]\=\d\+[fl]\=\>"
+" flag an octal number with wrong digits
+syn case match
+
+
+" Comments
+syn region sliceComment    start="/\*"  end="\*/"
+syn match sliceComment	"//.*"
+
+syn sync ccomment sliceComment
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link sliceComment	Comment
+hi def link sliceConstruct	Keyword
+hi def link sliceType	Type
+hi def link sliceString	String
+hi def link sliceIncluded	String
+hi def link sliceQualifier	Keyword
+hi def link sliceInclude	Include
+hi def link sliceGuard	PreProc
+hi def link sliceBoolean	Boolean
+hi def link sliceFloat	Number
+hi def link sliceNumber	Number
+hi def link sliceOctal	Number
+hi def link sliceOctalZero	Special
+hi def link sliceNumberError Special
+
+
+let b:current_syntax = "slice"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/slpconf.vim b/syntax/slpconf.vim
new file mode 100644
index 000000000..e134c596d
--- /dev/null
+++ b/syntax/slpconf.vim
@@ -0,0 +1,277 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpconf') == -1
+
+" Vim syntax file
+" Language:             RFC 2614 - An API for Service Location configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword slpconfTodo         contained TODO FIXME XXX NOTE
+
+syn region  slpconfComment      display oneline start='^[#;]' end='$'
+                                \ contains=slpconfTodo,@Spell
+
+syn match   slpconfBegin        display '^'
+                                \ nextgroup=slpconfTag,
+                                \ slpconfComment skipwhite
+
+syn keyword slpconfTag          contained net
+                                \ nextgroup=slpconfNetTagDot
+
+syn match   slpconfNetTagDot    contained display '.'
+                                \ nextgroup=slpconfNetTag
+
+syn keyword slpconfNetTag       contained slp
+                                \ nextgroup=slpconfNetSlpTagdot
+
+syn match   slpconfNetSlpTagDot contained display '.'
+                                \ nextgroup=slpconfNetSlpTag
+
+syn keyword slpconfNetSlpTag    contained isDA traceDATraffic traceMsg
+                                \ traceDrop traceReg isBroadcastOnly
+                                \ passiveDADetection securityEnabled
+                                \ nextgroup=slpconfBooleanEq,slpconfBooleanHome
+                                \ skipwhite
+
+syn match   slpconfBooleanHome  contained display
+                                \ '\.\d\{1,3}\%(\.\d\{1,3}\)\{3}'
+                                \ nextgroup=slpconfBooleanEq skipwhite
+
+syn match   slpconfBooleanEq    contained display '='
+                                \ nextgroup=slpconfBoolean skipwhite
+
+syn keyword slpconfBoolean      contained true false TRUE FALSE
+
+syn keyword slpconfNetSlpTag    contained DAHeartBeat multicastTTL
+                                \ DAActiveDiscoveryInterval
+                                \ multicastMaximumWait multicastTimeouts
+                                \ randomWaitBound MTU maxResults
+                                \ nextgroup=slpconfIntegerEq,slpconfIntegerHome
+                                \ skipwhite
+
+syn match   slpconfIntegerHome  contained display
+                                \ '\.\d\{1,3}\%(\.\d\{1,3}\)\{3}'
+                                \ nextgroup=slpconfIntegerEq skipwhite
+
+syn match   slpconfIntegerEq    contained display '='
+                                \ nextgroup=slpconfInteger skipwhite
+
+syn match   slpconfInteger      contained display '\<\d\+\>'
+
+syn keyword slpconfNetSlpTag    contained DAAttributes SAAttributes
+                                \ nextgroup=slpconfAttrEq,slpconfAttrHome
+                                \ skipwhite
+
+syn match   slpconfAttrHome     contained display
+                                \ '\.\d\{1,3}\%(\.\d\{1,3}\)\{3}'
+                                \ nextgroup=slpconfAttrEq skipwhite
+
+syn match   slpconfAttrEq       contained display '='
+                                \ nextgroup=slpconfAttrBegin skipwhite
+
+syn match   slpconfAttrBegin    contained display '('
+                                \ nextgroup=slpconfAttrTag skipwhite
+
+syn match   slpconfAttrTag      contained display
+                                \ '[^* \t_(),\\!<=>~[:cntrl:]]\+'
+                                \ nextgroup=slpconfAttrTagEq skipwhite
+
+syn match   slpconfAttrTagEq    contained display '='
+                                \ nextgroup=@slpconfAttrValue skipwhite
+
+syn cluster slpconfAttrValueCon contains=slpconfAttrValueSep,slpconfAttrEnd
+
+syn cluster slpconfAttrValue    contains=slpconfAttrIValue,slpconfAttrSValue,
+                                \ slpconfAttrBValue,slpconfAttrSSValue
+
+syn match   slpconfAttrSValue   contained display '[^ (),\\!<=>~[:cntrl:]]\+'
+                                \ nextgroup=@slpconfAttrValueCon skipwhite
+
+syn match   slpconfAttrSSValue  contained display '\\FF\%(\\\x\x\)\+'
+                                \ nextgroup=@slpconfAttrValueCon skipwhite
+
+syn match   slpconfAttrIValue   contained display '[-]\=\d\+\>'
+                                \ nextgroup=@slpconfAttrValueCon skipwhite
+
+syn keyword slpconfAttrBValue   contained true false
+                                \ nextgroup=@slpconfAttrValueCon skipwhite
+
+syn match   slpconfAttrValueSep contained display ','
+                                \ nextgroup=@slpconfAttrValue skipwhite
+
+syn match   slpconfAttrEnd      contained display ')'
+                                \ nextgroup=slpconfAttrSep skipwhite
+
+syn match   slpconfAttrSep      contained display ','
+                                \ nextgroup=slpconfAttrBegin skipwhite
+
+syn keyword slpconfNetSlpTag    contained useScopes typeHint
+                                \ nextgroup=slpconfStringsEq,slpconfStringsHome
+                                \ skipwhite
+
+syn match   slpconfStringsHome  contained display
+                                \ '\.\d\{1,3}\%(\.\d\{1,3}\)\{3}'
+                                \ nextgroup=slpconfStringsEq skipwhite
+
+syn match   slpconfStringsEq    contained display '='
+                                \ nextgroup=slpconfStrings skipwhite
+
+syn match   slpconfStrings      contained display
+                                \ '\%([[:digit:][:alpha:]]\|[!-+./:-@[-`{-~-]\|\\\x\x\)\+'
+                                \ nextgroup=slpconfStringsSep skipwhite
+
+syn match   slpconfStringsSep   contained display ','
+                                \ nextgroup=slpconfStrings skipwhite
+
+syn keyword slpconfNetSlpTag    contained DAAddresses
+                                \ nextgroup=slpconfAddressesEq,slpconfAddrsHome
+                                \ skipwhite
+
+syn match   slpconfAddrsHome    contained display
+                                \ '\.\d\{1,3}\%(\.\d\{1,3}\)\{3}'
+                                \ nextgroup=slpconfAddressesEq skipwhite
+
+syn match   slpconfAddressesEq  contained display '='
+                                \ nextgroup=@slpconfAddresses skipwhite
+
+syn cluster slpconfAddresses    contains=slpconfFQDNs,slpconfHostnumbers
+
+syn match   slpconfFQDNs        contained display
+                                \ '\a[[:alnum:]-]*[[:alnum:]]\|\a'
+                                \ nextgroup=slpconfAddressesSep skipwhite
+
+syn match   slpconfHostnumbers  contained display
+                                \ '\d\{1,3}\%(\.\d\{1,3}\)\{3}'
+                                \ nextgroup=slpconfAddressesSep skipwhite
+
+syn match   slpconfAddressesSep contained display ','
+                                \ nextgroup=@slpconfAddresses skipwhite
+
+syn keyword slpconfNetSlpTag    contained serializedRegURL
+                                \ nextgroup=slpconfStringEq,slpconfStringHome
+                                \ skipwhite
+
+syn match   slpconfStringHome   contained display
+                                \ '\.\d\{1,3}\%(\.\d\{1,3}\)\{3}'
+                                \ nextgroup=slpconfStringEq skipwhite
+
+syn match   slpconfStringEq     contained display '='
+                                \ nextgroup=slpconfString skipwhite
+
+syn match   slpconfString       contained display
+                                \ '\%([!-+./:-@[-`{-~-]\|\\\x\x\)\+\|[[:digit:][:alpha:]]'
+
+syn keyword slpconfNetSlpTag    contained multicastTimeouts DADiscoveryTimeouts
+                                \ datagramTimeouts
+                                \ nextgroup=slpconfIntegersEq,
+                                \ slpconfIntegersHome skipwhite
+
+syn match   slpconfIntegersHome contained display
+                                \ '\.\d\{1,3}\%(\.\d\{1,3}\)\{3}'
+                                \ nextgroup=slpconfIntegersEq skipwhite
+
+syn match   slpconfIntegersEq   contained display '='
+                                \ nextgroup=slpconfIntegers skipwhite
+
+syn match   slpconfIntegers     contained display '\<\d\+\>'
+                                \ nextgroup=slpconfIntegersSep skipwhite
+
+syn match   slpconfIntegersSep  contained display ','
+                                \ nextgroup=slpconfIntegers skipwhite
+
+syn keyword slpconfNetSlpTag    contained interfaces
+                                \ nextgroup=slpconfHostnumsEq,
+                                \ slpconfHostnumsHome skipwhite
+
+syn match   slpconfHostnumsHome contained display
+                                \ '\.\d\{1,3}\%(\.\d\{1,3}\)\{3}'
+                                \ nextgroup=slpconfHostnumsEq skipwhite
+
+syn match   slpconfHostnumsEq   contained display '='
+                                \ nextgroup=slpconfOHostnumbers skipwhite
+
+syn match   slpconfOHostnumbers contained display
+                                \ '\d\{1,3}\%(\.\d\{1,3}\)\{3}'
+                                \ nextgroup=slpconfHostnumsSep skipwhite
+
+syn match   slpconfHostnumsSep  contained display ','
+                                \ nextgroup=slpconfOHostnumbers skipwhite
+
+syn keyword slpconfNetSlpTag    contained locale
+                                \ nextgroup=slpconfLocaleEq,slpconfLocaleHome
+                                \ skipwhite
+
+syn match   slpconfLocaleHome   contained display
+                                \ '\.\d\{1,3}\%(\.\d\{1,3}\)\{3}'
+                                \ nextgroup=slpconfLocaleEq skipwhite
+
+syn match   slpconfLocaleEq     contained display '='
+                                \ nextgroup=slpconfLocale skipwhite
+
+syn match   slpconfLocale       contained display '\a\{1,8}\%(-\a\{1,8}\)\='
+
+hi def link slpconfTodo         Todo
+hi def link slpconfComment      Comment
+hi def link slpconfTag          Identifier
+hi def link slpconfDelimiter    Delimiter
+hi def link slpconfNetTagDot    slpconfDelimiter
+hi def link slpconfNetTag       slpconfTag
+hi def link slpconfNetSlpTagDot slpconfNetTagDot
+hi def link slpconfNetSlpTag    slpconfTag
+hi def link slpconfHome         Special
+hi def link slpconfBooleanHome  slpconfHome
+hi def link slpconfEq           Operator
+hi def link slpconfBooleanEq    slpconfEq
+hi def link slpconfBoolean      Boolean
+hi def link slpconfIntegerHome  slpconfHome
+hi def link slpconfIntegerEq    slpconfEq
+hi def link slpconfInteger      Number
+hi def link slpconfAttrHome     slpconfHome
+hi def link slpconfAttrEq       slpconfEq
+hi def link slpconfAttrBegin    slpconfDelimiter
+hi def link slpconfAttrTag      slpconfTag
+hi def link slpconfAttrTagEq    slpconfEq
+hi def link slpconfAttrIValue   slpconfInteger
+hi def link slpconfAttrSValue   slpconfString
+hi def link slpconfAttrBValue   slpconfBoolean
+hi def link slpconfAttrSSValue  slpconfString
+hi def link slpconfSeparator    slpconfDelimiter
+hi def link slpconfAttrValueSep slpconfSeparator
+hi def link slpconfAttrEnd      slpconfAttrBegin
+hi def link slpconfAttrSep      slpconfSeparator
+hi def link slpconfStringsHome  slpconfHome
+hi def link slpconfStringsEq    slpconfEq
+hi def link slpconfStrings      slpconfString
+hi def link slpconfStringsSep   slpconfSeparator
+hi def link slpconfAddrsHome    slpconfHome
+hi def link slpconfAddressesEq  slpconfEq
+hi def link slpconfFQDNs        String
+hi def link slpconfHostnumbers  Number
+hi def link slpconfAddressesSep slpconfSeparator
+hi def link slpconfStringHome   slpconfHome
+hi def link slpconfStringEq     slpconfEq
+hi def link slpconfString       String
+hi def link slpconfIntegersHome slpconfHome
+hi def link slpconfIntegersEq   slpconfEq
+hi def link slpconfIntegers     slpconfInteger
+hi def link slpconfIntegersSep  slpconfSeparator
+hi def link slpconfHostnumsHome slpconfHome
+hi def link slpconfHostnumsEq   slpconfEq
+hi def link slpconfOHostnumbers slpconfHostnumbers
+hi def link slpconfHostnumsSep  slpconfSeparator
+hi def link slpconfLocaleHome   slpconfHome
+hi def link slpconfLocaleEq     slpconfEq
+hi def link slpconfLocale       slpconfString
+
+let b:current_syntax = "slpconf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/slpreg.vim b/syntax/slpreg.vim
new file mode 100644
index 000000000..d8f50cae6
--- /dev/null
+++ b/syntax/slpreg.vim
@@ -0,0 +1,126 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpreg') == -1
+
+" Vim syntax file
+" Language:             RFC 2614 - An API for Service Location registration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword slpregTodo          contained TODO FIXME XXX NOTE
+
+syn region  slpregComment       display oneline start='^[#;]' end='$'
+                                \ contains=slpregTodo,@Spell
+
+syn match   slpregBegin         display '^'
+                                \ nextgroup=slpregServiceURL,
+                                \ slpregComment
+
+syn match   slpregServiceURL    contained display 'service:'
+                                \ nextgroup=slpregServiceType
+
+syn match   slpregServiceType   contained display '\a[[:alpha:][:digit:]+-]*\%(\.\a[[:alpha:][:digit:]+-]*\)\=\%(:\a[[:alpha:][:digit:]+-]*\)\='
+                                \ nextgroup=slpregServiceSAPCol
+
+syn match   slpregServiceSAPCol contained display ':'
+                                \ nextgroup=slpregSAP
+
+syn match   slpregSAP           contained '[^,]\+'
+                                \ nextgroup=slpregLangSep
+"syn match   slpregSAP           contained display '\%(//\%(\%([[:alpha:][:digit:]$-_.~!*\'(),+;&=]*@\)\=\%([[:alnum:]][[:alnum:]-]*[[:alnum:]]\|[[:alnum:]]\.\)*\%(\a[[:alnum:]-]*[[:alnum:]]\|\a\)\%(:\d\+\)\=\)\=\|/at/\%([[:alpha:][:digit:]$-_.~]\|\\\x\x\)\{1,31}:\%([[:alpha:][:digit:]$-_.~]\|\\\x\x\)\{1,31}\%([[:alpha:][:digit:]$-_.~]\|\\\x\x\)\{1,31}\|/ipx/\x\{8}:\x\{12}:\x\{4}\)\%(/\%([[:alpha:][:digit:]$-_.~!*\'()+;?:@&=+]\|\\\x\x\)*\)*\%(;[^()\\!<=>~[:cntrl:]* \t_]\+\%(=[^()\\!<=>~[:cntrl:] ]\+\)\=\)*'
+
+syn match   slpregLangSep       contained display ','
+                                \ nextgroup=slpregLang
+
+syn match   slpregLang          contained display '\a\{1,8}\%(-\a\{1,8\}\)\='
+                                \ nextgroup=slpregLTimeSep
+
+syn match   slpregLTimeSep      contained display ','
+                                \ nextgroup=slpregLTime
+
+syn match   slpregLTime         contained display '\d\{1,5}'
+                                \ nextgroup=slpregType,slpregUNewline
+
+syn match   slpregType          contained display '\a[[:alpha:][:digit:]+-]*'
+                                \ nextgroup=slpregUNewLine
+
+syn match   slpregUNewLine      contained '\s*\n'
+                                \ nextgroup=slpregScopes,slpregAttrList skipnl
+
+syn keyword slpregScopes        contained scopes
+                                \ nextgroup=slpregScopesEq
+
+syn match   slpregScopesEq      contained '=' nextgroup=slpregScopeName
+
+syn match   slpregScopeName     contained '[^(),\\!<=>[:cntrl:];*+ ]\+'
+                                \ nextgroup=slpregScopeNameSep,
+                                \ slpregScopeNewline
+
+syn match   slpregScopeNameSep  contained ','
+                                \ nextgroup=slpregScopeName
+
+syn match   slpregScopeNewline  contained '\s*\n'
+                                \ nextgroup=slpregAttribute skipnl
+
+syn match   slpregAttribute     contained '[^(),\\!<=>[:cntrl:]* \t_]\+'
+                                \ nextgroup=slpregAttributeEq,
+                                \ slpregScopeNewline
+
+syn match   slpregAttributeEq   contained '='
+                                \ nextgroup=@slpregAttrValue
+
+syn cluster slpregAttrValueCon  contains=slpregAttribute,slpregAttrValueSep
+
+syn cluster slpregAttrValue     contains=slpregAttrIValue,slpregAttrSValue,
+                                \ slpregAttrBValue,slpregAttrSSValue
+
+syn match   slpregAttrSValue    contained display '[^(),\\!<=>~[:cntrl:]]\+'
+                                \ nextgroup=@slpregAttrValueCon skipwhite skipnl
+
+syn match   slpregAttrSSValue   contained display '\\FF\%(\\\x\x\)\+'
+                                \ nextgroup=@slpregAttrValueCon skipwhite skipnl
+
+syn match   slpregAttrIValue    contained display '[-]\=\d\+\>'
+                                \ nextgroup=@slpregAttrValueCon skipwhite skipnl
+
+syn keyword slpregAttrBValue    contained true false
+                                \ nextgroup=@slpregAttrValueCon skipwhite skipnl
+
+syn match   slpregAttrValueSep  contained display ','
+                                \ nextgroup=@slpregAttrValue skipwhite skipnl
+
+hi def link slpregTodo          Todo
+hi def link slpregComment       Comment
+hi def link slpregServiceURL    Type
+hi def link slpregServiceType   slpregServiceURL
+hi def link slpregServiceSAPCol slpregServiceURL
+hi def link slpregSAP           slpregServiceURL
+hi def link slpregDelimiter     Delimiter
+hi def link slpregLangSep       slpregDelimiter
+hi def link slpregLang          String
+hi def link slpregLTimeSep      slpregDelimiter
+hi def link slpregLTime         Number
+hi def link slpregType          Type
+hi def link slpregScopes        Identifier
+hi def link slpregScopesEq      Operator
+hi def link slpregScopeName     String
+hi def link slpregScopeNameSep  slpregDelimiter
+hi def link slpregAttribute     Identifier
+hi def link slpregAttributeEq   Operator
+hi def link slpregAttrSValue    String
+hi def link slpregAttrSSValue   slpregAttrSValue
+hi def link slpregAttrIValue    Number
+hi def link slpregAttrBValue    Boolean
+hi def link slpregAttrValueSep  slpregDelimiter
+
+let b:current_syntax = "slpreg"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/slpspi.vim b/syntax/slpspi.vim
new file mode 100644
index 000000000..bbf176ef0
--- /dev/null
+++ b/syntax/slpspi.vim
@@ -0,0 +1,43 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpspi') == -1
+
+" Vim syntax file
+" Language:             RFC 2614 - An API for Service Location SPI file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword slpspiTodo          contained TODO FIXME XXX NOTE
+
+syn region  slpspiComment       display oneline start='^[#;]' end='$'
+                                \ contains=slpspiTodo,@Spell
+
+syn match   slpspiBegin         display '^'
+                                \ nextgroup=slpspiKeyType,
+                                \ slpspiComment skipwhite
+
+syn keyword slpspiKeyType       contained PRIVATE PUBLIC
+                                \ nextgroup=slpspiString skipwhite
+
+syn match   slpspiString        contained '\S\+'
+                                \ nextgroup=slpspiKeyFile skipwhite
+
+syn match   slpspiKeyFile       contained '\S\+'
+
+hi def link slpspiTodo          Todo
+hi def link slpspiComment       Comment
+hi def link slpspiKeyType       Type
+hi def link slpspiString        Identifier
+hi def link slpspiKeyFile       String
+
+let b:current_syntax = "slpspi"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/slrnrc.vim b/syntax/slrnrc.vim
new file mode 100644
index 000000000..262044ac8
--- /dev/null
+++ b/syntax/slrnrc.vim
@@ -0,0 +1,185 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slrnrc') == -1
+
+" Vim syntax file
+" Language:	Slrn setup file (based on slrn 0.9.8.1)
+" Maintainer:	Preben 'Peppe' Guldberg <peppe-vim@wielders.org>
+" Last Change:	23 April 2006
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn keyword slrnrcTodo		contained Todo
+
+" In some places whitespace is illegal
+syn match slrnrcSpaceError	contained "\s"
+
+syn match slrnrcNumber		contained "-\=\<\d\+\>"
+syn match slrnrcNumber		contained +'[^']\+'+
+
+syn match slrnrcSpecKey		contained +\(\\[er"']\|\^[^'"]\|\\\o\o\o\)+
+
+syn match  slrnrcKey		contained "\S\+"	contains=slrnrcSpecKey
+syn region slrnrcKey		contained start=+"+ skip=+\\"+ end=+"+ oneline contains=slrnrcSpecKey
+syn region slrnrcKey		contained start=+'+ skip=+\\'+ end=+'+ oneline contains=slrnrcSpecKey
+
+syn match slrnrcSpecChar	contained +'+
+syn match slrnrcSpecChar	contained +\\[n"]+
+syn match slrnrcSpecChar	contained "%[dfmnrs%]"
+
+syn match  slrnrcString		contained /[^ \t%"']\+/	contains=slrnrcSpecChar
+syn region slrnrcString		contained start=+"+ skip=+\\"+ end=+"+ oneline contains=slrnrcSpecChar
+
+syn match slrnSlangPreCondit	"^#\s*ifn\=\(def\>\|false\>\|true\>\|\$\)"
+syn match slrnSlangPreCondit	"^#\s*e\(lif\|lse\|ndif\)\>"
+
+syn match slrnrcComment		"%.*$"	contains=slrnrcTodo
+
+syn keyword  slrnrcVarInt	contained abort_unmodified_edits article_window_page_overlap auto_mark_article_as_read beep broken_xref broken_xref cc_followup check_new_groups
+syn keyword  slrnrcVarInt	contained color_by_score confirm_actions custom_sort_by_threads display_cursor_bar drop_bogus_groups editor_uses_mime_charset emphasized_text_mask
+syn keyword  slrnrcVarInt	contained emphasized_text_mode fold_headers fold_headers followup_strip_signature force_authentication force_authentication generate_date_header
+syn keyword  slrnrcVarInt	contained generate_email_from generate_email_from generate_message_id grouplens_port hide_pgpsignature hide_quotes hide_signature
+syn keyword  slrnrcVarInt	contained hide_verbatim_marks hide_verbatim_text highlight_unread_subjects highlight_urls ignore_signature kill_score lines_per_update
+syn keyword  slrnrcVarInt	contained mail_editor_is_mua max_low_score max_queued_groups min_high_score mouse netiquette_warnings new_subject_breaks_threads no_autosave
+syn keyword  slrnrcVarInt	contained no_backups prefer_head process_verbatim_marks query_next_article query_next_group query_read_group_cutoff read_active reject_long_lines
+syn keyword  slrnrcVarInt	contained scroll_by_page show_article show_thread_subject simulate_graphic_chars smart_quote sorting_method spoiler_char spoiler_char
+syn keyword  slrnrcVarInt	contained spoiler_display_mode spoiler_display_mode spool_check_up_on_nov spool_check_up_on_nov uncollapse_threads unsubscribe_new_groups use_blink
+syn keyword  slrnrcVarInt	contained use_color use_flow_control use_grouplens use_grouplens use_header_numbers use_inews use_inews use_localtime use_metamail use_mime use_mime
+syn keyword  slrnrcVarInt	contained use_recommended_msg_id use_slrnpull use_slrnpull use_tilde use_tmpdir use_uudeview use_uudeview warn_followup_to wrap_flags wrap_method
+syn keyword  slrnrcVarInt	contained write_newsrc_flags
+
+" Listed for removal
+syn keyword  slrnrcVarInt	contained author_display display_author_realname display_score group_dsc_start_column process_verbatum_marks prompt_next_group query_reconnect
+syn keyword  slrnrcVarInt	contained show_descriptions use_xgtitle
+
+" Match as a "string" too
+syn region  slrnrcVarIntStr	contained matchgroup=slrnrcVarInt start=+"+ end=+"+ oneline contains=slrnrcVarInt,slrnrcSpaceError
+
+syn keyword slrnrcVarStr	contained Xbrowser art_help_line art_status_line cansecret_file cc_post_string charset custom_headers custom_sort_order decode_directory
+syn keyword slrnrcVarStr	contained editor_command failed_posts_file followup_custom_headers followup_date_format followup_string followupto_string group_help_line
+syn keyword slrnrcVarStr	contained group_status_line grouplens_host grouplens_pseudoname header_help_line header_status_line hostname inews_program macro_directory
+syn keyword slrnrcVarStr	contained mail_editor_command metamail_command mime_charset non_Xbrowser organization overview_date_format post_editor_command post_object
+syn keyword slrnrcVarStr	contained postpone_directory printer_name quote_string realname reply_custom_headers reply_string replyto save_directory save_posts save_replies
+syn keyword slrnrcVarStr	contained score_editor_command scorefile sendmail_command server_object signature signoff_string spool_active_file spool_activetimes_file
+syn keyword slrnrcVarStr	contained spool_inn_root spool_newsgroups_file spool_nov_file spool_nov_root spool_overviewfmt_file spool_root supersedes_custom_headers
+syn keyword slrnrcVarStr	contained top_status_line username
+
+" Listed for removal
+syn keyword slrnrcVarStr	contained followup cc_followup_string
+
+" Match as a "string" too
+syn region  slrnrcVarStrStr	contained matchgroup=slrnrcVarStr start=+"+ end=+"+ oneline contains=slrnrcVarStr,slrnrcSpaceError
+
+" Various commands
+syn region slrnrcCmdLine	matchgroup=slrnrcCmd start="\<\(autobaud\|color\|compatible_charsets\|group_display_format\|grouplens_add\|header_display_format\|ignore_quotes\|include\|interpret\|mono\|nnrpaccess\|posting_host\|server\|set\|setkey\|strip_re_regexp\|strip_sig_regexp\|strip_was_regexp\|unsetkey\|visible_headers\)\>" end="$" oneline contains=slrnrc\(String\|Comment\)
+
+" Listed for removal
+syn region slrnrcCmdLine	matchgroup=slrnrcCmd start="\<\(cc_followup_string\|decode_directory\|editor_command\|followup\|hostname\|organization\|quote_string\|realname\|replyto\|scorefile\|signature\|username\)\>" end="$" oneline contains=slrnrc\(String\|Comment\)
+
+" Setting variables
+syn keyword slrnrcSet		contained set
+syn match   slrnrcSetStr	"^\s*set\s\+\S\+" skipwhite nextgroup=slrnrcString contains=slrnrcSet,slrnrcVarStr\(Str\)\=
+syn match   slrnrcSetInt	contained "^\s*set\s\+\S\+" contains=slrnrcSet,slrnrcVarInt\(Str\)\=
+syn match   slrnrcSetIntLine	"^\s*set\s\+\S\+\s\+\(-\=\d\+\>\|'[^']\+'\)" contains=slrnrcSetInt,slrnrcNumber,slrnrcVarInt
+
+" Color definitions
+syn match   slrnrcColorObj	contained "\<quotes\d\+\>"
+syn keyword slrnrcColorObj	contained article author boldtext box cursor date description error frame from_myself group grouplens_display header_name header_number headers
+syn keyword slrnrcColorObj	contained high_score italicstext menu menu_press message neg_score normal pgpsignature pos_score quotes response_char selection signature status
+syn keyword slrnrcColorObj	contained subject thread_number tilde tree underlinetext unread_subject url verbatim
+
+" Listed for removal
+syn keyword slrnrcColorObj	contained verbatum
+
+syn region  slrnrcColorObjStr	contained matchgroup=slrnrcColorObj start=+"+ end=+"+ oneline contains=slrnrcColorObj,slrnrcSpaceError
+syn keyword slrnrcColorVal	contained default
+syn keyword slrnrcColorVal	contained black blue brightblue brightcyan brightgreen brightmagenta brightred brown cyan gray green lightgray magenta red white yellow
+syn region  slrnrcColorValStr	contained matchgroup=slrnrcColorVal start=+"+ end=+"+ oneline contains=slrnrcColorVal,slrnrcSpaceError
+" Mathcing a function with three arguments
+syn keyword slrnrcColor		contained color
+syn match   slrnrcColorInit	contained "^\s*color\s\+\S\+" skipwhite nextgroup=slrnrcColorVal\(Str\)\= contains=slrnrcColor\(Obj\|ObjStr\)\=
+syn match   slrnrcColorLine	"^\s*color\s\+\S\+\s\+\S\+" skipwhite nextgroup=slrnrcColorVal\(Str\)\= contains=slrnrcColor\(Init\|Val\|ValStr\)
+
+" Mono settings
+syn keyword slrnrcMonoVal	contained blink bold none reverse underline
+syn region  slrnrcMonoValStr	contained matchgroup=slrnrcMonoVal start=+"+ end=+"+ oneline contains=slrnrcMonoVal,slrnrcSpaceError
+" Color object is inherited
+" Mono needs at least one argument
+syn keyword slrnrcMono		contained mono
+syn match   slrnrcMonoInit	contained "^\s*mono\s\+\S\+" contains=slrnrcMono,slrnrcColorObj\(Str\)\=
+syn match   slrnrcMonoLine	"^\s*mono\s\+\S\+\s\+\S.*" contains=slrnrcMono\(Init\|Val\|ValStr\),slrnrcComment
+
+" Functions in article mode
+syn keyword slrnrcFunArt	contained article_bob article_eob article_left article_line_down article_line_up article_page_down article_page_up article_right article_search
+syn keyword slrnrcFunArt	contained author_search_backward author_search_forward browse_url cancel catchup catchup_all create_score decode delete delete_thread digit_arg
+syn keyword slrnrcFunArt	contained enlarge_article_window evaluate_cmd exchange_mark expunge fast_quit followup forward forward_digest get_children_headers get_parent_header
+syn keyword slrnrcFunArt	contained goto_article goto_last_read grouplens_rate_article header_bob header_eob header_line_down header_line_up header_page_down header_page_up
+syn keyword slrnrcFunArt	contained help hide_article locate_article mark_spot next next_high_score next_same_subject pipe post post_postponed previous print quit redraw
+syn keyword slrnrcFunArt	contained repeat_last_key reply request save show_spoilers shrink_article_window skip_quotes skip_to_next_group skip_to_previous_group
+syn keyword slrnrcFunArt	contained subject_search_backward subject_search_forward supersede suspend tag_header toggle_collapse_threads toggle_header_formats
+syn keyword slrnrcFunArt	contained toggle_header_tag toggle_headers toggle_pgpsignature toggle_quotes toggle_rot13 toggle_signature toggle_sort toggle_verbatim_marks
+syn keyword slrnrcFunArt	contained toggle_verbatim_text uncatchup uncatchup_all undelete untag_headers view_scores wrap_article zoom_article_window
+
+" Listed for removal
+syn keyword slrnrcFunArt	contained art_bob art_eob art_xpunge article_linedn article_lineup article_pagedn article_pageup down enlarge_window goto_beginning goto_end left
+syn keyword slrnrcFunArt	contained locate_header_by_msgid pagedn pageup pipe_article prev print_article right scroll_dn scroll_up shrink_window skip_to_prev_group
+syn keyword slrnrcFunArt	contained toggle_show_author up
+
+" Functions in group mode
+syn keyword slrnrcFunGroup	contained add_group bob catchup digit_arg eob evaluate_cmd group_search group_search_backward group_search_forward help line_down line_up move_group
+syn keyword slrnrcFunGroup	contained page_down page_up post post_postponed quit redraw refresh_groups repeat_last_key save_newsrc select_group subscribe suspend
+syn keyword slrnrcFunGroup	contained toggle_group_formats toggle_hidden toggle_list_all toggle_scoring transpose_groups uncatchup unsubscribe
+
+" Listed for removal
+syn keyword slrnrcFunGroup	contained down group_bob group_eob pagedown pageup toggle_group_display uncatch_up up
+
+" Functions in readline mode (actually from slang's slrline.c)
+syn keyword slrnrcFunRead	contained bdel bol complete cycle del delbol delbow deleol down enter eol left quoted_insert right self_insert trim up
+
+" Binding keys
+syn keyword slrnrcSetkeyObj	contained article group readline
+syn region  slrnrcSetkeyObjStr	contained matchgroup=slrnrcSetkeyObj start=+"+ end=+"+ oneline contains=slrnrcSetkeyObj
+syn match   slrnrcSetkeyArt	contained '\("\=\)\<article\>\1\s\+\S\+' skipwhite nextgroup=slrnrcKey contains=slrnrcSetKeyObj\(Str\)\=,slrnrcFunArt
+syn match   slrnrcSetkeyGroup	contained '\("\=\)\<group\>\1\s\+\S\+' skipwhite nextgroup=slrnrcKey contains=slrnrcSetKeyObj\(Str\)\=,slrnrcFunGroup
+syn match   slrnrcSetkeyRead	contained '\("\=\)\<readline\>\1\s\+\S\+' skipwhite nextgroup=slrnrcKey contains=slrnrcSetKeyObj\(Str\)\=,slrnrcFunRead
+syn match   slrnrcSetkey	"^\s*setkey\>" skipwhite nextgroup=slrnrcSetkeyArt,slrnrcSetkeyGroup,slrnrcSetkeyRead
+
+" Unbinding keys
+syn match   slrnrcUnsetkey	'^\s*unsetkey\s\+\("\)\=\(article\|group\|readline\)\>\1' skipwhite nextgroup=slrnrcKey contains=slrnrcSetkeyObj\(Str\)\=
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link slrnrcTodo		Todo
+hi def link slrnrcSpaceError	Error
+hi def link slrnrcNumber		Number
+hi def link slrnrcSpecKey		SpecialChar
+hi def link slrnrcKey		String
+hi def link slrnrcSpecChar		SpecialChar
+hi def link slrnrcString		String
+hi def link slrnSlangPreCondit	Special
+hi def link slrnrcComment		Comment
+hi def link slrnrcVarInt		Identifier
+hi def link slrnrcVarStr		Identifier
+hi def link slrnrcCmd		slrnrcSet
+hi def link slrnrcSet		Operator
+hi def link slrnrcColor		Keyword
+hi def link slrnrcColorObj		Identifier
+hi def link slrnrcColorVal		String
+hi def link slrnrcMono		Keyword
+hi def link slrnrcMonoObj		Identifier
+hi def link slrnrcMonoVal		String
+hi def link slrnrcFunArt		Macro
+hi def link slrnrcFunGroup		Macro
+hi def link slrnrcFunRead		Macro
+hi def link slrnrcSetkeyObj	Identifier
+hi def link slrnrcSetkey		Keyword
+hi def link slrnrcUnsetkey		slrnrcSetkey
+
+
+let b:current_syntax = "slrnrc"
+
+"EOF	vim: ts=8 noet tw=120 sw=8 sts=0
+
+endif
diff --git a/syntax/slrnsc.vim b/syntax/slrnsc.vim
new file mode 100644
index 000000000..74d6ea691
--- /dev/null
+++ b/syntax/slrnsc.vim
@@ -0,0 +1,72 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slrnsc') == -1
+
+" Vim syntax file
+" Language:	Slrn score file (based on slrn 0.9.8.0)
+" Maintainer:	Preben 'Peppe' Guldberg <peppe@wielders.org>
+" Last Change:	8 Oct 2004
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" characters in newsgroup names
+setlocal isk=@,48-57,.,-,_,+
+
+syn match slrnscComment		"%.*$"
+syn match slrnscSectionCom	".].*"lc=2
+
+syn match slrnscGroup		contained "\(\k\|\*\)\+"
+syn match slrnscNumber		contained "\d\+"
+syn match slrnscDate		contained "\(\d\{1,2}[-/]\)\{2}\d\{4}"
+syn match slrnscDelim		contained ":"
+syn match slrnscComma		contained ","
+syn match slrnscOper		contained "\~"
+syn match slrnscEsc		contained "\\[ecC<>.]"
+syn match slrnscEsc		contained "[?^]"
+syn match slrnscEsc		contained "[^\\]$\s*$"lc=1
+
+syn keyword slrnscInclude	contained include
+syn match slrnscIncludeLine	"^\s*Include\s\+\S.*$"
+
+syn region slrnscSection	matchgroup=slrnscSectionStd start="^\s*\[" end='\]' contains=slrnscGroup,slrnscComma,slrnscSectionCom
+syn region slrnscSection	matchgroup=slrnscSectionNot start="^\s*\[\~" end='\]' contains=slrnscGroup,slrnscCommas,slrnscSectionCom
+
+syn keyword slrnscItem		contained Age Bytes Date Expires From Has-Body Lines Message-Id Newsgroup References Subject Xref
+
+syn match slrnscScoreItem	contained "%.*$"						skipempty nextgroup=slrnscScoreItem contains=slrnscComment
+syn match slrnscScoreItem	contained "^\s*Expires:\s*\(\d\{1,2}[-/]\)\{2}\d\{4}\s*$"	skipempty nextgroup=slrnscScoreItem contains=slrnscItem,slrnscDelim,slrnscDate
+syn match slrnscScoreItem	contained "^\s*\~\=\(Age\|Bytes\|Has-Body\|Lines\):\s*\d\+\s*$"	skipempty nextgroup=slrnscScoreItem contains=slrnscOper,slrnscItem,slrnscDelim,slrnscNumber
+syn match slrnscScoreItemFill	contained ".*$"							skipempty nextgroup=slrnscScoreItem contains=slrnscEsc
+syn match slrnscScoreItem	contained "^\s*\~\=\(Date\|From\|Message-Id\|Newsgroup\|References\|Subject\|Xref\):"	nextgroup=slrnscScoreItemFill contains=slrnscOper,slrnscItem,slrnscDelim
+syn region slrnscScoreItem	contained matchgroup=Special start="^\s*\~\={::\=" end="^\s*}" skipempty nextgroup=slrnscScoreItem contains=slrnscScoreItem
+
+syn keyword slrnscScore		contained Score
+syn match slrnscScoreIdent	contained "%.*"
+syn match slrnScoreLine		"^\s*Score::\=\s\+=\=[-+]\=\d\+\s*\(%.*\)\=$" skipempty nextgroup=slrnscScoreItem contains=slrnscScore,slrnscDelim,slrnscOper,slrnscNumber,slrnscScoreIdent
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link slrnscComment		Comment
+hi def link slrnscSectionCom	slrnscComment
+hi def link slrnscGroup		String
+hi def link slrnscNumber		Number
+hi def link slrnscDate		Special
+hi def link slrnscDelim		Delimiter
+hi def link slrnscComma		SpecialChar
+hi def link slrnscOper		SpecialChar
+hi def link slrnscEsc		String
+hi def link slrnscSectionStd	Type
+hi def link slrnscSectionNot	Delimiter
+hi def link slrnscItem		Statement
+hi def link slrnscScore		Keyword
+hi def link slrnscScoreIdent	Identifier
+hi def link slrnscInclude		Keyword
+
+
+let b:current_syntax = "slrnsc"
+
+"EOF	vim: ts=8 noet tw=200 sw=8 sts=0
+
+endif
diff --git a/syntax/sm.vim b/syntax/sm.vim
new file mode 100644
index 000000000..5ebe510ea
--- /dev/null
+++ b/syntax/sm.vim
@@ -0,0 +1,84 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sm') == -1
+
+" Vim syntax file
+" Language:	sendmail
+" Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Last Change:	Oct 25, 2016
+" Version:	9
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SM
+if exists("b:current_syntax")
+  finish
+endif
+
+" Comments
+syn match smComment	"^#.*$"	contains=@Spell
+
+" Definitions, Classes, Files, Options, Precedence, Trusted Users, Mailers
+syn match smDefine	"^[CDF]."
+syn match smDefine	"^O[AaBcdDeFfgHiLmNoQqrSsTtuvxXyYzZ]"
+syn match smDefine	"^O\s"he=e-1
+syn match smDefine	"^M[a-zA-Z0-9]\+,"he=e-1
+syn match smDefine	"^T"	nextgroup=smTrusted
+syn match smDefine	"^P"	nextgroup=smMesg
+syn match smTrusted	"\S\+$"		contained
+syn match smMesg		"\S*="he=e-1	contained nextgroup=smPrecedence
+syn match smPrecedence	"-\=[0-9]\+"		contained
+
+" Header Format  H?list-of-mailer-flags?name: format
+syn match smHeaderSep contained "[?:]"
+syn match smHeader	"^H\(?[a-zA-Z]\+?\)\=[-a-zA-Z_]\+:" contains=smHeaderSep
+
+" Variables
+syn match smVar		"\$[a-z\.\|]"
+
+" Rulesets
+syn match smRuleset	"^S\d*"
+
+" Rewriting Rules
+syn match smRewrite	"^R"			skipwhite nextgroup=smRewriteLhsToken,smRewriteLhsUser
+
+syn match smRewriteLhsUser	contained "[^\t$]\+"		skipwhite nextgroup=smRewriteLhsToken,smRewriteLhsSep
+syn match smRewriteLhsToken	contained "\(\$[-*+]\|\$[-=][A-Za-z]\|\$Y\)\+"	skipwhite nextgroup=smRewriteLhsUser,smRewriteLhsSep
+
+syn match smRewriteLhsSep	contained "\t\+"			skipwhite nextgroup=smRewriteRhsToken,smRewriteRhsUser
+
+syn match smRewriteRhsUser	contained "[^\t$]\+"		skipwhite nextgroup=smRewriteRhsToken,smRewriteRhsSep
+syn match smRewriteRhsToken	contained "\(\$\d\|\$>\d\|\$#\|\$@\|\$:[-_a-zA-Z]\+\|\$[[\]]\|\$@\|\$:\|\$[A-Za-z]\)\+" skipwhite nextgroup=smRewriteRhsUser,smRewriteRhsSep
+
+syn match smRewriteRhsSep	contained "\t\+"			skipwhite nextgroup=smRewriteComment,smRewriteRhsSep
+syn match smRewriteRhsSep	contained "$"
+
+syn match smRewriteComment	contained "[^\t$]*$"
+
+" Clauses
+syn match smClauseError		"\$\."
+syn match smElse		contained	"\$|"
+syn match smClauseCont	contained	"^\t"
+syn region smClause	matchgroup=Delimiter start="\$?." matchgroup=Delimiter end="\$\." contains=smElse,smClause,smVar,smClauseCont
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link smClause	Special
+hi def link smClauseError	Error
+hi def link smComment	Comment
+hi def link smDefine	Statement
+hi def link smElse	Delimiter
+hi def link smHeader	Statement
+hi def link smHeaderSep	String
+hi def link smMesg	Special
+hi def link smPrecedence	Number
+hi def link smRewrite	Statement
+hi def link smRewriteComment	Comment
+hi def link smRewriteLhsToken	String
+hi def link smRewriteLhsUser	Statement
+hi def link smRewriteRhsToken	String
+hi def link smRuleset	Preproc
+hi def link smTrusted	Special
+hi def link smVar		String
+
+let b:current_syntax = "sm"
+
+" vim: ts=18
+
+endif
diff --git a/syntax/smarty.vim b/syntax/smarty.vim
new file mode 100644
index 000000000..5ac25bc62
--- /dev/null
+++ b/syntax/smarty.vim
@@ -0,0 +1,80 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smarty') == -1
+
+" Vim syntax file
+" Language:	Smarty Templates
+" Maintainer:	Manfred Stienstra manfred.stienstra@dwerg.net
+" Last Change:  Mon Nov  4 11:42:23 CET 2002
+" Filenames:    *.tpl
+" URL:		http://www.dwerg.net/projects/vim/smarty.vim
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if !exists("main_syntax")
+  " quit when a syntax file was already loaded
+  if exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax = 'smarty'
+endif
+
+syn case ignore
+
+runtime! syntax/html.vim
+"syn cluster htmlPreproc add=smartyUnZone
+
+syn match smartyBlock contained "[\[\]]"
+
+syn keyword smartyTagName capture config_load include include_php
+syn keyword smartyTagName insert if elseif else ldelim rdelim literal
+syn keyword smartyTagName php section sectionelse foreach foreachelse
+syn keyword smartyTagName strip assign counter cycle debug eval fetch
+syn keyword smartyTagName html_options html_select_date html_select_time
+syn keyword smartyTagName math popup_init popup html_checkboxes html_image
+syn keyword smartyTagName html_radios html_table mailto textformat
+
+syn keyword smartyModifier cat capitalize count_characters count_paragraphs
+syn keyword smartyModifier count_sentences count_words date_format default
+syn keyword smartyModifier escape indent lower nl2br regex_replace replace
+syn keyword smartyModifier spacify string_format strip strip_tags truncate
+syn keyword smartyModifier upper wordwrap
+
+syn keyword smartyInFunc neq eq
+
+syn keyword smartyProperty contained "file="
+syn keyword smartyProperty contained "loop="
+syn keyword smartyProperty contained "name="
+syn keyword smartyProperty contained "include="
+syn keyword smartyProperty contained "skip="
+syn keyword smartyProperty contained "section="
+
+syn keyword smartyConstant "\$smarty"
+
+syn keyword smartyDot .
+
+syn region smartyZone matchgroup=Delimiter start="{" end="}" contains=smartyProperty, smartyString, smartyBlock, smartyTagName, smartyConstant, smartyInFunc, smartyModifier
+
+syn region  htmlString   contained start=+"+ end=+"+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc,smartyZone
+syn region  htmlString   contained start=+'+ end=+'+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc,smartyZone
+  syn region htmlLink start="<a\>\_[^>]*\<href\>" end="</a>"me=e-4 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,javaScript,@htmlPreproc,smartyZone
+
+
+
+hi def link smartyTagName Identifier
+hi def link smartyProperty Constant
+" if you want the text inside the braces to be colored, then
+" remove the comment in from of the next statement
+"hi def link smartyZone Include
+hi def link smartyInFunc Function
+hi def link smartyBlock Constant
+hi def link smartyDot SpecialChar
+hi def link smartyModifier Function
+
+let b:current_syntax = "smarty"
+
+if main_syntax == 'smarty'
+  unlet main_syntax
+endif
+
+" vim: ts=8
+
+endif
diff --git a/syntax/smcl.vim b/syntax/smcl.vim
new file mode 100644
index 000000000..57bac5586
--- /dev/null
+++ b/syntax/smcl.vim
@@ -0,0 +1,311 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smcl') == -1
+
+" smcl.vim -- Vim syntax file for smcl files.
+" Language:	SMCL -- Stata Markup and Control Language
+" Maintainer:	Jeff Pitblado <jpitblado@stata.com>
+" Last Change:	26apr2006
+" Version:	1.1.2
+
+" Log:
+" 20mar2003	updated the match definition for cmdab
+" 14apr2006	'syntax clear' only under version control
+"		check for 'b:current_syntax', removed 'did_smcl_syntax_inits'
+" 26apr2006	changed 'stata_smcl' to 'smcl'
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+syntax case match
+
+syn keyword smclCCLword current_date		contained
+syn keyword smclCCLword current_time		contained
+syn keyword smclCCLword rmsg_time		contained
+syn keyword smclCCLword stata_version		contained
+syn keyword smclCCLword version			contained
+syn keyword smclCCLword born_date		contained
+syn keyword smclCCLword flavor			contained
+syn keyword smclCCLword SE			contained
+syn keyword smclCCLword mode			contained
+syn keyword smclCCLword console			contained
+syn keyword smclCCLword os			contained
+syn keyword smclCCLword osdtl			contained
+syn keyword smclCCLword machine_type		contained
+syn keyword smclCCLword byteorder		contained
+syn keyword smclCCLword sysdir_stata		contained
+syn keyword smclCCLword sysdir_updates		contained
+syn keyword smclCCLword sysdir_base		contained
+syn keyword smclCCLword sysdir_site		contained
+syn keyword smclCCLword sysdir_plus		contained
+syn keyword smclCCLword sysdir_personal		contained
+syn keyword smclCCLword sysdir_oldplace		contained
+syn keyword smclCCLword adopath			contained
+syn keyword smclCCLword pwd			contained
+syn keyword smclCCLword dirsep			contained
+syn keyword smclCCLword max_N_theory		contained
+syn keyword smclCCLword max_N_current		contained
+syn keyword smclCCLword max_k_theory		contained
+syn keyword smclCCLword max_k_current		contained
+syn keyword smclCCLword max_width_theory	contained
+syn keyword smclCCLword max_width_current	contained
+syn keyword smclCCLword max_matsize		contained
+syn keyword smclCCLword min_matsize		contained
+syn keyword smclCCLword max_macrolen		contained
+syn keyword smclCCLword macrolen		contained
+syn keyword smclCCLword max_cmdlen		contained
+syn keyword smclCCLword cmdlen			contained
+syn keyword smclCCLword namelen			contained
+syn keyword smclCCLword mindouble		contained
+syn keyword smclCCLword maxdouble		contained
+syn keyword smclCCLword epsdouble		contained
+syn keyword smclCCLword minfloat		contained
+syn keyword smclCCLword maxfloat		contained
+syn keyword smclCCLword epsfloat		contained
+syn keyword smclCCLword minlong			contained
+syn keyword smclCCLword maxlong			contained
+syn keyword smclCCLword minint			contained
+syn keyword smclCCLword maxint			contained
+syn keyword smclCCLword minbyte			contained
+syn keyword smclCCLword maxbyte			contained
+syn keyword smclCCLword maxstrvarlen		contained
+syn keyword smclCCLword memory			contained
+syn keyword smclCCLword maxvar			contained
+syn keyword smclCCLword matsize			contained
+syn keyword smclCCLword N			contained
+syn keyword smclCCLword k			contained
+syn keyword smclCCLword width			contained
+syn keyword smclCCLword changed			contained
+syn keyword smclCCLword filename		contained
+syn keyword smclCCLword filedate		contained
+syn keyword smclCCLword more			contained
+syn keyword smclCCLword rmsg			contained
+syn keyword smclCCLword dp			contained
+syn keyword smclCCLword linesize		contained
+syn keyword smclCCLword pagesize		contained
+syn keyword smclCCLword logtype			contained
+syn keyword smclCCLword linegap			contained
+syn keyword smclCCLword scrollbufsize		contained
+syn keyword smclCCLword varlabelpos		contained
+syn keyword smclCCLword reventries		contained
+syn keyword smclCCLword graphics		contained
+syn keyword smclCCLword scheme			contained
+syn keyword smclCCLword printcolor		contained
+syn keyword smclCCLword adosize			contained
+syn keyword smclCCLword maxdb			contained
+syn keyword smclCCLword virtual			contained
+syn keyword smclCCLword checksum		contained
+syn keyword smclCCLword timeout1		contained
+syn keyword smclCCLword timeout2		contained
+syn keyword smclCCLword httpproxy		contained
+syn keyword smclCCLword h_current		contained
+syn keyword smclCCLword max_matsize		contained
+syn keyword smclCCLword min_matsize		contained
+syn keyword smclCCLword max_macrolen		contained
+syn keyword smclCCLword macrolen		contained
+syn keyword smclCCLword max_cmdlen		contained
+syn keyword smclCCLword cmdlen			contained
+syn keyword smclCCLword namelen			contained
+syn keyword smclCCLword mindouble		contained
+syn keyword smclCCLword maxdouble		contained
+syn keyword smclCCLword epsdouble		contained
+syn keyword smclCCLword minfloat		contained
+syn keyword smclCCLword maxfloat		contained
+syn keyword smclCCLword epsfloat		contained
+syn keyword smclCCLword minlong			contained
+syn keyword smclCCLword maxlong			contained
+syn keyword smclCCLword minint			contained
+syn keyword smclCCLword maxint			contained
+syn keyword smclCCLword minbyte			contained
+syn keyword smclCCLword maxbyte			contained
+syn keyword smclCCLword maxstrvarlen		contained
+syn keyword smclCCLword memory			contained
+syn keyword smclCCLword maxvar			contained
+syn keyword smclCCLword matsize			contained
+syn keyword smclCCLword N			contained
+syn keyword smclCCLword k			contained
+syn keyword smclCCLword width			contained
+syn keyword smclCCLword changed			contained
+syn keyword smclCCLword filename		contained
+syn keyword smclCCLword filedate		contained
+syn keyword smclCCLword more			contained
+syn keyword smclCCLword rmsg			contained
+syn keyword smclCCLword dp			contained
+syn keyword smclCCLword linesize		contained
+syn keyword smclCCLword pagesize		contained
+syn keyword smclCCLword logtype			contained
+syn keyword smclCCLword linegap			contained
+syn keyword smclCCLword scrollbufsize		contained
+syn keyword smclCCLword varlabelpos		contained
+syn keyword smclCCLword reventries		contained
+syn keyword smclCCLword graphics		contained
+syn keyword smclCCLword scheme			contained
+syn keyword smclCCLword printcolor		contained
+syn keyword smclCCLword adosize			contained
+syn keyword smclCCLword maxdb			contained
+syn keyword smclCCLword virtual			contained
+syn keyword smclCCLword checksum		contained
+syn keyword smclCCLword timeout1		contained
+syn keyword smclCCLword timeout2		contained
+syn keyword smclCCLword httpproxy		contained
+syn keyword smclCCLword httpproxyhost		contained
+syn keyword smclCCLword httpproxyport		contained
+syn keyword smclCCLword httpproxyauth		contained
+syn keyword smclCCLword httpproxyuser		contained
+syn keyword smclCCLword httpproxypw		contained
+syn keyword smclCCLword trace			contained
+syn keyword smclCCLword tracedepth		contained
+syn keyword smclCCLword tracesep		contained
+syn keyword smclCCLword traceindent		contained
+syn keyword smclCCLword traceexapnd		contained
+syn keyword smclCCLword tracenumber		contained
+syn keyword smclCCLword type			contained
+syn keyword smclCCLword level			contained
+syn keyword smclCCLword seed			contained
+syn keyword smclCCLword searchdefault		contained
+syn keyword smclCCLword pi			contained
+syn keyword smclCCLword rc			contained
+
+" Directive for the contant and current-value class
+syn region smclCCL start=/{ccl / end=/}/ oneline contains=smclCCLword
+
+" The order of the following syntax definitions is roughly that of the on-line
+" documentation for smcl in Stata, from within Stata see help smcl.
+
+" Format directives for line and paragraph modes
+syn match smclFormat /{smcl}/
+syn match smclFormat /{sf\(\|:[^}]\+\)}/
+syn match smclFormat /{it\(\|:[^}]\+\)}/
+syn match smclFormat /{bf\(\|:[^}]\+\)}/
+syn match smclFormat /{inp\(\|:[^}]\+\)}/
+syn match smclFormat /{input\(\|:[^}]\+\)}/
+syn match smclFormat /{err\(\|:[^}]\+\)}/
+syn match smclFormat /{error\(\|:[^}]\+\)}/
+syn match smclFormat /{res\(\|:[^}]\+\)}/
+syn match smclFormat /{result\(\|:[^}]\+\)}/
+syn match smclFormat /{txt\(\|:[^}]\+\)}/
+syn match smclFormat /{text\(\|:[^}]\+\)}/
+syn match smclFormat /{com\(\|:[^}]\+\)}/
+syn match smclFormat /{cmd\(\|:[^}]\+\)}/
+syn match smclFormat /{cmdab:[^:}]\+:[^:}()]*\(\|:\|:(\|:()\)}/
+syn match smclFormat /{hi\(\|:[^}]\+\)}/
+syn match smclFormat /{hilite\(\|:[^}]\+\)}/
+syn match smclFormat /{ul \(on\|off\)}/
+syn match smclFormat /{ul:[^}]\+}/
+syn match smclFormat /{hline\(\| \d\+\| -\d\+\|:[^}]\+\)}/
+syn match smclFormat /{dup \d\+:[^}]\+}/
+syn match smclFormat /{c [^}]\+}/
+syn match smclFormat /{char [^}]\+}/
+syn match smclFormat /{reset}/
+
+" Formatting directives for line mode
+syn match smclFormat /{title:[^}]\+}/
+syn match smclFormat /{center:[^}]\+}/
+syn match smclFormat /{centre:[^}]\+}/
+syn match smclFormat /{center \d\+:[^}]\+}/
+syn match smclFormat /{centre \d\+:[^}]\+}/
+syn match smclFormat /{right:[^}]\+}/
+syn match smclFormat /{lalign \d\+:[^}]\+}/
+syn match smclFormat /{ralign \d\+:[^}]\+}/
+syn match smclFormat /{\.\.\.}/
+syn match smclFormat /{col \d\+}/
+syn match smclFormat /{space \d\+}/
+syn match smclFormat /{tab}/
+
+" Formatting directives for paragraph mode
+syn match smclFormat /{bind:[^}]\+}/
+syn match smclFormat /{break}/
+
+syn match smclFormat /{p}/
+syn match smclFormat /{p \d\+}/
+syn match smclFormat /{p \d\+ \d\+}/
+syn match smclFormat /{p \d\+ \d\+ \d\+}/
+syn match smclFormat /{pstd}/
+syn match smclFormat /{psee}/
+syn match smclFormat /{phang\(\|2\|3\)}/
+syn match smclFormat /{pmore\(\|2\|3\)}/
+syn match smclFormat /{pin\(\|2\|3\)}/
+syn match smclFormat /{p_end}/
+
+syn match smclFormat /{opt \w\+\(\|:\w\+\)\(\|([^)}]*)\)}/
+
+syn match smclFormat /{opth \w*\(\|:\w\+\)(\w*)}/
+syn match smclFormat /{opth "\w\+\((\w\+:[^)}]\+)\)"}/
+syn match smclFormat /{opth \w\+:\w\+(\w\+:[^)}]\+)}/
+
+syn match smclFormat /{dlgtab\s*\(\|\d\+\|\d\+\s\+\d\+\):[^}]\+}/
+
+syn match smclFormat /{p2colset\s\+\d\+\s\+\d\+\s\+\d\+\s\+\d\+}/
+syn match smclFormat /{p2col\s\+:[^{}]*}.*{p_end}/
+syn match smclFormat /{p2col\s\+:{[^{}]*}}.*{p_end}/
+syn match smclFormat /{p2coldent\s*:[^{}]*}.*{p_end}/
+syn match smclFormat /{p2coldent\s*:{[^{}]*}}.*{p_end}/
+syn match smclFormat /{p2line\s*\(\|\d\+\s\+\d\+\)}/
+syn match smclFormat /{p2colreset}/
+
+syn match smclFormat /{synoptset\s\+\d\+\s\+\w\+}/
+syn match smclFormat /{synopt\s*:[^{}]*}.*{p_end}/
+syn match smclFormat /{synopt\s*:{[^{}]*}}.*{p_end}/
+syn match smclFormat /{syntab\s*:[^{}]*}/
+syn match smclFormat /{synopthdr}/
+syn match smclFormat /{synoptline}/
+
+" Link directive for line and paragraph modes
+syn match smclLink /{help [^}]\+}/
+syn match smclLink /{helpb [^}]\+}/
+syn match smclLink /{help_d:[^}]\+}/
+syn match smclLink /{search [^}]\+}/
+syn match smclLink /{search_d:[^}]\+}/
+syn match smclLink /{browse [^}]\+}/
+syn match smclLink /{view [^}]\+}/
+syn match smclLink /{view_d:[^}]\+}/
+syn match smclLink /{news:[^}]\+}/
+syn match smclLink /{net [^}]\+}/
+syn match smclLink /{net_d:[^}]\+}/
+syn match smclLink /{netfrom_d:[^}]\+}/
+syn match smclLink /{ado [^}]\+}/
+syn match smclLink /{ado_d:[^}]\+}/
+syn match smclLink /{update [^}]\+}/
+syn match smclLink /{update_d:[^}]\+}/
+syn match smclLink /{dialog [^}]\+}/
+syn match smclLink /{back:[^}]\+}/
+syn match smclLink /{clearmore:[^}]\+}/
+syn match smclLink /{stata [^}]\+}/
+
+syn match smclLink /{newvar\(\|:[^}]\+\)}/
+syn match smclLink /{var\(\|:[^}]\+\)}/
+syn match smclLink /{varname\(\|:[^}]\+\)}/
+syn match smclLink /{vars\(\|:[^}]\+\)}/
+syn match smclLink /{varlist\(\|:[^}]\+\)}/
+syn match smclLink /{depvar\(\|:[^}]\+\)}/
+syn match smclLink /{depvars\(\|:[^}]\+\)}/
+syn match smclLink /{depvarlist\(\|:[^}]\+\)}/
+syn match smclLink /{indepvars\(\|:[^}]\+\)}/
+
+syn match smclLink /{dtype}/
+syn match smclLink /{ifin}/
+syn match smclLink /{weight}/
+
+" Comment
+syn region smclComment start=/{\*/ end=/}/ oneline
+
+" Strings
+syn region smclString  matchgroup=Nothing start=/"/ end=/"/   oneline
+syn region smclEString matchgroup=Nothing start=/`"/ end=/"'/ oneline contains=smclEString
+
+" assign highlight groups
+
+hi def link smclEString		smclString
+
+hi def link smclCCLword		Statement
+hi def link smclCCL		Type
+hi def link smclFormat		Statement
+hi def link smclLink		Underlined
+hi def link smclComment		Comment
+hi def link smclString		String
+
+let b:current_syntax = "smcl"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/smith.vim b/syntax/smith.vim
new file mode 100644
index 000000000..7d3a67b79
--- /dev/null
+++ b/syntax/smith.vim
@@ -0,0 +1,43 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smith') == -1
+
+" Vim syntax file
+" Language:	SMITH
+" Maintainer:	Rafal M. Sulejman <rms@poczta.onet.pl>
+" Last Change:	21.07.2000
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+
+syn match smithComment ";.*$"
+
+syn match smithNumber		"\<[+-]*[0-9]\d*\>"
+
+syn match smithRegister		"R[\[]*[0-9]*[\]]*"
+
+syn match smithKeyword	"COR\|MOV\|MUL\|NOT\|STOP\|SUB\|NOP\|BLA\|REP"
+
+syn region smithString		start=+"+  skip=+\\\\\|\\"+  end=+"+
+
+
+syn case match
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link smithRegister	Identifier
+hi def link smithKeyword	Keyword
+hi def link smithComment Comment
+hi def link smithString String
+hi def link smithNumber	Number
+
+
+let b:current_syntax = "smith"
+
+" vim: ts=2
+
+endif
diff --git a/syntax/sml.vim b/syntax/sml.vim
new file mode 100644
index 000000000..b4ff495d2
--- /dev/null
+++ b/syntax/sml.vim
@@ -0,0 +1,221 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sml') == -1
+
+" Vim syntax file
+" Language:     SML
+" Filenames:    *.sml *.sig
+" Maintainers:  Markus Mottl            <markus.mottl@gmail.com>
+"               Fabrizio Zeno Cornelli  <zeno@filibusta.crema.unimi.it>
+" URL:          http://www.ocaml.info/vim/syntax/sml.vim
+" Last Change:  2006 Oct 23 - Fixed character highlighting bug (MM)
+"               2002 Jun 02 - Fixed small typo  (MM)
+"               2001 Nov 20 - Fixed small highlighting bug with modules (MM)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" SML is case sensitive.
+syn case match
+
+" lowercase identifier - the standard way to match
+syn match    smlLCIdentifier /\<\(\l\|_\)\(\w\|'\)*\>/
+
+syn match    smlKeyChar    "|"
+
+" Errors
+syn match    smlBraceErr   "}"
+syn match    smlBrackErr   "\]"
+syn match    smlParenErr   ")"
+syn match    smlCommentErr "\*)"
+syn match    smlThenErr    "\<then\>"
+
+" Error-highlighting of "end" without synchronization:
+" as keyword or as error (default)
+if exists("sml_noend_error")
+  syn match    smlKeyword    "\<end\>"
+else
+  syn match    smlEndErr     "\<end\>"
+endif
+
+" Some convenient clusters
+syn cluster  smlAllErrs contains=smlBraceErr,smlBrackErr,smlParenErr,smlCommentErr,smlEndErr,smlThenErr
+
+syn cluster  smlAENoParen contains=smlBraceErr,smlBrackErr,smlCommentErr,smlEndErr,smlThenErr
+
+syn cluster  smlContained contains=smlTodo,smlPreDef,smlModParam,smlModParam1,smlPreMPRestr,smlMPRestr,smlMPRestr1,smlMPRestr2,smlMPRestr3,smlModRHS,smlFuncWith,smlFuncStruct,smlModTypeRestr,smlModTRWith,smlWith,smlWithRest,smlModType,smlFullMod
+
+
+" Enclosing delimiters
+syn region   smlEncl transparent matchgroup=smlKeyword start="(" matchgroup=smlKeyword end=")" contains=ALLBUT,@smlContained,smlParenErr
+syn region   smlEncl transparent matchgroup=smlKeyword start="{" matchgroup=smlKeyword end="}"  contains=ALLBUT,@smlContained,smlBraceErr
+syn region   smlEncl transparent matchgroup=smlKeyword start="\[" matchgroup=smlKeyword end="\]" contains=ALLBUT,@smlContained,smlBrackErr
+syn region   smlEncl transparent matchgroup=smlKeyword start="#\[" matchgroup=smlKeyword end="\]" contains=ALLBUT,@smlContained,smlBrackErr
+
+
+" Comments
+syn region   smlComment start="(\*" end="\*)" contains=smlComment,smlTodo
+syn keyword  smlTodo contained TODO FIXME XXX
+
+
+" let
+syn region   smlEnd matchgroup=smlKeyword start="\<let\>" matchgroup=smlKeyword end="\<end\>" contains=ALLBUT,@smlContained,smlEndErr
+
+" local
+syn region   smlEnd matchgroup=smlKeyword start="\<local\>" matchgroup=smlKeyword end="\<end\>" contains=ALLBUT,@smlContained,smlEndErr
+
+" abstype
+syn region   smlNone matchgroup=smlKeyword start="\<abstype\>" matchgroup=smlKeyword end="\<end\>" contains=ALLBUT,@smlContained,smlEndErr
+
+" begin
+syn region   smlEnd matchgroup=smlKeyword start="\<begin\>" matchgroup=smlKeyword end="\<end\>" contains=ALLBUT,@smlContained,smlEndErr
+
+" if
+syn region   smlNone matchgroup=smlKeyword start="\<if\>" matchgroup=smlKeyword end="\<then\>" contains=ALLBUT,@smlContained,smlThenErr
+
+
+"" Modules
+
+" "struct"
+syn region   smlStruct matchgroup=smlModule start="\<struct\>" matchgroup=smlModule end="\<end\>" contains=ALLBUT,@smlContained,smlEndErr
+
+" "sig"
+syn region   smlSig matchgroup=smlModule start="\<sig\>" matchgroup=smlModule end="\<end\>" contains=ALLBUT,@smlContained,smlEndErr,smlModule
+syn region   smlModSpec matchgroup=smlKeyword start="\<structure\>" matchgroup=smlModule end="\<\u\(\w\|'\)*\>" contained contains=@smlAllErrs,smlComment skipwhite skipempty nextgroup=smlModTRWith,smlMPRestr
+
+" "open"
+syn region   smlNone matchgroup=smlKeyword start="\<open\>" matchgroup=smlModule end="\<\u\(\w\|'\)*\(\.\u\(\w\|'\)*\)*\>" contains=@smlAllErrs,smlComment
+
+" "structure" - somewhat complicated stuff ;-)
+syn region   smlModule matchgroup=smlKeyword start="\<\(structure\|functor\)\>" matchgroup=smlModule end="\<\u\(\w\|'\)*\>" contains=@smlAllErrs,smlComment skipwhite skipempty nextgroup=smlPreDef
+syn region   smlPreDef start="."me=e-1 matchgroup=smlKeyword end="\l\|="me=e-1 contained contains=@smlAllErrs,smlComment,smlModParam,smlModTypeRestr,smlModTRWith nextgroup=smlModPreRHS
+syn region   smlModParam start="([^*]" end=")" contained contains=@smlAENoParen,smlModParam1
+syn match    smlModParam1 "\<\u\(\w\|'\)*\>" contained skipwhite skipempty nextgroup=smlPreMPRestr
+
+syn region   smlPreMPRestr start="."me=e-1 end=")"me=e-1 contained contains=@smlAllErrs,smlComment,smlMPRestr,smlModTypeRestr
+
+syn region   smlMPRestr start=":" end="."me=e-1 contained contains=@smlComment skipwhite skipempty nextgroup=smlMPRestr1,smlMPRestr2,smlMPRestr3
+syn region   smlMPRestr1 matchgroup=smlModule start="\ssig\s\=" matchgroup=smlModule end="\<end\>" contained contains=ALLBUT,@smlContained,smlEndErr,smlModule
+syn region   smlMPRestr2 start="\sfunctor\(\s\|(\)\="me=e-1 matchgroup=smlKeyword end="->" contained contains=@smlAllErrs,smlComment,smlModParam skipwhite skipempty nextgroup=smlFuncWith
+syn match    smlMPRestr3 "\w\(\w\|'\)*\(\.\w\(\w\|'\)*\)*" contained
+syn match    smlModPreRHS "=" contained skipwhite skipempty nextgroup=smlModParam,smlFullMod
+syn region   smlModRHS start="." end=".\w\|([^*]"me=e-2 contained contains=smlComment skipwhite skipempty nextgroup=smlModParam,smlFullMod
+syn match    smlFullMod "\<\u\(\w\|'\)*\(\.\u\(\w\|'\)*\)*" contained skipwhite skipempty nextgroup=smlFuncWith
+
+syn region   smlFuncWith start="([^*]"me=e-1 end=")" contained contains=smlComment,smlWith,smlFuncStruct
+syn region   smlFuncStruct matchgroup=smlModule start="[^a-zA-Z]struct\>"hs=s+1 matchgroup=smlModule end="\<end\>" contains=ALLBUT,@smlContained,smlEndErr
+
+syn match    smlModTypeRestr "\<\w\(\w\|'\)*\(\.\w\(\w\|'\)*\)*\>" contained
+syn region   smlModTRWith start=":\s*("hs=s+1 end=")" contained contains=@smlAENoParen,smlWith
+syn match    smlWith "\<\(\u\(\w\|'\)*\.\)*\w\(\w\|'\)*\>" contained skipwhite skipempty nextgroup=smlWithRest
+syn region   smlWithRest start="[^)]" end=")"me=e-1 contained contains=ALLBUT,@smlContained
+
+" "signature"
+syn region   smlKeyword start="\<signature\>" matchgroup=smlModule end="\<\w\(\w\|'\)*\>" contains=smlComment skipwhite skipempty nextgroup=smlMTDef
+syn match    smlMTDef "=\s*\w\(\w\|'\)*\>"hs=s+1,me=s
+
+syn keyword  smlKeyword  and andalso case
+syn keyword  smlKeyword  datatype else eqtype
+syn keyword  smlKeyword  exception fn fun handle
+syn keyword  smlKeyword  in infix infixl infixr
+syn keyword  smlKeyword  match nonfix of orelse
+syn keyword  smlKeyword  raise handle type
+syn keyword  smlKeyword  val where while with withtype
+
+syn keyword  smlType     bool char exn int list option
+syn keyword  smlType     real string unit
+
+syn keyword  smlOperator div mod not or quot rem
+
+syn keyword  smlBoolean      true false
+syn match    smlConstructor  "(\s*)"
+syn match    smlConstructor  "\[\s*\]"
+syn match    smlConstructor  "#\[\s*\]"
+syn match    smlConstructor  "\u\(\w\|'\)*\>"
+
+" Module prefix
+syn match    smlModPath      "\u\(\w\|'\)*\."he=e-1
+
+syn match    smlCharacter    +#"\\""\|#"."\|#"\\\d\d\d"+
+syn match    smlCharErr      +#"\\\d\d"\|#"\\\d"+
+syn region   smlString       start=+"+ skip=+\\\\\|\\"+ end=+"+
+
+syn match    smlFunDef       "=>"
+syn match    smlRefAssign    ":="
+syn match    smlTopStop      ";;"
+syn match    smlOperator     "\^"
+syn match    smlOperator     "::"
+syn match    smlAnyVar       "\<_\>"
+syn match    smlKeyChar      "!"
+syn match    smlKeyChar      ";"
+syn match    smlKeyChar      "\*"
+syn match    smlKeyChar      "="
+
+syn match    smlNumber	      "\<-\=\d\+\>"
+syn match    smlNumber	      "\<-\=0[x|X]\x\+\>"
+syn match    smlReal	      "\<-\=\d\+\.\d*\([eE][-+]\=\d\+\)\=[fl]\=\>"
+
+" Synchronization
+syn sync minlines=20
+syn sync maxlines=500
+
+syn sync match smlEndSync     grouphere  smlEnd     "\<begin\>"
+syn sync match smlEndSync     groupthere smlEnd     "\<end\>"
+syn sync match smlStructSync  grouphere  smlStruct  "\<struct\>"
+syn sync match smlStructSync  groupthere smlStruct  "\<end\>"
+syn sync match smlSigSync     grouphere  smlSig     "\<sig\>"
+syn sync match smlSigSync     groupthere smlSig     "\<end\>"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link smlBraceErr	 Error
+hi def link smlBrackErr	 Error
+hi def link smlParenErr	 Error
+
+hi def link smlCommentErr	 Error
+
+hi def link smlEndErr	 Error
+hi def link smlThenErr	 Error
+
+hi def link smlCharErr	 Error
+
+hi def link smlComment	 Comment
+
+hi def link smlModPath	 Include
+hi def link smlModule	 Include
+hi def link smlModParam1	 Include
+hi def link smlModType	 Include
+hi def link smlMPRestr3	 Include
+hi def link smlFullMod	 Include
+hi def link smlModTypeRestr Include
+hi def link smlWith	 Include
+hi def link smlMTDef	 Include
+
+hi def link smlConstructor  Constant
+
+hi def link smlModPreRHS	 Keyword
+hi def link smlMPRestr2	 Keyword
+hi def link smlKeyword	 Keyword
+hi def link smlFunDef	 Keyword
+hi def link smlRefAssign	 Keyword
+hi def link smlKeyChar	 Keyword
+hi def link smlAnyVar	 Keyword
+hi def link smlTopStop	 Keyword
+hi def link smlOperator	 Keyword
+
+hi def link smlBoolean	 Boolean
+hi def link smlCharacter	 Character
+hi def link smlNumber	 Number
+hi def link smlReal	 Float
+hi def link smlString	 String
+hi def link smlType	 Type
+hi def link smlTodo	 Todo
+hi def link smlEncl	 Keyword
+
+
+let b:current_syntax = "sml"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/snobol4.vim b/syntax/snobol4.vim
new file mode 100644
index 000000000..0f88911cc
--- /dev/null
+++ b/syntax/snobol4.vim
@@ -0,0 +1,117 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'snobol4') == -1
+
+" Vim syntax file
+" Language:     SNOBOL4
+" Maintainer:   Rafal Sulejman <rms@poczta.onet.pl>
+" Site: http://rms.republika.pl/vim/syntax/snobol4.vim
+" Last change:  : Thu, 25 Jan 2018 14:21:24 +0100
+" Changes: 
+" - system variables updated for SNOBOL4 2.0+
+" - strict snobol4 mode (set snobol4_strict_mode to activate)
+" - incorrect HL of dots in strings corrected
+" - incorrect HL of dot-variables in parens corrected 
+" - one character labels weren't displayed correctly.
+" - nonexistent Snobol4 keywords displayed as errors.
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax case ignore
+
+" Snobol4 keywords
+syn keyword     snobol4Keyword      any apply arb arbno arg array
+syn keyword     snobol4Keyword      break
+syn keyword     snobol4Keyword      char clear code collect convert copy
+syn keyword     snobol4Keyword      data datatype date define detach differ dump dupl
+syn keyword     snobol4Keyword      endfile eq eval
+syn keyword     snobol4Keyword      field
+syn keyword     snobol4Keyword      ge gt ident
+syn keyword     snobol4Keyword      input integer item
+syn keyword     snobol4Keyword      le len lgt local lpad lt
+syn keyword     snobol4Keyword      ne notany
+syn keyword     snobol4Keyword      opsyn output
+syn keyword     snobol4Keyword      pos prototype
+syn keyword     snobol4Keyword      remdr replace rpad rpos rtab rewind
+syn keyword     snobol4Keyword      size span stoptr
+syn keyword     snobol4Keyword      tab table time trace trim terminal
+syn keyword     snobol4Keyword      unload
+syn keyword     snobol4Keyword      value
+
+" CSNOBOL keywords
+syn keyword     snobol4ExtKeyword   breakx
+syn keyword     snobol4ExtKeyword   char chop
+syn keyword     snobol4ExtKeyword   date delete
+syn keyword     snobol4ExtKeyword   exp
+syn keyword     snobol4ExtKeyword   freeze function
+syn keyword     snobol4ExtKeyword   host
+syn keyword     snobol4ExtKeyword   io_findunit
+syn keyword     snobol4ExtKeyword   label lpad leq lge lle llt lne log
+syn keyword     snobol4ExtKeyword   ord
+syn keyword     snobol4ExtKeyword   reverse rpad rsort rename
+syn keyword     snobol4ExtKeyword   serv_listen sset set sort sqrt substr
+syn keyword     snobol4ExtKeyword   thaw
+syn keyword     snobol4ExtKeyword   vdiffer
+
+syn region      snobol4String       matchgroup=Quote start=+"+ end=+"+
+syn region      snobol4String       matchgroup=Quote start=+'+ end=+'+
+syn match       snobol4BogusStatement    "^-[^ ][^ ]*"
+syn match       snobol4Statement    "^-\(include\|copy\|module\|line\|plusopts\|case\|error\|noerrors\|list\|unlist\|execute\|noexecute\|copy\)"
+syn match       snobol4Constant     /"[^a-z"']\.[a-z][a-z0-9\-]*"/hs=s+1
+syn region      snobol4Goto         start=":[sf]\{0,1}(" end=")\|$\|;" contains=ALLBUT,snobol4ParenError
+syn match       snobol4Number       "\<\d*\(\.\d\d*\)*\>" 
+syn match       snobol4BogusSysVar  "&\w\{1,}"
+syn match       snobol4SysVar       "&\<\(abort\|alphabet\|anchor\|arb\|bal\|case\|code\|digits\|dump\|errlimit\|errtext\|errtype\|fail\|fence\|fnclevel\|ftrace\|fullscan\|input\|lastno\|lcase\|maxlngth\|output\|parm\|rem\|rtntype\|stcount\|stfcount\|stlimit\|stno\|succeed\|trace\|trim\|ucase\)\>"
+syn match       snobol4ExtSysVar    "&\(gtrace\|line\|file\|lastline\|lastfile\)"
+syn match       snobol4Label        "\(^\|;\)[^-\.\+ \t\*\.]\{1,}[^ \t\*\;]*"
+syn match       snobol4Comment      "\(^\|;\)\([\*\|!;#].*$\)"
+
+" Parens matching
+syn cluster     snobol4ParenGroup   contains=snobol4ParenError
+syn region      snobol4Paren        transparent start='(' end=')' contains=ALLBUT,@snobol4ParenGroup,snobol4ErrInBracket
+syn match       snobol4ParenError   display "[\])]"
+syn match       snobol4ErrInParen   display contained "[\]{}]\|<%\|%>"
+syn region      snobol4Bracket      transparent start='\[\|<:' end=']\|:>' contains=ALLBUT,@snobol4ParenGroup,snobol4ErrInParen
+syn match       snobol4ErrInBracket display contained "[){}]\|<%\|%>"
+
+" optional shell shebang line
+" syn match       snobol4Comment      "^\#\!.*$"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link snobol4Constant        Constant
+hi def link snobol4Label           Label
+hi def link snobol4Goto            Repeat
+hi def link snobol4Conditional     Conditional
+hi def link snobol4Repeat          Repeat
+hi def link snobol4Number          Number
+hi def link snobol4Error           Error
+hi def link snobol4Statement       PreProc
+hi def link snobol4BogusStatement  snobol4Error
+hi def link snobol4String          String
+hi def link snobol4Comment         Comment
+hi def link snobol4Special         Special
+hi def link snobol4Todo            Todo
+hi def link snobol4Keyword         Keyword
+hi def link snobol4Function        Function
+hi def link snobol4MathsOperator   Operator
+hi def link snobol4ParenError      snobol4Error
+hi def link snobol4ErrInParen      snobol4Error
+hi def link snobol4ErrInBracket    snobol4Error
+hi def link snobol4SysVar          Keyword
+hi def link snobol4BogusSysVar     snobol4Error
+if exists("snobol4_strict_mode")
+  hi def link snobol4ExtSysVar       WarningMsg
+  hi def link snobol4ExtKeyword      WarningMsg
+else
+  hi def link snobol4ExtSysVar       snobol4SysVar
+  hi def link snobol4ExtKeyword      snobol4Keyword
+endif
+
+
+let b:current_syntax = "snobol4"
+" vim: ts=8
+
+endif
diff --git a/syntax/spec.vim b/syntax/spec.vim
new file mode 100644
index 000000000..570dea78d
--- /dev/null
+++ b/syntax/spec.vim
@@ -0,0 +1,230 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spec') == -1
+
+" Filename:    spec.vim
+" Purpose:     Vim syntax file
+" Language:    SPEC: Build/install scripts for Linux RPM packages
+" Maintainer:  Igor Gnatenko i.gnatenko.brain@gmail.com
+" Former Maintainer:  Donovan Rebbechi elflord@panix.com (until March 2014)
+" Last Change: 2020 May 25
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn sync minlines=1000
+
+syn match specSpecialChar contained '[][!$()\\|>^;:{}]'
+syn match specColon       contained ':'
+syn match specPercent     contained '%'
+
+syn match specVariables   contained '\$\h\w*' contains=specSpecialVariablesNames,specSpecialChar
+syn match specVariables   contained '\${\w*}' contains=specSpecialVariablesNames,specSpecialChar
+
+syn match specMacroIdentifier contained '%\h\w*' contains=specMacroNameLocal,specMacroNameOther,specPercent
+syn match specMacroIdentifier contained '%{\w*}' contains=specMacroNameLocal,specMacroNameOther,specPercent,specSpecialChar
+
+syn match specSpecialVariables contained '\$[0-9]\|\${[0-9]}'
+syn match specCommandOpts      contained '\s\(-\w\+\|--\w[a-zA-Z_-]\+\)'ms=s+1
+syn match specComment '^\s*#.*$'
+
+
+syn case match
+
+
+"matches with no highlight
+syn match specNoNumberHilite 'X11\|X11R6\|[a-zA-Z]*\.\d\|[a-zA-Z][-/]\d'
+syn match specManpageFile '[a-zA-Z]\.1'
+
+"Day, Month and most used license acronyms
+syn keyword specLicense contained GPL LGPL BSD MIT GNU
+syn keyword specWeekday contained Mon Tue Wed Thu Fri Sat Sun
+syn keyword specMonth   contained Jan Feb Mar Apr Jun Jul Aug Sep Oct Nov Dec
+syn keyword specMonth   contained January February March April May June July August September October November December
+
+"#, @, www
+syn match specNumber '\(^-\=\|[ \t]-\=\|-\)[0-9.-]*[0-9]'
+syn match specEmail contained "<\=\<[A-Za-z0-9_.-]\+@\([A-Za-z0-9_-]\+\.\)\+[A-Za-z]\+\>>\="
+syn match specURL      contained '\<\(\(https\{0,1}\|ftp\)://\|\(www[23]\{0,1}\.\|ftp\.\)\)[A-Za-z0-9._/~:,#-]\+\>'
+syn match specURLMacro contained '\<\(\(https\{0,1}\|ftp\)://\|\(www[23]\{0,1}\.\|ftp\.\)\)[A-Za-z0-9._/~:,#%{}-]\+\>' contains=specMacroIdentifier
+
+"TODO take specSpecialVariables out of the cluster for the sh* contains (ALLBUT)
+"Special system directories
+syn match specListedFilesPrefix contained '/\(usr\|local\|opt\|X11R6\|X11\)/'me=e-1
+syn match specListedFilesBin    contained '/s\=bin/'me=e-1
+syn match specListedFilesLib    contained '/\(lib\|include\)/'me=e-1
+syn match specListedFilesDoc    contained '/\(man\d*\|doc\|info\)\>'
+syn match specListedFilesEtc    contained '/etc/'me=e-1
+syn match specListedFilesShare  contained '/share/'me=e-1
+syn cluster specListedFiles contains=specListedFilesBin,specListedFilesLib,specListedFilesDoc,specListedFilesEtc,specListedFilesShare,specListedFilesPrefix,specVariables,specSpecialChar
+
+"specComands
+syn match   specConfigure  contained '\./configure'
+syn match   specTarCommand contained '\<tar\s\+[cxvpzIf]\{,5}\s*'
+syn keyword specCommandSpecial contained root
+syn keyword specCommand		contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch
+syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial
+
+"frequently used rpm env vars
+syn keyword specSpecialVariablesNames contained RPM_BUILD_ROOT RPM_BUILD_DIR RPM_SOURCE_DIR RPM_OPT_FLAGS LDFLAGS CC CC_FLAGS CPPNAME CFLAGS CXX CXXFLAGS CPPFLAGS
+
+"valid macro names from /usr/lib/rpm/macros
+syn keyword specMacroNameOther contained buildroot buildsubdir distribution disturl ix86 name nil optflags perl_sitearch release requires_eq vendor version
+syn match   specMacroNameOther contained '\<\(PATCH\|SOURCE\)\d*\>'
+
+"valid _macro names from /usr/lib/rpm/macros
+syn keyword specMacroNameLocal contained _arch _binary_payload _bindir _build _build_alias _build_cpu _builddir _build_os _buildshell _buildsubdir _build_vendor _bzip2bin _datadir _dbpath _dbpath_rebuild _defaultdocdir _docdir _excludedocs _exec_prefix _fixgroup _fixowner _fixperms _ftpport _ftpproxy _gpg_path _gzipbin _host _host_alias _host_cpu _host_os _host_vendor _httpport _httpproxy _includedir _infodir _install_langs _install_script_path _instchangelog _langpatt _lib _libdir _libexecdir _localstatedir _mandir _netsharedpath _oldincludedir _os _pgpbin _pgp_path _prefix _preScriptEnvironment _provides _rpmdir _rpmfilename _sbindir _sharedstatedir _signature _sourcedir _source_payload _specdir _srcrpmdir _sysconfdir _target _target_alias _target_cpu _target_os _target_platform _target_vendor _timecheck _tmppath _topdir _usr _unitdir _usrsrc _var _vendor
+
+
+"------------------------------------------------------------------------------
+" here's is all the spec sections definitions: PreAmble, Description, Package,
+"   Scripts, Files and Changelog
+
+"One line macros - valid in all ScriptAreas
+"tip: remember do include new items on specScriptArea's skip section
+syn region specSectionMacroArea oneline matchgroup=specSectionMacro start='^%\(define\|global\|patch\d*\|setup\|autosetup\|autopatch\|configure\|GNUconfigure\|find_lang\|make_build\|makeinstall\|make_install\|include\)\>' end='$' contains=specCommandOpts,specMacroIdentifier
+syn region specSectionMacroBracketArea oneline matchgroup=specSectionMacro start='^%{\(configure\|GNUconfigure\|find_lang\|make_build\|makeinstall\|make_install\)}' end='$' contains=specCommandOpts,specMacroIdentifier
+
+"%% Files Section %%
+"TODO %config valid parameters: missingok\|noreplace
+"TODO %verify valid parameters: \(not\)\= \(md5\|atime\|...\)
+syn region specFilesArea matchgroup=specSection start='^%[Ff][Ii][Ll][Ee][Ss]\>' skip='%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|license\|verify\|ghost\|exclude\)\>' end='^%[a-zA-Z]'me=e-2 contains=specFilesOpts,specFilesDirective,@specListedFiles,specComment,specCommandSpecial,specMacroIdentifier
+"tip: remember to include new itens in specFilesArea above
+syn match  specFilesDirective contained '%\(attrib\|defattr\|attr\|dir\|config\|docdir\|doc\|lang\|license\|verify\|ghost\|exclude\)\>'
+
+"valid options for certain section headers
+syn match specDescriptionOpts contained '\s-[ln]\s*\a'ms=s+1,me=e-1
+syn match specPackageOpts     contained    '\s-n\s*\w'ms=s+1,me=e-1
+syn match specFilesOpts       contained    '\s-f\s*\w'ms=s+1,me=e-1
+
+
+syn case ignore
+
+
+"%% PreAmble Section %%
+"Copyright and Serial were deprecated by License and Epoch
+syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Recommends\|Suggests\|Supplements\|Enhances\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+
+"%% Description Section %%
+syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
+
+"%% Package Section %%
+syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
+
+"%% Scripts Section %%
+syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|check\|pre\|postun\|preun\|post\|posttrans\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|autosetup\|autopatch\|find_lang\|make_build\|makeinstall\|make_install\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
+
+"%% Changelog Section %%
+syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
+
+
+
+"------------------------------------------------------------------------------
+"here's the shell syntax for all the Script Sections
+
+
+syn case match
+
+
+"sh-like comment stile, only valid in script part
+syn match shComment contained '#.*$'
+
+syn region dnlComment matchgroup=specComment start=+%dnl+ end=+$+
+
+syn region shQuote1 contained matchgroup=shQuoteDelim start=+'+ skip=+\\'+ end=+'+ contains=specMacroIdentifier
+syn region shQuote2 contained matchgroup=shQuoteDelim start=+"+ skip=+\\"+ end=+"+ contains=specVariables,specMacroIdentifier
+
+syn match shOperator contained '[><|!&;]\|[!=]='
+syn region shDo transparent matchgroup=specBlock start="\<do\>" end="\<done\>" contains=ALLBUT,shFunction,shDoError,shCase,specPreAmble,@specListedFiles
+
+syn region specIf  matchgroup=specBlock start="%ifosf\|%ifos\|%ifnos\|%ifarch\|%ifnarch\|%else"  end='%endif'  contains=ALLBUT, specIfError, shCase
+
+syn region  shIf transparent matchgroup=specBlock start="\<if\>" end="\<fi\>" contains=ALLBUT,shFunction,shIfError,shCase,@specListedFiles
+
+syn region  shFor  matchgroup=specBlock start="\<for\>" end="\<in\>" contains=ALLBUT,shFunction,shInError,shCase,@specListedFiles
+
+syn region shCaseEsac transparent matchgroup=specBlock start="\<case\>" matchgroup=NONE end="\<in\>"me=s-1 contains=ALLBUT,shFunction,shCaseError,@specListedFiles nextgroup=shCaseEsac
+syn region shCaseEsac matchgroup=specBlock start="\<in\>" end="\<esac\>" contains=ALLBUT,shFunction,shCaseError,@specListedFilesBin
+syn region shCase matchgroup=specBlock contained start=")"  end=";;" contains=ALLBUT,shFunction,shCaseError,shCase,@specListedFiles
+
+syn sync match shDoSync       grouphere  shDo       "\<do\>"
+syn sync match shDoSync       groupthere shDo       "\<done\>"
+syn sync match shIfSync       grouphere  shIf       "\<if\>"
+syn sync match shIfSync       groupthere shIf       "\<fi\>"
+syn sync match specIfSync     grouphere  specIf     "%ifarch\|%ifos\|%ifnos"
+syn sync match specIfSync     groupthere specIf     "%endIf"
+syn sync match shForSync      grouphere  shFor      "\<for\>"
+syn sync match shForSync      groupthere shFor      "\<in\>"
+syn sync match shCaseEsacSync grouphere  shCaseEsac "\<case\>"
+syn sync match shCaseEsacSync groupthere shCaseEsac "\<esac\>"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+"main types color definitions
+hi def link specSection			Structure
+hi def link specSectionMacro		Macro
+hi def link specWWWlink			PreProc
+hi def link specOpts			Operator
+
+"yes, it's ugly, but white is sooo cool
+if &background == "dark"
+hi def specGlobalMacro		ctermfg=white
+else
+hi def link specGlobalMacro		Identifier
+endif
+
+"sh colors
+hi def link shComment			Comment
+hi def link dnlComment			Comment
+hi def link shIf				Statement
+hi def link shOperator			Special
+hi def link shQuote1			String
+hi def link shQuote2			String
+hi def link shQuoteDelim			Statement
+
+"spec colors
+hi def link specBlock			Function
+hi def link specColon			Special
+hi def link specCommand			Statement
+hi def link specCommandOpts		specOpts
+hi def link specCommandSpecial		Special
+hi def link specComment			Comment
+hi def link specConfigure			specCommand
+hi def link specDate			String
+hi def link specDescriptionOpts		specOpts
+hi def link specEmail			specWWWlink
+hi def link specError			Error
+hi def link specFilesDirective		specSectionMacro
+hi def link specFilesOpts			specOpts
+hi def link specLicense			String
+hi def link specMacroNameLocal		specGlobalMacro
+hi def link specMacroNameOther		specGlobalMacro
+hi def link specManpageFile		NONE
+hi def link specMonth			specDate
+hi def link specNoNumberHilite		NONE
+hi def link specNumber			Number
+hi def link specPackageOpts		specOpts
+hi def link specPercent			Special
+hi def link specSpecialChar		Special
+hi def link specSpecialVariables		specGlobalMacro
+hi def link specSpecialVariablesNames	specGlobalMacro
+hi def link specTarCommand			specCommand
+hi def link specURL			specWWWlink
+hi def link specURLMacro			specWWWlink
+hi def link specVariables			Identifier
+hi def link specWeekday			specDate
+hi def link specListedFilesBin		Statement
+hi def link specListedFilesDoc		Statement
+hi def link specListedFilesEtc		Statement
+hi def link specListedFilesLib		Statement
+hi def link specListedFilesPrefix		Statement
+hi def link specListedFilesShare		Statement
+
+
+let b:current_syntax = "spec"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/spice.vim b/syntax/spice.vim
new file mode 100644
index 000000000..c168154a9
--- /dev/null
+++ b/syntax/spice.vim
@@ -0,0 +1,79 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spice') == -1
+
+" Vim syntax file
+" Language:	Spice circuit simulator input netlist
+" Maintainer:	Noam Halevy <Noam.Halevy.motorola.com>
+" Last Change:	2012 Jun 01
+" 		(Dominique Pelle added @Spell)
+"
+" This is based on sh.vim by Lennart Schultz
+" but greatly simplified
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" spice syntax is case INsensitive
+syn case ignore
+
+syn keyword	spiceTodo	contained TODO
+
+syn match spiceComment  "^ \=\*.*$" contains=@Spell
+syn match spiceComment  "\$.*$" contains=@Spell
+
+" Numbers, all with engineering suffixes and optional units
+"==========================================================
+"floating point number, with dot, optional exponent
+syn match spiceNumber  "\<[0-9]\+\.[0-9]*\(e[-+]\=[0-9]\+\)\=\(meg\=\|[afpnumkg]\)\="
+"floating point number, starting with a dot, optional exponent
+syn match spiceNumber  "\.[0-9]\+\(e[-+]\=[0-9]\+\)\=\(meg\=\|[afpnumkg]\)\="
+"integer number with optional exponent
+syn match spiceNumber  "\<[0-9]\+\(e[-+]\=[0-9]\+\)\=\(meg\=\|[afpnumkg]\)\="
+
+" Misc
+"=====
+syn match   spiceWrapLineOperator       "\\$"
+syn match   spiceWrapLineOperator       "^+"
+
+syn match   spiceStatement      "^ \=\.\I\+"
+
+" Matching pairs of parentheses
+"==========================================
+syn region  spiceParen transparent matchgroup=spiceOperator start="(" end=")" contains=ALLBUT,spiceParenError
+syn region  spiceSinglequote matchgroup=spiceOperator start=+'+ end=+'+
+
+" Errors
+"=======
+syn match spiceParenError ")"
+
+" Syncs
+" =====
+syn sync minlines=50
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link spiceTodo		Todo
+hi def link spiceWrapLineOperator	spiceOperator
+hi def link spiceSinglequote	spiceExpr
+hi def link spiceExpr		Function
+hi def link spiceParenError	Error
+hi def link spiceStatement		Statement
+hi def link spiceNumber		Number
+hi def link spiceComment		Comment
+hi def link spiceOperator		Operator
+
+
+let b:current_syntax = "spice"
+
+" insert the following to $VIM/syntax/scripts.vim
+" to autodetect HSpice netlists and text listing output:
+"
+" " Spice netlists and text listings
+" elseif getline(1) =~ 'spice\>' || getline("$") =~ '^\.end'
+"   so <sfile>:p:h/spice.vim
+
+" vim: ts=8
+
+endif
diff --git a/syntax/spup.vim b/syntax/spup.vim
new file mode 100644
index 000000000..71af16f93
--- /dev/null
+++ b/syntax/spup.vim
@@ -0,0 +1,273 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spup') == -1
+
+" Vim syntax file
+" Language:     Speedup, plant simulator from AspenTech
+" Maintainer:   Stefan.Schwarzer <s.schwarzer@ndh.net>
+" URL:		http://www.ndh.net/home/sschwarzer/download/spup.vim
+" Last Change:  2012 Feb 03 by Thilo Six
+" Filename:     spup.vim
+
+" Bugs
+" - in the appropriate sections keywords are always highlighted
+"   even if they are not used with the appropriate meaning;
+"   example: in
+"       MODEL demonstration
+"       TYPE
+"      *area AS area
+"   both "area" are highlighted as spupType.
+"
+" If you encounter problems or have questions or suggestions, mail me
+
+" Remove old syntax stuff
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" don't hightlight several keywords like subsections
+"let strict_subsections = 1
+
+" highlight types usually found in DECLARE section
+if !exists("hightlight_types")
+    let highlight_types = 1
+endif
+
+" one line comment syntax (# comments)
+" 1. allow appended code after comment, do not complain
+" 2. show code beginnig with the second # as an error
+" 3. show whole lines with more than one # as an error
+if !exists("oneline_comments")
+    let oneline_comments = 2
+endif
+
+" Speedup SECTION regions
+syn case ignore
+syn region spupCdi	  matchgroup=spupSection start="^CDI"	     end="^\*\*\*\*" contains=spupCdiSubs,@spupOrdinary
+syn region spupConditions matchgroup=spupSection start="^CONDITIONS" end="^\*\*\*\*" contains=spupConditionsSubs,@spupOrdinary,spupConditional,spupOperator,spupCode
+syn region spupDeclare    matchgroup=spupSection start="^DECLARE"    end="^\*\*\*\*" contains=spupDeclareSubs,@spupOrdinary,spupTypes,spupCode
+syn region spupEstimation matchgroup=spupSection start="^ESTIMATION" end="^\*\*\*\*" contains=spupEstimationSubs,@spupOrdinary
+syn region spupExternal   matchgroup=spupSection start="^EXTERNAL"   end="^\*\*\*\*" contains=spupExternalSubs,@spupOrdinary
+syn region spupFlowsheet  matchgroup=spupSection start="^FLOWSHEET"  end="^\*\*\*\*" contains=spupFlowsheetSubs,@spupOrdinary,spupStreams,@spupTextproc
+syn region spupFunction   matchgroup=spupSection start="^FUNCTION"   end="^\*\*\*\*" contains=spupFunctionSubs,@spupOrdinary,spupHelp,spupCode,spupTypes
+syn region spupGlobal     matchgroup=spupSection start="^GLOBAL"     end="^\*\*\*\*" contains=spupGlobalSubs,@spupOrdinary
+syn region spupHomotopy   matchgroup=spupSection start="^HOMOTOPY"   end="^\*\*\*\*" contains=spupHomotopySubs,@spupOrdinary
+syn region spupMacro      matchgroup=spupSection start="^MACRO"      end="^\*\*\*\*" contains=spupMacroSubs,@spupOrdinary,@spupTextproc,spupTypes,spupStreams,spupOperator
+syn region spupModel      matchgroup=spupSection start="^MODEL"      end="^\*\*\*\*" contains=spupModelSubs,@spupOrdinary,spupConditional,spupOperator,spupTypes,spupStreams,@spupTextproc,spupHelp
+syn region spupOperation  matchgroup=spupSection start="^OPERATION"  end="^\*\*\*\*" contains=spupOperationSubs,@spupOrdinary,@spupTextproc
+syn region spupOptions    matchgroup=spupSection start="^OPTIONS"    end="^\*\*\*\*" contains=spupOptionsSubs,@spupOrdinary
+syn region spupProcedure  matchgroup=spupSection start="^PROCEDURE"  end="^\*\*\*\*" contains=spupProcedureSubs,@spupOrdinary,spupHelp,spupCode,spupTypes
+syn region spupProfiles   matchgroup=spupSection start="^PROFILES"   end="^\*\*\*\*" contains=@spupOrdinary,@spupTextproc
+syn region spupReport     matchgroup=spupSection start="^REPORT"     end="^\*\*\*\*" contains=spupReportSubs,@spupOrdinary,spupHelp,@spupTextproc
+syn region spupTitle      matchgroup=spupSection start="^TITLE"      end="^\*\*\*\*" contains=spupTitleSubs,spupComment,spupConstant,spupError
+syn region spupUnit       matchgroup=spupSection start="^UNIT"       end="^\*\*\*\*" contains=spupUnitSubs,@spupOrdinary
+
+" Subsections
+syn keyword spupCdiSubs	       INPUT FREE OUTPUT LINEARTIME MINNONZERO CALCULATE FILES SCALING contained
+syn keyword spupDeclareSubs    TYPE STREAM contained
+syn keyword spupEstimationSubs ESTIMATE SSEXP DYNEXP RESULT contained
+syn keyword spupExternalSubs   TRANSMIT RECEIVE contained
+syn keyword spupFlowsheetSubs  STREAM contained
+syn keyword spupFunctionSubs   INPUT OUTPUT contained
+syn keyword spupGlobalSubs     VARIABLES MAXIMIZE MINIMIZE CONSTRAINT contained
+syn keyword spupHomotopySubs   VARY OPTIONS contained
+syn keyword spupMacroSubs      MODEL FLOWSHEET contained
+syn keyword spupModelSubs      CATEGORY SET TYPE STREAM EQUATION PROCEDURE contained
+syn keyword spupOperationSubs  SET PRESET INITIAL SSTATE FREE contained
+syn keyword spupOptionsSubs    ROUTINES TRANSLATE EXECUTION contained
+syn keyword spupProcedureSubs  INPUT OUTPUT SPACE PRECALL POSTCALL DERIVATIVE STREAM contained
+" no subsections for Profiles
+syn keyword spupReportSubs     SET INITIAL FIELDS FIELDMARK DISPLAY WITHIN contained
+syn keyword spupUnitSubs       ROUTINES SET contained
+
+" additional keywords for subsections
+if !exists( "strict_subsections" )
+    syn keyword spupConditionsSubs STOP PRINT contained
+    syn keyword spupDeclareSubs    UNIT SET COMPONENTS THERMO OPTIONS contained
+    syn keyword spupEstimationSubs VARY MEASURE INITIAL contained
+    syn keyword spupFlowsheetSubs  TYPE FEED PRODUCT INPUT OUTPUT CONNECTION OF IS contained
+    syn keyword spupMacroSubs      CONNECTION STREAM SET INPUT OUTPUT OF IS FEED PRODUCT TYPE contained
+    syn keyword spupModelSubs      AS ARRAY OF INPUT OUTPUT CONNECTION contained
+    syn keyword spupOperationSubs  WITHIN contained
+    syn keyword spupReportSubs     LEFT RIGHT CENTER CENTRE UOM TIME DATE VERSION RELDATE contained
+    syn keyword spupUnitSubs       IS A contained
+endif
+
+" Speedup data types
+if exists( "highlight_types" )
+    syn keyword spupTypes act_coeff_liq area coefficient concentration contained
+    syn keyword spupTypes control_signal cond_liq cond_vap cp_mass_liq contained
+    syn keyword spupTypes cp_mol_liq cp_mol_vap cv_mol_liq cv_mol_vap contained
+    syn keyword spupTypes diffus_liq diffus_vap delta_p dens_mass contained
+    syn keyword spupTypes dens_mass_sol dens_mass_liq dens_mass_vap dens_mol contained
+    syn keyword spupTypes dens_mol_sol dens_mol_liq dens_mol_vap enthflow contained
+    syn keyword spupTypes enth_mass enth_mass_liq enth_mass_vap enth_mol contained
+    syn keyword spupTypes enth_mol_sol enth_mol_liq enth_mol_vap entr_mol contained
+    syn keyword spupTypes entr_mol_sol entr_mol_liq entr_mol_vap fraction contained
+    syn keyword spupTypes flow_mass flow_mass_liq flow_mass_vap flow_mol contained
+    syn keyword spupTypes flow_mol_vap flow_mol_liq flow_vol flow_vol_vap contained
+    syn keyword spupTypes flow_vol_liq fuga_vap fuga_liq fuga_sol contained
+    syn keyword spupTypes gibb_mol_sol heat_react heat_trans_coeff contained
+    syn keyword spupTypes holdup_heat holdup_heat_liq holdup_heat_vap contained
+    syn keyword spupTypes holdup_mass holdup_mass_liq holdup_mass_vap contained
+    syn keyword spupTypes holdup_mol holdup_mol_liq holdup_mol_vap k_value contained
+    syn keyword spupTypes length length_delta length_short liqfraction contained
+    syn keyword spupTypes liqmassfraction mass massfraction molefraction contained
+    syn keyword spupTypes molweight moment_inertia negative notype percent contained
+    syn keyword spupTypes positive pressure press_diff press_drop press_rise contained
+    syn keyword spupTypes ratio reaction reaction_mass rotation surf_tens contained
+    syn keyword spupTypes temperature temperature_abs temp_diff temp_drop contained
+    syn keyword spupTypes temp_rise time vapfraction vapmassfraction contained
+    syn keyword spupTypes velocity visc_liq visc_vap volume zmom_rate contained
+    syn keyword spupTypes seg_rate smom_rate tmom_rate zmom_mass seg_mass contained
+    syn keyword spupTypes smom_mass tmom_mass zmom_holdup seg_holdup contained
+    syn keyword spupTypes smom_holdup tmom_holdup contained
+endif
+
+" stream types
+syn keyword spupStreams  mainstream vapour liquid contained
+
+" "conditional" keywords
+syn keyword spupConditional  IF THEN ELSE ENDIF contained
+" Operators, symbols etc.
+syn keyword spupOperator  AND OR NOT contained
+syn match spupSymbol  "[,\-+=:;*/\"<>@%()]" contained
+syn match spupSpecial  "[&\$?]" contained
+" Surprisingly, Speedup allows no unary + instead of the -
+syn match spupError  "[(=+\-*/]\s*+\d\+\([ed][+-]\=\d\+\)\=\>"lc=1 contained
+syn match spupError  "[(=+\-*/]\s*+\d\+\.\([ed][+-]\=\d\+\)\=\>"lc=1 contained
+syn match spupError  "[(=+\-*/]\s*+\d*\.\d\+\([ed][+-]\=\d\+\)\=\>"lc=1 contained
+" String
+syn region spupString  start=+"+  end=+"+  oneline contained
+syn region spupString  start=+'+  end=+'+  oneline contained
+" Identifier
+syn match spupIdentifier  "\<[a-z][a-z0-9_]*\>" contained
+" Textprocessor directives
+syn match spupTextprocGeneric  "?[a-z][a-z0-9_]*\>" contained
+syn region spupTextprocError matchgroup=spupTextprocGeneric start="?ERROR"  end="?END"he=s-1 contained
+" Number, without decimal point
+syn match spupNumber  "-\=\d\+\([ed][+-]\=\d\+\)\=" contained
+" Number, allows 1. before exponent
+syn match spupNumber  "-\=\d\+\.\([ed][+-]\=\d\+\)\=" contained
+" Number allows .1 before exponent
+syn match spupNumber  "-\=\d*\.\d\+\([ed][+-]\=\d\+\)\=" contained
+" Help subsections
+syn region spupHelp  start="^HELP"hs=e+1  end="^\$ENDHELP"he=s-1 contained
+" Fortran code
+syn region spupCode  start="^CODE"hs=e+1  end="^\$ENDCODE"he=s-1 contained
+" oneline comments
+if oneline_comments > 3
+    oneline_comments = 2   " default
+endif
+if oneline_comments == 1
+    syn match spupComment  "#[^#]*#\="
+elseif oneline_comments == 2
+    syn match spupError  "#.*$"
+    syn match spupComment  "#[^#]*"  nextgroup=spupError
+elseif oneline_comments == 3
+    syn match spupComment  "#[^#]*"
+    syn match spupError  "#[^#]*#.*"
+endif
+" multiline comments
+syn match spupOpenBrace "{" contained
+syn match spupError  "}"
+syn region spupComment  matchgroup=spupComment2  start="{"  end="}"  keepend  contains=spupOpenBrace
+
+syn cluster spupOrdinary  contains=spupNumber,spupIdentifier,spupSymbol
+syn cluster spupOrdinary  add=spupError,spupString,spupComment
+syn cluster spupTextproc  contains=spupTextprocGeneric,spupTextprocError
+
+" define syncronizing; especially OPERATION sections can become very large
+syn sync clear
+syn sync minlines=100
+syn sync maxlines=500
+
+syn sync match spupSyncOperation  grouphere spupOperation  "^OPERATION"
+syn sync match spupSyncCdi	  grouphere spupCdi	   "^CDI"
+syn sync match spupSyncConditions grouphere spupConditions "^CONDITIONS"
+syn sync match spupSyncDeclare    grouphere spupDeclare    "^DECLARE"
+syn sync match spupSyncEstimation grouphere spupEstimation "^ESTIMATION"
+syn sync match spupSyncExternal   grouphere spupExternal   "^EXTERNAL"
+syn sync match spupSyncFlowsheet  grouphere spupFlowsheet  "^FLOWSHEET"
+syn sync match spupSyncFunction   grouphere spupFunction   "^FUNCTION"
+syn sync match spupSyncGlobal     grouphere spupGlobal     "^GLOBAL"
+syn sync match spupSyncHomotopy   grouphere spupHomotopy   "^HOMOTOPY"
+syn sync match spupSyncMacro      grouphere spupMacro      "^MACRO"
+syn sync match spupSyncModel      grouphere spupModel      "^MODEL"
+syn sync match spupSyncOperation  grouphere spupOperation  "^OPERATION"
+syn sync match spupSyncOptions    grouphere spupOptions    "^OPTIONS"
+syn sync match spupSyncProcedure  grouphere spupProcedure  "^PROCEDURE"
+syn sync match spupSyncProfiles   grouphere spupProfiles   "^PROFILES"
+syn sync match spupSyncReport     grouphere spupReport     "^REPORT"
+syn sync match spupSyncTitle      grouphere spupTitle      "^TITLE"
+syn sync match spupSyncUnit       grouphere spupUnit       "^UNIT"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link spupCdi	    spupSection
+hi def link spupConditions   spupSection
+hi def link spupDeclare	    spupSection
+hi def link spupEstimation   spupSection
+hi def link spupExternal	    spupSection
+hi def link spupFlowsheet    spupSection
+hi def link spupFunction	    spupSection
+hi def link spupGlobal	    spupSection
+hi def link spupHomotopy	    spupSection
+hi def link spupMacro	    spupSection
+hi def link spupModel	    spupSection
+hi def link spupOperation    spupSection
+hi def link spupOptions	    spupSection
+hi def link spupProcedure    spupSection
+hi def link spupProfiles	    spupSection
+hi def link spupReport	    spupSection
+hi def link spupTitle	    spupConstant  " this is correct, truly ;)
+hi def link spupUnit	    spupSection
+
+hi def link spupCdiSubs	      spupSubs
+hi def link spupConditionsSubs spupSubs
+hi def link spupDeclareSubs    spupSubs
+hi def link spupEstimationSubs spupSubs
+hi def link spupExternalSubs   spupSubs
+hi def link spupFlowsheetSubs  spupSubs
+hi def link spupFunctionSubs   spupSubs
+hi def link spupHomotopySubs   spupSubs
+hi def link spupMacroSubs      spupSubs
+hi def link spupModelSubs      spupSubs
+hi def link spupOperationSubs  spupSubs
+hi def link spupOptionsSubs    spupSubs
+hi def link spupProcedureSubs  spupSubs
+hi def link spupReportSubs     spupSubs
+hi def link spupUnitSubs	      spupSubs
+
+hi def link spupCode	       Normal
+hi def link spupComment	       Comment
+hi def link spupComment2	       spupComment
+hi def link spupConditional     Statement
+hi def link spupConstant	       Constant
+hi def link spupError	       Error
+hi def link spupHelp	       Normal
+hi def link spupIdentifier      Identifier
+hi def link spupNumber	       Constant
+hi def link spupOperator	       Special
+hi def link spupOpenBrace       spupError
+hi def link spupSection	       Statement
+hi def link spupSpecial	       spupTextprocGeneric
+hi def link spupStreams	       Type
+hi def link spupString	       Constant
+hi def link spupSubs	       Statement
+hi def link spupSymbol	       Special
+hi def link spupTextprocError   Normal
+hi def link spupTextprocGeneric PreProc
+hi def link spupTypes	       Type
+
+
+let b:current_syntax = "spup"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim:ts=8
+
+endif
diff --git a/syntax/spyce.vim b/syntax/spyce.vim
new file mode 100644
index 000000000..2c87ffb4a
--- /dev/null
+++ b/syntax/spyce.vim
@@ -0,0 +1,108 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spyce') == -1
+
+" Vim syntax file
+" Language:	   SPYCE
+" Maintainer:	 Rimon Barr <rimon AT acm DOT org>
+" URL:		     http://spyce.sourceforge.net
+" Last Change: 2009 Nov 11
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" we define it here so that included files can test for it
+if !exists("main_syntax")
+  let main_syntax='spyce'
+endif
+
+" Read the HTML syntax to start with
+let b:did_indent = 1	     " don't perform HTML indentation!
+let html_no_rendering = 1    " do not render <b>,<i>, etc...
+runtime! syntax/html.vim
+unlet b:current_syntax
+syntax spell default  " added by Bram
+
+" include python
+syn include @Python <sfile>:p:h/python.vim
+syn include @Html <sfile>:p:h/html.vim
+
+" spyce definitions
+syn keyword spyceDirectiveKeyword include compact module import contained
+syn keyword spyceDirectiveArg name names file contained
+syn region  spyceDirectiveString start=+"+ end=+"+ contained
+syn match   spyceDirectiveValue "=[\t ]*[^'", \t>][^, \t>]*"hs=s+1 contained
+
+syn match spyceBeginErrorS  ,\[\[,
+syn match spyceBeginErrorA  ,<%,
+syn cluster spyceBeginError contains=spyceBeginErrorS,spyceBeginErrorA
+syn match spyceEndErrorS    ,\]\],
+syn match spyceEndErrorA    ,%>,
+syn cluster spyceEndError contains=spyceEndErrorS,spyceEndErrorA
+
+syn match spyceEscBeginS       ,\\\[\[,
+syn match spyceEscBeginA       ,\\<%,
+syn cluster spyceEscBegin contains=spyceEscBeginS,spyceEscBeginA
+syn match spyceEscEndS	       ,\\\]\],
+syn match spyceEscEndA	       ,\\%>,
+syn cluster spyceEscEnd contains=spyceEscEndS,spyceEscEndA
+syn match spyceEscEndCommentS  ,--\\\]\],
+syn match spyceEscEndCommentA  ,--\\%>,
+syn cluster spyceEscEndComment contains=spyceEscEndCommentS,spyceEscEndCommentA
+
+syn region spyceStmtS      matchgroup=spyceStmtDelim start=,\[\[, end=,\]\], contains=@Python,spyceLambdaS,spyceLambdaA,spyceBeginError keepend
+syn region spyceStmtA      matchgroup=spyceStmtDelim start=,<%, end=,%>, contains=@Python,spyceLambdaS,spyceLambdaA,spyceBeginError keepend
+syn region spyceChunkS     matchgroup=spyceChunkDelim start=,\[\[\\, end=,\]\], contains=@Python,spyceLambdaS,spyceLambdaA,spyceBeginError keepend
+syn region spyceChunkA     matchgroup=spyceChunkDelim start=,<%\\, end=,%>, contains=@Python,spyceLambdaS,spyceLambdaA,spyceBeginError keepend
+syn region spyceEvalS      matchgroup=spyceEvalDelim start=,\[\[=, end=,\]\], contains=@Python,spyceLambdaS,spyceLambdaA,spyceBeginError keepend
+syn region spyceEvalA      matchgroup=spyceEvalDelim start=,<%=, end=,%>, contains=@Python,spyceLambdaS,spyceLambdaA,spyceBeginError keepend
+syn region spyceDirectiveS matchgroup=spyceDelim start=,\[\[\., end=,\]\], contains=spyceBeginError,spyceDirectiveKeyword,spyceDirectiveArg,spyceDirectiveValue,spyceDirectiveString keepend
+syn region spyceDirectiveA matchgroup=spyceDelim start=,<%@, end=,%>, contains=spyceBeginError,spyceDirectiveKeyword,spyceDirectiveArg,spyceDirectiveValue,spyceDirectiveString keepend
+syn region spyceCommentS   matchgroup=spyceCommentDelim start=,\[\[--, end=,--\]\],
+syn region spyceCommentA   matchgroup=spyceCommentDelim start=,<%--, end=,--%>,
+syn region spyceLambdaS    matchgroup=spyceLambdaDelim start=,\[\[spy!\?, end=,\]\], contains=@Html,@spyce extend
+syn region spyceLambdaA    matchgroup=spyceLambdaDelim start=,<%spy!\?, end=,%>, contains=@Html,@spyce extend
+
+syn cluster spyce contains=spyceStmtS,spyceStmtA,spyceChunkS,spyceChunkA,spyceEvalS,spyceEvalA,spyceCommentS,spyceCommentA,spyceDirectiveS,spyceDirectiveA
+
+syn cluster htmlPreproc contains=@spyce
+
+hi link spyceDirectiveKeyword	Special
+hi link spyceDirectiveArg	Type
+hi link spyceDirectiveString	String
+hi link spyceDirectiveValue	String
+
+hi link spyceDelim		Special
+hi link spyceStmtDelim		spyceDelim
+hi link spyceChunkDelim		spyceDelim
+hi link spyceEvalDelim		spyceDelim
+hi link spyceLambdaDelim	spyceDelim
+hi link spyceCommentDelim	Comment
+
+hi link spyceBeginErrorS	Error
+hi link spyceBeginErrorA	Error
+hi link spyceEndErrorS		Error
+hi link spyceEndErrorA		Error
+
+hi link spyceStmtS		spyce
+hi link spyceStmtA		spyce
+hi link spyceChunkS		spyce
+hi link spyceChunkA		spyce
+hi link spyceEvalS		spyce
+hi link spyceEvalA		spyce
+hi link spyceDirectiveS		spyce
+hi link spyceDirectiveA		spyce
+hi link spyceCommentS		Comment
+hi link spyceCommentA		Comment
+hi link spyceLambdaS		Normal
+hi link spyceLambdaA		Normal
+
+hi link spyce			Statement
+
+let b:current_syntax = "spyce"
+if main_syntax == 'spyce'
+  unlet main_syntax
+endif
+
+
+endif
diff --git a/syntax/sqlj.vim b/syntax/sqlj.vim
new file mode 100644
index 000000000..b043fe5a2
--- /dev/null
+++ b/syntax/sqlj.vim
@@ -0,0 +1,95 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sqlj') == -1
+
+" Vim syntax file
+" Language:	sqlj
+" Maintainer:	Andreas Fischbach <afisch@altavista.com>
+"		This file is based on sql.vim && java.vim (thanx)
+"		with a handful of additional sql words and still
+"		a subset of whatever standard
+" Last change:	31th Dec 2001
+
+" au BufNewFile,BufRead *.sqlj so $VIM/syntax/sqlj.vim
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+   finish
+endif
+
+" Read the Java syntax to start with
+source <sfile>:p:h/java.vim
+
+" SQLJ extentions
+" The SQL reserved words, defined as keywords.
+
+syn case ignore
+syn keyword sqljSpecial   null
+
+syn keyword sqljKeyword	access add as asc by check cluster column
+syn keyword sqljKeyword	compress connect current decimal default
+syn keyword sqljKeyword	desc else exclusive file for from group
+syn keyword sqljKeyword	having identified immediate increment index
+syn keyword sqljKeyword	initial into is level maxextents mode modify
+syn keyword sqljKeyword	nocompress nowait of offline on online start
+syn keyword sqljKeyword	successful synonym table then to trigger uid
+syn keyword sqljKeyword	unique user validate values view whenever
+syn keyword sqljKeyword	where with option order pctfree privileges
+syn keyword sqljKeyword	public resource row rowlabel rownum rows
+syn keyword sqljKeyword	session share size smallint
+
+syn keyword sqljKeyword  fetch database context iterator field join
+syn keyword sqljKeyword  foreign outer inner isolation left right
+syn keyword sqljKeyword  match primary key
+
+syn keyword sqljOperator	not and or
+syn keyword sqljOperator	in any some all between exists
+syn keyword sqljOperator	like escape
+syn keyword sqljOperator union intersect minus
+syn keyword sqljOperator prior distinct
+syn keyword sqljOperator	sysdate
+
+syn keyword sqljOperator	max min avg sum count hex
+
+syn keyword sqljStatement	alter analyze audit comment commit create
+syn keyword sqljStatement	delete drop explain grant insert lock noaudit
+syn keyword sqljStatement	rename revoke rollback savepoint select set
+syn keyword sqljStatement	 truncate update begin work
+
+syn keyword sqljType		char character date long raw mlslabel number
+syn keyword sqljType		rowid varchar varchar2 float integer
+
+syn keyword sqljType		byte text serial
+
+
+" Strings and characters:
+syn region sqljString		start=+"+  skip=+\\\\\|\\"+  end=+"+
+syn region sqljString		start=+'+  skip=+\\\\\|\\"+  end=+'+
+
+" Numbers:
+syn match sqljNumber		"-\=\<\d*\.\=[0-9_]\>"
+
+" PreProc
+syn match sqljPre		"#sql"
+
+" Comments:
+syn region sqljComment    start="/\*"  end="\*/"
+syn match sqlComment	"--.*"
+
+syn sync ccomment sqljComment
+
+
+" The default methods for highlighting. Can be overridden later.
+hi def link sqljComment	Comment
+hi def link sqljKeyword	sqljSpecial
+hi def link sqljNumber	Number
+hi def link sqljOperator	sqljStatement
+hi def link sqljSpecial	Special
+hi def link sqljStatement	Statement
+hi def link sqljString	String
+hi def link sqljType	Type
+hi def link sqljPre	PreProc
+
+
+let b:current_syntax = "sqlj"
+
+
+endif
diff --git a/syntax/sqr.vim b/syntax/sqr.vim
new file mode 100644
index 000000000..f8812c0d9
--- /dev/null
+++ b/syntax/sqr.vim
@@ -0,0 +1,266 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sqr') == -1
+
+" Vim syntax file
+"    Language: Structured Query Report Writer (SQR)
+"  Maintainer: Nathan Stratton Treadway (nathanst at ontko dot com)
+"	  URL: http://www.ontko.com/sqr/#editor_config_files
+"
+" Modification History:
+"     2002-Apr-12: Updated for SQR v6.x
+"     2002-Jul-30: Added { and } to iskeyword definition
+"     2003-Oct-15: Allow "." in variable names
+"		   highlight entire open '... literal when it contains
+"		      "''" inside it (e.g. "'I can''t say" is treated
+"		      as one open string, not one terminated and one open)
+"		   {} variables can occur inside of '...' literals
+"
+"  Thanks to the previous maintainer of this file, Jeff Lanzarotta:
+"    http://lanzarotta.tripod.com/vim.html
+"    jefflanzarotta at yahoo dot com
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword=@,48-57,_,-,#,$,{,}
+
+syn case ignore
+
+" BEGIN GENERATED SECTION ============================================
+
+" Generated by generate_vim_syntax.sqr at 2002/04/11 13:04
+" (based on the UltraEdit syntax file for SQR 6.1.4
+" found at http://www.ontko.com/sqr/#editor_config_files )
+
+syn keyword    sqrSection     begin-footing begin-heading begin-procedure
+syn keyword    sqrSection     begin-program begin-report begin-setup
+syn keyword    sqrSection     end-footing end-heading end-procedure
+syn keyword    sqrSection     end-program end-report end-setup
+
+syn keyword    sqrParagraph   alter-color-map alter-connection
+syn keyword    sqrParagraph   alter-locale alter-printer alter-report
+syn keyword    sqrParagraph   begin-document begin-execute begin-select
+syn keyword    sqrParagraph   begin-sql declare-chart declare-image
+syn keyword    sqrParagraph   declare-color-map declare-connection
+syn keyword    sqrParagraph   declare-layout declare-printer
+syn keyword    sqrParagraph   declare-report declare-procedure
+syn keyword    sqrParagraph   declare-toc declare-variable end-declare
+syn keyword    sqrParagraph   end-document end-select exit-select end-sql
+syn keyword    sqrParagraph   load-lookup
+
+syn keyword    sqrReserved    #current-column #current-date #current-line
+syn keyword    sqrReserved    #end-file #page-count #return-status
+syn keyword    sqrReserved    #sql-count #sql-status #sqr-max-columns
+syn keyword    sqrReserved    #sqr-max-lines #sqr-pid #sqr-toc-level
+syn keyword    sqrReserved    #sqr-toc-page $sqr-database {sqr-database}
+syn keyword    sqrReserved    $sqr-dbcs {sqr-dbcs} $sqr-encoding
+syn keyword    sqrReserved    {sqr-encoding} $sqr-encoding-console
+syn keyword    sqrReserved    {sqr-encoding-console}
+syn keyword    sqrReserved    $sqr-encoding-database
+syn keyword    sqrReserved    {sqr-encoding-database}
+syn keyword    sqrReserved    $sqr-encoding-file-input
+syn keyword    sqrReserved    {sqr-encoding-file-input}
+syn keyword    sqrReserved    $sqr-encoding-file-output
+syn keyword    sqrReserved    {sqr-encoding-file-output}
+syn keyword    sqrReserved    $sqr-encoding-report-input
+syn keyword    sqrReserved    {sqr-encoding-report-input}
+syn keyword    sqrReserved    $sqr-encoding-report-output
+syn keyword    sqrReserved    {sqr-encoding-report-output}
+syn keyword    sqrReserved    $sqr-encoding-source {sqr-encoding-source}
+syn keyword    sqrReserved    $sql-error $sqr-hostname {sqr-hostname}
+syn keyword    sqrReserved    $sqr-locale $sqr-platform {sqr-platform}
+syn keyword    sqrReserved    $sqr-program $sqr-report $sqr-toc-text
+syn keyword    sqrReserved    $sqr-ver $username
+
+syn keyword    sqrPreProc     #define #else #end-if #endif #if #ifdef
+syn keyword    sqrPreProc     #ifndef #include
+
+syn keyword    sqrCommand     add array-add array-divide array-multiply
+syn keyword    sqrCommand     array-subtract ask break call clear-array
+syn keyword    sqrCommand     close columns commit concat connect
+syn keyword    sqrCommand     create-array create-color-palette date-time
+syn keyword    sqrCommand     display divide do dollar-symbol else encode
+syn keyword    sqrCommand     end-evaluate end-if end-while evaluate
+syn keyword    sqrCommand     execute extract find get get-color goto
+syn keyword    sqrCommand     graphic if input last-page let lookup
+syn keyword    sqrCommand     lowercase mbtosbs money-symbol move
+syn keyword    sqrCommand     multiply new-page new-report next-column
+syn keyword    sqrCommand     next-listing no-formfeed open page-number
+syn keyword    sqrCommand     page-size position print print-bar-code
+syn keyword    sqrCommand     print-chart print-direct print-image
+syn keyword    sqrCommand     printer-deinit printer-init put read
+syn keyword    sqrCommand     rollback security set-color set-delay-print
+syn keyword    sqrCommand     set-generations set-levels set-members
+syn keyword    sqrCommand     sbtombs show stop string subtract toc-entry
+syn keyword    sqrCommand     unstring uppercase use use-column
+syn keyword    sqrCommand     use-printer-type use-procedure use-report
+syn keyword    sqrCommand     while write
+
+syn keyword    sqrParam       3d-effects after after-bold after-page
+syn keyword    sqrParam       after-report after-toc and as at-end before
+syn keyword    sqrParam       background batch-mode beep before-bold
+syn keyword    sqrParam       before-page before-report before-toc blink
+syn keyword    sqrParam       bold border bottom-margin box break by
+syn keyword    sqrParam       caption center char char-size char-width
+syn keyword    sqrParam       chars-inch chart-size checksum cl
+syn keyword    sqrParam       clear-line clear-screen color color-palette
+syn keyword    sqrParam       cs color_ data-array
+syn keyword    sqrParam       data-array-column-count
+syn keyword    sqrParam       data-array-column-labels
+syn keyword    sqrParam       data-array-row-count data-labels date
+syn keyword    sqrParam       date-edit-mask date-seperator
+syn keyword    sqrParam       day-of-week-case day-of-week-full
+syn keyword    sqrParam       day-of-week-short decimal decimal-seperator
+syn keyword    sqrParam       default-numeric delay distinct dot-leader
+syn keyword    sqrParam       edit-option-ad edit-option-am
+syn keyword    sqrParam       edit-option-bc edit-option-na
+syn keyword    sqrParam       edit-option-pm encoding entry erase-page
+syn keyword    sqrParam       extent field fill fixed fixed_nolf float
+syn keyword    sqrParam       font font-style font-type footing
+syn keyword    sqrParam       footing-size foreground for-append
+syn keyword    sqrParam       for-reading for-reports for-tocs
+syn keyword    sqrParam       for-writing format formfeed from goto-top
+syn keyword    sqrParam       group having heading heading-size height
+syn keyword    sqrParam       horz-line image-size in indentation
+syn keyword    sqrParam       init-string input-date-edit-mask insert
+syn keyword    sqrParam       integer into item-color item-size key
+syn keyword    sqrParam       layout left-margin legend legend-placement
+syn keyword    sqrParam       legend-presentation legend-title level
+syn keyword    sqrParam       line-height line-size line-width lines-inch
+syn keyword    sqrParam       local locale loops max-columns max-lines
+syn keyword    sqrParam       maxlen money money-edit-mask money-sign
+syn keyword    sqrParam       money-sign-location months-case months-full
+syn keyword    sqrParam       months-short name need newline newpage
+syn keyword    sqrParam       no-advance nolf noline noprompt normal not
+syn keyword    sqrParam       nowait number number-edit-mask on-break
+syn keyword    sqrParam       on-error or order orientation page-depth
+syn keyword    sqrParam       paper-size pie-segment-explode
+syn keyword    sqrParam       pie-segment-percent-display
+syn keyword    sqrParam       pie-segment-quantity-display pitch
+syn keyword    sqrParam       point-markers point-size printer
+syn keyword    sqrParam       printer-type quiet record reset-string
+syn keyword    sqrParam       return_value reverse right-margin rows save
+syn keyword    sqrParam       select size skip skiplines sort source
+syn keyword    sqrParam       sqr-database sqr-platform startup-file
+syn keyword    sqrParam       status stop sub-title symbol-set system
+syn keyword    sqrParam       table text thousand-seperator
+syn keyword    sqrParam       time-seperator times title to toc
+syn keyword    sqrParam       top-margin type underline update using
+syn keyword    sqrParam       value vary vert-line wait warn when
+syn keyword    sqrParam       when-other where with x-axis-grid
+syn keyword    sqrParam       x-axis-label x-axis-major-increment
+syn keyword    sqrParam       x-axis-major-tick-marks x-axis-max-value
+syn keyword    sqrParam       x-axis-min-value x-axis-minor-increment
+syn keyword    sqrParam       x-axis-minor-tick-marks x-axis-rotate
+syn keyword    sqrParam       x-axis-scale x-axis-tick-mark-placement xor
+syn keyword    sqrParam       y-axis-grid y-axis-label
+syn keyword    sqrParam       y-axis-major-increment
+syn keyword    sqrParam       y-axis-major-tick-marks y-axis-max-value
+syn keyword    sqrParam       y-axis-min-value y-axis-minor-increment
+syn keyword    sqrParam       y-axis-minor-tick-marks y-axis-scale
+syn keyword    sqrParam       y-axis-tick-mark-placement y2-type
+syn keyword    sqrParam       y2-data-array y2-data-array-row-count
+syn keyword    sqrParam       y2-data-array-column-count
+syn keyword    sqrParam       y2-data-array-column-labels
+syn keyword    sqrParam       y2-axis-color-palette y2-axis-label
+syn keyword    sqrParam       y2-axis-major-increment
+syn keyword    sqrParam       y2-axis-major-tick-marks y2-axis-max-value
+syn keyword    sqrParam       y2-axis-min-value y2-axis-minor-increment
+syn keyword    sqrParam       y2-axis-minor-tick-marks y2-axis-scale
+
+syn keyword    sqrFunction    abs acos asin atan array ascii asciic ceil
+syn keyword    sqrFunction    cos cosh chr cond deg delete dateadd
+syn keyword    sqrFunction    datediff datenow datetostr e10 exp edit
+syn keyword    sqrFunction    exists floor getenv instr instrb isblank
+syn keyword    sqrFunction    isnull log log10 length lengthb lengthp
+syn keyword    sqrFunction    lengtht lower lpad ltrim mod nvl power rad
+syn keyword    sqrFunction    round range replace roman rpad rtrim rename
+syn keyword    sqrFunction    sign sin sinh sqrt substr substrb substrp
+syn keyword    sqrFunction    substrt strtodate tan tanh trunc to_char
+syn keyword    sqrFunction    to_multi_byte to_number to_single_byte
+syn keyword    sqrFunction    transform translate unicode upper wrapdepth
+
+" END GENERATED SECTION ==============================================
+
+" Variables
+syn match	  sqrVariable	/\(\$\|#\|&\)\(\k\|\.\)*/
+
+
+" Debug compiler directives
+syn match	  sqrPreProc	/\s*#debug\a\=\(\s\|$\)/
+syn match	  sqrSubstVar	/{\k*}/
+
+
+" Strings
+" Note: if an undoubled ! is found, this is not a valid string
+" (SQR will treat the end of the line as a comment)
+syn match	  sqrString	/'\(!!\|[^!']\)*'/      contains=sqrSubstVar
+syn match	  sqrStrOpen	/'\(!!\|''\|[^!']\)*$/
+" If we find a ' followed by an unmatched ! before a matching ',
+" flag the error.
+syn match	  sqrError	/'\(!!\|[^'!]\)*![^!]/me=e-1
+syn match	  sqrError	/'\(!!\|[^'!]\)*!$/
+
+" Numbers:
+syn match	  sqrNumber	/-\=\<\d*\.\=[0-9_]\>/
+
+
+
+" Comments:
+" Handle comments that start with "!=" specially; they are only valid
+" in the first column of the source line.  Also, "!!" is only treated
+" as a start-comment if there is only whitespace ahead of it on the line.
+
+syn keyword	sqrTodo		TODO FIXME XXX DEBUG NOTE ###
+syn match	sqrTodo		/???/
+
+" See also the sqrString section above for handling of ! characters
+" inside of strings.  (Those patterns override the ones below.)
+syn match	sqrComment	/!\@<!!\([^!=].*\|$\)/ contains=sqrTodo
+"				  the ! can't be preceded by another !,
+"				  and must be followed by at least one
+"				  character other than ! or =, or immediately
+"				  by the end-of-line
+syn match	sqrComment	/^!=.*/ contains=sqrTodo
+syn match	sqrComment	/^!!.*/ contains=sqrTodo
+syn match	sqrError	/^\s\+\zs!=.*/
+"				  it's an error to have "!=" preceded by
+"				  just whitespace on the line ("!="
+"				  preceded by non-whitespace is treated
+"				  as neither a comment nor an error, since
+"				  it is often correct, i.e.
+"				    if #count != 7
+syn match	sqrError	/.\+\zs!!.*/
+"				  a "!!" anywhere but at the beginning of
+"				  the line is always an error
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet.
+
+hi def link sqrSection Statement
+hi def link sqrParagraph Statement
+hi def link sqrReserved Statement
+hi def link sqrParameter Statement
+hi def link sqrPreProc PreProc
+hi def link sqrSubstVar PreProc
+hi def link sqrCommand Statement
+hi def link sqrParam Type
+hi def link sqrFunction Special
+
+hi def link sqrString String
+hi def link sqrStrOpen Todo
+hi def link sqrNumber Number
+hi def link sqrVariable Identifier
+
+hi def link sqrComment Comment
+hi def link sqrTodo Todo
+hi def link sqrError Error
+
+
+let b:current_syntax = "sqr"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/squid.vim b/syntax/squid.vim
new file mode 100644
index 000000000..2749a5305
--- /dev/null
+++ b/syntax/squid.vim
@@ -0,0 +1,144 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'squid') == -1
+
+" Vim syntax file
+" Language:	Squid config file
+" Maintainer:	Klaus Muth <klaus@hampft.de>
+" Last Change:	2005 Jun 12
+" URL:		http://www.hampft.de/vim/syntax/squid.vim
+" ThanksTo:	Ilya Sher <iso8601@mail.ru>,
+"               Michael Dotzler <Michael.Dotzler@leoni.com>
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" squid.conf syntax seems to be case insensitive
+syn case ignore
+
+syn keyword	squidTodo	contained TODO
+syn match	squidComment	"#.*$" contains=squidTodo,squidTag
+syn match	squidTag	contained "TAG: .*$"
+
+" Lots & lots of Keywords!
+syn keyword	squidConf	acl always_direct announce_host announce_period
+syn keyword	squidConf	announce_port announce_to anonymize_headers
+syn keyword	squidConf	append_domain as_whois_server auth_param_basic
+syn keyword	squidConf	authenticate_children authenticate_program
+syn keyword	squidConf	authenticate_ttl broken_posts buffered_logs
+syn keyword	squidConf	cache_access_log cache_announce cache_dir
+syn keyword	squidConf	cache_dns_program cache_effective_group
+syn keyword	squidConf	cache_effective_user cache_host cache_host_acl
+syn keyword	squidConf	cache_host_domain cache_log cache_mem
+syn keyword	squidConf	cache_mem_high cache_mem_low cache_mgr
+syn keyword	squidConf	cachemgr_passwd cache_peer cache_peer_access
+syn keyword	squidConf	cahce_replacement_policy cache_stoplist
+syn keyword	squidConf	cache_stoplist_pattern cache_store_log cache_swap
+syn keyword	squidConf	cache_swap_high cache_swap_log cache_swap_low
+syn keyword	squidConf	client_db client_lifetime client_netmask
+syn keyword	squidConf	connect_timeout coredump_dir dead_peer_timeout
+syn keyword	squidConf	debug_options delay_access delay_class
+syn keyword	squidConf	delay_initial_bucket_level delay_parameters
+syn keyword	squidConf	delay_pools deny_info dns_children dns_defnames
+syn keyword	squidConf	dns_nameservers dns_testnames emulate_httpd_log
+syn keyword	squidConf	err_html_text fake_user_agent firewall_ip
+syn keyword	squidConf	forwarded_for forward_snmpd_port fqdncache_size
+syn keyword	squidConf	ftpget_options ftpget_program ftp_list_width
+syn keyword	squidConf	ftp_passive ftp_user half_closed_clients
+syn keyword	squidConf	header_access header_replace hierarchy_stoplist
+syn keyword	squidConf	high_response_time_warning high_page_fault_warning
+syn keyword	squidConf	htcp_port http_access http_anonymizer httpd_accel
+syn keyword	squidConf	httpd_accel_host httpd_accel_port
+syn keyword	squidConf	httpd_accel_uses_host_header
+syn keyword	squidConf	httpd_accel_with_proxy http_port http_reply_access
+syn keyword	squidConf	icp_access icp_hit_stale icp_port
+syn keyword	squidConf	icp_query_timeout ident_lookup ident_lookup_access
+syn keyword	squidConf	ident_timeout incoming_http_average
+syn keyword	squidConf	incoming_icp_average inside_firewall ipcache_high
+syn keyword	squidConf	ipcache_low ipcache_size local_domain local_ip
+syn keyword	squidConf	logfile_rotate log_fqdn log_icp_queries
+syn keyword	squidConf	log_mime_hdrs maximum_object_size
+syn keyword	squidConf	maximum_single_addr_tries mcast_groups
+syn keyword	squidConf	mcast_icp_query_timeout mcast_miss_addr
+syn keyword	squidConf	mcast_miss_encode_key mcast_miss_port memory_pools
+syn keyword	squidConf	memory_pools_limit memory_replacement_policy
+syn keyword	squidConf	mime_table min_http_poll_cnt min_icp_poll_cnt
+syn keyword	squidConf	minimum_direct_hops minimum_object_size
+syn keyword	squidConf	minimum_retry_timeout miss_access negative_dns_ttl
+syn keyword	squidConf	negative_ttl neighbor_timeout neighbor_type_domain
+syn keyword	squidConf	netdb_high netdb_low netdb_ping_period
+syn keyword	squidConf	netdb_ping_rate never_direct no_cache
+syn keyword	squidConf	passthrough_proxy pconn_timeout pid_filename
+syn keyword	squidConf	pinger_program positive_dns_ttl prefer_direct
+syn keyword	squidConf	proxy_auth proxy_auth_realm query_icmp quick_abort
+syn keyword	squidConf	quick_abort quick_abort_max quick_abort_min
+syn keyword	squidConf	quick_abort_pct range_offset_limit read_timeout
+syn keyword	squidConf	redirect_children redirect_program
+syn keyword	squidConf	redirect_rewrites_host_header reference_age
+syn keyword	squidConf	reference_age refresh_pattern reload_into_ims
+syn keyword	squidConf	request_body_max_size request_size request_timeout
+syn keyword	squidConf	shutdown_lifetime single_parent_bypass
+syn keyword	squidConf	siteselect_timeout snmp_access
+syn keyword	squidConf	snmp_incoming_address snmp_port source_ping
+syn keyword	squidConf	ssl_proxy store_avg_object_size
+syn keyword	squidConf	store_objects_per_bucket strip_query_terms
+syn keyword	squidConf	swap_level1_dirs swap_level2_dirs
+syn keyword	squidConf	tcp_incoming_address tcp_outgoing_address
+syn keyword	squidConf	tcp_recv_bufsize test_reachability udp_hit_obj
+syn keyword	squidConf	udp_hit_obj_size udp_incoming_address
+syn keyword	squidConf	udp_outgoing_address unique_hostname
+syn keyword	squidConf	unlinkd_program uri_whitespace useragent_log
+syn keyword	squidConf	visible_hostname wais_relay wais_relay_host
+syn keyword	squidConf	wais_relay_port
+
+syn keyword	squidOpt	proxy-only weight ttl no-query default
+syn keyword	squidOpt	round-robin multicast-responder
+syn keyword	squidOpt	on off all deny allow
+syn keyword	squidopt	via parent no-digest heap lru realm
+syn keyword	squidopt	children credentialsttl none disable
+syn keyword	squidopt	offline_toggle diskd q1 q2
+
+" Security Actions for cachemgr_passwd
+syn keyword	squidAction	shutdown info parameter server_list
+syn keyword	squidAction	client_list
+syn match	squidAction	"stats/\(objects\|vm_objects\|utilization\|ipcache\|fqdncache\|dns\|redirector\|io\|reply_headers\|filedescriptors\|netdb\)"
+syn match	squidAction	"log\(/\(status\|enable\|disable\|clear\)\)\="
+syn match	squidAction	"squid\.conf"
+
+" Keywords for the acl-config
+syn keyword	squidAcl	url_regex urlpath_regex referer_regex port proto
+syn keyword	squidAcl	req_mime_type rep_mime_type
+syn keyword	squidAcl	method browser user src dst
+syn keyword	squidAcl	time dstdomain ident snmp_community
+
+syn match	squidNumber	"\<\d\+\>"
+syn match	squidIP		"\<\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\>"
+syn match	squidStr	"\(^\s*acl\s\+\S\+\s\+\(\S*_regex\|re[pq]_mime_type\|browser\|_domain\|user\)\+\s\+\)\@<=.*" contains=squidRegexOpt
+syn match	squidRegexOpt	contained "\(^\s*acl\s\+\S\+\s\+\S\+\(_regex\|_mime_type\)\s\+\)\@<=[-+]i\s\+"
+
+" All config is in one line, so this has to be sufficient
+" Make it fast like hell :)
+syn sync minlines=3
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link squidTodo	Todo
+hi def link squidComment	Comment
+hi def link squidTag	Special
+hi def link squidConf	Keyword
+hi def link squidOpt	Constant
+hi def link squidAction	String
+hi def link squidNumber	Number
+hi def link squidIP	Number
+hi def link squidAcl	Keyword
+hi def link squidStr	String
+hi def link squidRegexOpt	Special
+
+
+let b:current_syntax = "squid"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/srec.vim b/syntax/srec.vim
new file mode 100644
index 000000000..651480102
--- /dev/null
+++ b/syntax/srec.vim
@@ -0,0 +1,87 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'srec') == -1
+
+" Vim syntax file
+" Language:	Motorola S-Record
+" Maintainer:	Markus Heidelberg <markus.heidelberg@web.de>
+" Last Change:	2015 Feb 24
+
+" Each record (line) is built as follows:
+"
+"    field       digits          states
+"
+"  +----------+
+"  | start    |  1 ('S')         srecRecStart
+"  +----------+
+"  | type     |  1               srecRecType, (srecRecTypeUnknown)
+"  +----------+
+"  | count    |  2               srecByteCount
+"  +----------+
+"  | address  |  4/6/8           srecNoAddress, srecDataAddress, srecRecCount, srecStartAddress, (srecAddressFieldUnknown)
+"  +----------+
+"  | data     |  0..504/502/500  srecDataOdd, srecDataEven, (srecDataUnexpected)
+"  +----------+
+"  | checksum |  2               srecChecksum
+"  +----------+
+"
+" States in parentheses in the upper format description indicate that they
+" should not appear in a valid file.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match srecRecStart "^S"
+
+syn match srecRecTypeUnknown "^S."        contains=srecRecStart
+syn match srecRecType        "^S[0-35-9]" contains=srecRecStart
+
+syn match srecByteCount "^S.[0-9a-fA-F]\{2}"        contains=srecRecTypeUnknown nextgroup=srecAddressFieldUnknown,srecChecksum
+syn match srecByteCount "^S[0-35-9][0-9a-fA-F]\{2}" contains=srecRecType
+
+syn match srecAddressFieldUnknown "[0-9a-fA-F]\{2}" contained nextgroup=srecAddressFieldUnknown,srecChecksum
+
+syn match srecNoAddress    "^S0[0-9a-fA-F]\{6}"  contains=srecByteCount nextgroup=srecDataOdd,srecChecksum
+syn match srecDataAddress  "^S1[0-9a-fA-F]\{6}"  contains=srecByteCount nextgroup=srecDataOdd,srecChecksum
+syn match srecDataAddress  "^S2[0-9a-fA-F]\{8}"  contains=srecByteCount nextgroup=srecDataOdd,srecChecksum
+syn match srecDataAddress  "^S3[0-9a-fA-F]\{10}" contains=srecByteCount nextgroup=srecDataOdd,srecChecksum
+syn match srecRecCount     "^S5[0-9a-fA-F]\{6}"  contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum
+syn match srecRecCount     "^S6[0-9a-fA-F]\{8}"  contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum
+syn match srecStartAddress "^S7[0-9a-fA-F]\{10}" contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum
+syn match srecStartAddress "^S8[0-9a-fA-F]\{8}"  contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum
+syn match srecStartAddress "^S9[0-9a-fA-F]\{6}"  contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum
+
+" alternating highlight per byte for easier reading
+syn match srecDataOdd        "[0-9a-fA-F]\{2}" contained nextgroup=srecDataEven,srecChecksum
+syn match srecDataEven       "[0-9a-fA-F]\{2}" contained nextgroup=srecDataOdd,srecChecksum
+" data bytes which should not exist
+syn match srecDataUnexpected "[0-9a-fA-F]\{2}" contained nextgroup=srecDataUnexpected,srecChecksum
+" Data digit pair regex usage also results in only highlighting the checksum
+" if the number of data characters is even.
+
+syn match srecChecksum "[0-9a-fA-F]\{2}$" contained
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default methods for highlighting. Can be overridden later
+hi def link srecRecStart            srecRecType
+hi def link srecRecTypeUnknown      srecRecType
+hi def link srecRecType             WarningMsg
+hi def link srecByteCount           Constant
+hi def srecAddressFieldUnknown term=italic cterm=italic gui=italic
+hi def link srecNoAddress           DiffAdd
+hi def link srecDataAddress         Comment
+hi def link srecRecCount            srecNoAddress
+hi def link srecStartAddress        srecDataAddress
+hi def srecDataOdd             term=bold cterm=bold gui=bold
+hi def srecDataEven            term=NONE cterm=NONE gui=NONE
+hi def link srecDataUnexpected      Error
+hi def link srecChecksum            DiffChange
+
+
+let b:current_syntax = "srec"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/sshconfig.vim b/syntax/sshconfig.vim
new file mode 100644
index 000000000..c8e666d83
--- /dev/null
+++ b/syntax/sshconfig.vim
@@ -0,0 +1,281 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshconfig') == -1
+
+" Vim syntax file
+" Language:	OpenSSH client configuration file (ssh_config)
+" Author:	David Necas (Yeti)
+" Maintainer:	Dominik Fischer <d dot f dot fischer at web dot de>
+" Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>
+" Contributor:  Karsten Hopp <karsten@redhat.com>
+" Contributor:  Dean, Adam Kenneth <adam.ken.dean@hpe.com>
+" Last Change:	2020 Feb 12
+"		Added RemoteCommand from pull request #4809
+"		Included additional keywords from Martin.
+" SSH Version:	7.4p1
+"
+
+" Setup
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword=_,-,a-z,A-Z,48-57
+
+
+" case on
+syn case match
+
+
+" Comments
+syn match sshconfigComment "^#.*$" contains=sshconfigTodo
+syn match sshconfigComment "\s#.*$" contains=sshconfigTodo
+
+syn keyword sshconfigTodo TODO FIXME NOTE contained
+
+
+" Constants
+syn keyword sshconfigYesNo yes no ask confirm
+syn keyword sshconfigYesNo any auto
+syn keyword sshconfigYesNo force autoask none
+
+syn keyword sshconfigCipher 3des blowfish
+
+syn keyword sshconfigCiphers 3des-cbc
+syn keyword sshconfigCiphers blowfish-cbc
+syn keyword sshconfigCiphers cast128-cbc
+syn keyword sshconfigCiphers arcfour
+syn keyword sshconfigCiphers arcfour128
+syn keyword sshconfigCiphers arcfour256
+syn keyword sshconfigCiphers aes128-cbc
+syn keyword sshconfigCiphers aes192-cbc
+syn keyword sshconfigCiphers aes256-cbc
+syn match sshconfigCiphers "\<rijndael-cbc@lysator\.liu.se\>"
+syn keyword sshconfigCiphers aes128-ctr
+syn keyword sshconfigCiphers aes192-ctr
+syn keyword sshconfigCiphers aes256-ctr
+syn match sshconfigCiphers "\<aes128-gcm@openssh\.com\>"
+syn match sshconfigCiphers "\<aes256-gcm@openssh\.com\>"
+syn match sshconfigCiphers "\<chacha20-poly1305@openssh\.com\>"
+
+syn keyword sshconfigMAC hmac-sha1
+syn keyword sshconfigMAC mac-sha1-96
+syn keyword sshconfigMAC mac-sha2-256
+syn keyword sshconfigMAC mac-sha2-512
+syn keyword sshconfigMAC mac-md5
+syn keyword sshconfigMAC mac-md5-96
+syn keyword sshconfigMAC mac-ripemd160
+syn match   sshconfigMAC "\<hmac-ripemd160@openssh\.com\>"
+syn match   sshconfigMAC "\<umac-64@openssh\.com\>"
+syn match   sshconfigMAC "\<umac-128@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-sha1-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-sha1-96-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-sha2-256-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-sha2-512-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-md5-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-md5-96-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<hmac-ripemd160-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<umac-64-etm@openssh\.com\>"
+syn match   sshconfigMAC "\<umac-128-etm@openssh\.com\>"
+
+syn keyword sshconfigHostKeyAlgo ssh-ed25519
+syn match sshconfigHostKeyAlgo "\<ssh-ed25519-cert-v01@openssh\.com\>"
+syn keyword sshconfigHostKeyAlgo ssh-rsa
+syn keyword sshconfigHostKeyAlgo ssh-dss
+syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp256
+syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp384
+syn keyword sshconfigHostKeyAlgo ecdsa-sha2-nistp521
+syn match sshconfigHostKeyAlgo "\<ssh-rsa-cert-v01@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<ssh-dss-cert-v01@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp384-cert-v01@openssh\.com\>"
+syn match sshconfigHostKeyAlgo "\<ecdsa-sha2-nistp521-cert-v01@openssh\.com\>"
+
+syn keyword sshconfigPreferredAuth hostbased publickey password gssapi-with-mic
+syn keyword sshconfigPreferredAuth keyboard-interactive
+
+syn keyword sshconfigLogLevel QUIET FATAL ERROR INFO VERBOSE
+syn keyword sshconfigLogLevel DEBUG DEBUG1 DEBUG2 DEBUG3
+syn keyword sshconfigSysLogFacility DAEMON USER AUTH AUTHPRIV LOCAL0 LOCAL1
+syn keyword sshconfigSysLogFacility LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7
+syn keyword sshconfigAddressFamily  inet inet6
+
+syn match   sshconfigIPQoS	"af1[123]"
+syn match   sshconfigIPQoS	"af2[123]"
+syn match   sshconfigIPQoS	"af3[123]"
+syn match   sshconfigIPQoS	"af4[123]"
+syn match   sshconfigIPQoS	"cs[0-7]"
+syn keyword sshconfigIPQoS	ef lowdelay throughput reliability
+syn keyword sshconfigKbdInteractive bsdauth pam skey
+
+syn keyword sshconfigKexAlgo diffie-hellman-group1-sha1
+syn keyword sshconfigKexAlgo diffie-hellman-group14-sha1
+syn keyword sshconfigKexAlgo diffie-hellman-group-exchange-sha1
+syn keyword sshconfigKexAlgo diffie-hellman-group-exchange-sha256
+syn keyword sshconfigKexAlgo ecdh-sha2-nistp256
+syn keyword sshconfigKexAlgo ecdh-sha2-nistp384
+syn keyword sshconfigKexAlgo ecdh-sha2-nistp521
+syn match sshconfigKexAlgo "\<curve25519-sha256@libssh\.org\>"
+
+syn keyword sshconfigTunnel	point-to-point ethernet
+
+syn match sshconfigVar "%[rhplLdun]\>"
+syn match sshconfigSpecial "[*?]"
+syn match sshconfigNumber "\d\+"
+syn match sshconfigHostPort "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(:\d\+\)\?\>"
+syn match sshconfigHostPort "\<\([-a-zA-Z0-9]\+\.\)\+[-a-zA-Z0-9]\{2,}\(:\d\+\)\?\>"
+syn match sshconfigHostPort "\<\(\x\{,4}:\)\+\x\{,4}[:/]\d\+\>"
+syn match sshconfigHostPort "\(Host \)\@<=.\+"
+syn match sshconfigHostPort "\(HostName \)\@<=.\+"
+
+" case off
+syn case ignore
+
+
+" Keywords
+syn keyword sshconfigHostSect Host
+
+syn keyword sshconfigMatch canonical final exec host originalhost user localuser all
+
+syn keyword sshconfigKeyword AddressFamily
+syn keyword sshconfigKeyword AddKeysToAgent
+syn keyword sshconfigKeyword BatchMode
+syn keyword sshconfigKeyword BindAddress
+syn keyword sshconfigKeyword BindInterface
+syn keyword sshconfigKeyword CanonicalDomains
+syn keyword sshconfigKeyword CanonicalizeFallbackLocal
+syn keyword sshconfigKeyword CanonicalizeHostname
+syn keyword sshconfigKeyword CanonicalizeMaxDots
+syn keyword sshconfigKeyword CanonicalizePermittedCNAMEs
+syn keyword sshconfigKeyword CASignatureAlgorithms
+syn keyword sshconfigKeyword CertificateFile
+syn keyword sshconfigKeyword ChallengeResponseAuthentication
+syn keyword sshconfigKeyword CheckHostIP
+syn keyword sshconfigKeyword Ciphers
+syn keyword sshconfigKeyword ClearAllForwardings
+syn keyword sshconfigKeyword Compression
+syn keyword sshconfigKeyword ConnectTimeout
+syn keyword sshconfigKeyword ConnectionAttempts
+syn keyword sshconfigKeyword ControlMaster
+syn keyword sshconfigKeyword ControlPath
+syn keyword sshconfigKeyword ControlPersist
+syn keyword sshconfigKeyword DynamicForward
+syn keyword sshconfigKeyword EnableSSHKeysign
+syn keyword sshconfigKeyword EscapeChar
+syn keyword sshconfigKeyword ExitOnForwardFailure
+syn keyword sshconfigKeyword FingerprintHash
+syn keyword sshconfigKeyword ForwardAgent
+syn keyword sshconfigKeyword ForwardX11
+syn keyword sshconfigKeyword ForwardX11Timeout
+syn keyword sshconfigKeyword ForwardX11Trusted
+syn keyword sshconfigKeyword GSSAPIAuthentication
+syn keyword sshconfigKeyword GSSAPIDelegateCredentials
+syn keyword sshconfigKeyword GatewayPorts
+syn keyword sshconfigKeyword GlobalKnownHostsFile
+syn keyword sshconfigKeyword HashKnownHosts
+syn keyword sshconfigKeyword HostKeyAlgorithms
+syn keyword sshconfigKeyword HostKeyAlias
+syn keyword sshconfigKeyword HostName
+syn keyword sshconfigKeyword HostbasedAuthentication
+syn keyword sshconfigKeyword HostbasedKeyTypes
+syn keyword sshconfigKeyword IPQoS
+syn keyword sshconfigKeyword IdentitiesOnly
+syn keyword sshconfigKeyword IdentityAgent
+syn keyword sshconfigKeyword IdentityFile
+syn keyword sshconfigKeyword IgnoreUnknown
+syn keyword sshconfigKeyword Include
+syn keyword sshconfigKeyword IPQoS
+syn keyword sshconfigKeyword KbdInteractiveAuthentication
+syn keyword sshconfigKeyword KbdInteractiveDevices
+syn keyword sshconfigKeyword KexAlgorithms
+syn keyword sshconfigKeyword LocalCommand
+syn keyword sshconfigKeyword LocalForward
+syn keyword sshconfigKeyword LogLevel
+syn keyword sshconfigKeyword MACs
+syn keyword sshconfigKeyword Match
+syn keyword sshconfigKeyword NoHostAuthenticationForLocalhost
+syn keyword sshconfigKeyword NumberOfPasswordPrompts
+syn keyword sshconfigKeyword PKCS11Provider
+syn keyword sshconfigKeyword PasswordAuthentication
+syn keyword sshconfigKeyword PermitLocalCommand
+syn keyword sshconfigKeyword Port
+syn keyword sshconfigKeyword PreferredAuthentications
+syn keyword sshconfigKeyword ProxyCommand
+syn keyword sshconfigKeyword ProxyJump
+syn keyword sshconfigKeyword ProxyUseFDPass
+syn keyword sshconfigKeyword PubkeyAcceptedKeyTypes
+syn keyword sshconfigKeyword PubkeyAuthentication
+syn keyword sshconfigKeyword RekeyLimit
+syn keyword sshconfigKeyword RemoteCommand
+syn keyword sshconfigKeyword RemoteForward
+syn keyword sshconfigKeyword RequestTTY
+syn keyword sshconfigKeyword RevokedHostKeys
+syn keyword sshconfigKeyword SecurityKeyProvider
+syn keyword sshconfigKeyword SendEnv
+syn keyword sshconfigKeyword ServerAliveCountMax
+syn keyword sshconfigKeyword ServerAliveInterval
+syn keyword sshconfigKeyword SmartcardDevice
+syn keyword sshconfigKeyword SetEnv
+syn keyword sshconfigKeyword StreamLocalBindMask
+syn keyword sshconfigKeyword StreamLocalBindUnlink
+syn keyword sshconfigKeyword StrictHostKeyChecking
+syn keyword sshconfigKeyword SyslogFacility
+syn keyword sshconfigKeyword TCPKeepAlive
+syn keyword sshconfigKeyword Tunnel
+syn keyword sshconfigKeyword TunnelDevice
+syn keyword sshconfigKeyword UseBlacklistedKeys
+syn keyword sshconfigKeyword UpdateHostKeys
+syn keyword sshconfigKeyword User
+syn keyword sshconfigKeyword UserKnownHostsFile
+syn keyword sshconfigKeyword VerifyHostKeyDNS
+syn keyword sshconfigKeyword VisualHostKey
+syn keyword sshconfigKeyword XAuthLocation
+
+" Deprecated/ignored/remove/unsupported keywords
+
+syn keyword sshConfigDeprecated Cipher
+syn keyword sshconfigDeprecated GSSAPIClientIdentity
+syn keyword sshconfigDeprecated GSSAPIKeyExchange
+syn keyword sshconfigDeprecated GSSAPIRenewalForcesRekey
+syn keyword sshconfigDeprecated GSSAPIServerIdentity
+syn keyword sshconfigDeprecated GSSAPITrustDNS
+syn keyword sshconfigDeprecated GSSAPITrustDns
+syn keyword sshconfigDeprecated Protocol
+syn keyword sshconfigDeprecated RSAAuthentication
+syn keyword sshconfigDeprecated RhostsRSAAuthentication
+syn keyword sshconfigDeprecated CompressionLevel
+syn keyword sshconfigDeprecated UseRoaming
+syn keyword sshconfigDeprecated UsePrivilegedPort
+
+" Define the default highlighting
+
+hi def link sshconfigComment        Comment
+hi def link sshconfigTodo           Todo
+hi def link sshconfigHostPort       sshconfigConstant
+hi def link sshconfigNumber         sshconfigConstant
+hi def link sshconfigConstant       Constant
+hi def link sshconfigYesNo          sshconfigEnum
+hi def link sshconfigCipher         sshconfigDeprecated
+hi def link sshconfigCiphers        sshconfigEnum
+hi def link sshconfigMAC            sshconfigEnum
+hi def link sshconfigHostKeyAlgo    sshconfigEnum
+hi def link sshconfigLogLevel       sshconfigEnum
+hi def link sshconfigSysLogFacility sshconfigEnum
+hi def link sshconfigAddressFamily  sshconfigEnum
+hi def link sshconfigIPQoS          sshconfigEnum
+hi def link sshconfigKbdInteractive sshconfigEnum
+hi def link sshconfigKexAlgo        sshconfigEnum
+hi def link sshconfigTunnel         sshconfigEnum
+hi def link sshconfigPreferredAuth  sshconfigEnum
+hi def link sshconfigVar            sshconfigEnum
+hi def link sshconfigEnum           Identifier
+hi def link sshconfigSpecial        Special
+hi def link sshconfigKeyword        Keyword
+hi def link sshconfigHostSect       Type
+hi def link sshconfigMatch          Type
+hi def link sshconfigDeprecated     Error
+
+let b:current_syntax = "sshconfig"
+
+" vim:set ts=8 sw=2 sts=2:
+
+endif
diff --git a/syntax/sshdconfig.vim b/syntax/sshdconfig.vim
new file mode 100644
index 000000000..7e45086c6
--- /dev/null
+++ b/syntax/sshdconfig.vim
@@ -0,0 +1,286 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshdconfig') == -1
+
+" Vim syntax file
+" Language:	OpenSSH server configuration file (sshd_config)
+" Author:	David Necas (Yeti)
+" Maintainer:	Dominik Fischer <d dot f dot fischer at web dot de>
+" Contributor:	Thilo Six
+" Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>	
+" Contributor:  Karsten Hopp <karsten@redhat.com>
+" Originally:	2009-07-09
+" Last Change:	2019-05-31
+" SSH Version:	7.9p1
+"
+
+" Setup
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+setlocal iskeyword=_,-,a-z,A-Z,48-57
+
+
+" case on
+syn case match
+
+
+" Comments
+syn match sshdconfigComment "^#.*$" contains=sshdconfigTodo
+syn match sshdconfigComment "\s#.*$" contains=sshdconfigTodo
+
+syn keyword sshdconfigTodo TODO FIXME NOTE contained
+
+" Constants
+syn keyword sshdconfigYesNo yes no none
+
+syn keyword sshdconfigAddressFamily any inet inet6
+
+syn keyword sshdconfigPrivilegeSeparation sandbox
+
+syn keyword sshdconfigTcpForwarding local remote
+
+syn keyword sshdconfigRootLogin prohibit-password without-password forced-commands-only
+
+syn keyword sshdconfigCiphers 3des-cbc
+syn keyword sshdconfigCiphers blowfish-cbc
+syn keyword sshdconfigCiphers cast128-cbc
+syn keyword sshdconfigCiphers arcfour
+syn keyword sshdconfigCiphers arcfour128
+syn keyword sshdconfigCiphers arcfour256
+syn keyword sshdconfigCiphers aes128-cbc
+syn keyword sshdconfigCiphers aes192-cbc
+syn keyword sshdconfigCiphers aes256-cbc
+syn match sshdconfigCiphers "\<rijndael-cbc@lysator\.liu.se\>"
+syn keyword sshdconfigCiphers aes128-ctr
+syn keyword sshdconfigCiphers aes192-ctr
+syn keyword sshdconfigCiphers aes256-ctr
+syn match sshdconfigCiphers "\<aes128-gcm@openssh\.com\>"
+syn match sshdconfigCiphers "\<aes256-gcm@openssh\.com\>"
+syn match sshdconfigCiphers "\<chacha20-poly1305@openssh\.com\>"
+
+syn keyword sshdconfigMAC hmac-sha1
+syn keyword sshdconfigMAC mac-sha1-96
+syn keyword sshdconfigMAC mac-sha2-256
+syn keyword sshdconfigMAC mac-sha2-512
+syn keyword sshdconfigMAC mac-md5
+syn keyword sshdconfigMAC mac-md5-96
+syn keyword sshdconfigMAC mac-ripemd160
+syn match   sshdconfigMAC "\<hmac-ripemd160@openssh\.com\>"
+syn match   sshdconfigMAC "\<umac-64@openssh\.com\>"
+syn match   sshdconfigMAC "\<umac-128@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-sha1-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-sha1-96-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-sha2-256-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-sha2-512-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-md5-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-md5-96-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<hmac-ripemd160-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<umac-64-etm@openssh\.com\>"
+syn match   sshdconfigMAC "\<umac-128-etm@openssh\.com\>"
+
+syn keyword sshdconfigHostKeyAlgo ssh-ed25519
+syn match sshdconfigHostKeyAlgo "\<ssh-ed25519-cert-v01@openssh\.com\>"
+syn keyword sshdconfigHostKeyAlgo ssh-rsa
+syn keyword sshdconfigHostKeyAlgo ssh-dss
+syn keyword sshdconfigHostKeyAlgo ecdsa-sha2-nistp256
+syn keyword sshdconfigHostKeyAlgo ecdsa-sha2-nistp384
+syn keyword sshdconfigHostKeyAlgo ecdsa-sha2-nistp521
+syn match sshdconfigHostKeyAlgo "\<ssh-rsa-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<ssh-dss-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<ecdsa-sha2-nistp384-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<ecdsa-sha2-nistp521-cert-v01@openssh\.com\>"
+
+syn keyword sshdconfigRootLogin prohibit-password without-password forced-commands-only
+
+syn keyword sshdconfigLogLevel QUIET FATAL ERROR INFO VERBOSE
+syn keyword sshdconfigLogLevel DEBUG DEBUG1 DEBUG2 DEBUG3
+syn keyword sshdconfigSysLogFacility DAEMON USER AUTH AUTHPRIV LOCAL0 LOCAL1
+syn keyword sshdconfigSysLogFacility LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7
+
+syn keyword sshdconfigCompression    delayed
+
+syn match   sshdconfigIPQoS	"af1[123]"
+syn match   sshdconfigIPQoS	"af2[123]"
+syn match   sshdconfigIPQoS	"af3[123]"
+syn match   sshdconfigIPQoS	"af4[123]"
+syn match   sshdconfigIPQoS	"cs[0-7]"
+syn keyword sshdconfigIPQoS	ef lowdelay throughput reliability
+
+syn keyword sshdconfigKexAlgo diffie-hellman-group1-sha1
+syn keyword sshdconfigKexAlgo diffie-hellman-group14-sha1
+syn keyword sshdconfigKexAlgo diffie-hellman-group-exchange-sha1
+syn keyword sshdconfigKexAlgo diffie-hellman-group-exchange-sha256
+syn keyword sshdconfigKexAlgo ecdh-sha2-nistp256
+syn keyword sshdconfigKexAlgo ecdh-sha2-nistp384
+syn keyword sshdconfigKexAlgo ecdh-sha2-nistp521
+syn match sshdconfigKexAlgo "\<curve25519-sha256@libssh\.org\>"
+
+syn keyword sshdconfigTunnel	point-to-point ethernet
+
+syn keyword sshdconfigSubsystem internal-sftp
+
+syn match sshdconfigVar	    "%[hu]\>"
+syn match sshdconfigVar	    "%%"
+
+syn match sshdconfigSpecial "[*?]"
+
+syn match sshdconfigNumber "\d\+"
+syn match sshdconfigHostPort "\<\(\d\{1,3}\.\)\{3}\d\{1,3}\(:\d\+\)\?\>"
+syn match sshdconfigHostPort "\<\([-a-zA-Z0-9]\+\.\)\+[-a-zA-Z0-9]\{2,}\(:\d\+\)\?\>"
+" FIXME: this matches quite a few things which are NOT valid IPv6 addresses
+syn match sshdconfigHostPort "\<\(\x\{,4}:\)\+\x\{,4}:\d\+\>"
+syn match sshdconfigTime "\<\(\d\+[sSmMhHdDwW]\)\+\>"
+
+
+" case off
+syn case ignore
+
+
+" Keywords
+" Also includes RDomain, but that is a keyword.
+syn keyword sshdconfigMatch Host User Group Address LocalAddress LocalPort
+
+syn keyword sshdconfigKeyword AcceptEnv
+syn keyword sshdconfigKeyword AddressFamily
+syn keyword sshdconfigKeyword AllowAgentForwarding
+syn keyword sshdconfigKeyword AllowGroups
+syn keyword sshdconfigKeyword AllowStreamLocalForwarding
+syn keyword sshdconfigKeyword AllowTcpForwarding
+syn keyword sshdconfigKeyword AllowUsers
+syn keyword sshdconfigKeyword AuthenticationMethods
+syn keyword sshdconfigKeyword AuthorizedKeysFile
+syn keyword sshdconfigKeyword AuthorizedKeysCommand
+syn keyword sshdconfigKeyword AuthorizedKeysCommandUser
+syn keyword sshdconfigKeyword AuthorizedPrincipalsCommand
+syn keyword sshdconfigKeyword AuthorizedPrincipalsCommandUser
+syn keyword sshdconfigKeyword AuthorizedPrincipalsFile
+syn keyword sshdconfigKeyword Banner
+syn keyword sshdconfigKeyword CASignatureAlgorithms
+syn keyword sshdconfigKeyword ChallengeResponseAuthentication
+syn keyword sshdconfigKeyword ChrootDirectory
+syn keyword sshdconfigKeyword Ciphers
+syn keyword sshdconfigKeyword ClientAliveCountMax
+syn keyword sshdconfigKeyword ClientAliveInterval
+syn keyword sshdconfigKeyword Compression
+syn keyword sshdconfigKeyword DebianBanner
+syn keyword sshdconfigKeyword DenyGroups
+syn keyword sshdconfigKeyword DenyUsers
+syn keyword sshdconfigKeyword DisableForwarding
+syn keyword sshdconfigKeyword ExposeAuthInfo
+syn keyword sshdconfigKeyword FingerprintHash
+syn keyword sshdconfigKeyword ForceCommand
+syn keyword sshdconfigKeyword GatewayPorts
+syn keyword sshdconfigKeyword GSSAPIAuthentication
+syn keyword sshdconfigKeyword GSSAPICleanupCredentials
+syn keyword sshdconfigKeyword GSSAPIEnablek5users
+syn keyword sshdconfigKeyword GSSAPIKeyExchange
+syn keyword sshdconfigKeyword GSSAPIKexAlgorithms
+syn keyword sshdconfigKeyword GSSAPIStoreCredentialsOnRekey
+syn keyword sshdconfigKeyword GSSAPIStrictAcceptorCheck
+syn keyword sshdconfigKeyword HostCertificate
+syn keyword sshdconfigKeyword HostKey
+syn keyword sshdconfigKeyword HostKeyAgent
+syn keyword sshdconfigKeyword HostKeyAlgorithms
+syn keyword sshdconfigKeyword HostbasedAcceptedKeyTypes
+syn keyword sshdconfigKeyword HostbasedAuthentication
+syn keyword sshdconfigKeyword HostbasedUsesNameFromPacketOnly
+syn keyword sshdconfigKeyword IPQoS
+syn keyword sshdconfigKeyword IgnoreRhosts
+syn keyword sshdconfigKeyword IgnoreUserKnownHosts
+syn keyword sshdconfigKeyword KbdInteractiveAuthentication
+syn keyword sshdconfigKeyword KerberosAuthentication
+syn keyword sshdconfigKeyword KerberosGetAFSToken
+syn keyword sshdconfigKeyword KerberosOrLocalPasswd
+syn keyword sshdconfigKeyword KerberosTicketCleanup
+syn keyword sshdconfigKeyword KerberosUniqueCCache
+syn keyword sshdconfigKeyword KerberosUseKuserok
+syn keyword sshdconfigKeyword KexAlgorithms
+syn keyword sshdconfigKeyword KeyRegenerationInterval
+syn keyword sshdconfigKeyword ListenAddress
+syn keyword sshdconfigKeyword LogLevel
+syn keyword sshdconfigKeyword LoginGraceTime
+syn keyword sshdconfigKeyword MACs
+syn keyword sshdconfigKeyword Match
+syn keyword sshdconfigKeyword MaxAuthTries
+syn keyword sshdconfigKeyword MaxSessions
+syn keyword sshdconfigKeyword MaxStartups
+syn keyword sshdconfigKeyword PasswordAuthentication
+syn keyword sshdconfigKeyword PermitBlacklistedKeys
+syn keyword sshdconfigKeyword PermitEmptyPasswords
+syn keyword sshdconfigKeyword PermitListen
+syn keyword sshdconfigKeyword PermitOpen
+syn keyword sshdconfigKeyword PermitRootLogin
+syn keyword sshdconfigKeyword PermitTTY
+syn keyword sshdconfigKeyword PermitTunnel
+syn keyword sshdconfigKeyword PermitUserEnvironment
+syn keyword sshdconfigKeyword PermitUserRC
+syn keyword sshdconfigKeyword PidFile
+syn keyword sshdconfigKeyword Port
+syn keyword sshdconfigKeyword PrintLastLog
+syn keyword sshdconfigKeyword PrintMotd
+syn keyword sshdconfigKeyword Protocol
+syn keyword sshdconfigKeyword PubkeyAcceptedKeyTypes
+syn keyword sshdconfigKeyword PubkeyAuthentication
+syn keyword sshdconfigKeyword RSAAuthentication
+syn keyword sshdconfigKeyword RekeyLimit
+syn keyword sshdconfigKeyword RevokedKeys
+syn keyword sshdconfigKeyword RDomain
+syn keyword sshdconfigKeyword RhostsRSAAuthentication
+syn keyword sshdconfigKeyword ServerKeyBits
+syn keyword sshdconfigKeyword SetEnv
+syn keyword sshdconfigKeyword ShowPatchLevel
+syn keyword sshdconfigKeyword StrictModes
+syn keyword sshdconfigKeyword StreamLocalBindMask
+syn keyword sshdconfigKeyword StreamLocalBindUnlink
+syn keyword sshdconfigKeyword Subsystem
+syn keyword sshdconfigKeyword SyslogFacility
+syn keyword sshdconfigKeyword TCPKeepAlive
+syn keyword sshdconfigKeyword TrustedUserCAKeys
+syn keyword sshdconfigKeyword UseDNS
+syn keyword sshdconfigKeyword UseLogin
+syn keyword sshdconfigKeyword UsePAM
+syn keyword sshdconfigKeyword VersionAddendum
+syn keyword sshdconfigKeyword X11DisplayOffset
+syn keyword sshdconfigKeyword X11Forwarding
+syn keyword sshdconfigKeyword X11MaxDisplays
+syn keyword sshdconfigKeyword X11UseLocalhost
+syn keyword sshdconfigKeyword XAuthLocation
+
+
+" Define the default highlighting
+
+hi def link sshdconfigComment              Comment
+hi def link sshdconfigTodo                 Todo
+hi def link sshdconfigHostPort             sshdconfigConstant
+hi def link sshdconfigTime                 sshdconfigConstant
+hi def link sshdconfigNumber               sshdconfigConstant
+hi def link sshdconfigConstant             Constant
+hi def link sshdconfigYesNo                sshdconfigEnum
+hi def link sshdconfigAddressFamily        sshdconfigEnum
+hi def link sshdconfigPrivilegeSeparation  sshdconfigEnum
+hi def link sshdconfigTcpForwarding        sshdconfigEnum
+hi def link sshdconfigRootLogin            sshdconfigEnum
+hi def link sshdconfigCiphers              sshdconfigEnum
+hi def link sshdconfigMAC                  sshdconfigEnum
+hi def link sshdconfigHostKeyAlgo          sshdconfigEnum
+hi def link sshdconfigRootLogin            sshdconfigEnum
+hi def link sshdconfigLogLevel             sshdconfigEnum
+hi def link sshdconfigSysLogFacility       sshdconfigEnum
+hi def link sshdconfigVar                  sshdconfigEnum
+hi def link sshdconfigCompression          sshdconfigEnum
+hi def link sshdconfigIPQoS                sshdconfigEnum
+hi def link sshdconfigKexAlgo              sshdconfigEnum
+hi def link sshdconfigTunnel               sshdconfigEnum
+hi def link sshdconfigSubsystem            sshdconfigEnum
+hi def link sshdconfigEnum                 Function
+hi def link sshdconfigSpecial              Special
+hi def link sshdconfigKeyword              Keyword
+hi def link sshdconfigMatch                Type
+
+let b:current_syntax = "sshdconfig"
+
+" vim:set ts=8 sw=2 sts=2:
+
+endif
diff --git a/syntax/st.vim b/syntax/st.vim
new file mode 100644
index 000000000..a642ffa9b
--- /dev/null
+++ b/syntax/st.vim
@@ -0,0 +1,99 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'st') == -1
+
+" Vim syntax file
+" Language:	Smalltalk
+" Maintainer:	Arndt Hesse <hesse@self.de>
+" Last Change:	2012 Feb 12 by Thilo Six
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" some Smalltalk keywords and standard methods
+syn keyword	stKeyword	super self class true false new not
+syn keyword	stKeyword	notNil isNil inspect out nil
+syn match	stMethod	"\<do\>:"
+syn match	stMethod	"\<whileTrue\>:"
+syn match	stMethod	"\<whileFalse\>:"
+syn match	stMethod	"\<ifTrue\>:"
+syn match	stMethod	"\<ifFalse\>:"
+syn match	stMethod	"\<put\>:"
+syn match	stMethod	"\<to\>:"
+syn match	stMethod	"\<at\>:"
+syn match	stMethod	"\<add\>:"
+syn match	stMethod	"\<new\>:"
+syn match	stMethod	"\<for\>:"
+syn match	stMethod	"\<methods\>:"
+syn match	stMethod	"\<methodsFor\>:"
+syn match	stMethod	"\<instanceVariableNames\>:"
+syn match	stMethod	"\<classVariableNames\>:"
+syn match	stMethod	"\<poolDictionaries\>:"
+syn match	stMethod	"\<subclass\>:"
+
+" the block of local variables of a method
+syn region stLocalVariables	start="^[ \t]*|" end="|"
+
+" the Smalltalk comment
+syn region stComment	start="\"" end="\""
+
+" the Smalltalk strings and single characters
+syn region stString	start='\'' skip="''" end='\''
+syn match  stCharacter	"$."
+
+syn case ignore
+
+" the symols prefixed by a '#'
+syn match  stSymbol	"\(#\<[a-z_][a-z0-9_]*\>\)"
+syn match  stSymbol	"\(#'[^']*'\)"
+
+" the variables in a statement block for loops
+syn match  stBlockVariable "\(:[ \t]*\<[a-z_][a-z0-9_]*\>[ \t]*\)\+|" contained
+
+" some representations of numbers
+syn match  stNumber	"\<\d\+\(u\=l\=\|lu\|f\)\>"
+syn match  stFloat	"\<\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=\>"
+syn match  stFloat	"\<\d\+e[-+]\=\d\+[fl]\=\>"
+
+syn case match
+
+" a try to higlight paren mismatches
+syn region stParen	transparent start='(' end=')' contains=ALLBUT,stParenError
+syn match  stParenError	")"
+syn region stBlock	transparent start='\[' end='\]' contains=ALLBUT,stBlockError
+syn match  stBlockError	"\]"
+syn region stSet	transparent start='{' end='}' contains=ALLBUT,stSetError
+syn match  stSetError	"}"
+
+hi link stParenError stError
+hi link stSetError stError
+hi link stBlockError stError
+
+" synchronization for syntax analysis
+syn sync minlines=50
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link stKeyword		Statement
+hi def link stMethod		Statement
+hi def link stComment		Comment
+hi def link stCharacter		Constant
+hi def link stString		Constant
+hi def link stSymbol		Special
+hi def link stNumber		Type
+hi def link stFloat		Type
+hi def link stError		Error
+hi def link stLocalVariables	Identifier
+hi def link stBlockVariable	Identifier
+
+
+let b:current_syntax = "st"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/stata.vim b/syntax/stata.vim
new file mode 100644
index 000000000..9098914b0
--- /dev/null
+++ b/syntax/stata.vim
@@ -0,0 +1,454 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stata') == -1
+
+" stata.vim -- Vim syntax file for Stata do, ado, and class files.
+" Language:	Stata and/or Mata
+" Maintainer:	Jeff Pitblado <jpitblado@stata.com>
+" Last Change:	26apr2006
+" Version:	1.1.4
+
+" Log:
+" 14apr2006	renamed syntax groups st* to stata*
+"		'syntax clear' only under version control
+"		check for 'b:current_syntax', removed 'did_stata_syntax_inits'
+" 17apr2006	fixed start expression for stataFunc
+" 26apr2006	fixed brace confusion in stataErrInParen and stataErrInBracket
+"		fixed paren/bracket confusion in stataFuncGroup
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+syntax case match
+
+" comments - single line
+" note that the triple slash continuing line comment comes free
+syn region stataStarComment  start=/^\s*\*/ end=/$/    contains=stataComment oneline
+syn region stataSlashComment start="\s//"   end=/$/    contains=stataComment oneline
+syn region stataSlashComment start="^//"    end=/$/    contains=stataComment oneline
+" comments - multiple line
+syn region stataComment      start="/\*"    end="\*/"  contains=stataComment
+
+" global macros - simple case
+syn match  stataGlobal /\$\a\w*/
+" global macros - general case
+syn region stataGlobal start=/\${/ end=/}/ oneline contains=@stataMacroGroup
+" local macros - general case
+syn region stataLocal  start=/`/ end=/'/   oneline contains=@stataMacroGroup
+
+" numeric formats
+syn match  stataFormat /%-\=\d\+\.\d\+[efg]c\=/
+" numeric hex format
+syn match  stataFormat /%-\=21x/
+" string format
+syn match  stataFormat /%\(\|-\|\~\)\d\+s/
+
+" Statements
+syn keyword stataConditional else if
+syn keyword stataRepeat      foreach
+syn keyword stataRepeat      forv[alues]
+syn keyword stataRepeat      while
+
+" Common programming commands
+syn keyword stataCommand about
+syn keyword stataCommand adopath
+syn keyword stataCommand adoupdate
+syn keyword stataCommand assert
+syn keyword stataCommand break
+syn keyword stataCommand by
+syn keyword stataCommand cap[ture]
+syn keyword stataCommand cd
+syn keyword stataCommand chdir
+syn keyword stataCommand checksum
+syn keyword stataCommand class
+syn keyword stataCommand classutil
+syn keyword stataCommand compress
+syn keyword stataCommand conf[irm]
+syn keyword stataCommand conren
+syn keyword stataCommand continue
+syn keyword stataCommand cou[nt]
+syn keyword stataCommand cscript
+syn keyword stataCommand cscript_log
+syn keyword stataCommand #delimit
+syn keyword stataCommand d[escribe]
+syn keyword stataCommand dir
+syn keyword stataCommand discard
+syn keyword stataCommand di[splay]
+syn keyword stataCommand do
+syn keyword stataCommand doedit
+syn keyword stataCommand drop
+syn keyword stataCommand edit
+syn keyword stataCommand end
+syn keyword stataCommand erase
+syn keyword stataCommand eret[urn]
+syn keyword stataCommand err[or]
+syn keyword stataCommand e[xit]
+syn keyword stataCommand expand
+syn keyword stataCommand expandcl
+syn keyword stataCommand file
+syn keyword stataCommand findfile
+syn keyword stataCommand format
+syn keyword stataCommand g[enerate]
+syn keyword stataCommand gettoken
+syn keyword stataCommand gl[obal]
+syn keyword stataCommand help
+syn keyword stataCommand hexdump
+syn keyword stataCommand include
+syn keyword stataCommand infile
+syn keyword stataCommand infix
+syn keyword stataCommand input
+syn keyword stataCommand insheet
+syn keyword stataCommand joinby
+syn keyword stataCommand la[bel]
+syn keyword stataCommand levelsof
+syn keyword stataCommand list
+syn keyword stataCommand loc[al]
+syn keyword stataCommand log
+syn keyword stataCommand ma[cro]
+syn keyword stataCommand mark
+syn keyword stataCommand markout
+syn keyword stataCommand marksample
+syn keyword stataCommand mata
+syn keyword stataCommand matrix
+syn keyword stataCommand memory
+syn keyword stataCommand merge
+syn keyword stataCommand mkdir
+syn keyword stataCommand more
+syn keyword stataCommand net
+syn keyword stataCommand nobreak
+syn keyword stataCommand n[oisily]
+syn keyword stataCommand note[s]
+syn keyword stataCommand numlist
+syn keyword stataCommand outfile
+syn keyword stataCommand outsheet
+syn keyword stataCommand _parse
+syn keyword stataCommand pause
+syn keyword stataCommand plugin
+syn keyword stataCommand post
+syn keyword stataCommand postclose
+syn keyword stataCommand postfile
+syn keyword stataCommand preserve
+syn keyword stataCommand print
+syn keyword stataCommand printer
+syn keyword stataCommand profiler
+syn keyword stataCommand pr[ogram]
+syn keyword stataCommand q[uery]
+syn keyword stataCommand qui[etly]
+syn keyword stataCommand rcof
+syn keyword stataCommand reg[ress]
+syn keyword stataCommand rename
+syn keyword stataCommand repeat
+syn keyword stataCommand replace
+syn keyword stataCommand reshape
+syn keyword stataCommand ret[urn]
+syn keyword stataCommand _rmcoll
+syn keyword stataCommand _rmcoll
+syn keyword stataCommand _rmcollright
+syn keyword stataCommand rmdir
+syn keyword stataCommand _robust
+syn keyword stataCommand save
+syn keyword stataCommand sca[lar]
+syn keyword stataCommand search
+syn keyword stataCommand serset
+syn keyword stataCommand set
+syn keyword stataCommand shell
+syn keyword stataCommand sleep
+syn keyword stataCommand sort
+syn keyword stataCommand split
+syn keyword stataCommand sret[urn]
+syn keyword stataCommand ssc
+syn keyword stataCommand su[mmarize]
+syn keyword stataCommand syntax
+syn keyword stataCommand sysdescribe
+syn keyword stataCommand sysdir
+syn keyword stataCommand sysuse
+syn keyword stataCommand token[ize]
+syn keyword stataCommand translate
+syn keyword stataCommand type
+syn keyword stataCommand unab
+syn keyword stataCommand unabcmd
+syn keyword stataCommand update
+syn keyword stataCommand use
+syn keyword stataCommand vers[ion]
+syn keyword stataCommand view
+syn keyword stataCommand viewsource
+syn keyword stataCommand webdescribe
+syn keyword stataCommand webseek
+syn keyword stataCommand webuse
+syn keyword stataCommand which
+syn keyword stataCommand who
+syn keyword stataCommand window
+
+" Literals
+syn match  stataQuote   /"/
+syn region stataEString matchgroup=Nothing start=/`"/ end=/"'/ oneline contains=@stataMacroGroup,stataQuote,stataString,stataEString
+syn region stataString  matchgroup=Nothing start=/"/ end=/"/   oneline contains=@stataMacroGroup
+
+" define clusters
+syn cluster stataFuncGroup contains=@stataMacroGroup,stataFunc,stataString,stataEstring,stataParen,stataBracket
+syn cluster stataMacroGroup contains=stataGlobal,stataLocal
+syn cluster stataParenGroup contains=stataParenError,stataBracketError,stataBraceError,stataSpecial,stataFormat
+
+" Stata functions
+" Math
+syn region stataFunc matchgroup=Function start=/\<abs(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<acos(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<asin(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<atan(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<atan2(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<atanh(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<ceil(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<cloglog(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<comb(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<cos(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<digamma(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<exp(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<floor(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<int(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invcloglog(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invlogit(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<ln(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<lnfact(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<lnfactorial(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<lngamma(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<log(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<log10(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<logit(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<max(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<mod(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<reldif(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<round(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<sign(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<sin(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<sqrt(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<sum(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<tan(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<tanh(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<trigamma(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<trunc(/ end=/)/ contains=@stataFuncGroup
+" Probability distriubtions and density functions
+syn region stataFunc matchgroup=Function start=/\<betaden(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<Binomial(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<binorm(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<binormal(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<chi2(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<chi2tail(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<dgammapda(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<dgammapdada(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<dgammapdadx(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<dgammapdx(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<dgammapdxdx(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<F(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<Fden(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<Ftail(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<gammaden(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<gammap(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<ibeta(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invbinomial(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invchi2(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invchi2tail(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invF(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invFtail(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invgammap(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invibeta(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invnchi2(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invFtail(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invibeta(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invnorm(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invnormal(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invttail(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<lnnormal(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<lnnormalden(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<nbetaden(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<nchi2(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<nFden(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<nFtail(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<nibeta(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<norm(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<normal(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<normalden(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<normden(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<npnchi2(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<tden(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<ttail(/ end=/)/ contains=@stataFuncGroup
+" Random numbers
+syn region stataFunc matchgroup=Function start=/\<uniform(/ end=/)/ contains=@stataFuncGroup
+" String
+syn region stataFunc matchgroup=Function start=/\<abbrev(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<hchar(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<indexnot(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<itrim(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<length(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<lower(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<ltrim(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<plural(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<proper(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<real(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<regexm(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<regexr(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<regexs(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<reverse(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<rtrim(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<string(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<strlen(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<strmatch(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<strpos(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<subinstr(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<subinword(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<substr(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<trim(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<upper(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<word(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<wordcount(/ end=/)/ contains=@stataFuncGroup
+" Programming
+syn region stataFunc matchgroup=Function start=/\<autocode(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<byteorder(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<c(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<_caller(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<chop(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<clip(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<cond(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<e(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<epsdouble(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<epsfloat(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<float(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<has_eprop(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<has_eprop(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<inlist(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<inrange(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<irecode(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<matrix(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<maxbyte(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<maxdouble(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<maxfloat(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<maxint(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<maxlong(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<mi(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<minbyte(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<mindouble(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<minfloat(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<minint(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<minlong(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<missing(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<r(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<recode(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<replay(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<return(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<s(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<scalar(/ end=/)/ contains=@stataFuncGroup
+" Date
+syn region stataFunc matchgroup=Function start=/\<d(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<date(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<day(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<dow(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<doy(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<halfyear(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<mdy(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<month(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<quarter(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<week(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<year(/ end=/)/ contains=@stataFuncGroup
+" Time-series
+syn region stataFunc matchgroup=Function start=/\<daily(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<halfyearly(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<monthly(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<quarterly(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<weekly(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<yearly(/ end=/)/ contains=@stataFuncGroup
+"
+syn region stataFunc matchgroup=Function start=/\<yh(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<ym(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<yq(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<yw(/ end=/)/ contains=@stataFuncGroup
+"
+syn region stataFunc matchgroup=Function start=/\<d(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<h(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<m(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<q(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<w(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<y(/ end=/)/ contains=@stataFuncGroup
+"
+syn region stataFunc matchgroup=Function start=/\<dofd(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<dofh(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<dofm(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<dofq(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<dofw(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<dofy(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<hofd(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<mofd(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<qofd(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<wofd(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<yofd(/ end=/)/ contains=@stataFuncGroup
+"
+syn region stataFunc matchgroup=Function start=/\<tin(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<twithin(/ end=/)/ contains=@stataFuncGroup
+" Matrix
+syn region stataFunc matchgroup=Function start=/\<colnumb(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<colsof(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<det(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<diag0cnt(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<el(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<issymmetric(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<matmissing(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<mreldif(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<rownumb(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<rowsof(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<trace(/ end=/)/ contains=@stataFuncGroup
+"
+syn region stataFunc matchgroup=Function start=/\<cholsky(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<corr(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<diag(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<get(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<hadamard(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<I(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<inv(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<invsym(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<J(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<matuniform(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<nullmat(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<sweep(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<vec(/ end=/)/ contains=@stataFuncGroup
+syn region stataFunc matchgroup=Function start=/\<vecdiag(/ end=/)/ contains=@stataFuncGroup
+
+" Errors to catch
+" taken from $VIMRUNTIME/syntax/c.vim 
+" catch errors caused by wrong parenthesis, braces and brackets
+syn region	stataParen	transparent start=/(/ end=/)/  contains=ALLBUT,@stataParenGroup,stataErrInBracket,stataErrInBrace
+syn region	stataBracket	transparent start=/\[/ end=/]/ contains=ALLBUT,@stataParenGroup,stataErrInParen,stataErrInBrace
+syn region	stataBrace	transparent start=/{/ end=/}/  contains=ALLBUT,@stataParenGroup,stataErrInParen,stataErrInBracket
+syn match	stataParenError	/[\])}]/
+syn match	stataBracketError	/]/
+syn match	stataBraceError	/}/
+syn match	stataErrInParen	contained /[\]}]/
+syn match	stataErrInBracket	contained /[)}]/
+syn match	stataErrInBrace	contained /[)\]]/
+
+" assign highlight groups
+hi def link stataBraceError	stataError
+hi def link stataBracketError	stataError
+hi def link stataErrInBrace	stataError
+hi def link stataErrInBracket	stataError
+hi def link stataErrInParen	stataError
+hi def link stataEString	stataString
+hi def link stataFormat		stataSpecial
+hi def link stataGlobal		stataMacro
+hi def link stataLocal		stataMacro
+hi def link stataParenError	stataError
+hi def link stataSlashComment	stataComment
+hi def link stataStarComment	stataComment
+
+hi def link stataCommand	Define
+hi def link stataComment	Comment
+hi def link stataConditional	Conditional
+hi def link stataError		Error
+hi def link stataFunc		None
+hi def link stataMacro		Define
+hi def link stataRepeat		Repeat
+hi def link stataSpecial	SpecialChar
+hi def link stataString		String
+
+let b:current_syntax = "stata"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/stp.vim b/syntax/stp.vim
new file mode 100644
index 000000000..f40a4eb22
--- /dev/null
+++ b/syntax/stp.vim
@@ -0,0 +1,158 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stp') == -1
+
+" Vim syntax file
+"    Language: Stored Procedures (STP)
+"  Maintainer: Jeff Lanzarotta (jefflanzarotta@yahoo.com)
+"	  URL: http://lanzarotta.tripod.com/vim/syntax/stp.vim.zip
+" Last Change: March 05, 2002
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+" Specials.
+syn keyword stpSpecial    null
+
+" Keywords.
+syn keyword stpKeyword begin break call case create deallocate dynamic
+syn keyword stpKeyword execute from function go grant
+syn keyword stpKeyword index insert into leave max min on output procedure
+syn keyword stpKeyword public result return returns scroll table to
+syn keyword stpKeyword when
+syn match   stpKeyword "\<end\>"
+
+" Conditional.
+syn keyword stpConditional if else elseif then
+syn match   stpConditional "\<end\s\+if\>"
+
+" Repeats.
+syn keyword stpRepeat for while loop
+syn match   stpRepeat "\<end\s\+loop\>"
+
+" Operators.
+syn keyword stpOperator asc not and or desc group having in is any some all
+syn keyword stpOperator between exists like escape with union intersect minus
+syn keyword stpOperator out prior distinct sysdate
+
+" Statements.
+syn keyword stpStatement alter analyze as audit avg by close clustered comment
+syn keyword stpStatement commit continue count create cursor declare delete
+syn keyword stpStatement drop exec execute explain fetch from index insert
+syn keyword stpStatement into lock max min next noaudit nonclustered open
+syn keyword stpStatement order output print raiserror recompile rename revoke
+syn keyword stpStatement rollback savepoint select set sum transaction
+syn keyword stpStatement truncate unique update values where
+
+" Functions.
+syn keyword stpFunction abs acos ascii asin atan atn2 avg ceiling charindex
+syn keyword stpFunction charlength convert col_name col_length cos cot count
+syn keyword stpFunction curunreservedpgs datapgs datalength dateadd datediff
+syn keyword stpFunction datename datepart db_id db_name degree difference
+syn keyword stpFunction exp floor getdate hextoint host_id host_name index_col
+syn keyword stpFunction inttohex isnull lct_admin log log10 lower ltrim max
+syn keyword stpFunction min now object_id object_name patindex pi pos power
+syn keyword stpFunction proc_role radians rand replace replicate reserved_pgs
+syn keyword stpFunction reverse right rtrim rowcnt round show_role sign sin
+syn keyword stpFunction soundex space sqrt str stuff substr substring sum
+syn keyword stpFunction suser_id suser_name tan tsequal upper used_pgs user
+syn keyword stpFunction user_id user_name valid_name valid_user message
+
+" Types.
+syn keyword stpType binary bit char datetime decimal double float image
+syn keyword stpType int integer long money nchar numeric precision real
+syn keyword stpType smalldatetime smallint smallmoney text time tinyint
+syn keyword stpType timestamp varbinary varchar
+
+" Globals.
+syn match stpGlobals '@@char_convert'
+syn match stpGlobals '@@cient_csname'
+syn match stpGlobals '@@client_csid'
+syn match stpGlobals '@@connections'
+syn match stpGlobals '@@cpu_busy'
+syn match stpGlobals '@@error'
+syn match stpGlobals '@@identity'
+syn match stpGlobals '@@idle'
+syn match stpGlobals '@@io_busy'
+syn match stpGlobals '@@isolation'
+syn match stpGlobals '@@langid'
+syn match stpGlobals '@@language'
+syn match stpGlobals '@@max_connections'
+syn match stpGlobals '@@maxcharlen'
+syn match stpGlobals '@@ncharsize'
+syn match stpGlobals '@@nestlevel'
+syn match stpGlobals '@@pack_received'
+syn match stpGlobals '@@pack_sent'
+syn match stpGlobals '@@packet_errors'
+syn match stpGlobals '@@procid'
+syn match stpGlobals '@@rowcount'
+syn match stpGlobals '@@servername'
+syn match stpGlobals '@@spid'
+syn match stpGlobals '@@sqlstatus'
+syn match stpGlobals '@@testts'
+syn match stpGlobals '@@textcolid'
+syn match stpGlobals '@@textdbid'
+syn match stpGlobals '@@textobjid'
+syn match stpGlobals '@@textptr'
+syn match stpGlobals '@@textsize'
+syn match stpGlobals '@@thresh_hysteresis'
+syn match stpGlobals '@@timeticks'
+syn match stpGlobals '@@total_error'
+syn match stpGlobals '@@total_read'
+syn match stpGlobals '@@total_write'
+syn match stpGlobals '@@tranchained'
+syn match stpGlobals '@@trancount'
+syn match stpGlobals '@@transtate'
+syn match stpGlobals '@@version'
+
+" Todos.
+syn keyword stpTodo TODO FIXME XXX DEBUG NOTE
+
+" Strings and characters.
+syn match stpStringError "'.*$"
+syn match stpString "'\([^']\|''\)*'"
+
+" Numbers.
+syn match stpNumber "-\=\<\d*\.\=[0-9_]\>"
+
+" Comments.
+syn region stpComment start="/\*" end="\*/" contains=stpTodo
+syn match  stpComment "--.*" contains=stpTodo
+syn sync   ccomment stpComment
+
+" Parens.
+syn region stpParen transparent start='(' end=')' contains=ALLBUT,stpParenError
+syn match  stpParenError ")"
+
+" Syntax Synchronizing.
+syn sync minlines=10 maxlines=100
+
+" Define the default highlighting.
+" Only when and item doesn't have highlighting yet.
+
+hi def link stpConditional Conditional
+hi def link stpComment Comment
+hi def link stpKeyword Keyword
+hi def link stpNumber Number
+hi def link stpOperator Operator
+hi def link stpSpecial Special
+hi def link stpStatement Statement
+hi def link stpString String
+hi def link stpStringError Error
+hi def link stpType Type
+hi def link stpTodo Todo
+hi def link stpFunction Function
+hi def link stpGlobals Macro
+hi def link stpParen Normal
+hi def link stpParenError Error
+hi def link stpSQLKeyword Function
+hi def link stpRepeat Repeat
+
+
+let b:current_syntax = "stp"
+
+" vim ts=8 sw=2
+
+endif
diff --git a/syntax/sudoers.vim b/syntax/sudoers.vim
new file mode 100644
index 000000000..298ddb9cc
--- /dev/null
+++ b/syntax/sudoers.vim
@@ -0,0 +1,393 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sudoers') == -1
+
+" Vim syntax file
+" Language:             sudoers(5) configuration files
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2018-08-18
+" Recent Changes:	Support for #include and #includedir.
+" 			Added many new options (Samuel D. Leslie)
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" TODO: instead of 'skipnl', we would like to match a specific group that would
+" match \\$ and then continue with the nextgroup, actually, the skipnl doesn't
+" work...
+" TODO: treat 'ALL' like a special (yay, a bundle of new rules!!!)
+
+syn match   sudoersUserSpec '^' nextgroup=@sudoersUserInSpec skipwhite
+
+syn match   sudoersSpecEquals         contained '=' nextgroup=@sudoersCmndSpecList skipwhite
+
+syn cluster sudoersCmndSpecList       contains=sudoersUserRunasBegin,sudoersPASSWD,@sudoersCmndInSpec
+
+syn keyword sudoersTodo               contained TODO FIXME XXX NOTE
+
+syn region  sudoersComment            display oneline start='#' end='$' contains=sudoersTodo
+syn region  sudoersInclude            display oneline start='#\(include\|includedir\)' end='$'
+
+syn keyword sudoersAlias              User_Alias Runas_Alias nextgroup=sudoersUserAlias skipwhite skipnl
+syn keyword sudoersAlias              Host_Alias nextgroup=sudoersHostAlias skipwhite skipnl
+syn keyword sudoersAlias              Cmnd_Alias nextgroup=sudoersCmndAlias skipwhite skipnl
+
+syn match   sudoersUserAlias          contained '\<\u[A-Z0-9_]*\>'  nextgroup=sudoersUserAliasEquals  skipwhite skipnl
+syn match   sudoersUserNameInList     contained '\<\l\+\>'          nextgroup=@sudoersUserList        skipwhite skipnl
+syn match   sudoersUIDInList          contained '#\d\+\>'           nextgroup=@sudoersUserList        skipwhite skipnl
+syn match   sudoersGroupInList        contained '%\l\+\>'           nextgroup=@sudoersUserList        skipwhite skipnl
+syn match   sudoersUserNetgroupInList contained '+\l\+\>'           nextgroup=@sudoersUserList        skipwhite skipnl
+syn match   sudoersUserAliasInList    contained '\<\u[A-Z0-9_]*\>'  nextgroup=@sudoersUserList        skipwhite skipnl
+
+syn match   sudoersUserName           contained '\<\l\+\>'          nextgroup=@sudoersParameter       skipwhite skipnl
+syn match   sudoersUID                contained '#\d\+\>'           nextgroup=@sudoersParameter       skipwhite skipnl
+syn match   sudoersGroup              contained '%\l\+\>'           nextgroup=@sudoersParameter       skipwhite skipnl
+syn match   sudoersUserNetgroup       contained '+\l\+\>'           nextgroup=@sudoersParameter       skipwhite skipnl
+syn match   sudoersUserAliasRef       contained '\<\u[A-Z0-9_]*\>'  nextgroup=@sudoersParameter       skipwhite skipnl
+
+syn match   sudoersUserNameInSpec     contained '\<\l\+\>'          nextgroup=@sudoersUserSpec        skipwhite skipnl
+syn match   sudoersUIDInSpec          contained '#\d\+\>'           nextgroup=@sudoersUserSpec        skipwhite skipnl
+syn match   sudoersGroupInSpec        contained '%\l\+\>'           nextgroup=@sudoersUserSpec        skipwhite skipnl
+syn match   sudoersUserNetgroupInSpec contained '+\l\+\>'           nextgroup=@sudoersUserSpec        skipwhite skipnl
+syn match   sudoersUserAliasInSpec    contained '\<\u[A-Z0-9_]*\>'  nextgroup=@sudoersUserSpec        skipwhite skipnl
+
+syn match   sudoersUserNameInRunas    contained '\<\l\+\>'          nextgroup=@sudoersUserRunas       skipwhite skipnl
+syn match   sudoersUIDInRunas         contained '#\d\+\>'           nextgroup=@sudoersUserRunas       skipwhite skipnl
+syn match   sudoersGroupInRunas       contained '%\l\+\>'           nextgroup=@sudoersUserRunas       skipwhite skipnl
+syn match   sudoersUserNetgroupInRunas contained '+\l\+\>'          nextgroup=@sudoersUserRunas       skipwhite skipnl
+syn match   sudoersUserAliasInRunas   contained '\<\u[A-Z0-9_]*\>'  nextgroup=@sudoersUserRunas       skipwhite skipnl
+
+syn match   sudoersHostAlias          contained '\<\u[A-Z0-9_]*\>'  nextgroup=sudoersHostAliasEquals  skipwhite skipnl
+syn match   sudoersHostNameInList     contained '\<\l\+\>'          nextgroup=@sudoersHostList        skipwhite skipnl
+syn match   sudoersIPAddrInList       contained '\%(\d\{1,3}\.\)\{3}\d\{1,3}' nextgroup=@sudoersHostList skipwhite skipnl
+syn match   sudoersNetworkInList      contained '\%(\d\{1,3}\.\)\{3}\d\{1,3}\%(/\%(\%(\d\{1,3}\.\)\{3}\d\{1,3}\|\d\+\)\)\=' nextgroup=@sudoersHostList skipwhite skipnl
+syn match   sudoersHostNetgroupInList contained '+\l\+\>'           nextgroup=@sudoersHostList        skipwhite skipnl
+syn match   sudoersHostAliasInList    contained '\<\u[A-Z0-9_]*\>'  nextgroup=@sudoersHostList        skipwhite skipnl
+
+syn match   sudoersHostName           contained '\<\l\+\>'          nextgroup=@sudoersParameter       skipwhite skipnl
+syn match   sudoersIPAddr             contained '\%(\d\{1,3}\.\)\{3}\d\{1,3}' nextgroup=@sudoersParameter skipwhite skipnl
+syn match   sudoersNetwork            contained '\%(\d\{1,3}\.\)\{3}\d\{1,3}\%(/\%(\%(\d\{1,3}\.\)\{3}\d\{1,3}\|\d\+\)\)\=' nextgroup=@sudoersParameter skipwhite skipnl
+syn match   sudoersHostNetgroup       contained '+\l\+\>'           nextgroup=@sudoersParameter       skipwhite skipnl
+syn match   sudoersHostAliasRef       contained '\<\u[A-Z0-9_]*\>'  nextgroup=@sudoersParameter       skipwhite skipnl
+
+syn match   sudoersHostNameInSpec     contained '\<\l\+\>'          nextgroup=@sudoersHostSpec        skipwhite skipnl
+syn match   sudoersIPAddrInSpec       contained '\%(\d\{1,3}\.\)\{3}\d\{1,3}' nextgroup=@sudoersHostSpec skipwhite skipnl
+syn match   sudoersNetworkInSpec      contained '\%(\d\{1,3}\.\)\{3}\d\{1,3}\%(/\%(\%(\d\{1,3}\.\)\{3}\d\{1,3}\|\d\+\)\)\=' nextgroup=@sudoersHostSpec skipwhite skipnl
+syn match   sudoersHostNetgroupInSpec contained '+\l\+\>'           nextgroup=@sudoersHostSpec        skipwhite skipnl
+syn match   sudoersHostAliasInSpec    contained '\<\u[A-Z0-9_]*\>'  nextgroup=@sudoersHostSpec        skipwhite skipnl
+
+syn match   sudoersCmndAlias          contained '\<\u[A-Z0-9_]*\>'  nextgroup=sudoersCmndAliasEquals  skipwhite skipnl
+syn match   sudoersCmndNameInList     contained '[^[:space:],:=\\]\+\%(\\[[:space:],:=\\][^[:space:],:=\\]*\)*' nextgroup=@sudoersCmndList,sudoersCommandEmpty,sudoersCommandArgs skipwhite
+syn match   sudoersCmndAliasInList    contained '\<\u[A-Z0-9_]*\>'  nextgroup=@sudoersCmndList        skipwhite skipnl
+
+syn match   sudoersCmndNameInSpec     contained '[^[:space:],:=\\]\+\%(\\[[:space:],:=\\][^[:space:],:=\\]*\)*' nextgroup=@sudoersCmndSpec,sudoersCommandEmptyInSpec,sudoersCommandArgsInSpec skipwhite
+syn match   sudoersCmndAliasInSpec    contained '\<\u[A-Z0-9_]*\>'  nextgroup=@sudoersCmndSpec        skipwhite skipnl
+
+syn match   sudoersUserAliasEquals  contained '=' nextgroup=@sudoersUserInList  skipwhite skipnl
+syn match   sudoersUserListComma    contained ',' nextgroup=@sudoersUserInList  skipwhite skipnl
+syn match   sudoersUserListColon    contained ':' nextgroup=sudoersUserAlias    skipwhite skipnl
+syn cluster sudoersUserList         contains=sudoersUserListComma,sudoersUserListColon
+
+syn match   sudoersUserSpecComma    contained ',' nextgroup=@sudoersUserInSpec  skipwhite skipnl
+syn cluster sudoersUserSpec         contains=sudoersUserSpecComma,@sudoersHostInSpec
+
+syn match   sudoersUserRunasBegin   contained '(' nextgroup=@sudoersUserInRunas skipwhite skipnl
+syn match   sudoersUserRunasComma   contained ',' nextgroup=@sudoersUserInRunas skipwhite skipnl
+syn match   sudoersUserRunasEnd     contained ')' nextgroup=sudoersPASSWD,@sudoersCmndInSpec skipwhite skipnl
+syn cluster sudoersUserRunas        contains=sudoersUserRunasComma,@sudoersUserInRunas,sudoersUserRunasEnd
+
+
+syn match   sudoersHostAliasEquals  contained '=' nextgroup=@sudoersHostInList  skipwhite skipnl
+syn match   sudoersHostListComma    contained ',' nextgroup=@sudoersHostInList  skipwhite skipnl
+syn match   sudoersHostListColon    contained ':' nextgroup=sudoersHostAlias    skipwhite skipnl
+syn cluster sudoersHostList         contains=sudoersHostListComma,sudoersHostListColon
+
+syn match   sudoersHostSpecComma    contained ',' nextgroup=@sudoersHostInSpec  skipwhite skipnl
+syn cluster sudoersHostSpec         contains=sudoersHostSpecComma,sudoersSpecEquals
+
+
+syn match   sudoersCmndAliasEquals  contained '=' nextgroup=@sudoersCmndInList  skipwhite skipnl
+syn match   sudoersCmndListComma    contained ',' nextgroup=@sudoersCmndInList  skipwhite skipnl
+syn match   sudoersCmndListColon    contained ':' nextgroup=sudoersCmndAlias    skipwhite skipnl
+syn cluster sudoersCmndList         contains=sudoersCmndListComma,sudoersCmndListColon
+
+syn match   sudoersCmndSpecComma    contained ',' nextgroup=@sudoersCmndSpecList skipwhite skipnl
+syn match   sudoersCmndSpecColon    contained ':' nextgroup=@sudoersUserInSpec  skipwhite skipnl
+syn cluster sudoersCmndSpec         contains=sudoersCmndSpecComma,sudoersCmndSpecColon
+
+syn cluster sudoersUserInList       contains=sudoersUserNegationInList,sudoersUserNameInList,sudoersUIDInList,sudoersGroupInList,sudoersUserNetgroupInList,sudoersUserAliasInList
+syn cluster sudoersHostInList       contains=sudoersHostNegationInList,sudoersHostNameInList,sudoersIPAddrInList,sudoersNetworkInList,sudoersHostNetgroupInList,sudoersHostAliasInList
+syn cluster sudoersCmndInList       contains=sudoersCmndNegationInList,sudoersCmndNameInList,sudoersCmndAliasInList
+
+syn cluster sudoersUser             contains=sudoersUserNegation,sudoersUserName,sudoersUID,sudoersGroup,sudoersUserNetgroup,sudoersUserAliasRef
+syn cluster sudoersHost             contains=sudoersHostNegation,sudoersHostName,sudoersIPAddr,sudoersNetwork,sudoersHostNetgroup,sudoersHostAliasRef
+
+syn cluster sudoersUserInSpec       contains=sudoersUserNegationInSpec,sudoersUserNameInSpec,sudoersUIDInSpec,sudoersGroupInSpec,sudoersUserNetgroupInSpec,sudoersUserAliasInSpec
+syn cluster sudoersHostInSpec       contains=sudoersHostNegationInSpec,sudoersHostNameInSpec,sudoersIPAddrInSpec,sudoersNetworkInSpec,sudoersHostNetgroupInSpec,sudoersHostAliasInSpec
+syn cluster sudoersUserInRunas      contains=sudoersUserNegationInRunas,sudoersUserNameInRunas,sudoersUIDInRunas,sudoersGroupInRunas,sudoersUserNetgroupInRunas,sudoersUserAliasInRunas
+syn cluster sudoersCmndInSpec       contains=sudoersCmndNegationInSpec,sudoersCmndNameInSpec,sudoersCmndAliasInSpec
+
+syn match   sudoersUserNegationInList contained '!\+' nextgroup=@sudoersUserInList  skipwhite skipnl
+syn match   sudoersHostNegationInList contained '!\+' nextgroup=@sudoersHostInList  skipwhite skipnl
+syn match   sudoersCmndNegationInList contained '!\+' nextgroup=@sudoersCmndInList  skipwhite skipnl
+
+syn match   sudoersUserNegation       contained '!\+' nextgroup=@sudoersUser        skipwhite skipnl
+syn match   sudoersHostNegation       contained '!\+' nextgroup=@sudoersHost        skipwhite skipnl
+
+syn match   sudoersUserNegationInSpec contained '!\+' nextgroup=@sudoersUserInSpec  skipwhite skipnl
+syn match   sudoersHostNegationInSpec contained '!\+' nextgroup=@sudoersHostInSpec  skipwhite skipnl
+syn match   sudoersUserNegationInRunas contained '!\+' nextgroup=@sudoersUserInRunas skipwhite skipnl
+syn match   sudoersCmndNegationInSpec contained '!\+' nextgroup=@sudoersCmndInSpec  skipwhite skipnl
+
+syn match   sudoersCommandArgs      contained '[^[:space:],:=\\]\+\%(\\[[:space:],:=\\][^[:space:],:=\\]*\)*' nextgroup=sudoersCommandArgs,@sudoersCmndList skipwhite
+syn match   sudoersCommandEmpty     contained '""' nextgroup=@sudoersCmndList skipwhite skipnl
+
+syn match   sudoersCommandArgsInSpec contained '[^[:space:],:=\\]\+\%(\\[[:space:],:=\\][^[:space:],:=\\]*\)*' nextgroup=sudoersCommandArgsInSpec,@sudoersCmndSpec skipwhite
+syn match   sudoersCommandEmptyInSpec contained '""' nextgroup=@sudoersCmndSpec skipwhite skipnl
+
+syn keyword sudoersDefaultEntry Defaults nextgroup=sudoersDefaultTypeAt,sudoersDefaultTypeColon,sudoersDefaultTypeGreaterThan,@sudoersParameter skipwhite skipnl
+syn match   sudoersDefaultTypeAt          contained '@' nextgroup=@sudoersHost skipwhite skipnl
+syn match   sudoersDefaultTypeColon       contained ':' nextgroup=@sudoersUser skipwhite skipnl
+syn match   sudoersDefaultTypeGreaterThan contained '>' nextgroup=@sudoersUser skipwhite skipnl
+
+" TODO: could also deal with special characters here
+syn match   sudoersBooleanParameter contained '!' nextgroup=sudoersBooleanParameter skipwhite skipnl
+syn keyword sudoersBooleanParameter contained skipwhite skipnl
+                                  \ always_query_group_plugin
+                                  \ always_set_home
+                                  \ authenticate
+                                  \ closefrom_override
+                                  \ compress_io
+                                  \ env_editor
+                                  \ env_reset
+                                  \ exec_background
+                                  \ fast_glob
+                                  \ fqdn
+                                  \ ignore_audit_errors
+                                  \ ignore_dot
+                                  \ ignore_iolog_errors
+                                  \ ignore_local_sudoers
+                                  \ ignore_logfile_errors
+                                  \ ignore_unknown_defaults
+                                  \ insults
+                                  \ log_host
+                                  \ log_input
+                                  \ log_output
+                                  \ log_year
+                                  \ long_otp_prompt
+                                  \ mail_all_cmnds
+                                  \ mail_always
+                                  \ mail_badpass
+                                  \ mail_no_host
+                                  \ mail_no_perms
+                                  \ mail_no_user
+                                  \ match_group_by_gid
+                                  \ netgroup_tuple
+                                  \ noexec
+                                  \ pam_session
+                                  \ pam_setcred
+                                  \ passprompt_override
+                                  \ path_info
+                                  \ preserve_groups
+                                  \ pwfeedback
+                                  \ requiretty
+                                  \ root_sudo
+                                  \ rootpw
+                                  \ runaspw
+                                  \ set_home
+                                  \ set_logname
+                                  \ set_utmp
+                                  \ setenv
+                                  \ shell_noargs
+                                  \ stay_setuid
+                                  \ sudoedit_checkdir
+                                  \ sudoedit_fellow
+                                  \ syslog_pid
+                                  \ targetpw
+                                  \ tty_tickets
+                                  \ umask_override
+                                  \ use_netgroups
+                                  \ use_pty
+                                  \ user_command_timeouts
+                                  \ utmp_runas
+                                  \ visiblepw
+
+syn keyword sudoersIntegerParameter contained
+                                  \ nextgroup=sudoersIntegerParameterEquals
+                                  \ skipwhite skipnl
+                                  \ closefrom
+                                  \ command_timeout
+                                  \ loglinelen
+                                  \ maxseq
+                                  \ passwd_timeout
+                                  \ passwd_tries
+                                  \ syslog_maxlen
+                                  \ timestamp_timeout
+                                  \ umask
+
+syn keyword sudoersStringParameter  contained
+                                  \ nextgroup=sudoersStringParameterEquals
+                                  \ skipwhite skipnl
+                                  \ askpass
+                                  \ badpass_message
+                                  \ editor
+                                  \ env_file
+                                  \ exempt_group
+                                  \ fdexec
+                                  \ group_plugin
+                                  \ iolog_dir
+                                  \ iolog_file
+                                  \ iolog_flush
+                                  \ iolog_group
+                                  \ iolog_mode
+                                  \ iolog_user
+                                  \ lecture
+                                  \ lecture_file
+                                  \ lecture_status_dir
+                                  \ listpw
+                                  \ logfile
+                                  \ mailerflags
+                                  \ mailerpath
+                                  \ mailfrom
+                                  \ mailsub
+                                  \ mailto
+                                  \ noexec_file
+                                  \ pam_login_service
+                                  \ pam_service
+                                  \ passprompt
+                                  \ restricted_env_file
+                                  \ role
+                                  \ runas_default
+                                  \ secure_path
+                                  \ sudoers_locale
+                                  \ syslog
+                                  \ syslog_badpri
+                                  \ syslog_goodpri
+                                  \ timestamp_type
+                                  \ timestampdir
+                                  \ timestampowner
+                                  \ type
+                                  \ verifypw
+
+syn keyword sudoersListParameter    contained
+                                  \ nextgroup=sudoersListParameterEquals
+                                  \ skipwhite skipnl
+                                  \ env_check
+                                  \ env_delete
+                                  \ env_keep
+
+syn match   sudoersParameterListComma contained ',' nextgroup=@sudoersParameter skipwhite skipnl
+
+syn cluster sudoersParameter        contains=sudoersBooleanParameter,sudoersIntegerParameter,sudoersStringParameter,sudoersListParameter
+
+syn match   sudoersIntegerParameterEquals contained '[+-]\==' nextgroup=sudoersIntegerValue skipwhite skipnl
+syn match   sudoersStringParameterEquals  contained '[+-]\==' nextgroup=sudoersStringValue  skipwhite skipnl
+syn match   sudoersListParameterEquals    contained '[+-]\==' nextgroup=sudoersListValue    skipwhite skipnl
+
+syn match   sudoersIntegerValue contained '\d\+' nextgroup=sudoersParameterListComma skipwhite skipnl
+syn match   sudoersStringValue  contained '[^[:space:],:=\\]*\%(\\[[:space:],:=\\][^[:space:],:=\\]*\)*' nextgroup=sudoersParameterListComma skipwhite skipnl
+syn region  sudoersStringValue  contained start=+"+ skip=+\\"+ end=+"+ nextgroup=sudoersParameterListComma skipwhite skipnl
+syn match   sudoersListValue    contained '[^[:space:],:=\\]*\%(\\[[:space:],:=\\][^[:space:],:=\\]*\)*' nextgroup=sudoersParameterListComma skipwhite skipnl
+syn region  sudoersListValue    contained start=+"+ skip=+\\"+ end=+"+ nextgroup=sudoersParameterListComma skipwhite skipnl
+
+syn match   sudoersPASSWD                   contained '\%(NO\)\=PASSWD:' nextgroup=@sudoersCmndInSpec skipwhite
+
+hi def link sudoersSpecEquals               Operator
+hi def link sudoersTodo                     Todo
+hi def link sudoersComment                  Comment
+hi def link sudoersAlias                    Keyword
+hi def link sudoersUserAlias                Identifier
+hi def link sudoersUserNameInList           String
+hi def link sudoersUIDInList                Number
+hi def link sudoersGroupInList              PreProc
+hi def link sudoersUserNetgroupInList       PreProc
+hi def link sudoersUserAliasInList          PreProc
+hi def link sudoersUserName                 String
+hi def link sudoersUID                      Number
+hi def link sudoersGroup                    PreProc
+hi def link sudoersUserNetgroup             PreProc
+hi def link sudoersUserAliasRef             PreProc
+hi def link sudoersUserNameInSpec           String
+hi def link sudoersUIDInSpec                Number
+hi def link sudoersGroupInSpec              PreProc
+hi def link sudoersUserNetgroupInSpec       PreProc
+hi def link sudoersUserAliasInSpec          PreProc
+hi def link sudoersUserNameInRunas          String
+hi def link sudoersUIDInRunas               Number
+hi def link sudoersGroupInRunas             PreProc
+hi def link sudoersUserNetgroupInRunas      PreProc
+hi def link sudoersUserAliasInRunas         PreProc
+hi def link sudoersHostAlias                Identifier
+hi def link sudoersHostNameInList           String
+hi def link sudoersIPAddrInList             Number
+hi def link sudoersNetworkInList            Number
+hi def link sudoersHostNetgroupInList       PreProc
+hi def link sudoersHostAliasInList          PreProc
+hi def link sudoersHostName                 String
+hi def link sudoersIPAddr                   Number
+hi def link sudoersNetwork                  Number
+hi def link sudoersHostNetgroup             PreProc
+hi def link sudoersHostAliasRef             PreProc
+hi def link sudoersHostNameInSpec           String
+hi def link sudoersIPAddrInSpec             Number
+hi def link sudoersNetworkInSpec            Number
+hi def link sudoersHostNetgroupInSpec       PreProc
+hi def link sudoersHostAliasInSpec          PreProc
+hi def link sudoersCmndAlias                Identifier
+hi def link sudoersCmndNameInList           String
+hi def link sudoersCmndAliasInList          PreProc
+hi def link sudoersCmndNameInSpec           String
+hi def link sudoersCmndAliasInSpec          PreProc
+hi def link sudoersUserAliasEquals          Operator
+hi def link sudoersUserListComma            Delimiter
+hi def link sudoersUserListColon            Delimiter
+hi def link sudoersUserSpecComma            Delimiter
+hi def link sudoersUserRunasBegin           Delimiter
+hi def link sudoersUserRunasComma           Delimiter
+hi def link sudoersUserRunasEnd             Delimiter
+hi def link sudoersHostAliasEquals          Operator
+hi def link sudoersHostListComma            Delimiter
+hi def link sudoersHostListColon            Delimiter
+hi def link sudoersHostSpecComma            Delimiter
+hi def link sudoersCmndAliasEquals          Operator
+hi def link sudoersCmndListComma            Delimiter
+hi def link sudoersCmndListColon            Delimiter
+hi def link sudoersCmndSpecComma            Delimiter
+hi def link sudoersCmndSpecColon            Delimiter
+hi def link sudoersUserNegationInList       Operator
+hi def link sudoersHostNegationInList       Operator
+hi def link sudoersCmndNegationInList       Operator
+hi def link sudoersUserNegation             Operator
+hi def link sudoersHostNegation             Operator
+hi def link sudoersUserNegationInSpec       Operator
+hi def link sudoersHostNegationInSpec       Operator
+hi def link sudoersUserNegationInRunas      Operator
+hi def link sudoersCmndNegationInSpec       Operator
+hi def link sudoersCommandArgs              String
+hi def link sudoersCommandEmpty             Special
+hi def link sudoersDefaultEntry             Keyword
+hi def link sudoersDefaultTypeAt            Special
+hi def link sudoersDefaultTypeColon         Special
+hi def link sudoersDefaultTypeGreaterThan   Special
+hi def link sudoersBooleanParameter         Identifier
+hi def link sudoersIntegerParameter         Identifier
+hi def link sudoersStringParameter          Identifier
+hi def link sudoersListParameter            Identifier
+hi def link sudoersParameterListComma       Delimiter
+hi def link sudoersIntegerParameterEquals   Operator
+hi def link sudoersStringParameterEquals    Operator
+hi def link sudoersListParameterEquals      Operator
+hi def link sudoersIntegerValue             Number
+hi def link sudoersStringValue              String
+hi def link sudoersListValue                String
+hi def link sudoersPASSWD                   Special
+hi def link sudoersInclude                  Statement
+
+let b:current_syntax = "sudoers"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/svn.vim b/syntax/svn.vim
new file mode 100644
index 000000000..6d1fa476e
--- /dev/null
+++ b/syntax/svn.vim
@@ -0,0 +1,60 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svn') == -1
+
+" Vim syntax file
+" Language:     Subversion (svn) commit file
+" Maintainer:   Dmitry Vasiliev <dima at hlabs dot org>
+" URL:          https://github.com/hdima/vim-scripts/blob/master/syntax/svn.vim
+" Last Change:  2013-11-08
+" Filenames:    svn-commit*.tmp
+" Version:      1.10
+
+" Contributors:
+"
+" List of the contributors in alphabetical order:
+"
+"   A. S. Budden
+"   Ingo Karkat
+"   Myk Taylor
+"   Stefano Zacchiroli
+
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
+  finish
+endif
+
+syn spell toplevel
+
+syn match svnFirstLine  "\%^.*" nextgroup=svnRegion,svnBlank skipnl
+syn match svnSummary    "^.\{0,50\}" contained containedin=svnFirstLine nextgroup=svnOverflow contains=@Spell
+syn match svnOverflow   ".*" contained contains=@Spell
+syn match svnBlank      "^.*" contained contains=@Spell
+
+syn region svnRegion    end="\%$" matchgroup=svnDelimiter start="^--.*--$" contains=svnRemoved,svnRenamed,svnAdded,svnModified,svnProperty,@NoSpell
+syn match svnRemoved    "^D    .*$" contained contains=@NoSpell
+syn match svnRenamed    "^R[ M][ U][ +] .*$" contained contains=@NoSpell
+syn match svnAdded      "^A[ M][ U][ +] .*$" contained contains=@NoSpell
+syn match svnModified   "^M[ M][ U]  .*$" contained contains=@NoSpell
+syn match svnProperty   "^_M[ U]  .*$" contained contains=@NoSpell
+
+" Synchronization.
+syn sync clear
+syn sync match svnSync  grouphere svnRegion "^--.*--$"me=s-1
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet.
+
+hi def link svnSummary     Keyword
+hi def link svnBlank       Error
+
+hi def link svnRegion      Comment
+hi def link svnDelimiter   NonText
+hi def link svnRemoved     Constant
+hi def link svnAdded       Identifier
+hi def link svnModified    Special
+hi def link svnProperty    Special
+hi def link svnRenamed     Special
+
+
+let b:current_syntax = "svn"
+
+endif
diff --git a/syntax/swiftgyb.vim b/syntax/swiftgyb.vim
new file mode 100644
index 000000000..c9a8851bc
--- /dev/null
+++ b/syntax/swiftgyb.vim
@@ -0,0 +1,28 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swiftgyb') == -1
+
+" This source file is part of the Swift.org open source project
+"
+" Copyright (c) 2014 - 2020 Apple Inc. and the Swift project authors
+" Licensed under Apache License v2.0 with Runtime Library Exception
+"
+" See https://swift.org/LICENSE.txt for license information
+" See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+"
+" Vim syntax file
+" Language: gyb on swift
+"
+" Vim maintainer: Emir SARI <bitigchi@me.com>
+
+runtime! syntax/swift.vim
+unlet b:current_syntax
+
+syn include @Python syntax/python.vim
+syn region pythonCode matchgroup=gybPythonCode start=+^ *%+ end=+$+ contains=@Python keepend
+syn region pythonCode matchgroup=gybPythonCode start=+%{+ end=+}%+ contains=@Python keepend
+syn match gybPythonCode /\${[^}]*}/
+hi def link gybPythonCode CursorLineNr
+
+let b:current_syntax = "swiftgyb"
+
+
+endif
diff --git a/syntax/sysctl.vim b/syntax/sysctl.vim
new file mode 100644
index 000000000..0e8eb0bf7
--- /dev/null
+++ b/syntax/sysctl.vim
@@ -0,0 +1,43 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sysctl') == -1
+
+" Vim syntax file
+" Language:             sysctl.conf(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2011-05-02
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match   sysctlBegin   display '^'
+                          \ nextgroup=sysctlToken,sysctlComment skipwhite
+
+syn match   sysctlToken   contained display '[^=]\+'
+                          \ nextgroup=sysctlTokenEq skipwhite
+
+syn match   sysctlTokenEq contained display '=' nextgroup=sysctlValue skipwhite
+
+syn region  sysctlValue   contained display oneline
+                          \ matchgroup=sysctlValue start='\S'
+                          \ matchgroup=Normal end='\s*$'
+
+syn keyword sysctlTodo    contained TODO FIXME XXX NOTE
+
+syn region  sysctlComment display oneline start='^\s*[#;]' end='$'
+                          \ contains=sysctlTodo,@Spell
+
+hi def link sysctlTodo    Todo
+hi def link sysctlComment Comment
+hi def link sysctlToken   Identifier
+hi def link sysctlTokenEq Operator
+hi def link sysctlValue   String
+
+let b:current_syntax = "sysctl"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/systemverilog.vim b/syntax/systemverilog.vim
new file mode 100644
index 000000000..83eecaa71
--- /dev/null
+++ b/syntax/systemverilog.vim
@@ -0,0 +1,89 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemverilog') == -1
+
+" Vim syntax file
+" Language:    SystemVerilog
+" Maintainer:  kocha <kocha.lsifrontend@gmail.com>
+" Last Change: 12-Aug-2013. 
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+" Read in Verilog syntax files
+runtime! syntax/verilog.vim
+unlet b:current_syntax
+
+" IEEE1800-2005
+syn keyword systemverilogStatement   always_comb always_ff always_latch
+syn keyword systemverilogStatement   class endclass new
+syn keyword systemverilogStatement   virtual local const protected
+syn keyword systemverilogStatement   package endpackage
+syn keyword systemverilogStatement   rand randc constraint randomize
+syn keyword systemverilogStatement   with inside dist
+syn keyword systemverilogStatement   sequence endsequence randsequence 
+syn keyword systemverilogStatement   srandom
+syn keyword systemverilogStatement   logic bit byte
+syn keyword systemverilogStatement   int longint shortint
+syn keyword systemverilogStatement   struct packed
+syn keyword systemverilogStatement   final
+syn keyword systemverilogStatement   import export
+syn keyword systemverilogStatement   context pure 
+syn keyword systemverilogStatement   void shortreal chandle string
+syn keyword systemverilogStatement   clocking endclocking iff
+syn keyword systemverilogStatement   interface endinterface modport
+syn keyword systemverilogStatement   cover covergroup coverpoint endgroup
+syn keyword systemverilogStatement   property endproperty
+syn keyword systemverilogStatement   program endprogram
+syn keyword systemverilogStatement   bins binsof illegal_bins ignore_bins
+syn keyword systemverilogStatement   alias matches solve static assert
+syn keyword systemverilogStatement   assume super before expect bind
+syn keyword systemverilogStatement   extends null tagged extern this
+syn keyword systemverilogStatement   first_match throughout timeprecision
+syn keyword systemverilogStatement   timeunit type union 
+syn keyword systemverilogStatement   uwire var cross ref wait_order intersect
+syn keyword systemverilogStatement   wildcard within
+
+syn keyword systemverilogTypeDef     typedef enum
+
+syn keyword systemverilogConditional randcase
+syn keyword systemverilogConditional unique priority
+
+syn keyword systemverilogRepeat      return break continue
+syn keyword systemverilogRepeat      do foreach
+
+syn keyword systemverilogLabel       join_any join_none forkjoin
+
+" IEEE1800-2009 add
+syn keyword systemverilogStatement   checker endchecker
+syn keyword systemverilogStatement   accept_on reject_on
+syn keyword systemverilogStatement   sync_accept_on sync_reject_on
+syn keyword systemverilogStatement   eventually nexttime until until_with
+syn keyword systemverilogStatement   s_always s_eventually s_nexttime s_until s_until_with
+syn keyword systemverilogStatement   let untyped
+syn keyword systemverilogStatement   strong weak
+syn keyword systemverilogStatement   restrict global implies
+
+syn keyword systemverilogConditional unique0
+
+" IEEE1800-2012 add
+syn keyword systemverilogStatement   implements
+syn keyword systemverilogStatement   interconnect soft nettype
+
+" Define the default highlighting.
+
+" The default highlighting.
+hi def link systemverilogStatement       Statement
+hi def link systemverilogTypeDef         TypeDef
+hi def link systemverilogConditional     Conditional
+hi def link systemverilogRepeat          Repeat
+hi def link systemverilogLabel           Label
+hi def link systemverilogGlobal          Define
+hi def link systemverilogNumber          Number
+
+
+let b:current_syntax = "systemverilog"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/tags.vim b/syntax/tags.vim
new file mode 100644
index 000000000..9853f3955
--- /dev/null
+++ b/syntax/tags.vim
@@ -0,0 +1,35 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tags') == -1
+
+" Language:		tags
+" Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Last Change:	Oct 26, 2016
+" Version:		8
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TAGS
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match	tagName		"^[^\t]\+"	skipwhite	nextgroup=tagPath
+syn match	tagPath		"[^\t]\+"	contained	skipwhite	nextgroup=tagAddr	contains=tagBaseFile
+syn match	tagBaseFile	"[a-zA-Z_]\+[\.a-zA-Z_0-9]*\t"me=e-1		contained
+syn match	tagAddr		"\d*"		contained skipwhite nextgroup=tagComment
+syn region	tagAddr				matchgroup=tagDelim start="/" skip="\(\\\\\)*\\/" matchgroup=tagDelim end="$\|/" oneline contained skipwhite nextgroup=tagComment
+syn match	tagComment	";.*$"		contained contains=tagField
+syn match	tagComment	"^!_TAG_.*$"
+syn match	tagField			contained "[a-z]*:"
+
+" Define the default highlighting.
+if !exists("skip_drchip_tags_inits")
+ hi def link tagBaseFile	PreProc
+ hi def link tagComment		Comment
+ hi def link tagDelim		Delimiter
+ hi def link tagField		Number
+ hi def link tagName		Identifier
+ hi def link tagPath		PreProc
+endif
+
+let b:current_syntax = "tags"
+
+endif
diff --git a/syntax/tak.vim b/syntax/tak.vim
new file mode 100644
index 000000000..275a57c93
--- /dev/null
+++ b/syntax/tak.vim
@@ -0,0 +1,123 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tak') == -1
+
+" Vim syntax file
+" Language:     TAK2, TAK3, TAK2000 thermal modeling input file
+" Maintainer:   Adrian Nagle, anagle@ball.com
+" Last Change:  2003 May 11
+" Filenames:    *.tak
+" URL:		http://www.naglenet.org/vim/syntax/tak.vim
+" MAIN URL:     http://www.naglenet.org/vim/
+
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+
+
+" Ignore case
+syn case ignore
+
+
+
+"
+"
+" Begin syntax definitions for tak input file.
+"
+
+" Force free-form fortran format
+let fortran_free_source=1
+
+" Load FORTRAN syntax file
+runtime! syntax/fortran.vim
+unlet b:current_syntax
+
+
+
+" Define keywords for TAK and TAKOUT
+syn keyword takOptions  AUTODAMP CPRINT CSGDUMP GPRINT HPRINT LODTMP
+syn keyword takOptions  LOGIC LPRINT NCVPRINT PLOTQ QPRINT QDUMP
+syn keyword takOptions  SUMMARY SOLRTN UID DICTIONARIES
+
+syn keyword takRoutine  SSITER FWDWRD FWDBCK BCKWRD
+
+syn keyword takControl  ABSZRO BACKUP DAMP DTIMEI DTIMEL DTIMEH IFC
+syn keyword takControl  MAXTEMP NLOOPS NLOOPT NODELIST OUTPUT PLOT
+syn keyword takControl  SCALE SIGMA SSCRIT TIMEND TIMEN TIMEO TRCRIT
+syn keyword takControl  PLOT
+
+syn keyword takSolids   PLATE CYL
+syn keyword takSolidsArg   ID MATNAM NTYPE TEMP XL YL ZL ISTRN ISTRG NNX
+syn keyword takSolidsArg   NNY NNZ INCX INCY INCZ IAK IAC DIFF ARITH BOUN
+syn keyword takSolidsArg   RMIN RMAX AXMAX NNR NNTHETA INCR INCTHETA END
+
+syn case ignore
+
+syn keyword takMacro    fac pstart pstop
+syn keyword takMacro    takcommon fstart fstop
+
+syn keyword takIdentifier  flq flx gen ncv per sim siv stf stv tvd tvs
+syn keyword takIdentifier  tvt pro thm
+
+
+
+" Define matches for TAK
+syn match  takFortran     "^F[0-9 ]"me=e-1
+syn match  takMotran      "^M[0-9 ]"me=e-1
+
+syn match  takComment     "^C.*$"
+syn match  takComment     "^R.*$"
+syn match  takComment     "\$.*$"
+
+syn match  takHeader      "^header[^,]*"
+
+syn match  takIncludeFile "include \+[^ ]\+"hs=s+8 contains=fortranInclude
+
+syn match  takInteger     "-\=\<[0-9]*\>"
+syn match  takFloat       "-\=\<[0-9]*\.[0-9]*"
+syn match  takScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
+
+syn match  takEndData     "END OF DATA"
+
+if exists("thermal_todo")
+  execute 'syn match  takTodo ' . '"^'.thermal_todo.'.*$"'
+else
+  syn match  takTodo	    "^?.*$"
+endif
+
+
+
+" Define the default highlighting
+" Only when an item doesn't have highlighting yet
+
+hi def link takMacro		Macro
+hi def link takOptions		Special
+hi def link takRoutine		Type
+hi def link takControl		Special
+hi def link takSolids		Special
+hi def link takSolidsArg		Statement
+hi def link takIdentifier		Identifier
+
+hi def link takFortran		PreProc
+hi def link takMotran		PreProc
+
+hi def link takComment		Comment
+hi def link takHeader		Typedef
+hi def link takIncludeFile		Type
+hi def link takInteger		Number
+hi def link takFloat		Float
+hi def link takScientific		Float
+
+hi def link takEndData		Macro
+
+hi def link takTodo		Todo
+
+
+
+let b:current_syntax = "tak"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/taskdata.vim b/syntax/taskdata.vim
new file mode 100644
index 000000000..de9648979
--- /dev/null
+++ b/syntax/taskdata.vim
@@ -0,0 +1,49 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'taskdata') == -1
+
+" Vim syntax file
+" Language:	task data
+" Maintainer:	John Florian <jflorian@doubledog.org>
+" Updated:	Wed Jul  8 19:46:20 EDT 2009
+
+
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+" Key Names for values.
+syn keyword taskdataKey		description due end entry imask mask parent
+syn keyword taskdataKey		priority project recur start status tags uuid
+syn match taskdataKey		"annotation_\d\+"
+syn match taskdataUndo		"^time.*$"
+syn match taskdataUndo		"^\(old \|new \|---\)"
+
+" Values associated with key names.
+"
+" Strings
+syn region taskdataString	matchgroup=Normal start=+"+ end=+"+
+			\	contains=taskdataEncoded,taskdataUUID,@Spell
+"
+" Special Embedded Characters (e.g., "&comma;")
+syn match taskdataEncoded	"&\a\+;" contained
+" UUIDs
+syn match taskdataUUID		"\x\{8}-\(\x\{4}-\)\{3}\x\{12}" contained
+
+
+" The default methods for highlighting.  Can be overridden later.
+hi def link taskdataEncoded	Function
+hi def link taskdataKey		Statement
+hi def link taskdataString 	String
+hi def link taskdataUUID 	Special
+hi def link taskdataUndo 	Type
+
+let b:current_syntax = "taskdata"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim:noexpandtab
+
+endif
diff --git a/syntax/taskedit.vim b/syntax/taskedit.vim
new file mode 100644
index 000000000..96f4a050b
--- /dev/null
+++ b/syntax/taskedit.vim
@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'taskedit') == -1
+
+" Vim syntax file
+" Language:	support for 'task 42 edit'
+" Maintainer:	John Florian <jflorian@doubledog.org>
+" Updated:	Wed Jul  8 19:46:32 EDT 2009
+
+
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+syn match taskeditHeading	"^\s*#\s*Name\s\+Editable details\s*$" contained
+syn match taskeditHeading	"^\s*#\s*-\+\s\+-\+\s*$" contained
+syn match taskeditReadOnly	"^\s*#\s*\(UU\)\?ID:.*$" contained
+syn match taskeditReadOnly	"^\s*#\s*Status:.*$" contained
+syn match taskeditReadOnly	"^\s*#\s*i\?Mask:.*$" contained
+syn match taskeditKey		"^ *.\{-}:" nextgroup=taskeditString
+syn match taskeditComment	"^\s*#.*$"
+			\	contains=taskeditReadOnly,taskeditHeading
+syn match taskeditString	".*$" contained contains=@Spell
+
+
+" The default methods for highlighting.  Can be overridden later.
+hi def link taskeditComment	Comment
+hi def link taskeditHeading	Function
+hi def link taskeditKey		Statement
+hi def link taskeditReadOnly	Special
+hi def link taskeditString	String
+
+let b:current_syntax = "taskedit"
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim:noexpandtab
+
+endif
diff --git a/syntax/tcl.vim b/syntax/tcl.vim
new file mode 100644
index 000000000..6946bcc78
--- /dev/null
+++ b/syntax/tcl.vim
@@ -0,0 +1,278 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
+
+" Vim syntax file
+" Language:	Tcl/Tk
+" Maintainer:	Taylor Venable <taylor@metasyntax.net>
+" 		(previously Brett Cannon <brett@python.org>)
+" 		(previously Dean Copsey <copsey@cs.ucdavis.edu>)
+"		(previously Matt Neumann <mattneu@purpleturtle.com>)
+"		(previously Allan Kelly <allan@fruitloaf.co.uk>)
+" Original:	Robin Becker <robin@jessikat.demon.co.uk>
+" Last Change:	2014-02-12
+" Version:	1.14
+" URL:		http://bitbucket.org/taylor_venable/metasyntax/src/tip/Config/vim/syntax/tcl.vim
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Basic Tcl commands: http://www.tcl.tk/man/tcl8.6/TclCmd/contents.htm
+syn keyword tclCommand		after append array bgerror binary cd chan clock close concat
+syn keyword tclCommand		dde dict encoding eof error eval exec exit expr fblocked
+syn keyword tclCommand		fconfigure fcopy file fileevent flush format gets glob
+syn keyword tclCommand		global history http incr info interp join lappend lassign
+syn keyword tclCommand		lindex linsert list llength lmap load lrange lrepeat
+syn keyword tclCommand		lreplace lreverse lsearch lset lsort memory my namespace
+syn keyword tclCommand		next nextto open package pid puts pwd read refchan regexp
+syn keyword tclCommand		registry regsub rename scan seek self set socket source
+syn keyword tclCommand		split string subst tell time trace unknown unload unset
+syn keyword tclCommand		update uplevel upvar variable vwait
+
+" The 'Tcl Standard Library' commands: http://www.tcl.tk/man/tcl8.6/TclCmd/library.htm
+syn keyword tclCommand		auto_execok auto_import auto_load auto_mkindex auto_reset
+syn keyword tclCommand		auto_qualify tcl_findLibrary parray tcl_endOfWord
+syn keyword tclCommand		tcl_startOfNextWord tcl_startOfPreviousWord
+syn keyword tclCommand		tcl_wordBreakAfter tcl_wordBreakBefore
+
+" Global variables used by Tcl: http://www.tcl.tk/man/tcl8.6/TclCmd/tclvars.htm
+syn keyword tclVars		auto_path env errorCode errorInfo tcl_library tcl_patchLevel
+syn keyword tclVars		tcl_pkgPath tcl_platform tcl_precision tcl_rcFileName
+syn keyword tclVars		tcl_traceCompile tcl_traceExec tcl_wordchars
+syn keyword tclVars		tcl_nonwordchars tcl_version argc argv argv0 tcl_interactive
+
+" Strings which expr accepts as boolean values, aside from zero / non-zero.
+syn keyword tclBoolean		true false on off yes no
+
+syn keyword tclProcCommand	apply coroutine proc return tailcall yield yieldto
+syn keyword tclConditional	if then else elseif switch
+syn keyword tclConditional	catch try throw finally
+syn keyword tclLabel		default
+syn keyword tclRepeat		while for foreach break continue
+
+syn keyword tcltkSwitch	contained	insert create polygon fill outline tag
+
+" WIDGETS
+" commands associated with widgets
+syn keyword tcltkWidgetSwitch contained background highlightbackground insertontime cget
+syn keyword tcltkWidgetSwitch contained selectborderwidth borderwidth highlightcolor insertwidth
+syn keyword tcltkWidgetSwitch contained selectforeground cursor highlightthickness padx setgrid
+syn keyword tcltkWidgetSwitch contained exportselection insertbackground pady takefocus
+syn keyword tcltkWidgetSwitch contained font insertborderwidth relief xscrollcommand
+syn keyword tcltkWidgetSwitch contained foreground insertofftime selectbackground yscrollcommand
+syn keyword tcltkWidgetSwitch contained height spacing1 spacing2 spacing3
+syn keyword tcltkWidgetSwitch contained state tabs width wrap
+" button
+syn keyword tcltkWidgetSwitch contained command default
+" canvas
+syn keyword tcltkWidgetSwitch contained closeenough confine scrollregion xscrollincrement yscrollincrement orient
+" checkbutton, radiobutton
+syn keyword tcltkWidgetSwitch contained indicatoron offvalue onvalue selectcolor selectimage state variable
+" entry, frame
+syn keyword tcltkWidgetSwitch contained show class colormap container visual
+" listbox, menu
+syn keyword tcltkWidgetSwitch contained selectmode postcommand selectcolor tearoff tearoffcommand title type
+" menubutton, message
+syn keyword tcltkWidgetSwitch contained direction aspect justify
+" scale
+syn keyword tcltkWidgetSwitch contained bigincrement digits from length resolution showvalue sliderlength sliderrelief tickinterval to
+" scrollbar
+syn keyword tcltkWidgetSwitch contained activerelief elementborderwidth
+" image
+syn keyword tcltkWidgetSwitch contained delete names types create
+" variable reference
+	" ::optional::namespaces
+syn match tclVarRef "$\(\(::\)\?\([[:alnum:]_]*::\)*\)\a[[:alnum:]_]*"
+	" ${...} may contain any character except '}'
+syn match tclVarRef "${[^}]*}"
+
+" Used to facilitate hack to utilize string background for certain color
+" schemes, e.g. inkpot and lettuce.
+syn cluster tclVarRefC add=tclVarRef
+syn cluster tclSpecialC add=tclSpecial
+
+" The syntactic unquote-splicing replacement for [expand].
+syn match tclExpand '\s{\*}'
+syn match tclExpand '^{\*}'
+
+" menu, mane add
+syn keyword tcltkWidgetSwitch contained active end last none cascade checkbutton command radiobutton separator
+syn keyword tcltkWidgetSwitch contained activebackground actveforeground accelerator background bitmap columnbreak
+syn keyword tcltkWidgetSwitch contained font foreground hidemargin image indicatoron label menu offvalue onvalue
+syn keyword tcltkWidgetSwitch contained selectcolor selectimage state underline value variable
+syn keyword tcltkWidgetSwitch contained add clone configure delete entrycget entryconfigure index insert invoke
+syn keyword tcltkWidgetSwitch contained post postcascade type unpost yposition activate
+"syn keyword tcltkWidgetSwitch contained
+"syn match tcltkWidgetSwitch contained
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\<button\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1 contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\<scale\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\<canvas\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\<checkbutton\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\<entry\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\<frame\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\<image\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\<listbox\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\<menubutton\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\<message\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\<radiobutton\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1 contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\<scrollbar\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+" These words are dual purpose.
+" match switches
+"syn match tcltkWidgetSwitch contained "-text"hs=s+1
+syn match tcltkWidgetSwitch contained "-text\(var\)\?"hs=s+1
+syn match tcltkWidgetSwitch contained "-menu"hs=s+1
+syn match tcltkWidgetSwitch contained "-label"hs=s+1
+" match commands - 2 lines for pretty match.
+"variable
+" Special case - If a number follows a variable region, it must be at the end of
+" the pattern, by definition. Therefore, (1) either include a number as the region
+" end and exclude tclNumber from the contains list, or (2) make variable
+" keepend. As (1) would put variable out of step with everything else, use (2).
+syn region tcltkCommand matchgroup=tcltkCommandColor start="^\<variable\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tclString,tclNumber,tclVarRef,tcltkCommand
+syn region tcltkCommand matchgroup=tcltkCommandColor start="\s\<variable\>\|\[\<variable\>"hs=s+1 matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tclString,tclNumber,tclVarRef,tcltkCommand
+" menu
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="^\<menu\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\s\<menu\>\|\[\<menu\>"hs=s+1 matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+" label
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="^\<label\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\s\<label\>\|\[\<label\>"hs=s+1 matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+" text
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="^\<text\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidget,tcltkWidgetSwitch,tcltkSwitch,tclNumber,tclVarRef,tclString
+syn region tcltkWidget matchgroup=tcltkWidgetColor start="\s\<text\>\|\[\<text\>"hs=s+1 matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidget,tcltkWidgetSwitch,tclString,tcltkSwitch,tclNumber,tclVarRef
+
+" This isn't contained (I don't think) so it's OK to just associate with the Color group.
+" TODO: This could be wrong.
+syn keyword tcltkWidgetColor	toplevel
+
+
+syn region tcltkPackConf matchgroup=tcltkPackConfColor start="\<configure\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tcltkPackConfSwitch,tclNumber,tclVarRef keepend
+syn region tcltkPackConf matchgroup=tcltkPackConfColor start="\<cget\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"me=e-1  contains=tclLineContinue,tcltkWidgetSwitch,tclString,tcltkSwitch,tcltkPackConfSwitch,tclNumber,tclVarRef
+
+
+" NAMESPACE
+" commands associated with namespace
+syn keyword tcltkNamespaceSwitch contained children code current delete eval
+syn keyword tcltkNamespaceSwitch contained export forget import inscope origin
+syn keyword tcltkNamespaceSwitch contained parent qualifiers tail which command variable
+syn region tcltkCommand matchgroup=tcltkCommandColor start="\<namespace\>" matchgroup=NONE skip="^\s*$" end="{\|}\|]\|\"\|[^\\]*\s*$"me=e-1  contains=tclLineContinue,tcltkNamespaceSwitch
+
+" EXPR
+" commands associated with expr
+syn keyword tcltkMaths contained	abs acos asin atan atan2 bool ceil cos cosh double entier
+syn keyword tcltkMaths contained	exp floor fmod hypot int isqrt log log10 max min pow rand
+syn keyword tcltkMaths contained	round sin sinh sqrt srand tan tanh wide
+
+syn region tcltkCommand matchgroup=tcltkCommandColor start="\<expr\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"me=e-1  contains=tclLineContinue,tcltkMaths,tclNumber,tclVarRef,tclString,tcltlWidgetSwitch,tcltkCommand,tcltkPackConf
+
+" format
+syn region tcltkCommand matchgroup=tcltkCommandColor start="\<format\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"me=e-1  contains=tclLineContinue,tcltkMaths,tclNumber,tclVarRef,tclString,tcltlWidgetSwitch,tcltkCommand,tcltkPackConf
+
+" PACK
+" commands associated with pack
+syn keyword tcltkPackSwitch	contained	forget info propogate slaves
+syn keyword tcltkPackConfSwitch	contained	after anchor before expand fill in ipadx ipady padx pady side
+syn region tcltkCommand matchgroup=tcltkCommandColor start="\<pack\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkPackSwitch,tcltkPackConf,tcltkPackConfSwitch,tclNumber,tclVarRef,tclString,tcltkCommand keepend
+
+" STRING
+" commands associated with string
+syn keyword tcltkStringSwitch	contained	compare first index last length match range tolower toupper trim trimleft trimright wordstart wordend
+syn region tcltkCommand matchgroup=tcltkCommandColor start="\<string\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkStringSwitch,tclNumber,tclVarRef,tclString,tcltkCommand
+
+" ARRAY
+" commands associated with array
+syn keyword tcltkArraySwitch	contained	anymore donesearch exists get names nextelement size startsearch set
+" match from command name to ] or EOL
+syn region tcltkCommand matchgroup=tcltkCommandColor start="\<array\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkArraySwitch,tclNumber,tclVarRef,tclString,tcltkCommand
+
+" LSORT
+" switches for lsort
+syn keyword tcltkLsortSwitch	contained	ascii dictionary integer real command increasing decreasing index
+" match from command name to ] or EOL
+syn region tcltkCommand matchgroup=tcltkCommandColor start="\<lsort\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkLsortSwitch,tclNumber,tclVarRef,tclString,tcltkCommand
+
+syn keyword tclTodo contained	TODO
+
+" Sequences which are backslash-escaped: http://www.tcl.tk/man/tcl8.5/TclCmd/Tcl.htm#M16
+" Octal, hexadecimal, unicode codepoints, and the classics.
+" Tcl takes as many valid characters in a row as it can, so \xAZ in a string is newline followed by 'Z'.
+syn match   tclSpecial contained '\\\([0-7]\{1,3}\|x\x\{1,2}\|u\x\{1,4}\|[abfnrtv]\)'
+syn match   tclSpecial contained '\\[\[\]\{\}\"\$]'
+
+" Command appearing inside another command or inside a string.
+syn region tclEmbeddedStatement	start='\[' end='\]' contained contains=tclCommand,tclNumber,tclLineContinue,tclString,tclVarRef,tclEmbeddedStatement
+" A string needs the skip argument as it may legitimately contain \".
+" Match at start of line
+syn region  tclString		  start=+^"+ end=+"+ contains=@tclSpecialC skip=+\\\\\|\\"+
+"Match all other legal strings.
+syn region  tclString		  start=+[^\\]"+ms=s+1  end=+"+ contains=@tclSpecialC,@tclVarRefC,tclEmbeddedStatement skip=+\\\\\|\\"+
+
+" Line continuation is backslash immediately followed by newline.
+syn match tclLineContinue '\\$'
+
+if exists('g:tcl_warn_continuation')
+    syn match tclNotLineContinue '\\\s\+$'
+endif
+
+"integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match  tclNumber		"\<\d\+\(u\=l\=\|lu\|f\)\>"
+"floating point number, with dot, optional exponent
+syn match  tclNumber		"\<\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, starting with a dot, optional exponent
+syn match  tclNumber		"\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+syn match  tclNumber		"\<\d\+e[-+]\=\d\+[fl]\=\>"
+"hex number
+syn match  tclNumber		"0x[0-9a-f]\+\(u\=l\=\|lu\)\>"
+"syn match  tclIdentifier	"\<[a-z_][a-z0-9_]*\>"
+syn case match
+
+syn region  tclComment		start="^\s*\#" skip="\\$" end="$" contains=tclTodo
+syn region  tclComment		start=/;\s*\#/hs=s+1 skip="\\$" end="$" contains=tclTodo
+
+"syn match tclComment /^\s*\#.*$/
+"syn match tclComment /;\s*\#.*$/hs=s+1
+
+"syn sync ccomment tclComment
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link tcltkSwitch		Special
+hi def link tclExpand		Special
+hi def link tclLabel		Label
+hi def link tclConditional		Conditional
+hi def link tclRepeat		Repeat
+hi def link tclNumber		Number
+hi def link tclError		Error
+hi def link tclCommand		Statement
+hi def link tclProcCommand		Type
+hi def link tclString		String
+hi def link tclComment		Comment
+hi def link tclSpecial		Special
+hi def link tclTodo		Todo
+" Below here are the commands and their options.
+hi def link tcltkCommandColor	Statement
+hi def link tcltkWidgetColor	Structure
+hi def link tclLineContinue	WarningMsg
+if exists('g:tcl_warn_continuation')
+hi def link tclNotLineContinue	ErrorMsg
+endif
+hi def link tcltkStringSwitch	Special
+hi def link tcltkArraySwitch	Special
+hi def link tcltkLsortSwitch	Special
+hi def link tcltkPackSwitch	Special
+hi def link tcltkPackConfSwitch	Special
+hi def link tcltkMaths		Special
+hi def link tcltkNamespaceSwitch	Special
+hi def link tcltkWidgetSwitch	Special
+hi def link tcltkPackConfColor	Identifier
+hi def link tclVarRef		Identifier
+
+
+let b:current_syntax = "tcl"
+
+" vim: ts=8 noet nolist
+
+endif
diff --git a/syntax/template.vim b/syntax/template.vim
new file mode 100644
index 000000000..32b8bafed
--- /dev/null
+++ b/syntax/template.vim
@@ -0,0 +1,19 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'template') == -1
+
+" Vim syntax file
+" Language:	Generic template
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2019 May 06
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Known template types are very similar to HTML, E.g. golang and "Xfire User
+" Interface Template"
+" If you know how to recognize a more specific type for *.tmpl suggest a
+" change to runtime/scripts.vim.
+runtime! syntax/html.vim
+
+endif
diff --git a/syntax/teraterm.vim b/syntax/teraterm.vim
new file mode 100644
index 000000000..bfa0d3a8e
--- /dev/null
+++ b/syntax/teraterm.vim
@@ -0,0 +1,144 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'teraterm') == -1
+
+" Vim syntax file
+" Language:	Tera Term Language (TTL)
+"		Based on Tera Term Version 4.100
+" Maintainer:	Ken Takata
+" URL:		https://github.com/k-takata/vim-teraterm
+" Last Change:	2018-08-31
+" Filenames:	*.ttl
+" License:	VIM License
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+syn case ignore
+
+syn region ttlComment	start=";" end="$" contains=@Spell
+syn region ttlComment	start="/\*" end="\*/" contains=@Spell
+syn region ttlFirstComment	start="/\*" end="\*/" contained contains=@Spell
+			\ nextgroup=ttlStatement,ttlFirstComment
+
+syn match ttlCharacter	"#\%(\d\+\|\$\x\+\)\>"
+syn match ttlNumber	"\%(\<\d\+\|\$\x\+\)\>"
+syn match ttlString	"'[^']*'" contains=@Spell
+syn match ttlString	'"[^"]*"' contains=@Spell
+syn cluster ttlConstant contains=ttlCharacter,ttlNumber,ttlString
+
+syn match ttlLabel	":\s*\w\{1,32}\>"
+
+syn keyword ttlOperator	and or xor not
+
+syn match ttlVar	"\<groupmatchstr\d\>"
+syn match ttlVar	"\<param\d\>"
+syn keyword ttlVar	inputstr matchstr paramcnt params result timeout mtimeout
+
+
+syn match ttlLine nextgroup=ttlStatement "^"
+syn match ttlStatement contained "\s*"
+			\ nextgroup=ttlIf,ttlElseIf,ttlConditional,ttlRepeat,
+			\ ttlFirstComment,ttlComment,ttlLabel,@ttlCommand
+
+syn cluster ttlCommand contains=ttlControlCommand,ttlCommunicationCommand,
+			\ ttlStringCommand,ttlFileCommand,ttlPasswordCommand,
+			\ ttlMiscCommand
+
+
+syn keyword ttlIf contained nextgroup=ttlIfExpression if
+syn keyword ttlElseIf contained nextgroup=ttlElseIfExpression elseif
+
+syn match ttlIfExpression contained "\s.*"
+		\ contains=@ttlConstant,ttlVar,ttlOperator,ttlComment,ttlThen,
+		\ @ttlCommand
+syn match ttlElseIfExpression contained "\s.*"
+		\ contains=@ttlConstant,ttlVar,ttlOperator,ttlComment,ttlThen
+
+syn keyword ttlThen contained then
+syn keyword ttlConditional contained else endif
+
+syn keyword ttlRepeat contained for next until enduntil while endwhile
+syn match ttlRepeat contained
+			\ "\<\%(do\|loop\)\%(\s\+\%(while\|until\)\)\?\>"
+syn keyword ttlControlCommand contained
+			\ break call continue end execcmnd exit goto include
+			\ mpause pause return
+
+
+syn keyword ttlCommunicationCommand contained
+			\ bplusrecv bplussend callmenu changedir clearscreen
+			\ closett connect cygconnect disconnect dispstr
+			\ enablekeyb flushrecv gethostname getmodemstatus
+			\ gettitle kmtfinish kmtget kmtrecv kmtsend loadkeymap
+			\ logautoclosemode logclose loginfo logopen logpause
+			\ logrotate logstart logwrite quickvanrecv
+			\ quickvansend recvln restoresetup scprecv scpsend
+			\ send sendbreak sendbroadcast sendfile sendkcode
+			\ sendln sendlnbroadcast sendlnmulticast sendmulticast
+			\ setbaud setdebug setdtr setecho setflowctrl
+			\ setmulticastname setrts setspeed setsync settitle
+			\ showtt testlink unlink wait wait4all waitevent
+			\ waitln waitn waitrecv waitregex xmodemrecv
+			\ xmodemsend ymodemrecv ymodemsend zmodemrecv
+			\ zmodemsend
+syn keyword ttlStringCommand contained
+			\ code2str expandenv int2str regexoption sprintf
+			\ sprintf2 str2code str2int strcompare strconcat
+			\ strcopy strinsert strjoin strlen strmatch strremove
+			\ strreplace strscan strspecial strsplit strtrim
+			\ tolower toupper
+syn keyword ttlFileCommand contained
+			\ basename dirname fileclose fileconcat filecopy
+			\ filecreate filedelete filelock filemarkptr fileopen
+			\ filereadln fileread filerename filesearch fileseek
+			\ fileseekback filestat filestrseek filestrseek2
+			\ filetruncate fileunlock filewrite filewriteln
+			\ findfirst findnext findclose foldercreate
+			\ folderdelete foldersearch getdir getfileattr makepath
+			\ setdir setfileattr
+syn keyword ttlPasswordCommand contained
+			\ delpassword getpassword ispassword passwordbox
+			\ setpassword
+syn keyword ttlMiscCommand contained
+			\ beep bringupbox checksum8 checksum8file checksum16
+			\ checksum16file checksum32 checksum32file closesbox
+			\ clipb2var crc16 crc16file crc32 crc32file exec
+			\ dirnamebox filenamebox getdate getenv getipv4addr
+			\ getipv6addr getspecialfolder gettime getttdir getver
+			\ ifdefined inputbox intdim listbox messagebox random
+			\ rotateleft rotateright setdate setdlgpos setenv
+			\ setexitcode settime show statusbox strdim uptime
+			\ var2clipb yesnobox
+
+
+hi def link ttlCharacter Character
+hi def link ttlNumber Number
+hi def link ttlComment Comment
+hi def link ttlFirstComment Comment
+hi def link ttlString String
+hi def link ttlLabel Label
+hi def link ttlIf Conditional
+hi def link ttlElseIf Conditional
+hi def link ttlThen Conditional
+hi def link ttlConditional Conditional
+hi def link ttlRepeat Repeat
+hi def link ttlControlCommand Keyword
+hi def link ttlVar Identifier
+hi def link ttlOperator Operator
+hi def link ttlCommunicationCommand Keyword
+hi def link ttlStringCommand Keyword
+hi def link ttlFileCommand Keyword
+hi def link ttlPasswordCommand Keyword
+hi def link ttlMiscCommand Keyword
+
+let b:current_syntax = "teraterm"
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: ts=8 sw=2 sts=2
+
+endif
diff --git a/syntax/terminfo.vim b/syntax/terminfo.vim
new file mode 100644
index 000000000..45ae51269
--- /dev/null
+++ b/syntax/terminfo.vim
@@ -0,0 +1,97 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terminfo') == -1
+
+" Vim syntax file
+" Language:             terminfo(5) definition
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match terminfoKeywords      '[,=#|]'
+
+syn keyword terminfoTodo        contained TODO FIXME XXX NOTE
+
+syn region  terminfoComment     display oneline start='^#' end='$'
+                                \ contains=terminfoTodo,@Spell
+
+syn match   terminfoNumbers     '\<[0-9]\+\>'
+
+syn match   terminfoSpecialChar '\\\(\o\{3}\|[Eenlrtbfs^\,:0]\)'
+syn match   terminfoSpecialChar '\^\a'
+
+syn match   terminfoDelay       '$<[0-9]\+>'
+
+syn keyword terminfoBooleans    bw am bce ccc xhp xhpa cpix crxw xt xenl eo gn
+                                \ hc chts km daisy hs hls in lpix da db mir
+                                \ msgr nxon xsb npc ndscr nrrmc os mc5i xcpa
+                                \ sam eslok hz ul xon
+
+syn keyword terminfoNumerics    cols it lh lw lines lm xmc ma colors pairs wnum
+                                \ ncv nlab pb vt wsl bitwin bitype bufsz btns
+                                \ spinh spinv maddr mjump mcs npins orc orhi
+                                \ orl orvi cps widcs
+
+syn keyword terminfoStrings     acsc cbt bel cr cpi lpi chr cvr csr rmp tbc mgc
+                                \ clear el1 el ed hpa cmdch cwin cup cud1 home
+                                \ civis cub1 mrcup cnorm cuf1 ll cuu1 cvvis
+                                \ defc dch1 dl1 dial dsl dclk hd enacs smacs
+                                \ smam blink bold smcup smdc dim swidm sdrfq
+                                \ smir sitm slm smicm snlq snrmq prot rev
+                                \ invis sshm smso ssubm ssupm smul sum smxon
+                                \ ech rmacs rmam sgr0 rmcup rmdc rwidm rmir
+                                \ ritm rlm rmicm rshm rmso rsubm rsupm rmul
+                                \ rum rmxon pause hook flash ff fsl wingo hup
+                                \ is1 is2 is3 if iprog initc initp ich1 il1 ip
+                                \ ka1 ka3 kb2 kbs kbeg kcbt kc1 kc3 kcan ktbc
+                                \ kclr kclo kcmd kcpy kcrt kctab kdch1 kdl1
+                                \ kcud1 krmir kend kent kel ked kext kfnd khlp
+                                \ khome kich1 kil1 kcub1 kll kmrk kmsg kmov
+                                \ knxt knp kopn kopt kpp kprv kprt krdo kref
+                                \ krfr krpl krst kres kcuf1 ksav kBEG kCAN
+                                \ kCMD kCPY kCRT kDC kDL kslt kEND kEOL kEXT
+                                \ kind kFND kHLP kHOM kIC kLFT kMSG kMOV kNXT
+                                \ kOPT kPRV kPRT kri kRDO kRPL kRIT kRES kSAV
+                                \ kSPD khts kUND kspd kund kcuu1 rmkx smkx
+                                \ lf0 lf1 lf10 lf2 lf3 lf4 lf5 lf6 lf7 lf8 lf9
+                                \ fln rmln smln rmm smm mhpa mcud1 mcub1 mcuf1
+                                \ mvpa mcuu1 nel porder oc op pad dch dl cud
+                                \ mcud ich indn il cub mcub cuf mcuf rin cuu
+                                \ mccu pfkey pfloc pfx pln mc0 mc5p mc4 mc5
+                                \ pulse qdial rmclk rep rfi rs1 rs2 rs3 rf rc
+                                \ vpa sc ind ri scs sgr setbsmgb smgbp sclk
+                                \ scp setb setf smgl smglp smgr smgrp hts smgt
+                                \ smgtp wind sbim scsd rbim rcsd subcs supcs
+                                \ ht docr tsl tone uc hu u0 u1 u2 u3 u4 u5 u6
+                                \ u7 u8 u9 wait xoffc xonc zerom scesa bicr
+                                \ binel birep csnm csin colornm defbi devt
+                                \ dispc endbi smpch smsc rmpch rmsc getm kmous
+                                \ minfo pctrm pfxl reqmp scesc s0ds s1ds s2ds
+                                \ s3ds setab setaf setcolor smglr slines smgtb
+                                \ ehhlm elhlm erhlm ethlm evhlm sgr1 slengthsL
+syn match terminfoStrings       display '\<kf\([0-9]\|[0-5][0-9]\|6[0-3]\)\>'
+
+syn match terminfoParameters    '%[%dcspl+*/mAO&|^=<>!~i?te;-]'
+syn match terminfoParameters    "%\('[A-Z]'\|{[0-9]\{1,2}}\|p[1-9]\|P[a-z]\|g[A-Z]\)"
+
+hi def link terminfoComment     Comment
+hi def link terminfoTodo        Todo
+hi def link terminfoNumbers     Number
+hi def link terminfoSpecialChar SpecialChar
+hi def link terminfoDelay       Special
+hi def link terminfoBooleans    Type
+hi def link terminfoNumerics    Type
+hi def link terminfoStrings     Type
+hi def link terminfoParameters  Keyword
+hi def link terminfoKeywords    Keyword
+
+let b:current_syntax = "terminfo"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/tex.vim b/syntax/tex.vim
new file mode 100644
index 000000000..a48c454af
--- /dev/null
+++ b/syntax/tex.vim
@@ -0,0 +1,1344 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
+
+" Vim syntax file
+" Language:	TeX
+" Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Last Change:	Jun 29, 2020
+" Version:	119
+" URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
+"
+" Notes: {{{1
+"
+" 1. If you have a \begin{verbatim} that appears to overrun its boundaries,
+"    use %stopzone.
+"
+" 2. Run-on equations ($..$ and $$..$$, particularly) can also be stopped
+"    by suitable use of %stopzone.
+"
+" 3. If you have a slow computer, you may wish to modify
+"
+"	syn sync maxlines=200
+"	syn sync minlines=50
+"
+"    to values that are more to your liking.
+"
+" 4. There is no match-syncing for $...$ and $$...$$; hence large
+"    equation blocks constructed that way may exhibit syncing problems.
+"    (there's no difference between begin/end patterns)
+"
+" 5. If you have the variable "g:tex_no_error" defined then none of the
+"    lexical error-checking will be done.
+"
+"    ie. let g:tex_no_error=1
+"
+" 6. Please see  :help latex-syntax  for information on
+"      syntax folding           :help tex-folding
+"      spell checking           :help tex-nospell
+"      commands and mathzones   :help tex-runon
+"      new command highlighting :help tex-morecommands
+"      error highlighting       :help tex-error
+"      new math groups          :help tex-math
+"      new styles               :help tex-style
+"      using conceal mode       :help tex-conceal
+
+" Version Clears: {{{1
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+scriptencoding utf-8
+
+" by default, enable all region-based highlighting
+let s:tex_fast= "bcmMprsSvV"
+if exists("g:tex_fast")
+ if type(g:tex_fast) != 1
+  " g:tex_fast exists and is not a string, so
+  " turn off all optional region-based highighting
+  let s:tex_fast= ""
+ else
+  let s:tex_fast= g:tex_fast
+ endif
+endif
+
+" let user determine which classes of concealment will be supported
+"   a=accents/ligatures d=delimiters m=math symbols  g=Greek  s=superscripts/subscripts
+if !exists("g:tex_conceal")
+ let s:tex_conceal= 'abdmgsS'
+else
+ let s:tex_conceal= g:tex_conceal
+endif
+if !exists("g:tex_superscripts")
+ let s:tex_superscripts= '[0-9a-zA-W.,:;+-<>/()=]'
+else
+ let s:tex_superscripts= g:tex_superscripts
+endif
+if !exists("g:tex_subscripts")
+ let s:tex_subscripts= '[0-9aehijklmnoprstuvx,+-/().]'
+else
+ let s:tex_subscripts= g:tex_subscripts
+endif
+
+" Determine whether or not to use "*.sty" mode {{{1
+" The user may override the normal determination by setting
+"   g:tex_stylish to 1      (for    "*.sty" mode)
+"    or to           0 else (normal "*.tex" mode)
+" or on a buffer-by-buffer basis with b:tex_stylish
+let s:extfname=expand("%:e")
+if exists("g:tex_stylish")
+ let b:tex_stylish= g:tex_stylish
+elseif !exists("b:tex_stylish")
+ if s:extfname == "sty" || s:extfname == "cls" || s:extfname == "clo" || s:extfname == "dtx" || s:extfname == "ltx"
+  let b:tex_stylish= 1
+ else
+  let b:tex_stylish= 0
+ endif
+endif
+
+" handle folding {{{1
+if !exists("g:tex_fold_enabled")
+ let s:tex_fold_enabled= 0
+elseif g:tex_fold_enabled && !has("folding")
+ let s:tex_fold_enabled= 0
+ echomsg "Ignoring g:tex_fold_enabled=".g:tex_fold_enabled."; need to re-compile vim for +fold support"
+else
+ let s:tex_fold_enabled= 1
+endif
+if s:tex_fold_enabled && &fdm == "manual"
+ setl fdm=syntax
+endif
+if s:tex_fold_enabled && has("folding")
+ com! -nargs=* TexFold <args> fold 
+else
+ com! -nargs=* TexFold <args> 
+endif
+
+" (La)TeX keywords: uses the characters 0-9,a-z,A-Z,192-255 only... {{{1
+" but _ is the only one that causes problems.
+" One may override this iskeyword setting by providing
+" g:tex_isk
+if exists("g:tex_isk")
+ if b:tex_stylish && g:tex_isk !~ '@'
+  let b:tex_isk= '@,'.g:tex_isk
+ else
+  let b:tex_isk= g:tex_isk
+ endif
+elseif b:tex_stylish
+ let b:tex_isk="@,48-57,a-z,A-Z,192-255"
+else
+ let b:tex_isk="48-57,a-z,A-Z,192-255"
+endif
+if (v:version == 704 && has("patch-7.4.1142")) || v:version > 704
+ exe "syn iskeyword ".b:tex_isk
+else
+ exe "setl isk=".b:tex_isk
+endif
+if exists("g:tex_no_error") && g:tex_no_error
+ let s:tex_no_error= 1
+else
+ let s:tex_no_error= 0
+endif
+if exists("g:tex_comment_nospell") && g:tex_comment_nospell
+ let s:tex_comment_nospell= 1
+else
+ let s:tex_comment_nospell= 0
+endif
+if exists("g:tex_nospell") && g:tex_nospell
+ let s:tex_nospell = 1
+else
+ let s:tex_nospell = 0
+endif
+if exists("g:tex_matchcheck")
+ let s:tex_matchcheck= g:tex_matchcheck
+else
+ let s:tex_matchcheck= '[({[]'
+endif
+if exists("g:tex_excludematcher")
+ let s:tex_excludematcher= g:tex_excludematcher
+else
+ let s:tex_excludematcher= 0
+endif
+
+" Clusters: {{{1
+" --------
+syn cluster texCmdGroup			contains=texCmdBody,texComment,texDefParm,texDelimiter,texDocType,texInput,texLength,texLigature,texMathDelim,texMathOper,texNewCmd,texNewEnv,texRefZone,texSection,texBeginEnd,texBeginEndName,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,@texMathZones
+if !s:tex_no_error
+ syn cluster texCmdGroup		add=texMathError
+endif
+syn cluster texEnvGroup			contains=texMatcher,texMathDelim,texSpecialChar,texStatement
+syn cluster texFoldGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texBeginEnd,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,@texMathZones,texTitle,texAbstract,texBoldStyle,texItalStyle,texEmphStyle,texNoSpell
+syn cluster texBoldGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texBeginEnd,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,@texMathZones,texTitle,texAbstract,texBoldStyle,texBoldItalStyle,texNoSpell
+syn cluster texItalGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texBeginEnd,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,@texMathZones,texTitle,texAbstract,texItalStyle,texEmphStyle,texItalBoldStyle,texNoSpell
+if !s:tex_excludematcher
+ syn cluster texBoldGroup add=texMatcher
+ syn cluster texItalGroup add=texMatcher
+endif
+if !s:tex_nospell
+ syn cluster texMatchGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texBoldStyle,texBoldItalStyle,texItalStyle,texItalBoldStyle,texZone,texInputFile,texOption,@Spell
+ syn cluster texMatchNMGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcherNM,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texBoldStyle,texBoldItalStyle,texItalStyle,texItalBoldStyle,texZone,texInputFile,texOption,@Spell
+ syn cluster texStyleGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texBoldStyle,texBoldItalStyle,texItalStyle,texItalBoldStyle,texZone,texInputFile,texOption,texStyleStatement,texStyleMatcher,@Spell
+else
+ syn cluster texMatchGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption
+ syn cluster texMatchNMGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcherNM,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption
+ syn cluster texStyleGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texStyleStatement,texStyleMatcher
+endif
+syn cluster texPreambleMatchGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcherNM,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTitle,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texMathZoneZ
+syn cluster texRefGroup			contains=texMatcher,texComment,texDelimiter
+if !exists("g:tex_no_math")
+ syn cluster texPreambleMatchGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcherNM,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTitle,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texMathZoneZ
+ syn cluster texMathZones		contains=texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ
+ syn cluster texMatchGroup		add=@texMathZones
+ syn cluster texMathDelimGroup		contains=texMathDelimBad,texMathDelimKey,texMathDelimSet1,texMathDelimSet2
+ syn cluster texMathMatchGroup		contains=@texMathZones,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMathDelim,texMathMatcher,texMathOper,texNewCmd,texNewEnv,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone
+ syn cluster texMathZoneGroup		contains=texComment,texDelimiter,texLength,texMathDelim,texMathMatcher,texMathOper,texMathSymbol,texMathText,texRefZone,texSpecialChar,texStatement,texTypeSize,texTypeStyle
+ if !s:tex_no_error
+  syn cluster texMathMatchGroup		add=texMathError
+  syn cluster texMathZoneGroup		add=texMathError
+ endif
+ syn cluster texMathZoneGroup		add=@NoSpell
+ " following used in the \part \chapter \section \subsection \subsubsection
+ " \paragraph \subparagraph \author \title highlighting
+ syn cluster texDocGroup		contains=texPartZone,@texPartGroup
+ syn cluster texPartGroup		contains=texChapterZone,texSectionZone,texParaZone
+ syn cluster texChapterGroup		contains=texSectionZone,texParaZone
+ syn cluster texSectionGroup		contains=texSubSectionZone,texParaZone
+ syn cluster texSubSectionGroup		contains=texSubSubSectionZone,texParaZone
+ syn cluster texSubSubSectionGroup	contains=texParaZone
+ syn cluster texParaGroup		contains=texSubParaZone
+ if has("conceal") && &enc == 'utf-8'
+  syn cluster texMathZoneGroup		add=texGreek,texSuperscript,texSubscript,texMathSymbol
+  syn cluster texMathMatchGroup		add=texGreek,texSuperscript,texSubscript,texMathSymbol
+ endif
+endif
+
+" Try to flag {}, [], and () mismatches: {{{1
+if s:tex_fast =~# 'm'
+  if !s:tex_no_error
+   if s:tex_matchcheck =~ '{'
+    syn region texMatcher	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchGroup,texError
+    syn region texMatcherNM	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchNMGroup,texError
+   endif
+   if s:tex_matchcheck =~ '\['
+    syn region texMatcher	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchGroup,texError,@NoSpell
+    syn region texMatcherNM	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchNMGroup,texError,@NoSpell
+   endif
+  else
+   if s:tex_matchcheck =~ '{'
+    syn region texMatcher	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchGroup
+    syn region texMatcherNM	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchNMGroup
+   endif
+   if s:tex_matchcheck =~ '\['
+    syn region texMatcher	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchGroup
+    syn region texMatcherNM	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchNMGroup
+   endif
+  endif
+  if s:tex_matchcheck =~ '('
+   if !s:tex_nospell
+    syn region texParen		start="("	end=")"								transparent contains=@texMatchGroup,@Spell
+   else
+    syn region texParen		start="("	end=")"								transparent contains=@texMatchGroup
+   endif
+  endif
+endif
+if !s:tex_no_error
+ if s:tex_matchcheck =~ '('
+  syn match  texError		"[}\]]"
+ else
+  syn match  texError		"[}\])]"
+ endif
+endif
+if s:tex_fast =~# 'M'
+  if !exists("g:tex_no_math")
+   if !s:tex_no_error
+    syn match  texMathError	"}"	contained
+   endif
+   syn region texMathMatcher	matchgroup=Delimiter	start="{"          skip="\%(\\\\\)*\\}"     end="}" end="%stopzone\>"	contained contains=@texMathMatchGroup
+  endif
+endif
+
+" TeX/LaTeX keywords: {{{1
+" Instead of trying to be All Knowing, I just match \..alphameric..
+" Note that *.tex files may not have "@" in their \commands
+if exists("g:tex_tex") || b:tex_stylish
+  syn match texStatement	"\\[a-zA-Z@]\+"
+else
+  syn match texStatement	"\\\a\+"
+  if !s:tex_no_error
+   syn match texError		"\\\a*@[a-zA-Z@]*"
+  endif
+endif
+
+" TeX/LaTeX delimiters: {{{1
+syn match texDelimiter		"&"
+syn match texDelimiter		"\\\\"
+
+" Tex/Latex Options: {{{1
+syn match texOption		"[^\\]\zs#\d\+\|^#\d\+"
+
+" texAccent (tnx to Karim Belabas) avoids annoying highlighting for accents: {{{1
+if b:tex_stylish
+  syn match texAccent		"\\[bcdvuH][^a-zA-Z@]"me=e-1
+  syn match texLigature		"\\\([ijolL]\|ae\|oe\|ss\|AA\|AE\|OE\)[^a-zA-Z@]"me=e-1
+else
+  syn match texAccent		"\\[bcdvuH]\A"me=e-1
+  syn match texLigature		"\\\([ijolL]\|ae\|oe\|ss\|AA\|AE\|OE\)\A"me=e-1
+endif
+syn match texAccent		"\\[bcdvuH]$"
+syn match texAccent		+\\[=^.\~"`']+
+syn match texAccent		+\\['=t'.c^ud"vb~Hr]{\a}+
+syn match texLigature		"\\\([ijolL]\|ae\|oe\|ss\|AA\|AE\|OE\)$"
+
+
+" \begin{}/\end{} section markers: {{{1
+syn match  texBeginEnd		"\\begin\>\|\\end\>" nextgroup=texBeginEndName
+if s:tex_fast =~# 'm'
+  syn region texBeginEndName		matchgroup=Delimiter	start="{"		end="}"	contained	nextgroup=texBeginEndModifier	contains=texComment
+  syn region texBeginEndModifier	matchgroup=Delimiter	start="\["		end="]"	contained	contains=texComment,@texMathZones,@NoSpell
+endif
+
+" \documentclass, \documentstyle, \usepackage: {{{1
+syn match  texDocType		"\\documentclass\>\|\\documentstyle\>\|\\usepackage\>"	nextgroup=texBeginEndName,texDocTypeArgs
+if s:tex_fast =~# 'm'
+  syn region texDocTypeArgs	matchgroup=Delimiter start="\[" end="]"			contained	nextgroup=texBeginEndName	contains=texComment,@NoSpell
+endif
+
+" Preamble syntax-based folding support: {{{1
+if s:tex_fold_enabled && has("folding")
+ syn region texPreamble	transparent fold	start='\zs\\documentclass\>' end='\ze\\begin{document}'	contains=texStyle,@texPreambleMatchGroup
+endif
+
+" TeX input: {{{1
+syn match texInput		"\\input\s\+[a-zA-Z/.0-9_^]\+"hs=s+7				contains=texStatement
+syn match texInputFile		"\\include\(graphics\|list\)\=\(\[.\{-}\]\)\=\s*{.\{-}}"	contains=texStatement,texInputCurlies,texInputFileOpt
+syn match texInputFile		"\\\(epsfig\|input\|usepackage\)\s*\(\[.*\]\)\={.\{-}}"		contains=texStatement,texInputCurlies,texInputFileOpt
+syn match texInputCurlies	"[{}]"								contained
+if s:tex_fast =~# 'm'
+ syn region texInputFileOpt	matchgroup=Delimiter start="\[" end="\]"			contained	contains=texComment
+endif
+
+" Type Styles (LaTeX 2.09): {{{1
+syn match texTypeStyle		"\\rm\>"
+syn match texTypeStyle		"\\em\>"
+syn match texTypeStyle		"\\bf\>"
+syn match texTypeStyle		"\\it\>"
+syn match texTypeStyle		"\\sl\>"
+syn match texTypeStyle		"\\sf\>"
+syn match texTypeStyle		"\\sc\>"
+syn match texTypeStyle		"\\tt\>"
+
+" Type Styles: attributes, commands, families, etc (LaTeX2E): {{{1
+if s:tex_conceal !~# 'b'
+ syn match texTypeStyle		"\\textbf\>"
+ syn match texTypeStyle		"\\textit\>"
+ syn match texTypeStyle		"\\emph\>"
+endif
+syn match texTypeStyle		"\\textmd\>"
+syn match texTypeStyle		"\\textrm\>"
+
+syn match texTypeStyle		"\\mathbb\>"
+syn match texTypeStyle		"\\mathbf\>"
+syn match texTypeStyle		"\\mathcal\>"
+syn match texTypeStyle		"\\mathfrak\>"
+syn match texTypeStyle		"\\mathit\>"
+syn match texTypeStyle		"\\mathnormal\>"
+syn match texTypeStyle		"\\mathrm\>"
+syn match texTypeStyle		"\\mathsf\>"
+syn match texTypeStyle		"\\mathtt\>"
+
+syn match texTypeStyle		"\\rmfamily\>"
+syn match texTypeStyle		"\\sffamily\>"
+syn match texTypeStyle		"\\ttfamily\>"
+
+syn match texTypeStyle		"\\itshape\>"
+syn match texTypeStyle		"\\scshape\>"
+syn match texTypeStyle		"\\slshape\>"
+syn match texTypeStyle		"\\upshape\>"
+
+syn match texTypeStyle		"\\bfseries\>"
+syn match texTypeStyle		"\\mdseries\>"
+
+" Some type sizes: {{{1
+syn match texTypeSize		"\\tiny\>"
+syn match texTypeSize		"\\scriptsize\>"
+syn match texTypeSize		"\\footnotesize\>"
+syn match texTypeSize		"\\small\>"
+syn match texTypeSize		"\\normalsize\>"
+syn match texTypeSize		"\\large\>"
+syn match texTypeSize		"\\Large\>"
+syn match texTypeSize		"\\LARGE\>"
+syn match texTypeSize		"\\huge\>"
+syn match texTypeSize		"\\Huge\>"
+
+" Spacecodes (TeX'isms): {{{1
+" \mathcode`\^^@="2201  \delcode`\(="028300  \sfcode`\)=0 \uccode`X=`X  \lccode`x=`x
+syn match texSpaceCode		"\\\(math\|cat\|del\|lc\|sf\|uc\)code`"me=e-1 nextgroup=texSpaceCodeChar
+syn match texSpaceCodeChar    "`\\\=.\(\^.\)\==\(\d\|\"\x\{1,6}\|`.\)"	contained
+
+" Sections, subsections, etc: {{{1
+if s:tex_fast =~# 'p'
+ if !s:tex_nospell
+  TexFold syn region texDocZone			matchgroup=texSection start='\\begin\s*{\s*document\s*}' end='\\end\s*{\s*document\s*}'											contains=@texFoldGroup,@texDocGroup,@Spell
+  TexFold syn region texPartZone		matchgroup=texSection start='\\part\>'			 end='\ze\s*\\\%(part\>\|end\s*{\s*document\s*}\)'								contains=@texFoldGroup,@texPartGroup,@Spell
+  TexFold syn region texChapterZone		matchgroup=texSection start='\\chapter\>'		 end='\ze\s*\\\%(chapter\>\|part\>\|end\s*{\s*document\s*}\)'							contains=@texFoldGroup,@texChapterGroup,@Spell
+  TexFold syn region texSectionZone		matchgroup=texSection start='\\section\>'		 end='\ze\s*\\\%(section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)'					contains=@texFoldGroup,@texSectionGroup,@Spell
+  TexFold syn region texSubSectionZone		matchgroup=texSection start='\\subsection\>'		 end='\ze\s*\\\%(\%(sub\)\=section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)'				contains=@texFoldGroup,@texSubSectionGroup,@Spell
+  TexFold syn region texSubSubSectionZone	matchgroup=texSection start='\\subsubsection\>'		 end='\ze\s*\\\%(\%(sub\)\{,2}section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)'				contains=@texFoldGroup,@texSubSubSectionGroup,@Spell
+  TexFold syn region texParaZone		matchgroup=texSection start='\\paragraph\>'		 end='\ze\s*\\\%(paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)'			contains=@texFoldGroup,@texParaGroup,@Spell
+  TexFold syn region texSubParaZone		matchgroup=texSection start='\\subparagraph\>'		 end='\ze\s*\\\%(\%(sub\)\=paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)'	contains=@texFoldGroup,@Spell
+  TexFold syn region texTitle			matchgroup=texSection start='\\\%(author\|title\)\>\s*{' end='}'													contains=@texFoldGroup,@Spell
+  TexFold syn region texAbstract		matchgroup=texSection start='\\begin\s*{\s*abstract\s*}' end='\\end\s*{\s*abstract\s*}'											contains=@texFoldGroup,@Spell
+ else
+  TexFold syn region texDocZone			matchgroup=texSection start='\\begin\s*{\s*document\s*}' end='\\end\s*{\s*document\s*}'											contains=@texFoldGroup,@texDocGroup
+  TexFold syn region texPartZone		matchgroup=texSection start='\\part\>'			 end='\ze\s*\\\%(part\>\|end\s*{\s*document\s*}\)'								contains=@texFoldGroup,@texPartGroup
+  TexFold syn region texChapterZone		matchgroup=texSection start='\\chapter\>'		 end='\ze\s*\\\%(chapter\>\|part\>\|end\s*{\s*document\s*}\)'							contains=@texFoldGroup,@texChapterGroup
+  TexFold syn region texSectionZone		matchgroup=texSection start='\\section\>'		 end='\ze\s*\\\%(section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)'					contains=@texFoldGroup,@texSectionGroup
+  TexFold syn region texSubSectionZone		matchgroup=texSection start='\\subsection\>'		 end='\ze\s*\\\%(\%(sub\)\=section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)'				contains=@texFoldGroup,@texSubSectionGroup
+  TexFold syn region texSubSubSectionZone	matchgroup=texSection start='\\subsubsection\>'		 end='\ze\s*\\\%(\%(sub\)\{,2}section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)'				contains=@texFoldGroup,@texSubSubSectionGroup
+  TexFold syn region texParaZone		matchgroup=texSection start='\\paragraph\>'		 end='\ze\s*\\\%(paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)'			contains=@texFoldGroup,@texParaGroup
+  TexFold syn region texSubParaZone		matchgroup=texSection start='\\subparagraph\>'		 end='\ze\s*\\\%(\%(sub\)\=paragraph\>\|\%(sub\)*section\>\|chapter\>\|part\>\|end\s*{\s*document\s*}\)'	contains=@texFoldGroup
+  TexFold syn region texTitle			matchgroup=texSection start='\\\%(author\|title\)\>\s*{' end='}'													contains=@texFoldGroup
+  TexFold syn region texAbstract		matchgroup=texSection start='\\begin\s*{\s*abstract\s*}' end='\\end\s*{\s*abstract\s*}'											contains=@texFoldGroup
+  endif
+endif
+
+" particular support for bold and italic {{{1
+if s:tex_fast =~# 'b'
+  if s:tex_conceal =~# 'b'
+   if !exists("g:tex_nospell") || !g:tex_nospell
+    syn region texBoldStyle	matchgroup=texTypeStyle start="\\textbf\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texBoldGroup,@Spell
+    syn region texBoldItalStyle	matchgroup=texTypeStyle start="\\textit\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texItalGroup,@Spell
+    syn region texItalStyle	matchgroup=texTypeStyle start="\\textit\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texItalGroup,@Spell
+    syn region texItalBoldStyle	matchgroup=texTypeStyle start="\\textbf\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texBoldGroup,@Spell
+    syn region texEmphStyle	matchgroup=texTypeStyle start="\\emph\s*{"   matchgroup=texTypeStyle  end="}" concealends contains=@texItalGroup,@Spell
+    syn region texEmphStyle	matchgroup=texTypeStyle start="\\texts[cfl]\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texBoldGroup,@Spell
+    syn region texEmphStyle	matchgroup=texTypeStyle start="\\textup\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texBoldGroup,@Spell
+    syn region texEmphStyle	matchgroup=texTypeStyle start="\\texttt\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texBoldGroup,@Spell
+   else                                                                                              
+    syn region texBoldStyle	matchgroup=texTypeStyle start="\\textbf\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texBoldGroup
+    syn region texBoldItalStyle	matchgroup=texTypeStyle start="\\textit\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texItalGroup
+    syn region texItalStyle	matchgroup=texTypeStyle start="\\textit\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texItalGroup
+    syn region texItalBoldStyle	matchgroup=texTypeStyle start="\\textbf\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texBoldGroup
+    syn region texEmphStyle	matchgroup=texTypeStyle start="\\emph\s*{"   matchgroup=texTypeStyle  end="}" concealends contains=@texItalGroup
+    syn region texEmphStyle	matchgroup=texTypeStyle start="\\texts[cfl]\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texEmphGroup
+    syn region texEmphStyle	matchgroup=texTypeStyle start="\\textup\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texEmphGroup
+    syn region texEmphStyle	matchgroup=texTypeStyle start="\\texttt\s*{" matchgroup=texTypeStyle  end="}" concealends contains=@texEmphGroup
+   endif
+  endif
+endif
+
+" Bad Math (mismatched): {{{1
+if !exists("g:tex_no_math") && !s:tex_no_error
+ syn match texBadMath		"\\end\s*{\s*\(array\|[bBpvV]matrix\|split\|smallmatrix\)\s*}"
+ syn match texBadMath		"\\end\s*{\s*\(displaymath\|equation\|eqnarray\|math\)\*\=\s*}"
+ syn match texBadMath		"\\[\])]"
+endif
+
+" Math Zones: {{{1
+if !exists("g:tex_no_math")
+ " TexNewMathZone: function creates a mathzone with the given suffix and mathzone name. {{{2
+ "                 Starred forms are created if starform is true.  Starred
+ "                 forms have syntax group and synchronization groups with a
+ "                 "S" appended.  Handles: cluster, syntax, sync, and highlighting.
+ fun! TexNewMathZone(sfx,mathzone,starform)
+   let grpname  = "texMathZone".a:sfx
+   let syncname = "texSyncMathZone".a:sfx
+   if s:tex_fold_enabled
+    let foldcmd= " fold"
+   else
+    let foldcmd= ""
+   endif
+   exe "syn cluster texMathZones add=".grpname
+   if s:tex_fast =~# 'M'
+    exe 'syn region '.grpname.' start='."'".'\\begin\s*{\s*'.a:mathzone.'\s*}'."'".' end='."'".'\\end\s*{\s*'.a:mathzone.'\s*}'."'".' keepend contains=@texMathZoneGroup'.foldcmd
+    exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
+    exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
+   endif
+   exe 'hi def link '.grpname.' texMath'
+   if a:starform
+    let grpname  = "texMathZone".a:sfx.'S'
+    let syncname = "texSyncMathZone".a:sfx.'S'
+    exe "syn cluster texMathZones add=".grpname
+    if s:tex_fast =~# 'M'
+     exe 'syn region '.grpname.' start='."'".'\\begin\s*{\s*'.a:mathzone.'\*\s*}'."'".' end='."'".'\\end\s*{\s*'.a:mathzone.'\*\s*}'."'".' keepend contains=@texMathZoneGroup'.foldcmd
+     exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
+     exe 'syn sync match '.syncname.' grouphere '.grpname.' "\\begin\s*{\s*'.a:mathzone.'\*\s*}"'
+    endif
+    exe 'hi def link '.grpname.' texMath'
+   endif
+ endfun
+
+ " Standard Math Zones: {{{2
+ call TexNewMathZone("A","displaymath",1)
+ call TexNewMathZone("B","eqnarray",1)
+ call TexNewMathZone("C","equation",1)
+ call TexNewMathZone("D","math",1)
+
+ " Inline Math Zones: {{{2
+ if s:tex_fast =~# 'M'
+  if has("conceal") && &enc == 'utf-8' && s:tex_conceal =~# 'd'
+   syn region texMathZoneV	matchgroup=Delimiter start="\\("			matchgroup=Delimiter	end="\\)\|%stopzone\>"			keepend concealends contains=@texMathZoneGroup
+   syn region texMathZoneW	matchgroup=Delimiter start="\\\["			matchgroup=Delimiter	end="\\]\|%stopzone\>"			keepend concealends contains=@texMathZoneGroup
+   syn region texMathZoneX	matchgroup=Delimiter start="\$" skip="\\\\\|\\\$"	matchgroup=Delimiter	end="\$"	end="%stopzone\>"		concealends contains=@texMathZoneGroup
+   syn region texMathZoneY	matchgroup=Delimiter start="\$\$" 			matchgroup=Delimiter	end="\$\$"	end="%stopzone\>"	keepend concealends contains=@texMathZoneGroup
+  else
+   syn region texMathZoneV	matchgroup=Delimiter start="\\("			matchgroup=Delimiter	end="\\)\|%stopzone\>"			keepend contains=@texMathZoneGroup
+   syn region texMathZoneW	matchgroup=Delimiter start="\\\["			matchgroup=Delimiter	end="\\]\|%stopzone\>"			keepend contains=@texMathZoneGroup
+   syn region texMathZoneX	matchgroup=Delimiter start="\$" skip="\%(\\\\\)*\\\$"	matchgroup=Delimiter	end="\$"	end="%stopzone\>"		contains=@texMathZoneGroup
+   syn region texMathZoneY	matchgroup=Delimiter start="\$\$" 			matchgroup=Delimiter	end="\$\$"	end="%stopzone\>"	keepend	contains=@texMathZoneGroup
+  endif
+  syn region texMathZoneZ	matchgroup=texStatement start="\\ensuremath\s*{"	matchgroup=texStatement	end="}"		end="%stopzone\>"	contains=@texMathZoneGroup
+ endif
+
+ syn match texMathOper		"[_^=]" contained
+
+ " Text Inside Math Zones: {{{2
+ if s:tex_fast =~# 'M'
+  if !exists("g:tex_nospell") || !g:tex_nospell
+   syn region texMathText matchgroup=texStatement start='\\\(\(inter\)\=text\|mbox\)\s*{'	end='}'	contains=@texFoldGroup,@Spell
+  else
+   syn region texMathText matchgroup=texStatement start='\\\(\(inter\)\=text\|mbox\)\s*{'	end='}'	contains=@texFoldGroup
+  endif
+ endif
+
+ " \left..something.. and \right..something.. support: {{{2
+ syn match   texMathDelimBad	contained		"\S"
+ if has("conceal") && &enc == 'utf-8' && s:tex_conceal =~# 'm'
+  syn match   texMathDelim	contained		"\\left\["
+  syn match   texMathDelim	contained		"\\left\\{"	skipwhite nextgroup=texMathDelimSet1,texMathDelimSet2,texMathDelimBad contains=texMathSymbol cchar={
+  syn match   texMathDelim	contained		"\\right\\}"	skipwhite nextgroup=texMathDelimSet1,texMathDelimSet2,texMathDelimBad contains=texMathSymbol cchar=}
+  let s:texMathDelimList=[
+     \ ['<'            , '<'] ,
+     \ ['>'            , '>'] ,
+     \ ['('            , '('] ,
+     \ [')'            , ')'] ,
+     \ ['\['           , '['] ,
+     \ [']'            , ']'] ,
+     \ ['\\{'          , '{'] ,
+     \ ['\\}'          , '}'] ,
+     \ ['|'            , '|'] ,
+     \ ['\\|'          , '‖'] ,
+     \ ['\\backslash'  , '\'] ,
+     \ ['\\downarrow'  , '↓'] ,
+     \ ['\\Downarrow'  , '⇓'] ,
+     \ ['\\lbrace'     , '['] ,
+     \ ['\\lceil'      , '⌈'] ,
+     \ ['\\lfloor'     , '⌊'] ,
+     \ ['\\lgroup'     , '⌊'] ,
+     \ ['\\lmoustache' , '⎛'] ,
+     \ ['\\rbrace'     , ']'] ,
+     \ ['\\rceil'      , '⌉'] ,
+     \ ['\\rfloor'     , '⌋'] ,
+     \ ['\\rgroup'     , '⌋'] ,
+     \ ['\\rmoustache' , '⎞'] ,
+     \ ['\\uparrow'    , '↑'] ,
+     \ ['\\Uparrow'    , '↑'] ,
+     \ ['\\updownarrow', '↕'] ,
+     \ ['\\Updownarrow', '⇕']]
+  if &ambw == "double" || exists("g:tex_usedblwidth")
+    let s:texMathDelimList= s:texMathDelimList + [
+     \ ['\\langle'     , '〈'] ,
+     \ ['\\rangle'     , '〉']]
+  else
+    let s:texMathDelimList= s:texMathDelimList + [
+     \ ['\\langle'     , '<'] ,
+     \ ['\\rangle'     , '>']]
+  endif
+  syn match texMathDelim	'\\[bB]igg\=[lr]' contained nextgroup=texMathDelimBad
+  for texmath in s:texMathDelimList
+   exe "syn match texMathDelim	'\\\\[bB]igg\\=[lr]\\=".texmath[0]."'	contained conceal cchar=".texmath[1]
+  endfor
+
+ else
+  syn match   texMathDelim	contained		"\\\(left\|right\)\>"	skipwhite nextgroup=texMathDelimSet1,texMathDelimSet2,texMathDelimBad
+  syn match   texMathDelim	contained		"\\[bB]igg\=[lr]\=\>"	skipwhite nextgroup=texMathDelimSet1,texMathDelimSet2,texMathDelimBad
+  syn match   texMathDelimSet2	contained	"\\"		nextgroup=texMathDelimKey,texMathDelimBad
+  syn match   texMathDelimSet1	contained	"[<>()[\]|/.]\|\\[{}|]"
+  syn keyword texMathDelimKey	contained	backslash       lceil           lVert           rgroup          uparrow
+  syn keyword texMathDelimKey	contained	downarrow       lfloor          rangle          rmoustache      Uparrow
+  syn keyword texMathDelimKey	contained	Downarrow       lgroup          rbrace          rvert           updownarrow
+  syn keyword texMathDelimKey	contained	langle          lmoustache      rceil           rVert           Updownarrow
+  syn keyword texMathDelimKey	contained	lbrace          lvert           rfloor
+ endif
+ syn match   texMathDelim	contained		"\\\(left\|right\)arrow\>\|\<\([aA]rrow\|brace\)\=vert\>"
+ syn match   texMathDelim	contained		"\\lefteqn\>"
+endif
+
+" Special TeX characters  ( \$ \& \% \# \{ \} \_ \S \P ) : {{{1
+syn match texSpecialChar	"\\[$&%#{}_]"
+if b:tex_stylish
+  syn match texSpecialChar	"\\[SP@][^a-zA-Z@]"me=e-1
+else
+  syn match texSpecialChar	"\\[SP@]\A"me=e-1
+endif
+syn match texSpecialChar	"\\\\"
+if !exists("g:tex_no_math")
+ syn match texOnlyMath		"[_^]"
+endif
+syn match texSpecialChar	"\^\^[0-9a-f]\{2}\|\^\^\S"
+if s:tex_conceal !~# 'S'
+ syn match texSpecialChar	'\\glq\>'	contained conceal cchar=‚
+ syn match texSpecialChar	'\\grq\>'	contained conceal cchar=‘
+ syn match texSpecialChar	'\\glqq\>'	contained conceal cchar=„
+ syn match texSpecialChar	'\\grqq\>'	contained conceal cchar=“
+ syn match texSpecialChar	'\\hyp\>'	contained conceal cchar=-
+endif
+
+" Comments: {{{1
+"    Normal TeX LaTeX     :   %....
+"    Documented TeX Format:  ^^A...	-and-	leading %s (only)
+if !s:tex_comment_nospell
+ syn cluster texCommentGroup	contains=texTodo,@Spell
+else
+ syn cluster texCommentGroup	contains=texTodo,@NoSpell
+endif
+syn case ignore
+syn keyword texTodo		contained		combak	fixme	todo	xxx
+syn case match
+if s:extfname == "dtx"
+ syn match texComment		"\^\^A.*$"	contains=@texCommentGroup
+ syn match texComment		"^%\+"		contains=@texCommentGroup
+else
+ if s:tex_fold_enabled
+  " allows syntax-folding of 2 or more contiguous comment lines
+  " single-line comments are not folded
+  syn match  texComment	"%.*$"				contains=@texCommentGroup
+  if s:tex_fast =~# 'c'
+   TexFold syn region texComment						start="^\zs\s*%.*\_s*%"	skip="^\s*%"	end='^\ze\s*[^%]'	contains=@texCommentGroup
+   TexFold syn region texNoSpell	contained	matchgroup=texComment	start="%\s*nospell\s*{"	end="%\s*nospell\s*}"			contains=@texFoldGroup,@NoSpell
+  endif
+ else
+  syn match texComment		"%.*$"			contains=@texCommentGroup
+  if s:tex_fast =~# 'c'
+   syn region texNoSpell		contained	matchgroup=texComment start="%\s*nospell\s*{"	end="%\s*nospell\s*}"	contains=@texFoldGroup,@NoSpell
+  endif
+ endif
+endif
+
+" %begin-include ... %end-include acts like a texDocZone for \include'd files.  Permits spell checking, for example, in such files.
+if !s:tex_nospell
+ TexFold syn region texDocZone			matchgroup=texSection start='^\s*%begin-include\>'	 end='^\s*%end-include\>'											contains=@texFoldGroup,@texDocGroup,@Spell
+else
+ TexFold syn region texDocZone			matchgroup=texSection start='^\s*%begin-include\>'	 end='^\s*%end-include\>'											contains=@texFoldGroup,@texDocGroup
+endif
+
+" Separate lines used for verb` and verb# so that the end conditions {{{1
+" will appropriately terminate.
+" If g:tex_verbspell exists, then verbatim texZones will permit spellchecking there.
+if s:tex_fast =~# 'v'
+  if exists("g:tex_verbspell") && g:tex_verbspell
+   syn region texZone		start="\\begin{[vV]erbatim}"		end="\\end{[vV]erbatim}\|%stopzone\>"	contains=@Spell
+   " listings package:
+   if b:tex_stylish
+    syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z@]\)"	end="\z1\|%stopzone\>"			contains=@Spell
+   else
+    syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z]\)"	end="\z1\|%stopzone\>"			contains=@Spell
+   endif
+  else
+   syn region texZone		start="\\begin{[vV]erbatim}"		end="\\end{[vV]erbatim}\|%stopzone\>"
+   if b:tex_stylish
+     syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z@]\)"	end="\z1\|%stopzone\>"
+   else
+     syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z]\)"	end="\z1\|%stopzone\>"
+   endif
+  endif
+endif
+
+" Tex Reference Zones: {{{1
+if s:tex_fast =~# 'r'
+  syn region texZone		matchgroup=texStatement start="@samp{"			end="}\|%stopzone\>"	contains=@texRefGroup
+  syn region texRefZone		matchgroup=texStatement start="\\nocite{"		end="}\|%stopzone\>"	contains=@texRefGroup
+  syn region texRefZone		matchgroup=texStatement start="\\bibliography{"		end="}\|%stopzone\>"	contains=@texRefGroup
+  syn region texRefZone		matchgroup=texStatement start="\\label{"		end="}\|%stopzone\>"	contains=@texRefGroup
+  syn region texRefZone		matchgroup=texStatement start="\\\(page\|eq\)ref{"	end="}\|%stopzone\>"	contains=@texRefGroup
+  syn region texRefZone		matchgroup=texStatement start="\\v\=ref{"		end="}\|%stopzone\>"	contains=@texRefGroup
+  syn region texRefOption	contained	matchgroup=Delimiter start='\[' end=']'		contains=@texRefGroup,texRefZone	nextgroup=texRefOption,texCite
+  syn region texCite		contained	matchgroup=Delimiter start='{' end='}'		contains=@texRefGroup,texRefZone,texCite
+endif
+syn match  texRefZone		'\\cite\%([tp]\*\=\)\=\>' nextgroup=texRefOption,texCite
+
+" Handle newcommand, newenvironment : {{{1
+syn match  texNewCmd				"\\newcommand\>"			nextgroup=texCmdName skipwhite skipnl
+if s:tex_fast =~# 'V'
+  syn region texCmdName contained matchgroup=Delimiter start="{"rs=s+1  end="}"		nextgroup=texCmdArgs,texCmdBody skipwhite skipnl
+  syn region texCmdArgs contained matchgroup=Delimiter start="\["rs=s+1 end="]"		nextgroup=texCmdBody skipwhite skipnl
+  syn region texCmdBody contained matchgroup=Delimiter start="{"rs=s+1 skip="\\\\\|\\[{}]"	matchgroup=Delimiter end="}" contains=@texCmdGroup
+endif
+syn match  texNewEnv				"\\newenvironment\>"			nextgroup=texEnvName skipwhite skipnl
+if s:tex_fast =~# 'V'
+  syn region texEnvName contained matchgroup=Delimiter start="{"rs=s+1  end="}"		nextgroup=texEnvBgn skipwhite skipnl
+  syn region texEnvBgn  contained matchgroup=Delimiter start="{"rs=s+1  end="}"		nextgroup=texEnvEnd skipwhite skipnl contains=@texEnvGroup
+  syn region texEnvEnd  contained matchgroup=Delimiter start="{"rs=s+1  end="}"		skipwhite skipnl contains=@texEnvGroup
+endif
+
+" Definitions/Commands: {{{1
+syn match texDefCmd				"\\def\>"				nextgroup=texDefName skipwhite skipnl
+if b:tex_stylish
+  syn match texDefName contained		"\\[a-zA-Z@]\+"				nextgroup=texDefParms,texCmdBody skipwhite skipnl
+  syn match texDefName contained		"\\[^a-zA-Z@]"				nextgroup=texDefParms,texCmdBody skipwhite skipnl
+else
+  syn match texDefName contained		"\\\a\+"				nextgroup=texDefParms,texCmdBody skipwhite skipnl
+  syn match texDefName contained		"\\\A"					nextgroup=texDefParms,texCmdBody skipwhite skipnl
+endif
+syn match texDefParms  contained		"#[^{]*"	contains=texDefParm	nextgroup=texCmdBody skipwhite skipnl
+syn match  texDefParm  contained		"#\d\+"
+
+" TeX Lengths: {{{1
+syn match  texLength		"\<\d\+\([.,]\d\+\)\=\s*\(true\)\=\s*\(bp\|cc\|cm\|dd\|em\|ex\|in\|mm\|pc\|pt\|sp\)\>"
+
+" TeX String Delimiters: {{{1
+syn match texString		"\(``\|''\|,,\)"
+
+" makeatletter -- makeatother sections
+if !s:tex_no_error
+ if s:tex_fast =~# 'S'
+  syn region texStyle			matchgroup=texStatement start='\\makeatletter' end='\\makeatother'	contains=@texStyleGroup contained
+ endif
+ syn match  texStyleStatement		"\\[a-zA-Z@]\+"	contained
+ if s:tex_fast =~# 'S'
+  syn region texStyleMatcher		matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"		contains=@texStyleGroup,texError	contained
+  syn region texStyleMatcher		matchgroup=Delimiter start="\["				end="]"		contains=@texStyleGroup,texError	contained
+ endif
+endif
+
+" Conceal mode support (supports set cole=2) {{{1
+if has("conceal") && &enc == 'utf-8'
+
+ " Math Symbols {{{2
+ " (many of these symbols were contributed by Björn Winckler)
+ if s:tex_conceal =~# 'm'
+  let s:texMathList=[
+    \ ['|'		, '‖'],
+    \ ['aleph'		, 'ℵ'],
+    \ ['amalg'		, '∐'],
+    \ ['angle'		, '∠'],
+    \ ['approx'		, '≈'],
+    \ ['ast'		, '∗'],
+    \ ['asymp'		, '≍'],
+    \ ['backslash'	, '∖'],
+    \ ['bigcap'		, '∩'],
+    \ ['bigcirc'	, '○'],
+    \ ['bigcup'		, '∪'],
+    \ ['bigodot'	, '⊙'],
+    \ ['bigoplus'	, '⊕'],
+    \ ['bigotimes'	, '⊗'],
+    \ ['bigsqcup'	, '⊔'],
+    \ ['bigtriangledown', '∇'],
+    \ ['bigtriangleup'	, '∆'],
+    \ ['bigvee'		, '⋁'],
+    \ ['bigwedge'	, '⋀'],
+    \ ['bot'		, '⊥'],
+    \ ['bowtie'	        , '⋈'],
+    \ ['bullet'	        , '•'],
+    \ ['cap'		, '∩'],
+    \ ['cdot'		, '·'],
+    \ ['cdots'		, '⋯'],
+    \ ['circ'		, '∘'],
+    \ ['clubsuit'	, '♣'],
+    \ ['cong'		, '≅'],
+    \ ['coprod'		, '∐'],
+    \ ['copyright'	, '©'],
+    \ ['cup'		, '∪'],
+    \ ['dagger'	        , '†'],
+    \ ['dashv'		, '⊣'],
+    \ ['ddagger'	, '‡'],
+    \ ['ddots'	        , '⋱'],
+    \ ['diamond'	, '⋄'],
+    \ ['diamondsuit'	, '♢'],
+    \ ['div'		, '÷'],
+    \ ['doteq'		, '≐'],
+    \ ['dots'		, '…'],
+    \ ['downarrow'	, '↓'],
+    \ ['Downarrow'	, '⇓'],
+    \ ['ell'		, 'ℓ'],
+    \ ['emptyset'	, '∅'],
+    \ ['equiv'		, '≡'],
+    \ ['exists'		, '∃'],
+    \ ['flat'		, '♭'],
+    \ ['forall'		, '∀'],
+    \ ['frown'		, '⁔'],
+    \ ['ge'		, '≥'],
+    \ ['geq'		, '≥'],
+    \ ['gets'		, '←'],
+    \ ['gg'		, '⟫'],
+    \ ['hbar'		, 'ℏ'],
+    \ ['heartsuit'	, '♡'],
+    \ ['hookleftarrow'	, '↩'],
+    \ ['hookrightarrow'	, '↪'],
+    \ ['iff'            , '⇔'],
+    \ ['Im'		, 'ℑ'],
+    \ ['imath'		, 'ɩ'],
+    \ ['in'		, '∈'],
+    \ ['infty'		, '∞'],
+    \ ['int'		, '∫'],
+    \ ['jmath'		, '𝚥'],
+    \ ['land'		, '∧'],
+    \ ['lceil'		, '⌈'],
+    \ ['ldots'		, '…'],
+    \ ['le'		, '≤'],
+    \ ['left|'		, '|'],
+    \ ['left\\|'	, '‖'],
+    \ ['left('		, '('],
+    \ ['left\['		, '['],
+    \ ['left\\{'	, '{'],
+    \ ['leftarrow'	, '←'],
+    \ ['Leftarrow'	, '⇐'],
+    \ ['leftharpoondown', '↽'],
+    \ ['leftharpoonup'	, '↼'],
+    \ ['leftrightarrow'	, '↔'],
+    \ ['Leftrightarrow'	, '⇔'],
+    \ ['leq'		, '≤'],
+    \ ['leq'		, '≤'],
+    \ ['lfloor'		, '⌊'],
+    \ ['ll'		, '≪'],
+    \ ['lmoustache'     , '╭'],
+    \ ['lor'		, '∨'],
+    \ ['mapsto'		, '↦'],
+    \ ['mid'		, '∣'],
+    \ ['models'		, '╞'],
+    \ ['mp'		, '∓'],
+    \ ['nabla'		, '∇'],
+    \ ['natural'	, '♮'],
+    \ ['ne'		, '≠'],
+    \ ['nearrow'	, '↗'],
+    \ ['neg'		, '¬'],
+    \ ['neq'		, '≠'],
+    \ ['ni'		, '∋'],
+    \ ['notin'		, '∉'],
+    \ ['nwarrow'	, '↖'],
+    \ ['odot'		, '⊙'],
+    \ ['oint'		, '∮'],
+    \ ['ominus'		, '⊖'],
+    \ ['oplus'		, '⊕'],
+    \ ['oslash'		, '⊘'],
+    \ ['otimes'		, '⊗'],
+    \ ['owns'		, '∋'],
+    \ ['P'	        , '¶'],
+    \ ['parallel'	, '║'],
+    \ ['partial'	, '∂'],
+    \ ['perp'		, '⊥'],
+    \ ['pm'		, '±'],
+    \ ['prec'		, '≺'],
+    \ ['preceq'		, '⪯'],
+    \ ['prime'		, '′'],
+    \ ['prod'		, '∏'],
+    \ ['propto'		, '∝'],
+    \ ['rceil'		, '⌉'],
+    \ ['Re'		, 'ℜ'],
+    \ ['quad'		, ' '],
+    \ ['qquad'		, ' '],
+    \ ['rfloor'		, '⌋'],
+    \ ['right|'		, '|'],
+    \ ['right\\|'	, '‖'],
+    \ ['right)'		, ')'],
+    \ ['right]'		, ']'],
+    \ ['right\\}'	, '}'],
+    \ ['rightarrow'	, '→'],
+    \ ['Rightarrow'	, '⇒'],
+    \ ['rightleftharpoons', '⇌'],
+    \ ['rmoustache'     , '╮'],
+    \ ['S'	        , '§'],
+    \ ['searrow'	, '↘'],
+    \ ['setminus'	, '∖'],
+    \ ['sharp'		, '♯'],
+    \ ['sim'		, '∼'],
+    \ ['simeq'		, '⋍'],
+    \ ['smile'		, '‿'],
+    \ ['spadesuit'	, '♠'],
+    \ ['sqcap'		, '⊓'],
+    \ ['sqcup'		, '⊔'],
+    \ ['sqsubset'	, '⊏'],
+    \ ['sqsubseteq'	, '⊑'],
+    \ ['sqsupset'	, '⊐'],
+    \ ['sqsupseteq'	, '⊒'],
+    \ ['star'		, '✫'],
+    \ ['subset'		, '⊂'],
+    \ ['subseteq'	, '⊆'],
+    \ ['succ'		, '≻'],
+    \ ['succeq'		, '⪰'],
+    \ ['sum'		, '∑'],
+    \ ['supset'		, '⊃'],
+    \ ['supseteq'	, '⊇'],
+    \ ['surd'		, '√'],
+    \ ['swarrow'	, '↙'],
+    \ ['times'		, '×'],
+    \ ['to'		, '→'],
+    \ ['top'		, '⊤'],
+    \ ['triangle'	, '∆'],
+    \ ['triangleleft'	, '⊲'],
+    \ ['triangleright'	, '⊳'],
+    \ ['uparrow'	, '↑'],
+    \ ['Uparrow'	, '⇑'],
+    \ ['updownarrow'	, '↕'],
+    \ ['Updownarrow'	, '⇕'],
+    \ ['vdash'		, '⊢'],
+    \ ['vdots'		, '⋮'],
+    \ ['vee'		, '∨'],
+    \ ['wedge'		, '∧'],
+    \ ['wp'		, '℘'],
+    \ ['wr'		, '≀']]
+  if &ambw == "double" || exists("g:tex_usedblwidth")
+    let s:texMathList= s:texMathList + [
+    \ ['right\\rangle'	, '〉'],
+    \ ['left\\langle'	, '〈']]
+  else
+    let s:texMathList= s:texMathList + [
+    \ ['right\\rangle'	, '>'],
+    \ ['left\\langle'	, '<']]
+  endif
+  for texmath in s:texMathList
+   if texmath[0] =~# '\w$'
+    exe "syn match texMathSymbol '\\\\".texmath[0]."\\>' contained conceal cchar=".texmath[1]
+   else
+    exe "syn match texMathSymbol '\\\\".texmath[0]."' contained conceal cchar=".texmath[1]
+   endif
+  endfor
+
+  if &ambw == "double"
+   syn match texMathSymbol '\\gg\>'			contained conceal cchar=≫
+   syn match texMathSymbol '\\ll\>'			contained conceal cchar=≪
+  else
+   syn match texMathSymbol '\\gg\>'			contained conceal cchar=⟫
+   syn match texMathSymbol '\\ll\>'			contained conceal cchar=⟪
+  endif
+
+  syn match texMathSymbol '\\hat{a}' contained conceal cchar=â
+  syn match texMathSymbol '\\hat{A}' contained conceal cchar=Â
+  syn match texMathSymbol '\\hat{c}' contained conceal cchar=ĉ
+  syn match texMathSymbol '\\hat{C}' contained conceal cchar=Ĉ
+  syn match texMathSymbol '\\hat{e}' contained conceal cchar=ê
+  syn match texMathSymbol '\\hat{E}' contained conceal cchar=Ê
+  syn match texMathSymbol '\\hat{g}' contained conceal cchar=ĝ
+  syn match texMathSymbol '\\hat{G}' contained conceal cchar=Ĝ
+  syn match texMathSymbol '\\hat{i}' contained conceal cchar=î
+  syn match texMathSymbol '\\hat{I}' contained conceal cchar=Î
+  syn match texMathSymbol '\\hat{o}' contained conceal cchar=ô
+  syn match texMathSymbol '\\hat{O}' contained conceal cchar=Ô
+  syn match texMathSymbol '\\hat{s}' contained conceal cchar=ŝ
+  syn match texMathSymbol '\\hat{S}' contained conceal cchar=Ŝ
+  syn match texMathSymbol '\\hat{u}' contained conceal cchar=û
+  syn match texMathSymbol '\\hat{U}' contained conceal cchar=Û
+  syn match texMathSymbol '\\hat{w}' contained conceal cchar=ŵ
+  syn match texMathSymbol '\\hat{W}' contained conceal cchar=Ŵ
+  syn match texMathSymbol '\\hat{y}' contained conceal cchar=ŷ
+  syn match texMathSymbol '\\hat{Y}' contained conceal cchar=Ŷ
+"  syn match texMathSymbol '\\bar{a}' contained conceal cchar=a̅
+
+  syn match texMathSymbol '\\dot{B}' contained conceal cchar=Ḃ
+  syn match texMathSymbol '\\dot{b}' contained conceal cchar=ḃ
+  syn match texMathSymbol '\\dot{D}' contained conceal cchar=Ḋ
+  syn match texMathSymbol '\\dot{d}' contained conceal cchar=ḋ
+  syn match texMathSymbol '\\dot{F}' contained conceal cchar=Ḟ
+  syn match texMathSymbol '\\dot{f}' contained conceal cchar=ḟ
+  syn match texMathSymbol '\\dot{H}' contained conceal cchar=Ḣ
+  syn match texMathSymbol '\\dot{h}' contained conceal cchar=ḣ
+  syn match texMathSymbol '\\dot{M}' contained conceal cchar=Ṁ
+  syn match texMathSymbol '\\dot{m}' contained conceal cchar=ṁ
+  syn match texMathSymbol '\\dot{N}' contained conceal cchar=Ṅ
+  syn match texMathSymbol '\\dot{n}' contained conceal cchar=ṅ
+  syn match texMathSymbol '\\dot{P}' contained conceal cchar=Ṗ
+  syn match texMathSymbol '\\dot{p}' contained conceal cchar=ṗ
+  syn match texMathSymbol '\\dot{R}' contained conceal cchar=Ṙ
+  syn match texMathSymbol '\\dot{r}' contained conceal cchar=ṙ
+  syn match texMathSymbol '\\dot{S}' contained conceal cchar=Ṡ
+  syn match texMathSymbol '\\dot{s}' contained conceal cchar=ṡ
+  syn match texMathSymbol '\\dot{T}' contained conceal cchar=Ṫ
+  syn match texMathSymbol '\\dot{t}' contained conceal cchar=ṫ
+  syn match texMathSymbol '\\dot{W}' contained conceal cchar=Ẇ
+  syn match texMathSymbol '\\dot{w}' contained conceal cchar=ẇ
+  syn match texMathSymbol '\\dot{X}' contained conceal cchar=Ẋ
+  syn match texMathSymbol '\\dot{x}' contained conceal cchar=ẋ
+  syn match texMathSymbol '\\dot{Y}' contained conceal cchar=Ẏ
+  syn match texMathSymbol '\\dot{y}' contained conceal cchar=ẏ
+  syn match texMathSymbol '\\dot{Z}' contained conceal cchar=Ż
+  syn match texMathSymbol '\\dot{z}' contained conceal cchar=ż
+
+  syn match texMathSymbol '\\dot{C}' contained conceal cchar=Ċ
+  syn match texMathSymbol '\\dot{c}' contained conceal cchar=ċ
+  syn match texMathSymbol '\\dot{E}' contained conceal cchar=Ė
+  syn match texMathSymbol '\\dot{e}' contained conceal cchar=ė
+  syn match texMathSymbol '\\dot{G}' contained conceal cchar=Ġ
+  syn match texMathSymbol '\\dot{g}' contained conceal cchar=ġ
+  syn match texMathSymbol '\\dot{I}' contained conceal cchar=İ
+
+  syn match texMathSymbol '\\dot{A}' contained conceal cchar=Ȧ
+  syn match texMathSymbol '\\dot{a}' contained conceal cchar=ȧ
+  syn match texMathSymbol '\\dot{O}' contained conceal cchar=Ȯ
+  syn match texMathSymbol '\\dot{o}' contained conceal cchar=ȯ
+ endif
+
+ " Greek {{{2
+ if s:tex_conceal =~# 'g'
+  fun! s:Greek(group,pat,cchar)
+    exe 'syn match '.a:group." '".a:pat."' contained conceal cchar=".a:cchar
+  endfun
+  call s:Greek('texGreek','\\alpha\>'		,'α')
+  call s:Greek('texGreek','\\beta\>'		,'β')
+  call s:Greek('texGreek','\\gamma\>'		,'γ')
+  call s:Greek('texGreek','\\delta\>'		,'δ')
+  call s:Greek('texGreek','\\epsilon\>'		,'ϵ')
+  call s:Greek('texGreek','\\varepsilon\>'	,'ε')
+  call s:Greek('texGreek','\\zeta\>'		,'ζ')
+  call s:Greek('texGreek','\\eta\>'		,'η')
+  call s:Greek('texGreek','\\theta\>'		,'θ')
+  call s:Greek('texGreek','\\vartheta\>'	,'ϑ')
+  call s:Greek('texGreek','\\iota\>'            ,'ι')
+  call s:Greek('texGreek','\\kappa\>'		,'κ')
+  call s:Greek('texGreek','\\lambda\>'		,'λ')
+  call s:Greek('texGreek','\\mu\>'		,'μ')
+  call s:Greek('texGreek','\\nu\>'		,'ν')
+  call s:Greek('texGreek','\\xi\>'		,'ξ')
+  call s:Greek('texGreek','\\pi\>'		,'π')
+  call s:Greek('texGreek','\\varpi\>'		,'ϖ')
+  call s:Greek('texGreek','\\rho\>'		,'ρ')
+  call s:Greek('texGreek','\\varrho\>'		,'ϱ')
+  call s:Greek('texGreek','\\sigma\>'		,'σ')
+  call s:Greek('texGreek','\\varsigma\>'	,'ς')
+  call s:Greek('texGreek','\\tau\>'		,'τ')
+  call s:Greek('texGreek','\\upsilon\>'		,'υ')
+  call s:Greek('texGreek','\\phi\>'		,'ϕ')
+  call s:Greek('texGreek','\\varphi\>'		,'φ')
+  call s:Greek('texGreek','\\chi\>'		,'χ')
+  call s:Greek('texGreek','\\psi\>'		,'ψ')
+  call s:Greek('texGreek','\\omega\>'		,'ω')
+  call s:Greek('texGreek','\\Gamma\>'		,'Γ')
+  call s:Greek('texGreek','\\Delta\>'		,'Δ')
+  call s:Greek('texGreek','\\Theta\>'		,'Θ')
+  call s:Greek('texGreek','\\Lambda\>'		,'Λ')
+  call s:Greek('texGreek','\\Xi\>'              ,'Ξ')
+  call s:Greek('texGreek','\\Pi\>'		,'Π')
+  call s:Greek('texGreek','\\Sigma\>'		,'Σ')
+  call s:Greek('texGreek','\\Upsilon\>'		,'Υ')
+  call s:Greek('texGreek','\\Phi\>'		,'Φ')
+  call s:Greek('texGreek','\\Chi\>'		,'Χ')
+  call s:Greek('texGreek','\\Psi\>'		,'Ψ')
+  call s:Greek('texGreek','\\Omega\>'		,'Ω')
+  delfun s:Greek
+ endif
+
+ " Superscripts/Subscripts {{{2
+ if s:tex_conceal =~# 's'
+  if s:tex_fast =~# 's'
+   syn region texSuperscript	matchgroup=Delimiter start='\^{'	skip="\\\\\|\\[{}]" end='}'	contained concealends contains=texSpecialChar,texSuperscripts,texStatement,texSubscript,texSuperscript,texMathMatcher
+   syn region texSubscript	matchgroup=Delimiter start='_{'		skip="\\\\\|\\[{}]" end='}'	contained concealends contains=texSpecialChar,texSubscripts,texStatement,texSubscript,texSuperscript,texMathMatcher
+  endif
+  " s:SuperSub:
+  fun! s:SuperSub(group,leader,pat,cchar)
+    if a:pat =~# '^\\' || (a:leader == '\^' && a:pat =~# s:tex_superscripts) || (a:leader == '_' && a:pat =~# s:tex_subscripts)
+"     call Decho("SuperSub: group<".a:group."> leader<".a:leader."> pat<".a:pat."> cchar<".a:cchar.">")
+     exe 'syn match '.a:group." '".a:leader.a:pat."' contained conceal cchar=".a:cchar
+     exe 'syn match '.a:group."s '".a:pat        ."' contained conceal cchar=".a:cchar.' nextgroup='.a:group.'s'
+    endif
+  endfun
+  call s:SuperSub('texSuperscript','\^','0','⁰')
+  call s:SuperSub('texSuperscript','\^','1','¹')
+  call s:SuperSub('texSuperscript','\^','2','²')
+  call s:SuperSub('texSuperscript','\^','3','³')
+  call s:SuperSub('texSuperscript','\^','4','⁴')
+  call s:SuperSub('texSuperscript','\^','5','⁵')
+  call s:SuperSub('texSuperscript','\^','6','⁶')
+  call s:SuperSub('texSuperscript','\^','7','⁷')
+  call s:SuperSub('texSuperscript','\^','8','⁸')
+  call s:SuperSub('texSuperscript','\^','9','⁹')
+  call s:SuperSub('texSuperscript','\^','a','ᵃ')
+  call s:SuperSub('texSuperscript','\^','b','ᵇ')
+  call s:SuperSub('texSuperscript','\^','c','ᶜ')
+  call s:SuperSub('texSuperscript','\^','d','ᵈ')
+  call s:SuperSub('texSuperscript','\^','e','ᵉ')
+  call s:SuperSub('texSuperscript','\^','f','ᶠ')
+  call s:SuperSub('texSuperscript','\^','g','ᵍ')
+  call s:SuperSub('texSuperscript','\^','h','ʰ')
+  call s:SuperSub('texSuperscript','\^','i','ⁱ')
+  call s:SuperSub('texSuperscript','\^','j','ʲ')
+  call s:SuperSub('texSuperscript','\^','k','ᵏ')
+  call s:SuperSub('texSuperscript','\^','l','ˡ')
+  call s:SuperSub('texSuperscript','\^','m','ᵐ')
+  call s:SuperSub('texSuperscript','\^','n','ⁿ')
+  call s:SuperSub('texSuperscript','\^','o','ᵒ')
+  call s:SuperSub('texSuperscript','\^','p','ᵖ')
+  call s:SuperSub('texSuperscript','\^','r','ʳ')
+  call s:SuperSub('texSuperscript','\^','s','ˢ')
+  call s:SuperSub('texSuperscript','\^','t','ᵗ')
+  call s:SuperSub('texSuperscript','\^','u','ᵘ')
+  call s:SuperSub('texSuperscript','\^','v','ᵛ')
+  call s:SuperSub('texSuperscript','\^','w','ʷ')
+  call s:SuperSub('texSuperscript','\^','x','ˣ')
+  call s:SuperSub('texSuperscript','\^','y','ʸ')
+  call s:SuperSub('texSuperscript','\^','z','ᶻ')
+  call s:SuperSub('texSuperscript','\^','A','ᴬ')
+  call s:SuperSub('texSuperscript','\^','B','ᴮ')
+  call s:SuperSub('texSuperscript','\^','D','ᴰ')
+  call s:SuperSub('texSuperscript','\^','E','ᴱ')
+  call s:SuperSub('texSuperscript','\^','G','ᴳ')
+  call s:SuperSub('texSuperscript','\^','H','ᴴ')
+  call s:SuperSub('texSuperscript','\^','I','ᴵ')
+  call s:SuperSub('texSuperscript','\^','J','ᴶ')
+  call s:SuperSub('texSuperscript','\^','K','ᴷ')
+  call s:SuperSub('texSuperscript','\^','L','ᴸ')
+  call s:SuperSub('texSuperscript','\^','M','ᴹ')
+  call s:SuperSub('texSuperscript','\^','N','ᴺ')
+  call s:SuperSub('texSuperscript','\^','O','ᴼ')
+  call s:SuperSub('texSuperscript','\^','P','ᴾ')
+  call s:SuperSub('texSuperscript','\^','R','ᴿ')
+  call s:SuperSub('texSuperscript','\^','T','ᵀ')
+  call s:SuperSub('texSuperscript','\^','U','ᵁ')
+  call s:SuperSub('texSuperscript','\^','V','ⱽ')
+  call s:SuperSub('texSuperscript','\^','W','ᵂ')
+  call s:SuperSub('texSuperscript','\^',',','︐')
+  call s:SuperSub('texSuperscript','\^',':','︓')
+  call s:SuperSub('texSuperscript','\^',';','︔')
+  call s:SuperSub('texSuperscript','\^','+','⁺')
+  call s:SuperSub('texSuperscript','\^','-','⁻')
+  call s:SuperSub('texSuperscript','\^','<','˂')
+  call s:SuperSub('texSuperscript','\^','>','˃')
+  call s:SuperSub('texSuperscript','\^','/','ˊ')
+  call s:SuperSub('texSuperscript','\^','(','⁽')
+  call s:SuperSub('texSuperscript','\^',')','⁾')
+  call s:SuperSub('texSuperscript','\^','\.','˙')
+  call s:SuperSub('texSuperscript','\^','=','˭')
+  call s:SuperSub('texSubscript','_','0','₀')
+  call s:SuperSub('texSubscript','_','1','₁')
+  call s:SuperSub('texSubscript','_','2','₂')
+  call s:SuperSub('texSubscript','_','3','₃')
+  call s:SuperSub('texSubscript','_','4','₄')
+  call s:SuperSub('texSubscript','_','5','₅')
+  call s:SuperSub('texSubscript','_','6','₆')
+  call s:SuperSub('texSubscript','_','7','₇')
+  call s:SuperSub('texSubscript','_','8','₈')
+  call s:SuperSub('texSubscript','_','9','₉')
+  call s:SuperSub('texSubscript','_','a','ₐ')
+  call s:SuperSub('texSubscript','_','e','ₑ')
+  call s:SuperSub('texSubscript','_','h','ₕ')
+  call s:SuperSub('texSubscript','_','i','ᵢ')
+  call s:SuperSub('texSubscript','_','j','ⱼ')
+  call s:SuperSub('texSubscript','_','k','ₖ')
+  call s:SuperSub('texSubscript','_','l','ₗ')
+  call s:SuperSub('texSubscript','_','m','ₘ')
+  call s:SuperSub('texSubscript','_','n','ₙ')
+  call s:SuperSub('texSubscript','_','o','ₒ')
+  call s:SuperSub('texSubscript','_','p','ₚ')
+  call s:SuperSub('texSubscript','_','r','ᵣ')
+  call s:SuperSub('texSubscript','_','s','ₛ')
+  call s:SuperSub('texSubscript','_','t','ₜ')
+  call s:SuperSub('texSubscript','_','u','ᵤ')
+  call s:SuperSub('texSubscript','_','v','ᵥ')
+  call s:SuperSub('texSubscript','_','x','ₓ')
+  call s:SuperSub('texSubscript','_',',','︐')
+  call s:SuperSub('texSubscript','_','+','₊')
+  call s:SuperSub('texSubscript','_','-','₋')
+  call s:SuperSub('texSubscript','_','/','ˏ')
+  call s:SuperSub('texSubscript','_','(','₍')
+  call s:SuperSub('texSubscript','_',')','₎')
+  call s:SuperSub('texSubscript','_','\.','‸')
+  call s:SuperSub('texSubscript','_','r','ᵣ')
+  call s:SuperSub('texSubscript','_','v','ᵥ')
+  call s:SuperSub('texSubscript','_','x','ₓ')
+  call s:SuperSub('texSubscript','_','\\beta\>' ,'ᵦ')
+  call s:SuperSub('texSubscript','_','\\delta\>','ᵨ')
+  call s:SuperSub('texSubscript','_','\\phi\>'  ,'ᵩ')
+  call s:SuperSub('texSubscript','_','\\gamma\>','ᵧ')
+  call s:SuperSub('texSubscript','_','\\chi\>'  ,'ᵪ')
+
+  delfun s:SuperSub
+ endif
+
+ " Accented characters and Ligatures: {{{2
+ if s:tex_conceal =~# 'a'
+  if b:tex_stylish
+   syn match texAccent		"\\[bcdvuH][^a-zA-Z@]"me=e-1
+   syn match texLigature	"\\\([ijolL]\|ae\|oe\|ss\|AA\|AE\|OE\)[^a-zA-Z@]"me=e-1
+   syn match texLigature	'--'
+   syn match texLigature	'---'
+  else
+   fun! s:Accents(chr,...)
+     let i= 1
+     for accent in ["`","\\'","^",'"','\~','\.','=',"c","H","k","r","u","v"]
+      if i > a:0
+       break
+      endif
+      if strlen(a:{i}) == 0 || a:{i} == ' ' || a:{i} == '?'
+       let i= i + 1
+       continue
+      endif
+      if accent =~# '\a'
+       exe "syn match texAccent '".'\\'.accent.'\(\s*{'.a:chr.'}\|\s\+'.a:chr.'\)'."' conceal cchar=".a:{i}
+      else
+       exe "syn match texAccent '".'\\'.accent.'\s*\({'.a:chr.'}\|'.a:chr.'\)'."' conceal cchar=".a:{i}
+      endif
+      let i= i + 1
+     endfor
+   endfun
+   "                  \`  \'  \^  \"  \~  \.  \=  \c  \H  \k  \r  \u  \v
+   call s:Accents('a','à','á','â','ä','ã','ȧ','ā',' ',' ','ą','å','ă','ǎ')
+   call s:Accents('A','À','Á','Â','Ä','Ã','Ȧ','Ā',' ',' ','Ą','Å','Ă','Ǎ')
+   call s:Accents('c',' ','ć','ĉ',' ',' ','ċ',' ','ç',' ',' ',' ',' ','č')
+   call s:Accents('C',' ','Ć','Ĉ',' ',' ','Ċ',' ','Ç',' ',' ',' ',' ','Č')
+   call s:Accents('d',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','ď')
+   call s:Accents('D',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','Ď')
+   call s:Accents('e','è','é','ê','ë','ẽ','ė','ē','ȩ',' ','ę',' ','ĕ','ě')
+   call s:Accents('E','È','É','Ê','Ë','Ẽ','Ė','Ē','Ȩ',' ','Ę',' ','Ĕ','Ě')
+   call s:Accents('g',' ','ǵ','ĝ',' ',' ','ġ',' ','ģ',' ',' ',' ','ğ','ǧ')
+   call s:Accents('G',' ','Ǵ','Ĝ',' ',' ','Ġ',' ','Ģ',' ',' ',' ','Ğ','Ǧ')
+   call s:Accents('h',' ',' ','ĥ',' ',' ',' ',' ',' ',' ',' ',' ',' ','ȟ')
+   call s:Accents('H',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','Ȟ')
+   call s:Accents('i','ì','í','î','ï','ĩ','į','ī',' ',' ','į',' ','ĭ','ǐ')
+   call s:Accents('I','Ì','Í','Î','Ï','Ĩ','İ','Ī',' ',' ','Į',' ','Ĭ','Ǐ')
+   call s:Accents('J',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','ǰ')
+   call s:Accents('k',' ',' ',' ',' ',' ',' ',' ','ķ',' ',' ',' ',' ','ǩ')
+   call s:Accents('K',' ',' ',' ',' ',' ',' ',' ','Ķ',' ',' ',' ',' ','Ǩ')
+   call s:Accents('l',' ','ĺ','ľ',' ',' ',' ',' ','ļ',' ',' ',' ',' ','ľ')
+   call s:Accents('L',' ','Ĺ','Ľ',' ',' ',' ',' ','Ļ',' ',' ',' ',' ','Ľ')
+   call s:Accents('n',' ','ń',' ',' ','ñ',' ',' ','ņ',' ',' ',' ',' ','ň')
+   call s:Accents('N',' ','Ń',' ',' ','Ñ',' ',' ','Ņ',' ',' ',' ',' ','Ň')
+   call s:Accents('o','ò','ó','ô','ö','õ','ȯ','ō',' ','ő','ǫ',' ','ŏ','ǒ')
+   call s:Accents('O','Ò','Ó','Ô','Ö','Õ','Ȯ','Ō',' ','Ő','Ǫ',' ','Ŏ','Ǒ')
+   call s:Accents('r',' ','ŕ',' ',' ',' ',' ',' ','ŗ',' ',' ',' ',' ','ř')
+   call s:Accents('R',' ','Ŕ',' ',' ',' ',' ',' ','Ŗ',' ',' ',' ',' ','Ř')
+   call s:Accents('s',' ','ś','ŝ',' ',' ',' ',' ','ş',' ','ȿ',' ',' ','š')
+   call s:Accents('S',' ','Ś','Ŝ',' ',' ',' ',' ','Ş',' ',' ',' ',' ','Š')
+   call s:Accents('t',' ',' ',' ',' ',' ',' ',' ','ţ',' ',' ',' ',' ','ť')
+   call s:Accents('T',' ',' ',' ',' ',' ',' ',' ','Ţ',' ',' ',' ',' ','Ť')
+   call s:Accents('u','ù','ú','û','ü','ũ',' ','ū',' ','ű','ų','ů','ŭ','ǔ')
+   call s:Accents('U','Ù','Ú','Û','Ü','Ũ',' ','Ū',' ','Ű','Ų','Ů','Ŭ','Ǔ')
+   call s:Accents('w',' ',' ','ŵ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ')
+   call s:Accents('W',' ',' ','Ŵ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ')
+   call s:Accents('y','ỳ','ý','ŷ','ÿ','ỹ',' ',' ',' ',' ',' ',' ',' ',' ')
+   call s:Accents('Y','Ỳ','Ý','Ŷ','Ÿ','Ỹ',' ',' ',' ',' ',' ',' ',' ',' ')
+   call s:Accents('z',' ','ź',' ',' ',' ','ż',' ',' ',' ',' ',' ',' ','ž')
+   call s:Accents('Z',' ','Ź',' ',' ',' ','Ż',' ',' ',' ',' ',' ',' ','Ž')
+   call s:Accents('\\i','ì','í','î','ï','ĩ','į',' ',' ',' ',' ',' ','ĭ',' ')
+   "                    \`  \'  \^  \"  \~  \.  \=  \c  \H  \k  \r  \u  \v
+   delfun s:Accents
+   syn match texAccent		'\\aa\>'	conceal cchar=å
+   syn match texAccent		'\\AA\>'	conceal cchar=Å
+   syn match texAccent		'\\o\>'		conceal cchar=ø
+   syn match texAccent		'\\O\>'		conceal cchar=Ø
+   syn match texLigature	'\\AE\>'	conceal cchar=Æ
+   syn match texLigature	'\\ae\>'	conceal cchar=æ
+   syn match texLigature	'\\oe\>'	conceal cchar=œ
+   syn match texLigature	'\\OE\>'	conceal cchar=Œ
+   syn match texLigature	'\\ss\>'	conceal cchar=ß
+   syn match texLigature	'--'		conceal cchar=–
+   syn match texLigature	'---'		conceal cchar=—
+  endif
+ endif
+endif
+
+" ---------------------------------------------------------------------
+" LaTeX synchronization: {{{1
+syn sync maxlines=200
+syn sync minlines=50
+
+syn  sync match texSyncStop			groupthere NONE		"%stopzone\>"
+
+" Synchronization: {{{1
+" The $..$ and $$..$$ make for impossible sync patterns
+" (one can't tell if a "$$" starts or stops a math zone by itself)
+" The following grouptheres coupled with minlines above
+" help improve the odds of good syncing.
+if !exists("g:tex_no_math")
+ syn sync match texSyncMathZoneA		groupthere NONE		"\\end{abstract}"
+ syn sync match texSyncMathZoneA		groupthere NONE		"\\end{center}"
+ syn sync match texSyncMathZoneA		groupthere NONE		"\\end{description}"
+ syn sync match texSyncMathZoneA		groupthere NONE		"\\end{enumerate}"
+ syn sync match texSyncMathZoneA		groupthere NONE		"\\end{itemize}"
+ syn sync match texSyncMathZoneA		groupthere NONE		"\\end{table}"
+ syn sync match texSyncMathZoneA		groupthere NONE		"\\end{tabular}"
+ syn sync match texSyncMathZoneA		groupthere NONE		"\\\(sub\)*section\>"
+endif
+
+" ---------------------------------------------------------------------
+" Highlighting: {{{1
+
+" Define the default highlighting. {{{1
+if !exists("skip_tex_syntax_inits")
+
+  " TeX highlighting groups which should share similar highlighting
+  if !exists("g:tex_no_error")
+   if !exists("g:tex_no_math")
+    hi def link texBadMath		texError
+    hi def link texMathDelimBad		texError
+    hi def link texMathError		texError
+    if !b:tex_stylish
+      hi def link texOnlyMath		texError
+    endif
+   endif
+   hi def link texError			Error
+  endif
+
+  hi texBoldStyle		gui=bold	cterm=bold
+  hi texItalStyle		gui=italic	cterm=italic
+  hi texBoldItalStyle		gui=bold,italic cterm=bold,italic
+  hi texItalBoldStyle		gui=bold,italic cterm=bold,italic
+  hi def link texEmphStyle	texItalStyle
+  hi def link texCite		texRefZone
+  hi def link texDefCmd		texDef
+  hi def link texDefName	texDef
+  hi def link texDocType	texCmdName
+  hi def link texDocTypeArgs	texCmdArgs
+  hi def link texInputFileOpt	texCmdArgs
+  hi def link texInputCurlies	texDelimiter
+  hi def link texLigature	texSpecialChar
+  if !exists("g:tex_no_math")
+   hi def link texMathDelimSet1	texMathDelim
+   hi def link texMathDelimSet2	texMathDelim
+   hi def link texMathDelimKey	texMathDelim
+   hi def link texMathMatcher	texMath
+   hi def link texAccent	texStatement
+   hi def link texGreek		texStatement
+   hi def link texSuperscript	texStatement
+   hi def link texSubscript	texStatement
+   hi def link texSuperscripts 	texSuperscript
+   hi def link texSubscripts 	texSubscript
+   hi def link texMathSymbol	texStatement
+   hi def link texMathZoneV	texMath
+   hi def link texMathZoneW	texMath
+   hi def link texMathZoneX	texMath
+   hi def link texMathZoneY	texMath
+   hi def link texMathZoneV	texMath
+   hi def link texMathZoneZ	texMath
+  endif
+  hi def link texBeginEnd	texCmdName
+  hi def link texBeginEndName	texSection
+  hi def link texSpaceCode	texStatement
+  hi def link texStyleStatement	texStatement
+  hi def link texTypeSize	texType
+  hi def link texTypeStyle	texType
+
+   " Basic TeX highlighting groups
+  hi def link texCmdArgs	Number
+  hi def link texCmdName	Statement
+  hi def link texComment	Comment
+  hi def link texDef		Statement
+  hi def link texDefParm	Special
+  hi def link texDelimiter	Delimiter
+  hi def link texInput		Special
+  hi def link texInputFile	Special
+  hi def link texLength		Number
+  hi def link texMath		Special
+  hi def link texMathDelim	Statement
+  hi def link texMathOper	Operator
+  hi def link texNewCmd		Statement
+  hi def link texNewEnv		Statement
+  hi def link texOption		Number
+  hi def link texRefZone	Special
+  hi def link texSection	PreCondit
+  hi def link texSpaceCodeChar	Special
+  hi def link texSpecialChar	SpecialChar
+  hi def link texStatement	Statement
+  hi def link texString		String
+  hi def link texTodo		Todo
+  hi def link texType		Type
+  hi def link texZone		PreCondit
+
+endif
+
+" Cleanup: {{{1
+delc TexFold
+unlet s:extfname
+let   b:current_syntax = "tex"
+let &cpo               = s:keepcpo
+unlet s:keepcpo
+" vim: ts=8 fdm=marker
+
+endif
diff --git a/syntax/texinfo.vim b/syntax/texinfo.vim
new file mode 100644
index 000000000..f97713f4e
--- /dev/null
+++ b/syntax/texinfo.vim
@@ -0,0 +1,400 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'texinfo') == -1
+
+" Vim syntax file
+" Language:	Texinfo (macro package for TeX)
+" Maintainer:	Sandor Kopanyi <sandor.kopanyi@mailbox.hu>
+" URL:		<->
+" Last Change:	2004 Jun 23
+"
+" the file follows the Texinfo manual structure; this file is based
+" on manual for Texinfo version 4.0, 28 September 1999
+" since @ can have special meanings, everything is 'match'-ed and 'region'-ed
+" (including @ in 'iskeyword' option has unexpected effects)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'texinfo'
+endif
+
+"in Texinfo can be real big things, like tables; sync for that
+syn sync lines=200
+
+"some general stuff
+"syn match texinfoError     "\S" contained TODO
+syn match texinfoIdent	    "\k\+"		  contained "IDENTifier
+syn match texinfoAssignment "\k\+\s*=\s*\k\+\s*$" contained "assigment statement ( var = val )
+syn match texinfoSinglePar  "\k\+\s*$"		  contained "single parameter (used for several @-commands)
+syn match texinfoIndexPar   "\k\k\s*$"		  contained "param. used for different *index commands (+ @documentlanguage command)
+
+
+"marking words and phrases (chap. 9 in Texinfo manual)
+"(almost) everything appears as 'contained' too; is for tables (@table)
+
+"this chapter is at the beginning of this file to avoid overwritings
+
+syn match texinfoSpecialChar				    "@acronym"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@acronym{" end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@b"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@b{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@cite"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@cite{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@code"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@code{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@command"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@command{" end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@dfn"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@dfn{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@email"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@email{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@emph"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@emph{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@env"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@env{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@file"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@file{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@i"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@i{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@kbd"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@kbd{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@key"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@key{"	end="}" contains=texinfoSpecialChar
+syn match texinfoSpecialChar				    "@option"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@option{"	end="}" contains=texinfoSpecialChar
+syn match texinfoSpecialChar				    "@r"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@r{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@samp"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@samp{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@sc"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@sc{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@strong"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@strong{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@t"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@t{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@url"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@url{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoSpecialChar				    "@var"		contained
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@var{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn match texinfoAtCmd "^@kbdinputstyle" nextgroup=texinfoSinglePar skipwhite
+
+
+"overview of Texinfo (chap. 1 in Texinfo manual)
+syn match texinfoComment  "@c .*"
+syn match texinfoComment  "@c$"
+syn match texinfoComment  "@comment .*"
+syn region texinfoMltlnAtCmd matchgroup=texinfoComment start="^@ignore\s*$" end="^@end ignore\s*$" contains=ALL
+
+
+"beginning a Texinfo file (chap. 3 in Texinfo manual)
+syn region texinfoPrmAtCmd     matchgroup=texinfoAtCmd start="@center "		 skip="\\$" end="$"		       contains=texinfoSpecialChar,texinfoBrcPrmAtCmd oneline
+syn region texinfoMltlnDMAtCmd matchgroup=texinfoAtCmd start="^@detailmenu\s*$"		    end="^@end detailmenu\s*$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn region texinfoPrmAtCmd     matchgroup=texinfoAtCmd start="^@setfilename "    skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd     matchgroup=texinfoAtCmd start="^@settitle "       skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd     matchgroup=texinfoAtCmd start="^@shorttitlepage " skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd     matchgroup=texinfoAtCmd start="^@title "		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoBrcPrmAtCmd  matchgroup=texinfoAtCmd start="@titlefont{"		    end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn region texinfoMltlnAtCmd   matchgroup=texinfoAtCmd start="^@titlepage\s*$"		    end="^@end titlepage\s*$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoMltlnDMAtCmd,texinfoAtCmd,texinfoPrmAtCmd,texinfoMltlnAtCmd
+syn region texinfoPrmAtCmd     matchgroup=texinfoAtCmd start="^@vskip "		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn match texinfoAtCmd "^@exampleindent"     nextgroup=texinfoSinglePar skipwhite
+syn match texinfoAtCmd "^@headings"	     nextgroup=texinfoSinglePar skipwhite
+syn match texinfoAtCmd "^\\input"	     nextgroup=texinfoSinglePar skipwhite
+syn match texinfoAtCmd "^@paragraphindent"   nextgroup=texinfoSinglePar skipwhite
+syn match texinfoAtCmd "^@setchapternewpage" nextgroup=texinfoSinglePar skipwhite
+
+
+"ending a Texinfo file (chap. 4 in Texinfo manual)
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="@author " skip="\\$" end="$" contains=texinfoSpecialChar oneline
+"all below @bye should be comment TODO
+syn match texinfoAtCmd "^@bye\s*$"
+syn match texinfoAtCmd "^@contents\s*$"
+syn match texinfoAtCmd "^@printindex" nextgroup=texinfoIndexPar skipwhite
+syn match texinfoAtCmd "^@setcontentsaftertitlepage\s*$"
+syn match texinfoAtCmd "^@setshortcontentsaftertitlepage\s*$"
+syn match texinfoAtCmd "^@shortcontents\s*$"
+syn match texinfoAtCmd "^@summarycontents\s*$"
+
+
+"chapter structuring (chap. 5 in Texinfo manual)
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@appendix"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@appendixsec"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@appendixsection"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@appendixsubsec"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@appendixsubsubsec"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@centerchap"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@chapheading"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@chapter"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@heading"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@majorheading"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@section"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@subheading "	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@subsection"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@subsubheading"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@subsubsection"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@subtitle"		 skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@unnumbered"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@unnumberedsec"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@unnumberedsubsec"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@unnumberedsubsubsec" skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn match  texinfoAtCmd "^@lowersections\s*$"
+syn match  texinfoAtCmd "^@raisesections\s*$"
+
+
+"nodes (chap. 6 in Texinfo manual)
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@anchor{"		  end="}"
+syn region texinfoPrmAtCmd    matchgroup=texinfoAtCmd start="^@top"    skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd    matchgroup=texinfoAtCmd start="^@node"   skip="\\$" end="$" contains=texinfoSpecialChar oneline
+
+
+"menus (chap. 7 in Texinfo manual)
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@menu\s*$" end="^@end menu\s*$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoMltlnDMAtCmd
+
+
+"cross references (chap. 8 in Texinfo manual)
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@inforef{" end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@pxref{"   end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@ref{"     end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@uref{"    end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@xref{"    end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+
+
+"marking words and phrases (chap. 9 in Texinfo manual)
+"(almost) everything appears as 'contained' too; is for tables (@table)
+
+"this chapter is at the beginning of this file to avoid overwritings
+
+
+"quotations and examples (chap. 10 in Texinfo manual)
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@cartouche\s*$"	    end="^@end cartouche\s*$"	    contains=ALL
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@display\s*$"	    end="^@end display\s*$"	    contains=ALL
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@example\s*$"	    end="^@end example\s*$"	    contains=ALL
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@flushleft\s*$"	    end="^@end flushleft\s*$"	    contains=ALL
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@flushright\s*$"	    end="^@end flushright\s*$"	    contains=ALL
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@format\s*$"	    end="^@end format\s*$"	    contains=ALL
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@lisp\s*$"		    end="^@end lisp\s*$"	    contains=ALL
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@quotation\s*$"	    end="^@end quotation\s*$"	    contains=ALL
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@smalldisplay\s*$"     end="^@end smalldisplay\s*$"    contains=ALL
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@smallexample\s*$"     end="^@end smallexample\s*$"    contains=ALL
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@smallformat\s*$"	    end="^@end smallformat\s*$"     contains=ALL
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@smalllisp\s*$"	    end="^@end smalllisp\s*$"	    contains=ALL
+syn region texinfoPrmAtCmd   matchgroup=texinfoAtCmd start="^@exdent"	 skip="\\$" end="$"			    contains=texinfoSpecialChar oneline
+syn match texinfoAtCmd "^@noindent\s*$"
+syn match texinfoAtCmd "^@smallbook\s*$"
+
+
+"lists and tables (chap. 11 in Texinfo manual)
+syn match texinfoAtCmd "@asis"		   contained
+syn match texinfoAtCmd "@columnfractions"  contained
+syn match texinfoAtCmd "@item"		   contained
+syn match texinfoAtCmd "@itemx"		   contained
+syn match texinfoAtCmd "@tab"		   contained
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@enumerate"  end="^@end enumerate\s*$"  contains=ALL
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ftable"     end="^@end ftable\s*$"     contains=ALL
+syn region texinfoMltlnNAtCmd matchgroup=texinfoAtCmd start="^@itemize"    end="^@end itemize\s*$"    contains=ALL
+syn region texinfoMltlnNAtCmd matchgroup=texinfoAtCmd start="^@multitable" end="^@end multitable\s*$" contains=ALL
+syn region texinfoMltlnNAtCmd matchgroup=texinfoAtCmd start="^@table"      end="^@end table\s*$"      contains=ALL
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@vtable"     end="^@end vtable\s*$"     contains=ALL
+
+
+"indices (chap. 12 in Texinfo manual)
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@\(c\|f\|k\|p\|t\|v\)index"   skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@..index"			 skip="\\$" end="$" contains=texinfoSpecialChar oneline
+"@defcodeindex and @defindex is defined after chap. 15's @def* commands (otherwise those ones will overwrite these ones)
+syn match texinfoSIPar "\k\k\s*\k\k\s*$" contained
+syn match texinfoAtCmd "^@syncodeindex" nextgroup=texinfoSIPar skipwhite
+syn match texinfoAtCmd "^@synindex"     nextgroup=texinfoSIPar skipwhite
+
+"special insertions (chap. 13 in Texinfo manual)
+syn match texinfoSpecialChar "@\(!\|?\|@\|\s\)"
+syn match texinfoSpecialChar "@{"
+syn match texinfoSpecialChar "@}"
+"accents
+syn match texinfoSpecialChar "@=."
+syn match texinfoSpecialChar "@\('\|\"\|\^\|`\)[aeiouyAEIOUY]"
+syn match texinfoSpecialChar "@\~[aeinouyAEINOUY]"
+syn match texinfoSpecialChar "@dotaccent{.}"
+syn match texinfoSpecialChar "@H{.}"
+syn match texinfoSpecialChar "@,{[cC]}"
+syn match texinfoSpecialChar "@AA{}"
+syn match texinfoSpecialChar "@aa{}"
+syn match texinfoSpecialChar "@L{}"
+syn match texinfoSpecialChar "@l{}"
+syn match texinfoSpecialChar "@O{}"
+syn match texinfoSpecialChar "@o{}"
+syn match texinfoSpecialChar "@ringaccent{.}"
+syn match texinfoSpecialChar "@tieaccent{..}"
+syn match texinfoSpecialChar "@u{.}"
+syn match texinfoSpecialChar "@ubaraccent{.}"
+syn match texinfoSpecialChar "@udotaccent{.}"
+syn match texinfoSpecialChar "@v{.}"
+"ligatures
+syn match texinfoSpecialChar "@AE{}"
+syn match texinfoSpecialChar "@ae{}"
+syn match texinfoSpecialChar "@copyright{}"
+syn match texinfoSpecialChar "@bullet" contained "for tables and lists
+syn match texinfoSpecialChar "@bullet{}"
+syn match texinfoSpecialChar "@dotless{i}"
+syn match texinfoSpecialChar "@dotless{j}"
+syn match texinfoSpecialChar "@dots{}"
+syn match texinfoSpecialChar "@enddots{}"
+syn match texinfoSpecialChar "@equiv" contained "for tables and lists
+syn match texinfoSpecialChar "@equiv{}"
+syn match texinfoSpecialChar "@error{}"
+syn match texinfoSpecialChar "@exclamdown{}"
+syn match texinfoSpecialChar "@expansion{}"
+syn match texinfoSpecialChar "@minus" contained "for tables and lists
+syn match texinfoSpecialChar "@minus{}"
+syn match texinfoSpecialChar "@OE{}"
+syn match texinfoSpecialChar "@oe{}"
+syn match texinfoSpecialChar "@point" contained "for tables and lists
+syn match texinfoSpecialChar "@point{}"
+syn match texinfoSpecialChar "@pounds{}"
+syn match texinfoSpecialChar "@print{}"
+syn match texinfoSpecialChar "@questiondown{}"
+syn match texinfoSpecialChar "@result" contained "for tables and lists
+syn match texinfoSpecialChar "@result{}"
+syn match texinfoSpecialChar "@ss{}"
+syn match texinfoSpecialChar "@TeX{}"
+"other
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@dmn{"      end="}"
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@footnote{" end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@image{"    end="}"
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@math{"     end="}"
+syn match texinfoAtCmd "@footnotestyle" nextgroup=texinfoSinglePar skipwhite
+
+
+"making and preventing breaks (chap. 14 in Texinfo manual)
+syn match texinfoSpecialChar  "@\(\*\|-\|\.\)"
+syn match texinfoAtCmd	      "^@need"	   nextgroup=texinfoSinglePar skipwhite
+syn match texinfoAtCmd	      "^@page\s*$"
+syn match texinfoAtCmd	      "^@sp"	   nextgroup=texinfoSinglePar skipwhite
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@group\s*$"   end="^@end group\s*$" contains=ALL
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@hyphenation{" end="}"
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@w{"	    end="}"		  contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+
+
+"definition commands (chap. 15 in Texinfo manual)
+syn match texinfoMltlnAtCmdFLine "^@def\k\+" contained
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@def\k\+" end="^@end def\k\+$"      contains=ALL
+
+"next 2 commands are from chap. 12; must be defined after @def* commands above to overwrite them
+syn match texinfoAtCmd "@defcodeindex" nextgroup=texinfoIndexPar skipwhite
+syn match texinfoAtCmd "@defindex" nextgroup=texinfoIndexPar skipwhite
+
+
+"conditionally visible text (chap. 16 in Texinfo manual)
+syn match texinfoAtCmd "^@clear" nextgroup=texinfoSinglePar skipwhite
+syn region texinfoMltln2AtCmd matchgroup=texinfoAtCmd start="^@html\s*$"	end="^@end html\s*$"
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifclear"		end="^@end ifclear\s*$"   contains=ALL
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifhtml"		end="^@end ifhtml\s*$"	  contains=ALL
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifinfo"		end="^@end ifinfo\s*$"	  contains=ALL
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifnothtml"	end="^@end ifnothtml\s*$" contains=ALL
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifnotinfo"	end="^@end ifnotinfo\s*$" contains=ALL
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifnottex"	end="^@end ifnottex\s*$"  contains=ALL
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifset"		end="^@end ifset\s*$"	  contains=ALL
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@iftex"		end="^@end iftex\s*$"	  contains=ALL
+syn region texinfoPrmAtCmd    matchgroup=texinfoAtCmd start="^@set " skip="\\$" end="$" contains=texinfoSpecialChar oneline
+syn region texinfoTexCmd			      start="\$\$"		end="\$\$" contained
+syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@tex"		end="^@end tex\s*$"	  contains=texinfoTexCmd
+syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@value{"		end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+
+
+"internationalization (chap. 17 in Texinfo manual)
+syn match texinfoAtCmd "@documentencoding" nextgroup=texinfoSinglePar skipwhite
+syn match texinfoAtCmd "@documentlanguage" nextgroup=texinfoIndexPar skipwhite
+
+
+"defining new texinfo commands (chap. 18 in Texinfo manual)
+syn match texinfoAtCmd	"@alias"		      nextgroup=texinfoAssignment skipwhite
+syn match texinfoDIEPar "\S*\s*,\s*\S*\s*,\s*\S*\s*$" contained
+syn match texinfoAtCmd	"@definfoenclose"	      nextgroup=texinfoDIEPar	  skipwhite
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@macro" end="^@end macro\s*$" contains=ALL
+
+
+"formatting hardcopy (chap. 19 in Texinfo manual)
+syn match texinfoAtCmd "^@afourlatex\s*$"
+syn match texinfoAtCmd "^@afourpaper\s*$"
+syn match texinfoAtCmd "^@afourwide\s*$"
+syn match texinfoAtCmd "^@finalout\s*$"
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@pagesizes" end="$" oneline
+
+
+"creating and installing Info Files (chap. 20 in Texinfo manual)
+syn region texinfoPrmAtCmd   matchgroup=texinfoAtCmd start="^@dircategory"  skip="\\$" end="$" oneline
+syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@direntry\s*$"	       end="^@end direntry\s*$" contains=texinfoSpecialChar
+syn match  texinfoAtCmd "^@novalidate\s*$"
+
+
+"include files (appendix E in Texinfo manual)
+syn match texinfoAtCmd "^@include" nextgroup=texinfoSinglePar skipwhite
+
+
+"page headings (appendix F in Texinfo manual)
+syn match texinfoHFSpecialChar "@|"		  contained
+syn match texinfoThisAtCmd     "@thischapter"	  contained
+syn match texinfoThisAtCmd     "@thischaptername" contained
+syn match texinfoThisAtCmd     "@thisfile"	  contained
+syn match texinfoThisAtCmd     "@thispage"	  contained
+syn match texinfoThisAtCmd     "@thistitle"	  contained
+syn match texinfoThisAtCmd     "@today{}"	  contained
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@evenfooting"  skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoThisAtCmd,texinfoHFSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@evenheading"  skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoThisAtCmd,texinfoHFSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@everyfooting" skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoThisAtCmd,texinfoHFSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@everyheading" skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoThisAtCmd,texinfoHFSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@oddfooting"   skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoThisAtCmd,texinfoHFSpecialChar oneline
+syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@oddheading"   skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoThisAtCmd,texinfoHFSpecialChar oneline
+
+
+"refilling paragraphs (appendix H in Texinfo manual)
+syn match  texinfoAtCmd "@refill"
+
+
+syn cluster texinfoAll contains=ALLBUT,texinfoThisAtCmd,texinfoHFSpecialChar
+syn cluster texinfoReducedAll contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+"==============================================================================
+" highlighting
+
+" Only when an item doesn't have highlighting yet
+
+hi def link texinfoSpecialChar	Special
+hi def link texinfoHFSpecialChar	Special
+
+hi def link texinfoError		Error
+hi def link texinfoIdent		Identifier
+hi def link texinfoAssignment	Identifier
+hi def link texinfoSinglePar	Identifier
+hi def link texinfoIndexPar	Identifier
+hi def link texinfoSIPar		Identifier
+hi def link texinfoDIEPar		Identifier
+hi def link texinfoTexCmd		PreProc
+
+
+hi def link texinfoAtCmd		Statement	"@-command
+hi def link texinfoPrmAtCmd	String		"@-command in one line with unknown nr. of parameters
+					      "is String because is found as a region and is 'matchgroup'-ed
+					      "to texinfoAtCmd
+hi def link texinfoBrcPrmAtCmd	String		"@-command with parameter(s) in braces ({})
+					      "is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
+hi def link texinfoMltlnAtCmdFLine  texinfoAtCmd	"repeated embedded First lines in @-commands
+hi def link texinfoMltlnAtCmd	String		"@-command in multiple lines
+					      "is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
+hi def link texinfoMltln2AtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
+hi def link texinfoMltlnDMAtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors; used for @detailmenu, which can be included in @menu)
+hi def link texinfoMltlnNAtCmd	Normal		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
+hi def link texinfoThisAtCmd	Statement	"@-command used in headers and footers (@this... series)
+
+hi def link texinfoComment	Comment
+
+
+
+let b:current_syntax = "texinfo"
+
+if main_syntax == 'texinfo'
+  unlet main_syntax
+endif
+
+" vim: ts=8
+
+endif
diff --git a/syntax/texmf.vim b/syntax/texmf.vim
new file mode 100644
index 000000000..e6da43cbc
--- /dev/null
+++ b/syntax/texmf.vim
@@ -0,0 +1,78 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'texmf') == -1
+
+" Vim syntax file
+" This is a GENERATED FILE. Please always refer to source file at the URI below.
+" Language: Web2C TeX texmf.cnf configuration file
+" Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2001-05-13
+" URL: http://physics.muni.cz/~yeti/download/syntax/texmf.vim
+
+" Setup
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+" Comments
+syn match texmfComment "%..\+$" contains=texmfTodo
+syn match texmfComment "%\s*$" contains=texmfTodo
+syn keyword texmfTodo TODO FIXME XXX NOT contained
+
+" Constants and parameters
+syn match texmfPassedParameter "[-+]\=%\w\W"
+syn match texmfPassedParameter "[-+]\=%\w$"
+syn match texmfNumber "\<\d\+\>"
+syn match texmfVariable "\$\(\w\k*\|{\w\k*}\)"
+syn match texmfSpecial +\\"\|\\$+
+syn region texmfString start=+"+ end=+"+ skip=+\\"\\\\+ contains=texmfVariable,texmfSpecial,texmfPassedParameter
+
+" Assignments
+syn match texmfLHSStart "^\s*\w\k*" nextgroup=texmfLHSDot,texmfEquals
+syn match texmfLHSVariable "\w\k*" contained nextgroup=texmfLHSDot,texmfEquals
+syn match texmfLHSDot "\." contained nextgroup=texmfLHSVariable
+syn match texmfEquals "\s*=" contained
+
+" Specialities
+syn match texmfComma "," contained
+syn match texmfColons ":\|;"
+syn match texmfDoubleExclam "!!" contained
+
+" Catch errors caused by wrong parenthesization
+syn region texmfBrace matchgroup=texmfBraceBrace start="{" end="}" contains=ALLBUT,texmfTodo,texmfBraceError,texmfLHSVariable,texmfLHSDot transparent
+syn match texmfBraceError "}"
+
+" Define the default highlighting
+
+hi def link texmfComment Comment
+hi def link texmfTodo Todo
+
+hi def link texmfPassedParameter texmfVariable
+hi def link texmfVariable Identifier
+
+hi def link texmfNumber Number
+hi def link texmfString String
+
+hi def link texmfLHSStart texmfLHS
+hi def link texmfLHSVariable texmfLHS
+hi def link texmfLHSDot texmfLHS
+hi def link texmfLHS Type
+
+hi def link texmfEquals Normal
+
+hi def link texmfBraceBrace texmfDelimiter
+hi def link texmfComma texmfDelimiter
+hi def link texmfColons texmfDelimiter
+hi def link texmfDelimiter Preproc
+
+hi def link texmfDoubleExclam Statement
+hi def link texmfSpecial Special
+
+hi def link texmfBraceError texmfError
+hi def link texmfError Error
+
+
+let b:current_syntax = "texmf"
+
+endif
diff --git a/syntax/tf.vim b/syntax/tf.vim
new file mode 100644
index 000000000..bad76201e
--- /dev/null
+++ b/syntax/tf.vim
@@ -0,0 +1,200 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tf') == -1
+
+" Vim syntax file
+" Language:	tf
+" Maintainer:	Lutz Eymers <ixtab@polzin.com>
+" URL:		http://www.isp.de/data/tf.vim
+" Email:	send syntax_vim.tgz
+" Last Change:	2001 May 10
+"
+" Options	lite_minlines = x     to sync at least x lines backwards
+
+" Remove any old syntax stuff hanging around
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+if !exists("main_syntax")
+  let main_syntax = 'tf'
+endif
+
+" Special global variables
+syn keyword tfVar  HOME LANG MAIL SHELL TERM TFHELP TFLIBDIR TFLIBRARY TZ  contained
+syn keyword tfVar  background backslash  contained
+syn keyword tfVar  bamf bg_output borg clearfull cleardone clock connect  contained
+syn keyword tfVar  emulation end_color gag gethostbyname gpri hook hilite  contained
+syn keyword tfVar  hiliteattr histsize hpri insert isize istrip kecho  contained
+syn keyword tfVar  kprefix login lp lpquote maildelay matching max_iter  contained
+syn keyword tfVar  max_recur mecho more mprefix oldslash promt_sec  contained
+syn keyword tfVar  prompt_usec proxy_host proxy_port ptime qecho qprefix  contained
+syn keyword tfVar  quite quitdone redef refreshtime scroll shpause snarf sockmload  contained
+syn keyword tfVar  start_color tabsize telopt sub time_format visual  contained
+syn keyword tfVar  watch_dog watchname wordpunct wrap wraplog wrapsize  contained
+syn keyword tfVar  wrapspace  contained
+
+" Worldvar
+syn keyword tfWorld  world_name world_character world_password world_host contained
+syn keyword tfWorld  world_port world_mfile world_type contained
+
+" Number
+syn match tfNumber  "-\=\<\d\+\>"
+
+" Float
+syn match tfFloat  "\(-\=\<\d+\|-\=\)\.\d\+\>"
+
+" Operator
+syn match tfOperator  "[-+=?:&|!]"
+syn match tfOperator  "/[^*~@]"he=e-1
+syn match tfOperator  ":="
+syn match tfOperator  "[^/%]\*"hs=s+1
+syn match tfOperator  "$\+[([{]"he=e-1,me=e-1
+syn match tfOperator  "\^\[\+"he=s+1 contains=tfSpecialCharEsc
+
+" Relational
+syn match tfRelation  "&&"
+syn match tfRelation  "||"
+syn match tfRelation  "[<>/!=]="
+syn match tfRelation  "[<>]"
+syn match tfRelation  "[!=]\~"
+syn match tfRelation  "[=!]/"
+
+
+" Readonly Var
+syn match tfReadonly  "[#*]" contained
+syn match tfReadonly  "\<-\=L\=\d\{-}\>" contained
+syn match tfReadonly  "\<P\(\d\+\|R\|L\)\>" contained
+syn match tfReadonly  "\<R\>" contained
+
+" Identifier
+syn match tfIdentifier "%\+[a-zA-Z_#*-0-9]\w*" contains=tfVar,tfReadonly
+syn match tfIdentifier "%\+[{]"he=e-1,me=e-1
+syn match tfIdentifier "\$\+{[a-zA-Z_#*-0-9]\w*}" contains=tfWorld
+
+" Function names
+syn keyword tfFunctions  ascii char columns echo filename ftime fwrite getopts
+syn keyword tfFunctions  getpid idle kbdel kbgoto kbhead kblen kbmatch kbpoint
+syn keyword tfFunctions  kbtail kbwordleft kbwordright keycode lines mod
+syn keyword tfFunctions  moresize pad rand read regmatch send strcat strchr
+syn keyword tfFunctions  strcmp strlen strncmp strrchr strrep strstr substr
+syn keyword tfFunctions  systype time tolower toupper
+
+syn keyword tfStatement  addworld bamf beep bind break cat changes connect  contained
+syn keyword tfStatement  dc def dokey echo edit escape eval export expr fg for  contained
+syn keyword tfStatement  gag getfile grab help hilite histsize hook if input  contained
+syn keyword tfStatement  kill lcd let list listsockets listworlds load  contained
+syn keyword tfStatement  localecho log nohilite not partial paste ps purge  contained
+syn keyword tfStatement  purgeworld putfile quit quote recall recordline save  contained
+syn keyword tfStatement  saveworld send sh shift sub substitute  contained
+syn keyword tfStatement  suspend telnet test time toggle trig trigger unbind  contained
+syn keyword tfStatement  undef undefn undeft unhook  untrig unworld  contained
+syn keyword tfStatement  version watchdog watchname while world  contained
+
+" Hooks
+syn keyword tfHook  ACTIVITY BACKGROUND BAMF CONFAIL CONFLICT CONNECT DISCONNECT
+syn keyword tfHook  KILL LOAD LOADFAIL LOG LOGIN MAIL MORE PENDING PENDING
+syn keyword tfHook  PROCESS PROMPT PROXY REDEF RESIZE RESUME SEND SHADOW SHELL
+syn keyword tfHook  SIGHUP SIGTERM SIGUSR1 SIGUSR2 WORLD
+
+" Conditional
+syn keyword tfConditional  if endif then else elseif  contained
+
+" Repeat
+syn keyword tfRepeat  while do done repeat for  contained
+
+" Statement
+syn keyword tfStatement  break quit contained
+
+" Include
+syn keyword  tfInclude require load save loaded contained
+
+" Define
+syn keyword  tfDefine bind unbind def undef undefn undefn purge hook unhook trig untrig  contained
+syn keyword  tfDefine set unset setenv  contained
+
+" Todo
+syn keyword  tfTodo TODO Todo todo  contained
+
+" SpecialChar
+syn match tfSpecialChar "\\[abcfnrtyv\\]" contained
+syn match tfSpecialChar "\\\d\{3}" contained contains=tfOctalError
+syn match tfSpecialChar "\\x[0-9a-fA-F]\{2}" contained
+syn match tfSpecialCharEsc "\[\+" contained
+
+syn match tfOctalError "[89]" contained
+
+" Comment
+syn region tfComment		start="^;" end="$"  contains=tfTodo
+
+" String
+syn region tfString   oneline matchgroup=None start=+'+  skip=+\\\\\|\\'+  end=+'+ contains=tfIdentifier,tfSpecialChar,tfEscape
+syn region tfString   matchgroup=None start=+"+  skip=+\\\\\|\\"+  end=+"+ contains=tfIdentifier,tfSpecialChar,tfEscape
+
+syn match tfParentError "[)}\]]"
+
+" Parents
+syn region tfParent matchgroup=Delimiter start="(" end=")" contains=ALLBUT,tfReadonly
+syn region tfParent matchgroup=Delimiter start="\[" end="\]" contains=ALL
+syn region tfParent matchgroup=Delimiter start="{" end="}" contains=ALL
+
+syn match tfEndCommand "%%\{-};"
+syn match tfJoinLines "\\$"
+
+" Types
+
+syn match tfType "/[a-zA-Z_~@][a-zA-Z0-9_]*" contains=tfConditional,tfRepeat,tfStatement,tfInclude,tfDefine,tfStatement
+
+" Catch /quote .. '
+syn match tfQuotes "/quote .\{-}'" contains=ALLBUT,tfString
+" Catch $(/escape   )
+syn match tfEscape "(/escape .*)"
+
+" sync
+if exists("tf_minlines")
+  exec "syn sync minlines=" . tf_minlines
+else
+  syn sync minlines=100
+endif
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link tfComment		Comment
+hi def link tfString		String
+hi def link tfNumber		Number
+hi def link tfFloat		Float
+hi def link tfIdentifier		Identifier
+hi def link tfVar			Identifier
+hi def link tfWorld		Identifier
+hi def link tfReadonly		Identifier
+hi def link tfHook		Identifier
+hi def link tfFunctions		Function
+hi def link tfRepeat		Repeat
+hi def link tfConditional		Conditional
+hi def link tfLabel		Label
+hi def link tfStatement		Statement
+hi def link tfType		Type
+hi def link tfInclude		Include
+hi def link tfDefine		Define
+hi def link tfSpecialChar		SpecialChar
+hi def link tfSpecialCharEsc	SpecialChar
+hi def link tfParentError		Error
+hi def link tfTodo		Todo
+hi def link tfEndCommand		Delimiter
+hi def link tfJoinLines		Delimiter
+hi def link tfOperator		Operator
+hi def link tfRelation		Operator
+
+
+let b:current_syntax = "tf"
+
+if main_syntax == 'tf'
+  unlet main_syntax
+endif
+
+" vim: ts=8
+
+endif
diff --git a/syntax/tidy.vim b/syntax/tidy.vim
new file mode 100644
index 000000000..46e12bbaf
--- /dev/null
+++ b/syntax/tidy.vim
@@ -0,0 +1,139 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tidy') == -1
+
+" Vim syntax file
+" Language:	HMTL Tidy configuration file (/etc/tidyrc ~/.tidyrc)
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2016 Apr 24
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn iskeyword @,48-57,-,_
+
+syn case ignore
+syn keyword	tidyBoolean	contained t[rue] f[alse] y[es] n[o] 1 0
+syn keyword	tidyAutoBoolean	contained t[rue] f[alse] y[es] n[o] 1 0 auto
+syn case match
+syn keyword	tidyDoctype	contained html5 omit auto strict loose transitional user
+syn keyword	tidyEncoding	contained raw ascii latin0 latin1 utf8 iso2022 mac win1252 ibm858 utf16le utf16be utf16 big5 shiftjis
+syn keyword	tidyNewline	contained LF CRLF CR
+syn match	tidyNumber	contained "\<\d\+\>"
+syn keyword	tidyRepeat	contained keep-first keep-last
+syn keyword	tidySorter	contained alpha none
+syn region	tidyString	contained start=+"+ skip=+\\\\\|\\"+ end=+"+ oneline
+syn region	tidyString	contained start=+'+ skip=+\\\\\|\\'+ end=+'+ oneline
+syn match	tidyTags	contained "\<\w\+\(\s*,\s*\w\+\)*\>"
+
+syn keyword tidyBooleanOption add-xml-decl add-xml-pi add-xml-space
+	\ anchor-as-name ascii-chars assume-xml-procins bare break-before-br
+	\ clean coerce-endtags decorate-inferred-ul drop-empty-paras
+	\ drop-empty-elements drop-font-tags drop-proprietary-attributes
+	\ enclose-block-text enclose-text escape-cdata escape-scripts
+	\ fix-backslash fix-bad-comments fix-uri force-output gdoc gnu-emacs
+	\ hide-comments hide-endtags indent-attributes indent-cdata
+	\ indent-with-tabs input-xml join-classes join-styles keep-time
+	\ language literal-attributes logical-emphasis lower-literals markup
+	\ merge-emphasis ncr numeric-entities omit-optional-tags output-html
+	\ output-xhtml output-xml preserve-entities punctuation-wrap quiet
+	\ quote-ampersand quote-marks quote-nbsp raw replace-color show-info
+	\ show-warnings skip-nested split strict-tags-attributes tidy-mark
+	\ uppercase-attributes uppercase-tags word-2000 wrap-asp
+	\ wrap-attributes wrap-jste wrap-php wrap-script-literals
+	\ wrap-sections write-back
+	\ contained nextgroup=tidyBooleanDelimiter
+
+syn match tidyBooleanDelimiter ":" nextgroup=tidyBoolean contained skipwhite
+
+syn keyword tidyAutoBooleanOption indent merge-divs merge-spans output-bom show-body-only vertical-space contained nextgroup=tidyAutoBooleanDelimiter
+syn match tidyAutoBooleanDelimiter ":" nextgroup=tidyAutoBoolean contained skipwhite
+
+syn keyword tidyCSSSelectorOption css-prefix contained nextgroup=tidyCSSSelectorDelimiter
+syn match tidyCSSSelectorDelimiter ":" nextgroup=tidyCSSSelector contained skipwhite
+
+syn keyword tidyDoctypeOption doctype contained nextgroup=tidyDoctypeDelimiter
+syn match tidyDoctypeDelimiter ":" nextgroup=tidyDoctype contained skipwhite
+
+syn keyword tidyEncodingOption char-encoding input-encoding output-encoding contained nextgroup=tidyEncodingDelimiter
+syn match tidyEncodingDelimiter ":" nextgroup=tidyEncoding contained skipwhite
+
+syn keyword tidyIntegerOption accessibility-check doctype-mode indent-spaces show-errors tab-size wrap contained nextgroup=tidyIntegerDelimiter
+syn match tidyIntegerDelimiter ":" nextgroup=tidyNumber contained skipwhite
+
+syn keyword tidyNameOption slide-style contained nextgroup=tidyNameDelimiter
+syn match tidyNameDelimiter ":" nextgroup=tidyName contained skipwhite
+
+syn keyword tidyNewlineOption newline contained nextgroup=tidyNewlineDelimiter
+syn match tidyNewlineDelimiter ":" nextgroup=tidyNewline contained skipwhite
+
+syn keyword tidyTagsOption new-blocklevel-tags new-empty-tags new-inline-tags new-pre-tags contained nextgroup=tidyTagsDelimiter
+syn match tidyTagsDelimiter ":" nextgroup=tidyTags contained skipwhite
+
+syn keyword tidyRepeatOption repeated-attributes contained nextgroup=tidyRepeatDelimiter
+syn match tidyRepeatDelimiter ":" nextgroup=tidyRepeat contained skipwhite
+
+syn keyword tidySorterOption sort-attributes contained nextgroup=tidySorterDelimiter
+syn match tidySorterDelimiter ":" nextgroup=tidySorter contained skipwhite
+
+syn keyword tidyStringOption alt-text error-file gnu-emacs-file output-file contained nextgroup=tidyStringDelimiter
+syn match tidyStringDelimiter ":" nextgroup=tidyString contained skipwhite
+
+syn cluster tidyOptions contains=tidy.*Option
+
+syn match tidyStart "^" nextgroup=@tidyOptions
+
+syn match	tidyComment	"^\s*//.*$" contains=tidyTodo
+syn match	tidyComment	"^\s*#.*$"  contains=tidyTodo
+syn keyword	tidyTodo	TODO NOTE FIXME XXX contained
+
+hi def link tidyAutoBooleanOption	Identifier
+hi def link tidyBooleanOption		Identifier
+hi def link tidyCSSSelectorOption	Identifier
+hi def link tidyDoctypeOption		Identifier
+hi def link tidyEncodingOption		Identifier
+hi def link tidyIntegerOption		Identifier
+hi def link tidyNameOption		Identifier
+hi def link tidyNewlineOption		Identifier
+hi def link tidyTagsOption		Identifier
+hi def link tidyRepeatOption		Identifier
+hi def link tidySorterOption		Identifier
+hi def link tidyStringOption		Identifier
+
+hi def link tidyAutoBooleanDelimiter	Special
+hi def link tidyBooleanDelimiter	Special
+hi def link tidyCSSSelectorDelimiter	Special
+hi def link tidyDoctypeDelimiter	Special
+hi def link tidyEncodingDelimiter	Special
+hi def link tidyIntegerDelimiter	Special
+hi def link tidyNameDelimiter		Special
+hi def link tidyNewlineDelimiter	Special
+hi def link tidyTagsDelimiter		Special
+hi def link tidyRepeatDelimiter		Special
+hi def link tidySorterDelimiter		Special
+hi def link tidyStringDelimiter		Special
+
+hi def link tidyAutoBoolean		Boolean
+hi def link tidyBoolean			Boolean
+hi def link tidyDoctype			Constant
+hi def link tidyEncoding		Constant
+hi def link tidyNewline			Constant
+hi def link tidyTags			Constant
+hi def link tidyNumber			Number
+hi def link tidyRepeat			Constant
+hi def link tidySorter			Constant
+hi def link tidyString			String
+
+hi def link tidyComment			Comment
+hi def link tidyTodo			Todo
+
+let b:current_syntax = "tidy"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8
+
+endif
diff --git a/syntax/tilde.vim b/syntax/tilde.vim
new file mode 100644
index 000000000..af221da47
--- /dev/null
+++ b/syntax/tilde.vim
@@ -0,0 +1,45 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tilde') == -1
+
+" Vim syntax file
+" This file works only for Vim6.x
+" Language:	Tilde
+" Maintainer:	Tobias Rundstr�m <tobi@tildesoftware.net>
+" URL:		http://www.tildesoftware.net
+" CVS:		$Id: tilde.vim,v 1.1 2004/06/13 19:31:51 vimboss Exp $
+
+if exists("b:current_syntax")
+  finish
+endif
+
+"tilde dosent care ...
+syn case ignore
+
+syn match	tildeFunction	"\~[a-z_0-9]\+"ms=s+1
+syn region	tildeParen	start="(" end=")" contains=tildeString,tildeNumber,tildeVariable,tildeField,tildeSymtab,tildeFunction,tildeParen,tildeHexNumber,tildeOperator
+syn region	tildeString	contained start=+"+ skip=+\\\\\|\\"+ end=+"+ keepend
+syn region	tildeString	contained start=+'+ skip=+\\\\\|\\"+ end=+'+ keepend
+syn match	tildeNumber	"\d" contained
+syn match	tildeOperator	"or\|and" contained
+syn match	tildeHexNumber  "0x[a-z0-9]\+" contained
+syn match	tildeVariable	"$[a-z_0-9]\+" contained
+syn match	tildeField	"%[a-z_0-9]\+" contained
+syn match	tildeSymtab	"@[a-z_0-9]\+" contained
+syn match	tildeComment	"^#.*"
+syn region	tildeCurly	start=+{+ end=+}+ contained contains=tildeLG,tildeString,tildeNumber,tildeVariable,tildeField,tildeFunction,tildeSymtab,tildeHexNumber
+syn match	tildeLG		"=>" contained
+
+
+hi def link	tildeComment	Comment
+hi def link	tildeFunction	Operator
+hi def link	tildeOperator	Operator
+hi def link	tildeString	String
+hi def link	tildeNumber	Number
+hi def link	tildeHexNumber	Number
+hi def link	tildeVariable	Identifier
+hi def link	tildeField	Identifier
+hi def link	tildeSymtab	Identifier
+hi def link	tildeError	Error
+
+let b:current_syntax = "tilde"
+
+endif
diff --git a/syntax/tli.vim b/syntax/tli.vim
new file mode 100644
index 000000000..bbb5b4eb4
--- /dev/null
+++ b/syntax/tli.vim
@@ -0,0 +1,62 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tli') == -1
+
+" Vim syntax file
+" Language:	TealInfo source files (*.tli)
+" Maintainer:	Kurt W. Andrews <kandrews@fastrans.net>
+" Last Change:	2001 May 10
+" Version:      1.0
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" TealInfo Objects
+
+syn keyword tliObject LIST POPLIST WINDOW POPWINDOW OUTLINE CHECKMARK GOTO
+syn keyword tliObject LABEL IMAGE RECT TRES PASSWORD POPEDIT POPIMAGE CHECKLIST
+
+" TealInfo Fields
+
+syn keyword tliField X Y W H BX BY BW BH SX SY FONT BFONT CYCLE DELAY TABS
+syn keyword tliField STYLE BTEXT RECORD DATABASE KEY TARGET DEFAULT TEXT
+syn keyword tliField LINKS MAXVAL
+
+" TealInfo Styles
+
+syn keyword tliStyle INVERTED HORIZ_RULE VERT_RULE NO_SCROLL NO_BORDER BOLD_BORDER
+syn keyword tliStyle ROUND_BORDER ALIGN_RIGHT ALIGN_CENTER ALIGN_LEFT_START ALIGN_RIGHT_START
+syn keyword tliStyle ALIGN_CENTER_START ALIGN_LEFT_END ALIGN_RIGHT_END ALIGN_CENTER_END
+syn keyword tliStyle LOCKOUT BUTTON_SCROLL BUTTON_SELECT STROKE_FIND FILLED REGISTER
+
+" String and Character constants
+
+syn match tliSpecial	"@"
+syn region tliString	start=+"+ end=+"+
+
+"TealInfo Numbers, identifiers and comments
+
+syn case ignore
+syn match tliNumber	"\d*"
+syn match tliIdentifier	"\<\h\w*\>"
+syn match tliComment	"#.*"
+syn case match
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link tliNumber	Number
+hi def link tliString	String
+hi def link tliComment	Comment
+hi def link tliSpecial	SpecialChar
+hi def link tliIdentifier Identifier
+hi def link tliObject     Statement
+hi def link tliField      Type
+hi def link tliStyle      PreProc
+
+
+let b:current_syntax = "tli"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/tpp.vim b/syntax/tpp.vim
new file mode 100644
index 000000000..d9f280fd8
--- /dev/null
+++ b/syntax/tpp.vim
@@ -0,0 +1,87 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tpp') == -1
+
+" Vim syntax file
+" Language: tpp - Text Presentation Program
+" Maintainer: Debian Vim Maintainers
+" Former Maintainer: Gerfried Fuchs <alfie@ist.org>
+" Last Change: 2018 Dec 27
+" URL: https://salsa.debian.org/vim-team/vim-debian/master/syntax/tpp.vim
+" Filenames: *.tpp
+" License: BSD
+"
+" XXX This file is in need of a new maintainer, Debian VIM Maintainers maintain
+"     it only because patches have been submitted for it by Debian users and the
+"     former maintainer was MIA (Missing In Action), taking over its
+"     maintenance was thus the only way to include those patches.
+"     If you care about this file, and have time to maintain it please do so!
+"
+" Comments are very welcome - but please make sure that you are commenting on
+" the latest version of this file.
+" SPAM is _NOT_ welcome - be ready to be reported!
+
+" quit when a syntax file was already loaded
+if exists('b:current_syntax')
+  finish
+endif
+
+if !exists('main_syntax')
+  let main_syntax = 'tpp'
+endif
+
+
+"" list of the legal switches/options
+syn match tppAbstractOptionKey contained "^--\%(author\|title\|date\|footer\) *" nextgroup=tppString
+syn match tppPageLocalOptionKey contained "^--\%(heading\|center\|right\|huge\|sethugefont\|exec\) *" nextgroup=tppString
+syn match tppPageLocalSwitchKey contained "^--\%(horline\|-\|\%(begin\|end\)\%(\%(shell\)\?output\|slide\%(left\|right\|top\|bottom\)\)\|\%(bold\|rev\|ul\)\%(on\|off\)\|withborder\)"
+syn match tppNewPageOptionKey contained "^--newpage *" nextgroup=tppString
+syn match tppColorOptionKey contained "^--\%(\%(bg\|fg\)\?color\) *"
+syn match tppTimeOptionKey contained "^--sleep *"
+
+syn match tppString contained ".*"
+syn match tppColor contained "\%(white\|yellow\|red\|green\|blue\|cyan\|magenta\|black\|default\)"
+syn match tppTime contained "\d\+"
+
+syn region tppPageLocalSwitch start="^--" end="$" contains=tppPageLocalSwitchKey oneline
+syn region tppColorOption start="^--\%(\%(bg\|fg\)\?color\)" end="$" contains=tppColorOptionKey,tppColor oneline
+syn region tppTimeOption start="^--sleep" end="$" contains=tppTimeOptionKey,tppTime oneline
+syn region tppNewPageOption start="^--newpage" end="$" contains=tppNewPageOptionKey oneline
+syn region tppPageLocalOption start="^--\%(heading\|center\|right\|huge\|sethugefont\|exec\)" end="$" contains=tppPageLocalOptionKey oneline
+syn region tppAbstractOption start="^--\%(author\|title\|date\|footer\)" end="$" contains=tppAbstractOptionKey oneline
+
+if main_syntax !=# 'sh'
+  " shell command
+  syn include @tppShExec syntax/sh.vim
+  unlet b:current_syntax
+
+  syn region shExec matchgroup=tppPageLocalOptionKey start='^--exec *' keepend end='$' contains=@tppShExec
+
+endif
+
+syn match tppComment "^--##.*$"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link tppAbstractOptionKey		Special
+hi def link tppPageLocalOptionKey		Keyword
+hi def link tppPageLocalSwitchKey		Keyword
+hi def link tppColorOptionKey		Keyword
+hi def link tppTimeOptionKey		Comment
+hi def link tppNewPageOptionKey		PreProc
+hi def link tppString			String
+hi def link tppColor			String
+hi def link tppTime			Number
+hi def link tppComment			Comment
+hi def link tppAbstractOption		Error
+hi def link tppPageLocalOption		Error
+hi def link tppPageLocalSwitch		Error
+hi def link tppColorOption			Error
+hi def link tppNewPageOption		Error
+hi def link tppTimeOption			Error
+
+
+let b:current_syntax = 'tpp'
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/treetop.vim b/syntax/treetop.vim
new file mode 100644
index 000000000..46103dc67
--- /dev/null
+++ b/syntax/treetop.vim
@@ -0,0 +1,114 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'treetop') == -1
+
+" Vim syntax file
+" Language:             Treetop
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2011-03-14
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword treetopTodo
+      \ contained
+      \ TODO
+      \ FIXME
+      \ XXX
+      \ NOTE
+
+syn match treetopComment
+                        \ '#.*'
+                        \ display
+                        \ contains=treetopTodo
+
+syn include @treetopRuby syntax/ruby.vim
+unlet b:current_syntax
+
+syn keyword treetopKeyword
+                         \ require
+                         \ end
+syn region  treetopKeyword
+                         \ matchgroup=treetopKeyword
+                         \ start='\<\%(grammar\|include\|module\)\>\ze\s'
+                         \ end='$'
+                         \ transparent
+                         \ oneline
+                         \ keepend
+                         \ contains=@treetopRuby
+syn keyword treetopKeyword
+                         \ rule
+                         \ nextgroup=treetopRuleName
+                         \ skipwhite skipnl
+
+syn match   treetopGrammarName
+                             \ '\u\w*'
+                             \ contained
+
+syn match   treetopRubyModuleName
+                                \ '\u\w*'
+                                \ contained
+
+syn match   treetopRuleName
+                          \ '\h\w*'
+                          \ contained
+
+syn region  treetopString
+                        \ matchgroup=treetopStringDelimiter
+                        \ start=+"+
+                        \ end=+"+
+syn region  treetopString
+                        \ matchgroup=treetopStringDelimiter
+                        \ start=+'+
+                        \ end=+'+
+
+syn region  treetopCharacterClass
+                                \ matchgroup=treetopCharacterClassDelimiter
+                                \ start=+\[+
+                                \ skip=+\\\]+
+                                \ end=+\]+
+
+syn region  treetopRubyBlock
+                           \ matchgroup=treetopRubyBlockDelimiter
+                           \ start=+{+
+                           \ end=+}+
+                           \ contains=@treetopRuby
+
+syn region  treetopSemanticPredicate
+                           \ matchgroup=treetopSemanticPredicateDelimiter
+                           \ start=+[!&]{+
+                           \ end=+}+
+                           \ contains=@treetopRuby
+
+syn region  treetopSubclassDeclaration
+                           \ matchgroup=treetopSubclassDeclarationDelimiter
+                           \ start=+<+
+                           \ end=+>+
+                           \ contains=@treetopRuby
+
+syn match   treetopEllipsis
+                          \ +''+
+
+hi def link treetopTodo                         Todo
+hi def link treetopComment                      Comment
+hi def link treetopKeyword                      Keyword
+hi def link treetopGrammarName                  Constant
+hi def link treetopRubyModuleName               Constant
+hi def link treetopRuleName                     Identifier
+hi def link treetopString                       String
+hi def link treetopStringDelimiter              treetopString
+hi def link treetopCharacterClass               treetopString
+hi def link treetopCharacterClassDelimiter      treetopCharacterClass
+hi def link treetopRubyBlockDelimiter           PreProc
+hi def link treetopSemanticPredicateDelimiter   PreProc
+hi def link treetopSubclassDeclarationDelimiter PreProc
+hi def link treetopEllipsis                     Special
+
+let b:current_syntax = 'treetop'
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/trustees.vim b/syntax/trustees.vim
new file mode 100644
index 000000000..d2ff0ab08
--- /dev/null
+++ b/syntax/trustees.vim
@@ -0,0 +1,46 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'trustees') == -1
+
+" Vim syntax file
+" Language:     trustees
+" Maintainer:   Nima Talebi <nima@it.net.au>
+" Last Change:  2005-10-12
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax case match
+syntax sync minlines=0 maxlines=0
+
+" Errors & Comments
+syntax match tfsError /.*/
+highlight link tfsError Error
+syntax keyword tfsSpecialComment TODO XXX FIXME contained
+highlight link tfsSpecialComment Todo
+syntax match tfsComment ~\s*#.*~ contains=tfsSpecialComment
+highlight link tfsComment Comment 
+
+" Operators & Delimiters
+highlight link tfsSpecialChar Operator
+syntax match tfsSpecialChar ~[*!+]~ contained
+highlight link tfsDelimiter Delimiter
+syntax match tfsDelimiter ~:~ contained
+
+" Trustees Rules - Part 1 of 3 - The Device
+syntax region tfsRuleDevice matchgroup=tfsDeviceContainer start=~\[/~ end=~\]~ nextgroup=tfsRulePath oneline
+highlight link tfsRuleDevice Label
+highlight link tfsDeviceContainer PreProc
+
+" Trustees Rules - Part 2 of 3 - The Path
+syntax match tfsRulePath ~/[-_a-zA-Z0-9/]*~ nextgroup=tfsRuleACL contained contains=tfsDelimiter 
+highlight link tfsRulePath String
+
+" Trustees Rules - Part 3 of 3 - The ACLs
+syntax match tfsRuleACL ~\(:\(\*\|[+]\{0,1\}[a-zA-Z0-9/]\+\):[RWEBXODCU!]\+\)\+$~ contained contains=tfsDelimiter,tfsRuleWho,tfsRuleWhat
+syntax match tfsRuleWho ~\(\*\|[+]\{0,1\}[a-zA-Z0-9/]\+\)~ contained contains=tfsSpecialChar
+highlight link tfsRuleWho Identifier
+syntax match tfsRuleWhat ~[RWEBXODCU!]\+~ contained contains=tfsSpecialChar
+highlight link tfsRuleWhat Structure
+
+endif
diff --git a/syntax/tsalt.vim b/syntax/tsalt.vim
new file mode 100644
index 000000000..e0a4ade1f
--- /dev/null
+++ b/syntax/tsalt.vim
@@ -0,0 +1,210 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tsalt') == -1
+
+" Vim syntax file
+" Language:	Telix (Modem Comm Program) SALT Script
+" Maintainer:	Sean M. McKee <mckee@misslink.net>
+" Last Change:	2012 Feb 03 by Thilo Six
+" Version Info: @(#)tsalt.vim	1.5	97/12/16 08:11:15
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" turn case matching off
+syn case ignore
+
+"FUNCTIONS
+" Character Handling Functions
+syn keyword tsaltFunction	IsAscii IsAlNum IsAlpha IsCntrl IsDigit
+syn keyword tsaltFunction	IsLower IsUpper ToLower ToUpper
+
+" Connect Device Operations
+syn keyword tsaltFunction	Carrier cInp_Cnt cGetC cGetCT cPutC cPutN
+syn keyword tsaltFunction	cPutS cPutS_TR FlushBuf Get_Baud
+syn keyword tsaltFunction	Get_DataB Get_Port Get_StopB Hangup
+syn keyword tsaltFunction	KillConnectDevice MakeConnectDevice
+syn keyword tsaltFunction	Send_Brk Set_ConnectDevice Set_Port
+
+" File Input/Output Operations
+syn keyword tsaltFunction	fClearErr fClose fDelete fError fEOF fFlush
+syn keyword tsaltFunction	fGetC fGetS FileAttr FileFind FileSize
+syn keyword tsaltFunction	FileTime fnStrip fOpen fPutC fPutS fRead
+syn keyword tsaltFunction	fRename fSeek fTell fWrite
+
+" File Transfers and Logs
+syn keyword tsaltFunction	Capture Capture_Stat Printer Receive Send
+syn keyword tsaltFunction	Set_DefProt UsageLog Usage_Stat UStamp
+
+" Input String Matching
+syn keyword tsaltFunction	Track Track_AddChr Track_Free Track_Hit
+syn keyword tsaltFunction	WaitFor
+
+" Keyboard Operations
+syn keyword tsaltFunction	InKey InKeyW KeyGet KeyLoad KeySave KeySet
+
+" Miscellaneous Functions
+syn keyword tsaltFunction	ChatMode Dos Dial DosFunction ExitTelix
+syn keyword tsaltFunction	GetEnv GetFon HelpScreen LoadFon NewDir
+syn keyword tsaltFunction	Randon Redial RedirectDOS Run
+syn keyword tsaltFunction	Set_Terminal Show_Directory TelixVersion
+syn keyword tsaltFunction	Terminal TransTab Update_Term
+
+" Script Management
+syn keyword tsaltFunction	ArgCount Call CallD CompileScript GetRunPath
+syn keyword tsaltFunction	Is_Loaded Load_Scr ScriptVersion
+syn keyword tsaltFunction	TelixForWindows Unload_Scr
+
+" Sound Functions
+syn keyword tsaltFunction	Alarm PlayWave Tone
+
+" String Handling
+syn keyword tsaltFunction	CopyChrs CopyStr DelChrs GetS GetSXY
+syn keyword tsaltFunction	InputBox InsChrs ItoS SetChr StoI StrCat
+syn keyword tsaltFunction	StrChr StrCompI StrLen StrLower StrMaxLen
+syn keyword tsaltFunction	StrPos StrPosI StrUpper SubChr SubChrs
+syn keyword tsaltFunction	SubStr
+
+" Time, Date, and Timer Operations
+syn keyword tsaltFunction	CurTime Date Delay Delay_Scr Get_OnlineTime
+syn keyword tsaltFunction	tDay tHour tMin tMonth tSec tYear Time
+syn keyword tsaltFunction	Time_Up Timer_Free Time_Restart
+syn keyword tsaltFunction	Time_Start Time_Total
+
+" Video Operations
+syn keyword tsaltFunction	Box CNewLine Cursor_OnOff Clear_Scr
+syn keyword tsaltFunction	GetTermHeight GetTermWidth GetX GetY
+syn keyword tsaltFunction	GotoXY MsgBox NewLine PrintC PrintC_Trm
+syn keyword tsaltFunction	PrintN PrintN_Trm PrintS PrintS_Trm
+syn keyword tsaltFunction	PrintSC PRintSC_Trm
+syn keyword tsaltFunction	PStrA PStrAXY Scroll Status_Wind vGetChr
+syn keyword tsaltFunction	vGetChrs vGetChrsA  vPutChr vPutChrs
+syn keyword tsaltFunction	vPutChrsA vRstrArea vSaveArea
+
+" Dynamic Data Exchange (DDE) Operations
+syn keyword tsaltFunction	DDEExecute DDEInitate DDEPoke DDERequest
+syn keyword tsaltFunction	DDETerminate DDETerminateAll
+"END FUNCTIONS
+
+"PREDEFINED VARAIABLES
+syn keyword tsaltSysVar	_add_lf _alarm_on _answerback_str _asc_rcrtrans
+syn keyword tsaltSysVar	_asc_remabort _asc_rlftrans _asc_scpacing
+syn keyword tsaltSysVar	_asc_scrtrans _asc_secho _asc_slpacing
+syn keyword tsaltSysVar	_asc_spacechr _asc_striph _back_color
+syn keyword tsaltSysVar	_capture_fname _connect_str _dest_bs
+syn keyword tsaltSysVar	_dial_pause _dial_time _dial_post
+syn keyword tsaltSysVar	_dial_pref1 _dial_pref2 _dial_pref3
+syn keyword tsaltSysVar	_dial_pref4 _dir_prog _down_dir
+syn keyword tsaltSysVar	_entry_bbstype _entry_comment _entry_enum
+syn keyword tsaltSysVar	_entry_name _entry_num _entry_logonname
+syn keyword tsaltSysVar	_entry_pass _fore_color _image_file
+syn keyword tsaltSysVar	_local_echo _mdm_hang_str _mdm_init_str
+syn keyword tsaltSysVar	_no_connect1 _no_connect2 _no_connect3
+syn keyword tsaltSysVar	_no_connect4 _no_connect5 _redial_stop
+syn keyword tsaltSysVar	_scr_chk_key _script_dir _sound_on
+syn keyword tsaltSysVar	_strip_high _swap_bs _telix_dir _up_dir
+syn keyword tsaltSysVar	_usage_fname _zmodauto _zmod_rcrash
+syn keyword tsaltSysVar	_zmod_scrash
+"END PREDEFINED VARAIABLES
+
+"TYPE
+syn keyword tsaltType	str int
+"END TYPE
+
+"KEYWORDS
+syn keyword tsaltStatement	goto break return continue
+syn keyword tsaltConditional	if then else
+syn keyword tsaltRepeat		while for do
+"END KEYWORDS
+
+syn keyword tsaltTodo contained	TODO
+
+" the rest is pretty close to C -----------------------------------------
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match tsaltSpecial		contained "\^\d\d\d\|\^."
+syn region tsaltString		start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=tsaltSpecial
+syn match tsaltCharacter	"'[^\\]'"
+syn match tsaltSpecialCharacter	"'\\.'"
+
+"catch errors caused by wrong parenthesis
+syn region tsaltParen		transparent start='(' end=')' contains=ALLBUT,tsaltParenError,tsaltIncluded,tsaltSpecial,tsaltTodo
+syn match tsaltParenError		")"
+syn match tsaltInParen		contained "[{}]"
+
+hi link tsaltParenError		tsaltError
+hi link tsaltInParen		tsaltError
+
+"integer number, or floating point number without a dot and with "f".
+syn match  tsaltNumber		"\<\d\+\(u\=l\=\|lu\|f\)\>"
+"floating point number, with dot, optional exponent
+syn match  tsaltFloat		"\<\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, starting with a dot, optional exponent
+syn match  tsaltFloat		"\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+syn match  tsaltFloat		"\<\d\+e[-+]\=\d\+[fl]\=\>"
+"hex number
+syn match  tsaltNumber		"0x[0-9a-f]\+\(u\=l\=\|lu\)\>"
+"syn match  cIdentifier	"\<[a-z_][a-z0-9_]*\>"
+
+syn region tsaltComment		start="/\*"  end="\*/" contains=cTodo
+syn match  tsaltComment		"//.*" contains=cTodo
+syn match  tsaltCommentError	"\*/"
+
+syn region tsaltPreCondit	start="^[ \t]*#[ \t]*\(if\>\|ifdef\>\|ifndef\>\|elif\>\|else\>\|endif\>\)"  skip="\\$"  end="$" contains=tsaltComment,tsaltString,tsaltCharacter,tsaltNumber,tsaltCommentError
+syn region tsaltIncluded	contained start=+"+  skip=+\\\\\|\\"+  end=+"+
+syn match  tsaltIncluded	contained "<[^>]*>"
+syn match  tsaltInclude		"^[ \t]*#[ \t]*include\>[ \t]*["<]" contains=tsaltIncluded
+"syn match  TelixSalyLineSkip	"\\$"
+syn region tsaltDefine		start="^[ \t]*#[ \t]*\(define\>\|undef\>\)" skip="\\$" end="$" contains=ALLBUT,tsaltPreCondit,tsaltIncluded,tsaltInclude,tsaltDefine,tsaltInParen
+syn region tsaltPreProc		start="^[ \t]*#[ \t]*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" contains=ALLBUT,tsaltPreCondit,tsaltIncluded,tsaltInclude,tsaltDefine,tsaltInParen
+
+" Highlight User Labels
+syn region tsaltMulti	transparent start='?' end=':' contains=ALLBUT,tsaltIncluded,tsaltSpecial,tsaltTodo
+
+syn sync ccomment tsaltComment
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link tsaltFunction		Statement
+hi def link tsaltSysVar		Type
+"hi def link tsaltLibFunc		UserDefFunc
+"hi def link tsaltConstants		Type
+"hi def link tsaltFuncArg		Type
+"hi def link tsaltOperator		Operator
+"hi def link tsaltLabel		Label
+"hi def link tsaltUserLabel		Label
+hi def link tsaltConditional		Conditional
+hi def link tsaltRepeat		Repeat
+hi def link tsaltCharacter		SpecialChar
+hi def link tsaltSpecialCharacter	SpecialChar
+hi def link tsaltNumber		Number
+hi def link tsaltFloat		Float
+hi def link tsaltCommentError	tsaltError
+hi def link tsaltInclude		Include
+hi def link tsaltPreProc		PreProc
+hi def link tsaltDefine		Macro
+hi def link tsaltIncluded		tsaltString
+hi def link tsaltError		Error
+hi def link tsaltStatement		Statement
+hi def link tsaltPreCondit		PreCondit
+hi def link tsaltType		Type
+hi def link tsaltString		String
+hi def link tsaltComment		Comment
+hi def link tsaltSpecial		Special
+hi def link tsaltTodo		Todo
+
+
+let b:current_syntax = "tsalt"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/tsscl.vim b/syntax/tsscl.vim
new file mode 100644
index 000000000..ef5415b43
--- /dev/null
+++ b/syntax/tsscl.vim
@@ -0,0 +1,208 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tsscl') == -1
+
+" Vim syntax file
+" Language:     TSS (Thermal Synthesizer System) Command Line
+" Maintainer:   Adrian Nagle, anagle@ball.com
+" Last Change:  2003 May 11
+" Filenames:    *.tsscl
+" URL:		http://www.naglenet.org/vim/syntax/tsscl.vim
+" MAIN URL:     http://www.naglenet.org/vim/
+
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+
+
+" Ignore case
+syn case ignore
+
+
+
+"
+"
+" Begin syntax definitions for tss geomtery file.
+"
+
+" Load TSS geometry syntax file
+"source $VIM/myvim/tssgm.vim
+"source $VIMRUNTIME/syntax/c.vim
+
+" Define keywords for TSS
+syn keyword tssclCommand  begin radk list heatrates attr draw
+
+syn keyword tssclKeyword   cells rays error nodes levels objects cpu
+syn keyword tssclKeyword   units length positions energy time unit solar
+syn keyword tssclKeyword   solar_constant albedo planet_power
+
+syn keyword tssclEnd    exit
+
+syn keyword tssclUnits  cm feet meters inches
+syn keyword tssclUnits  Celsius Kelvin Fahrenheit Rankine
+
+
+
+" Define matches for TSS
+syn match  tssclString    /"[^"]\+"/ contains=ALLBUT,tssInteger,tssclKeyword,tssclCommand,tssclEnd,tssclUnits
+
+syn match  tssclComment     "#.*$"
+
+"  rational and logical operators
+"  <       Less than
+"  >       Greater than
+"  <=      Less than or equal
+"  >=      Greater than or equal
+"  == or = Equal to
+"  !=      Not equal to
+"  && or & Logical AND
+"  || or | Logical OR
+"  !       Logical NOT
+"
+" algebraic operators:
+"  ^ or ** Exponentation
+"  *       Multiplication
+"  /       Division
+"  %       Remainder
+"  +       Addition
+"  -       Subtraction
+"
+syn match  tssclOper      "||\||\|&&\|&\|!=\|!\|>=\|<=\|>\|<\|+\|-\|^\|\*\*\|\*\|/\|%\|==\|=\|\." skipwhite
+
+" CLI Directive Commands, with arguments
+"
+" BASIC COMMAND LIST
+" *ADD input_source
+" *ARITHMETIC { [ON] | OFF }
+" *CLOSE unit_number
+" *CPU
+" *DEFINE
+" *ECHO[/qualifiers] { [ON] | OFF }
+" *ELSE [IF { 0 | 1 } ]
+" *END { IF | WHILE }
+" *EXIT
+" *IF { 0 | 1 }
+" *LIST/n list variable
+" *OPEN[/r | /r+ | /w | /w+ ] unit_number file_name
+" *PROMPT prompt_string sybol_name
+" *READ/unit=unit_number[/LOCAL | /GLOBAL ] sym1 [sym2, [sym3 ...]]
+" *REWIND
+" *STOP
+" *STRCMP string_1 string_2 difference
+" *SYSTEM command
+" *UNDEFINE[/LOCAL][/GLOBAL] symbol_name
+" *WHILE { 0 | 1 }
+" *WRITE[/unit=unit_number] output text
+"
+syn match  tssclDirective "\*ADD"
+syn match  tssclDirective "\*ARITHMETIC \+\(ON\|OFF\)"
+syn match  tssclDirective "\*CLOSE"
+syn match  tssclDirective "\*CPU"
+syn match  tssclDirective "\*DEFINE"
+syn match  tssclDirective "\*ECHO"
+syn match  tssclConditional "\*ELSE"
+syn match  tssclConditional "\*END \+\(IF\|WHILE\)"
+syn match  tssclDirective "\*EXIT"
+syn match  tssclConditional "\*IF"
+syn match  tssclDirective "\*LIST"
+syn match  tssclDirective "\*OPEN"
+syn match  tssclDirective "\*PROMPT"
+syn match  tssclDirective "\*READ"
+syn match  tssclDirective "\*REWIND"
+syn match  tssclDirective "\*STOP"
+syn match  tssclDirective "\*STRCMP"
+syn match  tssclDirective "\*SYSTEM"
+syn match  tssclDirective "\*UNDEFINE"
+syn match  tssclConditional "\*WHILE"
+syn match  tssclDirective "\*WRITE"
+
+syn match  tssclContChar  "-$"
+
+" C library functoins
+" Bessel functions (jn, yn)
+" Error and complementary error fuctions (erf, erfc)
+" Exponential functions (exp)
+" Logrithm (log, log10)
+" Power (pow)
+" Square root (sqrt)
+" Floor (floor)
+" Ceiling (ceil)
+" Floating point remainder (fmod)
+" Floating point absolute value (fabs)
+" Gamma (gamma)
+" Euclidean distance function (hypot)
+" Hperbolic functions (sinh, cosh, tanh)
+" Trigometric functions in radians (sin, cos, tan, asin, acos, atan, atan2)
+" Trigometric functions in degrees (sind, cosd, tand, asind, acosd, atand,
+"    atan2d)
+"
+" local varialbles: cl_arg1, cl_arg2, etc. (cl_arg is an array of arguments)
+" cl_args is the number of arguments
+"
+"
+" I/O: *PROMPT, *WRITE, *READ
+"
+" Conditional branching:
+" IF, ELSE IF, END
+" *IF value       *IF I==10
+" *ELSE IF value  *ELSE IF I<10
+" *ELSE		  *ELSE
+" *ENDIF	  *ENDIF
+"
+"
+" Iterative looping:
+" WHILE
+" *WHILE test
+" .....
+" *END WHILE
+"
+"
+" EXAMPLE:
+" *DEFINE I = 1
+" *WHILE (I <= 10)
+"    *WRITE I = 'I'
+"    *DEFINE I = (I + 1)
+" *END WHILE
+"
+
+syn match  tssclQualifier "/[^/ ]\+"hs=s+1
+syn match  tssclSymbol    "'\S\+'"
+"syn match  tssclSymbol2   " \S\+ " contained
+
+syn match  tssclInteger     "-\=\<[0-9]*\>"
+syn match  tssclFloat       "-\=\<[0-9]*\.[0-9]*"
+syn match  tssclScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
+
+
+
+" Define the default highlighting
+" Only when an item doesn't have highlighting yet
+
+hi def link tssclCommand		Statement
+hi def link tssclKeyword		Special
+hi def link tssclEnd		Macro
+hi def link tssclUnits		Special
+
+hi def link tssclComment		Comment
+hi def link tssclDirective		Statement
+hi def link tssclConditional	Conditional
+hi def link tssclContChar		Macro
+hi def link tssclQualifier		Typedef
+hi def link tssclSymbol		Identifier
+hi def link tssclSymbol2		Symbol
+hi def link tssclString		String
+hi def link tssclOper		Operator
+
+hi def link tssclInteger		Number
+hi def link tssclFloat		Number
+hi def link tssclScientific	Number
+
+
+
+let b:current_syntax = "tsscl"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/tssgm.vim b/syntax/tssgm.vim
new file mode 100644
index 000000000..07a84ec36
--- /dev/null
+++ b/syntax/tssgm.vim
@@ -0,0 +1,102 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tssgm') == -1
+
+" Vim syntax file
+" Language:     TSS (Thermal Synthesizer System) Geometry
+" Maintainer:   Adrian Nagle, anagle@ball.com
+" Last Change:  2003 May 11
+" Filenames:    *.tssgm
+" URL:		http://www.naglenet.org/vim/syntax/tssgm.vim
+" MAIN URL:     http://www.naglenet.org/vim/
+
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+
+
+" Ignore case
+syn case ignore
+
+
+
+"
+"
+" Begin syntax definitions for tss geomtery file.
+"
+
+" Define keywords for TSS
+syn keyword tssgmParam  units mirror param active sides submodel include
+syn keyword tssgmParam  iconductor nbeta ngamma optics material thickness color
+syn keyword tssgmParam  initial_temp
+syn keyword tssgmParam  initial_id node_ids node_add node_type
+syn keyword tssgmParam  gamma_boundaries gamma_add beta_boundaries
+syn keyword tssgmParam  p1 p2 p3 p4 p5 p6 rot1 rot2 rot3 tx ty tz
+
+syn keyword tssgmSurfType  rectangle trapezoid disc ellipse triangle
+syn keyword tssgmSurfType  polygon cylinder cone sphere ellipic-cone
+syn keyword tssgmSurfType  ogive torus box paraboloid hyperboloid ellipsoid
+syn keyword tssgmSurfType  quadrilateral trapeziod
+
+syn keyword tssgmArgs   OUT IN DOWN BOTH DOUBLE NONE SINGLE RADK CC FECC
+syn keyword tssgmArgs   white red blue green yellow orange violet pink
+syn keyword tssgmArgs   turquoise grey black
+syn keyword tssgmArgs   Arithmetic Boundary Heater
+
+syn keyword tssgmDelim  assembly
+
+syn keyword tssgmEnd    end
+
+syn keyword tssgmUnits  cm feet meters inches
+syn keyword tssgmUnits  Celsius Kelvin Fahrenheit Rankine
+
+
+
+" Define matches for TSS
+syn match  tssgmDefault     "^DEFAULT/LENGTH = \(ft\|in\|cm\|m\)"
+syn match  tssgmDefault     "^DEFAULT/TEMP = [CKFR]"
+
+syn match  tssgmComment       /comment \+= \+".*"/ contains=tssParam,tssgmCommentString
+syn match  tssgmCommentString /".*"/ contained
+
+syn match  tssgmSurfIdent   " \S\+\.\d\+ \=$"
+
+syn match  tssgmString      /"[^" ]\+"/ms=s+1,me=e-1 contains=ALLBUT,tssInteger
+
+syn match  tssgmArgs	    / = [xyz],"/ms=s+3,me=e-2
+
+syn match  tssgmInteger     "-\=\<[0-9]*\>"
+syn match  tssgmFloat       "-\=\<[0-9]*\.[0-9]*"
+syn match  tssgmScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
+
+
+
+" Define the default highlighting
+" Only when an item doesn't have highlighting yet
+
+hi def link tssgmParam		Statement
+hi def link tssgmSurfType		Type
+hi def link tssgmArgs		Special
+hi def link tssgmDelim		Typedef
+hi def link tssgmEnd		Macro
+hi def link tssgmUnits		Special
+
+hi def link tssgmDefault		SpecialComment
+hi def link tssgmComment		Statement
+hi def link tssgmCommentString	Comment
+hi def link tssgmSurfIdent		Identifier
+hi def link tssgmString		Delimiter
+
+hi def link tssgmInteger		Number
+hi def link tssgmFloat		Float
+hi def link tssgmScientific	Float
+
+
+
+let b:current_syntax = "tssgm"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/tssop.vim b/syntax/tssop.vim
new file mode 100644
index 000000000..89c6c893b
--- /dev/null
+++ b/syntax/tssop.vim
@@ -0,0 +1,78 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tssop') == -1
+
+" Vim syntax file
+" Language:     TSS (Thermal Synthesizer System) Optics
+" Maintainer:   Adrian Nagle, anagle@ball.com
+" Last Change:  2003 May 11
+" Filenames:    *.tssop
+" URL:		http://www.naglenet.org/vim/syntax/tssop.vim
+" MAIN URL:     http://www.naglenet.org/vim/
+
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+
+
+" Ignore case
+syn case ignore
+
+
+
+"
+"
+" Begin syntax definitions for tss optics file.
+"
+
+" Define keywords for TSS
+syn keyword tssopParam  ir_eps ir_trans ir_spec ir_tspec ir_refract
+syn keyword tssopParam  sol_eps sol_trans sol_spec sol_tspec sol_refract
+syn keyword tssopParam  color
+
+"syn keyword tssopProp   property
+
+syn keyword tssopArgs   white red blue green yellow orange violet pink
+syn keyword tssopArgs   turquoise grey black
+
+
+
+" Define matches for TSS
+syn match  tssopComment       /comment \+= \+".*"/ contains=tssopParam,tssopCommentString
+syn match  tssopCommentString /".*"/ contained
+
+syn match  tssopProp	    "property "
+syn match  tssopProp	    "edit/optic "
+syn match  tssopPropName    "^property \S\+" contains=tssopProp
+syn match  tssopPropName    "^edit/optic \S\+$" contains=tssopProp
+
+syn match  tssopInteger     "-\=\<[0-9]*\>"
+syn match  tssopFloat       "-\=\<[0-9]*\.[0-9]*"
+syn match  tssopScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
+
+
+
+" Define the default highlighting
+" Only when an item doesn't have highlighting yet
+
+hi def link tssopParam		Statement
+hi def link tssopProp		Identifier
+hi def link tssopArgs		Special
+
+hi def link tssopComment		Statement
+hi def link tssopCommentString	Comment
+hi def link tssopPropName		Typedef
+
+hi def link tssopInteger		Number
+hi def link tssopFloat		Float
+hi def link tssopScientific	Float
+
+
+
+let b:current_syntax = "tssop"
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/uc.vim b/syntax/uc.vim
new file mode 100644
index 000000000..20c3ea80d
--- /dev/null
+++ b/syntax/uc.vim
@@ -0,0 +1,169 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'uc') == -1
+
+" Vim syntax file
+" Language:	UnrealScript
+" Maintainer:	Mark Ferrell <major@chaoticdreams.org>
+" URL:		ftp://ftp.chaoticdreams.org/pub/ut/vim/uc.vim
+" Credits:	Based on the java.vim syntax file by Claudio Fleiner
+" Last change:	2003 May 31
+
+" Please check :help uc.vim for comments on some of the options available.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" some characters that cannot be in a UnrealScript program (outside a string)
+syn match ucError "[\\@`]"
+syn match ucError "<<<\|\.\.\|=>\|<>\|||=\|&&=\|[^-]->\|\*\/"
+
+" we define it here so that included files can test for it
+if !exists("main_syntax")
+  let main_syntax='uc'
+endif
+
+syntax case ignore
+
+" keyword definitions
+syn keyword ucBranch	      break continue
+syn keyword ucConditional     if else switch
+syn keyword ucRepeat	      while for do foreach
+syn keyword ucBoolean	      true false
+syn keyword ucConstant	      null
+syn keyword ucOperator	      new instanceof
+syn keyword ucType	      boolean char byte short int long float double
+syn keyword ucType	      void Pawn sound state auto exec function ipaddr
+syn keyword ucType	      ELightType actor ammo defaultproperties bool
+syn keyword ucType	      native noexport var out vector name local string
+syn keyword ucType	      event
+syn keyword ucStatement       return
+syn keyword ucStorageClass    static synchronized transient volatile final
+syn keyword ucMethodDecl      synchronized throws
+
+" UnrealScript defines classes in sorta fscked up fashion
+syn match   ucClassDecl       "^[Cc]lass[\s$]*\S*[\s$]*expands[\s$]*\S*;" contains=ucSpecial,ucSpecialChar,ucClassKeys
+syn keyword ucClassKeys	      class expands extends
+syn match   ucExternal	      "^\#exec.*" contains=ucCommentString,ucNumber
+syn keyword ucScopeDecl       public protected private abstract
+
+" UnrealScript Functions
+syn match   ucFuncDef	      "^.*function\s*[\(]*" contains=ucType,ucStorageClass
+syn match   ucEventDef	      "^.*event\s*[\(]*" contains=ucType,ucStorageClass
+syn match   ucClassLabel      "[a-zA-Z0-9]*\'[a-zA-Z0-9]*\'" contains=ucCharacter
+
+syn region  ucLabelRegion     transparent matchgroup=ucLabel start="\<case\>" matchgroup=NONE end=":" contains=ucNumber
+syn match   ucUserLabel       "^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=ucLabel
+syn keyword ucLabel	      default
+
+" The following cluster contains all java groups except the contained ones
+syn cluster ucTop contains=ucExternal,ucError,ucError,ucBranch,ucLabelRegion,ucLabel,ucConditional,ucRepeat,ucBoolean,ucConstant,ucTypedef,ucOperator,ucType,ucType,ucStatement,ucStorageClass,ucMethodDecl,ucClassDecl,ucClassDecl,ucClassDecl,ucScopeDecl,ucError,ucError2,ucUserLabel,ucClassLabel
+
+" Comments
+syn keyword ucTodo	       contained TODO FIXME XXX
+syn region  ucCommentString    contained start=+"+ end=+"+ end=+\*/+me=s-1,he=s-1 contains=ucSpecial,ucCommentStar,ucSpecialChar
+syn region  ucComment2String   contained start=+"+  end=+$\|"+  contains=ucSpecial,ucSpecialChar
+syn match   ucCommentCharacter contained "'\\[^']\{1,6\}'" contains=ucSpecialChar
+syn match   ucCommentCharacter contained "'\\''" contains=ucSpecialChar
+syn match   ucCommentCharacter contained "'[^\\]'"
+syn region  ucComment	       start="/\*"  end="\*/" contains=ucCommentString,ucCommentCharacter,ucNumber,ucTodo
+syn match   ucCommentStar      contained "^\s*\*[^/]"me=e-1
+syn match   ucCommentStar      contained "^\s*\*$"
+syn match   ucLineComment      "//.*" contains=ucComment2String,ucCommentCharacter,ucNumber,ucTodo
+hi link ucCommentString ucString
+hi link ucComment2String ucString
+hi link ucCommentCharacter ucCharacter
+
+syn cluster ucTop add=ucComment,ucLineComment
+
+" match the special comment /**/
+syn match   ucComment	       "/\*\*/"
+
+" Strings and constants
+syn match   ucSpecialError     contained "\\."
+"syn match   ucSpecialCharError contained "[^']"
+syn match   ucSpecialChar      contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\)"
+syn region  ucString	       start=+"+ end=+"+  contains=ucSpecialChar,ucSpecialError
+syn match   ucStringError      +"\([^"\\]\|\\.\)*$+
+syn match   ucCharacter        "'[^']*'" contains=ucSpecialChar,ucSpecialCharError
+syn match   ucCharacter        "'\\''" contains=ucSpecialChar
+syn match   ucCharacter        "'[^\\]'"
+syn match   ucNumber	       "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
+syn match   ucNumber	       "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
+syn match   ucNumber	       "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
+syn match   ucNumber	       "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
+
+" unicode characters
+syn match   ucSpecial "\\u\d\{4\}"
+
+syn cluster ucTop add=ucString,ucCharacter,ucNumber,ucSpecial,ucStringError
+
+" catch errors caused by wrong parenthesis
+syn region  ucParen	       transparent start="(" end=")" contains=@ucTop,ucParen
+syn match   ucParenError       ")"
+hi link     ucParenError       ucError
+
+if !exists("uc_minlines")
+  let uc_minlines = 10
+endif
+exec "syn sync ccomment ucComment minlines=" . uc_minlines
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link ucFuncDef			Conditional
+hi def link ucEventDef			Conditional
+hi def link ucBraces			Function
+hi def link ucBranch			Conditional
+hi def link ucLabel			Label
+hi def link ucUserLabel			Label
+hi def link ucConditional			Conditional
+hi def link ucRepeat			Repeat
+hi def link ucStorageClass			StorageClass
+hi def link ucMethodDecl			ucStorageClass
+hi def link ucClassDecl			ucStorageClass
+hi def link ucScopeDecl			ucStorageClass
+hi def link ucBoolean			Boolean
+hi def link ucSpecial			Special
+hi def link ucSpecialError			Error
+hi def link ucSpecialCharError		Error
+hi def link ucString			String
+hi def link ucCharacter			Character
+hi def link ucSpecialChar			SpecialChar
+hi def link ucNumber			Number
+hi def link ucError			Error
+hi def link ucStringError			Error
+hi def link ucStatement			Statement
+hi def link ucOperator			Operator
+hi def link ucOverLoaded			Operator
+hi def link ucComment			Comment
+hi def link ucDocComment			Comment
+hi def link ucLineComment			Comment
+hi def link ucConstant			ucBoolean
+hi def link ucTypedef			Typedef
+hi def link ucTodo				Todo
+
+hi def link ucCommentTitle			SpecialComment
+hi def link ucDocTags			Special
+hi def link ucDocParam			Function
+hi def link ucCommentStar			ucComment
+
+hi def link ucType				Type
+hi def link ucExternal			Include
+
+hi def link ucClassKeys			Conditional
+hi def link ucClassLabel			Conditional
+
+hi def link htmlComment			Special
+hi def link htmlCommentPart		Special
+
+
+let b:current_syntax = "uc"
+
+if main_syntax == 'uc'
+  unlet main_syntax
+endif
+
+" vim: ts=8
+
+endif
diff --git a/syntax/udevconf.vim b/syntax/udevconf.vim
new file mode 100644
index 000000000..b2d12123c
--- /dev/null
+++ b/syntax/udevconf.vim
@@ -0,0 +1,43 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'udevconf') == -1
+
+" Vim syntax file
+" Language:             udev(8) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword udevconfTodo        contained TODO FIXME XXX NOTE
+
+syn region  udevconfComment     display oneline start='^\s*#' end='$'
+                                \ contains=udevconfTodo,@Spell
+
+syn match   udevconfBegin       display '^'
+                                \ nextgroup=udevconfVariable,udevconfComment
+                                \ skipwhite
+
+syn keyword udevconfVariable    contained udev_root udev_db udev_rules udev_log
+                                \ nextgroup=udevconfVariableEq
+
+syn match   udevconfVariableEq  contained '[[:space:]=]'
+                                \ nextgroup=udevconfString skipwhite
+
+syn region  udevconfString      contained display oneline start=+"+ end=+"+
+
+hi def link udevconfTodo        Todo
+hi def link udevconfComment     Comment
+hi def link udevconfVariable    Identifier
+hi def link udevconfVariableEq  Operator
+hi def link udevconfString      String
+
+let b:current_syntax = "udevconf"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/udevperm.vim b/syntax/udevperm.vim
new file mode 100644
index 000000000..d47f34c1f
--- /dev/null
+++ b/syntax/udevperm.vim
@@ -0,0 +1,73 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'udevperm') == -1
+
+" Vim syntax file
+" Language:             udev(8) permissions file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match   udevpermBegin       display '^' nextgroup=udevpermDevice
+
+syn match   udevpermDevice      contained display '[^:]\+'
+                                \ contains=udevpermPattern
+                                \ nextgroup=udevpermUserColon
+
+syn match   udevpermPattern     contained '[*?]'
+syn region  udevpermPattern     contained start='\[!\=' end='\]'
+                                \ contains=udevpermPatRange
+
+syn match   udevpermPatRange    contained '[^[-]-[^]-]'
+
+syn match   udevpermUserColon   contained display ':'
+                                \ nextgroup=udevpermUser
+
+syn match   udevpermUser        contained display '[^:]\+'
+                                \ nextgroup=udevpermGroupColon
+
+syn match   udevpermGroupColon  contained display ':'
+                                \ nextgroup=udevpermGroup
+
+syn match   udevpermGroup       contained display '[^:]\+'
+                                \ nextgroup=udevpermPermColon
+
+syn match   udevpermPermColon   contained display ':'
+                                \ nextgroup=udevpermPerm
+
+syn match   udevpermPerm        contained display '\<0\=\o\+\>'
+                                \ contains=udevpermOctalZero
+
+syn match   udevpermOctalZero   contained display '\<0'
+syn match   udevpermOctalError  contained display '\<0\o*[89]\d*\>'
+
+syn keyword udevpermTodo        contained TODO FIXME XXX NOTE
+
+syn region  udevpermComment     display oneline start='^\s*#' end='$'
+                                \ contains=udevpermTodo,@Spell
+
+hi def link udevpermTodo        Todo
+hi def link udevpermComment     Comment
+hi def link udevpermDevice      String
+hi def link udevpermPattern     SpecialChar
+hi def link udevpermPatRange    udevpermPattern
+hi def link udevpermColon       Normal
+hi def link udevpermUserColon   udevpermColon
+hi def link udevpermUser        Identifier
+hi def link udevpermGroupColon  udevpermColon
+hi def link udevpermGroup       Type
+hi def link udevpermPermColon   udevpermColon
+hi def link udevpermPerm        Number
+hi def link udevpermOctalZero   PreProc
+hi def link udevpermOctalError  Error
+
+let b:current_syntax = "udevperm"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/uil.vim b/syntax/uil.vim
new file mode 100644
index 000000000..81d834435
--- /dev/null
+++ b/syntax/uil.vim
@@ -0,0 +1,79 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'uil') == -1
+
+" Vim syntax file
+" Language:	Motif UIL (User Interface Language)
+" Maintainer:	Thomas Koehler <jean-luc@picard.franken.de>
+"		Please be aware: I'm often slow to answer email due to a high
+"		non-computer related workload (sometimes 4-8 weeks)
+" Last Change:	2016 September 6
+" URL:		http://gott-gehabt.de/800_wer_wir_sind/thomas/Homepage/Computer/vim/syntax/uil.vim
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" A bunch of useful keywords
+syn keyword uilType	arguments	callbacks	color
+syn keyword uilType	compound_string	controls	end
+syn keyword uilType	exported	file		include
+syn keyword uilType	module		object		procedure
+syn keyword uilType	user_defined	xbitmapfile
+
+syn keyword uilTodo contained	TODO
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match   uilSpecial contained "\\\d\d\d\|\\."
+syn region  uilString		start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=@Spell,uilSpecial
+syn match   uilCharacter	"'[^\\]'"
+syn region  uilString		start=+'+  skip=+\\\\\|\\'+  end=+'+  contains=@Spell,uilSpecial
+syn match   uilSpecialCharacter	"'\\.'"
+syn match   uilSpecialStatement	"Xm[^	 =(){}:;]*"
+syn match   uilSpecialFunction	"MrmNcreateCallback"
+syn match   uilRessource	"XmN[^	 =(){}:;]*"
+
+syn match  uilNumber		"-\=\<\d*\.\=\d\+\(e\=f\=\|[uU]\=[lL]\=\)\>"
+syn match  uilNumber		"0[xX]\x\+\>"
+
+syn region uilComment		start="/\*"  end="\*/" contains=@Spell,uilTodo
+syn match  uilComment		"!.*" contains=@Spell,uilTodo
+syn match  uilCommentError	"\*/"
+
+syn region uilPreCondit		start="^#\s*\(if\>\|ifdef\>\|ifndef\>\|elif\>\|else\>\|endif\>\)"  skip="\\$"  end="$" contains=uilComment,uilString,uilCharacter,uilNumber,uilCommentError
+syn match  uilIncluded contained "<[^>]*>"
+syn match  uilInclude		"^#\s*include\s\+." contains=uilString,uilIncluded
+syn match  uilLineSkip		"\\$"
+syn region uilDefine		start="^#\s*\(define\>\|undef\>\)" end="$" contains=uilLineSkip,uilComment,uilString,uilCharacter,uilNumber,uilCommentError
+
+syn sync ccomment uilComment
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default highlighting.
+hi def link uilCharacter		uilString
+hi def link uilSpecialCharacter	uilSpecial
+hi def link uilNumber		uilString
+hi def link uilCommentError	uilError
+hi def link uilInclude		uilPreCondit
+hi def link uilDefine		uilPreCondit
+hi def link uilIncluded		uilString
+hi def link uilSpecialFunction	uilRessource
+hi def link uilRessource		Identifier
+hi def link uilSpecialStatement	Keyword
+hi def link uilError		Error
+hi def link uilPreCondit		PreCondit
+hi def link uilType		Type
+hi def link uilString		String
+hi def link uilComment		Comment
+hi def link uilSpecial		Special
+hi def link uilTodo		Todo
+
+
+
+let b:current_syntax = "uil"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/updatedb.vim b/syntax/updatedb.vim
new file mode 100644
index 000000000..d4479902b
--- /dev/null
+++ b/syntax/updatedb.vim
@@ -0,0 +1,45 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'updatedb') == -1
+
+" Vim syntax file
+" Language:             updatedb.conf(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2009-05-25
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword updatedbTodo    contained TODO FIXME XXX NOTE
+
+syn region  updatedbComment display oneline start='^\s*#' end='$'
+                            \ contains=updatedbTodo,@Spell
+
+syn match   updatedbBegin   display '^'
+                            \ nextgroup=updatedbName,updatedbComment skipwhite
+
+syn keyword updatedbName    contained
+                            \ PRUNEFS
+                            \ PRUNENAMES
+                            \ PRUNEPATHS
+                            \ PRUNE_BIND_MOUNTS
+                            \ nextgroup=updatedbNameEq
+
+syn match   updatedbNameEq  contained display '=' nextgroup=updatedbValue
+
+syn region  updatedbValue   contained display oneline start='"' end='"'
+
+hi def link updatedbTodo    Todo
+hi def link updatedbComment Comment
+hi def link updatedbName    Identifier
+hi def link updatedbNameEq  Operator
+hi def link updatedbValue   String
+
+let b:current_syntax = "updatedb"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/upstart.vim b/syntax/upstart.vim
new file mode 100644
index 000000000..2295ad54c
--- /dev/null
+++ b/syntax/upstart.vim
@@ -0,0 +1,115 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'upstart') == -1
+
+" Vim syntax file
+" Language:	Upstart job files
+" Maintainer:	Michael Biebl <biebl@debian.org>
+"		James Hunt <james.hunt@ubuntu.com>
+" Last Change:	2012 Jan 16
+" License:	The Vim license
+" Version:	0.4
+" Remark:	Syntax highlighting for Upstart (init(8)) job files.
+"
+" It is inspired by the initng syntax file and includes sh.vim to do the
+" highlighting of script blocks.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+let is_bash = 1
+syn include @Shell syntax/sh.vim
+
+syn case match
+
+" avoid need to use 'match' for most events
+setlocal iskeyword+=-
+
+syn match upstartComment /#.*$/ contains=upstartTodo
+syn keyword upstartTodo TODO FIXME contained
+
+syn region upstartString start=/"/ end=/"/ skip=/\\"/
+
+syn region upstartScript matchgroup=upstartStatement start="script" end="end script" contains=@upstartShellCluster
+
+syn cluster upstartShellCluster contains=@Shell
+
+" one argument
+syn keyword upstartStatement description author version instance expect
+syn keyword upstartStatement pid kill normal console env exit export
+syn keyword upstartStatement umask nice oom chroot chdir exec
+
+" two arguments
+syn keyword upstartStatement limit
+
+" one or more arguments (events)
+syn keyword upstartStatement emits
+
+syn keyword upstartStatement on start stop
+
+" flag, no parameter
+syn keyword upstartStatement respawn service instance manual debug task
+
+" prefix for exec or script 
+syn keyword upstartOption pre-start post-start pre-stop post-stop
+
+" option for kill
+syn keyword upstartOption timeout
+" option for oom
+syn keyword upstartOption never
+" options for console
+syn keyword upstartOption output owner
+" options for expect
+syn keyword upstartOption fork daemon
+" options for limit
+syn keyword upstartOption unlimited
+
+" 'options' for start/stop on
+syn keyword upstartOption and or
+
+" Upstart itself and associated utilities
+syn keyword upstartEvent runlevel
+syn keyword upstartEvent started
+syn keyword upstartEvent starting
+syn keyword upstartEvent startup
+syn keyword upstartEvent stopped
+syn keyword upstartEvent stopping
+syn keyword upstartEvent control-alt-delete
+syn keyword upstartEvent keyboard-request
+syn keyword upstartEvent power-status-changed
+
+" D-Bus
+syn keyword upstartEvent dbus-activation
+
+" Display Manager (ie gdm)
+syn keyword upstartEvent desktop-session-start
+syn keyword upstartEvent login-session-start
+
+" mountall
+syn keyword upstartEvent all-swaps
+syn keyword upstartEvent filesystem
+syn keyword upstartEvent mounted
+syn keyword upstartEvent mounting
+syn keyword upstartEvent local-filesystems
+syn keyword upstartEvent remote-filesystems
+syn keyword upstartEvent virtual-filesystems
+
+" SysV umountnfs.sh
+syn keyword upstartEvent mounted-remote-filesystems
+
+" upstart-udev-bridge and ifup/down
+syn match   upstartEvent /\<\i\{-1,}-device-\(added\|removed\|up\|down\)/
+
+" upstart-socket-bridge
+syn keyword upstartEvent socket
+
+hi def link upstartComment   Comment
+hi def link upstartTodo	     Todo
+hi def link upstartString    String
+hi def link upstartStatement Statement
+hi def link upstartOption    Type
+hi def link upstartEvent     Define
+
+let b:current_syntax = "upstart"
+
+endif
diff --git a/syntax/upstreamdat.vim b/syntax/upstreamdat.vim
new file mode 100644
index 000000000..0ae0db3a5
--- /dev/null
+++ b/syntax/upstreamdat.vim
@@ -0,0 +1,309 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'upstreamdat') == -1
+
+" Vim syntax file
+" Language:		Innovation Data Processing upstream.dat file
+" Maintainer:		Rob Owens <rowens@fdrinnovation.com>
+" Latest Revision:	2013-11-27
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Parameters:
+syn keyword upstreamdat_Parameter ACCEPTPCREMOTE 
+syn keyword upstreamdat_Parameter ACCEPTREMOTE 
+syn keyword upstreamdat_Parameter ACTION 
+syn keyword upstreamdat_Parameter ACTIVATEONENTRY 
+syn keyword upstreamdat_Parameter ARCHIVEBIT 
+syn keyword upstreamdat_Parameter ARCHIVEBIT 
+syn keyword upstreamdat_Parameter ASCTOEBC 
+syn keyword upstreamdat_Parameter ASRBACKUP 
+syn keyword upstreamdat_Parameter ATTENDED 
+syn keyword upstreamdat_Parameter AUTHORITATIVE 
+syn keyword upstreamdat_Parameter AUTHORITATIVERESTORE 
+syn keyword upstreamdat_Parameter AUTHORITATIVERESTORE 
+syn keyword upstreamdat_Parameter BACKUPPROFILE 
+syn keyword upstreamdat_Parameter BACKUPPROFILE2 
+syn keyword upstreamdat_Parameter BACKUPREPARSEFILES 
+syn keyword upstreamdat_Parameter BACKUPREPARSEFILES 
+syn keyword upstreamdat_Parameter BACKUPVERIFY 
+syn keyword upstreamdat_Parameter BLANKTRUNC 
+syn keyword upstreamdat_Parameter CALCDASDSIZE 
+syn keyword upstreamdat_Parameter CHANGEDIRATTRIBS 
+syn keyword upstreamdat_Parameter CHANGEDIRATTRIBS 
+syn keyword upstreamdat_Parameter COMPRESSLEVEL 
+syn keyword upstreamdat_Parameter CONTROLFILE 
+syn keyword upstreamdat_Parameter DASDOVERRIDE 
+syn keyword upstreamdat_Parameter DATELIMIT 
+syn keyword upstreamdat_Parameter DATELIMIT 
+syn keyword upstreamdat_Parameter DAYSOLD 
+syn keyword upstreamdat_Parameter DAYSOLD 
+syn keyword upstreamdat_Parameter DELETED 
+syn keyword upstreamdat_Parameter DELETED 
+syn keyword upstreamdat_Parameter DELETEPROMPTS 
+syn keyword upstreamdat_Parameter DELETEPROMPTS 
+syn keyword upstreamdat_Parameter DESTINATION 
+syn keyword upstreamdat_Parameter DESTINATION 
+syn keyword upstreamdat_Parameter DIRDELETE 
+syn keyword upstreamdat_Parameter DIRECTORVMC 
+syn keyword upstreamdat_Parameter DIRONLYRESTOREOK 
+syn keyword upstreamdat_Parameter DIRSONLY 
+syn keyword upstreamdat_Parameter DIRSONLY 
+syn keyword upstreamdat_Parameter DISASTERRECOVERY 
+syn keyword upstreamdat_Parameter DISPLAY 
+syn keyword upstreamdat_Parameter DRIVEALIAS 
+syn keyword upstreamdat_Parameter DRIVEALIAS 
+syn keyword upstreamdat_Parameter DUALCOPY 
+syn keyword upstreamdat_Parameter DUPDAYS 
+syn keyword upstreamdat_Parameter DUPLICATE 
+syn keyword upstreamdat_Parameter EBCTOASC 
+syn keyword upstreamdat_Parameter ENCRYPT 
+syn keyword upstreamdat_Parameter ENCRYPTLEVEL 
+syn keyword upstreamdat_Parameter EXCLUDELISTNAME 
+syn keyword upstreamdat_Parameter FAILBACKUPONERROR 
+syn keyword upstreamdat_Parameter FAILBACKUPONERROR 
+syn keyword upstreamdat_Parameter FAILIFNOFILES 
+syn keyword upstreamdat_Parameter FAILIFNOFILES 
+syn keyword upstreamdat_Parameter FAILIFSKIP 
+syn keyword upstreamdat_Parameter FAILJOB 
+syn keyword upstreamdat_Parameter FAILRESTOREONERROR 
+syn keyword upstreamdat_Parameter FAILRESTOREONERROR 
+syn keyword upstreamdat_Parameter FILEDATE 
+syn keyword upstreamdat_Parameter FILEDATE 
+syn keyword upstreamdat_Parameter FILEDELETE 
+syn keyword upstreamdat_Parameter FILEDELETE 
+syn keyword upstreamdat_Parameter FILES 
+syn keyword upstreamdat_Parameter FILES 
+syn keyword upstreamdat_Parameter FILESOPENFORUPDAT 
+syn keyword upstreamdat_Parameter FILESOPENFORUPDAT 
+syn keyword upstreamdat_Parameter FILETRANSFER 
+syn keyword upstreamdat_Parameter GETREMOTEFILES 
+syn keyword upstreamdat_Parameter HARDLINKDB 
+syn keyword upstreamdat_Parameter HARDLINKS 
+syn keyword upstreamdat_Parameter HARDLINKS 
+syn keyword upstreamdat_Parameter HIDDENFILES 
+syn keyword upstreamdat_Parameter HIDDENFILES 
+syn keyword upstreamdat_Parameter HOLDTAPE 
+syn keyword upstreamdat_Parameter HOLDUSERDIRS 
+syn keyword upstreamdat_Parameter HOSTFILENAME 
+syn keyword upstreamdat_Parameter HOSTRECORD 
+syn keyword upstreamdat_Parameter HOSTSORT 
+syn keyword upstreamdat_Parameter IGNOREPLUGINSFORRESTORE 
+syn keyword upstreamdat_Parameter INCRDB 
+syn keyword upstreamdat_Parameter INCRDBARCHIVEBIT 
+syn keyword upstreamdat_Parameter INCRDBDELETEDFILES 
+syn keyword upstreamdat_Parameter INCREMENTAL 
+syn keyword upstreamdat_Parameter INCREMENTAL 
+syn keyword upstreamdat_Parameter INQOPTIONS 
+syn keyword upstreamdat_Parameter INSTALLWIN2KAGENT 
+syn keyword upstreamdat_Parameter INSTALLWIN2KAGENT 
+syn keyword upstreamdat_Parameter JOBOPTIONS 
+syn keyword upstreamdat_Parameter JOBRETURNCODEMAP 
+syn keyword upstreamdat_Parameter JOBWAITTIMELIMIT 
+syn keyword upstreamdat_Parameter KEEPALIVE 
+syn keyword upstreamdat_Parameter LANINTERFACE 
+syn keyword upstreamdat_Parameter LANWSNAME 
+syn keyword upstreamdat_Parameter LANWSPASSWORD 
+syn keyword upstreamdat_Parameter LASTACCESS 
+syn keyword upstreamdat_Parameter LASTACCESS 
+syn keyword upstreamdat_Parameter LATESTDATE 
+syn keyword upstreamdat_Parameter LATESTDATE 
+syn keyword upstreamdat_Parameter LATESTTIME 
+syn keyword upstreamdat_Parameter LATESTTIME 
+syn keyword upstreamdat_Parameter LATESTVERSION 
+syn keyword upstreamdat_Parameter LINEBLOCK 
+syn keyword upstreamdat_Parameter LINETRUNC 
+syn keyword upstreamdat_Parameter LISTENFORREMOTE 
+syn keyword upstreamdat_Parameter LOCALBACKUP 
+syn keyword upstreamdat_Parameter LOCALBACKUPDIR 
+syn keyword upstreamdat_Parameter LOCALBACKUPMAX 
+syn keyword upstreamdat_Parameter LOCALBACKUPMAXFILESIZE 
+syn keyword upstreamdat_Parameter LOCALBACKUPMAXSIZE 
+syn keyword upstreamdat_Parameter LOCALEXCLUDEFILE 
+syn keyword upstreamdat_Parameter LOCALPARAMETERS 
+syn keyword upstreamdat_Parameter LOCALPASSWORD 
+syn keyword upstreamdat_Parameter LOCALRESTORE 
+syn keyword upstreamdat_Parameter LOCALUSER 
+syn keyword upstreamdat_Parameter LOFS 
+syn keyword upstreamdat_Parameter LOGNONFATAL 
+syn keyword upstreamdat_Parameter MAXBACKUPFILESFAIL 
+syn keyword upstreamdat_Parameter MAXBACKUPTIME 
+syn keyword upstreamdat_Parameter MAXDUPS 
+syn keyword upstreamdat_Parameter MAXFILENAMESIZE 
+syn keyword upstreamdat_Parameter MAXKFILESIZE 
+syn keyword upstreamdat_Parameter MAXLOGDAYS 
+syn keyword upstreamdat_Parameter MAXRESTOREFILESFAIL 
+syn keyword upstreamdat_Parameter MAXRESTORETIME 
+syn keyword upstreamdat_Parameter MAXRETRY 
+syn keyword upstreamdat_Parameter MAXRPTDAYS 
+syn keyword upstreamdat_Parameter MERGE 
+syn keyword upstreamdat_Parameter MIGRBITS 
+syn keyword upstreamdat_Parameter MIGRBITS 
+syn keyword upstreamdat_Parameter MINCOMPRESSSIZE 
+syn keyword upstreamdat_Parameter MINIMIZE 
+syn keyword upstreamdat_Parameter MODIFYFILE 
+syn keyword upstreamdat_Parameter MOUNTPOINTS 
+syn keyword upstreamdat_Parameter MOUNTPOINTS 
+syn keyword upstreamdat_Parameter NDS 
+syn keyword upstreamdat_Parameter NDS 
+syn keyword upstreamdat_Parameter NEWFILECOMPARE 
+syn keyword upstreamdat_Parameter NFSBELOW 
+syn keyword upstreamdat_Parameter NODATAOK 
+syn keyword upstreamdat_Parameter NODIRFORINCREMENTAL 
+syn keyword upstreamdat_Parameter NODIRFORINCREMENTAL 
+syn keyword upstreamdat_Parameter NONFILEDATABITMAP 
+syn keyword upstreamdat_Parameter NONFILEDATABITMAP 
+syn keyword upstreamdat_Parameter NOPOINTRESTORE 
+syn keyword upstreamdat_Parameter NOSPECINHERITANCE 
+syn keyword upstreamdat_Parameter NOTIFYEVENTS 
+syn keyword upstreamdat_Parameter NOTIFYFAILUREATTACHMENT 
+syn keyword upstreamdat_Parameter NOTIFYSUCCESSATTACHMENT 
+syn keyword upstreamdat_Parameter NOTIFYTARGETS 
+syn keyword upstreamdat_Parameter NOUIDGIDNAMES 
+syn keyword upstreamdat_Parameter NOUIDGIDNAMES 
+syn keyword upstreamdat_Parameter NOVELLMIGRATE 
+syn keyword upstreamdat_Parameter NOVELLMIGRATE 
+syn keyword upstreamdat_Parameter NOVELLMIGRATEADDEXT 
+syn keyword upstreamdat_Parameter NOVELLMIGRATEADDEXT 
+syn keyword upstreamdat_Parameter NOVELLPROFILE 
+syn keyword upstreamdat_Parameter NOVELLRECALL 
+syn keyword upstreamdat_Parameter NTFSADDPERMISSION 
+syn keyword upstreamdat_Parameter NTFSADDPERMISSION 
+syn keyword upstreamdat_Parameter NTREGRESTORE 
+syn keyword upstreamdat_Parameter OSTYPE 
+syn keyword upstreamdat_Parameter OUTPORT 
+syn keyword upstreamdat_Parameter PACKFLUSHAFTERFILE 
+syn keyword upstreamdat_Parameter PACKRECSIZE 
+syn keyword upstreamdat_Parameter PARAMETER 
+syn keyword upstreamdat_Parameter PASSWORD 
+syn keyword upstreamdat_Parameter PATHNAME 
+syn keyword upstreamdat_Parameter PATHNAME 
+syn keyword upstreamdat_Parameter PERFORMBITMAP 
+syn keyword upstreamdat_Parameter PERFORMNUMRECORDS 
+syn keyword upstreamdat_Parameter PERFORMRECORDSIZE 
+syn keyword upstreamdat_Parameter PLUGIN 
+syn keyword upstreamdat_Parameter PLUGIN 
+syn keyword upstreamdat_Parameter PLUGINPARAMETERS 
+syn keyword upstreamdat_Parameter PLUGINPARAMETERS 
+syn keyword upstreamdat_Parameter POSTJOB 
+syn keyword upstreamdat_Parameter PREJOB 
+syn keyword upstreamdat_Parameter PRTYCLASS 
+syn keyword upstreamdat_Parameter PRTYLEVEL 
+syn keyword upstreamdat_Parameter RECALLCLEANUP 
+syn keyword upstreamdat_Parameter RECALLOFFLINEFILES 
+syn keyword upstreamdat_Parameter RECALLOFFLINEFILES 
+syn keyword upstreamdat_Parameter RECORDSIZE 
+syn keyword upstreamdat_Parameter REMOTEADDR 
+syn keyword upstreamdat_Parameter REMOTEAPPLPREF 
+syn keyword upstreamdat_Parameter REMOTEAPPLRETRY 
+syn keyword upstreamdat_Parameter REMOTECONNECTTYPE 
+syn keyword upstreamdat_Parameter REMOTEFLAGS 
+syn keyword upstreamdat_Parameter REMOTEIPADAPTER 
+syn keyword upstreamdat_Parameter REMOTELOCALPARAMETERS 
+syn keyword upstreamdat_Parameter REMOTELOGMODE 
+syn keyword upstreamdat_Parameter REMOTELUNAME 
+syn keyword upstreamdat_Parameter REMOTEMAXRETRIES 
+syn keyword upstreamdat_Parameter REMOTEMODENAME 
+syn keyword upstreamdat_Parameter REMOTEPARAMETERFILE 
+syn keyword upstreamdat_Parameter REMOTEPORT 
+syn keyword upstreamdat_Parameter REMOTEREQUEST 
+syn keyword upstreamdat_Parameter REMOTERESTART 
+syn keyword upstreamdat_Parameter REMOTEROUTE 
+syn keyword upstreamdat_Parameter REMOTETARGETNAME 
+syn keyword upstreamdat_Parameter REMOTETCP 
+syn keyword upstreamdat_Parameter REMOTETIMEOUT 
+syn keyword upstreamdat_Parameter REMOTETMAXRETRY 
+syn keyword upstreamdat_Parameter REMOTETPN 
+syn keyword upstreamdat_Parameter REMOTEUSAPPL 
+syn keyword upstreamdat_Parameter REMOTEVERIFY 
+syn keyword upstreamdat_Parameter REMOTEWTOCOMP 
+syn keyword upstreamdat_Parameter REPORTNAME 
+syn keyword upstreamdat_Parameter REPORTOPTIONS 
+syn keyword upstreamdat_Parameter RESTARTLASTFILE 
+syn keyword upstreamdat_Parameter RESTART 
+syn keyword upstreamdat_Parameter RESTARTTYPE 
+syn keyword upstreamdat_Parameter RESTARTVERSIONDATE 
+syn keyword upstreamdat_Parameter RESTOREARCHIVEBIT 
+syn keyword upstreamdat_Parameter RESTORECHECKPOINT 
+syn keyword upstreamdat_Parameter RESTOREDATELIMIT 
+syn keyword upstreamdat_Parameter RESTOREDATELIMIT 
+syn keyword upstreamdat_Parameter RESTOREFILEFAIL 
+syn keyword upstreamdat_Parameter RESTOREMOUNTPOINTS 
+syn keyword upstreamdat_Parameter RESTOREMOUNTPOINTS 
+syn keyword upstreamdat_Parameter RESTORESEGMENTS 
+syn keyword upstreamdat_Parameter RESTORESEGMENTS 
+syn keyword upstreamdat_Parameter RESTORETODIFFFS 
+syn keyword upstreamdat_Parameter RETAIN 
+syn keyword upstreamdat_Parameter RETAIN 
+syn keyword upstreamdat_Parameter ROOTENTRY 
+syn keyword upstreamdat_Parameter ROOTENTRY 
+syn keyword upstreamdat_Parameter SAN 
+syn keyword upstreamdat_Parameter SCHEDULENAME 
+syn keyword upstreamdat_Parameter SEGMENTEDFILESIZE 
+syn keyword upstreamdat_Parameter SEGMENTEDFILESIZE 
+syn keyword upstreamdat_Parameter SEGMENTSIZE 
+syn keyword upstreamdat_Parameter SEGMENTSIZE 
+syn keyword upstreamdat_Parameter SENDHOSTDETAILS 
+syn keyword upstreamdat_Parameter SINGLEFS 
+syn keyword upstreamdat_Parameter SIZETRC 
+syn keyword upstreamdat_Parameter SKIP 
+syn keyword upstreamdat_Parameter SKIPBACKUPSCAN 
+syn keyword upstreamdat_Parameter SKIPOLD 
+syn keyword upstreamdat_Parameter SKIPOLD 
+syn keyword upstreamdat_Parameter SMSTARGETSERVICENAME 
+syn keyword upstreamdat_Parameter SMSTSA 
+syn keyword upstreamdat_Parameter SOLO 
+syn keyword upstreamdat_Parameter SORTBACKUP 
+syn keyword upstreamdat_Parameter SOSDISK 
+syn keyword upstreamdat_Parameter SOSDISK 
+syn keyword upstreamdat_Parameter SOSTIMESTAMP 
+syn keyword upstreamdat_Parameter SOSTIMESTAMP 
+syn keyword upstreamdat_Parameter SOSTIMESTAMPPATH 
+syn keyword upstreamdat_Parameter SOSTIMESTAMPPATH 
+syn keyword upstreamdat_Parameter SPECNUMBER 
+syn keyword upstreamdat_Parameter SPECNUMBER 
+syn keyword upstreamdat_Parameter SPECTYPE 
+syn keyword upstreamdat_Parameter SPECTYPE 
+syn keyword upstreamdat_Parameter STARTTIME 
+syn keyword upstreamdat_Parameter STORAGETYPE 
+syn keyword upstreamdat_Parameter SUBDIRECTORIES 
+syn keyword upstreamdat_Parameter SUBDIRECTORIES 
+syn keyword upstreamdat_Parameter SWITCHTOTAPEMB 
+syn keyword upstreamdat_Parameter TCPADDRESS 
+syn keyword upstreamdat_Parameter TCPTIMEOUT 
+syn keyword upstreamdat_Parameter TIMEOVERRIDE 
+syn keyword upstreamdat_Parameter TRACE 
+syn keyword upstreamdat_Parameter TRANSLATE 
+syn keyword upstreamdat_Parameter ULTRACOMP 
+syn keyword upstreamdat_Parameter ULTREG 
+syn keyword upstreamdat_Parameter ULTUPD 
+syn keyword upstreamdat_Parameter UNCMACHINEALIAS 
+syn keyword upstreamdat_Parameter UNCMACHINEALIAS 
+syn keyword upstreamdat_Parameter USEALEBRA 
+syn keyword upstreamdat_Parameter USECONTROLFILE 
+syn keyword upstreamdat_Parameter USEGID 
+syn keyword upstreamdat_Parameter USERID 
+syn keyword upstreamdat_Parameter USEUID 
+syn keyword upstreamdat_Parameter USNOUIDGIDERRORS 
+syn keyword upstreamdat_Parameter UTF8 
+syn keyword upstreamdat_Parameter VAULTNUMBER 
+syn keyword upstreamdat_Parameter VERSIONDATE 
+syn keyword upstreamdat_Parameter WRITESPARSE 
+syn keyword upstreamdat_Parameter XFERECORDSIZE 
+syn keyword upstreamdat_Parameter XFERRECSEP 
+syn keyword upstreamdat_Parameter XFERRECUSECR 
+
+" File Specs:
+syn match upstreamdat_Filespec /file spec\c \d\{1,3}.*/
+
+" Comments:
+syn match upstreamdat_Comment /^#.*/
+
+hi def link upstreamdat_Parameter Type
+"hi def link upstreamdat_Filespec Underlined
+hi def link upstreamdat_Comment Comment
+
+let b:current_syntax = "upstreamdat"
+
+endif
diff --git a/syntax/upstreaminstalllog.vim b/syntax/upstreaminstalllog.vim
new file mode 100644
index 000000000..b4e760833
--- /dev/null
+++ b/syntax/upstreaminstalllog.vim
@@ -0,0 +1,31 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'upstreaminstalllog') == -1
+
+" Vim syntax file
+" Language:             Innovation Data Processing UPSTREAMInstall.log file
+" Maintainer:           Rob Owens <rowens@fdrinnovation.com>
+" Latest Revision:      2013-06-17
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Date:
+syn match upstreaminstalllog_Date /\u\l\l \u\l\l\s\{1,2}\d\{1,2} \d\d:\d\d:\d\d \d\d\d\d/
+" Msg Types:
+syn match upstreaminstalllog_MsgD /Msg #MSI\d\{4,5}D/
+syn match upstreaminstalllog_MsgE /Msg #MSI\d\{4,5}E/
+syn match upstreaminstalllog_MsgI /Msg #MSI\d\{4,5}I/
+syn match upstreaminstalllog_MsgW /Msg #MSI\d\{4,5}W/
+" IP Address:
+syn match upstreaminstalllog_IPaddr / \d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
+
+hi def link upstreaminstalllog_Date	Underlined
+hi def link upstreaminstalllog_MsgD	Type
+hi def link upstreaminstalllog_MsgE	Error
+hi def link upstreaminstalllog_MsgW	Constant
+hi def link upstreaminstalllog_IPaddr	Identifier
+
+let b:current_syntax = "upstreaminstalllog"
+
+endif
diff --git a/syntax/upstreamlog.vim b/syntax/upstreamlog.vim
new file mode 100644
index 000000000..8e50a9e68
--- /dev/null
+++ b/syntax/upstreamlog.vim
@@ -0,0 +1,58 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'upstreamlog') == -1
+
+" Vim syntax file
+" Language:             Innovation Data Processing upstream.log file
+" Maintainer:           Rob Owens <rowens@fdrinnovation.com>
+" Latest Revision:      2013-09-19
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Date:
+syn match upstreamlog_Date /\u\l\l \u\l\l\s\{1,2}\d\{1,2} \d\d:\d\d:\d\d \d\d\d\d/
+" Msg Types:
+syn match upstreamlog_MsgD /Msg #\(Agt\|PC\|Srv\)\d\{4,5}D/ nextgroup=upstreamlog_Process skipwhite
+syn match upstreamlog_MsgE /Msg #\(Agt\|PC\|Srv\)\d\{4,5}E/ nextgroup=upstreamlog_Process skipwhite
+syn match upstreamlog_MsgI /Msg #\(Agt\|PC\|Srv\)\d\{4,5}I/ nextgroup=upstreamlog_Process skipwhite
+syn match upstreamlog_MsgW /Msg #\(Agt\|PC\|Srv\)\d\{4,5}W/ nextgroup=upstreamlog_Process skipwhite
+" Processes:
+syn region upstreamlog_Process start="(" end=")" contained
+" IP Address:
+syn match upstreamlog_IPaddr /\( \|(\)\zs\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
+" Profile:
+syn match upstreamlog_Profile /Using default configuration for profile \zs\S\{1,8}\ze/
+syn match upstreamlog_Profile /Now running profile \zs\S\{1,8}\ze/
+syn match upstreamlog_Profile /in profile set \zs\S\{1,8}\ze/
+syn match upstreamlog_Profile /Migrate disk backup from profile \zs\S\{1,8}\ze/
+syn match upstreamlog_Profile /Profileset=\zs\S\{1,8}\ze,/
+syn match upstreamlog_Profile /Vault \(disk\|tape\) backup to vault \d\{1,4} from profile \zs\S\{1,8}\ze/
+syn match upstreamlog_Profile /Profile name \zs\"\S\{1,8}\"/
+syn match upstreamlog_Profile / Profile: \zs\S\{1,8}/
+syn match upstreamlog_Profile /  Profile: \zs\S\{1,8}\ze, /
+syn match upstreamlog_Profile /, profile: \zs\S\{1,8}\ze,/
+syn match upstreamlog_Profile /found Profile: \zs\S\{1,8}\ze,/
+syn match upstreamlog_Profile /Backup Profile: \zs\S\{1,8}\ze Version date/
+syn match upstreamlog_Profile /Backup profile: \zs\S\{1,8}\ze  Version date/
+syn match upstreamlog_Profile /Full of \zs\S\{1,8}\ze$/
+syn match upstreamlog_Profile /Incr. of \zs\S\{1,8}\ze$/
+syn match upstreamlog_Profile /Profile=\zs\S\{1,8}\ze,/
+" Target:
+syn region upstreamlog_Target start="Computer: \zs" end="\ze[\]\)]" 
+syn region upstreamlog_Target start="Computer name \zs\"" end="\"\ze" 
+syn region upstreamlog_Target start="request to registered name \zs" end=" "
+
+
+hi def link upstreamlog_Date	Underlined
+hi def link upstreamlog_MsgD	Type
+hi def link upstreamlog_MsgE	Error
+hi def link upstreamlog_MsgW	Constant
+hi def link upstreamlog_Process	Statement
+hi def link upstreamlog_IPaddr	Identifier
+hi def link upstreamlog_Profile	Identifier
+hi def link upstreamlog_Target	Identifier
+
+let b:current_syntax = "upstreamlog"
+
+endif
diff --git a/syntax/usserverlog.vim b/syntax/usserverlog.vim
new file mode 100644
index 000000000..c891affae
--- /dev/null
+++ b/syntax/usserverlog.vim
@@ -0,0 +1,64 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'usserverlog') == -1
+
+" Vim syntax file
+" Language:             Innovation Data Processing usserver.log file
+" Maintainer:           Rob Owens <rowens@fdrinnovation.com>
+" Latest Revision:      2013-09-19
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Date:
+syn match usserverlog_Date /\u\l\l \u\l\l\s\{1,2}\d\{1,2} \d\d:\d\d:\d\d \d\d\d\d/
+" Msg Types:
+syn match usserverlog_MsgD /Msg #\(Agt\|PC\|Srv\)\d\{4,5}D/ nextgroup=usserverlog_Process skipwhite
+syn match usserverlog_MsgE /Msg #\(Agt\|PC\|Srv\)\d\{4,5}E/ nextgroup=usserverlog_Process skipwhite
+syn match usserverlog_MsgI /Msg #\(Agt\|PC\|Srv\)\d\{4,5}I/ nextgroup=usserverlog_Process skipwhite
+syn match usserverlog_MsgW /Msg #\(Agt\|PC\|Srv\)\d\{4,5}W/ nextgroup=usserverlog_Process skipwhite
+" Processes:
+syn region usserverlog_Process start="(" end=")" contained
+" IP Address:
+syn match usserverlog_IPaddr /\( \|(\)\zs\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
+" Profile:
+syn match usserverlog_Profile /Using default configuration for profile \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Now running profile \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /in profile set \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Migrate disk backup from profile \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Using profile prefix for profile \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Add\/update profile \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Profileset=\zs\S\{1,8}\ze,/
+syn match usserverlog_Profile /profileset=\zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Vault \(disk\|tape\) backup to vault \d\{1,4} from profile \zs\S\{1,8}\ze/
+syn match usserverlog_Profile /Profile name \zs\"\S\{1,8}\"/
+syn match usserverlog_Profile / Profile: \zs\S\{1,8}/
+syn match usserverlog_Profile /  Profile: \zs\S\{1,8}\ze, /
+syn match usserverlog_Profile /, profile: \zs\S\{1,8}\ze,/
+syn match usserverlog_Profile /Expecting Profile: \zs\S\{1,8}\ze,/
+syn match usserverlog_Profile /found Profile: \zs\S\{1,8}\ze,/
+syn match usserverlog_Profile /Profile \zs\S\{1,8} \zeis a member of group: /
+syn match upstreamlog_Profile /Backup Profile: \zs\S\{1,8}\ze Version date/
+syn match upstreamlog_Profile /Backup profile: \zs\S\{1,8}\ze  Version date/
+syn match usserverlog_Profile /Full of \zs\S\{1,8}\ze$/
+syn match usserverlog_Profile /Incr. of \zs\S\{1,8}\ze$/
+syn match usserverlog_Profile /Profile=\zs\S\{1,8}\ze,/
+" Target:
+syn region usserverlog_Target start="Computer: \zs" end="\ze[\]\)]" 
+syn region usserverlog_Target start="Computer name \zs\"" end="\"\ze" 
+syn region usserverlog_Target start="Registration add request successful \zs" end="$"
+syn region usserverlog_Target start="request to registered name \zs" end=" "
+syn region usserverlog_Target start=", sending to \zs" end="$"
+
+hi def link usserverlog_Date	Underlined
+hi def link usserverlog_MsgD	Type
+hi def link usserverlog_MsgE	Error
+hi def link usserverlog_MsgW	Constant
+hi def link usserverlog_Process	Statement
+hi def link usserverlog_IPaddr	Identifier
+hi def link usserverlog_Profile	Identifier
+hi def link usserverlog_Target	Identifier
+
+let b:current_syntax = "usserverlog"
+
+endif
diff --git a/syntax/usw2kagtlog.vim b/syntax/usw2kagtlog.vim
new file mode 100644
index 000000000..8b3ee48be
--- /dev/null
+++ b/syntax/usw2kagtlog.vim
@@ -0,0 +1,58 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'usw2kagtlog') == -1
+
+" Vim syntax file
+" Language:             Innovation Data Processing USW2KAgt.log file
+" Maintainer:           Rob Owens <rowens@fdrinnovation.com>
+" Latest Revision:      2014-04-01
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Date:
+syn match usw2kagtlog_Date /\u\l\l \u\l\l\s\{1,2}\d\{1,2} \d\d:\d\d:\d\d \d\d\d\d/
+" Msg Types:
+syn match usw2kagtlog_MsgD /Msg #\(Agt\|PC\|Srv\)\d\{4,5}D/ nextgroup=usw2kagtlog_Process skipwhite
+syn match usw2kagtlog_MsgE /Msg #\(Agt\|PC\|Srv\)\d\{4,5}E/ nextgroup=usw2kagtlog_Process skipwhite
+syn match usw2kagtlog_MsgI /Msg #\(Agt\|PC\|Srv\)\d\{4,5}I/ nextgroup=usw2kagtlog_Process skipwhite
+syn match usw2kagtlog_MsgW /Msg #\(Agt\|PC\|Srv\)\d\{4,5}W/ nextgroup=usw2kagtlog_Process skipwhite
+" Processes:
+syn region usw2kagtlog_Process start="(" end=")" contained
+"syn region usw2kagtlog_Process start="Starting the processing for a \zs\"" end="\ze client request"
+"syn region usw2kagtlog_Process start="Ending the processing for a \zs\"" end="\ze client request"
+"syn region usw2kagtlog_Process start="Starting the processing for a \zs\"" end="\ze client\s\{0,1}\r\{0,1}\s\{1,9}request"
+"syn region usw2kagtlog_Process start="Ending the processing for a \zs\"" end="\ze client\s\{0,1}\r\{0,1}\s\{1,9}request"
+syn region usw2kagtlog_Process start="Starting the processing for a \zs\"" end="\ze client"
+syn region usw2kagtlog_Process start="Ending the processing for a \zs\"" end="\ze client"
+" IP Address:
+syn match usw2kagtlog_IPaddr / \d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}/
+" Profile:
+
+syn match usw2kagtlog_Profile /Profile name \zs\"\S\{1,8}\"/
+syn match usw2kagtlog_Profile / Profile: \zs\S\{1,8}/
+syn match usw2kagtlog_Profile /  Profile: \zs\S\{1,8}\ze, /
+syn match upstreamlog_Profile /Backup Profile: \zs\S\{1,8}\ze Version date/
+syn match upstreamlog_Profile /Backup profile: \zs\S\{1,8}\ze  Version date/
+syn match usw2kagtlog_Profile /Full of \zs\S\{1,8}\ze$/
+syn match usw2kagtlog_Profile /Incr. of \zs\S\{1,8}\ze$/
+syn match usw2kagtlog_Profile /profile name "\zs\S\{1,8}\ze"/
+" Target:
+syn region usw2kagtlog_Target start="Computer: \zs" end="\ze[\]\)]" 
+syn region usw2kagtlog_Target start="Computer name \zs\"" end="\"\ze" 
+" Agent Keywords:
+syn keyword usw2kagtlog_Agentword opened closed
+
+hi def link usw2kagtlog_Date		Underlined
+hi def link usw2kagtlog_MsgD		Type
+hi def link usw2kagtlog_MsgE		Error
+hi def link usw2kagtlog_MsgW		Constant
+hi def link usw2kagtlog_Process		Statement
+hi def link usw2kagtlog_IPaddr		Identifier
+hi def link usw2kagtlog_Profile		Identifier
+hi def link usw2kagtlog_Target		Identifier
+hi def link usw2kagtlog_Agentword	Special
+
+let b:current_syntax = "usw2kagentlog"
+
+endif
diff --git a/syntax/vera.vim b/syntax/vera.vim
new file mode 100644
index 000000000..8213de17b
--- /dev/null
+++ b/syntax/vera.vim
@@ -0,0 +1,352 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vera') == -1
+
+" Vim syntax file
+" Language:	Vera
+" Maintainer:	Dave Eggum (opine at bluebottle dOt com)
+" Last Change:	2005 Dec 19
+
+" NOTE: extra white space at the end of the line will be highlighted if you
+" add this line to your colorscheme:
+
+" highlight SpaceError    guibg=#204050
+
+" (change the value for guibg to any color you like)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" A bunch of useful Vera keywords
+syn keyword	veraStatement	break return continue fork join terminate
+syn keyword	veraStatement	breakpoint proceed
+
+syn keyword	veraLabel	bad_state bad_trans bind constraint coverage_group
+syn keyword	veraLabel	class CLOCK default function interface m_bad_state
+syn keyword	veraLabel	m_bad_trans m_state m_trans program randseq state
+syn keyword	veraLabel	task trans
+
+syn keyword	veraConditional	if else case casex casez randcase
+syn keyword 	veraRepeat      repeat while for do foreach
+syn keyword 	veraModifier	after all any around assoc_size async
+syn keyword 	veraModifier	before big_endian bit_normal bit_reverse export
+syn keyword 	veraModifier	extends extern little_endian local hdl_node hdl_task
+syn keyword 	veraModifier	negedge none packed protected posedge public rules
+syn keyword 	veraModifier	shadow soft static super this typedef unpacked var
+syn keyword 	veraModifier	vca virtual virtuals wildcard with
+
+syn keyword 	veraType	reg string enum event bit
+syn keyword 	veraType	rand randc integer port prod
+
+syn keyword     veraDeprecated	call_func call_task close_conn get_bind get_bind_id
+syn keyword     veraDeprecated	get_conn_err mailbox_receive mailbox_send make_client
+syn keyword     veraDeprecated	make_server simwave_plot up_connections
+
+" predefined tasks and functions
+syn keyword 	veraTask	alloc assoc_index cast_assign cm_coverage
+syn keyword 	veraTask	cm_get_coverage cm_get_limit delay error error_mode
+syn keyword 	veraTask	exit fclose feof ferror fflush flag fopen fprintf
+syn keyword 	veraTask	freadb freadh freadstr get_cycle get_env get_memsize
+syn keyword 	veraTask	get_plus_arg getstate get_systime get_time get_time_unit
+syn keyword 	veraTask	initstate lock_file mailbox_get mailbox_put os_command
+syn keyword 	veraTask	printf prodget prodset psprintf query query_str query_x
+syn keyword 	veraTask	rand48 random region_enter region_exit rewind
+syn keyword 	veraTask	semaphore_get semaphore_put setstate signal_connect
+syn keyword 	veraTask	sprintf srandom sscanf stop suspend_thread sync
+syn keyword 	veraTask	timeout trace trigger unit_delay unlock_file urand48
+syn keyword 	veraTask	urandom urandom_range vera_bit_reverse vera_crc
+syn keyword 	veraTask	vera_pack vera_pack_big_endian vera_plot
+syn keyword 	veraTask	vera_report_profile vera_unpack vera_unpack_big_endian
+syn keyword 	veraTask	vsv_call_func vsv_call_task vsv_get_conn_err
+syn keyword 	veraTask	vsv_make_client vsv_make_server vsv_up_connections
+syn keyword 	veraTask	vsv_wait_for_done vsv_wait_for_input wait_child wait_var
+
+syn cluster	veraOperGroup	contains=veraOperator,veraOperParen,veraNumber,veraString,veraOperOk,veraType
+" syn match	veraOperator	"++\|--\|&\|\~&\||\|\~|\|^\|\~^\|\~\|><"
+" syn match	veraOperator	"*\|/\|%\|+\|-\|<<\|>>\|<\|<=\|>\|>=\|!in"
+" syn match	veraOperator	"=?=\|!?=\|==\|!=\|===\|!==\|&\~\|^\~\||\~"
+" syn match	veraOperator	"&&\|||\|=\|+=\|-=\|*=\|/=\|%=\|<<=\|>>=\|&="
+" syn match	veraOperator	"|=\|^=\|\~&=\|\~|=\|\~^="
+
+syn match	veraOperator	"[&|\~><!*@+/=,.\^\-]"
+syn keyword	veraOperator	or in dist not
+
+" open vera class methods
+syn keyword	veraMethods	atobin atohex atoi atooct backref bittostr capacity
+syn keyword	veraMethods	compare Configure constraint_mode delete DisableTrigger
+syn keyword	veraMethods	DoAction empty EnableCount EnableTrigger Event find
+syn keyword	veraMethods	find_index first first_index GetAssert get_at_least
+syn keyword	veraMethods	get_auto_bin getc GetCount get_coverage_goal get_cov_weight
+syn keyword	veraMethods	get_cross_bin_max GetFirstAssert GetName GetNextAssert
+syn keyword	veraMethods	get_status get_status_msg hide hash icompare insert
+syn keyword	veraMethods	inst_get_at_least inst_get_auto_bin_max inst_get_collect
+syn keyword	veraMethods	inst_get_coverage_goal inst_get_cov_weight inst_getcross_bin_max
+syn keyword	veraMethods	inst_query inst_set_at_least inst_set_auto_bin_max
+syn keyword	veraMethods	inst_set_bin_activiation inst_set_collect inst_set_coverage_goal
+syn keyword	veraMethods	inst_set_cov_weight inst_set_cross_bin_max itoa last last_index
+syn keyword	veraMethods	len load match max max_index min min_index new object_compare
+syn keyword	veraMethods	object_compare object_copy object_print pack pick_index
+syn keyword	veraMethods	pop_back pop_front post_boundary postmatch post_pack post_pack
+syn keyword	veraMethods	post_randomize post_randomize post_unpack post_unpack
+syn keyword	veraMethods	pre_boundary prematch pre_pack pre_pack pre_randomize
+syn keyword	veraMethods	pre-randomize pre_unpack push_back push_front putc query
+syn keyword	veraMethods	query_str rand_mode randomize reserve reverse rsort search
+syn keyword	veraMethods	set_at_least set_auto_bin_max set_bin_activiation
+syn keyword	veraMethods	set_coverage_goal set_cov_weight set_cross_bin_max set_name
+syn keyword	veraMethods	size sort substr sum thismatch tolower toupper unique_index
+syn keyword	veraMethods	unpack Wait
+
+" interface keywords
+syn keyword	veraInterface	ASYNC CLOCK gnr gr0 gr1 grx grz NHOLD nr NR0 NR1
+syn keyword	veraInterface	NRZ NRZ NSAMPLE PHOLD PR0 PR1 PRX PRZ r0 r1 rx snr
+syn keyword	veraInterface	sr0 sr1 srx srz depth inout input output
+syn match       veraInterface   "\$\w\+"
+
+
+syn keyword	veraTodo	contained TODO FIXME XXX FINISH
+
+" veraCommentGroup allows adding matches for special things in comments
+syn cluster	veraCommentGroup	contains=veraTodo
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match	veraSpecial	display contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)"
+syn match	veraFormat	display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlL]\|ll\)\=\([bdiuoxXDOUfeEgGcCsSpnm]\|\[\^\=.[^]]*\]\)" contained
+syn match	veraFormat	display "%%" contained
+syn region	veraString	start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=veraSpecial,veraFormat,@Spell
+syn region	veraConcat	contained transparent oneline start='{' end='}'
+
+" veraCppString: same as veraString, but ends at end of line
+syn region	veraCppString	start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=veraSpecial,veraFormat,@Spell
+
+syn match	veraCharacter	"'[^\\]'"
+syn match	veraCharacter	"L'[^']*'" contains=veraSpecial
+syn match	veraSpecialError	"'\\[^'\"?\\abefnrtv]'"
+syn match	veraSpecialCharacter	"'\\['\"?\\abefnrtv]'"
+syn match	veraSpecialCharacter	display	"'\\\o\{1,3}'"
+syn match	veraSpecialCharacter	display	"'\\x\x\{1,2}'"
+syn match	veraSpecialCharacter	display	"L'\\x\x\+'"
+
+" highlight trailing white space
+syn match	veraSpaceError	display	excludenl "\s\+$"
+syn match	veraSpaceError	display	" \+\t"me=e-1
+
+"catch errors caused by wrong parenthesis and brackets
+syn cluster	veraParenGroup	contains=veraParenError,veraIncluded,veraSpecial,veraCommentSkip,veraCommentString,veraComment2String,@veraCommentGroup,veraCommentStartError,veraUserCont,veraUserLabel,veraBitField,veraCommentSkip,veraOctalZero,veraCppOut,veraCppOut2,veraCppSkip,veraFormat,veraNumber,veraFloat,veraOctal,veraOctalError,veraNumbersCom
+
+syn region	veraParen	transparent start='(' end=')' contains=ALLBUT,@veraParenGroup,veraCppParen,veraErrInBracket,veraCppBracket,veraCppString,@Spell
+" veraCppParen: same as veraParen but ends at end-of-line; used in veraDefine
+syn region	veraCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@veraParenGroup,veraErrInBracket,veraParen,veraBracket,veraString,@Spell
+syn match	veraParenError	display "[\])]"
+" syn match	veraErrInParen	display contained "[\]{}]"
+syn match	veraErrInParen	display contained "[\]]"
+syn region	veraBracket	transparent start='\[' end=']' contains=ALLBUT,@veraParenGroup,veraErrInParen,veraCppParen,veraCppBracket,veraCppString,@Spell
+
+" veraCppBracket: same as veraParen but ends at end-of-line; used in veraDefine
+syn region	veraCppBracket	transparent start='\[' skip='\\$' excludenl end=']' end='$' contained contains=ALLBUT,@veraParenGroup,veraErrInParen,veraParen,veraBracket,veraString,@Spell
+syn match	veraErrInBracket	display contained "[);{}]"
+
+"integer number, or floating point number without a dot and with "f".
+syn case ignore
+syn match	veraNumbers	display transparent "\<\d\|\.\d" contains=veraNumber,veraFloat,veraOctalError,veraOctal
+" Same, but without octal error (for comments)
+syn match	veraNumbersCom	display contained transparent "\<\d\|\.\d" contains=veraNumber,veraFloat,veraOctal
+" syn match	veraNumber	display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>"
+" "hex number
+" syn match	veraNumber	display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
+" syn match   veraNumber "\(\<[0-9]\+\|\)'[bdoh][0-9a-fxzA-FXZ_]\+\>"
+syn match	veraNumber "\<\(\<[0-9]\+\)\?\('[bdoh]\)\?[0-9a-fxz_]\+\>"
+" syn match   veraNumber "\<[+-]\=[0-9]\+\>"
+" Flag the first zero of an octal number as something special
+syn match	veraOctal	display contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>" contains=veraOctalZero
+syn match	veraOctalZero	display contained "\<0"
+syn match	veraFloat	display contained "\d\+f"
+"floating point number, with dot, optional exponent
+syn match	veraFloat	display contained "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\="
+"floating point number, starting with a dot, optional exponent
+syn match	veraFloat	display contained "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+"floating point number, without dot, with exponent
+syn match	veraFloat	display contained "\d\+e[-+]\=\d\+[fl]\=\>"
+"hexadecimal floating point number, optional leading digits, with dot, with exponent
+syn match	veraFloat	display contained "0x\x*\.\x\+p[-+]\=\d\+[fl]\=\>"
+"hexadecimal floating point number, with leading digits, optional dot, with exponent
+syn match	veraFloat	display contained "0x\x\+\.\=p[-+]\=\d\+[fl]\=\>"
+
+" flag an octal number with wrong digits
+syn match	veraOctalError	display contained "0\o*[89]\d*"
+syn case match
+
+let vera_comment_strings = 1
+
+if exists("vera_comment_strings")
+  " A comment can contain veraString, veraCharacter and veraNumber.
+  " But a "*/" inside a veraString in a veraComment DOES end the comment!  So we
+  " need to use a special type of veraString: veraCommentString, which also ends on
+  " "*/", and sees a "*" at the start of the line as comment again.
+  " Unfortunately this doesn't work very well for // type of comments :-(
+  syntax match	veraCommentSkip	contained "^\s*\*\($\|\s\+\)"
+  syntax region veraCommentString	contained start=+L\=\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end=+\*/+me=s-1 contains=veraSpecial,veraCommentSkip
+  syntax region veraComment2String	contained start=+\\\@<!"+ skip=+\\\\\|\\"+ end=+"+ end="$" contains=veraSpecial
+  syntax region  veraCommentL	start="//" skip="\\$" end="$" keepend contains=@veraCommentGroup,veraComment2String,veraCharacter,veraNumbersCom,veraSpaceError,@Spell
+  if exists("vera_no_comment_fold")
+    syntax region veraComment	matchgroup=veraCommentStart start="/\*" end="\*/" contains=@veraCommentGroup,veraCommentStartError,veraCommentString,veraCharacter,veraNumbersCom,veraSpaceError,@Spell
+  else
+    syntax region veraComment	matchgroup=veraCommentStart start="/\*" end="\*/" contains=@veraCommentGroup,veraCommentStartError,veraCommentString,veraCharacter,veraNumbersCom,veraSpaceError,@Spell fold
+  endif
+else
+  syn region	veraCommentL	start="//" skip="\\$" end="$" keepend contains=@veraCommentGroup,veraSpaceError,@Spell
+  if exists("vera_no_comment_fold")
+    syn region	veraComment	matchgroup=veraCommentStart start="/\*" end="\*/" contains=@veraCommentGroup,veraCommentStartError,veraSpaceError,@Spell
+  else
+    syn region	veraComment	matchgroup=veraCommentStart start="/\*" end="\*/" contains=@veraCommentGroup,veraCommentStartError,veraSpaceError,@Spell fold
+  endif
+endif
+" keep a // comment separately, it terminates a preproc. conditional
+syntax match	veraCommentError	display "\*/"
+syntax match	veraCommentStartError display "/\*"me=e-1 contained
+
+syntax region	veraBlock		start="{" end="}" transparent fold
+
+" open vera pre-defined constants
+syn keyword veraConstant	ALL ANY BAD_STATE BAD_TRANS CALL CHECK CHGEDGE
+syn keyword veraConstant	CLEAR COPY_NO_WAIT COPY_WAIT CROSS CROSS_TRANS
+syn keyword veraConstant	DEBUG DELETE EC_ARRAYX EC_CODE_END EC_CONFLICT
+syn keyword veraConstant	EC_EVNTIMOUT EC_EXPECT EC_FULLEXPECT EC_MBXTMOUT
+syn keyword veraConstant	EC_NEXPECT EC_RETURN EC_RGNTMOUT EC_SCONFLICT
+syn keyword veraConstant	EC_SEMTMOUT EC_SEXPECT EC_SFULLEXPECT EC_SNEXTPECT
+syn keyword veraConstant	EC_USERSET EQ EVENT FAIL FIRST FORK GE GOAL GT
+syn keyword veraConstant	HAND_SHAKE HI HIGH HNUM LE LIC_EXIT LIC_PRERR
+syn keyword veraConstant	LIC_PRWARN LIC_WAIT LO LOAD LOW LT MAILBOX MAX_COM
+syn keyword veraConstant	NAME NE NEGEDGE NEXT NO_OVERLAP NO_OVERLAP_STATE
+syn keyword veraConstant	NO_OVERLAP_TRANS NO_VARS NO_WAIT NUM NUM_BIN
+syn keyword veraConstant	NUM_DET null OFF OK OK_LAST ON ONE_BLAST ONE_SHOT ORDER
+syn keyword veraConstant	PAST_IT PERCENT POSEDGE PROGRAM RAWIN REGION REPORT
+syn keyword veraConstant	SAMPLE SAVE SEMAPHORE SET SILENT STATE stderr
+syn keyword veraConstant	stdin stdout STR STR_ERR_OUT_OF_RANGE
+syn keyword veraConstant	STR_ERR_REGEXP_SYNTAX SUM TRANS VERBOSE void WAIT
+syn keyword veraConstant	__LINE__ __FILE__ __DATE__ __TIME__ __VERA__
+syn keyword veraConstant	__VERSION__ __VERA_VERSION__ __VERA_MINOR__
+syn keyword veraConstant	__VERA_PATCH__ __VERA_VMC__ __VERA_VMC_MINOR__
+
+syn match   veraUserConstant "\<[A-Z][A-Z0-9_]\+\>"
+
+syn match veraClass "\zs\w\+\ze::"
+syn match veraClass "\zs\w\+\ze\s\+\w\+\s*[=;,)\[]" contains=veraConstant,veraUserConstant
+syn match veraClass "\zs\w\+\ze\s\+\w\+\s*$" contains=veraConstant,veraUserConstant
+syn match veraUserMethod "\zs\w\+\ze\s*(" contains=veraConstant,veraUserConstant
+syn match veraObject "\zs\w\+\ze\.\w"
+syn match veraObject "\zs\w\+\ze\.\$\w"
+
+" Accept ` for # (Verilog)
+syn region	veraPreCondit	start="^\s*\(`\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" end="//"me=s-1 contains=veraComment,veraCppString,veraCharacter,veraCppParen,veraParenError,veraNumbers,veraCommentError,veraSpaceError
+syn match	veraPreCondit	display "^\s*\(`\|#\)\s*\(else\|endif\)\>"
+if !exists("vera_no_if0")
+  syn region	veraCppOut		start="^\s*\(`\|#\)\s*if\s\+0\+\>" end=".\@=\|$" contains=veraCppOut2
+  syn region	veraCppOut2	contained start="0" end="^\s*\(`\|#\)\s*\(endif\>\|else\>\|elif\>\)" contains=veraSpaceError,veraCppSkip
+  syn region	veraCppSkip	contained start="^\s*\(`\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(`\|#\)\s*endif\>" contains=veraSpaceError,veraCppSkip
+endif
+syn region	veraIncluded	display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match	veraIncluded	display contained "<[^>]*>"
+syn match	veraInclude	display "^\s*\(`\|#\)\s*include\>\s*["<]" contains=veraIncluded
+"syn match veraLineSkip	"\\$"
+syn cluster	veraPreProcGroup	contains=veraPreCondit,veraIncluded,veraInclude,veraDefine,veraErrInParen,veraErrInBracket,veraUserLabel,veraSpecial,veraOctalZero,veraCppOut,veraCppOut2,veraCppSkip,veraFormat,veraNumber,veraFloat,veraOctal,veraOctalError,veraNumbersCom,veraString,veraCommentSkip,veraCommentString,veraComment2String,@veraCommentGroup,veraCommentStartError,veraParen,veraBracket,veraMulti
+syn region	veraDefine		start="^\s*\(`\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" end="//"me=s-1 contains=ALLBUT,@veraPreProcGroup,@Spell
+syn region	veraPreProc	start="^\s*\(`\|#\)\s*\(pragma\>\|line\>\|warning\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@veraPreProcGroup,@Spell
+
+" Highlight User Labels
+syn cluster	veraMultiGroup	contains=veraIncluded,veraSpecial,veraCommentSkip,veraCommentString,veraComment2String,@veraCommentGroup,veraCommentStartError,veraUserCont,veraUserLabel,veraBitField,veraOctalZero,veraCppOut,veraCppOut2,veraCppSkip,veraFormat,veraNumber,veraFloat,veraOctal,veraOctalError,veraNumbersCom,veraCppParen,veraCppBracket,veraCppString
+syn region	veraMulti		transparent start='?' skip='::' end=':' contains=ALLBUT,@veraMultiGroup,@Spell
+" syn region	veraMulti		transparent start='?' skip='::' end=':' contains=ALL
+" The above causes veraCppOut2 to catch on:
+"    i = (isTrue) ? 0 : 1;
+" which ends up commenting the rest of the file
+
+" Avoid matching foo::bar() by requiring that the next char is not ':'
+syn cluster	veraLabelGroup	contains=veraUserLabel
+syn match	veraUserCont	display "^\s*\I\i*\s*:$" contains=@veraLabelGroup
+syn match	veraUserCont	display ";\s*\I\i*\s*:$" contains=@veraLabelGroup
+syn match	veraUserCont	display "^\s*\I\i*\s*:[^:]"me=e-1 contains=@veraLabelGroup
+syn match	veraUserCont	display ";\s*\I\i*\s*:[^:]"me=e-1 contains=@veraLabelGroup
+
+syn match	veraUserLabel	display "\I\i*" contained
+
+" Avoid recognizing most bitfields as labels
+syn match	veraBitField	display "^\s*\I\i*\s*:\s*[1-9]"me=e-1
+syn match	veraBitField	display ";\s*\I\i*\s*:\s*[1-9]"me=e-1
+
+if exists("vera_minlines")
+  let b:vera_minlines = vera_minlines
+else
+  if !exists("vera_no_if0")
+    let b:vera_minlines = 50	" #if 0 constructs can be long
+  else
+    let b:vera_minlines = 15	" mostly for () constructs
+  endif
+endif
+exec "syn sync ccomment veraComment minlines=" . b:vera_minlines
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link veraClass		Identifier
+hi def link veraObject		Identifier
+hi def link veraUserMethod		Function
+hi def link veraTask		Keyword
+hi def link veraModifier		Tag
+hi def link veraDeprecated		veraError
+hi def link veraMethods		Statement
+" hi def link veraInterface		Label
+hi def link veraInterface		Function
+
+hi def link veraFormat		veraSpecial
+hi def link veraCppString		veraString
+hi def link veraCommentL		veraComment
+hi def link veraCommentStart		veraComment
+hi def link veraLabel			Label
+hi def link veraUserLabel		Label
+hi def link veraConditional		Conditional
+hi def link veraRepeat		Repeat
+hi def link veraCharacter		Character
+hi def link veraSpecialCharacter	veraSpecial
+hi def link veraNumber		Number
+hi def link veraOctal			Number
+hi def link veraOctalZero		PreProc	 " link this to Error if you want
+hi def link veraFloat			Float
+hi def link veraOctalError		veraError
+hi def link veraParenError		veraError
+hi def link veraErrInParen		veraError
+hi def link veraErrInBracket		veraError
+hi def link veraCommentError		veraError
+hi def link veraCommentStartError	veraError
+hi def link veraSpaceError         SpaceError
+hi def link veraSpecialError		veraError
+hi def link veraOperator		Operator
+hi def link veraStructure		Structure
+hi def link veraInclude		Include
+hi def link veraPreProc		PreProc
+hi def link veraDefine		Macro
+hi def link veraIncluded		veraString
+hi def link veraError			Error
+hi def link veraStatement		Statement
+hi def link veraPreCondit		PreCondit
+hi def link veraType			Type
+" hi def link veraConstant		Constant
+hi def link veraConstant		Keyword
+hi def link veraUserConstant		Constant
+hi def link veraCommentString		veraString
+hi def link veraComment2String	veraString
+hi def link veraCommentSkip		veraComment
+hi def link veraString		String
+hi def link veraComment		Comment
+hi def link veraSpecial		SpecialChar
+hi def link veraTodo			Todo
+hi def link veraCppSkip		veraCppOut
+hi def link veraCppOut2		veraCppOut
+hi def link veraCppOut		Comment
+
+
+let b:current_syntax = "vera"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/verilog.vim b/syntax/verilog.vim
new file mode 100644
index 000000000..cc00a76a0
--- /dev/null
+++ b/syntax/verilog.vim
@@ -0,0 +1,123 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilog') == -1
+
+" Vim syntax file
+" Language:	Verilog
+" Maintainer:	Mun Johl <Mun.Johl@emulex.com>
+" Last Update:  Wed Jul 20 16:04:19 PDT 2011
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+   finish
+endif
+
+" Set the local value of the 'iskeyword' option.
+" NOTE: '?' was added so that verilogNumber would be processed correctly when
+"       '?' is the last character of the number.
+setlocal iskeyword=@,48-57,63,_,192-255
+
+" A bunch of useful Verilog keywords
+
+syn keyword verilogStatement   always and assign automatic buf
+syn keyword verilogStatement   bufif0 bufif1 cell cmos
+syn keyword verilogStatement   config deassign defparam design
+syn keyword verilogStatement   disable edge endconfig
+syn keyword verilogStatement   endfunction endgenerate endmodule
+syn keyword verilogStatement   endprimitive endspecify endtable endtask
+syn keyword verilogStatement   event force function
+syn keyword verilogStatement   generate genvar highz0 highz1 ifnone
+syn keyword verilogStatement   incdir include initial inout input
+syn keyword verilogStatement   instance integer large liblist
+syn keyword verilogStatement   library localparam macromodule medium
+syn keyword verilogStatement   module nand negedge nmos nor
+syn keyword verilogStatement   noshowcancelled not notif0 notif1 or
+syn keyword verilogStatement   output parameter pmos posedge primitive
+syn keyword verilogStatement   pull0 pull1 pulldown pullup
+syn keyword verilogStatement   pulsestyle_onevent pulsestyle_ondetect
+syn keyword verilogStatement   rcmos real realtime reg release
+syn keyword verilogStatement   rnmos rpmos rtran rtranif0 rtranif1
+syn keyword verilogStatement   scalared showcancelled signed small
+syn keyword verilogStatement   specify specparam strong0 strong1
+syn keyword verilogStatement   supply0 supply1 table task time tran
+syn keyword verilogStatement   tranif0 tranif1 tri tri0 tri1 triand
+syn keyword verilogStatement   trior trireg unsigned use vectored wait
+syn keyword verilogStatement   wand weak0 weak1 wire wor xnor xor
+syn keyword verilogLabel       begin end fork join
+syn keyword verilogConditional if else case casex casez default endcase
+syn keyword verilogRepeat      forever repeat while for
+
+syn keyword verilogTodo contained TODO FIXME
+
+syn match   verilogOperator "[&|~><!)(*#%@+/=?:;}{,.\^\-\[\]]"
+
+syn region  verilogComment start="/\*" end="\*/" contains=verilogTodo,@Spell
+syn match   verilogComment "//.*" contains=verilogTodo,@Spell
+
+"syn match   verilogGlobal "`[a-zA-Z0-9_]\+\>"
+syn match verilogGlobal "`celldefine"
+syn match verilogGlobal "`default_nettype"
+syn match verilogGlobal "`define"
+syn match verilogGlobal "`else"
+syn match verilogGlobal "`elsif"
+syn match verilogGlobal "`endcelldefine"
+syn match verilogGlobal "`endif"
+syn match verilogGlobal "`ifdef"
+syn match verilogGlobal "`ifndef"
+syn match verilogGlobal "`include"
+syn match verilogGlobal "`line"
+syn match verilogGlobal "`nounconnected_drive"
+syn match verilogGlobal "`resetall"
+syn match verilogGlobal "`timescale"
+syn match verilogGlobal "`unconnected_drive"
+syn match verilogGlobal "`undef"
+syn match   verilogGlobal "$[a-zA-Z0-9_]\+\>"
+
+syn match   verilogConstant "\<[A-Z][A-Z0-9_]\+\>"
+
+syn match   verilogNumber "\(\<\d\+\|\)'[sS]\?[bB]\s*[0-1_xXzZ?]\+\>"
+syn match   verilogNumber "\(\<\d\+\|\)'[sS]\?[oO]\s*[0-7_xXzZ?]\+\>"
+syn match   verilogNumber "\(\<\d\+\|\)'[sS]\?[dD]\s*[0-9_xXzZ?]\+\>"
+syn match   verilogNumber "\(\<\d\+\|\)'[sS]\?[hH]\s*[0-9a-fA-F_xXzZ?]\+\>"
+syn match   verilogNumber "\<[+-]\=[0-9_]\+\(\.[0-9_]*\|\)\(e[0-9_]*\|\)\>"
+
+syn region  verilogString start=+"+ skip=+\\"+ end=+"+ contains=verilogEscape,@Spell
+syn match   verilogEscape +\\[nt"\\]+ contained
+syn match   verilogEscape "\\\o\o\=\o\=" contained
+
+" Directives
+syn match   verilogDirective   "//\s*synopsys\>.*$"
+syn region  verilogDirective   start="/\*\s*synopsys\>" end="\*/"
+syn region  verilogDirective   start="//\s*synopsys dc_script_begin\>" end="//\s*synopsys dc_script_end\>"
+
+syn match   verilogDirective   "//\s*\$s\>.*$"
+syn region  verilogDirective   start="/\*\s*\$s\>" end="\*/"
+syn region  verilogDirective   start="//\s*\$s dc_script_begin\>" end="//\s*\$s dc_script_end\>"
+
+"Modify the following as needed.  The trade-off is performance versus
+"functionality.
+syn sync minlines=50
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default highlighting.
+hi def link verilogCharacter       Character
+hi def link verilogConditional     Conditional
+hi def link verilogRepeat          Repeat
+hi def link verilogString          String
+hi def link verilogTodo            Todo
+hi def link verilogComment         Comment
+hi def link verilogConstant        Constant
+hi def link verilogLabel           Label
+hi def link verilogNumber          Number
+hi def link verilogOperator        Special
+hi def link verilogStatement       Statement
+hi def link verilogGlobal          Define
+hi def link verilogDirective       SpecialComment
+hi def link verilogEscape		 Special
+
+
+let b:current_syntax = "verilog"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/verilogams.vim b/syntax/verilogams.vim
new file mode 100644
index 000000000..bc65b3057
--- /dev/null
+++ b/syntax/verilogams.vim
@@ -0,0 +1,136 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilogams') == -1
+
+" Vim syntax file
+" Language:    Verilog-AMS
+" Maintainer:  S. Myles Prather <smprather@gmail.com>
+"
+" Version 1.1  S. Myles Prather <smprather@gmail.com>
+"              Moved some keywords to the type category.
+"              Added the metrix suffixes to the number matcher.
+" Version 1.2  Prasanna Tamhankar <pratam@gmail.com>
+"              Minor reserved keyword updates.
+" Last Update: Thursday September 15 15:36:03 CST 2005 
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+   finish
+endif
+
+" Set the local value of the 'iskeyword' option
+setlocal iskeyword=@,48-57,_,192-255
+
+" Annex B.1 'All keywords'
+syn keyword verilogamsStatement above abs absdelay acos acosh ac_stim
+syn keyword verilogamsStatement always analog analysis and asin
+syn keyword verilogamsStatement asinh assign atan atan2 atanh
+syn keyword verilogamsStatement buf bufif0 bufif1 ceil cmos connectmodule
+syn keyword verilogamsStatement connectrules cos cosh cross ddt ddx deassign
+syn keyword verilogamsStatement defparam disable discipline
+syn keyword verilogamsStatement driver_update edge enddiscipline
+syn keyword verilogamsStatement endconnectrules endmodule endfunction endgenerate
+syn keyword verilogamsStatement endnature endparamset endprimitive endspecify
+syn keyword verilogamsStatement endtable endtask event exp final_step
+syn keyword verilogamsStatement flicker_noise floor flow force fork
+syn keyword verilogamsStatement function generate highz0
+syn keyword verilogamsStatement highz1 hypot idt idtmod if ifnone inf initial
+syn keyword verilogamsStatement initial_step inout input join
+syn keyword verilogamsStatement laplace_nd laplace_np laplace_zd laplace_zp
+syn keyword verilogamsStatement large last_crossing limexp ln localparam log
+syn keyword verilogamsStatement macromodule max medium min module nand nature
+syn keyword verilogamsStatement negedge net_resolution nmos noise_table nor not
+syn keyword verilogamsStatement notif0 notif1 or output paramset pmos
+syn keyword verilogamsType      parameter real integer electrical input output
+syn keyword verilogamsType      inout reg tri tri0 tri1 triand trior trireg
+syn keyword verilogamsType      string from exclude aliasparam ground genvar
+syn keyword verilogamsType      branch time realtime
+syn keyword verilogamsStatement posedge potential pow primitive pull0 pull1
+syn keyword verilogamsStatement pullup pulldown rcmos release
+syn keyword verilogamsStatement rnmos rpmos rtran rtranif0 rtranif1
+syn keyword verilogamsStatement scalared sin sinh slew small specify specparam
+syn keyword verilogamsStatement sqrt strong0 strong1 supply0 supply1
+syn keyword verilogamsStatement table tan tanh task timer tran tranif0
+syn keyword verilogamsStatement tranif1 transition
+syn keyword verilogamsStatement vectored wait wand weak0 weak1
+syn keyword verilogamsStatement white_noise wire wor wreal xnor xor zi_nd
+syn keyword verilogamsStatement zi_np zi_zd zi_zp
+syn keyword verilogamsRepeat    forever repeat while for
+syn keyword verilogamsLabel     begin end
+syn keyword verilogamsConditional if else case casex casez default endcase
+syn match   verilogamsConstant  ":inf"lc=1
+syn match   verilogamsConstant  "-inf"lc=1
+" Annex B.2 Discipline/nature
+syn keyword verilogamsStatement abstol access continuous ddt_nature discrete
+syn keyword verilogamsStatement domain idt_nature units 
+" Annex B.3 Connect Rules
+syn keyword verilogamsStatement connect merged resolveto split
+
+syn match   verilogamsOperator  "[&|~><!)(*#%@+/=?:;}{,.\^\-\[\]]"
+syn match   verilogamsOperator  "<+"
+syn match   verilogamsStatement "[vV]("me=e-1
+syn match   verilogamsStatement "[iI]("me=e-1
+
+syn keyword verilogamsTodo contained TODO
+syn region  verilogamsComment start="/\*" end="\*/" contains=verilogamsTodo
+syn match   verilogamsComment "//.*" contains=verilogamsTodo
+
+syn match verilogamsGlobal "`celldefine"
+syn match verilogamsGlobal "`default_nettype"
+syn match verilogamsGlobal "`define"
+syn match verilogamsGlobal "`else"
+syn match verilogamsGlobal "`elsif"
+syn match verilogamsGlobal "`endcelldefine"
+syn match verilogamsGlobal "`endif"
+syn match verilogamsGlobal "`ifdef"
+syn match verilogamsGlobal "`ifndef"
+syn match verilogamsGlobal "`include"
+syn match verilogamsGlobal "`line"
+syn match verilogamsGlobal "`nounconnected_drive"
+syn match verilogamsGlobal "`resetall"
+syn match verilogamsGlobal "`timescale"
+syn match verilogamsGlobal "`unconnected_drive"
+syn match verilogamsGlobal "`undef"
+syn match verilogamsSystask "$[a-zA-Z0-9_]\+\>"
+
+syn match verilogamsConstant "\<[A-Z][A-Z0-9_]\+\>"
+
+syn match   verilogamsNumber "\(\<\d\+\|\)'[bB]\s*[0-1_xXzZ?]\+\>"
+syn match   verilogamsNumber "\(\<\d\+\|\)'[oO]\s*[0-7_xXzZ?]\+\>"
+syn match   verilogamsNumber "\(\<\d\+\|\)'[dD]\s*[0-9_xXzZ?]\+\>"
+syn match   verilogamsNumber "\(\<\d\+\|\)'[hH]\s*[0-9a-fA-F_xXzZ?]\+\>"
+syn match   verilogamsNumber "\<[+-]\=[0-9_]\+\(\.[0-9_]*\|\)\(e[0-9_]*\|\)[TGMKkmunpfa]\=\>"
+
+syn region  verilogamsString start=+"+ skip=+\\"+ end=+"+ contains=verilogamsEscape
+syn match   verilogamsEscape +\\[nt"\\]+ contained
+syn match   verilogamsEscape "\\\o\o\=\o\=" contained
+
+"Modify the following as needed.  The trade-off is performance versus
+"functionality.
+syn sync lines=50
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default highlighting.
+hi def link verilogamsCharacter    Character
+hi def link verilogamsConditional  Conditional
+hi def link verilogamsRepeat       Repeat
+hi def link verilogamsString       String
+hi def link verilogamsTodo         Todo
+hi def link verilogamsComment      Comment
+hi def link verilogamsConstant     Constant
+hi def link verilogamsLabel        Label
+hi def link verilogamsNumber       Number
+hi def link verilogamsOperator     Special
+hi def link verilogamsStatement    Statement
+hi def link verilogamsGlobal       Define
+hi def link verilogamsDirective    SpecialComment
+hi def link verilogamsEscape       Special
+hi def link verilogamsType         Type
+hi def link verilogamsSystask      Function
+
+
+let b:current_syntax = "verilogams"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/vgrindefs.vim b/syntax/vgrindefs.vim
new file mode 100644
index 000000000..7f6a46422
--- /dev/null
+++ b/syntax/vgrindefs.vim
@@ -0,0 +1,49 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vgrindefs') == -1
+
+" Vim syntax file
+" Language:	Vgrindefs
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2005 Jun 20
+
+" The Vgrindefs file is used to specify a language for vgrind
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Comments
+syn match vgrindefsComment "^#.*"
+
+" The fields that vgrind recognizes
+syn match vgrindefsField ":ab="
+syn match vgrindefsField ":ae="
+syn match vgrindefsField ":pb="
+syn match vgrindefsField ":bb="
+syn match vgrindefsField ":be="
+syn match vgrindefsField ":cb="
+syn match vgrindefsField ":ce="
+syn match vgrindefsField ":sb="
+syn match vgrindefsField ":se="
+syn match vgrindefsField ":lb="
+syn match vgrindefsField ":le="
+syn match vgrindefsField ":nc="
+syn match vgrindefsField ":tl"
+syn match vgrindefsField ":oc"
+syn match vgrindefsField ":kw="
+
+" Also find the ':' at the end of the line, so all ':' are highlighted
+syn match vgrindefsField ":\\$"
+syn match vgrindefsField ":$"
+syn match vgrindefsField "\\$"
+
+" Define the default highlighting.
+" Only used when an item doesn't have highlighting yet
+hi def link vgrindefsField	Statement
+hi def link vgrindefsComment	Comment
+
+let b:current_syntax = "vgrindefs"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/vhdl.vim b/syntax/vhdl.vim
new file mode 100644
index 000000000..f29ecc1a2
--- /dev/null
+++ b/syntax/vhdl.vim
@@ -0,0 +1,272 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vhdl') == -1
+
+" Vim syntax file
+" Language:		VHDL [VHSIC (Very High Speed Integrated Circuit) Hardware Description Language]
+" Maintainer:		Daniel Kho <daniel.kho@logik.haus>
+" Previous Maintainer:	Czo <Olivier.Sirol@lip6.fr>
+" Credits:		Stephan Hegel <stephan.hegel@snc.siemens.com.cn>
+" Last Changed:		2020 Apr 04 by Daniel Kho
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" case is not significant
+syn case	ignore
+
+" VHDL 1076-2019 keywords
+syn keyword	vhdlStatement	access after alias all
+syn keyword 	vhdlStatement	architecture array attribute
+syn keyword 	vhdlStatement	assert assume
+syn keyword 	vhdlStatement	begin block body buffer bus
+syn keyword 	vhdlStatement	case component configuration constant
+syn keyword 	vhdlStatement	context cover
+syn keyword 	vhdlStatement	default disconnect downto
+syn keyword 	vhdlStatement	elsif end entity exit
+syn keyword 	vhdlStatement	file for function
+syn keyword 	vhdlStatement	fairness force
+syn keyword 	vhdlStatement	generate generic group guarded
+syn keyword 	vhdlStatement	impure in inertial inout is
+syn keyword 	vhdlStatement	label library linkage literal loop
+syn keyword 	vhdlStatement	map
+syn keyword 	vhdlStatement	new next null
+syn keyword 	vhdlStatement	of on open others out
+syn keyword 	vhdlStatement	package port postponed procedure process pure
+syn keyword 	vhdlStatement	parameter property protected private
+syn keyword 	vhdlStatement	range record register reject report return
+syn keyword 	vhdlStatement	release restrict
+syn keyword 	vhdlStatement	select severity signal shared subtype
+syn keyword 	vhdlStatement	sequence strong
+syn keyword 	vhdlStatement	then to transport type
+syn keyword 	vhdlStatement	unaffected units until use
+syn keyword 	vhdlStatement	variable view
+syn keyword 	vhdlStatement	vpkg vmode vprop vunit
+syn keyword 	vhdlStatement	wait when while with
+
+" VHDL predefined severity levels
+syn keyword 	vhdlAttribute	note warning error failure
+
+" Linting of conditionals.
+syn match	vhdlStatement	"\<\(if\|else\)\>"
+syn match	vhdlError	"\<else\s\+if\>"
+
+" Types and type qualifiers
+" Predefined standard VHDL types
+syn match	vhdlType	"\<bit\>\'\="
+syn match	vhdlType	"\<boolean\>\'\="
+syn match	vhdlType	"\<natural\>\'\="
+syn match	vhdlType	"\<positive\>\'\="
+syn match	vhdlType	"\<integer\>\'\="
+syn match	vhdlType	"\<real\>\'\="
+syn match	vhdlType	"\<time\>\'\="
+
+syn match	vhdlType	"\<bit_vector\>\'\="
+syn match	vhdlType	"\<boolean_vector\>\'\="
+syn match	vhdlType	"\<integer_vector\>\'\="
+syn match	vhdlType	"\<real_vector\>\'\="
+syn match	vhdlType	"\<time_vector\>\'\="
+
+syn match	vhdlType	"\<character\>\'\="
+syn match	vhdlType	"\<string\>\'\="
+syn keyword	vhdlType	line text side width
+
+" Predefined standard IEEE VHDL types
+syn match	vhdlType	"\<std_ulogic\>\'\="
+syn match	vhdlType	"\<std_logic\>\'\="
+syn match	vhdlType	"\<std_ulogic_vector\>\'\="
+syn match	vhdlType	"\<std_logic_vector\>\'\="
+syn match	vhdlType	"\<unresolved_signed\>\'\="
+syn match	vhdlType	"\<unresolved_unsigned\>\'\="
+syn match	vhdlType	"\<u_signed\>\'\="
+syn match	vhdlType	"\<u_unsigned\>\'\="
+syn match	vhdlType	"\<signed\>\'\="
+syn match	vhdlType	"\<unsigned\>\'\="
+
+
+" array attributes
+syn match	vhdlAttribute	"\'high"
+syn match	vhdlAttribute	"\'left"
+syn match	vhdlAttribute	"\'length"
+syn match	vhdlAttribute	"\'low"
+syn match	vhdlAttribute	"\'range"
+syn match	vhdlAttribute	"\'reverse_range"
+syn match	vhdlAttribute	"\'right"
+syn match	vhdlAttribute	"\'ascending"
+" block attributes
+syn match	vhdlAttribute	"\'simple_name"
+syn match   	vhdlAttribute	"\'instance_name"
+syn match   	vhdlAttribute	"\'path_name"
+syn match   	vhdlAttribute	"\'foreign"	    " VHPI
+" signal attribute
+syn match	vhdlAttribute	"\'active"
+syn match   	vhdlAttribute	"\'delayed"
+syn match   	vhdlAttribute	"\'event"
+syn match   	vhdlAttribute	"\'last_active"
+syn match   	vhdlAttribute	"\'last_event"
+syn match   	vhdlAttribute	"\'last_value"
+syn match   	vhdlAttribute	"\'quiet"
+syn match   	vhdlAttribute	"\'stable"
+syn match   	vhdlAttribute	"\'transaction"
+syn match   	vhdlAttribute	"\'driving"
+syn match   	vhdlAttribute	"\'driving_value"
+" type attributes
+syn match	vhdlAttribute	"\'base"
+syn match   	vhdlAttribute	"\'subtype"
+syn match   	vhdlAttribute	"\'element"
+syn match   	vhdlAttribute	"\'leftof"
+syn match   	vhdlAttribute	"\'pos"
+syn match   	vhdlAttribute	"\'pred"
+syn match   	vhdlAttribute	"\'rightof"
+syn match   	vhdlAttribute	"\'succ"
+syn match   	vhdlAttribute	"\'val"
+syn match   	vhdlAttribute	"\'image"
+syn match   	vhdlAttribute	"\'value"
+" VHDL-2019 interface attribute
+syn match   	vhdlAttribute	"\'converse"
+
+syn keyword	vhdlBoolean	true false
+
+" for this vector values case is significant
+syn case	match
+" Values for standard VHDL types
+syn match	vhdlVector	"\'[0L1HXWZU\-\?]\'"
+syn case	ignore
+
+syn match	vhdlVector	"B\"[01_]\+\""
+syn match   	vhdlVector	"O\"[0-7_]\+\""
+syn match   	vhdlVector	"X\"[0-9a-f_]\+\""
+syn match   	vhdlCharacter   "'.'"
+syn region  	vhdlString	start=+"+  end=+"+
+
+" floating numbers
+syn match	vhdlNumber	"-\=\<\d\+\.\d\+\(E[+\-]\=\d\+\)\>"
+syn match	vhdlNumber	"-\=\<\d\+\.\d\+\>"
+syn match	vhdlNumber	"0*2#[01_]\+\.[01_]\+#\(E[+\-]\=\d\+\)\="
+syn match	vhdlNumber	"0*16#[0-9a-f_]\+\.[0-9a-f_]\+#\(E[+\-]\=\d\+\)\="
+" integer numbers
+syn match	vhdlNumber	"-\=\<\d\+\(E[+\-]\=\d\+\)\>"
+syn match	vhdlNumber	"-\=\<\d\+\>"
+syn match	vhdlNumber	"0*2#[01_]\+#\(E[+\-]\=\d\+\)\="
+syn match	vhdlNumber	"0*16#[0-9a-f_]\+#\(E[+\-]\=\d\+\)\="
+
+" operators
+syn keyword	vhdlOperator	and nand or nor xor xnor
+syn keyword	vhdlOperator	rol ror sla sll sra srl
+syn keyword	vhdlOperator	mod rem abs not
+
+" Concatenation and math operators
+syn match	vhdlOperator	"&\|+\|-\|\*\|\/"
+
+" Equality and comparison operators
+syn match	vhdlOperator	"=\|\/=\|>\|<\|>="
+
+" Assignment operators
+syn match	vhdlOperator	"<=\|:="
+syn match	vhdlOperator	"=>"
+
+" VHDL-202x concurrent signal association (spaceship) operator
+syn match	vhdlOperator	"<=>"
+
+" VHDL-2008 conversion, matching equality/non-equality operators
+syn match	vhdlOperator	"??\|?=\|?\/=\|?<\|?<=\|?>\|?>="
+
+" VHDL-2008 external names
+syn match	vhdlOperator	"<<\|>>"
+
+" Linting for illegal operators
+" '='
+syn match	vhdlError	"\(=\)[<=&+\-\*\/\\]\+"
+syn match	vhdlError	"[=&+\-\*\\]\+\(=\)"
+" '>', '<'
+" Allow external names: '<< ... >>'
+syn match	vhdlError	"\(>\)[<&+\-\/\\]\+"
+syn match	vhdlError	"[&+\-\/\\]\+\(>\)"
+syn match	vhdlError	"\(<\)[&+\-\/\\]\+"
+syn match	vhdlError	"[>=&+\-\/\\]\+\(<\)"
+" Covers most operators
+" support negative sign after operators. E.g. q<=-b;
+" Supports VHDL-202x spaceship (concurrent simple signal association).
+syn match	vhdlError	"\(<=\)[<=&+\*\\?:]\+"
+syn match	vhdlError	"[>=&+\-\*\\:]\+\(=>\)"
+syn match	vhdlError	"\(&\|+\|\-\|\*\*\|\/=\|??\|?=\|?\/=\|?<=\|?>=\|>=\|:=\|=>\)[<>=&+\*\\?:]\+"
+syn match	vhdlError	"[<>=&+\-\*\\:]\+\(&\|+\|\*\*\|\/=\|??\|?=\|?\/=\|?<\|?<=\|?>\|?>=\|>=\|<=\|:=\)"
+syn match	vhdlError	"\(?<\|?>\)[<>&+\*\/\\?:]\+"
+syn match	vhdlError	"\(<<\|>>\)[<>&+\*\/\\?:]\+"
+
+"syn match	vhdlError	"[?]\+\(&\|+\|\-\|\*\*\|??\|?=\|?\/=\|?<\|?<=\|?>\|?>=\|:=\|=>\)"
+" '/'
+syn match	vhdlError	"\(\/\)[<>&+\-\*\/\\?:]\+"
+syn match	vhdlError	"[<>=&+\-\*\/\\:]\+\(\/\)"
+
+syn match	vhdlSpecial	"<>"
+syn match	vhdlSpecial	"[().,;]"
+
+
+" time
+syn match	vhdlTime	"\<\d\+\s\+\(\([fpnum]s\)\|\(sec\)\|\(min\)\|\(hr\)\)\>"
+syn match	vhdlTime	"\<\d\+\.\d\+\s\+\(\([fpnum]s\)\|\(sec\)\|\(min\)\|\(hr\)\)\>"
+
+syn case	match
+syn keyword	vhdlTodo	contained TODO NOTE
+syn keyword	vhdlFixme	contained FIXME
+syn case	ignore
+
+syn region	vhdlComment	start="/\*" end="\*/"	contains=vhdlTodo,vhdlFixme,@Spell
+syn match	vhdlComment	"\(^\|\s\)--.*"		contains=vhdlTodo,vhdlFixme,@Spell
+
+" Standard IEEE P1076.6 preprocessor directives (metacomments).
+syn match	vhdlPreProc	"/\*\s*rtl_synthesis\s\+\(on\|off\)\s*\*/"
+syn match	vhdlPreProc	"\(^\|\s\)--\s*rtl_synthesis\s\+\(on\|off\)\s*"
+syn match	vhdlPreProc	"/\*\s*rtl_syn\s\+\(on\|off\)\s*\*/"
+syn match	vhdlPreProc	"\(^\|\s\)--\s*rtl_syn\s\+\(on\|off\)\s*"
+
+" Industry-standard directives. These are not standard VHDL, but are commonly
+" used in the industry.
+syn match	vhdlPreProc	"/\*\s*synthesis\s\+translate_\(on\|off\)\s*\*/"
+"syn match	vhdlPreProc	"/\*\s*simulation\s\+translate_\(on\|off\)\s*\*/"
+syn match	vhdlPreProc	"/\*\s*pragma\s\+translate_\(on\|off\)\s*\*/"
+syn match	vhdlPreProc	"/\*\s*pragma\s\+synthesis_\(on\|off\)\s*\*/"
+syn match	vhdlPreProc	"/\*\s*synopsys\s\+translate_\(on\|off\)\s*\*/"
+
+syn match	vhdlPreProc	"\(^\|\s\)--\s*synthesis\s\+translate_\(on\|off\)\s*"
+"syn match	vhdlPreProc	"\(^\|\s\)--\s*simulation\s\+translate_\(on\|off\)\s*"
+syn match	vhdlPreProc	"\(^\|\s\)--\s*pragma\s\+translate_\(on\|off\)\s*"
+syn match	vhdlPreProc	"\(^\|\s\)--\s*pragma\s\+synthesis_\(on\|off\)\s*"
+syn match	vhdlPreProc	"\(^\|\s\)--\s*synopsys\s\+translate_\(on\|off\)\s*"
+
+"Modify the following as needed.  The trade-off is performance versus functionality.
+syn sync	minlines=600
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link vhdlSpecial	Special
+hi def link vhdlStatement   Statement
+hi def link vhdlCharacter   Character
+hi def link vhdlString	String
+hi def link vhdlVector	Number
+hi def link vhdlBoolean	Number
+hi def link vhdlTodo	Todo
+hi def link vhdlFixme	Fixme
+hi def link vhdlComment	Comment
+hi def link vhdlNumber	Number
+hi def link vhdlTime	Number
+hi def link vhdlType	Type
+hi def link vhdlOperator    Operator
+hi def link vhdlError	Error
+hi def link vhdlAttribute   Special
+hi def link vhdlPreProc	PreProc
+
+
+let b:current_syntax = "vhdl"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8
+
+endif
diff --git a/syntax/vim.vim b/syntax/vim.vim
new file mode 100644
index 000000000..abe08f945
--- /dev/null
+++ b/syntax/vim.vim
@@ -0,0 +1,1032 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vim') == -1
+
+" Vim syntax file
+" Language:	Vim 8.0 script
+" Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
+" Last Change:	Aug 30, 2020
+" Version:	8.0-43
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM
+" Automatically generated keyword lists: {{{1
+
+" Quit when a syntax file was already loaded {{{2
+if exists("b:current_syntax")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+" vimTodo: contains common special-notices for comments {{{2
+" Use the vimCommentGroup cluster to add your own.
+syn keyword vimTodo contained	COMBAK	FIXME	TODO	XXX
+syn cluster vimCommentGroup	contains=vimTodo,@Spell
+
+" regular vim commands {{{2
+syn keyword vimCommand contained	a ar[gs] argl[ocal] ba[ll] bm[odified] breaka[dd] bun[load] cabc[lear] cal[l] cc cf[ile] changes cla[st] cnew[er] com cope[n] cscope debug delep dell diffg[et] dig[raphs] do dsp[lit] echom[sg] enddef eval f[ile] fina[lly] foldd[oopen] go[to] ha[rdcopy] hid[e] ij[ump] inor j[oin] keepj[umps] lab[ove] lat lc[d] le[ft] lg[etfile] lhi[story] lmapc[lear] loadkeymap lpf[ile] luafile mak[e] mk[exrc] mz[scheme] new nore on[ly] pc[lose] pp[op] promptf[ind] ptj[ump] pu[t] py[thon] pyxdo rec[over] reg[isters] rightb[elow] rv[iminfo] sIn san[dbox] sbl[ast] scI scr[iptnames] setf[iletype] sgI sgp sig sir smenu so[urce] spellr[are] sr srl startg[replace] sun[hide] sy tN[ext] tabe[dit] tabnew tc[l] ter[minal] tlmenu tma[p] tr[ewind] u[ndo] unl ve[rsion] vim9 vmapc[lear] wa[ll] winp[os] wundo xme xr[estore]
+syn keyword vimCommand contained	ab arga[dd] argu[ment] bad[d] bn[ext] breakd[el] bw[ipeout] cabo[ve] cat[ch] ccl[ose] cfdo chd[ir] class cnf[ile] comc[lear] cp[revious] cstag debugg[reedy] deletel delm[arks] diffo[ff] dir doau e[dit] echon endf[unction] ex files fini[sh] folddoc[losed] gr[ep] helpc[lose] his[tory] il[ist] interface ju[mps] keepp[atterns] lad[dexpr] later lch[dir] lefta[bove] lgetb[uffer] ll lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mks[ession] mzf[ile] nmapc[lear] nos[wapfile] opt[ions] pe[rl] pre[serve] promptr[epl] ptl[ast] pw[d] pydo pyxfile red[o] res[ize] ru[ntime] sI sIp sav[eas] sbm[odified] sce scripte[ncoding] setg[lobal] sgc sgr sign sl[eep] smile sor[t] spellr[epall] srI srn startr[eplace] sunme syn ta[g] tabf[ind] tabo[nly] tcd tf[irst] tln tmapc[lear] try una[bbreviate] unlo[ckvar] verb[ose] vim9script vne[w] wh[ile] wn[ext] wv[iminfo] xmenu xunme
+syn keyword vimCommand contained	abc[lear] argd[elete] as[cii] bd[elete] bo[tright] breakl[ist] cN[ext] cad[dbuffer] cb[uffer] cd cfir[st] che[ckpath] cle[arjumps] cnor comp[iler] cpf[ile] cun def deletep delp diffp[atch] disa[ssemble] doaut ea el[se] endfo[r] exi[t] filet fir[st] foldo[pen] grepa[dd] helpf[ind] i imapc[lear] intro k lN[ext] laddb[uffer] lb[uffer] lcl[ose] lex[pr] lgete[xpr] lla[st] lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mksp[ell] n[ext] noa nu[mber] ownsyntax ped[it] prev[ious] ps[earch] ptn[ext] py3 pyf[ile] q[uit] redi[r] ret[ab] rub[y] sIc sIr sbN[ext] sbn[ext] scg scriptv[ersion] setl[ocal] sge sh[ell] sil[ent] sla[st] sn[ext] sp[lit] spellr[rare] src srp stj[ump] sunmenu sync tab tabfir[st] tabp[revious] tch[dir] th[row] tlnoremenu tn[ext] ts[elect] undoj[oin] uns[ilent] vert[ical] vim[grep] vs[plit] win[size] wp[revious] x[it] xnoreme xunmenu
+syn keyword vimCommand contained	abo[veleft] argdo au bel[owright] bp[revious] bro[wse] cNf[ile] cadde[xpr] cbe[fore] cdo cg[etfile] checkt[ime] clo[se] co[py] con[tinue] cq[uit] cuna[bbrev] defc[ompile] deletl dep diffpu[t] dj[ump] dp earlier elsei[f] endt[ry] exp filetype fix[del] for gui helpg[rep] ia imp is[earch] kee[pmarks] lNf[ile] laddf[ile] lbe[fore] lcs lf[ile] lgr[ep] lli[st] lnf[ile] lol[der] lt[ag] lw[indow] menut[ranslate] mkv[imrc] nb[key] noautocmd o[pen] p[rint] perld[o] pro ptN[ext] ptp[revious] py3do python3 qa[ll] redr[aw] retu[rn] rubyd[o] sIe sN[ext] sb[uffer] sbp[revious] sci scs sf[ind] sgi si sim[alt] sm[agic] sno[magic] spe[llgood] spellu[ndo] sre[wind] st[op] stopi[nsert] sus[pend] syncbind tabN[ext] tabl[ast] tabr[ewind] tcld[o] tj[ump] tlu tno[remap] tu[nmenu] undol[ist] up[date] vi[sual] vimgrepa[dd] wN[ext] winc[md] wq xa[ll] xnoremenu xwininfo
+syn keyword vimCommand contained	addd arge[dit] bN[ext] bf[irst] br[ewind] bufdo c[hange] caddf[ile] cbel[ow] ce[nter] cgetb[uffer] chi[story] cmapc[lear] col[der] conf[irm] cr[ewind] cw[indow] delc[ommand] deletp di[splay] diffs[plit] dl dr[op] ec em[enu] endw[hile] export filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] import isp[lit] keepa l[ist] laf[ter] lbel[ow] lcscope lfdo lgrepa[dd] lma lo[adview] lop[en] lua m[ove] mes mkvie[w] nbc[lose] noh[lsearch] ol[dfiles] pa[ckadd] po[p] prof[ile] pta[g] ptr[ewind] py3f[ile] pythonx quita[ll] redraws[tatus] rew[ind] rubyf[ile] sIg sa[rgument] sba[ll] sbr[ewind] scl scscope sfir[st] sgl sic sin sm[ap] snoreme spelld[ump] spellw[rong] srg sta[g] sts[elect] sv[iew] syntime tabc[lose] tabm[ove] tabs tclf[ile] tl[ast] tlunmenu to[pleft] tunma[p] unh[ide] v vie[w] viu[sage] w[rite] windo wqa[ll] xmapc[lear] xprop y[ank]
+syn keyword vimCommand contained	al[l] argg[lobal] b[uffer] bl[ast] brea[k] buffers ca caf[ter] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cn[ext] colo[rscheme] cons[t] cs d[elete] delel delf[unction] dif[fupdate] difft[his] dli[st] ds[earch] echoe[rr] en[dif] ene[w] exu[sage] fin[d] foldc[lose] g h[elp] hi if in iuna[bbrev] keepalt la[st] lan[guage] lbo[ttom] ld[o] lfir[st] lh[elpgrep] lmak[e] loadk lp[revious] luado ma[rk] messages mod[e] nbs[tart] nor omapc[lear] packl[oadall] popu[p] profd[el] ptf[irst] pts[elect] py3f[ile] pyx r[ead] redrawt[abline] ri[ght] rundo sIl sal[l] sbf[irst] sc scp se[t] sg sgn sie sip sme snoremenu spelli[nfo] spr[evious] sri star[tinsert] substitutepattern sw[apname] t tabd[o] tabn[ext] tags te[aroff] tlm tm[enu] tp[revious] type
+syn match   vimCommand contained	"\<z[-+^.=]\=\>"
+syn keyword vimStdPlugin contained	Arguments Break Cfilter Clear Continue DiffOrig Evaluate Finish Gdb Lfilter Man N[ext] Over P[rint] Program Run S Source Step Stop Termdebug TermdebugCommand TOhtml Winbar XMLent XMLns
+
+" vimOptions are caught only when contained in a vimSet {{{2
+syn keyword vimOption contained	acd ambw arshape background ballooneval bex bl brk buftype cf cinkeys cmdwinheight com completeslash cpoptions cscoperelative csre cursorcolumn delcombine digraph eadirection emo equalprg expandtab fdls fex fileignorecase fml foldlevel formatexpr gcr go guifontset helpheight history hlsearch imaf ims includeexpr infercase iskeyword keywordprg laststatus lispwords lrm magic maxfuncdepth menuitems mm modifiable mousemodel mzq numberwidth opfunc patchexpr pfn pp printfont pumwidth pythonthreehome re restorescreen ro rulerformat scl scs sft shellslash shortmess showtabline sj smd spell spl srr startofline suffixes switchbuf ta tagfunc tbi term termwintype tgc titlelen toolbariconsize ttimeout ttymouse twt undofile varsofttabstop verbosefile viminfofile wak weirdinvert wig wildoptions winheight wm wrapscan
+syn keyword vimOption contained	ai anti autochdir backspace balloonevalterm bexpr bo browsedir casemap cfu cino cmp comments concealcursor cpp cscopetag cst cursorline dex dip eb emoji errorbells exrc fdm ff filetype fmr foldlevelstart formatlistpat gd gp guifontwide helplang hk ic imak imsearch incsearch insertmode isp km lazyredraw list ls makeef maxmapdepth mfd mmd modified mouses mzquantum nuw osfiletype patchmode ph preserveindent printheader pvh pyx readonly revins rop runtimepath scr sect sh shelltemp shortname shq slm sn spellcapcheck splitbelow ss statusline suffixesadd sws tabline taglength tbidi termbidi terse tgst titleold top ttimeoutlen ttyscroll tx undolevels vartabstop vfile virtualedit warn wfh wildchar wim winminheight wmh write
+syn keyword vimOption contained	akm antialias autoindent backup balloonexpr bg bomb bs cb ch cinoptions cms commentstring conceallevel cpt cscopetagorder csto cursorlineopt dg dir ed enc errorfile fcl fdn ffs fillchars fo foldmarker formatoptions gdefault grepformat guiheadroom hf hkmap icon imc imsf inde is isprint kmp lbr listchars lsp makeencoding maxmem mh mmp more mouseshape mzschemedll odev pa path pheader previewheight printmbcharset pvp pyxversion redrawtime ri rs sb scroll sections shcf shelltype showbreak si sm so spellfile splitright ssl stl sw sxe tabpagemax tagrelative tbis termencoding textauto thesaurus titlestring tpm ttm ttytype uc undoreload vb vi visualbell wb wfw wildcharm winaltkeys winminwidth wmnu writeany
+syn keyword vimOption contained	al ar autoread backupcopy bdir bh breakat bsdir cc charconvert cinw co compatible confirm crb cscopeverbose csverb cwh dict directory edcompatible encoding errorformat fcs fdo fic fixendofline foldclose foldmethod formatprg gfm grepprg guioptions hh hkmapp iconstring imcmdline imst indentexpr isf joinspaces kp lcs lm luadll makeprg maxmempattern mis mmt mouse mouset mzschemegcdll oft packpath pdev pi previewpopup printmbfont pvw qe regexpengine rightleft rtp sbo scrollbind secure shell shellxescape showcmd sidescroll smartcase softtabstop spelllang spo ssop stmp swapfile sxq tabstop tags tbs termguicolors textmode tildeop tl tr tty tw udf updatecount vbs viewdir vop wc wh wildignore wincolor winptydll wmw writebackup
+syn keyword vimOption contained	aleph arab autowrite backupdir bdlay bin breakindent bsk ccv ci cinwords cocu complete copyindent cryptmethod csl cuc debug dictionary display ef endofline esckeys fdc fdt fileencoding fixeol foldcolumn foldminlines fp gfn gtl guipty hi hkp ignorecase imd imstatusfunc indentkeys isfname js langmap linebreak lmap lw mat maxmemtot mkspellmem mod mousef mousetime nf ofu para penc pm previewwindow printoptions pw qftf relativenumber rightleftcmd ru sbr scrollfocus sel shellcmdflag shellxquote showfulltag sidescrolloff smartindent sol spelloptions spr st sts swapsync syn tag tagstack tc termwinkey textwidth timeout tm ts ttybuiltin twk udir updatetime vdir viewoptions vsts wcm whichwrap wildignorecase window winwidth wop writedelay
+syn keyword vimOption contained	allowrevins arabic autowriteall backupext belloff binary breakindentopt bt cd cin clipboard cole completefunc cot cscopepathcomp cspc cul deco diff dy efm eol et fde fen fileencodings fk foldenable foldnestmax fs gfs gtt guitablabel hid hl im imdisable imstyle indk isi key langmenu lines lnr lz matchpairs mco ml modeline mousefocus mp nrformats omnifunc paragraphs perldll pmbcs printdevice prompt pythondll quickfixtextfunc remap rl rubydll sc scrolljump selection shellpipe shiftround showmatch signcolumn smarttab sp spellsuggest sps sta su swb synmaxcol tagbsearch tal tcldll termwinscroll tf timeoutlen to tsl ttyfast tws ul ur ve vif vts wcr wi wildmenu winfixheight wiv wrap ws
+syn keyword vimOption contained	altkeymap arabicshape aw backupskip beval bk bri bufhidden cdpath cindent cm colorcolumn completeopt cp cscopeprg csprg culopt def diffexpr ea ei ep eventignore fdi fenc fileformat fkmap foldexpr foldopen fsync gfw guicursor guitabtooltip hidden hlg imactivatefunc imi inc inex isident keymap langnoremap linespace loadplugins ma matchtime mef mle modelineexpr mousehide mps nu opendevice paste pex pmbfn printencoding pt pythonhome quoteescape renderoptions rlc ruf scb scrolloff selectmode shellquote shiftwidth showmode siso smc spc spf sr stal sua swf syntax tagcase tb tenc termwinsize tfu title toolbar tsr ttym twsl undodir ut verbose viminfo wa wd wic wildmode winfixwidth wiw wrapmargin ww
+syn keyword vimOption contained	ambiwidth ari awa balloondelay bevalterm bkc briopt buflisted cedit cink cmdheight columns completepopup cpo cscopequickfix csqf cursorbind define diffopt ead ek equalalways ex fdl fencs fileformats flp foldignore foldtext ft ghr guifont helpfile highlight hls imactivatekey iminsert include inf isk keymodel langremap lisp lpl macatsui maxcombine menc mls modelines mousem msm number operatorfunc pastetoggle pexpr popt printexpr pumheight pythonthreedll rdt report rnu ruler scf scrollopt sessionoptions shellredir shm
+
+" vimOptions: These are the turn-off setting variants {{{2
+syn keyword vimOption contained	noacd noallowrevins noantialias noarabic noarshape noautoread noaw noballooneval nobevalterm nobk nobreakindent nocf nocindent nocopyindent nocscoperelative nocsre nocuc nocursorcolumn nodelcombine nodigraph noed noemo noeol noesckeys noexpandtab nofic nofixeol nofoldenable nogd nohid nohkmap nohls noicon noimc noimdisable noinfercase nojoinspaces nolangremap nolinebreak nolnr nolrm nomacatsui noml nomod nomodelineexpr nomodified nomousef nomousehide nonumber noopendevice nopi nopreviewwindow nopvw norelativenumber norestorescreen nori norl noro noru nosb noscb noscrollbind noscs nosft noshelltemp noshortname noshowfulltag noshowmode nosm nosmartindent nosmd nosol nosplitbelow nospr nossl nostartofline noswapfile nota notagrelative notbi notbs noterse notextmode notgst notimeout noto notr nottybuiltin notx noundofile novisualbell nowarn noweirdinvert nowfw nowildignorecase nowinfixheight nowiv nowrap nowrite nowritebackup
+syn keyword vimOption contained	noai noaltkeymap noar noarabicshape noautochdir noautowrite noawa noballoonevalterm nobin nobl nobri noci nocompatible nocp nocscopetag nocst nocul nocursorline nodg noea noedcompatible noemoji noequalalways noet noexrc nofileignorecase nofk nofs nogdefault nohidden nohkmapp nohlsearch noignorecase noimcmdline noincsearch noinsertmode nojs nolazyredraw nolisp noloadplugins nolz nomagic nomle nomodeline nomodifiable nomore nomousefocus nonu noodev nopaste nopreserveindent noprompt noreadonly noremap norevins norightleft nornu nors noruler nosc noscf noscrollfocus nosecure noshellslash noshiftround noshowcmd noshowmatch nosi nosmartcase nosmarttab nosn nospell nosplitright nosr nosta nostmp noswf notagbsearch notagstack notbidi notermbidi notextauto notf notildeop notitle notop nottimeout nottyfast noudf novb nowa nowb nowfh nowic nowildmenu nowinfixwidth nowmnu nowrapscan nowriteany nows
+syn keyword vimOption contained	noakm noanti noarab noari noautoindent noautowriteall nobackup nobeval nobinary nobomb nobuflisted nocin noconfirm nocrb nocscopeverbose nocsverb nocursorbind nodeco nodiff noeb noek noendofline noerrorbells noex nofen nofixendofline nofkmap nofsync noguipty nohk nohkp noic noim noimd noinf nois nolangnoremap nolbr nolist nolpl noma nomh
+
+" vimOptions: These are the invertible variants {{{2
+syn keyword vimOption contained	invacd invallowrevins invantialias invarabic invarshape invautoread invaw invballooneval invbevalterm invbk invbreakindent invcf invcindent invcopyindent invcscoperelative invcsre invcuc invcursorcolumn invdelcombine invdigraph inved invemo inveol invesckeys invexpandtab invfic invfixeol invfoldenable invgd invhid invhkmap invhls invicon invimc invimdisable invinfercase invjoinspaces invlangremap invlinebreak invlnr invlrm invmacatsui invml invmod invmodelineexpr invmodified invmousef invmousehide invnumber invopendevice invpi invpreviewwindow invpvw invrelativenumber invrestorescreen invri invrl invro invru invsb invscb invscrollbind invscs invsft invshelltemp invshortname invshowfulltag invshowmode invsm invsmartindent invsmd invsol invsplitbelow invspr invssl invstartofline invswapfile invta invtagrelative invtbi invtbs invterse invtextmode invtgst invtimeout invto invtr invttybuiltin invtx invundofile invvisualbell invwarn invweirdinvert invwfw invwildignorecase invwinfixheight invwiv invwrap invwrite invwritebackup
+syn keyword vimOption contained	invai invaltkeymap invar invarabicshape invautochdir invautowrite invawa invballoonevalterm invbin invbl invbri invci invcompatible invcp invcscopetag invcst invcul invcursorline invdg invea invedcompatible invemoji invequalalways invet invexrc invfileignorecase invfk invfs invgdefault invhidden invhkmapp invhlsearch invignorecase invimcmdline invincsearch invinsertmode invjs invlazyredraw invlisp invloadplugins invlz invmagic invmle invmodeline invmodifiable invmore invmousefocus invnu invodev invpaste invpreserveindent invprompt invreadonly invremap invrevins invrightleft invrnu invrs invruler invsc invscf invscrollfocus invsecure invshellslash invshiftround invshowcmd invshowmatch invsi invsmartcase invsmarttab invsn invspell invsplitright invsr invsta invstmp invswf invtagbsearch invtagstack invtbidi invtermbidi invtextauto invtf invtildeop invtitle invtop invttimeout invttyfast invudf invvb invwa invwb invwfh invwic invwildmenu invwinfixwidth invwmnu invwrapscan invwriteany invws
+syn keyword vimOption contained	invakm invanti invarab invari invautoindent invautowriteall invbackup invbeval invbinary invbomb invbuflisted invcin invconfirm invcrb invcscopeverbose invcsverb invcursorbind invdeco invdiff inveb invek invendofline inverrorbells invex invfen invfixendofline invfkmap invfsync invguipty invhk invhkp invic invim invimd invinf invis invlangnoremap invlbr invlist invlpl invma invmh
+
+" termcap codes (which can also be set) {{{2
+syn keyword vimOption contained	t_8b t_8u t_AF t_AL t_bc t_BE t_ce t_cl t_Co t_Cs t_CV t_db t_DL t_EI t_F2 t_F4 t_F6 t_F8 t_fs t_IE t_k1 t_k2 t_K3 t_K4 t_K5 t_K6 t_K7 t_K8 t_K9 t_kb t_KB t_kd t_KD t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_PE t_PS t_RB t_RC t_RF t_Ri t_RI t_RS t_RT t_RV t_Sb t_SC t_se t_Sf t_SH t_Si t_SI t_so t_sr t_SR t_ST t_te t_Te t_TE t_ti t_TI t_ts t_Ts t_u7 t_ue t_us t_ut t_vb t_ve t_vi t_vs t_VS t_WP t_WS t_xn t_xs t_ZH t_ZR
+syn keyword vimOption contained	t_8f t_AB t_al t_AU t_BD t_cd t_Ce t_cm t_cs t_CS t_da t_dl t_EC t_F1 t_F3 t_F5 t_F7 t_F9 t_GP t_IS t_K1 t_k3 t_k4 t_k5 t_k6 t_k7 t_k8 t_k9 t_KA t_kB t_KC t_kD t_ke
+syn match   vimOption contained	"t_%1"
+syn match   vimOption contained	"t_#2"
+syn match   vimOption contained	"t_#4"
+syn match   vimOption contained	"t_@7"
+syn match   vimOption contained	"t_*7"
+syn match   vimOption contained	"t_&8"
+syn match   vimOption contained	"t_%i"
+syn match   vimOption contained	"t_k;"
+
+" unsupported settings: some were supported by vi but don't do anything in vim {{{2
+" others have been dropped along with msdos support
+syn keyword vimErrSetting contained	bioskey biosk conskey consk autoprint beautify flash graphic hardtabs mesg novice open op optimize redraw slow slowopen sourceany w300 w1200 w9600 hardtabs ht nobioskey nobiosk noconskey noconsk noautoprint nobeautify noflash nographic nohardtabs nomesg nonovice noopen noop nooptimize noredraw noslow noslowopen nosourceany now300 now1200 now9600 w1200 w300 w9600
+
+" AutoCmd Events {{{2
+syn case ignore
+syn keyword vimAutoEvent contained	BufAdd BufDelete BufFilePost BufHidden BufNew BufRead BufReadPost BufUnload BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre CmdlineChanged CmdlineEnter CmdlineLeave CmdUndefined CmdwinEnter CmdwinLeave ColorScheme ColorSchemePre CompleteChanged CompleteDone CompleteDonePre CursorHold CursorHoldI CursorMoved CursorMovedI DiffUpdated DirChanged EncodingChanged ExitPre FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertCharPre InsertEnter InsertLeave MenuPopup OptionSet QuickFixCmdPost QuickFixCmdPre QuitPre RemoteReply SafeState SafeStateAgain SessionLoadPost ShellCmdPost ShellFilterPost SigUSR1 SourceCmd SourcePost SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabClosed TabEnter TabLeave TabNew TermChanged TerminalOpen TerminalWinOpen TermResponse TextChanged TextChangedI TextChangedP TextYankPost User VimEnter VimLeave VimLeavePre VimResized WinEnter WinLeave WinNew
+syn keyword vimAutoEvent contained	BufCreate BufEnter BufFilePre BufLeave BufNewFile BufReadCmd BufReadPre BufWinEnter
+
+" Highlight commonly used Groupnames {{{2
+syn keyword vimGroup contained	Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo
+
+" Default highlighting groups {{{2
+syn keyword vimHLGroup contained	ColorColumn Cursor CursorColumn CursorIM CursorLine CursorLineNr DiffAdd DiffChange DiffDelete DiffText Directory EndOfBuffer ErrorMsg FoldColumn Folded IncSearch LineNr LineNrAbove LineNrBelow MatchParen Menu ModeMsg MoreMsg NonText Normal Pmenu PmenuSbar PmenuSel PmenuThumb Question QuickFixLine Scrollbar Search SignColumn SpecialKey SpellBad SpellCap SpellLocal SpellRare StatusLine StatusLineNC StatusLineTerm TabLine TabLineFill TabLineSel Terminal Title Tooltip VertSplit Visual VisualNOS WarningMsg WildMenu
+syn match vimHLGroup contained	"Conceal"
+syn case match
+
+" Function Names {{{2
+syn keyword vimFuncName contained	abs appendbufline asin assert_fails assert_notmatch balloon_gettext bufadd bufname byteidx char2nr ch_evalexpr ch_log ch_readraw cindent complete_check cosh deepcopy diff_hlID eval exists feedkeys findfile fnameescape foldtext garbagecollect getchangelist getcmdpos getcwd getftime getloclist getpos gettabinfo getwinpos glob2regpat hasmapto hlexists index inputsave isdirectory job_getchannel job_stop json_encode line listener_flush luaeval match matchend menu_info nextnonblank popup_atcursor popup_dialog popup_getoptions popup_menu popup_show prompt_setinterrupt prop_list prop_type_get pyeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setenv setpos settagstack sign_define sign_placelist sin sound_playevent split str2list strftime strpart submatch synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_ignore_error test_null_job test_override test_srand_seed timer_start tr undotree wildmenumode win_execute win_gotoid winlayout winrestview winwidth
+syn keyword vimFuncName contained	acos argc assert_beeps assert_false assert_report balloon_show bufexists bufnr byteidxcomp ch_canread ch_evalraw ch_logfile ch_sendexpr clearmatches complete_info count delete echoraw eventhandler exp filereadable flatten fnamemodify foldtextresult get getchar getcmdtype getenv getftype getmarklist getqflist gettabvar getwinposx globpath histadd hlID input inputsecret isinf job_info join keys line2byte listener_remove map matchadd matchlist min nr2char popup_beval popup_filter_menu popup_getpos popup_move pow prompt_setprompt prop_remove prop_type_list pyxeval readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playfile sqrt str2nr strgetchar strptime substitute synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_null_blob test_null_list test_refcount test_unknown timer_stop trim uniq winbufnr win_findbuf winheight winline winsaveview wordcount
+syn keyword vimFuncName contained	add argidx assert_equal assert_inrange assert_true balloon_split buflisted bufwinid call ch_close ch_getbufnr ch_open ch_sendraw col confirm cscope_connection deletebufline empty executable expand filewritable float2nr foldclosed foreground getbufinfo getcharmod getcmdwintype getfontname getimstatus getmatches getreg gettabwinvar getwinposy has histdel hostname inputdialog insert islocked job_setoptions js_decode len lispindent localtime maparg matchaddpos matchstr mkdir or popup_clear popup_filter_yesno popup_hide popup_notification prevnonblank prop_add prop_type_add pum_getpos rand reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setline setreg sha256 sign_getplaced sign_unplace sort sound_stop srand strcharpart stridx strridx swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setansicolors term_start test_garbagecollect_now test_null_channel test_null_partial test_scrollbar test_void timer_stopall trunc values wincol win_getid win_id2tabwin winnr win_screenpos writefile
+syn keyword vimFuncName contained	and arglistid assert_equalfile assert_match atan browse bufload bufwinnr ceil ch_close_in ch_getjob ch_read ch_setoptions complete copy cursor did_filetype environ execute expandcmd filter floor foldclosedend funcref getbufline getcharsearch getcompletion getfperm getjumplist getmousepos getreginfo gettagstack getwinvar has_key histget iconv inputlist interrupt isnan job_start js_encode libcall list2str log mapcheck matcharg matchstrpos mode pathshorten popup_close popup_findinfo popup_list popup_setoptions printf prop_clear prop_type_change pumvisible range reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcharsearch setloclist settabvar shellescape sign_jump sign_unplacelist sound_clear spellbadword state strchars string strtrans swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled terminalprops term_setapi term_wait test_garbagecollect_soon test_null_dict test_null_string test_setmouse timer_info tolower type virtcol windowsversion win_gettype win_id2win winrestcmd win_splitmove xor
+syn keyword vimFuncName contained	append argv assert_exception assert_notequal atan2 browsedir bufloaded byte2line changenr chdir ch_info ch_readblob ch_status complete_add cos debugbreak diff_filler escape exepath extend finddir fmod foldlevel function getbufvar getcmdline getcurpos getfsize getline getpid getregtype getwininfo glob haslocaldir histnr indent inputrestore invert items job_status json_decode libcallnr listener_add log10 mapset matchdelete max mzeval perleval popup_create popup_findpreview popup_locate popup_settext prompt_setcallback prop_find prop_type_delete py3eval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcmdpos setmatches settabwinvar shiftwidth sign_place simplify soundfold spellsuggest str2float strdisplaywidth strlen strwidth synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_function test_option_not_set test_settime timer_pause toupper undofile visualmode
+
+"--- syntax here and above generated by mkvimvim ---
+" Special Vim Highlighting (not automatic) {{{1
+
+" Set up folding commands {{{2
+if exists("g:vimsyn_folding") && g:vimsyn_folding =~# '[afhlmpPrt]'
+ if g:vimsyn_folding =~# 'a'
+  com! -nargs=* VimFolda <args> fold
+ else
+  com! -nargs=* VimFolda <args>
+ endif
+ if g:vimsyn_folding =~# 'f'
+  com! -nargs=* VimFoldf <args> fold
+ else
+  com! -nargs=* VimFoldf <args>
+ endif
+ if g:vimsyn_folding =~# 'h'
+  com! -nargs=* VimFoldh <args> fold
+ else
+  com! -nargs=* VimFoldh <args>
+ endif
+ if g:vimsyn_folding =~# 'l'
+  com! -nargs=* VimFoldl <args> fold
+ else
+  com! -nargs=* VimFoldl <args>
+ endif
+ if g:vimsyn_folding =~# 'm'
+  com! -nargs=* VimFoldm <args> fold
+ else
+  com! -nargs=* VimFoldm <args>
+ endif
+ if g:vimsyn_folding =~# 'p'
+  com! -nargs=* VimFoldp <args> fold
+ else
+  com! -nargs=* VimFoldp <args>
+ endif
+ if g:vimsyn_folding =~# 'P'
+  com! -nargs=* VimFoldP <args> fold
+ else
+  com! -nargs=* VimFoldP <args>
+ endif
+ if g:vimsyn_folding =~# 'r'
+  com! -nargs=* VimFoldr <args> fold
+ else
+  com! -nargs=* VimFoldr <args>
+ endif
+ if g:vimsyn_folding =~# 't'
+  com! -nargs=* VimFoldt <args> fold
+ else
+  com! -nargs=* VimFoldt <args>
+ endif
+else
+ com! -nargs=*	VimFolda	<args>
+ com! -nargs=*	VimFoldf	<args>
+ com! -nargs=*	VimFoldh	<args>
+ com! -nargs=*	VimFoldl	<args>
+ com! -nargs=*	VimFoldm	<args>
+ com! -nargs=*	VimFoldp	<args>
+ com! -nargs=*	VimFoldP	<args>
+ com! -nargs=*	VimFoldr	<args>
+ com! -nargs=*	VimFoldt	<args>
+endif
+
+" commands not picked up by the generator (due to non-standard format) {{{2
+syn keyword vimCommand contained	py3
+
+" Deprecated variable options {{{2
+if exists("g:vim_minlines")
+ let g:vimsyn_minlines= g:vim_minlines
+endif
+if exists("g:vim_maxlines")
+ let g:vimsyn_maxlines= g:vim_maxlines
+endif
+if exists("g:vimsyntax_noerror")
+ let g:vimsyn_noerror= g:vimsyntax_noerror
+endif
+
+" Variable options {{{2
+if exists("g:vim_maxlines")
+ let s:vimsyn_maxlines= g:vim_maxlines
+else
+ let s:vimsyn_maxlines= 60
+endif
+
+" Numbers {{{2
+" =======
+syn match vimNumber	"\<\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\=" skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
+syn match vimNumber	"-\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\="  skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
+syn match vimNumber	"\<0[xX]\x\+"		       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
+syn match vimNumber	"\%(^\|\A\)\zs#\x\{6}"             	       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
+
+" All vimCommands are contained by vimIsCommand. {{{2
+syn match vimCmdSep	"[:|]\+"	skipwhite nextgroup=vimAddress,vimAutoCmd,vimEcho,vimIsCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd
+syn match vimIsCommand	"\<\h\w*\>"	contains=vimCommand
+syn match vimVar	      contained	"\<\h[a-zA-Z0-9#_]*\>"
+syn match vimVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"
+syn match vimVar	      	"\s\zs&\a\+\>"
+syn match vimFBVar      contained   "\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"
+syn keyword vimCommand  contained	in
+
+" Insertions And Appends: insert append {{{2
+" =======================
+syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=a\%[ppend]$"		matchgroup=vimCommand end="^\.$""
+syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=c\%[hange]$"		matchgroup=vimCommand end="^\.$""
+syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=i\%[nsert]$"		matchgroup=vimCommand end="^\.$""
+syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=starti\%[nsert]$"	matchgroup=vimCommand end="^\.$""
+
+" Behave! {{{2
+" =======
+syn match   vimBehave	"\<be\%[have]\>" skipwhite nextgroup=vimBehaveModel,vimBehaveError
+syn keyword vimBehaveModel contained	mswin	xterm
+if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_nobehaveerror")
+ syn match   vimBehaveError contained	"[^ ]\+"
+endif
+
+" Filetypes {{{2
+" =========
+syn match   vimFiletype	"\<filet\%[ype]\(\s\+\I\i*\)*"	skipwhite contains=vimFTCmd,vimFTOption,vimFTError
+if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_vimFTError")
+ syn match   vimFTError  contained	"\I\i*"
+endif
+syn keyword vimFTCmd    contained	filet[ype]
+syn keyword vimFTOption contained	detect indent off on plugin
+
+" Augroup : vimAugroupError removed because long augroups caused sync'ing problems. {{{2
+" ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking.
+syn cluster vimAugroupList	contains=vimAugroup,vimIsCommand,vimUserCmd,vimExecute,vimNotFunc,vimFuncName,vimFunction,vimFunctionError,vimLineComment,vimNotFunc,vimMap,vimSpecFile,vimOper,vimNumber,vimOperParen,vimComment,vim9Comment,vimString,vimSubst,vimMark,vimRegister,vimAddress,vimFilter,vimCmplxRepeat,vimComment,vim9Comment,vimLet,vimSet,vimAutoCmd,vimRegion,vimSynLine,vimNotation,vimCtrlChar,vimFuncVar,vimContinue,vimSetEqual,vimOption
+if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'a'
+ syn region  vimAugroup	fold matchgroup=vimAugroupKey start="\<aug\%[roup]\>\ze\s\+\K\k*" end="\<aug\%[roup]\>\ze\s\+[eE][nN][dD]\>"	contains=vimAutoCmd,@vimAugroupList
+else
+ syn region  vimAugroup	matchgroup=vimAugroupKey start="\<aug\%[roup]\>\ze\s\+\K\k*" end="\<aug\%[roup]\>\ze\s\+[eE][nN][dD]\>"		contains=vimAutoCmd,@vimAugroupList
+endif
+syn match   vimAugroup	"aug\%[roup]!"	contains=vimAugroupKey
+if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noaugrouperror")
+ syn match   vimAugroupError	"\<aug\%[roup]\>\s\+[eE][nN][dD]\>"
+endif
+syn keyword vimAugroupKey contained	aug[roup]
+
+" Operators: {{{2
+" =========
+syn cluster	vimOperGroup	contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperParen,vimNumber,vimString,vimRegister,vimContinue,vim9Comment
+syn match	vimOper	"\%#=1\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}"	skipwhite nextgroup=vimString,vimSpecFile
+syn match	vimOper	"\(\<is\|\<isnot\)[?#]\{0,2}\>"			skipwhite nextgroup=vimString,vimSpecFile
+syn match	vimOper	"||\|&&\|[-+.!]"				skipwhite nextgroup=vimString,vimSpecFile
+syn region	vimOperParen 	matchgroup=vimParenSep	start="(" end=")" contains=vimoperStar,@vimOperGroup
+syn region	vimOperParen	matchgroup=vimSep		start="{" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar
+if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror")
+ syn match	vimOperError	")"
+endif
+
+" Functions : Tag is provided for those who wish to highlight tagged functions {{{2
+" =========
+syn cluster	vimFuncList	contains=vimCommand,vimFunctionError,vimFuncKey,Tag,vimFuncSID
+syn cluster	vimFuncBodyList	contains=vimAbb,vimAddress,vimAugroupKey,vimAutoCmd,vimCmplxRepeat,vimComment,vim9Comment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimEnvvar,vimExecute,vimIsCommand,vimFBVar,vimFunc,vimFunction,vimFuncVar,vimGlobal,vimHighlight,vimIsCommand,vimLet,vimLetHereDoc,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSearch,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUnmap,vimUserCommand
+syn match	vimFunction	"\<\(fu\%[nction]\|def\)!\=\s\+\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\=\%(\i\|[#.]\|{.\{-1,}}\)*\ze\s*("	contains=@vimFuncList nextgroup=vimFuncBody
+
+if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f'
+ syn region	vimFuncBody  contained	fold start="\ze\s*("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\|enddef\>\)"		contains=@vimFuncBodyList
+else
+ syn region	vimFuncBody  contained	start="\ze\s*("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\|enddef\>\)"		contains=@vimFuncBodyList
+endif
+syn match	vimFuncVar   contained	"a:\(\K\k*\|\d\+\)"
+syn match	vimFuncSID   contained	"\c<sid>\|\<s:"
+syn keyword	vimFuncKey   contained	fu[nction]
+syn keyword	vimFuncKey   contained	def
+syn match	vimFuncBlank contained	"\s\+"
+
+syn keyword	vimPattern   contained	start	skip	end
+
+" Special Filenames, Modifiers, Extension Removal: {{{2
+" ===============================================
+syn match	vimSpecFile	"<c\(word\|WORD\)>"	nextgroup=vimSpecFileMod,vimSubst
+syn match	vimSpecFile	"<\([acs]file\|amatch\|abuf\)>"	nextgroup=vimSpecFileMod,vimSubst
+syn match	vimSpecFile	"\s%[ \t:]"ms=s+1,me=e-1	nextgroup=vimSpecFileMod,vimSubst
+syn match	vimSpecFile	"\s%$"ms=s+1	nextgroup=vimSpecFileMod,vimSubst
+syn match	vimSpecFile	"\s%<"ms=s+1,me=e-1	nextgroup=vimSpecFileMod,vimSubst
+syn match	vimSpecFile	"#\d\+\|[#%]<\>"	nextgroup=vimSpecFileMod,vimSubst
+syn match	vimSpecFileMod	"\(:[phtre]\)\+"	contained
+
+" User-Specified Commands: {{{2
+" =======================
+syn cluster	vimUserCmdList	contains=vimAddress,vimSyntax,vimHighlight,vimAutoCmd,vimCmplxRepeat,vimComment,vim9Comment,vimCtrlChar,vimEscapeBrace,vimFunc,vimFuncName,vimFunction,vimFunctionError,vimIsCommand,vimMark,vimNotation,vimNumber,vimOper,vimRegion,vimRegister,vimLet,vimSet,vimSetEqual,vimSetString,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange,vimSynLine
+syn keyword	vimUserCommand	contained	com[mand]
+syn match	vimUserCmd	"\<com\%[mand]!\=\>.*$"	contains=vimUserAttrb,vimUserAttrbError,vimUserCommand,@vimUserCmdList,vimComFilter
+syn match	vimUserAttrbError	contained	"-\a\+\ze\s"
+syn match	vimUserAttrb	contained	"-nargs=[01*?+]"	contains=vimUserAttrbKey,vimOper
+syn match	vimUserAttrb	contained	"-complete="		contains=vimUserAttrbKey,vimOper nextgroup=vimUserAttrbCmplt,vimUserCmdError
+syn match	vimUserAttrb	contained	"-range\(=%\|=\d\+\)\="	contains=vimNumber,vimOper,vimUserAttrbKey
+syn match	vimUserAttrb	contained	"-count\(=\d\+\)\="	contains=vimNumber,vimOper,vimUserAttrbKey
+syn match	vimUserAttrb	contained	"-bang\>"		contains=vimOper,vimUserAttrbKey
+syn match	vimUserAttrb	contained	"-bar\>"		contains=vimOper,vimUserAttrbKey
+syn match	vimUserAttrb	contained	"-buffer\>"		contains=vimOper,vimUserAttrbKey
+syn match	vimUserAttrb	contained	"-register\>"		contains=vimOper,vimUserAttrbKey
+if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_nousercmderror")
+ syn match	vimUserCmdError	contained	"\S\+\>"
+endif
+syn case ignore
+syn keyword	vimUserAttrbKey   contained	bar	ban[g]	cou[nt]	ra[nge] com[plete]	n[args]	re[gister]
+syn keyword	vimUserAttrbCmplt contained	augroup buffer behave color command compiler cscope dir environment event expression file file_in_path filetype function help highlight history locale mapping menu option packadd shellcmd sign syntax syntime tag tag_listfiles user var
+syn keyword	vimUserAttrbCmplt contained	custom customlist nextgroup=vimUserAttrbCmpltFunc,vimUserCmdError
+syn match	vimUserAttrbCmpltFunc contained	",\%([sS]:\|<[sS][iI][dD]>\)\=\%(\h\w*\%(#\h\w*\)\+\|\h\w*\)"hs=s+1 nextgroup=vimUserCmdError
+
+syn case match
+syn match	vimUserAttrbCmplt contained	"custom,\u\w*"
+
+" Lower Priority Comments: after some vim commands... {{{2
+" =======================
+syn match	vimComment	excludenl +\s"[^\-:.%#=*].*$+lc=1	contains=@vimCommentGroup,vimCommentString
+syn match	vimComment	+\<endif\s\+".*$+lc=5	contains=@vimCommentGroup,vimCommentString
+syn match	vimComment	+\<else\s\+".*$+lc=4	contains=@vimCommentGroup,vimCommentString
+syn region	vimCommentString	contained oneline start='\S\s\+"'ms=e	end='"'
+" Vim9 comments - TODO: might be highlighted while they don't work
+syn match	vim9Comment	excludenl +\s#[^{].*$+lc=1	contains=@vimCommentGroup,vimCommentString
+syn match	vim9Comment	+\<endif\s\+#[^{].*$+lc=5	contains=@vimCommentGroup,vimCommentString
+syn match	vim9Comment	+\<else\s\+#[^{].*$+lc=4	contains=@vimCommentGroup,vimCommentString
+" Vim9 comment inside expression
+syn match	vim9Comment	+\s\zs#[^{].*$+ms=s+1	contains=@vimCommentGroup,vimCommentString
+syn match	vim9Comment	+^\s*#[^{].*$+	contains=@vimCommentGroup,vimCommentString
+syn match	vim9Comment	+^\s*#$+	contains=@vimCommentGroup,vimCommentString
+
+" Environment Variables: {{{2
+" =====================
+syn match	vimEnvvar	"\$\I\i*"
+syn match	vimEnvvar	"\${\I\i*}"
+
+" In-String Specials: {{{2
+" Try to catch strings, if nothing else matches (therefore it must precede the others!)
+"  vimEscapeBrace handles ["]  []"] (ie. "s don't terminate string inside [])
+syn region	vimEscapeBrace	oneline   contained transparent start="[^\\]\(\\\\\)*\[\zs\^\=\]\=" skip="\\\\\|\\\]" end="]"me=e-1
+syn match	vimPatSepErr	contained	"\\)"
+syn match	vimPatSep	contained	"\\|"
+syn region	vimPatSepZone	oneline   contained   matchgroup=vimPatSepZ start="\\%\=\ze(" skip="\\\\" end="\\)\|[^\\]['"]"	contains=@vimStringGroup
+syn region	vimPatRegion	contained transparent matchgroup=vimPatSepR start="\\[z%]\=(" end="\\)"	contains=@vimSubstList oneline
+syn match	vimNotPatSep	contained	"\\\\"
+syn cluster	vimStringGroup	contains=vimEscapeBrace,vimPatSep,vimNotPatSep,vimPatSepErr,vimPatSepZone,@Spell
+syn region	vimString	oneline keepend	start=+[^a-zA-Z>!\\@]"+lc=1 skip=+\\\\\|\\"+ matchgroup=vimStringEnd end=+"+	contains=@vimStringGroup
+syn region	vimString	oneline keepend	start=+[^a-zA-Z>!\\@]'+lc=1 end=+'+
+syn region	vimString	oneline	start=+=!+lc=1	skip=+\\\\\|\\!+ end=+!+	contains=@vimStringGroup
+syn region	vimString	oneline	start="=+"lc=1	skip="\\\\\|\\+" end="+"	contains=@vimStringGroup
+"syn region	vimString	oneline	start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/"	contains=@vimStringGroup  " see tst45.vim
+syn match	vimString	contained	+"[^"]*\\$+	skipnl nextgroup=vimStringCont
+syn match	vimStringCont	contained	+\(\\\\\|.\)\{-}[^\\]"+
+
+" Substitutions: {{{2
+" =============
+syn cluster	vimSubstList	contains=vimPatSep,vimPatRegion,vimPatSepErr,vimSubstTwoBS,vimSubstRange,vimNotation
+syn cluster	vimSubstRepList	contains=vimSubstSubstr,vimSubstTwoBS,vimNotation
+syn cluster	vimSubstList	add=vimCollection
+syn match	vimSubst	"\(:\+\s*\|^\s*\||\s*\)\<\%(\<s\%[ubstitute]\>\|\<sm\%[agic]\>\|\<sno\%[magic]\>\)[:#[:alpha:]]\@!" nextgroup=vimSubstPat
+"syn match	vimSubst	"\%(^\|[^\\]\)\<s\%[ubstitute]\>[:#[:alpha:]]\@!"	nextgroup=vimSubstPat contained
+syn match	vimSubst	"\%(^\|[^\\\"']\)\<s\%[ubstitute]\>[:#[:alpha:]\"']\@!"	nextgroup=vimSubstPat contained
+syn match	vimSubst	"/\zs\<s\%[ubstitute]\>\ze/"		nextgroup=vimSubstPat
+syn match	vimSubst	"\(:\+\s*\|^\s*\)s\ze#.\{-}#.\{-}#"		nextgroup=vimSubstPat
+syn match	vimSubst1       contained	"\<s\%[ubstitute]\>"	nextgroup=vimSubstPat
+syn match	vimSubst2       contained	"s\%[ubstitute]\>"	nextgroup=vimSubstPat
+syn region	vimSubstPat     contained	matchgroup=vimSubstDelim start="\z([^a-zA-Z( \t[\]&]\)"rs=s+1 skip="\\\\\|\\\z1" end="\z1"re=e-1,me=e-1	 contains=@vimSubstList	nextgroup=vimSubstRep4	oneline
+syn region	vimSubstRep4    contained	matchgroup=vimSubstDelim start="\z(.\)" skip="\\\\\|\\\z1" end="\z1" matchgroup=vimNotation end="<[cC][rR]>" contains=@vimSubstRepList	nextgroup=vimSubstFlagErr	oneline
+syn region	vimCollection   contained transparent	start="\\\@<!\[" skip="\\\[" end="\]"	contains=vimCollClass
+syn match	vimCollClassErr contained	"\[:.\{-\}:\]"
+syn match	vimCollClass    contained transparent	"\%#=1\[:\(alnum\|alpha\|blank\|cntrl\|digit\|graph\|lower\|print\|punct\|space\|upper\|xdigit\|return\|tab\|escape\|backspace\):\]"
+syn match	vimSubstSubstr  contained	"\\z\=\d"
+syn match	vimSubstTwoBS   contained	"\\\\"
+syn match	vimSubstFlagErr contained	"[^< \t\r|]\+" contains=vimSubstFlags
+syn match	vimSubstFlags   contained	"[&cegiIlnpr#]\+"
+
+" 'String': {{{2
+syn match	vimString	"[^(,]'[^']\{-}\zs'"
+
+" Marks, Registers, Addresses, Filters: {{{2
+syn match	vimMark	"'[a-zA-Z0-9]\ze[-+,!]"	nextgroup=vimFilter,vimMarkNumber,vimSubst
+syn match	vimMark	"'[<>]\ze[-+,!]"		nextgroup=vimFilter,vimMarkNumber,vimSubst
+syn match	vimMark	",\zs'[<>]\ze"		nextgroup=vimFilter,vimMarkNumber,vimSubst
+syn match	vimMark	"[!,:]\zs'[a-zA-Z0-9]"	nextgroup=vimFilter,vimMarkNumber,vimSubst
+syn match	vimMark	"\<norm\%[al]\s\zs'[a-zA-Z0-9]"	nextgroup=vimFilter,vimMarkNumber,vimSubst
+syn match	vimMarkNumber	"[-+]\d\+"		contained contains=vimOper nextgroup=vimSubst2
+syn match	vimPlainMark contained	"'[a-zA-Z0-9]"
+syn match	vimRange	"[`'][a-zA-Z0-9],[`'][a-zA-Z0-9]"	contains=vimMark	skipwhite nextgroup=vimFilter
+
+syn match	vimRegister	'[^,;[{: \t]\zs"[a-zA-Z0-9.%#:_\-/]\ze[^a-zA-Z_":0-9]'
+syn match	vimRegister	'\<norm\s\+\zs"[a-zA-Z0-9]'
+syn match	vimRegister	'\<normal\s\+\zs"[a-zA-Z0-9]'
+syn match	vimRegister	'@"'
+syn match	vimPlainRegister contained	'"[a-zA-Z0-9\-:.%#*+=]'
+
+syn match	vimAddress	",\zs[.$]"	skipwhite nextgroup=vimSubst1
+syn match	vimAddress	"%\ze\a"	skipwhite nextgroup=vimString,vimSubst1
+
+syn match	vimFilter 		"^!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=vimOper,vimSpecFile
+syn match	vimFilter    contained	"!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=vimOper,vimSpecFile
+syn match	vimComFilter contained	"|!!\=[^"]\{-}\(|\|\ze\"\|$\)"      contains=vimOper,vimSpecFile
+
+" Complex Repeats: (:h complex-repeat) {{{2
+" ===============
+syn match	vimCmplxRepeat	'[^a-zA-Z_/\\()]q[0-9a-zA-Z"]\>'lc=1
+syn match	vimCmplxRepeat	'@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\>\)'
+
+" Set command and associated set-options (vimOptions) with comment {{{2
+syn region	vimSet		matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skip="\%(\\\\\)*\\." end="$" end="|" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vim9Comment,vimSetString,vimSetMod
+syn region	vimSetEqual	contained	start="[=:]\|[-+^]=" skip="\\\\\|\\\s" end="[| \t]\|$"me=e-1	contains=vimCtrlChar,vimSetSep,vimNotation,vimEnvvar oneline
+syn region	vimSetString	contained	start=+="+hs=s+1	skip=+\\\\\|\\"+  end=+"+		contains=vimCtrlChar
+syn match	vimSetSep	contained	"[,:]" skipwhite nextgroup=vimCommand
+syn match	vimSetMod	contained	"&vim\=\|[!&?<]\|all&"
+
+" Let: {{{2
+" ===
+syn keyword	vimLet	let var	unl[et]	skipwhite nextgroup=vimVar,vimFuncVar,vimLetHereDoc
+VimFoldh syn region vimLetHereDoc	matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\>\)\=\s*\z(\L\S*\)'	matchgroup=vimLetHereDocStop end='^\s*\z1\s*$'	contains=vimComment,vim9Comment
+
+" Abbreviations: {{{2
+" =============
+syn keyword vimAbb	ab[breviate] ca[bbrev] inorea[bbrev] cnorea[bbrev] norea[bbrev] ia[bbrev] skipwhite nextgroup=vimMapMod,vimMapLhs
+
+" Autocmd: {{{2
+" =======
+syn match	vimAutoEventList	contained	"\(!\s\+\)\=\(\a\+,\)*\a\+"	contains=vimAutoEvent nextgroup=vimAutoCmdSpace
+syn match	vimAutoCmdSpace	contained	"\s\+"	nextgroup=vimAutoCmdSfxList
+syn match	vimAutoCmdSfxList	contained	"\S*"	skipwhite nextgroup=vimAutoCmdMod
+syn keyword	vimAutoCmd	au[tocmd] do[autocmd] doautoa[ll]	skipwhite nextgroup=vimAutoEventList
+syn match	vimAutoCmdMod	"\(++\)\=\(once\|nested\)"
+
+" Echo And Execute: -- prefer strings! {{{2
+" ================
+syn region	vimEcho	oneline excludenl matchgroup=vimCommand start="\<ec\%[ho]\>" skip="\(\\\\\)*\\|" end="$\||" contains=vimFunc,vimFuncVar,vimString,vimVar
+syn region	vimExecute	oneline excludenl matchgroup=vimCommand start="\<exe\%[cute]\>" skip="\(\\\\\)*\\|" end="$\||\|<[cC][rR]>" contains=vimFuncVar,vimIsCommand,vimOper,vimNotation,vimOperParen,vimString,vimVar
+syn match	vimEchoHL	"echohl\="	skipwhite nextgroup=vimGroup,vimHLGroup,vimEchoHLNone
+syn case ignore
+syn keyword	vimEchoHLNone	none
+syn case match
+
+" Maps: {{{2
+" ====
+syn match	vimMap		"\<map\>!\=\ze\s*[^(]" skipwhite nextgroup=vimMapMod,vimMapLhs
+syn keyword	vimMap		cm[ap] cno[remap] im[ap] ino[remap] lm[ap] ln[oremap] nm[ap] nn[oremap] no[remap] om[ap] ono[remap] smap snor[emap] tno[remap] tm[ap] vm[ap] vn[oremap] xm[ap] xn[oremap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
+syn keyword	vimMap		mapc[lear] smapc[lear]
+syn keyword	vimUnmap		cu[nmap] iu[nmap] lu[nmap] nun[map] ou[nmap] sunm[ap] tunma[p] unm[ap] unm[ap] vu[nmap] xu[nmap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
+syn match	vimMapLhs	contained	"\S\+"			contains=vimNotation,vimCtrlChar skipwhite nextgroup=vimMapRhs
+syn match	vimMapBang	contained	"!"			skipwhite nextgroup=vimMapMod,vimMapLhs
+syn match	vimMapMod	contained	"\%#=1\c<\(buffer\|expr\|\(local\)\=leader\|nowait\|plug\|script\|sid\|unique\|silent\)\+>" contains=vimMapModKey,vimMapModErr skipwhite nextgroup=vimMapMod,vimMapLhs
+syn match	vimMapRhs	contained	".*" contains=vimNotation,vimCtrlChar	skipnl nextgroup=vimMapRhsExtend
+syn match	vimMapRhsExtend	contained	"^\s*\\.*$"			contains=vimContinue
+syn case ignore
+syn keyword	vimMapModKey	contained	buffer	expr	leader	localleader	nowait	plug	script	sid	silent	unique
+syn case match
+
+" Menus: {{{2
+" =====
+syn cluster	vimMenuList contains=vimMenuBang,vimMenuPriority,vimMenuName,vimMenuMod
+syn keyword	vimCommand	am[enu] an[oremenu] aun[menu] cme[nu] cnoreme[nu] cunme[nu] ime[nu] inoreme[nu] iunme[nu] me[nu] nme[nu] nnoreme[nu] noreme[nu] nunme[nu] ome[nu] onoreme[nu] ounme[nu] unme[nu] vme[nu] vnoreme[nu] vunme[nu] skipwhite nextgroup=@vimMenuList
+syn match	vimMenuName	"[^ \t\\<]\+"	contained nextgroup=vimMenuNameMore,vimMenuMap
+syn match	vimMenuPriority	"\d\+\(\.\d\+\)*"	contained skipwhite nextgroup=vimMenuName
+syn match	vimMenuNameMore	"\c\\\s\|<tab>\|\\\."	contained nextgroup=vimMenuName,vimMenuNameMore contains=vimNotation
+syn match	vimMenuMod    contained	"\c<\(script\|silent\)\+>"  skipwhite contains=vimMapModKey,vimMapModErr nextgroup=@vimMenuList
+syn match	vimMenuMap	"\s"	contained skipwhite nextgroup=vimMenuRhs
+syn match	vimMenuRhs	".*$"	contained contains=vimString,vimComment,vim9Comment,vimIsCommand
+syn match	vimMenuBang	"!"	contained skipwhite nextgroup=@vimMenuList
+
+" Angle-Bracket Notation: (tnx to Michael Geddes) {{{2
+" ======================
+syn case ignore
+syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([scamd]-\)\{0,4}x\=\(f\d\{1,2}\|[^ \t:]\|cr\|lf\|linefeed\|return\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|right\|left\|help\|undo\|insert\|ins\|mouse\|k\=home\|k\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|kpoint\|space\|k\=\(page\)\=\(\|down\|up\|k\d\>\)\)>" contains=vimBracket
+syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([scam2-4]-\)\{0,4}\(right\|left\|middle\)\(mouse\)\=\(drag\|release\)\=>"	contains=vimBracket
+syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\(bslash\|plug\|sid\|space\|bar\|nop\|nul\|lt\)>"			contains=vimBracket
+syn match	vimNotation	'\(\\\|<lt>\)\=<C-R>[0-9a-z"%#:.\-=]'he=e-1				contains=vimBracket
+syn match	vimNotation	'\%#=1\(\\\|<lt>\)\=<\%(q-\)\=\(line[12]\|count\|bang\|reg\|args\|mods\|f-args\|f-mods\|lt\)>'	contains=vimBracket
+syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([cas]file\|abuf\|amatch\|cword\|cWORD\|client\)>"		contains=vimBracket
+syn match	vimBracket contained	"[\\<>]"
+syn case match
+
+" User Function Highlighting: {{{2
+" (following Gautam Iyer's suggestion)
+" ==========================
+syn match vimFunc		"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*("		contains=vimFuncName,vimUserFunc,vimExecute
+syn match vimUserFunc contained	"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\<if\>"	contains=vimNotation
+
+" User Command Highlighting: {{{2
+syn match vimUsrCmd	'^\s*\zs\u\w*.*$'
+
+" Errors And Warnings: {{{2
+" ====================
+if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimfunctionerror")
+ syn match	vimFunctionError	"\s\zs[a-z0-9]\i\{-}\ze\s*("			contained contains=vimFuncKey,vimFuncBlank
+ syn match	vimFunctionError	"\s\zs\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\d\i\{-}\ze\s*("	contained contains=vimFuncKey,vimFuncBlank
+ syn match	vimElseIfErr	"\<else\s\+if\>"
+ syn match	vimBufnrWarn	/\<bufnr\s*(\s*["']\.['"]\s*)/
+endif
+
+syn match vimNotFunc	"\<if\>\|\<el\%[seif]\>\|\<return\>\|\<while\>"	skipwhite nextgroup=vimOper,vimOperParen,vimVar,vimFunc,vimNotation
+
+" Norm: {{{2
+" ====
+syn match	vimNorm		"\<norm\%[al]!\=" skipwhite nextgroup=vimNormCmds
+syn match	vimNormCmds contained	".*$"
+
+" Syntax: {{{2
+"=======
+syn match	vimGroupList	contained	"@\=[^ \t,]*"	contains=vimGroupSpecial,vimPatSep
+syn match	vimGroupList	contained	"@\=[^ \t,]*,"	nextgroup=vimGroupList contains=vimGroupSpecial,vimPatSep
+syn keyword	vimGroupSpecial	contained	ALL	ALLBUT	CONTAINED	TOP
+if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsynerror")
+ syn match	vimSynError	contained	"\i\+"
+ syn match	vimSynError	contained	"\i\+="	nextgroup=vimGroupList
+endif
+syn match	vimSynContains	contained	"\<contain\(s\|edin\)="	nextgroup=vimGroupList
+syn match	vimSynKeyContainedin	contained	"\<containedin="	nextgroup=vimGroupList
+syn match	vimSynNextgroup	contained	"nextgroup="	nextgroup=vimGroupList
+
+syn match	vimSyntax	"\<sy\%[ntax]\>"	contains=vimCommand skipwhite nextgroup=vimSynType,vimComment,vim9Comment
+syn match	vimAuSyntax	contained	"\s+sy\%[ntax]"	contains=vimCommand skipwhite nextgroup=vimSynType,vimComment,vim9Comment
+syn cluster vimFuncBodyList add=vimSyntax
+
+" Syntax: case {{{2
+syn keyword	vimSynType	contained	case	skipwhite nextgroup=vimSynCase,vimSynCaseError
+if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsyncaseerror")
+ syn match	vimSynCaseError	contained	"\i\+"
+endif
+syn keyword	vimSynCase	contained	ignore	match
+
+" Syntax: clear {{{2
+syn keyword	vimSynType	contained	clear	skipwhite nextgroup=vimGroupList
+
+" Syntax: cluster {{{2
+syn keyword	vimSynType	contained	cluster	skipwhite nextgroup=vimClusterName
+syn region	vimClusterName	contained	matchgroup=vimGroupName start="\h\w*" skip="\\\\\|\\|" matchgroup=vimSep end="$\||" contains=vimGroupAdd,vimGroupRem,vimSynContains,vimSynError
+syn match	vimGroupAdd	contained	"add="	nextgroup=vimGroupList
+syn match	vimGroupRem	contained	"remove="	nextgroup=vimGroupList
+syn cluster vimFuncBodyList add=vimSynType,vimGroupAdd,vimGroupRem
+
+" Syntax: iskeyword {{{2
+syn keyword	vimSynType	contained	iskeyword	skipwhite nextgroup=vimIskList
+syn match	vimIskList	contained	'\S\+'	contains=vimIskSep
+syn match	vimIskSep	contained	','
+
+" Syntax: include {{{2
+syn keyword	vimSynType	contained	include	skipwhite nextgroup=vimGroupList
+syn cluster vimFuncBodyList add=vimSynType
+
+" Syntax: keyword {{{2
+syn cluster	vimSynKeyGroup	contains=vimSynNextgroup,vimSynKeyOpt,vimSynKeyContainedin
+syn keyword	vimSynType	contained	keyword	skipwhite nextgroup=vimSynKeyRegion
+syn region	vimSynKeyRegion	contained oneline keepend	matchgroup=vimGroupName start="\h\w*" skip="\\\\\|\\|" matchgroup=vimSep end="|\|$" contains=@vimSynKeyGroup
+syn match	vimSynKeyOpt	contained	"\%#=1\<\(conceal\|contained\|transparent\|skipempty\|skipwhite\|skipnl\)\>"
+syn cluster vimFuncBodyList add=vimSynType
+
+" Syntax: match {{{2
+syn cluster	vimSynMtchGroup	contains=vimMtchComment,vimSynContains,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation,vim9Comment
+syn keyword	vimSynType	contained	match	skipwhite nextgroup=vimSynMatchRegion
+syn region	vimSynMatchRegion	contained keepend	matchgroup=vimGroupName start="\h\w*" matchgroup=vimSep end="|\|$" contains=@vimSynMtchGroup
+syn match	vimSynMtchOpt	contained	"\%#=1\<\(conceal\|transparent\|contained\|excludenl\|keepend\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
+if has("conceal")
+ syn match	vimSynMtchOpt	contained	"\<cchar="	nextgroup=vimSynMtchCchar
+ syn match	vimSynMtchCchar	contained	"\S"
+endif
+syn cluster vimFuncBodyList add=vimSynMtchGroup
+
+" Syntax: off and on {{{2
+syn keyword	vimSynType	contained	enable	list	manual	off	on	reset
+
+" Syntax: region {{{2
+syn cluster	vimSynRegPatGroup	contains=vimPatSep,vimNotPatSep,vimSynPatRange,vimSynNotPatRange,vimSubstSubstr,vimPatRegion,vimPatSepErr,vimNotation
+syn cluster	vimSynRegGroup	contains=vimSynContains,vimSynNextgroup,vimSynRegOpt,vimSynReg,vimSynMtchGrp
+syn keyword	vimSynType	contained	region	skipwhite nextgroup=vimSynRegion
+syn region	vimSynRegion	contained keepend	matchgroup=vimGroupName start="\h\w*" skip="\\\\\|\\|" end="|\|$" contains=@vimSynRegGroup
+syn match	vimSynRegOpt	contained	"\%#=1\<\(conceal\(ends\)\=\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|keepend\|oneline\|extend\|skipnl\|fold\)\>"
+syn match	vimSynReg	contained	"\(start\|skip\|end\)="he=e-1	nextgroup=vimSynRegPat
+syn match	vimSynMtchGrp	contained	"matchgroup="	nextgroup=vimGroup,vimHLGroup
+syn region	vimSynRegPat	contained extend	start="\z([-`~!@#$%^&*_=+;:'",./?]\)"  skip="\\\\\|\\\z1"  end="\z1"  contains=@vimSynRegPatGroup skipwhite nextgroup=vimSynPatMod,vimSynReg
+syn match	vimSynPatMod	contained	"\%#=1\(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\([-+]\d\+\)\="
+syn match	vimSynPatMod	contained	"\%#=1\(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\([-+]\d\+\)\=," nextgroup=vimSynPatMod
+syn match	vimSynPatMod	contained	"lc=\d\+"
+syn match	vimSynPatMod	contained	"lc=\d\+," nextgroup=vimSynPatMod
+syn region	vimSynPatRange	contained	start="\["	skip="\\\\\|\\]"   end="]"
+syn match	vimSynNotPatRange	contained	"\\\\\|\\\["
+syn match	vimMtchComment	contained	'"[^"]\+$'
+syn cluster vimFuncBodyList add=vimSynType
+
+" Syntax: sync {{{2
+" ============
+syn keyword vimSynType	contained	sync	skipwhite	nextgroup=vimSyncC,vimSyncLines,vimSyncMatch,vimSyncError,vimSyncLinebreak,vimSyncLinecont,vimSyncRegion
+if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsyncerror")
+ syn match	vimSyncError	contained	"\i\+"
+endif
+syn keyword	vimSyncC	contained	ccomment	clear	fromstart
+syn keyword	vimSyncMatch	contained	match	skipwhite	nextgroup=vimSyncGroupName
+syn keyword	vimSyncRegion	contained	region	skipwhite	nextgroup=vimSynReg
+syn match	vimSyncLinebreak	contained	"\<linebreaks="	skipwhite	nextgroup=vimNumber
+syn keyword	vimSyncLinecont	contained	linecont	skipwhite	nextgroup=vimSynRegPat
+syn match	vimSyncLines	contained	"\(min\|max\)\=lines="	nextgroup=vimNumber
+syn match	vimSyncGroupName	contained	"\h\w*"	skipwhite	nextgroup=vimSyncKey
+syn match	vimSyncKey	contained	"\<groupthere\|grouphere\>"	skipwhite nextgroup=vimSyncGroup
+syn match	vimSyncGroup	contained	"\h\w*"	skipwhite	nextgroup=vimSynRegPat,vimSyncNone
+syn keyword	vimSyncNone	contained	NONE
+
+" Additional IsCommand: here by reasons of precedence {{{2
+" ====================
+syn match	vimIsCommand	"<Bar>\s*\a\+"	transparent contains=vimCommand,vimNotation
+
+" Highlighting: {{{2
+" ============
+syn cluster	vimHighlightCluster		contains=vimHiLink,vimHiClear,vimHiKeyList,vimComment,vim9Comment
+if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimhictermerror")
+ syn match	vimHiCtermError	contained	"\D\i*"
+endif
+syn match	vimHighlight	"\<hi\%[ghlight]\>"	skipwhite nextgroup=vimHiBang,@vimHighlightCluster
+syn match	vimHiBang	contained	"!"	skipwhite nextgroup=@vimHighlightCluster
+
+syn match	vimHiGroup	contained	"\i\+"
+syn case ignore
+syn keyword	vimHiAttrib	contained	none bold inverse italic nocombine reverse standout strikethrough underline undercurl
+syn keyword	vimFgBgAttrib	contained	none bg background fg foreground
+syn case match
+syn match	vimHiAttribList	contained	"\i\+"	contains=vimHiAttrib
+syn match	vimHiAttribList	contained	"\i\+,"he=e-1	contains=vimHiAttrib nextgroup=vimHiAttribList
+syn case ignore
+syn keyword	vimHiCtermColor	contained	black blue brown cyan darkblue darkcyan darkgray darkgreen darkgrey darkmagenta darkred darkyellow gray green grey lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightred magenta red white yellow
+syn match	vimHiCtermColor	contained	"\<color\d\{1,3}\>"
+
+syn case match
+syn match	vimHiFontname	contained	"[a-zA-Z\-*]\+"
+syn match	vimHiGuiFontname	contained	"'[a-zA-Z\-* ]\+'"
+syn match	vimHiGuiRgb	contained	"#\x\{6}"
+
+" Highlighting: hi group key=arg ... {{{2
+syn cluster	vimHiCluster contains=vimGroup,vimHiGroup,vimHiTerm,vimHiCTerm,vimHiStartStop,vimHiCtermFgBg,vimHiCtermul,vimHiGui,vimHiGuiFont,vimHiGuiFgBg,vimHiKeyError,vimNotation
+syn region	vimHiKeyList	contained oneline start="\i\+" skip="\\\\\|\\|" end="$\||"	contains=@vimHiCluster
+if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_vimhikeyerror")
+ syn match	vimHiKeyError	contained	"\i\+="he=e-1
+endif
+syn match	vimHiTerm	contained	"\cterm="he=e-1		nextgroup=vimHiAttribList
+syn match	vimHiStartStop	contained	"\c\(start\|stop\)="he=e-1	nextgroup=vimHiTermcap,vimOption
+syn match	vimHiCTerm	contained	"\ccterm="he=e-1		nextgroup=vimHiAttribList
+syn match	vimHiCtermFgBg	contained	"\ccterm[fb]g="he=e-1	nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
+syn match	vimHiCtermul	contained	"\cctermul="he=e-1	nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
+syn match	vimHiGui	contained	"\cgui="he=e-1		nextgroup=vimHiAttribList
+syn match	vimHiGuiFont	contained	"\cfont="he=e-1		nextgroup=vimHiFontname
+syn match	vimHiGuiFgBg	contained	"\cgui\%([fb]g\|sp\)="he=e-1	nextgroup=vimHiGroup,vimHiGuiFontname,vimHiGuiRgb,vimFgBgAttrib
+syn match	vimHiTermcap	contained	"\S\+"		contains=vimNotation
+syn match	vimHiNmbr	contained	'\d\+'
+
+" Highlight: clear {{{2
+syn keyword	vimHiClear	contained	clear	nextgroup=vimHiGroup
+
+" Highlight: link {{{2
+" see tst24 (hi def vs hi) (Jul 06, 2018)
+"syn region	vimHiLink	contained oneline matchgroup=vimCommand start="\(\<hi\%[ghlight]\s\+\)\@<=\(\(def\%[ault]\s\+\)\=link\>\|\<def\>\)" end="$"	contains=vimHiGroup,vimGroup,vimHLGroup,vimNotation
+syn region	vimHiLink	contained oneline matchgroup=vimCommand start="\(\<hi\%[ghlight]\s\+\)\@<=\(\(def\%[ault]\s\+\)\=link\>\|\<def\>\)" end="$"	contains=@vimHiCluster
+syn cluster vimFuncBodyList add=vimHiLink
+
+" Control Characters: {{{2
+" ==================
+syn match	vimCtrlChar	"[
--]"
+
+" Beginners - Patterns that involve ^ {{{2
+" =========
+syn match	vimLineComment	+^[ \t:]*".*$+	contains=@vimCommentGroup,vimCommentString,vimCommentTitle
+syn match	vim9LineComment	+^[ \t]*#.*$+	contains=@vimCommentGroup,vimCommentString,vimCommentTitle
+syn match	vimCommentTitle	'"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1	contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup
+syn match	vimContinue	"^\s*\\"
+syn region	vimString	start="^\s*\\\z(['"]\)" skip='\\\\\|\\\z1' end="\z1" oneline keepend contains=@vimStringGroup,vimContinue
+syn match	vimCommentTitleLeader	'"\s\+'ms=s+1	contained
+
+" Searches And Globals: {{{2
+" ====================
+syn match	vimSearch	'^\s*[/?].*'		contains=vimSearchDelim
+syn match	vimSearchDelim	'^\s*\zs[/?]\|[/?]$'	contained
+syn region	vimGlobal	matchgroup=Statement start='\<g\%[lobal]!\=/'  skip='\\.' end='/'	skipwhite nextgroup=vimSubst
+syn region	vimGlobal	matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' end='/'	skipwhite nextgroup=vimSubst
+
+" Embedded Scripts:  {{{2
+" ================
+"   perl,ruby     : Benoit Cerrina
+"   python,tcl    : Johannes Zellner
+"   mzscheme, lua : Charles Campbell
+
+" Allows users to specify the type of embedded script highlighting
+" they want:  (perl/python/ruby/tcl support)
+"   g:vimsyn_embed == 0   : don't embed any scripts
+"   g:vimsyn_embed =~# 'l' : embed lua      (but only if vim supports it)
+"   g:vimsyn_embed =~# 'm' : embed mzscheme (but only if vim supports it)
+"   g:vimsyn_embed =~# 'p' : embed perl     (but only if vim supports it)
+"   g:vimsyn_embed =~# 'P' : embed python   (but only if vim supports it)
+"   g:vimsyn_embed =~# 'r' : embed ruby     (but only if vim supports it)
+"   g:vimsyn_embed =~# 't' : embed tcl      (but only if vim supports it)
+if !exists("g:vimsyn_embed")
+ let g:vimsyn_embed= "lmpPr"
+endif
+
+" [-- lua --] {{{3
+let s:luapath= fnameescape(expand("<sfile>:p:h")."/lua.vim")
+if !filereadable(s:luapath)
+ for s:luapath in split(globpath(&rtp,"syntax/lua.vim"),"\n")
+  if filereadable(fnameescape(s:luapath))
+   let s:luapath= fnameescape(s:luapath)
+   break
+  endif
+ endfor
+endif
+if (g:vimsyn_embed =~# 'l' && has("lua")) && filereadable(s:luapath)
+ unlet! b:current_syntax
+ syn cluster vimFuncBodyList	add=vimLuaRegion
+ exe "syn include @vimLuaScript ".s:luapath
+ VimFoldl syn region vimLuaRegion matchgroup=vimScriptDelim start=+lua\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimLuaScript
+ VimFoldl syn region vimLuaRegion matchgroup=vimScriptDelim start=+lua\s*<<\s*$+ end=+\.$+	contains=@vimLuaScript
+ syn cluster vimFuncBodyList	add=vimLuaRegion
+else
+ syn region vimEmbedError start=+lua\s*<<\s*\z(.*\)$+ end=+^\z1$+
+ syn region vimEmbedError start=+lua\s*<<\s*$+ end=+\.$+
+endif
+unlet s:luapath
+
+" [-- perl --] {{{3
+let s:perlpath= fnameescape(expand("<sfile>:p:h")."/perl.vim")
+if !filereadable(s:perlpath)
+ for s:perlpath in split(globpath(&rtp,"syntax/perl.vim"),"\n")
+  if filereadable(fnameescape(s:perlpath))
+   let s:perlpath= fnameescape(s:perlpath)
+   break
+  endif
+ endfor
+endif
+if (g:vimsyn_embed =~# 'p' && has("perl")) && filereadable(s:perlpath)
+ unlet! b:current_syntax
+ syn cluster vimFuncBodyList	add=vimPerlRegion
+ exe "syn include @vimPerlScript ".s:perlpath
+ VimFoldp syn region vimPerlRegion  matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*\z(\S*\)\ze\(\s*["#].*\)\=$+ end=+^\z1\ze\(\s*[#"].*\)\=$+	contains=@vimPerlScript
+ VimFoldp syn region vimPerlRegion	matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*$+ end=+\.$+			contains=@vimPerlScript
+ syn cluster vimFuncBodyList	add=vimPerlRegion
+else
+ syn region vimEmbedError start=+pe\%[rl]\s*<<\s*\z(.*\)$+ end=+^\z1$+
+ syn region vimEmbedError start=+pe\%[rl]\s*<<\s*$+ end=+\.$+
+endif
+unlet s:perlpath
+
+" [-- ruby --] {{{3
+let s:rubypath= fnameescape(expand("<sfile>:p:h")."/ruby.vim")
+if !filereadable(s:rubypath)
+ for s:rubypath in split(globpath(&rtp,"syntax/ruby.vim"),"\n")
+  if filereadable(fnameescape(s:rubypath))
+   let s:rubypath= fnameescape(s:rubypath)
+   break
+  endif
+ endfor
+endif
+if (g:vimsyn_embed =~# 'r' && has("ruby")) && filereadable(s:rubypath)
+ syn cluster vimFuncBodyList	add=vimRubyRegion
+ unlet! b:current_syntax
+ exe "syn include @vimRubyScript ".s:rubypath
+ VimFoldr syn region vimRubyRegion	matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+	contains=@vimRubyScript
+ syn region vimRubyRegion	matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*$+ end=+\.$+			contains=@vimRubyScript
+ syn cluster vimFuncBodyList	add=vimRubyRegion
+else
+ syn region vimEmbedError start=+rub[y]\s*<<\s*\z(.*\)$+ end=+^\z1$+
+ syn region vimEmbedError start=+rub[y]\s*<<\s*$+ end=+\.$+
+endif
+unlet s:rubypath
+
+" [-- python --] {{{3
+let s:pythonpath= fnameescape(expand("<sfile>:p:h")."/python.vim")
+if !filereadable(s:pythonpath)
+ for s:pythonpath in split(globpath(&rtp,"syntax/python.vim"),"\n")
+  if filereadable(fnameescape(s:pythonpath))
+   let s:pythonpath= fnameescape(s:pythonpath)
+   break
+  endif
+ endfor
+endif
+if g:vimsyn_embed =~# 'P' && has("pythonx") && filereadable(s:pythonpath)
+ unlet! b:current_syntax
+ syn cluster vimFuncBodyList	add=vimPythonRegion
+ exe "syn include @vimPythonScript ".s:pythonpath
+ VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon][3x]\=\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+	contains=@vimPythonScript
+ VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon][3x]\=\s*<<\s*$+ end=+\.$+				contains=@vimPythonScript
+ VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+	contains=@vimPythonScript
+ VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\=\s*<<\s*$+ end=+\.$+				contains=@vimPythonScript
+ syn cluster vimFuncBodyList	add=vimPythonRegion
+else
+ syn region vimEmbedError start=+py\%[thon]3\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
+ syn region vimEmbedError start=+py\%[thon]3\=\s*<<\s*$+ end=+\.$+
+endif
+unlet s:pythonpath
+
+" [-- tcl --] {{{3
+if has("win32") || has("win95") || has("win64") || has("win16")
+ " apparently has("tcl") has been hanging vim on some windows systems with cygwin
+ let s:trytcl= (&shell !~ '\<\%(bash\>\|4[nN][tT]\|\<zsh\)\>\%(\.exe\)\=$')
+else
+ let s:trytcl= 1
+endif
+if s:trytcl
+ let s:tclpath= fnameescape(expand("<sfile>:p:h")."/tcl.vim")
+ if !filereadable(s:tclpath)
+  for s:tclpath in split(globpath(&rtp,"syntax/tcl.vim"),"\n")
+   if filereadable(fnameescape(s:tclpath))
+    let s:tclpath= fnameescape(s:tclpath)
+    break
+   endif
+  endfor
+ endif
+ if (g:vimsyn_embed =~# 't' && has("tcl")) && filereadable(s:tclpath)
+  unlet! b:current_syntax
+  syn cluster vimFuncBodyList	add=vimTclRegion
+  exe "syn include @vimTclScript ".s:tclpath
+  VimFoldt syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimTclScript
+  VimFoldt syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*$+ end=+\.$+	contains=@vimTclScript
+  syn cluster vimFuncBodyList	add=vimTclScript
+ else
+  syn region vimEmbedError start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
+  syn region vimEmbedError start=+tc[l]\=\s*<<\s*$+ end=+\.$+
+ endif
+ unlet s:tclpath
+else
+ syn region vimEmbedError start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
+ syn region vimEmbedError start=+tc[l]\=\s*<<\s*$+ end=+\.$+
+endif
+unlet s:trytcl
+
+" [-- mzscheme --] {{{3
+let s:mzschemepath= fnameescape(expand("<sfile>:p:h")."/scheme.vim")
+if !filereadable(s:mzschemepath)
+ for s:mzschemepath in split(globpath(&rtp,"syntax/mzscheme.vim"),"\n")
+  if filereadable(fnameescape(s:mzschemepath))
+   let s:mzschemepath= fnameescape(s:mzschemepath)
+   break
+  endif
+ endfor
+endif
+if (g:vimsyn_embed =~# 'm' && has("mzscheme")) && filereadable(s:mzschemepath)
+ unlet! b:current_syntax
+ let s:iskKeep= &isk
+ syn cluster vimFuncBodyList	add=vimMzSchemeRegion
+ exe "syn include @vimMzSchemeScript ".s:mzschemepath
+ let &isk= s:iskKeep
+ unlet s:iskKeep
+ VimFoldm syn region vimMzSchemeRegion matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimMzSchemeScript
+ VimFoldm syn region vimMzSchemeRegion matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*$+ end=+\.$+		contains=@vimMzSchemeScript
+ syn cluster vimFuncBodyList	add=vimMzSchemeRegion
+else
+ syn region vimEmbedError start=+mz\%[scheme]\s*<<\s*\z(.*\)$+ end=+^\z1$+
+ syn region vimEmbedError start=+mz\%[scheme]\s*<<\s*$+ end=+\.$+
+endif
+unlet s:mzschemepath
+
+" Synchronize (speed) {{{2
+"============
+if exists("g:vimsyn_minlines")
+ exe "syn sync minlines=".g:vimsyn_minlines
+endif
+exe "syn sync maxlines=".s:vimsyn_maxlines
+syn sync linecont	"^\s\+\\"
+syn sync match vimAugroupSyncA	groupthere NONE	"\<aug\%[roup]\>\s\+[eE][nN][dD]"
+
+" ====================
+" Highlighting Settings {{{2
+" ====================
+
+if !exists("skip_vim_syntax_inits")
+ if !exists("g:vimsyn_noerror")
+  hi def link vimBehaveError	vimError
+  hi def link vimCollClassErr	vimError
+  hi def link vimErrSetting	vimError
+  hi def link vimEmbedError	vimError
+  hi def link vimFTError	vimError
+  hi def link vimFunctionError	vimError
+  hi def link vimFunc         	vimError
+  hi def link vimHiAttribList	vimError
+  hi def link vimHiCtermError	vimError
+  hi def link vimHiKeyError	vimError
+  hi def link vimKeyCodeError	vimError
+  hi def link vimMapModErr	vimError
+  hi def link vimSubstFlagErr	vimError
+  hi def link vimSynCaseError	vimError
+  hi def link vimBufnrWarn	vimWarn
+ endif
+
+ hi def link vimAbb	vimCommand
+ hi def link vimAddress	vimMark
+ hi def link vimAugroupError	vimError
+ hi def link vimAugroupKey	vimCommand
+ hi def link vimAuHighlight	vimHighlight
+ hi def link vimAutoCmdOpt	vimOption
+ hi def link vimAutoCmd	vimCommand
+ hi def link vimAutoEvent	Type
+ hi def link vimAutoCmdMod	Special
+ hi def link vimAutoSet	vimCommand
+ hi def link vimBehaveModel	vimBehave
+ hi def link vimBehave	vimCommand
+ hi def link vimBracket	Delimiter
+ hi def link vimCmplxRepeat	SpecialChar
+ hi def link vimCommand	Statement
+ hi def link vimComment	Comment
+ hi def link vim9Comment	Comment
+ hi def link vimCommentString	vimString
+ hi def link vimCommentTitle	PreProc
+ hi def link vimCondHL	vimCommand
+ hi def link vimContinue	Special
+ hi def link vimCtrlChar	SpecialChar
+ hi def link vimEchoHLNone	vimGroup
+ hi def link vimEchoHL	vimCommand
+ hi def link vimElseIfErr	Error
+ hi def link vimElseif	vimCondHL
+ hi def link vimEnvvar	PreProc
+ hi def link vimError	Error
+ hi def link vimFBVar	vimVar
+ hi def link vimFgBgAttrib	vimHiAttrib
+ hi def link vimHiCtermul	vimHiTerm
+ hi def link vimFold	Folded
+ hi def link vimFTCmd	vimCommand
+ hi def link vimFTOption	vimSynType
+ hi def link vimFuncKey	vimCommand
+ hi def link vimFuncName	Function
+ hi def link vimFuncSID	Special
+ hi def link vimFuncVar	Identifier
+ hi def link vimGroupAdd	vimSynOption
+ hi def link vimGroupName	vimGroup
+ hi def link vimGroupRem	vimSynOption
+ hi def link vimGroupSpecial	Special
+ hi def link vimGroup	Type
+ hi def link vimHiAttrib	PreProc
+ hi def link vimHiClear	vimHighlight
+ hi def link vimHiCtermFgBg	vimHiTerm
+ hi def link vimHiCTerm	vimHiTerm
+ hi def link vimHighlight	vimCommand
+ hi def link vimHiGroup	vimGroupName
+ hi def link vimHiGuiFgBg	vimHiTerm
+ hi def link vimHiGuiFont	vimHiTerm
+ hi def link vimHiGuiRgb	vimNumber
+ hi def link vimHiGui	vimHiTerm
+ hi def link vimHiNmbr	Number
+ hi def link vimHiStartStop	vimHiTerm
+ hi def link vimHiTerm	Type
+ hi def link vimHLGroup	vimGroup
+ hi def link vimHLMod	PreProc
+ hi def link vimInsert	vimString
+ hi def link vimIskSep	Delimiter
+ hi def link vimKeyCode	vimSpecFile
+ hi def link vimKeyword	Statement
+ hi def link vimLet	vimCommand
+ hi def link vimLetHereDoc	vimString
+ hi def link vimLetHereDocStart	Special
+ hi def link vimLetHereDocStop	Special
+ hi def link vimLineComment	vimComment
+ hi def link vim9LineComment	vimComment
+ hi def link vimMapBang	vimCommand
+ hi def link vimMapModKey	vimFuncSID
+ hi def link vimMapMod	vimBracket
+ hi def link vimMap	vimCommand
+ hi def link vimMark	Number
+ hi def link vimMarkNumber	vimNumber
+ hi def link vimMenuMod	vimMapMod
+ hi def link vimMenuNameMore	vimMenuName
+ hi def link vimMenuName	PreProc
+ hi def link vimMtchComment	vimComment
+ hi def link vimNorm	vimCommand
+ hi def link vimNotation	Special
+ hi def link vimNotFunc	vimCommand
+ hi def link vimNotPatSep	vimString
+ hi def link vimNumber	Number
+ hi def link vimOperError	Error
+ hi def link vimOper	Operator
+ hi def link vimOperStar	vimOper
+ hi def link vimOption	PreProc
+ hi def link vimParenSep	Delimiter
+ hi def link vimPatSepErr	vimError
+ hi def link vimPatSepR	vimPatSep
+ hi def link vimPatSep	SpecialChar
+ hi def link vimPatSepZone	vimString
+ hi def link vimPatSepZ	vimPatSep
+ hi def link vimPattern	Type
+ hi def link vimPlainMark	vimMark
+ hi def link vimPlainRegister	vimRegister
+ hi def link vimRegister	SpecialChar
+ hi def link vimScriptDelim	Comment
+ hi def link vimSearchDelim	Statement
+ hi def link vimSearch	vimString
+ hi def link vimSep	Delimiter
+ hi def link vimSetMod	vimOption
+ hi def link vimSetSep	Statement
+ hi def link vimSetString	vimString
+ hi def link vimSpecFile	Identifier
+ hi def link vimSpecFileMod	vimSpecFile
+ hi def link vimSpecial	Type
+ hi def link vimStatement	Statement
+ hi def link vimStringCont	vimString
+ hi def link vimString	String
+ hi def link vimStringEnd	vimString
+ hi def link vimSubst1	vimSubst
+ hi def link vimSubstDelim	Delimiter
+ hi def link vimSubstFlags	Special
+ hi def link vimSubstSubstr	SpecialChar
+ hi def link vimSubstTwoBS	vimString
+ hi def link vimSubst	vimCommand
+ hi def link vimSynCaseError	Error
+ hi def link vimSynCase	Type
+ hi def link vimSyncC	Type
+ hi def link vimSyncError	Error
+ hi def link vimSyncGroupName	vimGroupName
+ hi def link vimSyncGroup	vimGroupName
+ hi def link vimSyncKey	Type
+ hi def link vimSyncNone	Type
+ hi def link vimSynContains	vimSynOption
+ hi def link vimSynError	Error
+ hi def link vimSynKeyContainedin	vimSynContains
+ hi def link vimSynKeyOpt	vimSynOption
+ hi def link vimSynMtchGrp	vimSynOption
+ hi def link vimSynMtchOpt	vimSynOption
+ hi def link vimSynNextgroup	vimSynOption
+ hi def link vimSynNotPatRange	vimSynRegPat
+ hi def link vimSynOption	Special
+ hi def link vimSynPatRange	vimString
+ hi def link vimSynRegOpt	vimSynOption
+ hi def link vimSynRegPat	vimString
+ hi def link vimSynReg	Type
+ hi def link vimSyntax	vimCommand
+ hi def link vimSynType	vimSpecial
+ hi def link vimTodo	Todo
+ hi def link vimUnmap	vimMap
+ hi def link vimUserAttrbCmpltFunc	Special
+ hi def link vimUserAttrbCmplt	vimSpecial
+ hi def link vimUserAttrbKey	vimOption
+ hi def link vimUserAttrb	vimSpecial
+ hi def link vimUserAttrbError	Error
+ hi def link vimUserCmdError	Error
+ hi def link vimUserCommand	vimCommand
+ hi def link vimUserFunc	Normal
+ hi def link vimVar	Identifier
+ hi def link vimWarn	WarningMsg
+endif
+
+" Current Syntax Variable: {{{2
+let b:current_syntax = "vim"
+
+" ---------------------------------------------------------------------
+" Cleanup: {{{1
+delc VimFolda
+delc VimFoldf
+delc VimFoldl
+delc VimFoldm
+delc VimFoldp
+delc VimFoldP
+delc VimFoldr
+delc VimFoldt
+let &cpo = s:keepcpo
+unlet s:keepcpo
+" vim:ts=18  fdm=marker
+
+endif
diff --git a/syntax/viminfo.vim b/syntax/viminfo.vim
new file mode 100644
index 000000000..ca37f9e53
--- /dev/null
+++ b/syntax/viminfo.vim
@@ -0,0 +1,52 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'viminfo') == -1
+
+" Vim syntax file
+" Language:	Vim .viminfo file
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2016 Jun 05
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" The lines that are NOT recognized
+syn match viminfoError "^[^\t].*"
+
+" The one-character one-liners that are recognized
+syn match viminfoStatement "^[/&$@:?=%!<]"
+
+" The two-character one-liners that are recognized
+syn match viminfoStatement "^[-'>"]."
+syn match viminfoStatement +^"".+
+syn match viminfoStatement "^\~[/&]"
+syn match viminfoStatement "^\~[hH]"
+syn match viminfoStatement "^\~[mM][sS][lL][eE]\d\+\~\=[/&]"
+
+syn match viminfoOption "^\*.*=" contains=viminfoOptionName
+syn match viminfoOptionName "\*\a*"ms=s+1 contained
+
+" Comments
+syn match viminfoComment "^#.*"
+
+" New style lines.  TODO: highlight numbers and strings.
+syn match viminfoNew "^|.*"
+
+" Define the default highlighting.
+" Only used when an item doesn't have highlighting yet
+hi def link viminfoComment	Comment
+hi def link viminfoError	Error
+hi def link viminfoStatement	Statement
+hi def link viminfoNew		String
+
+let b:current_syntax = "viminfo"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8 sw=2
+
+endif
diff --git a/syntax/voscm.vim b/syntax/voscm.vim
new file mode 100644
index 000000000..cd883f6fc
--- /dev/null
+++ b/syntax/voscm.vim
@@ -0,0 +1,98 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'voscm') == -1
+
+" Vim syntax file
+" Language:	VOS CM macro
+" Maintainer:	Andrew McGill andrewm at lunch.za.net
+" Last Change:	Apr 06, 2007
+" Version:	1
+" URL:	http://lunch.za.net/
+"
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+" set iskeyword=48-57,_,a-z,A-Z
+
+syn match   voscmStatement     "^!"
+syn match voscmStatement	"&\(label\|begin_parameters\|end_parameters\|goto\|attach_input\|break\|continue\|control\|detach_input\|display_line\|display_line_partial\|echo\|eof\|eval\|if\|mode\|return\|while\|set\|set_string\|then\|else\|do\|done\|end\)\>"
+syn match  voscmJump		"\(&label\|&goto\)  *"  nextgroup=voscmLabelId
+syn match   voscmLabelId	contained "\<[A-Za-z][A-Z_a-z0-9]* *$"
+syn match  voscmSetvar		"\(&set_string\|&set\)  *"  nextgroup=voscmVariable
+syn match voscmError            "\(&set_string\|&set\)  *&" 
+syn match   voscmVariable	contained "\<[A-Za-z][A-Z_a-z0-9]\+\>"
+syn keyword voscmParamKeyword   contained number req string switch allow byte disable_input hidden length longword max min no_abbrev output_path req required req_for_form word 
+syn region  voscmParamList	matchgroup=voscmParam start="&begin_parameters" end="&end_parameters" contains=voscmParamKeyword,voscmString,voscmParamName,voscmParamId
+syn match   voscmParamName	contained "\(^\s*[A-Za-z_0-9]\+\s\+\)\@<=\k\+"
+syn match   voscmParamId	contained "\(^\s*\)\@<=\k\+"
+syn region par1 matchgroup=par1 start=/(/ end=/)/ contains=voscmFunction,voscmIdentifier,voscmString transparent
+" FIXME: functions should only be allowed after a bracket ... ie  (ask ...):
+syn keyword voscmFunction     contained abs access after ask before break byte calc ceil command_status concat
+syn keyword voscmFunction     contained contents path_name copy count current_dir current_module date date_time
+syn keyword voscmFunction     contained decimal directory_name end_of_file exists file_info floor given group_name
+syn keyword voscmFunction     contained has_access hexadecimal home_dir index iso_date iso_date_time language_name
+syn keyword voscmFunction     contained length lock_type locked ltrim master_disk max message min mod module_info
+syn keyword voscmFunction     contained module_name object_name online path_name person_name process_dir process_info
+syn keyword voscmFunction     contained process_type quote rank referencing_dir reverse rtrim search
+syn keyword voscmFunction     contained software_purchased string substitute substr system_name terminal_info
+syn keyword voscmFunction     contained terminal_name time translate trunc unique_string unquote user_name verify
+syn keyword voscmFunction     contained where_path
+syn keyword voscmTodo contained	TODO FIXME XXX DEBUG NOTE
+syn match voscmTab              "\t\+"
+
+syn keyword voscmCommand        add_entry_names add_library_path add_profile analyze_pc_samples attach_default_output attach_port batch bind break_process c c_preprocess call_thru cancel_batch_requests cancel_device_reservation cancel_print_requests cc change_current_dir check_posix cobol comment_on_manual compare_dirs compare_files convert_text_file copy_dir copy_file copy_tape cpp create_data_object create_deleted_record_index create_dir create_file create_index create_record_index create_tape_volumes cvt_fixed_to_stream cvt_stream_to_fixed debug delete_dir delete_file delete_index delete_library_path detach_default_output detach_port dismount_tape display display_access display_access_list display_batch_status display_current_dir display_current_module display_date_time display_default_access_list display_device_info display_dir_status display_disk_info display_disk_usage display_error display_file display_file_status display_line display_notices display_object_module_info display_print_defaults display_print_status display_program_module display_system_usage display_tape_params display_terminal_parameters dump_file dump_record dump_tape edit edit_form emacs enforce_region_locks fortran get_external_variable give_access give_default_access handle_sig_dfl harvest_pc_samples help kill line_edit link link_dirs list list_batch_requests list_devices list_gateways list_library_paths list_modules list_port_attachments list_print_requests list_process_cmd_limits list_save_tape list_systems list_tape list_terminal_types list_users locate_files locate_large_files login logout mount_tape move_device_reservation move_dir move_file mp_debug nls_edit_form pascal pl1 position_tape preprocess_file print profile propagate_access read_tape ready remove_access remove_default_access rename reserve_device restore_object save_object send_message set set_cpu_time_limit set_expiration_date set_external_variable set_file_allocation set_implicit_locking set_index_flags set_language set_library_paths set_line_wrap_width set_log_protected_file set_owner_access set_pipe_file set_priority set_ready set_safety_switch set_second_tape set_tape_drive_params set_tape_file_params set_tape_mount_params set_terminal_parameters set_text_file set_time_zone sleep sort start_logging start_process stop_logging stop_process tail_file text_data_merge translate_links truncate_file unlink update_batch_requests update_print_requests update_process_cmd_limits use_abbreviations use_message_file vcc verify_posix_access verify_save verify_system_access walk_dir where_command where_path who_locked write_tape 
+
+syn match voscmIdentifier	"&[A-Za-z][a-z0-9_A-Z]*&"
+
+syn match voscmString		"'[^']*'"
+
+" Number formats
+syn match voscmNumber		"\<\d\+\>"
+"Floating point number part only
+syn match voscmDecimalNumber	"\.\d\+\([eE][-+]\=\d\)\=\>"
+
+"syn region voscmComment	start="^[ 	]*&[ 	]+"	end="$"
+"syn match voscmComment		"^[ 	]*&[ 	].*$"
+"syn match voscmComment		"^&$"
+syn region voscmComment		start="^[ 	]*&[ 	]" end="$" contains=voscmTodo
+syn match voscmComment		"^&$"
+syn match voscmContinuation	"&+$"
+
+"syn match  voscmIdentifier	"[A-Za-z0-9&._-]\+"
+
+"Synchronization with Statement terminator $
+" syn sync maxlines=100
+
+hi def link voscmConditional	Conditional
+hi def link voscmStatement	Statement
+hi def link voscmSetvar         Statement
+hi def link voscmNumber         Number
+hi def link voscmDecimalNumber	Float
+hi def link voscmString         String
+hi def link voscmIdentifier	Identifier
+hi def link voscmVariable	Identifier
+hi def link voscmComment	Comment
+hi def link voscmJump	        Statement
+hi def link voscmContinuation	Macro
+hi def link voscmLabelId	String
+hi def link voscmParamList	NONE
+hi def link voscmParamId	Identifier
+hi def link voscmParamName	String
+hi def link voscmParam	        Statement
+hi def link voscmParamKeyword	Statement
+hi def link voscmFunction	Function
+hi def link voscmCommand	Structure
+"hi def link voscmIdentifier	NONE
+"hi def link voscmSpecial	Special   " not used 
+hi def link voscmTodo           Todo
+hi def link voscmTab          	Error
+hi def link voscmError         	Error
+
+let b:current_syntax = "voscm"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/vrml.vim b/syntax/vrml.vim
new file mode 100644
index 000000000..0ee66705e
--- /dev/null
+++ b/syntax/vrml.vim
@@ -0,0 +1,226 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vrml') == -1
+
+" Vim syntax file
+" Language:	   VRML97
+" Modified from:   VRML 1.0C by David Brown <dbrown@cgs.c4.gmeds.com>
+" Maintainer:	   vacancy!
+" Former Maintainer:    Gregory Seidman <gsslist+vim@anthropohedron.net>
+" Last change:	   2006 May 03
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" keyword definitions
+
+syn keyword VRMLFields	       ambientIntensity appearance attenuation
+syn keyword VRMLFields	       autoOffset avatarSize axisOfRotation backUrl
+syn keyword VRMLFields	       bboxCenter bboxSize beamWidth beginCap
+syn keyword VRMLFields	       bottom bottomRadius bottomUrl ccw center
+syn keyword VRMLFields	       children choice collide color colorIndex
+syn keyword VRMLFields	       colorPerVertex convex coord coordIndex
+syn keyword VRMLFields	       creaseAngle crossSection cutOffAngle
+syn keyword VRMLFields	       cycleInterval description diffuseColor
+syn keyword VRMLFields	       directOutput direction diskAngle
+syn keyword VRMLFields	       emissiveColor enabled endCap family
+syn keyword VRMLFields	       fieldOfView fogType fontStyle frontUrl
+syn keyword VRMLFields	       geometry groundAngle groundColor headlight
+syn keyword VRMLFields	       height horizontal info intensity jump
+syn keyword VRMLFields	       justify key keyValue language leftToRight
+syn keyword VRMLFields	       leftUrl length level location loop material
+syn keyword VRMLFields	       maxAngle maxBack maxExtent maxFront
+syn keyword VRMLFields	       maxPosition minAngle minBack minFront
+syn keyword VRMLFields	       minPosition mustEvaluate normal normalIndex
+syn keyword VRMLFields	       normalPerVertex offset on orientation
+syn keyword VRMLFields	       parameter pitch point position priority
+syn keyword VRMLFields	       proxy radius range repeatS repeatT rightUrl
+syn keyword VRMLFields	       rotation scale scaleOrientation shininess
+syn keyword VRMLFields	       side size skyAngle skyColor solid source
+syn keyword VRMLFields	       spacing spatialize specularColor speed spine
+syn keyword VRMLFields	       startTime stopTime string style texCoord
+syn keyword VRMLFields	       texCoordIndex texture textureTransform title
+syn keyword VRMLFields	       top topToBottom topUrl translation
+syn keyword VRMLFields	       transparency type url vector visibilityLimit
+syn keyword VRMLFields	       visibilityRange whichChoice xDimension
+syn keyword VRMLFields	       xSpacing zDimension zSpacing
+syn match   VRMLFields	       "\<[A-Za-z_][A-Za-z0-9_]*\>" contains=VRMLComment,VRMLProtos,VRMLfTypes
+" syn match   VRMLFields	 "\<[A-Za-z_][A-Za-z0-9_]*\>\(,\|\s\)*\(#.*$\)*\<IS\>\(#.*$\)*\(,\|\s\)*\<[A-Za-z_][A-Za-z0-9_]*\>\(,\|\s\)*\(#.*$\)*" contains=VRMLComment,VRMLProtos
+" syn region  VRMLFields	 start="\<[A-Za-z_][A-Za-z0-9_]*\>" end=+\(,\|#\|\s\)+me=e-1 contains=VRMLComment,VRMLProtos
+
+syn keyword VRMLEvents	       addChildren ambientIntensity_changed
+syn keyword VRMLEvents	       appearance_changed attenuation_changed
+syn keyword VRMLEvents	       autoOffset_changed avatarSize_changed
+syn keyword VRMLEvents	       axisOfRotation_changed backUrl_changed
+syn keyword VRMLEvents	       beamWidth_changed bindTime bottomUrl_changed
+syn keyword VRMLEvents	       center_changed children_changed
+syn keyword VRMLEvents	       choice_changed collideTime collide_changed
+syn keyword VRMLEvents	       color_changed coord_changed
+syn keyword VRMLEvents	       cutOffAngle_changed cycleInterval_changed
+syn keyword VRMLEvents	       cycleTime description_changed
+syn keyword VRMLEvents	       diffuseColor_changed direction_changed
+syn keyword VRMLEvents	       diskAngle_changed duration_changed
+syn keyword VRMLEvents	       emissiveColor_changed enabled_changed
+syn keyword VRMLEvents	       enterTime exitTime fogType_changed
+syn keyword VRMLEvents	       fontStyle_changed fraction_changed
+syn keyword VRMLEvents	       frontUrl_changed geometry_changed
+syn keyword VRMLEvents	       groundAngle_changed headlight_changed
+syn keyword VRMLEvents	       hitNormal_changed hitPoint_changed
+syn keyword VRMLEvents	       hitTexCoord_changed intensity_changed
+syn keyword VRMLEvents	       isActive isBound isOver jump_changed
+syn keyword VRMLEvents	       keyValue_changed key_changed leftUrl_changed
+syn keyword VRMLEvents	       length_changed level_changed
+syn keyword VRMLEvents	       location_changed loop_changed
+syn keyword VRMLEvents	       material_changed maxAngle_changed
+syn keyword VRMLEvents	       maxBack_changed maxExtent_changed
+syn keyword VRMLEvents	       maxFront_changed maxPosition_changed
+syn keyword VRMLEvents	       minAngle_changed minBack_changed
+syn keyword VRMLEvents	       minFront_changed minPosition_changed
+syn keyword VRMLEvents	       normal_changed offset_changed on_changed
+syn keyword VRMLEvents	       orientation_changed parameter_changed
+syn keyword VRMLEvents	       pitch_changed point_changed position_changed
+syn keyword VRMLEvents	       priority_changed radius_changed
+syn keyword VRMLEvents	       removeChildren rightUrl_changed
+syn keyword VRMLEvents	       rotation_changed scaleOrientation_changed
+syn keyword VRMLEvents	       scale_changed set_ambientIntensity
+syn keyword VRMLEvents	       set_appearance set_attenuation
+syn keyword VRMLEvents	       set_autoOffset set_avatarSize
+syn keyword VRMLEvents	       set_axisOfRotation set_backUrl set_beamWidth
+syn keyword VRMLEvents	       set_bind set_bottomUrl set_center
+syn keyword VRMLEvents	       set_children set_choice set_collide
+syn keyword VRMLEvents	       set_color set_colorIndex set_coord
+syn keyword VRMLEvents	       set_coordIndex set_crossSection
+syn keyword VRMLEvents	       set_cutOffAngle set_cycleInterval
+syn keyword VRMLEvents	       set_description set_diffuseColor
+syn keyword VRMLEvents	       set_direction set_diskAngle
+syn keyword VRMLEvents	       set_emissiveColor set_enabled set_fogType
+syn keyword VRMLEvents	       set_fontStyle set_fraction set_frontUrl
+syn keyword VRMLEvents	       set_geometry set_groundAngle set_headlight
+syn keyword VRMLEvents	       set_height set_intensity set_jump set_key
+syn keyword VRMLEvents	       set_keyValue set_leftUrl set_length
+syn keyword VRMLEvents	       set_level set_location set_loop set_material
+syn keyword VRMLEvents	       set_maxAngle set_maxBack set_maxExtent
+syn keyword VRMLEvents	       set_maxFront set_maxPosition set_minAngle
+syn keyword VRMLEvents	       set_minBack set_minFront set_minPosition
+syn keyword VRMLEvents	       set_normal set_normalIndex set_offset set_on
+syn keyword VRMLEvents	       set_orientation set_parameter set_pitch
+syn keyword VRMLEvents	       set_point set_position set_priority
+syn keyword VRMLEvents	       set_radius set_rightUrl set_rotation
+syn keyword VRMLEvents	       set_scale set_scaleOrientation set_shininess
+syn keyword VRMLEvents	       set_size set_skyAngle set_skyColor
+syn keyword VRMLEvents	       set_source set_specularColor set_speed
+syn keyword VRMLEvents	       set_spine set_startTime set_stopTime
+syn keyword VRMLEvents	       set_string set_texCoord set_texCoordIndex
+syn keyword VRMLEvents	       set_texture set_textureTransform set_topUrl
+syn keyword VRMLEvents	       set_translation set_transparency set_type
+syn keyword VRMLEvents	       set_url set_vector set_visibilityLimit
+syn keyword VRMLEvents	       set_visibilityRange set_whichChoice
+syn keyword VRMLEvents	       shininess_changed size_changed
+syn keyword VRMLEvents	       skyAngle_changed skyColor_changed
+syn keyword VRMLEvents	       source_changed specularColor_changed
+syn keyword VRMLEvents	       speed_changed startTime_changed
+syn keyword VRMLEvents	       stopTime_changed string_changed
+syn keyword VRMLEvents	       texCoord_changed textureTransform_changed
+syn keyword VRMLEvents	       texture_changed time topUrl_changed
+syn keyword VRMLEvents	       touchTime trackPoint_changed
+syn keyword VRMLEvents	       translation_changed transparency_changed
+syn keyword VRMLEvents	       type_changed url_changed value_changed
+syn keyword VRMLEvents	       vector_changed visibilityLimit_changed
+syn keyword VRMLEvents	       visibilityRange_changed whichChoice_changed
+syn region  VRMLEvents	       start="\S+[^0-9]+\.[A-Za-z_]+"ms=s+1 end="\(,\|$\|\s\)"me=e-1
+
+syn keyword VRMLNodes	       Anchor Appearance AudioClip Background
+syn keyword VRMLNodes	       Billboard Box Collision Color
+syn keyword VRMLNodes	       ColorInterpolator Cone Coordinate
+syn keyword VRMLNodes	       CoordinateInterpolator Cylinder
+syn keyword VRMLNodes	       CylinderSensor DirectionalLight
+syn keyword VRMLNodes	       ElevationGrid Extrusion Fog FontStyle
+syn keyword VRMLNodes	       Group ImageTexture IndexedFaceSet
+syn keyword VRMLNodes	       IndexedLineSet Inline LOD Material
+syn keyword VRMLNodes	       MovieTexture NavigationInfo Normal
+syn keyword VRMLNodes	       NormalInterpolator OrientationInterpolator
+syn keyword VRMLNodes	       PixelTexture PlaneSensor PointLight
+syn keyword VRMLNodes	       PointSet PositionInterpolator
+syn keyword VRMLNodes	       ProximitySensor ScalarInterpolator
+syn keyword VRMLNodes	       Script Shape Sound Sphere SphereSensor
+syn keyword VRMLNodes	       SpotLight Switch Text TextureCoordinate
+syn keyword VRMLNodes	       TextureTransform TimeSensor TouchSensor
+syn keyword VRMLNodes	       Transform Viewpoint VisibilitySensor
+syn keyword VRMLNodes	       WorldInfo
+
+" the following line doesn't catch <node><newline><openbrace> since \n
+" doesn't match as an atom yet :-(
+syn match   VRMLNodes	       "[A-Za-z_][A-Za-z0-9_]*\(,\|\s\)*{"me=e-1
+syn region  VRMLNodes	       start="\<EXTERNPROTO\>\(,\|\s\)*[A-Za-z_]"ms=e start="\<EXTERNPROTO\>\(,\|\s\)*" end="[\s]*\["me=e-1 contains=VRMLProtos,VRMLComment
+syn region  VRMLNodes	       start="PROTO\>\(,\|\s\)*[A-Za-z_]"ms=e start="PROTO\>\(,\|\s\)*" end="[\s]*\["me=e-1 contains=VRMLProtos,VRMLComment
+
+syn keyword VRMLTypes	       SFBool SFColor MFColor SFFloat MFFloat
+syn keyword VRMLTypes	       SFImage SFInt32 MFInt32 SFNode MFNode
+syn keyword VRMLTypes	       SFRotation MFRotation SFString MFString
+syn keyword VRMLTypes	       SFTime MFTime SFVec2f MFVec2f SFVec3f MFVec3f
+
+syn keyword VRMLfTypes	       field exposedField eventIn eventOut
+
+syn keyword VRMLValues	       TRUE FALSE NULL
+
+syn keyword VRMLProtos	       contained EXTERNPROTO PROTO IS
+
+syn keyword VRMLRoutes	       contained ROUTE TO
+
+"containment!
+syn include @jscript $VIMRUNTIME/syntax/javascript.vim
+syn region VRMLjScriptString contained start=+"\(\(javascript\)\|\(vrmlscript\)\|\(ecmascript\)\):+ms=e+1 skip=+\\\\\|\\"+ end=+"+me=e-1 contains=@jscript
+
+" match definitions.
+syn match   VRMLSpecial		  contained "\\[0-9][0-9][0-9]\|\\."
+syn region  VRMLString		  start=+"+  skip=+\\\\\|\\"+  end=+"+	contains=VRMLSpecial,VRMLjScriptString
+syn match   VRMLCharacter	  "'[^\\]'"
+syn match   VRMLSpecialCharacter  "'\\.'"
+syn match   VRMLNumber		  "[-+]\=\<[0-9]\+\(\.[0-9]\+\)\=\([eE]\{1}[-+]\=[0-9]\+\)\=\>\|0[xX][0-9a-fA-F]\+\>"
+syn match   VRMLNumber		  "0[xX][0-9a-fA-F]\+\>"
+syn match   VRMLComment		  "#.*$"
+
+" newlines should count as whitespace, but they can't be matched yet :-(
+syn region  VRMLRouteNode	  start="[^O]TO\(,\|\s\)*" end="\."me=e-1 contains=VRMLRoutes,VRMLComment
+syn region  VRMLRouteNode	  start="ROUTE\(,\|\s\)*" end="\."me=e-1 contains=VRMLRoutes,VRMLComment
+syn region  VRMLInstName	  start="DEF\>"hs=e+1 skip="DEF\(,\|\s\)*" end="[A-Za-z0-9_]\(\s\|$\|,\)"me=e contains=VRMLInstances,VRMLComment
+syn region  VRMLInstName	  start="USE\>"hs=e+1 skip="USE\(,\|\s\)*" end="[A-Za-z0-9_]\(\s\|$\|,\)"me=e contains=VRMLInstances,VRMLComment
+
+syn keyword VRMLInstances      contained DEF USE
+syn sync minlines=1
+
+"FOLDS!
+syn sync fromstart
+"setlocal foldmethod=syntax
+syn region braceFold start="{" end="}" transparent fold contains=TOP
+syn region bracketFold start="\[" end="]" transparent fold contains=TOP
+syn region VRMLString start=+"+ skip=+\\\\\|\\"+ end=+"+ fold contains=VRMLSpecial,VRMLjScriptString
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link VRMLCharacter  VRMLString
+hi def link VRMLSpecialCharacter VRMLSpecial
+hi def link VRMLNumber     VRMLString
+hi def link VRMLValues     VRMLString
+hi def link VRMLString     String
+hi def link VRMLSpecial    Special
+hi def link VRMLComment    Comment
+hi def link VRMLNodes      Statement
+hi def link VRMLFields     Type
+hi def link VRMLEvents     Type
+hi def link VRMLfTypes     LineNr
+"  hi     VRMLfTypes     ctermfg=6 guifg=Brown
+hi def link VRMLInstances  PreCondit
+hi def link VRMLRoutes     PreCondit
+hi def link VRMLProtos     PreProc
+hi def link VRMLRouteNode  Identifier
+hi def link VRMLInstName   Identifier
+hi def link VRMLTypes      Identifier
+
+
+let b:current_syntax = "vrml"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/vroom.vim b/syntax/vroom.vim
new file mode 100644
index 000000000..6d0a48497
--- /dev/null
+++ b/syntax/vroom.vim
@@ -0,0 +1,114 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vroom') == -1
+
+" Vim syntax file
+" Language:	Vroom (vim testing and executable documentation)
+" Maintainer:	David Barnett (https://github.com/google/vim-ft-vroom)
+" Last Change:	2014 Jul 23
+
+" quit when a syntax file was already loaded
+if exists('b:current_syntax')
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+
+syn include @vroomVim syntax/vim.vim
+syn include @vroomShell syntax/sh.vim
+
+syntax region vroomAction
+    \ matchgroup=vroomOutput
+    \ start='\m^  ' end='\m$' keepend
+    \ contains=vroomControlBlock
+
+syntax region vroomAction
+    \ matchgroup=vroomOutput
+    \ start='\m^  & ' end='\m$' keepend
+    \ contains=vroomControlBlock
+
+syntax match vroomOutput '\m^  &$'
+
+syntax region vroomMessageBody
+    \ matchgroup=vroomMessage
+    \ start='\m^  \~ ' end='\m$' keepend
+    \ contains=vroomControlBlock
+
+syntax region vroomColoredAction
+    \ matchgroup=vroomInput
+    \ start='\m^  > ' end='\m$' keepend
+    \ contains=vimNotation,vroomControlBlock
+syntax region vroomAction
+    \ matchgroup=vroomInput
+    \ start='\m^  % ' end='\m$' keepend
+    \ contains=vimNotation,vroomControlBlock
+
+syntax region vroomAction
+    \ matchgroup=vroomContinuation
+    \ start='\m^  |' end='\m$' keepend
+
+syntax region vroomAction
+    \ start='\m^  \ze:' end='\m$' keepend
+    \ contains=@vroomVim,vroomControlBlock
+
+syntax region vroomAction
+    \ matchgroup=vroomDirective
+    \ start='\m^  @\i\+' end='\m$' keepend
+    \ contains=vroomControlBlock
+
+syntax region vroomSystemAction
+    \ matchgroup=vroomSystem
+    \ start='\m^  ! ' end='\m$' keepend
+    \ contains=@vroomShell,vroomControlBlock
+
+syntax region vroomHijackAction
+    \ matchgroup=vroomHijack
+    \ start='\m^  \$ ' end='\m$' keepend
+    \ contains=vroomControlBlock
+
+syntax match vroomControlBlock contains=vroomControlEscape,@vroomControls
+    \ '\v \([^&()][^()]*\)$'
+
+syntax match vroomControlEscape '\m&' contained
+
+syntax cluster vroomControls
+    \ contains=vroomDelay,vroomMode,vroomBuffer,vroomRange
+    \,vroomChannel,vroomBind,vroomStrictness
+syntax match vroomRange '\v\.(,\+?(\d+|\$)?)?' contained
+syntax match vroomRange '\v\d*,\+?(\d+|\$)?' contained
+syntax match vroomBuffer '\v\d+,@!' contained
+syntax match vroomDelay '\v\d+(\.\d+)?s' contained
+syntax match vroomMode '\v<%(regex|glob|verbatim)' contained
+syntax match vroomChannel '\v<%(stderr|stdout|command|status)>' contained
+syntax match vroomBind '\v<bind>' contained
+syntax match vroomStrictness '\v\<%(STRICT|RELAXED|GUESS-ERRORS)\>' contained
+
+highlight default link vroomInput Identifier
+highlight default link vroomDirective vroomInput
+highlight default link vroomControlBlock vroomInput
+highlight default link vroomSystem vroomInput
+highlight default link vroomOutput Statement
+highlight default link vroomContinuation Constant
+highlight default link vroomHijack Special
+highlight default link vroomColoredAction Statement
+highlight default link vroomSystemAction vroomSystem
+highlight default link vroomHijackAction vroomHijack
+highlight default link vroomMessage vroomOutput
+highlight default link vroomMessageBody Constant
+
+highlight default link vroomControlEscape Special
+highlight default link vroomBuffer vroomInput
+highlight default link vroomRange Include
+highlight default link vroomMode Constant
+highlight default link vroomDelay Type
+highlight default link vroomStrictness vroomMode
+highlight default link vroomChannel vroomMode
+highlight default link vroomBind vroomMode
+
+let b:current_syntax = 'vroom'
+
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/wast.vim b/syntax/wast.vim
new file mode 100644
index 000000000..d0b81718e
--- /dev/null
+++ b/syntax/wast.vim
@@ -0,0 +1,88 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wast') == -1
+
+" Vim syntax file
+" Language:     WebAssembly
+" Maintainer:   rhysd <lin90162@yahoo.co.jp>
+" Last Change:  Jul 29, 2018
+" For bugs, patches and license go to https://github.com/rhysd/vim-wasm
+
+if exists("b:current_syntax")
+    finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn cluster wastCluster       contains=wastModule,wastInstWithType,wastInstGeneral,wastParamInst,wastControlInst,wastString,wastNamedVar,wastUnnamedVar,wastFloat,wastNumber,wastComment,wastList,wastType
+
+" Instructions
+" https://webassembly.github.io/spec/core/text/instructions.html
+" Note: memarg (align=,offset=) can be added to memory instructions
+syn match   wastInstWithType  "\%((\s*\)\@<=\<\%(i32\|i64\|f32\|f64\|memory\)\.[[:alnum:]_]\+\%(/\%(i32\|i64\|f32\|f64\)\)\=\>\%(\s\+\%(align\|offset\)=\)\=" contained display
+syn match   wastInstGeneral   "\%((\s*\)\@<=\<[[:alnum:]_]\+\>" contained display
+" https://webassembly.github.io/spec/core/text/instructions.html#control-instructions
+syn match   wastControlInst   "\%((\s*\)\@<=\<\%(block\|end\|loop\|if\|else\|unreachable\|nop\|br\|br_if\|br_table\|return\|call\|call_indirect\)\>" contained display
+" https://webassembly.github.io/spec/core/text/instructions.html#parametric-instructions
+syn match   wastParamInst     "\%((\s*\)\@<=\<\%(drop\|select\)\>" contained display
+
+" Identifiers
+" https://webassembly.github.io/spec/core/text/values.html#text-id
+syn match   wastNamedVar      "$\+[[:alnum:]!#$%&'∗./:=><?@\\^_`~+-]*" contained display
+syn match   wastUnnamedVar    "$\+\d\+[[:alnum:]!#$%&'∗./:=><?@\\^_`~+-]\@!" contained display
+
+" String literals
+" https://webassembly.github.io/spec/core/text/values.html#strings
+syn region  wastString        start=+"+ skip=+\\\\\|\\"+ end=+"+ contained contains=wastStringSpecial
+syn match   wastStringSpecial "\\\x\x\|\\[tnr'\\\"]\|\\u\x\+" contained containedin=wastString
+
+" Float literals
+" https://webassembly.github.io/spec/core/text/values.html#floating-point
+syn match   wastFloat         "\<-\=\d\%(_\=\d\)*\%(\.\d\%(_\=\d\)*\)\=\%([eE][-+]\=\d\%(_\=\d\)*\)\=" display contained
+syn match   wastFloat         "\<-\=0x\x\%(_\=\d\)*\%(\.\x\%(_\=\x\)*\)\=\%([pP][-+]\=\d\%(_\=\d\)*\)\=" display contained
+syn keyword wastFloat         inf nan contained
+
+" Integer literals
+" https://webassembly.github.io/spec/core/text/values.html#integers
+syn match   wastNumber        "\<-\=\d\%(_\=\d\)*\>" display contained
+syn match   wastNumber        "\<-\=0x\x\%(_\=\x\)*\>" display contained
+
+" Comments
+" https://webassembly.github.io/spec/core/text/lexical.html#comments
+syn region  wastComment       start=";;" end="$" display
+syn region  wastComment       start="(;;\@!" end=";)"
+
+syn region  wastList          matchgroup=wastListDelimiter start="(;\@!" matchgroup=wastListDelimiter end=";\@<!)" contains=@wastCluster
+
+" Types
+" https://webassembly.github.io/spec/core/text/types.html
+syn keyword wastType          i64 i32 f64 f32 param result anyfunc mut contained
+syn match   wastType          "\%((\_s*\)\@<=func\%(\_s*[()]\)\@=" display contained
+
+" Modules
+" https://webassembly.github.io/spec/core/text/modules.html
+syn keyword wastModule        module type export import table memory global data elem contained
+syn match   wastModule        "\%((\_s*\)\@<=func\%(\_s\+\$\)\@=" display contained
+
+syn sync lines=100
+
+hi def link wastModule        PreProc
+hi def link wastListDelimiter Delimiter
+hi def link wastInstWithType  Operator
+hi def link wastInstGeneral   Operator
+hi def link wastControlInst   Statement
+hi def link wastParamInst     Conditional
+hi def link wastString        String
+hi def link wastStringSpecial Special
+hi def link wastNamedVar      Identifier
+hi def link wastUnnamedVar    PreProc
+hi def link wastFloat         Float
+hi def link wastNumber        Number
+hi def link wastComment       Comment
+hi def link wastType          Type
+
+let b:current_syntax = "wast"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/webmacro.vim b/syntax/webmacro.vim
new file mode 100644
index 000000000..a5986b2ed
--- /dev/null
+++ b/syntax/webmacro.vim
@@ -0,0 +1,71 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'webmacro') == -1
+
+" WebMacro syntax file
+" Language:     WebMacro
+" Maintainer:   Claudio Fleiner <claudio@fleiner.com>
+" URL:		http://www.fleiner.com/vim/syntax/webmacro.vim
+" Last Change:  2003 May 11
+
+" webmacro is a nice little language that you should
+" check out if you use java servlets.
+" webmacro: http://www.webmacro.org
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if !exists("main_syntax")
+  " quit when a syntax file was already loaded
+  if exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax = 'webmacro'
+endif
+
+
+runtime! syntax/html.vim
+unlet b:current_syntax
+
+syn cluster htmlPreProc add=webmacroIf,webmacroUse,webmacroBraces,webmacroParse,webmacroInclude,webmacroSet,webmacroForeach,webmacroComment
+
+syn match webmacroVariable "\$[a-zA-Z0-9.()]*;\="
+syn match webmacroNumber "[-+]\=\d\+[lL]\=" contained
+syn keyword webmacroBoolean true false contained
+syn match webmacroSpecial "\\." contained
+syn region  webmacroString   contained start=+"+ end=+"+ contains=webmacroSpecial,webmacroVariable
+syn region  webmacroString   contained start=+'+ end=+'+ contains=webmacroSpecial,webmacroVariable
+syn region webmacroList contained matchgroup=Structure start="\[" matchgroup=Structure end="\]" contains=webmacroString,webmacroVariable,webmacroNumber,webmacroBoolean,webmacroList
+
+syn region webmacroIf start="#if" start="#else" end="{"me=e-1 contains=webmacroVariable,webmacroNumber,webmacroString,webmacroBoolean,webmacroList nextgroup=webmacroBraces
+syn region webmacroForeach start="#foreach" end="{"me=e-1 contains=webmacroVariable,webmacroNumber,webmacroString,webmacroBoolean,webmacroList nextgroup=webmacroBraces
+syn match webmacroSet "#set .*$" contains=webmacroVariable,webmacroNumber,webmacroNumber,webmacroBoolean,webmacroString,webmacroList
+syn match webmacroInclude "#include .*$" contains=webmacroVariable,webmacroNumber,webmacroNumber,webmacroBoolean,webmacroString,webmacroList
+syn match webmacroParse "#parse .*$" contains=webmacroVariable,webmacroNumber,webmacroNumber,webmacroBoolean,webmacroString,webmacroList
+syn region webmacroUse matchgroup=PreProc start="#use .*" matchgroup=PreProc end="^-.*" contains=webmacroHash,@HtmlTop
+syn region webmacroBraces matchgroup=Structure start="{" matchgroup=Structure end="}" contained transparent
+syn match webmacroBracesError "[{}]"
+syn match webmacroComment "##.*$"
+syn match webmacroHash "[#{}\$]" contained
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link webmacroComment CommentTitle
+hi def link webmacroVariable PreProc
+hi def link webmacroIf webmacroStatement
+hi def link webmacroForeach webmacroStatement
+hi def link webmacroSet webmacroStatement
+hi def link webmacroInclude webmacroStatement
+hi def link webmacroParse webmacroStatement
+hi def link webmacroStatement Function
+hi def link webmacroNumber Number
+hi def link webmacroBoolean Boolean
+hi def link webmacroSpecial Special
+hi def link webmacroString String
+hi def link webmacroBracesError Error
+
+let b:current_syntax = "webmacro"
+
+if main_syntax == 'webmacro'
+  unlet main_syntax
+endif
+
+endif
diff --git a/syntax/wget.vim b/syntax/wget.vim
new file mode 100644
index 000000000..62fafb2ae
--- /dev/null
+++ b/syntax/wget.vim
@@ -0,0 +1,193 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wget') == -1
+
+" Vim syntax file
+" Language:     Wget configuration file (/etc/wgetrc ~/.wgetrc)
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2013 Jun 1
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn match wgetComment "#.*$" contains=wgetTodo contained
+
+syn keyword wgetTodo TODO NOTE FIXME XXX contained
+
+syn region wgetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contained oneline
+syn region wgetString start=+'+ skip=+\\\\\|\\'+ end=+'+ contained oneline
+
+syn case ignore
+syn keyword wgetBoolean on off contained
+syn keyword wgetNumber  inf    contained
+syn case match
+
+syn match wgetNumber "\<\%(\d\+\|inf\)\>" contained
+syn match wgetQuota  "\<\d\+[kKmM]\>"     contained
+syn match wgetTime   "\<\d\+[smhdw]\>"    contained
+
+"{{{ Commands
+let s:commands = map([
+        \ "accept",
+	\ "add_hostdir",
+	\ "adjust_extension",
+	\ "always_rest",
+	\ "ask_password",
+	\ "auth_no_challenge",
+	\ "background",
+	\ "backup_converted",
+	\ "backups",
+	\ "base",
+	\ "bind_address",
+	\ "ca_certificate",
+	\ "ca_directory",
+	\ "cache",
+	\ "certificate",
+	\ "certificate_type",
+	\ "check_certificate",
+	\ "connect_timeout",
+	\ "content_disposition",
+	\ "continue",
+	\ "convert_links",
+	\ "cookies",
+	\ "cut_dirs",
+	\ "debug",
+	\ "default_page",
+	\ "delete_after",
+	\ "dns_cache",
+	\ "dns_timeout",
+	\ "dir_prefix",
+	\ "dir_struct",
+	\ "domains",
+	\ "dot_bytes",
+	\ "dots_in_line",
+	\ "dot_spacing",
+	\ "dot_style",
+	\ "egd_file",
+	\ "exclude_directories",
+	\ "exclude_domains",
+	\ "follow_ftp",
+	\ "follow_tags",
+	\ "force_html",
+	\ "ftp_passwd",
+	\ "ftp_password",
+	\ "ftp_user",
+	\ "ftp_proxy",
+	\ "glob",
+	\ "header",
+	\ "html_extension",
+	\ "htmlify",
+	\ "http_keep_alive",
+	\ "http_passwd",
+	\ "http_password",
+	\ "http_proxy",
+	\ "https_proxy",
+	\ "http_user",
+	\ "ignore_case",
+	\ "ignore_length",
+	\ "ignore_tags",
+	\ "include_directories",
+	\ "inet4_only",
+	\ "inet6_only",
+	\ "input",
+	\ "iri",
+	\ "keep_session_cookies",
+	\ "kill_longer",
+	\ "limit_rate",
+	\ "load_cookies",
+	\ "locale",
+	\ "local_encoding",
+	\ "logfile",
+	\ "login",
+	\ "max_redirect",
+	\ "mirror",
+	\ "netrc",
+	\ "no_clobber",
+	\ "no_parent",
+	\ "no_proxy",
+	\ "numtries",
+	\ "output_document",
+	\ "page_requisites",
+	\ "passive_ftp",
+	\ "passwd",
+	\ "password",
+	\ "post_data",
+	\ "post_file",
+	\ "prefer_family",
+	\ "preserve_permissions",
+	\ "private_key",
+	\ "private_key_type",
+	\ "progress",
+	\ "protocol_directories",
+	\ "proxy_passwd",
+	\ "proxy_password",
+	\ "proxy_user",
+	\ "quiet",
+	\ "quota",
+	\ "random_file",
+	\ "random_wait",
+	\ "read_timeout",
+	\ "reclevel",
+	\ "recursive",
+	\ "referer",
+	\ "reject",
+	\ "relative_only",
+	\ "remote_encoding",
+	\ "remove_listing",
+	\ "restrict_file_names",
+	\ "retr_symlinks",
+	\ "retry_connrefused",
+	\ "robots",
+	\ "save_cookies",
+	\ "save_headers",
+	\ "secure_protocol",
+	\ "server_response",
+	\ "show_all_dns_entries",
+	\ "simple_host_check",
+	\ "span_hosts",
+	\ "spider",
+	\ "strict_comments",
+	\ "sslcertfile",
+	\ "sslcertkey",
+	\ "timeout",
+	\ "time_stamping",
+	\ "use_server_timestamps",
+	\ "tries",
+	\ "trust_server_names",
+	\ "user",
+	\ "use_proxy",
+	\ "user_agent",
+	\ "verbose",
+	\ "wait",
+	\ "wait_retry"],
+	\ "substitute(v:val, '_', '[-_]\\\\=', 'g')")
+"}}}
+
+syn case ignore
+for cmd in s:commands
+  exe 'syn match wgetCommand "' . cmd . '" nextgroup=wgetAssignmentOperator skipwhite contained'
+endfor
+syn case match
+
+syn match wgetStart "^" nextgroup=wgetCommand,wgetComment skipwhite
+syn match wgetAssignmentOperator "=" nextgroup=wgetString,wgetBoolean,wgetNumber,wgetQuota,wgetTime skipwhite contained
+
+hi def link wgetAssignmentOperator Special
+hi def link wgetBoolean		   Boolean
+hi def link wgetCommand		   Identifier
+hi def link wgetComment		   Comment
+hi def link wgetNumber		   Number
+hi def link wgetQuota		   Number
+hi def link wgetString		   String
+hi def link wgetTodo		   Todo
+
+let b:current_syntax = "wget"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8 fdm=marker:
+
+endif
diff --git a/syntax/winbatch.vim b/syntax/winbatch.vim
new file mode 100644
index 000000000..d2494c8ca
--- /dev/null
+++ b/syntax/winbatch.vim
@@ -0,0 +1,178 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'winbatch') == -1
+
+" Vim syntax file
+" Language:	WinBatch/Webbatch (*.wbt, *.web)
+" Maintainer:	dominique@mggen.com
+" URL:		http://www.mggen.com/vim/syntax/winbatch.zip
+" Last change:	2001 May 10
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+syn keyword winbatchCtl	if then else endif break end return exit next
+syn keyword winbatchCtl while for gosub goto switch select to case
+syn keyword winbatchCtl endselect endwhile endselect endswitch
+
+" String
+syn region  winbatchVar		start=+%+  end=+%+
+" %var% in strings
+syn region  winbatchString	start=+"+  end=+"+ contains=winbatchVar
+
+syn match winbatchComment	";.*$"
+syn match winbatchLabel		"^\ *:[0-9a-zA-Z_\-]\+\>"
+
+" constant (bezgin by @)
+syn match winbatchConstant	"@[0_9a-zA-Z_\-]\+"
+
+" number
+syn match winbatchNumber	"\<[0-9]\+\(u\=l\=\|lu\|f\)\>"
+
+syn keyword winbatchImplicit aboveicons acc_attrib acc_chng_nt acc_control acc_create
+syn keyword winbatchImplicit acc_delete acc_full_95 acc_full_nt acc_list acc_pfull_nt
+syn keyword winbatchImplicit acc_pmang_nt acc_print_nt acc_read acc_read_95 acc_read_nt
+syn keyword winbatchImplicit acc_write amc arrange ascending attr_a attr_a attr_ci attr_ci
+syn keyword winbatchImplicit attr_dc attr_dc attr_di attr_di attr_dm attr_dm attr_h attr_h
+syn keyword winbatchImplicit attr_ic attr_ic attr_p attr_p attr_ri attr_ri attr_ro attr_ro
+syn keyword winbatchImplicit attr_sh attr_sh attr_sy attr_sy attr_t attr_t attr_x attr_x
+syn keyword winbatchImplicit avogadro backscan boltzmann cancel capslock check columns
+syn keyword winbatchImplicit commonformat cr crlf ctrl default default deg2rad descending
+syn keyword winbatchImplicit disable drive electric enable eulers false faraday float8
+syn keyword winbatchImplicit fwdscan gftsec globalgroup gmtsec goldenratio gravitation hidden
+syn keyword winbatchImplicit icon lbutton lclick ldblclick lf lightmps lightmtps localgroup
+syn keyword winbatchImplicit magfield major mbokcancel mbutton mbyesno mclick mdblclick minor
+syn keyword winbatchImplicit msformat multiple ncsaformat no none none noresize normal
+syn keyword winbatchImplicit notify nowait numlock off on open parsec parseonly pi
+syn keyword winbatchImplicit planckergs planckjoules printer rad2deg rbutton rclick rdblclick
+syn keyword winbatchImplicit regclasses regcurrent regmachine regroot regusers rows save
+syn keyword winbatchImplicit scrolllock server shift single sorted stack string tab tile
+syn keyword winbatchImplicit true uncheck unsorted wait wholesection word1 word2 word4 yes
+syn keyword winbatchImplicit zoomed about abs acos addextender appexist appwaitclose asin
+syn keyword winbatchImplicit askfilename askfiletext askitemlist askline askpassword askyesno
+syn keyword winbatchImplicit atan average beep binaryalloc binarycopy binaryeodget binaryeodset
+syn keyword winbatchImplicit binaryfree binaryhashrec binaryincr binaryincr2 binaryincr4
+syn keyword winbatchImplicit binaryincrflt binaryindex binaryindexnc binaryoletype binarypeek
+syn keyword winbatchImplicit binarypeek2 binarypeek4 binarypeekflt binarypeekstr binarypoke
+syn keyword winbatchImplicit binarypoke2 binarypoke4 binarypokeflt binarypokestr binaryread
+syn keyword winbatchImplicit binarysort binarystrcnt binarywrite boxbuttondraw boxbuttonkill
+syn keyword winbatchImplicit boxbuttonstat boxbuttonwait boxcaption boxcolor
+syn keyword winbatchImplicit boxdataclear boxdatatag
+syn keyword winbatchImplicit boxdestroy boxdrawcircle boxdrawline boxdrawrect boxdrawtext
+syn keyword winbatchImplicit boxesup boxmapmode boxnew boxopen boxpen boxshut boxtext boxtextcolor
+syn keyword winbatchImplicit boxtextfont boxtitle boxupdates break buttonnames by call
+syn keyword winbatchImplicit callext ceiling char2num clipappend clipget clipput
+syn keyword winbatchImplicit continue cos cosh datetime
+syn keyword winbatchImplicit ddeexecute ddeinitiate ddepoke dderequest ddeterminate
+syn keyword winbatchImplicit ddetimeout debug debugdata decimals delay dialog
+syn keyword winbatchImplicit dialogbox dirattrget dirattrset dirchange direxist
+syn keyword winbatchImplicit dirget dirhome diritemize dirmake dirremove dirrename
+syn keyword winbatchImplicit dirwindows diskexist diskfree diskinfo diskscan disksize
+syn keyword winbatchImplicit diskvolinfo display dllcall dllfree dllhinst dllhwnd dllload
+syn keyword winbatchImplicit dosboxcursorx dosboxcursory dosboxgetall dosboxgetdata
+syn keyword winbatchImplicit dosboxheight dosboxscrmode dosboxversion dosboxwidth dosversion
+syn keyword winbatchImplicit drop edosgetinfo edosgetvar edoslistvars edospathadd edospathchk
+syn keyword winbatchImplicit edospathdel edossetvar
+syn keyword winbatchImplicit endsession envgetinfo envgetvar environment
+syn keyword winbatchImplicit environset envitemize envlistvars envpathadd envpathchk
+syn keyword winbatchImplicit envpathdel envsetvar errormode exclusive execute exetypeinfo
+syn keyword winbatchImplicit exp fabs fileappend fileattrget fileattrset fileclose
+syn keyword winbatchImplicit filecompare filecopy filedelete fileexist fileextension filefullname
+syn keyword winbatchImplicit fileitemize filelocate filemapname filemove filenameeval1
+syn keyword winbatchImplicit filenameeval2 filenamelong filenameshort fileopen filepath
+syn keyword winbatchImplicit fileread filerename fileroot filesize filetimecode filetimeget
+syn keyword winbatchImplicit filetimeset filetimetouch fileverinfo filewrite fileymdhms
+syn keyword winbatchImplicit findwindow floor getexacttime gettickcount
+syn keyword winbatchImplicit iconarrange iconreplace ignoreinput inidelete inideletepvt
+syn keyword winbatchImplicit iniitemize iniitemizepvt iniread inireadpvt iniwrite iniwritepvt
+syn keyword winbatchImplicit installfile int intcontrol isdefined isfloat isint iskeydown
+syn keyword winbatchImplicit islicensed isnumber itemcount itemextract iteminsert itemlocate
+syn keyword winbatchImplicit itemremove itemselect itemsort keytoggleget keytoggleset
+syn keyword winbatchImplicit lasterror log10 logdisk loge max message min mod mouseclick
+syn keyword winbatchImplicit mouseclickbtn mousedrag mouseinfo mousemove msgtextget n3attach
+syn keyword winbatchImplicit n3captureend n3captureprt n3chgpassword n3detach n3dirattrget
+syn keyword winbatchImplicit n3dirattrset n3drivepath n3drivepath2 n3drivestatus n3fileattrget
+syn keyword winbatchImplicit n3fileattrset n3getloginid n3getmapped n3getnetaddr n3getuser
+syn keyword winbatchImplicit n3getuserid n3logout n3map n3mapdelete n3mapdir n3maproot n3memberdel
+syn keyword winbatchImplicit n3memberget n3memberset n3msgsend n3msgsendall n3serverinfo
+syn keyword winbatchImplicit n3serverlist n3setsrchdrv n3usergroups n3version n4attach
+syn keyword winbatchImplicit n4captureend n4captureprt n4chgpassword n4detach n4dirattrget
+syn keyword winbatchImplicit n4dirattrset n4drivepath n4drivestatus n4fileattrget n4fileattrset
+syn keyword winbatchImplicit n4getloginid n4getmapped n4getnetaddr n4getuser n4getuserid
+syn keyword winbatchImplicit n4login n4logout n4map n4mapdelete n4mapdir n4maproot n4memberdel
+syn keyword winbatchImplicit n4memberget n4memberset n4msgsend n4msgsendall n4serverinfo
+syn keyword winbatchImplicit n4serverlist n4setsrchdrv n4usergroups n4version netadddrive
+syn keyword winbatchImplicit netaddprinter netcancelcon netdirdialog netgetcon netgetuser
+syn keyword winbatchImplicit netinfo netresources netversion num2char objectclose
+syn keyword winbatchImplicit objectopen parsedata pause playmedia playmidi playwaveform
+syn keyword winbatchImplicit print random regapp regclosekey regconnect regcreatekey
+syn keyword winbatchImplicit regdeletekey regdelvalue regentrytype regloadhive regopenkey
+syn keyword winbatchImplicit regquerybin regquerydword regqueryex regqueryexpsz regqueryitem
+syn keyword winbatchImplicit regquerykey regquerymulsz regqueryvalue regsetbin
+syn keyword winbatchImplicit regsetdword regsetex regsetexpsz regsetmulsz regsetvalue
+syn keyword winbatchImplicit regunloadhive reload reload rtstatus run runenviron
+syn keyword winbatchImplicit runexit runhide runhidewait runicon runiconwait runshell runwait
+syn keyword winbatchImplicit runzoom runzoomwait sendkey sendkeyschild sendkeysto
+syn keyword winbatchImplicit sendmenusto shellexecute shortcutedit shortcutextra shortcutinfo
+syn keyword winbatchImplicit shortcutmake sin sinh snapshot sounds sqrt
+syn keyword winbatchImplicit srchfree srchinit srchnext strcat strcharcount strcmp
+syn keyword winbatchImplicit strfill strfix strfixchars stricmp strindex strlen
+syn keyword winbatchImplicit strlower strreplace strscan strsub strtrim strupper
+syn keyword winbatchImplicit tan tanh tcpaddr2host tcpftpchdir tcpftpclose tcpftpget
+syn keyword winbatchImplicit tcpftplist tcpftpmode tcpftpopen tcpftpput tcphost2addr tcphttpget
+syn keyword winbatchImplicit tcphttppost tcpparmget tcpparmset tcpping tcpsmtp terminate
+syn keyword winbatchImplicit textbox textboxsort textoutbufdel textoutbuffer textoutdebug
+syn keyword winbatchImplicit textoutfree textoutinfo textoutreset textouttrack textouttrackb
+syn keyword winbatchImplicit textouttrackp textoutwait textselect timeadd timedate
+syn keyword winbatchImplicit timedelay timediffdays timediffsecs timejulianday timejultoymd
+syn keyword winbatchImplicit timesubtract timewait timeymdhms version versiondll
+syn keyword winbatchImplicit w3addcon w3cancelcon w3dirbrowse w3getcaps w3getcon w3netdialog
+syn keyword winbatchImplicit w3netgetuser w3prtbrowse w3version w95accessadd w95accessdel
+syn keyword winbatchImplicit w95adddrive w95addprinter w95cancelcon w95dirdialog w95getcon
+syn keyword winbatchImplicit w95getuser w95resources w95shareadd w95sharedel w95shareset
+syn keyword winbatchImplicit w95version waitforkey wallpaper webbaseconv webcloselog
+syn keyword winbatchImplicit webcmddata webcondata webcounter webdatdata webdumperror webhashcode
+syn keyword winbatchImplicit webislocal weblogline webopenlog webout weboutfile webparamdata
+syn keyword winbatchImplicit webparamnames websettimeout webverifycard winactivate
+syn keyword winbatchImplicit winactivchild winarrange winclose winclosenot winconfig winexename
+syn keyword winbatchImplicit winexist winparset winparget winexistchild wingetactive
+syn keyword winbatchImplicit winhelp winhide winiconize winidget winisdos winitemchild
+syn keyword winbatchImplicit winitemize winitemnameid winmetrics winname winparmget
+syn keyword winbatchImplicit winparmset winplace winplaceget winplaceset
+syn keyword winbatchImplicit winposition winresources winshow winstate winsysinfo
+syn keyword winbatchImplicit wintitle winversion winwaitchild winwaitclose winwaitexist
+syn keyword winbatchImplicit winzoom wnaddcon wncancelcon wncmptrinfo wndialog
+syn keyword winbatchImplicit wndlgbrowse wndlgcon wndlgcon2 wndlgcon3
+syn keyword winbatchImplicit wndlgcon4 wndlgdiscon wndlgnoshare wndlgshare wngetcaps
+syn keyword winbatchImplicit wngetcon wngetuser wnnetnames wnrestore wnservers wnsharecnt
+syn keyword winbatchImplicit wnsharename wnsharepath wnshares wntaccessadd wntaccessdel
+syn keyword winbatchImplicit wntaccessget wntadddrive wntaddprinter wntcancelcon wntdirdialog
+syn keyword winbatchImplicit wntgetcon wntgetuser wntlistgroups wntmemberdel wntmemberget
+syn keyword winbatchImplicit wntmembergrps wntmemberlist wntmemberset wntresources wntshareadd
+syn keyword winbatchImplicit wntsharedel wntshareset wntversion wnversion wnwrkgroups wwenvunload
+syn keyword winbatchImplicit xbaseconvert xcursorset xdisklabelget xdriveready xextenderinfo
+syn keyword winbatchImplicit xgetchildhwnd xgetelapsed xhex xmemcompact xmessagebox
+syn keyword winbatchImplicit xsendmessage xverifyccard yield
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link winbatchLabel		PreProc
+hi def link winbatchCtl		Operator
+hi def link winbatchStatement	Statement
+hi def link winbatchTodo		Todo
+hi def link winbatchString		String
+hi def link winbatchVar		Type
+hi def link winbatchComment	Comment
+hi def link winbatchImplicit	Special
+hi def link winbatchNumber		Number
+hi def link winbatchConstant	StorageClass
+
+
+let b:current_syntax = "winbatch"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/wml.vim b/syntax/wml.vim
new file mode 100644
index 000000000..9ded9e190
--- /dev/null
+++ b/syntax/wml.vim
@@ -0,0 +1,154 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wml') == -1
+
+" Vim syntax file
+" Language:     WML - Website MetaLanguage
+" Maintainer:   Gerfried Fuchs <alfie@ist.org>
+" Filenames:    *.wml
+" Last Change:  07 Feb 2002
+" URL:		http://alfie.ist.org/software/vim/syntax/wml.vim
+"
+" Original Version: Craig Small <csmall@eye-net.com.au>
+
+" Comments are very welcome - but please make sure that you are commenting on
+" the latest version of this file.
+" SPAM is _NOT_ welcome - be ready to be reported!
+
+"  If you are looking for the "Wireless Markup Language" syntax file,
+"  please take a look at the wap.vim file done by Ralf Schandl, soon in a
+"  vim-package around your corner :)
+
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+
+" A lot of the web stuff looks like HTML so we load that first
+runtime! syntax/html.vim
+unlet b:current_syntax
+
+if !exists("main_syntax")
+  let main_syntax = 'wml'
+endif
+
+" special character
+syn match wmlNextLine	"\\$"
+
+" Redfine htmlTag
+syn clear htmlTag
+syn region  htmlTag  start=+<[^/<]+ end=+>+  contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition
+
+"
+" Add in extra Arguments used by wml
+syn keyword htmlTagName contained gfont imgbg imgdot lowsrc
+syn keyword htmlTagName contained navbar:define navbar:header
+syn keyword htmlTagName contained navbar:footer navbar:prolog
+syn keyword htmlTagName contained navbar:epilog navbar:button
+syn keyword htmlTagName contained navbar:filter navbar:debug
+syn keyword htmlTagName contained navbar:render
+syn keyword htmlTagName contained preload rollover
+syn keyword htmlTagName contained space hspace vspace over
+syn keyword htmlTagName contained ps ds pi ein big sc spaced headline
+syn keyword htmlTagName contained ue subheadline zwue verbcode
+syn keyword htmlTagName contained isolatin pod sdf text url verbatim
+syn keyword htmlTagName contained xtable
+syn keyword htmlTagName contained csmap fsview import box
+syn keyword htmlTagName contained case:upper case:lower
+syn keyword htmlTagName contained grid cell info lang: logo page
+syn keyword htmlTagName contained set-var restore
+syn keyword htmlTagName contained array:push array:show set-var ifdef
+syn keyword htmlTagName contained say m4 symbol dump enter divert
+syn keyword htmlTagName contained toc
+syn keyword htmlTagName contained wml card do refresh oneevent catch spawn
+
+"
+" The wml arguments
+syn keyword htmlArg contained adjust background base bdcolor bdspace
+syn keyword htmlArg contained bdwidth complete copyright created crop
+syn keyword htmlArg contained direction description domainname eperlfilter
+syn keyword htmlArg contained file hint imgbase imgstar interchar interline
+syn keyword htmlArg contained keephr keepindex keywords layout spacing
+syn keyword htmlArg contained padding nonetscape noscale notag notypo
+syn keyword htmlArg contained onload oversrc pos select slices style
+syn keyword htmlArg contained subselected txtcol_select txtcol_normal
+syn keyword htmlArg contained txtonly via
+syn keyword htmlArg contained mode columns localsrc ordered
+
+
+" Lines starting with an # are usually comments
+syn match   wmlComment     "^\s*#.*"
+" The different exceptions to comments
+syn match   wmlSharpBang   "^#!.*"
+syn match   wmlUsed	   contained "\s\s*[A-Za-z:_-]*"
+syn match   wmlUse	   "^\s*#\s*use\s\+" contains=wmlUsed
+syn match   wmlInclude	   "^\s*#\s*include.+"
+
+syn region  wmlBody	   contained start=+<<+ end=+>>+
+
+syn match   wmlLocationId  contained "[A-Za-z]\+"
+syn region  wmlLocation    start=+<<+ end=+>>+ contains=wmlLocationId
+"syn region  wmlLocation    start=+{#+ end=+#}+ contains=wmlLocationId
+"syn region  wmlLocationed  contained start=+<<+ end=+>>+ contains=wmlLocationId
+
+syn match   wmlDivert      "\.\.[a-zA-Z_]\+>>"
+syn match   wmlDivertEnd   "<<\.\."
+" new version
+"syn match   wmlDivert      "{#[a-zA-Z_]\+#:"
+"syn match   wmlDivertEnd   ":##}"
+
+syn match   wmlDefineName  contained "\s\+[A-Za-z-]\+"
+syn region  htmlTagName    start="\<\(define-tag\|define-region\)" end="\>" contains=wmlDefineName
+
+" The perl include stuff
+if main_syntax != 'perl'
+  " Perl script
+  syn include @wmlPerlScript syntax/perl.vim
+  unlet b:current_syntax
+
+  syn region perlScript   start=+<perl>+ keepend end=+</perl>+ contains=@wmlPerlScript,wmlPerlTag
+" eperl between '<:' and ':>'  -- Alfie [1999-12-26]
+  syn region perlScript   start=+<:+ keepend end=+:>+ contains=@wmlPerlScript,wmlPerlTag
+  syn match    wmlPerlTag  contained "</*perl>" contains=wmlPerlTagN
+  syn keyword  wmlPerlTagN contained perl
+
+  hi link   wmlPerlTag  htmlTag
+  hi link   wmlPerlTagN htmlStatement
+endif
+
+" verbatim tags -- don't highlight anything in between  -- Alfie [2002-02-07]
+syn region  wmlVerbatimText start=+<verbatim>+ keepend end=+</verbatim>+ contains=wmlVerbatimTag
+syn match   wmlVerbatimTag  contained "</*verbatim>" contains=wmlVerbatimTagN
+syn keyword wmlVerbatimTagN contained verbatim
+hi link     wmlVerbatimTag  htmlTag
+hi link     wmlVerbatimTagN htmlStatement
+
+if main_syntax == "html"
+  syn sync match wmlHighlight groupthere NONE "</a-zA-Z]"
+  syn sync match wmlHighlight groupthere perlScript "<perl>"
+  syn sync match wmlHighlightSkip "^.*['\"].*$"
+  syn sync minlines=10
+endif
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link wmlNextLine	Special
+hi def link wmlUse		Include
+hi def link wmlUsed	String
+hi def link wmlBody	Special
+hi def link wmlDiverted	Label
+hi def link wmlDivert	Delimiter
+hi def link wmlDivertEnd	Delimiter
+hi def link wmlLocationId	Label
+hi def link wmlLocation	Delimiter
+" hi def link wmlLocationed	Delimiter
+hi def link wmlDefineName	String
+hi def link wmlComment	Comment
+hi def link wmlInclude	Include
+hi def link wmlSharpBang	PreProc
+
+
+let b:current_syntax = "wml"
+
+endif
diff --git a/syntax/wsh.vim b/syntax/wsh.vim
new file mode 100644
index 000000000..d18c715d4
--- /dev/null
+++ b/syntax/wsh.vim
@@ -0,0 +1,49 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wsh') == -1
+
+" Vim syntax file
+" Language:	Windows Scripting Host
+" Maintainer:	Paul Moore <pf_moore AT yahoo.co.uk>
+" Last Change:	Fre, 24 Nov 2000 21:54:09 +0100
+
+" This reuses the XML, VB and JavaScript syntax files. While VB is not
+" VBScript, it's close enough for us. No attempt is made to handle
+" other languages.
+" Send comments, suggestions and requests to the maintainer.
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:wsh_cpo_save = &cpo
+set cpo&vim
+
+runtime! syntax/xml.vim
+unlet b:current_syntax
+
+syn case ignore
+syn include @wshVBScript <sfile>:p:h/vb.vim
+unlet b:current_syntax
+syn include @wshJavaScript <sfile>:p:h/javascript.vim
+unlet b:current_syntax
+syn region wshVBScript
+    \ matchgroup=xmlTag    start="<script[^>]*VBScript\(>\|[^>]*[^/>]>\)"
+    \ matchgroup=xmlEndTag end="</script>"
+    \ fold
+    \ contains=@wshVBScript
+    \ keepend
+syn region wshJavaScript
+    \ matchgroup=xmlTag    start="<script[^>]*J\(ava\)\=Script\(>\|[^>]*[^/>]>\)"
+    \ matchgroup=xmlEndTag end="</script>"
+    \ fold
+    \ contains=@wshJavaScript
+    \ keepend
+
+syn cluster xmlRegionHook add=wshVBScript,wshJavaScript
+
+let b:current_syntax = "wsh"
+
+let &cpo = s:wsh_cpo_save
+unlet s:wsh_cpo_save
+
+endif
diff --git a/syntax/wsml.vim b/syntax/wsml.vim
new file mode 100644
index 000000000..f3a583490
--- /dev/null
+++ b/syntax/wsml.vim
@@ -0,0 +1,117 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wsml') == -1
+
+" Vim syntax file
+" Language:     WSML
+" Maintainer:   Thomas Haselwanter <thomas.haselwanter@deri.org>
+" URL:		none
+" Last Change:  2006 Apr 30
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" WSML
+syn keyword wsmlHeader		wsmlVariant
+syn keyword wsmlNamespace	namespace
+syn keyword wsmlTopLevel	concept instance relationInstance ofType usesMediator usesService relation sharedVariables importsOntology
+syn keyword wsmlOntology	hasValue memberOf ofType impliesType subConceptOf
+syn keyword wsmlAxiom		axiom definedBy
+syn keyword wsmlService		assumption effect postcondition precondition capability interface
+syn keyword wsmlTopLevel	ooMediator wwMediator wgMediator ggMediator
+syn keyword wsmlMediation	usesService source target
+syn match wsmlDataTypes	        "\( _string\| _decimal\| _integer\| _float\| _double\| _iri\| _sqname\| _boolean\| _duration\| _dateTime\| _time\| _date\| _gyearmonth\| _gyear\| _gmonthday\| _gday\| _gmonth\| _hexbinary\| _base64binary\)\((\S*)\)\?" contains=wsmlString,wsmlNumber,wsmlCharacter
+syn keyword wsmlTopLevel	goal webService ontology
+syn keyword wsmlKeywordsInsideLEs	true false memberOf hasValue subConceptOf ofType impliesType and or implies impliedBy equivalent neg naf forall exists
+syn keyword wsmlNFP		nfp endnfp nonFunctionalProperties endNonFunctionalProperties
+syn region wsmlNFPregion	start="nfp\|nonFunctionalProperties" end="endnfp\|endNonFunctionalProperties" contains=ALL
+syn region wsmlNamespace	start="namespace" end="}" contains=wsmlIdentifier
+syn match wsmlOperator		"!=\|:=:\|=<\|>=\|=\|+\|\*\|/\|<->\|->\|<-\|:-\|!-\|-\|<\|>"
+syn match wsmlBrace		"(\|)\|\[\|\]\|{\|}"
+syn match wsmlIdentifier	+_"\S*"+
+syn match wsmlIdentifier	"_#\d*"
+syn match wsmlSqName		"[0-9A-Za-z]\+#[0-9A-Za-z]\+"
+syn match wsmlVariable		"?[0-9A-Za-z]\+"
+
+" ASM-specific code
+syn keyword wsmlBehavioral	choreography orchestration transitionRules
+syn keyword wsmlChoreographyPri	stateSignature in out shared static controlled 
+syn keyword wsmlChoreographySec with do withGrounding forall endForall choose if then endIf
+syn match wsmlChoreographyTer   "\(\s\|\_^\)\(add\|delete\|update\)\s*(.*)" contains=wsmlKeywordsInsideLEs,wsmlIdentifier,wsmlSqName,wsmlString,wsmlNumber,wsmlDataTypes,wsmlVariable
+
+" Comments
+syn keyword wsmlTodo		 contained TODO
+syn keyword wsmlFixMe		 contained FIXME
+if exists("wsml_comment_strings")
+  syn region  wsmlCommentString    contained start=+"+ end=+"+ end=+$+ end=+\*/+me=s-1,he=s-1 contains=wsmlSpecial,wsmlCommentStar,wsmlSpecialChar,@Spell
+  syn region  wsmlComment2String   contained start=+"+  end=+$\|"+  contains=wsmlSpecial,wsmlSpecialChar,@Spell
+  syn match   wsmlCommentCharacter contained "'\\[^']\{1,6\}'" contains=wsmlSpecialChar
+  syn match   wsmlCommentCharacter contained "'\\''" contains=wsmlSpecialChar
+  syn match   wsmlCommentCharacter contained "'[^\\]'"
+  syn cluster wsmlCommentSpecial add=wsmlCommentString,wsmlCommentCharacter,wsmlNumber
+  syn cluster wsmlCommentSpecial2 add=wsmlComment2String,wsmlCommentCharacter,wsmlNumber
+endif
+
+syn region  wsmlComment		 start="/\*"  end="\*/" contains=@wsmlCommentSpecial,wsmlTodo,wsmlFixMe,@Spell
+syn match   wsmlCommentStar      contained "^\s*\*[^/]"me=e-1
+syn match   wsmlCommentStar      contained "^\s*\*$"
+syn match   wsmlLineComment      "//.*" contains=@wsmlCommentSpecial2,wsmlTodo,@Spell
+
+syn cluster wsmlTop add=wsmlComment,wsmlLineComment
+
+"match the special comment /**/
+syn match   wsmlComment		 "/\*\*/"
+
+" Strings
+syn region  wsmlString		start=+"+ end=+"+ contains=wsmlSpecialChar,wsmlSpecialError,@Spell
+syn match   wsmlCharacter	 "'[^']*'" contains=javaSpecialChar,javaSpecialCharError
+syn match   wsmlCharacter	 "'\\''" contains=javaSpecialChar
+syn match   wsmlCharacter	 "'[^\\]'"
+syn match   wsmlNumber		 "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
+syn match   wsmlNumber		 "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
+syn match   wsmlNumber		 "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
+syn match   wsmlNumber		 "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
+
+" unicode characters
+syn match   wsmlSpecial "\\u\d\{4\}"
+
+syn cluster wsmlTop add=wsmlString,wsmlCharacter,wsmlNumber,wsmlSpecial,wsmlStringError
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+hi def link wsmlHeader			TypeDef
+hi def link wsmlNamespace			TypeDef
+hi def link wsmlOntology			Statement
+hi def link wsmlAxiom			TypeDef
+hi def link wsmlService			TypeDef
+hi def link wsmlNFP			TypeDef
+hi def link wsmlTopLevel			TypeDef
+hi def link wsmlMediation			TypeDef 
+hi def link wsmlBehavioral		TypeDef
+hi def link wsmlChoreographyPri		TypeDef
+hi def link wsmlChoreographySec		Operator
+hi def link wsmlChoreographyTer		Special
+hi def link wsmlString			String
+hi def link wsmlIdentifier		Normal 
+hi def link wsmlSqName                     Normal
+hi def link wsmlVariable			Define
+hi def link wsmlKeywordsInsideLEs		Operator
+hi def link wsmlOperator			Operator
+hi def link wsmlBrace			Operator
+hi def link wsmlCharacter			Character
+hi def link wsmlNumber			Number
+hi def link wsmlDataTypes			Special
+hi def link wsmlComment			Comment
+hi def link wsmlDocComment		Comment
+hi def link wsmlLineComment		Comment
+hi def link wsmlTodo			Todo
+hi def link wsmlFixMe			Error
+hi def link wsmlCommentTitle		SpecialComment
+hi def link wsmlCommentStar		wsmlComment
+
+
+let b:current_syntax = "wsml"
+let b:spell_options="contained"
+
+
+endif
diff --git a/syntax/wvdial.vim b/syntax/wvdial.vim
new file mode 100644
index 000000000..560060d2d
--- /dev/null
+++ b/syntax/wvdial.vim
@@ -0,0 +1,32 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wvdial') == -1
+
+" Vim syntax file
+" Language:     Configuration file for WvDial
+" Maintainer:   Prahlad Vaidyanathan <slime@vsnl.net>
+" Last Update:  Mon, 15 Oct 2001 09:39:03 Indian Standard Time
+
+" Quit if syntax file is already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+syn match   wvdialComment   "^;.*$"lc=1
+syn match   wvdialComment   "[^\\];.*$"lc=1
+syn match   wvdialSection   "^\s*\[.*\]"
+syn match   wvdialValue     "=.*$"ms=s+1
+syn match   wvdialValue     "\s*[^ ;"' ]\+"lc=1
+syn match   wvdialVar       "^\s*\(Inherits\|Modem\|Baud\|Init.\|Phone\|Area\ Code\|Dial\ Prefix\|Dial\ Command\|Login\|Login\| Prompt\|Password\|Password\ Prompt\|PPPD\ Path\|Force\ Address\|Remote\ Name\|Carrier\ Check\|Stupid\ [Mm]ode\|New\ PPPD\|Default\ Reply\|Auto\ Reconnect\|SetVolume\|Username\)"
+syn match   wvdialEqual     "="
+
+" The default highlighting
+hi def link wvdialComment   Comment
+hi def link wvdialSection   PreProc
+hi def link wvdialVar       Identifier
+hi def link wvdialValue     String
+hi def link wvdialEqual     Statement
+
+let b:current_syntax = "wvdial"
+
+"EOF vim: tw=78:ft=vim:ts=8
+
+endif
diff --git a/syntax/xdefaults.vim b/syntax/xdefaults.vim
new file mode 100644
index 000000000..704c24b14
--- /dev/null
+++ b/syntax/xdefaults.vim
@@ -0,0 +1,136 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xdefaults') == -1
+
+" Vim syntax file
+" Language:	X resources files like ~/.Xdefaults (xrdb)
+" Maintainer:	Johannes Zellner <johannes@zellner.org>
+"		Author and previous maintainer:
+"		Gautam H. Mudunuri <gmudunur@informatica.com>
+" Last Change:	Di, 09 Mai 2006 23:10:23 CEST
+" $Id: xdefaults.vim,v 1.2 2007/05/05 17:19:40 vimboss Exp $
+"
+" REFERENCES:
+"   xrdb manual page
+"   xrdb source: ftp://ftp.x.org/pub/R6.4/xc/programs/xrdb/xrdb.c
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" turn case on
+syn case match
+
+
+if !exists("xdefaults_no_colon_errors")
+    " mark lines which do not contain a colon as errors.
+    " This does not really catch all errors but only lines
+    " which contain at least two WORDS and no colon. This
+    " was done this way so that a line is not marked as
+    " error while typing (which would be annoying).
+    syntax match xdefaultsErrorLine "^\s*[a-zA-Z.*]\+\s\+[^: 	]\+"
+endif
+
+
+" syn region  xdefaultsLabel   start=+^[^:]\{-}:+he=e-1 skip=+\\+ end="$"
+syn match   xdefaultsLabel   +^[^:]\{-}:+he=e-1                       contains=xdefaultsPunct,xdefaultsSpecial,xdefaultsLineEnd
+syn region  xdefaultsValue   keepend start=+:+lc=1 skip=+\\+ end=+$+ contains=xdefaultsSpecial,xdefaultsLabel,xdefaultsLineEnd
+
+syn match   xdefaultsSpecial	contained +#override+
+syn match   xdefaultsSpecial	contained +#augment+
+syn match   xdefaultsPunct	contained +[.*:]+
+syn match   xdefaultsLineEnd	contained +\\$+
+syn match   xdefaultsLineEnd	contained +\\n\\$+
+syn match   xdefaultsLineEnd	contained +\\n$+
+
+
+
+" COMMENTS
+
+" note, that the '!' must be at the very first position of the line
+syn match   xdefaultsComment "^!.*$"                     contains=xdefaultsTodo,@Spell
+
+" lines starting with a '#' mark and which are not preprocessor
+" lines are skipped.  This is not part of the xrdb documentation.
+" It was reported by Bram Moolenaar and could be confirmed by
+" having a look at xrdb.c:GetEntries()
+syn match   xdefaultsCommentH		"^#.*$"
+"syn region  xdefaultsComment start="^#"  end="$" keepend contains=ALL
+syn region  xdefaultsComment start="/\*" end="\*/"       contains=xdefaultsTodo,@Spell
+
+syntax match xdefaultsCommentError	"\*/"
+
+syn keyword xdefaultsTodo contained TODO FIXME XXX display
+
+
+
+" PREPROCESSOR STUFF
+
+syn region	xdefaultsPreProc	start="^\s*#\s*\(if\|ifdef\|ifndef\|elif\|else\|endif\)\>" skip="\\$" end="$" contains=xdefaultsSymbol
+if !exists("xdefaults_no_if0")
+  syn region	xdefaultsCppOut		start="^\s*#\s*if\s\+0\>" end=".\|$" contains=xdefaultsCppOut2
+  syn region	xdefaultsCppOut2	contained start="0" end="^\s*#\s*\(endif\>\|else\>\|elif\>\)" contains=xdefaultsCppSkip
+  syn region	xdefaultsCppSkip	contained start="^\s*#\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*#\s*endif\>" contains=xdefaultsCppSkip
+endif
+syn region	xdefaultsIncluded	contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match	xdefaultsIncluded	contained "<[^>]*>"
+syn match	xdefaultsInclude	"^\s*#\s*include\>\s*["<]" contains=xdefaultsIncluded
+syn cluster	xdefaultsPreProcGroup	contains=xdefaultsPreProc,xdefaultsIncluded,xdefaultsInclude,xdefaultsDefine,xdefaultsCppOut,xdefaultsCppOut2,xdefaultsCppSkip
+syn region	xdefaultsDefine		start="^\s*#\s*\(define\|undef\)\>" skip="\\$" end="$" contains=ALLBUT,@xdefaultsPreProcGroup,xdefaultsCommentH,xdefaultsErrorLine,xdefaultsLabel,xdefaultsValue
+syn region	xdefaultsPreProc	start="^\s*#\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@xdefaultsPreProcGroup,xdefaultsCommentH,xdefaultsErrorLine,xdefaultsLabel,xdefaultsValue
+
+
+
+" symbols as defined by xrdb
+syn keyword xdefaultsSymbol contained SERVERHOST
+syn match   xdefaultsSymbol contained "SRVR_[a-zA-Z0-9_]\+"
+syn keyword xdefaultsSymbol contained HOST
+syn keyword xdefaultsSymbol contained DISPLAY_NUM
+syn keyword xdefaultsSymbol contained CLIENTHOST
+syn match   xdefaultsSymbol contained "CLNT_[a-zA-Z0-9_]\+"
+syn keyword xdefaultsSymbol contained RELEASE
+syn keyword xdefaultsSymbol contained REVISION
+syn keyword xdefaultsSymbol contained VERSION
+syn keyword xdefaultsSymbol contained VENDOR
+syn match   xdefaultsSymbol contained "VNDR_[a-zA-Z0-9_]\+"
+syn match   xdefaultsSymbol contained "EXT_[a-zA-Z0-9_]\+"
+syn keyword xdefaultsSymbol contained NUM_SCREENS
+syn keyword xdefaultsSymbol contained SCREEN_NUM
+syn keyword xdefaultsSymbol contained BITS_PER_RGB
+syn keyword xdefaultsSymbol contained CLASS
+syn keyword xdefaultsSymbol contained StaticGray GrayScale StaticColor PseudoColor TrueColor DirectColor
+syn match   xdefaultsSymbol contained "CLASS_\(StaticGray\|GrayScale\|StaticColor\|PseudoColor\|TrueColor\|DirectColor\)"
+syn keyword xdefaultsSymbol contained COLOR
+syn match   xdefaultsSymbol contained "CLASS_\(StaticGray\|GrayScale\|StaticColor\|PseudoColor\|TrueColor\|DirectColor\)_[0-9]\+"
+syn keyword xdefaultsSymbol contained HEIGHT
+syn keyword xdefaultsSymbol contained WIDTH
+syn keyword xdefaultsSymbol contained PLANES
+syn keyword xdefaultsSymbol contained X_RESOLUTION
+syn keyword xdefaultsSymbol contained Y_RESOLUTION
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+hi def link xdefaultsLabel		Type
+hi def link xdefaultsValue		Constant
+hi def link xdefaultsComment	Comment
+hi def link xdefaultsCommentH	xdefaultsComment
+hi def link xdefaultsPreProc	PreProc
+hi def link xdefaultsInclude	xdefaultsPreProc
+hi def link xdefaultsCppSkip	xdefaultsCppOut
+hi def link xdefaultsCppOut2	xdefaultsCppOut
+hi def link xdefaultsCppOut	Comment
+hi def link xdefaultsIncluded	String
+hi def link xdefaultsDefine	Macro
+hi def link xdefaultsSymbol	Statement
+hi def link xdefaultsSpecial	Statement
+hi def link xdefaultsErrorLine	Error
+hi def link xdefaultsCommentError	Error
+hi def link xdefaultsPunct		Normal
+hi def link xdefaultsLineEnd	Special
+hi def link xdefaultsTodo		Todo
+
+
+let b:current_syntax = "xdefaults"
+
+" vim:ts=8
+
+endif
diff --git a/syntax/xhtml.vim b/syntax/xhtml.vim
new file mode 100644
index 000000000..b1beead43
--- /dev/null
+++ b/syntax/xhtml.vim
@@ -0,0 +1,15 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xhtml') == -1
+
+" Vim syntax file
+" Language:	XHTML
+" Maintainer:	noone
+" Last Change:	2003 Feb 04
+
+" Load the HTML syntax for now.
+runtime! syntax/html.vim
+
+let b:current_syntax = "xhtml"
+
+" vim: ts=8
+
+endif
diff --git a/syntax/xinetd.vim b/syntax/xinetd.vim
new file mode 100644
index 000000000..2a59f43c0
--- /dev/null
+++ b/syntax/xinetd.vim
@@ -0,0 +1,351 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xinetd') == -1
+
+" Vim syntax file
+" Language:             xinetd.conf(5) configuration file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword xinetdTodo          contained TODO FIXME XXX NOTE
+
+syn region  xinetdComment       display oneline start='^\s*#' end='$'
+                                \ contains=xinetdTodo,@Spell
+
+syn match   xinetdService       '^\s*service\>'
+                                \ nextgroup=xinetdServiceName skipwhite
+
+syn match   xinetdServiceName   contained '\S\+'
+                                \ nextgroup=xinetdServiceGroup skipwhite skipnl
+
+syn match   xinetdDefaults      '^\s*defaults'
+                                \ nextgroup=xinetdServiceGroup skipwhite skipnl
+
+syn region  xinetdServiceGroup  contained transparent
+                                \ matchgroup=xinetdServiceGroupD start='{'
+                                \ matchgroup=xinetdServiceGroupD end='}'
+                                \ contains=xinetdAttribute,xinetdReqAttribute,
+                                \ xinetdDisable
+
+syn keyword xinetdReqAttribute  contained user server protocol
+                                \ nextgroup=xinetdStringEq skipwhite
+
+syn keyword xinetdAttribute     contained id group bind
+                                \ interface
+                                \ nextgroup=xinetdStringEq skipwhite
+
+syn match   xinetdStringEq      contained display '='
+                                \ nextgroup=xinetdString skipwhite
+
+syn match   xinetdString        contained display '\S\+'
+
+syn keyword xinetdAttribute     contained type nextgroup=xinetdTypeEq skipwhite
+
+syn match   xinetdTypeEq        contained display '='
+                                \ nextgroup=xinetdType skipwhite
+
+syn keyword xinetdType          contained RPC INTERNAL TCPMUX TCPMUXPLUS
+                                \ UNLISTED
+                                \ nextgroup=xinetdType skipwhite
+
+syn keyword xinetdAttribute     contained flags
+                                \ nextgroup=xinetdFlagsEq skipwhite
+
+syn cluster xinetdFlagsC        contains=xinetdFlags,xinetdDeprFlags
+
+syn match   xinetdFlagsEq       contained display '='
+                                \ nextgroup=@xinetdFlagsC skipwhite
+
+syn keyword xinetdFlags         contained INTERCEPT NORETRY IDONLY NAMEINARGS
+                                \ NODELAY KEEPALIVE NOLIBWRAP SENSOR IPv4 IPv6
+                                \ nextgroup=@xinetdFlagsC skipwhite
+
+syn keyword xinetdDeprFlags     contained REUSE nextgroup=xinetdFlagsC skipwhite
+
+syn keyword xinetdDisable       contained disable
+                                \ nextgroup=xinetdBooleanEq skipwhite
+
+syn match   xinetdBooleanEq     contained display '='
+                                \ nextgroup=xinetdBoolean skipwhite
+
+syn keyword xinetdBoolean       contained yes no
+
+syn keyword xinetdReqAttribute  contained socket_type
+                                \ nextgroup=xinetdSocketTypeEq skipwhite
+
+syn match   xinetdSocketTypeEq  contained display '='
+                                \ nextgroup=xinetdSocketType skipwhite
+
+syn keyword xinetdSocketType    contained stream dgram raw seqpacket
+
+syn keyword xinetdReqAttribute  contained wait
+                                \ nextgroup=xinetdBooleanEq skipwhite
+
+syn keyword xinetdAttribute     contained groups mdns
+                                \ nextgroup=xinetdBooleanEq skipwhite
+
+syn keyword xinetdAttribute     contained instances per_source rlimit_cpu
+                                \ rlimit_data rlimit_rss rlimit_stack
+                                \ nextgroup=xinetdUNumberEq skipwhite
+
+syn match   xinetdUNumberEq     contained display '='
+                                \ nextgroup=xinetdUnlimited,xinetdNumber
+                                \ skipwhite
+
+syn keyword xinetdUnlimited     contained UNLIMITED
+
+syn match   xinetdNumber        contained display '\<\d\+\>'
+
+syn keyword xinetdAttribute     contained nice
+                                \ nextgroup=xinetdSignedNumEq skipwhite
+
+syn match   xinetdSignedNumEq   contained display '='
+                                \ nextgroup=xinetdSignedNumber skipwhite
+
+syn match   xinetdSignedNumber  contained display '[+-]\=\d\+\>'
+
+syn keyword xinetdAttribute     contained server_args
+                                \ enabled
+                                \ nextgroup=xinetdStringsEq skipwhite
+
+syn match   xinetdStringsEq     contained display '='
+                                \ nextgroup=xinetdStrings skipwhite
+
+syn match   xinetdStrings       contained display '\S\+'
+                                \ nextgroup=xinetdStrings skipwhite
+
+syn keyword xinetdAttribute     contained only_from no_access passenv
+                                \ nextgroup=xinetdStringsAdvEq skipwhite
+
+syn match   xinetdStringsAdvEq  contained display '[+-]\=='
+                                \ nextgroup=xinetdStrings skipwhite
+
+syn keyword xinetdAttribute     contained access_times
+                                \ nextgroup=xinetdTimeRangesEq skipwhite
+
+syn match   xinetdTimeRangesEq  contained display '='
+                                \ nextgroup=xinetdTimeRanges skipwhite
+
+syn match   xinetdTimeRanges    contained display
+                                \ '\%(0?\d\|1\d\|2[0-3]\):\%(0?\d\|[1-5]\d\)-\%(0?\d\|1\d\|2[0-3]\):\%(0?\d\|[1-5]\d\)'
+                                \ nextgroup=xinetdTimeRanges skipwhite
+
+syn keyword xinetdAttribute     contained log_type nextgroup=xinetdLogTypeEq
+                                \ skipwhite
+
+syn match   xinetdLogTypeEq     contained display '='
+                                \ nextgroup=xinetdLogType skipwhite
+
+syn keyword xinetdLogType       contained SYSLOG nextgroup=xinetdSyslogType
+                                \ skipwhite
+
+syn keyword xinetdLogType       contained FILE nextgroup=xinetdLogFile skipwhite
+
+syn keyword xinetdSyslogType    contained daemon auth authpriv user mail lpr
+                                \ news uucp ftp local0 local1 local2 local3
+                                \ local4 local5 local6 local7
+                                \ nextgroup=xinetdSyslogLevel skipwhite
+
+syn keyword xinetdSyslogLevel   contained emerg alert crit err warning notice
+                                \ info debug
+
+syn match   xinetdLogFile       contained display '\S\+'
+                                \ nextgroup=xinetdLogSoftLimit skipwhite
+
+syn match   xinetdLogSoftLimit  contained display '\<\d\+\>'
+                                \ nextgroup=xinetdLogHardLimit skipwhite
+
+syn match   xinetdLogHardLimit  contained display '\<\d\+\>'
+
+syn keyword xinetdAttribute     contained log_on_success
+                                \ nextgroup=xinetdLogSuccessEq skipwhite
+
+syn match   xinetdLogSuccessEq  contained display '[+-]\=='
+                                \ nextgroup=xinetdLogSuccess skipwhite
+
+syn keyword xinetdLogSuccess    contained PID HOST USERID EXIT DURATION TRAFFIC
+                                \ nextgroup=xinetdLogSuccess skipwhite
+
+syn keyword xinetdAttribute     contained log_on_failure
+                                \ nextgroup=xinetdLogFailureEq skipwhite
+
+syn match   xinetdLogFailureEq  contained display '[+-]\=='
+                                \ nextgroup=xinetdLogFailure skipwhite
+
+syn keyword xinetdLogFailure    contained HOST USERID ATTEMPT
+                                \ nextgroup=xinetdLogFailure skipwhite
+
+syn keyword xinetdReqAttribute  contained rpc_version
+                                \ nextgroup=xinetdRPCVersionEq skipwhite
+
+syn match   xinetdRPCVersionEq  contained display '='
+                                \ nextgroup=xinetdRPCVersion skipwhite
+
+syn match   xinetdRPCVersion    contained display '\d\+\%(-\d\+\)\=\>'
+
+syn keyword xinetdReqAttribute  contained rpc_number port
+                                \ nextgroup=xinetdNumberEq skipwhite
+
+syn match   xinetdNumberEq      contained display '='
+                                \ nextgroup=xinetdNumber skipwhite
+
+syn keyword xinetdAttribute     contained env nextgroup=xinetdEnvEq skipwhite
+
+syn match   xinetdEnvEq         contained display '+\=='
+                                \ nextgroup=xinetdEnvName skipwhite
+
+syn match   xinetdEnvName       contained display '[^=]\+'
+                                \ nextgroup=xinetdEnvNameEq
+
+syn match   xinetdEnvNameEq     contained display '=' nextgroup=xinetdEnvValue
+
+syn match   xinetdEnvValue      contained display '\S\+'
+                                \ nextgroup=xinetdEnvName skipwhite
+
+syn keyword xinetdAttribute     contained banner banner_success banner_failure
+                                \ nextgroup=xinetdPathEq skipwhite
+
+syn keyword xinetdPPAttribute   include includedir
+                                \ nextgroup=xinetdPath skipwhite
+
+syn match   xinetdPathEq        contained display '='
+                                \ nextgroup=xinetdPath skipwhite
+
+syn match   xinetdPath          contained display '\S\+'
+
+syn keyword xinetdAttribute     contained redirect nextgroup=xinetdRedirectEq
+                                \ skipwhite
+
+syn match   xinetdRedirectEq    contained display '='
+                                \ nextgroup=xinetdRedirectIP skipwhite
+
+syn match   xinetdRedirectIP    contained display '\S\+'
+                                \ nextgroup=xinetdNumber skipwhite
+
+syn keyword xinetdAttribute     contained cps nextgroup=xinetdCPSEq skipwhite
+
+syn match   xinetdCPSEq         contained display '='
+                                \ nextgroup=xinetdCPS skipwhite
+
+syn match   xinetdCPS           contained display '\<\d\+\>'
+                                \ nextgroup=xinetdNumber skipwhite
+
+syn keyword xinetdAttribute     contained max_load nextgroup=xinetdFloatEq
+                                \ skipwhite
+
+syn match   xinetdFloatEq       contained display '='
+                                \ nextgroup=xinetdFloat skipwhite
+
+syn match   xinetdFloat         contained display '\d\+\.\d*\|\.\d\+'
+
+syn keyword xinetdAttribute     contained umask nextgroup=xinetdOctalEq
+                                \ skipwhite
+
+syn match   xinetdOctalEq       contained display '='
+                                \ nextgroup=xinetdOctal,xinetdOctalError
+                                \ skipwhite
+
+syn match   xinetdOctal         contained display '\<0\o\+\>'
+                                \ contains=xinetdOctalZero
+syn match   xinetdOctalZero     contained display '\<0'
+syn match   xinetdOctalError    contained display '\<0\o*[89]\d*\>'
+
+syn keyword xinetdAttribute     contained rlimit_as nextgroup=xinetdASEq
+                                \ skipwhite
+
+syn match   xinetdASEq          contained display '='
+                                \ nextgroup=xinetdAS,xinetdUnlimited
+                                \ skipwhite
+
+syn match   xinetdAS            contained display '\d\+' nextgroup=xinetdASMult
+
+syn match   xinetdASMult        contained display '[KM]'
+
+syn keyword xinetdAttribute     contained deny_time nextgroup=xinetdDenyTimeEq
+                                \ skipwhite
+
+syn match   xinetdDenyTimeEq    contained display '='
+                                \ nextgroup=xinetdDenyTime,xinetdNumber
+                                \ skipwhite
+
+syn keyword xinetdDenyTime      contained FOREVER NEVER
+
+hi def link xinetdTodo          Todo
+hi def link xinetdComment       Comment
+hi def link xinetdService       Keyword
+hi def link xinetdServiceName   String
+hi def link xinetdDefaults      Keyword
+hi def link xinetdServiceGroupD Delimiter
+hi def link xinetdReqAttribute  Keyword
+hi def link xinetdAttribute     Type
+hi def link xinetdEq            Operator
+hi def link xinetdStringEq      xinetdEq
+hi def link xinetdString        String
+hi def link xinetdTypeEq        xinetdEq
+hi def link xinetdType          Identifier
+hi def link xinetdFlagsEq       xinetdEq
+hi def link xinetdFlags         xinetdType
+hi def link xinetdDeprFlags     WarningMsg
+hi def link xinetdDisable       Special
+hi def link xinetdBooleanEq     xinetdEq
+hi def link xinetdBoolean       Boolean
+hi def link xinetdSocketTypeEq  xinetdEq
+hi def link xinetdSocketType    xinetdType
+hi def link xinetdUNumberEq     xinetdEq
+hi def link xinetdUnlimited     Define
+hi def link xinetdNumber        Number
+hi def link xinetdSignedNumEq   xinetdEq
+hi def link xinetdSignedNumber  xinetdNumber
+hi def link xinetdStringsEq     xinetdEq
+hi def link xinetdStrings       xinetdString
+hi def link xinetdStringsAdvEq  xinetdEq
+hi def link xinetdTimeRangesEq  xinetdEq
+hi def link xinetdTimeRanges    Number
+hi def link xinetdLogTypeEq     xinetdEq
+hi def link xinetdLogType       Keyword
+hi def link xinetdSyslogType    xinetdType
+hi def link xinetdSyslogLevel   Number
+hi def link xinetdLogFile       xinetdPath
+hi def link xinetdLogSoftLimit  xinetdNumber
+hi def link xinetdLogHardLimit  xinetdNumber
+hi def link xinetdLogSuccessEq  xinetdEq
+hi def link xinetdLogSuccess    xinetdType
+hi def link xinetdLogFailureEq  xinetdEq
+hi def link xinetdLogFailure    xinetdType
+hi def link xinetdRPCVersionEq  xinetdEq
+hi def link xinetdRPCVersion    xinetdNumber
+hi def link xinetdNumberEq      xinetdEq
+hi def link xinetdEnvEq         xinetdEq
+hi def link xinetdEnvName       Identifier
+hi def link xinetdEnvNameEq     xinetdEq
+hi def link xinetdEnvValue      String
+hi def link xinetdPPAttribute   PreProc
+hi def link xinetdPathEq        xinetdEq
+hi def link xinetdPath          String
+hi def link xinetdRedirectEq    xinetdEq
+hi def link xinetdRedirectIP    String
+hi def link xinetdCPSEq         xinetdEq
+hi def link xinetdCPS           xinetdNumber
+hi def link xinetdFloatEq       xinetdEq
+hi def link xinetdFloat         xinetdNumber
+hi def link xinetdOctalEq       xinetdEq
+hi def link xinetdOctal         xinetdNumber
+hi def link xinetdOctalZero     PreProc
+hi def link xinetdOctalError    Error
+hi def link xinetdASEq          xinetdEq
+hi def link xinetdAS            xinetdNumber
+hi def link xinetdASMult        PreProc
+hi def link xinetdDenyTimeEq    xinetdEq
+hi def link xinetdDenyTime      PreProc
+
+let b:current_syntax = "xinetd"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/xmath.vim b/syntax/xmath.vim
new file mode 100644
index 000000000..5824eddcd
--- /dev/null
+++ b/syntax/xmath.vim
@@ -0,0 +1,229 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xmath') == -1
+
+" Vim syntax file
+" Language:	xmath (a simulation tool)
+" Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Last Change:	Aug 31, 2016
+" Version:	10
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_XMATH
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" parenthesis sanity checker
+syn region xmathZone	matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" transparent contains=ALLBUT,xmathError,xmathBraceError,xmathCurlyError
+syn region xmathZone	matchgroup=Delimiter start="{" matchgroup=Delimiter end="}" transparent contains=ALLBUT,xmathError,xmathBraceError,xmathParenError
+syn region xmathZone	matchgroup=Delimiter start="\[" matchgroup=Delimiter end="]" transparent contains=ALLBUT,xmathError,xmathCurlyError,xmathParenError
+syn match  xmathError	"[)\]}]"
+syn match  xmathBraceError	"[)}]"	contained
+syn match  xmathCurlyError	"[)\]]"	contained
+syn match  xmathParenError	"[\]}]"	contained
+syn match  xmathComma	"[,;:]"
+syn match  xmathComma	"\.\.\.$"
+
+" A bunch of useful xmath keywords
+syn case ignore
+syn keyword xmathFuncCmd	function	endfunction	command	endcommand
+syn keyword xmathStatement	abort	beep	debug	default	define
+syn keyword xmathStatement	execute	exit	pause	return	undefine
+syn keyword xmathConditional	if	else	elseif	endif
+syn keyword xmathRepeat	while	for	endwhile	endfor
+syn keyword xmathCmd	anigraph	deletedatastore	keep	renamedatastore
+syn keyword xmathCmd	autocode	deletestd	linkhyper	renamestd
+syn keyword xmathCmd	build	deletesuperblock	linksim	renamesuperblock
+syn keyword xmathCmd	comment	deletetransition	listusertype	save
+syn keyword xmathCmd	copydatastore	deleteusertype	load	sbadisplay
+syn keyword xmathCmd	copystd	detailmodel	lock	set
+syn keyword xmathCmd	copysuperblock	display	minmax_display	setsbdefault
+syn keyword xmathCmd	createblock	documentit	modifyblock	show
+syn keyword xmathCmd	createbubble	editcatalog	modifybubble	showlicense
+syn keyword xmathCmd	createconnection	erase	modifystd	showsbdefault
+syn keyword xmathCmd	creatertf	expandsuperbubble	modifysuperblock	stop
+syn keyword xmathCmd	createstd	for	modifytransition	stopcosim
+syn keyword xmathCmd	createsuperblock	go	modifyusertype	syntax
+syn keyword xmathCmd	createsuperbubble	goto	new	unalias
+syn keyword xmathCmd	createtransition	hardcopy	next	unlock
+syn keyword xmathCmd	createusertype	help	polargraph	usertype
+syn keyword xmathCmd	delete	hyperbuild	print	whatis
+syn keyword xmathCmd	deleteblock	if	printmodel	while
+syn keyword xmathCmd	deletebubble	ifilter	quit	who
+syn keyword xmathCmd	deleteconnection	ipcwc	remove	xgraph
+
+syn keyword xmathFunc	abcd	eye	irea	querystdoptions
+syn keyword xmathFunc	abs	eyepattern	is	querysuperblock
+syn keyword xmathFunc	acos	feedback	ISID	querysuperblockopt
+syn keyword xmathFunc	acosh	fft	ISID	Models	querytransition
+syn keyword xmathFunc	adconversion	fftpdm	kronecker	querytransitionopt
+syn keyword xmathFunc	afeedback	filter	length	qz
+syn keyword xmathFunc	all	find	limit	rampinvar
+syn keyword xmathFunc	ambiguity	firparks	lin	random
+syn keyword xmathFunc	amdemod	firremez	lin30	randpdm
+syn keyword xmathFunc	analytic	firwind	linearfm	randpert
+syn keyword xmathFunc	analyze	fmdemod	linfnorm	randsys
+syn keyword xmathFunc	any	forwdiff	lintodb	rank
+syn keyword xmathFunc	append	fprintf	list	rayleigh
+syn keyword xmathFunc	argn	frac	log	rcepstrum
+syn keyword xmathFunc	argv	fracred	log10	rcond
+syn keyword xmathFunc	arma	freq	logm	rdintegrate
+syn keyword xmathFunc	arma2ss	freqcircle	lognormal	read
+syn keyword xmathFunc	armax	freqcont	logspace	real
+syn keyword xmathFunc	ascii	frequencyhop	lowpass	rectify
+syn keyword xmathFunc	asin	fsesti	lpopt	redschur
+syn keyword xmathFunc	asinh	fslqgcomp	lqgcomp	reflect
+syn keyword xmathFunc	atan	fsregu	lqgltr	regulator
+syn keyword xmathFunc	atan2	fwls	ls	residue
+syn keyword xmathFunc	atanh	gabor	ls2unc	riccati
+syn keyword xmathFunc	attach_ac100	garb	ls2var	riccati_eig
+syn keyword xmathFunc	backdiff	gaussian	lsjoin	riccati_schur
+syn keyword xmathFunc	balance	gcexp	lu	ricean
+syn keyword xmathFunc	balmoore	gcos	lyapunov	rifd
+syn keyword xmathFunc	bandpass	gdfileselection	makecontinuous	rlinfo
+syn keyword xmathFunc	bandstop	gdmessage	makematrix	rlocus
+syn keyword xmathFunc	bj	gdselection	makepoly	rms
+syn keyword xmathFunc	blknorm	genconv	margin	rootlocus
+syn keyword xmathFunc	bode	get	markoff	roots
+syn keyword xmathFunc	bpm	get_info30	matchedpz	round
+syn keyword xmathFunc	bpm2inn	get_inn	max	rref
+syn keyword xmathFunc	bpmjoin	gfdm	maxlike	rve_get
+syn keyword xmathFunc	bpmsplit	gfsk	mean	rve_info
+syn keyword xmathFunc	bst	gfskernel	mergeseg	rve_reset
+syn keyword xmathFunc	buttconstr	gfunction	min	rve_update
+syn keyword xmathFunc	butterworth	ggauss	minimal	samplehold
+syn keyword xmathFunc	cancel	giv	mkpert	schur
+syn keyword xmathFunc	canform	giv2var	mkphase	sdf
+syn keyword xmathFunc	ccepstrum	givjoin	mma	sds
+syn keyword xmathFunc	char	gpsk	mmaget	sdtrsp
+syn keyword xmathFunc	chebconstr	gpulse	mmaput	sec
+syn keyword xmathFunc	chebyshev	gqam	mod	sech
+syn keyword xmathFunc	check	gqpsk	modal	siginterp
+syn keyword xmathFunc	cholesky	gramp	modalstate	sign
+syn keyword xmathFunc	chop	gsawtooth	modcarrier	sim
+syn keyword xmathFunc	circonv	gsigmoid	mreduce	sim30
+syn keyword xmathFunc	circorr	gsin	mtxplt	simin
+syn keyword xmathFunc	clock	gsinc	mu	simin30
+syn keyword xmathFunc	clocus	gsqpsk	mulhank	simout
+syn keyword xmathFunc	clsys	gsquarewave	multipath	simout30
+syn keyword xmathFunc	coherence	gstep	musynfit	simtransform
+syn keyword xmathFunc	colorind	GuiDialogCreate	mxstr2xmstr	sin
+syn keyword xmathFunc	combinepf	GuiDialogDestroy	mxstring2xmstring	singriccati
+syn keyword xmathFunc	commentof	GuiFlush	names	sinh
+syn keyword xmathFunc	compare	GuiGetValue	nichols	sinm
+syn keyword xmathFunc	complementaryerf	GuiManage	noisefilt	size
+syn keyword xmathFunc	complexenvelope	GuiPlot	none	smargin
+syn keyword xmathFunc	complexfreqshift	GuiPlotGet	norm	sns2sys
+syn keyword xmathFunc	concatseg	GuiSetValue	numden	sort
+syn keyword xmathFunc	condition	GuiShellCreate	nyquist	spectrad
+syn keyword xmathFunc	conj	GuiShellDeiconify	obscf	spectrum
+syn keyword xmathFunc	conmap	GuiShellDestroy	observable	spline
+syn keyword xmathFunc	connect	GuiShellIconify	oe	sprintf
+syn keyword xmathFunc	conpdm	GuiShellLower	ones	sqrt
+syn keyword xmathFunc	constellation	GuiShellRaise	ophank	sqrtm
+syn keyword xmathFunc	consys	GuiShellRealize	optimize	sresidualize
+syn keyword xmathFunc	controllable	GuiShellUnrealize	optscale	ss2arma
+syn keyword xmathFunc	convolve	GuiTimer	orderfilt	sst
+syn keyword xmathFunc	correlate	GuiToolCreate	orderstate	ssv
+syn keyword xmathFunc	cos	GuiToolDestroy	orth	stable
+syn keyword xmathFunc	cosh	GuiToolExist	oscmd	stair
+syn keyword xmathFunc	cosm	GuiUnmanage	oscope	starp
+syn keyword xmathFunc	cot	GuiWidgetExist	osscale	step
+syn keyword xmathFunc	coth	h2norm	padcrop	stepinvar
+syn keyword xmathFunc	covariance	h2syn	partialsum	string
+syn keyword xmathFunc	csc	hadamard	pdm	stringex
+syn keyword xmathFunc	csch	hankelsv	pdmslice	substr
+syn keyword xmathFunc	csum	hessenberg	pem	subsys
+syn keyword xmathFunc	ctrcf	highpass	perfplots	sum
+syn keyword xmathFunc	ctrlplot	hilbert	period	svd
+syn keyword xmathFunc	daug	hilberttransform	pfscale	svplot
+syn keyword xmathFunc	dbtolin	hinfcontr	phaseshift	sweep
+syn keyword xmathFunc	dct	hinfnorm	pinv	symbolmap
+syn keyword xmathFunc	decimate	hinfsyn	plot	sys2sns
+syn keyword xmathFunc	defFreqRange	histogram	plot30	sysic
+syn keyword xmathFunc	defTimeRange	idfreq	pmdemod	Sysid
+syn keyword xmathFunc	delay	idimpulse	poisson	system
+syn keyword xmathFunc	delsubstr	idsim	poissonimpulse	tan
+syn keyword xmathFunc	det	ifft	poleplace	tanh
+syn keyword xmathFunc	detrend	imag	poles	taper
+syn keyword xmathFunc	dht	impinvar	polezero	tfid
+syn keyword xmathFunc	diagonal	impplot	poltrend	toeplitz
+syn keyword xmathFunc	differentiate	impulse	polyfit	trace
+syn keyword xmathFunc	directsequence	index	polynomial	tril
+syn keyword xmathFunc	discretize	indexlist	polyval	trim
+syn keyword xmathFunc	divide	initial	polyvalm	trim30
+syn keyword xmathFunc	domain	initmodel	prbs	triu
+syn keyword xmathFunc	dst	initx0	product	trsp
+syn keyword xmathFunc	eig	inn2bpm	psd	truncate
+syn keyword xmathFunc	ellipconstr	inn2pe	put_inn	tustin
+syn keyword xmathFunc	elliptic	inn2unc	qpopt	uniform
+syn keyword xmathFunc	erf	insertseg	qr	val
+syn keyword xmathFunc	error	int	quantize	variance
+syn keyword xmathFunc	estimator	integrate	queryblock	videolines
+syn keyword xmathFunc	etfe	integratedump	queryblockoptions	wcbode
+syn keyword xmathFunc	exist	interp	querybubble	wcgain
+syn keyword xmathFunc	exp	interpolate	querybubbleoptionswindow
+syn keyword xmathFunc	expm	inv	querycatalog	wtbalance
+syn keyword xmathFunc	extractchan	invhilbert	queryconnection	zeros
+syn keyword xmathFunc	extractseg	iqmix	querystd
+
+syn case match
+
+" Labels (supports xmath's goto)
+syn match   xmathLabel	 "^\s*<[a-zA-Z_][a-zA-Z0-9]*>"
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match   xmathSpecial	contained "\\\d\d\d\|\\."
+syn region  xmathString	start=+"+  skip=+\\\\\|\\"+  end=+"+ contains=xmathSpecial,@Spell
+syn match   xmathCharacter	"'[^\\]'"
+syn match   xmathSpecialChar	"'\\.'"
+
+syn match   xmathNumber	"-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
+
+" Comments:
+" xmath supports #...  (like Unix shells)
+"       and      #{ ... }# comment blocks
+syn cluster xmathCommentGroup	contains=xmathString,xmathTodo,@Spell
+syn keyword xmathTodo contained	COMBAK	DEBUG	FIXME	Todo	TODO	XXX
+syn match   xmathComment	"#.*$"		contains=@xmathCommentGroup
+syn region  xmathCommentBlock	start="#{" end="}#"	contains=@xmathCommentGroup
+
+" synchronizing
+syn sync match xmathSyncComment	grouphere xmathCommentBlock "#{"
+syn sync match xmathSyncComment	groupthere NONE "}#"
+
+" Define the default highlighting.
+if !exists("skip_xmath_syntax_inits")
+
+  hi def link xmathBraceError	xmathError
+  hi def link xmathCmd	xmathStatement
+  hi def link xmathCommentBlock	xmathComment
+  hi def link xmathCurlyError	xmathError
+  hi def link xmathFuncCmd	xmathStatement
+  hi def link xmathParenError	xmathError
+
+  " The default methods for highlighting.  Can be overridden later
+  hi def link xmathCharacter	Character
+  hi def link xmathComma	Delimiter
+  hi def link xmathComment	Comment
+  hi def link xmathCommentBlock	Comment
+  hi def link xmathConditional	Conditional
+  hi def link xmathError	Error
+  hi def link xmathFunc	Function
+  hi def link xmathLabel	PreProc
+  hi def link xmathNumber	Number
+  hi def link xmathRepeat	Repeat
+  hi def link xmathSpecial	Type
+  hi def link xmathSpecialChar	SpecialChar
+  hi def link xmathStatement	Statement
+  hi def link xmathString	String
+  hi def link xmathTodo	Todo
+
+endif
+
+let b:current_syntax = "xmath"
+
+" vim: ts=17
+
+endif
diff --git a/syntax/xmodmap.vim b/syntax/xmodmap.vim
new file mode 100644
index 000000000..b0de83098
--- /dev/null
+++ b/syntax/xmodmap.vim
@@ -0,0 +1,681 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xmodmap') == -1
+
+" Vim syntax file
+" Language:             xmodmap(1) definition file
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-04-19
+
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn keyword xmodmapTodo       contained TODO FIXME XXX NOTE
+
+syn region  xmodmapComment    display oneline start='^!' end='$'
+                              \ contains=xmodmapTodo,@Spell
+
+syn case ignore
+syn match   xmodmapInt        display '\<\d\+\>'
+syn match   xmodmapHex        display '\<0x\x\+\>'
+syn match   xmodmapOctal      display '\<0\o\+\>'
+syn match   xmodmapOctalError display '\<0\o*[89]\d*'
+syn case match
+
+syn match   xmodmapKeySym     display '\<[A-Za-z]\>'
+
+" #include <X11/keysymdef.h>
+syn keyword xmodmapKeySym     XK_VoidSymbol XK_BackSpace XK_Tab XK_Linefeed
+                              \ XK_Clear XK_Return XK_Pause XK_Scroll_Lock
+                              \ XK_Sys_Req XK_Escape XK_Delete XK_Multi_key
+                              \ XK_Codeinput XK_SingleCandidate
+                              \ XK_MultipleCandidate XK_PreviousCandidate
+                              \ XK_Kanji XK_Muhenkan XK_Henkan_Mode
+                              \ XK_Henkan XK_Romaji XK_Hiragana XK_Katakana
+                              \ XK_Hiragana_Katakana XK_Zenkaku XK_Hankaku
+                              \ XK_Zenkaku_Hankaku XK_Touroku XK_Massyo
+                              \ XK_Kana_Lock XK_Kana_Shift XK_Eisu_Shift
+                              \ XK_Eisu_toggle XK_Kanji_Bangou XK_Zen_Koho
+                              \ XK_Mae_Koho XK_Home XK_Left XK_Up XK_Right
+                              \ XK_Down XK_Prior XK_Page_Up XK_Next
+                              \ XK_Page_Down XK_End XK_Begin XK_Select
+                              \ XK_Print XK_Execute XK_Insert XK_Undo XK_Redo
+                              \ XK_Menu XK_Find XK_Cancel XK_Help XK_Break
+                              \ XK_Mode_switch XK_script_switch XK_Num_Lock
+                              \ XK_KP_Space XK_KP_Tab XK_KP_Enter XK_KP_F1
+                              \ XK_KP_F2 XK_KP_F3 XK_KP_F4 XK_KP_Home
+                              \ XK_KP_Left XK_KP_Up XK_KP_Right XK_KP_Down
+                              \ XK_KP_Prior XK_KP_Page_Up XK_KP_Next
+                              \ XK_KP_Page_Down XK_KP_End XK_KP_Begin
+                              \ XK_KP_Insert XK_KP_Delete XK_KP_Equal
+                              \ XK_KP_Multiply XK_KP_Add XK_KP_Separator
+                              \ XK_KP_Subtract XK_KP_Decimal XK_KP_Divide
+                              \ XK_KP_0 XK_KP_1 XK_KP_2 XK_KP_3 XK_KP_4
+                              \ XK_KP_5 XK_KP_6 XK_KP_7 XK_KP_8 XK_KP_9 XK_F1
+                              \ XK_F2 XK_F3 XK_F4 XK_F5 XK_F6 XK_F7 XK_F8
+                              \ XK_F9 XK_F10 XK_F11 XK_L1 XK_F12 XK_L2 XK_F13
+                              \ XK_L3 XK_F14 XK_L4 XK_F15 XK_L5 XK_F16 XK_L6
+                              \ XK_F17 XK_L7 XK_F18 XK_L8 XK_F19 XK_L9 XK_F20
+                              \ XK_L10 XK_F21 XK_R1 XK_F22 XK_R2 XK_F23
+                              \ XK_R3 XK_F24 XK_R4 XK_F25 XK_R5 XK_F26
+                              \ XK_R6 XK_F27 XK_R7 XK_F28 XK_R8 XK_F29
+                              \ XK_R9 XK_F30 XK_R10 XK_F31 XK_R11 XK_F32
+                              \ XK_R12 XK_F33 XK_R13 XK_F34 XK_R14 XK_F35
+                              \ XK_R15 XK_Shift_L XK_Shift_R XK_Control_L
+                              \ XK_Control_R XK_Caps_Lock XK_Shift_Lock
+                              \ XK_Meta_L XK_Meta_R XK_Alt_L XK_Alt_R
+                              \ XK_Super_L XK_Super_R XK_Hyper_L XK_Hyper_R
+                              \ XK_dead_hook XK_dead_horn XK_3270_Duplicate
+                              \ XK_3270_FieldMark XK_3270_Right2 XK_3270_Left2
+                              \ XK_3270_BackTab XK_3270_EraseEOF
+                              \ XK_3270_EraseInput XK_3270_Reset
+                              \ XK_3270_Quit XK_3270_PA1 XK_3270_PA2
+                              \ XK_3270_PA3 XK_3270_Test XK_3270_Attn
+                              \ XK_3270_CursorBlink XK_3270_AltCursor
+                              \ XK_3270_KeyClick XK_3270_Jump
+                              \ XK_3270_Ident XK_3270_Rule XK_3270_Copy
+                              \ XK_3270_Play XK_3270_Setup XK_3270_Record
+                              \ XK_3270_ChangeScreen XK_3270_DeleteWord
+                              \ XK_3270_ExSelect XK_3270_CursorSelect
+                              \ XK_3270_PrintScreen XK_3270_Enter XK_space
+                              \ XK_exclam XK_quotedbl XK_numbersign XK_dollar
+                              \ XK_percent XK_ampersand XK_apostrophe
+                              \ XK_quoteright XK_parenleft XK_parenright
+                              \ XK_asterisk XK_plus XK_comma XK_minus
+                              \ XK_period XK_slash XK_0 XK_1 XK_2 XK_3
+                              \ XK_4 XK_5 XK_6 XK_7 XK_8 XK_9 XK_colon
+                              \ XK_semicolon XK_less XK_equal XK_greater
+                              \ XK_question XK_at XK_A XK_B XK_C XK_D XK_E
+                              \ XK_F XK_G XK_H XK_I XK_J XK_K XK_L XK_M XK_N
+                              \ XK_O XK_P XK_Q XK_R XK_S XK_T XK_U XK_V XK_W
+                              \ XK_X XK_Y XK_Z XK_bracketleft XK_backslash
+                              \ XK_bracketright XK_asciicircum XK_underscore
+                              \ XK_grave XK_quoteleft XK_a XK_b XK_c XK_d
+                              \ XK_e XK_f XK_g XK_h XK_i XK_j XK_k XK_l
+                              \ XK_m XK_n XK_o XK_p XK_q XK_r XK_s XK_t XK_u
+                              \ XK_v XK_w XK_x XK_y XK_z XK_braceleft XK_bar
+                              \ XK_braceright XK_asciitilde XK_nobreakspace
+                              \ XK_exclamdown XK_cent XK_sterling XK_currency
+                              \ XK_yen XK_brokenbar XK_section XK_diaeresis
+                              \ XK_copyright XK_ordfeminine XK_guillemotleft
+                              \ XK_notsign XK_hyphen XK_registered XK_macron
+                              \ XK_degree XK_plusminus XK_twosuperior
+                              \ XK_threesuperior XK_acute XK_mu XK_paragraph
+                              \ XK_periodcentered XK_cedilla XK_onesuperior
+                              \ XK_masculine XK_guillemotright XK_onequarter
+                              \ XK_onehalf XK_threequarters XK_questiondown
+                              \ XK_Agrave XK_Aacute XK_Acircumflex XK_Atilde
+                              \ XK_Adiaeresis XK_Aring XK_AE XK_Ccedilla
+                              \ XK_Egrave XK_Eacute XK_Ecircumflex
+                              \ XK_Ediaeresis XK_Igrave XK_Iacute
+                              \ XK_Icircumflex XK_Idiaeresis XK_ETH XK_Eth
+                              \ XK_Ntilde XK_Ograve XK_Oacute XK_Ocircumflex
+                              \ XK_Otilde XK_Odiaeresis XK_multiply
+                              \ XK_Ooblique XK_Ugrave XK_Uacute XK_Ucircumflex
+                              \ XK_Udiaeresis XK_Yacute XK_THORN XK_Thorn
+                              \ XK_ssharp XK_agrave XK_aacute XK_acircumflex
+                              \ XK_atilde XK_adiaeresis XK_aring XK_ae
+                              \ XK_ccedilla XK_egrave XK_eacute XK_ecircumflex
+                              \ XK_ediaeresis XK_igrave XK_iacute
+                              \ XK_icircumflex XK_idiaeresis XK_eth XK_ntilde
+                              \ XK_ograve XK_oacute XK_ocircumflex XK_otilde
+                              \ XK_odiaeresis XK_division XK_oslash XK_ugrave
+                              \ XK_uacute XK_ucircumflex XK_udiaeresis
+                              \ XK_yacute XK_thorn XK_ydiaeresis XK_Aogonek
+                              \ XK_breve XK_Lstroke XK_Lcaron XK_Sacute
+                              \ XK_Scaron XK_Scedilla XK_Tcaron XK_Zacute
+                              \ XK_Zcaron XK_Zabovedot XK_aogonek XK_ogonek
+                              \ XK_lstroke XK_lcaron XK_sacute XK_caron
+                              \ XK_scaron XK_scedilla XK_tcaron XK_zacute
+                              \ XK_doubleacute XK_zcaron XK_zabovedot
+                              \ XK_Racute XK_Abreve XK_Lacute XK_Cacute
+                              \ XK_Ccaron XK_Eogonek XK_Ecaron XK_Dcaron
+                              \ XK_Dstroke XK_Nacute XK_Ncaron XK_Odoubleacute
+                              \ XK_Rcaron XK_Uring XK_Udoubleacute
+                              \ XK_Tcedilla XK_racute XK_abreve XK_lacute
+                              \ XK_cacute XK_ccaron XK_eogonek XK_ecaron
+                              \ XK_dcaron XK_dstroke XK_nacute XK_ncaron
+                              \ XK_odoubleacute XK_udoubleacute XK_rcaron
+                              \ XK_uring XK_tcedilla XK_abovedot XK_Hstroke
+                              \ XK_Hcircumflex XK_Iabovedot XK_Gbreve
+                              \ XK_Jcircumflex XK_hstroke XK_hcircumflex
+                              \ XK_idotless XK_gbreve XK_jcircumflex
+                              \ XK_Cabovedot XK_Ccircumflex XK_Gabovedot
+                              \ XK_Gcircumflex XK_Ubreve XK_Scircumflex
+                              \ XK_cabovedot XK_ccircumflex XK_gabovedot
+                              \ XK_gcircumflex XK_ubreve XK_scircumflex XK_kra
+                              \ XK_kappa XK_Rcedilla XK_Itilde XK_Lcedilla
+                              \ XK_Emacron XK_Gcedilla XK_Tslash XK_rcedilla
+                              \ XK_itilde XK_lcedilla XK_emacron XK_gcedilla
+                              \ XK_tslash XK_ENG XK_eng XK_Amacron XK_Iogonek
+                              \ XK_Eabovedot XK_Imacron XK_Ncedilla XK_Omacron
+                              \ XK_Kcedilla XK_Uogonek XK_Utilde XK_Umacron
+                              \ XK_amacron XK_iogonek XK_eabovedot XK_imacron
+                              \ XK_ncedilla XK_omacron XK_kcedilla XK_uogonek
+                              \ XK_utilde XK_umacron XK_Babovedot XK_babovedot
+                              \ XK_Dabovedot XK_Wgrave XK_Wacute XK_dabovedot
+                              \ XK_Ygrave XK_Fabovedot XK_fabovedot
+                              \ XK_Mabovedot XK_mabovedot XK_Pabovedot
+                              \ XK_wgrave XK_pabovedot XK_wacute XK_Sabovedot
+                              \ XK_ygrave XK_Wdiaeresis XK_wdiaeresis
+                              \ XK_sabovedot XK_Wcircumflex XK_Tabovedot
+                              \ XK_Ycircumflex XK_wcircumflex
+                              \ XK_tabovedot XK_ycircumflex XK_OE XK_oe
+                              \ XK_Ydiaeresis XK_overline XK_kana_fullstop
+                              \ XK_kana_openingbracket XK_kana_closingbracket
+                              \ XK_kana_comma XK_kana_conjunctive
+                              \ XK_kana_middledot XK_kana_WO XK_kana_a
+                              \ XK_kana_i XK_kana_u XK_kana_e XK_kana_o
+                              \ XK_kana_ya XK_kana_yu XK_kana_yo
+                              \ XK_kana_tsu XK_kana_tu XK_prolongedsound
+                              \ XK_kana_A XK_kana_I XK_kana_U XK_kana_E
+                              \ XK_kana_O XK_kana_KA XK_kana_KI XK_kana_KU
+                              \ XK_kana_KE XK_kana_KO XK_kana_SA XK_kana_SHI
+                              \ XK_kana_SU XK_kana_SE XK_kana_SO XK_kana_TA
+                              \ XK_kana_CHI XK_kana_TI XK_kana_TSU
+                              \ XK_kana_TU XK_kana_TE XK_kana_TO XK_kana_NA
+                              \ XK_kana_NI XK_kana_NU XK_kana_NE XK_kana_NO
+                              \ XK_kana_HA XK_kana_HI XK_kana_FU XK_kana_HU
+                              \ XK_kana_HE XK_kana_HO XK_kana_MA XK_kana_MI
+                              \ XK_kana_MU XK_kana_ME XK_kana_MO XK_kana_YA
+                              \ XK_kana_YU XK_kana_YO XK_kana_RA XK_kana_RI
+                              \ XK_kana_RU XK_kana_RE XK_kana_RO XK_kana_WA
+                              \ XK_kana_N XK_voicedsound XK_semivoicedsound
+                              \ XK_kana_switch XK_Farsi_0 XK_Farsi_1
+                              \ XK_Farsi_2 XK_Farsi_3 XK_Farsi_4 XK_Farsi_5
+                              \ XK_Farsi_6 XK_Farsi_7 XK_Farsi_8 XK_Farsi_9
+                              \ XK_Arabic_percent XK_Arabic_superscript_alef
+                              \ XK_Arabic_tteh XK_Arabic_peh XK_Arabic_tcheh
+                              \ XK_Arabic_ddal XK_Arabic_rreh XK_Arabic_comma
+                              \ XK_Arabic_fullstop XK_Arabic_0 XK_Arabic_1
+                              \ XK_Arabic_2 XK_Arabic_3 XK_Arabic_4
+                              \ XK_Arabic_5 XK_Arabic_6 XK_Arabic_7
+                              \ XK_Arabic_8 XK_Arabic_9 XK_Arabic_semicolon
+                              \ XK_Arabic_question_mark XK_Arabic_hamza
+                              \ XK_Arabic_maddaonalef XK_Arabic_hamzaonalef
+                              \ XK_Arabic_hamzaonwaw XK_Arabic_hamzaunderalef
+                              \ XK_Arabic_hamzaonyeh XK_Arabic_alef
+                              \ XK_Arabic_beh XK_Arabic_tehmarbuta
+                              \ XK_Arabic_teh XK_Arabic_theh XK_Arabic_jeem
+                              \ XK_Arabic_hah XK_Arabic_khah XK_Arabic_dal
+                              \ XK_Arabic_thal XK_Arabic_ra XK_Arabic_zain
+                              \ XK_Arabic_seen XK_Arabic_sheen
+                              \ XK_Arabic_sad XK_Arabic_dad XK_Arabic_tah
+                              \ XK_Arabic_zah XK_Arabic_ain XK_Arabic_ghain
+                              \ XK_Arabic_tatweel XK_Arabic_feh XK_Arabic_qaf
+                              \ XK_Arabic_kaf XK_Arabic_lam XK_Arabic_meem
+                              \ XK_Arabic_noon XK_Arabic_ha XK_Arabic_heh
+                              \ XK_Arabic_waw XK_Arabic_alefmaksura
+                              \ XK_Arabic_yeh XK_Arabic_fathatan
+                              \ XK_Arabic_dammatan XK_Arabic_kasratan
+                              \ XK_Arabic_fatha XK_Arabic_damma
+                              \ XK_Arabic_kasra XK_Arabic_shadda
+                              \ XK_Arabic_sukun XK_Arabic_madda_above
+                              \ XK_Arabic_hamza_above XK_Arabic_hamza_below
+                              \ XK_Arabic_jeh XK_Arabic_veh XK_Arabic_keheh
+                              \ XK_Arabic_gaf XK_Arabic_noon_ghunna
+                              \ XK_Arabic_heh_doachashmee XK_Farsi_yeh
+                              \ XK_Arabic_yeh_baree XK_Arabic_heh_goal
+                              \ XK_Arabic_switch XK_Cyrillic_GHE_bar
+                              \ XK_Cyrillic_ghe_bar XK_Cyrillic_ZHE_descender
+                              \ XK_Cyrillic_zhe_descender
+                              \ XK_Cyrillic_KA_descender
+                              \ XK_Cyrillic_ka_descender
+                              \ XK_Cyrillic_KA_vertstroke
+                              \ XK_Cyrillic_ka_vertstroke
+                              \ XK_Cyrillic_EN_descender
+                              \ XK_Cyrillic_en_descender
+                              \ XK_Cyrillic_U_straight XK_Cyrillic_u_straight
+                              \ XK_Cyrillic_U_straight_bar
+                              \ XK_Cyrillic_u_straight_bar
+                              \ XK_Cyrillic_HA_descender
+                              \ XK_Cyrillic_ha_descender
+                              \ XK_Cyrillic_CHE_descender
+                              \ XK_Cyrillic_che_descender
+                              \ XK_Cyrillic_CHE_vertstroke
+                              \ XK_Cyrillic_che_vertstroke XK_Cyrillic_SHHA
+                              \ XK_Cyrillic_shha XK_Cyrillic_SCHWA
+                              \ XK_Cyrillic_schwa XK_Cyrillic_I_macron
+                              \ XK_Cyrillic_i_macron XK_Cyrillic_O_bar
+                              \ XK_Cyrillic_o_bar XK_Cyrillic_U_macron
+                              \ XK_Cyrillic_u_macron XK_Serbian_dje
+                              \ XK_Macedonia_gje XK_Cyrillic_io
+                              \ XK_Ukrainian_ie XK_Ukranian_je
+                              \ XK_Macedonia_dse XK_Ukrainian_i XK_Ukranian_i
+                              \ XK_Ukrainian_yi XK_Ukranian_yi XK_Cyrillic_je
+                              \ XK_Serbian_je XK_Cyrillic_lje XK_Serbian_lje
+                              \ XK_Cyrillic_nje XK_Serbian_nje XK_Serbian_tshe
+                              \ XK_Macedonia_kje XK_Ukrainian_ghe_with_upturn
+                              \ XK_Byelorussian_shortu XK_Cyrillic_dzhe
+                              \ XK_Serbian_dze XK_numerosign
+                              \ XK_Serbian_DJE XK_Macedonia_GJE
+                              \ XK_Cyrillic_IO XK_Ukrainian_IE XK_Ukranian_JE
+                              \ XK_Macedonia_DSE XK_Ukrainian_I XK_Ukranian_I
+                              \ XK_Ukrainian_YI XK_Ukranian_YI XK_Cyrillic_JE
+                              \ XK_Serbian_JE XK_Cyrillic_LJE XK_Serbian_LJE
+                              \ XK_Cyrillic_NJE XK_Serbian_NJE XK_Serbian_TSHE
+                              \ XK_Macedonia_KJE XK_Ukrainian_GHE_WITH_UPTURN
+                              \ XK_Byelorussian_SHORTU XK_Cyrillic_DZHE
+                              \ XK_Serbian_DZE XK_Cyrillic_yu
+                              \ XK_Cyrillic_a XK_Cyrillic_be XK_Cyrillic_tse
+                              \ XK_Cyrillic_de XK_Cyrillic_ie XK_Cyrillic_ef
+                              \ XK_Cyrillic_ghe XK_Cyrillic_ha XK_Cyrillic_i
+                              \ XK_Cyrillic_shorti XK_Cyrillic_ka
+                              \ XK_Cyrillic_el XK_Cyrillic_em XK_Cyrillic_en
+                              \ XK_Cyrillic_o XK_Cyrillic_pe XK_Cyrillic_ya
+                              \ XK_Cyrillic_er XK_Cyrillic_es XK_Cyrillic_te
+                              \ XK_Cyrillic_u XK_Cyrillic_zhe XK_Cyrillic_ve
+                              \ XK_Cyrillic_softsign XK_Cyrillic_yeru
+                              \ XK_Cyrillic_ze XK_Cyrillic_sha XK_Cyrillic_e
+                              \ XK_Cyrillic_shcha XK_Cyrillic_che
+                              \ XK_Cyrillic_hardsign XK_Cyrillic_YU
+                              \ XK_Cyrillic_A XK_Cyrillic_BE XK_Cyrillic_TSE
+                              \ XK_Cyrillic_DE XK_Cyrillic_IE XK_Cyrillic_EF
+                              \ XK_Cyrillic_GHE XK_Cyrillic_HA XK_Cyrillic_I
+                              \ XK_Cyrillic_SHORTI XK_Cyrillic_KA
+                              \ XK_Cyrillic_EL XK_Cyrillic_EM XK_Cyrillic_EN
+                              \ XK_Cyrillic_O XK_Cyrillic_PE XK_Cyrillic_YA
+                              \ XK_Cyrillic_ER XK_Cyrillic_ES XK_Cyrillic_TE
+                              \ XK_Cyrillic_U XK_Cyrillic_ZHE XK_Cyrillic_VE
+                              \ XK_Cyrillic_SOFTSIGN XK_Cyrillic_YERU
+                              \ XK_Cyrillic_ZE XK_Cyrillic_SHA XK_Cyrillic_E
+                              \ XK_Cyrillic_SHCHA XK_Cyrillic_CHE
+                              \ XK_Cyrillic_HARDSIGN XK_Greek_ALPHAaccent
+                              \ XK_Greek_EPSILONaccent XK_Greek_ETAaccent
+                              \ XK_Greek_IOTAaccent XK_Greek_IOTAdieresis
+                              \ XK_Greek_OMICRONaccent XK_Greek_UPSILONaccent
+                              \ XK_Greek_UPSILONdieresis
+                              \ XK_Greek_OMEGAaccent XK_Greek_accentdieresis
+                              \ XK_Greek_horizbar XK_Greek_alphaaccent
+                              \ XK_Greek_epsilonaccent XK_Greek_etaaccent
+                              \ XK_Greek_iotaaccent XK_Greek_iotadieresis
+                              \ XK_Greek_iotaaccentdieresis
+                              \ XK_Greek_omicronaccent XK_Greek_upsilonaccent
+                              \ XK_Greek_upsilondieresis
+                              \ XK_Greek_upsilonaccentdieresis
+                              \ XK_Greek_omegaaccent XK_Greek_ALPHA
+                              \ XK_Greek_BETA XK_Greek_GAMMA XK_Greek_DELTA
+                              \ XK_Greek_EPSILON XK_Greek_ZETA XK_Greek_ETA
+                              \ XK_Greek_THETA XK_Greek_IOTA XK_Greek_KAPPA
+                              \ XK_Greek_LAMDA XK_Greek_LAMBDA XK_Greek_MU
+                              \ XK_Greek_NU XK_Greek_XI XK_Greek_OMICRON
+                              \ XK_Greek_PI XK_Greek_RHO XK_Greek_SIGMA
+                              \ XK_Greek_TAU XK_Greek_UPSILON XK_Greek_PHI
+                              \ XK_Greek_CHI XK_Greek_PSI XK_Greek_OMEGA
+                              \ XK_Greek_alpha XK_Greek_beta XK_Greek_gamma
+                              \ XK_Greek_delta XK_Greek_epsilon XK_Greek_zeta
+                              \ XK_Greek_eta XK_Greek_theta XK_Greek_iota
+                              \ XK_Greek_kappa XK_Greek_lamda XK_Greek_lambda
+                              \ XK_Greek_mu XK_Greek_nu XK_Greek_xi
+                              \ XK_Greek_omicron XK_Greek_pi XK_Greek_rho
+                              \ XK_Greek_sigma XK_Greek_finalsmallsigma
+                              \ XK_Greek_tau XK_Greek_upsilon XK_Greek_phi
+                              \ XK_Greek_chi XK_Greek_psi XK_Greek_omega
+                              \ XK_Greek_switch XK_leftradical
+                              \ XK_topleftradical XK_horizconnector
+                              \ XK_topintegral XK_botintegral
+                              \ XK_vertconnector XK_topleftsqbracket
+                              \ XK_botleftsqbracket XK_toprightsqbracket
+                              \ XK_botrightsqbracket XK_topleftparens
+                              \ XK_botleftparens XK_toprightparens
+                              \ XK_botrightparens XK_leftmiddlecurlybrace
+                              \ XK_rightmiddlecurlybrace
+                              \ XK_topleftsummation XK_botleftsummation
+                              \ XK_topvertsummationconnector
+                              \ XK_botvertsummationconnector
+                              \ XK_toprightsummation XK_botrightsummation
+                              \ XK_rightmiddlesummation XK_lessthanequal
+                              \ XK_notequal XK_greaterthanequal XK_integral
+                              \ XK_therefore XK_variation XK_infinity
+                              \ XK_nabla XK_approximate XK_similarequal
+                              \ XK_ifonlyif XK_implies XK_identical XK_radical
+                              \ XK_includedin XK_includes XK_intersection
+                              \ XK_union XK_logicaland XK_logicalor
+                              \ XK_partialderivative XK_function XK_leftarrow
+                              \ XK_uparrow XK_rightarrow XK_downarrow XK_blank
+                              \ XK_soliddiamond XK_checkerboard XK_ht XK_ff
+                              \ XK_cr XK_lf XK_nl XK_vt XK_lowrightcorner
+                              \ XK_uprightcorner XK_upleftcorner
+                              \ XK_lowleftcorner XK_crossinglines
+                              \ XK_horizlinescan1 XK_horizlinescan3
+                              \ XK_horizlinescan5 XK_horizlinescan7
+                              \ XK_horizlinescan9 XK_leftt XK_rightt XK_bott
+                              \ XK_topt XK_vertbar XK_emspace XK_enspace
+                              \ XK_em3space XK_em4space XK_digitspace
+                              \ XK_punctspace XK_thinspace XK_hairspace
+                              \ XK_emdash XK_endash XK_signifblank XK_ellipsis
+                              \ XK_doubbaselinedot XK_onethird XK_twothirds
+                              \ XK_onefifth XK_twofifths XK_threefifths
+                              \ XK_fourfifths XK_onesixth XK_fivesixths
+                              \ XK_careof XK_figdash XK_leftanglebracket
+                              \ XK_decimalpoint XK_rightanglebracket
+                              \ XK_marker XK_oneeighth XK_threeeighths
+                              \ XK_fiveeighths XK_seveneighths XK_trademark
+                              \ XK_signaturemark XK_trademarkincircle
+                              \ XK_leftopentriangle XK_rightopentriangle
+                              \ XK_emopencircle XK_emopenrectangle
+                              \ XK_leftsinglequotemark XK_rightsinglequotemark
+                              \ XK_leftdoublequotemark XK_rightdoublequotemark
+                              \ XK_prescription XK_minutes XK_seconds
+                              \ XK_latincross XK_hexagram XK_filledrectbullet
+                              \ XK_filledlefttribullet XK_filledrighttribullet
+                              \ XK_emfilledcircle XK_emfilledrect
+                              \ XK_enopencircbullet XK_enopensquarebullet
+                              \ XK_openrectbullet XK_opentribulletup
+                              \ XK_opentribulletdown XK_openstar
+                              \ XK_enfilledcircbullet XK_enfilledsqbullet
+                              \ XK_filledtribulletup XK_filledtribulletdown
+                              \ XK_leftpointer XK_rightpointer XK_club
+                              \ XK_diamond XK_heart XK_maltesecross
+                              \ XK_dagger XK_doubledagger XK_checkmark
+                              \ XK_ballotcross XK_musicalsharp XK_musicalflat
+                              \ XK_malesymbol XK_femalesymbol XK_telephone
+                              \ XK_telephonerecorder XK_phonographcopyright
+                              \ XK_caret XK_singlelowquotemark
+                              \ XK_doublelowquotemark XK_cursor
+                              \ XK_leftcaret XK_rightcaret XK_downcaret
+                              \ XK_upcaret XK_overbar XK_downtack XK_upshoe
+                              \ XK_downstile XK_underbar XK_jot XK_quad
+                              \ XK_uptack XK_circle XK_upstile XK_downshoe
+                              \ XK_rightshoe XK_leftshoe XK_lefttack
+                              \ XK_righttack XK_hebrew_doublelowline
+                              \ XK_hebrew_aleph XK_hebrew_bet XK_hebrew_beth
+                              \ XK_hebrew_gimel XK_hebrew_gimmel
+                              \ XK_hebrew_dalet XK_hebrew_daleth
+                              \ XK_hebrew_he XK_hebrew_waw XK_hebrew_zain
+                              \ XK_hebrew_zayin XK_hebrew_chet XK_hebrew_het
+                              \ XK_hebrew_tet XK_hebrew_teth XK_hebrew_yod
+                              \ XK_hebrew_finalkaph XK_hebrew_kaph
+                              \ XK_hebrew_lamed XK_hebrew_finalmem
+                              \ XK_hebrew_mem XK_hebrew_finalnun XK_hebrew_nun
+                              \ XK_hebrew_samech XK_hebrew_samekh
+                              \ XK_hebrew_ayin XK_hebrew_finalpe XK_hebrew_pe
+                              \ XK_hebrew_finalzade XK_hebrew_finalzadi
+                              \ XK_hebrew_zade XK_hebrew_zadi XK_hebrew_qoph
+                              \ XK_hebrew_kuf XK_hebrew_resh XK_hebrew_shin
+                              \ XK_hebrew_taw XK_hebrew_taf XK_Hebrew_switch
+                              \ XK_Thai_kokai XK_Thai_khokhai XK_Thai_khokhuat
+                              \ XK_Thai_khokhwai XK_Thai_khokhon
+                              \ XK_Thai_khorakhang XK_Thai_ngongu
+                              \ XK_Thai_chochan XK_Thai_choching
+                              \ XK_Thai_chochang XK_Thai_soso XK_Thai_chochoe
+                              \ XK_Thai_yoying XK_Thai_dochada XK_Thai_topatak
+                              \ XK_Thai_thothan XK_Thai_thonangmontho
+                              \ XK_Thai_thophuthao XK_Thai_nonen
+                              \ XK_Thai_dodek XK_Thai_totao XK_Thai_thothung
+                              \ XK_Thai_thothahan XK_Thai_thothong
+                              \ XK_Thai_nonu XK_Thai_bobaimai XK_Thai_popla
+                              \ XK_Thai_phophung XK_Thai_fofa XK_Thai_phophan
+                              \ XK_Thai_fofan XK_Thai_phosamphao XK_Thai_moma
+                              \ XK_Thai_yoyak XK_Thai_rorua XK_Thai_ru
+                              \ XK_Thai_loling XK_Thai_lu XK_Thai_wowaen
+                              \ XK_Thai_sosala XK_Thai_sorusi XK_Thai_sosua
+                              \ XK_Thai_hohip XK_Thai_lochula XK_Thai_oang
+                              \ XK_Thai_honokhuk XK_Thai_paiyannoi
+                              \ XK_Thai_saraa XK_Thai_maihanakat
+                              \ XK_Thai_saraaa XK_Thai_saraam XK_Thai_sarai
+                              \ XK_Thai_saraii XK_Thai_saraue XK_Thai_sarauee
+                              \ XK_Thai_sarau XK_Thai_sarauu XK_Thai_phinthu
+                              \ XK_Thai_maihanakat_maitho XK_Thai_baht
+                              \ XK_Thai_sarae XK_Thai_saraae XK_Thai_sarao
+                              \ XK_Thai_saraaimaimuan XK_Thai_saraaimaimalai
+                              \ XK_Thai_lakkhangyao XK_Thai_maiyamok
+                              \ XK_Thai_maitaikhu XK_Thai_maiek XK_Thai_maitho
+                              \ XK_Thai_maitri XK_Thai_maichattawa
+                              \ XK_Thai_thanthakhat XK_Thai_nikhahit
+                              \ XK_Thai_leksun XK_Thai_leknung XK_Thai_leksong
+                              \ XK_Thai_leksam XK_Thai_leksi XK_Thai_lekha
+                              \ XK_Thai_lekhok XK_Thai_lekchet XK_Thai_lekpaet
+                              \ XK_Thai_lekkao XK_Hangul XK_Hangul_Start
+                              \ XK_Hangul_End XK_Hangul_Hanja XK_Hangul_Jamo
+                              \ XK_Hangul_Romaja XK_Hangul_Codeinput
+                              \ XK_Hangul_Jeonja XK_Hangul_Banja
+                              \ XK_Hangul_PreHanja XK_Hangul_PostHanja
+                              \ XK_Hangul_SingleCandidate
+                              \ XK_Hangul_MultipleCandidate
+                              \ XK_Hangul_PreviousCandidate XK_Hangul_Special
+                              \ XK_Hangul_switch XK_Hangul_Kiyeog
+                              \ XK_Hangul_SsangKiyeog XK_Hangul_KiyeogSios
+                              \ XK_Hangul_Nieun XK_Hangul_NieunJieuj
+                              \ XK_Hangul_NieunHieuh XK_Hangul_Dikeud
+                              \ XK_Hangul_SsangDikeud XK_Hangul_Rieul
+                              \ XK_Hangul_RieulKiyeog XK_Hangul_RieulMieum
+                              \ XK_Hangul_RieulPieub XK_Hangul_RieulSios
+                              \ XK_Hangul_RieulTieut XK_Hangul_RieulPhieuf
+                              \ XK_Hangul_RieulHieuh XK_Hangul_Mieum
+                              \ XK_Hangul_Pieub XK_Hangul_SsangPieub
+                              \ XK_Hangul_PieubSios XK_Hangul_Sios
+                              \ XK_Hangul_SsangSios XK_Hangul_Ieung
+                              \ XK_Hangul_Jieuj XK_Hangul_SsangJieuj
+                              \ XK_Hangul_Cieuc XK_Hangul_Khieuq
+                              \ XK_Hangul_Tieut XK_Hangul_Phieuf
+                              \ XK_Hangul_Hieuh XK_Hangul_A XK_Hangul_AE
+                              \ XK_Hangul_YA XK_Hangul_YAE XK_Hangul_EO
+                              \ XK_Hangul_E XK_Hangul_YEO XK_Hangul_YE
+                              \ XK_Hangul_O XK_Hangul_WA XK_Hangul_WAE
+                              \ XK_Hangul_OE XK_Hangul_YO XK_Hangul_U
+                              \ XK_Hangul_WEO XK_Hangul_WE XK_Hangul_WI
+                              \ XK_Hangul_YU XK_Hangul_EU XK_Hangul_YI
+                              \ XK_Hangul_I XK_Hangul_J_Kiyeog
+                              \ XK_Hangul_J_SsangKiyeog XK_Hangul_J_KiyeogSios
+                              \ XK_Hangul_J_Nieun XK_Hangul_J_NieunJieuj
+                              \ XK_Hangul_J_NieunHieuh XK_Hangul_J_Dikeud
+                              \ XK_Hangul_J_Rieul XK_Hangul_J_RieulKiyeog
+                              \ XK_Hangul_J_RieulMieum XK_Hangul_J_RieulPieub
+                              \ XK_Hangul_J_RieulSios XK_Hangul_J_RieulTieut
+                              \ XK_Hangul_J_RieulPhieuf XK_Hangul_J_RieulHieuh
+                              \ XK_Hangul_J_Mieum XK_Hangul_J_Pieub
+                              \ XK_Hangul_J_PieubSios XK_Hangul_J_Sios
+                              \ XK_Hangul_J_SsangSios XK_Hangul_J_Ieung
+                              \ XK_Hangul_J_Jieuj XK_Hangul_J_Cieuc
+                              \ XK_Hangul_J_Khieuq XK_Hangul_J_Tieut
+                              \ XK_Hangul_J_Phieuf XK_Hangul_J_Hieuh
+                              \ XK_Hangul_RieulYeorinHieuh
+                              \ XK_Hangul_SunkyeongeumMieum
+                              \ XK_Hangul_SunkyeongeumPieub XK_Hangul_PanSios
+                              \ XK_Hangul_KkogjiDalrinIeung
+                              \ XK_Hangul_SunkyeongeumPhieuf
+                              \ XK_Hangul_YeorinHieuh XK_Hangul_AraeA
+                              \ XK_Hangul_AraeAE XK_Hangul_J_PanSios
+                              \ XK_Hangul_J_KkogjiDalrinIeung
+                              \ XK_Hangul_J_YeorinHieuh XK_Korean_Won
+                              \ XK_Armenian_eternity XK_Armenian_ligature_ew
+                              \ XK_Armenian_full_stop XK_Armenian_verjaket
+                              \ XK_Armenian_parenright XK_Armenian_parenleft
+                              \ XK_Armenian_guillemotright
+                              \ XK_Armenian_guillemotleft XK_Armenian_em_dash
+                              \ XK_Armenian_dot XK_Armenian_mijaket
+                              \ XK_Armenian_separation_mark XK_Armenian_but
+                              \ XK_Armenian_comma XK_Armenian_en_dash
+                              \ XK_Armenian_hyphen XK_Armenian_yentamna
+                              \ XK_Armenian_ellipsis XK_Armenian_exclam
+                              \ XK_Armenian_amanak XK_Armenian_accent
+                              \ XK_Armenian_shesht XK_Armenian_question
+                              \ XK_Armenian_paruyk XK_Armenian_AYB
+                              \ XK_Armenian_ayb XK_Armenian_BEN
+                              \ XK_Armenian_ben XK_Armenian_GIM
+                              \ XK_Armenian_gim XK_Armenian_DA XK_Armenian_da
+                              \ XK_Armenian_YECH XK_Armenian_yech
+                              \ XK_Armenian_ZA XK_Armenian_za XK_Armenian_E
+                              \ XK_Armenian_e XK_Armenian_AT XK_Armenian_at
+                              \ XK_Armenian_TO XK_Armenian_to
+                              \ XK_Armenian_ZHE XK_Armenian_zhe
+                              \ XK_Armenian_INI XK_Armenian_ini
+                              \ XK_Armenian_LYUN XK_Armenian_lyun
+                              \ XK_Armenian_KHE XK_Armenian_khe
+                              \ XK_Armenian_TSA XK_Armenian_tsa
+                              \ XK_Armenian_KEN XK_Armenian_ken XK_Armenian_HO
+                              \ XK_Armenian_ho XK_Armenian_DZA XK_Armenian_dza
+                              \ XK_Armenian_GHAT XK_Armenian_ghat
+                              \ XK_Armenian_TCHE XK_Armenian_tche
+                              \ XK_Armenian_MEN XK_Armenian_men XK_Armenian_HI
+                              \ XK_Armenian_hi XK_Armenian_NU XK_Armenian_nu
+                              \ XK_Armenian_SHA XK_Armenian_sha XK_Armenian_VO
+                              \ XK_Armenian_vo XK_Armenian_CHA XK_Armenian_cha
+                              \ XK_Armenian_PE XK_Armenian_pe XK_Armenian_JE
+                              \ XK_Armenian_je XK_Armenian_RA XK_Armenian_ra
+                              \ XK_Armenian_SE XK_Armenian_se XK_Armenian_VEV
+                              \ XK_Armenian_vev XK_Armenian_TYUN
+                              \ XK_Armenian_tyun XK_Armenian_RE
+                              \ XK_Armenian_re XK_Armenian_TSO
+                              \ XK_Armenian_tso XK_Armenian_VYUN
+                              \ XK_Armenian_vyun XK_Armenian_PYUR
+                              \ XK_Armenian_pyur XK_Armenian_KE XK_Armenian_ke
+                              \ XK_Armenian_O XK_Armenian_o XK_Armenian_FE
+                              \ XK_Armenian_fe XK_Armenian_apostrophe
+                              \ XK_Armenian_section_sign XK_Georgian_an
+                              \ XK_Georgian_ban XK_Georgian_gan
+                              \ XK_Georgian_don XK_Georgian_en XK_Georgian_vin
+                              \ XK_Georgian_zen XK_Georgian_tan
+                              \ XK_Georgian_in XK_Georgian_kan XK_Georgian_las
+                              \ XK_Georgian_man XK_Georgian_nar XK_Georgian_on
+                              \ XK_Georgian_par XK_Georgian_zhar
+                              \ XK_Georgian_rae XK_Georgian_san
+                              \ XK_Georgian_tar XK_Georgian_un
+                              \ XK_Georgian_phar XK_Georgian_khar
+                              \ XK_Georgian_ghan XK_Georgian_qar
+                              \ XK_Georgian_shin XK_Georgian_chin
+                              \ XK_Georgian_can XK_Georgian_jil
+                              \ XK_Georgian_cil XK_Georgian_char
+                              \ XK_Georgian_xan XK_Georgian_jhan
+                              \ XK_Georgian_hae XK_Georgian_he XK_Georgian_hie
+                              \ XK_Georgian_we XK_Georgian_har XK_Georgian_hoe
+                              \ XK_Georgian_fi XK_Ccedillaabovedot
+                              \ XK_Xabovedot XK_Qabovedot XK_IE XK_UO
+                              \ XK_Zstroke XK_ccedillaabovedot XK_xabovedot
+                              \ XK_qabovedot XK_ie XK_uo XK_zstroke XK_SCHWA
+                              \ XK_schwa XK_Lbelowdot XK_Lstrokebelowdot
+                              \ XK_lbelowdot XK_lstrokebelowdot XK_Gtilde
+                              \ XK_gtilde XK_Abelowdot XK_abelowdot
+                              \ XK_Ahook XK_ahook XK_Acircumflexacute
+                              \ XK_acircumflexacute XK_Acircumflexgrave
+                              \ XK_acircumflexgrave XK_Acircumflexhook
+                              \ XK_acircumflexhook XK_Acircumflextilde
+                              \ XK_acircumflextilde XK_Acircumflexbelowdot
+                              \ XK_acircumflexbelowdot XK_Abreveacute
+                              \ XK_abreveacute XK_Abrevegrave XK_abrevegrave
+                              \ XK_Abrevehook XK_abrevehook XK_Abrevetilde
+                              \ XK_abrevetilde XK_Abrevebelowdot
+                              \ XK_abrevebelowdot XK_Ebelowdot XK_ebelowdot
+                              \ XK_Ehook XK_ehook XK_Etilde XK_etilde
+                              \ XK_Ecircumflexacute XK_ecircumflexacute
+                              \ XK_Ecircumflexgrave XK_ecircumflexgrave
+                              \ XK_Ecircumflexhook XK_ecircumflexhook
+                              \ XK_Ecircumflextilde XK_ecircumflextilde
+                              \ XK_Ecircumflexbelowdot XK_ecircumflexbelowdot
+                              \ XK_Ihook XK_ihook XK_Ibelowdot XK_ibelowdot
+                              \ XK_Obelowdot XK_obelowdot XK_Ohook XK_ohook
+                              \ XK_Ocircumflexacute XK_ocircumflexacute
+                              \ XK_Ocircumflexgrave XK_ocircumflexgrave
+                              \ XK_Ocircumflexhook XK_ocircumflexhook
+                              \ XK_Ocircumflextilde XK_ocircumflextilde
+                              \ XK_Ocircumflexbelowdot XK_ocircumflexbelowdot
+                              \ XK_Ohornacute XK_ohornacute XK_Ohorngrave
+                              \ XK_ohorngrave XK_Ohornhook XK_ohornhook
+                              \ XK_Ohorntilde XK_ohorntilde XK_Ohornbelowdot
+                              \ XK_ohornbelowdot XK_Ubelowdot XK_ubelowdot
+                              \ XK_Uhook XK_uhook XK_Uhornacute XK_uhornacute
+                              \ XK_Uhorngrave XK_uhorngrave XK_Uhornhook
+                              \ XK_uhornhook XK_Uhorntilde XK_uhorntilde
+                              \ XK_Uhornbelowdot XK_uhornbelowdot XK_Ybelowdot
+                              \ XK_ybelowdot XK_Yhook XK_yhook XK_Ytilde
+                              \ XK_ytilde XK_Ohorn XK_ohorn XK_Uhorn XK_uhorn
+                              \ XK_combining_tilde XK_combining_grave
+                              \ XK_combining_acute XK_combining_hook
+                              \ XK_combining_belowdot XK_EcuSign XK_ColonSign
+                              \ XK_CruzeiroSign XK_FFrancSign XK_LiraSign
+                              \ XK_MillSign XK_NairaSign XK_PesetaSign
+                              \ XK_RupeeSign XK_WonSign XK_NewSheqelSign
+                              \ XK_DongSign XK_EuroSign
+
+" #include <X11/Sunkeysym.h>
+syn keyword xmodmapKeySym     SunXK_Sys_Req SunXK_Print_Screen SunXK_Compose
+                              \ SunXK_AltGraph SunXK_PageUp SunXK_PageDown
+                              \ SunXK_Undo SunXK_Again SunXK_Find SunXK_Stop
+                              \ SunXK_Props SunXK_Front SunXK_Copy SunXK_Open
+                              \ SunXK_Paste SunXK_Cut SunXK_PowerSwitch
+                              \ SunXK_AudioLowerVolume SunXK_AudioMute
+                              \ SunXK_AudioRaiseVolume SunXK_VideoDegauss
+                              \ SunXK_VideoLowerBrightness
+                              \ SunXK_VideoRaiseBrightness
+                              \ SunXK_PowerSwitchShift
+
+" #include <X11/XF86keysym.h>
+syn keyword xmodmapKeySym     XF86XK_ModeLock XF86XK_Standby
+                              \ XF86XK_AudioLowerVolume XF86XK_AudioMute
+                              \ XF86XK_AudioRaiseVolume XF86XK_AudioPlay
+                              \ XF86XK_AudioStop XF86XK_AudioPrev
+                              \ XF86XK_AudioNext XF86XK_HomePage
+                              \ XF86XK_Mail XF86XK_Start XF86XK_Search
+                              \ XF86XK_AudioRecord XF86XK_Calculator
+                              \ XF86XK_Memo XF86XK_ToDoList XF86XK_Calendar
+                              \ XF86XK_PowerDown XF86XK_ContrastAdjust
+                              \ XF86XK_RockerUp XF86XK_RockerDown
+                              \ XF86XK_RockerEnter XF86XK_Back XF86XK_Forward
+                              \ XF86XK_Stop XF86XK_Refresh XF86XK_PowerOff
+                              \ XF86XK_WakeUp XF86XK_Eject XF86XK_ScreenSaver
+                              \ XF86XK_WWW XF86XK_Sleep XF86XK_Favorites
+                              \ XF86XK_AudioPause XF86XK_AudioMedia
+                              \ XF86XK_MyComputer XF86XK_VendorHome
+                              \ XF86XK_LightBulb XF86XK_Shop XF86XK_History
+                              \ XF86XK_OpenURL XF86XK_AddFavorite
+                              \ XF86XK_HotLinks XF86XK_BrightnessAdjust
+                              \ XF86XK_Finance XF86XK_Community
+                              \ XF86XK_AudioRewind XF86XK_XF86BackForward
+                              \ XF86XK_Launch0 XF86XK_Launch1 XF86XK_Launch2
+                              \ XF86XK_Launch3 XF86XK_Launch4 XF86XK_Launch5
+                              \ XF86XK_Launch6 XF86XK_Launch7 XF86XK_Launch8
+                              \ XF86XK_Launch9 XF86XK_LaunchA XF86XK_LaunchB
+                              \ XF86XK_LaunchC XF86XK_LaunchD XF86XK_LaunchE
+                              \ XF86XK_LaunchF XF86XK_ApplicationLeft
+                              \ XF86XK_ApplicationRight XF86XK_Book
+                              \ XF86XK_CD XF86XK_Calculater XF86XK_Clear
+                              \ XF86XK_Close XF86XK_Copy XF86XK_Cut
+                              \ XF86XK_Display XF86XK_DOS XF86XK_Documents
+                              \ XF86XK_Excel XF86XK_Explorer XF86XK_Game
+                              \ XF86XK_Go XF86XK_iTouch XF86XK_LogOff
+                              \ XF86XK_Market XF86XK_Meeting XF86XK_MenuKB
+                              \ XF86XK_MenuPB XF86XK_MySites XF86XK_New
+                              \ XF86XK_News XF86XK_OfficeHome XF86XK_Open
+                              \ XF86XK_Option XF86XK_Paste XF86XK_Phone
+                              \ XF86XK_Q XF86XK_Reply XF86XK_Reload
+                              \ XF86XK_RotateWindows XF86XK_RotationPB
+                              \ XF86XK_RotationKB XF86XK_Save XF86XK_ScrollUp
+                              \ XF86XK_ScrollDown XF86XK_ScrollClick
+                              \ XF86XK_Send XF86XK_Spell XF86XK_SplitScreen
+                              \ XF86XK_Support XF86XK_TaskPane XF86XK_Terminal
+                              \ XF86XK_Tools XF86XK_Travel XF86XK_UserPB
+                              \ XF86XK_User1KB XF86XK_User2KB XF86XK_Video
+                              \ XF86XK_WheelButton XF86XK_Word XF86XK_Xfer
+                              \ XF86XK_ZoomIn XF86XK_ZoomOut XF86XK_Away
+                              \ XF86XK_Messenger XF86XK_WebCam
+                              \ XF86XK_MailForward XF86XK_Pictures
+                              \ XF86XK_Music XF86XK_Switch_VT_1
+                              \ XF86XK_Switch_VT_2 XF86XK_Switch_VT_3
+                              \ XF86XK_Switch_VT_4 XF86XK_Switch_VT_5
+                              \ XF86XK_Switch_VT_6 XF86XK_Switch_VT_7
+                              \ XF86XK_Switch_VT_8 XF86XK_Switch_VT_9
+                              \ XF86XK_Switch_VT_10 XF86XK_Switch_VT_11
+                              \ XF86XK_Switch_VT_12 XF86XK_Ungrab
+                              \ XF86XK_ClearGrab XF86XK_Next_VMode
+                              \ XF86XK_Prev_VMode
+
+syn keyword xmodmapKeyword    keycode keysym clear add remove pointer
+
+hi def link xmodmapComment    Comment
+hi def link xmodmapTodo       Todo
+hi def link xmodmapInt        Number
+hi def link xmodmapHex        Number
+hi def link xmodmapOctal      Number
+hi def link xmodmapOctalError Error
+hi def link xmodmapKeySym     Constant
+hi def link xmodmapKeyword    Keyword
+
+let b:current_syntax = "xmodmap"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/xquery.vim b/syntax/xquery.vim
new file mode 100644
index 000000000..8a154a951
--- /dev/null
+++ b/syntax/xquery.vim
@@ -0,0 +1,86 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xquery') == -1
+
+" Vim syntax file
+" Language:	XQuery
+" Author: René Neumann <necoro@necoro.eu>
+" Author: Steve Spigarelli <http://spig.net/>
+" Original Author:	Jean-Marc Vanel <http://jmvanel.free.fr/>
+" Last Change:	mar jui 12 18:04:05 CEST 2005
+" Filenames:	*.xq
+" URL:		http://jmvanel.free.fr/vim/xquery.vim
+
+" REFERENCES:
+"   [1] http://www.w3.org/TR/xquery/
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+" - is allowed in keywords
+setlocal iskeyword+=-
+
+runtime syntax/xml.vim
+
+syn case match
+
+" From XQuery grammar:
+syn keyword xqStatement ancestor ancestor-or-self and as ascending at attribute base-uri boundary-space by case cast castable child collation construction declare default descendant descendant-or-self descending div document element else empty encoding eq every except external following following-sibling for function ge greatest gt idiv if import in inherit-namespaces instance intersect is le least let lt mod module namespace ne no of or order ordered ordering parent preceding preceding-sibling preserve return satisfies schema self some stable strip then to treat typeswitch union unordered validate variable version where xmlspace xquery yes
+
+" TODO contains clashes with vim keyword
+syn	keyword	xqFunction abs adjust-date-to-timezone adjust-date-to-timezone adjust-dateTime-to-timezone adjust-dateTime-to-timezone adjust-time-to-timezone adjust-time-to-timezone avg base-uri base-uri boolean ceiling codepoint-equal codepoints-to-string collection collection compare concat count current-date current-dateTime current-time data dateTime day-from-date day-from-dateTime days-from-duration deep-equal deep-equal default-collation distinct-values distinct-values doc doc-available document-uri empty ends-with ends-with error error error error escape-uri exactly-one exists false floor hours-from-dateTime hours-from-duration hours-from-time id id idref idref implicit-timezone in-scope-prefixes index-of index-of insert-before lang lang last local-name local-name local-name-from-QName lower-case matches matches max max min min minutes-from-dateTime minutes-from-duration minutes-from-time month-from-date month-from-dateTime months-from-duration name name namespace-uri namespace-uri namespace-uri-for-prefix namespace-uri-from-QName nilled node-name normalize-space normalize-space normalize-unicode normalize-unicode not number number one-or-more position prefix-from-QName QName remove replace replace resolve-QName resolve-uri resolve-uri reverse root root round round-half-to-even round-half-to-even seconds-from-dateTime seconds-from-duration seconds-from-time starts-with starts-with static-base-uri string string string-join string-length string-length string-to-codepoints subsequence subsequence substring substring substring-after substring-after substring-before substring-before sum sum timezone-from-date timezone-from-dateTime timezone-from-time tokenize tokenize trace translate true unordered upper-case year-from-date year-from-dateTime years-from-duration zero-or-one
+
+syn keyword xqOperator add-dayTimeDuration-to-date add-dayTimeDuration-to-dateTime add-dayTimeDuration-to-time add-dayTimeDurations add-yearMonthDuration-to-date add-yearMonthDuration-to-dateTime add-yearMonthDurations base64Binary-equal boolean-equal boolean-greater-than boolean-less-than concatenate date-equal date-greater-than date-less-than dateTime-equal dateTime-greater-than dateTime-less-than dayTimeDuration-equal dayTimeDuration-greater-than dayTimeDuration-less-than divide-dayTimeDuration divide-dayTimeDuration-by-dayTimeDuration divide-yearMonthDuration divide-yearMonthDuration-by-yearMonthDuration except gDay-equal gMonth-equal gMonthDay-equal gYear-equal gYearMonth-equal hexBinary-equal intersect is-same-node multiply-dayTimeDuration multiply-yearMonthDuration node-after node-before NOTATION-equal numeric-add numeric-divide numeric-equal numeric-greater-than numeric-integer-divide numeric-less-than numeric-mod numeric-multiply numeric-subtract numeric-unary-minus numeric-unary-plus QName-equal subtract-dates-yielding-dayTimeDuration subtract-dateTimes-yielding-dayTimeDuration subtract-dayTimeDuration-from-date subtract-dayTimeDuration-from-dateTime subtract-dayTimeDuration-from-time subtract-dayTimeDurations subtract-times subtract-yearMonthDuration-from-date subtract-yearMonthDuration-from-dateTime subtract-yearMonthDurations time-equal time-greater-than time-less-than to union yearMonthDuration-equal yearMonthDuration-greater-than yearMonthDuration-less-than
+
+syn match xqType "xs:\(\|Datatype\|primitive\|string\|boolean\|float\|double\|decimal\|duration\|dateTime\|time\|date\|gYearMonth\|gYear\|gMonthDay\|gDay\|gMonth\|hexBinary\|base64Binary\|anyURI\|QName\|NOTATION\|\|normalizedString\|token\|language\|IDREFS\|ENTITIES\|NMTOKEN\|NMTOKENS\|Name\|NCName\|ID\|IDREF\|ENTITY\|integer\|nonPositiveInteger\|negativeInteger\|long\|int\|short\|byte\|nonNegativeInteger\|unsignedLong\|unsignedInt\|unsignedShort\|unsignedByte\|positiveInteger\)"
+
+
+" From XPath grammar:
+syn keyword xqXPath some every in in satisfies if then else to div idiv mod union intersect except instance of treat castable cast eq ne lt le gt ge is child descendant attribute self descendant-or-self following-sibling following namespace parent ancestor preceding-sibling preceding ancestor-or-self void item node document-node text comment processing-instruction attribute schema-attribute schema-element
+
+" eXist extensions
+syn	match xqExist "&="
+
+" XQdoc
+syn	match	XQdoc contained "@\(param\|return\|author\)\>" 
+
+" floating point number, with dot, optional exponent
+syn match xqFloat   "\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\="
+" floating point number, starting with a dot, optional exponent
+syn match xqFloat   "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
+" floating point number, without dot, with exponent
+syn match xqFloat   "\d\+e[-+]\=\d\+[fl]\=\>"
+syn match xqNumber  "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
+syn match xqNumber  "\<\d\+\>"
+
+syn region xqString  start=+\z(['"]\)+ skip=+\\.+ end=+\z1+
+syn region xqComment start='(:' excludenl end=':)' contains=XQdoc
+
+syn match xqVariable "$\<[a-zA-Z:_][-.0-9a-zA-Z0-9:_]*\>"
+syn match xqSeparator ",\|;"
+syn region xqCode transparent contained start='{' excludenl end='}' contains=xqFunction,xqCode,xmlRegionBis,xqComment,xqStatement,xmlString,xqSeparator,xqNumber,xqVariable,xqString keepend extend
+
+syn region xmlRegionBis start=+<\z([^ /!?<>"']\+\)+ skip=+<!--\_.\{-}-->+ end=+</\z1\_\s\{-}>+ end=+/>+ fold contains=xmlTag,xmlEndTag,xmlCdata,xmlRegionBis,xmlComment,xmlEntity,xmlProcessing,xqCode keepend extend
+
+hi def link xqNumber    Number
+hi def link xqFloat     Number
+hi def link xqString    String
+hi def link xqVariable  Identifier
+hi def link xqComment   Comment
+hi def link xqSeparator Operator
+hi def link xqStatement Statement
+hi def link xqFunction  Function
+hi def link xqOperator  Operator
+hi def link xqType      Type
+hi def link xqXPath     Operator
+hi def link XQdoc       Special
+hi def link xqExist     Operator
+
+" override the xml highlighting
+"hi link xmlTag      Structure
+"hi link xmlTagName  Structure
+"hi link xmlEndTag   Structure
+
+let b:current_syntax = "xquery"
+
+endif
diff --git a/syntax/xsd.vim b/syntax/xsd.vim
new file mode 100644
index 000000000..aa6358892
--- /dev/null
+++ b/syntax/xsd.vim
@@ -0,0 +1,65 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
+
+" Vim syntax file
+" Language:	XSD (XML Schema)
+" Maintainer:	Johannes Zellner <johannes@zellner.org>
+" Last Change:	Tue, 27 Apr 2004 14:54:59 CEST
+" Filenames:	*.xsd
+" $Id: xsd.vim,v 1.1 2004/06/13 18:20:48 vimboss Exp $
+
+" REFERENCES:
+"   [1] http://www.w3.org/TR/xmlschema-0
+"
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+runtime syntax/xml.vim
+
+syn cluster xmlTagHook add=xsdElement
+syn case match
+
+syn match xsdElement '\%(xsd:\)\@<=all'
+syn match xsdElement '\%(xsd:\)\@<=annotation'
+syn match xsdElement '\%(xsd:\)\@<=any'
+syn match xsdElement '\%(xsd:\)\@<=anyAttribute'
+syn match xsdElement '\%(xsd:\)\@<=appInfo'
+syn match xsdElement '\%(xsd:\)\@<=attribute'
+syn match xsdElement '\%(xsd:\)\@<=attributeGroup'
+syn match xsdElement '\%(xsd:\)\@<=choice'
+syn match xsdElement '\%(xsd:\)\@<=complexContent'
+syn match xsdElement '\%(xsd:\)\@<=complexType'
+syn match xsdElement '\%(xsd:\)\@<=documentation'
+syn match xsdElement '\%(xsd:\)\@<=element'
+syn match xsdElement '\%(xsd:\)\@<=enumeration'
+syn match xsdElement '\%(xsd:\)\@<=extension'
+syn match xsdElement '\%(xsd:\)\@<=field'
+syn match xsdElement '\%(xsd:\)\@<=group'
+syn match xsdElement '\%(xsd:\)\@<=import'
+syn match xsdElement '\%(xsd:\)\@<=include'
+syn match xsdElement '\%(xsd:\)\@<=key'
+syn match xsdElement '\%(xsd:\)\@<=keyref'
+syn match xsdElement '\%(xsd:\)\@<=length'
+syn match xsdElement '\%(xsd:\)\@<=list'
+syn match xsdElement '\%(xsd:\)\@<=maxInclusive'
+syn match xsdElement '\%(xsd:\)\@<=maxLength'
+syn match xsdElement '\%(xsd:\)\@<=minInclusive'
+syn match xsdElement '\%(xsd:\)\@<=minLength'
+syn match xsdElement '\%(xsd:\)\@<=pattern'
+syn match xsdElement '\%(xsd:\)\@<=redefine'
+syn match xsdElement '\%(xsd:\)\@<=restriction'
+syn match xsdElement '\%(xsd:\)\@<=schema'
+syn match xsdElement '\%(xsd:\)\@<=selector'
+syn match xsdElement '\%(xsd:\)\@<=sequence'
+syn match xsdElement '\%(xsd:\)\@<=simpleContent'
+syn match xsdElement '\%(xsd:\)\@<=simpleType'
+syn match xsdElement '\%(xsd:\)\@<=union'
+syn match xsdElement '\%(xsd:\)\@<=unique'
+
+hi def link xsdElement Statement
+
+" vim: ts=8
+
+endif
diff --git a/syntax/xslt.vim b/syntax/xslt.vim
new file mode 100644
index 000000000..6efd3738b
--- /dev/null
+++ b/syntax/xslt.vim
@@ -0,0 +1,75 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xslt') == -1
+
+" Vim syntax file
+" Language:	XSLT
+" Maintainer:   Bogdan Barbu <l4b.bogdan.barbu@gmail.com>
+" Previous Maintainer:	Johannes Zellner <johannes@zellner.org>
+" Last Change:	Fri, 17 Jan 2020 07:15:37 +0200
+" Filenames:	*.xsl
+" $Id: xslt.vim,v 1.1 2004/06/13 15:52:10 vimboss Exp $
+
+" REFERENCES:
+"   [1] http://www.w3.org/TR/xslt
+"   [2] http://www.w3.org/TR/xslt20
+
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
+    finish
+endif
+
+runtime syntax/xml.vim
+
+syn cluster xmlTagHook add=xslElement
+syn case match
+
+syn match xslElement '\%(xsl:\)\@<=analyze-string'
+syn match xslElement '\%(xsl:\)\@<=apply-imports'
+syn match xslElement '\%(xsl:\)\@<=apply-templates'
+syn match xslElement '\%(xsl:\)\@<=attribute'
+syn match xslElement '\%(xsl:\)\@<=attribute-set'
+syn match xslElement '\%(xsl:\)\@<=call-template'
+syn match xslElement '\%(xsl:\)\@<=character-map'
+syn match xslElement '\%(xsl:\)\@<=choose'
+syn match xslElement '\%(xsl:\)\@<=comment'
+syn match xslElement '\%(xsl:\)\@<=copy'
+syn match xslElement '\%(xsl:\)\@<=copy-of'
+syn match xslElement '\%(xsl:\)\@<=decimal-format'
+syn match xslElement '\%(xsl:\)\@<=document'
+syn match xslElement '\%(xsl:\)\@<=element'
+syn match xslElement '\%(xsl:\)\@<=fallback'
+syn match xslElement '\%(xsl:\)\@<=for-each'
+syn match xslElement '\%(xsl:\)\@<=for-each-group'
+syn match xslElement '\%(xsl:\)\@<=function'
+syn match xslElement '\%(xsl:\)\@<=if'
+syn match xslElement '\%(xsl:\)\@<=include'
+syn match xslElement '\%(xsl:\)\@<=import'
+syn match xslElement '\%(xsl:\)\@<=import-schema'
+syn match xslElement '\%(xsl:\)\@<=key'
+syn match xslElement '\%(xsl:\)\@<=message'
+syn match xslElement '\%(xsl:\)\@<=namespace'
+syn match xslElement '\%(xsl:\)\@<=namespace-alias'
+syn match xslElement '\%(xsl:\)\@<=number'
+syn match xslElement '\%(xsl:\)\@<=otherwise'
+syn match xslElement '\%(xsl:\)\@<=output'
+syn match xslElement '\%(xsl:\)\@<=param'
+syn match xslElement '\%(xsl:\)\@<=perform-sort'
+syn match xslElement '\%(xsl:\)\@<=processing-instruction'
+syn match xslElement '\%(xsl:\)\@<=preserve-space'
+syn match xslElement '\%(xsl:\)\@<=script'
+syn match xslElement '\%(xsl:\)\@<=sequence'
+syn match xslElement '\%(xsl:\)\@<=sort'
+syn match xslElement '\%(xsl:\)\@<=strip-space'
+syn match xslElement '\%(xsl:\)\@<=stylesheet'
+syn match xslElement '\%(xsl:\)\@<=template'
+syn match xslElement '\%(xsl:\)\@<=transform'
+syn match xslElement '\%(xsl:\)\@<=text'
+syn match xslElement '\%(xsl:\)\@<=value-of'
+syn match xslElement '\%(xsl:\)\@<=variable'
+syn match xslElement '\%(xsl:\)\@<=when'
+syn match xslElement '\%(xsl:\)\@<=with-param'
+
+hi def link xslElement Statement
+
+" vim: ts=8
+
+endif
diff --git a/syntax/yacc.vim b/syntax/yacc.vim
new file mode 100644
index 000000000..01992fadd
--- /dev/null
+++ b/syntax/yacc.vim
@@ -0,0 +1,124 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yacc') == -1
+
+" Vim syntax file
+" Language:	Yacc
+" Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Last Change:	Mar 25, 2019
+" Version:	17
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_YACC
+"
+" Options: {{{1
+"   g:yacc_uses_cpp : if this variable exists, then C++ is loaded rather than C
+
+" ---------------------------------------------------------------------
+" this version of syntax/yacc.vim requires 6.0 or later
+if exists("b:current_syntax")
+ syntax clear
+endif
+
+" ---------------------------------------------------------------------
+"  Folding Support {{{1
+if has("folding")
+ com! -nargs=+ SynFold	<args> fold
+else
+ com! -nargs=+ SynFold	<args>
+endif
+
+" ---------------------------------------------------------------------
+" Read the C syntax to start with {{{1
+" Read the C/C++ syntax to start with
+let s:Cpath= fnameescape(expand("<sfile>:p:h").(exists("g:yacc_uses_cpp")? "/cpp.vim" : "/c.vim"))
+if !filereadable(s:Cpath)
+ for s:Cpath in split(globpath(&rtp,(exists("g:yacc_uses_cpp")? "syntax/cpp.vim" : "syntax/c.vim")),"\n")
+  if filereadable(fnameescape(s:Cpath))
+   let s:Cpath= fnameescape(s:Cpath)
+   break
+  endif
+ endfor
+endif
+exe "syn include @yaccCode ".s:Cpath
+
+" ---------------------------------------------------------------------
+"  Yacc Clusters: {{{1
+syn cluster yaccInitCluster	contains=yaccKey,yaccKeyActn,yaccBrkt,yaccType,yaccString,yaccUnionStart,yaccHeader2,yaccComment,yaccDefines,yaccParseParam,yaccParseOption
+syn cluster yaccRulesCluster	contains=yaccNonterminal,yaccString,yaccComment
+
+" ---------------------------------------------------------------------
+"  Yacc Sections: {{{1
+SynFold syn	region	yaccInit	start='.'ms=s-1,rs=s-1	matchgroup=yaccSectionSep		end='^%%\ze\(\s*/[*/].*\)\=$'me=e-2,re=e-2	contains=@yaccInitCluster	nextgroup=yaccRules	skipwhite skipempty contained
+SynFold syn	region	yaccInit2      start='\%^.'ms=s-1,rs=s-1	matchgroup=yaccSectionSep		end='^%%\ze\(\s*/[*/].*\)\=$'me=e-2,re=e-2	contains=@yaccInitCluster	nextgroup=yaccRules	skipwhite skipempty
+SynFold syn	region	yaccHeader2	matchgroup=yaccSep	start="^\s*\zs%{"		end="^\s*%}"			contains=@yaccCode	nextgroup=yaccInit	skipwhite skipempty contained
+SynFold syn	region	yaccHeader	matchgroup=yaccSep	start="^\s*\zs%{"		end="^\s*%}"			contains=@yaccCode	nextgroup=yaccInit	skipwhite skipempty
+SynFold syn	region	yaccRules	matchgroup=yaccSectionSep	start='^%%\ze\(\s*/[*/].*\)\=$'	end='^%%\ze\(\s*/[*/].*\)\=$'me=e-2,re=e-2	contains=@yaccRulesCluster	nextgroup=yaccEndCode	skipwhite skipempty contained
+SynFold syn	region	yaccEndCode	matchgroup=yaccSectionSep	start='^%%\ze\(\s*/[*/].*\)\=$'	end='\%$'			contains=@yaccCode	contained
+
+" ---------------------------------------------------------------------
+" Yacc Commands: {{{1
+syn	match	yaccDefines	'^%define\s\+.*$'
+syn	match	yaccParseParam	'%\(parse\|lex\)-param\>'		skipwhite	nextgroup=yaccParseParamStr
+syn	match	yaccParseOption '%\%(api\.pure\|pure-parser\|locations\|error-verbose\)\>'
+syn	region	yaccParseParamStr	contained matchgroup=Delimiter	start='{'	end='}'	contains=cStructure
+
+syn	match	yaccDelim	"[:|]"	contained
+syn	match	yaccOper	"@\d\+"	contained
+
+syn	match	yaccKey	"^\s*%\(token\|type\|left\|right\|start\|ident\|nonassoc\)\>"	contained
+syn	match	yaccKey	"\s%\(prec\|expect\)\>"	contained
+syn	match	yaccKey	"\$\(<[a-zA-Z_][a-zA-Z_0-9]*>\)\=[\$0-9]\+"	contained
+syn	keyword	yaccKeyActn	yyerrok yyclearin	contained
+
+syn	match	yaccUnionStart	"^%union"	skipwhite skipnl nextgroup=yaccUnion	contained
+SynFold syn	region	yaccUnion	matchgroup=yaccCurly start="{" matchgroup=yaccCurly end="}" contains=@yaccCode	contained
+syn	match	yaccBrkt	"[<>]"	contained
+syn	match	yaccType	"<[a-zA-Z_][a-zA-Z0-9_]*>"	contains=yaccBrkt	contained
+
+SynFold syn	region	yaccNonterminal	start="^\s*\a\w*\ze\_s*\(/\*\_.\{-}\*/\)\=\_s*:"	matchgroup=yaccDelim end=";"	matchgroup=yaccSectionSep end='^%%$'me=e-2,re=e-2 contains=yaccAction,yaccDelim,yaccString,yaccComment	contained
+syn	region	yaccComment	start="/\*"	end="\*/"
+syn	region	yaccComment	start="//"	end="$"
+syn	match	yaccString	"'[^']*'"	contained
+
+
+" ---------------------------------------------------------------------
+" I'd really like to highlight just the outer {}.  Any suggestions??? {{{1
+syn	match	yaccCurlyError	"[{}]"
+SynFold syn	region	yaccAction	matchgroup=yaccCurly start="{" end="}" 	contains=@yaccCode,yaccVar		contained
+syn	match	yaccVar	'\$\d\+\|\$\$\|\$<\I\i*>\$\|\$<\I\i*>\d\+'	containedin=cParen,cPreProc,cMulti	contained
+
+" ---------------------------------------------------------------------
+" Yacc synchronization: {{{1
+syn sync fromstart
+
+" ---------------------------------------------------------------------
+" Define the default highlighting. {{{1
+if !exists("skip_yacc_syn_inits")
+  hi def link yaccBrkt	yaccStmt
+  hi def link yaccComment	Comment
+  hi def link yaccCurly	Delimiter
+  hi def link yaccCurlyError	Error
+  hi def link yaccDefines	cDefine
+  hi def link yaccDelim	Delimiter
+  hi def link yaccKeyActn	Special
+  hi def link yaccKey	yaccStmt
+  hi def link yaccNonterminal	Function
+  hi def link yaccOper	yaccStmt
+  hi def link yaccParseOption	cDefine
+  hi def link yaccParseParam	yaccParseOption
+  hi def link yaccSectionSep	Todo
+  hi def link yaccSep	Delimiter
+  hi def link yaccStmt	Statement
+  hi def link yaccString	String
+  hi def link yaccType	Type
+  hi def link yaccUnionStart	yaccKey
+  hi def link yaccVar	Special
+endif
+
+" ---------------------------------------------------------------------
+"  Cleanup: {{{1
+delcommand SynFold
+let b:current_syntax = "yacc"
+
+" ---------------------------------------------------------------------
+"  Modelines: {{{1
+" vim: ts=15 fdm=marker
+
+endif
diff --git a/syntax/z8a.vim b/syntax/z8a.vim
new file mode 100644
index 000000000..b2229bf78
--- /dev/null
+++ b/syntax/z8a.vim
@@ -0,0 +1,105 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'z8a') == -1
+
+" Vim syntax file
+" Language:	Z80 assembler asz80
+" Maintainer:	Milan Pikula <www@fornax.elf.stuba.sk>
+" Last Change:	2003 May 11
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+" Common Z80 Assembly instructions
+syn keyword z8aInstruction adc add and bit ccf cp cpd cpdr cpi cpir cpl
+syn keyword z8aInstruction daa di djnz ei exx halt im in
+syn keyword z8aInstruction ind ini indr inir jp jr ld ldd lddr ldi ldir
+syn keyword z8aInstruction neg nop or otdr otir out outd outi
+syn keyword z8aInstruction res rl rla rlc rlca rld
+syn keyword z8aInstruction rr rra rrc rrca rrd sbc scf set sla sra
+syn keyword z8aInstruction srl sub xor
+" syn keyword z8aInstruction push pop call ret reti retn inc dec ex rst
+
+" Any other stuff
+syn match z8aIdentifier		"[a-z_][a-z0-9_]*"
+
+" Instructions changing stack
+syn keyword z8aSpecInst push pop call ret reti retn rst
+syn match z8aInstruction "\<inc\>"
+syn match z8aInstruction "\<dec\>"
+syn match z8aInstruction "\<ex\>"
+syn match z8aSpecInst "\<inc\s\+sp\>"me=s+3
+syn match z8aSpecInst "\<dec\s\+sp\>"me=s+3
+syn match z8aSpecInst "\<ex\s\+(\s*sp\s*)\s*,\s*hl\>"me=s+2
+
+"Labels
+syn match z8aLabel		"[a-z_][a-z0-9_]*:"
+syn match z8aSpecialLabel	"[a-z_][a-z0-9_]*::"
+
+" PreProcessor commands
+syn match z8aPreProc	"\.org"
+syn match z8aPreProc	"\.globl"
+syn match z8aPreProc	"\.db"
+syn match z8aPreProc	"\.dw"
+syn match z8aPreProc	"\.ds"
+syn match z8aPreProc	"\.byte"
+syn match z8aPreProc	"\.word"
+syn match z8aPreProc	"\.blkb"
+syn match z8aPreProc	"\.blkw"
+syn match z8aPreProc	"\.ascii"
+syn match z8aPreProc	"\.asciz"
+syn match z8aPreProc	"\.module"
+syn match z8aPreProc	"\.title"
+syn match z8aPreProc	"\.sbttl"
+syn match z8aPreProc	"\.even"
+syn match z8aPreProc	"\.odd"
+syn match z8aPreProc	"\.area"
+syn match z8aPreProc	"\.page"
+syn match z8aPreProc	"\.setdp"
+syn match z8aPreProc	"\.radix"
+syn match z8aInclude	"\.include"
+syn match z8aPreCondit	"\.if"
+syn match z8aPreCondit	"\.else"
+syn match z8aPreCondit	"\.endif"
+
+" Common strings
+syn match z8aString		"\".*\""
+syn match z8aString		"\'.*\'"
+
+" Numbers
+syn match z8aNumber		"[0-9]\+"
+syn match z8aNumber		"0[xXhH][0-9a-fA-F]\+"
+syn match z8aNumber		"0[bB][0-1]*"
+syn match z8aNumber		"0[oO\@qQ][0-7]\+"
+syn match z8aNumber		"0[dD][0-9]\+"
+
+" Character constant
+syn match z8aString		"\#\'."hs=s+1
+
+" Comments
+syn match z8aComment		";.*"
+
+syn case match
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link z8aSection		Special
+hi def link z8aLabel		Label
+hi def link z8aSpecialLabel	Label
+hi def link z8aComment		Comment
+hi def link z8aInstruction	Statement
+hi def link z8aSpecInst		Statement
+hi def link z8aInclude		Include
+hi def link z8aPreCondit		PreCondit
+hi def link z8aPreProc		PreProc
+hi def link z8aNumber		Number
+hi def link z8aString		String
+
+
+let b:current_syntax = "z8a"
+" vim: ts=8
+
+endif
diff --git a/syntax/zimbu.vim b/syntax/zimbu.vim
new file mode 100644
index 000000000..388e0206e
--- /dev/null
+++ b/syntax/zimbu.vim
@@ -0,0 +1,164 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zimbu') == -1
+
+" Vim syntax file
+" Language:	Zimbu
+" Maintainer:	Bram Moolenaar
+" Last Change:	2014 Nov 23
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn include @Ccode syntax/c.vim
+
+syn keyword zimbuTodo		TODO FIXME XXX contained
+syn match   zimbuNoBar          "|" contained
+syn match   zimbuParam  	"|[^| ]\+|" contained contains=zimbuNoBar
+syn match   zimbuNoBacktick     "`" contained
+syn match   zimbuCode  		"`[^`]\+`" contained contains=zimbuNoBacktick
+syn match   zimbuComment	"#.*$" contains=zimbuTodo,zimbuParam,zimbuCode,@Spell
+syn match   zimbuComment	"/\*.\{-}\*/" contains=zimbuTodo,zimbuParam,zimbuCode,@Spell
+
+syn match   zimbuChar	"'\\\=.'"
+
+syn keyword zimbuBasicType	bool status
+syn keyword zimbuBasicType	int1 int2 int3 int4 int5 int6 int7
+syn keyword zimbuBasicType	int9 int10 int11 int12 int13 int14 int15
+syn keyword zimbuBasicType	int int8 int16 int32 int64 bigInt
+syn keyword zimbuBasicType	nat nat8 byte nat16 nat32 nat64 bigNat
+syn keyword zimbuBasicType	nat1 nat2 nat3 nat4 nat5 nat6 nat7
+syn keyword zimbuBasicType	nat9 nat10 nat11 nat12 nat13 nat14 nat15
+syn keyword zimbuBasicType	float float32 float64 float80 float128
+syn keyword zimbuBasicType	fixed1 fixed2 fixed3 fixed4 fixed5 fixed6
+syn keyword zimbuBasicType	fixed7 fixed8 fixed9 fixed10 fixed11 fixed12
+syn keyword zimbuBasicType	fixed13 fixed14 fixed15
+
+syn keyword zimbuCompType	string varString
+syn keyword zimbuCompType	byteString varByteString
+syn keyword zimbuCompType	tuple array list dict dictList set callback
+syn keyword zimbuCompType	sortedList multiDict multiDictList multiSet
+syn keyword zimbuCompType	complex complex32 complex64 complex80 complex128
+syn keyword zimbuCompType	proc func def thread evalThread lock cond pipe
+
+syn keyword zimbuType   VAR dyn type USE GET
+syn match zimbuType	"IO.File"
+syn match zimbuType	"IO.Stat"
+
+syn keyword zimbuStatement IF ELSE ELSEIF IFNIL WHILE REPEAT FOR IN TO STEP
+syn keyword zimbuStatement DO UNTIL SWITCH WITH
+syn keyword zimbuStatement TRY CATCH FINALLY
+syn keyword zimbuStatement GENERATE_IF GENERATE_ELSE GENERATE_ELSEIF
+syn keyword zimbuStatement GENERATE_ERROR
+syn keyword zimbuStatement BUILD_IF BUILD_ELSE BUILD_ELSEIF
+syn keyword zimbuStatement CASE DEFAULT FINAL ABSTRACT VIRTUAL DEFINE REPLACE
+syn keyword zimbuStatement IMPLEMENTS EXTENDS PARENT LOCAL
+syn keyword zimbuStatement PART ALIAS TYPE CONNECT WRAP
+syn keyword zimbuStatement BREAK CONTINUE PROCEED
+syn keyword zimbuStatement RETURN EXIT THROW DEFER
+syn keyword zimbuStatement IMPORT AS OPTIONS MAIN
+syn keyword zimbuStatement INTERFACE PIECE INCLUDE MODULE ENUM BITS
+syn keyword zimbuStatement SHARED STATIC
+syn keyword zimbuStatement LAMBDA
+syn match zimbuStatement "\<\(FUNC\|PROC\|DEF\)\>"
+syn match zimbuStatement "\<CLASS\>"
+syn match zimbuStatement "}"
+
+syn match zimbuAttribute "@backtrace=no\>"
+syn match zimbuAttribute "@backtrace=yes\>"
+syn match zimbuAttribute "@abstract\>"
+syn match zimbuAttribute "@earlyInit\>"
+syn match zimbuAttribute "@default\>"
+syn match zimbuAttribute "@define\>"
+syn match zimbuAttribute "@replace\>"
+syn match zimbuAttribute "@final\>"
+syn match zimbuAttribute "@primitive\>"
+syn match zimbuAttribute "@notOnExit\>"
+
+syn match zimbuAttribute "@private\>"
+syn match zimbuAttribute "@protected\>"
+syn match zimbuAttribute "@public\>"
+syn match zimbuAttribute "@local\>"
+syn match zimbuAttribute "@file\>"
+syn match zimbuAttribute "@directory\>"
+syn match zimbuAttribute "@read=private\>"
+syn match zimbuAttribute "@read=protected\>"
+syn match zimbuAttribute "@read=public\>"
+syn match zimbuAttribute "@read=file\>"
+syn match zimbuAttribute "@read=directory\>"
+syn match zimbuAttribute "@items=private\>"
+syn match zimbuAttribute "@items=protected\>"
+syn match zimbuAttribute "@items=public\>"
+syn match zimbuAttribute "@items=file\>"
+syn match zimbuAttribute "@items=directory\>"
+
+syn keyword zimbuMethod NEW EQUAL COPY COMPARE SIZE GET SET INIT EARLYINIT
+
+syn keyword zimbuOperator IS ISNOT ISA ISNOTA
+
+syn keyword zimbuModule  ARG CHECK E GC IO LOG PROTO SYS HTTP ZC ZWT T TIME THREAD
+
+syn match zimbuImport  "\.\zsPROTO"
+syn match zimbuImport  "\.\zsCHEADER"
+
+"syn match zimbuString  +"\([^"\\]\|\\.\)*\("\|$\)+ contains=zimbuStringExpr
+syn region zimbuString  start=+"+  skip=+[^"\\]\|\\.+ end=+"\|$+ contains=zimbuStringExpr
+syn match zimbuString  +R"\([^"]\|""\)*\("\|$\)+
+syn region zimbuLongString  start=+''"+ end=+"''+
+syn match zimbuStringExpr +\\([^)]*)+hs=s+2,he=e-1 contained contains=zimbuString,zimbuParenPairOuter
+syn region zimbuParenPairOuter  start=+(+ms=s+1  end=+)+me=e-1 contained contains=zimbuString,zimbuParenPair
+syn region zimbuParenPair  start=+(+  end=+)+ contained contains=zimbuString,zimbuParenPair
+
+syn keyword zimbuFixed  TRUE FALSE NIL THIS THISTYPE FAIL OK
+syn keyword zimbuError  NULL
+
+" trailing whitespace
+syn match   zimbuSpaceError   display excludenl "\S\s\+$"ms=s+1
+" mixed tabs and spaces
+syn match   zimbuSpaceError   display " \+\t"
+syn match   zimbuSpaceError   display "\t\+ "
+
+syn match zimbuUses contained "\<uses([a-zA-Z_ ,]*)"
+syn match zimbuBlockgc contained "blockgc"
+syn match zimbuBlockComment contained " #.*"
+
+syn region zimbuCregion matchgroup=zimbuCblock start="^>>>" end="^<<<.*" contains=@Ccode,zimbuUses,zimbuBlockgc,zimbuBlockComment keepend
+
+" Assume long strings and C regions don't take more than 200 lines.
+syn sync minlines=200
+
+" When we find the start of a long string, without a # or " before it, we are
+" sure to be inside a long string.
+syn sync match zimbuLongStringSync grouphere zimbuLongString +^[^"#]*''\"+
+
+hi def link zimbuBasicType	Type
+hi def link zimbuCompType	Type
+hi def link zimbuType		Type
+hi def link zimbuStatement	Statement
+hi def link zimbuOperator	Statement
+hi def link zimbuMethod		PreProc
+hi def link zimbuModule		PreProc
+hi def link zimbuImport		PreProc
+hi def link zimbuUses		PreProc
+hi def link zimbuBlockgc	PreProc
+hi def link zimbuAttribute	PreProc
+hi def link zimbuString		Constant
+hi def link zimbuLongString	Special
+hi def link zimbuChar		Constant
+hi def link zimbuFixed		Constant
+hi def link zimbuComment	Comment
+hi def link zimbuCommentStart	zimbuComment
+hi def link zimbuBlockComment	Comment
+hi def link zimbuCblock		Comment
+hi def link zimbuTodo		Todo
+hi def link zimbuParam		Constant
+hi def link zimbuCode		Statement
+hi def link zimbuNoBar		Ignore
+hi def link zimbuNoBacktick	Ignore
+hi def link zimbuSpaceError	Error
+hi def link zimbuError		Error
+
+let b:current_syntax = "zimbu"
+
+" vim: ts=8
+
+endif
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 1a2b725c0..00d19b7ed 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -6,6 +6,8 @@ function! TestFiletype(filetype)
 endfunction
 
 call TestFiletype('8th')
+call TestFiletype('cfg')
+call TestFiletype('master')
 call TestFiletype('conf')
 call TestFiletype('haproxy')
 call TestFiletype('a2ps')
@@ -151,6 +153,7 @@ call TestFiletype('ocpbuildroot')
 call TestFiletype('sexplib')
 call TestFiletype('octave')
 call TestFiletype('opencl')
+call TestFiletype('rc')
 call TestFiletype('perl')
 call TestFiletype('pod')
 call TestFiletype('mason')
@@ -203,6 +206,7 @@ call TestFiletype('svg')
 call TestFiletype('swift')
 call TestFiletype('sxhkdrc')
 call TestFiletype('systemd')
+call TestFiletype('tf')
 call TestFiletype('terraform')
 call TestFiletype('textile')
 call TestFiletype('thrift')
@@ -224,6 +228,7 @@ call TestFiletype('vue')
 call TestFiletype('xdc')
 call TestFiletype('xsl')
 call TestFiletype('yaml.ansible')
+call TestFiletype('smarty')
 call TestFiletype('helm')
 call TestFiletype('help')
 call TestFiletype('zephir')
@@ -232,6 +237,7 @@ call TestFiletype('zig')
 call TestFiletype('trasys')
 call TestFiletype('basic')
 call TestFiletype('vb')
+call TestFiletype('spec')
 call TestFiletype('dosini')
 call TestFiletype('odin')
 call TestFiletype('bzl')
@@ -243,3 +249,381 @@ call TestFiletype('b')
 call TestFiletype('ibasic')
 call TestFiletype('freebasic')
 call TestFiletype('hamster')
+call TestFiletype('dosbatch')
+call TestFiletype('bc')
+call TestFiletype('bdf')
+call TestFiletype('bib')
+call TestFiletype('bst')
+call TestFiletype('named')
+call TestFiletype('bindzone')
+call TestFiletype('blank')
+call TestFiletype('bsdl')
+call TestFiletype('lpc')
+call TestFiletype('calendar')
+call TestFiletype('cs')
+call TestFiletype('csdl')
+call TestFiletype('cabal')
+call TestFiletype('cdrtoc')
+call TestFiletype('cdrdaoconf')
+call TestFiletype('cfengine')
+call TestFiletype('chaiscript')
+call TestFiletype('cdl')
+call TestFiletype('conaryrecipe')
+call TestFiletype('crm')
+call TestFiletype('cynpp')
+call TestFiletype('ch')
+call TestFiletype('css')
+call TestFiletype('cterm')
+call TestFiletype('debchangelog')
+call TestFiletype('chill')
+call TestFiletype('chordpro')
+call TestFiletype('clean')
+call TestFiletype('cl')
+call TestFiletype('cmusrc')
+call TestFiletype('cobol')
+call TestFiletype('coco')
+call TestFiletype('cf')
+call TestFiletype('config')
+call TestFiletype('cuda')
+call TestFiletype('dcd')
+call TestFiletype('eterm')
+call TestFiletype('lynx')
+call TestFiletype('quake')
+call TestFiletype('csp')
+call TestFiletype('cupl')
+call TestFiletype('cuplsim')
+call TestFiletype('debcontrol')
+call TestFiletype('debcopyright')
+call TestFiletype('debsources')
+call TestFiletype('denyhosts')
+call TestFiletype('dnsmasq')
+call TestFiletype('desc')
+call TestFiletype('desktop')
+call TestFiletype('dictconf')
+call TestFiletype('dictdconf')
+call TestFiletype('diff')
+call TestFiletype('dircolors')
+call TestFiletype('dot')
+call TestFiletype('dylanlid')
+call TestFiletype('dylanintr')
+call TestFiletype('dylan')
+call TestFiletype('def')
+call TestFiletype('dracula')
+call TestFiletype('datascript')
+call TestFiletype('dsl')
+call TestFiletype('dtd')
+call TestFiletype('dts')
+call TestFiletype('edif')
+call TestFiletype('ecd')
+call TestFiletype('elinks')
+call TestFiletype('elmfilt')
+call TestFiletype('esmtprc')
+call TestFiletype('esqlc')
+call TestFiletype('esterel')
+call TestFiletype('csc')
+call TestFiletype('exim')
+call TestFiletype('expect')
+call TestFiletype('exports')
+call TestFiletype('falcon')
+call TestFiletype('fan')
+call TestFiletype('factor')
+call TestFiletype('fetchmail')
+call TestFiletype('focexec')
+call TestFiletype('reva')
+call TestFiletype('fortran')
+call TestFiletype('framescript')
+call TestFiletype('fstab')
+call TestFiletype('gdb')
+call TestFiletype('gdmo')
+call TestFiletype('gedcom')
+call TestFiletype('gkrellmrc')
+call TestFiletype('gp')
+call TestFiletype('gpg')
+call TestFiletype('gnash')
+call TestFiletype('gitolite')
+call TestFiletype('grads')
+call TestFiletype('gretl')
+call TestFiletype('gsp')
+call TestFiletype('group')
+call TestFiletype('gtkrc')
+call TestFiletype('lhaskell')
+call TestFiletype('chaskell')
+call TestFiletype('haste')
+call TestFiletype('hastepreproc')
+call TestFiletype('hercules')
+call TestFiletype('hex')
+call TestFiletype('hollywood')
+call TestFiletype('tilde')
+call TestFiletype('htmlm4')
+call TestFiletype('template')
+call TestFiletype('hostconf')
+call TestFiletype('hostsaccess')
+call TestFiletype('hb')
+call TestFiletype('httest')
+call TestFiletype('icon')
+call TestFiletype('msidl')
+call TestFiletype('icemenu')
+call TestFiletype('indent')
+call TestFiletype('inform')
+call TestFiletype('initng')
+call TestFiletype('upstreamdat')
+call TestFiletype('upstreamlog')
+call TestFiletype('upstreaminstalllog')
+call TestFiletype('usserverlog')
+call TestFiletype('usw2kagtlog')
+call TestFiletype('ipfilter')
+call TestFiletype('fgl')
+call TestFiletype('inittab')
+call TestFiletype('iss')
+call TestFiletype('j')
+call TestFiletype('jal')
+call TestFiletype('jam')
+call TestFiletype('java')
+call TestFiletype('javacc')
+call TestFiletype('jsp')
+call TestFiletype('jproperties')
+call TestFiletype('jess')
+call TestFiletype('jgraph')
+call TestFiletype('jovial')
+call TestFiletype('kix')
+call TestFiletype('kwt')
+call TestFiletype('kivy')
+call TestFiletype('kscript')
+call TestFiletype('kconfig')
+call TestFiletype('lace')
+call TestFiletype('latte')
+call TestFiletype('limits')
+call TestFiletype('lprolog')
+call TestFiletype('ldif')
+call TestFiletype('ld')
+call TestFiletype('lex')
+call TestFiletype('libao')
+call TestFiletype('sensors')
+call TestFiletype('lftp')
+call TestFiletype('lifelines')
+call TestFiletype('lilo')
+call TestFiletype('lisp')
+call TestFiletype('liquid')
+call TestFiletype('lite')
+call TestFiletype('litestep')
+call TestFiletype('loginaccess')
+call TestFiletype('logindefs')
+call TestFiletype('logtalk')
+call TestFiletype('lotos')
+call TestFiletype('lout')
+call TestFiletype('lsl')
+call TestFiletype('lss')
+call TestFiletype('mgp')
+call TestFiletype('mail')
+call TestFiletype('mailaliases')
+call TestFiletype('mailcap')
+call TestFiletype('ist')
+call TestFiletype('mallard')
+call TestFiletype('man')
+call TestFiletype('manconf')
+call TestFiletype('maple')
+call TestFiletype('map')
+call TestFiletype('mel')
+call TestFiletype('hgcommit')
+call TestFiletype('messages')
+call TestFiletype('mf')
+call TestFiletype('mp')
+call TestFiletype('mgl')
+call TestFiletype('mix')
+call TestFiletype('mmp')
+call TestFiletype('modula2')
+call TestFiletype('modula3')
+call TestFiletype('monk')
+call TestFiletype('moo')
+call TestFiletype('modconf')
+call TestFiletype('mplayerconf')
+call TestFiletype('srec')
+call TestFiletype('mrxvtrc')
+call TestFiletype('msql')
+call TestFiletype('mysql')
+call TestFiletype('muttrc')
+call TestFiletype('mupad')
+call TestFiletype('mush')
+call TestFiletype('n1ql')
+call TestFiletype('nanorc')
+call TestFiletype('natural')
+call TestFiletype('neomuttrc')
+call TestFiletype('netrc')
+call TestFiletype('ninja')
+call TestFiletype('ncf')
+call TestFiletype('nroff')
+call TestFiletype('nqc')
+call TestFiletype('nsis')
+call TestFiletype('occam')
+call TestFiletype('omnimark')
+call TestFiletype('openroad')
+call TestFiletype('opl')
+call TestFiletype('ora')
+call TestFiletype('pf')
+call TestFiletype('pamconf')
+call TestFiletype('pamenv')
+call TestFiletype('papp')
+call TestFiletype('passwd')
+call TestFiletype('pascal')
+call TestFiletype('pdf')
+call TestFiletype('pcmk')
+call TestFiletype('pike')
+call TestFiletype('cmod')
+call TestFiletype('pinfo')
+call TestFiletype('pilrc')
+call TestFiletype('pine')
+call TestFiletype('pli')
+call TestFiletype('plm')
+call TestFiletype('plsql')
+call TestFiletype('plp')
+call TestFiletype('po')
+call TestFiletype('pfmain')
+call TestFiletype('postscr')
+call TestFiletype('ppd')
+call TestFiletype('pov')
+call TestFiletype('povini')
+call TestFiletype('pccts')
+call TestFiletype('ppwiz')
+call TestFiletype('obj')
+call TestFiletype('proc')
+call TestFiletype('privoxy')
+call TestFiletype('procmail')
+call TestFiletype('psf')
+call TestFiletype('promela')
+call TestFiletype('protocols')
+call TestFiletype('pyrex')
+call TestFiletype('radiance')
+call TestFiletype('ratpoison')
+call TestFiletype('rcs')
+call TestFiletype('readline')
+call TestFiletype('rib')
+call TestFiletype('rego')
+call TestFiletype('rexx')
+call TestFiletype('rnoweb')
+call TestFiletype('rmd')
+call TestFiletype('rrst')
+call TestFiletype('remind')
+call TestFiletype('resolv')
+call TestFiletype('rnc')
+call TestFiletype('rng')
+call TestFiletype('rpl')
+call TestFiletype('robots')
+call TestFiletype('rpcgen')
+call TestFiletype('rtf')
+call TestFiletype('slang')
+call TestFiletype('samba')
+call TestFiletype('sas')
+call TestFiletype('sass')
+call TestFiletype('sather')
+call TestFiletype('scilab')
+call TestFiletype('sd')
+call TestFiletype('sdl')
+call TestFiletype('sed')
+call TestFiletype('sieve')
+call TestFiletype('sm')
+call TestFiletype('services')
+call TestFiletype('slpconf')
+call TestFiletype('slpreg')
+call TestFiletype('spyce')
+call TestFiletype('slpspi')
+call TestFiletype('setserial')
+call TestFiletype('catalog')
+call TestFiletype('scheme')
+call TestFiletype('screen')
+call TestFiletype('simula')
+call TestFiletype('sinda')
+call TestFiletype('sisu')
+call TestFiletype('skill')
+call TestFiletype('slrnrc')
+call TestFiletype('slrnsc')
+call TestFiletype('st')
+call TestFiletype('smith')
+call TestFiletype('snobol4')
+call TestFiletype('mib')
+call TestFiletype('hog')
+call TestFiletype('spup')
+call TestFiletype('slice')
+call TestFiletype('spice')
+call TestFiletype('squid')
+call TestFiletype('sqlj')
+call TestFiletype('sqr')
+call TestFiletype('sshconfig')
+call TestFiletype('sshdconfig')
+call TestFiletype('stata')
+call TestFiletype('smcl')
+call TestFiletype('stp')
+call TestFiletype('sml')
+call TestFiletype('voscm')
+call TestFiletype('swiftgyb')
+call TestFiletype('sil')
+call TestFiletype('sysctl')
+call TestFiletype('sdc')
+call TestFiletype('sudoers')
+call TestFiletype('tags')
+call TestFiletype('tak')
+call TestFiletype('taskdata')
+call TestFiletype('taskedit')
+call TestFiletype('tcl')
+call TestFiletype('tli')
+call TestFiletype('tsalt')
+call TestFiletype('teraterm')
+call TestFiletype('terminfo')
+call TestFiletype('tex')
+call TestFiletype('context')
+call TestFiletype('texinfo')
+call TestFiletype('texmf')
+call TestFiletype('tidy')
+call TestFiletype('tpp')
+call TestFiletype('treetop')
+call TestFiletype('trustees')
+call TestFiletype('tssgm')
+call TestFiletype('tssop')
+call TestFiletype('tsscl')
+call TestFiletype('uil')
+call TestFiletype('udevconf')
+call TestFiletype('udevperm')
+call TestFiletype('uc')
+call TestFiletype('updatedb')
+call TestFiletype('upstart')
+call TestFiletype('vera')
+call TestFiletype('verilog')
+call TestFiletype('verilogams')
+call TestFiletype('systemverilog')
+call TestFiletype('vhdl')
+call TestFiletype('vim')
+call TestFiletype('viminfo')
+call TestFiletype('vgrindefs')
+call TestFiletype('vrml')
+call TestFiletype('vroom')
+call TestFiletype('wast')
+call TestFiletype('webmacro')
+call TestFiletype('wget')
+call TestFiletype('wml')
+call TestFiletype('winbatch')
+call TestFiletype('wsml')
+call TestFiletype('wvdial')
+call TestFiletype('cvsrc')
+call TestFiletype('cvs')
+call TestFiletype('wsh')
+call TestFiletype('xhtml')
+call TestFiletype('xinetd')
+call TestFiletype('xdefaults')
+call TestFiletype('xmath')
+call TestFiletype('xmodmap')
+call TestFiletype('xquery')
+call TestFiletype('xsd')
+call TestFiletype('xslt')
+call TestFiletype('yacc')
+call TestFiletype('zimbu')
+call TestFiletype('zimbutempl')
+call TestFiletype('z8a')
+call TestFiletype('apachestyle')
+call TestFiletype('asterisk')
+call TestFiletype('asteriskvm')
+call TestFiletype('bzr')
+call TestFiletype('crontab')
+call TestFiletype('fvwm')
+call TestFiletype('logcheck')
+call TestFiletype('svn')
+call TestFiletype('text')
+call TestFiletype('pullrequest')

From a96c420e14becb9be406fe9991c9e1ace868ba56 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 6 Oct 2020 19:00:11 +0200
Subject: [PATCH 113/299] Simplify list of packages

---
 README.md     | 438 +-------------------------------------------------
 scripts/build |   5 +-
 2 files changed, 6 insertions(+), 437 deletions(-)

diff --git a/README.md b/README.md
index 63a34062e..115508e58 100644
--- a/README.md
+++ b/README.md
@@ -41,597 +41,163 @@ If you need full functionality of any plugin, please use it directly with your p
 
 ## Language packs
 
+On top of all language packas from [vim repository](https://github.com/vim/vim/tree/master/runtime), vim-polyglot includes:
+
 <!--Language Packs-->
-- [8th](https://github.com/vim/vim/tree/master/runtime)
-- [a2ps](https://github.com/vim/vim/tree/master/runtime)
-- [a65](https://github.com/vim/vim/tree/master/runtime)
-- [aap](https://github.com/vim/vim/tree/master/runtime)
-- [abap](https://github.com/vim/vim/tree/master/runtime)
-- [abaqus](https://github.com/vim/vim/tree/master/runtime)
-- [abc](https://github.com/vim/vim/tree/master/runtime)
-- [abel](https://github.com/vim/vim/tree/master/runtime)
-- [acedb](https://github.com/vim/vim/tree/master/runtime)
 - [acpiasl](https://github.com/martinlroth/vim-acpi-asl)
-- [ada](https://github.com/vim/vim/tree/master/runtime)
-- [ahdl](https://github.com/vim/vim/tree/master/runtime)
-- [aidl](https://github.com/vim/vim/tree/master/runtime)
-- [alsaconf](https://github.com/vim/vim/tree/master/runtime)
-- [aml](https://github.com/vim/vim/tree/master/runtime)
-- [ampl](https://github.com/vim/vim/tree/master/runtime)
 - [ansible](https://github.com/pearofducks/ansible-vim)
-- [ant](https://github.com/vim/vim/tree/master/runtime)
-- [apache](https://github.com/vim/vim/tree/master/runtime)
-- [apachestyle](https://github.com/vim/vim/tree/master/runtime)
 - [apiblueprint](https://github.com/kylef/apiblueprint.vim)
 - [applescript](https://github.com/mityu/vim-applescript)
-- [aptconf](https://github.com/vim/vim/tree/master/runtime)
-- [arch](https://github.com/vim/vim/tree/master/runtime)
 - [arduino](https://github.com/sudar/vim-arduino-syntax)
-- [art](https://github.com/vim/vim/tree/master/runtime)
 - [asciidoc](https://github.com/asciidoc/vim-asciidoc)
-- [asn](https://github.com/vim/vim/tree/master/runtime)
-- [aspperl](https://github.com/vim/vim/tree/master/runtime)
-- [aspvbs](https://github.com/vim/vim/tree/master/runtime)
-- [asterisk](https://github.com/vim/vim/tree/master/runtime)
-- [asteriskvm](https://github.com/vim/vim/tree/master/runtime)
-- [atlas](https://github.com/vim/vim/tree/master/runtime)
 - [autohotkey](https://github.com/hnamikaw/vim-autohotkey)
-- [autoit](https://github.com/vim/vim/tree/master/runtime)
-- [automake](https://github.com/vim/vim/tree/master/runtime)
-- [ave](https://github.com/vim/vim/tree/master/runtime)
-- [awk](https://github.com/vim/vim/tree/master/runtime)
-- [b](https://github.com/vim/vim/tree/master/runtime)
-- [basic](https://github.com/vim/vim/tree/master/runtime)
-- [bc](https://github.com/vim/vim/tree/master/runtime)
-- [bdf](https://github.com/vim/vim/tree/master/runtime)
-- [bib](https://github.com/vim/vim/tree/master/runtime)
-- [bindzone](https://github.com/vim/vim/tree/master/runtime)
 - [blade](https://github.com/jwalton512/vim-blade)
-- [blank](https://github.com/vim/vim/tree/master/runtime)
 - [brewfile](https://github.com/bfontaine/Brewfile.vim)
-- [bsdl](https://github.com/vim/vim/tree/master/runtime)
-- [bst](https://github.com/vim/vim/tree/master/runtime)
-- [bzl](https://github.com/vim/vim/tree/master/runtime)
-- [bzr](https://github.com/vim/vim/tree/master/runtime)
 - [c/c++](https://github.com/vim-jp/vim-cpp)
-- [cabal](https://github.com/vim/vim/tree/master/runtime)
 - [caddyfile](https://github.com/isobit/vim-caddyfile)
-- [calendar](https://github.com/vim/vim/tree/master/runtime)
 - [carp](https://github.com/hellerve/carp-vim)
-- [catalog](https://github.com/vim/vim/tree/master/runtime)
-- [cdl](https://github.com/vim/vim/tree/master/runtime)
-- [cdrdaoconf](https://github.com/vim/vim/tree/master/runtime)
-- [cdrtoc](https://github.com/vim/vim/tree/master/runtime)
-- [cf](https://github.com/vim/vim/tree/master/runtime)
-- [cfengine](https://github.com/vim/vim/tree/master/runtime)
-- [cfg](https://github.com/vim/vim/tree/master/runtime)
-- [ch](https://github.com/vim/vim/tree/master/runtime)
-- [chaiscript](https://github.com/vim/vim/tree/master/runtime)
-- [chaskell](https://github.com/vim/vim/tree/master/runtime)
-- [chill](https://github.com/vim/vim/tree/master/runtime)
-- [chordpro](https://github.com/vim/vim/tree/master/runtime)
 - [cjsx](https://github.com/mtscout6/vim-cjsx)
-- [cl](https://github.com/vim/vim/tree/master/runtime)
-- [clean](https://github.com/vim/vim/tree/master/runtime)
 - [clojure](https://github.com/guns/vim-clojure-static)
 - [cmake](https://github.com/pboettch/vim-cmake-syntax)
-- [cmod](https://github.com/vim/vim/tree/master/runtime)
-- [cmusrc](https://github.com/vim/vim/tree/master/runtime)
-- [cobol](https://github.com/vim/vim/tree/master/runtime)
-- [coco](https://github.com/vim/vim/tree/master/runtime)
 - [coffee-script](https://github.com/kchmck/vim-coffee-script)
-- [conaryrecipe](https://github.com/vim/vim/tree/master/runtime)
-- [conf](https://github.com/vim/vim/tree/master/runtime)
-- [config](https://github.com/vim/vim/tree/master/runtime)
-- [context](https://github.com/vim/vim/tree/master/runtime)
 - [cpp-modern](https://github.com/bfrg/vim-cpp-modern)
 - [cql](https://github.com/elubow/cql-vim)
-- [crm](https://github.com/vim/vim/tree/master/runtime)
-- [crontab](https://github.com/vim/vim/tree/master/runtime)
 - [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim)
 - [crystal](https://github.com/rhysd/vim-crystal)
-- [cs](https://github.com/vim/vim/tree/master/runtime)
-- [csc](https://github.com/vim/vim/tree/master/runtime)
-- [csdl](https://github.com/vim/vim/tree/master/runtime)
-- [csp](https://github.com/vim/vim/tree/master/runtime)
-- [css](https://github.com/vim/vim/tree/master/runtime)
 - [csv](https://github.com/chrisbra/csv.vim)
-- [cterm](https://github.com/vim/vim/tree/master/runtime)
 - [cucumber](https://github.com/tpope/vim-cucumber)
-- [cuda](https://github.com/vim/vim/tree/master/runtime)
 - [cue](https://github.com/mgrabovsky/vim-cuesheet)
-- [cupl](https://github.com/vim/vim/tree/master/runtime)
-- [cuplsim](https://github.com/vim/vim/tree/master/runtime)
-- [cvs](https://github.com/vim/vim/tree/master/runtime)
-- [cvsrc](https://github.com/vim/vim/tree/master/runtime)
-- [cynpp](https://github.com/vim/vim/tree/master/runtime)
 - [dart](https://github.com/dart-lang/dart-vim-plugin)
-- [datascript](https://github.com/vim/vim/tree/master/runtime)
-- [dcd](https://github.com/vim/vim/tree/master/runtime)
-- [debchangelog](https://github.com/vim/vim/tree/master/runtime)
-- [debcontrol](https://github.com/vim/vim/tree/master/runtime)
-- [debcopyright](https://github.com/vim/vim/tree/master/runtime)
-- [debsources](https://github.com/vim/vim/tree/master/runtime)
-- [def](https://github.com/vim/vim/tree/master/runtime)
-- [denyhosts](https://github.com/vim/vim/tree/master/runtime)
-- [desc](https://github.com/vim/vim/tree/master/runtime)
-- [desktop](https://github.com/vim/vim/tree/master/runtime)
 - [dhall](https://github.com/vmchale/dhall-vim)
-- [dictconf](https://github.com/vim/vim/tree/master/runtime)
-- [dictdconf](https://github.com/vim/vim/tree/master/runtime)
-- [diff](https://github.com/vim/vim/tree/master/runtime)
-- [dircolors](https://github.com/vim/vim/tree/master/runtime)
 - [dlang](https://github.com/JesseKPhillips/d.vim)
-- [dnsmasq](https://github.com/vim/vim/tree/master/runtime)
 - [dockerfile](https://github.com/ekalinin/Dockerfile.vim)
-- [dosbatch](https://github.com/vim/vim/tree/master/runtime)
-- [dosini](https://github.com/vim/vim/tree/master/runtime)
-- [dot](https://github.com/vim/vim/tree/master/runtime)
-- [dracula](https://github.com/vim/vim/tree/master/runtime)
-- [dsl](https://github.com/vim/vim/tree/master/runtime)
-- [dtd](https://github.com/vim/vim/tree/master/runtime)
-- [dts](https://github.com/vim/vim/tree/master/runtime)
-- [dylan](https://github.com/vim/vim/tree/master/runtime)
-- [dylanintr](https://github.com/vim/vim/tree/master/runtime)
-- [dylanlid](https://github.com/vim/vim/tree/master/runtime)
-- [ecd](https://github.com/vim/vim/tree/master/runtime)
-- [edif](https://github.com/vim/vim/tree/master/runtime)
-- [elf](https://github.com/vim/vim/tree/master/runtime)
-- [elinks](https://github.com/vim/vim/tree/master/runtime)
 - [elixir](https://github.com/elixir-lang/vim-elixir)
 - [elm](https://github.com/andys8/vim-elm-syntax)
-- [elmfilt](https://github.com/vim/vim/tree/master/runtime)
 - [emberscript](https://github.com/yalesov/vim-ember-script)
 - [emblem](https://github.com/yalesov/vim-emblem)
 - [erlang](https://github.com/vim-erlang/vim-erlang-runtime)
-- [esmtprc](https://github.com/vim/vim/tree/master/runtime)
-- [esqlc](https://github.com/vim/vim/tree/master/runtime)
-- [esterel](https://github.com/vim/vim/tree/master/runtime)
-- [eterm](https://github.com/vim/vim/tree/master/runtime)
-- [exim](https://github.com/vim/vim/tree/master/runtime)
-- [expect](https://github.com/vim/vim/tree/master/runtime)
-- [exports](https://github.com/vim/vim/tree/master/runtime)
-- [factor](https://github.com/vim/vim/tree/master/runtime)
-- [falcon](https://github.com/vim/vim/tree/master/runtime)
-- [fan](https://github.com/vim/vim/tree/master/runtime)
 - [fennel](https://github.com/bakpakin/fennel.vim)
 - [ferm](https://github.com/vim-scripts/ferm.vim)
-- [fetchmail](https://github.com/vim/vim/tree/master/runtime)
-- [fgl](https://github.com/vim/vim/tree/master/runtime)
 - [fish](https://github.com/georgewitteman/vim-fish)
 - [flatbuffers](https://github.com/dcharbon/vim-flatbuffers)
-- [focexec](https://github.com/vim/vim/tree/master/runtime)
-- [forth](https://github.com/vim/vim/tree/master/runtime)
-- [fortran](https://github.com/vim/vim/tree/master/runtime)
-- [framescript](https://github.com/vim/vim/tree/master/runtime)
-- [freebasic](https://github.com/vim/vim/tree/master/runtime)
 - [fsharp](https://github.com/ionide/Ionide-vim)
-- [fstab](https://github.com/vim/vim/tree/master/runtime)
-- [fvwm](https://github.com/vim/vim/tree/master/runtime)
-- [gdb](https://github.com/vim/vim/tree/master/runtime)
-- [gdmo](https://github.com/vim/vim/tree/master/runtime)
 - [gdscript](https://github.com/calviken/vim-gdscript3)
-- [gedcom](https://github.com/vim/vim/tree/master/runtime)
 - [git](https://github.com/tpope/vim-git)
 - [gitignore](https://github.com/fszymanski/fzf-gitignore)
-- [gitolite](https://github.com/vim/vim/tree/master/runtime)
-- [gkrellmrc](https://github.com/vim/vim/tree/master/runtime)
 - [glsl](https://github.com/tikhomirov/vim-glsl)
 - [gmpl](https://github.com/maelvalais/gmpl.vim)
-- [gnash](https://github.com/vim/vim/tree/master/runtime)
 - [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting)
 - [go](https://github.com/fatih/vim-go)
-- [gp](https://github.com/vim/vim/tree/master/runtime)
-- [gpg](https://github.com/vim/vim/tree/master/runtime)
 - [gradle](https://github.com/tfnico/vim-gradle)
-- [grads](https://github.com/vim/vim/tree/master/runtime)
 - [graphql](https://github.com/jparise/vim-graphql)
-- [gretl](https://github.com/vim/vim/tree/master/runtime)
-- [groovy](https://github.com/vim/vim/tree/master/runtime)
-- [group](https://github.com/vim/vim/tree/master/runtime)
-- [grub](https://github.com/vim/vim/tree/master/runtime)
-- [gsp](https://github.com/vim/vim/tree/master/runtime)
-- [gtkrc](https://github.com/vim/vim/tree/master/runtime)
 - [haml](https://github.com/tpope/vim-haml)
-- [hamster](https://github.com/vim/vim/tree/master/runtime)
 - [handlebars](https://github.com/mustache/vim-mustache-handlebars)
 - [haproxy](https://github.com/CH-DanReif/haproxy.vim)
 - [haskell](https://github.com/neovimhaskell/haskell-vim)
-- [haste](https://github.com/vim/vim/tree/master/runtime)
-- [hastepreproc](https://github.com/vim/vim/tree/master/runtime)
 - [haxe](https://github.com/yaymukund/vim-haxe)
-- [hb](https://github.com/vim/vim/tree/master/runtime)
 - [hcl](https://github.com/b4b4r07/vim-hcl)
 - [helm](https://github.com/towolf/vim-helm)
 - [help](https://github.com/neovim/neovim/tree/master/runtime)
-- [hercules](https://github.com/vim/vim/tree/master/runtime)
-- [hex](https://github.com/vim/vim/tree/master/runtime)
-- [hgcommit](https://github.com/vim/vim/tree/master/runtime)
 - [hive](https://github.com/zebradil/hive.vim)
-- [hog](https://github.com/vim/vim/tree/master/runtime)
-- [hollywood](https://github.com/vim/vim/tree/master/runtime)
-- [hostconf](https://github.com/vim/vim/tree/master/runtime)
-- [hostsaccess](https://github.com/vim/vim/tree/master/runtime)
 - [html5](https://github.com/othree/html5.vim)
-- [htmldjango](https://github.com/vim/vim/tree/master/runtime)
-- [htmlm4](https://github.com/vim/vim/tree/master/runtime)
-- [httest](https://github.com/vim/vim/tree/master/runtime)
 - [i3](https://github.com/mboughaba/i3config.vim)
-- [ibasic](https://github.com/vim/vim/tree/master/runtime)
 - [icalendar](https://github.com/chutzpah/icalendar.vim)
-- [icemenu](https://github.com/vim/vim/tree/master/runtime)
-- [icon](https://github.com/vim/vim/tree/master/runtime)
 - [idris2](https://github.com/edwinb/idris2-vim)
 - [idris](https://github.com/idris-hackers/idris-vim)
-- [indent](https://github.com/vim/vim/tree/master/runtime)
-- [inform](https://github.com/vim/vim/tree/master/runtime)
-- [initng](https://github.com/vim/vim/tree/master/runtime)
-- [inittab](https://github.com/vim/vim/tree/master/runtime)
 - [ion](https://github.com/vmchale/ion-vim)
-- [ipfilter](https://github.com/vim/vim/tree/master/runtime)
-- [iss](https://github.com/vim/vim/tree/master/runtime)
-- [ist](https://github.com/vim/vim/tree/master/runtime)
-- [j](https://github.com/vim/vim/tree/master/runtime)
-- [jal](https://github.com/vim/vim/tree/master/runtime)
-- [jam](https://github.com/vim/vim/tree/master/runtime)
-- [java](https://github.com/vim/vim/tree/master/runtime)
-- [javacc](https://github.com/vim/vim/tree/master/runtime)
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
 - [javascript](https://github.com/pangloss/vim-javascript)
 - [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax)
-- [jess](https://github.com/vim/vim/tree/master/runtime)
-- [jgraph](https://github.com/vim/vim/tree/master/runtime)
-- [jovial](https://github.com/vim/vim/tree/master/runtime)
-- [jproperties](https://github.com/vim/vim/tree/master/runtime)
 - [jq](https://github.com/vito-c/jq.vim)
 - [json5](https://github.com/GutenYe/json5.vim)
 - [json](https://github.com/elzr/vim-json)
 - [jsonnet](https://github.com/google/vim-jsonnet)
-- [jsp](https://github.com/vim/vim/tree/master/runtime)
 - [jst](https://github.com/briancollins/vim-jst)
 - [jsx](https://github.com/MaxMEllon/vim-jsx-pretty)
 - [julia](https://github.com/JuliaEditorSupport/julia-vim)
-- [kconfig](https://github.com/vim/vim/tree/master/runtime)
-- [kivy](https://github.com/vim/vim/tree/master/runtime)
-- [kix](https://github.com/vim/vim/tree/master/runtime)
 - [kotlin](https://github.com/udalov/kotlin-vim)
-- [kscript](https://github.com/vim/vim/tree/master/runtime)
-- [kwt](https://github.com/vim/vim/tree/master/runtime)
-- [lace](https://github.com/vim/vim/tree/master/runtime)
-- [latte](https://github.com/vim/vim/tree/master/runtime)
-- [ld](https://github.com/vim/vim/tree/master/runtime)
-- [ldif](https://github.com/vim/vim/tree/master/runtime)
 - [ledger](https://github.com/ledger/vim-ledger)
-- [less](https://github.com/vim/vim/tree/master/runtime)
-- [lex](https://github.com/vim/vim/tree/master/runtime)
-- [lftp](https://github.com/vim/vim/tree/master/runtime)
-- [lhaskell](https://github.com/vim/vim/tree/master/runtime)
-- [libao](https://github.com/vim/vim/tree/master/runtime)
-- [lifelines](https://github.com/vim/vim/tree/master/runtime)
-- [lilo](https://github.com/vim/vim/tree/master/runtime)
 - [lilypond](https://github.com/anowlcalledjosh/vim-lilypond)
-- [limits](https://github.com/vim/vim/tree/master/runtime)
-- [liquid](https://github.com/vim/vim/tree/master/runtime)
-- [lisp](https://github.com/vim/vim/tree/master/runtime)
-- [lite](https://github.com/vim/vim/tree/master/runtime)
-- [litestep](https://github.com/vim/vim/tree/master/runtime)
 - [livescript](https://github.com/gkz/vim-ls)
 - [llvm](https://github.com/rhysd/vim-llvm)
 - [log](https://github.com/MTDL9/vim-log-highlighting)
-- [logcheck](https://github.com/vim/vim/tree/master/runtime)
-- [loginaccess](https://github.com/vim/vim/tree/master/runtime)
-- [logindefs](https://github.com/vim/vim/tree/master/runtime)
-- [logtalk](https://github.com/vim/vim/tree/master/runtime)
-- [lotos](https://github.com/vim/vim/tree/master/runtime)
-- [lout](https://github.com/vim/vim/tree/master/runtime)
-- [lpc](https://github.com/vim/vim/tree/master/runtime)
-- [lprolog](https://github.com/vim/vim/tree/master/runtime)
-- [lsl](https://github.com/vim/vim/tree/master/runtime)
-- [lss](https://github.com/vim/vim/tree/master/runtime)
 - [lua](https://github.com/tbastos/vim-lua)
-- [lynx](https://github.com/vim/vim/tree/master/runtime)
-- [m4](https://github.com/vim/vim/tree/master/runtime)
-- [mail](https://github.com/vim/vim/tree/master/runtime)
-- [mailaliases](https://github.com/vim/vim/tree/master/runtime)
-- [mailcap](https://github.com/vim/vim/tree/master/runtime)
 - [mako](https://github.com/sophacles/vim-bundle-mako)
-- [mallard](https://github.com/vim/vim/tree/master/runtime)
-- [man](https://github.com/vim/vim/tree/master/runtime)
-- [manconf](https://github.com/vim/vim/tree/master/runtime)
-- [map](https://github.com/vim/vim/tree/master/runtime)
-- [maple](https://github.com/vim/vim/tree/master/runtime)
 - [markdown](https://github.com/plasticboy/vim-markdown)
-- [master](https://github.com/vim/vim/tree/master/runtime)
 - [mathematica](https://github.com/voldikss/vim-mma)
 - [mdx](https://github.com/jxnblk/vim-mdx-js)
-- [mel](https://github.com/vim/vim/tree/master/runtime)
 - [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim)
-- [messages](https://github.com/vim/vim/tree/master/runtime)
-- [mf](https://github.com/vim/vim/tree/master/runtime)
-- [mgl](https://github.com/vim/vim/tree/master/runtime)
-- [mgp](https://github.com/vim/vim/tree/master/runtime)
-- [mib](https://github.com/vim/vim/tree/master/runtime)
-- [mix](https://github.com/vim/vim/tree/master/runtime)
-- [mmp](https://github.com/vim/vim/tree/master/runtime)
-- [modconf](https://github.com/vim/vim/tree/master/runtime)
-- [modula2](https://github.com/vim/vim/tree/master/runtime)
-- [modula3](https://github.com/vim/vim/tree/master/runtime)
-- [monk](https://github.com/vim/vim/tree/master/runtime)
-- [moo](https://github.com/vim/vim/tree/master/runtime)
 - [moonscript](https://github.com/leafo/moonscript-vim)
-- [mp](https://github.com/vim/vim/tree/master/runtime)
-- [mplayerconf](https://github.com/vim/vim/tree/master/runtime)
-- [mrxvtrc](https://github.com/vim/vim/tree/master/runtime)
-- [msidl](https://github.com/vim/vim/tree/master/runtime)
-- [msql](https://github.com/vim/vim/tree/master/runtime)
-- [mupad](https://github.com/vim/vim/tree/master/runtime)
-- [murphi](https://github.com/vim/vim/tree/master/runtime)
-- [mush](https://github.com/vim/vim/tree/master/runtime)
-- [muttrc](https://github.com/vim/vim/tree/master/runtime)
-- [mysql](https://github.com/vim/vim/tree/master/runtime)
-- [n1ql](https://github.com/vim/vim/tree/master/runtime)
-- [named](https://github.com/vim/vim/tree/master/runtime)
-- [nanorc](https://github.com/vim/vim/tree/master/runtime)
-- [natural](https://github.com/vim/vim/tree/master/runtime)
-- [ncf](https://github.com/vim/vim/tree/master/runtime)
-- [neomuttrc](https://github.com/vim/vim/tree/master/runtime)
-- [netrc](https://github.com/vim/vim/tree/master/runtime)
 - [nginx](https://github.com/chr4/nginx.vim)
 - [nim](https://github.com/zah/nim.vim)
-- [ninja](https://github.com/vim/vim/tree/master/runtime)
 - [nix](https://github.com/LnL7/vim-nix)
-- [nqc](https://github.com/vim/vim/tree/master/runtime)
-- [nroff](https://github.com/vim/vim/tree/master/runtime)
-- [nsis](https://github.com/vim/vim/tree/master/runtime)
-- [obj](https://github.com/vim/vim/tree/master/runtime)
 - [objc](https://github.com/b4winckler/vim-objc)
 - [ocaml](https://github.com/rgrinberg/vim-ocaml)
-- [occam](https://github.com/vim/vim/tree/master/runtime)
 - [octave](https://github.com/McSinyx/vim-octave)
 - [odin](https://github.com/Tetralux/odin.vim)
-- [omnimark](https://github.com/vim/vim/tree/master/runtime)
 - [opencl](https://github.com/petRUShka/vim-opencl)
-- [openroad](https://github.com/vim/vim/tree/master/runtime)
-- [opl](https://github.com/vim/vim/tree/master/runtime)
-- [ora](https://github.com/vim/vim/tree/master/runtime)
-- [pamconf](https://github.com/vim/vim/tree/master/runtime)
-- [pamenv](https://github.com/vim/vim/tree/master/runtime)
-- [papp](https://github.com/vim/vim/tree/master/runtime)
-- [pascal](https://github.com/vim/vim/tree/master/runtime)
-- [passwd](https://github.com/vim/vim/tree/master/runtime)
-- [pccts](https://github.com/vim/vim/tree/master/runtime)
-- [pcmk](https://github.com/vim/vim/tree/master/runtime)
-- [pdf](https://github.com/vim/vim/tree/master/runtime)
 - [perl](https://github.com/vim-perl/vim-perl)
-- [pf](https://github.com/vim/vim/tree/master/runtime)
-- [pfmain](https://github.com/vim/vim/tree/master/runtime)
 - [pgsql](https://github.com/lifepillar/pgsql.vim)
 - [php](https://github.com/StanAngeloff/php.vim)
-- [pike](https://github.com/vim/vim/tree/master/runtime)
-- [pilrc](https://github.com/vim/vim/tree/master/runtime)
-- [pine](https://github.com/vim/vim/tree/master/runtime)
-- [pinfo](https://github.com/vim/vim/tree/master/runtime)
 - [plantuml](https://github.com/aklt/plantuml-syntax)
-- [pli](https://github.com/vim/vim/tree/master/runtime)
-- [plm](https://github.com/vim/vim/tree/master/runtime)
-- [plp](https://github.com/vim/vim/tree/master/runtime)
-- [plsql](https://github.com/vim/vim/tree/master/runtime)
-- [po](https://github.com/vim/vim/tree/master/runtime)
 - [pony](https://github.com/jakwings/vim-pony)
-- [postscr](https://github.com/vim/vim/tree/master/runtime)
-- [pov](https://github.com/vim/vim/tree/master/runtime)
-- [povini](https://github.com/vim/vim/tree/master/runtime)
 - [powershell](https://github.com/PProvost/vim-ps1)
-- [ppd](https://github.com/vim/vim/tree/master/runtime)
-- [ppwiz](https://github.com/vim/vim/tree/master/runtime)
-- [privoxy](https://github.com/vim/vim/tree/master/runtime)
-- [proc](https://github.com/vim/vim/tree/master/runtime)
-- [procmail](https://github.com/vim/vim/tree/master/runtime)
-- [prolog](https://github.com/vim/vim/tree/master/runtime)
-- [promela](https://github.com/vim/vim/tree/master/runtime)
 - [protobuf](https://github.com/uarun/vim-protobuf)
-- [protocols](https://github.com/vim/vim/tree/master/runtime)
-- [psf](https://github.com/vim/vim/tree/master/runtime)
 - [pug](https://github.com/digitaltoad/vim-pug)
-- [pullrequest](https://github.com/vim/vim/tree/master/runtime)
 - [puppet](https://github.com/rodjek/vim-puppet)
 - [purescript](https://github.com/purescript-contrib/purescript-vim)
-- [pyrex](https://github.com/vim/vim/tree/master/runtime)
 - [python-compiler](https://github.com/aliev/vim-compiler-python)
 - [python-indent](https://github.com/Vimjas/vim-python-pep8-indent)
 - [python](https://github.com/vim-python/python-syntax)
 - [qmake](https://github.com/artoj/qmake-syntax-vim)
 - [qml](https://github.com/peterhoeg/vim-qml)
-- [quake](https://github.com/vim/vim/tree/master/runtime)
 - [r-lang](https://github.com/vim-scripts/R.vim)
 - [racket](https://github.com/wlangstroth/vim-racket)
-- [radiance](https://github.com/vim/vim/tree/master/runtime)
 - [ragel](https://github.com/jneen/ragel.vim)
 - [raku](https://github.com/Raku/vim-raku)
 - [raml](https://github.com/IN3D/vim-raml)
-- [ratpoison](https://github.com/vim/vim/tree/master/runtime)
 - [razor](https://github.com/adamclerk/vim-razor)
-- [rc](https://github.com/vim/vim/tree/master/runtime)
-- [rcs](https://github.com/vim/vim/tree/master/runtime)
-- [readline](https://github.com/vim/vim/tree/master/runtime)
 - [reason](https://github.com/reasonml-editor/vim-reason-plus)
-- [rego](https://github.com/vim/vim/tree/master/runtime)
-- [remind](https://github.com/vim/vim/tree/master/runtime)
 - [requirements](https://github.com/raimon49/requirements.txt.vim)
-- [resolv](https://github.com/vim/vim/tree/master/runtime)
-- [reva](https://github.com/vim/vim/tree/master/runtime)
-- [rexx](https://github.com/vim/vim/tree/master/runtime)
-- [rib](https://github.com/vim/vim/tree/master/runtime)
-- [rmd](https://github.com/vim/vim/tree/master/runtime)
-- [rnc](https://github.com/vim/vim/tree/master/runtime)
-- [rng](https://github.com/vim/vim/tree/master/runtime)
-- [rnoweb](https://github.com/vim/vim/tree/master/runtime)
-- [robots](https://github.com/vim/vim/tree/master/runtime)
-- [rpcgen](https://github.com/vim/vim/tree/master/runtime)
-- [rpl](https://github.com/vim/vim/tree/master/runtime)
-- [rrst](https://github.com/vim/vim/tree/master/runtime)
 - [rspec](https://github.com/keith/rspec.vim)
 - [rst](https://github.com/marshallward/vim-restructuredtext)
-- [rtf](https://github.com/vim/vim/tree/master/runtime)
 - [ruby](https://github.com/vim-ruby/vim-ruby)
 - [rust](https://github.com/rust-lang/rust.vim)
-- [samba](https://github.com/vim/vim/tree/master/runtime)
-- [sas](https://github.com/vim/vim/tree/master/runtime)
-- [sass](https://github.com/vim/vim/tree/master/runtime)
-- [sather](https://github.com/vim/vim/tree/master/runtime)
 - [sbt](https://github.com/derekwyatt/vim-sbt)
 - [scala](https://github.com/derekwyatt/vim-scala)
-- [scheme](https://github.com/vim/vim/tree/master/runtime)
-- [scilab](https://github.com/vim/vim/tree/master/runtime)
-- [screen](https://github.com/vim/vim/tree/master/runtime)
 - [scss](https://github.com/cakebaker/scss-syntax.vim)
-- [sd](https://github.com/vim/vim/tree/master/runtime)
-- [sdc](https://github.com/vim/vim/tree/master/runtime)
-- [sdl](https://github.com/vim/vim/tree/master/runtime)
-- [sed](https://github.com/vim/vim/tree/master/runtime)
-- [sensors](https://github.com/vim/vim/tree/master/runtime)
-- [services](https://github.com/vim/vim/tree/master/runtime)
-- [setserial](https://github.com/vim/vim/tree/master/runtime)
 - [sh](https://github.com/arzg/vim-sh)
-- [sieve](https://github.com/vim/vim/tree/master/runtime)
-- [sil](https://github.com/vim/vim/tree/master/runtime)
-- [simula](https://github.com/vim/vim/tree/master/runtime)
-- [sinda](https://github.com/vim/vim/tree/master/runtime)
-- [sisu](https://github.com/vim/vim/tree/master/runtime)
-- [skill](https://github.com/vim/vim/tree/master/runtime)
-- [slang](https://github.com/vim/vim/tree/master/runtime)
-- [slice](https://github.com/vim/vim/tree/master/runtime)
 - [slim](https://github.com/slim-template/vim-slim)
 - [slime](https://github.com/slime-lang/vim-slime-syntax)
-- [slpconf](https://github.com/vim/vim/tree/master/runtime)
-- [slpreg](https://github.com/vim/vim/tree/master/runtime)
-- [slpspi](https://github.com/vim/vim/tree/master/runtime)
-- [slrnrc](https://github.com/vim/vim/tree/master/runtime)
-- [slrnsc](https://github.com/vim/vim/tree/master/runtime)
-- [sm](https://github.com/vim/vim/tree/master/runtime)
-- [smarty](https://github.com/vim/vim/tree/master/runtime)
-- [smcl](https://github.com/vim/vim/tree/master/runtime)
-- [smith](https://github.com/vim/vim/tree/master/runtime)
-- [sml](https://github.com/vim/vim/tree/master/runtime)
 - [smt2](https://github.com/bohlender/vim-smt2)
-- [snobol4](https://github.com/vim/vim/tree/master/runtime)
 - [solidity](https://github.com/tomlion/vim-solidity)
-- [spec](https://github.com/vim/vim/tree/master/runtime)
-- [spice](https://github.com/vim/vim/tree/master/runtime)
-- [spup](https://github.com/vim/vim/tree/master/runtime)
-- [spyce](https://github.com/vim/vim/tree/master/runtime)
-- [sql](https://github.com/vim/vim/tree/master/runtime)
-- [sqlj](https://github.com/vim/vim/tree/master/runtime)
-- [sqr](https://github.com/vim/vim/tree/master/runtime)
-- [squid](https://github.com/vim/vim/tree/master/runtime)
-- [srec](https://github.com/vim/vim/tree/master/runtime)
-- [sshconfig](https://github.com/vim/vim/tree/master/runtime)
-- [sshdconfig](https://github.com/vim/vim/tree/master/runtime)
-- [st](https://github.com/vim/vim/tree/master/runtime)
-- [stata](https://github.com/vim/vim/tree/master/runtime)
-- [stp](https://github.com/vim/vim/tree/master/runtime)
 - [stylus](https://github.com/wavded/vim-stylus)
-- [sudoers](https://github.com/vim/vim/tree/master/runtime)
 - [svelte](https://github.com/evanleck/vim-svelte/tree/main)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
 - [svg](https://github.com/vim-scripts/svg.vim)
-- [svn](https://github.com/vim/vim/tree/master/runtime)
 - [swift](https://github.com/keith/swift.vim)
-- [swiftgyb](https://github.com/vim/vim/tree/master/runtime)
 - [sxhkd](https://github.com/baskerville/vim-sxhkdrc)
-- [sysctl](https://github.com/vim/vim/tree/master/runtime)
 - [systemd](https://github.com/wgwoods/vim-systemd-syntax)
-- [systemverilog](https://github.com/vim/vim/tree/master/runtime)
-- [tads](https://github.com/vim/vim/tree/master/runtime)
-- [tags](https://github.com/vim/vim/tree/master/runtime)
-- [tak](https://github.com/vim/vim/tree/master/runtime)
-- [taskdata](https://github.com/vim/vim/tree/master/runtime)
-- [taskedit](https://github.com/vim/vim/tree/master/runtime)
-- [tcl](https://github.com/vim/vim/tree/master/runtime)
-- [template](https://github.com/vim/vim/tree/master/runtime)
-- [teraterm](https://github.com/vim/vim/tree/master/runtime)
-- [terminfo](https://github.com/vim/vim/tree/master/runtime)
-- [terraform](https://github.com/hashivim/vim-terraform)
-- [tex](https://github.com/vim/vim/tree/master/runtime)
-- [texinfo](https://github.com/vim/vim/tree/master/runtime)
-- [texmf](https://github.com/vim/vim/tree/master/runtime)
-- [text](https://github.com/vim/vim/tree/master/runtime)
 - [textile](https://github.com/timcharper/textile.vim)
-- [tf](https://github.com/vim/vim/tree/master/runtime)
 - [thrift](https://github.com/solarnz/thrift.vim)
-- [tidy](https://github.com/vim/vim/tree/master/runtime)
-- [tilde](https://github.com/vim/vim/tree/master/runtime)
-- [tli](https://github.com/vim/vim/tree/master/runtime)
 - [tmux](https://github.com/ericpruitt/tmux.vim/tree/master/vim)
 - [toml](https://github.com/cespare/vim-toml)
-- [tpp](https://github.com/vim/vim/tree/master/runtime)
 - [tptp](https://github.com/c-cube/vim-tptp)
-- [trasys](https://github.com/vim/vim/tree/master/runtime)
-- [treetop](https://github.com/vim/vim/tree/master/runtime)
-- [trustees](https://github.com/vim/vim/tree/master/runtime)
-- [tsalt](https://github.com/vim/vim/tree/master/runtime)
-- [tsscl](https://github.com/vim/vim/tree/master/runtime)
-- [tssgm](https://github.com/vim/vim/tree/master/runtime)
-- [tssop](https://github.com/vim/vim/tree/master/runtime)
 - [twig](https://github.com/lumiliet/vim-twig)
 - [typescript](https://github.com/HerringtonDarkholme/yats.vim)
-- [uc](https://github.com/vim/vim/tree/master/runtime)
-- [udevconf](https://github.com/vim/vim/tree/master/runtime)
-- [udevperm](https://github.com/vim/vim/tree/master/runtime)
-- [uil](https://github.com/vim/vim/tree/master/runtime)
 - [unison](https://github.com/unisonweb/unison/tree/trunk/editor-support/vim)
-- [updatedb](https://github.com/vim/vim/tree/master/runtime)
-- [upstart](https://github.com/vim/vim/tree/master/runtime)
-- [upstreamdat](https://github.com/vim/vim/tree/master/runtime)
-- [upstreaminstalllog](https://github.com/vim/vim/tree/master/runtime)
-- [upstreamlog](https://github.com/vim/vim/tree/master/runtime)
-- [usserverlog](https://github.com/vim/vim/tree/master/runtime)
-- [usw2kagtlog](https://github.com/vim/vim/tree/master/runtime)
 - [v](https://github.com/ollykel/v-vim)
 - [vala](https://github.com/arrufat/vala.vim)
 - [vbnet](https://github.com/vim-scripts/vbnet.vim)
 - [vcl](https://github.com/smerrill/vcl-vim-plugin)
 - [velocity](https://github.com/lepture/vim-velocity)
-- [vera](https://github.com/vim/vim/tree/master/runtime)
-- [verilog](https://github.com/vim/vim/tree/master/runtime)
-- [verilogams](https://github.com/vim/vim/tree/master/runtime)
-- [vgrindefs](https://github.com/vim/vim/tree/master/runtime)
-- [vhdl](https://github.com/vim/vim/tree/master/runtime)
-- [vim](https://github.com/vim/vim/tree/master/runtime)
-- [viminfo](https://github.com/vim/vim/tree/master/runtime)
-- [visual-basic](https://github.com/vim/vim/tree/master/runtime)
-- [vmasm](https://github.com/vim/vim/tree/master/runtime)
-- [voscm](https://github.com/vim/vim/tree/master/runtime)
-- [vrml](https://github.com/vim/vim/tree/master/runtime)
-- [vroom](https://github.com/vim/vim/tree/master/runtime)
 - [vue](https://github.com/posva/vim-vue)
-- [wast](https://github.com/vim/vim/tree/master/runtime)
-- [webmacro](https://github.com/vim/vim/tree/master/runtime)
-- [wget](https://github.com/vim/vim/tree/master/runtime)
-- [winbatch](https://github.com/vim/vim/tree/master/runtime)
-- [wml](https://github.com/vim/vim/tree/master/runtime)
-- [wsh](https://github.com/vim/vim/tree/master/runtime)
-- [wsml](https://github.com/vim/vim/tree/master/runtime)
-- [wvdial](https://github.com/vim/vim/tree/master/runtime)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)
-- [xdefaults](https://github.com/vim/vim/tree/master/runtime)
-- [xhtml](https://github.com/vim/vim/tree/master/runtime)
-- [xinetd](https://github.com/vim/vim/tree/master/runtime)
-- [xmath](https://github.com/vim/vim/tree/master/runtime)
 - [xml](https://github.com/amadeus/vim-xml)
-- [xmodmap](https://github.com/vim/vim/tree/master/runtime)
-- [xquery](https://github.com/vim/vim/tree/master/runtime)
-- [xsd](https://github.com/vim/vim/tree/master/runtime)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax)
-- [xslt](https://github.com/vim/vim/tree/master/runtime)
-- [yacc](https://github.com/vim/vim/tree/master/runtime)
-- [yaml](https://github.com/vim/vim/tree/df44a27b53586fccfc6a3aedc89061fdd9a515ff/runtime)
 - [yard](https://github.com/noprompt/vim-yardoc)
-- [z8a](https://github.com/vim/vim/tree/master/runtime)
 - [zephir](https://github.com/xwsoul/vim-zephir)
 - [zig](https://github.com/ziglang/zig.vim)
-- [zimbu](https://github.com/vim/vim/tree/master/runtime)
-- [zimbutempl](https://github.com/vim/vim/tree/master/runtime)
 - [zinit](https://github.com/zinit-zsh/zplugin-vim-syntax)
 <!--/Language Packs-->
 
diff --git a/scripts/build b/scripts/build
index deee269ef..c5141d412 100755
--- a/scripts/build
+++ b/scripts/build
@@ -481,6 +481,9 @@ def extract(packages)
       end
     end
 
+    if repo.include?("vim/vim")
+      next
+    end
     if branch != "master" || path
       if path
         output << "- [#{package["name"]}](https://github.com/#{repo}/tree/#{branch}/#{path})"
@@ -497,7 +500,7 @@ def extract(packages)
 
   readme.gsub!(
     %r{(?<=<!--Package Count-->).*?(?=<!--/Package Count-->)},
-    output.size.to_s
+    packages.size.to_s
   )
 
   readme.gsub!(

From 214ecc13849fb0e8141944a10b186b0e92b21549 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 6 Oct 2020 19:00:50 +0200
Subject: [PATCH 114/299] Update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 115508e58..60d3a122f 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ If you need full functionality of any plugin, please use it directly with your p
 
 ## Language packs
 
-On top of all language packas from [vim repository](https://github.com/vim/vim/tree/master/runtime), vim-polyglot includes:
+On top of all language packs from [vim repository](https://github.com/vim/vim/tree/master/runtime), vim-polyglot includes:
 
 <!--Language Packs-->
 - [acpiasl](https://github.com/martinlroth/vim-acpi-asl)

From f084509520f6b2df54c27c6b76db5d29bf153856 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 7 Oct 2020 12:10:02 +0200
Subject: [PATCH 115/299] Fix vim 8 package manager, closes #574

---
 plugin/polyglot.vim | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 plugin/polyglot.vim

diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
new file mode 100644
index 000000000..3148cff76
--- /dev/null
+++ b/plugin/polyglot.vim
@@ -0,0 +1,3 @@
+if !exists("did_load_polyglot")
+  runtime! ftdetect/polyglot.vim
+endif

From 3f79f795dcdeed51ff8a0a7151f53ffe58ae88fc Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 7 Oct 2020 12:37:21 +0200
Subject: [PATCH 116/299] Remove filetype.vim for now, not clear it works

---
 filetype.vim | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 filetype.vim

diff --git a/filetype.vim b/filetype.vim
deleted file mode 100644
index 824eec6ba..000000000
--- a/filetype.vim
+++ /dev/null
@@ -1,8 +0,0 @@
-" Oh yeah, we are loading before vim's filetype.vim so we can
-" make startup little faster by preventing it to load later
-if !exists("did_load_filetypes")
-  runtime! ftdetect/polyglot.vim
-
-  " We need to do it here to avoid recursive loop
-  runtime! ftdetect/*.vim
-endif

From 619a7a854b198c78947719bc75adb5225bde2ad5 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 7 Oct 2020 12:48:46 +0200
Subject: [PATCH 117/299] Remove man plugin from vim, it does not work for
 nvim, closes #576

---
 README.md                    |   2 +-
 autoload/polyglot/sleuth.vim |   1 -
 ftdetect/polyglot.vim        |   4 -
 ftplugin/man.vim             | 254 -----------------------------------
 ftplugin/purescript.vim      |   1 +
 ftplugin/yaml.vim            |  29 ++++
 indent/yaml.vim              | 159 ++++++++++++++++++++++
 packages.yaml                |   9 --
 syntax/man.vim               |  60 ---------
 syntax/svelte.vim            |   3 -
 syntax/zig.vim               |   2 +-
 tests/filetypes.vim          |   1 -
 12 files changed, 191 insertions(+), 334 deletions(-)
 delete mode 100644 ftplugin/man.vim
 create mode 100644 ftplugin/yaml.vim
 create mode 100644 indent/yaml.vim
 delete mode 100644 syntax/man.vim

diff --git a/README.md b/README.md
index 60d3a122f..0857df4ae 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->591<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->590<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index db1c70d1f..bc7822def 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -308,7 +308,6 @@ let s:globs = {
   \ 'mailcap': '.mailcap,mailcap',
   \ 'mako': '*.mako,*.mao',
   \ 'mallard': '*.page',
-  \ 'man': '*.man',
   \ 'manconf': 'man.config',
   \ 'map': '*.map',
   \ 'maple': '*.mv,*.mpl,*.mws',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 4e1988b43..0dae0bd40 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -970,10 +970,6 @@ if !has_key(s:disabled_packages, 'manconf')
   au BufNewFile,BufRead */etc/man.conf,man.config setf manconf
 endif
 
-if !has_key(s:disabled_packages, 'man')
-  au BufNewFile,BufRead *.man setf man
-endif
-
 if !has_key(s:disabled_packages, 'mallard')
   au BufNewFile,BufRead *.page setf mallard
 endif
diff --git a/ftplugin/man.vim b/ftplugin/man.vim
deleted file mode 100644
index 300129c2a..000000000
--- a/ftplugin/man.vim
+++ /dev/null
@@ -1,254 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'man') == -1
-
-" Vim filetype plugin file
-" Language:	man
-" Maintainer:	Jason Franklin <vim@justemail.net>
-" Maintainer:	SungHyun Nam <goweol@gmail.com>
-" Last Change: 	2020 Jun 01
-
-" To make the ":Man" command available before editing a manual page, source
-" this script from your startup vimrc file.
-
-" If 'filetype' isn't "man", we must have been called to only define ":Man".
-if &filetype == "man"
-
-  " Only do this when not done yet for this buffer
-  if exists("b:did_ftplugin")
-    finish
-  endif
-  let b:did_ftplugin = 1
-endif
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-if &filetype == "man"
-  " allow dot and dash in manual page name.
-  setlocal iskeyword+=\.,-
-  let b:undo_ftplugin = "setlocal iskeyword<"
-
-  " Add mappings, unless the user didn't want this.
-  if !exists("no_plugin_maps") && !exists("no_man_maps")
-    if !hasmapto('<Plug>ManBS')
-      nmap <buffer> <LocalLeader>h <Plug>ManBS
-      let b:undo_ftplugin = b:undo_ftplugin
-	    \ . '|silent! nunmap <buffer> <LocalLeader>h'
-    endif
-    nnoremap <buffer> <Plug>ManBS :%s/.\b//g<CR>:setl nomod<CR>''
-
-    nnoremap <buffer> <silent> <c-]> :call <SID>PreGetPage(v:count)<CR>
-    nnoremap <buffer> <silent> <c-t> :call <SID>PopPage()<CR>
-    nnoremap <buffer> <silent> q :q<CR>
-
-    " Add undo commands for the maps
-    let b:undo_ftplugin = b:undo_ftplugin
-	  \ . '|silent! nunmap <buffer> <Plug>ManBS'
-	  \ . '|silent! nunmap <buffer> <c-]>'
-	  \ . '|silent! nunmap <buffer> <c-t>'
-	  \ . '|silent! nunmap <buffer> q'
-  endif
-
-  if exists('g:ft_man_folding_enable') && (g:ft_man_folding_enable == 1)
-    setlocal foldmethod=indent foldnestmax=1 foldenable
-    let b:undo_ftplugin = b:undo_ftplugin
-	  \ . '|silent! setl fdm< fdn< fen<'
-  endif
-
-endif
-
-if exists(":Man") != 2
-  com -nargs=+ -complete=shellcmd Man call s:GetPage(<q-mods>, <f-args>)
-  nmap <Leader>K :call <SID>PreGetPage(0)<CR>
-  nmap <Plug>ManPreGetPage :call <SID>PreGetPage(0)<CR>
-endif
-
-" Define functions only once.
-if !exists("s:man_tag_depth")
-
-let s:man_tag_depth = 0
-
-let s:man_sect_arg = ""
-let s:man_find_arg = "-w"
-try
-  if !has("win32") && $OSTYPE !~ 'cygwin\|linux' && system('uname -s') =~ "SunOS" && system('uname -r') =~ "^5"
-    let s:man_sect_arg = "-s"
-    let s:man_find_arg = "-l"
-  endif
-catch /E145:/
-  " Ignore the error in restricted mode
-endtry
-
-func <SID>PreGetPage(cnt)
-  if a:cnt == 0
-    let old_isk = &iskeyword
-    if &ft == 'man'
-      setl iskeyword+=(,)
-    endif
-    let str = expand("<cword>")
-    let &l:iskeyword = old_isk
-    let page = substitute(str, '(*\(\k\+\).*', '\1', '')
-    let sect = substitute(str, '\(\k\+\)(\([^()]*\)).*', '\2', '')
-    if match(sect, '^[0-9 ]\+$') == -1
-      let sect = ""
-    endif
-    if sect == page
-      let sect = ""
-    endif
-  else
-    let sect = a:cnt
-    let page = expand("<cword>")
-  endif
-  call s:GetPage('', sect, page)
-endfunc
-
-func <SID>GetCmdArg(sect, page)
-  if a:sect == ''
-    return a:page
-  endif
-  return s:man_sect_arg.' '.a:sect.' '.a:page
-endfunc
-
-func <SID>FindPage(sect, page)
-  let where = system("man ".s:man_find_arg.' '.s:GetCmdArg(a:sect, a:page))
-  if where !~ "^/"
-    if matchstr(where, " [^ ]*$") !~ "^ /"
-      return 0
-    endif
-  endif
-  return 1
-endfunc
-
-func <SID>GetPage(cmdmods, ...)
-  if a:0 >= 2
-    let sect = a:1
-    let page = a:2
-  elseif a:0 >= 1
-    let sect = ""
-    let page = a:1
-  else
-    return
-  endif
-
-  " To support:	    nmap K :Man <cword>
-  if page == '<cword>'
-    let page = expand('<cword>')
-  endif
-
-  if !exists('g:ft_man_no_sect_fallback') || (g:ft_man_no_sect_fallback == 0)
-    if sect != "" && s:FindPage(sect, page) == 0
-      let sect = ""
-    endif
-  endif
-  if s:FindPage(sect, page) == 0
-    let msg = 'man.vim: no manual entry for "' . page . '"'
-    if !empty(sect)
-      let msg .= ' in section ' . sect
-    endif
-    echomsg msg
-    return
-  endif
-  exec "let s:man_tag_buf_".s:man_tag_depth." = ".bufnr("%")
-  exec "let s:man_tag_lin_".s:man_tag_depth." = ".line(".")
-  exec "let s:man_tag_col_".s:man_tag_depth." = ".col(".")
-  let s:man_tag_depth = s:man_tag_depth + 1
-
-  let open_cmd = 'edit'
-
-  " Use an existing "man" window if it exists, otherwise open a new one.
-  if &filetype != "man"
-    let thiswin = winnr()
-    exe "norm! \<C-W>b"
-    if winnr() > 1
-      exe "norm! " . thiswin . "\<C-W>w"
-      while 1
-	if &filetype == "man"
-	  break
-	endif
-	exe "norm! \<C-W>w"
-	if thiswin == winnr()
-	  break
-	endif
-      endwhile
-    endif
-    if &filetype != "man"
-      if exists("g:ft_man_open_mode")
-        if g:ft_man_open_mode == 'vert'
-	  let open_cmd = 'vsplit'
-        elseif g:ft_man_open_mode == 'tab'
-	  let open_cmd = 'tabedit'
-        else
-	  let open_cmd = 'split'
-        endif
-      else
-	let open_cmd = a:cmdmods . ' split'
-      endif
-    endif
-  endif
-
-  silent execute open_cmd . " $HOME/" . page . '.' . sect . '~'
-
-  " Avoid warning for editing the dummy file twice
-  setl buftype=nofile noswapfile
-
-  setl fdc=0 ma nofen nonu nornu
-  %delete _
-  let unsetwidth = 0
-  if empty($MANWIDTH)
-    let $MANWIDTH = winwidth(0)
-    let unsetwidth = 1
-  endif
-
-  " Ensure Vim is not recursively invoked (man-db does this) when doing ctrl-[
-  " on a man page reference by unsetting MANPAGER.
-  " Some versions of env(1) do not support the '-u' option, and in such case
-  " we set MANPAGER=cat.
-  if !exists('s:env_has_u')
-    call system('env -u x true')
-    let s:env_has_u = (v:shell_error == 0)
-  endif
-  let env_cmd = s:env_has_u ? 'env -u MANPAGER' : 'env MANPAGER=cat'
-  let env_cmd .= ' GROFF_NO_SGR=1'
-  let man_cmd = env_cmd . ' man ' . s:GetCmdArg(sect, page) . ' | col -b'
-  silent exec "r !" . man_cmd
-
-  if unsetwidth
-    let $MANWIDTH = ''
-  endif
-  " Remove blank lines from top and bottom.
-  while line('$') > 1 && getline(1) =~ '^\s*$'
-    1delete _
-  endwhile
-  while line('$') > 1 && getline('$') =~ '^\s*$'
-    $delete _
-  endwhile
-  1
-  setl ft=man nomod
-  setl bufhidden=hide
-  setl nobuflisted
-  setl noma
-endfunc
-
-func <SID>PopPage()
-  if s:man_tag_depth > 0
-    let s:man_tag_depth = s:man_tag_depth - 1
-    exec "let s:man_tag_buf=s:man_tag_buf_".s:man_tag_depth
-    exec "let s:man_tag_lin=s:man_tag_lin_".s:man_tag_depth
-    exec "let s:man_tag_col=s:man_tag_col_".s:man_tag_depth
-    exec s:man_tag_buf."b"
-    exec s:man_tag_lin
-    exec "norm! ".s:man_tag_col."|"
-    exec "unlet s:man_tag_buf_".s:man_tag_depth
-    exec "unlet s:man_tag_lin_".s:man_tag_depth
-    exec "unlet s:man_tag_col_".s:man_tag_depth
-    unlet s:man_tag_buf s:man_tag_lin s:man_tag_col
-  endif
-endfunc
-
-endif
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: set sw=2 ts=8 noet:
-
-endif
diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim
index c2c855353..dba11b3b5 100644
--- a/ftplugin/purescript.vim
+++ b/ftplugin/purescript.vim
@@ -1,6 +1,7 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--\ \|,:--
+setlocal commentstring=--\ %s
 setlocal include=^import
 setlocal includeexpr=printf('%s.purs',substitute(v:fname,'\\.','/','g'))
 
diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim
new file mode 100644
index 000000000..261d71ca8
--- /dev/null
+++ b/ftplugin/yaml.vim
@@ -0,0 +1,29 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+
+" Vim filetype plugin file
+" Language:             YAML (YAML Ain't Markup Language)
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se> (inactive)
+" Last Change:      	2020 Mar 02
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< et< fo<"
+
+setlocal comments=:# commentstring=#\ %s expandtab
+setlocal formatoptions-=t formatoptions+=croql
+
+if !exists("g:yaml_recommended_style") || g:yaml_recommended_style != 0
+  let b:undo_ftplugin .= " sw< sts<"
+  setlocal shiftwidth=2 softtabstop=2
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/indent/yaml.vim b/indent/yaml.vim
new file mode 100644
index 000000000..c7fdebcff
--- /dev/null
+++ b/indent/yaml.vim
@@ -0,0 +1,159 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+
+" Vim indent file
+" Language:         YAML
+" Maintainer:       Nikolai Pavlov <zyx.vim@gmail.com>
+" Last Change:	    2019 Sep 28
+
+" Only load this indent file when no other was loaded.
+if exists('b:did_indent')
+  finish
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+let b:did_indent = 1
+
+setlocal indentexpr=GetYAMLIndent(v:lnum)
+setlocal indentkeys=!^F,o,O,0#,0},0],<:>,0-
+setlocal nosmartindent
+
+let b:undo_indent = 'setlocal indentexpr< indentkeys< smartindent<'
+
+" Only define the function once.
+if exists('*GetYAMLIndent')
+    finish
+endif
+
+function s:FindPrevLessIndentedLine(lnum, ...)
+    let prevlnum = prevnonblank(a:lnum-1)
+    let curindent = a:0 ? a:1 : indent(a:lnum)
+    while           prevlnum
+                \&&  indent(prevlnum) >=  curindent
+                \&& getline(prevlnum) !~# '^\s*#'
+        let prevlnum = prevnonblank(prevlnum-1)
+    endwhile
+    return prevlnum
+endfunction
+
+function s:FindPrevLEIndentedLineMatchingRegex(lnum, regex)
+    let plilnum = s:FindPrevLessIndentedLine(a:lnum, indent(a:lnum)+1)
+    while plilnum && getline(plilnum) !~# a:regex
+        let plilnum = s:FindPrevLessIndentedLine(plilnum)
+    endwhile
+    return plilnum
+endfunction
+
+let s:mapkeyregex='\v^\s*\#@!\S@=%(\''%([^'']|\''\'')*\'''.
+                \                 '|\"%([^"\\]|\\.)*\"'.
+                \                 '|%(%(\:\ )@!.)*)\:%(\ |$)'
+let s:liststartregex='\v^\s*%(\-%(\ |$))'
+
+let s:c_ns_anchor_char = '\v%([\n\r\uFEFF \t,[\]{}]@!\p)'
+let s:c_ns_anchor_name = s:c_ns_anchor_char.'+'
+let s:c_ns_anchor_property =  '\v\&'.s:c_ns_anchor_name
+
+let s:ns_word_char = '\v[[:alnum:]_\-]'
+let s:ns_tag_char  = '\v%(%\x\x|'.s:ns_word_char.'|[#/;?:@&=+$.~*''()])'
+let s:c_named_tag_handle     = '\v\!'.s:ns_word_char.'+\!'
+let s:c_secondary_tag_handle = '\v\!\!'
+let s:c_primary_tag_handle   = '\v\!'
+let s:c_tag_handle = '\v%('.s:c_named_tag_handle.
+            \            '|'.s:c_secondary_tag_handle.
+            \            '|'.s:c_primary_tag_handle.')'
+let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+'
+let s:c_non_specific_tag = '\v\!'
+let s:ns_uri_char  = '\v%(%\x\x|'.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])'
+let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>'
+let s:c_ns_tag_property = '\v'.s:c_verbatim_tag.
+            \               '\v|'.s:c_ns_shorthand_tag.
+            \               '\v|'.s:c_non_specific_tag
+
+let s:block_scalar_header = '\v[|>]%([+-]?[1-9]|[1-9]?[+-])?'
+
+function GetYAMLIndent(lnum)
+    if a:lnum == 1 || !prevnonblank(a:lnum-1)
+        return 0
+    endif
+
+    let prevlnum = prevnonblank(a:lnum-1)
+    let previndent = indent(prevlnum)
+
+    let line = getline(a:lnum)
+    if line =~# '^\s*#' && getline(a:lnum-1) =~# '^\s*#'
+        " Comment blocks should have identical indent
+        return previndent
+    elseif line =~# '^\s*[\]}]'
+        " Lines containing only closing braces should have previous indent
+        return indent(s:FindPrevLessIndentedLine(a:lnum))
+    endif
+
+    " Ignore comment lines when calculating indent
+    while getline(prevlnum) =~# '^\s*#'
+        let prevlnum = prevnonblank(prevlnum-1)
+        if !prevlnum
+            return previndent
+        endif
+    endwhile
+
+    let prevline = getline(prevlnum)
+    let previndent = indent(prevlnum)
+
+    " Any examples below assume that shiftwidth=2
+    if prevline =~# '\v[{[:]$|[:-]\ [|>][+\-]?%(\s+\#.*|\s*)$'
+        " Mapping key:
+        "     nested mapping: ...
+        "
+        " - {
+        "     key: [
+        "         list value
+        "     ]
+        " }
+        "
+        " - |-
+        "     Block scalar without indentation indicator
+        return previndent+shiftwidth()
+    elseif prevline =~# '\v[:-]\ [|>]%(\d+[+\-]?|[+\-]?\d+)%(\#.*|\s*)$'
+        " - |+2
+        "   block scalar with indentation indicator
+        "#^^ indent+2, not indent+shiftwidth
+        return previndent + str2nr(matchstr(prevline,
+                    \'\v([:-]\ [|>])@<=[+\-]?\d+%([+\-]?%(\s+\#.*|\s*)$)@='))
+    elseif prevline =~# '\v\"%([^"\\]|\\.)*\\$'
+        "    "Multiline string \
+        "     with escaped end"
+        let qidx = match(prevline, '\v\"%([^"\\]|\\.)*\\')
+        return virtcol([prevlnum, qidx+1])
+    elseif line =~# s:liststartregex
+        " List line should have indent equal to previous list line unless it was 
+        " caught by one of the previous rules
+        return indent(s:FindPrevLEIndentedLineMatchingRegex(a:lnum,
+                    \                                       s:liststartregex))
+    elseif line =~# s:mapkeyregex
+        " Same for line containing mapping key
+        let prevmapline = s:FindPrevLEIndentedLineMatchingRegex(a:lnum,
+                    \                                           s:mapkeyregex)
+        if getline(prevmapline) =~# '^\s*- '
+            return indent(prevmapline) + 2
+        else
+            return indent(prevmapline)
+        endif
+    elseif prevline =~# '^\s*- '
+        " - List with
+        "   multiline scalar
+        return previndent+2
+    elseif prevline =~# s:mapkeyregex . '\v\s*%(%('.s:c_ns_tag_property.
+                \                              '\v|'.s:c_ns_anchor_property.
+                \                              '\v|'.s:block_scalar_header.
+                \                             '\v)%(\s+|\s*%(\#.*)?$))*'
+        " Mapping with: value
+        "     that is multiline scalar
+        return previndent+shiftwidth()
+    endif
+    return previndent
+endfunction
+
+let &cpo = s:save_cpo
+
+endif
diff --git a/packages.yaml b/packages.yaml
index ade2bd83d..83121e15b 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -3560,15 +3560,6 @@ filetypes:
   - pattern: "*.page"
     description: Mallard
 ---
-name: man
-remote: vim/vim:runtime
-glob: "**/man.vim"
-filetypes:
-- name: man
-  patterns:
-  - pattern: "*.man"
-    description: Manpage
----
 name: manconf
 remote: vim/vim:runtime
 glob: "**/manconf.vim"
diff --git a/syntax/man.vim b/syntax/man.vim
deleted file mode 100644
index c607f0e43..000000000
--- a/syntax/man.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'man') == -1
-
-" Vim syntax file
-" Language:	Man page
-" Maintainer:	Jason Franklin <vim@justemail.net>
-" Previous Maintainer:	SungHyun Nam <goweol@gmail.com>
-" Previous Maintainer:	Gautam H. Mudunuri <gmudunur@informatica.com>
-" Version Info:
-" Last Change:	2020 Sep 19
-
-" Additional highlighting by Johannes Tanzler <johannes.tanzler@aon.at>:
-"	* manSubHeading
-"	* manSynopsis (only for sections 2 and 3)
-
-" quit when a syntax file was already loaded
-if exists("b:current_syntax")
-  finish
-endif
-
-" Get the CTRL-H syntax to handle backspaced text
-runtime! syntax/ctrlh.vim
-
-syn case ignore
-
-syn match  manReference       "\f\+([1-9][a-z]\=)"
-syn match  manSectionHeading  "^\a.*$"
-syn match  manSubHeading      "^\s\{3\}\a.*$"
-syn match  manOptionDesc      "^\s*[+-][a-z0-9]\S*"
-syn match  manLongOptionDesc  "^\s*--[a-z0-9-]\S*"
-" syn match  manHistory		"^[a-z].*last change.*$"
-
-syn match manHeader '\%1l.*'
-exe 'syn match manFooter ''\%' . line('$') . 'l.*'''
-
-if getline(1) =~ '^[a-zA-Z_]\+([23])'
-  syntax include @cCode <sfile>:p:h/c.vim
-  syn match manCFuncDefinition  display "\<\h\w*\>\s*("me=e-1 contained
-  syn region manSynopsis start="^SYNOPSIS"hs=s+8 end="^\u\+\s*$"me=e-12 keepend contains=manSectionHeading,@cCode,manCFuncDefinition
-endif
-
-
-" Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-
-hi def link manHeader Title
-hi def link manFooter PreProc
-
-hi def link manSectionHeading  Statement
-hi def link manOptionDesc	    Constant
-hi def link manLongOptionDesc  Constant
-hi def link manReference	    PreProc
-hi def link manSubHeading      Function
-hi def link manCFuncDefinition Function
-
-
-let b:current_syntax = "man"
-
-" vim:ts=8 sts=2 sw=2:
-
-endif
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index 4a510bebd..0654b2033 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -26,9 +26,6 @@ syntax match htmlTagName contained "\<[a-zA-Z:\.]*\>"
 " "bind:something", etc.
 syntax match svelteKeyword "\<[a-z]\+:[a-zA-Z|]\+=" contained containedin=htmlTag
 
-" Mixed-case attributes are likely props.
-syntax match svelteKeyword "\<[a-z]\+:[a-zA-Z|]\+=" contained containedin=htmlTag
-
 " The "slot" attribute has special meaning.
 syntax keyword svelteKeyword slot contained containedin=htmlTag
 
diff --git a/syntax/zig.vim b/syntax/zig.vim
index f9f889c54..f6819ef58 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -38,7 +38,7 @@ syn match zigBuiltinFn "\v\@(errorReturnTrace|fence|fieldParentPtr|field|unionIn
 syn match zigBuiltinFn "\v\@(frameAddress|import|newStackCall|asyncCall|intToPtr)>"
 syn match zigBuiltinFn "\v\@(memcpy|memset|mod|mulWithOverflow|splat|src)>"
 syn match zigBuiltinFn "\v\@(bitOffsetOf|byteOffsetOf|OpaqueType|panic|ptrCast)>"
-syn match zigBuiltinFn "\v\@(ptrToInt|rem|returnAddress|setCold|Type|shuffle)>"
+syn match zigBuiltinFn "\v\@(ptrToInt|rem|returnAddress|setCold|Type|shuffle|reduce)>"
 syn match zigBuiltinFn "\v\@(setRuntimeSafety|setEvalBranchQuota|setFloatMode)>"
 syn match zigBuiltinFn "\v\@(setGlobalLinkage|setGlobalSection|shlExact|This|hasDecl|hasField)>"
 syn match zigBuiltinFn "\v\@(shlWithOverflow|shrExact|sizeOf|bitSizeOf|sqrt|byteSwap|subWithOverflow|intCast|floatCast|intToFloat|floatToInt|boolToInt|errSetCast)>"
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 00d19b7ed..a5f556d78 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -419,7 +419,6 @@ call TestFiletype('mailaliases')
 call TestFiletype('mailcap')
 call TestFiletype('ist')
 call TestFiletype('mallard')
-call TestFiletype('man')
 call TestFiletype('manconf')
 call TestFiletype('maple')
 call TestFiletype('map')

From 9f4e2b683453c9521de8164169327a112d71f6c1 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 7 Oct 2020 13:01:20 +0200
Subject: [PATCH 118/299] Remove context from packages, fixes #575

---
 README.md                    |   2 +-
 autoload/context.vim         | 188 -----------------------------------
 autoload/polyglot/sleuth.vim |   1 -
 compiler/context.vim         |  58 -----------
 ftdetect/polyglot.vim        |   4 -
 ftplugin/context.vim         | 106 --------------------
 indent/context.vim           |  40 --------
 packages.yaml                |   9 --
 syntax/context.vim           | 145 ---------------------------
 tests/filetypes.vim          |   1 -
 10 files changed, 1 insertion(+), 553 deletions(-)
 delete mode 100644 autoload/context.vim
 delete mode 100644 compiler/context.vim
 delete mode 100644 ftplugin/context.vim
 delete mode 100644 indent/context.vim
 delete mode 100644 syntax/context.vim

diff --git a/README.md b/README.md
index 0857df4ae..49b104769 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->590<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->589<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
diff --git a/autoload/context.vim b/autoload/context.vim
deleted file mode 100644
index 437864639..000000000
--- a/autoload/context.vim
+++ /dev/null
@@ -1,188 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
-
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Latest Revision:    2016 Oct 21
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-" Helper functions {{{
-function! s:context_echo(message, mode)
-  redraw
-  echo "\r"
-  execute 'echohl' a:mode
-  echomsg '[ConTeXt]' a:message
-  echohl None
-endf
-
-function! s:sh()
-  return has('win32') || has('win64') || has('win16') || has('win95')
-        \ ? ['cmd.exe', '/C']
-        \ : ['/bin/sh', '-c']
-endfunction
-
-" For backward compatibility
-if exists('*win_getid')
-
-  function! s:win_getid()
-    return win_getid()
-  endf
-
-  function! s:win_id2win(winid)
-    return win_id2win(a:winid)
-  endf
-
-else
-
-  function! s:win_getid()
-    return winnr()
-  endf
-
-  function! s:win_id2win(winnr)
-    return a:winnr
-  endf
-
-endif
-" }}}
-
-" ConTeXt jobs {{{
-if has('job')
-
-  let g:context_jobs = []
-
-  " Print the status of ConTeXt jobs
-  function! context#job_status()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    let l:n = len(l:jobs)
-    call s:context_echo(
-          \ 'There '.(l:n == 1 ? 'is' : 'are').' '.(l:n == 0 ? 'no' : l:n)
-          \ .' job'.(l:n == 1 ? '' : 's').' running'
-          \ .(l:n == 0 ? '.' : ' (' . join(l:jobs, ', ').').'),
-          \ 'ModeMsg')
-  endfunction
-
-  " Stop all ConTeXt jobs
-  function! context#stop_jobs()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    for job in l:jobs
-      call job_stop(job)
-    endfor
-    sleep 1
-    let l:tmp = []
-    for job in l:jobs
-      if job_status(job) == "run"
-        call add(l:tmp, job)
-      endif
-    endfor
-    let g:context_jobs = l:tmp
-    if empty(g:context_jobs)
-      call s:context_echo('Done. No jobs running.', 'ModeMsg')
-    else
-      call s:context_echo('There are still some jobs running. Please try again.', 'WarningMsg')
-    endif
-  endfunction
-
-  function! context#callback(path, job, status)
-    if index(g:context_jobs, a:job) != -1 && job_status(a:job) != 'run' " just in case
-      call remove(g:context_jobs, index(g:context_jobs, a:job))
-    endif
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! context#close_cb(channel)
-    call job_status(ch_getjob(a:channel)) " Trigger exit_cb's callback for faster feedback
-  endfunction
-
-  function! s:typeset(path)
-    call add(g:context_jobs,
-          \ job_start(add(s:sh(), context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))), {
-          \   'close_cb' : 'context#close_cb',
-          \   'exit_cb'  : function(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \                         [a:path]),
-          \   'in_io'    : 'null'
-          \ }))
-  endfunction
-
-else " No jobs
-
-  function! context#job_status()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction!
-
-  function! context#stop_jobs()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction
-
-  function! context#callback(path, job, status)
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! s:typeset(path)
-    execute '!' . context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))
-    call call(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \ [a:path, 0, v:shell_error])
-  endfunction
-
-endif " has('job')
-
-function! s:callback(path, job, status) abort
-  if a:status < 0 " Assume the job was terminated
-    return
-  endif
-  " Get info about the current window
-  let l:winid = s:win_getid()             " Save window id
-  let l:efm = &l:errorformat              " Save local errorformat
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  " Set errorformat to parse ConTeXt errors
-  execute 'setl efm=' . escape(b:context_errorformat, ' ')
-  try " Set cwd to expand error file correctly
-    execute 'lcd' fnameescape(fnamemodify(a:path, ':h'))
-  catch /.*/
-    execute 'setl efm=' . escape(l:efm, ' ')
-    throw v:exception
-  endtry
-  try
-    execute 'cgetfile' fnameescape(fnamemodify(a:path, ':r') . '.log')
-    botright cwindow
-  finally " Restore cwd and errorformat
-    execute s:win_id2win(l:winid) . 'wincmd w'
-    execute 'lcd ' . fnameescape(l:cwd)
-    execute 'setl efm=' . escape(l:efm, ' ')
-  endtry
-  if a:status == 0
-    call s:context_echo('Success!', 'ModeMsg')
-  else
-    call s:context_echo('There are errors. ', 'ErrorMsg')
-  endif
-endfunction
-
-function! context#command()
-  return get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode'
-        \ . ' --synctex=' . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-endfunction
-
-" Accepts an optional path (useful for big projects, when the file you are
-" editing is not the project's root document). If no argument is given, uses
-" the path of the current buffer.
-function! context#typeset(...) abort
-  let l:path = fnamemodify(strlen(a:000[0]) > 0 ? a:1 : expand("%"), ":p")
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  call s:context_echo('Typesetting...',  'ModeMsg')
-  execute 'lcd' fnameescape(fnamemodify(l:path, ":h"))
-  try
-    call s:typeset(l:path)
-  finally " Restore local working directory
-    execute 'lcd ' . fnameescape(l:cwd)
-  endtry
-endfunction!
-"}}}
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim: sw=2 fdm=marker
-
-endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index bc7822def..1250badf5 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -80,7 +80,6 @@ let s:globs = {
   \ 'conaryrecipe': '*.recipe',
   \ 'conf': '*.conf,auto.master,config',
   \ 'config': 'configure.in,configure.ac,Pipfile',
-  \ 'context': '*.mkii,*.mkiv,*.mkvi',
   \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh',
   \ 'cql': '*.cql',
   \ 'crm': '*.crm',
diff --git a/compiler/context.vim b/compiler/context.vim
deleted file mode 100644
index 9c05b4146..000000000
--- a/compiler/context.vim
+++ /dev/null
@@ -1,58 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
-
-" Vim compiler file
-" Compiler:     ConTeXt typesetting engine
-" Maintainer:   Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Last Change:  2016 Oct 21
-
-if exists("current_compiler")
-  finish
-endif
-let s:keepcpo= &cpo
-set cpo&vim
-
-if exists(":CompilerSet") != 2    " older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-" If makefile exists and we are not asked to ignore it, we use standard make
-" (do not redefine makeprg)
-if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
-      \ (!filereadable('Makefile') && !filereadable('makefile'))
-  let current_compiler = 'context'
-  " The following assumes that the current working directory is set to the
-  " directory of the file to be typeset
-  let &l:makeprg = get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode --synctex='
-        \ . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-        \ . ' ' . shellescape(expand('%:p:t'))
-else
-  let current_compiler = 'make'
-endif
-
-let b:context_errorformat = ''
-      \ . '%-Popen source%.%#> %f,'
-      \ . '%-Qclose source%.%#> %f,'
-      \ . "%-Popen source%.%#name '%f',"
-      \ . "%-Qclose source%.%#name '%f',"
-      \ . '%Etex %trror%.%#mp error on line %l in file %f:%.%#,'
-      \ . 'tex %trror%.%#error on line %l in file %f: %m,'
-      \ . '%Elua %trror%.%#error on line %l in file %f:,'
-      \ . '%+Emetapost %#> error: %#,'
-      \ . '! error: %#%m,'
-      \ . '%-C %#,'
-      \ . '%C! %m,'
-      \ . '%Z[ctxlua]%m,'
-      \ . '%+C<*> %.%#,'
-      \ . '%-C%.%#,'
-      \ . '%Z...%m,'
-      \ . '%-Zno-error,'
-      \ . '%-G%.%#' " Skip remaining lines
-
-execute 'CompilerSet errorformat=' . escape(b:context_errorformat, ' ')
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-endif
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 0dae0bd40..485296740 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -356,10 +356,6 @@ if !has_key(s:disabled_packages, 'texinfo')
   au BufNewFile,BufRead *.texi,*.texinfo,*.txi setf texinfo
 endif
 
-if !has_key(s:disabled_packages, 'context')
-  au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi setf context
-endif
-
 if !has_key(s:disabled_packages, 'tex')
   au BufNewFile,BufRead *.bbl,*.dtx,*.latex,*.ltx,*.sty setf tex
 endif
diff --git a/ftplugin/context.vim b/ftplugin/context.vim
deleted file mode 100644
index 2e68ecfc1..000000000
--- a/ftplugin/context.vim
+++ /dev/null
@@ -1,106 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
-
-" Vim filetype plugin file
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:    2016 Oct 30
-
-if exists("b:did_ftplugin")
-  finish
-endif
-let b:did_ftplugin = 1
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-if !exists('current_compiler')
-  compiler context
-endif
-
-let b:undo_ftplugin = "setl com< cms< def< inc< sua< fo< ofu<"
-      \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
-
-setlocal comments=b:%D,b:%C,b:%M,:% commentstring=%\ %s formatoptions+=tjcroql2
-if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
-  setlocal omnifunc=contextcomplete#Complete
-  let g:omni_syntax_group_include_context = 'mf\w\+,mp\w\+'
-  let g:omni_syntax_group_exclude_context = 'mfTodoComment'
-endif
-
-let &l:define='\\\%([egx]\|char\|mathchar\|count\|dimen\|muskip\|skip\|toks\)\='
-        \ .     'def\|\\font\|\\\%(future\)\=let'
-        \ . '\|\\new\%(count\|dimen\|skip\|muskip\|box\|toks\|read\|write'
-        \ .     '\|fam\|insert\|if\)'
-
-let &l:include = '^\s*\\\%(input\|component\|product\|project\|environment\)'
-
-setlocal suffixesadd=.tex
-
-if exists("loaded_matchit")
-  let b:match_ignorecase = 0
-  let b:match_skip = 'r:\\\@<!\%(\\\\\)*%'
-  let b:match_words = '(:),\[:],{:},\\(:\\),\\\[:\\],' .
-        \ '\\start\(\a\+\):\\stop\1'
-endif
-
-let s:context_regex = {
-      \ 'beginsection' : '\\\%(start\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
-      \ 'endsection'   : '\\\%(stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
-      \ 'beginblock'   : '\\\%(start\|setup\|define\)',
-      \ 'endblock'     : '\\\%(stop\|setup\|define\)'
-      \ }
-
-function! s:move_around(count, what, flags, visual)
-  if a:visual
-    exe "normal! gv"
-  endif
-  call search(s:context_regex[a:what], a:flags.'s') " 's' sets previous context mark
-  call map(range(2, a:count), 'search(s:context_regex[a:what], a:flags)')
-endfunction
-
-" Move around macros.
-nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
-vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
-nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
-vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
-nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
-vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
-nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
-vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
-nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
-vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
-nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
-vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
-
-" Other useful mappings
-if get(g:, 'context_mappings', 1)
-  let s:tp_regex = '?^$\|^\s*\\\(item\|start\|stop\|blank\|\%(sub\)*section\|chapter\|\%(sub\)*subject\|title\|part\)'
-
-  fun! s:tp()
-    call cursor(search(s:tp_regex, 'bcW') + 1, 1)
-    normal! V
-    call cursor(search(s:tp_regex, 'W') - 1, 1)
-  endf
-
-  " Reflow paragraphs with commands like gqtp ("gq TeX paragraph")
-  onoremap <silent><buffer> tp :<c-u>call <sid>tp()<cr>
-  " Select TeX paragraph
-  vnoremap <silent><buffer> tp <esc>:<c-u>call <sid>tp()<cr>
-
-  " $...$ text object
-  onoremap <silent><buffer> i$ :<c-u>normal! T$vt$<cr>
-  onoremap <silent><buffer> a$ :<c-u>normal! F$vf$<cr>
-  vnoremap <buffer> i$ T$ot$
-  vnoremap <buffer> a$ F$of$
-endif
-
-" Commands for asynchronous typesetting
-command! -buffer -nargs=? -complete=file ConTeXt          call context#typeset(<q-args>)
-command!         -nargs=0                ConTeXtJobStatus call context#job_status()
-command!         -nargs=0                ConTeXtStopJobs  call context#stop_jobs()
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-endif
diff --git a/indent/context.vim b/indent/context.vim
deleted file mode 100644
index 16ec08298..000000000
--- a/indent/context.vim
+++ /dev/null
@@ -1,40 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
-
-" ConTeXt indent file
-" Language: ConTeXt typesetting engine
-" Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Last Change:  2016 Oct 15
-
-if exists("b:did_indent")
-  finish
-endif
-
-if !get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
-  finish
-endif
-
-" Load MetaPost indentation script
-runtime! indent/mp.vim
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-setlocal indentexpr=GetConTeXtIndent()
-
-let b:undo_indent = "setl indentexpr<"
-
-function! GetConTeXtIndent()
-  " Use MetaPost rules inside MetaPost graphic environments
-  if len(synstack(v:lnum, 1)) > 0 &&
-        \ synIDattr(synstack(v:lnum, 1)[0], "name") ==# 'contextMPGraphic'
-    return GetMetaPostIndent()
-  endif
-  return -1
-endfunc
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim:sw=2
-
-endif
diff --git a/packages.yaml b/packages.yaml
index 83121e15b..ea409055d 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -4945,15 +4945,6 @@ filetypes:
   - pattern: "*.latex,*.sty,*.dtx,*.ltx,*.bbl"
     description: TeX
 ---
-name: context
-remote: vim/vim:runtime
-glob: "**/context.vim"
-filetypes:
-- name: context
-  patterns:
-  - pattern: "*.mkii,*.mkiv,*.mkvi"
-    description: ConTeXt
----
 name: texinfo
 remote: vim/vim:runtime
 glob: "**/texinfo.vim"
diff --git a/syntax/context.vim b/syntax/context.vim
deleted file mode 100644
index 433287dfa..000000000
--- a/syntax/context.vim
+++ /dev/null
@@ -1,145 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
-
-" Vim syntax file
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:    2016 Oct 16
-
-if exists("b:current_syntax")
-  finish
-endif
-
-runtime! syntax/plaintex.vim
-unlet b:current_syntax
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-" Dictionary of (filetype, group) pairs to highlight between \startGROUP \stopGROUP.
-let s:context_include = get(b:, 'context_include', get(g:, 'context_include', {'xml': 'XML'}))
-
-" For backward compatibility (g:context_include used to be a List)
-if type(s:context_include) ==# type([])
-  let g:context_metapost = (index(s:context_include, 'mp') != -1)
-  let s:context_include = filter(
-        \ {'c': 'C', 'javascript': 'JS', 'ruby': 'Ruby', 'xml': 'XML'},
-        \ { k,_ -> index(s:context_include, k) != -1 }
-        \ )
-endif
-
-syn iskeyword @,48-57,a-z,A-Z,192-255
-
-syn spell   toplevel
-
-" ConTeXt options, i.e., [...] blocks
-syn region  contextOptions    matchgroup=contextDelimiter start='\['  end=']\|\ze\\stop' skip='\\\[\|\\\]' contains=ALLBUT,contextBeginEndLua,@Spell
-
-" Highlight braces
-syn match   contextDelimiter  '[{}]'
-
-" Comments
-syn match   contextComment '\\\@<!\%(\\\\\)*\zs%.*$' display contains=initexTodo
-syn match   contextComment '^\s*%[CDM].*$'           display contains=initexTodo
-
-syn match   contextBlockDelim '\\\%(start\|stop\)\a\+' contains=@NoSpell
-
-syn region  contextEscaped    matchgroup=contextPreProc start='\\type\%(\s*\|\n\)*\z([^A-Za-z%]\)' end='\z1'
-syn region  contextEscaped    matchgroup=contextPreProc start='\\type\=\%(\s\|\n\)*{' end='}'
-syn region  contextEscaped    matchgroup=contextPreProc start='\\type\=\%(\s*\|\n\)*<<' end='>>'
-syn region  contextEscaped    matchgroup=contextPreProc
-                              \ start='\\start\z(\a*\%(typing\|typen\)\)'
-                              \ end='\\stop\z1' contains=plaintexComment keepend
-syn region  contextEscaped    matchgroup=contextPreProc start='\\\h\+Type\%(\s\|\n\)*{' end='}'
-syn region  contextEscaped    matchgroup=contextPreProc start='\\Typed\h\+\%(\s\|\n\)*{' end='}'
-
-syn match   contextBuiltin    display contains=@NoSpell
-      \ '\\\%(unprotect\|protect\|unexpanded\)\>'
-
-syn match   contextPreProc    '^\s*\\\%(start\|stop\)\=\%(component\|environment\|project\|product\)\>'
-                              \ contains=@NoSpell
-
-if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
-  let b:mp_metafun_macros = 1 " Highlight MetaFun keywords
-  syn include @mpTop          syntax/mp.vim
-  unlet b:current_syntax
-
-  syn region  contextMPGraphic  matchgroup=contextBlockDelim
-                                \ start='\\start\z(MP\%(clip\|code\|definitions\|drawing\|environment\|extensions\|inclusions\|initializations\|page\|\)\)\>.*$'
-                                \ end='\\stop\z1'
-                                \ contains=@mpTop,@NoSpell
-  syn region  contextMPGraphic  matchgroup=contextBlockDelim
-                                \ start='\\start\z(\%(\%[re]usable\|use\|unique\|static\)MPgraphic\|staticMPfigure\|uniqueMPpagegraphic\)\>.*$'
-                                \ end='\\stop\z1'
-                                \ contains=@mpTop,@NoSpell
-endif
-
-if get(b:, 'context_lua', get(g:, 'context_lua', 1))
-  syn include @luaTop          syntax/lua.vim
-  unlet b:current_syntax
-
-  syn region  contextLuaCode    matchgroup=contextBlockDelim
-                                \ start='\\startluacode\>'
-                                \ end='\\stopluacode\>' keepend
-                                \ contains=@luaTop,@NoSpell
-
-  syn match   contextDirectLua  "\\\%(directlua\|ctxlua\)\>\%(\s*%.*$\)\="
-                                \ nextgroup=contextBeginEndLua skipwhite skipempty
-                                \ contains=initexComment
-  syn region  contextBeginEndLua matchgroup=contextSpecial
-                                \ start="{" end="}" skip="\\[{}]"
-                                \ contained contains=@luaTop,@NoSpell
-endif
-
-for synname in keys(s:context_include)
-  execute 'syn include @' . synname . 'Top' 'syntax/' . synname . '.vim'
-  unlet b:current_syntax
-  execute 'syn region context' . s:context_include[synname] . 'Code'
-        \ 'matchgroup=contextBlockDelim'
-        \ 'start=+\\start' . s:context_include[synname] . '+'
-        \ 'end=+\\stop' . s:context_include[synname] . '+'
-        \ 'contains=@' . synname . 'Top,@NoSpell'
-endfor
-
-syn match   contextSectioning '\\\%(start\|stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>'
-                              \ contains=@NoSpell
-
-syn match   contextSpecial    '\\crlf\>\|\\par\>\|-\{2,3}\||[<>/]\=|'
-                              \ contains=@NoSpell
-syn match   contextSpecial    /\\[`'"]/
-syn match   contextSpecial    +\\char\%(\d\{1,3}\|'\o\{1,3}\|"\x\{1,2}\)\>+
-                              \ contains=@NoSpell
-syn match   contextSpecial    '\^\^.'
-syn match   contextSpecial    '`\%(\\.\|\^\^.\|.\)'
-
-syn match   contextStyle      '\\\%(em\|ss\|hw\|cg\|mf\)\>'
-                              \ contains=@NoSpell
-syn match   contextFont       '\\\%(CAP\|Cap\|cap\|Caps\|kap\|nocap\)\>'
-                              \ contains=@NoSpell
-syn match   contextFont       '\\\%(Word\|WORD\|Words\|WORDS\)\>'
-                              \ contains=@NoSpell
-syn match   contextFont       '\\\%(vi\{1,3}\|ix\|xi\{0,2}\)\>'
-                              \ contains=@NoSpell
-syn match   contextFont       '\\\%(tf\|b[si]\|s[cl]\|os\)\%(xx\|[xabcd]\)\=\>'
-                              \ contains=@NoSpell
-
-hi def link contextOptions    Typedef
-hi def link contextComment    Comment
-hi def link contextBlockDelim Keyword
-hi def link contextBuiltin    Keyword
-hi def link contextDelimiter  Delimiter
-hi def link contextEscaped    String
-hi def link contextPreProc    PreProc
-hi def link contextSectioning PreProc
-hi def link contextSpecial    Special
-hi def link contextType       Type
-hi def link contextStyle      contextType
-hi def link contextFont       contextType
-hi def link contextDirectLua  Keyword
-
-let b:current_syntax = "context"
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-endif
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index a5f556d78..d77ade814 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -568,7 +568,6 @@ call TestFiletype('tsalt')
 call TestFiletype('teraterm')
 call TestFiletype('terminfo')
 call TestFiletype('tex')
-call TestFiletype('context')
 call TestFiletype('texinfo')
 call TestFiletype('texmf')
 call TestFiletype('tidy')

From 4bec20ec1a7cde0c29d9550d244f428484fa56ab Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 7 Oct 2020 21:51:30 +0200
Subject: [PATCH 119/299] Fix test and loading of filetypes, closes #577

---
 README.md             |   4 +-
 autoload/csv.vim      |  10 ++-
 doc/ft-csv.txt        |   5 ++
 ftdetect/polyglot.vim |   1 +
 ftplugin/falcon.vim   |   2 +-
 packages.yaml         |  17 ++++-
 scripts/build         |  18 ++---
 scripts/test          |   6 +-
 syntax/autodoc.vim    | 105 ++++++++++++++++++++++++++++
 syntax/html.vim       |  19 ++++++
 syntax/n1ql.vim       |   2 +-
 syntax/sqloracle.vim  | 154 ++++++++++++++++++++++++++++++++++++++++++
 tests/filetypes.vim   |  13 +++-
 13 files changed, 332 insertions(+), 24 deletions(-)
 create mode 100644 syntax/autodoc.vim
 create mode 100644 syntax/sqloracle.vim

diff --git a/README.md b/README.md
index 49b104769..ea6adcf15 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->589<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->590<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -99,7 +99,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [helm](https://github.com/towolf/vim-helm)
 - [help](https://github.com/neovim/neovim/tree/master/runtime)
 - [hive](https://github.com/zebradil/hive.vim)
-- [html5](https://github.com/othree/html5.vim)
+- [html5](https://github.com/sheerun/html5.vim)
 - [i3](https://github.com/mboughaba/i3config.vim)
 - [icalendar](https://github.com/chutzpah/icalendar.vim)
 - [idris2](https://github.com/edwinb/idris2-vim)
diff --git a/autoload/csv.vim b/autoload/csv.vim
index 16eeb676e..b97428c38 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -75,9 +75,13 @@ fu! csv#Init(start, end, ...) "{{{3
     endif
 
     if empty(b:delimiter) && !exists("b:csv_fixed_width")
-        call csv#Warn("No delimiter found. See :h csv-delimiter to set it manually!")
-        " Use a sane default as delimiter:
-        let b:delimiter = ','
+        if !exists("g:csv_default_delim")
+          call csv#Warn("No delimiter found. See :h csv-delimiter to set it manually!")
+          " Use a sane default as delimiter:
+          let b:delimiter = ','
+        else
+          let b:delimiter = g:csv_default_delim
+        endif
     endif
 
     let s:del='\%(' . b:delimiter . '\|$\)'
diff --git a/doc/ft-csv.txt b/doc/ft-csv.txt
index 7f8f6eb39..7ef33464a 100644
--- a/doc/ft-csv.txt
+++ b/doc/ft-csv.txt
@@ -1115,6 +1115,11 @@ manually, use: >
 to let the comma be the delimiter. This sets the buffer local delimiter
 variable b:delimiter.
 
+You can also set default delimiter to prevent a warning if no delimiter can
+be detected: >
+
+    :let g:csv_default_delim=','
+
 If your file does not consist of delimited columns, but rather is a fixed
 width csv file, see |csv-fixedwidth| for configuring the plugin appropriately.
 
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 485296740..791c4c0eb 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -69,6 +69,7 @@ call s:SetDefault('g:javascript_sql_dialect', 'sql')
 " Make csv loading faster
 call s:SetDefault('g:csv_start', 1)
 call s:SetDefault('g:csv_end', 2)
+call s:SetDefault('g:csv_default_delim', ',')
 
 " Disable json concealing by default
 call s:SetDefault('g:vim_json_syntax_conceal', 0)
diff --git a/ftplugin/falcon.vim b/ftplugin/falcon.vim
index f0735dd5e..8227c8f3b 100644
--- a/ftplugin/falcon.vim
+++ b/ftplugin/falcon.vim
@@ -16,7 +16,7 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-setlocal softtabstop=4 shiftwidth=4 fileencoding=utf-8
+setlocal softtabstop=4 shiftwidth=4 encoding=utf-8
 setlocal suffixesadd=.fal,.ftd
 
 " Matchit support
diff --git a/packages.yaml b/packages.yaml
index ea409055d..55ec0d8af 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -323,6 +323,7 @@ filetypes:
 ---
 name: c/c++
 remote: vim-jp/vim-cpp
+dependencies: autodoc
 filetypes:
 - name: cpp
   linguist: C++
@@ -791,8 +792,9 @@ filetypes:
   extra_extensions:
   - ql
 ---
+# TODO: change after https://github.com/othree/html5.vim/pull/106 is merged
 name: html5
-remote: othree/html5.vim
+remote: sheerun/html5.vim
 filetypes:
 - name: html
   linguist: HTML
@@ -1933,7 +1935,9 @@ filetypes:
 ---
 name: sql
 remote: vim/vim:runtime
-glob: '**/sql.vim'
+glob: 
+- '**/sql.vim'
+- '**/sqloracle.vim'
 filetypes:
 - name: sql
   linguist: PLSQL
@@ -2690,6 +2694,7 @@ filetypes:
   - pattern: exports
     description: Exports
 ---
+# TODO: change after merge: 
 name: falcon
 remote: vim/vim:runtime
 glob: "**/falcon.vim"
@@ -4002,6 +4007,7 @@ filetypes:
 name: pike
 remote: vim/vim:runtime
 glob: "**/pike.vim"
+dependencies: autodoc
 filetypes:
 - name: pike
   patterns:
@@ -4011,6 +4017,7 @@ filetypes:
 name: cmod
 remote: vim/vim:runtime
 glob: "**/cmod.vim"
+dependencies: autodoc
 filetypes:
 - name: cmod
   patterns:
@@ -5472,3 +5479,9 @@ filetypes:
 - name: pullrequest
   patterns:
   - pattern: PULLREQ_EDITMSG
+---
+name: autodoc
+remote: vim/vim:runtime
+glob: "**/autodoc.vim"
+# Needed by c, cmod, and pike
+filetypes: []
diff --git a/scripts/build b/scripts/build
index c5141d412..8f46b2174 100755
--- a/scripts/build
+++ b/scripts/build
@@ -177,7 +177,8 @@ def patterns_to_vim_patterns(patterns)
   stdin.write(patterns.join("\n"))
   stdin.close
   stdout.readlines.map(&:chomp).map do |r|
-    r.gsub('\b', '\(\<\|\>\)')
+    r.gsub!('\b', '\(\<\|\>\)')
+    r
   end
 end
 
@@ -274,7 +275,10 @@ def copy_file(package, src, dest)
         output << "if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '#{name}') == -1\n\n"
       end
       contents = File.read(input)
+      # ..= is feature of new vims...
       contents.gsub!(' ..= ', ' .= ')
+      # https://github.com/vim/vim/pull/7091 
+      contents.gsub!('fileencoding=', 'encoding=')
       output << contents
       output << "\nendif\n"
     end
@@ -649,15 +653,7 @@ def inject_code(path, code)
 end
 
 def generate_tests(packages)
-  output = <<~EOS
-    function! TestFiletype(filetype)
-      call Log('Loading ' . a:filetype . ' filetype...')
-
-      enew
-      exec 'set ft=' . a:filetype
-    endfunction
-
-  EOS
+  output = ""
 
   for package in packages
     for filetype in package.fetch("filetypes", [])
@@ -665,7 +661,7 @@ def generate_tests(packages)
     end
   end
 
-  File.write('tests/filetypes.vim', output)
+  inject_code('tests/filetypes.vim', output)
 
 
 end
diff --git a/scripts/test b/scripts/test
index ebb6d6ce8..f22c224c1 100755
--- a/scripts/test
+++ b/scripts/test
@@ -8,8 +8,10 @@ def run_vimscript(src)
   wrapper = <<~EOF
     vim --clean --not-a-term -u <(cat <<- "EOM"
     let g:polyglot_test = 1
+    set nocompatible
     let &rtp='$PWD,' . &rtp
-    runtime filetype.vim
+    filetype plugin indent on
+    syntax on
     set t_ti= t_te=
     set shortmess+=F
     set noswapfile
@@ -44,7 +46,7 @@ test_helptags = <<~EOF
 EOF
 
 run_vimscript('source tests/filetypes.vim')
-run_vimscript('source tests/extensions.vim')
+# run_vimscript('source tests/extensions.vim')
 run_script(test_helptags)
 
 # run_vimscript("
diff --git a/syntax/autodoc.vim b/syntax/autodoc.vim
new file mode 100644
index 000000000..5fcc60ca1
--- /dev/null
+++ b/syntax/autodoc.vim
@@ -0,0 +1,105 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'autodoc') == -1
+
+" Vim syntax file
+" Language:	Autodoc
+" Maintainer:	Stephen R. van den Berg <srb@cuci.nl>
+" Last Change:	2018 Jan 23
+" Version:	2.9
+" Remark:       Included by pike.vim, cmod.vim and optionally c.vim
+" Remark:       In order to make c.vim use it, set: c_autodoc
+
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn case match
+
+" A bunch of useful autodoc keywords
+syn keyword autodocStatement contained appears belongs global
+syn keyword autodocStatement contained decl directive inherit
+syn keyword autodocStatement contained deprecated obsolete bugs
+syn keyword autodocStatement contained copyright example fixme note param returns
+syn keyword autodocStatement contained seealso thanks throws constant
+syn keyword autodocStatement contained member index elem
+syn keyword autodocStatement contained value type item
+
+syn keyword autodocRegion contained enum mapping code multiset array
+syn keyword autodocRegion contained int string section mixed ol ul dl
+syn keyword autodocRegion contained class module namespace
+syn keyword autodocRegion contained endenum endmapping endcode endmultiset
+syn keyword autodocRegion contained endarray endint endstring endsection
+syn keyword autodocRegion contained endmixed endol endul enddl
+syn keyword autodocRegion contained endclass endmodule endnamespace
+
+syn keyword autodocIgnore contained ignore endignore
+
+syn keyword autodocStatAcc contained b i u tt url pre sub sup
+syn keyword autodocStatAcc contained ref rfc xml dl expr image
+
+syn keyword	autodocTodo		contained TODO FIXME XXX
+
+syn match autodocLineStart	display "\(//\|/\?\*\)\@2<=!"
+syn match autodocWords "[^!@{}[\]]\+" display contains=@Spell
+
+syn match autodocLink "@\[[^[\]]\+]"hs=s+2,he=e-1 display contains=autodocLead
+syn match autodocAtStmt "@[a-z]\+\%(\s\|$\)\@="hs=s+1 display contains=autodocStatement,autodocIgnore,autodocLead,autodocRegion
+
+" Due to limitations of the matching algorithm, we cannot highlight
+" nested autodocNStmtAcc structures correctly
+syn region autodocNStmtAcc start="@[a-z]\+{" end="@}" contains=autodocStatAcc,autodocLead keepend
+
+syn match autodocUrl contained display ".\+"
+syn region autodocAtUrlAcc start="{"ms=s+1 end="@}"he=e-1,me=e-2 contained display contains=autodocUrl,autodocLead keepend
+syn region autodocNUrlAcc start="@url{" end="@}" contains=autodocStatAcc,autodocAtUrlAcc,autodocLead transparent
+
+syn match autodocSpecial "@@" display
+syn match autodocLead "@" display contained
+
+"when wanted, highlight trailing white space
+if exists("c_space_errors")
+  if !exists("c_no_trail_space_error")
+    syn match	autodocSpaceError	display excludenl "\s\+$"
+  endif
+  if !exists("c_no_tab_space_error")
+    syn match	autodocSpaceError	display " \+\t"me=e-1
+  endif
+endif
+
+if exists("c_minlines")
+  let b:c_minlines = c_minlines
+else
+  if !exists("c_no_if0")
+    let b:c_minlines = 50	" #if 0 constructs can be long
+  else
+    let b:c_minlines = 15	" mostly for () constructs
+  endif
+endif
+exec "syn sync ccomment autodocComment minlines=" . b:c_minlines
+
+" Define the default highlighting.
+" Only used when an item doesn't have highlighting yet
+hi def link autodocStatement	Statement
+hi def link autodocStatAcc	Statement
+hi def link autodocRegion	Structure
+hi def link autodocAtStmt	Error
+hi def link autodocNStmtAcc	Identifier
+hi def link autodocLink		Type
+hi def link autodocTodo		Todo
+hi def link autodocSpaceError	Error
+hi def link autodocLineStart	SpecialComment
+hi def link autodocSpecial	SpecialChar
+hi def link autodocUrl		Underlined
+hi def link autodocLead		Statement
+hi def link autodocIgnore	Delimiter
+
+let b:current_syntax = "autodoc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/html.vim b/syntax/html.vim
index 633a157e7..43db75758 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -19,6 +19,17 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Modified:     htdebeer <H.T.de.Beer@gmail.com>
 " Changes:      add common SVG elements and attributes for inline SVG
 
+" quit when a syntax file was already loaded
+if !exists("main_syntax")
+  if exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax = 'html'
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
 " Patch 7.4.1142
 if has("patch-7.4-1142")
   if has("win32")
@@ -192,5 +203,13 @@ syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemul
 syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
 syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
 
+let b:current_syntax = "html"
+
+if main_syntax == 'html'
+  unlet main_syntax
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
 
 endif
diff --git a/syntax/n1ql.vim b/syntax/n1ql.vim
index c9f55282d..80b940902 100644
--- a/syntax/n1ql.vim
+++ b/syntax/n1ql.vim
@@ -14,7 +14,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'n1ql') == -1
 " Questions, comments:  <n1ql AT cime.net>
 "                       https://ciurana.eu/pgp, https://keybase.io/pr3d4t0r
 "
-" vim: set fileencoding=utf-8:
+" vim: set encoding=utf-8:
 
 
 if exists("b:current_syntax")
diff --git a/syntax/sqloracle.vim b/syntax/sqloracle.vim
new file mode 100644
index 000000000..eb3390ba8
--- /dev/null
+++ b/syntax/sqloracle.vim
@@ -0,0 +1,154 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
+
+" Vim syntax file
+" Language:	SQL, PL/SQL (Oracle 11g)
+" Maintainer:	Christian Brabandt
+" Repository:   https://github.com/chrisbra/vim-sqloracle-syntax
+" License:      Vim
+" Previous Maintainer:	Paul Moore
+" Last Change:	2018 June 24
+
+" Changes:
+" 02.04.2016: Support for when keyword
+" 03.04.2016: Support for join related keywords
+" 22.07.2016: Support Oracle Q-Quote-Syntax
+" 25.07.2016: Support for Oracle N'-Quote syntax
+" 22.06.2018: Remove skip part for sqlString (do not escape strings)
+" (https://web.archive.org/web/20150922065035/https://mariadb.com/kb/en/sql-99/character-string-literals/)
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn case ignore
+
+" The SQL reserved words, defined as keywords.
+
+syn keyword sqlSpecial	false null true
+
+syn keyword sqlKeyword	access add as asc begin by case check cluster column
+syn keyword sqlKeyword	cache compress connect current cursor decimal default desc
+syn keyword sqlKeyword	else elsif end exception exclusive file for from
+syn keyword sqlKeyword	function group having identified if immediate increment
+syn keyword sqlKeyword	index initial initrans into is level link logging loop
+syn keyword sqlKeyword	maxextents maxtrans mode modify monitoring
+syn keyword sqlKeyword	nocache nocompress nologging noparallel nowait of offline on online start
+syn keyword sqlKeyword	parallel successful synonym table tablespace then to trigger uid
+syn keyword sqlKeyword	unique user validate values view when whenever
+syn keyword sqlKeyword	where with option order pctfree pctused privileges procedure
+syn keyword sqlKeyword	public resource return row rowlabel rownum rows
+syn keyword sqlKeyword	session share size smallint type using
+syn keyword sqlKeyword	join cross inner outer left right
+
+syn keyword sqlOperator	not and or
+syn keyword sqlOperator	in any some all between exists
+syn keyword sqlOperator	like escape
+syn keyword sqlOperator	union intersect minus
+syn keyword sqlOperator	prior distinct
+syn keyword sqlOperator	sysdate out
+
+syn keyword sqlStatement analyze audit comment commit
+syn keyword sqlStatement delete drop execute explain grant lock noaudit
+syn keyword sqlStatement rename revoke rollback savepoint set
+syn keyword sqlStatement truncate
+" next ones are contained, so folding works.
+syn keyword sqlStatement create update alter select insert contained
+
+syn keyword sqlType	bfile blob boolean char character clob date datetime
+syn keyword sqlType	dec decimal float int integer long mlslabel nchar
+syn keyword sqlType	nclob number numeric nvarchar2 precision raw rowid
+syn keyword sqlType	smallint real timestamp urowid varchar varchar2 varray
+
+" Strings:
+syn region sqlString	matchgroup=Quote start=+n\?"+     end=+"+
+syn region sqlString	matchgroup=Quote start=+n\?'+     end=+'+
+syn region sqlString	matchgroup=Quote start=+n\?q'\z([^[(<{]\)+    end=+\z1'+
+syn region sqlString	matchgroup=Quote start=+n\?q'<+   end=+>'+
+syn region sqlString	matchgroup=Quote start=+n\?q'{+   end=+}'+
+syn region sqlString	matchgroup=Quote start=+n\?q'(+   end=+)'+
+syn region sqlString	matchgroup=Quote start=+n\?q'\[+  end=+]'+
+
+" Numbers:
+syn match sqlNumber	"-\=\<\d*\.\=[0-9_]\>"
+
+" Comments:
+syn region sqlComment	start="/\*"  end="\*/" contains=sqlTodo,@Spell fold 
+syn match sqlComment	"--.*$" contains=sqlTodo,@Spell
+syn match sqlComment "^rem.*$" contains=sqlTodo,@Spell
+
+" Setup Folding:
+" this is a hack, to get certain statements folded.
+" the keywords create/update/alter/select/insert need to
+" have contained option.
+syn region sqlFold start='^\s*\zs\c\(Create\|Update\|Alter\|Select\|Insert\)' end=';$\|^$' transparent fold contains=ALL
+
+syn sync ccomment sqlComment
+
+" Functions:
+" (Oracle 11g)
+" Aggregate Functions
+syn keyword sqlFunction	avg collect corr corr_s corr_k count covar_pop covar_samp cume_dist dense_rank first
+syn keyword sqlFunction	group_id grouping grouping_id last max median min percentile_cont percentile_disc percent_rank rank
+syn keyword sqlFunction	regr_slope regr_intercept regr_count regr_r2 regr_avgx regr_avgy regr_sxx regr_syy regr_sxy
+syn keyword sqlFunction	stats_binomial_test stats_crosstab stats_f_test stats_ks_test stats_mode stats_mw_test
+syn keyword sqlFunction	stats_one_way_anova stats_t_test_one stats_t_test_paired stats_t_test_indep stats_t_test_indepu
+syn keyword sqlFunction	stats_wsr_test stddev stddev_pop stddev_samp sum
+syn keyword sqlFunction	sys_xmlagg var_pop var_samp variance xmlagg
+" Char Functions
+syn keyword sqlFunction	ascii chr concat initcap instr length lower lpad ltrim
+syn keyword sqlFunction	nls_initcap nls_lower nlssort nls_upper regexp_instr regexp_replace
+syn keyword sqlFunction	regexp_substr replace rpad rtrim soundex substr translate treat trim upper
+" Comparison Functions
+syn keyword sqlFunction	greatest least
+" Conversion Functions
+syn keyword sqlFunction	asciistr bin_to_num cast chartorowid compose convert
+syn keyword sqlFunction	decompose hextoraw numtodsinterval numtoyminterval rawtohex rawtonhex rowidtochar
+syn keyword sqlFunction	rowidtonchar scn_to_timestamp timestamp_to_scn to_binary_double to_binary_float
+syn keyword sqlFunction	to_char to_char to_char to_clob to_date to_dsinterval to_lob to_multi_byte
+syn keyword sqlFunction	to_nchar to_nchar to_nchar to_nclob to_number to_dsinterval to_single_byte
+syn keyword sqlFunction	to_timestamp to_timestamp_tz to_yminterval to_yminterval translate unistr
+" DataMining Functions
+syn keyword sqlFunction	cluster_id cluster_probability cluster_set feature_id feature_set
+syn keyword sqlFunction	feature_value prediction prediction_bounds prediction_cost
+syn keyword sqlFunction	prediction_details prediction_probability prediction_set
+" Datetime Functions
+syn keyword sqlFunction	add_months current_date current_timestamp dbtimezone extract
+syn keyword sqlFunction	from_tz last_day localtimestamp months_between new_time
+syn keyword sqlFunction	next_day numtodsinterval numtoyminterval round sessiontimezone
+syn keyword sqlFunction	sys_extract_utc sysdate systimestamp to_char to_timestamp
+syn keyword sqlFunction	to_timestamp_tz to_dsinterval to_yminterval trunc tz_offset
+" Numeric Functions
+syn keyword sqlFunction	abs acos asin atan atan2 bitand ceil cos cosh exp
+syn keyword sqlFunction	floor ln log mod nanvl power remainder round sign
+syn keyword sqlFunction	sin sinh sqrt tan tanh trunc width_bucket
+" NLS Functions
+syn keyword sqlFunction	ls_charset_decl_len nls_charset_id nls_charset_name
+" Various Functions
+syn keyword sqlFunction	bfilename cardin coalesce collect decode dump empty_blob empty_clob
+syn keyword sqlFunction	lnnvl nullif nvl nvl2 ora_hash powermultiset powermultiset_by_cardinality
+syn keyword sqlFunction	sys_connect_by_path sys_context sys_guid sys_typeid uid user userenv vsizeality
+" XML Functions
+syn keyword sqlFunction	appendchildxml deletexml depth extract existsnode extractvalue insertchildxml
+syn keyword sqlFunction	insertxmlbefore path sys_dburigen sys_xmlagg sys_xmlgen updatexml xmlagg xmlcast
+syn keyword sqlFunction	xmlcdata xmlcolattval xmlcomment xmlconcat xmldiff xmlelement xmlexists xmlforest
+syn keyword sqlFunction	xmlparse xmlpatch xmlpi xmlquery xmlroot xmlsequence xmlserialize xmltable xmltransform
+" Todo:
+syn keyword sqlTodo TODO FIXME XXX DEBUG NOTE contained
+
+" Define the default highlighting.
+hi def link Quote		Special
+hi def link sqlComment		Comment
+hi def link sqlFunction		Function
+hi def link sqlKeyword		sqlSpecial
+hi def link sqlNumber		Number
+hi def link sqlOperator		sqlStatement
+hi def link sqlSpecial		Special
+hi def link sqlStatement	Statement
+hi def link sqlString		String
+hi def link sqlType		Type
+hi def link sqlTodo		Todo
+
+let b:current_syntax = "sql"
+" vim: ts=8
+
+endif
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index d77ade814..5676807d3 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -1,10 +1,17 @@
 function! TestFiletype(filetype)
   call Log('Loading ' . a:filetype . ' filetype...')
 
-  enew
-  exec 'set ft=' . a:filetype
+  try
+    enew
+    exec 'set ft=' . a:filetype
+  catch
+    echo 'Failed to load ' . a:filetype  . ' filetype...'
+    echo v:exception
+  endtry
 endfunction
 
+" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
+
 call TestFiletype('8th')
 call TestFiletype('cfg')
 call TestFiletype('master')
@@ -625,3 +632,5 @@ call TestFiletype('logcheck')
 call TestFiletype('svn')
 call TestFiletype('text')
 call TestFiletype('pullrequest')
+
+" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE

From b3763a917a6a3ca85ae51086fc8d29b28f66fc88 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 7 Oct 2020 23:52:17 +0200
Subject: [PATCH 120/299] Use neovim version of .vim highlighting, #578

---
 README.md        |   1 +
 ftplugin/vim.vim |  35 +++---
 indent/vim.vim   |  36 +-----
 packages.yaml    |   2 +-
 syntax/vim.vim   | 296 ++++++++++++++++++++---------------------------
 5 files changed, 149 insertions(+), 221 deletions(-)

diff --git a/README.md b/README.md
index ea6adcf15..8845bc9c7 100644
--- a/README.md
+++ b/README.md
@@ -191,6 +191,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [vbnet](https://github.com/vim-scripts/vbnet.vim)
 - [vcl](https://github.com/smerrill/vcl-vim-plugin)
 - [velocity](https://github.com/lepture/vim-velocity)
+- [vim](https://github.com/neovim/neovim/tree/master/runtime)
 - [vue](https://github.com/posva/vim-vue)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)
 - [xml](https://github.com/amadeus/vim-xml)
diff --git a/ftplugin/vim.vim b/ftplugin/vim.vim
index bf721a024..af269d051 100644
--- a/ftplugin/vim.vim
+++ b/ftplugin/vim.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vim') == -1
 " Vim filetype plugin
 " Language:	Vim
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Aug 14
+" Last Change:	2018 Aug 07
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -14,11 +14,11 @@ endif
 let b:did_ftplugin = 1
 
 let s:cpo_save = &cpo
-set cpo&vim
+set cpo-=C
 
 if !exists('*VimFtpluginUndo')
   func VimFtpluginUndo()
-    setl fo< isk< com< tw< commentstring<
+    setl fo< isk< com< tw< commentstring< keywordprg<
     if exists('b:did_add_maps')
       silent! nunmap <buffer> [[
       silent! vunmap <buffer> [[
@@ -32,7 +32,7 @@ if !exists('*VimFtpluginUndo')
       silent! vunmap <buffer> ]"
       silent! nunmap <buffer> ["
       silent! vunmap <buffer> ["
-    endif
+     endif
     unlet! b:match_ignorecase b:match_words b:match_skip b:did_add_maps
   endfunc
 endif
@@ -51,29 +51,31 @@ setlocal isk+=#
 setlocal keywordprg=:help
 
 " Set 'comments' to format dashed lists in comments
-" Avoid that #{} starts a comment.
-setlocal com=sO:\"\ -,mO:\"\ \ ,sO:#\ -,mO:#\ \ ,eO:##,:\",b:#
+setlocal com=sO:\"\ -,mO:\"\ \ ,eO:\"\",:\"
 
 " Format comments to be up to 78 characters long
 if &tw == 0
   setlocal tw=78
 endif
 
-" Comments start with a double quote; in Vim9 script # would also work
+" Comments start with a double quote
 setlocal commentstring=\"%s
 
+" Prefer Vim help instead of manpages.
+setlocal keywordprg=:help
+
 if !exists("no_plugin_maps") && !exists("no_vim_maps")
   let b:did_add_maps = 1
 
   " Move around functions.
-  nnoremap <silent><buffer> [[ m':call search('^\s*\(fu\%[nction]\\|def\)\>', "bW")<CR>
-  vnoremap <silent><buffer> [[ m':<C-U>exe "normal! gv"<Bar>call search('^\s*\(fu\%[nction]\\|def\)\>', "bW")<CR>
-  nnoremap <silent><buffer> ]] m':call search('^\s*\(fu\%[nction]\\|def\)\>', "W")<CR>
-  vnoremap <silent><buffer> ]] m':<C-U>exe "normal! gv"<Bar>call search('^\s*\(fu\%[nction]\\|def\)\>', "W")<CR>
-  nnoremap <silent><buffer> [] m':call search('^\s*end\(f\%[unction]\\|def\)\>', "bW")<CR>
-  vnoremap <silent><buffer> [] m':<C-U>exe "normal! gv"<Bar>call search('^\s*end\(f\%[unction]\\|def\)\>', "bW")<CR>
-  nnoremap <silent><buffer> ][ m':call search('^\s*end\(f\%[unction]\\|def\)\>', "W")<CR>
-  vnoremap <silent><buffer> ][ m':<C-U>exe "normal! gv"<Bar>call search('^\s*end\(f\%[unction]\\|def\)\>', "W")<CR>
+  nnoremap <silent><buffer> [[ m':call search('^\s*fu\%[nction]\>', "bW")<CR>
+  vnoremap <silent><buffer> [[ m':<C-U>exe "normal! gv"<Bar>call search('^\s*fu\%[nction]\>', "bW")<CR>
+  nnoremap <silent><buffer> ]] m':call search('^\s*fu\%[nction]\>', "W")<CR>
+  vnoremap <silent><buffer> ]] m':<C-U>exe "normal! gv"<Bar>call search('^\s*fu\%[nction]\>', "W")<CR>
+  nnoremap <silent><buffer> [] m':call search('^\s*endf\%[unction]\>', "bW")<CR>
+  vnoremap <silent><buffer> [] m':<C-U>exe "normal! gv"<Bar>call search('^\s*endf\%[unction]\>', "bW")<CR>
+  nnoremap <silent><buffer> ][ m':call search('^\s*endf\%[unction]\>', "W")<CR>
+  vnoremap <silent><buffer> ][ m':<C-U>exe "normal! gv"<Bar>call search('^\s*endf\%[unction]\>', "W")<CR>
 
   " Move around comments
   nnoremap <silent><buffer> ]" :call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR>
@@ -86,10 +88,9 @@ endif
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
   let b:match_words =
-	\ '\<\%(fu\%[nction]\|def\)\>)\@!:\<retu\%[rn]\>:\<\%(endf\%[unction]\|enddef\)\>,' .
+	\ '\<fu\%[nction]\>:\<retu\%[rn]\>:\<endf\%[unction]\>,' .
  	\ '\<\(wh\%[ile]\|for\)\>:\<brea\%[k]\>:\<con\%[tinue]\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' .
 	\ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' .
-	\ '{:},' .
 	\ '\<try\>:\<cat\%[ch]\>:\<fina\%[lly]\>:\<endt\%[ry]\>,' .
 	\ '\<aug\%[roup]\s\+\%(END\>\)\@!\S:\<aug\%[roup]\s\+END\>,'
   " Ignore syntax region commands and settings, any 'en*' would clobber
diff --git a/indent/vim.vim b/indent/vim.vim
index c819c64f9..47d1c4ded 100644
--- a/indent/vim.vim
+++ b/indent/vim.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vim') == -1
 " Vim indent file
 " Language:	Vim script
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Sep 27
+" Last Change:	2016 Jun 27
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -12,8 +12,7 @@ endif
 let b:did_indent = 1
 
 setlocal indentexpr=GetVimIndent()
-setlocal indentkeys+==end,=},=else,=cat,=finall,=END,0\\,0=\"\\\ 
-setlocal indentkeys-=0#
+setlocal indentkeys+==end,=else,=cat,=fina,=END,0\\,0=\"\\\ 
 
 let b:undo_indent = "setl indentkeys< indentexpr<"
 
@@ -59,31 +58,6 @@ function GetVimIndentIntern()
   " and :else.  Add it three times for a line that starts with '\' or '"\ '
   " after a line that doesn't (or g:vim_indent_cont if it exists).
   let ind = indent(lnum)
-
-  " In heredoc indenting works completely differently.
-  if has('syntax_items') 
-    let syn_here = synIDattr(synID(v:lnum, 1, 1), "name")
-    if syn_here =~ 'vimLetHereDocStop'
-      " End of heredoc: use indent of matching start line
-      let lnum = v:lnum - 1
-      while lnum > 0
-	if synIDattr(synID(lnum, 1, 1), "name") !~ 'vimLetHereDoc'
-	  return indent(lnum)
-	endif
-	let lnum -= 1
-      endwhile
-      return 0
-    endif
-    if syn_here =~ 'vimLetHereDoc'
-      if synIDattr(synID(lnum, 1, 1), "name") !~ 'vimLetHereDoc'
-	" First line in heredoc: increase indent
-	return ind + shiftwidth()
-      endif
-      " Heredoc continues: no change in indent
-      return ind
-    endif
-  endif
-
   if cur_text =~ s:lineContPat && v:lnum > 1 && prev_text !~ s:lineContPat
     if exists("g:vim_indent_cont")
       let ind = ind + g:vim_indent_cont
@@ -95,7 +69,7 @@ function GetVimIndentIntern()
   else
     " A line starting with :au does not increment/decrement indent.
     if prev_text !~ '^\s*au\%[tocmd]'
-      let i = match(prev_text, '\(^\||\)\s*\(export\s\+\)\?\({\|\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\|finall\%[y]\|fu\%[nction]\|def\|el\%[seif]\)\>\)')
+      let i = match(prev_text, '\(^\||\)\s*\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\%[lly]\|fu\%[nction]\|el\%[seif]\)\>')
       if i >= 0
 	let ind += shiftwidth()
 	if strpart(prev_text, i, 1) == '|' && has('syntax_items')
@@ -118,8 +92,8 @@ function GetVimIndentIntern()
 
 
   " Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry,
-  " :endfun, :enddef, :else and :augroup END.
-  if cur_text =~ '^\s*\(ene\@!\|}\|cat\|finall\|el\|aug\%[roup]\s\+[eE][nN][dD]\)'
+  " :endfun, :else and :augroup END.
+  if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s\+[eE][nN][dD]\)'
     let ind = ind - shiftwidth()
   endif
 
diff --git a/packages.yaml b/packages.yaml
index 55ec0d8af..e8a136faf 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5152,7 +5152,7 @@ filetypes:
   - pattern: "*.vhdl_[0-9]*"
 ---
 name: vim
-remote: vim/vim:runtime
+remote: neovim/neovim:runtime
 glob: "**/vim.vim"
 filetypes:
 - name: vim
diff --git a/syntax/vim.vim b/syntax/vim.vim
index abe08f945..9717a8fb0 100644
--- a/syntax/vim.vim
+++ b/syntax/vim.vim
@@ -1,12 +1,14 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vim') == -1
 
 " Vim syntax file
-" Language:	Vim 8.0 script
-" Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Aug 30, 2020
-" Version:	8.0-43
-" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM
-" Automatically generated keyword lists: {{{1
+
+" #############################################################################
+" #############################################################################
+" Note: Be careful when merging the upstream version of this file.
+"       Much of this is generated by scripts/genvimvim.lua
+"       (installs to $VIMRUNTIME/syntax/vim/generated.vim)
+" #############################################################################
+" #############################################################################
 
 " Quit when a syntax file was already loaded {{{2
 if exists("b:current_syntax")
@@ -20,77 +22,49 @@ set cpo&vim
 syn keyword vimTodo contained	COMBAK	FIXME	TODO	XXX
 syn cluster vimCommentGroup	contains=vimTodo,@Spell
 
-" regular vim commands {{{2
-syn keyword vimCommand contained	a ar[gs] argl[ocal] ba[ll] bm[odified] breaka[dd] bun[load] cabc[lear] cal[l] cc cf[ile] changes cla[st] cnew[er] com cope[n] cscope debug delep dell diffg[et] dig[raphs] do dsp[lit] echom[sg] enddef eval f[ile] fina[lly] foldd[oopen] go[to] ha[rdcopy] hid[e] ij[ump] inor j[oin] keepj[umps] lab[ove] lat lc[d] le[ft] lg[etfile] lhi[story] lmapc[lear] loadkeymap lpf[ile] luafile mak[e] mk[exrc] mz[scheme] new nore on[ly] pc[lose] pp[op] promptf[ind] ptj[ump] pu[t] py[thon] pyxdo rec[over] reg[isters] rightb[elow] rv[iminfo] sIn san[dbox] sbl[ast] scI scr[iptnames] setf[iletype] sgI sgp sig sir smenu so[urce] spellr[are] sr srl startg[replace] sun[hide] sy tN[ext] tabe[dit] tabnew tc[l] ter[minal] tlmenu tma[p] tr[ewind] u[ndo] unl ve[rsion] vim9 vmapc[lear] wa[ll] winp[os] wundo xme xr[estore]
-syn keyword vimCommand contained	ab arga[dd] argu[ment] bad[d] bn[ext] breakd[el] bw[ipeout] cabo[ve] cat[ch] ccl[ose] cfdo chd[ir] class cnf[ile] comc[lear] cp[revious] cstag debugg[reedy] deletel delm[arks] diffo[ff] dir doau e[dit] echon endf[unction] ex files fini[sh] folddoc[losed] gr[ep] helpc[lose] his[tory] il[ist] interface ju[mps] keepp[atterns] lad[dexpr] later lch[dir] lefta[bove] lgetb[uffer] ll lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mks[ession] mzf[ile] nmapc[lear] nos[wapfile] opt[ions] pe[rl] pre[serve] promptr[epl] ptl[ast] pw[d] pydo pyxfile red[o] res[ize] ru[ntime] sI sIp sav[eas] sbm[odified] sce scripte[ncoding] setg[lobal] sgc sgr sign sl[eep] smile sor[t] spellr[epall] srI srn startr[eplace] sunme syn ta[g] tabf[ind] tabo[nly] tcd tf[irst] tln tmapc[lear] try una[bbreviate] unlo[ckvar] verb[ose] vim9script vne[w] wh[ile] wn[ext] wv[iminfo] xmenu xunme
-syn keyword vimCommand contained	abc[lear] argd[elete] as[cii] bd[elete] bo[tright] breakl[ist] cN[ext] cad[dbuffer] cb[uffer] cd cfir[st] che[ckpath] cle[arjumps] cnor comp[iler] cpf[ile] cun def deletep delp diffp[atch] disa[ssemble] doaut ea el[se] endfo[r] exi[t] filet fir[st] foldo[pen] grepa[dd] helpf[ind] i imapc[lear] intro k lN[ext] laddb[uffer] lb[uffer] lcl[ose] lex[pr] lgete[xpr] lla[st] lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mksp[ell] n[ext] noa nu[mber] ownsyntax ped[it] prev[ious] ps[earch] ptn[ext] py3 pyf[ile] q[uit] redi[r] ret[ab] rub[y] sIc sIr sbN[ext] sbn[ext] scg scriptv[ersion] setl[ocal] sge sh[ell] sil[ent] sla[st] sn[ext] sp[lit] spellr[rare] src srp stj[ump] sunmenu sync tab tabfir[st] tabp[revious] tch[dir] th[row] tlnoremenu tn[ext] ts[elect] undoj[oin] uns[ilent] vert[ical] vim[grep] vs[plit] win[size] wp[revious] x[it] xnoreme xunmenu
-syn keyword vimCommand contained	abo[veleft] argdo au bel[owright] bp[revious] bro[wse] cNf[ile] cadde[xpr] cbe[fore] cdo cg[etfile] checkt[ime] clo[se] co[py] con[tinue] cq[uit] cuna[bbrev] defc[ompile] deletl dep diffpu[t] dj[ump] dp earlier elsei[f] endt[ry] exp filetype fix[del] for gui helpg[rep] ia imp is[earch] kee[pmarks] lNf[ile] laddf[ile] lbe[fore] lcs lf[ile] lgr[ep] lli[st] lnf[ile] lol[der] lt[ag] lw[indow] menut[ranslate] mkv[imrc] nb[key] noautocmd o[pen] p[rint] perld[o] pro ptN[ext] ptp[revious] py3do python3 qa[ll] redr[aw] retu[rn] rubyd[o] sIe sN[ext] sb[uffer] sbp[revious] sci scs sf[ind] sgi si sim[alt] sm[agic] sno[magic] spe[llgood] spellu[ndo] sre[wind] st[op] stopi[nsert] sus[pend] syncbind tabN[ext] tabl[ast] tabr[ewind] tcld[o] tj[ump] tlu tno[remap] tu[nmenu] undol[ist] up[date] vi[sual] vimgrepa[dd] wN[ext] winc[md] wq xa[ll] xnoremenu xwininfo
-syn keyword vimCommand contained	addd arge[dit] bN[ext] bf[irst] br[ewind] bufdo c[hange] caddf[ile] cbel[ow] ce[nter] cgetb[uffer] chi[story] cmapc[lear] col[der] conf[irm] cr[ewind] cw[indow] delc[ommand] deletp di[splay] diffs[plit] dl dr[op] ec em[enu] endw[hile] export filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] import isp[lit] keepa l[ist] laf[ter] lbel[ow] lcscope lfdo lgrepa[dd] lma lo[adview] lop[en] lua m[ove] mes mkvie[w] nbc[lose] noh[lsearch] ol[dfiles] pa[ckadd] po[p] prof[ile] pta[g] ptr[ewind] py3f[ile] pythonx quita[ll] redraws[tatus] rew[ind] rubyf[ile] sIg sa[rgument] sba[ll] sbr[ewind] scl scscope sfir[st] sgl sic sin sm[ap] snoreme spelld[ump] spellw[rong] srg sta[g] sts[elect] sv[iew] syntime tabc[lose] tabm[ove] tabs tclf[ile] tl[ast] tlunmenu to[pleft] tunma[p] unh[ide] v vie[w] viu[sage] w[rite] windo wqa[ll] xmapc[lear] xprop y[ank]
-syn keyword vimCommand contained	al[l] argg[lobal] b[uffer] bl[ast] brea[k] buffers ca caf[ter] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cn[ext] colo[rscheme] cons[t] cs d[elete] delel delf[unction] dif[fupdate] difft[his] dli[st] ds[earch] echoe[rr] en[dif] ene[w] exu[sage] fin[d] foldc[lose] g h[elp] hi if in iuna[bbrev] keepalt la[st] lan[guage] lbo[ttom] ld[o] lfir[st] lh[elpgrep] lmak[e] loadk lp[revious] luado ma[rk] messages mod[e] nbs[tart] nor omapc[lear] packl[oadall] popu[p] profd[el] ptf[irst] pts[elect] py3f[ile] pyx r[ead] redrawt[abline] ri[ght] rundo sIl sal[l] sbf[irst] sc scp se[t] sg sgn sie sip sme snoremenu spelli[nfo] spr[evious] sri star[tinsert] substitutepattern sw[apname] t tabd[o] tabn[ext] tags te[aroff] tlm tm[enu] tp[revious] type
+" Special and plugin vim commands {{{2
 syn match   vimCommand contained	"\<z[-+^.=]\=\>"
-syn keyword vimStdPlugin contained	Arguments Break Cfilter Clear Continue DiffOrig Evaluate Finish Gdb Lfilter Man N[ext] Over P[rint] Program Run S Source Step Stop Termdebug TermdebugCommand TOhtml Winbar XMLent XMLns
-
-" vimOptions are caught only when contained in a vimSet {{{2
-syn keyword vimOption contained	acd ambw arshape background ballooneval bex bl brk buftype cf cinkeys cmdwinheight com completeslash cpoptions cscoperelative csre cursorcolumn delcombine digraph eadirection emo equalprg expandtab fdls fex fileignorecase fml foldlevel formatexpr gcr go guifontset helpheight history hlsearch imaf ims includeexpr infercase iskeyword keywordprg laststatus lispwords lrm magic maxfuncdepth menuitems mm modifiable mousemodel mzq numberwidth opfunc patchexpr pfn pp printfont pumwidth pythonthreehome re restorescreen ro rulerformat scl scs sft shellslash shortmess showtabline sj smd spell spl srr startofline suffixes switchbuf ta tagfunc tbi term termwintype tgc titlelen toolbariconsize ttimeout ttymouse twt undofile varsofttabstop verbosefile viminfofile wak weirdinvert wig wildoptions winheight wm wrapscan
-syn keyword vimOption contained	ai anti autochdir backspace balloonevalterm bexpr bo browsedir casemap cfu cino cmp comments concealcursor cpp cscopetag cst cursorline dex dip eb emoji errorbells exrc fdm ff filetype fmr foldlevelstart formatlistpat gd gp guifontwide helplang hk ic imak imsearch incsearch insertmode isp km lazyredraw list ls makeef maxmapdepth mfd mmd modified mouses mzquantum nuw osfiletype patchmode ph preserveindent printheader pvh pyx readonly revins rop runtimepath scr sect sh shelltemp shortname shq slm sn spellcapcheck splitbelow ss statusline suffixesadd sws tabline taglength tbidi termbidi terse tgst titleold top ttimeoutlen ttyscroll tx undolevels vartabstop vfile virtualedit warn wfh wildchar wim winminheight wmh write
-syn keyword vimOption contained	akm antialias autoindent backup balloonexpr bg bomb bs cb ch cinoptions cms commentstring conceallevel cpt cscopetagorder csto cursorlineopt dg dir ed enc errorfile fcl fdn ffs fillchars fo foldmarker formatoptions gdefault grepformat guiheadroom hf hkmap icon imc imsf inde is isprint kmp lbr listchars lsp makeencoding maxmem mh mmp more mouseshape mzschemedll odev pa path pheader previewheight printmbcharset pvp pyxversion redrawtime ri rs sb scroll sections shcf shelltype showbreak si sm so spellfile splitright ssl stl sw sxe tabpagemax tagrelative tbis termencoding textauto thesaurus titlestring tpm ttm ttytype uc undoreload vb vi visualbell wb wfw wildcharm winaltkeys winminwidth wmnu writeany
-syn keyword vimOption contained	al ar autoread backupcopy bdir bh breakat bsdir cc charconvert cinw co compatible confirm crb cscopeverbose csverb cwh dict directory edcompatible encoding errorformat fcs fdo fic fixendofline foldclose foldmethod formatprg gfm grepprg guioptions hh hkmapp iconstring imcmdline imst indentexpr isf joinspaces kp lcs lm luadll makeprg maxmempattern mis mmt mouse mouset mzschemegcdll oft packpath pdev pi previewpopup printmbfont pvw qe regexpengine rightleft rtp sbo scrollbind secure shell shellxescape showcmd sidescroll smartcase softtabstop spelllang spo ssop stmp swapfile sxq tabstop tags tbs termguicolors textmode tildeop tl tr tty tw udf updatecount vbs viewdir vop wc wh wildignore wincolor winptydll wmw writebackup
-syn keyword vimOption contained	aleph arab autowrite backupdir bdlay bin breakindent bsk ccv ci cinwords cocu complete copyindent cryptmethod csl cuc debug dictionary display ef endofline esckeys fdc fdt fileencoding fixeol foldcolumn foldminlines fp gfn gtl guipty hi hkp ignorecase imd imstatusfunc indentkeys isfname js langmap linebreak lmap lw mat maxmemtot mkspellmem mod mousef mousetime nf ofu para penc pm previewwindow printoptions pw qftf relativenumber rightleftcmd ru sbr scrollfocus sel shellcmdflag shellxquote showfulltag sidescrolloff smartindent sol spelloptions spr st sts swapsync syn tag tagstack tc termwinkey textwidth timeout tm ts ttybuiltin twk udir updatetime vdir viewoptions vsts wcm whichwrap wildignorecase window winwidth wop writedelay
-syn keyword vimOption contained	allowrevins arabic autowriteall backupext belloff binary breakindentopt bt cd cin clipboard cole completefunc cot cscopepathcomp cspc cul deco diff dy efm eol et fde fen fileencodings fk foldenable foldnestmax fs gfs gtt guitablabel hid hl im imdisable imstyle indk isi key langmenu lines lnr lz matchpairs mco ml modeline mousefocus mp nrformats omnifunc paragraphs perldll pmbcs printdevice prompt pythondll quickfixtextfunc remap rl rubydll sc scrolljump selection shellpipe shiftround showmatch signcolumn smarttab sp spellsuggest sps sta su swb synmaxcol tagbsearch tal tcldll termwinscroll tf timeoutlen to tsl ttyfast tws ul ur ve vif vts wcr wi wildmenu winfixheight wiv wrap ws
-syn keyword vimOption contained	altkeymap arabicshape aw backupskip beval bk bri bufhidden cdpath cindent cm colorcolumn completeopt cp cscopeprg csprg culopt def diffexpr ea ei ep eventignore fdi fenc fileformat fkmap foldexpr foldopen fsync gfw guicursor guitabtooltip hidden hlg imactivatefunc imi inc inex isident keymap langnoremap linespace loadplugins ma matchtime mef mle modelineexpr mousehide mps nu opendevice paste pex pmbfn printencoding pt pythonhome quoteescape renderoptions rlc ruf scb scrolloff selectmode shellquote shiftwidth showmode siso smc spc spf sr stal sua swf syntax tagcase tb tenc termwinsize tfu title toolbar tsr ttym twsl undodir ut verbose viminfo wa wd wic wildmode winfixwidth wiw wrapmargin ww
-syn keyword vimOption contained	ambiwidth ari awa balloondelay bevalterm bkc briopt buflisted cedit cink cmdheight columns completepopup cpo cscopequickfix csqf cursorbind define diffopt ead ek equalalways ex fdl fencs fileformats flp foldignore foldtext ft ghr guifont helpfile highlight hls imactivatekey iminsert include inf isk keymodel langremap lisp lpl macatsui maxcombine menc mls modelines mousem msm number operatorfunc pastetoggle pexpr popt printexpr pumheight pythonthreedll rdt report rnu ruler scf scrollopt sessionoptions shellredir shm
-
-" vimOptions: These are the turn-off setting variants {{{2
-syn keyword vimOption contained	noacd noallowrevins noantialias noarabic noarshape noautoread noaw noballooneval nobevalterm nobk nobreakindent nocf nocindent nocopyindent nocscoperelative nocsre nocuc nocursorcolumn nodelcombine nodigraph noed noemo noeol noesckeys noexpandtab nofic nofixeol nofoldenable nogd nohid nohkmap nohls noicon noimc noimdisable noinfercase nojoinspaces nolangremap nolinebreak nolnr nolrm nomacatsui noml nomod nomodelineexpr nomodified nomousef nomousehide nonumber noopendevice nopi nopreviewwindow nopvw norelativenumber norestorescreen nori norl noro noru nosb noscb noscrollbind noscs nosft noshelltemp noshortname noshowfulltag noshowmode nosm nosmartindent nosmd nosol nosplitbelow nospr nossl nostartofline noswapfile nota notagrelative notbi notbs noterse notextmode notgst notimeout noto notr nottybuiltin notx noundofile novisualbell nowarn noweirdinvert nowfw nowildignorecase nowinfixheight nowiv nowrap nowrite nowritebackup
-syn keyword vimOption contained	noai noaltkeymap noar noarabicshape noautochdir noautowrite noawa noballoonevalterm nobin nobl nobri noci nocompatible nocp nocscopetag nocst nocul nocursorline nodg noea noedcompatible noemoji noequalalways noet noexrc nofileignorecase nofk nofs nogdefault nohidden nohkmapp nohlsearch noignorecase noimcmdline noincsearch noinsertmode nojs nolazyredraw nolisp noloadplugins nolz nomagic nomle nomodeline nomodifiable nomore nomousefocus nonu noodev nopaste nopreserveindent noprompt noreadonly noremap norevins norightleft nornu nors noruler nosc noscf noscrollfocus nosecure noshellslash noshiftround noshowcmd noshowmatch nosi nosmartcase nosmarttab nosn nospell nosplitright nosr nosta nostmp noswf notagbsearch notagstack notbidi notermbidi notextauto notf notildeop notitle notop nottimeout nottyfast noudf novb nowa nowb nowfh nowic nowildmenu nowinfixwidth nowmnu nowrapscan nowriteany nows
-syn keyword vimOption contained	noakm noanti noarab noari noautoindent noautowriteall nobackup nobeval nobinary nobomb nobuflisted nocin noconfirm nocrb nocscopeverbose nocsverb nocursorbind nodeco nodiff noeb noek noendofline noerrorbells noex nofen nofixendofline nofkmap nofsync noguipty nohk nohkp noic noim noimd noinf nois nolangnoremap nolbr nolist nolpl noma nomh
-
-" vimOptions: These are the invertible variants {{{2
-syn keyword vimOption contained	invacd invallowrevins invantialias invarabic invarshape invautoread invaw invballooneval invbevalterm invbk invbreakindent invcf invcindent invcopyindent invcscoperelative invcsre invcuc invcursorcolumn invdelcombine invdigraph inved invemo inveol invesckeys invexpandtab invfic invfixeol invfoldenable invgd invhid invhkmap invhls invicon invimc invimdisable invinfercase invjoinspaces invlangremap invlinebreak invlnr invlrm invmacatsui invml invmod invmodelineexpr invmodified invmousef invmousehide invnumber invopendevice invpi invpreviewwindow invpvw invrelativenumber invrestorescreen invri invrl invro invru invsb invscb invscrollbind invscs invsft invshelltemp invshortname invshowfulltag invshowmode invsm invsmartindent invsmd invsol invsplitbelow invspr invssl invstartofline invswapfile invta invtagrelative invtbi invtbs invterse invtextmode invtgst invtimeout invto invtr invttybuiltin invtx invundofile invvisualbell invwarn invweirdinvert invwfw invwildignorecase invwinfixheight invwiv invwrap invwrite invwritebackup
-syn keyword vimOption contained	invai invaltkeymap invar invarabicshape invautochdir invautowrite invawa invballoonevalterm invbin invbl invbri invci invcompatible invcp invcscopetag invcst invcul invcursorline invdg invea invedcompatible invemoji invequalalways invet invexrc invfileignorecase invfk invfs invgdefault invhidden invhkmapp invhlsearch invignorecase invimcmdline invincsearch invinsertmode invjs invlazyredraw invlisp invloadplugins invlz invmagic invmle invmodeline invmodifiable invmore invmousefocus invnu invodev invpaste invpreserveindent invprompt invreadonly invremap invrevins invrightleft invrnu invrs invruler invsc invscf invscrollfocus invsecure invshellslash invshiftround invshowcmd invshowmatch invsi invsmartcase invsmarttab invsn invspell invsplitright invsr invsta invstmp invswf invtagbsearch invtagstack invtbidi invtermbidi invtextauto invtf invtildeop invtitle invtop invttimeout invttyfast invudf invvb invwa invwb invwfh invwic invwildmenu invwinfixwidth invwmnu invwrapscan invwriteany invws
-syn keyword vimOption contained	invakm invanti invarab invari invautoindent invautowriteall invbackup invbeval invbinary invbomb invbuflisted invcin invconfirm invcrb invcscopeverbose invcsverb invcursorbind invdeco invdiff inveb invek invendofline inverrorbells invex invfen invfixendofline invfkmap invfsync invguipty invhk invhkp invic invim invimd invinf invis invlangnoremap invlbr invlist invlpl invma invmh
+syn keyword vimOnlyCommand contained	fix[del] op[en] sh[ell] P[rint]
+syn keyword vimStdPlugin contained	DiffOrig Man N[ext] S TOhtml XMLent XMLns
+
+" Vim-specific options {{{2
+syn keyword vimOnlyOption contained	biosk bioskey cp compatible consk conskey cm cryptmethod edcompatible guipty key macatsui mzq mzquantum osfiletype oft renderoptions rop st shelltype sn shortname tenc termencoding ta textauto tx textmode tf ttyfast ttym ttymouse tbi ttybuiltin wiv weirdinvert
+
+" Turn-off setting variants
+syn keyword vimOnlyOption contained	nobiosk nobioskey noconsk noconskey nocp nocompatible noguipty nomacatsui nosn noshortname nota notextauto notx notextmode notf nottyfast notbi nottybuiltin nowiv noweirdinvert
 
+" Invertible setting variants
+syn keyword vimOnlyOption contained	invbiosk invbioskey invconsk invconskey invcp invcompatible invguipty invmacatsui invsn invshortname invta invtextauto invtx invtextmode invtf invttyfast invtbi invttybuiltin invwiv invweirdinvert
 " termcap codes (which can also be set) {{{2
-syn keyword vimOption contained	t_8b t_8u t_AF t_AL t_bc t_BE t_ce t_cl t_Co t_Cs t_CV t_db t_DL t_EI t_F2 t_F4 t_F6 t_F8 t_fs t_IE t_k1 t_k2 t_K3 t_K4 t_K5 t_K6 t_K7 t_K8 t_K9 t_kb t_KB t_kd t_KD t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_PE t_PS t_RB t_RC t_RF t_Ri t_RI t_RS t_RT t_RV t_Sb t_SC t_se t_Sf t_SH t_Si t_SI t_so t_sr t_SR t_ST t_te t_Te t_TE t_ti t_TI t_ts t_Ts t_u7 t_ue t_us t_ut t_vb t_ve t_vi t_vs t_VS t_WP t_WS t_xn t_xs t_ZH t_ZR
-syn keyword vimOption contained	t_8f t_AB t_al t_AU t_BD t_cd t_Ce t_cm t_cs t_CS t_da t_dl t_EC t_F1 t_F3 t_F5 t_F7 t_F9 t_GP t_IS t_K1 t_k3 t_k4 t_k5 t_k6 t_k7 t_k8 t_k9 t_KA t_kB t_KC t_kD t_ke
-syn match   vimOption contained	"t_%1"
-syn match   vimOption contained	"t_#2"
-syn match   vimOption contained	"t_#4"
-syn match   vimOption contained	"t_@7"
-syn match   vimOption contained	"t_*7"
-syn match   vimOption contained	"t_&8"
-syn match   vimOption contained	"t_%i"
-syn match   vimOption contained	"t_k;"
-
-" unsupported settings: some were supported by vi but don't do anything in vim {{{2
-" others have been dropped along with msdos support
-syn keyword vimErrSetting contained	bioskey biosk conskey consk autoprint beautify flash graphic hardtabs mesg novice open op optimize redraw slow slowopen sourceany w300 w1200 w9600 hardtabs ht nobioskey nobiosk noconskey noconsk noautoprint nobeautify noflash nographic nohardtabs nomesg nonovice noopen noop nooptimize noredraw noslow noslowopen nosourceany now300 now1200 now9600 w1200 w300 w9600
-
-" AutoCmd Events {{{2
+syn keyword vimTermOption contained	t_8b t_AB t_al t_bc t_ce t_cl t_Co t_Cs t_CV t_db t_DL t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_fs t_IE t_IS t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_ke t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RB t_RI t_RV t_Sb t_se t_Sf t_SI t_so t_sr t_SR t_te t_ti t_ts t_u7 t_ue t_us t_ut t_vb t_ve t_vi t_vs t_WP t_WS t_xn t_xs t_ZH t_ZR
+syn keyword vimTermOption contained	t_8f t_AF t_AL t_cd t_Ce t_cm t_cs t_CS t_da t_dl t_EI
+syn match   vimTermOption contained	"t_%1"
+syn match   vimTermOption contained	"t_#2"
+syn match   vimTermOption contained	"t_#4"
+syn match   vimTermOption contained	"t_@7"
+syn match   vimTermOption contained	"t_*7"
+syn match   vimTermOption contained	"t_&8"
+syn match   vimTermOption contained	"t_%i"
+syn match   vimTermOption contained	"t_k;"
+
+" unsupported settings: these are supported by vi but don't do anything in vim {{{2
+syn keyword vimErrSetting contained	hardtabs ht w1200 w300 w9600 
+"}}}2
 syn case ignore
-syn keyword vimAutoEvent contained	BufAdd BufDelete BufFilePost BufHidden BufNew BufRead BufReadPost BufUnload BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre CmdlineChanged CmdlineEnter CmdlineLeave CmdUndefined CmdwinEnter CmdwinLeave ColorScheme ColorSchemePre CompleteChanged CompleteDone CompleteDonePre CursorHold CursorHoldI CursorMoved CursorMovedI DiffUpdated DirChanged EncodingChanged ExitPre FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileChangedShellPost FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter GUIFailed InsertChange InsertCharPre InsertEnter InsertLeave MenuPopup OptionSet QuickFixCmdPost QuickFixCmdPre QuitPre RemoteReply SafeState SafeStateAgain SessionLoadPost ShellCmdPost ShellFilterPost SigUSR1 SourceCmd SourcePost SourcePre SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TabClosed TabEnter TabLeave TabNew TermChanged TerminalOpen TerminalWinOpen TermResponse TextChanged TextChangedI TextChangedP TextYankPost User VimEnter VimLeave VimLeavePre VimResized WinEnter WinLeave WinNew
-syn keyword vimAutoEvent contained	BufCreate BufEnter BufFilePre BufLeave BufNewFile BufReadCmd BufReadPre BufWinEnter
-
 " Highlight commonly used Groupnames {{{2
-syn keyword vimGroup contained	Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo
+syn keyword vimGroup contained	Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo 
 
 " Default highlighting groups {{{2
-syn keyword vimHLGroup contained	ColorColumn Cursor CursorColumn CursorIM CursorLine CursorLineNr DiffAdd DiffChange DiffDelete DiffText Directory EndOfBuffer ErrorMsg FoldColumn Folded IncSearch LineNr LineNrAbove LineNrBelow MatchParen Menu ModeMsg MoreMsg NonText Normal Pmenu PmenuSbar PmenuSel PmenuThumb Question QuickFixLine Scrollbar Search SignColumn SpecialKey SpellBad SpellCap SpellLocal SpellRare StatusLine StatusLineNC StatusLineTerm TabLine TabLineFill TabLineSel Terminal Title Tooltip VertSplit Visual VisualNOS WarningMsg WildMenu
+syn keyword vimHLGroup contained	ColorColumn Cursor CursorColumn CursorIM CursorLine CursorLineNr DiffAdd DiffChange DiffDelete DiffText Directory EndOfBuffer ErrorMsg FoldColumn Folded IncSearch LineNr MatchParen Menu ModeMsg MoreMsg NonText Normal Pmenu PmenuSbar PmenuSel PmenuThumb Question Scrollbar Search SignColumn SpecialKey SpellBad SpellCap SpellLocal SpellRare StatusLine StatusLineNC TabLine TabLineFill TabLineSel Title Tooltip VertSplit Visual WarningMsg WildMenu 
 syn match vimHLGroup contained	"Conceal"
+syn keyword vimOnlyHLGroup contained	VisualNOS
+syn keyword nvimHLGroup contained	Substitute TermCursor TermCursorNC QuickFixLine
+"}}}2
 syn case match
-
-" Function Names {{{2
-syn keyword vimFuncName contained	abs appendbufline asin assert_fails assert_notmatch balloon_gettext bufadd bufname byteidx char2nr ch_evalexpr ch_log ch_readraw cindent complete_check cosh deepcopy diff_hlID eval exists feedkeys findfile fnameescape foldtext garbagecollect getchangelist getcmdpos getcwd getftime getloclist getpos gettabinfo getwinpos glob2regpat hasmapto hlexists index inputsave isdirectory job_getchannel job_stop json_encode line listener_flush luaeval match matchend menu_info nextnonblank popup_atcursor popup_dialog popup_getoptions popup_menu popup_show prompt_setinterrupt prop_list prop_type_get pyeval readdirex reltime remote_peek rename rubyeval screenpos searchdecl serverlist setenv setpos settagstack sign_define sign_placelist sin sound_playevent split str2list strftime strpart submatch synID systemlist taglist term_dumpload term_getcursor term_getstatus term_scrape term_setrestore test_autochdir test_ignore_error test_null_job test_override test_srand_seed timer_start tr undotree wildmenumode win_execute win_gotoid winlayout winrestview winwidth
-syn keyword vimFuncName contained	acos argc assert_beeps assert_false assert_report balloon_show bufexists bufnr byteidxcomp ch_canread ch_evalraw ch_logfile ch_sendexpr clearmatches complete_info count delete echoraw eventhandler exp filereadable flatten fnamemodify foldtextresult get getchar getcmdtype getenv getftype getmarklist getqflist gettabvar getwinposx globpath histadd hlID input inputsecret isinf job_info join keys line2byte listener_remove map matchadd matchlist min nr2char popup_beval popup_filter_menu popup_getpos popup_move pow prompt_setprompt prop_remove prop_type_list pyxeval readfile reltimefloat remote_read repeat screenattr screenrow searchpair setbufline setfperm setqflist setwinvar sign_getdefined sign_undefine sinh sound_playfile sqrt str2nr strgetchar strptime substitute synIDattr tabpagebuflist tan term_dumpwrite term_getjob term_gettitle term_sendkeys term_setsize test_feedinput test_null_blob test_null_list test_refcount test_unknown timer_stop trim uniq winbufnr win_findbuf winheight winline winsaveview wordcount
-syn keyword vimFuncName contained	add argidx assert_equal assert_inrange assert_true balloon_split buflisted bufwinid call ch_close ch_getbufnr ch_open ch_sendraw col confirm cscope_connection deletebufline empty executable expand filewritable float2nr foldclosed foreground getbufinfo getcharmod getcmdwintype getfontname getimstatus getmatches getreg gettabwinvar getwinposy has histdel hostname inputdialog insert islocked job_setoptions js_decode len lispindent localtime maparg matchaddpos matchstr mkdir or popup_clear popup_filter_yesno popup_hide popup_notification prevnonblank prop_add prop_type_add pum_getpos rand reduce reltimestr remote_send resolve screenchar screenstring searchpairpos setbufvar setline setreg sha256 sign_getplaced sign_unplace sort sound_stop srand strcharpart stridx strridx swapinfo synIDtrans tabpagenr tanh term_getaltscreen term_getline term_gettty term_setansicolors term_start test_garbagecollect_now test_null_channel test_null_partial test_scrollbar test_void timer_stopall trunc values wincol win_getid win_id2tabwin winnr win_screenpos writefile
-syn keyword vimFuncName contained	and arglistid assert_equalfile assert_match atan browse bufload bufwinnr ceil ch_close_in ch_getjob ch_read ch_setoptions complete copy cursor did_filetype environ execute expandcmd filter floor foldclosedend funcref getbufline getcharsearch getcompletion getfperm getjumplist getmousepos getreginfo gettagstack getwinvar has_key histget iconv inputlist interrupt isnan job_start js_encode libcall list2str log mapcheck matcharg matchstrpos mode pathshorten popup_close popup_findinfo popup_list popup_setoptions printf prop_clear prop_type_change pumvisible range reg_executing remote_expr remote_startserver reverse screenchars search searchpos setcharsearch setloclist settabvar shellescape sign_jump sign_unplacelist sound_clear spellbadword state strchars string strtrans swapname synstack tabpagewinnr tempname term_getansicolors term_getscrolled terminalprops term_setapi term_wait test_garbagecollect_soon test_null_dict test_null_string test_setmouse timer_info tolower type virtcol windowsversion win_gettype win_id2win winrestcmd win_splitmove xor
-syn keyword vimFuncName contained	append argv assert_exception assert_notequal atan2 browsedir bufloaded byte2line changenr chdir ch_info ch_readblob ch_status complete_add cos debugbreak diff_filler escape exepath extend finddir fmod foldlevel function getbufvar getcmdline getcurpos getfsize getline getpid getregtype getwininfo glob haslocaldir histnr indent inputrestore invert items job_status json_decode libcallnr listener_add log10 mapset matchdelete max mzeval perleval popup_create popup_findpreview popup_locate popup_settext prompt_setcallback prop_find prop_type_delete py3eval readdir reg_recording remote_foreground remove round screencol searchcount server2client setcmdpos setmatches settabwinvar shiftwidth sign_place simplify soundfold spellsuggest str2float strdisplaywidth strlen strwidth synconcealed system tagfiles term_dumpdiff term_getattr term_getsize term_list term_setkill test_alloc_fail test_getvalue test_null_function test_option_not_set test_settime timer_pause toupper undofile visualmode
-
-"--- syntax here and above generated by mkvimvim ---
 " Special Vim Highlighting (not automatic) {{{1
 
-" Set up folding commands {{{2
-if exists("g:vimsyn_folding") && g:vimsyn_folding =~# '[afhlmpPrt]'
+" Set up folding commands
+if exists("g:vimsyn_folding") && g:vimsyn_folding =~# '[aflmpPrt]'
  if g:vimsyn_folding =~# 'a'
   com! -nargs=* VimFolda <args> fold
  else
@@ -101,11 +75,6 @@ if exists("g:vimsyn_folding") && g:vimsyn_folding =~# '[afhlmpPrt]'
  else
   com! -nargs=* VimFoldf <args>
  endif
- if g:vimsyn_folding =~# 'h'
-  com! -nargs=* VimFoldh <args> fold
- else
-  com! -nargs=* VimFoldh <args>
- endif
  if g:vimsyn_folding =~# 'l'
   com! -nargs=* VimFoldl <args> fold
  else
@@ -116,10 +85,10 @@ if exists("g:vimsyn_folding") && g:vimsyn_folding =~# '[afhlmpPrt]'
  else
   com! -nargs=* VimFoldm <args>
  endif
- if g:vimsyn_folding =~# 'p'
-  com! -nargs=* VimFoldp <args> fold
- else
-  com! -nargs=* VimFoldp <args>
+ if g:vimsyn_folding =~# 'p' 
+  com! -nargs=* VimFoldp <args> fold 
+ else 
+  com! -nargs=* VimFoldp <args> 
  endif
  if g:vimsyn_folding =~# 'P'
   com! -nargs=* VimFoldP <args> fold
@@ -139,7 +108,6 @@ if exists("g:vimsyn_folding") && g:vimsyn_folding =~# '[afhlmpPrt]'
 else
  com! -nargs=*	VimFolda	<args>
  com! -nargs=*	VimFoldf	<args>
- com! -nargs=*	VimFoldh	<args>
  com! -nargs=*	VimFoldl	<args>
  com! -nargs=*	VimFoldm	<args>
  com! -nargs=*	VimFoldp	<args>
@@ -148,7 +116,7 @@ else
  com! -nargs=*	VimFoldt	<args>
 endif
 
-" commands not picked up by the generator (due to non-standard format) {{{2
+" commands not picked up by the generator (due to non-standard format)
 syn keyword vimCommand contained	py3
 
 " Deprecated variable options {{{2
@@ -171,10 +139,10 @@ endif
 
 " Numbers {{{2
 " =======
-syn match vimNumber	"\<\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\=" skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
-syn match vimNumber	"-\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\="  skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
-syn match vimNumber	"\<0[xX]\x\+"		       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
-syn match vimNumber	"\%(^\|\A\)\zs#\x\{6}"             	       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment,vim9Comment
+syn match vimNumber	"\<\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\=" skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment
+syn match vimNumber	"-\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\="  skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment
+syn match vimNumber	"\<0[xX]\x\+"		       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment
+syn match vimNumber	"\%(^\|\A\)\zs#\x\{6}"             	       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment
 
 " All vimCommands are contained by vimIsCommand. {{{2
 syn match vimCmdSep	"[:|]\+"	skipwhite nextgroup=vimAddress,vimAutoCmd,vimEcho,vimIsCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd
@@ -211,7 +179,7 @@ syn keyword vimFTOption contained	detect indent off on plugin
 
 " Augroup : vimAugroupError removed because long augroups caused sync'ing problems. {{{2
 " ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking.
-syn cluster vimAugroupList	contains=vimAugroup,vimIsCommand,vimUserCmd,vimExecute,vimNotFunc,vimFuncName,vimFunction,vimFunctionError,vimLineComment,vimNotFunc,vimMap,vimSpecFile,vimOper,vimNumber,vimOperParen,vimComment,vim9Comment,vimString,vimSubst,vimMark,vimRegister,vimAddress,vimFilter,vimCmplxRepeat,vimComment,vim9Comment,vimLet,vimSet,vimAutoCmd,vimRegion,vimSynLine,vimNotation,vimCtrlChar,vimFuncVar,vimContinue,vimSetEqual,vimOption
+syn cluster vimAugroupList	contains=vimAugroup,vimIsCommand,vimUserCmd,vimExecute,vimNotFunc,vimFuncName,vimFunction,vimFunctionError,vimLineComment,vimNotFunc,vimMap,vimSpecFile,vimOper,vimNumber,vimOperParen,vimComment,vimString,vimSubst,vimMark,vimRegister,vimAddress,vimFilter,vimCmplxRepeat,vimComment,vimLet,vimSet,vimAutoCmd,vimRegion,vimSynLine,vimNotation,vimCtrlChar,vimFuncVar,vimContinue,vimSetEqual,vimOption
 if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'a'
  syn region  vimAugroup	fold matchgroup=vimAugroupKey start="\<aug\%[roup]\>\ze\s\+\K\k*" end="\<aug\%[roup]\>\ze\s\+[eE][nN][dD]\>"	contains=vimAutoCmd,@vimAugroupList
 else
@@ -225,11 +193,11 @@ syn keyword vimAugroupKey contained	aug[roup]
 
 " Operators: {{{2
 " =========
-syn cluster	vimOperGroup	contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperParen,vimNumber,vimString,vimRegister,vimContinue,vim9Comment
+syn cluster	vimOperGroup	contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperParen,vimNumber,vimString,vimRegister,vimContinue
 syn match	vimOper	"\%#=1\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}"	skipwhite nextgroup=vimString,vimSpecFile
 syn match	vimOper	"\(\<is\|\<isnot\)[?#]\{0,2}\>"			skipwhite nextgroup=vimString,vimSpecFile
 syn match	vimOper	"||\|&&\|[-+.!]"				skipwhite nextgroup=vimString,vimSpecFile
-syn region	vimOperParen 	matchgroup=vimParenSep	start="(" end=")" contains=vimoperStar,@vimOperGroup
+syn region	vimOperParen 	matchgroup=vimParenSep	start="(" end=")" contains=@vimOperGroup
 syn region	vimOperParen	matchgroup=vimSep		start="{" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar
 if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror")
  syn match	vimOperError	")"
@@ -238,18 +206,17 @@ endif
 " Functions : Tag is provided for those who wish to highlight tagged functions {{{2
 " =========
 syn cluster	vimFuncList	contains=vimCommand,vimFunctionError,vimFuncKey,Tag,vimFuncSID
-syn cluster	vimFuncBodyList	contains=vimAbb,vimAddress,vimAugroupKey,vimAutoCmd,vimCmplxRepeat,vimComment,vim9Comment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimEnvvar,vimExecute,vimIsCommand,vimFBVar,vimFunc,vimFunction,vimFuncVar,vimGlobal,vimHighlight,vimIsCommand,vimLet,vimLetHereDoc,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSearch,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUnmap,vimUserCommand
-syn match	vimFunction	"\<\(fu\%[nction]\|def\)!\=\s\+\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\=\%(\i\|[#.]\|{.\{-1,}}\)*\ze\s*("	contains=@vimFuncList nextgroup=vimFuncBody
+syn cluster	vimFuncBodyList	contains=vimAbb,vimAddress,vimAugroupKey,vimAutoCmd,vimCmplxRepeat,vimComment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimExecute,vimIsCommand,vimFBVar,vimFunc,vimFunction,vimFuncVar,vimGlobal,vimHighlight,vimIsCommand,vimLet,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSearch,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUnmap,vimUserCommand
+syn match	vimFunction	"\<fu\%[nction]!\=\s\+\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\=\%(\i\|[#.]\|{.\{-1,}}\)*\ze\s*("	contains=@vimFuncList nextgroup=vimFuncBody
 
 if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f'
- syn region	vimFuncBody  contained	fold start="\ze\s*("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\|enddef\>\)"		contains=@vimFuncBodyList
+ syn region	vimFuncBody  contained	fold start="\ze\s*("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\)"		contains=@vimFuncBodyList
 else
- syn region	vimFuncBody  contained	start="\ze\s*("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\|enddef\>\)"		contains=@vimFuncBodyList
+ syn region	vimFuncBody  contained	start="\ze\s*("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\)"		contains=@vimFuncBodyList
 endif
 syn match	vimFuncVar   contained	"a:\(\K\k*\|\d\+\)"
 syn match	vimFuncSID   contained	"\c<sid>\|\<s:"
 syn keyword	vimFuncKey   contained	fu[nction]
-syn keyword	vimFuncKey   contained	def
 syn match	vimFuncBlank contained	"\s\+"
 
 syn keyword	vimPattern   contained	start	skip	end
@@ -266,9 +233,9 @@ syn match	vimSpecFileMod	"\(:[phtre]\)\+"	contained
 
 " User-Specified Commands: {{{2
 " =======================
-syn cluster	vimUserCmdList	contains=vimAddress,vimSyntax,vimHighlight,vimAutoCmd,vimCmplxRepeat,vimComment,vim9Comment,vimCtrlChar,vimEscapeBrace,vimFunc,vimFuncName,vimFunction,vimFunctionError,vimIsCommand,vimMark,vimNotation,vimNumber,vimOper,vimRegion,vimRegister,vimLet,vimSet,vimSetEqual,vimSetString,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange,vimSynLine
+syn cluster	vimUserCmdList	contains=vimAddress,vimSyntax,vimHighlight,vimAutoCmd,vimCmplxRepeat,vimComment,vimCtrlChar,vimEscapeBrace,vimFunc,vimFuncName,vimFunction,vimFunctionError,vimIsCommand,vimMark,vimNotation,vimNumber,vimOper,vimRegion,vimRegister,vimLet,vimSet,vimSetEqual,vimSetString,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange,vimSynLine
 syn keyword	vimUserCommand	contained	com[mand]
-syn match	vimUserCmd	"\<com\%[mand]!\=\>.*$"	contains=vimUserAttrb,vimUserAttrbError,vimUserCommand,@vimUserCmdList,vimComFilter
+syn match	vimUserCmd	"\<com\%[mand]!\=\>.*$"	contains=vimUserAttrb,vimUserAttrbError,vimUserCommand,@vimUserCmdList
 syn match	vimUserAttrbError	contained	"-\a\+\ze\s"
 syn match	vimUserAttrb	contained	"-nargs=[01*?+]"	contains=vimUserAttrbKey,vimOper
 syn match	vimUserAttrb	contained	"-complete="		contains=vimUserAttrbKey,vimOper nextgroup=vimUserAttrbCmplt,vimUserCmdError
@@ -296,14 +263,6 @@ syn match	vimComment	excludenl +\s"[^\-:.%#=*].*$+lc=1	contains=@vimCommentGroup
 syn match	vimComment	+\<endif\s\+".*$+lc=5	contains=@vimCommentGroup,vimCommentString
 syn match	vimComment	+\<else\s\+".*$+lc=4	contains=@vimCommentGroup,vimCommentString
 syn region	vimCommentString	contained oneline start='\S\s\+"'ms=e	end='"'
-" Vim9 comments - TODO: might be highlighted while they don't work
-syn match	vim9Comment	excludenl +\s#[^{].*$+lc=1	contains=@vimCommentGroup,vimCommentString
-syn match	vim9Comment	+\<endif\s\+#[^{].*$+lc=5	contains=@vimCommentGroup,vimCommentString
-syn match	vim9Comment	+\<else\s\+#[^{].*$+lc=4	contains=@vimCommentGroup,vimCommentString
-" Vim9 comment inside expression
-syn match	vim9Comment	+\s\zs#[^{].*$+ms=s+1	contains=@vimCommentGroup,vimCommentString
-syn match	vim9Comment	+^\s*#[^{].*$+	contains=@vimCommentGroup,vimCommentString
-syn match	vim9Comment	+^\s*#$+	contains=@vimCommentGroup,vimCommentString
 
 " Environment Variables: {{{2
 " =====================
@@ -324,7 +283,7 @@ syn region	vimString	oneline keepend	start=+[^a-zA-Z>!\\@]"+lc=1 skip=+\\\\\|\\"
 syn region	vimString	oneline keepend	start=+[^a-zA-Z>!\\@]'+lc=1 end=+'+
 syn region	vimString	oneline	start=+=!+lc=1	skip=+\\\\\|\\!+ end=+!+	contains=@vimStringGroup
 syn region	vimString	oneline	start="=+"lc=1	skip="\\\\\|\\+" end="+"	contains=@vimStringGroup
-"syn region	vimString	oneline	start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/"	contains=@vimStringGroup  " see tst45.vim
+syn region	vimString	oneline	start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/"	contains=@vimStringGroup
 syn match	vimString	contained	+"[^"]*\\$+	skipnl nextgroup=vimStringCont
 syn match	vimStringCont	contained	+\(\\\\\|.\)\{-}[^\\]"+
 
@@ -334,8 +293,7 @@ syn cluster	vimSubstList	contains=vimPatSep,vimPatRegion,vimPatSepErr,vimSubstTw
 syn cluster	vimSubstRepList	contains=vimSubstSubstr,vimSubstTwoBS,vimNotation
 syn cluster	vimSubstList	add=vimCollection
 syn match	vimSubst	"\(:\+\s*\|^\s*\||\s*\)\<\%(\<s\%[ubstitute]\>\|\<sm\%[agic]\>\|\<sno\%[magic]\>\)[:#[:alpha:]]\@!" nextgroup=vimSubstPat
-"syn match	vimSubst	"\%(^\|[^\\]\)\<s\%[ubstitute]\>[:#[:alpha:]]\@!"	nextgroup=vimSubstPat contained
-syn match	vimSubst	"\%(^\|[^\\\"']\)\<s\%[ubstitute]\>[:#[:alpha:]\"']\@!"	nextgroup=vimSubstPat contained
+syn match	vimSubst	"\%(^\|[^\\]\)\<s\%[ubstitute]\>[:#[:alpha:]]\@!"	nextgroup=vimSubstPat contained
 syn match	vimSubst	"/\zs\<s\%[ubstitute]\>\ze/"		nextgroup=vimSubstPat
 syn match	vimSubst	"\(:\+\s*\|^\s*\)s\ze#.\{-}#.\{-}#"		nextgroup=vimSubstPat
 syn match	vimSubst1       contained	"\<s\%[ubstitute]\>"	nextgroup=vimSubstPat
@@ -348,7 +306,7 @@ syn match	vimCollClass    contained transparent	"\%#=1\[:\(alnum\|alpha\|blank\|
 syn match	vimSubstSubstr  contained	"\\z\=\d"
 syn match	vimSubstTwoBS   contained	"\\\\"
 syn match	vimSubstFlagErr contained	"[^< \t\r|]\+" contains=vimSubstFlags
-syn match	vimSubstFlags   contained	"[&cegiIlnpr#]\+"
+syn match	vimSubstFlags   contained	"[&cegiIpr]\+"
 
 " 'String': {{{2
 syn match	vimString	"[^(,]'[^']\{-}\zs'"
@@ -373,53 +331,51 @@ syn match	vimAddress	",\zs[.$]"	skipwhite nextgroup=vimSubst1
 syn match	vimAddress	"%\ze\a"	skipwhite nextgroup=vimString,vimSubst1
 
 syn match	vimFilter 		"^!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=vimOper,vimSpecFile
-syn match	vimFilter    contained	"!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=vimOper,vimSpecFile
-syn match	vimComFilter contained	"|!!\=[^"]\{-}\(|\|\ze\"\|$\)"      contains=vimOper,vimSpecFile
+syn match	vimFilter contained	"!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=vimOper,vimSpecFile
 
-" Complex Repeats: (:h complex-repeat) {{{2
-" ===============
+" Complex repeats (:h complex-repeat) {{{2
 syn match	vimCmplxRepeat	'[^a-zA-Z_/\\()]q[0-9a-zA-Z"]\>'lc=1
 syn match	vimCmplxRepeat	'@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\>\)'
 
 " Set command and associated set-options (vimOptions) with comment {{{2
-syn region	vimSet		matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skip="\%(\\\\\)*\\." end="$" end="|" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vim9Comment,vimSetString,vimSetMod
+syn region	vimSet		matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skip="\%(\\\\\)*\\." end="$" end="|" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod
 syn region	vimSetEqual	contained	start="[=:]\|[-+^]=" skip="\\\\\|\\\s" end="[| \t]\|$"me=e-1	contains=vimCtrlChar,vimSetSep,vimNotation,vimEnvvar oneline
 syn region	vimSetString	contained	start=+="+hs=s+1	skip=+\\\\\|\\"+  end=+"+		contains=vimCtrlChar
 syn match	vimSetSep	contained	"[,:]" skipwhite nextgroup=vimCommand
 syn match	vimSetMod	contained	"&vim\=\|[!&?<]\|all&"
 
-" Let: {{{2
+" Let {{{2
 " ===
-syn keyword	vimLet	let var	unl[et]	skipwhite nextgroup=vimVar,vimFuncVar,vimLetHereDoc
-VimFoldh syn region vimLetHereDoc	matchgroup=vimLetHereDocStart start='=<<\s\+\%(trim\>\)\=\s*\z(\L\S*\)'	matchgroup=vimLetHereDocStop end='^\s*\z1\s*$'	contains=vimComment,vim9Comment
+syn keyword	vimLet	let	unl[et]	skipwhite nextgroup=vimVar,vimFuncVar
 
-" Abbreviations: {{{2
+" Abbreviations {{{2
 " =============
 syn keyword vimAbb	ab[breviate] ca[bbrev] inorea[bbrev] cnorea[bbrev] norea[bbrev] ia[bbrev] skipwhite nextgroup=vimMapMod,vimMapLhs
 
-" Autocmd: {{{2
+" Autocmd {{{2
 " =======
-syn match	vimAutoEventList	contained	"\(!\s\+\)\=\(\a\+,\)*\a\+"	contains=vimAutoEvent nextgroup=vimAutoCmdSpace
+syn match	vimAutoEventList	contained	"\(!\s\+\)\=\(\a\+,\)*\a\+"	contains=vimAutoEvent,nvimAutoEvent nextgroup=vimAutoCmdSpace
 syn match	vimAutoCmdSpace	contained	"\s\+"	nextgroup=vimAutoCmdSfxList
-syn match	vimAutoCmdSfxList	contained	"\S*"	skipwhite nextgroup=vimAutoCmdMod
+syn match	vimAutoCmdSfxList	contained	"\S*"
 syn keyword	vimAutoCmd	au[tocmd] do[autocmd] doautoa[ll]	skipwhite nextgroup=vimAutoEventList
-syn match	vimAutoCmdMod	"\(++\)\=\(once\|nested\)"
 
-" Echo And Execute: -- prefer strings! {{{2
+" Echo and Execute -- prefer strings! {{{2
 " ================
 syn region	vimEcho	oneline excludenl matchgroup=vimCommand start="\<ec\%[ho]\>" skip="\(\\\\\)*\\|" end="$\||" contains=vimFunc,vimFuncVar,vimString,vimVar
 syn region	vimExecute	oneline excludenl matchgroup=vimCommand start="\<exe\%[cute]\>" skip="\(\\\\\)*\\|" end="$\||\|<[cC][rR]>" contains=vimFuncVar,vimIsCommand,vimOper,vimNotation,vimOperParen,vimString,vimVar
-syn match	vimEchoHL	"echohl\="	skipwhite nextgroup=vimGroup,vimHLGroup,vimEchoHLNone
+syn match	vimEchoHL	"echohl\="	skipwhite nextgroup=vimGroup,vimHLGroup,vimEchoHLNone,vimOnlyHLGroup,nvimHLGroup
 syn case ignore
 syn keyword	vimEchoHLNone	none
 syn case match
 
-" Maps: {{{2
+" Maps {{{2
 " ====
 syn match	vimMap		"\<map\>!\=\ze\s*[^(]" skipwhite nextgroup=vimMapMod,vimMapLhs
-syn keyword	vimMap		cm[ap] cno[remap] im[ap] ino[remap] lm[ap] ln[oremap] nm[ap] nn[oremap] no[remap] om[ap] ono[remap] smap snor[emap] tno[remap] tm[ap] vm[ap] vn[oremap] xm[ap] xn[oremap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
+syn keyword	vimMap		cm[ap] cno[remap] im[ap] ino[remap] lm[ap] ln[oremap] nm[ap] nn[oremap] no[remap] om[ap] ono[remap] smap snor[emap] vm[ap] vn[oremap] xm[ap] xn[oremap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
+syn keyword	nvimMap		tn[oremap] tm[ap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
 syn keyword	vimMap		mapc[lear] smapc[lear]
-syn keyword	vimUnmap		cu[nmap] iu[nmap] lu[nmap] nun[map] ou[nmap] sunm[ap] tunma[p] unm[ap] unm[ap] vu[nmap] xu[nmap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
+syn keyword	vimUnmap		cu[nmap] iu[nmap] lu[nmap] nun[map] ou[nmap] sunm[ap] unm[ap] unm[ap] vu[nmap] xu[nmap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
+syn keyword	nvimUnmap 		tunm[ap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
 syn match	vimMapLhs	contained	"\S\+"			contains=vimNotation,vimCtrlChar skipwhite nextgroup=vimMapRhs
 syn match	vimMapBang	contained	"!"			skipwhite nextgroup=vimMapMod,vimMapLhs
 syn match	vimMapMod	contained	"\%#=1\c<\(buffer\|expr\|\(local\)\=leader\|nowait\|plug\|script\|sid\|unique\|silent\)\+>" contains=vimMapModKey,vimMapModErr skipwhite nextgroup=vimMapMod,vimMapLhs
@@ -429,7 +385,7 @@ syn case ignore
 syn keyword	vimMapModKey	contained	buffer	expr	leader	localleader	nowait	plug	script	sid	silent	unique
 syn case match
 
-" Menus: {{{2
+" Menus {{{2
 " =====
 syn cluster	vimMenuList contains=vimMenuBang,vimMenuPriority,vimMenuName,vimMenuMod
 syn keyword	vimCommand	am[enu] an[oremenu] aun[menu] cme[nu] cnoreme[nu] cunme[nu] ime[nu] inoreme[nu] iunme[nu] me[nu] nme[nu] nnoreme[nu] noreme[nu] nunme[nu] ome[nu] onoreme[nu] ounme[nu] unme[nu] vme[nu] vnoreme[nu] vunme[nu] skipwhite nextgroup=@vimMenuList
@@ -438,13 +394,13 @@ syn match	vimMenuPriority	"\d\+\(\.\d\+\)*"	contained skipwhite nextgroup=vimMen
 syn match	vimMenuNameMore	"\c\\\s\|<tab>\|\\\."	contained nextgroup=vimMenuName,vimMenuNameMore contains=vimNotation
 syn match	vimMenuMod    contained	"\c<\(script\|silent\)\+>"  skipwhite contains=vimMapModKey,vimMapModErr nextgroup=@vimMenuList
 syn match	vimMenuMap	"\s"	contained skipwhite nextgroup=vimMenuRhs
-syn match	vimMenuRhs	".*$"	contained contains=vimString,vimComment,vim9Comment,vimIsCommand
+syn match	vimMenuRhs	".*$"	contained contains=vimString,vimComment,vimIsCommand
 syn match	vimMenuBang	"!"	contained skipwhite nextgroup=@vimMenuList
 
-" Angle-Bracket Notation: (tnx to Michael Geddes) {{{2
+" Angle-Bracket Notation (tnx to Michael Geddes) {{{2
 " ======================
 syn case ignore
-syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([scamd]-\)\{0,4}x\=\(f\d\{1,2}\|[^ \t:]\|cr\|lf\|linefeed\|return\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|right\|left\|help\|undo\|insert\|ins\|mouse\|k\=home\|k\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|kpoint\|space\|k\=\(page\)\=\(\|down\|up\|k\d\>\)\)>" contains=vimBracket
+syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([scamd]-\)\{0,4}x\=\(f\d\{1,2}\|[^ \t:]\|cmd\|cr\|lf\|linefeed\|return\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|right\|left\|help\|undo\|insert\|ins\|mouse\|k\=home\|k\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|kpoint\|space\|k\=\(page\)\=\(\|down\|up\|k\d\>\)\)>" contains=vimBracket
 syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([scam2-4]-\)\{0,4}\(right\|left\|middle\)\(mouse\)\=\(drag\|release\)\=>"	contains=vimBracket
 syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\(bslash\|plug\|sid\|space\|bar\|nop\|nul\|lt\)>"			contains=vimBracket
 syn match	vimNotation	'\(\\\|<lt>\)\=<C-R>[0-9a-z"%#:.\-=]'he=e-1				contains=vimBracket
@@ -453,15 +409,12 @@ syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([cas]file\|abuf\|amatch\|cword\|cWO
 syn match	vimBracket contained	"[\\<>]"
 syn case match
 
-" User Function Highlighting: {{{2
+" User Function Highlighting {{{2
 " (following Gautam Iyer's suggestion)
 " ==========================
 syn match vimFunc		"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*("		contains=vimFuncName,vimUserFunc,vimExecute
 syn match vimUserFunc contained	"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\<if\>"	contains=vimNotation
 
-" User Command Highlighting: {{{2
-syn match vimUsrCmd	'^\s*\zs\u\w*.*$'
-
 " Errors And Warnings: {{{2
 " ====================
 if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimfunctionerror")
@@ -473,12 +426,12 @@ endif
 
 syn match vimNotFunc	"\<if\>\|\<el\%[seif]\>\|\<return\>\|\<while\>"	skipwhite nextgroup=vimOper,vimOperParen,vimVar,vimFunc,vimNotation
 
-" Norm: {{{2
+" Norm {{{2
 " ====
 syn match	vimNorm		"\<norm\%[al]!\=" skipwhite nextgroup=vimNormCmds
 syn match	vimNormCmds contained	".*$"
 
-" Syntax: {{{2
+" Syntax {{{2
 "=======
 syn match	vimGroupList	contained	"@\=[^ \t,]*"	contains=vimGroupSpecial,vimPatSep
 syn match	vimGroupList	contained	"@\=[^ \t,]*,"	nextgroup=vimGroupList contains=vimGroupSpecial,vimPatSep
@@ -491,8 +444,8 @@ syn match	vimSynContains	contained	"\<contain\(s\|edin\)="	nextgroup=vimGroupLis
 syn match	vimSynKeyContainedin	contained	"\<containedin="	nextgroup=vimGroupList
 syn match	vimSynNextgroup	contained	"nextgroup="	nextgroup=vimGroupList
 
-syn match	vimSyntax	"\<sy\%[ntax]\>"	contains=vimCommand skipwhite nextgroup=vimSynType,vimComment,vim9Comment
-syn match	vimAuSyntax	contained	"\s+sy\%[ntax]"	contains=vimCommand skipwhite nextgroup=vimSynType,vimComment,vim9Comment
+syn match	vimSyntax	"\<sy\%[ntax]\>"	contains=vimCommand skipwhite nextgroup=vimSynType,vimComment
+syn match	vimAuSyntax	contained	"\s+sy\%[ntax]"	contains=vimCommand skipwhite nextgroup=vimSynType,vimComment
 syn cluster vimFuncBodyList add=vimSyntax
 
 " Syntax: case {{{2
@@ -529,7 +482,7 @@ syn match	vimSynKeyOpt	contained	"\%#=1\<\(conceal\|contained\|transparent\|skip
 syn cluster vimFuncBodyList add=vimSynType
 
 " Syntax: match {{{2
-syn cluster	vimSynMtchGroup	contains=vimMtchComment,vimSynContains,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation,vim9Comment
+syn cluster	vimSynMtchGroup	contains=vimMtchComment,vimSynContains,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation
 syn keyword	vimSynType	contained	match	skipwhite nextgroup=vimSynMatchRegion
 syn region	vimSynMatchRegion	contained keepend	matchgroup=vimGroupName start="\h\w*" matchgroup=vimSep end="|\|$" contains=@vimSynMtchGroup
 syn match	vimSynMtchOpt	contained	"\%#=1\<\(conceal\|transparent\|contained\|excludenl\|keepend\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
@@ -549,7 +502,7 @@ syn keyword	vimSynType	contained	region	skipwhite nextgroup=vimSynRegion
 syn region	vimSynRegion	contained keepend	matchgroup=vimGroupName start="\h\w*" skip="\\\\\|\\|" end="|\|$" contains=@vimSynRegGroup
 syn match	vimSynRegOpt	contained	"\%#=1\<\(conceal\(ends\)\=\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|keepend\|oneline\|extend\|skipnl\|fold\)\>"
 syn match	vimSynReg	contained	"\(start\|skip\|end\)="he=e-1	nextgroup=vimSynRegPat
-syn match	vimSynMtchGrp	contained	"matchgroup="	nextgroup=vimGroup,vimHLGroup
+syn match	vimSynMtchGrp	contained	"matchgroup="	nextgroup=vimGroup,vimHLGroup,vimOnlyHLGroup,nvimHLGroup
 syn region	vimSynRegPat	contained extend	start="\z([-`~!@#$%^&*_=+;:'",./?]\)"  skip="\\\\\|\\\z1"  end="\z1"  contains=@vimSynRegPatGroup skipwhite nextgroup=vimSynPatMod,vimSynReg
 syn match	vimSynPatMod	contained	"\%#=1\(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\([-+]\d\+\)\="
 syn match	vimSynPatMod	contained	"\%#=1\(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\([-+]\d\+\)\=," nextgroup=vimSynPatMod
@@ -577,13 +530,13 @@ syn match	vimSyncKey	contained	"\<groupthere\|grouphere\>"	skipwhite nextgroup=v
 syn match	vimSyncGroup	contained	"\h\w*"	skipwhite	nextgroup=vimSynRegPat,vimSyncNone
 syn keyword	vimSyncNone	contained	NONE
 
-" Additional IsCommand: here by reasons of precedence {{{2
+" Additional IsCommand, here by reasons of precedence {{{2
 " ====================
 syn match	vimIsCommand	"<Bar>\s*\a\+"	transparent contains=vimCommand,vimNotation
 
-" Highlighting: {{{2
+" Highlighting {{{2
 " ============
-syn cluster	vimHighlightCluster		contains=vimHiLink,vimHiClear,vimHiKeyList,vimComment,vim9Comment
+syn cluster	vimHighlightCluster		contains=vimHiLink,vimHiClear,vimHiKeyList,vimComment
 if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimhictermerror")
  syn match	vimHiCtermError	contained	"\D\i*"
 endif
@@ -607,7 +560,7 @@ syn match	vimHiGuiFontname	contained	"'[a-zA-Z\-* ]\+'"
 syn match	vimHiGuiRgb	contained	"#\x\{6}"
 
 " Highlighting: hi group key=arg ... {{{2
-syn cluster	vimHiCluster contains=vimGroup,vimHiGroup,vimHiTerm,vimHiCTerm,vimHiStartStop,vimHiCtermFgBg,vimHiCtermul,vimHiGui,vimHiGuiFont,vimHiGuiFgBg,vimHiKeyError,vimNotation
+syn cluster	vimHiCluster contains=vimGroup,vimHiBlend,vimHiGroup,vimHiTerm,vimHiCTerm,vimHiStartStop,vimHiCtermFgBg,vimHiGui,vimHiGuiFont,vimHiGuiFgBg,vimHiKeyError,vimNotation
 syn region	vimHiKeyList	contained oneline start="\i\+" skip="\\\\\|\\|" end="$\||"	contains=@vimHiCluster
 if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_vimhikeyerror")
  syn match	vimHiKeyError	contained	"\i\+="he=e-1
@@ -616,11 +569,11 @@ syn match	vimHiTerm	contained	"\cterm="he=e-1		nextgroup=vimHiAttribList
 syn match	vimHiStartStop	contained	"\c\(start\|stop\)="he=e-1	nextgroup=vimHiTermcap,vimOption
 syn match	vimHiCTerm	contained	"\ccterm="he=e-1		nextgroup=vimHiAttribList
 syn match	vimHiCtermFgBg	contained	"\ccterm[fb]g="he=e-1	nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
-syn match	vimHiCtermul	contained	"\cctermul="he=e-1	nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
 syn match	vimHiGui	contained	"\cgui="he=e-1		nextgroup=vimHiAttribList
 syn match	vimHiGuiFont	contained	"\cfont="he=e-1		nextgroup=vimHiFontname
 syn match	vimHiGuiFgBg	contained	"\cgui\%([fb]g\|sp\)="he=e-1	nextgroup=vimHiGroup,vimHiGuiFontname,vimHiGuiRgb,vimFgBgAttrib
 syn match	vimHiTermcap	contained	"\S\+"		contains=vimNotation
+syn match	vimHiBlend	contained	"\cblend="he=e-1		nextgroup=vimHiNmbr
 syn match	vimHiNmbr	contained	'\d\+'
 
 " Highlight: clear {{{2
@@ -632,14 +585,13 @@ syn keyword	vimHiClear	contained	clear	nextgroup=vimHiGroup
 syn region	vimHiLink	contained oneline matchgroup=vimCommand start="\(\<hi\%[ghlight]\s\+\)\@<=\(\(def\%[ault]\s\+\)\=link\>\|\<def\>\)" end="$"	contains=@vimHiCluster
 syn cluster vimFuncBodyList add=vimHiLink
 
-" Control Characters: {{{2
+" Control Characters {{{2
 " ==================
 syn match	vimCtrlChar	"[
--]"
 
 " Beginners - Patterns that involve ^ {{{2
 " =========
 syn match	vimLineComment	+^[ \t:]*".*$+	contains=@vimCommentGroup,vimCommentString,vimCommentTitle
-syn match	vim9LineComment	+^[ \t]*#.*$+	contains=@vimCommentGroup,vimCommentString,vimCommentTitle
 syn match	vimCommentTitle	'"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1	contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup
 syn match	vimContinue	"^\s*\\"
 syn region	vimString	start="^\s*\\\z(['"]\)" skip='\\\\\|\\\z1' end="\z1" oneline keepend contains=@vimStringGroup,vimContinue
@@ -652,23 +604,21 @@ syn match	vimSearchDelim	'^\s*\zs[/?]\|[/?]$'	contained
 syn region	vimGlobal	matchgroup=Statement start='\<g\%[lobal]!\=/'  skip='\\.' end='/'	skipwhite nextgroup=vimSubst
 syn region	vimGlobal	matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' end='/'	skipwhite nextgroup=vimSubst
 
-" Embedded Scripts:  {{{2
-" ================
-"   perl,ruby     : Benoit Cerrina
-"   python,tcl    : Johannes Zellner
-"   mzscheme, lua : Charles Campbell
+" Scripts  : perl,ruby : Benoit Cerrina {{{2
+" =======    python,tcl: Johannes Zellner
+"            lua
 
 " Allows users to specify the type of embedded script highlighting
 " they want:  (perl/python/ruby/tcl support)
 "   g:vimsyn_embed == 0   : don't embed any scripts
-"   g:vimsyn_embed =~# 'l' : embed lua      (but only if vim supports it)
-"   g:vimsyn_embed =~# 'm' : embed mzscheme (but only if vim supports it)
-"   g:vimsyn_embed =~# 'p' : embed perl     (but only if vim supports it)
-"   g:vimsyn_embed =~# 'P' : embed python   (but only if vim supports it)
-"   g:vimsyn_embed =~# 'r' : embed ruby     (but only if vim supports it)
-"   g:vimsyn_embed =~# 't' : embed tcl      (but only if vim supports it)
+"   g:vimsyn_embed =~# 'l' : embed lua
+"   g:vimsyn_embed =~# 'm' : embed mzscheme
+"   g:vimsyn_embed =~# 'p' : embed perl
+"   g:vimsyn_embed =~# 'P' : embed python
+"   g:vimsyn_embed =~# 'r' : embed ruby
+"   g:vimsyn_embed =~# 't' : embed tcl
 if !exists("g:vimsyn_embed")
- let g:vimsyn_embed= "lmpPr"
+ let g:vimsyn_embed= 0
 endif
 
 " [-- lua --] {{{3
@@ -681,7 +631,7 @@ if !filereadable(s:luapath)
   endif
  endfor
 endif
-if (g:vimsyn_embed =~# 'l' && has("lua")) && filereadable(s:luapath)
+if g:vimsyn_embed =~# 'l' && filereadable(s:luapath)
  unlet! b:current_syntax
  syn cluster vimFuncBodyList	add=vimLuaRegion
  exe "syn include @vimLuaScript ".s:luapath
@@ -704,10 +654,12 @@ if !filereadable(s:perlpath)
   endif
  endfor
 endif
-if (g:vimsyn_embed =~# 'p' && has("perl")) && filereadable(s:perlpath)
+if g:vimsyn_embed =~# 'p' && filereadable(s:perlpath)
  unlet! b:current_syntax
  syn cluster vimFuncBodyList	add=vimPerlRegion
+ let s:foldmethod = &l:foldmethod
  exe "syn include @vimPerlScript ".s:perlpath
+ let &l:foldmethod = s:foldmethod
  VimFoldp syn region vimPerlRegion  matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*\z(\S*\)\ze\(\s*["#].*\)\=$+ end=+^\z1\ze\(\s*[#"].*\)\=$+	contains=@vimPerlScript
  VimFoldp syn region vimPerlRegion	matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*$+ end=+\.$+			contains=@vimPerlScript
  syn cluster vimFuncBodyList	add=vimPerlRegion
@@ -727,10 +679,12 @@ if !filereadable(s:rubypath)
   endif
  endfor
 endif
-if (g:vimsyn_embed =~# 'r' && has("ruby")) && filereadable(s:rubypath)
+if g:vimsyn_embed =~# 'r' && filereadable(s:rubypath)
  syn cluster vimFuncBodyList	add=vimRubyRegion
  unlet! b:current_syntax
+ let s:foldmethod = &l:foldmethod
  exe "syn include @vimRubyScript ".s:rubypath
+ let &l:foldmethod = s:foldmethod
  VimFoldr syn region vimRubyRegion	matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+	contains=@vimRubyScript
  syn region vimRubyRegion	matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*$+ end=+\.$+			contains=@vimRubyScript
  syn cluster vimFuncBodyList	add=vimRubyRegion
@@ -750,14 +704,14 @@ if !filereadable(s:pythonpath)
   endif
  endfor
 endif
-if g:vimsyn_embed =~# 'P' && has("pythonx") && filereadable(s:pythonpath)
+if g:vimsyn_embed =~# 'P' && filereadable(s:pythonpath)
  unlet! b:current_syntax
  syn cluster vimFuncBodyList	add=vimPythonRegion
  exe "syn include @vimPythonScript ".s:pythonpath
- VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon][3x]\=\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+	contains=@vimPythonScript
- VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon][3x]\=\s*<<\s*$+ end=+\.$+				contains=@vimPythonScript
+ VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]3\=\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+	contains=@vimPythonScript
+ VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]3\=\s*<<\s*$+ end=+\.$+			contains=@vimPythonScript
  VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+	contains=@vimPythonScript
- VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\=\s*<<\s*$+ end=+\.$+				contains=@vimPythonScript
+ VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\=\s*<<\s*$+ end=+\.$+			contains=@vimPythonScript
  syn cluster vimFuncBodyList	add=vimPythonRegion
 else
  syn region vimEmbedError start=+py\%[thon]3\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
@@ -782,7 +736,7 @@ if s:trytcl
    endif
   endfor
  endif
- if (g:vimsyn_embed =~# 't' && has("tcl")) && filereadable(s:tclpath)
+ if g:vimsyn_embed =~# 't' && filereadable(s:tclpath)
   unlet! b:current_syntax
   syn cluster vimFuncBodyList	add=vimTclRegion
   exe "syn include @vimTclScript ".s:tclpath
@@ -810,7 +764,7 @@ if !filereadable(s:mzschemepath)
   endif
  endfor
 endif
-if (g:vimsyn_embed =~# 'm' && has("mzscheme")) && filereadable(s:mzschemepath)
+if g:vimsyn_embed =~# 'm' && filereadable(s:mzschemepath)
  unlet! b:current_syntax
  let s:iskKeep= &isk
  syn cluster vimFuncBodyList	add=vimMzSchemeRegion
@@ -844,7 +798,7 @@ if !exists("skip_vim_syntax_inits")
   hi def link vimBehaveError	vimError
   hi def link vimCollClassErr	vimError
   hi def link vimErrSetting	vimError
-  hi def link vimEmbedError	vimError
+  hi def link vimEmbedError	Normal
   hi def link vimFTError	vimError
   hi def link vimFunctionError	vimError
   hi def link vimFunc         	vimError
@@ -866,7 +820,6 @@ if !exists("skip_vim_syntax_inits")
  hi def link vimAutoCmdOpt	vimOption
  hi def link vimAutoCmd	vimCommand
  hi def link vimAutoEvent	Type
- hi def link vimAutoCmdMod	Special
  hi def link vimAutoSet	vimCommand
  hi def link vimBehaveModel	vimBehave
  hi def link vimBehave	vimCommand
@@ -874,7 +827,6 @@ if !exists("skip_vim_syntax_inits")
  hi def link vimCmplxRepeat	SpecialChar
  hi def link vimCommand	Statement
  hi def link vimComment	Comment
- hi def link vim9Comment	Comment
  hi def link vimCommentString	vimString
  hi def link vimCommentTitle	PreProc
  hi def link vimCondHL	vimCommand
@@ -888,7 +840,6 @@ if !exists("skip_vim_syntax_inits")
  hi def link vimError	Error
  hi def link vimFBVar	vimVar
  hi def link vimFgBgAttrib	vimHiAttrib
- hi def link vimHiCtermul	vimHiTerm
  hi def link vimFold	Folded
  hi def link vimFTCmd	vimCommand
  hi def link vimFTOption	vimSynType
@@ -902,6 +853,7 @@ if !exists("skip_vim_syntax_inits")
  hi def link vimGroupSpecial	Special
  hi def link vimGroup	Type
  hi def link vimHiAttrib	PreProc
+ hi def link vimHiBlend	vimHiTerm
  hi def link vimHiClear	vimHighlight
  hi def link vimHiCtermFgBg	vimHiTerm
  hi def link vimHiCTerm	vimHiTerm
@@ -921,11 +873,7 @@ if !exists("skip_vim_syntax_inits")
  hi def link vimKeyCode	vimSpecFile
  hi def link vimKeyword	Statement
  hi def link vimLet	vimCommand
- hi def link vimLetHereDoc	vimString
- hi def link vimLetHereDocStart	Special
- hi def link vimLetHereDocStop	Special
  hi def link vimLineComment	vimComment
- hi def link vim9LineComment	vimComment
  hi def link vimMapBang	vimCommand
  hi def link vimMapModKey	vimFuncSID
  hi def link vimMapMod	vimBracket
@@ -943,7 +891,6 @@ if !exists("skip_vim_syntax_inits")
  hi def link vimNumber	Number
  hi def link vimOperError	Error
  hi def link vimOper	Operator
- hi def link vimOperStar	vimOper
  hi def link vimOption	PreProc
  hi def link vimParenSep	Delimiter
  hi def link vimPatSepErr	vimError
@@ -1010,6 +957,11 @@ if !exists("skip_vim_syntax_inits")
  hi def link vimUserFunc	Normal
  hi def link vimVar	Identifier
  hi def link vimWarn	WarningMsg
+
+ hi def link nvimAutoEvent	vimAutoEvent
+ hi def link nvimHLGroup	vimHLGroup
+ hi def link nvimMap	vimMap
+ hi def link nvimUnmap	vimUnmap
 endif
 
 " Current Syntax Variable: {{{2

From bb3de8fa5e509d5f5faf173fd1a92635a0023274 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 8 Oct 2020 00:40:28 +0200
Subject: [PATCH 121/299] Fix markdown and other highlighting, #578

---
 README.md                                     |    2 +-
 after/ftplugin/html.vim                       |   13 +
 after/indent/html.vim                         | 1064 +++++++++++++++++
 after/syntax/html.vim                         |  186 ++-
 {syntax => after/syntax}/html/aria.vim        |    0
 {syntax => after/syntax}/html/electron.vim    |    0
 {syntax => after/syntax}/html/rdfa.vim        |    0
 {syntax => after/syntax}/javascript/html5.vim |    0
 ftdetect/polyglot.vim                         |   10 +-
 ftplugin/html.vim                             |   56 +-
 indent/html.vim                               |   76 +-
 packages.yaml                                 |   20 +-
 syntax/html.vim                               |  497 +++++---
 tests/filetypes.vim                           |    2 +-
 14 files changed, 1691 insertions(+), 235 deletions(-)
 create mode 100644 after/ftplugin/html.vim
 create mode 100644 after/indent/html.vim
 rename {syntax => after/syntax}/html/aria.vim (100%)
 rename {syntax => after/syntax}/html/electron.vim (100%)
 rename {syntax => after/syntax}/html/rdfa.vim (100%)
 rename {syntax => after/syntax}/javascript/html5.vim (100%)

diff --git a/README.md b/README.md
index 8845bc9c7..b5b2e7cfc 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->590<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->591<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
diff --git a/after/ftplugin/html.vim b/after/ftplugin/html.vim
new file mode 100644
index 000000000..50cdb2aec
--- /dev/null
+++ b/after/ftplugin/html.vim
@@ -0,0 +1,13 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+
+" Maintainer:  	othree <othree@gmail.com>
+" URL:		      http://github.com/othree/html5.vim
+" Last Change:  2014-05-02
+" License:      MIT
+" Changes:      Add - to keyword
+
+" setlocal iskeyword+=-
+
+setlocal commentstring=<!--%s-->
+
+endif
diff --git a/after/indent/html.vim b/after/indent/html.vim
new file mode 100644
index 000000000..3b9c7eb43
--- /dev/null
+++ b/after/indent/html.vim
@@ -0,0 +1,1064 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+
+" Vim indent script for HTML
+" Header: "{{{
+" Maintainer:	Bram Moolenaar
+" Original Author: Andy Wokula <anwoku@yahoo.de>
+" Last Change:	2017 Jun 13
+" Version:	1.0
+" Description:	HTML indent script with cached state for faster indenting on a
+"		range of lines.
+"		Supports template systems through hooks.
+"		Supports Closure stylesheets.
+"
+" Credits:
+"	indent/html.vim (2006 Jun 05) from J. Zellner
+"	indent/css.vim (2006 Dec 20) from N. Weibull
+"
+" History:
+" 2014 June	(v1.0) overhaul (Bram)
+" 2012 Oct 21	(v0.9) added support for shiftwidth()
+" 2011 Sep 09	(v0.8) added HTML5 tags (thx to J. Zuckerman)
+" 2008 Apr 28	(v0.6) revised customization
+" 2008 Mar 09	(v0.5) fixed 'indk' issue (thx to C.J. Robinson)
+"}}}
+
+" Init Folklore, check user settings (2nd time ++)
+if exists("b:did_indent") "{{{
+  finish
+endif
+
+" Load the Javascript indent script first, it defines GetJavascriptIndent().
+" Undo the rest.
+" Load base python indent.
+if !exists('*GetJavascriptIndent')
+  runtime! indent/javascript.vim
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=HtmlIndent()
+setlocal indentkeys=o,O,<Return>,<>>,{,},!^F
+
+" Needed for % to work when finding start/end of a tag.
+setlocal matchpairs+=<:>
+
+let b:undo_indent = "setlocal inde< indk<"
+
+" b:hi_indent keeps state to speed up indenting consecutive lines.
+let b:hi_indent = {"lnum": -1}
+
+"""""" Code below this is loaded only once. """""
+if exists("*HtmlIndent") && !exists('g:force_reload_html')
+  call HtmlIndent_CheckUserSettings()
+  finish
+endif
+
+" Allow for line continuation below.
+let s:cpo_save = &cpo
+set cpo-=C
+"}}}
+
+" Check and process settings from b:html_indent and g:html_indent... variables.
+" Prefer using buffer-local settings over global settings, so that there can
+" be defaults for all HTML files and exceptions for specific types of HTML
+" files.
+func! HtmlIndent_CheckUserSettings()
+  "{{{
+  let inctags = ''
+  if exists("b:html_indent_inctags")
+    let inctags = b:html_indent_inctags
+  elseif exists("g:html_indent_inctags")
+    let inctags = g:html_indent_inctags
+  endif
+  let b:hi_tags = {}
+  if len(inctags) > 0
+    call s:AddITags(b:hi_tags, split(inctags, ","))
+  endif
+
+  let autotags = ''
+  if exists("b:html_indent_autotags")
+    let autotags = b:html_indent_autotags
+  elseif exists("g:html_indent_autotags")
+    let autotags = g:html_indent_autotags
+  endif
+  let b:hi_removed_tags = {}
+  if len(autotags) > 0
+    call s:RemoveITags(b:hi_removed_tags, split(autotags, ","))
+  endif
+
+  " Syntax names indicating being inside a string of an attribute value.
+  let string_names = []
+  if exists("b:html_indent_string_names")
+    let string_names = b:html_indent_string_names
+  elseif exists("g:html_indent_string_names")
+    let string_names = g:html_indent_string_names
+  endif
+  let b:hi_insideStringNames = ['htmlString']
+  if len(string_names) > 0
+    for s in string_names
+      call add(b:hi_insideStringNames, s)
+    endfor
+  endif
+
+  " Syntax names indicating being inside a tag.
+  let tag_names = []
+  if exists("b:html_indent_tag_names")
+    let tag_names = b:html_indent_tag_names
+  elseif exists("g:html_indent_tag_names")
+    let tag_names = g:html_indent_tag_names
+  endif
+  let b:hi_insideTagNames = ['htmlTag', 'htmlScriptTag']
+  if len(tag_names) > 0
+    for s in tag_names
+      call add(b:hi_insideTagNames, s)
+    endfor
+  endif
+
+  let indone = {"zero": 0
+              \,"auto": "indent(prevnonblank(v:lnum-1))"
+              \,"inc": "b:hi_indent.blocktagind + shiftwidth()"}
+
+  let script1 = ''
+  if exists("b:html_indent_script1")
+    let script1 = b:html_indent_script1
+  elseif exists("g:html_indent_script1")
+    let script1 = g:html_indent_script1
+  endif
+  if len(script1) > 0
+    let b:hi_js1indent = get(indone, script1, indone.zero)
+  else
+    let b:hi_js1indent = 0
+  endif
+
+  let style1 = ''
+  if exists("b:html_indent_style1")
+    let style1 = b:html_indent_style1
+  elseif exists("g:html_indent_style1")
+    let style1 = g:html_indent_style1
+  endif
+  if len(style1) > 0
+    let b:hi_css1indent = get(indone, style1, indone.zero)
+  else
+    let b:hi_css1indent = 0
+  endif
+
+  if !exists('b:html_indent_line_limit')
+    if exists('g:html_indent_line_limit')
+      let b:html_indent_line_limit = g:html_indent_line_limit
+    else
+      let b:html_indent_line_limit = 200
+    endif
+  endif
+endfunc "}}}
+
+" Init Script Vars
+"{{{
+let b:hi_lasttick = 0
+let b:hi_newstate = {}
+let s:countonly = 0
+ "}}}
+
+" Fill the s:indent_tags dict with known tags.
+" The key is "tagname" or "/tagname".  {{{
+" The value is:
+" 1   opening tag
+" 2   "pre"
+" 3   "script"
+" 4   "style"
+" 5   comment start
+" 6   conditional comment start
+" -1  closing tag
+" -2  "/pre"
+" -3  "/script"
+" -4  "/style"
+" -5  comment end
+" -6  conditional comment end
+let s:indent_tags = {}
+let s:endtags = [0,0,0,0,0,0,0]   " long enough for the highest index
+"}}}
+
+" Add a list of tag names for a pair of <tag> </tag> to "tags".
+func! s:AddITags(tags, taglist)
+  "{{{
+  for itag in a:taglist
+    let a:tags[itag] = 1
+    let a:tags['/' . itag] = -1
+  endfor
+endfunc "}}}
+
+" Take a list of tag name pairs that are not to be used as tag pairs.
+func! s:RemoveITags(tags, taglist)
+  "{{{
+  for itag in a:taglist
+    let a:tags[itag] = 1
+    let a:tags['/' . itag] = 1
+  endfor
+endfunc "}}}
+
+" Add a block tag, that is a tag with a different kind of indenting.
+func! s:AddBlockTag(tag, id, ...)
+  "{{{
+  if !(a:id >= 2 && a:id < len(s:endtags))
+    echoerr 'AddBlockTag ' . a:id
+    return
+  endif
+  let s:indent_tags[a:tag] = a:id
+  if a:0 == 0
+    let s:indent_tags['/' . a:tag] = -a:id
+    let s:endtags[a:id] = "</" . a:tag . ">"
+  else
+    let s:indent_tags[a:1] = -a:id
+    let s:endtags[a:id] = a:1
+  endif
+endfunc "}}}
+
+" Add known tag pairs.
+" Self-closing tags and tags that are sometimes {{{
+" self-closing (e.g., <p>) are not here (when encountering </p> we can find
+" the matching <p>, but not the other way around).
+" Old HTML tags:
+call s:AddITags(s:indent_tags, [
+    \ 'a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big',
+    \ 'blockquote', 'body', 'button', 'caption', 'center', 'cite', 'code',
+    \ 'colgroup', 'del', 'dfn', 'dir', 'div', 'dl', 'em', 'fieldset', 'font',
+    \ 'form', 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'html',
+    \ 'i', 'iframe', 'ins', 'kbd', 'label', 'legend', 'li',
+    \ 'map', 'menu', 'noframes', 'noscript', 'object', 'ol',
+    \ 'optgroup', 'p', 'q', 's', 'samp', 'select', 'small', 'span', 'strong', 'sub',
+    \ 'sup', 'table', 'textarea', 'title', 'tt', 'u', 'ul', 'var', 'th', 'td',
+    \ 'tr', 'tbody', 'tfoot', 'thead'])
+
+" New HTML5 elements:
+call s:AddITags(s:indent_tags, [
+    \ 'area', 'article', 'aside', 'audio', 'bdi', 'canvas',
+    \ 'command', 'data', 'datalist', 'details', 'dislog', 'embed', 'figcaption',
+    \ 'figure', 'footer', 'header', 'keygen', 'main', 'mark', 'meter', 'nav', 'output',
+    \ 'picture', 'progress', 'rp', 'rt', 'ruby', 'section', 'source', 'summary', 'svg', 
+    \ 'time', 'track', 'video', 'wbr'])
+
+" Tags added for web components:
+call s:AddITags(s:indent_tags, [
+    \ 'content', 'shadow', 'template'])
+"}}}
+
+" Add Block Tags: these contain alien content
+"{{{
+call s:AddBlockTag('pre', 2)
+call s:AddBlockTag('script', 3)
+call s:AddBlockTag('style', 4)
+call s:AddBlockTag('<!--', 5, '-->')
+call s:AddBlockTag('<!--[', 6, '![endif]-->')
+"}}}
+
+" Return non-zero when "tagname" is an opening tag, not being a block tag, for
+" which there should be a closing tag.  Can be used by scripts that include
+" HTML indenting.
+func! HtmlIndent_IsOpenTag(tagname)
+  "{{{
+  if get(s:indent_tags, a:tagname) == 1
+    return 1
+  endif
+  return get(b:hi_tags, a:tagname) == 1
+endfunc "}}}
+
+" Get the value for "tagname", taking care of buffer-local tags.
+func! s:get_tag(tagname)
+  "{{{
+  let i = get(s:indent_tags, a:tagname)
+  if (i == 1 || i == -1) && get(b:hi_removed_tags, a:tagname) != 0
+    return 0
+  endif
+  if i == 0
+    let i = get(b:hi_tags, a:tagname)
+  endif
+  return i
+endfunc "}}}
+
+" Count the number of start and end tags in "text".
+func! s:CountITags(text)
+  "{{{
+  " Store the result in s:curind and s:nextrel.
+  let s:curind = 0  " relative indent steps for current line [unit &sw]:
+  let s:nextrel = 0  " relative indent steps for next line [unit &sw]:
+  let s:block = 0		" assume starting outside of a block
+  let s:countonly = 1	" don't change state
+  call substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
+  let s:countonly = 0
+endfunc "}}}
+
+" Count the number of start and end tags in text.
+func! s:CountTagsAndState(text)
+  "{{{
+  " Store the result in s:curind and s:nextrel.  Update b:hi_newstate.block.
+  let s:curind = 0  " relative indent steps for current line [unit &sw]:
+  let s:nextrel = 0  " relative indent steps for next line [unit &sw]:
+
+  let s:block = b:hi_newstate.block
+  let tmp = substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
+  if s:block == 3
+    let b:hi_newstate.scripttype = s:GetScriptType(matchstr(tmp, '\C.*<SCRIPT\>\zs[^>]*'))
+  endif
+  let b:hi_newstate.block = s:block
+endfunc "}}}
+
+" Used by s:CountITags() and s:CountTagsAndState().
+func! s:CheckTag(itag)
+  "{{{
+  " Returns an empty string or "SCRIPT".
+  " a:itag can be "tag" or "/tag" or "<!--" or "-->"
+  if (s:CheckCustomTag(a:itag))
+    return ""
+  endif
+  let ind = s:get_tag(a:itag)
+  if ind == -1
+    " closing tag
+    if s:block != 0
+      " ignore itag within a block
+      return ""
+    endif
+    if s:nextrel == 0
+      let s:curind -= 1
+    else
+      let s:nextrel -= 1
+    endif
+  elseif ind == 1
+    " opening tag
+    if s:block != 0
+      return ""
+    endif
+    let s:nextrel += 1
+  elseif ind != 0
+    " block-tag (opening or closing)
+    return s:CheckBlockTag(a:itag, ind)
+  " else ind==0 (other tag found): keep indent
+  endif
+  return ""
+endfunc "}}}
+
+" Used by s:CheckTag(). Returns an empty string or "SCRIPT".
+func! s:CheckBlockTag(blocktag, ind)
+  "{{{
+  if a:ind > 0
+    " a block starts here
+    if s:block != 0
+      " already in a block (nesting) - ignore
+      " especially ignore comments after other blocktags
+      return ""
+    endif
+    let s:block = a:ind		" block type
+    if s:countonly
+      return ""
+    endif
+    let b:hi_newstate.blocklnr = v:lnum
+    " save allover indent for the endtag
+    let b:hi_newstate.blocktagind = b:hi_indent.baseindent + (s:nextrel + s:curind) * shiftwidth()
+    if a:ind == 3
+      return "SCRIPT"    " all except this must be lowercase
+      " line is to be checked again for the type attribute
+    endif
+  else
+    let s:block = 0
+    " we get here if starting and closing a block-tag on the same line
+  endif
+  return ""
+endfunc "}}}
+
+" Used by s:CheckTag().
+func! s:CheckCustomTag(ctag)
+  "{{{
+  " Returns 1 if ctag is the tag for a custom element, 0 otherwise.
+  " a:ctag can be "tag" or "/tag" or "<!--" or "-->"
+  let pattern = '\%\(\w\+-\)\+\w\+'
+  if match(a:ctag, pattern) == -1
+    return 0
+  endif
+  if matchstr(a:ctag, '\/\ze.\+') == "/"
+    " closing tag
+    if s:block != 0
+      " ignore ctag within a block
+      return 1
+    endif
+    if s:nextrel == 0
+      let s:curind -= 1
+    else
+      let s:nextrel -= 1
+    endif
+  else
+    " opening tag
+    if s:block != 0
+      return 1
+    endif
+    let s:nextrel += 1
+  endif
+  return 1
+endfunc "}}}
+
+" Return the <script> type: either "javascript" or ""
+func! s:GetScriptType(str)
+  "{{{
+  if a:str == "" || a:str =~ "java"
+    return "javascript"
+  else
+    return ""
+  endif
+endfunc "}}}
+
+" Look back in the file, starting at a:lnum - 1, to compute a state for the
+" start of line a:lnum.  Return the new state.
+func! s:FreshState(lnum)
+  "{{{
+  " A state is to know ALL relevant details about the
+  " lines 1..a:lnum-1, initial calculating (here!) can be slow, but updating is
+  " fast (incremental).
+  " TODO: this should be split up in detecting the block type and computing the
+  " indent for the block type, so that when we do not know the indent we do
+  " not need to clear the whole state and re-detect the block type again.
+  " State:
+  "	lnum		last indented line == prevnonblank(a:lnum - 1)
+  "	block = 0	a:lnum located within special tag: 0:none, 2:<pre>,
+  "			3:<script>, 4:<style>, 5:<!--, 6:<!--[
+  "	baseindent	use this indent for line a:lnum as a start - kind of
+  "			autoindent (if block==0)
+  "	scripttype = ''	type attribute of a script tag (if block==3)
+  "	blocktagind	indent for current opening (get) and closing (set)
+  "			blocktag (if block!=0)
+  "	blocklnr	lnum of starting blocktag (if block!=0)
+  "	inattr		line {lnum} starts with attributes of a tag
+  let state = {}
+  let state.lnum = prevnonblank(a:lnum - 1)
+  let state.scripttype = ""
+  let state.blocktagind = -1
+  let state.block = 0
+  let state.baseindent = 0
+  let state.blocklnr = 0
+  let state.inattr = 0
+
+  if state.lnum == 0
+    return state
+  endif
+
+  " Heuristic:
+  " remember startline state.lnum
+  " look back for <pre, </pre, <script, </script, <style, </style tags
+  " remember stopline
+  " if opening tag found,
+  "	assume a:lnum within block
+  " else
+  "	look back in result range (stopline, startline) for comment
+  "	    \ delimiters (<!--, -->)
+  "	if comment opener found,
+  "	    assume a:lnum within comment
+  "	else
+  "	    assume usual html for a:lnum
+  "	    if a:lnum-1 has a closing comment
+  "		look back to get indent of comment opener
+  " FI
+
+  " look back for a blocktag
+  let stopline2 = v:lnum + 1
+  if has_key(b:hi_indent, 'block') && b:hi_indent.block > 5
+    let [stopline2, stopcol2] = searchpos('<!--', 'bnW')
+  endif
+  let [stopline, stopcol] = searchpos('\c<\zs\/\=\%(pre\>\|script\>\|style\>\)', "bnW")
+  if stopline > 0 && stopline < stopline2
+    " ugly ... why isn't there searchstr()
+    let tagline = tolower(getline(stopline))
+    let blocktag = matchstr(tagline, '\/\=\%(pre\>\|script\>\|style\>\)', stopcol - 1)
+    if blocktag[0] != "/"
+      " opening tag found, assume a:lnum within block
+      let state.block = s:indent_tags[blocktag]
+      if state.block == 3
+        let state.scripttype = s:GetScriptType(matchstr(tagline, '\>[^>]*', stopcol))
+      endif
+      let state.blocklnr = stopline
+      " check preceding tags in the line:
+      call s:CountITags(tagline[: stopcol-2])
+      let state.blocktagind = indent(stopline) + (s:curind + s:nextrel) * shiftwidth()
+      return state
+    elseif stopline == state.lnum
+      " handle special case: previous line (= state.lnum) contains a
+      " closing blocktag which is preceded by line-noise;
+      " blocktag == "/..."
+      let swendtag = match(tagline, '^\s*</') >= 0
+      if !swendtag
+        let [bline, bcol] = searchpos('<'.blocktag[1:].'\>', "bnW")
+        call s:CountITags(tolower(getline(bline)[: bcol-2]))
+        let state.baseindent = indent(bline) + (s:curind + s:nextrel) * shiftwidth()
+        return state
+      endif
+    endif
+  endif
+  if stopline > stopline2
+    let stopline = stopline2
+    let stopcol = stopcol2
+  endif
+
+  " else look back for comment
+  let [comlnum, comcol, found] = searchpos('\(<!--\[\)\|\(<!--\)\|-->', 'bpnW', stopline)
+  if found == 2 || found == 3
+    " comment opener found, assume a:lnum within comment
+    let state.block = (found == 3 ? 5 : 6)
+    let state.blocklnr = comlnum
+    " check preceding tags in the line:
+    call s:CountITags(tolower(getline(comlnum)[: comcol-2]))
+    if found == 2
+      let state.baseindent = b:hi_indent.baseindent
+    endif
+    let state.blocktagind = indent(comlnum) + (s:curind + s:nextrel) * shiftwidth()
+    return state
+  endif
+
+  " else within usual HTML
+  let text = tolower(getline(state.lnum))
+
+  " Check a:lnum-1 for closing comment (we need indent from the opening line).
+  " Not when other tags follow (might be --> inside a string).
+  let comcol = stridx(text, '-->')
+  if comcol >= 0 && match(text, '[<>]', comcol) <= 0
+    call cursor(state.lnum, comcol + 1)
+    let [comlnum, comcol] = searchpos('<!--', 'bW')
+    if comlnum == state.lnum
+      let text = text[: comcol-2]
+    else
+      let text = tolower(getline(comlnum)[: comcol-2])
+    endif
+    call s:CountITags(text)
+    let state.baseindent = indent(comlnum) + (s:curind + s:nextrel) * shiftwidth()
+    " TODO check tags that follow "-->"
+    return state
+  endif
+
+  " Check if the previous line starts with end tag.
+  let swendtag = match(text, '^\s*</') >= 0
+
+  " If previous line ended in a closing tag, line up with the opening tag.
+  if !swendtag && text =~ '</\w\+\s*>\s*$'
+    call cursor(state.lnum, 99999)
+    normal! F<
+    let start_lnum = HtmlIndent_FindStartTag()
+    if start_lnum > 0
+      let state.baseindent = indent(start_lnum)
+      if col('.') > 2
+        " check for tags before the matching opening tag.
+        let text = getline(start_lnum)
+        let swendtag = match(text, '^\s*</') >= 0
+        call s:CountITags(text[: col('.') - 2])
+        let state.baseindent += s:nextrel * shiftwidth()
+        if !swendtag
+          let state.baseindent += s:curind * shiftwidth()
+        endif
+      endif
+      return state
+    endif
+  endif
+
+  " Else: no comments. Skip backwards to find the tag we're inside.
+  let [state.lnum, found] = HtmlIndent_FindTagStart(state.lnum)
+  " Check if that line starts with end tag.
+  let text = getline(state.lnum)
+  let swendtag = match(text, '^\s*</') >= 0
+  call s:CountITags(tolower(text))
+  let state.baseindent = indent(state.lnum) + s:nextrel * shiftwidth()
+  if !swendtag
+    let state.baseindent += s:curind * shiftwidth()
+  endif
+  return state
+endfunc "}}}
+
+" Indent inside a <pre> block: Keep indent as-is.
+func! s:Alien2()
+  "{{{
+  return -1
+endfunc "}}}
+
+" Return the indent inside a <script> block for javascript.
+func! s:Alien3()
+  "{{{
+  let lnum = prevnonblank(v:lnum - 1)
+  while lnum > 1 && getline(lnum) =~ '^\s*/[/*]'
+    " Skip over comments to avoid that cindent() aligns with the <script> tag
+    let lnum = prevnonblank(lnum - 1)
+  endwhile
+  if lnum == b:hi_indent.blocklnr
+    " indent for the first line after <script>
+    return eval(b:hi_js1indent)
+  endif
+  if b:hi_indent.scripttype == "javascript"
+    return GetJavascriptIndent()
+  else
+    return -1
+  endif
+endfunc "}}}
+
+" Return the indent inside a <style> block.
+func! s:Alien4()
+  "{{{
+  if prevnonblank(v:lnum-1) == b:hi_indent.blocklnr
+    " indent for first content line
+    return eval(b:hi_css1indent)
+  endif
+  return s:CSSIndent()
+endfunc "}}}
+
+" Indending inside a <style> block.  Returns the indent.
+func! s:CSSIndent()
+  "{{{
+  " This handles standard CSS and also Closure stylesheets where special lines
+  " start with @.
+  " When the line starts with '*' or the previous line starts with "/*"
+  " and does not end in "*/", use C indenting to format the comment.
+  " Adopted $VIMRUNTIME/indent/css.vim
+  let curtext = getline(v:lnum)
+  if curtext =~ '^\s*[*]'
+        \ || (v:lnum > 1 && getline(v:lnum - 1) =~ '\s*/\*'
+        \     && getline(v:lnum - 1) !~ '\*/\s*$')
+    return cindent(v:lnum)
+  endif
+
+  let min_lnum = b:hi_indent.blocklnr
+  let prev_lnum = s:CssPrevNonComment(v:lnum - 1, min_lnum)
+  let [prev_lnum, found] = HtmlIndent_FindTagStart(prev_lnum)
+  if prev_lnum <= min_lnum
+    " Just below the <style> tag, indent for first content line after comments.
+    return eval(b:hi_css1indent)
+  endif
+
+  " If the current line starts with "}" align with it's match.
+  if curtext =~ '^\s*}'
+    call cursor(v:lnum, 1)
+    try
+      normal! %
+      " Found the matching "{", align with it after skipping unfinished lines.
+      let align_lnum = s:CssFirstUnfinished(line('.'), min_lnum)
+      return indent(align_lnum)
+    catch
+      " can't find it, try something else, but it's most likely going to be
+      " wrong
+    endtry
+  endif
+
+  " add indent after {
+  let brace_counts = HtmlIndent_CountBraces(prev_lnum)
+  let extra = brace_counts.c_open * shiftwidth()
+
+  let prev_text = getline(prev_lnum)
+  let below_end_brace = prev_text =~ '}\s*$'
+
+  " Search back to align with the first line that's unfinished.
+  let align_lnum = s:CssFirstUnfinished(prev_lnum, min_lnum)
+
+  " Handle continuation lines if aligning with previous line and not after a
+  " "}".
+  if extra == 0 && align_lnum == prev_lnum && !below_end_brace
+    let prev_hasfield = prev_text =~ '^\s*[a-zA-Z0-9-]\+:'
+    let prev_special = prev_text =~ '^\s*\(/\*\|@\)'
+    if curtext =~ '^\s*\(/\*\|@\)'
+      " if the current line is not a comment or starts with @ (used by template
+      " systems) reduce indent if previous line is a continuation line
+      if !prev_hasfield && !prev_special
+        let extra = -shiftwidth()
+      endif
+    else
+      let cur_hasfield = curtext =~ '^\s*[a-zA-Z0-9-]\+:'
+      let prev_unfinished = s:CssUnfinished(prev_text)
+      if !cur_hasfield && (prev_hasfield || prev_unfinished)
+        " Continuation line has extra indent if the previous line was not a
+        " continuation line.
+        let extra = shiftwidth()
+        " Align with @if
+        if prev_text =~ '^\s*@if '
+          let extra = 4
+        endif
+      elseif cur_hasfield && !prev_hasfield && !prev_special
+        " less indent below a continuation line
+        let extra = -shiftwidth()
+      endif
+    endif
+  endif
+
+  if below_end_brace
+    " find matching {, if that line starts with @ it's not the start of a rule
+    " but something else from a template system
+    call cursor(prev_lnum, 1)
+    call search('}\s*$')
+    try
+      normal! %
+      " Found the matching "{", align with it.
+      let align_lnum = s:CssFirstUnfinished(line('.'), min_lnum)
+      let special = getline(align_lnum) =~ '^\s*@'
+    catch
+      let special = 0
+    endtry
+    if special
+      " do not reduce indent below @{ ... }
+      if extra < 0
+        let extra += shiftwidth()
+      endif
+    else
+      let extra -= (brace_counts.c_close - (prev_text =~ '^\s*}')) * shiftwidth()
+    endif
+  endif
+
+  " if no extra indent yet...
+  if extra == 0
+    if brace_counts.p_open > brace_counts.p_close
+      " previous line has more ( than ): add a shiftwidth
+      let extra = shiftwidth()
+    elseif brace_counts.p_open < brace_counts.p_close
+      " previous line has more ) than (: subtract a shiftwidth
+      let extra = -shiftwidth()
+    endif
+  endif
+
+  return indent(align_lnum) + extra
+endfunc "}}}
+
+" Inside <style>: Whether a line is unfinished.
+func! s:CssUnfinished(text)
+  "{{{
+  return a:text =~ '\s\(||\|&&\|:\)\s*$'
+endfunc "}}}
+
+" Search back for the first unfinished line above "lnum".
+func! s:CssFirstUnfinished(lnum, min_lnum)
+  "{{{
+  let align_lnum = a:lnum
+  while align_lnum > a:min_lnum && s:CssUnfinished(getline(align_lnum - 1))
+    let align_lnum -= 1
+  endwhile
+  return align_lnum
+endfunc "}}}
+
+" Find the non-empty line at or before "lnum" that is not a comment.
+func! s:CssPrevNonComment(lnum, stopline)
+  "{{{
+  " caller starts from a line a:lnum + 1 that is not a comment
+  let lnum = prevnonblank(a:lnum)
+  while 1
+    let ccol = match(getline(lnum), '\*/')
+    if ccol < 0
+      " No comment end thus it's something else.
+      return lnum
+    endif
+    call cursor(lnum, ccol + 1)
+    " Search back for the /* that starts the comment
+    let lnum = search('/\*', 'bW', a:stopline)
+    if indent(".") == virtcol(".") - 1
+      " The  found /* is at the start of the line. Now go back to the line
+      " above it and again check if it is a comment.
+      let lnum = prevnonblank(lnum - 1)
+    else
+      " /* is after something else, thus it's not a comment line.
+      return lnum
+    endif
+  endwhile
+endfunc "}}}
+
+" Check the number of {} and () in line "lnum". Return a dict with the counts.
+func! HtmlIndent_CountBraces(lnum)
+  "{{{
+  let brs = substitute(getline(a:lnum), '[''"].\{-}[''"]\|/\*.\{-}\*/\|/\*.*$\|[^{}()]', '', 'g')
+  let c_open = 0
+  let c_close = 0
+  let p_open = 0
+  let p_close = 0
+  for brace in split(brs, '\zs')
+    if brace == "{"
+      let c_open += 1
+    elseif brace == "}"
+      if c_open > 0
+        let c_open -= 1
+      else
+        let c_close += 1
+      endif
+    elseif brace == '('
+      let p_open += 1
+    elseif brace == ')'
+      if p_open > 0
+        let p_open -= 1
+      else
+        let p_close += 1
+      endif
+    endif
+  endfor
+  return {'c_open': c_open,
+        \ 'c_close': c_close,
+        \ 'p_open': p_open,
+        \ 'p_close': p_close}
+endfunc "}}}
+
+" Return the indent for a comment: <!-- -->
+func! s:Alien5()
+  "{{{
+  let curtext = getline(v:lnum)
+  if curtext =~ '^\s*\zs-->'
+    " current line starts with end of comment, line up with comment start.
+    call cursor(v:lnum, 0)
+    let lnum = search('<!--', 'b')
+    if lnum > 0
+      " TODO: what if <!-- is not at the start of the line?
+      return indent(lnum)
+    endif
+
+    " Strange, can't find it.
+    return -1
+  endif
+
+  let prevlnum = prevnonblank(v:lnum - 1)
+  let prevtext = getline(prevlnum)
+  let idx = match(prevtext, '^\s*\zs<!--')
+  if idx >= 0
+    " just below comment start, add a shiftwidth
+    return idx + shiftwidth()
+  endif
+
+  " Some files add 4 spaces just below a TODO line.  It's difficult to detect
+  " the end of the TODO, so let's not do that.
+
+  " Align with the previous non-blank line.
+  return indent(prevlnum)
+endfunc "}}}
+
+" Return the indent for conditional comment: <!--[ ![endif]-->
+func! s:Alien6()
+  "{{{
+  let curtext = getline(v:lnum)
+  if curtext =~ '\s*\zs<!\[endif\]-->'
+    " current line starts with end of comment, line up with comment start.
+    let lnum = search('<!--', 'bn')
+    if lnum > 0
+      return indent(lnum)
+    endif
+  endif
+  return b:hi_indent.baseindent + shiftwidth()
+endfunc "}}}
+
+" When the "lnum" line ends in ">" find the line containing the matching "<".
+func! HtmlIndent_FindTagStart(lnum)
+  "{{{
+  " Avoids using the indent of a continuation line.
+  " Moves the cursor.
+  " Return two values:
+  " - the matching line number or "lnum".
+  " - a flag indicating whether we found the end of a tag.
+  " This method is global so that HTML-like indenters can use it.
+  " To avoid matching " > " or " < " inside a string require that the opening
+  " "<" is followed by a word character
+  let idx = match(getline(a:lnum), '\S>\s*$')
+  if idx > 0
+    call cursor(a:lnum, idx)
+    let lnum = searchpair('<\w', '' , '>', 'bW', '', max([a:lnum - b:html_indent_line_limit, 0]))
+    if lnum > 0
+      return [lnum, 1]
+    endif
+  endif
+  return [a:lnum, 0]
+endfunc "}}}
+
+" Find the unclosed start tag from the current cursor position.
+func! HtmlIndent_FindStartTag()
+  "{{{
+  " The cursor must be on or before a closing tag.
+  " If found, positions the cursor at the match and returns the line number.
+  " Otherwise returns 0.
+  let tagname = matchstr(getline('.')[col('.') - 1:], '</\zs\w\+\(-\w\+\)*\ze')
+  let start_lnum = searchpair('<' . tagname . '\>', '', '</' . tagname . '\>', 'bW')
+  if start_lnum > 0
+    return start_lnum
+  endif
+  return 0
+endfunc "}}}
+
+" Moves the cursor from a "<" to the matching ">".
+func! HtmlIndent_FindTagEnd()
+  "{{{
+  " Call this with the cursor on the "<" of a start tag.
+  " This will move the cursor to the ">" of the matching end tag or, when it's
+  " a self-closing tag, to the matching ">".
+  " Limited to look up to b:html_indent_line_limit lines away.
+  let text = getline('.')
+  let tagname = matchstr(text, '\w\+\(-\w\+\)*\|!--', col('.'))
+  if tagname == '!--'
+    call search('--\zs>')
+  elseif s:get_tag('/' . tagname) != 0
+    " tag with a closing tag, find matching "</tag>"
+    call searchpair('<' . tagname, '', '</' . tagname . '\zs>', 'W', '', line('.') + b:html_indent_line_limit)
+  else
+    " self-closing tag, find the ">"
+    call search('\S\zs>')
+  endif
+endfunc "}}}
+
+" Indenting inside a start tag. Return the correct indent or -1 if unknown.
+func! s:InsideTag(foundHtmlString)
+  "{{{
+  if a:foundHtmlString
+    " Inside an attribute string.
+    " Align with the previous line or use an external function.
+    let lnum = v:lnum - 1
+    if lnum > 1
+      if exists('b:html_indent_tag_string_func')
+        return b:html_indent_tag_string_func(lnum)
+      endif
+      return indent(lnum)
+    endif
+  endif
+
+  " Should be another attribute: " attr="val".  Align with the previous
+  " attribute start.
+  let lnum = v:lnum
+  while lnum > 1
+    let lnum -= 1
+    let text = getline(lnum)
+    " Find a match with one of these, align with "attr":
+    "       attr=
+    "  <tag attr=
+    "  text<tag attr=
+    "  <tag>text</tag>text<tag attr=
+    " For long lines search for the first match, finding the last match
+    " gets very slow.
+    if len(text) < 300
+      let idx = match(text, '.*\s\zs[_a-zA-Z0-9-]\+="')
+    else
+      let idx = match(text, '\s\zs[_a-zA-Z0-9-]\+="')
+    endif
+    if idx == -1
+      let idx = match(text, '<\w\+\(-\w\+\)*\s\zs\w')
+    endif
+    if idx == -1
+      let idx = match(text, '<\w\+\(-\w\+\)*')
+      if idx >= 0
+        let idx = idx + shiftwidth()
+      endif
+    endif
+    if idx > 0
+      " Found the attribute.  TODO: assumes spaces, no Tabs.
+      return idx
+    endif
+  endwhile
+  return -1
+endfunc "}}}
+
+" THE MAIN INDENT FUNCTION. Return the amount of indent for v:lnum.
+func! HtmlIndent()
+  "{{{
+  if prevnonblank(v:lnum - 1) < 1
+    " First non-blank line has no indent.
+    return 0
+  endif
+
+  let curtext = tolower(getline(v:lnum))
+  let indentunit = shiftwidth()
+
+  let b:hi_newstate = {}
+  let b:hi_newstate.lnum = v:lnum
+
+  " When syntax HL is enabled, detect we are inside a tag.  Indenting inside
+  " a tag works very differently. Do not do this when the line starts with
+  " "<", it gets the "htmlTag" ID but we are not inside a tag then.
+  if curtext !~ '^\s*<'
+    normal! ^
+    let stack = synstack(v:lnum, col('.'))  " assumes there are no tabs
+    let foundHtmlString = 0
+    for synid in reverse(stack)
+      let name = synIDattr(synid, "name")
+      if index(b:hi_insideStringNames, name) >= 0
+        let foundHtmlString = 1
+      elseif index(b:hi_insideTagNames, name) >= 0
+        " Yes, we are inside a tag.
+        let indent = s:InsideTag(foundHtmlString)
+        if indent >= 0
+          " Do not keep the state. TODO: could keep the block type.
+          let b:hi_indent.lnum = 0
+          return indent
+        endif
+      endif
+    endfor
+  endif
+
+  " does the line start with a closing tag?
+  let swendtag = match(curtext, '^\s*</') >= 0
+
+  if prevnonblank(v:lnum - 1) == b:hi_indent.lnum && b:hi_lasttick == b:changedtick - 1
+    " use state (continue from previous line)
+  else
+    " start over (know nothing)
+    let b:hi_indent = s:FreshState(v:lnum)
+  endif
+
+  if b:hi_indent.block >= 2
+    " within block
+    let endtag = s:endtags[b:hi_indent.block]
+    let blockend = stridx(curtext, endtag)
+    if blockend >= 0
+      " block ends here
+      let b:hi_newstate.block = 0
+      " calc indent for REST OF LINE (may start more blocks):
+      call s:CountTagsAndState(strpart(curtext, blockend + strlen(endtag)))
+      if swendtag && b:hi_indent.block != 5
+        let indent = b:hi_indent.blocktagind + s:curind * indentunit
+        let b:hi_newstate.baseindent = indent + s:nextrel * indentunit
+      else
+        let indent = s:Alien{b:hi_indent.block}()
+        let b:hi_newstate.baseindent = b:hi_indent.blocktagind + s:nextrel * indentunit
+      endif
+    else
+      " block continues
+      " indent this line with alien method
+      let indent = s:Alien{b:hi_indent.block}()
+    endif
+  else
+    " not within a block - within usual html
+    let b:hi_newstate.block = b:hi_indent.block
+    if swendtag
+      " The current line starts with an end tag, align with its start tag.
+      call cursor(v:lnum, 1)
+      let start_lnum = HtmlIndent_FindStartTag()
+      if start_lnum > 0
+        " check for the line starting with something inside a tag:
+        " <sometag               <- align here
+        "    attr=val><open>     not here
+        let text = getline(start_lnum)
+        let angle = matchstr(text, '[<>]')
+        if angle == '>'
+          call cursor(start_lnum, 1)
+          normal! f>%
+          let start_lnum = line('.')
+          let text = getline(start_lnum)
+        endif
+
+        let indent = indent(start_lnum)
+        if col('.') > 2
+          let swendtag = match(text, '^\s*</') >= 0
+          call s:CountITags(text[: col('.') - 2])
+          let indent += s:nextrel * shiftwidth()
+          if !swendtag
+            let indent += s:curind * shiftwidth()
+          endif
+        endif
+      else
+        " not sure what to do
+        let indent = b:hi_indent.baseindent
+      endif
+      let b:hi_newstate.baseindent = indent
+    else
+      call s:CountTagsAndState(curtext)
+      let indent = b:hi_indent.baseindent
+      let b:hi_newstate.baseindent = indent + (s:curind + s:nextrel) * indentunit
+    endif
+  endif
+
+  let b:hi_lasttick = b:changedtick
+  call extend(b:hi_indent, b:hi_newstate, "force")
+  return indent
+endfunc "}}}
+
+" Check user settings when loading this script the first time.
+call HtmlIndent_CheckUserSettings()
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: fdm=marker ts=8 sw=2 tw=78
+
+endif
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index bc7e8eedd..c02c02a36 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -2,11 +2,195 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 
 " Vim syntax file
 " Language:     HTML (version 5.1)
-" Last Change:  2017 Feb 15
+"               SVG (SVG 1.1 Second Edition)
+"               MathML (MathML 3.0 Second Edition)
+" Last Change:  2017 Mar 07
 " License:      Public domain
 "               (but let me know if you like :) )
 "
+" Note: This file just add new tags from HTML 5
+"       and don't replace default html.vim syntax file
+"
 " Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
+" Changes:      update to Draft 2016 Jan 13
+"               add microdata Attributes
+" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
+" URL:          http://rm.blog.br/vim/syntax/html.vim
+" Modified:     htdebeer <H.T.de.Beer@gmail.com>
+" Changes:      add common SVG elements and attributes for inline SVG
+
+" Patch 7.4.1142
+if has("patch-7.4-1142")
+  if has("win32")
+    syn iskeyword @,48-57,_,128-167,224-235,-
+  else
+    syn iskeyword @,48-57,_,192-255,-
+  endif
+endif
+
+" HTML 5 tags
+syn keyword htmlTagName contained article aside audio canvas command
+syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
+syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
+syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
+syn keyword htmlTagName contained template content shadow slot
+syn keyword htmlTagName contained wbr bdi
+syn keyword htmlTagName contained picture
+
+" SVG tags
+" http://www.w3.org/TR/SVG/
+" as found in http://www.w3.org/TR/SVG/eltindex.html
+syn keyword htmlTagName contained svg 
+syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
+syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
+syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
+syn keyword htmlTagName contained clipPath color-profile cursor 
+syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
+syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
+syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
+syn keyword htmlTagName contained glyph glyphRef hkern 
+syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
+syn keyword htmlTagName contained missing-glyph mpath 
+syn keyword htmlTagName contained text textPath tref tspan vkern
+syn keyword htmlTagName contained metadata title
+
+" MathML tags
+" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
+syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
+syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
+syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
+syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
+syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
+syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
+syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
+syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
+syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
+syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
+syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
+syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
+syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
+syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
+syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
+syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
+syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
+syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
+syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
+syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
+
+" Custom Element
+syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
+syn match htmlTagName contained "[.0-9_a-z]\@<=-[-.0-9_a-z]*\>"
+
+" HTML 5 arguments
+" Core Attributes
+syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
+syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
+" Event-handler Attributes
+syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
+syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
+syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
+syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
+syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
+syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
+syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
+syn keyword htmlArg contained onvolumechange onwaiting
+" XML Attributes
+syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
+" new features
+" <body>
+syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
+syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
+" <video>, <audio>, <source>, <track>
+syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
+" <form>, <input>, <button>
+syn keyword htmlArg contained form autocomplete autofocus list min max step
+syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
+syn keyword htmlArg contained required placeholder pattern
+" <command>, <details>, <time>
+syn keyword htmlArg contained label icon open datetime-local pubdate
+" <script>
+syn keyword htmlArg contained async
+" <content>
+syn keyword htmlArg contained select
+" <iframe>
+syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest allowpresentation
+" <picture>
+syn keyword htmlArg contained srcset sizes
+" <a>
+syn keyword htmlArg contained download media
+" <script>, <style>
+syn keyword htmlArg contained nonce
+" <area>, <a>, <img>, <iframe>, <link>
+syn keyword htmlArg contained referrerpolicy
+" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
+syn keyword htmlArg contained integrity crossorigin
+" <link>
+syn keyword htmlArg contained prefetch 
+" syn keyword htmlArg contained preload
+" <img>
+syn keyword htmlArg contained decoding
+" https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
+syn keyword htmlArg contained onselectstart onselectionchange
+" https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/loading
+syn keyword htmlArg contained loading
+
+" Custom Data Attributes
+" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
+syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Vendor Extension Attributes
+" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
+syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Microdata
+" http://dev.w3.org/html5/md/
+syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
+
+" SVG
+" http://www.w3.org/TR/SVG/
+" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
+syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
+syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
+syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
+syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
+syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
+syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
+syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
+syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
+syn keyword htmlArg contained id ideographic in in2 intercept 
+syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
+syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
+syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
+syn keyword htmlArg contained numOctaves 
+syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
+syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
+syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
+syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
+syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
+syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
+syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
+syn keyword htmlArg contained width widths 
+syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
+syn keyword htmlArg contained y y1 y2 yChannelSelector 
+syn keyword htmlArg contained z zoomAndPan 
+syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
+
+" MathML attributes
+" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
+syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
+syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
+syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
+syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
+syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
+syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
+syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
+syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
+syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
+syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
+syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
+syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
+syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
+syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
 
 " Comment
 " https://github.com/w3c/html/issues/694
diff --git a/syntax/html/aria.vim b/after/syntax/html/aria.vim
similarity index 100%
rename from syntax/html/aria.vim
rename to after/syntax/html/aria.vim
diff --git a/syntax/html/electron.vim b/after/syntax/html/electron.vim
similarity index 100%
rename from syntax/html/electron.vim
rename to after/syntax/html/electron.vim
diff --git a/syntax/html/rdfa.vim b/after/syntax/html/rdfa.vim
similarity index 100%
rename from syntax/html/rdfa.vim
rename to after/syntax/html/rdfa.vim
diff --git a/syntax/javascript/html5.vim b/after/syntax/javascript/html5.vim
similarity index 100%
rename from syntax/javascript/html5.vim
rename to after/syntax/javascript/html5.vim
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 791c4c0eb..2f8cad974 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -118,6 +118,11 @@ augroup filetypedetect
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(s:disabled_packages, 'html')
+  au! BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
+  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
+endif
+
 if !has_key(s:disabled_packages, 'pullrequest')
   au BufNewFile,BufRead PULLREQ_EDITMSG setf pullrequest
 endif
@@ -2197,11 +2202,6 @@ if !has_key(s:disabled_packages, 'i3')
   au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config setf i3config
 endif
 
-if !has_key(s:disabled_packages, 'html5')
-  au! BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
-  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
-endif
-
 if !has_key(s:disabled_packages, 'hive')
   au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
 endif
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index 50cdb2aec..d65502beb 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,13 +1,55 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html') == -1
 
-" Maintainer:  	othree <othree@gmail.com>
-" URL:		      http://github.com/othree/html5.vim
-" Last Change:  2014-05-02
-" License:      MIT
-" Changes:      Add - to keyword
+" Vim filetype plugin file
+" Language:	html
+" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Changed: 20 Jan 2009
+" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
 
-" setlocal iskeyword+=-
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
 
+" Make sure the continuation lines below do not cause problems in
+" compatibility mode.
+let s:save_cpo = &cpo
+set cpo-=C
+
+setlocal matchpairs+=<:>
 setlocal commentstring=<!--%s-->
+setlocal comments=s:<!--,m:\ \ \ \ ,e:-->
+
+if exists("g:ft_html_autocomment") && (g:ft_html_autocomment == 1)
+    setlocal formatoptions-=t formatoptions+=croql
+endif
+
+if exists('&omnifunc')
+  setlocal omnifunc=htmlcomplete#CompleteTags
+  call htmlcomplete#DetectOmniFlavor()
+endif
+
+" HTML:  thanks to Johannes Zellner and Benji Fisher.
+if exists("loaded_matchit")
+    let b:match_ignorecase = 1
+    let b:match_words = '<:>,' .
+    \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' .
+    \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' .
+    \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
+endif
+
+" Change the :browse e filter to primarily show HTML-related files.
+if has("gui_win32")
+    let  b:browsefilter="HTML Files (*.html,*.htm)\t*.htm;*.html\n" .
+		\	"JavaScript Files (*.js)\t*.js\n" .
+		\	"Cascading StyleSheets (*.css)\t*.css\n" .
+		\	"All Files (*.*)\t*.*\n"
+endif
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "setlocal commentstring< matchpairs< omnifunc< comments< formatoptions<" .
+    \	" | unlet! b:match_ignorecase b:match_skip b:match_words b:browsefilter"
+
+" Restore the saved compatibility options.
+let &cpo = s:save_cpo
+unlet s:save_cpo
 
 endif
diff --git a/indent/html.vim b/indent/html.vim
index 3b9c7eb43..1e56c85ea 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,11 +1,10 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html') == -1
 
 " Vim indent script for HTML
-" Header: "{{{
 " Maintainer:	Bram Moolenaar
 " Original Author: Andy Wokula <anwoku@yahoo.de>
-" Last Change:	2017 Jun 13
-" Version:	1.0
+" Last Change:	2020 Jul 06
+" Version:	1.0 "{{{
 " Description:	HTML indent script with cached state for faster indenting on a
 "		range of lines.
 "		Supports template systems through hooks.
@@ -58,6 +57,9 @@ let s:cpo_save = &cpo
 set cpo-=C
 "}}}
 
+" Pattern to match the name of a tag, including custom elements.
+let s:tagname = '\w\+\(-\w\+\)*'
+
 " Check and process settings from b:html_indent and g:html_indent... variables.
 " Prefer using buffer-local settings over global settings, so that there can
 " be defaults for all HTML files and exceptions for specific types of HTML
@@ -216,25 +218,27 @@ endfunc "}}}
 " Self-closing tags and tags that are sometimes {{{
 " self-closing (e.g., <p>) are not here (when encountering </p> we can find
 " the matching <p>, but not the other way around).
+" Known self-closing tags: " 'p', 'img', 'source', 'area', 'keygen', 'track',
+" 'wbr'.
 " Old HTML tags:
 call s:AddITags(s:indent_tags, [
     \ 'a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big',
     \ 'blockquote', 'body', 'button', 'caption', 'center', 'cite', 'code',
-    \ 'colgroup', 'del', 'dfn', 'dir', 'div', 'dl', 'em', 'fieldset', 'font',
+    \ 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt', 'em', 'fieldset', 'font',
     \ 'form', 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'html',
     \ 'i', 'iframe', 'ins', 'kbd', 'label', 'legend', 'li',
     \ 'map', 'menu', 'noframes', 'noscript', 'object', 'ol',
-    \ 'optgroup', 'p', 'q', 's', 'samp', 'select', 'small', 'span', 'strong', 'sub',
+    \ 'optgroup', 'q', 's', 'samp', 'select', 'small', 'span', 'strong', 'sub',
     \ 'sup', 'table', 'textarea', 'title', 'tt', 'u', 'ul', 'var', 'th', 'td',
     \ 'tr', 'tbody', 'tfoot', 'thead'])
 
 " New HTML5 elements:
 call s:AddITags(s:indent_tags, [
-    \ 'area', 'article', 'aside', 'audio', 'bdi', 'canvas',
-    \ 'command', 'data', 'datalist', 'details', 'dislog', 'embed', 'figcaption',
-    \ 'figure', 'footer', 'header', 'keygen', 'main', 'mark', 'meter', 'nav', 'output',
-    \ 'picture', 'progress', 'rp', 'rt', 'ruby', 'section', 'source', 'summary', 'svg', 
-    \ 'time', 'track', 'video', 'wbr'])
+    \ 'article', 'aside', 'audio', 'bdi', 'canvas', 'command', 'data',
+    \ 'datalist', 'details', 'dialog', 'embed', 'figcaption', 'figure',
+    \ 'footer', 'header', 'hgroup', 'main', 'mark', 'meter', 'nav', 'output',
+    \ 'picture', 'progress', 'rp', 'rt', 'ruby', 'section', 'summary',
+    \ 'svg', 'time', 'video'])
 
 " Tags added for web components:
 call s:AddITags(s:indent_tags, [
@@ -282,7 +286,7 @@ func! s:CountITags(text)
   let s:nextrel = 0  " relative indent steps for next line [unit &sw]:
   let s:block = 0		" assume starting outside of a block
   let s:countonly = 1	" don't change state
-  call substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
+  call substitute(a:text, '<\zs/\=' . s:tagname . '\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
   let s:countonly = 0
 endfunc "}}}
 
@@ -294,7 +298,7 @@ func! s:CountTagsAndState(text)
   let s:nextrel = 0  " relative indent steps for next line [unit &sw]:
 
   let s:block = b:hi_newstate.block
-  let tmp = substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
+  let tmp = substitute(a:text, '<\zs/\=' . s:tagname . '\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
   if s:block == 3
     let b:hi_newstate.scripttype = s:GetScriptType(matchstr(tmp, '\C.*<SCRIPT\>\zs[^>]*'))
   endif
@@ -532,7 +536,7 @@ func! s:FreshState(lnum)
   let swendtag = match(text, '^\s*</') >= 0
 
   " If previous line ended in a closing tag, line up with the opening tag.
-  if !swendtag && text =~ '</\w\+\s*>\s*$'
+  if !swendtag && text =~ '</' . s:tagname . '\s*>\s*$'
     call cursor(state.lnum, 99999)
     normal! F<
     let start_lnum = HtmlIndent_FindStartTag()
@@ -584,7 +588,7 @@ func! s:Alien3()
     return eval(b:hi_js1indent)
   endif
   if b:hi_indent.scripttype == "javascript"
-    return GetJavascriptIndent()
+    return eval(b:hi_js1indent) + GetJavascriptIndent()
   else
     return -1
   endif
@@ -623,7 +627,7 @@ func! s:CSSIndent()
     return eval(b:hi_css1indent)
   endif
 
-  " If the current line starts with "}" align with it's match.
+  " If the current line starts with "}" align with its match.
   if curtext =~ '^\s*}'
     call cursor(v:lnum, 1)
     try
@@ -661,7 +665,7 @@ func! s:CSSIndent()
     else
       let cur_hasfield = curtext =~ '^\s*[a-zA-Z0-9-]\+:'
       let prev_unfinished = s:CssUnfinished(prev_text)
-      if !cur_hasfield && (prev_hasfield || prev_unfinished)
+      if prev_unfinished
         " Continuation line has extra indent if the previous line was not a
         " continuation line.
         let extra = shiftwidth()
@@ -714,9 +718,13 @@ func! s:CSSIndent()
 endfunc "}}}
 
 " Inside <style>: Whether a line is unfinished.
+" 	tag:
+" 	tag: blah
+" 	tag: blah &&
+" 	tag: blah ||
 func! s:CssUnfinished(text)
   "{{{
-  return a:text =~ '\s\(||\|&&\|:\)\s*$'
+  return a:text =~ '\(||\|&&\|:\|\k\)\s*$'
 endfunc "}}}
 
 " Search back for the first unfinished line above "lnum".
@@ -843,11 +851,12 @@ func! HtmlIndent_FindTagStart(lnum)
   " - a flag indicating whether we found the end of a tag.
   " This method is global so that HTML-like indenters can use it.
   " To avoid matching " > " or " < " inside a string require that the opening
-  " "<" is followed by a word character
+  " "<" is followed by a word character and the closing ">" comes after a
+  " non-white character.
   let idx = match(getline(a:lnum), '\S>\s*$')
   if idx > 0
     call cursor(a:lnum, idx)
-    let lnum = searchpair('<\w', '' , '>', 'bW', '', max([a:lnum - b:html_indent_line_limit, 0]))
+    let lnum = searchpair('<\w', '' , '\S>', 'bW', '', max([a:lnum - b:html_indent_line_limit, 0]))
     if lnum > 0
       return [lnum, 1]
     endif
@@ -861,7 +870,7 @@ func! HtmlIndent_FindStartTag()
   " The cursor must be on or before a closing tag.
   " If found, positions the cursor at the match and returns the line number.
   " Otherwise returns 0.
-  let tagname = matchstr(getline('.')[col('.') - 1:], '</\zs\w\+\(-\w\+\)*\ze')
+  let tagname = matchstr(getline('.')[col('.') - 1:], '</\zs' . s:tagname . '\ze')
   let start_lnum = searchpair('<' . tagname . '\>', '', '</' . tagname . '\>', 'bW')
   if start_lnum > 0
     return start_lnum
@@ -877,7 +886,7 @@ func! HtmlIndent_FindTagEnd()
   " a self-closing tag, to the matching ">".
   " Limited to look up to b:html_indent_line_limit lines away.
   let text = getline('.')
-  let tagname = matchstr(text, '\w\+\(-\w\+\)*\|!--', col('.'))
+  let tagname = matchstr(text, s:tagname . '\|!--', col('.'))
   if tagname == '!--'
     call search('--\zs>')
   elseif s:get_tag('/' . tagname) != 0
@@ -894,12 +903,19 @@ func! s:InsideTag(foundHtmlString)
   "{{{
   if a:foundHtmlString
     " Inside an attribute string.
-    " Align with the previous line or use an external function.
+    " Align with the opening quote or use an external function.
     let lnum = v:lnum - 1
     if lnum > 1
       if exists('b:html_indent_tag_string_func')
         return b:html_indent_tag_string_func(lnum)
       endif
+      " If there is a double quote in the previous line, indent with the
+      " character after it.
+      if getline(lnum) =~ '"'
+	call cursor(lnum, 0)
+	normal f"
+	return virtcol('.')
+      endif
       return indent(lnum)
     endif
   endif
@@ -923,17 +939,21 @@ func! s:InsideTag(foundHtmlString)
       let idx = match(text, '\s\zs[_a-zA-Z0-9-]\+="')
     endif
     if idx == -1
-      let idx = match(text, '<\w\+\(-\w\+\)*\s\zs\w')
+      " try <tag attr
+      let idx = match(text, '<' . s:tagname . '\s\+\zs\w')
     endif
     if idx == -1
-      let idx = match(text, '<\w\+\(-\w\+\)*')
+      " after just "<tag" indent one level more
+      let idx = match(text, '<' . s:tagname . '$')
       if idx >= 0
-        let idx = idx + shiftwidth()
+	call cursor(lnum, idx)
+	return virtcol('.') + shiftwidth()
       endif
     endif
     if idx > 0
-      " Found the attribute.  TODO: assumes spaces, no Tabs.
-      return idx
+      " Found the attribute to align with.
+      call cursor(lnum, idx)
+      return virtcol('.')
     endif
   endwhile
   return -1
diff --git a/packages.yaml b/packages.yaml
index e8a136faf..e160bfd6f 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -792,13 +792,6 @@ filetypes:
   extra_extensions:
   - ql
 ---
-# TODO: change after https://github.com/othree/html5.vim/pull/106 is merged
-name: html5
-remote: sheerun/html5.vim
-filetypes:
-- name: html
-  linguist: HTML
----
 name: i3
 remote: mboughaba/i3config.vim
 filetypes:
@@ -5485,3 +5478,16 @@ remote: vim/vim:runtime
 glob: "**/autodoc.vim"
 # Needed by c, cmod, and pike
 filetypes: []
+---
+name: html
+remote: vim/vim:runtime
+glob: "**/html.vim"
+filetypes:
+- name: html
+  linguist: HTML
+---
+# TODO: change after https://github.com/othree/html5.vim/pull/106 is merged
+name: html5
+remote: sheerun/html5.vim
+dependencies: html
+filetypes: []
diff --git a/syntax/html.vim b/syntax/html.vim
index 43db75758..a04b4c90d 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,23 +1,15 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html') == -1
 
 " Vim syntax file
-" Language:     HTML (version 5.1)
-"               SVG (SVG 1.1 Second Edition)
-"               MathML (MathML 3.0 Second Edition)
-" Last Change:  2017 Mar 07
-" License:      Public domain
-"               (but let me know if you like :) )
+" Language:             HTML
+" Maintainer:           Jorge Maldonado Ventura <jorgesumle@freakspot.net>
+" Previous Maintainer:  Claudio Fleiner <claudio@fleiner.com>
+" Repository:           https://notabug.org/jorgesumle/vim-html-syntax
+" Last Change:          2020 Mar 17
+" Included patch from Florian Breisch to add the summary element
 "
-" Note: This file just add new tags from HTML 5
-"       and don't replace default html.vim syntax file
-"
-" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
-" Changes:      update to Draft 2016 Jan 13
-"               add microdata Attributes
-" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
-" URL:          http://rm.blog.br/vim/syntax/html.vim
-" Modified:     htdebeer <H.T.de.Beer@gmail.com>
-" Changes:      add common SVG elements and attributes for inline SVG
+
+" Please check :help html.vim for some comments and a description of the options
 
 " quit when a syntax file was already loaded
 if !exists("main_syntax")
@@ -30,178 +22,312 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" Patch 7.4.1142
-if has("patch-7.4-1142")
-  if has("win32")
-    syn iskeyword @,48-57,_,128-167,224-235,-
+syntax spell toplevel
+
+syn case ignore
+
+" mark illegal characters
+syn match htmlError "[<>&]"
+
+
+" tags
+syn region  htmlString   contained start=+"+ end=+"+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc
+syn region  htmlString   contained start=+'+ end=+'+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc
+syn match   htmlValue    contained "=[\t ]*[^'" \t>][^ \t>]*"hs=s+1   contains=javaScriptExpression,@htmlPreproc
+syn region  htmlEndTag             start=+</+      end=+>+ contains=htmlTagN,htmlTagError
+syn region  htmlTag                start=+<[^/]+   end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster
+syn match   htmlTagN     contained +<\s*[-a-zA-Z0-9]\++hs=s+1 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
+syn match   htmlTagN     contained +</\s*[-a-zA-Z0-9]\++hs=s+2 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
+syn match   htmlTagError contained "[^>]<"ms=s+1
+
+
+" tag names
+syn keyword htmlTagName contained address applet area a base basefont
+syn keyword htmlTagName contained big blockquote br caption center
+syn keyword htmlTagName contained cite code dd dfn dir div dl dt font
+syn keyword htmlTagName contained form hr html img
+syn keyword htmlTagName contained input isindex kbd li link map menu
+syn keyword htmlTagName contained meta ol option param pre p samp span
+syn keyword htmlTagName contained select small sub sup
+syn keyword htmlTagName contained table td textarea th tr tt ul var xmp
+syn match htmlTagName contained "\<\(b\|i\|u\|h[1-6]\|em\|strong\|head\|body\|title\)\>"
+
+" new html 4.0 tags
+syn keyword htmlTagName contained abbr acronym bdo button col label
+syn keyword htmlTagName contained colgroup fieldset iframe ins legend
+syn keyword htmlTagName contained object optgroup q s tbody tfoot thead
+
+" new html 5 tags
+syn keyword htmlTagName contained article aside audio bdi canvas data
+syn keyword htmlTagName contained datalist details dialog embed figcaption
+syn keyword htmlTagName contained figure footer header hgroup keygen main
+syn keyword htmlTagName contained mark menuitem meter nav output picture
+syn keyword htmlTagName contained progress rb rp rt rtc ruby section
+syn keyword htmlTagName contained slot source summary template time track
+syn keyword htmlTagName contained video wbr
+
+" legal arg names
+syn keyword htmlArg contained action
+syn keyword htmlArg contained align alink alt archive background bgcolor
+syn keyword htmlArg contained border bordercolor cellpadding
+syn keyword htmlArg contained cellspacing checked class clear code codebase color
+syn keyword htmlArg contained cols colspan content coords enctype face
+syn keyword htmlArg contained gutter height hspace id
+syn keyword htmlArg contained link lowsrc marginheight
+syn keyword htmlArg contained marginwidth maxlength method name prompt
+syn keyword htmlArg contained rel rev rows rowspan scrolling selected shape
+syn keyword htmlArg contained size src start target text type url
+syn keyword htmlArg contained usemap ismap valign value vlink vspace width wrap
+syn match   htmlArg contained "\<\(http-equiv\|href\|title\)="me=e-1
+
+" aria attributes
+syn match htmlArg contained "\<\(aria-activedescendant\|aria-atomic\)\>"
+syn match htmlArg contained "\<\(aria-autocomplete\|aria-busy\|aria-checked\)\>"
+syn match htmlArg contained "\<\(aria-colcount\|aria-colindex\|aria-colspan\)\>"
+syn match htmlArg contained "\<\(aria-controls\|aria-current\)\>"
+syn match htmlArg contained "\<\(aria-describedby\|aria-details\)\>"
+syn match htmlArg contained "\<\(aria-disabled\|aria-dropeffect\)\>"
+syn match htmlArg contained "\<\(aria-errormessage\|aria-expanded\)\>"
+syn match htmlArg contained "\<\(aria-flowto\|aria-grabbed\|aria-haspopup\)\>"
+syn match htmlArg contained "\<\(aria-hidden\|aria-invalid\)\>"
+syn match htmlArg contained "\<\(aria-keyshortcuts\|aria-label\)\>"
+syn match htmlArg contained "\<\(aria-labelledby\|aria-level\|aria-live\)\>"
+syn match htmlArg contained "\<\(aria-modal\|aria-multiline\)\>"
+syn match htmlArg contained "\<\(aria-multiselectable\|aria-orientation\)\>"
+syn match htmlArg contained "\<\(aria-owns\|aria-placeholder\|aria-posinset\)\>"
+syn match htmlArg contained "\<\(aria-pressed\|aria-readonly\|aria-relevant\)\>"
+syn match htmlArg contained "\<\(aria-required\|aria-roledescription\)\>"
+syn match htmlArg contained "\<\(aria-rowcount\|aria-rowindex\|aria-rowspan\)\>"
+syn match htmlArg contained "\<\(aria-selected\|aria-setsize\|aria-sort\)\>"
+syn match htmlArg contained "\<\(aria-valuemax\|aria-valuemin\)\>"
+syn match htmlArg contained "\<\(aria-valuenow\|aria-valuetext\)\>"
+syn keyword htmlArg contained role
+
+" Netscape extensions
+syn keyword htmlTagName contained frame noframes frameset nobr blink
+syn keyword htmlTagName contained layer ilayer nolayer spacer
+syn keyword htmlArg     contained frameborder noresize pagex pagey above below
+syn keyword htmlArg     contained left top visibility clip id noshade
+syn match   htmlArg     contained "\<z-index\>"
+
+" Microsoft extensions
+syn keyword htmlTagName contained marquee
+
+" html 4.0 arg names
+syn match   htmlArg contained "\<\(accept-charset\|label\)\>"
+syn keyword htmlArg contained abbr accept accesskey axis char charoff charset
+syn keyword htmlArg contained cite classid codetype compact data datetime
+syn keyword htmlArg contained declare defer dir disabled for frame
+syn keyword htmlArg contained headers hreflang lang language longdesc
+syn keyword htmlArg contained multiple nohref nowrap object profile readonly
+syn keyword htmlArg contained rules scheme scope span standby style
+syn keyword htmlArg contained summary tabindex valuetype version
+
+" html 5 arg names
+syn keyword htmlArg contained allowfullscreen async autocomplete autofocus
+syn keyword htmlArg contained autoplay challenge contenteditable contextmenu
+syn keyword htmlArg contained controls crossorigin default dirname download
+syn keyword htmlArg contained draggable dropzone form formaction formenctype
+syn keyword htmlArg contained formmethod formnovalidate formtarget hidden
+syn keyword htmlArg contained high icon inputmode keytype kind list loop low
+syn keyword htmlArg contained max min minlength muted nonce novalidate open
+syn keyword htmlArg contained optimum pattern placeholder poster preload
+syn keyword htmlArg contained radiogroup required reversed sandbox spellcheck
+syn keyword htmlArg contained sizes srcset srcdoc srclang step title translate
+syn keyword htmlArg contained typemustmatch
+
+" special characters
+syn match htmlSpecialChar "&#\=[0-9A-Za-z]\{1,8};"
+
+" Comments (the real ones or the old netscape ones)
+if exists("html_wrong_comments")
+  syn region htmlComment                start=+<!--+    end=+--\s*>+ contains=@Spell
+else
+  syn region htmlComment                start=+<!+      end=+>+   contains=htmlCommentPart,htmlCommentError,@Spell
+  syn match  htmlCommentError contained "[^><!]"
+  syn region htmlCommentPart  contained start=+--+      end=+--\s*+  contains=@htmlPreProc,@Spell
+endif
+syn region htmlComment                  start=+<!DOCTYPE+ keepend end=+>+
+
+" server-parsed commands
+syn region htmlPreProc start=+<!--#+ end=+-->+ contains=htmlPreStmt,htmlPreError,htmlPreAttr
+syn match htmlPreStmt contained "<!--#\(config\|echo\|exec\|fsize\|flastmod\|include\|printenv\|set\|if\|elif\|else\|endif\|geoguide\)\>"
+syn match htmlPreError contained "<!--#\S*"ms=s+4
+syn match htmlPreAttr contained "\w\+=[^"]\S\+" contains=htmlPreProcAttrError,htmlPreProcAttrName
+syn region htmlPreAttr contained start=+\w\+="+ skip=+\\\\\|\\"+ end=+"+ contains=htmlPreProcAttrName keepend
+syn match htmlPreProcAttrError contained "\w\+="he=e-1
+syn match htmlPreProcAttrName contained "\(expr\|errmsg\|sizefmt\|timefmt\|var\|cgi\|cmd\|file\|virtual\|value\)="he=e-1
+
+if !exists("html_no_rendering")
+  " rendering
+  syn cluster htmlTop contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLink,javaScript,@htmlPreproc
+
+  syn region htmlStrike start="<del\>" end="</del\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlStrike start="<strike\>" end="</strike\_s*>"me=s-1 contains=@htmlTop
+
+  syn region htmlBold start="<b\>" end="</b\_s*>"me=s-1 contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic
+  syn region htmlBold start="<strong\>" end="</strong\_s*>"me=s-1 contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic
+  syn region htmlBoldUnderline contained start="<u\>" end="</u\_s*>"me=s-1 contains=@htmlTop,htmlBoldUnderlineItalic
+  syn region htmlBoldItalic contained start="<i\>" end="</i\_s*>"me=s-1 contains=@htmlTop,htmlBoldItalicUnderline
+  syn region htmlBoldItalic contained start="<em\>" end="</em\_s*>"me=s-1 contains=@htmlTop,htmlBoldItalicUnderline
+  syn region htmlBoldUnderlineItalic contained start="<i\>" end="</i\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlBoldUnderlineItalic contained start="<em\>" end="</em\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlBoldItalicUnderline contained start="<u\>" end="</u\_s*>"me=s-1 contains=@htmlTop,htmlBoldUnderlineItalic
+
+  syn region htmlUnderline start="<u\>" end="</u\_s*>"me=s-1 contains=@htmlTop,htmlUnderlineBold,htmlUnderlineItalic
+  syn region htmlUnderlineBold contained start="<b\>" end="</b\_s*>"me=s-1 contains=@htmlTop,htmlUnderlineBoldItalic
+  syn region htmlUnderlineBold contained start="<strong\>" end="</strong\_s*>"me=s-1 contains=@htmlTop,htmlUnderlineBoldItalic
+  syn region htmlUnderlineItalic contained start="<i\>" end="</i\_s*>"me=s-1 contains=@htmlTop,htmlUnderlineItalicBold
+  syn region htmlUnderlineItalic contained start="<em\>" end="</em\_s*>"me=s-1 contains=@htmlTop,htmlUnderlineItalicBold
+  syn region htmlUnderlineItalicBold contained start="<b\>" end="</b\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlUnderlineItalicBold contained start="<strong\>" end="</strong\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlUnderlineBoldItalic contained start="<i\>" end="</i\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlUnderlineBoldItalic contained start="<em\>" end="</em\_s*>"me=s-1 contains=@htmlTop
+
+  syn region htmlItalic start="<i\>" end="</i\_s*>"me=s-1 contains=@htmlTop,htmlItalicBold,htmlItalicUnderline
+  syn region htmlItalic start="<em\>" end="</em\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlItalicBold contained start="<b\>" end="</b\_s*>"me=s-1 contains=@htmlTop,htmlItalicBoldUnderline
+  syn region htmlItalicBold contained start="<strong\>" end="</strong\_s*>"me=s-1 contains=@htmlTop,htmlItalicBoldUnderline
+  syn region htmlItalicBoldUnderline contained start="<u\>" end="</u\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlItalicUnderline contained start="<u\>" end="</u\_s*>"me=s-1 contains=@htmlTop,htmlItalicUnderlineBold
+  syn region htmlItalicUnderlineBold contained start="<b\>" end="</b\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlItalicUnderlineBold contained start="<strong\>" end="</strong\_s*>"me=s-1 contains=@htmlTop
+
+  syn match htmlLeadingSpace "^\s\+" contained
+  syn region htmlLink start="<a\>\_[^>]*\<href\>" end="</a\_s*>"me=s-1 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLeadingSpace,javaScript,@htmlPreproc
+  syn region htmlH1 start="<h1\>" end="</h1\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlH2 start="<h2\>" end="</h2\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlH3 start="<h3\>" end="</h3\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlH4 start="<h4\>" end="</h4\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlH5 start="<h5\>" end="</h5\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlH6 start="<h6\>" end="</h6\_s*>"me=s-1 contains=@htmlTop
+  syn region htmlHead start="<head\>" end="</head\_s*>"me=s-1 end="<body\>"me=s-1 end="<h[1-6]\>"me=s-1 contains=htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLink,htmlTitle,javaScript,cssStyle,@htmlPreproc
+  syn region htmlTitle start="<title\>" end="</title\_s*>"me=s-1 contains=htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,javaScript,@htmlPreproc
+endif
+
+syn keyword htmlTagName         contained noscript
+syn keyword htmlSpecialTagName  contained script style
+if main_syntax != 'java' || exists("java_javascript")
+  " JAVA SCRIPT
+  syn include @htmlJavaScript syntax/javascript.vim
+  unlet b:current_syntax
+  syn region  javaScript start=+<script\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
+  syn region  htmlScriptTag     contained start=+<script+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
+  hi def link htmlScriptTag htmlTag
+
+  " html events (i.e. arguments that include javascript commands)
+  if exists("html_extended_events")
+    syn region htmlEvent        contained start=+\<on\a\+\s*=[\t ]*'+ end=+'+ contains=htmlEventSQ
+    syn region htmlEvent        contained start=+\<on\a\+\s*=[\t ]*"+ end=+"+ contains=htmlEventDQ
   else
-    syn iskeyword @,48-57,_,192-255,-
+    syn region htmlEvent        contained start=+\<on\a\+\s*=[\t ]*'+ end=+'+ keepend contains=htmlEventSQ
+    syn region htmlEvent        contained start=+\<on\a\+\s*=[\t ]*"+ end=+"+ keepend contains=htmlEventDQ
   endif
+  syn region htmlEventSQ        contained start=+'+ms=s+1 end=+'+me=s-1 contains=@htmlJavaScript
+  syn region htmlEventDQ        contained start=+"+ms=s+1 end=+"+me=s-1 contains=@htmlJavaScript
+  hi def link htmlEventSQ htmlEvent
+  hi def link htmlEventDQ htmlEvent
+
+  " a javascript expression is used as an arg value
+  syn region  javaScriptExpression contained start=+&{+ keepend end=+};+ contains=@htmlJavaScript,@htmlPreproc
+endif
+
+if main_syntax != 'java' || exists("java_vb")
+  " VB SCRIPT
+  syn include @htmlVbScript syntax/vb.vim
+  unlet b:current_syntax
+  syn region  javaScript start=+<script \_[^>]*language *=\_[^>]*vbscript\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlVbScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
 endif
 
-" HTML 5 tags
-syn keyword htmlTagName contained article aside audio canvas command
-syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
-syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
-syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
-syn keyword htmlTagName contained template content shadow slot
-syn keyword htmlTagName contained wbr bdi
-syn keyword htmlTagName contained picture
-
-" SVG tags
-" http://www.w3.org/TR/SVG/
-" as found in http://www.w3.org/TR/SVG/eltindex.html
-syn keyword htmlTagName contained svg 
-syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
-syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
-syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
-syn keyword htmlTagName contained clipPath color-profile cursor 
-syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
-syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
-syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
-syn keyword htmlTagName contained glyph glyphRef hkern 
-syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
-syn keyword htmlTagName contained missing-glyph mpath 
-syn keyword htmlTagName contained text textPath tref tspan vkern
-syn keyword htmlTagName contained metadata title
-
-" MathML tags
-" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
-syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
-syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
-syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
-syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
-syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
-syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
-syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
-syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
-syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
-syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
-syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
-syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
-syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
-syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
-syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
-syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
-syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
-syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
-syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
-syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
-
-" Custom Element
-syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
-syn match htmlTagName contained "[.0-9_a-z]\@<=-[-.0-9_a-z]*\>"
-
-" HTML 5 arguments
-" Core Attributes
-syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
-syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
-" Event-handler Attributes
-syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
-syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
-syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
-syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
-syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
-syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
-syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
-syn keyword htmlArg contained onvolumechange onwaiting
-" XML Attributes
-syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
-" new features
-" <body>
-syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
-syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
-" <video>, <audio>, <source>, <track>
-syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
-" <form>, <input>, <button>
-syn keyword htmlArg contained form autocomplete autofocus list min max step
-syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
-syn keyword htmlArg contained required placeholder pattern
-" <command>, <details>, <time>
-syn keyword htmlArg contained label icon open datetime-local pubdate
-" <script>
-syn keyword htmlArg contained async
-" <content>
-syn keyword htmlArg contained select
-" <iframe>
-syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest allowpresentation
-" <picture>
-syn keyword htmlArg contained srcset sizes
-" <a>
-syn keyword htmlArg contained download media
-" <script>, <style>
-syn keyword htmlArg contained nonce
-" <area>, <a>, <img>, <iframe>, <link>
-syn keyword htmlArg contained referrerpolicy
-" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
-syn keyword htmlArg contained integrity crossorigin
-" <link>
-syn keyword htmlArg contained prefetch 
-" syn keyword htmlArg contained preload
-" <img>
-syn keyword htmlArg contained decoding
-" https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
-syn keyword htmlArg contained onselectstart onselectionchange
-" https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/loading
-syn keyword htmlArg contained loading
-
-" Custom Data Attributes
-" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
-syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
-
-" Vendor Extension Attributes
-" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
-syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
-
-" Microdata
-" http://dev.w3.org/html5/md/
-syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
-
-" SVG
-" http://www.w3.org/TR/SVG/
-" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
-syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
-syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
-syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
-syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
-syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
-syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
-syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
-syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
-syn keyword htmlArg contained id ideographic in in2 intercept 
-syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
-syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
-syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
-syn keyword htmlArg contained numOctaves 
-syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
-syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
-syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
-syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
-syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
-syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
-syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
-syn keyword htmlArg contained width widths 
-syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
-syn keyword htmlArg contained y y1 y2 yChannelSelector 
-syn keyword htmlArg contained z zoomAndPan 
-syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
-
-" MathML attributes
-" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
-syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
-syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
-syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
-syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
-syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
-syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
-syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
-syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
-syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
-syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
-syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
-syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
-syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
-syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
+syn cluster htmlJavaScript      add=@htmlPreproc
+
+if main_syntax != 'java' || exists("java_css")
+  " embedded style sheets
+  syn keyword htmlArg           contained media
+  syn include @htmlCss syntax/css.vim
+  unlet b:current_syntax
+  syn region cssStyle start=+<style+ keepend end=+</style>+ contains=@htmlCss,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc
+  syn match htmlCssStyleComment contained "\(<!--\|-->\)"
+  syn region htmlCssDefinition matchgroup=htmlArg start='style="' keepend matchgroup=htmlString end='"' contains=css.*Attr,css.*Prop,cssComment,cssLength,cssColor,cssURL,cssImportant,cssError,cssString,@htmlPreproc
+  hi def link htmlStyleArg htmlString
+endif
+
+if main_syntax == "html"
+  " synchronizing (does not always work if a comment includes legal
+  " html tags, but doing it right would mean to always start
+  " at the first line, which is too slow)
+  syn sync match htmlHighlight groupthere NONE "<[/a-zA-Z]"
+  syn sync match htmlHighlight groupthere javaScript "<script"
+  syn sync match htmlHighlightSkip "^.*['\"].*$"
+  syn sync minlines=10
+endif
+
+" The default highlighting.
+hi def link htmlTag                     Function
+hi def link htmlEndTag                  Identifier
+hi def link htmlArg                     Type
+hi def link htmlTagName                 htmlStatement
+hi def link htmlSpecialTagName          Exception
+hi def link htmlValue                     String
+hi def link htmlSpecialChar             Special
+
+if !exists("html_no_rendering")
+  hi def link htmlH1                      Title
+  hi def link htmlH2                      htmlH1
+  hi def link htmlH3                      htmlH2
+  hi def link htmlH4                      htmlH3
+  hi def link htmlH5                      htmlH4
+  hi def link htmlH6                      htmlH5
+  hi def link htmlHead                    PreProc
+  hi def link htmlTitle                   Title
+  hi def link htmlBoldItalicUnderline     htmlBoldUnderlineItalic
+  hi def link htmlUnderlineBold           htmlBoldUnderline
+  hi def link htmlUnderlineItalicBold     htmlBoldUnderlineItalic
+  hi def link htmlUnderlineBoldItalic     htmlBoldUnderlineItalic
+  hi def link htmlItalicUnderline         htmlUnderlineItalic
+  hi def link htmlItalicBold              htmlBoldItalic
+  hi def link htmlItalicBoldUnderline     htmlBoldUnderlineItalic
+  hi def link htmlItalicUnderlineBold     htmlBoldUnderlineItalic
+  hi def link htmlLink                    Underlined
+  hi def link htmlLeadingSpace            None
+  if !exists("html_my_rendering")
+    hi def htmlBold                term=bold cterm=bold gui=bold
+    hi def htmlBoldUnderline       term=bold,underline cterm=bold,underline gui=bold,underline
+    hi def htmlBoldItalic          term=bold,italic cterm=bold,italic gui=bold,italic
+    hi def htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,italic,underline gui=bold,italic,underline
+    hi def htmlUnderline           term=underline cterm=underline gui=underline
+    hi def htmlUnderlineItalic     term=italic,underline cterm=italic,underline gui=italic,underline
+    hi def htmlItalic              term=italic cterm=italic gui=italic
+    if v:version > 800 || v:version == 800 && has("patch1038")
+        hi def htmlStrike              term=strikethrough cterm=strikethrough gui=strikethrough
+    else
+        hi def htmlStrike              term=underline cterm=underline gui=underline
+    endif
+  endif
+endif
+
+hi def link htmlPreStmt            PreProc
+hi def link htmlPreError           Error
+hi def link htmlPreProc            PreProc
+hi def link htmlPreAttr            String
+hi def link htmlPreProcAttrName    PreProc
+hi def link htmlPreProcAttrError   Error
+hi def link htmlSpecial            Special
+hi def link htmlSpecialChar        Special
+hi def link htmlString             String
+hi def link htmlStatement          Statement
+hi def link htmlComment            Comment
+hi def link htmlCommentPart        Comment
+hi def link htmlValue              String
+hi def link htmlCommentError       htmlError
+hi def link htmlTagError           htmlError
+hi def link htmlEvent              javaScript
+hi def link htmlError              Error
+
+hi def link javaScript             Special
+hi def link javaScriptExpression   javaScript
+hi def link htmlCssStyleComment    Comment
+hi def link htmlCssDefinition      Special
 
 let b:current_syntax = "html"
 
@@ -211,5 +337,6 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+" vim: ts=8
 
 endif
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 5676807d3..1c2daaeb5 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -112,7 +112,6 @@ call TestFiletype('haskell')
 call TestFiletype('haxe')
 call TestFiletype('hcl')
 call TestFiletype('hive')
-call TestFiletype('html')
 call TestFiletype('i3config')
 call TestFiletype('icalendar')
 call TestFiletype('idris')
@@ -632,5 +631,6 @@ call TestFiletype('logcheck')
 call TestFiletype('svn')
 call TestFiletype('text')
 call TestFiletype('pullrequest')
+call TestFiletype('html')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE

From 1993b9f68fff3cb87413fdc2e328763c291578c4 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 8 Oct 2020 08:31:09 +0200
Subject: [PATCH 122/299] Fix encoding of vim files

---
 ftplugin/falcon.vim |  2 +-
 ftplugin/ocaml.vim  |  2 +-
 ftplugin/rpl.vim    |  2 +-
 indent/rpl.vim      |  2 +-
 indent/tilde.vim    |  2 +-
 scripts/build       | 10 +++++++---
 syntax/css.vim      |  2 +-
 syntax/elf.vim      |  2 +-
 syntax/forth.vim    |  2 +-
 syntax/fortran.vim  |  4 ++--
 syntax/initng.vim   |  2 +-
 syntax/iss.vim      |  2 +-
 syntax/lout.vim     |  2 +-
 syntax/moo.vim      |  2 +-
 syntax/n1ql.vim     |  2 +-
 syntax/nroff.vim    |  4 ++--
 syntax/pascal.vim   |  2 +-
 syntax/rnoweb-1.vim |  2 +-
 syntax/robots.vim   |  2 +-
 syntax/rpl.vim      |  2 +-
 syntax/rtf.vim      |  2 +-
 syntax/tilde.vim    |  2 +-
 22 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/ftplugin/falcon.vim b/ftplugin/falcon.vim
index 8227c8f3b..752f5bc33 100644
--- a/ftplugin/falcon.vim
+++ b/ftplugin/falcon.vim
@@ -16,7 +16,7 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-setlocal softtabstop=4 shiftwidth=4 encoding=utf-8
+setlocal softtabstop=4 shiftwidth=4
 setlocal suffixesadd=.fal,.ftd
 
 " Matchit support
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index c9b88e1b0..10ca49200 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -524,7 +524,7 @@ endfunction
   "c. link this stuff with what the user wants
   " ie. get the expression selected/under the cursor
 
-    let s:ocaml_word_char = '\w|[�-�]|'''
+    let s:ocaml_word_char = '\w|[\u00ac-\uffff]|'''
 
       "In:  the current mode (eg. "visual", "normal", etc.)
       "Out: the borders of the expression we are looking for the type
diff --git a/ftplugin/rpl.vim b/ftplugin/rpl.vim
index cc24fffd0..bfefa15a6 100644
--- a/ftplugin/rpl.vim
+++ b/ftplugin/rpl.vim
@@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 
 " Vim filetype plugin file
 " Language:     RPL/2
-" Maintainer:   Jo�l BERTRAND <rpl2@free.fr>
+" Maintainer:   Joël BERTRAND <rpl2@free.fr>
 " Last Change:	2012 Mar 07
 " Version: 		0.1
 
diff --git a/indent/rpl.vim b/indent/rpl.vim
index 190a83354..bc4420b58 100644
--- a/indent/rpl.vim
+++ b/indent/rpl.vim
@@ -4,7 +4,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 " Language:	RPL/2
 " Version:	0.2
 " Last Change:	2017 Jun 13
-" Maintainer:	BERTRAND Jo�l <rpl2@free.fr>
+" Maintainer:	BERTRAND Joël <rpl2@free.fr>
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
diff --git a/indent/tilde.vim b/indent/tilde.vim
index e23c9806e..4d5fdf305 100644
--- a/indent/tilde.vim
+++ b/indent/tilde.vim
@@ -1,7 +1,7 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tilde') == -1
 
 "Description: Indent scheme for the tilde weblanguage
-"Author: Tobias Rundstr�m <tobi@tobi.nu>
+"Author: Tobias Rundström <tobi@tobi.nu>
 "URL: http://tilde.tildesoftware.net
 "Last Change: May  8 09:15:09 CEST 2002
 
diff --git a/scripts/build b/scripts/build
index 8f46b2174..573a88919 100755
--- a/scripts/build
+++ b/scripts/build
@@ -275,10 +275,14 @@ def copy_file(package, src, dest)
         output << "if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '#{name}') == -1\n\n"
       end
       contents = File.read(input)
+      # fix encoding if required
+      contents.gsub!(/!@#%#/, "") rescue contents = contents.force_encoding('iso-8859-1').encode('utf-8')
       # ..= is feature of new vims...
       contents.gsub!(' ..= ', ' .= ')
       # https://github.com/vim/vim/pull/7091 
-      contents.gsub!('fileencoding=', 'encoding=')
+      contents.gsub!(/set(local)? fileencoding=utf-8/, '')
+      contents.gsub!(/ fileencoding=utf-8/, '')
+      contents.gsub!('À-ÿ', '\u00ac-\uffff')
       output << contents
       output << "\nendif\n"
     end
@@ -476,8 +480,8 @@ def extract(packages)
         globs = [package.fetch("glob", package.fetch('globs', '**/*.{vim,ctags,vital,txt}'))].flatten
         globs.each do |glob|
           Dir.glob("#{subdir}/#{glob}", base: subtree).each do |p|
-            next unless File.file?("#{subtree}/#{p}")
-            copy_file(package, "#{subtree}/#{p}", p)
+            next unless File.file?("#{subtree}#{p}")
+            copy_file(package, "#{subtree}#{p}", p)
           end
         end
       elsif File.exist?(subpath)
diff --git a/syntax/css.vim b/syntax/css.vim
index 9aa4af3f1..8cac40ec2 100644
--- a/syntax/css.vim
+++ b/syntax/css.vim
@@ -63,7 +63,7 @@ syn match cssClassName "\.-\=[A-Za-z_][A-Za-z0-9_-]*" contains=cssClassNameDot
 syn match cssClassNameDot contained '\.'
 
 try
-syn match cssIdentifier "#[A-Za-z�-�_@][A-Za-z�-�0-9_@-]*"
+syn match cssIdentifier "#[A-Za-z\u00ac-\uffff_@][A-Za-z\u00ac-\uffff0-9_@-]*"
 catch /^.*/
 syn match cssIdentifier "#[A-Za-z_@][A-Za-z0-9_@-]*"
 endtry
diff --git a/syntax/elf.vim b/syntax/elf.vim
index 5b6b96781..67063f69a 100644
--- a/syntax/elf.vim
+++ b/syntax/elf.vim
@@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elf') == -1
 
 " Vim syntax file
 " Language:    ELF
-" Maintainer:  Christian V. J. Br�ssow <cvjb@cvjb.de>
+" Maintainer:  Christian V. J. Brüssow <cvjb@cvjb.de>
 " Last Change: Son 22 Jun 2003 20:43:14 CEST
 " Filenames:   *.ab,*.am
 " URL:	       http://www.cvjb.de/comp/vim/elf.vim
diff --git a/syntax/forth.vim b/syntax/forth.vim
index 0e9350abd..dbdc120a7 100644
--- a/syntax/forth.vim
+++ b/syntax/forth.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'forth') == -1
 " Vim syntax file
 " Language:    FORTH
 " Current Maintainer:  Johan Kotlinski <kotlinski@gmail.com>
-" Previous Maintainer:  Christian V. J. Br�ssow <cvjb@cvjb.de>
+" Previous Maintainer:  Christian V. J. Brüssow <cvjb@cvjb.de>
 " Last Change: 2018-03-29
 " Filenames:   *.fs,*.ft
 " URL:	       https://github.com/jkotlinski/forth.vim
diff --git a/syntax/fortran.vim b/syntax/fortran.vim
index 087620c0a..4fddcef31 100644
--- a/syntax/fortran.vim
+++ b/syntax/fortran.vim
@@ -12,9 +12,9 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
 "  Fortran 77 syntax file by Mario Eusebio and Preben Guldberg.
 "  Since then, useful suggestions and contributions have been made, in order, by:
 "  Andrej Panjkov, Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile,
-"  Walter Dieudonn�, Alexander Wagner, Roman Bertle, Charles Rendleman,
+"  Walter Dieudonné, Alexander Wagner, Roman Bertle, Charles Rendleman,
 "  Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, Jan Hermann,
-"  Stefano Zaghi, Vishnu V. Krishnan, Judica�l Grasset, and Takuma Yoshida
+"  Stefano Zaghi, Vishnu V. Krishnan, Judicaël Grasset, and Takuma Yoshida
 
 if exists("b:current_syntax")
   finish
diff --git a/syntax/initng.vim b/syntax/initng.vim
index 2e1d8a453..8f8d459b0 100644
--- a/syntax/initng.vim
+++ b/syntax/initng.vim
@@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'initng') == -1
 
 " Vim syntax file
 " Language:	initng .i files
-" Maintainer:	Elan Ruusam�e <glen@pld-linux.org>
+" Maintainer:	Elan Ruusamäe <glen@pld-linux.org>
 " URL:		http://glen.alkohol.ee/pld/initng/
 " License:	GPL v2
 " Version:	0.13
diff --git a/syntax/iss.vim b/syntax/iss.vim
index de0b8e86f..835896120 100644
--- a/syntax/iss.vim
+++ b/syntax/iss.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'iss') == -1
 " Vim syntax file
 " Language:             Inno Setup File (iss file) and My InnoSetup extension
 " Maintainer:           Jason Mills (jmills@cs.mun.ca)
-" Previous Maintainer:  Dominique St�phan (dominique@mggen.com)
+" Previous Maintainer:  Dominique Stéphan (dominique@mggen.com)
 " Last Change:          2019 Sep 27
 "
 " Todo:
diff --git a/syntax/lout.vim b/syntax/lout.vim
index 872d30948..a5a254b2a 100644
--- a/syntax/lout.vim
+++ b/syntax/lout.vim
@@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lout') == -1
 
 " Vim syntax file
 " Language:    Lout
-" Maintainer:  Christian V. J. Br�ssow <cvjb@cvjb.de>
+" Maintainer:  Christian V. J. Brüssow <cvjb@cvjb.de>
 " Last Change: So 12 Feb 2012 15:15:03 CET
 " Filenames:   *.lout,*.lt
 " URL:         http://www.cvjb.de/comp/vim/lout.vim
diff --git a/syntax/moo.vim b/syntax/moo.vim
index 076788e6a..053d9df16 100644
--- a/syntax/moo.vim
+++ b/syntax/moo.vim
@@ -97,7 +97,7 @@ if exists("moo_unknown_builtin_functions")
   syn keyword mooKnownBuiltinFunction abs acos add_property add_verb asin atan binary_hash boot_player buffered_output_length callers caller_perms call_function ceil children chparent clear_property connected_players connected_seconds connection_name connection_option connection_options cos cosh create crypt ctime db_disk_size decode_binary delete_property delete_verb disassemble dump_database encode_binary equal eval exp floatstr floor flush_input force_input function_info idle_seconds index is_clear_property is_member is_player kill_task length listappend listdelete listen listeners listinsert listset log log10 match max max_object memory_usage min move notify object_bytes open_network_connection output_delimiters parent pass players properties property_info queued_tasks queue_info raise random read recycle renumber reset_max_object resume rindex rmatch seconds_left server_log server_version setadd setremove set_connection_option set_player_flag set_property_info set_task_perms set_verb_args set_verb_code set_verb_info shutdown sin sinh sqrt strcmp string_hash strsub substitute suspend tan tanh task_id task_stack ticks_left time tofloat toint toliteral tonum toobj tostr trunc typeof unlisten valid value_bytes value_hash verbs verb_args verb_code verb_info contained
 endif
 
-"�Enclosed expressions
+" Enclosed expressions
 syn match mooUnenclosedError display ~[')\]|}]~
 syn match mooParenthesesError display ~[';\]|}]~ contained
 syn region mooParentheses start=~(~ end=~)~ transparent contains=@mooEnclosedContents,mooParenthesesError
diff --git a/syntax/n1ql.vim b/syntax/n1ql.vim
index 80b940902..4aa51bec7 100644
--- a/syntax/n1ql.vim
+++ b/syntax/n1ql.vim
@@ -14,7 +14,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'n1ql') == -1
 " Questions, comments:  <n1ql AT cime.net>
 "                       https://ciurana.eu/pgp, https://keybase.io/pr3d4t0r
 "
-" vim: set encoding=utf-8:
+" vim: :
 
 
 if exists("b:current_syntax")
diff --git a/syntax/nroff.vim b/syntax/nroff.vim
index f295c6cd5..525649a84 100644
--- a/syntax/nroff.vim
+++ b/syntax/nroff.vim
@@ -2,7 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nroff') == -1
 
 " VIM syntax file
 " Language:	nroff/groff
-" Maintainer:	Pedro Alejandro L�pez-Valencia <palopezv@gmail.com>
+" Maintainer:	Pedro Alejandro López-Valencia <palopezv@gmail.com>
 " URL:		http://vorbote.wordpress.com/
 " Last Change:	2012 Feb 2
 "
@@ -10,7 +10,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nroff') == -1
 "
 " ACKNOWLEDGEMENTS:
 "
-" My thanks to J�r�me Pl�t <Jerome.Plut@ens.fr>, who was the
+" My thanks to Jérôme Plût <Jerome.Plut@ens.fr>, who was the
 " creator and maintainer of this syntax file for several years.
 " May I be as good at it as he has been.
 "
diff --git a/syntax/pascal.vim b/syntax/pascal.vim
index 90ab2abeb..8e9b0f75d 100644
--- a/syntax/pascal.vim
+++ b/syntax/pascal.vim
@@ -4,7 +4,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pascal') == -1
 " Language:	Pascal
 " Version: 2.8
 " Last Change:	2004/10/17 17:47:30
-" Maintainer:  Xavier Cr�gut <xavier.cregut@enseeiht.fr>
+" Maintainer:  Xavier Crégut <xavier.cregut@enseeiht.fr>
 " Previous Maintainer:	Mario Eusebio <bio@dq.fct.unl.pt>
 
 " Contributors: Tim Chase <tchase@csc.com>,
diff --git a/syntax/rnoweb-1.vim b/syntax/rnoweb-1.vim
index f3058c7eb..e3906c1c4 100644
--- a/syntax/rnoweb-1.vim
+++ b/syntax/rnoweb-1.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
 " Vim syntax file
 " Language:    R noweb Files
 " Maintainer:  Johannes Ranke <jranke@uni-bremen.de>
-" Last Change: 2007 M�r 30
+" Last Change: 2007 Mär 30
 " Version:     0.8
 " SVN:	       $Id: rnoweb.vim 69 2007-03-30 08:55:36Z ranke $
 " Remarks:     - This file is inspired by the proposal of 
diff --git a/syntax/robots.vim b/syntax/robots.vim
index 1bd377209..724b70b9d 100644
--- a/syntax/robots.vim
+++ b/syntax/robots.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'robots') == -1
 " Vim syntax file
 " Language:	"Robots.txt" files
 " Robots.txt files indicate to WWW robots which parts of a web site should not be accessed.
-" Maintainer:	Dominique St�phan (dominique@mggen.com)
+" Maintainer:	Dominique Stéphan (dominique@mggen.com)
 " URL: http://www.mggen.com/vim/syntax/robots.zip
 " Last change:	2001 May 09
 
diff --git a/syntax/rpl.vim b/syntax/rpl.vim
index fa052971b..be71c4d50 100644
--- a/syntax/rpl.vim
+++ b/syntax/rpl.vim
@@ -4,7 +4,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 " Language:	RPL/2
 " Version:	0.15.15 against RPL/2 version 4.00pre7i
 " Last Change:	2012 Feb 03 by Thilo Six
-" Maintainer:	Jo�l BERTRAND <rpl2@free.fr>
+" Maintainer:	Joël BERTRAND <rpl2@free.fr>
 " URL:		http://www.makalis.fr/~bertrand/rpl2/download/vim/indent/rpl.vim
 " Credits:	Nothing
 
diff --git a/syntax/rtf.vim b/syntax/rtf.vim
index d67574d2d..d795c9324 100644
--- a/syntax/rtf.vim
+++ b/syntax/rtf.vim
@@ -9,7 +9,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rtf') == -1
 " .hlp (windows help files) use compiled rtf files
 " rtf documentation at http://night.primate.wisc.edu/software/RTF/
 "
-" Maintainer:	Dominique St�phan (dominique@mggen.com)
+" Maintainer:	Dominique Stéphan (dominique@mggen.com)
 " URL: http://www.mggen.com/vim/syntax/rtf.zip
 " Last change:	2001 Mai 02
 
diff --git a/syntax/tilde.vim b/syntax/tilde.vim
index af221da47..f31c7cdfa 100644
--- a/syntax/tilde.vim
+++ b/syntax/tilde.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tilde') == -1
 " Vim syntax file
 " This file works only for Vim6.x
 " Language:	Tilde
-" Maintainer:	Tobias Rundstr�m <tobi@tildesoftware.net>
+" Maintainer:	Tobias Rundström <tobi@tildesoftware.net>
 " URL:		http://www.tildesoftware.net
 " CVS:		$Id: tilde.vim,v 1.1 2004/06/13 19:31:51 vimboss Exp $
 

From 0d48ba92455548018105670980552e54930f60eb Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 9 Oct 2020 22:57:13 +0200
Subject: [PATCH 123/299] Fix detecting of some filetypes, closes #579

---
 after/syntax/cpp.vim   | 11 +++++++++--
 autoload/go/config.vim | 16 +++++++++++++---
 doc/vim-go.txt         | 42 +++++++++++++++++++++++++++++++-----------
 ftdetect/polyglot.vim  | 20 ++++++++++----------
 scripts/build          |  2 +-
 scripts/test           |  2 +-
 syntax/zig.vim         |  2 +-
 tests/extensions.vim   |  3 +++
 8 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index 730bb819b..ec3f1fcfb 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -6,13 +6,20 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') ==
 " Original Author: Jon Haggblad <https://github.com/octol>
 " Maintainer:      bfrg <https://github.com/bfrg>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Oct 4, 2020
+" Last Change:     Oct 8, 2020
 "
 " This syntax file is based on:
 " https://github.com/octol/vim-cpp-enhanced-highlight
-" http://www.vim.org/scripts/script.php?script_id=4293
 " ==============================================================================
 
+" C++ attributes {{{1
+if get(g:, 'cpp_attributes_highlight', 0)
+    syntax region cppAttribute matchgroup=cppAttributeBrackets start='\[\[' end=']]' contains=cString
+    hi def link cppAttribute         Macro
+    hi def link cppAttributeBrackets Identifier
+endif
+
+
 " Standard library {{{1
 syntax keyword cppSTLdefine
         \ MB_CUR_MAX MB_LEN_MAX WCHAR_MAX WCHAR_MIN WEOF __STDC_UTF_16__ __STDC_UTF_32__
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index 355f90fb6..b450ad165 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -266,15 +266,25 @@ function! go#config#SetTemplateAutocreate(value) abort
 endfunction
 
 function! go#config#MetalinterCommand() abort
-  return get(g:, "go_metalinter_command", "golangci-lint")
+  return get(g:, 'go_metalinter_command', 'golangci-lint')
 endfunction
 
 function! go#config#MetalinterAutosaveEnabled() abort
-  return get(g:, "go_metalinter_autosave_enabled", ["govet", "golint"])
+  let l:default = []
+  if get(g:, 'go_metalinter_command', 'golangci-lint') == 'golangci-lint'
+    let l:default = ['govet', 'golint']
+  endif
+
+  return get(g:, 'go_metalinter_autosave_enabled', l:default)
 endfunction
 
 function! go#config#MetalinterEnabled() abort
-  return get(g:, "go_metalinter_enabled", ["vet", "golint", "errcheck"])
+  let l:default = []
+  if get(g:, 'go_metalinter_command', 'golangci-lint') == 'golangci-lint'
+    let l:default = ['vet', 'golint', 'errcheck']
+  endif
+
+  return get(g:, 'go_metalinter_enabled', l:default)
 endfunction
 
 function! go#config#GolintBin() abort
diff --git a/doc/vim-go.txt b/doc/vim-go.txt
index 7d4ac52d9..cc412836c 100644
--- a/doc/vim-go.txt
+++ b/doc/vim-go.txt
@@ -1625,27 +1625,45 @@ window. The list to use can be set using |'g:go_list_type_commands'|.
 <
                                           *'g:go_metalinter_autosave_enabled'*
 
-Specifies the enabled linters for auto |:GoMetaLinter| on save. By
-default it's using `vet` and `golint`. If any are enabled, `--disable-all`
-will be sent to the metalinter.
+Specifies the enabled linters for auto |:GoMetaLinter| on save. When the
+metalinter is `golangci-lint`, if any are enabled, `--disable-all` will be
+sent to the metalinter.
+
+When `g:go_metalinter_command` is set to `staticcheck`, the default value is
+an empty list; `staticcheck`'s `-checks` flag will not be used.
+>
+  let g:go_metalinter_autosave_enabled = ['all']
+<
+
+When `g:go_metalinter_command is set to `golangci-lint'`, the default value is
 >
   let g:go_metalinter_autosave_enabled = ['vet', 'golint']
 <
                                                    *'g:go_metalinter_enabled'*
 
-Specifies the linters to enable for the |:GoMetaLinter| command. By default
-it's using `vet`, `golint` and `errcheck`. If any are enabled, `--disable-all`
-will be sent to the metalinter.
+Specifies the linters to enable for the |:GoMetaLinter| command. For
+`golangci-lint`, if any are enabled, `--disable-all` will be passed to the
+metalinter.
+
+When `g:go_metalinter_command` is set to `staticcheck`, the default value is
+an empty list; `staticcheck`'s `-checks` flag will not be used.
+>
+  let g:go_metalinter_autosave_enabled = ['all']
+<
+
+When `g:go_metalinter_command is set to `golangci-lint'`, the default value is
 >
   let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck']
 <
                                                    *'g:go_metalinter_command'*
 
 Overrides the command to be executed when |:GoMetaLinter| is called. By
-default it's `golangci-lint`. Valid options are `golangci-lint` and `gopls`.
+default it's `golangci-lint`. Valid options are `golangci-lint, `gopls`, and
+`staticcheck`..
+
 When the value is `gopls`, users may want to consider setting
-`g:go_gopls_staticcheck`.  It can also be used as an advanced setting for
-users who want to have more control over the metalinter.
+`g:go_gopls_staticcheck`. It can also be used as an advanced setting for users
+who want to have more control over the metalinter.
 >
   let g:go_metalinter_command = "golangci-lint"
 <
@@ -1653,6 +1671,8 @@ users who want to have more control over the metalinter.
 
 Overrides the maximum time the linters have to complete. By default it's 5
 seconds.
+
+Only applies when the metalinter is `golangci-lint`.
 >
   let g:go_metalinter_deadline = "5s"
 <
@@ -2286,7 +2306,7 @@ The program will halt on the breakpoint, at which point you can inspect the
 program state. You can go to the next line with |:GoDebugNext| (<F10>) or step
 in with |:GoDebugStep| (<F11>).
 
-The program can also be halted with `:GoDebugHalt` (<F6>).
+The program can also be halted with `:GoDebugHalt` (<F8>).
 
 The variable window in the bottom left (`GODEBUG_VARIABLES`) will display all
 local variables. Struct values are displayed as `{...}`, array/slices as
@@ -2362,7 +2382,7 @@ The rest of the commands and mappings become available after executing
 
     Halt the program.
 
-    Mapped to <F6> by default.
+    Mapped to <F8> by default.
 
                                                                 *:GoDebugStop*
                                                              *(go-debug-stop)*
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 2f8cad974..3d08e2aba 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -629,7 +629,7 @@ endif
 
 if !has_key(s:disabled_packages, 'remind')
   au BufNewFile,BufRead *.rem,*.remind,{.,}reminders setf remind
-  au BufNewFile,BufRead {.,}reminders* call s:StarSetf('remind')
+  au BufNewFile,BufRead .reminders* call s:StarSetf('remind')
 endif
 
 if !has_key(s:disabled_packages, 'rrst')
@@ -854,7 +854,7 @@ if !has_key(s:disabled_packages, 'neomuttrc')
   au BufNewFile,BufRead Neomuttrc setf neomuttrc
   au BufNewFile,BufRead neomuttrc* call s:StarSetf('neomuttrc')
   au BufNewFile,BufRead Neomuttrc* call s:StarSetf('neomuttrc')
-  au BufNewFile,BufRead {.,}neomuttrc* call s:StarSetf('neomuttrc')
+  au BufNewFile,BufRead .neomuttrc* call s:StarSetf('neomuttrc')
   au BufNewFile,BufRead */.neomutt/neomuttrc* call s:StarSetf('neomuttrc')
 endif
 
@@ -882,7 +882,7 @@ if !has_key(s:disabled_packages, 'muttrc')
   au BufNewFile,BufRead Mutt{ng,}rc setf muttrc
   au BufNewFile,BufRead mutt{ng,}rc* call s:StarSetf('muttrc')
   au BufNewFile,BufRead Mutt{ng,}rc* call s:StarSetf('muttrc')
-  au BufNewFile,BufRead {.,}mutt{ng,}rc* call s:StarSetf('muttrc')
+  au BufNewFile,BufRead .mutt{ng,}rc* call s:StarSetf('muttrc')
   au BufNewFile,BufRead */etc/Muttrc.d/* call s:StarSetf('muttrc')
   au BufNewFile,BufRead */.mutt{ng,}/mutt{ng,}rc* call s:StarSetf('muttrc')
 endif
@@ -1273,7 +1273,7 @@ endif
 if !has_key(s:disabled_packages, 'gtkrc')
   au BufNewFile,BufRead {.,}gtkrc,gtkrc setf gtkrc
   au BufNewFile,BufRead gtkrc* call s:StarSetf('gtkrc')
-  au BufNewFile,BufRead {.,}gtkrc* call s:StarSetf('gtkrc')
+  au BufNewFile,BufRead .gtkrc* call s:StarSetf('gtkrc')
 endif
 
 if !has_key(s:disabled_packages, 'group')
@@ -1820,7 +1820,7 @@ if !has_key(s:disabled_packages, 'toml')
 endif
 
 if !has_key(s:disabled_packages, 'tmux')
-  au BufNewFile,BufRead {.,}tmux*.conf setf tmux
+  au BufNewFile,BufRead .tmux*.conf setf tmux
 endif
 
 if !has_key(s:disabled_packages, 'thrift')
@@ -1883,9 +1883,9 @@ endif
 if !has_key(s:disabled_packages, 'sh')
   au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc setf sh
   au BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
-  au BufNewFile,BufRead {.,}zsh* call s:StarSetf('zsh')
-  au BufNewFile,BufRead {.,}zlog* call s:StarSetf('zsh')
-  au BufNewFile,BufRead {.,}zcompdump* call s:StarSetf('zsh')
+  au BufNewFile,BufRead .zsh* call s:StarSetf('zsh')
+  au BufNewFile,BufRead .zlog* call s:StarSetf('zsh')
+  au BufNewFile,BufRead .zcompdump* call s:StarSetf('zsh')
 endif
 
 if !has_key(s:disabled_packages, 'scss')
@@ -2166,7 +2166,7 @@ endif
 
 if !has_key(s:disabled_packages, 'jq')
   au BufNewFile,BufRead *.jq,{.,}jqrc setf jq
-  au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq')
+  au BufNewFile,BufRead .jqrc* call s:StarSetf('jq')
 endif
 
 if !has_key(s:disabled_packages, 'htmldjango')
@@ -2271,7 +2271,7 @@ if !has_key(s:disabled_packages, 'git')
   au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules setf gitconfig
   au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
   au BufNewFile,BufRead git-rebase-todo setf gitrebase
-  au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
+  au BufNewFile,BufRead .gitsendemail.* call s:StarSetf('gitsendemail')
   au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
 endif
 
diff --git a/scripts/build b/scripts/build
index 573a88919..6ba4e43ae 100755
--- a/scripts/build
+++ b/scripts/build
@@ -579,7 +579,7 @@ def generate_ftdetect(packages, heuristics)
       end
 
       for filename in filenames.sort
-        if filename[0] == "."
+        if filename.match?(/^\.[^\*\/]+$/)
           filename = "{.,}" + filename[1..-1]
         end
         if filename[-1] == "*"
diff --git a/scripts/test b/scripts/test
index f22c224c1..b87d511cb 100755
--- a/scripts/test
+++ b/scripts/test
@@ -46,7 +46,7 @@ test_helptags = <<~EOF
 EOF
 
 run_vimscript('source tests/filetypes.vim')
-# run_vimscript('source tests/extensions.vim')
+run_vimscript('source tests/extensions.vim')
 run_script(test_helptags)
 
 # run_vimscript("
diff --git a/syntax/zig.vim b/syntax/zig.vim
index f6819ef58..95d52381f 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -11,7 +11,7 @@ endif
 let b:current_syntax = "zig"
 
 syn keyword zigStorage const var extern packed export pub noalias inline noinline comptime callconv volatile allowzero align linksection threadlocal anytype
-syn keyword zigStructure struct enum union error
+syn keyword zigStructure struct enum union error opaque
 syn keyword zigStatement break return continue asm defer errdefer unreachable try catch async nosuspend await suspend resume
 syn keyword zigConditional if else switch and or orelse
 syn keyword zigRepeat while for
diff --git a/tests/extensions.vim b/tests/extensions.vim
index f66065321..77ff620b7 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -385,3 +385,6 @@ call TestExtension("xml", "fglrxrc", "")
 call TestExtension("conf", "foo.conf", "")
 call TestExtension("conf", "config", "")
 call TestExtension("conf", "auto.master", "")
+
+" https://github.com/sheerun/vim-polyglot/issues/579
+call TestExtension("dart", "reminders.dart", "")

From 3da600ac3070976142f81025b53dda44d99d44e4 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 9 Oct 2020 23:00:41 +0200
Subject: [PATCH 124/299] Relax previous commit a bit

---
 ftdetect/polyglot.vim | 2 +-
 scripts/build         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 3d08e2aba..960e41b18 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1820,7 +1820,7 @@ if !has_key(s:disabled_packages, 'toml')
 endif
 
 if !has_key(s:disabled_packages, 'tmux')
-  au BufNewFile,BufRead .tmux*.conf setf tmux
+  au BufNewFile,BufRead {.,}tmux*.conf setf tmux
 endif
 
 if !has_key(s:disabled_packages, 'thrift')
diff --git a/scripts/build b/scripts/build
index 6ba4e43ae..4783ed21c 100755
--- a/scripts/build
+++ b/scripts/build
@@ -579,7 +579,7 @@ def generate_ftdetect(packages, heuristics)
       end
 
       for filename in filenames.sort
-        if filename.match?(/^\.[^\*\/]+$/)
+        if filename.match?(/^\.[^\/]+[^\*]$/)
           filename = "{.,}" + filename[1..-1]
         end
         if filename[-1] == "*"

From bbee246aaeb7fb689c7a2ae2bb911e34cabe7b00 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Oct 2020 23:01:53 +0200
Subject: [PATCH 125/299] Add and fix tests from upstream vim

---
 README.md                     |   3 +-
 autoload/polyglot/detect.vim  |  75 +++-
 autoload/polyglot/shebang.vim |   2 +-
 autoload/polyglot/sleuth.vim  |  15 +-
 ftdetect/polyglot.vim         | 161 ++++----
 ftoff.vim                     |   3 +
 ftplugin/Dockerfile.vim       |  37 --
 ftplugin/make.vim             |  37 ++
 ftplugin/sbt.vim              |  19 +
 ftplugin/xf86conf.vim         |  23 ++
 indent/Dockerfile.vim         |  27 --
 indent/make.vim               | 120 ++++++
 indent/xf86conf.vim           |  41 ++
 packages.yaml                 |  67 ++--
 scripts/build                 |  37 +-
 scripts/import_vim            | 209 +++++++++-
 scripts/test                  |  43 ++-
 syntax/Dockerfile.vim         |  63 ---
 syntax/make.vim               | 148 +++++++
 syntax/sbt.vim                |   9 +-
 syntax/xf86conf.vim           | 209 ++++++++++
 tests/extensions.vim          |   4 +
 tests/filetypes.vim           |  32 +-
 tests/native.vim              | 703 ++++++++++++++++++++++++++++++++++
 24 files changed, 1787 insertions(+), 300 deletions(-)
 create mode 100644 ftoff.vim
 delete mode 100644 ftplugin/Dockerfile.vim
 create mode 100644 ftplugin/make.vim
 create mode 100644 ftplugin/sbt.vim
 create mode 100644 ftplugin/xf86conf.vim
 delete mode 100644 indent/Dockerfile.vim
 create mode 100644 indent/make.vim
 create mode 100644 indent/xf86conf.vim
 delete mode 100644 syntax/Dockerfile.vim
 create mode 100644 syntax/make.vim
 create mode 100644 syntax/xf86conf.vim
 create mode 100644 tests/native.vim

diff --git a/README.md b/README.md
index b5b2e7cfc..4c4452ac3 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->591<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->593<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -163,7 +163,6 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [rst](https://github.com/marshallward/vim-restructuredtext)
 - [ruby](https://github.com/vim-ruby/vim-ruby)
 - [rust](https://github.com/rust-lang/rust.vim)
-- [sbt](https://github.com/derekwyatt/vim-sbt)
 - [scala](https://github.com/derekwyatt/vim-scala)
 - [scss](https://github.com/cakebaker/scss-syntax.vim)
 - [sh](https://github.com/arzg/vim-sh)
diff --git a/autoload/polyglot/detect.vim b/autoload/polyglot/detect.vim
index 85b9cd6a1..bdd2e48d6 100644
--- a/autoload/polyglot/detect.vim
+++ b/autoload/polyglot/detect.vim
@@ -4,7 +4,10 @@ set cpo&vim
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
-func! polyglot#detect#Inp()
+func! polyglot#detect#Inp(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   let line = getline(nextnonblank(1))
   if line =~# '^\*'
     set ft=abaqus | return
@@ -17,14 +20,20 @@ func! polyglot#detect#Inp()
   endfor
 endfunc
 
-func! polyglot#detect#Asa()
+func! polyglot#detect#Asa(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   if exists("g:filetype_asa")
     let &ft = g:filetype_asa | return
   endif
   set ft=aspvbs | return
 endfunc
 
-func! polyglot#detect#Asp()
+func! polyglot#detect#Asp(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   if exists("g:filetype_asp")
     let &ft = g:filetype_asp | return
   endif
@@ -37,7 +46,10 @@ func! polyglot#detect#Asp()
   set ft=aspvbs | return
 endfunc
 
-func! polyglot#detect#H()
+func! polyglot#detect#H(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   for lnum in range(1, min([line("$"), 200]))
     let line = getline(lnum)
     if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
@@ -56,7 +68,10 @@ func! polyglot#detect#H()
   set ft=cpp | return
 endfunc
 
-func! polyglot#detect#M()
+func! polyglot#detect#M(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   let saw_comment = 0
   for lnum in range(1, min([line("$"), 100]))
     let line = getline(lnum)
@@ -85,7 +100,10 @@ func! polyglot#detect#M()
   set ft=octave | return
 endfunc
 
-func! polyglot#detect#Fs()
+func! polyglot#detect#Fs(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
     if line =~# '^\(: \|new-device\)'
@@ -104,7 +122,10 @@ func! polyglot#detect#Fs()
   set ft=forth | return
 endfunc
 
-func! polyglot#detect#Re()
+func! polyglot#detect#Re(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
     if line =~# '^\s*#\%(\%(if\|ifdef\|define\|pragma\)\s\+\w\|\s*include\s\+[<"]\|template\s*<\)'
@@ -114,7 +135,10 @@ func! polyglot#detect#Re()
   endfor
 endfunc
 
-func! polyglot#detect#Idr()
+func! polyglot#detect#Idr(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   for lnum in range(1, min([line("$"), 5]))
     let line = getline(lnum)
     if line =~# '^\s*--.*[Ii]dris \=1'
@@ -148,7 +172,10 @@ func! polyglot#detect#Idr()
   set ft=idris2 | return
 endfunc
 
-func! polyglot#detect#Lidr()
+func! polyglot#detect#Lidr(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   for lnum in range(1, min([line("$"), 200]))
     let line = getline(lnum)
     if line =~# '^>\s*--.*[Ii]dris \=1'
@@ -158,7 +185,10 @@ func! polyglot#detect#Lidr()
   set ft=lidris2 | return
 endfunc
 
-func! polyglot#detect#Bas()
+func! polyglot#detect#Bas(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   for lnum in range(1, min([line("$"), 5]))
     let line = getline(lnum)
     if line =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
@@ -168,7 +198,10 @@ func! polyglot#detect#Bas()
   set ft=basic | return
 endfunc
 
-func! polyglot#detect#Pm()
+func! polyglot#detect#Pm(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   let line = getline(nextnonblank(1))
   if line =~# 'XPM2'
     set ft=xpm2 | return
@@ -192,7 +225,10 @@ func! polyglot#detect#Pm()
   set ft=perl | return
 endfunc
 
-func! polyglot#detect#Pl()
+func! polyglot#detect#Pl(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   let line = getline(nextnonblank(1))
   if line =~# '^[^#]*:-' || line =~# '^\s*\%(%\|/\*\)' || line =~# '\.\s*$'
     set ft=prolog | return
@@ -213,7 +249,10 @@ func! polyglot#detect#Pl()
   set ft=perl | return
 endfunc
 
-func! polyglot#detect#T()
+func! polyglot#detect#T(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   for lnum in range(1, min([line("$"), 5]))
     let line = getline(lnum)
     if line =~# '^\.'
@@ -236,7 +275,10 @@ func! polyglot#detect#T()
   set ft=perl | return
 endfunc
 
-func! polyglot#detect#Tt2()
+func! polyglot#detect#Tt2(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   for lnum in range(1, min([line("$"), 3]))
     let line = getline(lnum)
     if line =~? '<\%(!DOCTYPE HTML\|[%?]\|html\)'
@@ -246,7 +288,10 @@ func! polyglot#detect#Tt2()
   set ft=tt2 | return
 endfunc
 
-func! polyglot#detect#Html()
+func! polyglot#detect#Html(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
   let line = getline(nextnonblank(1))
   if line =~# '^\(%\|<[%&].*>\)'
     set ft=mason | return
diff --git a/autoload/polyglot/shebang.vim b/autoload/polyglot/shebang.vim
index 62eb11a2d..ef6bc0ed8 100644
--- a/autoload/polyglot/shebang.vim
+++ b/autoload/polyglot/shebang.vim
@@ -513,7 +513,6 @@ let s:interpreters = {
   \ 'pdksh': 'sh',
   \ 'rc': 'sh',
   \ 'sh': 'sh',
-  \ 'zsh': 'sh',
   \ 'boolector': 'smt2',
   \ 'cvc4': 'smt2',
   \ 'mathsat5': 'smt2',
@@ -526,6 +525,7 @@ let s:interpreters = {
   \ 'z3': 'smt2',
   \ 'deno': 'typescript',
   \ 'ts-node': 'typescript',
+  \ 'zsh': 'zsh',
   \ }
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 1250badf5..f8dc23444 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -1,6 +1,5 @@
 let s:globs = {
   \ '8th': '*.8th',
-  \ 'Dockerfile': '*.dockerfile,*.dock,*.Dockerfile,Dockerfile,dockerfile,Dockerfile*',
   \ 'Jenkinsfile': '*.jenkinsfile,*.Jenkinsfile,Jenkinsfile,Jenkinsfile*',
   \ 'a2ps': 'a2psrc,.a2psrc',
   \ 'a65': '*.a65',
@@ -35,7 +34,7 @@ let s:globs = {
   \ 'atlas': '*.atl,*.as',
   \ 'autohotkey': '*.ahk,*.ahkl',
   \ 'autoit': '*.au3',
-  \ 'automake': '*.mak,*.dsp,*.mk,Makefile.am,makefile.am,GNUmakefile.am',
+  \ 'automake': '[mM]akefile.am,GNUmakefile.am',
   \ 'ave': '*.ave',
   \ 'awk': '*.awk,*.gawk',
   \ 'b': '*.mch,*.ref,*.imp',
@@ -203,7 +202,7 @@ let s:globs = {
   \ 'gtkrc': '.gtkrc,gtkrc,.gtkrc*,gtkrc*',
   \ 'haml': '*.haml,*.haml.deface,*.hamlc,*.hamlbars',
   \ 'hamster': '*.hsc,*.hsm',
-  \ 'haproxy': '*.cfg,haproxy.cfg,haproxy*.conf*',
+  \ 'haproxy': 'haproxy*.conf*,haproxy*.cfg*',
   \ 'haskell': '*.hs,*.hs-boot,*.hsc,*.bpk,*.hsig',
   \ 'haste': '*.ht',
   \ 'hastepreproc': '*.htpp',
@@ -305,6 +304,7 @@ let s:globs = {
   \ 'mail': '*.eml,snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\\\{6\},neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},ae\d\+.txt,{neo,}mutt[[:alnum:]._-]\\\{6\},reportbug-*',
   \ 'mailaliases': '',
   \ 'mailcap': '.mailcap,mailcap',
+  \ 'make': '*.mak,*.dsp,*.mk,*[mM]akefile',
   \ 'mako': '*.mako,*.mao',
   \ 'mallard': '*.page',
   \ 'manconf': 'man.config',
@@ -374,7 +374,7 @@ let s:globs = {
   \ 'pamconf': '',
   \ 'pamenv': 'pam_env.conf,.pam_environment',
   \ 'papp': '*.papp,*.pxml,*.pxsl',
-  \ 'pascal': '*.pas,*.dpr',
+  \ 'pascal': '*.pas,*.pp,*.dpr,*.lpr',
   \ 'passwd': '',
   \ 'pccts': '*.g',
   \ 'pcmk': '*.pcmk',
@@ -455,7 +455,7 @@ let s:globs = {
   \ 'sas': '*.sas',
   \ 'sass': '*.sass',
   \ 'sather': '*.sa',
-  \ 'sbt.scala': '*.sbt',
+  \ 'sbt': '*.sbt',
   \ 'scala': '*.scala,*.kojo,*.sc',
   \ 'scheme': '*.scm,*.ss,*.rkt',
   \ 'scilab': '*.sci,*.sce',
@@ -469,7 +469,7 @@ let s:globs = {
   \ 'services': '',
   \ 'setserial': '',
   \ 'sexplib': '*.sexp',
-  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc',
+  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile',
   \ 'sieve': '*.siv,*.sieve',
   \ 'sil': '*.sil',
   \ 'simula': '*.sim',
@@ -536,7 +536,7 @@ let s:globs = {
   \ 'textile': '*.textile',
   \ 'tf': '*.tf,.tfrc,tfrc',
   \ 'thrift': '*.thrift',
-  \ 'tidy': '.tidyrc,tidyrc',
+  \ 'tidy': '.tidyrc,tidyrc,tidy.conf',
   \ 'tilde': '*.t.html',
   \ 'tli': '*.tli',
   \ 'tmux': '.tmux*.conf',
@@ -594,6 +594,7 @@ let s:globs = {
   \ 'wvdial': 'wvdial.conf,.wvdialrc',
   \ 'xdc': '*.xdc',
   \ 'xdefaults': '*.ad,.Xdefaults,.Xpdefaults,.Xresources,xdm-config,Xresources*',
+  \ 'xf86conf': 'XF86Config-4*,XF86Config*,xorg.conf,xorg.conf-4',
   \ 'xhtml': '*.xhtml,*.xht',
   \ 'xinetd': '',
   \ 'xmath': '*.msc,*.msf',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 960e41b18..a408d5026 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -27,6 +27,9 @@ let did_load_filetypes = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
+" Be consistent across different systems
+set nofileignorecase
+
 func! s:Observe(fn)
   let b:polyglot_observe = a:fn
   augroup polyglot-observer
@@ -118,9 +121,10 @@ augroup filetypedetect
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
-if !has_key(s:disabled_packages, 'html')
-  au! BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
-  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
+if !has_key(s:disabled_packages, 'xf86conf')
+  au BufNewFile,BufRead */xorg.conf.d/*.conf,xorg.conf,xorg.conf-4 setf xf86conf
+  au BufNewFile,BufRead XF86Config-4* call s:StarSetf('xf86conf')
+  au BufNewFile,BufRead XF86Config* call s:StarSetf('xf86conf')
 endif
 
 if !has_key(s:disabled_packages, 'pullrequest')
@@ -351,7 +355,7 @@ if !has_key(s:disabled_packages, 'tpp')
 endif
 
 if !has_key(s:disabled_packages, 'tidy')
-  au BufNewFile,BufRead {.,}tidyrc,tidyrc setf tidy
+  au BufNewFile,BufRead {.,}tidyrc,tidy.conf,tidyrc setf tidy
 endif
 
 if !has_key(s:disabled_packages, 'texmf')
@@ -563,10 +567,6 @@ if !has_key(s:disabled_packages, 'sieve')
   au BufNewFile,BufRead *.sieve,*.siv setf sieve
 endif
 
-if !has_key(s:disabled_packages, 'sed')
-  au BufNewFile,BufRead *.sed setf sed
-endif
-
 if !has_key(s:disabled_packages, 'sdl')
   au BufNewFile,BufRead *.pr,*.sdl setf sdl
 endif
@@ -579,6 +579,10 @@ if !has_key(s:disabled_packages, 'scilab')
   au BufNewFile,BufRead *.sce,*.sci setf scilab
 endif
 
+if !has_key(s:disabled_packages, 'sbt')
+  au BufNewFile,BufRead *.sbt setf sbt
+endif
+
 if !has_key(s:disabled_packages, 'sather')
   au BufNewFile,BufRead *.sa setf sather
 endif
@@ -781,7 +785,7 @@ if !has_key(s:disabled_packages, 'pdf')
 endif
 
 if !has_key(s:disabled_packages, 'pascal')
-  au BufNewFile,BufRead *.dpr,*.pas setf pascal
+  au BufNewFile,BufRead *.dpr,*.lpr,*.pas,*.pp setf pascal
 endif
 
 if !has_key(s:disabled_packages, 'passwd')
@@ -887,10 +891,6 @@ if !has_key(s:disabled_packages, 'muttrc')
   au BufNewFile,BufRead */.mutt{ng,}/mutt{ng,}rc* call s:StarSetf('muttrc')
 endif
 
-if !has_key(s:disabled_packages, 'mysql')
-  au BufNewFile,BufRead *.mysql setf mysql
-endif
-
 if !has_key(s:disabled_packages, 'msql')
   au BufNewFile,BufRead *.msql setf msql
 endif
@@ -1242,6 +1242,11 @@ if !has_key(s:disabled_packages, 'tilde')
   au BufNewFile,BufRead *.t.html setf tilde
 endif
 
+if !has_key(s:disabled_packages, 'html')
+  au BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
+  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
+endif
+
 if !has_key(s:disabled_packages, 'hollywood')
   au BufNewFile,BufRead *.hws setf hollywood
 endif
@@ -1695,11 +1700,11 @@ if !has_key(s:disabled_packages, 'gitignore')
 endif
 
 if !has_key(s:disabled_packages, 'tads')
-  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+  au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
 endif
 
 if !has_key(s:disabled_packages, 'prolog')
-  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap setf prolog
 endif
 
@@ -1722,7 +1727,7 @@ if !has_key(s:disabled_packages, 'spec')
 endif
 
 if !has_key(s:disabled_packages, 'visual-basic')
-  au! BufNewFile,BufRead,BufWritePost *.bas call polyglot#detect#Bas()
+  au BufNewFile,BufRead,BufWritePost *.bas call polyglot#detect#Bas()
   au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs setf vb
 endif
 
@@ -1731,7 +1736,7 @@ if !has_key(s:disabled_packages, 'basic')
 endif
 
 if !has_key(s:disabled_packages, 'trasys')
-  au! BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
+  au BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
 endif
 
 if !has_key(s:disabled_packages, 'zig')
@@ -1881,8 +1886,8 @@ if !has_key(s:disabled_packages, 'slim')
 endif
 
 if !has_key(s:disabled_packages, 'sh')
-  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile,zlogin,zlogout,zprofile,zshenv,zshrc setf sh
-  au BufNewFile,BufRead *.zsh,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
+  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile setf sh
+  au BufNewFile,BufRead *.zsh,*/etc/zprofile,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
   au BufNewFile,BufRead .zsh* call s:StarSetf('zsh')
   au BufNewFile,BufRead .zlog* call s:StarSetf('zsh')
   au BufNewFile,BufRead .zcompdump* call s:StarSetf('zsh')
@@ -1892,10 +1897,6 @@ if !has_key(s:disabled_packages, 'scss')
   au BufNewFile,BufRead *.scss setf scss
 endif
 
-if !has_key(s:disabled_packages, 'sbt')
-  au BufNewFile,BufRead *.sbt setf sbt.scala
-endif
-
 if !has_key(s:disabled_packages, 'scala')
   au BufNewFile,BufRead *.kojo,*.sc,*.scala setf scala
 endif
@@ -1923,7 +1924,7 @@ if !has_key(s:disabled_packages, 'rst')
 endif
 
 if !has_key(s:disabled_packages, 'reason')
-  au! BufNewFile,BufRead,BufWritePost *.re call polyglot#detect#Re()
+  au BufNewFile,BufRead,BufWritePost *.re call polyglot#detect#Re()
   au BufNewFile,BufRead *.rei setf reason
 endif
 
@@ -1936,9 +1937,9 @@ if !has_key(s:disabled_packages, 'raml')
 endif
 
 if !has_key(s:disabled_packages, 'raku')
-  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
-  au! BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
-  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+  au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 setf raku
 endif
 
@@ -2018,14 +2019,14 @@ if !has_key(s:disabled_packages, 'pgsql')
 endif
 
 if !has_key(s:disabled_packages, 'perl')
-  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
-  au! BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
-  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+  au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc setf perl
   au BufNewFile,BufRead *.pod setf pod
   au BufNewFile,BufRead *.comp,*.mason,*.mhtml setf mason
-  au! BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
-  au! BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
+  au BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
+  au BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
   au BufNewFile,BufRead *.xs setf xs
 endif
 
@@ -2038,7 +2039,7 @@ if !has_key(s:disabled_packages, 'opencl')
 endif
 
 if !has_key(s:disabled_packages, 'octave')
-  au! BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
   au BufNewFile,BufRead *.oct setf octave
 endif
 
@@ -2055,8 +2056,8 @@ if !has_key(s:disabled_packages, 'ocaml')
 endif
 
 if !has_key(s:disabled_packages, 'objc')
-  au! BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
-  au! BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
+  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+  au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
 endif
 
 if !has_key(s:disabled_packages, 'nix')
@@ -2074,7 +2075,7 @@ if !has_key(s:disabled_packages, 'nginx')
 endif
 
 if !has_key(s:disabled_packages, 'murphi')
-  au! BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
 endif
 
 if !has_key(s:disabled_packages, 'moonscript')
@@ -2090,12 +2091,8 @@ if !has_key(s:disabled_packages, 'mdx')
   au BufNewFile,BufRead *.mdx setf markdown.mdx
 endif
 
-if !has_key(s:disabled_packages, 'markdown')
-  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr setf markdown
-endif
-
 if !has_key(s:disabled_packages, 'mathematica')
-  au! BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
   au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt setf mma
 endif
 
@@ -2183,14 +2180,14 @@ if !has_key(s:disabled_packages, 'ion')
 endif
 
 if !has_key(s:disabled_packages, 'idris2')
-  au! BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
+  au BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
   au BufNewFile,BufRead *.ipkg,idris-response setf idris2
-  au! BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
+  au BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
 endif
 
 if !has_key(s:disabled_packages, 'idris')
-  au! BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
-  au! BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
+  au BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
+  au BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
   au BufNewFile,BufRead idris-response setf idris
 endif
 
@@ -2218,6 +2215,11 @@ if !has_key(s:disabled_packages, 'haskell')
   au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig setf haskell
 endif
 
+if !has_key(s:disabled_packages, 'haproxy')
+  au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
+  au BufNewFile,BufRead haproxy*.cfg* call s:StarSetf('haproxy')
+endif
+
 if !has_key(s:disabled_packages, 'handlebars')
   au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache setf html.mustache
   au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs setf html.handlebars
@@ -2263,7 +2265,7 @@ if !has_key(s:disabled_packages, 'gmpl')
 endif
 
 if !has_key(s:disabled_packages, 'glsl')
-  au! BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
+  au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
 endif
 
@@ -2280,12 +2282,12 @@ if !has_key(s:disabled_packages, 'gdscript')
 endif
 
 if !has_key(s:disabled_packages, 'fsharp')
-  au! BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
+  au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.fsi,*.fsx setf fsharp
 endif
 
 if !has_key(s:disabled_packages, 'forth')
-  au! BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
+  au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.ft,*.fth setf forth
 endif
 
@@ -2327,8 +2329,6 @@ if !has_key(s:disabled_packages, 'elixir')
 endif
 
 if !has_key(s:disabled_packages, 'dockerfile')
-  au BufNewFile,BufRead *.Dockerfile,*.dock,*.dockerfile,Dockerfile,dockerfile setf Dockerfile
-  au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
   au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml setf yaml.docker-compose
 endif
 
@@ -2336,6 +2336,14 @@ if !has_key(s:disabled_packages, 'yaml')
   au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock setf yaml
 endif
 
+if !has_key(s:disabled_packages, 'mysql')
+  au BufNewFile,BufRead *.mysql setf mysql
+endif
+
+if !has_key(s:disabled_packages, 'sed')
+  au BufNewFile,BufRead *.sed setf sed
+endif
+
 if !has_key(s:disabled_packages, 'dlang')
   au BufNewFile,BufRead *.d,*.di setf d
   au BufNewFile,BufRead *.lst setf dcov
@@ -2374,6 +2382,10 @@ if !has_key(s:disabled_packages, 'coffee-script')
   au BufNewFile,BufRead *.coffee.md,*.litcoffee setf litcoffee
 endif
 
+if !has_key(s:disabled_packages, 'markdown')
+  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr setf markdown
+endif
+
 if !has_key(s:disabled_packages, 'cmake')
   au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt setf cmake
 endif
@@ -2407,12 +2419,12 @@ if !has_key(s:disabled_packages, 'atlas')
 endif
 
 if !has_key(s:disabled_packages, 'aspperl')
-  au! BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
+  au BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
 endif
 
 if !has_key(s:disabled_packages, 'aspvbs')
-  au! BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
-  au! BufNewFile,BufRead,BufWritePost *.asa call polyglot#detect#Asa()
+  au BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
+  au BufNewFile,BufRead,BufWritePost *.asa call polyglot#detect#Asa()
 endif
 
 if !has_key(s:disabled_packages, 'asn')
@@ -2420,13 +2432,17 @@ if !has_key(s:disabled_packages, 'asn')
 endif
 
 if !has_key(s:disabled_packages, 'automake')
-  au BufNewFile,BufRead *.dsp,*.mak,*.mk,GNUmakefile.am,Makefile.am,makefile.am setf automake
+  au BufNewFile,BufRead GNUmakefile.am,[mM]akefile.am setf automake
 endif
 
 if !has_key(s:disabled_packages, 'elf')
   au BufNewFile,BufRead *.am setf elf
 endif
 
+if !has_key(s:disabled_packages, 'make')
+  au BufNewFile,BufRead *.dsp,*.mak,*.mk,*[mM]akefile setf make
+endif
+
 if !has_key(s:disabled_packages, 'autohotkey')
   au BufNewFile,BufRead *.ahk,*.ahkl setf autohotkey
 endif
@@ -2444,9 +2460,9 @@ if !has_key(s:disabled_packages, 'arduino')
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
-  au! BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
+  au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
   au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp setf cpp
-  au! BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
+  au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
   au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
 endif
 
@@ -2506,6 +2522,14 @@ if !has_key(s:disabled_packages, 'alsaconf')
   au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc setf alsaconf
 endif
 
+if !has_key(s:disabled_packages, 'conf')
+  au BufNewFile,BufRead *.conf,auto.master,config setf conf
+endif
+
+if !has_key(s:disabled_packages, 'master')
+  au BufNewFile,BufRead *.mas,*.master setf master
+endif
+
 if !has_key(s:disabled_packages, 'aidl')
   " AIDL
   au BufNewFile,BufRead *.aidl setf aidl
@@ -2541,7 +2565,7 @@ if !has_key(s:disabled_packages, 'abc')
 endif
 
 if !has_key(s:disabled_packages, 'abaqus')
-  au! BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
+  au BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
 endif
 
 if !has_key(s:disabled_packages, 'abap')
@@ -2563,19 +2587,6 @@ if !has_key(s:disabled_packages, 'a2ps')
   au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc setf a2ps
 endif
 
-if !has_key(s:disabled_packages, 'haproxy')
-  au BufNewFile,BufRead *.cfg,haproxy.cfg setf haproxy
-  au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
-endif
-
-if !has_key(s:disabled_packages, 'conf')
-  au BufNewFile,BufRead *.conf,auto.master,config setf conf
-endif
-
-if !has_key(s:disabled_packages, 'master')
-  au BufNewFile,BufRead *.mas,*.master setf master
-endif
-
 if !has_key(s:disabled_packages, 'cfg')
   au BufNewFile,BufRead *.cfg,*.hgrc,*hgrc setf cfg
 endif
@@ -3635,9 +3646,6 @@ au BufNewFile,BufRead *.mod
 	\   setf modsim3 |
 	\ endif
 
-" Modula 2  (.md removed in favor of Markdown)
-au BufNewFile,BufRead *.m2,*.DEF,*.MOD,*.mi	setf modula2
-
 " Modula 3 (.m3, .i3, .mg, .ig)
 au BufNewFile,BufRead *.[mi][3g]		setf modula3
 
@@ -3950,13 +3958,6 @@ au BufNewFile,BufRead *.rego			setf rego
 " Rexx
 au BufNewFile,BufRead *.rex,*.orx,*.rxo,*.rxj,*.jrexx,*.rexxj,*.rexx,*.testGroup,*.testUnit	setf rexx
 
-" R (Splus)
-if has("fname_case")
-  au BufNewFile,BufRead *.s,*.S			setf r
-else
-  au BufNewFile,BufRead *.s			setf r
-endif
-
 " R Help file
 if has("fname_case")
   au BufNewFile,BufRead *.rd,*.Rd		setf rhelp
diff --git a/ftoff.vim b/ftoff.vim
new file mode 100644
index 000000000..049e26cca
--- /dev/null
+++ b/ftoff.vim
@@ -0,0 +1,3 @@
+if exists("did_load_polyglot")
+  unlet did_load_polyglot
+endif
diff --git a/ftplugin/Dockerfile.vim b/ftplugin/Dockerfile.vim
deleted file mode 100644
index 85fb1ee53..000000000
--- a/ftplugin/Dockerfile.vim
+++ /dev/null
@@ -1,37 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
-
-" Define comment string
-setlocal commentstring=#\ %s
-
-" Enable automatic comment insertion
-setlocal formatoptions+=cro
-
-function! DockerfileReplaceInstruction(original, replacement)
-    let syn = synIDtrans(synID(line("."), col(".") - 1, 0))
-    if syn != hlID("Comment") && syn != hlID("Constant") && strlen(getline(".")) == 0
-        let word = a:replacement
-    else
-        let word = a:original
-    endif
-    let g:UnduBuffer = a:original
-    return word
-endfunction
-
-inoreabbr <silent> <buffer> from <C-R>=DockerfileReplaceInstruction("from", "FROM")<CR>
-inoreabbr <silent> <buffer> maintainer <C-R>=DockerfileReplaceInstruction("maintainer", "MAINTAINER")<CR>
-inoreabbr <silent> <buffer> run <C-R>=DockerfileReplaceInstruction("run", "RUN")<CR>
-inoreabbr <silent> <buffer> cmd <C-R>=DockerfileReplaceInstruction("cmd", "CMD")<CR>
-inoreabbr <silent> <buffer> label <C-R>=DockerfileReplaceInstruction("label", "LABEL")<CR>
-inoreabbr <silent> <buffer> expose <C-R>=DockerfileReplaceInstruction("expose", "EXPOSE")<CR>
-inoreabbr <silent> <buffer> env <C-R>=DockerfileReplaceInstruction("env", "ENV")<CR>
-inoreabbr <silent> <buffer> add <C-R>=DockerfileReplaceInstruction("add", "ADD")<CR>
-inoreabbr <silent> <buffer> copy <C-R>=DockerfileReplaceInstruction("copy", "COPY")<CR>
-inoreabbr <silent> <buffer> entrypoint <C-R>=DockerfileReplaceInstruction("entrypoint", "ENTRYPOINT")<CR>
-inoreabbr <silent> <buffer> volume <C-R>=DockerfileReplaceInstruction("volume", "VOLUME")<CR>
-inoreabbr <silent> <buffer> user <C-R>=DockerfileReplaceInstruction("user", "USER")<CR>
-inoreabbr <silent> <buffer> workdir <C-R>=DockerfileReplaceInstruction("workdir", "WORKDIR")<CR>
-inoreabbr <silent> <buffer> arg <C-R>=DockerfileReplaceInstruction("arg", "ARG")<CR>
-inoreabbr <silent> <buffer> onbuild <C-R>=DockerfileReplaceInstruction("onbuild", "ONBUILD")<CR>
-inoreabbr <silent> <buffer> stopsignal <C-R>=DockerfileReplaceInstruction("stopsignal", "STOPSIGNAL")<CR>
-
-endif
diff --git a/ftplugin/make.vim b/ftplugin/make.vim
new file mode 100644
index 000000000..18d69dc8c
--- /dev/null
+++ b/ftplugin/make.vim
@@ -0,0 +1,37 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'make') == -1
+
+" Vim filetype plugin file
+" Language:	Make
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2019 Apr 02
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl et< sts< fo< com< cms< inc<"
+
+" Make sure a hard tab is used, required for most make programs
+setlocal noexpandtab softtabstop=0
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" and insert the comment leader when hitting <CR> or using "o".
+setlocal fo-=t fo+=croql
+
+" Set 'comments' to format dashed lists in comments
+setlocal com=sO:#\ -,mO:#\ \ ,b:#
+
+" Set 'commentstring' to put the marker after a #.
+setlocal commentstring=#\ %s
+
+" Including files.
+let &l:include = '^\s*include'
+
+" For matchit.vim, suggested by Albert Netymk and Ken Takata.
+if exists("loaded_matchit")
+  let b:match_words = '^ *ifn\=\(eq\|def\)\>:^ *else\(\s\+ifn\=\(eq\|def\)\)\=\>:^ *endif\>,\<define\>:\<endef\>,^!\s*if\(n\=def\)\=\>:^!\s*else\(if\(n\=def\)\=\)\=\>:^!\s*endif\>'
+endif
+
+endif
diff --git a/ftplugin/sbt.vim b/ftplugin/sbt.vim
new file mode 100644
index 000000000..13601c872
--- /dev/null
+++ b/ftplugin/sbt.vim
@@ -0,0 +1,19 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sbt') == -1
+
+" Vim filetype plugin file
+" Language:     sbt
+" Maintainer:   Steven Dobay <stevendobay at protonmail.com>
+" License:      Same as Vim
+" Last Change:  2017.04.30
+" ----------------------------------------------------------------------------
+
+if exists('b:did_ftplugin') || &cp
+  finish
+endif
+
+let b:did_ftplugin = 1
+
+runtime! ftplugin/scala.vim
+
+
+endif
diff --git a/ftplugin/xf86conf.vim b/ftplugin/xf86conf.vim
new file mode 100644
index 000000000..c298379bf
--- /dev/null
+++ b/ftplugin/xf86conf.vim
@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xf86conf') == -1
+
+" Vim filetype plugin file
+" Language:             XFree86 Configuration File
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/indent/Dockerfile.vim b/indent/Dockerfile.vim
deleted file mode 100644
index 18db33d17..000000000
--- a/indent/Dockerfile.vim
+++ /dev/null
@@ -1,27 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
-
-if exists('b:did_indent') | finish | endif
-let b:did_indent = 1
-
-
-function! DockerfileIndent(line)
-  let prev_line = getline(a:line - 1)
-  if a:line > 1 && prev_line =~ '\\\s*$'
-    let i = indent(a:line - 1)
-    if i == 0
-      let i += &l:shiftwidth
-      if &l:expandtab && prev_line =~# '^RUN\s'
-        " Overindent past RUN
-        let i = 4 + &l:shiftwidth
-      endif
-    endif
-    return i
-  endif
-
-  return -1
-endfunction
-
-
-set indentexpr=DockerfileIndent(v:lnum)
-
-endif
diff --git a/indent/make.vim b/indent/make.vim
new file mode 100644
index 000000000..07436042d
--- /dev/null
+++ b/indent/make.vim
@@ -0,0 +1,120 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'make') == -1
+
+" Vim indent file
+" Language:             Makefile
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2007-05-07
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetMakeIndent()
+setlocal indentkeys=!^F,o,O,<:>,=else,=endif
+setlocal nosmartindent
+
+if exists("*GetMakeIndent")
+  finish
+endif
+
+let s:comment_rx = '^\s*#'
+let s:rule_rx = '^[^ \t#:][^#:]*:\{1,2}\%([^=:]\|$\)'
+let s:continued_rule_rx = '^[^#:]*:\{1,2}\%([^=:]\|$\)'
+let s:continuation_rx = '\\$'
+let s:assignment_rx = '^\s*\h\w*\s*[+?]\==\s*\zs.*\\$'
+let s:folded_assignment_rx = '^\s*\h\w*\s*[+?]\=='
+" TODO: This needs to be a lot more restrictive in what it matches.
+let s:just_inserted_rule_rx = '^\s*[^#:]\+:\{1,2}$'
+let s:conditional_directive_rx = '^ *\%(ifn\=\%(eq\|def\)\|else\)\>'
+let s:end_conditional_directive_rx = '^\s*\%(else\|endif\)\>'
+
+function s:remove_continuation(line)
+  return substitute(a:line, s:continuation_rx, "", "")
+endfunction
+
+function GetMakeIndent()
+  " TODO: Should this perhaps be v:lnum -1?
+"  let prev_lnum = prevnonblank(v:lnum - 1)
+  let prev_lnum = v:lnum - 1
+  if prev_lnum == 0
+    return 0
+  endif
+  let prev_line = getline(prev_lnum)
+
+  let prev_prev_lnum = prev_lnum - 1
+  let prev_prev_line = prev_prev_lnum != 0 ? getline(prev_prev_lnum) : ""
+
+  " TODO: Deal with comments.  In comments, continuations aren't interesting.
+  if prev_line =~ s:continuation_rx
+    if prev_prev_line =~ s:continuation_rx
+      return indent(prev_lnum)
+    elseif prev_line =~ s:rule_rx
+      return shiftwidth()
+    elseif prev_line =~ s:assignment_rx
+      call cursor(prev_lnum, 1)
+      if search(s:assignment_rx, 'W') != 0
+        return virtcol('.') - 1
+      else
+        " TODO: ?
+        return shiftwidth()
+      endif
+    else
+      " TODO: OK, this might be a continued shell command, so perhaps indent
+      " properly here?  Leave this out for now, but in the next release this
+      " should be using indent/sh.vim somehow.
+      "if prev_line =~ '^\t' " s:rule_command_rx
+      "  if prev_line =~ '^\s\+[@-]\%(if\)\>'
+      "    return indent(prev_lnum) + 2
+      "  endif
+      "endif
+      return indent(prev_lnum) + shiftwidth()
+    endif
+  elseif prev_prev_line =~ s:continuation_rx
+    let folded_line = s:remove_continuation(prev_prev_line) . ' ' . s:remove_continuation(prev_line)
+    let lnum = prev_prev_lnum - 1
+    let line = getline(lnum)
+    while line =~ s:continuation_rx
+      let folded_line = s:remove_continuation(line) . ' ' . folded_line
+      let lnum -= 1
+      let line = getline(lnum)
+    endwhile
+    let folded_lnum = lnum + 1
+    if folded_line =~ s:rule_rx
+      if getline(v:lnum) =~ s:rule_rx
+        return 0
+      else
+        return &ts
+      endif
+    else
+"    elseif folded_line =~ s:folded_assignment_rx
+      if getline(v:lnum) =~ s:rule_rx
+        return 0
+      else
+        return indent(folded_lnum)
+      endif
+"    else
+"      " TODO: ?
+"      return indent(prev_lnum)
+    endif
+  elseif prev_line =~ s:rule_rx
+    if getline(v:lnum) =~ s:rule_rx
+      return 0
+    else
+      return &ts
+    endif
+  elseif prev_line =~ s:conditional_directive_rx
+    return shiftwidth()
+  else
+    let line = getline(v:lnum)
+    if line =~ s:just_inserted_rule_rx
+      return 0
+    elseif line =~ s:end_conditional_directive_rx
+      return v:lnum - 1 == 0 ? 0 : indent(v:lnum - 1) - shiftwidth()
+    else
+      return v:lnum - 1 == 0 ? 0 : indent(v:lnum - 1)
+    endif
+  endif
+endfunction
+
+endif
diff --git a/indent/xf86conf.vim b/indent/xf86conf.vim
new file mode 100644
index 000000000..261c44161
--- /dev/null
+++ b/indent/xf86conf.vim
@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xf86conf') == -1
+
+" Vim indent file
+" Language:             XFree86 Configuration File
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2006-12-20
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetXF86ConfIndent()
+setlocal indentkeys=!^F,o,O,=End
+setlocal nosmartindent
+
+if exists("*GetXF86ConfIndent")
+  finish
+endif
+
+function GetXF86ConfIndent()
+  let lnum = prevnonblank(v:lnum - 1)
+
+  if lnum == 0
+    return 0
+  endif
+
+  let ind = indent(lnum)
+
+  if getline(lnum) =~? '^\s*\(Sub\)\=Section\>'
+    let ind = ind + shiftwidth()
+  endif
+
+  if getline(v:lnum) =~? '^\s*End\(Sub\)\=Section\>'
+    let ind = ind - shiftwidth()
+  endif
+
+  return ind
+endfunction
+
+endif
diff --git a/packages.yaml b/packages.yaml
index e160bfd6f..c348e351f 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -245,20 +245,27 @@ filetypes:
 - name: autohotkey
   linguist: AutoHotkey
 ---
-name: automake
+name: make
 remote: vim/vim:runtime
-glob: '**/automake.vim'
+glob: '**/make.vim'
 filetypes:
-- name: automake
+- name: make
   filenames:
-  - Makefile.am
-  - makefile.am
-  - GNUmakefile.am
+  - '*[mM]akefile'
   extensions:
   - mak
   - dsp
   - mk
 ---
+name: automake
+remote: vim/vim:runtime
+glob: '**/automake.vim'
+filetypes:
+- name: automake
+  filenames:
+  - '[mM]akefile.am'
+  - GNUmakefile.am
+---
 name: asn
 remote: vim/vim:runtime
 glob: '**/asn.vim'
@@ -493,15 +500,8 @@ filetypes:
 ---
 name: dockerfile
 remote: ekalinin/Dockerfile.vim
+glob: '**/docker-compose.vim'
 filetypes:
-- name: Dockerfile
-  linguist: Dockerfile
-  extra_extensions:
-  - dock
-  - Dockerfile
-  extra_filenames:
-  - dockerfile
-  - Dockerfile*
 - name: yaml.docker-compose
   filenames:
   - 'docker-compose*.yaml'
@@ -754,8 +754,13 @@ filetypes:
   linguist: HAProxy
   extra_filenames:
   - 'haproxy*.conf*'
+  - 'haproxy*.cfg*'
   ignored_warnings:
   - 'haproxy*.c*'
+  ignored_extensions:
+  - cfg
+  ignored_filenames:
+  - haproxy.cfg
 ---
 name: haskell
 remote: neovimhaskell/haskell-vim
@@ -1471,13 +1476,6 @@ filetypes:
   # handled by sbt plugin
   - sbt
 ---
-name: sbt
-remote: derekwyatt/vim-sbt
-filetypes:
-- name: sbt.scala
-  extensions:
-  - sbt
----
 name: scss
 remote: cakebaker/scss-syntax.vim
 filetypes:
@@ -1497,10 +1495,19 @@ filetypes:
   - '.zlogin'
   - '.zprofile'
   - '.zlogout'
+  - 'zshrc'
+  - 'zshenv'
+  - 'zlogin'
+  - 'zprofile'
+  - 'zlogout'
   # Udev symlinks config
   extra_filenames:
   - '*/etc/udev/cdsymlinks.conf'
+  ignored_interpreters:
+  - zsh
 - name: zsh
+  interpreters:
+  - zsh
   extensions:
   - zsh
   filenames:
@@ -1513,6 +1520,7 @@ filetypes:
   - '.zcompdump*'
   - '.zfbfmarks'
   - '.zsh*'
+  - '*/etc/zprofile'
 ---
 name: zinit
 remote: zinit-zsh/zplugin-vim-syntax
@@ -2321,7 +2329,7 @@ glob: "**/dockerfile.vim"
 filetypes:
 - name: dockerfile
   patterns:
-  - pattern: Containerfile,Dockerfile,*.Dockerfile
+  - pattern: Containerfile,Dockerfile,*.Dockerfile,*.dock,dockerfile,Dockerfile*
     description: Dockerfile; Podman uses the same syntax with name Containerfile
 ---
 name: dcd
@@ -3974,9 +3982,9 @@ glob: "**/pascal.vim"
 filetypes:
 - name: pascal
   patterns:
-  - pattern: "*.pas"
+  - pattern: "*.pas,*.pp"
     description: Pascal (also *.p)
-  - pattern: "*.dpr"
+  - pattern: "*.dpr,*.lpr"
     description: Delphi or Lazarus program file
 ---
 name: pdf
@@ -4624,6 +4632,7 @@ filetypes:
 name: st
 remote: vim/vim:runtime
 glob: "**/st.vim"
+after: html
 filetypes:
 - name: st
   patterns:
@@ -4969,7 +4978,7 @@ glob: "**/tidy.vim"
 filetypes:
 - name: tidy
   patterns:
-  - pattern: ".tidyrc,tidyrc"
+  - pattern: ".tidyrc,tidyrc,tidy.conf"
     description: Tidy config
 ---
 name: tf
@@ -5491,3 +5500,11 @@ name: html5
 remote: sheerun/html5.vim
 dependencies: html
 filetypes: []
+---
+name: xf86conf
+remote: vim/vim:runtime
+glob: "**/xf86conf.vim"
+filetypes:
+- name: xf86conf
+  patterns:
+  - pattern: "XF86Config-4*,XF86Config*,*/xorg.conf.d/*.conf,xorg.conf,xorg.conf-4"
diff --git a/scripts/build b/scripts/build
index 4783ed21c..6f85776bb 100755
--- a/scripts/build
+++ b/scripts/build
@@ -22,6 +22,7 @@ def except(hash, *keys)
   h
 end
 
+
 def verify(packages, heuristics)
   extensions_with_heuristics = Set.new(heuristics.flat_map { |e| e["extensions"] })
   no_heuristics = Hash.new { |a, b| a[b] = [] }
@@ -64,7 +65,7 @@ def sort_packages(packages)
   for p in packages
     for f in p["filetypes"]
       for e in f["extensions"]
-        by_extension[e] << p["name"]
+        by_extension[e] << p["name"] unless by_extension[e].include?(p["name"])
       end
     end
   end
@@ -84,6 +85,25 @@ def sort_packages(packages)
           end
         end
       end
+
+      for e in f["extensions"]
+        if e.count(".") > 0
+          ext = e.split(".").last
+          for name in by_extension[ext]
+            if p["name"] != name
+              implicit_dependencies[p["name"]] |= [name]
+            end
+          end
+        end
+
+        if e.match?(/[A-Z]/) && by_extension[e.downcase].size > 0
+          for name in by_extension[e.downcase]
+            if p["name"] != name
+              implicit_dependencies[p["name"]] |= [name]
+            end
+          end
+        end
+      end
     end
   end
 
@@ -120,6 +140,7 @@ def load_data()
             end
           end
         end
+        filetype.delete("patterns")
       end
       if filetype["linguist"]
         if filetype["extensions"]
@@ -338,7 +359,11 @@ def pattern_to_condition(rule)
 end
 
 def rules_to_code(rules)
-  output = ""
+  output = <<~EOF
+  if a:0 != 1 && did_filetype()
+    return
+  endif
+  EOF
 
   vars = []
   each_hash(rules) do |h|
@@ -595,7 +620,7 @@ def generate_ftdetect(packages, heuristics)
 
       for heuristic in filetype_heuristics.uniq
         extensions = heuristic["extensions"].map { |e| "*.#{e}" }
-        autocommands << "au! BufNewFile,BufRead,BufWritePost #{extensions.join(",")} call polyglot#detect##{camelize(heuristic["extensions"].first)}()"
+        autocommands << "au BufNewFile,BufRead,BufWritePost #{extensions.join(",")} call polyglot#detect##{camelize(heuristic["extensions"].first)}()"
       end
 
       if autocommands.size > 0 && filetype["description"]
@@ -621,7 +646,7 @@ def generate_ftdetect(packages, heuristics)
 
   for heuristic in heuristics
     output << <<~EOS
-      func! polyglot#detect##{camelize(heuristic["extensions"].first)}()
+      func! polyglot#detect##{camelize(heuristic["extensions"].first)}(...)
       #{indent(rules_to_code(heuristic), 2)}
       endfunc
     EOS
@@ -843,8 +868,4 @@ if __FILE__ == $0
   generate_plugins(packages)
   generate_tests(packages)
   puts(" Bye! Have a wonderful time!")
-
-  if !ENV["DEV"]
-    FileUtils.rm_rf("tmp")
-  end
 end
diff --git a/scripts/import_vim b/scripts/import_vim
index 0cf9231c8..9e65da67d 100755
--- a/scripts/import_vim
+++ b/scripts/import_vim
@@ -1,15 +1,16 @@
 #!/usr/bin/env ruby
 
 require 'yaml'
+require 'json'
 
 def comma_expanson(s)
-  s.scan(/{[^{]+}|[^{]+/).map { |a| a[0] == "{" ? a : a.split(",", -1) }.reduce([]) do |a, b|
+  s.scan(/{[^{]+}|[^{]+/).map { |a| a[0] == "{" ? a : a.split(/(?<!\\),/, -1) }.reduce([]) do |a, b|
     a.size > 0 ?
       (b.is_a?(String) ?
          a[0..-2] + [a[-1] + b] :
          a[0..-2] + [a[-1] + b[0]] + b[1..-1]) :
       [b].flatten
-  end
+  end.map { |e| e.gsub('\\,', ',')}
 end
 
 def import_autocommands
@@ -37,6 +38,9 @@ vim -es -u DEFAULTS -c 'exe("func! Capture() \\n redir => capture \\n silent aut
     end
   end
 
+  for k, v in filetypes
+    filetypes[k].uniq!
+  end
 
   filetypes
 end
@@ -87,8 +91,6 @@ def generate_packages_entries(filetypes, comments)
   return entries
 end
 
-filetypes = import_autocommands
-
 def fix_quotes(a)
   a = a.gsub(/\\/) { '\\\\' }
   a.scan(/^.*?"(.+?)"\n/m).each { |p| a[p[0]] = p[0].gsub('"') { '\\"'} }
@@ -114,9 +116,200 @@ def get_comments
   result
 end
 
-comments = get_comments()
-autocommands = import_autocommands()
-entries = generate_packages_entries(autocommands, comments)
-print(entries.join(""))
+def square_expansion(s)
+  return [s] unless s.include?('[')
+  s.scan(/(\[[^\]]+\]|[^\[]+)/).map { |x| x[0] }
+    .map { |x| x[0] == "[" ? x[1..-2].split("") : [x] }
+    .reduce(&:product).map(&:flatten).map(&:join)
+end
+
+def brace_expansion(s)
+  if !s.include?('{')
+    return [s]
+  end
+  r=1                                       # Dummy value to forward-declare the parse function `r`
+  t=->x{                                    # Function to parse a bracket block
+    x=x[0].gsub(/^{(.*)}$/){$1}             # Remove outer brackets if both are present
+                                            # x[0] is required because of quirks in the `scan` function
+    x=x.scan(/(({(\g<1>|,)*}|[^,{}]|(?<=,|^)(?=,|$))+)/)
+                                            # Regex black magic: collect elements of outer bracket
+    x.map{|i|i=i[0];i[?{]?r[i]:i}.flatten   # For each element with brackets, run parse function
+  }
+  r=->x{                                    # Function to parse bracket expansions a{b,c}{d,e}
+    i=x.scan(/({(\g<1>)*}|[^{} ]+)/)        # Regex black magic: scan for adjacent sets of brackets
+    i=i.map(&t)                             # Map all elements against the bracket parser function `t`
+    i.shift.product(*i).map &:join          # Combine the adjacent sets with cartesian product and join them together
+  }
+  s.split.map(&r).flatten
+end
+
+def generate_tests(autocommands)
+  existing = JSON.parse(File.read('tmp/vim/vim/src/testdir/test_filetype.vim')
+    .match(/let s:filename_checks = ({.*?\\ })/m)[1]
+    .gsub('    \\', ' ').gsub("'", '"')
+    .gsub('$VIMRUNTIME .', '').gsub(",\n  }", "}"))
+
+  output = []
+
+  generated = {}
+  for ft in autocommands.keys().sort()
+    patterns = autocommands[ft]
+
+    files1 = []
+    to_delete = []
+
+    patterns.reject! { |p| p.match?(/[\|\\\(]/) }
+
+    patterns = patterns.map do |pattern|
+      pattern = pattern.gsub('[0-9]', '1').gsub('[2-3]', '2').gsub('[1-3]', '1').gsub('?', 'x')
+
+      if pattern.match?(/\/\*\.[^\*\/]+$/)
+        pattern = pattern.gsub(/\/\*\.([^\*\/]+)$/, '/file.\1')
+      end
+
+      if pattern.match?(/[\/\.-]\*$/)
+        pattern = pattern[0..-2] + "file"
+      end
+
+      pattern = pattern.gsub(/\/\*\//) { '/any/' }
+
+      pattern
+    end
+
+    patterns = patterns.flat_map { |p| brace_expansion(p) }
 
+    for pattern in patterns
+      if pattern.match(/^\*[.\,][^\*\/]+$/)
+        files1 << pattern.gsub('*', 'file')
+
+        to_delete << pattern
+      end
+      if pattern.match(/^[^\*\/]+\.\*$/)
+        files1 << pattern.gsub('*', 'file')
+        to_delete << pattern
+      end
+    end
+    files1.sort!
+    patterns = patterns - to_delete
 
+
+    files2 = []
+    for pattern in patterns
+      if !pattern.match(/\*/)
+        files2 << pattern
+        to_delete << pattern
+      end
+    end
+    files2.sort!
+    patterns = patterns - to_delete
+
+    patterns = patterns.flat_map do |pattern|
+      if pattern.match?(/^\*\//)
+        [pattern[1..-1], "any" + pattern[1..-1]]
+      else
+        [pattern]
+      end
+    end
+    
+    patterns = patterns.flat_map do |pattern|
+      if pattern.match?(/^\*[-\.]/)
+        ["some" + pattern[1..-1]]
+      elsif pattern.match?(/^\*/)
+        [pattern[1..-1], "some-" + pattern[1..-1]]
+      else
+        [pattern]
+      end
+    end
+
+    patterns = patterns.flat_map do |pattern|
+      if pattern.match?(/[^\/]+\/\*-[^\\]+$/)
+        [pattern.gsub('/*-', '/file-')]
+      elsif pattern.match?(/[^\/]+\/\*\.[^\\]+$/)
+        [pattern.gsub('/*.', '/file.')]
+      elsif pattern.match?(/[^\/]+\/\*[^\\]+$/)
+        [pattern.gsub('/*', '/'), pattern.gsub('/*', '/some-')]
+      else
+        [pattern]
+      end
+    end
+
+    patterns = patterns.flat_map do |pattern|
+      if pattern.include?('-*/')
+        [pattern.gsub('-*/', '-file/')]
+      elsif pattern.include?('.*/')
+        [pattern.gsub('.*/', '.file/')]
+      elsif pattern.include?('*/')
+        [pattern.gsub('*/', '/'), pattern.gsub('*/', '-some/')]
+      else
+        [pattern]
+      end
+    end
+
+    patterns = patterns.flat_map do |pattern|
+      if pattern.match?(/[^\/]+\.\*\.([^\*\/]+)$/)
+        [pattern.gsub('.*.', '.file.')]
+      elsif pattern.match?(/[^\/]+-\*\.([^\*\/]+)$/)
+        [pattern.gsub('-*.', '-file.')]
+      elsif pattern.match?(/[^\/]+\*\.([^\*\/]+)$/)
+        [pattern.gsub('*.', '.'), pattern.gsub('*.', '-file.')]
+      else
+        [pattern]
+      end
+    end
+
+    patterns = patterns.flat_map do |pattern|
+      if pattern.match?(/\*$/)
+        [pattern[0..-2], pattern[0..-2] + "-file"]
+      else
+        [pattern]
+      end
+    end
+    patterns.sort!
+
+    files = [*files1, *files2, *patterns].flat_map { |e| square_expansion(e) }
+    generated[ft] = files
+
+  end
+
+
+  for ft, original in existing
+    for file in generated.fetch(ft, [])
+
+      unless original.include?(file) || ['file.DEF', 'file.MOD', 'file.BUILD', 'BUILD'].include?(file) || ft == "help"
+        original << file
+      end
+    end
+    generated.delete(ft)
+    output << "    \\ '#{ft}': #{JSON.generate(original).gsub('"', "'").gsub("','", "', '")},"
+  end
+
+  for ft, paths in generated
+    idx = output.find_index { |a| a > "    \\ '" + ft }
+    output.insert(idx, "    \\ '#{ft}': #{JSON.generate(paths).gsub('"', "'").gsub("','", "', '")},")
+  end
+
+
+  output << "    \\ }"
+
+  msgs = <<'EOF'
+    \ 'messages': ['/log/auth', '/log/cron', '/log/daemon', '/log/debug', '/log/kern', '/log/lpr', '/log/mail', '/log/messages', '/log/news/news', '/log/syslog', '/log/user',
+    \     '/log/auth.log', '/log/cron.log', '/log/daemon.log', '/log/debug.log', '/log/kern.log', '/log/lpr.log', '/log/mail.log', '/log/messages.log', '/log/news/news.log', '/log/syslog.log', '/log/user.log',
+    \     '/log/auth.err', '/log/cron.err', '/log/daemon.err', '/log/debug.err', '/log/kern.err', '/log/lpr.err', '/log/mail.err', '/log/messages.err', '/log/news/news.err', '/log/syslog.err', '/log/user.err',
+    \      '/log/auth.info', '/log/cron.info', '/log/daemon.info', '/log/debug.info', '/log/kern.info', '/log/lpr.info', '/log/mail.info', '/log/messages.info', '/log/news/news.info', '/log/syslog.info', '/log/user.info',
+    \      '/log/auth.warn', '/log/cron.warn', '/log/daemon.warn', '/log/debug.warn', '/log/kern.warn', '/log/lpr.warn', '/log/mail.warn', '/log/messages.warn', '/log/news/news.warn', '/log/syslog.warn', '/log/user.warn',
+    \      '/log/auth.crit', '/log/cron.crit', '/log/daemon.crit', '/log/debug.crit', '/log/kern.crit', '/log/lpr.crit', '/log/mail.crit', '/log/messages.crit', '/log/news/news.crit', '/log/syslog.crit', '/log/user.crit',
+    \      '/log/auth.notice', '/log/cron.notice', '/log/daemon.notice', '/log/debug.notice', '/log/kern.notice', '/log/lpr.notice', '/log/mail.notice', '/log/messages.notice', '/log/news/news.notice', '/log/syslog.notice', '/log/user.notice'],
+EOF
+
+
+  "let s:filename_checks = {\n" + output.join("\n").gsub("'/doc/help.txt'", "$VIMRUNTIME . '/doc/help.txt'").gsub(/    \\ 'messages':.*?\],\n/m) { msgs }
+
+
+end
+
+#comments = get_comments()
+autocommands = import_autocommands()
+# entries = generate_packages_entries(autocommands, comments)
+# print(entries.join(""))
+result = generate_tests(autocommands)
+print(result)
diff --git a/scripts/test b/scripts/test
index b87d511cb..ae4080638 100755
--- a/scripts/test
+++ b/scripts/test
@@ -1,17 +1,17 @@
 #!/usr/bin/env ruby
 
 def run_script(src)
-  system("bash", "-c", src)
+  if system("bash", "-eo", "pipefail", "-c", src) != true
+    exit(1)
+  end
 end
 
 def run_vimscript(src)
+
   wrapper = <<~EOF
     vim --clean --not-a-term -u <(cat <<- "EOM"
-    let g:polyglot_test = 1
     set nocompatible
-    let &rtp='$PWD,' . &rtp
-    filetype plugin indent on
-    syntax on
+    let &rtp='#{Dir.pwd},' . &rtp
     set t_ti= t_te=
     set shortmess+=F
     set noswapfile
@@ -23,18 +23,36 @@ def run_vimscript(src)
       endif
     endfunc
     EOM
+  EOF
+
+  wrapper += <<~'EOF'
     ) -S <(cat <<- "EOM"
-      try
       #{src}
-      catch
-        echo v:exception
-        echo v:throwpoint
-      endtry
+
+      redir @q
+      silent function /^NewTest_
+      redir END
+      let s:tests = split(substitute(@q, '\(function\|def\) \(\k*()\)', '\2', 'g'))
+      for test in s:tests
+        echo test
+        %bwipe!
+        exe 'call ' . test
+        set noinsertmode
+        if len(v:errors) > 0
+          for err in v:errors
+            echo err
+          endfor
+          cq!
+        endif
+      endfor
+
       qa!
     EOM
     ) | perl -pe 's/\e\[[0-9;]*[a-zA-Z]//g'
   EOF
 
+  wrapper.gsub!('#{src}') { src }
+
   run_script(wrapper)
 end
 
@@ -47,6 +65,11 @@ EOF
 
 run_vimscript('source tests/filetypes.vim')
 run_vimscript('source tests/extensions.vim')
+
+if !ENV['DEV']
+  run_vimscript('source tests/native.vim')
+end
+
 run_script(test_helptags)
 
 # run_vimscript("
diff --git a/syntax/Dockerfile.vim b/syntax/Dockerfile.vim
deleted file mode 100644
index 2f68794c6..000000000
--- a/syntax/Dockerfile.vim
+++ /dev/null
@@ -1,63 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
-
-" Vim syntax file
-" Language: Dockerfile
-" Maintainer: Eugene Kalinin
-" Latest Revision: 11 September 2013
-" Source: http://docs.docker.io/en/latest/use/builder/
-
-if exists("b:current_syntax")
-  finish
-endif
-
-" case sensitivity (fix #17)
-" syn case  ignore
-
-" Keywords
-syn keyword dockerfileKeywords FROM AS MAINTAINER RUN CMD COPY
-syn keyword dockerfileKeywords EXPOSE ADD ENTRYPOINT
-syn keyword dockerfileKeywords VOLUME USER WORKDIR ONBUILD
-syn keyword dockerfileKeywords LABEL ARG HEALTHCHECK SHELL STOPSIGNAL
-
-" Bash statements
-setlocal iskeyword+=-
-syn keyword bashStatement add-apt-repository adduser apk apt-get aptitude apt-key autoconf bundle
-syn keyword bashStatement cd chgrp chmod chown clear complete composer cp curl du echo egrep
-syn keyword bashStatement expr fgrep find gem gnufind gnugrep gpg grep groupadd head less ln
-syn keyword bashStatement ls make mkdir mv node npm pacman pip pip3 php python rails rm rmdir rpm ruby
-syn keyword bashStatement sed sleep sort strip tar tail tailf touch useradd virtualenv yum
-syn keyword bashStatement usermod bash cat a2ensite a2dissite a2enmod a2dismod apache2ctl
-syn keyword bashStatement wget gzip
-
-" Strings
-syn region dockerfileString start=/"/ skip=/\\"|\\\\/ end=/"/
-syn region dockerfileString1 start=/'/ skip=/\\'|\\\\/ end=/'/
-
-" Emails
-syn region dockerfileEmail start=/</ end=/>/ contains=@ oneline
-
-" Urls
-syn match dockerfileUrl /\(http\|https\|ssh\|hg\|git\)\:\/\/[a-zA-Z0-9\/\-\._]\+/
-
-" Task tags
-syn keyword dockerfileTodo contained TODO FIXME XXX
-
-" Comments
-syn region dockerfileComment start="#" end="\n" contains=dockerfileTodo
-syn region dockerfileEnvWithComment start="^\s*ENV\>" end="\n" contains=dockerfileEnv
-syn match dockerfileEnv contained /\<ENV\>/
-
-" Highlighting
-hi link dockerfileKeywords  Keyword
-hi link dockerfileEnv       Keyword
-hi link dockerfileString    String
-hi link dockerfileString1   String
-hi link dockerfileComment   Comment
-hi link dockerfileEmail     Identifier
-hi link dockerfileUrl       Identifier
-hi link dockerfileTodo      Todo
-hi link bashStatement       Function
-
-let b:current_syntax = "dockerfile"
-
-endif
diff --git a/syntax/make.vim b/syntax/make.vim
new file mode 100644
index 000000000..349305ba6
--- /dev/null
+++ b/syntax/make.vim
@@ -0,0 +1,148 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'make') == -1
+
+" Vim syntax file
+" Language:	Makefile
+" Maintainer:	Roland Hieber <rohieb+vim-iR0jGdkV@rohieb.name>, <https://github.com/rohieb>
+" Previous Maintainer:	Claudio Fleiner <claudio@fleiner.com>
+" URL:		https://github.com/vim/vim/blob/master/runtime/syntax/make.vim
+" Last Change:	2020 May 03
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" some special characters
+syn match makeSpecial	"^\s*[@+-]\+"
+syn match makeNextLine	"\\\n\s*"
+
+" catch unmatched define/endef keywords.  endef only matches it is by itself on a line, possibly followed by a commend
+syn region makeDefine start="^\s*define\s" end="^\s*endef\s*\(#.*\)\?$"
+	\ contains=makeStatement,makeIdent,makePreCondit,makeDefine
+
+" Microsoft Makefile specials
+syn case ignore
+syn match makeInclude	"^!\s*include\s.*$"
+syn match makePreCondit "^!\s*\(cmdswitches\|error\|message\|include\|if\|ifdef\|ifndef\|else\|else\s*if\|else\s*ifdef\|else\s*ifndef\|endif\|undef\)\>"
+syn case match
+
+" identifiers
+syn region makeIdent	start="\$(" skip="\\)\|\\\\" end=")" contains=makeStatement,makeIdent
+syn region makeIdent	start="\${" skip="\\}\|\\\\" end="}" contains=makeStatement,makeIdent
+syn match makeIdent	"\$\$\w*"
+syn match makeIdent	"\$[^({]"
+syn match makeIdent	"^ *[^:#= \t]*\s*[:+?!*]="me=e-2
+syn match makeIdent	"^ *[^:#= \t]*\s*::="me=e-3
+syn match makeIdent	"^ *[^:#= \t]*\s*="me=e-1
+syn match makeIdent	"%"
+
+" Makefile.in variables
+syn match makeConfig "@[A-Za-z0-9_]\+@"
+
+" make targets
+syn match makeImplicit		"^\.[A-Za-z0-9_./\t -]\+\s*:$"me=e-1
+syn match makeImplicit		"^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2
+
+syn region makeTarget transparent matchgroup=makeTarget
+	\ start="^[~A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"rs=e-1
+	\ end=";"re=e-1,me=e-1 end="[^\\]$"
+	\ keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment,makeDString
+	\ skipnl nextGroup=makeCommands
+syn match makeTarget		"^[~A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*::\=\s*$"
+	\ contains=makeIdent,makeSpecTarget,makeComment
+	\ skipnl nextgroup=makeCommands,makeCommandError
+
+syn region makeSpecTarget	transparent matchgroup=makeSpecTarget
+	\ start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*:\{1,2}[^:=]"rs=e-1
+	\ end="[^\\]$" keepend
+	\ contains=makeIdent,makeSpecTarget,makeNextLine,makeComment skipnl nextGroup=makeCommands
+syn match makeSpecTarget	"^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*::\=\s*$"
+	\ contains=makeIdent,makeComment
+	\ skipnl nextgroup=makeCommands,makeCommandError
+
+syn match makeCommandError "^\s\+\S.*" contained
+syn region makeCommands contained start=";"hs=s+1 start="^\t"
+	\ end="^[^\t#]"me=e-1,re=e-1 end="^$"
+	\ contains=makeCmdNextLine,makeSpecial,makeComment,makeIdent,makePreCondit,makeDefine,makeDString,makeSString
+	\ nextgroup=makeCommandError
+syn match makeCmdNextLine	"\\\n."he=e-1 contained
+
+" some directives
+syn match makePreCondit	"^ *\(ifn\=\(eq\|def\)\>\|else\(\s\+ifn\=\(eq\|def\)\)\=\>\|endif\>\)"
+syn match makeInclude	"^ *[-s]\=include\s.*$"
+syn match makeStatement	"^ *vpath"
+syn match makeExport    "^ *\(export\|unexport\)\>"
+syn match makeOverride	"^ *override\>"
+" Statements / Functions (GNU make)
+syn match makeStatement contained "(\(abspath\|addprefix\|addsuffix\|and\|basename\|call\|dir\|error\|eval\|file\|filter-out\|filter\|findstring\|firstword\|flavor\|foreach\|guile\|if\|info\|join\|lastword\|notdir\|or\|origin\|patsubst\|realpath\|shell\|sort\|strip\|subst\|suffix\|value\|warning\|wildcard\|word\|wordlist\|words\)\>"ms=s+1
+
+" Comment
+if exists("make_microsoft")
+   syn match  makeComment "#.*" contains=@Spell,makeTodo
+elseif !exists("make_no_comments")
+   syn region  makeComment	start="#" end="^$" end="[^\\]$" keepend contains=@Spell,makeTodo
+   syn match   makeComment	"#$" contains=@Spell
+endif
+syn keyword makeTodo TODO FIXME XXX contained
+
+" match escaped quotes and any other escaped character
+" except for $, as a backslash in front of a $ does
+" not make it a standard character, but instead it will
+" still act as the beginning of a variable
+" The escaped char is not highlightet currently
+syn match makeEscapedChar	"\\[^$]"
+
+
+syn region  makeDString start=+\(\\\)\@<!"+  skip=+\\.+  end=+"+  contained contains=makeIdent
+syn region  makeSString start=+\(\\\)\@<!'+  skip=+\\.+  end=+'+  contained contains=makeIdent
+syn region  makeBString start=+\(\\\)\@<!`+  skip=+\\.+  end=+`+  contains=makeIdent,makeSString,makeDString,makeNextLine
+
+" Syncing
+syn sync minlines=20 maxlines=200
+
+" Sync on Make command block region: When searching backwards hits a line that
+" can't be a command or a comment, use makeCommands if it looks like a target,
+" NONE otherwise.
+syn sync match makeCommandSync groupthere NONE "^[^\t#]"
+syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"
+syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}\s*$"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link makeNextLine	makeSpecial
+hi def link makeCmdNextLine	makeSpecial
+hi link     makeOverride        makeStatement
+hi link     makeExport          makeStatement
+
+hi def link makeSpecTarget	Statement
+if !exists("make_no_commands")
+hi def link makeCommands	Number
+endif
+hi def link makeImplicit	Function
+hi def link makeTarget		Function
+hi def link makeInclude		Include
+hi def link makePreCondit	PreCondit
+hi def link makeStatement	Statement
+hi def link makeIdent		Identifier
+hi def link makeSpecial		Special
+hi def link makeComment		Comment
+hi def link makeDString		String
+hi def link makeSString		String
+hi def link makeBString		Function
+hi def link makeError		Error
+hi def link makeTodo		Todo
+hi def link makeDefine		Define
+hi def link makeCommandError	Error
+hi def link makeConfig		PreCondit
+
+let b:current_syntax = "make"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif
diff --git a/syntax/sbt.vim b/syntax/sbt.vim
index 80b360e6a..2a2806243 100644
--- a/syntax/sbt.vim
+++ b/syntax/sbt.vim
@@ -1,9 +1,9 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sbt') == -1
 
 " Vim syntax file
-" Language:     sbt
-" Maintainer:   Derek Wyatt <derek@{myfirstname}{mylastname}.org>
-" Last Change:  2013 Oct 20
+" Language:    sbt
+" Maintainer:  Steven Dobay <stevendobay at protonmail.com>
+" Last Change: 2017.04.30
 
 if exists("b:current_syntax")
   finish
@@ -17,7 +17,6 @@ syn match sbtStringEscape "\\[nrfvb\\\"]" contained
 
 syn match sbtIdentitifer "^\S\+\ze\s*\(:=\|++=\|+=\|<<=\|<+=\)"
 syn match sbtBeginningSeq "^[Ss]eq\>"
-syn match sbtAddPlugin "^addSbtPlugin\>"
 
 syn match sbtSpecial "\(:=\|++=\|+=\|<<=\|<+=\)"
 
@@ -28,10 +27,10 @@ syn region sbtDocComment start="/\*\*" end="\*/" keepend
 hi link sbtString String
 hi link sbtIdentitifer Keyword
 hi link sbtBeginningSeq Keyword
-hi link sbtAddPlugin Keyword
 hi link sbtSpecial Special
 hi link sbtComment Comment
 hi link sbtLineComment Comment
 hi link sbtDocComment Comment
 
+
 endif
diff --git a/syntax/xf86conf.vim b/syntax/xf86conf.vim
new file mode 100644
index 000000000..1c2950578
--- /dev/null
+++ b/syntax/xf86conf.vim
@@ -0,0 +1,209 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xf86conf') == -1
+
+" Vim syntax file
+" This is a GENERATED FILE. Please always refer to source file at the URI below.
+" Language: XF86Config (XFree86 configuration file)
+" Former Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz>
+" Last Change: 2010 Nov 01
+" URL: http://trific.ath.cx/Ftp/vim/syntax/xf86conf.vim
+" Required Vim Version: 6.0
+"
+" Options: let xf86conf_xfree86_version = 3 or 4
+"							 to force XFree86 3.x or 4.x XF86Config syntax
+
+" Setup
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+if !exists("b:xf86conf_xfree86_version")
+	if exists("xf86conf_xfree86_version")
+		let b:xf86conf_xfree86_version = xf86conf_xfree86_version
+	else
+		let b:xf86conf_xfree86_version = 4
+	endif
+endif
+
+syn case ignore
+
+" Comments
+syn match xf86confComment "#.*$" contains=xf86confTodo
+syn case match
+syn keyword xf86confTodo FIXME TODO XXX NOT contained
+syn case ignore
+syn match xf86confTodo "???" contained
+
+" Sectioning errors
+syn keyword xf86confSectionError Section contained
+syn keyword xf86confSectionError EndSection
+syn keyword xf86confSubSectionError SubSection
+syn keyword xf86confSubSectionError EndSubSection
+syn keyword xf86confModeSubSectionError Mode
+syn keyword xf86confModeSubSectionError EndMode
+syn cluster xf86confSectionErrors contains=xf86confSectionError,xf86confSubSectionError,xf86confModeSubSectionError
+
+" Values
+if b:xf86conf_xfree86_version >= 4
+	syn region xf86confString start=+"+ skip=+\\\\\|\\"+ end=+"+ contained contains=xf86confSpecialChar,xf86confConstant,xf86confOptionName oneline keepend nextgroup=xf86confValue skipwhite
+else
+	syn region xf86confString start=+"+ skip=+\\\\\|\\"+ end=+"+ contained contains=xf86confSpecialChar,xf86confOptionName oneline keepend
+endif
+syn match xf86confSpecialChar "\\\d\d\d\|\\." contained
+syn match xf86confDecimalNumber "\(\s\|-\)\zs\d*\.\=\d\+\>"
+syn match xf86confFrequency "\(\s\|-\)\zs\d\+\.\=\d*\(Hz\|k\|kHz\|M\|MHz\)"
+syn match xf86confOctalNumber "\<0\o\+\>"
+syn match xf86confOctalNumberError "\<0\o\+[89]\d*\>"
+syn match xf86confHexadecimalNumber "\<0x\x\+\>"
+syn match xf86confValue "\s\+.*$" contained contains=xf86confComment,xf86confString,xf86confFrequency,xf86conf\w\+Number,xf86confConstant
+syn keyword xf86confOption Option nextgroup=xf86confString skipwhite
+syn match xf86confModeLineValue "\"[^\"]\+\"\(\_s\+[0-9.]\+\)\{9}" nextgroup=xf86confSync skipwhite skipnl
+
+" Sections and subsections
+if b:xf86conf_xfree86_version >= 4
+	syn region xf86confSection matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"\(Files\|Server[_ ]*Flags\|Input[_ ]*Device\|Device\|Video[_ ]*Adaptor\|Server[_ ]*Layout\|DRI\|Extensions\|Vendor\|Keyboard\|Pointer\|InputClass\)\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confComment,xf86confOption,xf86confKeyword,xf86confSectionError
+	syn region xf86confSectionModule matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"Module\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionAny,xf86confComment,xf86confOption,xf86confKeyword
+	syn region xf86confSectionMonitor matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"Monitor\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionMode,xf86confModeLine,xf86confComment,xf86confOption,xf86confKeyword
+	syn region xf86confSectionModes matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"Modes\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionMode,xf86confModeLine,xf86confComment
+	syn region xf86confSectionScreen matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"Screen\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionDisplay,xf86confComment,xf86confOption,xf86confKeyword
+	syn region xf86confSubSectionAny matchgroup=xf86confSectionDelim start="^\s*SubSection\s\+\"[^\"]\+\"" end="^\s*EndSubSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confComment,xf86confOption,xf86confKeyword,@xf86confSectionErrors
+	syn region xf86confSubSectionMode matchgroup=xf86confSectionDelim start="^\s*Mode\s\+\"[^\"]\+\"" end="^\s*EndMode\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confComment,xf86confKeyword,@xf86confSectionErrors
+	syn region xf86confSubSectionDisplay matchgroup=xf86confSectionDelim start="^\s*SubSection\s\+\"Display\"" end="^\s*EndSubSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confComment,xf86confOption,xf86confKeyword,@xf86confSectionErrors
+else
+	syn region xf86confSection matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"\(Files\|Server[_ ]*Flags\|Device\|Keyboard\|Pointer\)\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confComment,xf86confOptionName,xf86confOption,xf86confKeyword
+	syn region xf86confSectionMX matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"\(Module\|Xinput\)\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionAny,xf86confComment,xf86confOptionName,xf86confOption,xf86confKeyword
+	syn region xf86confSectionMonitor matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"Monitor\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionMode,xf86confModeLine,xf86confComment,xf86confOptionName,xf86confOption,xf86confKeyword
+	syn region xf86confSectionScreen matchgroup=xf86confSectionDelim start="^\s*Section\s\+\"Screen\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confSubsectionDisplay,xf86confComment,xf86confOptionName,xf86confOption,xf86confKeyword
+	syn region xf86confSubSectionAny matchgroup=xf86confSectionDelim start="^\s*SubSection\s\+\"[^\"]\+\"" end="^\s*EndSubSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confComment,xf86confOptionName,xf86confOption,xf86confKeyword,@xf86confSectionErrors
+	syn region xf86confSubSectionMode matchgroup=xf86confSectionDelim start="^\s*Mode\s\+\"[^\"]\+\"" end="^\s*EndMode\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confComment,xf86confOptionName,xf86confOption,xf86confKeyword,@xf86confSectionErrors
+	syn region xf86confSubSectionDisplay matchgroup=xf86confSectionDelim start="^\s*SubSection\s\+\"Display\"" end="^\s*EndSubSection\>" skip="#.*$\|\"[^\"]*\"" contains=xf86confComment,xf86confOptionName,xf86confOption,xf86confKeyword,@xf86confSectionErrors
+endif
+
+" Options
+if b:xf86conf_xfree86_version >= 4
+	command -nargs=+ Xf86confdeclopt syn keyword xf86confOptionName <args> contained
+else
+	command -nargs=+ Xf86confdeclopt syn keyword xf86confOptionName <args> contained nextgroup=xf86confValue,xf86confComment skipwhite
+endif
+
+Xf86confdeclopt 18bitBus AGPFastWrite AGPMode Accel AllowClosedownGrabs AllowDeactivateGrabs
+Xf86confdeclopt AllowMouseOpenFail AllowNonLocalModInDev AllowNonLocalXvidtune AlwaysCore
+Xf86confdeclopt AngleOffset AutoRepeat BaudRate BeamTimeout Beep BlankTime BlockWrite BottomX
+Xf86confdeclopt BottomY ButtonNumber ButtonThreshold Buttons ByteSwap CacheLines ChordMiddle
+Xf86confdeclopt ClearDTR ClearDTS ClickMode CloneDisplay CloneHSync CloneMode CloneVRefresh
+Xf86confdeclopt ColorKey Composite CompositeSync CoreKeyboard CorePointer Crt2Memory CrtScreen
+Xf86confdeclopt CrtcNumber CyberShadow CyberStretch DDC DDCMode DMAForXv DPMS Dac6Bit DacSpeed
+Xf86confdeclopt DataBits Debug DebugLevel DefaultServerLayout DeltaX DeltaY Device DeviceName
+Xf86confdeclopt DisableModInDev DisableVidModeExtension Display Display1400 DontVTSwitch
+Xf86confdeclopt DontZap DontZoom DoubleScan DozeMode DozeScan DozeTime DragLockButtons
+Xf86confdeclopt DualCount DualRefresh EarlyRasPrecharge Emulate3Buttons Emulate3Timeout
+Xf86confdeclopt EmulateWheel EmulateWheelButton EmulateWheelInertia EnablePageFlip EnterCount
+Xf86confdeclopt EstimateSizesAggressively ExternDisp FPClock16 FPClock24 FPClock32
+Xf86confdeclopt FPClock8 FPDither FastDram FifoAggresive FifoConservative FifoModerate
+Xf86confdeclopt FireGL3000 FixPanelSize FlatPanel FlipXY FlowControl ForceCRT1 ForceCRT2Type
+Xf86confdeclopt ForceLegacyCRT ForcePCIMode FpmVRAM FrameBufferWC FullMMIO GammaBrightness
+Xf86confdeclopt HWClocks HWCursor HandleSpecialKeys HistorySize Interlace Interlaced InternDisp
+Xf86confdeclopt InvX InvY InvertX InvertY KeepShape LCDClock LateRasPrecharge LcdCenter
+Xf86confdeclopt LeftAlt Linear MGASDRAM MMIO MMIOCache MTTR MaxX MaxY MaximumXPosition
+Xf86confdeclopt MaximumYPosition MinX MinY MinimumXPosition MinimumYPosition NoAccel
+Xf86confdeclopt NoAllowMouseOpenFail NoAllowNonLocalModInDev NoAllowNonLocalXvidtune
+Xf86confdeclopt NoBlockWrite NoCompositeSync NoCompression NoCrtScreen NoCyberShadow NoDCC
+Xf86confdeclopt NoDDC NoDac6Bit NoDebug NoDisableModInDev NoDisableVidModeExtension NoDontZap
+Xf86confdeclopt NoDontZoom NoFireGL3000 NoFixPanelSize NoFpmVRAM NoFrameBufferWC NoHWClocks
+Xf86confdeclopt NoHWCursor NoHal NoLcdCenter NoLinear NoMGASDRAM NoMMIO NoMMIOCache NoMTTR
+Xf86confdeclopt NoOverClockMem NoOverlay NoPC98 NoPM NoPciBurst NoPciRetry NoProbeClock
+Xf86confdeclopt NoSTN NoSWCursor NoShadowFb NoShowCache NoSlowEDODRAM NoStretch NoSuspendHack
+Xf86confdeclopt NoTexturedVideo NoTrapSignals NoUseFBDev NoUseModeline NoUseVclk1 NoVTSysReq
+Xf86confdeclopt NoXVideo NvAGP OSMImageBuffers OffTime Origin OverClockMem Overlay
+Xf86confdeclopt PC98 PCIBurst PM PWMActive PWMSleep PanelDelayCompensation PanelHeight
+Xf86confdeclopt PanelOff PanelWidth Parity PciBurst PciRetry Pixmap Port PressDur PressPitch
+Xf86confdeclopt PressVol ProbeClocks ProgramFPRegs Protocol RGBBits ReleaseDur ReleasePitch
+Xf86confdeclopt ReportingMode Resolution RightAlt RightCtl Rotate STN SWCursor SampleRate
+Xf86confdeclopt ScreenNumber ScrollLock SendCoreEvents SendDragEvents Serial ServerNumLock
+Xf86confdeclopt SetLcdClk SetMClk SetRefClk ShadowFb ShadowStatus ShowCache SleepMode
+Xf86confdeclopt SleepScan SleepTime SlowDram SlowEDODRAM StandbyTime StopBits Stretch
+Xf86confdeclopt SuspendHack SuspendTime SwapXY SyncOnGreen TV TVOutput TVOverscan TVStandard
+Xf86confdeclopt TVXPosOffset TVYPosOffset TexturedVideo Threshold Tilt TopX TopY TouchTime
+Xf86confdeclopt TrapSignals Type USB UseBIOS UseFB UseFBDev UseFlatPanel UseModeline
+Xf86confdeclopt UseROMData UseVclk1 VTInit VTSysReq VTime VideoKey Vmin XAxisMapping
+Xf86confdeclopt XLeds XVideo XaaNoCPUToScreenColorExpandFill XaaNoColor8x8PatternFillRect
+Xf86confdeclopt XaaNoColor8x8PatternFillTrap XaaNoDashedBresenhamLine XaaNoDashedTwoPointLine
+Xf86confdeclopt XaaNoImageWriteRect XaaNoMono8x8PatternFillRect XaaNoMono8x8PatternFillTrap
+Xf86confdeclopt XaaNoOffscreenPixmaps XaaNoPixmapCache XaaNoScanlineCPUToScreenColorExpandFill
+Xf86confdeclopt XaaNoScanlineImageWriteRect XaaNoScreenToScreenColorExpandFill
+Xf86confdeclopt XaaNoScreenToScreenCopy XaaNoSolidBresenhamLine XaaNoSolidFillRect
+Xf86confdeclopt XaaNoSolidFillTrap XaaNoSolidHorVertLine XaaNoSolidTwoPointLine Xinerama
+Xf86confdeclopt XkbCompat XkbDisable XkbGeometry XkbKeycodes XkbKeymap XkbLayout XkbModel
+Xf86confdeclopt XkbOptions XkbRules XkbSymbols XkbTypes XkbVariant XvBskew XvHsync XvOnCRT2
+Xf86confdeclopt XvRskew XvVsync YAxisMapping ZAxisMapping ZoomOnLCD
+
+delcommand Xf86confdeclopt
+
+" Keywords
+syn keyword xf86confKeyword Device Driver FontPath Group Identifier Load ModelName ModulePath Monitor RGBPath VendorName VideoAdaptor Visual nextgroup=xf86confComment,xf86confString skipwhite
+syn keyword xf86confKeyword BiosBase Black BoardName BusID ChipID ChipRev Chipset nextgroup=xf86confComment,xf86confValue
+syn keyword xf86confKeyword ClockChip Clocks DacSpeed DefaultDepth DefaultFbBpp nextgroup=xf86confComment,xf86confValue
+syn keyword xf86confKeyword DefaultColorDepth nextgroup=xf86confComment,xf86confValue
+syn keyword xf86confKeyword Depth DisplaySize DotClock FbBpp Flags Gamma HorizSync nextgroup=xf86confComment,xf86confValue
+syn keyword xf86confKeyword Hskew HTimings InputDevice IOBase MemBase Mode nextgroup=xf86confComment,xf86confValue
+syn keyword xf86confKeyword Modes Ramdac Screen TextClockFreq UseModes VendorName nextgroup=xf86confComment,xf86confValue
+syn keyword xf86confKeyword VertRefresh VideoRam ViewPort Virtual VScan VTimings nextgroup=xf86confComment,xf86confValue
+syn keyword xf86confKeyword Weight White nextgroup=xf86confComment,xf86confValue
+syn keyword xf86confModeLine ModeLine nextgroup=xf86confComment,xf86confModeLineValue skipwhite skipnl
+
+" Constants
+if b:xf86conf_xfree86_version >= 4
+	syn keyword xf86confConstant true false on off yes no omit contained
+else
+	syn keyword xf86confConstant Meta Compose Control
+endif
+syn keyword xf86confConstant StaticGray GrayScale StaticColor PseudoColor TrueColor DirectColor contained
+syn keyword xf86confConstant Absolute RightOf LeftOf Above Below Relative StaticGray GrayScale StaticColor PseudoColor TrueColor DirectColor contained
+syn match xf86confSync "\(\s\+[+-][CHV]_*Sync\)\+" contained
+
+" Synchronization
+if b:xf86conf_xfree86_version >= 4
+	syn sync match xf86confSyncSection grouphere xf86confSection "^\s*Section\s\+\"\(Files\|Server[_ ]*Flags\|Input[_ ]*Device\|Device\|Video[_ ]*Adaptor\|Server[_ ]*Layout\|DRI\|Extensions\|Vendor\|Keyboard\|Pointer\|InputClass\)\""
+	syn sync match xf86confSyncSectionModule grouphere xf86confSectionModule "^\s*Section\s\+\"Module\""
+	syn sync match xf86confSyncSectionModes groupthere xf86confSectionModes "^\s*Section\s\+\"Modes\""
+else
+	syn sync match xf86confSyncSection grouphere xf86confSection "^\s*Section\s\+\"\(Files\|Server[_ ]*Flags\|Device\|Keyboard\|Pointer\)\""
+	syn sync match xf86confSyncSectionMX grouphere xf86confSectionMX "^\s*Section\s\+\"\(Module\|Xinput\)\""
+endif
+syn sync match xf86confSyncSectionMonitor groupthere xf86confSectionMonitor "^\s*Section\s\+\"Monitor\""
+syn sync match xf86confSyncSectionScreen groupthere xf86confSectionScreen "^\s*Section\s\+\"Screen\""
+syn sync match xf86confSyncEndSection groupthere NONE "^\s*End_*Section\s*$"
+
+" Define the default highlighting
+hi def link xf86confComment Comment
+hi def link xf86confTodo Todo
+hi def link xf86confSectionDelim Statement
+hi def link xf86confOptionName Identifier
+
+hi def link xf86confSectionError xf86confError
+hi def link xf86confSubSectionError xf86confError
+hi def link xf86confModeSubSectionError xf86confError
+hi def link xf86confOctalNumberError xf86confError
+hi def link xf86confError Error
+
+hi def link xf86confOption xf86confKeyword
+hi def link xf86confModeLine xf86confKeyword
+hi def link xf86confKeyword Type
+
+hi def link xf86confDecimalNumber xf86confNumber
+hi def link xf86confOctalNumber xf86confNumber
+hi def link xf86confHexadecimalNumber xf86confNumber
+hi def link xf86confFrequency xf86confNumber
+hi def link xf86confModeLineValue Constant
+hi def link xf86confNumber Constant
+
+hi def link xf86confSync xf86confConstant
+hi def link xf86confConstant Special
+hi def link xf86confSpecialChar Special
+hi def link xf86confString String
+
+hi def link xf86confValue Constant
+
+let b:current_syntax = "xf86conf"
+
+endif
diff --git a/tests/extensions.vim b/tests/extensions.vim
index 77ff620b7..de074e5db 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -1,3 +1,5 @@
+filetype on
+
 function! TestExtension(filetype, filename, content)
   call Log('Detecting ' . a:filetype . ' filetype (' . a:filename . ')...')
 
@@ -388,3 +390,5 @@ call TestExtension("conf", "auto.master", "")
 
 " https://github.com/sheerun/vim-polyglot/issues/579
 call TestExtension("dart", "reminders.dart", "")
+
+filetype off
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 1c2daaeb5..51fdb3dce 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -1,22 +1,23 @@
-function! TestFiletype(filetype)
+filetype plugin indent on
+
+func! TestFiletype(filetype)
   call Log('Loading ' . a:filetype . ' filetype...')
 
   try
     enew
     exec 'set ft=' . a:filetype
+    exec ":bw!"
   catch
     echo 'Failed to load ' . a:filetype  . ' filetype...'
-    echo v:exception
+    throw v:exception
+    cq!
   endtry
-endfunction
+endfunc
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
 call TestFiletype('8th')
 call TestFiletype('cfg')
-call TestFiletype('master')
-call TestFiletype('conf')
-call TestFiletype('haproxy')
 call TestFiletype('a2ps')
 call TestFiletype('a65')
 call TestFiletype('aap')
@@ -29,6 +30,8 @@ call TestFiletype('asl')
 call TestFiletype('ada')
 call TestFiletype('ahdl')
 call TestFiletype('aidl')
+call TestFiletype('master')
+call TestFiletype('conf')
 call TestFiletype('alsaconf')
 call TestFiletype('aml')
 call TestFiletype('ampl')
@@ -46,6 +49,7 @@ call TestFiletype('arduino')
 call TestFiletype('art')
 call TestFiletype('asciidoc')
 call TestFiletype('autohotkey')
+call TestFiletype('make')
 call TestFiletype('elf')
 call TestFiletype('automake')
 call TestFiletype('asn')
@@ -59,6 +63,7 @@ call TestFiletype('caddyfile')
 call TestFiletype('carp')
 call TestFiletype('clojure')
 call TestFiletype('cmake')
+call TestFiletype('markdown')
 call TestFiletype('coffee')
 call TestFiletype('litcoffee')
 call TestFiletype('cryptol')
@@ -73,8 +78,9 @@ call TestFiletype('dcov')
 call TestFiletype('dd')
 call TestFiletype('ddoc')
 call TestFiletype('dsdl')
+call TestFiletype('sed')
+call TestFiletype('mysql')
 call TestFiletype('yaml')
-call TestFiletype('Dockerfile')
 call TestFiletype('yaml.docker-compose')
 call TestFiletype('elixir')
 call TestFiletype('eelixir')
@@ -108,6 +114,7 @@ call TestFiletype('grub')
 call TestFiletype('haml')
 call TestFiletype('html.mustache')
 call TestFiletype('html.handlebars')
+call TestFiletype('haproxy')
 call TestFiletype('haskell')
 call TestFiletype('haxe')
 call TestFiletype('hcl')
@@ -138,7 +145,6 @@ call TestFiletype('lua')
 call TestFiletype('m4')
 call TestFiletype('mako')
 call TestFiletype('mma')
-call TestFiletype('markdown')
 call TestFiletype('markdown.mdx')
 call TestFiletype('meson')
 call TestFiletype('dosini')
@@ -198,7 +204,6 @@ call TestFiletype('ruby')
 call TestFiletype('brewfile')
 call TestFiletype('rust')
 call TestFiletype('scala')
-call TestFiletype('sbt.scala')
 call TestFiletype('scss')
 call TestFiletype('sh')
 call TestFiletype('zsh')
@@ -359,6 +364,7 @@ call TestFiletype('hastepreproc')
 call TestFiletype('hercules')
 call TestFiletype('hex')
 call TestFiletype('hollywood')
+call TestFiletype('html')
 call TestFiletype('tilde')
 call TestFiletype('htmlm4')
 call TestFiletype('template')
@@ -445,7 +451,6 @@ call TestFiletype('mplayerconf')
 call TestFiletype('srec')
 call TestFiletype('mrxvtrc')
 call TestFiletype('msql')
-call TestFiletype('mysql')
 call TestFiletype('muttrc')
 call TestFiletype('mupad')
 call TestFiletype('mush')
@@ -520,10 +525,10 @@ call TestFiletype('samba')
 call TestFiletype('sas')
 call TestFiletype('sass')
 call TestFiletype('sather')
+call TestFiletype('sbt')
 call TestFiletype('scilab')
 call TestFiletype('sd')
 call TestFiletype('sdl')
-call TestFiletype('sed')
 call TestFiletype('sieve')
 call TestFiletype('sm')
 call TestFiletype('services')
@@ -631,6 +636,9 @@ call TestFiletype('logcheck')
 call TestFiletype('svn')
 call TestFiletype('text')
 call TestFiletype('pullrequest')
-call TestFiletype('html')
+call TestFiletype('xf86conf')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
+
+filetype plugin indent off
+filetype off
diff --git a/tests/native.vim b/tests/native.vim
new file mode 100644
index 000000000..ff7b3025b
--- /dev/null
+++ b/tests/native.vim
@@ -0,0 +1,703 @@
+func Test_detection()
+  filetype on
+  augroup filetypedetect
+    au BufNewFile,BufRead *	call assert_equal(1, did_filetype())
+  augroup END
+  new something.vim
+  call assert_equal('vim', &filetype)
+
+  bwipe!
+  filetype off
+endfunc
+
+func Test_conf_type()
+  filetype on
+  call writefile(['# some comment', 'must be conf'], 'Xfile')
+  augroup filetypedetect
+    au BufNewFile,BufRead *	call assert_equal(0, did_filetype())
+  augroup END
+  split Xfile
+  call assert_equal('conf', &filetype)
+
+  bwipe!
+  call delete('Xfile')
+  filetype off
+endfunc
+
+func Test_other_type()
+  filetype on
+  augroup filetypedetect
+    au BufNewFile,BufRead *	call assert_equal(0, did_filetype())
+    au BufNewFile,BufRead Xfile	setf testfile
+    au BufNewFile,BufRead *	call assert_equal(1, did_filetype())
+  augroup END
+  call writefile(['# some comment', 'must be conf'], 'Xfile')
+  split Xfile
+  call assert_equal('testfile', &filetype)
+
+  bwipe!
+  call delete('Xfile')
+  filetype off
+endfunc
+
+" Filetypes detected just from matching the file name.
+let s:filename_checks = {
+    \ '8th': ['file.8th'],
+    \ 'a2ps': ['/etc/a2ps.cfg', '/etc/a2ps/file.cfg', 'a2psrc', '.a2psrc', 'any/etc/a2ps.cfg', 'any/etc/a2ps/file.cfg'],
+    \ 'a65': ['file.a65'],
+    \ 'aap': ['file.aap'],
+    \ 'abap': ['file.abap'],
+    \ 'abc': ['file.abc'],
+    \ 'abel': ['file.abl'],
+    \ 'acedb': ['file.wrm'],
+    \ 'ada': ['file.adb', 'file.ads', 'file.ada', 'file.gpr'],
+    \ 'ahdl': ['file.tdf'],
+    \ 'aidl': ['file.aidl'],
+    \ 'alsaconf': ['.asoundrc', '/usr/share/alsa/alsa.conf', '/etc/asound.conf', 'any/etc/asound.conf', 'any/usr/share/alsa/alsa.conf'],
+    \ 'aml': ['file.aml'],
+    \ 'ampl': ['file.run'],
+    \ 'ant': ['build.xml'],
+    \ 'apache': ['.htaccess', '/etc/httpd/file.conf', '/etc/apache2/sites-2/file.com', '/etc/apache2/some.config', '/etc/apache2/conf.file/conf', '/etc/apache2/mods-some/file', '/etc/apache2/sites-some/file', '/etc/httpd/conf.d/file.config', '/etc/apache2/conf.file/file', '/etc/apache2/file.conf', '/etc/apache2/file.conf-file', '/etc/apache2/mods-file/file', '/etc/apache2/sites-file/file', '/etc/apache2/sites-file/file.com', '/etc/httpd/conf.d/file.conf', '/etc/httpd/conf.d/file.conf-file', 'access.conf', 'access.conf-file', 'any/etc/apache2/conf.file/file', 'any/etc/apache2/file.conf', 'any/etc/apache2/file.conf-file', 'any/etc/apache2/mods-file/file', 'any/etc/apache2/sites-file/file', 'any/etc/apache2/sites-file/file.com', 'any/etc/httpd/conf.d/file.conf', 'any/etc/httpd/conf.d/file.conf-file', 'any/etc/httpd/file.conf', 'apache.conf', 'apache.conf-file', 'apache2.conf', 'apache2.conf-file', 'httpd.conf', 'httpd.conf-file', 'srm.conf', 'srm.conf-file'],
+    \ 'apachestyle': ['/etc/proftpd/file.config,/etc/proftpd/conf.file/file', '/etc/proftpd/conf.file/file', '/etc/proftpd/file.conf', '/etc/proftpd/file.conf-file', 'any/etc/proftpd/conf.file/file', 'any/etc/proftpd/file.conf', 'any/etc/proftpd/file.conf-file', 'proftpd.conf', 'proftpd.conf-file'],
+    \ 'applescript': ['file.scpt'],
+    \ 'aptconf': ['apt.conf', '/.aptitude/config', 'any/.aptitude/config'],
+    \ 'arch': ['.arch-inventory', '=tagging-method'],
+    \ 'arduino': ['file.ino', 'file.pde'],
+    \ 'art': ['file.art'],
+    \ 'asciidoc': ['file.asciidoc', 'file.adoc'],
+    \ 'asn': ['file.asn', 'file.asn1'],
+    \ 'asterisk': ['asterisk/file.conf', 'asterisk/file.conf-file', 'some-asterisk/file.conf', 'some-asterisk/file.conf-file'],
+    \ 'atlas': ['file.atl', 'file.as'],
+    \ 'autohotkey': ['file.ahk'],
+    \ 'autoit': ['file.au3'],
+    \ 'automake': ['GNUmakefile.am', 'makefile.am', 'Makefile.am'],
+    \ 'ave': ['file.ave'],
+    \ 'awk': ['file.awk', 'file.gawk'],
+    \ 'b': ['file.mch', 'file.ref', 'file.imp'],
+    \ 'bzl': ['file.bazel', 'file.bzl', 'WORKSPACE'],
+    \ 'bc': ['file.bc'],
+    \ 'bdf': ['file.bdf'],
+    \ 'bib': ['file.bib'],
+    \ 'bindzone': ['named.root', '/bind/db.file', '/named/db.file', 'any/bind/db.file', 'any/named/db.file'],
+    \ 'blank': ['file.bl'],
+    \ 'bsdl': ['file.bsd', 'file.bsdl', 'bsd', 'some-bsd'],
+    \ 'bst': ['file.bst'],
+    \ 'bzr': ['bzr_log.any', 'bzr_log.file'],
+    \ 'c': ['enlightenment/file.cfg', 'file.qc', 'file.c', 'some-enlightenment/file.cfg'],
+    \ 'cabal': ['file.cabal'],
+    \ 'calendar': ['calendar', '/.calendar/file', '/share/calendar/any/calendar.file', '/share/calendar/calendar.file', 'any/.calendar/file', 'any/share/calendar/any/calendar.file', 'any/share/calendar/calendar.file'],
+    \ 'catalog': ['catalog', 'sgml.catalogfile', 'sgml.catalog', 'sgml.catalog-file'],
+    \ 'cdl': ['file.cdl'],
+    \ 'cdrdaoconf': ['/etc/cdrdao.conf', '/etc/defaults/cdrdao', '/etc/default/cdrdao', '.cdrdao', 'any/etc/cdrdao.conf', 'any/etc/default/cdrdao', 'any/etc/defaults/cdrdao'],
+    \ 'cdrtoc': ['file.toc'],
+    \ 'cf': ['file.cfm', 'file.cfi', 'file.cfc'],
+    \ 'cfengine': ['cfengine.conf'],
+    \ 'cfg': ['file.cfg', 'file.hgrc', 'filehgrc', 'hgrc', 'some-hgrc'],
+    \ 'ch': ['file.chf'],
+    \ 'chaiscript': ['file.chai'],
+    \ 'chaskell': ['file.chs'],
+    \ 'chill': ['file..ch'],
+    \ 'chordpro': ['file.chopro', 'file.crd', 'file.cho', 'file.crdpro', 'file.chordpro'],
+    \ 'cl': ['file.eni'],
+    \ 'clean': ['file.dcl', 'file.icl'],
+    \ 'clojure': ['file.clj', 'file.cljs', 'file.cljx', 'file.cljc'],
+    \ 'cmake': ['CMakeLists.txt', 'file.cmake', 'file.cmake.in'],
+    \ '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'],
+    \ 'cobol': ['file.cbl', 'file.cob', 'file.lib'],
+    \ 'coco': ['file.atg'],
+    \ 'conaryrecipe': ['file.recipe'],
+    \ 'conf': ['auto.master'],
+    \ 'config': ['configure.in', 'configure.ac', 'Pipfile', '/etc/hostname.file'],
+    \ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi'],
+    \ 'cpp': ['file.cxx', 'file.c++', 'file.hh', 'file.hxx', 'file.hpp', 'file.ipp', 'file.moc', 'file.tcc', 'file.inl', 'file.tlh'],
+    \ 'crm': ['file.crm'],
+    \ 'crontab': ['crontab', 'crontab.file', '/etc/cron.d/file', 'any/etc/cron.d/file'],
+    \ 'cs': ['file.cs'],
+    \ 'csc': ['file.csc'],
+    \ 'csdl': ['file.csdl'],
+    \ 'csp': ['file.csp', 'file.fdr'],
+    \ 'css': ['file.css'],
+    \ 'cterm': ['file.con'],
+    \ 'cucumber': ['file.feature'],
+    \ 'cuda': ['file.cu', 'file.cuh'],
+    \ 'cupl': ['file.pld'],
+    \ 'cuplsim': ['file.si'],
+    \ 'cvs': ['cvs123'],
+    \ 'cvsrc': ['.cvsrc'],
+    \ 'cynpp': ['file.cyn'],
+    \ 'dart': ['file.dart', 'file.drt'],
+    \ 'datascript': ['file.ds'],
+    \ 'dcd': ['file.dcd'],
+    \ 'debchangelog': ['changelog.Debian', 'changelog.dch', 'NEWS.Debian', 'NEWS.dch', '/debian/changelog'],
+    \ 'debcontrol': ['/debian/control', 'any/debian/control'],
+    \ 'debcopyright': ['/debian/copyright', 'any/debian/copyright'],
+    \ 'debsources': ['/etc/apt/sources.list', '/etc/apt/sources.list.d/file.list', 'any/etc/apt/sources.list', 'any/etc/apt/sources.list.d/file.list'],
+    \ 'def': ['file.def'],
+    \ 'denyhosts': ['denyhosts.conf'],
+    \ 'desc': ['file.desc'],
+    \ 'desktop': ['file.desktop', '.directory', 'file.directory'],
+    \ 'dictconf': ['dict.conf', '.dictrc'],
+    \ 'dictdconf': ['dictd.conf'],
+    \ 'diff': ['file.diff', 'file.rej'],
+    \ 'dircolors': ['.dir_colors', '.dircolors', '/etc/DIR_COLORS', 'any/etc/DIR_COLORS'],
+    \ 'dnsmasq': ['/etc/dnsmasq.conf', '/etc/dnsmasq.d/file', 'any/etc/dnsmasq.conf', 'any/etc/dnsmasq.d/file'],
+    \ 'dockerfile': ['Containerfile', 'Dockerfile', 'file.Dockerfile'],
+    \ 'dosbatch': ['file.bat', 'file.sys'],
+    \ 'dosini': ['.editorconfig', '/etc/pacman.conf', '/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', '/etc/yum.repos.d/file', 'any/etc/pacman.conf', 'any/etc/yum.conf', 'any/etc/yum.repos.d/file'],
+    \ 'dot': ['file.dot', 'file.gv'],
+    \ 'dracula': ['file.drac', 'file.drc', 'filelvs', 'filelpe', 'drac.file', 'lpe', 'lvs', 'some-lpe', 'some-lvs'],
+    \ 'dsl': ['file.dsl'],
+    \ 'dtd': ['file.dtd'],
+    \ 'dts': ['file.dts', 'file.dtsi'],
+    \ 'dylan': ['file.dylan'],
+    \ 'dylanintr': ['file.intr'],
+    \ 'dylanlid': ['file.lid'],
+    \ 'ecd': ['file.ecd'],
+    \ 'edif': ['file.edf', 'file.edif', 'file.edo'],
+    \ 'elinks': ['elinks.conf'],
+    \ 'elm': ['file.elm'],
+    \ 'elmfilt': ['filter-rules'],
+    \ 'erlang': ['file.erl', 'file.hrl', 'file.yaws'],
+    \ 'eruby': ['file.erb', 'file.rhtml'],
+    \ 'esmtprc': ['anyesmtprc', 'esmtprc', 'some-esmtprc'],
+    \ 'esqlc': ['file.ec', 'file.EC'],
+    \ 'esterel': ['file.strl'],
+    \ 'eterm': ['anyEterm/file.cfg', 'Eterm/file.cfg', 'some-Eterm/file.cfg'],
+    \ 'exim': ['exim.conf'],
+    \ 'expect': ['file.exp'],
+    \ 'exports': ['exports'],
+    \ 'factor': ['file.factor'],
+    \ 'falcon': ['file.fal'],
+    \ 'fan': ['file.fan', 'file.fwt'],
+    \ 'fetchmail': ['.fetchmailrc'],
+    \ 'fgl': ['file.4gl', 'file.4gh', 'file.m4gl'],
+    \ 'focexec': ['file.fex', 'file.focexec'],
+    \ 'forth': ['file.fs', 'file.ft', 'file.fth'],
+    \ 'fortran': ['file.f', 'file.for', 'file.fortran', 'file.fpp', 'file.ftn', 'file.f77', 'file.f90', 'file.f95', 'file.f03', 'file.f08'],
+    \ 'framescript': ['file.fsl'],
+    \ 'freebasic': ['file.fb', 'file.bi'],
+    \ 'fstab': ['fstab', 'mtab'],
+    \ 'fvwm': ['/.fvwm/file', 'any/.fvwm/file'],
+    \ 'gdb': ['.gdbinit'],
+    \ 'gdmo': ['file.mo', 'file.gdmo'],
+    \ 'gedcom': ['file.ged', 'lltxxxxx.txt', '/tmp/lltmp', '/tmp/lltmp-file', 'any/tmp/lltmp', 'any/tmp/lltmp-file'],
+    \ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG'],
+    \ 'gitconfig': ['file.git/config', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig', '/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config', 'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'],
+    \ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
+    \ 'gitrebase': ['git-rebase-todo'],
+    \ 'gitsendemail': ['.gitsendemail.msg.xxxxxx'],
+    \ 'gkrellmrc': ['gkrellmrc', 'gkrellmrc_x'],
+    \ 'gnash': ['gnashrc', '.gnashrc', 'gnashpluginrc', '.gnashpluginrc'],
+    \ 'gnuplot': ['file.gpi'],
+    \ 'go': ['file.go'],
+    \ 'gp': ['file.gp', '.gprc'],
+    \ 'gpg': ['/.gnupg/options', '/.gnupg/gpg.conf', '/usr/any/gnupg/options.skel', 'any/.gnupg/gpg.conf', 'any/.gnupg/options', 'any/usr/any/gnupg/options.skel'],
+    \ 'grads': ['file.gs'],
+    \ 'gretl': ['file.gretl'],
+    \ 'groovy': ['file.gradle', 'file.groovy'],
+    \ 'group': ['any/etc/group', 'any/etc/group-', 'any/etc/group.edit', 'any/etc/gshadow', 'any/etc/gshadow-', 'any/etc/gshadow.edit', 'any/var/backups/group.bak', 'any/var/backups/gshadow.bak', '/etc/group', '/etc/group-', '/etc/group.edit', '/etc/gshadow', '/etc/gshadow-', '/etc/gshadow.edit', '/var/backups/group.bak', '/var/backups/gshadow.bak'],
+    \ 'grub': ['/boot/grub/menu.lst', '/boot/grub/grub.conf', '/etc/grub.conf', 'any/boot/grub/grub.conf', 'any/boot/grub/menu.lst', 'any/etc/grub.conf'],
+    \ 'gsp': ['file.gsp'],
+    \ 'gtkrc': ['.gtkrc', 'gtkrc', '.gtkrc-file', 'gtkrc-file'],
+    \ 'haml': ['file.haml'],
+    \ 'hamster': ['file.hsc', 'file.hsm'],
+    \ 'haskell': ['file.hs', 'file.hs-boot'],
+    \ 'haste': ['file.ht'],
+    \ 'hastepreproc': ['file.htpp'],
+    \ 'hb': ['file.hb'],
+    \ 'hercules': ['file.vc', 'file.ev', 'file.sum', 'file.errsum'],
+    \ 'hex': ['file.hex', 'file.h32'],
+    \ 'hgcommit': ['hg-editor-file.txt'],
+    \ 'hog': ['file.hog', 'snort.conf', 'vision.conf'],
+    \ 'hollywood': ['file.hws'],
+    \ 'hostconf': ['/etc/host.conf', 'any/etc/host.conf'],
+    \ 'hostsaccess': ['/etc/hosts.allow', '/etc/hosts.deny', 'any/etc/hosts.allow', 'any/etc/hosts.deny'],
+    \ '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'],
+    \ 'modula3': ['file.m3', 'file.mg', 'file.i3', 'file.ig'],
+    \ 'natural': ['file.NSA', 'file.NSC', 'file.NSG', 'file.NSL', 'file.NSM', 'file.NSN', 'file.NSP', 'file.NSS'],
+    \ 'neomuttrc': ['Neomuttrc', '.neomuttrc', '.neomuttrc-file', '/.neomutt/neomuttrc', '/.neomutt/neomuttrc-file', 'Neomuttrc', 'Neomuttrc-file', 'any/.neomutt/neomuttrc', 'any/.neomutt/neomuttrc-file', 'neomuttrc', 'neomuttrc-file'],
+    \ 'opl': ['file.OPL', 'file.OPl', 'file.OpL', 'file.Opl', 'file.oPL', 'file.oPl', 'file.opL', 'file.opl'],
+    \ 'pcmk': ['file.pcmk'],
+    \ 'r': ['file.r'],
+    \ 'rhelp': ['file.rd'],
+    \ 'rmd': ['file.rmd', 'file.smd'],
+    \ 'rnoweb': ['file.rnw', 'file.snw'],
+    \ 'rrst': ['file.rrst', 'file.srst'],
+    \ 'template': ['file.tmpl'],
+    \ 'htmlm4': ['file.html.m4'],
+    \ 'httest': ['file.htt', 'file.htb'],
+    \ 'ibasic': ['file.iba', 'file.ibi'],
+    \ 'icemenu': ['/.icewm/menu', 'any/.icewm/menu'],
+    \ 'icon': ['file.icn'],
+    \ 'indent': ['.indent.pro', 'indentrc'],
+    \ 'inform': ['file.inf', 'file.INF'],
+    \ 'initng': ['/etc/initng/any/file.i', 'file.ii', 'any/etc/initng/any/file.i'],
+    \ 'inittab': ['inittab'],
+    \ 'ipfilter': ['ipf.conf', 'ipf6.conf', 'ipf.rules'],
+    \ 'iss': ['file.iss'],
+    \ 'ist': ['file.ist', 'file.mst'],
+    \ 'j': ['file.ijs'],
+    \ 'jal': ['file.jal', 'file.JAL'],
+    \ 'jam': ['file.jpl', 'file.jpr', 'JAM-file.file', 'JAM.file', 'Prl-file.file', 'Prl.file'],
+    \ 'java': ['file.java', 'file.jav'],
+    \ 'javacc': ['file.jj', 'file.jjt'],
+    \ 'javascript': ['file.js', 'file.javascript', 'file.es', 'file.mjs', 'file.cjs'],
+    \ 'javascriptreact': ['file.jsx'],
+    \ 'jess': ['file.clp'],
+    \ 'jgraph': ['file.jgr'],
+    \ 'jovial': ['file.jov', 'file.j73', 'file.jovial'],
+    \ 'jproperties': ['file.properties', 'file.properties_xx', 'file.properties_xx_xx', 'some.properties_xx_xx_file'],
+    \ 'json': ['file.json', 'file.jsonp', 'file.webmanifest', 'Pipfile.lock'],
+    \ 'jsp': ['file.jsp'],
+    \ 'kconfig': ['Kconfig', 'Kconfig.debug', 'Kconfig.file'],
+    \ 'kivy': ['file.kv'],
+    \ 'kix': ['file.kix'],
+    \ 'kotlin': ['file.kt', 'file.ktm', 'file.kts'],
+    \ 'kscript': ['file.ks'],
+    \ 'kwt': ['file.k'],
+    \ 'lace': ['file.ace', 'file.ACE'],
+    \ 'latte': ['file.latte', 'file.lte'],
+    \ 'ld': ['file.ld'],
+    \ 'ldif': ['file.ldif'],
+    \ 'less': ['file.less'],
+    \ 'lex': ['file.lex', 'file.l', 'file.lxx', 'file.l++'],
+    \ 'lftp': ['lftp.conf', '.lftprc', 'anylftp/rc', 'lftp/rc', 'some-lftp/rc'],
+    \ 'lhaskell': ['file.lhs'],
+    \ 'libao': ['/etc/libao.conf', '/.libao', 'any/.libao', 'any/etc/libao.conf'],
+    \ 'lifelines': ['file.ll'],
+    \ 'lilo': ['lilo.conf', 'lilo.conf-file'],
+    \ 'limits': ['/etc/limits', '/etc/anylimits.conf', '/etc/anylimits.d/file.conf', '/etc/limits.conf', '/etc/limits.d/file.conf', '/etc/some-limits.conf', '/etc/some-limits.d/file.conf', 'any/etc/limits', 'any/etc/limits.conf', 'any/etc/limits.d/file.conf', 'any/etc/some-limits.conf', 'any/etc/some-limits.d/file.conf'],
+    \ 'liquid': ['file.liquid'],
+    \ 'lisp': ['file.lsp', 'file.lisp', 'file.el', 'file.cl', '.emacs', '.sawfishrc', 'sbclrc', '.sbclrc'],
+    \ 'lite': ['file.lite', 'file.lt'],
+    \ 'litestep': ['/LiteStep/any/file.rc', 'any/LiteStep/any/file.rc'],
+    \ 'loginaccess': ['/etc/login.access', 'any/etc/login.access'],
+    \ 'logindefs': ['/etc/login.defs', 'any/etc/login.defs'],
+    \ 'logtalk': ['file.lgt'],
+    \ 'lotos': ['file.lot', 'file.lotos'],
+    \ 'lout': ['file.lou', 'file.lout'],
+    \ 'lprolog': ['file.sig'],
+    \ 'lsl': ['file.lsl'],
+    \ 'lss': ['file.lss'],
+    \ 'lua': ['file.lua', 'file.rockspec', 'file.nse'],
+    \ 'lynx': ['lynx.cfg'],
+    \ 'm4': ['file.at'],
+    \ 'mail': ['snd.123', '.letter', '.letter.123', '.followup', '.article', '.article.123', 'pico.123', 'mutt-xx-xxx', 'muttng-xx-xxx', 'ae123.txt', 'file.eml', 'reportbug-file'],
+    \ 'mailaliases': ['/etc/mail/aliases', '/etc/aliases', 'any/etc/aliases', 'any/etc/mail/aliases'],
+    \ 'mailcap': ['.mailcap', 'mailcap'],
+    \ 'make': ['file.mk', 'file.mak', 'file.dsp', 'makefile', 'Makefile', 'makefile-file', 'Makefile-file', 'some-makefile', 'some-Makefile'],
+    \ 'mallard': ['file.page'],
+    \ 'man': ['file.man'],
+    \ 'manconf': ['/etc/man.conf', 'man.config', 'any/etc/man.conf'],
+    \ 'map': ['file.map'],
+    \ 'maple': ['file.mv', 'file.mpl', 'file.mws'],
+    \ 'markdown': ['file.markdown', 'file.mdown', 'file.mkd', 'file.mkdn', 'file.mdwn', 'file.md'],
+    \ 'mason': ['file.mason', 'file.mhtml', 'file.comp'],
+    \ 'master': ['file.mas', 'file.master'],
+    \ 'mel': ['file.mel'],
+    \ 'meson': ['meson.build', 'meson_options.txt'],
+    \ 'messages': ['/log/auth', '/log/cron', '/log/daemon', '/log/debug', '/log/kern', '/log/lpr', '/log/mail', '/log/messages', '/log/news/news', '/log/syslog', '/log/user',
+    \     '/log/auth.log', '/log/cron.log', '/log/daemon.log', '/log/debug.log', '/log/kern.log', '/log/lpr.log', '/log/mail.log', '/log/messages.log', '/log/news/news.log', '/log/syslog.log', '/log/user.log',
+    \     '/log/auth.err', '/log/cron.err', '/log/daemon.err', '/log/debug.err', '/log/kern.err', '/log/lpr.err', '/log/mail.err', '/log/messages.err', '/log/news/news.err', '/log/syslog.err', '/log/user.err',
+    \      '/log/auth.info', '/log/cron.info', '/log/daemon.info', '/log/debug.info', '/log/kern.info', '/log/lpr.info', '/log/mail.info', '/log/messages.info', '/log/news/news.info', '/log/syslog.info', '/log/user.info',
+    \      '/log/auth.warn', '/log/cron.warn', '/log/daemon.warn', '/log/debug.warn', '/log/kern.warn', '/log/lpr.warn', '/log/mail.warn', '/log/messages.warn', '/log/news/news.warn', '/log/syslog.warn', '/log/user.warn',
+    \      '/log/auth.crit', '/log/cron.crit', '/log/daemon.crit', '/log/debug.crit', '/log/kern.crit', '/log/lpr.crit', '/log/mail.crit', '/log/messages.crit', '/log/news/news.crit', '/log/syslog.crit', '/log/user.crit',
+    \      '/log/auth.notice', '/log/cron.notice', '/log/daemon.notice', '/log/debug.notice', '/log/kern.notice', '/log/lpr.notice', '/log/mail.notice', '/log/messages.notice', '/log/news/news.notice', '/log/syslog.notice', '/log/user.notice'],
+    \ 'mf': ['file.mf'],
+    \ 'mgl': ['file.mgl'],
+    \ 'mgp': ['file.mgp'],
+    \ 'mib': ['file.mib', 'file.my'],
+    \ 'mix': ['file.mix', 'file.mixal'],
+    \ 'mma': ['file.nb'],
+    \ 'mmp': ['file.mmp'],
+    \ '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'],
+    \ 'modula2': ['file.m2', 'file.mi'],
+    \ 'monk': ['file.isc', 'file.monk', 'file.ssc', 'file.tsc'],
+    \ 'moo': ['file.moo'],
+    \ 'mp': ['file.mp'],
+    \ 'mplayerconf': ['mplayer.conf', '/.mplayer/config', 'any/.mplayer/config'],
+    \ 'mrxvtrc': ['mrxvtrc', '.mrxvtrc'],
+    \ 'msidl': ['file.odl', 'file.mof'],
+    \ 'msql': ['file.msql'],
+    \ 'mupad': ['file.mu'],
+    \ 'mush': ['file.mush'],
+    \ 'muttrc': ['Muttngrc', 'Muttrc', '.muttngrc', '.muttngrc-file', '.muttrc', '.muttrc-file', '/.mutt/muttngrc', '/.mutt/muttngrc-file', '/.mutt/muttrc', '/.mutt/muttrc-file', '/.muttng/muttngrc', '/.muttng/muttngrc-file', '/.muttng/muttrc', '/.muttng/muttrc-file', '/etc/Muttrc.d/file', 'Muttngrc-file', 'Muttrc-file', 'any/.mutt/muttngrc', 'any/.mutt/muttngrc-file', 'any/.mutt/muttrc', 'any/.mutt/muttrc-file', 'any/.muttng/muttngrc', 'any/.muttng/muttngrc-file', 'any/.muttng/muttrc', 'any/.muttng/muttrc-file', 'any/etc/Muttrc.d/file', 'muttngrc', 'muttngrc-file', 'muttrc', 'muttrc-file'],
+    \ 'mysql': ['file.mysql'],
+    \ 'n1ql': ['file.n1ql', 'file.nql'],
+    \ 'named': ['namedfile.conf', 'rndcfile.conf', 'named-file.conf', 'named.conf', 'rndc-file.conf', 'rndc-file.key', 'rndc.conf', 'rndc.key'],
+    \ 'nanorc': ['/etc/nanorc', 'file.nanorc', 'any/etc/nanorc'],
+    \ 'ncf': ['file.ncf'],
+    \ 'netrc': ['.netrc'],
+    \ 'ninja': ['file.ninja'],
+    \ 'nqc': ['file.nqc'],
+    \ 'nroff': ['file.tr', 'file.nr', 'file.roff', 'file.tmac', 'file.mom', 'tmac.file'],
+    \ 'nsis': ['file.nsi', 'file.nsh'],
+    \ 'obj': ['file.obj'],
+    \ 'ocaml': ['file.ml', 'file.mli', 'file.mll', 'file.mly', '.ocamlinit'],
+    \ 'occam': ['file.occ'],
+    \ 'omnimark': ['file.xom', 'file.xin'],
+    \ 'openroad': ['file.or'],
+    \ 'ora': ['file.ora'],
+    \ 'pamconf': ['/etc/pam.conf', '/etc/pam.d/file', 'any/etc/pam.conf', 'any/etc/pam.d/file'],
+    \ 'pamenv': ['/etc/security/pam_env.conf', '/home/user/.pam_environment', '.pam_environment', 'pam_env.conf'],
+    \ 'papp': ['file.papp', 'file.pxml', 'file.pxsl'],
+    \ 'pascal': ['file.pas', 'file.pp', 'file.dpr', 'file.lpr'],
+    \ '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'],
+    \ 'pccts': ['file.g'],
+    \ 'pdf': ['file.pdf'],
+    \ 'perl': ['file.plx', 'file.al', 'file.psgi', 'gitolite.rc', '.gitolite.rc', 'example.gitolite.rc'],
+    \ 'raku': ['file.p6', 'file.pm6', 'file.pl6', 'file.raku', 'file.rakumod', 'file.pod6'],
+    \ 'pf': ['pf.conf'],
+    \ 'pfmain': ['main.cf'],
+    \ 'php': ['file.php', 'file.php9', 'file.phtml', 'file.ctp'],
+    \ 'lpc': ['file.lpc', 'file.ulpc'],
+    \ 'pike': ['file.pike', 'file.pmod'],
+    \ 'cmod': ['file.cmod'],
+    \ 'pilrc': ['file.rcp'],
+    \ 'pine': ['.pinerc', 'pinerc', '.pinercex', 'pinercex'],
+    \ 'pinfo': ['/etc/pinforc', '/.pinforc', 'any/.pinforc', 'any/etc/pinforc'],
+    \ 'pli': ['file.pli', 'file.pl1'],
+    \ 'plm': ['file.plm', 'file.p36', 'file.pac'],
+    \ 'plp': ['file.plp'],
+    \ 'plsql': ['file.pls', 'file.plsql'],
+    \ 'po': ['file.po', 'file.pot'],
+    \ 'pod': ['file.pod'],
+    \ 'postscr': ['file.ps', 'file.pfa', 'file.afm', 'file.eps', 'file.epsf', 'file.epsi', 'file.ai'],
+    \ 'pov': ['file.pov'],
+    \ 'povini': ['.povrayrc'],
+    \ 'ppd': ['file.ppd'],
+    \ 'ppwiz': ['file.it', 'file.ih'],
+    \ 'privoxy': ['file.action'],
+    \ 'proc': ['file.pc'],
+    \ 'procmail': ['.procmail', '.procmailrc'],
+    \ 'prolog': ['file.pdb'],
+    \ 'promela': ['file.pml'],
+    \ 'proto': ['file.proto'],
+    \ 'protocols': ['/etc/protocols', 'any/etc/protocols'],
+    \ 'psf': ['file.psf'],
+    \ 'pyrex': ['file.pyx', 'file.pxd'],
+    \ 'python': ['file.py', 'file.pyw', '.pythonstartup', '.pythonrc', 'file.ptl', 'file.pyi', 'SConstruct'],
+    \ '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'],
+    \ 'radiance': ['file.rad', 'file.mat'],
+    \ 'ratpoison': ['.ratpoisonrc', 'ratpoisonrc'],
+    \ 'rc': ['file.rc', 'file.rch'],
+    \ 'rcs': ['file,v'],
+    \ 'readline': ['.inputrc', 'inputrc'],
+    \ 'remind': ['.reminders', 'file.remind', 'file.rem', '.reminders-file'],
+    \ 'rego': ['file.rego'],
+    \ 'resolv': ['resolv.conf'],
+    \ 'reva': ['file.frt'],
+    \ 'rexx': ['file.rex', 'file.orx', 'file.rxo', 'file.rxj', 'file.jrexx', 'file.rexxj', 'file.rexx', 'file.testGroup', 'file.testUnit'],
+    \ 'rib': ['file.rib'],
+    \ 'rnc': ['file.rnc'],
+    \ 'rng': ['file.rng'],
+    \ 'robots': ['robots.txt'],
+    \ 'rpcgen': ['file.x'],
+    \ 'rpl': ['file.rpl'],
+    \ 'rst': ['file.rst'],
+    \ 'rtf': ['file.rtf'],
+    \ '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'],
+    \ 'rust': ['file.rs'],
+    \ 'samba': ['smb.conf'],
+    \ 'sas': ['file.sas'],
+    \ 'sass': ['file.sass'],
+    \ 'sather': ['file.sa'],
+    \ 'sbt': ['file.sbt'],
+    \ 'scala': ['file.scala'],
+    \ 'scheme': ['file.scm', 'file.ss', 'file.rkt'],
+    \ 'scilab': ['file.sci', 'file.sce'],
+    \ 'screen': ['.screenrc', 'screenrc'],
+    \ 'scss': ['file.scss'],
+    \ 'sd': ['file.sd'],
+    \ 'sdc': ['file.sdc'],
+    \ 'sdl': ['file.sdl', 'file.pr'],
+    \ 'sed': ['file.sed'],
+    \ 'sensors': ['/etc/sensors.conf', '/etc/sensors3.conf', 'any/etc/sensors.conf', 'any/etc/sensors3.conf'],
+    \ 'services': ['/etc/services', 'any/etc/services'],
+    \ 'setserial': ['/etc/serial.conf', 'any/etc/serial.conf'],
+    \ 'sh': ['/etc/udev/cdsymlinks.conf', 'any/etc/udev/cdsymlinks.conf'],
+    \ 'sieve': ['file.siv', 'file.sieve'],
+    \ 'simula': ['file.sim'],
+    \ 'sinda': ['file.sin', 'file.s85'],
+    \ 'sisu': ['file.sst', 'file.ssm', 'file.ssi', 'file.-sst', 'file._sst', 'file.sst.meta', 'file.-sst.meta', 'file._sst.meta'],
+    \ 'skill': ['file.il', 'file.ils', 'file.cdf'],
+    \ 'slang': ['file.sl'],
+    \ 'slice': ['file.ice'],
+    \ 'slpconf': ['/etc/slp.conf', 'any/etc/slp.conf'],
+    \ 'slpreg': ['/etc/slp.reg', 'any/etc/slp.reg'],
+    \ 'slpspi': ['/etc/slp.spi', 'any/etc/slp.spi'],
+    \ 'slrnrc': ['.slrnrc'],
+    \ 'slrnsc': ['file.score'],
+    \ 'sm': ['sendmail.cf'],
+    \ 'smarty': ['file.tpl'],
+    \ 'smcl': ['file.hlp', 'file.ihlp', 'file.smcl'],
+    \ 'smith': ['file.smt', 'file.smith'],
+    \ 'sml': ['file.sml'],
+    \ 'snobol4': ['file.sno', 'file.spt'],
+    \ 'spec': ['file.spec'],
+    \ 'spice': ['file.sp', 'file.spice'],
+    \ 'spup': ['file.speedup', 'file.spdata', 'file.spd'],
+    \ 'spyce': ['file.spy', 'file.spi'],
+    \ 'sql': ['file.tyb', 'file.typ', 'file.tyc', 'file.pkb', 'file.pks'],
+    \ 'sqlj': ['file.sqlj'],
+    \ 'sqr': ['file.sqr', 'file.sqi'],
+    \ 'squid': ['squid.conf'],
+    \ 'srec': ['file.s19', 'file.s28', 'file.s37', 'file.mot', 'file.srec'],
+    \ 'sshconfig': ['ssh_config', '/.ssh/config', '/etc/ssh/ssh_config.d/file.conf', 'any/etc/ssh/ssh_config.d/file.conf', 'any/.ssh/config'],
+    \ 'sshdconfig': ['sshd_config', '/etc/ssh/sshd_config.d/file.conf', 'any/etc/ssh/sshd_config.d/file.conf'],
+    \ 'st': ['file.st'],
+    \ 'stata': ['file.ado', 'file.do', 'file.imata', 'file.mata'],
+    \ 'stp': ['file.stp'],
+    \ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp', '/etc/sudoers'],
+    \ 'svg': ['file.svg'],
+    \ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'],
+    \ 'swift': ['file.swift'],
+    \ 'swiftgyb': ['file.swift.gyb'],
+    \ 'sil': ['file.sil'],
+    \ 'sysctl': ['/etc/sysctl.conf', '/etc/sysctl.d/file.conf', 'any/etc/sysctl.conf', 'any/etc/sysctl.d/file.conf'],
+    \ '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'],
+    \ 'systemverilog': ['file.sv', 'file.svh'],
+    \ 'tags': ['tags'],
+    \ 'tak': ['file.tak'],
+    \ 'taskdata': ['pending.data', 'completed.data', 'undo.data'],
+    \ 'taskedit': ['file.task'],
+    \ 'tcl': ['file.tcl', 'file.tk', 'file.itcl', 'file.itk', 'file.jacl'],
+    \ 'teraterm': ['file.ttl'],
+    \ 'terminfo': ['file.ti'],
+    \ 'tex': ['file.latex', 'file.sty', 'file.dtx', 'file.ltx', 'file.bbl'],
+    \ 'texinfo': ['file.texinfo', 'file.texi', 'file.txi'],
+    \ 'texmf': ['texmf.cnf'],
+    \ 'text': ['file.text', 'README'],
+    \ 'tf': ['.tfrc', 'tfrc'],
+    \ 'tidy': ['.tidyrc', 'tidyrc', 'tidy.conf'],
+    \ 'tilde': ['file.t.html'],
+    \ 'tli': ['file.tli'],
+    \ 'tmux': ['tmuxfile.conf', '.tmuxfile.conf', '.tmux-file.conf', '.tmux.conf', 'tmux-file.conf', 'tmux.conf'],
+    \ 'tpp': ['file.tpp'],
+    \ 'treetop': ['file.treetop'],
+    \ 'trustees': ['trustees.conf'],
+    \ 'tsalt': ['file.slt'],
+    \ 'tsscl': ['file.tsscl'],
+    \ 'tssgm': ['file.tssgm'],
+    \ 'tssop': ['file.tssop'],
+    \ 'html.twig': ['file.twig'],
+    \ 'typescript': ['file.ts'],
+    \ 'typescriptreact': ['file.tsx'],
+    \ 'uc': ['file.uc'],
+    \ 'udevconf': ['/etc/udev/udev.conf', 'any/etc/udev/udev.conf'],
+    \ 'udevperm': ['/etc/udev/permissions.d/file.permissions', 'any/etc/udev/permissions.d/file.permissions'],
+    \ 'udevrules': ['/etc/udev/rules.d/file.rules', '/usr/lib/udev/rules.d/file.rules', '/lib/udev/rules.d/file.rules'],
+    \ 'uil': ['file.uit', 'file.uil'],
+    \ 'updatedb': ['/etc/updatedb.conf', 'any/etc/updatedb.conf'],
+    \ 'upstart': ['/usr/share/upstart/file.conf', '/usr/share/upstart/file.override', '/etc/init/file.conf', '/etc/init/file.override', '/.init/file.conf', '/.init/file.override', '/.config/upstart/file.conf', '/.config/upstart/file.override', 'any/.config/upstart/file.conf', 'any/.config/upstart/file.override', 'any/.init/file.conf', 'any/.init/file.override', 'any/etc/init/file.conf', 'any/etc/init/file.override', 'any/usr/share/upstart/file.conf', 'any/usr/share/upstart/file.override'],
+    \ 'upstreamdat': ['upstream.dat', 'UPSTREAM.DAT', 'upstream.file.dat', 'UPSTREAM.FILE.DAT', 'file.upstream.dat', 'FILE.UPSTREAM.DAT'],
+    \ 'upstreaminstalllog': ['upstreaminstall.log', 'UPSTREAMINSTALL.LOG', 'upstreaminstall.file.log', 'UPSTREAMINSTALL.FILE.LOG', 'file.upstreaminstall.log', 'FILE.UPSTREAMINSTALL.LOG'],
+    \ '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'],
+    \ 'usserverlog': ['usserver.log', 'USSERVER.LOG', 'usserver.file.log', 'USSERVER.FILE.LOG', 'file.usserver.log', 'FILE.USSERVER.LOG'],
+    \ 'usw2kagtlog': ['usw2kagt.log', 'USW2KAGT.LOG', 'usw2kagt.file.log', 'USW2KAGT.FILE.LOG', 'file.usw2kagt.log', 'FILE.USW2KAGT.LOG'],
+    \ 'vb': ['file.sba', 'file.vbs', 'file.dsm', 'file.ctl'],
+    \ 'vera': ['file.vr', 'file.vri', 'file.vrh'],
+    \ 'verilog': ['file.v'],
+    \ 'verilogams': ['file.va', 'file.vams'],
+    \ 'vgrindefs': ['vgrindefs'],
+    \ 'vhdl': ['file.hdl', 'file.vhd', 'file.vhdl', 'file.vbe', 'file.vst', 'file.vhdl_123', 'file.vho', 'some.vhdl_1', 'some.vhdl_1-file'],
+    \ 'vim': ['file.vim', 'file.vba', '.exrc', '_exrc', 'some-vimrc', 'some-vimrc-file', 'vimrc', 'vimrc-file'],
+    \ 'viminfo': ['.viminfo', '_viminfo'],
+    \ 'vmasm': ['file.mar'],
+    \ 'voscm': ['file.cm'],
+    \ 'vrml': ['file.wrl'],
+    \ 'vroom': ['file.vroom'],
+    \ 'vue': ['file.vue'],
+    \ 'wast': ['file.wast', 'file.wat'],
+    \ 'webmacro': ['file.wm'],
+    \ 'wget': ['.wgetrc', 'wgetrc'],
+    \ 'winbatch': ['file.wbt'],
+    \ 'wml': ['file.wml'],
+    \ 'wsh': ['file.wsf', 'file.wsc'],
+    \ 'wsml': ['file.wsml'],
+    \ 'wvdial': ['wvdial.conf', '.wvdialrc'],
+    \ 'xdefaults': ['.Xdefaults', '.Xpdefaults', '.Xresources', 'xdm-config', 'file.ad', '/Xresources/file', '/app-defaults/file', 'Xresources', 'Xresources-file', 'any/Xresources/file', 'any/app-defaults/file'],
+    \ 'xhtml': ['file.xhtml', 'file.xht'],
+    \ 'xinetd': ['/etc/xinetd.conf', '/etc/xinetd.d/file', 'any/etc/xinetd.conf', 'any/etc/xinetd.d/file'],
+    \ 'xmath': ['file.msc', 'file.msf'],
+    \ 'xml': ['/etc/blkid.tab', '/etc/blkid.tab.old', 'file.xmi', 'file.csproj', 'file.csproj.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'],
+    \ 'xmodmap': ['anyXmodmap', 'Xmodmap', 'some-Xmodmap', 'some-xmodmap', 'some-xmodmap-file', 'xmodmap', 'xmodmap-file'],
+    \ 'xf86conf': ['xorg.conf', 'xorg.conf-4'],
+    \ 'xpm2': ['file.xpm2'],
+    \ 'xquery': ['file.xq', 'file.xql', 'file.xqm', 'file.xquery', 'file.xqy'],
+    \ 'xs': ['file.xs'],
+    \ 'xsd': ['file.xsd'],
+    \ 'xslt': ['file.xsl', 'file.xslt'],
+    \ 'yacc': ['file.yy', 'file.yxx', 'file.y++'],
+    \ 'yaml': ['file.yaml', 'file.yml'],
+    \ 'raml': ['file.raml'],
+    \ 'z8a': ['file.z8a'],
+    \ 'zimbu': ['file.zu'],
+    \ 'zimbutempl': ['file.zut'],
+    \ 'zsh': ['.zprofile', '/etc/zprofile', '.zfbfmarks', 'file.zsh', '.zcompdump', '.zlogin', '.zlogout', '.zshenv', '.zshrc', '.zcompdump-file', '.zlog', '.zlog-file', '.zsh', '.zsh-file', 'any/etc/zprofile', 'zlog', 'zlog-file', 'zsh', 'zsh-file'],
+    \
+    \ 'help': [$VIMRUNTIME . '/doc/help.txt'],
+    \ 'xpm': ['file.xpm'],
+    \ }
+
+let s:filename_case_checks = {
+    \ 'modula2': ['file.DEF', 'file.MOD'],
+    \ 'bzl': ['file.BUILD', 'BUILD'],
+    \ }
+
+func CheckItems(checks)
+  for [ft, names] in items(a:checks)
+    for i in range(0, len(names) - 1)
+      new
+      try
+        exe 'edit ' . fnameescape(names[i])
+      catch
+	call assert_report('cannot edit "' . names[i] . '": ' . v:exception)
+      endtry
+      if &filetype == '' && &readonly
+	" File exists but not able to edit it (permission denied)
+      else
+	call assert_equal(ft, &filetype, 'with file name: ' . names[i])
+      endif
+      bwipe!
+    endfor
+  endfor
+endfunc
+
+func NewTest_filetype_detection()
+  filetype on
+  call CheckItems(s:filename_checks)
+  if has('fname_case')
+    call CheckItems(s:filename_case_checks)
+  endif
+  filetype off
+endfunc
+
+" Filetypes detected from the file contents by scripts.vim
+let s:script_checks = {
+      \ 'virata': [['% Virata'],
+      \		['', '% Virata'],
+      \		['', '', '% Virata'],
+      \		['', '', '', '% Virata'],
+      \		['', '', '', '', '% Virata']],
+      \ 'strace': [['execve("/usr/bin/pstree", ["pstree"], 0x7ff0 /* 63 vars */) = 0'],
+      \		['15:17:47 execve("/usr/bin/pstree", ["pstree"], ... "_=/usr/bin/strace"]) = 0'],
+      \		['__libc_start_main and something']],
+      \ 'clojure': [['#!/path/clojure']],
+      \ 'scala': [['#!/path/scala']],
+      \ 'tcsh': [['#!/path/tcsh']],
+      \ 'zsh': [['#!/path/zsh']],
+      \ 'tcl': [['#!/path/tclsh'],
+      \         ['#!/path/wish'],
+      \         ['#!/path/expectk'],
+      \         ['#!/path/itclsh'],
+      \         ['#!/path/itkwish']],
+      \ 'expect': [['#!/path/expect']],
+      \ 'gnuplot': [['#!/path/gnuplot']],
+      \ 'make': [['#!/path/make']],
+      \ 'pike': [['#!/path/pike'],
+      \          ['#!/path/pike0'],
+      \          ['#!/path/pike9']],
+      \ 'lua': [['#!/path/lua']],
+      \ 'raku': [['#!/path/perl6']],
+      \ 'perl': [['#!/path/perl']],
+      \ 'php': [['#!/path/php']],
+      \ 'python': [['#!/path/python'],
+      \            ['#!/path/python2'],
+      \            ['#!/path/python3']],
+      \ 'groovy': [['#!/path/groovy']],
+      \ 'ruby': [['#!/path/ruby']],
+      \ 'javascript': [['#!/path/node'],
+      \                ['#!/path/js'],
+      \                ['#!/path/nodejs'],
+      \                ['#!/path/rhino']],
+      \ 'bc': [['#!/path/bc']],
+      \ 'sed': [['#!/path/sed']],
+      \ 'ocaml': [['#!/path/ocaml']],
+      \ 'awk': [['#!/path/awk'],
+      \         ['#!/path/gawk']],
+      \ 'wml': [['#!/path/wml']],
+      \ 'scheme': [['#!/path/scheme']],
+      \ 'cfengine': [['#!/path/cfengine']],
+      \ 'erlang': [['#!/path/escript']],
+      \ 'haskell': [['#!/path/haskell']],
+      \ 'cpp': [['// Standard iostream objects -*- C++ -*-'],
+      \         ['// -*- C++ -*-']],
+      \ 'yaml': [['%YAML 1.2']],
+      \ }
+
+" Various forms of "env" optional arguments.
+let s:script_env_checks = {
+      \ 'perl': [['#!/usr/bin/env VAR=val perl']],
+      \ 'scala': [['#!/usr/bin/env VAR=val VVAR=vval scala']],
+      \ 'awk': [['#!/usr/bin/env VAR=val -i awk']],
+      \ 'scheme': [['#!/usr/bin/env VAR=val --ignore-environment scheme']],
+      \ 'python': [['#!/usr/bin/env VAR=val -S python -w -T']],
+      \ 'wml': [['#!/usr/bin/env VAR=val --split-string wml']],
+      \ }
+
+func Run_script_detection(test_dict)
+  filetype on
+  for [ft, files] in items(a:test_dict)
+    for file in files
+      enew
+      silent put =file
+      1delete _
+      filetype detect
+      call assert_equal(ft, &filetype, 'for text: ' . string(file))
+      bwipe!
+    endfor
+  endfor
+  filetype off
+endfunc
+
+func Test_script_detection()
+  call Run_script_detection(s:script_checks)
+  call Run_script_detection(s:script_env_checks)
+endfunc
+
+func Test_setfiletype_completion()
+  call feedkeys(":setfiletype java\<C-A>\<C-B>\"\<CR>", 'tx')
+  call assert_equal('"setfiletype java javacc javascript javascriptreact', @:)
+endfunc
+
+" Test for ':filetype detect' command for a buffer without a file
+func Test_emptybuf_ftdetect()
+  new
+  call setline(1, '#!/bin/sh')
+  call assert_equal('', &filetype)
+  filetype detect
+  call assert_equal('sh', &filetype)
+  close!
+endfunc
+
+" Test for ':filetype indent on' and ':filetype indent off' commands
+func Test_filetype_indent_off()
+  new Xtest.vim
+  filetype indent on
+  call assert_equal(1, g:did_indent_on)
+  call assert_equal(['filetype detection:ON  plugin:OFF  indent:ON'],
+        \ execute('filetype')->split("\n"))
+  filetype indent off
+  call assert_equal(0, exists('g:did_indent_on'))
+  call assert_equal(['filetype detection:ON  plugin:OFF  indent:OFF'],
+        \ execute('filetype')->split("\n"))
+  close
+endfunc
+
+func Test_hook_file()
+  filetype on
+
+  call writefile(['[Trigger]', 'this is pacman config'], 'Xfile.hook')
+  split Xfile.hook
+  call assert_equal('dosini', &filetype)
+  bwipe!
+
+  call writefile(['not pacman'], 'Xfile.hook')
+  split Xfile.hook
+  call assert_notequal('dosini', &filetype)
+  bwipe!
+
+  call delete('Xfile.hook')
+  filetype off
+endfunc

From c45f0b8f640156142773eeb4d13b86b79605291a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Oct 2020 23:23:32 +0200
Subject: [PATCH 126/299] Make sure custom ftdetect is loaded, fixes #587

---
 ftdetect/polyglot.vim | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index a408d5026..6794397be 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -117,6 +117,11 @@ func! s:StarSetf(ft)
   endif
 endfunc
 
+" Load user-defined filetype.vim
+augroup filetypedetect
+runtime! filetype.vim
+augroup END
+
 augroup filetypedetect
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
@@ -4834,6 +4839,10 @@ au BufNewFile,BufRead *.txt
 	\|   setf text
 	\| endif
 
+" Use the filetype detect plugins.  They may overrule any of the previously
+" detected filetypes.
+runtime! ftdetect/*.vim
+
 " NOTE: The above command could have ended the filetypedetect autocmd group
 " and started another one. Let's make sure it has ended to get to a consistent
 " state.

From ba11e0f1ad214a0696ab48fbfdf06afd08ad2f91 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Oct 2020 23:26:36 +0200
Subject: [PATCH 127/299] Improve django detection, closes #585

---
 autoload/polyglot/detect.vim | 2 +-
 heuristics.yaml              | 2 +-
 tests/extensions.vim         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/autoload/polyglot/detect.vim b/autoload/polyglot/detect.vim
index bdd2e48d6..b1b5d6d78 100644
--- a/autoload/polyglot/detect.vim
+++ b/autoload/polyglot/detect.vim
@@ -298,7 +298,7 @@ func! polyglot#detect#Html(...)
   endif
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
-    if line =~# '{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\(\<\|\>\)\|{#\s\+'
+    if line =~# '{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\|load\)\(\<\|\>\)\|{#\s\+'
       set ft=htmldjango | return
     endif
     if line =~# '\(\<\|\>\)DTD\s\+XHTML\s'
diff --git a/heuristics.yaml b/heuristics.yaml
index 4080cbc44..23f63bb44 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -188,7 +188,7 @@ rules:
   filetype: mason
 - lines: 50
   rules:
-  - pattern: '{%-?\s*(end.*|extends|block|macro|set|if|for|include|trans)\b|{#\s+'
+  - pattern: '{%-?\s*(end.*|extends|block|macro|set|if|for|include|trans|load)\b|{#\s+'
     filetype: htmldjango
   - pattern: '\bDTD\s+XHTML\s'
     filetype: xhtml
diff --git a/tests/extensions.vim b/tests/extensions.vim
index de074e5db..6b4b7fe85 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -371,6 +371,7 @@ call TestExtension("mason", "mason2.html", "<%filter></%filter>")
 call TestExtension("htmldjango", "jinja2.html", "{% for item in navigation %}{% endfor %}")
 call TestExtension("htmldjango", "jinja3.html", "{% block head %}")
 call TestExtension("htmldjango", "jinja4.html", "{# some comment #}")
+call TestExtension("htmldjango", "jinja3.html", "{% load static %}")
 call TestExtension("xhtml", "xhtml.html", "<DTD   XHTML ")
 
 " many html templates use {{ }}, e.g. Angular, we should not assume django

From e95c5f49aae37ac650fa1078032e61d8cc42af62 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Oct 2020 23:37:38 +0200
Subject: [PATCH 128/299] Check indentation with 1024 lines as fallback, fixes
 #588

---
 ftdetect/polyglot.vim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 6794397be..c98c27d72 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2735,6 +2735,9 @@ if !has_key(s:disabled_packages, 'autoindent')
     if s:guess(getline(1, 32))
       return
     endif
+    if s:guess(getline(1, 1024))
+      return
+    endif
     let pattern = polyglot#sleuth#GlobForFiletype(&filetype)
     if len(pattern) == 0
       return

From 3ac0dd5a8033d3b356a2976e1dcc6ae8006f903b Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Oct 2020 23:47:17 +0200
Subject: [PATCH 129/299] Alaways use native vim syntax, fixes #582

---
 README.md        |   1 -
 ftplugin/vim.vim | 110 ------
 indent/vim.vim   | 108 ------
 packages.yaml    |   2 -
 scripts/build    |   5 +-
 syntax/vim.vim   | 984 -----------------------------------------------
 6 files changed, 4 insertions(+), 1206 deletions(-)
 delete mode 100644 ftplugin/vim.vim
 delete mode 100644 indent/vim.vim
 delete mode 100644 syntax/vim.vim

diff --git a/README.md b/README.md
index 4c4452ac3..f9a346233 100644
--- a/README.md
+++ b/README.md
@@ -190,7 +190,6 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [vbnet](https://github.com/vim-scripts/vbnet.vim)
 - [vcl](https://github.com/smerrill/vcl-vim-plugin)
 - [velocity](https://github.com/lepture/vim-velocity)
-- [vim](https://github.com/neovim/neovim/tree/master/runtime)
 - [vue](https://github.com/posva/vim-vue)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)
 - [xml](https://github.com/amadeus/vim-xml)
diff --git a/ftplugin/vim.vim b/ftplugin/vim.vim
deleted file mode 100644
index af269d051..000000000
--- a/ftplugin/vim.vim
+++ /dev/null
@@ -1,110 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vim') == -1
-
-" Vim filetype plugin
-" Language:	Vim
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2018 Aug 07
-
-" Only do this when not done yet for this buffer
-if exists("b:did_ftplugin")
-  finish
-endif
-
-" Don't load another plugin for this buffer
-let b:did_ftplugin = 1
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-if !exists('*VimFtpluginUndo')
-  func VimFtpluginUndo()
-    setl fo< isk< com< tw< commentstring< keywordprg<
-    if exists('b:did_add_maps')
-      silent! nunmap <buffer> [[
-      silent! vunmap <buffer> [[
-      silent! nunmap <buffer> ]]
-      silent! vunmap <buffer> ]]
-      silent! nunmap <buffer> []
-      silent! vunmap <buffer> []
-      silent! nunmap <buffer> ][
-      silent! vunmap <buffer> ][
-      silent! nunmap <buffer> ]"
-      silent! vunmap <buffer> ]"
-      silent! nunmap <buffer> ["
-      silent! vunmap <buffer> ["
-     endif
-    unlet! b:match_ignorecase b:match_words b:match_skip b:did_add_maps
-  endfunc
-endif
-
-let b:undo_ftplugin = "call VimFtpluginUndo()"
-
-" Set 'formatoptions' to break comment lines but not other lines,
-" and insert the comment leader when hitting <CR> or using "o".
-setlocal fo-=t fo+=croql
-
-" To allow tag lookup via CTRL-] for autoload functions, '#' must be a
-" keyword character.  E.g., for netrw#Nread().
-setlocal isk+=#
-
-" Use :help to lookup the keyword under the cursor with K.
-setlocal keywordprg=:help
-
-" Set 'comments' to format dashed lists in comments
-setlocal com=sO:\"\ -,mO:\"\ \ ,eO:\"\",:\"
-
-" Format comments to be up to 78 characters long
-if &tw == 0
-  setlocal tw=78
-endif
-
-" Comments start with a double quote
-setlocal commentstring=\"%s
-
-" Prefer Vim help instead of manpages.
-setlocal keywordprg=:help
-
-if !exists("no_plugin_maps") && !exists("no_vim_maps")
-  let b:did_add_maps = 1
-
-  " Move around functions.
-  nnoremap <silent><buffer> [[ m':call search('^\s*fu\%[nction]\>', "bW")<CR>
-  vnoremap <silent><buffer> [[ m':<C-U>exe "normal! gv"<Bar>call search('^\s*fu\%[nction]\>', "bW")<CR>
-  nnoremap <silent><buffer> ]] m':call search('^\s*fu\%[nction]\>', "W")<CR>
-  vnoremap <silent><buffer> ]] m':<C-U>exe "normal! gv"<Bar>call search('^\s*fu\%[nction]\>', "W")<CR>
-  nnoremap <silent><buffer> [] m':call search('^\s*endf\%[unction]\>', "bW")<CR>
-  vnoremap <silent><buffer> [] m':<C-U>exe "normal! gv"<Bar>call search('^\s*endf\%[unction]\>', "bW")<CR>
-  nnoremap <silent><buffer> ][ m':call search('^\s*endf\%[unction]\>', "W")<CR>
-  vnoremap <silent><buffer> ][ m':<C-U>exe "normal! gv"<Bar>call search('^\s*endf\%[unction]\>', "W")<CR>
-
-  " Move around comments
-  nnoremap <silent><buffer> ]" :call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR>
-  vnoremap <silent><buffer> ]" :<C-U>exe "normal! gv"<Bar>call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR>
-  nnoremap <silent><buffer> [" :call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR>
-  vnoremap <silent><buffer> [" :<C-U>exe "normal! gv"<Bar>call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR>
-endif
-
-" Let the matchit plugin know what items can be matched.
-if exists("loaded_matchit")
-  let b:match_ignorecase = 0
-  let b:match_words =
-	\ '\<fu\%[nction]\>:\<retu\%[rn]\>:\<endf\%[unction]\>,' .
- 	\ '\<\(wh\%[ile]\|for\)\>:\<brea\%[k]\>:\<con\%[tinue]\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' .
-	\ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' .
-	\ '\<try\>:\<cat\%[ch]\>:\<fina\%[lly]\>:\<endt\%[ry]\>,' .
-	\ '\<aug\%[roup]\s\+\%(END\>\)\@!\S:\<aug\%[roup]\s\+END\>,'
-  " Ignore syntax region commands and settings, any 'en*' would clobber
-  " if-endif.
-  " - set spl=de,en
-  " - au! FileType javascript syntax region foldBraces start=/{/ end=/}/ …
-  let b:match_skip = 'synIDattr(synID(line("."),col("."),1),"name")
-        \ =~? "comment\\|string\\|vimSynReg\\|vimSet"'
-endif
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" removed this, because 'cpoptions' is a global option.
-" setlocal cpo+=M		" makes \%( match \)
-
-endif
diff --git a/indent/vim.vim b/indent/vim.vim
deleted file mode 100644
index 47d1c4ded..000000000
--- a/indent/vim.vim
+++ /dev/null
@@ -1,108 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vim') == -1
-
-" Vim indent file
-" Language:	Vim script
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Jun 27
-
-" Only load this indent file when no other was loaded.
-if exists("b:did_indent")
-  finish
-endif
-let b:did_indent = 1
-
-setlocal indentexpr=GetVimIndent()
-setlocal indentkeys+==end,=else,=cat,=fina,=END,0\\,0=\"\\\ 
-
-let b:undo_indent = "setl indentkeys< indentexpr<"
-
-" Only define the function once.
-if exists("*GetVimIndent")
-  finish
-endif
-let s:keepcpo= &cpo
-set cpo&vim
-
-function GetVimIndent()
-  let ignorecase_save = &ignorecase
-  try
-    let &ignorecase = 0
-    return GetVimIndentIntern()
-  finally
-    let &ignorecase = ignorecase_save
-  endtry
-endfunc
-
-let s:lineContPat = '^\s*\(\\\|"\\ \)'
-
-function GetVimIndentIntern()
-  " Find a non-blank line above the current line.
-  let lnum = prevnonblank(v:lnum - 1)
-
-  " If the current line doesn't start with '\' or '"\ ' and below a line that
-  " starts with '\' or '"\ ', use the indent of the line above it.
-  let cur_text = getline(v:lnum)
-  if cur_text !~ s:lineContPat
-    while lnum > 0 && getline(lnum) =~ s:lineContPat
-      let lnum = lnum - 1
-    endwhile
-  endif
-
-  " At the start of the file use zero indent.
-  if lnum == 0
-    return 0
-  endif
-  let prev_text = getline(lnum)
-
-  " Add a 'shiftwidth' after :if, :while, :try, :catch, :finally, :function
-  " and :else.  Add it three times for a line that starts with '\' or '"\ '
-  " after a line that doesn't (or g:vim_indent_cont if it exists).
-  let ind = indent(lnum)
-  if cur_text =~ s:lineContPat && v:lnum > 1 && prev_text !~ s:lineContPat
-    if exists("g:vim_indent_cont")
-      let ind = ind + g:vim_indent_cont
-    else
-      let ind = ind + shiftwidth() * 3
-    endif
-  elseif prev_text =~ '^\s*aug\%[roup]\s\+' && prev_text !~ '^\s*aug\%[roup]\s\+[eE][nN][dD]\>'
-    let ind = ind + shiftwidth()
-  else
-    " A line starting with :au does not increment/decrement indent.
-    if prev_text !~ '^\s*au\%[tocmd]'
-      let i = match(prev_text, '\(^\||\)\s*\(if\|wh\%[ile]\|for\|try\|cat\%[ch]\|fina\%[lly]\|fu\%[nction]\|el\%[seif]\)\>')
-      if i >= 0
-	let ind += shiftwidth()
-	if strpart(prev_text, i, 1) == '|' && has('syntax_items')
-	      \ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$'
-	  let ind -= shiftwidth()
-	endif
-      endif
-    endif
-  endif
-
-  " If the previous line contains an "end" after a pipe, but not in an ":au"
-  " command.  And not when there is a backslash before the pipe.
-  " And when syntax HL is enabled avoid a match inside a string.
-  let i = match(prev_text, '[^\\]|\s*\(ene\@!\)')
-  if i > 0 && prev_text !~ '^\s*au\%[tocmd]'
-    if !has('syntax_items') || synIDattr(synID(lnum, i + 2, 1), "name") !~ '\(Comment\|String\)$'
-      let ind = ind - shiftwidth()
-    endif
-  endif
-
-
-  " Subtract a 'shiftwidth' on a :endif, :endwhile, :catch, :finally, :endtry,
-  " :endfun, :else and :augroup END.
-  if cur_text =~ '^\s*\(ene\@!\|cat\|fina\|el\|aug\%[roup]\s\+[eE][nN][dD]\)'
-    let ind = ind - shiftwidth()
-  endif
-
-  return ind
-endfunction
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim:sw=2
-
-endif
diff --git a/packages.yaml b/packages.yaml
index c348e351f..a58497f25 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5154,8 +5154,6 @@ filetypes:
   - pattern: "*.vhdl_[0-9]*"
 ---
 name: vim
-remote: neovim/neovim:runtime
-glob: "**/vim.vim"
 filetypes:
 - name: vim
   patterns:
diff --git a/scripts/build b/scripts/build
index 6f85776bb..c3ffd1dde 100755
--- a/scripts/build
+++ b/scripts/build
@@ -311,7 +311,7 @@ def copy_file(package, src, dest)
 end
 
 def download(packages)
-  packages.map { |p| p["remote"] or raise "No remote for: " + p["name"] }.uniq.each_slice(20) do |remotes|
+  packages.map { |p| p["remote"] }.compact.uniq.each_slice(20) do |remotes|
     remotes.map do |remote|
       Thread.new do
         repo, branch, path, dir = parse_remote(remote)
@@ -488,6 +488,9 @@ def extract(packages)
 
   output = []
   packages.map do |package|
+    if !package["remote"]
+      next
+    end
     repo, branch, path, dir = parse_remote(package["remote"])
     dirs = package.fetch("dirs", default_dirs)
     ignored_dirs = package.fetch("ignored_dirs", [])
diff --git a/syntax/vim.vim b/syntax/vim.vim
deleted file mode 100644
index 9717a8fb0..000000000
--- a/syntax/vim.vim
+++ /dev/null
@@ -1,984 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vim') == -1
-
-" Vim syntax file
-
-" #############################################################################
-" #############################################################################
-" Note: Be careful when merging the upstream version of this file.
-"       Much of this is generated by scripts/genvimvim.lua
-"       (installs to $VIMRUNTIME/syntax/vim/generated.vim)
-" #############################################################################
-" #############################################################################
-
-" Quit when a syntax file was already loaded {{{2
-if exists("b:current_syntax")
-  finish
-endif
-let s:keepcpo= &cpo
-set cpo&vim
-
-" vimTodo: contains common special-notices for comments {{{2
-" Use the vimCommentGroup cluster to add your own.
-syn keyword vimTodo contained	COMBAK	FIXME	TODO	XXX
-syn cluster vimCommentGroup	contains=vimTodo,@Spell
-
-" Special and plugin vim commands {{{2
-syn match   vimCommand contained	"\<z[-+^.=]\=\>"
-syn keyword vimOnlyCommand contained	fix[del] op[en] sh[ell] P[rint]
-syn keyword vimStdPlugin contained	DiffOrig Man N[ext] S TOhtml XMLent XMLns
-
-" Vim-specific options {{{2
-syn keyword vimOnlyOption contained	biosk bioskey cp compatible consk conskey cm cryptmethod edcompatible guipty key macatsui mzq mzquantum osfiletype oft renderoptions rop st shelltype sn shortname tenc termencoding ta textauto tx textmode tf ttyfast ttym ttymouse tbi ttybuiltin wiv weirdinvert
-
-" Turn-off setting variants
-syn keyword vimOnlyOption contained	nobiosk nobioskey noconsk noconskey nocp nocompatible noguipty nomacatsui nosn noshortname nota notextauto notx notextmode notf nottyfast notbi nottybuiltin nowiv noweirdinvert
-
-" Invertible setting variants
-syn keyword vimOnlyOption contained	invbiosk invbioskey invconsk invconskey invcp invcompatible invguipty invmacatsui invsn invshortname invta invtextauto invtx invtextmode invtf invttyfast invtbi invttybuiltin invwiv invweirdinvert
-" termcap codes (which can also be set) {{{2
-syn keyword vimTermOption contained	t_8b t_AB t_al t_bc t_ce t_cl t_Co t_Cs t_CV t_db t_DL t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_fs t_IE t_IS t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_ke t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RB t_RI t_RV t_Sb t_se t_Sf t_SI t_so t_sr t_SR t_te t_ti t_ts t_u7 t_ue t_us t_ut t_vb t_ve t_vi t_vs t_WP t_WS t_xn t_xs t_ZH t_ZR
-syn keyword vimTermOption contained	t_8f t_AF t_AL t_cd t_Ce t_cm t_cs t_CS t_da t_dl t_EI
-syn match   vimTermOption contained	"t_%1"
-syn match   vimTermOption contained	"t_#2"
-syn match   vimTermOption contained	"t_#4"
-syn match   vimTermOption contained	"t_@7"
-syn match   vimTermOption contained	"t_*7"
-syn match   vimTermOption contained	"t_&8"
-syn match   vimTermOption contained	"t_%i"
-syn match   vimTermOption contained	"t_k;"
-
-" unsupported settings: these are supported by vi but don't do anything in vim {{{2
-syn keyword vimErrSetting contained	hardtabs ht w1200 w300 w9600 
-"}}}2
-syn case ignore
-" Highlight commonly used Groupnames {{{2
-syn keyword vimGroup contained	Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo 
-
-" Default highlighting groups {{{2
-syn keyword vimHLGroup contained	ColorColumn Cursor CursorColumn CursorIM CursorLine CursorLineNr DiffAdd DiffChange DiffDelete DiffText Directory EndOfBuffer ErrorMsg FoldColumn Folded IncSearch LineNr MatchParen Menu ModeMsg MoreMsg NonText Normal Pmenu PmenuSbar PmenuSel PmenuThumb Question Scrollbar Search SignColumn SpecialKey SpellBad SpellCap SpellLocal SpellRare StatusLine StatusLineNC TabLine TabLineFill TabLineSel Title Tooltip VertSplit Visual WarningMsg WildMenu 
-syn match vimHLGroup contained	"Conceal"
-syn keyword vimOnlyHLGroup contained	VisualNOS
-syn keyword nvimHLGroup contained	Substitute TermCursor TermCursorNC QuickFixLine
-"}}}2
-syn case match
-" Special Vim Highlighting (not automatic) {{{1
-
-" Set up folding commands
-if exists("g:vimsyn_folding") && g:vimsyn_folding =~# '[aflmpPrt]'
- if g:vimsyn_folding =~# 'a'
-  com! -nargs=* VimFolda <args> fold
- else
-  com! -nargs=* VimFolda <args>
- endif
- if g:vimsyn_folding =~# 'f'
-  com! -nargs=* VimFoldf <args> fold
- else
-  com! -nargs=* VimFoldf <args>
- endif
- if g:vimsyn_folding =~# 'l'
-  com! -nargs=* VimFoldl <args> fold
- else
-  com! -nargs=* VimFoldl <args>
- endif
- if g:vimsyn_folding =~# 'm'
-  com! -nargs=* VimFoldm <args> fold
- else
-  com! -nargs=* VimFoldm <args>
- endif
- if g:vimsyn_folding =~# 'p' 
-  com! -nargs=* VimFoldp <args> fold 
- else 
-  com! -nargs=* VimFoldp <args> 
- endif
- if g:vimsyn_folding =~# 'P'
-  com! -nargs=* VimFoldP <args> fold
- else
-  com! -nargs=* VimFoldP <args>
- endif
- if g:vimsyn_folding =~# 'r'
-  com! -nargs=* VimFoldr <args> fold
- else
-  com! -nargs=* VimFoldr <args>
- endif
- if g:vimsyn_folding =~# 't'
-  com! -nargs=* VimFoldt <args> fold
- else
-  com! -nargs=* VimFoldt <args>
- endif
-else
- com! -nargs=*	VimFolda	<args>
- com! -nargs=*	VimFoldf	<args>
- com! -nargs=*	VimFoldl	<args>
- com! -nargs=*	VimFoldm	<args>
- com! -nargs=*	VimFoldp	<args>
- com! -nargs=*	VimFoldP	<args>
- com! -nargs=*	VimFoldr	<args>
- com! -nargs=*	VimFoldt	<args>
-endif
-
-" commands not picked up by the generator (due to non-standard format)
-syn keyword vimCommand contained	py3
-
-" Deprecated variable options {{{2
-if exists("g:vim_minlines")
- let g:vimsyn_minlines= g:vim_minlines
-endif
-if exists("g:vim_maxlines")
- let g:vimsyn_maxlines= g:vim_maxlines
-endif
-if exists("g:vimsyntax_noerror")
- let g:vimsyn_noerror= g:vimsyntax_noerror
-endif
-
-" Variable options {{{2
-if exists("g:vim_maxlines")
- let s:vimsyn_maxlines= g:vim_maxlines
-else
- let s:vimsyn_maxlines= 60
-endif
-
-" Numbers {{{2
-" =======
-syn match vimNumber	"\<\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\=" skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment
-syn match vimNumber	"-\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\="  skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment
-syn match vimNumber	"\<0[xX]\x\+"		       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment
-syn match vimNumber	"\%(^\|\A\)\zs#\x\{6}"             	       skipwhite nextgroup=vimGlobal,vimSubst,vimCommand,vimComment
-
-" All vimCommands are contained by vimIsCommand. {{{2
-syn match vimCmdSep	"[:|]\+"	skipwhite nextgroup=vimAddress,vimAutoCmd,vimEcho,vimIsCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd
-syn match vimIsCommand	"\<\h\w*\>"	contains=vimCommand
-syn match vimVar	      contained	"\<\h[a-zA-Z0-9#_]*\>"
-syn match vimVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"
-syn match vimVar	      	"\s\zs&\a\+\>"
-syn match vimFBVar      contained   "\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"
-syn keyword vimCommand  contained	in
-
-" Insertions And Appends: insert append {{{2
-" =======================
-syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=a\%[ppend]$"		matchgroup=vimCommand end="^\.$""
-syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=c\%[hange]$"		matchgroup=vimCommand end="^\.$""
-syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=i\%[nsert]$"		matchgroup=vimCommand end="^\.$""
-syn region vimInsert	matchgroup=vimCommand start="^[: \t]*\(\d\+\(,\d\+\)\=\)\=starti\%[nsert]$"	matchgroup=vimCommand end="^\.$""
-
-" Behave! {{{2
-" =======
-syn match   vimBehave	"\<be\%[have]\>" skipwhite nextgroup=vimBehaveModel,vimBehaveError
-syn keyword vimBehaveModel contained	mswin	xterm
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_nobehaveerror")
- syn match   vimBehaveError contained	"[^ ]\+"
-endif
-
-" Filetypes {{{2
-" =========
-syn match   vimFiletype	"\<filet\%[ype]\(\s\+\I\i*\)*"	skipwhite contains=vimFTCmd,vimFTOption,vimFTError
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_vimFTError")
- syn match   vimFTError  contained	"\I\i*"
-endif
-syn keyword vimFTCmd    contained	filet[ype]
-syn keyword vimFTOption contained	detect indent off on plugin
-
-" Augroup : vimAugroupError removed because long augroups caused sync'ing problems. {{{2
-" ======= : Trade-off: Increasing synclines with slower editing vs augroup END error checking.
-syn cluster vimAugroupList	contains=vimAugroup,vimIsCommand,vimUserCmd,vimExecute,vimNotFunc,vimFuncName,vimFunction,vimFunctionError,vimLineComment,vimNotFunc,vimMap,vimSpecFile,vimOper,vimNumber,vimOperParen,vimComment,vimString,vimSubst,vimMark,vimRegister,vimAddress,vimFilter,vimCmplxRepeat,vimComment,vimLet,vimSet,vimAutoCmd,vimRegion,vimSynLine,vimNotation,vimCtrlChar,vimFuncVar,vimContinue,vimSetEqual,vimOption
-if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'a'
- syn region  vimAugroup	fold matchgroup=vimAugroupKey start="\<aug\%[roup]\>\ze\s\+\K\k*" end="\<aug\%[roup]\>\ze\s\+[eE][nN][dD]\>"	contains=vimAutoCmd,@vimAugroupList
-else
- syn region  vimAugroup	matchgroup=vimAugroupKey start="\<aug\%[roup]\>\ze\s\+\K\k*" end="\<aug\%[roup]\>\ze\s\+[eE][nN][dD]\>"		contains=vimAutoCmd,@vimAugroupList
-endif
-syn match   vimAugroup	"aug\%[roup]!"	contains=vimAugroupKey
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noaugrouperror")
- syn match   vimAugroupError	"\<aug\%[roup]\>\s\+[eE][nN][dD]\>"
-endif
-syn keyword vimAugroupKey contained	aug[roup]
-
-" Operators: {{{2
-" =========
-syn cluster	vimOperGroup	contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperParen,vimNumber,vimString,vimRegister,vimContinue
-syn match	vimOper	"\%#=1\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}"	skipwhite nextgroup=vimString,vimSpecFile
-syn match	vimOper	"\(\<is\|\<isnot\)[?#]\{0,2}\>"			skipwhite nextgroup=vimString,vimSpecFile
-syn match	vimOper	"||\|&&\|[-+.!]"				skipwhite nextgroup=vimString,vimSpecFile
-syn region	vimOperParen 	matchgroup=vimParenSep	start="(" end=")" contains=@vimOperGroup
-syn region	vimOperParen	matchgroup=vimSep		start="{" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror")
- syn match	vimOperError	")"
-endif
-
-" Functions : Tag is provided for those who wish to highlight tagged functions {{{2
-" =========
-syn cluster	vimFuncList	contains=vimCommand,vimFunctionError,vimFuncKey,Tag,vimFuncSID
-syn cluster	vimFuncBodyList	contains=vimAbb,vimAddress,vimAugroupKey,vimAutoCmd,vimCmplxRepeat,vimComment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimExecute,vimIsCommand,vimFBVar,vimFunc,vimFunction,vimFuncVar,vimGlobal,vimHighlight,vimIsCommand,vimLet,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSearch,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUnmap,vimUserCommand
-syn match	vimFunction	"\<fu\%[nction]!\=\s\+\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\=\%(\i\|[#.]\|{.\{-1,}}\)*\ze\s*("	contains=@vimFuncList nextgroup=vimFuncBody
-
-if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f'
- syn region	vimFuncBody  contained	fold start="\ze\s*("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\)"		contains=@vimFuncBodyList
-else
- syn region	vimFuncBody  contained	start="\ze\s*("	matchgroup=vimCommand end="\<\(endf\>\|endfu\%[nction]\>\)"		contains=@vimFuncBodyList
-endif
-syn match	vimFuncVar   contained	"a:\(\K\k*\|\d\+\)"
-syn match	vimFuncSID   contained	"\c<sid>\|\<s:"
-syn keyword	vimFuncKey   contained	fu[nction]
-syn match	vimFuncBlank contained	"\s\+"
-
-syn keyword	vimPattern   contained	start	skip	end
-
-" Special Filenames, Modifiers, Extension Removal: {{{2
-" ===============================================
-syn match	vimSpecFile	"<c\(word\|WORD\)>"	nextgroup=vimSpecFileMod,vimSubst
-syn match	vimSpecFile	"<\([acs]file\|amatch\|abuf\)>"	nextgroup=vimSpecFileMod,vimSubst
-syn match	vimSpecFile	"\s%[ \t:]"ms=s+1,me=e-1	nextgroup=vimSpecFileMod,vimSubst
-syn match	vimSpecFile	"\s%$"ms=s+1	nextgroup=vimSpecFileMod,vimSubst
-syn match	vimSpecFile	"\s%<"ms=s+1,me=e-1	nextgroup=vimSpecFileMod,vimSubst
-syn match	vimSpecFile	"#\d\+\|[#%]<\>"	nextgroup=vimSpecFileMod,vimSubst
-syn match	vimSpecFileMod	"\(:[phtre]\)\+"	contained
-
-" User-Specified Commands: {{{2
-" =======================
-syn cluster	vimUserCmdList	contains=vimAddress,vimSyntax,vimHighlight,vimAutoCmd,vimCmplxRepeat,vimComment,vimCtrlChar,vimEscapeBrace,vimFunc,vimFuncName,vimFunction,vimFunctionError,vimIsCommand,vimMark,vimNotation,vimNumber,vimOper,vimRegion,vimRegister,vimLet,vimSet,vimSetEqual,vimSetString,vimSpecFile,vimString,vimSubst,vimSubstRep,vimSubstRange,vimSynLine
-syn keyword	vimUserCommand	contained	com[mand]
-syn match	vimUserCmd	"\<com\%[mand]!\=\>.*$"	contains=vimUserAttrb,vimUserAttrbError,vimUserCommand,@vimUserCmdList
-syn match	vimUserAttrbError	contained	"-\a\+\ze\s"
-syn match	vimUserAttrb	contained	"-nargs=[01*?+]"	contains=vimUserAttrbKey,vimOper
-syn match	vimUserAttrb	contained	"-complete="		contains=vimUserAttrbKey,vimOper nextgroup=vimUserAttrbCmplt,vimUserCmdError
-syn match	vimUserAttrb	contained	"-range\(=%\|=\d\+\)\="	contains=vimNumber,vimOper,vimUserAttrbKey
-syn match	vimUserAttrb	contained	"-count\(=\d\+\)\="	contains=vimNumber,vimOper,vimUserAttrbKey
-syn match	vimUserAttrb	contained	"-bang\>"		contains=vimOper,vimUserAttrbKey
-syn match	vimUserAttrb	contained	"-bar\>"		contains=vimOper,vimUserAttrbKey
-syn match	vimUserAttrb	contained	"-buffer\>"		contains=vimOper,vimUserAttrbKey
-syn match	vimUserAttrb	contained	"-register\>"		contains=vimOper,vimUserAttrbKey
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_nousercmderror")
- syn match	vimUserCmdError	contained	"\S\+\>"
-endif
-syn case ignore
-syn keyword	vimUserAttrbKey   contained	bar	ban[g]	cou[nt]	ra[nge] com[plete]	n[args]	re[gister]
-syn keyword	vimUserAttrbCmplt contained	augroup buffer behave color command compiler cscope dir environment event expression file file_in_path filetype function help highlight history locale mapping menu option packadd shellcmd sign syntax syntime tag tag_listfiles user var
-syn keyword	vimUserAttrbCmplt contained	custom customlist nextgroup=vimUserAttrbCmpltFunc,vimUserCmdError
-syn match	vimUserAttrbCmpltFunc contained	",\%([sS]:\|<[sS][iI][dD]>\)\=\%(\h\w*\%(#\h\w*\)\+\|\h\w*\)"hs=s+1 nextgroup=vimUserCmdError
-
-syn case match
-syn match	vimUserAttrbCmplt contained	"custom,\u\w*"
-
-" Lower Priority Comments: after some vim commands... {{{2
-" =======================
-syn match	vimComment	excludenl +\s"[^\-:.%#=*].*$+lc=1	contains=@vimCommentGroup,vimCommentString
-syn match	vimComment	+\<endif\s\+".*$+lc=5	contains=@vimCommentGroup,vimCommentString
-syn match	vimComment	+\<else\s\+".*$+lc=4	contains=@vimCommentGroup,vimCommentString
-syn region	vimCommentString	contained oneline start='\S\s\+"'ms=e	end='"'
-
-" Environment Variables: {{{2
-" =====================
-syn match	vimEnvvar	"\$\I\i*"
-syn match	vimEnvvar	"\${\I\i*}"
-
-" In-String Specials: {{{2
-" Try to catch strings, if nothing else matches (therefore it must precede the others!)
-"  vimEscapeBrace handles ["]  []"] (ie. "s don't terminate string inside [])
-syn region	vimEscapeBrace	oneline   contained transparent start="[^\\]\(\\\\\)*\[\zs\^\=\]\=" skip="\\\\\|\\\]" end="]"me=e-1
-syn match	vimPatSepErr	contained	"\\)"
-syn match	vimPatSep	contained	"\\|"
-syn region	vimPatSepZone	oneline   contained   matchgroup=vimPatSepZ start="\\%\=\ze(" skip="\\\\" end="\\)\|[^\\]['"]"	contains=@vimStringGroup
-syn region	vimPatRegion	contained transparent matchgroup=vimPatSepR start="\\[z%]\=(" end="\\)"	contains=@vimSubstList oneline
-syn match	vimNotPatSep	contained	"\\\\"
-syn cluster	vimStringGroup	contains=vimEscapeBrace,vimPatSep,vimNotPatSep,vimPatSepErr,vimPatSepZone,@Spell
-syn region	vimString	oneline keepend	start=+[^a-zA-Z>!\\@]"+lc=1 skip=+\\\\\|\\"+ matchgroup=vimStringEnd end=+"+	contains=@vimStringGroup
-syn region	vimString	oneline keepend	start=+[^a-zA-Z>!\\@]'+lc=1 end=+'+
-syn region	vimString	oneline	start=+=!+lc=1	skip=+\\\\\|\\!+ end=+!+	contains=@vimStringGroup
-syn region	vimString	oneline	start="=+"lc=1	skip="\\\\\|\\+" end="+"	contains=@vimStringGroup
-syn region	vimString	oneline	start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/"	contains=@vimStringGroup
-syn match	vimString	contained	+"[^"]*\\$+	skipnl nextgroup=vimStringCont
-syn match	vimStringCont	contained	+\(\\\\\|.\)\{-}[^\\]"+
-
-" Substitutions: {{{2
-" =============
-syn cluster	vimSubstList	contains=vimPatSep,vimPatRegion,vimPatSepErr,vimSubstTwoBS,vimSubstRange,vimNotation
-syn cluster	vimSubstRepList	contains=vimSubstSubstr,vimSubstTwoBS,vimNotation
-syn cluster	vimSubstList	add=vimCollection
-syn match	vimSubst	"\(:\+\s*\|^\s*\||\s*\)\<\%(\<s\%[ubstitute]\>\|\<sm\%[agic]\>\|\<sno\%[magic]\>\)[:#[:alpha:]]\@!" nextgroup=vimSubstPat
-syn match	vimSubst	"\%(^\|[^\\]\)\<s\%[ubstitute]\>[:#[:alpha:]]\@!"	nextgroup=vimSubstPat contained
-syn match	vimSubst	"/\zs\<s\%[ubstitute]\>\ze/"		nextgroup=vimSubstPat
-syn match	vimSubst	"\(:\+\s*\|^\s*\)s\ze#.\{-}#.\{-}#"		nextgroup=vimSubstPat
-syn match	vimSubst1       contained	"\<s\%[ubstitute]\>"	nextgroup=vimSubstPat
-syn match	vimSubst2       contained	"s\%[ubstitute]\>"	nextgroup=vimSubstPat
-syn region	vimSubstPat     contained	matchgroup=vimSubstDelim start="\z([^a-zA-Z( \t[\]&]\)"rs=s+1 skip="\\\\\|\\\z1" end="\z1"re=e-1,me=e-1	 contains=@vimSubstList	nextgroup=vimSubstRep4	oneline
-syn region	vimSubstRep4    contained	matchgroup=vimSubstDelim start="\z(.\)" skip="\\\\\|\\\z1" end="\z1" matchgroup=vimNotation end="<[cC][rR]>" contains=@vimSubstRepList	nextgroup=vimSubstFlagErr	oneline
-syn region	vimCollection   contained transparent	start="\\\@<!\[" skip="\\\[" end="\]"	contains=vimCollClass
-syn match	vimCollClassErr contained	"\[:.\{-\}:\]"
-syn match	vimCollClass    contained transparent	"\%#=1\[:\(alnum\|alpha\|blank\|cntrl\|digit\|graph\|lower\|print\|punct\|space\|upper\|xdigit\|return\|tab\|escape\|backspace\):\]"
-syn match	vimSubstSubstr  contained	"\\z\=\d"
-syn match	vimSubstTwoBS   contained	"\\\\"
-syn match	vimSubstFlagErr contained	"[^< \t\r|]\+" contains=vimSubstFlags
-syn match	vimSubstFlags   contained	"[&cegiIpr]\+"
-
-" 'String': {{{2
-syn match	vimString	"[^(,]'[^']\{-}\zs'"
-
-" Marks, Registers, Addresses, Filters: {{{2
-syn match	vimMark	"'[a-zA-Z0-9]\ze[-+,!]"	nextgroup=vimFilter,vimMarkNumber,vimSubst
-syn match	vimMark	"'[<>]\ze[-+,!]"		nextgroup=vimFilter,vimMarkNumber,vimSubst
-syn match	vimMark	",\zs'[<>]\ze"		nextgroup=vimFilter,vimMarkNumber,vimSubst
-syn match	vimMark	"[!,:]\zs'[a-zA-Z0-9]"	nextgroup=vimFilter,vimMarkNumber,vimSubst
-syn match	vimMark	"\<norm\%[al]\s\zs'[a-zA-Z0-9]"	nextgroup=vimFilter,vimMarkNumber,vimSubst
-syn match	vimMarkNumber	"[-+]\d\+"		contained contains=vimOper nextgroup=vimSubst2
-syn match	vimPlainMark contained	"'[a-zA-Z0-9]"
-syn match	vimRange	"[`'][a-zA-Z0-9],[`'][a-zA-Z0-9]"	contains=vimMark	skipwhite nextgroup=vimFilter
-
-syn match	vimRegister	'[^,;[{: \t]\zs"[a-zA-Z0-9.%#:_\-/]\ze[^a-zA-Z_":0-9]'
-syn match	vimRegister	'\<norm\s\+\zs"[a-zA-Z0-9]'
-syn match	vimRegister	'\<normal\s\+\zs"[a-zA-Z0-9]'
-syn match	vimRegister	'@"'
-syn match	vimPlainRegister contained	'"[a-zA-Z0-9\-:.%#*+=]'
-
-syn match	vimAddress	",\zs[.$]"	skipwhite nextgroup=vimSubst1
-syn match	vimAddress	"%\ze\a"	skipwhite nextgroup=vimString,vimSubst1
-
-syn match	vimFilter 		"^!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=vimOper,vimSpecFile
-syn match	vimFilter contained	"!!\=[^"]\{-}\(|\|\ze\"\|$\)"	contains=vimOper,vimSpecFile
-
-" Complex repeats (:h complex-repeat) {{{2
-syn match	vimCmplxRepeat	'[^a-zA-Z_/\\()]q[0-9a-zA-Z"]\>'lc=1
-syn match	vimCmplxRepeat	'@[0-9a-z".=@:]\ze\($\|[^a-zA-Z]\>\)'
-
-" Set command and associated set-options (vimOptions) with comment {{{2
-syn region	vimSet		matchgroup=vimCommand start="\<\%(setl\%[ocal]\|setg\%[lobal]\|se\%[t]\)\>" skip="\%(\\\\\)*\\." end="$" end="|" matchgroup=vimNotation end="<[cC][rR]>" keepend oneline contains=vimSetEqual,vimOption,vimErrSetting,vimComment,vimSetString,vimSetMod
-syn region	vimSetEqual	contained	start="[=:]\|[-+^]=" skip="\\\\\|\\\s" end="[| \t]\|$"me=e-1	contains=vimCtrlChar,vimSetSep,vimNotation,vimEnvvar oneline
-syn region	vimSetString	contained	start=+="+hs=s+1	skip=+\\\\\|\\"+  end=+"+		contains=vimCtrlChar
-syn match	vimSetSep	contained	"[,:]" skipwhite nextgroup=vimCommand
-syn match	vimSetMod	contained	"&vim\=\|[!&?<]\|all&"
-
-" Let {{{2
-" ===
-syn keyword	vimLet	let	unl[et]	skipwhite nextgroup=vimVar,vimFuncVar
-
-" Abbreviations {{{2
-" =============
-syn keyword vimAbb	ab[breviate] ca[bbrev] inorea[bbrev] cnorea[bbrev] norea[bbrev] ia[bbrev] skipwhite nextgroup=vimMapMod,vimMapLhs
-
-" Autocmd {{{2
-" =======
-syn match	vimAutoEventList	contained	"\(!\s\+\)\=\(\a\+,\)*\a\+"	contains=vimAutoEvent,nvimAutoEvent nextgroup=vimAutoCmdSpace
-syn match	vimAutoCmdSpace	contained	"\s\+"	nextgroup=vimAutoCmdSfxList
-syn match	vimAutoCmdSfxList	contained	"\S*"
-syn keyword	vimAutoCmd	au[tocmd] do[autocmd] doautoa[ll]	skipwhite nextgroup=vimAutoEventList
-
-" Echo and Execute -- prefer strings! {{{2
-" ================
-syn region	vimEcho	oneline excludenl matchgroup=vimCommand start="\<ec\%[ho]\>" skip="\(\\\\\)*\\|" end="$\||" contains=vimFunc,vimFuncVar,vimString,vimVar
-syn region	vimExecute	oneline excludenl matchgroup=vimCommand start="\<exe\%[cute]\>" skip="\(\\\\\)*\\|" end="$\||\|<[cC][rR]>" contains=vimFuncVar,vimIsCommand,vimOper,vimNotation,vimOperParen,vimString,vimVar
-syn match	vimEchoHL	"echohl\="	skipwhite nextgroup=vimGroup,vimHLGroup,vimEchoHLNone,vimOnlyHLGroup,nvimHLGroup
-syn case ignore
-syn keyword	vimEchoHLNone	none
-syn case match
-
-" Maps {{{2
-" ====
-syn match	vimMap		"\<map\>!\=\ze\s*[^(]" skipwhite nextgroup=vimMapMod,vimMapLhs
-syn keyword	vimMap		cm[ap] cno[remap] im[ap] ino[remap] lm[ap] ln[oremap] nm[ap] nn[oremap] no[remap] om[ap] ono[remap] smap snor[emap] vm[ap] vn[oremap] xm[ap] xn[oremap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-syn keyword	nvimMap		tn[oremap] tm[ap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-syn keyword	vimMap		mapc[lear] smapc[lear]
-syn keyword	vimUnmap		cu[nmap] iu[nmap] lu[nmap] nun[map] ou[nmap] sunm[ap] unm[ap] unm[ap] vu[nmap] xu[nmap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-syn keyword	nvimUnmap 		tunm[ap] skipwhite nextgroup=vimMapBang,vimMapMod,vimMapLhs
-syn match	vimMapLhs	contained	"\S\+"			contains=vimNotation,vimCtrlChar skipwhite nextgroup=vimMapRhs
-syn match	vimMapBang	contained	"!"			skipwhite nextgroup=vimMapMod,vimMapLhs
-syn match	vimMapMod	contained	"\%#=1\c<\(buffer\|expr\|\(local\)\=leader\|nowait\|plug\|script\|sid\|unique\|silent\)\+>" contains=vimMapModKey,vimMapModErr skipwhite nextgroup=vimMapMod,vimMapLhs
-syn match	vimMapRhs	contained	".*" contains=vimNotation,vimCtrlChar	skipnl nextgroup=vimMapRhsExtend
-syn match	vimMapRhsExtend	contained	"^\s*\\.*$"			contains=vimContinue
-syn case ignore
-syn keyword	vimMapModKey	contained	buffer	expr	leader	localleader	nowait	plug	script	sid	silent	unique
-syn case match
-
-" Menus {{{2
-" =====
-syn cluster	vimMenuList contains=vimMenuBang,vimMenuPriority,vimMenuName,vimMenuMod
-syn keyword	vimCommand	am[enu] an[oremenu] aun[menu] cme[nu] cnoreme[nu] cunme[nu] ime[nu] inoreme[nu] iunme[nu] me[nu] nme[nu] nnoreme[nu] noreme[nu] nunme[nu] ome[nu] onoreme[nu] ounme[nu] unme[nu] vme[nu] vnoreme[nu] vunme[nu] skipwhite nextgroup=@vimMenuList
-syn match	vimMenuName	"[^ \t\\<]\+"	contained nextgroup=vimMenuNameMore,vimMenuMap
-syn match	vimMenuPriority	"\d\+\(\.\d\+\)*"	contained skipwhite nextgroup=vimMenuName
-syn match	vimMenuNameMore	"\c\\\s\|<tab>\|\\\."	contained nextgroup=vimMenuName,vimMenuNameMore contains=vimNotation
-syn match	vimMenuMod    contained	"\c<\(script\|silent\)\+>"  skipwhite contains=vimMapModKey,vimMapModErr nextgroup=@vimMenuList
-syn match	vimMenuMap	"\s"	contained skipwhite nextgroup=vimMenuRhs
-syn match	vimMenuRhs	".*$"	contained contains=vimString,vimComment,vimIsCommand
-syn match	vimMenuBang	"!"	contained skipwhite nextgroup=@vimMenuList
-
-" Angle-Bracket Notation (tnx to Michael Geddes) {{{2
-" ======================
-syn case ignore
-syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([scamd]-\)\{0,4}x\=\(f\d\{1,2}\|[^ \t:]\|cmd\|cr\|lf\|linefeed\|return\|k\=del\%[ete]\|bs\|backspace\|tab\|esc\|right\|left\|help\|undo\|insert\|ins\|mouse\|k\=home\|k\=end\|kplus\|kminus\|kdivide\|kmultiply\|kenter\|kpoint\|space\|k\=\(page\)\=\(\|down\|up\|k\d\>\)\)>" contains=vimBracket
-syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([scam2-4]-\)\{0,4}\(right\|left\|middle\)\(mouse\)\=\(drag\|release\)\=>"	contains=vimBracket
-syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\(bslash\|plug\|sid\|space\|bar\|nop\|nul\|lt\)>"			contains=vimBracket
-syn match	vimNotation	'\(\\\|<lt>\)\=<C-R>[0-9a-z"%#:.\-=]'he=e-1				contains=vimBracket
-syn match	vimNotation	'\%#=1\(\\\|<lt>\)\=<\%(q-\)\=\(line[12]\|count\|bang\|reg\|args\|mods\|f-args\|f-mods\|lt\)>'	contains=vimBracket
-syn match	vimNotation	"\%#=1\(\\\|<lt>\)\=<\([cas]file\|abuf\|amatch\|cword\|cWORD\|client\)>"		contains=vimBracket
-syn match	vimBracket contained	"[\\<>]"
-syn case match
-
-" User Function Highlighting {{{2
-" (following Gautam Iyer's suggestion)
-" ==========================
-syn match vimFunc		"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\ze\s*("		contains=vimFuncName,vimUserFunc,vimExecute
-syn match vimUserFunc contained	"\%(\%([sSgGbBwWtTlL]:\|<[sS][iI][dD]>\)\=\%(\w\+\.\)*\I[a-zA-Z0-9_.]*\)\|\<\u[a-zA-Z0-9.]*\>\|\<if\>"	contains=vimNotation
-
-" Errors And Warnings: {{{2
-" ====================
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimfunctionerror")
- syn match	vimFunctionError	"\s\zs[a-z0-9]\i\{-}\ze\s*("			contained contains=vimFuncKey,vimFuncBlank
- syn match	vimFunctionError	"\s\zs\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\d\i\{-}\ze\s*("	contained contains=vimFuncKey,vimFuncBlank
- syn match	vimElseIfErr	"\<else\s\+if\>"
- syn match	vimBufnrWarn	/\<bufnr\s*(\s*["']\.['"]\s*)/
-endif
-
-syn match vimNotFunc	"\<if\>\|\<el\%[seif]\>\|\<return\>\|\<while\>"	skipwhite nextgroup=vimOper,vimOperParen,vimVar,vimFunc,vimNotation
-
-" Norm {{{2
-" ====
-syn match	vimNorm		"\<norm\%[al]!\=" skipwhite nextgroup=vimNormCmds
-syn match	vimNormCmds contained	".*$"
-
-" Syntax {{{2
-"=======
-syn match	vimGroupList	contained	"@\=[^ \t,]*"	contains=vimGroupSpecial,vimPatSep
-syn match	vimGroupList	contained	"@\=[^ \t,]*,"	nextgroup=vimGroupList contains=vimGroupSpecial,vimPatSep
-syn keyword	vimGroupSpecial	contained	ALL	ALLBUT	CONTAINED	TOP
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsynerror")
- syn match	vimSynError	contained	"\i\+"
- syn match	vimSynError	contained	"\i\+="	nextgroup=vimGroupList
-endif
-syn match	vimSynContains	contained	"\<contain\(s\|edin\)="	nextgroup=vimGroupList
-syn match	vimSynKeyContainedin	contained	"\<containedin="	nextgroup=vimGroupList
-syn match	vimSynNextgroup	contained	"nextgroup="	nextgroup=vimGroupList
-
-syn match	vimSyntax	"\<sy\%[ntax]\>"	contains=vimCommand skipwhite nextgroup=vimSynType,vimComment
-syn match	vimAuSyntax	contained	"\s+sy\%[ntax]"	contains=vimCommand skipwhite nextgroup=vimSynType,vimComment
-syn cluster vimFuncBodyList add=vimSyntax
-
-" Syntax: case {{{2
-syn keyword	vimSynType	contained	case	skipwhite nextgroup=vimSynCase,vimSynCaseError
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsyncaseerror")
- syn match	vimSynCaseError	contained	"\i\+"
-endif
-syn keyword	vimSynCase	contained	ignore	match
-
-" Syntax: clear {{{2
-syn keyword	vimSynType	contained	clear	skipwhite nextgroup=vimGroupList
-
-" Syntax: cluster {{{2
-syn keyword	vimSynType	contained	cluster	skipwhite nextgroup=vimClusterName
-syn region	vimClusterName	contained	matchgroup=vimGroupName start="\h\w*" skip="\\\\\|\\|" matchgroup=vimSep end="$\||" contains=vimGroupAdd,vimGroupRem,vimSynContains,vimSynError
-syn match	vimGroupAdd	contained	"add="	nextgroup=vimGroupList
-syn match	vimGroupRem	contained	"remove="	nextgroup=vimGroupList
-syn cluster vimFuncBodyList add=vimSynType,vimGroupAdd,vimGroupRem
-
-" Syntax: iskeyword {{{2
-syn keyword	vimSynType	contained	iskeyword	skipwhite nextgroup=vimIskList
-syn match	vimIskList	contained	'\S\+'	contains=vimIskSep
-syn match	vimIskSep	contained	','
-
-" Syntax: include {{{2
-syn keyword	vimSynType	contained	include	skipwhite nextgroup=vimGroupList
-syn cluster vimFuncBodyList add=vimSynType
-
-" Syntax: keyword {{{2
-syn cluster	vimSynKeyGroup	contains=vimSynNextgroup,vimSynKeyOpt,vimSynKeyContainedin
-syn keyword	vimSynType	contained	keyword	skipwhite nextgroup=vimSynKeyRegion
-syn region	vimSynKeyRegion	contained oneline keepend	matchgroup=vimGroupName start="\h\w*" skip="\\\\\|\\|" matchgroup=vimSep end="|\|$" contains=@vimSynKeyGroup
-syn match	vimSynKeyOpt	contained	"\%#=1\<\(conceal\|contained\|transparent\|skipempty\|skipwhite\|skipnl\)\>"
-syn cluster vimFuncBodyList add=vimSynType
-
-" Syntax: match {{{2
-syn cluster	vimSynMtchGroup	contains=vimMtchComment,vimSynContains,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation
-syn keyword	vimSynType	contained	match	skipwhite nextgroup=vimSynMatchRegion
-syn region	vimSynMatchRegion	contained keepend	matchgroup=vimGroupName start="\h\w*" matchgroup=vimSep end="|\|$" contains=@vimSynMtchGroup
-syn match	vimSynMtchOpt	contained	"\%#=1\<\(conceal\|transparent\|contained\|excludenl\|keepend\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
-if has("conceal")
- syn match	vimSynMtchOpt	contained	"\<cchar="	nextgroup=vimSynMtchCchar
- syn match	vimSynMtchCchar	contained	"\S"
-endif
-syn cluster vimFuncBodyList add=vimSynMtchGroup
-
-" Syntax: off and on {{{2
-syn keyword	vimSynType	contained	enable	list	manual	off	on	reset
-
-" Syntax: region {{{2
-syn cluster	vimSynRegPatGroup	contains=vimPatSep,vimNotPatSep,vimSynPatRange,vimSynNotPatRange,vimSubstSubstr,vimPatRegion,vimPatSepErr,vimNotation
-syn cluster	vimSynRegGroup	contains=vimSynContains,vimSynNextgroup,vimSynRegOpt,vimSynReg,vimSynMtchGrp
-syn keyword	vimSynType	contained	region	skipwhite nextgroup=vimSynRegion
-syn region	vimSynRegion	contained keepend	matchgroup=vimGroupName start="\h\w*" skip="\\\\\|\\|" end="|\|$" contains=@vimSynRegGroup
-syn match	vimSynRegOpt	contained	"\%#=1\<\(conceal\(ends\)\=\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|keepend\|oneline\|extend\|skipnl\|fold\)\>"
-syn match	vimSynReg	contained	"\(start\|skip\|end\)="he=e-1	nextgroup=vimSynRegPat
-syn match	vimSynMtchGrp	contained	"matchgroup="	nextgroup=vimGroup,vimHLGroup,vimOnlyHLGroup,nvimHLGroup
-syn region	vimSynRegPat	contained extend	start="\z([-`~!@#$%^&*_=+;:'",./?]\)"  skip="\\\\\|\\\z1"  end="\z1"  contains=@vimSynRegPatGroup skipwhite nextgroup=vimSynPatMod,vimSynReg
-syn match	vimSynPatMod	contained	"\%#=1\(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\([-+]\d\+\)\="
-syn match	vimSynPatMod	contained	"\%#=1\(hs\|ms\|me\|hs\|he\|rs\|re\)=[se]\([-+]\d\+\)\=," nextgroup=vimSynPatMod
-syn match	vimSynPatMod	contained	"lc=\d\+"
-syn match	vimSynPatMod	contained	"lc=\d\+," nextgroup=vimSynPatMod
-syn region	vimSynPatRange	contained	start="\["	skip="\\\\\|\\]"   end="]"
-syn match	vimSynNotPatRange	contained	"\\\\\|\\\["
-syn match	vimMtchComment	contained	'"[^"]\+$'
-syn cluster vimFuncBodyList add=vimSynType
-
-" Syntax: sync {{{2
-" ============
-syn keyword vimSynType	contained	sync	skipwhite	nextgroup=vimSyncC,vimSyncLines,vimSyncMatch,vimSyncError,vimSyncLinebreak,vimSyncLinecont,vimSyncRegion
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimsyncerror")
- syn match	vimSyncError	contained	"\i\+"
-endif
-syn keyword	vimSyncC	contained	ccomment	clear	fromstart
-syn keyword	vimSyncMatch	contained	match	skipwhite	nextgroup=vimSyncGroupName
-syn keyword	vimSyncRegion	contained	region	skipwhite	nextgroup=vimSynReg
-syn match	vimSyncLinebreak	contained	"\<linebreaks="	skipwhite	nextgroup=vimNumber
-syn keyword	vimSyncLinecont	contained	linecont	skipwhite	nextgroup=vimSynRegPat
-syn match	vimSyncLines	contained	"\(min\|max\)\=lines="	nextgroup=vimNumber
-syn match	vimSyncGroupName	contained	"\h\w*"	skipwhite	nextgroup=vimSyncKey
-syn match	vimSyncKey	contained	"\<groupthere\|grouphere\>"	skipwhite nextgroup=vimSyncGroup
-syn match	vimSyncGroup	contained	"\h\w*"	skipwhite	nextgroup=vimSynRegPat,vimSyncNone
-syn keyword	vimSyncNone	contained	NONE
-
-" Additional IsCommand, here by reasons of precedence {{{2
-" ====================
-syn match	vimIsCommand	"<Bar>\s*\a\+"	transparent contains=vimCommand,vimNotation
-
-" Highlighting {{{2
-" ============
-syn cluster	vimHighlightCluster		contains=vimHiLink,vimHiClear,vimHiKeyList,vimComment
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_novimhictermerror")
- syn match	vimHiCtermError	contained	"\D\i*"
-endif
-syn match	vimHighlight	"\<hi\%[ghlight]\>"	skipwhite nextgroup=vimHiBang,@vimHighlightCluster
-syn match	vimHiBang	contained	"!"	skipwhite nextgroup=@vimHighlightCluster
-
-syn match	vimHiGroup	contained	"\i\+"
-syn case ignore
-syn keyword	vimHiAttrib	contained	none bold inverse italic nocombine reverse standout strikethrough underline undercurl
-syn keyword	vimFgBgAttrib	contained	none bg background fg foreground
-syn case match
-syn match	vimHiAttribList	contained	"\i\+"	contains=vimHiAttrib
-syn match	vimHiAttribList	contained	"\i\+,"he=e-1	contains=vimHiAttrib nextgroup=vimHiAttribList
-syn case ignore
-syn keyword	vimHiCtermColor	contained	black blue brown cyan darkblue darkcyan darkgray darkgreen darkgrey darkmagenta darkred darkyellow gray green grey lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightred magenta red white yellow
-syn match	vimHiCtermColor	contained	"\<color\d\{1,3}\>"
-
-syn case match
-syn match	vimHiFontname	contained	"[a-zA-Z\-*]\+"
-syn match	vimHiGuiFontname	contained	"'[a-zA-Z\-* ]\+'"
-syn match	vimHiGuiRgb	contained	"#\x\{6}"
-
-" Highlighting: hi group key=arg ... {{{2
-syn cluster	vimHiCluster contains=vimGroup,vimHiBlend,vimHiGroup,vimHiTerm,vimHiCTerm,vimHiStartStop,vimHiCtermFgBg,vimHiGui,vimHiGuiFont,vimHiGuiFgBg,vimHiKeyError,vimNotation
-syn region	vimHiKeyList	contained oneline start="\i\+" skip="\\\\\|\\|" end="$\||"	contains=@vimHiCluster
-if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_vimhikeyerror")
- syn match	vimHiKeyError	contained	"\i\+="he=e-1
-endif
-syn match	vimHiTerm	contained	"\cterm="he=e-1		nextgroup=vimHiAttribList
-syn match	vimHiStartStop	contained	"\c\(start\|stop\)="he=e-1	nextgroup=vimHiTermcap,vimOption
-syn match	vimHiCTerm	contained	"\ccterm="he=e-1		nextgroup=vimHiAttribList
-syn match	vimHiCtermFgBg	contained	"\ccterm[fb]g="he=e-1	nextgroup=vimHiNmbr,vimHiCtermColor,vimFgBgAttrib,vimHiCtermError
-syn match	vimHiGui	contained	"\cgui="he=e-1		nextgroup=vimHiAttribList
-syn match	vimHiGuiFont	contained	"\cfont="he=e-1		nextgroup=vimHiFontname
-syn match	vimHiGuiFgBg	contained	"\cgui\%([fb]g\|sp\)="he=e-1	nextgroup=vimHiGroup,vimHiGuiFontname,vimHiGuiRgb,vimFgBgAttrib
-syn match	vimHiTermcap	contained	"\S\+"		contains=vimNotation
-syn match	vimHiBlend	contained	"\cblend="he=e-1		nextgroup=vimHiNmbr
-syn match	vimHiNmbr	contained	'\d\+'
-
-" Highlight: clear {{{2
-syn keyword	vimHiClear	contained	clear	nextgroup=vimHiGroup
-
-" Highlight: link {{{2
-" see tst24 (hi def vs hi) (Jul 06, 2018)
-"syn region	vimHiLink	contained oneline matchgroup=vimCommand start="\(\<hi\%[ghlight]\s\+\)\@<=\(\(def\%[ault]\s\+\)\=link\>\|\<def\>\)" end="$"	contains=vimHiGroup,vimGroup,vimHLGroup,vimNotation
-syn region	vimHiLink	contained oneline matchgroup=vimCommand start="\(\<hi\%[ghlight]\s\+\)\@<=\(\(def\%[ault]\s\+\)\=link\>\|\<def\>\)" end="$"	contains=@vimHiCluster
-syn cluster vimFuncBodyList add=vimHiLink
-
-" Control Characters {{{2
-" ==================
-syn match	vimCtrlChar	"[
--]"
-
-" Beginners - Patterns that involve ^ {{{2
-" =========
-syn match	vimLineComment	+^[ \t:]*".*$+	contains=@vimCommentGroup,vimCommentString,vimCommentTitle
-syn match	vimCommentTitle	'"\s*\%([sS]:\|\h\w*#\)\=\u\w*\(\s\+\u\w*\)*:'hs=s+1	contained contains=vimCommentTitleLeader,vimTodo,@vimCommentGroup
-syn match	vimContinue	"^\s*\\"
-syn region	vimString	start="^\s*\\\z(['"]\)" skip='\\\\\|\\\z1' end="\z1" oneline keepend contains=@vimStringGroup,vimContinue
-syn match	vimCommentTitleLeader	'"\s\+'ms=s+1	contained
-
-" Searches And Globals: {{{2
-" ====================
-syn match	vimSearch	'^\s*[/?].*'		contains=vimSearchDelim
-syn match	vimSearchDelim	'^\s*\zs[/?]\|[/?]$'	contained
-syn region	vimGlobal	matchgroup=Statement start='\<g\%[lobal]!\=/'  skip='\\.' end='/'	skipwhite nextgroup=vimSubst
-syn region	vimGlobal	matchgroup=Statement start='\<v\%[global]!\=/' skip='\\.' end='/'	skipwhite nextgroup=vimSubst
-
-" Scripts  : perl,ruby : Benoit Cerrina {{{2
-" =======    python,tcl: Johannes Zellner
-"            lua
-
-" Allows users to specify the type of embedded script highlighting
-" they want:  (perl/python/ruby/tcl support)
-"   g:vimsyn_embed == 0   : don't embed any scripts
-"   g:vimsyn_embed =~# 'l' : embed lua
-"   g:vimsyn_embed =~# 'm' : embed mzscheme
-"   g:vimsyn_embed =~# 'p' : embed perl
-"   g:vimsyn_embed =~# 'P' : embed python
-"   g:vimsyn_embed =~# 'r' : embed ruby
-"   g:vimsyn_embed =~# 't' : embed tcl
-if !exists("g:vimsyn_embed")
- let g:vimsyn_embed= 0
-endif
-
-" [-- lua --] {{{3
-let s:luapath= fnameescape(expand("<sfile>:p:h")."/lua.vim")
-if !filereadable(s:luapath)
- for s:luapath in split(globpath(&rtp,"syntax/lua.vim"),"\n")
-  if filereadable(fnameescape(s:luapath))
-   let s:luapath= fnameescape(s:luapath)
-   break
-  endif
- endfor
-endif
-if g:vimsyn_embed =~# 'l' && filereadable(s:luapath)
- unlet! b:current_syntax
- syn cluster vimFuncBodyList	add=vimLuaRegion
- exe "syn include @vimLuaScript ".s:luapath
- VimFoldl syn region vimLuaRegion matchgroup=vimScriptDelim start=+lua\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimLuaScript
- VimFoldl syn region vimLuaRegion matchgroup=vimScriptDelim start=+lua\s*<<\s*$+ end=+\.$+	contains=@vimLuaScript
- syn cluster vimFuncBodyList	add=vimLuaRegion
-else
- syn region vimEmbedError start=+lua\s*<<\s*\z(.*\)$+ end=+^\z1$+
- syn region vimEmbedError start=+lua\s*<<\s*$+ end=+\.$+
-endif
-unlet s:luapath
-
-" [-- perl --] {{{3
-let s:perlpath= fnameescape(expand("<sfile>:p:h")."/perl.vim")
-if !filereadable(s:perlpath)
- for s:perlpath in split(globpath(&rtp,"syntax/perl.vim"),"\n")
-  if filereadable(fnameescape(s:perlpath))
-   let s:perlpath= fnameescape(s:perlpath)
-   break
-  endif
- endfor
-endif
-if g:vimsyn_embed =~# 'p' && filereadable(s:perlpath)
- unlet! b:current_syntax
- syn cluster vimFuncBodyList	add=vimPerlRegion
- let s:foldmethod = &l:foldmethod
- exe "syn include @vimPerlScript ".s:perlpath
- let &l:foldmethod = s:foldmethod
- VimFoldp syn region vimPerlRegion  matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*\z(\S*\)\ze\(\s*["#].*\)\=$+ end=+^\z1\ze\(\s*[#"].*\)\=$+	contains=@vimPerlScript
- VimFoldp syn region vimPerlRegion	matchgroup=vimScriptDelim start=+pe\%[rl]\s*<<\s*$+ end=+\.$+			contains=@vimPerlScript
- syn cluster vimFuncBodyList	add=vimPerlRegion
-else
- syn region vimEmbedError start=+pe\%[rl]\s*<<\s*\z(.*\)$+ end=+^\z1$+
- syn region vimEmbedError start=+pe\%[rl]\s*<<\s*$+ end=+\.$+
-endif
-unlet s:perlpath
-
-" [-- ruby --] {{{3
-let s:rubypath= fnameescape(expand("<sfile>:p:h")."/ruby.vim")
-if !filereadable(s:rubypath)
- for s:rubypath in split(globpath(&rtp,"syntax/ruby.vim"),"\n")
-  if filereadable(fnameescape(s:rubypath))
-   let s:rubypath= fnameescape(s:rubypath)
-   break
-  endif
- endfor
-endif
-if g:vimsyn_embed =~# 'r' && filereadable(s:rubypath)
- syn cluster vimFuncBodyList	add=vimRubyRegion
- unlet! b:current_syntax
- let s:foldmethod = &l:foldmethod
- exe "syn include @vimRubyScript ".s:rubypath
- let &l:foldmethod = s:foldmethod
- VimFoldr syn region vimRubyRegion	matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+	contains=@vimRubyScript
- syn region vimRubyRegion	matchgroup=vimScriptDelim start=+rub[y]\s*<<\s*$+ end=+\.$+			contains=@vimRubyScript
- syn cluster vimFuncBodyList	add=vimRubyRegion
-else
- syn region vimEmbedError start=+rub[y]\s*<<\s*\z(.*\)$+ end=+^\z1$+
- syn region vimEmbedError start=+rub[y]\s*<<\s*$+ end=+\.$+
-endif
-unlet s:rubypath
-
-" [-- python --] {{{3
-let s:pythonpath= fnameescape(expand("<sfile>:p:h")."/python.vim")
-if !filereadable(s:pythonpath)
- for s:pythonpath in split(globpath(&rtp,"syntax/python.vim"),"\n")
-  if filereadable(fnameescape(s:pythonpath))
-   let s:pythonpath= fnameescape(s:pythonpath)
-   break
-  endif
- endfor
-endif
-if g:vimsyn_embed =~# 'P' && filereadable(s:pythonpath)
- unlet! b:current_syntax
- syn cluster vimFuncBodyList	add=vimPythonRegion
- exe "syn include @vimPythonScript ".s:pythonpath
- VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]3\=\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+	contains=@vimPythonScript
- VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+py\%[thon]3\=\s*<<\s*$+ end=+\.$+			contains=@vimPythonScript
- VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\s*<<\s*\z(\S*\)\ze\(\s*#.*\)\=$+ end=+^\z1\ze\(\s*".*\)\=$+	contains=@vimPythonScript
- VimFoldP syn region vimPythonRegion matchgroup=vimScriptDelim start=+Py\%[thon]2or3\=\s*<<\s*$+ end=+\.$+			contains=@vimPythonScript
- syn cluster vimFuncBodyList	add=vimPythonRegion
-else
- syn region vimEmbedError start=+py\%[thon]3\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
- syn region vimEmbedError start=+py\%[thon]3\=\s*<<\s*$+ end=+\.$+
-endif
-unlet s:pythonpath
-
-" [-- tcl --] {{{3
-if has("win32") || has("win95") || has("win64") || has("win16")
- " apparently has("tcl") has been hanging vim on some windows systems with cygwin
- let s:trytcl= (&shell !~ '\<\%(bash\>\|4[nN][tT]\|\<zsh\)\>\%(\.exe\)\=$')
-else
- let s:trytcl= 1
-endif
-if s:trytcl
- let s:tclpath= fnameescape(expand("<sfile>:p:h")."/tcl.vim")
- if !filereadable(s:tclpath)
-  for s:tclpath in split(globpath(&rtp,"syntax/tcl.vim"),"\n")
-   if filereadable(fnameescape(s:tclpath))
-    let s:tclpath= fnameescape(s:tclpath)
-    break
-   endif
-  endfor
- endif
- if g:vimsyn_embed =~# 't' && filereadable(s:tclpath)
-  unlet! b:current_syntax
-  syn cluster vimFuncBodyList	add=vimTclRegion
-  exe "syn include @vimTclScript ".s:tclpath
-  VimFoldt syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimTclScript
-  VimFoldt syn region vimTclRegion matchgroup=vimScriptDelim start=+tc[l]\=\s*<<\s*$+ end=+\.$+	contains=@vimTclScript
-  syn cluster vimFuncBodyList	add=vimTclScript
- else
-  syn region vimEmbedError start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
-  syn region vimEmbedError start=+tc[l]\=\s*<<\s*$+ end=+\.$+
- endif
- unlet s:tclpath
-else
- syn region vimEmbedError start=+tc[l]\=\s*<<\s*\z(.*\)$+ end=+^\z1$+
- syn region vimEmbedError start=+tc[l]\=\s*<<\s*$+ end=+\.$+
-endif
-unlet s:trytcl
-
-" [-- mzscheme --] {{{3
-let s:mzschemepath= fnameescape(expand("<sfile>:p:h")."/scheme.vim")
-if !filereadable(s:mzschemepath)
- for s:mzschemepath in split(globpath(&rtp,"syntax/mzscheme.vim"),"\n")
-  if filereadable(fnameescape(s:mzschemepath))
-   let s:mzschemepath= fnameescape(s:mzschemepath)
-   break
-  endif
- endfor
-endif
-if g:vimsyn_embed =~# 'm' && filereadable(s:mzschemepath)
- unlet! b:current_syntax
- let s:iskKeep= &isk
- syn cluster vimFuncBodyList	add=vimMzSchemeRegion
- exe "syn include @vimMzSchemeScript ".s:mzschemepath
- let &isk= s:iskKeep
- unlet s:iskKeep
- VimFoldm syn region vimMzSchemeRegion matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*\z(.*\)$+ end=+^\z1$+	contains=@vimMzSchemeScript
- VimFoldm syn region vimMzSchemeRegion matchgroup=vimScriptDelim start=+mz\%[scheme]\s*<<\s*$+ end=+\.$+		contains=@vimMzSchemeScript
- syn cluster vimFuncBodyList	add=vimMzSchemeRegion
-else
- syn region vimEmbedError start=+mz\%[scheme]\s*<<\s*\z(.*\)$+ end=+^\z1$+
- syn region vimEmbedError start=+mz\%[scheme]\s*<<\s*$+ end=+\.$+
-endif
-unlet s:mzschemepath
-
-" Synchronize (speed) {{{2
-"============
-if exists("g:vimsyn_minlines")
- exe "syn sync minlines=".g:vimsyn_minlines
-endif
-exe "syn sync maxlines=".s:vimsyn_maxlines
-syn sync linecont	"^\s\+\\"
-syn sync match vimAugroupSyncA	groupthere NONE	"\<aug\%[roup]\>\s\+[eE][nN][dD]"
-
-" ====================
-" Highlighting Settings {{{2
-" ====================
-
-if !exists("skip_vim_syntax_inits")
- if !exists("g:vimsyn_noerror")
-  hi def link vimBehaveError	vimError
-  hi def link vimCollClassErr	vimError
-  hi def link vimErrSetting	vimError
-  hi def link vimEmbedError	Normal
-  hi def link vimFTError	vimError
-  hi def link vimFunctionError	vimError
-  hi def link vimFunc         	vimError
-  hi def link vimHiAttribList	vimError
-  hi def link vimHiCtermError	vimError
-  hi def link vimHiKeyError	vimError
-  hi def link vimKeyCodeError	vimError
-  hi def link vimMapModErr	vimError
-  hi def link vimSubstFlagErr	vimError
-  hi def link vimSynCaseError	vimError
-  hi def link vimBufnrWarn	vimWarn
- endif
-
- hi def link vimAbb	vimCommand
- hi def link vimAddress	vimMark
- hi def link vimAugroupError	vimError
- hi def link vimAugroupKey	vimCommand
- hi def link vimAuHighlight	vimHighlight
- hi def link vimAutoCmdOpt	vimOption
- hi def link vimAutoCmd	vimCommand
- hi def link vimAutoEvent	Type
- hi def link vimAutoSet	vimCommand
- hi def link vimBehaveModel	vimBehave
- hi def link vimBehave	vimCommand
- hi def link vimBracket	Delimiter
- hi def link vimCmplxRepeat	SpecialChar
- hi def link vimCommand	Statement
- hi def link vimComment	Comment
- hi def link vimCommentString	vimString
- hi def link vimCommentTitle	PreProc
- hi def link vimCondHL	vimCommand
- hi def link vimContinue	Special
- hi def link vimCtrlChar	SpecialChar
- hi def link vimEchoHLNone	vimGroup
- hi def link vimEchoHL	vimCommand
- hi def link vimElseIfErr	Error
- hi def link vimElseif	vimCondHL
- hi def link vimEnvvar	PreProc
- hi def link vimError	Error
- hi def link vimFBVar	vimVar
- hi def link vimFgBgAttrib	vimHiAttrib
- hi def link vimFold	Folded
- hi def link vimFTCmd	vimCommand
- hi def link vimFTOption	vimSynType
- hi def link vimFuncKey	vimCommand
- hi def link vimFuncName	Function
- hi def link vimFuncSID	Special
- hi def link vimFuncVar	Identifier
- hi def link vimGroupAdd	vimSynOption
- hi def link vimGroupName	vimGroup
- hi def link vimGroupRem	vimSynOption
- hi def link vimGroupSpecial	Special
- hi def link vimGroup	Type
- hi def link vimHiAttrib	PreProc
- hi def link vimHiBlend	vimHiTerm
- hi def link vimHiClear	vimHighlight
- hi def link vimHiCtermFgBg	vimHiTerm
- hi def link vimHiCTerm	vimHiTerm
- hi def link vimHighlight	vimCommand
- hi def link vimHiGroup	vimGroupName
- hi def link vimHiGuiFgBg	vimHiTerm
- hi def link vimHiGuiFont	vimHiTerm
- hi def link vimHiGuiRgb	vimNumber
- hi def link vimHiGui	vimHiTerm
- hi def link vimHiNmbr	Number
- hi def link vimHiStartStop	vimHiTerm
- hi def link vimHiTerm	Type
- hi def link vimHLGroup	vimGroup
- hi def link vimHLMod	PreProc
- hi def link vimInsert	vimString
- hi def link vimIskSep	Delimiter
- hi def link vimKeyCode	vimSpecFile
- hi def link vimKeyword	Statement
- hi def link vimLet	vimCommand
- hi def link vimLineComment	vimComment
- hi def link vimMapBang	vimCommand
- hi def link vimMapModKey	vimFuncSID
- hi def link vimMapMod	vimBracket
- hi def link vimMap	vimCommand
- hi def link vimMark	Number
- hi def link vimMarkNumber	vimNumber
- hi def link vimMenuMod	vimMapMod
- hi def link vimMenuNameMore	vimMenuName
- hi def link vimMenuName	PreProc
- hi def link vimMtchComment	vimComment
- hi def link vimNorm	vimCommand
- hi def link vimNotation	Special
- hi def link vimNotFunc	vimCommand
- hi def link vimNotPatSep	vimString
- hi def link vimNumber	Number
- hi def link vimOperError	Error
- hi def link vimOper	Operator
- hi def link vimOption	PreProc
- hi def link vimParenSep	Delimiter
- hi def link vimPatSepErr	vimError
- hi def link vimPatSepR	vimPatSep
- hi def link vimPatSep	SpecialChar
- hi def link vimPatSepZone	vimString
- hi def link vimPatSepZ	vimPatSep
- hi def link vimPattern	Type
- hi def link vimPlainMark	vimMark
- hi def link vimPlainRegister	vimRegister
- hi def link vimRegister	SpecialChar
- hi def link vimScriptDelim	Comment
- hi def link vimSearchDelim	Statement
- hi def link vimSearch	vimString
- hi def link vimSep	Delimiter
- hi def link vimSetMod	vimOption
- hi def link vimSetSep	Statement
- hi def link vimSetString	vimString
- hi def link vimSpecFile	Identifier
- hi def link vimSpecFileMod	vimSpecFile
- hi def link vimSpecial	Type
- hi def link vimStatement	Statement
- hi def link vimStringCont	vimString
- hi def link vimString	String
- hi def link vimStringEnd	vimString
- hi def link vimSubst1	vimSubst
- hi def link vimSubstDelim	Delimiter
- hi def link vimSubstFlags	Special
- hi def link vimSubstSubstr	SpecialChar
- hi def link vimSubstTwoBS	vimString
- hi def link vimSubst	vimCommand
- hi def link vimSynCaseError	Error
- hi def link vimSynCase	Type
- hi def link vimSyncC	Type
- hi def link vimSyncError	Error
- hi def link vimSyncGroupName	vimGroupName
- hi def link vimSyncGroup	vimGroupName
- hi def link vimSyncKey	Type
- hi def link vimSyncNone	Type
- hi def link vimSynContains	vimSynOption
- hi def link vimSynError	Error
- hi def link vimSynKeyContainedin	vimSynContains
- hi def link vimSynKeyOpt	vimSynOption
- hi def link vimSynMtchGrp	vimSynOption
- hi def link vimSynMtchOpt	vimSynOption
- hi def link vimSynNextgroup	vimSynOption
- hi def link vimSynNotPatRange	vimSynRegPat
- hi def link vimSynOption	Special
- hi def link vimSynPatRange	vimString
- hi def link vimSynRegOpt	vimSynOption
- hi def link vimSynRegPat	vimString
- hi def link vimSynReg	Type
- hi def link vimSyntax	vimCommand
- hi def link vimSynType	vimSpecial
- hi def link vimTodo	Todo
- hi def link vimUnmap	vimMap
- hi def link vimUserAttrbCmpltFunc	Special
- hi def link vimUserAttrbCmplt	vimSpecial
- hi def link vimUserAttrbKey	vimOption
- hi def link vimUserAttrb	vimSpecial
- hi def link vimUserAttrbError	Error
- hi def link vimUserCmdError	Error
- hi def link vimUserCommand	vimCommand
- hi def link vimUserFunc	Normal
- hi def link vimVar	Identifier
- hi def link vimWarn	WarningMsg
-
- hi def link nvimAutoEvent	vimAutoEvent
- hi def link nvimHLGroup	vimHLGroup
- hi def link nvimMap	vimMap
- hi def link nvimUnmap	vimUnmap
-endif
-
-" Current Syntax Variable: {{{2
-let b:current_syntax = "vim"
-
-" ---------------------------------------------------------------------
-" Cleanup: {{{1
-delc VimFolda
-delc VimFoldf
-delc VimFoldl
-delc VimFoldm
-delc VimFoldp
-delc VimFoldP
-delc VimFoldr
-delc VimFoldt
-let &cpo = s:keepcpo
-unlet s:keepcpo
-" vim:ts=18  fdm=marker
-
-endif

From cd919c003992d5868b2b6e254ca265f82a45933f Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 16 Oct 2020 13:40:50 +0200
Subject: [PATCH 130/299] Mention filetypes in the readme

---
 README.md     | 288 +++++++++++++++++++++++++-------------------------
 scripts/build |   7 ++
 2 files changed, 151 insertions(+), 144 deletions(-)

diff --git a/README.md b/README.md
index f9a346233..f96b2a2d4 100644
--- a/README.md
+++ b/README.md
@@ -44,159 +44,159 @@ If you need full functionality of any plugin, please use it directly with your p
 On top of all language packs from [vim repository](https://github.com/vim/vim/tree/master/runtime), vim-polyglot includes:
 
 <!--Language Packs-->
-- [acpiasl](https://github.com/martinlroth/vim-acpi-asl)
-- [ansible](https://github.com/pearofducks/ansible-vim)
-- [apiblueprint](https://github.com/kylef/apiblueprint.vim)
-- [applescript](https://github.com/mityu/vim-applescript)
-- [arduino](https://github.com/sudar/vim-arduino-syntax)
-- [asciidoc](https://github.com/asciidoc/vim-asciidoc)
-- [autohotkey](https://github.com/hnamikaw/vim-autohotkey)
-- [blade](https://github.com/jwalton512/vim-blade)
-- [brewfile](https://github.com/bfontaine/Brewfile.vim)
-- [c/c++](https://github.com/vim-jp/vim-cpp)
-- [caddyfile](https://github.com/isobit/vim-caddyfile)
-- [carp](https://github.com/hellerve/carp-vim)
+- [acpiasl](https://github.com/martinlroth/vim-acpi-asl)(asl filetype)
+- [ansible](https://github.com/pearofducks/ansible-vim)(yaml.ansible filetype)
+- [apiblueprint](https://github.com/kylef/apiblueprint.vim)(apiblueprint filetype)
+- [applescript](https://github.com/mityu/vim-applescript)(applescript filetype)
+- [arduino](https://github.com/sudar/vim-arduino-syntax)(arduino filetype)
+- [asciidoc](https://github.com/asciidoc/vim-asciidoc)(asciidoc filetype)
+- [autohotkey](https://github.com/hnamikaw/vim-autohotkey)(autohotkey filetype)
+- [blade](https://github.com/jwalton512/vim-blade)(blade filetype)
+- [brewfile](https://github.com/bfontaine/Brewfile.vim)(brewfile filetype)
+- [c/c++](https://github.com/vim-jp/vim-cpp)(cpp,  and c filetypes)
+- [caddyfile](https://github.com/isobit/vim-caddyfile)(caddyfile filetype)
+- [carp](https://github.com/hellerve/carp-vim)(carp filetype)
 - [cjsx](https://github.com/mtscout6/vim-cjsx)
-- [clojure](https://github.com/guns/vim-clojure-static)
-- [cmake](https://github.com/pboettch/vim-cmake-syntax)
-- [coffee-script](https://github.com/kchmck/vim-coffee-script)
+- [clojure](https://github.com/guns/vim-clojure-static)(clojure filetype)
+- [cmake](https://github.com/pboettch/vim-cmake-syntax)(cmake filetype)
+- [coffee-script](https://github.com/kchmck/vim-coffee-script)(coffee, litcoffe and litcoffee filetypes)
 - [cpp-modern](https://github.com/bfrg/vim-cpp-modern)
-- [cql](https://github.com/elubow/cql-vim)
-- [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim)
-- [crystal](https://github.com/rhysd/vim-crystal)
-- [csv](https://github.com/chrisbra/csv.vim)
-- [cucumber](https://github.com/tpope/vim-cucumber)
-- [cue](https://github.com/mgrabovsky/vim-cuesheet)
-- [dart](https://github.com/dart-lang/dart-vim-plugin)
-- [dhall](https://github.com/vmchale/dhall-vim)
-- [dlang](https://github.com/JesseKPhillips/d.vim)
-- [dockerfile](https://github.com/ekalinin/Dockerfile.vim)
-- [elixir](https://github.com/elixir-lang/vim-elixir)
-- [elm](https://github.com/andys8/vim-elm-syntax)
-- [emberscript](https://github.com/yalesov/vim-ember-script)
-- [emblem](https://github.com/yalesov/vim-emblem)
-- [erlang](https://github.com/vim-erlang/vim-erlang-runtime)
-- [fennel](https://github.com/bakpakin/fennel.vim)
-- [ferm](https://github.com/vim-scripts/ferm.vim)
-- [fish](https://github.com/georgewitteman/vim-fish)
-- [flatbuffers](https://github.com/dcharbon/vim-flatbuffers)
-- [fsharp](https://github.com/ionide/Ionide-vim)
-- [gdscript](https://github.com/calviken/vim-gdscript3)
-- [git](https://github.com/tpope/vim-git)
-- [gitignore](https://github.com/fszymanski/fzf-gitignore)
-- [glsl](https://github.com/tikhomirov/vim-glsl)
-- [gmpl](https://github.com/maelvalais/gmpl.vim)
-- [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting)
-- [go](https://github.com/fatih/vim-go)
+- [cql](https://github.com/elubow/cql-vim)(cql filetype)
+- [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim)(cryptol filetype)
+- [crystal](https://github.com/rhysd/vim-crystal)(crystal, ecrysta and ecrystal filetypes)
+- [csv](https://github.com/chrisbra/csv.vim)(csv filetype)
+- [cucumber](https://github.com/tpope/vim-cucumber)(cucumber filetype)
+- [cue](https://github.com/mgrabovsky/vim-cuesheet)(cuesheet filetype)
+- [dart](https://github.com/dart-lang/dart-vim-plugin)(dart filetype)
+- [dhall](https://github.com/vmchale/dhall-vim)(dhall filetype)
+- [dlang](https://github.com/JesseKPhillips/d.vim)(d, dcov, dd, ddoc, dsd and dsdl filetypes)
+- [dockerfile](https://github.com/ekalinin/Dockerfile.vim)(yaml.docker-compose filetype)
+- [elixir](https://github.com/elixir-lang/vim-elixir)(elixir, eelixi and eelixir filetypes)
+- [elm](https://github.com/andys8/vim-elm-syntax)(elm filetype)
+- [emberscript](https://github.com/yalesov/vim-ember-script)(ember-script filetype)
+- [emblem](https://github.com/yalesov/vim-emblem)(emblem filetype)
+- [erlang](https://github.com/vim-erlang/vim-erlang-runtime)(erlang filetype)
+- [fennel](https://github.com/bakpakin/fennel.vim)(fennel filetype)
+- [ferm](https://github.com/vim-scripts/ferm.vim)(ferm filetype)
+- [fish](https://github.com/georgewitteman/vim-fish)(fish filetype)
+- [flatbuffers](https://github.com/dcharbon/vim-flatbuffers)(fbs filetype)
+- [fsharp](https://github.com/ionide/Ionide-vim)(fsharp filetype)
+- [gdscript](https://github.com/calviken/vim-gdscript3)(gdscript3 filetype)
+- [git](https://github.com/tpope/vim-git)(gitconfig, gitrebase, gitsendemail, gitcommi and gitcommit filetypes)
+- [gitignore](https://github.com/fszymanski/fzf-gitignore)(gitignore filetype)
+- [glsl](https://github.com/tikhomirov/vim-glsl)(glsl filetype)
+- [gmpl](https://github.com/maelvalais/gmpl.vim)(gmpl filetype)
+- [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting)(gnuplot filetype)
+- [go](https://github.com/fatih/vim-go)(go, gomod, gohtmltmp and gohtmltmpl filetypes)
 - [gradle](https://github.com/tfnico/vim-gradle)
-- [graphql](https://github.com/jparise/vim-graphql)
-- [haml](https://github.com/tpope/vim-haml)
-- [handlebars](https://github.com/mustache/vim-mustache-handlebars)
-- [haproxy](https://github.com/CH-DanReif/haproxy.vim)
-- [haskell](https://github.com/neovimhaskell/haskell-vim)
-- [haxe](https://github.com/yaymukund/vim-haxe)
-- [hcl](https://github.com/b4b4r07/vim-hcl)
-- [helm](https://github.com/towolf/vim-helm)
-- [help](https://github.com/neovim/neovim/tree/master/runtime)
-- [hive](https://github.com/zebradil/hive.vim)
+- [graphql](https://github.com/jparise/vim-graphql)(graphql filetype)
+- [haml](https://github.com/tpope/vim-haml)(haml filetype)
+- [handlebars](https://github.com/mustache/vim-mustache-handlebars)(html.mustache, html.handlebar and html.handlebars filetypes)
+- [haproxy](https://github.com/CH-DanReif/haproxy.vim)(haproxy filetype)
+- [haskell](https://github.com/neovimhaskell/haskell-vim)(haskell filetype)
+- [haxe](https://github.com/yaymukund/vim-haxe)(haxe filetype)
+- [hcl](https://github.com/b4b4r07/vim-hcl)(hcl filetype)
+- [helm](https://github.com/towolf/vim-helm)(helm filetype)
+- [help](https://github.com/neovim/neovim/tree/master/runtime)(help filetype)
+- [hive](https://github.com/zebradil/hive.vim)(hive filetype)
 - [html5](https://github.com/sheerun/html5.vim)
-- [i3](https://github.com/mboughaba/i3config.vim)
-- [icalendar](https://github.com/chutzpah/icalendar.vim)
-- [idris2](https://github.com/edwinb/idris2-vim)
-- [idris](https://github.com/idris-hackers/idris-vim)
-- [ion](https://github.com/vmchale/ion-vim)
+- [i3](https://github.com/mboughaba/i3config.vim)(i3config filetype)
+- [icalendar](https://github.com/chutzpah/icalendar.vim)(icalendar filetype)
+- [idris2](https://github.com/edwinb/idris2-vim)(idris2, lidris and lidris2 filetypes)
+- [idris](https://github.com/idris-hackers/idris-vim)(idris filetype)
+- [ion](https://github.com/vmchale/ion-vim)(ion filetype)
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
-- [javascript](https://github.com/pangloss/vim-javascript)
-- [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax)
-- [jq](https://github.com/vito-c/jq.vim)
-- [json5](https://github.com/GutenYe/json5.vim)
-- [json](https://github.com/elzr/vim-json)
-- [jsonnet](https://github.com/google/vim-jsonnet)
-- [jst](https://github.com/briancollins/vim-jst)
-- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty)
-- [julia](https://github.com/JuliaEditorSupport/julia-vim)
-- [kotlin](https://github.com/udalov/kotlin-vim)
-- [ledger](https://github.com/ledger/vim-ledger)
-- [lilypond](https://github.com/anowlcalledjosh/vim-lilypond)
-- [livescript](https://github.com/gkz/vim-ls)
-- [llvm](https://github.com/rhysd/vim-llvm)
-- [log](https://github.com/MTDL9/vim-log-highlighting)
-- [lua](https://github.com/tbastos/vim-lua)
-- [mako](https://github.com/sophacles/vim-bundle-mako)
-- [markdown](https://github.com/plasticboy/vim-markdown)
-- [mathematica](https://github.com/voldikss/vim-mma)
-- [mdx](https://github.com/jxnblk/vim-mdx-js)
-- [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim)
-- [moonscript](https://github.com/leafo/moonscript-vim)
-- [nginx](https://github.com/chr4/nginx.vim)
-- [nim](https://github.com/zah/nim.vim)
-- [nix](https://github.com/LnL7/vim-nix)
-- [objc](https://github.com/b4winckler/vim-objc)
-- [ocaml](https://github.com/rgrinberg/vim-ocaml)
-- [octave](https://github.com/McSinyx/vim-octave)
-- [odin](https://github.com/Tetralux/odin.vim)
-- [opencl](https://github.com/petRUShka/vim-opencl)
-- [perl](https://github.com/vim-perl/vim-perl)
-- [pgsql](https://github.com/lifepillar/pgsql.vim)
-- [php](https://github.com/StanAngeloff/php.vim)
-- [plantuml](https://github.com/aklt/plantuml-syntax)
-- [pony](https://github.com/jakwings/vim-pony)
-- [powershell](https://github.com/PProvost/vim-ps1)
-- [protobuf](https://github.com/uarun/vim-protobuf)
-- [pug](https://github.com/digitaltoad/vim-pug)
-- [puppet](https://github.com/rodjek/vim-puppet)
-- [purescript](https://github.com/purescript-contrib/purescript-vim)
+- [javascript](https://github.com/pangloss/vim-javascript)(javascript, flo and flow filetypes)
+- [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax)(Jenkinsfile filetype)
+- [jq](https://github.com/vito-c/jq.vim)(jq filetype)
+- [json5](https://github.com/GutenYe/json5.vim)(json5 filetype)
+- [json](https://github.com/elzr/vim-json)(json filetype)
+- [jsonnet](https://github.com/google/vim-jsonnet)(jsonnet filetype)
+- [jst](https://github.com/briancollins/vim-jst)(jst filetype)
+- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty)(javascriptreact filetype)
+- [julia](https://github.com/JuliaEditorSupport/julia-vim)(julia filetype)
+- [kotlin](https://github.com/udalov/kotlin-vim)(kotlin filetype)
+- [ledger](https://github.com/ledger/vim-ledger)(ledger filetype)
+- [lilypond](https://github.com/anowlcalledjosh/vim-lilypond)(lilypond filetype)
+- [livescript](https://github.com/gkz/vim-ls)(livescript filetype)
+- [llvm](https://github.com/rhysd/vim-llvm)(llvm, tablege and tablegen filetypes)
+- [log](https://github.com/MTDL9/vim-log-highlighting)(log filetype)
+- [lua](https://github.com/tbastos/vim-lua)(lua filetype)
+- [mako](https://github.com/sophacles/vim-bundle-mako)(mako filetype)
+- [markdown](https://github.com/plasticboy/vim-markdown)(markdown filetype)
+- [mathematica](https://github.com/voldikss/vim-mma)(mma filetype)
+- [mdx](https://github.com/jxnblk/vim-mdx-js)(markdown.mdx filetype)
+- [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim)(meson, dosin and dosini filetypes)
+- [moonscript](https://github.com/leafo/moonscript-vim)(moon filetype)
+- [nginx](https://github.com/chr4/nginx.vim)(nginx filetype)
+- [nim](https://github.com/zah/nim.vim)(nim filetype)
+- [nix](https://github.com/LnL7/vim-nix)(nix filetype)
+- [objc](https://github.com/b4winckler/vim-objc)(objc filetype)
+- [ocaml](https://github.com/rgrinberg/vim-ocaml)(ocaml, omake, opam, oasis, dune, ocamlbuild_tags, ocpbuild, ocpbuildroot, sexpli and sexplib filetypes)
+- [octave](https://github.com/McSinyx/vim-octave)(octave filetype)
+- [odin](https://github.com/Tetralux/odin.vim)(odin filetype)
+- [opencl](https://github.com/petRUShka/vim-opencl)(opencl filetype)
+- [perl](https://github.com/vim-perl/vim-perl)(perl, pod, mason, tt2, tt2html, x and xs filetypes)
+- [pgsql](https://github.com/lifepillar/pgsql.vim)(sql filetype)
+- [php](https://github.com/StanAngeloff/php.vim)(php filetype)
+- [plantuml](https://github.com/aklt/plantuml-syntax)(plantuml filetype)
+- [pony](https://github.com/jakwings/vim-pony)(pony filetype)
+- [powershell](https://github.com/PProvost/vim-ps1)(ps1, ps1xm and ps1xml filetypes)
+- [protobuf](https://github.com/uarun/vim-protobuf)(proto filetype)
+- [pug](https://github.com/digitaltoad/vim-pug)(pug filetype)
+- [puppet](https://github.com/rodjek/vim-puppet)(puppet, embeddedpuppe and embeddedpuppet filetypes)
+- [purescript](https://github.com/purescript-contrib/purescript-vim)(purescript filetype)
 - [python-compiler](https://github.com/aliev/vim-compiler-python)
 - [python-indent](https://github.com/Vimjas/vim-python-pep8-indent)
-- [python](https://github.com/vim-python/python-syntax)
-- [qmake](https://github.com/artoj/qmake-syntax-vim)
-- [qml](https://github.com/peterhoeg/vim-qml)
-- [r-lang](https://github.com/vim-scripts/R.vim)
-- [racket](https://github.com/wlangstroth/vim-racket)
-- [ragel](https://github.com/jneen/ragel.vim)
-- [raku](https://github.com/Raku/vim-raku)
-- [raml](https://github.com/IN3D/vim-raml)
-- [razor](https://github.com/adamclerk/vim-razor)
-- [reason](https://github.com/reasonml-editor/vim-reason-plus)
-- [requirements](https://github.com/raimon49/requirements.txt.vim)
-- [rspec](https://github.com/keith/rspec.vim)
-- [rst](https://github.com/marshallward/vim-restructuredtext)
-- [ruby](https://github.com/vim-ruby/vim-ruby)
-- [rust](https://github.com/rust-lang/rust.vim)
-- [scala](https://github.com/derekwyatt/vim-scala)
-- [scss](https://github.com/cakebaker/scss-syntax.vim)
-- [sh](https://github.com/arzg/vim-sh)
-- [slim](https://github.com/slim-template/vim-slim)
-- [slime](https://github.com/slime-lang/vim-slime-syntax)
-- [smt2](https://github.com/bohlender/vim-smt2)
-- [solidity](https://github.com/tomlion/vim-solidity)
-- [stylus](https://github.com/wavded/vim-stylus)
-- [svelte](https://github.com/evanleck/vim-svelte/tree/main)
+- [python](https://github.com/vim-python/python-syntax)(python filetype)
+- [qmake](https://github.com/artoj/qmake-syntax-vim)(qmake filetype)
+- [qml](https://github.com/peterhoeg/vim-qml)(qml filetype)
+- [r-lang](https://github.com/vim-scripts/R.vim)(r, rhel and rhelp filetypes)
+- [racket](https://github.com/wlangstroth/vim-racket)(racket filetype)
+- [ragel](https://github.com/jneen/ragel.vim)(ragel filetype)
+- [raku](https://github.com/Raku/vim-raku)(raku filetype)
+- [raml](https://github.com/IN3D/vim-raml)(raml filetype)
+- [razor](https://github.com/adamclerk/vim-razor)(razor filetype)
+- [reason](https://github.com/reasonml-editor/vim-reason-plus)(reason filetype)
+- [requirements](https://github.com/raimon49/requirements.txt.vim)(requirements filetype)
+- [rspec](https://github.com/keith/rspec.vim)(ruby filetype)
+- [rst](https://github.com/marshallward/vim-restructuredtext)(rst filetype)
+- [ruby](https://github.com/vim-ruby/vim-ruby)(ruby, erub and eruby filetypes)
+- [rust](https://github.com/rust-lang/rust.vim)(rust filetype)
+- [scala](https://github.com/derekwyatt/vim-scala)(scala filetype)
+- [scss](https://github.com/cakebaker/scss-syntax.vim)(scss filetype)
+- [sh](https://github.com/arzg/vim-sh)(sh, zs and zsh filetypes)
+- [slim](https://github.com/slim-template/vim-slim)(slim filetype)
+- [slime](https://github.com/slime-lang/vim-slime-syntax)(slime filetype)
+- [smt2](https://github.com/bohlender/vim-smt2)(smt2 filetype)
+- [solidity](https://github.com/tomlion/vim-solidity)(solidity filetype)
+- [stylus](https://github.com/wavded/vim-stylus)(stylus filetype)
+- [svelte](https://github.com/evanleck/vim-svelte/tree/main)(svelte filetype)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
-- [svg](https://github.com/vim-scripts/svg.vim)
-- [swift](https://github.com/keith/swift.vim)
-- [sxhkd](https://github.com/baskerville/vim-sxhkdrc)
-- [systemd](https://github.com/wgwoods/vim-systemd-syntax)
-- [textile](https://github.com/timcharper/textile.vim)
-- [thrift](https://github.com/solarnz/thrift.vim)
-- [tmux](https://github.com/ericpruitt/tmux.vim/tree/master/vim)
-- [toml](https://github.com/cespare/vim-toml)
-- [tptp](https://github.com/c-cube/vim-tptp)
-- [twig](https://github.com/lumiliet/vim-twig)
-- [typescript](https://github.com/HerringtonDarkholme/yats.vim)
-- [unison](https://github.com/unisonweb/unison/tree/trunk/editor-support/vim)
-- [v](https://github.com/ollykel/v-vim)
-- [vala](https://github.com/arrufat/vala.vim)
-- [vbnet](https://github.com/vim-scripts/vbnet.vim)
-- [vcl](https://github.com/smerrill/vcl-vim-plugin)
-- [velocity](https://github.com/lepture/vim-velocity)
-- [vue](https://github.com/posva/vim-vue)
-- [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)
-- [xml](https://github.com/amadeus/vim-xml)
-- [xsl](https://github.com/vim-scripts/XSLT-syntax)
+- [svg](https://github.com/vim-scripts/svg.vim)(svg filetype)
+- [swift](https://github.com/keith/swift.vim)(swift filetype)
+- [sxhkd](https://github.com/baskerville/vim-sxhkdrc)(sxhkdrc filetype)
+- [systemd](https://github.com/wgwoods/vim-systemd-syntax)(systemd filetype)
+- [textile](https://github.com/timcharper/textile.vim)(textile filetype)
+- [thrift](https://github.com/solarnz/thrift.vim)(thrift filetype)
+- [tmux](https://github.com/ericpruitt/tmux.vim/tree/master/vim)(tmux filetype)
+- [toml](https://github.com/cespare/vim-toml)(toml filetype)
+- [tptp](https://github.com/c-cube/vim-tptp)(tptp filetype)
+- [twig](https://github.com/lumiliet/vim-twig)(html.twig, xml.twi and xml.twig filetypes)
+- [typescript](https://github.com/HerringtonDarkholme/yats.vim)(typescript, typescriptreac and typescriptreact filetypes)
+- [unison](https://github.com/unisonweb/unison/tree/trunk/editor-support/vim)(unison filetype)
+- [v](https://github.com/ollykel/v-vim)(vlang filetype)
+- [vala](https://github.com/arrufat/vala.vim)(vala filetype)
+- [vbnet](https://github.com/vim-scripts/vbnet.vim)(vbnet filetype)
+- [vcl](https://github.com/smerrill/vcl-vim-plugin)(vcl filetype)
+- [velocity](https://github.com/lepture/vim-velocity)(velocity filetype)
+- [vue](https://github.com/posva/vim-vue)(vue filetype)
+- [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)(xdc filetype)
+- [xml](https://github.com/amadeus/vim-xml)(xml filetype)
+- [xsl](https://github.com/vim-scripts/XSLT-syntax)(xsl filetype)
 - [yard](https://github.com/noprompt/vim-yardoc)
-- [zephir](https://github.com/xwsoul/vim-zephir)
-- [zig](https://github.com/ziglang/zig.vim)
+- [zephir](https://github.com/xwsoul/vim-zephir)(zephir filetype)
+- [zig](https://github.com/ziglang/zig.vim)(zir, zi and zig filetypes)
 - [zinit](https://github.com/zinit-zsh/zplugin-vim-syntax)
 <!--/Language Packs-->
 
diff --git a/scripts/build b/scripts/build
index c3ffd1dde..40ac7f331 100755
--- a/scripts/build
+++ b/scripts/build
@@ -529,6 +529,13 @@ def extract(packages)
     else
       output << "- [#{package["name"]}](https://github.com/#{repo})"
     end
+
+    if package["filetypes"].size > 1
+      output[-1] << "(#{package["filetypes"].map { |f| f["name"] }.join(", ")[0..-2]} and #{package["filetypes"].last["name"]} filetypes)"
+    elsif package["filetypes"].size > 0
+      output[-1] << "(#{package["filetypes"].first["name"]} filetype)"
+    end
+
     progress
   end
 

From 3ee6ab9d13767aacceea51e72ecf9646206b7163 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 16 Oct 2020 13:41:54 +0200
Subject: [PATCH 131/299] Update

---
 README.md              | 288 ++++++++++++++++++++---------------------
 autoload/fsharp.vim    |   2 +-
 autoload/go/config.vim |  17 ++-
 autoload/julia/doc.vim |   4 +-
 doc/julia-vim.txt      |  87 ++++++++++++-
 doc/vim-go.txt         |  49 ++++++-
 ftplugin/falcon.vim    |   1 +
 ftplugin/fortran.vim   |  12 +-
 ftplugin/ocaml.vim     |   2 +-
 indent/fortran.vim     |  12 +-
 indent/julia.vim       | 143 ++++++++++++++++----
 scripts/build          |   4 +-
 syntax/apache.vim      |   4 +-
 syntax/asterisk.vim    |   4 +-
 syntax/cabal-2.vim     |   7 +-
 syntax/crystal.vim     |   2 +-
 syntax/css.vim         |   2 +-
 syntax/fortran.vim     |  30 +++--
 syntax/julia.vim       |  39 ++++--
 syntax/less.vim        |   3 +-
 syntax/qml.vim         |   2 +-
 21 files changed, 493 insertions(+), 221 deletions(-)

diff --git a/README.md b/README.md
index f96b2a2d4..8111f3c2e 100644
--- a/README.md
+++ b/README.md
@@ -44,159 +44,159 @@ If you need full functionality of any plugin, please use it directly with your p
 On top of all language packs from [vim repository](https://github.com/vim/vim/tree/master/runtime), vim-polyglot includes:
 
 <!--Language Packs-->
-- [acpiasl](https://github.com/martinlroth/vim-acpi-asl)(asl filetype)
-- [ansible](https://github.com/pearofducks/ansible-vim)(yaml.ansible filetype)
-- [apiblueprint](https://github.com/kylef/apiblueprint.vim)(apiblueprint filetype)
-- [applescript](https://github.com/mityu/vim-applescript)(applescript filetype)
-- [arduino](https://github.com/sudar/vim-arduino-syntax)(arduino filetype)
-- [asciidoc](https://github.com/asciidoc/vim-asciidoc)(asciidoc filetype)
-- [autohotkey](https://github.com/hnamikaw/vim-autohotkey)(autohotkey filetype)
-- [blade](https://github.com/jwalton512/vim-blade)(blade filetype)
-- [brewfile](https://github.com/bfontaine/Brewfile.vim)(brewfile filetype)
-- [c/c++](https://github.com/vim-jp/vim-cpp)(cpp,  and c filetypes)
-- [caddyfile](https://github.com/isobit/vim-caddyfile)(caddyfile filetype)
-- [carp](https://github.com/hellerve/carp-vim)(carp filetype)
+- [acpiasl](https://github.com/martinlroth/vim-acpi-asl) (asl filetype)
+- [ansible](https://github.com/pearofducks/ansible-vim) (yaml.ansible filetype)
+- [apiblueprint](https://github.com/kylef/apiblueprint.vim) (apiblueprint filetype)
+- [applescript](https://github.com/mityu/vim-applescript) (applescript filetype)
+- [arduino](https://github.com/sudar/vim-arduino-syntax) (arduino filetype)
+- [asciidoc](https://github.com/asciidoc/vim-asciidoc) (asciidoc filetype)
+- [autohotkey](https://github.com/hnamikaw/vim-autohotkey) (autohotkey filetype)
+- [blade](https://github.com/jwalton512/vim-blade) (blade filetype)
+- [brewfile](https://github.com/bfontaine/Brewfile.vim) (brewfile filetype)
+- [c/c++](https://github.com/vim-jp/vim-cpp) (cpp,  and c filetypes)
+- [caddyfile](https://github.com/isobit/vim-caddyfile) (caddyfile filetype)
+- [carp](https://github.com/hellerve/carp-vim) (carp filetype)
 - [cjsx](https://github.com/mtscout6/vim-cjsx)
-- [clojure](https://github.com/guns/vim-clojure-static)(clojure filetype)
-- [cmake](https://github.com/pboettch/vim-cmake-syntax)(cmake filetype)
-- [coffee-script](https://github.com/kchmck/vim-coffee-script)(coffee, litcoffe and litcoffee filetypes)
+- [clojure](https://github.com/guns/vim-clojure-static) (clojure filetype)
+- [cmake](https://github.com/pboettch/vim-cmake-syntax) (cmake filetype)
+- [coffee-script](https://github.com/kchmck/vim-coffee-script) (coffee, litcoffe and litcoffee filetypes)
 - [cpp-modern](https://github.com/bfrg/vim-cpp-modern)
-- [cql](https://github.com/elubow/cql-vim)(cql filetype)
-- [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim)(cryptol filetype)
-- [crystal](https://github.com/rhysd/vim-crystal)(crystal, ecrysta and ecrystal filetypes)
-- [csv](https://github.com/chrisbra/csv.vim)(csv filetype)
-- [cucumber](https://github.com/tpope/vim-cucumber)(cucumber filetype)
-- [cue](https://github.com/mgrabovsky/vim-cuesheet)(cuesheet filetype)
-- [dart](https://github.com/dart-lang/dart-vim-plugin)(dart filetype)
-- [dhall](https://github.com/vmchale/dhall-vim)(dhall filetype)
-- [dlang](https://github.com/JesseKPhillips/d.vim)(d, dcov, dd, ddoc, dsd and dsdl filetypes)
-- [dockerfile](https://github.com/ekalinin/Dockerfile.vim)(yaml.docker-compose filetype)
-- [elixir](https://github.com/elixir-lang/vim-elixir)(elixir, eelixi and eelixir filetypes)
-- [elm](https://github.com/andys8/vim-elm-syntax)(elm filetype)
-- [emberscript](https://github.com/yalesov/vim-ember-script)(ember-script filetype)
-- [emblem](https://github.com/yalesov/vim-emblem)(emblem filetype)
-- [erlang](https://github.com/vim-erlang/vim-erlang-runtime)(erlang filetype)
-- [fennel](https://github.com/bakpakin/fennel.vim)(fennel filetype)
-- [ferm](https://github.com/vim-scripts/ferm.vim)(ferm filetype)
-- [fish](https://github.com/georgewitteman/vim-fish)(fish filetype)
-- [flatbuffers](https://github.com/dcharbon/vim-flatbuffers)(fbs filetype)
-- [fsharp](https://github.com/ionide/Ionide-vim)(fsharp filetype)
-- [gdscript](https://github.com/calviken/vim-gdscript3)(gdscript3 filetype)
-- [git](https://github.com/tpope/vim-git)(gitconfig, gitrebase, gitsendemail, gitcommi and gitcommit filetypes)
-- [gitignore](https://github.com/fszymanski/fzf-gitignore)(gitignore filetype)
-- [glsl](https://github.com/tikhomirov/vim-glsl)(glsl filetype)
-- [gmpl](https://github.com/maelvalais/gmpl.vim)(gmpl filetype)
-- [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting)(gnuplot filetype)
-- [go](https://github.com/fatih/vim-go)(go, gomod, gohtmltmp and gohtmltmpl filetypes)
+- [cql](https://github.com/elubow/cql-vim) (cql filetype)
+- [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim) (cryptol filetype)
+- [crystal](https://github.com/rhysd/vim-crystal) (crystal, ecrysta and ecrystal filetypes)
+- [csv](https://github.com/chrisbra/csv.vim) (csv filetype)
+- [cucumber](https://github.com/tpope/vim-cucumber) (cucumber filetype)
+- [cue](https://github.com/mgrabovsky/vim-cuesheet) (cuesheet filetype)
+- [dart](https://github.com/dart-lang/dart-vim-plugin) (dart filetype)
+- [dhall](https://github.com/vmchale/dhall-vim) (dhall filetype)
+- [dlang](https://github.com/JesseKPhillips/d.vim) (d, dcov, dd, ddoc, dsd and dsdl filetypes)
+- [dockerfile](https://github.com/ekalinin/Dockerfile.vim) (yaml.docker-compose filetype)
+- [elixir](https://github.com/elixir-lang/vim-elixir) (elixir, eelixi and eelixir filetypes)
+- [elm](https://github.com/andys8/vim-elm-syntax) (elm filetype)
+- [emberscript](https://github.com/yalesov/vim-ember-script) (ember-script filetype)
+- [emblem](https://github.com/yalesov/vim-emblem) (emblem filetype)
+- [erlang](https://github.com/vim-erlang/vim-erlang-runtime) (erlang filetype)
+- [fennel](https://github.com/bakpakin/fennel.vim) (fennel filetype)
+- [ferm](https://github.com/vim-scripts/ferm.vim) (ferm filetype)
+- [fish](https://github.com/georgewitteman/vim-fish) (fish filetype)
+- [flatbuffers](https://github.com/dcharbon/vim-flatbuffers) (fbs filetype)
+- [fsharp](https://github.com/ionide/Ionide-vim) (fsharp filetype)
+- [gdscript](https://github.com/calviken/vim-gdscript3) (gdscript3 filetype)
+- [git](https://github.com/tpope/vim-git) (gitconfig, gitrebase, gitsendemail, gitcommi and gitcommit filetypes)
+- [gitignore](https://github.com/fszymanski/fzf-gitignore) (gitignore filetype)
+- [glsl](https://github.com/tikhomirov/vim-glsl) (glsl filetype)
+- [gmpl](https://github.com/maelvalais/gmpl.vim) (gmpl filetype)
+- [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting) (gnuplot filetype)
+- [go](https://github.com/fatih/vim-go) (go, gomod, gohtmltmp and gohtmltmpl filetypes)
 - [gradle](https://github.com/tfnico/vim-gradle)
-- [graphql](https://github.com/jparise/vim-graphql)(graphql filetype)
-- [haml](https://github.com/tpope/vim-haml)(haml filetype)
-- [handlebars](https://github.com/mustache/vim-mustache-handlebars)(html.mustache, html.handlebar and html.handlebars filetypes)
-- [haproxy](https://github.com/CH-DanReif/haproxy.vim)(haproxy filetype)
-- [haskell](https://github.com/neovimhaskell/haskell-vim)(haskell filetype)
-- [haxe](https://github.com/yaymukund/vim-haxe)(haxe filetype)
-- [hcl](https://github.com/b4b4r07/vim-hcl)(hcl filetype)
-- [helm](https://github.com/towolf/vim-helm)(helm filetype)
-- [help](https://github.com/neovim/neovim/tree/master/runtime)(help filetype)
-- [hive](https://github.com/zebradil/hive.vim)(hive filetype)
+- [graphql](https://github.com/jparise/vim-graphql) (graphql filetype)
+- [haml](https://github.com/tpope/vim-haml) (haml filetype)
+- [handlebars](https://github.com/mustache/vim-mustache-handlebars) (html.mustache, html.handlebar and html.handlebars filetypes)
+- [haproxy](https://github.com/CH-DanReif/haproxy.vim) (haproxy filetype)
+- [haskell](https://github.com/neovimhaskell/haskell-vim) (haskell filetype)
+- [haxe](https://github.com/yaymukund/vim-haxe) (haxe filetype)
+- [hcl](https://github.com/b4b4r07/vim-hcl) (hcl filetype)
+- [helm](https://github.com/towolf/vim-helm) (helm filetype)
+- [help](https://github.com/neovim/neovim/tree/master/runtime) (help filetype)
+- [hive](https://github.com/zebradil/hive.vim) (hive filetype)
 - [html5](https://github.com/sheerun/html5.vim)
-- [i3](https://github.com/mboughaba/i3config.vim)(i3config filetype)
-- [icalendar](https://github.com/chutzpah/icalendar.vim)(icalendar filetype)
-- [idris2](https://github.com/edwinb/idris2-vim)(idris2, lidris and lidris2 filetypes)
-- [idris](https://github.com/idris-hackers/idris-vim)(idris filetype)
-- [ion](https://github.com/vmchale/ion-vim)(ion filetype)
+- [i3](https://github.com/mboughaba/i3config.vim) (i3config filetype)
+- [icalendar](https://github.com/chutzpah/icalendar.vim) (icalendar filetype)
+- [idris2](https://github.com/edwinb/idris2-vim) (idris2, lidris and lidris2 filetypes)
+- [idris](https://github.com/idris-hackers/idris-vim) (idris filetype)
+- [ion](https://github.com/vmchale/ion-vim) (ion filetype)
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
-- [javascript](https://github.com/pangloss/vim-javascript)(javascript, flo and flow filetypes)
-- [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax)(Jenkinsfile filetype)
-- [jq](https://github.com/vito-c/jq.vim)(jq filetype)
-- [json5](https://github.com/GutenYe/json5.vim)(json5 filetype)
-- [json](https://github.com/elzr/vim-json)(json filetype)
-- [jsonnet](https://github.com/google/vim-jsonnet)(jsonnet filetype)
-- [jst](https://github.com/briancollins/vim-jst)(jst filetype)
-- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty)(javascriptreact filetype)
-- [julia](https://github.com/JuliaEditorSupport/julia-vim)(julia filetype)
-- [kotlin](https://github.com/udalov/kotlin-vim)(kotlin filetype)
-- [ledger](https://github.com/ledger/vim-ledger)(ledger filetype)
-- [lilypond](https://github.com/anowlcalledjosh/vim-lilypond)(lilypond filetype)
-- [livescript](https://github.com/gkz/vim-ls)(livescript filetype)
-- [llvm](https://github.com/rhysd/vim-llvm)(llvm, tablege and tablegen filetypes)
-- [log](https://github.com/MTDL9/vim-log-highlighting)(log filetype)
-- [lua](https://github.com/tbastos/vim-lua)(lua filetype)
-- [mako](https://github.com/sophacles/vim-bundle-mako)(mako filetype)
-- [markdown](https://github.com/plasticboy/vim-markdown)(markdown filetype)
-- [mathematica](https://github.com/voldikss/vim-mma)(mma filetype)
-- [mdx](https://github.com/jxnblk/vim-mdx-js)(markdown.mdx filetype)
-- [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim)(meson, dosin and dosini filetypes)
-- [moonscript](https://github.com/leafo/moonscript-vim)(moon filetype)
-- [nginx](https://github.com/chr4/nginx.vim)(nginx filetype)
-- [nim](https://github.com/zah/nim.vim)(nim filetype)
-- [nix](https://github.com/LnL7/vim-nix)(nix filetype)
-- [objc](https://github.com/b4winckler/vim-objc)(objc filetype)
-- [ocaml](https://github.com/rgrinberg/vim-ocaml)(ocaml, omake, opam, oasis, dune, ocamlbuild_tags, ocpbuild, ocpbuildroot, sexpli and sexplib filetypes)
-- [octave](https://github.com/McSinyx/vim-octave)(octave filetype)
-- [odin](https://github.com/Tetralux/odin.vim)(odin filetype)
-- [opencl](https://github.com/petRUShka/vim-opencl)(opencl filetype)
-- [perl](https://github.com/vim-perl/vim-perl)(perl, pod, mason, tt2, tt2html, x and xs filetypes)
-- [pgsql](https://github.com/lifepillar/pgsql.vim)(sql filetype)
-- [php](https://github.com/StanAngeloff/php.vim)(php filetype)
-- [plantuml](https://github.com/aklt/plantuml-syntax)(plantuml filetype)
-- [pony](https://github.com/jakwings/vim-pony)(pony filetype)
-- [powershell](https://github.com/PProvost/vim-ps1)(ps1, ps1xm and ps1xml filetypes)
-- [protobuf](https://github.com/uarun/vim-protobuf)(proto filetype)
-- [pug](https://github.com/digitaltoad/vim-pug)(pug filetype)
-- [puppet](https://github.com/rodjek/vim-puppet)(puppet, embeddedpuppe and embeddedpuppet filetypes)
-- [purescript](https://github.com/purescript-contrib/purescript-vim)(purescript filetype)
+- [javascript](https://github.com/pangloss/vim-javascript) (javascript, flo and flow filetypes)
+- [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax) (Jenkinsfile filetype)
+- [jq](https://github.com/vito-c/jq.vim) (jq filetype)
+- [json5](https://github.com/GutenYe/json5.vim) (json5 filetype)
+- [json](https://github.com/elzr/vim-json) (json filetype)
+- [jsonnet](https://github.com/google/vim-jsonnet) (jsonnet filetype)
+- [jst](https://github.com/briancollins/vim-jst) (jst filetype)
+- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (javascriptreact filetype)
+- [julia](https://github.com/JuliaEditorSupport/julia-vim) (julia filetype)
+- [kotlin](https://github.com/udalov/kotlin-vim) (kotlin filetype)
+- [ledger](https://github.com/ledger/vim-ledger) (ledger filetype)
+- [lilypond](https://github.com/anowlcalledjosh/vim-lilypond) (lilypond filetype)
+- [livescript](https://github.com/gkz/vim-ls) (livescript filetype)
+- [llvm](https://github.com/rhysd/vim-llvm) (llvm, tablege and tablegen filetypes)
+- [log](https://github.com/MTDL9/vim-log-highlighting) (log filetype)
+- [lua](https://github.com/tbastos/vim-lua) (lua filetype)
+- [mako](https://github.com/sophacles/vim-bundle-mako) (mako filetype)
+- [markdown](https://github.com/plasticboy/vim-markdown) (markdown filetype)
+- [mathematica](https://github.com/voldikss/vim-mma) (mma filetype)
+- [mdx](https://github.com/jxnblk/vim-mdx-js) (markdown.mdx filetype)
+- [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim) (meson, dosin and dosini filetypes)
+- [moonscript](https://github.com/leafo/moonscript-vim) (moon filetype)
+- [nginx](https://github.com/chr4/nginx.vim) (nginx filetype)
+- [nim](https://github.com/zah/nim.vim) (nim filetype)
+- [nix](https://github.com/LnL7/vim-nix) (nix filetype)
+- [objc](https://github.com/b4winckler/vim-objc) (objc filetype)
+- [ocaml](https://github.com/rgrinberg/vim-ocaml) (ocaml, omake, opam, oasis, dune, ocamlbuild_tags, ocpbuild, ocpbuildroot, sexpli and sexplib filetypes)
+- [octave](https://github.com/McSinyx/vim-octave) (octave filetype)
+- [odin](https://github.com/Tetralux/odin.vim) (odin filetype)
+- [opencl](https://github.com/petRUShka/vim-opencl) (opencl filetype)
+- [perl](https://github.com/vim-perl/vim-perl) (perl, pod, mason, tt2, tt2html, x and xs filetypes)
+- [pgsql](https://github.com/lifepillar/pgsql.vim) (sql filetype)
+- [php](https://github.com/StanAngeloff/php.vim) (php filetype)
+- [plantuml](https://github.com/aklt/plantuml-syntax) (plantuml filetype)
+- [pony](https://github.com/jakwings/vim-pony) (pony filetype)
+- [powershell](https://github.com/PProvost/vim-ps1) (ps1, ps1xm and ps1xml filetypes)
+- [protobuf](https://github.com/uarun/vim-protobuf) (proto filetype)
+- [pug](https://github.com/digitaltoad/vim-pug) (pug filetype)
+- [puppet](https://github.com/rodjek/vim-puppet) (puppet, embeddedpuppe and embeddedpuppet filetypes)
+- [purescript](https://github.com/purescript-contrib/purescript-vim) (purescript filetype)
 - [python-compiler](https://github.com/aliev/vim-compiler-python)
 - [python-indent](https://github.com/Vimjas/vim-python-pep8-indent)
-- [python](https://github.com/vim-python/python-syntax)(python filetype)
-- [qmake](https://github.com/artoj/qmake-syntax-vim)(qmake filetype)
-- [qml](https://github.com/peterhoeg/vim-qml)(qml filetype)
-- [r-lang](https://github.com/vim-scripts/R.vim)(r, rhel and rhelp filetypes)
-- [racket](https://github.com/wlangstroth/vim-racket)(racket filetype)
-- [ragel](https://github.com/jneen/ragel.vim)(ragel filetype)
-- [raku](https://github.com/Raku/vim-raku)(raku filetype)
-- [raml](https://github.com/IN3D/vim-raml)(raml filetype)
-- [razor](https://github.com/adamclerk/vim-razor)(razor filetype)
-- [reason](https://github.com/reasonml-editor/vim-reason-plus)(reason filetype)
-- [requirements](https://github.com/raimon49/requirements.txt.vim)(requirements filetype)
-- [rspec](https://github.com/keith/rspec.vim)(ruby filetype)
-- [rst](https://github.com/marshallward/vim-restructuredtext)(rst filetype)
-- [ruby](https://github.com/vim-ruby/vim-ruby)(ruby, erub and eruby filetypes)
-- [rust](https://github.com/rust-lang/rust.vim)(rust filetype)
-- [scala](https://github.com/derekwyatt/vim-scala)(scala filetype)
-- [scss](https://github.com/cakebaker/scss-syntax.vim)(scss filetype)
-- [sh](https://github.com/arzg/vim-sh)(sh, zs and zsh filetypes)
-- [slim](https://github.com/slim-template/vim-slim)(slim filetype)
-- [slime](https://github.com/slime-lang/vim-slime-syntax)(slime filetype)
-- [smt2](https://github.com/bohlender/vim-smt2)(smt2 filetype)
-- [solidity](https://github.com/tomlion/vim-solidity)(solidity filetype)
-- [stylus](https://github.com/wavded/vim-stylus)(stylus filetype)
-- [svelte](https://github.com/evanleck/vim-svelte/tree/main)(svelte filetype)
+- [python](https://github.com/vim-python/python-syntax) (python filetype)
+- [qmake](https://github.com/artoj/qmake-syntax-vim) (qmake filetype)
+- [qml](https://github.com/peterhoeg/vim-qml) (qml filetype)
+- [r-lang](https://github.com/vim-scripts/R.vim) (r, rhel and rhelp filetypes)
+- [racket](https://github.com/wlangstroth/vim-racket) (racket filetype)
+- [ragel](https://github.com/jneen/ragel.vim) (ragel filetype)
+- [raku](https://github.com/Raku/vim-raku) (raku filetype)
+- [raml](https://github.com/IN3D/vim-raml) (raml filetype)
+- [razor](https://github.com/adamclerk/vim-razor) (razor filetype)
+- [reason](https://github.com/reasonml-editor/vim-reason-plus) (reason filetype)
+- [requirements](https://github.com/raimon49/requirements.txt.vim) (requirements filetype)
+- [rspec](https://github.com/keith/rspec.vim) (ruby filetype)
+- [rst](https://github.com/marshallward/vim-restructuredtext) (rst filetype)
+- [ruby](https://github.com/vim-ruby/vim-ruby) (ruby, erub and eruby filetypes)
+- [rust](https://github.com/rust-lang/rust.vim) (rust filetype)
+- [scala](https://github.com/derekwyatt/vim-scala) (scala filetype)
+- [scss](https://github.com/cakebaker/scss-syntax.vim) (scss filetype)
+- [sh](https://github.com/arzg/vim-sh) (sh, zs and zsh filetypes)
+- [slim](https://github.com/slim-template/vim-slim) (slim filetype)
+- [slime](https://github.com/slime-lang/vim-slime-syntax) (slime filetype)
+- [smt2](https://github.com/bohlender/vim-smt2) (smt2 filetype)
+- [solidity](https://github.com/tomlion/vim-solidity) (solidity filetype)
+- [stylus](https://github.com/wavded/vim-stylus) (stylus filetype)
+- [svelte](https://github.com/evanleck/vim-svelte/tree/main) (svelte filetype)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
-- [svg](https://github.com/vim-scripts/svg.vim)(svg filetype)
-- [swift](https://github.com/keith/swift.vim)(swift filetype)
-- [sxhkd](https://github.com/baskerville/vim-sxhkdrc)(sxhkdrc filetype)
-- [systemd](https://github.com/wgwoods/vim-systemd-syntax)(systemd filetype)
-- [textile](https://github.com/timcharper/textile.vim)(textile filetype)
-- [thrift](https://github.com/solarnz/thrift.vim)(thrift filetype)
-- [tmux](https://github.com/ericpruitt/tmux.vim/tree/master/vim)(tmux filetype)
-- [toml](https://github.com/cespare/vim-toml)(toml filetype)
-- [tptp](https://github.com/c-cube/vim-tptp)(tptp filetype)
-- [twig](https://github.com/lumiliet/vim-twig)(html.twig, xml.twi and xml.twig filetypes)
-- [typescript](https://github.com/HerringtonDarkholme/yats.vim)(typescript, typescriptreac and typescriptreact filetypes)
-- [unison](https://github.com/unisonweb/unison/tree/trunk/editor-support/vim)(unison filetype)
-- [v](https://github.com/ollykel/v-vim)(vlang filetype)
-- [vala](https://github.com/arrufat/vala.vim)(vala filetype)
-- [vbnet](https://github.com/vim-scripts/vbnet.vim)(vbnet filetype)
-- [vcl](https://github.com/smerrill/vcl-vim-plugin)(vcl filetype)
-- [velocity](https://github.com/lepture/vim-velocity)(velocity filetype)
-- [vue](https://github.com/posva/vim-vue)(vue filetype)
-- [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)(xdc filetype)
-- [xml](https://github.com/amadeus/vim-xml)(xml filetype)
-- [xsl](https://github.com/vim-scripts/XSLT-syntax)(xsl filetype)
+- [svg](https://github.com/vim-scripts/svg.vim) (svg filetype)
+- [swift](https://github.com/keith/swift.vim) (swift filetype)
+- [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (sxhkdrc filetype)
+- [systemd](https://github.com/wgwoods/vim-systemd-syntax) (systemd filetype)
+- [textile](https://github.com/timcharper/textile.vim) (textile filetype)
+- [thrift](https://github.com/solarnz/thrift.vim) (thrift filetype)
+- [tmux](https://github.com/ericpruitt/tmux.vim/tree/master/vim) (tmux filetype)
+- [toml](https://github.com/cespare/vim-toml) (toml filetype)
+- [tptp](https://github.com/c-cube/vim-tptp) (tptp filetype)
+- [twig](https://github.com/lumiliet/vim-twig) (html.twig, xml.twi and xml.twig filetypes)
+- [typescript](https://github.com/HerringtonDarkholme/yats.vim) (typescript, typescriptreac and typescriptreact filetypes)
+- [unison](https://github.com/unisonweb/unison/tree/trunk/editor-support/vim) (unison filetype)
+- [v](https://github.com/ollykel/v-vim) (vlang filetype)
+- [vala](https://github.com/arrufat/vala.vim) (vala filetype)
+- [vbnet](https://github.com/vim-scripts/vbnet.vim) (vbnet filetype)
+- [vcl](https://github.com/smerrill/vcl-vim-plugin) (vcl filetype)
+- [velocity](https://github.com/lepture/vim-velocity) (velocity filetype)
+- [vue](https://github.com/posva/vim-vue) (vue filetype)
+- [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (xdc filetype)
+- [xml](https://github.com/amadeus/vim-xml) (xml filetype)
+- [xsl](https://github.com/vim-scripts/XSLT-syntax) (xsl filetype)
 - [yard](https://github.com/noprompt/vim-yardoc)
-- [zephir](https://github.com/xwsoul/vim-zephir)(zephir filetype)
-- [zig](https://github.com/ziglang/zig.vim)(zir, zi and zig filetypes)
+- [zephir](https://github.com/xwsoul/vim-zephir) (zephir filetype)
+- [zig](https://github.com/ziglang/zig.vim) (zir, zi and zig filetypes)
 - [zinit](https://github.com/zinit-zsh/zplugin-vim-syntax)
 <!--/Language Packs-->
 
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index 6816d8228..90313231d 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -330,7 +330,7 @@ function! s:download(branch)
     let zip = s:script_root_dir . "fsac.zip"
     call system(
         \ 'curl -fLo ' . zip .  ' --create-dirs ' .
-        \ '"https://ci.appveyor.com/api/projects/fsautocomplete/fsautocomplete/artifacts/bin/pkgs/fsautocomplete.netcore.zip?branch=' . a:branch . '"'
+        \ '"https://github.com/fsharp/FsAutoComplete/releases/latest/download/fsautocomplete.netcore.zip"'
         \ )
     if v:shell_error == 0
         call system('unzip -o -d ' . s:script_root_dir . "/fsac " . zip)
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index b450ad165..ce33d996f 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -524,7 +524,7 @@ function! go#config#ReferrersMode() abort
 endfunction
 
 function! go#config#ImplementsMode() abort
-  return get(g:, 'go_implements_mode', 'guru')
+  return get(g:, 'go_implements_mode', 'gopls')
 endfunction
 
 function! go#config#GoplsCompleteUnimported() abort
@@ -586,6 +586,21 @@ function! go#config#FillStructMode() abort
   return get(g:, 'go_fillstruct_mode', 'fillstruct')
 endfunction
 
+function! go#config#DebugMappings() abort
+  let l:default = {
+     \ '(go-debug-continue)':   {'key': '<F5>'},
+     \ '(go-debug-print)':      {'key': '<F6>'},
+     \ '(go-debug-breakpoint)': {'key': '<F9>'},
+     \ '(go-debug-next)':       {'key': '<F10>'},
+     \ '(go-debug-step)':       {'key': '<F11>'},
+     \ '(go-debug-halt)':       {'key': '<F8>'},
+  \ }
+
+  let l:user = deepcopy(get(g:, 'go_debug_mappings', {}))
+
+  return extend(l:user, l:default, 'keep')
+endfunction
+
 " Set the default value. A value of "1" is a shortcut for this, for
 " compatibility reasons.
 if exists("g:go_gorename_prefill") && g:go_gorename_prefill == 1
diff --git a/autoload/julia/doc.vim b/autoload/julia/doc.vim
index 7907c94a0..0bba5bfc7 100644
--- a/autoload/julia/doc.vim
+++ b/autoload/julia/doc.vim
@@ -37,7 +37,7 @@ let s:NODOCPATTERN = '\C\VNo documentation found.'
 function! julia#doc#lookup(keyword, ...) abort
   let juliapath = get(a:000, 0, g:julia#doc#juliapath)
   let keyword = escape(a:keyword, '"\')
-  let cmd = printf('%s -E "@doc %s"', juliapath, keyword)
+  let cmd = printf('%s --compile=min --optimize=0 -E "@doc %s"', juliapath, keyword)
   return systemlist(cmd)
 endfunction
 
@@ -238,7 +238,7 @@ endfunction
 function! s:likely(str) abort
   " escape twice
   let str = escape(escape(a:str, '"\'), '"\')
-  let cmd = printf('%s -E "%s(\"%s\")"', g:julia#doc#juliapath, s:REPL_SEARCH, str)
+  let cmd = printf('%s --compile=min --optimize=0 -E "%s(\"%s\")"', g:julia#doc#juliapath, s:REPL_SEARCH, str)
   let output = systemlist(cmd)
   return split(matchstr(output[0], '\C^search: \zs.*'))
 endfunction
diff --git a/doc/julia-vim.txt b/doc/julia-vim.txt
index 3f09e3bdc..5cf181d03 100644
--- a/doc/julia-vim.txt
+++ b/doc/julia-vim.txt
@@ -349,7 +349,7 @@ julia#function_assign2block()
                 statements are removed; if the result is empty, `nothing` is
                 substituted. Leading macros (e.g. `@inline` or `@compat`) are
                 recognized and preserved by the transformation.
-                
+
                 In order to make this functionality practical, it is advisable
                 to map it to some key combination, e.g.:
 >
@@ -386,6 +386,91 @@ g:julia_highlight_operators
                 Determines whether to apply syntax highlighting to operators.
                 Default: on (set to `1`).
 
+                                              *g:julia_indent_align_import*
+g:julia_indent_align_import
+
+                In a multi-line import/using/export statment, the lines after
+                the first one use some special alignment rules by default,
+                e.g.:
+>
+                import X: one,
+                          two,
+                          three
+                export four,
+                       five,
+                       six
+<
+                When `g:julia_indent_align_import` is `0` instead, the usual
+                indentation is used:
+>
+                import X: one,
+                    two,
+                    three
+                export four,
+                    five,
+                    six
+
+                                              *g:julia_indent_align_brackets*
+g:julia_indent_align_brackets
+
+                In a multi-line bracketed expression (except for function
+                arguments, see |g:julia_indent_align_funcargs|), the lines
+                after the first one use some special alignment rules by
+                default, e.g.:
+>
+                matrix = [1 2 3;
+                          4 5 6]
+                tpl = (
+                       abc = Dict(a=>1,
+                                  b=>2),
+                       def = [1 2;
+                              3 4],
+                       xyz = SubArray{eltype(P),
+                                      N, P, I,
+                                      false}
+                      )
+<
+                When `g:julia_indent_align_brackets` is `0` instead, an extra
+                indent is used:
+>
+                matrix = [1 2 3;
+                    4 5 6]
+                tpl = (
+                    abc = Dict(a=>1,
+                        b=>2),
+                    def = [1 2;
+                        3 4],
+                    xyz = SubArray{eltype(P),
+                        N, P, I,
+                        false}
+                )
+<
+
+                                              *g:julia_indent_align_funcargs*
+g:julia_indent_align_funcargs
+
+                In a function definition, when the arguments span multiple
+                lines, the lines after the first one get an extra indentation
+                step by default, e.g.:
+>
+                function functionanme(
+                        arg1, arg2,
+                        arg3, arg4
+                    )
+                    # function body
+                end
+<
+                By setting `g:julia_indent_align_funcargs` to `1`, the
+                arguments are aligned to the bracket instead (they work as any
+                other bracket with the default value of
+                |g:julia_indent_align_brackets|):
+>
+                function functionanme(arg1, arg2,
+                                      arg3, arg4
+                                     )
+                    # function body
+                end
+<
 
 ==============================================================================
 ABOUT                                                     *julia-vim-about*
diff --git a/doc/vim-go.txt b/doc/vim-go.txt
index cc412836c..d33a8b38b 100644
--- a/doc/vim-go.txt
+++ b/doc/vim-go.txt
@@ -1498,9 +1498,9 @@ other packages. Valid options are `gopls` and `guru`. By default it's `gopls`.
 
 Use this option to define the command to be used for |:GoImplements|.
 The Implements feature in gopls is still new and being worked upon.
-Valid options are `gopls` and `guru`. By default it's `guru`.
+Valid options are `gopls` and `guru`. By default it's `gopls`.
 >
-  let g:go_implements_mode = 'guru'
+  let g:go_implements_mode = 'gopls'
 <
                                                   *'g:go_def_mapping_enabled'*
 
@@ -2490,7 +2490,52 @@ Show only variables on the right-hand side: >
   let g:go_debug_windows = {
         \ 'vars':  'rightbelow 60vnew',
   \ }
+
+                                                       *'g:go_debug_mappings'*
+
+Contains custom key mapping information to customize the active mappings
+when debugging.
+
+Only the customizations desired need to be provided; the debugger will use its
+default key mappings for any mapping not defined here.
+
+This value should be a dictionary whose keys are the plugin mapping commands
+(e.g.  `(go-debug-continue)`). The values are dictionaries with two keys.
+`key` and `attributes`.
+
+`key` is expected to be the key to map (i.e. it's the `lhs` in a mapping).
+`key` can be empty or missing to prevent a key mapping from being applied for
+one the named mappings.
+
+`arguments` is the string of `map-arguments` for the mapping (e.g.
+`<nowait>`).
+
+The first item must be the `lhs` to use for the mapping. The optional
+second item is for `:map-arguments`. All mappings will always be `:map-local`,
+so there is never a need to include `"<buffer>"` in the the arguments.
+>
+  let g:go_debug_mappings = {
+    \ '(go-debug-continue)': {'key': 'c', 'arguments': '<nowait>'],
+    \ '(go-debug-stop)': {'key': 'q'},
+    \ '(go-debug-next)': {'key': 'n', 'arguments': '<nowait>'},
+    \ '(go-debug-step)': {'key': 's'},
+  \}
 <
+
+Defaults are equivalent to:
+>
+  let g:go_debug_mappings = {
+     \ '(go-debug-continue)':   {'key': '<F5>'},
+     \ '(go-debug-print)':      {'key': '<F6>'},
+     \ '(go-debug-breakpoint)': {'key': '<F9>'},
+     \ '(go-debug-next)':       {'key': '<F10>'},
+     \ '(go-debug-step)':       {'key': '<F11>'},
+     \ '(go-debug-halt)':       {'key': '<F8>'},
+  \ }
+<
+
+Your user specified settings will be merged with the defaults.
+
                                                         *'g:go_debug_address'*
 
 Server address `dlv` will listen on; must be in `hostname:port` format.
diff --git a/ftplugin/falcon.vim b/ftplugin/falcon.vim
index 752f5bc33..defc4cbe6 100644
--- a/ftplugin/falcon.vim
+++ b/ftplugin/falcon.vim
@@ -5,6 +5,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'falcon') == -1
 " Author:       Steven Oliver <oliver.steven@gmail.com>
 " Copyright:    Copyright (c) 2009-2013 Steven Oliver
 " License:      You may redistribute this under the same terms as Vim itself
+" Last Update:  2020 Oct 10
 " --------------------------------------------------------------------------
 
 " Only do this when not done yet for this buffer
diff --git a/ftplugin/fortran.vim b/ftplugin/fortran.vim
index 7b8a1fb1e..efbc28846 100644
--- a/ftplugin/fortran.vim
+++ b/ftplugin/fortran.vim
@@ -2,14 +2,14 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
 
 " Vim settings file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, 77, 66)
-" Version:	0.50
-" Last Change:	2020 Apr 20
-" Patched By:	Eisuke Kawashima
+" Version:	(v52) 2020 October 07
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-plugin from Vim
 " Credits:
-" Useful suggestions were made by Stefano Zacchiroli, Hendrik Merx, Ben
-" Fritz, and David Barnett.
+"  Version 0.1 was created in September 2000 by Ajit Thakkar.
+"  Since then, useful suggestions and contributions have been made, in order, by:
+"  Stefano Zacchiroli, Hendrik Merx, Ben Fritz, David Barnett, Eisuke Kawashima,
+"  and Doug Kearns.
 
 " Only do these settings when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -121,7 +121,7 @@ if !exists("b:match_words")
 endif
 
 " File filters for :browse e
-if has("gui_win32") && !exists("b:browsefilter")
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:browsefilter = "Fortran Files (*.f;*.for;*.f77;*.f90;*.f95;*.f03;*.f08;*.fpp;*.ftn)\t*.f;*.for;*.f77;*.f90;*.f95;*.f03;*.f08;*.fpp;*.ftn\n" .
     \ "All Files (*.*)\t*.*\n"
 endif
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index 10ca49200..87ad6fa6f 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -524,7 +524,7 @@ endfunction
   "c. link this stuff with what the user wants
   " ie. get the expression selected/under the cursor
 
-    let s:ocaml_word_char = '\w|[\u00ac-\uffff]|'''
+    let s:ocaml_word_char = '\w|[\xc0-\xff]|'''
 
       "In:  the current mode (eg. "visual", "normal", etc.)
       "Out: the borders of the expression we are looking for the type
diff --git a/indent/fortran.vim b/indent/fortran.vim
index 1fed2974d..a4c5f130d 100644
--- a/indent/fortran.vim
+++ b/indent/fortran.vim
@@ -2,14 +2,14 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
 
 " Vim indent file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
-" Version:	47
-" Last Change:	2020 Apr 20
-" Patched By:	Eisuke Kawashima
+" Version:	(v48) 2020 October 07
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-indent from Vim
 " Credits:
-"  Useful suggestions were made, in chronological order, by:
-"  Albert Oliver Serra, Takuya Fujiwara and Philipp Edelmann.
+"  Version 0.1 was created in September 2000 by Ajit Thakkar.
+"  Since then, useful suggestions and contributions have been made, in order, by:
+"  Albert Oliver Serra, Takuya Fujiwara, Philipp Edelmann, Eisuke Kawashima,
+"  and Louis Cochen.
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -148,7 +148,7 @@ function FortranGetIndent(lnum)
         \. 'type\|forall\|associate\|enum\|block\)\)\>'
     let ind = ind - shiftwidth()
     " Fix indent for case statement immediately after select
-    if prevstat =~? '\<select\s\+\(case\|type\)\>'
+    if prevstat =~? '\<select\s*\(case\|type\)\>'
       let ind = ind + shiftwidth()
     endif
   endif
diff --git a/indent/julia.vim b/indent/julia.vim
index d95fa193a..6f4be447d 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -21,7 +21,7 @@ if exists("*GetJuliaIndent")
   finish
 endif
 
-let s:skipPatterns = '\<julia\%(Comprehension\%(For\|If\)\|RangeKeyword\|Comment[LM]\|\%([bsv]\|ip\|big\|MIME\|Shell\|Printf\|Doc\)\=String\|RegEx\|SymbolS\?\)\>'
+let s:skipPatterns = '\<julia\%(Comprehension\%(For\|If\)\|RangeKeyword\|Comment\%([LM]\|Delim\)\|\%([bsv]\|ip\|big\|MIME\|Shell\|Printf\|Doc\)\=String\|RegEx\|SymbolS\?\)\>'
 
 function JuliaMatch(lnum, str, regex, st, ...)
   let s = a:st
@@ -51,7 +51,7 @@ function GetJuliaNestingStruct(lnum, ...)
   let blocks_stack = []
   let num_closed_blocks = 0
   while 1
-    let fb = JuliaMatch(a:lnum, line, '@\@<!\<\%(if\|else\%(if\)\?\|while\|for\|try\|catch\|finally\|\%(staged\)\?function\|macro\|begin\|mutable\s\+struct\|\%(mutable\s\+\)\@<!struct\|\%(abstract\|primitive\)\s\+type\|immutable\|let\|\%(bare\)\?module\|quote\|do\)\>', s, e)
+    let fb = JuliaMatch(a:lnum, line, '@\@<!\<\%(if\|else\%(if\)\?\|while\|for\|try\|catch\|finally\|\%(staged\)\?function\|macro\|begin\|mutable\s\+struct\|\%(mutable\s\+\)\@<!struct\|\%(abstract\|primitive\)\s\+type\|let\|\%(bare\)\?module\|quote\|do\)\>', s, e)
     let fe = JuliaMatch(a:lnum, line, '@\@<!\<end\>', s, e)
 
     if fb < 0 && fe < 0
@@ -255,14 +255,18 @@ function GetJuliaNestingBrackets(lnum, c)
   endwhile
   let first_open_bracket = -1
   let last_open_bracket = -1
+  let infuncargs = 0
   if len(brackets_stack) > 0
     let first_open_bracket = brackets_stack[0][1]
     let last_open_bracket = brackets_stack[-1][1]
+    if brackets_stack[-1][0] == 'par' && IsFunctionArgPar(a:lnum, last_open_bracket)
+      let infuncargs = 1
+    endif
   endif
-  return [first_open_bracket, last_open_bracket, last_closed_bracket]
+  return [first_open_bracket, last_open_bracket, last_closed_bracket, infuncargs]
 endfunction
 
-let s:bracketBlocks = '\<julia\%(\%(\%(Printf\)\?Par\|SqBra\|CurBra\)Block\|ParBlockInRange\|StringVars\%(Par\|SqBra\|CurBra\)\|Dollar\%(Par\|SqBra\)\|QuotedParBlockS\?\)\>'
+let s:bracketBlocks = '\<julia\%(\%(\%(Printf\)\?Par\|SqBra\%(Idx\)\?\|CurBra\)Block\|ParBlockInRange\|StringVars\%(Par\|SqBra\|CurBra\)\|Dollar\%(Par\|SqBra\)\|QuotedParBlockS\?\)\>'
 
 function IsInBrackets(lnum, c)
   let stack = map(synstack(a:lnum, a:c), 'synIDattr(v:val, "name")')
@@ -272,10 +276,40 @@ endfunction
 
 function IsInDocString(lnum)
   let stack = map(synstack(a:lnum, 1), 'synIDattr(v:val, "name")')
-  call filter(stack, 'v:val =~# "\\<juliaDocString\\>"')
+  call filter(stack, 'v:val =~# "\\<juliaDocString\\(Delim\\)\\?\\>"')
   return len(stack) > 0
 endfunction
 
+function IsInContinuationImportLine(lnum)
+  let stack = map(synstack(a:lnum, 1), 'synIDattr(v:val, "name")')
+  call filter(stack, 'v:val =~# "\\<juliaImportLine\\>"')
+  if len(stack) == 0
+    return 0
+  endif
+  return JuliaMatch(a:lnum, getline(a:lnum), '\<\%(import\|using\|export\)\>', indent(a:lnum)) == -1
+endfunction
+
+function IsFunctionArgPar(lnum, c)
+  if a:c == 0
+    return 0
+  endif
+  let stack = map(synstack(a:lnum, a:c-1), 'synIDattr(v:val, "name")')
+  return stack[-1] == 'juliaFunctionBlock'
+endfunction
+
+function JumpToMatch(lnum, last_closed_bracket)
+  " we use the % command to skip back (tries to ues matchit if possible,
+  " otherwise resorts to vim's default, which is buggy but better than
+  " nothing)
+  call cursor(a:lnum, a:last_closed_bracket)
+  let percmap = maparg("%", "n") 
+  if exists("g:loaded_matchit") && percmap =~# 'Match\%(it\|_wrapper\)'
+    normal %
+  else
+    normal! %
+  end
+endfunction
+
 " Auxiliary function to find a line which does not start in the middle of a
 " multiline bracketed expression, to be used as reference for block
 " indentation.
@@ -314,30 +348,29 @@ function GetJuliaIndent()
   let lim = -1
 
   " Multiline bracketed expressions take precedence
+  let align_brackets = get(g:, "julia_indent_align_brackets", 1)
+  let align_funcargs = get(g:, "julia_indent_align_funcargs", 0)
   let c = len(getline(lnum)) + 1
   while IsInBrackets(lnum, c)
-    let [first_open_bracket, last_open_bracket, last_closed_bracket] = GetJuliaNestingBrackets(lnum, c)
+    let [first_open_bracket, last_open_bracket, last_closed_bracket, infuncargs] = GetJuliaNestingBrackets(lnum, c)
 
     " First scenario: the previous line has a hanging open bracket:
     " set the indentation to match the opening bracket (plus an extra space)
+    " unless we're in a function arguments list or alignment is disabled, in
+    " which case we just add an extra indent
     if last_open_bracket != -1
-      let st = last_open_bracket
-      let ind = virtcol([lnum, st + 1])
+      if (!infuncargs && align_brackets) || (infuncargs && align_funcargs)
+        let st = last_open_bracket
+        let ind = virtcol([lnum, st + 1])
+      else
+        let ind = indent(lnum) + shiftwidth()
+      endif
 
     " Second scenario: some multiline bracketed expression was closed in the
     " previous line. But since we know we are still in a bracketed expression,
-    " we need to find the line where the bracket was open
+    " we need to find the line where the bracket was opened
     elseif last_closed_bracket != -1
-      " we use the % command to skip back (tries to ues matchit if possible,
-      " otherwise resorts to vim's default, which is buggy but better than
-      " nothing)
-      call cursor(lnum, last_closed_bracket)
-      let percmap = maparg("%", "n") 
-      if exists("g:loaded_matchit") && percmap =~# 'Match\%(it\|_wrapper\)'
-        normal %
-      else
-        normal! %
-      end
+      call JumpToMatch(lnum, last_closed_bracket)
       if line(".") == lnum
         " something wrong here, give up
         let ind = indent(lnum)
@@ -354,15 +387,28 @@ function GetJuliaIndent()
         endif
       endif
 
-    " Third scenario: nothing special, or matchit not available: keep the indentation
+    " Third scenario: nothing special: keep the indentation
     else
       let ind = indent(lnum)
     endif
 
-    " In case the current line starts with a closing bracket, we align it with
-    " the opening one.
+    " Does the current line starts with a closing bracket? Then depending on
+    " the situation we align it with the opening one, or we let the rest of
+    " the code figure it out (the case in which we're closing a function
+    " argument list is special-cased)
     if JuliaMatch(v:lnum, getline(v:lnum), '[])}]', indent(v:lnum)) == indent(v:lnum) && ind > 0
-      return ind - 1
+      if !align_brackets && !align_funcargs
+        let ind = -1
+      elseif (align_brackets && getline(v:lnum)[indent(v:lnum)] != ')') || align_funcargs
+        return ind - 1
+      else " must be a ')' and align_brackets==1 and align_funcargs==0
+        call JumpToMatch(v:lnum, indent(v:lnum))
+        if IsFunctionArgPar(line("."), col("."))
+          let ind = -1
+        else
+          return ind - 1
+        endif
+      endif
     endif
 
     break
@@ -374,7 +420,7 @@ function GetJuliaIndent()
     let [lnum,ind] = LastBlockIndent(lnum)
     let c = len(getline(lnum)) + 1
     if IsInBrackets(lnum, c)
-      let [first_open_bracket, last_open_bracket, last_closed_bracket] = GetJuliaNestingBrackets(lnum, c)
+      let [first_open_bracket, last_open_bracket, last_closed_bracket, infuncargs] = GetJuliaNestingBrackets(lnum, c)
       let lim = first_open_bracket
     endif
   end
@@ -389,6 +435,55 @@ function GetJuliaIndent()
   " Decrease indentation for each closed block in the current line
   let ind -= shiftwidth() * num_closed_blocks
 
+  " Additional special case: multiline import/using/export statements
+
+  let prevline = getline(lnum)
+  " Are we in a multiline import/using/export statement, right below the
+  " opening line?
+  if IsInContinuationImportLine(v:lnum) && !IsInContinuationImportLine(lnum)
+    if get(g:, 'julia_indent_align_import', 1)
+      " if the opening line has a colon followed by non-comments, use it as
+      " reference point
+      let cind = JuliaMatch(lnum, prevline, ':', indent(lnum), lim)
+      " echo "cind=".string(cind) | sleep 1
+      if cind >= 0
+        let nonwhiteind = JuliaMatch(lnum, prevline, '\S', cind+1)
+        if nonwhiteind >= 0
+          " return match(prevline, '\S', cind+1) " a bit overkill...
+          return cind + 2
+        endif
+      else
+        " if the opening line is not a naked import/using/export statement, use
+        " it as reference
+        let iind = JuliaMatch(lnum, prevline, '\<import\|using\|export\>', indent(lnum), lim)
+        if iind >= 0
+          " assuming whitespace after using... so no `using(XYZ)` please!
+          let nonwhiteind = JuliaMatch(lnum, prevline, '\S', iind+6)
+          if nonwhiteind >= 0
+            return match(prevline, '\S', iind+6)
+          endif
+        endif
+      endif
+    endif
+    let ind += shiftwidth()
+
+  " Or did we just close a multiline import/using/export statement?
+  elseif !IsInContinuationImportLine(v:lnum) && IsInContinuationImportLine(lnum)
+    " find the starting line of the statement
+    let ilnum = 0
+    for iln in range(lnum-1, 1, -1)
+      if !IsInContinuationImportLine(iln)
+        let ilnum = iln
+        break
+      endif
+    endfor
+    if ilnum == 0
+      " something went horribly wrong, give up
+      let ind = indent(lnum)
+    endif
+    let ind = indent(ilnum)
+  endif
+
   return ind
 endfunction
 
diff --git a/scripts/build b/scripts/build
index 40ac7f331..c2e5d41a6 100755
--- a/scripts/build
+++ b/scripts/build
@@ -531,9 +531,9 @@ def extract(packages)
     end
 
     if package["filetypes"].size > 1
-      output[-1] << "(#{package["filetypes"].map { |f| f["name"] }.join(", ")[0..-2]} and #{package["filetypes"].last["name"]} filetypes)"
+      output[-1] << " (#{package["filetypes"].map { |f| f["name"] }.join(", ")[0..-2]} and #{package["filetypes"].last["name"]} filetypes)"
     elsif package["filetypes"].size > 0
-      output[-1] << "(#{package["filetypes"].first["name"]} filetype)"
+      output[-1] << " (#{package["filetypes"].first["name"]} filetype)"
     end
 
     progress
diff --git a/syntax/apache.vim b/syntax/apache.vim
index b515c4114..737f478f9 100644
--- a/syntax/apache.vim
+++ b/syntax/apache.vim
@@ -5,7 +5,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apache') == -1
 " Maintainer: David Necas (Yeti) <yeti@physics.muni.cz>
 " License: This file can be redistribued and/or modified under the same terms
 "		as Vim itself.
-" Last Change: 2018-12-06
+" Last Change: 2020 Oct 07
 " Notes: Last synced with apache-2.2.3, version 1.x is no longer supported
 " TODO: see particular FIXME's scattered through the file
 "		make it really linewise?
@@ -44,6 +44,8 @@ syn keyword apacheOption user group
 syn match apacheOption "\<valid-user\>"
 syn case match
 syn keyword apacheMethodOption GET POST PUT DELETE CONNECT OPTIONS TRACE PATCH PROPFIND PROPPATCH MKCOL COPY MOVE LOCK UNLOCK contained
+" Added as suggested by Mikko Koivunalho
+syn keyword apacheMethodOption BASELINE-CONTROL CHECKIN CHECKOUT LABEL MERGE MKACTIVITY MKWORKSPACE REPORT UNCHECKOUT UPDATE VERSION-CONTROL contained
 syn case ignore
 syn match apacheSection "<\/\=\(Directory\|DirectoryMatch\|Files\|FilesMatch\|IfModule\|IfDefine\|Location\|LocationMatch\|VirtualHost\)[^>]*>" contains=apacheAnything
 syn match apacheLimitSection "<\/\=\(Limit\|LimitExcept\)[^>]*>" contains=apacheLimitSectionKeyword,apacheMethodOption,apacheError
diff --git a/syntax/asterisk.vim b/syntax/asterisk.vim
index f29ae1198..e065fb4a4 100644
--- a/syntax/asterisk.vim
+++ b/syntax/asterisk.vim
@@ -21,7 +21,7 @@ syn match       asteriskComment         ";.*" contains=asteriskTodo
 syn match       asteriskContext         "\[.\{-}\]"
 syn match       asteriskExten           "^\s*\zsexten\s*=>\?\s*[^,]\+\ze," contains=asteriskPattern nextgroup=asteriskPriority
 syn match       asteriskExten           "^\s*\zssame\s*=>\?\s*\ze" nextgroup=asteriskPriority
-syn match       asteriskExten           "^\s*\(register\|channel\|ignorepat\|include\|\(no\)\?load\)\s*=>\?"
+syn match       asteriskExten           "^\s*\(register\|channel\|ignorepat\|include\|l\?e\?switch\|\(no\)\?load\)\s*=>\?"
 syn match       asteriskPattern         "_\(\[[[:alnum:]#*\-]\+\]\|[[:alnum:]#*]\)*\.\?" contained
 syn match       asteriskPattern         "[^A-Za-z0-9,]\zs[[:alnum:]#*]\+\ze" contained
 syn match       asteriskApp             ",\zs[a-zA-Z]\+\ze$"
@@ -41,7 +41,7 @@ syn match       asteriskVarLen          "\${_\{0,2}[[:alpha:]][[:alnum:]_]*(.*)}
 syn match       asteriskVarLen          "(\zs[[:alpha:]][[:alnum:]_]*(.\{-})\ze=" contains=asteriskVar,asteriskVarLen,asteriskExp
 syn match       asteriskExp             "\$\[.\{-}\]" contains=asteriskVar,asteriskVarLen,asteriskExp
 syn match       asteriskCodecsPermit    "^\s*\(allow\|disallow\)\s*=\s*.*$" contains=asteriskCodecs
-syn match       asteriskCodecs          "\(g723\|gsm\|ulaw\|alaw\|g726\|adpcm\|slin\|lpc10\|g729\|speex\|ilbc\|all\s*$\)"
+syn match       asteriskCodecs          "\(vp9\|vp8\|h264\|h263p\|h263\|h261\|jpeg\|opus\|g722\|g723\|gsm\|ulaw\|alaw\|g719\|g726\|g726aal2\|siren7\|siren14\|adpcm\|slin\|lpc10\|g729\|speex\|ilbc\|wav\|all\s*$\)"
 syn match       asteriskError           "^\(type\|auth\|permit\|deny\|bindaddr\|host\)\s*=.*$"
 syn match       asteriskType            "^\zstype=\ze\<\(peer\|user\|friend\)\>$" contains=asteriskTypeType
 syn match       asteriskTypeType        "\<\(peer\|user\|friend\)\>" contained
diff --git a/syntax/cabal-2.vim b/syntax/cabal-2.vim
index c4ef829f4..e297a9bcd 100644
--- a/syntax/cabal-2.vim
+++ b/syntax/cabal-2.vim
@@ -6,7 +6,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cabal') == -1
 " Maintainer:   Marcin Szamotulski <profunctor@pm.me>
 " Previous Maintainer:	Vincent Berthoux <twinside@gmail.com>
 " File Types:   .cabal
-" Last Change:  15 May 2018
+" Last Change:  3 Oct 2020
 " v1.5: Incorporated changes from
 "       https://github.com/sdiehl/haskell-vim-proto/blob/master/vim/syntax/cabal.vim
 "       Use `syn keyword` instead of `syn match`.
@@ -64,11 +64,12 @@ syn keyword cabalCategory contained
 	\ source-repository
 	\ flag
 	\ custom-setup
+	\ common
 syn match cabalCategoryTitle contained /[^{]*\ze{\?/
 syn match cabalCategoryRegion
 	\ contains=cabalCategory,cabalCategoryTitle
 	\ nextgroup=cabalCategory skipwhite
-	\ /^\c\s*\(contained\|executable\|library\|benchmark\|test-suite\|source-repository\|flag\|custom-setup\)\+\s*\%(.*$\|$\)/
+	\ /^\c\s*\(contained\|executable\|library\|benchmark\|test-suite\|source-repository\|flag\|custom-setup\|common\)\+\s*\%(.*$\|$\)/
 syn keyword cabalTruth true false
 
 " cabalStatementRegion which limits the scope of cabalStatement keywords, this
@@ -78,6 +79,7 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
 	\ default-language
 	\ default-extensions
 	\ author
+        \ autogen-modules
 	\ branch
 	\ bug-reports
 	\ build-depends
@@ -112,6 +114,7 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
 	\ homepage
 	\ hs-source-dirs
 	\ hugs-options
+	\ import
 	\ include-dirs
 	\ includes
 	\ install-includes
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index fb1b200f9..147bd050c 100644
--- a/syntax/crystal.vim
+++ b/syntax/crystal.vim
@@ -141,7 +141,7 @@ syn match crystalFloat     "\<\d[[:digit:]_]*\%(\.\d[[:digit:]_]*\)\=\%([eE][-+]
 syn match crystalInvalidInteger "\%(\.\|[eE][+-]\)\@2<!\<0\d\+\>" contained containedin=crystalFloat,crystalInteger display
 
 " Identifiers
-syn match crystalLocalVariableOrMethod "\<[_[:lower:]][_[:alnum:]]*[?!=]\=" contains=NONE display transparent
+syn match crystalLocalVariableOrMethod "\<[_[:lower:]][_[:alnum:]]*[?!=]\=" contains=NONE display
 syn match crystalBlockArgument         "&[_[:lower:]][_[:alnum:]]"          contains=NONE display transparent
 
 syn match  crystalTypeName         "\%(\%([.@$]\@1<!\.\)\@1<!\<\|::\)\_s*\zs\u\w*\%(\>\|::\)\@=" contained
diff --git a/syntax/css.vim b/syntax/css.vim
index 8cac40ec2..df65677d2 100644
--- a/syntax/css.vim
+++ b/syntax/css.vim
@@ -651,7 +651,7 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
 
+" vim: ts=8
 
 endif
diff --git a/syntax/fortran.vim b/syntax/fortran.vim
index 4fddcef31..96b0fbe82 100644
--- a/syntax/fortran.vim
+++ b/syntax/fortran.vim
@@ -2,19 +2,18 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
 
 " Vim syntax file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
-" Version:	102
-" Last Change:	2020 Apr 20
-" Patched By:	Eisuke Kawashima
+" Version:	(v103) 2020 October 07
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-syntax from Vim
 " Credits:
-"  Version 0.1 for Fortran 95 was created (April 2000) by Ajit Thakkar from the
-"  Fortran 77 syntax file by Mario Eusebio and Preben Guldberg.
+"  Version 0.1 for Fortran 95 was created in April 2000 by Ajit Thakkar from an
+"  older Fortran 77 syntax file by Mario Eusebio and Preben Guldberg.
 "  Since then, useful suggestions and contributions have been made, in order, by:
 "  Andrej Panjkov, Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile,
 "  Walter Dieudonné, Alexander Wagner, Roman Bertle, Charles Rendleman,
 "  Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, Jan Hermann,
-"  Stefano Zaghi, Vishnu V. Krishnan, Judicaël Grasset, and Takuma Yoshida
+"  Stefano Zaghi, Vishnu V. Krishnan, Judicaël Grasset, Takuma Yoshida,
+"  Eisuke Kawashima, and André Chalella.`
 
 if exists("b:current_syntax")
   finish
@@ -104,6 +103,8 @@ syn match fortranUnitHeader	"\<end\>"
 syn match fortranType		"\<character\>"
 syn match fortranType		"\<complex\>"
 syn match fortranType		"\<integer\>"
+syn match fortranType		"\<real\>"
+syn match fortranType		"\<logical\>"
 syn keyword fortranType		intrinsic
 syn match fortranType		"\<implicit\>"
 syn keyword fortranStructure	dimension
@@ -151,11 +152,9 @@ syn keyword fortranExtraIntrinsic	algama cdabs cdcos cdexp cdlog cdsin cdsqrt cq
 syn keyword fortranIntrinsic	abs acos aimag aint anint asin atan atan2 char cmplx conjg cos cosh exp ichar index int log log10 max min nint sign sin sinh sqrt tan tanh
 syn match fortranIntrinsic	"\<len\s*[(,]"me=s+3
 syn match fortranIntrinsic	"\<real\s*("me=s+4
-syn match fortranType		"\<implicit\s\+real"
-syn match fortranType		"^\s*real\>"
 syn match fortranIntrinsic	"\<logical\s*("me=s+7
-syn match fortranType		"\<implicit\s\+logical"
-syn match fortranType		"^\s*logical\>"
+syn match fortranType           "\<implicit\s\+real\>"
+syn match fortranType           "\<implicit\s\+logical\>"
 
 "Numbers of various sorts
 " Integers
@@ -170,6 +169,12 @@ syn match fortranFloatIll	display	"\<\d\+\.\([deq][-+]\=\d\+\)\=\(_\a\w*\)\=\>"
 syn match fortranFloatIll	display	"\<\d\+\.\d\+\([dq][-+]\=\d\+\)\=\(_\a\w*\)\=\>"
 " floating point number
 syn match fortranFloat	display	"\<\d\+\.\d\+\(e[-+]\=\d\+\)\=\(_\a\w*\)\=\>"
+" binary number
+syn match fortranBinary	display	"b["'][01]\+["']"
+" octal number
+syn match fortranOctal	display	"o["'][0-7]\+["']"
+" hexadecimal number
+syn match fortranHex	display	"z["'][0-9A-F]\+["']"
 " Numbers in formats
 syn match fortranFormatSpec	display	"\d*f\d\+\.\d\+"
 syn match fortranFormatSpec	display	"\d*e[sn]\=\d\+\.\d\+\(e\d+\>\)\="
@@ -217,7 +222,6 @@ syn match fortranUnitHeader	"\<submodule\>"
 syn keyword fortranUnitHeader	use only contains
 syn keyword fortranUnitHeader	result operator assignment
 syn match fortranUnitHeader	"\<interface\>"
-syn match fortranUnitHeader	"\<recursive\>"
 syn keyword fortranKeyword	allocate deallocate nullify cycle exit
 syn match fortranConditional	"\<select\>"
 syn keyword fortranConditional	case default where elsewhere
@@ -276,6 +280,7 @@ syn keyword fortranIntrinsic	null cpu_time
 syn match fortranType			"\<elemental\>"
 syn match fortranType			"\<pure\>"
 syn match fortranType			"\<impure\>"
+syn match fortranType           	"\<recursive\>"
 if exists("fortran_more_precise")
   syn match fortranConstructName "\(\<end\s*forall\s\+\)\@15<=\a\w*\>"
 endif
@@ -455,6 +460,9 @@ hi def link fortranTodo		Todo
 hi def link fortranContinueMark	Special
 hi def link fortranString	String
 hi def link fortranNumber	Number
+hi def link fortranBinary	Number
+hi def link fortranOctal	Number
+hi def link fortranHex  	Number
 hi def link fortranOperator	Operator
 hi def link fortranBoolean	Boolean
 hi def link fortranLabelError	Error
diff --git a/syntax/julia.vim b/syntax/julia.vim
index be4f9680e..c2f36b7e3 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -76,7 +76,7 @@ syntax cluster juliaExpressions		contains=@juliaParItems,@juliaStringItems,@juli
 syntax cluster juliaExprsPrintf		contains=@juliaExpressions,@juliaPrintfItems
 
 syntax cluster juliaParItems		contains=juliaParBlock,juliaSqBraIdxBlock,juliaSqBraBlock,juliaCurBraBlock,juliaQuotedParBlock,juliaQuotedQMarkPar
-syntax cluster juliaKeywordItems	contains=juliaKeyword,juliaInfixKeyword,juliaRepKeyword,juliaTypedef
+syntax cluster juliaKeywordItems	contains=juliaKeyword,juliaImportLine,juliaInfixKeyword,juliaRepKeyword
 syntax cluster juliaBlocksItems		contains=juliaConditionalBlock,juliaWhileBlock,juliaForBlock,juliaBeginBlock,juliaFunctionBlock,juliaMacroBlock,juliaQuoteBlock,juliaTypeBlock,juliaImmutableBlock,juliaExceptionBlock,juliaLetBlock,juliaDoBlock,juliaModuleBlock,juliaStructBlock,juliaMutableStructBlock,juliaAbstractBlock,juliaPrimitiveBlock
 syntax cluster juliaTypesItems		contains=juliaBaseTypeBasic,juliaBaseTypeNum,juliaBaseTypeC,juliaBaseTypeError,juliaBaseTypeIter,juliaBaseTypeString,juliaBaseTypeArray,juliaBaseTypeDict,juliaBaseTypeSet,juliaBaseTypeIO,juliaBaseTypeProcess,juliaBaseTypeRange,juliaBaseTypeRegex,juliaBaseTypeFact,juliaBaseTypeFact,juliaBaseTypeSort,juliaBaseTypeRound,juliaBaseTypeSpecial,juliaBaseTypeRandom,juliaBaseTypeDisplay,juliaBaseTypeTime,juliaBaseTypeOther
 
@@ -126,8 +126,14 @@ syntax region  juliaSqBraIdxBlock	matchgroup=juliaParDelim start="\[" end="\]" c
 exec 'syntax region  juliaSqBraBlock	matchgroup=juliaParDelim start="\%(^\|\s\|' . s:operators . '\)\@'.s:d(3).'<=\[" end="\]" contains=@juliaExpressions,juliaComprehensionFor,juliaSymbolS,juliaQuotedParBlockS,juliaQuotedQMarkParS'
 syntax region  juliaCurBraBlock		matchgroup=juliaParDelim start="{" end="}" contains=@juliaExpressions
 
-exec 'syntax match   juliaKeyword		display "'.s:nodot.'\<\%(return\|local\|global\|import\%(all\)\?\|export\|using\|const\|where\)\>"'
+exec 'syntax match   juliaKeyword		display "'.s:nodot.'\<\%(return\|local\|global\|const\|where\)\>"'
 syntax match   juliaInfixKeyword	display "\%(=\s*\)\@<!\<\%(in\|isa\)\>\S\@!\%(\s*=\)\@!"
+
+" The import/export/using keywords introduce a sort of special parsing
+" environment with its own rules
+exec 'syntax region  juliaImportLine		matchgroup=juliaKeyword excludenl start="'.s:nodot.'\<\%(import\|using\|export\)\>" skip="\%(\%(\<\%(import\|using\|export\)\>\)\|^\)\@'.s:d(6).'<=$" end="$" end="\%([])}]\)\@=" contains=@juliaExpressions,juliaAsKeyword,@juliaContinuationItems,juliaMacroName'
+syntax match   juliaAsKeyword		display contained "\<as\>"
+
 exec 'syntax match   juliaRepKeyword		display "'.s:nodot.'\<\%(break\|continue\)\>"'
 exec 'syntax region  juliaConditionalBlock	matchgroup=juliaConditional start="'.s:nodot.'\<if\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaConditionalEIBlock,juliaConditionalEBlock fold'
 exec 'syntax region  juliaConditionalEIBlock	matchgroup=juliaConditional transparent contained start="'.s:nodot.'\<elseif\>" end="'.s:nodot.'\<\%(end\|else\|elseif\)\>"me=s-1 contains=@juliaExpressions,juliaConditionalEIBlock,juliaConditionalEBlock'
@@ -139,17 +145,16 @@ exec 'syntax region  juliaFunctionBlock	matchgroup=juliaBlKeyword start="'.s:nod
 exec 'syntax region  juliaMacroBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<macro\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaQuoteBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<quote\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaStructBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
-exec 'syntax region  juliaMutableStructBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<mutable struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
+exec 'syntax region  juliaMutableStructBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<mutable\s\+struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaLetBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<let\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaDoBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<do\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaModuleBlock		matchgroup=juliaBlKeyword start="\%(\%(\.\s*\)\@'.s:d(6).'<!\|\%(@\s*\.\s*\)\@'.s:d(6).'<=\)\<\%(bare\)\?module\>" end="\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaExceptionBlock	matchgroup=juliaException start="'.s:nodot.'\<try\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaCatchBlock,juliaFinallyBlock fold'
 exec 'syntax region  juliaCatchBlock		matchgroup=juliaException transparent contained start="'.s:nodot.'\<catch\>" end="'.s:nodot.'\<end\>"me=s-1 contains=@juliaExpressions,juliaFinallyBlock'
 exec 'syntax region  juliaFinallyBlock	matchgroup=juliaException transparent contained start="'.s:nodot.'\<finally\>" end="'.s:nodot.'\<end\>"me=s-1 contains=@juliaExpressions'
-exec 'syntax match   juliaTypedef		"'.s:nodot.'\<\%(abstract\|typealias\|bitstype\)\>"'
 " AbstractBlock needs to come after to take precedence
-exec 'syntax region  juliaAbstractBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<abstract type\>" end="'.s:nodot.'\<end\>" fold contains=@juliaExpressions'
-exec 'syntax region  juliaPrimitiveBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<primitive type\>" end="'.s:nodot.'\<end\>" fold contains=@juliaExpressions'
+exec 'syntax region  juliaAbstractBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<abstract\s\+type\>" end="'.s:nodot.'\<end\>" fold contains=@juliaExpressions'
+exec 'syntax region  juliaPrimitiveBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<primitive\s\+type\>" end="'.s:nodot.'\<end\>" fold contains=@juliaExpressions'
 
 exec 'syntax region  juliaComprehensionFor	matchgroup=juliaComprehensionFor transparent contained start="\%([^[:space:],;:({[]\_s*\)\@'.s:d(80).'<=\<for\>" end="\ze[]);]" contains=@juliaExpressions,juliaComprehensionIf,juliaComprehensionFor'
 exec 'syntax match   juliaComprehensionIf	contained "'.s:nodot.'\<if\>"'
@@ -275,7 +280,7 @@ syntax region  juliatextString		matchgroup=juliaStringDelim start=+\<text\z("\("
 syntax region  juliahtmlString		matchgroup=juliaStringDelim start=+\<html\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialCharsRaw
 syntax region  juliaint128String	matchgroup=juliaStringDelim start=+\<u\?int128\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialCharsRaw
 
-syntax region  juliaDocString		matchgroup=juliaDocStringDelim start=+^"""+ skip=+\%(\\\\\)*\\"+ end=+"""+ contains=@juliaStringVars,@juliaSpecialChars,@juliaSpellcheckDocStrings
+syntax region  juliaDocString		matchgroup=juliaDocStringDelim fold start=+^"""+ skip=+\%(\\\\\)*\\"+ end=+"""+ contains=@juliaStringVars,@juliaSpecialChars,@juliaSpellcheckDocStrings
 
 exec 'syntax region  juliaPrintfMacro		contained transparent start="@s\?printf(" end=")\@'.s:d(1).'<=" contains=juliaMacro,juliaPrintfParBlock'
 syntax region  juliaPrintfMacro		contained transparent start="@s\?printf\s\+" end="\ze\%([])};#]\|$\|\<for\>\)" contains=@juliaExprsPrintf,juliaMacro,juliaSymbolS,juliaQuotedParBlockS
@@ -333,13 +338,25 @@ exec 'syntax region   juliaQuotedParBlock	matchgroup=juliaQParDelim start="' . s
 exec 'syntax match    juliaQuotedQMarkPar	"' . s:quoting_colon . '(\s*?\s*)" contains=juliaQuotedQMark'
 exec 'syntax region   juliaQuotedParBlockS	matchgroup=juliaQParDelim contained start="' . s:quoting_colonS . '(" end=")" contains=@juliaExpressions'
 
+
 " force precedence over Symbols
 syntax match   juliaOperator		display "::"
 
-syntax region  juliaCommentL		matchgroup=juliaCommentDelim start="#\ze\%([^=]\|$\)" end="$" keepend contains=juliaTodo,@juliaSpellcheckComments
-syntax region  juliaCommentM		matchgroup=juliaCommentDelim start="#=\ze\%([^#]\|$\)" end="=#" contains=juliaTodo,juliaCommentM,@juliaSpellcheckComments
+syntax region  juliaCommentL		matchgroup=juliaCommentDelim excludenl start="#\ze\%([^=]\|$\)" end="$" contains=juliaTodo,juliaCommentM,@juliaSpellcheckComments
+syntax region  juliaCommentM		matchgroup=juliaCommentDelim fold start="#=\ze\%([^#]\|$\)" end="=#" contains=juliaTodo,juliaCommentM,@juliaSpellcheckComments
 syntax keyword juliaTodo		contained TODO FIXME XXX
 
+" detect an end-of-line with only whitespace or comments before it
+let s:eol = '\s*\%(\%(\%(#=\%(=#\@!\|[^=]\|\n\)\{-}=#\)\s*\)\+\)\?\%(#=\@!.*\)\?\n'
+
+" a trailing comma, or colon, or an empty line in an import/using/export
+" multi-line command. Used to recognize the as keyword, and for indentation
+" (this needs to take precedence over normal commas and colons, and comments)
+syntax cluster juliaContinuationItems	contains=juliaContinuationComma,juliaContinuationColon,juliaContinuationNone
+exec 'syntax region  juliaContinuationComma	matchgroup=juliaComma contained start=",\ze'.s:eol.'" end="\n\+\ze." contains=@juliaCommentItems'
+exec 'syntax region  juliaContinuationColon	matchgroup=juliaColon contained start=":\ze'.s:eol.'" end="\n\+\ze." contains=@juliaCommentItems'
+exec 'syntax region  juliaContinuationNone	matchgroup=NONE contained start="\%(\<\%(import\|using\|export\)\>\|^\)\@'.s:d(6).'<=\ze'.s:eol.'" end="\n\+\ze." contains=@juliaCommentItems,juliaAsKeyword'
+exec 'syntax match   juliaMacroName		"@' . s:idregex . '\%(\.' . s:idregex . '\)*"'
 
 " the following are disabled by default, but
 " can be enabled by entering e.g.
@@ -350,15 +367,17 @@ hi def link juliaComma			juliaNone
 
 hi def link juliaColon			juliaOperator
 
+hi def link juliaMacroName     		juliaMacro
+
 
 hi def link juliaKeyword		Keyword
 hi def link juliaInfixKeyword		Keyword
+hi def link juliaAsKeyword		Keyword
 hi def link juliaRepKeyword		Keyword
 hi def link juliaBlKeyword		Keyword
 hi def link juliaConditional		Conditional
 hi def link juliaRepeat			Repeat
 hi def link juliaException		Exception
-hi def link juliaTypedef		Keyword
 hi def link juliaOuter			Keyword
 hi def link juliaBaseTypeBasic		Type
 hi def link juliaBaseTypeNum		Type
diff --git a/syntax/less.vim b/syntax/less.vim
index 0b0c5373a..82feb4549 100644
--- a/syntax/less.vim
+++ b/syntax/less.vim
@@ -4,14 +4,13 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 " Language:	less
 " Maintainer:	Alessandro Vioni <jenoma@gmail.com>
 " URL: https://github.com/genoma/vim-less
-" Last Change:	2014 November 24
+" Last Change:	2020 Sep 29
 
 if exists("b:current_syntax")
   finish
 endif
 
 runtime! syntax/css.vim
-runtime! after/syntax/css.vim
 
 syn case ignore
 
diff --git a/syntax/qml.vim b/syntax/qml.vim
index 760a5deae..268c9f8e5 100644
--- a/syntax/qml.vim
+++ b/syntax/qml.vim
@@ -63,7 +63,7 @@ syn keyword qmlLabel             case default
 syn keyword qmlException         try catch finally throw
 syn keyword qmlMessage           alert confirm prompt status
 syn keyword qmlGlobal            self
-syn keyword qmlDeclaration       property signal readonly
+syn keyword qmlDeclaration       property signal component readonly required
 syn keyword qmlReserved          abstract boolean byte char class const debugger enum export extends final float goto implements import interface long native package pragma private protected public short static super synchronized throws transient volatile
 
 if get(g:, 'qml_fold', 0)

From 23d7b0931d41f1205bd284d81dc04ceb4c1615fb Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 16 Oct 2020 13:49:57 +0200
Subject: [PATCH 132/299] Use language names instead of filetype names

---
 README.md     | 288 +++++++++++++++++++++++++-------------------------
 scripts/build |  16 ++-
 2 files changed, 156 insertions(+), 148 deletions(-)

diff --git a/README.md b/README.md
index 8111f3c2e..6f95df140 100644
--- a/README.md
+++ b/README.md
@@ -44,159 +44,159 @@ If you need full functionality of any plugin, please use it directly with your p
 On top of all language packs from [vim repository](https://github.com/vim/vim/tree/master/runtime), vim-polyglot includes:
 
 <!--Language Packs-->
-- [acpiasl](https://github.com/martinlroth/vim-acpi-asl) (asl filetype)
-- [ansible](https://github.com/pearofducks/ansible-vim) (yaml.ansible filetype)
-- [apiblueprint](https://github.com/kylef/apiblueprint.vim) (apiblueprint filetype)
-- [applescript](https://github.com/mityu/vim-applescript) (applescript filetype)
-- [arduino](https://github.com/sudar/vim-arduino-syntax) (arduino filetype)
-- [asciidoc](https://github.com/asciidoc/vim-asciidoc) (asciidoc filetype)
-- [autohotkey](https://github.com/hnamikaw/vim-autohotkey) (autohotkey filetype)
-- [blade](https://github.com/jwalton512/vim-blade) (blade filetype)
-- [brewfile](https://github.com/bfontaine/Brewfile.vim) (brewfile filetype)
-- [c/c++](https://github.com/vim-jp/vim-cpp) (cpp,  and c filetypes)
-- [caddyfile](https://github.com/isobit/vim-caddyfile) (caddyfile filetype)
-- [carp](https://github.com/hellerve/carp-vim) (carp filetype)
+- [acpiasl](https://github.com/martinlroth/vim-acpi-asl)
+- [ansible](https://github.com/pearofducks/ansible-vim)
+- [apiblueprint](https://github.com/kylef/apiblueprint.vim) (API Blueprint syntax highlighting)
+- [applescript](https://github.com/mityu/vim-applescript) (AppleScript syntax highlighting)
+- [arduino](https://github.com/sudar/vim-arduino-syntax) (Processing syntax highlighting)
+- [asciidoc](https://github.com/asciidoc/vim-asciidoc) (AsciiDoc syntax highlighting)
+- [autohotkey](https://github.com/hnamikaw/vim-autohotkey) (AutoHotkey syntax highlighting)
+- [blade](https://github.com/jwalton512/vim-blade) (Blade syntax highlighting)
+- [brewfile](https://github.com/bfontaine/Brewfile.vim)
+- [c/c++](https://github.com/vim-jp/vim-cpp) (C++ and C syntax highlighting)
+- [caddyfile](https://github.com/isobit/vim-caddyfile)
+- [carp](https://github.com/hellerve/carp-vim)
 - [cjsx](https://github.com/mtscout6/vim-cjsx)
-- [clojure](https://github.com/guns/vim-clojure-static) (clojure filetype)
-- [cmake](https://github.com/pboettch/vim-cmake-syntax) (cmake filetype)
-- [coffee-script](https://github.com/kchmck/vim-coffee-script) (coffee, litcoffe and litcoffee filetypes)
+- [clojure](https://github.com/guns/vim-clojure-static) (Clojure syntax highlighting)
+- [cmake](https://github.com/pboettch/vim-cmake-syntax) (CMake syntax highlighting)
+- [coffee-script](https://github.com/kchmck/vim-coffee-script) (CoffeeScript and Literate CoffeeScript syntax highlighting)
 - [cpp-modern](https://github.com/bfrg/vim-cpp-modern)
-- [cql](https://github.com/elubow/cql-vim) (cql filetype)
-- [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim) (cryptol filetype)
-- [crystal](https://github.com/rhysd/vim-crystal) (crystal, ecrysta and ecrystal filetypes)
-- [csv](https://github.com/chrisbra/csv.vim) (csv filetype)
-- [cucumber](https://github.com/tpope/vim-cucumber) (cucumber filetype)
-- [cue](https://github.com/mgrabovsky/vim-cuesheet) (cuesheet filetype)
-- [dart](https://github.com/dart-lang/dart-vim-plugin) (dart filetype)
-- [dhall](https://github.com/vmchale/dhall-vim) (dhall filetype)
-- [dlang](https://github.com/JesseKPhillips/d.vim) (d, dcov, dd, ddoc, dsd and dsdl filetypes)
-- [dockerfile](https://github.com/ekalinin/Dockerfile.vim) (yaml.docker-compose filetype)
-- [elixir](https://github.com/elixir-lang/vim-elixir) (elixir, eelixi and eelixir filetypes)
-- [elm](https://github.com/andys8/vim-elm-syntax) (elm filetype)
-- [emberscript](https://github.com/yalesov/vim-ember-script) (ember-script filetype)
-- [emblem](https://github.com/yalesov/vim-emblem) (emblem filetype)
-- [erlang](https://github.com/vim-erlang/vim-erlang-runtime) (erlang filetype)
-- [fennel](https://github.com/bakpakin/fennel.vim) (fennel filetype)
-- [ferm](https://github.com/vim-scripts/ferm.vim) (ferm filetype)
-- [fish](https://github.com/georgewitteman/vim-fish) (fish filetype)
-- [flatbuffers](https://github.com/dcharbon/vim-flatbuffers) (fbs filetype)
-- [fsharp](https://github.com/ionide/Ionide-vim) (fsharp filetype)
-- [gdscript](https://github.com/calviken/vim-gdscript3) (gdscript3 filetype)
-- [git](https://github.com/tpope/vim-git) (gitconfig, gitrebase, gitsendemail, gitcommi and gitcommit filetypes)
-- [gitignore](https://github.com/fszymanski/fzf-gitignore) (gitignore filetype)
-- [glsl](https://github.com/tikhomirov/vim-glsl) (glsl filetype)
-- [gmpl](https://github.com/maelvalais/gmpl.vim) (gmpl filetype)
-- [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting) (gnuplot filetype)
-- [go](https://github.com/fatih/vim-go) (go, gomod, gohtmltmp and gohtmltmpl filetypes)
+- [cql](https://github.com/elubow/cql-vim)
+- [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim)
+- [crystal](https://github.com/rhysd/vim-crystal) (Crystal and HTML+ECR syntax highlighting)
+- [csv](https://github.com/chrisbra/csv.vim) (CSV syntax highlighting)
+- [cucumber](https://github.com/tpope/vim-cucumber) (Gherkin syntax highlighting)
+- [cue](https://github.com/mgrabovsky/vim-cuesheet)
+- [dart](https://github.com/dart-lang/dart-vim-plugin) (Dart syntax highlighting)
+- [dhall](https://github.com/vmchale/dhall-vim) (Dhall syntax highlighting)
+- [dlang](https://github.com/JesseKPhillips/d.vim) (D syntax highlighting)
+- [dockerfile](https://github.com/ekalinin/Dockerfile.vim)
+- [elixir](https://github.com/elixir-lang/vim-elixir) (Elixir and HTML+EEX syntax highlighting)
+- [elm](https://github.com/andys8/vim-elm-syntax) (Elm syntax highlighting)
+- [emberscript](https://github.com/yalesov/vim-ember-script) (EmberScript syntax highlighting)
+- [emblem](https://github.com/yalesov/vim-emblem)
+- [erlang](https://github.com/vim-erlang/vim-erlang-runtime) (Erlang syntax highlighting)
+- [fennel](https://github.com/bakpakin/fennel.vim)
+- [ferm](https://github.com/vim-scripts/ferm.vim)
+- [fish](https://github.com/georgewitteman/vim-fish) (fish syntax highlighting)
+- [flatbuffers](https://github.com/dcharbon/vim-flatbuffers)
+- [fsharp](https://github.com/ionide/Ionide-vim) (F# syntax highlighting)
+- [gdscript](https://github.com/calviken/vim-gdscript3) (GDScript syntax highlighting)
+- [git](https://github.com/tpope/vim-git) (Git Config syntax highlighting)
+- [gitignore](https://github.com/fszymanski/fzf-gitignore)
+- [glsl](https://github.com/tikhomirov/vim-glsl) (GLSL syntax highlighting)
+- [gmpl](https://github.com/maelvalais/gmpl.vim)
+- [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting) (Gnuplot syntax highlighting)
+- [go](https://github.com/fatih/vim-go) (Go syntax highlighting)
 - [gradle](https://github.com/tfnico/vim-gradle)
-- [graphql](https://github.com/jparise/vim-graphql) (graphql filetype)
-- [haml](https://github.com/tpope/vim-haml) (haml filetype)
-- [handlebars](https://github.com/mustache/vim-mustache-handlebars) (html.mustache, html.handlebar and html.handlebars filetypes)
-- [haproxy](https://github.com/CH-DanReif/haproxy.vim) (haproxy filetype)
-- [haskell](https://github.com/neovimhaskell/haskell-vim) (haskell filetype)
-- [haxe](https://github.com/yaymukund/vim-haxe) (haxe filetype)
-- [hcl](https://github.com/b4b4r07/vim-hcl) (hcl filetype)
-- [helm](https://github.com/towolf/vim-helm) (helm filetype)
-- [help](https://github.com/neovim/neovim/tree/master/runtime) (help filetype)
-- [hive](https://github.com/zebradil/hive.vim) (hive filetype)
+- [graphql](https://github.com/jparise/vim-graphql) (GraphQL syntax highlighting)
+- [haml](https://github.com/tpope/vim-haml) (Haml syntax highlighting)
+- [handlebars](https://github.com/mustache/vim-mustache-handlebars) (Mustache and Handlebars syntax highlighting)
+- [haproxy](https://github.com/CH-DanReif/haproxy.vim) (HAProxy syntax highlighting)
+- [haskell](https://github.com/neovimhaskell/haskell-vim) (Haskell syntax highlighting)
+- [haxe](https://github.com/yaymukund/vim-haxe) (Haxe syntax highlighting)
+- [hcl](https://github.com/b4b4r07/vim-hcl) (HCL syntax highlighting)
+- [helm](https://github.com/towolf/vim-helm)
+- [help](https://github.com/neovim/neovim/tree/master/runtime)
+- [hive](https://github.com/zebradil/hive.vim) (HiveQL syntax highlighting)
 - [html5](https://github.com/sheerun/html5.vim)
-- [i3](https://github.com/mboughaba/i3config.vim) (i3config filetype)
-- [icalendar](https://github.com/chutzpah/icalendar.vim) (icalendar filetype)
-- [idris2](https://github.com/edwinb/idris2-vim) (idris2, lidris and lidris2 filetypes)
-- [idris](https://github.com/idris-hackers/idris-vim) (idris filetype)
-- [ion](https://github.com/vmchale/ion-vim) (ion filetype)
+- [i3](https://github.com/mboughaba/i3config.vim)
+- [icalendar](https://github.com/chutzpah/icalendar.vim)
+- [idris2](https://github.com/edwinb/idris2-vim)
+- [idris](https://github.com/idris-hackers/idris-vim) (Idris syntax highlighting)
+- [ion](https://github.com/vmchale/ion-vim)
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
-- [javascript](https://github.com/pangloss/vim-javascript) (javascript, flo and flow filetypes)
-- [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax) (Jenkinsfile filetype)
-- [jq](https://github.com/vito-c/jq.vim) (jq filetype)
-- [json5](https://github.com/GutenYe/json5.vim) (json5 filetype)
-- [json](https://github.com/elzr/vim-json) (json filetype)
-- [jsonnet](https://github.com/google/vim-jsonnet) (jsonnet filetype)
-- [jst](https://github.com/briancollins/vim-jst) (jst filetype)
-- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (javascriptreact filetype)
-- [julia](https://github.com/JuliaEditorSupport/julia-vim) (julia filetype)
-- [kotlin](https://github.com/udalov/kotlin-vim) (kotlin filetype)
-- [ledger](https://github.com/ledger/vim-ledger) (ledger filetype)
-- [lilypond](https://github.com/anowlcalledjosh/vim-lilypond) (lilypond filetype)
-- [livescript](https://github.com/gkz/vim-ls) (livescript filetype)
-- [llvm](https://github.com/rhysd/vim-llvm) (llvm, tablege and tablegen filetypes)
-- [log](https://github.com/MTDL9/vim-log-highlighting) (log filetype)
-- [lua](https://github.com/tbastos/vim-lua) (lua filetype)
-- [mako](https://github.com/sophacles/vim-bundle-mako) (mako filetype)
-- [markdown](https://github.com/plasticboy/vim-markdown) (markdown filetype)
-- [mathematica](https://github.com/voldikss/vim-mma) (mma filetype)
-- [mdx](https://github.com/jxnblk/vim-mdx-js) (markdown.mdx filetype)
-- [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim) (meson, dosin and dosini filetypes)
-- [moonscript](https://github.com/leafo/moonscript-vim) (moon filetype)
-- [nginx](https://github.com/chr4/nginx.vim) (nginx filetype)
-- [nim](https://github.com/zah/nim.vim) (nim filetype)
-- [nix](https://github.com/LnL7/vim-nix) (nix filetype)
-- [objc](https://github.com/b4winckler/vim-objc) (objc filetype)
-- [ocaml](https://github.com/rgrinberg/vim-ocaml) (ocaml, omake, opam, oasis, dune, ocamlbuild_tags, ocpbuild, ocpbuildroot, sexpli and sexplib filetypes)
-- [octave](https://github.com/McSinyx/vim-octave) (octave filetype)
-- [odin](https://github.com/Tetralux/odin.vim) (odin filetype)
-- [opencl](https://github.com/petRUShka/vim-opencl) (opencl filetype)
-- [perl](https://github.com/vim-perl/vim-perl) (perl, pod, mason, tt2, tt2html, x and xs filetypes)
-- [pgsql](https://github.com/lifepillar/pgsql.vim) (sql filetype)
-- [php](https://github.com/StanAngeloff/php.vim) (php filetype)
-- [plantuml](https://github.com/aklt/plantuml-syntax) (plantuml filetype)
-- [pony](https://github.com/jakwings/vim-pony) (pony filetype)
-- [powershell](https://github.com/PProvost/vim-ps1) (ps1, ps1xm and ps1xml filetypes)
-- [protobuf](https://github.com/uarun/vim-protobuf) (proto filetype)
-- [pug](https://github.com/digitaltoad/vim-pug) (pug filetype)
-- [puppet](https://github.com/rodjek/vim-puppet) (puppet, embeddedpuppe and embeddedpuppet filetypes)
-- [purescript](https://github.com/purescript-contrib/purescript-vim) (purescript filetype)
+- [javascript](https://github.com/pangloss/vim-javascript) (JavaScript syntax highlighting)
+- [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax)
+- [jq](https://github.com/vito-c/jq.vim) (JSONiq syntax highlighting)
+- [json5](https://github.com/GutenYe/json5.vim) (JSON5 syntax highlighting)
+- [json](https://github.com/elzr/vim-json) (JSON syntax highlighting)
+- [jsonnet](https://github.com/google/vim-jsonnet) (Jsonnet syntax highlighting)
+- [jst](https://github.com/briancollins/vim-jst) (EJS syntax highlighting)
+- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (JSX syntax highlighting)
+- [julia](https://github.com/JuliaEditorSupport/julia-vim) (Julia syntax highlighting)
+- [kotlin](https://github.com/udalov/kotlin-vim) (Kotlin syntax highlighting)
+- [ledger](https://github.com/ledger/vim-ledger)
+- [lilypond](https://github.com/anowlcalledjosh/vim-lilypond) (LilyPond syntax highlighting)
+- [livescript](https://github.com/gkz/vim-ls) (LiveScript syntax highlighting)
+- [llvm](https://github.com/rhysd/vim-llvm) (LLVM syntax highlighting)
+- [log](https://github.com/MTDL9/vim-log-highlighting)
+- [lua](https://github.com/tbastos/vim-lua) (Lua syntax highlighting)
+- [mako](https://github.com/sophacles/vim-bundle-mako) (Mako syntax highlighting)
+- [markdown](https://github.com/plasticboy/vim-markdown) (Markdown syntax highlighting)
+- [mathematica](https://github.com/voldikss/vim-mma) (Mathematica syntax highlighting)
+- [mdx](https://github.com/jxnblk/vim-mdx-js)
+- [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim) (Meson syntax highlighting)
+- [moonscript](https://github.com/leafo/moonscript-vim) (MoonScript syntax highlighting)
+- [nginx](https://github.com/chr4/nginx.vim) (Nginx syntax highlighting)
+- [nim](https://github.com/zah/nim.vim) (Nim syntax highlighting)
+- [nix](https://github.com/LnL7/vim-nix) (Nix syntax highlighting)
+- [objc](https://github.com/b4winckler/vim-objc) (Objective-C syntax highlighting)
+- [ocaml](https://github.com/rgrinberg/vim-ocaml) (OCaml syntax highlighting)
+- [octave](https://github.com/McSinyx/vim-octave)
+- [odin](https://github.com/Tetralux/odin.vim) (Odin syntax highlighting)
+- [opencl](https://github.com/petRUShka/vim-opencl) (OpenCL syntax highlighting)
+- [perl](https://github.com/vim-perl/vim-perl) (Perl syntax highlighting)
+- [pgsql](https://github.com/lifepillar/pgsql.vim) (PLpgSQL syntax highlighting)
+- [php](https://github.com/StanAngeloff/php.vim) (PHP syntax highlighting)
+- [plantuml](https://github.com/aklt/plantuml-syntax) (PlantUML syntax highlighting)
+- [pony](https://github.com/jakwings/vim-pony) (Pony syntax highlighting)
+- [powershell](https://github.com/PProvost/vim-ps1) (PowerShell syntax highlighting)
+- [protobuf](https://github.com/uarun/vim-protobuf) (Protocol Buffer syntax highlighting)
+- [pug](https://github.com/digitaltoad/vim-pug) (Pug syntax highlighting)
+- [puppet](https://github.com/rodjek/vim-puppet) (Puppet syntax highlighting)
+- [purescript](https://github.com/purescript-contrib/purescript-vim) (PureScript syntax highlighting)
 - [python-compiler](https://github.com/aliev/vim-compiler-python)
 - [python-indent](https://github.com/Vimjas/vim-python-pep8-indent)
-- [python](https://github.com/vim-python/python-syntax) (python filetype)
-- [qmake](https://github.com/artoj/qmake-syntax-vim) (qmake filetype)
-- [qml](https://github.com/peterhoeg/vim-qml) (qml filetype)
-- [r-lang](https://github.com/vim-scripts/R.vim) (r, rhel and rhelp filetypes)
-- [racket](https://github.com/wlangstroth/vim-racket) (racket filetype)
-- [ragel](https://github.com/jneen/ragel.vim) (ragel filetype)
-- [raku](https://github.com/Raku/vim-raku) (raku filetype)
-- [raml](https://github.com/IN3D/vim-raml) (raml filetype)
-- [razor](https://github.com/adamclerk/vim-razor) (razor filetype)
-- [reason](https://github.com/reasonml-editor/vim-reason-plus) (reason filetype)
-- [requirements](https://github.com/raimon49/requirements.txt.vim) (requirements filetype)
-- [rspec](https://github.com/keith/rspec.vim) (ruby filetype)
-- [rst](https://github.com/marshallward/vim-restructuredtext) (rst filetype)
-- [ruby](https://github.com/vim-ruby/vim-ruby) (ruby, erub and eruby filetypes)
-- [rust](https://github.com/rust-lang/rust.vim) (rust filetype)
-- [scala](https://github.com/derekwyatt/vim-scala) (scala filetype)
-- [scss](https://github.com/cakebaker/scss-syntax.vim) (scss filetype)
-- [sh](https://github.com/arzg/vim-sh) (sh, zs and zsh filetypes)
-- [slim](https://github.com/slim-template/vim-slim) (slim filetype)
-- [slime](https://github.com/slime-lang/vim-slime-syntax) (slime filetype)
-- [smt2](https://github.com/bohlender/vim-smt2) (smt2 filetype)
-- [solidity](https://github.com/tomlion/vim-solidity) (solidity filetype)
-- [stylus](https://github.com/wavded/vim-stylus) (stylus filetype)
-- [svelte](https://github.com/evanleck/vim-svelte/tree/main) (svelte filetype)
+- [python](https://github.com/vim-python/python-syntax) (Python syntax highlighting)
+- [qmake](https://github.com/artoj/qmake-syntax-vim) (QMake syntax highlighting)
+- [qml](https://github.com/peterhoeg/vim-qml) (QML syntax highlighting)
+- [r-lang](https://github.com/vim-scripts/R.vim) (R syntax highlighting)
+- [racket](https://github.com/wlangstroth/vim-racket) (Racket syntax highlighting)
+- [ragel](https://github.com/jneen/ragel.vim) (Ragel syntax highlighting)
+- [raku](https://github.com/Raku/vim-raku) (Raku syntax highlighting)
+- [raml](https://github.com/IN3D/vim-raml) (RAML syntax highlighting)
+- [razor](https://github.com/adamclerk/vim-razor) (HTML+Razor syntax highlighting)
+- [reason](https://github.com/reasonml-editor/vim-reason-plus) (Reason syntax highlighting)
+- [requirements](https://github.com/raimon49/requirements.txt.vim)
+- [rspec](https://github.com/keith/rspec.vim)
+- [rst](https://github.com/marshallward/vim-restructuredtext) (reStructuredText syntax highlighting)
+- [ruby](https://github.com/vim-ruby/vim-ruby) (Ruby and HTML+ERB syntax highlighting)
+- [rust](https://github.com/rust-lang/rust.vim) (Rust syntax highlighting)
+- [scala](https://github.com/derekwyatt/vim-scala) (Scala syntax highlighting)
+- [scss](https://github.com/cakebaker/scss-syntax.vim) (SCSS syntax highlighting)
+- [sh](https://github.com/arzg/vim-sh) (Shell syntax highlighting)
+- [slim](https://github.com/slim-template/vim-slim) (Slim syntax highlighting)
+- [slime](https://github.com/slime-lang/vim-slime-syntax)
+- [smt2](https://github.com/bohlender/vim-smt2) (SMT syntax highlighting)
+- [solidity](https://github.com/tomlion/vim-solidity) (Solidity syntax highlighting)
+- [stylus](https://github.com/wavded/vim-stylus) (Stylus syntax highlighting)
+- [svelte](https://github.com/evanleck/vim-svelte/tree/main) (Svelte syntax highlighting)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
-- [svg](https://github.com/vim-scripts/svg.vim) (svg filetype)
-- [swift](https://github.com/keith/swift.vim) (swift filetype)
-- [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (sxhkdrc filetype)
-- [systemd](https://github.com/wgwoods/vim-systemd-syntax) (systemd filetype)
-- [textile](https://github.com/timcharper/textile.vim) (textile filetype)
-- [thrift](https://github.com/solarnz/thrift.vim) (thrift filetype)
-- [tmux](https://github.com/ericpruitt/tmux.vim/tree/master/vim) (tmux filetype)
-- [toml](https://github.com/cespare/vim-toml) (toml filetype)
-- [tptp](https://github.com/c-cube/vim-tptp) (tptp filetype)
-- [twig](https://github.com/lumiliet/vim-twig) (html.twig, xml.twi and xml.twig filetypes)
-- [typescript](https://github.com/HerringtonDarkholme/yats.vim) (typescript, typescriptreac and typescriptreact filetypes)
-- [unison](https://github.com/unisonweb/unison/tree/trunk/editor-support/vim) (unison filetype)
-- [v](https://github.com/ollykel/v-vim) (vlang filetype)
-- [vala](https://github.com/arrufat/vala.vim) (vala filetype)
-- [vbnet](https://github.com/vim-scripts/vbnet.vim) (vbnet filetype)
-- [vcl](https://github.com/smerrill/vcl-vim-plugin) (vcl filetype)
-- [velocity](https://github.com/lepture/vim-velocity) (velocity filetype)
-- [vue](https://github.com/posva/vim-vue) (vue filetype)
-- [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (xdc filetype)
-- [xml](https://github.com/amadeus/vim-xml) (xml filetype)
-- [xsl](https://github.com/vim-scripts/XSLT-syntax) (xsl filetype)
+- [svg](https://github.com/vim-scripts/svg.vim) (SVG syntax highlighting)
+- [swift](https://github.com/keith/swift.vim) (Swift syntax highlighting)
+- [sxhkd](https://github.com/baskerville/vim-sxhkdrc)
+- [systemd](https://github.com/wgwoods/vim-systemd-syntax)
+- [textile](https://github.com/timcharper/textile.vim) (Textile syntax highlighting)
+- [thrift](https://github.com/solarnz/thrift.vim) (Thrift syntax highlighting)
+- [tmux](https://github.com/ericpruitt/tmux.vim/tree/master/vim)
+- [toml](https://github.com/cespare/vim-toml) (TOML syntax highlighting)
+- [tptp](https://github.com/c-cube/vim-tptp)
+- [twig](https://github.com/lumiliet/vim-twig) (Twig syntax highlighting)
+- [typescript](https://github.com/HerringtonDarkholme/yats.vim) (TypeScript and TSX syntax highlighting)
+- [unison](https://github.com/unisonweb/unison/tree/trunk/editor-support/vim)
+- [v](https://github.com/ollykel/v-vim) (V syntax highlighting)
+- [vala](https://github.com/arrufat/vala.vim) (Vala syntax highlighting)
+- [vbnet](https://github.com/vim-scripts/vbnet.vim) (Visual Basic .NET syntax highlighting)
+- [vcl](https://github.com/smerrill/vcl-vim-plugin) (VCL syntax highlighting)
+- [velocity](https://github.com/lepture/vim-velocity)
+- [vue](https://github.com/posva/vim-vue) (Vue syntax highlighting)
+- [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)
+- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting)
+- [xsl](https://github.com/vim-scripts/XSLT-syntax) (XSLT syntax highlighting)
 - [yard](https://github.com/noprompt/vim-yardoc)
-- [zephir](https://github.com/xwsoul/vim-zephir) (zephir filetype)
-- [zig](https://github.com/ziglang/zig.vim) (zir, zi and zig filetypes)
+- [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting)
+- [zig](https://github.com/ziglang/zig.vim) (Zig syntax highlighting)
 - [zinit](https://github.com/zinit-zsh/zplugin-vim-syntax)
 <!--/Language Packs-->
 
diff --git a/scripts/build b/scripts/build
index c2e5d41a6..d117c3bd8 100755
--- a/scripts/build
+++ b/scripts/build
@@ -530,10 +530,10 @@ def extract(packages)
       output << "- [#{package["name"]}](https://github.com/#{repo})"
     end
 
-    if package["filetypes"].size > 1
-      output[-1] << " (#{package["filetypes"].map { |f| f["name"] }.join(", ")[0..-2]} and #{package["filetypes"].last["name"]} filetypes)"
-    elsif package["filetypes"].size > 0
-      output[-1] << " (#{package["filetypes"].first["name"]} filetype)"
+
+    langs = package["filetypes"].map { |f| f["linguist"] }.compact
+    if langs.size > 0
+      output[-1] << " (#{print_and(langs)} syntax highlighting)"
     end
 
     progress
@@ -554,6 +554,14 @@ def extract(packages)
   File.write('README.md', readme)
 end
 
+def print_and(list)
+  if list.size == 1
+    list[0]
+  else
+    list[0..-2].join(", ") + " and " + list[-1]
+  end
+end
+
 def generate_ftdetect(packages, heuristics)
   FileUtils.mkdir_p('autoload/polyglot')
 

From 8f9e5ac70b3492b1385ed01d832f51388d643275 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 16 Oct 2020 14:08:54 +0200
Subject: [PATCH 133/299] Add extensions to the readme

---
 README.md     | 268 +++++++++++++++++++++++++-------------------------
 scripts/build |  20 +++-
 2 files changed, 153 insertions(+), 135 deletions(-)

diff --git a/README.md b/README.md
index 6f95df140..a6bffae79 100644
--- a/README.md
+++ b/README.md
@@ -44,159 +44,159 @@ If you need full functionality of any plugin, please use it directly with your p
 On top of all language packs from [vim repository](https://github.com/vim/vim/tree/master/runtime), vim-polyglot includes:
 
 <!--Language Packs-->
-- [acpiasl](https://github.com/martinlroth/vim-acpi-asl)
+- [acpiasl](https://github.com/martinlroth/vim-acpi-asl) (Syntax highlighting for asl and dsl files)
 - [ansible](https://github.com/pearofducks/ansible-vim)
-- [apiblueprint](https://github.com/kylef/apiblueprint.vim) (API Blueprint syntax highlighting)
-- [applescript](https://github.com/mityu/vim-applescript) (AppleScript syntax highlighting)
-- [arduino](https://github.com/sudar/vim-arduino-syntax) (Processing syntax highlighting)
-- [asciidoc](https://github.com/asciidoc/vim-asciidoc) (AsciiDoc syntax highlighting)
-- [autohotkey](https://github.com/hnamikaw/vim-autohotkey) (AutoHotkey syntax highlighting)
-- [blade](https://github.com/jwalton512/vim-blade) (Blade syntax highlighting)
+- [apiblueprint](https://github.com/kylef/apiblueprint.vim) (API Blueprint syntax highlighting for apib files)
+- [applescript](https://github.com/mityu/vim-applescript) (AppleScript syntax highlighting for applescript and scpt files)
+- [arduino](https://github.com/sudar/vim-arduino-syntax) (Processing syntax highlighting for pde and ino files)
+- [asciidoc](https://github.com/asciidoc/vim-asciidoc) (AsciiDoc syntax highlighting for asciidoc, adoc and asc files)
+- [autohotkey](https://github.com/hnamikaw/vim-autohotkey) (AutoHotkey syntax highlighting for ahk and ahkl files)
+- [blade](https://github.com/jwalton512/vim-blade) (Blade syntax highlighting for blade and blade.php files)
 - [brewfile](https://github.com/bfontaine/Brewfile.vim)
-- [c/c++](https://github.com/vim-jp/vim-cpp) (C++ and C syntax highlighting)
+- [c/c++](https://github.com/vim-jp/vim-cpp) (C++ and C syntax highlighting for cpp, c++, cc, cp, cxx and 17 more files)
 - [caddyfile](https://github.com/isobit/vim-caddyfile)
-- [carp](https://github.com/hellerve/carp-vim)
+- [carp](https://github.com/hellerve/carp-vim) (Syntax highlighting for carp files)
 - [cjsx](https://github.com/mtscout6/vim-cjsx)
-- [clojure](https://github.com/guns/vim-clojure-static) (Clojure syntax highlighting)
-- [cmake](https://github.com/pboettch/vim-cmake-syntax) (CMake syntax highlighting)
-- [coffee-script](https://github.com/kchmck/vim-coffee-script) (CoffeeScript and Literate CoffeeScript syntax highlighting)
+- [clojure](https://github.com/guns/vim-clojure-static) (Clojure syntax highlighting for clj, boot, cl2, cljc, cljs, cljs.hl, cljscm, cljx, hic and edn files)
+- [cmake](https://github.com/pboettch/vim-cmake-syntax) (CMake syntax highlighting for cmake and cmake.in files)
+- [coffee-script](https://github.com/kchmck/vim-coffee-script) (CoffeeScript and Literate CoffeeScript syntax highlighting for coffee, cake, cjsx, iced, coffeekup, litcoffee and coffee.md files)
 - [cpp-modern](https://github.com/bfrg/vim-cpp-modern)
-- [cql](https://github.com/elubow/cql-vim)
-- [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim)
-- [crystal](https://github.com/rhysd/vim-crystal) (Crystal and HTML+ECR syntax highlighting)
-- [csv](https://github.com/chrisbra/csv.vim) (CSV syntax highlighting)
-- [cucumber](https://github.com/tpope/vim-cucumber) (Gherkin syntax highlighting)
-- [cue](https://github.com/mgrabovsky/vim-cuesheet)
-- [dart](https://github.com/dart-lang/dart-vim-plugin) (Dart syntax highlighting)
-- [dhall](https://github.com/vmchale/dhall-vim) (Dhall syntax highlighting)
-- [dlang](https://github.com/JesseKPhillips/d.vim) (D syntax highlighting)
+- [cql](https://github.com/elubow/cql-vim) (Syntax highlighting for cql files)
+- [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim) (Syntax highlighting for cry, cyl, lcry and lcyl files)
+- [crystal](https://github.com/rhysd/vim-crystal) (Crystal and HTML+ECR syntax highlighting for cr and ecr files)
+- [csv](https://github.com/chrisbra/csv.vim) (CSV syntax highlighting for csv, tsv and tab files)
+- [cucumber](https://github.com/tpope/vim-cucumber) (Gherkin syntax highlighting for feature and story files)
+- [cue](https://github.com/mgrabovsky/vim-cuesheet) (Syntax highlighting for cue files)
+- [dart](https://github.com/dart-lang/dart-vim-plugin) (Dart syntax highlighting for dart and drt files)
+- [dhall](https://github.com/vmchale/dhall-vim) (Dhall syntax highlighting for dhall files)
+- [dlang](https://github.com/JesseKPhillips/d.vim) (D syntax highlighting for d, di, lst, dd, ddoc and sdl files)
 - [dockerfile](https://github.com/ekalinin/Dockerfile.vim)
-- [elixir](https://github.com/elixir-lang/vim-elixir) (Elixir and HTML+EEX syntax highlighting)
-- [elm](https://github.com/andys8/vim-elm-syntax) (Elm syntax highlighting)
-- [emberscript](https://github.com/yalesov/vim-ember-script) (EmberScript syntax highlighting)
-- [emblem](https://github.com/yalesov/vim-emblem)
-- [erlang](https://github.com/vim-erlang/vim-erlang-runtime) (Erlang syntax highlighting)
-- [fennel](https://github.com/bakpakin/fennel.vim)
-- [ferm](https://github.com/vim-scripts/ferm.vim)
-- [fish](https://github.com/georgewitteman/vim-fish) (fish syntax highlighting)
-- [flatbuffers](https://github.com/dcharbon/vim-flatbuffers)
-- [fsharp](https://github.com/ionide/Ionide-vim) (F# syntax highlighting)
-- [gdscript](https://github.com/calviken/vim-gdscript3) (GDScript syntax highlighting)
-- [git](https://github.com/tpope/vim-git) (Git Config syntax highlighting)
+- [elixir](https://github.com/elixir-lang/vim-elixir) (Elixir and HTML+EEX syntax highlighting for ex, exs, eex and leex files)
+- [elm](https://github.com/andys8/vim-elm-syntax) (Elm syntax highlighting for elm files)
+- [emberscript](https://github.com/yalesov/vim-ember-script) (EmberScript syntax highlighting for em and emberscript files)
+- [emblem](https://github.com/yalesov/vim-emblem) (Syntax highlighting for emblem and em files)
+- [erlang](https://github.com/vim-erlang/vim-erlang-runtime) (Erlang syntax highlighting for erl, app.src, es, escript, hrl, xrl, yrl, app and yaws files)
+- [fennel](https://github.com/bakpakin/fennel.vim) (Syntax highlighting for fnl files)
+- [ferm](https://github.com/vim-scripts/ferm.vim) (Syntax highlighting for ferm files)
+- [fish](https://github.com/georgewitteman/vim-fish) (fish syntax highlighting for fish files)
+- [flatbuffers](https://github.com/dcharbon/vim-flatbuffers) (Syntax highlighting for fbs files)
+- [fsharp](https://github.com/ionide/Ionide-vim) (F# syntax highlighting for fs, fsi and fsx files)
+- [gdscript](https://github.com/calviken/vim-gdscript3) (GDScript syntax highlighting for gd files)
+- [git](https://github.com/tpope/vim-git) (Git Config syntax highlighting for gitconfig files)
 - [gitignore](https://github.com/fszymanski/fzf-gitignore)
-- [glsl](https://github.com/tikhomirov/vim-glsl) (GLSL syntax highlighting)
-- [gmpl](https://github.com/maelvalais/gmpl.vim)
-- [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting) (Gnuplot syntax highlighting)
-- [go](https://github.com/fatih/vim-go) (Go syntax highlighting)
+- [glsl](https://github.com/tikhomirov/vim-glsl) (GLSL syntax highlighting for glsl, fp, frag, frg, fs and 16 more files)
+- [gmpl](https://github.com/maelvalais/gmpl.vim) (Syntax highlighting for mod files)
+- [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting) (Gnuplot syntax highlighting for gp, gnu, gnuplot, p, plot, plt and gpi files)
+- [go](https://github.com/fatih/vim-go) (Go syntax highlighting for go and tmpl files)
 - [gradle](https://github.com/tfnico/vim-gradle)
-- [graphql](https://github.com/jparise/vim-graphql) (GraphQL syntax highlighting)
-- [haml](https://github.com/tpope/vim-haml) (Haml syntax highlighting)
-- [handlebars](https://github.com/mustache/vim-mustache-handlebars) (Mustache and Handlebars syntax highlighting)
+- [graphql](https://github.com/jparise/vim-graphql) (GraphQL syntax highlighting for graphql, gql and graphqls files)
+- [haml](https://github.com/tpope/vim-haml) (Haml syntax highlighting for haml, haml.deface, hamlc and hamlbars files)
+- [handlebars](https://github.com/mustache/vim-mustache-handlebars) (Mustache and Handlebars syntax highlighting for mustache, hogan, hulk, hjs, handlebars, hbs, hdbs and hb files)
 - [haproxy](https://github.com/CH-DanReif/haproxy.vim) (HAProxy syntax highlighting)
-- [haskell](https://github.com/neovimhaskell/haskell-vim) (Haskell syntax highlighting)
-- [haxe](https://github.com/yaymukund/vim-haxe) (Haxe syntax highlighting)
-- [hcl](https://github.com/b4b4r07/vim-hcl) (HCL syntax highlighting)
+- [haskell](https://github.com/neovimhaskell/haskell-vim) (Haskell syntax highlighting for hs, hs-boot, hsc, bpk and hsig files)
+- [haxe](https://github.com/yaymukund/vim-haxe) (Haxe syntax highlighting for hx and hxsl files)
+- [hcl](https://github.com/b4b4r07/vim-hcl) (HCL syntax highlighting for hcl, nomad and workflow files)
 - [helm](https://github.com/towolf/vim-helm)
 - [help](https://github.com/neovim/neovim/tree/master/runtime)
-- [hive](https://github.com/zebradil/hive.vim) (HiveQL syntax highlighting)
+- [hive](https://github.com/zebradil/hive.vim) (HiveQL syntax highlighting for q, hql and ql files)
 - [html5](https://github.com/sheerun/html5.vim)
-- [i3](https://github.com/mboughaba/i3config.vim)
-- [icalendar](https://github.com/chutzpah/icalendar.vim)
-- [idris2](https://github.com/edwinb/idris2-vim)
-- [idris](https://github.com/idris-hackers/idris-vim) (Idris syntax highlighting)
-- [ion](https://github.com/vmchale/ion-vim)
+- [i3](https://github.com/mboughaba/i3config.vim) (Syntax highlighting for i3.config and i3config files)
+- [icalendar](https://github.com/chutzpah/icalendar.vim) (Syntax highlighting for ics files)
+- [idris2](https://github.com/edwinb/idris2-vim) (Syntax highlighting for idr, ipkg and lidr files)
+- [idris](https://github.com/idris-hackers/idris-vim) (Idris syntax highlighting for idr and lidr files)
+- [ion](https://github.com/vmchale/ion-vim) (Syntax highlighting for ion files)
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
-- [javascript](https://github.com/pangloss/vim-javascript) (JavaScript syntax highlighting)
-- [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax)
-- [jq](https://github.com/vito-c/jq.vim) (JSONiq syntax highlighting)
-- [json5](https://github.com/GutenYe/json5.vim) (JSON5 syntax highlighting)
-- [json](https://github.com/elzr/vim-json) (JSON syntax highlighting)
-- [jsonnet](https://github.com/google/vim-jsonnet) (Jsonnet syntax highlighting)
-- [jst](https://github.com/briancollins/vim-jst) (EJS syntax highlighting)
-- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (JSX syntax highlighting)
-- [julia](https://github.com/JuliaEditorSupport/julia-vim) (Julia syntax highlighting)
-- [kotlin](https://github.com/udalov/kotlin-vim) (Kotlin syntax highlighting)
-- [ledger](https://github.com/ledger/vim-ledger)
-- [lilypond](https://github.com/anowlcalledjosh/vim-lilypond) (LilyPond syntax highlighting)
-- [livescript](https://github.com/gkz/vim-ls) (LiveScript syntax highlighting)
-- [llvm](https://github.com/rhysd/vim-llvm) (LLVM syntax highlighting)
-- [log](https://github.com/MTDL9/vim-log-highlighting)
-- [lua](https://github.com/tbastos/vim-lua) (Lua syntax highlighting)
-- [mako](https://github.com/sophacles/vim-bundle-mako) (Mako syntax highlighting)
-- [markdown](https://github.com/plasticboy/vim-markdown) (Markdown syntax highlighting)
-- [mathematica](https://github.com/voldikss/vim-mma) (Mathematica syntax highlighting)
-- [mdx](https://github.com/jxnblk/vim-mdx-js)
-- [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim) (Meson syntax highlighting)
-- [moonscript](https://github.com/leafo/moonscript-vim) (MoonScript syntax highlighting)
-- [nginx](https://github.com/chr4/nginx.vim) (Nginx syntax highlighting)
-- [nim](https://github.com/zah/nim.vim) (Nim syntax highlighting)
-- [nix](https://github.com/LnL7/vim-nix) (Nix syntax highlighting)
-- [objc](https://github.com/b4winckler/vim-objc) (Objective-C syntax highlighting)
-- [ocaml](https://github.com/rgrinberg/vim-ocaml) (OCaml syntax highlighting)
-- [octave](https://github.com/McSinyx/vim-octave)
-- [odin](https://github.com/Tetralux/odin.vim) (Odin syntax highlighting)
-- [opencl](https://github.com/petRUShka/vim-opencl) (OpenCL syntax highlighting)
-- [perl](https://github.com/vim-perl/vim-perl) (Perl syntax highlighting)
-- [pgsql](https://github.com/lifepillar/pgsql.vim) (PLpgSQL syntax highlighting)
-- [php](https://github.com/StanAngeloff/php.vim) (PHP syntax highlighting)
-- [plantuml](https://github.com/aklt/plantuml-syntax) (PlantUML syntax highlighting)
-- [pony](https://github.com/jakwings/vim-pony) (Pony syntax highlighting)
-- [powershell](https://github.com/PProvost/vim-ps1) (PowerShell syntax highlighting)
-- [protobuf](https://github.com/uarun/vim-protobuf) (Protocol Buffer syntax highlighting)
-- [pug](https://github.com/digitaltoad/vim-pug) (Pug syntax highlighting)
-- [puppet](https://github.com/rodjek/vim-puppet) (Puppet syntax highlighting)
-- [purescript](https://github.com/purescript-contrib/purescript-vim) (PureScript syntax highlighting)
+- [javascript](https://github.com/pangloss/vim-javascript) (JavaScript syntax highlighting for js, bones, cjs, es, es6 and 17 more files)
+- [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax) (Syntax highlighting for jenkinsfile and Jenkinsfile files)
+- [jq](https://github.com/vito-c/jq.vim) (JSONiq syntax highlighting for jq files)
+- [json5](https://github.com/GutenYe/json5.vim) (JSON5 syntax highlighting for json5 files)
+- [json](https://github.com/elzr/vim-json) (JSON syntax highlighting for json, avsc, geojson, gltf, har and 13 more files)
+- [jsonnet](https://github.com/google/vim-jsonnet) (Jsonnet syntax highlighting for jsonnet and libsonnet files)
+- [jst](https://github.com/briancollins/vim-jst) (EJS syntax highlighting for ejs, ect and jst files)
+- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (JSX syntax highlighting for jsx files)
+- [julia](https://github.com/JuliaEditorSupport/julia-vim) (Julia syntax highlighting for jl files)
+- [kotlin](https://github.com/udalov/kotlin-vim) (Kotlin syntax highlighting for kt, ktm and kts files)
+- [ledger](https://github.com/ledger/vim-ledger) (Syntax highlighting for ldg, ledger and journal files)
+- [lilypond](https://github.com/anowlcalledjosh/vim-lilypond) (LilyPond syntax highlighting for ly and ily files)
+- [livescript](https://github.com/gkz/vim-ls) (LiveScript syntax highlighting for ls files)
+- [llvm](https://github.com/rhysd/vim-llvm) (LLVM syntax highlighting for ll and td files)
+- [log](https://github.com/MTDL9/vim-log-highlighting) (Syntax highlighting for log and LOG files)
+- [lua](https://github.com/tbastos/vim-lua) (Lua syntax highlighting for lua, fcgi, nse, p8, rbxs, rockspec and wlua files)
+- [mako](https://github.com/sophacles/vim-bundle-mako) (Mako syntax highlighting for mako and mao files)
+- [markdown](https://github.com/plasticboy/vim-markdown) (Markdown syntax highlighting for md, markdown, mdown, mdwn, mkd, mkdn, mkdown, ronn and workbook files)
+- [mathematica](https://github.com/voldikss/vim-mma) (Mathematica syntax highlighting for mathematica, cdf, m, ma, mt and 6 more files)
+- [mdx](https://github.com/jxnblk/vim-mdx-js) (Syntax highlighting for mdx files)
+- [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim) (Meson syntax highlighting for wrap files)
+- [moonscript](https://github.com/leafo/moonscript-vim) (MoonScript syntax highlighting for moon files)
+- [nginx](https://github.com/chr4/nginx.vim) (Nginx syntax highlighting for nginx, nginxconf and vhost files)
+- [nim](https://github.com/zah/nim.vim) (Nim syntax highlighting for nim, nim.cfg, nimble, nimrod and nims files)
+- [nix](https://github.com/LnL7/vim-nix) (Nix syntax highlighting for nix files)
+- [objc](https://github.com/b4winckler/vim-objc) (Objective-C syntax highlighting for m and h files)
+- [ocaml](https://github.com/rgrinberg/vim-ocaml) (OCaml syntax highlighting for ml, eliom, eliomi, ml4, mli and 13 more files)
+- [octave](https://github.com/McSinyx/vim-octave) (Syntax highlighting for oct and m files)
+- [odin](https://github.com/Tetralux/odin.vim) (Odin syntax highlighting for odin files)
+- [opencl](https://github.com/petRUShka/vim-opencl) (OpenCL syntax highlighting for cl and opencl files)
+- [perl](https://github.com/vim-perl/vim-perl) (Perl syntax highlighting for pl, al, cgi, fcgi, perl and 12 more files)
+- [pgsql](https://github.com/lifepillar/pgsql.vim) (PLpgSQL syntax highlighting for pgsql files)
+- [php](https://github.com/StanAngeloff/php.vim) (PHP syntax highlighting for php, aw, ctp, fcgi, inc and 6 more files)
+- [plantuml](https://github.com/aklt/plantuml-syntax) (PlantUML syntax highlighting for puml, iuml, plantuml, uml and pu files)
+- [pony](https://github.com/jakwings/vim-pony) (Pony syntax highlighting for pony files)
+- [powershell](https://github.com/PProvost/vim-ps1) (PowerShell syntax highlighting for ps1, psd1, psm1, pssc and ps1xml files)
+- [protobuf](https://github.com/uarun/vim-protobuf) (Protocol Buffer syntax highlighting for proto files)
+- [pug](https://github.com/digitaltoad/vim-pug) (Pug syntax highlighting for jade and pug files)
+- [puppet](https://github.com/rodjek/vim-puppet) (Puppet syntax highlighting for pp and epp files)
+- [purescript](https://github.com/purescript-contrib/purescript-vim) (PureScript syntax highlighting for purs files)
 - [python-compiler](https://github.com/aliev/vim-compiler-python)
 - [python-indent](https://github.com/Vimjas/vim-python-pep8-indent)
-- [python](https://github.com/vim-python/python-syntax) (Python syntax highlighting)
-- [qmake](https://github.com/artoj/qmake-syntax-vim) (QMake syntax highlighting)
-- [qml](https://github.com/peterhoeg/vim-qml) (QML syntax highlighting)
-- [r-lang](https://github.com/vim-scripts/R.vim) (R syntax highlighting)
-- [racket](https://github.com/wlangstroth/vim-racket) (Racket syntax highlighting)
-- [ragel](https://github.com/jneen/ragel.vim) (Ragel syntax highlighting)
-- [raku](https://github.com/Raku/vim-raku) (Raku syntax highlighting)
-- [raml](https://github.com/IN3D/vim-raml) (RAML syntax highlighting)
-- [razor](https://github.com/adamclerk/vim-razor) (HTML+Razor syntax highlighting)
-- [reason](https://github.com/reasonml-editor/vim-reason-plus) (Reason syntax highlighting)
-- [requirements](https://github.com/raimon49/requirements.txt.vim)
+- [python](https://github.com/vim-python/python-syntax) (Python syntax highlighting for py, cgi, fcgi, gyp, gypi and 14 more files)
+- [qmake](https://github.com/artoj/qmake-syntax-vim) (QMake syntax highlighting for pro and pri files)
+- [qml](https://github.com/peterhoeg/vim-qml) (QML syntax highlighting for qml and qbs files)
+- [r-lang](https://github.com/vim-scripts/R.vim) (R syntax highlighting for r, rsx, s, S and rd files)
+- [racket](https://github.com/wlangstroth/vim-racket) (Racket syntax highlighting for rkt, rktd, rktl and scrbl files)
+- [ragel](https://github.com/jneen/ragel.vim) (Ragel syntax highlighting for rl files)
+- [raku](https://github.com/Raku/vim-raku) (Raku syntax highlighting for 6pl, 6pm, nqp, p6, p6l and 12 more files)
+- [raml](https://github.com/IN3D/vim-raml) (RAML syntax highlighting for raml files)
+- [razor](https://github.com/adamclerk/vim-razor) (HTML+Razor syntax highlighting for cshtml and razor files)
+- [reason](https://github.com/reasonml-editor/vim-reason-plus) (Reason syntax highlighting for re and rei files)
+- [requirements](https://github.com/raimon49/requirements.txt.vim) (Syntax highlighting for pip files)
 - [rspec](https://github.com/keith/rspec.vim)
-- [rst](https://github.com/marshallward/vim-restructuredtext) (reStructuredText syntax highlighting)
-- [ruby](https://github.com/vim-ruby/vim-ruby) (Ruby and HTML+ERB syntax highlighting)
-- [rust](https://github.com/rust-lang/rust.vim) (Rust syntax highlighting)
-- [scala](https://github.com/derekwyatt/vim-scala) (Scala syntax highlighting)
-- [scss](https://github.com/cakebaker/scss-syntax.vim) (SCSS syntax highlighting)
-- [sh](https://github.com/arzg/vim-sh) (Shell syntax highlighting)
-- [slim](https://github.com/slim-template/vim-slim) (Slim syntax highlighting)
-- [slime](https://github.com/slime-lang/vim-slime-syntax)
-- [smt2](https://github.com/bohlender/vim-smt2) (SMT syntax highlighting)
-- [solidity](https://github.com/tomlion/vim-solidity) (Solidity syntax highlighting)
-- [stylus](https://github.com/wavded/vim-stylus) (Stylus syntax highlighting)
-- [svelte](https://github.com/evanleck/vim-svelte/tree/main) (Svelte syntax highlighting)
+- [rst](https://github.com/marshallward/vim-restructuredtext) (reStructuredText syntax highlighting for rst, rest, rest.txt and rst.txt files)
+- [ruby](https://github.com/vim-ruby/vim-ruby) (Ruby and HTML+ERB syntax highlighting for rb, builder, eye, fcgi, gemspec and 25 more files)
+- [rust](https://github.com/rust-lang/rust.vim) (Rust syntax highlighting for rs and rs.in files)
+- [scala](https://github.com/derekwyatt/vim-scala) (Scala syntax highlighting for scala, kojo and sc files)
+- [scss](https://github.com/cakebaker/scss-syntax.vim) (SCSS syntax highlighting for scss files)
+- [sh](https://github.com/arzg/vim-sh) (Shell syntax highlighting for sh, bash, bats, cgi, command and 7 more files)
+- [slim](https://github.com/slim-template/vim-slim) (Slim syntax highlighting for slim files)
+- [slime](https://github.com/slime-lang/vim-slime-syntax) (Syntax highlighting for slime files)
+- [smt2](https://github.com/bohlender/vim-smt2) (SMT syntax highlighting for smt2 and smt files)
+- [solidity](https://github.com/tomlion/vim-solidity) (Solidity syntax highlighting for sol files)
+- [stylus](https://github.com/wavded/vim-stylus) (Stylus syntax highlighting for styl and stylus files)
+- [svelte](https://github.com/evanleck/vim-svelte/tree/main) (Svelte syntax highlighting for svelte files)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
-- [svg](https://github.com/vim-scripts/svg.vim) (SVG syntax highlighting)
-- [swift](https://github.com/keith/swift.vim) (Swift syntax highlighting)
-- [sxhkd](https://github.com/baskerville/vim-sxhkdrc)
-- [systemd](https://github.com/wgwoods/vim-systemd-syntax)
-- [textile](https://github.com/timcharper/textile.vim) (Textile syntax highlighting)
-- [thrift](https://github.com/solarnz/thrift.vim) (Thrift syntax highlighting)
+- [svg](https://github.com/vim-scripts/svg.vim) (SVG syntax highlighting for svg files)
+- [swift](https://github.com/keith/swift.vim) (Swift syntax highlighting for swift files)
+- [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (Syntax highlighting for sxhkdrc files)
+- [systemd](https://github.com/wgwoods/vim-systemd-syntax) (Syntax highlighting for automount, dnssd, link, mount, netdev and 9 more files)
+- [textile](https://github.com/timcharper/textile.vim) (Textile syntax highlighting for textile files)
+- [thrift](https://github.com/solarnz/thrift.vim) (Thrift syntax highlighting for thrift files)
 - [tmux](https://github.com/ericpruitt/tmux.vim/tree/master/vim)
-- [toml](https://github.com/cespare/vim-toml) (TOML syntax highlighting)
-- [tptp](https://github.com/c-cube/vim-tptp)
-- [twig](https://github.com/lumiliet/vim-twig) (Twig syntax highlighting)
-- [typescript](https://github.com/HerringtonDarkholme/yats.vim) (TypeScript and TSX syntax highlighting)
-- [unison](https://github.com/unisonweb/unison/tree/trunk/editor-support/vim)
-- [v](https://github.com/ollykel/v-vim) (V syntax highlighting)
-- [vala](https://github.com/arrufat/vala.vim) (Vala syntax highlighting)
-- [vbnet](https://github.com/vim-scripts/vbnet.vim) (Visual Basic .NET syntax highlighting)
-- [vcl](https://github.com/smerrill/vcl-vim-plugin) (VCL syntax highlighting)
-- [velocity](https://github.com/lepture/vim-velocity)
-- [vue](https://github.com/posva/vim-vue) (Vue syntax highlighting)
-- [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)
-- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting)
-- [xsl](https://github.com/vim-scripts/XSLT-syntax) (XSLT syntax highlighting)
+- [toml](https://github.com/cespare/vim-toml) (TOML syntax highlighting for toml files)
+- [tptp](https://github.com/c-cube/vim-tptp) (Syntax highlighting for p, tptp and ax files)
+- [twig](https://github.com/lumiliet/vim-twig) (Twig syntax highlighting for twig and xml.twig files)
+- [typescript](https://github.com/HerringtonDarkholme/yats.vim) (TypeScript and TSX syntax highlighting for ts and tsx files)
+- [unison](https://github.com/unisonweb/unison/tree/trunk/editor-support/vim) (Syntax highlighting for u and uu files)
+- [v](https://github.com/ollykel/v-vim) (V syntax highlighting for v, vv and vsh files)
+- [vala](https://github.com/arrufat/vala.vim) (Vala syntax highlighting for vala, vapi and valadoc files)
+- [vbnet](https://github.com/vim-scripts/vbnet.vim) (Visual Basic .NET syntax highlighting for vb and vbhtml files)
+- [vcl](https://github.com/smerrill/vcl-vim-plugin) (VCL syntax highlighting for vcl files)
+- [velocity](https://github.com/lepture/vim-velocity) (Syntax highlighting for vm files)
+- [vue](https://github.com/posva/vim-vue) (Vue syntax highlighting for vue and wpy files)
+- [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (Syntax highlighting for xdc files)
+- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 93 more files)
+- [xsl](https://github.com/vim-scripts/XSLT-syntax) (XSLT syntax highlighting for xslt and xsl files)
 - [yard](https://github.com/noprompt/vim-yardoc)
-- [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting)
-- [zig](https://github.com/ziglang/zig.vim) (Zig syntax highlighting)
+- [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting for zep files)
+- [zig](https://github.com/ziglang/zig.vim) (Zig syntax highlighting for zir, zig and zir files)
 - [zinit](https://github.com/zinit-zsh/zplugin-vim-syntax)
 <!--/Language Packs-->
 
diff --git a/scripts/build b/scripts/build
index d117c3bd8..1d5620b51 100755
--- a/scripts/build
+++ b/scripts/build
@@ -531,11 +531,27 @@ def extract(packages)
     end
 
 
+    names = nil
     langs = package["filetypes"].map { |f| f["linguist"] }.compact
     if langs.size > 0
-      output[-1] << " (#{print_and(langs)} syntax highlighting)"
+      names = print_and(langs)
     end
 
+    files = nil
+    extensions = package["filetypes"].flat_map { |f| f["extensions"].reject { |e| e.match?(/_/) } }.compact
+    if extensions.size > 0
+      files = print_and(extensions)
+    end
+
+    if names && files
+      output[-1] << " (#{names} syntax highlighting for #{files} files)"
+    elsif names
+      output[-1] << " (#{names} syntax highlighting)"
+    elsif files
+      output[-1] << " (Syntax highlighting for #{files} files)"
+    end
+
+
     progress
   end
 
@@ -557,6 +573,8 @@ end
 def print_and(list)
   if list.size == 1
     list[0]
+  elsif list.size > 10
+    list[0...5].join(", ") + " and #{list.size - 5} more"
   else
     list[0..-2].join(", ") + " and " + list[-1]
   end

From 3383046210d81ab38096238dd480f34cfffe1c4e Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 16 Oct 2020 20:15:30 +0200
Subject: [PATCH 134/299] Handle most warnings

---
 ftdetect/polyglot.vim | 1448 +----------------------------------------
 1 file changed, 3 insertions(+), 1445 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index c98c27d72..c91d1d13a 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2840,8 +2840,6 @@ if !exists("g:ft_ignore_pat")
   let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|zip\|tgz\)$'
 endif
 
-" Batch file for MSDOS.
-au BufNewFile,BufRead *.bat,*.sys		setf dosbatch
 " *.cmd is close to a Batch file, but on OS/2 Rexx files also use *.cmd.
 au BufNewFile,BufRead *.cmd
 	\ if getline(1) =~ '^/\*' | setf rexx | else | setf dosbatch | endif
@@ -2849,116 +2847,18 @@ au BufNewFile,BufRead *.cmd
 " Batch file for 4DOS
 au BufNewFile,BufRead *.btm			call polyglot#ft#FTbtm()
 
-" BC calculator
-au BufNewFile,BufRead *.bc			setf bc
-
-" BDF font
-au BufNewFile,BufRead *.bdf			setf bdf
-
-" BibTeX bibliography database file
-au BufNewFile,BufRead *.bib			setf bib
-
-" BibTeX Bibliography Style
-au BufNewFile,BufRead *.bst			setf bst
-
-" BIND configuration
-" sudoedit uses namedXXXX.conf
-au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key	setf named
-
 " BIND zone
-au BufNewFile,BufRead named.root		setf bindzone
 au BufNewFile,BufRead *.db			call polyglot#ft#BindzoneCheck('')
 
-" Blank
-au BufNewFile,BufRead *.bl			setf blank
-
-" Blkid cache file
-au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old   setf xml
-
-" BSDL
-au BufNewFile,BufRead *bsd,*.bsdl		setf bsdl
-
-" Bazel (http://bazel.io)
-autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE	setf bzl
-if has("fname_case")
-  " There is another check for BUILD further below.
-  autocmd BufRead,BufNewFile *.BUILD,BUILD		setf bzl
-endif
-
 " C or lpc
 au BufNewFile,BufRead *.c			call polyglot#ft#FTlpc()
-au BufNewFile,BufRead *.lpc,*.ulpc		setf lpc
-
-" Calendar
-au BufNewFile,BufRead calendar			setf calendar
-
-" C#
-au BufNewFile,BufRead *.cs			setf cs
-
-" CSDL
-au BufNewFile,BufRead *.csdl			setf csdl
-
-" Cabal
-au BufNewFile,BufRead *.cabal			setf cabal
-
-" Cdrdao TOC
-au BufNewFile,BufRead *.toc			setf cdrtoc
-
-" Cdrdao config
-au BufNewFile,BufRead */etc/cdrdao.conf,*/etc/defaults/cdrdao,*/etc/default/cdrdao,.cdrdao	setf cdrdaoconf
-
-" Cfengine
-au BufNewFile,BufRead cfengine.conf		setf cfengine
-
-" ChaiScript
-au BufRead,BufNewFile *.chai			setf chaiscript
-
-" Comshare Dimension Definition Language
-au BufNewFile,BufRead *.cdl			setf cdl
-
-" Conary Recipe
-au BufNewFile,BufRead *.recipe			setf conaryrecipe
-
-" Controllable Regex Mutilator
-au BufNewFile,BufRead *.crm			setf crm
-
-" Cyn++
-au BufNewFile,BufRead *.cyn			setf cynpp
 
 " Cynlib
 " .cc and .cpp files can be C++ or Cynlib.
-au BufNewFile,BufRead *.cc
-	\ if exists("cynlib_syntax_for_cc")|setf cynlib|else|setf cpp|endif
-au BufNewFile,BufRead *.cpp
-	\ if exists("cynlib_syntax_for_cpp")|setf cynlib|else|setf cpp|endif
+au BufNewFile,BufRead *.cpp if exists("cynlib_syntax_for_cpp")|setf cynlib|else|setf cpp|endif
 
-" C++
-au BufNewFile,BufRead *.cxx,*.c++,*.hh,*.hxx,*.hpp,*.ipp,*.moc,*.tcc,*.inl setf cpp
-if has("fname_case")
-  au BufNewFile,BufRead *.C,*.H setf cpp
-endif
-
-" .h files can be C, Ch C++, ObjC or ObjC++.
-" Set c_syntax_for_h if you want C, ch_syntax_for_h if you want Ch. ObjC is
-" detected automatically.
 au BufNewFile,BufRead *.h			call polyglot#ft#FTheader()
 
-" Ch (CHscript)
-au BufNewFile,BufRead *.chf			setf ch
-
-" TLH files are C++ headers generated by Visual C++'s #import from typelibs
-au BufNewFile,BufRead *.tlh			setf cpp
-
-" Cascading Style Sheets
-au BufNewFile,BufRead *.css			setf css
-
-" Century Term Command Scripts (*.cmd too)
-au BufNewFile,BufRead *.con			setf cterm
-
-" Changelog
-au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch,*/debian/changelog
-					\	setf debchangelog
-
 au BufNewFile,BufRead [cC]hange[lL]og
 	\  if getline(1) =~ '; urgency='
 	\|   setf debchangelog
@@ -2971,21 +2871,9 @@ au BufNewFile,BufRead NEWS
 	\|   setf debchangelog
 	\| endif
 
-" CHILL
-au BufNewFile,BufRead *..ch			setf chill
-
 " Changes for WEB and CWEB or CHILL
 au BufNewFile,BufRead *.ch			call polyglot#ft#FTchange()
 
-" ChordPro
-au BufNewFile,BufRead *.chopro,*.crd,*.cho,*.crdpro,*.chordpro	setf chordpro
-
-" Clean
-au BufNewFile,BufRead *.dcl,*.icl		setf clean
-
-" Clever
-au BufNewFile,BufRead *.eni			setf cl
-
 " Clever or dtd
 au BufNewFile,BufRead *.ent			call polyglot#ft#FTent()
 
@@ -2997,19 +2885,6 @@ au BufNewFile,BufRead *.prg
 	\   setf clipper |
 	\ endif
 
-" Clojure
-au BufNewFile,BufRead *.clj,*.cljs,*.cljx,*.cljc		setf clojure
-
-" Cmake
-au BufNewFile,BufRead CMakeLists.txt,*.cmake,*.cmake.in		setf cmake
-
-" Cmusrc
-au BufNewFile,BufRead */.cmus/{autosave,rc,command-history,*.theme} setf cmusrc
-au BufNewFile,BufRead */cmus/{rc,*.theme}			setf cmusrc
-
-" Cobol
-au BufNewFile,BufRead *.cbl,*.cob,*.lib	setf cobol
-"   cobol or zope form controller python script? (heuristic)
 au BufNewFile,BufRead *.cpy
 	\ if getline(1) =~ '^##' |
 	\   setf python |
@@ -3017,103 +2892,25 @@ au BufNewFile,BufRead *.cpy
 	\   setf cobol |
 	\ endif
 
-" Coco/R
-au BufNewFile,BufRead *.atg			setf coco
-
-" Cold Fusion
-au BufNewFile,BufRead *.cfm,*.cfi,*.cfc		setf cf
-
-" Configure scripts
-au BufNewFile,BufRead configure.in,configure.ac setf config
-
-" CUDA  Cumpute Unified Device Architecture
-au BufNewFile,BufRead *.cu,*.cuh		setf cuda
-
-" Dockerfile; Podman uses the same syntax with name Containerfile
-au BufNewFile,BufRead Containerfile,Dockerfile,*.Dockerfile	setf dockerfile
-
-" WildPackets EtherPeek Decoder
-au BufNewFile,BufRead *.dcd			setf dcd
-
-" Enlightenment configuration files
-au BufNewFile,BufRead *enlightenment/*.cfg	setf c
-
-" Eterm
-au BufNewFile,BufRead *Eterm/*.cfg		setf eterm
-
 " Euphoria 3 or 4
 au BufNewFile,BufRead *.eu,*.ew,*.ex,*.exu,*.exw  call polyglot#ft#EuphoriaCheck()
 if has("fname_case")
    au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW  call polyglot#ft#EuphoriaCheck()
 endif
 
-" Lynx config files
-au BufNewFile,BufRead lynx.cfg			setf lynx
-
-" Quake
-au BufNewFile,BufRead *baseq[2-3]/*.cfg,*id1/*.cfg	setf quake
-au BufNewFile,BufRead *quake[1-3]/*.cfg			setf quake
-
-" Quake C
-au BufNewFile,BufRead *.qc			setf c
-
-" Configure files
-au BufNewFile,BufRead *.cfg			setf cfg
-
-" Cucumber
-au BufNewFile,BufRead *.feature			setf cucumber
-
-" Communicating Sequential Processes
-au BufNewFile,BufRead *.csp,*.fdr		setf csp
-
-" CUPL logic description and simulation
-au BufNewFile,BufRead *.pld			setf cupl
-au BufNewFile,BufRead *.si			setf cuplsim
-
-" Dart
-au BufRead,BufNewfile *.dart,*.drt		setf dart
-
-" Debian Control
-au BufNewFile,BufRead */debian/control		setf debcontrol
 au BufNewFile,BufRead control
 	\  if getline(1) =~ '^Source:'
 	\|   setf debcontrol
 	\| endif
 
-" Debian Copyright
-au BufNewFile,BufRead */debian/copyright	setf debcopyright
 au BufNewFile,BufRead copyright
 	\  if getline(1) =~ '^Format:'
 	\|   setf debcopyright
 	\| endif
 
-" Debian Sources.list
-au BufNewFile,BufRead */etc/apt/sources.list		setf debsources
-au BufNewFile,BufRead */etc/apt/sources.list.d/*.list	setf debsources
-
-" Deny hosts
-au BufNewFile,BufRead denyhosts.conf		setf denyhosts
-
-" dnsmasq(8) configuration files
-au BufNewFile,BufRead */etc/dnsmasq.conf	setf dnsmasq
-
-" ROCKLinux package description
-au BufNewFile,BufRead *.desc			setf desc
-
 " the D language or dtrace
 au BufNewFile,BufRead *.d			call polyglot#ft#DtraceCheck()
 
-" Desktop files
-au BufNewFile,BufRead *.desktop,*.directory	setf desktop
-
-" Dict config
-au BufNewFile,BufRead dict.conf,.dictrc		setf dictconf
-
-" Dictd config
-au BufNewFile,BufRead dictd.conf		setf dictdconf
-
-" Diff files
-au BufNewFile,BufRead *.diff,*.rej		setf diff
 au BufNewFile,BufRead *.patch
 	\ if getline(1) =~ '^From [0-9a-f]\{40\} Mon Sep 17 00:00:00 2001$' |
 	\   setf gitsendemail |
@@ -3121,9 +2918,6 @@ au BufNewFile,BufRead *.patch
 	\   setf diff |
 	\ endif
 
-" Dircolors
-au BufNewFile,BufRead .dir_colors,.dircolors,*/etc/DIR_COLORS	setf dircolors
-
 " Diva (with Skill) or InstallShield
 au BufNewFile,BufRead *.rul
 	\ if getline(1).getline(2).getline(3).getline(4).getline(5).getline(6) =~? 'InstallShield' |
@@ -3135,38 +2929,6 @@ au BufNewFile,BufRead *.rul
 " DCL (Digital Command Language - vms) or DNS zone file
 au BufNewFile,BufRead *.com			call polyglot#ft#BindzoneCheck('dcl')
 
-" DOT
-au BufNewFile,BufRead *.dot,*.gv		setf dot
-
-" Dylan - lid files
-au BufNewFile,BufRead *.lid			setf dylanlid
-
-" Dylan - intr files (melange)
-au BufNewFile,BufRead *.intr			setf dylanintr
-
-" Dylan
-au BufNewFile,BufRead *.dylan			setf dylan
-
-" Microsoft Module Definition
-au BufNewFile,BufRead *.def			setf def
-
-" Dracula
-au BufNewFile,BufRead *.drac,*.drc,*lvs,*lpe	setf dracula
-
-" Datascript
-au BufNewFile,BufRead *.ds			setf datascript
-
-" dsl
-au BufNewFile,BufRead *.dsl			setf dsl
-
-" DTD (Document Type Definition for XML)
-au BufNewFile,BufRead *.dtd			setf dtd
-
-" DTS/DSTI (device tree files)
-au BufNewFile,BufRead *.dts,*.dtsi		setf dts
-
-" EDIF (*.edf,*.edif,*.edn,*.edo) or edn
-au BufNewFile,BufRead *.ed\(f\|if\|o\)		setf edif
 au BufNewFile,BufRead *.edn
 	\ if getline(1) =~ '^\s*(\s*edif\>' |
 	\   setf edif |
@@ -3174,108 +2936,13 @@ au BufNewFile,BufRead *.edn
 	\   setf clojure |
 	\ endif
 
-" EditorConfig (close enough to dosini)
-au BufNewFile,BufRead .editorconfig		setf dosini
-
-" Embedix Component Description
-au BufNewFile,BufRead *.ecd			setf ecd
-
 " Eiffel or Specman or Euphoria
 au BufNewFile,BufRead *.e,*.E			call polyglot#ft#FTe()
 
-" Elinks configuration
-au BufNewFile,BufRead elinks.conf		setf elinks
-
-" ERicsson LANGuage; Yaws is erlang too
-au BufNewFile,BufRead *.erl,*.hrl,*.yaws	setf erlang
-
-" Elm
-au BufNewFile,BufRead *.elm			setf elm
-
-" Elm Filter Rules file
-au BufNewFile,BufRead filter-rules		setf elmfilt
-
-" ESMTP rc file
-au BufNewFile,BufRead *esmtprc			setf esmtprc
-
-" ESQL-C
-au BufNewFile,BufRead *.ec,*.EC			setf esqlc
-
-" Esterel
-au BufNewFile,BufRead *.strl			setf esterel
-
-" Essbase script
-au BufNewFile,BufRead *.csc			setf csc
-
-" Exim
-au BufNewFile,BufRead exim.conf			setf exim
-
-" Expect
-au BufNewFile,BufRead *.exp			setf expect
-
-" Exports
-au BufNewFile,BufRead exports			setf exports
-
-" Falcon
-au BufNewFile,BufRead *.fal			setf falcon
-
-" Fantom
-au BufNewFile,BufRead *.fan,*.fwt		setf fan
-
-" Factor
-au BufNewFile,BufRead *.factor			setf factor
-
-" Fetchmail RC file
-au BufNewFile,BufRead .fetchmailrc		setf fetchmail
-
-" FlexWiki - disabled, because it has side effects when a .wiki file
-" is not actually FlexWiki
-"au BufNewFile,BufRead *.wiki			setf flexwiki
-
-" Focus Executable
-au BufNewFile,BufRead *.fex,*.focexec		setf focexec
-
-" Focus Master file (but not for auto.master)
-au BufNewFile,BufRead auto.master		setf conf
-au BufNewFile,BufRead *.mas,*.master		setf master
-
-" Forth
-au BufNewFile,BufRead *.fs,*.ft,*.fth		setf forth
-
-" Reva Forth
-au BufNewFile,BufRead *.frt			setf reva
-
-" Fortran
-if has("fname_case")
-  au BufNewFile,BufRead *.F,*.FOR,*.FPP,*.FTN,*.F77,*.F90,*.F95,*.F03,*.F08	 setf fortran
-endif
-au BufNewFile,BufRead   *.f,*.for,*.fortran,*.fpp,*.ftn,*.f77,*.f90,*.f95,*.f03,*.f08  setf fortran
-
-" Framescript
-au BufNewFile,BufRead *.fsl			setf framescript
-
-" FStab
-au BufNewFile,BufRead fstab,mtab		setf fstab
-
-" GDB command files
-au BufNewFile,BufRead .gdbinit			setf gdb
-
-" GDMO
-au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
-
-" Gedcom
-au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
-
-" Git
-au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG	setf gitcommit
-au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig	setf gitconfig
-au BufNewFile,BufRead */.config/git/config			setf gitconfig
-au BufNewFile,BufRead .gitmodules,*.git/modules/*/config	setf gitconfig
 if !empty($XDG_CONFIG_HOME)
   au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config		setf gitconfig
 endif
-au BufNewFile,BufRead git-rebase-todo		setf gitrebase
-au BufRead,BufNewFile .gitsendemail.msg.??????	setf gitsendemail
+
 au BufNewFile,BufRead .msg.[0-9]*
       \ if getline(1) =~ '^From.*# This line is ignored.$' |
       \   setf gitsendemail |
@@ -3285,367 +2952,32 @@ au BufNewFile,BufRead *.git/*
       \   setf git |
       \ endif
 
-" Gkrellmrc
-au BufNewFile,BufRead gkrellmrc,gkrellmrc_?	setf gkrellmrc
-
-" GP scripts (2.0 and onward)
-au BufNewFile,BufRead *.gp,.gprc		setf gp
-
-" GPG
-au BufNewFile,BufRead */.gnupg/options		setf gpg
-au BufNewFile,BufRead */.gnupg/gpg.conf		setf gpg
-au BufNewFile,BufRead */usr/*/gnupg/options.skel setf gpg
 if !empty($GNUPGHOME)
   au BufNewFile,BufRead $GNUPGHOME/options	setf gpg
   au BufNewFile,BufRead $GNUPGHOME/gpg.conf	setf gpg
 endif
 
-" gnash(1) configuration files
-au BufNewFile,BufRead gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc setf gnash
-
-" Gitolite
-au BufNewFile,BufRead gitolite.conf		setf gitolite
-au BufNewFile,BufRead {,.}gitolite.rc,example.gitolite.rc	setf perl
-
-" GrADS scripts
-au BufNewFile,BufRead *.gs			setf grads
-
-" Gretl
-au BufNewFile,BufRead *.gretl			setf gretl
-
-" Groovy
-au BufNewFile,BufRead *.gradle,*.groovy		setf groovy
-
-" GNU Server Pages
-au BufNewFile,BufRead *.gsp			setf gsp
-
-" Group file
-au BufNewFile,BufRead */etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/etc/gshadow-,*/etc/gshadow.edit,*/var/backups/group.bak,*/var/backups/gshadow.bak  setf group
-
-" GTK RC
-au BufNewFile,BufRead .gtkrc,gtkrc		setf gtkrc
-
-" Haskell
-au BufNewFile,BufRead *.hs,*.hs-boot		setf haskell
-au BufNewFile,BufRead *.lhs			setf lhaskell
-au BufNewFile,BufRead *.chs			setf chaskell
-
-" Haste
-au BufNewFile,BufRead *.ht			setf haste
-au BufNewFile,BufRead *.htpp			setf hastepreproc
-
-" Hercules
-au BufNewFile,BufRead *.vc,*.ev,*.sum,*.errsum	setf hercules
-
-" HEX (Intel)
-au BufNewFile,BufRead *.hex,*.h32		setf hex
-
-" Hollywood
-au BufRead,BufNewFile *.hws			setf hollywood
-
-" Tilde (must be before HTML)
-au BufNewFile,BufRead *.t.html			setf tilde
-
 " HTML (.shtml and .stm for server side)
 au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm  call polyglot#ft#FThtml()
 
-" HTML with Ruby - eRuby
-au BufNewFile,BufRead *.erb,*.rhtml		setf eruby
-
-" HTML with M4
-au BufNewFile,BufRead *.html.m4			setf htmlm4
-
-" Some template.  Used to be HTML Cheetah.
-au BufNewFile,BufRead *.tmpl			setf template
-
-" Host config
-au BufNewFile,BufRead */etc/host.conf		setf hostconf
-
-" Hosts access
-au BufNewFile,BufRead */etc/hosts.allow,*/etc/hosts.deny  setf hostsaccess
-
-" Hyper Builder
-au BufNewFile,BufRead *.hb			setf hb
-
-" Httest
-au BufNewFile,BufRead *.htt,*.htb		setf httest
-
-" Icon
-au BufNewFile,BufRead *.icn			setf icon
-
 " IDL (Interface Description Language)
 au BufNewFile,BufRead *.idl			call polyglot#ft#FTidl()
 
-" Microsoft IDL (Interface Description Language)  Also *.idl
-" MOF = WMI (Windows Management Instrumentation) Managed Object Format
-au BufNewFile,BufRead *.odl,*.mof		setf msidl
-
-" Icewm menu
-au BufNewFile,BufRead */.icewm/menu		setf icemenu
-
-" Indent profile (must come before IDL *.pro!)
-au BufNewFile,BufRead .indent.pro		setf indent
 au BufNewFile,BufRead indent.pro		call polyglot#ft#ProtoCheck('indent')
 
 " IDL (Interactive Data Language)
 au BufNewFile,BufRead *.pro			call polyglot#ft#ProtoCheck('idlang')
 
-" Indent RC
-au BufNewFile,BufRead indentrc			setf indent
-
-" Inform
-au BufNewFile,BufRead *.inf,*.INF		setf inform
-
-" Initng
-au BufNewFile,BufRead */etc/initng/*/*.i,*.ii	setf initng
-
-" Innovation Data Processing
-au BufRead,BufNewFile upstream.dat\c,upstream.*.dat\c,*.upstream.dat\c	setf upstreamdat
-au BufRead,BufNewFile fdrupstream.log,upstream.log\c,upstream.*.log\c,*.upstream.log\c,UPSTREAM-*.log\c	setf upstreamlog
-au BufRead,BufNewFile upstreaminstall.log\c,upstreaminstall.*.log\c,*.upstreaminstall.log\c setf upstreaminstalllog
-au BufRead,BufNewFile usserver.log\c,usserver.*.log\c,*.usserver.log\c	setf usserverlog
-au BufRead,BufNewFile usw2kagt.log\c,usw2kagt.*.log\c,*.usw2kagt.log\c	setf usw2kagtlog
-
-" Ipfilter
-au BufNewFile,BufRead ipf.conf,ipf6.conf,ipf.rules	setf ipfilter
-
-" Informix 4GL (source - canonical, include file, I4GL+M4 preproc.)
-au BufNewFile,BufRead *.4gl,*.4gh,*.m4gl	setf fgl
-
-" .INI file for MSDOS
-au BufNewFile,BufRead *.ini			setf dosini
-
-" SysV Inittab
-au BufNewFile,BufRead inittab			setf inittab
-
-" Inno Setup
-au BufNewFile,BufRead *.iss			setf iss
-
-" J
-au BufNewFile,BufRead *.ijs			setf j
-
-" JAL
-au BufNewFile,BufRead *.jal,*.JAL		setf jal
-
-" Jam
-au BufNewFile,BufRead *.jpl,*.jpr		setf jam
-
-" Java
-au BufNewFile,BufRead *.java,*.jav		setf java
-
-" JavaCC
-au BufNewFile,BufRead *.jj,*.jjt		setf javacc
-
-" JavaScript, ECMAScript, ES module script, CommonJS script
-au BufNewFile,BufRead *.js,*.javascript,*.es,*.mjs,*.cjs   setf javascript
-
-" JavaScript with React
-au BufNewFile,BufRead *.jsx			setf javascriptreact
-
-" Java Server Pages
-au BufNewFile,BufRead *.jsp			setf jsp
-
-" Java Properties resource file (note: doesn't catch font.properties.pl)
-au BufNewFile,BufRead *.properties,*.properties_??,*.properties_??_??	setf jproperties
-
-" Jess
-au BufNewFile,BufRead *.clp			setf jess
-
-" Jgraph
-au BufNewFile,BufRead *.jgr			setf jgraph
-
-" Jovial
-au BufNewFile,BufRead *.jov,*.j73,*.jovial	setf jovial
-
-" JSON
-au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest	setf json
-
-" Kixtart
-au BufNewFile,BufRead *.kix			setf kix
-
-" Kimwitu[++]
-au BufNewFile,BufRead *.k			setf kwt
-
-" Kivy
-au BufNewFile,BufRead *.kv			setf kivy
-
-" Kotlin
-au BufNewFile,BufRead *.kt,*.ktm,*.kts		setf kotlin
-
-" KDE script
-au BufNewFile,BufRead *.ks			setf kscript
-
-" Kconfig
-au BufNewFile,BufRead Kconfig,Kconfig.debug	setf kconfig
-
-" Lace (ISE)
-au BufNewFile,BufRead *.ace,*.ACE		setf lace
-
-" Latte
-au BufNewFile,BufRead *.latte,*.lte		setf latte
-
-" Limits
-au BufNewFile,BufRead */etc/limits,*/etc/*limits.conf,*/etc/*limits.d/*.conf	setf limits
-
-" LambdaProlog (*.mod too, see Modsim)
-au BufNewFile,BufRead *.sig			setf lprolog
-
-" LDAP LDIF
-au BufNewFile,BufRead *.ldif			setf ldif
-
-" Ld loader
-au BufNewFile,BufRead *.ld			setf ld
-
-" Less
-au BufNewFile,BufRead *.less			setf less
-
-" Lex
-au BufNewFile,BufRead *.lex,*.l,*.lxx,*.l++	setf lex
-
-" Libao
-au BufNewFile,BufRead */etc/libao.conf,*/.libao	setf libao
-
-" Libsensors
-au BufNewFile,BufRead */etc/sensors.conf,*/etc/sensors3.conf	setf sensors
-
-" LFTP
-au BufNewFile,BufRead lftp.conf,.lftprc,*lftp/rc	setf lftp
-
-" Lifelines (or Lex for C++!)
-au BufNewFile,BufRead *.ll			setf lifelines
-
-" Lilo: Linux loader
-au BufNewFile,BufRead lilo.conf			setf lilo
-
-" Lisp (*.el = ELisp, *.cl = Common Lisp)
-" *.jl was removed, it's also used for Julia, better skip than guess wrong.
-if has("fname_case")
-  au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.L,.emacs,.sawfishrc setf lisp
-else
-  au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,.emacs,.sawfishrc setf lisp
-endif
-
-" SBCL implementation of Common Lisp
-au BufNewFile,BufRead sbclrc,.sbclrc		setf lisp
-
-" Liquid
-au BufNewFile,BufRead *.liquid			setf liquid
-
-" Lite
-au BufNewFile,BufRead *.lite,*.lt		setf lite
-
-" LiteStep RC files
-au BufNewFile,BufRead */LiteStep/*/*.rc		setf litestep
-
-" Login access
-au BufNewFile,BufRead */etc/login.access	setf loginaccess
-
-" Login defs
-au BufNewFile,BufRead */etc/login.defs		setf logindefs
-
-" Logtalk
-au BufNewFile,BufRead *.lgt			setf logtalk
-
-" LOTOS
-au BufNewFile,BufRead *.lot,*.lotos		setf lotos
-
-" Lout (also: *.lt)
-au BufNewFile,BufRead *.lou,*.lout		setf lout
-
-" Lua
-au BufNewFile,BufRead *.lua			setf lua
-
-" Luarocks
-au BufNewFile,BufRead *.rockspec		setf lua
-
-" Linden Scripting Language (Second Life)
-au BufNewFile,BufRead *.lsl			setf lsl
-
-" Lynx style file (or LotusScript!)
-au BufNewFile,BufRead *.lss			setf lss
-
 " M4
 au BufNewFile,BufRead *.m4
 	\ if expand("<afile>") !~? 'html.m4$\|fvwm2rc' | setf m4 | endif
 
-" MaGic Point
-au BufNewFile,BufRead *.mgp			setf mgp
-
-" Mail (for Elm, trn, mutt, muttng, rn, slrn, neomutt)
-au BufNewFile,BufRead snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\\\{6\},neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml setf mail
-
-" Mail aliases
-au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases	setf mailaliases
-
-" Mailcap configuration file
-au BufNewFile,BufRead .mailcap,mailcap		setf mailcap
-
-" Makefile
-"au BufNewFile,BufRead *[mM]akefile,*.mk,*.mak,*.dsp setf make
-
-" MakeIndex
-au BufNewFile,BufRead *.ist,*.mst		setf ist
-
-" Mallard
-au BufNewFile,BufRead *.page			setf mallard
-
-" Manpage
-au BufNewFile,BufRead *.man			setf man
-
-" Man config
-au BufNewFile,BufRead */etc/man.conf,man.config	setf manconf
-
-" Maple V
-au BufNewFile,BufRead *.mv,*.mpl,*.mws		setf maple
-
-" Map (UMN mapserver config file)
-au BufNewFile,BufRead *.map			setf map
-
-" Markdown
-au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,*.md  setf markdown
-
-" Mason
-au BufNewFile,BufRead *.mason,*.mhtml,*.comp	setf mason
-
 " Mathematica, Matlab, Murphi or Objective C
 au BufNewFile,BufRead *.m			call polyglot#ft#FTm()
 
-" Mathematica notebook
-au BufNewFile,BufRead *.nb			setf mma
-
-" Maya Extension Language
-au BufNewFile,BufRead *.mel			setf mel
-
-" Mercurial (hg) commit file
-au BufNewFile,BufRead hg-editor-*.txt		setf hgcommit
-
-" Mercurial config (looks like generic config file)
-au BufNewFile,BufRead *.hgrc,*hgrc		setf cfg
-
-" Meson Build system config
-au BufNewFile,BufRead meson.build,meson_options.txt setf meson
-
-" Messages (logs mostly)
-au BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.[0-9]*,-[0-9]*} setf messages
-
-" Metafont
-au BufNewFile,BufRead *.mf			setf mf
-
-" MetaPost
-au BufNewFile,BufRead *.mp			setf mp
-
-" MGL
-au BufNewFile,BufRead *.mgl			setf mgl
-
-" MIX - Knuth assembly
-au BufNewFile,BufRead *.mix,*.mixal		setf mix
-
 " MMIX or VMS makefile
 au BufNewFile,BufRead *.mms			call polyglot#ft#FTmms()
 
-" Symbian meta-makefile definition (MMP)
-au BufNewFile,BufRead *.mmp			setf mmp
-
 " Modsim III (or LambdaProlog)
 au BufNewFile,BufRead *.mod
 	\ if getline(1) =~ '\<module\>' |
@@ -3654,158 +2986,27 @@ au BufNewFile,BufRead *.mod
 	\   setf modsim3 |
 	\ endif
 
-" Modula 3 (.m3, .i3, .mg, .ig)
-au BufNewFile,BufRead *.[mi][3g]		setf modula3
-
-" Monk
-au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc	setf monk
-
-" MOO
-au BufNewFile,BufRead *.moo			setf moo
-
-" Modconf
-au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules setf modconf
-
-" Mplayer config
-au BufNewFile,BufRead mplayer.conf,*/.mplayer/config	setf mplayerconf
-
-" Motorola S record
-au BufNewFile,BufRead *.s19,*.s28,*.s37,*.mot,*.srec	setf srec
-
-" Mrxvtrc
-au BufNewFile,BufRead mrxvtrc,.mrxvtrc		setf mrxvtrc
-
-" Msql
-au BufNewFile,BufRead *.msql			setf msql
-
-" Mysql
-au BufNewFile,BufRead *.mysql			setf mysql
-
 " Mutt setup files (must be before catch *.rc)
 au BufNewFile,BufRead */etc/Muttrc.d/*		call s:StarSetf('muttrc')
 
-" M$ Resource files
-au BufNewFile,BufRead *.rc,*.rch		setf rc
-
-" MuPAD source
-au BufRead,BufNewFile *.mu			setf mupad
-
-" Mush
-au BufNewFile,BufRead *.mush			setf mush
-
-" Mutt setup file (also for Muttng)
-au BufNewFile,BufRead Mutt{ng,}rc		setf muttrc
-
-" N1QL
-au BufRead,BufNewfile *.n1ql,*.nql		setf n1ql
-
-" Nano
-au BufNewFile,BufRead */etc/nanorc,*.nanorc	setf nanorc
-
-" Nastran input/DMAP
-"au BufNewFile,BufRead *.dat			setf nastran
-
-" Natural
-au BufNewFile,BufRead *.NS[ACGLMNPS]		setf natural
-
-" Noemutt setup file
-au BufNewFile,BufRead Neomuttrc			setf neomuttrc
-
-" Netrc
-au BufNewFile,BufRead .netrc			setf netrc
-
-" Ninja file
-au BufNewFile,BufRead *.ninja			setf ninja
-
-" NPM RC file
-au BufNewFile,BufRead npmrc,.npmrc		setf dosini
-
-" Novell netware batch files
-au BufNewFile,BufRead *.ncf			setf ncf
-
 " Nroff/Troff (*.ms and *.t are checked below)
 au BufNewFile,BufRead *.me
 	\ if expand("<afile>") != "read.me" && expand("<afile>") != "click.me" |
 	\   setf nroff |
 	\ endif
-au BufNewFile,BufRead *.tr,*.nr,*.roff,*.tmac,*.mom	setf nroff
 au BufNewFile,BufRead *.[1-9]			call polyglot#ft#FTnroff()
 
 " Nroff or Objective C++
 au BufNewFile,BufRead *.mm			call polyglot#ft#FTmm()
 
-" Not Quite C
-au BufNewFile,BufRead *.nqc			setf nqc
-
-" NSE - Nmap Script Engine - uses Lua syntax
-au BufNewFile,BufRead *.nse			setf lua
-
-" NSIS
-au BufNewFile,BufRead *.nsi,*.nsh		setf nsis
-
-" OCAML
-au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit	setf ocaml
-
-" Occam
-au BufNewFile,BufRead *.occ			setf occam
-
-" Omnimark
-au BufNewFile,BufRead *.xom,*.xin		setf omnimark
-
-" OpenROAD
-au BufNewFile,BufRead *.or			setf openroad
-
-" OPL
-au BufNewFile,BufRead *.[Oo][Pp][Ll]		setf opl
-
-" Oracle config file
-au BufNewFile,BufRead *.ora			setf ora
-
-" Packet filter conf
-au BufNewFile,BufRead pf.conf			setf pf
-
-" Pacman Config (close enough to dosini)
-au BufNewFile,BufRead */etc/pacman.conf		setf dosini
-
 " Pacman hooks
 au BufNewFile,BufRead *.hook
 	\ if getline(1) == '[Trigger]' |
 	\   setf dosini |
 	\ endif
 
-" Pam conf
-au BufNewFile,BufRead */etc/pam.conf			setf pamconf
-
-" Pam environment
-au BufNewFile,BufRead pam_env.conf,.pam_environment	setf pamenv
-
-" PApp
-au BufNewFile,BufRead *.papp,*.pxml,*.pxsl	setf papp
-
-" Password file
-au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
-
-" Pascal (also *.p)
-au BufNewFile,BufRead *.pas,*.pp		setf pascal
-
-" Delphi or Lazarus program file
-au BufNewFile,BufRead *.dpr,*.lpr		setf pascal
-
-" PDF
-au BufNewFile,BufRead *.pdf			setf pdf
-
-" PCMK - HAE - crm configure edit
-au BufNewFile,BufRead *.pcmk			setf pcmk
-
 " Perl
-if has("fname_case")
-  au BufNewFile,BufRead *.pl,*.PL		call polyglot#ft#FTpl()
-else
-  au BufNewFile,BufRead *.pl			call polyglot#ft#FTpl()
-endif
-au BufNewFile,BufRead *.plx,*.al,*.psgi		setf perl
-au BufNewFile,BufRead *.p6,*.pm6,*.pl6		setf perl6
-au BufNewFile,BufRead *.raku,*.rakumod		setf perl6
+au BufNewFile,BufRead *.pl			call polyglot#ft#FTpl()
 
 " Perl, XPM or XPM2
 au BufNewFile,BufRead *.pm
@@ -3817,65 +3018,6 @@ au BufNewFile,BufRead *.pm
 	\   setf perl |
 	\ endif
 
-" Perl POD
-au BufNewFile,BufRead *.pod			setf pod
-au BufNewFile,BufRead *.pod6			setf pod6
-
-" Php, php3, php4, etc.
-" Also Phtml (was used for PHP 2 in the past)
-" Also .ctp for Cake template file
-au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp	setf php
-
-" PHP config
-au BufNewFile,BufRead php.ini-*			setf dosini
-
-" Pike and Cmod
-au BufNewFile,BufRead *.pike,*.pmod		setf pike
-au BufNewFile,BufRead *.cmod			setf cmod
-
-" Pinfo config
-au BufNewFile,BufRead */etc/pinforc,*/.pinforc	setf pinfo
-
-" Palm Resource compiler
-au BufNewFile,BufRead *.rcp			setf pilrc
-
-" Pine config
-au BufNewFile,BufRead .pinerc,pinerc,.pinercex,pinercex		setf pine
-
-" Pipenv Pipfiles
-au BufNewFile,BufRead Pipfile			setf config
-au BufNewFile,BufRead Pipfile.lock		setf json
-
-" PL/1, PL/I
-au BufNewFile,BufRead *.pli,*.pl1		setf pli
-
-" PL/M (also: *.inp)
-au BufNewFile,BufRead *.plm,*.p36,*.pac		setf plm
-
-" PL/SQL
-au BufNewFile,BufRead *.pls,*.plsql		setf plsql
-
-" PLP
-au BufNewFile,BufRead *.plp			setf plp
-
-" PO and PO template (GNU gettext)
-au BufNewFile,BufRead *.po,*.pot		setf po
-
-" Postfix main config
-au BufNewFile,BufRead main.cf			setf pfmain
-
-" PostScript (+ font files, encapsulated PostScript, Adobe Illustrator)
-au BufNewFile,BufRead *.ps,*.pfa,*.afm,*.eps,*.epsf,*.epsi,*.ai	  setf postscr
-
-" PostScript Printer Description
-au BufNewFile,BufRead *.ppd			setf ppd
-
-" Povray
-au BufNewFile,BufRead *.pov			setf pov
-
-" Povray configuration
-au BufNewFile,BufRead .povrayrc			setf povini
-
 " Povray, PHP or assembly
 au BufNewFile,BufRead *.inc			call polyglot#ft#FTinc()
 
@@ -3885,26 +3027,6 @@ au BufNewFile,BufRead *printcap
 au BufNewFile,BufRead *termcap
 	\ let b:ptcap_type = "term" | setf ptcap
 
-" PCCTS / ANTRL
-"au BufNewFile,BufRead *.g			setf antrl
-au BufNewFile,BufRead *.g			setf pccts
-
-" PPWizard
-au BufNewFile,BufRead *.it,*.ih			setf ppwiz
-
-" Obj 3D file format
-" TODO: is there a way to avoid MS-Windows Object files?
-au BufNewFile,BufRead *.obj			setf obj
-
-" Oracle Pro*C/C++
-au BufNewFile,BufRead *.pc			setf proc
-
-" Privoxy actions file
-au BufNewFile,BufRead *.action			setf privoxy
-
-" Procmail
-au BufNewFile,BufRead .procmail,.procmailrc	setf procmail
-
 " Progress or CWEB
 au BufNewFile,BufRead *.w			call polyglot#ft#FTprogress_cweb()
 
@@ -3915,199 +3037,21 @@ au BufNewFile,BufRead *.i			call polyglot#ft#FTprogress_asm()
 au BufNewFile,BufRead *.p			call polyglot#ft#FTprogress_pascal()
 
 " Software Distributor Product Specification File (POSIX 1387.2-1995)
-au BufNewFile,BufRead *.psf			setf psf
 au BufNewFile,BufRead INDEX,INFO
 	\ if getline(1) =~ '^\s*\(distribution\|installed_software\|root\|bundle\|product\)\s*$' |
 	\   setf psf |
 	\ endif
 
-" Prolog
-au BufNewFile,BufRead *.pdb			setf prolog
-
-" Promela
-au BufNewFile,BufRead *.pml			setf promela
-
-" Google protocol buffers
-au BufNewFile,BufRead *.proto			setf proto
-
-" Protocols
-au BufNewFile,BufRead */etc/protocols		setf protocols
-
-" Pyrex
-au BufNewFile,BufRead *.pyx,*.pxd		setf pyrex
-
-" Python, Python Shell Startup and Python Stub Files
-" Quixote (Python-based web framework)
-au BufNewFile,BufRead *.py,*.pyw,.pythonstartup,.pythonrc  setf python
-au BufNewFile,BufRead *.ptl,*.pyi,SConstruct		   setf python
-
-" Radiance
-au BufNewFile,BufRead *.rad,*.mat		setf radiance
-
-" Ratpoison config/command files
-au BufNewFile,BufRead .ratpoisonrc,ratpoisonrc	setf ratpoison
-
-" RCS file
-au BufNewFile,BufRead *\,v			setf rcs
-
-" Readline
-au BufNewFile,BufRead .inputrc,inputrc		setf readline
-
 " Registry for MS-Windows
 au BufNewFile,BufRead *.reg
 	\ if getline(1) =~? '^REGEDIT[0-9]*\s*$\|^Windows Registry Editor Version \d*\.\d*\s*$' | setf registry | endif
 
-" Renderman Interface Bytestream
-au BufNewFile,BufRead *.rib			setf rib
-
-" Rego Policy Language
-au BufNewFile,BufRead *.rego			setf rego
-
-" Rexx
-au BufNewFile,BufRead *.rex,*.orx,*.rxo,*.rxj,*.jrexx,*.rexxj,*.rexx,*.testGroup,*.testUnit	setf rexx
-
-" R Help file
-if has("fname_case")
-  au BufNewFile,BufRead *.rd,*.Rd		setf rhelp
-else
-  au BufNewFile,BufRead *.rd			setf rhelp
-endif
-
-" R noweb file
-if has("fname_case")
-  au BufNewFile,BufRead *.Rnw,*.rnw,*.Snw,*.snw		setf rnoweb
-else
-  au BufNewFile,BufRead *.rnw,*.snw			setf rnoweb
-endif
-
-" R Markdown file
-if has("fname_case")
-  au BufNewFile,BufRead *.Rmd,*.rmd,*.Smd,*.smd		setf rmd
-else
-  au BufNewFile,BufRead *.rmd,*.smd			setf rmd
-endif
-
-" R reStructuredText file
-if has("fname_case")
-  au BufNewFile,BufRead *.Rrst,*.rrst,*.Srst,*.srst	setf rrst
-else
-  au BufNewFile,BufRead *.rrst,*.srst			setf rrst
-endif
-
 " Rexx, Rebol or R
 au BufNewFile,BufRead *.r,*.R				call polyglot#ft#FTr()
 
-" Remind
-au BufNewFile,BufRead .reminders,*.remind,*.rem		setf remind
-
-" Resolv.conf
-au BufNewFile,BufRead resolv.conf		setf resolv
-
-" Relax NG Compact
-au BufNewFile,BufRead *.rnc			setf rnc
-
-" Relax NG XML
-au BufNewFile,BufRead *.rng			setf rng
-
-" RPL/2
-au BufNewFile,BufRead *.rpl			setf rpl
-
-" Robots.txt
-au BufNewFile,BufRead robots.txt		setf robots
-
-" Rpcgen
-au BufNewFile,BufRead *.x			setf rpcgen
-
-" reStructuredText Documentation Format
-au BufNewFile,BufRead *.rst			setf rst
-
-" RTF
-au BufNewFile,BufRead *.rtf			setf rtf
-
-" Interactive Ruby shell
-au BufNewFile,BufRead .irbrc,irbrc		setf ruby
-
-" Ruby
-au BufNewFile,BufRead *.rb,*.rbw		setf ruby
-
-" RubyGems
-au BufNewFile,BufRead *.gemspec			setf ruby
-
-" Rust
-au BufNewFile,BufRead *.rs			setf rust
-
-" Rackup
-au BufNewFile,BufRead *.ru			setf ruby
-
-" Bundler
-au BufNewFile,BufRead Gemfile			setf ruby
-
-" Ruby on Rails
-au BufNewFile,BufRead *.builder,*.rxml,*.rjs	setf ruby
-
-" Rantfile and Rakefile is like Ruby
-au BufNewFile,BufRead [rR]antfile,*.rant,[rR]akefile,*.rake	setf ruby
-
-" S-lang (or shader language, or SmallLisp)
-au BufNewFile,BufRead *.sl			setf slang
-
-" Samba config
-au BufNewFile,BufRead smb.conf			setf samba
-
-" SAS script
-au BufNewFile,BufRead *.sas			setf sas
-
-" Sass
-au BufNewFile,BufRead *.sass			setf sass
-
-" Sather
-au BufNewFile,BufRead *.sa			setf sather
-
-" Scala
-au BufNewFile,BufRead *.scala			setf scala
-
-" SBT - Scala Build Tool
-au BufNewFile,BufRead *.sbt			setf sbt
-
-" Scilab
-au BufNewFile,BufRead *.sci,*.sce		setf scilab
-
-" SCSS
-au BufNewFile,BufRead *.scss			setf scss
-
-" SD: Streaming Descriptors
-au BufNewFile,BufRead *.sd			setf sd
-
-" SDL
-au BufNewFile,BufRead *.sdl,*.pr		setf sdl
-
-" sed
-au BufNewFile,BufRead *.sed			setf sed
-
-" Sieve (RFC 3028, 5228)
-au BufNewFile,BufRead *.siv,*.sieve		setf sieve
-
-" Sendmail
-au BufNewFile,BufRead sendmail.cf		setf sm
-
 " Sendmail .mc files are actually m4.  Could also be MS Message text file.
 au BufNewFile,BufRead *.mc			call polyglot#ft#McSetf()
 
-" Services
-au BufNewFile,BufRead */etc/services		setf services
-
-" Service Location config
-au BufNewFile,BufRead */etc/slp.conf		setf slpconf
-
-" Service Location registration
-au BufNewFile,BufRead */etc/slp.reg		setf slpreg
-
-" Service Location SPI
-au BufNewFile,BufRead */etc/slp.spi		setf slpspi
-
-" Setserial config
-au BufNewFile,BufRead */etc/serial.conf		setf setserial
-
 " SGML
 au BufNewFile,BufRead *.sgm,*.sgml
 	\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'linuxdoc' |
@@ -4126,9 +3070,6 @@ au BufNewFile,BufRead *.decl,*.dcl,*.dec
 	\    setf sgmldecl |
 	\ endif
 
-" SGML catalog file
-au BufNewFile,BufRead catalog			setf catalog
-
 " Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc.
 " Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts
 " NOTE: Patterns ending in a star are further down, these have lower priority.
@@ -4152,36 +3093,6 @@ au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login	call polyglot#ft#Set
 " (patterns ending in a start further below)
 au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias  call polyglot#ft#CSH()
 
-" Z-Shell script (patterns ending in a star further below)
-au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks  setf zsh
-au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump setf zsh
-au BufNewFile,BufRead *.zsh			setf zsh
-
-" Scheme
-au BufNewFile,BufRead *.scm,*.ss,*.rkt		setf scheme
-
-" Screen RC
-au BufNewFile,BufRead .screenrc,screenrc	setf screen
-
-" Simula
-au BufNewFile,BufRead *.sim			setf simula
-
-" SINDA
-au BufNewFile,BufRead *.sin,*.s85		setf sinda
-
-" SiSU
-au BufNewFile,BufRead *.sst,*.ssm,*.ssi,*.-sst,*._sst setf sisu
-au BufNewFile,BufRead *.sst.meta,*.-sst.meta,*._sst.meta setf sisu
-
-" SKILL
-au BufNewFile,BufRead *.il,*.ils,*.cdf		setf skill
-
-" SLRN
-au BufNewFile,BufRead .slrnrc			setf slrnrc
-au BufNewFile,BufRead *.score			setf slrnsc
-
-" Smalltalk (and TeX)
-au BufNewFile,BufRead *.st			setf st
 au BufNewFile,BufRead *.cls
 	\ if getline(1) =~ '^%' |
 	\  setf tex |
@@ -4191,9 +3102,6 @@ au BufNewFile,BufRead *.cls
 	\  setf st |
 	\ endif
 
-" Smarty templates
-au BufNewFile,BufRead *.tpl			setf smarty
-
 " SMIL or XML
 au BufNewFile,BufRead *.smil
 	\ if getline(1) =~ '<?\s*xml.*?>' |
@@ -4210,231 +3118,17 @@ au BufNewFile,BufRead *.smi
 	\   setf mib |
 	\ endif
 
-" SMITH
-au BufNewFile,BufRead *.smt,*.smith		setf smith
-
-" Snobol4 and spitbol
-au BufNewFile,BufRead *.sno,*.spt		setf snobol4
-
-" SNMP MIB files
-au BufNewFile,BufRead *.mib,*.my		setf mib
-
-" Snort Configuration
-au BufNewFile,BufRead *.hog,snort.conf,vision.conf	setf hog
 au BufNewFile,BufRead *.rules			call polyglot#ft#FTRules()
 
-" Spec (Linux RPM)
-au BufNewFile,BufRead *.spec			setf spec
-
-" Speedup (AspenTech plant simulator)
-au BufNewFile,BufRead *.speedup,*.spdata,*.spd	setf spup
-
-" Slice
-au BufNewFile,BufRead *.ice			setf slice
-
-" Spice
-au BufNewFile,BufRead *.sp,*.spice		setf spice
-
-" Spyce
-au BufNewFile,BufRead *.spy,*.spi		setf spyce
-
-" Squid
-au BufNewFile,BufRead squid.conf		setf squid
-
-" SQL for Oracle Designer
-au BufNewFile,BufRead *.tyb,*.typ,*.tyc,*.pkb,*.pks	setf sql
-
 " SQL
 au BufNewFile,BufRead *.sql			call polyglot#ft#SQL()
 
-" SQLJ
-au BufNewFile,BufRead *.sqlj			setf sqlj
-
-" SQR
-au BufNewFile,BufRead *.sqr,*.sqi		setf sqr
-
-" OpenSSH configuration
-au BufNewFile,BufRead ssh_config,*/.ssh/config		setf sshconfig
-au BufNewFile,BufRead */etc/ssh/ssh_config.d/*.conf	setf sshconfig
-
-" OpenSSH server configuration
-au BufNewFile,BufRead sshd_config			setf sshdconfig
-au BufNewFile,BufRead */etc/ssh/sshd_config.d/*.conf	setf sshdconfig
-
-" Stata
-au BufNewFile,BufRead *.ado,*.do,*.imata,*.mata	setf stata
 " Also *.class, but not when it's a Java bytecode file
 au BufNewFile,BufRead *.class
 	\ if getline(1) !~ "^\xca\xfe\xba\xbe" | setf stata | endif
 
-" SMCL
-au BufNewFile,BufRead *.hlp,*.ihlp,*.smcl	setf smcl
-
-" Stored Procedures
-au BufNewFile,BufRead *.stp			setf stp
-
-" Standard ML
-au BufNewFile,BufRead *.sml			setf sml
-
-" Sratus VOS command macro
-au BufNewFile,BufRead *.cm			setf voscm
-
-" Swift
-au BufNewFile,BufRead *.swift			setf swift
-au BufNewFile,BufRead *.swift.gyb		setf swiftgyb
-
-" Swift Intermediate Language
-au BufNewFile,BufRead *.sil			setf sil
-
-" Sysctl
-au BufNewFile,BufRead */etc/sysctl.conf,*/etc/sysctl.d/*.conf	setf sysctl
-
-" Systemd unit files
-au BufNewFile,BufRead */systemd/*.{automount,dnssd,link,mount,netdev,network,nspawn,path,service,slice,socket,swap,target,timer}	setf systemd
-" Systemd overrides
-au BufNewFile,BufRead */etc/systemd/*.conf.d/*.conf	setf systemd
-au BufNewFile,BufRead */etc/systemd/system/*.d/*.conf	setf systemd
-au BufNewFile,BufRead */.config/systemd/user/*.d/*.conf	setf systemd
-" Systemd temp files
-au BufNewFile,BufRead */etc/systemd/system/*.d/.#*	setf systemd
-au BufNewFile,BufRead */etc/systemd/system/.#*		setf systemd
-au BufNewFile,BufRead */.config/systemd/user/*.d/.#*	setf systemd
-au BufNewFile,BufRead */.config/systemd/user/.#*	setf systemd
-
-" Synopsys Design Constraints
-au BufNewFile,BufRead *.sdc			setf sdc
-
-" Sudoers
-au BufNewFile,BufRead */etc/sudoers,sudoers.tmp	setf sudoers
-
-" SVG (Scalable Vector Graphics)
-au BufNewFile,BufRead *.svg			setf svg
-
-" Tads (or Nroff or Perl test file)
-"au BufNewFile,BufRead *.t
-"	\ if !polyglot#ft#FTnroff() && !polyglot#ft#FTperl() | setf tads | endif
-
-" Tags
-au BufNewFile,BufRead tags			setf tags
-
-" TAK
-au BufNewFile,BufRead *.tak			setf tak
-
-" Task
-au BufRead,BufNewFile {pending,completed,undo}.data  setf taskdata
-au BufRead,BufNewFile *.task			setf taskedit
-
-" Tcl (JACL too)
-au BufNewFile,BufRead *.tcl,*.tk,*.itcl,*.itk,*.jacl	setf tcl
-
-" TealInfo
-au BufNewFile,BufRead *.tli			setf tli
-
-" Telix Salt
-au BufNewFile,BufRead *.slt			setf tsalt
-
-" Tera Term Language
-au BufRead,BufNewFile *.ttl			setf teraterm
-
-" Terminfo
-au BufNewFile,BufRead *.ti			setf terminfo
-
-" TeX
-au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl	setf tex
 au BufNewFile,BufRead *.tex			call polyglot#ft#FTtex()
 
-" ConTeXt
-au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi   setf context
-
-" Texinfo
-au BufNewFile,BufRead *.texinfo,*.texi,*.txi	setf texinfo
-
-" TeX configuration
-au BufNewFile,BufRead texmf.cnf			setf texmf
-
-" Tidy config
-au BufNewFile,BufRead .tidyrc,tidyrc,tidy.conf	setf tidy
-
-" TF mud client
-au BufNewFile,BufRead *.tf,.tfrc,tfrc		setf tf
-
-" tmux configuration
-au BufNewFile,BufRead {.,}tmux*.conf		setf tmux
-
-" TPP - Text Presentation Program
-au BufNewFile,BufReadPost *.tpp			setf tpp
-
-" Treetop
-au BufRead,BufNewFile *.treetop			setf treetop
-
-" Trustees
-au BufNewFile,BufRead trustees.conf		setf trustees
-
-" TSS - Geometry
-au BufNewFile,BufReadPost *.tssgm		setf tssgm
-
-" TSS - Optics
-au BufNewFile,BufReadPost *.tssop		setf tssop
-
-" TSS - Command Line (temporary)
-au BufNewFile,BufReadPost *.tsscl		setf tsscl
-
-" TWIG files
-au BufNewFile,BufReadPost *.twig		setf twig
-
-" Typescript
-au BufNewFile,BufReadPost *.ts			setf typescript
-
-" TypeScript with React
-au BufNewFile,BufRead *.tsx			setf typescriptreact
-
-" Motif UIT/UIL files
-au BufNewFile,BufRead *.uit,*.uil		setf uil
-
-" Udev conf
-au BufNewFile,BufRead */etc/udev/udev.conf	setf udevconf
-
-" Udev permissions
-au BufNewFile,BufRead */etc/udev/permissions.d/*.permissions setf udevperm
-"
-" Udev symlinks config
-au BufNewFile,BufRead */etc/udev/cdsymlinks.conf	setf sh
-
-" UnrealScript
-au BufNewFile,BufRead *.uc			setf uc
-
-" Updatedb
-au BufNewFile,BufRead */etc/updatedb.conf	setf updatedb
-
-" Upstart (init(8)) config files
-au BufNewFile,BufRead */usr/share/upstart/*.conf	       setf upstart
-au BufNewFile,BufRead */usr/share/upstart/*.override	       setf upstart
-au BufNewFile,BufRead */etc/init/*.conf,*/etc/init/*.override  setf upstart
-au BufNewFile,BufRead */.init/*.conf,*/.init/*.override	       setf upstart
-au BufNewFile,BufRead */.config/upstart/*.conf		       setf upstart
-au BufNewFile,BufRead */.config/upstart/*.override	       setf upstart
-
-" Vera
-au BufNewFile,BufRead *.vr,*.vri,*.vrh		setf vera
-
-" Verilog HDL
-au BufNewFile,BufRead *.v			setf verilog
-
-" Verilog-AMS HDL
-au BufNewFile,BufRead *.va,*.vams		setf verilogams
-
-" SystemVerilog
-au BufNewFile,BufRead *.sv,*.svh		setf systemverilog
-
-" VHDL
-au BufNewFile,BufRead *.hdl,*.vhd,*.vhdl,*.vbe,*.vst,*.vho  setf vhdl
-
-" Vim script
-au BufNewFile,BufRead *.vim,*.vba,.exrc,_exrc	setf vim
-
-" Viminfo file
-au BufNewFile,BufRead .viminfo,_viminfo		setf viminfo
-
 " Virata Config Script File or Drupal module
 au BufRead,BufNewFile *.hw,*.module,*.pkg
 	\ if getline(1) =~ '<?php' |
@@ -4446,51 +3140,6 @@ au BufRead,BufNewFile *.hw,*.module,*.pkg
 " Visual Basic (also uses *.bas) or FORM
 au BufNewFile,BufRead *.frm			call polyglot#ft#FTVB("form")
 
-" SaxBasic is close to Visual Basic
-au BufNewFile,BufRead *.sba			setf vb
-
-" Vgrindefs file
-au BufNewFile,BufRead vgrindefs			setf vgrindefs
-
-" VRML V1.0c
-au BufNewFile,BufRead *.wrl			setf vrml
-
-" Vroom (vim testing and executable documentation)
-au BufNewFile,BufRead *.vroom			setf vroom
-
-" Vue.js Single File Component
-au BufNewFile,BufRead *.vue			setf vue
-
-" WebAssembly
-au BufNewFile,BufRead *.wast,*.wat		setf wast
-
-" Webmacro
-au BufNewFile,BufRead *.wm			setf webmacro
-
-" Wget config
-au BufNewFile,BufRead .wgetrc,wgetrc		setf wget
-
-" Website MetaLanguage
-au BufNewFile,BufRead *.wml			setf wml
-
-" Winbatch
-au BufNewFile,BufRead *.wbt			setf winbatch
-
-" WSML
-au BufNewFile,BufRead *.wsml			setf wsml
-
-" WPL
-au BufNewFile,BufRead *.wpl			setf xml
-
-" WvDial
-au BufNewFile,BufRead wvdial.conf,.wvdialrc	setf wvdial
-
-" CVS RC file
-au BufNewFile,BufRead .cvsrc			setf cvsrc
-
-" CVS commit file
-au BufNewFile,BufRead cvs\d\+			setf cvs
-
 " WEB (*.web is also used for Winbatch: Guess, based on expecting "%" comment
 " lines in a WEB file).
 au BufNewFile,BufRead *.web
@@ -4500,12 +3149,6 @@ au BufNewFile,BufRead *.web
 	\   setf winbatch |
 	\ endif
 
-" Windows Scripting Host and Windows Script Component
-au BufNewFile,BufRead *.ws[fc]			setf wsh
-
-" XHTML
-au BufNewFile,BufRead *.xhtml,*.xht		setf xhtml
-
 " X Pixmap (dynamically sets colors, use BufEnter to make it work better)
 au BufEnter *.xpm
 	\ if getline(1) =~ "XPM2" |
@@ -4513,7 +3156,6 @@ au BufEnter *.xpm
 	\ else |
 	\   setf xpm |
 	\ endif
-au BufEnter *.xpm2				setf xpm2
 
 " XFree86 config
 au BufNewFile,BufRead XF86Config
@@ -4528,84 +3170,15 @@ au BufNewFile,BufRead */xorg.conf.d/*.conf
 " Xorg config
 au BufNewFile,BufRead xorg.conf,xorg.conf-4	let b:xf86conf_xfree86_version = 4 | setf xf86conf
 
-" Xinetd conf
-au BufNewFile,BufRead */etc/xinetd.conf		setf xinetd
-
-" XS Perl extension interface language
-au BufNewFile,BufRead *.xs			setf xs
-
-" X resources file
-au BufNewFile,BufRead .Xdefaults,.Xpdefaults,.Xresources,xdm-config,*.ad setf xdefaults
-
-" Xmath
-au BufNewFile,BufRead *.msc,*.msf		setf xmath
 au BufNewFile,BufRead *.ms
 	\ if !polyglot#ft#FTnroff() | setf xmath | endif
 
 " XML  specific variants: docbk and xbl
 au BufNewFile,BufRead *.xml			call polyglot#ft#FTxml()
 
-" XMI (holding UML models) is also XML
-au BufNewFile,BufRead *.xmi			setf xml
-
-" CSPROJ files are Visual Studio.NET's XML-based project config files
-au BufNewFile,BufRead *.csproj,*.csproj.user	setf xml
-
-" Qt Linguist translation source and Qt User Interface Files are XML
-" However, for .ts Typescript is more common.
-au BufNewFile,BufRead *.ui			setf xml
-
-" TPM's are RDF-based descriptions of TeX packages (Nikolai Weibull)
-au BufNewFile,BufRead *.tpm			setf xml
-
-" Xdg menus
-au BufNewFile,BufRead */etc/xdg/menus/*.menu	setf xml
-
-" ATI graphics driver configuration
-au BufNewFile,BufRead fglrxrc			setf xml
-
-" Web Services Description Language (WSDL)
-au BufNewFile,BufRead *.wsdl			setf xml
-
-" XLIFF (XML Localisation Interchange File Format) is also XML
-au BufNewFile,BufRead *.xlf			setf xml
-au BufNewFile,BufRead *.xliff			setf xml
-
-" XML User Interface Language
-au BufNewFile,BufRead *.xul			setf xml
-
-" X11 xmodmap (also see below)
-au BufNewFile,BufRead *Xmodmap			setf xmodmap
-
-" Xquery
-au BufNewFile,BufRead *.xq,*.xql,*.xqm,*.xquery,*.xqy	setf xquery
-
-" XSD
-au BufNewFile,BufRead *.xsd			setf xsd
-
-" Xslt
-au BufNewFile,BufRead *.xsl,*.xslt		setf xslt
-
-" Yacc
-au BufNewFile,BufRead *.yy,*.yxx,*.y++		setf yacc
-
 " Yacc or racc
 au BufNewFile,BufRead *.y			call polyglot#ft#FTy()
 
-" Yaml
-au BufNewFile,BufRead *.yaml,*.yml		setf yaml
-
-" Raml
-au BufNewFile,BufRead *.raml			setf raml
-
-" yum conf (close enough to dosini)
-au BufNewFile,BufRead */etc/yum.conf		setf dosini
-
-" Zimbu
-au BufNewFile,BufRead *.zu			setf zimbu
-" Zimbu Templates
-au BufNewFile,BufRead *.zut			setf zimbutempl
-
 " Zope
 "   dtml (zope dynamic template markup language), pt (zope page template),
 "   cpt (zope form controller page template)
@@ -4613,9 +3186,6 @@ au BufNewFile,BufRead *.dtml,*.pt,*.cpt		call polyglot#ft#FThtml()
 "   zsql (zope sql method)
 au BufNewFile,BufRead *.zsql			call polyglot#ft#SQL()
 
-" Z80 assembler asz80
-au BufNewFile,BufRead *.z8a			setf z8a
-
 augroup END
 
 
@@ -4654,14 +3224,6 @@ au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2
 au BufNewFile,BufRead *asterisk/*.conf*		call s:StarSetf('asterisk')
 au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
 
-" Bazaar version control
-au BufNewFile,BufRead bzr_log.*			setf bzr
-
-" Bazel build file
-if !has("fname_case")
-  au BufNewFile,BufRead *.BUILD,BUILD			setf bzl
-endif
-
 " BIND zone
 au BufNewFile,BufRead */named/db.*,*/bind/db.*	call s:StarSetf('bindzone')
 
@@ -4832,10 +3394,6 @@ au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump*  call s:StarSetf('zsh')
 au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
 
 
-" Plain text files, needs to be far down to not override others.  This avoids
-" the "conf" type being used if there is a line starting with '#'.
-au BufNewFile,BufRead *.text,README		setf text
-
 " Help files match *.txt but should have a last line that is a modeline.
 au BufNewFile,BufRead *.txt
 	\  if getline('$') !~ 'vim:.*ft=help'

From 6b9625ecd5d8ef8af7f84a8b61759e104c0c904e Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 17 Oct 2020 11:52:39 +0200
Subject: [PATCH 135/299] Fix detecting indentation, closes #590

---
 ftdetect/polyglot.vim | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index c91d1d13a..ed800dab5 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2608,14 +2608,13 @@ au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>:e") == "" |
   \ call polyglot#shebang#Detect() | endif
 
 au BufEnter * if &ft == "" && expand("<afile>:e") == ""  |
-      \ call s:Observe('shebang#Detect') | endif
+  \ call s:Observe('shebang#Detect') | endif
 
 augroup END
 
 if !has_key(s:disabled_packages, 'autoindent')
   " Code below re-implements sleuth for vim-polyglot
   let g:loaded_sleuth = 1
-  let g:loaded_foobar = 1
 
   " Makes shiftwidth to be synchronized with tabstop by default
   if &shiftwidth == &tabstop
@@ -2637,7 +2636,7 @@ if !has_key(s:disabled_packages, 'autoindent')
     for line in a:lines
       let i += 1
 
-      if !len(line) || line =~# '^\W*$'
+      if !len(line) || line =~# '^\S+$'
         continue
       endif
 

From 6b663ec330356e92de9c68a6dac09a80a2d5b07c Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 17 Oct 2020 13:49:45 +0200
Subject: [PATCH 136/299] Change implementation of observing, fixes #584

---
 ftdetect/polyglot.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index ed800dab5..0ff59e1b7 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -31,10 +31,10 @@ set cpo&vim
 set nofileignorecase
 
 func! s:Observe(fn)
-  let b:polyglot_observe = a:fn
+  let b:PolyglotObserve = function("polyglot#" . a:fn)
   augroup polyglot-observer
     au! CursorHold,CursorHoldI,BufWritePost <buffer>
-      \ execute('if polyglot#' . b:polyglot_observe . '() | au! polyglot-observer | endif')
+          \ if b:PolyglotObserve() | au! polyglot-observer | endif
   augroup END
 endfunc
 

From af3ebda71002223b4bc6d4cc79a0359523eaa385 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 17 Oct 2020 14:17:55 +0200
Subject: [PATCH 137/299] Fix tests

---
 README.md                    |   6 +-
 autoload/context.vim         | 188 ++++++++++++++++++++++++++
 autoload/polyglot/sleuth.vim |   9 +-
 compiler/context.vim         |  58 ++++++++
 ftdetect/polyglot.vim        |  30 ++++-
 ftplugin/context.vim         | 106 +++++++++++++++
 ftplugin/docker-compose.vim  |   2 +-
 ftplugin/dockerfile.vim      |  20 +++
 ftplugin/man.vim             | 254 +++++++++++++++++++++++++++++++++++
 indent/context.vim           |  40 ++++++
 packages.yaml                |  39 +++++-
 syntax/context.vim           | 145 ++++++++++++++++++++
 syntax/docker-compose.vim    |   2 +-
 syntax/dockerfile.vim        |  49 +++++++
 syntax/man.vim               |  60 +++++++++
 syntax/xpm.vim               | 142 ++++++++++++++++++++
 syntax/xpm2.vim              | 157 ++++++++++++++++++++++
 tests/filetypes.vim          |   5 +
 18 files changed, 1298 insertions(+), 14 deletions(-)
 create mode 100644 autoload/context.vim
 create mode 100644 compiler/context.vim
 create mode 100644 ftplugin/context.vim
 create mode 100644 ftplugin/dockerfile.vim
 create mode 100644 ftplugin/man.vim
 create mode 100644 indent/context.vim
 create mode 100644 syntax/context.vim
 create mode 100644 syntax/dockerfile.vim
 create mode 100644 syntax/man.vim
 create mode 100644 syntax/xpm.vim
 create mode 100644 syntax/xpm2.vim

diff --git a/README.md b/README.md
index a6bffae79..9daa1461d 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->593<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->598<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -70,7 +70,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [dart](https://github.com/dart-lang/dart-vim-plugin) (Dart syntax highlighting for dart and drt files)
 - [dhall](https://github.com/vmchale/dhall-vim) (Dhall syntax highlighting for dhall files)
 - [dlang](https://github.com/JesseKPhillips/d.vim) (D syntax highlighting for d, di, lst, dd, ddoc and sdl files)
-- [dockerfile](https://github.com/ekalinin/Dockerfile.vim)
+- [docker-compose](https://github.com/ekalinin/Dockerfile.vim)
 - [elixir](https://github.com/elixir-lang/vim-elixir) (Elixir and HTML+EEX syntax highlighting for ex, exs, eex and leex files)
 - [elm](https://github.com/andys8/vim-elm-syntax) (Elm syntax highlighting for elm files)
 - [emberscript](https://github.com/yalesov/vim-ember-script) (EmberScript syntax highlighting for em and emberscript files)
@@ -138,7 +138,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [opencl](https://github.com/petRUShka/vim-opencl) (OpenCL syntax highlighting for cl and opencl files)
 - [perl](https://github.com/vim-perl/vim-perl) (Perl syntax highlighting for pl, al, cgi, fcgi, perl and 12 more files)
 - [pgsql](https://github.com/lifepillar/pgsql.vim) (PLpgSQL syntax highlighting for pgsql files)
-- [php](https://github.com/StanAngeloff/php.vim) (PHP syntax highlighting for php, aw, ctp, fcgi, inc and 6 more files)
+- [php](https://github.com/StanAngeloff/php.vim) (PHP syntax highlighting for php, aw, ctp, fcgi, inc and 7 more files)
 - [plantuml](https://github.com/aklt/plantuml-syntax) (PlantUML syntax highlighting for puml, iuml, plantuml, uml and pu files)
 - [pony](https://github.com/jakwings/vim-pony) (Pony syntax highlighting for pony files)
 - [powershell](https://github.com/PProvost/vim-ps1) (PowerShell syntax highlighting for ps1, psd1, psm1, pssc and ps1xml files)
diff --git a/autoload/context.vim b/autoload/context.vim
new file mode 100644
index 000000000..437864639
--- /dev/null
+++ b/autoload/context.vim
@@ -0,0 +1,188 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
+
+" Language:           ConTeXt typesetting engine
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Latest Revision:    2016 Oct 21
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+" Helper functions {{{
+function! s:context_echo(message, mode)
+  redraw
+  echo "\r"
+  execute 'echohl' a:mode
+  echomsg '[ConTeXt]' a:message
+  echohl None
+endf
+
+function! s:sh()
+  return has('win32') || has('win64') || has('win16') || has('win95')
+        \ ? ['cmd.exe', '/C']
+        \ : ['/bin/sh', '-c']
+endfunction
+
+" For backward compatibility
+if exists('*win_getid')
+
+  function! s:win_getid()
+    return win_getid()
+  endf
+
+  function! s:win_id2win(winid)
+    return win_id2win(a:winid)
+  endf
+
+else
+
+  function! s:win_getid()
+    return winnr()
+  endf
+
+  function! s:win_id2win(winnr)
+    return a:winnr
+  endf
+
+endif
+" }}}
+
+" ConTeXt jobs {{{
+if has('job')
+
+  let g:context_jobs = []
+
+  " Print the status of ConTeXt jobs
+  function! context#job_status()
+    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
+    let l:n = len(l:jobs)
+    call s:context_echo(
+          \ 'There '.(l:n == 1 ? 'is' : 'are').' '.(l:n == 0 ? 'no' : l:n)
+          \ .' job'.(l:n == 1 ? '' : 's').' running'
+          \ .(l:n == 0 ? '.' : ' (' . join(l:jobs, ', ').').'),
+          \ 'ModeMsg')
+  endfunction
+
+  " Stop all ConTeXt jobs
+  function! context#stop_jobs()
+    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
+    for job in l:jobs
+      call job_stop(job)
+    endfor
+    sleep 1
+    let l:tmp = []
+    for job in l:jobs
+      if job_status(job) == "run"
+        call add(l:tmp, job)
+      endif
+    endfor
+    let g:context_jobs = l:tmp
+    if empty(g:context_jobs)
+      call s:context_echo('Done. No jobs running.', 'ModeMsg')
+    else
+      call s:context_echo('There are still some jobs running. Please try again.', 'WarningMsg')
+    endif
+  endfunction
+
+  function! context#callback(path, job, status)
+    if index(g:context_jobs, a:job) != -1 && job_status(a:job) != 'run' " just in case
+      call remove(g:context_jobs, index(g:context_jobs, a:job))
+    endif
+    call s:callback(a:path, a:job, a:status)
+  endfunction
+
+  function! context#close_cb(channel)
+    call job_status(ch_getjob(a:channel)) " Trigger exit_cb's callback for faster feedback
+  endfunction
+
+  function! s:typeset(path)
+    call add(g:context_jobs,
+          \ job_start(add(s:sh(), context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))), {
+          \   'close_cb' : 'context#close_cb',
+          \   'exit_cb'  : function(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
+          \                         [a:path]),
+          \   'in_io'    : 'null'
+          \ }))
+  endfunction
+
+else " No jobs
+
+  function! context#job_status()
+    call s:context_echo('Not implemented', 'WarningMsg')
+  endfunction!
+
+  function! context#stop_jobs()
+    call s:context_echo('Not implemented', 'WarningMsg')
+  endfunction
+
+  function! context#callback(path, job, status)
+    call s:callback(a:path, a:job, a:status)
+  endfunction
+
+  function! s:typeset(path)
+    execute '!' . context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))
+    call call(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
+          \ [a:path, 0, v:shell_error])
+  endfunction
+
+endif " has('job')
+
+function! s:callback(path, job, status) abort
+  if a:status < 0 " Assume the job was terminated
+    return
+  endif
+  " Get info about the current window
+  let l:winid = s:win_getid()             " Save window id
+  let l:efm = &l:errorformat              " Save local errorformat
+  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
+  " Set errorformat to parse ConTeXt errors
+  execute 'setl efm=' . escape(b:context_errorformat, ' ')
+  try " Set cwd to expand error file correctly
+    execute 'lcd' fnameescape(fnamemodify(a:path, ':h'))
+  catch /.*/
+    execute 'setl efm=' . escape(l:efm, ' ')
+    throw v:exception
+  endtry
+  try
+    execute 'cgetfile' fnameescape(fnamemodify(a:path, ':r') . '.log')
+    botright cwindow
+  finally " Restore cwd and errorformat
+    execute s:win_id2win(l:winid) . 'wincmd w'
+    execute 'lcd ' . fnameescape(l:cwd)
+    execute 'setl efm=' . escape(l:efm, ' ')
+  endtry
+  if a:status == 0
+    call s:context_echo('Success!', 'ModeMsg')
+  else
+    call s:context_echo('There are errors. ', 'ErrorMsg')
+  endif
+endfunction
+
+function! context#command()
+  return get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
+        \ . ' --script context --autogenerate --nonstopmode'
+        \ . ' --synctex=' . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
+        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
+endfunction
+
+" Accepts an optional path (useful for big projects, when the file you are
+" editing is not the project's root document). If no argument is given, uses
+" the path of the current buffer.
+function! context#typeset(...) abort
+  let l:path = fnamemodify(strlen(a:000[0]) > 0 ? a:1 : expand("%"), ":p")
+  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
+  call s:context_echo('Typesetting...',  'ModeMsg')
+  execute 'lcd' fnameescape(fnamemodify(l:path, ":h"))
+  try
+    call s:typeset(l:path)
+  finally " Restore local working directory
+    execute 'lcd ' . fnameescape(l:cwd)
+  endtry
+endfunction!
+"}}}
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim: sw=2 fdm=marker
+
+endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index f8dc23444..db032dd6e 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -79,6 +79,7 @@ let s:globs = {
   \ 'conaryrecipe': '*.recipe',
   \ 'conf': '*.conf,auto.master,config',
   \ 'config': 'configure.in,configure.ac,Pipfile',
+  \ 'context': '*.mkii,*.mkiv,*.mkvi',
   \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh',
   \ 'cql': '*.cql',
   \ 'crm': '*.crm',
@@ -121,6 +122,7 @@ let s:globs = {
   \ 'diff': '*.diff,*.rej',
   \ 'dircolors': '.dir_colors,.dircolors',
   \ 'dnsmasq': '',
+  \ 'dockerfile': '*.Dockerfile,*.dock,Containerfile,Dockerfile,dockerfile,Dockerfile*',
   \ 'dosbatch': '*.bat,*.sys',
   \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,buildozer.spec,.editorconfig,.npmrc,php.ini-*',
   \ 'dot': '*.dot,*.gv',
@@ -307,6 +309,7 @@ let s:globs = {
   \ 'make': '*.mak,*.dsp,*.mk,*[mM]akefile',
   \ 'mako': '*.mako,*.mao',
   \ 'mallard': '*.page',
+  \ 'man': '*.1,*.1in,*.1m,*.1x,*.2,*.3,*.3in,*.3m,*.3p,*.3pm,*.3qt,*.3x,*.4,*.5,*.6,*.7,*.8,*.9,*.man,*.mdoc',
   \ 'manconf': 'man.config',
   \ 'map': '*.map',
   \ 'maple': '*.mv,*.mpl,*.mws',
@@ -382,7 +385,7 @@ let s:globs = {
   \ 'perl': '*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc,.gitolite.rc',
   \ 'pf': 'pf.conf',
   \ 'pfmain': 'main.cf',
-  \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,.php,.php_cs,.php_cs.dist,Phakefile',
+  \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,*.php9,.php,.php_cs,.php_cs.dist,Phakefile',
   \ 'pike': '*.pike,*.pmod',
   \ 'pilrc': '*.rcp',
   \ 'pine': '.pinerc,pinerc,.pinercex,pinercex',
@@ -449,7 +452,7 @@ let s:globs = {
   \ 'rrst': '*.rrst,*.srst',
   \ 'rst': '*.rst,*.rest,*.rest.txt,*.rst.txt',
   \ 'rtf': '*.rtf',
-  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb',
+  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,[Rr]antfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb',
   \ 'rust': '*.rs,*.rs.in',
   \ 'samba': 'smb.conf',
   \ 'sas': '*.sas',
@@ -601,6 +604,8 @@ let s:globs = {
   \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
   \ 'xml.twig': '*.xml.twig',
   \ 'xmodmap': '*Xmodmap,*xmodmap*',
+  \ 'xpm': '*.xpm,*.pm',
+  \ 'xpm2': '*.xpm2',
   \ 'xquery': '*.xq,*.xql,*.xqm,*.xquery,*.xqy',
   \ 'xs': '*.xs',
   \ 'xsd': '*.xsd',
diff --git a/compiler/context.vim b/compiler/context.vim
new file mode 100644
index 000000000..9c05b4146
--- /dev/null
+++ b/compiler/context.vim
@@ -0,0 +1,58 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
+
+" Vim compiler file
+" Compiler:     ConTeXt typesetting engine
+" Maintainer:   Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Last Change:  2016 Oct 21
+
+if exists("current_compiler")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+if exists(":CompilerSet") != 2    " older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+" If makefile exists and we are not asked to ignore it, we use standard make
+" (do not redefine makeprg)
+if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
+      \ (!filereadable('Makefile') && !filereadable('makefile'))
+  let current_compiler = 'context'
+  " The following assumes that the current working directory is set to the
+  " directory of the file to be typeset
+  let &l:makeprg = get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
+        \ . ' --script context --autogenerate --nonstopmode --synctex='
+        \ . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
+        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
+        \ . ' ' . shellescape(expand('%:p:t'))
+else
+  let current_compiler = 'make'
+endif
+
+let b:context_errorformat = ''
+      \ . '%-Popen source%.%#> %f,'
+      \ . '%-Qclose source%.%#> %f,'
+      \ . "%-Popen source%.%#name '%f',"
+      \ . "%-Qclose source%.%#name '%f',"
+      \ . '%Etex %trror%.%#mp error on line %l in file %f:%.%#,'
+      \ . 'tex %trror%.%#error on line %l in file %f: %m,'
+      \ . '%Elua %trror%.%#error on line %l in file %f:,'
+      \ . '%+Emetapost %#> error: %#,'
+      \ . '! error: %#%m,'
+      \ . '%-C %#,'
+      \ . '%C! %m,'
+      \ . '%Z[ctxlua]%m,'
+      \ . '%+C<*> %.%#,'
+      \ . '%-C%.%#,'
+      \ . '%Z...%m,'
+      \ . '%-Zno-error,'
+      \ . '%-G%.%#' " Skip remaining lines
+
+execute 'CompilerSet errorformat=' . escape(b:context_errorformat, ' ')
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+endif
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 0ff59e1b7..34dfdf8b0 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -126,6 +126,23 @@ augroup filetypedetect
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(s:disabled_packages, 'context')
+  au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi setf context
+endif
+
+if !has_key(s:disabled_packages, 'xpm2')
+  au BufNewFile,BufRead *.xpm2 setf xpm2
+endif
+
+if !has_key(s:disabled_packages, 'xpm')
+  au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au BufNewFile,BufRead *.xpm setf xpm
+endif
+
+if !has_key(s:disabled_packages, 'man')
+  au BufNewFile,BufRead *.1,*.1in,*.1m,*.1x,*.2,*.3,*.3in,*.3m,*.3p,*.3pm,*.3qt,*.3x,*.4,*.5,*.6,*.7,*.8,*.9,*.man,*.mdoc setf man
+endif
+
 if !has_key(s:disabled_packages, 'xf86conf')
   au BufNewFile,BufRead */xorg.conf.d/*.conf,xorg.conf,xorg.conf-4 setf xf86conf
   au BufNewFile,BufRead XF86Config-4* call s:StarSetf('xf86conf')
@@ -1530,6 +1547,11 @@ if !has_key(s:disabled_packages, 'dcd')
   au BufNewFile,BufRead *.dcd setf dcd
 endif
 
+if !has_key(s:disabled_packages, 'dockerfile')
+  au BufNewFile,BufRead *.Dockerfile,*.dock,Containerfile,Dockerfile,dockerfile setf dockerfile
+  au BufNewFile,BufRead Dockerfile* call s:StarSetf('dockerfile')
+endif
+
 if !has_key(s:disabled_packages, 'cuda')
   au BufNewFile,BufRead *.cu,*.cuh setf cuda
 endif
@@ -1572,7 +1594,7 @@ if !has_key(s:disabled_packages, 'chill')
 endif
 
 if !has_key(s:disabled_packages, 'debchangelog')
-  au BufNewFile,BufRead NEWS.Debian,NEWS.dch,changelog.Debian,changelog.dch setf debchangelog
+  au BufNewFile,BufRead */debian/changelog,NEWS.Debian,NEWS.dch,changelog.Debian,changelog.dch setf debchangelog
 endif
 
 if !has_key(s:disabled_packages, 'cterm')
@@ -1919,7 +1941,7 @@ if !has_key(s:disabled_packages, 'rspec')
 endif
 
 if !has_key(s:disabled_packages, 'ruby')
-  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Rantfile,Routefile,Snapfile,Thorfile,Vagrantfile,buildfile,vagrantfile setf ruby
+  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Routefile,Snapfile,Thorfile,Vagrantfile,[Rr]antfile,buildfile,vagrantfile setf ruby
   au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
   au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml setf eruby
 endif
@@ -2012,7 +2034,7 @@ if !has_key(s:disabled_packages, 'blade')
 endif
 
 if !has_key(s:disabled_packages, 'php')
-  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile setf php
+  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.php9,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile setf php
 endif
 
 if !has_key(s:disabled_packages, 'cql')
@@ -2333,7 +2355,7 @@ if !has_key(s:disabled_packages, 'elixir')
   au BufNewFile,BufRead *.eex,*.leex setf eelixir
 endif
 
-if !has_key(s:disabled_packages, 'dockerfile')
+if !has_key(s:disabled_packages, 'docker-compose')
   au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml setf yaml.docker-compose
 endif
 
diff --git a/ftplugin/context.vim b/ftplugin/context.vim
new file mode 100644
index 000000000..2e68ecfc1
--- /dev/null
+++ b/ftplugin/context.vim
@@ -0,0 +1,106 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
+
+" Vim filetype plugin file
+" Language:           ConTeXt typesetting engine
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Nikolai Weibull <now@bitwi.se>
+" Latest Revision:    2016 Oct 30
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if !exists('current_compiler')
+  compiler context
+endif
+
+let b:undo_ftplugin = "setl com< cms< def< inc< sua< fo< ofu<"
+      \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
+
+setlocal comments=b:%D,b:%C,b:%M,:% commentstring=%\ %s formatoptions+=tjcroql2
+if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
+  setlocal omnifunc=contextcomplete#Complete
+  let g:omni_syntax_group_include_context = 'mf\w\+,mp\w\+'
+  let g:omni_syntax_group_exclude_context = 'mfTodoComment'
+endif
+
+let &l:define='\\\%([egx]\|char\|mathchar\|count\|dimen\|muskip\|skip\|toks\)\='
+        \ .     'def\|\\font\|\\\%(future\)\=let'
+        \ . '\|\\new\%(count\|dimen\|skip\|muskip\|box\|toks\|read\|write'
+        \ .     '\|fam\|insert\|if\)'
+
+let &l:include = '^\s*\\\%(input\|component\|product\|project\|environment\)'
+
+setlocal suffixesadd=.tex
+
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_skip = 'r:\\\@<!\%(\\\\\)*%'
+  let b:match_words = '(:),\[:],{:},\\(:\\),\\\[:\\],' .
+        \ '\\start\(\a\+\):\\stop\1'
+endif
+
+let s:context_regex = {
+      \ 'beginsection' : '\\\%(start\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
+      \ 'endsection'   : '\\\%(stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
+      \ 'beginblock'   : '\\\%(start\|setup\|define\)',
+      \ 'endblock'     : '\\\%(stop\|setup\|define\)'
+      \ }
+
+function! s:move_around(count, what, flags, visual)
+  if a:visual
+    exe "normal! gv"
+  endif
+  call search(s:context_regex[a:what], a:flags.'s') " 's' sets previous context mark
+  call map(range(2, a:count), 'search(s:context_regex[a:what], a:flags)')
+endfunction
+
+" Move around macros.
+nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
+vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
+vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
+nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
+vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
+nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
+vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
+
+" Other useful mappings
+if get(g:, 'context_mappings', 1)
+  let s:tp_regex = '?^$\|^\s*\\\(item\|start\|stop\|blank\|\%(sub\)*section\|chapter\|\%(sub\)*subject\|title\|part\)'
+
+  fun! s:tp()
+    call cursor(search(s:tp_regex, 'bcW') + 1, 1)
+    normal! V
+    call cursor(search(s:tp_regex, 'W') - 1, 1)
+  endf
+
+  " Reflow paragraphs with commands like gqtp ("gq TeX paragraph")
+  onoremap <silent><buffer> tp :<c-u>call <sid>tp()<cr>
+  " Select TeX paragraph
+  vnoremap <silent><buffer> tp <esc>:<c-u>call <sid>tp()<cr>
+
+  " $...$ text object
+  onoremap <silent><buffer> i$ :<c-u>normal! T$vt$<cr>
+  onoremap <silent><buffer> a$ :<c-u>normal! F$vf$<cr>
+  vnoremap <buffer> i$ T$ot$
+  vnoremap <buffer> a$ F$of$
+endif
+
+" Commands for asynchronous typesetting
+command! -buffer -nargs=? -complete=file ConTeXt          call context#typeset(<q-args>)
+command!         -nargs=0                ConTeXtJobStatus call context#job_status()
+command!         -nargs=0                ConTeXtStopJobs  call context#stop_jobs()
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/ftplugin/docker-compose.vim b/ftplugin/docker-compose.vim
index 82896b057..e80041e25 100644
--- a/ftplugin/docker-compose.vim
+++ b/ftplugin/docker-compose.vim
@@ -1,4 +1,4 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'docker-compose') == -1
 
 " Define comment string
 setlocal commentstring=#\ %s
diff --git a/ftplugin/dockerfile.vim b/ftplugin/dockerfile.vim
new file mode 100644
index 000000000..3780119aa
--- /dev/null
+++ b/ftplugin/dockerfile.vim
@@ -0,0 +1,20 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
+
+" Vim filetype plugin
+" Language:	Dockerfile
+" Maintainer:   Honza Pokorny <http://honza.ca>
+" Last Change:	2014 Aug 29
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl commentstring<"
+
+setlocal commentstring=#\ %s
+
+endif
diff --git a/ftplugin/man.vim b/ftplugin/man.vim
new file mode 100644
index 000000000..300129c2a
--- /dev/null
+++ b/ftplugin/man.vim
@@ -0,0 +1,254 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'man') == -1
+
+" Vim filetype plugin file
+" Language:	man
+" Maintainer:	Jason Franklin <vim@justemail.net>
+" Maintainer:	SungHyun Nam <goweol@gmail.com>
+" Last Change: 	2020 Jun 01
+
+" To make the ":Man" command available before editing a manual page, source
+" this script from your startup vimrc file.
+
+" If 'filetype' isn't "man", we must have been called to only define ":Man".
+if &filetype == "man"
+
+  " Only do this when not done yet for this buffer
+  if exists("b:did_ftplugin")
+    finish
+  endif
+  let b:did_ftplugin = 1
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+if &filetype == "man"
+  " allow dot and dash in manual page name.
+  setlocal iskeyword+=\.,-
+  let b:undo_ftplugin = "setlocal iskeyword<"
+
+  " Add mappings, unless the user didn't want this.
+  if !exists("no_plugin_maps") && !exists("no_man_maps")
+    if !hasmapto('<Plug>ManBS')
+      nmap <buffer> <LocalLeader>h <Plug>ManBS
+      let b:undo_ftplugin = b:undo_ftplugin
+	    \ . '|silent! nunmap <buffer> <LocalLeader>h'
+    endif
+    nnoremap <buffer> <Plug>ManBS :%s/.\b//g<CR>:setl nomod<CR>''
+
+    nnoremap <buffer> <silent> <c-]> :call <SID>PreGetPage(v:count)<CR>
+    nnoremap <buffer> <silent> <c-t> :call <SID>PopPage()<CR>
+    nnoremap <buffer> <silent> q :q<CR>
+
+    " Add undo commands for the maps
+    let b:undo_ftplugin = b:undo_ftplugin
+	  \ . '|silent! nunmap <buffer> <Plug>ManBS'
+	  \ . '|silent! nunmap <buffer> <c-]>'
+	  \ . '|silent! nunmap <buffer> <c-t>'
+	  \ . '|silent! nunmap <buffer> q'
+  endif
+
+  if exists('g:ft_man_folding_enable') && (g:ft_man_folding_enable == 1)
+    setlocal foldmethod=indent foldnestmax=1 foldenable
+    let b:undo_ftplugin = b:undo_ftplugin
+	  \ . '|silent! setl fdm< fdn< fen<'
+  endif
+
+endif
+
+if exists(":Man") != 2
+  com -nargs=+ -complete=shellcmd Man call s:GetPage(<q-mods>, <f-args>)
+  nmap <Leader>K :call <SID>PreGetPage(0)<CR>
+  nmap <Plug>ManPreGetPage :call <SID>PreGetPage(0)<CR>
+endif
+
+" Define functions only once.
+if !exists("s:man_tag_depth")
+
+let s:man_tag_depth = 0
+
+let s:man_sect_arg = ""
+let s:man_find_arg = "-w"
+try
+  if !has("win32") && $OSTYPE !~ 'cygwin\|linux' && system('uname -s') =~ "SunOS" && system('uname -r') =~ "^5"
+    let s:man_sect_arg = "-s"
+    let s:man_find_arg = "-l"
+  endif
+catch /E145:/
+  " Ignore the error in restricted mode
+endtry
+
+func <SID>PreGetPage(cnt)
+  if a:cnt == 0
+    let old_isk = &iskeyword
+    if &ft == 'man'
+      setl iskeyword+=(,)
+    endif
+    let str = expand("<cword>")
+    let &l:iskeyword = old_isk
+    let page = substitute(str, '(*\(\k\+\).*', '\1', '')
+    let sect = substitute(str, '\(\k\+\)(\([^()]*\)).*', '\2', '')
+    if match(sect, '^[0-9 ]\+$') == -1
+      let sect = ""
+    endif
+    if sect == page
+      let sect = ""
+    endif
+  else
+    let sect = a:cnt
+    let page = expand("<cword>")
+  endif
+  call s:GetPage('', sect, page)
+endfunc
+
+func <SID>GetCmdArg(sect, page)
+  if a:sect == ''
+    return a:page
+  endif
+  return s:man_sect_arg.' '.a:sect.' '.a:page
+endfunc
+
+func <SID>FindPage(sect, page)
+  let where = system("man ".s:man_find_arg.' '.s:GetCmdArg(a:sect, a:page))
+  if where !~ "^/"
+    if matchstr(where, " [^ ]*$") !~ "^ /"
+      return 0
+    endif
+  endif
+  return 1
+endfunc
+
+func <SID>GetPage(cmdmods, ...)
+  if a:0 >= 2
+    let sect = a:1
+    let page = a:2
+  elseif a:0 >= 1
+    let sect = ""
+    let page = a:1
+  else
+    return
+  endif
+
+  " To support:	    nmap K :Man <cword>
+  if page == '<cword>'
+    let page = expand('<cword>')
+  endif
+
+  if !exists('g:ft_man_no_sect_fallback') || (g:ft_man_no_sect_fallback == 0)
+    if sect != "" && s:FindPage(sect, page) == 0
+      let sect = ""
+    endif
+  endif
+  if s:FindPage(sect, page) == 0
+    let msg = 'man.vim: no manual entry for "' . page . '"'
+    if !empty(sect)
+      let msg .= ' in section ' . sect
+    endif
+    echomsg msg
+    return
+  endif
+  exec "let s:man_tag_buf_".s:man_tag_depth." = ".bufnr("%")
+  exec "let s:man_tag_lin_".s:man_tag_depth." = ".line(".")
+  exec "let s:man_tag_col_".s:man_tag_depth." = ".col(".")
+  let s:man_tag_depth = s:man_tag_depth + 1
+
+  let open_cmd = 'edit'
+
+  " Use an existing "man" window if it exists, otherwise open a new one.
+  if &filetype != "man"
+    let thiswin = winnr()
+    exe "norm! \<C-W>b"
+    if winnr() > 1
+      exe "norm! " . thiswin . "\<C-W>w"
+      while 1
+	if &filetype == "man"
+	  break
+	endif
+	exe "norm! \<C-W>w"
+	if thiswin == winnr()
+	  break
+	endif
+      endwhile
+    endif
+    if &filetype != "man"
+      if exists("g:ft_man_open_mode")
+        if g:ft_man_open_mode == 'vert'
+	  let open_cmd = 'vsplit'
+        elseif g:ft_man_open_mode == 'tab'
+	  let open_cmd = 'tabedit'
+        else
+	  let open_cmd = 'split'
+        endif
+      else
+	let open_cmd = a:cmdmods . ' split'
+      endif
+    endif
+  endif
+
+  silent execute open_cmd . " $HOME/" . page . '.' . sect . '~'
+
+  " Avoid warning for editing the dummy file twice
+  setl buftype=nofile noswapfile
+
+  setl fdc=0 ma nofen nonu nornu
+  %delete _
+  let unsetwidth = 0
+  if empty($MANWIDTH)
+    let $MANWIDTH = winwidth(0)
+    let unsetwidth = 1
+  endif
+
+  " Ensure Vim is not recursively invoked (man-db does this) when doing ctrl-[
+  " on a man page reference by unsetting MANPAGER.
+  " Some versions of env(1) do not support the '-u' option, and in such case
+  " we set MANPAGER=cat.
+  if !exists('s:env_has_u')
+    call system('env -u x true')
+    let s:env_has_u = (v:shell_error == 0)
+  endif
+  let env_cmd = s:env_has_u ? 'env -u MANPAGER' : 'env MANPAGER=cat'
+  let env_cmd .= ' GROFF_NO_SGR=1'
+  let man_cmd = env_cmd . ' man ' . s:GetCmdArg(sect, page) . ' | col -b'
+  silent exec "r !" . man_cmd
+
+  if unsetwidth
+    let $MANWIDTH = ''
+  endif
+  " Remove blank lines from top and bottom.
+  while line('$') > 1 && getline(1) =~ '^\s*$'
+    1delete _
+  endwhile
+  while line('$') > 1 && getline('$') =~ '^\s*$'
+    $delete _
+  endwhile
+  1
+  setl ft=man nomod
+  setl bufhidden=hide
+  setl nobuflisted
+  setl noma
+endfunc
+
+func <SID>PopPage()
+  if s:man_tag_depth > 0
+    let s:man_tag_depth = s:man_tag_depth - 1
+    exec "let s:man_tag_buf=s:man_tag_buf_".s:man_tag_depth
+    exec "let s:man_tag_lin=s:man_tag_lin_".s:man_tag_depth
+    exec "let s:man_tag_col=s:man_tag_col_".s:man_tag_depth
+    exec s:man_tag_buf."b"
+    exec s:man_tag_lin
+    exec "norm! ".s:man_tag_col."|"
+    exec "unlet s:man_tag_buf_".s:man_tag_depth
+    exec "unlet s:man_tag_lin_".s:man_tag_depth
+    exec "unlet s:man_tag_col_".s:man_tag_depth
+    unlet s:man_tag_buf s:man_tag_lin s:man_tag_col
+  endif
+endfunc
+
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: set sw=2 ts=8 noet:
+
+endif
diff --git a/indent/context.vim b/indent/context.vim
new file mode 100644
index 000000000..16ec08298
--- /dev/null
+++ b/indent/context.vim
@@ -0,0 +1,40 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
+
+" ConTeXt indent file
+" Language: ConTeXt typesetting engine
+" Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Last Change:  2016 Oct 15
+
+if exists("b:did_indent")
+  finish
+endif
+
+if !get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
+  finish
+endif
+
+" Load MetaPost indentation script
+runtime! indent/mp.vim
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+setlocal indentexpr=GetConTeXtIndent()
+
+let b:undo_indent = "setl indentexpr<"
+
+function! GetConTeXtIndent()
+  " Use MetaPost rules inside MetaPost graphic environments
+  if len(synstack(v:lnum, 1)) > 0 &&
+        \ synIDattr(synstack(v:lnum, 1)[0], "name") ==# 'contextMPGraphic'
+    return GetMetaPostIndent()
+  endif
+  return -1
+endfunc
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim:sw=2
+
+endif
diff --git a/packages.yaml b/packages.yaml
index a58497f25..fc6a702db 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -498,7 +498,7 @@ filetypes:
   extensions:
   - sdl
 ---
-name: dockerfile
+name: docker-compose
 remote: ekalinin/Dockerfile.vim
 glob: '**/docker-compose.vim'
 filetypes:
@@ -1227,6 +1227,7 @@ filetypes:
   linguist: PHP
   extra_extensions:
   - phtml
+  - php9
 ---
 name: blade
 remote: jwalton512/vim-blade
@@ -1417,7 +1418,7 @@ filetypes:
   - cap
   - opal
   extra_filenames:
-  - Rantfile
+  - '[Rr]antfile'
   - ".autotest"
   - Cheffile
   - KitchenSink
@@ -2228,7 +2229,7 @@ glob: "**/debchangelog.vim"
 filetypes:
 - name: debchangelog
   patterns:
-  - pattern: changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch
+  - pattern: changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch,*/debian/changelog
 ---
 name: chill
 remote: vim/vim:runtime
@@ -5506,3 +5507,35 @@ filetypes:
 - name: xf86conf
   patterns:
   - pattern: "XF86Config-4*,XF86Config*,*/xorg.conf.d/*.conf,xorg.conf,xorg.conf-4"
+---
+name: man
+remote: vim/vim:runtime
+glob: "**/man.vim"
+filetypes:
+- name: man
+  linguist: Roff Manpage
+---
+name: xpm
+remote: vim/vim:runtime
+glob: "**/xpm.vim"
+filetypes:
+- name: xpm
+  linguist: X PixMap
+---
+name: xpm2
+remote: vim/vim:runtime
+glob: "**/xpm2.vim"
+filetypes:
+- name: xpm2
+  patterns:
+  - pattern: '*.xpm2'
+    description: X PixMap 2
+---
+name: context
+remote: vim/vim:runtime
+glob: "**/context.vim"
+filetypes:
+- name: context
+  patterns:
+  - pattern: '*.mkii,*.mkiv,*.mkvi'
+    description: ConTeXt
diff --git a/syntax/context.vim b/syntax/context.vim
new file mode 100644
index 000000000..433287dfa
--- /dev/null
+++ b/syntax/context.vim
@@ -0,0 +1,145 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
+
+" Vim syntax file
+" Language:           ConTeXt typesetting engine
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Nikolai Weibull <now@bitwi.se>
+" Latest Revision:    2016 Oct 16
+
+if exists("b:current_syntax")
+  finish
+endif
+
+runtime! syntax/plaintex.vim
+unlet b:current_syntax
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Dictionary of (filetype, group) pairs to highlight between \startGROUP \stopGROUP.
+let s:context_include = get(b:, 'context_include', get(g:, 'context_include', {'xml': 'XML'}))
+
+" For backward compatibility (g:context_include used to be a List)
+if type(s:context_include) ==# type([])
+  let g:context_metapost = (index(s:context_include, 'mp') != -1)
+  let s:context_include = filter(
+        \ {'c': 'C', 'javascript': 'JS', 'ruby': 'Ruby', 'xml': 'XML'},
+        \ { k,_ -> index(s:context_include, k) != -1 }
+        \ )
+endif
+
+syn iskeyword @,48-57,a-z,A-Z,192-255
+
+syn spell   toplevel
+
+" ConTeXt options, i.e., [...] blocks
+syn region  contextOptions    matchgroup=contextDelimiter start='\['  end=']\|\ze\\stop' skip='\\\[\|\\\]' contains=ALLBUT,contextBeginEndLua,@Spell
+
+" Highlight braces
+syn match   contextDelimiter  '[{}]'
+
+" Comments
+syn match   contextComment '\\\@<!\%(\\\\\)*\zs%.*$' display contains=initexTodo
+syn match   contextComment '^\s*%[CDM].*$'           display contains=initexTodo
+
+syn match   contextBlockDelim '\\\%(start\|stop\)\a\+' contains=@NoSpell
+
+syn region  contextEscaped    matchgroup=contextPreProc start='\\type\%(\s*\|\n\)*\z([^A-Za-z%]\)' end='\z1'
+syn region  contextEscaped    matchgroup=contextPreProc start='\\type\=\%(\s\|\n\)*{' end='}'
+syn region  contextEscaped    matchgroup=contextPreProc start='\\type\=\%(\s*\|\n\)*<<' end='>>'
+syn region  contextEscaped    matchgroup=contextPreProc
+                              \ start='\\start\z(\a*\%(typing\|typen\)\)'
+                              \ end='\\stop\z1' contains=plaintexComment keepend
+syn region  contextEscaped    matchgroup=contextPreProc start='\\\h\+Type\%(\s\|\n\)*{' end='}'
+syn region  contextEscaped    matchgroup=contextPreProc start='\\Typed\h\+\%(\s\|\n\)*{' end='}'
+
+syn match   contextBuiltin    display contains=@NoSpell
+      \ '\\\%(unprotect\|protect\|unexpanded\)\>'
+
+syn match   contextPreProc    '^\s*\\\%(start\|stop\)\=\%(component\|environment\|project\|product\)\>'
+                              \ contains=@NoSpell
+
+if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
+  let b:mp_metafun_macros = 1 " Highlight MetaFun keywords
+  syn include @mpTop          syntax/mp.vim
+  unlet b:current_syntax
+
+  syn region  contextMPGraphic  matchgroup=contextBlockDelim
+                                \ start='\\start\z(MP\%(clip\|code\|definitions\|drawing\|environment\|extensions\|inclusions\|initializations\|page\|\)\)\>.*$'
+                                \ end='\\stop\z1'
+                                \ contains=@mpTop,@NoSpell
+  syn region  contextMPGraphic  matchgroup=contextBlockDelim
+                                \ start='\\start\z(\%(\%[re]usable\|use\|unique\|static\)MPgraphic\|staticMPfigure\|uniqueMPpagegraphic\)\>.*$'
+                                \ end='\\stop\z1'
+                                \ contains=@mpTop,@NoSpell
+endif
+
+if get(b:, 'context_lua', get(g:, 'context_lua', 1))
+  syn include @luaTop          syntax/lua.vim
+  unlet b:current_syntax
+
+  syn region  contextLuaCode    matchgroup=contextBlockDelim
+                                \ start='\\startluacode\>'
+                                \ end='\\stopluacode\>' keepend
+                                \ contains=@luaTop,@NoSpell
+
+  syn match   contextDirectLua  "\\\%(directlua\|ctxlua\)\>\%(\s*%.*$\)\="
+                                \ nextgroup=contextBeginEndLua skipwhite skipempty
+                                \ contains=initexComment
+  syn region  contextBeginEndLua matchgroup=contextSpecial
+                                \ start="{" end="}" skip="\\[{}]"
+                                \ contained contains=@luaTop,@NoSpell
+endif
+
+for synname in keys(s:context_include)
+  execute 'syn include @' . synname . 'Top' 'syntax/' . synname . '.vim'
+  unlet b:current_syntax
+  execute 'syn region context' . s:context_include[synname] . 'Code'
+        \ 'matchgroup=contextBlockDelim'
+        \ 'start=+\\start' . s:context_include[synname] . '+'
+        \ 'end=+\\stop' . s:context_include[synname] . '+'
+        \ 'contains=@' . synname . 'Top,@NoSpell'
+endfor
+
+syn match   contextSectioning '\\\%(start\|stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>'
+                              \ contains=@NoSpell
+
+syn match   contextSpecial    '\\crlf\>\|\\par\>\|-\{2,3}\||[<>/]\=|'
+                              \ contains=@NoSpell
+syn match   contextSpecial    /\\[`'"]/
+syn match   contextSpecial    +\\char\%(\d\{1,3}\|'\o\{1,3}\|"\x\{1,2}\)\>+
+                              \ contains=@NoSpell
+syn match   contextSpecial    '\^\^.'
+syn match   contextSpecial    '`\%(\\.\|\^\^.\|.\)'
+
+syn match   contextStyle      '\\\%(em\|ss\|hw\|cg\|mf\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(CAP\|Cap\|cap\|Caps\|kap\|nocap\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(Word\|WORD\|Words\|WORDS\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(vi\{1,3}\|ix\|xi\{0,2}\)\>'
+                              \ contains=@NoSpell
+syn match   contextFont       '\\\%(tf\|b[si]\|s[cl]\|os\)\%(xx\|[xabcd]\)\=\>'
+                              \ contains=@NoSpell
+
+hi def link contextOptions    Typedef
+hi def link contextComment    Comment
+hi def link contextBlockDelim Keyword
+hi def link contextBuiltin    Keyword
+hi def link contextDelimiter  Delimiter
+hi def link contextEscaped    String
+hi def link contextPreProc    PreProc
+hi def link contextSectioning PreProc
+hi def link contextSpecial    Special
+hi def link contextType       Type
+hi def link contextStyle      contextType
+hi def link contextFont       contextType
+hi def link contextDirectLua  Keyword
+
+let b:current_syntax = "context"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif
diff --git a/syntax/docker-compose.vim b/syntax/docker-compose.vim
index 92121065e..33582ec84 100644
--- a/syntax/docker-compose.vim
+++ b/syntax/docker-compose.vim
@@ -1,4 +1,4 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'docker-compose') == -1
 
 " Vim syntax file
 " Language: Dockerfile
diff --git a/syntax/dockerfile.vim b/syntax/dockerfile.vim
new file mode 100644
index 000000000..35ed34daa
--- /dev/null
+++ b/syntax/dockerfile.vim
@@ -0,0 +1,49 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
+
+" dockerfile.vim - Syntax highlighting for Dockerfiles
+" Maintainer:   Honza Pokorny <https://honza.ca>
+" Last Change:  2020 Feb 11
+" License:      BSD
+
+" https://docs.docker.com/engine/reference/builder/
+
+if exists("b:current_syntax")
+    finish
+endif
+
+syntax include @JSON syntax/json.vim
+unlet b:current_syntax
+
+syntax include @Shell syntax/sh.vim
+unlet b:current_syntax
+
+syntax case ignore
+syntax match dockerfileLinePrefix /\v^\s*(ONBUILD\s+)?\ze\S/ contains=dockerfileKeyword nextgroup=dockerfileInstruction skipwhite
+syntax region dockerfileFrom matchgroup=dockerfileKeyword start=/\v^\s*(FROM)\ze(\s|$)/ skip=/\v\\\_./ end=/\v((^|\s)AS(\s|$)|$)/ contains=dockerfileOption
+
+syntax keyword dockerfileKeyword contained ADD ARG CMD COPY ENTRYPOINT ENV EXPOSE HEALTHCHECK LABEL MAINTAINER ONBUILD RUN SHELL STOPSIGNAL USER VOLUME WORKDIR
+syntax match dockerfileOption contained /\v(^|\s)\zs--\S+/
+
+syntax match dockerfileInstruction contained /\v<(\S+)>(\s+--\S+)*/             contains=dockerfileKeyword,dockerfileOption skipwhite nextgroup=dockerfileValue
+syntax match dockerfileInstruction contained /\v<(ADD|COPY)>(\s+--\S+)*/        contains=dockerfileKeyword,dockerfileOption skipwhite nextgroup=dockerfileJSON
+syntax match dockerfileInstruction contained /\v<(HEALTHCHECK)>(\s+--\S+)*/     contains=dockerfileKeyword,dockerfileOption skipwhite nextgroup=dockerfileInstruction
+syntax match dockerfileInstruction contained /\v<(CMD|ENTRYPOINT|RUN)>/         contains=dockerfileKeyword skipwhite nextgroup=dockerfileShell
+syntax match dockerfileInstruction contained /\v<(CMD|ENTRYPOINT|RUN)>\ze\s+\[/ contains=dockerfileKeyword skipwhite nextgroup=dockerfileJSON
+syntax match dockerfileInstruction contained /\v<(SHELL|VOLUME)>/               contains=dockerfileKeyword skipwhite nextgroup=dockerfileJSON
+
+syntax region dockerfileString contained start=/\v"/ skip=/\v\\./ end=/\v"/
+syntax region dockerfileJSON   contained keepend start=/\v\[/ skip=/\v\\\_./ end=/\v$/ contains=@JSON
+syntax region dockerfileShell  contained keepend start=/\v/ skip=/\v\\\_./ end=/\v$/ contains=@Shell
+syntax region dockerfileValue  contained keepend start=/\v/ skip=/\v\\\_./ end=/\v$/ contains=dockerfileString
+
+syntax region dockerfileComment start=/\v^\s*#/ end=/\v$/
+set commentstring=#\ %s
+
+hi def link dockerfileString String
+hi def link dockerfileKeyword Keyword
+hi def link dockerfileComment Comment
+hi def link dockerfileOption Special
+
+let b:current_syntax = "dockerfile"
+
+endif
diff --git a/syntax/man.vim b/syntax/man.vim
new file mode 100644
index 000000000..c607f0e43
--- /dev/null
+++ b/syntax/man.vim
@@ -0,0 +1,60 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'man') == -1
+
+" Vim syntax file
+" Language:	Man page
+" Maintainer:	Jason Franklin <vim@justemail.net>
+" Previous Maintainer:	SungHyun Nam <goweol@gmail.com>
+" Previous Maintainer:	Gautam H. Mudunuri <gmudunur@informatica.com>
+" Version Info:
+" Last Change:	2020 Sep 19
+
+" Additional highlighting by Johannes Tanzler <johannes.tanzler@aon.at>:
+"	* manSubHeading
+"	* manSynopsis (only for sections 2 and 3)
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Get the CTRL-H syntax to handle backspaced text
+runtime! syntax/ctrlh.vim
+
+syn case ignore
+
+syn match  manReference       "\f\+([1-9][a-z]\=)"
+syn match  manSectionHeading  "^\a.*$"
+syn match  manSubHeading      "^\s\{3\}\a.*$"
+syn match  manOptionDesc      "^\s*[+-][a-z0-9]\S*"
+syn match  manLongOptionDesc  "^\s*--[a-z0-9-]\S*"
+" syn match  manHistory		"^[a-z].*last change.*$"
+
+syn match manHeader '\%1l.*'
+exe 'syn match manFooter ''\%' . line('$') . 'l.*'''
+
+if getline(1) =~ '^[a-zA-Z_]\+([23])'
+  syntax include @cCode <sfile>:p:h/c.vim
+  syn match manCFuncDefinition  display "\<\h\w*\>\s*("me=e-1 contained
+  syn region manSynopsis start="^SYNOPSIS"hs=s+8 end="^\u\+\s*$"me=e-12 keepend contains=manSectionHeading,@cCode,manCFuncDefinition
+endif
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link manHeader Title
+hi def link manFooter PreProc
+
+hi def link manSectionHeading  Statement
+hi def link manOptionDesc	    Constant
+hi def link manLongOptionDesc  Constant
+hi def link manReference	    PreProc
+hi def link manSubHeading      Function
+hi def link manCFuncDefinition Function
+
+
+let b:current_syntax = "man"
+
+" vim:ts=8 sts=2 sw=2:
+
+endif
diff --git a/syntax/xpm.vim b/syntax/xpm.vim
new file mode 100644
index 000000000..7e741cad6
--- /dev/null
+++ b/syntax/xpm.vim
@@ -0,0 +1,142 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xpm') == -1
+
+" Vim syntax file
+" Language:	X Pixmap
+" Maintainer:	Ronald Schild <rs@scutum.de>
+" Last Change:	2017 Feb 01
+" Version:	5.4n.1
+"               Jemma Nelson added termguicolors support
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syn keyword xpmType		char
+syn keyword xpmStorageClass	static
+syn keyword xpmTodo		TODO FIXME XXX  contained
+syn region  xpmComment		start="/\*"  end="\*/"  contains=xpmTodo
+syn region  xpmPixelString	start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=@xpmColors
+
+if has("gui_running") || has("termguicolors") && &termguicolors
+
+let color  = ""
+let chars  = ""
+let colors = 0
+let cpp    = 0
+let n      = 0
+let i      = 1
+
+while i <= line("$")		" scanning all lines
+
+   let s = matchstr(getline(i), '".\{-1,}"')
+   if s != ""			" does line contain a string?
+
+      if n == 0			" first string is the Values string
+
+	 " get the 3rd value: colors = number of colors
+	 let colors = substitute(s, '"\s*\d\+\s\+\d\+\s\+\(\d\+\).*"', '\1', '')
+	 " get the 4th value: cpp = number of character per pixel
+	 let cpp = substitute(s, '"\s*\d\+\s\+\d\+\s\+\d\+\s\+\(\d\+\).*"', '\1', '')
+	 if cpp =~ '[^0-9]'
+	    break  " if cpp is not made of digits there must be something wrong
+	 endif
+
+	 " Highlight the Values string as normal string (no pixel string).
+	 " Only when there is no slash, it would terminate the pattern.
+	 if s !~ '/'
+	    exe 'syn match xpmValues /' . s . '/'
+	 endif
+	 hi link xpmValues String
+
+	 let n = 1		" n = color index
+
+      elseif n <= colors	" string is a color specification
+
+	 " get chars = <cpp> length string representing the pixels
+	 " (first incl. the following whitespace)
+	 let chars = substitute(s, '"\(.\{'.cpp.'}\s\).*"', '\1', '')
+
+	 " now get color, first try 'c' key if any (color visual)
+	 let color = substitute(s, '".*\sc\s\+\(.\{-}\)\s*\(\(g4\=\|[ms]\)\s.*\)*\s*"', '\1', '')
+	 if color == s
+	    " no 'c' key, try 'g' key (grayscale with more than 4 levels)
+	    let color = substitute(s, '".*\sg\s\+\(.\{-}\)\s*\(\(g4\|[ms]\)\s.*\)*\s*"', '\1', '')
+	    if color == s
+	       " next try: 'g4' key (4-level grayscale)
+	       let color = substitute(s, '".*\sg4\s\+\(.\{-}\)\s*\([ms]\s.*\)*\s*"', '\1', '')
+	       if color == s
+		  " finally try 'm' key (mono visual)
+		  let color = substitute(s, '".*\sm\s\+\(.\{-}\)\s*\(s\s.*\)*\s*"', '\1', '')
+		  if color == s
+		     let color = ""
+		  endif
+	       endif
+	    endif
+	 endif
+
+	 " Vim cannot handle RGB codes with more than 6 hex digits
+	 if color =~ '#\x\{10,}$'
+	    let color = substitute(color, '\(\x\x\)\x\x', '\1', 'g')
+	 elseif color =~ '#\x\{7,}$'
+	    let color = substitute(color, '\(\x\x\)\x', '\1', 'g')
+	 " nor with 3 digits
+	 elseif color =~ '#\x\{3}$'
+	    let color = substitute(color, '\(\x\)\(\x\)\(\x\)', '0\10\20\3', '')
+	 endif
+
+	 " escape meta characters in patterns
+	 let s = escape(s, '/\*^$.~[]')
+	 let chars = escape(chars, '/\*^$.~[]')
+
+	 " now create syntax items
+	 " highlight the color string as normal string (no pixel string)
+	 exe 'syn match xpmCol'.n.'Def /'.s.'/ contains=xpmCol'.n.'inDef'
+	 exe 'hi link xpmCol'.n.'Def String'
+
+	 " but highlight the first whitespace after chars in its color
+	 exe 'syn match xpmCol'.n.'inDef /"'.chars.'/hs=s+'.(cpp+1).' contained'
+	 exe 'hi link xpmCol'.n.'inDef xpmColor'.n
+
+	 " remove the following whitespace from chars
+	 let chars = substitute(chars, '.$', '', '')
+
+	 " and create the syntax item contained in the pixel strings
+	 exe 'syn match xpmColor'.n.' /'.chars.'/ contained'
+	 exe 'syn cluster xpmColors add=xpmColor'.n
+
+	 " if no color or color = "None" show background
+	 if color == ""  ||  substitute(color, '.*', '\L&', '') == 'none'
+	    exe 'hi xpmColor'.n.' guifg=bg'
+	    exe 'hi xpmColor'.n.' guibg=NONE'
+	 elseif color !~ "'"
+	    exe 'hi xpmColor'.n." guifg='".color."'"
+	    exe 'hi xpmColor'.n." guibg='".color."'"
+	 endif
+	 let n = n + 1
+      else
+	 break		" no more color string
+      endif
+   endif
+   let i = i + 1
+endwhile
+
+unlet color chars colors cpp n i s
+
+endif          " has("gui_running") || has("termguicolors") && &termguicolors
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link xpmType		Type
+hi def link xpmStorageClass	StorageClass
+hi def link xpmTodo		Todo
+hi def link xpmComment		Comment
+hi def link xpmPixelString	String
+
+
+let b:current_syntax = "xpm"
+
+" vim: ts=8:sw=3:noet:
+
+endif
diff --git a/syntax/xpm2.vim b/syntax/xpm2.vim
new file mode 100644
index 000000000..b1eebba9a
--- /dev/null
+++ b/syntax/xpm2.vim
@@ -0,0 +1,157 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xpm2') == -1
+
+" Vim syntax file
+" Language:	X Pixmap v2
+" Maintainer:	Steve Wall (hitched97@velnet.com)
+" Last Change:	2017 Feb 01
+" 		(Dominique Pelle added @Spell)
+" Version:	5.8
+"               Jemma Nelson added termguicolors support
+"
+" Made from xpm.vim by Ronald Schild <rs@scutum.de>
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn region  xpm2PixelString	start="^"  end="$"  contains=@xpm2Colors
+syn keyword xpm2Todo		TODO FIXME XXX  contained
+syn match   xpm2Comment		"\!.*$"  contains=@Spell,xpm2Todo
+
+
+command -nargs=+ Hi hi def <args>
+
+if has("gui_running") || has("termguicolors") && &termguicolors
+
+  let color  = ""
+  let chars  = ""
+  let colors = 0
+  let cpp    = 0
+  let n      = 0
+  let i      = 1
+
+  while i <= line("$")		" scanning all lines
+
+    let s = getline(i)
+    if match(s,"\!.*$") != -1
+      let s = matchstr(s, "^[^\!]*")
+    endif
+    if s != ""			" does line contain a string?
+
+      if n == 0			" first string is the Values string
+
+	" get the 3rd value: colors = number of colors
+	let colors = substitute(s, '\s*\d\+\s\+\d\+\s\+\(\d\+\).*', '\1', '')
+	" get the 4th value: cpp = number of character per pixel
+	let cpp = substitute(s, '\s*\d\+\s\+\d\+\s\+\d\+\s\+\(\d\+\).*', '\1', '')
+	if cpp =~ '[^0-9]'
+	  break  " if cpp is not made of digits there must be something wrong
+	endif
+
+	" Highlight the Values string as normal string (no pixel string).
+	" Only when there is no slash, it would terminate the pattern.
+	if s !~ '/'
+	  exe 'syn match xpm2Values /' . s . '/'
+	endif
+	hi def link xpm2Values Statement
+
+	let n = 1			" n = color index
+
+      elseif n <= colors		" string is a color specification
+
+	" get chars = <cpp> length string representing the pixels
+	" (first incl. the following whitespace)
+	let chars = substitute(s, '\(.\{'.cpp.'}\s\+\).*', '\1', '')
+
+	" now get color, first try 'c' key if any (color visual)
+	let color = substitute(s, '.*\sc\s\+\(.\{-}\)\s*\(\(g4\=\|[ms]\)\s.*\)*\s*', '\1', '')
+	if color == s
+	  " no 'c' key, try 'g' key (grayscale with more than 4 levels)
+	  let color = substitute(s, '.*\sg\s\+\(.\{-}\)\s*\(\(g4\|[ms]\)\s.*\)*\s*', '\1', '')
+	  if color == s
+	    " next try: 'g4' key (4-level grayscale)
+	    let color = substitute(s, '.*\sg4\s\+\(.\{-}\)\s*\([ms]\s.*\)*\s*', '\1', '')
+	    if color == s
+	      " finally try 'm' key (mono visual)
+	      let color = substitute(s, '.*\sm\s\+\(.\{-}\)\s*\(s\s.*\)*\s*', '\1', '')
+	      if color == s
+		let color = ""
+	      endif
+	    endif
+	  endif
+	endif
+
+	" Vim cannot handle RGB codes with more than 6 hex digits
+	if color =~ '#\x\{10,}$'
+	  let color = substitute(color, '\(\x\x\)\x\x', '\1', 'g')
+	elseif color =~ '#\x\{7,}$'
+	  let color = substitute(color, '\(\x\x\)\x', '\1', 'g')
+	" nor with 3 digits
+	elseif color =~ '#\x\{3}$'
+	  let color = substitute(color, '\(\x\)\(\x\)\(\x\)', '0\10\20\3', '')
+	endif
+
+	" escape meta characters in patterns
+	let s = escape(s, '/\*^$.~[]')
+	let chars = escape(chars, '/\*^$.~[]')
+
+	" change whitespace to "\s\+"
+	let s = substitute(s, "[ \t][ \t]*", "\\\\s\\\\+", "g")
+	let chars = substitute(chars, "[ \t][ \t]*", "\\\\s\\\\+", "g")
+
+	" now create syntax items
+	" highlight the color string as normal string (no pixel string)
+	exe 'syn match xpm2Col'.n.'Def /'.s.'/ contains=xpm2Col'.n.'inDef'
+	exe 'hi def link xpm2Col'.n.'Def Constant'
+
+	" but highlight the first whitespace after chars in its color
+	exe 'syn match xpm2Col'.n.'inDef /^'.chars.'/hs=s+'.(cpp).' contained'
+	exe 'hi def link xpm2Col'.n.'inDef xpm2Color'.n
+
+	" remove the following whitespace from chars
+	let chars = substitute(chars, '\\s\\+$', '', '')
+
+	" and create the syntax item contained in the pixel strings
+	exe 'syn match xpm2Color'.n.' /'.chars.'/ contained'
+	exe 'syn cluster xpm2Colors add=xpm2Color'.n
+
+	" if no color or color = "None" show background
+	if color == ""  ||  substitute(color, '.*', '\L&', '') == 'none'
+	  exe 'Hi xpm2Color'.n.' guifg=bg guibg=NONE'
+	elseif color !~ "'"
+	  exe 'Hi xpm2Color'.n." guifg='".color."' guibg='".color."'"
+	endif
+	let n = n + 1
+      else
+	break			" no more color string
+      endif
+    endif
+    let i = i + 1
+  endwhile
+
+  unlet color chars colors cpp n i s
+
+endif          " has("gui_running") || has("termguicolors") && &termguicolors
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+" The default highlighting.
+hi def link xpm2Type		Type
+hi def link xpm2StorageClass	StorageClass
+hi def link xpm2Todo		Todo
+hi def link xpm2Comment		Comment
+hi def link xpm2PixelString	String
+
+delcommand Hi
+
+let b:current_syntax = "xpm2"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8:sw=2:noet:
+
+endif
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 51fdb3dce..e9a885366 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -296,6 +296,7 @@ call TestFiletype('coco')
 call TestFiletype('cf')
 call TestFiletype('config')
 call TestFiletype('cuda')
+call TestFiletype('dockerfile')
 call TestFiletype('dcd')
 call TestFiletype('eterm')
 call TestFiletype('lynx')
@@ -637,6 +638,10 @@ call TestFiletype('svn')
 call TestFiletype('text')
 call TestFiletype('pullrequest')
 call TestFiletype('xf86conf')
+call TestFiletype('man')
+call TestFiletype('xpm')
+call TestFiletype('xpm2')
+call TestFiletype('context')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 

From 00213842594d8262c35b64b03b176d6e831a6e94 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 17 Oct 2020 15:56:13 +0200
Subject: [PATCH 138/299] Make sure polyglot_disable does not skip native vim
 files, fixes #591

---
 ftdetect/polyglot.vim | 25 ++++++++++++++-----------
 plugin/polyglot.vim   |  2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 34dfdf8b0..01a465bbf 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -13,6 +13,10 @@ if exists("did_load_polyglot")
   finish
 endif
 
+" Line continuation is used here, remove 'C' from 'cpoptions'
+let s:cpo_save = &cpo
+set cpo&vim
+
 let did_load_polyglot = 1
 
 " It can happen vim filetype.vim loads first, then we need a reset
@@ -23,10 +27,6 @@ endif
 " Prevent filetype.vim of vim from loading again
 let did_load_filetypes = 1
 
-" Line continuation is used here, remove 'C' from 'cpoptions'
-let s:cpo_save = &cpo
-set cpo&vim
-
 " Be consistent across different systems
 set nofileignorecase
 
@@ -117,12 +117,12 @@ func! s:StarSetf(ft)
   endif
 endfunc
 
-" Load user-defined filetype.vim
 augroup filetypedetect
-runtime! filetype.vim
-augroup END
 
-augroup filetypedetect
+" Load user-defined filetype.vim and oter plugins ftdetect first
+" This is to use polyglot-defined ftdetect always as fallback to user settings
+runtime! filetype.vim
+runtime! ftdetect/*.vim
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
@@ -3421,15 +3421,18 @@ au BufNewFile,BufRead *.txt
 	\|   setf text
 	\| endif
 
-" Use the filetype detect plugins.  They may overrule any of the previously
-" detected filetypes.
-runtime! ftdetect/*.vim
 
 " NOTE: The above command could have ended the filetypedetect autocmd group
 " and started another one. Let's make sure it has ended to get to a consistent
 " state.
 augroup END
 
+" Use the filetype detect plugins.  They may overrule any of the previously
+" detected filetypes.
+if exists("did_load_filetypes") && exists("g:polyglot_disabled")
+  unlet did_load_filetypes
+  runtime! $VIMRUNTIME/filetype.vim
+endif
 
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index 3148cff76..7cfa1069f 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -1,3 +1,3 @@
 if !exists("did_load_polyglot")
-  runtime! ftdetect/polyglot.vim
+  filetype plugin indent on
 endif

From 518d733369fb6f2e4652e9649a78546ce6493079 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 17 Oct 2020 17:40:10 +0200
Subject: [PATCH 139/299] Make sure custom scripts.vim are respected as well

---
 autoload/go/config.vim |    4 +
 autoload/nim.vim       |  106 +-
 compiler/nim.vim       |    6 +-
 doc/vim-go.txt         |    8 +
 extras/filetype.vim    | 2257 ++++++++++++++++++++++++++++++++++++++++
 filetype.vim           |    1 +
 ftdetect/polyglot.vim  |    2 +-
 indent/nim.vim         |   30 +-
 plugin/polyglot.vim    |    8 +-
 scripts/build          |   21 +-
 syntax/nim.vim         |   22 +-
 11 files changed, 2376 insertions(+), 89 deletions(-)
 create mode 100644 extras/filetype.vim
 create mode 100644 filetype.vim

diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index ce33d996f..8af1e675b 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -578,6 +578,10 @@ function! go#config#DiagnosticsEnabled() abort
   return get(g:, 'go_diagnostics_enabled', 0)
 endfunction
 
+function! go#config#DiagnosticsIgnoreWarnings() abort
+  return get(g:, 'go_diagnostics_ignore_warnings', 0)
+endfunction
+
 function! go#config#GoplsOptions() abort
   return get(g:, 'go_gopls_options', ['-remote=auto'])
 endfunction
diff --git a/autoload/nim.vim b/autoload/nim.vim
index 59f9122d3..e5531ec5a 100644
--- a/autoload/nim.vim
+++ b/autoload/nim.vim
@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 let g:nim_log = []
 let s:plugin_path = escape(expand('<sfile>:p:h'), '\')
 
-if !exists("g:nim_caas_enabled")
+if !exists('g:nim_caas_enabled')
   let g:nim_caas_enabled = 0
 endif
 
@@ -11,27 +11,25 @@ if !executable('nim')
   echoerr "the Nim compiler must be in your system's PATH"
 endif
 
-if has("python3")
-  exe 'py3file ' . fnameescape(s:plugin_path) . '/nim_vim.py'
-elseif has("python")
-  exe 'pyfile ' . fnameescape(s:plugin_path) . '/nim_vim.py'
+if has('pythonx')
+  exe 'pyxfile ' . fnameescape(s:plugin_path) . '/nim_vim.py'
 endif
 
-fun! nim#init()
-  let cmd = printf("nim --dump.format:json --verbosity:0 dump %s", s:CurrentNimFile())
+fun! nim#init() abort
+  let cmd = printf('nim --dump.format:json --verbosity:0 dump %s', s:CurrentNimFile())
   let raw_dumpdata = system(cmd)
-  if !v:shell_error && expand("%:e") == "nim"
+  if !v:shell_error && expand('%:e') ==# 'nim'
     let false = 0 " Needed for eval of json
     let true = 1 " Needed for eval of json
-    let dumpdata = eval(substitute(raw_dumpdata, "\n", "", "g"))
+    let dumpdata = eval(substitute(raw_dumpdata, "\n", '', 'g'))
     
     let b:nim_project_root = dumpdata['project_path']
     let b:nim_defined_symbols = dumpdata['defined_symbols']
     let b:nim_caas_enabled = g:nim_caas_enabled || index(dumpdata['defined_symbols'], 'forcecaas') != -1
 
     for path in dumpdata['lib_paths']
-      if finddir(path) == path
-        let &l:path = path . "," . &l:path
+      if finddir(path) ==# path
+        let &l:path = path . ',' . &l:path
       endif
     endfor
   else
@@ -39,7 +37,7 @@ fun! nim#init()
   endif
 endf
 
-fun! s:UpdateNimLog()
+fun! s:UpdateNimLog() abort
   setlocal buftype=nofile
   setlocal bufhidden=hide
   setlocal noswapfile
@@ -56,32 +54,32 @@ endf
 augroup NimVim
   au!
   au BufEnter log://nim call s:UpdateNimLog()
-  if has("python3") || has("python")
-    " au QuitPre * :py nimTerminateAll()
-    au VimLeavePre * :py nimTerminateAll()
+  if has('pythonx')
+    " au QuitPre * :pyx nimTerminateAll()
+    au VimLeavePre * :pyx nimTerminateAll()
   endif
 augroup END
 
 command! NimLog :e log://nim
 
 command! NimTerminateService
-  \ :exe printf("py nimTerminateService('%s')", b:nim_project_root)
+  \ :exe printf("pyx nimTerminateService('%s')", b:nim_project_root)
 
 command! NimRestartService
-  \ :exe printf("py nimRestartService('%s')", b:nim_project_root)
+  \ :exe printf("pyx nimRestartService('%s')", b:nim_project_root)
 
-fun! s:CurrentNimFile()
+fun! s:CurrentNimFile() abort
   let save_cur = getpos('.')
   call cursor(0, 0, 0)
   
-  let PATTERN = "\\v^\\#\\s*included from \\zs.*\\ze"
-  let l = search(PATTERN, "n")
+  let PATTERN = '\v^\#\s*included from \zs.*\ze'
+  let l = search(PATTERN, 'n')
 
   if l != 0
     let f = matchstr(getline(l), PATTERN)
-    let l:to_check = expand('%:h') . "/" . f
+    let l:to_check = expand('%:h') . '/' . f
   else
-    let l:to_check = expand("%")
+    let l:to_check = expand('%')
   endif
 
   call setpos('.', save_cur)
@@ -108,42 +106,42 @@ let g:nim_symbol_types = {
   \ 'skEnumField': 'v',
   \ }
 
-fun! NimExec(op)
-  let isDirty = getbufvar(bufnr('%'), "&modified")
+fun! NimExec(op) abort
+  let isDirty = getbufvar(bufnr('%'), '&modified')
   if isDirty
-    let tmp = tempname() . bufname("%") . "_dirty.nim"
-    silent! exe ":w " . tmp
+    let tmp = tempname() . bufname('%') . '_dirty.nim'
+    silent! exe ':w ' . tmp
 
-    let cmd = printf("idetools %s --trackDirty:\"%s,%s,%d,%d\" \"%s\"",
+    let cmd = printf('idetools %s --trackDirty:"%s,%s,%d,%d" "%s"',
       \ a:op, tmp, expand('%:p'), line('.'), col('.')-1, s:CurrentNimFile())
   else
-    let cmd = printf("idetools %s --track:\"%s,%d,%d\" \"%s\"",
+    let cmd = printf('idetools %s --track:"%s,%d,%d" "%s"',
       \ a:op, expand('%:p'), line('.'), col('.')-1, s:CurrentNimFile())
   endif
 
   if b:nim_caas_enabled
-    exe printf("py nimExecCmd('%s', '%s', False)", b:nim_project_root, cmd)
-    let output = l:py_res
+    exe printf("pyx nimExecCmd('%s', '%s', False)", b:nim_project_root, cmd)
+    let output = get(l:, 'py_res', '')
   else
-    let output = system("nim " . cmd)
+    let output = system('nim ' . cmd)
   endif
 
-  call add(g:nim_log, "nim " . cmd . "\n" . output)
+  call add(g:nim_log, 'nim ' . cmd . "\n" . output)
   return output
 endf
 
-fun! NimExecAsync(op, Handler)
+fun! NimExecAsync(op, Handler) abort
   let result = NimExec(a:op)
   call a:Handler(result)
 endf
 
-fun! NimComplete(findstart, base)
-  if b:nim_caas_enabled == 0
+fun! NimComplete(findstart, base) abort
+  if b:nim_caas_enabled ==# 0
     return -1
   endif
 
   if a:findstart
-    if synIDattr(synIDtrans(synID(line("."),col("."),1)), "name") == 'Comment'
+    if synIDattr(synIDtrans(synID(line('.'),col('.'),1)), 'name') ==# 'Comment'
       return -1
     endif
     let line = getline('.')
@@ -154,10 +152,10 @@ fun! NimComplete(findstart, base)
     return start
   else
     let result = []
-    let sugOut = NimExec("--suggest")
+    let sugOut = NimExec('--suggest')
     for line in split(sugOut, '\n')
       let lineData = split(line, '\t')
-      if len(lineData) > 0 && lineData[0] == "sug"
+      if len(lineData) > 0 && lineData[0] ==# 'sug'
         let word = split(lineData[2], '\.')[-1]
         if a:base ==? '' || word =~# '^' . a:base
           let kind = get(g:nim_symbol_types, lineData[1], '')
@@ -170,7 +168,7 @@ fun! NimComplete(findstart, base)
   endif
 endf
 
-if !exists("g:neocomplcache_omni_patterns")
+if !exists('g:neocomplcache_omni_patterns')
   let g:neocomplcache_omni_patterns = {}
 endif
 let g:neocomplcache_omni_patterns['nim'] = '[^. *\t]\.\w*'
@@ -182,7 +180,7 @@ let g:neocomplete#sources#omni#input_patterns['nim'] = '[^. *\t]\.\w*'
 
 let g:nim_completion_callbacks = {}
 
-fun! NimAsyncCmdComplete(cmd, output)
+fun! NimAsyncCmdComplete(cmd, output) abort
   call add(g:nim_log, a:output)
   echom g:nim_completion_callbacks
   if has_key(g:nim_completion_callbacks, a:cmd)
@@ -190,52 +188,52 @@ fun! NimAsyncCmdComplete(cmd, output)
     call Callback(a:output)
     " remove(g:nim_completion_callbacks, a:cmd)
   else
-    echom "ERROR, Unknown Command: " . a:cmd
+    echom 'ERROR, Unknown Command: ' . a:cmd
   endif
   return 1
 endf
 
-fun! GotoDefinition_nim_ready(def_output)
+fun! GotoDefinition_nim_ready(def_output) abort
   if v:shell_error
-    echo "nim was unable to locate the definition. exit code: " . v:shell_error
+    echo 'nim was unable to locate the definition. exit code: ' . v:shell_error
     " echoerr a:def_output
     return 0
   endif
   
   let rawDef = matchstr(a:def_output, 'def\t\([^\n]*\)')
-  if rawDef == ""
-    echo "the current cursor position does not match any definitions"
+  if rawDef == ''
+    echo 'the current cursor position does not match any definitions'
     return 0
   endif
   
   let defBits = split(rawDef, '\t')
   let file = defBits[4]
   let line = defBits[5]
-  exe printf("e +%d %s", line, file)
+  exe printf('e +%d %s', line, file)
   return 1
 endf
 
-fun! GotoDefinition_nim()
-  call NimExecAsync("--def", function("GotoDefinition_nim_ready"))
+fun! GotoDefinition_nim() abort
+  call NimExecAsync('--def', function('GotoDefinition_nim_ready'))
 endf
 
-fun! FindReferences_nim()
-  setloclist()
+fun! FindReferences_nim() abort
+  "setloclist()
 endf
 
 " Syntastic syntax checking
-fun! SyntaxCheckers_nim_nim_GetLocList()
+fun! SyntaxCheckers_nim_nim_GetLocList() abort
   let makeprg = 'nim check --hints:off --listfullpaths ' . s:CurrentNimFile()
   let errorformat = &errorformat
   
   return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
 endf
 
-function! SyntaxCheckers_nim_nim_IsAvailable()
-  return executable("nim")
+function! SyntaxCheckers_nim_nim_IsAvailable() abort
+  return executable('nim')
 endfunction
 
-if exists("g:SyntasticRegistry")
+if exists('g:SyntasticRegistry')
   call g:SyntasticRegistry.CreateAndRegisterChecker({
       \ 'filetype': 'nim',
       \ 'name': 'nim'})
diff --git a/compiler/nim.vim b/compiler/nim.vim
index a587a306b..c849b1e98 100644
--- a/compiler/nim.vim
+++ b/compiler/nim.vim
@@ -1,12 +1,12 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 
-if exists("current_compiler")
+if exists('current_compiler')
   finish
 endif
 
-let current_compiler = "nim"
+let current_compiler = 'nim'
 
-if exists(":CompilerSet") != 2 " older Vim always used :setlocal
+if exists(':CompilerSet') != 2 " older Vim always used :setlocal
   command -nargs=* CompilerSet setlocal <args>
 endif
 
diff --git a/doc/vim-go.txt b/doc/vim-go.txt
index d33a8b38b..26639768f 100644
--- a/doc/vim-go.txt
+++ b/doc/vim-go.txt
@@ -1941,6 +1941,14 @@ By default it is disabled.
 >
   let g:go_diagnostics_enabled = 0
 <
+                                        *'g:go_diagnostics_ignore_warnings'*
+
+Specifies whether warnings from  `gopls` diagnostics are ignored.
+
+By default it is disabled.
+>
+  let g:go_diagnostics_ignore_warnings = 0
+<
 
                                                   *'g:go_template_autocreate'*
 
diff --git a/extras/filetype.vim b/extras/filetype.vim
new file mode 100644
index 000000000..dbc797f83
--- /dev/null
+++ b/extras/filetype.vim
@@ -0,0 +1,2257 @@
+" Vim support file to detect file types
+"
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2020 Sep 30
+
+" Listen very carefully, I will say this only once
+if exists("did_load_filetypes")
+  finish
+endif
+let did_load_filetypes = 1
+
+" Line continuation is used here, remove 'C' from 'cpoptions'
+let s:cpo_save = &cpo
+set cpo&vim
+
+augroup filetypedetect
+
+" Ignored extensions
+if exists("*fnameescape")
+au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.dpkg-dist,?\+.dpkg-old,?\+.dpkg-new,?\+.dpkg-bak,?\+.rpmsave,?\+.rpmnew,?\+.pacsave,?\+.pacnew
+	\ exe "doau filetypedetect BufRead " . fnameescape(expand("<afile>:r"))
+au BufNewFile,BufRead *~
+	\ let s:name = expand("<afile>") |
+	\ let s:short = substitute(s:name, '\~$', '', '') |
+	\ if s:name != s:short && s:short != "" |
+	\   exe "doau filetypedetect BufRead " . fnameescape(s:short) |
+	\ endif |
+	\ unlet! s:name s:short
+au BufNewFile,BufRead ?\+.in
+	\ if expand("<afile>:t") != "configure.in" |
+	\   exe "doau filetypedetect BufRead " . fnameescape(expand("<afile>:r")) |
+	\ endif
+elseif &verbose > 0
+  echomsg "Warning: some filetypes will not be recognized because this version of Vim does not have fnameescape()"
+endif
+
+" Pattern used to match file names which should not be inspected.
+" Currently finds compressed files.
+if !exists("g:ft_ignore_pat")
+  let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|zip\|tgz\)$'
+endif
+
+" Function used for patterns that end in a star: don't set the filetype if the
+" file name matches ft_ignore_pat.
+" When using this, the entry should probably be further down below with the
+" other StarSetf() calls.
+func! s:StarSetf(ft)
+  if expand("<amatch>") !~ g:ft_ignore_pat
+    exe 'setf ' . a:ft
+  endif
+endfunc
+
+" Vim help file
+au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt	setf help
+
+" Abaqus or Trasys
+au BufNewFile,BufRead *.inp			call dist#ft#Check_inp()
+
+" 8th (Firth-derivative)
+au BufNewFile,BufRead *.8th			setf 8th
+
+" A-A-P recipe
+au BufNewFile,BufRead *.aap			setf aap
+
+" A2ps printing utility
+au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,a2psrc,.a2psrc setf a2ps
+
+" ABAB/4
+au BufNewFile,BufRead *.abap			setf abap
+
+" ABC music notation
+au BufNewFile,BufRead *.abc			setf abc
+
+" ABEL
+au BufNewFile,BufRead *.abl			setf abel
+
+" AceDB
+au BufNewFile,BufRead *.wrm			setf acedb
+
+" Ada (83, 9X, 95)
+au BufNewFile,BufRead *.adb,*.ads,*.ada		setf ada
+if has("vms")
+  au BufNewFile,BufRead *.gpr,*.ada_m,*.adc	setf ada
+else
+  au BufNewFile,BufRead *.gpr			setf ada
+endif
+
+" AHDL
+au BufNewFile,BufRead *.tdf			setf ahdl
+
+" AIDL
+au BufNewFile,BufRead *.aidl			setf aidl
+
+" AMPL
+au BufNewFile,BufRead *.run			setf ampl
+
+" Ant
+au BufNewFile,BufRead build.xml			setf ant
+
+" Arduino
+au BufNewFile,BufRead *.ino,*.pde		setf arduino
+
+" Apache config file
+au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf		setf apache
+au BufNewFile,BufRead */etc/apache2/sites-*/*.com		setf apache
+
+" XA65 MOS6510 cross assembler
+au BufNewFile,BufRead *.a65			setf a65
+
+" Applescript
+au BufNewFile,BufRead *.scpt			setf applescript
+
+" Applix ELF
+au BufNewFile,BufRead *.am
+	\ if expand("<afile>") !~? 'Makefile.am\>' | setf elf | endif
+
+" ALSA configuration
+au BufNewFile,BufRead .asoundrc,*/usr/share/alsa/alsa.conf,*/etc/asound.conf setf alsaconf
+
+" Arc Macro Language
+au BufNewFile,BufRead *.aml			setf aml
+
+" APT config file
+au BufNewFile,BufRead apt.conf		       setf aptconf
+au BufNewFile,BufRead */.aptitude/config       setf aptconf
+au BufNewFile,BufRead */etc/apt/apt.conf.d/{[-_[:alnum:]]\+,[-_.[:alnum:]]\+.conf} setf aptconf
+
+" Arch Inventory file
+au BufNewFile,BufRead .arch-inventory,=tagging-method	setf arch
+
+" ART*Enterprise (formerly ART-IM)
+au BufNewFile,BufRead *.art			setf art
+
+" AsciiDoc
+au BufNewFile,BufRead *.asciidoc,*.adoc		setf asciidoc
+
+" ASN.1
+au BufNewFile,BufRead *.asn,*.asn1		setf asn
+
+" Active Server Pages (with Visual Basic Script)
+au BufNewFile,BufRead *.asa
+	\ if exists("g:filetype_asa") |
+	\   exe "setf " . g:filetype_asa |
+	\ else |
+	\   setf aspvbs |
+	\ endif
+
+" Active Server Pages (with Perl or Visual Basic Script)
+au BufNewFile,BufRead *.asp
+	\ if exists("g:filetype_asp") |
+	\   exe "setf " . g:filetype_asp |
+	\ elseif getline(1) . getline(2) . getline(3) =~? "perlscript" |
+	\   setf aspperl |
+	\ else |
+	\   setf aspvbs |
+	\ endif
+
+" Grub (must be before catch *.lst)
+au BufNewFile,BufRead */boot/grub/menu.lst,*/boot/grub/grub.conf,*/etc/grub.conf setf grub
+
+" Assembly (all kinds)
+" *.lst is not pure assembly, it has two extra columns (address, byte codes)
+au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call dist#ft#FTasm()
+
+" Macro (VAX)
+au BufNewFile,BufRead *.mar			setf vmasm
+
+" Atlas
+au BufNewFile,BufRead *.atl,*.as		setf atlas
+
+" Autoit v3
+au BufNewFile,BufRead *.au3			setf autoit
+
+" Autohotkey
+au BufNewFile,BufRead *.ahk			setf autohotkey
+
+" Automake
+au BufNewFile,BufRead [mM]akefile.am,GNUmakefile.am	setf automake
+
+" Autotest .at files are actually m4
+au BufNewFile,BufRead *.at			setf m4
+
+" Avenue
+au BufNewFile,BufRead *.ave			setf ave
+
+" Awk
+au BufNewFile,BufRead *.awk,*.gawk		setf awk
+
+" B
+au BufNewFile,BufRead *.mch,*.ref,*.imp		setf b
+
+" BASIC or Visual Basic
+au BufNewFile,BufRead *.bas			call dist#ft#FTVB("basic")
+
+" Visual Basic Script (close to Visual Basic) or Visual Basic .NET
+au BufNewFile,BufRead *.vb,*.vbs,*.dsm,*.ctl	setf vb
+
+" IBasic file (similar to QBasic)
+au BufNewFile,BufRead *.iba,*.ibi		setf ibasic
+
+" FreeBasic file (similar to QBasic)
+au BufNewFile,BufRead *.fb,*.bi			setf freebasic
+
+" Batch file for MSDOS.
+au BufNewFile,BufRead *.bat,*.sys		setf dosbatch
+" *.cmd is close to a Batch file, but on OS/2 Rexx files also use *.cmd.
+au BufNewFile,BufRead *.cmd
+	\ if getline(1) =~ '^/\*' | setf rexx | else | setf dosbatch | endif
+
+" Batch file for 4DOS
+au BufNewFile,BufRead *.btm			call dist#ft#FTbtm()
+
+" BC calculator
+au BufNewFile,BufRead *.bc			setf bc
+
+" BDF font
+au BufNewFile,BufRead *.bdf			setf bdf
+
+" BibTeX bibliography database file
+au BufNewFile,BufRead *.bib			setf bib
+
+" BibTeX Bibliography Style
+au BufNewFile,BufRead *.bst			setf bst
+
+" BIND configuration
+" sudoedit uses namedXXXX.conf
+au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key	setf named
+
+" BIND zone
+au BufNewFile,BufRead named.root		setf bindzone
+au BufNewFile,BufRead *.db			call dist#ft#BindzoneCheck('')
+
+" Blank
+au BufNewFile,BufRead *.bl			setf blank
+
+" Blkid cache file
+au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old   setf xml
+
+" BSDL
+au BufNewFile,BufRead *bsd,*.bsdl		setf bsdl
+
+" Bazel (http://bazel.io)
+autocmd BufRead,BufNewFile *.bzl,*.bazel,WORKSPACE	setf bzl
+if has("fname_case")
+  " There is another check for BUILD further below.
+  autocmd BufRead,BufNewFile *.BUILD,BUILD		setf bzl
+endif
+
+" C or lpc
+au BufNewFile,BufRead *.c			call dist#ft#FTlpc()
+au BufNewFile,BufRead *.lpc,*.ulpc		setf lpc
+
+" Calendar
+au BufNewFile,BufRead calendar			setf calendar
+
+" C#
+au BufNewFile,BufRead *.cs			setf cs
+
+" CSDL
+au BufNewFile,BufRead *.csdl			setf csdl
+
+" Cabal
+au BufNewFile,BufRead *.cabal			setf cabal
+
+" Cdrdao TOC
+au BufNewFile,BufRead *.toc			setf cdrtoc
+
+" Cdrdao config
+au BufNewFile,BufRead */etc/cdrdao.conf,*/etc/defaults/cdrdao,*/etc/default/cdrdao,.cdrdao	setf cdrdaoconf
+
+" Cfengine
+au BufNewFile,BufRead cfengine.conf		setf cfengine
+
+" ChaiScript
+au BufRead,BufNewFile *.chai			setf chaiscript
+
+" Comshare Dimension Definition Language
+au BufNewFile,BufRead *.cdl			setf cdl
+
+" Conary Recipe
+au BufNewFile,BufRead *.recipe			setf conaryrecipe
+
+" Controllable Regex Mutilator
+au BufNewFile,BufRead *.crm			setf crm
+
+" Cyn++
+au BufNewFile,BufRead *.cyn			setf cynpp
+
+" Cynlib
+" .cc and .cpp files can be C++ or Cynlib.
+au BufNewFile,BufRead *.cc
+	\ if exists("cynlib_syntax_for_cc")|setf cynlib|else|setf cpp|endif
+au BufNewFile,BufRead *.cpp
+	\ if exists("cynlib_syntax_for_cpp")|setf cynlib|else|setf cpp|endif
+
+" C++
+au BufNewFile,BufRead *.cxx,*.c++,*.hh,*.hxx,*.hpp,*.ipp,*.moc,*.tcc,*.inl setf cpp
+if has("fname_case")
+  au BufNewFile,BufRead *.C,*.H setf cpp
+endif
+
+" .h files can be C, Ch C++, ObjC or ObjC++.
+" Set c_syntax_for_h if you want C, ch_syntax_for_h if you want Ch. ObjC is
+" detected automatically.
+au BufNewFile,BufRead *.h			call dist#ft#FTheader()
+
+" Ch (CHscript)
+au BufNewFile,BufRead *.chf			setf ch
+
+" TLH files are C++ headers generated by Visual C++'s #import from typelibs
+au BufNewFile,BufRead *.tlh			setf cpp
+
+" Cascading Style Sheets
+au BufNewFile,BufRead *.css			setf css
+
+" Century Term Command Scripts (*.cmd too)
+au BufNewFile,BufRead *.con			setf cterm
+
+" Changelog
+au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch,*/debian/changelog
+					\	setf debchangelog
+
+au BufNewFile,BufRead [cC]hange[lL]og
+	\  if getline(1) =~ '; urgency='
+	\|   setf debchangelog
+	\| else
+	\|   setf changelog
+	\| endif
+
+au BufNewFile,BufRead NEWS
+	\  if getline(1) =~ '; urgency='
+	\|   setf debchangelog
+	\| endif
+
+" CHILL
+au BufNewFile,BufRead *..ch			setf chill
+
+" Changes for WEB and CWEB or CHILL
+au BufNewFile,BufRead *.ch			call dist#ft#FTchange()
+
+" ChordPro
+au BufNewFile,BufRead *.chopro,*.crd,*.cho,*.crdpro,*.chordpro	setf chordpro
+
+" Clean
+au BufNewFile,BufRead *.dcl,*.icl		setf clean
+
+" Clever
+au BufNewFile,BufRead *.eni			setf cl
+
+" Clever or dtd
+au BufNewFile,BufRead *.ent			call dist#ft#FTent()
+
+" Clipper (or FoxPro; could also be eviews)
+au BufNewFile,BufRead *.prg
+	\ if exists("g:filetype_prg") |
+	\   exe "setf " . g:filetype_prg |
+	\ else |
+	\   setf clipper |
+	\ endif
+
+" Clojure
+au BufNewFile,BufRead *.clj,*.cljs,*.cljx,*.cljc		setf clojure
+
+" Cmake
+au BufNewFile,BufRead CMakeLists.txt,*.cmake,*.cmake.in		setf cmake
+
+" Cmusrc
+au BufNewFile,BufRead */.cmus/{autosave,rc,command-history,*.theme} setf cmusrc
+au BufNewFile,BufRead */cmus/{rc,*.theme}			setf cmusrc
+
+" Cobol
+au BufNewFile,BufRead *.cbl,*.cob,*.lib	setf cobol
+"   cobol or zope form controller python script? (heuristic)
+au BufNewFile,BufRead *.cpy
+	\ if getline(1) =~ '^##' |
+	\   setf python |
+	\ else |
+	\   setf cobol |
+	\ endif
+
+" Coco/R
+au BufNewFile,BufRead *.atg			setf coco
+
+" Cold Fusion
+au BufNewFile,BufRead *.cfm,*.cfi,*.cfc		setf cf
+
+" Configure scripts
+au BufNewFile,BufRead configure.in,configure.ac setf config
+
+" CUDA  Cumpute Unified Device Architecture
+au BufNewFile,BufRead *.cu,*.cuh		setf cuda
+
+" Dockerfile; Podman uses the same syntax with name Containerfile
+au BufNewFile,BufRead Containerfile,Dockerfile,*.Dockerfile	setf dockerfile
+
+" WildPackets EtherPeek Decoder
+au BufNewFile,BufRead *.dcd			setf dcd
+
+" Enlightenment configuration files
+au BufNewFile,BufRead *enlightenment/*.cfg	setf c
+
+" Eterm
+au BufNewFile,BufRead *Eterm/*.cfg		setf eterm
+
+" Euphoria 3 or 4
+au BufNewFile,BufRead *.eu,*.ew,*.ex,*.exu,*.exw  call dist#ft#EuphoriaCheck()
+if has("fname_case")
+   au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW  call dist#ft#EuphoriaCheck()
+endif
+
+" Lynx config files
+au BufNewFile,BufRead lynx.cfg			setf lynx
+
+" Quake
+au BufNewFile,BufRead *baseq[2-3]/*.cfg,*id1/*.cfg	setf quake
+au BufNewFile,BufRead *quake[1-3]/*.cfg			setf quake
+
+" Quake C
+au BufNewFile,BufRead *.qc			setf c
+
+" Configure files
+au BufNewFile,BufRead *.cfg			setf cfg
+
+" Cucumber
+au BufNewFile,BufRead *.feature			setf cucumber
+
+" Communicating Sequential Processes
+au BufNewFile,BufRead *.csp,*.fdr		setf csp
+
+" CUPL logic description and simulation
+au BufNewFile,BufRead *.pld			setf cupl
+au BufNewFile,BufRead *.si			setf cuplsim
+
+" Dart
+au BufRead,BufNewfile *.dart,*.drt		setf dart
+
+" Debian Control
+au BufNewFile,BufRead */debian/control		setf debcontrol
+au BufNewFile,BufRead control
+	\  if getline(1) =~ '^Source:'
+	\|   setf debcontrol
+	\| endif
+
+" Debian Copyright
+au BufNewFile,BufRead */debian/copyright	setf debcopyright
+au BufNewFile,BufRead copyright
+	\  if getline(1) =~ '^Format:'
+	\|   setf debcopyright
+	\| endif
+
+" Debian Sources.list
+au BufNewFile,BufRead */etc/apt/sources.list		setf debsources
+au BufNewFile,BufRead */etc/apt/sources.list.d/*.list	setf debsources
+
+" Deny hosts
+au BufNewFile,BufRead denyhosts.conf		setf denyhosts
+
+" dnsmasq(8) configuration files
+au BufNewFile,BufRead */etc/dnsmasq.conf	setf dnsmasq
+
+" ROCKLinux package description
+au BufNewFile,BufRead *.desc			setf desc
+
+" the D language or dtrace
+au BufNewFile,BufRead *.d			call dist#ft#DtraceCheck()
+
+" Desktop files
+au BufNewFile,BufRead *.desktop,*.directory	setf desktop
+
+" Dict config
+au BufNewFile,BufRead dict.conf,.dictrc		setf dictconf
+
+" Dictd config
+au BufNewFile,BufRead dictd.conf		setf dictdconf
+
+" Diff files
+au BufNewFile,BufRead *.diff,*.rej		setf diff
+au BufNewFile,BufRead *.patch
+	\ if getline(1) =~ '^From [0-9a-f]\{40\} Mon Sep 17 00:00:00 2001$' |
+	\   setf gitsendemail |
+	\ else |
+	\   setf diff |
+	\ endif
+
+" Dircolors
+au BufNewFile,BufRead .dir_colors,.dircolors,*/etc/DIR_COLORS	setf dircolors
+
+" Diva (with Skill) or InstallShield
+au BufNewFile,BufRead *.rul
+	\ if getline(1).getline(2).getline(3).getline(4).getline(5).getline(6) =~? 'InstallShield' |
+	\   setf ishd |
+	\ else |
+	\   setf diva |
+	\ endif
+
+" DCL (Digital Command Language - vms) or DNS zone file
+au BufNewFile,BufRead *.com			call dist#ft#BindzoneCheck('dcl')
+
+" DOT
+au BufNewFile,BufRead *.dot,*.gv		setf dot
+
+" Dylan - lid files
+au BufNewFile,BufRead *.lid			setf dylanlid
+
+" Dylan - intr files (melange)
+au BufNewFile,BufRead *.intr			setf dylanintr
+
+" Dylan
+au BufNewFile,BufRead *.dylan			setf dylan
+
+" Microsoft Module Definition
+au BufNewFile,BufRead *.def			setf def
+
+" Dracula
+au BufNewFile,BufRead *.drac,*.drc,*lvs,*lpe	setf dracula
+
+" Datascript
+au BufNewFile,BufRead *.ds			setf datascript
+
+" dsl
+au BufNewFile,BufRead *.dsl			setf dsl
+
+" DTD (Document Type Definition for XML)
+au BufNewFile,BufRead *.dtd			setf dtd
+
+" DTS/DSTI (device tree files)
+au BufNewFile,BufRead *.dts,*.dtsi		setf dts
+
+" EDIF (*.edf,*.edif,*.edn,*.edo) or edn
+au BufNewFile,BufRead *.ed\(f\|if\|o\)		setf edif
+au BufNewFile,BufRead *.edn
+	\ if getline(1) =~ '^\s*(\s*edif\>' |
+	\   setf edif |
+	\ else |
+	\   setf clojure |
+	\ endif
+
+" EditorConfig (close enough to dosini)
+au BufNewFile,BufRead .editorconfig		setf dosini
+
+" Embedix Component Description
+au BufNewFile,BufRead *.ecd			setf ecd
+
+" Eiffel or Specman or Euphoria
+au BufNewFile,BufRead *.e,*.E			call dist#ft#FTe()
+
+" Elinks configuration
+au BufNewFile,BufRead elinks.conf		setf elinks
+
+" ERicsson LANGuage; Yaws is erlang too
+au BufNewFile,BufRead *.erl,*.hrl,*.yaws	setf erlang
+
+" Elm
+au BufNewFile,BufRead *.elm			setf elm
+
+" Elm Filter Rules file
+au BufNewFile,BufRead filter-rules		setf elmfilt
+
+" ESMTP rc file
+au BufNewFile,BufRead *esmtprc			setf esmtprc
+
+" ESQL-C
+au BufNewFile,BufRead *.ec,*.EC			setf esqlc
+
+" Esterel
+au BufNewFile,BufRead *.strl			setf esterel
+
+" Essbase script
+au BufNewFile,BufRead *.csc			setf csc
+
+" Exim
+au BufNewFile,BufRead exim.conf			setf exim
+
+" Expect
+au BufNewFile,BufRead *.exp			setf expect
+
+" Exports
+au BufNewFile,BufRead exports			setf exports
+
+" Falcon
+au BufNewFile,BufRead *.fal			setf falcon
+
+" Fantom
+au BufNewFile,BufRead *.fan,*.fwt		setf fan
+
+" Factor
+au BufNewFile,BufRead *.factor			setf factor
+
+" Fetchmail RC file
+au BufNewFile,BufRead .fetchmailrc		setf fetchmail
+
+" FlexWiki - disabled, because it has side effects when a .wiki file
+" is not actually FlexWiki
+"au BufNewFile,BufRead *.wiki			setf flexwiki
+
+" Focus Executable
+au BufNewFile,BufRead *.fex,*.focexec		setf focexec
+
+" Focus Master file (but not for auto.master)
+au BufNewFile,BufRead auto.master		setf conf
+au BufNewFile,BufRead *.mas,*.master		setf master
+
+" Forth
+au BufNewFile,BufRead *.fs,*.ft,*.fth		setf forth
+
+" Reva Forth
+au BufNewFile,BufRead *.frt			setf reva
+
+" Fortran
+if has("fname_case")
+  au BufNewFile,BufRead *.F,*.FOR,*.FPP,*.FTN,*.F77,*.F90,*.F95,*.F03,*.F08	 setf fortran
+endif
+au BufNewFile,BufRead   *.f,*.for,*.fortran,*.fpp,*.ftn,*.f77,*.f90,*.f95,*.f03,*.f08  setf fortran
+
+" Framescript
+au BufNewFile,BufRead *.fsl			setf framescript
+
+" FStab
+au BufNewFile,BufRead fstab,mtab		setf fstab
+
+" GDB command files
+au BufNewFile,BufRead .gdbinit			setf gdb
+
+" GDMO
+au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
+
+" Gedcom
+au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
+
+" Git
+au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG	setf gitcommit
+au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig	setf gitconfig
+au BufNewFile,BufRead */.config/git/config			setf gitconfig
+au BufNewFile,BufRead .gitmodules,*.git/modules/*/config	setf gitconfig
+if !empty($XDG_CONFIG_HOME)
+  au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config		setf gitconfig
+endif
+au BufNewFile,BufRead git-rebase-todo		setf gitrebase
+au BufRead,BufNewFile .gitsendemail.msg.??????	setf gitsendemail
+au BufNewFile,BufRead .msg.[0-9]*
+      \ if getline(1) =~ '^From.*# This line is ignored.$' |
+      \   setf gitsendemail |
+      \ endif
+au BufNewFile,BufRead *.git/*
+      \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
+      \   setf git |
+      \ endif
+
+" Gkrellmrc
+au BufNewFile,BufRead gkrellmrc,gkrellmrc_?	setf gkrellmrc
+
+" GP scripts (2.0 and onward)
+au BufNewFile,BufRead *.gp,.gprc		setf gp
+
+" GPG
+au BufNewFile,BufRead */.gnupg/options		setf gpg
+au BufNewFile,BufRead */.gnupg/gpg.conf		setf gpg
+au BufNewFile,BufRead */usr/*/gnupg/options.skel setf gpg
+if !empty($GNUPGHOME)
+  au BufNewFile,BufRead $GNUPGHOME/options	setf gpg
+  au BufNewFile,BufRead $GNUPGHOME/gpg.conf	setf gpg
+endif
+
+" gnash(1) configuration files
+au BufNewFile,BufRead gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc setf gnash
+
+" Gitolite
+au BufNewFile,BufRead gitolite.conf		setf gitolite
+au BufNewFile,BufRead {,.}gitolite.rc,example.gitolite.rc	setf perl
+
+" Gnuplot scripts
+au BufNewFile,BufRead *.gpi			setf gnuplot
+
+" Go (Google)
+au BufNewFile,BufRead *.go			setf go
+
+" GrADS scripts
+au BufNewFile,BufRead *.gs			setf grads
+
+" Gretl
+au BufNewFile,BufRead *.gretl			setf gretl
+
+" Groovy
+au BufNewFile,BufRead *.gradle,*.groovy		setf groovy
+
+" GNU Server Pages
+au BufNewFile,BufRead *.gsp			setf gsp
+
+" Group file
+au BufNewFile,BufRead */etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/etc/gshadow-,*/etc/gshadow.edit,*/var/backups/group.bak,*/var/backups/gshadow.bak  setf group
+
+" GTK RC
+au BufNewFile,BufRead .gtkrc,gtkrc		setf gtkrc
+
+" Haml
+au BufNewFile,BufRead *.haml			setf haml
+
+" Hamster Classic | Playground files
+au BufNewFile,BufRead *.hsc,*.hsm		setf hamster
+
+" Haskell
+au BufNewFile,BufRead *.hs,*.hs-boot		setf haskell
+au BufNewFile,BufRead *.lhs			setf lhaskell
+au BufNewFile,BufRead *.chs			setf chaskell
+
+" Haste
+au BufNewFile,BufRead *.ht			setf haste
+au BufNewFile,BufRead *.htpp			setf hastepreproc
+
+" Hercules
+au BufNewFile,BufRead *.vc,*.ev,*.sum,*.errsum	setf hercules
+
+" HEX (Intel)
+au BufNewFile,BufRead *.hex,*.h32		setf hex
+
+" Hollywood
+au BufRead,BufNewFile *.hws			setf hollywood
+
+" Tilde (must be before HTML)
+au BufNewFile,BufRead *.t.html			setf tilde
+
+" HTML (.shtml and .stm for server side)
+au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm  call dist#ft#FThtml()
+
+" HTML with Ruby - eRuby
+au BufNewFile,BufRead *.erb,*.rhtml		setf eruby
+
+" HTML with M4
+au BufNewFile,BufRead *.html.m4			setf htmlm4
+
+" Some template.  Used to be HTML Cheetah.
+au BufNewFile,BufRead *.tmpl			setf template
+
+" Host config
+au BufNewFile,BufRead */etc/host.conf		setf hostconf
+
+" Hosts access
+au BufNewFile,BufRead */etc/hosts.allow,*/etc/hosts.deny  setf hostsaccess
+
+" Hyper Builder
+au BufNewFile,BufRead *.hb			setf hb
+
+" Httest
+au BufNewFile,BufRead *.htt,*.htb		setf httest
+
+" Icon
+au BufNewFile,BufRead *.icn			setf icon
+
+" IDL (Interface Description Language)
+au BufNewFile,BufRead *.idl			call dist#ft#FTidl()
+
+" Microsoft IDL (Interface Description Language)  Also *.idl
+" MOF = WMI (Windows Management Instrumentation) Managed Object Format
+au BufNewFile,BufRead *.odl,*.mof		setf msidl
+
+" Icewm menu
+au BufNewFile,BufRead */.icewm/menu		setf icemenu
+
+" Indent profile (must come before IDL *.pro!)
+au BufNewFile,BufRead .indent.pro		setf indent
+au BufNewFile,BufRead indent.pro		call dist#ft#ProtoCheck('indent')
+
+" IDL (Interactive Data Language)
+au BufNewFile,BufRead *.pro			call dist#ft#ProtoCheck('idlang')
+
+" Indent RC
+au BufNewFile,BufRead indentrc			setf indent
+
+" Inform
+au BufNewFile,BufRead *.inf,*.INF		setf inform
+
+" Initng
+au BufNewFile,BufRead */etc/initng/*/*.i,*.ii	setf initng
+
+" Innovation Data Processing
+au BufRead,BufNewFile upstream.dat\c,upstream.*.dat\c,*.upstream.dat\c	setf upstreamdat
+au BufRead,BufNewFile fdrupstream.log,upstream.log\c,upstream.*.log\c,*.upstream.log\c,UPSTREAM-*.log\c	setf upstreamlog
+au BufRead,BufNewFile upstreaminstall.log\c,upstreaminstall.*.log\c,*.upstreaminstall.log\c setf upstreaminstalllog
+au BufRead,BufNewFile usserver.log\c,usserver.*.log\c,*.usserver.log\c	setf usserverlog
+au BufRead,BufNewFile usw2kagt.log\c,usw2kagt.*.log\c,*.usw2kagt.log\c	setf usw2kagtlog
+
+" Ipfilter
+au BufNewFile,BufRead ipf.conf,ipf6.conf,ipf.rules	setf ipfilter
+
+" Informix 4GL (source - canonical, include file, I4GL+M4 preproc.)
+au BufNewFile,BufRead *.4gl,*.4gh,*.m4gl	setf fgl
+
+" .INI file for MSDOS
+au BufNewFile,BufRead *.ini			setf dosini
+
+" SysV Inittab
+au BufNewFile,BufRead inittab			setf inittab
+
+" Inno Setup
+au BufNewFile,BufRead *.iss			setf iss
+
+" J
+au BufNewFile,BufRead *.ijs			setf j
+
+" JAL
+au BufNewFile,BufRead *.jal,*.JAL		setf jal
+
+" Jam
+au BufNewFile,BufRead *.jpl,*.jpr		setf jam
+
+" Java
+au BufNewFile,BufRead *.java,*.jav		setf java
+
+" JavaCC
+au BufNewFile,BufRead *.jj,*.jjt		setf javacc
+
+" JavaScript, ECMAScript, ES module script, CommonJS script
+au BufNewFile,BufRead *.js,*.javascript,*.es,*.mjs,*.cjs   setf javascript
+
+" JavaScript with React
+au BufNewFile,BufRead *.jsx			setf javascriptreact
+
+" Java Server Pages
+au BufNewFile,BufRead *.jsp			setf jsp
+
+" Java Properties resource file (note: doesn't catch font.properties.pl)
+au BufNewFile,BufRead *.properties,*.properties_??,*.properties_??_??	setf jproperties
+
+" Jess
+au BufNewFile,BufRead *.clp			setf jess
+
+" Jgraph
+au BufNewFile,BufRead *.jgr			setf jgraph
+
+" Jovial
+au BufNewFile,BufRead *.jov,*.j73,*.jovial	setf jovial
+
+" JSON
+au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest	setf json
+
+" Kixtart
+au BufNewFile,BufRead *.kix			setf kix
+
+" Kimwitu[++]
+au BufNewFile,BufRead *.k			setf kwt
+
+" Kivy
+au BufNewFile,BufRead *.kv			setf kivy
+
+" Kotlin
+au BufNewFile,BufRead *.kt,*.ktm,*.kts		setf kotlin
+
+" KDE script
+au BufNewFile,BufRead *.ks			setf kscript
+
+" Kconfig
+au BufNewFile,BufRead Kconfig,Kconfig.debug	setf kconfig
+
+" Lace (ISE)
+au BufNewFile,BufRead *.ace,*.ACE		setf lace
+
+" Latte
+au BufNewFile,BufRead *.latte,*.lte		setf latte
+
+" Limits
+au BufNewFile,BufRead */etc/limits,*/etc/*limits.conf,*/etc/*limits.d/*.conf	setf limits
+
+" LambdaProlog (*.mod too, see Modsim)
+au BufNewFile,BufRead *.sig			setf lprolog
+
+" LDAP LDIF
+au BufNewFile,BufRead *.ldif			setf ldif
+
+" Ld loader
+au BufNewFile,BufRead *.ld			setf ld
+
+" Less
+au BufNewFile,BufRead *.less			setf less
+
+" Lex
+au BufNewFile,BufRead *.lex,*.l,*.lxx,*.l++	setf lex
+
+" Libao
+au BufNewFile,BufRead */etc/libao.conf,*/.libao	setf libao
+
+" Libsensors
+au BufNewFile,BufRead */etc/sensors.conf,*/etc/sensors3.conf	setf sensors
+
+" LFTP
+au BufNewFile,BufRead lftp.conf,.lftprc,*lftp/rc	setf lftp
+
+" Lifelines (or Lex for C++!)
+au BufNewFile,BufRead *.ll			setf lifelines
+
+" Lilo: Linux loader
+au BufNewFile,BufRead lilo.conf			setf lilo
+
+" Lisp (*.el = ELisp, *.cl = Common Lisp)
+" *.jl was removed, it's also used for Julia, better skip than guess wrong.
+if has("fname_case")
+  au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.L,.emacs,.sawfishrc setf lisp
+else
+  au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,.emacs,.sawfishrc setf lisp
+endif
+
+" SBCL implementation of Common Lisp
+au BufNewFile,BufRead sbclrc,.sbclrc		setf lisp
+
+" Liquid
+au BufNewFile,BufRead *.liquid			setf liquid
+
+" Lite
+au BufNewFile,BufRead *.lite,*.lt		setf lite
+
+" LiteStep RC files
+au BufNewFile,BufRead */LiteStep/*/*.rc		setf litestep
+
+" Login access
+au BufNewFile,BufRead */etc/login.access	setf loginaccess
+
+" Login defs
+au BufNewFile,BufRead */etc/login.defs		setf logindefs
+
+" Logtalk
+au BufNewFile,BufRead *.lgt			setf logtalk
+
+" LOTOS
+au BufNewFile,BufRead *.lot,*.lotos		setf lotos
+
+" Lout (also: *.lt)
+au BufNewFile,BufRead *.lou,*.lout		setf lout
+
+" Lua
+au BufNewFile,BufRead *.lua			setf lua
+
+" Luarocks
+au BufNewFile,BufRead *.rockspec		setf lua
+
+" Linden Scripting Language (Second Life)
+au BufNewFile,BufRead *.lsl			setf lsl
+
+" Lynx style file (or LotusScript!)
+au BufNewFile,BufRead *.lss			setf lss
+
+" M4
+au BufNewFile,BufRead *.m4
+	\ if expand("<afile>") !~? 'html.m4$\|fvwm2rc' | setf m4 | endif
+
+" MaGic Point
+au BufNewFile,BufRead *.mgp			setf mgp
+
+" Mail (for Elm, trn, mutt, muttng, rn, slrn, neomutt)
+au BufNewFile,BufRead snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\\\{6\},neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml setf mail
+
+" Mail aliases
+au BufNewFile,BufRead */etc/mail/aliases,*/etc/aliases	setf mailaliases
+
+" Mailcap configuration file
+au BufNewFile,BufRead .mailcap,mailcap		setf mailcap
+
+" Makefile
+au BufNewFile,BufRead *[mM]akefile,*.mk,*.mak,*.dsp setf make
+
+" MakeIndex
+au BufNewFile,BufRead *.ist,*.mst		setf ist
+
+" Mallard
+au BufNewFile,BufRead *.page			setf mallard
+
+" Manpage
+au BufNewFile,BufRead *.man			setf man
+
+" Man config
+au BufNewFile,BufRead */etc/man.conf,man.config	setf manconf
+
+" Maple V
+au BufNewFile,BufRead *.mv,*.mpl,*.mws		setf maple
+
+" Map (UMN mapserver config file)
+au BufNewFile,BufRead *.map			setf map
+
+" Markdown
+au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,*.md  setf markdown
+
+" Mason
+au BufNewFile,BufRead *.mason,*.mhtml,*.comp	setf mason
+
+" Mathematica, Matlab, Murphi or Objective C
+au BufNewFile,BufRead *.m			call dist#ft#FTm()
+
+" Mathematica notebook
+au BufNewFile,BufRead *.nb			setf mma
+
+" Maya Extension Language
+au BufNewFile,BufRead *.mel			setf mel
+
+" Mercurial (hg) commit file
+au BufNewFile,BufRead hg-editor-*.txt		setf hgcommit
+
+" Mercurial config (looks like generic config file)
+au BufNewFile,BufRead *.hgrc,*hgrc		setf cfg
+
+" Meson Build system config
+au BufNewFile,BufRead meson.build,meson_options.txt setf meson
+
+" Messages (logs mostly)
+au BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.[0-9]*,-[0-9]*} setf messages
+
+" Metafont
+au BufNewFile,BufRead *.mf			setf mf
+
+" MetaPost
+au BufNewFile,BufRead *.mp			setf mp
+
+" MGL
+au BufNewFile,BufRead *.mgl			setf mgl
+
+" MIX - Knuth assembly
+au BufNewFile,BufRead *.mix,*.mixal		setf mix
+
+" MMIX or VMS makefile
+au BufNewFile,BufRead *.mms			call dist#ft#FTmms()
+
+" Symbian meta-makefile definition (MMP)
+au BufNewFile,BufRead *.mmp			setf mmp
+
+" Modsim III (or LambdaProlog)
+au BufNewFile,BufRead *.mod
+	\ if getline(1) =~ '\<module\>' |
+	\   setf lprolog |
+	\ else |
+	\   setf modsim3 |
+	\ endif
+
+" Modula 2  (.md removed in favor of Markdown)
+au BufNewFile,BufRead *.m2,*.DEF,*.MOD,*.mi	setf modula2
+
+" Modula 3 (.m3, .i3, .mg, .ig)
+au BufNewFile,BufRead *.[mi][3g]		setf modula3
+
+" Monk
+au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc	setf monk
+
+" MOO
+au BufNewFile,BufRead *.moo			setf moo
+
+" Modconf
+au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules setf modconf
+
+" Mplayer config
+au BufNewFile,BufRead mplayer.conf,*/.mplayer/config	setf mplayerconf
+
+" Motorola S record
+au BufNewFile,BufRead *.s19,*.s28,*.s37,*.mot,*.srec	setf srec
+
+" Mrxvtrc
+au BufNewFile,BufRead mrxvtrc,.mrxvtrc		setf mrxvtrc
+
+" Msql
+au BufNewFile,BufRead *.msql			setf msql
+
+" Mysql
+au BufNewFile,BufRead *.mysql			setf mysql
+
+" Mutt setup files (must be before catch *.rc)
+au BufNewFile,BufRead */etc/Muttrc.d/*		call s:StarSetf('muttrc')
+
+" M$ Resource files
+au BufNewFile,BufRead *.rc,*.rch		setf rc
+
+" MuPAD source
+au BufRead,BufNewFile *.mu			setf mupad
+
+" Mush
+au BufNewFile,BufRead *.mush			setf mush
+
+" Mutt setup file (also for Muttng)
+au BufNewFile,BufRead Mutt{ng,}rc		setf muttrc
+
+" N1QL
+au BufRead,BufNewfile *.n1ql,*.nql		setf n1ql
+
+" Nano
+au BufNewFile,BufRead */etc/nanorc,*.nanorc	setf nanorc
+
+" Nastran input/DMAP
+"au BufNewFile,BufRead *.dat			setf nastran
+
+" Natural
+au BufNewFile,BufRead *.NS[ACGLMNPS]		setf natural
+
+" Noemutt setup file
+au BufNewFile,BufRead Neomuttrc			setf neomuttrc
+
+" Netrc
+au BufNewFile,BufRead .netrc			setf netrc
+
+" Ninja file
+au BufNewFile,BufRead *.ninja			setf ninja
+
+" NPM RC file
+au BufNewFile,BufRead npmrc,.npmrc		setf dosini
+
+" Novell netware batch files
+au BufNewFile,BufRead *.ncf			setf ncf
+
+" Nroff/Troff (*.ms and *.t are checked below)
+au BufNewFile,BufRead *.me
+	\ if expand("<afile>") != "read.me" && expand("<afile>") != "click.me" |
+	\   setf nroff |
+	\ endif
+au BufNewFile,BufRead *.tr,*.nr,*.roff,*.tmac,*.mom	setf nroff
+au BufNewFile,BufRead *.[1-9]			call dist#ft#FTnroff()
+
+" Nroff or Objective C++
+au BufNewFile,BufRead *.mm			call dist#ft#FTmm()
+
+" Not Quite C
+au BufNewFile,BufRead *.nqc			setf nqc
+
+" NSE - Nmap Script Engine - uses Lua syntax
+au BufNewFile,BufRead *.nse			setf lua
+
+" NSIS
+au BufNewFile,BufRead *.nsi,*.nsh		setf nsis
+
+" OCAML
+au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit	setf ocaml
+
+" Occam
+au BufNewFile,BufRead *.occ			setf occam
+
+" Omnimark
+au BufNewFile,BufRead *.xom,*.xin		setf omnimark
+
+" OpenROAD
+au BufNewFile,BufRead *.or			setf openroad
+
+" OPL
+au BufNewFile,BufRead *.[Oo][Pp][Ll]		setf opl
+
+" Oracle config file
+au BufNewFile,BufRead *.ora			setf ora
+
+" Packet filter conf
+au BufNewFile,BufRead pf.conf			setf pf
+
+" Pacman Config (close enough to dosini)
+au BufNewFile,BufRead */etc/pacman.conf		setf dosini
+
+" Pacman hooks
+au BufNewFile,BufRead *.hook
+	\ if getline(1) == '[Trigger]' |
+	\   setf dosini |
+	\ endif
+
+" Pam conf
+au BufNewFile,BufRead */etc/pam.conf			setf pamconf
+
+" Pam environment
+au BufNewFile,BufRead pam_env.conf,.pam_environment	setf pamenv
+
+" PApp
+au BufNewFile,BufRead *.papp,*.pxml,*.pxsl	setf papp
+
+" Password file
+au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
+
+" Pascal (also *.p)
+au BufNewFile,BufRead *.pas,*.pp		setf pascal
+
+" Delphi or Lazarus program file
+au BufNewFile,BufRead *.dpr,*.lpr		setf pascal
+
+" PDF
+au BufNewFile,BufRead *.pdf			setf pdf
+
+" PCMK - HAE - crm configure edit
+au BufNewFile,BufRead *.pcmk			setf pcmk
+
+" Perl
+if has("fname_case")
+  au BufNewFile,BufRead *.pl,*.PL		call dist#ft#FTpl()
+else
+  au BufNewFile,BufRead *.pl			call dist#ft#FTpl()
+endif
+au BufNewFile,BufRead *.plx,*.al,*.psgi		setf perl
+au BufNewFile,BufRead *.p6,*.pm6,*.pl6		setf perl6
+au BufNewFile,BufRead *.raku,*.rakumod		setf perl6
+
+" Perl, XPM or XPM2
+au BufNewFile,BufRead *.pm
+	\ if getline(1) =~ "XPM2" |
+	\   setf xpm2 |
+	\ elseif getline(1) =~ "XPM" |
+	\   setf xpm |
+	\ else |
+	\   setf perl |
+	\ endif
+
+" Perl POD
+au BufNewFile,BufRead *.pod			setf pod
+au BufNewFile,BufRead *.pod6			setf pod6
+
+" Php, php3, php4, etc.
+" Also Phtml (was used for PHP 2 in the past)
+" Also .ctp for Cake template file
+au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp	setf php
+
+" PHP config
+au BufNewFile,BufRead php.ini-*			setf dosini
+
+" Pike and Cmod
+au BufNewFile,BufRead *.pike,*.pmod		setf pike
+au BufNewFile,BufRead *.cmod			setf cmod
+
+" Pinfo config
+au BufNewFile,BufRead */etc/pinforc,*/.pinforc	setf pinfo
+
+" Palm Resource compiler
+au BufNewFile,BufRead *.rcp			setf pilrc
+
+" Pine config
+au BufNewFile,BufRead .pinerc,pinerc,.pinercex,pinercex		setf pine
+
+" Pipenv Pipfiles
+au BufNewFile,BufRead Pipfile			setf config
+au BufNewFile,BufRead Pipfile.lock		setf json
+
+" PL/1, PL/I
+au BufNewFile,BufRead *.pli,*.pl1		setf pli
+
+" PL/M (also: *.inp)
+au BufNewFile,BufRead *.plm,*.p36,*.pac		setf plm
+
+" PL/SQL
+au BufNewFile,BufRead *.pls,*.plsql		setf plsql
+
+" PLP
+au BufNewFile,BufRead *.plp			setf plp
+
+" PO and PO template (GNU gettext)
+au BufNewFile,BufRead *.po,*.pot		setf po
+
+" Postfix main config
+au BufNewFile,BufRead main.cf			setf pfmain
+
+" PostScript (+ font files, encapsulated PostScript, Adobe Illustrator)
+au BufNewFile,BufRead *.ps,*.pfa,*.afm,*.eps,*.epsf,*.epsi,*.ai	  setf postscr
+
+" PostScript Printer Description
+au BufNewFile,BufRead *.ppd			setf ppd
+
+" Povray
+au BufNewFile,BufRead *.pov			setf pov
+
+" Povray configuration
+au BufNewFile,BufRead .povrayrc			setf povini
+
+" Povray, PHP or assembly
+au BufNewFile,BufRead *.inc			call dist#ft#FTinc()
+
+" Printcap and Termcap
+au BufNewFile,BufRead *printcap
+	\ let b:ptcap_type = "print" | setf ptcap
+au BufNewFile,BufRead *termcap
+	\ let b:ptcap_type = "term" | setf ptcap
+
+" PCCTS / ANTRL
+"au BufNewFile,BufRead *.g			setf antrl
+au BufNewFile,BufRead *.g			setf pccts
+
+" PPWizard
+au BufNewFile,BufRead *.it,*.ih			setf ppwiz
+
+" Obj 3D file format
+" TODO: is there a way to avoid MS-Windows Object files?
+au BufNewFile,BufRead *.obj			setf obj
+
+" Oracle Pro*C/C++
+au BufNewFile,BufRead *.pc			setf proc
+
+" Privoxy actions file
+au BufNewFile,BufRead *.action			setf privoxy
+
+" Procmail
+au BufNewFile,BufRead .procmail,.procmailrc	setf procmail
+
+" Progress or CWEB
+au BufNewFile,BufRead *.w			call dist#ft#FTprogress_cweb()
+
+" Progress or assembly
+au BufNewFile,BufRead *.i			call dist#ft#FTprogress_asm()
+
+" Progress or Pascal
+au BufNewFile,BufRead *.p			call dist#ft#FTprogress_pascal()
+
+" Software Distributor Product Specification File (POSIX 1387.2-1995)
+au BufNewFile,BufRead *.psf			setf psf
+au BufNewFile,BufRead INDEX,INFO
+	\ if getline(1) =~ '^\s*\(distribution\|installed_software\|root\|bundle\|product\)\s*$' |
+	\   setf psf |
+	\ endif
+
+" Prolog
+au BufNewFile,BufRead *.pdb			setf prolog
+
+" Promela
+au BufNewFile,BufRead *.pml			setf promela
+
+" Google protocol buffers
+au BufNewFile,BufRead *.proto			setf proto
+
+" Protocols
+au BufNewFile,BufRead */etc/protocols		setf protocols
+
+" Pyrex
+au BufNewFile,BufRead *.pyx,*.pxd		setf pyrex
+
+" Python, Python Shell Startup and Python Stub Files
+" Quixote (Python-based web framework)
+au BufNewFile,BufRead *.py,*.pyw,.pythonstartup,.pythonrc  setf python
+au BufNewFile,BufRead *.ptl,*.pyi,SConstruct		   setf python
+
+" Radiance
+au BufNewFile,BufRead *.rad,*.mat		setf radiance
+
+" Ratpoison config/command files
+au BufNewFile,BufRead .ratpoisonrc,ratpoisonrc	setf ratpoison
+
+" RCS file
+au BufNewFile,BufRead *\,v			setf rcs
+
+" Readline
+au BufNewFile,BufRead .inputrc,inputrc		setf readline
+
+" Registry for MS-Windows
+au BufNewFile,BufRead *.reg
+	\ if getline(1) =~? '^REGEDIT[0-9]*\s*$\|^Windows Registry Editor Version \d*\.\d*\s*$' | setf registry | endif
+
+" Renderman Interface Bytestream
+au BufNewFile,BufRead *.rib			setf rib
+
+" Rego Policy Language
+au BufNewFile,BufRead *.rego			setf rego
+
+" Rexx
+au BufNewFile,BufRead *.rex,*.orx,*.rxo,*.rxj,*.jrexx,*.rexxj,*.rexx,*.testGroup,*.testUnit	setf rexx
+
+" R Help file
+if has("fname_case")
+  au BufNewFile,BufRead *.rd,*.Rd		setf rhelp
+else
+  au BufNewFile,BufRead *.rd			setf rhelp
+endif
+
+" R noweb file
+if has("fname_case")
+  au BufNewFile,BufRead *.Rnw,*.rnw,*.Snw,*.snw		setf rnoweb
+else
+  au BufNewFile,BufRead *.rnw,*.snw			setf rnoweb
+endif
+
+" R Markdown file
+if has("fname_case")
+  au BufNewFile,BufRead *.Rmd,*.rmd,*.Smd,*.smd		setf rmd
+else
+  au BufNewFile,BufRead *.rmd,*.smd			setf rmd
+endif
+
+" R reStructuredText file
+if has("fname_case")
+  au BufNewFile,BufRead *.Rrst,*.rrst,*.Srst,*.srst	setf rrst
+else
+  au BufNewFile,BufRead *.rrst,*.srst			setf rrst
+endif
+
+" Rexx, Rebol or R
+au BufNewFile,BufRead *.r,*.R				call dist#ft#FTr()
+
+" Remind
+au BufNewFile,BufRead .reminders,*.remind,*.rem		setf remind
+
+" Resolv.conf
+au BufNewFile,BufRead resolv.conf		setf resolv
+
+" Relax NG Compact
+au BufNewFile,BufRead *.rnc			setf rnc
+
+" Relax NG XML
+au BufNewFile,BufRead *.rng			setf rng
+
+" RPL/2
+au BufNewFile,BufRead *.rpl			setf rpl
+
+" Robots.txt
+au BufNewFile,BufRead robots.txt		setf robots
+
+" Rpcgen
+au BufNewFile,BufRead *.x			setf rpcgen
+
+" reStructuredText Documentation Format
+au BufNewFile,BufRead *.rst			setf rst
+
+" RTF
+au BufNewFile,BufRead *.rtf			setf rtf
+
+" Interactive Ruby shell
+au BufNewFile,BufRead .irbrc,irbrc		setf ruby
+
+" Ruby
+au BufNewFile,BufRead *.rb,*.rbw		setf ruby
+
+" RubyGems
+au BufNewFile,BufRead *.gemspec			setf ruby
+
+" Rust
+au BufNewFile,BufRead *.rs			setf rust
+
+" Rackup
+au BufNewFile,BufRead *.ru			setf ruby
+
+" Bundler
+au BufNewFile,BufRead Gemfile			setf ruby
+
+" Ruby on Rails
+au BufNewFile,BufRead *.builder,*.rxml,*.rjs	setf ruby
+
+" Rantfile and Rakefile is like Ruby
+au BufNewFile,BufRead [rR]antfile,*.rant,[rR]akefile,*.rake	setf ruby
+
+" S-lang (or shader language, or SmallLisp)
+au BufNewFile,BufRead *.sl			setf slang
+
+" Samba config
+au BufNewFile,BufRead smb.conf			setf samba
+
+" SAS script
+au BufNewFile,BufRead *.sas			setf sas
+
+" Sass
+au BufNewFile,BufRead *.sass			setf sass
+
+" Sather
+au BufNewFile,BufRead *.sa			setf sather
+
+" Scala
+au BufNewFile,BufRead *.scala			setf scala
+
+" SBT - Scala Build Tool
+au BufNewFile,BufRead *.sbt			setf sbt
+
+" Scilab
+au BufNewFile,BufRead *.sci,*.sce		setf scilab
+
+" SCSS
+au BufNewFile,BufRead *.scss			setf scss
+
+" SD: Streaming Descriptors
+au BufNewFile,BufRead *.sd			setf sd
+
+" SDL
+au BufNewFile,BufRead *.sdl,*.pr		setf sdl
+
+" sed
+au BufNewFile,BufRead *.sed			setf sed
+
+" Sieve (RFC 3028, 5228)
+au BufNewFile,BufRead *.siv,*.sieve		setf sieve
+
+" Sendmail
+au BufNewFile,BufRead sendmail.cf		setf sm
+
+" Sendmail .mc files are actually m4.  Could also be MS Message text file.
+au BufNewFile,BufRead *.mc			call dist#ft#McSetf()
+
+" Services
+au BufNewFile,BufRead */etc/services		setf services
+
+" Service Location config
+au BufNewFile,BufRead */etc/slp.conf		setf slpconf
+
+" Service Location registration
+au BufNewFile,BufRead */etc/slp.reg		setf slpreg
+
+" Service Location SPI
+au BufNewFile,BufRead */etc/slp.spi		setf slpspi
+
+" Setserial config
+au BufNewFile,BufRead */etc/serial.conf		setf setserial
+
+" SGML
+au BufNewFile,BufRead *.sgm,*.sgml
+	\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'linuxdoc' |
+	\   setf sgmllnx |
+	\ elseif getline(1) =~ '<!DOCTYPE.*DocBook' || getline(2) =~ '<!DOCTYPE.*DocBook' |
+	\   let b:docbk_type = "sgml" |
+	\   let b:docbk_ver = 4 |
+	\   setf docbk |
+	\ else |
+	\   setf sgml |
+	\ endif
+
+" SGMLDECL
+au BufNewFile,BufRead *.decl,*.dcl,*.dec
+	\ if getline(1).getline(2).getline(3) =~? '^<!SGML' |
+	\    setf sgmldecl |
+	\ endif
+
+" SGML catalog file
+au BufNewFile,BufRead catalog			setf catalog
+
+" Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc.
+" Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts
+" NOTE: Patterns ending in a star are further down, these have lower priority.
+au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD call dist#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .kshrc,*.ksh call dist#ft#SetFileTypeSH("ksh")
+au BufNewFile,BufRead */etc/profile,.profile,*.sh,*.env call dist#ft#SetFileTypeSH(getline(1))
+
+
+" Shell script (Arch Linux) or PHP file (Drupal)
+au BufNewFile,BufRead *.install
+	\ if getline(1) =~ '<?php' |
+	\   setf php |
+	\ else |
+	\   call dist#ft#SetFileTypeSH("bash") |
+	\ endif
+
+" tcsh scripts (patterns ending in a star further below)
+au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login	call dist#ft#SetFileTypeShell("tcsh")
+
+" csh scripts, but might also be tcsh scripts (on some systems csh is tcsh)
+" (patterns ending in a start further below)
+au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias  call dist#ft#CSH()
+
+" Z-Shell script (patterns ending in a star further below)
+au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks  setf zsh
+au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump setf zsh
+au BufNewFile,BufRead *.zsh			setf zsh
+
+" Scheme
+au BufNewFile,BufRead *.scm,*.ss,*.rkt		setf scheme
+
+" Screen RC
+au BufNewFile,BufRead .screenrc,screenrc	setf screen
+
+" Simula
+au BufNewFile,BufRead *.sim			setf simula
+
+" SINDA
+au BufNewFile,BufRead *.sin,*.s85		setf sinda
+
+" SiSU
+au BufNewFile,BufRead *.sst,*.ssm,*.ssi,*.-sst,*._sst setf sisu
+au BufNewFile,BufRead *.sst.meta,*.-sst.meta,*._sst.meta setf sisu
+
+" SKILL
+au BufNewFile,BufRead *.il,*.ils,*.cdf		setf skill
+
+" SLRN
+au BufNewFile,BufRead .slrnrc			setf slrnrc
+au BufNewFile,BufRead *.score			setf slrnsc
+
+" Smalltalk (and TeX)
+au BufNewFile,BufRead *.st			setf st
+au BufNewFile,BufRead *.cls
+	\ if getline(1) =~ '^%' |
+	\  setf tex |
+	\ elseif getline(1)[0] == '#' && getline(1) =~ 'rexx' |
+	\  setf rexx |
+	\ else |
+	\  setf st |
+	\ endif
+
+" Smarty templates
+au BufNewFile,BufRead *.tpl			setf smarty
+
+" SMIL or XML
+au BufNewFile,BufRead *.smil
+	\ if getline(1) =~ '<?\s*xml.*?>' |
+	\   setf xml |
+	\ else |
+	\   setf smil |
+	\ endif
+
+" SMIL or SNMP MIB file
+au BufNewFile,BufRead *.smi
+	\ if getline(1) =~ '\<smil\>' |
+	\   setf smil |
+	\ else |
+	\   setf mib |
+	\ endif
+
+" SMITH
+au BufNewFile,BufRead *.smt,*.smith		setf smith
+
+" Snobol4 and spitbol
+au BufNewFile,BufRead *.sno,*.spt		setf snobol4
+
+" SNMP MIB files
+au BufNewFile,BufRead *.mib,*.my		setf mib
+
+" Snort Configuration
+au BufNewFile,BufRead *.hog,snort.conf,vision.conf	setf hog
+au BufNewFile,BufRead *.rules			call dist#ft#FTRules()
+
+" Spec (Linux RPM)
+au BufNewFile,BufRead *.spec			setf spec
+
+" Speedup (AspenTech plant simulator)
+au BufNewFile,BufRead *.speedup,*.spdata,*.spd	setf spup
+
+" Slice
+au BufNewFile,BufRead *.ice			setf slice
+
+" Spice
+au BufNewFile,BufRead *.sp,*.spice		setf spice
+
+" Spyce
+au BufNewFile,BufRead *.spy,*.spi		setf spyce
+
+" Squid
+au BufNewFile,BufRead squid.conf		setf squid
+
+" SQL for Oracle Designer
+au BufNewFile,BufRead *.tyb,*.typ,*.tyc,*.pkb,*.pks	setf sql
+
+" SQL
+au BufNewFile,BufRead *.sql			call dist#ft#SQL()
+
+" SQLJ
+au BufNewFile,BufRead *.sqlj			setf sqlj
+
+" SQR
+au BufNewFile,BufRead *.sqr,*.sqi		setf sqr
+
+" OpenSSH configuration
+au BufNewFile,BufRead ssh_config,*/.ssh/config		setf sshconfig
+au BufNewFile,BufRead */etc/ssh/ssh_config.d/*.conf	setf sshconfig
+
+" OpenSSH server configuration
+au BufNewFile,BufRead sshd_config			setf sshdconfig
+au BufNewFile,BufRead */etc/ssh/sshd_config.d/*.conf	setf sshdconfig
+
+" Stata
+au BufNewFile,BufRead *.ado,*.do,*.imata,*.mata	setf stata
+" Also *.class, but not when it's a Java bytecode file
+au BufNewFile,BufRead *.class
+	\ if getline(1) !~ "^\xca\xfe\xba\xbe" | setf stata | endif
+
+" SMCL
+au BufNewFile,BufRead *.hlp,*.ihlp,*.smcl	setf smcl
+
+" Stored Procedures
+au BufNewFile,BufRead *.stp			setf stp
+
+" Standard ML
+au BufNewFile,BufRead *.sml			setf sml
+
+" Sratus VOS command macro
+au BufNewFile,BufRead *.cm			setf voscm
+
+" Swift
+au BufNewFile,BufRead *.swift			setf swift
+au BufNewFile,BufRead *.swift.gyb		setf swiftgyb
+
+" Swift Intermediate Language
+au BufNewFile,BufRead *.sil			setf sil
+
+" Sysctl
+au BufNewFile,BufRead */etc/sysctl.conf,*/etc/sysctl.d/*.conf	setf sysctl
+
+" Systemd unit files
+au BufNewFile,BufRead */systemd/*.{automount,dnssd,link,mount,netdev,network,nspawn,path,service,slice,socket,swap,target,timer}	setf systemd
+" Systemd overrides
+au BufNewFile,BufRead */etc/systemd/*.conf.d/*.conf	setf systemd
+au BufNewFile,BufRead */etc/systemd/system/*.d/*.conf	setf systemd
+au BufNewFile,BufRead */.config/systemd/user/*.d/*.conf	setf systemd
+" Systemd temp files
+au BufNewFile,BufRead */etc/systemd/system/*.d/.#*	setf systemd
+au BufNewFile,BufRead */etc/systemd/system/.#*		setf systemd
+au BufNewFile,BufRead */.config/systemd/user/*.d/.#*	setf systemd
+au BufNewFile,BufRead */.config/systemd/user/.#*	setf systemd
+
+" Synopsys Design Constraints
+au BufNewFile,BufRead *.sdc			setf sdc
+
+" Sudoers
+au BufNewFile,BufRead */etc/sudoers,sudoers.tmp	setf sudoers
+
+" SVG (Scalable Vector Graphics)
+au BufNewFile,BufRead *.svg			setf svg
+
+" Tads (or Nroff or Perl test file)
+au BufNewFile,BufRead *.t
+	\ if !dist#ft#FTnroff() && !dist#ft#FTperl() | setf tads | endif
+
+" Tags
+au BufNewFile,BufRead tags			setf tags
+
+" TAK
+au BufNewFile,BufRead *.tak			setf tak
+
+" Task
+au BufRead,BufNewFile {pending,completed,undo}.data  setf taskdata
+au BufRead,BufNewFile *.task			setf taskedit
+
+" Tcl (JACL too)
+au BufNewFile,BufRead *.tcl,*.tk,*.itcl,*.itk,*.jacl	setf tcl
+
+" TealInfo
+au BufNewFile,BufRead *.tli			setf tli
+
+" Telix Salt
+au BufNewFile,BufRead *.slt			setf tsalt
+
+" Tera Term Language
+au BufRead,BufNewFile *.ttl			setf teraterm
+
+" Terminfo
+au BufNewFile,BufRead *.ti			setf terminfo
+
+" TeX
+au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl	setf tex
+au BufNewFile,BufRead *.tex			call dist#ft#FTtex()
+
+" ConTeXt
+au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi   setf context
+
+" Texinfo
+au BufNewFile,BufRead *.texinfo,*.texi,*.txi	setf texinfo
+
+" TeX configuration
+au BufNewFile,BufRead texmf.cnf			setf texmf
+
+" Tidy config
+au BufNewFile,BufRead .tidyrc,tidyrc,tidy.conf	setf tidy
+
+" TF mud client
+au BufNewFile,BufRead *.tf,.tfrc,tfrc		setf tf
+
+" tmux configuration
+au BufNewFile,BufRead {.,}tmux*.conf		setf tmux
+
+" TPP - Text Presentation Program
+au BufNewFile,BufReadPost *.tpp			setf tpp
+
+" Treetop
+au BufRead,BufNewFile *.treetop			setf treetop
+
+" Trustees
+au BufNewFile,BufRead trustees.conf		setf trustees
+
+" TSS - Geometry
+au BufNewFile,BufReadPost *.tssgm		setf tssgm
+
+" TSS - Optics
+au BufNewFile,BufReadPost *.tssop		setf tssop
+
+" TSS - Command Line (temporary)
+au BufNewFile,BufReadPost *.tsscl		setf tsscl
+
+" TWIG files
+au BufNewFile,BufReadPost *.twig		setf twig
+
+" Typescript
+au BufNewFile,BufReadPost *.ts			setf typescript
+
+" TypeScript with React
+au BufNewFile,BufRead *.tsx			setf typescriptreact
+
+" Motif UIT/UIL files
+au BufNewFile,BufRead *.uit,*.uil		setf uil
+
+" Udev conf
+au BufNewFile,BufRead */etc/udev/udev.conf	setf udevconf
+
+" Udev permissions
+au BufNewFile,BufRead */etc/udev/permissions.d/*.permissions setf udevperm
+"
+" Udev symlinks config
+au BufNewFile,BufRead */etc/udev/cdsymlinks.conf	setf sh
+
+" UnrealScript
+au BufNewFile,BufRead *.uc			setf uc
+
+" Updatedb
+au BufNewFile,BufRead */etc/updatedb.conf	setf updatedb
+
+" Upstart (init(8)) config files
+au BufNewFile,BufRead */usr/share/upstart/*.conf	       setf upstart
+au BufNewFile,BufRead */usr/share/upstart/*.override	       setf upstart
+au BufNewFile,BufRead */etc/init/*.conf,*/etc/init/*.override  setf upstart
+au BufNewFile,BufRead */.init/*.conf,*/.init/*.override	       setf upstart
+au BufNewFile,BufRead */.config/upstart/*.conf		       setf upstart
+au BufNewFile,BufRead */.config/upstart/*.override	       setf upstart
+
+" Vera
+au BufNewFile,BufRead *.vr,*.vri,*.vrh		setf vera
+
+" Verilog HDL
+au BufNewFile,BufRead *.v			setf verilog
+
+" Verilog-AMS HDL
+au BufNewFile,BufRead *.va,*.vams		setf verilogams
+
+" SystemVerilog
+au BufNewFile,BufRead *.sv,*.svh		setf systemverilog
+
+" VHDL
+au BufNewFile,BufRead *.hdl,*.vhd,*.vhdl,*.vbe,*.vst,*.vho  setf vhdl
+
+" Vim script
+au BufNewFile,BufRead *.vim,*.vba,.exrc,_exrc	setf vim
+
+" Viminfo file
+au BufNewFile,BufRead .viminfo,_viminfo		setf viminfo
+
+" Virata Config Script File or Drupal module
+au BufRead,BufNewFile *.hw,*.module,*.pkg
+	\ if getline(1) =~ '<?php' |
+	\   setf php |
+	\ else |
+	\   setf virata |
+	\ endif
+
+" Visual Basic (also uses *.bas) or FORM
+au BufNewFile,BufRead *.frm			call dist#ft#FTVB("form")
+
+" SaxBasic is close to Visual Basic
+au BufNewFile,BufRead *.sba			setf vb
+
+" Vgrindefs file
+au BufNewFile,BufRead vgrindefs			setf vgrindefs
+
+" VRML V1.0c
+au BufNewFile,BufRead *.wrl			setf vrml
+
+" Vroom (vim testing and executable documentation)
+au BufNewFile,BufRead *.vroom			setf vroom
+
+" Vue.js Single File Component
+au BufNewFile,BufRead *.vue			setf vue
+
+" WebAssembly
+au BufNewFile,BufRead *.wast,*.wat		setf wast
+
+" Webmacro
+au BufNewFile,BufRead *.wm			setf webmacro
+
+" Wget config
+au BufNewFile,BufRead .wgetrc,wgetrc		setf wget
+
+" Website MetaLanguage
+au BufNewFile,BufRead *.wml			setf wml
+
+" Winbatch
+au BufNewFile,BufRead *.wbt			setf winbatch
+
+" WSML
+au BufNewFile,BufRead *.wsml			setf wsml
+
+" WPL
+au BufNewFile,BufRead *.wpl			setf xml
+
+" WvDial
+au BufNewFile,BufRead wvdial.conf,.wvdialrc	setf wvdial
+
+" CVS RC file
+au BufNewFile,BufRead .cvsrc			setf cvsrc
+
+" CVS commit file
+au BufNewFile,BufRead cvs\d\+			setf cvs
+
+" WEB (*.web is also used for Winbatch: Guess, based on expecting "%" comment
+" lines in a WEB file).
+au BufNewFile,BufRead *.web
+	\ if getline(1)[0].getline(2)[0].getline(3)[0].getline(4)[0].getline(5)[0] =~ "%" |
+	\   setf web |
+	\ else |
+	\   setf winbatch |
+	\ endif
+
+" Windows Scripting Host and Windows Script Component
+au BufNewFile,BufRead *.ws[fc]			setf wsh
+
+" XHTML
+au BufNewFile,BufRead *.xhtml,*.xht		setf xhtml
+
+" X Pixmap (dynamically sets colors, use BufEnter to make it work better)
+au BufEnter *.xpm
+	\ if getline(1) =~ "XPM2" |
+	\   setf xpm2 |
+	\ else |
+	\   setf xpm |
+	\ endif
+au BufEnter *.xpm2				setf xpm2
+
+" XFree86 config
+au BufNewFile,BufRead XF86Config
+	\ if getline(1) =~ '\<XConfigurator\>' |
+	\   let b:xf86conf_xfree86_version = 3 |
+	\ endif |
+	\ setf xf86conf
+au BufNewFile,BufRead */xorg.conf.d/*.conf
+	\ let b:xf86conf_xfree86_version = 4 |
+	\ setf xf86conf
+
+" Xorg config
+au BufNewFile,BufRead xorg.conf,xorg.conf-4	let b:xf86conf_xfree86_version = 4 | setf xf86conf
+
+" Xinetd conf
+au BufNewFile,BufRead */etc/xinetd.conf		setf xinetd
+
+" XS Perl extension interface language
+au BufNewFile,BufRead *.xs			setf xs
+
+" X resources file
+au BufNewFile,BufRead .Xdefaults,.Xpdefaults,.Xresources,xdm-config,*.ad setf xdefaults
+
+" Xmath
+au BufNewFile,BufRead *.msc,*.msf		setf xmath
+au BufNewFile,BufRead *.ms
+	\ if !dist#ft#FTnroff() | setf xmath | endif
+
+" XML  specific variants: docbk and xbl
+au BufNewFile,BufRead *.xml			call dist#ft#FTxml()
+
+" XMI (holding UML models) is also XML
+au BufNewFile,BufRead *.xmi			setf xml
+
+" CSPROJ files are Visual Studio.NET's XML-based project config files
+au BufNewFile,BufRead *.csproj,*.csproj.user	setf xml
+
+" Qt Linguist translation source and Qt User Interface Files are XML
+" However, for .ts Typescript is more common.
+au BufNewFile,BufRead *.ui			setf xml
+
+" TPM's are RDF-based descriptions of TeX packages (Nikolai Weibull)
+au BufNewFile,BufRead *.tpm			setf xml
+
+" Xdg menus
+au BufNewFile,BufRead */etc/xdg/menus/*.menu	setf xml
+
+" ATI graphics driver configuration
+au BufNewFile,BufRead fglrxrc			setf xml
+
+" Web Services Description Language (WSDL)
+au BufNewFile,BufRead *.wsdl			setf xml
+
+" XLIFF (XML Localisation Interchange File Format) is also XML
+au BufNewFile,BufRead *.xlf			setf xml
+au BufNewFile,BufRead *.xliff			setf xml
+
+" XML User Interface Language
+au BufNewFile,BufRead *.xul			setf xml
+
+" X11 xmodmap (also see below)
+au BufNewFile,BufRead *Xmodmap			setf xmodmap
+
+" Xquery
+au BufNewFile,BufRead *.xq,*.xql,*.xqm,*.xquery,*.xqy	setf xquery
+
+" XSD
+au BufNewFile,BufRead *.xsd			setf xsd
+
+" Xslt
+au BufNewFile,BufRead *.xsl,*.xslt		setf xslt
+
+" Yacc
+au BufNewFile,BufRead *.yy,*.yxx,*.y++		setf yacc
+
+" Yacc or racc
+au BufNewFile,BufRead *.y			call dist#ft#FTy()
+
+" Yaml
+au BufNewFile,BufRead *.yaml,*.yml		setf yaml
+
+" Raml
+au BufNewFile,BufRead *.raml			setf raml
+
+" yum conf (close enough to dosini)
+au BufNewFile,BufRead */etc/yum.conf		setf dosini
+
+" Zimbu
+au BufNewFile,BufRead *.zu			setf zimbu
+" Zimbu Templates
+au BufNewFile,BufRead *.zut			setf zimbutempl
+
+" Zope
+"   dtml (zope dynamic template markup language), pt (zope page template),
+"   cpt (zope form controller page template)
+au BufNewFile,BufRead *.dtml,*.pt,*.cpt		call dist#ft#FThtml()
+"   zsql (zope sql method)
+au BufNewFile,BufRead *.zsql			call dist#ft#SQL()
+
+" Z80 assembler asz80
+au BufNewFile,BufRead *.z8a			setf z8a
+
+augroup END
+
+
+" Source the user-specified filetype file, for backwards compatibility with
+" Vim 5.x.
+if exists("myfiletypefile") && filereadable(expand(myfiletypefile))
+  execute "source " . myfiletypefile
+endif
+
+
+" Check for "*" after loading myfiletypefile, so that scripts.vim is only used
+" when there are no matching file name extensions.
+" Don't do this for compressed files.
+augroup filetypedetect
+
+
+
+
+" Extra checks for when no filetype has been detected now.  Mostly used for
+" patterns that end in "*".  E.g., "zsh*" matches "zsh.vim", but that's a Vim
+" script file.
+" Most of these should call s:StarSetf() to avoid names ending in .gz and the
+" like are used.
+
+" More Apache style config files
+au BufNewFile,BufRead */etc/proftpd/*.conf*,*/etc/proftpd/conf.*/*	call s:StarSetf('apachestyle')
+au BufNewFile,BufRead proftpd.conf*					call s:StarSetf('apachestyle')
+
+" More Apache config files
+au BufNewFile,BufRead access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*	call s:StarSetf('apache')
+au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.d/*.conf*		call s:StarSetf('apache')
+
+" Asterisk config file
+au BufNewFile,BufRead *asterisk/*.conf*		call s:StarSetf('asterisk')
+au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
+
+" Bazaar version control
+au BufNewFile,BufRead bzr_log.*			setf bzr
+
+" Bazel build file
+if !has("fname_case")
+  au BufNewFile,BufRead *.BUILD,BUILD			setf bzl
+endif
+
+" BIND zone
+au BufNewFile,BufRead */named/db.*,*/bind/db.*	call s:StarSetf('bindzone')
+
+" Calendar
+au BufNewFile,BufRead */.calendar/*,
+	\*/share/calendar/*/calendar.*,*/share/calendar/calendar.*
+	\					call s:StarSetf('calendar')
+
+" Changelog
+au BufNewFile,BufRead [cC]hange[lL]og*
+	\ if getline(1) =~ '; urgency='
+	\|  call s:StarSetf('debchangelog')
+	\|else
+	\|  call s:StarSetf('changelog')
+	\|endif
+
+" Crontab
+au BufNewFile,BufRead crontab,crontab.*,*/etc/cron.d/*		call s:StarSetf('crontab')
+
+" dnsmasq(8) configuration
+au BufNewFile,BufRead */etc/dnsmasq.d/*		call s:StarSetf('dnsmasq')
+
+" Dracula
+au BufNewFile,BufRead drac.*			call s:StarSetf('dracula')
+
+" Fvwm
+au BufNewFile,BufRead */.fvwm/*			call s:StarSetf('fvwm')
+au BufNewFile,BufRead *fvwmrc*,*fvwm95*.hook
+	\ let b:fvwm_version = 1 | call s:StarSetf('fvwm')
+au BufNewFile,BufRead *fvwm2rc*
+	\ if expand("<afile>:e") == "m4"
+	\|  call s:StarSetf('fvwm2m4')
+	\|else
+	\|  let b:fvwm_version = 2 | call s:StarSetf('fvwm')
+	\|endif
+
+" Gedcom
+au BufNewFile,BufRead */tmp/lltmp*		call s:StarSetf('gedcom')
+
+" Git
+au BufNewFile,BufRead */.gitconfig.d/*,/etc/gitconfig.d/*	call s:StarSetf('gitconfig')
+
+" Gitolite
+au BufNewFile,BufRead */gitolite-admin/conf/*	call s:StarSetf('gitolite')
+
+" GTK RC
+au BufNewFile,BufRead .gtkrc*,gtkrc*		call s:StarSetf('gtkrc')
+
+" Jam
+au BufNewFile,BufRead Prl*.*,JAM*.*		call s:StarSetf('jam')
+
+" Jargon
+au! BufNewFile,BufRead *jarg*
+	\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'THIS IS THE JARGON FILE'
+	\|  call s:StarSetf('jargon')
+	\|endif
+
+" Java Properties resource file (note: doesn't catch font.properties.pl)
+au BufNewFile,BufRead *.properties_??_??_*	call s:StarSetf('jproperties')
+
+" Kconfig
+au BufNewFile,BufRead Kconfig.*			call s:StarSetf('kconfig')
+
+" Lilo: Linux loader
+au BufNewFile,BufRead lilo.conf*		call s:StarSetf('lilo')
+
+" Logcheck
+au BufNewFile,BufRead */etc/logcheck/*.d*/*	call s:StarSetf('logcheck')
+
+" Makefile
+au BufNewFile,BufRead [mM]akefile*		call s:StarSetf('make')
+
+" Ruby Makefile
+au BufNewFile,BufRead [rR]akefile*		call s:StarSetf('ruby')
+
+" Mail (also matches muttrc.vim, so this is below the other checks)
+au BufNewFile,BufRead {neo,}mutt[[:alnum:]._-]\\\{6\}	setf mail
+
+au BufNewFile,BufRead reportbug-*		call s:StarSetf('mail')
+
+" Modconf
+au BufNewFile,BufRead */etc/modutils/*
+	\ if executable(expand("<afile>")) != 1
+	\|  call s:StarSetf('modconf')
+	\|endif
+au BufNewFile,BufRead */etc/modprobe.*		call s:StarSetf('modconf')
+
+" Mutt setup file
+au BufNewFile,BufRead .mutt{ng,}rc*,*/.mutt{ng,}/mutt{ng,}rc*	call s:StarSetf('muttrc')
+au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc*		call s:StarSetf('muttrc')
+
+" Neomutt setup file
+au BufNewFile,BufRead .neomuttrc*,*/.neomutt/neomuttrc*	call s:StarSetf('neomuttrc')
+au BufNewFile,BufRead neomuttrc*,Neomuttrc*		call s:StarSetf('neomuttrc')
+
+" Nroff macros
+au BufNewFile,BufRead tmac.*			call s:StarSetf('nroff')
+
+" OpenBSD hostname.if
+au BufNewFile,BufRead /etc/hostname.*		call s:StarSetf('config')
+
+" Pam conf
+au BufNewFile,BufRead */etc/pam.d/*		call s:StarSetf('pamconf')
+
+" Printcap and Termcap
+au BufNewFile,BufRead *printcap*
+	\ if !did_filetype()
+	\|  let b:ptcap_type = "print" | call s:StarSetf('ptcap')
+	\|endif
+au BufNewFile,BufRead *termcap*
+	\ if !did_filetype()
+	\|  let b:ptcap_type = "term" | call s:StarSetf('ptcap')
+	\|endif
+
+" ReDIF
+" Only used when the .rdf file was not detected to be XML.
+au BufRead,BufNewFile *.rdf			call dist#ft#Redif()
+
+" Remind
+au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
+
+" SGML catalog file
+au BufNewFile,BufRead sgml.catalog*		call s:StarSetf('catalog')
+
+" Shell scripts ending in a star
+au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,,PKGBUILD* call dist#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .kshrc* call dist#ft#SetFileTypeSH("ksh")
+au BufNewFile,BufRead .profile* call dist#ft#SetFileTypeSH(getline(1))
+
+" tcsh scripts ending in a star
+au BufNewFile,BufRead .tcshrc*	call dist#ft#SetFileTypeShell("tcsh")
+
+" csh scripts ending in a star
+au BufNewFile,BufRead .login*,.cshrc*  call dist#ft#CSH()
+
+" VHDL
+au BufNewFile,BufRead *.vhdl_[0-9]*		call s:StarSetf('vhdl')
+
+" Vim script
+au BufNewFile,BufRead *vimrc*			call s:StarSetf('vim')
+
+" Subversion commit file
+au BufNewFile,BufRead svn-commit*.tmp		setf svn
+
+" X resources file
+au BufNewFile,BufRead Xresources*,*/app-defaults/*,*/Xresources/* call s:StarSetf('xdefaults')
+
+" XFree86 config
+au BufNewFile,BufRead XF86Config-4*
+	\ let b:xf86conf_xfree86_version = 4 | call s:StarSetf('xf86conf')
+au BufNewFile,BufRead XF86Config*
+	\ if getline(1) =~ '\<XConfigurator\>'
+	\|  let b:xf86conf_xfree86_version = 3
+	\|endif
+	\|call s:StarSetf('xf86conf')
+
+" X11 xmodmap
+au BufNewFile,BufRead *xmodmap*			call s:StarSetf('xmodmap')
+
+" Xinetd conf
+au BufNewFile,BufRead */etc/xinetd.d/*		call s:StarSetf('xinetd')
+
+" yum conf (close enough to dosini)
+au BufNewFile,BufRead */etc/yum.repos.d/*	call s:StarSetf('dosini')
+
+" Z-Shell script ending in a star
+au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump*  call s:StarSetf('zsh')
+au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
+
+
+" Plain text files, needs to be far down to not override others.  This avoids
+" the "conf" type being used if there is a line starting with '#'.
+au BufNewFile,BufRead *.text,README		setf text
+
+" Help files match *.txt but should have a last line that is a modeline.
+au BufNewFile,BufRead *.txt
+	\  if getline('$') !~ 'vim:.*ft=help'
+	\|   setf text
+	\| endif
+
+
+" Use the filetype detect plugins.  They may overrule any of the previously
+" detected filetypes.
+
+
+" NOTE: The above command could have ended the filetypedetect autocmd group
+" and started another one. Let's make sure it has ended to get to a consistent
+" state.
+augroup END
+
+" Generic configuration file. Use FALLBACK, it's just guessing!
+
+
+
+" If the GUI is already running, may still need to install the Syntax menu.
+" Don't do it when the 'M' flag is included in 'guioptions'.
+if has("menu") && has("gui_running")
+      \ && !exists("did_install_syntax_menu") && &guioptions !~# "M"
+  source <sfile>:p:h/menu.vim
+endif
+
+" Function called for testing all functions defined here.  These are
+" script-local, thus need to be executed here.
+" Returns a string with error messages (hopefully empty).
+func! TestFiletypeFuncs(testlist)
+  let output = ''
+  for f in a:testlist
+    try
+      exe f
+    catch
+      let output = output . "\n" . f . ": " . v:exception
+    endtry
+  endfor
+  return output
+endfunc
+
+" Restore 'cpoptions'
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/filetype.vim b/filetype.vim
new file mode 100644
index 000000000..988d79ee2
--- /dev/null
+++ b/filetype.vim
@@ -0,0 +1 @@
+runtime! ftdetect/polyglot.vim
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 01a465bbf..7473464d2 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -3431,7 +3431,7 @@ augroup END
 " detected filetypes.
 if exists("did_load_filetypes") && exists("g:polyglot_disabled")
   unlet did_load_filetypes
-  runtime! $VIMRUNTIME/filetype.vim
+  runtime! extras/filetype.vim
 endif
 
 " Restore 'cpoptions'
diff --git a/indent/nim.vim b/indent/nim.vim
index 3eea2ed7f..7193a9fac 100644
--- a/indent/nim.vim
+++ b/indent/nim.vim
@@ -1,7 +1,7 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 
 " Only load this indent file when no other was loaded.
-if exists("b:did_indent")
+if exists('b:did_indent')
   finish
 endif
 let b:did_indent = 1
@@ -14,7 +14,7 @@ setlocal indentexpr=GetNimIndent(v:lnum)
 setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif
 
 " Only define the function once.
-if exists("*GetNimIndent")
+if exists('*GetNimIndent')
   finish
 endif
 
@@ -40,7 +40,7 @@ function! GetNimIndent(lnum)
   endif
 
   " If the start of the line is in a string don't change the indent.
-  if has('syntax_items') && synIDattr(synID(a:lnum, 1, 1), "name") =~ "String$"
+  if has('syntax_items') && synIDattr(synID(a:lnum, 1, 1), 'name') =~# 'String$'
     return -1
   endif
 
@@ -56,12 +56,12 @@ function! GetNimIndent(lnum)
     " If the last character in the line is a comment, do a binary search for
     " the start of the comment.  synID() is slow, a linear search would take
     " too long on a long line.
-    if synIDattr(synID(plnum, pline_len, 1), "name") =~ "Comment$"
+    if synIDattr(synID(plnum, pline_len, 1), 'name') =~# 'Comment$'
       let min = 1
       let max = pline_len
       while min < max
         let col = (min + max) / 2
-        if synIDattr(synID(plnum, col, 1), "name") =~ "Comment$"
+        if synIDattr(synID(plnum, col, 1), 'name') =~# 'Comment$'
           let max = col
         else
           let min = col + 1
@@ -80,16 +80,16 @@ function! GetNimIndent(lnum)
     endwhile
   endif
 
-  if cline =~ '^\s*\(if\|when\|for\|while\|case\|of\|try\)\>'
+  if cline =~# '^\s*\(if\|when\|for\|while\|case\|of\|try\)\>'
     " This is a benign line, do nothing
     return -1
   endif
 
   " If the current line begins with a keyword that lines up with "try"
-  if cline =~ '^\s*\(except\|finally\)\>'
+  if cline =~# '^\s*\(except\|finally\)\>'
     let lnum = a:lnum - 1
     while lnum >= 1
-      if getline(lnum) =~ '^\s*\(try\|except\)\>'
+      if getline(lnum) =~# '^\s*\(try\|except\)\>'
         let ind = indent(lnum)
         if ind >= clindent
           return -1     " indent is already less than this
@@ -102,31 +102,31 @@ function! GetNimIndent(lnum)
   endif
 
   " If the current line begins with a header keyword, dedent
-  if cline =~ '^\s*\(elif\|else\)\>'
+  if cline =~# '^\s*\(elif\|else\)\>'
     return s:FindStartLine(a:lnum, '^\s*\(if\|when\|elif\|of\)')
   endif
 
-  if pline =~ ':\s*$'
+  if pline =~# ':\s*$'
     "return s:FindStartLine(plnum, '(^\s*\(if\|when\|else\|elif\|case\|of\|try\|except\|finally\)\>)\|\<do\>') + &sw
     return s:FindStartLine(plnum, '^\s*\(if\|when\|else\|elif\|for\|while\|case\|of\|try\|except\|finally\)\>') + &sw
   endif
 
-  if pline =~ '=\s*$'
+  if pline =~# '=\s*$'
     return s:FindStartLine(plnum, '^\s*\(proc\|template\|macro\|iterator\)\>') + &sw
   endif
 
   " if we got here, this should be the begging of a multi-line if expression for example
-  if pline =~ '^\s*\(if\|when\|proc\|iterator\|macro\|template\|for\|while\)[^:]*$'
+  if pline =~# '^\s*\(if\|when\|proc\|iterator\|macro\|template\|for\|while\)[^:]*$'
     return plindent + &sw
   endif
 
-  if pline =~ '\(type\|import\|const\|var\|let\)\s*$'
-    \ || pline =~ '=\s*\(object\|enum\|tuple\|concept\)'
+  if pline =~# '\(type\|import\|const\|var\|let\)\s*$'
+    \ || pline =~# '=\s*\(object\|enum\|tuple\|concept\)'
     return plindent + &sw
   endif
 
   " If the previous line was a stop-execution statement...
-  if pline =~ '^\s*\(break\|continue\|raise\|return\)\>'
+  if pline =~# '^\s*\(break\|continue\|raise\|return\)\>'
     " See if the user has already dedented
     if indent(a:lnum) > plindent - &sw
       " If not, recommend one dedent
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index 7cfa1069f..27e12b77e 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -1,3 +1,9 @@
-if !exists("did_load_polyglot")
+" Turn on filetype plugins (:help filetype-plugin).
+if has('autocmd') && !(exists("did_load_filetypes") && exists("did_indent_on"))
   filetype plugin indent on
 endif
+
+" Enable syntax highlighting.
+if has('syntax') && !exists('g:syntax_on')
+  syntax enable
+endif
diff --git a/scripts/build b/scripts/build
index 1d5620b51..9e305b21c 100755
--- a/scripts/build
+++ b/scripts/build
@@ -257,9 +257,8 @@ def parse_remote(remote)
   [match[:repo], match[:branch] || "master", match[:path], dir]
 end
 
-def copy_file(package, src, dest)
+def copy_file(name, src, dest)
   FileUtils.mkdir_p(File.dirname(dest))
-  name = package.fetch("name")
 
   if dest.end_with?(".vim")
     header = '" Polyglot metafile'
@@ -509,11 +508,11 @@ def extract(packages)
         globs.each do |glob|
           Dir.glob("#{subdir}/#{glob}", base: subtree).each do |p|
             next unless File.file?("#{subtree}#{p}")
-            copy_file(package, "#{subtree}#{p}", p)
+            copy_file(package["name"], "#{subtree}#{p}", p)
           end
         end
       elsif File.exist?(subpath)
-        copy_file(package, subpath, subdir)
+        copy_file(package["name"], subpath, subdir)
       end
     end
 
@@ -889,6 +888,19 @@ def show_warnings(all_filetypes, expected_filetypes)
   end
 end
 
+def generate_fallback
+  filetype_content = File.read('tmp/vim/vim/runtime/filetype.vim') 
+  filetype_content.gsub!('runtime! ftdetect/*.vim', '')
+  filetype_content.gsub!(/^au BufNewFile,BufRead \*\n.+?runtime!.+?endif/m) {}
+  filetype_content.gsub!(/^au StdinReadPost \* .+?runtime!.+?endif/m) {}
+  filetype_content.gsub!(/^au filetypedetect BufNewFile,BufRead,StdinReadPost \*\n.+?endif/m) {}
+  File.write('extras/filetype.vim', filetype_content)
+
+  autoload_content = File.read('tmp/vim/vim/runtime/autoload/dist/ft.vim') 
+  autoload_content.gsub!('dist#ft#', 'polyglot#ft#')
+  File.write('autoload/polyglot/ft.vim', autoload_content)
+end
+
 
 if __FILE__ == $0
   if !ENV["DEV"]
@@ -900,6 +912,7 @@ if __FILE__ == $0
   packages, heuristics = load_data()
   download(packages)
   extract(packages)
+  generate_fallback()
   generate_ftdetect(packages, heuristics)
   generate_plugins(packages)
   generate_tests(packages)
diff --git a/syntax/nim.vim b/syntax/nim.vim
index 37f8d9fac..e13170561 100644
--- a/syntax/nim.vim
+++ b/syntax/nim.vim
@@ -2,30 +2,30 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
-if version < 600
+if v:version < 600
   syntax clear
-elseif exists("b:current_syntax")
+elseif exists('b:current_syntax')
   finish
 endif
 
 " Keep user-supplied options
-if !exists("nim_highlight_numbers")
+if !exists('nim_highlight_numbers')
   let nim_highlight_numbers = 1
 endif
-if !exists("nim_highlight_builtins")
+if !exists('nim_highlight_builtins')
   let nim_highlight_builtins = 1
 endif
-if !exists("nim_highlight_exceptions")
+if !exists('nim_highlight_exceptions')
   let nim_highlight_exceptions = 1
 endif
-if !exists("nim_highlight_space_errors")
+if !exists('nim_highlight_space_errors')
   let nim_highlight_space_errors = 1
 endif
-if !exists("nim_highlight_special_vars")
+if !exists('nim_highlight_special_vars')
   let nim_highlight_special_vars = 1
 endif
 
-if exists("nim_highlight_all")
+if exists('nim_highlight_all')
   let nim_highlight_numbers      = 1
   let nim_highlight_builtins     = 1
   let nim_highlight_exceptions   = 1
@@ -158,8 +158,8 @@ syn sync match nimSync grouphere NONE "):$"
 syn sync maxlines=200
 syn sync minlines=2000
 
-if version >= 508 || !exists("did_nim_syn_inits")
-  if version <= 508
+if v:version >= 508 || !exists('did_nim_syn_inits')
+  if v:version <= 508
     let did_nim_syn_inits = 1
     command -nargs=+ HiLink hi link <args>
   else
@@ -202,7 +202,7 @@ if version >= 508 || !exists("did_nim_syn_inits")
   delcommand HiLink
 endif
 
-let b:current_syntax = "nim"
+let b:current_syntax = 'nim'
 
 
 endif

From 1fc249bafdc7937b97a62107302925e8f7062b3f Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 17 Oct 2020 21:23:12 +0200
Subject: [PATCH 140/299] Set nocompatible mode instead of checking it

---
 ftdetect/polyglot.vim | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 7473464d2..72fed6231 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -3,22 +3,16 @@
 " Maintainer:	Adam Stankiewicz <sheerun@sher.pl>
 " URL: https://github.com/sheerun/vim-polyglot
 
-" We are not supporting non-compatible mode
-if &compatible
-  finish
-endif
-
 " Listen very carefully, I will say this only once
 if exists("did_load_polyglot")
   finish
 endif
 
-" Line continuation is used here, remove 'C' from 'cpoptions'
-let s:cpo_save = &cpo
-set cpo&vim
-
 let did_load_polyglot = 1
 
+" We are not supporting non-compatible mode
+set nocompatible
+
 " It can happen vim filetype.vim loads first, then we need a reset
 if exists("did_load_filetypes")
   au! filetypedetect
@@ -3433,7 +3427,3 @@ if exists("did_load_filetypes") && exists("g:polyglot_disabled")
   unlet did_load_filetypes
   runtime! extras/filetype.vim
 endif
-
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save

From c9f2aa9ae03cb5a0faa4101642b482dad67500ed Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 18 Oct 2020 12:24:33 +0200
Subject: [PATCH 141/299] Leave only filetype detection for man, #576

---
 after/syntax/c.vim     |  17 ++-
 autoload/go/config.vim |  11 +-
 doc/vim-go.txt         |  27 +++--
 ftplugin/man.vim       | 254 -----------------------------------------
 packages.yaml          |   2 -
 syntax/man.vim         |  60 ----------
 6 files changed, 40 insertions(+), 331 deletions(-)
 delete mode 100644 ftplugin/man.vim
 delete mode 100644 syntax/man.vim

diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index 1f2821d7a..c533862c6 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -7,7 +7,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') ==
 "                  http://www.vim.org/scripts/script.php?script_id=3064
 " Maintainer:      bfrg <bfrg@users.noreply.github.com>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Oct 4, 2020
+" Last Change:     Oct 17, 2020
 "
 " Extended C syntax highlighting including highlighting of user-defined
 " functions.
@@ -28,6 +28,21 @@ if !get(g:, 'cpp_no_function_highlight', 0)
 endif
 
 
+" Highlight struct/class member variables
+if get(g:, 'cpp_member_highlight', 0)
+    syn match cMemberAccess "\.\|->" nextgroup=cStructMember,cppTemplateKeyword
+    syn match cStructMember "\<\h\w*\>\%((\|<\)\@!" contained
+    syn cluster cParenGroup add=cStructMember
+    syn cluster cPreProcGroup add=cStructMember
+    hi def link cStructMember Identifier
+
+    if &filetype ==# 'cpp'
+        syn keyword cppTemplateKeyword template
+        hi def link cppTemplateKeyword cppStructure
+    endif
+endif
+
+
 " Common ANSI-standard Names
 syn keyword cAnsiName
         \ PRId8 PRIi16 PRIo32 PRIu64 PRId16 PRIi32 PRIo64 PRIuLEAST8 PRId32 PRIi64 PRIoLEAST8 PRIuLEAST16 PRId64 PRIiLEAST8 PRIoLEAST16 PRIuLEAST32 PRIdLEAST8 PRIiLEAST16 PRIoLEAST32 PRIuLEAST64 PRIdLEAST16 PRIiLEAST32 PRIoLEAST64 PRIuFAST8 PRIdLEAST32 PRIiLEAST64 PRIoFAST8 PRIuFAST16 PRIdLEAST64 PRIiFAST8 PRIoFAST16 PRIuFAST32 PRIdFAST8 PRIiFAST16 PRIoFAST32 PRIuFAST64 PRIdFAST16 PRIiFAST32 PRIoFAST64 PRIuMAX PRIdFAST32 PRIiFAST64 PRIoMAX PRIuPTR PRIdFAST64 PRIiMAX PRIoPTR PRIx8 PRIdMAX PRIiPTR PRIu8 PRIx16 PRIdPTR PRIo8 PRIu16 PRIx32 PRIi8 PRIo16 PRIu32 PRIx64 PRIxLEAST8 SCNd8 SCNiFAST32 SCNuLEAST32 PRIxLEAST16 SCNd16 SCNiFAST64 SCNuLEAST64 PRIxLEAST32 SCNd32 SCNiMAX SCNuFAST8 PRIxLEAST64 SCNd64 SCNiPTR SCNuFAST16 PRIxFAST8 SCNdLEAST8 SCNo8 SCNuFAST32 PRIxFAST16 SCNdLEAST16 SCNo16 SCNuFAST64 PRIxFAST32 SCNdLEAST32 SCNo32 SCNuMAX PRIxFAST64 SCNdLEAST64 SCNo64 SCNuPTR PRIxMAX SCNdFAST8 SCNoLEAST8 SCNx8 PRIxPTR SCNdFAST16 SCNoLEAST16 SCNx16 PRIX8 SCNdFAST32 SCNoLEAST32 SCNx32 PRIX16 SCNdFAST64 SCNoLEAST64 SCNx64 PRIX32 SCNdMAX SCNoFAST8 SCNxLEAST8 PRIX64 SCNdPTR SCNoFAST16 SCNxLEAST16 PRIXLEAST8 SCNi8 SCNoFAST32 SCNxLEAST32 PRIXLEAST16 SCNi16 SCNoFAST64 SCNxLEAST64 PRIXLEAST32 SCNi32 SCNoMAX SCNxFAST8 PRIXLEAST64 SCNi64 SCNoPTR SCNxFAST16 PRIXFAST8 SCNiLEAST8 SCNu8 SCNxFAST32 PRIXFAST16 SCNiLEAST16 SCNu16 SCNxFAST64 PRIXFAST32 SCNiLEAST32 SCNu32 SCNxMAX PRIXFAST64 SCNiLEAST64 SCNu64 SCNxPTR PRIXMAX SCNiFAST8 SCNuLEAST8 PRIXPTR SCNiFAST16 SCNuLEAST16 STDC CX_LIMITED_RANGE STDC FENV_ACCESS STDC FP_CONTRACT
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index 8af1e675b..54f94f019 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -574,12 +574,19 @@ function! go#config#GoplsEnabled() abort
   return get(g:, 'go_gopls_enabled', 1)
 endfunction
 
+" TODO(bc): remove support for g:go_diagnostics_enabled;
+" g:go_diagnostics_level is the replacement.
 function! go#config#DiagnosticsEnabled() abort
   return get(g:, 'go_diagnostics_enabled', 0)
 endfunction
 
-function! go#config#DiagnosticsIgnoreWarnings() abort
-  return get(g:, 'go_diagnostics_ignore_warnings', 0)
+function! go#config#DiagnosticsLevel() abort
+  let l:default = 2
+  if has_key(g:, 'go_diagnostics_enabled') && !g:go_diagnostics_enabled
+    let l:default = 0
+  endif
+
+  return get(g:, 'go_diagnostics_level', l:default)
 endfunction
 
 function! go#config#GoplsOptions() abort
diff --git a/doc/vim-go.txt b/doc/vim-go.txt
index 26639768f..18306a0f5 100644
--- a/doc/vim-go.txt
+++ b/doc/vim-go.txt
@@ -1902,8 +1902,12 @@ When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 
                                                          *'g:go_gopls_local'*
 
-Specifies the prefix for imports that `gopls` should consider group
-separately.
+Specifies the prefix for imports that `gopls` should group separately.
+
+The value can either be a string or a dictionary. When it is a string, all
+workspaces will use the same value. When it is a dictionary, the key should be
+the absolute path of the workspace and the value is the prefix to use for
+local imports within that workspace.
 
 When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
@@ -1933,21 +1937,20 @@ default it is `v:null`.
 <
                                                  *'g:go_diagnostics_enabled'*
 
-Specifies whether `gopls` diagnostics are enabled. Only the diagnostics for
-the current buffer will be processed when it is not set; all others will be
-ignored.
-
-By default it is disabled.
+Deprecated. See `'g:go_diagnostics_level'`. Specifies whether `gopls`
+diagnostics are enabled. Only the diagnostics for the current buffer will be
+processed when it is not set; all others will be ignored. By default it is
+disabled.
 >
   let g:go_diagnostics_enabled = 0
 <
-                                        *'g:go_diagnostics_ignore_warnings'*
-
-Specifies whether warnings from  `gopls` diagnostics are ignored.
+                                                  *'g:go_diagnostics_level'*
 
-By default it is disabled.
+Specifies the `gopls` diagnostics level. Valid values are 0, 1, and 2. 0
+ignores `gopls` diagnostics, 1 is for errors only, and 2 is for errors and
+warnings. By default it is 2.
 >
-  let g:go_diagnostics_ignore_warnings = 0
+  let g:go_diagnostics_level = 2
 <
 
                                                   *'g:go_template_autocreate'*
diff --git a/ftplugin/man.vim b/ftplugin/man.vim
deleted file mode 100644
index 300129c2a..000000000
--- a/ftplugin/man.vim
+++ /dev/null
@@ -1,254 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'man') == -1
-
-" Vim filetype plugin file
-" Language:	man
-" Maintainer:	Jason Franklin <vim@justemail.net>
-" Maintainer:	SungHyun Nam <goweol@gmail.com>
-" Last Change: 	2020 Jun 01
-
-" To make the ":Man" command available before editing a manual page, source
-" this script from your startup vimrc file.
-
-" If 'filetype' isn't "man", we must have been called to only define ":Man".
-if &filetype == "man"
-
-  " Only do this when not done yet for this buffer
-  if exists("b:did_ftplugin")
-    finish
-  endif
-  let b:did_ftplugin = 1
-endif
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-if &filetype == "man"
-  " allow dot and dash in manual page name.
-  setlocal iskeyword+=\.,-
-  let b:undo_ftplugin = "setlocal iskeyword<"
-
-  " Add mappings, unless the user didn't want this.
-  if !exists("no_plugin_maps") && !exists("no_man_maps")
-    if !hasmapto('<Plug>ManBS')
-      nmap <buffer> <LocalLeader>h <Plug>ManBS
-      let b:undo_ftplugin = b:undo_ftplugin
-	    \ . '|silent! nunmap <buffer> <LocalLeader>h'
-    endif
-    nnoremap <buffer> <Plug>ManBS :%s/.\b//g<CR>:setl nomod<CR>''
-
-    nnoremap <buffer> <silent> <c-]> :call <SID>PreGetPage(v:count)<CR>
-    nnoremap <buffer> <silent> <c-t> :call <SID>PopPage()<CR>
-    nnoremap <buffer> <silent> q :q<CR>
-
-    " Add undo commands for the maps
-    let b:undo_ftplugin = b:undo_ftplugin
-	  \ . '|silent! nunmap <buffer> <Plug>ManBS'
-	  \ . '|silent! nunmap <buffer> <c-]>'
-	  \ . '|silent! nunmap <buffer> <c-t>'
-	  \ . '|silent! nunmap <buffer> q'
-  endif
-
-  if exists('g:ft_man_folding_enable') && (g:ft_man_folding_enable == 1)
-    setlocal foldmethod=indent foldnestmax=1 foldenable
-    let b:undo_ftplugin = b:undo_ftplugin
-	  \ . '|silent! setl fdm< fdn< fen<'
-  endif
-
-endif
-
-if exists(":Man") != 2
-  com -nargs=+ -complete=shellcmd Man call s:GetPage(<q-mods>, <f-args>)
-  nmap <Leader>K :call <SID>PreGetPage(0)<CR>
-  nmap <Plug>ManPreGetPage :call <SID>PreGetPage(0)<CR>
-endif
-
-" Define functions only once.
-if !exists("s:man_tag_depth")
-
-let s:man_tag_depth = 0
-
-let s:man_sect_arg = ""
-let s:man_find_arg = "-w"
-try
-  if !has("win32") && $OSTYPE !~ 'cygwin\|linux' && system('uname -s') =~ "SunOS" && system('uname -r') =~ "^5"
-    let s:man_sect_arg = "-s"
-    let s:man_find_arg = "-l"
-  endif
-catch /E145:/
-  " Ignore the error in restricted mode
-endtry
-
-func <SID>PreGetPage(cnt)
-  if a:cnt == 0
-    let old_isk = &iskeyword
-    if &ft == 'man'
-      setl iskeyword+=(,)
-    endif
-    let str = expand("<cword>")
-    let &l:iskeyword = old_isk
-    let page = substitute(str, '(*\(\k\+\).*', '\1', '')
-    let sect = substitute(str, '\(\k\+\)(\([^()]*\)).*', '\2', '')
-    if match(sect, '^[0-9 ]\+$') == -1
-      let sect = ""
-    endif
-    if sect == page
-      let sect = ""
-    endif
-  else
-    let sect = a:cnt
-    let page = expand("<cword>")
-  endif
-  call s:GetPage('', sect, page)
-endfunc
-
-func <SID>GetCmdArg(sect, page)
-  if a:sect == ''
-    return a:page
-  endif
-  return s:man_sect_arg.' '.a:sect.' '.a:page
-endfunc
-
-func <SID>FindPage(sect, page)
-  let where = system("man ".s:man_find_arg.' '.s:GetCmdArg(a:sect, a:page))
-  if where !~ "^/"
-    if matchstr(where, " [^ ]*$") !~ "^ /"
-      return 0
-    endif
-  endif
-  return 1
-endfunc
-
-func <SID>GetPage(cmdmods, ...)
-  if a:0 >= 2
-    let sect = a:1
-    let page = a:2
-  elseif a:0 >= 1
-    let sect = ""
-    let page = a:1
-  else
-    return
-  endif
-
-  " To support:	    nmap K :Man <cword>
-  if page == '<cword>'
-    let page = expand('<cword>')
-  endif
-
-  if !exists('g:ft_man_no_sect_fallback') || (g:ft_man_no_sect_fallback == 0)
-    if sect != "" && s:FindPage(sect, page) == 0
-      let sect = ""
-    endif
-  endif
-  if s:FindPage(sect, page) == 0
-    let msg = 'man.vim: no manual entry for "' . page . '"'
-    if !empty(sect)
-      let msg .= ' in section ' . sect
-    endif
-    echomsg msg
-    return
-  endif
-  exec "let s:man_tag_buf_".s:man_tag_depth." = ".bufnr("%")
-  exec "let s:man_tag_lin_".s:man_tag_depth." = ".line(".")
-  exec "let s:man_tag_col_".s:man_tag_depth." = ".col(".")
-  let s:man_tag_depth = s:man_tag_depth + 1
-
-  let open_cmd = 'edit'
-
-  " Use an existing "man" window if it exists, otherwise open a new one.
-  if &filetype != "man"
-    let thiswin = winnr()
-    exe "norm! \<C-W>b"
-    if winnr() > 1
-      exe "norm! " . thiswin . "\<C-W>w"
-      while 1
-	if &filetype == "man"
-	  break
-	endif
-	exe "norm! \<C-W>w"
-	if thiswin == winnr()
-	  break
-	endif
-      endwhile
-    endif
-    if &filetype != "man"
-      if exists("g:ft_man_open_mode")
-        if g:ft_man_open_mode == 'vert'
-	  let open_cmd = 'vsplit'
-        elseif g:ft_man_open_mode == 'tab'
-	  let open_cmd = 'tabedit'
-        else
-	  let open_cmd = 'split'
-        endif
-      else
-	let open_cmd = a:cmdmods . ' split'
-      endif
-    endif
-  endif
-
-  silent execute open_cmd . " $HOME/" . page . '.' . sect . '~'
-
-  " Avoid warning for editing the dummy file twice
-  setl buftype=nofile noswapfile
-
-  setl fdc=0 ma nofen nonu nornu
-  %delete _
-  let unsetwidth = 0
-  if empty($MANWIDTH)
-    let $MANWIDTH = winwidth(0)
-    let unsetwidth = 1
-  endif
-
-  " Ensure Vim is not recursively invoked (man-db does this) when doing ctrl-[
-  " on a man page reference by unsetting MANPAGER.
-  " Some versions of env(1) do not support the '-u' option, and in such case
-  " we set MANPAGER=cat.
-  if !exists('s:env_has_u')
-    call system('env -u x true')
-    let s:env_has_u = (v:shell_error == 0)
-  endif
-  let env_cmd = s:env_has_u ? 'env -u MANPAGER' : 'env MANPAGER=cat'
-  let env_cmd .= ' GROFF_NO_SGR=1'
-  let man_cmd = env_cmd . ' man ' . s:GetCmdArg(sect, page) . ' | col -b'
-  silent exec "r !" . man_cmd
-
-  if unsetwidth
-    let $MANWIDTH = ''
-  endif
-  " Remove blank lines from top and bottom.
-  while line('$') > 1 && getline(1) =~ '^\s*$'
-    1delete _
-  endwhile
-  while line('$') > 1 && getline('$') =~ '^\s*$'
-    $delete _
-  endwhile
-  1
-  setl ft=man nomod
-  setl bufhidden=hide
-  setl nobuflisted
-  setl noma
-endfunc
-
-func <SID>PopPage()
-  if s:man_tag_depth > 0
-    let s:man_tag_depth = s:man_tag_depth - 1
-    exec "let s:man_tag_buf=s:man_tag_buf_".s:man_tag_depth
-    exec "let s:man_tag_lin=s:man_tag_lin_".s:man_tag_depth
-    exec "let s:man_tag_col=s:man_tag_col_".s:man_tag_depth
-    exec s:man_tag_buf."b"
-    exec s:man_tag_lin
-    exec "norm! ".s:man_tag_col."|"
-    exec "unlet s:man_tag_buf_".s:man_tag_depth
-    exec "unlet s:man_tag_lin_".s:man_tag_depth
-    exec "unlet s:man_tag_col_".s:man_tag_depth
-    unlet s:man_tag_buf s:man_tag_lin s:man_tag_col
-  endif
-endfunc
-
-endif
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: set sw=2 ts=8 noet:
-
-endif
diff --git a/packages.yaml b/packages.yaml
index fc6a702db..ad1f68585 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5509,8 +5509,6 @@ filetypes:
   - pattern: "XF86Config-4*,XF86Config*,*/xorg.conf.d/*.conf,xorg.conf,xorg.conf-4"
 ---
 name: man
-remote: vim/vim:runtime
-glob: "**/man.vim"
 filetypes:
 - name: man
   linguist: Roff Manpage
diff --git a/syntax/man.vim b/syntax/man.vim
deleted file mode 100644
index c607f0e43..000000000
--- a/syntax/man.vim
+++ /dev/null
@@ -1,60 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'man') == -1
-
-" Vim syntax file
-" Language:	Man page
-" Maintainer:	Jason Franklin <vim@justemail.net>
-" Previous Maintainer:	SungHyun Nam <goweol@gmail.com>
-" Previous Maintainer:	Gautam H. Mudunuri <gmudunur@informatica.com>
-" Version Info:
-" Last Change:	2020 Sep 19
-
-" Additional highlighting by Johannes Tanzler <johannes.tanzler@aon.at>:
-"	* manSubHeading
-"	* manSynopsis (only for sections 2 and 3)
-
-" quit when a syntax file was already loaded
-if exists("b:current_syntax")
-  finish
-endif
-
-" Get the CTRL-H syntax to handle backspaced text
-runtime! syntax/ctrlh.vim
-
-syn case ignore
-
-syn match  manReference       "\f\+([1-9][a-z]\=)"
-syn match  manSectionHeading  "^\a.*$"
-syn match  manSubHeading      "^\s\{3\}\a.*$"
-syn match  manOptionDesc      "^\s*[+-][a-z0-9]\S*"
-syn match  manLongOptionDesc  "^\s*--[a-z0-9-]\S*"
-" syn match  manHistory		"^[a-z].*last change.*$"
-
-syn match manHeader '\%1l.*'
-exe 'syn match manFooter ''\%' . line('$') . 'l.*'''
-
-if getline(1) =~ '^[a-zA-Z_]\+([23])'
-  syntax include @cCode <sfile>:p:h/c.vim
-  syn match manCFuncDefinition  display "\<\h\w*\>\s*("me=e-1 contained
-  syn region manSynopsis start="^SYNOPSIS"hs=s+8 end="^\u\+\s*$"me=e-12 keepend contains=manSectionHeading,@cCode,manCFuncDefinition
-endif
-
-
-" Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-
-hi def link manHeader Title
-hi def link manFooter PreProc
-
-hi def link manSectionHeading  Statement
-hi def link manOptionDesc	    Constant
-hi def link manLongOptionDesc  Constant
-hi def link manReference	    PreProc
-hi def link manSubHeading      Function
-hi def link manCFuncDefinition Function
-
-
-let b:current_syntax = "man"
-
-" vim:ts=8 sts=2 sw=2:
-
-endif

From 8a790ac7bfc5b49d8ea43c625bb691cfa8a0ab0b Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 18 Oct 2020 12:27:11 +0200
Subject: [PATCH 142/299] Leave only filetype detect for context, closes #575

---
 autoload/context.vim | 188 -------------------------------------------
 compiler/context.vim |  58 -------------
 ftplugin/context.vim | 106 ------------------------
 indent/context.vim   |  40 ---------
 packages.yaml        |   2 -
 syntax/context.vim   | 145 ---------------------------------
 6 files changed, 539 deletions(-)
 delete mode 100644 autoload/context.vim
 delete mode 100644 compiler/context.vim
 delete mode 100644 ftplugin/context.vim
 delete mode 100644 indent/context.vim
 delete mode 100644 syntax/context.vim

diff --git a/autoload/context.vim b/autoload/context.vim
deleted file mode 100644
index 437864639..000000000
--- a/autoload/context.vim
+++ /dev/null
@@ -1,188 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
-
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Latest Revision:    2016 Oct 21
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-" Helper functions {{{
-function! s:context_echo(message, mode)
-  redraw
-  echo "\r"
-  execute 'echohl' a:mode
-  echomsg '[ConTeXt]' a:message
-  echohl None
-endf
-
-function! s:sh()
-  return has('win32') || has('win64') || has('win16') || has('win95')
-        \ ? ['cmd.exe', '/C']
-        \ : ['/bin/sh', '-c']
-endfunction
-
-" For backward compatibility
-if exists('*win_getid')
-
-  function! s:win_getid()
-    return win_getid()
-  endf
-
-  function! s:win_id2win(winid)
-    return win_id2win(a:winid)
-  endf
-
-else
-
-  function! s:win_getid()
-    return winnr()
-  endf
-
-  function! s:win_id2win(winnr)
-    return a:winnr
-  endf
-
-endif
-" }}}
-
-" ConTeXt jobs {{{
-if has('job')
-
-  let g:context_jobs = []
-
-  " Print the status of ConTeXt jobs
-  function! context#job_status()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    let l:n = len(l:jobs)
-    call s:context_echo(
-          \ 'There '.(l:n == 1 ? 'is' : 'are').' '.(l:n == 0 ? 'no' : l:n)
-          \ .' job'.(l:n == 1 ? '' : 's').' running'
-          \ .(l:n == 0 ? '.' : ' (' . join(l:jobs, ', ').').'),
-          \ 'ModeMsg')
-  endfunction
-
-  " Stop all ConTeXt jobs
-  function! context#stop_jobs()
-    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
-    for job in l:jobs
-      call job_stop(job)
-    endfor
-    sleep 1
-    let l:tmp = []
-    for job in l:jobs
-      if job_status(job) == "run"
-        call add(l:tmp, job)
-      endif
-    endfor
-    let g:context_jobs = l:tmp
-    if empty(g:context_jobs)
-      call s:context_echo('Done. No jobs running.', 'ModeMsg')
-    else
-      call s:context_echo('There are still some jobs running. Please try again.', 'WarningMsg')
-    endif
-  endfunction
-
-  function! context#callback(path, job, status)
-    if index(g:context_jobs, a:job) != -1 && job_status(a:job) != 'run' " just in case
-      call remove(g:context_jobs, index(g:context_jobs, a:job))
-    endif
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! context#close_cb(channel)
-    call job_status(ch_getjob(a:channel)) " Trigger exit_cb's callback for faster feedback
-  endfunction
-
-  function! s:typeset(path)
-    call add(g:context_jobs,
-          \ job_start(add(s:sh(), context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))), {
-          \   'close_cb' : 'context#close_cb',
-          \   'exit_cb'  : function(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \                         [a:path]),
-          \   'in_io'    : 'null'
-          \ }))
-  endfunction
-
-else " No jobs
-
-  function! context#job_status()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction!
-
-  function! context#stop_jobs()
-    call s:context_echo('Not implemented', 'WarningMsg')
-  endfunction
-
-  function! context#callback(path, job, status)
-    call s:callback(a:path, a:job, a:status)
-  endfunction
-
-  function! s:typeset(path)
-    execute '!' . context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))
-    call call(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
-          \ [a:path, 0, v:shell_error])
-  endfunction
-
-endif " has('job')
-
-function! s:callback(path, job, status) abort
-  if a:status < 0 " Assume the job was terminated
-    return
-  endif
-  " Get info about the current window
-  let l:winid = s:win_getid()             " Save window id
-  let l:efm = &l:errorformat              " Save local errorformat
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  " Set errorformat to parse ConTeXt errors
-  execute 'setl efm=' . escape(b:context_errorformat, ' ')
-  try " Set cwd to expand error file correctly
-    execute 'lcd' fnameescape(fnamemodify(a:path, ':h'))
-  catch /.*/
-    execute 'setl efm=' . escape(l:efm, ' ')
-    throw v:exception
-  endtry
-  try
-    execute 'cgetfile' fnameescape(fnamemodify(a:path, ':r') . '.log')
-    botright cwindow
-  finally " Restore cwd and errorformat
-    execute s:win_id2win(l:winid) . 'wincmd w'
-    execute 'lcd ' . fnameescape(l:cwd)
-    execute 'setl efm=' . escape(l:efm, ' ')
-  endtry
-  if a:status == 0
-    call s:context_echo('Success!', 'ModeMsg')
-  else
-    call s:context_echo('There are errors. ', 'ErrorMsg')
-  endif
-endfunction
-
-function! context#command()
-  return get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode'
-        \ . ' --synctex=' . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-endfunction
-
-" Accepts an optional path (useful for big projects, when the file you are
-" editing is not the project's root document). If no argument is given, uses
-" the path of the current buffer.
-function! context#typeset(...) abort
-  let l:path = fnamemodify(strlen(a:000[0]) > 0 ? a:1 : expand("%"), ":p")
-  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
-  call s:context_echo('Typesetting...',  'ModeMsg')
-  execute 'lcd' fnameescape(fnamemodify(l:path, ":h"))
-  try
-    call s:typeset(l:path)
-  finally " Restore local working directory
-    execute 'lcd ' . fnameescape(l:cwd)
-  endtry
-endfunction!
-"}}}
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim: sw=2 fdm=marker
-
-endif
diff --git a/compiler/context.vim b/compiler/context.vim
deleted file mode 100644
index 9c05b4146..000000000
--- a/compiler/context.vim
+++ /dev/null
@@ -1,58 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
-
-" Vim compiler file
-" Compiler:     ConTeXt typesetting engine
-" Maintainer:   Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Last Change:  2016 Oct 21
-
-if exists("current_compiler")
-  finish
-endif
-let s:keepcpo= &cpo
-set cpo&vim
-
-if exists(":CompilerSet") != 2    " older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-" If makefile exists and we are not asked to ignore it, we use standard make
-" (do not redefine makeprg)
-if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
-      \ (!filereadable('Makefile') && !filereadable('makefile'))
-  let current_compiler = 'context'
-  " The following assumes that the current working directory is set to the
-  " directory of the file to be typeset
-  let &l:makeprg = get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
-        \ . ' --script context --autogenerate --nonstopmode --synctex='
-        \ . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
-        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
-        \ . ' ' . shellescape(expand('%:p:t'))
-else
-  let current_compiler = 'make'
-endif
-
-let b:context_errorformat = ''
-      \ . '%-Popen source%.%#> %f,'
-      \ . '%-Qclose source%.%#> %f,'
-      \ . "%-Popen source%.%#name '%f',"
-      \ . "%-Qclose source%.%#name '%f',"
-      \ . '%Etex %trror%.%#mp error on line %l in file %f:%.%#,'
-      \ . 'tex %trror%.%#error on line %l in file %f: %m,'
-      \ . '%Elua %trror%.%#error on line %l in file %f:,'
-      \ . '%+Emetapost %#> error: %#,'
-      \ . '! error: %#%m,'
-      \ . '%-C %#,'
-      \ . '%C! %m,'
-      \ . '%Z[ctxlua]%m,'
-      \ . '%+C<*> %.%#,'
-      \ . '%-C%.%#,'
-      \ . '%Z...%m,'
-      \ . '%-Zno-error,'
-      \ . '%-G%.%#' " Skip remaining lines
-
-execute 'CompilerSet errorformat=' . escape(b:context_errorformat, ' ')
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-endif
diff --git a/ftplugin/context.vim b/ftplugin/context.vim
deleted file mode 100644
index 2e68ecfc1..000000000
--- a/ftplugin/context.vim
+++ /dev/null
@@ -1,106 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
-
-" Vim filetype plugin file
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:    2016 Oct 30
-
-if exists("b:did_ftplugin")
-  finish
-endif
-let b:did_ftplugin = 1
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-if !exists('current_compiler')
-  compiler context
-endif
-
-let b:undo_ftplugin = "setl com< cms< def< inc< sua< fo< ofu<"
-      \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
-
-setlocal comments=b:%D,b:%C,b:%M,:% commentstring=%\ %s formatoptions+=tjcroql2
-if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
-  setlocal omnifunc=contextcomplete#Complete
-  let g:omni_syntax_group_include_context = 'mf\w\+,mp\w\+'
-  let g:omni_syntax_group_exclude_context = 'mfTodoComment'
-endif
-
-let &l:define='\\\%([egx]\|char\|mathchar\|count\|dimen\|muskip\|skip\|toks\)\='
-        \ .     'def\|\\font\|\\\%(future\)\=let'
-        \ . '\|\\new\%(count\|dimen\|skip\|muskip\|box\|toks\|read\|write'
-        \ .     '\|fam\|insert\|if\)'
-
-let &l:include = '^\s*\\\%(input\|component\|product\|project\|environment\)'
-
-setlocal suffixesadd=.tex
-
-if exists("loaded_matchit")
-  let b:match_ignorecase = 0
-  let b:match_skip = 'r:\\\@<!\%(\\\\\)*%'
-  let b:match_words = '(:),\[:],{:},\\(:\\),\\\[:\\],' .
-        \ '\\start\(\a\+\):\\stop\1'
-endif
-
-let s:context_regex = {
-      \ 'beginsection' : '\\\%(start\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
-      \ 'endsection'   : '\\\%(stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
-      \ 'beginblock'   : '\\\%(start\|setup\|define\)',
-      \ 'endblock'     : '\\\%(stop\|setup\|define\)'
-      \ }
-
-function! s:move_around(count, what, flags, visual)
-  if a:visual
-    exe "normal! gv"
-  endif
-  call search(s:context_regex[a:what], a:flags.'s') " 's' sets previous context mark
-  call map(range(2, a:count), 'search(s:context_regex[a:what], a:flags)')
-endfunction
-
-" Move around macros.
-nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
-vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
-nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
-vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
-nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
-vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
-nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
-vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
-nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
-vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
-nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
-vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
-
-" Other useful mappings
-if get(g:, 'context_mappings', 1)
-  let s:tp_regex = '?^$\|^\s*\\\(item\|start\|stop\|blank\|\%(sub\)*section\|chapter\|\%(sub\)*subject\|title\|part\)'
-
-  fun! s:tp()
-    call cursor(search(s:tp_regex, 'bcW') + 1, 1)
-    normal! V
-    call cursor(search(s:tp_regex, 'W') - 1, 1)
-  endf
-
-  " Reflow paragraphs with commands like gqtp ("gq TeX paragraph")
-  onoremap <silent><buffer> tp :<c-u>call <sid>tp()<cr>
-  " Select TeX paragraph
-  vnoremap <silent><buffer> tp <esc>:<c-u>call <sid>tp()<cr>
-
-  " $...$ text object
-  onoremap <silent><buffer> i$ :<c-u>normal! T$vt$<cr>
-  onoremap <silent><buffer> a$ :<c-u>normal! F$vf$<cr>
-  vnoremap <buffer> i$ T$ot$
-  vnoremap <buffer> a$ F$of$
-endif
-
-" Commands for asynchronous typesetting
-command! -buffer -nargs=? -complete=file ConTeXt          call context#typeset(<q-args>)
-command!         -nargs=0                ConTeXtJobStatus call context#job_status()
-command!         -nargs=0                ConTeXtStopJobs  call context#stop_jobs()
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-endif
diff --git a/indent/context.vim b/indent/context.vim
deleted file mode 100644
index 16ec08298..000000000
--- a/indent/context.vim
+++ /dev/null
@@ -1,40 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
-
-" ConTeXt indent file
-" Language: ConTeXt typesetting engine
-" Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Last Change:  2016 Oct 15
-
-if exists("b:did_indent")
-  finish
-endif
-
-if !get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
-  finish
-endif
-
-" Load MetaPost indentation script
-runtime! indent/mp.vim
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-setlocal indentexpr=GetConTeXtIndent()
-
-let b:undo_indent = "setl indentexpr<"
-
-function! GetConTeXtIndent()
-  " Use MetaPost rules inside MetaPost graphic environments
-  if len(synstack(v:lnum, 1)) > 0 &&
-        \ synIDattr(synstack(v:lnum, 1)[0], "name") ==# 'contextMPGraphic'
-    return GetMetaPostIndent()
-  endif
-  return -1
-endfunc
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim:sw=2
-
-endif
diff --git a/packages.yaml b/packages.yaml
index ad1f68585..4590b31bd 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5530,8 +5530,6 @@ filetypes:
     description: X PixMap 2
 ---
 name: context
-remote: vim/vim:runtime
-glob: "**/context.vim"
 filetypes:
 - name: context
   patterns:
diff --git a/syntax/context.vim b/syntax/context.vim
deleted file mode 100644
index 433287dfa..000000000
--- a/syntax/context.vim
+++ /dev/null
@@ -1,145 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'context') == -1
-
-" Vim syntax file
-" Language:           ConTeXt typesetting engine
-" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
-" Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:    2016 Oct 16
-
-if exists("b:current_syntax")
-  finish
-endif
-
-runtime! syntax/plaintex.vim
-unlet b:current_syntax
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-" Dictionary of (filetype, group) pairs to highlight between \startGROUP \stopGROUP.
-let s:context_include = get(b:, 'context_include', get(g:, 'context_include', {'xml': 'XML'}))
-
-" For backward compatibility (g:context_include used to be a List)
-if type(s:context_include) ==# type([])
-  let g:context_metapost = (index(s:context_include, 'mp') != -1)
-  let s:context_include = filter(
-        \ {'c': 'C', 'javascript': 'JS', 'ruby': 'Ruby', 'xml': 'XML'},
-        \ { k,_ -> index(s:context_include, k) != -1 }
-        \ )
-endif
-
-syn iskeyword @,48-57,a-z,A-Z,192-255
-
-syn spell   toplevel
-
-" ConTeXt options, i.e., [...] blocks
-syn region  contextOptions    matchgroup=contextDelimiter start='\['  end=']\|\ze\\stop' skip='\\\[\|\\\]' contains=ALLBUT,contextBeginEndLua,@Spell
-
-" Highlight braces
-syn match   contextDelimiter  '[{}]'
-
-" Comments
-syn match   contextComment '\\\@<!\%(\\\\\)*\zs%.*$' display contains=initexTodo
-syn match   contextComment '^\s*%[CDM].*$'           display contains=initexTodo
-
-syn match   contextBlockDelim '\\\%(start\|stop\)\a\+' contains=@NoSpell
-
-syn region  contextEscaped    matchgroup=contextPreProc start='\\type\%(\s*\|\n\)*\z([^A-Za-z%]\)' end='\z1'
-syn region  contextEscaped    matchgroup=contextPreProc start='\\type\=\%(\s\|\n\)*{' end='}'
-syn region  contextEscaped    matchgroup=contextPreProc start='\\type\=\%(\s*\|\n\)*<<' end='>>'
-syn region  contextEscaped    matchgroup=contextPreProc
-                              \ start='\\start\z(\a*\%(typing\|typen\)\)'
-                              \ end='\\stop\z1' contains=plaintexComment keepend
-syn region  contextEscaped    matchgroup=contextPreProc start='\\\h\+Type\%(\s\|\n\)*{' end='}'
-syn region  contextEscaped    matchgroup=contextPreProc start='\\Typed\h\+\%(\s\|\n\)*{' end='}'
-
-syn match   contextBuiltin    display contains=@NoSpell
-      \ '\\\%(unprotect\|protect\|unexpanded\)\>'
-
-syn match   contextPreProc    '^\s*\\\%(start\|stop\)\=\%(component\|environment\|project\|product\)\>'
-                              \ contains=@NoSpell
-
-if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
-  let b:mp_metafun_macros = 1 " Highlight MetaFun keywords
-  syn include @mpTop          syntax/mp.vim
-  unlet b:current_syntax
-
-  syn region  contextMPGraphic  matchgroup=contextBlockDelim
-                                \ start='\\start\z(MP\%(clip\|code\|definitions\|drawing\|environment\|extensions\|inclusions\|initializations\|page\|\)\)\>.*$'
-                                \ end='\\stop\z1'
-                                \ contains=@mpTop,@NoSpell
-  syn region  contextMPGraphic  matchgroup=contextBlockDelim
-                                \ start='\\start\z(\%(\%[re]usable\|use\|unique\|static\)MPgraphic\|staticMPfigure\|uniqueMPpagegraphic\)\>.*$'
-                                \ end='\\stop\z1'
-                                \ contains=@mpTop,@NoSpell
-endif
-
-if get(b:, 'context_lua', get(g:, 'context_lua', 1))
-  syn include @luaTop          syntax/lua.vim
-  unlet b:current_syntax
-
-  syn region  contextLuaCode    matchgroup=contextBlockDelim
-                                \ start='\\startluacode\>'
-                                \ end='\\stopluacode\>' keepend
-                                \ contains=@luaTop,@NoSpell
-
-  syn match   contextDirectLua  "\\\%(directlua\|ctxlua\)\>\%(\s*%.*$\)\="
-                                \ nextgroup=contextBeginEndLua skipwhite skipempty
-                                \ contains=initexComment
-  syn region  contextBeginEndLua matchgroup=contextSpecial
-                                \ start="{" end="}" skip="\\[{}]"
-                                \ contained contains=@luaTop,@NoSpell
-endif
-
-for synname in keys(s:context_include)
-  execute 'syn include @' . synname . 'Top' 'syntax/' . synname . '.vim'
-  unlet b:current_syntax
-  execute 'syn region context' . s:context_include[synname] . 'Code'
-        \ 'matchgroup=contextBlockDelim'
-        \ 'start=+\\start' . s:context_include[synname] . '+'
-        \ 'end=+\\stop' . s:context_include[synname] . '+'
-        \ 'contains=@' . synname . 'Top,@NoSpell'
-endfor
-
-syn match   contextSectioning '\\\%(start\|stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>'
-                              \ contains=@NoSpell
-
-syn match   contextSpecial    '\\crlf\>\|\\par\>\|-\{2,3}\||[<>/]\=|'
-                              \ contains=@NoSpell
-syn match   contextSpecial    /\\[`'"]/
-syn match   contextSpecial    +\\char\%(\d\{1,3}\|'\o\{1,3}\|"\x\{1,2}\)\>+
-                              \ contains=@NoSpell
-syn match   contextSpecial    '\^\^.'
-syn match   contextSpecial    '`\%(\\.\|\^\^.\|.\)'
-
-syn match   contextStyle      '\\\%(em\|ss\|hw\|cg\|mf\)\>'
-                              \ contains=@NoSpell
-syn match   contextFont       '\\\%(CAP\|Cap\|cap\|Caps\|kap\|nocap\)\>'
-                              \ contains=@NoSpell
-syn match   contextFont       '\\\%(Word\|WORD\|Words\|WORDS\)\>'
-                              \ contains=@NoSpell
-syn match   contextFont       '\\\%(vi\{1,3}\|ix\|xi\{0,2}\)\>'
-                              \ contains=@NoSpell
-syn match   contextFont       '\\\%(tf\|b[si]\|s[cl]\|os\)\%(xx\|[xabcd]\)\=\>'
-                              \ contains=@NoSpell
-
-hi def link contextOptions    Typedef
-hi def link contextComment    Comment
-hi def link contextBlockDelim Keyword
-hi def link contextBuiltin    Keyword
-hi def link contextDelimiter  Delimiter
-hi def link contextEscaped    String
-hi def link contextPreProc    PreProc
-hi def link contextSectioning PreProc
-hi def link contextSpecial    Special
-hi def link contextType       Type
-hi def link contextStyle      contextType
-hi def link contextFont       contextType
-hi def link contextDirectLua  Keyword
-
-let b:current_syntax = "context"
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-endif

From bb27d0efbfaafcf83af1596a8416e798ead8f96a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 18 Oct 2020 13:34:01 +0200
Subject: [PATCH 143/299] Add regression test

---
 scripts/build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/build b/scripts/build
index 9e305b21c..d77a556a9 100755
--- a/scripts/build
+++ b/scripts/build
@@ -128,6 +128,10 @@ def load_data()
 
   for package in packages
     for filetype in package["filetypes"]
+      if ["context", "man"].include?(filetype["name"]) && package["remote"]
+        puts "context and man packages caused issues in past, are you sure?"
+        exit 1
+      end
       if filetype["patterns"]
         for pattern in filetype["patterns"]
           for p in comma_expanson(pattern["pattern"])

From 6d7f437b84aa76e5a69d420565123f75b040f836 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 18 Oct 2020 22:15:53 +0200
Subject: [PATCH 144/299] Do not set nocompatible mode, fixes #593

---
 ftdetect/polyglot.vim | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 72fed6231..73d2e3850 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -10,9 +10,6 @@ endif
 
 let did_load_polyglot = 1
 
-" We are not supporting non-compatible mode
-set nocompatible
-
 " It can happen vim filetype.vim loads first, then we need a reset
 if exists("did_load_filetypes")
   au! filetypedetect

From 88cae16fcad307d2a2c6d7f7ba6e4aecb1c8de0b Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 18 Oct 2020 23:57:00 +0200
Subject: [PATCH 145/299] Autodetect only 2, 3, 4, or 8 space indent, fixes
 #592

---
 ftdetect/polyglot.vim | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 73d2e3850..747c79d2c 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2629,11 +2629,6 @@ if !has_key(s:disabled_packages, 'autoindent')
   " Code below re-implements sleuth for vim-polyglot
   let g:loaded_sleuth = 1
 
-  " Makes shiftwidth to be synchronized with tabstop by default
-  if &shiftwidth == &tabstop
-    let &shiftwidth = 0
-  endif
-
   function! s:guess(lines) abort
     let options = {}
     let ccomment = 0
@@ -2718,11 +2713,12 @@ if !has_key(s:disabled_packages, 'autoindent')
       if line[0] == "\t"
         setlocal noexpandtab
         let &l:shiftwidth=&tabstop
+        let &l:tabstop=minindent
         let b:sleuth_culprit .= ':' . i
         return 1
       elseif line[0] == " "
         let indent = len(matchstr(line, '^ *'))
-        if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
+        if indent < minindent && index([2, 3, 4, 8], indent) >= 0
           let minindent = indent
         endif
       endif
@@ -2731,6 +2727,7 @@ if !has_key(s:disabled_packages, 'autoindent')
     if minindent < 10
       setlocal expandtab
       let &l:shiftwidth=minindent
+      let &l:tabstop=minindent
       let b:sleuth_culprit .= ':' . i
       return 1
     endif
@@ -2743,6 +2740,16 @@ if !has_key(s:disabled_packages, 'autoindent')
       return
     endif
 
+    if &expandtab
+      " Make tabstop to be synchronized with shiftwidth by default
+      " Some plugins are using &shiftwidth directly or accessing &tabstop
+      if &tabstop != 8 || &shiftwidth == 0
+        let &shiftwidth = &tabstop
+      else
+        let &tabstop = &shiftwidth
+      endif
+    endif
+
     let b:sleuth_culprit = expand("<afile>:p")
     if s:guess(getline(1, 32))
       return
@@ -2784,7 +2791,7 @@ if !has_key(s:disabled_packages, 'autoindent')
     unlet b:sleuth_culprit
   endfunction
 
-  setglobal smarttab
+  set smarttab
 
   function! SleuthIndicator() abort
     let sw = &shiftwidth ? &shiftwidth : &tabstop
@@ -2799,7 +2806,7 @@ if !has_key(s:disabled_packages, 'autoindent')
 
   augroup polyglot-sleuth
     au!
-    au FileType * call s:detect_indent()
+    au BufEnter * call s:detect_indent()
     au User Flags call Hoist('buffer', 5, 'SleuthIndicator')
   augroup END
 

From 3618414fad6ac488e89895810d3a3da3c3c1c6fd Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 00:10:17 +0200
Subject: [PATCH 146/299] Do not set tabstop by mistake

---
 ftdetect/polyglot.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 747c79d2c..99fb94139 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2713,7 +2713,6 @@ if !has_key(s:disabled_packages, 'autoindent')
       if line[0] == "\t"
         setlocal noexpandtab
         let &l:shiftwidth=&tabstop
-        let &l:tabstop=minindent
         let b:sleuth_culprit .= ':' . i
         return 1
       elseif line[0] == " "

From c3e825027ddabecf18370df61c1da4018f017b7b Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 02:25:59 +0200
Subject: [PATCH 147/299] Allow vim-polyglot to load in non-compatible mode

---
 autoload/go/config.vim       |  6 +++---
 autoload/polyglot/sleuth.vim | 13 +++++++++++++
 doc/vim-go.txt               |  4 ++--
 ftdetect/polyglot.vim        |  9 +++++++++
 scripts/build                | 10 +---------
 scripts/test                 |  1 -
 6 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index 54f94f019..2265608b4 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -581,9 +581,9 @@ function! go#config#DiagnosticsEnabled() abort
 endfunction
 
 function! go#config#DiagnosticsLevel() abort
-  let l:default = 2
-  if has_key(g:, 'go_diagnostics_enabled') && !g:go_diagnostics_enabled
-    let l:default = 0
+  let l:default = 0
+  if has_key(g:, 'go_diagnostics_enabled') && g:go_diagnostics_enabled
+    let l:default = 2
   endif
 
   return get(g:, 'go_diagnostics_level', l:default)
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index db032dd6e..b5b30ab8d 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -1,3 +1,9 @@
+" Restore 'cpoptions'
+let s:cpo_save = &cpo
+set cpo&vim
+
+" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
+
 let s:globs = {
   \ '8th': '*.8th',
   \ 'Jenkinsfile': '*.jenkinsfile,*.Jenkinsfile,Jenkinsfile,Jenkinsfile*',
@@ -624,6 +630,13 @@ let s:globs = {
   \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks,.zsh*',
   \}
 
+
+" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
+
 func! polyglot#sleuth#GlobForFiletype(type)
   return get(s:globs, a:type, '')
 endfunc
+
+" Restore 'cpoptions'
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/doc/vim-go.txt b/doc/vim-go.txt
index 18306a0f5..dbb6af1f6 100644
--- a/doc/vim-go.txt
+++ b/doc/vim-go.txt
@@ -1948,9 +1948,9 @@ disabled.
 
 Specifies the `gopls` diagnostics level. Valid values are 0, 1, and 2. 0
 ignores `gopls` diagnostics, 1 is for errors only, and 2 is for errors and
-warnings. By default it is 2.
+warnings. By default it is 0.
 >
-  let g:go_diagnostics_level = 2
+  let g:go_diagnostics_level = 0
 <
 
                                                   *'g:go_template_autocreate'*
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 99fb94139..5bb1bc76d 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -10,6 +10,10 @@ endif
 
 let did_load_polyglot = 1
 
+" Switch to compatible mode for the time being
+let s:cpo_save = &cpo
+set cpo&vim
+
 " It can happen vim filetype.vim loads first, then we need a reset
 if exists("did_load_filetypes")
   au! filetypedetect
@@ -2625,6 +2629,7 @@ au BufEnter * if &ft == "" && expand("<afile>:e") == ""  |
 
 augroup END
 
+
 if !has_key(s:disabled_packages, 'autoindent')
   " Code below re-implements sleuth for vim-polyglot
   let g:loaded_sleuth = 1
@@ -3430,3 +3435,7 @@ if exists("did_load_filetypes") && exists("g:polyglot_disabled")
   unlet did_load_filetypes
   runtime! extras/filetype.vim
 endif
+
+" Restore 'cpoptions'
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/scripts/build b/scripts/build
index d77a556a9..b3867b976 100755
--- a/scripts/build
+++ b/scripts/build
@@ -848,15 +848,7 @@ def generate_plugins(packages)
   end
   output << "  \\}\n\n"
 
-
-  output << <<~EOS
-    func! polyglot#sleuth#GlobForFiletype(type)
-      return get(s:globs, a:type, '')
-    endfunc
-  EOS
-
-
-  File.write('autoload/polyglot/sleuth.vim', output)
+  inject_code('autoload/polyglot/sleuth.vim', output)
 end
 
 def process_list(list, extras)
diff --git a/scripts/test b/scripts/test
index ae4080638..f726d2266 100755
--- a/scripts/test
+++ b/scripts/test
@@ -7,7 +7,6 @@ def run_script(src)
 end
 
 def run_vimscript(src)
-
   wrapper = <<~EOF
     vim --clean --not-a-term -u <(cat <<- "EOM"
     set nocompatible

From 233a817f05ba73574539ed7395bde49d183a807a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 02:26:31 +0200
Subject: [PATCH 148/299] Add vim-sensible defaults by default

---
 plugin/polyglot.vim | 128 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)

diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index 27e12b77e..1b5d34e1f 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -7,3 +7,131 @@ endif
 if has('syntax') && !exists('g:syntax_on')
   syntax enable
 endif
+
+" No need to duplicate work
+if exists('g:loaded_sensible')
+	finish
+endif
+
+" Code taken from https://github.com/tpope/vim-sensible
+" and (mostly comments) from https://github.com/sheerun/vimrc
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible')
+	" Autoindent when starting new line, or using `o` or `O`.
+	set autoindent
+
+	" Allow backspace in insert mode.
+	set backspace=indent,eol,start
+
+	" Don't scan included files. The .tags file is more performant.
+	set complete-=i
+
+	" Use 'shiftwidth' when using `<Tab>` in front of a line.
+	" By default it's used only for shift commands (`<`, `>`).
+	set smarttab
+
+	" Disable octal format for number processing.
+	set nrformats-=octal
+
+	" Allow for mappings including `Esc`, while preserving
+	" zero timeout after pressing it manually.
+	" (only vim needs a fix for this)
+	if !has('nvim') && &ttimeoutlen == -1
+		set ttimeout
+		set ttimeoutlen=100
+	endif
+
+	" Enable highlighted case-insensitive incremential search.
+	set incsearch
+
+	" Use <C-L> to clear the highlighting of :set hlsearch.
+	if maparg('<C-L>', 'n') ==# ''
+		nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
+	endif
+
+	" Always show window statuses, even if there's only one.
+	set laststatus=2
+
+	" Show the line and column number of the cursor position.
+	set ruler
+
+	" Autocomplete commands using nice menu in place of window status.
+	" Enable `Ctrl-N` and `Ctrl-P` to scroll through matches.
+	set wildmenu
+
+	" Keep 5 columns next to the cursor when scrolling horizontally.
+	if !&scrolloff
+		set scrolloff=1
+	endif
+	if !&sidescrolloff
+		set sidescrolloff=5
+	endif
+
+	" When 'wrap' is on, display last line even if it doesn't fit.
+	set display+=lastline
+
+	" Force utf-8 encoding
+	set encoding=utf-8
+
+	" Set default whitespace characters when using `:set list`
+	if &listchars ==# 'eol:$'
+		set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
+	endif
+
+	" Delete comment character when joining commented lines
+	if v:version > 703 || v:version == 703 && has("patch541")
+		set formatoptions+=j
+	endif
+
+	" Search upwards for tags file instead only locally
+	if has('path_extra')
+		setglobal tags-=./tags tags-=./tags; tags^=./tags;
+	endif
+
+	" Fix issues with fish shell
+	" https://github.com/tpope/vim-sensible/issues/50
+	if &shell =~# 'fish$' && (v:version < 704 || v:version == 704 && !has('patch276'))
+		set shell=/usr/bin/env\ bash
+	endif
+
+	" Reload unchanged files automatically.
+	set autoread
+
+	" Increase history size to 1000 items.
+	if &history < 1000
+		set history=1000
+	endif
+
+	" Allow for up to 50 opened tabs on Vim start.
+	if &tabpagemax < 50
+		set tabpagemax=50
+	endif
+
+	" Always save upper case variables to viminfo file.
+	if !empty(&viminfo)
+		set viminfo^=!
+	endif
+
+	" Don't save options in sessions and views
+	set sessionoptions-=options
+	set viewoptions-=options
+
+	" Allow color schemes to do bright colors without forcing bold.
+	if &t_Co == 8 && $TERM !~# '^Eterm'
+		set t_Co=16
+	endif
+
+	" Load matchit.vim, but only if the user hasn't installed a newer version.
+	if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
+		runtime! macros/matchit.vim
+	endif
+
+	" `Ctrl-U` in insert mode deletes a lot. Use `Ctrl-G` u to first break undo,
+	" so that you can undo `Ctrl-U` without undoing what you typed before it.
+	if empty(mapcheck('<C-U>', 'i'))
+		inoremap <C-U> <C-G>u<C-U>
+	endif
+
+	if empty(mapcheck('<C-W>', 'i'))
+		inoremap <C-W> <C-G>u<C-W>
+	endif
+endif

From 71d9a2db9f0c2f8db0b7396b1b9d347e29214440 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 02:34:23 +0200
Subject: [PATCH 149/299] Add docs about sensible

---
 README.md | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 9daa1461d..3c5fa337a 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,10 @@ A collection of language packs for Vim.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
 - It **installs and updates 120+ times faster** than the <!--Package Count-->598<!--/Package Count--> packages it consists of.
-- It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
-- Solid syntax and indentation support (other features skipped). Only the best language packs.
-- All unnecessary files are ignored (like enormous documentation from php support).
-- Automatically detect indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth))
-- Each build is tested by automated vimrunner script on CI. See `spec` directory.
+- It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
+- Best syntax and indentation support (no other features). Hand-selected language packs.
+- Automatically detects indentation (includes fixed and performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
+- Includes defaults from [vim-sensible](https://github.com/tpope/vim-sensible), which are usually necessary for editing in any language (can be disabled)
 
 \*To be completely honest, optimized `ftdetect` script takes around `10ms` to load.
 
@@ -226,12 +225,23 @@ let g:polyglot_disabled = ['markdown.plugin']
 
 Please note that disabling a language won't make in your vim startup any faster / slower (only for specific this specific filetype). All plugins are lazily loaded only when they are really needed. 
 
+## Autoindent
+
 Vim Polyglot tries to automatically detect indentation settings (just like vim-sleuth). If this feature is not working for you for some reason, please file an issue and disable it temporarily with:
 
 ```vim
 let g:polyglot_disabled = ['autoindent']
 ```
 
+## Default settings
+
+Vim Polyglot includes vim-sensible plugin, which is usually necessary for editing any language. This can be disabled with:
+
+
+```vim
+let g:polyglot_disabled = ['sensible']
+```
+
 ## Contributing
 
 Language packs are periodically updated using automated `scripts/build` script.

From 225c408b02cbcd76463b7b040b6d719d00a0d013 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 02:37:33 +0200
Subject: [PATCH 150/299] Mention nocompatible in the .vimrc

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3c5fa337a..5f574bed1 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,13 @@ A collection of language packs for Vim.
 For example when using [Plug](https://github.com/junegunn/vim-plug):
 
 ```
+set nocompatible
+
+call plug#begin()
+
 Plug 'sheerun/vim-polyglot'
+
+call plug#end()
 ```
 
 Optionally download one of the [releases](https://github.com/sheerun/vim-polyglot/releases) and unpack it directly under `~/.vim` directory.
@@ -205,7 +211,7 @@ You can either wait for new patch release with updates or run `make` by yourself
 
 ## Troubleshooting
 
-Please make sure you have `syntax on` in your `.vimrc` (or use something like [sheerun/vimrc](https://github.com/sheerun/vimrc))
+Please make sure you have `set nocompatible` in your `.vimrc` (or use something like [sheerun/vimrc](https://github.com/sheerun/vimrc))
 
 Individual language packs can be disabled by setting `g:polyglot_disabled` as follows:
 

From 6208384bd4b4306338ef4bfa0605cf182a424ee2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 02:38:07 +0200
Subject: [PATCH 151/299] Improve syntax highlighting of the readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5f574bed1..381d3d0a1 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ A collection of language packs for Vim.
 
 For example when using [Plug](https://github.com/junegunn/vim-plug):
 
-```
+```vim
 set nocompatible
 
 call plug#begin()

From dbfcb6dca4a7ef9bb8969b10f4dd8c80dece1837 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 02:50:00 +0200
Subject: [PATCH 152/299] Mention I recommend using plug

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 381d3d0a1..925dce0f4 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ A collection of language packs for Vim.
 1. Install [Pathogen](https://github.com/tpope/vim-pathogen), [Vundle](https://github.com/VundleVim/Vundle.vim), [NeoBundle](https://github.com/Shougo/neobundle.vim), or [Plug](https://github.com/junegunn/vim-plug) package manager for Vim.
 2. Use this repository as submodule or package.
 
-For example when using [Plug](https://github.com/junegunn/vim-plug):
+For example when using [Plug](https://github.com/junegunn/vim-plug) (which I recommend):
 
 ```vim
 set nocompatible

From 4ab0bdd326bd99925676ec8fc2bd43b96620e8c5 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 02:51:16 +0200
Subject: [PATCH 153/299] Make readme little shorter

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 925dce0f4..552cef680 100644
--- a/README.md
+++ b/README.md
@@ -40,10 +40,6 @@ You can also use Vim 8 built-in package manager:
 git clone --depth 1 https://github.com/sheerun/vim-polyglot ~/.vim/pack/plugins/start/vim-polyglot
 ```
 
-NOTE: Not all features of individual language packs are available. We strip them from functionality slowing vim startup (for example we ignore `plugins` folder that is loaded regardless of file type, instead we prefer `ftplugin` which is loaded lazily).
-
-If you need full functionality of any plugin, please use it directly with your plugin manager.
-
 ## Language packs
 
 On top of all language packs from [vim repository](https://github.com/vim/vim/tree/master/runtime), vim-polyglot includes:

From 09808395683ecb082e65412861ef70ed6374984b Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 02:51:41 +0200
Subject: [PATCH 154/299] Prevent break in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 552cef680..ed0980c39 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ A collection of language packs for Vim.
 - It **installs and updates 120+ times faster** than the <!--Package Count-->598<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
-- Automatically detects indentation (includes fixed and performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
+- Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
 - Includes defaults from [vim-sensible](https://github.com/tpope/vim-sensible), which are usually necessary for editing in any language (can be disabled)
 
 \*To be completely honest, optimized `ftdetect` script takes around `10ms` to load.

From 3d80a66e7be229a014989b798fc4fad8e579946d Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 02:52:47 +0200
Subject: [PATCH 155/299] Move comment about polyglot_disabled

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ed0980c39..878926be7 100644
--- a/README.md
+++ b/README.md
@@ -211,14 +211,14 @@ Please make sure you have `set nocompatible` in your `.vimrc` (or use something
 
 Individual language packs can be disabled by setting `g:polyglot_disabled` as follows:
 
+**Please declare this variable before polyglot is loaded (at the top of .vimrc)**
+
 ```vim
 let g:polyglot_disabled = ['markdown']
 ```
 
 The list of available languages to disable is shown above.
 
-*Please declare this variable before polyglot is loaded (at the top of .vimrc)*
-
 If you wish to use filetype detection by Vim Polyglot but you'd like to use your own syntax-highlighting plugin, you can append `.plugin` to disabled entry, like below. Disabling Vim Polyglot filetype plugin won't disable native Vim filetype plugin.
 
 ```vim

From 5e2607d93f98e0394d1d68b1d6592b2d0a11f52f Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 02:55:37 +0200
Subject: [PATCH 156/299] Remove docs so docs of installed plugins are up to
 date

---
 doc/clojure.txt             |  185 --
 doc/coffee-script.txt       |    8 -
 doc/cryptol.txt             |  108 --
 doc/dart.txt                |   90 -
 doc/dhall.txt               |   43 -
 doc/elixir.txt              |  116 --
 doc/ft-csv.txt              | 1768 -------------------
 doc/ft-gitcommit-plugin.txt |   25 -
 doc/ft-ruby-indent.txt      |  152 --
 doc/ft-ruby-omni.txt        |   56 -
 doc/ft-ruby-plugin.txt      |   85 -
 doc/ft-ruby-syntax.txt      |  123 --
 doc/fzf_gitignore.txt       |   85 -
 doc/graphql.txt             |   54 -
 doc/haskell-vim.txt         |  163 --
 doc/idris-vim.txt           |  158 --
 doc/julia-vim-L2U-table.txt | 3282 -----------------------------------
 doc/julia-vim-L2U.txt       |  405 -----
 doc/julia-vim.txt           |  484 ------
 doc/ledger.txt              |  443 -----
 doc/ocaml.txt               |   16 -
 doc/opam.txt                |   22 -
 doc/pgsql.txt               |  145 --
 doc/ps1.txt                 |   68 -
 doc/python-syntax.txt       |  124 --
 doc/reason.txt              |   24 -
 doc/rust.txt                |  490 ------
 doc/scala.txt               |  137 --
 doc/terraform.txt           |   18 -
 doc/textile.txt             |   70 -
 doc/vim-fsharp.txt          |  210 ---
 doc/vim-go.txt              | 2855 ------------------------------
 doc/vim-jsonnet.txt         |  104 --
 doc/vim-jsx-pretty-doc.txt  |  129 --
 doc/vim-markdown.txt        |  667 -------
 doc/vim-raml.txt            |   64 -
 scripts/build               |    4 +-
 37 files changed, 2 insertions(+), 12978 deletions(-)
 delete mode 100644 doc/clojure.txt
 delete mode 100644 doc/coffee-script.txt
 delete mode 100644 doc/cryptol.txt
 delete mode 100644 doc/dart.txt
 delete mode 100644 doc/dhall.txt
 delete mode 100644 doc/elixir.txt
 delete mode 100644 doc/ft-csv.txt
 delete mode 100644 doc/ft-gitcommit-plugin.txt
 delete mode 100644 doc/ft-ruby-indent.txt
 delete mode 100644 doc/ft-ruby-omni.txt
 delete mode 100644 doc/ft-ruby-plugin.txt
 delete mode 100644 doc/ft-ruby-syntax.txt
 delete mode 100644 doc/fzf_gitignore.txt
 delete mode 100644 doc/graphql.txt
 delete mode 100644 doc/haskell-vim.txt
 delete mode 100644 doc/idris-vim.txt
 delete mode 100644 doc/julia-vim-L2U-table.txt
 delete mode 100644 doc/julia-vim-L2U.txt
 delete mode 100644 doc/julia-vim.txt
 delete mode 100644 doc/ledger.txt
 delete mode 100644 doc/ocaml.txt
 delete mode 100644 doc/opam.txt
 delete mode 100644 doc/pgsql.txt
 delete mode 100644 doc/ps1.txt
 delete mode 100644 doc/python-syntax.txt
 delete mode 100644 doc/reason.txt
 delete mode 100644 doc/rust.txt
 delete mode 100644 doc/scala.txt
 delete mode 100644 doc/terraform.txt
 delete mode 100644 doc/textile.txt
 delete mode 100644 doc/vim-fsharp.txt
 delete mode 100644 doc/vim-go.txt
 delete mode 100644 doc/vim-jsonnet.txt
 delete mode 100644 doc/vim-jsx-pretty-doc.txt
 delete mode 100644 doc/vim-markdown.txt
 delete mode 100644 doc/vim-raml.txt

diff --git a/doc/clojure.txt b/doc/clojure.txt
deleted file mode 100644
index 07fce86b9..000000000
--- a/doc/clojure.txt
+++ /dev/null
@@ -1,185 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
-
-*clojure.txt*	Clojure runtime files
-
-INTRODUCTION						*clojure-introduction*
-
-Meikel Brandmeyer's excellent Clojure runtime files. Includes syntax, indent,
-ftdetect, and ftplugin scripts.
-
-CLOJURE					*ft-clojure-indent* *clojure-indent*
-
-Clojure indentation differs somewhat from traditional Lisps, due in part to
-the use of square and curly brackets, and otherwise by community convention.
-These conventions are not universally followed, so the Clojure indent script
-offers a few configurable options, listed below.
-
-If the current vim does not include searchpairpos(), the indent script falls
-back to normal 'lisp' indenting, and the following options are ignored.
-
-							*g:clojure_maxlines*
-
-Set maximum scan distance of searchpairpos(). Larger values trade performance
-for correctness when dealing with very long forms. A value of 0 will scan
-without limits.
->
-	" Default
-	let g:clojure_maxlines = 100
-<
-						*g:clojure_fuzzy_indent*
-					*g:clojure_fuzzy_indent_patterns*
-					*g:clojure_fuzzy_indent_blacklist*
-
-The 'lispwords' option is a list of comma-separated words that mark special
-forms whose subforms must be indented with two spaces.
-
-For example:
->
-	(defn bad []
-	      "Incorrect indentation")
-
-	(defn good []
-	  "Correct indentation")
-<
-If you would like to specify 'lispwords' with a |pattern| instead, you can use
-the fuzzy indent feature:
->
-	" Default
-	let g:clojure_fuzzy_indent = 1
-	let g:clojure_fuzzy_indent_patterns = ['^with', '^def', '^let']
-	let g:clojure_fuzzy_indent_blacklist =
-		\ ['-fn$', '\v^with-%(meta|out-str|loading-context)$']
-
-	" Legacy comma-delimited string version; the list format above is
-	" recommended. Note that patterns are implicitly anchored with ^ and $
-	let g:clojure_fuzzy_indent_patterns = 'with.*,def.*,let.*'
-<
-|g:clojure_fuzzy_indent_patterns| and |g:clojure_fuzzy_indent_blacklist| are
-|Lists| of patterns that will be matched against the unquoted, unqualified
-symbol at the head of a list. This means that a pattern like "^foo" will match
-all these candidates: "foobar", "my.ns/foobar", and "#'foobar".
-
-Each candidate word is tested for special treatment in this order:
-
-	1. Return true if word is literally in 'lispwords'
-	2. Return false if word matches a pattern in
-	   |g:clojure_fuzzy_indent_blacklist|
-	3. Return true if word matches a pattern in
-	   |g:clojure_fuzzy_indent_patterns|
-	4. Return false and indent normally otherwise
-
-					*g:clojure_special_indent_words*
-
-Some forms in Clojure are indented so that every subform is indented only two
-spaces, regardless of 'lispwords'. If you have a custom construct that should
-be indented in this idiosyncratic fashion, you can add your symbols to the
-default list below.
->
-	" Default
-	let g:clojure_special_indent_words =
-	   \ 'deftype,defrecord,reify,proxy,extend-type,extend-protocol,letfn'
-<
-					*g:clojure_align_multiline_strings*
-
-Align subsequent lines in multiline strings to the column after the opening
-quote, instead of the same column.
-
-For example:
->
-	(def default
-	  "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-	  eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-	  enim ad minim veniam, quis nostrud exercitation ullamco laboris
-	  nisi ut aliquip ex ea commodo consequat.")
-
-	(def aligned
-	  "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
-	   eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut
-	   enim ad minim veniam, quis nostrud exercitation ullamco laboris
-	   nisi ut aliquip ex ea commodo consequat.")
-<
-This option is off by default.
->
-	" Default
-	let g:clojure_align_multiline_strings = 0
-<
-						*g:clojure_align_subforms*
-
-By default, parenthesized compound forms that look like function calls and
-whose head subform is on its own line have subsequent subforms indented by
-two spaces relative to the opening paren:
->
-	(foo
-	  bar
-	  baz)
-<
-Setting this option changes this behavior so that all subforms are aligned to
-the same column, emulating the default behavior of clojure-mode.el:
->
-	(foo
-	 bar
-	 baz)
-<
-This option is off by default.
->
-	" Default
-	let g:clojure_align_subforms = 0
-<
-
-CLOJURE							*ft-clojure-syntax*
-
-The default syntax groups can be augmented through the
-*g:clojure_syntax_keywords* and *b:clojure_syntax_keywords* variables. The
-value should be a |Dictionary| of syntax group names to a |List| of custom
-identifiers:
->
-	let g:clojure_syntax_keywords = {
-	    \ 'clojureMacro': ["defproject", "defcustom"],
-	    \ 'clojureFunc': ["string/join", "string/replace"]
-	    \ }
-<
-Refer to the Clojure syntax script for valid syntax group names.
-
-If the |buffer-variable| *b:clojure_syntax_without_core_keywords* is set, only
-language constants and special forms are matched.
-
-Setting *g:clojure_fold* enables folding Clojure code via the syntax engine.
-Any list, vector, or map that extends over more than one line can be folded
-using the standard Vim |fold-commands|.
-
-Please note that this option does not work with scripts that redefine the
-bracket syntax regions, such as rainbow-parentheses plugins.
-
-This option is off by default.
->
-	" Default
-	let g:clojure_fold = 0
-<
-
-ABOUT							*clojure-about*
-
-This document and associated runtime files are maintained at:
-https://github.com/guns/vim-clojure-static
-
-Distributed under the Vim license. See |license|.
-
-syntax/clojure.vim
-
-	Copyright 2007-2008 (c) Toralf Wittner <toralf.wittner@gmail.com>
-	Copyright 2008-2012 (c) Meikel Brandmeyer <mb@kotka.de>
-
-ftdetect/clojure.vim,
-ftplugin/clojure.vim,
-indent/clojure.vim
-
-	Copyright 2008-2012 (c) Meikel Brandmeyer <mb@kotka.de>
-
-Modified and relicensed under the Vim License for distribution with Vim:
-
-	Copyright 2013-2014 (c) Sung Pae <self@sungpae.com>
-
-Last Change: %%RELEASE_DATE%%
-
- vim:tw=78:noet:sw=8:sts=8:ts=8:ft=help:norl:
-
-endif
diff --git a/doc/coffee-script.txt b/doc/coffee-script.txt
deleted file mode 100644
index 692d62419..000000000
--- a/doc/coffee-script.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-
-Please see the project readme for up-to-date docs:
-https://github.com/kchmck/vim-coffee-script
-
- vim:tw=78:ts=8:ft=help:norl:
-
-endif
diff --git a/doc/cryptol.txt b/doc/cryptol.txt
deleted file mode 100644
index 0d90528c3..000000000
--- a/doc/cryptol.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
-
-*cryptol.txt* functionality for the Cryptol programming language
-
-Copyright © 2013 Edward O'Callaghan. All Rights Reserved.
-
-  .oooooo.                                       .             oooo  
- d8P'  `Y8b                                    .o8             `888  
-888          oooo d8b oooo    ooo oo.ooooo.  .o888oo  .ooooo.   888  
-888          `888""8P  `88.  .8'   888' `88b   888   d88' `88b  888  
-888           888       `88..8'    888   888   888   888   888  888  
-`88b    ooo   888        `888'     888   888   888 . 888   888  888  
- `Y8bood8P'  d888b        .8'      888bod8P'   "888" `Y8bod8P' o888o 
-                      .o..P'       888                               
-                      `Y8P'       o888o                              
-
-          Functionality for the Cryptol programming language.
-        Includes syntax highlighting, code folding, and more!
-
-==============================================================================
-CONTENTS                                                      *CryptolContents*
-
-    1. Usage ................ |CryptolUsage|
-    2. Mappings ............. |CryptolMappings|
-    3. License .............. |CryptolLicense|
-    4. Bugs ................. |CryptolBugs|
-    5. Contributing ......... |CryptolContributing|
-    6. Changelog ............ |CryptolChangelog|
-    7. Credits .............. |CryptolCredits|
-
-==============================================================================
-Section 1: Usage                                                 *CryptolUsage*
-
-This plugin will automatically provide syntax highlighting for Cryptol files
-(files ending in .cry).
-
-Cryptol is a purely functional domain specific language, developed over the
-past decade by Galois for the NSA, for the design, implementation and
-verification of cryptographic algorithms.
-
-==============================================================================
-Section 2: Mappings                                           *CryptolMappings*
-
-Code folding is done in the typical way, for example:
- * za - When on a closed fold - open it.
- * zM - Close all foldings to level 0.
- * zR - Reduce folding
-
-For more information see, for example, :help za
-
-==============================================================================
-Section 3: License                                             *CryptolLicense*
-
-Copyright © 2013 Edward O'Callaghan. All Rights Reserved.
-
-HOWEVER:
-Be it known, The syntax file was written by
-Copyright © 2005 Fergus Henderson. All Rights Reserved.
-
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-==============================================================================
-Section 4: Bugs                                                   *CryptolBugs*
-
- * https://github.com/victoredwardocallaghan/cryptol.vim/issues
-
-==============================================================================
-Section 5: TODOs                                                *CryptolTODOs
-
- * Add compiler support
-  - .
-
-==============================================================================
-Section 6: Contributing                                   *CryptolContributing*
-
- * Edward O'Callaghan
-
-==============================================================================
-Section 7: Changelog                                         *CryptolChangelog*
-
- * Initial 25 Apr 2013.
-
-==============================================================================
-Section 8: Credits                                             *CryptolCredits*
-
- * Edward O'Callaghan
- * Fergus Henderson - wrote the orginal syntax file.
-
-vim:ts=4:ft=help:tw=78:et
-
-endif
diff --git a/doc/dart.txt b/doc/dart.txt
deleted file mode 100644
index 2a3bc78e1..000000000
--- a/doc/dart.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
-
-*dart-vim-plugin*  Dart support for Vim
-
-INTRODUCTION                                    *dart.vim*
-
-dart-vim-plugin provides filetype detection, syntax highlighting, and
-indentation for Dart code in Vim.
-
-https://github.com/dart-lang/dart-vim-plugin
-
-TOOLS                                           *dart-tools*
-
-An `includeexpr` is set that can read `.packages` files and resolve `package:`
-uris to a file. See |gf| for an example use.
-
-COMMANDS                                        *dart-commands*
-
-These commands are available in buffers with the dart filetype.
-
-                                                *:Dart2Js*
-Runs dart2js to compile the current file. Takes the same arguments as the
-dart2js binary and always passes the path to the current file as the last
-argument.
-If there are any errors they will be shown in the quickfix window.
-
-                                                *:DartFmt*
-Runs dartfmt and passes the current buffer content through stdin. If the
-format is successful replaces the current buffer content with the formatted
-result. If the format is unsuccessful errors are shown in the quickfix window.
-This command does not use the file content on disk so it is safe to run with
-unwritten changes.
-Passes arguments through to dartfmt.
-
-                                                *:DartAnalyzer*
-Runs dartanalyzer to analyze the current file. Takes the same arguments as the
-dartanalyzer binary and always passes the path to the current file as the last
-argument.
-If there are any errors they will be shown in the quickfix window.
-
-CONFIGURATION                                   *dart-configure*
-
-                                                *g:dart_html_in_string*
-Set to `v:true` to highlights HTML syntax inside Strings within Dart files.
-Default `v:false`
-
-                                                *g:dart_corelib_highlight*
-Set to `v:false` to disable highlighting of code Dart classes like `Map` or
-`List`.
-Default `v:true`
-                                                *g:dart_style_guide*
-Set to any value (set to `2` by convention) to set tab and width behavior to
-match the Dart style guide - spaces only with an indent of 2. Also sets
-`formatoptions += t` to auto wrap text.
-
-Configure DartFmt options with `let g:dartfmt_options`, for example, enable
-auto syntax fixes with `let g:dartfmt_options = ['--fix']`
-(discover formatter options with `dartfmt -h`)
-
-
-SYNTAX HIGHLIGHTING                              *dart-syntax*
-
-This plugin uses narrow highlight groups to allow selectively disabling the
-syntax highlights. Link any of the following groups to the `Normal` highlight
-group to disable them:
-
-`dartSdkException`: Capitalized exception or error classes defined in the SDK.
-
-`dartCoreType`: `void`, `var`, `dynamic`
-
-`dartSdkClass`: Capitalized classes defined in the SDK, along with `bool`,
-`int`, `double`, and `num`.
-
-`dartUserType`: Any capitalized identifier.
-
-`dartType`: Combines `dartCoreType`, `dartSdkClass`, and `dartUserType`.
-
-`dartSdkTypedef`: SDK defined `typdef`s.
-
-`dartFunction`: Any lower cased identifier preceding an open parenthesis.
-
-For example, to remove the highlighting for type and function names:
->
- highlight link dartType Normal
- highlight link dartFunction Normal
-<
-
- vim:tw=78:sw=4:ts=8:ft=help:norl:
-
-endif
diff --git a/doc/dhall.txt b/doc/dhall.txt
deleted file mode 100644
index 8c5f37a56..000000000
--- a/doc/dhall.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dhall') == -1
-
-*dhall* Dhall syntax highlighting for Vim
-                        ____
-=====================================================================
-CONTENTS                                              *DhallContents*
-
-    1. Config ......................................... ❘DhallConfig❘
-    2. License ....................................... ❘DhallLicense❘
-
-======================================================================
-Section 1: Config                                        *DhallConfig*
-
-----------------------------------------------------------------------
-                                                 *'g:dhall_use_ctags'*
-Values: 0, 1
-Default: ''
-
-Generate tags file for vim on write, using universal ctags. >
-    let g:dhall_use_ctags=1
-<
-
-                                                    *'g:dhall_format'*
-Values: 0, 1
-Default: ''
-
-Format Dhall files on write >
-    let g:dhall_format=1
-<
-                                          *'g:dhall_strip_whitespace'*
-Values: 0, 1
-Default: ''
-
-To enable whitespace stripping >
-    let g:dhall_strip_whitespace=1
-<
-
-======================================================================
-Section 2: License                                      *DhallLicense*
-
-This plugin is licensed under the BDS3 license.
-
-endif
diff --git a/doc/elixir.txt b/doc/elixir.txt
deleted file mode 100644
index eb482a30e..000000000
--- a/doc/elixir.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-
-*elixir.txt*	Vim configuration files for Elixir http://elixir-lang.org/
-
-Author: Plataformatec
-License: Apache License Version 2.0
-
-==============================================================================
-CONTENTS					*elixir-contents*
-
-INTRODUCTION			|elixir-introduction|
-INTERFACE			|elixir-interface|
-  FUNCTIONS			  |elixir-functions|
-  KEY MAPPINGS			  |elixir-key-mappings|
-OPTIONS				|elixir-options|
-SETTINGS			|elixir-settings|
-
-==============================================================================
-INTRODUCTION					*elixir-introduction*
-
-*elixir* provides Vim configuration files for Elixir http://elixir-lang.org/
-
-* Syntax highlighting for Elixir and EEx files
-* Filetype detection for `.ex`, `.exs`, `.eex` and `.leex` files
-* Automatic indentation
-* Integration between Ecto projects and |vim-dadbod| for running SQL queries
-  on defined Ecto repositories
-
-
-Latest Version:
-https://github.com/elixir-editors/vim-elixir
-
-
-==============================================================================
-INTERFACE					*elixir-interface*
-
-------------------------------------------------------------------------------
-FUNCTIONS					*elixir-functions*
-
-db#adapter#ecto#canonicalize({url})	*db#adapter#ecto#canonicalize()*
-	TODO
-
-db#adapter#ecto#complete_opaque({url})	*db#adapter#ecto#complete_opaque()*
-	TODO
-
-elixir#indent#indent({lnum})		*elixir#indent#indent()*
-	TODO
-
-elixir#indent#searchpair_back_skip()	*elixir#indent#searchpair_back_skip()*
-	TODO
-
-				*elixir#indent#handle_top_of_file()*
-elixir#indent#handle_top_of_file({context})
-	TODO
-
-				*elixir#indent#handle_follow_prev_nb()*
-elixir#indent#handle_follow_prev_nb({context})
-	TODO
-
-		*elixir#indent#handle_following_trailing_binary_operator()*
-elixir#indent#handle_following_trailing_binary_operator({context})
-	TODO
-
-				*elixir#indent#handle_starts_with_pipe()*
-elixir#indent#handle_starts_with_pipe({context})
-	TODO
-
-				*elixir#indent#handle_starts_with_end()*
-elixir#indent#handle_starts_with_end({context})
-	TODO
-
-			*elixir#indent#handle_starts_with_binary_operator()*
-elixir#indent#handle_starts_with_binary_operator({context})
-	TODO
-
-				*elixir#indent#handle_inside_block()*
-elixir#indent#handle_inside_block({context})
-	TODO
-
-				*elixir#indent#handle_inside_generic_block()*
-elixir#indent#handle_inside_generic_block({context})
-	TODO
-
-elixir#util#get_filename({word})	*elixir#util#get_filename({word})*
-	TODO
-
-
-------------------------------------------------------------------------------
-KEY MAPPINGS					*elixir-key-mappings*
-
-TODO
-
-
-
-==============================================================================
-SETTINGS					*elixir-settings*
-
-					*g:eelixir_default_subtype*
-	TODO
-
-					*g:elixir_indent_debug*
-	TODO
-
-					*g:elixir_indent_max_lookbehind*
-	TODO
-
-					*g:elixir_use_markdown_for_docs*
-	TODO
-
-					*g:path*
-	TODO
-
-==============================================================================
-vim:tw=78:fo=tcq2mM:ts=8:ft=help:norl
-
-endif
diff --git a/doc/ft-csv.txt b/doc/ft-csv.txt
deleted file mode 100644
index 7ef33464a..000000000
--- a/doc/ft-csv.txt
+++ /dev/null
@@ -1,1768 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csv') == -1
-
-*ft-csv.txt*	For Vim version 7.4	Last Change: Thu, 15 Jan 2015
-
-Author:		Christian Brabandt <cb@256bit.org>
-Version:	0.31
-Homepage:	http://www.vim.org/scripts/script.php?script_id=2830
-
-The VIM LICENSE applies to the CSV filetype plugin (see |copyright|).
-NO WARRANTY, EXPRESS OR IMPLIED.  USE AT-YOUR-OWN-RISK.
-                                                           *csv-toc*
-1. Introduction.................................|csv-intro|
-2. Installation.................................|csv-installation|
-3. CSV Commands.................................|csv-commands|
-    3.1 WhatColumn..............................|WhatColumn_CSV|
-    3.2 NrColumns...............................|NrColumns_CSV|
-    3.3 SearchInColumn..........................|SearchInColumn_CSV|
-    3.4 HiColumn................................|HiColumn_CSV|
-    3.5 ArrangeColumn...........................|ArrangeColumn_CSV|
-    3.6 UnArrangeColumn.........................|UnArrangeColumn_CSV|
-    3.7 DeleteColumn............................|DeleteColumn_CSV|
-    3.8 InitCSV.................................|InitCSV|
-    3.9 Header..................................|Header_CSV|
-    3.10 Sort...................................|Sort_CSV|
-    3.11 CopyColumn.............................|Copy_CSV|
-    3.12 MoveColumn.............................|MoveCol_CSV|
-    3.13 Sum of a column........................|SumCol_CSV|
-    3.14 Create new records ....................|NewRecord_CSV|
-    3.15 Change the delimiter...................|NewDelimiter_CSV|
-    3.16 Check for duplicate records............|Duplicate_CSV|
-    3.17 Normal mode commands...................|csv-mapping|
-    3.18 Convert CSV file.......................|csv-convert|
-    3.19 Dynamic filters........................|csv-filter|
-    3.20 Analyze a column.......................|csv-analyze|
-    3.21 Vertical Folding.......................|csv-vertfold|
-    3.22 Transposing columns....................|csv-transpose|
-    3.23 Transforming into a table..............|csv-tabularize|
-    3.24 Add new empty columns..................|AddColumn_CSV|
-    3.25 Substitute in columns..................|Substitute_CSV|
-    3.26 Count values inside a column...........|Count_CSV|
-    3.27 Maximum/Minimum values ................|MaxCol_CSV|
-    3.28 Average values.........................|AvgCol_CSV|
-    3.29 Variance of a Column...................|VarCol_CSV|
-    3.30 Standard Deviation of a Column.........|StdDevCol_CSV|
-    3.31 Duplicate columns......................|DupColumn_CSV|
-    3.32 Column width...........................|ColumnWidth_CSV|
-4. CSV Filetype configuration...................|csv-configuration|
-    4.1 Delimiter...............................|csv-delimiter|
-    4.2 Column..................................|csv-column|
-    4.3 HiGroup.................................|csv-higroup|
-    4.4 Strict Columns..........................|csv-strict|
-    4.5 Concealing..............................|csv-conceal|
-    4.6 Newlines................................|csv-newline|
-    4.7 Highlight column automatically..........|csv-hicol|
-    4.8 Fixed width columns.....................|csv-fixedwidth|
-        4.8.1 Manual setup
-        4.8.2 Setup using a Wizard
-    4.9 CSV Header lines........................|csv-header|
-    4.10 Number format..........................|csv-nrformat|
-    4.11 Move folded lines......................|csv-move-folds|
-    4.12 Using Comments.........................|csv-comments|
-    4.13 Size and performance considerations....|csv-size|
-5. Functions....................................|CSV-Functions|
-    5.1 CSVPat()................................|CSVPat()|
-    5.2 CSVField()..............................|CSVField()|
-    5.3 CSVCol()................................|CSVCol()|
-    5.4 CSVSum()................................|CSVSum()|
-    5.5 CSVCount()..............................|CSVCount()|
-    5.6 CSVMax()................................|CSVMax()|
-    5.7 CSVMin()................................|CSVMin()|
-    5.8 CSVAvg()................................|CSVAvg()|
-    5.9 CSVWidth()..............................|CSVWidth()|
-6. CSV Tips and Tricks..........................|csv-tips|
-    6.1 Statusline..............................|csv-stl|
-    6.2 Slow CSV plugin.........................|csv-slow|
-    6.3 Defining custom aggregate functions.....|csv-aggregate-functions|
-    6.4 Autocommand on opening/closing files....|csv-arrange-autocmd|
-    6.5 CSV Syntax error........................|csv-syntax-error|
-    6.6 Calculating new column values...........|csv-calculate-column|
-    6.7 Using the result of an evaluation.......|b:csv_result|
-7. CSV Changelog................................|csv-changelog|
-
-==============================================================================
-1. Introduction                                                    *csv-intro*
-
-This plugin is used for handling column separated data with Vim. Usually those
-files are called csv files and use the ',' as delimiter, though sometimes they
-use e.g. the '|' or ';' as delimiter and there also exists fixedwidth columns.
-The aim of this plugin is to ease handling these kinds of files.
-
-This is a filetype plugin for CSV files. It was heavily influenced by
-the Vim Wiki Tip667 (http://vim.wikia.com/wiki/VimTip667), though it
-works differently. For instructions on installing this file, type
-:help add-local-help |add-local-help| inside Vim. For a screenshot, of
-how the plugin can be used, see http://www.256bit.org/~chrisbra/csv.gif
-
-It will make use of the |+vartabs| feature for tab delimited files to arrange
-them automatically.
-
-==============================================================================
-2. Installation						*csv-installation*
-
-In order to have vim automatically detect csv files, you need to have
-|ftplugins| enabled (e.g. by having this line in your |.vimrc| file: >
-
-   :filetype plugin on
-
-<
-The plugin already sets up some logic to detect CSV files. By default,
-the plugin recognizes *.csv and *.dat files as CSV filetype. In order that the
-CSV filetype plugin is loaded correctly, vim needs to be enabled to load
-|filetype-plugins|. This can be ensured by putting a line like this in your
-|.vimrc|: >
-    :filetype plugin on
-<
-(see also |filetype-plugin-on|).
-
-In case this did not work, you need to setup vim like this:
-
-To have Vim automatically detect csv files, you need to do the following.
-
-   1) Create your user runtime directory if you do not have one yet. This
-      directory needs to be in your 'runtime' path. In Unix this would
-      typically the ~/.vim directory, while in Windows this is usually your
-      ~/vimfiles directory. Use :echo expand("~") to find out, what Vim thinks
-      your user directory is.
-      To create this directory, you can do: >
-
-      :!mkdir ~/.vim
-<
-      for Unix and >
-
-      :!mkdir ~/vimfiles
-<
-      for Windows.
-
-   2) In that directory you create a file that will detect csv files. >
-
-    if exists("did_load_csvfiletype")
-      finish
-    endif
-    let did_load_csvfiletype=1
-
-    augroup filetypedetect
-      au! BufRead,BufNewFile *.csv,*.dat	setfiletype csv
-    augroup END
-<
-      You save this file as "filetype.vim" in your user runtime diretory: >
-
-        :w ~/.vim/filetype.vim
-<
-   3) To be able to use your new filetype.vim detection, you need to restart
-      Vim. Vim will then  load the csv filetype plugin for all files whose
-      names end with .csv.
-
-==============================================================================
-3. Commands							*csv-commands*
-
-The CSV ftplugin provides several Commands. All commands are also provided
-with the prefix :CSV (e.g. |:CSVNrColumns|)
-
-                                                            *:CSVWhatColumn*
-3.1 WhatColumn                                                *WhatColumn_CSV*
---------------
-
-If you would like to know, on which column the cursor is, use >
-    :WhatColumn
-<
-or >
-    :CSVWhatColumn
-<
-Use the bang attribute, if you have a heading in the first line and you want
-to know the name of the column in which the cursor is: >
-    :WhatColumn!
-<
-                                                            *:CSVNrColumns*
-3.2 NrColumns                                                 *NrColumns_CSV*
---------------
-
-`:NrColumns` and `:CSVNrColumns` outputs the maximum number of columns
-available. It does this by testing the first 10 lines for the number of
-columns. This usually should be enough. If you use the '!' attribute, it
-outputs the number of columns in the current line.
-
-                                                        *:CSVSearchInColumn*
-3.3 SearchInColumn                                        *SearchInColumn_CSV*
-------------------
-
-Use `:SearchInColumn` or `:CSVSearchInColumn` to search for a pattern within a
-specific column. The usage is: >
-
-    :SearchInColumn [<nr>] /{pat}/
-<
-
-So if you would like to search in Column 1 for the word foobar, you enter >
-
-    :SearchInColumn 1 /foobar/
-
-Instead of / as delimiter, you can use any other delimiter you like. If you
-don't enter a column, the current column will be used.
-
-                                                            *:CSVHiColumn*
-3.4 HiColumn                                                    *HiColumn_CSV*
-------------
-
-`:HiColumn` or `:CSVHiColumn` <nr> can be used to highlight Column <nr>.
-Currently the plugin uses the WildMenu Highlight Group. If you would like to
-change this, you need to define the variable |g:csv_hiGroup|.
-
-If you do not specify a <nr>, HiColumn will highlight the column on which the
-cursor is. Use >
-
-    :HiColumn!
-
-to remove any highlighting.
-
-If you want to automatically highlight a column, see |csv-hicol|
-
-                                            *:ArrangeColumn* *:CSVArrangeColumn*
-3.5 ArrangeColumn                                          *ArrangeColumn_CSV*
------------------
-
-If you would like all columns to be visually arranged, you can use the
-`:ArrangeColumn` or `:CSVArrangeColumn` command: >
-
-    :[range]ArrangeColumn[!] [<Row>]
-
-Beware, that this will change your file and depending on the size of
-your file may slow down Vim significantly. This is highly experimental.
-:ArrangeCommand will try to vertically align all columns by their maximum
-column size. While the command is run, a progressbar in the statusline 'stl'
-will be shown.
-
-Use the bang attribute to force recalculating the column width. This is
-slower, but especially if you have modified the file, this will correctly
-calculate the width of each column so that they can be correctly aligned. If
-no column width has been calculated before, the width will be calculated, even
-if the '!' has not been given.
-
-If <Row> is given, will use the Row, to calculate the width, else will
-calculate the maximum of at least the first 10,000 rows to calculate the
-width. The limit of 10,000 is set to speed up the processing and can be
-overriden by setting the "b:csv_arrange_use_all_rows" variable (see below).
-
-If [range] is not given, it defaults to the current line.
-
-							*csv_arrange_align*
-By default, the columns will be right-aligned. If you want a different
-alignment you need to specify this through the b:csv_arrange_align variable.
-This is a string of flags ('r': right align, 'l': left align, 'c': center
-alignment, '.': decimal alignment) where each flag defines the alignment for
-a particular column (starting from left). Missing columns will be right aligned.
-You can use '*' to repeat the previous value until the end.
-So this: >
-
-    :let b:csv_arrange_align = 'lc.'
-<
-Will left-align the first column, center align the second column, decimal
-align the third column and all following columns right align. (Note: decimal
-aligning might slow down Vim and additionally, if the value is no decimal
-number it will be right aligned).
-And this: >
-
-    :let b:csv_arrange_align = 'l*'
-
-Will left align all columns.
-
-If you change the alignment parameter, you need to use the "!" attribute, the
-next time you run the |:ArrangeCol| command, otherwise for performance
-reasons, it won't be considered.
-
-Note, arranging the columns can be very slow on large files or many columns (see
-|csv-slow| on how to increase performance for this command). For large files,
-calculating the column width can take long and take a considerable amount of
-memory. Therefore, the csv plugin will at most check 10.000 lines for the
-width. Set the variable b:csv_arrange_use_all_rows to 1 to use all records: >
-
-    :let b:csv_arrange_use_all_rows = 1
-<
-(this could however in the worst case lead to a crash).
-
-To disable the statusline progressbar set the variable g:csv_no_progress: >
-
-    :let g:csv_no_progress = 1
-<
-This will disable the progressbar and slightly improve performance (since no
-additional redraws are needed).
-
-Note: this command does not work for fixed width columns |csv-fixedwidth|
-
-See also |csv-arrange-autocmd| on how to have vim automatically arrange a CSV
-file upon entering it.
-
-By default, all lines in the file are considered to calculate the column width.
-If you want to ignore some lines at the beginning of the file, set the global
-variable g:csv_skipfirst to the number of lines to be ignored, e.g. the first
-line of the file can be ignored with >
-
-    :let g:csv_skipfirst = 1
-<
-Then use the '!' to force recalculation of column width when applying 
-:ArrangeColumn
-
-                                                        *:CSVUnArrangeColumn*
-3.6 UnArrangeColumn                                    *UnArrangeColumn_CSV*
------------------
-
-If you would like to undo a previous :ArrangeColumn command, you can use this
-`:UnArrangeColumn` or `:CSVUnArrangeColumn` command: >
-
-    :[range]UnArrangeColumn
-
-Beware, that is no exact undo of the :ArrangeColumn command, since it strips
-away all leading blanks for each column. So if previously a column contained
-only some blanks, this command will strip all blanks.
-
-If [range] is given, it defaults to the current line.
-
-                                                        *:CSVDeleteColumn*
-3.7 DeleteColumn                                           *DeleteColumn_CSV*
-----------------
-
-The command `:DeleteColumn` or `:CSVDeleteColumn` can be used to delete a specific column. >
-
-    :DeleteColumn 2
-
-will delete column 2. If you use `:DeleteColumn 2-3` columns 2 and 3 will be
-deleted.
-
-If you don't specify a column number, it will delete the column on which the
-cursor is. Alternatively, you can also specify a search string. The plugin
-will then delete all columns that match the pattern: >
-
-    :DeleteColumn /foobar
-<
-will delete all columns where the pattern "foobar" matches.
-
-                                                                *:CSVInit*
-                                                                *:InitCSV*
-3.8 CSVInit
------------
-Reinitialize the Plugin. Use this, if you have changed the configuration
-of the plugin (see |csv-configuration| ).
-If you use the bang (!) attribute, it will keep the b:delimiter configuration
-variable.
-
-                                                                *:CSVHeader*
-3.9 Header lines						 *Header_CSV*
-----------------
-The `:Header` or `:CSVHeader` command splits the csv-buffer and adds a window,
-that holds a small fraction of the csv file. This is useful, if the first line
-contains some kind of a heading and you want always to display it. This works
-similar to fixing a certain line at the top. As optional argument, you can
-give the number of columns from the top, that shall be displayed. By default,
-1 is used (You can define your own default by setting the b:csv_headerline
-variable, see |csv-header|). Use the '!' to close this window. So this >
-
-    :Header 3
-
-opens at the top a split window, that holds the first 3 lines, is fixed
-and horizontally 'scrollbind'ed to the csv window and highlighted using the
-CSVHeaderLine highlighting.
-To close the header window, use >
-
-    :Header!
-
-Note, this won't work with linebreaks in the column.
-
-Note also, that if you already have a horizontal header window (|VHeader_CSV|),
-this command will close the horizontal Header window. This is because of a
-limitation of Vim itself, which doesn't allow to sync the scrolling between
-two windows horizontally and at the same time have another window only sync
-its scrolling vertically.
-
-Note: this command does not work for fixed width columns |csv-fixedwidth|
-
-                                                *:CSVVHeader* *VHeader_CSV*
-If you want a vertical header line, use `:VHeader` or `:CSVVHeader`. This works
-similar to the |Header_CSV| command, except that it will open a vertical split
-window with the first column always visible. It will always open the first
-column in the new split window. Use the '!' to close the window. If you
-specify a count, that many columns will be visible (default: the first). Add
-the bang to the count, if you only want the specific column to be visible.
->
-    :VHeader 2
-<
-This will open a vertical split window containing the first 2 columns, while
->
-    :VHeader 2!
-<
-Opens a new vertical split window containing only the 2 second column.
-
-Note, this won't work with linebreaks in the column.
-Note also: this command does not work for fixed width columns |csv-fixedwidth|
-
-
-                                        *:CSVVHeaderToggle* *:CSVHeaderToggle*
-                                        *VHeaderToggle_CSV* *HeaderToggle_CSV*
-Use the `:HeaderToggle` and `:VHeaderToggle` command to toggle displaying the
-horizontal or vertical header line. Alternatively, use `:CSVHeaderToggle` or
-`:CSVVHeaderToggle`
-
-
-                                                                *:CSVSort*
-3.10 Sort							*Sort_CSV*
----------
-The command `:Sort` or `:CSVSort` can be used to sort the csv file on a
-certain column. If no range is given, is sorts the whole file. Specify the
-column number to sort on as argument. Use the '!' attribute to reverse the
-sort order. For example, the following command sorts line 1 til 10 on the 3
-column >
-
-    :1,10Sort 3
-
-While this command >
-
-    :1,10Sort! 3
-
-reverses the order based on column 3.
-
-The column number can be optionally followed by any of the flags [i], [n],
-[x] and [o] for [i]gnoring case, sorting by [n]umeric, he[x]adecimal
-or [o]ctal value.
-
-When no column number is given, it will sort by the column, on which the
-cursor is currently.
-
-                                                                *:CSVColumn*
-3.11 Copy Column        					 *Copy_CSV*
-----------------
-If you need to copy a specific column, you can use the command `:CSVColumn` or
-`:Column` >
-
-    :[N]Column [a]
-
-Copy column N into register a. This will copy all the values, that are
-not folded-away (|csv-filter|) and skip comments.
-
-If you don't specify N, the column of the current cursor position is used.
-If no register is given, the default register
-|quotequote| is used.
-
-                                                                *:CSVMoveCol*
-3.12 Move A Column        					 *MoveCol_CSV*
-------------------
-You can move one column to the right of another column by using the
-`:CSVMoveColumn` or `:MoveColumn` command >
-
-    :[range]MoveColumn [source] [dest]
-
-This moves the column number source to the right of column nr destination. If
-both arguments are not given, move the column on which the cursor is to the
-right of the current last column. If [range] is not given, MoveColumn moves
-the entire column, otherwise, it moves the columns only for the lines within
-the range, e.g. given that your first line is a header line, which you don't
-want to change >
-
-    :2,$MoveColumn 1 $
-
-this would move column 1 behind the last column, while keeping the header line
-as is.
-
-
-                                                                *:CSVSumCol*
-3.13 Sum of a Column        					 *SumCol_CSV*
---------------------
-You can let Vim output the sum of a column using the `:CSVSumCol` or `:SumCol`
-command >
-
-    :[range]SumCol [nr] [/format/]
-
-This outputs the result of the column <nr> within the range given. If no range
-is given, this will calculate the sum of the whole column. If <nr> is not
-given, this calculates the sum for the column the cursor is on. Note, that the
-delimiter will be stripped away from each value and also empty values won't be
-considered.
-
-By default, Vim uses the a numerical format that uses the '.' as decimal
-separator while there is no thousands separator. If youre file contains
-the numbers in a different format, you can use the /format/ option to specify
-a different thousands separator or a different decimal separator. The format
-needs to be specified like this:
-    /x:y/
-where 'x' defines the thousands separator and y defines the decimal
-separator and each one is optional. This means, that >
-
-    :SumCol 1 /:,/
-
-uses the default thousands separator and ',' as the decimal separator and >
-
-    :SumCol 2 / :./
-
-uses the Space as thousands separator and the '.' as decimal separator.
-
-Note, if you Vim is compiled without floating point number format (|+float|),
-Vim will only aggregate the integer part and therefore won't use the 'y'
-argument in the /format/ specifier.
-
-See also |csv-aggregate-functions|
-
-                                                            *:CSVNewRecord*
-3.14 Create new Records                                      *NewRecord_CSV*
------------------------
-If you want to create one or several records, you can use the `:NewRecord` or
-`:CSVNewRecord` command: >
-
-    :[range]NewRecord [count]
-
-This will create in each line given by range [count] number of new empty
-records. If [range] is not specified, creates a new line below the line the
-cursor is on and if count is not given, it defaults to 1.
-
-
-                                                            *:CSVNewDelimiter*
-3.15 Change the delimiter                                    *NewDelimiter_CSV*
--------------------------
-If you want to change the field delimiter of your file you can use the
-`:CSVNewDelimiter` or `:NewDelimiter` command: >
-
-    :NewDelimiter char
-
-This changes the field delimiter of your file to the new delimiter "char".
-Note: Will remove trailing delimiters.
-
-                                                            *:CSVDuplicate*
-3.16 Check for duplicate records                            *Duplicate_CSV*
---------------------------------
-If you want to check the file for duplicate records, use the command
-`:Duplicate` or `:CSVDuplicate`: >
-
-    :Duplicate columnlist
-<
-
-Columnlist needs to be a numeric comma-separated list of all columns that you
-want to check. You can also use a range like '2-5' which means the plugin
-should check columns 2,3,4 and 5.
-
-If the plugin finds a duplicate records, it outputs its line number (but it
-only does that at most 10 times).
-
-3.17 Normal mode commands					 *csv-mapping*
--------------------------
-The csv filetype plugin redefines the following keys (in normal Mode) as:
-
-<C-Right> or L or W	Move [count] field forwards
-
-<C-Left> or E or H	Move [count] field backwards (but see |csv-mapping-H| 
-                        for the movement of H).
-
-<Up> or K		Move [count] lines upwards within the same column
-
-<Down> or J		Move [count] lines downwards within the same column
-
-The upwards and downwards motions try to keep the cursor in the relative
-position within the cell when changing lines. That is not a guaranteed to work
-and will fail if the upper/lower cell is of a different width than the
-starting cell.
-
-<Enter>                 Dynamically fold all lines away, that don't match
-                        the value in the current column. See |csv-filter|
-
-                        In |Replace-mode| and |Virtual-Replace-mode| does not
-                        create a new row, but instead moves the cursor to the
-                        beginning of the same column, one more line below.
-
-<Space>                 Dynamically fold all lines away, that match
-                        the value in the current column. See |csv-filter|
-
-<BS>                    Remove last item from the dynamic filter.
-                        See |csv-filter|
-
-                                                    *csv-mapping-H*
-Note how the mapping of 'H' differs from 'E'
-
-H step fields backwards but also stops at where the content of the columns
-begins.
-
-If you look into this example (with the cursor being '|')
-
-    aaa,   bbbb,|ccc `
-
-Pressing 'H' moves to
-
-    aaa,   |bbbb,ccc `
-
-Pressing 'H' again moves to
-
-    aaa,|   bbbb,ccc `
-
-Pressing 'H' again moves to 
-
-    |aaa,   bbbb,ccc `
-
-While with 'E', the cursor moves to: 
-
-     aaa,|  bbbb,ccc `
-
-and pressing  'E' again, it would move directly to 
-
-    |aaa,   bbbb,ccc `
-
-                                                            *csv-textobjects*
-Also, the csv plugin defines these text-object:
-
-if                      Inner Field (contains everything up to the delimiter)
-af                      Outer Field (contains everything up to and including
-                        the delimiter)
-iL                      Inner Line (visually linewise select all lines, that
-                        has the same value at the cursor's column)
-
-Note, that the <BS>, <CR>, K and J overlap Vim's default mapping for |<CR>|,
-|<BS>|, |J| and |K| respectively. Therefore, this functionality has been
-mapped to a sane default of <Localleader>J and <LocalLeader>K. If you haven't
-changed the |<Leader>| or |<LocalLeader>| variables, those the <Localleader>
-is equival to a single backslash '\', e.g. \K would run the lookup function on
-the word under the cursor and \J would join this line with the previous line.
-
-If you want to prevent the mapping of keys, simply set the global variable
-g:csv_nomap_<key> to 1, (remove the special characters `<>` and replace `-` by
-`_`), e.g. to prevent mapping of <CR> and <C-Left> in csv files, put >
-
-    let g:csv_nomap_cr = 1
-    let g:csv_nomap_c_left = 1
-<
-into your |.vimrc|. Note, the keyname must be lower case.
-
-Also the csv plugins follows the general consensus, that when the variable
-g:no_plugin_maps or g:no_csv_maps is set, no key will be mapped.
-
-
-                                           *:CSVConvertData* *ConvertData_CSV*
-3.18 Converting a CSV File					 *csv-convert*
---------------------------
-You can convert your CSV file to a different format with the `:ConvertData`
-or `:CSVConvertData` command >
-
-    ConvertData
-
-Use the the ! attribute, to convert your data without the delimiter.
-
-This command will interactively ask you for the definition of 3 variables.
-After which it will convert your csv file into a new format, defined by those
-3 variables and open the newly created file in a new window. Those 3 variables
-define how the text converted.
-
-First, You need to define what has to be done, before converting your column
-data. That is done with the "pre convert" variable. The content of this
-variable will be put in front of the new document.
-
-Second, you define, what has to be put after the converted content of your
-column data. This happens with the "post convert" variable. Basically the
-contents of this variable will be put after processing the columns.
-
-Last, the columns need to be converted into your format. For this you can
-specify a printf() format like string, that defines how your data will be
-converted. You can use '%s' to specify placeholders, which will later be
-replaced by the content of the actual column.
-
-For example, suppose you want to convert your data into HTML, then you first
-call the >
-
-    :ConvertData
-
-At this point, Vim will ask you for input. First, you need to specify, what
-needs to be done before processing the data:
-
-    Pre convert text: <html><body><table> `
-
-This would specify to put the HTML Header before the actual data can be
-processed. If the variable g:csv_pre_convert is already defined, Vim will
-already show you its' content as default value. Simply pressing Enter will use
-this data. After that, Vim asks, what the end of the converted file needs to
-look like:
-
-    Post convert text: </table></body></html> `
-
-So here you are defining how to finish up the HTML file. If the variable
-g:csv_post_convert is already defined, Vim will already show you its' content
-as default value which you can confirm by pressing Enter. Last, you define,
-how your columns need to be converted. Again, Vim asks you for how to do that:
-
-    Converted text, use %s for column input: `
-    <tr><td>%s</td><td>%s</td><td>%s</td></tr>
-
-This time, you can use '%s' expandos. They tell Vim, that they need to be
-replaced by the actual content of your file. It does by going from the first
-column in your file and replacing it with the corresponding %s in that order.
-If there are less '%s' expandos than columns in your file, Vim will skip the
-columns, that are not used. Again If the variable g:csv_convert is already
-defined, Vim will already show you its' content as default value which you can
-confirm by pressing Enter.
-
-After you hit Enter, Vim will convert your data and put it into a new window.
-It may look like this:
-
-    <html><body><table> `
-    <tr><td>1,</td><td>2,</td><td>3,</td></tr> `
-    <tr><td>2,</td><td>2,</td><td>4,</td></tr> `
-    </table></body></html> `
-
-Note, this is only a proof of concept. A better version of converting your
-data to HTML is bundled with Vim (|:TOhtml|).
-
-But may be you want your data converted into SQL-insert statements. That could
-be done like this: >
-
-    ConvertData!
-<
-    Pre convert text: `
-
-(Leave this empty. It won't be used).
-
-    Post convert text: Commit; `
-
-After inserting the data, commit it into the database.
-
-    Converted text, use %s for column input: `
-    Insert into table foobar values ('%s', '%s', %s); `
-
-Note, that the last argument is not included within single quotation marks,
-since in this case the data is assumed to be integer and won't need to be
-quoted for the database.
-
-After hitting Enter, a new Window will be opened, which might look like this:
-
-    Insert into table foobar values('Foobar', '2', 2011); `
-    Insert into table foobar values('Bar', '1', 2011); `
-    Commit; `
-
-Since the command was used with the bang attribute (!), the converted data
-doesn't include the column delimiters.
-
-Now you can copy it into your database, or further manipulate it.
-
-3.19 Dynamic filters      					 *csv-filter*
---------------------
-If you are on a value and only want to see lines that have the same value in
-this column, you can dynamically filter the file and fold away all lines not
-matching the value in the current column. To do so, simply press <CR> (Enter).
-Now Vim will fold away all lines, that don't have the same value in this
-particular row. Note, that leading blanks and the delimiter is removed and the
-value is used literally when comparing with other values. If you press <Space>
-on the value, all fields having the same value will be folded away.
-Pressing <BS> will remove the last item from the dynamic filter. To remove all
-filters, keep pressing <BS> until no more filters are present.
-
-The way this is done is, that the value from the column is extracted and a
-regular expression for that field is generated from it. In the end this
-regular expression is used for folding the file.
-
-A subsequent <CR> or <Space> on another value, will add this value to the
-current applied filter (this is like using the logical AND between the
-currently active filter and the new value). To remove the last item from the
-filter, press <BS> (backspace). If all items from the filter are removed,
-folding will be disabled.
-
-If some command messes up the folding, you can use |zX| to have the folding
-being reinitialized.
-
-By default, the first line is assumed to be the header and won't be folded
-away. See also |csv-header|.
-
-If you have set the g:csv_move_folds variable and the file is modifiable, all
-folded lines will be moved to the end of the file, so you can view all
-non-folded lines as one consecutive area  (see also |csv-move-folds|)
-
-                                           *:CSVFilter* *:Filter* *Filter_CSV*
-To see the active filters, you can use the `:Filter` or `:CSVFilter` command.
-This will show you a small summary, of what filters are active and looks like
-this:
-
-Nr      Match   Col           Name              Value ~
-===================================================== `
-01       -       07          Price              23.10 `
-02       +       08            Qty                 10 `
-
-This means, there are two filters active. The current active filter is on
-column 7 (column name is Price) and all values that match 23.10 will be folded
-away AND all values that don't match a value of 10 in the QTY column will also
-be folded away.
-When removing one item from the filter by pressing <BS>, it will always remove
-the last item (highest number in NR column) from the active filter values.
-
-Note, that depending on your csv file and the number of filters you used,
-applying the filter might actually slow down vim, because a complex regular
-expression is generated that is applied by the fold expression. Look into the
-@/ (|quote_/|) register to see its value.
-
-Use |zX| to apply the current value of your search register as filter. Use >
-
-    :Filters!
-
-to reapply all values from the current active filter and fold non-matching
-items away.
-
-                                                    *:CSVAnalyze* *Analyze_CSV*
-3.20 Analyze a Column       					 *csv-analyze*
----------------------
-If you'd like to know, how the values are distributed among a certain column,
-you can use the `:CSVAnalyze` or `:Analyze` command. So >
-
-    :Analyze 3
-
-outputs the the distribution of the top 5 values in column 3. This looks like
-this:
-
-Nr      Count    %      Value ~
-============================= `
-01      20      50%     10    `
-02      10      25%     2     `
-03      10      25%     5     `
-
-This tells you, that the the value '10' in column 3 occurs 50% of the time
-(exactly 20 times) and the other 2 values '2' and '5' occur only 10 times, so
-25% of the time.
-
-In addition, a second argument may be used to specify the number of top values.
-So 
-
-    :Analyze 3 10
-
-outputs the the distribution of the top 10 values in column 3, respectively.
-
-                                                 *:CSVVertFold* *VertFold_CSV*
-3.21 Vertical Folding       					 *csv-vertfold*
----------------------
-Sometimes, you want to hide away certain columns to better view only certain
-columns without having to horizontally scroll. You can use the `:CSVVertFold`
-or `:VertFold` command to hide certain columns: >
-
-    :VertFold [<nr>]
-<
-This will hide all columns from the first until the number entered. It
-currently can't hide single columns, because of the way, syntax highlighting
-is used. This command uses the conceal-feature |:syn-conceal| to hide away
-those columns. If no nr is given, hides all columns from the beginning till
-the current column.
-
-Use >
-    :VertFold!
-
-to display all hidden columns again.
-
-                                                *:CSVTranspose* *Transpose_CSV*
-3.22 Transposing a column                                      *csv-transpose*
--------------------------
-Transposing means to exchange rows and columns. You can transpose the csv
-file, using the `:CSVTranspose` or `:Transpose` : >
-
-    :[range]Transpose
-<
-command. If [range] is not given, it will transpose the complete file,
-otherwise it will only transpose the lines in the range given. Note, comments
-will be deleted and transposing does not work with fixed-width columns.
-
-                                                          *:CSVTabularize*
-3.23 Transforming into a table                      *:CSVTable* *csv-tabularize*
-------------------------------
-You  can also transform your csv data into a visual table, using the
-`:CSVTabularize` or `:CSVTable`: >
-
-    :CSVTabularize
-<
-command. This will make a frame around your csv data and substitute all
-delimiters by '|', so that it will look like a table.
-
-e.g. consider this data: >
->
-First,Second,Third ~
-10,5,2 `
-5,2,10 `
-2,10,5 `
-10,5,2 `
-
-This will be transformed into: >
-
-    |---------------------|
-    | First| Second| Third|
-    |------|-------|------|
-    |    10|      5|     2|
-    |     5|      2|    10|
-    |     2|     10|     5|
-    |    10|      5|     2|
-    |---------------------|
-
-If your Vim uses an unicode 'encoding', the plugin makes a nice table using
-special unicode drawing glyphs (but it might be possible, that those chars are
-not being displayed correctly, if either your terminal or the gui font doesn't
-have characters for those codepoints). If you use the bang form, each row will
-be separated by a line.
-You can also visual select a range of lines and use :Tabularize to have only
-that range converted into a nice ascii table. Else it try to use the current
-paragraph and try to transform it.
-
-If you use the '!' bang argument, between each row, a line will be drawn.
-
-In csv files, you can also use the :CSVTabularize command, in different
-filetypes you can use the :CSVTable command (and is available as plugin so it
-will be available for non-CSV filetypes).
-
-Set the variable g:csv_table_leftalign=1 if you want the columns to be
-leftaligned.
-
-Note: Each row must contain exactly as many fields as columns.
-
-This command is available as default plugin. To disable this feature, set the 
- variable g:csv_disable_table_command to 1: >
-
-    :let g:csv_disable_table_command = 1
-<
-                                                            *:CSVAddColumn*
-3.24 Add new empty columns                                   *AddColumn_CSV*
---------------------------
-If you want to add new empty columns to your file you can use the
-`:CSVAddColumn` or `:AddColumn` command: >
-
-    :[range]AddColumn [column] [count]
-
-By default, this works for the whole file, but you can give a different range
-to which the AddColumn command applies. If no arguments are given, the new
-empty column will be added after the column on which the cursor is. You can
-however add as first argument the column number after which the new column
-needs to be added.
-
-Additionally, you can also add a count number to add several columns at once
-after the specified column number. Use 0 for the column number, if you want to
-add several columns after the current column.
-
-                                                            *:CSVSubstitute*
-3.25 Substitute in columns                                  *Substitute_CSV*
---------------------------
-If you want to substitute only in specific columns, you can use the
-`:CSVSubstitute` or `:Substitute` command: >
-
-    :[range]Substitute [column/]pattern/string[/flags]
-
-This means in the range and within the given columns replace pattern by
-string. This works basically like the |:s| command, except that you MUST use
-forward slashes / to delimit the command. The optional part `[column/]` can
-take either the form of an address or if you leave it out, substitution will
-only happen in the current column. Additionally, you can use the `1,5/` form
-to substitute within the columns 1 till 5 or you can even use `1,$` which
-means to substitute in each column (so in fact this simplifies to a simple
-`:s` command whithin the given range. For the use of `[/flags]` see |:s_flags|
-Here are some examples: >
-
-    :%Substitute 1,4/foobar/baz/gce
-
-Substitutes in the whole file in columns 1 till 4 the pattern foobar by baz
-for every match ('g' flag) and asks for confirmation ('c' flag).
-
-    :%S 3,$/(\d\+)/\1 EUR/g
-
-Substitutes in each column starting from the third each number and appends the
-EURO suffix to it.
-
-3.26 Count Values inside a Column      				 *Count_CSV*
----------------------------------
-You can let Vim output the number of values inside a column using the `:CSVCountCol` 
-command >
-
-    :[range]CountCol [nr] [distinct]
-
-This outputs the number of [distinct] values visible in the column [nr]
-If [distinct] is not given, count's all values. Note, header rows and folded
-rows won't be counted.
-
-The result is also available in the buffer-local variable `b:csv_result`.
-
-See also |csv-aggregate-functions|
-
-3.27 Maximum/Minimum value of a Column 		*MaxCol_CSV* *MinCol_CSV*
----------------------------------------
-You can let Vim output the 10 maximum/minimum values of a column using the
-`:CSVMaxCol` command >
-
-    :[range]MaxCol [nr][distinct] [/format/]
-    :[range]MinCol [nr][distinct] [/format/]
-
-This outputs the result of the column <nr> within the range given. If no range
-is given, this will calculate the max value of the whole column. If <nr> is not
-given, this calculates the sum for the column the cursor is on. Note, that the
-delimiter will be stripped away from each value and also empty values won't be
-considered.
-
-                                                    *format_number_csv*
-By default, Vim uses the a numerical format that uses the '.' as decimal
-separator while there is no thousands separator. If youre file contains
-the numbers in a different format, you can use the /format/ option to specify
-a different thousands separator or a different decimal separator. The format
-needs to be specified like this:
-    /x:y/
-where 'x' defines the thousands separator and y defines the decimal
-separator and each one is optional. This means, that >
-
-    :MaxCol 1 /:,/
-
-uses the default thousands separator and ',' as the decimal separator and >
-
-    :MaxCol 2 / :./
-
-uses the Space as thousands separator and the '.' as decimal separator.
-
-If [distinct] is given, only returns the number of distinct values.
-
-The result is also available in the buffer-local variable `b:csv_result`.
-
-3.28 Average value of a Column 				*AvgCol_CSV*
-------------------------------
-You can let Vim output the value of a column using the `:CSVAvgCol` command >
-
-    :[range]AvgCol [nr] [/format/]
-
-This outputs the result of the column <nr> within the range given. If no range
-is given, this will calculate the average value of the whole column. If <nr> is not
-given, this calculates the sum for the column the cursor is on. Note, that the
-delimiter will be stripped away from each value and also empty values won't be
-considered.
-
-For the [/format/] part, see |format_number_csv|.
-
-The result is also available in the buffer-local variable `b:csv_result`.
-
-See also |csv-aggregate-functions|
-
-3.29 Variance of a Column 				*VarCol_CSV* *SmplVarCol* *PopVarCol*
-_________________________
-
-    :[range]PopVarCol [nr] [/format/]
-
-    :[range]SmplVarCol [nr] [/format/]
-
-Calculate the Population or Sample Variance for the specified column.
-
-This outputs the result of the column `<nr>` within the range given. If no range
-is given, this will calculate the statistical variance of the whole column. If <nr> is not
-given, this calculates the variance for the column the cursor is on. Note, that the delimiter
-will be stripped away from each value and also empty values won't be considered.
-
-The result is also available in the buffer-local variable `b:csv_result`.
-
-For the [/format/] part, see |format_number_csv|.
-
-3.30 Standard Deviation of a Column *StdDevCol_CSV* *PopStdCol* *SmplStdCol*
-___________________________________
-
-    :[range]PopStdCol [nr] [/format/]
-
-    :[range]SmplStdCol [nr] [/format/]
-
-Calculate the Population or Sample Standard Deviation for the specified column.
-
-This outputs the result of the column `<nr>` within the range given. If no range
-is given, this will calculate the standard deviation of the whole column. If <nr> is not
-given, this calculates the standard deviation for the column the cursor is on. Note, that
-the delimiter will be stripped away from each value and also empty values won't be considered.
-
-The result is also available in the buffer-local variable `b:csv_result`.
-
-For the [/format/] part, see |format_number_csv|.
-
-                                                            *:CSVDupColumn*
-3.31 Duplicate columns                                       *DupColumn_CSV*
-----------------------
-If you want to add duplicate an existing column you can use the
-`:CSVDupColumn` or `:DupColumn` command: >
-
-    :[range]DupColumn [column] [count]
-
-By default, this works for the whole file, but you can give a different range
-to which the command applies. By default it will duplicate the column on which
-the cursor is, but you can add as first argument which column will be duplicated.
-
-Additionally, you can also provide a count to copy several columns at once.
-
-                                                        *ColumnWidth_CSV*
-3.32 Column Width                                       *:CSVColumnWidth*
------------------
-If you want to know the width of each column, you can use the `:CSVColumnWidth` command: >
-
-    :CSVColumnWidth 
-
-This will output the width for each column at the bottom. See also
-|CSVWidth()| function
-
-3.33 Sum of Numbers in a Row	                   				*SumRow_CSV*
-----------------------------
-You can let Vim output the sum of a field in a row using the `:CSVASumRow` command >
-
-    :[range]SumRow [/format/]
-
-This outputs the sum of the row [range]. If no range is given, this will
-calculate the sum for the current row. Note, that the delimiter will be
-stripped away from each value and also empty values won't be considered.
-
-For the [/format/] part, see |format_number_csv|
-==============================================================================
-4. CSV Configuration					 *csv-configuration*
-
-The CSV plugin tries to automatically detect the field delimiter for your
-file, cause although often the file is called CSV (comma separated values), a
-semicolon is actually used. By default the plugin tries the following
-delimiters: ',', ';', '|', '\t', '^', ':'. 
-The column separator is stored in the buffer-local variable b:delimiter. This
-delimiter is heavily used, because you need it to define a column. Almost all
-commands use this variable therefore.
-
-4.1 Delimiter				              	*csv-delimiter*
--------------
-To override the automatic detection of the delimiter and define the separator
-manually, use: >
-
-    :let g:csv_delim=','
-
-to let the comma be the delimiter. This sets the buffer local delimiter
-variable b:delimiter.
-
-You can also set default delimiter to prevent a warning if no delimiter can
-be detected: >
-
-    :let g:csv_default_delim=','
-
-If your file does not consist of delimited columns, but rather is a fixed
-width csv file, see |csv-fixedwidth| for configuring the plugin appropriately.
-
-If you changed the delimiter, you should reinitialize the plugin using
-|InitCSV|
-
-Note: the delimiter will be used to generate a regular expression that matches
-a column. Internally the plugin uses the very-nomagic setting for the
-delimiter, so escaping is not neccessary.
-
-If you want to override which delimiters are probed automatically, set the
-g:csv_delim_test variable like this: >
-        :let g:csv_delim_test = ',;|'
-
-This will only make the plugin test the possible delimiters ',', ';' and '|'.
-This will also make the automatic detection a bit faster, since it does not
-need to test that many delimiters.
-
-4.2 Column							*csv-column*
-----------
-The definition, of what a column is, is defined as buffer-local variable
-b:col. By default this variable is initialized to: >
-
-    let b:col='\%(\%([^' . b:delimiter . ']*"[^"]*"[^' . b:delimiter . ']*'
-    \. b:delimiter . '\)\|\%([^' . b:delimiter . ']*\%(' . b:delimiter
-    \. '\|$\)\)\)'
-
-This should take care of quoted delimiters within a column. Those should
-obviously not count as a delimiter. This regular expression is quite
-complex and might not always work on some complex cases (e.g. linebreaks
-within a field, see RFC4180 for some ugly cases that will probably not work
-with this plugin).
-
-If you changed the b:delimiter variable, you need to redefine the b:col
-variable, cause otherwise it will not reflect the change. To change the
-variable from the comma to a semicolon, you could call in your CSV-Buffer
-this command: >
-
-    :let b:col=substitute(b:col, ',', ';', 'g')
-
-Check with :echo b:col, if the definition is correct afterwards.
-
-You can also force the plugin to use your own defined regular expression as
-column. That regular expression should include the delimiter for the columns.
-To define your own regular expression, set the g:csv_col variable: >
-
-    let g:csv_col='[^,]*,'
-
-This defines a column as a field delimited by the comma (where no comma can be
-contained inside a field), similar to how |csv-strict| works.
-
-You should reinitialize the plugin afterwards |InitCSV|
-
-4.3 Highlighting Group                                         *csv-higroup*
-----------------------
-By default the csv ftplugin uses the WildMenu highlighting Group to define how
-the |HiColumn| command highlights columns. If you would like to define a
-different highlighting group, you need to set this via the g:csv_hiGroup
-variable. You can e.g. define it in your |.vimrc|: >
-
-    :let g:csv_hiGroup = "IncSearch"
-
-You need to restart Vim, if you have changed this variable or use |InitCSV|
-
-The |hl-Title| highlighting is used for the Header line that is created by the
-|Header_CSV| command. If you prefer a different highlighting, set the
-g:csv_hiHeader variable to the prefered highlighting: >
-
-    let g:csv_hiHeader = 'Pmenu'
-<
-This would set the header window to the |hl-Pmenu| highlighting, that is used
-for the popup menu. To disable the custom highlighting, simply |unlet| the
-variable: >
-
-    unlet g:csv_hiHeader
-
-You should reinitialize the plugin afterwards |InitCSV|
-
-4.4 Strict Columns						*csv-strict*
-------------------
-The default regular expression to define a column is quite complex
-(|csv-column|). This slows down the processing and makes Vim use more memory
-and it could still not fit to your specific use case.
-
-If you know, that in your data file, the delimiter cannot be contained inside
-the fields quoted or escaped, you can speed up processing (this is quite
-noticeable when using the |ArrangeColumn_CSV| command) by setting the
-g:csv_strict_columns variable: >
-
-    let g:csv_strict_columns = 1
-
-This would define a column as this regex: >
-
-    let b:col = '\%([^' . b:delimiter . ']*' . b:delimiter . '\|$\)'
-
-Much simpler then the default column definition, isn't it?
-See also |csv-column| and |csv-delimiter|
-
-You can disable the effect if you |unlet| the variable: >
-
-    unlet g:csv_strict_columns
-
-You should reinitialize the plugin afterwards |InitCSV|
-
-For example when opening a CSV file you get the Error |E363|: pattern uses
-more memory than 'maxmempattern'. In this case, either increase the
-'maxmempattern' or set the g:csv_strict_columns variable.
-
-
-4.5 Concealing					*csv-syntax*	*csv-conceal*
---------------
-The CSV plugin comes with a function to syntax highlight csv files. Basically
-allt it does is highlight the columns and the header line.
-
-By default, the delimiter will not be displayed, if Vim supports |conceal| of
-syntax items and instead draws a vertical line. If you don't want that, simply
-set the g:csv_noconceal variable in your .vimrc >
-
-    let g:csv_no_conceal = 1
-
-and to disable it, simply unlet the variable >
-
-    unlet g:csv_no_conceal
-
-You should reinitialize the plugin afterwards |InitCSV|
-Note: You can also set the 'conceallevel' option to control how the concealed
-chars will be displayed.
-
-If you want to customize the syntax colors, you can define your own groups.
-The CSV plugin will use already defined highlighting groups, if they are
-already defined, otherwise it will define its own defaults which should be
-visible with 8, 16, 88 and 256 color terminals. For that it uses the
-CSVColumnHeaderOdd and CSVColumnHeaderEven highlight groups for syntax
-coloring the first line. All other lines get either the CSVColumnOdd or
-CSVColumnEven highlighting.
-
-In case you want to define your own highlighting groups, you can define your
-own syntax highlighting like this in your |.vimrc| >
-
-    hi CSVColumnEven term=bold ctermbg=4 guibg=DarkBlue
-    hi CSVColumnOdd  term=bold ctermbg=5 guibg=DarkMagenta
-    hi CSVColumnHeaderEven ...
-    hi CSVColumnHeaderOdd ...
-
-Alternatively, you can simply link those highlighting groups to some other
-ones, you really like: >
-
-    hi link CSVColumnOdd MoreMsg
-    hi link CSVColumnEven Question
-<
-If you do not want column highlighting, set the variable
-g:csv_no_column_highlight to 1 >
-
-    :let g:csv_no_column_highlight = 1
-<
-Note, these changes won't take effect, until you restart Vim.
-
-
-4.6 Newlines						*csv-newline*
-------------
-RFC4180 allows newlines in double quoted strings. By default, the csv-plugin
-won't recognize newlines inside fields. It is however possible to make the
-plugin aware of newlines within quoted strings. To enable this, set >
-
-    let g:csv_nl = 1
-
-and to disable it again, simply unset the variable >
-
-    unlet g:csv_nl
-
-It is a good idea to reinitialize the plugin afterwards |InitCSV|
-
-Note, this might not work correctly in all cases. The syntax highlighting
-seems to change on cursor movements. This could possibly be a bug in the
-syntax highlighting engine of Vim. Also, |WhatColumn_CSV| can't handle
-newlines inside fields and will most certainly be wrong.
-
-4.7 Highlight column automatically				*csv-hicol*
-----------------------------------
-You can let vim automatically highlight the column on which the cursor is.
-This works by defining an |CursorMoved| autocommand to always highlight the
-column, when the cursor is moved in normal mode. Note, this does not update
-the highlighting, if the Cursor is moved in Insert mode. To enable this,
-define the g:csv_highlight_column variable like this >
-
-    let g:csv_highlight_column = 'y'
-
-and to disable it again, simply unset the variable >
-
-    unlet g:csv_highlight_column
-
-It is a good idea to reinitialize the plugin afterwards |InitCSV|
-
-4.8 Fixed width columns                                        *csv-fixedwidth*
------------------------
-Sometimes there are no real columns, but rather the file is fixed width with
-no distinct delimiters between each column. The CSV plugin allows you to
-handle such virtual columns like csv columns, if you define where each column
-starts.
-
-Note: Except for |ArrangeColumn_CSV| and the |Header_CSV| commands, all
-commands work in either mode. Those two commands won't do anything in the case
-of fixedwidth columns, since they don't really make sense here.
-
-4.8.1 Manual setup
-------------------
-You can do this, by setting the buffer-local variable
-b:csv_fixed_width like this >
-
-    let b:csv_fixed_width="1,5,9,13,17,21"
-
-This defines that each column starts at multiples of 4. Be sure, to issue
-this command in the buffer, that contains your file, otherwise, it won't
-have an effect, since this is a buffer-local option (|local-option|)
-
-After setting this variable, you should reinitialize the plugins using
-|InitCSV|
-
-                                                                    *CSVFixed*
-4.8.2 Setup using a Wizard
---------------------------
-Alternatively, you can setup the fixed width columns using the :CSVFixed
-command. This provides a simple wizard to select each column. If you enter
-the command: >
-    :CSVFixed
-<
-The first column will be highlighted and Vim outputs:
-<Cursor>, <Space>, <ESC>, <BS>, <CR>...
-This means, you can now use those 5 keys to configure the fixed-width columns:
-
-   <Cursor> Use Cursor Left (<Left>) and Cursor Right (<Right>) to move the
-            highlighting bar.
-   <Space>  If you press <Space>, this column will be fixed and remain
-            highlighted and there will be another bar, you can move using
-            the Cursor keys. This means this column will be considered to be
-            the border between 2 fixed with columns.
-   <ESC>    Abort
-   <BS>     Press the backspace key, to remove the last column you fixed with
-            the <Space> key.
-   <CR>     Use Enter to finish the wizard. This will use all fixed columns
-            to define the fixed width columns of your csv file. The plugin
-            will be initialized and syntax highlighting should appear.
-
-Note: This only works, if your Vim has the 'colorcolumn' option available
-(This won't work with Vim < 7.3 and also not with a Vim without +syntax
-feature).
-
-
-4.9 CSV Header lines                                        *csv-header*
---------------------
-By default, dynamic filtering |csv-filter| will not fold away the first line.
-If you don't like that, you can define your header line using the variable
-b:csv_fold_headerline, e.g. >
-
-    let b:csv_headerline = 0
-
-to disable, that a header line won't be folded away. If your header line
-instead is on line 5, simply set this variable to 5. This also applies to the
-|Header_CSV| command.
-
-4.10 Number format                                           *csv-nrformat*
-------------------
-When using the |SumCol_CSV| command, you can specify a certain number format
-using the /x:y/ argument. You can however also configure the plugin to detect
-a different number format than the default number format (which does not
-support a thousands separator and uses the '.' as decimal separator).
-
-To specify a different thousands separator by default, use >
-
-    let b:csv_thousands_sep = ' '
-
-to have the space use as thousands separator and >
-
-    let b:csv_decimal_sep = ','
-
-to use the comma as decimal separator.
-
-4.11 Move folded lines                                        *csv-move-folds*
-----------------------
-If you use dynamic filters (see |csv-filter|), you can configure the plugin to
-move all folded lines to the end of the file. This only happens if you set the
-variable >
-
-    let g:csv_move_folds = 1
-<
-and the file is modifiable. This let's you see all non-folded records as a
-consecutive area without being disrupted by folded lines.
-
-4.12 Using comments                                           *csv-comments*
--------------------
-Strictly speaking, in csv files there can't be any comments. You might however
-still wish to comment or annotate certain sections in your file, so the CSV
-plugin supports Comments.
-
-Be default, the CSV plugin will use the 'commentstring' setting to identify
-comments. If this option includes the '%s' it will consider the part before
-the '%s' as leading comment marker and the part behind it as comment
-delimiter.
-
-You can however define your own comment marker, using the variable
-g:csv_comment. Like with the 'commentstring' setting, you can use '%s'
-expandos, that will denote where the actual comment text belongs. To define
-your own comment string, put this in your |.vimrc| >
-
-    :let g:csv_comment = '#'
-<
-Which will use the '#' sign as comment leader like in many scripting
-languages.
-
-After setting this variable, you should reinitialize the plugins using
-|InitCSV|
-
-                                                            *csv-foldtext*
-By default, the csv plugin sets the 'foldtext' option. If you don't want this,
-set the variable `g:csv_disable_fdt` in your |.vimrc| >
-
-    :let g:csv_disable_fdt = 1
-
-4.13 Size and performance considerations                            *csv-size*
-----------------------------------------
-By default, the csv plugin will analyze the whole file to determine which
-delimiter to use. Beside specifying the the actual delimiter to use
-(|csv-delimiter|) you can restrict analyzing the plugin to consider only a
-certain part of the file. This should make loading huge csv files a log
-faster. To only consider the first 100 rows set the `g:csv_start` and
-`g:csv_end` variables in your |.vimrc| like this >
-
-  :let g:csv_start = 1
-  :let g:csv_end = 100
-
-Also note, you can use the Large File plugin
-(http://www.drchip.org/astronaut/vim/index.html#LARGEFILE) which however will
-disable syntax highlighting and the filetype commands for very large csv files
-(by default larger than 100 MB).
-
-See also |csv-slow|
-==============================================================================
-5. Functions                                                    *CSV-Functions*
-
-The csv plugins also defines some functions, that can be used for scripting
-when a csv file is open
-
-5.1 CSVPat()  							*CSVPat()*
-------------
-CSVPat({column}[, {pattern}])
-
-This function returns the pattern for the selected column. If only columns is
-given, returns the regular expression used to search for the pattern '.*' in
-that column (which means the content of that column). Alternatively, an
-optional pattern can be given, so the return string can be directly feeded to
-the |/| or |:s| command, e.g. type: >
-
-    :s/<C-R>=CSVPat(3, 'foobar')<cr>/baz
-
-where the <C-R> means pressing Control followed by R followed by =
-(see |c_CTRL-R_=|). A prompt will apear, with the '=' as the first character
-on which you can enter expressions.
-
-In this case enter CSVPat(3, 'foobar') which returns the pattern to search for
-the string 'foobar' in the third column. After you press enter, the returned
-pattern will be put after the :s command so you can directly enter / and the
-substitute string.
-
-5.2 CSVField(x,y[, orig])					*CSVField()*
--------------------------
-This function returns the field at index (x,y) (starting from 1). If the
-parameter orig is given, returns the column "as is" (e.g. including delimiter
-and leading and trailing whitespace, otherwise that will be stripped.)
-
-5.3 CSVCol([name])				        	*CSVCol()*
-------------------
-If the name parameter is given, returns the name of the column, else returns
-the index of the current column, starting at 1.
-
-5.4 CSVSum(col, fmt, startline, endline)                        *CSVSum()*
-----------------------------------------
-Returns the sum for column col. Uses fmt to parse number format (see
-|:CSVSumCol|) startline and endline specify the lines to consider, if empty,
-will be first and last line.
-
-5.5 CSVCount(col, fmt, startline, endline[, distinct])            *CSVCount()*
-------------------------------------------------------
-Returns the count of values for column col. If the optional parameter
-[distinct] is given, only returns the distinct number of values.
-
-5.6 CSVMax(col, fmt, startline, endline)                         *CSVMax()*
-------------------------------------------------------
-Returns the 10 largest values for column col. 
-
-5.7 CSVMin(col, fmt, startline, endline)                         *CSVMin()*
-------------------------------------------------------
-Returns the 10 smallest values for column col. 
-
-5.8 CSVAvg(col, fmt, startline, endline)                         *CSVAvg()*
-------------------------------------------------------
-Returns the average value for column col. 
-
-5.9 CSVWidth([silent])                                             *CSVWidth()*
-------------------------------------------------------
-Returns a list with the width for each column. If the first argument is given
-and non-zero, do not output warning message about the number of records used
-to calculate the width (else it might output something like:
-  CSV: File too large, only checking the first 10000 rows for the width
-), default: 1
-
-==============================================================================
-6. CSV Tips and Tricks						*csv-tips*
-
-Here, there you'll find some small tips and tricks that might help when
-working with CSV files.
-
-6.1 Statusline							*csv-stl*
---------------
-Suppose you want to include the column, on which the cursor is, into your
-statusline. You can do this, by defining in your .vimrc the 'statusline' like
-this: >
-
-    function MySTL()
-        if has("statusline")
-            hi User1 term=standout ctermfg=0 ctermbg=11 guifg=Black guibg=Yellow
-            let stl = ...
-            if exists("*CSV_WCol")
-                let csv = '%1*%{&ft=~"csv" ? CSV_WCol() : ""}%*'
-            else
-                let csv = ''
-            endif
-            return stl.csv
-        endif
-    endfunc
-    set stl=%!MySTL()
-<
-
-This will draw in your statusline right aligned the current column and max
-column (like 1/10), if you are inside a CSV file. The column info will be
-drawn using the User1 highlighting (|hl-User1|), that has been defined in the
-second line of the function. In the third line of your function, put your
-desired 'statusline' settings as |expression|. Note the section starting with
-'if exists(..)' guards against not having loaded the filetype plugin.
-
-Note: vim-airline (https://github.com/bling/vim-airline) by default supports
-the csv plugin and enables a nice little csv statusline which helps for
-navigating within a csv file. For details, see the Vim-Airline documentation.
-
-                                                                 *CSV_WCol()*
-The CSV_WCol() function controls, what will be output. In the simplest case,
-when no argument is given, it simply returns on which column the cursor is.
-This would look like '1/10' which means the cursor is on the first of 10
-columns. If you rather like to know the name of the column, simply give as
-parameter to the function the string "Name". This will return the column name
-as it is printed on the first line of that column. This can be adjusted, to
-have the column name printed into the statusline (see |csv-stl| above) by
-replacing the line >
-
-    let csv = '%1*%{&ft=~"csv" ? CSV_WCol() : ""}%*'
-<
-by e.g.
-
-    let csv = '%1*%{&ft=~"csv" ? CSV_WCol("Name") . " " . CSV_WCol() : ""}%*'
-
-which will output "Name 2/10" if the cursor is in the second column
-which is named "Name".
-
-6.2 Slow CSV plugin						*csv-slow*
--------------------
-Processing a csv file using |ArrangeColumn_CSV| can be quite slow, because Vim
-needs to calculate the width for each column and then replace each column by
-itself widened by spaces to the optimal length. Unfortunately, csv files tend
-to be quite big. Remember, for a file with 10,000 lines and 50 columns Vim
-needs to process each cell, which accumulates to 500,000 substitutions. It
-might take some time, until Vim is finished.
-
-You can speed up things a little bit, if you omit the '!' attribute to the
-|ArrangeColumn| (but this will only work, if the width has been calculated
-before, e.g. by issuing a :1ArrangeColumn command to arrange only the first
-line. Additionally you can also configure how this command behaves by setting
-some configuration variables.
-
-Also note, using dynamic filters (|csv-filter|), can slow down Vim
-considerably, since they internally work with complex regular expressions, and
-if you have a large file, containing many columns, you might hit a performance
-penalty (especially, if you want to filter many columns). It's best to avoid
-those functions if you are using a large csv file (so using strict columns
-|csv-strict| might help a little and also setting 're' to 1 might also
-alleviate it a little).
-
-
-6.3 Defining custom aggregate functions		    *csv-aggregate-functions*
----------------------------------------
-The CSV plugin already defines the |SumCol_CSV| command, to let you calculate
-the sum of all values of a certain column within a given range. This will
-consider all values within the range, that are not folded away (|csv-filter|),
-and also skip comments and the header lines. The delimiter will be deleted
-from each field.
-
-But it may be, that you don't need the sum, but would rather want to have the
-average of all values within a certain column. You can define your own
-function and let the plugin call it for a column like this:
-
-    1) You define your own custom function in the after directory of your
-       vim runtime path |after-directory| (see also #2 below) >
-
-        fun! My_CSV_Average(col)
-            let sum=0
-            for item in a:col
-                let sum+=item
-            endfor
-            return sum/len(a:col)
-        endfun
-<
-       This function takes a list as argument, and calculates the average for
-       all items in the list. You could also make use of Vim's |eval()|
-       function and write your own Product function like this >
-
-        fun! My_CSV_Product(col)
-            return eval(join(a:col, '*'))
-        endfun
-<
-
-    2) Now define your own custom command, that calls your custom function for
-    a certain column >
-
-            command! -buffer -nargs=? -range=% AvgCol
-            \ :echo csv#EvalColumn(<q-args>,
-            \ "My_CSV_Average", <line1>,<line2>)
-<
-        This command should best be put into a file called csv.vim and save
-        it into your ~/.vim/after/ftplugin/ directory. Create directories
-        that don't exist yet. For Windows, this would be the
-        $VIMRUNTIME/vimfiles/after/ftplugin directory.
-
-    3) Make sure, your |.vimrc| includes a filetype plugin setting like this >
-
-        filetype plugin on
-<
-       This should make sure, that all the necessary scripts are loaded by
-       Vim.
-
-    After restarting Vim, you can now use your custom command definition
-    :AvgCol. Use a range, for the number of lines you want to evaluate and
-    optionally use an argument to specify which column you want to be
-    evaluated >
-
-        :2,$AvgCol 7
-<
-    This will evaluate the average of column seven (assuming, line 1 is the
-    header line, which should not be taken into account).
-
-    Note: this plugin already defines an average function.
-
-6.4 Autocommand on opening/closing files                *csv-arrange-autocmd*
-----------------------------------------
-If you want your CSV files to always be displayed like a table, you can
-achieve this using the |ArrangeColumn_CSV| command and some autocommands.
-Define these autocommands in your |.vimrc| >
-
-    aug CSV_Editing
-        au!
-        au BufRead,BufWritePost *.csv :%ArrangeColumn
-        au BufWritePre *.csv :%UnArrangeColumn
-    aug end
-
-Upon Entering a csv file, Vim will visually arrange all columns and before
-writing, those columns will be collapsed again. The BufWritePost autocommand
-makes sure, that after the file has been written successfully, the csv file
-will again be visually arranged.
-
-You can also simply set the variable >
-
-    let g:csv_autocmd_arrange = 1
-<
-in your vimrc and an autocmd will be installed, that visually arranges your
-csv file whenever you open them for editing. Alternatively, you can restrict
-this setting to files below a certain size. For example, if you only want to
-enable this feature for files smaller than 1 MB, put this into your |.vimrc| >
-
-    let g:csv_autocmd_arrange      = 1
-    let g:csv_autocmd_arrange_size = 1024*1024
-
-Note, this is highly experimental and especially on big files, this might
-slow down Vim considerably.
-
-6.5 Syntax error when opening a CSV file               *csv-syntax-error*
-----------------------------------------
-If you see this error: >
-
-   CSV Syntax:Invalid column pattern, using default pattern \%([^,]*,\|$\)
-<
-This happens usually, when the syntax script is read before the filetype
-plugin, so the plugin did not have a chance to setup the column delimiter
-correctly.
-
-The easy way to fix it, is to make sure the :syntax on (|:syn-on|) statement
-comes after the :filetype plugin (|:filetype-plugin-on|) statement in your
-|.vimrc|
-
-Alternatively, you can simply call |InitCSV| and ignore the error.
-
-Note: It could also be caused by lazy loading feature by a vim plugin
-manager. For example this line might also cause it: >
-
-  Plug 'https://github.com/chrisbra/csv.vim',  { 'for' : 'csv' }
-<
-
-The fix would then be: >
-
-  Plug 'https://github.com/chrisbra/csv.vim'
-
-6.6 Calculate new columns               *csv-calculate-column*
--------------------------
-Suppose you have a table like this:
-
-Index;Value1;Value2~
-1;100;3 `
-2;20;4 `
-
-And you need one more column, that is the calculated product of column 2 and
-3, you can make use of the provided |CSVField()| function using a
-|sub-replace-expression| of an |:s| command. In this case, you would do this: >
-
-    :2,3s/$/\=printf("%s%.2f", b:delimiter,
-    (CSVField(2,line('.'))+0.0)*(CSVField(3,line('.'))+0.0/
-
-Note: Enter as single line. The result will be this: >
-
-Index;Value1;Value2~
-1;100;3;300.00 `
-2;20;4;80.00 `
-
-6.7 Using the result of an evaluation in insert mode              *b:csv_result*
-----------------------------------------------------
-The result of the last evaluation like e.g. |SumCol_CSV| will be available in
-the buffer-local variable `b:csv_result`. This allows to easily enter the
-result in a new new cell while in insert mode, using |i_CTRL-R|(e.g. in insert
-mode press Ctrl-R followed by "=b:csv_result<enter>".
-
-You can also easily copy and paste it into e.g. the system clipboard using >
-        :let @+=b:csv_result
-
-==============================================================================
-7. CSV Changelog					       *csv-changelog*
-
-see CHANGELOG.md in root directory of the plugin.
-
-# vim:ft=help
-
-endif
diff --git a/doc/ft-gitcommit-plugin.txt b/doc/ft-gitcommit-plugin.txt
deleted file mode 100644
index 3d6b90556..000000000
--- a/doc/ft-gitcommit-plugin.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
-
-GIT COMMIT                                              *ft-gitcommit-plugin*
-
-One command, :DiffGitCached, is provided to show a diff of the current commit
-in the preview window.  It is equivalent to calling "git diff --cached" plus
-any arguments given to the command.
-
-GIT REBASE                                              *ft-gitrebase-plugin*
-
-In a gitrebase filetype buffer, the following commands are provided:
-
-  `:Pick`     Changes the cursor line to a `pick` line.
-  `:Squash`   Changes the cursor line to a `squash` line
-  `:Edit`     Changes the cursor line to an `edit` line
-  `:Reword`   Changes the cursor line to a `reword` line
-  `:Fixup`    Changes the cursor line to a `fixup` line
-  `:Drop`     Changes the cursor line to a `drop` line
-  `:Cycle`    Cycles between the first 5 gitrebase commands
-
-To make the `:Cycle` command more useful, it might be mapped, e.g. >
-  nnoremap <buffer> <silent> S :Cycle<CR>
-<
-
-endif
diff --git a/doc/ft-ruby-indent.txt b/doc/ft-ruby-indent.txt
deleted file mode 100644
index 5e2749656..000000000
--- a/doc/ft-ruby-indent.txt
+++ /dev/null
@@ -1,152 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-
-RUBY							*ft-ruby-indent*
-							*vim-ruby-indent*
-
-    Ruby: Access modifier indentation	|ruby-access-modifier-indentation|
-    Ruby: Block style indentation	|ruby-block-style-indentation|
-    Ruby: Assignment style indentation	|ruby-assignment-style-indentation|
-    Ruby: Hanging element indentation	|ruby-hanging-element-indentation|
-
-					*ruby-access-modifier-indentation*
-					*g:ruby_indent_access_modifier_style*
- Ruby: Access modifier indentation ~
-
-Different access modifier indentation styles can be used by setting: >
-
-	:let g:ruby_indent_access_modifier_style = 'normal'
-	:let g:ruby_indent_access_modifier_style = 'indent'
-	:let g:ruby_indent_access_modifier_style = 'outdent'
-<
-By default, the "normal" access modifier style is used.
-
-Access modifier style "normal":
->
-  class Indent
-    private :method
-    protected :method
-    private
-    def method; end
-    protected
-    def method; end
-    public
-    def method; end
-  end
-<
-Access modifier style "indent":
->
-  class Indent
-    private :method
-    protected :method
-    private
-      def method; end
-    protected
-      def method; end
-    public
-    def method; end
-  end
-<
-Access modifier style "outdent":
->
-  class Indent
-    private :method
-    protected :method
-  private
-    def method; end
-  protected
-    def method; end
-  public
-    def method; end
-  end
-<
-					*ruby-block-style-indentation*
-					*g:ruby_indent_block_style*
-    Ruby: Block style indentation ~
-
-Different block indentation styles can be used by setting: >
-
-    :let g:ruby_indent_block_style = 'expression'
-    :let g:ruby_indent_block_style = 'do'
-<
-By default, the "do" block indent style is used.
-
-Block indent style "expression":
->
-    first
-      .second do |x|
-      something
-    end
-<
-Block indent style "do":
->
-    first
-      .second do |x|
-        something
-      end
-<
-
-					*ruby-assignment-style-indentation*
-					*g:ruby_indent_assignment_style*
-    Ruby: Assignment style indentation ~
-
-Different styles of indenting assignment for multiline expressions:
->
-    :let g:ruby_indent_assignment_style = 'hanging'
-    :let g:ruby_indent_assignment_style = 'variable'
-<
-By default, the "hanging" style is used.
-
-Assignment indent style "hanging":
->
-    x = if condition
-          something
-        end
-<
-Assignment indent style "variable":
->
-    x = if condition
-      something
-    end
-<
-
-					*ruby-hanging-element-indentation*
-					*g:ruby_indent_hanging_elements*
-    Ruby: Hanging element indentation ~
-
-Elements of multiline collections -- such as arrays, hashes, and method
-argument lists -- can have hanging indentation enabled or disabled with the
-following setting.
->
-    :let g:ruby_indent_hanging_elements = 1
-    :let g:ruby_indent_hanging_elements = 0
-<
-By default, this setting is "1" (true) meaning that hanging indentation is
-enabled in some cases.
-
-Here is an example method call when the setting is true (non-zero):
->
-    render('product/show',
-           product: product,
-           on_sale: true,
-          )
-<
-And the same method call when the setting is false (zero):
->
-    render('product/show',
-      product: product,
-      on_sale: true,
-    )
-<
-Note that, even if the setting is turned on, you can still get non-hanging
-indentation by putting each argument on a separate line:
->
-    render(
-      'product/show',
-      product: product,
-      on_sale: true,
-    )
-<
-
- vim:tw=78:sw=4:ts=8:ft=help:norl:
-
-endif
diff --git a/doc/ft-ruby-omni.txt b/doc/ft-ruby-omni.txt
deleted file mode 100644
index dc78493bb..000000000
--- a/doc/ft-ruby-omni.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-
-RUBY							*ft-ruby-omni*
-							*vim-ruby-omni*
-
-Completion of Ruby code requires that Vim be built with |+ruby|.
-
-Ruby completion will parse your buffer on demand in order to provide a list of
-completions.  These completions will be drawn from modules loaded by "require"
-and modules defined in the current buffer.
-
-The completions provided by CTRL-X CTRL-O are sensitive to the context:
-
-          CONTEXT                          COMPLETIONS PROVIDED ~
-
- 1. Not inside a class definition    Classes, constants and globals
-
- 2. Inside a class definition        Methods or constants defined in the class
-
- 3. After '.', '::' or ':'           Methods applicable to the object being
-                                       dereferenced
-
- 4. After ':' or ':foo'              Symbol name (beginning with "foo")
-
-Notes:
- - Vim will load/evaluate code in order to provide completions.  This may
-   cause some code execution, which may be a concern.  This is no longer
-   enabled by default, to enable this feature add >
-     let g:rubycomplete_buffer_loading = 1
-< - In context 1 above, Vim can parse the entire buffer to add a list of
-   classes to the completion results.  This feature is turned off by default,
-   to enable it add >
-     let g:rubycomplete_classes_in_global = 1
-<   to your vimrc
- - In context 2 above, anonymous classes are not supported.
- - In context 3 above, Vim will attempt to determine the methods supported by
-   the object.
- - Vim can detect and load the Rails environment for files within a rails
-   project.  The feature is disabled by default, to enable it add >
-     let g:rubycomplete_rails = 1
-<   to your vimrc
- - Vim can parse a Gemfile, in case gems are being implicitly required.  To
-   activate the feature: >
-     let g:rubycomplete_load_gemfile = 1
-<   To specify an alternative path, use: >
-     let g:rubycomplete_gemfile_path = 'Gemfile.aux'
-<   To use Bundler.require instead of parsing the Gemfile, set: >
-     let g:rubycomplete_use_bundler = 1
-<   To use custom paths that should be added to $LOAD_PATH to correctly
-   resolve requires, set: >
-     let g:rubycomplete_load_paths = ["/path/to/code", "./lib/example"]
-
-
- vim:tw=78:sw=4:ts=8:ft=help:norl:
-
-endif
diff --git a/doc/ft-ruby-plugin.txt b/doc/ft-ruby-plugin.txt
deleted file mode 100644
index 2380240d1..000000000
--- a/doc/ft-ruby-plugin.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-
-RUBY							*ft-ruby-plugin*
-							*vim-ruby-plugin*
-
-
-    Ruby: Recommended settings		|ruby-recommended|
-    Ruby: Motion commands		|ruby-motion|
-    Ruby: Text objects			|ruby-text-objects|
-
-							*ruby-recommended*
-							*g:ruby_recommended_style*
- Ruby: Recommended settings ~
-
-The `g:ruby_recommended_style` variable activates indentation settings
-according to the most common ruby convention: two spaces for indentation. It's
-turned on by default to ensure an unsurprising default experience for most
-ruby developers.
-
-If you'd like to enforce your own style, it's possible to apply your own
-preferences in your own configuration in `after/ftplugin/ruby.vim`. You can
-also disable the setting by setting the variable to 0:
->
-    let g:ruby_recommended_style = 0
-<
-
-							*ruby-motion*
- Ruby: Motion commands ~
-
-Vim provides motions such as |[m| and |]m| for jumping to the start or end of
-a method definition.  Out of the box, these work for curly-bracket languages,
-but not for Ruby.  The vim-ruby plugin enhances these motions, by making them
-also work on Ruby files.
-
-							*ruby-]m*
-]m			Go to start of next method definition.
-
-							*ruby-]M*
-]M			Go to end of next method definition.
-
-							*ruby-[m*
-[m			Go to start of previous method definition.
-
-							*ruby-[M*
-[M			Go to end of previous method definition.
-
-							*ruby-]]*
-]]			Go to start of next module or class definition.
-
-							*ruby-][*
-][			Go to end of next module or class definition.
-
-							*ruby-[[*
-[[			Go to start of previous module or class definition.
-
-							*ruby-[]*
-[]			Go to end of previous module or class definition.
-
-							*ruby-text-objects*
- Ruby: Text objects ~
-
-Vim's |text-objects| can be used to select or operate upon regions of text
-that are defined by structure.  The vim-ruby plugin adds text objects for
-operating on methods and classes.
-
-							*ruby-v_am* *ruby-am*
-am			"a method", select from "def" until matching "end"
-			keyword.
-
-							*ruby-v_im* *ruby-im*
-im			"inner method", select contents of "def"/"end" block,
-			excluding the "def" and "end" themselves.
-
-							*ruby-v_aM* *ruby-aM*
-aM			"a class", select from "class" until matching "end"
-			keyword.
-
-							*ruby-v_iM* *ruby-iM*
-iM			"inner class", select contents of "class"/"end"
-			block, excluding the "class" and "end" themselves.
-
-
- vim:tw=78:sw=4:ts=8:ft=help:norl:
-
-endif
diff --git a/doc/ft-ruby-syntax.txt b/doc/ft-ruby-syntax.txt
deleted file mode 100644
index c8c8b9cf7..000000000
--- a/doc/ft-ruby-syntax.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-
-RUBY						*ruby.vim* *ft-ruby-syntax*
-							*vim-ruby-syntax*
-
-    Ruby: Operator highlighting		|ruby_operators|
-    Ruby: Whitespace errors		|ruby_space_errors|
-    Ruby: Syntax errors			|ruby_syntax_errors|
-    Ruby: Folding			|ruby_fold| |ruby_foldable_groups|
-    Ruby: Reducing expensive operations	|ruby_no_expensive| |ruby_minlines|
-    Ruby: Spellchecking strings		|ruby_spellcheck_strings|
-
-						*ruby_operators*
- Ruby: Operator highlighting ~
-
-Operators, and pseudo operators, can be highlighted by defining: >
-
-	:let ruby_operators        = 1
-	:let ruby_pseudo_operators = 1
-<
-The supported pseudo operators are ., &., ::, *, **, &, <, << and ->.
-
-						*ruby_space_errors*
- Ruby: Whitespace errors ~
-
-Whitespace errors can be highlighted by defining "ruby_space_errors": >
-
-	:let ruby_space_errors = 1
-<
-This will highlight trailing whitespace and tabs preceded by a space character
-as errors.  This can be refined by defining "ruby_no_trail_space_error" and
-"ruby_no_tab_space_error" which will ignore trailing whitespace and tabs after
-spaces respectively.
-
-						*ruby_syntax_errors*
- Ruby: Syntax errors ~
-
-Redundant line continuations and predefined global variable look-alikes (such
-as $# and $-z) can be highlighted as errors by defining:
->
-	:let ruby_line_continuation_error = 1
-	:let ruby_global_variable_error   = 1
-<
-						*ruby_fold*
- Ruby: Folding ~
-
-Folding can be enabled by defining "ruby_fold": >
-
-	:let ruby_fold = 1
-<
-This will set the value of 'foldmethod' to "syntax" locally to the current
-buffer or window, which will enable syntax-based folding when editing Ruby
-filetypes.
-
-						*ruby_foldable_groups*
-Default folding is rather detailed, i.e., small syntax units like "if", "do",
-"%w[]" may create corresponding fold levels.
-
-You can set "ruby_foldable_groups" to restrict which groups are foldable: >
-
-        :let ruby_foldable_groups = 'if case %'
-<
-The value is a space-separated list of keywords:
-
-    keyword       meaning ~
-    --------  ------------------------------------- ~
-    ALL        Most block syntax (default)
-    NONE       Nothing
-    if         "if" or "unless" block
-    def        "def" block
-    class      "class" block
-    module     "module" block
-    do         "do" block
-    begin      "begin" block
-    case       "case" block
-    for        "for", "while", "until" loops
-    {          Curly bracket block or hash literal
-    [          Array literal
-    %          Literal with "%" notation, e.g.: %w(STRING), %!STRING!
-    /          Regexp
-    string     String and shell command output (surrounded by ', ", `)
-    :          Symbol
-    #          Multiline comment
-    <<         Here documents
-    __END__    Source code after "__END__" directive
-
-NONE and ALL have priority, in that order, over all other folding groups.
-
-						*ruby_no_expensive*
- Ruby: Reducing expensive operations ~
-
-By default, the "end" keyword is colorized according to the opening statement
-of the block it closes.  While useful, this feature can be expensive; if you
-experience slow redrawing (or you are on a terminal with poor color support)
-you may want to turn it off by defining the "ruby_no_expensive" variable: >
-
-	:let ruby_no_expensive = 1
-<
-In this case the same color will be used for all control keywords.
-
-						*ruby_minlines*
-
-If you do want this feature enabled, but notice highlighting errors while
-scrolling backwards, which are fixed when redrawing with CTRL-L, try setting
-the "ruby_minlines" variable to a value larger than 50: >
-
-	:let ruby_minlines = 100
-<
-Ideally, this value should be a number of lines large enough to embrace your
-largest class or module.
-
-						*ruby_spellcheck_strings*
- Ruby: Spellchecking strings ~
-
-Ruby syntax will perform spellchecking of strings if you define
-"ruby_spellcheck_strings": >
-
-	:let ruby_spellcheck_strings = 1
-<
-
- vim:tw=78:sw=4:ts=8:ft=help:norl:
-
-endif
diff --git a/doc/fzf_gitignore.txt b/doc/fzf_gitignore.txt
deleted file mode 100644
index 4d94748ce..000000000
--- a/doc/fzf_gitignore.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
-
-*fzf_gitignore.txt* Create useful .gitignore files for your project
-
-Author: Filip Szymański <fszymanski.pl@gmail.com>
-
-==============================================================================
-CONTENTS                                              *fzf-gitignore-contents*
-
-  1. Introduction                                |fzf-gitignore-introduction|
-  2. Configuration                               |fzf-gitignore-configuration|
-  3. Commands                                    |fzf-gitignore-commands|
-  4. Mappings                                    |fzf-gitignore-mappings|
-  5. License                                     |fzf-gitignore-license|
-  6. Bugs                                        |fzf-gitignore-bugs|
-  7. Contributing                                |fzf-gitignore-contributing|
-
-==============================================================================
-INTRODUCTION                                      *fzf-gitignore-introduction*
-
-fzf[1] interface for creating .gitignore files using the gitignore.io[2] API.
-
-Note: This plugin was inspired by helm-gitignore[3].
-
-==============================================================================
-CONFIGURATION                                    *fzf-gitignore-configuration*
-
-                                                     *g:fzf_gitignore_no_maps*
-Set this option to disable all key mappings.
->
-  let g:fzf_gitignore_no_maps = 1
-<
-Default: Not defined (number)
-
-                                                         *g:fzf_gitignore_map*
-Set this option to change the |<Plug>(fzf-gitignore)| key mapping.
->
-  let g:fzf_gitignore_map = '<Leader>i'
-<
-Default: '<Leader>gi' (string)
-
-==============================================================================
-COMMANDS                                              *fzf-gitignore-commands*
-
-                                                               *:FzfGitignore*
-Create .gitignore file.
-
-==============================================================================
-MAPPINGS                                              *fzf-gitignore-mappings*
-
- -----------------------------------+----------------------------------------
-  Mapping                           | Description                            ~
- -----------------------------------+----------------------------------------
-  <Plug>(fzf-gitignore)             | Create .gitignore file
- -----------------------------------+----------------------------------------
-
-==============================================================================
-LICENSE                                                *fzf-gitignore-license*
-
-MIT
-
-==============================================================================
-BUGS                                                      *fzf-gitignore-bugs*
-
-If you find a bug please create an issue on GitHub.
-
-https://github.com/fszymanski/fzf-gitignore/issues
-
-==============================================================================
-CONTRIBUTING                                      *fzf-gitignore-contributing*
-
-Think you can make this plugin better? Awesome. Fork it on GitHub and create
-a pull request.
-
-https://github.com/fszymanski/fzf-gitignore
-
-==============================================================================
-
-[1] https://github.com/junegunn/fzf
-[2] https://www.gitignore.io/
-[3] https://github.com/jupl/helm-gitignore
-
- vim: tw=78 ts=8 ft=help norl
-
-endif
diff --git a/doc/graphql.txt b/doc/graphql.txt
deleted file mode 100644
index 868c74d85..000000000
--- a/doc/graphql.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-
-*graphql.txt* GraphQL plug-in for Vim                                *graphql*
-
-CONTENTS                                                    *graphql-contents*
-
-1. Introduction         |graphql-intro|
-2. JavaScript Support   |graphql-javascript|
-3. TypeScript Support   |graphql-typescript|
-
-
-INTRODUCTION                                                   *graphql-intro*
-
-This plugin provides GraphQL (http://graphql.org/) file detection, syntax
-highlighting, and indentation.
-
-
-JAVASCRIPT                                                *graphql-javascript*
-
-GraphQL syntax support in ES2015 template literals is provided. It works "out
-of the box" with Vim 8.2's JavaScript support. The extended syntax provided by
-the vim-javascript (https://github.com/pangloss/vim-javascript) plugin is also
-supported.
-
-                                                  *graphql-javascript-options*
-
-                                                   *g:graphql_javascript_tags*
-|g:graphql_javascript_tags|                                    list of strings
-
-  Default: `["gql", "graphql", "Relay.QL"]`
-
-  This variable lists the ES2015 template tag names that will be recognized as
-  containing GraphQL template literal strings.
-
-
-TYPESCRIPT                                                *graphql-typescript*
-
-Like |graphql-javascript|, GraphQL syntax support in ES2015 template literals
-is provided. It also works "out of the box" with Vim 8.2's TypeScript support,
-which is based on the yats (https://github.com/HerringtonDarkholme/yats.vim)
-plugin. For older versions, you can install yats directly.
-
-TypeScript syntax support also uses |graphql-javascript-options| to customize
-the list of recognized template tag names.
-
-REASONML                                                    *graphql-reasonml*
-
-GraphQL syntax support inside of ReasonML template strings using graphql-ppx
-is available.
-
-------------------------------------------------------------------------------
-vim:tw=78:ft=help:norl:
-
-endif
diff --git a/doc/haskell-vim.txt b/doc/haskell-vim.txt
deleted file mode 100644
index d2083ca59..000000000
--- a/doc/haskell-vim.txt
+++ /dev/null
@@ -1,163 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-
-*haskell-vim.txt*                                     Last Change 2016 March 14
-===============================================================================
-===============================================================================
-
-===============================================================================
-CONTENTS                                                   *haskell-vim-contents*
-
-  1. Features      |haskell-vim-features|
-  2. Configuration |haskell-vim-configuration|
-  3. Highlighting  |haskell-vim-indentation|
-
-===============================================================================
-FEATURES                                                   *haskell-vim-features*
-
-  * Covers a broader spectrum of keywords
-  * Highlighting for new features like type families, pattern synonyms,
-    arrow syntax, recursive do, role annotations, QuasiQuotation
-  * More contextual highlighting
-    (e.g. highlight "as" or "family" only in appropriate places)
-  * Smarter indentation
-  * Better Cabal support
-
-===============================================================================
-CONFIGURATION                                         *haskell-vim-configuration*
-
-To enable the features you would like to use, just add the according line to
-your `.vimrc`.
-
-===============================================================================
-HIGHLIGHTING                                           *haskell-vim-highlighting*
-
-`haskell-vim` can highlight additional keywords. This is enabled by setting
-the according variable to 1 in the `.vimrc`.
-
-  * |haskell-vim-enable-quantification|
-  * |haskell-vim-enable-recursivedo|
-  * |haskell-vim-enable-arrowsyntax|
-  * |haskell-vim-enable-pattern-synonyms|
-  * |haskell-vim-enable-typeroles|
-  * |haskell-vim-enable-static-pointers|
-  * |haskell-vim-classic-highlighting|
-  * |haskell-vim-disable-TH|
-
-                                               *haskell-vim-enable-quantification*
-`g:haskell_enable_quantification`   Enables highlighting of `forall`.
-
-                                                  *haskell-vim-enable-recursivedo*
-`g:haskell_enable_recursivedo`      Enables highlighting of `mdo` and `rec`.
-
-                                                 *haskell-vim-enable-arrowsyntax*
-`g:haskell_enable_arrowsyntax`      Enables highlighting of `proc`.
-
-                                            *haskell-vim-enable-pattern-synonyms*
-`g:haskell_enable_pattern_synonyms` Enables highlighting of the `pattern` keyword.
-
-                                                    *haskell-vim-enable-typeroles*
-`g:haskell_enable_typeroles`        Enables highlighting of the `role` keyword, as
-                                  well as `phantom`, `norminal` and
-                                  `representational`.
-
-                                              *haskell-vim-enable-static-pointers*
-`g:haskell_enable_static_pointers`  Enables highlighting of the `static` keyword.
-
-                                                *haskell-vim-classic-highlighting*
-`haskell-vim` has an opinionated highlighting. If you do not like that you can
-switch to a more traditional mode by setting `g:haskell_classic_highlighting`
-to 1.
-
-                                                *haskell-vim-disable-TH*
-Disabling Template Haskell and Quasiquoting syntax is possible by setting
-`g:haskell_disable_TH` to `1`.
-
-===============================================================================
-INDENTATION                                             *haskell-vim-indentation*
-
-To configure indentation in `haskell-vim` you can use the following variables to
-change indentation depth, just add the according line to your `.vimrc`.
-
-You can disable the indentation by setting `g:haskell_indent_disable` to `1`.
-
-Haskell~
-
-  * |haskell-vim-indent-if|
-  * |haskell-vim-indent-case|
-  * |haskell-vim-indent-let|
-  * |haskell-vim-indent-where|
-  * |haskell-vim-indent-before-where|
-  * |haskell-vim-indent-after-bare-where|
-  * |haskell-vim-indent-do|
-  * |haskell-vim-indent-in|
-  * |haskell-vim-indent-guard|
-                                                           *haskell-vim-indent-if*
-* let g:haskell_indent_if = 3 >
-
-        if bool
-        >>>then ...
-        >>>else ...
-<
-
-                                                         *haskell-vim-indent-case*
-* let g:haskell_indent_case = 2 >
-
-        case xs of
-        >>[]     -> ...
-        >>(y:ys) -> ...
-<
-                                                          *haskell-vim-indent-let*
-* let g:haskell_indent_let = 4 >
-
-        let x = 0 in
-        >>>>x
-<
-                                                        *haskell-vim-indent-where*
-* let g:haskell_indent_where = 6 >
-
-        where f :: Int -> Int
-        >>>>>>f x = x
-<
-                                                 *haskell-vim-indent-before-where*
-* let g:haskell_indent_before_where = 2 >
-
-        foo
-        >>where
-<
-                                             *haskell-vim-indent-after-bare-where*
-* let g:haskell_indent_after_bare_where = 2 >
-
-        where
-        >>foo
-<
-                                                           *haskell-vim-indent-do*
-* let g:haskell_indent_do = 3 >
-
-        do x <- a
-        >>>y <- b
-<
-                                                           *haskell-vim-indent-in*
-* let g:haskell_indent_in = 1 >
-
-        let x = 1
-        >in x
-<
-                                                        *haskell-vim-indent-guard*
-* let g:haskell_indent_guard = 2 >
-
-        f x y
-        >>|
-<
-
-Cabal~
-
-  * |cabal-vim-indent-section|
-
-                                                        *cabal-vim-indent-section*
-* let g:cabal_indent_section = 2 (limited to max. 4 spaces) >
-
-        executable name
-        >>main-is:             Main.hs
-<
-
-endif
diff --git a/doc/idris-vim.txt b/doc/idris-vim.txt
deleted file mode 100644
index e3d48e9eb..000000000
--- a/doc/idris-vim.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
-
-*idris-vim.txt*   Last change 2014 April 24
-===============================================================================
-===============================================================================
-   @@@@ @@@@@@@@  @@@@@@@@  @@@@  @@@@@@          @@     @@ @@@@ @@     @@
-    @@  @@     @@ @@     @@  @@  @@    @@         @@     @@  @@  @@@   @@@
-    @@  @@     @@ @@     @@  @@  @@               @@     @@  @@  @@@@ @@@@
-    @@  @@     @@ @@@@@@@@   @@   @@@@@@  @@@@@@@ @@     @@  @@  @@ @@@ @@
-    @@  @@     @@ @@   @@    @@        @@          @@   @@   @@  @@     @@
-    @@  @@     @@ @@    @@   @@  @@    @@           @@ @@    @@  @@     @@
-   @@@@ @@@@@@@@  @@     @@ @@@@  @@@@@@             @@@    @@@@ @@     @@
-===============================================================================
-CONTENTS                                                   *idris-vim-contents*
-
-  1. Features:                                   |idris-vim-features|
-  2. Requirements:                               |idris-vim-requirements|
-  3. Functions:                                  |idris-vim-functions|
-  4. Troubleshooting                             |idris-vim-troubleshooting|
-  5. Examples:                                   |idris-vim-examples|
-  6. Information:                                |idris-vim-information|
-
-===============================================================================
-FEATURES                                                   *idris-vim-features*
-
-  * Syntax Highlighting
-  * Indentation
-  * Unicode Concealing
-  * Syntax Checking (via Syntastic(https://github.com/scrooloose/syntastic))
-  * Interactive Editing via the REPL
-
-===============================================================================
-REQUIREMENTS                                           *idris-vim-requirements*
-
-  * Idris (http://www.idris-lang.org/)
-
-  OPTIONAL:
-
-    * Syntastic(https://github.com/scrooloose/syntastic) for syntax checking
-    * Vimshell(https://github.com/Shougo/vimshell.vim) for a REPL
-
-===============================================================================
-FUNCTIONS                                                 *idris-vim-functions*
-
-All of the functions in idris-vim are essentially just calls back to the REPL,
-so documentation for each of them is also available there.
-
-IdrisDocumentation                                           *IdrisDocumentation*
-  Shows internal documentation of the primitive under the cursor.
-
-  Mapped to '<LocalLeader>_h' by default.
-
-IdrisResponseWin                                              *IdrisResponseWin*
-  This opens an idris response window in a new pane.
-
-  Mapped to '<LocalLeader>_i' by default.
-
-IdrisShowType                                                    *IdrisShowType*
-  This shows the type of the name under the cursor (or, if the cursor happens
-  to be over a metavariable, a bit more information about its context).
-
-  Mapped to '<LocalLeader>_t' by default.
-
-IdrisReload                                                        *IdrisReload*
-  This reloads the file and type-checks the file in the current buffer.
-
-  Mapped to '<LocalLeader>_r' by default.
-
-IdrisEval                                                            *IdrisEval*
-  This prompts for an expression and then evaluates it in the REPL, then
-  returns the result.
-
-  Mapped to '<LocalLeader>_e' by default.
-
-IdrisCaseSplit                                                 *IdrisCaseSplit*
-  When the cursor is over a variable in a pattern match clause or case
-  expression, this splits the variable into all well-typed patterns.
-
-  Mapped to '<LocalLeader>_c' by default
-
-IdrisAddClause                                                 *IdrisAddClause*
-  When the cursor is at a type declaration this creates a new clause for that
-  signature.
-
-  By default mapped to '<LocalLeader>_d' for an ordinary top-level definition,
-  '<LocalLeader>_b' for a typeclass instance definition, and
-  '<LocalLeader>_md' to add a pattern-matching proof clause.
-
-IdrisAddMissing:                                               *IdrisAddMissing*
-  When the cursor is over a function, this adds all clauses necessary to make
-  that function cover all inputs.  This also eliminates clauses which would
-  lead to unification errors from appearing.
-
-  Mapped to '<LocalLeader>_m' by default
-
-IdrisRefine:                                                      *IdrisRefine*
-  Refines the item the cursor is over (applies the name and fills in any
-  arguments which can be filled in via unification)
-
-  Mapped to '<LocalLeader>_f' by default
-
-IdrisProofSearch:                                             *IdrisProofSearch*
-  This attempts to find a value for the metavariable it was called on by
-  looking at the rest of the code.  It can also be called with hints, which
-  are functions that can apply to help solve for the metavariable.
-
-  Mapped to '<LocalLeader>_o' without hints and '<LocalLeader>p' with hints by
-  default
-
-IdrisMakeWith:                                                   *IdrisMakeWith*
-  When the cursor is over a pattern clause and this is called, it creates a
-  new with clause.
-
-  Mapped to '<LocalLeader>_w' by default
-
-IdrisMakeLemma:                                                   *IdrisMakeLemma*
-  When the cursor is over a metavariable and this is called, it creates a new
-  top-level definition to solve the metavariable.
-
-  Mapped to '<LocalLeader>_l' by default
-
-===============================================================================
-TROUBLESHOOTING                                      *idris-vim-troubleshooting*
-
-If this isn't working for you, make sure that:
-
-  * There is an Idris REPL running
-  * For syntax checking, you have syntastic installed
-  * The plugins mappings exists and don't conflict with anything else installed
-    (You can use ':map' to check. There should be mappings similar to
-    '\h * :call IdrisShowDoc()'.)
-  * Vim recognizes you're in an idris file (you can use ':verb set ft' to check)
-
-If none of this works, check to issue tracker on github and if nothing is
-there create an issue with a detailed description of the problem.
-
-===============================================================================
-EXAMPLES                                                    *idris-vim-examples*
-
-Some excellent tutorials/examples for interactive editing using the above
-functions can be found at:
-  http://edwinb.wordpress.com/2013/10/28/interactive-idris-editing-with-vim/
-and
-  http://www.scribd.com/doc/214031954/60/Interactive-Editing-in-Vim
-
-===============================================================================
-INFORMATION                                              *idris-vim-information*
-
-Author: edwinb
-Repo: https://github.com/idris-hackers/idris-vim
-
-Documentation by japesinator
-
-===============================================================================
-===============================================================================
-" vim:ft=help:et:ts=2:sw=2:sts=2:norl:
-
-endif
diff --git a/doc/julia-vim-L2U-table.txt b/doc/julia-vim-L2U-table.txt
deleted file mode 100644
index 06f8a3945..000000000
--- a/doc/julia-vim-L2U-table.txt
+++ /dev/null
@@ -1,3282 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-
-julia-vim-L2U-table.txt  LaTeX-to-Unicode reference table
-
-===================================================================
-LATEX-TO-UNICODE REFERENCE TABLE    *L2U-ref* *julia-vim-L2U-reference*
-
-  Note: This file is autogenerated from the script 'generate_latex_symbols_table.jl'
-  The symbols are based on the documentation of Julia version 1.5.0-DEV.67
-  See |julia-vim| for the LaTeX-to-Unicode manual.
-
-Code point(s)     Character(s) Tab completion sequence(s)                   Unicode name(s)~
------------------ ------------ -------------------------------------------- --------------------------------------------------------------------------------------------------------
-U+000A1           ¡            \exclamdown                                  INVERTED EXCLAMATION MARK
-U+000A3           £            \sterling                                    POUND SIGN
-U+000A5           ¥            \yen                                         YEN SIGN
-U+000A6           ¦            \brokenbar                                   BROKEN BAR / BROKEN VERTICAL BAR
-U+000A7           §            \S                                           SECTION SIGN
-U+000A9           ©            \copyright, \:copyright:                     COPYRIGHT SIGN
-U+000AA           ª            \ordfeminine                                 FEMININE ORDINAL INDICATOR
-U+000AC           ¬            \neg                                         NOT SIGN
-U+000AE           ®            \circledR, \:registered:                     REGISTERED SIGN / REGISTERED TRADE MARK SIGN
-U+000AF           ¯            \highminus                                   MACRON / SPACING MACRON
-U+000B0           °            \degree                                      DEGREE SIGN
-U+000B1           ±            \pm                                          PLUS-MINUS SIGN / PLUS-OR-MINUS SIGN
-U+000B2           ²            \^2                                          SUPERSCRIPT TWO / SUPERSCRIPT DIGIT TWO
-U+000B3           ³            \^3                                          SUPERSCRIPT THREE / SUPERSCRIPT DIGIT THREE
-U+000B6           ¶            \P                                           PILCROW SIGN / PARAGRAPH SIGN
-U+000B7           ·            \cdotp                                       MIDDLE DOT
-U+000B9           ¹            \^1                                          SUPERSCRIPT ONE / SUPERSCRIPT DIGIT ONE
-U+000BA           º            \ordmasculine                                MASCULINE ORDINAL INDICATOR
-U+000BC           ¼            \1/4                                         VULGAR FRACTION ONE QUARTER / FRACTION ONE QUARTER
-U+000BD           ½            \1/2                                         VULGAR FRACTION ONE HALF / FRACTION ONE HALF
-U+000BE           ¾            \3/4                                         VULGAR FRACTION THREE QUARTERS / FRACTION THREE QUARTERS
-U+000BF           ¿            \questiondown                                INVERTED QUESTION MARK
-U+000C5           Å            \AA                                          LATIN CAPITAL LETTER A WITH RING ABOVE / LATIN CAPITAL LETTER A RING
-U+000C6           Æ            \AE                                          LATIN CAPITAL LETTER AE / LATIN CAPITAL LETTER A E
-U+000D0           Ð            \DH                                          LATIN CAPITAL LETTER ETH
-U+000D7           ×            \times                                       MULTIPLICATION SIGN
-U+000D8           Ø            \O                                           LATIN CAPITAL LETTER O WITH STROKE / LATIN CAPITAL LETTER O SLASH
-U+000DE           Þ            \TH                                          LATIN CAPITAL LETTER THORN
-U+000DF           ß            \ss                                          LATIN SMALL LETTER SHARP S
-U+000E5           å            \aa                                          LATIN SMALL LETTER A WITH RING ABOVE / LATIN SMALL LETTER A RING
-U+000E6           æ            \ae                                          LATIN SMALL LETTER AE / LATIN SMALL LETTER A E
-U+000F0           ð            \eth, \dh                                    LATIN SMALL LETTER ETH
-U+000F7           ÷            \div                                         DIVISION SIGN
-U+000F8           ø            \o                                           LATIN SMALL LETTER O WITH STROKE / LATIN SMALL LETTER O SLASH
-U+000FE           þ            \th                                          LATIN SMALL LETTER THORN
-U+00110           Đ            \DJ                                          LATIN CAPITAL LETTER D WITH STROKE / LATIN CAPITAL LETTER D BAR
-U+00111           đ            \dj                                          LATIN SMALL LETTER D WITH STROKE / LATIN SMALL LETTER D BAR
-U+00127           ħ            \hbar                                        LATIN SMALL LETTER H WITH STROKE / LATIN SMALL LETTER H BAR
-U+00131           ı            \imath                                       LATIN SMALL LETTER DOTLESS I
-U+00141           Ł            \L                                           LATIN CAPITAL LETTER L WITH STROKE / LATIN CAPITAL LETTER L SLASH
-U+00142           ł            \l                                           LATIN SMALL LETTER L WITH STROKE / LATIN SMALL LETTER L SLASH
-U+0014A           Ŋ            \NG                                          LATIN CAPITAL LETTER ENG
-U+0014B           ŋ            \ng                                          LATIN SMALL LETTER ENG
-U+00152           Π           \OE                                          LATIN CAPITAL LIGATURE OE / LATIN CAPITAL LETTER O E
-U+00153           œ            \oe                                          LATIN SMALL LIGATURE OE / LATIN SMALL LETTER O E
-U+00195           ƕ            \hvlig                                       LATIN SMALL LETTER HV / LATIN SMALL LETTER H V
-U+0019E           ƞ            \nrleg                                       LATIN SMALL LETTER N WITH LONG RIGHT LEG
-U+001B5           Ƶ            \Zbar                                        LATIN CAPITAL LETTER Z WITH STROKE / LATIN CAPITAL LETTER Z BAR
-U+001C2           ǂ            \doublepipe                                  LATIN LETTER ALVEOLAR CLICK / LATIN LETTER PIPE DOUBLE BAR
-U+00237           ȷ            \jmath                                       LATIN SMALL LETTER DOTLESS J
-U+00250           ɐ            \trna                                        LATIN SMALL LETTER TURNED A
-U+00252           ɒ            \trnsa                                       LATIN SMALL LETTER TURNED ALPHA / LATIN SMALL LETTER TURNED SCRIPT A
-U+00254           ɔ            \openo                                       LATIN SMALL LETTER OPEN O
-U+00256           ɖ            \rtld                                        LATIN SMALL LETTER D WITH TAIL / LATIN SMALL LETTER D RETROFLEX HOOK
-U+00259           ə            \schwa                                       LATIN SMALL LETTER SCHWA
-U+00263           ɣ            \pgamma                                      LATIN SMALL LETTER GAMMA
-U+00264           ɤ            \pbgam                                       LATIN SMALL LETTER RAMS HORN / LATIN SMALL LETTER BABY GAMMA
-U+00265           ɥ            \trnh                                        LATIN SMALL LETTER TURNED H
-U+0026C           ɬ            \btdl                                        LATIN SMALL LETTER L WITH BELT / LATIN SMALL LETTER L BELT
-U+0026D           ɭ            \rtll                                        LATIN SMALL LETTER L WITH RETROFLEX HOOK / LATIN SMALL LETTER L RETROFLEX HOOK
-U+0026F           ɯ            \trnm                                        LATIN SMALL LETTER TURNED M
-U+00270           ɰ            \trnmlr                                      LATIN SMALL LETTER TURNED M WITH LONG LEG
-U+00271           ɱ            \ltlmr                                       LATIN SMALL LETTER M WITH HOOK / LATIN SMALL LETTER M HOOK
-U+00272           ɲ            \ltln                                        LATIN SMALL LETTER N WITH LEFT HOOK / LATIN SMALL LETTER N HOOK
-U+00273           ɳ            \rtln                                        LATIN SMALL LETTER N WITH RETROFLEX HOOK / LATIN SMALL LETTER N RETROFLEX HOOK
-U+00277           ɷ            \clomeg                                      LATIN SMALL LETTER CLOSED OMEGA
-U+00278           ɸ            \ltphi                                       LATIN SMALL LETTER PHI
-U+00279           ɹ            \trnr                                        LATIN SMALL LETTER TURNED R
-U+0027A           ɺ            \trnrl                                       LATIN SMALL LETTER TURNED R WITH LONG LEG
-U+0027B           ɻ            \rttrnr                                      LATIN SMALL LETTER TURNED R WITH HOOK / LATIN SMALL LETTER TURNED R HOOK
-U+0027C           ɼ            \rl                                          LATIN SMALL LETTER R WITH LONG LEG
-U+0027D           ɽ            \rtlr                                        LATIN SMALL LETTER R WITH TAIL / LATIN SMALL LETTER R HOOK
-U+0027E           ɾ            \fhr                                         LATIN SMALL LETTER R WITH FISHHOOK / LATIN SMALL LETTER FISHHOOK R
-U+00282           ʂ            \rtls                                        LATIN SMALL LETTER S WITH HOOK / LATIN SMALL LETTER S HOOK
-U+00283           ʃ            \esh                                         LATIN SMALL LETTER ESH
-U+00287           ʇ            \trnt                                        LATIN SMALL LETTER TURNED T
-U+00288           ʈ            \rtlt                                        LATIN SMALL LETTER T WITH RETROFLEX HOOK / LATIN SMALL LETTER T RETROFLEX HOOK
-U+0028A           ʊ            \pupsil                                      LATIN SMALL LETTER UPSILON
-U+0028B           ʋ            \pscrv                                       LATIN SMALL LETTER V WITH HOOK / LATIN SMALL LETTER SCRIPT V
-U+0028C           ʌ            \invv                                        LATIN SMALL LETTER TURNED V
-U+0028D           ʍ            \invw                                        LATIN SMALL LETTER TURNED W
-U+0028E           ʎ            \trny                                        LATIN SMALL LETTER TURNED Y
-U+00290           ʐ            \rtlz                                        LATIN SMALL LETTER Z WITH RETROFLEX HOOK / LATIN SMALL LETTER Z RETROFLEX HOOK
-U+00292           ʒ            \yogh                                        LATIN SMALL LETTER EZH / LATIN SMALL LETTER YOGH
-U+00294           ʔ            \glst                                        LATIN LETTER GLOTTAL STOP
-U+00295           ʕ            \reglst                                      LATIN LETTER PHARYNGEAL VOICED FRICATIVE / LATIN LETTER REVERSED GLOTTAL STOP
-U+00296           ʖ            \inglst                                      LATIN LETTER INVERTED GLOTTAL STOP
-U+0029E           ʞ            \turnk                                       LATIN SMALL LETTER TURNED K
-U+002A4           ʤ            \dyogh                                       LATIN SMALL LETTER DEZH DIGRAPH / LATIN SMALL LETTER D YOGH
-U+002A7           ʧ            \tesh                                        LATIN SMALL LETTER TESH DIGRAPH / LATIN SMALL LETTER T ESH
-U+002B0           ʰ            \^h                                          MODIFIER LETTER SMALL H
-U+002B2           ʲ            \^j                                          MODIFIER LETTER SMALL J
-U+002B3           ʳ            \^r                                          MODIFIER LETTER SMALL R
-U+002B7           ʷ            \^w                                          MODIFIER LETTER SMALL W
-U+002B8           ʸ            \^y                                          MODIFIER LETTER SMALL Y
-U+002BC           ʼ            \rasp                                        MODIFIER LETTER APOSTROPHE
-U+002C8           ˈ            \verts                                       MODIFIER LETTER VERTICAL LINE
-U+002CC           ˌ            \verti                                       MODIFIER LETTER LOW VERTICAL LINE
-U+002D0           ː            \lmrk                                        MODIFIER LETTER TRIANGULAR COLON
-U+002D1           ˑ            \hlmrk                                       MODIFIER LETTER HALF TRIANGULAR COLON
-U+002D2           ˒            \sbrhr                                       MODIFIER LETTER CENTRED RIGHT HALF RING / MODIFIER LETTER CENTERED RIGHT HALF RING
-U+002D3           ˓            \sblhr                                       MODIFIER LETTER CENTRED LEFT HALF RING / MODIFIER LETTER CENTERED LEFT HALF RING
-U+002D4           ˔            \rais                                        MODIFIER LETTER UP TACK
-U+002D5           ˕            \low                                         MODIFIER LETTER DOWN TACK
-U+002D8           ˘            \u                                           BREVE / SPACING BREVE
-U+002DC           ˜            \tildelow                                    SMALL TILDE / SPACING TILDE
-U+002E1           ˡ            \^l                                          MODIFIER LETTER SMALL L
-U+002E2           ˢ            \^s                                          MODIFIER LETTER SMALL S
-U+002E3           ˣ            \^x                                          MODIFIER LETTER SMALL X
-U+00300           ◌̀           \grave                                       COMBINING GRAVE ACCENT / NON-SPACING GRAVE
-U+00301           ◌́           \acute                                       COMBINING ACUTE ACCENT / NON-SPACING ACUTE
-U+00302           ◌̂           \hat                                         COMBINING CIRCUMFLEX ACCENT / NON-SPACING CIRCUMFLEX
-U+00303           ◌̃           \tilde                                       COMBINING TILDE / NON-SPACING TILDE
-U+00304           ◌̄           \bar                                         COMBINING MACRON / NON-SPACING MACRON
-U+00305           ◌̅           \overbar                                     COMBINING OVERLINE / NON-SPACING OVERSCORE
-U+00306           ◌̆           \breve                                       COMBINING BREVE / NON-SPACING BREVE
-U+00307           ◌̇           \dot                                         COMBINING DOT ABOVE / NON-SPACING DOT ABOVE
-U+00308           ◌̈           \ddot                                        COMBINING DIAERESIS / NON-SPACING DIAERESIS
-U+00309           ◌̉           \ovhook                                      COMBINING HOOK ABOVE / NON-SPACING HOOK ABOVE
-U+0030A           ◌̊           \ocirc                                       COMBINING RING ABOVE / NON-SPACING RING ABOVE
-U+0030B           ◌̋           \H                                           COMBINING DOUBLE ACUTE ACCENT / NON-SPACING DOUBLE ACUTE
-U+0030C           ◌̌           \check                                       COMBINING CARON / NON-SPACING HACEK
-U+00310           ◌̐           \candra                                      COMBINING CANDRABINDU / NON-SPACING CANDRABINDU
-U+00312           ◌̒           \oturnedcomma                                COMBINING TURNED COMMA ABOVE / NON-SPACING TURNED COMMA ABOVE
-U+00315           ◌̕           \ocommatopright                              COMBINING COMMA ABOVE RIGHT / NON-SPACING COMMA ABOVE RIGHT
-U+0031A           ◌̚           \droang                                      COMBINING LEFT ANGLE ABOVE / NON-SPACING LEFT ANGLE ABOVE
-U+00321           ◌̡           \palh                                        COMBINING PALATALIZED HOOK BELOW / NON-SPACING PALATALIZED HOOK BELOW
-U+00322           ◌̢           \rh                                          COMBINING RETROFLEX HOOK BELOW / NON-SPACING RETROFLEX HOOK BELOW
-U+00327           ◌̧           \c                                           COMBINING CEDILLA / NON-SPACING CEDILLA
-U+00328           ◌̨           \k                                           COMBINING OGONEK / NON-SPACING OGONEK
-U+0032A           ◌̪           \sbbrg                                       COMBINING BRIDGE BELOW / NON-SPACING BRIDGE BELOW
-U+00330           ◌̰           \wideutilde                                  COMBINING TILDE BELOW / NON-SPACING TILDE BELOW
-U+00332           ◌̲           \underbar                                    COMBINING LOW LINE / NON-SPACING UNDERSCORE
-U+00336           ◌̶           \strike, \sout                               COMBINING LONG STROKE OVERLAY / NON-SPACING LONG BAR OVERLAY
-U+00338           ◌̸           \not                                         COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+0034D           ◌͍           \underleftrightarrow                         COMBINING LEFT RIGHT ARROW BELOW
-U+00391           Α            \Alpha                                       GREEK CAPITAL LETTER ALPHA
-U+00392           Β            \Beta                                        GREEK CAPITAL LETTER BETA
-U+00393           Γ            \Gamma                                       GREEK CAPITAL LETTER GAMMA
-U+00394           Δ            \Delta                                       GREEK CAPITAL LETTER DELTA
-U+00395           Ε            \Epsilon                                     GREEK CAPITAL LETTER EPSILON
-U+00396           Ζ            \Zeta                                        GREEK CAPITAL LETTER ZETA
-U+00397           Η            \Eta                                         GREEK CAPITAL LETTER ETA
-U+00398           Θ            \Theta                                       GREEK CAPITAL LETTER THETA
-U+00399           Ι            \Iota                                        GREEK CAPITAL LETTER IOTA
-U+0039A           Κ            \Kappa                                       GREEK CAPITAL LETTER KAPPA
-U+0039B           Λ            \Lambda                                      GREEK CAPITAL LETTER LAMDA / GREEK CAPITAL LETTER LAMBDA
-U+0039C           Μ            \upMu                                        GREEK CAPITAL LETTER MU
-U+0039D           Ν            \upNu                                        GREEK CAPITAL LETTER NU
-U+0039E           Ξ            \Xi                                          GREEK CAPITAL LETTER XI
-U+0039F           Ο            \upOmicron                                   GREEK CAPITAL LETTER OMICRON
-U+003A0           Π            \Pi                                          GREEK CAPITAL LETTER PI
-U+003A1           Ρ            \Rho                                         GREEK CAPITAL LETTER RHO
-U+003A3           Σ            \Sigma                                       GREEK CAPITAL LETTER SIGMA
-U+003A4           Τ            \Tau                                         GREEK CAPITAL LETTER TAU
-U+003A5           Υ            \Upsilon                                     GREEK CAPITAL LETTER UPSILON
-U+003A6           Φ            \Phi                                         GREEK CAPITAL LETTER PHI
-U+003A7           Χ            \Chi                                         GREEK CAPITAL LETTER CHI
-U+003A8           Ψ            \Psi                                         GREEK CAPITAL LETTER PSI
-U+003A9           Ω            \Omega                                       GREEK CAPITAL LETTER OMEGA
-U+003B1           α            \alpha                                       GREEK SMALL LETTER ALPHA
-U+003B2           β            \beta                                        GREEK SMALL LETTER BETA
-U+003B3           γ            \gamma                                       GREEK SMALL LETTER GAMMA
-U+003B4           δ            \delta                                       GREEK SMALL LETTER DELTA
-U+003B5           ε            \upepsilon, \varepsilon                      GREEK SMALL LETTER EPSILON
-U+003B6           ζ            \zeta                                        GREEK SMALL LETTER ZETA
-U+003B7           η            \eta                                         GREEK SMALL LETTER ETA
-U+003B8           θ            \theta                                       GREEK SMALL LETTER THETA
-U+003B9           ι            \iota                                        GREEK SMALL LETTER IOTA
-U+003BA           κ            \kappa                                       GREEK SMALL LETTER KAPPA
-U+003BB           λ            \lambda                                      GREEK SMALL LETTER LAMDA / GREEK SMALL LETTER LAMBDA
-U+003BC           μ            \mu                                          GREEK SMALL LETTER MU
-U+003BD           ν            \nu                                          GREEK SMALL LETTER NU
-U+003BE           ξ            \xi                                          GREEK SMALL LETTER XI
-U+003BF           ο            \upomicron                                   GREEK SMALL LETTER OMICRON
-U+003C0           π            \pi                                          GREEK SMALL LETTER PI
-U+003C1           ρ            \rho                                         GREEK SMALL LETTER RHO
-U+003C2           ς            \varsigma                                    GREEK SMALL LETTER FINAL SIGMA
-U+003C3           σ            \sigma                                       GREEK SMALL LETTER SIGMA
-U+003C4           τ            \tau                                         GREEK SMALL LETTER TAU
-U+003C5           υ            \upsilon                                     GREEK SMALL LETTER UPSILON
-U+003C6           φ            \varphi                                      GREEK SMALL LETTER PHI
-U+003C7           χ            \chi                                         GREEK SMALL LETTER CHI
-U+003C8           ψ            \psi                                         GREEK SMALL LETTER PSI
-U+003C9           ω            \omega                                       GREEK SMALL LETTER OMEGA
-U+003D0           ϐ            \upvarbeta                                   GREEK BETA SYMBOL / GREEK SMALL LETTER CURLED BETA
-U+003D1           ϑ            \vartheta                                    GREEK THETA SYMBOL / GREEK SMALL LETTER SCRIPT THETA
-U+003D5           ϕ            \phi                                         GREEK PHI SYMBOL / GREEK SMALL LETTER SCRIPT PHI
-U+003D6           ϖ            \varpi                                       GREEK PI SYMBOL / GREEK SMALL LETTER OMEGA PI
-U+003D8           Ϙ            \upoldKoppa                                  GREEK LETTER ARCHAIC KOPPA
-U+003D9           ϙ            \upoldkoppa                                  GREEK SMALL LETTER ARCHAIC KOPPA
-U+003DA           Ϛ            \Stigma                                      GREEK LETTER STIGMA / GREEK CAPITAL LETTER STIGMA
-U+003DB           ϛ            \upstigma                                    GREEK SMALL LETTER STIGMA
-U+003DC           Ϝ            \Digamma                                     GREEK LETTER DIGAMMA / GREEK CAPITAL LETTER DIGAMMA
-U+003DD           ϝ            \digamma                                     GREEK SMALL LETTER DIGAMMA
-U+003DE           Ϟ            \Koppa                                       GREEK LETTER KOPPA / GREEK CAPITAL LETTER KOPPA
-U+003DF           ϟ            \upkoppa                                     GREEK SMALL LETTER KOPPA
-U+003E0           Ϡ            \Sampi                                       GREEK LETTER SAMPI / GREEK CAPITAL LETTER SAMPI
-U+003E1           ϡ            \upsampi                                     GREEK SMALL LETTER SAMPI
-U+003F0           ϰ            \varkappa                                    GREEK KAPPA SYMBOL / GREEK SMALL LETTER SCRIPT KAPPA
-U+003F1           ϱ            \varrho                                      GREEK RHO SYMBOL / GREEK SMALL LETTER TAILED RHO
-U+003F4           ϴ            \varTheta                                    GREEK CAPITAL THETA SYMBOL
-U+003F5           ϵ            \epsilon                                     GREEK LUNATE EPSILON SYMBOL
-U+003F6           ϶            \backepsilon                                 GREEK REVERSED LUNATE EPSILON SYMBOL
-U+01D2C           ᴬ            \^A                                          MODIFIER LETTER CAPITAL A
-U+01D2E           ᴮ            \^B                                          MODIFIER LETTER CAPITAL B
-U+01D30           ᴰ            \^D                                          MODIFIER LETTER CAPITAL D
-U+01D31           ᴱ            \^E                                          MODIFIER LETTER CAPITAL E
-U+01D33           ᴳ            \^G                                          MODIFIER LETTER CAPITAL G
-U+01D34           ᴴ            \^H                                          MODIFIER LETTER CAPITAL H
-U+01D35           ᴵ            \^I                                          MODIFIER LETTER CAPITAL I
-U+01D36           ᴶ            \^J                                          MODIFIER LETTER CAPITAL J
-U+01D37           ᴷ            \^K                                          MODIFIER LETTER CAPITAL K
-U+01D38           ᴸ            \^L                                          MODIFIER LETTER CAPITAL L
-U+01D39           ᴹ            \^M                                          MODIFIER LETTER CAPITAL M
-U+01D3A           ᴺ            \^N                                          MODIFIER LETTER CAPITAL N
-U+01D3C           ᴼ            \^O                                          MODIFIER LETTER CAPITAL O
-U+01D3E           ᴾ            \^P                                          MODIFIER LETTER CAPITAL P
-U+01D3F           ᴿ            \^R                                          MODIFIER LETTER CAPITAL R
-U+01D40           ᵀ            \^T                                          MODIFIER LETTER CAPITAL T
-U+01D41           ᵁ            \^U                                          MODIFIER LETTER CAPITAL U
-U+01D42           ᵂ            \^W                                          MODIFIER LETTER CAPITAL W
-U+01D43           ᵃ            \^a                                          MODIFIER LETTER SMALL A
-U+01D45           ᵅ            \^alpha                                      MODIFIER LETTER SMALL ALPHA
-U+01D47           ᵇ            \^b                                          MODIFIER LETTER SMALL B
-U+01D48           ᵈ            \^d                                          MODIFIER LETTER SMALL D
-U+01D49           ᵉ            \^e                                          MODIFIER LETTER SMALL E
-U+01D4B           ᵋ            \^epsilon                                    MODIFIER LETTER SMALL OPEN E
-U+01D4D           ᵍ            \^g                                          MODIFIER LETTER SMALL G
-U+01D4F           ᵏ            \^k                                          MODIFIER LETTER SMALL K
-U+01D50           ᵐ            \^m                                          MODIFIER LETTER SMALL M
-U+01D52           ᵒ            \^o                                          MODIFIER LETTER SMALL O
-U+01D56           ᵖ            \^p                                          MODIFIER LETTER SMALL P
-U+01D57           ᵗ            \^t                                          MODIFIER LETTER SMALL T
-U+01D58           ᵘ            \^u                                          MODIFIER LETTER SMALL U
-U+01D5B           ᵛ            \^v                                          MODIFIER LETTER SMALL V
-U+01D5D           ᵝ            \^beta                                       MODIFIER LETTER SMALL BETA
-U+01D5E           ᵞ            \^gamma                                      MODIFIER LETTER SMALL GREEK GAMMA
-U+01D5F           ᵟ            \^delta                                      MODIFIER LETTER SMALL DELTA
-U+01D60           ᵠ            \^phi                                        MODIFIER LETTER SMALL GREEK PHI
-U+01D61           ᵡ            \^chi                                        MODIFIER LETTER SMALL CHI
-U+01D62           ᵢ            \_i                                          LATIN SUBSCRIPT SMALL LETTER I
-U+01D63           ᵣ            \_r                                          LATIN SUBSCRIPT SMALL LETTER R
-U+01D64           ᵤ            \_u                                          LATIN SUBSCRIPT SMALL LETTER U
-U+01D65           ᵥ            \_v                                          LATIN SUBSCRIPT SMALL LETTER V
-U+01D66           ᵦ            \_beta                                       GREEK SUBSCRIPT SMALL LETTER BETA
-U+01D67           ᵧ            \_gamma                                      GREEK SUBSCRIPT SMALL LETTER GAMMA
-U+01D68           ᵨ            \_rho                                        GREEK SUBSCRIPT SMALL LETTER RHO
-U+01D69           ᵩ            \_phi                                        GREEK SUBSCRIPT SMALL LETTER PHI
-U+01D6A           ᵪ            \_chi                                        GREEK SUBSCRIPT SMALL LETTER CHI
-U+01D9C           ᶜ            \^c                                          MODIFIER LETTER SMALL C
-U+01DA0           ᶠ            \^f                                          MODIFIER LETTER SMALL F
-U+01DA5           ᶥ            \^iota                                       MODIFIER LETTER SMALL IOTA
-U+01DB2           ᶲ            \^Phi                                        MODIFIER LETTER SMALL PHI
-U+01DBB           ᶻ            \^z                                          MODIFIER LETTER SMALL Z
-U+01DBF           ᶿ            \^theta                                      MODIFIER LETTER SMALL THETA
-U+02002                        \enspace                                     EN SPACE
-U+02003                        \quad                                        EM SPACE
-U+02005                        \thickspace                                  FOUR-PER-EM SPACE
-U+02009                        \thinspace                                   THIN SPACE
-U+0200A                        \hspace                                      HAIR SPACE
-U+02013           –            \endash                                      EN DASH
-U+02014           —            \emdash                                      EM DASH
-U+02016           ‖            \Vert                                        DOUBLE VERTICAL LINE / DOUBLE VERTICAL BAR
-U+02018           ‘            \lq                                          LEFT SINGLE QUOTATION MARK / SINGLE TURNED COMMA QUOTATION MARK
-U+02019           ’            \rq                                          RIGHT SINGLE QUOTATION MARK / SINGLE COMMA QUOTATION MARK
-U+0201B           ‛            \reapos                                      SINGLE HIGH-REVERSED-9 QUOTATION MARK / SINGLE REVERSED COMMA QUOTATION MARK
-U+0201C           “            \quotedblleft                                LEFT DOUBLE QUOTATION MARK / DOUBLE TURNED COMMA QUOTATION MARK
-U+0201D           ”            \quotedblright                               RIGHT DOUBLE QUOTATION MARK / DOUBLE COMMA QUOTATION MARK
-U+02020           †            \dagger                                      DAGGER
-U+02021           ‡            \ddagger                                     DOUBLE DAGGER
-U+02022           •            \bullet                                      BULLET
-U+02026           …            \dots, \ldots                                HORIZONTAL ELLIPSIS
-U+02030           ‰            \perthousand                                 PER MILLE SIGN
-U+02031           ‱            \pertenthousand                              PER TEN THOUSAND SIGN
-U+02032           ′            \prime                                       PRIME
-U+02033           ″            \pprime                                      DOUBLE PRIME
-U+02034           ‴            \ppprime                                     TRIPLE PRIME
-U+02035           ‵            \backprime                                   REVERSED PRIME
-U+02036           ‶            \backpprime                                  REVERSED DOUBLE PRIME
-U+02037           ‷            \backppprime                                 REVERSED TRIPLE PRIME
-U+02039           ‹            \guilsinglleft                               SINGLE LEFT-POINTING ANGLE QUOTATION MARK / LEFT POINTING SINGLE GUILLEMET
-U+0203A           ›            \guilsinglright                              SINGLE RIGHT-POINTING ANGLE QUOTATION MARK / RIGHT POINTING SINGLE GUILLEMET
-U+0203C           ‼            \:bangbang:                                  DOUBLE EXCLAMATION MARK
-U+02040           ⁀            \tieconcat                                   CHARACTER TIE
-U+02049           ⁉            \:interrobang:                               EXCLAMATION QUESTION MARK
-U+02057           ⁗            \pppprime                                    QUADRUPLE PRIME
-U+0205D           ⁝            \tricolon                                    TRICOLON
-U+02060           ⁠            \nolinebreak                                 WORD JOINER
-U+02070           ⁰            \^0                                          SUPERSCRIPT ZERO / SUPERSCRIPT DIGIT ZERO
-U+02071           ⁱ            \^i                                          SUPERSCRIPT LATIN SMALL LETTER I
-U+02074           ⁴            \^4                                          SUPERSCRIPT FOUR / SUPERSCRIPT DIGIT FOUR
-U+02075           ⁵            \^5                                          SUPERSCRIPT FIVE / SUPERSCRIPT DIGIT FIVE
-U+02076           ⁶            \^6                                          SUPERSCRIPT SIX / SUPERSCRIPT DIGIT SIX
-U+02077           ⁷            \^7                                          SUPERSCRIPT SEVEN / SUPERSCRIPT DIGIT SEVEN
-U+02078           ⁸            \^8                                          SUPERSCRIPT EIGHT / SUPERSCRIPT DIGIT EIGHT
-U+02079           ⁹            \^9                                          SUPERSCRIPT NINE / SUPERSCRIPT DIGIT NINE
-U+0207A           ⁺            \^+                                          SUPERSCRIPT PLUS SIGN
-U+0207B           ⁻            \^-                                          SUPERSCRIPT MINUS / SUPERSCRIPT HYPHEN-MINUS
-U+0207C           ⁼            \^=                                          SUPERSCRIPT EQUALS SIGN
-U+0207D           ⁽            \^(                                          SUPERSCRIPT LEFT PARENTHESIS / SUPERSCRIPT OPENING PARENTHESIS
-U+0207E           ⁾            \^)                                          SUPERSCRIPT RIGHT PARENTHESIS / SUPERSCRIPT CLOSING PARENTHESIS
-U+0207F           ⁿ            \^n                                          SUPERSCRIPT LATIN SMALL LETTER N
-U+02080           ₀            \_0                                          SUBSCRIPT ZERO / SUBSCRIPT DIGIT ZERO
-U+02081           ₁            \_1                                          SUBSCRIPT ONE / SUBSCRIPT DIGIT ONE
-U+02082           ₂            \_2                                          SUBSCRIPT TWO / SUBSCRIPT DIGIT TWO
-U+02083           ₃            \_3                                          SUBSCRIPT THREE / SUBSCRIPT DIGIT THREE
-U+02084           ₄            \_4                                          SUBSCRIPT FOUR / SUBSCRIPT DIGIT FOUR
-U+02085           ₅            \_5                                          SUBSCRIPT FIVE / SUBSCRIPT DIGIT FIVE
-U+02086           ₆            \_6                                          SUBSCRIPT SIX / SUBSCRIPT DIGIT SIX
-U+02087           ₇            \_7                                          SUBSCRIPT SEVEN / SUBSCRIPT DIGIT SEVEN
-U+02088           ₈            \_8                                          SUBSCRIPT EIGHT / SUBSCRIPT DIGIT EIGHT
-U+02089           ₉            \_9                                          SUBSCRIPT NINE / SUBSCRIPT DIGIT NINE
-U+0208A           ₊            \_+                                          SUBSCRIPT PLUS SIGN
-U+0208B           ₋            \_-                                          SUBSCRIPT MINUS / SUBSCRIPT HYPHEN-MINUS
-U+0208C           ₌            \_=                                          SUBSCRIPT EQUALS SIGN
-U+0208D           ₍            \_(                                          SUBSCRIPT LEFT PARENTHESIS / SUBSCRIPT OPENING PARENTHESIS
-U+0208E           ₎            \_)                                          SUBSCRIPT RIGHT PARENTHESIS / SUBSCRIPT CLOSING PARENTHESIS
-U+02090           ₐ            \_a                                          LATIN SUBSCRIPT SMALL LETTER A
-U+02091           ₑ            \_e                                          LATIN SUBSCRIPT SMALL LETTER E
-U+02092           ₒ            \_o                                          LATIN SUBSCRIPT SMALL LETTER O
-U+02093           ₓ            \_x                                          LATIN SUBSCRIPT SMALL LETTER X
-U+02094           ₔ            \_schwa                                      LATIN SUBSCRIPT SMALL LETTER SCHWA
-U+02095           ₕ            \_h                                          LATIN SUBSCRIPT SMALL LETTER H
-U+02096           ₖ            \_k                                          LATIN SUBSCRIPT SMALL LETTER K
-U+02097           ₗ            \_l                                          LATIN SUBSCRIPT SMALL LETTER L
-U+02098           ₘ            \_m                                          LATIN SUBSCRIPT SMALL LETTER M
-U+02099           ₙ            \_n                                          LATIN SUBSCRIPT SMALL LETTER N
-U+0209A           ₚ            \_p                                          LATIN SUBSCRIPT SMALL LETTER P
-U+0209B           ₛ            \_s                                          LATIN SUBSCRIPT SMALL LETTER S
-U+0209C           ₜ            \_t                                          LATIN SUBSCRIPT SMALL LETTER T
-U+020A7           ₧            \pes                                         PESETA SIGN
-U+020AC           €            \euro                                        EURO SIGN
-U+020D0           ◌⃐           \leftharpoonaccent                           COMBINING LEFT HARPOON ABOVE / NON-SPACING LEFT HARPOON ABOVE
-U+020D1           ◌⃑           \rightharpoonaccent                          COMBINING RIGHT HARPOON ABOVE / NON-SPACING RIGHT HARPOON ABOVE
-U+020D2           ◌⃒           \vertoverlay                                 COMBINING LONG VERTICAL LINE OVERLAY / NON-SPACING LONG VERTICAL BAR OVERLAY
-U+020D6           ◌⃖           \overleftarrow                               COMBINING LEFT ARROW ABOVE / NON-SPACING LEFT ARROW ABOVE
-U+020D7           ◌⃗           \vec                                         COMBINING RIGHT ARROW ABOVE / NON-SPACING RIGHT ARROW ABOVE
-U+020DB           ◌⃛           \dddot                                       COMBINING THREE DOTS ABOVE / NON-SPACING THREE DOTS ABOVE
-U+020DC           ◌⃜           \ddddot                                      COMBINING FOUR DOTS ABOVE / NON-SPACING FOUR DOTS ABOVE
-U+020DD           ◌⃝           \enclosecircle                               COMBINING ENCLOSING CIRCLE / ENCLOSING CIRCLE
-U+020DE           ◌⃞           \enclosesquare                               COMBINING ENCLOSING SQUARE / ENCLOSING SQUARE
-U+020DF           ◌⃟           \enclosediamond                              COMBINING ENCLOSING DIAMOND / ENCLOSING DIAMOND
-U+020E1           ◌⃡           \overleftrightarrow                          COMBINING LEFT RIGHT ARROW ABOVE / NON-SPACING LEFT RIGHT ARROW ABOVE
-U+020E4           ◌⃤           \enclosetriangle                             COMBINING ENCLOSING UPWARD POINTING TRIANGLE
-U+020E7           ◌⃧           \annuity                                     COMBINING ANNUITY SYMBOL
-U+020E8           ◌⃨           \threeunderdot                               COMBINING TRIPLE UNDERDOT
-U+020E9           ◌⃩           \widebridgeabove                             COMBINING WIDE BRIDGE ABOVE
-U+020EC           ◌⃬           \underrightharpoondown                       COMBINING RIGHTWARDS HARPOON WITH BARB DOWNWARDS
-U+020ED           ◌⃭           \underleftharpoondown                        COMBINING LEFTWARDS HARPOON WITH BARB DOWNWARDS
-U+020EE           ◌⃮           \underleftarrow                              COMBINING LEFT ARROW BELOW
-U+020EF           ◌⃯           \underrightarrow                             COMBINING RIGHT ARROW BELOW
-U+020F0           ◌⃰           \asteraccent                                 COMBINING ASTERISK ABOVE
-U+02102           ℂ            \bbC                                         DOUBLE-STRUCK CAPITAL C / DOUBLE-STRUCK C
-U+02107           ℇ            \eulermascheroni                             EULER CONSTANT / EULERS
-U+0210A           ℊ            \scrg                                        SCRIPT SMALL G
-U+0210B           ℋ            \scrH                                        SCRIPT CAPITAL H / SCRIPT H
-U+0210C           ℌ            \frakH                                       BLACK-LETTER CAPITAL H / BLACK-LETTER H
-U+0210D           ℍ            \bbH                                         DOUBLE-STRUCK CAPITAL H / DOUBLE-STRUCK H
-U+0210E           ℎ            \planck                                      PLANCK CONSTANT
-U+0210F           ℏ            \hslash                                      PLANCK CONSTANT OVER TWO PI / PLANCK CONSTANT OVER 2 PI
-U+02110           ℐ            \scrI                                        SCRIPT CAPITAL I / SCRIPT I
-U+02111           ℑ            \Im                                          BLACK-LETTER CAPITAL I / BLACK-LETTER I
-U+02112           ℒ            \scrL                                        SCRIPT CAPITAL L / SCRIPT L
-U+02113           ℓ            \ell                                         SCRIPT SMALL L
-U+02115           ℕ            \bbN                                         DOUBLE-STRUCK CAPITAL N / DOUBLE-STRUCK N
-U+02116           №            \numero                                      NUMERO SIGN / NUMERO
-U+02118           ℘            \wp                                          SCRIPT CAPITAL P / SCRIPT P
-U+02119           ℙ            \bbP                                         DOUBLE-STRUCK CAPITAL P / DOUBLE-STRUCK P
-U+0211A           ℚ            \bbQ                                         DOUBLE-STRUCK CAPITAL Q / DOUBLE-STRUCK Q
-U+0211B           ℛ            \scrR                                        SCRIPT CAPITAL R / SCRIPT R
-U+0211C           ℜ            \Re                                          BLACK-LETTER CAPITAL R / BLACK-LETTER R
-U+0211D           ℝ            \bbR                                         DOUBLE-STRUCK CAPITAL R / DOUBLE-STRUCK R
-U+0211E           ℞            \xrat                                        PRESCRIPTION TAKE
-U+02122           ™            \trademark, \:tm:                            TRADE MARK SIGN / TRADEMARK
-U+02124           ℤ            \bbZ                                         DOUBLE-STRUCK CAPITAL Z / DOUBLE-STRUCK Z
-U+02126           Ω            \ohm                                         OHM SIGN / OHM
-U+02127           ℧            \mho                                         INVERTED OHM SIGN / MHO
-U+02128           ℨ            \frakZ                                       BLACK-LETTER CAPITAL Z / BLACK-LETTER Z
-U+02129           ℩            \turnediota                                  TURNED GREEK SMALL LETTER IOTA
-U+0212B           Å            \Angstrom                                    ANGSTROM SIGN / ANGSTROM UNIT
-U+0212C           ℬ            \scrB                                        SCRIPT CAPITAL B / SCRIPT B
-U+0212D           ℭ            \frakC                                       BLACK-LETTER CAPITAL C / BLACK-LETTER C
-U+0212F           ℯ            \scre, \euler                                SCRIPT SMALL E
-U+02130           ℰ            \scrE                                        SCRIPT CAPITAL E / SCRIPT E
-U+02131           ℱ            \scrF                                        SCRIPT CAPITAL F / SCRIPT F
-U+02132           Ⅎ            \Finv                                        TURNED CAPITAL F / TURNED F
-U+02133           ℳ            \scrM                                        SCRIPT CAPITAL M / SCRIPT M
-U+02134           ℴ            \scro                                        SCRIPT SMALL O
-U+02135           ℵ            \aleph                                       ALEF SYMBOL / FIRST TRANSFINITE CARDINAL
-U+02136           ℶ            \beth                                        BET SYMBOL / SECOND TRANSFINITE CARDINAL
-U+02137           ℷ            \gimel                                       GIMEL SYMBOL / THIRD TRANSFINITE CARDINAL
-U+02138           ℸ            \daleth                                      DALET SYMBOL / FOURTH TRANSFINITE CARDINAL
-U+02139           ℹ            \:information_source:                        INFORMATION SOURCE
-U+0213C           ℼ            \bbpi                                        DOUBLE-STRUCK SMALL PI
-U+0213D           ℽ            \bbgamma                                     DOUBLE-STRUCK SMALL GAMMA
-U+0213E           ℾ            \bbGamma                                     DOUBLE-STRUCK CAPITAL GAMMA
-U+0213F           ℿ            \bbPi                                        DOUBLE-STRUCK CAPITAL PI
-U+02140           ⅀            \bbsum                                       DOUBLE-STRUCK N-ARY SUMMATION
-U+02141           ⅁            \Game                                        TURNED SANS-SERIF CAPITAL G
-U+02142           ⅂            \sansLturned                                 TURNED SANS-SERIF CAPITAL L
-U+02143           ⅃            \sansLmirrored                               REVERSED SANS-SERIF CAPITAL L
-U+02144           ⅄            \Yup                                         TURNED SANS-SERIF CAPITAL Y
-U+02145           ⅅ            \bbiD                                        DOUBLE-STRUCK ITALIC CAPITAL D
-U+02146           ⅆ            \bbid                                        DOUBLE-STRUCK ITALIC SMALL D
-U+02147           ⅇ            \bbie                                        DOUBLE-STRUCK ITALIC SMALL E
-U+02148           ⅈ            \bbii                                        DOUBLE-STRUCK ITALIC SMALL I
-U+02149           ⅉ            \bbij                                        DOUBLE-STRUCK ITALIC SMALL J
-U+0214A           ⅊            \PropertyLine                                PROPERTY LINE
-U+0214B           ⅋            \upand                                       TURNED AMPERSAND
-U+02150           ⅐            \1/7                                         VULGAR FRACTION ONE SEVENTH
-U+02151           ⅑            \1/9                                         VULGAR FRACTION ONE NINTH
-U+02152           ⅒            \1/10                                        VULGAR FRACTION ONE TENTH
-U+02153           ⅓            \1/3                                         VULGAR FRACTION ONE THIRD / FRACTION ONE THIRD
-U+02154           ⅔            \2/3                                         VULGAR FRACTION TWO THIRDS / FRACTION TWO THIRDS
-U+02155           ⅕            \1/5                                         VULGAR FRACTION ONE FIFTH / FRACTION ONE FIFTH
-U+02156           ⅖            \2/5                                         VULGAR FRACTION TWO FIFTHS / FRACTION TWO FIFTHS
-U+02157           ⅗            \3/5                                         VULGAR FRACTION THREE FIFTHS / FRACTION THREE FIFTHS
-U+02158           ⅘            \4/5                                         VULGAR FRACTION FOUR FIFTHS / FRACTION FOUR FIFTHS
-U+02159           ⅙            \1/6                                         VULGAR FRACTION ONE SIXTH / FRACTION ONE SIXTH
-U+0215A           ⅚            \5/6                                         VULGAR FRACTION FIVE SIXTHS / FRACTION FIVE SIXTHS
-U+0215B           ⅛            \1/8                                         VULGAR FRACTION ONE EIGHTH / FRACTION ONE EIGHTH
-U+0215C           ⅜            \3/8                                         VULGAR FRACTION THREE EIGHTHS / FRACTION THREE EIGHTHS
-U+0215D           ⅝            \5/8                                         VULGAR FRACTION FIVE EIGHTHS / FRACTION FIVE EIGHTHS
-U+0215E           ⅞            \7/8                                         VULGAR FRACTION SEVEN EIGHTHS / FRACTION SEVEN EIGHTHS
-U+0215F           ⅟            \1/                                          FRACTION NUMERATOR ONE
-U+02189           ↉            \0/3                                         VULGAR FRACTION ZERO THIRDS
-U+02190           ←            \leftarrow                                   LEFTWARDS ARROW / LEFT ARROW
-U+02191           ↑            \uparrow                                     UPWARDS ARROW / UP ARROW
-U+02192           →            \to, \rightarrow                             RIGHTWARDS ARROW / RIGHT ARROW
-U+02193           ↓            \downarrow                                   DOWNWARDS ARROW / DOWN ARROW
-U+02194           ↔            \leftrightarrow, \:left_right_arrow:         LEFT RIGHT ARROW
-U+02195           ↕            \updownarrow, \:arrow_up_down:               UP DOWN ARROW
-U+02196           ↖            \nwarrow, \:arrow_upper_left:                NORTH WEST ARROW / UPPER LEFT ARROW
-U+02197           ↗            \nearrow, \:arrow_upper_right:               NORTH EAST ARROW / UPPER RIGHT ARROW
-U+02198           ↘            \searrow, \:arrow_lower_right:               SOUTH EAST ARROW / LOWER RIGHT ARROW
-U+02199           ↙            \swarrow, \:arrow_lower_left:                SOUTH WEST ARROW / LOWER LEFT ARROW
-U+0219A           ↚            \nleftarrow                                  LEFTWARDS ARROW WITH STROKE / LEFT ARROW WITH STROKE
-U+0219B           ↛            \nrightarrow                                 RIGHTWARDS ARROW WITH STROKE / RIGHT ARROW WITH STROKE
-U+0219C           ↜            \leftwavearrow                               LEFTWARDS WAVE ARROW / LEFT WAVE ARROW
-U+0219D           ↝            \rightwavearrow                              RIGHTWARDS WAVE ARROW / RIGHT WAVE ARROW
-U+0219E           ↞            \twoheadleftarrow                            LEFTWARDS TWO HEADED ARROW / LEFT TWO HEADED ARROW
-U+0219F           ↟            \twoheaduparrow                              UPWARDS TWO HEADED ARROW / UP TWO HEADED ARROW
-U+021A0           ↠            \twoheadrightarrow                           RIGHTWARDS TWO HEADED ARROW / RIGHT TWO HEADED ARROW
-U+021A1           ↡            \twoheaddownarrow                            DOWNWARDS TWO HEADED ARROW / DOWN TWO HEADED ARROW
-U+021A2           ↢            \leftarrowtail                               LEFTWARDS ARROW WITH TAIL / LEFT ARROW WITH TAIL
-U+021A3           ↣            \rightarrowtail                              RIGHTWARDS ARROW WITH TAIL / RIGHT ARROW WITH TAIL
-U+021A4           ↤            \mapsfrom                                    LEFTWARDS ARROW FROM BAR / LEFT ARROW FROM BAR
-U+021A5           ↥            \mapsup                                      UPWARDS ARROW FROM BAR / UP ARROW FROM BAR
-U+021A6           ↦            \mapsto                                      RIGHTWARDS ARROW FROM BAR / RIGHT ARROW FROM BAR
-U+021A7           ↧            \mapsdown                                    DOWNWARDS ARROW FROM BAR / DOWN ARROW FROM BAR
-U+021A8           ↨            \updownarrowbar                              UP DOWN ARROW WITH BASE
-U+021A9           ↩            \hookleftarrow, \:leftwards_arrow_with_hook: LEFTWARDS ARROW WITH HOOK / LEFT ARROW WITH HOOK
-U+021AA           ↪            \hookrightarrow, \:arrow_right_hook:         RIGHTWARDS ARROW WITH HOOK / RIGHT ARROW WITH HOOK
-U+021AB           ↫            \looparrowleft                               LEFTWARDS ARROW WITH LOOP / LEFT ARROW WITH LOOP
-U+021AC           ↬            \looparrowright                              RIGHTWARDS ARROW WITH LOOP / RIGHT ARROW WITH LOOP
-U+021AD           ↭            \leftrightsquigarrow                         LEFT RIGHT WAVE ARROW
-U+021AE           ↮            \nleftrightarrow                             LEFT RIGHT ARROW WITH STROKE
-U+021AF           ↯            \downzigzagarrow                             DOWNWARDS ZIGZAG ARROW / DOWN ZIGZAG ARROW
-U+021B0           ↰            \Lsh                                         UPWARDS ARROW WITH TIP LEFTWARDS / UP ARROW WITH TIP LEFT
-U+021B1           ↱            \Rsh                                         UPWARDS ARROW WITH TIP RIGHTWARDS / UP ARROW WITH TIP RIGHT
-U+021B2           ↲            \Ldsh                                        DOWNWARDS ARROW WITH TIP LEFTWARDS / DOWN ARROW WITH TIP LEFT
-U+021B3           ↳            \Rdsh                                        DOWNWARDS ARROW WITH TIP RIGHTWARDS / DOWN ARROW WITH TIP RIGHT
-U+021B4           ↴            \linefeed                                    RIGHTWARDS ARROW WITH CORNER DOWNWARDS / RIGHT ARROW WITH CORNER DOWN
-U+021B5           ↵            \carriagereturn                              DOWNWARDS ARROW WITH CORNER LEFTWARDS / DOWN ARROW WITH CORNER LEFT
-U+021B6           ↶            \curvearrowleft                              ANTICLOCKWISE TOP SEMICIRCLE ARROW
-U+021B7           ↷            \curvearrowright                             CLOCKWISE TOP SEMICIRCLE ARROW
-U+021B8           ↸            \barovernorthwestarrow                       NORTH WEST ARROW TO LONG BAR / UPPER LEFT ARROW TO LONG BAR
-U+021B9           ↹            \barleftarrowrightarrowbar                   LEFTWARDS ARROW TO BAR OVER RIGHTWARDS ARROW TO BAR / LEFT ARROW TO BAR OVER RIGHT ARROW TO BAR
-U+021BA           ↺            \circlearrowleft                             ANTICLOCKWISE OPEN CIRCLE ARROW
-U+021BB           ↻            \circlearrowright                            CLOCKWISE OPEN CIRCLE ARROW
-U+021BC           ↼            \leftharpoonup                               LEFTWARDS HARPOON WITH BARB UPWARDS / LEFT HARPOON WITH BARB UP
-U+021BD           ↽            \leftharpoondown                             LEFTWARDS HARPOON WITH BARB DOWNWARDS / LEFT HARPOON WITH BARB DOWN
-U+021BE           ↾            \upharpoonright                              UPWARDS HARPOON WITH BARB RIGHTWARDS / UP HARPOON WITH BARB RIGHT
-U+021BF           ↿            \upharpoonleft                               UPWARDS HARPOON WITH BARB LEFTWARDS / UP HARPOON WITH BARB LEFT
-U+021C0           ⇀            \rightharpoonup                              RIGHTWARDS HARPOON WITH BARB UPWARDS / RIGHT HARPOON WITH BARB UP
-U+021C1           ⇁            \rightharpoondown                            RIGHTWARDS HARPOON WITH BARB DOWNWARDS / RIGHT HARPOON WITH BARB DOWN
-U+021C2           ⇂            \downharpoonright                            DOWNWARDS HARPOON WITH BARB RIGHTWARDS / DOWN HARPOON WITH BARB RIGHT
-U+021C3           ⇃            \downharpoonleft                             DOWNWARDS HARPOON WITH BARB LEFTWARDS / DOWN HARPOON WITH BARB LEFT
-U+021C4           ⇄            \rightleftarrows                             RIGHTWARDS ARROW OVER LEFTWARDS ARROW / RIGHT ARROW OVER LEFT ARROW
-U+021C5           ⇅            \dblarrowupdown                              UPWARDS ARROW LEFTWARDS OF DOWNWARDS ARROW / UP ARROW LEFT OF DOWN ARROW
-U+021C6           ⇆            \leftrightarrows                             LEFTWARDS ARROW OVER RIGHTWARDS ARROW / LEFT ARROW OVER RIGHT ARROW
-U+021C7           ⇇            \leftleftarrows                              LEFTWARDS PAIRED ARROWS / LEFT PAIRED ARROWS
-U+021C8           ⇈            \upuparrows                                  UPWARDS PAIRED ARROWS / UP PAIRED ARROWS
-U+021C9           ⇉            \rightrightarrows                            RIGHTWARDS PAIRED ARROWS / RIGHT PAIRED ARROWS
-U+021CA           ⇊            \downdownarrows                              DOWNWARDS PAIRED ARROWS / DOWN PAIRED ARROWS
-U+021CB           ⇋            \leftrightharpoons                           LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON / LEFT HARPOON OVER RIGHT HARPOON
-U+021CC           ⇌            \rightleftharpoons                           RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON / RIGHT HARPOON OVER LEFT HARPOON
-U+021CD           ⇍            \nLeftarrow                                  LEFTWARDS DOUBLE ARROW WITH STROKE / LEFT DOUBLE ARROW WITH STROKE
-U+021CE           ⇎            \nLeftrightarrow                             LEFT RIGHT DOUBLE ARROW WITH STROKE
-U+021CF           ⇏            \nRightarrow                                 RIGHTWARDS DOUBLE ARROW WITH STROKE / RIGHT DOUBLE ARROW WITH STROKE
-U+021D0           ⇐            \Leftarrow                                   LEFTWARDS DOUBLE ARROW / LEFT DOUBLE ARROW
-U+021D1           ⇑            \Uparrow                                     UPWARDS DOUBLE ARROW / UP DOUBLE ARROW
-U+021D2           ⇒            \Rightarrow                                  RIGHTWARDS DOUBLE ARROW / RIGHT DOUBLE ARROW
-U+021D3           ⇓            \Downarrow                                   DOWNWARDS DOUBLE ARROW / DOWN DOUBLE ARROW
-U+021D4           ⇔            \Leftrightarrow                              LEFT RIGHT DOUBLE ARROW
-U+021D5           ⇕            \Updownarrow                                 UP DOWN DOUBLE ARROW
-U+021D6           ⇖            \Nwarrow                                     NORTH WEST DOUBLE ARROW / UPPER LEFT DOUBLE ARROW
-U+021D7           ⇗            \Nearrow                                     NORTH EAST DOUBLE ARROW / UPPER RIGHT DOUBLE ARROW
-U+021D8           ⇘            \Searrow                                     SOUTH EAST DOUBLE ARROW / LOWER RIGHT DOUBLE ARROW
-U+021D9           ⇙            \Swarrow                                     SOUTH WEST DOUBLE ARROW / LOWER LEFT DOUBLE ARROW
-U+021DA           ⇚            \Lleftarrow                                  LEFTWARDS TRIPLE ARROW / LEFT TRIPLE ARROW
-U+021DB           ⇛            \Rrightarrow                                 RIGHTWARDS TRIPLE ARROW / RIGHT TRIPLE ARROW
-U+021DC           ⇜            \leftsquigarrow                              LEFTWARDS SQUIGGLE ARROW / LEFT SQUIGGLE ARROW
-U+021DD           ⇝            \rightsquigarrow                             RIGHTWARDS SQUIGGLE ARROW / RIGHT SQUIGGLE ARROW
-U+021DE           ⇞            \nHuparrow                                   UPWARDS ARROW WITH DOUBLE STROKE / UP ARROW WITH DOUBLE STROKE
-U+021DF           ⇟            \nHdownarrow                                 DOWNWARDS ARROW WITH DOUBLE STROKE / DOWN ARROW WITH DOUBLE STROKE
-U+021E0           ⇠            \leftdasharrow                               LEFTWARDS DASHED ARROW / LEFT DASHED ARROW
-U+021E1           ⇡            \updasharrow                                 UPWARDS DASHED ARROW / UP DASHED ARROW
-U+021E2           ⇢            \rightdasharrow                              RIGHTWARDS DASHED ARROW / RIGHT DASHED ARROW
-U+021E3           ⇣            \downdasharrow                               DOWNWARDS DASHED ARROW / DOWN DASHED ARROW
-U+021E4           ⇤            \barleftarrow                                LEFTWARDS ARROW TO BAR / LEFT ARROW TO BAR
-U+021E5           ⇥            \rightarrowbar                               RIGHTWARDS ARROW TO BAR / RIGHT ARROW TO BAR
-U+021E6           ⇦            \leftwhitearrow                              LEFTWARDS WHITE ARROW / WHITE LEFT ARROW
-U+021E7           ⇧            \upwhitearrow                                UPWARDS WHITE ARROW / WHITE UP ARROW
-U+021E8           ⇨            \rightwhitearrow                             RIGHTWARDS WHITE ARROW / WHITE RIGHT ARROW
-U+021E9           ⇩            \downwhitearrow                              DOWNWARDS WHITE ARROW / WHITE DOWN ARROW
-U+021EA           ⇪            \whitearrowupfrombar                         UPWARDS WHITE ARROW FROM BAR / WHITE UP ARROW FROM BAR
-U+021F4           ⇴            \circleonrightarrow                          RIGHT ARROW WITH SMALL CIRCLE
-U+021F5           ⇵            \DownArrowUpArrow                            DOWNWARDS ARROW LEFTWARDS OF UPWARDS ARROW
-U+021F6           ⇶            \rightthreearrows                            THREE RIGHTWARDS ARROWS
-U+021F7           ⇷            \nvleftarrow                                 LEFTWARDS ARROW WITH VERTICAL STROKE
-U+021F8           ⇸            \nvrightarrow                                RIGHTWARDS ARROW WITH VERTICAL STROKE
-U+021F9           ⇹            \nvleftrightarrow                            LEFT RIGHT ARROW WITH VERTICAL STROKE
-U+021FA           ⇺            \nVleftarrow                                 LEFTWARDS ARROW WITH DOUBLE VERTICAL STROKE
-U+021FB           ⇻            \nVrightarrow                                RIGHTWARDS ARROW WITH DOUBLE VERTICAL STROKE
-U+021FC           ⇼            \nVleftrightarrow                            LEFT RIGHT ARROW WITH DOUBLE VERTICAL STROKE
-U+021FD           ⇽            \leftarrowtriangle                           LEFTWARDS OPEN-HEADED ARROW
-U+021FE           ⇾            \rightarrowtriangle                          RIGHTWARDS OPEN-HEADED ARROW
-U+021FF           ⇿            \leftrightarrowtriangle                      LEFT RIGHT OPEN-HEADED ARROW
-U+02200           ∀            \forall                                      FOR ALL
-U+02201           ∁            \complement                                  COMPLEMENT
-U+02202           ∂            \partial                                     PARTIAL DIFFERENTIAL
-U+02203           ∃            \exists                                      THERE EXISTS
-U+02204           ∄            \nexists                                     THERE DOES NOT EXIST
-U+02205           ∅            \varnothing, \emptyset                       EMPTY SET
-U+02206           ∆            \increment                                   INCREMENT
-U+02207           ∇            \del, \nabla                                 NABLA
-U+02208           ∈            \in                                          ELEMENT OF
-U+02209           ∉            \notin                                       NOT AN ELEMENT OF
-U+0220A           ∊            \smallin                                     SMALL ELEMENT OF
-U+0220B           ∋            \ni                                          CONTAINS AS MEMBER
-U+0220C           ∌            \nni                                         DOES NOT CONTAIN AS MEMBER
-U+0220D           ∍            \smallni                                     SMALL CONTAINS AS MEMBER
-U+0220E           ∎            \QED                                         END OF PROOF
-U+0220F           ∏            \prod                                        N-ARY PRODUCT
-U+02210           ∐            \coprod                                      N-ARY COPRODUCT
-U+02211           ∑            \sum                                         N-ARY SUMMATION
-U+02212           −            \minus                                       MINUS SIGN
-U+02213           ∓            \mp                                          MINUS-OR-PLUS SIGN
-U+02214           ∔            \dotplus                                     DOT PLUS
-U+02216           ∖            \setminus                                    SET MINUS
-U+02217           ∗            \ast                                         ASTERISK OPERATOR
-U+02218           ∘            \circ                                        RING OPERATOR
-U+02219           ∙            \vysmblkcircle                               BULLET OPERATOR
-U+0221A           √            \surd, \sqrt                                 SQUARE ROOT
-U+0221B           ∛            \cbrt                                        CUBE ROOT
-U+0221C           ∜            \fourthroot                                  FOURTH ROOT
-U+0221D           ∝            \propto                                      PROPORTIONAL TO
-U+0221E           ∞            \infty                                       INFINITY
-U+0221F           ∟            \rightangle                                  RIGHT ANGLE
-U+02220           ∠            \angle                                       ANGLE
-U+02221           ∡            \measuredangle                               MEASURED ANGLE
-U+02222           ∢            \sphericalangle                              SPHERICAL ANGLE
-U+02223           ∣            \mid                                         DIVIDES
-U+02224           ∤            \nmid                                        DOES NOT DIVIDE
-U+02225           ∥            \parallel                                    PARALLEL TO
-U+02226           ∦            \nparallel                                   NOT PARALLEL TO
-U+02227           ∧            \wedge                                       LOGICAL AND
-U+02228           ∨            \vee                                         LOGICAL OR
-U+02229           ∩            \cap                                         INTERSECTION
-U+0222A           ∪            \cup                                         UNION
-U+0222B           ∫            \int                                         INTEGRAL
-U+0222C           ∬            \iint                                        DOUBLE INTEGRAL
-U+0222D           ∭            \iiint                                       TRIPLE INTEGRAL
-U+0222E           ∮            \oint                                        CONTOUR INTEGRAL
-U+0222F           ∯            \oiint                                       SURFACE INTEGRAL
-U+02230           ∰            \oiiint                                      VOLUME INTEGRAL
-U+02231           ∱            \clwintegral                                 CLOCKWISE INTEGRAL
-U+02232           ∲            \varointclockwise                            CLOCKWISE CONTOUR INTEGRAL
-U+02233           ∳            \ointctrclockwise                            ANTICLOCKWISE CONTOUR INTEGRAL
-U+02234           ∴            \therefore                                   THEREFORE
-U+02235           ∵            \because                                     BECAUSE
-U+02237           ∷            \Colon                                       PROPORTION
-U+02238           ∸            \dotminus                                    DOT MINUS
-U+0223A           ∺            \dotsminusdots                               GEOMETRIC PROPORTION
-U+0223B           ∻            \kernelcontraction                           HOMOTHETIC
-U+0223C           ∼            \sim                                         TILDE OPERATOR
-U+0223D           ∽            \backsim                                     REVERSED TILDE
-U+0223E           ∾            \lazysinv                                    INVERTED LAZY S
-U+0223F           ∿            \sinewave                                    SINE WAVE
-U+02240           ≀            \wr                                          WREATH PRODUCT
-U+02241           ≁            \nsim                                        NOT TILDE
-U+02242           ≂            \eqsim                                       MINUS TILDE
-U+02242 + U+00338 ≂̸           \neqsim                                      MINUS TILDE + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02243           ≃            \simeq                                       ASYMPTOTICALLY EQUAL TO
-U+02244           ≄            \nsime                                       NOT ASYMPTOTICALLY EQUAL TO
-U+02245           ≅            \cong                                        APPROXIMATELY EQUAL TO
-U+02246           ≆            \approxnotequal                              APPROXIMATELY BUT NOT ACTUALLY EQUAL TO
-U+02247           ≇            \ncong                                       NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO
-U+02248           ≈            \approx                                      ALMOST EQUAL TO
-U+02249           ≉            \napprox                                     NOT ALMOST EQUAL TO
-U+0224A           ≊            \approxeq                                    ALMOST EQUAL OR EQUAL TO
-U+0224B           ≋            \tildetrpl                                   TRIPLE TILDE
-U+0224C           ≌            \allequal                                    ALL EQUAL TO
-U+0224D           ≍            \asymp                                       EQUIVALENT TO
-U+0224E           ≎            \Bumpeq                                      GEOMETRICALLY EQUIVALENT TO
-U+0224E + U+00338 ≎̸           \nBumpeq                                     GEOMETRICALLY EQUIVALENT TO + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+0224F           ≏            \bumpeq                                      DIFFERENCE BETWEEN
-U+0224F + U+00338 ≏̸           \nbumpeq                                     DIFFERENCE BETWEEN + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02250           ≐            \doteq                                       APPROACHES THE LIMIT
-U+02251           ≑            \Doteq                                       GEOMETRICALLY EQUAL TO
-U+02252           ≒            \fallingdotseq                               APPROXIMATELY EQUAL TO OR THE IMAGE OF
-U+02253           ≓            \risingdotseq                                IMAGE OF OR APPROXIMATELY EQUAL TO
-U+02254           ≔            \coloneq                                     COLON EQUALS / COLON EQUAL
-U+02255           ≕            \eqcolon                                     EQUALS COLON / EQUAL COLON
-U+02256           ≖            \eqcirc                                      RING IN EQUAL TO
-U+02257           ≗            \circeq                                      RING EQUAL TO
-U+02258           ≘            \arceq                                       CORRESPONDS TO
-U+02259           ≙            \wedgeq                                      ESTIMATES
-U+0225A           ≚            \veeeq                                       EQUIANGULAR TO
-U+0225B           ≛            \starequal                                   STAR EQUALS
-U+0225C           ≜            \triangleq                                   DELTA EQUAL TO
-U+0225D           ≝            \eqdef                                       EQUAL TO BY DEFINITION
-U+0225E           ≞            \measeq                                      MEASURED BY
-U+0225F           ≟            \questeq                                     QUESTIONED EQUAL TO
-U+02260           ≠            \ne                                          NOT EQUAL TO
-U+02261           ≡            \equiv                                       IDENTICAL TO
-U+02262           ≢            \nequiv                                      NOT IDENTICAL TO
-U+02263           ≣            \Equiv                                       STRICTLY EQUIVALENT TO
-U+02264           ≤            \le, \leq                                    LESS-THAN OR EQUAL TO / LESS THAN OR EQUAL TO
-U+02265           ≥            \ge, \geq                                    GREATER-THAN OR EQUAL TO / GREATER THAN OR EQUAL TO
-U+02266           ≦            \leqq                                        LESS-THAN OVER EQUAL TO / LESS THAN OVER EQUAL TO
-U+02267           ≧            \geqq                                        GREATER-THAN OVER EQUAL TO / GREATER THAN OVER EQUAL TO
-U+02268           ≨            \lneqq                                       LESS-THAN BUT NOT EQUAL TO / LESS THAN BUT NOT EQUAL TO
-U+02268 + U+0FE00 ≨︀           \lvertneqq                                   LESS-THAN BUT NOT EQUAL TO / LESS THAN BUT NOT EQUAL TO + VARIATION SELECTOR-1
-U+02269           ≩            \gneqq                                       GREATER-THAN BUT NOT EQUAL TO / GREATER THAN BUT NOT EQUAL TO
-U+02269 + U+0FE00 ≩︀           \gvertneqq                                   GREATER-THAN BUT NOT EQUAL TO / GREATER THAN BUT NOT EQUAL TO + VARIATION SELECTOR-1
-U+0226A           ≪            \ll                                          MUCH LESS-THAN / MUCH LESS THAN
-U+0226A + U+00338 ≪̸           \NotLessLess                                 MUCH LESS-THAN / MUCH LESS THAN + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+0226B           ≫            \gg                                          MUCH GREATER-THAN / MUCH GREATER THAN
-U+0226B + U+00338 ≫̸           \NotGreaterGreater                           MUCH GREATER-THAN / MUCH GREATER THAN + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+0226C           ≬            \between                                     BETWEEN
-U+0226D           ≭            \nasymp                                      NOT EQUIVALENT TO
-U+0226E           ≮            \nless                                       NOT LESS-THAN / NOT LESS THAN
-U+0226F           ≯            \ngtr                                        NOT GREATER-THAN / NOT GREATER THAN
-U+02270           ≰            \nleq                                        NEITHER LESS-THAN NOR EQUAL TO / NEITHER LESS THAN NOR EQUAL TO
-U+02271           ≱            \ngeq                                        NEITHER GREATER-THAN NOR EQUAL TO / NEITHER GREATER THAN NOR EQUAL TO
-U+02272           ≲            \lesssim                                     LESS-THAN OR EQUIVALENT TO / LESS THAN OR EQUIVALENT TO
-U+02273           ≳            \gtrsim                                      GREATER-THAN OR EQUIVALENT TO / GREATER THAN OR EQUIVALENT TO
-U+02274           ≴            \nlesssim                                    NEITHER LESS-THAN NOR EQUIVALENT TO / NEITHER LESS THAN NOR EQUIVALENT TO
-U+02275           ≵            \ngtrsim                                     NEITHER GREATER-THAN NOR EQUIVALENT TO / NEITHER GREATER THAN NOR EQUIVALENT TO
-U+02276           ≶            \lessgtr                                     LESS-THAN OR GREATER-THAN / LESS THAN OR GREATER THAN
-U+02277           ≷            \gtrless                                     GREATER-THAN OR LESS-THAN / GREATER THAN OR LESS THAN
-U+02278           ≸            \notlessgreater                              NEITHER LESS-THAN NOR GREATER-THAN / NEITHER LESS THAN NOR GREATER THAN
-U+02279           ≹            \notgreaterless                              NEITHER GREATER-THAN NOR LESS-THAN / NEITHER GREATER THAN NOR LESS THAN
-U+0227A           ≺            \prec                                        PRECEDES
-U+0227B           ≻            \succ                                        SUCCEEDS
-U+0227C           ≼            \preccurlyeq                                 PRECEDES OR EQUAL TO
-U+0227D           ≽            \succcurlyeq                                 SUCCEEDS OR EQUAL TO
-U+0227E           ≾            \precsim                                     PRECEDES OR EQUIVALENT TO
-U+0227E + U+00338 ≾̸           \nprecsim                                    PRECEDES OR EQUIVALENT TO + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+0227F           ≿            \succsim                                     SUCCEEDS OR EQUIVALENT TO
-U+0227F + U+00338 ≿̸           \nsuccsim                                    SUCCEEDS OR EQUIVALENT TO + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02280           ⊀            \nprec                                       DOES NOT PRECEDE
-U+02281           ⊁            \nsucc                                       DOES NOT SUCCEED
-U+02282           ⊂            \subset                                      SUBSET OF
-U+02283           ⊃            \supset                                      SUPERSET OF
-U+02284           ⊄            \nsubset                                     NOT A SUBSET OF
-U+02285           ⊅            \nsupset                                     NOT A SUPERSET OF
-U+02286           ⊆            \subseteq                                    SUBSET OF OR EQUAL TO
-U+02287           ⊇            \supseteq                                    SUPERSET OF OR EQUAL TO
-U+02288           ⊈            \nsubseteq                                   NEITHER A SUBSET OF NOR EQUAL TO
-U+02289           ⊉            \nsupseteq                                   NEITHER A SUPERSET OF NOR EQUAL TO
-U+0228A           ⊊            \subsetneq                                   SUBSET OF WITH NOT EQUAL TO / SUBSET OF OR NOT EQUAL TO
-U+0228A + U+0FE00 ⊊︀           \varsubsetneqq                               SUBSET OF WITH NOT EQUAL TO / SUBSET OF OR NOT EQUAL TO + VARIATION SELECTOR-1
-U+0228B           ⊋            \supsetneq                                   SUPERSET OF WITH NOT EQUAL TO / SUPERSET OF OR NOT EQUAL TO
-U+0228B + U+0FE00 ⊋︀           \varsupsetneq                                SUPERSET OF WITH NOT EQUAL TO / SUPERSET OF OR NOT EQUAL TO + VARIATION SELECTOR-1
-U+0228D           ⊍            \cupdot                                      MULTISET MULTIPLICATION
-U+0228E           ⊎            \uplus                                       MULTISET UNION
-U+0228F           ⊏            \sqsubset                                    SQUARE IMAGE OF
-U+0228F + U+00338 ⊏̸           \NotSquareSubset                             SQUARE IMAGE OF + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02290           ⊐            \sqsupset                                    SQUARE ORIGINAL OF
-U+02290 + U+00338 ⊐̸           \NotSquareSuperset                           SQUARE ORIGINAL OF + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02291           ⊑            \sqsubseteq                                  SQUARE IMAGE OF OR EQUAL TO
-U+02292           ⊒            \sqsupseteq                                  SQUARE ORIGINAL OF OR EQUAL TO
-U+02293           ⊓            \sqcap                                       SQUARE CAP
-U+02294           ⊔            \sqcup                                       SQUARE CUP
-U+02295           ⊕            \oplus                                       CIRCLED PLUS
-U+02296           ⊖            \ominus                                      CIRCLED MINUS
-U+02297           ⊗            \otimes                                      CIRCLED TIMES
-U+02298           ⊘            \oslash                                      CIRCLED DIVISION SLASH
-U+02299           ⊙            \odot                                        CIRCLED DOT OPERATOR
-U+0229A           ⊚            \circledcirc                                 CIRCLED RING OPERATOR
-U+0229B           ⊛            \circledast                                  CIRCLED ASTERISK OPERATOR
-U+0229C           ⊜            \circledequal                                CIRCLED EQUALS
-U+0229D           ⊝            \circleddash                                 CIRCLED DASH
-U+0229E           ⊞            \boxplus                                     SQUARED PLUS
-U+0229F           ⊟            \boxminus                                    SQUARED MINUS
-U+022A0           ⊠            \boxtimes                                    SQUARED TIMES
-U+022A1           ⊡            \boxdot                                      SQUARED DOT OPERATOR
-U+022A2           ⊢            \vdash                                       RIGHT TACK
-U+022A3           ⊣            \dashv                                       LEFT TACK
-U+022A4           ⊤            \top                                         DOWN TACK
-U+022A5           ⊥            \bot                                         UP TACK
-U+022A7           ⊧            \models                                      MODELS
-U+022A8           ⊨            \vDash                                       TRUE
-U+022A9           ⊩            \Vdash                                       FORCES
-U+022AA           ⊪            \Vvdash                                      TRIPLE VERTICAL BAR RIGHT TURNSTILE
-U+022AB           ⊫            \VDash                                       DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE
-U+022AC           ⊬            \nvdash                                      DOES NOT PROVE
-U+022AD           ⊭            \nvDash                                      NOT TRUE
-U+022AE           ⊮            \nVdash                                      DOES NOT FORCE
-U+022AF           ⊯            \nVDash                                      NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE
-U+022B0           ⊰            \prurel                                      PRECEDES UNDER RELATION
-U+022B1           ⊱            \scurel                                      SUCCEEDS UNDER RELATION
-U+022B2           ⊲            \vartriangleleft                             NORMAL SUBGROUP OF
-U+022B3           ⊳            \vartriangleright                            CONTAINS AS NORMAL SUBGROUP
-U+022B4           ⊴            \trianglelefteq                              NORMAL SUBGROUP OF OR EQUAL TO
-U+022B5           ⊵            \trianglerighteq                             CONTAINS AS NORMAL SUBGROUP OR EQUAL TO
-U+022B6           ⊶            \original                                    ORIGINAL OF
-U+022B7           ⊷            \image                                       IMAGE OF
-U+022B8           ⊸            \multimap                                    MULTIMAP
-U+022B9           ⊹            \hermitconjmatrix                            HERMITIAN CONJUGATE MATRIX
-U+022BA           ⊺            \intercal                                    INTERCALATE
-U+022BB           ⊻            \veebar, \xor                                XOR
-U+022BC           ⊼            \barwedge                                    NAND
-U+022BD           ⊽            \barvee                                      NOR
-U+022BE           ⊾            \rightanglearc                               RIGHT ANGLE WITH ARC
-U+022BF           ⊿            \varlrtriangle                               RIGHT TRIANGLE
-U+022C0           ⋀            \bigwedge                                    N-ARY LOGICAL AND
-U+022C1           ⋁            \bigvee                                      N-ARY LOGICAL OR
-U+022C2           ⋂            \bigcap                                      N-ARY INTERSECTION
-U+022C3           ⋃            \bigcup                                      N-ARY UNION
-U+022C4           ⋄            \diamond                                     DIAMOND OPERATOR
-U+022C5           ⋅            \cdot                                        DOT OPERATOR
-U+022C6           ⋆            \star                                        STAR OPERATOR
-U+022C7           ⋇            \divideontimes                               DIVISION TIMES
-U+022C8           ⋈            \bowtie                                      BOWTIE
-U+022C9           ⋉            \ltimes                                      LEFT NORMAL FACTOR SEMIDIRECT PRODUCT
-U+022CA           ⋊            \rtimes                                      RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT
-U+022CB           ⋋            \leftthreetimes                              LEFT SEMIDIRECT PRODUCT
-U+022CC           ⋌            \rightthreetimes                             RIGHT SEMIDIRECT PRODUCT
-U+022CD           ⋍            \backsimeq                                   REVERSED TILDE EQUALS
-U+022CE           ⋎            \curlyvee                                    CURLY LOGICAL OR
-U+022CF           ⋏            \curlywedge                                  CURLY LOGICAL AND
-U+022D0           ⋐            \Subset                                      DOUBLE SUBSET
-U+022D1           ⋑            \Supset                                      DOUBLE SUPERSET
-U+022D2           ⋒            \Cap                                         DOUBLE INTERSECTION
-U+022D3           ⋓            \Cup                                         DOUBLE UNION
-U+022D4           ⋔            \pitchfork                                   PITCHFORK
-U+022D5           ⋕            \equalparallel                               EQUAL AND PARALLEL TO
-U+022D6           ⋖            \lessdot                                     LESS-THAN WITH DOT / LESS THAN WITH DOT
-U+022D7           ⋗            \gtrdot                                      GREATER-THAN WITH DOT / GREATER THAN WITH DOT
-U+022D8           ⋘            \verymuchless                                VERY MUCH LESS-THAN / VERY MUCH LESS THAN
-U+022D9           ⋙            \ggg                                         VERY MUCH GREATER-THAN / VERY MUCH GREATER THAN
-U+022DA           ⋚            \lesseqgtr                                   LESS-THAN EQUAL TO OR GREATER-THAN / LESS THAN EQUAL TO OR GREATER THAN
-U+022DB           ⋛            \gtreqless                                   GREATER-THAN EQUAL TO OR LESS-THAN / GREATER THAN EQUAL TO OR LESS THAN
-U+022DC           ⋜            \eqless                                      EQUAL TO OR LESS-THAN / EQUAL TO OR LESS THAN
-U+022DD           ⋝            \eqgtr                                       EQUAL TO OR GREATER-THAN / EQUAL TO OR GREATER THAN
-U+022DE           ⋞            \curlyeqprec                                 EQUAL TO OR PRECEDES
-U+022DF           ⋟            \curlyeqsucc                                 EQUAL TO OR SUCCEEDS
-U+022E0           ⋠            \npreccurlyeq                                DOES NOT PRECEDE OR EQUAL
-U+022E1           ⋡            \nsucccurlyeq                                DOES NOT SUCCEED OR EQUAL
-U+022E2           ⋢            \nsqsubseteq                                 NOT SQUARE IMAGE OF OR EQUAL TO
-U+022E3           ⋣            \nsqsupseteq                                 NOT SQUARE ORIGINAL OF OR EQUAL TO
-U+022E4           ⋤            \sqsubsetneq                                 SQUARE IMAGE OF OR NOT EQUAL TO
-U+022E5           ⋥            \sqspne                                      SQUARE ORIGINAL OF OR NOT EQUAL TO
-U+022E6           ⋦            \lnsim                                       LESS-THAN BUT NOT EQUIVALENT TO / LESS THAN BUT NOT EQUIVALENT TO
-U+022E7           ⋧            \gnsim                                       GREATER-THAN BUT NOT EQUIVALENT TO / GREATER THAN BUT NOT EQUIVALENT TO
-U+022E8           ⋨            \precnsim                                    PRECEDES BUT NOT EQUIVALENT TO
-U+022E9           ⋩            \succnsim                                    SUCCEEDS BUT NOT EQUIVALENT TO
-U+022EA           ⋪            \ntriangleleft                               NOT NORMAL SUBGROUP OF
-U+022EB           ⋫            \ntriangleright                              DOES NOT CONTAIN AS NORMAL SUBGROUP
-U+022EC           ⋬            \ntrianglelefteq                             NOT NORMAL SUBGROUP OF OR EQUAL TO
-U+022ED           ⋭            \ntrianglerighteq                            DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL
-U+022EE           ⋮            \vdots                                       VERTICAL ELLIPSIS
-U+022EF           ⋯            \cdots                                       MIDLINE HORIZONTAL ELLIPSIS
-U+022F0           ⋰            \adots                                       UP RIGHT DIAGONAL ELLIPSIS
-U+022F1           ⋱            \ddots                                       DOWN RIGHT DIAGONAL ELLIPSIS
-U+022F2           ⋲            \disin                                       ELEMENT OF WITH LONG HORIZONTAL STROKE
-U+022F3           ⋳            \varisins                                    ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
-U+022F4           ⋴            \isins                                       SMALL ELEMENT OF WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
-U+022F5           ⋵            \isindot                                     ELEMENT OF WITH DOT ABOVE
-U+022F6           ⋶            \varisinobar                                 ELEMENT OF WITH OVERBAR
-U+022F7           ⋷            \isinobar                                    SMALL ELEMENT OF WITH OVERBAR
-U+022F8           ⋸            \isinvb                                      ELEMENT OF WITH UNDERBAR
-U+022F9           ⋹            \isinE                                       ELEMENT OF WITH TWO HORIZONTAL STROKES
-U+022FA           ⋺            \nisd                                        CONTAINS WITH LONG HORIZONTAL STROKE
-U+022FB           ⋻            \varnis                                      CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
-U+022FC           ⋼            \nis                                         SMALL CONTAINS WITH VERTICAL BAR AT END OF HORIZONTAL STROKE
-U+022FD           ⋽            \varniobar                                   CONTAINS WITH OVERBAR
-U+022FE           ⋾            \niobar                                      SMALL CONTAINS WITH OVERBAR
-U+022FF           ⋿            \bagmember                                   Z NOTATION BAG MEMBERSHIP
-U+02300           ⌀            \diameter                                    DIAMETER SIGN
-U+02302           ⌂            \house                                       HOUSE
-U+02305           ⌅            \varbarwedge                                 PROJECTIVE
-U+02306           ⌆            \vardoublebarwedge                           PERSPECTIVE
-U+02308           ⌈            \lceil                                       LEFT CEILING
-U+02309           ⌉            \rceil                                       RIGHT CEILING
-U+0230A           ⌊            \lfloor                                      LEFT FLOOR
-U+0230B           ⌋            \rfloor                                      RIGHT FLOOR
-U+02310           ⌐            \invnot                                      REVERSED NOT SIGN
-U+02311           ⌑            \sqlozenge                                   SQUARE LOZENGE
-U+02312           ⌒            \profline                                    ARC
-U+02313           ⌓            \profsurf                                    SEGMENT
-U+02315           ⌕            \recorder                                    TELEPHONE RECORDER
-U+02317           ⌗            \viewdata                                    VIEWDATA SQUARE
-U+02319           ⌙            \turnednot                                   TURNED NOT SIGN
-U+0231A           ⌚            \:watch:                                     WATCH
-U+0231B           ⌛            \:hourglass:                                 HOURGLASS
-U+0231C           ⌜            \ulcorner                                    TOP LEFT CORNER
-U+0231D           ⌝            \urcorner                                    TOP RIGHT CORNER
-U+0231E           ⌞            \llcorner                                    BOTTOM LEFT CORNER
-U+0231F           ⌟            \lrcorner                                    BOTTOM RIGHT CORNER
-U+02322           ⌢            \frown                                       FROWN
-U+02323           ⌣            \smile                                       SMILE
-U+0232C           ⌬            \varhexagonlrbonds                           BENZENE RING
-U+02332           ⌲            \conictaper                                  CONICAL TAPER
-U+02336           ⌶            \topbot                                      APL FUNCTIONAL SYMBOL I-BEAM
-U+0233D           ⌽            \obar                                        APL FUNCTIONAL SYMBOL CIRCLE STILE
-U+0233F           ⌿            \notslash                                    APL FUNCTIONAL SYMBOL SLASH BAR
-U+02340           ⍀            \notbackslash                                APL FUNCTIONAL SYMBOL BACKSLASH BAR
-U+02353           ⍓            \boxupcaret                                  APL FUNCTIONAL SYMBOL QUAD UP CARET
-U+02370           ⍰            \boxquestion                                 APL FUNCTIONAL SYMBOL QUAD QUESTION
-U+02394           ⎔            \hexagon                                     SOFTWARE-FUNCTION SYMBOL
-U+023A3           ⎣            \dlcorn                                      LEFT SQUARE BRACKET LOWER CORNER
-U+023B0           ⎰            \lmoustache                                  UPPER LEFT OR LOWER RIGHT CURLY BRACKET SECTION
-U+023B1           ⎱            \rmoustache                                  UPPER RIGHT OR LOWER LEFT CURLY BRACKET SECTION
-U+023B4           ⎴            \overbracket                                 TOP SQUARE BRACKET
-U+023B5           ⎵            \underbracket                                BOTTOM SQUARE BRACKET
-U+023B6           ⎶            \bbrktbrk                                    BOTTOM SQUARE BRACKET OVER TOP SQUARE BRACKET
-U+023B7           ⎷            \sqrtbottom                                  RADICAL SYMBOL BOTTOM
-U+023B8           ⎸            \lvboxline                                   LEFT VERTICAL BOX LINE
-U+023B9           ⎹            \rvboxline                                   RIGHT VERTICAL BOX LINE
-U+023CE           ⏎            \varcarriagereturn                           RETURN SYMBOL
-U+023DE           ⏞            \overbrace                                   TOP CURLY BRACKET
-U+023DF           ⏟            \underbrace                                  BOTTOM CURLY BRACKET
-U+023E2           ⏢            \trapezium                                   WHITE TRAPEZIUM
-U+023E3           ⏣            \benzenr                                     BENZENE RING WITH CIRCLE
-U+023E4           ⏤            \strns                                       STRAIGHTNESS
-U+023E5           ⏥            \fltns                                       FLATNESS
-U+023E6           ⏦            \accurrent                                   AC CURRENT
-U+023E7           ⏧            \elinters                                    ELECTRICAL INTERSECTION
-U+023E9           ⏩            \:fast_forward:                              BLACK RIGHT-POINTING DOUBLE TRIANGLE
-U+023EA           ⏪            \:rewind:                                    BLACK LEFT-POINTING DOUBLE TRIANGLE
-U+023EB           ⏫            \:arrow_double_up:                           BLACK UP-POINTING DOUBLE TRIANGLE
-U+023EC           ⏬            \:arrow_double_down:                         BLACK DOWN-POINTING DOUBLE TRIANGLE
-U+023F0           ⏰            \:alarm_clock:                               ALARM CLOCK
-U+023F3           ⏳            \:hourglass_flowing_sand:                    HOURGLASS WITH FLOWING SAND
-U+02422           ␢            \blanksymbol                                 BLANK SYMBOL / BLANK
-U+02423           ␣            \visiblespace                                OPEN BOX
-U+024C2           Ⓜ            \:m:                                         CIRCLED LATIN CAPITAL LETTER M
-U+024C8           Ⓢ            \circledS                                    CIRCLED LATIN CAPITAL LETTER S
-U+02506           ┆            \dshfnc                                      BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL / FORMS LIGHT TRIPLE DASH VERTICAL
-U+02519           ┙            \sqfnw                                       BOX DRAWINGS UP LIGHT AND LEFT HEAVY / FORMS UP LIGHT AND LEFT HEAVY
-U+02571           ╱            \diagup                                      BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT / FORMS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT
-U+02572           ╲            \diagdown                                    BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT / FORMS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT
-U+02580           ▀            \blockuphalf                                 UPPER HALF BLOCK
-U+02584           ▄            \blocklowhalf                                LOWER HALF BLOCK
-U+02588           █            \blockfull                                   FULL BLOCK
-U+0258C           ▌            \blocklefthalf                               LEFT HALF BLOCK
-U+02590           ▐            \blockrighthalf                              RIGHT HALF BLOCK
-U+02591           ░            \blockqtrshaded                              LIGHT SHADE
-U+02592           ▒            \blockhalfshaded                             MEDIUM SHADE
-U+02593           ▓            \blockthreeqtrshaded                         DARK SHADE
-U+025A0           ■            \blacksquare                                 BLACK SQUARE
-U+025A1           □            \square                                      WHITE SQUARE
-U+025A2           ▢            \squoval                                     WHITE SQUARE WITH ROUNDED CORNERS
-U+025A3           ▣            \blackinwhitesquare                          WHITE SQUARE CONTAINING BLACK SMALL SQUARE
-U+025A4           ▤            \squarehfill                                 SQUARE WITH HORIZONTAL FILL
-U+025A5           ▥            \squarevfill                                 SQUARE WITH VERTICAL FILL
-U+025A6           ▦            \squarehvfill                                SQUARE WITH ORTHOGONAL CROSSHATCH FILL
-U+025A7           ▧            \squarenwsefill                              SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL
-U+025A8           ▨            \squareneswfill                              SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL
-U+025A9           ▩            \squarecrossfill                             SQUARE WITH DIAGONAL CROSSHATCH FILL
-U+025AA           ▪            \smblksquare, \:black_small_square:          BLACK SMALL SQUARE
-U+025AB           ▫            \smwhtsquare, \:white_small_square:          WHITE SMALL SQUARE
-U+025AC           ▬            \hrectangleblack                             BLACK RECTANGLE
-U+025AD           ▭            \hrectangle                                  WHITE RECTANGLE
-U+025AE           ▮            \vrectangleblack                             BLACK VERTICAL RECTANGLE
-U+025AF           ▯            \vrecto                                      WHITE VERTICAL RECTANGLE
-U+025B0           ▰            \parallelogramblack                          BLACK PARALLELOGRAM
-U+025B1           ▱            \parallelogram                               WHITE PARALLELOGRAM
-U+025B2           ▲            \bigblacktriangleup                          BLACK UP-POINTING TRIANGLE / BLACK UP POINTING TRIANGLE
-U+025B3           △            \bigtriangleup                               WHITE UP-POINTING TRIANGLE / WHITE UP POINTING TRIANGLE
-U+025B4           ▴            \blacktriangle                               BLACK UP-POINTING SMALL TRIANGLE / BLACK UP POINTING SMALL TRIANGLE
-U+025B5           ▵            \vartriangle                                 WHITE UP-POINTING SMALL TRIANGLE / WHITE UP POINTING SMALL TRIANGLE
-U+025B6           ▶            \blacktriangleright, \:arrow_forward:        BLACK RIGHT-POINTING TRIANGLE / BLACK RIGHT POINTING TRIANGLE
-U+025B7           ▷            \triangleright                               WHITE RIGHT-POINTING TRIANGLE / WHITE RIGHT POINTING TRIANGLE
-U+025B8           ▸            \smallblacktriangleright                     BLACK RIGHT-POINTING SMALL TRIANGLE / BLACK RIGHT POINTING SMALL TRIANGLE
-U+025B9           ▹            \smalltriangleright                          WHITE RIGHT-POINTING SMALL TRIANGLE / WHITE RIGHT POINTING SMALL TRIANGLE
-U+025BA           ►            \blackpointerright                           BLACK RIGHT-POINTING POINTER / BLACK RIGHT POINTING POINTER
-U+025BB           ▻            \whitepointerright                           WHITE RIGHT-POINTING POINTER / WHITE RIGHT POINTING POINTER
-U+025BC           ▼            \bigblacktriangledown                        BLACK DOWN-POINTING TRIANGLE / BLACK DOWN POINTING TRIANGLE
-U+025BD           ▽            \bigtriangledown                             WHITE DOWN-POINTING TRIANGLE / WHITE DOWN POINTING TRIANGLE
-U+025BE           ▾            \blacktriangledown                           BLACK DOWN-POINTING SMALL TRIANGLE / BLACK DOWN POINTING SMALL TRIANGLE
-U+025BF           ▿            \triangledown                                WHITE DOWN-POINTING SMALL TRIANGLE / WHITE DOWN POINTING SMALL TRIANGLE
-U+025C0           ◀            \blacktriangleleft, \:arrow_backward:        BLACK LEFT-POINTING TRIANGLE / BLACK LEFT POINTING TRIANGLE
-U+025C1           ◁            \triangleleft                                WHITE LEFT-POINTING TRIANGLE / WHITE LEFT POINTING TRIANGLE
-U+025C2           ◂            \smallblacktriangleleft                      BLACK LEFT-POINTING SMALL TRIANGLE / BLACK LEFT POINTING SMALL TRIANGLE
-U+025C3           ◃            \smalltriangleleft                           WHITE LEFT-POINTING SMALL TRIANGLE / WHITE LEFT POINTING SMALL TRIANGLE
-U+025C4           ◄            \blackpointerleft                            BLACK LEFT-POINTING POINTER / BLACK LEFT POINTING POINTER
-U+025C5           ◅            \whitepointerleft                            WHITE LEFT-POINTING POINTER / WHITE LEFT POINTING POINTER
-U+025C6           ◆            \mdlgblkdiamond                              BLACK DIAMOND
-U+025C7           ◇            \mdlgwhtdiamond                              WHITE DIAMOND
-U+025C8           ◈            \blackinwhitediamond                         WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND
-U+025C9           ◉            \fisheye                                     FISHEYE
-U+025CA           ◊            \lozenge                                     LOZENGE
-U+025CB           ○            \bigcirc                                     WHITE CIRCLE
-U+025CC           ◌            \dottedcircle                                DOTTED CIRCLE
-U+025CD           ◍            \circlevertfill                              CIRCLE WITH VERTICAL FILL
-U+025CE           ◎            \bullseye                                    BULLSEYE
-U+025CF           ●            \mdlgblkcircle                               BLACK CIRCLE
-U+025D0           ◐            \cirfl                                       CIRCLE WITH LEFT HALF BLACK
-U+025D1           ◑            \cirfr                                       CIRCLE WITH RIGHT HALF BLACK
-U+025D2           ◒            \cirfb                                       CIRCLE WITH LOWER HALF BLACK
-U+025D3           ◓            \circletophalfblack                          CIRCLE WITH UPPER HALF BLACK
-U+025D4           ◔            \circleurquadblack                           CIRCLE WITH UPPER RIGHT QUADRANT BLACK
-U+025D5           ◕            \blackcircleulquadwhite                      CIRCLE WITH ALL BUT UPPER LEFT QUADRANT BLACK
-U+025D6           ◖            \blacklefthalfcircle                         LEFT HALF BLACK CIRCLE
-U+025D7           ◗            \blackrighthalfcircle                        RIGHT HALF BLACK CIRCLE
-U+025D8           ◘            \rvbull                                      INVERSE BULLET
-U+025D9           ◙            \inversewhitecircle                          INVERSE WHITE CIRCLE
-U+025DA           ◚            \invwhiteupperhalfcircle                     UPPER HALF INVERSE WHITE CIRCLE
-U+025DB           ◛            \invwhitelowerhalfcircle                     LOWER HALF INVERSE WHITE CIRCLE
-U+025DC           ◜            \ularc                                       UPPER LEFT QUADRANT CIRCULAR ARC
-U+025DD           ◝            \urarc                                       UPPER RIGHT QUADRANT CIRCULAR ARC
-U+025DE           ◞            \lrarc                                       LOWER RIGHT QUADRANT CIRCULAR ARC
-U+025DF           ◟            \llarc                                       LOWER LEFT QUADRANT CIRCULAR ARC
-U+025E0           ◠            \topsemicircle                               UPPER HALF CIRCLE
-U+025E1           ◡            \botsemicircle                               LOWER HALF CIRCLE
-U+025E2           ◢            \lrblacktriangle                             BLACK LOWER RIGHT TRIANGLE
-U+025E3           ◣            \llblacktriangle                             BLACK LOWER LEFT TRIANGLE
-U+025E4           ◤            \ulblacktriangle                             BLACK UPPER LEFT TRIANGLE
-U+025E5           ◥            \urblacktriangle                             BLACK UPPER RIGHT TRIANGLE
-U+025E6           ◦            \smwhtcircle                                 WHITE BULLET
-U+025E7           ◧            \sqfl                                        SQUARE WITH LEFT HALF BLACK
-U+025E8           ◨            \sqfr                                        SQUARE WITH RIGHT HALF BLACK
-U+025E9           ◩            \squareulblack                               SQUARE WITH UPPER LEFT DIAGONAL HALF BLACK
-U+025EA           ◪            \sqfse                                       SQUARE WITH LOWER RIGHT DIAGONAL HALF BLACK
-U+025EB           ◫            \boxbar                                      WHITE SQUARE WITH VERTICAL BISECTING LINE
-U+025EC           ◬            \trianglecdot                                WHITE UP-POINTING TRIANGLE WITH DOT / WHITE UP POINTING TRIANGLE WITH DOT
-U+025ED           ◭            \triangleleftblack                           UP-POINTING TRIANGLE WITH LEFT HALF BLACK / UP POINTING TRIANGLE WITH LEFT HALF BLACK
-U+025EE           ◮            \trianglerightblack                          UP-POINTING TRIANGLE WITH RIGHT HALF BLACK / UP POINTING TRIANGLE WITH RIGHT HALF BLACK
-U+025EF           ◯            \lgwhtcircle                                 LARGE CIRCLE
-U+025F0           ◰            \squareulquad                                WHITE SQUARE WITH UPPER LEFT QUADRANT
-U+025F1           ◱            \squarellquad                                WHITE SQUARE WITH LOWER LEFT QUADRANT
-U+025F2           ◲            \squarelrquad                                WHITE SQUARE WITH LOWER RIGHT QUADRANT
-U+025F3           ◳            \squareurquad                                WHITE SQUARE WITH UPPER RIGHT QUADRANT
-U+025F4           ◴            \circleulquad                                WHITE CIRCLE WITH UPPER LEFT QUADRANT
-U+025F5           ◵            \circlellquad                                WHITE CIRCLE WITH LOWER LEFT QUADRANT
-U+025F6           ◶            \circlelrquad                                WHITE CIRCLE WITH LOWER RIGHT QUADRANT
-U+025F7           ◷            \circleurquad                                WHITE CIRCLE WITH UPPER RIGHT QUADRANT
-U+025F8           ◸            \ultriangle                                  UPPER LEFT TRIANGLE
-U+025F9           ◹            \urtriangle                                  UPPER RIGHT TRIANGLE
-U+025FA           ◺            \lltriangle                                  LOWER LEFT TRIANGLE
-U+025FB           ◻            \mdwhtsquare, \:white_medium_square:         WHITE MEDIUM SQUARE
-U+025FC           ◼            \mdblksquare, \:black_medium_square:         BLACK MEDIUM SQUARE
-U+025FD           ◽            \mdsmwhtsquare, \:white_medium_small_square: WHITE MEDIUM SMALL SQUARE
-U+025FE           ◾            \mdsmblksquare, \:black_medium_small_square: BLACK MEDIUM SMALL SQUARE
-U+025FF           ◿            \lrtriangle                                  LOWER RIGHT TRIANGLE
-U+02600           ☀            \:sunny:                                     BLACK SUN WITH RAYS
-U+02601           ☁            \:cloud:                                     CLOUD
-U+02605           ★            \bigstar                                     BLACK STAR
-U+02606           ☆            \bigwhitestar                                WHITE STAR
-U+02609           ☉            \astrosun                                    SUN
-U+0260E           ☎            \:phone:                                     BLACK TELEPHONE
-U+02611           ☑            \:ballot_box_with_check:                     BALLOT BOX WITH CHECK
-U+02614           ☔            \:umbrella:                                  UMBRELLA WITH RAIN DROPS
-U+02615           ☕            \:coffee:                                    HOT BEVERAGE
-U+0261D           ☝            \:point_up:                                  WHITE UP POINTING INDEX
-U+02621           ☡            \danger                                      CAUTION SIGN
-U+0263A           ☺            \:relaxed:                                   WHITE SMILING FACE
-U+0263B           ☻            \blacksmiley                                 BLACK SMILING FACE
-U+0263C           ☼            \sun                                         WHITE SUN WITH RAYS
-U+0263D           ☽            \rightmoon                                   FIRST QUARTER MOON
-U+0263E           ☾            \leftmoon                                    LAST QUARTER MOON
-U+0263F           ☿            \mercury                                     MERCURY
-U+02640           ♀            \venus, \female                              FEMALE SIGN
-U+02642           ♂            \male, \mars                                 MALE SIGN
-U+02643           ♃            \jupiter                                     JUPITER
-U+02644           ♄            \saturn                                      SATURN
-U+02645           ♅            \uranus                                      URANUS
-U+02646           ♆            \neptune                                     NEPTUNE
-U+02647           ♇            \pluto                                       PLUTO
-U+02648           ♈            \aries, \:aries:                             ARIES
-U+02649           ♉            \taurus, \:taurus:                           TAURUS
-U+0264A           ♊            \gemini, \:gemini:                           GEMINI
-U+0264B           ♋            \cancer, \:cancer:                           CANCER
-U+0264C           ♌            \leo, \:leo:                                 LEO
-U+0264D           ♍            \virgo, \:virgo:                             VIRGO
-U+0264E           ♎            \libra, \:libra:                             LIBRA
-U+0264F           ♏            \scorpio, \:scorpius:                        SCORPIUS
-U+02650           ♐            \sagittarius, \:sagittarius:                 SAGITTARIUS
-U+02651           ♑            \capricornus, \:capricorn:                   CAPRICORN
-U+02652           ♒            \aquarius, \:aquarius:                       AQUARIUS
-U+02653           ♓            \pisces, \:pisces:                           PISCES
-U+02660           ♠            \spadesuit, \:spades:                        BLACK SPADE SUIT
-U+02661           ♡            \heartsuit                                   WHITE HEART SUIT
-U+02662           ♢            \diamondsuit                                 WHITE DIAMOND SUIT
-U+02663           ♣            \clubsuit, \:clubs:                          BLACK CLUB SUIT
-U+02664           ♤            \varspadesuit                                WHITE SPADE SUIT
-U+02665           ♥            \varheartsuit, \:hearts:                     BLACK HEART SUIT
-U+02666           ♦            \vardiamondsuit, \:diamonds:                 BLACK DIAMOND SUIT
-U+02667           ♧            \varclubsuit                                 WHITE CLUB SUIT
-U+02668           ♨            \:hotsprings:                                HOT SPRINGS
-U+02669           ♩            \quarternote                                 QUARTER NOTE
-U+0266A           ♪            \eighthnote                                  EIGHTH NOTE
-U+0266B           ♫            \twonotes                                    BEAMED EIGHTH NOTES / BARRED EIGHTH NOTES
-U+0266D           ♭            \flat                                        MUSIC FLAT SIGN / FLAT
-U+0266E           ♮            \natural                                     MUSIC NATURAL SIGN / NATURAL
-U+0266F           ♯            \sharp                                       MUSIC SHARP SIGN / SHARP
-U+0267B           ♻            \:recycle:                                   BLACK UNIVERSAL RECYCLING SYMBOL
-U+0267E           ♾            \acidfree                                    PERMANENT PAPER SIGN
-U+0267F           ♿            \:wheelchair:                                WHEELCHAIR SYMBOL
-U+02680           ⚀            \dicei                                       DIE FACE-1
-U+02681           ⚁            \diceii                                      DIE FACE-2
-U+02682           ⚂            \diceiii                                     DIE FACE-3
-U+02683           ⚃            \diceiv                                      DIE FACE-4
-U+02684           ⚄            \dicev                                       DIE FACE-5
-U+02685           ⚅            \dicevi                                      DIE FACE-6
-U+02686           ⚆            \circledrightdot                             WHITE CIRCLE WITH DOT RIGHT
-U+02687           ⚇            \circledtwodots                              WHITE CIRCLE WITH TWO DOTS
-U+02688           ⚈            \blackcircledrightdot                        BLACK CIRCLE WITH WHITE DOT RIGHT
-U+02689           ⚉            \blackcircledtwodots                         BLACK CIRCLE WITH TWO WHITE DOTS
-U+02693           ⚓            \:anchor:                                    ANCHOR
-U+026A0           ⚠            \:warning:                                   WARNING SIGN
-U+026A1           ⚡            \:zap:                                       HIGH VOLTAGE SIGN
-U+026A5           ⚥            \hermaphrodite                               MALE AND FEMALE SIGN
-U+026AA           ⚪            \mdwhtcircle, \:white_circle:                MEDIUM WHITE CIRCLE
-U+026AB           ⚫            \mdblkcircle, \:black_circle:                MEDIUM BLACK CIRCLE
-U+026AC           ⚬            \mdsmwhtcircle                               MEDIUM SMALL WHITE CIRCLE
-U+026B2           ⚲            \neuter                                      NEUTER
-U+026BD           ⚽            \:soccer:                                    SOCCER BALL
-U+026BE           ⚾            \:baseball:                                  BASEBALL
-U+026C4           ⛄            \:snowman:                                   SNOWMAN WITHOUT SNOW
-U+026C5           ⛅            \:partly_sunny:                              SUN BEHIND CLOUD
-U+026CE           ⛎            \:ophiuchus:                                 OPHIUCHUS
-U+026D4           ⛔            \:no_entry:                                  NO ENTRY
-U+026EA           ⛪            \:church:                                    CHURCH
-U+026F2           ⛲            \:fountain:                                  FOUNTAIN
-U+026F3           ⛳            \:golf:                                      FLAG IN HOLE
-U+026F5           ⛵            \:boat:                                      SAILBOAT
-U+026FA           ⛺            \:tent:                                      TENT
-U+026FD           ⛽            \:fuelpump:                                  FUEL PUMP
-U+02702           ✂            \:scissors:                                  BLACK SCISSORS
-U+02705           ✅            \:white_check_mark:                          WHITE HEAVY CHECK MARK
-U+02708           ✈            \:airplane:                                  AIRPLANE
-U+02709           ✉            \:email:                                     ENVELOPE
-U+0270A           ✊            \:fist:                                      RAISED FIST
-U+0270B           ✋            \:hand:                                      RAISED HAND
-U+0270C           ✌            \:v:                                         VICTORY HAND
-U+0270F           ✏            \:pencil2:                                   PENCIL
-U+02712           ✒            \:black_nib:                                 BLACK NIB
-U+02713           ✓            \checkmark                                   CHECK MARK
-U+02714           ✔            \:heavy_check_mark:                          HEAVY CHECK MARK
-U+02716           ✖            \:heavy_multiplication_x:                    HEAVY MULTIPLICATION X
-U+02720           ✠            \maltese                                     MALTESE CROSS
-U+02728           ✨            \:sparkles:                                  SPARKLES
-U+0272A           ✪            \circledstar                                 CIRCLED WHITE STAR
-U+02733           ✳            \:eight_spoked_asterisk:                     EIGHT SPOKED ASTERISK
-U+02734           ✴            \:eight_pointed_black_star:                  EIGHT POINTED BLACK STAR
-U+02736           ✶            \varstar                                     SIX POINTED BLACK STAR
-U+0273D           ✽            \dingasterisk                                HEAVY TEARDROP-SPOKED ASTERISK
-U+02744           ❄            \:snowflake:                                 SNOWFLAKE
-U+02747           ❇            \:sparkle:                                   SPARKLE
-U+0274C           ❌            \:x:                                         CROSS MARK
-U+0274E           ❎            \:negative_squared_cross_mark:               NEGATIVE SQUARED CROSS MARK
-U+02753           ❓            \:question:                                  BLACK QUESTION MARK ORNAMENT
-U+02754           ❔            \:grey_question:                             WHITE QUESTION MARK ORNAMENT
-U+02755           ❕            \:grey_exclamation:                          WHITE EXCLAMATION MARK ORNAMENT
-U+02757           ❗            \:exclamation:                               HEAVY EXCLAMATION MARK SYMBOL
-U+02764           ❤            \:heart:                                     HEAVY BLACK HEART
-U+02795           ➕            \:heavy_plus_sign:                           HEAVY PLUS SIGN
-U+02796           ➖            \:heavy_minus_sign:                          HEAVY MINUS SIGN
-U+02797           ➗            \:heavy_division_sign:                       HEAVY DIVISION SIGN
-U+0279B           ➛            \draftingarrow                               DRAFTING POINT RIGHTWARDS ARROW / DRAFTING POINT RIGHT ARROW
-U+027A1           ➡            \:arrow_right:                               BLACK RIGHTWARDS ARROW / BLACK RIGHT ARROW
-U+027B0           ➰            \:curly_loop:                                CURLY LOOP
-U+027BF           ➿            \:loop:                                      DOUBLE CURLY LOOP
-U+027C0           ⟀            \threedangle                                 THREE DIMENSIONAL ANGLE
-U+027C1           ⟁            \whiteinwhitetriangle                        WHITE TRIANGLE CONTAINING SMALL WHITE TRIANGLE
-U+027C2           ⟂            \perp                                        PERPENDICULAR
-U+027C8           ⟈            \bsolhsub                                    REVERSE SOLIDUS PRECEDING SUBSET
-U+027C9           ⟉            \suphsol                                     SUPERSET PRECEDING SOLIDUS
-U+027D1           ⟑            \wedgedot                                    AND WITH DOT
-U+027D2           ⟒            \upin                                        ELEMENT OF OPENING UPWARDS
-U+027D5           ⟕            \leftouterjoin                               LEFT OUTER JOIN
-U+027D6           ⟖            \rightouterjoin                              RIGHT OUTER JOIN
-U+027D7           ⟗            \fullouterjoin                               FULL OUTER JOIN
-U+027D8           ⟘            \bigbot                                      LARGE UP TACK
-U+027D9           ⟙            \bigtop                                      LARGE DOWN TACK
-U+027E6           ⟦            \llbracket, \openbracketleft                 MATHEMATICAL LEFT WHITE SQUARE BRACKET
-U+027E7           ⟧            \openbracketright, \rrbracket                MATHEMATICAL RIGHT WHITE SQUARE BRACKET
-U+027E8           ⟨            \langle                                      MATHEMATICAL LEFT ANGLE BRACKET
-U+027E9           ⟩            \rangle                                      MATHEMATICAL RIGHT ANGLE BRACKET
-U+027F0           ⟰            \UUparrow                                    UPWARDS QUADRUPLE ARROW
-U+027F1           ⟱            \DDownarrow                                  DOWNWARDS QUADRUPLE ARROW
-U+027F5           ⟵            \longleftarrow                               LONG LEFTWARDS ARROW
-U+027F6           ⟶            \longrightarrow                              LONG RIGHTWARDS ARROW
-U+027F7           ⟷            \longleftrightarrow                          LONG LEFT RIGHT ARROW
-U+027F8           ⟸            \impliedby, \Longleftarrow                   LONG LEFTWARDS DOUBLE ARROW
-U+027F9           ⟹            \implies, \Longrightarrow                    LONG RIGHTWARDS DOUBLE ARROW
-U+027FA           ⟺            \Longleftrightarrow, \iff                    LONG LEFT RIGHT DOUBLE ARROW
-U+027FB           ⟻            \longmapsfrom                                LONG LEFTWARDS ARROW FROM BAR
-U+027FC           ⟼            \longmapsto                                  LONG RIGHTWARDS ARROW FROM BAR
-U+027FD           ⟽            \Longmapsfrom                                LONG LEFTWARDS DOUBLE ARROW FROM BAR
-U+027FE           ⟾            \Longmapsto                                  LONG RIGHTWARDS DOUBLE ARROW FROM BAR
-U+027FF           ⟿            \longrightsquigarrow                         LONG RIGHTWARDS SQUIGGLE ARROW
-U+02900           ⤀            \nvtwoheadrightarrow                         RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE
-U+02901           ⤁            \nVtwoheadrightarrow                         RIGHTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE
-U+02902           ⤂            \nvLeftarrow                                 LEFTWARDS DOUBLE ARROW WITH VERTICAL STROKE
-U+02903           ⤃            \nvRightarrow                                RIGHTWARDS DOUBLE ARROW WITH VERTICAL STROKE
-U+02904           ⤄            \nvLeftrightarrow                            LEFT RIGHT DOUBLE ARROW WITH VERTICAL STROKE
-U+02905           ⤅            \twoheadmapsto                               RIGHTWARDS TWO-HEADED ARROW FROM BAR
-U+02906           ⤆            \Mapsfrom                                    LEFTWARDS DOUBLE ARROW FROM BAR
-U+02907           ⤇            \Mapsto                                      RIGHTWARDS DOUBLE ARROW FROM BAR
-U+02908           ⤈            \downarrowbarred                             DOWNWARDS ARROW WITH HORIZONTAL STROKE
-U+02909           ⤉            \uparrowbarred                               UPWARDS ARROW WITH HORIZONTAL STROKE
-U+0290A           ⤊            \Uuparrow                                    UPWARDS TRIPLE ARROW
-U+0290B           ⤋            \Ddownarrow                                  DOWNWARDS TRIPLE ARROW
-U+0290C           ⤌            \leftbkarrow                                 LEFTWARDS DOUBLE DASH ARROW
-U+0290D           ⤍            \bkarow                                      RIGHTWARDS DOUBLE DASH ARROW
-U+0290E           ⤎            \leftdbkarrow                                LEFTWARDS TRIPLE DASH ARROW
-U+0290F           ⤏            \dbkarow                                     RIGHTWARDS TRIPLE DASH ARROW
-U+02910           ⤐            \drbkarrow                                   RIGHTWARDS TWO-HEADED TRIPLE DASH ARROW
-U+02911           ⤑            \rightdotarrow                               RIGHTWARDS ARROW WITH DOTTED STEM
-U+02912           ⤒            \UpArrowBar                                  UPWARDS ARROW TO BAR
-U+02913           ⤓            \DownArrowBar                                DOWNWARDS ARROW TO BAR
-U+02914           ⤔            \nvrightarrowtail                            RIGHTWARDS ARROW WITH TAIL WITH VERTICAL STROKE
-U+02915           ⤕            \nVrightarrowtail                            RIGHTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE
-U+02916           ⤖            \twoheadrightarrowtail                       RIGHTWARDS TWO-HEADED ARROW WITH TAIL
-U+02917           ⤗            \nvtwoheadrightarrowtail                     RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE
-U+02918           ⤘            \nVtwoheadrightarrowtail                     RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE
-U+0291D           ⤝            \diamondleftarrow                            LEFTWARDS ARROW TO BLACK DIAMOND
-U+0291E           ⤞            \rightarrowdiamond                           RIGHTWARDS ARROW TO BLACK DIAMOND
-U+0291F           ⤟            \diamondleftarrowbar                         LEFTWARDS ARROW FROM BAR TO BLACK DIAMOND
-U+02920           ⤠            \barrightarrowdiamond                        RIGHTWARDS ARROW FROM BAR TO BLACK DIAMOND
-U+02925           ⤥            \hksearow                                    SOUTH EAST ARROW WITH HOOK
-U+02926           ⤦            \hkswarow                                    SOUTH WEST ARROW WITH HOOK
-U+02927           ⤧            \tona                                        NORTH WEST ARROW AND NORTH EAST ARROW
-U+02928           ⤨            \toea                                        NORTH EAST ARROW AND SOUTH EAST ARROW
-U+02929           ⤩            \tosa                                        SOUTH EAST ARROW AND SOUTH WEST ARROW
-U+0292A           ⤪            \towa                                        SOUTH WEST ARROW AND NORTH WEST ARROW
-U+0292B           ⤫            \rdiagovfdiag                                RISING DIAGONAL CROSSING FALLING DIAGONAL
-U+0292C           ⤬            \fdiagovrdiag                                FALLING DIAGONAL CROSSING RISING DIAGONAL
-U+0292D           ⤭            \seovnearrow                                 SOUTH EAST ARROW CROSSING NORTH EAST ARROW
-U+0292E           ⤮            \neovsearrow                                 NORTH EAST ARROW CROSSING SOUTH EAST ARROW
-U+0292F           ⤯            \fdiagovnearrow                              FALLING DIAGONAL CROSSING NORTH EAST ARROW
-U+02930           ⤰            \rdiagovsearrow                              RISING DIAGONAL CROSSING SOUTH EAST ARROW
-U+02931           ⤱            \neovnwarrow                                 NORTH EAST ARROW CROSSING NORTH WEST ARROW
-U+02932           ⤲            \nwovnearrow                                 NORTH WEST ARROW CROSSING NORTH EAST ARROW
-U+02934           ⤴            \:arrow_heading_up:                          ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS
-U+02935           ⤵            \:arrow_heading_down:                        ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS
-U+02942           ⥂            \Rlarr                                       RIGHTWARDS ARROW ABOVE SHORT LEFTWARDS ARROW
-U+02944           ⥄            \rLarr                                       SHORT RIGHTWARDS ARROW ABOVE LEFTWARDS ARROW
-U+02945           ⥅            \rightarrowplus                              RIGHTWARDS ARROW WITH PLUS BELOW
-U+02946           ⥆            \leftarrowplus                               LEFTWARDS ARROW WITH PLUS BELOW
-U+02947           ⥇            \rarrx                                       RIGHTWARDS ARROW THROUGH X
-U+02948           ⥈            \leftrightarrowcircle                        LEFT RIGHT ARROW THROUGH SMALL CIRCLE
-U+02949           ⥉            \twoheaduparrowcircle                        UPWARDS TWO-HEADED ARROW FROM SMALL CIRCLE
-U+0294A           ⥊            \leftrightharpoonupdown                      LEFT BARB UP RIGHT BARB DOWN HARPOON
-U+0294B           ⥋            \leftrightharpoondownup                      LEFT BARB DOWN RIGHT BARB UP HARPOON
-U+0294C           ⥌            \updownharpoonrightleft                      UP BARB RIGHT DOWN BARB LEFT HARPOON
-U+0294D           ⥍            \updownharpoonleftright                      UP BARB LEFT DOWN BARB RIGHT HARPOON
-U+0294E           ⥎            \LeftRightVector                             LEFT BARB UP RIGHT BARB UP HARPOON
-U+0294F           ⥏            \RightUpDownVector                           UP BARB RIGHT DOWN BARB RIGHT HARPOON
-U+02950           ⥐            \DownLeftRightVector                         LEFT BARB DOWN RIGHT BARB DOWN HARPOON
-U+02951           ⥑            \LeftUpDownVector                            UP BARB LEFT DOWN BARB LEFT HARPOON
-U+02952           ⥒            \LeftVectorBar                               LEFTWARDS HARPOON WITH BARB UP TO BAR
-U+02953           ⥓            \RightVectorBar                              RIGHTWARDS HARPOON WITH BARB UP TO BAR
-U+02954           ⥔            \RightUpVectorBar                            UPWARDS HARPOON WITH BARB RIGHT TO BAR
-U+02955           ⥕            \RightDownVectorBar                          DOWNWARDS HARPOON WITH BARB RIGHT TO BAR
-U+02956           ⥖            \DownLeftVectorBar                           LEFTWARDS HARPOON WITH BARB DOWN TO BAR
-U+02957           ⥗            \DownRightVectorBar                          RIGHTWARDS HARPOON WITH BARB DOWN TO BAR
-U+02958           ⥘            \LeftUpVectorBar                             UPWARDS HARPOON WITH BARB LEFT TO BAR
-U+02959           ⥙            \LeftDownVectorBar                           DOWNWARDS HARPOON WITH BARB LEFT TO BAR
-U+0295A           ⥚            \LeftTeeVector                               LEFTWARDS HARPOON WITH BARB UP FROM BAR
-U+0295B           ⥛            \RightTeeVector                              RIGHTWARDS HARPOON WITH BARB UP FROM BAR
-U+0295C           ⥜            \RightUpTeeVector                            UPWARDS HARPOON WITH BARB RIGHT FROM BAR
-U+0295D           ⥝            \RightDownTeeVector                          DOWNWARDS HARPOON WITH BARB RIGHT FROM BAR
-U+0295E           ⥞            \DownLeftTeeVector                           LEFTWARDS HARPOON WITH BARB DOWN FROM BAR
-U+0295F           ⥟            \DownRightTeeVector                          RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR
-U+02960           ⥠            \LeftUpTeeVector                             UPWARDS HARPOON WITH BARB LEFT FROM BAR
-U+02961           ⥡            \LeftDownTeeVector                           DOWNWARDS HARPOON WITH BARB LEFT FROM BAR
-U+02962           ⥢            \leftharpoonsupdown                          LEFTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB DOWN
-U+02963           ⥣            \upharpoonsleftright                         UPWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT
-U+02964           ⥤            \rightharpoonsupdown                         RIGHTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB DOWN
-U+02965           ⥥            \downharpoonsleftright                       DOWNWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT
-U+02966           ⥦            \leftrightharpoonsup                         LEFTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB UP
-U+02967           ⥧            \leftrightharpoonsdown                       LEFTWARDS HARPOON WITH BARB DOWN ABOVE RIGHTWARDS HARPOON WITH BARB DOWN
-U+02968           ⥨            \rightleftharpoonsup                         RIGHTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB UP
-U+02969           ⥩            \rightleftharpoonsdown                       RIGHTWARDS HARPOON WITH BARB DOWN ABOVE LEFTWARDS HARPOON WITH BARB DOWN
-U+0296A           ⥪            \leftharpoonupdash                           LEFTWARDS HARPOON WITH BARB UP ABOVE LONG DASH
-U+0296B           ⥫            \dashleftharpoondown                         LEFTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH
-U+0296C           ⥬            \rightharpoonupdash                          RIGHTWARDS HARPOON WITH BARB UP ABOVE LONG DASH
-U+0296D           ⥭            \dashrightharpoondown                        RIGHTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH
-U+0296E           ⥮            \UpEquilibrium                               UPWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT
-U+0296F           ⥯            \ReverseUpEquilibrium                        DOWNWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT
-U+02970           ⥰            \RoundImplies                                RIGHT DOUBLE ARROW WITH ROUNDED HEAD
-U+02980           ⦀            \Vvert                                       TRIPLE VERTICAL BAR DELIMITER
-U+02986           ⦆            \Elroang                                     RIGHT WHITE PARENTHESIS
-U+02999           ⦙            \ddfnc                                       DOTTED FENCE
-U+0299B           ⦛            \measuredangleleft                           MEASURED ANGLE OPENING LEFT
-U+0299C           ⦜            \Angle                                       RIGHT ANGLE VARIANT WITH SQUARE
-U+0299D           ⦝            \rightanglemdot                              MEASURED RIGHT ANGLE WITH DOT
-U+0299E           ⦞            \angles                                      ANGLE WITH S INSIDE
-U+0299F           ⦟            \angdnr                                      ACUTE ANGLE
-U+029A0           ⦠            \lpargt                                      SPHERICAL ANGLE OPENING LEFT
-U+029A1           ⦡            \sphericalangleup                            SPHERICAL ANGLE OPENING UP
-U+029A2           ⦢            \turnangle                                   TURNED ANGLE
-U+029A3           ⦣            \revangle                                    REVERSED ANGLE
-U+029A4           ⦤            \angleubar                                   ANGLE WITH UNDERBAR
-U+029A5           ⦥            \revangleubar                                REVERSED ANGLE WITH UNDERBAR
-U+029A6           ⦦            \wideangledown                               OBLIQUE ANGLE OPENING UP
-U+029A7           ⦧            \wideangleup                                 OBLIQUE ANGLE OPENING DOWN
-U+029A8           ⦨            \measanglerutone                             MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND RIGHT
-U+029A9           ⦩            \measanglelutonw                             MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND LEFT
-U+029AA           ⦪            \measanglerdtose                             MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND RIGHT
-U+029AB           ⦫            \measangleldtosw                             MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND LEFT
-U+029AC           ⦬            \measangleurtone                             MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND UP
-U+029AD           ⦭            \measangleultonw                             MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND UP
-U+029AE           ⦮            \measangledrtose                             MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND DOWN
-U+029AF           ⦯            \measangledltosw                             MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN
-U+029B0           ⦰            \revemptyset                                 REVERSED EMPTY SET
-U+029B1           ⦱            \emptysetobar                                EMPTY SET WITH OVERBAR
-U+029B2           ⦲            \emptysetocirc                               EMPTY SET WITH SMALL CIRCLE ABOVE
-U+029B3           ⦳            \emptysetoarr                                EMPTY SET WITH RIGHT ARROW ABOVE
-U+029B4           ⦴            \emptysetoarrl                               EMPTY SET WITH LEFT ARROW ABOVE
-U+029B7           ⦷            \circledparallel                             CIRCLED PARALLEL
-U+029B8           ⦸            \obslash                                     CIRCLED REVERSE SOLIDUS
-U+029BC           ⦼            \odotslashdot                                CIRCLED ANTICLOCKWISE-ROTATED DIVISION SIGN
-U+029BE           ⦾            \circledwhitebullet                          CIRCLED WHITE BULLET
-U+029BF           ⦿            \circledbullet                               CIRCLED BULLET
-U+029C0           ⧀            \olessthan                                   CIRCLED LESS-THAN
-U+029C1           ⧁            \ogreaterthan                                CIRCLED GREATER-THAN
-U+029C4           ⧄            \boxdiag                                     SQUARED RISING DIAGONAL SLASH
-U+029C5           ⧅            \boxbslash                                   SQUARED FALLING DIAGONAL SLASH
-U+029C6           ⧆            \boxast                                      SQUARED ASTERISK
-U+029C7           ⧇            \boxcircle                                   SQUARED SMALL CIRCLE
-U+029CA           ⧊            \Lap                                         TRIANGLE WITH DOT ABOVE
-U+029CB           ⧋            \defas                                       TRIANGLE WITH UNDERBAR
-U+029CF           ⧏            \LeftTriangleBar                             LEFT TRIANGLE BESIDE VERTICAL BAR
-U+029CF + U+00338 ⧏̸           \NotLeftTriangleBar                          LEFT TRIANGLE BESIDE VERTICAL BAR + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+029D0           ⧐            \RightTriangleBar                            VERTICAL BAR BESIDE RIGHT TRIANGLE
-U+029D0 + U+00338 ⧐̸           \NotRightTriangleBar                         VERTICAL BAR BESIDE RIGHT TRIANGLE + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+029DF           ⧟            \dualmap                                     DOUBLE-ENDED MULTIMAP
-U+029E1           ⧡            \lrtriangleeq                                INCREASES AS
-U+029E2           ⧢            \shuffle                                     SHUFFLE PRODUCT
-U+029E3           ⧣            \eparsl                                      EQUALS SIGN AND SLANTED PARALLEL
-U+029E4           ⧤            \smeparsl                                    EQUALS SIGN AND SLANTED PARALLEL WITH TILDE ABOVE
-U+029E5           ⧥            \eqvparsl                                    IDENTICAL TO AND SLANTED PARALLEL
-U+029EB           ⧫            \blacklozenge                                BLACK LOZENGE
-U+029F4           ⧴            \RuleDelayed                                 RULE-DELAYED
-U+029F6           ⧶            \dsol                                        SOLIDUS WITH OVERBAR
-U+029F7           ⧷            \rsolbar                                     REVERSE SOLIDUS WITH HORIZONTAL STROKE
-U+029FA           ⧺            \doubleplus                                  DOUBLE PLUS
-U+029FB           ⧻            \tripleplus                                  TRIPLE PLUS
-U+02A00           ⨀            \bigodot                                     N-ARY CIRCLED DOT OPERATOR
-U+02A01           ⨁            \bigoplus                                    N-ARY CIRCLED PLUS OPERATOR
-U+02A02           ⨂            \bigotimes                                   N-ARY CIRCLED TIMES OPERATOR
-U+02A03           ⨃            \bigcupdot                                   N-ARY UNION OPERATOR WITH DOT
-U+02A04           ⨄            \biguplus                                    N-ARY UNION OPERATOR WITH PLUS
-U+02A05           ⨅            \bigsqcap                                    N-ARY SQUARE INTERSECTION OPERATOR
-U+02A06           ⨆            \bigsqcup                                    N-ARY SQUARE UNION OPERATOR
-U+02A07           ⨇            \conjquant                                   TWO LOGICAL AND OPERATOR
-U+02A08           ⨈            \disjquant                                   TWO LOGICAL OR OPERATOR
-U+02A09           ⨉            \bigtimes                                    N-ARY TIMES OPERATOR
-U+02A0A           ⨊            \modtwosum                                   MODULO TWO SUM
-U+02A0B           ⨋            \sumint                                      SUMMATION WITH INTEGRAL
-U+02A0C           ⨌            \iiiint                                      QUADRUPLE INTEGRAL OPERATOR
-U+02A0D           ⨍            \intbar                                      FINITE PART INTEGRAL
-U+02A0E           ⨎            \intBar                                      INTEGRAL WITH DOUBLE STROKE
-U+02A0F           ⨏            \clockoint                                   INTEGRAL AVERAGE WITH SLASH
-U+02A10           ⨐            \cirfnint                                    CIRCULATION FUNCTION
-U+02A11           ⨑            \awint                                       ANTICLOCKWISE INTEGRATION
-U+02A12           ⨒            \rppolint                                    LINE INTEGRATION WITH RECTANGULAR PATH AROUND POLE
-U+02A13           ⨓            \scpolint                                    LINE INTEGRATION WITH SEMICIRCULAR PATH AROUND POLE
-U+02A14           ⨔            \npolint                                     LINE INTEGRATION NOT INCLUDING THE POLE
-U+02A15           ⨕            \pointint                                    INTEGRAL AROUND A POINT OPERATOR
-U+02A16           ⨖            \sqrint                                      QUATERNION INTEGRAL OPERATOR
-U+02A18           ⨘            \intx                                        INTEGRAL WITH TIMES SIGN
-U+02A19           ⨙            \intcap                                      INTEGRAL WITH INTERSECTION
-U+02A1A           ⨚            \intcup                                      INTEGRAL WITH UNION
-U+02A1B           ⨛            \upint                                       INTEGRAL WITH OVERBAR
-U+02A1C           ⨜            \lowint                                      INTEGRAL WITH UNDERBAR
-U+02A1D           ⨝            \Join, \join                                 JOIN
-U+02A22           ⨢            \ringplus                                    PLUS SIGN WITH SMALL CIRCLE ABOVE
-U+02A23           ⨣            \plushat                                     PLUS SIGN WITH CIRCUMFLEX ACCENT ABOVE
-U+02A24           ⨤            \simplus                                     PLUS SIGN WITH TILDE ABOVE
-U+02A25           ⨥            \plusdot                                     PLUS SIGN WITH DOT BELOW
-U+02A26           ⨦            \plussim                                     PLUS SIGN WITH TILDE BELOW
-U+02A27           ⨧            \plussubtwo                                  PLUS SIGN WITH SUBSCRIPT TWO
-U+02A28           ⨨            \plustrif                                    PLUS SIGN WITH BLACK TRIANGLE
-U+02A29           ⨩            \commaminus                                  MINUS SIGN WITH COMMA ABOVE
-U+02A2A           ⨪            \minusdot                                    MINUS SIGN WITH DOT BELOW
-U+02A2B           ⨫            \minusfdots                                  MINUS SIGN WITH FALLING DOTS
-U+02A2C           ⨬            \minusrdots                                  MINUS SIGN WITH RISING DOTS
-U+02A2D           ⨭            \opluslhrim                                  PLUS SIGN IN LEFT HALF CIRCLE
-U+02A2E           ⨮            \oplusrhrim                                  PLUS SIGN IN RIGHT HALF CIRCLE
-U+02A2F           ⨯            \Times                                       VECTOR OR CROSS PRODUCT
-U+02A30           ⨰            \dottimes                                    MULTIPLICATION SIGN WITH DOT ABOVE
-U+02A31           ⨱            \timesbar                                    MULTIPLICATION SIGN WITH UNDERBAR
-U+02A32           ⨲            \btimes                                      SEMIDIRECT PRODUCT WITH BOTTOM CLOSED
-U+02A33           ⨳            \smashtimes                                  SMASH PRODUCT
-U+02A34           ⨴            \otimeslhrim                                 MULTIPLICATION SIGN IN LEFT HALF CIRCLE
-U+02A35           ⨵            \otimesrhrim                                 MULTIPLICATION SIGN IN RIGHT HALF CIRCLE
-U+02A36           ⨶            \otimeshat                                   CIRCLED MULTIPLICATION SIGN WITH CIRCUMFLEX ACCENT
-U+02A37           ⨷            \Otimes                                      MULTIPLICATION SIGN IN DOUBLE CIRCLE
-U+02A38           ⨸            \odiv                                        CIRCLED DIVISION SIGN
-U+02A39           ⨹            \triangleplus                                PLUS SIGN IN TRIANGLE
-U+02A3A           ⨺            \triangleminus                               MINUS SIGN IN TRIANGLE
-U+02A3B           ⨻            \triangletimes                               MULTIPLICATION SIGN IN TRIANGLE
-U+02A3C           ⨼            \intprod                                     INTERIOR PRODUCT
-U+02A3D           ⨽            \intprodr                                    RIGHTHAND INTERIOR PRODUCT
-U+02A3F           ⨿            \amalg                                       AMALGAMATION OR COPRODUCT
-U+02A40           ⩀            \capdot                                      INTERSECTION WITH DOT
-U+02A41           ⩁            \uminus                                      UNION WITH MINUS SIGN
-U+02A42           ⩂            \barcup                                      UNION WITH OVERBAR
-U+02A43           ⩃            \barcap                                      INTERSECTION WITH OVERBAR
-U+02A44           ⩄            \capwedge                                    INTERSECTION WITH LOGICAL AND
-U+02A45           ⩅            \cupvee                                      UNION WITH LOGICAL OR
-U+02A4A           ⩊            \twocups                                     UNION BESIDE AND JOINED WITH UNION
-U+02A4B           ⩋            \twocaps                                     INTERSECTION BESIDE AND JOINED WITH INTERSECTION
-U+02A4C           ⩌            \closedvarcup                                CLOSED UNION WITH SERIFS
-U+02A4D           ⩍            \closedvarcap                                CLOSED INTERSECTION WITH SERIFS
-U+02A4E           ⩎            \Sqcap                                       DOUBLE SQUARE INTERSECTION
-U+02A4F           ⩏            \Sqcup                                       DOUBLE SQUARE UNION
-U+02A50           ⩐            \closedvarcupsmashprod                       CLOSED UNION WITH SERIFS AND SMASH PRODUCT
-U+02A51           ⩑            \wedgeodot                                   LOGICAL AND WITH DOT ABOVE
-U+02A52           ⩒            \veeodot                                     LOGICAL OR WITH DOT ABOVE
-U+02A53           ⩓            \And                                         DOUBLE LOGICAL AND
-U+02A54           ⩔            \Or                                          DOUBLE LOGICAL OR
-U+02A55           ⩕            \wedgeonwedge                                TWO INTERSECTING LOGICAL AND
-U+02A56           ⩖            \ElOr                                        TWO INTERSECTING LOGICAL OR
-U+02A57           ⩗            \bigslopedvee                                SLOPING LARGE OR
-U+02A58           ⩘            \bigslopedwedge                              SLOPING LARGE AND
-U+02A5A           ⩚            \wedgemidvert                                LOGICAL AND WITH MIDDLE STEM
-U+02A5B           ⩛            \veemidvert                                  LOGICAL OR WITH MIDDLE STEM
-U+02A5C           ⩜            \midbarwedge                                 LOGICAL AND WITH HORIZONTAL DASH
-U+02A5D           ⩝            \midbarvee                                   LOGICAL OR WITH HORIZONTAL DASH
-U+02A5E           ⩞            \perspcorrespond                             LOGICAL AND WITH DOUBLE OVERBAR
-U+02A5F           ⩟            \minhat                                      LOGICAL AND WITH UNDERBAR
-U+02A60           ⩠            \wedgedoublebar                              LOGICAL AND WITH DOUBLE UNDERBAR
-U+02A61           ⩡            \varveebar                                   SMALL VEE WITH UNDERBAR
-U+02A62           ⩢            \doublebarvee                                LOGICAL OR WITH DOUBLE OVERBAR
-U+02A63           ⩣            \veedoublebar                                LOGICAL OR WITH DOUBLE UNDERBAR
-U+02A66           ⩦            \eqdot                                       EQUALS SIGN WITH DOT BELOW
-U+02A67           ⩧            \dotequiv                                    IDENTICAL WITH DOT ABOVE
-U+02A6A           ⩪            \dotsim                                      TILDE OPERATOR WITH DOT ABOVE
-U+02A6B           ⩫            \simrdots                                    TILDE OPERATOR WITH RISING DOTS
-U+02A6C           ⩬            \simminussim                                 SIMILAR MINUS SIMILAR
-U+02A6D           ⩭            \congdot                                     CONGRUENT WITH DOT ABOVE
-U+02A6E           ⩮            \asteq                                       EQUALS WITH ASTERISK
-U+02A6F           ⩯            \hatapprox                                   ALMOST EQUAL TO WITH CIRCUMFLEX ACCENT
-U+02A70           ⩰            \approxeqq                                   APPROXIMATELY EQUAL OR EQUAL TO
-U+02A71           ⩱            \eqqplus                                     EQUALS SIGN ABOVE PLUS SIGN
-U+02A72           ⩲            \pluseqq                                     PLUS SIGN ABOVE EQUALS SIGN
-U+02A73           ⩳            \eqqsim                                      EQUALS SIGN ABOVE TILDE OPERATOR
-U+02A74           ⩴            \Coloneq                                     DOUBLE COLON EQUAL
-U+02A75           ⩵            \Equal                                       TWO CONSECUTIVE EQUALS SIGNS
-U+02A76           ⩶            \eqeqeq                                      THREE CONSECUTIVE EQUALS SIGNS
-U+02A77           ⩷            \ddotseq                                     EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW
-U+02A78           ⩸            \equivDD                                     EQUIVALENT WITH FOUR DOTS ABOVE
-U+02A79           ⩹            \ltcir                                       LESS-THAN WITH CIRCLE INSIDE
-U+02A7A           ⩺            \gtcir                                       GREATER-THAN WITH CIRCLE INSIDE
-U+02A7B           ⩻            \ltquest                                     LESS-THAN WITH QUESTION MARK ABOVE
-U+02A7C           ⩼            \gtquest                                     GREATER-THAN WITH QUESTION MARK ABOVE
-U+02A7D           ⩽            \leqslant                                    LESS-THAN OR SLANTED EQUAL TO
-U+02A7D + U+00338 ⩽̸           \nleqslant                                   LESS-THAN OR SLANTED EQUAL TO + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02A7E           ⩾            \geqslant                                    GREATER-THAN OR SLANTED EQUAL TO
-U+02A7E + U+00338 ⩾̸           \ngeqslant                                   GREATER-THAN OR SLANTED EQUAL TO + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02A7F           ⩿            \lesdot                                      LESS-THAN OR SLANTED EQUAL TO WITH DOT INSIDE
-U+02A80           ⪀            \gesdot                                      GREATER-THAN OR SLANTED EQUAL TO WITH DOT INSIDE
-U+02A81           ⪁            \lesdoto                                     LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE
-U+02A82           ⪂            \gesdoto                                     GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE
-U+02A83           ⪃            \lesdotor                                    LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE RIGHT
-U+02A84           ⪄            \gesdotol                                    GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE LEFT
-U+02A85           ⪅            \lessapprox                                  LESS-THAN OR APPROXIMATE
-U+02A86           ⪆            \gtrapprox                                   GREATER-THAN OR APPROXIMATE
-U+02A87           ⪇            \lneq                                        LESS-THAN AND SINGLE-LINE NOT EQUAL TO
-U+02A88           ⪈            \gneq                                        GREATER-THAN AND SINGLE-LINE NOT EQUAL TO
-U+02A89           ⪉            \lnapprox                                    LESS-THAN AND NOT APPROXIMATE
-U+02A8A           ⪊            \gnapprox                                    GREATER-THAN AND NOT APPROXIMATE
-U+02A8B           ⪋            \lesseqqgtr                                  LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN
-U+02A8C           ⪌            \gtreqqless                                  GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN
-U+02A8D           ⪍            \lsime                                       LESS-THAN ABOVE SIMILAR OR EQUAL
-U+02A8E           ⪎            \gsime                                       GREATER-THAN ABOVE SIMILAR OR EQUAL
-U+02A8F           ⪏            \lsimg                                       LESS-THAN ABOVE SIMILAR ABOVE GREATER-THAN
-U+02A90           ⪐            \gsiml                                       GREATER-THAN ABOVE SIMILAR ABOVE LESS-THAN
-U+02A91           ⪑            \lgE                                         LESS-THAN ABOVE GREATER-THAN ABOVE DOUBLE-LINE EQUAL
-U+02A92           ⪒            \glE                                         GREATER-THAN ABOVE LESS-THAN ABOVE DOUBLE-LINE EQUAL
-U+02A93           ⪓            \lesges                                      LESS-THAN ABOVE SLANTED EQUAL ABOVE GREATER-THAN ABOVE SLANTED EQUAL
-U+02A94           ⪔            \gesles                                      GREATER-THAN ABOVE SLANTED EQUAL ABOVE LESS-THAN ABOVE SLANTED EQUAL
-U+02A95           ⪕            \eqslantless                                 SLANTED EQUAL TO OR LESS-THAN
-U+02A96           ⪖            \eqslantgtr                                  SLANTED EQUAL TO OR GREATER-THAN
-U+02A97           ⪗            \elsdot                                      SLANTED EQUAL TO OR LESS-THAN WITH DOT INSIDE
-U+02A98           ⪘            \egsdot                                      SLANTED EQUAL TO OR GREATER-THAN WITH DOT INSIDE
-U+02A99           ⪙            \eqqless                                     DOUBLE-LINE EQUAL TO OR LESS-THAN
-U+02A9A           ⪚            \eqqgtr                                      DOUBLE-LINE EQUAL TO OR GREATER-THAN
-U+02A9B           ⪛            \eqqslantless                                DOUBLE-LINE SLANTED EQUAL TO OR LESS-THAN
-U+02A9C           ⪜            \eqqslantgtr                                 DOUBLE-LINE SLANTED EQUAL TO OR GREATER-THAN
-U+02A9D           ⪝            \simless                                     SIMILAR OR LESS-THAN
-U+02A9E           ⪞            \simgtr                                      SIMILAR OR GREATER-THAN
-U+02A9F           ⪟            \simlE                                       SIMILAR ABOVE LESS-THAN ABOVE EQUALS SIGN
-U+02AA0           ⪠            \simgE                                       SIMILAR ABOVE GREATER-THAN ABOVE EQUALS SIGN
-U+02AA1           ⪡            \NestedLessLess                              DOUBLE NESTED LESS-THAN
-U+02AA1 + U+00338 ⪡̸           \NotNestedLessLess                           DOUBLE NESTED LESS-THAN + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02AA2           ⪢            \NestedGreaterGreater                        DOUBLE NESTED GREATER-THAN
-U+02AA2 + U+00338 ⪢̸           \NotNestedGreaterGreater                     DOUBLE NESTED GREATER-THAN + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02AA3           ⪣            \partialmeetcontraction                      DOUBLE NESTED LESS-THAN WITH UNDERBAR
-U+02AA4           ⪤            \glj                                         GREATER-THAN OVERLAPPING LESS-THAN
-U+02AA5           ⪥            \gla                                         GREATER-THAN BESIDE LESS-THAN
-U+02AA6           ⪦            \ltcc                                        LESS-THAN CLOSED BY CURVE
-U+02AA7           ⪧            \gtcc                                        GREATER-THAN CLOSED BY CURVE
-U+02AA8           ⪨            \lescc                                       LESS-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL
-U+02AA9           ⪩            \gescc                                       GREATER-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL
-U+02AAA           ⪪            \smt                                         SMALLER THAN
-U+02AAB           ⪫            \lat                                         LARGER THAN
-U+02AAC           ⪬            \smte                                        SMALLER THAN OR EQUAL TO
-U+02AAD           ⪭            \late                                        LARGER THAN OR EQUAL TO
-U+02AAE           ⪮            \bumpeqq                                     EQUALS SIGN WITH BUMPY ABOVE
-U+02AAF           ⪯            \preceq                                      PRECEDES ABOVE SINGLE-LINE EQUALS SIGN
-U+02AAF + U+00338 ⪯̸           \npreceq                                     PRECEDES ABOVE SINGLE-LINE EQUALS SIGN + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02AB0           ⪰            \succeq                                      SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN
-U+02AB0 + U+00338 ⪰̸           \nsucceq                                     SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02AB1           ⪱            \precneq                                     PRECEDES ABOVE SINGLE-LINE NOT EQUAL TO
-U+02AB2           ⪲            \succneq                                     SUCCEEDS ABOVE SINGLE-LINE NOT EQUAL TO
-U+02AB3           ⪳            \preceqq                                     PRECEDES ABOVE EQUALS SIGN
-U+02AB4           ⪴            \succeqq                                     SUCCEEDS ABOVE EQUALS SIGN
-U+02AB5           ⪵            \precneqq                                    PRECEDES ABOVE NOT EQUAL TO
-U+02AB6           ⪶            \succneqq                                    SUCCEEDS ABOVE NOT EQUAL TO
-U+02AB7           ⪷            \precapprox                                  PRECEDES ABOVE ALMOST EQUAL TO
-U+02AB8           ⪸            \succapprox                                  SUCCEEDS ABOVE ALMOST EQUAL TO
-U+02AB9           ⪹            \precnapprox                                 PRECEDES ABOVE NOT ALMOST EQUAL TO
-U+02ABA           ⪺            \succnapprox                                 SUCCEEDS ABOVE NOT ALMOST EQUAL TO
-U+02ABB           ⪻            \Prec                                        DOUBLE PRECEDES
-U+02ABC           ⪼            \Succ                                        DOUBLE SUCCEEDS
-U+02ABD           ⪽            \subsetdot                                   SUBSET WITH DOT
-U+02ABE           ⪾            \supsetdot                                   SUPERSET WITH DOT
-U+02ABF           ⪿            \subsetplus                                  SUBSET WITH PLUS SIGN BELOW
-U+02AC0           ⫀            \supsetplus                                  SUPERSET WITH PLUS SIGN BELOW
-U+02AC1           ⫁            \submult                                     SUBSET WITH MULTIPLICATION SIGN BELOW
-U+02AC2           ⫂            \supmult                                     SUPERSET WITH MULTIPLICATION SIGN BELOW
-U+02AC3           ⫃            \subedot                                     SUBSET OF OR EQUAL TO WITH DOT ABOVE
-U+02AC4           ⫄            \supedot                                     SUPERSET OF OR EQUAL TO WITH DOT ABOVE
-U+02AC5           ⫅            \subseteqq                                   SUBSET OF ABOVE EQUALS SIGN
-U+02AC5 + U+00338 ⫅̸           \nsubseteqq                                  SUBSET OF ABOVE EQUALS SIGN + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02AC6           ⫆            \supseteqq                                   SUPERSET OF ABOVE EQUALS SIGN
-U+02AC6 + U+00338 ⫆̸           \nsupseteqq                                  SUPERSET OF ABOVE EQUALS SIGN + COMBINING LONG SOLIDUS OVERLAY / NON-SPACING LONG SLASH OVERLAY
-U+02AC7           ⫇            \subsim                                      SUBSET OF ABOVE TILDE OPERATOR
-U+02AC8           ⫈            \supsim                                      SUPERSET OF ABOVE TILDE OPERATOR
-U+02AC9           ⫉            \subsetapprox                                SUBSET OF ABOVE ALMOST EQUAL TO
-U+02ACA           ⫊            \supsetapprox                                SUPERSET OF ABOVE ALMOST EQUAL TO
-U+02ACB           ⫋            \subsetneqq                                  SUBSET OF ABOVE NOT EQUAL TO
-U+02ACC           ⫌            \supsetneqq                                  SUPERSET OF ABOVE NOT EQUAL TO
-U+02ACD           ⫍            \lsqhook                                     SQUARE LEFT OPEN BOX OPERATOR
-U+02ACE           ⫎            \rsqhook                                     SQUARE RIGHT OPEN BOX OPERATOR
-U+02ACF           ⫏            \csub                                        CLOSED SUBSET
-U+02AD0           ⫐            \csup                                        CLOSED SUPERSET
-U+02AD1           ⫑            \csube                                       CLOSED SUBSET OR EQUAL TO
-U+02AD2           ⫒            \csupe                                       CLOSED SUPERSET OR EQUAL TO
-U+02AD3           ⫓            \subsup                                      SUBSET ABOVE SUPERSET
-U+02AD4           ⫔            \supsub                                      SUPERSET ABOVE SUBSET
-U+02AD5           ⫕            \subsub                                      SUBSET ABOVE SUBSET
-U+02AD6           ⫖            \supsup                                      SUPERSET ABOVE SUPERSET
-U+02AD7           ⫗            \suphsub                                     SUPERSET BESIDE SUBSET
-U+02AD8           ⫘            \supdsub                                     SUPERSET BESIDE AND JOINED BY DASH WITH SUBSET
-U+02AD9           ⫙            \forkv                                       ELEMENT OF OPENING DOWNWARDS
-U+02ADB           ⫛            \mlcp                                        TRANSVERSAL INTERSECTION
-U+02ADC           ⫝̸            \forks                                       FORKING
-U+02ADD           ⫝            \forksnot                                    NONFORKING
-U+02AE3           ⫣            \dashV                                       DOUBLE VERTICAL BAR LEFT TURNSTILE
-U+02AE4           ⫤            \Dashv                                       VERTICAL BAR DOUBLE LEFT TURNSTILE
-U+02AF4           ⫴            \interleave                                  TRIPLE VERTICAL BAR BINARY RELATION
-U+02AF6           ⫶            \tdcol                                       TRIPLE COLON OPERATOR
-U+02AF7           ⫷            \lllnest                                     TRIPLE NESTED LESS-THAN
-U+02AF8           ⫸            \gggnest                                     TRIPLE NESTED GREATER-THAN
-U+02AF9           ⫹            \leqqslant                                   DOUBLE-LINE SLANTED LESS-THAN OR EQUAL TO
-U+02AFA           ⫺            \geqqslant                                   DOUBLE-LINE SLANTED GREATER-THAN OR EQUAL TO
-U+02B05           ⬅            \:arrow_left:                                LEFTWARDS BLACK ARROW
-U+02B06           ⬆            \:arrow_up:                                  UPWARDS BLACK ARROW
-U+02B07           ⬇            \:arrow_down:                                DOWNWARDS BLACK ARROW
-U+02B12           ⬒            \squaretopblack                              SQUARE WITH TOP HALF BLACK
-U+02B13           ⬓            \squarebotblack                              SQUARE WITH BOTTOM HALF BLACK
-U+02B14           ⬔            \squareurblack                               SQUARE WITH UPPER RIGHT DIAGONAL HALF BLACK
-U+02B15           ⬕            \squarellblack                               SQUARE WITH LOWER LEFT DIAGONAL HALF BLACK
-U+02B16           ⬖            \diamondleftblack                            DIAMOND WITH LEFT HALF BLACK
-U+02B17           ⬗            \diamondrightblack                           DIAMOND WITH RIGHT HALF BLACK
-U+02B18           ⬘            \diamondtopblack                             DIAMOND WITH TOP HALF BLACK
-U+02B19           ⬙            \diamondbotblack                             DIAMOND WITH BOTTOM HALF BLACK
-U+02B1A           ⬚            \dottedsquare                                DOTTED SQUARE
-U+02B1B           ⬛            \lgblksquare, \:black_large_square:          BLACK LARGE SQUARE
-U+02B1C           ⬜            \lgwhtsquare, \:white_large_square:          WHITE LARGE SQUARE
-U+02B1D           ⬝            \vysmblksquare                               BLACK VERY SMALL SQUARE
-U+02B1E           ⬞            \vysmwhtsquare                               WHITE VERY SMALL SQUARE
-U+02B1F           ⬟            \pentagonblack                               BLACK PENTAGON
-U+02B20           ⬠            \pentagon                                    WHITE PENTAGON
-U+02B21           ⬡            \varhexagon                                  WHITE HEXAGON
-U+02B22           ⬢            \varhexagonblack                             BLACK HEXAGON
-U+02B23           ⬣            \hexagonblack                                HORIZONTAL BLACK HEXAGON
-U+02B24           ⬤            \lgblkcircle                                 BLACK LARGE CIRCLE
-U+02B25           ⬥            \mdblkdiamond                                BLACK MEDIUM DIAMOND
-U+02B26           ⬦            \mdwhtdiamond                                WHITE MEDIUM DIAMOND
-U+02B27           ⬧            \mdblklozenge                                BLACK MEDIUM LOZENGE
-U+02B28           ⬨            \mdwhtlozenge                                WHITE MEDIUM LOZENGE
-U+02B29           ⬩            \smblkdiamond                                BLACK SMALL DIAMOND
-U+02B2A           ⬪            \smblklozenge                                BLACK SMALL LOZENGE
-U+02B2B           ⬫            \smwhtlozenge                                WHITE SMALL LOZENGE
-U+02B2C           ⬬            \blkhorzoval                                 BLACK HORIZONTAL ELLIPSE
-U+02B2D           ⬭            \whthorzoval                                 WHITE HORIZONTAL ELLIPSE
-U+02B2E           ⬮            \blkvertoval                                 BLACK VERTICAL ELLIPSE
-U+02B2F           ⬯            \whtvertoval                                 WHITE VERTICAL ELLIPSE
-U+02B30           ⬰            \circleonleftarrow                           LEFT ARROW WITH SMALL CIRCLE
-U+02B31           ⬱            \leftthreearrows                             THREE LEFTWARDS ARROWS
-U+02B32           ⬲            \leftarrowonoplus                            LEFT ARROW WITH CIRCLED PLUS
-U+02B33           ⬳            \longleftsquigarrow                          LONG LEFTWARDS SQUIGGLE ARROW
-U+02B34           ⬴            \nvtwoheadleftarrow                          LEFTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE
-U+02B35           ⬵            \nVtwoheadleftarrow                          LEFTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE
-U+02B36           ⬶            \twoheadmapsfrom                             LEFTWARDS TWO-HEADED ARROW FROM BAR
-U+02B37           ⬷            \twoheadleftdbkarrow                         LEFTWARDS TWO-HEADED TRIPLE DASH ARROW
-U+02B38           ⬸            \leftdotarrow                                LEFTWARDS ARROW WITH DOTTED STEM
-U+02B39           ⬹            \nvleftarrowtail                             LEFTWARDS ARROW WITH TAIL WITH VERTICAL STROKE
-U+02B3A           ⬺            \nVleftarrowtail                             LEFTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE
-U+02B3B           ⬻            \twoheadleftarrowtail                        LEFTWARDS TWO-HEADED ARROW WITH TAIL
-U+02B3C           ⬼            \nvtwoheadleftarrowtail                      LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE
-U+02B3D           ⬽            \nVtwoheadleftarrowtail                      LEFTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE
-U+02B3E           ⬾            \leftarrowx                                  LEFTWARDS ARROW THROUGH X
-U+02B3F           ⬿            \leftcurvedarrow                             WAVE ARROW POINTING DIRECTLY LEFT
-U+02B40           ⭀            \equalleftarrow                              EQUALS SIGN ABOVE LEFTWARDS ARROW
-U+02B41           ⭁            \bsimilarleftarrow                           REVERSE TILDE OPERATOR ABOVE LEFTWARDS ARROW
-U+02B42           ⭂            \leftarrowbackapprox                         LEFTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO
-U+02B43           ⭃            \rightarrowgtr                               RIGHTWARDS ARROW THROUGH GREATER-THAN
-U+02B44           ⭄            \rightarrowsupset                            RIGHTWARDS ARROW THROUGH SUPERSET
-U+02B45           ⭅            \LLeftarrow                                  LEFTWARDS QUADRUPLE ARROW
-U+02B46           ⭆            \RRightarrow                                 RIGHTWARDS QUADRUPLE ARROW
-U+02B47           ⭇            \bsimilarrightarrow                          REVERSE TILDE OPERATOR ABOVE RIGHTWARDS ARROW
-U+02B48           ⭈            \rightarrowbackapprox                        RIGHTWARDS ARROW ABOVE REVERSE ALMOST EQUAL TO
-U+02B49           ⭉            \similarleftarrow                            TILDE OPERATOR ABOVE LEFTWARDS ARROW
-U+02B4A           ⭊            \leftarrowapprox                             LEFTWARDS ARROW ABOVE ALMOST EQUAL TO
-U+02B4B           ⭋            \leftarrowbsimilar                           LEFTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
-U+02B4C           ⭌            \rightarrowbsimilar                          RIGHTWARDS ARROW ABOVE REVERSE TILDE OPERATOR
-U+02B50           ⭐            \medwhitestar, \:star:                       WHITE MEDIUM STAR
-U+02B51           ⭑            \medblackstar                                BLACK SMALL STAR
-U+02B52           ⭒            \smwhitestar                                 WHITE SMALL STAR
-U+02B53           ⭓            \rightpentagonblack                          BLACK RIGHT-POINTING PENTAGON
-U+02B54           ⭔            \rightpentagon                               WHITE RIGHT-POINTING PENTAGON
-U+02B55           ⭕            \:o:                                         HEAVY LARGE CIRCLE
-U+02C7C           ⱼ            \_j                                          LATIN SUBSCRIPT SMALL LETTER J
-U+02C7D           ⱽ            \^V                                          MODIFIER LETTER CAPITAL V
-U+03012           〒            \postalmark                                  POSTAL MARK
-U+03030           〰            \:wavy_dash:                                 WAVY DASH
-U+0303D           〽            \:part_alternation_mark:                     PART ALTERNATION MARK
-U+03297           ㊗            \:congratulations:                           CIRCLED IDEOGRAPH CONGRATULATION
-U+03299           ㊙            \:secret:                                    CIRCLED IDEOGRAPH SECRET
-U+1D400           𝐀            \bfA                                         MATHEMATICAL BOLD CAPITAL A
-U+1D401           𝐁            \bfB                                         MATHEMATICAL BOLD CAPITAL B
-U+1D402           𝐂            \bfC                                         MATHEMATICAL BOLD CAPITAL C
-U+1D403           𝐃            \bfD                                         MATHEMATICAL BOLD CAPITAL D
-U+1D404           𝐄            \bfE                                         MATHEMATICAL BOLD CAPITAL E
-U+1D405           𝐅            \bfF                                         MATHEMATICAL BOLD CAPITAL F
-U+1D406           𝐆            \bfG                                         MATHEMATICAL BOLD CAPITAL G
-U+1D407           𝐇            \bfH                                         MATHEMATICAL BOLD CAPITAL H
-U+1D408           𝐈            \bfI                                         MATHEMATICAL BOLD CAPITAL I
-U+1D409           𝐉            \bfJ                                         MATHEMATICAL BOLD CAPITAL J
-U+1D40A           𝐊            \bfK                                         MATHEMATICAL BOLD CAPITAL K
-U+1D40B           𝐋            \bfL                                         MATHEMATICAL BOLD CAPITAL L
-U+1D40C           𝐌            \bfM                                         MATHEMATICAL BOLD CAPITAL M
-U+1D40D           𝐍            \bfN                                         MATHEMATICAL BOLD CAPITAL N
-U+1D40E           𝐎            \bfO                                         MATHEMATICAL BOLD CAPITAL O
-U+1D40F           𝐏            \bfP                                         MATHEMATICAL BOLD CAPITAL P
-U+1D410           𝐐            \bfQ                                         MATHEMATICAL BOLD CAPITAL Q
-U+1D411           𝐑            \bfR                                         MATHEMATICAL BOLD CAPITAL R
-U+1D412           𝐒            \bfS                                         MATHEMATICAL BOLD CAPITAL S
-U+1D413           𝐓            \bfT                                         MATHEMATICAL BOLD CAPITAL T
-U+1D414           𝐔            \bfU                                         MATHEMATICAL BOLD CAPITAL U
-U+1D415           𝐕            \bfV                                         MATHEMATICAL BOLD CAPITAL V
-U+1D416           𝐖            \bfW                                         MATHEMATICAL BOLD CAPITAL W
-U+1D417           𝐗            \bfX                                         MATHEMATICAL BOLD CAPITAL X
-U+1D418           𝐘            \bfY                                         MATHEMATICAL BOLD CAPITAL Y
-U+1D419           𝐙            \bfZ                                         MATHEMATICAL BOLD CAPITAL Z
-U+1D41A           𝐚            \bfa                                         MATHEMATICAL BOLD SMALL A
-U+1D41B           𝐛            \bfb                                         MATHEMATICAL BOLD SMALL B
-U+1D41C           𝐜            \bfc                                         MATHEMATICAL BOLD SMALL C
-U+1D41D           𝐝            \bfd                                         MATHEMATICAL BOLD SMALL D
-U+1D41E           𝐞            \bfe                                         MATHEMATICAL BOLD SMALL E
-U+1D41F           𝐟            \bff                                         MATHEMATICAL BOLD SMALL F
-U+1D420           𝐠            \bfg                                         MATHEMATICAL BOLD SMALL G
-U+1D421           𝐡            \bfh                                         MATHEMATICAL BOLD SMALL H
-U+1D422           𝐢            \bfi                                         MATHEMATICAL BOLD SMALL I
-U+1D423           𝐣            \bfj                                         MATHEMATICAL BOLD SMALL J
-U+1D424           𝐤            \bfk                                         MATHEMATICAL BOLD SMALL K
-U+1D425           𝐥            \bfl                                         MATHEMATICAL BOLD SMALL L
-U+1D426           𝐦            \bfm                                         MATHEMATICAL BOLD SMALL M
-U+1D427           𝐧            \bfn                                         MATHEMATICAL BOLD SMALL N
-U+1D428           𝐨            \bfo                                         MATHEMATICAL BOLD SMALL O
-U+1D429           𝐩            \bfp                                         MATHEMATICAL BOLD SMALL P
-U+1D42A           𝐪            \bfq                                         MATHEMATICAL BOLD SMALL Q
-U+1D42B           𝐫            \bfr                                         MATHEMATICAL BOLD SMALL R
-U+1D42C           𝐬            \bfs                                         MATHEMATICAL BOLD SMALL S
-U+1D42D           𝐭            \bft                                         MATHEMATICAL BOLD SMALL T
-U+1D42E           𝐮            \bfu                                         MATHEMATICAL BOLD SMALL U
-U+1D42F           𝐯            \bfv                                         MATHEMATICAL BOLD SMALL V
-U+1D430           𝐰            \bfw                                         MATHEMATICAL BOLD SMALL W
-U+1D431           𝐱            \bfx                                         MATHEMATICAL BOLD SMALL X
-U+1D432           𝐲            \bfy                                         MATHEMATICAL BOLD SMALL Y
-U+1D433           𝐳            \bfz                                         MATHEMATICAL BOLD SMALL Z
-U+1D434           𝐴            \itA                                         MATHEMATICAL ITALIC CAPITAL A
-U+1D435           𝐵            \itB                                         MATHEMATICAL ITALIC CAPITAL B
-U+1D436           𝐶            \itC                                         MATHEMATICAL ITALIC CAPITAL C
-U+1D437           𝐷            \itD                                         MATHEMATICAL ITALIC CAPITAL D
-U+1D438           𝐸            \itE                                         MATHEMATICAL ITALIC CAPITAL E
-U+1D439           𝐹            \itF                                         MATHEMATICAL ITALIC CAPITAL F
-U+1D43A           𝐺            \itG                                         MATHEMATICAL ITALIC CAPITAL G
-U+1D43B           𝐻            \itH                                         MATHEMATICAL ITALIC CAPITAL H
-U+1D43C           𝐼            \itI                                         MATHEMATICAL ITALIC CAPITAL I
-U+1D43D           𝐽            \itJ                                         MATHEMATICAL ITALIC CAPITAL J
-U+1D43E           𝐾            \itK                                         MATHEMATICAL ITALIC CAPITAL K
-U+1D43F           𝐿            \itL                                         MATHEMATICAL ITALIC CAPITAL L
-U+1D440           𝑀            \itM                                         MATHEMATICAL ITALIC CAPITAL M
-U+1D441           𝑁            \itN                                         MATHEMATICAL ITALIC CAPITAL N
-U+1D442           𝑂            \itO                                         MATHEMATICAL ITALIC CAPITAL O
-U+1D443           𝑃            \itP                                         MATHEMATICAL ITALIC CAPITAL P
-U+1D444           𝑄            \itQ                                         MATHEMATICAL ITALIC CAPITAL Q
-U+1D445           𝑅            \itR                                         MATHEMATICAL ITALIC CAPITAL R
-U+1D446           𝑆            \itS                                         MATHEMATICAL ITALIC CAPITAL S
-U+1D447           𝑇            \itT                                         MATHEMATICAL ITALIC CAPITAL T
-U+1D448           𝑈            \itU                                         MATHEMATICAL ITALIC CAPITAL U
-U+1D449           𝑉            \itV                                         MATHEMATICAL ITALIC CAPITAL V
-U+1D44A           𝑊            \itW                                         MATHEMATICAL ITALIC CAPITAL W
-U+1D44B           𝑋            \itX                                         MATHEMATICAL ITALIC CAPITAL X
-U+1D44C           𝑌            \itY                                         MATHEMATICAL ITALIC CAPITAL Y
-U+1D44D           𝑍            \itZ                                         MATHEMATICAL ITALIC CAPITAL Z
-U+1D44E           𝑎            \ita                                         MATHEMATICAL ITALIC SMALL A
-U+1D44F           𝑏            \itb                                         MATHEMATICAL ITALIC SMALL B
-U+1D450           𝑐            \itc                                         MATHEMATICAL ITALIC SMALL C
-U+1D451           𝑑            \itd                                         MATHEMATICAL ITALIC SMALL D
-U+1D452           𝑒            \ite                                         MATHEMATICAL ITALIC SMALL E
-U+1D453           𝑓            \itf                                         MATHEMATICAL ITALIC SMALL F
-U+1D454           𝑔            \itg                                         MATHEMATICAL ITALIC SMALL G
-U+1D456           𝑖            \iti                                         MATHEMATICAL ITALIC SMALL I
-U+1D457           𝑗            \itj                                         MATHEMATICAL ITALIC SMALL J
-U+1D458           𝑘            \itk                                         MATHEMATICAL ITALIC SMALL K
-U+1D459           𝑙            \itl                                         MATHEMATICAL ITALIC SMALL L
-U+1D45A           𝑚            \itm                                         MATHEMATICAL ITALIC SMALL M
-U+1D45B           𝑛            \itn                                         MATHEMATICAL ITALIC SMALL N
-U+1D45C           𝑜            \ito                                         MATHEMATICAL ITALIC SMALL O
-U+1D45D           𝑝            \itp                                         MATHEMATICAL ITALIC SMALL P
-U+1D45E           𝑞            \itq                                         MATHEMATICAL ITALIC SMALL Q
-U+1D45F           𝑟            \itr                                         MATHEMATICAL ITALIC SMALL R
-U+1D460           𝑠            \its                                         MATHEMATICAL ITALIC SMALL S
-U+1D461           𝑡            \itt                                         MATHEMATICAL ITALIC SMALL T
-U+1D462           𝑢            \itu                                         MATHEMATICAL ITALIC SMALL U
-U+1D463           𝑣            \itv                                         MATHEMATICAL ITALIC SMALL V
-U+1D464           𝑤            \itw                                         MATHEMATICAL ITALIC SMALL W
-U+1D465           𝑥            \itx                                         MATHEMATICAL ITALIC SMALL X
-U+1D466           𝑦            \ity                                         MATHEMATICAL ITALIC SMALL Y
-U+1D467           𝑧            \itz                                         MATHEMATICAL ITALIC SMALL Z
-U+1D468           𝑨            \biA                                         MATHEMATICAL BOLD ITALIC CAPITAL A
-U+1D469           𝑩            \biB                                         MATHEMATICAL BOLD ITALIC CAPITAL B
-U+1D46A           𝑪            \biC                                         MATHEMATICAL BOLD ITALIC CAPITAL C
-U+1D46B           𝑫            \biD                                         MATHEMATICAL BOLD ITALIC CAPITAL D
-U+1D46C           𝑬            \biE                                         MATHEMATICAL BOLD ITALIC CAPITAL E
-U+1D46D           𝑭            \biF                                         MATHEMATICAL BOLD ITALIC CAPITAL F
-U+1D46E           𝑮            \biG                                         MATHEMATICAL BOLD ITALIC CAPITAL G
-U+1D46F           𝑯            \biH                                         MATHEMATICAL BOLD ITALIC CAPITAL H
-U+1D470           𝑰            \biI                                         MATHEMATICAL BOLD ITALIC CAPITAL I
-U+1D471           𝑱            \biJ                                         MATHEMATICAL BOLD ITALIC CAPITAL J
-U+1D472           𝑲            \biK                                         MATHEMATICAL BOLD ITALIC CAPITAL K
-U+1D473           𝑳            \biL                                         MATHEMATICAL BOLD ITALIC CAPITAL L
-U+1D474           𝑴            \biM                                         MATHEMATICAL BOLD ITALIC CAPITAL M
-U+1D475           𝑵            \biN                                         MATHEMATICAL BOLD ITALIC CAPITAL N
-U+1D476           𝑶            \biO                                         MATHEMATICAL BOLD ITALIC CAPITAL O
-U+1D477           𝑷            \biP                                         MATHEMATICAL BOLD ITALIC CAPITAL P
-U+1D478           𝑸            \biQ                                         MATHEMATICAL BOLD ITALIC CAPITAL Q
-U+1D479           𝑹            \biR                                         MATHEMATICAL BOLD ITALIC CAPITAL R
-U+1D47A           𝑺            \biS                                         MATHEMATICAL BOLD ITALIC CAPITAL S
-U+1D47B           𝑻            \biT                                         MATHEMATICAL BOLD ITALIC CAPITAL T
-U+1D47C           𝑼            \biU                                         MATHEMATICAL BOLD ITALIC CAPITAL U
-U+1D47D           𝑽            \biV                                         MATHEMATICAL BOLD ITALIC CAPITAL V
-U+1D47E           𝑾            \biW                                         MATHEMATICAL BOLD ITALIC CAPITAL W
-U+1D47F           𝑿            \biX                                         MATHEMATICAL BOLD ITALIC CAPITAL X
-U+1D480           𝒀            \biY                                         MATHEMATICAL BOLD ITALIC CAPITAL Y
-U+1D481           𝒁            \biZ                                         MATHEMATICAL BOLD ITALIC CAPITAL Z
-U+1D482           𝒂            \bia                                         MATHEMATICAL BOLD ITALIC SMALL A
-U+1D483           𝒃            \bib                                         MATHEMATICAL BOLD ITALIC SMALL B
-U+1D484           𝒄            \bic                                         MATHEMATICAL BOLD ITALIC SMALL C
-U+1D485           𝒅            \bid                                         MATHEMATICAL BOLD ITALIC SMALL D
-U+1D486           𝒆            \bie                                         MATHEMATICAL BOLD ITALIC SMALL E
-U+1D487           𝒇            \bif                                         MATHEMATICAL BOLD ITALIC SMALL F
-U+1D488           𝒈            \big                                         MATHEMATICAL BOLD ITALIC SMALL G
-U+1D489           𝒉            \bih                                         MATHEMATICAL BOLD ITALIC SMALL H
-U+1D48A           𝒊            \bii                                         MATHEMATICAL BOLD ITALIC SMALL I
-U+1D48B           𝒋            \bij                                         MATHEMATICAL BOLD ITALIC SMALL J
-U+1D48C           𝒌            \bik                                         MATHEMATICAL BOLD ITALIC SMALL K
-U+1D48D           𝒍            \bil                                         MATHEMATICAL BOLD ITALIC SMALL L
-U+1D48E           𝒎            \bim                                         MATHEMATICAL BOLD ITALIC SMALL M
-U+1D48F           𝒏            \bin                                         MATHEMATICAL BOLD ITALIC SMALL N
-U+1D490           𝒐            \bio                                         MATHEMATICAL BOLD ITALIC SMALL O
-U+1D491           𝒑            \bip                                         MATHEMATICAL BOLD ITALIC SMALL P
-U+1D492           𝒒            \biq                                         MATHEMATICAL BOLD ITALIC SMALL Q
-U+1D493           𝒓            \bir                                         MATHEMATICAL BOLD ITALIC SMALL R
-U+1D494           𝒔            \bis                                         MATHEMATICAL BOLD ITALIC SMALL S
-U+1D495           𝒕            \bit                                         MATHEMATICAL BOLD ITALIC SMALL T
-U+1D496           𝒖            \biu                                         MATHEMATICAL BOLD ITALIC SMALL U
-U+1D497           𝒗            \biv                                         MATHEMATICAL BOLD ITALIC SMALL V
-U+1D498           𝒘            \biw                                         MATHEMATICAL BOLD ITALIC SMALL W
-U+1D499           𝒙            \bix                                         MATHEMATICAL BOLD ITALIC SMALL X
-U+1D49A           𝒚            \biy                                         MATHEMATICAL BOLD ITALIC SMALL Y
-U+1D49B           𝒛            \biz                                         MATHEMATICAL BOLD ITALIC SMALL Z
-U+1D49C           𝒜            \scrA                                        MATHEMATICAL SCRIPT CAPITAL A
-U+1D49E           𝒞            \scrC                                        MATHEMATICAL SCRIPT CAPITAL C
-U+1D49F           𝒟            \scrD                                        MATHEMATICAL SCRIPT CAPITAL D
-U+1D4A2           𝒢            \scrG                                        MATHEMATICAL SCRIPT CAPITAL G
-U+1D4A5           𝒥            \scrJ                                        MATHEMATICAL SCRIPT CAPITAL J
-U+1D4A6           𝒦            \scrK                                        MATHEMATICAL SCRIPT CAPITAL K
-U+1D4A9           𝒩            \scrN                                        MATHEMATICAL SCRIPT CAPITAL N
-U+1D4AA           𝒪            \scrO                                        MATHEMATICAL SCRIPT CAPITAL O
-U+1D4AB           𝒫            \scrP                                        MATHEMATICAL SCRIPT CAPITAL P
-U+1D4AC           𝒬            \scrQ                                        MATHEMATICAL SCRIPT CAPITAL Q
-U+1D4AE           𝒮            \scrS                                        MATHEMATICAL SCRIPT CAPITAL S
-U+1D4AF           𝒯            \scrT                                        MATHEMATICAL SCRIPT CAPITAL T
-U+1D4B0           𝒰            \scrU                                        MATHEMATICAL SCRIPT CAPITAL U
-U+1D4B1           𝒱            \scrV                                        MATHEMATICAL SCRIPT CAPITAL V
-U+1D4B2           𝒲            \scrW                                        MATHEMATICAL SCRIPT CAPITAL W
-U+1D4B3           𝒳            \scrX                                        MATHEMATICAL SCRIPT CAPITAL X
-U+1D4B4           𝒴            \scrY                                        MATHEMATICAL SCRIPT CAPITAL Y
-U+1D4B5           𝒵            \scrZ                                        MATHEMATICAL SCRIPT CAPITAL Z
-U+1D4B6           𝒶            \scra                                        MATHEMATICAL SCRIPT SMALL A
-U+1D4B7           𝒷            \scrb                                        MATHEMATICAL SCRIPT SMALL B
-U+1D4B8           𝒸            \scrc                                        MATHEMATICAL SCRIPT SMALL C
-U+1D4B9           𝒹            \scrd                                        MATHEMATICAL SCRIPT SMALL D
-U+1D4BB           𝒻            \scrf                                        MATHEMATICAL SCRIPT SMALL F
-U+1D4BD           𝒽            \scrh                                        MATHEMATICAL SCRIPT SMALL H
-U+1D4BE           𝒾            \scri                                        MATHEMATICAL SCRIPT SMALL I
-U+1D4BF           𝒿            \scrj                                        MATHEMATICAL SCRIPT SMALL J
-U+1D4C0           𝓀            \scrk                                        MATHEMATICAL SCRIPT SMALL K
-U+1D4C1           𝓁            \scrl                                        MATHEMATICAL SCRIPT SMALL L
-U+1D4C2           𝓂            \scrm                                        MATHEMATICAL SCRIPT SMALL M
-U+1D4C3           𝓃            \scrn                                        MATHEMATICAL SCRIPT SMALL N
-U+1D4C5           𝓅            \scrp                                        MATHEMATICAL SCRIPT SMALL P
-U+1D4C6           𝓆            \scrq                                        MATHEMATICAL SCRIPT SMALL Q
-U+1D4C7           𝓇            \scrr                                        MATHEMATICAL SCRIPT SMALL R
-U+1D4C8           𝓈            \scrs                                        MATHEMATICAL SCRIPT SMALL S
-U+1D4C9           𝓉            \scrt                                        MATHEMATICAL SCRIPT SMALL T
-U+1D4CA           𝓊            \scru                                        MATHEMATICAL SCRIPT SMALL U
-U+1D4CB           𝓋            \scrv                                        MATHEMATICAL SCRIPT SMALL V
-U+1D4CC           𝓌            \scrw                                        MATHEMATICAL SCRIPT SMALL W
-U+1D4CD           𝓍            \scrx                                        MATHEMATICAL SCRIPT SMALL X
-U+1D4CE           𝓎            \scry                                        MATHEMATICAL SCRIPT SMALL Y
-U+1D4CF           𝓏            \scrz                                        MATHEMATICAL SCRIPT SMALL Z
-U+1D4D0           𝓐            \bscrA                                       MATHEMATICAL BOLD SCRIPT CAPITAL A
-U+1D4D1           𝓑            \bscrB                                       MATHEMATICAL BOLD SCRIPT CAPITAL B
-U+1D4D2           𝓒            \bscrC                                       MATHEMATICAL BOLD SCRIPT CAPITAL C
-U+1D4D3           𝓓            \bscrD                                       MATHEMATICAL BOLD SCRIPT CAPITAL D
-U+1D4D4           𝓔            \bscrE                                       MATHEMATICAL BOLD SCRIPT CAPITAL E
-U+1D4D5           𝓕            \bscrF                                       MATHEMATICAL BOLD SCRIPT CAPITAL F
-U+1D4D6           𝓖            \bscrG                                       MATHEMATICAL BOLD SCRIPT CAPITAL G
-U+1D4D7           𝓗            \bscrH                                       MATHEMATICAL BOLD SCRIPT CAPITAL H
-U+1D4D8           𝓘            \bscrI                                       MATHEMATICAL BOLD SCRIPT CAPITAL I
-U+1D4D9           𝓙            \bscrJ                                       MATHEMATICAL BOLD SCRIPT CAPITAL J
-U+1D4DA           𝓚            \bscrK                                       MATHEMATICAL BOLD SCRIPT CAPITAL K
-U+1D4DB           𝓛            \bscrL                                       MATHEMATICAL BOLD SCRIPT CAPITAL L
-U+1D4DC           𝓜            \bscrM                                       MATHEMATICAL BOLD SCRIPT CAPITAL M
-U+1D4DD           𝓝            \bscrN                                       MATHEMATICAL BOLD SCRIPT CAPITAL N
-U+1D4DE           𝓞            \bscrO                                       MATHEMATICAL BOLD SCRIPT CAPITAL O
-U+1D4DF           𝓟            \bscrP                                       MATHEMATICAL BOLD SCRIPT CAPITAL P
-U+1D4E0           𝓠            \bscrQ                                       MATHEMATICAL BOLD SCRIPT CAPITAL Q
-U+1D4E1           𝓡            \bscrR                                       MATHEMATICAL BOLD SCRIPT CAPITAL R
-U+1D4E2           𝓢            \bscrS                                       MATHEMATICAL BOLD SCRIPT CAPITAL S
-U+1D4E3           𝓣            \bscrT                                       MATHEMATICAL BOLD SCRIPT CAPITAL T
-U+1D4E4           𝓤            \bscrU                                       MATHEMATICAL BOLD SCRIPT CAPITAL U
-U+1D4E5           𝓥            \bscrV                                       MATHEMATICAL BOLD SCRIPT CAPITAL V
-U+1D4E6           𝓦            \bscrW                                       MATHEMATICAL BOLD SCRIPT CAPITAL W
-U+1D4E7           𝓧            \bscrX                                       MATHEMATICAL BOLD SCRIPT CAPITAL X
-U+1D4E8           𝓨            \bscrY                                       MATHEMATICAL BOLD SCRIPT CAPITAL Y
-U+1D4E9           𝓩            \bscrZ                                       MATHEMATICAL BOLD SCRIPT CAPITAL Z
-U+1D4EA           𝓪            \bscra                                       MATHEMATICAL BOLD SCRIPT SMALL A
-U+1D4EB           𝓫            \bscrb                                       MATHEMATICAL BOLD SCRIPT SMALL B
-U+1D4EC           𝓬            \bscrc                                       MATHEMATICAL BOLD SCRIPT SMALL C
-U+1D4ED           𝓭            \bscrd                                       MATHEMATICAL BOLD SCRIPT SMALL D
-U+1D4EE           𝓮            \bscre                                       MATHEMATICAL BOLD SCRIPT SMALL E
-U+1D4EF           𝓯            \bscrf                                       MATHEMATICAL BOLD SCRIPT SMALL F
-U+1D4F0           𝓰            \bscrg                                       MATHEMATICAL BOLD SCRIPT SMALL G
-U+1D4F1           𝓱            \bscrh                                       MATHEMATICAL BOLD SCRIPT SMALL H
-U+1D4F2           𝓲            \bscri                                       MATHEMATICAL BOLD SCRIPT SMALL I
-U+1D4F3           𝓳            \bscrj                                       MATHEMATICAL BOLD SCRIPT SMALL J
-U+1D4F4           𝓴            \bscrk                                       MATHEMATICAL BOLD SCRIPT SMALL K
-U+1D4F5           𝓵            \bscrl                                       MATHEMATICAL BOLD SCRIPT SMALL L
-U+1D4F6           𝓶            \bscrm                                       MATHEMATICAL BOLD SCRIPT SMALL M
-U+1D4F7           𝓷            \bscrn                                       MATHEMATICAL BOLD SCRIPT SMALL N
-U+1D4F8           𝓸            \bscro                                       MATHEMATICAL BOLD SCRIPT SMALL O
-U+1D4F9           𝓹            \bscrp                                       MATHEMATICAL BOLD SCRIPT SMALL P
-U+1D4FA           𝓺            \bscrq                                       MATHEMATICAL BOLD SCRIPT SMALL Q
-U+1D4FB           𝓻            \bscrr                                       MATHEMATICAL BOLD SCRIPT SMALL R
-U+1D4FC           𝓼            \bscrs                                       MATHEMATICAL BOLD SCRIPT SMALL S
-U+1D4FD           𝓽            \bscrt                                       MATHEMATICAL BOLD SCRIPT SMALL T
-U+1D4FE           𝓾            \bscru                                       MATHEMATICAL BOLD SCRIPT SMALL U
-U+1D4FF           𝓿            \bscrv                                       MATHEMATICAL BOLD SCRIPT SMALL V
-U+1D500           𝔀            \bscrw                                       MATHEMATICAL BOLD SCRIPT SMALL W
-U+1D501           𝔁            \bscrx                                       MATHEMATICAL BOLD SCRIPT SMALL X
-U+1D502           𝔂            \bscry                                       MATHEMATICAL BOLD SCRIPT SMALL Y
-U+1D503           𝔃            \bscrz                                       MATHEMATICAL BOLD SCRIPT SMALL Z
-U+1D504           𝔄            \frakA                                       MATHEMATICAL FRAKTUR CAPITAL A
-U+1D505           𝔅            \frakB                                       MATHEMATICAL FRAKTUR CAPITAL B
-U+1D507           𝔇            \frakD                                       MATHEMATICAL FRAKTUR CAPITAL D
-U+1D508           𝔈            \frakE                                       MATHEMATICAL FRAKTUR CAPITAL E
-U+1D509           𝔉            \frakF                                       MATHEMATICAL FRAKTUR CAPITAL F
-U+1D50A           𝔊            \frakG                                       MATHEMATICAL FRAKTUR CAPITAL G
-U+1D50D           𝔍            \frakJ                                       MATHEMATICAL FRAKTUR CAPITAL J
-U+1D50E           𝔎            \frakK                                       MATHEMATICAL FRAKTUR CAPITAL K
-U+1D50F           𝔏            \frakL                                       MATHEMATICAL FRAKTUR CAPITAL L
-U+1D510           𝔐            \frakM                                       MATHEMATICAL FRAKTUR CAPITAL M
-U+1D511           𝔑            \frakN                                       MATHEMATICAL FRAKTUR CAPITAL N
-U+1D512           𝔒            \frakO                                       MATHEMATICAL FRAKTUR CAPITAL O
-U+1D513           𝔓            \frakP                                       MATHEMATICAL FRAKTUR CAPITAL P
-U+1D514           𝔔            \frakQ                                       MATHEMATICAL FRAKTUR CAPITAL Q
-U+1D516           𝔖            \frakS                                       MATHEMATICAL FRAKTUR CAPITAL S
-U+1D517           𝔗            \frakT                                       MATHEMATICAL FRAKTUR CAPITAL T
-U+1D518           𝔘            \frakU                                       MATHEMATICAL FRAKTUR CAPITAL U
-U+1D519           𝔙            \frakV                                       MATHEMATICAL FRAKTUR CAPITAL V
-U+1D51A           𝔚            \frakW                                       MATHEMATICAL FRAKTUR CAPITAL W
-U+1D51B           𝔛            \frakX                                       MATHEMATICAL FRAKTUR CAPITAL X
-U+1D51C           𝔜            \frakY                                       MATHEMATICAL FRAKTUR CAPITAL Y
-U+1D51E           𝔞            \fraka                                       MATHEMATICAL FRAKTUR SMALL A
-U+1D51F           𝔟            \frakb                                       MATHEMATICAL FRAKTUR SMALL B
-U+1D520           𝔠            \frakc                                       MATHEMATICAL FRAKTUR SMALL C
-U+1D521           𝔡            \frakd                                       MATHEMATICAL FRAKTUR SMALL D
-U+1D522           𝔢            \frake                                       MATHEMATICAL FRAKTUR SMALL E
-U+1D523           𝔣            \frakf                                       MATHEMATICAL FRAKTUR SMALL F
-U+1D524           𝔤            \frakg                                       MATHEMATICAL FRAKTUR SMALL G
-U+1D525           𝔥            \frakh                                       MATHEMATICAL FRAKTUR SMALL H
-U+1D526           𝔦            \fraki                                       MATHEMATICAL FRAKTUR SMALL I
-U+1D527           𝔧            \frakj                                       MATHEMATICAL FRAKTUR SMALL J
-U+1D528           𝔨            \frakk                                       MATHEMATICAL FRAKTUR SMALL K
-U+1D529           𝔩            \frakl                                       MATHEMATICAL FRAKTUR SMALL L
-U+1D52A           𝔪            \frakm                                       MATHEMATICAL FRAKTUR SMALL M
-U+1D52B           𝔫            \frakn                                       MATHEMATICAL FRAKTUR SMALL N
-U+1D52C           𝔬            \frako                                       MATHEMATICAL FRAKTUR SMALL O
-U+1D52D           𝔭            \frakp                                       MATHEMATICAL FRAKTUR SMALL P
-U+1D52E           𝔮            \frakq                                       MATHEMATICAL FRAKTUR SMALL Q
-U+1D52F           𝔯            \frakr                                       MATHEMATICAL FRAKTUR SMALL R
-U+1D530           𝔰            \fraks                                       MATHEMATICAL FRAKTUR SMALL S
-U+1D531           𝔱            \frakt                                       MATHEMATICAL FRAKTUR SMALL T
-U+1D532           𝔲            \fraku                                       MATHEMATICAL FRAKTUR SMALL U
-U+1D533           𝔳            \frakv                                       MATHEMATICAL FRAKTUR SMALL V
-U+1D534           𝔴            \frakw                                       MATHEMATICAL FRAKTUR SMALL W
-U+1D535           𝔵            \frakx                                       MATHEMATICAL FRAKTUR SMALL X
-U+1D536           𝔶            \fraky                                       MATHEMATICAL FRAKTUR SMALL Y
-U+1D537           𝔷            \frakz                                       MATHEMATICAL FRAKTUR SMALL Z
-U+1D538           𝔸            \bbA                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL A
-U+1D539           𝔹            \bbB                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL B
-U+1D53B           𝔻            \bbD                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL D
-U+1D53C           𝔼            \bbE                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL E
-U+1D53D           𝔽            \bbF                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL F
-U+1D53E           𝔾            \bbG                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL G
-U+1D540           𝕀            \bbI                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL I
-U+1D541           𝕁            \bbJ                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL J
-U+1D542           𝕂            \bbK                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL K
-U+1D543           𝕃            \bbL                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL L
-U+1D544           𝕄            \bbM                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL M
-U+1D546           𝕆            \bbO                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL O
-U+1D54A           𝕊            \bbS                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL S
-U+1D54B           𝕋            \bbT                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL T
-U+1D54C           𝕌            \bbU                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL U
-U+1D54D           𝕍            \bbV                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL V
-U+1D54E           𝕎            \bbW                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL W
-U+1D54F           𝕏            \bbX                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL X
-U+1D550           𝕐            \bbY                                         MATHEMATICAL DOUBLE-STRUCK CAPITAL Y
-U+1D552           𝕒            \bba                                         MATHEMATICAL DOUBLE-STRUCK SMALL A
-U+1D553           𝕓            \bbb                                         MATHEMATICAL DOUBLE-STRUCK SMALL B
-U+1D554           𝕔            \bbc                                         MATHEMATICAL DOUBLE-STRUCK SMALL C
-U+1D555           𝕕            \bbd                                         MATHEMATICAL DOUBLE-STRUCK SMALL D
-U+1D556           𝕖            \bbe                                         MATHEMATICAL DOUBLE-STRUCK SMALL E
-U+1D557           𝕗            \bbf                                         MATHEMATICAL DOUBLE-STRUCK SMALL F
-U+1D558           𝕘            \bbg                                         MATHEMATICAL DOUBLE-STRUCK SMALL G
-U+1D559           𝕙            \bbh                                         MATHEMATICAL DOUBLE-STRUCK SMALL H
-U+1D55A           𝕚            \bbi                                         MATHEMATICAL DOUBLE-STRUCK SMALL I
-U+1D55B           𝕛            \bbj                                         MATHEMATICAL DOUBLE-STRUCK SMALL J
-U+1D55C           𝕜            \bbk                                         MATHEMATICAL DOUBLE-STRUCK SMALL K
-U+1D55D           𝕝            \bbl                                         MATHEMATICAL DOUBLE-STRUCK SMALL L
-U+1D55E           𝕞            \bbm                                         MATHEMATICAL DOUBLE-STRUCK SMALL M
-U+1D55F           𝕟            \bbn                                         MATHEMATICAL DOUBLE-STRUCK SMALL N
-U+1D560           𝕠            \bbo                                         MATHEMATICAL DOUBLE-STRUCK SMALL O
-U+1D561           𝕡            \bbp                                         MATHEMATICAL DOUBLE-STRUCK SMALL P
-U+1D562           𝕢            \bbq                                         MATHEMATICAL DOUBLE-STRUCK SMALL Q
-U+1D563           𝕣            \bbr                                         MATHEMATICAL DOUBLE-STRUCK SMALL R
-U+1D564           𝕤            \bbs                                         MATHEMATICAL DOUBLE-STRUCK SMALL S
-U+1D565           𝕥            \bbt                                         MATHEMATICAL DOUBLE-STRUCK SMALL T
-U+1D566           𝕦            \bbu                                         MATHEMATICAL DOUBLE-STRUCK SMALL U
-U+1D567           𝕧            \bbv                                         MATHEMATICAL DOUBLE-STRUCK SMALL V
-U+1D568           𝕨            \bbw                                         MATHEMATICAL DOUBLE-STRUCK SMALL W
-U+1D569           𝕩            \bbx                                         MATHEMATICAL DOUBLE-STRUCK SMALL X
-U+1D56A           𝕪            \bby                                         MATHEMATICAL DOUBLE-STRUCK SMALL Y
-U+1D56B           𝕫            \bbz                                         MATHEMATICAL DOUBLE-STRUCK SMALL Z
-U+1D56C           𝕬            \bfrakA                                      MATHEMATICAL BOLD FRAKTUR CAPITAL A
-U+1D56D           𝕭            \bfrakB                                      MATHEMATICAL BOLD FRAKTUR CAPITAL B
-U+1D56E           𝕮            \bfrakC                                      MATHEMATICAL BOLD FRAKTUR CAPITAL C
-U+1D56F           𝕯            \bfrakD                                      MATHEMATICAL BOLD FRAKTUR CAPITAL D
-U+1D570           𝕰            \bfrakE                                      MATHEMATICAL BOLD FRAKTUR CAPITAL E
-U+1D571           𝕱            \bfrakF                                      MATHEMATICAL BOLD FRAKTUR CAPITAL F
-U+1D572           𝕲            \bfrakG                                      MATHEMATICAL BOLD FRAKTUR CAPITAL G
-U+1D573           𝕳            \bfrakH                                      MATHEMATICAL BOLD FRAKTUR CAPITAL H
-U+1D574           𝕴            \bfrakI                                      MATHEMATICAL BOLD FRAKTUR CAPITAL I
-U+1D575           𝕵            \bfrakJ                                      MATHEMATICAL BOLD FRAKTUR CAPITAL J
-U+1D576           𝕶            \bfrakK                                      MATHEMATICAL BOLD FRAKTUR CAPITAL K
-U+1D577           𝕷            \bfrakL                                      MATHEMATICAL BOLD FRAKTUR CAPITAL L
-U+1D578           𝕸            \bfrakM                                      MATHEMATICAL BOLD FRAKTUR CAPITAL M
-U+1D579           𝕹            \bfrakN                                      MATHEMATICAL BOLD FRAKTUR CAPITAL N
-U+1D57A           𝕺            \bfrakO                                      MATHEMATICAL BOLD FRAKTUR CAPITAL O
-U+1D57B           𝕻            \bfrakP                                      MATHEMATICAL BOLD FRAKTUR CAPITAL P
-U+1D57C           𝕼            \bfrakQ                                      MATHEMATICAL BOLD FRAKTUR CAPITAL Q
-U+1D57D           𝕽            \bfrakR                                      MATHEMATICAL BOLD FRAKTUR CAPITAL R
-U+1D57E           𝕾            \bfrakS                                      MATHEMATICAL BOLD FRAKTUR CAPITAL S
-U+1D57F           𝕿            \bfrakT                                      MATHEMATICAL BOLD FRAKTUR CAPITAL T
-U+1D580           𝖀            \bfrakU                                      MATHEMATICAL BOLD FRAKTUR CAPITAL U
-U+1D581           𝖁            \bfrakV                                      MATHEMATICAL BOLD FRAKTUR CAPITAL V
-U+1D582           𝖂            \bfrakW                                      MATHEMATICAL BOLD FRAKTUR CAPITAL W
-U+1D583           𝖃            \bfrakX                                      MATHEMATICAL BOLD FRAKTUR CAPITAL X
-U+1D584           𝖄            \bfrakY                                      MATHEMATICAL BOLD FRAKTUR CAPITAL Y
-U+1D585           𝖅            \bfrakZ                                      MATHEMATICAL BOLD FRAKTUR CAPITAL Z
-U+1D586           𝖆            \bfraka                                      MATHEMATICAL BOLD FRAKTUR SMALL A
-U+1D587           𝖇            \bfrakb                                      MATHEMATICAL BOLD FRAKTUR SMALL B
-U+1D588           𝖈            \bfrakc                                      MATHEMATICAL BOLD FRAKTUR SMALL C
-U+1D589           𝖉            \bfrakd                                      MATHEMATICAL BOLD FRAKTUR SMALL D
-U+1D58A           𝖊            \bfrake                                      MATHEMATICAL BOLD FRAKTUR SMALL E
-U+1D58B           𝖋            \bfrakf                                      MATHEMATICAL BOLD FRAKTUR SMALL F
-U+1D58C           𝖌            \bfrakg                                      MATHEMATICAL BOLD FRAKTUR SMALL G
-U+1D58D           𝖍            \bfrakh                                      MATHEMATICAL BOLD FRAKTUR SMALL H
-U+1D58E           𝖎            \bfraki                                      MATHEMATICAL BOLD FRAKTUR SMALL I
-U+1D58F           𝖏            \bfrakj                                      MATHEMATICAL BOLD FRAKTUR SMALL J
-U+1D590           𝖐            \bfrakk                                      MATHEMATICAL BOLD FRAKTUR SMALL K
-U+1D591           𝖑            \bfrakl                                      MATHEMATICAL BOLD FRAKTUR SMALL L
-U+1D592           𝖒            \bfrakm                                      MATHEMATICAL BOLD FRAKTUR SMALL M
-U+1D593           𝖓            \bfrakn                                      MATHEMATICAL BOLD FRAKTUR SMALL N
-U+1D594           𝖔            \bfrako                                      MATHEMATICAL BOLD FRAKTUR SMALL O
-U+1D595           𝖕            \bfrakp                                      MATHEMATICAL BOLD FRAKTUR SMALL P
-U+1D596           𝖖            \bfrakq                                      MATHEMATICAL BOLD FRAKTUR SMALL Q
-U+1D597           𝖗            \bfrakr                                      MATHEMATICAL BOLD FRAKTUR SMALL R
-U+1D598           𝖘            \bfraks                                      MATHEMATICAL BOLD FRAKTUR SMALL S
-U+1D599           𝖙            \bfrakt                                      MATHEMATICAL BOLD FRAKTUR SMALL T
-U+1D59A           𝖚            \bfraku                                      MATHEMATICAL BOLD FRAKTUR SMALL U
-U+1D59B           𝖛            \bfrakv                                      MATHEMATICAL BOLD FRAKTUR SMALL V
-U+1D59C           𝖜            \bfrakw                                      MATHEMATICAL BOLD FRAKTUR SMALL W
-U+1D59D           𝖝            \bfrakx                                      MATHEMATICAL BOLD FRAKTUR SMALL X
-U+1D59E           𝖞            \bfraky                                      MATHEMATICAL BOLD FRAKTUR SMALL Y
-U+1D59F           𝖟            \bfrakz                                      MATHEMATICAL BOLD FRAKTUR SMALL Z
-U+1D5A0           𝖠            \sansA                                       MATHEMATICAL SANS-SERIF CAPITAL A
-U+1D5A1           𝖡            \sansB                                       MATHEMATICAL SANS-SERIF CAPITAL B
-U+1D5A2           𝖢            \sansC                                       MATHEMATICAL SANS-SERIF CAPITAL C
-U+1D5A3           𝖣            \sansD                                       MATHEMATICAL SANS-SERIF CAPITAL D
-U+1D5A4           𝖤            \sansE                                       MATHEMATICAL SANS-SERIF CAPITAL E
-U+1D5A5           𝖥            \sansF                                       MATHEMATICAL SANS-SERIF CAPITAL F
-U+1D5A6           𝖦            \sansG                                       MATHEMATICAL SANS-SERIF CAPITAL G
-U+1D5A7           𝖧            \sansH                                       MATHEMATICAL SANS-SERIF CAPITAL H
-U+1D5A8           𝖨            \sansI                                       MATHEMATICAL SANS-SERIF CAPITAL I
-U+1D5A9           𝖩            \sansJ                                       MATHEMATICAL SANS-SERIF CAPITAL J
-U+1D5AA           𝖪            \sansK                                       MATHEMATICAL SANS-SERIF CAPITAL K
-U+1D5AB           𝖫            \sansL                                       MATHEMATICAL SANS-SERIF CAPITAL L
-U+1D5AC           𝖬            \sansM                                       MATHEMATICAL SANS-SERIF CAPITAL M
-U+1D5AD           𝖭            \sansN                                       MATHEMATICAL SANS-SERIF CAPITAL N
-U+1D5AE           𝖮            \sansO                                       MATHEMATICAL SANS-SERIF CAPITAL O
-U+1D5AF           𝖯            \sansP                                       MATHEMATICAL SANS-SERIF CAPITAL P
-U+1D5B0           𝖰            \sansQ                                       MATHEMATICAL SANS-SERIF CAPITAL Q
-U+1D5B1           𝖱            \sansR                                       MATHEMATICAL SANS-SERIF CAPITAL R
-U+1D5B2           𝖲            \sansS                                       MATHEMATICAL SANS-SERIF CAPITAL S
-U+1D5B3           𝖳            \sansT                                       MATHEMATICAL SANS-SERIF CAPITAL T
-U+1D5B4           𝖴            \sansU                                       MATHEMATICAL SANS-SERIF CAPITAL U
-U+1D5B5           𝖵            \sansV                                       MATHEMATICAL SANS-SERIF CAPITAL V
-U+1D5B6           𝖶            \sansW                                       MATHEMATICAL SANS-SERIF CAPITAL W
-U+1D5B7           𝖷            \sansX                                       MATHEMATICAL SANS-SERIF CAPITAL X
-U+1D5B8           𝖸            \sansY                                       MATHEMATICAL SANS-SERIF CAPITAL Y
-U+1D5B9           𝖹            \sansZ                                       MATHEMATICAL SANS-SERIF CAPITAL Z
-U+1D5BA           𝖺            \sansa                                       MATHEMATICAL SANS-SERIF SMALL A
-U+1D5BB           𝖻            \sansb                                       MATHEMATICAL SANS-SERIF SMALL B
-U+1D5BC           𝖼            \sansc                                       MATHEMATICAL SANS-SERIF SMALL C
-U+1D5BD           𝖽            \sansd                                       MATHEMATICAL SANS-SERIF SMALL D
-U+1D5BE           𝖾            \sanse                                       MATHEMATICAL SANS-SERIF SMALL E
-U+1D5BF           𝖿            \sansf                                       MATHEMATICAL SANS-SERIF SMALL F
-U+1D5C0           𝗀            \sansg                                       MATHEMATICAL SANS-SERIF SMALL G
-U+1D5C1           𝗁            \sansh                                       MATHEMATICAL SANS-SERIF SMALL H
-U+1D5C2           𝗂            \sansi                                       MATHEMATICAL SANS-SERIF SMALL I
-U+1D5C3           𝗃            \sansj                                       MATHEMATICAL SANS-SERIF SMALL J
-U+1D5C4           𝗄            \sansk                                       MATHEMATICAL SANS-SERIF SMALL K
-U+1D5C5           𝗅            \sansl                                       MATHEMATICAL SANS-SERIF SMALL L
-U+1D5C6           𝗆            \sansm                                       MATHEMATICAL SANS-SERIF SMALL M
-U+1D5C7           𝗇            \sansn                                       MATHEMATICAL SANS-SERIF SMALL N
-U+1D5C8           𝗈            \sanso                                       MATHEMATICAL SANS-SERIF SMALL O
-U+1D5C9           𝗉            \sansp                                       MATHEMATICAL SANS-SERIF SMALL P
-U+1D5CA           𝗊            \sansq                                       MATHEMATICAL SANS-SERIF SMALL Q
-U+1D5CB           𝗋            \sansr                                       MATHEMATICAL SANS-SERIF SMALL R
-U+1D5CC           𝗌            \sanss                                       MATHEMATICAL SANS-SERIF SMALL S
-U+1D5CD           𝗍            \sanst                                       MATHEMATICAL SANS-SERIF SMALL T
-U+1D5CE           𝗎            \sansu                                       MATHEMATICAL SANS-SERIF SMALL U
-U+1D5CF           𝗏            \sansv                                       MATHEMATICAL SANS-SERIF SMALL V
-U+1D5D0           𝗐            \sansw                                       MATHEMATICAL SANS-SERIF SMALL W
-U+1D5D1           𝗑            \sansx                                       MATHEMATICAL SANS-SERIF SMALL X
-U+1D5D2           𝗒            \sansy                                       MATHEMATICAL SANS-SERIF SMALL Y
-U+1D5D3           𝗓            \sansz                                       MATHEMATICAL SANS-SERIF SMALL Z
-U+1D5D4           𝗔            \bsansA                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL A
-U+1D5D5           𝗕            \bsansB                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL B
-U+1D5D6           𝗖            \bsansC                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL C
-U+1D5D7           𝗗            \bsansD                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL D
-U+1D5D8           𝗘            \bsansE                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL E
-U+1D5D9           𝗙            \bsansF                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL F
-U+1D5DA           𝗚            \bsansG                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL G
-U+1D5DB           𝗛            \bsansH                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL H
-U+1D5DC           𝗜            \bsansI                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL I
-U+1D5DD           𝗝            \bsansJ                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL J
-U+1D5DE           𝗞            \bsansK                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL K
-U+1D5DF           𝗟            \bsansL                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL L
-U+1D5E0           𝗠            \bsansM                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL M
-U+1D5E1           𝗡            \bsansN                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL N
-U+1D5E2           𝗢            \bsansO                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL O
-U+1D5E3           𝗣            \bsansP                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL P
-U+1D5E4           𝗤            \bsansQ                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL Q
-U+1D5E5           𝗥            \bsansR                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL R
-U+1D5E6           𝗦            \bsansS                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL S
-U+1D5E7           𝗧            \bsansT                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL T
-U+1D5E8           𝗨            \bsansU                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL U
-U+1D5E9           𝗩            \bsansV                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL V
-U+1D5EA           𝗪            \bsansW                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL W
-U+1D5EB           𝗫            \bsansX                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL X
-U+1D5EC           𝗬            \bsansY                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL Y
-U+1D5ED           𝗭            \bsansZ                                      MATHEMATICAL SANS-SERIF BOLD CAPITAL Z
-U+1D5EE           𝗮            \bsansa                                      MATHEMATICAL SANS-SERIF BOLD SMALL A
-U+1D5EF           𝗯            \bsansb                                      MATHEMATICAL SANS-SERIF BOLD SMALL B
-U+1D5F0           𝗰            \bsansc                                      MATHEMATICAL SANS-SERIF BOLD SMALL C
-U+1D5F1           𝗱            \bsansd                                      MATHEMATICAL SANS-SERIF BOLD SMALL D
-U+1D5F2           𝗲            \bsanse                                      MATHEMATICAL SANS-SERIF BOLD SMALL E
-U+1D5F3           𝗳            \bsansf                                      MATHEMATICAL SANS-SERIF BOLD SMALL F
-U+1D5F4           𝗴            \bsansg                                      MATHEMATICAL SANS-SERIF BOLD SMALL G
-U+1D5F5           𝗵            \bsansh                                      MATHEMATICAL SANS-SERIF BOLD SMALL H
-U+1D5F6           𝗶            \bsansi                                      MATHEMATICAL SANS-SERIF BOLD SMALL I
-U+1D5F7           𝗷            \bsansj                                      MATHEMATICAL SANS-SERIF BOLD SMALL J
-U+1D5F8           𝗸            \bsansk                                      MATHEMATICAL SANS-SERIF BOLD SMALL K
-U+1D5F9           𝗹            \bsansl                                      MATHEMATICAL SANS-SERIF BOLD SMALL L
-U+1D5FA           𝗺            \bsansm                                      MATHEMATICAL SANS-SERIF BOLD SMALL M
-U+1D5FB           𝗻            \bsansn                                      MATHEMATICAL SANS-SERIF BOLD SMALL N
-U+1D5FC           𝗼            \bsanso                                      MATHEMATICAL SANS-SERIF BOLD SMALL O
-U+1D5FD           𝗽            \bsansp                                      MATHEMATICAL SANS-SERIF BOLD SMALL P
-U+1D5FE           𝗾            \bsansq                                      MATHEMATICAL SANS-SERIF BOLD SMALL Q
-U+1D5FF           𝗿            \bsansr                                      MATHEMATICAL SANS-SERIF BOLD SMALL R
-U+1D600           𝘀            \bsanss                                      MATHEMATICAL SANS-SERIF BOLD SMALL S
-U+1D601           𝘁            \bsanst                                      MATHEMATICAL SANS-SERIF BOLD SMALL T
-U+1D602           𝘂            \bsansu                                      MATHEMATICAL SANS-SERIF BOLD SMALL U
-U+1D603           𝘃            \bsansv                                      MATHEMATICAL SANS-SERIF BOLD SMALL V
-U+1D604           𝘄            \bsansw                                      MATHEMATICAL SANS-SERIF BOLD SMALL W
-U+1D605           𝘅            \bsansx                                      MATHEMATICAL SANS-SERIF BOLD SMALL X
-U+1D606           𝘆            \bsansy                                      MATHEMATICAL SANS-SERIF BOLD SMALL Y
-U+1D607           𝘇            \bsansz                                      MATHEMATICAL SANS-SERIF BOLD SMALL Z
-U+1D608           𝘈            \isansA                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL A
-U+1D609           𝘉            \isansB                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL B
-U+1D60A           𝘊            \isansC                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL C
-U+1D60B           𝘋            \isansD                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL D
-U+1D60C           𝘌            \isansE                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL E
-U+1D60D           𝘍            \isansF                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL F
-U+1D60E           𝘎            \isansG                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL G
-U+1D60F           𝘏            \isansH                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL H
-U+1D610           𝘐            \isansI                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL I
-U+1D611           𝘑            \isansJ                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL J
-U+1D612           𝘒            \isansK                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL K
-U+1D613           𝘓            \isansL                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL L
-U+1D614           𝘔            \isansM                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL M
-U+1D615           𝘕            \isansN                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL N
-U+1D616           𝘖            \isansO                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL O
-U+1D617           𝘗            \isansP                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL P
-U+1D618           𝘘            \isansQ                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL Q
-U+1D619           𝘙            \isansR                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL R
-U+1D61A           𝘚            \isansS                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL S
-U+1D61B           𝘛            \isansT                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL T
-U+1D61C           𝘜            \isansU                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL U
-U+1D61D           𝘝            \isansV                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL V
-U+1D61E           𝘞            \isansW                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL W
-U+1D61F           𝘟            \isansX                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL X
-U+1D620           𝘠            \isansY                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL Y
-U+1D621           𝘡            \isansZ                                      MATHEMATICAL SANS-SERIF ITALIC CAPITAL Z
-U+1D622           𝘢            \isansa                                      MATHEMATICAL SANS-SERIF ITALIC SMALL A
-U+1D623           𝘣            \isansb                                      MATHEMATICAL SANS-SERIF ITALIC SMALL B
-U+1D624           𝘤            \isansc                                      MATHEMATICAL SANS-SERIF ITALIC SMALL C
-U+1D625           𝘥            \isansd                                      MATHEMATICAL SANS-SERIF ITALIC SMALL D
-U+1D626           𝘦            \isanse                                      MATHEMATICAL SANS-SERIF ITALIC SMALL E
-U+1D627           𝘧            \isansf                                      MATHEMATICAL SANS-SERIF ITALIC SMALL F
-U+1D628           𝘨            \isansg                                      MATHEMATICAL SANS-SERIF ITALIC SMALL G
-U+1D629           𝘩            \isansh                                      MATHEMATICAL SANS-SERIF ITALIC SMALL H
-U+1D62A           𝘪            \isansi                                      MATHEMATICAL SANS-SERIF ITALIC SMALL I
-U+1D62B           𝘫            \isansj                                      MATHEMATICAL SANS-SERIF ITALIC SMALL J
-U+1D62C           𝘬            \isansk                                      MATHEMATICAL SANS-SERIF ITALIC SMALL K
-U+1D62D           𝘭            \isansl                                      MATHEMATICAL SANS-SERIF ITALIC SMALL L
-U+1D62E           𝘮            \isansm                                      MATHEMATICAL SANS-SERIF ITALIC SMALL M
-U+1D62F           𝘯            \isansn                                      MATHEMATICAL SANS-SERIF ITALIC SMALL N
-U+1D630           𝘰            \isanso                                      MATHEMATICAL SANS-SERIF ITALIC SMALL O
-U+1D631           𝘱            \isansp                                      MATHEMATICAL SANS-SERIF ITALIC SMALL P
-U+1D632           𝘲            \isansq                                      MATHEMATICAL SANS-SERIF ITALIC SMALL Q
-U+1D633           𝘳            \isansr                                      MATHEMATICAL SANS-SERIF ITALIC SMALL R
-U+1D634           𝘴            \isanss                                      MATHEMATICAL SANS-SERIF ITALIC SMALL S
-U+1D635           𝘵            \isanst                                      MATHEMATICAL SANS-SERIF ITALIC SMALL T
-U+1D636           𝘶            \isansu                                      MATHEMATICAL SANS-SERIF ITALIC SMALL U
-U+1D637           𝘷            \isansv                                      MATHEMATICAL SANS-SERIF ITALIC SMALL V
-U+1D638           𝘸            \isansw                                      MATHEMATICAL SANS-SERIF ITALIC SMALL W
-U+1D639           𝘹            \isansx                                      MATHEMATICAL SANS-SERIF ITALIC SMALL X
-U+1D63A           𝘺            \isansy                                      MATHEMATICAL SANS-SERIF ITALIC SMALL Y
-U+1D63B           𝘻            \isansz                                      MATHEMATICAL SANS-SERIF ITALIC SMALL Z
-U+1D63C           𝘼            \bisansA                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL A
-U+1D63D           𝘽            \bisansB                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL B
-U+1D63E           𝘾            \bisansC                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL C
-U+1D63F           𝘿            \bisansD                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL D
-U+1D640           𝙀            \bisansE                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL E
-U+1D641           𝙁            \bisansF                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL F
-U+1D642           𝙂            \bisansG                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL G
-U+1D643           𝙃            \bisansH                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL H
-U+1D644           𝙄            \bisansI                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL I
-U+1D645           𝙅            \bisansJ                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL J
-U+1D646           𝙆            \bisansK                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL K
-U+1D647           𝙇            \bisansL                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL L
-U+1D648           𝙈            \bisansM                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL M
-U+1D649           𝙉            \bisansN                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL N
-U+1D64A           𝙊            \bisansO                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL O
-U+1D64B           𝙋            \bisansP                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL P
-U+1D64C           𝙌            \bisansQ                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Q
-U+1D64D           𝙍            \bisansR                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL R
-U+1D64E           𝙎            \bisansS                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL S
-U+1D64F           𝙏            \bisansT                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL T
-U+1D650           𝙐            \bisansU                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL U
-U+1D651           𝙑            \bisansV                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL V
-U+1D652           𝙒            \bisansW                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL W
-U+1D653           𝙓            \bisansX                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL X
-U+1D654           𝙔            \bisansY                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Y
-U+1D655           𝙕            \bisansZ                                     MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL Z
-U+1D656           𝙖            \bisansa                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL A
-U+1D657           𝙗            \bisansb                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL B
-U+1D658           𝙘            \bisansc                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL C
-U+1D659           𝙙            \bisansd                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL D
-U+1D65A           𝙚            \bisanse                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL E
-U+1D65B           𝙛            \bisansf                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL F
-U+1D65C           𝙜            \bisansg                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL G
-U+1D65D           𝙝            \bisansh                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL H
-U+1D65E           𝙞            \bisansi                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL I
-U+1D65F           𝙟            \bisansj                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL J
-U+1D660           𝙠            \bisansk                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL K
-U+1D661           𝙡            \bisansl                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL L
-U+1D662           𝙢            \bisansm                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL M
-U+1D663           𝙣            \bisansn                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL N
-U+1D664           𝙤            \bisanso                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL O
-U+1D665           𝙥            \bisansp                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL P
-U+1D666           𝙦            \bisansq                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Q
-U+1D667           𝙧            \bisansr                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL R
-U+1D668           𝙨            \bisanss                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL S
-U+1D669           𝙩            \bisanst                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL T
-U+1D66A           𝙪            \bisansu                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL U
-U+1D66B           𝙫            \bisansv                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL V
-U+1D66C           𝙬            \bisansw                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL W
-U+1D66D           𝙭            \bisansx                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL X
-U+1D66E           𝙮            \bisansy                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Y
-U+1D66F           𝙯            \bisansz                                     MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL Z
-U+1D670           𝙰            \ttA                                         MATHEMATICAL MONOSPACE CAPITAL A
-U+1D671           𝙱            \ttB                                         MATHEMATICAL MONOSPACE CAPITAL B
-U+1D672           𝙲            \ttC                                         MATHEMATICAL MONOSPACE CAPITAL C
-U+1D673           𝙳            \ttD                                         MATHEMATICAL MONOSPACE CAPITAL D
-U+1D674           𝙴            \ttE                                         MATHEMATICAL MONOSPACE CAPITAL E
-U+1D675           𝙵            \ttF                                         MATHEMATICAL MONOSPACE CAPITAL F
-U+1D676           𝙶            \ttG                                         MATHEMATICAL MONOSPACE CAPITAL G
-U+1D677           𝙷            \ttH                                         MATHEMATICAL MONOSPACE CAPITAL H
-U+1D678           𝙸            \ttI                                         MATHEMATICAL MONOSPACE CAPITAL I
-U+1D679           𝙹            \ttJ                                         MATHEMATICAL MONOSPACE CAPITAL J
-U+1D67A           𝙺            \ttK                                         MATHEMATICAL MONOSPACE CAPITAL K
-U+1D67B           𝙻            \ttL                                         MATHEMATICAL MONOSPACE CAPITAL L
-U+1D67C           𝙼            \ttM                                         MATHEMATICAL MONOSPACE CAPITAL M
-U+1D67D           𝙽            \ttN                                         MATHEMATICAL MONOSPACE CAPITAL N
-U+1D67E           𝙾            \ttO                                         MATHEMATICAL MONOSPACE CAPITAL O
-U+1D67F           𝙿            \ttP                                         MATHEMATICAL MONOSPACE CAPITAL P
-U+1D680           𝚀            \ttQ                                         MATHEMATICAL MONOSPACE CAPITAL Q
-U+1D681           𝚁            \ttR                                         MATHEMATICAL MONOSPACE CAPITAL R
-U+1D682           𝚂            \ttS                                         MATHEMATICAL MONOSPACE CAPITAL S
-U+1D683           𝚃            \ttT                                         MATHEMATICAL MONOSPACE CAPITAL T
-U+1D684           𝚄            \ttU                                         MATHEMATICAL MONOSPACE CAPITAL U
-U+1D685           𝚅            \ttV                                         MATHEMATICAL MONOSPACE CAPITAL V
-U+1D686           𝚆            \ttW                                         MATHEMATICAL MONOSPACE CAPITAL W
-U+1D687           𝚇            \ttX                                         MATHEMATICAL MONOSPACE CAPITAL X
-U+1D688           𝚈            \ttY                                         MATHEMATICAL MONOSPACE CAPITAL Y
-U+1D689           𝚉            \ttZ                                         MATHEMATICAL MONOSPACE CAPITAL Z
-U+1D68A           𝚊            \tta                                         MATHEMATICAL MONOSPACE SMALL A
-U+1D68B           𝚋            \ttb                                         MATHEMATICAL MONOSPACE SMALL B
-U+1D68C           𝚌            \ttc                                         MATHEMATICAL MONOSPACE SMALL C
-U+1D68D           𝚍            \ttd                                         MATHEMATICAL MONOSPACE SMALL D
-U+1D68E           𝚎            \tte                                         MATHEMATICAL MONOSPACE SMALL E
-U+1D68F           𝚏            \ttf                                         MATHEMATICAL MONOSPACE SMALL F
-U+1D690           𝚐            \ttg                                         MATHEMATICAL MONOSPACE SMALL G
-U+1D691           𝚑            \tth                                         MATHEMATICAL MONOSPACE SMALL H
-U+1D692           𝚒            \tti                                         MATHEMATICAL MONOSPACE SMALL I
-U+1D693           𝚓            \ttj                                         MATHEMATICAL MONOSPACE SMALL J
-U+1D694           𝚔            \ttk                                         MATHEMATICAL MONOSPACE SMALL K
-U+1D695           𝚕            \ttl                                         MATHEMATICAL MONOSPACE SMALL L
-U+1D696           𝚖            \ttm                                         MATHEMATICAL MONOSPACE SMALL M
-U+1D697           𝚗            \ttn                                         MATHEMATICAL MONOSPACE SMALL N
-U+1D698           𝚘            \tto                                         MATHEMATICAL MONOSPACE SMALL O
-U+1D699           𝚙            \ttp                                         MATHEMATICAL MONOSPACE SMALL P
-U+1D69A           𝚚            \ttq                                         MATHEMATICAL MONOSPACE SMALL Q
-U+1D69B           𝚛            \ttr                                         MATHEMATICAL MONOSPACE SMALL R
-U+1D69C           𝚜            \tts                                         MATHEMATICAL MONOSPACE SMALL S
-U+1D69D           𝚝            \ttt                                         MATHEMATICAL MONOSPACE SMALL T
-U+1D69E           𝚞            \ttu                                         MATHEMATICAL MONOSPACE SMALL U
-U+1D69F           𝚟            \ttv                                         MATHEMATICAL MONOSPACE SMALL V
-U+1D6A0           𝚠            \ttw                                         MATHEMATICAL MONOSPACE SMALL W
-U+1D6A1           𝚡            \ttx                                         MATHEMATICAL MONOSPACE SMALL X
-U+1D6A2           𝚢            \tty                                         MATHEMATICAL MONOSPACE SMALL Y
-U+1D6A3           𝚣            \ttz                                         MATHEMATICAL MONOSPACE SMALL Z
-U+1D6A4           𝚤            \itimath                                     MATHEMATICAL ITALIC SMALL DOTLESS I
-U+1D6A5           𝚥            \itjmath                                     MATHEMATICAL ITALIC SMALL DOTLESS J
-U+1D6A8           𝚨            \bfAlpha                                     MATHEMATICAL BOLD CAPITAL ALPHA
-U+1D6A9           𝚩            \bfBeta                                      MATHEMATICAL BOLD CAPITAL BETA
-U+1D6AA           𝚪            \bfGamma                                     MATHEMATICAL BOLD CAPITAL GAMMA
-U+1D6AB           𝚫            \bfDelta                                     MATHEMATICAL BOLD CAPITAL DELTA
-U+1D6AC           𝚬            \bfEpsilon                                   MATHEMATICAL BOLD CAPITAL EPSILON
-U+1D6AD           𝚭            \bfZeta                                      MATHEMATICAL BOLD CAPITAL ZETA
-U+1D6AE           𝚮            \bfEta                                       MATHEMATICAL BOLD CAPITAL ETA
-U+1D6AF           𝚯            \bfTheta                                     MATHEMATICAL BOLD CAPITAL THETA
-U+1D6B0           𝚰            \bfIota                                      MATHEMATICAL BOLD CAPITAL IOTA
-U+1D6B1           𝚱            \bfKappa                                     MATHEMATICAL BOLD CAPITAL KAPPA
-U+1D6B2           𝚲            \bfLambda                                    MATHEMATICAL BOLD CAPITAL LAMDA
-U+1D6B3           𝚳            \bfMu                                        MATHEMATICAL BOLD CAPITAL MU
-U+1D6B4           𝚴            \bfNu                                        MATHEMATICAL BOLD CAPITAL NU
-U+1D6B5           𝚵            \bfXi                                        MATHEMATICAL BOLD CAPITAL XI
-U+1D6B6           𝚶            \bfOmicron                                   MATHEMATICAL BOLD CAPITAL OMICRON
-U+1D6B7           𝚷            \bfPi                                        MATHEMATICAL BOLD CAPITAL PI
-U+1D6B8           𝚸            \bfRho                                       MATHEMATICAL BOLD CAPITAL RHO
-U+1D6B9           𝚹            \bfvarTheta                                  MATHEMATICAL BOLD CAPITAL THETA SYMBOL
-U+1D6BA           𝚺            \bfSigma                                     MATHEMATICAL BOLD CAPITAL SIGMA
-U+1D6BB           𝚻            \bfTau                                       MATHEMATICAL BOLD CAPITAL TAU
-U+1D6BC           𝚼            \bfUpsilon                                   MATHEMATICAL BOLD CAPITAL UPSILON
-U+1D6BD           𝚽            \bfPhi                                       MATHEMATICAL BOLD CAPITAL PHI
-U+1D6BE           𝚾            \bfChi                                       MATHEMATICAL BOLD CAPITAL CHI
-U+1D6BF           𝚿            \bfPsi                                       MATHEMATICAL BOLD CAPITAL PSI
-U+1D6C0           𝛀            \bfOmega                                     MATHEMATICAL BOLD CAPITAL OMEGA
-U+1D6C1           𝛁            \bfnabla                                     MATHEMATICAL BOLD NABLA
-U+1D6C2           𝛂            \bfalpha                                     MATHEMATICAL BOLD SMALL ALPHA
-U+1D6C3           𝛃            \bfbeta                                      MATHEMATICAL BOLD SMALL BETA
-U+1D6C4           𝛄            \bfgamma                                     MATHEMATICAL BOLD SMALL GAMMA
-U+1D6C5           𝛅            \bfdelta                                     MATHEMATICAL BOLD SMALL DELTA
-U+1D6C6           𝛆            \bfepsilon                                   MATHEMATICAL BOLD SMALL EPSILON
-U+1D6C7           𝛇            \bfzeta                                      MATHEMATICAL BOLD SMALL ZETA
-U+1D6C8           𝛈            \bfeta                                       MATHEMATICAL BOLD SMALL ETA
-U+1D6C9           𝛉            \bftheta                                     MATHEMATICAL BOLD SMALL THETA
-U+1D6CA           𝛊            \bfiota                                      MATHEMATICAL BOLD SMALL IOTA
-U+1D6CB           𝛋            \bfkappa                                     MATHEMATICAL BOLD SMALL KAPPA
-U+1D6CC           𝛌            \bflambda                                    MATHEMATICAL BOLD SMALL LAMDA
-U+1D6CD           𝛍            \bfmu                                        MATHEMATICAL BOLD SMALL MU
-U+1D6CE           𝛎            \bfnu                                        MATHEMATICAL BOLD SMALL NU
-U+1D6CF           𝛏            \bfxi                                        MATHEMATICAL BOLD SMALL XI
-U+1D6D0           𝛐            \bfomicron                                   MATHEMATICAL BOLD SMALL OMICRON
-U+1D6D1           𝛑            \bfpi                                        MATHEMATICAL BOLD SMALL PI
-U+1D6D2           𝛒            \bfrho                                       MATHEMATICAL BOLD SMALL RHO
-U+1D6D3           𝛓            \bfvarsigma                                  MATHEMATICAL BOLD SMALL FINAL SIGMA
-U+1D6D4           𝛔            \bfsigma                                     MATHEMATICAL BOLD SMALL SIGMA
-U+1D6D5           𝛕            \bftau                                       MATHEMATICAL BOLD SMALL TAU
-U+1D6D6           𝛖            \bfupsilon                                   MATHEMATICAL BOLD SMALL UPSILON
-U+1D6D7           𝛗            \bfvarphi                                    MATHEMATICAL BOLD SMALL PHI
-U+1D6D8           𝛘            \bfchi                                       MATHEMATICAL BOLD SMALL CHI
-U+1D6D9           𝛙            \bfpsi                                       MATHEMATICAL BOLD SMALL PSI
-U+1D6DA           𝛚            \bfomega                                     MATHEMATICAL BOLD SMALL OMEGA
-U+1D6DB           𝛛            \bfpartial                                   MATHEMATICAL BOLD PARTIAL DIFFERENTIAL
-U+1D6DC           𝛜            \bfvarepsilon                                MATHEMATICAL BOLD EPSILON SYMBOL
-U+1D6DD           𝛝            \bfvartheta                                  MATHEMATICAL BOLD THETA SYMBOL
-U+1D6DE           𝛞            \bfvarkappa                                  MATHEMATICAL BOLD KAPPA SYMBOL
-U+1D6DF           𝛟            \bfphi                                       MATHEMATICAL BOLD PHI SYMBOL
-U+1D6E0           𝛠            \bfvarrho                                    MATHEMATICAL BOLD RHO SYMBOL
-U+1D6E1           𝛡            \bfvarpi                                     MATHEMATICAL BOLD PI SYMBOL
-U+1D6E2           𝛢            \itAlpha                                     MATHEMATICAL ITALIC CAPITAL ALPHA
-U+1D6E3           𝛣            \itBeta                                      MATHEMATICAL ITALIC CAPITAL BETA
-U+1D6E4           𝛤            \itGamma                                     MATHEMATICAL ITALIC CAPITAL GAMMA
-U+1D6E5           𝛥            \itDelta                                     MATHEMATICAL ITALIC CAPITAL DELTA
-U+1D6E6           𝛦            \itEpsilon                                   MATHEMATICAL ITALIC CAPITAL EPSILON
-U+1D6E7           𝛧            \itZeta                                      MATHEMATICAL ITALIC CAPITAL ZETA
-U+1D6E8           𝛨            \itEta                                       MATHEMATICAL ITALIC CAPITAL ETA
-U+1D6E9           𝛩            \itTheta                                     MATHEMATICAL ITALIC CAPITAL THETA
-U+1D6EA           𝛪            \itIota                                      MATHEMATICAL ITALIC CAPITAL IOTA
-U+1D6EB           𝛫            \itKappa                                     MATHEMATICAL ITALIC CAPITAL KAPPA
-U+1D6EC           𝛬            \itLambda                                    MATHEMATICAL ITALIC CAPITAL LAMDA
-U+1D6ED           𝛭            \itMu                                        MATHEMATICAL ITALIC CAPITAL MU
-U+1D6EE           𝛮            \itNu                                        MATHEMATICAL ITALIC CAPITAL NU
-U+1D6EF           𝛯            \itXi                                        MATHEMATICAL ITALIC CAPITAL XI
-U+1D6F0           𝛰            \itOmicron                                   MATHEMATICAL ITALIC CAPITAL OMICRON
-U+1D6F1           𝛱            \itPi                                        MATHEMATICAL ITALIC CAPITAL PI
-U+1D6F2           𝛲            \itRho                                       MATHEMATICAL ITALIC CAPITAL RHO
-U+1D6F3           𝛳            \itvarTheta                                  MATHEMATICAL ITALIC CAPITAL THETA SYMBOL
-U+1D6F4           𝛴            \itSigma                                     MATHEMATICAL ITALIC CAPITAL SIGMA
-U+1D6F5           𝛵            \itTau                                       MATHEMATICAL ITALIC CAPITAL TAU
-U+1D6F6           𝛶            \itUpsilon                                   MATHEMATICAL ITALIC CAPITAL UPSILON
-U+1D6F7           𝛷            \itPhi                                       MATHEMATICAL ITALIC CAPITAL PHI
-U+1D6F8           𝛸            \itChi                                       MATHEMATICAL ITALIC CAPITAL CHI
-U+1D6F9           𝛹            \itPsi                                       MATHEMATICAL ITALIC CAPITAL PSI
-U+1D6FA           𝛺            \itOmega                                     MATHEMATICAL ITALIC CAPITAL OMEGA
-U+1D6FB           𝛻            \itnabla                                     MATHEMATICAL ITALIC NABLA
-U+1D6FC           𝛼            \italpha                                     MATHEMATICAL ITALIC SMALL ALPHA
-U+1D6FD           𝛽            \itbeta                                      MATHEMATICAL ITALIC SMALL BETA
-U+1D6FE           𝛾            \itgamma                                     MATHEMATICAL ITALIC SMALL GAMMA
-U+1D6FF           𝛿            \itdelta                                     MATHEMATICAL ITALIC SMALL DELTA
-U+1D700           𝜀            \itepsilon                                   MATHEMATICAL ITALIC SMALL EPSILON
-U+1D701           𝜁            \itzeta                                      MATHEMATICAL ITALIC SMALL ZETA
-U+1D702           𝜂            \iteta                                       MATHEMATICAL ITALIC SMALL ETA
-U+1D703           𝜃            \ittheta                                     MATHEMATICAL ITALIC SMALL THETA
-U+1D704           𝜄            \itiota                                      MATHEMATICAL ITALIC SMALL IOTA
-U+1D705           𝜅            \itkappa                                     MATHEMATICAL ITALIC SMALL KAPPA
-U+1D706           𝜆            \itlambda                                    MATHEMATICAL ITALIC SMALL LAMDA
-U+1D707           𝜇            \itmu                                        MATHEMATICAL ITALIC SMALL MU
-U+1D708           𝜈            \itnu                                        MATHEMATICAL ITALIC SMALL NU
-U+1D709           𝜉            \itxi                                        MATHEMATICAL ITALIC SMALL XI
-U+1D70A           𝜊            \itomicron                                   MATHEMATICAL ITALIC SMALL OMICRON
-U+1D70B           𝜋            \itpi                                        MATHEMATICAL ITALIC SMALL PI
-U+1D70C           𝜌            \itrho                                       MATHEMATICAL ITALIC SMALL RHO
-U+1D70D           𝜍            \itvarsigma                                  MATHEMATICAL ITALIC SMALL FINAL SIGMA
-U+1D70E           𝜎            \itsigma                                     MATHEMATICAL ITALIC SMALL SIGMA
-U+1D70F           𝜏            \ittau                                       MATHEMATICAL ITALIC SMALL TAU
-U+1D710           𝜐            \itupsilon                                   MATHEMATICAL ITALIC SMALL UPSILON
-U+1D711           𝜑            \itphi                                       MATHEMATICAL ITALIC SMALL PHI
-U+1D712           𝜒            \itchi                                       MATHEMATICAL ITALIC SMALL CHI
-U+1D713           𝜓            \itpsi                                       MATHEMATICAL ITALIC SMALL PSI
-U+1D714           𝜔            \itomega                                     MATHEMATICAL ITALIC SMALL OMEGA
-U+1D715           𝜕            \itpartial                                   MATHEMATICAL ITALIC PARTIAL DIFFERENTIAL
-U+1D716           𝜖            \itvarepsilon                                MATHEMATICAL ITALIC EPSILON SYMBOL
-U+1D717           𝜗            \itvartheta                                  MATHEMATICAL ITALIC THETA SYMBOL
-U+1D718           𝜘            \itvarkappa                                  MATHEMATICAL ITALIC KAPPA SYMBOL
-U+1D719           𝜙            \itvarphi                                    MATHEMATICAL ITALIC PHI SYMBOL
-U+1D71A           𝜚            \itvarrho                                    MATHEMATICAL ITALIC RHO SYMBOL
-U+1D71B           𝜛            \itvarpi                                     MATHEMATICAL ITALIC PI SYMBOL
-U+1D71C           𝜜            \biAlpha                                     MATHEMATICAL BOLD ITALIC CAPITAL ALPHA
-U+1D71D           𝜝            \biBeta                                      MATHEMATICAL BOLD ITALIC CAPITAL BETA
-U+1D71E           𝜞            \biGamma                                     MATHEMATICAL BOLD ITALIC CAPITAL GAMMA
-U+1D71F           𝜟            \biDelta                                     MATHEMATICAL BOLD ITALIC CAPITAL DELTA
-U+1D720           𝜠            \biEpsilon                                   MATHEMATICAL BOLD ITALIC CAPITAL EPSILON
-U+1D721           𝜡            \biZeta                                      MATHEMATICAL BOLD ITALIC CAPITAL ZETA
-U+1D722           𝜢            \biEta                                       MATHEMATICAL BOLD ITALIC CAPITAL ETA
-U+1D723           𝜣            \biTheta                                     MATHEMATICAL BOLD ITALIC CAPITAL THETA
-U+1D724           𝜤            \biIota                                      MATHEMATICAL BOLD ITALIC CAPITAL IOTA
-U+1D725           𝜥            \biKappa                                     MATHEMATICAL BOLD ITALIC CAPITAL KAPPA
-U+1D726           𝜦            \biLambda                                    MATHEMATICAL BOLD ITALIC CAPITAL LAMDA
-U+1D727           𝜧            \biMu                                        MATHEMATICAL BOLD ITALIC CAPITAL MU
-U+1D728           𝜨            \biNu                                        MATHEMATICAL BOLD ITALIC CAPITAL NU
-U+1D729           𝜩            \biXi                                        MATHEMATICAL BOLD ITALIC CAPITAL XI
-U+1D72A           𝜪            \biOmicron                                   MATHEMATICAL BOLD ITALIC CAPITAL OMICRON
-U+1D72B           𝜫            \biPi                                        MATHEMATICAL BOLD ITALIC CAPITAL PI
-U+1D72C           𝜬            \biRho                                       MATHEMATICAL BOLD ITALIC CAPITAL RHO
-U+1D72D           𝜭            \bivarTheta                                  MATHEMATICAL BOLD ITALIC CAPITAL THETA SYMBOL
-U+1D72E           𝜮            \biSigma                                     MATHEMATICAL BOLD ITALIC CAPITAL SIGMA
-U+1D72F           𝜯            \biTau                                       MATHEMATICAL BOLD ITALIC CAPITAL TAU
-U+1D730           𝜰            \biUpsilon                                   MATHEMATICAL BOLD ITALIC CAPITAL UPSILON
-U+1D731           𝜱            \biPhi                                       MATHEMATICAL BOLD ITALIC CAPITAL PHI
-U+1D732           𝜲            \biChi                                       MATHEMATICAL BOLD ITALIC CAPITAL CHI
-U+1D733           𝜳            \biPsi                                       MATHEMATICAL BOLD ITALIC CAPITAL PSI
-U+1D734           𝜴            \biOmega                                     MATHEMATICAL BOLD ITALIC CAPITAL OMEGA
-U+1D735           𝜵            \binabla                                     MATHEMATICAL BOLD ITALIC NABLA
-U+1D736           𝜶            \bialpha                                     MATHEMATICAL BOLD ITALIC SMALL ALPHA
-U+1D737           𝜷            \bibeta                                      MATHEMATICAL BOLD ITALIC SMALL BETA
-U+1D738           𝜸            \bigamma                                     MATHEMATICAL BOLD ITALIC SMALL GAMMA
-U+1D739           𝜹            \bidelta                                     MATHEMATICAL BOLD ITALIC SMALL DELTA
-U+1D73A           𝜺            \biepsilon                                   MATHEMATICAL BOLD ITALIC SMALL EPSILON
-U+1D73B           𝜻            \bizeta                                      MATHEMATICAL BOLD ITALIC SMALL ZETA
-U+1D73C           𝜼            \bieta                                       MATHEMATICAL BOLD ITALIC SMALL ETA
-U+1D73D           𝜽            \bitheta                                     MATHEMATICAL BOLD ITALIC SMALL THETA
-U+1D73E           𝜾            \biiota                                      MATHEMATICAL BOLD ITALIC SMALL IOTA
-U+1D73F           𝜿            \bikappa                                     MATHEMATICAL BOLD ITALIC SMALL KAPPA
-U+1D740           𝝀            \bilambda                                    MATHEMATICAL BOLD ITALIC SMALL LAMDA
-U+1D741           𝝁            \bimu                                        MATHEMATICAL BOLD ITALIC SMALL MU
-U+1D742           𝝂            \binu                                        MATHEMATICAL BOLD ITALIC SMALL NU
-U+1D743           𝝃            \bixi                                        MATHEMATICAL BOLD ITALIC SMALL XI
-U+1D744           𝝄            \biomicron                                   MATHEMATICAL BOLD ITALIC SMALL OMICRON
-U+1D745           𝝅            \bipi                                        MATHEMATICAL BOLD ITALIC SMALL PI
-U+1D746           𝝆            \birho                                       MATHEMATICAL BOLD ITALIC SMALL RHO
-U+1D747           𝝇            \bivarsigma                                  MATHEMATICAL BOLD ITALIC SMALL FINAL SIGMA
-U+1D748           𝝈            \bisigma                                     MATHEMATICAL BOLD ITALIC SMALL SIGMA
-U+1D749           𝝉            \bitau                                       MATHEMATICAL BOLD ITALIC SMALL TAU
-U+1D74A           𝝊            \biupsilon                                   MATHEMATICAL BOLD ITALIC SMALL UPSILON
-U+1D74B           𝝋            \biphi                                       MATHEMATICAL BOLD ITALIC SMALL PHI
-U+1D74C           𝝌            \bichi                                       MATHEMATICAL BOLD ITALIC SMALL CHI
-U+1D74D           𝝍            \bipsi                                       MATHEMATICAL BOLD ITALIC SMALL PSI
-U+1D74E           𝝎            \biomega                                     MATHEMATICAL BOLD ITALIC SMALL OMEGA
-U+1D74F           𝝏            \bipartial                                   MATHEMATICAL BOLD ITALIC PARTIAL DIFFERENTIAL
-U+1D750           𝝐            \bivarepsilon                                MATHEMATICAL BOLD ITALIC EPSILON SYMBOL
-U+1D751           𝝑            \bivartheta                                  MATHEMATICAL BOLD ITALIC THETA SYMBOL
-U+1D752           𝝒            \bivarkappa                                  MATHEMATICAL BOLD ITALIC KAPPA SYMBOL
-U+1D753           𝝓            \bivarphi                                    MATHEMATICAL BOLD ITALIC PHI SYMBOL
-U+1D754           𝝔            \bivarrho                                    MATHEMATICAL BOLD ITALIC RHO SYMBOL
-U+1D755           𝝕            \bivarpi                                     MATHEMATICAL BOLD ITALIC PI SYMBOL
-U+1D756           𝝖            \bsansAlpha                                  MATHEMATICAL SANS-SERIF BOLD CAPITAL ALPHA
-U+1D757           𝝗            \bsansBeta                                   MATHEMATICAL SANS-SERIF BOLD CAPITAL BETA
-U+1D758           𝝘            \bsansGamma                                  MATHEMATICAL SANS-SERIF BOLD CAPITAL GAMMA
-U+1D759           𝝙            \bsansDelta                                  MATHEMATICAL SANS-SERIF BOLD CAPITAL DELTA
-U+1D75A           𝝚            \bsansEpsilon                                MATHEMATICAL SANS-SERIF BOLD CAPITAL EPSILON
-U+1D75B           𝝛            \bsansZeta                                   MATHEMATICAL SANS-SERIF BOLD CAPITAL ZETA
-U+1D75C           𝝜            \bsansEta                                    MATHEMATICAL SANS-SERIF BOLD CAPITAL ETA
-U+1D75D           𝝝            \bsansTheta                                  MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA
-U+1D75E           𝝞            \bsansIota                                   MATHEMATICAL SANS-SERIF BOLD CAPITAL IOTA
-U+1D75F           𝝟            \bsansKappa                                  MATHEMATICAL SANS-SERIF BOLD CAPITAL KAPPA
-U+1D760           𝝠            \bsansLambda                                 MATHEMATICAL SANS-SERIF BOLD CAPITAL LAMDA
-U+1D761           𝝡            \bsansMu                                     MATHEMATICAL SANS-SERIF BOLD CAPITAL MU
-U+1D762           𝝢            \bsansNu                                     MATHEMATICAL SANS-SERIF BOLD CAPITAL NU
-U+1D763           𝝣            \bsansXi                                     MATHEMATICAL SANS-SERIF BOLD CAPITAL XI
-U+1D764           𝝤            \bsansOmicron                                MATHEMATICAL SANS-SERIF BOLD CAPITAL OMICRON
-U+1D765           𝝥            \bsansPi                                     MATHEMATICAL SANS-SERIF BOLD CAPITAL PI
-U+1D766           𝝦            \bsansRho                                    MATHEMATICAL SANS-SERIF BOLD CAPITAL RHO
-U+1D767           𝝧            \bsansvarTheta                               MATHEMATICAL SANS-SERIF BOLD CAPITAL THETA SYMBOL
-U+1D768           𝝨            \bsansSigma                                  MATHEMATICAL SANS-SERIF BOLD CAPITAL SIGMA
-U+1D769           𝝩            \bsansTau                                    MATHEMATICAL SANS-SERIF BOLD CAPITAL TAU
-U+1D76A           𝝪            \bsansUpsilon                                MATHEMATICAL SANS-SERIF BOLD CAPITAL UPSILON
-U+1D76B           𝝫            \bsansPhi                                    MATHEMATICAL SANS-SERIF BOLD CAPITAL PHI
-U+1D76C           𝝬            \bsansChi                                    MATHEMATICAL SANS-SERIF BOLD CAPITAL CHI
-U+1D76D           𝝭            \bsansPsi                                    MATHEMATICAL SANS-SERIF BOLD CAPITAL PSI
-U+1D76E           𝝮            \bsansOmega                                  MATHEMATICAL SANS-SERIF BOLD CAPITAL OMEGA
-U+1D76F           𝝯            \bsansnabla                                  MATHEMATICAL SANS-SERIF BOLD NABLA
-U+1D770           𝝰            \bsansalpha                                  MATHEMATICAL SANS-SERIF BOLD SMALL ALPHA
-U+1D771           𝝱            \bsansbeta                                   MATHEMATICAL SANS-SERIF BOLD SMALL BETA
-U+1D772           𝝲            \bsansgamma                                  MATHEMATICAL SANS-SERIF BOLD SMALL GAMMA
-U+1D773           𝝳            \bsansdelta                                  MATHEMATICAL SANS-SERIF BOLD SMALL DELTA
-U+1D774           𝝴            \bsansepsilon                                MATHEMATICAL SANS-SERIF BOLD SMALL EPSILON
-U+1D775           𝝵            \bsanszeta                                   MATHEMATICAL SANS-SERIF BOLD SMALL ZETA
-U+1D776           𝝶            \bsanseta                                    MATHEMATICAL SANS-SERIF BOLD SMALL ETA
-U+1D777           𝝷            \bsanstheta                                  MATHEMATICAL SANS-SERIF BOLD SMALL THETA
-U+1D778           𝝸            \bsansiota                                   MATHEMATICAL SANS-SERIF BOLD SMALL IOTA
-U+1D779           𝝹            \bsanskappa                                  MATHEMATICAL SANS-SERIF BOLD SMALL KAPPA
-U+1D77A           𝝺            \bsanslambda                                 MATHEMATICAL SANS-SERIF BOLD SMALL LAMDA
-U+1D77B           𝝻            \bsansmu                                     MATHEMATICAL SANS-SERIF BOLD SMALL MU
-U+1D77C           𝝼            \bsansnu                                     MATHEMATICAL SANS-SERIF BOLD SMALL NU
-U+1D77D           𝝽            \bsansxi                                     MATHEMATICAL SANS-SERIF BOLD SMALL XI
-U+1D77E           𝝾            \bsansomicron                                MATHEMATICAL SANS-SERIF BOLD SMALL OMICRON
-U+1D77F           𝝿            \bsanspi                                     MATHEMATICAL SANS-SERIF BOLD SMALL PI
-U+1D780           𝞀            \bsansrho                                    MATHEMATICAL SANS-SERIF BOLD SMALL RHO
-U+1D781           𝞁            \bsansvarsigma                               MATHEMATICAL SANS-SERIF BOLD SMALL FINAL SIGMA
-U+1D782           𝞂            \bsanssigma                                  MATHEMATICAL SANS-SERIF BOLD SMALL SIGMA
-U+1D783           𝞃            \bsanstau                                    MATHEMATICAL SANS-SERIF BOLD SMALL TAU
-U+1D784           𝞄            \bsansupsilon                                MATHEMATICAL SANS-SERIF BOLD SMALL UPSILON
-U+1D785           𝞅            \bsansphi                                    MATHEMATICAL SANS-SERIF BOLD SMALL PHI
-U+1D786           𝞆            \bsanschi                                    MATHEMATICAL SANS-SERIF BOLD SMALL CHI
-U+1D787           𝞇            \bsanspsi                                    MATHEMATICAL SANS-SERIF BOLD SMALL PSI
-U+1D788           𝞈            \bsansomega                                  MATHEMATICAL SANS-SERIF BOLD SMALL OMEGA
-U+1D789           𝞉            \bsanspartial                                MATHEMATICAL SANS-SERIF BOLD PARTIAL DIFFERENTIAL
-U+1D78A           𝞊            \bsansvarepsilon                             MATHEMATICAL SANS-SERIF BOLD EPSILON SYMBOL
-U+1D78B           𝞋            \bsansvartheta                               MATHEMATICAL SANS-SERIF BOLD THETA SYMBOL
-U+1D78C           𝞌            \bsansvarkappa                               MATHEMATICAL SANS-SERIF BOLD KAPPA SYMBOL
-U+1D78D           𝞍            \bsansvarphi                                 MATHEMATICAL SANS-SERIF BOLD PHI SYMBOL
-U+1D78E           𝞎            \bsansvarrho                                 MATHEMATICAL SANS-SERIF BOLD RHO SYMBOL
-U+1D78F           𝞏            \bsansvarpi                                  MATHEMATICAL SANS-SERIF BOLD PI SYMBOL
-U+1D790           𝞐            \bisansAlpha                                 MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ALPHA
-U+1D791           𝞑            \bisansBeta                                  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL BETA
-U+1D792           𝞒            \bisansGamma                                 MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL GAMMA
-U+1D793           𝞓            \bisansDelta                                 MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL DELTA
-U+1D794           𝞔            \bisansEpsilon                               MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL EPSILON
-U+1D795           𝞕            \bisansZeta                                  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ZETA
-U+1D796           𝞖            \bisansEta                                   MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL ETA
-U+1D797           𝞗            \bisansTheta                                 MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA
-U+1D798           𝞘            \bisansIota                                  MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL IOTA
-U+1D799           𝞙            \bisansKappa                                 MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL KAPPA
-U+1D79A           𝞚            \bisansLambda                                MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL LAMDA
-U+1D79B           𝞛            \bisansMu                                    MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL MU
-U+1D79C           𝞜            \bisansNu                                    MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL NU
-U+1D79D           𝞝            \bisansXi                                    MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL XI
-U+1D79E           𝞞            \bisansOmicron                               MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMICRON
-U+1D79F           𝞟            \bisansPi                                    MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PI
-U+1D7A0           𝞠            \bisansRho                                   MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL RHO
-U+1D7A1           𝞡            \bisansvarTheta                              MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL THETA SYMBOL
-U+1D7A2           𝞢            \bisansSigma                                 MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL SIGMA
-U+1D7A3           𝞣            \bisansTau                                   MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL TAU
-U+1D7A4           𝞤            \bisansUpsilon                               MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL UPSILON
-U+1D7A5           𝞥            \bisansPhi                                   MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PHI
-U+1D7A6           𝞦            \bisansChi                                   MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL CHI
-U+1D7A7           𝞧            \bisansPsi                                   MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL PSI
-U+1D7A8           𝞨            \bisansOmega                                 MATHEMATICAL SANS-SERIF BOLD ITALIC CAPITAL OMEGA
-U+1D7A9           𝞩            \bisansnabla                                 MATHEMATICAL SANS-SERIF BOLD ITALIC NABLA
-U+1D7AA           𝞪            \bisansalpha                                 MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ALPHA
-U+1D7AB           𝞫            \bisansbeta                                  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL BETA
-U+1D7AC           𝞬            \bisansgamma                                 MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL GAMMA
-U+1D7AD           𝞭            \bisansdelta                                 MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL DELTA
-U+1D7AE           𝞮            \bisansepsilon                               MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL EPSILON
-U+1D7AF           𝞯            \bisanszeta                                  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ZETA
-U+1D7B0           𝞰            \bisanseta                                   MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL ETA
-U+1D7B1           𝞱            \bisanstheta                                 MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL THETA
-U+1D7B2           𝞲            \bisansiota                                  MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL IOTA
-U+1D7B3           𝞳            \bisanskappa                                 MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL KAPPA
-U+1D7B4           𝞴            \bisanslambda                                MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL LAMDA
-U+1D7B5           𝞵            \bisansmu                                    MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL MU
-U+1D7B6           𝞶            \bisansnu                                    MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL NU
-U+1D7B7           𝞷            \bisansxi                                    MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL XI
-U+1D7B8           𝞸            \bisansomicron                               MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMICRON
-U+1D7B9           𝞹            \bisanspi                                    MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PI
-U+1D7BA           𝞺            \bisansrho                                   MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL RHO
-U+1D7BB           𝞻            \bisansvarsigma                              MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL FINAL SIGMA
-U+1D7BC           𝞼            \bisanssigma                                 MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL SIGMA
-U+1D7BD           𝞽            \bisanstau                                   MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL TAU
-U+1D7BE           𝞾            \bisansupsilon                               MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL UPSILON
-U+1D7BF           𝞿            \bisansphi                                   MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PHI
-U+1D7C0           𝟀            \bisanschi                                   MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL CHI
-U+1D7C1           𝟁            \bisanspsi                                   MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL PSI
-U+1D7C2           𝟂            \bisansomega                                 MATHEMATICAL SANS-SERIF BOLD ITALIC SMALL OMEGA
-U+1D7C3           𝟃            \bisanspartial                               MATHEMATICAL SANS-SERIF BOLD ITALIC PARTIAL DIFFERENTIAL
-U+1D7C4           𝟄            \bisansvarepsilon                            MATHEMATICAL SANS-SERIF BOLD ITALIC EPSILON SYMBOL
-U+1D7C5           𝟅            \bisansvartheta                              MATHEMATICAL SANS-SERIF BOLD ITALIC THETA SYMBOL
-U+1D7C6           𝟆            \bisansvarkappa                              MATHEMATICAL SANS-SERIF BOLD ITALIC KAPPA SYMBOL
-U+1D7C7           𝟇            \bisansvarphi                                MATHEMATICAL SANS-SERIF BOLD ITALIC PHI SYMBOL
-U+1D7C8           𝟈            \bisansvarrho                                MATHEMATICAL SANS-SERIF BOLD ITALIC RHO SYMBOL
-U+1D7C9           𝟉            \bisansvarpi                                 MATHEMATICAL SANS-SERIF BOLD ITALIC PI SYMBOL
-U+1D7CA           𝟊            \bfDigamma                                   MATHEMATICAL BOLD CAPITAL DIGAMMA
-U+1D7CB           𝟋            \bfdigamma                                   MATHEMATICAL BOLD SMALL DIGAMMA
-U+1D7CE           𝟎            \bfzero                                      MATHEMATICAL BOLD DIGIT ZERO
-U+1D7CF           𝟏            \bfone                                       MATHEMATICAL BOLD DIGIT ONE
-U+1D7D0           𝟐            \bftwo                                       MATHEMATICAL BOLD DIGIT TWO
-U+1D7D1           𝟑            \bfthree                                     MATHEMATICAL BOLD DIGIT THREE
-U+1D7D2           𝟒            \bffour                                      MATHEMATICAL BOLD DIGIT FOUR
-U+1D7D3           𝟓            \bffive                                      MATHEMATICAL BOLD DIGIT FIVE
-U+1D7D4           𝟔            \bfsix                                       MATHEMATICAL BOLD DIGIT SIX
-U+1D7D5           𝟕            \bfseven                                     MATHEMATICAL BOLD DIGIT SEVEN
-U+1D7D6           𝟖            \bfeight                                     MATHEMATICAL BOLD DIGIT EIGHT
-U+1D7D7           𝟗            \bfnine                                      MATHEMATICAL BOLD DIGIT NINE
-U+1D7D8           𝟘            \bbzero                                      MATHEMATICAL DOUBLE-STRUCK DIGIT ZERO
-U+1D7D9           𝟙            \bbone                                       MATHEMATICAL DOUBLE-STRUCK DIGIT ONE
-U+1D7DA           𝟚            \bbtwo                                       MATHEMATICAL DOUBLE-STRUCK DIGIT TWO
-U+1D7DB           𝟛            \bbthree                                     MATHEMATICAL DOUBLE-STRUCK DIGIT THREE
-U+1D7DC           𝟜            \bbfour                                      MATHEMATICAL DOUBLE-STRUCK DIGIT FOUR
-U+1D7DD           𝟝            \bbfive                                      MATHEMATICAL DOUBLE-STRUCK DIGIT FIVE
-U+1D7DE           𝟞            \bbsix                                       MATHEMATICAL DOUBLE-STRUCK DIGIT SIX
-U+1D7DF           𝟟            \bbseven                                     MATHEMATICAL DOUBLE-STRUCK DIGIT SEVEN
-U+1D7E0           𝟠            \bbeight                                     MATHEMATICAL DOUBLE-STRUCK DIGIT EIGHT
-U+1D7E1           𝟡            \bbnine                                      MATHEMATICAL DOUBLE-STRUCK DIGIT NINE
-U+1D7E2           𝟢            \sanszero                                    MATHEMATICAL SANS-SERIF DIGIT ZERO
-U+1D7E3           𝟣            \sansone                                     MATHEMATICAL SANS-SERIF DIGIT ONE
-U+1D7E4           𝟤            \sanstwo                                     MATHEMATICAL SANS-SERIF DIGIT TWO
-U+1D7E5           𝟥            \sansthree                                   MATHEMATICAL SANS-SERIF DIGIT THREE
-U+1D7E6           𝟦            \sansfour                                    MATHEMATICAL SANS-SERIF DIGIT FOUR
-U+1D7E7           𝟧            \sansfive                                    MATHEMATICAL SANS-SERIF DIGIT FIVE
-U+1D7E8           𝟨            \sanssix                                     MATHEMATICAL SANS-SERIF DIGIT SIX
-U+1D7E9           𝟩            \sansseven                                   MATHEMATICAL SANS-SERIF DIGIT SEVEN
-U+1D7EA           𝟪            \sanseight                                   MATHEMATICAL SANS-SERIF DIGIT EIGHT
-U+1D7EB           𝟫            \sansnine                                    MATHEMATICAL SANS-SERIF DIGIT NINE
-U+1D7EC           𝟬            \bsanszero                                   MATHEMATICAL SANS-SERIF BOLD DIGIT ZERO
-U+1D7ED           𝟭            \bsansone                                    MATHEMATICAL SANS-SERIF BOLD DIGIT ONE
-U+1D7EE           𝟮            \bsanstwo                                    MATHEMATICAL SANS-SERIF BOLD DIGIT TWO
-U+1D7EF           𝟯            \bsansthree                                  MATHEMATICAL SANS-SERIF BOLD DIGIT THREE
-U+1D7F0           𝟰            \bsansfour                                   MATHEMATICAL SANS-SERIF BOLD DIGIT FOUR
-U+1D7F1           𝟱            \bsansfive                                   MATHEMATICAL SANS-SERIF BOLD DIGIT FIVE
-U+1D7F2           𝟲            \bsanssix                                    MATHEMATICAL SANS-SERIF BOLD DIGIT SIX
-U+1D7F3           𝟳            \bsansseven                                  MATHEMATICAL SANS-SERIF BOLD DIGIT SEVEN
-U+1D7F4           𝟴            \bsanseight                                  MATHEMATICAL SANS-SERIF BOLD DIGIT EIGHT
-U+1D7F5           𝟵            \bsansnine                                   MATHEMATICAL SANS-SERIF BOLD DIGIT NINE
-U+1D7F6           𝟶            \ttzero                                      MATHEMATICAL MONOSPACE DIGIT ZERO
-U+1D7F7           𝟷            \ttone                                       MATHEMATICAL MONOSPACE DIGIT ONE
-U+1D7F8           𝟸            \tttwo                                       MATHEMATICAL MONOSPACE DIGIT TWO
-U+1D7F9           𝟹            \ttthree                                     MATHEMATICAL MONOSPACE DIGIT THREE
-U+1D7FA           𝟺            \ttfour                                      MATHEMATICAL MONOSPACE DIGIT FOUR
-U+1D7FB           𝟻            \ttfive                                      MATHEMATICAL MONOSPACE DIGIT FIVE
-U+1D7FC           𝟼            \ttsix                                       MATHEMATICAL MONOSPACE DIGIT SIX
-U+1D7FD           𝟽            \ttseven                                     MATHEMATICAL MONOSPACE DIGIT SEVEN
-U+1D7FE           𝟾            \tteight                                     MATHEMATICAL MONOSPACE DIGIT EIGHT
-U+1D7FF           𝟿            \ttnine                                      MATHEMATICAL MONOSPACE DIGIT NINE
-U+1F004           🀄            \:mahjong:                                   MAHJONG TILE RED DRAGON
-U+1F0CF           🃏            \:black_joker:                               PLAYING CARD BLACK JOKER
-U+1F170           🅰            \:a:                                         NEGATIVE SQUARED LATIN CAPITAL LETTER A
-U+1F171           🅱            \:b:                                         NEGATIVE SQUARED LATIN CAPITAL LETTER B
-U+1F17E           🅾            \:o2:                                        NEGATIVE SQUARED LATIN CAPITAL LETTER O
-U+1F17F           🅿            \:parking:                                   NEGATIVE SQUARED LATIN CAPITAL LETTER P
-U+1F18E           🆎            \:ab:                                        NEGATIVE SQUARED AB
-U+1F191           🆑            \:cl:                                        SQUARED CL
-U+1F192           🆒            \:cool:                                      SQUARED COOL
-U+1F193           🆓            \:free:                                      SQUARED FREE
-U+1F194           🆔            \:id:                                        SQUARED ID
-U+1F195           🆕            \:new:                                       SQUARED NEW
-U+1F196           🆖            \:ng:                                        SQUARED NG
-U+1F197           🆗            \:ok:                                        SQUARED OK
-U+1F198           🆘            \:sos:                                       SQUARED SOS
-U+1F199           🆙            \:up:                                        SQUARED UP WITH EXCLAMATION MARK
-U+1F19A           🆚            \:vs:                                        SQUARED VS
-U+1F201           🈁            \:koko:                                      SQUARED KATAKANA KOKO
-U+1F202           🈂            \:sa:                                        SQUARED KATAKANA SA
-U+1F21A           🈚            \:u7121:                                     SQUARED CJK UNIFIED IDEOGRAPH-7121
-U+1F22F           🈯            \:u6307:                                     SQUARED CJK UNIFIED IDEOGRAPH-6307
-U+1F232           🈲            \:u7981:                                     SQUARED CJK UNIFIED IDEOGRAPH-7981
-U+1F233           🈳            \:u7a7a:                                     SQUARED CJK UNIFIED IDEOGRAPH-7A7A
-U+1F234           🈴            \:u5408:                                     SQUARED CJK UNIFIED IDEOGRAPH-5408
-U+1F235           🈵            \:u6e80:                                     SQUARED CJK UNIFIED IDEOGRAPH-6E80
-U+1F236           🈶            \:u6709:                                     SQUARED CJK UNIFIED IDEOGRAPH-6709
-U+1F237           🈷            \:u6708:                                     SQUARED CJK UNIFIED IDEOGRAPH-6708
-U+1F238           🈸            \:u7533:                                     SQUARED CJK UNIFIED IDEOGRAPH-7533
-U+1F239           🈹            \:u5272:                                     SQUARED CJK UNIFIED IDEOGRAPH-5272
-U+1F23A           🈺            \:u55b6:                                     SQUARED CJK UNIFIED IDEOGRAPH-55B6
-U+1F250           🉐            \:ideograph_advantage:                       CIRCLED IDEOGRAPH ADVANTAGE
-U+1F251           🉑            \:accept:                                    CIRCLED IDEOGRAPH ACCEPT
-U+1F300           🌀            \:cyclone:                                   CYCLONE
-U+1F301           🌁            \:foggy:                                     FOGGY
-U+1F302           🌂            \:closed_umbrella:                           CLOSED UMBRELLA
-U+1F303           🌃            \:night_with_stars:                          NIGHT WITH STARS
-U+1F304           🌄            \:sunrise_over_mountains:                    SUNRISE OVER MOUNTAINS
-U+1F305           🌅            \:sunrise:                                   SUNRISE
-U+1F306           🌆            \:city_sunset:                               CITYSCAPE AT DUSK
-U+1F307           🌇            \:city_sunrise:                              SUNSET OVER BUILDINGS
-U+1F308           🌈            \:rainbow:                                   RAINBOW
-U+1F309           🌉            \:bridge_at_night:                           BRIDGE AT NIGHT
-U+1F30A           🌊            \:ocean:                                     WATER WAVE
-U+1F30B           🌋            \:volcano:                                   VOLCANO
-U+1F30C           🌌            \:milky_way:                                 MILKY WAY
-U+1F30D           🌍            \:earth_africa:                              EARTH GLOBE EUROPE-AFRICA
-U+1F30E           🌎            \:earth_americas:                            EARTH GLOBE AMERICAS
-U+1F30F           🌏            \:earth_asia:                                EARTH GLOBE ASIA-AUSTRALIA
-U+1F310           🌐            \:globe_with_meridians:                      GLOBE WITH MERIDIANS
-U+1F311           🌑            \:new_moon:                                  NEW MOON SYMBOL
-U+1F312           🌒            \:waxing_crescent_moon:                      WAXING CRESCENT MOON SYMBOL
-U+1F313           🌓            \:first_quarter_moon:                        FIRST QUARTER MOON SYMBOL
-U+1F314           🌔            \:moon:                                      WAXING GIBBOUS MOON SYMBOL
-U+1F315           🌕            \:full_moon:                                 FULL MOON SYMBOL
-U+1F316           🌖            \:waning_gibbous_moon:                       WANING GIBBOUS MOON SYMBOL
-U+1F317           🌗            \:last_quarter_moon:                         LAST QUARTER MOON SYMBOL
-U+1F318           🌘            \:waning_crescent_moon:                      WANING CRESCENT MOON SYMBOL
-U+1F319           🌙            \:crescent_moon:                             CRESCENT MOON
-U+1F31A           🌚            \:new_moon_with_face:                        NEW MOON WITH FACE
-U+1F31B           🌛            \:first_quarter_moon_with_face:              FIRST QUARTER MOON WITH FACE
-U+1F31C           🌜            \:last_quarter_moon_with_face:               LAST QUARTER MOON WITH FACE
-U+1F31D           🌝            \:full_moon_with_face:                       FULL MOON WITH FACE
-U+1F31E           🌞            \:sun_with_face:                             SUN WITH FACE
-U+1F31F           🌟            \:star2:                                     GLOWING STAR
-U+1F320           🌠            \:stars:                                     SHOOTING STAR
-U+1F330           🌰            \:chestnut:                                  CHESTNUT
-U+1F331           🌱            \:seedling:                                  SEEDLING
-U+1F332           🌲            \:evergreen_tree:                            EVERGREEN TREE
-U+1F333           🌳            \:deciduous_tree:                            DECIDUOUS TREE
-U+1F334           🌴            \:palm_tree:                                 PALM TREE
-U+1F335           🌵            \:cactus:                                    CACTUS
-U+1F337           🌷            \:tulip:                                     TULIP
-U+1F338           🌸            \:cherry_blossom:                            CHERRY BLOSSOM
-U+1F339           🌹            \:rose:                                      ROSE
-U+1F33A           🌺            \:hibiscus:                                  HIBISCUS
-U+1F33B           🌻            \:sunflower:                                 SUNFLOWER
-U+1F33C           🌼            \:blossom:                                   BLOSSOM
-U+1F33D           🌽            \:corn:                                      EAR OF MAIZE
-U+1F33E           🌾            \:ear_of_rice:                               EAR OF RICE
-U+1F33F           🌿            \:herb:                                      HERB
-U+1F340           🍀            \:four_leaf_clover:                          FOUR LEAF CLOVER
-U+1F341           🍁            \:maple_leaf:                                MAPLE LEAF
-U+1F342           🍂            \:fallen_leaf:                               FALLEN LEAF
-U+1F343           🍃            \:leaves:                                    LEAF FLUTTERING IN WIND
-U+1F344           🍄            \:mushroom:                                  MUSHROOM
-U+1F345           🍅            \:tomato:                                    TOMATO
-U+1F346           🍆            \:eggplant:                                  AUBERGINE
-U+1F347           🍇            \:grapes:                                    GRAPES
-U+1F348           🍈            \:melon:                                     MELON
-U+1F349           🍉            \:watermelon:                                WATERMELON
-U+1F34A           🍊            \:tangerine:                                 TANGERINE
-U+1F34B           🍋            \:lemon:                                     LEMON
-U+1F34C           🍌            \:banana:                                    BANANA
-U+1F34D           🍍            \:pineapple:                                 PINEAPPLE
-U+1F34E           🍎            \:apple:                                     RED APPLE
-U+1F34F           🍏            \:green_apple:                               GREEN APPLE
-U+1F350           🍐            \:pear:                                      PEAR
-U+1F351           🍑            \:peach:                                     PEACH
-U+1F352           🍒            \:cherries:                                  CHERRIES
-U+1F353           🍓            \:strawberry:                                STRAWBERRY
-U+1F354           🍔            \:hamburger:                                 HAMBURGER
-U+1F355           🍕            \:pizza:                                     SLICE OF PIZZA
-U+1F356           🍖            \:meat_on_bone:                              MEAT ON BONE
-U+1F357           🍗            \:poultry_leg:                               POULTRY LEG
-U+1F358           🍘            \:rice_cracker:                              RICE CRACKER
-U+1F359           🍙            \:rice_ball:                                 RICE BALL
-U+1F35A           🍚            \:rice:                                      COOKED RICE
-U+1F35B           🍛            \:curry:                                     CURRY AND RICE
-U+1F35C           🍜            \:ramen:                                     STEAMING BOWL
-U+1F35D           🍝            \:spaghetti:                                 SPAGHETTI
-U+1F35E           🍞            \:bread:                                     BREAD
-U+1F35F           🍟            \:fries:                                     FRENCH FRIES
-U+1F360           🍠            \:sweet_potato:                              ROASTED SWEET POTATO
-U+1F361           🍡            \:dango:                                     DANGO
-U+1F362           🍢            \:oden:                                      ODEN
-U+1F363           🍣            \:sushi:                                     SUSHI
-U+1F364           🍤            \:fried_shrimp:                              FRIED SHRIMP
-U+1F365           🍥            \:fish_cake:                                 FISH CAKE WITH SWIRL DESIGN
-U+1F366           🍦            \:icecream:                                  SOFT ICE CREAM
-U+1F367           🍧            \:shaved_ice:                                SHAVED ICE
-U+1F368           🍨            \:ice_cream:                                 ICE CREAM
-U+1F369           🍩            \:doughnut:                                  DOUGHNUT
-U+1F36A           🍪            \:cookie:                                    COOKIE
-U+1F36B           🍫            \:chocolate_bar:                             CHOCOLATE BAR
-U+1F36C           🍬            \:candy:                                     CANDY
-U+1F36D           🍭            \:lollipop:                                  LOLLIPOP
-U+1F36E           🍮            \:custard:                                   CUSTARD
-U+1F36F           🍯            \:honey_pot:                                 HONEY POT
-U+1F370           🍰            \:cake:                                      SHORTCAKE
-U+1F371           🍱            \:bento:                                     BENTO BOX
-U+1F372           🍲            \:stew:                                      POT OF FOOD
-U+1F373           🍳            \:egg:                                       COOKING
-U+1F374           🍴            \:fork_and_knife:                            FORK AND KNIFE
-U+1F375           🍵            \:tea:                                       TEACUP WITHOUT HANDLE
-U+1F376           🍶            \:sake:                                      SAKE BOTTLE AND CUP
-U+1F377           🍷            \:wine_glass:                                WINE GLASS
-U+1F378           🍸            \:cocktail:                                  COCKTAIL GLASS
-U+1F379           🍹            \:tropical_drink:                            TROPICAL DRINK
-U+1F37A           🍺            \:beer:                                      BEER MUG
-U+1F37B           🍻            \:beers:                                     CLINKING BEER MUGS
-U+1F37C           🍼            \:baby_bottle:                               BABY BOTTLE
-U+1F380           🎀            \:ribbon:                                    RIBBON
-U+1F381           🎁            \:gift:                                      WRAPPED PRESENT
-U+1F382           🎂            \:birthday:                                  BIRTHDAY CAKE
-U+1F383           🎃            \:jack_o_lantern:                            JACK-O-LANTERN
-U+1F384           🎄            \:christmas_tree:                            CHRISTMAS TREE
-U+1F385           🎅            \:santa:                                     FATHER CHRISTMAS
-U+1F386           🎆            \:fireworks:                                 FIREWORKS
-U+1F387           🎇            \:sparkler:                                  FIREWORK SPARKLER
-U+1F388           🎈            \:balloon:                                   BALLOON
-U+1F389           🎉            \:tada:                                      PARTY POPPER
-U+1F38A           🎊            \:confetti_ball:                             CONFETTI BALL
-U+1F38B           🎋            \:tanabata_tree:                             TANABATA TREE
-U+1F38C           🎌            \:crossed_flags:                             CROSSED FLAGS
-U+1F38D           🎍            \:bamboo:                                    PINE DECORATION
-U+1F38E           🎎            \:dolls:                                     JAPANESE DOLLS
-U+1F38F           🎏            \:flags:                                     CARP STREAMER
-U+1F390           🎐            \:wind_chime:                                WIND CHIME
-U+1F391           🎑            \:rice_scene:                                MOON VIEWING CEREMONY
-U+1F392           🎒            \:school_satchel:                            SCHOOL SATCHEL
-U+1F393           🎓            \:mortar_board:                              GRADUATION CAP
-U+1F3A0           🎠            \:carousel_horse:                            CAROUSEL HORSE
-U+1F3A1           🎡            \:ferris_wheel:                              FERRIS WHEEL
-U+1F3A2           🎢            \:roller_coaster:                            ROLLER COASTER
-U+1F3A3           🎣            \:fishing_pole_and_fish:                     FISHING POLE AND FISH
-U+1F3A4           🎤            \:microphone:                                MICROPHONE
-U+1F3A5           🎥            \:movie_camera:                              MOVIE CAMERA
-U+1F3A6           🎦            \:cinema:                                    CINEMA
-U+1F3A7           🎧            \:headphones:                                HEADPHONE
-U+1F3A8           🎨            \:art:                                       ARTIST PALETTE
-U+1F3A9           🎩            \:tophat:                                    TOP HAT
-U+1F3AA           🎪            \:circus_tent:                               CIRCUS TENT
-U+1F3AB           🎫            \:ticket:                                    TICKET
-U+1F3AC           🎬            \:clapper:                                   CLAPPER BOARD
-U+1F3AD           🎭            \:performing_arts:                           PERFORMING ARTS
-U+1F3AE           🎮            \:video_game:                                VIDEO GAME
-U+1F3AF           🎯            \:dart:                                      DIRECT HIT
-U+1F3B0           🎰            \:slot_machine:                              SLOT MACHINE
-U+1F3B1           🎱            \:8ball:                                     BILLIARDS
-U+1F3B2           🎲            \:game_die:                                  GAME DIE
-U+1F3B3           🎳            \:bowling:                                   BOWLING
-U+1F3B4           🎴            \:flower_playing_cards:                      FLOWER PLAYING CARDS
-U+1F3B5           🎵            \:musical_note:                              MUSICAL NOTE
-U+1F3B6           🎶            \:notes:                                     MULTIPLE MUSICAL NOTES
-U+1F3B7           🎷            \:saxophone:                                 SAXOPHONE
-U+1F3B8           🎸            \:guitar:                                    GUITAR
-U+1F3B9           🎹            \:musical_keyboard:                          MUSICAL KEYBOARD
-U+1F3BA           🎺            \:trumpet:                                   TRUMPET
-U+1F3BB           🎻            \:violin:                                    VIOLIN
-U+1F3BC           🎼            \:musical_score:                             MUSICAL SCORE
-U+1F3BD           🎽            \:running_shirt_with_sash:                   RUNNING SHIRT WITH SASH
-U+1F3BE           🎾            \:tennis:                                    TENNIS RACQUET AND BALL
-U+1F3BF           🎿            \:ski:                                       SKI AND SKI BOOT
-U+1F3C0           🏀            \:basketball:                                BASKETBALL AND HOOP
-U+1F3C1           🏁            \:checkered_flag:                            CHEQUERED FLAG
-U+1F3C2           🏂            \:snowboarder:                               SNOWBOARDER
-U+1F3C3           🏃            \:runner:                                    RUNNER
-U+1F3C4           🏄            \:surfer:                                    SURFER
-U+1F3C6           🏆            \:trophy:                                    TROPHY
-U+1F3C7           🏇            \:horse_racing:                              HORSE RACING
-U+1F3C8           🏈            \:football:                                  AMERICAN FOOTBALL
-U+1F3C9           🏉            \:rugby_football:                            RUGBY FOOTBALL
-U+1F3CA           🏊            \:swimmer:                                   SWIMMER
-U+1F3E0           🏠            \:house:                                     HOUSE BUILDING
-U+1F3E1           🏡            \:house_with_garden:                         HOUSE WITH GARDEN
-U+1F3E2           🏢            \:office:                                    OFFICE BUILDING
-U+1F3E3           🏣            \:post_office:                               JAPANESE POST OFFICE
-U+1F3E4           🏤            \:european_post_office:                      EUROPEAN POST OFFICE
-U+1F3E5           🏥            \:hospital:                                  HOSPITAL
-U+1F3E6           🏦            \:bank:                                      BANK
-U+1F3E7           🏧            \:atm:                                       AUTOMATED TELLER MACHINE
-U+1F3E8           🏨            \:hotel:                                     HOTEL
-U+1F3E9           🏩            \:love_hotel:                                LOVE HOTEL
-U+1F3EA           🏪            \:convenience_store:                         CONVENIENCE STORE
-U+1F3EB           🏫            \:school:                                    SCHOOL
-U+1F3EC           🏬            \:department_store:                          DEPARTMENT STORE
-U+1F3ED           🏭            \:factory:                                   FACTORY
-U+1F3EE           🏮            \:izakaya_lantern:                           IZAKAYA LANTERN
-U+1F3EF           🏯            \:japanese_castle:                           JAPANESE CASTLE
-U+1F3F0           🏰            \:european_castle:                           EUROPEAN CASTLE
-U+1F3FB           🏻            \:skin-tone-2:                               EMOJI MODIFIER FITZPATRICK TYPE-1-2
-U+1F3FC           🏼            \:skin-tone-3:                               EMOJI MODIFIER FITZPATRICK TYPE-3
-U+1F3FD           🏽            \:skin-tone-4:                               EMOJI MODIFIER FITZPATRICK TYPE-4
-U+1F3FE           🏾            \:skin-tone-5:                               EMOJI MODIFIER FITZPATRICK TYPE-5
-U+1F3FF           🏿            \:skin-tone-6:                               EMOJI MODIFIER FITZPATRICK TYPE-6
-U+1F400           🐀            \:rat:                                       RAT
-U+1F401           🐁            \:mouse2:                                    MOUSE
-U+1F402           🐂            \:ox:                                        OX
-U+1F403           🐃            \:water_buffalo:                             WATER BUFFALO
-U+1F404           🐄            \:cow2:                                      COW
-U+1F405           🐅            \:tiger2:                                    TIGER
-U+1F406           🐆            \:leopard:                                   LEOPARD
-U+1F407           🐇            \:rabbit2:                                   RABBIT
-U+1F408           🐈            \:cat2:                                      CAT
-U+1F409           🐉            \:dragon:                                    DRAGON
-U+1F40A           🐊            \:crocodile:                                 CROCODILE
-U+1F40B           🐋            \:whale2:                                    WHALE
-U+1F40C           🐌            \:snail:                                     SNAIL
-U+1F40D           🐍            \:snake:                                     SNAKE
-U+1F40E           🐎            \:racehorse:                                 HORSE
-U+1F40F           🐏            \:ram:                                       RAM
-U+1F410           🐐            \:goat:                                      GOAT
-U+1F411           🐑            \:sheep:                                     SHEEP
-U+1F412           🐒            \:monkey:                                    MONKEY
-U+1F413           🐓            \:rooster:                                   ROOSTER
-U+1F414           🐔            \:chicken:                                   CHICKEN
-U+1F415           🐕            \:dog2:                                      DOG
-U+1F416           🐖            \:pig2:                                      PIG
-U+1F417           🐗            \:boar:                                      BOAR
-U+1F418           🐘            \:elephant:                                  ELEPHANT
-U+1F419           🐙            \:octopus:                                   OCTOPUS
-U+1F41A           🐚            \:shell:                                     SPIRAL SHELL
-U+1F41B           🐛            \:bug:                                       BUG
-U+1F41C           🐜            \:ant:                                       ANT
-U+1F41D           🐝            \:bee:                                       HONEYBEE
-U+1F41E           🐞            \:beetle:                                    LADY BEETLE
-U+1F41F           🐟            \:fish:                                      FISH
-U+1F420           🐠            \:tropical_fish:                             TROPICAL FISH
-U+1F421           🐡            \:blowfish:                                  BLOWFISH
-U+1F422           🐢            \:turtle:                                    TURTLE
-U+1F423           🐣            \:hatching_chick:                            HATCHING CHICK
-U+1F424           🐤            \:baby_chick:                                BABY CHICK
-U+1F425           🐥            \:hatched_chick:                             FRONT-FACING BABY CHICK
-U+1F426           🐦            \:bird:                                      BIRD
-U+1F427           🐧            \:penguin:                                   PENGUIN
-U+1F428           🐨            \:koala:                                     KOALA
-U+1F429           🐩            \:poodle:                                    POODLE
-U+1F42A           🐪            \:dromedary_camel:                           DROMEDARY CAMEL
-U+1F42B           🐫            \:camel:                                     BACTRIAN CAMEL
-U+1F42C           🐬            \:dolphin:                                   DOLPHIN
-U+1F42D           🐭            \:mouse:                                     MOUSE FACE
-U+1F42E           🐮            \:cow:                                       COW FACE
-U+1F42F           🐯            \:tiger:                                     TIGER FACE
-U+1F430           🐰            \:rabbit:                                    RABBIT FACE
-U+1F431           🐱            \:cat:                                       CAT FACE
-U+1F432           🐲            \:dragon_face:                               DRAGON FACE
-U+1F433           🐳            \:whale:                                     SPOUTING WHALE
-U+1F434           🐴            \:horse:                                     HORSE FACE
-U+1F435           🐵            \:monkey_face:                               MONKEY FACE
-U+1F436           🐶            \:dog:                                       DOG FACE
-U+1F437           🐷            \:pig:                                       PIG FACE
-U+1F438           🐸            \:frog:                                      FROG FACE
-U+1F439           🐹            \:hamster:                                   HAMSTER FACE
-U+1F43A           🐺            \:wolf:                                      WOLF FACE
-U+1F43B           🐻            \:bear:                                      BEAR FACE
-U+1F43C           🐼            \:panda_face:                                PANDA FACE
-U+1F43D           🐽            \:pig_nose:                                  PIG NOSE
-U+1F43E           🐾            \:feet:                                      PAW PRINTS
-U+1F440           👀            \:eyes:                                      EYES
-U+1F442           👂            \:ear:                                       EAR
-U+1F443           👃            \:nose:                                      NOSE
-U+1F444           👄            \:lips:                                      MOUTH
-U+1F445           👅            \:tongue:                                    TONGUE
-U+1F446           👆            \:point_up_2:                                WHITE UP POINTING BACKHAND INDEX
-U+1F447           👇            \:point_down:                                WHITE DOWN POINTING BACKHAND INDEX
-U+1F448           👈            \:point_left:                                WHITE LEFT POINTING BACKHAND INDEX
-U+1F449           👉            \:point_right:                               WHITE RIGHT POINTING BACKHAND INDEX
-U+1F44A           👊            \:facepunch:                                 FISTED HAND SIGN
-U+1F44B           👋            \:wave:                                      WAVING HAND SIGN
-U+1F44C           👌            \:ok_hand:                                   OK HAND SIGN
-U+1F44D           👍            \:+1:                                        THUMBS UP SIGN
-U+1F44E           👎            \:-1:                                        THUMBS DOWN SIGN
-U+1F44F           👏            \:clap:                                      CLAPPING HANDS SIGN
-U+1F450           👐            \:open_hands:                                OPEN HANDS SIGN
-U+1F451           👑            \:crown:                                     CROWN
-U+1F452           👒            \:womans_hat:                                WOMANS HAT
-U+1F453           👓            \:eyeglasses:                                EYEGLASSES
-U+1F454           👔            \:necktie:                                   NECKTIE
-U+1F455           👕            \:shirt:                                     T-SHIRT
-U+1F456           👖            \:jeans:                                     JEANS
-U+1F457           👗            \:dress:                                     DRESS
-U+1F458           👘            \:kimono:                                    KIMONO
-U+1F459           👙            \:bikini:                                    BIKINI
-U+1F45A           👚            \:womans_clothes:                            WOMANS CLOTHES
-U+1F45B           👛            \:purse:                                     PURSE
-U+1F45C           👜            \:handbag:                                   HANDBAG
-U+1F45D           👝            \:pouch:                                     POUCH
-U+1F45E           👞            \:mans_shoe:                                 MANS SHOE
-U+1F45F           👟            \:athletic_shoe:                             ATHLETIC SHOE
-U+1F460           👠            \:high_heel:                                 HIGH-HEELED SHOE
-U+1F461           👡            \:sandal:                                    WOMANS SANDAL
-U+1F462           👢            \:boot:                                      WOMANS BOOTS
-U+1F463           👣            \:footprints:                                FOOTPRINTS
-U+1F464           👤            \:bust_in_silhouette:                        BUST IN SILHOUETTE
-U+1F465           👥            \:busts_in_silhouette:                       BUSTS IN SILHOUETTE
-U+1F466           👦            \:boy:                                       BOY
-U+1F467           👧            \:girl:                                      GIRL
-U+1F468           👨            \:man:                                       MAN
-U+1F469           👩            \:woman:                                     WOMAN
-U+1F46A           👪            \:family:                                    FAMILY
-U+1F46B           👫            \:couple:                                    MAN AND WOMAN HOLDING HANDS
-U+1F46C           👬            \:two_men_holding_hands:                     TWO MEN HOLDING HANDS
-U+1F46D           👭            \:two_women_holding_hands:                   TWO WOMEN HOLDING HANDS
-U+1F46E           👮            \:cop:                                       POLICE OFFICER
-U+1F46F           👯            \:dancers:                                   WOMAN WITH BUNNY EARS
-U+1F470           👰            \:bride_with_veil:                           BRIDE WITH VEIL
-U+1F471           👱            \:person_with_blond_hair:                    PERSON WITH BLOND HAIR
-U+1F472           👲            \:man_with_gua_pi_mao:                       MAN WITH GUA PI MAO
-U+1F473           👳            \:man_with_turban:                           MAN WITH TURBAN
-U+1F474           👴            \:older_man:                                 OLDER MAN
-U+1F475           👵            \:older_woman:                               OLDER WOMAN
-U+1F476           👶            \:baby:                                      BABY
-U+1F477           👷            \:construction_worker:                       CONSTRUCTION WORKER
-U+1F478           👸            \:princess:                                  PRINCESS
-U+1F479           👹            \:japanese_ogre:                             JAPANESE OGRE
-U+1F47A           👺            \:japanese_goblin:                           JAPANESE GOBLIN
-U+1F47B           👻            \:ghost:                                     GHOST
-U+1F47C           👼            \:angel:                                     BABY ANGEL
-U+1F47D           👽            \:alien:                                     EXTRATERRESTRIAL ALIEN
-U+1F47E           👾            \:space_invader:                             ALIEN MONSTER
-U+1F47F           👿            \:imp:                                       IMP
-U+1F480           💀            \:skull:                                     SKULL
-U+1F481           💁            \:information_desk_person:                   INFORMATION DESK PERSON
-U+1F482           💂            \:guardsman:                                 GUARDSMAN
-U+1F483           💃            \:dancer:                                    DANCER
-U+1F484           💄            \:lipstick:                                  LIPSTICK
-U+1F485           💅            \:nail_care:                                 NAIL POLISH
-U+1F486           💆            \:massage:                                   FACE MASSAGE
-U+1F487           💇            \:haircut:                                   HAIRCUT
-U+1F488           💈            \:barber:                                    BARBER POLE
-U+1F489           💉            \:syringe:                                   SYRINGE
-U+1F48A           💊            \:pill:                                      PILL
-U+1F48B           💋            \:kiss:                                      KISS MARK
-U+1F48C           💌            \:love_letter:                               LOVE LETTER
-U+1F48D           💍            \:ring:                                      RING
-U+1F48E           💎            \:gem:                                       GEM STONE
-U+1F48F           💏            \:couplekiss:                                KISS
-U+1F490           💐            \:bouquet:                                   BOUQUET
-U+1F491           💑            \:couple_with_heart:                         COUPLE WITH HEART
-U+1F492           💒            \:wedding:                                   WEDDING
-U+1F493           💓            \:heartbeat:                                 BEATING HEART
-U+1F494           💔            \:broken_heart:                              BROKEN HEART
-U+1F495           💕            \:two_hearts:                                TWO HEARTS
-U+1F496           💖            \:sparkling_heart:                           SPARKLING HEART
-U+1F497           💗            \:heartpulse:                                GROWING HEART
-U+1F498           💘            \:cupid:                                     HEART WITH ARROW
-U+1F499           💙            \:blue_heart:                                BLUE HEART
-U+1F49A           💚            \:green_heart:                               GREEN HEART
-U+1F49B           💛            \:yellow_heart:                              YELLOW HEART
-U+1F49C           💜            \:purple_heart:                              PURPLE HEART
-U+1F49D           💝            \:gift_heart:                                HEART WITH RIBBON
-U+1F49E           💞            \:revolving_hearts:                          REVOLVING HEARTS
-U+1F49F           💟            \:heart_decoration:                          HEART DECORATION
-U+1F4A0           💠            \:diamond_shape_with_a_dot_inside:           DIAMOND SHAPE WITH A DOT INSIDE
-U+1F4A1           💡            \:bulb:                                      ELECTRIC LIGHT BULB
-U+1F4A2           💢            \:anger:                                     ANGER SYMBOL
-U+1F4A3           💣            \:bomb:                                      BOMB
-U+1F4A4           💤            \:zzz:                                       SLEEPING SYMBOL
-U+1F4A5           💥            \:boom:                                      COLLISION SYMBOL
-U+1F4A6           💦            \:sweat_drops:                               SPLASHING SWEAT SYMBOL
-U+1F4A7           💧            \:droplet:                                   DROPLET
-U+1F4A8           💨            \:dash:                                      DASH SYMBOL
-U+1F4A9           💩            \:hankey:                                    PILE OF POO
-U+1F4AA           💪            \:muscle:                                    FLEXED BICEPS
-U+1F4AB           💫            \:dizzy:                                     DIZZY SYMBOL
-U+1F4AC           💬            \:speech_balloon:                            SPEECH BALLOON
-U+1F4AD           💭            \:thought_balloon:                           THOUGHT BALLOON
-U+1F4AE           💮            \:white_flower:                              WHITE FLOWER
-U+1F4AF           💯            \:100:                                       HUNDRED POINTS SYMBOL
-U+1F4B0           💰            \:moneybag:                                  MONEY BAG
-U+1F4B1           💱            \:currency_exchange:                         CURRENCY EXCHANGE
-U+1F4B2           💲            \:heavy_dollar_sign:                         HEAVY DOLLAR SIGN
-U+1F4B3           💳            \:credit_card:                               CREDIT CARD
-U+1F4B4           💴            \:yen:                                       BANKNOTE WITH YEN SIGN
-U+1F4B5           💵            \:dollar:                                    BANKNOTE WITH DOLLAR SIGN
-U+1F4B6           💶            \:euro:                                      BANKNOTE WITH EURO SIGN
-U+1F4B7           💷            \:pound:                                     BANKNOTE WITH POUND SIGN
-U+1F4B8           💸            \:money_with_wings:                          MONEY WITH WINGS
-U+1F4B9           💹            \:chart:                                     CHART WITH UPWARDS TREND AND YEN SIGN
-U+1F4BA           💺            \:seat:                                      SEAT
-U+1F4BB           💻            \:computer:                                  PERSONAL COMPUTER
-U+1F4BC           💼            \:briefcase:                                 BRIEFCASE
-U+1F4BD           💽            \:minidisc:                                  MINIDISC
-U+1F4BE           💾            \:floppy_disk:                               FLOPPY DISK
-U+1F4BF           💿            \:cd:                                        OPTICAL DISC
-U+1F4C0           📀            \:dvd:                                       DVD
-U+1F4C1           📁            \:file_folder:                               FILE FOLDER
-U+1F4C2           📂            \:open_file_folder:                          OPEN FILE FOLDER
-U+1F4C3           📃            \:page_with_curl:                            PAGE WITH CURL
-U+1F4C4           📄            \:page_facing_up:                            PAGE FACING UP
-U+1F4C5           📅            \:date:                                      CALENDAR
-U+1F4C6           📆            \:calendar:                                  TEAR-OFF CALENDAR
-U+1F4C7           📇            \:card_index:                                CARD INDEX
-U+1F4C8           📈            \:chart_with_upwards_trend:                  CHART WITH UPWARDS TREND
-U+1F4C9           📉            \:chart_with_downwards_trend:                CHART WITH DOWNWARDS TREND
-U+1F4CA           📊            \:bar_chart:                                 BAR CHART
-U+1F4CB           📋            \:clipboard:                                 CLIPBOARD
-U+1F4CC           📌            \:pushpin:                                   PUSHPIN
-U+1F4CD           📍            \:round_pushpin:                             ROUND PUSHPIN
-U+1F4CE           📎            \:paperclip:                                 PAPERCLIP
-U+1F4CF           📏            \:straight_ruler:                            STRAIGHT RULER
-U+1F4D0           📐            \:triangular_ruler:                          TRIANGULAR RULER
-U+1F4D1           📑            \:bookmark_tabs:                             BOOKMARK TABS
-U+1F4D2           📒            \:ledger:                                    LEDGER
-U+1F4D3           📓            \:notebook:                                  NOTEBOOK
-U+1F4D4           📔            \:notebook_with_decorative_cover:            NOTEBOOK WITH DECORATIVE COVER
-U+1F4D5           📕            \:closed_book:                               CLOSED BOOK
-U+1F4D6           📖            \:book:                                      OPEN BOOK
-U+1F4D7           📗            \:green_book:                                GREEN BOOK
-U+1F4D8           📘            \:blue_book:                                 BLUE BOOK
-U+1F4D9           📙            \:orange_book:                               ORANGE BOOK
-U+1F4DA           📚            \:books:                                     BOOKS
-U+1F4DB           📛            \:name_badge:                                NAME BADGE
-U+1F4DC           📜            \:scroll:                                    SCROLL
-U+1F4DD           📝            \:memo:                                      MEMO
-U+1F4DE           📞            \:telephone_receiver:                        TELEPHONE RECEIVER
-U+1F4DF           📟            \:pager:                                     PAGER
-U+1F4E0           📠            \:fax:                                       FAX MACHINE
-U+1F4E1           📡            \:satellite:                                 SATELLITE ANTENNA
-U+1F4E2           📢            \:loudspeaker:                               PUBLIC ADDRESS LOUDSPEAKER
-U+1F4E3           📣            \:mega:                                      CHEERING MEGAPHONE
-U+1F4E4           📤            \:outbox_tray:                               OUTBOX TRAY
-U+1F4E5           📥            \:inbox_tray:                                INBOX TRAY
-U+1F4E6           📦            \:package:                                   PACKAGE
-U+1F4E7           📧            \:e-mail:                                    E-MAIL SYMBOL
-U+1F4E8           📨            \:incoming_envelope:                         INCOMING ENVELOPE
-U+1F4E9           📩            \:envelope_with_arrow:                       ENVELOPE WITH DOWNWARDS ARROW ABOVE
-U+1F4EA           📪            \:mailbox_closed:                            CLOSED MAILBOX WITH LOWERED FLAG
-U+1F4EB           📫            \:mailbox:                                   CLOSED MAILBOX WITH RAISED FLAG
-U+1F4EC           📬            \:mailbox_with_mail:                         OPEN MAILBOX WITH RAISED FLAG
-U+1F4ED           📭            \:mailbox_with_no_mail:                      OPEN MAILBOX WITH LOWERED FLAG
-U+1F4EE           📮            \:postbox:                                   POSTBOX
-U+1F4EF           📯            \:postal_horn:                               POSTAL HORN
-U+1F4F0           📰            \:newspaper:                                 NEWSPAPER
-U+1F4F1           📱            \:iphone:                                    MOBILE PHONE
-U+1F4F2           📲            \:calling:                                   MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT
-U+1F4F3           📳            \:vibration_mode:                            VIBRATION MODE
-U+1F4F4           📴            \:mobile_phone_off:                          MOBILE PHONE OFF
-U+1F4F5           📵            \:no_mobile_phones:                          NO MOBILE PHONES
-U+1F4F6           📶            \:signal_strength:                           ANTENNA WITH BARS
-U+1F4F7           📷            \:camera:                                    CAMERA
-U+1F4F9           📹            \:video_camera:                              VIDEO CAMERA
-U+1F4FA           📺            \:tv:                                        TELEVISION
-U+1F4FB           📻            \:radio:                                     RADIO
-U+1F4FC           📼            \:vhs:                                       VIDEOCASSETTE
-U+1F500           🔀            \:twisted_rightwards_arrows:                 TWISTED RIGHTWARDS ARROWS
-U+1F501           🔁            \:repeat:                                    CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS
-U+1F502           🔂            \:repeat_one:                                CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS WITH CIRCLED ONE OVERLAY
-U+1F503           🔃            \:arrows_clockwise:                          CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS
-U+1F504           🔄            \:arrows_counterclockwise:                   ANTICLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS
-U+1F505           🔅            \:low_brightness:                            LOW BRIGHTNESS SYMBOL
-U+1F506           🔆            \:high_brightness:                           HIGH BRIGHTNESS SYMBOL
-U+1F507           🔇            \:mute:                                      SPEAKER WITH CANCELLATION STROKE
-U+1F508           🔈            \:speaker:                                   SPEAKER
-U+1F509           🔉            \:sound:                                     SPEAKER WITH ONE SOUND WAVE
-U+1F50A           🔊            \:loud_sound:                                SPEAKER WITH THREE SOUND WAVES
-U+1F50B           🔋            \:battery:                                   BATTERY
-U+1F50C           🔌            \:electric_plug:                             ELECTRIC PLUG
-U+1F50D           🔍            \:mag:                                       LEFT-POINTING MAGNIFYING GLASS
-U+1F50E           🔎            \:mag_right:                                 RIGHT-POINTING MAGNIFYING GLASS
-U+1F50F           🔏            \:lock_with_ink_pen:                         LOCK WITH INK PEN
-U+1F510           🔐            \:closed_lock_with_key:                      CLOSED LOCK WITH KEY
-U+1F511           🔑            \:key:                                       KEY
-U+1F512           🔒            \:lock:                                      LOCK
-U+1F513           🔓            \:unlock:                                    OPEN LOCK
-U+1F514           🔔            \:bell:                                      BELL
-U+1F515           🔕            \:no_bell:                                   BELL WITH CANCELLATION STROKE
-U+1F516           🔖            \:bookmark:                                  BOOKMARK
-U+1F517           🔗            \:link:                                      LINK SYMBOL
-U+1F518           🔘            \:radio_button:                              RADIO BUTTON
-U+1F519           🔙            \:back:                                      BACK WITH LEFTWARDS ARROW ABOVE
-U+1F51A           🔚            \:end:                                       END WITH LEFTWARDS ARROW ABOVE
-U+1F51B           🔛            \:on:                                        ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE
-U+1F51C           🔜            \:soon:                                      SOON WITH RIGHTWARDS ARROW ABOVE
-U+1F51D           🔝            \:top:                                       TOP WITH UPWARDS ARROW ABOVE
-U+1F51E           🔞            \:underage:                                  NO ONE UNDER EIGHTEEN SYMBOL
-U+1F51F           🔟            \:keycap_ten:                                KEYCAP TEN
-U+1F520           🔠            \:capital_abcd:                              INPUT SYMBOL FOR LATIN CAPITAL LETTERS
-U+1F521           🔡            \:abcd:                                      INPUT SYMBOL FOR LATIN SMALL LETTERS
-U+1F522           🔢            \:1234:                                      INPUT SYMBOL FOR NUMBERS
-U+1F523           🔣            \:symbols:                                   INPUT SYMBOL FOR SYMBOLS
-U+1F524           🔤            \:abc:                                       INPUT SYMBOL FOR LATIN LETTERS
-U+1F525           🔥            \:fire:                                      FIRE
-U+1F526           🔦            \:flashlight:                                ELECTRIC TORCH
-U+1F527           🔧            \:wrench:                                    WRENCH
-U+1F528           🔨            \:hammer:                                    HAMMER
-U+1F529           🔩            \:nut_and_bolt:                              NUT AND BOLT
-U+1F52A           🔪            \:hocho:                                     HOCHO
-U+1F52B           🔫            \:gun:                                       PISTOL
-U+1F52C           🔬            \:microscope:                                MICROSCOPE
-U+1F52D           🔭            \:telescope:                                 TELESCOPE
-U+1F52E           🔮            \:crystal_ball:                              CRYSTAL BALL
-U+1F52F           🔯            \:six_pointed_star:                          SIX POINTED STAR WITH MIDDLE DOT
-U+1F530           🔰            \:beginner:                                  JAPANESE SYMBOL FOR BEGINNER
-U+1F531           🔱            \:trident:                                   TRIDENT EMBLEM
-U+1F532           🔲            \:black_square_button:                       BLACK SQUARE BUTTON
-U+1F533           🔳            \:white_square_button:                       WHITE SQUARE BUTTON
-U+1F534           🔴            \:red_circle:                                LARGE RED CIRCLE
-U+1F535           🔵            \:large_blue_circle:                         LARGE BLUE CIRCLE
-U+1F536           🔶            \:large_orange_diamond:                      LARGE ORANGE DIAMOND
-U+1F537           🔷            \:large_blue_diamond:                        LARGE BLUE DIAMOND
-U+1F538           🔸            \:small_orange_diamond:                      SMALL ORANGE DIAMOND
-U+1F539           🔹            \:small_blue_diamond:                        SMALL BLUE DIAMOND
-U+1F53A           🔺            \:small_red_triangle:                        UP-POINTING RED TRIANGLE
-U+1F53B           🔻            \:small_red_triangle_down:                   DOWN-POINTING RED TRIANGLE
-U+1F53C           🔼            \:arrow_up_small:                            UP-POINTING SMALL RED TRIANGLE
-U+1F53D           🔽            \:arrow_down_small:                          DOWN-POINTING SMALL RED TRIANGLE
-U+1F550           🕐            \:clock1:                                    CLOCK FACE ONE OCLOCK
-U+1F551           🕑            \:clock2:                                    CLOCK FACE TWO OCLOCK
-U+1F552           🕒            \:clock3:                                    CLOCK FACE THREE OCLOCK
-U+1F553           🕓            \:clock4:                                    CLOCK FACE FOUR OCLOCK
-U+1F554           🕔            \:clock5:                                    CLOCK FACE FIVE OCLOCK
-U+1F555           🕕            \:clock6:                                    CLOCK FACE SIX OCLOCK
-U+1F556           🕖            \:clock7:                                    CLOCK FACE SEVEN OCLOCK
-U+1F557           🕗            \:clock8:                                    CLOCK FACE EIGHT OCLOCK
-U+1F558           🕘            \:clock9:                                    CLOCK FACE NINE OCLOCK
-U+1F559           🕙            \:clock10:                                   CLOCK FACE TEN OCLOCK
-U+1F55A           🕚            \:clock11:                                   CLOCK FACE ELEVEN OCLOCK
-U+1F55B           🕛            \:clock12:                                   CLOCK FACE TWELVE OCLOCK
-U+1F55C           🕜            \:clock130:                                  CLOCK FACE ONE-THIRTY
-U+1F55D           🕝            \:clock230:                                  CLOCK FACE TWO-THIRTY
-U+1F55E           🕞            \:clock330:                                  CLOCK FACE THREE-THIRTY
-U+1F55F           🕟            \:clock430:                                  CLOCK FACE FOUR-THIRTY
-U+1F560           🕠            \:clock530:                                  CLOCK FACE FIVE-THIRTY
-U+1F561           🕡            \:clock630:                                  CLOCK FACE SIX-THIRTY
-U+1F562           🕢            \:clock730:                                  CLOCK FACE SEVEN-THIRTY
-U+1F563           🕣            \:clock830:                                  CLOCK FACE EIGHT-THIRTY
-U+1F564           🕤            \:clock930:                                  CLOCK FACE NINE-THIRTY
-U+1F565           🕥            \:clock1030:                                 CLOCK FACE TEN-THIRTY
-U+1F566           🕦            \:clock1130:                                 CLOCK FACE ELEVEN-THIRTY
-U+1F567           🕧            \:clock1230:                                 CLOCK FACE TWELVE-THIRTY
-U+1F5FB           🗻            \:mount_fuji:                                MOUNT FUJI
-U+1F5FC           🗼            \:tokyo_tower:                               TOKYO TOWER
-U+1F5FD           🗽            \:statue_of_liberty:                         STATUE OF LIBERTY
-U+1F5FE           🗾            \:japan:                                     SILHOUETTE OF JAPAN
-U+1F5FF           🗿            \:moyai:                                     MOYAI
-U+1F600           😀            \:grinning:                                  GRINNING FACE
-U+1F601           😁            \:grin:                                      GRINNING FACE WITH SMILING EYES
-U+1F602           😂            \:joy:                                       FACE WITH TEARS OF JOY
-U+1F603           😃            \:smiley:                                    SMILING FACE WITH OPEN MOUTH
-U+1F604           😄            \:smile:                                     SMILING FACE WITH OPEN MOUTH AND SMILING EYES
-U+1F605           😅            \:sweat_smile:                               SMILING FACE WITH OPEN MOUTH AND COLD SWEAT
-U+1F606           😆            \:laughing:                                  SMILING FACE WITH OPEN MOUTH AND TIGHTLY-CLOSED EYES
-U+1F607           😇            \:innocent:                                  SMILING FACE WITH HALO
-U+1F608           😈            \:smiling_imp:                               SMILING FACE WITH HORNS
-U+1F609           😉            \:wink:                                      WINKING FACE
-U+1F60A           😊            \:blush:                                     SMILING FACE WITH SMILING EYES
-U+1F60B           😋            \:yum:                                       FACE SAVOURING DELICIOUS FOOD
-U+1F60C           😌            \:relieved:                                  RELIEVED FACE
-U+1F60D           😍            \:heart_eyes:                                SMILING FACE WITH HEART-SHAPED EYES
-U+1F60E           😎            \:sunglasses:                                SMILING FACE WITH SUNGLASSES
-U+1F60F           😏            \:smirk:                                     SMIRKING FACE
-U+1F610           😐            \:neutral_face:                              NEUTRAL FACE
-U+1F611           😑            \:expressionless:                            EXPRESSIONLESS FACE
-U+1F612           😒            \:unamused:                                  UNAMUSED FACE
-U+1F613           😓            \:sweat:                                     FACE WITH COLD SWEAT
-U+1F614           😔            \:pensive:                                   PENSIVE FACE
-U+1F615           😕            \:confused:                                  CONFUSED FACE
-U+1F616           😖            \:confounded:                                CONFOUNDED FACE
-U+1F617           😗            \:kissing:                                   KISSING FACE
-U+1F618           😘            \:kissing_heart:                             FACE THROWING A KISS
-U+1F619           😙            \:kissing_smiling_eyes:                      KISSING FACE WITH SMILING EYES
-U+1F61A           😚            \:kissing_closed_eyes:                       KISSING FACE WITH CLOSED EYES
-U+1F61B           😛            \:stuck_out_tongue:                          FACE WITH STUCK-OUT TONGUE
-U+1F61C           😜            \:stuck_out_tongue_winking_eye:              FACE WITH STUCK-OUT TONGUE AND WINKING EYE
-U+1F61D           😝            \:stuck_out_tongue_closed_eyes:              FACE WITH STUCK-OUT TONGUE AND TIGHTLY-CLOSED EYES
-U+1F61E           😞            \:disappointed:                              DISAPPOINTED FACE
-U+1F61F           😟            \:worried:                                   WORRIED FACE
-U+1F620           😠            \:angry:                                     ANGRY FACE
-U+1F621           😡            \:rage:                                      POUTING FACE
-U+1F622           😢            \:cry:                                       CRYING FACE
-U+1F623           😣            \:persevere:                                 PERSEVERING FACE
-U+1F624           😤            \:triumph:                                   FACE WITH LOOK OF TRIUMPH
-U+1F625           😥            \:disappointed_relieved:                     DISAPPOINTED BUT RELIEVED FACE
-U+1F626           😦            \:frowning:                                  FROWNING FACE WITH OPEN MOUTH
-U+1F627           😧            \:anguished:                                 ANGUISHED FACE
-U+1F628           😨            \:fearful:                                   FEARFUL FACE
-U+1F629           😩            \:weary:                                     WEARY FACE
-U+1F62A           😪            \:sleepy:                                    SLEEPY FACE
-U+1F62B           😫            \:tired_face:                                TIRED FACE
-U+1F62C           😬            \:grimacing:                                 GRIMACING FACE
-U+1F62D           😭            \:sob:                                       LOUDLY CRYING FACE
-U+1F62E           😮            \:open_mouth:                                FACE WITH OPEN MOUTH
-U+1F62F           😯            \:hushed:                                    HUSHED FACE
-U+1F630           😰            \:cold_sweat:                                FACE WITH OPEN MOUTH AND COLD SWEAT
-U+1F631           😱            \:scream:                                    FACE SCREAMING IN FEAR
-U+1F632           😲            \:astonished:                                ASTONISHED FACE
-U+1F633           😳            \:flushed:                                   FLUSHED FACE
-U+1F634           😴            \:sleeping:                                  SLEEPING FACE
-U+1F635           😵            \:dizzy_face:                                DIZZY FACE
-U+1F636           😶            \:no_mouth:                                  FACE WITHOUT MOUTH
-U+1F637           😷            \:mask:                                      FACE WITH MEDICAL MASK
-U+1F638           😸            \:smile_cat:                                 GRINNING CAT FACE WITH SMILING EYES
-U+1F639           😹            \:joy_cat:                                   CAT FACE WITH TEARS OF JOY
-U+1F63A           😺            \:smiley_cat:                                SMILING CAT FACE WITH OPEN MOUTH
-U+1F63B           😻            \:heart_eyes_cat:                            SMILING CAT FACE WITH HEART-SHAPED EYES
-U+1F63C           😼            \:smirk_cat:                                 CAT FACE WITH WRY SMILE
-U+1F63D           😽            \:kissing_cat:                               KISSING CAT FACE WITH CLOSED EYES
-U+1F63E           😾            \:pouting_cat:                               POUTING CAT FACE
-U+1F63F           😿            \:crying_cat_face:                           CRYING CAT FACE
-U+1F640           🙀            \:scream_cat:                                WEARY CAT FACE
-U+1F645           🙅            \:no_good:                                   FACE WITH NO GOOD GESTURE
-U+1F646           🙆            \:ok_woman:                                  FACE WITH OK GESTURE
-U+1F647           🙇            \:bow:                                       PERSON BOWING DEEPLY
-U+1F648           🙈            \:see_no_evil:                               SEE-NO-EVIL MONKEY
-U+1F649           🙉            \:hear_no_evil:                              HEAR-NO-EVIL MONKEY
-U+1F64A           🙊            \:speak_no_evil:                             SPEAK-NO-EVIL MONKEY
-U+1F64B           🙋            \:raising_hand:                              HAPPY PERSON RAISING ONE HAND
-U+1F64C           🙌            \:raised_hands:                              PERSON RAISING BOTH HANDS IN CELEBRATION
-U+1F64D           🙍            \:person_frowning:                           PERSON FROWNING
-U+1F64E           🙎            \:person_with_pouting_face:                  PERSON WITH POUTING FACE
-U+1F64F           🙏            \:pray:                                      PERSON WITH FOLDED HANDS
-U+1F680           🚀            \:rocket:                                    ROCKET
-U+1F681           🚁            \:helicopter:                                HELICOPTER
-U+1F682           🚂            \:steam_locomotive:                          STEAM LOCOMOTIVE
-U+1F683           🚃            \:railway_car:                               RAILWAY CAR
-U+1F684           🚄            \:bullettrain_side:                          HIGH-SPEED TRAIN
-U+1F685           🚅            \:bullettrain_front:                         HIGH-SPEED TRAIN WITH BULLET NOSE
-U+1F686           🚆            \:train2:                                    TRAIN
-U+1F687           🚇            \:metro:                                     METRO
-U+1F688           🚈            \:light_rail:                                LIGHT RAIL
-U+1F689           🚉            \:station:                                   STATION
-U+1F68A           🚊            \:tram:                                      TRAM
-U+1F68B           🚋            \:train:                                     TRAM CAR
-U+1F68C           🚌            \:bus:                                       BUS
-U+1F68D           🚍            \:oncoming_bus:                              ONCOMING BUS
-U+1F68E           🚎            \:trolleybus:                                TROLLEYBUS
-U+1F68F           🚏            \:busstop:                                   BUS STOP
-U+1F690           🚐            \:minibus:                                   MINIBUS
-U+1F691           🚑            \:ambulance:                                 AMBULANCE
-U+1F692           🚒            \:fire_engine:                               FIRE ENGINE
-U+1F693           🚓            \:police_car:                                POLICE CAR
-U+1F694           🚔            \:oncoming_police_car:                       ONCOMING POLICE CAR
-U+1F695           🚕            \:taxi:                                      TAXI
-U+1F696           🚖            \:oncoming_taxi:                             ONCOMING TAXI
-U+1F697           🚗            \:car:                                       AUTOMOBILE
-U+1F698           🚘            \:oncoming_automobile:                       ONCOMING AUTOMOBILE
-U+1F699           🚙            \:blue_car:                                  RECREATIONAL VEHICLE
-U+1F69A           🚚            \:truck:                                     DELIVERY TRUCK
-U+1F69B           🚛            \:articulated_lorry:                         ARTICULATED LORRY
-U+1F69C           🚜            \:tractor:                                   TRACTOR
-U+1F69D           🚝            \:monorail:                                  MONORAIL
-U+1F69E           🚞            \:mountain_railway:                          MOUNTAIN RAILWAY
-U+1F69F           🚟            \:suspension_railway:                        SUSPENSION RAILWAY
-U+1F6A0           🚠            \:mountain_cableway:                         MOUNTAIN CABLEWAY
-U+1F6A1           🚡            \:aerial_tramway:                            AERIAL TRAMWAY
-U+1F6A2           🚢            \:ship:                                      SHIP
-U+1F6A3           🚣            \:rowboat:                                   ROWBOAT
-U+1F6A4           🚤            \:speedboat:                                 SPEEDBOAT
-U+1F6A5           🚥            \:traffic_light:                             HORIZONTAL TRAFFIC LIGHT
-U+1F6A6           🚦            \:vertical_traffic_light:                    VERTICAL TRAFFIC LIGHT
-U+1F6A7           🚧            \:construction:                              CONSTRUCTION SIGN
-U+1F6A8           🚨            \:rotating_light:                            POLICE CARS REVOLVING LIGHT
-U+1F6A9           🚩            \:triangular_flag_on_post:                   TRIANGULAR FLAG ON POST
-U+1F6AA           🚪            \:door:                                      DOOR
-U+1F6AB           🚫            \:no_entry_sign:                             NO ENTRY SIGN
-U+1F6AC           🚬            \:smoking:                                   SMOKING SYMBOL
-U+1F6AD           🚭            \:no_smoking:                                NO SMOKING SYMBOL
-U+1F6AE           🚮            \:put_litter_in_its_place:                   PUT LITTER IN ITS PLACE SYMBOL
-U+1F6AF           🚯            \:do_not_litter:                             DO NOT LITTER SYMBOL
-U+1F6B0           🚰            \:potable_water:                             POTABLE WATER SYMBOL
-U+1F6B1           🚱            \:non-potable_water:                         NON-POTABLE WATER SYMBOL
-U+1F6B2           🚲            \:bike:                                      BICYCLE
-U+1F6B3           🚳            \:no_bicycles:                               NO BICYCLES
-U+1F6B4           🚴            \:bicyclist:                                 BICYCLIST
-U+1F6B5           🚵            \:mountain_bicyclist:                        MOUNTAIN BICYCLIST
-U+1F6B6           🚶            \:walking:                                   PEDESTRIAN
-U+1F6B7           🚷            \:no_pedestrians:                            NO PEDESTRIANS
-U+1F6B8           🚸            \:children_crossing:                         CHILDREN CROSSING
-U+1F6B9           🚹            \:mens:                                      MENS SYMBOL
-U+1F6BA           🚺            \:womens:                                    WOMENS SYMBOL
-U+1F6BB           🚻            \:restroom:                                  RESTROOM
-U+1F6BC           🚼            \:baby_symbol:                               BABY SYMBOL
-U+1F6BD           🚽            \:toilet:                                    TOILET
-U+1F6BE           🚾            \:wc:                                        WATER CLOSET
-U+1F6BF           🚿            \:shower:                                    SHOWER
-U+1F6C0           🛀            \:bath:                                      BATH
-U+1F6C1           🛁            \:bathtub:                                   BATHTUB
-U+1F6C2           🛂            \:passport_control:                          PASSPORT CONTROL
-U+1F6C3           🛃            \:customs:                                   CUSTOMS
-U+1F6C4           🛄            \:baggage_claim:                             BAGGAGE CLAIM
-U+1F6C5           🛅            \:left_luggage:                              LEFT LUGGAGE
------------------ ------------ -------------------------------------------- --------------------------------------------------------------------------------------------------------
-
-  vim:tw=180:et:ft=help:norl:
-
-endif
diff --git a/doc/julia-vim-L2U.txt b/doc/julia-vim-L2U.txt
deleted file mode 100644
index 8f3a852cf..000000000
--- a/doc/julia-vim-L2U.txt
+++ /dev/null
@@ -1,405 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-
-*julia-vim-L2U.txt*  Support for LaTeX-to-Unicode substitutions
-
-Author:  Carlo Baldassi <carlobaldassi@gmail.com>
-License: MIT license  {{{
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-    The above copyright notice and this permission notice shall be included
-    in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-}}}
-CONTENTS					*julia-vim-L2U*
-
-LaTeX-to-Unicode substitutions      |julia-vim-L2U-introdction|
-  Via Tab key                       |julia-vim-L2U-tab|
-  As you type                       |julia-vim-L2U-as-you-type|
-  Via Keymap                        |julia-vim-L2U-keymap|
-  On different file types           |julia-vim-L2U-file-types|
-  Enabling and disabling            |julia-vim-L2U-enable-disable|
-Variables                           |julia-vim-L2U-variables|
-Functions                           |julia-vim-L2U-functions|
-
-==============================================================================
-LATEX TO UNICODE                              *julia-vim-L2U-introduction*
-
-In the Julia REPL, entering a LaTeX-like sequence such as `\alpha` and pressing
-the <Tab> key substitutes it with a Unicode character such as `α`. The Julia
-REPL also provides partial completions, and suggestions for possible
-completions upon repeated pressing of the <Tab> key. Emojis are also
-available, with their names written between colons, e.g. `\:interrobang:`
-produces `⁉`.
-
-See |julia-vim-L2U-reference| for the complete table of substitutions.
-
-This Vim plug-in also provides the functionality needed to convert LaTeX
-input sequences into Unicode characters. There are 3 different methods
-available:
-
-  1. The default one is the most similar to the Julia one: substitutions are
-     triggered by pressing the <Tab> key; if a partial match is found a list
-     of suggested completions is presented in a menu together with their
-     Unicode counterpart. The exact behaviour of this feature can be
-     customized, see |julia-vim-L2U-tab|.
-
-  2. The second one substitutes symbols on the fly as you type, but only in
-     |Insert| mode. See |julia-vim-L2U-as-you-type|.
-
-  3. The third is based on |keymap|. It also substitutes as-you-type, but it
-     doesn't show you the full LaTeX sequence as you're typing it, and there
-     is a time-out. Its main advantage over the previous one is that can be
-     used in more circumstances, e.g. in |Command-line| mode or when searching
-     for a character with |f| or |t|, as explained in |language-mapping|. See
-     |julia-vim-L2U-keymap|.
-
-All of these methods are independent and can be used together without issues.
-
-The default configuration is to use the first method, and it's only active
-when editing Julia files. It only works in |Insert| and |Command-line| modes.
-
-It is possible to enable it with other file types, see
-|julia-vim-L2U-file-types|, and it can be even turned on/off on the fly
-regardless of the file type, see |julia-vim-L2U-enable-disable|.
-
-In |Command-line| mode, e.g. when searching with the |/| or |?| commands, the
-default behavior is very similar to the default |Insert| mode behavior, but
-slightly more limited, see |julia-vim-L2U-cmdmode|.
-
-These features only work as described with Vim version 7.4 or higher. Tab
-completion can still be made available on lower Vim versions, see
-|julia-vim-L2U-workaround|. The keymap mode might work but it hasn't been
-tested.
-
-See |julia-vim| for the general reference about the other features of the
-julia-vim plug-in.
-
-------------------------------------------------------------------------------
-LATEX TO UNICODE VIA TAB KEY                            *julia-vim-L2U-tab*
-
-Substitution of LaTeX sequences when pressing the <Tab> key (in |Insert| mode or
-in |Command-line| modes) is active by default. Use |g:latex_to_unicode_tab| to
-control it.
-
-When this feature is active, the julia-vim plug-in creates a mapping for the
-<Tab> key (in |Insert| mode) which takes precedence on any previously defined
-mapping assigned to it, such that when the <Tab> key is pressed the plug-in
-looks for potential LaTeX symbol matches before the cursor, and if it fails to
-find anything of interest it will fall-back to the previous mapping for <Tab>
-(with default Vim settings, this means it will insert a literal <Tab>; but if
-you have defined some other behavior for that key, e.g. by installing another
-plug-in such as supertab (https://github.com/ervandew/supertab) than that will
-be used).
-
-For example, entering this text in a file:
->
-    1 + \alpha
-<
-and then pressing <Tab>, results in:
->
-    1 + α
-<
-
-This feature is associated with 'omnifunc' completion, and therefore can
-always be accessed via CTRL-X CTRL-O, even when |g:latex_to_unicode_tab| is 0.
-
-A literal <Tab> key can always be entered by using CTRL-V before <Tab> (see
-|i_CTRL-V|).
-
-Partial sequence recognition triggers auto-completion (performed as if the
-`longest` setting was used in 'completeopt') and shows a menu of suggestions
-together with their corresponding Unicode symbol (provided the `menu` setting
-is included in 'completeopt', and more then one match is found). So for
-example, entering `\al` and pressing <Tab> will result in the following list:
->
-    +-------------+
-    | \aleph    ℵ |
-    | \allequal ≌ |
-    | \alpha    α |
-    +-------------+
->
-Then, pressing `p` will reduce the list to `\alpha`, pressing <Tab> will
-complete it and pressing <Tab> again will perform the substitution.
-
-The completion menu can be disbled, and this will happen automatically if a
-plug-in which is known to be incompatible with this feature is detected: see
-|g:latex_to_unicode_suggestions|.
-
-Some LaTeX sequences can be valid both as they are and as partial matches for
-other sequences, e.g. `\ne` is associated with `≠`, but it is also a partial
-match for `\nequiv` (`≢`). By default, if <Tab> finds an exact match performs
-the substitution, but this can be controlled by the |g:latex_to_unicode_eager|
-setting.
-
-Command-line mode                                      *julia-vim-L2U-cmdmode*
-
-In |Command-line| mode, the behavior is largely the same except that both
-<Tab> and <S-Tab> are mapped by default, and the functionality is slightly
-more limited. No suggestions are shown for partial completions. Pre-existing
-user-defined mappings of <Tab> are overridden. In order to avoid that, the
-completion can be mapped onto a defferent key combination, see
-|g:latex_to_unicode_cmd_mapping|. When using <Tab>, if no matches are found
-the behavior falls back to the standard Vim command-line completion.
-
-Vim versions lower than 7.4                     *julia-vim-L2U-workaround*
-
-The <Tab> key remapping is not performed by default with Vim versions lower
-than 7.4. However, the functionality is still available via onmicompletion,
-which is accessible by the CTRL-X CTRL-O key combination. You can map some
-other key combination to this by adding something like
->
-  inoremap <C-Tab> <C-X><C-O>
-<
-in your |.vimrc| file. If you'd map <Tab> directly, then you'd need to use
-CTRL-V <Tab> to insert a literal <Tab>.
-
-The settings |g:latex_to_unicode_eager| and |g:latex_to_unicode_suggestions|
-are still meaningful in this case.
-
-------------------------------------------------------------------------------
-LATEX TO UNICODE AS YOU TYPE                    *julia-vim-L2U-as-you-type*
-
-This feature is disabled by default, see |g:latex_to_unicode_auto|, and it is
-only available with Vim version 7.4 or higher. It consists in substituting
-valid LaTeX sequences with Unicode symbols automatically as the typing
-progresses, as soon as the sequences is unambiguously complete. For example,
-when typing:
->
-    \chi\^2 = 1
-<
-The result is
->
-    χ² = 1
-<
-The `\chi` is substituted right when the second backslash is entered, and the
-`\^2` is substituted when the following space is entered, before the equal
-sign.
-
-This feature does not currently work with emojis.
-
-This feature does not interfere with the <Tab> based substitution.
-
-------------------------------------------------------------------------------
-LATEX TO UNICODE VIA KEYMAP                          *julia-vim-L2U-keymap*
-
-This method is somewhat similar to the as-you-type one described above, but it
-uses |keymap| to generate the mappings. This has the advantage that it works
-in more circumstances, e.g. in |Command-line| mode or when searching within a
-line with |f| or |t| (since it uses |language-mapping| underneath). It can
-also be easily turned on or off like any other keymap (see |i_CTRL-^| and
-|c_CTRL-^|). Like the as-you-type fature, it doesn't work with emojis.
-The disadvantage is that you don't see the whole sequence as you're typing
-it, and you can't fix mistakes with backspace, for example.
-Another difference is that there is a |timeout| like for any other mapping.
-
-In order to use this method, set |g:latex_to_unicode_keymap| to `1`.
-You can use it in parallel with the other methods, they don't interfere. For
-example, typing a partial sequence and pressing <Tab> still triggers
-completions and suggestions if |g:latex_to_unicode_tab| is active.
-
-If you use this feature, it's also useful to set |lCursor|.
-
-------------------------------------------------------------------------------
-LATEX TO UNICODE ON DIFFERENT FILE TYPES         *julia-vim-L2U-file-types*
-
-By default, the LaTeX-to-Unicode substitutions are only active when editing
-Julia files. However, you can use the variable |g:latex_to_unicode_file_types|
-to specify for which file types this feature is active by default. The
-variable must be set to a string containing a |pattern| (a regular expression)
-which matches the desired file types, or to a list of such patterns. For
-example, to activate the feature on all file types by default, you could put
-this in your |.vimrc| file:
->
-    let g:latex_to_unicode_file_types = ".*"
-<
-To make it active only on, say, Julia and Lisp files, you could use:
->
-    let g:latex_to_unicode_file_types = ["julia", "lisp"]
-<
-
-Another option, |g:latex_to_unicode_file_types_blacklist|, can be used to
-exclude certain file types. For example, if you'd wish to enable the feature
-in all cases except for Python and untyped files, you would use:
->
-    let g:latex_to_unicode_file_types = ".*"
-    let g:latex_to_unicode_file_types_blacklist = ["python", ""]
-<
-
-NOTE: enabling the functionality will override the |'omnifunc'| setting, which
-can be undesirable, and interfere with plug-ins for different file types. In
-any case, the previous |'omnifunc'| setting is restored when the functionality
-is disabled, see |julia-vim-L2U-enable-disable|.
-
-------------------------------------------------------------------------------
-ENABLING AND DISABLING LATEX TO UNICODE      *julia-vim-L2U-enable-disable*
-
-The LaTeX-to-Unicode functionality can be enabled or disabled at any time,
-regardless of the |'filetype'| of the file you're editing, using the functions
-|LaTeXtoUnicode#Enable()|, |LaTeXtoUnicode#Disable()|, |LaTeXtoUnicode#Toggle()|.
-For example, you could use a mapping like:
->
-    noremap <expr> <F7> LaTeXtoUnicode#Toggle()
-    noremap! <expr> <F7> LaTeXtoUnicode#Toggle()
-<
-and then use the <F7> key to quickly switch the functionality on and off as
-needed (see |noremap| and |noremap!|).
-
-NOTE: these functions are different from the variables |g:latex_to_unicode_tab|,
-|g:latex_to_unicode_auto| and |g:latex_to_unicode_keymap|: the functions
-enable/disable the functionality as a whole, while the variables control
-individual features (tab, auto and keymap substitution).
-
-==============================================================================
-VARIABLES                                         *julia-vim-L2U-variables*
-
-                                                   *g:latex_to_unicode_tab*
-g:latex_to_unicode_tab
-
-                Determines whether to map LaTeX-to-Unicode substitution to the
-                <Tab> key while in |Insert| and |Command-line| modes, see
-                |julia-vim-L2U-tab|. If unspecified, it is on. You can disable
-                the feature by default by inserting the line
->
-                    let g:latex_to_unicode_tab = 0
-<
-                in your |.vimrc| file. You can change this setting at any moment
-                while editing, but you need to invoke |LaTeXtoUnicode#Init()|
-                for the change to take effect.
-                
-                                           *g:latex_to_unicode_suggestions*
-g:latex_to_unicode_suggestions
-
-                Determines whether the <Tab> key mapping produces suggestions
-                for partial matches. By default, this is set to 1 (active),
-                unless a plug-in which is known to be incompatible with it is
-                detected. Currently, known incompatible plug-ins are
-                YouCompleteMe (https://github.com/Valloric/YouCompleteMe),
-                neocomplcache (https://github.com/Shougo/neocomplcache.vim),
-                neocomplete (https://github.com/Shougo/neocomplete.vim) and
-                deoplete (https://github.com/Shougo/deoplete.nvim),
-
-                This variable can be set at any time, changes will immediately
-                take effect.
-                
-                                                 *g:latex_to_unicode_eager*
-g:latex_to_unicode_eager
-
-                Determines whether the <Tab> key mapping performs the
-                substitution immediately upon finding an exact match. By
-                default this setting is set to 1 (active), so that e.g. typing
-                `\ne` and pressing the <Tab> key triggers the substitution. If
-                this variable is set to 0, an exact match which is also a
-                possible partial match to some other sequence triggers the
-                suggestions menu first, but another <Tab> forces the
-                substitution, so that e.g. typing `\ne` and then <Tab>
-                produces a list with `\ne`, `\neg`, `\nequiv` etc., and
-                pressing <Tab> again performs the substitution.
-
-                This variable can be set at any time, changes will immediately
-                take effect. When |g:latex_to_unicode_suggestions| is `0`,
-                this setting has no effect (it's like if it was always on).
-                
-                                                  *g:latex_to_unicode_auto*
-g:latex_to_unicode_auto
-
-                Determines whether to activate LaTeX-to-Unicode substitution
-                on the fly as you type (in |Insert| mode), see
-                |julia-vim-L2U-as-you-type|. If unspecified, it is `0` (off).
-                You can enable the feature by default by inserting the line
->
-                    let g:latex_to_unicode_auto = 1
-<
-                in your |.vimrc| file. You can change this setting at any
-                moment while editing, but you need to invoke
-                |LaTeXtoUnicode#Init()| for the change to take effect.
-
-
-                                                *g:latex_to_unicode_keymap*
-g:latex_to_unicode_keymap
-
-                Determines whether to activate the |keymap|-based
-                LaTeX-to-Unicode substitutions, see |julia-vim-L2U-keymap|.
-                If unspecified, it is `0` (off). You can enable the feature by
-                default by inserting the line
->
-                    let g:latex_to_unicode_keymap = 1
-<
-                in your |.vimrc| file. You can change this setting at any
-                moment while editing, but you need to invoke
-                |LaTeXtoUnicode#Init()| for the change to take effect.
-
-                                            *g:latex_to_unicode_file_types*
-g:latex_to_unicode_file_types
-
-                Contains a |pattern|, or a list of patterns, which are matched
-                against the |'filetype'| to determine when to enable the
-                LaTeX-to-Unicode functionality, see |julia-vim-L2U-file-types|.
-                By default, its value is `"julia"`. The patterns provided must
-                match the whole filetype name. See also
-                |g:latex_to_unicode_file_types_blacklist|.
-
-                                  *g:latex_to_unicode_file_types_blacklist*
-g:latex_to_unicode_file_types_blacklist
-
-                Same as |g:latex_to_unicode_file_types|, but acts in reverse:
-                it disables the LaTeX-to-Unicode functionality when the
-                |'filetype'| matches the provided pattern (or any of the
-                patterns if a list is provided). By default, it contains an
-                unmatchable pattern, i.e. it is effectively disabled.
-
-                                           *g:latex_to_unicode_cmd_mapping*
-g:latex_to_unicode_cmd_mapping
-
-                Specifies the mapping (or list of mappings) for the
-                substitution in |Command-line| mode. By default, it is
-                `['<Tab>', '<S-Tab>']`, but it can be changed to avoid
-                overriding other user-defined mapping, e.g. to `'<S-Tab>'`
-                (if your terminal suppoorts it) or `'<C-\><Tab>'`.
-                The `'<Tab>'` (or to be more precise the |wildchar| key) and
-                `'<S-Tab>'` mappings are special in that they fall back to
-                performing default Vim completions in case no suitable
-                substitutions are found.
-
-==============================================================================
-FUNCTIONS                                         *julia-vim-L2U-functions*
-
-                                                    *LaTeXtoUnicode#Init()*
-LaTeXtoUnicode#Init()
-
-                Initialize or re-initialize the LaTeX-to-Unicode substitutions
-                (see |julia-vim-L2U-introduction|). Must be invoked after
-                changing |g:latex_to_unicode_tab| or |g:latex_to_unicode_auto|
-                to make the changes take effect.
-
-                                                  *LaTeXtoUnicode#Enable()*
-                                                 *LaTeXtoUnicode#Disable()*
-                                                  *LaTeXtoUnicode#Toggle()*
-LaTeXtoUnicode#Enable()
-LaTeXtoUnicode#Disable()
-LaTeXtoUnicode#Toggle()
-
-                These functions enable/disable/toggle the LaTeX-to-Unicode
-                functionality, regardless of the |'filetype'| specified in
-                |g:latex_to_unicode_file_types| and
-                |g:latex_to_unicode_file_types_blacklist|. See
-                |julia-vim-L2U-enable-disable|. Note that LaTeXtoUnicode#Enable()
-                will override the |'omnifunc'| definition, if present. However,
-                LaTeXtoUnicode#Disable() will restore it.
-                These functions implicitly invoke |LaTeXtoUnicode#Init()|.
-
-
- vim:tw=78:et:ft=help:norl:
-
-endif
diff --git a/doc/julia-vim.txt b/doc/julia-vim.txt
deleted file mode 100644
index 5cf181d03..000000000
--- a/doc/julia-vim.txt
+++ /dev/null
@@ -1,484 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-
-*julia-vim.txt*  Support for Julia in Vim
-
-Author:  Carlo Baldassi <carlobaldassi@gmail.com>
-License: MIT license  {{{
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-    The above copyright notice and this permission notice shall be included
-    in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-}}}
-
-CONTENTS					*julia-vim*
-
-Introduction	                    |julia-vim-introduction|
-Block-wise movements/objects        |julia-vim-blocks|
-  Keyword-oriented movements        |julia-vim-blocks-move|
-  Block-oriented movements          |julia-vim-blocks-moveblock|
-  Block text objects                |julia-vim-blocks-objects|
-  Variables                         |julia-vim-blocks-variables|
-Referring to documents              |julia-vim-doc|
-Extras                              |julia-vim-extras|
-Customizations                      |julia-vim-options|
-About                               |julia-vim-about|
-
-==============================================================================
-INTRODUCTION                                       *julia-vim-introduction*
-
-The julia-vim plug-in provides:
-  - basic support for editing Julia files (automatic filetype detection,
-    indentation, syntax highlighting)
-  - support for the |matchit| plugin
-  - support for Julia block-wise movements (i.e. jumping around between
-    Julia blocks like if/end, function/end etc.) and block text-objects
-  - facilities for conversion of LaTeX entries to Unicode symbols which mimic
-    and extend what the Julia REPL and the IJulia notebook interface do.
-    Optionally, this functionality can be used with all file types, not
-    just Julia files. See |julia-vim-L2U|.
-  - a keymapping |K| to refer julia documents.
-
-This help file documents: 1) the block-wise movements and objects, how they
-work and what variables can be used to enable/disable/tweak them; 2) The
-documentation lookup facility; 3) Some extra functions and customization
-options.
-The LaTeX-to-Unicode facilities are documented in |julia-vim-L2U|.
-
-==============================================================================
-BLOCK-WISE MOVEMENTS AND BLOCK TEXT OBJECTS              *julia-vim-blocks*
-
-In Julia, all blocks start with a keyword (`module`, `function`, `if`, `for`,
-`while`, `type`, etc.) and end with the `end` keyword.
-
-This plug-in adds support for the |matchit| plugin, such that pressing |%| while
-on a block keyword will jump to the other keywords pertaining to the same
-block. For example, if the cursor is at the beginning of the following code:
->
-    if a == 1
-      if b > 0
-        println("yes")
-      end
-    else
-      println("no")
-    end
-<
-then pressing |%| will jump to the `else` keyword, pressing it again will jump
-to `end`, and pressing it again will go back to the first `if`.
-
-Note that the matchit plugin is normally distributed with ViM, but it is
-disabled by default. To enable it, add this line to your |.vimrc| file:
->
-    runtime macros/matchit.vim
-<
-The julia-vim plug-in also adds commands to jump around block keywords in
-normal, operator-pending and visual modes (see |vim-modes|). These are somehow
-similar to the |]]| and |]m| mappings when used in C and Java files,
-respectively, but are more powerful. These commands also require that the
-matchit plugin is enabled.
-
-There are two families of block movements, keyword-oriented (see
-|julia-vim-blocks-move|) and block-oriented (see
-|julia-vim-blocks-blockmove|).
-
-Finally, this plug-in also adds block |text-objects| special mappings, so that
-whole blocks can be manipulated as a whole when in visual mode or
-operator-pending mode, see |julia-vim-block-objects|.
-
-The block movements and block objects mappings can be collectively disabled,
-see |g:julia_blocks|, and customized, see |g:julia_blocks_mappings|.
-
-NOTE: in all cases, macros at the beginning of a block are considered as part
-of the block itself. For example, in this code:
->
-    @inbounds for i = 1:5
-      s += v[i]
-    end
-<
-the block begins at `@inbounds`.
-
-------------------------------------------------------------------------------
-KEYWORD-ORIENTED MOVEMENTS                          *julia-vim-blocks-move*
-
-These movements jump to the following/preceding block keyword, and they
-differentiate between begin keywords and end keywords. Some block keywords can
-also be used outside blocks (e.g. `for` in comprehensions, or `end` within
-indexing expressions): these instances are ignored by these commands.
-
-The following movements are provided:
-
-                                      *julia_]j* *julia_]J* *julia_[j* *julia_[J*
-move_n : jumps to the next begin keyword. By default, it is mapped to `]j`.
-move_N : jumps to the next end keyword. By default, it is mapped to `]J`.
-move_p : jumps to the preceding begin keyword. By default, it is mapped to `[j`.
-move_P : jumps to the preceding end keyword. By default, it is mapped to `[J`.
-
-Use |g:julia_blocks_mappings| to customize the mappings.
-
-------------------------------------------------------------------------------
-BLOCK-ORIENTED MOVEMENTS                       *julia-vim-blocks-moveblock*
-
-These movements are like keyword-oriented movements (|julia-vim-blocks-move|),
-except that they ignore nested blocks within the block where the cursor is.
-For example, given the following code (with line annotations):
->
-    1  while true
-    2    a += 1
-    3    if a > 5
-    4      break
-    5    end
-    6  end
-    7  if b == 2
-    8    return
-    9  end
-<
-if the cursor is on line 2, these movements will ignore the inner
-`if/end` block (lines 3 to 5). You would then be able to jump directly
-to lines 1 (with `[[`), 6 (with `][`), 7 (with `]]`), or 9 (with `2][`).
-
-The following movements are provided:
-
-                                      *julia_]]* *julia_][* *julia_[[* *julia_[]*
-moveblock_n : gets out from the current block (if any) and jumps to the next
-              begin keyword. (Similar to |w| for word movements.) By default,
-              it is mapped to `]]`.
-moveblock_N : jumps to the end of the current block, if any. If the cursor is
-              already at the end of a block, jumps to the end of the following
-              block at the same level of the current one, or at the end of the
-              enclosing block. (Similar to |e| for word movements.) By
-              default, it is mapped to `][`.
-moveblock_p : jumps to the beginning of the current block, if any. If the
-              cursor is already at the beginning of a block, jumps to the
-              beginning of the preceding block at the same level of the
-              current one, or at the beginning of the enclosing block.
-              (Similar to |b| for word movements.) By default, it is mapped to
-              `[[`.
-moveblock_P : gets out from the current block (if any) and jumps to the
-              preceding end keyword. (Similar to |ge| for word movements.)
-              By default, it is mapped to `[]`.
-
-Use |g:julia_blocks_mappings| to customize the mappings.
-
-------------------------------------------------------------------------------
-BLOCK TEXT OBJECTS                               *julia-vim-blocks-objects*
-
-The julia-vim plug-in extends the ViM |text-objects| by defining special
-mappings which allow to operate on blocks as a whole when in visual mode
-or operator-pending mode. The default mappings use `aj` and `ij` to refer to
-these objects.
-For example, given the following code (with line annotations):
->
-    1  while true
-    2    a += 1
-    3    if a > 5
-    4      break
-    5    end
-    6  end
-<
-if the cursor is on `break` on line 4, pressing `vaj` will select the whole
-inner `if` block (lines 3 to 5), and pressing `aj` again will select the whole
-`while` block (lines 1 to 6). The same effect could have been obtained with a
-counter, i.e. using `v2aj`. If the cursor were initially on line 2, the whole
-`while` block would have been selected with the first `vaj`. Using `daj` would
-delete a block, `caj` would delete it and leave ViM in insert mode, `=aj`
-would indent it, etc.
-Starting from line 2, pressing `vij` wuold only select the inner part of the
-`while` block (lines 2 to 5).
-
-The following mappings are provided:
-
-                                                        *julia_aj* *julia_ij*
-select_a : the block which contains the cursor, including its delimiters.
-           By default, this is mapped to `aj`. Repeated application (e.g.
-           `vajaj`) selects the enclosing blocks. A counter can be used to
-           the same effect as repetition (e.g. `v2aj`).
-select_i : same as select_a, but only selects the lines included between the
-           delimiters. Thus, this does not work with single-line blocks.
-           By default, this is mapped to `ij`. Repeated application (e.g.
-           `vijij`) has no effect, but using a counter has the same effect as
-           using "select_a" and then selecting the inner part of the outermost
-           block. For example, with the default mappings, `v3ij` is the same as
-           `v3ajij`, or `vajajajij`.
-
-Use |g:julia_blocks_mappings| to customize the mappings.
-
-The following auxiliary function is only mapped to normal mode:
-
-                                                           *julia_whereami*
-whereami : this mapping prints the first line of the current block on the
-           command line. If invoked repeatedly, or if given a count, it prints
-           the first line of the enclosing blocks, like `select_a`. If followed
-           by `select_a`, the selection, or operation, will refer to the last
-           block printed. By default, it is not mapped to any key, but a
-           mapping can be easily provided in |g:julia_blocks_mappings|. It is
-           possible to obtain the string, instead of having it printed, by
-           calling the function `julia_blocks#whereami()`. In such case, use
-           the function `julia_blocks#select_reset()` to reset the block
-           nesting level.
-
-------------------------------------------------------------------------------
-VARIABLES                                      *julia-vim-blocks-variables*
-
-                                                           *g:julia_blocks*
-g:julia_blocks
-
-                Determines whether to map block-wise movements and objects. If
-                unspecified, it is on. You can disable the feature by default
-                by inserting the line
->
-                    let g:julia_blocks = 0
-<
-                in your |.vimrc| file.
-
-                                                  *g:julia_blocks_mappings*
-g:julia_blocks_mappings
-
-                Custom mapping for block-wise movements. This must be a |dict|
-                associating movements to key combinations. Use empty strings
-                to disable individual mappings. The following is equivalent
-                to the default mappings (see |julia-vim-blocks-moveblock|,
-                |julia-vim-blocks-move| and |julia-vim-blocks-objects|):
->
-                  let g:julia_blocks_mappings = {
-                    \  "move_n" : "]j",
-                    \  "move_N" : "]J",
-                    \  "move_p" : "[j",
-                    \  "move_P" : "[J",
-                    \
-                    \  "moveblock_n" : "]]",
-                    \  "moveblock_N" : "][",
-                    \  "moveblock_p" : "[[",
-                    \  "moveblock_P" : "[]",
-                    \
-                    \  "select_a" : "aj",
-                    \  "select_i" : "ij",
-                    \
-                    \  "whereami" : "",
-                    \  }
-<
-                You can change individual mappings by writing something like
-                this in your |.vimrc| file:
->
-                  let g:julia_blocks_mappings = {
-                    \  "move_N"   : "]n",
-                    \  "move_P"   : "[n",
-                    \  "whereami" : "<Leader>j",
-                    \  }
-<
-                Or you can disable individual mappings by writing something like
-                this in your |.vimrc| file:
->
-                  let g:julia_blocks_mappings = {
-                    \  "moveblock_n" : "",
-                    \  "moveblock_p" : "",
-                    \  }
-<
-                All unspecified entries keep their default value.
-
-
-==============================================================================
-REFERRING TO DOCUMENTATION                                  *julia-vim-doc*
-
-                                                              *julia-vim-K*
-K
-        Look up documentation for the keyword under the cursor. If found,
-        a preview window with the documentation is opened.
-
-        This also works for keywords within the opened preview window,
-        allowing effortless browsing of the documentation.
-
-        (This is not really a key mapping, but uses the built-in
-        |keywordprg|-mechanism in vim; see |K| if you're curious).
-
-
-                                                   *<Plug>(JuliaDocPrompt)*
-<Plug>(JuliaDocPrompt)
-        Open a prompt for keyword documentation lookup. If you don't use |?|
-        for backward search, you can use the following to make `?` work like
-        in the Julia REPL:
->
-        autocmd FileType julia nmap <buffer> ? <Plug>(JuliaDocPrompt)
-<
-        Apply |:augroup| as needed.
-
-
-                                                                *:JuliaDoc*
-:JuliaDoc {keyword}
-        Look up documentation for {keyword}.
-
-
-==============================================================================
-EXTRAS                                                   *julia-vim-extras*
-
-
-                                        *julia#toggle_function_blockassign*
-                                        *julia#function_block2assign*
-                                        *julia#function_assign2block*
-julia#toggle_function_blockassign()
-julia#function_block2assign()
-julia#function_assign2block()
-
-                These functions allow to transform function definitions
-                between block format and assignment format. For example,
-                these two definitions are equivalent:
->
-                function test(x, y)
-                    x + 2y
-                end
-
-                test(x, y) = x + 2y
-<
-                You can use the function `julia#toggle_function_blockassign()`
-                to switch between the two forms (the cursor needs to be on the
-                first line of the block form). This functionality requires
-                that the |matchit| plugin is loaded. Only three-line function
-                blocks like the one in the example are recognized. When
-                changing the block form into the assignment form, `return`
-                statements are removed; if the result is empty, `nothing` is
-                substituted. Leading macros (e.g. `@inline` or `@compat`) are
-                recognized and preserved by the transformation.
-
-                In order to make this functionality practical, it is advisable
-                to map it to some key combination, e.g.:
->
-                noremap <Leader>fb :call julia#toggle_function_blockassign()<CR>
-<
-
-==============================================================================
-CUSTOMIZATIONS                                          *julia-vim-options*
-
-The following options allows customizing some aspects of the plugin.
-
-                                             *g:julia_spellcheck_docstrings*
-g:julia_spellcheck_docstrings
-
-                Determines whether to enable spell-checking for docstrings,
-                i.e. triple quoted strings that start in the first column. See
-                |spell|. Default: on (set to `1`).
-
-                                               *g:julia_spellcheck_strings*
-g:julia_spellcheck_strings
-
-                Determines whether to enable spell-checking for all strings.
-                See |spell|. Default: off (set to `0`).
-
-                                              *g:julia_spellcheck_comments*
-g:julia_spellcheck_comments
-
-                Determines whether to enable spell-checking for comments. See
-                |spell|. Default: on (set to `1`).
-
-                                              *g:julia_highlight_operators*
-g:julia_highlight_operators
-
-                Determines whether to apply syntax highlighting to operators.
-                Default: on (set to `1`).
-
-                                              *g:julia_indent_align_import*
-g:julia_indent_align_import
-
-                In a multi-line import/using/export statment, the lines after
-                the first one use some special alignment rules by default,
-                e.g.:
->
-                import X: one,
-                          two,
-                          three
-                export four,
-                       five,
-                       six
-<
-                When `g:julia_indent_align_import` is `0` instead, the usual
-                indentation is used:
->
-                import X: one,
-                    two,
-                    three
-                export four,
-                    five,
-                    six
-
-                                              *g:julia_indent_align_brackets*
-g:julia_indent_align_brackets
-
-                In a multi-line bracketed expression (except for function
-                arguments, see |g:julia_indent_align_funcargs|), the lines
-                after the first one use some special alignment rules by
-                default, e.g.:
->
-                matrix = [1 2 3;
-                          4 5 6]
-                tpl = (
-                       abc = Dict(a=>1,
-                                  b=>2),
-                       def = [1 2;
-                              3 4],
-                       xyz = SubArray{eltype(P),
-                                      N, P, I,
-                                      false}
-                      )
-<
-                When `g:julia_indent_align_brackets` is `0` instead, an extra
-                indent is used:
->
-                matrix = [1 2 3;
-                    4 5 6]
-                tpl = (
-                    abc = Dict(a=>1,
-                        b=>2),
-                    def = [1 2;
-                        3 4],
-                    xyz = SubArray{eltype(P),
-                        N, P, I,
-                        false}
-                )
-<
-
-                                              *g:julia_indent_align_funcargs*
-g:julia_indent_align_funcargs
-
-                In a function definition, when the arguments span multiple
-                lines, the lines after the first one get an extra indentation
-                step by default, e.g.:
->
-                function functionanme(
-                        arg1, arg2,
-                        arg3, arg4
-                    )
-                    # function body
-                end
-<
-                By setting `g:julia_indent_align_funcargs` to `1`, the
-                arguments are aligned to the bracket instead (they work as any
-                other bracket with the default value of
-                |g:julia_indent_align_brackets|):
->
-                function functionanme(arg1, arg2,
-                                      arg3, arg4
-                                     )
-                    # function body
-                end
-<
-
-==============================================================================
-ABOUT                                                     *julia-vim-about*
-
-Grab the latest version or report a bug on GitHub:
-
-http://github.com/JuliaEditorSupport/julia-vim
-
- vim:tw=78:et:ft=help:norl:
-
-endif
diff --git a/doc/ledger.txt b/doc/ledger.txt
deleted file mode 100644
index 1cb2f65cd..000000000
--- a/doc/ledger.txt
+++ /dev/null
@@ -1,443 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ledger') == -1
-
-*ledger.txt* Plugin for the ledger filetype.
-
-
-                                                  *ledger* *ledger-plugin*
-
-Contents:
-
-        Commands............|ledger-invoking|
-        Source................|ledger-source|
-        Usage..................|ledger-usage|
-        Tips....................|ledger-tips|
-        Reports..............|ledger-reports|
-        Settings............|ledger-settings|
-        Completion........|ledger-completion|
-        License..............|ledger-license|
-
-
-==============================================================================
-USAGE                                                           *ledger-usage*
-
-Copy each file to the corresponding directory in your ~/.vim directory or
-install using Pathogen.
-
-You can also use a modeline like this in every ledger file:
-
-    vim:filetype=ledger
-
-==============================================================================
-TIPS                                                             *ledger-tips*
-
-Tips and useful commands
-
-* vim-ledger can do syntax-sensitive folding when you set `foldmethod=syntax`
-  in the |modeline| of your ledger file. This way transactions can shrink down
-  to just one line.
-
-* Try account-completion (as explained below). If you use YouCompleteMe, you
-  should disable it for Ledger files. Put this in your .vimrc:
-
-        if exists('g:ycm_filetype_blacklist')
-          call extend(g:ycm_filetype_blacklist, { 'ledger': 1 })
-        endif
-
-* You may use `:make` for syntax checking. It may be convenient to define a
-  mapping for the following command:
-
-	:silent make | redraw! | cwindow
-
-  It is recommended to set the value of `g:ledger_extra_options` (see below)
-  as follows:
-
-        let g:ledger_extra_options = '--pedantic --explicit --check-payees'
-
-  to catch most potential problems in your source file.
-
-* Remap vim paragraph motion to move by transaction.
-
-  In vim, the "{" and "}" keystrokes move the cursor up and down by whole
-  paragraphs. They can be redefined in ledger files to move by transaction
-  instead. Add these lines to .vimrc:
-
-        au FileType ledger noremap { ?^\d<CR>
-        au FileType ledger noremap } /^\d<CR>
-
-  The default definitions already work in ledger files that separate
-  transactions with blank lines.
-
-* `:call ledger#transaction_date_set(line('.'), "auxiliary")`
-
-  will set today's date as the auxiliary date of the current transaction. You
-  can use also "primary" or "unshift" in place of "auxiliary". When you pass
-  "unshift" the old primary date will be set as the auxiliary date and today's
-  date will be set as the new primary date.
-  To use a different date pass a date measured in seconds since 1st Jan 1970
-  as the third argument.
-
-* `:call ledger#transaction_state_set(line('.'), '*')`
-
-  sets the state of the current transaction to '*'. You can use this in custom
-  mappings.
-
-* `:call ledger#transaction_state_toggle(line('.'), ' *?!')`
-
-  will toggle through the provided transaction states. You can map this to
-  double-clicking for example:
-
-        noremap <silent><buffer> <2-LeftMouse>\
-        :call ledger#transaction_state_toggle(line('.'), ' *?!')<CR>
-
-* `:LedgerAlign`
-
-  moves the amount expression of a posting so that the decimal separator is
-  aligned at the column specified by g:ledger_align_at. If an amount has no
-  decimal point, the imaginary decimal point to the right of the least
-  significant digit will align. The command acts on a range, with the default
-  being the current line.
-
-  The decimal separator can be set using `g:ledger_decimal_sep`. The default
-  value of `g:ledger_decimal_sep` is `'.'`.
-
-  See below for the recommended mappings.
-
-* `:call ledger#align_amount_at_cursor()`
-
-  aligns the amount under the cursor and append/prepend the default currency.
-  The default currency can be set using `g:ledger_default_commodity`. Whether
-  the commodity should be inserted before the amount or appended to it can be
-  configured with the boolean flag `g:ledger_commodity_before` (the default
-  value is 1). A separator between the commodity and the amount may be set
-  using `g:ledger_commodity_sep`.
-
-  See below for the recommended mappings.
-
-* `:call ledger#autocomplete_and_align()`
-
-  when the cursor is on a number or immediately after it, invokes
-  `ledger#align_amount_at_cursor()` to align it and add the default currency;
-  otherwise, performs autocompletion. If you define the following mappings in
-  your `.vimrc` then you may perform both autocompletion and alignment using
-  the <Tab> key:
-
-        au FileType ledger inoremap <silent> <Tab> \
-        <C-r>=ledger#autocomplete_and_align()<CR>
-        au FileType ledger vnoremap <silent> <Tab> :LedgerAlign<CR>
-
-  Alternatively, you may create a file `.vim/after/ftplugin/ledger.vim`
-  containing the following definitions:
-
-        inoremap <silent> <buffer> <Tab> \
-        <C-r>=ledger#autocomplete_and_align()<CR>
-        vnoremap <silent> <buffer> <Tab> :LedgerAlign<CR>
-
-  Now, you may type `asset:check<Tab><Space>123.45<Tab>`, and have the
-  account name autocompleted and `$123.45` properly aligned (assuming your
-  default commodity is set to `'$'`). Or you may press <Tab> in Visual mode
-  to align a number of transactions at once.
-
-* `:call ledger#entry()`
-
-  enters a new transaction based on the text in the current line.
-  The text in the current line is replaced by the new transaction.
-  This is a front end to `ledger entry`.
-
-==============================================================================
-REPORTS                                                      *ledger-reports*
-
-* `:Ledger`
-
-  Executes an arbitrary Ledger command and sends the output to a new buffer.
-  For example:
-
-        :Ledger bal ^assets ^liab
-
-  Errors are displayed in a quickfix window. The command offers account and
-  payee autocompletion (by pressing <Tab>): every name starting with `@` is
-  autocompleted as a payee; any other name is autocompleted as an account.
-
-  In a report buffer or in the quickfix window, you may press <Tab> to switch
-  back to your source file, and you may press `q` to dismiss the current window.
-
-  There are three highlight groups that are used to color the report:
-
-  * `LedgerNumber`
-
-    This is used to color nonnegative numbers.
-
-  * `LedgerNegativeNumber`
-
-    This is used to color negative numbers.
-
-  * `LedgerImproperPerc`
-
-    This is used to color improper percentages.
-
-* `:Balance`
-
-  Show the pending and cleared balance of a given account below the status
-  line. For example:
-
-	:Balance checking:savings
-
-  The command offers payee and account autocompletion (see `:Ledger`). The
-  account argument is optional: if no argument is given, the first account
-  name found in the current line is used.
-
-  Two highlight groups can be used to customize the colors of the line:
-
-  * `LedgerCleared`
-
-    This is used to color the cleared balance.
-
-  * `LedgerPending`
-
-    This is used to color the pending balance.
-
-* `:Register`
-
-  Opens an arbitrary register report in the quickfix window. For example:
-
-	:Register groceries -p 'this month'
-
-  The command offers account and payee autocompletion (see |:Ledger|). You
-  may use the standard quickfix commands to jump from an entry in the register
-  report to the corresponding location in the source file. If you use GUI Vim
-  or if your terminal has support for the mouse (e.g., iTerm2, or even
-  Terminal.app in OS X 10.11 or later), you may also double-click on a line
-  number in the quickfix window to jump to the corresponding posting.
-
-  It is strongly recommended that you add mappings for common quickfix
-  commands like `:cprev` and `:cnext`, or that you use T. Pope's Unimpaired
-  plugin.
-
-* :`Reconcile`
-
-  Reconcile an account. For example:
-
-	:Reconcile checking
-
-  After you press Enter, you will be asked to enter a target amount (use
-  Vim's syntax for numbers, not your ledger's format). For example, for a
-  checking account, the target amount may be the balance of your latest bank
-  statement. The list of uncleared postings appears in the quickfix window.
-  The current balance of the account, together with the difference between the
-  target amount and the cleared balance, is shown at the bottom of the screen.
-  You may use standard quickfix commands to navigate through the postings. You
-  may use |ledger#transaction_state_set()| to update a transaction's state.
-  Every time you save your file, the balance and the difference from the
-  target amount are updated at the bottom of the screen. The goal, of course,
-  is to get such difference to zero. You may press `<C-l>` to refresh the
-  Reconcile buffer. To finish reconciling an account, simply close the
-  quickfix window.
-
-  There is a highlight group to customize the color of the difference from
-  target:
-
-  * `LedgerTarget`
-
-    This is used to color the difference between the target amount and the
-    cleared balance.
-
-==============================================================================
-SETTINGS                                                     *ledger-settings*
-
-Configuration
-
-Include the following let-statements somewhere in your `.vimrc` to modify the
-behaviour of the ledger filetype.
-
-* Path to the `ledger` executable:
-
-	let g:ledger_bin = 'ledger'
-
-* Additional default options for the `ledger` executable:
-
-	let g:ledger_extra_options = ''
-
-* To use a custom external system command to generate a list of account names
-  for completion, set the following. If g:ledger_bin is set, this will default
-  to running that command with arguments to parse the current file using the
-  accounts subcommand (works with ledger or hledger), otherwise it will parse
-  the postings in the current file itself.
-
-	let g:ledger_accounts_cmd = 'your_command args'
-
-* To use a custom external system command to generate a list of descriptions
-  for completion, set the following. If g:ledger_bin is set, this will default
-  to running that command with arguments to parse the current file using the
-  descriptions subcommand (works with ledger or hledger), otherwise it will
-  parse the transactions in the current file itself.
-
-	let g:ledger_descriptions_cmd = 'your_command args'
-
-* Number of columns that will be used to display the foldtext. Set this when
-  you think that the amount is too far off to the right.
-
-        let g:ledger_maxwidth = 80
-
-* String that will be used to fill the space between account name and amount in
-  the foldtext. Set this to get some kind of lines or visual aid.
-
-        let g:ledger_fillstring = '    -'
-
-* If you want the account completion to be sorted by level of detail/depth
-  instead of alphabetical, include the following line:
-
-        let g:ledger_detailed_first = 1
-
-* By default vim will fold ledger transactions, leaving surrounding blank lines
-  unfolded. You can use 'g:ledger_fold_blanks' to hide blank lines following a
-  transaction.
-
-        let g:ledger_fold_blanks = 0
-
-  A value of 0 will disable folding of blank lines, 1 will allow folding of a
-  single blank line between transactions; any larger value will enable folding
-  unconditionally.
-
-  Note that only lines containing no trailing spaces are considered for
-  folding. You can take advantage of this to disable this feature on a
-  case-by-case basis.
-
-* Decimal separator:
-
-        let g:ledger_decimal_sep = '.'
-
-* Specify at which column decimal separators should be aligned:
-
-        let g:ledger_align_at = 60
-
-* Default commodity used by `ledger#align_amount_at_cursor()`:
-
-        let g:ledger_default_commodity = ''
-
-* Flag that tells whether the commodity should be prepended or appended to the
-  amount:
-
-        let g:ledger_commodity_before = 1
-
-* String to be put between the commodity and the amount:
-
-        let g:ledger_commodity_sep = ''
-
-* Flag that enable the spelling of the amount:
-
-        let g:ledger_commodity_spell = 1
-
-* Format of transaction date:
-
-        let g:ledger_date_format = '%Y/%m/%d'
-
-* The file to be used to generate reports:
-
-        let g:ledger_main = '%'
-
-  The default is to use the current file.
-
-* Position of a report buffer:
-
-        let g:ledger_winpos = 'B'
-
-  Use `b` for bottom, `t` for top, `l` for left, `r` for right. Use uppercase letters
-  if you want the window to always occupy the full width or height.
-
-* Format of quickfix register reports (see |:Register|):
-
-	let g:ledger_qf_register_format = \
-        '%(date) %-50(payee) %-30(account) %15(amount) %15(total)\n'
-
-  The format is specified using the standard Ledger syntax for --format.
-
-* Format of the reconcile quickfix window (see |:Reconcile|):
-
-	let g:ledger_qf_reconcile_format = \
-        '%(date) %-4(code) %-50(payee) %-30(account) %15(amount)\n'
-
-  The format is specified using the standard Ledger syntax for --format.
-
-* Flag that tells whether a location list or a quickfix list should be used:
-
-	let g:ledger_use_location_list = 0
-
-  The default is to use the quickfix window. Set to 1 to use a location list.
-
-* Position of the quickfix/location list:
-
-	let g:ledger_qf_vertical = 0
-
-  Set to 1 to open the quickfix window in a vertical split.
-
-* Size of the quickfix window:
-
-	let g:ledger_qf_size = 10
-
-  This is the number of lines of a horizontal quickfix window, or the number
-  of columns of a vertical quickfix window.
-
-* Flag to show or hide filenames in the quickfix window:
-
-	let g:ledger_qf_hide_file = 1
-
-  Filenames in the quickfix window are hidden by default. Set this to 1 is
-  you want filenames to be visible.
-
-* Text of the output of the |:Balance| command:
-
-	let g:ledger_cleared_string = 'Cleared: '
-	let g:ledger_pending_string = 'Cleared or pending: '
-	let g:ledger_target_string = 'Difference from target: '
-
-==============================================================================
-COMPLETION                                                 *ledger-completion*
-
-Omni completion is currently implemented for account names only.
-
-### Accounts
-
-Account names are matched by the start of every sub-level. When you
-insert an account name like this:
-
-    Asse<C-X><C-O>
-
-You will get a list of top-level accounts that start like this.
-
-Go ahead and try something like:
-
-    As:Ban:Che<C-X><C-O>
-
-When you have an account like this, 'Assets:Bank:Checking' should show up.
-
-When you want to complete on a virtual transaction, it's currently best
-to keep the cursor in front of the closing bracket. Of course you can
-insert the closing bracket after calling the completion, too.
-
-==============================================================================
-LICENSE                                                       *ledger-license*
-
-https://github.com/ledger/vim-ledger
-
-Copyright 2019 Caleb Maclennan
-Copyright 2009–2017 Johann Klähn
-Copyright 2009 Stefan Karrmann
-Copyright 2005 Wolfgang Oertl
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation, either version 2 of the License, or (at your
-option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program. If not, see <https://www.gnu.org/licenses/>.
-
-
-vim:ts=8 sw=8 noexpandtab tw=78 ft=help:
-
-
-endif
diff --git a/doc/ocaml.txt b/doc/ocaml.txt
deleted file mode 100644
index 83c5418dc..000000000
--- a/doc/ocaml.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
-
-*ocaml.txt*        Filetype plugin for OCaml
-
-CONFIGURATION                                    *ocaml-configuration*
-
-                                                 *g:ocaml_highlight_operators*
-
-By default operators are not linked to the Operator group and thus not
-highlighted. You can turn on highlighting of operators by defining:
-
-  let g:ocaml_highlight_operators = 1
-
- vim:tw=78:et:ft=help:norl:
-
-endif
diff --git a/doc/opam.txt b/doc/opam.txt
deleted file mode 100644
index 6669bb2b5..000000000
--- a/doc/opam.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
-
-*opam.txt*  Switch OCaml versions from inside Vim using OPAM
-
-Author:  Rudi Grinberg <http://rgrinberg.com>
-License: Same terms as Vim itself (see |license|)
-
-This plugin is only available if 'compatible' is not set.
-
-COMMANDS                                        *:opam*
-
-:Opam {version}          Set the current OCaml version to {version}.
-
-ABOUT                                           *opam-about*
-
-Grab the latest version or report a bug on GitHub:
-
-https://github.com/ocaml/vim-ocaml
-
- vim:tw=78:et:ft=help:norl:
-
-endif
diff --git a/doc/pgsql.txt b/doc/pgsql.txt
deleted file mode 100644
index 2d2de6ed8..000000000
--- a/doc/pgsql.txt
+++ /dev/null
@@ -1,145 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pgsql') == -1
-
-*pgsql.txt*	Syntax highlighting for PostgreSQL files
-					    _                             ~
-					   | |                            ~
-		     ____   ____  ___  ____| |                            ~
-		    |  _ \ / _  |/___)/ _  | |                            ~
-		    | |_| ( (_| |___ | |_| | |                            ~
-		    |  __/ \___ (___/ \__  |\_)                           ~
-		    |_|   (_____|        |_|                              ~
-
-		The best PostgreSQL plugin for Vim!
-
-Author:  Lifepillar <https://github.com/lifepillar>
-License: Public Domain
-
-==============================================================================
-CONTENTS					*pgsql-contents*
-
-    1.  Syntax highlighting ................... |pgsql-syntax|
-    2.  Customization ......................... |pgsql-customization|
-    3.  Autocompletion ........................ |pgsql-autocompletion|
-    4.  Contributing .......................... |pgsql-contributing|
-    5.  Credits ............................... |pgsql-credits|
-
-==============================================================================
-Syntax highlighting				*pgsql-syntax*
-
-Files with a .`pgsql` suffix are highlighted out of the box. If you want to
-highlight `.sql` files using this plugin by default, add this to your `.vimrc`
-(see |ft_sql.txt| for more details):
->
-	let g:sql_type_default = 'pgsql'
-<
-Alternatively, after loading a `.sql` file use this command:
->
-	SQLSetType pgsql.vim
-<
-To set the file type in new buffers use:
->
-	let b:sql_type_override='pgsql' | set ft=sql
-<
-Identifiers starting with an underscore are highlighted as variables. It is
-recommended to adopt the convention of prefixing function parameters and local
-variables with `_`.
-
-Code between `$pgsql$`, `$body$`, or `$$` pairs is interpreted as PL/pgSQL and
-highlighted accordingly (the delimiters are case-insensitive). If you prefer
-to use `$$` to highlight strings instead, you may set |g:pgsql_dollar_strings|
-to 1.
-
-Text enclosed between `$anyword$` pairs, where `anyword` is any non-empty
-sequence of word characters different from those with a special meaning (such
-as `$pgsql$`) is treated as a multi-line string.
-
-When |foldmethod| is set to "syntax", SQL commands can be folded.
-
-Finally, the plugin supports syntax highlighting of arbitrary languages within
-procedure and function blocks. This feature needs to be configured: see
-|g:pgsql_pl|.
-
-==============================================================================
-Customization					*pgsql-customization*
-
-						*'g:pgsql_backslash_quote'*
-Set to 1 to recognize `\'` as an escape sequence in all strings. By default,
-`\'` is treated as an escape sequence only in "escape" strings constants,
-i.e., strings enclosed in `E''`.
->
-	let g:pgsql_backslash_quote = 0
-<
-						*'g:pgsql_disabled_extensions'*
-Support for the most common PostgreSQL extensions is enabled by default. Set
-this to a List of names of extensions whose keywords you do not want to be
-highlighted.
->
-	let g:pgsql_disabled_extensions = []
-<
-						*'g:pgsql_dollar_strings'*
-Set to 1 if you want double-dollar enclosed text highlighted as a SQL string.
-By default, text quoted with `$$` is highlighted as PL/pgSQL.
->
-	let g:pgsql_dollar_strings = 0
-<
-						*'g:pgsql_pl'*
-						*'b:pgsql_pl'*
-A List of the filetypes that should be highlighted inside the body of
-user-defined functions and procedures.
->
-	let g:pgsql_pl = []
-<
-For example, to use PL/Python and PL/R, you should define:
->
-	let g:pgsql_pl = ['python', 'r']
-<
-Then, code between `$python$` pairs will be highlighted as Python, and code
-between `$r$` pairs will be highlighted as R.
-
-The buffer-local version of this setting can be used to override the global
-setting in a single buffer.
-
-Note: changes to any of these variables take effect after the SQL filetype is
-reloaded.
-
-==============================================================================
-Autocompletion					*pgsql-autocompletion*
-
-This plugin just defines a new dialect for Vim's SQL plugin. As such, it
-inherits the static and dynamic completion methods already offered by Vim (see
-|sql-completion|). So, for example, by default you may use `<C-c>f` to
-complete function names, `<C-c>T` to complete types, and so on. See
-|ft_sql.txt| for thorough documentation about SQL support in Vim.
-
-As far as I know, YouCompleteMe does not support SQL. If you use YouCompleteMe
-you may want to disable it for SQL buffers. Add this to
-`.vim/after/ftplugin/sql.vim`:
->
-	if exists('g:ycm_filetype_blacklist')
-	    call extend(g:ycm_filetype_blacklist, { 'sql': 1 })
-	endif
-<
-Of course, I recommend using my own MUcomplete plugin over YCM ;)
-
-==============================================================================
-Contributing					*pgsql-contributing*
-
-For bug reports and feature requests please use:
-
-    https://github.com/lifepillar/pgsql.vim/issues
-
-Pull requests are welcome, too!
-
-==============================================================================
-Credits						*pgsql-credits*
-
-This plugin was originally a fork of space::tekk's
-
-	https://github.com/spacetekk/pgsql.vim
-
-and completely rewritten.
-
- vim:tw=78:ts=8:noet:ft=help:norl:
-
-
-endif
diff --git a/doc/ps1.txt b/doc/ps1.txt
deleted file mode 100644
index 660f2c1a0..000000000
--- a/doc/ps1.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
-
-*ps1.txt*  A Windows PowerShell syntax plugin for Vim
-
-Maintainer: Peter Provost <https://www.github.com/PProvost>
-License:    Apache 2.0
-Version:    2.10
-
-INTRODUCTION                                                    *ps1-syntax*
-
-This plugin provides Vim syntax, indent and filetype detection for Windows
-PowerShell scripts, modules, and XML configuration files.
-
-
-ABOUT                                                           *ps1-about*
-
-Grab the latest version or report a bug on GitHub:
-
-https://github.com/PProvost/vim-ps1
-
-
-FOLDING                                                         *ps1-folding*
-
-The ps1 syntax file provides syntax folding (see |:syn-fold|) for script blocks
-and digital signatures in scripts.
-
-When 'foldmethod' is set to "syntax" then function script blocks will be
-folded unless you use the following in your .vimrc or before opening a script: >
-
-    :let g:ps1_nofold_blocks = 1
-<
-Digital signatures in scripts will also be folded unless you use: >
-
-    :let g:ps1_nofold_sig = 1
-<
-Note: syntax folding might slow down syntax highlighting significantly,
-especially for large files.
-
-
-COMPILER                                                        *ps1-compiler*
-
-The powershell |compiler| script configures |:make| to execute the script in
-PowerShell.
-
-It tries to pick a smart default PowerShell command: `pwsh` if available and
-`powershell` otherwise, but you can customize the command: >
-
-    :let g:ps1_makeprg_cmd = '/path/to/pwsh'
-<
-To configure whether to show the exception type information: >
-
-    :let g:ps1_efm_show_error_categories = 1
-<
-
-KEYWORD LOOKUP                                                 *ps1-keyword*
-
-To look up keywords using PowerShell's Get-Help, press the |K| key. For more
-convenient paging, the pager `less` should be installed, which is included in
-many Linux distributions and in macOS.
-
-Many other distributions are available for Windows like
-https://chocolatey.org/packages/less/. Make sure `less` is in a directory
-listed in the `PATH` environment variable, which chocolatey above does.
-
-------------------------------------------------------------------------------
- vim:ft=help:
-
-endif
diff --git a/doc/python-syntax.txt b/doc/python-syntax.txt
deleted file mode 100644
index d5391ff73..000000000
--- a/doc/python-syntax.txt
+++ /dev/null
@@ -1,124 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python') == -1
-
-*python-syntax.txt* Python syntax highlighting
-
-==============================================================================
-Introduction                         *python-syntax* *ft-python-syntax* *python.vim*
-
-This is an enhanced version of the original Vim 6.1 Python syntax highlighting
-`python.vim` by Neil Schemenauer.
-
-Features
---------
-
-* Enhanced highlighting for:
-  * Strings
-  * Special symbols inside strings
-  * Numeric constants
-* Added support for:
-  * Python 3
-  * Numbers with underscores
-  * String %-formatting and f-strings
-  * Magic comments: source code encoding and shebangs
-  * New exceptions and builtins
-  * Doctests
-  * `@decorator` syntax
-  * Class variables such as `self` and `cls`
-  * Operators
-* Highlighting of the following errors:
-  * Invalid symbols in source file
-  * Invalid numeric constants
-  * Invalid %-formatting inside strings
-  * Invalid variable names
-  * Invalid operators
-  * Mixing spaces and tabs
-  * Trailing spaces (Enabled with `g:python_highlight_space_errors`)
-* Commands for easy switching between versions
-
-Folding is done by the plugin SimpylFold
-(https://github.com/tmhedberg/SimpylFold).
-
-==============================================================================
-Configuration                                      *python-syntax-configuration*
-
-Option variables
-----------------
-
-Set variable to `1` to enable or `0` to disable.
-
-For example to enable all syntax highlighting features you can add the
-following command to your `~/.config/nvim/init.vim` or `~/.vimrc`: >
-
-    let g:python_highlight_all = 1
-<
-
-`g:python_version_2` (default `0`)
-    Python 2 mode
-
-`b:python_version_2` (default `0`)
-    Python 2 mode (buffer local)
-
-`g:python_highlight_builtins` (default `0`)
-    Highlight builtin objects, types, and functions
-
-`g:python_highlight_builtin_objs` (default `0`)
-    Highlight builtin objects only
-
-`g:python_highlight_builtin_types` (default `0`)
-    Highlight builtin types only
-
-`g:python_highlight_builtin_funcs` (default `0`)
-    Highlight builtin functions only
-
-`g:python_highlight_builtin_funcs_kwarg` (default `1`)
-    Highlight builtin functions when used as kwarg
-
-`g:python_highlight_exceptions` (default `0`)
-    Highlight standard exceptions
-
-`g:python_highlight_string_formatting` (default `0`)
-    Highlight `%` string formatting
-
-`g:python_highlight_string_format` (default `0`)
-    Highlight syntax of `str.format` syntax
-
-`g:python_highlight_string_templates` (default `0`)
-    Highlight syntax of `string.Template`
-
-`g:python_highlight_indent_errors` (default `0`)
-    Highlight indentation errors
-
-`g:python_highlight_space_errors` (default `0`)
-    Highlight trailing spaces
-
-`g:python_highlight_doctests` (default `0`)
-    Highlight doc-tests
-
-`g:python_highlight_func_calls` (default `0`)
-    Highlight functions calls
-
-`g:python_highlight_class_vars` (default `0`)
-    Highlight class variables `self` and `cls`
-
-`g:python_highlight_operators` (default `0`)
-    Highlight all operators
-
-`g:python_highlight_all` (default `0`)
-    Enable all highlight options above, except for previously set.
-
-`g:python_highlight_file_headers_as_comments` (default `0`)
-    Highlight shebang and coding headers as comments
-
-`g:python_slow_sync` (default `1`)
-    Disable for slow machines
-
-Commands
---------
-
-`Python2Syntax`
-    Switch to Python 2
-
-`Python3Syntax`
-    Switch to Python 3
-
-endif
diff --git a/doc/reason.txt b/doc/reason.txt
deleted file mode 100644
index ad2cd1d96..000000000
--- a/doc/reason.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
-
-*reason.txt*      Filetype plugin for Reason
-
-==============================================================================
-CONTENTS                                                      *reason* *ft-reason*
-
-
-==============================================================================
-INTRODUCTION                                                      *reason-intro*
-
-
-==============================================================================
-SETTINGS                                                       *reason-settings*
-
-
-==============================================================================
-MAPPINGS                                                       *reason-mappings*
-
-
-==============================================================================
- vim:tw=78:sw=4:noet:ts=8:ft=help:norl:
-
-endif
diff --git a/doc/rust.txt b/doc/rust.txt
deleted file mode 100644
index 6dbb1a2ce..000000000
--- a/doc/rust.txt
+++ /dev/null
@@ -1,490 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-
-*ft_rust.txt*      Filetype plugin for Rust
-
-==============================================================================
-CONTENTS                                                      *rust*
-
-1. Introduction                                                   |rust-intro|
-2. Settings                                                    |rust-settings|
-3. Commands                                                    |rust-commands|
-4. Mappings                                                    |rust-mappings|
-
-==============================================================================
-INTRODUCTION                                                      *rust-intro*
-
-This plugin provides syntax and supporting functionality for the Rust
-filetype. It requires Vim 8 or higher for full functionality. Some commands
-will not work on earlier versions.
-
-==============================================================================
-SETTINGS                                                       *rust-settings*
-
-This plugin has a few variables you can define in your vimrc that change the
-behavior of the plugin.
-
-Some variables can be set buffer local (`:b` prefix), and the buffer local
-will take precedence over the global `g:` counterpart.
-
-                                                                *g:rustc_path*
-g:rustc_path~
-	Set this option to the path to rustc for use in the |:RustRun| and
-	|:RustExpand| commands. If unset, "rustc" will be located in $PATH: >
-	    let g:rustc_path = $HOME."/bin/rustc"
-<
-
-                                                  *g:rustc_makeprg_no_percent*
-g:rustc_makeprg_no_percent~
-	Set this option to 1 to have 'makeprg' default to "rustc" instead of
-	"rustc %": >
-	    let g:rustc_makeprg_no_percent = 1
-<
-
-                                                              *g:rust_conceal*
-g:rust_conceal~
-	Set this option to turn on the basic |conceal| support: >
-	    let g:rust_conceal = 1
-<
-
-                                                     *g:rust_conceal_mod_path*
-g:rust_conceal_mod_path~
-	Set this option to turn on |conceal| for the path connecting token
-	"::": >
-	    let g:rust_conceal_mod_path = 1
-<
-
-                                                          *g:rust_conceal_pub*
-g:rust_conceal_pub~
-	Set this option to turn on |conceal| for the "pub" token: >
-	    let g:rust_conceal_pub = 1
-<
-
-                                                     *g:rust_recommended_style*
-g:rust_recommended_style~
-        Set this option to enable vim indentation and textwidth settings to
-        conform to style conventions of the rust standard library (i.e. use 4
-        spaces for indents and sets 'textwidth' to 99). This option is enabled
-	by default. To disable it: >
-	    let g:rust_recommended_style = 0
-<
-
-                                                                 *g:rust_fold*
-g:rust_fold~
-	Set this option to turn on |folding|: >
-	    let g:rust_fold = 1
-<
-	Value		Effect ~
-	0		No folding
-	1		Braced blocks are folded. All folds are open by
-			default.
-	2		Braced blocks are folded. 'foldlevel' is left at the
-			global value (all folds are closed by default).
-
-                                                  *g:rust_bang_comment_leader*
-g:rust_bang_comment_leader~
-	Set this option to 1 to preserve the leader on multi-line doc comments
-	using the /*! syntax: >
-	    let g:rust_bang_comment_leader = 1
-<
-
-                                                *g:rust_use_custom_ctags_defs*
-g:rust_use_custom_ctags_defs~
-	Set this option to 1 if you have customized ctags definitions for Rust
-	and do not wish for those included with rust.vim to be used: >
-	    let g:rust_use_custom_ctags_defs = 1
-<
-
-	NOTE: rust.vim's built-in definitions are only used for the Tagbar Vim
-	plugin, if you have it installed, AND if Universal Ctags is not
-	detected. This is because Universal Ctags already has built-in
-	support for Rust when used with Tagbar.
-
-	Also, note that when using ctags other than Universal Ctags, it is not
-	automatically used when generating |tags| files that Vim can use to
-	navigate to definitions across different source files. Feel free to
-	copy `rust.vim/ctags/rust.ctags` into your own `~/.ctags` if you wish
-	to generate |tags| files.
-
-
-                                                 *g:ftplugin_rust_source_path*
-g:ftplugin_rust_source_path~
-	Set this option to a path that should be prepended to 'path' for Rust
-	source files: >
-	    let g:ftplugin_rust_source_path = $HOME.'/dev/rust'
-<
-
-                                                       *g:rustfmt_command*
-g:rustfmt_command~
-	Set this option to the name of the 'rustfmt' executable in your $PATH. If
-	not specified it defaults to 'rustfmt' : >
-	    let g:rustfmt_command = 'rustfmt'
-<
-                                                       *g:rustfmt_autosave*
-g:rustfmt_autosave~
-	Set this option to 1 to run |:RustFmt| automatically when saving a
-	buffer. If not specified it defaults to 0 : >
-	    let g:rustfmt_autosave = 0
-<
-	There is also a buffer-local b:rustfmt_autosave that can be set for
-	the same purpose, and can override the global setting.
-
-                                        *g:rustfmt_autosave_if_config_present*
-g:rustfmt_autosave_if_config_present~
-	Set this option to 1 to have *b:rustfmt_autosave* be set automatically
-	if a `rustfmt.toml` file is present in any parent directly leading to
-	the file being edited. If not set, default to 0: >
-	    let g:rustfmt_autosave_if_config_present = 0
-<
-	This is useful to have `rustfmt` only execute on save, on projects
-	that have `rustfmt.toml` configuration.
-
-	There is also a buffer-local b:rustfmt_autosave_if_config_present
-	that can be set for the same purpose, which can overrides the global
-	setting.
-                                                       *g:rustfmt_fail_silently*
-g:rustfmt_fail_silently~
-	Set this option to 1 to prevent 'rustfmt' from populating the
-	|location-list| with errors. If not specified it defaults to 0: >
-	    let g:rustfmt_fail_silently = 0
-<
-                                                       *g:rustfmt_options*
-g:rustfmt_options~
-	Set this option to a string of options to pass to 'rustfmt'. The
-	write-mode is already set to 'overwrite'. If not specified it
-	defaults to '' : >
-	    let g:rustfmt_options = ''
-<
-                                                       *g:rustfmt_emit_files*
-g:rustfmt_emit_files~
-	If not specified rust.vim tries to detect the right parameter to
-	pass to rustfmt based on its reported version. Otherwise, it
-	determines whether to run rustfmt with '--emit=files' (when 1 is
-	provided) instead of '--write-mode=overwrite'. >
-	    let g:rustfmt_emit_files = 0
-
-
-                                                          *g:rust_playpen_url*
-g:rust_playpen_url~
-	Set this option to override the url for the playpen to use: >
-	    let g:rust_playpen_url = 'https://play.rust-lang.org/'
-<
-
-                                                        *g:rust_shortener_url*
-g:rust_shortener_url~
-	Set this option to override the url for the url shortener: >
-	    let g:rust_shortener_url = 'https://is.gd/'
-<
-
-                                                        *g:rust_clip_command*
-g:rust_clip_command~
-	Set this option to the command used in your OS to copy the Rust Play
-	url to the clipboard: >
-	    let g:rust_clip_command = 'xclip -selection clipboard'
-<
-
-                                                       *g:cargo_makeprg_params*
-g:cargo_makeprg_params~
-	Set this option to the string of parameters to pass to cargo. If not
-	specified it defaults to '$*' : >
-	    let g:cargo_makeprg_params = 'build'
-<
-
-                                                  *g:cargo_shell_command_runner*
-g:cargo_shell_command_runner~
-	Set this option to change how to run shell commands for cargo commands
-	|:Cargo|, |:Cbuild|, |:Crun|, ...
-	By default, |:terminal| is used to run shell command in terminal window
-	asynchronously. But if you prefer |:!| for running the commands, it can
-	be specified: >
-	    let g:cargo_shell_command_runner = '!'
-<
-
-
-Integration with Syntastic                                    *rust-syntastic*
---------------------------
-
-This plugin automatically integrates with the Syntastic checker. There are two
-checkers provided: 'rustc', and 'cargo'. The latter invokes 'Cargo' in order to
-build code, and the former delivers a single edited '.rs' file as a compilation
-target directly to the Rust compiler, `rustc`.
-
-Because Cargo is almost exclusively being used for building Rust code these
-days, 'cargo' is the default checker. >
-
-    let g:syntastic_rust_checkers = ['cargo']
-<
-If you would like to change it, you can set `g:syntastic_rust_checkers` to a
-different value.
-                                          *g:rust_cargo_avoid_whole_workspace*
-                                          *b:rust_cargo_avoid_whole_workspace*
-g:rust_cargo_avoid_whole_workspace~
-	When editing a crate that is part of a Cargo workspace, and this
-	option is set to 1 (the default), then 'cargo' will be executed
-	directly in that crate directory instead of in the workspace
-	directory. Setting 0 prevents this behavior - however be aware that if
-	you are working in large workspace, Cargo commands may take more time,
-	plus the Syntastic error list may include all the crates in the
-	workspace. >
-            let g:rust_cargo_avoid_whole_workspace = 0
-<
-                                              *g:rust_cargo_check_all_targets*
-                                              *b:rust_cargo_check_all_targets*
-g:rust_cargo_check_all_targets~
-	When set to 1, the `--all-targets` option will be passed to cargo when
-	Syntastic executes it, allowing the linting of all targets under the
-	package.
-	The default is 0.
-
-                                              *g:rust_cargo_check_all_features*
-                                              *b:rust_cargo_check_all_features*
-g:rust_cargo_check_all_features~
-	When set to 1, the `--all-features` option will be passed to cargo when
-	Syntastic executes it, allowing the linting of all features of the
-	package.
-	The default is 0.
-
-                                                 *g:rust_cargo_check_examples*
-                                                 *b:rust_cargo_check_examples*
-g:rust_cargo_check_examples~
-	When set to 1, the `--examples` option will be passed to cargo when
-	Syntastic executes it, to prevent the exclusion of examples from
-	linting. The examples are normally under the `examples/` directory of
-	the crate.
-	The default is 0.
-
-                                                    *g:rust_cargo_check_tests*
-                                                    *b:rust_cargo_check_tests*
-g:rust_cargo_check_tests~
-	When set to 1, the `--tests` option will be passed to cargo when
-	Syntastic executes it, to prevent the exclusion of tests from linting.
-	The tests are normally under the `tests/` directory of the crate.
-	The default is 0.
-
-                                                  *g:rust_cargo_check_benches*
-                                                  *b:rust_cargo_check_benches*
-g:rust_cargo_check_benches~
-	When set to 1, the `--benches` option will be passed to cargo when
-	Syntastic executes it.  The benches are normally under the `benches/`
-	directory of the crate.
-	The default is 0.
-
-Integration with auto-pairs                                    *rust-auto-pairs*
----------------------------
-
-This plugin automatically configures the auto-pairs plugin not to duplicate
-single quotes, which are used more often for lifetime annotations than for
-single character literals.
-
-                                                  *g:rust_keep_autopairs_default*
-g:rust_keep_autopairs_default~
-
-	Don't override auto-pairs default for the Rust filetype. The default
-	is 0.
-
-==============================================================================
-COMMANDS                                                       *rust-commands*
-
-Invoking Cargo
---------------
-
-This plug defines very simple shortcuts for invoking Cargo from with Vim.
-
-:Cargo <args>                                                       *:Cargo*
-                Runs 'cargo' with the provided arguments.
-
-:Cbuild <args>                                                     *:Cbuild*
-                Shortcut for 'cargo build`.
-
-:Cclean <args>                                                     *:Cclean*
-                Shortcut for 'cargo clean`.
-
-:Cdoc <args>                                                         *:Cdoc*
-                Shortcut for 'cargo doc`.
-
-:Cinit <args>                                                       *:Cinit*
-                Shortcut for 'cargo init`.
-
-:Crun <args>                                                         *:Crun*
-                Shortcut for 'cargo run`.
-
-:Ctest <args>                                                       *:Ctest*
-                Shortcut for 'cargo test`.
-
-:Cupdate <args>                                                   *:Cupdate*
-                Shortcut for 'cargo update`.
-
-:Cbench <args>                                                     *:Cbench*
-                Shortcut for 'cargo bench`.
-
-:Csearch <args>                                                   *:Csearch*
-                Shortcut for 'cargo search`.
-
-:Cpublish <args>                                                 *:Cpublish*
-                Shortcut for 'cargo publish`.
-
-:Cinstall <args>                                                 *:Cinstall*
-                Shortcut for 'cargo install`.
-
-:Cruntarget <args>                                                 *:Cruntarget*
-                Shortcut for 'cargo run --bin' or 'cargo run --example',
-                depending on the currently open buffer.
-
-Formatting
-----------
-
-:RustFmt                                                       *:RustFmt*
-		Runs |g:rustfmt_command| on the current buffer. If
-		|g:rustfmt_options| is set then those will be passed to the
-		executable.
-
-		If |g:rustfmt_fail_silently| is 0 (the default) then it
-		will populate the |location-list| with the errors from
-		|g:rustfmt_command|. If |g:rustfmt_fail_silently| is set to 1
-		then it will not populate the |location-list|.
-
-:RustFmtRange                                                  *:RustFmtRange*
-		Runs |g:rustfmt_command| with selected range. See
-		|:RustFmt| for any other information.
-
-
-Playpen integration
--------------------
-
-:RustPlay                                                          *:RustPlay*
-		This command will only work if you have web-api.vim installed
-		(available at https://github.com/mattn/webapi-vim).  It sends the
-		current selection, or if nothing is selected, the entirety of the
-		current buffer to the Rust playpen, and emits a message with the
-		shortened URL to the playpen.
-
-		|g:rust_playpen_url| is the base URL to the playpen, by default
-		"https://play.rust-lang.org/".
-
-		|g:rust_shortener_url| is the base url for the shorterner, by
-		default "https://is.gd/"
-
-		|g:rust_clip_command| is the command to run to copy the
-		playpen url to the clipboard of your system.
-
-
-Evaluation of a single Rust file
---------------------------------
-
-NOTE: These commands are useful only when working with standalone Rust files,
-which is usually not the case for common Rust development. If you wish to
-building Rust crates from with Vim can should use Vim's make, Syntastic, or
-functionality from other plugins.
-
-
-:RustRun  [args]                                                    *:RustRun*
-:RustRun! [rustc-args] [--] [args]
-		Compiles and runs the current file. If it has unsaved changes,
-		it will be saved first using |:update|. If the current file is
-		an unnamed buffer, it will be written to a temporary file
-		first. The compiled binary is always placed in a temporary
-		directory, but is run from the current directory.
-
-		The arguments given to |:RustRun| will be passed to the
-		compiled binary.
-
-		If ! is specified, the arguments are passed to rustc instead.
-		A "--" argument will separate the rustc arguments from the
-		arguments passed to the binary.
-
-		If |g:rustc_path| is defined, it is used as the path to rustc.
-		Otherwise it is assumed rustc can be found in $PATH.
-
-:RustExpand  [args]                                              *:RustExpand*
-:RustExpand! [TYPE] [args]
-		Expands the current file using --pretty and displays the
-		results in a new split. If the current file has unsaved
-		changes, it will be saved first using |:update|. If the
-		current file is an unnamed buffer, it will be written to a
-		temporary file first.
-
-		The arguments given to |:RustExpand| will be passed to rustc.
-		This is largely intended for specifying various --cfg
-		configurations.
-
-		If ! is specified, the first argument is the expansion type to
-		pass to rustc --pretty. Otherwise it will default to
-		"expanded".
-
-		If |g:rustc_path| is defined, it is used as the path to rustc.
-		Otherwise it is assumed rustc can be found in $PATH.
-
-:RustEmitIr [args]                                               *:RustEmitIr*
-		Compiles the current file to LLVM IR and displays the results
-		in a new split. If the current file has unsaved changes, it
-		will be saved first using |:update|. If the current file is an
-		unnamed buffer, it will be written to a temporary file first.
-
-		The arguments given to |:RustEmitIr| will be passed to rustc.
-
-		If |g:rustc_path| is defined, it is used as the path to rustc.
-		Otherwise it is assumed rustc can be found in $PATH.
-
-:RustEmitAsm [args]                                             *:RustEmitAsm*
-		Compiles the current file to assembly and displays the results
-		in a new split. If the current file has unsaved changes, it
-		will be saved first using |:update|. If the current file is an
-		unnamed buffer, it will be written to a temporary file first.
-
-		The arguments given to |:RustEmitAsm| will be passed to rustc.
-
-		If |g:rustc_path| is defined, it is used as the path to rustc.
-		Otherwise it is assumed rustc can be found in $PATH.
-
-
-Running test(s)
----------------
-
-:[N]RustTest[!] [options]                                       *:RustTest*
-		Runs a test under the cursor when the current buffer is in a
-		cargo project with "cargo test" command. If the command did
-		not find any test function under the cursor, it stops with an
-		error message.
-
-		When N is given, adjust the size of the new window to N lines
-		or columns.
-
-		When ! is given, runs all tests regardless of current cursor
-		position.
-
-		When [options] is given, it is passed to "cargo" command
-		arguments.
-
-		When the current buffer is outside cargo project, the command
-		runs "rustc --test" command instead of "cargo test" as
-		fallback. All tests are run regardless of adding ! since there
-		is no way to run specific test function with rustc. [options]
-		is passed to "rustc" command arguments in the case.
-
-		Takes optional modifiers (see |<mods>|):  >
-		    :tab RustTest
-		    :belowright 16RustTest
-		    :leftabove vert 80RustTest
-<
-rust.vim Debugging
-------------------
-
-:RustInfo                                                          *:RustInfo*
-		Emits debugging info of the Vim Rust plugin.
-
-:RustInfoToClipboard                                      *:RustInfoClipboard*
-		Saves debugging info of the Vim Rust plugin to the default
-		register.
-
-:RustInfoToFile [filename]                                   *:RustInfoToFile*
-		Saves debugging info of the Vim Rust plugin to the the given
-		file, overwritting it.
-
-==============================================================================
-MAPPINGS                                                       *rust-mappings*
-
-This plugin defines mappings for |[[| and |]]| to support hanging indents.
-
-==============================================================================
- vim:tw=78:sw=4:noet:ts=8:ft=help:norl:
-
-endif
diff --git a/doc/scala.txt b/doc/scala.txt
deleted file mode 100644
index b9fe2cf7b..000000000
--- a/doc/scala.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-
-*scala.txt* Syntax highlighting and helper functions for the Scala language.
-
-This plugin is only available if 'compatible' is not set.
-{Vi does not have any of this}
-
-==============================================================================
-INTRODUCTION                                    *scala*
-
-Syntax highlighting and helper functions for the scala language. Extras
-include:
-
-  - Sorting of import statements, configurable to your conventions.
-  - Tagbar support to navigate definitions within a file in the plugin's
-    sidebar window.
-  - ...and probably more that we've forgotten to update in this doc.
-
-==============================================================================
-OPTIONS                                         *scala-options*
-
-Use these options to control behavior of the plugin. Default values are
-indicated in the examples.
-
-                                           *'g:scala_use_builtin_tagbar_defs'*
-If you are using the Tagbar Vim plugin, vim-scala includes a Tagbar type
-definition and ctags definition for Scala, so you can use Tagbar immediately.
-If you have your own ctags definition in `~/.ctags` and prefer to use it, set
-this option to 0 (we would appreciate contributions if you've improved the
-ctags definition!).
-
-Note that Tagbar's ctags definition for Scala is not used to generate a
-|tags| file that Vim can use to navigate to definitions in other files, only
-for the plugin sidebar. Feel free to copy `vim-scala/ctags/scala.ctags` into
-your own `~/.ctags` if you wish to generate |tags| files.
->
-    let g:scala_use_builtin_tagbar_defs = 1
-<
-                                           *'g:scala_use_default_keymappings'*
-Set this option to disable definition of all mappings provided by vim-scala.
-See |scala-mappings|.
->
-    let g:scala_use_default_keymappings = 1
-<
-
-                                                   *'g:scala_scaladoc_indent'*
-By default, the plugin indents documentation comments according to the
-standard Javadoc format.
-    /**
-     * This is a doc comment using Javadoc-style indentation.
-     */
-Set this option to enable the indentation standard as recommended for Scaladoc
-comments.
-    /** This is a Scaladoc comment using 
-      * the recommended indentation.
-      */
->
-    let g:scala_scaladoc_indent = 1
-<
-                                                     
-==============================================================================
-COMMANDS                                        *scala-commands*
-
-                                                *:SortScalaImports*
-:SortScalaImports       There are two modes in which this command can operate.
-                        By default it walks all import groups at the top of
-                        the Scala file and orders their lines alphabetically.
-                        A group is a series of lines starting with the
-                        import keyword separated by one or more blank lines.
-
-                        The second, more advanced mode, can be activated by
-                        setting
-
-                          let g:scala_sort_across_groups=1
-
-                        This makes this command include all imports in the
-                        sorting regardless of blank lines in between them and
-                        puts them in three predefined groups instead.
-                        The three groups in which the imports can fall are:
-
-                          1. Scala and Java core
-                          2. Third party libraries
-                          3. First party code (ie. your own)
-
-                        Java and Scala core imports are identified by the
-                        java(x) and scala namespaces.
-                        Everything else that isn't a first party namespace
-                        will be a third party import.
-                        You can define a regex that matches first party
-                        namespaces by setting
-
-                          g:scala_first_party_namespaces
-
-                        For example in a standard Play app this would be
-                        set to
-                          g:scala_first_party_namespaces=
-                             \ '\(controllers\|views\|models\)'
-
-==============================================================================
-MAPPINGS                                        *scala-mappings*
-
-Currently the only mappings defined are for FuzzyFinder users--these will
-only be enabled if FuzzyFinder is detected.
-
-                                                *scala-leader-fs*
-<Leader>fs              "Find src". Primes |:FufFile| with `src/main/scala`,
-                        and goes deeper still if only a single directory
-                        exists below that. Helpful for package namespacing
-                        like `src/main/scala/com/myorg`.
-
-                                                *scala-leader-ft*
-<Leader>ft              "Find test". Like |scala-leader-fs|, but with
-                        `src/test/scala`.
-
-                                                *scala-leader-fr*
-<Leader>fr              "Find from root". For the rarer cases when you want to
-                        start FuzzyFinder at project root (parent of `src/`).
-
-Disabling Mappings~
-
-If you wish to disable the default key mappings, write the following line in
-your ~/.vimrc: >
-
-    let g:scala_use_default_keymappings = 0
-
-==============================================================================
-CREDITS                                          *scala-credits*
-
-Developed by Derek Wyatt, building on initial work by Stefan Matthias Aust.
-Distributed under the Apache 2 license.
-
-Project's home and Git repository: https://github.com/derekwyatt/vim-scala
-
-------------------------------------------------------------------------------
- vim:tw=78:ts=8:ft=help:norl:
-
-endif
diff --git a/doc/terraform.txt b/doc/terraform.txt
deleted file mode 100644
index b609f5840..000000000
--- a/doc/terraform.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
-
-*terraform.txt*  basic vim/terraform integration
-
-Author:  HashiVim <https://github.com/hashivim>
-License: ISC license
-Repo:    https://github.com/hashivim/vim-terraform
-
-COMMANDS                                        *terraform*
-
-This command is only available if terraform is in your PATH.
-
-                                                *terraform-:terraform*
-:Terraform [args]         Invoke an arbitrary terraform command.
-
- vim:tw=78:et:ft=help:norl:
-
-endif
diff --git a/doc/textile.txt b/doc/textile.txt
deleted file mode 100644
index 2b28186ac..000000000
--- a/doc/textile.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'textile') == -1
-
-*textile.txt*              Textile for Vim       Last Change: November 3, 2008
-
-==============================================================================
-REQUIREMENTS                                             *textile-requirements*
-
-- ruby - http://ruby-lang.org/ (seperate executable, not compiled in)
-- RedCloth - http://redcloth.org/
-
-Files with the extension *.textile will auto-detected.  If editing a new file,
-or otherwise, run ":setf textile" to enable textile commands.
-
-
-==============================================================================
-CHANGELOG                                                  *textile-changelog*
-
-0.3     - Fixed keymappings in the documentation
-0.2     - Added multiple colors for headers, and alternating colors for list
-          items
-        - Fixed error in the vim script for TextileRenderBufferToFile
-        - Changed shortcut keys from \tp to \rp (render preview instead of
-          textile preview, since it's file-type specific anyways)
-0.1     - Initial Release
-
-==============================================================================
-COMMANDS                                                    *textile-commands*
-
-:TextilePreview     - Render the current buffer to a temp file, and open it in
-                      your web browser (OSX only)
-
-                      <Leader>rp
-
-:TextileRenderTab   - ... to a new tab
-
-                      <Leader>rt
-
-:TextileRenderFile  - ... to a file
-
-                      <Leader>rf
-
-<Leader> is \ by default, so <Leader>rp == \rp
-
-==============================================================================
-CONFIG                                                        *textile-config*
-
-MAC OS X:
-
-  Optional:
-    let g:TextileBrowser="Google Chrome"   - Open preview in "Google Chrome"
-                                             rather than Safari (optional)
-
-Other:
-
-  Mandatory:
-    let g:TextileOS="Linux"
-    let g:TextileBrowser="/path/to/browser_bin"
-
-
-==============================================================================
-CREDITS                                                      *textile-credits* 
-
-- "Dominic Mitchell":http://happygiraffe.net/: initial syntax highlighting
-- "Aaron Bieber":http://blog.aaronbieber.com/: improved syntax highlighting 
-- "Tim Harper":http://tim.theenchanter.com/  : improved syntax highlighting,
-                                                plugin
-
-vim:tw=78:noet:wrap:ts=2:expandtab:ft=help:norl:
-
-endif
diff --git a/doc/vim-fsharp.txt b/doc/vim-fsharp.txt
deleted file mode 100644
index bc2a4657d..000000000
--- a/doc/vim-fsharp.txt
+++ /dev/null
@@ -1,210 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
-
-*vim-fsharp.txt* F# support for Vim
-*FSharp* *F#* *fsharp* *vim-fsharp*
-===============================================================================
-#                                                                             #
-#               ███████╗███████╗██╗  ██╗ █████╗ ██████╗ ██████╗               #
-#               ██╔════╝██╔════╝██║  ██║██╔══██╗██╔══██╗██╔══██╗              #
-#               █████╗  ███████╗███████║███████║██████╔╝██████╔╝              #
-#               ██╔══╝  ╚════██║██╔══██║██╔══██║██╔══██╗██╔═══╝               #
-#               ██║     ███████║██║  ██║██║  ██║██║  ██║██║                   #
-#               ╚═╝     ╚══════╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝  ╚═╝╚═╝                   #
-#                                                                             #
-===============================================================================
-CONTENTS                                                      *fsharp-contents*
-
-    1. Dependencies.................................|fsharp-dependencies|
-    2. Usage........................................|fsharp-usage|
-    3. Options......................................|fsharp-options|
-    4. Commands.....................................|fsharp-commands|
-    5. Mappings.....................................|fsharp-mappings|
-    6. Credits......................................|fsharp-credits|
-
-===============================================================================
-DEPENDENCIES                                              *fsharp-dependencies*
-
-Required:~
-    - Vim 7.3 or higher with Python 2 or 3 support
-    - Mono OR .NET Framework
-    - F#
-
-Optional:~
-    - Syntastic plugin (for syntax and type checking)
-    NOTE: Must be enabled (see |'g:syntastic_fsharp_checkers'|)
-
-===============================================================================
-USAGE                                                            *fsharp-usage*
-
-Syntax highlighting and linting will trigger upon opening a `*.fs`, `*.fsi`,
-or `*.fsx` file. Using omni completion will begin the fsautocomplete process.
-
-Suggestion: Install a completer such as NeoComplete or SuperTab
-
-===============================================================================
-OPTIONS                                                        *fsharp-options*
-
-                                                *'g:syntastic_fsharp_checkers'*
-Use this option to enable syntastic integration >
-    let g:syntastic_fsharp_checkers=['syntax']
-<
-                                        *'g:fsharp_only_check_errors_on_write'*
-Use this option to disable "on the fly" syntax checking >
-    let g:fsharp_only_check_errors_on_write = 1
-<
-                                                      *'g:fsharpbinding_debug'*
-Use this option to enable debug-mode and inspect fsautocomplete behavior: >
-    let g:fsharpbinding_debug = 1
-<
-This will create two log files `log.txt` and `log2.txt` in your temporary folder
-(i.e. `/tmp/`)
-
-                                                       *'g:fsharp_xbuild_path'*
-Use this option set the msbuild/xbuild path >
-    let g:fsharp_xbuild_path = "/path/to/xbuild/or/msbuild"
-<
-
-                                                       *'g:fsharp_test_runner'*
-Use this option to point to a suitable test runner (such as nunit-console.exe) >
-    let g:fsharp_test_runner = "/path/to/test/runner"
-<
-
-                                               *'g:fsharp_completion_helptext'*
-Use this option to disable helptext during auto completion. Turn off if
-completion is too slow >
-    let g:fsharp_completion_helptext = 0
-<
-
-                                                          *'g:fsharp_map_keys'*
-Use this option to disable default bindings >
-    let g:fsharp_map_keys = 0
-<
-
-                                                        *'g:fsharp_map_prefix'*
-Use this option to override the default prefix of `<leader>` >
-    let g:fsharp_map_prefix = 'cp'
-<
-Set to `cp` in this example
-
-                                                   *'g:fsharp_map_fsisendline'*
-Use this option to override the default mapping to send the current line to
-fsharp interactive >
-    let g:fsharp_map_fsisendline = 'p'
-<
-Set to `p` in this example
-
-                                                    *'g:fsharp_map_fsisendsel'*
-Use this option to override the default mapping to send the current selection
-to fsharp interactive >
-    let g:fsharp_map_fsisendsel = 'p'
-<
-Set to `p` in this example
-
-                                                      *'g:fsharp_map_gotodecl'*
-Use this option to override the default mapping to go to declaration in the
-current window >
-    let g:fsharp_map_gotodecl = 'g'
-<
-Set to `g` in this example
-
-                                                *'g:fsharp_map_gobackfromdecl'*
-Use this option to override the default mapping to go back to where go to
-declaration was triggered >
-    let g:fsharp_map_gobackfromdecl = 'b'
-<
-Set to `b` in this example
-
-                                                      *'g:fsharp_map_fsiinput'*
-Override the default mapping to evaluate an fsharp expression in the fsi >
-    let g:fsharp_map_fsiinput = 'i'
-<
-
-===============================================================================
-COMMANDS                                                      *fsharp-commands*
-
-General commands:~
-                                                                        *:make*
-:make
-    Calls xbuild on the fsproj for the current file (if any).
-
-                                                          *:FSharpParseProject*
-:FSharpParseProject
-    Reparses all the project files and dependencies (this is done automatically
-    when opening a .fs or .fsi file).
-
-                                                          *:FSharpBuildProject*
-:FSharpBuildProject
-    Calls xbuild on the fsproj for the current file (if any). Can also take a
-    path to the proj file to build.
-
-                                                            *:FSharpRunProject*
-:FSharpRunProject
-    Runs the project for the current file (if any).
-
-                                                              *:FSharpRunTests*
-:FSharpRunTests
-    If `g:fsharp_test_runner` is set it will build the current project and run
-    any tests. (Currently only tested with nunit-console.exe)
-
-                                                        *:FSharpToggleHelptext*
-:FSharpToggleHelptext
-    toggles g:fsharp_completion_helptext. (See below for details)
-
-FSharp interaction commands:~
-
-                                                                     `:FsiEval`
-:FsiEval
-    Evaluates an fsharp expression in the fsi
-
-                                                               `:FsiEvalBuffer`
-:FsiEvalBuffer
-    Evaluates the entire buffer in the fsi
-
-                                                                    `:FsiReset`
-:FsiReset
-    Resets the current fsharp interactive
-
-                                                                     `:FsiRead`
-:FsiRead
-    Outputs any lines written by the fsi but not yet output as vim messages
-
-                                                                    `:FsiClear`
-:FsiClear
-    Deletes all text from the fsi output buffer but doesn't reset the fsi
-    session.
-
-                                                                     `:FsiShow`
-:FsiShow
-    Opens the _fsi-out_ buffer in a split window
-
-===============================================================================
-MAPPINGS                                                      *fsharp-mappings*
-
-General:~
-
-    <leader>t
-        Echoes the type of the expression currently pointed to by the cursor
-    <leader>d
-        Go to declaration in current window
-    <leader>s
-        Takes you back from where go to declaration was triggered. Experimental
-
-FSharp Interactive:~
-    <A-CR>      OR
-    <leader>i
-        Send either the current selection or the current line to the fsharp
-        interactive and echoes the output the first line of the output. All
-        output will be written to the fsi-out buffer.
-
-===============================================================================
-CREDITS                                                        *fsharp-credits*
-
-Syntax and indent files by kongo2002 <github.com/kongo2002>:
- http://github.com/kongo2002/fsharp-vim
-
-Adapted from Tim Robinson <github.com/timrobinson>:
- http://github.com/timrobinson/fsharp-vim
->
-===============================================================================
-
-endif
diff --git a/doc/vim-go.txt b/doc/vim-go.txt
deleted file mode 100644
index dbb6af1f6..000000000
--- a/doc/vim-go.txt
+++ /dev/null
@@ -1,2855 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-
-*vim-go.txt* Go development plugin
-*vim-go*
-
-==============================================================================
-#                                                                            #
-#             ##     ## #### ##     ##          ######    #######            #
-#             ##     ##  ##  ###   ###         ##    ##  ##     ##           #
-#             ##     ##  ##  #### ####         ##        ##     ##           #
-#             ##     ##  ##  ## ### ## ####### ##   #### ##     ##           #
-#              ##   ##   ##  ##     ##         ##    ##  ##     ##           #
-#               ## ##    ##  ##     ##         ##    ##  ##     ##           #
-#                ###    #### ##     ##          ######    #######            #
-#                                                                            #
-==============================================================================
-CONTENTS                                                         *go-contents*
-
-  1. Intro........................................|go-intro|
-  2. Install......................................|go-install|
-  3. Commands.....................................|go-commands|
-  4. Mappings.....................................|go-mappings|
-  5. Text Objects.................................|go-text-objects|
-  6. Functions....................................|go-functions|
-  7. Settings.....................................|go-settings|
-  8. Syntax highlighting..........................|go-syntax|
-  9. Debugger.....................................|go-debug|
- 10. FAQ/Troubleshooting..........................|go-troubleshooting|
- 11. Development..................................|go-development|
- 12. Donation.....................................|go-donation|
- 13. Credits......................................|go-credits|
-
-==============================================================================
-INTRO                                                               *go-intro*
-
-Go (golang) support for Vim. vim-go comes with sensible predefined settings
-(e.g. automatic `gofmt` on save), has code completion, snippet support,
-improved syntax highlighting, go toolchain commands, etc. It is highly
-customizable, and individual features can be toggled easily. vim-go leverages
-a number of tools developed by the Go community to provide a seamless Vim
-experience.
-
-  * Compile your package with |:GoBuild|, install it with |:GoInstall| or
-    test it with |:GoTest|. Run a single test with |:GoTestFunc|).
-  * Quickly execute your current file(s) with |:GoRun|.
-  * Improved syntax highlighting and folding.
-  * Debug programs with integrated `delve` support with |:GoDebugStart|.
-  * Code completion support via `gocode` and `gopls`.
-  * `gofmt` or `goimports` on save keeps the cursor position and undo history.
-  * Go to symbol/declaration with |:GoDef|.
-  * Look up documentation with |:GoDoc| or |:GoDocBrowser|.
-  * Easily import packages via |:GoImport|, remove them via |:GoDrop|.
-  * Precise type-safe renaming of identifiers with |:GoRename|.
-  * See which code is covered by tests with |:GoCoverage|.
-  * Add or remove tags on struct fields with |:GoAddTags| and |:GoRemoveTags|.
-  * Call `golangci-lint` with |:GoMetaLinter| to invoke all possible linters
-    (`golint`, `vet`, `errcheck`, `deadcode`, etc.) and put the result in the
-    quickfix or location list.
-  * Lint your code with |:GoLint|, run your code through |:GoVet| to catch
-    static errors, or make sure errors are checked with |:GoErrCheck|.
-  * Advanced source analysis tools utilizing `guru`, such as |:GoImplements|,
-    |:GoCallees|, and |:GoReferrers|.
-  * Automatic `GOPATH` detection which works with `gb` and `godep`. Change or
-    display `GOPATH` with |:GoPath|.
-  * Integrated and improved snippets, supporting `ultisnips`, `neosnippet`,
-    and `vim-minisnip`.
-  * Share your current code to play.golang.org with |:GoPlay|.
-  * On-the-fly information about the word under the cursor. Plug it into your
-    custom Vim function.
-  * Text objects such as "a function" (|go-af|) or "inner function" (|go-if|).
-  * Most commands are run asynchronous in Neovim and Vim 8. Fully async
-    building and testing.
-  * Integrated with the Neovim terminal, launch |:GoRun| and other Go commands
-    in a terminal buffer.
-  * Switch between `file.go` and `file_test.go` code with |:GoAlternate|.
-  * Supports integration with the Tagbar and ctrlp.vim plugins.
-  * ...and more...
-
-==============================================================================
-INSTALL                                                           *go-install*
-
-vim-go requires at least Vim 8.0.1453 or Neovim 0.4.0. On macOS, if you are
-still using your system version of vim, you can use homebrew to keep your
-version of Vim up-to-date with the following terminal command:
->
-  brew install vim
-
-The latest stable release, https://github.com/fatih/vim-go/releases/latest, is
-the recommended version to use. If you choose to use the master branch
-instead, please do so with caution; it is a _development_ branch.
-
-vim-go follows the standard runtime path structure and should work with any of
-the major plugin managers.
-
-For Pathogen or Vim |packages|, just clone the repo. For other plugin managers
-you may also need to add the lines to your vimrc to execute the plugin
-manager's install command.
-
-*  Vim 8 |packages| >
-
-    git clone https://github.com/fatih/vim-go.git \
-      ~/.vim/pack/plugins/start/vim-go
-<
-*  https://github.com/tpope/vim-pathogen >
-
-    git clone https://github.com/fatih/vim-go.git ~/.vim/bundle/vim-go
-<
-*  https://github.com/junegunn/vim-plug >
-
-    Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
-<
-*  https://github.com/Shougo/neobundle.vim >
-
-    NeoBundle 'fatih/vim-go'
-<
-*  https://github.com/gmarik/vundle >
-
-    Plugin 'fatih/vim-go'
-<
-*  Manual (not recommended) >
-
-    Copy all of the files into your `~/.vim` directory
-<
-
-You will also need to install all the necessary binaries. vim-go makes it easy
-to install all of them by providing a command, |:GoInstallBinaries|, to
-`go get` all the required binaries. The binaries will be installed to $GOBIN
-or $GOPATH/bin (default: $HOME/go/bin). It requires `git`.
-
-Depending on your installation method, you may have to generate the plugin's
-|:helptags| manually (e.g. `:helptags ALL`).
-
-Code completion is enabled by default via 'omnifunc', which you can trigger
-with |i_CTRL-X_CTRL-O| (`<C-x><C-o>`).
-
-Supported Go plugins~                                         *vim-go-plugins*
-
-The following plugins are supported for use with vim-go:
-
-* Real-time completion (Vim):
-  https://github.com/Shougo/neocomplete.vim
-
-* Real-time completion (Neovim and Vim 8):
-  https://github.com/Shougo/deoplete.nvim
-
-  Add the following line to your vimrc. This instructs deoplete to use omni
-  completion for Go files.
-
-    call deoplete#custom#option('omni_patterns', { 'go': '[^. *\t]\.\w*' })
-
-* Display source code navigation in a sidebar:
-  https://github.com/majutsushi/tagbar
-
-* Snippets:
-  https://github.com/Shougo/neosnippet.vim or
-  https://github.com/SirVer/ultisnips or
-  https://github.com/joereynolds/vim-minisnip
-
-* Interactive |:GoDecls| and |:GoDeclsDir|:
-  https://github.com/ctrlpvim/ctrlp.vim or
-  https://github.com/junegunn/fzf.vim or
-  https://github.com/Shougo/unite.vim or
-  https://github.com/Shougo/denite.nvim
-
-==============================================================================
-COMMANDS                                                         *go-commands*
-
-                                                        *:GoReportGitHubIssue*
-:GoReportGitHubIssue
-    GoReportGitHubIssue opens the default browser and starts a new bug report
-    with useful system information.
-
-                                                                     *:GoPath*
-:GoPath [path]
-
-    GoPath sets and overrides GOPATH with the given {path}. If no {path} is
-    given it shows the current GOPATH. If `""` is given as path, it clears
-    current `GOPATH` which was set with |:GoPath| and restores `GOPATH` back
-    to the initial value which was sourced when Vim was started.
-
-                                                                   *:GoImport*
-:GoImport[!] [path]
-
-    Import ensures that the provided package {path} is imported in the current
-    Go buffer, using proper style and ordering. If {path} is already being
-    imported, an error will be displayed and the buffer will be untouched.
-
-    If [!] is given it will download the package with `go get`
-
-                                                                 *:GoImportAs*
-:GoImportAs [localname] [path]
-
-    Same as Import, but uses a custom local name for the package.
-
-                                                                     *:GoDrop*
-:GoDrop [path]
-
-    Remove the import line for the provided package {path}, if present in the
-    current Go buffer.  If {path} is not being imported, an error will be
-    displayed and the buffer will be untouched.
-
-                                                                     *:GoLint*
-:GoLint! [packages]
-
-    Run golint for the directory under your current file, or for the given
-    packages.
-
-    If [!] is not given the first error is jumped to.
-
-                                                                      *:GoDoc*
-:GoDoc [word]
-
-    Open the relevant GoDoc in split window for either the word[s] passed to
-    the command or by default, the word under the cursor.
-
-                                                               *:GoDocBrowser*
-:GoDocBrowser [word]
-
-    Open the relevant GoDoc in browser for either the word[s] passed to the
-    command or by default, the word under the cursor. By default it opens the
-    documentation in 'https://pkg.go.dev'. To change it see |'g:go_doc_url'|.
-
-                                                                      *:GoFmt*
-:GoFmt
-
-    Filter the current Go buffer through gofmt.  It tries to preserve cursor
-    position and avoids replacing the buffer with stderr output.
-
-                                                                  *:GoImports*
-:GoImports
-
-    Filter the current Go buffer through goimports (needs to be installed).
-    `goimports` automatically discards/add import path based on the code. Like
-    |:GoFmt|, It tries to preserve cursor position and avoids replacing the
-    buffer with stderr output.
-
-                                                                     *:GoPlay*
-:[range]GoPlay
-
-    Share snippet to play.golang.org. If no [range] is given it shares
-    the whole file, otherwise the selected lines are shared. Snippet URL
-    is copied to system clipboard if Vim is compiled with 'clipboard' or
-     'xterm-clipboard' otherwise it's get yanked into the `""` register.
-
-                                                                      *:GoVet*
-:GoVet[!] [options]
-
-    Run `go vet` for the directory under your current file. Vet examines Go
-    source code and reports suspicious constructs, such as Printf calls whose
-    arguments do not align with the format string. Vet uses heuristics that do
-    not guarantee all reports are genuine problems, but it can find errors not
-    caught by the compilers.
-
-    You may optionally pass any valid go vet flags/options.
-
-    If [!] is not given the first error is jumped to.
-
-                                                                      *:GoDef*
-:GoDef
-gd
-CTRL-]
-g<C-LeftMouse>
-<C-LeftMouse>
-
-    Go to declaration/definition for the identifier under the cursor. By
-    default the CTRL-] shortcut, the mapping `gd` and <C-LeftMouse>,
-    g<LeftMouse> are enabled to invoke :GoDef for the identifier under the
-    cursor. See |'g:go_def_mapping_enabled'| to disable them. No explicit
-    arguments are supported.
-
-    vim-go also keeps a per-window location stack, roughly analogous to how
-    Vim's internal |tags| functionality works. This is pushed to every time a
-    jump is made using the GoDef functionality. In essence, this is a LIFO
-    list of file locations you have visited with :GoDef that is retained to
-    help you navigate software.
-
-    The per-window location stack is shared with |:GoDefType|.
-
-                                                                  *:GoDefType*
-:GoDefType
-
-    Go to type definition for the identifier under the cursor.
-
-    The per-window location stack is shared with |:GoDef|.
-                                                                 *:GoDefStack*
-:GoDefStack [number]
-
-    This command Jumps to a given location in the jumpstack, retaining all
-    other entries. Jumps to non-existent entries will print an informative
-    message, but are otherwise a noop.
-
-    If no argument is given, it will print out an interactive list of all
-    items in the stack. Its output looks like this:
-
-      1 /path/first/file.go|1187 col 16|AddThing func(t *Thing)
-    > 2 /path/thing/thing.go|624 col 19|String() string
-      3 /path/thing/thing.go|744 col 6|func Sprintln(a ...interface{}) string
-
-    This list shows the identifiers that you jumped to and the file and cursor
-    position before that jump.  The older jumps are at the top, the newer at
-    the bottom.
-
-    The '>' points to the active entry.  This entry and any newer entries
-    below it will be replaced if |:GoDef| is done from this location. The
-    CTRL-t and |:GoDefPop| command will jump to the position above the active
-    entry.
-
-    Jumps to non-existent entries will print an informative message, but are
-    otherwise a noop.
-
-                                                            *:GoDefStackClear*
-:GoDefStackClear
-
-    Clears the current stack list and resets it.
-
-                                                                   *:GoDefPop*
-:GoDefPop [count]
-CTRL-t
-
-    Navigate to the [count] earlier entry in the jump stack, retaining the
-    newer entries. If no argument is given, it will jump to the next most
-    recent entry (`:GoDefPop 1`).  If [count] is greater than the number of
-    prior entries, an error will be printed and no jump will be performed.
-
-    If you have used :GoDefPop to jump to an earlier location, and you issue
-    another :GoDef command, the current entry will be replaced, and all newer
-    entries will be removed, effectively resuming the stack at that location.
-
-    By default [count]CTRL-t is enabled to invoke :GoDefPop.  Similarly,
-    hitting CTRL-t without a prior count is equivalent to `:GoDefPop 1`.  See
-    |'g:go_def_mapping_enabled'| to disable this.
-
-                                                                      *:GoRun*
-:GoRun[!] [expand]
-
-    Build and run your current main package. By default all main files for the
-    current file is used. If an argument is passed, [expand] is used as file
-    selector. For example use `:GoRun %` to select the current file only.
-
-    You may optionally pass any valid go run flags/options. For a full list
-    please see `go help run`.
-
-    If [!] is not given the first error is jumped to.
-
-    If using neovim then `:GoRun` will run in a new terminal according to
-    |'g:go_term_mode'|.
-
-    The working directory will be the directory containing the current buffer.
-
-
-                                                                    *:GoBuild*
-:GoBuild[!] [expand]
-
-    Build your package with `go build`. Errors are populated in the quickfix
-    window. It automatically builds only the files that depends on the current
-    file. `:GoBuild` doesn't produce a result file.
-    Use |:make| to create a result file.
-
-    You may optionally pass any valid go build flags/options. For a full list
-    please see `go help build`. Options are expanded with [expand].
-
-    If [!] is not given the first error is jumped to.
-
-    If using neovim then this command is fully async, it does not block the
-    UI.
-
-                                                                 *:GoGenerate*
-:GoGenerate[!] [expand]
-
-    Creates or updates your auto-generated source files by running `go
-    generate`.
-
-    You may optionally pass any valid go generate flags/options. For a full
-    list please see `go help generate`. Options are expanded with [expand].
-
-    If [!] is not given the first error is jumped to.
-
-                                                                     *:GoInfo*
-:GoInfo
-    Show type information about the identifier under the cursor. For example
-    putting it above a function call is going to show the full function
-    signature. By default it uses `gopls` to get the type informations. To
-    change the underlying tool from `gopls` to another tool, see
-    |'g:go_info_mode'|.
-
-
-                                                                  *:GoInstall*
-:GoInstall[!] [options]
-
-    Install your package with `go install`.
-
-    You may optionally pass any valid go install flags/options. For a full
-    list please see `go help install`.
-
-    If [!] is not given the first error is jumped to.
-
-                                                                     *:GoTest*
-:GoTest[!] [expand]
-
-    Run the tests on your _test.go files via in your current directory. Errors
-    are populated in the quickfix window.  If an argument is passed, [expand]
-    is used as file selector (useful for cases like `:GoTest ./...`).
-
-    You may optionally pass any valid go test flags/options. For a full list
-    please see `go help test`.
-
-    GoTest times out automatically after 10 seconds. To customize the timeout
-    use |'g:go_test_timeout'|. This feature is disabled if any arguments are
-    passed to the `:GoTest` command.
-
-    If [!] is not given the first error is jumped to.
-
-    If using neovim `:GoTest` will run in a new terminal or run asynchronously
-    in the background according to |'g:go_term_enabled'|. You can set the mode
-    of the new terminal with |'g:go_term_mode'|.
-
-                                                                 *:GoTestFunc*
-:GoTestFunc[!] [expand]
-
-    Runs :GoTest, but only on the single test function immediate to your
-    cursor using 'go test's '-run' flag.
-
-    Lookup is done starting at the cursor (including that line) moving up till
-    a matching `func Test` pattern is found or top of file is reached. Search
-    will not wrap around when at the top of the file.
-
-    If [!] is not given the first error is jumped to.
-
-                                                              *:GoTestCompile*
-:GoTestCompile[!] [expand]
-
-    Compile your _test.go files via in your current directory. Errors are
-    populated in the quickfix window.  If an argument is passed, [expand] is
-    used as file selector (useful for cases like `:GoTest ./...`). Useful to
-    not run the tests and capture/fix errors before running the tests or to
-    create test binary.
-
-    If [!] is not given the first error is jumped to.
-
-                                                                 *:GoCoverage*
-:GoCoverage[!] [options]
-
-    Create a coverage profile and annotates the current file's source code. If
-    called again it rerurns the tests.
-
-    If [!] is not given the first error is jumped to.
-
-                                                           *:GoCoverageToggle*
-:GoCoverageToggle[!] [options]
-
-    Create a coverage profile and annotates the current file's source code. If
-    called again clears the annotation (works as a toggle).
-
-    If [!] is not given the first error is jumped to.
-
-                                                            *:GoCoverageClear*
-:GoCoverageClear [options]
-
-   Clears the coverage annotation.
-
-
-                                                          *:GoCoverageBrowser*
-:GoCoverageBrowser[!] [options]
-
-    Create a coverage profile and open a browser to display the annotated
-    source code of the current package.
-
-    You may optionally pass any valid go test flags/options, such as
-    `-covermode set,count,atomic`. For a full list please see `go help test`.
-
-    If [!] is not given the first error is jumped to.
-
-                                                                 *:GoErrCheck*
-:GoErrCheck! [options]
-
-    Check for unchecked errors in you current package. Errors are populated in
-    the quickfix window.
-
-    You may optionally pass any valid errcheck flags/options. See
-    `errcheck -h` for a full list.
-
-    If [!] is not given the first error is jumped to.
-
-                                                                    *:GoFiles*
-:GoFiles [source_files]
-
-    Show source files for the current package. The [source_files] specifies
-    which file types to list. See the "// Source files" section of
-    `go list -h` for possible values; multiple values are accepted.
-    Command-line completion also works for this command.
-    The default is to use `GoFiles` if no arguments are given.
-
-                                                                     *:GoDeps*
-:GoDeps
-
-    Show dependencies for the current package.
-
-                                                          *:GoInstallBinaries*
-:GoInstallBinaries [binaries]
-
-    Download and install all necessary Go tool binaries such as `godef`,
-    `goimports`, `gopls`, etc. under |'g:go_bin_path'|. If [binaries] is
-    supplied, then only the specified binaries will be installed. The default
-    is to install everything.
-
-    Set |'g:go_get_update'| to disable updating dependencies.
-
-                                                           *:GoUpdateBinaries*
-:GoUpdateBinaries [binaries]
-
-    Download and update previously installed Go tool binaries such as `godef`,
-    `goimports`, `gopls`, etc. under |'g:go_bin_path'|. If [binaries] is
-    supplied, then only the specified binaries will be updated. The default is
-    to update everything.
-
-    Set |'g:go_get_update'| to disable updating dependencies.
-
-                                                               *:GoImplements*
-:GoImplements
-
-    Show "implements" relation for a selected package. A list of interfaces
-    for the type that implements an interface under the cursor (or selected
-    package) is shown in a location list.
-                                                                   *:GoRename*
-:GoRename[!] [to]
-
-    Rename the identifier under the cursor to the desired new name. If no
-    argument is given a prompt will ask for the desired identifier.
-
-    If [!] is not given the first error is jumped to.
-
-
-                                                                *:GoGuruScope*
-:GoGuruScope [pattern] ...
-
-    Changes the custom |'g:go_guru_scope'| setting and overrides it with the
-    given package patterns. The custom scope is cleared (unset) if `""` is
-    given as the only path. If no arguments is given it prints the current
-    custom scope. Example patterns are:
->
-      golang.org/x/tools/cmd/guru # a single package
-      golang.org/x/tools/...      # all packages beneath dir
-      ...                         # the entire workspace.
-<
-    Example usage, the following sets the scope to a `github.com/fatih/color`
-    and to all packages under `golang.org/x/tools/`:
->
-      :GoGuruScope github.com/fatih/color golang.org/x/tools/...
-<
-    The following sets it to the entire workspace:
->
-      :GoGuruScope ...
-<
-    Under the hood, the patterns are all joined to a comma-separated list and
-    passed to `guru`'s `-scope` flag.
-
-    Also see |go-guru-scope|.
-
-                                                                  *:GoCallees*
-:GoCallees
-
-    Show "callees" relation for a selected package. A list of possible call
-    targets for the type under the cursor (or selected package) is shown in a
-    location list.
-
-                                                                  *:GoCallers*
-:GoCallers
-
-    Show "callers" relation for a selected function. A list of possible
-    callers for the selected function under the cursor is shown in a location
-    list.
-
-                                                                 *:GoDescribe*
-:GoDescribe
-
-    Shows various properties of the selected syntax: its syntactic kind, its
-    type (for an expression), its value (for a constant expression), its size,
-    alignment, method set and interfaces (for a type), its declaration (for an
-    identifier), etc. Almost any piece of syntax may be described, and the
-    guru will try to print all the useful information it can.
-
-                                                                *:GoCallstack*
-:GoCallstack
-
-    Shows "callstack" relation for the selected function. An arbitrary path
-    from the root of the callgraph to the selected function is shown in a
-    location list. This may be useful to understand how the function is
-    reached in a given program.
-
-                                                                 *:GoFreevars*
-:GoFreevars
-
-    Enumerates the free variables of the selection. "Free variables" is a
-    technical term meaning the set of variables that are referenced but not
-    defined within the selection, or loosely speaking, its inputs.
-
-    This information is useful when considering whether to refactor the
-    selection into a function of its own, as the free variables would be the
-    necessary parameters of that function. It's also useful when you want to
-    understand what the inputs are to a complex block of code even if you
-    don’t plan to change it.
-
-                                                             *:GoChannelPeers*
-:GoChannelPeers
-
-    Shows the set of possible sends/receives on the channel operand of the
-    selected send or receive operation; the selection must be a `<-` token.
-
-    For example, visually select a channel operand in the form of:
->
-      done <- true
-<
-    And call |:GoChannelPeers| on it. It will show where it was allocated, and
-    the sending and receiving endings.
-
-                                                                *:GoReferrers*
-:GoReferrers
-
-    The referrers query shows the set of identifiers that refer to the same
-    object as does the selected identifier.
-
-                                                                  *:GoSameIds*
-:GoSameIds
-
-    Highlights all identifiers that are equivalent to the identifier under the
-    cursor.
-
-                                                             *:GoSameIdsClear*
-:GoSameIdsClear
-
-    Clears all SameIds highlights from a |:GoSameIds| call.
-
-                                                            *:GoSameIdsToggle*
-:GoSameIdsToggle
-
-    Toggle between |:GoSameIds| and |:GoSameIdsClear|.
-
-                                                        *:GoSameIdsAutoToggle*
-:GoSameIdsAutoToggle
-
-    Enables or disables automatic highlighting of |:GoSameIds| while moving
-    the cursor. This basically toggles the option |'g:go_auto_sameids'|
-    on/off.
-    If enabled it starts highlighting whenever your cursor is staying at the
-    same position for a configurable period of time (see |'g:go_updatetime'|).
-    If disabled it clears and stops automatic highlighting.
-
-                                                               *:GoMetaLinter*
-:GoMetaLinter! [path]
-
-    Calls the underlying `golangci-lint` tool and displays all warnings and
-    errors in the |quickfix| window. By default the following linters are
-    enabled: `vet`, `golint`, and `errcheck`. This can be changed with the
-    |'g:go_metalinter_enabled'| variable. To override the command completely
-    use the variable |'g:go_metalinter_command'|. To override the maximum
-    linters execution time use |'g:go_metalinter_deadline'| variable.
-
-    If [!] is not given the first error is jumped to.
-
-                                                              *:GoDiagnostics*
-:GoDiagnostics! [packages]
-
-    Displays the diagnostics from `gopls` for the given packages in a
-    |quickfix| window. The diagnostics for the current package are displayed
-    when no package is given. The diagnostics for all packages will be
-    displayed when `all` is as an argument.
-
-    Disabled when |'g:go_diagnostics_enabled'| is not set.
-
-    If [!] is not given the first error is jumped to.
-
-                                                                *:GoBuildTags*
-:GoBuildTags [tags]
-
-    Changes the build tags for various commands. If you have any file that
-    uses a custom build tag, such as `// +build integration` , this command
-    can be used to pass it to all tools that accepts tags, such as gopls,
-    guru, gorename, etc.
-
-    The build tags is cleared (unset) if `""` is given. If no arguments are
-    given it prints the current build tags.
-
-                                                                     *:AsmFmt*
-:AsmFmt
-
-    Filter the current Go asm buffer through asmfmt. It tries to preserve
-    cursor position and avoids replacing the buffer with stderr output.
-
-                                                                *:GoAlternate*
-:GoAlternate[!]
-
-    Alternates between the implementation and test code. For example if in
-    main.go, switch to main_test.go. Uses the |'g:go_alternate_mode'| setting
-    as the command to open the file.
-
-    If [!] is given then it switches to the new file even if it does not
-    exist.
-
-    If you would like to override the traditional commands for alternating,
-    add the following to your .vimrc:
->
-    augroup go
-      autocmd!
-      autocmd Filetype go
-        \  command! -bang A call go#alternate#Switch(<bang>0, 'edit')
-        \| command! -bang AV call go#alternate#Switch(<bang>0, 'vsplit')
-        \| command! -bang AS call go#alternate#Switch(<bang>0, 'split')
-    augroup END
-<
-
-                                                                 *:GoPointsTo*
-:GoPointsTo
-
-    Show all variables to which the pointer under the cursor may point to.
-
-                                                                *:GoWhicherrs*
-:GoWhicherrs
-
-    Show the list of possible constants, global variables, and concrete types
-    for the error type under the cursor in a location list.
-
-                                                                    *:GoDecls*
-:GoDecls [file]
-
-    Show all function and type declarations for the current file. If
-    [file] is non empty it parses the given file.
-    Requires `ctrlp.vim` or `fzf`; it will autodetect the plugin if installed,
-    but you can use |'g:go_decls_mode'| to force using one or the other.
-    By default `type` and `func` declarations are shown. This can be changed
-    via |'g:go_decls_includes'|. Also see |unite-decls|, |denite-decls|.
-
-                                                                 *:GoDeclsDir*
-:GoDeclsDir [dir]
-
-    Show all function and type declarations for the current directory. If
-    [dir] is given it parses the given directory.
-
-                                                                 *unite-decls*
-                                                                *denite-decls*
-:Unite decls[:path]
-:Denite decls[:path]
-
-    Only enabled if `unite.vim` or `denite.nvim` is installed. Show
-    declarations for all functions and types on the current file or directory
-    or for [path] if given.
-
-    Note: `denite.nvim` requires NeoVim or Vim 8 with |:python3| enabled.
->
-    " show declarations on the parent directory of the current file
-    :Unite decls
-    :Denite decls
-
-    " show declarations in the file.
-    :Unite decls:foo/bar.go
-    :Denite decls:foo/bar.go
-
-    " show declarations in the directory "foo".
-    :Unite decls:foo
-    :Denite decls:foo
-<
-                                                                     *:GoImpl*
-:GoImpl [receiver] [interface]
-
-    Generates method stubs for implementing an interface. If no arguments is
-    passed it takes the identifier under the cursor to be the receiver and
-    asks for the interface type to be generated. If used with arguments, the
-    receiver and the interface needs to be specified. Example usages:
->
-      :GoImpl f *Foo io.Writer
-      :GoImpl t Type io.ReadWriteCloser
-<
-                                                                  *:GoAddTags*
-:[range]GoAddTags [key],[option] [key1],[option] ...
-
-    Adds field tags for the fields of a struct. If called inside a struct it
-    automatically add field tags with the `json` key and the value
-    automatically generated based on the field name. An error message is given
-    if it's called outside a struct definition or if the file is not correctly
-    formatted.
-
-    If [range] is given, only the selected fields will be changed.
-
-    The default `json` can be changed by providing one or more [key]
-    arguments. An example of adding `xml` and `db` would be:
->
-      :GoAddTags xml db
-<
-    If [option] is passed it'll either add a new tag with an option or will
-    modify existing tags. An example of adding `omitempty` to all `json`
-    fields would be:
->
-      :GoAddTags json,omitempty
-<
-    You can define a constant value instead of the default field based value.
-    For example the following command will add ``valid:"1"`` to all fields.
->
-      :GoAddTags valid:1
-<
-                                                               *:GoRemoveTags*
-:[range]GoRemoveTags [key],[option] [key1],[option1] ...
-
-    Remove field tags for the fields of a struct. If called inside a struct it
-    automatically remove all field tags. An error message is given if it's
-    called outside a struct definition or if the file is not correctly
-    formatted
-
-    If [range] is given, only the selected fields will be changed.
-
-    If [key] is given, it will only remove those keys. Example:
->
-      :GoRemoveTags json
-<
-    If [option] is passed with a [key], it will only remove the options.
-    Example, this will only remove `omitempty` options from fields containing
-    `json`:
->
-      :GoRemoveTags json,omitempty
-<
-                                                       *:GoAutoTypeInfoToggle*
-:GoAutoTypeInfoToggle
-
-    Toggles |'g:go_auto_type_info'|.
-
-                                                        *:GoFmtAutoSaveToggle*
-:GoFmtAutoSaveToggle
-
-    Toggles |'g:go_fmt_autosave'|.
-
-                                                     *:GoModFmtAutoSaveToggle*
-:GoModFmtAutoSaveToggle
-
-    Toggles |'g:go_mod_fmt_autosave'|.
-
-                                                     *:GoAsmFmtAutoSaveToggle*
-:GoAsmFmtAutoSaveToggle
-
-    Toggles |'g:go_asmfmt_autosave'|.
-
-                                                 *:GoMetaLinterAutoSaveToggle*
-:GoMetaLinterAutoSaveToggle
-
-    Toggles |'g:go_metalinter_autosave'|.
-
-    By default, `golangci-lint` messages will be shown in the |location-list|
-    window. The list to use can be set using |'g:go_list_type_commands'|.
-
-                                                 *:GoTemplateAutoCreateToggle*
-:GoTemplateAutoCreateToggle
-
-    Toggles |'g:go_template_autocreate'|.
-
-                                                               *:GoKeyify*
-:GoKeyify
-
-    Uses `keyify` to turn unkeyed struct literals into keyed ones.
-
-    For example:
->
-      Person{"John", "Smith"}
-<
-    Becomes:
->
-      Person{
-        Name: "John",
-        Surname: "Smith",
-      }
-<
-                                                               *:GoFillStruct*
-:GoFillStruct
-
-    Use `fillstruct` to fill a struct literal with default values. Existing
-    values (if any) are preserved. The cursor must be on the struct you wish
-    to fill.
-
-    For example:
->
-      addr := net.Address{Name: "Ford Prefect"}
-<
-    Becomes:
->
-      addr := net.Address{
-        Name: "Ford Prefect",
-        Email: "",
-      }
-<
-
-                                                                    *:GoIfErr*
-:GoIfErr
-
-    Generate if err != nil { return ... } automatically which infer the type
-    of return values and the numbers.
-
-    For example:
->
-      func doSomething() (string, error) {
-          f, err := os.Open("file")
-      }
-<
-    Becomes:
->
-      func doSomething() (string, error) {
-          f, err := os.Open("file")
-          if err != nil {
-              return "", err
-          }
-      }
-<
-                                                                  *:GoModFmt*
-:GoModFmt
-
-    Filter the current go.mod buffer through "go mod edit -fmt" command.  It
-    tries to preserve cursor position and avoids replacing the buffer with
-    stderr output.
-
-                                                            *:GoAddWorkspace*
-:GoAddWorkspace [dir] ...
-
-    Add directories to the `gopls` workspace.
-
-                                                         *:GoLSPDebugBrowser*
-:GoLSPDebugBrowser
-
-    Open a browser to see gopls debugging information.
-
-==============================================================================
-MAPPINGS                                                        *go-mappings*
-
-vim-go has several <Plug> keys which can be used to create custom mappings
-For example, to create a mapping that calls `go run` for the current package,
-create a mapping for the `(go-run)`: >
-
-  au FileType go nmap <leader>r <Plug>(go-run)
-
-As always one is free to create more advanced mappings or functions based with
-|go-commands|. For more information please check out the mappings command
-documentation in the |go-commands| section. Available <Plug> keys are:
-
-                                                                    *(go-run)*
-
-Calls `go run` for the current main package
-
-                                                                *(go-run-tab)*
-
-Calls `go run` for the current file in a new terminal tab
-This option is neovim only.
-
-                                                              *(go-run-split)*
-
-Calls `go run` for the current file in a new terminal horizontal split
-This option is neovim only.
-
-                                                           *(go-run-vertical)*
-
-Calls `go run` for the current file in a new terminal vertical split
-This option is neovim only.
-
-                                                                  *(go-build)*
-
-Calls `go build` for the current package
-
-                                                               *(go-generate)*
-
-Calls `go generate` for the current package
-
-                                                                   *(go-info)*
-
-Shows type information for the word under the cursor
-
-                                                                *(go-install)*
-
-Calls `go install` for the current package
-
-                                                                   *(go-test)*
-
-Calls `go test` for the current package
-
-                                                              *(go-test-func)*
-
-Calls `go test -run '...'` for the test function immediate to cursor
-
-                                                           *(go-test-compile)*
-
-Calls `go test -c` for the current package
-
-                                                               *(go-coverage)*
-
-Calls `go test -coverprofile-temp.out` for the current package and shows the
-coverage annotation.
-
-                                                         *(go-coverage-clear)*
-
-Clears the coverage annotation
-
-                                                        *(go-coverage-toggle)*
-
-Calls `go test -coverprofile-temp.out` for the current package and shows the
-coverage annotation. If run again it acts as a toggle and clears the
-annotation.
-
-                                                                *(go-imports)*
-
-Calls `goimports` for the current package
-
-                                                                   *(go-lint)*
-
-Calls `golint` for the current package
-
-                                                                    *(go-vet)*
-
-Calls `go vet` for the current package
-
-
-                                                                  *(go-files)*
-
-Show source files that depends for the current package
-
-
-                                                                   *(go-deps)*
-
-Show dependencies for the current package
-
-                                                                    *(go-doc)*
-
-Show the relevant GoDoc for the word under the cursor in a split window
-leftabove (default mode).
-
-                                                              *(go-doc-split)*
-
-Show the relevant GoDoc for the word under the cursor in a split window.
-
-
-                                                           *(go-doc-vertical)*
-
-Show the relevant GoDoc for the word under the cursor in a vertical split
-window.
-
-                                                                *(go-doc-tab)*
-
-Show the relevant GoDoc for the word under the cursor in a tab window.
-
-
-                                                            *(go-doc-browser)*
-
-Show the relevant GoDoc for the word under in browser
-
-                                                                    *(go-def)*
-
-Goto declaration/definition. Results are shown in the current window.
-
-                                                              *(go-def-split)*
-
-Goto declaration/definition. Results are shown in a split window.
-Jumps to an existing buffer if |'g:go_def_reuse_buffer'| is enabled.
-
-                                                           *(go-def-vertical)*
-
-Goto declaration/definition. Results are shown in a vertical split window.
-Jumps to an existing buffer if |'g:go_def_reuse_buffer'| is enabled.
-
-                                                                *(go-def-tab)*
-
-Goto declaration/definition. Results are shown in a tab window.
-Jumps to an existing buffer if |'g:go_def_reuse_buffer'| is enabled.
-
-                                                              *(go-def-type)*
-
-Goto type declaration/definition.  Results are shown in the current window.
-Jumps to an existing buffer if |'g:go_def_reuse_buffer'| is enabled.
-
-                                                     *(go-def-type-vertical)*
-Goto type declaration/definition. Results are shown in a vertical split
-window.
-Jumps to an existing buffer if |'g:go_def_reuse_buffer'| is enabled.
-
-                                                        *(go-def-type-split)*
-Goto type declaration/definition. Results are shown in a split window.
-Jumps to an existing buffer if |'g:go_def_reuse_buffer'| is enabled.
-
-                                                          *(go-def-type-tab)*
-Goto type declaration/definition. Results are shown in a tab window.
-Jumps to an existing buffer if |'g:go_def_reuse_buffer'| is enabled.
-
-                                                              *(go-def-stack)*
-
-Shows the godef tag stack
-
-                                                        *(go-def-stack-clear)*
-
-Resets and clears the tag stack
-
-                                                                *(go-def-pop)*
-
-Jump to previous entry in the tag stack
-
-                                                             *(go-implements)*
-
-Show the interfaces that the type under the cursor implements.
-
-                                                                 *(go-rename)*
-
-Rename the identifier under the cursor to the desired new name
-
-                                                                *(go-callees)*
-
-Show the call targets for the type under the cursor
-
-                                                                *(go-callers)*
-
-Show possible callers of selected function
-
-                                                               *(go-describe)*
-
-Describe selected syntax: definition, methods, etc
-
-                                                              *(go-callstack)*
-
-Show path from callgraph root to selected function
-
-                                                               *(go-freevars)*
-
-Show free variables of selection
-
-                                                           *(go-channelpeers)*
-
-Show send/receive corresponding to selected channel op
-
-                                                              *(go-referrers)*
-
-Show all refs to entity denoted by selected identifier
-
-                                                               *(go-pointsto)*
-
-Show all variables to which the pointer under the cursor may point to.
-
-                                                             *(go-metalinter)*
-
-Calls `go-metalinter` for the current directory
-
-                                                         *(go-alternate-edit)*
-
-Alternates between the implementation and test code in the current window
-
-                                                        *(go-alternate-split)*
-
-Alternates between the implementation and test code in a new horizontal split
-
-                                                     *(go-alternate-vertical)*
-
-Alternates between the implementation and test code in a new vertical split
-
-                                                                 *(go-import)*
-
-Calls `:GoImport` for the current package
-
-                                                                  *(go-iferr)*
-
-Generate if err != nil { return ... } automatically which infer the type of
-return values and the numbers.
-
-                                                                *(go-mod-fmt)*
-
-Calls |:GoModFmt| for the current buffer
-
-                                                            *(go-diagnostics)*
-Calls `:GoDiagnostics`
-
-==============================================================================
-TEXT OBJECTS                                                 *go-text-objects*
-
-vim-go comes with several custom |text-objects| that can be used to operate
-upon regions of text. vim-go currently defines the following text objects:
-
-                                               *go-v_af* *go-af*
-af            "a function", select contents from a function definition to the
-               closing bracket. If |'g:go_textobj_include_function_doc'| is
-               enabled it also includes the comment doc for a function
-               declaration. This text-object also supports literal functions.
-               If |'g:go_textobj_include_variable'| is enabled it also
-               includes the variable of an function assignment
-
-                                               *go-v_if* *go-if*
-if            "inside a function", select contents of a function,
-              excluding the function definition and the closing bracket. This
-              text-object also supports literal functions
-
-                                               *go-v_ac* *go-ac*
-ac            "a comment", select contents of the current comment block.
-
-                                               *go-v_ic* *go-ic*
-ic            "inner comment", select contents of the current comment block,
-              excluding the start and end comment markers.
-
-vim-go also defines the following text motion objects:
-
-                                               *go-v_]]* *go-]]*
-]]            [count] forward to next function declaration. If
-              |'g:go_textobj_include_function_doc'| is enabled and if your
-              on a comment, it skips the function which the comment
-              belongs and forwards to the next function declaration.
-
-                                               *go-v_[[* *go-[[*
-[[            [count] backward to previous function declaration.
-
-
-
-==============================================================================
-FUNCTIONS                                                       *go-functions*
-
-                                                        *go#statusline#Show()*
-
-Shows the status of a job running asynchronously. Can be used to plug into the
-statusline. It works to show the status per package instead of per file.
-Assume you have three files open, all belonging to the same package, if the
-package build (`:GoBuild`) is successful, all statuslines will show `success`,
-if it fails all windows' statuslines will show `failed`.
-
-To avoid always showing old status information, the status information is
-cleaned for each package after `60` seconds. This can be changed with the
-|'g:go_statusline_duration'| setting.
-
-                                                       *go#complete#GetInfo()*
-
-Returns the description of the identifer under the cursor. Can be used to plug
-into the statusline.
-
-                                                      *go#complete#Complete()*
-
-Uses `gopls` for autocompletion. By default, it is hooked up to 'omnifunc'.
-
-                                                   *go#tool#DescribeBalloon()*
-
-Suitable to be used as an expression to show the evaluation balloon. See `help
-balloonexpr`.
-
-==============================================================================
-SETTINGS                                                        *go-settings*
-
-                                                     *'g:go_version_warning'*
-
-Enable warning when using an unsupported version of Vim. By default it is
-enabled.
->
-  let g:go_version_warning = 1
-<
-
-                                              *'g:go_code_completion_enabled'*
-
-Enable code completion with 'omnifunc'. By default it is enabled.
->
-  let g:go_code_completion_enabled = 1
-<
-
-                                                *'g:go_code_completion_icase'*
-
-Override the icase field in 'omnifunc' results. By default it is set to 0.
-See 'complete-items' for details.
->
-  let g:go_code_completion_icase = 0
-<
-
-                                                      *'g:go_test_show_name'*
-
-Show the name of each failed test before the errors and logs output by the
-test. By default it is disabled.
->
-  let g:go_test_show_name = 0
-<
-
-                                                         *'g:go_test_timeout'*
-
-Use this option to change the test timeout of |:GoTest|. By default it is
-set to 10 seconds . >
-
-  let g:go_test_timeout= '10s'
-<
-                                                 *'g:go_play_browser_command'*
-
-Browser to use for |:GoPlay|, |:GoDocBrowser|, and |:GoLSPDebugBrowser|. The
-url must be added with `%URL%`, and it's advisable to include `&` to make sure
-the shell returns. For example:
->
-  let g:go_play_browser_command = 'firefox-developer %URL% &'
-<
-
-By default it tries to find it automatically for the current OS. >
-
-  let g:go_play_browser_command = ''
-<
-                                                    *'g:go_play_open_browser'*
-
-Use this option to open browser after posting the snippet to play.golang.org
-with |:GoPlay|. By default it's enabled. >
-
-  let g:go_play_open_browser = 1
-<
-                                                       *'g:go_auto_type_info'*
-
-Use this option to show the type info (|:GoInfo|) for the word under the
-cursor automatically. Whenever the cursor changes the type info will be
-updated. By default it's disabled. The delay can be configured with the
-|'g:go_updatetime'| setting.
->
-  let g:go_auto_type_info = 0
-<
-
-                                                            *'g:go_info_mode'*
-
-Use this option to define the command to be used for |:GoInfo|. By default
-`gopls` is used, because it is the fastest and is known to be highly accurate.
-One might also use `guru` for its accuracy.
-Valid options are `gopls` and `guru`.
->
-  let g:go_info_mode = 'gopls'
-<
-                                                         *'g:go_auto_sameids'*
-
-Use this option to highlight all uses of the identifier under the cursor
-(|:GoSameIds|) automatically. By default it's disabled. The delay can be
-configured with the |'g:go_updatetime'| setting.
->
-  let g:go_auto_sameids = 0
-<
-                                                           *'g:go_updatetime'*
-
-Use this option to configure the delay until it starts some jobs (see
-|'g:go_auto_type_info'|, |'g:go_auto_sameids'|). If set to 0, it uses the
-value from 'updatetime'. By default it's set to 800ms.
->
-  let g:go_updatetime = 800
-<
-                                                        *'g:go_jump_to_error'*
-
-Use this option to enable/disable passing the bang attribute to the mappings
-(e.g. |(go-build)|, |(go-run)|, etc.) and the metalinter on save.  When
-enabled it will jump to the first error automatically (means it will NOT pass
-the bang attribute to the appropriate command, i.e: (go-run) -> :GoRun ).
-Note, that calling this doesn't have any affect on calling the commands
-manually. This setting is only useful for changing the behaviour of our custom
-static mappings. By default it's enabled.
->
-  let g:go_jump_to_error = 1
-<
-                                                         *'g:go_fmt_autosave'*
-
-Use this option to auto |:GoFmt| on save. When both 'g:go_imports_autosave'
-and 'g:go_fmt_autosave' are enabled and both 'g:go_fmt_command' and
-'g:go_imports_mode' are set to `goimports`, `goimports` will be run only once.
-By default it's enabled >
-
-  let g:go_fmt_autosave = 1
-<
-                                                          *'g:go_fmt_command'*
-
-Use this option to define which tool is used to format code. Valid options are
-`gofmt`, `goimports`, and `gopls`. By default `gofmt` is used.
->
-
-  let g:go_fmt_command = "gofmt"
-<
-                                                          *'g:go_fmt_options'*
-
-Use this option to add additional options to the |'g:go_fmt_command'|. It's
-value type can be either a string or a dictionary. This is due backwards
-compatibility. The string version will be removed in the future so please use
-the dictionary version. Default is empty.
->
-  let g:go_fmt_options = ''
-
-  or
-
-  let g:go_fmt_options = {}
-<
-The dictionary version allows you to define options for multiple binaries:
->
-  let g:go_fmt_options = {
-    \ 'gofmt': '-s',
-    \ 'goimports': '-local mycompany.com',
-    \ }
-<
-                                                          *'b:go_fmt_options'*
-
-This option is identical to |'g:go_fmt_options'|, but a buffer-level setting.
-If present, it's used instead of the global setting. By default it is not set.
-
-As an example, the following autocmd will configure goimports to put imports
-of packages from the current module in their own group:
->
-  autocmd FileType go let b:go_fmt_options = {
-    \ 'goimports': '-local ' .
-      \ trim(system('{cd '. shellescape(expand('%:h')) .' && go list -m;}')),
-    \ }
-<
-                                                    *'g:go_fmt_fail_silently'*
-
-Use this option to disable showing a location list when |'g:go_fmt_command'|
-fails. By default the location list is shown. >
-
-  let g:go_fmt_fail_silently = 0
-<
-                                                     *'g:go_fmt_experimental'*
-
-Use this option to enable fmt's experimental mode. This experimental mode is
-superior to the current mode as it fully saves the undo history, so undo/redo
-doesn't break. However, it's slow (creates/deletes a file for every save) and
-it's causing problems on some Vim versions. This has no effect if
-`g:go_fmt_command` is set to `gopls`. By default it's disabled.
->
-
-  let g:go_fmt_experimental = 0
-
-<
-
-                                                     *'g:go_imports_autosave'*
-
-Use this option to auto |:GoImports| on save. When both
-'g:go_imports_autosave' and 'g:go_fmt_autosave' are enabled and both
-'g:go_fmt_command' and 'g:go_imports_mode' are set to `goimports`, `goimports`
-will be run only once. By default it's disabled.
->
-  let g:go_imports_autosave = 0
-<
-                                                         *'g:go_imports_mode'*
-
-Use this option to define which tool is used to adjust imports. Valid options
-are `goimports` and `gopls`. The buffer will not be formatted when this is set
-to `gopls`. By default `goimports` is used.
->
-
-  let g:go_imports_mode = "goimports"
-<
-                                                     *'g:go_mod_fmt_autosave'*
-
-Use this option to auto |:GoModFmt| on save. By default it's enabled >
-
-  let g:go_mod_fmt_autosave = 1
-<
-
-                                               *'g:go_doc_keywordprg_enabled'*
-
-Use this option to run `godoc` on words under the cursor with |K|; this will
-normally run the `man` program, but for Go using `godoc` is more idiomatic. It
-will not override the 'keywordprg' setting, but will run |:GoDoc|. Default
-is enabled. >
-
-  let g:go_doc_keywordprg_enabled = 1
-<
-                                                           *'g:go_doc_height'*
-
-Maximum height for the GoDoc window created with |:GoDoc|. Default is 20. >
-
-  let g:go_doc_max_height = 20
-<
-
-                                                              *'g:go_doc_url'*
-
-godoc server URL used when |:GoDocBrowser| is used. Change if you want to use
-a private internal service. Default is 'https://pkg.go.dev'.
->
-  let g:go_doc_url = 'https://pkg.go.dev'
-<
-
-                                                     *'g:go_doc_popup_window'*
-
-Use this option to use the popup-window for |K| and |:GoDoc|, rather than the
-|preview-window|. Default is disabled.
->
-  let g:go_doc_popup_window = 0
-<
-
-                                                             *'g:go_def_mode'*
-
-Use this option to define the command to be used for |:GoDef|. By default
-`gopls` is used, because it is the fastest. One might also use `guru` for its
-accuracy or `godef` for its performance. Valid options are `godef`, `gopls`,
-and `guru`.
->
-  let g:go_def_mode = 'gopls'
-<
-                                                      *'g:go_fillstruct_mode'*
-
-Use this option to define the command to be used for |:GoFillStruct|. By
-default `fillstruct` is used. Valid values are `fillstruct` and `gopls`. By
-default it is `fillstruct`.
->
-  let g:go_fillstruct_mode = 'fillstruct'
-<
-                                                       *'g:go_referrers_mode'*
-
-Use this option to define the command to be used for |:GoReferrers|. By
-default `gopls` is used, because it is the fastest and works with Go modules.
-One might also use `guru` for its ability to show references from other
-packages.  This option will be removed after `gopls` can show references from
-other packages. Valid options are `gopls` and `guru`. By default it's `gopls`.
->
-  let g:go_referrers_mode = 'gopls'
-<
-                                                      *'g:go_implements_mode'*
-
-Use this option to define the command to be used for |:GoImplements|.
-The Implements feature in gopls is still new and being worked upon.
-Valid options are `gopls` and `guru`. By default it's `gopls`.
->
-  let g:go_implements_mode = 'gopls'
-<
-                                                  *'g:go_def_mapping_enabled'*
-
-Use this option to enable/disable the default mapping of CTRL-],
-<C-LeftMouse>, g<C-LeftMouse> and (`gd`) for GoDef and CTRL-t for :GoDefPop.
-Disabling it allows you to map something else to these keys or mappings.
-Default is enabled. >
-
-  let g:go_def_mapping_enabled = 1
-<
-                                                     *'g:go_def_reuse_buffer'*
-
-Use this option to jump to an existing buffer for the split, vsplit and tab
-mappings of |:GoDef|. By default it's disabled. >
-
-  let g:go_def_reuse_buffer = 0
-<
-                                                             *'g:go_bin_path'*
-
-Use this option to change default path for vim-go tools when using
-|:GoInstallBinaries| and |:GoUpdateBinaries|. If not set `$GOBIN` or
-`$GOPATH/bin` is used. >
-
-  let g:go_bin_path = ""
-<
-                                                *'g:go_search_bin_path_first'*
-
-This option lets |'g:go_bin_path'| (or its default value) take precedence over
-$PATH when invoking a tool command such as |:GoFmt| or |:GoImports|.
-
-Enabling this option ensures that the binaries installed via
-|:GoInstallBinaries| and |:GoUpdateBinaries| are the same ones that are
-invoked via the tool commands.
-
-By default it is enabled. >
-
-  let g:go_search_bin_path_first = 1
-<
-                                                       *'g:go_snippet_engine'*
-
-Define the snippet engine to use. The default is to auto-detect one. Valid
-values are:
-
-  automatic      Automatically detect a snippet engine.
-  ultisnips      https://github.com/SirVer/ultisnips
-  neosnippet     https://github.com/Shougo/neosnippet.vim
-  minisnip       https://github.com/joereynolds/vim-minisnip
-                 Note: the original at KeyboardFire/vim-minisnip won't work.
->
-  let g:go_snippet_engine = "automatic"
-<
-                                                           *'g:go_get_update'*
-
-Use this option to disable updating dependencies with |:GoInstallBinaries|. By
-default this is enabled.
->
-  let g:go_get_update = 1
-<
-                                                           *'g:go_guru_scope'*
-
-Use this option to define the scope of the analysis to be passed for guru
-related commands, such as |:GoImplements|, |:GoCallers|, etc. You can change
-it on-the-fly with |:GoGuruScope|. The input should be a a list of package
-pattern. An example input might be:
-`["github.com/fatih/color","github.com/fatih/structs"]`
-
-Also see |go-guru-scope|.
-
-By default it's not set, so the relevant commands' defaults are being used.
->
-  let g:go_guru_scope = []
-<
-                                                           *'g:go_build_tags'*
-
-Space-separated list of build tags passed to the `-tags` flag of tools that
-support it.
-There is also the |:GoBuildTags| convenience command to change or remove build
-tags.
->
-  let g:go_build_tags = ''
-<
-                                                    *'g:go_autodetect_gopath'*
-
-Automatically modify GOPATH for certain directory structures, such as for
-the `godep` tool which stores dependencies in the `Godeps` folder. What this
-means is that all tools are now working with the newly modified GOPATH. So
-|:GoDef| for example jumps to the source inside the `Godeps` (vendored)
-source. Currently `godep` and `gb` are supported. By default it's disabled.
->
-  let g:go_autodetect_gopath = 0
-<
-                                                      *'g:go_textobj_enabled'*
-
-Adds custom text objects. By default it's enabled. >
-
-  let g:go_textobj_enabled = 1
-<
-                                         *'g:go_textobj_include_function_doc'*
-
-Consider the comment above a function to be part of the function when using
-the `af` text object and `[[` motion. By default it's enabled. >
-
-  let g:go_textobj_include_function_doc = 1
-<
-                                             *'g:go_textobj_include_variable'*
-
-Consider the variable of an function assignment to be part of the anonymous
-function when using the `af` text object. By default it's enabled. >
-
-  let g:go_textobj_include_variable = 1
-<
-                                                  *'g:go_metalinter_autosave'*
-
-Use this option to auto |:GoMetaLinter| on save. Only linter messages for
-the active buffer will be shown.
-
-By default, `golangci-lint` messages will be shown in the |location-list|
-window. The list to use can be set using |'g:go_list_type_commands'|.
-
- By default it's disabled >
-  let g:go_metalinter_autosave = 0
-<
-                                          *'g:go_metalinter_autosave_enabled'*
-
-Specifies the enabled linters for auto |:GoMetaLinter| on save. When the
-metalinter is `golangci-lint`, if any are enabled, `--disable-all` will be
-sent to the metalinter.
-
-When `g:go_metalinter_command` is set to `staticcheck`, the default value is
-an empty list; `staticcheck`'s `-checks` flag will not be used.
->
-  let g:go_metalinter_autosave_enabled = ['all']
-<
-
-When `g:go_metalinter_command is set to `golangci-lint'`, the default value is
->
-  let g:go_metalinter_autosave_enabled = ['vet', 'golint']
-<
-                                                   *'g:go_metalinter_enabled'*
-
-Specifies the linters to enable for the |:GoMetaLinter| command. For
-`golangci-lint`, if any are enabled, `--disable-all` will be passed to the
-metalinter.
-
-When `g:go_metalinter_command` is set to `staticcheck`, the default value is
-an empty list; `staticcheck`'s `-checks` flag will not be used.
->
-  let g:go_metalinter_autosave_enabled = ['all']
-<
-
-When `g:go_metalinter_command is set to `golangci-lint'`, the default value is
->
-  let g:go_metalinter_enabled = ['vet', 'golint', 'errcheck']
-<
-                                                   *'g:go_metalinter_command'*
-
-Overrides the command to be executed when |:GoMetaLinter| is called. By
-default it's `golangci-lint`. Valid options are `golangci-lint, `gopls`, and
-`staticcheck`..
-
-When the value is `gopls`, users may want to consider setting
-`g:go_gopls_staticcheck`. It can also be used as an advanced setting for users
-who want to have more control over the metalinter.
->
-  let g:go_metalinter_command = "golangci-lint"
-<
-                                                  *'g:go_metalinter_deadline'*
-
-Overrides the maximum time the linters have to complete. By default it's 5
-seconds.
-
-Only applies when the metalinter is `golangci-lint`.
->
-  let g:go_metalinter_deadline = "5s"
-<
-                                                          *'g:go_list_height'*
-
-Specifies the window height for the quickfix and location list windows. The
-default value (empty) automatically sets the height to the number of items
-(maximum up to 10 items to prevent large heights). Setting the value
-explicitly overrides this behavior. For standard Vim behavior, set it to 10.
->
-  let g:go_list_height = 0
-<
-                                                            *'g:go_list_type'*
-
-Specifies the type of list to use for command outputs (such as errors from
-builds, results from static analysis commands, etc...). The list type for
-specific commands can be overridden with |'g:go_list_type_commands'|. The
-default value (empty) will use the appropriate kind of list for the command
-that was called. Supported values are "", "quickfix", and "locationlist".
->
-  let g:go_list_type = ""
-<
-
-                                                   *'g:go_list_type_commands'*
-
-Specifies the type of list to use for command outputs (such as errors from
-builds, results from static analysis commands, etc...). When an expected key
-is not present in the dictionary, |'g:go_list_type'| will be used instead.
-Supported keys are "GoBuild", "GoErrCheck", "GoFmt", "GoModFmt", "GoInstall",
-"GoLint", "GoMetaLinter", "GoMetaLinterAutoSave", "GoModifyTags" (used for
-both :GoAddTags and :GoRemoveTags), "GoRename", "GoRun", and "GoTest".
-Supported values for each command are "quickfix" and "locationlist".
->
-  let g:go_list_type_commands = {}
-<
-As an example, the following settings will change all list types to
-`locationlist` except for `:GoBuild` where `quickfix` is used:
->
-  let g:go_list_type = "locationlist"
-  let g:go_list_type_commands = {"GoBuild": "quickfix"}
-<
-
-                                                       *'g:go_list_autoclose'*
-
-Specifies whether the quickfix/location list should be closed automatically
-in the absence of errors.  The default value is 1.
-If you prefer to keep a long running error window open, you can disable
-this by setting the value to 0.
->
-  let g:go_list_autoclose = 1
-<
-                                                      *'g:go_asmfmt_autosave'*
-
-Use this option to auto |:AsmFmt| on save. By default it's disabled. >
-
-  let g:go_asmfmt_autosave = 0
-<
-                                                            *'g:go_term_mode'*
-
-The default command used to open a new terminal for go commands such as
-|:GoRun|.  The default is `:vsplit`.
-
-Applicable to Neovim and Vim with `terminal` feature only.
->
-  let g:go_term_mode = "vsplit"
-<
-                                                          *'g:go_term_reuse'*
-
-Reuse the terminal window when |'g:go_term_enabled'| is set. By default it's
-disabled.
->
-  let g:go_term_reuse = 0
-<
-                                                          *'g:go_term_height'*
-                                                           *'g:go_term_width'*
-
-Controls the height and width of a terminal split, respectively. By default
-these are not set, meaning that the height and width are set automatically by
-the editor. The height only applies to a horizontal split and width only
-applies to a vertical split.
-
-Applicable to Neovim and Vim with `terminal` feature only.
-
-For example here is how to set each to 30.
->
-  let g:go_term_height = 30
-  let g:go_term_width = 30
-<
-                                                         *'g:go_term_enabled'*
-
-Causes some types of jobs to run inside a new terminal according to
-|'g:go_term_mode'|. By default it is disabled.
-
-Applicable to Neovim and Vim with `terminal` feature only.
->
-  let g:go_term_enabled = 0
-<
-                                                   *'g:go_term_close_on_exit'*
-
-Closes the terminal after the command run in it exits when the command fails.
-By default it is enabled.
-
-Applicable to Neovim and Vim with `terminal` feature only.
-
->
-  let g:go_term_close_on_exit = 1
-<
-                                                       *'g:go_alternate_mode'*
-
-Specifies the command that |:GoAlternate| uses to open the alternate file.  By
-default it is set to edit.
->
-  let g:go_alternate_mode = "edit"
-<
-                                                       *'g:go_rename_command'*
-
-Use this option to define which tool is used to rename. By default `gopls`
-is used. Valid options are `gorename` and `gopls`.
->
-  let g:go_rename_command = 'gopls'
-<
-                                                     *'g:go_gorename_prefill'*
-
-Expression to prefill the new identifier when using |:GoRename| without any
-arguments. Use an empty string if you don't want to prefill anything. By
-default it converts the identifier to camel case but preserves the
-capitalisation of the first letter to ensure that the exported state stays the
-same.
->
-  let g:go_gorename_prefill = 'expand("<cword>") =~# "^[A-Z]"' .
-        \ '? go#util#pascalcase(expand("<cword>"))' .
-        \ ': go#util#camelcase(expand("<cword>"))'
-<
-
-                                                        *'g:go_gopls_enabled'*
-
-Specifies whether `gopls` can be used by vim-go.
-
-Completion will not work when gopls is disabled and other configuration
-options may also need to be adjusted.
-
-By default gopls is enabled.
-
->
-  let g:go_gopls_enabled = 1
-<
-
-                                                        *'g:go_gopls_options'*
-
-The commandline arguments to pass to gopls.
-
-By default, it is `['-remote=auto']`.
->
-  let g:go_gopls_options = ['-remote=auto']
-<
-
-                                                       *'g:go_gopls_analyses'*
-
-The analyses settings for `gopls`.
-
-The Expected value is either `v:null` or a dictionary. The dictionary will be
-provided to `gopls` via json-rpc, so dictionary values need to be of the
-appropriate type for Vim to convert to JSON (e.g. truthy dictionary values
-should be `v:true` or `v:false`). By default, it is `v:null`.
->
-  let g:go_gopls_analyses = v:null
-<
-
-                                            *'g:go_gopls_complete_unimported'*
-
-Specifies whether `gopls` should include suggestions from unimported packages.
-
-When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
->
-  let g:go_gopls_complete_unimported = v:null
-<
-
-                                                *'g:go_gopls_deep_completion'*
-
-Specifies whether `gopls` should use deep completion.
-
-When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
->
-  let g:go_gopls_deep_completion = v:null
-<
-
-                                                       *'g:go_gopls_matcher'*
-
-Specifies how `gopls` should match for completions.
-
-Valid values are `v:null`, `fuzzy`, and `caseSensitive`. When it is `v:null`,
-`gopls`' default will be used. By default it is `v:null`.
->
-  let g:go_gopls_matcher = v:null
-<
-
-                                                   *'g:go_gopls_staticcheck'*
-
-Specifies whether `gopls` should run staticcheck checks.
-
-When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
->
-  let g:go_gopls_staticcheck = v:null
-<
-
-                                               *'g:go_gopls_use_placeholders'*
-
-Specifies whether `gopls` can provide placeholders for function parameters and
-struct fields. When set, completion items will be treated as anonymous
-snippets if UltiSnips is installed and configured to be used as
-|'g:go_snippet_engine'|.
-
-When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
->
-  let g:go_gopls_use_placeholders = v:null
-<
-
-                                                   *'g:go_gopls_temp_modfile'*
-
-Specifies whether `gopls` should use a temp modfile and suggest edits rather
-than modifying the ambient go.mod file.
-
-When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
->
-  let g:go_gopls_temp_modfile = v:null
-<
-
-                                                         *'g:go_gopls_local'*
-
-Specifies the prefix for imports that `gopls` should group separately.
-
-The value can either be a string or a dictionary. When it is a string, all
-workspaces will use the same value. When it is a dictionary, the key should be
-the absolute path of the workspace and the value is the prefix to use for
-local imports within that workspace.
-
-When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
->
-  let g:go_gopls_local = v:null
-<
-
-                                                       *'g:go_gopls_gofumpt'*
-
-Specifies whether `gopls` should use `gofumpt` for formatting.
-
-When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
->
-  let g:go_gopls_gofumpt = v:null
-<
-
-                                                      *'g:go_gopls_settings'*
-
-Specifies `gopls` workspace settings for `gopls` that are not yet officially
-supported by vim-go.
-
-Any value in the dictionary will be overridden by values provided in the
-specific options supported by vim-go (e.g.  g:go_gopls_staticcheck) or
-settings statically configured by vim-go to ensure expected behavior. By
-default it is `v:null`.
->
-  let g:go_gopls_settings = v:null
-<
-                                                 *'g:go_diagnostics_enabled'*
-
-Deprecated. See `'g:go_diagnostics_level'`. Specifies whether `gopls`
-diagnostics are enabled. Only the diagnostics for the current buffer will be
-processed when it is not set; all others will be ignored. By default it is
-disabled.
->
-  let g:go_diagnostics_enabled = 0
-<
-                                                  *'g:go_diagnostics_level'*
-
-Specifies the `gopls` diagnostics level. Valid values are 0, 1, and 2. 0
-ignores `gopls` diagnostics, 1 is for errors only, and 2 is for errors and
-warnings. By default it is 0.
->
-  let g:go_diagnostics_level = 0
-<
-
-                                                  *'g:go_template_autocreate'*
-
-When a new Go file is created, vim-go automatically fills the buffer content
-with a Go code template. By default, the templates under the `templates`
-folder are used.  This can be changed with the |'g:go_template_file'| and
-|'g:go_template_test_file'| settings to either use a different file in the
-same `templates` folder, or to use a file stored elsewhere.
-
-If the new file is created in an already prepopulated package (with other Go
-files), in this case a Go code template with only the Go package declaration
-(which is automatically determined according to the current package) is added.
-
-To always use the package name instead of the template, enable the
-|'g:go_template_use_pkg'| setting.
-
-By default it is enabled.
->
-  let g:go_template_autocreate = 1
-<
-                                                        *'g:go_template_file'*
-
-Specifies either the file under the `templates` folder that is used if a new
-Go file is created. Checkout |'g:go_template_autocreate'| for more info. By
-default the `hello_world.go` file is used.
-
-This variable can be set to an absolute path, so the template files don't have
-to be stored inside the vim-go directory structure. Useful when you want to
-use different templates for different projects.
->
-  let g:go_template_file = "hello_world.go"
-<
-                                                   *'g:go_template_test_file'*
-
-Like with |'g:go_template_file'|, this specifies the file to use for test
-tempaltes. The template file should be under the `templates` folder,
-alternatively absolute paths can be used, too. Checkout
-|'g:go_template_autocreate'| for more info. By default, the
-`hello_world_test.go` file is used.
->
-  let g:go_template_test_file = "hello_world_test.go"
-<
-                                                     *'g:go_template_use_pkg'*
-
-Specifies that, rather than using a template, the package name is used if a
-new Go file is created. Checkout |'g:go_template_autocreate'| for more info.
-By default the template file specified by |'g:go_template_file'| is used.
-
->
-  let g:go_template_use_pkg = 0
-<
-                                                       *'g:go_decls_includes'*
-
-Only useful if `ctrlp.vim`, `unite.vim`, `denite.nvim` or `fzf` are installed.
-This sets which declarations to show for |:GoDecls| (`ctrp.vim`),
-|unite-decls| (`unite.vim`) and |denite-decls| (`denite.nvim`).  It is a Comma
-delimited list.  Possible options are: {func,type}.  The default is: >
-
-      let g:go_decls_includes = 'func,type'
-<
-                                                       *'g:go_decls_mode'*
-
-Define the tool to be used for |:GoDecls|. Valid options are `ctrlp.vim`,
-`fzf`, or an empty string; in which case it will try to autodetect either
-`ctrlp.vim` or `fzf`.
->
-      let g:go_decls_mode = ''
-<
-                                                    *'g:go_echo_command_info'*
-
-Echoes information about various Go commands, such as `:GoBuild`, `:GoTest`,
-`:GoCoverage`, etc... Useful to disable if you use the statusline integration,
-i.e: |go#statusline#Show()|. By default it's enabled
->
-      let g:go_echo_command_info = 1
-<
-                                                       *'g:go_echo_go_info'*
-
-Use this option to show the identifier information when code completion is
-done. By default it's enabled. >
-
-      let g:go_echo_go_info = 1
-<
-Please note that 'noshowmode' must be set for this feature to work correctly.
-
-                                                  *'g:go_statusline_duration'*
-
-Specifies the duration of statusline information being showed per package. By
-default it's 60 seconds. Must be in milliseconds.
->
-      let g:go_statusline_duration = 60000
-<
-                                                   *'g:go_addtags_transform'*
-
-Sets the `transform` option for `gomodifytags` when using |:GoAddTags| or if
-it's being used for snippet expansion of single fields.  Possible options are:
-`snakecase`, `camelcase`, `lispcase`, `pascalcase`, `keep`. For the following
-case, if `snakecase` is used the field will be transformed to:
->
-  type T struct {
-    FooBarQuz string `json:"foo_bar_quz"`
-  }
-<
-
-If "camelcase" is used:
->
-  type T struct {
-    FooBarQuz string `json:"fooBarQuz"`
-  }
-<
-By default "snakecase" is used. Current values are: ["snakecase",
-"camelcase", "lispcase", "pascalcase", "keep"].
->
-      let g:go_addtags_transform = 'snakecase'
-<
-                                              *'g:go_addtags_skip_unexported'*
-
-Sets the `skip-unexported` option for `gomodifytags` when using |:GoAddTags|.
-If set it will prevent `gomodifytags` from adding tags to unexported fields:
->
-  type T struct {
-    FooBar string `json:"foo_bar"`
-    quz    string
-  }
-<
-By default it is disabled.
->
-      let g:go_addtags_skip_unexported = 0
-<
-                                                                *'g:go_debug'*
-
-A list of options to debug; useful for development and/or reporting bugs.
-
-Currently accepted values:
-
-  shell-commands     Echo all shell commands that vim-go runs.
-  debugger-state     Expose debugger state in 'g:go_debug_diag'.
-  debugger-commands  Echo communication between vim-go and `dlv`; requests and
-                     responses are recorded in `g:go_debug_commands`.
-  lsp                Echo communication between vim-go and `gopls`. All
-                     communication is shown in a dedicated window. When
-                     enabled before gopls is started, |:GoLSPDebugBrowser| can
-                     be used to open a browser window to help debug gopls.
->
-      let g:go_debug = []
-<
-
-==============================================================================
-SYNTAX HIGHLIGHTING                                 *ft-go-syntax* *go-syntax*
-
-vim-go comes with an enhanced version of Vim's Go syntax highlighting. It
-comes with a number of features, most of which are disabled by default.
-
-The recommended settings are the default values. If you're experiencing
-slowdowns in Go files and you enabled some of these options then try disabling
-them; some can be resource intensive.
-
-                                                          *'g:go_fold_enable'*
-
-Control syntax-based folding which takes effect when 'foldmethod' is set to
-`syntax`.
-You can enable specific fold regions by setting an array. Possible values are:
-
- block                `{` .. `}` blocks.
- import               `import` block.
- varconst             `var` and `const` blocks.
- package_comment      The package comment.
- comment              Any comment that is not the package comment.
-
-By default all except "comment" are enabled:
->
-  let g:go_fold_enable = ['block', 'import', 'varconst', 'package_comment']
-<
-Enable folding of only imports:
->
-  let g:go_fold_enable = ['import']
-<
-Disable everything (same as not setting 'foldmethod' to `syntax`):
->
-  let g:go_fold_enable = []
-<
-                                     *'g:go_highlight_array_whitespace_error'*
-
-Highlight white space after `[]`. >
-
-  let g:go_highlight_array_whitespace_error = 0
-<
-                                      *'g:go_highlight_chan_whitespace_error'*
-
-Highlight white space around the receive operator (`<-`) that doesn't follow
-the standard style. >
-
-  let g:go_highlight_chan_whitespace_error = 0
-<
-                                                *'g:go_highlight_extra_types'*
-
-Highlight commonly used library types (`io.Reader`, etc.). >
-
-  let g:go_highlight_extra_types = 0
-<
-                                            *'g:go_highlight_space_tab_error'*
-
-Highlight instances of tabs following spaces. >
-
-  let g:go_highlight_space_tab_error = 0
-<
-                                  *'g:go_highlight_trailing_whitespace_error'*
-
-Highlight trailing white space. >
-
-  let g:go_highlight_trailing_whitespace_error = 0
-<
-                                                  *'g:go_highlight_operators'*
-
-Highlight operators such as `:=` , `==`, `-=`, etc.
->
-  let g:go_highlight_operators = 0
-<
-                                                  *'g:go_highlight_functions'*
-
-Highlight function and method declarations.
->
-  let g:go_highlight_functions = 0
-<
-                                       *'g:go_highlight_function_parameters'*
-
-Highlight the variable names in parameters (including named return parameters)
-in function declarations. Setting this implies the functionality from
-|'g:go_highlight_functions'|.
->
-  let g:go_highlight_function_parameters = 0
-<
-                                             *'g:go_highlight_function_calls'*
-
-Highlight function and method calls.
->
-  let g:go_highlight_function_calls = 0
-<
-                                                      *'g:go_highlight_types'*
-
-Highlight struct and interface names.
->
-  let g:go_highlight_types = 0
-<
-                                                     *'g:go_highlight_fields'*
-
-Highlight struct field names.
->
-  let g:go_highlight_fields = 0
-<
-                                          *'g:go_highlight_build_constraints'*
-
-Highlights build constraints.
->
-  let g:go_highlight_build_constraints = 0
-<
-                                              *'g:go_highlight_generate_tags'*
-
-Highlight go:generate directives.
->
-  let g:go_highlight_generate_tags = 0
-<
-                                          *'g:go_highlight_string_spellcheck'*
-
-Highlight spelling errors in strings when |spell| is enabled.
->
-  let g:go_highlight_string_spellcheck = 1
-<
-                                             *'g:go_highlight_format_strings'*
-
-Highlight printf-style formatting verbs inside string literals.
->
-  let g:go_highlight_format_strings = 1
-<
-                                      *'g:go_highlight_variable_declarations'*
-
-Highlight variable names in variable declarations (`x` in ` x :=`).
->
-  let g:go_highlight_variable_declarations = 0
-<
-                                       *'g:go_highlight_variable_assignments'*
-
-Highlight variable names in variable assignments (`x` in `x =`).
->
-  let g:go_highlight_variable_assignments = 0
-<
-                                          *'g:go_highlight_diagnostic_errors'*
-
-Highlight diagnostic errors.
->
-  let g:go_highlight_diagnostic_errors = 1
-<
-                                        *'g:go_highlight_diagnostic_warnings'*
-
-Highlight diagnostic warnings.
->
-  let g:go_highlight_diagnostic_warnings = 1
-<
-
-==============================================================================
-                                           *gohtmltmpl* *ft-gohtmltmpl-syntax*
-                                           *gotexttmpl* *ft-gotexttmpl-syntax*
-Go template syntax~
-
-The `gotexttmpl` 'filetype' provides syntax highlighting and indentation for
-Go's `text/template` package.
-
-The `gohtmltmpl` filetype is for use with the `html/template` package and is
-identical to `gotexttmpl` except that it will also load the standard `html`
-filetype.
-
-The `gohtmltmpl` filetype is automatically set for `*.tmpl` files; the
-`gotexttmpl` is never automatically set and needs to be set manually.
-
-==============================================================================
-                                                    *gomod* *ft-gomod-syntax*
-go.mod file syntax~
-
-The `gomod` 'filetype' provides syntax highlighting for Go's module file
-`go.mod`
-
-
-==============================================================================
-DEBUGGER                                                            *go-debug*
-
-Vim-go comes with a special "debugger mode". This starts a `dlv` process in
-the background and provides various commands to communicate with it.
-
-This debugger is similar to Visual Studio or Eclipse and has the following
-features:
-
-  * Show stack trace and jumps.
-  * List local variables.
-  * List function arguments.
-  * Expand values of struct or array/slice.
-  * Show balloon on the symbol.
-  * Show output of stdout/stderr.
-  * Toggle breakpoint.
-  * Stack operation continue/next/step out.
-
-This feature requires either Vim 8.0.0087 or newer with the |+job| feature or
-Neovim. This features also requires Delve 1.0.0 or newer, and it is
-recommended to use Go 1.10 or newer, as its new caching will speed up
-recompiles.
-
-                                                              *go-debug-intro*
-GETTING STARTED WITH THE DEBUGGER~
-
-Use |:GoDebugStart| or |:GoDebugTest| to start the debugger. The first
-argument is the package name, and any arguments after that will be passed on
-to the program; for example:
->
-    :GoDebugStart . -someflag value
-<
-This may take few seconds. After the code is compiled you'll see three new
-windows: the stack trace on left side, the variable list on the bottom-left,
-and program output at the bottom.
-
-You can add breakpoints with |:GoDebugBreakpoint| (<F9>) and run your program
-with |:GoDebugContinue| (<F5>).
-
-The program will halt on the breakpoint, at which point you can inspect the
-program state. You can go to the next line with |:GoDebugNext| (<F10>) or step
-in with |:GoDebugStep| (<F11>).
-
-The program can also be halted with `:GoDebugHalt` (<F8>).
-
-The variable window in the bottom left (`GODEBUG_VARIABLES`) will display all
-local variables. Struct values are displayed as `{...}`, array/slices as
-`[4]`. Use <CR> on the variable name to expand the values.
-
-The `GODEBUG_OUTPUT` window displays output from the program and the Delve
-debugger.
-
-The `GODEBUG_STACKTRACE` window can be used to jump to different places in the
-call stack.
-
-When you're done use |:GoDebugStop| to close the debugging windows and halt
-the `dlv` process, or |:GoDebugRestart| to recompile the code.
-
-                                                           *go-debug-commands*
-DEBUGGER COMMANDS~
-
-Only |:GoDebugAttach|, |:GoDebugStart|, |:GoDebugTest|, and
-|:GoDebugBreakpoint| are available by default. |:GoDebugContinue| becomes
-available after running |:GoDebugAttach|, |:GoDebugStart| or |:GoDebugTest|.
-The rest of the commands and mappings become available after executing
-|:GoDebugContinue|.
-
-                                                             *:GoDebugAttach*
-:GoDebugAttach pid
-
-    Start the debug mode for pid; this does several things:
-
-      * Setup the debug windows according to |'g:go_debug_windows'|.
-      * Make the `:GoDebug*` commands and `(go-debug-*)` mappings available.
-
-    Use |:GoDebugStop| to stop `dlv` and exit debugging mode.
-
-                                                               *:GoDebugStart*
-:GoDebugStart [pkg] [program-args]
-
-    Start the debug mode for [pkg]; this does several things:
-
-      * Setup the debug windows according to |'g:go_debug_windows'|.
-      * Make the `:GoDebug*` commands and `(go-debug-*)` mappings available.
-
-    The directory of the current buffer is used if [pkg] is empty. Any other
-    arguments will be passed to the program.
-
-    Use |:GoDebugStop| to stop `dlv` and exit debugging mode.
-
-                                                                *:GoDebugTest*
-:GoDebugTest [pkg] [program-args]
-
-    Behaves the same as |:GoDebugStart| but runs `dlv test` instead of
-    `dlv debug` so you can debug tests.
-
-    Use `-test.flag` to pass flags to `go test` when debugging a test; for
-    example `-test.v` or `-test.run TestFoo`
-
-                                                            *:GoDebugTestFunc*
-:GoDebugTestFunc [expand]
-
-    Behaves the same as |:GoDebugTest| and implicitly adds `-test.run` to run
-    the nearest test or example function (i.e the nearest function declaration
-    that matches `func Test` or `func Example`) at or previous to the cursor.
-    Search will not wrap around when at the top of the file.
-
-                                                             *:GoDebugRestart*
-:GoDebugRestart
-
-    Stop the program (if running) and restart `dlv` to recompile the package.
-    The current window layout and breakpoints will be left intact.
-
-                                                                *:GoDebugHalt*
-                                                             *(go-debug-halt)*
-:GoDebugHalt
-
-    Halt the program.
-
-    Mapped to <F8> by default.
-
-                                                                *:GoDebugStop*
-                                                             *(go-debug-stop)*
-:GoDebugStop
-
-    Stop `dlv` and remove all debug-specific commands, mappings, and windows.
-
-                                                          *:GoDebugBreakpoint*
-                                                       *(go-debug-breakpoint)*
-:GoDebugBreakpoint [linenr]
-
-    Toggle breakpoint for the [linenr]. [linenr] defaults to the current line
-    if it is omitted. A line with a breakpoint will have the
-    {godebugbreakpoint} |:sign| placed on it. The line the program is
-    currently halted on will have the {godebugcurline} sign.
-
-                                    *hl-GoDebugCurrent* *hl-GoDebugBreakpoint*
-    A line with a breakpoint will be highlighted with the {GoDebugBreakpoint}
-    group; the line the program is currently halted on will be highlighted
-    with {GoDebugCurrent}.
-
-    Mapped to <F9> by default.
-
-                                                            *:GoDebugContinue*
-                                                         *(go-debug-continue)*
-:GoDebugContinue
-
-    Continue execution until breakpoint or program termination. It will start
-    the program if it hasn't been started yet.
-
-    Mapped to <F5> by default.
-
-                                                                *:GoDebugNext*
-                                                             *(go-debug-next)*
-:GoDebugNext
-
-    Advance execution by one line, also called "step over" by some other
-    debuggers.
-
-    Mapped to <F10> by default.
-
-                                                                *:GoDebugStep*
-                                                             *(go-debug-step)*
-:GoDebugStep
-
-    Advance execution by one step, stopping at the next line of code that will
-    be executed (regardless of location).
-
-    Mapped to <F11> by default.
-
-                                                             *:GoDebugStepOut*
-                                                          *(go-debug-stepout)*
-
-:GoDebugStepOut
-
-    Run all the code in the current function and halt when the function
-    returns ("step out of the current function").
-
-                                                                 *:GoDebugSet*
-:GoDebugSet {var} {value}
-
-    Set the variable {var} to {value}. Example:
->
-      :GoDebugSet truth 42
-<
-    This only works for `float`, `int` and variants, `uint` and variants,
-    `bool`, and pointers (this is a `delve` limitation, not a vim-go
-    limitation).
-
-                                                               *:GoDebugPrint*
-                                                            *(go-debug-print)*
-:GoDebugPrint {expr}
-
-    Print the result of a Go expression.
->
-    :GoDebugPrint truth == 42
-    truth == 42 true
-<
-    Mapped to <F6> by default, which will evaluate the <cword> under the
-    cursor.
-
-                                                           *go-debug-settings*
-DEBUGGER SETTINGS~
-
-                                                        *'g:go_debug_windows'*
-
-Controls the window layout for debugging mode. This is a |dict| with four
-possible keys: "vars", "stack", "goroutines", and "out"; each of the new
-windows will be created in that that order with the commands in the value. The
-current window is made the only window before creating the debug windows.
-
-A window will not be created if a key is missing or empty.
-
-Defaults:
->
-  let g:go_debug_windows = {
-            \ 'vars':       'leftabove 30vnew',
-            \ 'stack':      'leftabove 20new',
-            \ 'goroutines': 'botright 10new',
-            \ 'out':        'botright 5new',
-  \ }
-<
-Show only variables on the right-hand side: >
-
-  let g:go_debug_windows = {
-        \ 'vars':  'rightbelow 60vnew',
-  \ }
-
-                                                       *'g:go_debug_mappings'*
-
-Contains custom key mapping information to customize the active mappings
-when debugging.
-
-Only the customizations desired need to be provided; the debugger will use its
-default key mappings for any mapping not defined here.
-
-This value should be a dictionary whose keys are the plugin mapping commands
-(e.g.  `(go-debug-continue)`). The values are dictionaries with two keys.
-`key` and `attributes`.
-
-`key` is expected to be the key to map (i.e. it's the `lhs` in a mapping).
-`key` can be empty or missing to prevent a key mapping from being applied for
-one the named mappings.
-
-`arguments` is the string of `map-arguments` for the mapping (e.g.
-`<nowait>`).
-
-The first item must be the `lhs` to use for the mapping. The optional
-second item is for `:map-arguments`. All mappings will always be `:map-local`,
-so there is never a need to include `"<buffer>"` in the the arguments.
->
-  let g:go_debug_mappings = {
-    \ '(go-debug-continue)': {'key': 'c', 'arguments': '<nowait>'],
-    \ '(go-debug-stop)': {'key': 'q'},
-    \ '(go-debug-next)': {'key': 'n', 'arguments': '<nowait>'},
-    \ '(go-debug-step)': {'key': 's'},
-  \}
-<
-
-Defaults are equivalent to:
->
-  let g:go_debug_mappings = {
-     \ '(go-debug-continue)':   {'key': '<F5>'},
-     \ '(go-debug-print)':      {'key': '<F6>'},
-     \ '(go-debug-breakpoint)': {'key': '<F9>'},
-     \ '(go-debug-next)':       {'key': '<F10>'},
-     \ '(go-debug-step)':       {'key': '<F11>'},
-     \ '(go-debug-halt)':       {'key': '<F8>'},
-  \ }
-<
-
-Your user specified settings will be merged with the defaults.
-
-                                                        *'g:go_debug_address'*
-
-Server address `dlv` will listen on; must be in `hostname:port` format.
-Defaults to `127.0.0.1:8181`:
->
-  let g:go_debug_address = '127.0.0.1:8181'
-<
-
-                                                     *'g:go_debug_log_output'*
-
-Specifies log output options for `dlv`. Value should be a single string of
-comma-separated options suitable for passing to `dlv`.  An empty string (`''`)
-will suppress logging entirely.  Default: `'debugger,rpc'`:
->
-  let g:go_debug_log_output = 'debugger,rpc'
-<
-
-                                                     *'g:go_highlight_debug'*
-
-Highlight the current line and breakpoints in the debugger.
-
->
-  let g:go_highlight_debug = 1
-<
-
-                                         *'go:go_debug_breakpoint_sign_text'*
-
-Set the sign text used for breakpoints in the debugger. By default it's '>'.
-
->
-  let g:go_debug_breakpoint_sign_text = '>'
-<
-
-==============================================================================
-FAQ TROUBLESHOOTING                                     *go-troubleshooting*
-
-How do I troubleshoot problems?~
-
-One of the best ways to understand what vim-go is doing and the output from
-the tools to which it delegates is to use leverage the features described in
-|'g:go_debug'|.
-
-Completion and other functions that use `gopls` don't work~
-
-Vim-go is heavily reliant on `gopls` for completion and other functionality.
-Many of the features that use `gopls` (e.g. completion, jumping to
-definitions, showing identifier information, et al.) can be configured to
-delegate to other tools. e.g.  completion via 'omnifunc', |'g:go_info_mode'|
-and |'g:go_def_mode'| can be set to use other tools for now (though some of
-the alternatives to `gopls` are effectively at their end of life and support
-for them from within vim-go may be removed soon).
-
-I want to disable `gopls`~
-
-Vim-go's use of `gopls` can be disabled with 'g:go_gopls_enabled'.
-
-Some users want to do this to limit the load on their system when using vim-go
-concurrently with an LSP client like vim-lsp. Instead of disabling vim-go's
-use of `gopls`, you may prefer to configure vim-go to share the `gopls`
-instance with other LSP plugins. 'g:go_gopls_options' can be used to configure
-how vim-go starts `gopls` so that the instance can be shared with other
-plugins and vim-go user's can leverage the full power of vim-go.
-
-I get a "Unknown function: go#config#..." error~
-
-This often happens to vim-polyglot users when new config options are added to
-vim-go. Run vim-polyglot's `build` script or make sure that vim-go is loaded
-before vim-polyglot.
-
-It can also happen when multiple versions of vim-go are installed and the
-version loaded by Vim doesn't have a function introduced by a later version.
-To see where vim-go is being loaded from run
->
-    :verbose function go#config#FmtAutosave
-<
-
-The output will show the path to the `autoload/go/config.vim` that was loaded
-by Vim. Make sure the root of the path to output by the command is the path
-from which vim-go is expected to sourced. If it is not rooted as expected,
-then there are multiple copies of vim-go installed; remove the unexpected
-copies.
-
-I get "not an editor command" error when I invoke :GoXXX~
-
-This happens if vim-go is not installed properly. Be sure you have added this
-line into your vimrc:
->
-  filetype plugin indent on
-<
-
-I get a "command not found" error when I invoke :GoXXX~
-
-If you try to call |:GoDef|, |:GoInfo| and get a command not found, check that
-you have the binaries installed by using |:GoInstallBinaries|.
-
-Before opening vim, check your current $PATH:
->
-  echo $PATH
-<
-After opening vim, run `:echo $PATH`, the output must be your current `$PATH`
-plus `$GOPATH/bin` (the location where |:GoInstallBinaries| installed the
-binaries).
-
-                                                               *go-guru-scope*
-What is the guru scope and how do I set it?~
-
-Many vim-go commands use the `guru` commandline tool to get information. Some
-`guru` commands require an expensive analysis of the source code. To still get
-a reasonable amount of performance `guru` limits this analysis to a selected
-list of packages. This is known as the "guru scope".
-
-The default is to use the package the current buffer belongs to, but this may
-not always be correct. For example for the file `guthub.com/user/pkg/a/a.go`
-the scope will be set to `github.com/user/pkg/a`, but you probably want
-`github.com/user/pkg`
-
-Guessing what package(s) you do want is not easy so you may need to set this
-manually, usually from an |autocommand|:
->
-  autocmd BufRead /home/martin/go/src/github.com/user/pkg/*.go
-        \ :GoGuruScope github.com/user/pkg
-<
-
-If you have a lot of packages with the same prefix (`github.com/user`) you can
-use a single autocommand:
->
-  autocmd BufRead /home/martin/go/src/*.go
-        \  let s:tmp = matchlist(expand('%:p'),
-            \ '/home/martin/go/src/\(github.com/user/[^/]\+\)')
-        \| if len(s:tmp) > 1 |  exe 'silent :GoGuruScope ' . s:tmp[1] | endif
-        \| unlet s:tmp
-<
-Also see |:GoGuruScope| and |'g:go_guru_scope'|.
-
-
-Vim becomes slow while editing Go files~
-
-The most common cause for this is using an older version of Vim that doesn't
-support asynchronous jobs. |'g:go_auto_sameids'| and |'g:go_auto_type_info'|
-run jobs that can cause noticable delays when used with vim74. The problem is
-most pronounced on vim74, but can occur on vim8 and nvim. On vim8 and nvim,
-the problem should be restricted to a short period when the first buffer in a
-package is first loaded.
-
-If you see unexpected characters rendered in the current window, the problem
-is most likely due to |'g:go_auto_sameids'| or |'g:go_auto_type_info'|. First,
-try using another mode for |'g:go_info_mode'|. If that doesn't work, try
-disabling |'g:go_auto_sameids'| and |'g:go_auto_type_info'|.
-
-To a lesser extent, this can be caused by `g:go_highlight_*` options. If Vim
-is just slower than normal, but doesn't render unexpected characters in the
-currrent window, then the problem is most likely the `g:go_highlight_*`
-options. Try disabling them if you've enabled some of them.
-
-I get errors when using GoInstallBinaries~
-
-If you see errors like this:
->
-  Error installing golang.org/x/tools/cmd/goimports
-<
-that means your local Go setup is broken or the remote website is down. For
-example sometimes code.google.com times out. To test, just execute a simple
-`go get`:
->
-  go get golang.org/x/tools/cmd/goimports
-<
-You'll see a more detailed error. If this works, vim-go will work too.
-
-
-I want to use a different binary name than "go", can I do this?~
-
-There is no way to directly configure the binary name; but you can use a
-wrapper script; for example if you would like to run `goapp` instead of `go`:
-
-1. In `~/gobin/go` (remember to make it executable):
->
-     #!/bin/sh
-     # Remove gobin from PATH and run goapp.
-     PATH=${PATH#$HOME/gobin} goapp "$@"
-<
-2. Start Vim with `~/gobin` as the first `PATH` entry so it will use the
-   wrapper script:
->
-     PATH="$HOME/gobin/:$PATH" vim
-<
-   Alternatively you you could set `$PATH` in your vimrc with an |:autocmd|.
-
-
-How do I use vim-go with syntastic?~
-
-Sometimes when using both `vim-go` and `syntastic` Vim will start lagging
-while saving and opening files. The following fixes this:
->
- let g:syntastic_go_checkers = ['golint', 'govet']
- let g:syntastic_mode_map = { 'mode': 'active', 'passive_filetypes': ['go'] }
-<
-If you want to add errcheck you can use golangci-lint as a wrapper:
->
- let g:syntastic_go_checkers = ['golint', 'govet', 'golangci-lint']
- let g:syntastic_go_gometalinter_args = ['--disable-all', '--enable=errcheck']
- let g:syntastic_mode_map = { 'mode': 'active', 'passive_filetypes': ['go'] }
-<
-Another issue with `vim-go` and `syntastic` is that the location list window
-that contains the output of commands such as `:GoBuild` and `:GoTest` might
-not appear.  To resolve this:
->
- let g:go_list_type = "quickfix"
-<
-
-How do I run focused ginkgo tests?~
-
-You must set this environment variable in your `.vimrc`:
->
-  let $GINKGO_EDITOR_INTEGRATION = "true"
-<
-
-Using with NeoVim~
-
-Note: Neovim currently is not a first class citizen for vim-go. You are free
-to open bug, however I'm not using Neovim so it's hard for me to test it.
-vim-go might not work as well in Neovim as it does in Vim. I'm happy to accept
-pull requests or very detailed bug reports. If you're interested to improve
-the state of Neovim in vim-go you're always welcome!
-
-Run `:GoRun` in a new tab, horizontal split or vertical split terminal
->
- au FileType go nmap <leader>rt <Plug>(go-run-tab)
- au FileType go nmap <leader>rs <Plug>(go-run-split)
- au FileType go nmap <leader>rv <Plug>(go-run-vertical)
-<
-By default new terminals are opened in a vertical split. To change it
->
- let g:go_term_mode = "split"
->
-
-How can I customize the highlighting?~
-
-All the highlight groups used by vim-go are prefixed with `go` (e.g.
-`goType`) and are defined in the files in the `syntax` directory. To change
-the highlighting for any group, add a `highlight` command for the group to
-your vimrc.  To turn off the highlighting for any group, add `highlight link
-group-name NONE` (where `group-name` is the name of the group whose highlight
-you'd like to turn off) to your vimrc.
-
-Some people may wish to highlight Go's builtins as keywords. To do so, one
-should simply add `highlight link goBuiltins Keyword` to the `vimrc` file.
-
-==============================================================================
-DEVELOPMENT                                               *go-development*
-
-vim-go supports test files written in VimScript; the way they're run is
-roughly similar to Go tests:
-
-- A `*.vim` file has a corresponding `*_test.vim`.
-- All functions starting with `Test_` are run as test.
-- A test is considered to be "failed" if |v:errors| has any entries. You can
-  use one of the |test-functions| to set this, or append to it directly.
-
-A simple example:
->
- function Test_run_fmt()
-   call assert_equal(expected, actual)
-   ...
- endfunction
-<
-To run tests vim-go comes with three small helper scripts:
-
-  `scripts/install-vim`   Install a pristine Vim to `/tmp/vim-go-test/`.
-  `scripts/run-vim`       Run a Vim version from `/tmp/vim-go-test/`.
-  `scripts/test`          Run all tests with a Vim from `/tmp/vim-go-test/`.
-
-All scripts accept a Vim version as the first argument, which can be
-`vim-8.0` or `nvim`. You will need to install a Vim version with
-`install-vim` before you can use `run-vim` or `test`.
-
-You can install and test all Vim versions by running `make`.
-
-
-==============================================================================
-DONATION                                                         *go-donation*
-
-People have asked for this for a long time, now you can be a fully supporter
-by being a patreon at: https://www.patreon.com/bhcleek
-
-By being a patron, you are enabling vim-go to grow and mature, helping me to
-invest in bug fixes, new documentation, and improving both current and future
-features. It's completely optional and is just a direct way to support
-vim-go's ongoing development. Thanks!
-
-Check it out: https://www.patreon.com/bhcleek
-
-
-==============================================================================
-CREDITS                                                         *go-credits*
-
-* Go Authors for official Vim plugins.
-* Gocode, Godef, Golint, Guru, Goimports, Errcheck projects and authors of
-  those projects.
-* Other vim-plugins, thanks for inspiration (vim-golang, go.vim, vim-gocode,
-  vim-godef).
-* vim-go contributors: https://github.com/fatih/vim-go/graphs/contributors.
-
-
- vim: ft=help tw=78 et ts=2 sw=2 sts=2 norl
-
-endif
diff --git a/doc/vim-jsonnet.txt b/doc/vim-jsonnet.txt
deleted file mode 100644
index 988453bc8..000000000
--- a/doc/vim-jsonnet.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsonnet') == -1
-
-*vim-jsonnet.txt* Jsonnet development plugin
-*vim-jsonnet*
-
-====================================================================================
-  #     # ### #     #             #  #####  ####### #     # #     # ####### #######
-  #     #  #  ##   ##             # #     # #     # ##    # ##    # #          #
-  #     #  #  # # # #             # #       #     # # #   # # #   # #          #
-  #     #  #  #  #  # #####       #  #####  #     # #  #  # #  #  # #####      #
-   #   #   #  #     #       #     #       # #     # #   # # #   # # #          #
-    # #    #  #     #       #     # #     # #     # #    ## #    ## #          #
-     #    ### #     #        #####   #####  ####### #     # #     # #######    #
-====================================================================================
-CONTENTS                                                         *jsonnet-contents*
-
-  1. Intro........................................|jsonnet-intro|
-  2. Install......................................|jsonnet-install|
-  3. Commands.....................................|jsonnet-commands|
-  4. Mappings.....................................|jsonnet-mappings|
-  6. Functions....................................|jsonnet-functions|
-  7. Settings.....................................|jsonnet-settings|
-  8. Troubleshooting..............................|jsonnet-troubleshooting|
-  9. Credits......................................|jsonnet-credits|
-
-==============================================================================
-INTRO                                                               *jsonnet-intro*
-
-==============================================================================
-INSTALL                                                           *jsonnet-install*
-
-==============================================================================
-COMMANDS                                                         *jsonnet-commands*
-
-                                                                      *:JsonnetFmt*
-:JsonnetFmt
-
-Filter the current Jsonnet buffer through `jsonnetfmt`.  It tries to
-preserve cursor position and avoids replacing the buffer with stderr
-output.
-
-==============================================================================
-MAPPINGS                                                        *jsonnet-mappings*
-
-==============================================================================
-FUNCTIONS                                                       *jsonnet-functions*
-
-                                                                 *jsonnet#Format()*
-
-Filter the current Jsonnet buffer through `jsonnetfmt`.  It tries to
-preserve cursor position and avoids replacing the buffer with stderr
-output.
-
-==============================================================================
-SETTINGS                                                        *jsonnet-settings*
-
-                                                         *'g:jsonnet_fmt_on_save'*
-
-Use this option to auto |:JsonnetFmt| on save. By default it's enabled >
-
-  let g:jsonnet_fmt_on_save = 1
-<
-                                                             *'g:jsonnet_command'*
-
-Use this option to define which tool is used to fotmat. By default `jsonnet` is
-used >
-
-  let g:jsonnet_command = "jsonnet"
-<
-                                                         *'g:jsonnet_fmt_command'*
-
-Use this option to define which <cmd> parameter is used with *g:jsonnet_command* tool.
-By default `fmt` is used >
-
-  let g:jsonnet_fmt_command = "fmt"
-<
-                                                         *'g:jsonnet_fmt_options'*
-
-Use this option to add additional options to the
-|'g:jsonnet_command'| + |'g:jsonnet_fmt_command'|. Default is empty. >
-
-  let g:jsonnet_fmt_options = ''
-<
-                                                   *'g:jsonnet_fmt_fail_silently'*
-
-Use this option to enable processing of
-|'g:jsonnet_command'| + |'g:jsonnet_fmt_command'| command if it fails. By default
-it is turned off. By default the error output from the
-|'g:jsonnet_command'| + |'g:jsonnet_fmt_command'| command is ignored.
-FixMe: The processing of the |'g:jsonnet_command'| + |'g:jsonnet_fmt_command'|
-is not implemented yet. So clearing this option would not do anything at this time. >
-
-  let g:jsonnet_fmt_fail_silently = 1
-<
-
-==============================================================================
-TROUBLESHOOTING                                         *jsonnet-troubleshooting*
-
-==============================================================================
-CREDITS                                                         *jsonnet-credits*
-
-
-
-endif
diff --git a/doc/vim-jsx-pretty-doc.txt b/doc/vim-jsx-pretty-doc.txt
deleted file mode 100644
index cc170976d..000000000
--- a/doc/vim-jsx-pretty-doc.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
-
-vim-jsx-pretty is syntax highlight for JSX (React.js).
-(https://github.com/MaxMEllon/vim-jsx-pretty)
-
-version 1.0.6
-Author: maxmellon<maxmellon1994@gmail.com>
-License: MIT
-
-About                                             |vim-jsx-pretty-about|
-Usage                                             |vim-jsx-pretty-usage|
-Install                                           |vim-jsx-pretty-install|
-Config                                            |vim-jsx-pretty-config|
-Detail                                            |vim-jsx-pretty-detail|
-License                                           |vim-jsx-pretty-license|
-Thanks                                            |vim-jsx-retty-thanks|
-Inspiration                                       |vim-jsx-pretty-inspiration|
-
-===============================================================================
-ABOUT                                                    *vim-jsx-pretty-about*
-
-*vim-jsx-pretty* is highlight and indentation JSX (React.js) syntax.
-
-Dependency Plugin:
-  - pangloss/vim-javascript
-
-===============================================================================
-USAGE                                                    *vim-jsx-pretty-usage*
-
-Just Install it.
-
-===============================================================================
-INSTALL                                                *vim-jsx-pretty-install*
-
-If you used plugin manager `vim-plug`, As follows. >
-
-  Plug 'pangloss/vim-javascript'  " dependency plugin
-  Plug 'maxmellon/vim-jsx-pretty'
-<
-===============================================================================
-CONFIG                                                  *vim-jsx-pretty-config*
-
-- config list
->
-  |                  name                 | default |        detail        |
-  |---------------------------------------|---------|----------------------|
-  | g:vim_jsx_pretty_enable_jsx_highlight |    1    | jsx highlight flag   |
-  | g:vim_jsx_pretty_colorful_config      |    0    | colorful config flag |
-  | g:vim_jsx_pretty_disable_js           |    0    | js toggle flag       |
-<
-
-- *g:vim_jsx_pretty_enable_jsx_highlight*
-
-If you set 'g:vim_jsx_pretty_enable_jsx_highlight', Disable jsx highlight.
-But highlight group is set to jsx syntax. So you should set manual
-highlight setting.
-
-  - Example: >
-
-    let g:vim_jsx_pretty_enable_jsx_highlight = 0
-
-    highlight def link jsxTag Function
-    highlight def link jsxTagName Function
-    highlight def link jsxString String
-    highlight def link jsxNameSpace Function
-    highlight def link jsxComment Error
-    highlight def link jsxAttrib Type
-    highlight def link jsxCloseTag Identifier
-    highlight def link jsxCloseString Identifier
-
-- *g:vim_jsx_pretty_colorful_config*
-
-If you set 'g:vim_jsx_pretty_colorful_config', Enable colorful config.
-
-===============================================================================
-DETAIL                                                  *vim-jsx-pretty-detail*
-
-- Syntax group list
->
-  |     name     |       match        |              |                    |
-  |--------------|--------------------|--------------|--------------------|
-  | jsxTag       | `<tag id="sample">`| jsxjsxAttrib | `<tag id="sample">`|
-  |              | `~~~~~~~~~~~~~~~~~`|              | `_____~~__________`|
-  |--------------|--------------------|--------------|--------------------|
-  | jsxTagName   | `<tag id="sample">`| jsxEqual     | `<tag id="sample">`|
-  |              | `_~~~_____________`|              | `_______~_________`|
-  |--------------|--------------------|--------------|--------------------|
-  | jsxString    | `<tag id="sample">`| jsxCloseTag  | `</tag> ｜ <tag />`|
-  |              | `________~~~~~~~~_`|              | `~~~~~~ ｜  _____~~|
-  |--------------|--------------------|--------------|--------------------|
-
-===============================================================================
-LICENSE                                                *vim-jsx-pretty-license*
-
-Copyright (c) 2016-2017 MaxMEllon
-MIT License
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-==============================================================================
-THANKS                                                  *vim-jsx-pretty-thanks*
-
-  - yuezk
-  - y0za
-  - cormacrelf
-
-===============================================================================
-INSPIREATION                                       *vim-jsx-pretty-inspiration*
-
-  - vim-jsx
-    See: https://github.com/mxw/vim-jsx
-
- vim:tw=78:ts=8:ft=help:norl:
-
-endif
diff --git a/doc/vim-markdown.txt b/doc/vim-markdown.txt
deleted file mode 100644
index c2337e690..000000000
--- a/doc/vim-markdown.txt
+++ /dev/null
@@ -1,667 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
-
-*vim-markdown*  Vim Markdown
-
-===============================================================================
-Contents ~
-
- 1. Introduction                                    |vim-markdown-introduction|
- 2. Installation                                    |vim-markdown-installation|
- 3. Basic usage                                      |vim-markdown-basic-usage|
-  1. Folding                                             |vim-markdown-folding|
-  2. Concealing                                       |vim-markdown-concealing|
- 4. Options                                              |vim-markdown-options|
-  1. Disable Folding                             |vim-markdown-disable-folding|
-  2. Change fold style                         |vim-markdown-change-fold-style|
-  3. Set header folding level           |vim-markdown-set-header-folding-level|
-  4. Disable Default Key Mappings   |vim-markdown-disable-default-key-mappings|
-  5. Enable TOC window auto-fit       |vim-markdown-enable-toc-window-auto-fit|
-  6. Text emphasis restriction to single-lines
-                       |vim-markdown-text-emphasis-restriction-to-single-lines|
-  7. Syntax Concealing                         |vim-markdown-syntax-concealing|
-  8. Fenced code block languages     |vim-markdown-fenced-code-block-languages|
-  9. Follow named anchors                   |vim-markdown-follow-named-anchors|
-  10. Syntax extensions                        |vim-markdown-syntax-extensions|
-   1. LaTeX math                                      |vim-markdown-latex-math|
-   2. YAML Front Matter                        |vim-markdown-yaml-front-matter|
-   3. TOML Front Matter                        |vim-markdown-toml-front-matter|
-   4. JSON Front Matter                        |vim-markdown-json-front-matter|
-   5. Strikethrough                                |vim-markdown-strikethrough|
-  11. Adjust new list item indent    |vim-markdown-adjust-new-list-item-indent|
-  12. Do not require .md extensions for Markdown links
-                |vim-markdown-do-not-require-.md-extensions-for-markdown-links|
-  13. Auto-write when following link
-                                  |vim-markdown-auto-write-when-following-link|
-  14. Change default file extension
-                                   |vim-markdown-change-default-file-extension|
-  15. Do not automatically insert bulletpoints
-                        |vim-markdown-do-not-automatically-insert-bulletpoints|
-  16. Change how to open new files  |vim-markdown-change-how-to-open-new-files|
- 5. Mappings                                            |vim-markdown-mappings|
- 6. Commands                                            |vim-markdown-commands|
- 7. Credits                                              |vim-markdown-credits|
- 8. License                                              |vim-markdown-license|
- 9. References                                        |vim-markdown-references|
-
-===============================================================================
-                                                    *vim-markdown-introduction*
-Introduction ~
-
-Syntax highlighting, matching rules and mappings for the original Markdown [1]
-and extensions.
-
-===============================================================================
-                                                    *vim-markdown-installation*
-Installation ~
-
-If you use Vundle [2], add the following lines to your '~/.vimrc':
->
-  Plugin 'godlygeek/tabular'
-  Plugin 'plasticboy/vim-markdown'
-<
-The 'tabular' plugin must come _before_ 'vim-markdown'.
-
-Then run inside Vim:
->
-  :so ~/.vimrc
-  :PluginInstall
-<
-If you use Pathogen [3], do this:
->
-  cd ~/.vim/bundle
-  git clone https://github.com/plasticboy/vim-markdown.git
-<
-To install without Pathogen using the Debian vim-addon-manager [4], do this:
->
-  git clone https://github.com/plasticboy/vim-markdown.git
-  cd vim-markdown
-  sudo make install
-  vim-addon-manager install markdown
-<
-If you are not using any package manager, download the tarball [5] and do this:
->
-  cd ~/.vim
-  tar --strip=1 -zxf vim-markdown-master.tar.gz
-<
-===============================================================================
-                                                     *vim-markdown-basic-usage*
-Basic usage ~
-
--------------------------------------------------------------------------------
-                                                         *vim-markdown-folding*
-Folding ~
-
-Folding is enabled for headers by default.
-
-The following commands are useful to open and close folds:
-
-                                                              *vim-markdown-zr*
-- 'zr': reduces fold level throughout the buffer
-                                                              *vim-markdown-zR*
-- 'zR': opens all folds
-                                                              *vim-markdown-zm*
-- 'zm': increases fold level throughout the buffer
-                                                              *vim-markdown-zM*
-- 'zM': folds everything all the way
-                                                              *vim-markdown-za*
-- 'za': open a fold your cursor is on
-                                                              *vim-markdown-zA*
-- 'zA': open a fold your cursor is on recursively
-                                                              *vim-markdown-zc*
-- 'zc': close a fold your cursor is on
-                                                              *vim-markdown-zC*
-- 'zC': close a fold your cursor is on recursively
-
-Options are available to disable folding or change folding style.
-
-Try ':help fold-expr' and ':help fold-commands' for details.
-
--------------------------------------------------------------------------------
-                                                      *vim-markdown-concealing*
-Concealing ~
-
-Concealing is set for some syntax such as bold, italic, code block and link.
-
-Concealing lets you conceal text with other text. The actual source text is not
-modified. If you put your cursor on the concealed line, the conceal goes away.
-
-Options are available to disable or change concealing.
-
-Try ':help concealcursor' and ':help conceallevel' for details.
-
-===============================================================================
-                                                         *vim-markdown-options*
-Options ~
-
--------------------------------------------------------------------------------
-                                                 *vim-markdown-disable-folding*
-Disable Folding ~
-
-                                              *g:vim_markdown_folding_disabled*
-- 'g:vim_markdown_folding_disabled'
-
-  Add the following line to your '.vimrc' to disable the folding
-  configuration:
->
-  let g:vim_markdown_folding_disabled = 1
-<
-  This option only controls Vim Markdown specific folding configuration.
-
-  To enable/disable folding use Vim's standard folding configuration.
->
-  set [no]foldenable
-<
--------------------------------------------------------------------------------
-                                               *vim-markdown-change-fold-style*
-Change fold style ~
-
-                                        *g:vim_markdown_folding_style_pythonic*
-- 'g:vim_markdown_folding_style_pythonic'
-
-  To fold in a style like python-mode [6], add the following to your
-  '.vimrc':
->
-  let g:vim_markdown_folding_style_pythonic = 1
-<
-  'g:vim_markdown_folding_level' setting (default 1) is set to 'foldlevel'.
-  Thus level 1 heading which is served as a document title is expanded by
-  default.
-
-                                             *g:vim_markdown_override_foldtext*
-- 'g:vim_markdown_override_foldtext'
-
-  To prevent foldtext from being set add the following to your '.vimrc':
->
-  let g:vim_markdown_override_foldtext = 0
-<
--------------------------------------------------------------------------------
-                                        *vim-markdown-set-header-folding-level*
-Set header folding level ~
-
-                                                 *g:vim_markdown_folding_level*
-- 'g:vim_markdown_folding_level'
-
-  Folding level is a number between 1 and 6. By default, if not specified, it
-  is set to 1.
->
-  let g:vim_markdown_folding_level = 6
-<
-  Tip: it can be changed on the fly with:
->
-  :let g:vim_markdown_folding_level = 1
-  :edit
-<
--------------------------------------------------------------------------------
-                                    *vim-markdown-disable-default-key-mappings*
-Disable Default Key Mappings ~
-
-                                       *g:vim_markdown_no_default_key_mappings*
-- 'g:vim_markdown_no_default_key_mappings'
-
-  Add the following line to your '.vimrc' to disable default key mappings:
->
-  let g:vim_markdown_no_default_key_mappings = 1
-<
-  You can also map them by yourself with '<Plug>' mappings.
-
--------------------------------------------------------------------------------
-                                      *vim-markdown-enable-toc-window-auto-fit*
-Enable TOC window auto-fit ~
-
-                                                   *g:vim_markdown_toc_autofit*
-- 'g:vim_markdown_toc_autofit'
-
-  Allow for the TOC window to auto-fit when it's possible for it to shrink.
-  It never increases its default size (half screen), it only shrinks.
->
-  let g:vim_markdown_toc_autofit = 1
-<
--------------------------------------------------------------------------------
-                       *vim-markdown-text-emphasis-restriction-to-single-lines*
-Text emphasis restriction to single-lines ~
-
-                                            *g:vim_markdown_emphasis_multiline*
-- 'g:vim_markdown_emphasis_multiline'
-
-  By default text emphasis works across multiple lines until a closing token
-  is found. However, it's possible to restrict text emphasis to a single line
-  (i.e., for it to be applied a closing token must be found on the same
-  line). To do so:
->
-  let g:vim_markdown_emphasis_multiline = 0
-<
--------------------------------------------------------------------------------
-                                               *vim-markdown-syntax-concealing*
-Syntax Concealing ~
-
-                                                       *g:vim_markdown_conceal*
-- 'g:vim_markdown_conceal'
-
-  Concealing is set for some syntax.
-
-  For example, conceal '[link text](link url)' as just 'link text'. Also,
-  '_italic_' and '*italic*' will conceal to just _italic_. Similarly
-  '__bold__', '**bold**', '___italic bold___', and '***italic bold***' will
-  conceal to just **bold**, **bold**, **_italic bold_**, and **_italic
-  bold_** respectively.
-
-  To enable conceal use Vim's standard conceal configuration.
->
-  set conceallevel=2
-<
-  To disable conceal regardless of 'conceallevel' setting, add the following
-  to your '.vimrc':
->
-  let g:vim_markdown_conceal = 0
-<
-  To disable math conceal with LaTeX math syntax enabled, add the following
-  to your '.vimrc':
->
-  let g:tex_conceal = ""
-  let g:vim_markdown_math = 1
-<
-                                           *g:vim_markdown_conceal_code_blocks*
-- 'g:vim_markdown_conceal_code_blocks'
-
-  Disabling conceal for code fences requires an additional setting:
->
-  let g:vim_markdown_conceal_code_blocks = 0
-<
--------------------------------------------------------------------------------
-                                     *vim-markdown-fenced-code-block-languages*
-Fenced code block languages ~
-
-                                              *g:vim_markdown_fenced_languages*
-- 'g:vim_markdown_fenced_languages'
-
-  You can use filetype name as fenced code block languages for syntax
-  highlighting. If you want to use different name from filetype, you can add
-  it in your '.vimrc' like so:
->
-  let g:vim_markdown_fenced_languages = ['csharp=cs']
-<
-  This will cause the following to be highlighted using the 'cs' filetype
-  syntax.
->
-  ```csharp
-  ...
-  ```
-<
-  Default is "['c++=cpp', 'viml=vim', 'bash=sh', 'ini=dosini']".
-
--------------------------------------------------------------------------------
-                                            *vim-markdown-follow-named-anchors*
-Follow named anchors ~
-
-                                                 *g:vim_markdown_follow_anchor*
-- 'g:vim_markdown_follow_anchor'
-
-  This feature allows the 'ge' command to follow named anchors in links of
-  the form 'file#anchor' or just '#anchor', where file may omit the '.md'
-  extension as usual. Two variables control its operation:
->
-  let g:vim_markdown_follow_anchor = 1
-<
-  This tells vim-markdown whether to attempt to follow a named anchor in a
-  link or not. When it is 1, and only if a link can be split in two parts by
-  the pattern '#', then the first part is interpreted as the file and the
-  second one as the named anchor. This also includes urls of the form
-  '#anchor', for which the first part is considered empty, meaning that the
-  target file is the current one. After the file is opened, the anchor will
-  be searched.
-
-  Default is '0'.
-
-                                                    *g:vim_markdown_anchorexpr*
-- 'g:vim_markdown_anchorexpr'
->
-  let g:vim_markdown_anchorexpr = "'<<'.v:anchor.'>>'"
-<
-  This expression will be evaluated substituting 'v:anchor' with a quoted
-  string that contains the anchor to visit. The result of the evaluation will
-  become the real anchor to search in the target file. This is useful in
-  order to convert anchors of the form, say, 'my-section-title' to searches
-  of the form 'My Section Title' or '<<my-section-title>>'.
-
-  Default is "''".
-
--------------------------------------------------------------------------------
-                                               *vim-markdown-syntax-extensions*
-Syntax extensions ~
-
-The following options control which syntax extensions will be turned on. They
-are off by default.
-
--------------------------------------------------------------------------------
-                                                      *vim-markdown-latex-math*
-LaTeX math ~
-
-                                                          *g:vim_markdown_math*
-- 'g:vim_markdown_math'
-
-  Used as '$x^2$', '$$x^2$$', escapable as '\$x\$' and '\$\$x\$\$'.
->
-  let g:vim_markdown_math = 1
-<
--------------------------------------------------------------------------------
-                                               *vim-markdown-yaml-front-matter*
-YAML Front Matter ~
-
-                                                   *g:vim_markdown_frontmatter*
-- 'g:vim_markdown_frontmatter'
-
-  Highlight YAML front matter as used by Jekyll or Hugo [7].
->
-  let g:vim_markdown_frontmatter = 1
-<
--------------------------------------------------------------------------------
-                                               *vim-markdown-toml-front-matter*
-TOML Front Matter ~
-
-                                              *g:vim_markdown_toml_frontmatter*
-- 'g:vim_markdown_toml_frontmatter'
-
-  Highlight TOML front matter as used by Hugo [7].
-
-  TOML syntax highlight requires vim-toml [8].
->
-  let g:vim_markdown_toml_frontmatter = 1
-<
--------------------------------------------------------------------------------
-                                               *vim-markdown-json-front-matter*
-JSON Front Matter ~
-
-                                              *g:vim_markdown_json_frontmatter*
-- 'g:vim_markdown_json_frontmatter'
-
-  Highlight JSON front matter as used by Hugo [7].
-
-  JSON syntax highlight requires vim-json [9].
->
-  let g:vim_markdown_json_frontmatter = 1
-<
--------------------------------------------------------------------------------
-                                                   *vim-markdown-strikethrough*
-Strikethrough ~
-
-                                                 *g:vim_markdown_strikethrough*
-- 'g:vim_markdown_strikethrough'
-
-  Strikethrough uses two tildes. '~~Scratch this.~~'
->
-  let g:vim_markdown_strikethrough = 1
-<
--------------------------------------------------------------------------------
-                                     *vim-markdown-adjust-new-list-item-indent*
-Adjust new list item indent ~
-
-                                          *g:vim_markdown_new_list_item_indent*
-- 'g:vim_markdown_new_list_item_indent'
-
-  You can adjust a new list indent. For example, you insert a single line
-  like below:
->
-  * item1
-<
-  Then if you type 'o' to insert new line in vim and type '* item2', the
-  result will be:
->
-  * item1
-      * item2
-<
-  vim-markdown automatically insert the indent. By default, the number of
-  spaces of indent is 4. If you'd like to change the number as 2, just write:
->
-  let g:vim_markdown_new_list_item_indent = 2
-<
--------------------------------------------------------------------------------
-                *vim-markdown-do-not-require-.md-extensions-for-markdown-links*
-Do not require .md extensions for Markdown links ~
-
-                                     *g:vim_markdown_no_extensions_in_markdown*
-- 'g:vim_markdown_no_extensions_in_markdown'
-
-  If you want to have a link like this '[link text](link-url)' and follow it
-  for editing in vim using the 'ge' command, but have it open the file "link-
-  url.md" instead of the file "link-url", then use this option:
->
-  let g:vim_markdown_no_extensions_in_markdown = 1
-<
-  This is super useful for GitLab and GitHub wiki repositories.
-
-  Normal behaviour would be that vim-markup required you to do this '[link
-  text](link-url.md)', but this is not how the Gitlab and GitHub wiki
-  repositories work. So this option adds some consistency between the two.
-
--------------------------------------------------------------------------------
-                                  *vim-markdown-auto-write-when-following-link*
-Auto-write when following link ~
-
-                                                     *g:vim_markdown_autowrite*
-- 'g:vim_markdown_autowrite'
-
-  If you follow a link like this '[link text](link-url)' using the 'ge'
-  shortcut, this option will automatically save any edits you made before
-  moving you:
->
-  let g:vim_markdown_autowrite = 1
-<
--------------------------------------------------------------------------------
-                                   *vim-markdown-change-default-file-extension*
-Change default file extension ~
-
-                                            *g:vim_markdown_auto_extension_ext*
-- 'g:vim_markdown_auto_extension_ext'
-
-  If you would like to use a file extension other than '.md' you may do so
-  using the 'vim_markdown_auto_extension_ext' variable:
->
-  let g:vim_markdown_auto_extension_ext = 'txt'
-<
--------------------------------------------------------------------------------
-                        *vim-markdown-do-not-automatically-insert-bulletpoints*
-Do not automatically insert bulletpoints ~
-
-                                           *g:vim_markdown_auto_insert_bullets*
-- 'g:vim_markdown_auto_insert_bullets'
-
-  Automatically inserting bulletpoints can lead to problems when wrapping
-  text (see issue #232 for details), so it can be disabled:
->
-  let g:vim_markdown_auto_insert_bullets = 0
-<
-  In that case, you probably also want to set the new list item indent to 0
-  as well, or you will have to remove an indent each time you add a new list
-  item:
->
-  let g:vim_markdown_new_list_item_indent = 0
-<
--------------------------------------------------------------------------------
-                                    *vim-markdown-change-how-to-open-new-files*
-Change how to open new files ~
-
-                                                   *g:vim_markdown_edit_url_in*
-- 'g:vim_markdown_edit_url_in'
-
-  By default when following a link the target file will be opened in your
-  current buffer. This behavior can change if you prefer using splits or tabs
-  by using the 'vim_markdown_edit_url_in' variable. Possible values are
-  'tab', 'vsplit', 'hsplit', 'current' opening in a new tab, vertical split,
-  horizontal split, and current buffer respectively. Defaults to current
-  buffer if not set:
->
-  let g:vim_markdown_edit_url_in = 'tab'
-<
-===============================================================================
-                                                        *vim-markdown-mappings*
-Mappings ~
-
-The following work on normal and visual modes:
-
-                                                              *vim-markdown-gx*
-- 'gx': open the link under the cursor in the same browser as the standard
-  'gx' command. '<Plug>Markdown_OpenUrlUnderCursor'
-
-  The standard 'gx' is extended by allowing you to put your cursor anywhere
-  inside a link.
-
-  For example, all the following cursor positions will work:
->
-  [Example](http://example.com)
-  ^  ^    ^^   ^       ^
-  1  2    34   5       6
-
-  <http://example.com>
-  ^  ^               ^
-  1  2               3
-<
-  Known limitation: does not work for links that span multiple lines.
-
-                                                              *vim-markdown-ge*
-- 'ge': open the link under the cursor in Vim for editing. Useful for
-  relative markdown links. '<Plug>Markdown_EditUrlUnderCursor'
-
-  The rules for the cursor position are the same as the 'gx' command.
-
-                                                              *vim-markdown-]]*
-- ']]': go to next header. '<Plug>Markdown_MoveToNextHeader'
-
-                                                              *vim-markdown-[[*
-- '[[': go to previous header. Contrast with ']c'.
-  '<Plug>Markdown_MoveToPreviousHeader'
-
-                                                              *vim-markdown-][*
-- '][': go to next sibling header if any.
-  '<Plug>Markdown_MoveToNextSiblingHeader'
-
-                                                              *vim-markdown-[]*
-- '[]': go to previous sibling header if any.
-  '<Plug>Markdown_MoveToPreviousSiblingHeader'
-
-                                                              *vim-markdown-]c*
-- ']c': go to Current header. '<Plug>Markdown_MoveToCurHeader'
-
-                                                              *vim-markdown-]u*
-- ']u': go to parent header (Up). '<Plug>Markdown_MoveToParentHeader'
-
-This plugin follows the recommended Vim plugin mapping interface, so to change
-the map ']u' to 'asdf', add to your '.vimrc':
->
-  map asdf <Plug>Markdown_MoveToParentHeader
-<
-To disable a map use:
->
-  map <Plug> <Plug>Markdown_MoveToParentHeader
-<
-===============================================================================
-                                                        *vim-markdown-commands*
-Commands ~
-
-The following requires ':filetype plugin on'.
-
-                                                              *:HeaderDecrease*
-- ':HeaderDecrease':
-
-  Decrease level of all headers in buffer: 'h2' to 'h1', 'h3' to 'h2', etc.
-
-  If range is given, only operate in the range.
-
-  If an 'h1' would be decreased, abort.
-
-  For simplicity of implementation, Setex headers are converted to Atx.
-
-                                                              *:HeaderIncrease*
-- ':HeaderIncrease': Analogous to ':HeaderDecrease', but increase levels
-  instead.
-
-                                                                  *:SetexToAtx*
-- ':SetexToAtx':
-
-  Convert all Setex style headers in buffer to Atx.
-
-  If a range is given, e.g. hit ':' from visual mode, only operate on the
-  range.
-
-                                                                 *:TableFormat*
-- ':TableFormat': Format the table under the cursor like this [10].
-
-  Requires Tabular [11].
-
-  The input table _must_ already have a separator line as the second line of
-  the table. That line only needs to contain the correct pipes '|', nothing
-  else is required.
-
-                                                                         *:Toc*
-- ':Toc': create a quickfix vertical window navigable table of contents with
-  the headers.
-
-  Hit '<Enter>' on a line to jump to the corresponding line of the markdown
-  file.
-
-                                                                        *:Toch*
-- ':Toch': Same as ':Toc' but in an horizontal window.
-
-                                                                        *:Toct*
-- ':Toct': Same as ':Toc' but in a new tab.
-
-                                                                        *:Tocv*
-- ':Tocv': Same as ':Toc' for symmetry with ':Toch' and ':Tocv'.
-
-===============================================================================
-                                                         *vim-markdown-credits*
-Credits ~
-
-The main contributors of vim-markdown are:
-
-- **Ben Williams** (A.K.A. **plasticboy**). The original developer of vim-
-  markdown. Homepage [12].
-
-If you feel that your name should be on this list, please make a pull request
-listing your contributions.
-
-===============================================================================
-                                                         *vim-markdown-license*
-License ~
-
-The MIT License (MIT)
-
-Copyright (c) 2012 Benjamin D. Williams
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-===============================================================================
-                                                      *vim-markdown-references*
-References ~
-
-[1] http://daringfireball.net/projects/markdown/
-[2] https://github.com/gmarik/vundle
-[3] https://github.com/tpope/vim-pathogen
-[4] http://packages.qa.debian.org/v/vim-addon-manager.html
-[5] https://github.com/plasticboy/vim-markdown/archive/master.tar.gz
-[6] https://github.com/klen/python-mode
-[7] https://gohugo.io/content/front-matter/
-[8] https://github.com/cespare/vim-toml
-[9] https://github.com/elzr/vim-json
-[10] http://www.cirosantilli.com/markdown-style-guide/#tables
-[11] https://github.com/godlygeek/tabular
-[12] http://plasticboy.com/
-
-vim: ft=help
-
-endif
diff --git a/doc/vim-raml.txt b/doc/vim-raml.txt
deleted file mode 100644
index ea26798c4..000000000
--- a/doc/vim-raml.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
-
-# vim-raml
-Vim syntax and language settings for RAML
-
-About
----
-vim-raml is a superset of Vim's own syntax settings for YAML, as RAML itself
-is a superset of YAML. Obviously, filetype detection is provided for RAML
-files as well to make use of the expanded syntax, as well language formatting
-defaults.
-
-You'll notice several changes over using the default YAML syntax file:
- - The RAML version header, manditory in RAML now stands out brightly,
-   rather than looking like a comment.
- - Parameter interpolation i.e. ```<<thing>>``` is highlighted inside of blocks
-   and values.
- - Delimiters and blocks i.e. ```-, |, etc``` are consistently highlighted
-   (flaky in YAML).
- - HTTP verbs, response codes, data types, and route definitions are all
-   colored separately from regular keys to help immediately distingush
-   different levels of the data structure.
-   - HTTP verbs include all that are supported by RAML: get, post, put, delete,
-     head, patch, and options
-   - Response codes e.g. 200, 201, 404, 401, etc are colored like numbers
-     (for obvious reasons)
-   - Data types e.g. ```type: integer```. Supports all RAML datatypes. string,
-     number, integer, date, boolean, and file.
-   - Route definitions: these include ```/posts:``` or ```/{id}:```
-
-Installation
----
-vim-raml doesn't have any strange or esoteric requirements.
-Provided you're using Vundle, Pathogen or any of the other standard Vim
-plugin managers. You can install vim-raml exactly how you'd expect.
-
-For completeness, to install via Vundle just add the following into your
-.vimrc with your other plugins
-
-Plugin '.../.../'
-Plugin 'IN3D/vim-raml'
-Plugin '.../.../'
-
-Then run:
-
-:source %
-:PluginInstall
-
-
-Or for Pathogen:
-
-cd ~/.vim/bundle
-git clone https://github.com/IN3D/vim-raml.git
-
-And Pathogen should pick it up the next time Vim is started.
-
-
-Questions, suggestions, and issues
----
-If you have a question, suggestion, or have found an issue with vim-raml.
-The best way to bring it to my attention is to open an issue at
-https://github.com/IN3D/vim-raml/issues
-
-endif
diff --git a/scripts/build b/scripts/build
index b3867b976..91a7a26cd 100755
--- a/scripts/build
+++ b/scripts/build
@@ -474,10 +474,10 @@ def rule_to_code(rule)
 end
 
 def extract(packages)
-  all_dirs = %w(syntax indent doc compiler ftplugin ctags extras after)
+  all_dirs = %w(syntax indent compiler ftplugin ctags extras after)
 
   default_dirs = %w(
-    syntax indent doc compiler autoload ftplugin ctags extras
+    syntax indent compiler autoload ftplugin ctags extras
     after/syntax after/indent after/ftplugin
   )
 

From 5297baf28553a593518f47b1a941a9ea8540829a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 03:05:39 +0200
Subject: [PATCH 157/299] Add doc for polyglot

---
 doc/polyglot.txt | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 doc/polyglot.txt

diff --git a/doc/polyglot.txt b/doc/polyglot.txt
new file mode 100644
index 000000000..14d8b9972
--- /dev/null
+++ b/doc/polyglot.txt
@@ -0,0 +1,31 @@
+*polyglot-vim-plugin*  Language pack for Vim
+
+CONFIGURATION                                    *polyglot.vim*
+
+_|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|
+___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|__
+_|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|
+___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|__
+
+You can disable vim-polyglot by putting using `g:polyglot_disabled`
+option. It needs to be defined before vim-polyglot is loaded.
+
+```
+let g:polyglot_disabled = ['javascript', 'autoindent', 'sensible']
+```
+
+What can be disabled:
+
+1. Language packs, like "javascript", "css" etc.
+2. Support for detecting indentation like vim-sleuth ('autoindent')
+3. Default vim settings from vim-sensible  ('sensible')
+
+
+You can file bugs, and find more information at:
+
+https://github.com/sheerun/vim-polyglot
+
+_|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|
+___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|__
+_|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|
+___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|__

From 8c1ec94a3cd749b9aaefe757605cabb63ed63a92 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 03:10:32 +0200
Subject: [PATCH 158/299] Change ascii art

---
 doc/polyglot.txt | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/doc/polyglot.txt b/doc/polyglot.txt
index 14d8b9972..ace96d0f8 100644
--- a/doc/polyglot.txt
+++ b/doc/polyglot.txt
@@ -1,12 +1,11 @@
+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---
+ o | o   o | o   o | o   o | o   o | o   o | o   o | o   o | o   o 
+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---
+
 *polyglot-vim-plugin*  Language pack for Vim
 
 CONFIGURATION                                    *polyglot.vim*
 
-_|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|
-___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|__
-_|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|
-___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|__
-
 You can disable vim-polyglot by putting using `g:polyglot_disabled`
 option. It needs to be defined before vim-polyglot is loaded.
 
@@ -25,7 +24,6 @@ You can file bugs, and find more information at:
 
 https://github.com/sheerun/vim-polyglot
 
-_|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|
-___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|__
-_|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|
-___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|___|__
+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---
+ o | o   o | o   o | o   o | o   o | o   o | o   o | o   o | o   o 
+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---+---

From fbeca0ed90a84dab705719fa3788391d88716b98 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 03:14:58 +0200
Subject: [PATCH 159/299] Change link to vim repository

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 878926be7..131a8d518 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ git clone --depth 1 https://github.com/sheerun/vim-polyglot ~/.vim/pack/plugins/
 
 ## Language packs
 
-On top of all language packs from [vim repository](https://github.com/vim/vim/tree/master/runtime), vim-polyglot includes:
+On top of all language packs from [vim repository](https://github.com/vim/vim/tree/master/runtime/syntax), vim-polyglot includes:
 
 <!--Language Packs-->
 - [acpiasl](https://github.com/martinlroth/vim-acpi-asl) (Syntax highlighting for asl and dsl files)

From ad2df97a644fd3bbddd5314a37c24c91bdd3b427 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 09:10:39 +0200
Subject: [PATCH 160/299] Allow 6-spaces indent and do not set tabstop if
 changed

---
 ftdetect/polyglot.vim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 5bb1bc76d..c4b0d7209 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2722,7 +2722,7 @@ if !has_key(s:disabled_packages, 'autoindent')
         return 1
       elseif line[0] == " "
         let indent = len(matchstr(line, '^ *'))
-        if indent < minindent && index([2, 3, 4, 8], indent) >= 0
+        if indent < minindent && index([2, 3, 4, 6, 8], indent) >= 0
           let minindent = indent
         endif
       endif
@@ -2731,7 +2731,9 @@ if !has_key(s:disabled_packages, 'autoindent')
     if minindent < 10
       setlocal expandtab
       let &l:shiftwidth=minindent
-      let &l:tabstop=minindent
+      if &tabstop == 8
+        let &l:tabstop=minindent
+      endif
       let b:sleuth_culprit .= ':' . i
       return 1
     endif

From 1d7f0e4a7e0a6384cfbeaaa50e64779353be6f51 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 10:03:56 +0200
Subject: [PATCH 161/299] Remove non-relevant sensible settings

https://github.com/sheerun/vim-polyglot/commit/233a817f05ba73574539ed7395bde49d183a807a
---
 README.md           |  2 +-
 plugin/polyglot.vim | 48 +++++++--------------------------------------
 2 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/README.md b/README.md
index 131a8d518..a0146ead1 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A collection of language packs for Vim.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
-- Includes defaults from [vim-sensible](https://github.com/tpope/vim-sensible), which are usually necessary for editing in any language (can be disabled)
+- Includes some defaults from [vim-sensible](https://github.com/tpope/vim-sensible), which are usually necessary for editing in any language (can be disabled)
 
 \*To be completely honest, optimized `ftdetect` script takes around `10ms` to load.
 
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index 1b5d34e1f..a00ab88f2 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -15,6 +15,8 @@ endif
 
 " Code taken from https://github.com/tpope/vim-sensible
 " and (mostly comments) from https://github.com/sheerun/vimrc
+"
+" Only settings that matter for proper editing are left
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible')
 	" Autoindent when starting new line, or using `o` or `O`.
 	set autoindent
@@ -22,16 +24,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible')
 	" Allow backspace in insert mode.
 	set backspace=indent,eol,start
 
-	" Don't scan included files. The .tags file is more performant.
-	set complete-=i
-
-	" Use 'shiftwidth' when using `<Tab>` in front of a line.
-	" By default it's used only for shift commands (`<`, `>`).
-	set smarttab
-
-	" Disable octal format for number processing.
-	set nrformats-=octal
-
 	" Allow for mappings including `Esc`, while preserving
 	" zero timeout after pressing it manually.
 	" (only vim needs a fix for this)
@@ -43,33 +35,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible')
 	" Enable highlighted case-insensitive incremential search.
 	set incsearch
 
-	" Use <C-L> to clear the highlighting of :set hlsearch.
-	if maparg('<C-L>', 'n') ==# ''
-		nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
-	endif
-
-	" Always show window statuses, even if there's only one.
-	set laststatus=2
-
-	" Show the line and column number of the cursor position.
-	set ruler
-
-	" Autocomplete commands using nice menu in place of window status.
-	" Enable `Ctrl-N` and `Ctrl-P` to scroll through matches.
-	set wildmenu
-
-	" Keep 5 columns next to the cursor when scrolling horizontally.
-	if !&scrolloff
-		set scrolloff=1
-	endif
-	if !&sidescrolloff
-		set sidescrolloff=5
-	endif
-
-	" When 'wrap' is on, display last line even if it doesn't fit.
-	set display+=lastline
-
-	" Force utf-8 encoding
+	" Use utf-8 encoding by default
 	set encoding=utf-8
 
 	" Set default whitespace characters when using `:set list`
@@ -82,10 +48,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible')
 		set formatoptions+=j
 	endif
 
-	" Search upwards for tags file instead only locally
-	if has('path_extra')
-		setglobal tags-=./tags tags-=./tags; tags^=./tags;
-	endif
+  " Search upwards for tags file instead only locally
+  if has('path_extra')
+     setglobal tags-=./tags tags-=./tags; tags^=./tags;
+  endif
 
 	" Fix issues with fish shell
 	" https://github.com/tpope/vim-sensible/issues/50

From 71a21a1044370c58b3a8ac3cea7905cdd625220e Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 10:05:33 +0200
Subject: [PATCH 162/299] Use spaces instead of tabs

---
 plugin/polyglot.vim | 148 ++++++++++++++++++++++----------------------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index a00ab88f2..f23df6bf3 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -10,7 +10,7 @@ endif
 
 " No need to duplicate work
 if exists('g:loaded_sensible')
-	finish
+  finish
 endif
 
 " Code taken from https://github.com/tpope/vim-sensible
@@ -18,86 +18,86 @@ endif
 "
 " Only settings that matter for proper editing are left
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible')
-	" Autoindent when starting new line, or using `o` or `O`.
-	set autoindent
-
-	" Allow backspace in insert mode.
-	set backspace=indent,eol,start
-
-	" Allow for mappings including `Esc`, while preserving
-	" zero timeout after pressing it manually.
-	" (only vim needs a fix for this)
-	if !has('nvim') && &ttimeoutlen == -1
-		set ttimeout
-		set ttimeoutlen=100
-	endif
+  " Autoindent when starting new line, or using `o` or `O`.
+  set autoindent
+
+  " Allow backspace in insert mode.
+  set backspace=indent,eol,start
+
+  " Allow for mappings including `Esc`, while preserving
+  " zero timeout after pressing it manually.
+  " (only vim needs a fix for this)
+  if !has('nvim') && &ttimeoutlen == -1
+    set ttimeout
+    set ttimeoutlen=100
+  endif
 
-	" Enable highlighted case-insensitive incremential search.
-	set incsearch
+  " Enable highlighted case-insensitive incremential search.
+  set incsearch
 
-	" Use utf-8 encoding by default
-	set encoding=utf-8
+  " Use utf-8 encoding by default
+  set encoding=utf-8
 
-	" Set default whitespace characters when using `:set list`
-	if &listchars ==# 'eol:$'
-		set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
-	endif
+  " Set default whitespace characters when using `:set list`
+  if &listchars ==# 'eol:$'
+    set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
+  endif
 
-	" Delete comment character when joining commented lines
-	if v:version > 703 || v:version == 703 && has("patch541")
-		set formatoptions+=j
-	endif
+  " Delete comment character when joining commented lines
+  if v:version > 703 || v:version == 703 && has("patch541")
+    set formatoptions+=j
+  endif
 
   " Search upwards for tags file instead only locally
   if has('path_extra')
-     setglobal tags-=./tags tags-=./tags; tags^=./tags;
+    setglobal tags-=./tags tags-=./tags; tags^=./tags;
+  endif
+
+  " Fix issues with fish shell
+  " https://github.com/tpope/vim-sensible/issues/50
+  if &shell =~# 'fish$' && (v:version < 704 || v:version == 704 && !has('patch276'))
+    set shell=/usr/bin/env\ bash
+  endif
+
+  " Reload unchanged files automatically.
+  set autoread
+
+  " Increase history size to 1000 items.
+  if &history < 1000
+    set history=1000
+  endif
+
+  " Allow for up to 50 opened tabs on Vim start.
+  if &tabpagemax < 50
+    set tabpagemax=50
+  endif
+
+  " Always save upper case variables to viminfo file.
+  if !empty(&viminfo)
+    set viminfo^=!
+  endif
+
+  " Don't save options in sessions and views
+  set sessionoptions-=options
+  set viewoptions-=options
+
+  " Allow color schemes to do bright colors without forcing bold.
+  if &t_Co == 8 && $TERM !~# '^Eterm'
+    set t_Co=16
   endif
 
-	" Fix issues with fish shell
-	" https://github.com/tpope/vim-sensible/issues/50
-	if &shell =~# 'fish$' && (v:version < 704 || v:version == 704 && !has('patch276'))
-		set shell=/usr/bin/env\ bash
-	endif
-
-	" Reload unchanged files automatically.
-	set autoread
-
-	" Increase history size to 1000 items.
-	if &history < 1000
-		set history=1000
-	endif
-
-	" Allow for up to 50 opened tabs on Vim start.
-	if &tabpagemax < 50
-		set tabpagemax=50
-	endif
-
-	" Always save upper case variables to viminfo file.
-	if !empty(&viminfo)
-		set viminfo^=!
-	endif
-
-	" Don't save options in sessions and views
-	set sessionoptions-=options
-	set viewoptions-=options
-
-	" Allow color schemes to do bright colors without forcing bold.
-	if &t_Co == 8 && $TERM !~# '^Eterm'
-		set t_Co=16
-	endif
-
-	" Load matchit.vim, but only if the user hasn't installed a newer version.
-	if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
-		runtime! macros/matchit.vim
-	endif
-
-	" `Ctrl-U` in insert mode deletes a lot. Use `Ctrl-G` u to first break undo,
-	" so that you can undo `Ctrl-U` without undoing what you typed before it.
-	if empty(mapcheck('<C-U>', 'i'))
-		inoremap <C-U> <C-G>u<C-U>
-	endif
-
-	if empty(mapcheck('<C-W>', 'i'))
-		inoremap <C-W> <C-G>u<C-W>
-	endif
+  " Load matchit.vim, but only if the user hasn't installed a newer version.
+  if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
+    runtime! macros/matchit.vim
+  endif
+
+  " `Ctrl-U` in insert mode deletes a lot. Use `Ctrl-G` u to first break undo,
+  " so that you can undo `Ctrl-U` without undoing what you typed before it.
+  if empty(mapcheck('<C-U>', 'i'))
+    inoremap <C-U> <C-G>u<C-U>
+  endif
+
+  if empty(mapcheck('<C-W>', 'i'))
+    inoremap <C-W> <C-G>u<C-W>
+  endif
 endif

From 903793ac04b9fbc06f3e0b6e63113a0dd4c87940 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 11:00:16 +0200
Subject: [PATCH 163/299] Improve indent heuristics (count increments /
 decrements), fixes #592

---
 ftdetect/polyglot.vim | 79 ++++++++++++++++++++++++++++++-------------
 1 file changed, 55 insertions(+), 24 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index c4b0d7209..69934c489 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2634,7 +2634,19 @@ if !has_key(s:disabled_packages, 'autoindent')
   " Code below re-implements sleuth for vim-polyglot
   let g:loaded_sleuth = 1
 
-  function! s:guess(lines) abort
+  func! s:get_shiftwidth(indents) abort
+    let shiftwidth = 0
+    let max_count = 0
+    for [indent, indent_count] in items(a:indents)
+      if indent_count > max_count
+        let shiftwidth = indent
+        let max_count = indent_count
+      endif
+    endfor
+    return shiftwidth
+  endfunc
+
+  func! s:guess(lines) abort
     let options = {}
     let ccomment = 0
     let podcomment = 0
@@ -2644,12 +2656,15 @@ if !has_key(s:disabled_packages, 'autoindent')
     let heredoc = ''
     let minindent = 10
     let spaces_minus_tabs = 0
-    let i = 0
+    let lineno = 0
+    let indents = { '2': 0, '3': 0, '4': 0, '6': 0, '8': 0 }
+    let next_indent_lineno = 1
+    let prev_indent = 0
 
     for line in a:lines
-      let i += 1
+      let lineno += 1
 
-      if !len(line) || line =~# '^\S+$'
+      if line =~# '^\s*$'
         continue
       endif
 
@@ -2713,35 +2728,45 @@ if !has_key(s:disabled_packages, 'autoindent')
         let heredoc = herematch[1] . '$'
       endif
 
-      let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
-
       if line[0] == "\t"
-        setlocal noexpandtab
-        let &l:shiftwidth=&tabstop
-        let b:sleuth_culprit .= ':' . i
-        return 1
-      elseif line[0] == " "
+        let spaces_minus_tabs -= 1
+      else
+        let spaces_minus_tabs += 1
         let indent = len(matchstr(line, '^ *'))
-        if indent < minindent && index([2, 3, 4, 6, 8], indent) >= 0
-          let minindent = indent
+        let indent_inc = abs(indent - prev_indent)
+
+        if indent_inc > 0 && lineno == next_indent_lineno
+          if has_key(indents, indent_inc)
+            let indents[indent_inc] += 1
+          endif
         endif
+
+        let next_indent_lineno = lineno + 1
+        let prev_indent = indent
       endif
     endfor
 
-    if minindent < 10
+    if spaces_minus_tabs < 0
+      setlocal noexpandtab
+      let &l:shiftwidth=&tabstop
+      return 1
+    endif
+
+    let shiftwidth = s:get_shiftwidth(indents)
+
+    if shiftwidth > 0
       setlocal expandtab
-      let &l:shiftwidth=minindent
+      let &l:shiftwidth=shiftwidth
       if &tabstop == 8
-        let &l:tabstop=minindent
+        let &l:tabstop=shiftwidth
       endif
-      let b:sleuth_culprit .= ':' . i
       return 1
     endif
 
     return 0
-  endfunction
+  endfunc
 
-  function! s:detect_indent() abort
+  func! s:detect_indent() abort
     if &buftype ==# 'help'
       return
     endif
@@ -2757,7 +2782,7 @@ if !has_key(s:disabled_packages, 'autoindent')
     endif
 
     let b:sleuth_culprit = expand("<afile>:p")
-    if s:guess(getline(1, 32))
+    if s:guess(getline(1, 64))
       return
     endif
     if s:guess(getline(1, 1024))
@@ -2794,12 +2819,18 @@ if !has_key(s:disabled_packages, 'autoindent')
       let level -= 1
     endwhile
 
-    unlet b:sleuth_culprit
-  endfunction
+    setlocal expandtab
+    let &l:shiftwidth = 2
+    if &tabstop == 8
+      let &l:tabstop = 2
+    endif
+
+    let b:sleuth_culprit = "default"
+  endfunc
 
   set smarttab
 
-  function! SleuthIndicator() abort
+  func! SleuthIndicator() abort
     let sw = &shiftwidth ? &shiftwidth : &tabstop
     if &expandtab
       return 'sw='.sw
@@ -2808,7 +2839,7 @@ if !has_key(s:disabled_packages, 'autoindent')
     else
       return 'sw='.sw.',ts='.&tabstop
     endif
-  endfunction
+  endfunc
 
   augroup polyglot-sleuth
     au!

From b64fcedd82f188e7951585c6dda5efc5f4a497b2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 11:24:31 +0200
Subject: [PATCH 164/299] Count only increments in indent, also respect
 ftplugin settings

---
 ftdetect/polyglot.vim | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 69934c489..83198ebc3 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2733,7 +2733,7 @@ if !has_key(s:disabled_packages, 'autoindent')
       else
         let spaces_minus_tabs += 1
         let indent = len(matchstr(line, '^ *'))
-        let indent_inc = abs(indent - prev_indent)
+        let indent_inc = indent - prev_indent
 
         if indent_inc > 0 && lineno == next_indent_lineno
           if has_key(indents, indent_inc)
@@ -2771,14 +2771,9 @@ if !has_key(s:disabled_packages, 'autoindent')
       return
     endif
 
-    if &expandtab
-      " Make tabstop to be synchronized with shiftwidth by default
-      " Some plugins are using &shiftwidth directly or accessing &tabstop
-      if &tabstop != 8 || &shiftwidth == 0
-        let &shiftwidth = &tabstop
-      else
-        let &tabstop = &shiftwidth
-      endif
+    " Do not autodetect indent if language sets it
+    if &l:shiftwidth != &g:shiftwidth
+      return
     endif
 
     let b:sleuth_culprit = expand("<afile>:p")

From 86bf33aa3bdaa836fbd1537d1ba6a63b58b088bd Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 19:49:44 +0200
Subject: [PATCH 165/299] Use conf for /etc/hosts, fixes #595

---
 ftdetect/polyglot.vim | 2 +-
 packages.yaml         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 83198ebc3..02554c1f5 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2545,7 +2545,7 @@ if !has_key(s:disabled_packages, 'alsaconf')
 endif
 
 if !has_key(s:disabled_packages, 'conf')
-  au BufNewFile,BufRead *.conf,auto.master,config setf conf
+  au BufNewFile,BufRead *.conf,*/etc/hosts,auto.master,config setf conf
 endif
 
 if !has_key(s:disabled_packages, 'master')
diff --git a/packages.yaml b/packages.yaml
index 4590b31bd..dc24c858e 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1958,6 +1958,7 @@ filetypes:
   filenames:
   - auto.master
   - config
+  - '*/etc/hosts'
 ---
 name: b
 remote: vim/vim:runtime

From 78f6c8f318ad6ce429877498271d968961a83481 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 19 Oct 2020 20:32:40 +0200
Subject: [PATCH 166/299] Improve autoindent heuristics (count diff of multiple
 lines of same indent)

---
 ftdetect/polyglot.vim | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 02554c1f5..29c13c357 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2657,9 +2657,8 @@ if !has_key(s:disabled_packages, 'autoindent')
     let minindent = 10
     let spaces_minus_tabs = 0
     let lineno = 0
+    let stack = [0]
     let indents = { '2': 0, '3': 0, '4': 0, '6': 0, '8': 0 }
-    let next_indent_lineno = 1
-    let prev_indent = 0
 
     for line in a:lines
       let lineno += 1
@@ -2733,16 +2732,24 @@ if !has_key(s:disabled_packages, 'autoindent')
       else
         let spaces_minus_tabs += 1
         let indent = len(matchstr(line, '^ *'))
-        let indent_inc = indent - prev_indent
+        while stack[-1] > indent
+          call remove(stack, -1)
+        endwhile
 
-        if indent_inc > 0 && lineno == next_indent_lineno
-          if has_key(indents, indent_inc)
-            let indents[indent_inc] += 1
-          endif
+        let indent_inc = indent - stack[-1]
+
+        if indent_inc == 0 && len(stack) > 1
+          let indent_inc = indent - stack[-2]
         endif
 
-        let next_indent_lineno = lineno + 1
-        let prev_indent = indent
+        if has_key(indents, indent_inc)
+          let indents[indent_inc] += 1
+          let prev_indent = indent
+        endif
+
+        if stack[-1] != indent
+          call add(stack, indent)
+        endif
       endif
     endfor
 
@@ -2777,7 +2784,7 @@ if !has_key(s:disabled_packages, 'autoindent')
     endif
 
     let b:sleuth_culprit = expand("<afile>:p")
-    if s:guess(getline(1, 64))
+    if s:guess(getline(1, 128))
       return
     endif
     if s:guess(getline(1, 1024))

From 4b8687ebca35811bd4e6ead1eb849d883369c425 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 21 Oct 2020 14:23:28 +0200
Subject: [PATCH 167/299] Fix deteting tab indents, closes #596

---
 ftdetect/polyglot.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 29c13c357..bac116248 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2730,7 +2730,9 @@ if !has_key(s:disabled_packages, 'autoindent')
       if line[0] == "\t"
         let spaces_minus_tabs -= 1
       else
-        let spaces_minus_tabs += 1
+        if line[0] == " "
+          let spaces_minus_tabs += 1
+        endif
         let indent = len(matchstr(line, '^ *'))
         while stack[-1] > indent
           call remove(stack, -1)

From 114f731483c4eacaa138ea4e8872719bd657db21 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 21 Oct 2020 14:26:54 +0200
Subject: [PATCH 168/299] Add missing menu file, fixes #597

---
 extras/menu.vim | 1199 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1199 insertions(+)
 create mode 100644 extras/menu.vim

diff --git a/extras/menu.vim b/extras/menu.vim
new file mode 100644
index 000000000..f969c1b18
--- /dev/null
+++ b/extras/menu.vim
@@ -0,0 +1,1199 @@
+" Vim support file to define the default menus
+" You can also use this as a start for your own set of menus.
+"
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2020 Mar 29
+
+" Note that ":an" (short for ":anoremenu") is often used to make a menu work
+" in all modes and avoid side effects from mappings defined by the user.
+
+" Make sure the '<' and 'C' flags are not included in 'cpoptions', otherwise
+" <CR> would not be recognized.  See ":help 'cpoptions'".
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Avoid installing the menus twice
+if !exists("did_install_default_menus")
+let did_install_default_menus = 1
+
+
+if exists("v:lang") || &langmenu != ""
+  " Try to find a menu translation file for the current language.
+  if &langmenu != ""
+    if &langmenu =~ "none"
+      let s:lang = ""
+    else
+      let s:lang = &langmenu
+    endif
+  else
+    let s:lang = v:lang
+  endif
+  " A language name must be at least two characters, don't accept "C"
+  " Also skip "en_US" to avoid picking up "en_gb" translations.
+  if strlen(s:lang) > 1 && s:lang !~? '^en_us'
+    " When the language does not include the charset add 'encoding'
+    if s:lang =~ '^\a\a$\|^\a\a_\a\a$'
+      let s:lang = s:lang . '.' . &enc
+    endif
+
+    " We always use a lowercase name.
+    " Change "iso-8859" to "iso_8859" and "iso8859" to "iso_8859", some
+    " systems appear to use this.
+    " Change spaces to underscores.
+    let s:lang = substitute(tolower(s:lang), '\.iso-', ".iso_", "")
+    let s:lang = substitute(s:lang, '\.iso8859', ".iso_8859", "")
+    let s:lang = substitute(s:lang, " ", "_", "g")
+    " Remove "@euro", otherwise "LC_ALL=de_DE@euro gvim" will show English menus
+    let s:lang = substitute(s:lang, "@euro", "", "")
+    " Change "iso_8859-1" and "iso_8859-15" to "latin1", we always use the
+    " same menu file for them.
+    let s:lang = substitute(s:lang, 'iso_8859-15\=$', "latin1", "")
+    menutrans clear
+    exe "runtime! lang/menu_" . s:lang . ".vim"
+
+    if !exists("did_menu_trans")
+      " There is no exact match, try matching with a wildcard added
+      " (e.g. find menu_de_de.iso_8859-1.vim if s:lang == de_DE).
+      let s:lang = substitute(s:lang, '\.[^.]*', "", "")
+      exe "runtime! lang/menu_" . s:lang . "[^a-z]*vim"
+
+      if !exists("did_menu_trans") && s:lang =~ '_'
+	" If the language includes a region try matching without that region.
+	" (e.g. find menu_de.vim if s:lang == de_DE).
+	let langonly = substitute(s:lang, '_.*', "", "")
+	exe "runtime! lang/menu_" . langonly . "[^a-z]*vim"
+      endif
+
+      if !exists("did_menu_trans") && strlen($LANG) > 1 && s:lang !~ '^en_us'
+	" On windows locale names are complicated, try using $LANG, it might
+	" have been set by set_init_1().  But don't do this for "en" or "en_us".
+	" But don't match "slovak" when $LANG is "sl".
+	exe "runtime! lang/menu_" . tolower($LANG) . "[^a-z]*vim"
+      endif
+    endif
+  endif
+endif
+
+
+" Help menu
+an 9999.10 &Help.&Overview<Tab><F1>	:help<CR>
+an 9999.20 &Help.&User\ Manual		:help usr_toc<CR>
+an 9999.30 &Help.&How-To\ Links		:help how-to<CR>
+an <silent> 9999.40 &Help.&Find\.\.\.	:call <SID>Helpfind()<CR>
+an 9999.45 &Help.-sep1-			<Nop>
+an 9999.50 &Help.&Credits		:help credits<CR>
+an 9999.60 &Help.Co&pying		:help copying<CR>
+an 9999.70 &Help.&Sponsor/Register	:help sponsor<CR>
+an 9999.70 &Help.O&rphans		:help kcc<CR>
+an 9999.75 &Help.-sep2-			<Nop>
+an 9999.80 &Help.&Version		:version<CR>
+an 9999.90 &Help.&About			:intro<CR>
+
+fun! s:Helpfind()
+  if !exists("g:menutrans_help_dialog")
+    let g:menutrans_help_dialog = "Enter a command or word to find help on:\n\nPrepend i_ for Input mode commands (e.g.: i_CTRL-X)\nPrepend c_ for command-line editing commands (e.g.: c_<Del>)\nPrepend ' for an option name (e.g.: 'shiftwidth')"
+  endif
+  let h = inputdialog(g:menutrans_help_dialog)
+  if h != ""
+    let v:errmsg = ""
+    silent! exe "help " . h
+    if v:errmsg != ""
+      echo v:errmsg
+    endif
+  endif
+endfun
+
+" File menu
+an 10.310 &File.&Open\.\.\.<Tab>:e		:browse confirm e<CR>
+an 10.320 &File.Sp&lit-Open\.\.\.<Tab>:sp	:browse sp<CR>
+an 10.320 &File.Open\ Tab\.\.\.<Tab>:tabnew	:browse tabnew<CR>
+an 10.325 &File.&New<Tab>:enew			:confirm enew<CR>
+an <silent> 10.330 &File.&Close<Tab>:close
+	\ :if winheight(2) < 0 && tabpagewinnr(2) == 0 <Bar>
+	\   confirm enew <Bar>
+	\ else <Bar>
+	\   confirm close <Bar>
+	\ endif<CR>
+an 10.335 &File.-SEP1-				<Nop>
+an <silent> 10.340 &File.&Save<Tab>:w		:if expand("%") == ""<Bar>browse confirm w<Bar>else<Bar>confirm w<Bar>endif<CR>
+an 10.350 &File.Save\ &As\.\.\.<Tab>:sav	:browse confirm saveas<CR>
+
+if has("diff")
+  an 10.400 &File.-SEP2-			<Nop>
+  an 10.410 &File.Split\ &Diff\ With\.\.\.	:browse vert diffsplit<CR>
+  an 10.420 &File.Split\ Patched\ &By\.\.\.	:browse vert diffpatch<CR>
+endif
+
+if has("printer")
+  an 10.500 &File.-SEP3-			<Nop>
+  an 10.510 &File.&Print			:hardcopy<CR>
+  vunmenu   &File.&Print
+  vnoremenu &File.&Print			:hardcopy<CR>
+elseif has("unix")
+  an 10.500 &File.-SEP3-			<Nop>
+  an 10.510 &File.&Print			:w !lpr<CR>
+  vunmenu   &File.&Print
+  vnoremenu &File.&Print			:w !lpr<CR>
+endif
+an 10.600 &File.-SEP4-				<Nop>
+an 10.610 &File.Sa&ve-Exit<Tab>:wqa		:confirm wqa<CR>
+an 10.620 &File.E&xit<Tab>:qa			:confirm qa<CR>
+
+func s:SelectAll()
+  exe "norm! gg" . (&slm == "" ? "VG" : "gH\<C-O>G")
+endfunc
+
+func s:FnameEscape(fname)
+  if exists('*fnameescape')
+    return fnameescape(a:fname)
+  endif
+  return escape(a:fname, " \t\n*?[{`$\\%#'\"|!<")
+endfunc
+
+" Edit menu
+an 20.310 &Edit.&Undo<Tab>u			u
+an 20.320 &Edit.&Redo<Tab>^R			<C-R>
+an 20.330 &Edit.Rep&eat<Tab>\.			.
+
+an 20.335 &Edit.-SEP1-				<Nop>
+vnoremenu 20.340 &Edit.Cu&t<Tab>"+x		"+x
+vnoremenu 20.350 &Edit.&Copy<Tab>"+y		"+y
+cnoremenu 20.350 &Edit.&Copy<Tab>"+y		<C-Y>
+if exists(':tlmenu')
+  tlnoremenu 20.350 &Edit.&Copy<Tab>"+y 	<C-W>:<C-Y><CR>
+endif
+nnoremenu 20.360 &Edit.&Paste<Tab>"+gP		"+gP
+cnoremenu	 &Edit.&Paste<Tab>"+gP		<C-R>+
+if exists(':tlmenu')
+  tlnoremenu	 &Edit.&Paste<Tab>"+gP		<C-W>"+
+endif
+exe 'vnoremenu <script> &Edit.&Paste<Tab>"+gP	' . paste#paste_cmd['v']
+exe 'inoremenu <script> &Edit.&Paste<Tab>"+gP	' . paste#paste_cmd['i']
+nnoremenu 20.370 &Edit.Put\ &Before<Tab>[p	[p
+inoremenu	 &Edit.Put\ &Before<Tab>[p	<C-O>[p
+nnoremenu 20.380 &Edit.Put\ &After<Tab>]p	]p
+inoremenu	 &Edit.Put\ &After<Tab>]p	<C-O>]p
+if has("win32")
+  vnoremenu 20.390 &Edit.&Delete<Tab>x		x
+endif
+noremenu  <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG	:<C-U>call <SID>SelectAll()<CR>
+inoremenu <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG	<C-O>:call <SID>SelectAll()<CR>
+cnoremenu <script> <silent> 20.400 &Edit.&Select\ All<Tab>ggVG	<C-U>call <SID>SelectAll()<CR>
+
+an 20.405	 &Edit.-SEP2-				<Nop>
+if has("win32") || has("gui_gtk") || has("gui_kde") || has("gui_motif")
+  an 20.410	 &Edit.&Find\.\.\.			:promptfind<CR>
+  vunmenu	 &Edit.&Find\.\.\.
+  vnoremenu <silent>	 &Edit.&Find\.\.\.		y:promptfind <C-R>=<SID>FixFText()<CR><CR>
+  an 20.420	 &Edit.Find\ and\ Rep&lace\.\.\.	:promptrepl<CR>
+  vunmenu	 &Edit.Find\ and\ Rep&lace\.\.\.
+  vnoremenu <silent>	 &Edit.Find\ and\ Rep&lace\.\.\. y:promptrepl <C-R>=<SID>FixFText()<CR><CR>
+else
+  an 20.410	 &Edit.&Find<Tab>/			/
+  an 20.420	 &Edit.Find\ and\ Rep&lace<Tab>:%s	:%s/
+  vunmenu	 &Edit.Find\ and\ Rep&lace<Tab>:%s
+  vnoremenu	 &Edit.Find\ and\ Rep&lace<Tab>:s	:s/
+endif
+
+an 20.425	 &Edit.-SEP3-				<Nop>
+an 20.430	 &Edit.Settings\ &Window		:options<CR>
+an 20.435	 &Edit.Startup\ &Settings		:call <SID>EditVimrc()<CR>
+
+fun! s:EditVimrc()
+  if $MYVIMRC != ''
+    let fname = $MYVIMRC
+  elseif has("win32")
+    if $HOME != ''
+      let fname = $HOME . "/_vimrc"
+    else
+      let fname = $VIM . "/_vimrc"
+    endif
+  elseif has("amiga")
+    let fname = "s:.vimrc"
+  else
+    let fname = $HOME . "/.vimrc"
+  endif
+  let fname = s:FnameEscape(fname)
+  if &mod
+    exe "split " . fname
+  else
+    exe "edit " . fname
+  endif
+endfun
+
+fun! s:FixFText()
+  " Fix text in nameless register to be used with :promptfind.
+  return substitute(@", "[\r\n]", '\\n', 'g')
+endfun
+
+" Edit/Global Settings
+an 20.440.100 &Edit.&Global\ Settings.Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	:set hls! hls?<CR>
+an 20.440.110 &Edit.&Global\ Settings.Toggle\ &Ignoring\ Case<Tab>:set\ ic!	:set ic! ic?<CR>
+an 20.440.110 &Edit.&Global\ Settings.Toggle\ &Showing\ Matched\ Pairs<Tab>:set\ sm!	:set sm! sm?<CR>
+
+an 20.440.120 &Edit.&Global\ Settings.&Context\ Lines.\ 1\  :set so=1<CR>
+an 20.440.120 &Edit.&Global\ Settings.&Context\ Lines.\ 2\  :set so=2<CR>
+an 20.440.120 &Edit.&Global\ Settings.&Context\ Lines.\ 3\  :set so=3<CR>
+an 20.440.120 &Edit.&Global\ Settings.&Context\ Lines.\ 4\  :set so=4<CR>
+an 20.440.120 &Edit.&Global\ Settings.&Context\ Lines.\ 5\  :set so=5<CR>
+an 20.440.120 &Edit.&Global\ Settings.&Context\ Lines.\ 7\  :set so=7<CR>
+an 20.440.120 &Edit.&Global\ Settings.&Context\ Lines.\ 10\  :set so=10<CR>
+an 20.440.120 &Edit.&Global\ Settings.&Context\ Lines.\ 100\  :set so=100<CR>
+
+an 20.440.130.40 &Edit.&Global\ Settings.&Virtual\ Edit.Never :set ve=<CR>
+an 20.440.130.50 &Edit.&Global\ Settings.&Virtual\ Edit.Block\ Selection :set ve=block<CR>
+an 20.440.130.60 &Edit.&Global\ Settings.&Virtual\ Edit.Insert\ Mode :set ve=insert<CR>
+an 20.440.130.70 &Edit.&Global\ Settings.&Virtual\ Edit.Block\ and\ Insert :set ve=block,insert<CR>
+an 20.440.130.80 &Edit.&Global\ Settings.&Virtual\ Edit.Always :set ve=all<CR>
+an 20.440.140 &Edit.&Global\ Settings.Toggle\ Insert\ &Mode<Tab>:set\ im!	:set im!<CR>
+an 20.440.145 &Edit.&Global\ Settings.Toggle\ Vi\ C&ompatibility<Tab>:set\ cp!	:set cp!<CR>
+an <silent> 20.440.150 &Edit.&Global\ Settings.Search\ &Path\.\.\.  :call <SID>SearchP()<CR>
+an <silent> 20.440.160 &Edit.&Global\ Settings.Ta&g\ Files\.\.\.  :call <SID>TagFiles()<CR>
+"
+" GUI options
+an 20.440.300 &Edit.&Global\ Settings.-SEP1-				<Nop>
+an <silent> 20.440.310 &Edit.&Global\ Settings.Toggle\ &Toolbar		:call <SID>ToggleGuiOption("T")<CR>
+an <silent> 20.440.320 &Edit.&Global\ Settings.Toggle\ &Bottom\ Scrollbar :call <SID>ToggleGuiOption("b")<CR>
+an <silent> 20.440.330 &Edit.&Global\ Settings.Toggle\ &Left\ Scrollbar	:call <SID>ToggleGuiOption("l")<CR>
+an <silent> 20.440.340 &Edit.&Global\ Settings.Toggle\ &Right\ Scrollbar :call <SID>ToggleGuiOption("r")<CR>
+
+fun! s:SearchP()
+  if !exists("g:menutrans_path_dialog")
+    let g:menutrans_path_dialog = "Enter search path for files.\nSeparate directory names with a comma."
+  endif
+  let n = inputdialog(g:menutrans_path_dialog, substitute(&path, '\\ ', ' ', 'g'))
+  if n != ""
+    let &path = substitute(n, ' ', '\\ ', 'g')
+  endif
+endfun
+
+fun! s:TagFiles()
+  if !exists("g:menutrans_tags_dialog")
+    let g:menutrans_tags_dialog = "Enter names of tag files.\nSeparate the names with a comma."
+  endif
+  let n = inputdialog(g:menutrans_tags_dialog, substitute(&tags, '\\ ', ' ', 'g'))
+  if n != ""
+    let &tags = substitute(n, ' ', '\\ ', 'g')
+  endif
+endfun
+
+fun! s:ToggleGuiOption(option)
+    " If a:option is already set in guioptions, then we want to remove it
+    if match(&guioptions, "\\C" . a:option) > -1
+	exec "set go-=" . a:option
+    else
+	exec "set go+=" . a:option
+    endif
+endfun
+
+" Edit/File Settings
+
+" Boolean options
+an 20.440.100 &Edit.F&ile\ Settings.Toggle\ Line\ &Numbering<Tab>:set\ nu!	:set nu! nu?<CR>
+an 20.440.105 &Edit.F&ile\ Settings.Toggle\ Relati&ve\ Line\ Numbering<Tab>:set\ rnu!	:set rnu! rnu?<CR>
+an 20.440.110 &Edit.F&ile\ Settings.Toggle\ &List\ Mode<Tab>:set\ list!	:set list! list?<CR>
+an 20.440.120 &Edit.F&ile\ Settings.Toggle\ Line\ &Wrapping<Tab>:set\ wrap!	:set wrap! wrap?<CR>
+an 20.440.130 &Edit.F&ile\ Settings.Toggle\ W&rapping\ at\ Word<Tab>:set\ lbr!	:set lbr! lbr?<CR>
+an 20.440.160 &Edit.F&ile\ Settings.Toggle\ Tab\ &Expanding<Tab>:set\ et!	:set et! et?<CR>
+an 20.440.170 &Edit.F&ile\ Settings.Toggle\ &Auto\ Indenting<Tab>:set\ ai!	:set ai! ai?<CR>
+an 20.440.180 &Edit.F&ile\ Settings.Toggle\ &C-Style\ Indenting<Tab>:set\ cin!	:set cin! cin?<CR>
+
+" other options
+an 20.440.600 &Edit.F&ile\ Settings.-SEP2-		<Nop>
+an 20.440.610.20 &Edit.F&ile\ Settings.&Shiftwidth.2	:set sw=2 sw?<CR>
+an 20.440.610.30 &Edit.F&ile\ Settings.&Shiftwidth.3	:set sw=3 sw?<CR>
+an 20.440.610.40 &Edit.F&ile\ Settings.&Shiftwidth.4	:set sw=4 sw?<CR>
+an 20.440.610.50 &Edit.F&ile\ Settings.&Shiftwidth.5	:set sw=5 sw?<CR>
+an 20.440.610.60 &Edit.F&ile\ Settings.&Shiftwidth.6	:set sw=6 sw?<CR>
+an 20.440.610.80 &Edit.F&ile\ Settings.&Shiftwidth.8	:set sw=8 sw?<CR>
+
+an 20.440.620.20 &Edit.F&ile\ Settings.Soft\ &Tabstop.2	:set sts=2 sts?<CR>
+an 20.440.620.30 &Edit.F&ile\ Settings.Soft\ &Tabstop.3	:set sts=3 sts?<CR>
+an 20.440.620.40 &Edit.F&ile\ Settings.Soft\ &Tabstop.4	:set sts=4 sts?<CR>
+an 20.440.620.50 &Edit.F&ile\ Settings.Soft\ &Tabstop.5	:set sts=5 sts?<CR>
+an 20.440.620.60 &Edit.F&ile\ Settings.Soft\ &Tabstop.6	:set sts=6 sts?<CR>
+an 20.440.620.80 &Edit.F&ile\ Settings.Soft\ &Tabstop.8	:set sts=8 sts?<CR>
+
+an <silent> 20.440.630 &Edit.F&ile\ Settings.Te&xt\ Width\.\.\.  :call <SID>TextWidth()<CR>
+an <silent> 20.440.640 &Edit.F&ile\ Settings.&File\ Format\.\.\.  :call <SID>FileFormat()<CR>
+fun! s:TextWidth()
+  if !exists("g:menutrans_textwidth_dialog")
+    let g:menutrans_textwidth_dialog = "Enter new text width (0 to disable formatting): "
+  endif
+  let n = inputdialog(g:menutrans_textwidth_dialog, &tw)
+  if n != ""
+    " Remove leading zeros to avoid it being used as an octal number.
+    " But keep a zero by itself.
+    let tw = substitute(n, "^0*", "", "")
+    let &tw = tw == '' ? 0 : tw
+  endif
+endfun
+
+fun! s:FileFormat()
+  if !exists("g:menutrans_fileformat_dialog")
+    let g:menutrans_fileformat_dialog = "Select format for writing the file"
+  endif
+  if !exists("g:menutrans_fileformat_choices")
+    let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Cancel"
+  endif
+  if &ff == "dos"
+    let def = 2
+  elseif &ff == "mac"
+    let def = 3
+  else
+    let def = 1
+  endif
+  let n = confirm(g:menutrans_fileformat_dialog, g:menutrans_fileformat_choices, def, "Question")
+  if n == 1
+    set ff=unix
+  elseif n == 2
+    set ff=dos
+  elseif n == 3
+    set ff=mac
+  endif
+endfun
+
+let s:did_setup_color_schemes = 0
+
+" Setup the Edit.Color Scheme submenu
+func s:SetupColorSchemes() abort
+  if s:did_setup_color_schemes
+    return
+  endif
+  let s:did_setup_color_schemes = 1
+
+  let n = globpath(&runtimepath, "colors/*.vim", 1, 1)
+  let n += globpath(&packpath, "pack/*/start/*/colors/*.vim", 1, 1)
+  let n += globpath(&packpath, "pack/*/opt/*/colors/*.vim", 1, 1)
+
+  " Ignore case for VMS and windows, sort on name
+  let names = sort(map(n, 'substitute(v:val, "\\c.*[/\\\\:\\]]\\([^/\\\\:]*\\)\\.vim", "\\1", "")'), 1)
+
+  " define all the submenu entries
+  let idx = 100
+  for name in names
+    exe "an 20.450." . idx . ' &Edit.C&olor\ Scheme.' . name . " :colors " . name . "<CR>"
+    let idx = idx + 10
+  endfor
+  silent! aunmenu &Edit.Show\ C&olor\ Schemes\ in\ Menu
+endfun
+if exists("do_no_lazyload_menus")
+  call s:SetupColorSchemes()
+else
+  an <silent> 20.450 &Edit.Show\ C&olor\ Schemes\ in\ Menu :call <SID>SetupColorSchemes()<CR>
+endif
+
+
+" Setup the Edit.Keymap submenu
+if has("keymap")
+  let s:did_setup_keymaps = 0
+
+  func s:SetupKeymaps() abort
+    if s:did_setup_keymaps
+      return
+    endif
+    let s:did_setup_keymaps = 1
+
+    let n = globpath(&runtimepath, "keymap/*.vim", 1, 1)
+    if !empty(n)
+      let idx = 100
+      an 20.460.90 &Edit.&Keymap.None :set keymap=<CR>
+      for name in n
+	" Ignore case for VMS and windows
+	let name = substitute(name, '\c.*[/\\:\]]\([^/\\:_]*\)\(_[0-9a-zA-Z-]*\)\=\.vim', '\1', '')
+	exe "an 20.460." . idx . ' &Edit.&Keymap.' . name . " :set keymap=" . name . "<CR>"
+	let idx = idx + 10
+      endfor
+    endif
+    silent! aunmenu &Edit.Show\ &Keymaps\ in\ Menu
+  endfun
+  if exists("do_no_lazyload_menus")
+    call s:SetupKeymaps()
+  else
+    an <silent> 20.460 &Edit.Show\ &Keymaps\ in\ Menu :call <SID>SetupKeymaps()<CR>
+  endif
+endif
+if has("win32") || has("gui_motif") || has("gui_gtk") || has("gui_kde") || has("gui_photon") || has("gui_mac")
+  an 20.470 &Edit.Select\ Fo&nt\.\.\.	:set guifont=*<CR>
+endif
+
+" Programming menu
+if !exists("g:ctags_command")
+  if has("vms")
+    let g:ctags_command = "mc vim:ctags *.*"
+  else
+    let g:ctags_command = "ctags -R ."
+  endif
+endif
+
+an 40.300 &Tools.&Jump\ to\ This\ Tag<Tab>g^]	g<C-]>
+vunmenu &Tools.&Jump\ to\ This\ Tag<Tab>g^]
+vnoremenu &Tools.&Jump\ to\ This\ Tag<Tab>g^]	g<C-]>
+an 40.310 &Tools.Jump\ &Back<Tab>^T		<C-T>
+an 40.320 &Tools.Build\ &Tags\ File		:exe "!" . g:ctags_command<CR>
+
+if has("folding") || has("spell")
+  an 40.330 &Tools.-SEP1-						<Nop>
+endif
+
+" Tools.Spelling Menu
+if has("spell")
+  an 40.335.110 &Tools.&Spelling.&Spell\ Check\ On		:set spell<CR>
+  an 40.335.120 &Tools.&Spelling.Spell\ Check\ &Off		:set nospell<CR>
+  an 40.335.130 &Tools.&Spelling.To\ &Next\ Error<Tab>]s	]s
+  an 40.335.130 &Tools.&Spelling.To\ &Previous\ Error<Tab>[s	[s
+  an 40.335.140 &Tools.&Spelling.Suggest\ &Corrections<Tab>z=	z=
+  an 40.335.150 &Tools.&Spelling.&Repeat\ Correction<Tab>:spellrepall	:spellrepall<CR>
+  an 40.335.200 &Tools.&Spelling.-SEP1-				<Nop>
+  an 40.335.210 &Tools.&Spelling.Set\ Language\ to\ "en"	:set spl=en spell<CR>
+  an 40.335.220 &Tools.&Spelling.Set\ Language\ to\ "en_au"	:set spl=en_au spell<CR>
+  an 40.335.230 &Tools.&Spelling.Set\ Language\ to\ "en_ca"	:set spl=en_ca spell<CR>
+  an 40.335.240 &Tools.&Spelling.Set\ Language\ to\ "en_gb"	:set spl=en_gb spell<CR>
+  an 40.335.250 &Tools.&Spelling.Set\ Language\ to\ "en_nz"	:set spl=en_nz spell<CR>
+  an 40.335.260 &Tools.&Spelling.Set\ Language\ to\ "en_us"	:set spl=en_us spell<CR>
+  an <silent> 40.335.270 &Tools.&Spelling.&Find\ More\ Languages	:call <SID>SpellLang()<CR>
+
+  let s:undo_spelllang = ['aun &Tools.&Spelling.&Find\ More\ Languages']
+  func s:SpellLang()
+    for cmd in s:undo_spelllang
+      exe "silent! " . cmd
+    endfor
+    let s:undo_spelllang = []
+
+    if &enc == "iso-8859-15"
+      let enc = "latin1"
+    else
+      let enc = &enc
+    endif
+
+    if !exists("g:menutrans_set_lang_to")
+      let g:menutrans_set_lang_to = 'Set Language to'
+    endif
+
+    let found = 0
+    let s = globpath(&runtimepath, "spell/*." . enc . ".spl", 1, 1)
+    if !empty(s)
+      let n = 300
+      for f in s
+	let nm = substitute(f, '.*spell[/\\]\(..\)\.[^/\\]*\.spl', '\1', "")
+	if nm != "en" && nm !~ '/'
+          let _nm = nm
+	  let found += 1
+	  let menuname = '&Tools.&Spelling.' . escape(g:menutrans_set_lang_to, "\\. \t|") . '\ "' . nm . '"'
+	  exe 'an 40.335.' . n . ' ' . menuname . ' :set spl=' . nm . ' spell<CR>'
+	  let s:undo_spelllang += ['aun ' . menuname]
+	endif
+	let n += 10
+      endfor
+    endif
+    if found == 0
+      echomsg "Could not find other spell files"
+    elseif found == 1
+      echomsg "Found spell file " . _nm
+    else
+      echomsg "Found " . found . " more spell files"
+    endif
+    " Need to redo this when 'encoding' is changed.
+    augroup spellmenu
+    au! EncodingChanged * call <SID>SpellLang()
+    augroup END
+  endfun
+
+endif
+
+" Tools.Fold Menu
+if has("folding")
+  " open close folds
+  an 40.340.110 &Tools.&Folding.&Enable/Disable\ Folds<Tab>zi		zi
+  an 40.340.120 &Tools.&Folding.&View\ Cursor\ Line<Tab>zv		zv
+  an 40.340.120 &Tools.&Folding.Vie&w\ Cursor\ Line\ Only<Tab>zMzx	zMzx
+  inoremenu 40.340.120 &Tools.&Folding.Vie&w\ Cursor\ Line\ Only<Tab>zMzx  <C-O>zM<C-O>zx
+  an 40.340.130 &Tools.&Folding.C&lose\ More\ Folds<Tab>zm		zm
+  an 40.340.140 &Tools.&Folding.&Close\ All\ Folds<Tab>zM		zM
+  an 40.340.150 &Tools.&Folding.O&pen\ More\ Folds<Tab>zr		zr
+  an 40.340.160 &Tools.&Folding.&Open\ All\ Folds<Tab>zR		zR
+  " fold method
+  an 40.340.200 &Tools.&Folding.-SEP1-			<Nop>
+  an 40.340.210 &Tools.&Folding.Fold\ Met&hod.M&anual	:set fdm=manual<CR>
+  an 40.340.210 &Tools.&Folding.Fold\ Met&hod.I&ndent	:set fdm=indent<CR>
+  an 40.340.210 &Tools.&Folding.Fold\ Met&hod.E&xpression :set fdm=expr<CR>
+  an 40.340.210 &Tools.&Folding.Fold\ Met&hod.S&yntax	:set fdm=syntax<CR>
+  an 40.340.210 &Tools.&Folding.Fold\ Met&hod.&Diff	:set fdm=diff<CR>
+  an 40.340.210 &Tools.&Folding.Fold\ Met&hod.Ma&rker	:set fdm=marker<CR>
+  " create and delete folds
+  vnoremenu 40.340.220 &Tools.&Folding.Create\ &Fold<Tab>zf	zf
+  an 40.340.230 &Tools.&Folding.&Delete\ Fold<Tab>zd		zd
+  an 40.340.240 &Tools.&Folding.Delete\ &All\ Folds<Tab>zD	zD
+  " moving around in folds
+  an 40.340.300 &Tools.&Folding.-SEP2-				<Nop>
+  an 40.340.310.10 &Tools.&Folding.Fold\ Col&umn\ Width.\ &0\ 	:set fdc=0<CR>
+  an 40.340.310.20 &Tools.&Folding.Fold\ Col&umn\ Width.\ &2\ 	:set fdc=2<CR>
+  an 40.340.310.30 &Tools.&Folding.Fold\ Col&umn\ Width.\ &3\ 	:set fdc=3<CR>
+  an 40.340.310.40 &Tools.&Folding.Fold\ Col&umn\ Width.\ &4\ 	:set fdc=4<CR>
+  an 40.340.310.50 &Tools.&Folding.Fold\ Col&umn\ Width.\ &5\ 	:set fdc=5<CR>
+  an 40.340.310.60 &Tools.&Folding.Fold\ Col&umn\ Width.\ &6\ 	:set fdc=6<CR>
+  an 40.340.310.70 &Tools.&Folding.Fold\ Col&umn\ Width.\ &7\ 	:set fdc=7<CR>
+  an 40.340.310.80 &Tools.&Folding.Fold\ Col&umn\ Width.\ &8\ 	:set fdc=8<CR>
+endif  " has folding
+
+if has("diff")
+  an 40.350.100 &Tools.&Diff.&Update		:diffupdate<CR>
+  an 40.350.110 &Tools.&Diff.&Get\ Block	:diffget<CR>
+  vunmenu &Tools.&Diff.&Get\ Block
+  vnoremenu &Tools.&Diff.&Get\ Block		:diffget<CR>
+  an 40.350.120 &Tools.&Diff.&Put\ Block	:diffput<CR>
+  vunmenu &Tools.&Diff.&Put\ Block
+  vnoremenu &Tools.&Diff.&Put\ Block		:diffput<CR>
+endif
+
+an 40.358 &Tools.-SEP2-					<Nop>
+an 40.360 &Tools.&Make<Tab>:make			:make<CR>
+an 40.370 &Tools.&List\ Errors<Tab>:cl			:cl<CR>
+an 40.380 &Tools.L&ist\ Messages<Tab>:cl!		:cl!<CR>
+an 40.390 &Tools.&Next\ Error<Tab>:cn			:cn<CR>
+an 40.400 &Tools.&Previous\ Error<Tab>:cp		:cp<CR>
+an 40.410 &Tools.&Older\ List<Tab>:cold			:colder<CR>
+an 40.420 &Tools.N&ewer\ List<Tab>:cnew			:cnewer<CR>
+an 40.430.50 &Tools.Error\ &Window.&Update<Tab>:cwin	:cwin<CR>
+an 40.430.60 &Tools.Error\ &Window.&Open<Tab>:copen	:copen<CR>
+an 40.430.70 &Tools.Error\ &Window.&Close<Tab>:cclose	:cclose<CR>
+
+an 40.520 &Tools.-SEP3-					<Nop>
+an <silent> 40.530 &Tools.&Convert\ to\ HEX<Tab>:%!xxd
+	\ :call <SID>XxdConv()<CR>
+an <silent> 40.540 &Tools.Conve&rt\ Back<Tab>:%!xxd\ -r
+	\ :call <SID>XxdBack()<CR>
+
+" Use a function to do the conversion, so that it also works with 'insertmode'
+" set.
+func s:XxdConv()
+  let mod = &mod
+  if has("vms")
+    %!mc vim:xxd
+  else
+    call s:XxdFind()
+    exe '%!' . g:xxdprogram
+  endif
+  if getline(1) =~ "^0000000:"		" only if it worked
+    set ft=xxd
+  endif
+  let &mod = mod
+endfun
+
+func s:XxdBack()
+  let mod = &mod
+  if has("vms")
+    %!mc vim:xxd -r
+  else
+    call s:XxdFind()
+    exe '%!' . g:xxdprogram . ' -r'
+  endif
+  set ft=
+  doautocmd filetypedetect BufReadPost
+  let &mod = mod
+endfun
+
+func s:XxdFind()
+  if !exists("g:xxdprogram")
+    " On the PC xxd may not be in the path but in the install directory
+    if has("win32") && !executable("xxd")
+      let g:xxdprogram = $VIMRUNTIME . (&shellslash ? '/' : '\') . "xxd.exe"
+      if g:xxdprogram =~ ' '
+	let g:xxdprogram = '"' .. g:xxdprogram .. '"'
+      endif
+    else
+      let g:xxdprogram = "xxd"
+    endif
+  endif
+endfun
+
+let s:did_setup_compilers = 0
+
+" Setup the Tools.Compiler submenu
+func s:SetupCompilers() abort
+  if s:did_setup_compilers
+    return
+  endif
+  let s:did_setup_compilers = 1
+
+  let n = globpath(&runtimepath, "compiler/*.vim", 1, 1)
+  let idx = 100
+  for name in n
+    " Ignore case for VMS and windows
+    let name = substitute(name, '\c.*[/\\:\]]\([^/\\:]*\)\.vim', '\1', '')
+    exe "an 30.440." . idx . ' &Tools.Se&t\ Compiler.' . name . " :compiler " . name . "<CR>"
+    let idx = idx + 10
+  endfor
+  silent! aunmenu &Tools.Show\ Compiler\ Se&ttings\ in\ Menu
+endfun
+if exists("do_no_lazyload_menus")
+  call s:SetupCompilers()
+else
+  an <silent> 30.440 &Tools.Show\ Compiler\ Se&ttings\ in\ Menu :call <SID>SetupCompilers()<CR>
+endif
+
+" Load ColorScheme, Compiler Setting and Keymap menus when idle.
+if !exists("do_no_lazyload_menus")
+  func s:SetupLazyloadMenus()
+    call s:SetupColorSchemes()
+    call s:SetupCompilers()
+    if has("keymap")
+      call s:SetupKeymaps()
+    endif
+  endfunc
+  augroup SetupLazyloadMenus
+    au!
+    au CursorHold,CursorHoldI * call <SID>SetupLazyloadMenus() | au! SetupLazyloadMenus
+  augroup END
+endif
+
+
+if !exists("no_buffers_menu")
+
+" Buffer list menu -- Setup functions & actions
+
+" wait with building the menu until after loading 'session' files. Makes
+" startup faster.
+let s:bmenu_wait = 1
+
+" Dictionary of buffer number to name. This helps prevent problems where a
+" buffer as renamed and we didn't keep track of that.
+let s:bmenu_items = {}
+
+if !exists("bmenu_priority")
+  let bmenu_priority = 60
+endif
+
+" invoked from a BufCreate or BufFilePost autocommand
+func s:BMAdd()
+  if s:bmenu_wait == 0
+    " when adding too many buffers, redraw in short format
+    if s:bmenu_count == &menuitems && s:bmenu_short == 0
+      call s:BMShow()
+    else
+      let name = expand("<afile>")
+      let num = expand("<abuf>") + 0 " add zero to convert to a number type
+      if s:BMCanAdd(name, num)
+	call <SID>BMFilename(name, num)
+	let s:bmenu_count += 1
+      endif
+    endif
+  endif
+endfunc
+
+" invoked from a BufDelete or BufFilePre autocommand
+func s:BMRemove()
+  if s:bmenu_wait == 0
+    let bufnum = expand("<abuf>")
+    if s:bmenu_items->has_key(bufnum)
+      let menu_name = s:bmenu_items[bufnum]
+      exe 'silent! aun &Buffers.' . menu_name
+      let s:bmenu_count = s:bmenu_count - 1
+      unlet s:bmenu_items[bufnum]
+    endif
+  endif
+endfunc
+
+" Return non-zero if buffer with number "name" / "num" is useful to add in the
+" buffer menu.
+func s:BMCanAdd(name, num)
+  " no directory or unlisted buffer
+  if isdirectory(a:name) || !buflisted(a:num)
+    return 0
+  endif
+
+  " no special buffer, such as terminal or popup
+  let buftype = getbufvar(a:num, '&buftype')
+  if buftype != '' && buftype != 'nofile' && buftype != 'nowrite'
+    return 0
+  endif
+
+  " only existing buffers
+  return bufexists(a:num)
+endfunc
+
+" Create the buffer menu (delete an existing one first).
+func s:BMShow(...)
+  let s:bmenu_wait = 1
+  let s:bmenu_short = 1
+  let s:bmenu_count = 0
+  let s:bmenu_items = {}
+  "
+  " get new priority, if exists
+  if a:0 == 1
+    let g:bmenu_priority = a:1
+  endif
+
+  " Remove old menu, if it exists; keep one entry to avoid a torn off menu to
+  " disappear.  Use try/catch to avoid setting v:errmsg
+  try | unmenu &Buffers | catch | endtry
+  exe 'noremenu ' . g:bmenu_priority . ".1 &Buffers.Dummy l"
+  try | unmenu! &Buffers | catch | endtry
+
+  " create new menu; set 'cpo' to include the <CR>
+  let cpo_save = &cpo
+  set cpo&vim
+  exe 'an <silent> ' . g:bmenu_priority . ".2 &Buffers.&Refresh\\ menu :call <SID>BMShow()<CR>"
+  exe 'an ' . g:bmenu_priority . ".4 &Buffers.&Delete :confirm bd<CR>"
+  exe 'an ' . g:bmenu_priority . ".6 &Buffers.&Alternate :confirm b #<CR>"
+  exe 'an ' . g:bmenu_priority . ".7 &Buffers.&Next :confirm bnext<CR>"
+  exe 'an ' . g:bmenu_priority . ".8 &Buffers.&Previous :confirm bprev<CR>"
+  exe 'an ' . g:bmenu_priority . ".9 &Buffers.-SEP- :"
+  let &cpo = cpo_save
+  unmenu &Buffers.Dummy
+
+  " figure out how many buffers there are
+  let buf = 1
+  while buf <= bufnr('$')
+    if s:BMCanAdd(bufname(buf), buf)
+      let s:bmenu_count = s:bmenu_count + 1
+    endif
+    let buf = buf + 1
+  endwhile
+  if s:bmenu_count <= &menuitems
+    let s:bmenu_short = 0
+  endif
+
+  " iterate through buffer list, adding each buffer to the menu:
+  let buf = 1
+  while buf <= bufnr('$')
+    let name = bufname(buf)
+    if s:BMCanAdd(name, buf)
+      call <SID>BMFilename(name, buf)
+    endif
+    let buf = buf + 1
+  endwhile
+  let s:bmenu_wait = 0
+  aug buffer_list
+  au!
+  au BufCreate,BufFilePost * call <SID>BMAdd()
+  au BufDelete,BufFilePre * call <SID>BMRemove()
+  aug END
+endfunc
+
+func s:BMHash(name)
+  " Make name all upper case, so that chars are between 32 and 96
+  let nm = substitute(a:name, ".*", '\U\0', "")
+  if has("ebcdic")
+    " HACK: Replace all non alphabetics with 'Z'
+    "       Just to make it work for now.
+    let nm = substitute(nm, "[^A-Z]", 'Z', "g")
+    let sp = char2nr('A') - 1
+  else
+    let sp = char2nr(' ')
+  endif
+  " convert first six chars into a number for sorting:
+  return (char2nr(nm[0]) - sp) * 0x800000 + (char2nr(nm[1]) - sp) * 0x20000 + (char2nr(nm[2]) - sp) * 0x1000 + (char2nr(nm[3]) - sp) * 0x80 + (char2nr(nm[4]) - sp) * 0x20 + (char2nr(nm[5]) - sp)
+endfunc
+
+func s:BMHash2(name)
+  let nm = substitute(a:name, ".", '\L\0', "")
+  " Not exactly right for EBCDIC...
+  if nm[0] < 'a' || nm[0] > 'z'
+    return '&others.'
+  elseif nm[0] <= 'd'
+    return '&abcd.'
+  elseif nm[0] <= 'h'
+    return '&efgh.'
+  elseif nm[0] <= 'l'
+    return '&ijkl.'
+  elseif nm[0] <= 'p'
+    return '&mnop.'
+  elseif nm[0] <= 't'
+    return '&qrst.'
+  else
+    return '&u-z.'
+  endif
+endfunc
+
+" Insert a buffer name into the buffer menu.
+func s:BMFilename(name, num)
+  let munge = <SID>BMMunge(a:name, a:num)
+  let hash = <SID>BMHash(munge)
+  if s:bmenu_short == 0
+    let s:bmenu_items[a:num] = munge
+    let cmd = 'an ' . g:bmenu_priority . '.' . hash . ' &Buffers.' . munge
+  else
+    let menu_name = <SID>BMHash2(munge) . munge
+    let s:bmenu_items[a:num] = menu_name
+    let cmd = 'an ' . g:bmenu_priority . '.' . hash . '.' . hash . ' &Buffers.' . menu_name
+  endif
+  " set 'cpo' to include the <CR>
+  let cpo_save = &cpo
+  set cpo&vim
+  exe cmd . ' :confirm b' . a:num . '<CR>'
+  let &cpo = cpo_save
+endfunc
+
+" Truncate a long path to fit it in a menu item.
+if !exists("g:bmenu_max_pathlen")
+  let g:bmenu_max_pathlen = 35
+endif
+func s:BMTruncName(fname)
+  let name = a:fname
+  if g:bmenu_max_pathlen < 5
+    let name = ""
+  else
+    let len = strlen(name)
+    if len > g:bmenu_max_pathlen
+      let amountl = (g:bmenu_max_pathlen / 2) - 2
+      let amountr = g:bmenu_max_pathlen - amountl - 3
+      let pattern = '^\(.\{,' . amountl . '}\).\{-}\(.\{,' . amountr . '}\)$'
+      let left = substitute(name, pattern, '\1', '')
+      let right = substitute(name, pattern, '\2', '')
+      if strlen(left) + strlen(right) < len
+	let name = left . '...' . right
+      endif
+    endif
+  endif
+  return name
+endfunc
+
+func s:BMMunge(fname, bnum)
+  let name = a:fname
+  if name == ''
+    if !exists("g:menutrans_no_file")
+      let g:menutrans_no_file = "[No Name]"
+    endif
+    let name = g:menutrans_no_file
+  else
+    let name = fnamemodify(name, ':p:~')
+  endif
+  " detach file name and separate it out:
+  let name2 = fnamemodify(name, ':t')
+  if a:bnum >= 0
+    let name2 = name2 . ' (' . a:bnum . ')'
+  endif
+  let name = name2 . "\t" . <SID>BMTruncName(fnamemodify(name,':h'))
+  let name = escape(name, "\\. \t|")
+  let name = substitute(name, "&", "&&", "g")
+  let name = substitute(name, "\n", "^@", "g")
+  return name
+endfunc
+
+" When just starting Vim, load the buffer menu later
+if has("vim_starting")
+  augroup LoadBufferMenu
+    au! VimEnter * if !exists("no_buffers_menu") | call <SID>BMShow() | endif
+    au  VimEnter * au! LoadBufferMenu
+  augroup END
+else
+  call <SID>BMShow()
+endif
+
+endif " !exists("no_buffers_menu")
+
+" Window menu
+an 70.300 &Window.&New<Tab>^Wn			<C-W>n
+an 70.310 &Window.S&plit<Tab>^Ws		<C-W>s
+an 70.320 &Window.Sp&lit\ To\ #<Tab>^W^^	<C-W><C-^>
+an 70.330 &Window.Split\ &Vertically<Tab>^Wv	<C-W>v
+an <silent> 70.332 &Window.Split\ File\ E&xplorer	:call MenuExplOpen()<CR>
+if !exists("*MenuExplOpen")
+  fun MenuExplOpen()
+    if @% == ""
+      20vsp .
+    else
+      exe "20vsp " . s:FnameEscape(expand("%:p:h"))
+    endif
+  endfun
+endif
+an 70.335 &Window.-SEP1-				<Nop>
+an 70.340 &Window.&Close<Tab>^Wc			:confirm close<CR>
+an 70.345 &Window.Close\ &Other(s)<Tab>^Wo		:confirm only<CR>
+an 70.350 &Window.-SEP2-				<Nop>
+an 70.355 &Window.Move\ &To.&Top<Tab>^WK		<C-W>K
+an 70.355 &Window.Move\ &To.&Bottom<Tab>^WJ		<C-W>J
+an 70.355 &Window.Move\ &To.&Left\ Side<Tab>^WH		<C-W>H
+an 70.355 &Window.Move\ &To.&Right\ Side<Tab>^WL	<C-W>L
+an 70.360 &Window.Rotate\ &Up<Tab>^WR			<C-W>R
+an 70.362 &Window.Rotate\ &Down<Tab>^Wr			<C-W>r
+an 70.365 &Window.-SEP3-				<Nop>
+an 70.370 &Window.&Equal\ Size<Tab>^W=			<C-W>=
+an 70.380 &Window.&Max\ Height<Tab>^W_			<C-W>_
+an 70.390 &Window.M&in\ Height<Tab>^W1_			<C-W>1_
+an 70.400 &Window.Max\ &Width<Tab>^W\|			<C-W>\|
+an 70.410 &Window.Min\ Widt&h<Tab>^W1\|			<C-W>1\|
+
+" The popup menu
+an 1.10 PopUp.&Undo			u
+an 1.15 PopUp.-SEP1-			<Nop>
+vnoremenu 1.20 PopUp.Cu&t		"+x
+vnoremenu 1.30 PopUp.&Copy		"+y
+cnoremenu 1.30 PopUp.&Copy		<C-Y>
+nnoremenu 1.40 PopUp.&Paste		"+gP
+cnoremenu 1.40 PopUp.&Paste		<C-R>+
+exe 'vnoremenu <script> 1.40 PopUp.&Paste	' . paste#paste_cmd['v']
+exe 'inoremenu <script> 1.40 PopUp.&Paste	' . paste#paste_cmd['i']
+vnoremenu 1.50 PopUp.&Delete		x
+an 1.55 PopUp.-SEP2-			<Nop>
+vnoremenu 1.60 PopUp.Select\ Blockwise	<C-V>
+
+nnoremenu 1.70 PopUp.Select\ &Word	vaw
+onoremenu 1.70 PopUp.Select\ &Word	aw
+vnoremenu 1.70 PopUp.Select\ &Word	<C-C>vaw
+inoremenu 1.70 PopUp.Select\ &Word	<C-O>vaw
+cnoremenu 1.70 PopUp.Select\ &Word	<C-C>vaw
+
+nnoremenu 1.73 PopUp.Select\ &Sentence	vas
+onoremenu 1.73 PopUp.Select\ &Sentence	as
+vnoremenu 1.73 PopUp.Select\ &Sentence	<C-C>vas
+inoremenu 1.73 PopUp.Select\ &Sentence	<C-O>vas
+cnoremenu 1.73 PopUp.Select\ &Sentence	<C-C>vas
+
+nnoremenu 1.77 PopUp.Select\ Pa&ragraph	vap
+onoremenu 1.77 PopUp.Select\ Pa&ragraph	ap
+vnoremenu 1.77 PopUp.Select\ Pa&ragraph	<C-C>vap
+inoremenu 1.77 PopUp.Select\ Pa&ragraph	<C-O>vap
+cnoremenu 1.77 PopUp.Select\ Pa&ragraph	<C-C>vap
+
+nnoremenu 1.80 PopUp.Select\ &Line	V
+onoremenu 1.80 PopUp.Select\ &Line	<C-C>V
+vnoremenu 1.80 PopUp.Select\ &Line	<C-C>V
+inoremenu 1.80 PopUp.Select\ &Line	<C-O>V
+cnoremenu 1.80 PopUp.Select\ &Line	<C-C>V
+
+nnoremenu 1.90 PopUp.Select\ &Block	<C-V>
+onoremenu 1.90 PopUp.Select\ &Block	<C-C><C-V>
+vnoremenu 1.90 PopUp.Select\ &Block	<C-C><C-V>
+inoremenu 1.90 PopUp.Select\ &Block	<C-O><C-V>
+cnoremenu 1.90 PopUp.Select\ &Block	<C-C><C-V>
+
+noremenu  <script> <silent> 1.100 PopUp.Select\ &All	:<C-U>call <SID>SelectAll()<CR>
+inoremenu <script> <silent> 1.100 PopUp.Select\ &All	<C-O>:call <SID>SelectAll()<CR>
+cnoremenu <script> <silent> 1.100 PopUp.Select\ &All	<C-U>call <SID>SelectAll()<CR>
+
+if has("spell")
+  " Spell suggestions in the popup menu.  Note that this will slow down the
+  " appearance of the menu!
+  func s:SpellPopup()
+    if exists("s:changeitem") && s:changeitem != ''
+      call <SID>SpellDel()
+    endif
+
+    " Return quickly if spell checking is not enabled.
+    if !&spell || &spelllang == ''
+      return
+    endif
+
+    let curcol = col('.')
+    let [w, a] = spellbadword()
+    if col('.') > curcol		" don't use word after the cursor
+      let w = ''
+    endif
+    if w != ''
+      if a == 'caps'
+	let s:suglist = [substitute(w, '.*', '\u&', '')]
+      else
+	let s:suglist = spellsuggest(w, 10)
+      endif
+      if len(s:suglist) > 0
+	if !exists("g:menutrans_spell_change_ARG_to")
+	  let g:menutrans_spell_change_ARG_to = 'Change\ "%s"\ to'
+	endif
+	let s:changeitem = printf(g:menutrans_spell_change_ARG_to, escape(w, ' .'))
+	let s:fromword = w
+	let pri = 1
+	" set 'cpo' to include the <CR>
+	let cpo_save = &cpo
+	set cpo&vim
+	for sug in s:suglist
+	  exe 'anoremenu 1.5.' . pri . ' PopUp.' . s:changeitem . '.' . escape(sug, ' .')
+		\ . ' :call <SID>SpellReplace(' . pri . ')<CR>'
+	  let pri += 1
+	endfor
+
+	if !exists("g:menutrans_spell_add_ARG_to_word_list")
+	  let g:menutrans_spell_add_ARG_to_word_list = 'Add\ "%s"\ to\ Word\ List'
+	endif
+	let s:additem = printf(g:menutrans_spell_add_ARG_to_word_list, escape(w, ' .'))
+	exe 'anoremenu 1.6 PopUp.' . s:additem . ' :spellgood ' . w . '<CR>'
+
+	if !exists("g:menutrans_spell_ignore_ARG")
+	  let g:menutrans_spell_ignore_ARG = 'Ignore\ "%s"'
+	endif
+	let s:ignoreitem = printf(g:menutrans_spell_ignore_ARG, escape(w, ' .'))
+	exe 'anoremenu 1.7 PopUp.' . s:ignoreitem . ' :spellgood! ' . w . '<CR>'
+
+	anoremenu 1.8 PopUp.-SpellSep- :
+	let &cpo = cpo_save
+      endif
+    endif
+    call cursor(0, curcol)	" put the cursor back where it was
+  endfunc
+
+  func s:SpellReplace(n)
+    let l = getline('.')
+    " Move the cursor to the start of the word.
+    call spellbadword()
+    call setline('.', strpart(l, 0, col('.') - 1) . s:suglist[a:n - 1]
+	  \ . strpart(l, col('.') + len(s:fromword) - 1))
+  endfunc
+
+  func s:SpellDel()
+    exe "aunmenu PopUp." . s:changeitem
+    exe "aunmenu PopUp." . s:additem
+    exe "aunmenu PopUp." . s:ignoreitem
+    aunmenu PopUp.-SpellSep-
+    let s:changeitem = ''
+  endfun
+
+  augroup SpellPopupMenu
+    au! MenuPopup * call <SID>SpellPopup()
+  augroup END
+endif
+
+" The GUI toolbar (for MS-Windows and GTK)
+if has("toolbar")
+  an 1.10 ToolBar.Open			:browse confirm e<CR>
+  an <silent> 1.20 ToolBar.Save		:if expand("%") == ""<Bar>browse confirm w<Bar>else<Bar>confirm w<Bar>endif<CR>
+  an 1.30 ToolBar.SaveAll		:browse confirm wa<CR>
+
+  if has("printer")
+    an 1.40   ToolBar.Print		:hardcopy<CR>
+    vunmenu   ToolBar.Print
+    vnoremenu ToolBar.Print		:hardcopy<CR>
+  elseif has("unix")
+    an 1.40   ToolBar.Print		:w !lpr<CR>
+    vunmenu   ToolBar.Print
+    vnoremenu ToolBar.Print		:w !lpr<CR>
+  endif
+
+  an 1.45 ToolBar.-sep1-		<Nop>
+  an 1.50 ToolBar.Undo			u
+  an 1.60 ToolBar.Redo			<C-R>
+
+  an 1.65 ToolBar.-sep2-		<Nop>
+  vnoremenu 1.70 ToolBar.Cut		"+x
+  vnoremenu 1.80 ToolBar.Copy		"+y
+  cnoremenu 1.80 ToolBar.Copy		<C-Y>
+  nnoremenu 1.90 ToolBar.Paste		"+gP
+  cnoremenu	 ToolBar.Paste		<C-R>+
+  exe 'vnoremenu <script>	 ToolBar.Paste	' . paste#paste_cmd['v']
+  exe 'inoremenu <script>	 ToolBar.Paste	' . paste#paste_cmd['i']
+
+  if !has("gui_athena")
+    an 1.95   ToolBar.-sep3-		<Nop>
+    an 1.100  ToolBar.Replace		:promptrepl<CR>
+    vunmenu   ToolBar.Replace
+    vnoremenu ToolBar.Replace		y:promptrepl <C-R>=<SID>FixFText()<CR><CR>
+    an 1.110  ToolBar.FindNext		n
+    an 1.120  ToolBar.FindPrev		N
+  endif
+
+  an 1.215 ToolBar.-sep5-		<Nop>
+  an <silent> 1.220 ToolBar.LoadSesn	:call <SID>LoadVimSesn()<CR>
+  an <silent> 1.230 ToolBar.SaveSesn	:call <SID>SaveVimSesn()<CR>
+  an 1.240 ToolBar.RunScript		:browse so<CR>
+
+  an 1.245 ToolBar.-sep6-		<Nop>
+  an 1.250 ToolBar.Make			:make<CR>
+  an 1.270 ToolBar.RunCtags		:exe "!" . g:ctags_command<CR>
+  an 1.280 ToolBar.TagJump		g<C-]>
+
+  an 1.295 ToolBar.-sep7-		<Nop>
+  an 1.300 ToolBar.Help			:help<CR>
+  an <silent> 1.310 ToolBar.FindHelp	:call <SID>Helpfind()<CR>
+
+" Only set the tooltips here if not done in a language menu file
+if exists("*Do_toolbar_tmenu")
+  call Do_toolbar_tmenu()
+else
+  let did_toolbar_tmenu = 1
+  tmenu ToolBar.Open		Open file
+  tmenu ToolBar.Save		Save current file
+  tmenu ToolBar.SaveAll		Save all files
+  tmenu ToolBar.Print		Print
+  tmenu ToolBar.Undo		Undo
+  tmenu ToolBar.Redo		Redo
+  tmenu ToolBar.Cut		Cut to clipboard
+  tmenu ToolBar.Copy		Copy to clipboard
+  tmenu ToolBar.Paste		Paste from Clipboard
+  if !has("gui_athena")
+    tmenu ToolBar.Replace	Find / Replace...
+    tmenu ToolBar.FindNext	Find Next
+    tmenu ToolBar.FindPrev	Find Previous
+  endif
+  tmenu ToolBar.LoadSesn	Choose a session to load
+  tmenu ToolBar.SaveSesn	Save current session
+  tmenu ToolBar.RunScript	Choose a Vim Script to run
+  tmenu ToolBar.Make		Make current project (:make)
+  tmenu ToolBar.RunCtags	Build tags in current directory tree (!ctags -R .)
+  tmenu ToolBar.TagJump		Jump to tag under cursor
+  tmenu ToolBar.Help		Vim Help
+  tmenu ToolBar.FindHelp	Search Vim Help
+endif
+
+" Select a session to load; default to current session name if present
+fun! s:LoadVimSesn()
+  if strlen(v:this_session) > 0
+    let name = s:FnameEscape(v:this_session)
+  else
+    let name = "Session.vim"
+  endif
+  execute "browse so " . name
+endfun
+
+" Select a session to save; default to current session name if present
+fun! s:SaveVimSesn()
+  if strlen(v:this_session) == 0
+    let v:this_session = "Session.vim"
+  endif
+  execute "browse mksession! " . s:FnameEscape(v:this_session)
+endfun
+
+endif
+
+endif " !exists("did_install_default_menus")
+
+" Define these items always, so that syntax can be switched on when it wasn't.
+" But skip them when the Syntax menu was disabled by the user.
+if !exists("did_install_syntax_menu")
+  an 50.212 &Syntax.&Manual		:syn manual<CR>
+  an 50.214 &Syntax.A&utomatic		:syn on<CR>
+  an <silent> 50.216 &Syntax.On/Off\ for\ &This\ File :call <SID>SynOnOff()<CR>
+  if !exists("*s:SynOnOff")
+    fun s:SynOnOff()
+      if has("syntax_items")
+	syn clear
+      else
+	if !exists("g:syntax_on")
+	  syn manual
+	endif
+	set syn=ON
+      endif
+    endfun
+  endif
+endif
+
+
+" Install the Syntax menu only when filetype.vim has been loaded or when
+" manual syntax highlighting is enabled.
+" Avoid installing the Syntax menu twice.
+if (exists("did_load_filetypes") || exists("syntax_on"))
+	\ && !exists("did_install_syntax_menu")
+  let did_install_syntax_menu = 1
+
+" Skip setting up the individual syntax selection menus unless
+" do_syntax_sel_menu is defined (it takes quite a bit of time).
+if exists("do_syntax_sel_menu")
+  runtime! synmenu.vim
+else
+  an <silent> 50.10 &Syntax.&Show\ File\ Types\ in\ Menu	:let do_syntax_sel_menu = 1<Bar>runtime! synmenu.vim<Bar>aunmenu &Syntax.&Show\ File\ Types\ in\ Menu<CR>
+  an 50.195 &Syntax.-SEP1-		<Nop>
+endif
+
+an 50.210 &Syntax.&Off			:syn off<CR>
+an 50.700 &Syntax.-SEP3-		<Nop>
+an 50.710 &Syntax.Co&lor\ Test		:sp $VIMRUNTIME/syntax/colortest.vim<Bar>so %<CR>
+an 50.720 &Syntax.&Highlight\ Test	:runtime syntax/hitest.vim<CR>
+an 50.730 &Syntax.&Convert\ to\ HTML	:runtime syntax/2html.vim<CR>
+
+endif " !exists("did_install_syntax_menu")
+
+" Restore the previous value of 'cpoptions'.
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: set sw=2 :
+

From 2a205569eb5a6b0cd69336bbdced1dc35cbbc7d2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 23 Oct 2020 00:51:16 +0200
Subject: [PATCH 169/299] Set only softtabstop, not tabstop, fixes #600

---
 ftdetect/polyglot.vim | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index bac116248..38c3d6893 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2766,9 +2766,7 @@ if !has_key(s:disabled_packages, 'autoindent')
     if shiftwidth > 0
       setlocal expandtab
       let &l:shiftwidth=shiftwidth
-      if &tabstop == 8
-        let &l:tabstop=shiftwidth
-      endif
+      let &l:softtabstop=shiftwidth
       return 1
     endif
 

From 6636144497456510fb48a252c65462750cf36aeb Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 23 Oct 2020 00:56:41 +0200
Subject: [PATCH 170/299] Prevent setting expandtab by default, closes #599

---
 ftdetect/polyglot.vim | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 38c3d6893..175575baf 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2821,12 +2821,6 @@ if !has_key(s:disabled_packages, 'autoindent')
       let level -= 1
     endwhile
 
-    setlocal expandtab
-    let &l:shiftwidth = 2
-    if &tabstop == 8
-      let &l:tabstop = 2
-    endif
-
     let b:sleuth_culprit = "default"
   endfunc
 

From 29ec69ffa095a16fe15e4c63c1a6ba90974efd74 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 23 Oct 2020 01:04:53 +0200
Subject: [PATCH 171/299] Set default tabstop to 2, but only if not changed

---
 ftdetect/polyglot.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 175575baf..6d495073d 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2634,6 +2634,10 @@ if !has_key(s:disabled_packages, 'autoindent')
   " Code below re-implements sleuth for vim-polyglot
   let g:loaded_sleuth = 1
 
+  if &tabstop == 8
+    let &tabstop = 2
+  endif
+
   func! s:get_shiftwidth(indents) abort
     let shiftwidth = 0
     let max_count = 0

From 50a9a7345f8f9a9f81712554f42e9e62995d094f Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 23 Oct 2020 01:13:09 +0200
Subject: [PATCH 172/299] Update

---
 after/syntax/c.vim |  3 ++-
 extras/menu.vim    | 18 ++++++++++++++++--
 scripts/build      |  1 +
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index c533862c6..821350c37 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -7,7 +7,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') ==
 "                  http://www.vim.org/scripts/script.php?script_id=3064
 " Maintainer:      bfrg <bfrg@users.noreply.github.com>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Oct 17, 2020
+" Last Change:     Oct 22, 2020
 "
 " Extended C syntax highlighting including highlighting of user-defined
 " functions.
@@ -34,6 +34,7 @@ if get(g:, 'cpp_member_highlight', 0)
     syn match cStructMember "\<\h\w*\>\%((\|<\)\@!" contained
     syn cluster cParenGroup add=cStructMember
     syn cluster cPreProcGroup add=cStructMember
+    syn cluster cMultiGroup add=cStructMember
     hi def link cStructMember Identifier
 
     if &filetype ==# 'cpp'
diff --git a/extras/menu.vim b/extras/menu.vim
index f969c1b18..e17652432 100644
--- a/extras/menu.vim
+++ b/extras/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Mar 29
+" Last Change:	2020 Sep 28
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -89,6 +89,21 @@ an 9999.75 &Help.-sep2-			<Nop>
 an 9999.80 &Help.&Version		:version<CR>
 an 9999.90 &Help.&About			:intro<CR>
 
+if exists(':tlmenu')
+  tlnoremenu 9999.10 &Help.&Overview<Tab><F1>		<C-W>:help<CR>
+  tlnoremenu 9999.20 &Help.&User\ Manual		<C-W>:help usr_toc<CR>
+  tlnoremenu 9999.30 &Help.&How-To\ Links		<C-W>:help how-to<CR>
+  tlnoremenu <silent> 9999.40 &Help.&Find\.\.\.		<C-W>:call <SID>Helpfind()<CR>
+  tlnoremenu 9999.45 &Help.-sep1-			<Nop>
+  tlnoremenu 9999.50 &Help.&Credits			<C-W>:help credits<CR>
+  tlnoremenu 9999.60 &Help.Co&pying			<C-W>:help copying<CR>
+  tlnoremenu 9999.70 &Help.&Sponsor/Register		<C-W>:help sponsor<CR>
+  tlnoremenu 9999.70 &Help.O&rphans			<C-W>:help kcc<CR>
+  tlnoremenu 9999.75 &Help.-sep2-			<Nop>
+  tlnoremenu 9999.80 &Help.&Version			<C-W>:version<CR>
+  tlnoremenu 9999.90 &Help.&About			<C-W>:intro<CR>
+endif
+
 fun! s:Helpfind()
   if !exists("g:menutrans_help_dialog")
     let g:menutrans_help_dialog = "Enter a command or word to find help on:\n\nPrepend i_ for Input mode commands (e.g.: i_CTRL-X)\nPrepend c_ for command-line editing commands (e.g.: c_<Del>)\nPrepend ' for an option name (e.g.: 'shiftwidth')"
@@ -1196,4 +1211,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set sw=2 :
-
diff --git a/scripts/build b/scripts/build
index 91a7a26cd..15d123338 100755
--- a/scripts/build
+++ b/scripts/build
@@ -891,6 +891,7 @@ def generate_fallback
   filetype_content.gsub!(/^au StdinReadPost \* .+?runtime!.+?endif/m) {}
   filetype_content.gsub!(/^au filetypedetect BufNewFile,BufRead,StdinReadPost \*\n.+?endif/m) {}
   File.write('extras/filetype.vim', filetype_content)
+  File.write('extras/menu.vim', File.read('tmp/vim/vim/runtime/menu.vim'))
 
   autoload_content = File.read('tmp/vim/vim/runtime/autoload/dist/ft.vim') 
   autoload_content.gsub!('dist#ft#', 'polyglot#ft#')

From 2522ad2029cb880552173cc5eb6a861b02a8799a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 23 Oct 2020 01:16:32 +0200
Subject: [PATCH 173/299] Set softtabstop to -1 to allow easy sw configuraton

---
 ftdetect/polyglot.vim | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 6d495073d..f0146c74a 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2770,6 +2770,13 @@ if !has_key(s:disabled_packages, 'autoindent')
     if shiftwidth > 0
       setlocal expandtab
       let &l:shiftwidth=shiftwidth
+      try
+        " Sunchronize tabstop with shiftwidth
+        let &l:softtabstop = -1
+      catch /^Vim\%((\a\+)\)\=:E487/ 
+        " -1 was not supported before Vim 7.4
+        let &l:softtabstop = a:num_spaces
+      endtry
       let &l:softtabstop=shiftwidth
       return 1
     endif

From f828912a7f39f7525fca1a90adeb390a53e0d0a1 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 23 Oct 2020 01:22:31 +0200
Subject: [PATCH 174/299] Set softtabstop to -1 to allow chaging shiftwidth

---
 ftdetect/polyglot.vim | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index f0146c74a..69d27f08b 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2773,11 +2773,10 @@ if !has_key(s:disabled_packages, 'autoindent')
       try
         " Sunchronize tabstop with shiftwidth
         let &l:softtabstop = -1
-      catch /^Vim\%((\a\+)\)\=:E487/ 
+      catch /^Vim\%((\a\+)\)\=:E487/
         " -1 was not supported before Vim 7.4
         let &l:softtabstop = a:num_spaces
       endtry
-      let &l:softtabstop=shiftwidth
       return 1
     endif
 

From 113f9b8949643f7e02c29051ad2148c3265b8131 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 23 Oct 2020 01:30:33 +0200
Subject: [PATCH 175/299] Respect shiftwidth if set by user or plugin

---
 ftdetect/polyglot.vim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 69d27f08b..938aac738 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2638,6 +2638,8 @@ if !has_key(s:disabled_packages, 'autoindent')
     let &tabstop = 2
   endif
 
+  let s:default_shiftwidth = &shiftwidth
+
   func! s:get_shiftwidth(indents) abort
     let shiftwidth = 0
     let max_count = 0
@@ -2788,8 +2790,8 @@ if !has_key(s:disabled_packages, 'autoindent')
       return
     endif
 
-    " Do not autodetect indent if language sets it
-    if &l:shiftwidth != &g:shiftwidth
+    " Do not autodetect indent if language or user sets it
+    if &l:shiftwidth != s:default_shiftwidth
       return
     endif
 

From 6422a5a479905bf32abe7a322d1c0b0a75d4aa8c Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 23 Oct 2020 02:36:02 +0200
Subject: [PATCH 176/299] Count all multiplies for given indent, fixes #592

---
 ftdetect/polyglot.vim | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 938aac738..2ebfec959 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2643,10 +2643,20 @@ if !has_key(s:disabled_packages, 'autoindent')
   func! s:get_shiftwidth(indents) abort
     let shiftwidth = 0
     let max_count = 0
+    let final_counts = {}
     for [indent, indent_count] in items(a:indents)
-      if indent_count > max_count
+      let indent_count *= 1.5
+      for [indent2, indent2_count] in items(a:indents)
+        if indent2 > indent && indent2 % indent == 0
+          let indent_count += indent2_count
+        endif
+      endfor
+      let final_counts[indent] = indent_count
+    endfor
+    for [indent, final_count] in items(final_counts)
+      if final_count > max_count
         let shiftwidth = indent
-        let max_count = indent_count
+        let max_count = final_count
       endif
     endfor
     return shiftwidth

From 0a2f2cc04d39f996d5afcdbc99f5b4190f094bbb Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 23 Oct 2020 21:57:54 +0200
Subject: [PATCH 177/299] Fix old nvim, closes #592

---
 ftdetect/polyglot.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 2ebfec959..15bd5a0fd 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2645,10 +2645,10 @@ if !has_key(s:disabled_packages, 'autoindent')
     let max_count = 0
     let final_counts = {}
     for [indent, indent_count] in items(a:indents)
-      let indent_count *= 1.5
+      let indent_count = indent_count * 1.5
       for [indent2, indent2_count] in items(a:indents)
         if indent2 > indent && indent2 % indent == 0
-          let indent_count += indent2_count
+          let indent_count = indent_count + indent2_count
         endif
       endfor
       let final_counts[indent] = indent_count

From 73245289847c4e806e9bc20b7382f2a46eb9337c Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 24 Oct 2020 16:34:21 +0200
Subject: [PATCH 178/299] Fix detecting shell filetypes, closes #603

---
 after/syntax/c.vim  |   3 +-
 extras/filetype.vim | 104 ++++++++++++++++++++++----------------------
 scripts/build       |   1 +
 syntax/qml.vim      |   2 +-
 4 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index 821350c37..80501e194 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -7,7 +7,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') ==
 "                  http://www.vim.org/scripts/script.php?script_id=3064
 " Maintainer:      bfrg <bfrg@users.noreply.github.com>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Oct 22, 2020
+" Last Change:     Oct 23, 2020
 "
 " Extended C syntax highlighting including highlighting of user-defined
 " functions.
@@ -63,6 +63,7 @@ hi def link cAnsiName Identifier
 if get(g:, 'cpp_simple_highlight', 0)
     hi link cStorageClass Statement
     hi link cStructure    Statement
+    hi link cTypedef      Statement
     hi link cLabel        Statement
 endif
 
diff --git a/extras/filetype.vim b/extras/filetype.vim
index dbc797f83..feb304488 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -54,7 +54,7 @@ endfunc
 au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt	setf help
 
 " Abaqus or Trasys
-au BufNewFile,BufRead *.inp			call dist#ft#Check_inp()
+au BufNewFile,BufRead *.inp			call polyglot#ft#Check_inp()
 
 " 8th (Firth-derivative)
 au BufNewFile,BufRead *.8th			setf 8th
@@ -160,7 +160,7 @@ au BufNewFile,BufRead */boot/grub/menu.lst,*/boot/grub/grub.conf,*/etc/grub.conf
 
 " Assembly (all kinds)
 " *.lst is not pure assembly, it has two extra columns (address, byte codes)
-au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call dist#ft#FTasm()
+au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call polyglot#ft#FTasm()
 
 " Macro (VAX)
 au BufNewFile,BufRead *.mar			setf vmasm
@@ -190,7 +190,7 @@ au BufNewFile,BufRead *.awk,*.gawk		setf awk
 au BufNewFile,BufRead *.mch,*.ref,*.imp		setf b
 
 " BASIC or Visual Basic
-au BufNewFile,BufRead *.bas			call dist#ft#FTVB("basic")
+au BufNewFile,BufRead *.bas			call polyglot#ft#FTVB("basic")
 
 " Visual Basic Script (close to Visual Basic) or Visual Basic .NET
 au BufNewFile,BufRead *.vb,*.vbs,*.dsm,*.ctl	setf vb
@@ -208,7 +208,7 @@ au BufNewFile,BufRead *.cmd
 	\ if getline(1) =~ '^/\*' | setf rexx | else | setf dosbatch | endif
 
 " Batch file for 4DOS
-au BufNewFile,BufRead *.btm			call dist#ft#FTbtm()
+au BufNewFile,BufRead *.btm			call polyglot#ft#FTbtm()
 
 " BC calculator
 au BufNewFile,BufRead *.bc			setf bc
@@ -228,7 +228,7 @@ au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key	setf named
 
 " BIND zone
 au BufNewFile,BufRead named.root		setf bindzone
-au BufNewFile,BufRead *.db			call dist#ft#BindzoneCheck('')
+au BufNewFile,BufRead *.db			call polyglot#ft#BindzoneCheck('')
 
 " Blank
 au BufNewFile,BufRead *.bl			setf blank
@@ -247,7 +247,7 @@ if has("fname_case")
 endif
 
 " C or lpc
-au BufNewFile,BufRead *.c			call dist#ft#FTlpc()
+au BufNewFile,BufRead *.c			call polyglot#ft#FTlpc()
 au BufNewFile,BufRead *.lpc,*.ulpc		setf lpc
 
 " Calendar
@@ -302,7 +302,7 @@ endif
 " .h files can be C, Ch C++, ObjC or ObjC++.
 " Set c_syntax_for_h if you want C, ch_syntax_for_h if you want Ch. ObjC is
 " detected automatically.
-au BufNewFile,BufRead *.h			call dist#ft#FTheader()
+au BufNewFile,BufRead *.h			call polyglot#ft#FTheader()
 
 " Ch (CHscript)
 au BufNewFile,BufRead *.chf			setf ch
@@ -336,7 +336,7 @@ au BufNewFile,BufRead NEWS
 au BufNewFile,BufRead *..ch			setf chill
 
 " Changes for WEB and CWEB or CHILL
-au BufNewFile,BufRead *.ch			call dist#ft#FTchange()
+au BufNewFile,BufRead *.ch			call polyglot#ft#FTchange()
 
 " ChordPro
 au BufNewFile,BufRead *.chopro,*.crd,*.cho,*.crdpro,*.chordpro	setf chordpro
@@ -348,7 +348,7 @@ au BufNewFile,BufRead *.dcl,*.icl		setf clean
 au BufNewFile,BufRead *.eni			setf cl
 
 " Clever or dtd
-au BufNewFile,BufRead *.ent			call dist#ft#FTent()
+au BufNewFile,BufRead *.ent			call polyglot#ft#FTent()
 
 " Clipper (or FoxPro; could also be eviews)
 au BufNewFile,BufRead *.prg
@@ -403,9 +403,9 @@ au BufNewFile,BufRead *enlightenment/*.cfg	setf c
 au BufNewFile,BufRead *Eterm/*.cfg		setf eterm
 
 " Euphoria 3 or 4
-au BufNewFile,BufRead *.eu,*.ew,*.ex,*.exu,*.exw  call dist#ft#EuphoriaCheck()
+au BufNewFile,BufRead *.eu,*.ew,*.ex,*.exu,*.exw  call polyglot#ft#EuphoriaCheck()
 if has("fname_case")
-   au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW  call dist#ft#EuphoriaCheck()
+   au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW  call polyglot#ft#EuphoriaCheck()
 endif
 
 " Lynx config files
@@ -462,7 +462,7 @@ au BufNewFile,BufRead */etc/dnsmasq.conf	setf dnsmasq
 au BufNewFile,BufRead *.desc			setf desc
 
 " the D language or dtrace
-au BufNewFile,BufRead *.d			call dist#ft#DtraceCheck()
+au BufNewFile,BufRead *.d			call polyglot#ft#DtraceCheck()
 
 " Desktop files
 au BufNewFile,BufRead *.desktop,*.directory	setf desktop
@@ -494,7 +494,7 @@ au BufNewFile,BufRead *.rul
 	\ endif
 
 " DCL (Digital Command Language - vms) or DNS zone file
-au BufNewFile,BufRead *.com			call dist#ft#BindzoneCheck('dcl')
+au BufNewFile,BufRead *.com			call polyglot#ft#BindzoneCheck('dcl')
 
 " DOT
 au BufNewFile,BufRead *.dot,*.gv		setf dot
@@ -542,7 +542,7 @@ au BufNewFile,BufRead .editorconfig		setf dosini
 au BufNewFile,BufRead *.ecd			setf ecd
 
 " Eiffel or Specman or Euphoria
-au BufNewFile,BufRead *.e,*.E			call dist#ft#FTe()
+au BufNewFile,BufRead *.e,*.E			call polyglot#ft#FTe()
 
 " Elinks configuration
 au BufNewFile,BufRead elinks.conf		setf elinks
@@ -720,7 +720,7 @@ au BufRead,BufNewFile *.hws			setf hollywood
 au BufNewFile,BufRead *.t.html			setf tilde
 
 " HTML (.shtml and .stm for server side)
-au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm  call dist#ft#FThtml()
+au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm  call polyglot#ft#FThtml()
 
 " HTML with Ruby - eRuby
 au BufNewFile,BufRead *.erb,*.rhtml		setf eruby
@@ -747,7 +747,7 @@ au BufNewFile,BufRead *.htt,*.htb		setf httest
 au BufNewFile,BufRead *.icn			setf icon
 
 " IDL (Interface Description Language)
-au BufNewFile,BufRead *.idl			call dist#ft#FTidl()
+au BufNewFile,BufRead *.idl			call polyglot#ft#FTidl()
 
 " Microsoft IDL (Interface Description Language)  Also *.idl
 " MOF = WMI (Windows Management Instrumentation) Managed Object Format
@@ -758,10 +758,10 @@ au BufNewFile,BufRead */.icewm/menu		setf icemenu
 
 " Indent profile (must come before IDL *.pro!)
 au BufNewFile,BufRead .indent.pro		setf indent
-au BufNewFile,BufRead indent.pro		call dist#ft#ProtoCheck('indent')
+au BufNewFile,BufRead indent.pro		call polyglot#ft#ProtoCheck('indent')
 
 " IDL (Interactive Data Language)
-au BufNewFile,BufRead *.pro			call dist#ft#ProtoCheck('idlang')
+au BufNewFile,BufRead *.pro			call polyglot#ft#ProtoCheck('idlang')
 
 " Indent RC
 au BufNewFile,BufRead indentrc			setf indent
@@ -981,7 +981,7 @@ au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,*.md  setf markdown
 au BufNewFile,BufRead *.mason,*.mhtml,*.comp	setf mason
 
 " Mathematica, Matlab, Murphi or Objective C
-au BufNewFile,BufRead *.m			call dist#ft#FTm()
+au BufNewFile,BufRead *.m			call polyglot#ft#FTm()
 
 " Mathematica notebook
 au BufNewFile,BufRead *.nb			setf mma
@@ -1014,7 +1014,7 @@ au BufNewFile,BufRead *.mgl			setf mgl
 au BufNewFile,BufRead *.mix,*.mixal		setf mix
 
 " MMIX or VMS makefile
-au BufNewFile,BufRead *.mms			call dist#ft#FTmms()
+au BufNewFile,BufRead *.mms			call polyglot#ft#FTmms()
 
 " Symbian meta-makefile definition (MMP)
 au BufNewFile,BufRead *.mmp			setf mmp
@@ -1105,10 +1105,10 @@ au BufNewFile,BufRead *.me
 	\   setf nroff |
 	\ endif
 au BufNewFile,BufRead *.tr,*.nr,*.roff,*.tmac,*.mom	setf nroff
-au BufNewFile,BufRead *.[1-9]			call dist#ft#FTnroff()
+au BufNewFile,BufRead *.[1-9]			call polyglot#ft#FTnroff()
 
 " Nroff or Objective C++
-au BufNewFile,BufRead *.mm			call dist#ft#FTmm()
+au BufNewFile,BufRead *.mm			call polyglot#ft#FTmm()
 
 " Not Quite C
 au BufNewFile,BufRead *.nqc			setf nqc
@@ -1175,9 +1175,9 @@ au BufNewFile,BufRead *.pcmk			setf pcmk
 
 " Perl
 if has("fname_case")
-  au BufNewFile,BufRead *.pl,*.PL		call dist#ft#FTpl()
+  au BufNewFile,BufRead *.pl,*.PL		call polyglot#ft#FTpl()
 else
-  au BufNewFile,BufRead *.pl			call dist#ft#FTpl()
+  au BufNewFile,BufRead *.pl			call polyglot#ft#FTpl()
 endif
 au BufNewFile,BufRead *.plx,*.al,*.psgi		setf perl
 au BufNewFile,BufRead *.p6,*.pm6,*.pl6		setf perl6
@@ -1253,7 +1253,7 @@ au BufNewFile,BufRead *.pov			setf pov
 au BufNewFile,BufRead .povrayrc			setf povini
 
 " Povray, PHP or assembly
-au BufNewFile,BufRead *.inc			call dist#ft#FTinc()
+au BufNewFile,BufRead *.inc			call polyglot#ft#FTinc()
 
 " Printcap and Termcap
 au BufNewFile,BufRead *printcap
@@ -1282,13 +1282,13 @@ au BufNewFile,BufRead *.action			setf privoxy
 au BufNewFile,BufRead .procmail,.procmailrc	setf procmail
 
 " Progress or CWEB
-au BufNewFile,BufRead *.w			call dist#ft#FTprogress_cweb()
+au BufNewFile,BufRead *.w			call polyglot#ft#FTprogress_cweb()
 
 " Progress or assembly
-au BufNewFile,BufRead *.i			call dist#ft#FTprogress_asm()
+au BufNewFile,BufRead *.i			call polyglot#ft#FTprogress_asm()
 
 " Progress or Pascal
-au BufNewFile,BufRead *.p			call dist#ft#FTprogress_pascal()
+au BufNewFile,BufRead *.p			call polyglot#ft#FTprogress_pascal()
 
 " Software Distributor Product Specification File (POSIX 1387.2-1995)
 au BufNewFile,BufRead *.psf			setf psf
@@ -1371,7 +1371,7 @@ else
 endif
 
 " Rexx, Rebol or R
-au BufNewFile,BufRead *.r,*.R				call dist#ft#FTr()
+au BufNewFile,BufRead *.r,*.R				call polyglot#ft#FTr()
 
 " Remind
 au BufNewFile,BufRead .reminders,*.remind,*.rem		setf remind
@@ -1467,7 +1467,7 @@ au BufNewFile,BufRead *.siv,*.sieve		setf sieve
 au BufNewFile,BufRead sendmail.cf		setf sm
 
 " Sendmail .mc files are actually m4.  Could also be MS Message text file.
-au BufNewFile,BufRead *.mc			call dist#ft#McSetf()
+au BufNewFile,BufRead *.mc			call polyglot#ft#McSetf()
 
 " Services
 au BufNewFile,BufRead */etc/services		setf services
@@ -1508,9 +1508,9 @@ au BufNewFile,BufRead catalog			setf catalog
 " Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc.
 " Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts
 " NOTE: Patterns ending in a star are further down, these have lower priority.
-au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD call dist#ft#SetFileTypeSH("bash")
-au BufNewFile,BufRead .kshrc,*.ksh call dist#ft#SetFileTypeSH("ksh")
-au BufNewFile,BufRead */etc/profile,.profile,*.sh,*.env call dist#ft#SetFileTypeSH(getline(1))
+au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD call polyglot#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .kshrc,*.ksh call polyglot#ft#SetFileTypeSH("ksh")
+au BufNewFile,BufRead */etc/profile,.profile,*.sh,*.env call polyglot#ft#SetFileTypeSH(getline(1))
 
 
 " Shell script (Arch Linux) or PHP file (Drupal)
@@ -1518,15 +1518,15 @@ au BufNewFile,BufRead *.install
 	\ if getline(1) =~ '<?php' |
 	\   setf php |
 	\ else |
-	\   call dist#ft#SetFileTypeSH("bash") |
+	\   call polyglot#ft#SetFileTypeSH("bash") |
 	\ endif
 
 " tcsh scripts (patterns ending in a star further below)
-au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login	call dist#ft#SetFileTypeShell("tcsh")
+au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login	call polyglot#ft#SetFileTypeShell("tcsh")
 
 " csh scripts, but might also be tcsh scripts (on some systems csh is tcsh)
 " (patterns ending in a start further below)
-au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias  call dist#ft#CSH()
+au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias  call polyglot#ft#CSH()
 
 " Z-Shell script (patterns ending in a star further below)
 au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks  setf zsh
@@ -1597,7 +1597,7 @@ au BufNewFile,BufRead *.mib,*.my		setf mib
 
 " Snort Configuration
 au BufNewFile,BufRead *.hog,snort.conf,vision.conf	setf hog
-au BufNewFile,BufRead *.rules			call dist#ft#FTRules()
+au BufNewFile,BufRead *.rules			call polyglot#ft#FTRules()
 
 " Spec (Linux RPM)
 au BufNewFile,BufRead *.spec			setf spec
@@ -1621,7 +1621,7 @@ au BufNewFile,BufRead squid.conf		setf squid
 au BufNewFile,BufRead *.tyb,*.typ,*.tyc,*.pkb,*.pks	setf sql
 
 " SQL
-au BufNewFile,BufRead *.sql			call dist#ft#SQL()
+au BufNewFile,BufRead *.sql			call polyglot#ft#SQL()
 
 " SQLJ
 au BufNewFile,BufRead *.sqlj			setf sqlj
@@ -1688,7 +1688,7 @@ au BufNewFile,BufRead *.svg			setf svg
 
 " Tads (or Nroff or Perl test file)
 au BufNewFile,BufRead *.t
-	\ if !dist#ft#FTnroff() && !dist#ft#FTperl() | setf tads | endif
+	\ if !polyglot#ft#FTnroff() && !polyglot#ft#FTperl() | setf tads | endif
 
 " Tags
 au BufNewFile,BufRead tags			setf tags
@@ -1717,7 +1717,7 @@ au BufNewFile,BufRead *.ti			setf terminfo
 
 " TeX
 au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl	setf tex
-au BufNewFile,BufRead *.tex			call dist#ft#FTtex()
+au BufNewFile,BufRead *.tex			call polyglot#ft#FTtex()
 
 " ConTeXt
 au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi   setf context
@@ -1820,7 +1820,7 @@ au BufRead,BufNewFile *.hw,*.module,*.pkg
 	\ endif
 
 " Visual Basic (also uses *.bas) or FORM
-au BufNewFile,BufRead *.frm			call dist#ft#FTVB("form")
+au BufNewFile,BufRead *.frm			call polyglot#ft#FTVB("form")
 
 " SaxBasic is close to Visual Basic
 au BufNewFile,BufRead *.sba			setf vb
@@ -1916,10 +1916,10 @@ au BufNewFile,BufRead .Xdefaults,.Xpdefaults,.Xresources,xdm-config,*.ad setf xd
 " Xmath
 au BufNewFile,BufRead *.msc,*.msf		setf xmath
 au BufNewFile,BufRead *.ms
-	\ if !dist#ft#FTnroff() | setf xmath | endif
+	\ if !polyglot#ft#FTnroff() | setf xmath | endif
 
 " XML  specific variants: docbk and xbl
-au BufNewFile,BufRead *.xml			call dist#ft#FTxml()
+au BufNewFile,BufRead *.xml			call polyglot#ft#FTxml()
 
 " XMI (holding UML models) is also XML
 au BufNewFile,BufRead *.xmi			setf xml
@@ -1966,7 +1966,7 @@ au BufNewFile,BufRead *.xsl,*.xslt		setf xslt
 au BufNewFile,BufRead *.yy,*.yxx,*.y++		setf yacc
 
 " Yacc or racc
-au BufNewFile,BufRead *.y			call dist#ft#FTy()
+au BufNewFile,BufRead *.y			call polyglot#ft#FTy()
 
 " Yaml
 au BufNewFile,BufRead *.yaml,*.yml		setf yaml
@@ -1985,9 +1985,9 @@ au BufNewFile,BufRead *.zut			setf zimbutempl
 " Zope
 "   dtml (zope dynamic template markup language), pt (zope page template),
 "   cpt (zope form controller page template)
-au BufNewFile,BufRead *.dtml,*.pt,*.cpt		call dist#ft#FThtml()
+au BufNewFile,BufRead *.dtml,*.pt,*.cpt		call polyglot#ft#FThtml()
 "   zsql (zope sql method)
-au BufNewFile,BufRead *.zsql			call dist#ft#SQL()
+au BufNewFile,BufRead *.zsql			call polyglot#ft#SQL()
 
 " Z80 assembler asz80
 au BufNewFile,BufRead *.z8a			setf z8a
@@ -2152,7 +2152,7 @@ au BufNewFile,BufRead *termcap*
 
 " ReDIF
 " Only used when the .rdf file was not detected to be XML.
-au BufRead,BufNewFile *.rdf			call dist#ft#Redif()
+au BufRead,BufNewFile *.rdf			call polyglot#ft#Redif()
 
 " Remind
 au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
@@ -2161,15 +2161,15 @@ au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
 au BufNewFile,BufRead sgml.catalog*		call s:StarSetf('catalog')
 
 " Shell scripts ending in a star
-au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,,PKGBUILD* call dist#ft#SetFileTypeSH("bash")
-au BufNewFile,BufRead .kshrc* call dist#ft#SetFileTypeSH("ksh")
-au BufNewFile,BufRead .profile* call dist#ft#SetFileTypeSH(getline(1))
+au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,,PKGBUILD* call polyglot#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .kshrc* call polyglot#ft#SetFileTypeSH("ksh")
+au BufNewFile,BufRead .profile* call polyglot#ft#SetFileTypeSH(getline(1))
 
 " tcsh scripts ending in a star
-au BufNewFile,BufRead .tcshrc*	call dist#ft#SetFileTypeShell("tcsh")
+au BufNewFile,BufRead .tcshrc*	call polyglot#ft#SetFileTypeShell("tcsh")
 
 " csh scripts ending in a star
-au BufNewFile,BufRead .login*,.cshrc*  call dist#ft#CSH()
+au BufNewFile,BufRead .login*,.cshrc*  call polyglot#ft#CSH()
 
 " VHDL
 au BufNewFile,BufRead *.vhdl_[0-9]*		call s:StarSetf('vhdl')
diff --git a/scripts/build b/scripts/build
index 15d123338..efae3219f 100755
--- a/scripts/build
+++ b/scripts/build
@@ -890,6 +890,7 @@ def generate_fallback
   filetype_content.gsub!(/^au BufNewFile,BufRead \*\n.+?runtime!.+?endif/m) {}
   filetype_content.gsub!(/^au StdinReadPost \* .+?runtime!.+?endif/m) {}
   filetype_content.gsub!(/^au filetypedetect BufNewFile,BufRead,StdinReadPost \*\n.+?endif/m) {}
+  filetype_content.gsub!("dist#ft#", "polyglot#ft#")
   File.write('extras/filetype.vim', filetype_content)
   File.write('extras/menu.vim', File.read('tmp/vim/vim/runtime/menu.vim'))
 
diff --git a/syntax/qml.vim b/syntax/qml.vim
index 268c9f8e5..15f1d2558 100644
--- a/syntax/qml.vim
+++ b/syntax/qml.vim
@@ -54,7 +54,7 @@ syn keyword qmlRepeat            while for do in
 syn keyword qmlBranch            break continue
 syn keyword qmlOperator          new delete instanceof typeof
 syn keyword qmlJsType            Array Boolean Date Function Number Object String RegExp
-syn keyword qmlType              action alias bool color date double enumeration font int list point real rect size string time url variant vector3d
+syn keyword qmlType              action alias bool color date double enumeration font int list point real rect size string time url variant vector2d vector3d vector4d
 syn keyword qmlStatement         return with
 syn keyword qmlBoolean           true false
 syn keyword qmlNull              null undefined

From e3609fed6b1c771f06c9c7e94df9096318dd65f6 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 24 Oct 2020 16:37:45 +0200
Subject: [PATCH 179/299] Fix disabling sensible settings, closes #602

---
 plugin/polyglot.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index f23df6bf3..d4a60b297 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -17,7 +17,7 @@ endif
 " and (mostly comments) from https://github.com/sheerun/vimrc
 "
 " Only settings that matter for proper editing are left
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible')
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -1
   " Autoindent when starting new line, or using `o` or `O`.
   set autoindent
 

From b6654c85b28b1fbaec56ccfda085afb7c1a06875 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 24 Oct 2020 16:54:55 +0200
Subject: [PATCH 180/299] Fix shortcuts in plugins, fixes #566

---
 ftdetect/polyglot.vim | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 15bd5a0fd..e345dc6dd 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -25,14 +25,6 @@ let did_load_filetypes = 1
 " Be consistent across different systems
 set nofileignorecase
 
-func! s:Observe(fn)
-  let b:PolyglotObserve = function("polyglot#" . a:fn)
-  augroup polyglot-observer
-    au! CursorHold,CursorHoldI,BufWritePost <buffer>
-          \ if b:PolyglotObserve() | au! polyglot-observer | endif
-  augroup END
-endfunc
-
 let s:disabled_packages = {}
 let s:new_polyglot_disabled = []
 
@@ -112,6 +104,8 @@ func! s:StarSetf(ft)
   endif
 endfunc
 
+augroup polyglot-observer | augroup END
+
 augroup filetypedetect
 
 " Load user-defined filetype.vim and oter plugins ftdetect first
@@ -2621,12 +2615,22 @@ endif
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 
-au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>:e") == "" |
+func! s:Observe(fn)
+  let b:PolyglotObserve = function("polyglot#" . a:fn)
+  augroup polyglot-observer
+    au!
+    au CursorHold,CursorHoldI,BufWritePost <buffer> call b:PolyglotObserve()
+  augroup END
+endfunc
+
+au BufNewFile,BufRead,StdinReadPost * if expand("<afile>:e") == "" |
   \ call polyglot#shebang#Detect() | endif
 
-au BufEnter * if &ft == "" && expand("<afile>:e") == ""  |
+au BufWinEnter * if &ft == "" && expand("<afile>:e") == ""  |
   \ call s:Observe('shebang#Detect') | endif
 
+au FileType * au! polyglot-observer
+
 augroup END
 
 

From f52f6b9519f51faeeeae123a852a7bacc82089d5 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 24 Oct 2020 17:19:54 +0200
Subject: [PATCH 181/299] Allow to override incsearch, #603

---
 ftdetect/polyglot.vim | 15 +++++++++++++++
 plugin/polyglot.vim   | 16 +++-------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index e345dc6dd..49b2c8948 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -3491,6 +3491,21 @@ if exists("did_load_filetypes") && exists("g:polyglot_disabled")
   runtime! extras/filetype.vim
 endif
 
+
+if !has_key(s:disabled_packages, 'sensible')
+  " Reload unchanged files automatically.
+  set autoread
+
+  " Enable highlighted case-insensitive incremential search.
+  set incsearch
+
+  " Use utf-8 encoding by default
+  set encoding=utf-8
+
+  " Autoindent when starting new line, or using `o` or `O`.
+  set autoindent
+endif
+
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index d4a60b297..c5074088f 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -18,11 +18,10 @@ endif
 "
 " Only settings that matter for proper editing are left
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -1
-  " Autoindent when starting new line, or using `o` or `O`.
-  set autoindent
-
   " Allow backspace in insert mode.
-  set backspace=indent,eol,start
+  if &backspace == ""
+    set backspace=indent,eol,start
+  endif
 
   " Allow for mappings including `Esc`, while preserving
   " zero timeout after pressing it manually.
@@ -32,12 +31,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -
     set ttimeoutlen=100
   endif
 
-  " Enable highlighted case-insensitive incremential search.
-  set incsearch
-
-  " Use utf-8 encoding by default
-  set encoding=utf-8
-
   " Set default whitespace characters when using `:set list`
   if &listchars ==# 'eol:$'
     set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
@@ -59,9 +52,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -
     set shell=/usr/bin/env\ bash
   endif
 
-  " Reload unchanged files automatically.
-  set autoread
-
   " Increase history size to 1000 items.
   if &history < 1000
     set history=1000

From 739102e06df4fe5bca752d1163b954603912bc98 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 24 Oct 2020 17:32:39 +0200
Subject: [PATCH 182/299] Make editing same file in multiple vim instances
 seamless

---
 ftdetect/polyglot.vim | 10 ++++++++++
 plugin/polyglot.vim   |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 49b2c8948..c2a6ae177 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -8,6 +8,7 @@ if exists("did_load_polyglot")
   finish
 endif
 
+
 let did_load_polyglot = 1
 
 " Switch to compatible mode for the time being
@@ -3496,6 +3497,15 @@ if !has_key(s:disabled_packages, 'sensible')
   " Reload unchanged files automatically.
   set autoread
 
+  " Disable swap, it doesn't play well with autoread
+  set noswapfile
+
+  " Auto reload if file was changed somewhere else (for autoread)
+  augroup polyglot-sensible
+    au!
+    au CursorHold * checktime
+  augroup END
+
   " Enable highlighted case-insensitive incremential search.
   set incsearch
 
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index c5074088f..7143043ed 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -62,6 +62,11 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -
     set tabpagemax=50
   endif
 
+  " Reduce updatetime from 4000 to 300 to avoid issues with coc.nvim
+  if &updatetime == 4000
+    set updatetime=300
+  endif
+
   " Always save upper case variables to viminfo file.
   if !empty(&viminfo)
     set viminfo^=!

From 3c148e9ef5a303a599320eb64e608392db82eeb0 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 24 Oct 2020 17:46:15 +0200
Subject: [PATCH 183/299] Do not set checktime if already set

---
 ftdetect/polyglot.vim |  6 ------
 plugin/polyglot.vim   | 11 +++++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index c2a6ae177..2f85f2ff5 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -3500,12 +3500,6 @@ if !has_key(s:disabled_packages, 'sensible')
   " Disable swap, it doesn't play well with autoread
   set noswapfile
 
-  " Auto reload if file was changed somewhere else (for autoread)
-  augroup polyglot-sensible
-    au!
-    au CursorHold * checktime
-  augroup END
-
   " Enable highlighted case-insensitive incremential search.
   set incsearch
 
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index 7143043ed..f989d583e 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -67,6 +67,17 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -
     set updatetime=300
   endif
 
+  " Automatically reload file if changed somewhere else
+  redir => capture
+  silent autocmd CursorHold
+  redir END
+  if match(capture, 'checktime') == -1
+    augroup polyglot-sensible
+      au!
+      au CursorHold * checktime
+    augroup END
+  endif
+
   " Always save upper case variables to viminfo file.
   if !empty(&viminfo)
     set viminfo^=!

From 8e61708b4527072aa9250deb2c4cf7a56e3f3b0a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 24 Oct 2020 18:52:18 +0200
Subject: [PATCH 184/299] Use vim-polyglot only as fallback to other plugins,
 fixes #580

---
 autoload/LaTeXtoUnicode.vim             | 5 +++++
 autoload/RstFold.vim                    | 5 +++++
 autoload/ada.vim                        | 5 +++++
 autoload/cargo.vim                      | 5 +++++
 autoload/cargo/quickfix.vim             | 5 +++++
 autoload/clojurecomplete.vim            | 5 +++++
 autoload/coffee.vim                     | 5 +++++
 autoload/crystal/indent.vim             | 5 +++++
 autoload/crystal_lang.vim               | 5 +++++
 autoload/csv.vim                        | 5 +++++
 autoload/dart.vim                       | 5 +++++
 autoload/db/adapter/ecto.vim            | 5 +++++
 autoload/ecrystal.vim                   | 5 +++++
 autoload/elixir/indent.vim              | 5 +++++
 autoload/elixir/util.vim                | 5 +++++
 autoload/fish.vim                       | 5 +++++
 autoload/fsharp.vim                     | 5 +++++
 autoload/fzf_gitignore.vim              | 5 +++++
 autoload/go/config.vim                  | 5 +++++
 autoload/graphql.vim                    | 5 +++++
 autoload/htmlcomplete.vim               | 5 +++++
 autoload/jsonnet.vim                    | 5 +++++
 autoload/jsx_pretty/comment.vim         | 5 +++++
 autoload/jsx_pretty/indent.vim          | 5 +++++
 autoload/julia.vim                      | 5 +++++
 autoload/julia/doc.vim                  | 5 +++++
 autoload/julia_blocks.vim               | 5 +++++
 autoload/julia_latex_symbols.vim        | 5 +++++
 autoload/ledger.vim                     | 5 +++++
 autoload/nim.vim                        | 5 +++++
 autoload/pony.vim                       | 5 +++++
 autoload/puppet/align.vim               | 5 +++++
 autoload/puppet/ctags.vim               | 5 +++++
 autoload/puppet/format.vim              | 5 +++++
 autoload/python/utils.vim               | 5 +++++
 autoload/requirements.vim               | 5 +++++
 autoload/rubycomplete.vim               | 5 +++++
 autoload/rust.vim                       | 5 +++++
 autoload/rust/debugging.vim             | 5 +++++
 autoload/rust/delimitmate.vim           | 5 +++++
 autoload/rust/tags.vim                  | 5 +++++
 autoload/rustfmt.vim                    | 5 +++++
 autoload/smt2.vim                       | 5 +++++
 autoload/terraform.vim                  | 5 +++++
 autoload/vital/_crystal.vim             | 5 +++++
 autoload/vital/_crystal/ColorEcho.vim   | 5 +++++
 autoload/vital/_crystal/Data/List.vim   | 5 +++++
 autoload/vital/_crystal/Data/String.vim | 5 +++++
 autoload/vital/_crystal/Process.vim     | 5 +++++
 autoload/vital/_crystal/Web/JSON.vim    | 5 +++++
 autoload/vital/crystal.vim              | 5 +++++
 autoload/xml/aria.vim                   | 5 +++++
 autoload/xml/html5.vim                  | 5 +++++
 autoload/xml/xsd.vim                    | 5 +++++
 autoload/zig/config.vim                 | 5 +++++
 autoload/zig/fmt.vim                    | 5 +++++
 autoload/zig/list.vim                   | 5 +++++
 autoload/zig/util.vim                   | 5 +++++
 compiler/ant.vim                        | 5 +++++
 compiler/bdf.vim                        | 5 +++++
 compiler/cake.vim                       | 5 +++++
 compiler/cargo.vim                      | 5 +++++
 compiler/coffee.vim                     | 5 +++++
 compiler/credo.vim                      | 5 +++++
 compiler/cryptol.vim                    | 5 +++++
 compiler/cs.vim                         | 5 +++++
 compiler/cucumber.vim                   | 5 +++++
 compiler/dot.vim                        | 5 +++++
 compiler/eruby.vim                      | 5 +++++
 compiler/exunit.vim                     | 5 +++++
 compiler/fish.vim                       | 5 +++++
 compiler/go.vim                         | 5 +++++
 compiler/gradle.vim                     | 5 +++++
 compiler/gradlew.vim                    | 5 +++++
 compiler/haml.vim                       | 5 +++++
 compiler/ledger.vim                     | 5 +++++
 compiler/lilypond.vim                   | 5 +++++
 compiler/ls.vim                         | 5 +++++
 compiler/mix.vim                        | 5 +++++
 compiler/nim.vim                        | 5 +++++
 compiler/nix-build.vim                  | 5 +++++
 compiler/ocaml.vim                      | 5 +++++
 compiler/powershell.vim                 | 5 +++++
 compiler/python.vim                     | 5 +++++
 compiler/rake.vim                       | 5 +++++
 compiler/rspec.vim                      | 5 +++++
 compiler/ruby.vim                       | 5 +++++
 compiler/rubyunit.vim                   | 5 +++++
 compiler/rustc.vim                      | 5 +++++
 compiler/sass.vim                       | 5 +++++
 compiler/sbt.vim                        | 5 +++++
 compiler/swift.vim                      | 5 +++++
 compiler/tcl.vim                        | 5 +++++
 compiler/tex.vim                        | 5 +++++
 compiler/tidy.vim                       | 5 +++++
 compiler/typescript.vim                 | 5 +++++
 extras/flow.vim                         | 5 +++++
 extras/jsdoc.vim                        | 5 +++++
 extras/ngdoc.vim                        | 5 +++++
 ftplugin/8th.vim                        | 5 +++++
 ftplugin/a2ps.vim                       | 5 +++++
 ftplugin/aap.vim                        | 5 +++++
 ftplugin/abap.vim                       | 5 +++++
 ftplugin/abaqus.vim                     | 5 +++++
 ftplugin/ada.vim                        | 5 +++++
 ftplugin/alsaconf.vim                   | 5 +++++
 ftplugin/ansible.vim                    | 5 +++++
 ftplugin/ansible_hosts.vim              | 5 +++++
 ftplugin/ant.vim                        | 5 +++++
 ftplugin/arch.vim                       | 5 +++++
 ftplugin/art.vim                        | 5 +++++
 ftplugin/aspvbs.vim                     | 5 +++++
 ftplugin/automake.vim                   | 5 +++++
 ftplugin/awk.vim                        | 5 +++++
 ftplugin/bdf.vim                        | 5 +++++
 ftplugin/blade.vim                      | 5 +++++
 ftplugin/bst.vim                        | 5 +++++
 ftplugin/bzl.vim                        | 5 +++++
 ftplugin/caddyfile.vim                  | 5 +++++
 ftplugin/calendar.vim                   | 5 +++++
 ftplugin/cdrdaoconf.vim                 | 5 +++++
 ftplugin/cfg.vim                        | 5 +++++
 ftplugin/ch.vim                         | 5 +++++
 ftplugin/clojure.vim                    | 5 +++++
 ftplugin/cobol.vim                      | 5 +++++
 ftplugin/coffee.vim                     | 5 +++++
 ftplugin/conf.vim                       | 5 +++++
 ftplugin/config.vim                     | 5 +++++
 ftplugin/crm.vim                        | 5 +++++
 ftplugin/cryptol/folding.vim            | 5 +++++
 ftplugin/crystal.vim                    | 5 +++++
 ftplugin/cs.vim                         | 5 +++++
 ftplugin/csc.vim                        | 5 +++++
 ftplugin/css.vim                        | 5 +++++
 ftplugin/csv.vim                        | 5 +++++
 ftplugin/cucumber.vim                   | 5 +++++
 ftplugin/cvsrc.vim                      | 5 +++++
 ftplugin/dart.vim                       | 5 +++++
 ftplugin/debchangelog.vim               | 5 +++++
 ftplugin/debcontrol.vim                 | 5 +++++
 ftplugin/denyhosts.vim                  | 5 +++++
 ftplugin/dhall.vim                      | 5 +++++
 ftplugin/dictconf.vim                   | 5 +++++
 ftplugin/dictdconf.vim                  | 5 +++++
 ftplugin/diff.vim                       | 5 +++++
 ftplugin/dircolors.vim                  | 5 +++++
 ftplugin/docker-compose.vim             | 5 +++++
 ftplugin/dockerfile.vim                 | 5 +++++
 ftplugin/dosbatch.vim                   | 5 +++++
 ftplugin/dosini.vim                     | 5 +++++
 ftplugin/dtd.vim                        | 5 +++++
 ftplugin/dune.vim                       | 5 +++++
 ftplugin/ecrystal.vim                   | 5 +++++
 ftplugin/eelixir.vim                    | 5 +++++
 ftplugin/elinks.vim                     | 5 +++++
 ftplugin/elixir.vim                     | 5 +++++
 ftplugin/embeddedpuppet.vim             | 5 +++++
 ftplugin/ember-script.vim               | 5 +++++
 ftplugin/emblem.vim                     | 5 +++++
 ftplugin/eruby.vim                      | 5 +++++
 ftplugin/eterm.vim                      | 5 +++++
 ftplugin/falcon.vim                     | 5 +++++
 ftplugin/fennel.vim                     | 5 +++++
 ftplugin/fetchmail.vim                  | 5 +++++
 ftplugin/fish.vim                       | 5 +++++
 ftplugin/fortran.vim                    | 5 +++++
 ftplugin/framescript.vim                | 5 +++++
 ftplugin/fvwm.vim                       | 5 +++++
 ftplugin/gdb.vim                        | 5 +++++
 ftplugin/git.vim                        | 5 +++++
 ftplugin/gitcommit.vim                  | 5 +++++
 ftplugin/gitconfig.vim                  | 5 +++++
 ftplugin/gitignore.vim                  | 5 +++++
 ftplugin/gitrebase.vim                  | 5 +++++
 ftplugin/gitsendemail.vim               | 5 +++++
 ftplugin/gpg.vim                        | 5 +++++
 ftplugin/graphql.vim                    | 5 +++++
 ftplugin/groovy.vim                     | 5 +++++
 ftplugin/group.vim                      | 5 +++++
 ftplugin/grub.vim                       | 5 +++++
 ftplugin/haml.vim                       | 5 +++++
 ftplugin/hamster.vim                    | 5 +++++
 ftplugin/handlebars.vim                 | 5 +++++
 ftplugin/hcl.vim                        | 5 +++++
 ftplugin/help.vim                       | 5 +++++
 ftplugin/hgcommit.vim                   | 5 +++++
 ftplugin/hive.vim                       | 5 +++++
 ftplugin/hog.vim                        | 5 +++++
 ftplugin/hostconf.vim                   | 5 +++++
 ftplugin/hostsaccess.vim                | 5 +++++
 ftplugin/html.vim                       | 5 +++++
 ftplugin/htmldjango.vim                 | 5 +++++
 ftplugin/i3config.vim                   | 5 +++++
 ftplugin/idris.vim                      | 5 +++++
 ftplugin/idris2.vim                     | 5 +++++
 ftplugin/indent.vim                     | 5 +++++
 ftplugin/ion.vim                        | 5 +++++
 ftplugin/j.vim                          | 5 +++++
 ftplugin/java.vim                       | 5 +++++
 ftplugin/jproperties.vim                | 5 +++++
 ftplugin/jq.vim                         | 5 +++++
 ftplugin/json.vim                       | 5 +++++
 ftplugin/jsonnet.vim                    | 5 +++++
 ftplugin/jsp.vim                        | 5 +++++
 ftplugin/julia.vim                      | 5 +++++
 ftplugin/juliadoc.vim                   | 5 +++++
 ftplugin/kconfig.vim                    | 5 +++++
 ftplugin/kotlin.vim                     | 5 +++++
 ftplugin/kwt.vim                        | 5 +++++
 ftplugin/ld.vim                         | 5 +++++
 ftplugin/less.vim                       | 5 +++++
 ftplugin/lftp.vim                       | 5 +++++
 ftplugin/libao.vim                      | 5 +++++
 ftplugin/lilypond.vim                   | 5 +++++
 ftplugin/limits.vim                     | 5 +++++
 ftplugin/liquid.vim                     | 5 +++++
 ftplugin/lisp.vim                       | 5 +++++
 ftplugin/litcoffee.vim                  | 5 +++++
 ftplugin/llvm.vim                       | 5 +++++
 ftplugin/logcheck.vim                   | 5 +++++
 ftplugin/loginaccess.vim                | 5 +++++
 ftplugin/logindefs.vim                  | 5 +++++
 ftplugin/logtalk.vim                    | 5 +++++
 ftplugin/lprolog.vim                    | 5 +++++
 ftplugin/ls.vim                         | 5 +++++
 ftplugin/m4.vim                         | 5 +++++
 ftplugin/mail.vim                       | 5 +++++
 ftplugin/mailaliases.vim                | 5 +++++
 ftplugin/mailcap.vim                    | 5 +++++
 ftplugin/make.vim                       | 5 +++++
 ftplugin/mako.vim                       | 5 +++++
 ftplugin/manconf.vim                    | 5 +++++
 ftplugin/markdown.vim                   | 5 +++++
 ftplugin/meson.vim                      | 5 +++++
 ftplugin/mf.vim                         | 5 +++++
 ftplugin/mma.vim                        | 5 +++++
 ftplugin/modconf.vim                    | 5 +++++
 ftplugin/moon.vim                       | 5 +++++
 ftplugin/mp.vim                         | 5 +++++
 ftplugin/mplayerconf.vim                | 5 +++++
 ftplugin/mrxvtrc.vim                    | 5 +++++
 ftplugin/mustache.vim                   | 5 +++++
 ftplugin/muttrc.vim                     | 5 +++++
 ftplugin/nanorc.vim                     | 5 +++++
 ftplugin/neomuttrc.vim                  | 5 +++++
 ftplugin/netrc.vim                      | 5 +++++
 ftplugin/nginx.vim                      | 5 +++++
 ftplugin/nix.vim                        | 5 +++++
 ftplugin/nroff.vim                      | 5 +++++
 ftplugin/nsis.vim                       | 5 +++++
 ftplugin/oasis.vim                      | 5 +++++
 ftplugin/objc.vim                       | 5 +++++
 ftplugin/ocaml.vim                      | 5 +++++
 ftplugin/ocamlbuild_tags.vim            | 5 +++++
 ftplugin/occam.vim                      | 5 +++++
 ftplugin/omake.vim                      | 5 +++++
 ftplugin/opencl.vim                     | 5 +++++
 ftplugin/pamconf.vim                    | 5 +++++
 ftplugin/pascal.vim                     | 5 +++++
 ftplugin/passwd.vim                     | 5 +++++
 ftplugin/pdf.vim                        | 5 +++++
 ftplugin/perl.vim                       | 5 +++++
 ftplugin/pinfo.vim                      | 5 +++++
 ftplugin/plantuml.vim                   | 5 +++++
 ftplugin/pony.vim                       | 5 +++++
 ftplugin/postscr.vim                    | 5 +++++
 ftplugin/procmail.vim                   | 5 +++++
 ftplugin/prolog.vim                     | 5 +++++
 ftplugin/protocols.vim                  | 5 +++++
 ftplugin/ps1.vim                        | 5 +++++
 ftplugin/ps1xml.vim                     | 5 +++++
 ftplugin/pug.vim                        | 5 +++++
 ftplugin/puppet.vim                     | 5 +++++
 ftplugin/puppet_tagbar.vim              | 5 +++++
 ftplugin/purescript.vim                 | 5 +++++
 ftplugin/pyrex.vim                      | 5 +++++
 ftplugin/qml.vim                        | 5 +++++
 ftplugin/quake.vim                      | 5 +++++
 ftplugin/racket.vim                     | 5 +++++
 ftplugin/raku.vim                       | 5 +++++
 ftplugin/raml.vim                       | 5 +++++
 ftplugin/razor.vim                      | 5 +++++
 ftplugin/readline.vim                   | 5 +++++
 ftplugin/reva.vim                       | 5 +++++
 ftplugin/rmd.vim                        | 5 +++++
 ftplugin/rnc.vim                        | 5 +++++
 ftplugin/rnoweb.vim                     | 5 +++++
 ftplugin/rpl.vim                        | 5 +++++
 ftplugin/rrst.vim                       | 5 +++++
 ftplugin/rst.vim                        | 5 +++++
 ftplugin/ruby.vim                       | 5 +++++
 ftplugin/rust.vim                       | 5 +++++
 ftplugin/rust/tagbar.vim                | 5 +++++
 ftplugin/sass.vim                       | 5 +++++
 ftplugin/sbt.vim                        | 5 +++++
 ftplugin/scala.vim                      | 5 +++++
 ftplugin/scala.xpt.vim                  | 5 +++++
 ftplugin/scala/tagbar.vim               | 5 +++++
 ftplugin/scheme.vim                     | 5 +++++
 ftplugin/screen.vim                     | 5 +++++
 ftplugin/scss.vim                       | 5 +++++
 ftplugin/sensors.vim                    | 5 +++++
 ftplugin/services.vim                   | 5 +++++
 ftplugin/setserial.vim                  | 5 +++++
 ftplugin/sexplib.vim                    | 5 +++++
 ftplugin/sieve.vim                      | 5 +++++
 ftplugin/slim.vim                       | 5 +++++
 ftplugin/slpconf.vim                    | 5 +++++
 ftplugin/slpreg.vim                     | 5 +++++
 ftplugin/slpspi.vim                     | 5 +++++
 ftplugin/smt2.vim                       | 5 +++++
 ftplugin/solidity.vim                   | 5 +++++
 ftplugin/spec.vim                       | 5 +++++
 ftplugin/sql.vim                        | 5 +++++
 ftplugin/sshconfig.vim                  | 5 +++++
 ftplugin/stylus.vim                     | 5 +++++
 ftplugin/sudoers.vim                    | 5 +++++
 ftplugin/svelte.vim                     | 5 +++++
 ftplugin/swift.vim                      | 5 +++++
 ftplugin/swiftgyb.vim                   | 5 +++++
 ftplugin/sysctl.vim                     | 5 +++++
 ftplugin/systemd.vim                    | 5 +++++
 ftplugin/systemverilog.vim              | 5 +++++
 ftplugin/tablegen.vim                   | 5 +++++
 ftplugin/tcl.vim                        | 5 +++++
 ftplugin/terminfo.vim                   | 5 +++++
 ftplugin/terraform.vim                  | 5 +++++
 ftplugin/tex.vim                        | 5 +++++
 ftplugin/text.vim                       | 5 +++++
 ftplugin/textile.vim                    | 5 +++++
 ftplugin/tmux.vim                       | 5 +++++
 ftplugin/toml.vim                       | 5 +++++
 ftplugin/treetop.vim                    | 5 +++++
 ftplugin/tt2html.vim                    | 5 +++++
 ftplugin/twig.vim                       | 5 +++++
 ftplugin/typescript.vim                 | 5 +++++
 ftplugin/typescriptreact.vim            | 5 +++++
 ftplugin/udevconf.vim                   | 5 +++++
 ftplugin/udevperm.vim                   | 5 +++++
 ftplugin/updatedb.vim                   | 5 +++++
 ftplugin/vala.vim                       | 5 +++++
 ftplugin/vb.vim                         | 5 +++++
 ftplugin/verilog.vim                    | 5 +++++
 ftplugin/vhdl.vim                       | 5 +++++
 ftplugin/vlang.vim                      | 5 +++++
 ftplugin/vroom.vim                      | 5 +++++
 ftplugin/vue.vim                        | 5 +++++
 ftplugin/wast.vim                       | 5 +++++
 ftplugin/xdefaults.vim                  | 5 +++++
 ftplugin/xf86conf.vim                   | 5 +++++
 ftplugin/xhtml.vim                      | 5 +++++
 ftplugin/xinetd.vim                     | 5 +++++
 ftplugin/xmodmap.vim                    | 5 +++++
 ftplugin/xs.vim                         | 5 +++++
 ftplugin/xsd.vim                        | 5 +++++
 ftplugin/xslt.vim                       | 5 +++++
 ftplugin/yaml.vim                       | 5 +++++
 ftplugin/zig.vim                        | 5 +++++
 ftplugin/zimbu.vim                      | 5 +++++
 indent/Jenkinsfile.vim                  | 5 +++++
 indent/aap.vim                          | 5 +++++
 indent/ada.vim                          | 5 +++++
 indent/ansible.vim                      | 5 +++++
 indent/ant.vim                          | 5 +++++
 indent/applescript.vim                  | 5 +++++
 indent/arduino.vim                      | 5 +++++
 indent/autohotkey.vim                   | 5 +++++
 indent/automake.vim                     | 5 +++++
 indent/awk.vim                          | 5 +++++
 indent/bib.vim                          | 5 +++++
 indent/blade.vim                        | 5 +++++
 indent/bst.vim                          | 5 +++++
 indent/bzl.vim                          | 5 +++++
 indent/cabal.vim                        | 5 +++++
 indent/caddyfile.vim                    | 5 +++++
 indent/cdl.vim                          | 5 +++++
 indent/ch.vim                           | 5 +++++
 indent/chaiscript.vim                   | 5 +++++
 indent/clojure.vim                      | 5 +++++
 indent/cmake.vim                        | 5 +++++
 indent/cobol.vim                        | 5 +++++
 indent/coffee.vim                       | 5 +++++
 indent/config.vim                       | 5 +++++
 indent/crystal.vim                      | 5 +++++
 indent/cs.vim                           | 5 +++++
 indent/css.vim                          | 5 +++++
 indent/cucumber.vim                     | 5 +++++
 indent/cuda.vim                         | 5 +++++
 indent/cython.vim                       | 5 +++++
 indent/d.vim                            | 5 +++++
 indent/dart.vim                         | 5 +++++
 indent/dictconf.vim                     | 5 +++++
 indent/dictdconf.vim                    | 5 +++++
 indent/dosbatch.vim                     | 5 +++++
 indent/dtd.vim                          | 5 +++++
 indent/dune.vim                         | 5 +++++
 indent/dylan.vim                        | 5 +++++
 indent/ecrystal.vim                     | 5 +++++
 indent/eelixir.vim                      | 5 +++++
 indent/elixir.vim                       | 5 +++++
 indent/elm.vim                          | 5 +++++
 indent/ember-script.vim                 | 5 +++++
 indent/emblem.vim                       | 5 +++++
 indent/erlang.vim                       | 5 +++++
 indent/eruby.vim                        | 5 +++++
 indent/eterm.vim                        | 5 +++++
 indent/falcon.vim                       | 5 +++++
 indent/fennel.vim                       | 5 +++++
 indent/fish.vim                         | 5 +++++
 indent/fortran.vim                      | 5 +++++
 indent/framescript.vim                  | 5 +++++
 indent/fsharp.vim                       | 5 +++++
 indent/gdscript3.vim                    | 5 +++++
 indent/gitconfig.vim                    | 5 +++++
 indent/gitolite.vim                     | 5 +++++
 indent/glsl.vim                         | 5 +++++
 indent/go.vim                           | 5 +++++
 indent/gohtmltmpl.vim                   | 5 +++++
 indent/graphql.vim                      | 5 +++++
 indent/haml.vim                         | 5 +++++
 indent/hamster.vim                      | 5 +++++
 indent/handlebars.vim                   | 5 +++++
 indent/haskell.vim                      | 5 +++++
 indent/hcl.vim                          | 5 +++++
 indent/hog.vim                          | 5 +++++
 indent/html.vim                         | 5 +++++
 indent/htmldjango.vim                   | 5 +++++
 indent/idris.vim                        | 5 +++++
 indent/idris2.vim                       | 5 +++++
 indent/j.vim                            | 5 +++++
 indent/java.vim                         | 5 +++++
 indent/javascript.vim                   | 5 +++++
 indent/json.vim                         | 5 +++++
 indent/jsp.vim                          | 5 +++++
 indent/jst.vim                          | 5 +++++
 indent/julia.vim                        | 5 +++++
 indent/kotlin.vim                       | 5 +++++
 indent/ld.vim                           | 5 +++++
 indent/ledger.vim                       | 5 +++++
 indent/less.vim                         | 5 +++++
 indent/lifelines.vim                    | 5 +++++
 indent/lilypond.vim                     | 5 +++++
 indent/liquid.vim                       | 5 +++++
 indent/lisp.vim                         | 5 +++++
 indent/litcoffee.vim                    | 5 +++++
 indent/llvm.vim                         | 5 +++++
 indent/logtalk.vim                      | 5 +++++
 indent/ls.vim                           | 5 +++++
 indent/lua.vim                          | 5 +++++
 indent/mail.vim                         | 5 +++++
 indent/make.vim                         | 5 +++++
 indent/mako.vim                         | 5 +++++
 indent/markdown.vim                     | 5 +++++
 indent/meson.vim                        | 5 +++++
 indent/mf.vim                           | 5 +++++
 indent/moon.vim                         | 5 +++++
 indent/mp.vim                           | 5 +++++
 indent/mustache.vim                     | 5 +++++
 indent/nginx.vim                        | 5 +++++
 indent/nim.vim                          | 5 +++++
 indent/nix.vim                          | 5 +++++
 indent/nsis.vim                         | 5 +++++
 indent/ocaml.vim                        | 5 +++++
 indent/occam.vim                        | 5 +++++
 indent/octave.vim                       | 5 +++++
 indent/odin.vim                         | 5 +++++
 indent/omake.vim                        | 5 +++++
 indent/opencl.vim                       | 5 +++++
 indent/pascal.vim                       | 5 +++++
 indent/perl.vim                         | 5 +++++
 indent/pgsql.vim                        | 5 +++++
 indent/plantuml.vim                     | 5 +++++
 indent/pony.vim                         | 5 +++++
 indent/postscr.vim                      | 5 +++++
 indent/pov.vim                          | 5 +++++
 indent/prolog.vim                       | 5 +++++
 indent/proto.vim                        | 5 +++++
 indent/ps1.vim                          | 5 +++++
 indent/pug.vim                          | 5 +++++
 indent/puppet.vim                       | 5 +++++
 indent/purescript.vim                   | 5 +++++
 indent/pyrex.vim                        | 5 +++++
 indent/python.vim                       | 5 +++++
 indent/qml.vim                          | 5 +++++
 indent/racket.vim                       | 5 +++++
 indent/raku.vim                         | 5 +++++
 indent/razor.vim                        | 5 +++++
 indent/readline.vim                     | 5 +++++
 indent/reason.vim                       | 5 +++++
 indent/rmd.vim                          | 5 +++++
 indent/rnoweb.vim                       | 5 +++++
 indent/rpl.vim                          | 5 +++++
 indent/rrst.vim                         | 5 +++++
 indent/rst.vim                          | 5 +++++
 indent/ruby.vim                         | 5 +++++
 indent/rust.vim                         | 5 +++++
 indent/sas.vim                          | 5 +++++
 indent/sass.vim                         | 5 +++++
 indent/scala.vim                        | 5 +++++
 indent/scheme.vim                       | 5 +++++
 indent/scss.vim                         | 5 +++++
 indent/sdl.vim                          | 5 +++++
 indent/slim.vim                         | 5 +++++
 indent/slime.vim                        | 5 +++++
 indent/sml.vim                          | 5 +++++
 indent/solidity.vim                     | 5 +++++
 indent/sql.vim                          | 5 +++++
 indent/sshconfig.vim                    | 5 +++++
 indent/stylus.vim                       | 5 +++++
 indent/svelte.vim                       | 5 +++++
 indent/svg.vim                          | 5 +++++
 indent/swift.vim                        | 5 +++++
 indent/systemverilog.vim                | 5 +++++
 indent/tcl.vim                          | 5 +++++
 indent/teraterm.vim                     | 5 +++++
 indent/terraform.vim                    | 5 +++++
 indent/tex.vim                          | 5 +++++
 indent/tf.vim                           | 5 +++++
 indent/tilde.vim                        | 5 +++++
 indent/treetop.vim                      | 5 +++++
 indent/twig.vim                         | 5 +++++
 indent/typescript.vim                   | 5 +++++
 indent/typescriptreact.vim              | 5 +++++
 indent/vala.vim                         | 5 +++++
 indent/vb.vim                           | 5 +++++
 indent/velocity.vim                     | 5 +++++
 indent/verilog.vim                      | 5 +++++
 indent/vhdl.vim                         | 5 +++++
 indent/vlang.vim                        | 5 +++++
 indent/vroom.vim                        | 5 +++++
 indent/vue.vim                          | 5 +++++
 indent/wast.vim                         | 5 +++++
 indent/xf86conf.vim                     | 5 +++++
 indent/xhtml.vim                        | 5 +++++
 indent/xinetd.vim                       | 5 +++++
 indent/xsd.vim                          | 5 +++++
 indent/xslt.vim                         | 5 +++++
 indent/yacc.vim                         | 5 +++++
 indent/yaml.vim                         | 5 +++++
 indent/zig.vim                          | 5 +++++
 indent/zimbu.vim                        | 5 +++++
 scripts/build                           | 9 +++++++++
 syntax/8th.vim                          | 5 +++++
 syntax/Jenkinsfile.vim                  | 5 +++++
 syntax/a2ps.vim                         | 5 +++++
 syntax/a65.vim                          | 5 +++++
 syntax/aap.vim                          | 5 +++++
 syntax/abap.vim                         | 5 +++++
 syntax/abaqus.vim                       | 5 +++++
 syntax/abc.vim                          | 5 +++++
 syntax/abel.vim                         | 5 +++++
 syntax/acedb.vim                        | 5 +++++
 syntax/ada.vim                          | 5 +++++
 syntax/ahdl.vim                         | 5 +++++
 syntax/aidl.vim                         | 5 +++++
 syntax/alsaconf.vim                     | 5 +++++
 syntax/aml.vim                          | 5 +++++
 syntax/ampl.vim                         | 5 +++++
 syntax/ansible.vim                      | 5 +++++
 syntax/ansible_hosts.vim                | 5 +++++
 syntax/ant.vim                          | 5 +++++
 syntax/apache.vim                       | 5 +++++
 syntax/apachestyle.vim                  | 5 +++++
 syntax/apiblueprint.vim                 | 5 +++++
 syntax/applescript.vim                  | 5 +++++
 syntax/aptconf.vim                      | 5 +++++
 syntax/arch.vim                         | 5 +++++
 syntax/arduino.vim                      | 5 +++++
 syntax/art.vim                          | 5 +++++
 syntax/asciidoc.vim                     | 5 +++++
 syntax/asl.vim                          | 5 +++++
 syntax/asn.vim                          | 5 +++++
 syntax/aspperl.vim                      | 5 +++++
 syntax/aspvbs.vim                       | 5 +++++
 syntax/asterisk.vim                     | 5 +++++
 syntax/asteriskvm.vim                   | 5 +++++
 syntax/atlas.vim                        | 5 +++++
 syntax/autodoc.vim                      | 5 +++++
 syntax/autoit.vim                       | 5 +++++
 syntax/automake.vim                     | 5 +++++
 syntax/ave.vim                          | 5 +++++
 syntax/awk.vim                          | 5 +++++
 syntax/b.vim                            | 5 +++++
 syntax/basic.vim                        | 5 +++++
 syntax/basic/class.vim                  | 5 +++++
 syntax/basic/cluster.vim                | 5 +++++
 syntax/basic/decorator.vim              | 5 +++++
 syntax/basic/doc.vim                    | 5 +++++
 syntax/basic/function.vim               | 5 +++++
 syntax/basic/identifiers.vim            | 5 +++++
 syntax/basic/keyword.vim                | 5 +++++
 syntax/basic/literal.vim                | 5 +++++
 syntax/basic/members.vim                | 5 +++++
 syntax/basic/object.vim                 | 5 +++++
 syntax/basic/patch.vim                  | 5 +++++
 syntax/basic/reserved.vim               | 5 +++++
 syntax/basic/symbols.vim                | 5 +++++
 syntax/basic/type.vim                   | 5 +++++
 syntax/bc.vim                           | 5 +++++
 syntax/bdf.vim                          | 5 +++++
 syntax/bib.vim                          | 5 +++++
 syntax/bindzone.vim                     | 5 +++++
 syntax/blade.vim                        | 5 +++++
 syntax/blank.vim                        | 5 +++++
 syntax/brewfile.vim                     | 5 +++++
 syntax/bsdl.vim                         | 5 +++++
 syntax/bst.vim                          | 5 +++++
 syntax/bzl.vim                          | 5 +++++
 syntax/bzr.vim                          | 5 +++++
 syntax/c.vim                            | 5 +++++
 syntax/cabal-1.vim                      | 5 +++++
 syntax/cabal-2.vim                      | 5 +++++
 syntax/caddyfile.vim                    | 5 +++++
 syntax/calendar.vim                     | 5 +++++
 syntax/carp.vim                         | 5 +++++
 syntax/catalog.vim                      | 5 +++++
 syntax/cdl.vim                          | 5 +++++
 syntax/cdrdaoconf.vim                   | 5 +++++
 syntax/cdrtoc.vim                       | 5 +++++
 syntax/cf.vim                           | 5 +++++
 syntax/cfg.vim                          | 5 +++++
 syntax/ch.vim                           | 5 +++++
 syntax/chaiscript.vim                   | 5 +++++
 syntax/chaskell.vim                     | 5 +++++
 syntax/chill.vim                        | 5 +++++
 syntax/chordpro.vim                     | 5 +++++
 syntax/cl.vim                           | 5 +++++
 syntax/clean.vim                        | 5 +++++
 syntax/clojure.vim                      | 5 +++++
 syntax/cmake.vim                        | 5 +++++
 syntax/cmod.vim                         | 5 +++++
 syntax/cmusrc.vim                       | 5 +++++
 syntax/cobol.vim                        | 5 +++++
 syntax/coco.vim                         | 5 +++++
 syntax/coffee.vim                       | 5 +++++
 syntax/common.vim                       | 5 +++++
 syntax/conaryrecipe.vim                 | 5 +++++
 syntax/conf.vim                         | 5 +++++
 syntax/config.vim                       | 5 +++++
 syntax/cpp.vim                          | 5 +++++
 syntax/cql.vim                          | 5 +++++
 syntax/crm.vim                          | 5 +++++
 syntax/crontab.vim                      | 5 +++++
 syntax/cryptol.vim                      | 5 +++++
 syntax/crystal.vim                      | 5 +++++
 syntax/cs.vim                           | 5 +++++
 syntax/csc.vim                          | 5 +++++
 syntax/csdl.vim                         | 5 +++++
 syntax/csp.vim                          | 5 +++++
 syntax/css.vim                          | 5 +++++
 syntax/csv.vim                          | 5 +++++
 syntax/cterm.vim                        | 5 +++++
 syntax/cucumber.vim                     | 5 +++++
 syntax/cuda.vim                         | 5 +++++
 syntax/cuesheet.vim                     | 5 +++++
 syntax/cupl.vim                         | 5 +++++
 syntax/cuplsim.vim                      | 5 +++++
 syntax/cvs.vim                          | 5 +++++
 syntax/cvsrc.vim                        | 5 +++++
 syntax/cynpp.vim                        | 5 +++++
 syntax/d.vim                            | 5 +++++
 syntax/dart.vim                         | 5 +++++
 syntax/datascript.vim                   | 5 +++++
 syntax/dcd.vim                          | 5 +++++
 syntax/dcov.vim                         | 5 +++++
 syntax/dd.vim                           | 5 +++++
 syntax/ddoc.vim                         | 5 +++++
 syntax/debchangelog.vim                 | 5 +++++
 syntax/debcontrol.vim                   | 5 +++++
 syntax/debcopyright.vim                 | 5 +++++
 syntax/debsources.vim                   | 5 +++++
 syntax/def.vim                          | 5 +++++
 syntax/denyhosts.vim                    | 5 +++++
 syntax/desc.vim                         | 5 +++++
 syntax/desktop.vim                      | 5 +++++
 syntax/dhall.vim                        | 5 +++++
 syntax/dictconf.vim                     | 5 +++++
 syntax/dictdconf.vim                    | 5 +++++
 syntax/diff.vim                         | 5 +++++
 syntax/dircolors.vim                    | 5 +++++
 syntax/django.vim                       | 5 +++++
 syntax/dnsmasq.vim                      | 5 +++++
 syntax/docker-compose.vim               | 5 +++++
 syntax/dockerfile.vim                   | 5 +++++
 syntax/dosbatch.vim                     | 5 +++++
 syntax/dosini.vim                       | 5 +++++
 syntax/dot.vim                          | 5 +++++
 syntax/dracula.vim                      | 5 +++++
 syntax/dsdl.vim                         | 5 +++++
 syntax/dsl.vim                          | 5 +++++
 syntax/dtd.vim                          | 5 +++++
 syntax/dts.vim                          | 5 +++++
 syntax/dune.vim                         | 5 +++++
 syntax/dylan.vim                        | 5 +++++
 syntax/dylanintr.vim                    | 5 +++++
 syntax/dylanlid.vim                     | 5 +++++
 syntax/ecd.vim                          | 5 +++++
 syntax/ecrystal.vim                     | 5 +++++
 syntax/edif.vim                         | 5 +++++
 syntax/eelixir.vim                      | 5 +++++
 syntax/elf.vim                          | 5 +++++
 syntax/elinks.vim                       | 5 +++++
 syntax/elixir.vim                       | 5 +++++
 syntax/elm.vim                          | 5 +++++
 syntax/elmfilt.vim                      | 5 +++++
 syntax/embeddedpuppet.vim               | 5 +++++
 syntax/ember-script.vim                 | 5 +++++
 syntax/emblem.vim                       | 5 +++++
 syntax/erlang.vim                       | 5 +++++
 syntax/eruby.vim                        | 5 +++++
 syntax/esmtprc.vim                      | 5 +++++
 syntax/esqlc.vim                        | 5 +++++
 syntax/esterel.vim                      | 5 +++++
 syntax/eterm.vim                        | 5 +++++
 syntax/exim.vim                         | 5 +++++
 syntax/expect.vim                       | 5 +++++
 syntax/exports.vim                      | 5 +++++
 syntax/falcon.vim                       | 5 +++++
 syntax/fan.vim                          | 5 +++++
 syntax/fbs.vim                          | 5 +++++
 syntax/fennel.vim                       | 5 +++++
 syntax/ferm.vim                         | 5 +++++
 syntax/fetchmail.vim                    | 5 +++++
 syntax/fgl.vim                          | 5 +++++
 syntax/fish.vim                         | 5 +++++
 syntax/flow.vim                         | 5 +++++
 syntax/focexec.vim                      | 5 +++++
 syntax/forth.vim                        | 5 +++++
 syntax/fortran.vim                      | 5 +++++
 syntax/framescript.vim                  | 5 +++++
 syntax/freebasic.vim                    | 5 +++++
 syntax/fsharp.vim                       | 5 +++++
 syntax/fstab.vim                        | 5 +++++
 syntax/fvwm.vim                         | 5 +++++
 syntax/gdb.vim                          | 5 +++++
 syntax/gdmo.vim                         | 5 +++++
 syntax/gdscript3.vim                    | 5 +++++
 syntax/gedcom.vim                       | 5 +++++
 syntax/git.vim                          | 5 +++++
 syntax/gitcommit.vim                    | 5 +++++
 syntax/gitconfig.vim                    | 5 +++++
 syntax/gitignore.vim                    | 5 +++++
 syntax/gitolite.vim                     | 5 +++++
 syntax/gitrebase.vim                    | 5 +++++
 syntax/gitsendemail.vim                 | 5 +++++
 syntax/gkrellmrc.vim                    | 5 +++++
 syntax/glsl.vim                         | 5 +++++
 syntax/gmpl.vim                         | 5 +++++
 syntax/gnash.vim                        | 5 +++++
 syntax/gnuplot.vim                      | 5 +++++
 syntax/go.vim                           | 5 +++++
 syntax/godebugoutput.vim                | 5 +++++
 syntax/godebugstacktrace.vim            | 5 +++++
 syntax/godebugvariables.vim             | 5 +++++
 syntax/godefstack.vim                   | 5 +++++
 syntax/gohtmltmpl.vim                   | 5 +++++
 syntax/gomod.vim                        | 5 +++++
 syntax/gotexttmpl.vim                   | 5 +++++
 syntax/gp.vim                           | 5 +++++
 syntax/gpg.vim                          | 5 +++++
 syntax/grads.vim                        | 5 +++++
 syntax/graphql.vim                      | 5 +++++
 syntax/gretl.vim                        | 5 +++++
 syntax/groovy.vim                       | 5 +++++
 syntax/group.vim                        | 5 +++++
 syntax/grub.vim                         | 5 +++++
 syntax/gsl.vim                          | 5 +++++
 syntax/gsp.vim                          | 5 +++++
 syntax/gtkrc.vim                        | 5 +++++
 syntax/haml.vim                         | 5 +++++
 syntax/hamster.vim                      | 5 +++++
 syntax/handlebars.vim                   | 5 +++++
 syntax/haproxy.vim                      | 5 +++++
 syntax/haskell.vim                      | 5 +++++
 syntax/haste.vim                        | 5 +++++
 syntax/hastepreproc.vim                 | 5 +++++
 syntax/haxe.vim                         | 5 +++++
 syntax/hb.vim                           | 5 +++++
 syntax/hcl.vim                          | 5 +++++
 syntax/helm.vim                         | 5 +++++
 syntax/help.vim                         | 5 +++++
 syntax/hercules.vim                     | 5 +++++
 syntax/hex.vim                          | 5 +++++
 syntax/hgcommit.vim                     | 5 +++++
 syntax/hive.vim                         | 5 +++++
 syntax/hog.vim                          | 5 +++++
 syntax/hollywood.vim                    | 5 +++++
 syntax/hostconf.vim                     | 5 +++++
 syntax/hostsaccess.vim                  | 5 +++++
 syntax/html.vim                         | 5 +++++
 syntax/htmldjango.vim                   | 5 +++++
 syntax/htmlm4.vim                       | 5 +++++
 syntax/i3config.vim                     | 5 +++++
 syntax/ibasic.vim                       | 5 +++++
 syntax/icalendar.vim                    | 5 +++++
 syntax/icemenu.vim                      | 5 +++++
 syntax/icon.vim                         | 5 +++++
 syntax/idris.vim                        | 5 +++++
 syntax/idris2.vim                       | 5 +++++
 syntax/indent.vim                       | 5 +++++
 syntax/inform.vim                       | 5 +++++
 syntax/initng.vim                       | 5 +++++
 syntax/inittab.vim                      | 5 +++++
 syntax/ion.vim                          | 5 +++++
 syntax/ipfilter.vim                     | 5 +++++
 syntax/iss.vim                          | 5 +++++
 syntax/ist.vim                          | 5 +++++
 syntax/j.vim                            | 5 +++++
 syntax/jal.vim                          | 5 +++++
 syntax/jam.vim                          | 5 +++++
 syntax/java.vim                         | 5 +++++
 syntax/javacc.vim                       | 5 +++++
 syntax/javascript.vim                   | 5 +++++
 syntax/jess.vim                         | 5 +++++
 syntax/jgraph.vim                       | 5 +++++
 syntax/jinja2.vim                       | 5 +++++
 syntax/jovial.vim                       | 5 +++++
 syntax/jproperties.vim                  | 5 +++++
 syntax/jq.vim                           | 5 +++++
 syntax/json.vim                         | 5 +++++
 syntax/json5.vim                        | 5 +++++
 syntax/jsonnet.vim                      | 5 +++++
 syntax/jsp.vim                          | 5 +++++
 syntax/jst.vim                          | 5 +++++
 syntax/julia.vim                        | 5 +++++
 syntax/juliadoc.vim                     | 5 +++++
 syntax/kconfig.vim                      | 5 +++++
 syntax/kivy.vim                         | 5 +++++
 syntax/kix.vim                          | 5 +++++
 syntax/kotlin.vim                       | 5 +++++
 syntax/kscript.vim                      | 5 +++++
 syntax/kwt.vim                          | 5 +++++
 syntax/lace.vim                         | 5 +++++
 syntax/latte.vim                        | 5 +++++
 syntax/ld.vim                           | 5 +++++
 syntax/ldif.vim                         | 5 +++++
 syntax/ledger.vim                       | 5 +++++
 syntax/less.vim                         | 5 +++++
 syntax/lex.vim                          | 5 +++++
 syntax/lftp.vim                         | 5 +++++
 syntax/lhaskell.vim                     | 5 +++++
 syntax/libao.vim                        | 5 +++++
 syntax/lidris.vim                       | 5 +++++
 syntax/lidris2.vim                      | 5 +++++
 syntax/lifelines.vim                    | 5 +++++
 syntax/lilo.vim                         | 5 +++++
 syntax/lilypond-words.vim               | 5 +++++
 syntax/lilypond.vim                     | 5 +++++
 syntax/limits.vim                       | 5 +++++
 syntax/liquid.vim                       | 5 +++++
 syntax/lisp.vim                         | 5 +++++
 syntax/litcoffee.vim                    | 5 +++++
 syntax/lite.vim                         | 5 +++++
 syntax/litestep.vim                     | 5 +++++
 syntax/llvm.vim                         | 5 +++++
 syntax/log.vim                          | 5 +++++
 syntax/loginaccess.vim                  | 5 +++++
 syntax/logindefs.vim                    | 5 +++++
 syntax/logtalk.vim                      | 5 +++++
 syntax/lotos.vim                        | 5 +++++
 syntax/lout.vim                         | 5 +++++
 syntax/lpc.vim                          | 5 +++++
 syntax/lprolog.vim                      | 5 +++++
 syntax/ls.vim                           | 5 +++++
 syntax/lsl.vim                          | 5 +++++
 syntax/lss.vim                          | 5 +++++
 syntax/lua.vim                          | 5 +++++
 syntax/lynx.vim                         | 5 +++++
 syntax/m4.vim                           | 5 +++++
 syntax/mail.vim                         | 5 +++++
 syntax/mailaliases.vim                  | 5 +++++
 syntax/mailcap.vim                      | 5 +++++
 syntax/make.vim                         | 5 +++++
 syntax/mako.vim                         | 5 +++++
 syntax/mallard.vim                      | 5 +++++
 syntax/manconf.vim                      | 5 +++++
 syntax/maple.vim                        | 5 +++++
 syntax/markdown.vim                     | 5 +++++
 syntax/mason.vim                        | 5 +++++
 syntax/master.vim                       | 5 +++++
 syntax/mel.vim                          | 5 +++++
 syntax/merlin.vim                       | 5 +++++
 syntax/meson.vim                        | 5 +++++
 syntax/messages.vim                     | 5 +++++
 syntax/mf.vim                           | 5 +++++
 syntax/mgl.vim                          | 5 +++++
 syntax/mgp.vim                          | 5 +++++
 syntax/mib.vim                          | 5 +++++
 syntax/mix.vim                          | 5 +++++
 syntax/mma.vim                          | 5 +++++
 syntax/mmp.vim                          | 5 +++++
 syntax/modconf.vim                      | 5 +++++
 syntax/modula2.vim                      | 5 +++++
 syntax/modula3.vim                      | 5 +++++
 syntax/monk.vim                         | 5 +++++
 syntax/moo.vim                          | 5 +++++
 syntax/moon.vim                         | 5 +++++
 syntax/mp.vim                           | 5 +++++
 syntax/mplayerconf.vim                  | 5 +++++
 syntax/mrxvtrc.vim                      | 5 +++++
 syntax/msidl.vim                        | 5 +++++
 syntax/msql.vim                         | 5 +++++
 syntax/mupad.vim                        | 5 +++++
 syntax/murphi.vim                       | 5 +++++
 syntax/mush.vim                         | 5 +++++
 syntax/mustache.vim                     | 5 +++++
 syntax/muttrc.vim                       | 5 +++++
 syntax/mysql.vim                        | 5 +++++
 syntax/n1ql.vim                         | 5 +++++
 syntax/named.vim                        | 5 +++++
 syntax/nanorc.vim                       | 5 +++++
 syntax/natural.vim                      | 5 +++++
 syntax/ncf.vim                          | 5 +++++
 syntax/neomuttrc.vim                    | 5 +++++
 syntax/netrc.vim                        | 5 +++++
 syntax/nginx.vim                        | 5 +++++
 syntax/nim.vim                          | 5 +++++
 syntax/ninja.vim                        | 5 +++++
 syntax/nix.vim                          | 5 +++++
 syntax/nqc.vim                          | 5 +++++
 syntax/nroff.vim                        | 5 +++++
 syntax/nsis.vim                         | 5 +++++
 syntax/oasis.vim                        | 5 +++++
 syntax/obj.vim                          | 5 +++++
 syntax/ocaml.vim                        | 5 +++++
 syntax/ocamlbuild_tags.vim              | 5 +++++
 syntax/occam.vim                        | 5 +++++
 syntax/ocpbuild.vim                     | 5 +++++
 syntax/ocpbuildroot.vim                 | 5 +++++
 syntax/octave.vim                       | 5 +++++
 syntax/odin.vim                         | 5 +++++
 syntax/omake.vim                        | 5 +++++
 syntax/omnimark.vim                     | 5 +++++
 syntax/opam.vim                         | 5 +++++
 syntax/opencl.vim                       | 5 +++++
 syntax/openroad.vim                     | 5 +++++
 syntax/opl.vim                          | 5 +++++
 syntax/ora.vim                          | 5 +++++
 syntax/pamconf.vim                      | 5 +++++
 syntax/pamenv.vim                       | 5 +++++
 syntax/papp.vim                         | 5 +++++
 syntax/pascal.vim                       | 5 +++++
 syntax/passwd.vim                       | 5 +++++
 syntax/pccts.vim                        | 5 +++++
 syntax/pdf.vim                          | 5 +++++
 syntax/perl.vim                         | 5 +++++
 syntax/pf.vim                           | 5 +++++
 syntax/pfmain.vim                       | 5 +++++
 syntax/pgsql.vim                        | 5 +++++
 syntax/php.vim                          | 5 +++++
 syntax/pike.vim                         | 5 +++++
 syntax/pilrc.vim                        | 5 +++++
 syntax/pine.vim                         | 5 +++++
 syntax/pinfo.vim                        | 5 +++++
 syntax/plantuml.vim                     | 5 +++++
 syntax/pli.vim                          | 5 +++++
 syntax/plm.vim                          | 5 +++++
 syntax/plp.vim                          | 5 +++++
 syntax/plsql.vim                        | 5 +++++
 syntax/po.vim                           | 5 +++++
 syntax/pod.vim                          | 5 +++++
 syntax/pony.vim                         | 5 +++++
 syntax/postscr.vim                      | 5 +++++
 syntax/pov.vim                          | 5 +++++
 syntax/povini.vim                       | 5 +++++
 syntax/ppd.vim                          | 5 +++++
 syntax/ppwiz.vim                        | 5 +++++
 syntax/privoxy.vim                      | 5 +++++
 syntax/procmail.vim                     | 5 +++++
 syntax/prolog.vim                       | 5 +++++
 syntax/promela.vim                      | 5 +++++
 syntax/proto.vim                        | 5 +++++
 syntax/protocols.vim                    | 5 +++++
 syntax/ps1.vim                          | 5 +++++
 syntax/ps1xml.vim                       | 5 +++++
 syntax/psf.vim                          | 5 +++++
 syntax/pug.vim                          | 5 +++++
 syntax/puppet.vim                       | 5 +++++
 syntax/purescript.vim                   | 5 +++++
 syntax/pyrex.vim                        | 5 +++++
 syntax/python.vim                       | 5 +++++
 syntax/qmake.vim                        | 5 +++++
 syntax/qml.vim                          | 5 +++++
 syntax/quake.vim                        | 5 +++++
 syntax/racket.vim                       | 5 +++++
 syntax/radiance.vim                     | 5 +++++
 syntax/ragel.vim                        | 5 +++++
 syntax/raku.vim                         | 5 +++++
 syntax/raml.vim                         | 5 +++++
 syntax/ratpoison.vim                    | 5 +++++
 syntax/razor.vim                        | 5 +++++
 syntax/rc.vim                           | 5 +++++
 syntax/rcs.vim                          | 5 +++++
 syntax/readline.vim                     | 5 +++++
 syntax/reason.vim                       | 5 +++++
 syntax/rego.vim                         | 5 +++++
 syntax/remind.vim                       | 5 +++++
 syntax/requirements.vim                 | 5 +++++
 syntax/resolv.vim                       | 5 +++++
 syntax/reva.vim                         | 5 +++++
 syntax/rexx.vim                         | 5 +++++
 syntax/rhelp.vim                        | 5 +++++
 syntax/rib.vim                          | 5 +++++
 syntax/rmd.vim                          | 5 +++++
 syntax/rnc.vim                          | 5 +++++
 syntax/rng.vim                          | 5 +++++
 syntax/rnoweb-1.vim                     | 5 +++++
 syntax/rnoweb-2.vim                     | 5 +++++
 syntax/robots.vim                       | 5 +++++
 syntax/rpcgen.vim                       | 5 +++++
 syntax/rpl.vim                          | 5 +++++
 syntax/rrst.vim                         | 5 +++++
 syntax/rst.vim                          | 5 +++++
 syntax/rtf.vim                          | 5 +++++
 syntax/ruby.vim                         | 5 +++++
 syntax/rust.vim                         | 5 +++++
 syntax/samba.vim                        | 5 +++++
 syntax/sas.vim                          | 5 +++++
 syntax/sass.vim                         | 5 +++++
 syntax/sather.vim                       | 5 +++++
 syntax/sbt.vim                          | 5 +++++
 syntax/scala.vim                        | 5 +++++
 syntax/scheme.vim                       | 5 +++++
 syntax/scilab.vim                       | 5 +++++
 syntax/screen.vim                       | 5 +++++
 syntax/scss.vim                         | 5 +++++
 syntax/sd.vim                           | 5 +++++
 syntax/sdc.vim                          | 5 +++++
 syntax/sdl.vim                          | 5 +++++
 syntax/sed.vim                          | 5 +++++
 syntax/sensors.vim                      | 5 +++++
 syntax/services.vim                     | 5 +++++
 syntax/setserial.vim                    | 5 +++++
 syntax/sexplib.vim                      | 5 +++++
 syntax/sh.vim                           | 5 +++++
 syntax/sieve.vim                        | 5 +++++
 syntax/sil.vim                          | 5 +++++
 syntax/simula.vim                       | 5 +++++
 syntax/sinda.vim                        | 5 +++++
 syntax/sisu.vim                         | 5 +++++
 syntax/skill.vim                        | 5 +++++
 syntax/slang.vim                        | 5 +++++
 syntax/slice.vim                        | 5 +++++
 syntax/slim.vim                         | 5 +++++
 syntax/slime.vim                        | 5 +++++
 syntax/slpconf.vim                      | 5 +++++
 syntax/slpreg.vim                       | 5 +++++
 syntax/slpspi.vim                       | 5 +++++
 syntax/slrnrc.vim                       | 5 +++++
 syntax/slrnsc.vim                       | 5 +++++
 syntax/sm.vim                           | 5 +++++
 syntax/smarty.vim                       | 5 +++++
 syntax/smcl.vim                         | 5 +++++
 syntax/smhl.vim                         | 5 +++++
 syntax/smith.vim                        | 5 +++++
 syntax/sml.vim                          | 5 +++++
 syntax/smt2.vim                         | 5 +++++
 syntax/snobol4.vim                      | 5 +++++
 syntax/solidity.vim                     | 5 +++++
 syntax/spec.vim                         | 5 +++++
 syntax/spice.vim                        | 5 +++++
 syntax/spup.vim                         | 5 +++++
 syntax/spyce.vim                        | 5 +++++
 syntax/sql.vim                          | 5 +++++
 syntax/sqlj.vim                         | 5 +++++
 syntax/sqloracle.vim                    | 5 +++++
 syntax/sqr.vim                          | 5 +++++
 syntax/squid.vim                        | 5 +++++
 syntax/srec.vim                         | 5 +++++
 syntax/sshconfig.vim                    | 5 +++++
 syntax/sshdconfig.vim                   | 5 +++++
 syntax/st.vim                           | 5 +++++
 syntax/stata.vim                        | 5 +++++
 syntax/stp.vim                          | 5 +++++
 syntax/stylus.vim                       | 5 +++++
 syntax/sudoers.vim                      | 5 +++++
 syntax/svelte.vim                       | 5 +++++
 syntax/svg.vim                          | 5 +++++
 syntax/svn.vim                          | 5 +++++
 syntax/swift.vim                        | 5 +++++
 syntax/swiftgyb.vim                     | 5 +++++
 syntax/sxhkdrc.vim                      | 5 +++++
 syntax/sysctl.vim                       | 5 +++++
 syntax/systemd.vim                      | 5 +++++
 syntax/systemverilog.vim                | 5 +++++
 syntax/tablegen.vim                     | 5 +++++
 syntax/tads.vim                         | 5 +++++
 syntax/tags.vim                         | 5 +++++
 syntax/tak.vim                          | 5 +++++
 syntax/tap.vim                          | 5 +++++
 syntax/taskdata.vim                     | 5 +++++
 syntax/taskedit.vim                     | 5 +++++
 syntax/tcl.vim                          | 5 +++++
 syntax/template.vim                     | 5 +++++
 syntax/teraterm.vim                     | 5 +++++
 syntax/terminfo.vim                     | 5 +++++
 syntax/terraform.vim                    | 5 +++++
 syntax/tex.vim                          | 5 +++++
 syntax/texinfo.vim                      | 5 +++++
 syntax/texmf.vim                        | 5 +++++
 syntax/textile.vim                      | 5 +++++
 syntax/tf.vim                           | 5 +++++
 syntax/thrift.vim                       | 5 +++++
 syntax/tidy.vim                         | 5 +++++
 syntax/tilde.vim                        | 5 +++++
 syntax/tli.vim                          | 5 +++++
 syntax/tmux.vim                         | 5 +++++
 syntax/toml.vim                         | 5 +++++
 syntax/tpp.vim                          | 5 +++++
 syntax/tptp.vim                         | 5 +++++
 syntax/trasys.vim                       | 5 +++++
 syntax/treetop.vim                      | 5 +++++
 syntax/trustees.vim                     | 5 +++++
 syntax/tsalt.vim                        | 5 +++++
 syntax/tsscl.vim                        | 5 +++++
 syntax/tssgm.vim                        | 5 +++++
 syntax/tssop.vim                        | 5 +++++
 syntax/tt2.vim                          | 5 +++++
 syntax/tt2html.vim                      | 5 +++++
 syntax/tt2js.vim                        | 5 +++++
 syntax/twig.vim                         | 5 +++++
 syntax/typescript.vim                   | 5 +++++
 syntax/typescriptreact.vim              | 5 +++++
 syntax/uc.vim                           | 5 +++++
 syntax/udevconf.vim                     | 5 +++++
 syntax/udevperm.vim                     | 5 +++++
 syntax/uil.vim                          | 5 +++++
 syntax/unison.vim                       | 5 +++++
 syntax/updatedb.vim                     | 5 +++++
 syntax/upstart.vim                      | 5 +++++
 syntax/upstreamdat.vim                  | 5 +++++
 syntax/upstreaminstalllog.vim           | 5 +++++
 syntax/upstreamlog.vim                  | 5 +++++
 syntax/usserverlog.vim                  | 5 +++++
 syntax/usw2kagtlog.vim                  | 5 +++++
 syntax/vala.vim                         | 5 +++++
 syntax/vb.vim                           | 5 +++++
 syntax/vbnet.vim                        | 5 +++++
 syntax/vcl.vim                          | 5 +++++
 syntax/velocity.vim                     | 5 +++++
 syntax/vera.vim                         | 5 +++++
 syntax/verilog.vim                      | 5 +++++
 syntax/verilogams.vim                   | 5 +++++
 syntax/vgrindefs.vim                    | 5 +++++
 syntax/vhdl.vim                         | 5 +++++
 syntax/vimgo.vim                        | 5 +++++
 syntax/viminfo.vim                      | 5 +++++
 syntax/vlang.vim                        | 5 +++++
 syntax/vmasm.vim                        | 5 +++++
 syntax/voscm.vim                        | 5 +++++
 syntax/vrml.vim                         | 5 +++++
 syntax/vroom.vim                        | 5 +++++
 syntax/vue.vim                          | 5 +++++
 syntax/wast.vim                         | 5 +++++
 syntax/webmacro.vim                     | 5 +++++
 syntax/wget.vim                         | 5 +++++
 syntax/winbatch.vim                     | 5 +++++
 syntax/wml.vim                          | 5 +++++
 syntax/wsh.vim                          | 5 +++++
 syntax/wsml.vim                         | 5 +++++
 syntax/wvdial.vim                       | 5 +++++
 syntax/xdc.vim                          | 5 +++++
 syntax/xdefaults.vim                    | 5 +++++
 syntax/xf86conf.vim                     | 5 +++++
 syntax/xhtml.vim                        | 5 +++++
 syntax/xinetd.vim                       | 5 +++++
 syntax/xmath.vim                        | 5 +++++
 syntax/xml.vim                          | 5 +++++
 syntax/xmodmap.vim                      | 5 +++++
 syntax/xpm.vim                          | 5 +++++
 syntax/xpm2.vim                         | 5 +++++
 syntax/xquery.vim                       | 5 +++++
 syntax/xs.vim                           | 5 +++++
 syntax/xsd.vim                          | 5 +++++
 syntax/xsl.vim                          | 5 +++++
 syntax/xslt.vim                         | 5 +++++
 syntax/yacc.vim                         | 5 +++++
 syntax/yaml.vim                         | 5 +++++
 syntax/yats.vim                         | 5 +++++
 syntax/yats/css.vim                     | 5 +++++
 syntax/yats/dom-document.vim            | 5 +++++
 syntax/yats/dom-elem.vim                | 5 +++++
 syntax/yats/dom-event.vim               | 5 +++++
 syntax/yats/dom-form.vim                | 5 +++++
 syntax/yats/dom-node.vim                | 5 +++++
 syntax/yats/dom-storage.vim             | 5 +++++
 syntax/yats/ecma-402.vim                | 5 +++++
 syntax/yats/es6-array.vim               | 5 +++++
 syntax/yats/es6-date.vim                | 5 +++++
 syntax/yats/es6-function.vim            | 5 +++++
 syntax/yats/es6-json.vim                | 5 +++++
 syntax/yats/es6-map.vim                 | 5 +++++
 syntax/yats/es6-math.vim                | 5 +++++
 syntax/yats/es6-number.vim              | 5 +++++
 syntax/yats/es6-object.vim              | 5 +++++
 syntax/yats/es6-promise.vim             | 5 +++++
 syntax/yats/es6-proxy.vim               | 5 +++++
 syntax/yats/es6-reflect.vim             | 5 +++++
 syntax/yats/es6-regexp.vim              | 5 +++++
 syntax/yats/es6-set.vim                 | 5 +++++
 syntax/yats/es6-string.vim              | 5 +++++
 syntax/yats/es6-symbol.vim              | 5 +++++
 syntax/yats/event.vim                   | 5 +++++
 syntax/yats/node.vim                    | 5 +++++
 syntax/yats/test.vim                    | 5 +++++
 syntax/yats/typescript.vim              | 5 +++++
 syntax/yats/web-blob.vim                | 5 +++++
 syntax/yats/web-console.vim             | 5 +++++
 syntax/yats/web-crypto.vim              | 5 +++++
 syntax/yats/web-encoding.vim            | 5 +++++
 syntax/yats/web-fetch.vim               | 5 +++++
 syntax/yats/web-geo.vim                 | 5 +++++
 syntax/yats/web-history.vim             | 5 +++++
 syntax/yats/web-location.vim            | 5 +++++
 syntax/yats/web-navigator.vim           | 5 +++++
 syntax/yats/web-network.vim             | 5 +++++
 syntax/yats/web-payment.vim             | 5 +++++
 syntax/yats/web-service-worker.vim      | 5 +++++
 syntax/yats/web-window.vim              | 5 +++++
 syntax/yats/web-xhr.vim                 | 5 +++++
 syntax/yats/web.vim                     | 5 +++++
 syntax/z8a.vim                          | 5 +++++
 syntax/zephir.vim                       | 5 +++++
 syntax/zig.vim                          | 5 +++++
 syntax/zimbu.vim                        | 5 +++++
 syntax/zir.vim                          | 5 +++++
 syntax/zsh.vim                          | 5 +++++
 1227 files changed, 6139 insertions(+)

diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index 8e6714dc5..132437ed6 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/LaTeXtoUnicode.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
diff --git a/autoload/RstFold.vim b/autoload/RstFold.vim
index 30d008743..dc1044f76 100644
--- a/autoload/RstFold.vim
+++ b/autoload/RstFold.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/RstFold.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 
 " Author: Antony Lee <anntzer.lee@gmail.com>
diff --git a/autoload/ada.vim b/autoload/ada.vim
index efe5e7176..e01b83ae4 100644
--- a/autoload/ada.vim
+++ b/autoload/ada.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/ada.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ada') == -1
 
 "------------------------------------------------------------------------------
diff --git a/autoload/cargo.vim b/autoload/cargo.vim
index bd453ac7c..a8b35e731 100644
--- a/autoload/cargo.vim
+++ b/autoload/cargo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/cargo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 function! cargo#Load()
diff --git a/autoload/cargo/quickfix.vim b/autoload/cargo/quickfix.vim
index cce7fcbb7..630928f55 100644
--- a/autoload/cargo/quickfix.vim
+++ b/autoload/cargo/quickfix.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/cargo/quickfix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 function! cargo#quickfix#CmdPre() abort
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index 9128b3d16..70c1d4cea 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/clojurecomplete.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 
 " Vim completion script
diff --git a/autoload/coffee.vim b/autoload/coffee.vim
index 76eab3b00..c3376640a 100644
--- a/autoload/coffee.vim
+++ b/autoload/coffee.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/coffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
diff --git a/autoload/crystal/indent.vim b/autoload/crystal/indent.vim
index ffd780e06..d50c6e290 100644
--- a/autoload/crystal/indent.vim
+++ b/autoload/crystal/indent.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/crystal/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " Variables {{{1
diff --git a/autoload/crystal_lang.vim b/autoload/crystal_lang.vim
index b0e63ea26..3b10ecbd3 100644
--- a/autoload/crystal_lang.vim
+++ b/autoload/crystal_lang.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/crystal_lang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 let s:V = vital#crystal#new()
diff --git a/autoload/csv.vim b/autoload/csv.vim
index b97428c38..a51163066 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/csv.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csv') == -1
 
 " Filetype plugin for editing CSV files. "{{{1
diff --git a/autoload/dart.vim b/autoload/dart.vim
index 52d76c020..bbb1de213 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/dart.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 
 
diff --git a/autoload/db/adapter/ecto.vim b/autoload/db/adapter/ecto.vim
index 4012f04ab..f97301e9a 100644
--- a/autoload/db/adapter/ecto.vim
+++ b/autoload/db/adapter/ecto.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/db/adapter/ecto.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 let s:path = expand('<sfile>:h')
diff --git a/autoload/ecrystal.vim b/autoload/ecrystal.vim
index 20f3151fa..658d5bd8e 100644
--- a/autoload/ecrystal.vim
+++ b/autoload/ecrystal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/ecrystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 let s:ecrystal_extensions = {
diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index 741ec0944..61015846e 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/elixir/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if !exists("g:elixir_indent_max_lookbehind")
diff --git a/autoload/elixir/util.vim b/autoload/elixir/util.vim
index 04cb8375e..de7972def 100644
--- a/autoload/elixir/util.vim
+++ b/autoload/elixir/util.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/elixir/util.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 function! elixir#util#get_filename(word) abort
diff --git a/autoload/fish.vim b/autoload/fish.vim
index 6d8af0133..2cc6fcfbb 100644
--- a/autoload/fish.vim
+++ b/autoload/fish.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/fish.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 
 function! fish#Indent()
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index 90313231d..a7abc1d70 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/fsharp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
 
 " Vim autoload functions
diff --git a/autoload/fzf_gitignore.vim b/autoload/fzf_gitignore.vim
index 7548130c4..a482c0306 100644
--- a/autoload/fzf_gitignore.vim
+++ b/autoload/fzf_gitignore.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/fzf_gitignore.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
 
 scriptencoding utf-8
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index 2265608b4..c58b983a8 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/go/config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " don't spam the user when Vim is started in Vi compatibility mode
diff --git a/autoload/graphql.vim b/autoload/graphql.vim
index 5a0a8c54d..49c63437f 100644
--- a/autoload/graphql.vim
+++ b/autoload/graphql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/graphql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
diff --git a/autoload/htmlcomplete.vim b/autoload/htmlcomplete.vim
index 135f716b5..ae83ea68b 100644
--- a/autoload/htmlcomplete.vim
+++ b/autoload/htmlcomplete.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/htmlcomplete.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 
 " Vim completion script
diff --git a/autoload/jsonnet.vim b/autoload/jsonnet.vim
index 6607ac0df..0f1272db9 100644
--- a/autoload/jsonnet.vim
+++ b/autoload/jsonnet.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/jsonnet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsonnet') == -1
 
 
diff --git a/autoload/jsx_pretty/comment.vim b/autoload/jsx_pretty/comment.vim
index 7ba23b821..15442453f 100644
--- a/autoload/jsx_pretty/comment.vim
+++ b/autoload/jsx_pretty/comment.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/jsx_pretty/comment.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
 
 function! jsx_pretty#comment#update_commentstring(original)
diff --git a/autoload/jsx_pretty/indent.vim b/autoload/jsx_pretty/indent.vim
index be78ccaaf..77d620389 100644
--- a/autoload/jsx_pretty/indent.vim
+++ b/autoload/jsx_pretty/indent.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/jsx_pretty/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
 
 if exists('*shiftwidth')
diff --git a/autoload/julia.vim b/autoload/julia.vim
index 9442f611d..daaa9f446 100644
--- a/autoload/julia.vim
+++ b/autoload/julia.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/julia.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 function! julia#set_syntax_version(jvers)
diff --git a/autoload/julia/doc.vim b/autoload/julia/doc.vim
index 0bba5bfc7..7e6b5d317 100644
--- a/autoload/julia/doc.vim
+++ b/autoload/julia/doc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/julia/doc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " path to the julia binary to communicate with
diff --git a/autoload/julia_blocks.vim b/autoload/julia_blocks.vim
index 81c204cf4..634462d69 100644
--- a/autoload/julia_blocks.vim
+++ b/autoload/julia_blocks.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/julia_blocks.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Facilities for moving around Julia blocks (e.g. if/end, function/end etc.)
diff --git a/autoload/julia_latex_symbols.vim b/autoload/julia_latex_symbols.vim
index 3b2bf0506..23101f784 100644
--- a/autoload/julia_latex_symbols.vim
+++ b/autoload/julia_latex_symbols.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/julia_latex_symbols.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " This file is autogenerated from the script 'generate_latex_symbols_table.jl'
diff --git a/autoload/ledger.vim b/autoload/ledger.vim
index 225f96a3d..cb7acfe7b 100644
--- a/autoload/ledger.vim
+++ b/autoload/ledger.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/ledger.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ledger') == -1
 
 scriptencoding utf-8
diff --git a/autoload/nim.vim b/autoload/nim.vim
index e5531ec5a..cf7bb3786 100644
--- a/autoload/nim.vim
+++ b/autoload/nim.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/nim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 
 let g:nim_log = []
diff --git a/autoload/pony.vim b/autoload/pony.vim
index d7ab5d025..85506e8b4 100644
--- a/autoload/pony.vim
+++ b/autoload/pony.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/pony.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 
 " Vim plugin file
diff --git a/autoload/puppet/align.vim b/autoload/puppet/align.vim
index b7dc1edad..712b686b9 100644
--- a/autoload/puppet/align.vim
+++ b/autoload/puppet/align.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/puppet/align.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 function! puppet#align#IndentLevel(lnum)
diff --git a/autoload/puppet/ctags.vim b/autoload/puppet/ctags.vim
index 8f4d108f7..a86490bb2 100644
--- a/autoload/puppet/ctags.vim
+++ b/autoload/puppet/ctags.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/puppet/ctags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 
diff --git a/autoload/puppet/format.vim b/autoload/puppet/format.vim
index 519fcc71d..503378490 100644
--- a/autoload/puppet/format.vim
+++ b/autoload/puppet/format.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/puppet/format.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 "
diff --git a/autoload/python/utils.vim b/autoload/python/utils.vim
index c2e64874e..283d785a4 100644
--- a/autoload/python/utils.vim
+++ b/autoload/python/utils.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/python/utils.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
 
 " Sometimes Python issues debugging messages
diff --git a/autoload/requirements.vim b/autoload/requirements.vim
index f237905e7..79be715c8 100644
--- a/autoload/requirements.vim
+++ b/autoload/requirements.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/requirements.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'requirements') == -1
 
 " the Requirements File Format syntax support for Vim
diff --git a/autoload/rubycomplete.vim b/autoload/rubycomplete.vim
index 54b7e1b81..1e8a6f0d7 100644
--- a/autoload/rubycomplete.vim
+++ b/autoload/rubycomplete.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/rubycomplete.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim completion script
diff --git a/autoload/rust.vim b/autoload/rust.vim
index 34dd16736..bab6a11fc 100644
--- a/autoload/rust.vim
+++ b/autoload/rust.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/rust.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Description: Helper functions for Rust commands/mappings
diff --git a/autoload/rust/debugging.vim b/autoload/rust/debugging.vim
index 066e2451a..3ddcc63cc 100644
--- a/autoload/rust/debugging.vim
+++ b/autoload/rust/debugging.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/rust/debugging.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.vim
diff --git a/autoload/rust/delimitmate.vim b/autoload/rust/delimitmate.vim
index 6707adc54..c605742b7 100644
--- a/autoload/rust/delimitmate.vim
+++ b/autoload/rust/delimitmate.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/rust/delimitmate.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 let s:delimitMate_extra_excluded_regions = ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
diff --git a/autoload/rust/tags.vim b/autoload/rust/tags.vim
index e75fb2083..10ce9440f 100644
--- a/autoload/rust/tags.vim
+++ b/autoload/rust/tags.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/rust/tags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Tagbar support code, for the sake of not automatically overriding its
diff --git a/autoload/rustfmt.vim b/autoload/rustfmt.vim
index 28cca07a7..c847219bb 100644
--- a/autoload/rustfmt.vim
+++ b/autoload/rustfmt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/rustfmt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Author: Stephen Sugden <stephen@stephensugden.com>
diff --git a/autoload/smt2.vim b/autoload/smt2.vim
index 294a64c6d..b081d345d 100644
--- a/autoload/smt2.vim
+++ b/autoload/smt2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/smt2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smt2') == -1
 
 " Invokes the solver on current file
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index 1f9876695..2380a395a 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/terraform.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 
 let s:cpo_save = &cpoptions
diff --git a/autoload/vital/_crystal.vim b/autoload/vital/_crystal.vim
index 27e1b3104..ffa302406 100644
--- a/autoload/vital/_crystal.vim
+++ b/autoload/vital/_crystal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 let s:_plugin_name = expand('<sfile>:t:r')
diff --git a/autoload/vital/_crystal/ColorEcho.vim b/autoload/vital/_crystal/ColorEcho.vim
index f93c52153..58996327d 100644
--- a/autoload/vital/_crystal/ColorEcho.vim
+++ b/autoload/vital/_crystal/ColorEcho.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/ColorEcho.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " ___vital___
diff --git a/autoload/vital/_crystal/Data/List.vim b/autoload/vital/_crystal/Data/List.vim
index 18a7a9477..064615256 100644
--- a/autoload/vital/_crystal/Data/List.vim
+++ b/autoload/vital/_crystal/Data/List.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/List.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " ___vital___
diff --git a/autoload/vital/_crystal/Data/String.vim b/autoload/vital/_crystal/Data/String.vim
index d5124081e..7e6ced35a 100644
--- a/autoload/vital/_crystal/Data/String.vim
+++ b/autoload/vital/_crystal/Data/String.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/String.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " ___vital___
diff --git a/autoload/vital/_crystal/Process.vim b/autoload/vital/_crystal/Process.vim
index ecbfc0d4c..a7bbedade 100644
--- a/autoload/vital/_crystal/Process.vim
+++ b/autoload/vital/_crystal/Process.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Process.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " ___vital___
diff --git a/autoload/vital/_crystal/Web/JSON.vim b/autoload/vital/_crystal/Web/JSON.vim
index c6892b4ec..891bd2dcc 100644
--- a/autoload/vital/_crystal/Web/JSON.vim
+++ b/autoload/vital/_crystal/Web/JSON.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Web/JSON.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " ___vital___
diff --git a/autoload/vital/crystal.vim b/autoload/vital/crystal.vim
index e1fb611b6..ca8c320ed 100644
--- a/autoload/vital/crystal.vim
+++ b/autoload/vital/crystal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/vital/crystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 let s:plugin_name = expand('<sfile>:t:r')
diff --git a/autoload/xml/aria.vim b/autoload/xml/aria.vim
index 4fbd25d92..1cd801fe4 100644
--- a/autoload/xml/aria.vim
+++ b/autoload/xml/aria.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/xml/aria.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 
 " Vim completion for WAI-ARIA data file
diff --git a/autoload/xml/html5.vim b/autoload/xml/html5.vim
index a20fd4f96..6e526be62 100644
--- a/autoload/xml/html5.vim
+++ b/autoload/xml/html5.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/xml/html5.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 
 " Vim completion for HTML5 data file
diff --git a/autoload/xml/xsd.vim b/autoload/xml/xsd.vim
index 572581a13..ad3630daf 100644
--- a/autoload/xml/xsd.vim
+++ b/autoload/xml/xsd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/xml/xsd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
 
 " Author: Thomas Barthel
diff --git a/autoload/zig/config.vim b/autoload/zig/config.vim
index 328ba100b..d4f1a298c 100644
--- a/autoload/zig/config.vim
+++ b/autoload/zig/config.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/zig/config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 function! zig#config#ListTypeCommands() abort
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index d3aa9641f..b1ec0bbe9 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/zig/fmt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Adapted from fatih/vim-go: autoload/go/fmt.vim
diff --git a/autoload/zig/list.vim b/autoload/zig/list.vim
index bdd433769..8ab57d424 100644
--- a/autoload/zig/list.vim
+++ b/autoload/zig/list.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/zig/list.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Adapted from fatih/vim-go: autoload/go/list.vim
diff --git a/autoload/zig/util.vim b/autoload/zig/util.vim
index bc454dd98..23d457584 100644
--- a/autoload/zig/util.vim
+++ b/autoload/zig/util.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'autoload/zig/util.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Adapted from vim-go: autoload/go/util.vim
diff --git a/compiler/ant.vim b/compiler/ant.vim
index ddb9e7465..a893daaa6 100644
--- a/compiler/ant.vim
+++ b/compiler/ant.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/ant.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ant') == -1
 
 " Vim Compiler File
diff --git a/compiler/bdf.vim b/compiler/bdf.vim
index 5bdd94775..04903c2c4 100644
--- a/compiler/bdf.vim
+++ b/compiler/bdf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/bdf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bdf') == -1
 
 " Vim compiler file
diff --git a/compiler/cake.vim b/compiler/cake.vim
index 9cd45dbbc..3ebcd187f 100644
--- a/compiler/cake.vim
+++ b/compiler/cake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/cake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
diff --git a/compiler/cargo.vim b/compiler/cargo.vim
index a82713616..f33a0a4c7 100644
--- a/compiler/cargo.vim
+++ b/compiler/cargo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/cargo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Vim compiler file
diff --git a/compiler/coffee.vim b/compiler/coffee.vim
index d4a112c58..8193a4a56 100644
--- a/compiler/coffee.vim
+++ b/compiler/coffee.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/coffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
diff --git a/compiler/credo.vim b/compiler/credo.vim
index 271dc67d6..5ad1f452b 100644
--- a/compiler/credo.vim
+++ b/compiler/credo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/credo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists('current_compiler')
diff --git a/compiler/cryptol.vim b/compiler/cryptol.vim
index d355f1888..3dca5026d 100644
--- a/compiler/cryptol.vim
+++ b/compiler/cryptol.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/cryptol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
 
 " Vim compiler file
diff --git a/compiler/cs.vim b/compiler/cs.vim
index 4e56feebc..feea9751b 100644
--- a/compiler/cs.vim
+++ b/compiler/cs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/cs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
 
 " Vim compiler file
diff --git a/compiler/cucumber.vim b/compiler/cucumber.vim
index af5dd4b6b..c0ddbc6d9 100644
--- a/compiler/cucumber.vim
+++ b/compiler/cucumber.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/cucumber.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 
 " Vim compiler file
diff --git a/compiler/dot.vim b/compiler/dot.vim
index 30af567d3..34be342a1 100644
--- a/compiler/dot.vim
+++ b/compiler/dot.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/dot.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dot') == -1
 
 " Vim compiler file
diff --git a/compiler/eruby.vim b/compiler/eruby.vim
index a2957379b..5d75d8690 100644
--- a/compiler/eruby.vim
+++ b/compiler/eruby.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/eruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim compiler file
diff --git a/compiler/exunit.vim b/compiler/exunit.vim
index 091506838..8f6d31121 100644
--- a/compiler/exunit.vim
+++ b/compiler/exunit.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/exunit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists("current_compiler")
diff --git a/compiler/fish.vim b/compiler/fish.vim
index 87abb8bfc..797abcc94 100644
--- a/compiler/fish.vim
+++ b/compiler/fish.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/fish.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 
 if exists('current_compiler')
diff --git a/compiler/go.vim b/compiler/go.vim
index a5528cfea..6a83f3dd7 100644
--- a/compiler/go.vim
+++ b/compiler/go.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/go.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " Copyright 2013 The Go Authors. All rights reserved.
diff --git a/compiler/gradle.vim b/compiler/gradle.vim
index 69fa1bb96..aa5b1917d 100644
--- a/compiler/gradle.vim
+++ b/compiler/gradle.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/gradle.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gradle') == -1
 
 " Vim Compiler File
diff --git a/compiler/gradlew.vim b/compiler/gradlew.vim
index 0d08ff3e2..932ace2ca 100644
--- a/compiler/gradlew.vim
+++ b/compiler/gradlew.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/gradlew.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gradle') == -1
 
 " Vim Compiler File
diff --git a/compiler/haml.vim b/compiler/haml.vim
index e942631fb..5593c2729 100644
--- a/compiler/haml.vim
+++ b/compiler/haml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/haml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 
 " Vim compiler file
diff --git a/compiler/ledger.vim b/compiler/ledger.vim
index 8d441af91..f74a27a20 100644
--- a/compiler/ledger.vim
+++ b/compiler/ledger.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/ledger.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ledger') == -1
 
 " Vim Compiler File
diff --git a/compiler/lilypond.vim b/compiler/lilypond.vim
index da1dd17cc..986c27814 100644
--- a/compiler/lilypond.vim
+++ b/compiler/lilypond.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/lilypond.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 
 " LilyPond compiler file
diff --git a/compiler/ls.vim b/compiler/ls.vim
index 8aed9a685..ab6b1c128 100644
--- a/compiler/ls.vim
+++ b/compiler/ls.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/ls.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 
 " Language:    LiveScript
diff --git a/compiler/mix.vim b/compiler/mix.vim
index 9bee88e95..13dd13403 100644
--- a/compiler/mix.vim
+++ b/compiler/mix.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/mix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists('current_compiler')
diff --git a/compiler/nim.vim b/compiler/nim.vim
index c849b1e98..b15e72214 100644
--- a/compiler/nim.vim
+++ b/compiler/nim.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/nim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 
 if exists('current_compiler')
diff --git a/compiler/nix-build.vim b/compiler/nix-build.vim
index 4ef29d28b..9766965a7 100644
--- a/compiler/nix-build.vim
+++ b/compiler/nix-build.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/nix-build.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 
 if exists('current_compiler')
diff --git a/compiler/ocaml.vim b/compiler/ocaml.vim
index c8fa745e8..ad3186d96 100644
--- a/compiler/ocaml.vim
+++ b/compiler/ocaml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/ocaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim Compiler File
diff --git a/compiler/powershell.vim b/compiler/powershell.vim
index 1737a5a59..13e56ddf1 100644
--- a/compiler/powershell.vim
+++ b/compiler/powershell.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/powershell.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Compiler:	powershell
diff --git a/compiler/python.vim b/compiler/python.vim
index eac2bb84d..f453919cc 100644
--- a/compiler/python.vim
+++ b/compiler/python.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/python.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
 
 " Vim compiler file
diff --git a/compiler/rake.vim b/compiler/rake.vim
index 12f7b7a0c..05fce7bfb 100644
--- a/compiler/rake.vim
+++ b/compiler/rake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/rake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim compiler file
diff --git a/compiler/rspec.vim b/compiler/rspec.vim
index 1f7c132f0..7b696c8ee 100644
--- a/compiler/rspec.vim
+++ b/compiler/rspec.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/rspec.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim compiler file
diff --git a/compiler/ruby.vim b/compiler/ruby.vim
index abdb6d304..4fe2817fc 100644
--- a/compiler/ruby.vim
+++ b/compiler/ruby.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/ruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim compiler file
diff --git a/compiler/rubyunit.vim b/compiler/rubyunit.vim
index c92f3ec8b..862de9dc7 100644
--- a/compiler/rubyunit.vim
+++ b/compiler/rubyunit.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/rubyunit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim compiler file
diff --git a/compiler/rustc.vim b/compiler/rustc.vim
index 14034ae43..f9da25f22 100644
--- a/compiler/rustc.vim
+++ b/compiler/rustc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/rustc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Vim compiler file
diff --git a/compiler/sass.vim b/compiler/sass.vim
index 8ce9dc846..1f0668734 100644
--- a/compiler/sass.vim
+++ b/compiler/sass.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/sass.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
 
 " Vim compiler file
diff --git a/compiler/sbt.vim b/compiler/sbt.vim
index a57f58c9a..f6333af5d 100644
--- a/compiler/sbt.vim
+++ b/compiler/sbt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/sbt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 " Vim compiler file
diff --git a/compiler/swift.vim b/compiler/swift.vim
index 5dab34f6b..c90b3fa28 100644
--- a/compiler/swift.vim
+++ b/compiler/swift.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/swift.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 
 " Vim compiler file
diff --git a/compiler/tcl.vim b/compiler/tcl.vim
index 11792a1ca..e1d7779e8 100644
--- a/compiler/tcl.vim
+++ b/compiler/tcl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/tcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
 
 " Vim compiler file
diff --git a/compiler/tex.vim b/compiler/tex.vim
index da14b9144..6f974124c 100644
--- a/compiler/tex.vim
+++ b/compiler/tex.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/tex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
 
 " Vim compiler file
diff --git a/compiler/tidy.vim b/compiler/tidy.vim
index f13b36649..ba44ce83f 100644
--- a/compiler/tidy.vim
+++ b/compiler/tidy.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/tidy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tidy') == -1
 
 " Vim compiler file
diff --git a/compiler/typescript.vim b/compiler/typescript.vim
index 6d1587710..e48600927 100644
--- a/compiler/typescript.vim
+++ b/compiler/typescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'compiler/typescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 if exists('current_compiler')
diff --git a/extras/flow.vim b/extras/flow.vim
index 6bbd91f11..5b9db5383 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'extras/flow.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index bbb0bb574..d65badb23 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'extras/jsdoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 "" syntax coloring for javadoc comments (HTML)
diff --git a/extras/ngdoc.vim b/extras/ngdoc.vim
index 6e38f9052..9ef799251 100644
--- a/extras/ngdoc.vim
+++ b/extras/ngdoc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'extras/ngdoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
diff --git a/ftplugin/8th.vim b/ftplugin/8th.vim
index 29c08c5e9..f6877548a 100644
--- a/ftplugin/8th.vim
+++ b/ftplugin/8th.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/8th.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '8th') == -1
 
 " Vim ftplugin file
diff --git a/ftplugin/a2ps.vim b/ftplugin/a2ps.vim
index 1274e83a7..052a9fb84 100644
--- a/ftplugin/a2ps.vim
+++ b/ftplugin/a2ps.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/a2ps.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'a2ps') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/aap.vim b/ftplugin/aap.vim
index d163c5bb2..d9f3213c3 100644
--- a/ftplugin/aap.vim
+++ b/ftplugin/aap.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/aap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aap') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/abap.vim b/ftplugin/abap.vim
index 1c1631c08..0ecefa794 100644
--- a/ftplugin/abap.vim
+++ b/ftplugin/abap.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/abap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'abap') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/abaqus.vim b/ftplugin/abaqus.vim
index efa42dda9..f6d21fa14 100644
--- a/ftplugin/abaqus.vim
+++ b/ftplugin/abaqus.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/abaqus.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'abaqus') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/ada.vim b/ftplugin/ada.vim
index 59bde0a51..19dbdd20e 100644
--- a/ftplugin/ada.vim
+++ b/ftplugin/ada.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ada.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ada') == -1
 
 "------------------------------------------------------------------------------
diff --git a/ftplugin/alsaconf.vim b/ftplugin/alsaconf.vim
index 68ce4a30b..5aac50a43 100644
--- a/ftplugin/alsaconf.vim
+++ b/ftplugin/alsaconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/alsaconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'alsaconf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/ansible.vim b/ftplugin/ansible.vim
index 1f83ddf7f..32b30474f 100644
--- a/ftplugin/ansible.vim
+++ b/ftplugin/ansible.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ansible.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 set isfname+=@-@
diff --git a/ftplugin/ansible_hosts.vim b/ftplugin/ansible_hosts.vim
index d93acc7c9..d93ef6f88 100644
--- a/ftplugin/ansible_hosts.vim
+++ b/ftplugin/ansible_hosts.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ansible_hosts.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 if exists("b:did_ftplugin")
diff --git a/ftplugin/ant.vim b/ftplugin/ant.vim
index 565815bd4..a69d4df07 100644
--- a/ftplugin/ant.vim
+++ b/ftplugin/ant.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ant.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ant') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/arch.vim b/ftplugin/arch.vim
index c9e018bcd..e674fdb0f 100644
--- a/ftplugin/arch.vim
+++ b/ftplugin/arch.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/arch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arch') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/art.vim b/ftplugin/art.vim
index ce63ba52a..65d411dc1 100644
--- a/ftplugin/art.vim
+++ b/ftplugin/art.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/art.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'art') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/aspvbs.vim b/ftplugin/aspvbs.vim
index c2afec5aa..6c3c53df9 100644
--- a/ftplugin/aspvbs.vim
+++ b/ftplugin/aspvbs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/aspvbs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aspvbs') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/automake.vim b/ftplugin/automake.vim
index 0e8538437..f5c92bcc2 100644
--- a/ftplugin/automake.vim
+++ b/ftplugin/automake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/automake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'automake') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/awk.vim b/ftplugin/awk.vim
index 4425ac475..764edfd96 100644
--- a/ftplugin/awk.vim
+++ b/ftplugin/awk.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/awk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'awk') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/bdf.vim b/ftplugin/bdf.vim
index e18c493cf..ae22bf31b 100644
--- a/ftplugin/bdf.vim
+++ b/ftplugin/bdf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/bdf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bdf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/blade.vim b/ftplugin/blade.vim
index e5a5af91b..81020de73 100644
--- a/ftplugin/blade.vim
+++ b/ftplugin/blade.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/blade.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/bst.vim b/ftplugin/bst.vim
index e4445546f..5e49c1bc6 100644
--- a/ftplugin/bst.vim
+++ b/ftplugin/bst.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/bst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bst') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/bzl.vim b/ftplugin/bzl.vim
index 3abebee9e..c65643a44 100644
--- a/ftplugin/bzl.vim
+++ b/ftplugin/bzl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/bzl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/caddyfile.vim b/ftplugin/caddyfile.vim
index 8e4bb9851..5d480987f 100644
--- a/ftplugin/caddyfile.vim
+++ b/ftplugin/caddyfile.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/caddyfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
 
 " Language:	    Caddyfile
diff --git a/ftplugin/calendar.vim b/ftplugin/calendar.vim
index 1ce0e41dd..b5af5c1e4 100644
--- a/ftplugin/calendar.vim
+++ b/ftplugin/calendar.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/calendar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'calendar') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/cdrdaoconf.vim b/ftplugin/cdrdaoconf.vim
index 8b114fcbd..478aaf9d8 100644
--- a/ftplugin/cdrdaoconf.vim
+++ b/ftplugin/cdrdaoconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/cdrdaoconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdrdaoconf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/cfg.vim b/ftplugin/cfg.vim
index 6b4fb0626..472e5240a 100644
--- a/ftplugin/cfg.vim
+++ b/ftplugin/cfg.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/cfg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cfg') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/ch.vim b/ftplugin/ch.vim
index 71f4870be..5222c5e8c 100644
--- a/ftplugin/ch.vim
+++ b/ftplugin/ch.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ch') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 102781149..c04de2e30 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/clojure.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/cobol.vim b/ftplugin/cobol.vim
index 45050de26..dec2d8c67 100644
--- a/ftplugin/cobol.vim
+++ b/ftplugin/cobol.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/cobol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cobol') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim
index 64daa2901..86a3e82fd 100644
--- a/ftplugin/coffee.vim
+++ b/ftplugin/coffee.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/coffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
diff --git a/ftplugin/conf.vim b/ftplugin/conf.vim
index 50f87fa72..3e6a45739 100644
--- a/ftplugin/conf.vim
+++ b/ftplugin/conf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/conf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'conf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/config.vim b/ftplugin/config.vim
index d6a4281bd..050c6f00d 100644
--- a/ftplugin/config.vim
+++ b/ftplugin/config.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'config') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/crm.vim b/ftplugin/crm.vim
index f5a6268d3..83076461a 100644
--- a/ftplugin/crm.vim
+++ b/ftplugin/crm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/crm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crm') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/cryptol/folding.vim b/ftplugin/cryptol/folding.vim
index 210d0573c..d516f61fa 100644
--- a/ftplugin/cryptol/folding.vim
+++ b/ftplugin/cryptol/folding.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/cryptol/folding.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
 
 " Copyright © 2013 Edward O'Callaghan. All Rights Reserved.
diff --git a/ftplugin/crystal.vim b/ftplugin/crystal.vim
index 0a206003a..eb8e8974e 100644
--- a/ftplugin/crystal.vim
+++ b/ftplugin/crystal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/crystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 if exists('b:did_ftplugin')
diff --git a/ftplugin/cs.vim b/ftplugin/cs.vim
index 46d26f558..72dbdfe08 100644
--- a/ftplugin/cs.vim
+++ b/ftplugin/cs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/cs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/csc.vim b/ftplugin/csc.vim
index e992f438a..908a027a0 100644
--- a/ftplugin/csc.vim
+++ b/ftplugin/csc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/csc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csc') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/css.vim b/ftplugin/css.vim
index 47db09cde..6209091b2 100644
--- a/ftplugin/css.vim
+++ b/ftplugin/css.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/css.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'css') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/csv.vim b/ftplugin/csv.vim
index b5d48dd09..125d06ed3 100644
--- a/ftplugin/csv.vim
+++ b/ftplugin/csv.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/csv.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csv') == -1
 
 " Filetype plugin for editing CSV files. "{{{1
diff --git a/ftplugin/cucumber.vim b/ftplugin/cucumber.vim
index 5d34213b5..102541530 100644
--- a/ftplugin/cucumber.vim
+++ b/ftplugin/cucumber.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/cucumber.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/cvsrc.vim b/ftplugin/cvsrc.vim
index b408fdb11..705787b92 100644
--- a/ftplugin/cvsrc.vim
+++ b/ftplugin/cvsrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/cvsrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cvsrc') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim
index 69dae68cc..147e657dd 100644
--- a/ftplugin/dart.vim
+++ b/ftplugin/dart.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/dart.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 
 if exists('b:did_ftplugin')
diff --git a/ftplugin/debchangelog.vim b/ftplugin/debchangelog.vim
index 261af91cb..355826f79 100644
--- a/ftplugin/debchangelog.vim
+++ b/ftplugin/debchangelog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/debchangelog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debchangelog') == -1
 
 " Vim filetype plugin file (GUI menu, folding and completion)
diff --git a/ftplugin/debcontrol.vim b/ftplugin/debcontrol.vim
index 47128050c..647d59424 100644
--- a/ftplugin/debcontrol.vim
+++ b/ftplugin/debcontrol.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/debcontrol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debcontrol') == -1
 
 " Vim filetype plugin file (GUI menu and folding)
diff --git a/ftplugin/denyhosts.vim b/ftplugin/denyhosts.vim
index 9b5cbba36..3cadf87fc 100644
--- a/ftplugin/denyhosts.vim
+++ b/ftplugin/denyhosts.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/denyhosts.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'denyhosts') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/dhall.vim b/ftplugin/dhall.vim
index 1c524a786..983877c03 100644
--- a/ftplugin/dhall.vim
+++ b/ftplugin/dhall.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/dhall.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dhall') == -1
 
 if exists('b:dhall_ftplugin')
diff --git a/ftplugin/dictconf.vim b/ftplugin/dictconf.vim
index 0ac9a9f48..22f10401f 100644
--- a/ftplugin/dictconf.vim
+++ b/ftplugin/dictconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/dictconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictconf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/dictdconf.vim b/ftplugin/dictdconf.vim
index df6226c3b..8f229104c 100644
--- a/ftplugin/dictdconf.vim
+++ b/ftplugin/dictdconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/dictdconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictdconf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/diff.vim b/ftplugin/diff.vim
index 8b7d05514..226956ca4 100644
--- a/ftplugin/diff.vim
+++ b/ftplugin/diff.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/diff.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'diff') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/dircolors.vim b/ftplugin/dircolors.vim
index 9e2ef46ae..b9b2549e8 100644
--- a/ftplugin/dircolors.vim
+++ b/ftplugin/dircolors.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/dircolors.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dircolors') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/docker-compose.vim b/ftplugin/docker-compose.vim
index e80041e25..8e5c4fd3c 100644
--- a/ftplugin/docker-compose.vim
+++ b/ftplugin/docker-compose.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/docker-compose.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'docker-compose') == -1
 
 " Define comment string
diff --git a/ftplugin/dockerfile.vim b/ftplugin/dockerfile.vim
index 3780119aa..239fd78c9 100644
--- a/ftplugin/dockerfile.vim
+++ b/ftplugin/dockerfile.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/dockerfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/dosbatch.vim b/ftplugin/dosbatch.vim
index b846f4f51..a90f06b7b 100644
--- a/ftplugin/dosbatch.vim
+++ b/ftplugin/dosbatch.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/dosbatch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosbatch') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/dosini.vim b/ftplugin/dosini.vim
index e0a2ba3dd..3e2689c08 100644
--- a/ftplugin/dosini.vim
+++ b/ftplugin/dosini.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/dosini.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosini') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/dtd.vim b/ftplugin/dtd.vim
index d2c4876e4..71e7535a1 100644
--- a/ftplugin/dtd.vim
+++ b/ftplugin/dtd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/dtd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dtd') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/dune.vim b/ftplugin/dune.vim
index cce58e5e8..6a6a88e96 100644
--- a/ftplugin/dune.vim
+++ b/ftplugin/dune.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/dune.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 if exists("b:did_ftplugin")
diff --git a/ftplugin/ecrystal.vim b/ftplugin/ecrystal.vim
index 58ccde5a9..0aa94254b 100644
--- a/ftplugin/ecrystal.vim
+++ b/ftplugin/ecrystal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ecrystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " Filetype plugin for https://crystal-lang.org/api/0.35.1/ECR.html
diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index ab8174a9b..06b74eec4 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/eelixir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists("b:did_ftplugin")
diff --git a/ftplugin/elinks.vim b/ftplugin/elinks.vim
index 8e2611dc6..57150b99a 100644
--- a/ftplugin/elinks.vim
+++ b/ftplugin/elinks.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/elinks.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elinks') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index e6e0cafab..2889a446d 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/elixir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists('b:did_ftplugin')
diff --git a/ftplugin/embeddedpuppet.vim b/ftplugin/embeddedpuppet.vim
index 50a69ea82..0a3ccf6f4 100644
--- a/ftplugin/embeddedpuppet.vim
+++ b/ftplugin/embeddedpuppet.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/embeddedpuppet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/ember-script.vim b/ftplugin/ember-script.vim
index 18a0481bb..a1436b7b8 100644
--- a/ftplugin/ember-script.vim
+++ b/ftplugin/ember-script.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ember-script.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
 
 " Language:    ember-script
diff --git a/ftplugin/emblem.vim b/ftplugin/emblem.vim
index 54bdc07e9..7ddba5c20 100644
--- a/ftplugin/emblem.vim
+++ b/ftplugin/emblem.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/emblem.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 
 " Language:    emblem
diff --git a/ftplugin/eruby.vim b/ftplugin/eruby.vim
index 342283b0f..cd3e8be1f 100644
--- a/ftplugin/eruby.vim
+++ b/ftplugin/eruby.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/eruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/eterm.vim b/ftplugin/eterm.vim
index 3211c867c..33fa42f6c 100644
--- a/ftplugin/eterm.vim
+++ b/ftplugin/eterm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/eterm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'eterm') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/falcon.vim b/ftplugin/falcon.vim
index defc4cbe6..c1095b58f 100644
--- a/ftplugin/falcon.vim
+++ b/ftplugin/falcon.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/falcon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'falcon') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/fennel.vim b/ftplugin/fennel.vim
index 1fba74f1f..3dc46a7b8 100644
--- a/ftplugin/fennel.vim
+++ b/ftplugin/fennel.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/fennel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fennel') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/fetchmail.vim b/ftplugin/fetchmail.vim
index 2001caad1..a9d2abc96 100644
--- a/ftplugin/fetchmail.vim
+++ b/ftplugin/fetchmail.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/fetchmail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fetchmail') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
index 393b84e4a..85bae2dc1 100644
--- a/ftplugin/fish.vim
+++ b/ftplugin/fish.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/fish.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 
 setlocal comments=:#
diff --git a/ftplugin/fortran.vim b/ftplugin/fortran.vim
index efbc28846..ca1e4ab49 100644
--- a/ftplugin/fortran.vim
+++ b/ftplugin/fortran.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/fortran.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
 
 " Vim settings file
diff --git a/ftplugin/framescript.vim b/ftplugin/framescript.vim
index aa56a7b72..48dd0d667 100644
--- a/ftplugin/framescript.vim
+++ b/ftplugin/framescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/framescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'framescript') == -1
 
 " Vim ftplugin file
diff --git a/ftplugin/fvwm.vim b/ftplugin/fvwm.vim
index 76ba91962..ad662455d 100644
--- a/ftplugin/fvwm.vim
+++ b/ftplugin/fvwm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/fvwm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fvwm') == -1
 
 " Created	: Tue 09 May 2006 02:07:31 PM CDT
diff --git a/ftplugin/gdb.vim b/ftplugin/gdb.vim
index abfa32088..49606b747 100644
--- a/ftplugin/gdb.vim
+++ b/ftplugin/gdb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/gdb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdb') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/git.vim b/ftplugin/git.vim
index 0137f594e..b5401255c 100644
--- a/ftplugin/git.vim
+++ b/ftplugin/git.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/git.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim
index e8810c4f7..a770f9114 100644
--- a/ftplugin/gitcommit.vim
+++ b/ftplugin/gitcommit.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/gitcommit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/gitconfig.vim b/ftplugin/gitconfig.vim
index 2cb8d97fd..7d3336428 100644
--- a/ftplugin/gitconfig.vim
+++ b/ftplugin/gitconfig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/gitconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/gitignore.vim b/ftplugin/gitignore.vim
index d8cbadc53..09e7a5edb 100644
--- a/ftplugin/gitignore.vim
+++ b/ftplugin/gitignore.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/gitignore.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
 
 scriptencoding utf-8
diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim
index 27213988e..c471e5052 100644
--- a/ftplugin/gitrebase.vim
+++ b/ftplugin/gitrebase.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/gitrebase.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/gitsendemail.vim b/ftplugin/gitsendemail.vim
index e13b3ca97..38fe9a94a 100644
--- a/ftplugin/gitsendemail.vim
+++ b/ftplugin/gitsendemail.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/gitsendemail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/gpg.vim b/ftplugin/gpg.vim
index d75199241..bcac352de 100644
--- a/ftplugin/gpg.vim
+++ b/ftplugin/gpg.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/gpg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gpg') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim
index 524be44ce..5a4aabb54 100644
--- a/ftplugin/graphql.vim
+++ b/ftplugin/graphql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/graphql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
diff --git a/ftplugin/groovy.vim b/ftplugin/groovy.vim
index ad78164c2..5ad1d552d 100644
--- a/ftplugin/groovy.vim
+++ b/ftplugin/groovy.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/groovy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/group.vim b/ftplugin/group.vim
index 5f0b4d908..82a90570f 100644
--- a/ftplugin/group.vim
+++ b/ftplugin/group.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/group.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'group') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/grub.vim b/ftplugin/grub.vim
index 03df37299..2e91a3111 100644
--- a/ftplugin/grub.vim
+++ b/ftplugin/grub.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/grub.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'grub') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/haml.vim b/ftplugin/haml.vim
index ca5655ecd..c5b216e58 100644
--- a/ftplugin/haml.vim
+++ b/ftplugin/haml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/haml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/hamster.vim b/ftplugin/hamster.vim
index ad5fe0d35..c89527b62 100644
--- a/ftplugin/hamster.vim
+++ b/ftplugin/hamster.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/hamster.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hamster') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/handlebars.vim b/ftplugin/handlebars.vim
index 649984aaa..ef56d4c14 100644
--- a/ftplugin/handlebars.vim
+++ b/ftplugin/handlebars.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/handlebars.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 if exists('b:loaded_mustache_handlebars')
diff --git a/ftplugin/hcl.vim b/ftplugin/hcl.vim
index c4b44e245..f7e9a57a6 100644
--- a/ftplugin/hcl.vim
+++ b/ftplugin/hcl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/hcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hcl') == -1
 
 " File: ftplugin/hcl.vim
diff --git a/ftplugin/help.vim b/ftplugin/help.vim
index bb6d43e82..92fc165c9 100644
--- a/ftplugin/help.vim
+++ b/ftplugin/help.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/help.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'help') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/hgcommit.vim b/ftplugin/hgcommit.vim
index 16c927967..6c4493218 100644
--- a/ftplugin/hgcommit.vim
+++ b/ftplugin/hgcommit.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/hgcommit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hgcommit') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/hive.vim b/ftplugin/hive.vim
index dc9506242..a95a17ad7 100644
--- a/ftplugin/hive.vim
+++ b/ftplugin/hive.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/hive.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hive') == -1
 
 setlocal comments=:--
diff --git a/ftplugin/hog.vim b/ftplugin/hog.vim
index b0541a398..bd0ef9ffd 100644
--- a/ftplugin/hog.vim
+++ b/ftplugin/hog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/hog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hog') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/hostconf.vim b/ftplugin/hostconf.vim
index a6a9a840b..72b955bdf 100644
--- a/ftplugin/hostconf.vim
+++ b/ftplugin/hostconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/hostconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hostconf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/hostsaccess.vim b/ftplugin/hostsaccess.vim
index 36a67e90c..72434da31 100644
--- a/ftplugin/hostsaccess.vim
+++ b/ftplugin/hostsaccess.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/hostsaccess.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hostsaccess') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index d65502beb..f78f9d77f 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/html.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/htmldjango.vim b/ftplugin/htmldjango.vim
index 55489c0fa..92ca3fe4e 100644
--- a/ftplugin/htmldjango.vim
+++ b/ftplugin/htmldjango.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/htmldjango.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/i3config.vim b/ftplugin/i3config.vim
index dbb95e335..628d01ced 100644
--- a/ftplugin/i3config.vim
+++ b/ftplugin/i3config.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/i3config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'i3') == -1
 
 setlocal commentstring=#\ %s
diff --git a/ftplugin/idris.vim b/ftplugin/idris.vim
index ae46bedd6..454591a5c 100644
--- a/ftplugin/idris.vim
+++ b/ftplugin/idris.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/idris.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 
 if bufname('%') == "idris-response"
diff --git a/ftplugin/idris2.vim b/ftplugin/idris2.vim
index 420bc52d2..7e39f23ea 100644
--- a/ftplugin/idris2.vim
+++ b/ftplugin/idris2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/idris2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
 
 if bufname('%') == "idris-response"
diff --git a/ftplugin/indent.vim b/ftplugin/indent.vim
index c4c1ab4a4..f426b9b3d 100644
--- a/ftplugin/indent.vim
+++ b/ftplugin/indent.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'indent') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/ion.vim b/ftplugin/ion.vim
index 88bb5238f..c6cfd8a55 100644
--- a/ftplugin/ion.vim
+++ b/ftplugin/ion.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ion.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ion') == -1
 
 
diff --git a/ftplugin/j.vim b/ftplugin/j.vim
index 0d8ef152b..9dd87d9da 100644
--- a/ftplugin/j.vim
+++ b/ftplugin/j.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/j.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'j') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
index e41d53e0c..97a4af13f 100644
--- a/ftplugin/java.vim
+++ b/ftplugin/java.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/java.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'java') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/jproperties.vim b/ftplugin/jproperties.vim
index a9cf4e624..f9c282c1b 100644
--- a/ftplugin/jproperties.vim
+++ b/ftplugin/jproperties.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/jproperties.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jproperties') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/jq.vim b/ftplugin/jq.vim
index 0e7a3a542..2fd91c555 100644
--- a/ftplugin/jq.vim
+++ b/ftplugin/jq.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/jq.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jq') == -1
 
 setlocal commentstring=#%s
diff --git a/ftplugin/json.vim b/ftplugin/json.vim
index 2d51fbd78..682f24e95 100644
--- a/ftplugin/json.vim
+++ b/ftplugin/json.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/json.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 
 " Vim syntax file
diff --git a/ftplugin/jsonnet.vim b/ftplugin/jsonnet.vim
index 41fa83ffb..b18fb7d47 100644
--- a/ftplugin/jsonnet.vim
+++ b/ftplugin/jsonnet.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/jsonnet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsonnet') == -1
 
 
diff --git a/ftplugin/jsp.vim b/ftplugin/jsp.vim
index 091e359a8..c5eb1ae7f 100644
--- a/ftplugin/jsp.vim
+++ b/ftplugin/jsp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/jsp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsp') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index 554f91511..96aaca5b3 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/julia.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/juliadoc.vim b/ftplugin/juliadoc.vim
index 2d9e21680..66c7f5568 100644
--- a/ftplugin/juliadoc.vim
+++ b/ftplugin/juliadoc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/juliadoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/kconfig.vim b/ftplugin/kconfig.vim
index b106b3d9f..f25135f43 100644
--- a/ftplugin/kconfig.vim
+++ b/ftplugin/kconfig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/kconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kconfig') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/kotlin.vim b/ftplugin/kotlin.vim
index f9cc43032..9c85505fd 100644
--- a/ftplugin/kotlin.vim
+++ b/ftplugin/kotlin.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/kotlin.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
 
 if exists('b:did_ftplugin') | finish | endif
diff --git a/ftplugin/kwt.vim b/ftplugin/kwt.vim
index 5bc89215e..152b8903a 100644
--- a/ftplugin/kwt.vim
+++ b/ftplugin/kwt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/kwt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kwt') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/ld.vim b/ftplugin/ld.vim
index bd9723f4f..3a6d6647b 100644
--- a/ftplugin/ld.vim
+++ b/ftplugin/ld.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ld.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ld') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/less.vim b/ftplugin/less.vim
index 2a8ff1724..eb9d5b842 100644
--- a/ftplugin/less.vim
+++ b/ftplugin/less.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/less.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/lftp.vim b/ftplugin/lftp.vim
index f9e0be864..a3ee81a88 100644
--- a/ftplugin/lftp.vim
+++ b/ftplugin/lftp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/lftp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lftp') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/libao.vim b/ftplugin/libao.vim
index d6d6e660a..cf3469a5a 100644
--- a/ftplugin/libao.vim
+++ b/ftplugin/libao.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/libao.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'libao') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/lilypond.vim b/ftplugin/lilypond.vim
index 9debb5320..f8462fa31 100644
--- a/ftplugin/lilypond.vim
+++ b/ftplugin/lilypond.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/lilypond.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 
 " LilyPond filetype plugin
diff --git a/ftplugin/limits.vim b/ftplugin/limits.vim
index 873f93415..6dec8a527 100644
--- a/ftplugin/limits.vim
+++ b/ftplugin/limits.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/limits.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'limits') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/liquid.vim b/ftplugin/liquid.vim
index 5ffbade6b..c7e42872f 100644
--- a/ftplugin/liquid.vim
+++ b/ftplugin/liquid.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/liquid.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/lisp.vim b/ftplugin/lisp.vim
index eaae27950..8de27ece0 100644
--- a/ftplugin/lisp.vim
+++ b/ftplugin/lisp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/lisp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lisp') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/litcoffee.vim b/ftplugin/litcoffee.vim
index 31284a8dc..f0c84c70a 100644
--- a/ftplugin/litcoffee.vim
+++ b/ftplugin/litcoffee.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/litcoffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 runtime ftplugin/coffee.vim
diff --git a/ftplugin/llvm.vim b/ftplugin/llvm.vim
index a7b93e7b9..109dbb515 100644
--- a/ftplugin/llvm.vim
+++ b/ftplugin/llvm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/llvm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/logcheck.vim b/ftplugin/logcheck.vim
index 1c1d85109..1dbcf551c 100644
--- a/ftplugin/logcheck.vim
+++ b/ftplugin/logcheck.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/logcheck.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logcheck') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/loginaccess.vim b/ftplugin/loginaccess.vim
index e19e9d8dd..c2850aedf 100644
--- a/ftplugin/loginaccess.vim
+++ b/ftplugin/loginaccess.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/loginaccess.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'loginaccess') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/logindefs.vim b/ftplugin/logindefs.vim
index be22441f4..c917bfb69 100644
--- a/ftplugin/logindefs.vim
+++ b/ftplugin/logindefs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/logindefs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logindefs') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/logtalk.vim b/ftplugin/logtalk.vim
index 2b79723fb..6310b4c41 100644
--- a/ftplugin/logtalk.vim
+++ b/ftplugin/logtalk.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/logtalk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logtalk') == -1
 
 " Logtalk filetype plugin file
diff --git a/ftplugin/lprolog.vim b/ftplugin/lprolog.vim
index 8f4654608..edf3c23ed 100644
--- a/ftplugin/lprolog.vim
+++ b/ftplugin/lprolog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/lprolog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lprolog') == -1
 
 " Vim settings file
diff --git a/ftplugin/ls.vim b/ftplugin/ls.vim
index 5f9af33dd..87eee4ba1 100644
--- a/ftplugin/ls.vim
+++ b/ftplugin/ls.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ls.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 
 " Language:    LiveScript
diff --git a/ftplugin/m4.vim b/ftplugin/m4.vim
index 16479d431..12c53b2f9 100644
--- a/ftplugin/m4.vim
+++ b/ftplugin/m4.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/m4.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'm4') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/mail.vim b/ftplugin/mail.vim
index b3d7f5b9e..567bb6f03 100644
--- a/ftplugin/mail.vim
+++ b/ftplugin/mail.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/mail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mail') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/mailaliases.vim b/ftplugin/mailaliases.vim
index ac7466cca..9ac29c76c 100644
--- a/ftplugin/mailaliases.vim
+++ b/ftplugin/mailaliases.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/mailaliases.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mailaliases') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/mailcap.vim b/ftplugin/mailcap.vim
index fca0215b8..5da2d9570 100644
--- a/ftplugin/mailcap.vim
+++ b/ftplugin/mailcap.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/mailcap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mailcap') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/make.vim b/ftplugin/make.vim
index 18d69dc8c..635c81264 100644
--- a/ftplugin/make.vim
+++ b/ftplugin/make.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/make.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'make') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/mako.vim b/ftplugin/mako.vim
index 6d63492b1..a25fedf24 100644
--- a/ftplugin/mako.vim
+++ b/ftplugin/mako.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/mako.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/manconf.vim b/ftplugin/manconf.vim
index cfe01594c..255f4f322 100644
--- a/ftplugin/manconf.vim
+++ b/ftplugin/manconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/manconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'manconf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index 53e948720..2936ac00e 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/markdown.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
 
 "TODO print messages when on visual mode. I only see VISUAL, not the messages.
diff --git a/ftplugin/meson.vim b/ftplugin/meson.vim
index a187d100f..eb3105b52 100644
--- a/ftplugin/meson.vim
+++ b/ftplugin/meson.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/meson.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/mf.vim b/ftplugin/mf.vim
index 1a005d662..4f63dc03e 100644
--- a/ftplugin/mf.vim
+++ b/ftplugin/mf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/mf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/mma.vim b/ftplugin/mma.vim
index 4a2581ebd..b22ce1c9e 100644
--- a/ftplugin/mma.vim
+++ b/ftplugin/mma.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/mma.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
 
 "Vim filetype plugin
diff --git a/ftplugin/modconf.vim b/ftplugin/modconf.vim
index 07ea16692..bf73a0cc3 100644
--- a/ftplugin/modconf.vim
+++ b/ftplugin/modconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/modconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'modconf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/moon.vim b/ftplugin/moon.vim
index a4eca9a5f..09e9c7bc1 100644
--- a/ftplugin/moon.vim
+++ b/ftplugin/moon.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/moon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
 
 " Language:    MoonScript
diff --git a/ftplugin/mp.vim b/ftplugin/mp.vim
index a13f5cff3..2cf65bb19 100644
--- a/ftplugin/mp.vim
+++ b/ftplugin/mp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/mp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mp') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/mplayerconf.vim b/ftplugin/mplayerconf.vim
index b3587bdcf..a251ebf2f 100644
--- a/ftplugin/mplayerconf.vim
+++ b/ftplugin/mplayerconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/mplayerconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mplayerconf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/mrxvtrc.vim b/ftplugin/mrxvtrc.vim
index bf73b0e4c..bfe04c1cd 100644
--- a/ftplugin/mrxvtrc.vim
+++ b/ftplugin/mrxvtrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/mrxvtrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mrxvtrc') == -1
 
 " Created	: Wed 26 Apr 2006 01:20:53 AM CDT
diff --git a/ftplugin/mustache.vim b/ftplugin/mustache.vim
index 7ca19b76b..349ec2368 100644
--- a/ftplugin/mustache.vim
+++ b/ftplugin/mustache.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/mustache.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 runtime! ftplugin/handlebars*.vim ftplugin/handlebars/*.vim
diff --git a/ftplugin/muttrc.vim b/ftplugin/muttrc.vim
index 1d77a63f7..ebe868069 100644
--- a/ftplugin/muttrc.vim
+++ b/ftplugin/muttrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/muttrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'muttrc') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/nanorc.vim b/ftplugin/nanorc.vim
index a116e3181..1363191c6 100644
--- a/ftplugin/nanorc.vim
+++ b/ftplugin/nanorc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/nanorc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nanorc') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/neomuttrc.vim b/ftplugin/neomuttrc.vim
index 660931d0e..a63769cb5 100644
--- a/ftplugin/neomuttrc.vim
+++ b/ftplugin/neomuttrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/neomuttrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'neomuttrc') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/netrc.vim b/ftplugin/netrc.vim
index 75f5ff7f9..071362e48 100644
--- a/ftplugin/netrc.vim
+++ b/ftplugin/netrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/netrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'netrc') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/nginx.vim b/ftplugin/nginx.vim
index 1ae408490..13a50b2a7 100644
--- a/ftplugin/nginx.vim
+++ b/ftplugin/nginx.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/nginx.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
 
 setlocal commentstring=#\ %s
diff --git a/ftplugin/nix.vim b/ftplugin/nix.vim
index c3e745a9d..7863be6d6 100644
--- a/ftplugin/nix.vim
+++ b/ftplugin/nix.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/nix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/nroff.vim b/ftplugin/nroff.vim
index 2d040e3a4..091fb018c 100644
--- a/ftplugin/nroff.vim
+++ b/ftplugin/nroff.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/nroff.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nroff') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/nsis.vim b/ftplugin/nsis.vim
index 8820f0664..edbe91920 100644
--- a/ftplugin/nsis.vim
+++ b/ftplugin/nsis.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/nsis.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nsis') == -1
 
 " Vim ftplugin file
diff --git a/ftplugin/oasis.vim b/ftplugin/oasis.vim
index 850889ebd..0b2150d5c 100644
--- a/ftplugin/oasis.vim
+++ b/ftplugin/oasis.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/oasis.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 
diff --git a/ftplugin/objc.vim b/ftplugin/objc.vim
index ed76e4bd9..909a14424 100644
--- a/ftplugin/objc.vim
+++ b/ftplugin/objc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/objc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
 
 " Use C++ style comment strings with commentary.vim
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index 87ad6fa6f..1c92e7d9e 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ocaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Language:    OCaml
diff --git a/ftplugin/ocamlbuild_tags.vim b/ftplugin/ocamlbuild_tags.vim
index 850889ebd..373ee28fa 100644
--- a/ftplugin/ocamlbuild_tags.vim
+++ b/ftplugin/ocamlbuild_tags.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ocamlbuild_tags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 
diff --git a/ftplugin/occam.vim b/ftplugin/occam.vim
index c428c13b9..e5bf6b854 100644
--- a/ftplugin/occam.vim
+++ b/ftplugin/occam.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/occam.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'occam') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/omake.vim b/ftplugin/omake.vim
index 656cc6a93..c78d15d02 100644
--- a/ftplugin/omake.vim
+++ b/ftplugin/omake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/omake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/opencl.vim b/ftplugin/opencl.vim
index c9fa5673a..39416e67b 100644
--- a/ftplugin/opencl.vim
+++ b/ftplugin/opencl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/opencl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
 
 if exists("b:did_ftplugin") | finish | endif
diff --git a/ftplugin/pamconf.vim b/ftplugin/pamconf.vim
index e8925de49..7628224b3 100644
--- a/ftplugin/pamconf.vim
+++ b/ftplugin/pamconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/pamconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pamconf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/pascal.vim b/ftplugin/pascal.vim
index f026da082..f33a19460 100644
--- a/ftplugin/pascal.vim
+++ b/ftplugin/pascal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/pascal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pascal') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/passwd.vim b/ftplugin/passwd.vim
index d13758720..2e3ff2203 100644
--- a/ftplugin/passwd.vim
+++ b/ftplugin/passwd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/passwd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'passwd') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/pdf.vim b/ftplugin/pdf.vim
index 12dbc6038..d2acbeafa 100644
--- a/ftplugin/pdf.vim
+++ b/ftplugin/pdf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/pdf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pdf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/perl.vim b/ftplugin/perl.vim
index b0eaf1ba8..e95319cce 100644
--- a/ftplugin/perl.vim
+++ b/ftplugin/perl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/perl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/pinfo.vim b/ftplugin/pinfo.vim
index 1fbcab16f..d76a1fedd 100644
--- a/ftplugin/pinfo.vim
+++ b/ftplugin/pinfo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/pinfo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pinfo') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/plantuml.vim b/ftplugin/plantuml.vim
index 9db919de2..acfd5e03c 100644
--- a/ftplugin/plantuml.vim
+++ b/ftplugin/plantuml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/plantuml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
 
 scriptencoding utf-8
diff --git a/ftplugin/pony.vim b/ftplugin/pony.vim
index df726643d..bf1311f85 100644
--- a/ftplugin/pony.vim
+++ b/ftplugin/pony.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/pony.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/postscr.vim b/ftplugin/postscr.vim
index 7730cdc87..5539b765a 100644
--- a/ftplugin/postscr.vim
+++ b/ftplugin/postscr.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/postscr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'postscr') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/procmail.vim b/ftplugin/procmail.vim
index 7bc335d75..381269946 100644
--- a/ftplugin/procmail.vim
+++ b/ftplugin/procmail.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/procmail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'procmail') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/prolog.vim b/ftplugin/prolog.vim
index bd813dcec..1b92ed90a 100644
--- a/ftplugin/prolog.vim
+++ b/ftplugin/prolog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/prolog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/protocols.vim b/ftplugin/protocols.vim
index 293bc6c27..fa268d397 100644
--- a/ftplugin/protocols.vim
+++ b/ftplugin/protocols.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/protocols.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protocols') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/ps1.vim b/ftplugin/ps1.vim
index f14a31ebb..5d1622c82 100644
--- a/ftplugin/ps1.vim
+++ b/ftplugin/ps1.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ps1.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/ps1xml.vim b/ftplugin/ps1xml.vim
index a0233fd83..a859e919b 100644
--- a/ftplugin/ps1xml.vim
+++ b/ftplugin/ps1xml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ps1xml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/pug.vim b/ftplugin/pug.vim
index 1bd08b398..7b58b2ed2 100644
--- a/ftplugin/pug.vim
+++ b/ftplugin/pug.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/pug.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index 532479582..0b9bd72d5 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/puppet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/puppet_tagbar.vim b/ftplugin/puppet_tagbar.vim
index 36772da7d..68240b516 100644
--- a/ftplugin/puppet_tagbar.vim
+++ b/ftplugin/puppet_tagbar.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/puppet_tagbar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Puppet set up for Tagbar plugin
diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim
index dba11b3b5..96be330b5 100644
--- a/ftplugin/purescript.vim
+++ b/ftplugin/purescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/purescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--\ \|,:--
diff --git a/ftplugin/pyrex.vim b/ftplugin/pyrex.vim
index 62b8e2ae7..02b106841 100644
--- a/ftplugin/pyrex.vim
+++ b/ftplugin/pyrex.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/pyrex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pyrex') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/qml.vim b/ftplugin/qml.vim
index f4a96fa66..e61e983c4 100644
--- a/ftplugin/qml.vim
+++ b/ftplugin/qml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/qml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/quake.vim b/ftplugin/quake.vim
index bab3eca14..44e8f4f31 100644
--- a/ftplugin/quake.vim
+++ b/ftplugin/quake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/quake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'quake') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/racket.vim b/ftplugin/racket.vim
index 1a3ba1899..caf377cd5 100644
--- a/ftplugin/racket.vim
+++ b/ftplugin/racket.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/racket.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
 
 " Language:     Racket
diff --git a/ftplugin/raku.vim b/ftplugin/raku.vim
index dee6197e5..c16c536e6 100644
--- a/ftplugin/raku.vim
+++ b/ftplugin/raku.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/raku.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raku') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/raml.vim b/ftplugin/raml.vim
index b7cef80e7..7c83588ee 100644
--- a/ftplugin/raml.vim
+++ b/ftplugin/raml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/raml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
 
 set ts=2 sts=2 sw=2 et
diff --git a/ftplugin/razor.vim b/ftplugin/razor.vim
index 2d516bfc6..8e6c86a59 100644
--- a/ftplugin/razor.vim
+++ b/ftplugin/razor.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/razor.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'razor') == -1
 
 if exists("b:did_ftplugin")
diff --git a/ftplugin/readline.vim b/ftplugin/readline.vim
index 042f4b6bb..afb4d3a87 100644
--- a/ftplugin/readline.vim
+++ b/ftplugin/readline.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/readline.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'readline') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/reva.vim b/ftplugin/reva.vim
index 5fe5f59f1..52665d598 100644
--- a/ftplugin/reva.vim
+++ b/ftplugin/reva.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/reva.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reva') == -1
 
 " Vim ftplugin file
diff --git a/ftplugin/rmd.vim b/ftplugin/rmd.vim
index 32fcc9618..e62efad6b 100644
--- a/ftplugin/rmd.vim
+++ b/ftplugin/rmd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/rmd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rmd') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/rnc.vim b/ftplugin/rnc.vim
index 78f30817e..0ede84a33 100644
--- a/ftplugin/rnc.vim
+++ b/ftplugin/rnc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/rnc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnc') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/rnoweb.vim b/ftplugin/rnoweb.vim
index 1253c4511..c04a9dc24 100644
--- a/ftplugin/rnoweb.vim
+++ b/ftplugin/rnoweb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/rnoweb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnoweb') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/rpl.vim b/ftplugin/rpl.vim
index bfefa15a6..011bd9451 100644
--- a/ftplugin/rpl.vim
+++ b/ftplugin/rpl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/rpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/rrst.vim b/ftplugin/rrst.vim
index 7ddc0fc77..95945a637 100644
--- a/ftplugin/rrst.vim
+++ b/ftplugin/rrst.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/rrst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rrst') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index 5265edcf3..d1d71c29e 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/rst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 
 " reStructuredText filetype plugin file
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index edca30ddc..c20a08b26 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/ruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim
index 211f86b0c..408a9199c 100644
--- a/ftplugin/rust.vim
+++ b/ftplugin/rust.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/rust.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Language:     Rust
diff --git a/ftplugin/rust/tagbar.vim b/ftplugin/rust/tagbar.vim
index 9533a6825..875b766a9 100644
--- a/ftplugin/rust/tagbar.vim
+++ b/ftplugin/rust/tagbar.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/rust/tagbar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 "
diff --git a/ftplugin/sass.vim b/ftplugin/sass.vim
index d13a9e185..a5b66a835 100644
--- a/ftplugin/sass.vim
+++ b/ftplugin/sass.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/sass.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/sbt.vim b/ftplugin/sbt.vim
index 13601c872..017f63ab0 100644
--- a/ftplugin/sbt.vim
+++ b/ftplugin/sbt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/sbt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sbt') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index dafda59f2..0d569e107 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/scala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/scala.xpt.vim b/ftplugin/scala.xpt.vim
index 1bab04f04..b49230a18 100644
--- a/ftplugin/scala.xpt.vim
+++ b/ftplugin/scala.xpt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/scala.xpt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 
diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index e2f416d95..a60bf2351 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/scala/tagbar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 "
diff --git a/ftplugin/scheme.vim b/ftplugin/scheme.vim
index e79efe7e6..6b791eecf 100644
--- a/ftplugin/scheme.vim
+++ b/ftplugin/scheme.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/scheme.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scheme') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/screen.vim b/ftplugin/screen.vim
index ecd1f5acc..83e5f7e34 100644
--- a/ftplugin/screen.vim
+++ b/ftplugin/screen.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/screen.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'screen') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim
index e134f2987..55db812ad 100644
--- a/ftplugin/scss.vim
+++ b/ftplugin/scss.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/scss.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
 
 if exists('b:did_indent') && b:did_indent
diff --git a/ftplugin/sensors.vim b/ftplugin/sensors.vim
index bdf1ea91a..cc91a810d 100644
--- a/ftplugin/sensors.vim
+++ b/ftplugin/sensors.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/sensors.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensors') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/services.vim b/ftplugin/services.vim
index c676b8a77..2c0f414ad 100644
--- a/ftplugin/services.vim
+++ b/ftplugin/services.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/services.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'services') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/setserial.vim b/ftplugin/setserial.vim
index 270f2e0fa..50560bfec 100644
--- a/ftplugin/setserial.vim
+++ b/ftplugin/setserial.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/setserial.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'setserial') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/sexplib.vim b/ftplugin/sexplib.vim
index 5726deee0..8b4029e23 100644
--- a/ftplugin/sexplib.vim
+++ b/ftplugin/sexplib.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/sexplib.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Language:    Sexplib
diff --git a/ftplugin/sieve.vim b/ftplugin/sieve.vim
index e14eadf46..b5d363923 100644
--- a/ftplugin/sieve.vim
+++ b/ftplugin/sieve.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/sieve.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sieve') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/slim.vim b/ftplugin/slim.vim
index 9051e4545..e15389d98 100644
--- a/ftplugin/slim.vim
+++ b/ftplugin/slim.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/slim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
 
 if exists("b:did_ftplugin")
diff --git a/ftplugin/slpconf.vim b/ftplugin/slpconf.vim
index c03df0c1e..1140f20bd 100644
--- a/ftplugin/slpconf.vim
+++ b/ftplugin/slpconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/slpconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpconf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/slpreg.vim b/ftplugin/slpreg.vim
index 5e6bcfebc..ca09dfb58 100644
--- a/ftplugin/slpreg.vim
+++ b/ftplugin/slpreg.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/slpreg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpreg') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/slpspi.vim b/ftplugin/slpspi.vim
index 1e253e1f9..ef4722c94 100644
--- a/ftplugin/slpspi.vim
+++ b/ftplugin/slpspi.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/slpspi.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpspi') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/smt2.vim b/ftplugin/smt2.vim
index b9d01baf0..b39fe64d4 100644
--- a/ftplugin/smt2.vim
+++ b/ftplugin/smt2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/smt2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smt2') == -1
 
 setlocal iskeyword+=-,:,#,',$
diff --git a/ftplugin/solidity.vim b/ftplugin/solidity.vim
index decf041dc..853c53d2d 100644
--- a/ftplugin/solidity.vim
+++ b/ftplugin/solidity.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/solidity.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
 
 setlocal commentstring=//\ %s
diff --git a/ftplugin/spec.vim b/ftplugin/spec.vim
index cf93a223c..900b0e49e 100644
--- a/ftplugin/spec.vim
+++ b/ftplugin/spec.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/spec.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spec') == -1
 
 " Plugin to update the %changelog section of RPM spec files
diff --git a/ftplugin/sql.vim b/ftplugin/sql.vim
index 41e1d2bf4..befd023b4 100644
--- a/ftplugin/sql.vim
+++ b/ftplugin/sql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/sql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
 
 " SQL filetype plugin file
diff --git a/ftplugin/sshconfig.vim b/ftplugin/sshconfig.vim
index 3233a591a..9519f30b6 100644
--- a/ftplugin/sshconfig.vim
+++ b/ftplugin/sshconfig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/sshconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshconfig') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/stylus.vim b/ftplugin/stylus.vim
index 66ed8c6a4..c39decc3c 100644
--- a/ftplugin/stylus.vim
+++ b/ftplugin/stylus.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/stylus.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/sudoers.vim b/ftplugin/sudoers.vim
index 61a5f708d..26ce58364 100644
--- a/ftplugin/sudoers.vim
+++ b/ftplugin/sudoers.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/sudoers.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sudoers') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/svelte.vim b/ftplugin/svelte.vim
index 3c3df23a1..d8bd58d5f 100644
--- a/ftplugin/svelte.vim
+++ b/ftplugin/svelte.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/svelte.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svelte') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/swift.vim b/ftplugin/swift.vim
index 78394bc53..d1e1de898 100644
--- a/ftplugin/swift.vim
+++ b/ftplugin/swift.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/swift.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 
 setlocal commentstring=//\ %s
diff --git a/ftplugin/swiftgyb.vim b/ftplugin/swiftgyb.vim
index a8f2ebcf0..0870048ba 100644
--- a/ftplugin/swiftgyb.vim
+++ b/ftplugin/swiftgyb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/swiftgyb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swiftgyb') == -1
 
 " This source file is part of the Swift.org open source project
diff --git a/ftplugin/sysctl.vim b/ftplugin/sysctl.vim
index 7288f0207..d8dca8590 100644
--- a/ftplugin/sysctl.vim
+++ b/ftplugin/sysctl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/sysctl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sysctl') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/systemd.vim b/ftplugin/systemd.vim
index 6e757d91b..ee05ed2a5 100644
--- a/ftplugin/systemd.vim
+++ b/ftplugin/systemd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/systemd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemd') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/systemverilog.vim b/ftplugin/systemverilog.vim
index 49502bfab..6b088c6cf 100644
--- a/ftplugin/systemverilog.vim
+++ b/ftplugin/systemverilog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/systemverilog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemverilog') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/tablegen.vim b/ftplugin/tablegen.vim
index 9e895afcb..04b8c4e60 100644
--- a/ftplugin/tablegen.vim
+++ b/ftplugin/tablegen.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/tablegen.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/tcl.vim b/ftplugin/tcl.vim
index d9bd25c26..c2dfd0354 100644
--- a/ftplugin/tcl.vim
+++ b/ftplugin/tcl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/tcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/terminfo.vim b/ftplugin/terminfo.vim
index 6466f3c6e..ab948691a 100644
--- a/ftplugin/terminfo.vim
+++ b/ftplugin/terminfo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/terminfo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terminfo') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index 3786648f6..8edc509d0 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/terraform.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 
 " terraform.vim - basic vim/terraform integration
diff --git a/ftplugin/tex.vim b/ftplugin/tex.vim
index 4890dba3a..b2ab45609 100644
--- a/ftplugin/tex.vim
+++ b/ftplugin/tex.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/tex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
 
 " LaTeX filetype plugin
diff --git a/ftplugin/text.vim b/ftplugin/text.vim
index 8dcebd6db..7c13d82f1 100644
--- a/ftplugin/text.vim
+++ b/ftplugin/text.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/text.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'text') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/textile.vim b/ftplugin/textile.vim
index 829e80d09..d260e848d 100644
--- a/ftplugin/textile.vim
+++ b/ftplugin/textile.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/textile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'textile') == -1
 
 " textile.vim
diff --git a/ftplugin/tmux.vim b/ftplugin/tmux.vim
index 4b830a6b8..4965032b5 100644
--- a/ftplugin/tmux.vim
+++ b/ftplugin/tmux.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/tmux.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
index ad8843083..ce5a9fa19 100644
--- a/ftplugin/toml.vim
+++ b/ftplugin/toml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/toml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'toml') == -1
 
 " File: ftplugin/toml.vim
diff --git a/ftplugin/treetop.vim b/ftplugin/treetop.vim
index 59376a3b8..628bd8911 100644
--- a/ftplugin/treetop.vim
+++ b/ftplugin/treetop.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/treetop.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'treetop') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/tt2html.vim b/ftplugin/tt2html.vim
index 858dc13b7..6fb150fc8 100644
--- a/ftplugin/tt2html.vim
+++ b/ftplugin/tt2html.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/tt2html.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Language:      TT2 embedded with HTML
diff --git a/ftplugin/twig.vim b/ftplugin/twig.vim
index 9284189f2..ea10d3db9 100644
--- a/ftplugin/twig.vim
+++ b/ftplugin/twig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/twig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index 148eff9e0..b99f5d9bb 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/typescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " set Vi-incompatible, compiler and commentstring
diff --git a/ftplugin/typescriptreact.vim b/ftplugin/typescriptreact.vim
index 6b8380f77..a52ab70c9 100644
--- a/ftplugin/typescriptreact.vim
+++ b/ftplugin/typescriptreact.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/typescriptreact.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " modified from mxw/vim-jsx from html.vim
diff --git a/ftplugin/udevconf.vim b/ftplugin/udevconf.vim
index 2e706fd16..e554c90bc 100644
--- a/ftplugin/udevconf.vim
+++ b/ftplugin/udevconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/udevconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'udevconf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/udevperm.vim b/ftplugin/udevperm.vim
index 26616d829..7fde3445a 100644
--- a/ftplugin/udevperm.vim
+++ b/ftplugin/udevperm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/udevperm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'udevperm') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/updatedb.vim b/ftplugin/updatedb.vim
index 69f4c712d..7dd6476f0 100644
--- a/ftplugin/updatedb.vim
+++ b/ftplugin/updatedb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/updatedb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'updatedb') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/vala.vim b/ftplugin/vala.vim
index 00eefd1df..88f9ea7c0 100644
--- a/ftplugin/vala.vim
+++ b/ftplugin/vala.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/vala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
 
 if exists('b:did_ftplugin')
diff --git a/ftplugin/vb.vim b/ftplugin/vb.vim
index 63bf8efd0..f591072e5 100644
--- a/ftplugin/vb.vim
+++ b/ftplugin/vb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/vb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/verilog.vim b/ftplugin/verilog.vim
index dd3805251..ff1109e52 100644
--- a/ftplugin/verilog.vim
+++ b/ftplugin/verilog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/verilog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilog') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/vhdl.vim b/ftplugin/vhdl.vim
index 55490ffbc..31aded2b3 100644
--- a/ftplugin/vhdl.vim
+++ b/ftplugin/vhdl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/vhdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vhdl') == -1
 
 " VHDL filetype plugin
diff --git a/ftplugin/vlang.vim b/ftplugin/vlang.vim
index 0aafeac59..8c597249d 100644
--- a/ftplugin/vlang.vim
+++ b/ftplugin/vlang.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/vlang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'v') == -1
 
 setlocal commentstring=//\ %s
diff --git a/ftplugin/vroom.vim b/ftplugin/vroom.vim
index 0c1eee801..835f13144 100644
--- a/ftplugin/vroom.vim
+++ b/ftplugin/vroom.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/vroom.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vroom') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/vue.vim b/ftplugin/vue.vim
index fb8739c72..e5bb5e43c 100644
--- a/ftplugin/vue.vim
+++ b/ftplugin/vue.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/vue.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
 
 " Vim filetype plugin
diff --git a/ftplugin/wast.vim b/ftplugin/wast.vim
index b211e6f54..7936da974 100644
--- a/ftplugin/wast.vim
+++ b/ftplugin/wast.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/wast.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wast') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/xdefaults.vim b/ftplugin/xdefaults.vim
index d3fb6487b..83fa9f91e 100644
--- a/ftplugin/xdefaults.vim
+++ b/ftplugin/xdefaults.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/xdefaults.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xdefaults') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/xf86conf.vim b/ftplugin/xf86conf.vim
index c298379bf..839dfaac9 100644
--- a/ftplugin/xf86conf.vim
+++ b/ftplugin/xf86conf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/xf86conf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xf86conf') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/xhtml.vim b/ftplugin/xhtml.vim
index 0556d1bec..68151ffbd 100644
--- a/ftplugin/xhtml.vim
+++ b/ftplugin/xhtml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/xhtml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xhtml') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/xinetd.vim b/ftplugin/xinetd.vim
index f99a91ac4..25af06077 100644
--- a/ftplugin/xinetd.vim
+++ b/ftplugin/xinetd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/xinetd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xinetd') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/xmodmap.vim b/ftplugin/xmodmap.vim
index 16ab12ee0..e787380bb 100644
--- a/ftplugin/xmodmap.vim
+++ b/ftplugin/xmodmap.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/xmodmap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xmodmap') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/xs.vim b/ftplugin/xs.vim
index 072566515..95d8a2283 100644
--- a/ftplugin/xs.vim
+++ b/ftplugin/xs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/xs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/xsd.vim b/ftplugin/xsd.vim
index f3f94d919..f53f5bacd 100644
--- a/ftplugin/xsd.vim
+++ b/ftplugin/xsd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/xsd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/xslt.vim b/ftplugin/xslt.vim
index 2d2320ae4..76735f0a0 100644
--- a/ftplugin/xslt.vim
+++ b/ftplugin/xslt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/xslt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xslt') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim
index 261d71ca8..44f716bff 100644
--- a/ftplugin/yaml.vim
+++ b/ftplugin/yaml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/yaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 
 " Vim filetype plugin file
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index dc9af384d..50f3aecdf 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/zig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Only do this when not done yet for this buffer
diff --git a/ftplugin/zimbu.vim b/ftplugin/zimbu.vim
index fc939fde0..6af9be4f0 100644
--- a/ftplugin/zimbu.vim
+++ b/ftplugin/zimbu.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'ftplugin/zimbu.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zimbu') == -1
 
 " Vim filetype plugin file
diff --git a/indent/Jenkinsfile.vim b/indent/Jenkinsfile.vim
index 6fe4fbb44..286024798 100644
--- a/indent/Jenkinsfile.vim
+++ b/indent/Jenkinsfile.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/Jenkinsfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jenkins') == -1
 
 runtime indent/groovy.vim
diff --git a/indent/aap.vim b/indent/aap.vim
index 9e7573df8..41140acef 100644
--- a/indent/aap.vim
+++ b/indent/aap.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/aap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aap') == -1
 
 " Vim indent file
diff --git a/indent/ada.vim b/indent/ada.vim
index 77000842b..249c7afa3 100644
--- a/indent/ada.vim
+++ b/indent/ada.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/ada.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ada') == -1
 
 "------------------------------------------------------------------------------
diff --git a/indent/ansible.vim b/indent/ansible.vim
index a68128c4a..2632f8936 100644
--- a/indent/ansible.vim
+++ b/indent/ansible.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/ansible.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 let s:save_cpo = &cpo
diff --git a/indent/ant.vim b/indent/ant.vim
index 22d344db4..fc948477c 100644
--- a/indent/ant.vim
+++ b/indent/ant.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/ant.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ant') == -1
 
 " Vim indent file
diff --git a/indent/applescript.vim b/indent/applescript.vim
index cf75187f1..d58e92ccc 100644
--- a/indent/applescript.vim
+++ b/indent/applescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/applescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
 
 "Plugin Name: applescript indent file.
diff --git a/indent/arduino.vim b/indent/arduino.vim
index d004dcf2b..a265ea02e 100644
--- a/indent/arduino.vim
+++ b/indent/arduino.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/arduino.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
 
 " Vim indent file
diff --git a/indent/autohotkey.vim b/indent/autohotkey.vim
index fa57c3156..1d0a09367 100644
--- a/indent/autohotkey.vim
+++ b/indent/autohotkey.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/autohotkey.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'autohotkey') == -1
 
 " Vim indent file
diff --git a/indent/automake.vim b/indent/automake.vim
index a9f67f7c3..27272c5eb 100644
--- a/indent/automake.vim
+++ b/indent/automake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/automake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'automake') == -1
 
 " Vim indent file
diff --git a/indent/awk.vim b/indent/awk.vim
index 7d2bae32d..17082d356 100644
--- a/indent/awk.vim
+++ b/indent/awk.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/awk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'awk') == -1
 
 "  vim: set sw=3 sts=3:
diff --git a/indent/bib.vim b/indent/bib.vim
index 677b19df4..802fa6889 100644
--- a/indent/bib.vim
+++ b/indent/bib.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/bib.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bib') == -1
 
 " Vim indent file
diff --git a/indent/blade.vim b/indent/blade.vim
index 6d815b35c..0ab2e45c1 100644
--- a/indent/blade.vim
+++ b/indent/blade.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/blade.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 
 " Vim indent file
diff --git a/indent/bst.vim b/indent/bst.vim
index 6d41acf8c..ac2f9bfea 100644
--- a/indent/bst.vim
+++ b/indent/bst.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/bst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bst') == -1
 
 " Vim indent file
diff --git a/indent/bzl.vim b/indent/bzl.vim
index adda8a858..deea163ca 100644
--- a/indent/bzl.vim
+++ b/indent/bzl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/bzl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
 
 " Vim indent file
diff --git a/indent/cabal.vim b/indent/cabal.vim
index 8f8e81b8a..b81a82777 100644
--- a/indent/cabal.vim
+++ b/indent/cabal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/cabal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 
 " indentation for cabal
diff --git a/indent/caddyfile.vim b/indent/caddyfile.vim
index c8636bcb3..b3a5c20e2 100644
--- a/indent/caddyfile.vim
+++ b/indent/caddyfile.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/caddyfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
 
 if exists('b:did_indent')
diff --git a/indent/cdl.vim b/indent/cdl.vim
index 844ae7177..8f9ded852 100644
--- a/indent/cdl.vim
+++ b/indent/cdl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/cdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdl') == -1
 
 " Description:	Comshare Dimension Definition Language (CDL)
diff --git a/indent/ch.vim b/indent/ch.vim
index 479ce324d..023fff0a9 100644
--- a/indent/ch.vim
+++ b/indent/ch.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/ch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ch') == -1
 
 " Vim indent file
diff --git a/indent/chaiscript.vim b/indent/chaiscript.vim
index 49b9bad36..367f462cd 100644
--- a/indent/chaiscript.vim
+++ b/indent/chaiscript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/chaiscript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chaiscript') == -1
 
 " Vim indent file
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 86eb78392..2b06814c4 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/clojure.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 
 " Vim indent file
diff --git a/indent/cmake.vim b/indent/cmake.vim
index ef0ed8133..dd7cd9b4a 100644
--- a/indent/cmake.vim
+++ b/indent/cmake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/cmake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmake') == -1
 
 " Vim indent file
diff --git a/indent/cobol.vim b/indent/cobol.vim
index 5cfe23211..9d17a6f73 100644
--- a/indent/cobol.vim
+++ b/indent/cobol.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/cobol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cobol') == -1
 
 " Vim indent file
diff --git a/indent/coffee.vim b/indent/coffee.vim
index ee9c8a615..790bc2ce4 100644
--- a/indent/coffee.vim
+++ b/indent/coffee.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/coffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
diff --git a/indent/config.vim b/indent/config.vim
index 3e59cc5e7..73d5c09c5 100644
--- a/indent/config.vim
+++ b/indent/config.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'config') == -1
 
 " Vim indent file
diff --git a/indent/crystal.vim b/indent/crystal.vim
index 2ba6563c8..3c554a3f7 100644
--- a/indent/crystal.vim
+++ b/indent/crystal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/crystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " Initialization {{{1
diff --git a/indent/cs.vim b/indent/cs.vim
index 893f5b806..fd8f49de1 100644
--- a/indent/cs.vim
+++ b/indent/cs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/cs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
 
 " Vim indent file
diff --git a/indent/css.vim b/indent/css.vim
index 58189a485..5b8dc7d2f 100644
--- a/indent/css.vim
+++ b/indent/css.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/css.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'css') == -1
 
 " Vim indent file
diff --git a/indent/cucumber.vim b/indent/cucumber.vim
index a9960b029..a564e254c 100644
--- a/indent/cucumber.vim
+++ b/indent/cucumber.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/cucumber.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 
 " Vim indent file
diff --git a/indent/cuda.vim b/indent/cuda.vim
index 22552a293..696843635 100644
--- a/indent/cuda.vim
+++ b/indent/cuda.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/cuda.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cuda') == -1
 
 " Vim indent file
diff --git a/indent/cython.vim b/indent/cython.vim
index 156833d4e..39bc24da8 100644
--- a/indent/cython.vim
+++ b/indent/cython.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/cython.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-indent') == -1
 
 " PEP8 compatible Python indent file
diff --git a/indent/d.vim b/indent/d.vim
index 9575f611c..8fff519e1 100644
--- a/indent/d.vim
+++ b/indent/d.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/d.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 " Vim indent file for the D programming language (version 1.076 and 2.063).
diff --git a/indent/dart.vim b/indent/dart.vim
index 7599de4d3..87b3bbefc 100644
--- a/indent/dart.vim
+++ b/indent/dart.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/dart.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 
 if exists('b:did_indent')
diff --git a/indent/dictconf.vim b/indent/dictconf.vim
index 3a10fef5c..d2035d80c 100644
--- a/indent/dictconf.vim
+++ b/indent/dictconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/dictconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictconf') == -1
 
 " Vim indent file
diff --git a/indent/dictdconf.vim b/indent/dictdconf.vim
index 4338ff88d..891334e9b 100644
--- a/indent/dictdconf.vim
+++ b/indent/dictdconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/dictdconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictdconf') == -1
 
 " Vim indent file
diff --git a/indent/dosbatch.vim b/indent/dosbatch.vim
index f4352ead8..1baee7196 100644
--- a/indent/dosbatch.vim
+++ b/indent/dosbatch.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/dosbatch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosbatch') == -1
 
 " Vim indent file
diff --git a/indent/dtd.vim b/indent/dtd.vim
index 189182b1d..9c035ee5d 100644
--- a/indent/dtd.vim
+++ b/indent/dtd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/dtd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dtd') == -1
 
 " Vim indent file
diff --git a/indent/dune.vim b/indent/dune.vim
index 658cfe042..a0b2c3c36 100644
--- a/indent/dune.vim
+++ b/indent/dune.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/dune.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim indent file
diff --git a/indent/dylan.vim b/indent/dylan.vim
index f882f7bdb..39fc58300 100644
--- a/indent/dylan.vim
+++ b/indent/dylan.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/dylan.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylan') == -1
 
 " Vim indent file
diff --git a/indent/ecrystal.vim b/indent/ecrystal.vim
index ad3303c3b..8bd3580e4 100644
--- a/indent/ecrystal.vim
+++ b/indent/ecrystal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/ecrystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " Setup {{{1
diff --git a/indent/eelixir.vim b/indent/eelixir.vim
index e9ce89f4d..cf0b54614 100644
--- a/indent/eelixir.vim
+++ b/indent/eelixir.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/eelixir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists("b:did_indent")
diff --git a/indent/elixir.vim b/indent/elixir.vim
index 5c7f36fe8..762516c70 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/elixir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists("b:did_indent")
diff --git a/indent/elm.vim b/indent/elm.vim
index e27c6e908..a29a253e0 100644
--- a/indent/elm.vim
+++ b/indent/elm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/elm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 
 " indentation for Elm (https://elm-lang.org/)
diff --git a/indent/ember-script.vim b/indent/ember-script.vim
index f887714b6..465952155 100644
--- a/indent/ember-script.vim
+++ b/indent/ember-script.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/ember-script.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
 
 " Language:    ember-script
diff --git a/indent/emblem.vim b/indent/emblem.vim
index 8400f58cf..ba4673b1f 100644
--- a/indent/emblem.vim
+++ b/indent/emblem.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/emblem.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 
 " Language:    emblem
diff --git a/indent/erlang.vim b/indent/erlang.vim
index 2cc1cb23d..537b52f56 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/erlang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
 
 " Vim indent file
diff --git a/indent/eruby.vim b/indent/eruby.vim
index 2dc00daf5..16f4b8f5a 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/eruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim indent file
diff --git a/indent/eterm.vim b/indent/eterm.vim
index 6042815ce..87a3cd890 100644
--- a/indent/eterm.vim
+++ b/indent/eterm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/eterm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'eterm') == -1
 
 " Vim indent file
diff --git a/indent/falcon.vim b/indent/falcon.vim
index a00d80a74..388a508c9 100644
--- a/indent/falcon.vim
+++ b/indent/falcon.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/falcon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'falcon') == -1
 
 " Vim indent file
diff --git a/indent/fennel.vim b/indent/fennel.vim
index c45161350..9a85f3b20 100644
--- a/indent/fennel.vim
+++ b/indent/fennel.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/fennel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fennel') == -1
 
 " Vim filetype plugin file
diff --git a/indent/fish.vim b/indent/fish.vim
index 260139a63..a5e2ab07b 100644
--- a/indent/fish.vim
+++ b/indent/fish.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/fish.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 
 setlocal indentexpr=fish#Indent()
diff --git a/indent/fortran.vim b/indent/fortran.vim
index a4c5f130d..f56af8eee 100644
--- a/indent/fortran.vim
+++ b/indent/fortran.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/fortran.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
 
 " Vim indent file
diff --git a/indent/framescript.vim b/indent/framescript.vim
index d7a7b0e16..ae2a2026f 100644
--- a/indent/framescript.vim
+++ b/indent/framescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/framescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'framescript') == -1
 
 " Vim indent file
diff --git a/indent/fsharp.vim b/indent/fsharp.vim
index 6d54ae39d..e743cfb38 100644
--- a/indent/fsharp.vim
+++ b/indent/fsharp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/fsharp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
 
 " Vim indent file
diff --git a/indent/gdscript3.vim b/indent/gdscript3.vim
index c57561e07..f481ef716 100644
--- a/indent/gdscript3.vim
+++ b/indent/gdscript3.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/gdscript3.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdscript') == -1
 
 " Vim indent file
diff --git a/indent/gitconfig.vim b/indent/gitconfig.vim
index 53dff35a0..4eb4b0e75 100644
--- a/indent/gitconfig.vim
+++ b/indent/gitconfig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/gitconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim indent file
diff --git a/indent/gitolite.vim b/indent/gitolite.vim
index acde56c90..6a990ec6b 100644
--- a/indent/gitolite.vim
+++ b/indent/gitolite.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/gitolite.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitolite') == -1
 
 " Vim indent file
diff --git a/indent/glsl.vim b/indent/glsl.vim
index d998358cd..34437a031 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/glsl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
 
 " Language: OpenGL Shading Language
diff --git a/indent/go.vim b/indent/go.vim
index a231b4b81..2ab791435 100644
--- a/indent/go.vim
+++ b/indent/go.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/go.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " Copyright 2011 The Go Authors. All rights reserved.
diff --git a/indent/gohtmltmpl.vim b/indent/gohtmltmpl.vim
index 9f44597a6..f389cf355 100644
--- a/indent/gohtmltmpl.vim
+++ b/indent/gohtmltmpl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/gohtmltmpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:did_indent")
diff --git a/indent/graphql.vim b/indent/graphql.vim
index 12204f5f2..6612527b0 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/graphql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
diff --git a/indent/haml.vim b/indent/haml.vim
index ea6f5d176..3b00ccb2c 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/haml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 
 " Vim indent file
diff --git a/indent/hamster.vim b/indent/hamster.vim
index b8f0b5d4b..0ec5252fa 100644
--- a/indent/hamster.vim
+++ b/indent/hamster.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/hamster.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hamster') == -1
 
 " Vim indent file
diff --git a/indent/handlebars.vim b/indent/handlebars.vim
index fbff2fa06..77780ef7a 100644
--- a/indent/handlebars.vim
+++ b/indent/handlebars.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/handlebars.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 " Mustache & Handlebars syntax
diff --git a/indent/haskell.vim b/indent/haskell.vim
index baefc7f35..5267f3f34 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/haskell.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 
 " indentation for haskell
diff --git a/indent/hcl.vim b/indent/hcl.vim
index 2d7acf4b3..7c054c83e 100644
--- a/indent/hcl.vim
+++ b/indent/hcl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/hcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hcl') == -1
 
 if exists('b:did_indent')
diff --git a/indent/hog.vim b/indent/hog.vim
index 20e152b3b..1fb5845eb 100644
--- a/indent/hog.vim
+++ b/indent/hog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/hog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hog') == -1
 
 " Vim indent file
diff --git a/indent/html.vim b/indent/html.vim
index 1e56c85ea..e3cac3104 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/html.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html') == -1
 
 " Vim indent script for HTML
diff --git a/indent/htmldjango.vim b/indent/htmldjango.vim
index 493ced544..176546629 100644
--- a/indent/htmldjango.vim
+++ b/indent/htmldjango.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/htmldjango.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
 
 " Vim indent file
diff --git a/indent/idris.vim b/indent/idris.vim
index 3c415e74f..97e5386e9 100644
--- a/indent/idris.vim
+++ b/indent/idris.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/idris.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 
 " indentation for idris (idris-lang.org)
diff --git a/indent/idris2.vim b/indent/idris2.vim
index 83995423f..0870c3b8b 100644
--- a/indent/idris2.vim
+++ b/indent/idris2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/idris2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
 
 " indentation for idris (idris-lang.org)
diff --git a/indent/j.vim b/indent/j.vim
index 550fae8a3..fdf4df814 100644
--- a/indent/j.vim
+++ b/indent/j.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/j.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'j') == -1
 
 " Vim indent file
diff --git a/indent/java.vim b/indent/java.vim
index 99203420a..67bdec6f7 100644
--- a/indent/java.vim
+++ b/indent/java.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/java.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'java') == -1
 
 " Vim indent file
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 36c3482a9..bb19347cd 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/javascript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 " Vim indent file
diff --git a/indent/json.vim b/indent/json.vim
index 56f5ffa5e..62da1d7b8 100644
--- a/indent/json.vim
+++ b/indent/json.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/json.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 
 " Vim indent file
diff --git a/indent/jsp.vim b/indent/jsp.vim
index 613496bcb..cb7dd66c8 100644
--- a/indent/jsp.vim
+++ b/indent/jsp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/jsp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsp') == -1
 
 " Vim filetype indent file
diff --git a/indent/jst.vim b/indent/jst.vim
index c009eae5d..006bcf204 100644
--- a/indent/jst.vim
+++ b/indent/jst.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/jst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
 
 if exists("b:did_indent")
diff --git a/indent/julia.vim b/indent/julia.vim
index 6f4be447d..8b65d4a92 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/julia.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Vim indent file
diff --git a/indent/kotlin.vim b/indent/kotlin.vim
index a987f067d..fca5e30d9 100644
--- a/indent/kotlin.vim
+++ b/indent/kotlin.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/kotlin.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
 
 " Vim indent file
diff --git a/indent/ld.vim b/indent/ld.vim
index d5c908546..6b153d3be 100644
--- a/indent/ld.vim
+++ b/indent/ld.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/ld.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ld') == -1
 
 " Vim indent file
diff --git a/indent/ledger.vim b/indent/ledger.vim
index 9dde49b62..6cb481554 100644
--- a/indent/ledger.vim
+++ b/indent/ledger.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/ledger.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ledger') == -1
 
 " Vim filetype indent file
diff --git a/indent/less.vim b/indent/less.vim
index 628f2ff3b..4c71822a1 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/less.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 
 " Vim indent file
diff --git a/indent/lifelines.vim b/indent/lifelines.vim
index b0c16ba58..f6c540f61 100644
--- a/indent/lifelines.vim
+++ b/indent/lifelines.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/lifelines.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lifelines') == -1
 
 " Vim indent file
diff --git a/indent/lilypond.vim b/indent/lilypond.vim
index f9b2cbdda..ec62de557 100644
--- a/indent/lilypond.vim
+++ b/indent/lilypond.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/lilypond.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 
 " LilyPond indent file
diff --git a/indent/liquid.vim b/indent/liquid.vim
index 60f9c6039..b922e162a 100644
--- a/indent/liquid.vim
+++ b/indent/liquid.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/liquid.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
 
 " Vim indent file
diff --git a/indent/lisp.vim b/indent/lisp.vim
index 13e0558a2..466928dc9 100644
--- a/indent/lisp.vim
+++ b/indent/lisp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/lisp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lisp') == -1
 
 " Vim indent file
diff --git a/indent/litcoffee.vim b/indent/litcoffee.vim
index 9ab22c97b..b75f93ac1 100644
--- a/indent/litcoffee.vim
+++ b/indent/litcoffee.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/litcoffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 if exists('b:did_indent')
diff --git a/indent/llvm.vim b/indent/llvm.vim
index dd00c7e8e..344430806 100644
--- a/indent/llvm.vim
+++ b/indent/llvm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/llvm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 
 " Vim indent file
diff --git a/indent/logtalk.vim b/indent/logtalk.vim
index 3ca147075..437de8635 100644
--- a/indent/logtalk.vim
+++ b/indent/logtalk.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/logtalk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logtalk') == -1
 
 "  Maintainer:	Paulo Moura <pmoura@logtalk.org>
diff --git a/indent/ls.vim b/indent/ls.vim
index 5de62bb62..fe959f3e5 100644
--- a/indent/ls.vim
+++ b/indent/ls.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/ls.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 
 " Language:    LiveScript
diff --git a/indent/lua.vim b/indent/lua.vim
index 6eb8ff08a..e86c1b8d9 100644
--- a/indent/lua.vim
+++ b/indent/lua.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/lua.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lua') == -1
 
 " Vim indent file
diff --git a/indent/mail.vim b/indent/mail.vim
index 6ecf607f6..ff3f67a96 100644
--- a/indent/mail.vim
+++ b/indent/mail.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/mail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mail') == -1
 
 " Vim indent file
diff --git a/indent/make.vim b/indent/make.vim
index 07436042d..66553b2b2 100644
--- a/indent/make.vim
+++ b/indent/make.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/make.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'make') == -1
 
 " Vim indent file
diff --git a/indent/mako.vim b/indent/mako.vim
index fc9717853..12dc3f0d3 100644
--- a/indent/mako.vim
+++ b/indent/mako.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/mako.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
 
 " Vim indent file
diff --git a/indent/markdown.vim b/indent/markdown.vim
index fa797312b..927e5ed70 100644
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/markdown.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
 
 if exists("b:did_indent") | finish | endif
diff --git a/indent/meson.vim b/indent/meson.vim
index db5610ac0..26dd22c33 100644
--- a/indent/meson.vim
+++ b/indent/meson.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/meson.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1
 
 " Vim indent file
diff --git a/indent/mf.vim b/indent/mf.vim
index b3f1dea8e..4bf6501ed 100644
--- a/indent/mf.vim
+++ b/indent/mf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/mf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mf') == -1
 
 " METAFONT indent file
diff --git a/indent/moon.vim b/indent/moon.vim
index 799da8db5..202d2de61 100644
--- a/indent/moon.vim
+++ b/indent/moon.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/moon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
 
 " Language:    MoonScript
diff --git a/indent/mp.vim b/indent/mp.vim
index 76e9df227..d48e8ac4d 100644
--- a/indent/mp.vim
+++ b/indent/mp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/mp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mp') == -1
 
 " MetaPost indent file
diff --git a/indent/mustache.vim b/indent/mustache.vim
index 3387485e7..05c58d365 100644
--- a/indent/mustache.vim
+++ b/indent/mustache.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/mustache.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 runtime! indent/handlebars.vim
diff --git a/indent/nginx.vim b/indent/nginx.vim
index 9ff283746..1dd748d17 100644
--- a/indent/nginx.vim
+++ b/indent/nginx.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/nginx.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
 
 if exists("b:did_indent")
diff --git a/indent/nim.vim b/indent/nim.vim
index 7193a9fac..c4cc7e982 100644
--- a/indent/nim.vim
+++ b/indent/nim.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/nim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 
 " Only load this indent file when no other was loaded.
diff --git a/indent/nix.vim b/indent/nix.vim
index d91f75639..7b3f3defa 100644
--- a/indent/nix.vim
+++ b/indent/nix.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/nix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 
 " Vim indent file
diff --git a/indent/nsis.vim b/indent/nsis.vim
index 0ffa1b2ea..d6aef5c06 100644
--- a/indent/nsis.vim
+++ b/indent/nsis.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/nsis.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nsis') == -1
 
 " Vim indent file
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index 5297b34cc..1d4e2f669 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/ocaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim indent file
diff --git a/indent/occam.vim b/indent/occam.vim
index 9361bf483..06c9face3 100644
--- a/indent/occam.vim
+++ b/indent/occam.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/occam.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'occam') == -1
 
 " Vim indent file
diff --git a/indent/octave.vim b/indent/octave.vim
index e7bb4acab..ce6c6952b 100644
--- a/indent/octave.vim
+++ b/indent/octave.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/octave.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'octave') == -1
 
 " Vim indent file
diff --git a/indent/odin.vim b/indent/odin.vim
index b00b53877..6cd93a9ac 100644
--- a/indent/odin.vim
+++ b/indent/odin.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/odin.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'odin') == -1
 
 if exists("b:did_indent")
diff --git a/indent/omake.vim b/indent/omake.vim
index 91db5daab..b5cc828cc 100644
--- a/indent/omake.vim
+++ b/indent/omake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/omake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim indent file
diff --git a/indent/opencl.vim b/indent/opencl.vim
index e438fdf03..5c30574bb 100644
--- a/indent/opencl.vim
+++ b/indent/opencl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/opencl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
 
 " Only load this indent file when no other was loaded.
diff --git a/indent/pascal.vim b/indent/pascal.vim
index e112a84e1..92177246e 100644
--- a/indent/pascal.vim
+++ b/indent/pascal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/pascal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pascal') == -1
 
 " Vim indent file
diff --git a/indent/perl.vim b/indent/perl.vim
index ff78e996b..d40e36298 100644
--- a/indent/perl.vim
+++ b/indent/perl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/perl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim indent file
diff --git a/indent/pgsql.vim b/indent/pgsql.vim
index f46597a7c..a0ece225b 100644
--- a/indent/pgsql.vim
+++ b/indent/pgsql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/pgsql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pgsql') == -1
 
 " Vim indent file
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index 0553e706e..414ea9893 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/plantuml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
 
 scriptencoding utf-8
diff --git a/indent/pony.vim b/indent/pony.vim
index 2b6e3e51b..32a4c1078 100644
--- a/indent/pony.vim
+++ b/indent/pony.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/pony.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 
 " Vim indent file
diff --git a/indent/postscr.vim b/indent/postscr.vim
index 04e91cc4a..1f8e563c2 100644
--- a/indent/postscr.vim
+++ b/indent/postscr.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/postscr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'postscr') == -1
 
 " PostScript indent file
diff --git a/indent/pov.vim b/indent/pov.vim
index dca8d2e12..747a21358 100644
--- a/indent/pov.vim
+++ b/indent/pov.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/pov.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pov') == -1
 
 " Vim indent file
diff --git a/indent/prolog.vim b/indent/prolog.vim
index 0426a473e..e4eb14dcb 100644
--- a/indent/prolog.vim
+++ b/indent/prolog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/prolog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
 
 "  vim: set sw=4 sts=4:
diff --git a/indent/proto.vim b/indent/proto.vim
index b09816b1e..d932d146d 100644
--- a/indent/proto.vim
+++ b/indent/proto.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/proto.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protobuf') == -1
 
 " Vim indent file
diff --git a/indent/ps1.vim b/indent/ps1.vim
index 810bdafc4..da13602a5 100644
--- a/indent/ps1.vim
+++ b/indent/ps1.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/ps1.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Vim indent file
diff --git a/indent/pug.vim b/indent/pug.vim
index 291ebfc63..175abe39a 100644
--- a/indent/pug.vim
+++ b/indent/pug.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/pug.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
 
 " Vim indent file
diff --git a/indent/puppet.vim b/indent/puppet.vim
index 6d733c84f..8a5366908 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/puppet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Vim indent file
diff --git a/indent/purescript.vim b/indent/purescript.vim
index 5d01bba45..fb83604d5 100644
--- a/indent/purescript.vim
+++ b/indent/purescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/purescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 
 " indentation for purescript
diff --git a/indent/pyrex.vim b/indent/pyrex.vim
index c4662c319..9440efebe 100644
--- a/indent/pyrex.vim
+++ b/indent/pyrex.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/pyrex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pyrex') == -1
 
 " Vim indent file
diff --git a/indent/python.vim b/indent/python.vim
index 156833d4e..8128d26c9 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/python.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-indent') == -1
 
 " PEP8 compatible Python indent file
diff --git a/indent/qml.vim b/indent/qml.vim
index 2a5b5d4f5..5d02a475a 100644
--- a/indent/qml.vim
+++ b/indent/qml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/qml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
 
 " Vim indent file
diff --git a/indent/racket.vim b/indent/racket.vim
index be620b7b0..966bb8ce0 100644
--- a/indent/racket.vim
+++ b/indent/racket.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/racket.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
 
 " Language:     Racket
diff --git a/indent/raku.vim b/indent/raku.vim
index 9a508e452..ef3976aff 100644
--- a/indent/raku.vim
+++ b/indent/raku.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/raku.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raku') == -1
 
 " Vim indent file
diff --git a/indent/razor.vim b/indent/razor.vim
index d3990890c..8465fb7f0 100644
--- a/indent/razor.vim
+++ b/indent/razor.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/razor.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'razor') == -1
 
 " Vim indent file
diff --git a/indent/readline.vim b/indent/readline.vim
index 5c83059dd..9aa70349b 100644
--- a/indent/readline.vim
+++ b/indent/readline.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/readline.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'readline') == -1
 
 " Vim indent file
diff --git a/indent/reason.vim b/indent/reason.vim
index 7ee5c6dba..11a6c4e01 100644
--- a/indent/reason.vim
+++ b/indent/reason.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/reason.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
 
 " Vim indent file
diff --git a/indent/rmd.vim b/indent/rmd.vim
index 25ec7023c..e52686b47 100644
--- a/indent/rmd.vim
+++ b/indent/rmd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/rmd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rmd') == -1
 
 " Vim indent file
diff --git a/indent/rnoweb.vim b/indent/rnoweb.vim
index 0abe01281..54e7dab2a 100644
--- a/indent/rnoweb.vim
+++ b/indent/rnoweb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/rnoweb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnoweb') == -1
 
 " Vim indent file
diff --git a/indent/rpl.vim b/indent/rpl.vim
index bc4420b58..bc674b4d2 100644
--- a/indent/rpl.vim
+++ b/indent/rpl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/rpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 
 " Vim indent file
diff --git a/indent/rrst.vim b/indent/rrst.vim
index 9d346ce2e..32fd82d35 100644
--- a/indent/rrst.vim
+++ b/indent/rrst.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/rrst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rrst') == -1
 
 " Vim indent file
diff --git a/indent/rst.vim b/indent/rst.vim
index 0eb0f9c6f..82e6a8124 100644
--- a/indent/rst.vim
+++ b/indent/rst.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/rst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 
 " Vim indent file
diff --git a/indent/ruby.vim b/indent/ruby.vim
index 1f2313cdc..37363d9f0 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/ruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim indent file
diff --git a/indent/rust.vim b/indent/rust.vim
index 69070b466..69fdb0784 100644
--- a/indent/rust.vim
+++ b/indent/rust.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/rust.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Vim indent file
diff --git a/indent/sas.vim b/indent/sas.vim
index 8fad46907..4eac68cb9 100644
--- a/indent/sas.vim
+++ b/indent/sas.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/sas.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sas') == -1
 
 " Vim indent file
diff --git a/indent/sass.vim b/indent/sass.vim
index f0169e428..d59a1abae 100644
--- a/indent/sass.vim
+++ b/indent/sass.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/sass.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
 
 " Vim indent file
diff --git a/indent/scala.vim b/indent/scala.vim
index d77c00753..f29f80b8f 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/scala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 " Vim indent file
diff --git a/indent/scheme.vim b/indent/scheme.vim
index 8faac9b86..1524ce887 100644
--- a/indent/scheme.vim
+++ b/indent/scheme.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/scheme.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scheme') == -1
 
 " Vim indent file
diff --git a/indent/scss.vim b/indent/scss.vim
index 331fb78bd..c955aeb92 100644
--- a/indent/scss.vim
+++ b/indent/scss.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/scss.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
 
 " Vim indent file
diff --git a/indent/sdl.vim b/indent/sdl.vim
index 10d494dc1..eb6b783fb 100644
--- a/indent/sdl.vim
+++ b/indent/sdl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/sdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sdl') == -1
 
 " Vim indent file
diff --git a/indent/slim.vim b/indent/slim.vim
index 81762b1d4..5c10c83c1 100644
--- a/indent/slim.vim
+++ b/indent/slim.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/slim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
 
 " Vim indent file
diff --git a/indent/slime.vim b/indent/slime.vim
index 0cb565ac7..366ad4e0f 100644
--- a/indent/slime.vim
+++ b/indent/slime.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/slime.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slime') == -1
 
 " Vim indent file
diff --git a/indent/sml.vim b/indent/sml.vim
index 13b35a864..b1d15bc1d 100644
--- a/indent/sml.vim
+++ b/indent/sml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/sml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sml') == -1
 
 " Vim indent file
diff --git a/indent/solidity.vim b/indent/solidity.vim
index d80e55667..a3c9b45d1 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/solidity.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
 
 " Vim indent file
diff --git a/indent/sql.vim b/indent/sql.vim
index 495845242..49b2a638c 100644
--- a/indent/sql.vim
+++ b/indent/sql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/sql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
 
 " Vim indent file loader
diff --git a/indent/sshconfig.vim b/indent/sshconfig.vim
index c25e297df..a0d7f7d26 100644
--- a/indent/sshconfig.vim
+++ b/indent/sshconfig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/sshconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshconfig') == -1
 
 " Vim indent file
diff --git a/indent/stylus.vim b/indent/stylus.vim
index 009bf4997..584f4de51 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/stylus.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
 
 " Vim indent file
diff --git a/indent/svelte.vim b/indent/svelte.vim
index 8d9fbb2f9..00e65db67 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/svelte.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svelte') == -1
 
 " Vim indent file
diff --git a/indent/svg.vim b/indent/svg.vim
index 320573622..5bf84360a 100644
--- a/indent/svg.vim
+++ b/indent/svg.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/svg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svg-indent') == -1
 
 " Vim indent file
diff --git a/indent/swift.vim b/indent/swift.vim
index edaf4c99e..dc09cc5d0 100644
--- a/indent/swift.vim
+++ b/indent/swift.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/swift.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 
 " File: swift.vim
diff --git a/indent/systemverilog.vim b/indent/systemverilog.vim
index 82b277948..015a60ddc 100644
--- a/indent/systemverilog.vim
+++ b/indent/systemverilog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/systemverilog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemverilog') == -1
 
 " Vim indent file
diff --git a/indent/tcl.vim b/indent/tcl.vim
index 3ad7b4e18..be81acbd3 100644
--- a/indent/tcl.vim
+++ b/indent/tcl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/tcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
 
 " Vim indent file
diff --git a/indent/teraterm.vim b/indent/teraterm.vim
index cde676899..c55127b6d 100644
--- a/indent/teraterm.vim
+++ b/indent/teraterm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/teraterm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'teraterm') == -1
 
 " Vim indent file
diff --git a/indent/terraform.vim b/indent/terraform.vim
index 4f536c487..d0358e3d8 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/terraform.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 
 " Only load this file if no other indent file was loaded
diff --git a/indent/tex.vim b/indent/tex.vim
index 54c45307f..71aea3f30 100644
--- a/indent/tex.vim
+++ b/indent/tex.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/tex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
 
 " Vim indent file
diff --git a/indent/tf.vim b/indent/tf.vim
index ba22883c1..0f388869a 100644
--- a/indent/tf.vim
+++ b/indent/tf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/tf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tf') == -1
 
 " Vim indent file
diff --git a/indent/tilde.vim b/indent/tilde.vim
index 4d5fdf305..30551dd35 100644
--- a/indent/tilde.vim
+++ b/indent/tilde.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/tilde.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tilde') == -1
 
 "Description: Indent scheme for the tilde weblanguage
diff --git a/indent/treetop.vim b/indent/treetop.vim
index 13cb3e44f..1c5658469 100644
--- a/indent/treetop.vim
+++ b/indent/treetop.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/treetop.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'treetop') == -1
 
 " Vim indent file
diff --git a/indent/twig.vim b/indent/twig.vim
index a07829460..0f52b6b0b 100644
--- a/indent/twig.vim
+++ b/indent/twig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/twig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
 
 if exists("b:ran_once")
diff --git a/indent/typescript.vim b/indent/typescript.vim
index 64eca31b7..53f716d2f 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/typescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " Vim indent file
diff --git a/indent/typescriptreact.vim b/indent/typescriptreact.vim
index 65db50dcc..52bb0eda1 100644
--- a/indent/typescriptreact.vim
+++ b/indent/typescriptreact.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/typescriptreact.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 exe 'runtime! indent/typescript.vim'
diff --git a/indent/vala.vim b/indent/vala.vim
index f9339eb59..ecf4cc296 100644
--- a/indent/vala.vim
+++ b/indent/vala.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/vala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
 
 " Vim indent file
diff --git a/indent/vb.vim b/indent/vb.vim
index 129c2abde..d4eaa2ec7 100644
--- a/indent/vb.vim
+++ b/indent/vb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/vb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
 
 " Vim indent file
diff --git a/indent/velocity.vim b/indent/velocity.vim
index 2a0b7143a..43015f067 100644
--- a/indent/velocity.vim
+++ b/indent/velocity.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/velocity.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'velocity') == -1
 
 if exists("b:did_indent")
diff --git a/indent/verilog.vim b/indent/verilog.vim
index 43213a8dc..9e6fcddc9 100644
--- a/indent/verilog.vim
+++ b/indent/verilog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/verilog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilog') == -1
 
 " Language:     Verilog HDL
diff --git a/indent/vhdl.vim b/indent/vhdl.vim
index 5e9bfd4e3..55e8974ae 100644
--- a/indent/vhdl.vim
+++ b/indent/vhdl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/vhdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vhdl') == -1
 
 " VHDL indent ('93 syntax)
diff --git a/indent/vlang.vim b/indent/vlang.vim
index 71c0021bc..bfff3d37a 100644
--- a/indent/vlang.vim
+++ b/indent/vlang.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/vlang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'v') == -1
 
 " Based on the Go identation file.
diff --git a/indent/vroom.vim b/indent/vroom.vim
index 9ed918c6e..40ee746b2 100644
--- a/indent/vroom.vim
+++ b/indent/vroom.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/vroom.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vroom') == -1
 
 " Vim indent file
diff --git a/indent/vue.vim b/indent/vue.vim
index 2f601959c..41b8051b5 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/vue.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
 
 " Vim indent file
diff --git a/indent/wast.vim b/indent/wast.vim
index abc5bfbd4..870874c6d 100644
--- a/indent/wast.vim
+++ b/indent/wast.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/wast.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wast') == -1
 
 " Vim indent file
diff --git a/indent/xf86conf.vim b/indent/xf86conf.vim
index 261c44161..7d1ccbe49 100644
--- a/indent/xf86conf.vim
+++ b/indent/xf86conf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/xf86conf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xf86conf') == -1
 
 " Vim indent file
diff --git a/indent/xhtml.vim b/indent/xhtml.vim
index abe08ba3e..2f95f5926 100644
--- a/indent/xhtml.vim
+++ b/indent/xhtml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/xhtml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xhtml') == -1
 
 " Vim indent file
diff --git a/indent/xinetd.vim b/indent/xinetd.vim
index 4ee1a76f8..2056eb504 100644
--- a/indent/xinetd.vim
+++ b/indent/xinetd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/xinetd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xinetd') == -1
 
 " Vim indent file
diff --git a/indent/xsd.vim b/indent/xsd.vim
index c12f73c79..bb0051f1a 100644
--- a/indent/xsd.vim
+++ b/indent/xsd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/xsd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
 
 " Vim indent file
diff --git a/indent/xslt.vim b/indent/xslt.vim
index e31f9aca7..f86604316 100644
--- a/indent/xslt.vim
+++ b/indent/xslt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/xslt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xslt') == -1
 
 " Vim indent file
diff --git a/indent/yacc.vim b/indent/yacc.vim
index 9ebb7f497..c42be8bd1 100644
--- a/indent/yacc.vim
+++ b/indent/yacc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/yacc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yacc') == -1
 
 " Vim indent file
diff --git a/indent/yaml.vim b/indent/yaml.vim
index c7fdebcff..7bb1c7da4 100644
--- a/indent/yaml.vim
+++ b/indent/yaml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/yaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 
 " Vim indent file
diff --git a/indent/zig.vim b/indent/zig.vim
index 1fc112980..3ce6b88c0 100644
--- a/indent/zig.vim
+++ b/indent/zig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/zig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " indent/zig.vim
diff --git a/indent/zimbu.vim b/indent/zimbu.vim
index 203544017..593a65576 100644
--- a/indent/zimbu.vim
+++ b/indent/zimbu.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'indent/zimbu.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zimbu') == -1
 
 " Vim indent file
diff --git a/scripts/build b/scripts/build
index efae3219f..7d678e434 100755
--- a/scripts/build
+++ b/scripts/build
@@ -293,6 +293,15 @@ def copy_file(name, src, dest)
 
   open(src, "r") do |input|
     open(dest, "w") do |output|
+      if dest.match?(/\.vim$/) && !dest.match('after/')
+        output << <<~EOF
+        let files = filter(globpath(&rtp, '#{dest}', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+        if len(files) > 0
+          exec 'source ' . files[0]
+          finish
+        endif
+        EOF
+      end
       if name == "jsx"
         output << "if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)\n\n"
       else
diff --git a/syntax/8th.vim b/syntax/8th.vim
index 9eae523f6..77b0db4d8 100644
--- a/syntax/8th.vim
+++ b/syntax/8th.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/8th.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '8th') == -1
 
 " Vim syntax file
diff --git a/syntax/Jenkinsfile.vim b/syntax/Jenkinsfile.vim
index 3f175903b..6db426f3c 100644
--- a/syntax/Jenkinsfile.vim
+++ b/syntax/Jenkinsfile.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/Jenkinsfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jenkins') == -1
 
 runtime syntax/groovy.vim
diff --git a/syntax/a2ps.vim b/syntax/a2ps.vim
index 3c0900e94..1e19b5439 100644
--- a/syntax/a2ps.vim
+++ b/syntax/a2ps.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/a2ps.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'a2ps') == -1
 
 " Vim syntax file
diff --git a/syntax/a65.vim b/syntax/a65.vim
index 01215767c..49ebfa54d 100644
--- a/syntax/a65.vim
+++ b/syntax/a65.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/a65.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'a65') == -1
 
 " Vim syntax file
diff --git a/syntax/aap.vim b/syntax/aap.vim
index 7c443ac27..3bfbdf0ef 100644
--- a/syntax/aap.vim
+++ b/syntax/aap.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/aap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aap') == -1
 
 " Vim syntax file
diff --git a/syntax/abap.vim b/syntax/abap.vim
index 7115c3d8a..f813d783e 100644
--- a/syntax/abap.vim
+++ b/syntax/abap.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/abap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'abap') == -1
 
 " Vim ABAP syntax file
diff --git a/syntax/abaqus.vim b/syntax/abaqus.vim
index a54e9fe89..27617bca9 100644
--- a/syntax/abaqus.vim
+++ b/syntax/abaqus.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/abaqus.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'abaqus') == -1
 
 " Vim syntax file
diff --git a/syntax/abc.vim b/syntax/abc.vim
index a44a929de..69e062402 100644
--- a/syntax/abc.vim
+++ b/syntax/abc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/abc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'abc') == -1
 
 " Vim syntax file
diff --git a/syntax/abel.vim b/syntax/abel.vim
index 4cd9e35fb..be84cb0d5 100644
--- a/syntax/abel.vim
+++ b/syntax/abel.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/abel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'abel') == -1
 
 " Vim syntax file
diff --git a/syntax/acedb.vim b/syntax/acedb.vim
index b382bdd3a..26de8945d 100644
--- a/syntax/acedb.vim
+++ b/syntax/acedb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/acedb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'acedb') == -1
 
 " Vim syntax file
diff --git a/syntax/ada.vim b/syntax/ada.vim
index f8093d8a5..aeea3449f 100644
--- a/syntax/ada.vim
+++ b/syntax/ada.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ada.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ada') == -1
 
 "----------------------------------------------------------------------------
diff --git a/syntax/ahdl.vim b/syntax/ahdl.vim
index 1457255e5..825e7df37 100644
--- a/syntax/ahdl.vim
+++ b/syntax/ahdl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ahdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ahdl') == -1
 
 " Vim syn file
diff --git a/syntax/aidl.vim b/syntax/aidl.vim
index d9c88ab47..530e16268 100644
--- a/syntax/aidl.vim
+++ b/syntax/aidl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/aidl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aidl') == -1
 
 " Vim syntax file
diff --git a/syntax/alsaconf.vim b/syntax/alsaconf.vim
index 152c2c9f5..6331bbce5 100644
--- a/syntax/alsaconf.vim
+++ b/syntax/alsaconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/alsaconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'alsaconf') == -1
 
 " Vim syntax file
diff --git a/syntax/aml.vim b/syntax/aml.vim
index 44f62facd..c5ed3a570 100644
--- a/syntax/aml.vim
+++ b/syntax/aml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/aml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aml') == -1
 
 " Vim syntax file
diff --git a/syntax/ampl.vim b/syntax/ampl.vim
index 699d33dcc..57b76abcd 100644
--- a/syntax/ampl.vim
+++ b/syntax/ampl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ampl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ampl') == -1
 
 " Language:     ampl (A Mathematical Programming Language)
diff --git a/syntax/ansible.vim b/syntax/ansible.vim
index 72dc977c9..7bbf5157e 100644
--- a/syntax/ansible.vim
+++ b/syntax/ansible.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ansible.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 " Vim syntax file
diff --git a/syntax/ansible_hosts.vim b/syntax/ansible_hosts.vim
index 5bdf05303..cb5f68c62 100644
--- a/syntax/ansible_hosts.vim
+++ b/syntax/ansible_hosts.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ansible_hosts.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 " Vim syntax file
diff --git a/syntax/ant.vim b/syntax/ant.vim
index 0930401a7..ea81e2f54 100644
--- a/syntax/ant.vim
+++ b/syntax/ant.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ant.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ant') == -1
 
 " Vim syntax file
diff --git a/syntax/apache.vim b/syntax/apache.vim
index 737f478f9..b18582631 100644
--- a/syntax/apache.vim
+++ b/syntax/apache.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/apache.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apache') == -1
 
 " Vim syntax file
diff --git a/syntax/apachestyle.vim b/syntax/apachestyle.vim
index 0eb4015e9..57f40134c 100644
--- a/syntax/apachestyle.vim
+++ b/syntax/apachestyle.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/apachestyle.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apachestyle') == -1
 
 " Vim syntax file
diff --git a/syntax/apiblueprint.vim b/syntax/apiblueprint.vim
index 2c1b15378..76c036113 100644
--- a/syntax/apiblueprint.vim
+++ b/syntax/apiblueprint.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/apiblueprint.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apiblueprint') == -1
 
 runtime! syntax/markdown.vim
diff --git a/syntax/applescript.vim b/syntax/applescript.vim
index 53066e071..8da47afba 100644
--- a/syntax/applescript.vim
+++ b/syntax/applescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/applescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
 
 " Vim syntax file
diff --git a/syntax/aptconf.vim b/syntax/aptconf.vim
index 4d88ce654..4d7b252f5 100644
--- a/syntax/aptconf.vim
+++ b/syntax/aptconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/aptconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aptconf') == -1
 
 " Vim syntax file
diff --git a/syntax/arch.vim b/syntax/arch.vim
index 1491b7234..3f9b913af 100644
--- a/syntax/arch.vim
+++ b/syntax/arch.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/arch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arch') == -1
 
 " Vim syntax file
diff --git a/syntax/arduino.vim b/syntax/arduino.vim
index 4511d6ccb..8d29bf1e4 100644
--- a/syntax/arduino.vim
+++ b/syntax/arduino.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/arduino.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
 
 " Vim syntax file
diff --git a/syntax/art.vim b/syntax/art.vim
index 0e032c2d9..73e10e634 100644
--- a/syntax/art.vim
+++ b/syntax/art.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/art.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'art') == -1
 
 " Vim syntax file
diff --git a/syntax/asciidoc.vim b/syntax/asciidoc.vim
index d4c0962ec..afbc905fc 100644
--- a/syntax/asciidoc.vim
+++ b/syntax/asciidoc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/asciidoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asciidoc') == -1
 
 " Vim syntax file
diff --git a/syntax/asl.vim b/syntax/asl.vim
index b108b1eb5..bc8a09503 100644
--- a/syntax/asl.vim
+++ b/syntax/asl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/asl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'acpiasl') == -1
 
 " Vim syntax file
diff --git a/syntax/asn.vim b/syntax/asn.vim
index 55d1b1fac..d355ce435 100644
--- a/syntax/asn.vim
+++ b/syntax/asn.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/asn.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asn') == -1
 
 " Vim syntax file
diff --git a/syntax/aspperl.vim b/syntax/aspperl.vim
index 18933caf5..4a2c553db 100644
--- a/syntax/aspperl.vim
+++ b/syntax/aspperl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/aspperl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aspperl') == -1
 
 " Vim syntax file
diff --git a/syntax/aspvbs.vim b/syntax/aspvbs.vim
index d9cf40c6d..b008f672f 100644
--- a/syntax/aspvbs.vim
+++ b/syntax/aspvbs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/aspvbs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aspvbs') == -1
 
 " Vim syntax file
diff --git a/syntax/asterisk.vim b/syntax/asterisk.vim
index e065fb4a4..7318d8472 100644
--- a/syntax/asterisk.vim
+++ b/syntax/asterisk.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/asterisk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asterisk') == -1
 
 " Vim syntax file
diff --git a/syntax/asteriskvm.vim b/syntax/asteriskvm.vim
index 8a4c079a1..df563e2d0 100644
--- a/syntax/asteriskvm.vim
+++ b/syntax/asteriskvm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/asteriskvm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asteriskvm') == -1
 
 " Vim syntax file
diff --git a/syntax/atlas.vim b/syntax/atlas.vim
index d74e9c439..4341c201b 100644
--- a/syntax/atlas.vim
+++ b/syntax/atlas.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/atlas.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'atlas') == -1
 
 " Vim syntax file
diff --git a/syntax/autodoc.vim b/syntax/autodoc.vim
index 5fcc60ca1..c3ec62eb4 100644
--- a/syntax/autodoc.vim
+++ b/syntax/autodoc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/autodoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'autodoc') == -1
 
 " Vim syntax file
diff --git a/syntax/autoit.vim b/syntax/autoit.vim
index 2cdac618a..439202460 100644
--- a/syntax/autoit.vim
+++ b/syntax/autoit.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/autoit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'autoit') == -1
 
 " Vim syntax file
diff --git a/syntax/automake.vim b/syntax/automake.vim
index be0cbb920..86cc75788 100644
--- a/syntax/automake.vim
+++ b/syntax/automake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/automake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'automake') == -1
 
 " Vim syntax file
diff --git a/syntax/ave.vim b/syntax/ave.vim
index 71a88cc3a..340e3a5e7 100644
--- a/syntax/ave.vim
+++ b/syntax/ave.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ave.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ave') == -1
 
 " Vim syntax file
diff --git a/syntax/awk.vim b/syntax/awk.vim
index 342a49b78..ae4c92ea3 100644
--- a/syntax/awk.vim
+++ b/syntax/awk.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/awk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'awk') == -1
 
 " Vim syntax file
diff --git a/syntax/b.vim b/syntax/b.vim
index 588fdebc0..c05ab6b27 100644
--- a/syntax/b.vim
+++ b/syntax/b.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/b.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'b') == -1
 
 " Vim syntax file
diff --git a/syntax/basic.vim b/syntax/basic.vim
index f2aa1bc44..24a8b0972 100644
--- a/syntax/basic.vim
+++ b/syntax/basic.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'basic') == -1
 
 " Vim syntax file
diff --git a/syntax/basic/class.vim b/syntax/basic/class.vim
index 303d20776..dea703aa4 100644
--- a/syntax/basic/class.vim
+++ b/syntax/basic/class.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/class.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "don't add typescriptMembers to nextgroup, let outer scope match it
diff --git a/syntax/basic/cluster.vim b/syntax/basic/cluster.vim
index 8538c5171..f5eb59d18 100644
--- a/syntax/basic/cluster.vim
+++ b/syntax/basic/cluster.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/cluster.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "Block VariableStatement EmptyStatement ExpressionStatement IfStatement IterationStatement ContinueStatement BreakStatement ReturnStatement WithStatement LabelledStatement SwitchStatement ThrowStatement TryStatement DebuggerStatement
diff --git a/syntax/basic/decorator.vim b/syntax/basic/decorator.vim
index 2a7a1dd13..7f5456cd2 100644
--- a/syntax/basic/decorator.vim
+++ b/syntax/basic/decorator.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/decorator.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax match typescriptDecorator /@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>/
diff --git a/syntax/basic/doc.vim b/syntax/basic/doc.vim
index 50f03e29b..2bf5d614f 100644
--- a/syntax/basic/doc.vim
+++ b/syntax/basic/doc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/doc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "Syntax coloring for Node.js shebang line
diff --git a/syntax/basic/function.vim b/syntax/basic/function.vim
index e1743ab5b..ac94b9a1e 100644
--- a/syntax/basic/function.vim
+++ b/syntax/basic/function.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/function.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptAsyncFuncKeyword      async
diff --git a/syntax/basic/identifiers.vim b/syntax/basic/identifiers.vim
index 6a7ba4b0a..b03df0110 100644
--- a/syntax/basic/identifiers.vim
+++ b/syntax/basic/identifiers.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/identifiers.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax cluster afterIdentifier contains=
diff --git a/syntax/basic/keyword.vim b/syntax/basic/keyword.vim
index a810b545a..ddb4e8a12 100644
--- a/syntax/basic/keyword.vim
+++ b/syntax/basic/keyword.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/keyword.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "Import
diff --git a/syntax/basic/literal.vim b/syntax/basic/literal.vim
index 89d96bb0f..6f092fcc9 100644
--- a/syntax/basic/literal.vim
+++ b/syntax/basic/literal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/literal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "Syntax in the JavaScript code
diff --git a/syntax/basic/members.vim b/syntax/basic/members.vim
index 343559b9e..7362eaf95 100644
--- a/syntax/basic/members.vim
+++ b/syntax/basic/members.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/members.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptConstructor           contained constructor
diff --git a/syntax/basic/object.vim b/syntax/basic/object.vim
index 90c75a0a9..6f5d1f28b 100644
--- a/syntax/basic/object.vim
+++ b/syntax/basic/object.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/object.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax region  typescriptObjectLiteral         matchgroup=typescriptBraces
diff --git a/syntax/basic/patch.vim b/syntax/basic/patch.vim
index 5531db798..a2ebd1dab 100644
--- a/syntax/basic/patch.vim
+++ b/syntax/basic/patch.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/patch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " patch for generated code
diff --git a/syntax/basic/reserved.vim b/syntax/basic/reserved.vim
index 14ea7565e..0cfb36acc 100644
--- a/syntax/basic/reserved.vim
+++ b/syntax/basic/reserved.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/reserved.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax cluster typescriptStrings               contains=typescriptProp,typescriptString,typescriptTemplate,@typescriptComments,typescriptDocComment,typescriptRegexpString,typescriptPropertyName
diff --git a/syntax/basic/symbols.vim b/syntax/basic/symbols.vim
index 2799ed39e..15490f80a 100644
--- a/syntax/basic/symbols.vim
+++ b/syntax/basic/symbols.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/symbols.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " + - ^ ~
diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim
index 02e782375..378ecafec 100644
--- a/syntax/basic/type.vim
+++ b/syntax/basic/type.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/basic/type.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " Types
diff --git a/syntax/bc.vim b/syntax/bc.vim
index c4c1acf7e..35533f845 100644
--- a/syntax/bc.vim
+++ b/syntax/bc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/bc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bc') == -1
 
 " Vim syntax file
diff --git a/syntax/bdf.vim b/syntax/bdf.vim
index b6c0cf0df..548ef1b3d 100644
--- a/syntax/bdf.vim
+++ b/syntax/bdf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/bdf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bdf') == -1
 
 " Vim syntax file
diff --git a/syntax/bib.vim b/syntax/bib.vim
index 218638eb9..f59ab6ecd 100644
--- a/syntax/bib.vim
+++ b/syntax/bib.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/bib.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bib') == -1
 
 " Vim syntax file
diff --git a/syntax/bindzone.vim b/syntax/bindzone.vim
index c7e256463..d59c993d3 100644
--- a/syntax/bindzone.vim
+++ b/syntax/bindzone.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/bindzone.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bindzone') == -1
 
 " Vim syntax file
diff --git a/syntax/blade.vim b/syntax/blade.vim
index 77f1f0833..da81031d2 100644
--- a/syntax/blade.vim
+++ b/syntax/blade.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/blade.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 
 " Vim syntax file
diff --git a/syntax/blank.vim b/syntax/blank.vim
index 056f68557..d5a80aa2d 100644
--- a/syntax/blank.vim
+++ b/syntax/blank.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/blank.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blank') == -1
 
 " Vim syntax file
diff --git a/syntax/brewfile.vim b/syntax/brewfile.vim
index 4056c8840..1f52c49b2 100644
--- a/syntax/brewfile.vim
+++ b/syntax/brewfile.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/brewfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'brewfile') == -1
 
 " Vim syntax file
diff --git a/syntax/bsdl.vim b/syntax/bsdl.vim
index 10ca5b8f5..d23bfb28c 100644
--- a/syntax/bsdl.vim
+++ b/syntax/bsdl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/bsdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bsdl') == -1
 
 " Vim syntax file
diff --git a/syntax/bst.vim b/syntax/bst.vim
index a59618428..87688f0c9 100644
--- a/syntax/bst.vim
+++ b/syntax/bst.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/bst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bst') == -1
 
 " Vim syntax file
diff --git a/syntax/bzl.vim b/syntax/bzl.vim
index 9c0c57811..aed4d6bb7 100644
--- a/syntax/bzl.vim
+++ b/syntax/bzl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/bzl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
 
 " Vim syntax file
diff --git a/syntax/bzr.vim b/syntax/bzr.vim
index 99db04d62..c641d25db 100644
--- a/syntax/bzr.vim
+++ b/syntax/bzr.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/bzr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzr') == -1
 
 " Vim syntax file
diff --git a/syntax/c.vim b/syntax/c.vim
index ff1cf9dbc..930bf5615 100644
--- a/syntax/c.vim
+++ b/syntax/c.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/c.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c/c++') == -1
 
 " Vim syntax file
diff --git a/syntax/cabal-1.vim b/syntax/cabal-1.vim
index 7b9724bd5..13618fbcb 100644
--- a/syntax/cabal-1.vim
+++ b/syntax/cabal-1.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cabal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 
 " syntax highlighting for cabal
diff --git a/syntax/cabal-2.vim b/syntax/cabal-2.vim
index e297a9bcd..8f502ea00 100644
--- a/syntax/cabal-2.vim
+++ b/syntax/cabal-2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cabal-2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cabal') == -1
 
 " Vim syntax file
diff --git a/syntax/caddyfile.vim b/syntax/caddyfile.vim
index da12cd77a..59ee547c6 100644
--- a/syntax/caddyfile.vim
+++ b/syntax/caddyfile.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/caddyfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
 
 " Language: Caddyfile
diff --git a/syntax/calendar.vim b/syntax/calendar.vim
index c9b6c3488..218b5db98 100644
--- a/syntax/calendar.vim
+++ b/syntax/calendar.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/calendar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'calendar') == -1
 
 " Vim syntax file
diff --git a/syntax/carp.vim b/syntax/carp.vim
index 7266360dc..16976286d 100644
--- a/syntax/carp.vim
+++ b/syntax/carp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/carp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'carp') == -1
 
 " Vim syntax file
diff --git a/syntax/catalog.vim b/syntax/catalog.vim
index 2efff8e37..1949e1342 100644
--- a/syntax/catalog.vim
+++ b/syntax/catalog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/catalog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'catalog') == -1
 
 " Vim syntax file
diff --git a/syntax/cdl.vim b/syntax/cdl.vim
index 125029c66..d54fd30e6 100644
--- a/syntax/cdl.vim
+++ b/syntax/cdl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdl') == -1
 
 " Vim syntax file
diff --git a/syntax/cdrdaoconf.vim b/syntax/cdrdaoconf.vim
index dd90437a6..41285ff5c 100644
--- a/syntax/cdrdaoconf.vim
+++ b/syntax/cdrdaoconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cdrdaoconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdrdaoconf') == -1
 
 " Vim syntax file
diff --git a/syntax/cdrtoc.vim b/syntax/cdrtoc.vim
index 2dc80fb35..3392635c8 100644
--- a/syntax/cdrtoc.vim
+++ b/syntax/cdrtoc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cdrtoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdrtoc') == -1
 
 " Vim syntax file
diff --git a/syntax/cf.vim b/syntax/cf.vim
index 591f8c526..21d3f5a90 100644
--- a/syntax/cf.vim
+++ b/syntax/cf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cf') == -1
 
 " Vim syntax file
diff --git a/syntax/cfg.vim b/syntax/cfg.vim
index ff4272e37..a70a77f5a 100644
--- a/syntax/cfg.vim
+++ b/syntax/cfg.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cfg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cfg') == -1
 
 " Vim syntax file
diff --git a/syntax/ch.vim b/syntax/ch.vim
index 00f49e016..0a6ee7c65 100644
--- a/syntax/ch.vim
+++ b/syntax/ch.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ch') == -1
 
 " Vim syntax file
diff --git a/syntax/chaiscript.vim b/syntax/chaiscript.vim
index 7a84ec90c..25653ce06 100644
--- a/syntax/chaiscript.vim
+++ b/syntax/chaiscript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/chaiscript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chaiscript') == -1
 
 " Vim syntax file
diff --git a/syntax/chaskell.vim b/syntax/chaskell.vim
index e4d303d93..019a2d6b1 100644
--- a/syntax/chaskell.vim
+++ b/syntax/chaskell.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/chaskell.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chaskell') == -1
 
 " Vim syntax file
diff --git a/syntax/chill.vim b/syntax/chill.vim
index 6385bc013..5ff41bea6 100644
--- a/syntax/chill.vim
+++ b/syntax/chill.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/chill.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chill') == -1
 
 " Vim syntax file
diff --git a/syntax/chordpro.vim b/syntax/chordpro.vim
index e114f9a71..25dad67fe 100644
--- a/syntax/chordpro.vim
+++ b/syntax/chordpro.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/chordpro.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chordpro') == -1
 
 " Vim syntax file
diff --git a/syntax/cl.vim b/syntax/cl.vim
index 3268d1e59..fe377a649 100644
--- a/syntax/cl.vim
+++ b/syntax/cl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cl') == -1
 
 " Vim syntax file
diff --git a/syntax/clean.vim b/syntax/clean.vim
index e618bf367..fc6010129 100644
--- a/syntax/clean.vim
+++ b/syntax/clean.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/clean.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clean') == -1
 
 " Vim syntax file
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index 6ef9369be..e4a21ac5a 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/clojure.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 
 " Vim syntax file
diff --git a/syntax/cmake.vim b/syntax/cmake.vim
index a7c929536..0ea44d78e 100644
--- a/syntax/cmake.vim
+++ b/syntax/cmake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cmake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmake') == -1
 
 " Vim syntax file
diff --git a/syntax/cmod.vim b/syntax/cmod.vim
index 7e5529c0a..7d5fc7407 100644
--- a/syntax/cmod.vim
+++ b/syntax/cmod.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cmod.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmod') == -1
 
 " Vim syntax file
diff --git a/syntax/cmusrc.vim b/syntax/cmusrc.vim
index 1bcbd5693..9325e5503 100644
--- a/syntax/cmusrc.vim
+++ b/syntax/cmusrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cmusrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmusrc') == -1
 
 " Vim syntax file
diff --git a/syntax/cobol.vim b/syntax/cobol.vim
index d3a723f34..2d238c83f 100644
--- a/syntax/cobol.vim
+++ b/syntax/cobol.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cobol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cobol') == -1
 
 " Vim syntax file
diff --git a/syntax/coco.vim b/syntax/coco.vim
index 298279ad7..5d9142133 100644
--- a/syntax/coco.vim
+++ b/syntax/coco.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/coco.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coco') == -1
 
 " Vim syntax file
diff --git a/syntax/coffee.vim b/syntax/coffee.vim
index 2037d02d6..043a907e2 100644
--- a/syntax/coffee.vim
+++ b/syntax/coffee.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/coffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
diff --git a/syntax/common.vim b/syntax/common.vim
index b5e5c16cf..839254a68 100644
--- a/syntax/common.vim
+++ b/syntax/common.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/common.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " Define the default highlighting.
diff --git a/syntax/conaryrecipe.vim b/syntax/conaryrecipe.vim
index 1406c6867..f054be03e 100644
--- a/syntax/conaryrecipe.vim
+++ b/syntax/conaryrecipe.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/conaryrecipe.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'conaryrecipe') == -1
 
 " Vim syntax file
diff --git a/syntax/conf.vim b/syntax/conf.vim
index 209d92d96..9d64dc7eb 100644
--- a/syntax/conf.vim
+++ b/syntax/conf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/conf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'conf') == -1
 
 " Vim syntax file
diff --git a/syntax/config.vim b/syntax/config.vim
index a3eb138e0..d89e93c77 100644
--- a/syntax/config.vim
+++ b/syntax/config.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'config') == -1
 
 " Vim syntax file
diff --git a/syntax/cpp.vim b/syntax/cpp.vim
index 5ccc7d3d8..26d1975fa 100644
--- a/syntax/cpp.vim
+++ b/syntax/cpp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cpp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c/c++') == -1
 
 " Vim syntax file
diff --git a/syntax/cql.vim b/syntax/cql.vim
index 2b6eeea57..f07f817df 100644
--- a/syntax/cql.vim
+++ b/syntax/cql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cql') == -1
 
 " Vim syntax file
diff --git a/syntax/crm.vim b/syntax/crm.vim
index a3d9db931..bfe5165a3 100644
--- a/syntax/crm.vim
+++ b/syntax/crm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/crm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crm') == -1
 
 " Vim syntax file
diff --git a/syntax/crontab.vim b/syntax/crontab.vim
index aa6cb20d9..c858dab4c 100644
--- a/syntax/crontab.vim
+++ b/syntax/crontab.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/crontab.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crontab') == -1
 
 " Vim syntax file
diff --git a/syntax/cryptol.vim b/syntax/cryptol.vim
index 97992369a..c0256e54d 100644
--- a/syntax/cryptol.vim
+++ b/syntax/cryptol.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cryptol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
 
 " Vim syntax file
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index 147bd050c..0866b3837 100644
--- a/syntax/crystal.vim
+++ b/syntax/crystal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/crystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " Language: Crystal
diff --git a/syntax/cs.vim b/syntax/cs.vim
index c86c7a9b8..687c66c2f 100644
--- a/syntax/cs.vim
+++ b/syntax/cs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
 
 " Vim syntax file
diff --git a/syntax/csc.vim b/syntax/csc.vim
index 07f538bb1..5ee5668a0 100644
--- a/syntax/csc.vim
+++ b/syntax/csc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/csc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csc') == -1
 
 " Vim syntax file
diff --git a/syntax/csdl.vim b/syntax/csdl.vim
index 33fc8fbd6..fe6c088f9 100644
--- a/syntax/csdl.vim
+++ b/syntax/csdl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/csdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csdl') == -1
 
 " Vim syntax file
diff --git a/syntax/csp.vim b/syntax/csp.vim
index e269b3f07..4a3b862e4 100644
--- a/syntax/csp.vim
+++ b/syntax/csp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/csp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csp') == -1
 
 " Vim syntax file
diff --git a/syntax/css.vim b/syntax/css.vim
index df65677d2..2cf2645ad 100644
--- a/syntax/css.vim
+++ b/syntax/css.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/css.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'css') == -1
 
 " Vim syntax file
diff --git a/syntax/csv.vim b/syntax/csv.vim
index e212e2f3c..574ac3de6 100644
--- a/syntax/csv.vim
+++ b/syntax/csv.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/csv.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csv') == -1
 
 " A simple syntax highlighting, simply alternate colors between two
diff --git a/syntax/cterm.vim b/syntax/cterm.vim
index 1fd031a1b..85260cf2a 100644
--- a/syntax/cterm.vim
+++ b/syntax/cterm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cterm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cterm') == -1
 
 " Vim syntax file
diff --git a/syntax/cucumber.vim b/syntax/cucumber.vim
index 6cc43cf97..77123633a 100644
--- a/syntax/cucumber.vim
+++ b/syntax/cucumber.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cucumber.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 
 " Vim syntax file
diff --git a/syntax/cuda.vim b/syntax/cuda.vim
index 50a7657a9..73e7c0dfc 100644
--- a/syntax/cuda.vim
+++ b/syntax/cuda.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cuda.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cuda') == -1
 
 " Vim syntax file
diff --git a/syntax/cuesheet.vim b/syntax/cuesheet.vim
index 4e30b725c..f60af6123 100644
--- a/syntax/cuesheet.vim
+++ b/syntax/cuesheet.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cuesheet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cue') == -1
 
 " Language:    Cue sheet
diff --git a/syntax/cupl.vim b/syntax/cupl.vim
index 609c50714..81807257d 100644
--- a/syntax/cupl.vim
+++ b/syntax/cupl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cupl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cupl') == -1
 
 " Vim syntax file
diff --git a/syntax/cuplsim.vim b/syntax/cuplsim.vim
index fb1d4fc8e..9f0ff45ce 100644
--- a/syntax/cuplsim.vim
+++ b/syntax/cuplsim.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cuplsim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cuplsim') == -1
 
 " Vim syntax file
diff --git a/syntax/cvs.vim b/syntax/cvs.vim
index a83b74a58..3b3011dac 100644
--- a/syntax/cvs.vim
+++ b/syntax/cvs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cvs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cvs') == -1
 
 " Vim syntax file
diff --git a/syntax/cvsrc.vim b/syntax/cvsrc.vim
index ed12b5023..999baf5a3 100644
--- a/syntax/cvsrc.vim
+++ b/syntax/cvsrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cvsrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cvsrc') == -1
 
 " Vim syntax file
diff --git a/syntax/cynpp.vim b/syntax/cynpp.vim
index f64b0a694..5e870ae7c 100644
--- a/syntax/cynpp.vim
+++ b/syntax/cynpp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/cynpp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cynpp') == -1
 
 " Vim syntax file
diff --git a/syntax/d.vim b/syntax/d.vim
index 69100b9cc..5f3f051ba 100644
--- a/syntax/d.vim
+++ b/syntax/d.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/d.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 " Vim syntax file for the D programming language (version 1.076 and 2.069).
diff --git a/syntax/dart.vim b/syntax/dart.vim
index 68035dc86..5b0c1a987 100644
--- a/syntax/dart.vim
+++ b/syntax/dart.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dart.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 
 " Vim syntax file " Language: Dart
diff --git a/syntax/datascript.vim b/syntax/datascript.vim
index b24aa9376..79a74867d 100644
--- a/syntax/datascript.vim
+++ b/syntax/datascript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/datascript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'datascript') == -1
 
 " Vim syntax file
diff --git a/syntax/dcd.vim b/syntax/dcd.vim
index 4f26d0ba8..17ffa8511 100644
--- a/syntax/dcd.vim
+++ b/syntax/dcd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dcd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dcd') == -1
 
 " Vim syntax file
diff --git a/syntax/dcov.vim b/syntax/dcov.vim
index bfd7b91c3..007a7b48f 100644
--- a/syntax/dcov.vim
+++ b/syntax/dcov.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dcov.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 " Vim syntax file for coverage information for the reference compiler (DMD) of
diff --git a/syntax/dd.vim b/syntax/dd.vim
index 2bfc2b0ec..c634232a4 100644
--- a/syntax/dd.vim
+++ b/syntax/dd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 runtime! /syntax/ddoc.vim
diff --git a/syntax/ddoc.vim b/syntax/ddoc.vim
index 0a4a9d495..5bca70824 100644
--- a/syntax/ddoc.vim
+++ b/syntax/ddoc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ddoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 if &filetype == "ddoc"
diff --git a/syntax/debchangelog.vim b/syntax/debchangelog.vim
index f36398bef..e7040ab35 100644
--- a/syntax/debchangelog.vim
+++ b/syntax/debchangelog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/debchangelog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debchangelog') == -1
 
 " Vim syntax file
diff --git a/syntax/debcontrol.vim b/syntax/debcontrol.vim
index 74ea764d2..0c246e561 100644
--- a/syntax/debcontrol.vim
+++ b/syntax/debcontrol.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/debcontrol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debcontrol') == -1
 
 " Vim syntax file
diff --git a/syntax/debcopyright.vim b/syntax/debcopyright.vim
index 2f985b1bb..aded0ddaf 100644
--- a/syntax/debcopyright.vim
+++ b/syntax/debcopyright.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/debcopyright.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debcopyright') == -1
 
 " Vim syntax file
diff --git a/syntax/debsources.vim b/syntax/debsources.vim
index ec39b8b3c..daa308d46 100644
--- a/syntax/debsources.vim
+++ b/syntax/debsources.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/debsources.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debsources') == -1
 
 " Vim syntax file
diff --git a/syntax/def.vim b/syntax/def.vim
index 413c4f3d8..084559383 100644
--- a/syntax/def.vim
+++ b/syntax/def.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/def.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'def') == -1
 
 " Vim syntax file
diff --git a/syntax/denyhosts.vim b/syntax/denyhosts.vim
index b1e47785c..7a716af81 100644
--- a/syntax/denyhosts.vim
+++ b/syntax/denyhosts.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/denyhosts.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'denyhosts') == -1
 
 " Vim syntax file
diff --git a/syntax/desc.vim b/syntax/desc.vim
index 990b0afb2..413fd67b1 100644
--- a/syntax/desc.vim
+++ b/syntax/desc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/desc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'desc') == -1
 
 " Vim syntax file
diff --git a/syntax/desktop.vim b/syntax/desktop.vim
index a35e7e840..015f2f17d 100644
--- a/syntax/desktop.vim
+++ b/syntax/desktop.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/desktop.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'desktop') == -1
 
 " Vim syntax file
diff --git a/syntax/dhall.vim b/syntax/dhall.vim
index c42e20d2d..a52161bb1 100644
--- a/syntax/dhall.vim
+++ b/syntax/dhall.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dhall.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dhall') == -1
 
 scriptencoding utf-8
diff --git a/syntax/dictconf.vim b/syntax/dictconf.vim
index 69727f71e..e72bf0df5 100644
--- a/syntax/dictconf.vim
+++ b/syntax/dictconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dictconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictconf') == -1
 
 " Vim syntax file
diff --git a/syntax/dictdconf.vim b/syntax/dictdconf.vim
index c698fa81a..85383c634 100644
--- a/syntax/dictdconf.vim
+++ b/syntax/dictdconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dictdconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictdconf') == -1
 
 " Vim syntax file
diff --git a/syntax/diff.vim b/syntax/diff.vim
index 02299ad75..e9757b780 100644
--- a/syntax/diff.vim
+++ b/syntax/diff.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/diff.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'diff') == -1
 
 " Vim syntax file
diff --git a/syntax/dircolors.vim b/syntax/dircolors.vim
index 00758289b..dfd085a84 100644
--- a/syntax/dircolors.vim
+++ b/syntax/dircolors.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dircolors.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dircolors') == -1
 
 " Vim syntax file
diff --git a/syntax/django.vim b/syntax/django.vim
index b11caa981..51a6a3e79 100644
--- a/syntax/django.vim
+++ b/syntax/django.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/django.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
 
 " Vim syntax file
diff --git a/syntax/dnsmasq.vim b/syntax/dnsmasq.vim
index 15f94343f..b9f6b5932 100644
--- a/syntax/dnsmasq.vim
+++ b/syntax/dnsmasq.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dnsmasq.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dnsmasq') == -1
 
 " Vim syntax file
diff --git a/syntax/docker-compose.vim b/syntax/docker-compose.vim
index 33582ec84..be0e07ef9 100644
--- a/syntax/docker-compose.vim
+++ b/syntax/docker-compose.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/docker-compose.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'docker-compose') == -1
 
 " Vim syntax file
diff --git a/syntax/dockerfile.vim b/syntax/dockerfile.vim
index 35ed34daa..2480c7fc9 100644
--- a/syntax/dockerfile.vim
+++ b/syntax/dockerfile.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dockerfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
 
 " dockerfile.vim - Syntax highlighting for Dockerfiles
diff --git a/syntax/dosbatch.vim b/syntax/dosbatch.vim
index 5145062a2..a9b93ceb5 100644
--- a/syntax/dosbatch.vim
+++ b/syntax/dosbatch.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dosbatch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosbatch') == -1
 
 " Vim syntax file
diff --git a/syntax/dosini.vim b/syntax/dosini.vim
index e84448b44..c052ba7c1 100644
--- a/syntax/dosini.vim
+++ b/syntax/dosini.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dosini.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosini') == -1
 
 " Vim syntax file
diff --git a/syntax/dot.vim b/syntax/dot.vim
index cf8899c19..1f8d50ba2 100644
--- a/syntax/dot.vim
+++ b/syntax/dot.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dot.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dot') == -1
 
 " Vim syntax file
diff --git a/syntax/dracula.vim b/syntax/dracula.vim
index a8feff9f9..10c45b213 100644
--- a/syntax/dracula.vim
+++ b/syntax/dracula.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dracula.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dracula') == -1
 
 " Vim syntax file
diff --git a/syntax/dsdl.vim b/syntax/dsdl.vim
index c7cc2425c..db2ddb807 100644
--- a/syntax/dsdl.vim
+++ b/syntax/dsdl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dsdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 " Vim syntax file for DUB configurations."
diff --git a/syntax/dsl.vim b/syntax/dsl.vim
index 68872114a..602b17920 100644
--- a/syntax/dsl.vim
+++ b/syntax/dsl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dsl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dsl') == -1
 
 " Vim syntax file
diff --git a/syntax/dtd.vim b/syntax/dtd.vim
index e78fb5e0c..2145b2f01 100644
--- a/syntax/dtd.vim
+++ b/syntax/dtd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dtd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dtd') == -1
 
 " Vim syntax file
diff --git a/syntax/dts.vim b/syntax/dts.vim
index 4a7579666..17a6f0be3 100644
--- a/syntax/dts.vim
+++ b/syntax/dts.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dts.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dts') == -1
 
 " Vim syntax file
diff --git a/syntax/dune.vim b/syntax/dune.vim
index 319250884..8433e47f6 100644
--- a/syntax/dune.vim
+++ b/syntax/dune.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dune.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/dylan.vim b/syntax/dylan.vim
index acf802b98..d1db4dc06 100644
--- a/syntax/dylan.vim
+++ b/syntax/dylan.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dylan.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylan') == -1
 
 " Vim syntax file
diff --git a/syntax/dylanintr.vim b/syntax/dylanintr.vim
index e8530a9ca..65e645d68 100644
--- a/syntax/dylanintr.vim
+++ b/syntax/dylanintr.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dylanintr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylanintr') == -1
 
 " Vim syntax file
diff --git a/syntax/dylanlid.vim b/syntax/dylanlid.vim
index cf44d1eea..0bdac4353 100644
--- a/syntax/dylanlid.vim
+++ b/syntax/dylanlid.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/dylanlid.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylanlid') == -1
 
 " Vim syntax file
diff --git a/syntax/ecd.vim b/syntax/ecd.vim
index 3f120981a..ef0973f18 100644
--- a/syntax/ecd.vim
+++ b/syntax/ecd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ecd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ecd') == -1
 
 " Vim syntax file
diff --git a/syntax/ecrystal.vim b/syntax/ecrystal.vim
index 096990ffb..7742ba154 100644
--- a/syntax/ecrystal.vim
+++ b/syntax/ecrystal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ecrystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 if &syntax !~# '\<ecrystal\>' || get(b:, 'current_syntax') =~# '\<ecrystal\>'
diff --git a/syntax/edif.vim b/syntax/edif.vim
index dbea79d93..883cd77f8 100644
--- a/syntax/edif.vim
+++ b/syntax/edif.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/edif.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'edif') == -1
 
 " Vim syntax file
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index 1715f36ed..92fe6a546 100644
--- a/syntax/eelixir.vim
+++ b/syntax/eelixir.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/eelixir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/elf.vim b/syntax/elf.vim
index 67063f69a..4dc7148de 100644
--- a/syntax/elf.vim
+++ b/syntax/elf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/elf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elf') == -1
 
 " Vim syntax file
diff --git a/syntax/elinks.vim b/syntax/elinks.vim
index eb0d840f0..41215404d 100644
--- a/syntax/elinks.vim
+++ b/syntax/elinks.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/elinks.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elinks') == -1
 
 " Vim syntax file
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index 890bb279a..8dee7cc41 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/elixir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if !exists("main_syntax")
diff --git a/syntax/elm.vim b/syntax/elm.vim
index 474f21d0f..115c4edb8 100644
--- a/syntax/elm.vim
+++ b/syntax/elm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/elm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 
 " syntax highlighting for Elm (https://elm-lang.org/)
diff --git a/syntax/elmfilt.vim b/syntax/elmfilt.vim
index 650bc65bf..d3e5820ca 100644
--- a/syntax/elmfilt.vim
+++ b/syntax/elmfilt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/elmfilt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elmfilt') == -1
 
 " Vim syntax file
diff --git a/syntax/embeddedpuppet.vim b/syntax/embeddedpuppet.vim
index 71096274d..eca80cedd 100644
--- a/syntax/embeddedpuppet.vim
+++ b/syntax/embeddedpuppet.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/embeddedpuppet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Vim syntax plugin
diff --git a/syntax/ember-script.vim b/syntax/ember-script.vim
index d034a67e8..df931b378 100644
--- a/syntax/ember-script.vim
+++ b/syntax/ember-script.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ember-script.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
 
 " Language:    ember-script
diff --git a/syntax/emblem.vim b/syntax/emblem.vim
index 00e7541dd..b080ad7b2 100644
--- a/syntax/emblem.vim
+++ b/syntax/emblem.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/emblem.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 
 " Language:    emblem
diff --git a/syntax/erlang.vim b/syntax/erlang.vim
index 65b8059c2..83f3be8bd 100644
--- a/syntax/erlang.vim
+++ b/syntax/erlang.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/erlang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
 
 " Vim syntax file
diff --git a/syntax/eruby.vim b/syntax/eruby.vim
index 4de67ab58..3be2b5de4 100644
--- a/syntax/eruby.vim
+++ b/syntax/eruby.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/eruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim syntax file
diff --git a/syntax/esmtprc.vim b/syntax/esmtprc.vim
index 9bd25923f..e9123c9a5 100644
--- a/syntax/esmtprc.vim
+++ b/syntax/esmtprc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/esmtprc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'esmtprc') == -1
 
 " Vim syntax file
diff --git a/syntax/esqlc.vim b/syntax/esqlc.vim
index c54802767..ea13abded 100644
--- a/syntax/esqlc.vim
+++ b/syntax/esqlc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/esqlc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'esqlc') == -1
 
 " Vim syntax file
diff --git a/syntax/esterel.vim b/syntax/esterel.vim
index 26afe3153..b2e9298d7 100644
--- a/syntax/esterel.vim
+++ b/syntax/esterel.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/esterel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'esterel') == -1
 
 " Vim syntax file
diff --git a/syntax/eterm.vim b/syntax/eterm.vim
index 459104826..1068f0d90 100644
--- a/syntax/eterm.vim
+++ b/syntax/eterm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/eterm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'eterm') == -1
 
 " Vim syntax file
diff --git a/syntax/exim.vim b/syntax/exim.vim
index 371a3aa4c..dda5ef5ce 100644
--- a/syntax/exim.vim
+++ b/syntax/exim.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/exim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'exim') == -1
 
 " Vim syntax file
diff --git a/syntax/expect.vim b/syntax/expect.vim
index b80ff528e..7ee59f561 100644
--- a/syntax/expect.vim
+++ b/syntax/expect.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/expect.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'expect') == -1
 
 " Vim syntax file
diff --git a/syntax/exports.vim b/syntax/exports.vim
index 834cab5af..3587f07a0 100644
--- a/syntax/exports.vim
+++ b/syntax/exports.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/exports.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'exports') == -1
 
 " Vim syntax file
diff --git a/syntax/falcon.vim b/syntax/falcon.vim
index 2723461d1..2b57e48bb 100644
--- a/syntax/falcon.vim
+++ b/syntax/falcon.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/falcon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'falcon') == -1
 
 " Vim syntax file
diff --git a/syntax/fan.vim b/syntax/fan.vim
index f22c89c98..9f7c6efca 100644
--- a/syntax/fan.vim
+++ b/syntax/fan.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/fan.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fan') == -1
 
 " Vim syntax file
diff --git a/syntax/fbs.vim b/syntax/fbs.vim
index 704732a47..82b826b35 100644
--- a/syntax/fbs.vim
+++ b/syntax/fbs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/fbs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'flatbuffers') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/fennel.vim b/syntax/fennel.vim
index ec6f80848..e25abac66 100644
--- a/syntax/fennel.vim
+++ b/syntax/fennel.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/fennel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fennel') == -1
 
 " Vim syntax file
diff --git a/syntax/ferm.vim b/syntax/ferm.vim
index 8bb0aaf34..4a45b7396 100644
--- a/syntax/ferm.vim
+++ b/syntax/ferm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ferm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ferm') == -1
 
 "============================================================================
diff --git a/syntax/fetchmail.vim b/syntax/fetchmail.vim
index b2843c162..2e4a2575d 100644
--- a/syntax/fetchmail.vim
+++ b/syntax/fetchmail.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/fetchmail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fetchmail') == -1
 
 " Vim syntax file
diff --git a/syntax/fgl.vim b/syntax/fgl.vim
index a1e03f645..01b4d3393 100644
--- a/syntax/fgl.vim
+++ b/syntax/fgl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/fgl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fgl') == -1
 
 " Vim syntax file
diff --git a/syntax/fish.vim b/syntax/fish.vim
index fef75cfb0..5e55660e4 100644
--- a/syntax/fish.vim
+++ b/syntax/fish.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/fish.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 
 if exists('b:current_syntax')
diff --git a/syntax/flow.vim b/syntax/flow.vim
index ad4ba0a82..7999405cb 100644
--- a/syntax/flow.vim
+++ b/syntax/flow.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/flow.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 runtime syntax/javascript.vim
diff --git a/syntax/focexec.vim b/syntax/focexec.vim
index 18b191889..e43e5e2f2 100644
--- a/syntax/focexec.vim
+++ b/syntax/focexec.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/focexec.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'focexec') == -1
 
 " Vim syntax file
diff --git a/syntax/forth.vim b/syntax/forth.vim
index dbdc120a7..d3c8d309e 100644
--- a/syntax/forth.vim
+++ b/syntax/forth.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/forth.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'forth') == -1
 
 " Vim syntax file
diff --git a/syntax/fortran.vim b/syntax/fortran.vim
index 96b0fbe82..505b9b813 100644
--- a/syntax/fortran.vim
+++ b/syntax/fortran.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/fortran.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
 
 " Vim syntax file
diff --git a/syntax/framescript.vim b/syntax/framescript.vim
index 720f1d4a2..1f0b99bfd 100644
--- a/syntax/framescript.vim
+++ b/syntax/framescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/framescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'framescript') == -1
 
 " Vim syntax file
diff --git a/syntax/freebasic.vim b/syntax/freebasic.vim
index cc932d63f..ed844b746 100644
--- a/syntax/freebasic.vim
+++ b/syntax/freebasic.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/freebasic.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'freebasic') == -1
 
 " Vim syntax file
diff --git a/syntax/fsharp.vim b/syntax/fsharp.vim
index ff92f6a6f..d623207b4 100644
--- a/syntax/fsharp.vim
+++ b/syntax/fsharp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/fsharp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
 
 " Vim syntax file
diff --git a/syntax/fstab.vim b/syntax/fstab.vim
index 256f2d041..02fc6d8bd 100644
--- a/syntax/fstab.vim
+++ b/syntax/fstab.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/fstab.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fstab') == -1
 
 " Vim syntax file
diff --git a/syntax/fvwm.vim b/syntax/fvwm.vim
index 9cd7cbc6e..425c4cd82 100644
--- a/syntax/fvwm.vim
+++ b/syntax/fvwm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/fvwm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fvwm') == -1
 
 " Vim syntax file for Fvwm-2.5.22
diff --git a/syntax/gdb.vim b/syntax/gdb.vim
index a99d6b887..d88b9b114 100644
--- a/syntax/gdb.vim
+++ b/syntax/gdb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gdb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdb') == -1
 
 " Vim syntax file
diff --git a/syntax/gdmo.vim b/syntax/gdmo.vim
index 134e7069e..370af4625 100644
--- a/syntax/gdmo.vim
+++ b/syntax/gdmo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gdmo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdmo') == -1
 
 " Vim syntax file
diff --git a/syntax/gdscript3.vim b/syntax/gdscript3.vim
index dd60b4501..c14ac812b 100644
--- a/syntax/gdscript3.vim
+++ b/syntax/gdscript3.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gdscript3.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdscript') == -1
 
 " Syntax file for GDScript
diff --git a/syntax/gedcom.vim b/syntax/gedcom.vim
index 45e27a121..04628d098 100644
--- a/syntax/gedcom.vim
+++ b/syntax/gedcom.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gedcom.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gedcom') == -1
 
 " Vim syntax file
diff --git a/syntax/git.vim b/syntax/git.vim
index 142478f88..aa508353f 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/git.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim syntax file
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index af5d42806..7e8babac8 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gitcommit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim syntax file
diff --git a/syntax/gitconfig.vim b/syntax/gitconfig.vim
index af401431e..95a54b3eb 100644
--- a/syntax/gitconfig.vim
+++ b/syntax/gitconfig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gitconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim syntax file
diff --git a/syntax/gitignore.vim b/syntax/gitignore.vim
index 7a1a8e9ca..ba6238299 100644
--- a/syntax/gitignore.vim
+++ b/syntax/gitignore.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gitignore.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
 
 scriptencoding utf-8
diff --git a/syntax/gitolite.vim b/syntax/gitolite.vim
index 1cbd62601..56989389c 100644
--- a/syntax/gitolite.vim
+++ b/syntax/gitolite.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gitolite.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitolite') == -1
 
 " Vim syntax file
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index 4f2707b4b..b36e99305 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/gitrebase.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gitrebase.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim syntax file
diff --git a/syntax/gitsendemail.vim b/syntax/gitsendemail.vim
index d4bfb8b32..0d02129d4 100644
--- a/syntax/gitsendemail.vim
+++ b/syntax/gitsendemail.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gitsendemail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim syntax file
diff --git a/syntax/gkrellmrc.vim b/syntax/gkrellmrc.vim
index 899f914ac..acd8b85b2 100644
--- a/syntax/gkrellmrc.vim
+++ b/syntax/gkrellmrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gkrellmrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gkrellmrc') == -1
 
 " Vim syntax file
diff --git a/syntax/glsl.vim b/syntax/glsl.vim
index 34876b5da..12b30938b 100644
--- a/syntax/glsl.vim
+++ b/syntax/glsl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/glsl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
 
 " Language: OpenGL Shading Language
diff --git a/syntax/gmpl.vim b/syntax/gmpl.vim
index b157c0127..18c65bf4e 100644
--- a/syntax/gmpl.vim
+++ b/syntax/gmpl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gmpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gmpl') == -1
 
 " Vim syntax file
diff --git a/syntax/gnash.vim b/syntax/gnash.vim
index b424b8e23..c1fdccf55 100644
--- a/syntax/gnash.vim
+++ b/syntax/gnash.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gnash.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gnash') == -1
 
 " Vim syntax file
diff --git a/syntax/gnuplot.vim b/syntax/gnuplot.vim
index 95ee7fd56..e66aa84ab 100644
--- a/syntax/gnuplot.vim
+++ b/syntax/gnuplot.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gnuplot.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gnuplot') == -1
 
 " Vim syntax file
diff --git a/syntax/go.vim b/syntax/go.vim
index 73f280370..83fa7cb2c 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/go.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " Copyright 2009 The Go Authors. All rights reserved.
diff --git a/syntax/godebugoutput.vim b/syntax/godebugoutput.vim
index f00139365..9577ca2f2 100644
--- a/syntax/godebugoutput.vim
+++ b/syntax/godebugoutput.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/godebugoutput.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/godebugstacktrace.vim b/syntax/godebugstacktrace.vim
index 2568100d3..117b04585 100644
--- a/syntax/godebugstacktrace.vim
+++ b/syntax/godebugstacktrace.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/godebugstacktrace.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/godebugvariables.vim b/syntax/godebugvariables.vim
index 7e7254729..bc3536904 100644
--- a/syntax/godebugvariables.vim
+++ b/syntax/godebugvariables.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/godebugvariables.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/godefstack.vim b/syntax/godefstack.vim
index 0b6ce1683..161296a2d 100644
--- a/syntax/godefstack.vim
+++ b/syntax/godefstack.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/godefstack.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/gohtmltmpl.vim b/syntax/gohtmltmpl.vim
index 0cc7b955c..6c5a095e7 100644
--- a/syntax/gohtmltmpl.vim
+++ b/syntax/gohtmltmpl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gohtmltmpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/gomod.vim b/syntax/gomod.vim
index 11cd76862..190f39ece 100644
--- a/syntax/gomod.vim
+++ b/syntax/gomod.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gomod.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " gomod.vim: Vim syntax file for go.mod file
diff --git a/syntax/gotexttmpl.vim b/syntax/gotexttmpl.vim
index 3d5f3926b..621324ec1 100644
--- a/syntax/gotexttmpl.vim
+++ b/syntax/gotexttmpl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gotexttmpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " Copyright 2011 The Go Authors. All rights reserved.
diff --git a/syntax/gp.vim b/syntax/gp.vim
index cf2c18c2b..3f6aaa67a 100644
--- a/syntax/gp.vim
+++ b/syntax/gp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gp') == -1
 
 " Vim syntax file
diff --git a/syntax/gpg.vim b/syntax/gpg.vim
index b6e9578a1..b828cdc81 100644
--- a/syntax/gpg.vim
+++ b/syntax/gpg.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gpg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gpg') == -1
 
 " Vim syntax file
diff --git a/syntax/grads.vim b/syntax/grads.vim
index bb8f4b337..163f874cf 100644
--- a/syntax/grads.vim
+++ b/syntax/grads.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/grads.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'grads') == -1
 
 " Vim syntax file
diff --git a/syntax/graphql.vim b/syntax/graphql.vim
index 6ccbf03fb..834e98245 100644
--- a/syntax/graphql.vim
+++ b/syntax/graphql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/graphql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
diff --git a/syntax/gretl.vim b/syntax/gretl.vim
index 7378015b0..491342ce3 100644
--- a/syntax/gretl.vim
+++ b/syntax/gretl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gretl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gretl') == -1
 
 " Vim syntax file
diff --git a/syntax/groovy.vim b/syntax/groovy.vim
index 6a4de4d5f..acf9af510 100644
--- a/syntax/groovy.vim
+++ b/syntax/groovy.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/groovy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy') == -1
 
 " Vim syntax file
diff --git a/syntax/group.vim b/syntax/group.vim
index a0dba966a..0365cc96a 100644
--- a/syntax/group.vim
+++ b/syntax/group.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/group.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'group') == -1
 
 " Vim syntax file
diff --git a/syntax/grub.vim b/syntax/grub.vim
index b752209de..b276985d7 100644
--- a/syntax/grub.vim
+++ b/syntax/grub.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/grub.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'grub') == -1
 
 " Vim syntax file
diff --git a/syntax/gsl.vim b/syntax/gsl.vim
index 6118a3af1..be4475272 100644
--- a/syntax/gsl.vim
+++ b/syntax/gsl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gsl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdscript') == -1
 
 " Syntax file for Godot Shading Language
diff --git a/syntax/gsp.vim b/syntax/gsp.vim
index 03c604048..3b3f3a9f2 100644
--- a/syntax/gsp.vim
+++ b/syntax/gsp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gsp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gsp') == -1
 
 " Vim syntax file
diff --git a/syntax/gtkrc.vim b/syntax/gtkrc.vim
index beebd233a..830490e88 100644
--- a/syntax/gtkrc.vim
+++ b/syntax/gtkrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/gtkrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gtkrc') == -1
 
 " Vim syntax file
diff --git a/syntax/haml.vim b/syntax/haml.vim
index 02f5cf835..61c9c63a9 100644
--- a/syntax/haml.vim
+++ b/syntax/haml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/haml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 
 " Vim syntax file
diff --git a/syntax/hamster.vim b/syntax/hamster.vim
index c93e95fa2..23fdb5f57 100644
--- a/syntax/hamster.vim
+++ b/syntax/hamster.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/hamster.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hamster') == -1
 
 " Vim syntax file
diff --git a/syntax/handlebars.vim b/syntax/handlebars.vim
index 52c2913ab..3ecdbc549 100644
--- a/syntax/handlebars.vim
+++ b/syntax/handlebars.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/handlebars.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 " Mustache & Handlebars syntax
diff --git a/syntax/haproxy.vim b/syntax/haproxy.vim
index 21a449c27..b2796c48a 100644
--- a/syntax/haproxy.vim
+++ b/syntax/haproxy.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/haproxy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haproxy') == -1
 
 " Vim syntax file
diff --git a/syntax/haskell.vim b/syntax/haskell.vim
index aed7aac55..e1f1c3083 100644
--- a/syntax/haskell.vim
+++ b/syntax/haskell.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/haskell.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 
 " syntax highlighting for haskell
diff --git a/syntax/haste.vim b/syntax/haste.vim
index 0368fd305..33ab9fff0 100644
--- a/syntax/haste.vim
+++ b/syntax/haste.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/haste.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haste') == -1
 
 " Vim syntax file
diff --git a/syntax/hastepreproc.vim b/syntax/hastepreproc.vim
index db8bd237d..40e429190 100644
--- a/syntax/hastepreproc.vim
+++ b/syntax/hastepreproc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/hastepreproc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hastepreproc') == -1
 
 " Vim syntax file
diff --git a/syntax/haxe.vim b/syntax/haxe.vim
index ef159ce9c..90f85dec1 100644
--- a/syntax/haxe.vim
+++ b/syntax/haxe.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/haxe.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haxe') == -1
 
 " Vim syntax file
diff --git a/syntax/hb.vim b/syntax/hb.vim
index 6a3eacd2f..b92ac3b23 100644
--- a/syntax/hb.vim
+++ b/syntax/hb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/hb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hb') == -1
 
 " Vim syntax file
diff --git a/syntax/hcl.vim b/syntax/hcl.vim
index 66d4071cb..96db23bf1 100644
--- a/syntax/hcl.vim
+++ b/syntax/hcl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/hcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hcl') == -1
 
 
diff --git a/syntax/helm.vim b/syntax/helm.vim
index 8118a5735..c3c4e1ba7 100644
--- a/syntax/helm.vim
+++ b/syntax/helm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/helm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'helm') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/help.vim b/syntax/help.vim
index a031e48e0..afd6588a2 100644
--- a/syntax/help.vim
+++ b/syntax/help.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/help.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'help') == -1
 
 " Vim syntax file
diff --git a/syntax/hercules.vim b/syntax/hercules.vim
index e0fc737a4..c08283e38 100644
--- a/syntax/hercules.vim
+++ b/syntax/hercules.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/hercules.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hercules') == -1
 
 " Vim syntax file
diff --git a/syntax/hex.vim b/syntax/hex.vim
index 62e51f962..5ae880df4 100644
--- a/syntax/hex.vim
+++ b/syntax/hex.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/hex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hex') == -1
 
 " Vim syntax file
diff --git a/syntax/hgcommit.vim b/syntax/hgcommit.vim
index a57ccafaf..ad96c5149 100644
--- a/syntax/hgcommit.vim
+++ b/syntax/hgcommit.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/hgcommit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hgcommit') == -1
 
 " Vim syntax file
diff --git a/syntax/hive.vim b/syntax/hive.vim
index 12a87f8ec..7bef1dc57 100644
--- a/syntax/hive.vim
+++ b/syntax/hive.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/hive.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hive') == -1
 
 " Vim syntax file
diff --git a/syntax/hog.vim b/syntax/hog.vim
index 95a09fd53..1c6b89f6a 100644
--- a/syntax/hog.vim
+++ b/syntax/hog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/hog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hog') == -1
 
 " Vim syntax file
diff --git a/syntax/hollywood.vim b/syntax/hollywood.vim
index cf3345f4b..fef8c79e8 100644
--- a/syntax/hollywood.vim
+++ b/syntax/hollywood.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/hollywood.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hollywood') == -1
 
 " Vim syntax file
diff --git a/syntax/hostconf.vim b/syntax/hostconf.vim
index bf69bf7df..90bb4937c 100644
--- a/syntax/hostconf.vim
+++ b/syntax/hostconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/hostconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hostconf') == -1
 
 " Vim syntax file
diff --git a/syntax/hostsaccess.vim b/syntax/hostsaccess.vim
index aab22b0eb..100462dc2 100644
--- a/syntax/hostsaccess.vim
+++ b/syntax/hostsaccess.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/hostsaccess.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hostsaccess') == -1
 
 " Vim syntax file
diff --git a/syntax/html.vim b/syntax/html.vim
index a04b4c90d..d5699c3d4 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/html.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html') == -1
 
 " Vim syntax file
diff --git a/syntax/htmldjango.vim b/syntax/htmldjango.vim
index 0e2c329d7..c16cbb801 100644
--- a/syntax/htmldjango.vim
+++ b/syntax/htmldjango.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/htmldjango.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
 
 " Vim syntax file
diff --git a/syntax/htmlm4.vim b/syntax/htmlm4.vim
index 60c02ea9e..00915a951 100644
--- a/syntax/htmlm4.vim
+++ b/syntax/htmlm4.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/htmlm4.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmlm4') == -1
 
 " Vim syntax file
diff --git a/syntax/i3config.vim b/syntax/i3config.vim
index 3b36d1070..957048eaf 100644
--- a/syntax/i3config.vim
+++ b/syntax/i3config.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/i3config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'i3') == -1
 
 " Vim syntax file
diff --git a/syntax/ibasic.vim b/syntax/ibasic.vim
index 0fd76d484..2725331f2 100644
--- a/syntax/ibasic.vim
+++ b/syntax/ibasic.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ibasic.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ibasic') == -1
 
 " Vim syntax file
diff --git a/syntax/icalendar.vim b/syntax/icalendar.vim
index 05b3d68cb..eb99cad2d 100644
--- a/syntax/icalendar.vim
+++ b/syntax/icalendar.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/icalendar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'icalendar') == -1
 
 " Vim syntax file
diff --git a/syntax/icemenu.vim b/syntax/icemenu.vim
index 2f454bfc5..68b309767 100644
--- a/syntax/icemenu.vim
+++ b/syntax/icemenu.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/icemenu.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'icemenu') == -1
 
 " Vim syntax file
diff --git a/syntax/icon.vim b/syntax/icon.vim
index de5c021d7..d15d63ffa 100644
--- a/syntax/icon.vim
+++ b/syntax/icon.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/icon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'icon') == -1
 
 " Vim syntax file
diff --git a/syntax/idris.vim b/syntax/idris.vim
index 934c900b5..15833ee6c 100644
--- a/syntax/idris.vim
+++ b/syntax/idris.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/idris.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 
 " syntax highlighting for idris (idris-lang.org)
diff --git a/syntax/idris2.vim b/syntax/idris2.vim
index 6bd18c584..aa7055788 100644
--- a/syntax/idris2.vim
+++ b/syntax/idris2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/idris2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
 
 " syntax highlighting for Idris 2 (idris-lang.org)
diff --git a/syntax/indent.vim b/syntax/indent.vim
index 8d305c85a..4a11ae599 100644
--- a/syntax/indent.vim
+++ b/syntax/indent.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'indent') == -1
 
 " Vim syntax file
diff --git a/syntax/inform.vim b/syntax/inform.vim
index a2f2fac4a..4ec5703f1 100644
--- a/syntax/inform.vim
+++ b/syntax/inform.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/inform.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'inform') == -1
 
 " Vim syntax file
diff --git a/syntax/initng.vim b/syntax/initng.vim
index 8f8d459b0..a9d74d3db 100644
--- a/syntax/initng.vim
+++ b/syntax/initng.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/initng.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'initng') == -1
 
 " Vim syntax file
diff --git a/syntax/inittab.vim b/syntax/inittab.vim
index 35be2f20c..534d2ce73 100644
--- a/syntax/inittab.vim
+++ b/syntax/inittab.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/inittab.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'inittab') == -1
 
 " Vim syntax file
diff --git a/syntax/ion.vim b/syntax/ion.vim
index 40a5d59cd..96d329e2e 100644
--- a/syntax/ion.vim
+++ b/syntax/ion.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ion.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ion') == -1
 
 if v:version < 600
diff --git a/syntax/ipfilter.vim b/syntax/ipfilter.vim
index 1924b0663..c550b547e 100644
--- a/syntax/ipfilter.vim
+++ b/syntax/ipfilter.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ipfilter.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ipfilter') == -1
 
 " ipfilter syntax file
diff --git a/syntax/iss.vim b/syntax/iss.vim
index 835896120..4e28e36f5 100644
--- a/syntax/iss.vim
+++ b/syntax/iss.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/iss.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'iss') == -1
 
 " Vim syntax file
diff --git a/syntax/ist.vim b/syntax/ist.vim
index 75579b2e7..390b9f7b2 100644
--- a/syntax/ist.vim
+++ b/syntax/ist.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ist.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ist') == -1
 
 " Vim syntax file
diff --git a/syntax/j.vim b/syntax/j.vim
index 1a2e07ee7..6275a955a 100644
--- a/syntax/j.vim
+++ b/syntax/j.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/j.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'j') == -1
 
 " Vim syntax file
diff --git a/syntax/jal.vim b/syntax/jal.vim
index fa24ffd92..c72c1394b 100644
--- a/syntax/jal.vim
+++ b/syntax/jal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/jal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jal') == -1
 
 " Vim syntax file
diff --git a/syntax/jam.vim b/syntax/jam.vim
index 4ce35d574..53091ba9d 100644
--- a/syntax/jam.vim
+++ b/syntax/jam.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/jam.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jam') == -1
 
 " Vim syntax file
diff --git a/syntax/java.vim b/syntax/java.vim
index cd1bf69e1..0ca7a1952 100644
--- a/syntax/java.vim
+++ b/syntax/java.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/java.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'java') == -1
 
 " Vim syntax file
diff --git a/syntax/javacc.vim b/syntax/javacc.vim
index 5d932bae1..f00bb0da7 100644
--- a/syntax/javacc.vim
+++ b/syntax/javacc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/javacc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javacc') == -1
 
 " Vim syntax file
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index b2ef4c79a..341e4a547 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/javascript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 " Vim syntax file
diff --git a/syntax/jess.vim b/syntax/jess.vim
index 5a15286dc..4f37959c7 100644
--- a/syntax/jess.vim
+++ b/syntax/jess.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/jess.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jess') == -1
 
 " Vim syntax file
diff --git a/syntax/jgraph.vim b/syntax/jgraph.vim
index 5bc5caaac..d3b86a5a5 100644
--- a/syntax/jgraph.vim
+++ b/syntax/jgraph.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/jgraph.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jgraph') == -1
 
 " Vim syntax file
diff --git a/syntax/jinja2.vim b/syntax/jinja2.vim
index 830d3be1a..3cbf38df1 100644
--- a/syntax/jinja2.vim
+++ b/syntax/jinja2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/jinja2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 " Vim syntax file
diff --git a/syntax/jovial.vim b/syntax/jovial.vim
index a3c31f6f1..9a350a603 100644
--- a/syntax/jovial.vim
+++ b/syntax/jovial.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/jovial.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jovial') == -1
 
 " Vim syntax file
diff --git a/syntax/jproperties.vim b/syntax/jproperties.vim
index cbf55597f..b8003df45 100644
--- a/syntax/jproperties.vim
+++ b/syntax/jproperties.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/jproperties.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jproperties') == -1
 
 " Vim syntax file
diff --git a/syntax/jq.vim b/syntax/jq.vim
index a767d5221..dbfc6b52b 100644
--- a/syntax/jq.vim
+++ b/syntax/jq.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/jq.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jq') == -1
 
 " Vim syntax file
diff --git a/syntax/json.vim b/syntax/json.vim
index dcdfebdf1..fe718b34b 100644
--- a/syntax/json.vim
+++ b/syntax/json.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/json.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 
 " Vim syntax file
diff --git a/syntax/json5.vim b/syntax/json5.vim
index 5b1e5636b..d3904ff1d 100644
--- a/syntax/json5.vim
+++ b/syntax/json5.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/json5.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json5') == -1
 
 " Modified from the original taken from https://github.com/gutenye/json5.vim
diff --git a/syntax/jsonnet.vim b/syntax/jsonnet.vim
index c4b1e625c..c3142d85d 100644
--- a/syntax/jsonnet.vim
+++ b/syntax/jsonnet.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/jsonnet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsonnet') == -1
 
 " Copyright 2014 Google Inc. All rights reserved.
diff --git a/syntax/jsp.vim b/syntax/jsp.vim
index 247a51b43..f474f75e8 100644
--- a/syntax/jsp.vim
+++ b/syntax/jsp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/jsp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsp') == -1
 
 " Vim syntax file
diff --git a/syntax/jst.vim b/syntax/jst.vim
index e520379b5..a364b5bf4 100644
--- a/syntax/jst.vim
+++ b/syntax/jst.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/jst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/julia.vim b/syntax/julia.vim
index c2f36b7e3..29e00bba9 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/julia.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Vim syntax file
diff --git a/syntax/juliadoc.vim b/syntax/juliadoc.vim
index 4092a9ef0..2ae435c2d 100644
--- a/syntax/juliadoc.vim
+++ b/syntax/juliadoc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/juliadoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Vim syntax file for julia document view
diff --git a/syntax/kconfig.vim b/syntax/kconfig.vim
index 86ed9ff4d..5a0ec8520 100644
--- a/syntax/kconfig.vim
+++ b/syntax/kconfig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/kconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kconfig') == -1
 
 " Vim syntax file
diff --git a/syntax/kivy.vim b/syntax/kivy.vim
index 3a7159c39..c71cff099 100644
--- a/syntax/kivy.vim
+++ b/syntax/kivy.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/kivy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kivy') == -1
 
 " Vim syntax file
diff --git a/syntax/kix.vim b/syntax/kix.vim
index bc27e8397..1e56a02f4 100644
--- a/syntax/kix.vim
+++ b/syntax/kix.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/kix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kix') == -1
 
 " Vim syntax file
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index 82437dd77..4593234c0 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/kotlin.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
 
 " Vim syntax file
diff --git a/syntax/kscript.vim b/syntax/kscript.vim
index 84d6126d3..caf54360b 100644
--- a/syntax/kscript.vim
+++ b/syntax/kscript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/kscript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kscript') == -1
 
 " Vim syntax file
diff --git a/syntax/kwt.vim b/syntax/kwt.vim
index 7f4c4e8c8..b49013586 100644
--- a/syntax/kwt.vim
+++ b/syntax/kwt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/kwt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kwt') == -1
 
 " Vim syntax file
diff --git a/syntax/lace.vim b/syntax/lace.vim
index 084d51871..309a85bfb 100644
--- a/syntax/lace.vim
+++ b/syntax/lace.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lace.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lace') == -1
 
 " Vim syntax file
diff --git a/syntax/latte.vim b/syntax/latte.vim
index 1dea60cfa..fe94d9cce 100644
--- a/syntax/latte.vim
+++ b/syntax/latte.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/latte.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latte') == -1
 
 " Vim syntax file
diff --git a/syntax/ld.vim b/syntax/ld.vim
index 4646b0aa8..dc51e15f8 100644
--- a/syntax/ld.vim
+++ b/syntax/ld.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ld.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ld') == -1
 
 " Vim syntax file
diff --git a/syntax/ldif.vim b/syntax/ldif.vim
index ac73f285e..5f8f89227 100644
--- a/syntax/ldif.vim
+++ b/syntax/ldif.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ldif.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ldif') == -1
 
 " Vim syntax file
diff --git a/syntax/ledger.vim b/syntax/ledger.vim
index 98ada4c9f..b768c8349 100644
--- a/syntax/ledger.vim
+++ b/syntax/ledger.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ledger.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ledger') == -1
 
 " Vim syntax file
diff --git a/syntax/less.vim b/syntax/less.vim
index 82feb4549..ee2a40bbb 100644
--- a/syntax/less.vim
+++ b/syntax/less.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/less.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 
 " Vim syntax file
diff --git a/syntax/lex.vim b/syntax/lex.vim
index 15ca5e010..a4d62b119 100644
--- a/syntax/lex.vim
+++ b/syntax/lex.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lex') == -1
 
 " Vim syntax file
diff --git a/syntax/lftp.vim b/syntax/lftp.vim
index b70595537..916954589 100644
--- a/syntax/lftp.vim
+++ b/syntax/lftp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lftp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lftp') == -1
 
 " Vim syntax file
diff --git a/syntax/lhaskell.vim b/syntax/lhaskell.vim
index c1dacf1f8..a38b93c02 100644
--- a/syntax/lhaskell.vim
+++ b/syntax/lhaskell.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lhaskell.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lhaskell') == -1
 
 " Vim syntax file
diff --git a/syntax/libao.vim b/syntax/libao.vim
index 01ad1dd55..0080efe35 100644
--- a/syntax/libao.vim
+++ b/syntax/libao.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/libao.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'libao') == -1
 
 " Vim syntax file
diff --git a/syntax/lidris.vim b/syntax/lidris.vim
index af65997fb..8f1ca1b30 100644
--- a/syntax/lidris.vim
+++ b/syntax/lidris.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lidris.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 
 " Vim syntax file
diff --git a/syntax/lidris2.vim b/syntax/lidris2.vim
index a47572050..277e10024 100644
--- a/syntax/lidris2.vim
+++ b/syntax/lidris2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lidris2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
 
 " Vim syntax file
diff --git a/syntax/lifelines.vim b/syntax/lifelines.vim
index 05ac1cf8b..2f92a7ec7 100644
--- a/syntax/lifelines.vim
+++ b/syntax/lifelines.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lifelines.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lifelines') == -1
 
 " Vim syntax file
diff --git a/syntax/lilo.vim b/syntax/lilo.vim
index daa364dff..66c6c9637 100644
--- a/syntax/lilo.vim
+++ b/syntax/lilo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lilo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilo') == -1
 
 " Vim syntax file
diff --git a/syntax/lilypond-words.vim b/syntax/lilypond-words.vim
index 5af8d964d..43ad7c3dd 100644
--- a/syntax/lilypond-words.vim
+++ b/syntax/lilypond-words.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lilypond-words.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 
 syn match lilyKeyword "[-_^]\?\\\(xNotesOn\|xNotesOff\|xNote\|wordwrap-string-internal\|wordwrap-string\|wordwrap-lines\|wordwrap-internal\|wordwrap-field\|wordwrap\|withMusicProperty\|with-url\|with-link\|with-dimensions\|with-color\|with\|whiteout\|whiteTriangleMarkup\|walkerHeadsMinor\|walkerHeads\|vspace\|void\|voiceTwoStyle\|voiceTwo\|voiceThreeStyle\|voiceThree\|voiceOneStyle\|voiceOne\|voiceNeutralStyle\|voiceFourStyle\|voiceFour\|vocalName\|virgula\|virga\|verylongfermata\|versus\|version\|verbatim-file\|vcenter\|varcoda\|upright\|upprall\|upmordent\|upbow\|up\|unset\|unit\|unfoldRepeats\|undo\|underline\|unaCorda\|unHideNotes\|typewriter\|type\|tweak\|turn\|tupletUp\|tupletSpan\|tupletNeutral\|tupletDown\|tuplet\|trill\|triangle\|treCorde\|transposition\|transposedCueDuring\|transpose\|transparent\|translate-scaled\|translate\|topLevelAlignment\|tocTitleMarkup\|tocItemWithDotsMarkup\|tocItemMarkup\|tocItem\|tiny\|timing\|times\|timeSignatureSettings\|timeSignatureFraction\|time\|tied-lyric\|tieWaitForNote\|tieUp\|tieSolid\|tieNeutral\|tieHalfSolid\|tieHalfDashed\|tieDown\|tieDotted\|tieDashed\|tieDashPattern\|thumb\|textSpannerUp\|textSpannerNeutral\|textSpannerDown\|textLengthOn\|textLengthOff\|text\|tenuto\|temporary\|tempoWholesPerMinute\|tempo\|teeny\|tag\|table-of-contents\|tablatureFormat\|tabStaffLineLayoutFunction\|tabFullNotation\|systemStartDelimiter\|sustainOn\|sustainOff\|super\|subdivideBeams\|sub\|styledNoteHeads\|strut\|stropha\|strokeFingerOrientations\|stringTunings\|stringOneTopmost\|stringNumberOrientations\|stopped\|stopTrillSpan\|stopTextSpan\|stopStaff\|stopSlashedGraceMusic\|stopMeasureCount\|stopGroup\|stopGraceSlur\|stopGraceMusic\|stopAppoggiaturaMusic\|stopAcciaccaturaMusic\|stop\|stencil\|stemUp\|stemNeutral\|stemDown\|startTrillSpan\|startTextSpan\|startStaff\|startSlashedGraceMusic\|startRepeatType\|startMeasureCount\|startGroup\|startGraceSlur\|startGraceMusic\|startAppoggiaturaMusic\|startAcciaccaturaMusic\|start\|staccato\|staccatissimo\|squashedPosition\|spp\|spacingTweaks\|sp\|southernHarmonyHeadsMinor\|southernHarmonyHeads\|sostenutoOn\|sostenutoOff\|soloText\|soloIIText\|snappizzicato\|smaller\|smallCaps\|small\|slurUp\|slurSolid\|slurNeutral\|slurHalfSolid\|slurHalfDashed\|slurDown\|slurDotted\|slurDashed\|slurDashPattern\|slashedGrace\|slashed-digit\|slashChordSeparator\|skipTypesetting\|skip\|single\|simultaneous\|simple\|signumcongruentiae\|showStaffSwitch\|showSplitTiedTabNotes\|shortfermata\|shortVocalName\|shortInstrumentName\|shiftOnnn\|shiftOnn\|shiftOn\|shiftOff\|shiftDurations\|sharp\|shape\|sfz\|sfp\|sff\|sf\|settingsFrom\|setDefaultDurationToQuarter\|set\|sesquisharp\|sesquiflat\|sequential\|semisharp\|semiflat\|semicirculus\|semiGermanChords\|segno\|searchForVoice\|scriptDefinitions\|score\|scaleDurations\|scale\|sans\|sacredHarpHeadsMinor\|sacredHarpHeads\|rtoe\|rounded-box\|rotate\|roman\|rightHandFinger\|right-column\|right-brace\|right-align\|right\|rheel\|rfz\|revertTimeSignatureSettings\|revert\|reverseturn\|retrograde\|restrainOpenStrings\|rest-by-number\|rest\|responsum\|resetRelativeOctave\|replace\|repeatTie\|repeatCountVisibility\|repeat\|removeWithTag\|remove\|relative\|rehearsalMark\|raise\|quotedEventTypes\|quotedCueEventTypes\|quoteDuring\|quilisma\|put-adjacent\|pushToTag\|pt\|property-recursive\|printPartCombineTexts\|printKeyCancellation\|predefinedFretboardsOn\|predefinedFretboardsOff\|predefinedDiagramTable\|prallup\|prallprall\|prallmordent\|pralldown\|prall\|ppppp\|pppp\|ppp\|pp\|powerChords\|powerChordSymbol\|powerChordExceptions\|postscript\|portato\|pointAndClickTypes\|pointAndClickOn\|pointAndClickOff\|pitchedTrill\|phrygian\|phrasingSlurUp\|phrasingSlurSolid\|phrasingSlurNeutral\|phrasingSlurHalfSolid\|phrasingSlurHalfDashed\|phrasingSlurDown\|phrasingSlurDotted\|phrasingSlurDashed\|phrasingSlurDashPattern\|pes\|pedalUnaCordaStyle\|pedalUnaCordaStrings\|pedalSustainStyle\|pedalSustainStrings\|pedalSostenutoStyle\|pedalSostenutoStrings\|pattern\|path\|partialJazzMusic\|partialJazzExceptions\|partial\|partcombineUp\|partcombineUnisonoOnce\|partcombineUnisono\|partcombineSoloIOnce\|partcombineSoloIIOnce\|partcombineSoloII\|partcombineSoloI\|partcombineForce\|partcombineDown\|partcombineChordsOnce\|partcombineChords\|partcombineAutomaticOnce\|partcombineAutomatic\|partcombineApartOnce\|partcombineApart\|partcombine\|partCombineTextsOnNote\|partCombineListener\|parenthesize\|parallelMusic\|paper\|palmMuteOn\|palmMuteOff\|palmMute\|pageTurn\|pageBreak\|page-ref\|page-link\|pad-x\|pad-to-box\|pad-markup\|pad-around\|p\|overrideTimeSignatureSettings\|overrideProperty\|override-lines\|override\|oval\|ottava\|oriscus\|open\|oneVoice\|once\|on-the-fly\|omit\|offset\|octaveCheck\|numericTimeSignature\|number\|null\|notemode\|noteToFretFunction\|note-by-number\|note\|normalsize\|normal-text\|normal-size-super\|normal-size-sub\|noPageTurn\|noPageBreak\|noChordSymbol\|noBreak\|noBeam\|newSpacingSection\|new\|neumeDemoLayout\|natural\|name\|musicglyph\|musicMap\|mp\|mordent\|modalTranspose\|modalInversion\|mm\|mixolydian\|minorChordModifier\|minor\|midiInstrument\|midiChannelMapping\|midi\|middleCPosition\|middleCClefPosition\|mf\|metronomeMarkFormatter\|mergeDifferentlyHeadedOn\|mergeDifferentlyHeadedOff\|mergeDifferentlyDottedOn\|mergeDifferentlyDottedOff\|melismaEnd\|melismaBusyProperties\|melisma\|medium\|maxima\|markuplist\|markup\|markletter\|markalphabet\|markLengthOn\|markLengthOff\|markFormatter\|mark\|marcato\|map-markup-commands\|makeClusters\|majorSevenSymbol\|major\|maininput\|magnify\|lyricsto\|lyrics\|lyricmode\|lyricMelismaAlignment\|lydian\|ltoe\|lower\|lookup\|longfermata\|longa\|locrian\|localKeySignature\|lineprall\|linea\|line\|ligature\|lheel\|left-column\|left-brace\|left-align\|left\|layout\|larger\|large\|languageSaveAndChange\|languageRestore\|language\|laissezVibrer\|label\|killCues\|kievanOn\|kievanOff\|keyAlterationOrder\|key\|keepWithTag\|keepAliveInterfaces\|justify-string\|justify-field\|justify\|justified-lines\|italic\|italianChords\|ionian\|inversion\|interscoreline\|instrumentTransposition\|instrumentSwitch\|instrumentName\|instrumentEqualizer\|indent\|include\|inclinatum\|inStaffSegno\|in\|improvisationOn\|improvisationOff\|implicitTimeSignatureVisibility\|ij\|iij\|ignoreFiguredBassRest\|ignoreBarChecks\|ignatzekExceptions\|ignatzekExceptionMusic\|ictus\|huge\|hspace\|highStringOne\|hideStaffSwitch\|hideSplitTiedTabNotes\|hideNotes\|hide\|header\|hcenter-in\|hbracket\|harp-pedal\|harmonicsOn\|harmonicsOff\|harmonicNote\|harmonicByRatio\|harmonicByFret\|harmonicAccidentals\|harmonic\|handleNegativeFrets\|halign\|halfopen\|grobdescriptions\|graceSettings\|grace\|glissando\|germanChords\|general-align\|fz\|funkHeadsMinor\|funkHeads\|fullJazzExceptions\|fromproperty\|fret-diagram-verbose\|fret-diagram-terse\|fret-diagram\|frenchChords\|fraction\|fp\|footnote\|fontsize\|fontSize\|fontCaps\|flexa\|flat\|flageolet\|firstClef\|fingeringOrientations\|finger\|finalis\|filled-box\|fill-with-pattern\|fill-line\|figures\|figuremode\|figuredBassFormatter\|fffff\|ffff\|fff\|ff\|fermataMarkup\|fermata\|featherDurations\|f\|eyeglasses\|extraNatural\|explicitKeySignatureVisibility\|explicitCueClefVisibility\|explicitClefVisibility\|expandFullBarRests\|eventChords\|espressivo\|epsfile\|episemInitium\|episemFinis\|endincipit\|enddim\|enddecresc\|enddecr\|endcresc\|endcr\|endSpanners\|endRepeatType\|ellipse\|easyHeadsOn\|easyHeadsOff\|dynamicUp\|dynamicNeutral\|dynamicDown\|dynamicAbsoluteVolumeFunction\|dynamic\|drums\|drummode\|drumStyleTable\|drumPitchTable\|draw-line\|draw-hline\|draw-dotted-line\|draw-dashed-line\|draw-circle\|downprall\|downmordent\|downbow\|down\|doublesharp\|doubleflat\|doubleRepeatType\|dotsUp\|dotsNeutral\|dotsDown\|dorian\|divisioMinima\|divisioMaxima\|divisioMaior\|displayScheme\|displayMusic\|displayLilyMusic\|dir-column\|dimTextDim\|dimTextDecresc\|dimTextDecr\|dimHairpin\|dim\|description\|descendens\|deprecatedenddim\|deprecatedendcresc\|deprecateddim\|deprecatedcresc\|denies\|deminutum\|defineBarLine\|defaultchild\|defaultTimeSignature\|defaultNoteHeads\|defaultBarType\|default\|decrescendoSpanner\|decresc\|decr\|deadNotesOn\|deadNotesOff\|deadNote\|dashUnderscore\|dashPlus\|dashLarger\|dashHat\|dashDot\|dashDash\|dashBang\|cueDuringWithClef\|cueDuring\|cueClefUnset\|cueClefTranspositionFormatter\|cueClef\|crossStaff\|crescendoSpanner\|crescTextCresc\|crescHairpin\|cresc\|createSpacing\|cr\|context\|consists\|concat\|compressFullBarRests\|compoundMeter\|command-name\|combine\|column-lines\|column\|coda\|cm\|clefTranspositionFormatter\|clefTransposition\|clefPosition\|clefGlyph\|clef\|circulus\|circle\|chords\|chordmodifiers\|chordmode\|chordRootNamer\|chordPrefixSpacer\|chordNoteNamer\|chordNameSeparator\|chordNameLowercaseMinor\|chordNameFunction\|chordNameExceptionsPartial\|chordNameExceptionsFull\|chordNameExceptions\|char\|change\|center-column\|center-align\|center\|cavum\|caps\|caesura\|cadenzaOn\|cadenzaOff\|breve\|breathe\|breakDynamicSpan\|break\|bracket\|box\|bookpart\|bookOutputSuffix\|bookOutputName\|book\|bold\|blackTriangleMarkup\|bigger\|bendAfter\|beamHalfMeasure\|beam\|bassStaffProperties\|bassFigureStaffAlignmentUp\|bassFigureStaffAlignmentNeutral\|bassFigureStaffAlignmentDown\|bassFigureExtendersOn\|bassFigureExtendersOff\|barNumberVisibility\|barNumberFormatter\|barNumberCheck\|barCheckSynchronize\|barAlways\|bar\|balloonText\|balloonLengthOn\|balloonLengthOff\|balloonGrobText\|backslashed-digit\|automaticBars\|autochange\|autoCautionaries\|autoBeaming\|autoBeamOn\|autoBeamOff\|autoBeamCheck\|autoAccidentals\|auto-footnote\|augmentum\|auctum\|assertBeamSlope\|assertBeamQuant\|ascendens\|arrow-head\|arpeggioParenthesisDashed\|arpeggioParenthesis\|arpeggioNormal\|arpeggioBracket\|arpeggioArrowUp\|arpeggioArrowDown\|arpeggio\|appoggiatura\|applyOutput\|applyMusic\|applyContext\|appendToTag\|alternative\|alterBroken\|allowVoltaHook\|allowPageTurn\|alias\|aikenHeadsMinor\|aikenHeads\|afterGraceFraction\|afterGrace\|aeolian\|addlyrics\|additionalPitchPrefix\|addQuote\|addInstrumentDefinition\|accidentalStyle\|acciaccatura\|accepts\|accentus\|accent\|absolute\|abs-fontsize\|aDueText\|RemoveEmptyTabStaffContext\|RemoveEmptyStaffContext\|RemoveEmptyRhythmicStaffContext\|RemoveEmptyDrumStaffContext\|IJ\|IIJ\|C\|B\|AncientRemoveEmptyStaffContext\|A\|n\)\(\A\|\n\)"me=e-1
diff --git a/syntax/lilypond.vim b/syntax/lilypond.vim
index feed18c54..96b7df323 100644
--- a/syntax/lilypond.vim
+++ b/syntax/lilypond.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lilypond.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 
 " LilyPond syntax file
diff --git a/syntax/limits.vim b/syntax/limits.vim
index 1f62582fe..a8e434bfd 100644
--- a/syntax/limits.vim
+++ b/syntax/limits.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/limits.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'limits') == -1
 
 " Vim syntax file
diff --git a/syntax/liquid.vim b/syntax/liquid.vim
index f69b77a5f..fd8640ee4 100644
--- a/syntax/liquid.vim
+++ b/syntax/liquid.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/liquid.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
 
 " Vim syntax file
diff --git a/syntax/lisp.vim b/syntax/lisp.vim
index d27e43a65..9982330f7 100644
--- a/syntax/lisp.vim
+++ b/syntax/lisp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lisp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lisp') == -1
 
 " Vim syntax file
diff --git a/syntax/litcoffee.vim b/syntax/litcoffee.vim
index fb49e49c7..5c30b8059 100644
--- a/syntax/litcoffee.vim
+++ b/syntax/litcoffee.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/litcoffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:   Literate CoffeeScript
diff --git a/syntax/lite.vim b/syntax/lite.vim
index f54fa61d8..4ffd53789 100644
--- a/syntax/lite.vim
+++ b/syntax/lite.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lite.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lite') == -1
 
 " Vim syntax file
diff --git a/syntax/litestep.vim b/syntax/litestep.vim
index eecb04ccf..ca0ad369d 100644
--- a/syntax/litestep.vim
+++ b/syntax/litestep.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/litestep.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'litestep') == -1
 
 " Vim syntax file
diff --git a/syntax/llvm.vim b/syntax/llvm.vim
index 427e11341..c276bf1ae 100644
--- a/syntax/llvm.vim
+++ b/syntax/llvm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/llvm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 
 " Vim syntax file
diff --git a/syntax/log.vim b/syntax/log.vim
index 6061cd587..42af83154 100644
--- a/syntax/log.vim
+++ b/syntax/log.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/log.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'log') == -1
 
 " Vim syntax file
diff --git a/syntax/loginaccess.vim b/syntax/loginaccess.vim
index 26880e7ae..ed9bbd745 100644
--- a/syntax/loginaccess.vim
+++ b/syntax/loginaccess.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/loginaccess.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'loginaccess') == -1
 
 " Vim syntax file
diff --git a/syntax/logindefs.vim b/syntax/logindefs.vim
index cebeabeb0..6409a31e5 100644
--- a/syntax/logindefs.vim
+++ b/syntax/logindefs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/logindefs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logindefs') == -1
 
 " Vim syntax file
diff --git a/syntax/logtalk.vim b/syntax/logtalk.vim
index 86cea6939..5deb393ea 100644
--- a/syntax/logtalk.vim
+++ b/syntax/logtalk.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/logtalk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logtalk') == -1
 
 " Vim syntax file
diff --git a/syntax/lotos.vim b/syntax/lotos.vim
index 639c70416..27f8512b5 100644
--- a/syntax/lotos.vim
+++ b/syntax/lotos.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lotos.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lotos') == -1
 
 " Vim syntax file
diff --git a/syntax/lout.vim b/syntax/lout.vim
index a5a254b2a..4c8982acc 100644
--- a/syntax/lout.vim
+++ b/syntax/lout.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lout.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lout') == -1
 
 " Vim syntax file
diff --git a/syntax/lpc.vim b/syntax/lpc.vim
index 24bbe796e..6fbff0c50 100644
--- a/syntax/lpc.vim
+++ b/syntax/lpc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lpc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lpc') == -1
 
 " Vim syntax file
diff --git a/syntax/lprolog.vim b/syntax/lprolog.vim
index d6eabbd86..5541aa283 100644
--- a/syntax/lprolog.vim
+++ b/syntax/lprolog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lprolog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lprolog') == -1
 
 " Vim syntax file
diff --git a/syntax/ls.vim b/syntax/ls.vim
index f13dbf115..056d0abe2 100644
--- a/syntax/ls.vim
+++ b/syntax/ls.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ls.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 
 " Language:    LiveScript "
diff --git a/syntax/lsl.vim b/syntax/lsl.vim
index 5065e1795..dfbec0c4b 100644
--- a/syntax/lsl.vim
+++ b/syntax/lsl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lsl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lsl') == -1
 
 " Vim syntax file
diff --git a/syntax/lss.vim b/syntax/lss.vim
index f2a170cef..a74543699 100644
--- a/syntax/lss.vim
+++ b/syntax/lss.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lss.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lss') == -1
 
 " Vim syntax file
diff --git a/syntax/lua.vim b/syntax/lua.vim
index 36956285b..29ee33c6a 100644
--- a/syntax/lua.vim
+++ b/syntax/lua.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lua.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lua') == -1
 
 " Vim syntax file
diff --git a/syntax/lynx.vim b/syntax/lynx.vim
index 4dfe92051..13c96b84e 100644
--- a/syntax/lynx.vim
+++ b/syntax/lynx.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/lynx.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lynx') == -1
 
 " Vim syntax file
diff --git a/syntax/m4.vim b/syntax/m4.vim
index 848dba3f0..772a6985a 100644
--- a/syntax/m4.vim
+++ b/syntax/m4.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/m4.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'm4') == -1
 
 " Vim syntax file
diff --git a/syntax/mail.vim b/syntax/mail.vim
index 41a4a860e..dfa7069b5 100644
--- a/syntax/mail.vim
+++ b/syntax/mail.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mail') == -1
 
 " Vim syntax file
diff --git a/syntax/mailaliases.vim b/syntax/mailaliases.vim
index af00b7832..d2a37c22e 100644
--- a/syntax/mailaliases.vim
+++ b/syntax/mailaliases.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mailaliases.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mailaliases') == -1
 
 " Vim syntax file
diff --git a/syntax/mailcap.vim b/syntax/mailcap.vim
index bb2432b09..82fe7986e 100644
--- a/syntax/mailcap.vim
+++ b/syntax/mailcap.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mailcap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mailcap') == -1
 
 " Vim syntax file
diff --git a/syntax/make.vim b/syntax/make.vim
index 349305ba6..cb04511a7 100644
--- a/syntax/make.vim
+++ b/syntax/make.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/make.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'make') == -1
 
 " Vim syntax file
diff --git a/syntax/mako.vim b/syntax/mako.vim
index d8d685ff9..38aa67c30 100644
--- a/syntax/mako.vim
+++ b/syntax/mako.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mako.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
 
 " Vim syntax file
diff --git a/syntax/mallard.vim b/syntax/mallard.vim
index 9c8e9844b..782c14467 100644
--- a/syntax/mallard.vim
+++ b/syntax/mallard.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mallard.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mallard') == -1
 
 " Vim syntax file
diff --git a/syntax/manconf.vim b/syntax/manconf.vim
index 6d7d808d4..6e70d99d4 100644
--- a/syntax/manconf.vim
+++ b/syntax/manconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/manconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'manconf') == -1
 
 " Vim syntax file
diff --git a/syntax/maple.vim b/syntax/maple.vim
index 1391e3fb7..ddf0ab90e 100644
--- a/syntax/maple.vim
+++ b/syntax/maple.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/maple.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'maple') == -1
 
 " Vim syntax file
diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index 4ab0bebc4..f4a809fc0 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/markdown.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
 
 " Vim syntax file
diff --git a/syntax/mason.vim b/syntax/mason.vim
index 9e7d82e58..6af8080da 100644
--- a/syntax/mason.vim
+++ b/syntax/mason.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mason.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim syntax file
diff --git a/syntax/master.vim b/syntax/master.vim
index a13b4c635..cd4d7bf45 100644
--- a/syntax/master.vim
+++ b/syntax/master.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/master.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'master') == -1
 
 " Vim syntax file
diff --git a/syntax/mel.vim b/syntax/mel.vim
index f06355e1f..c0ab91094 100644
--- a/syntax/mel.vim
+++ b/syntax/mel.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mel') == -1
 
 " Vim syntax file
diff --git a/syntax/merlin.vim b/syntax/merlin.vim
index c0f84fa9e..cf2292c32 100644
--- a/syntax/merlin.vim
+++ b/syntax/merlin.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/merlin.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
 
 " Vim syntax file for editing merlin project files
diff --git a/syntax/meson.vim b/syntax/meson.vim
index c90697d24..5153c88a8 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/meson.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1
 
 " Vim syntax file
diff --git a/syntax/messages.vim b/syntax/messages.vim
index 50819a1e1..d9669ee55 100644
--- a/syntax/messages.vim
+++ b/syntax/messages.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/messages.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'messages') == -1
 
 " Vim syntax file
diff --git a/syntax/mf.vim b/syntax/mf.vim
index 916da2f27..c1a01c0a1 100644
--- a/syntax/mf.vim
+++ b/syntax/mf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mf') == -1
 
 " Vim syntax file
diff --git a/syntax/mgl.vim b/syntax/mgl.vim
index 72f4be371..c5960af40 100644
--- a/syntax/mgl.vim
+++ b/syntax/mgl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mgl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mgl') == -1
 
 " Vim syntax file
diff --git a/syntax/mgp.vim b/syntax/mgp.vim
index 3ba57850f..2f9b545d2 100644
--- a/syntax/mgp.vim
+++ b/syntax/mgp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mgp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mgp') == -1
 
 " Vim syntax file
diff --git a/syntax/mib.vim b/syntax/mib.vim
index 5a9d4f120..238d31324 100644
--- a/syntax/mib.vim
+++ b/syntax/mib.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mib.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mib') == -1
 
 " Vim syntax file
diff --git a/syntax/mix.vim b/syntax/mix.vim
index 59a92f7c7..90ad0b5a5 100644
--- a/syntax/mix.vim
+++ b/syntax/mix.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mix') == -1
 
 " Vim syntax file
diff --git a/syntax/mma.vim b/syntax/mma.vim
index f6059296f..01cbeb5dd 100644
--- a/syntax/mma.vim
+++ b/syntax/mma.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mma.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
 
 "Vim syntax file
diff --git a/syntax/mmp.vim b/syntax/mmp.vim
index 9ed55a97f..5431a451a 100644
--- a/syntax/mmp.vim
+++ b/syntax/mmp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mmp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mmp') == -1
 
 " Vim syntax file
diff --git a/syntax/modconf.vim b/syntax/modconf.vim
index 42b0e97d9..5dc2a51b3 100644
--- a/syntax/modconf.vim
+++ b/syntax/modconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/modconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'modconf') == -1
 
 " Vim syntax file
diff --git a/syntax/modula2.vim b/syntax/modula2.vim
index 3f0bf04af..a54d23096 100644
--- a/syntax/modula2.vim
+++ b/syntax/modula2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/modula2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'modula2') == -1
 
 " Vim syntax file
diff --git a/syntax/modula3.vim b/syntax/modula3.vim
index 520d8ac5f..4a520f2cb 100644
--- a/syntax/modula3.vim
+++ b/syntax/modula3.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/modula3.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'modula3') == -1
 
 " Vim syntax file
diff --git a/syntax/monk.vim b/syntax/monk.vim
index af828968d..9c0365dd4 100644
--- a/syntax/monk.vim
+++ b/syntax/monk.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/monk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'monk') == -1
 
 " Vim syntax file
diff --git a/syntax/moo.vim b/syntax/moo.vim
index 053d9df16..0d8f11aae 100644
--- a/syntax/moo.vim
+++ b/syntax/moo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/moo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moo') == -1
 
 " Vim syntax file
diff --git a/syntax/moon.vim b/syntax/moon.vim
index 10d9b32bf..4d679a224 100644
--- a/syntax/moon.vim
+++ b/syntax/moon.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/moon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
 
 " Language:    MoonScript
diff --git a/syntax/mp.vim b/syntax/mp.vim
index 754c4441b..93be5d94e 100644
--- a/syntax/mp.vim
+++ b/syntax/mp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mp') == -1
 
 " Vim syntax file
diff --git a/syntax/mplayerconf.vim b/syntax/mplayerconf.vim
index 1971260b6..25a7bdbb5 100644
--- a/syntax/mplayerconf.vim
+++ b/syntax/mplayerconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mplayerconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mplayerconf') == -1
 
 " Vim syntax file
diff --git a/syntax/mrxvtrc.vim b/syntax/mrxvtrc.vim
index 1b77e9c71..5d3affe07 100644
--- a/syntax/mrxvtrc.vim
+++ b/syntax/mrxvtrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mrxvtrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mrxvtrc') == -1
 
 " Description	: Vim syntax file for mrxvtrc (for mrxvt-0.5.0 and up)
diff --git a/syntax/msidl.vim b/syntax/msidl.vim
index 8a09710a9..e654e0a37 100644
--- a/syntax/msidl.vim
+++ b/syntax/msidl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/msidl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'msidl') == -1
 
 " Vim syntax file
diff --git a/syntax/msql.vim b/syntax/msql.vim
index 2728724de..e9cf6edf5 100644
--- a/syntax/msql.vim
+++ b/syntax/msql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/msql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'msql') == -1
 
 " Vim syntax file
diff --git a/syntax/mupad.vim b/syntax/mupad.vim
index 9e102149d..933a68ff9 100644
--- a/syntax/mupad.vim
+++ b/syntax/mupad.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mupad.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mupad') == -1
 
 " Vim syntax file
diff --git a/syntax/murphi.vim b/syntax/murphi.vim
index c6d163261..7e1208a73 100644
--- a/syntax/murphi.vim
+++ b/syntax/murphi.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/murphi.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'murphi') == -1
 
 " Vim syntax file
diff --git a/syntax/mush.vim b/syntax/mush.vim
index 33fc883c9..ac7cb6f2c 100644
--- a/syntax/mush.vim
+++ b/syntax/mush.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mush.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mush') == -1
 
 " MUSHcode syntax file
diff --git a/syntax/mustache.vim b/syntax/mustache.vim
index 36a4ba271..a620e6a37 100644
--- a/syntax/mustache.vim
+++ b/syntax/mustache.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mustache.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 runtime! syntax/handlebars.vim
diff --git a/syntax/muttrc.vim b/syntax/muttrc.vim
index 167fe636b..0c4609e12 100644
--- a/syntax/muttrc.vim
+++ b/syntax/muttrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/muttrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'muttrc') == -1
 
 " Vim syntax file
diff --git a/syntax/mysql.vim b/syntax/mysql.vim
index 60068c66d..018a01e81 100644
--- a/syntax/mysql.vim
+++ b/syntax/mysql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/mysql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mysql') == -1
 
 " Vim syntax file
diff --git a/syntax/n1ql.vim b/syntax/n1ql.vim
index 4aa51bec7..fa1648ef3 100644
--- a/syntax/n1ql.vim
+++ b/syntax/n1ql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/n1ql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'n1ql') == -1
 
 " Vim syntax file
diff --git a/syntax/named.vim b/syntax/named.vim
index 508f7ec7d..d422ef3e6 100644
--- a/syntax/named.vim
+++ b/syntax/named.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/named.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'named') == -1
 
 " Vim syntax file
diff --git a/syntax/nanorc.vim b/syntax/nanorc.vim
index 079e4bfeb..93d6ecbe7 100644
--- a/syntax/nanorc.vim
+++ b/syntax/nanorc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/nanorc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nanorc') == -1
 
 " Vim syntax file
diff --git a/syntax/natural.vim b/syntax/natural.vim
index 54f5e670c..6c6b2d79d 100644
--- a/syntax/natural.vim
+++ b/syntax/natural.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/natural.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'natural') == -1
 
 " Vim syntax file
diff --git a/syntax/ncf.vim b/syntax/ncf.vim
index 6e60e0d64..5f05580c1 100644
--- a/syntax/ncf.vim
+++ b/syntax/ncf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ncf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ncf') == -1
 
 " Vim syntax file
diff --git a/syntax/neomuttrc.vim b/syntax/neomuttrc.vim
index 363b811a9..98c048b93 100644
--- a/syntax/neomuttrc.vim
+++ b/syntax/neomuttrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/neomuttrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'neomuttrc') == -1
 
 " Vim syntax file
diff --git a/syntax/netrc.vim b/syntax/netrc.vim
index f9cdd890a..7c036ea6f 100644
--- a/syntax/netrc.vim
+++ b/syntax/netrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/netrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'netrc') == -1
 
 " Vim syntax file
diff --git a/syntax/nginx.vim b/syntax/nginx.vim
index 78160f37d..9a0be5db0 100644
--- a/syntax/nginx.vim
+++ b/syntax/nginx.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/nginx.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
 
 " Vim syntax file
diff --git a/syntax/nim.vim b/syntax/nim.vim
index e13170561..f01213c13 100644
--- a/syntax/nim.vim
+++ b/syntax/nim.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/nim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 
 " For version 5.x: Clear all syntax items
diff --git a/syntax/ninja.vim b/syntax/ninja.vim
index 4a06b9f5d..54dc9c6e6 100644
--- a/syntax/ninja.vim
+++ b/syntax/ninja.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ninja.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ninja') == -1
 
 " ninja build file syntax.
diff --git a/syntax/nix.vim b/syntax/nix.vim
index d8fd4f669..047eded30 100644
--- a/syntax/nix.vim
+++ b/syntax/nix.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/nix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 
 " Vim syntax file
diff --git a/syntax/nqc.vim b/syntax/nqc.vim
index ca8b10012..16e601285 100644
--- a/syntax/nqc.vim
+++ b/syntax/nqc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/nqc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nqc') == -1
 
 " Vim syntax file
diff --git a/syntax/nroff.vim b/syntax/nroff.vim
index 525649a84..ea743fe68 100644
--- a/syntax/nroff.vim
+++ b/syntax/nroff.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/nroff.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nroff') == -1
 
 " VIM syntax file
diff --git a/syntax/nsis.vim b/syntax/nsis.vim
index 39d02cfdc..a3602d423 100644
--- a/syntax/nsis.vim
+++ b/syntax/nsis.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/nsis.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nsis') == -1
 
 " Vim syntax file
diff --git a/syntax/oasis.vim b/syntax/oasis.vim
index 054d05345..8534bcd4c 100644
--- a/syntax/oasis.vim
+++ b/syntax/oasis.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/oasis.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/obj.vim b/syntax/obj.vim
index 3d335d095..cf4091674 100644
--- a/syntax/obj.vim
+++ b/syntax/obj.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/obj.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'obj') == -1
 
 " Vim syntax file
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index 6e6cf2250..ce8c4b75c 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ocaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim syntax file
diff --git a/syntax/ocamlbuild_tags.vim b/syntax/ocamlbuild_tags.vim
index 7f73366be..469ce7b89 100644
--- a/syntax/ocamlbuild_tags.vim
+++ b/syntax/ocamlbuild_tags.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ocamlbuild_tags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/occam.vim b/syntax/occam.vim
index dc42ecf42..b0da63cbc 100644
--- a/syntax/occam.vim
+++ b/syntax/occam.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/occam.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'occam') == -1
 
 " Vim syntax file
diff --git a/syntax/ocpbuild.vim b/syntax/ocpbuild.vim
index 98b0ab3c4..e644d6de0 100644
--- a/syntax/ocpbuild.vim
+++ b/syntax/ocpbuild.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ocpbuild.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim syntax file
diff --git a/syntax/ocpbuildroot.vim b/syntax/ocpbuildroot.vim
index 48dc476a3..cebc26b78 100644
--- a/syntax/ocpbuildroot.vim
+++ b/syntax/ocpbuildroot.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ocpbuildroot.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim syntax file
diff --git a/syntax/octave.vim b/syntax/octave.vim
index 64bdf0113..686680a4a 100644
--- a/syntax/octave.vim
+++ b/syntax/octave.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/octave.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'octave') == -1
 
 " Vim syntax file
diff --git a/syntax/odin.vim b/syntax/odin.vim
index 393929e9d..23af11273 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/odin.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'odin') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/omake.vim b/syntax/omake.vim
index 47edd57ee..8de5c2fc6 100644
--- a/syntax/omake.vim
+++ b/syntax/omake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/omake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim syntax file
diff --git a/syntax/omnimark.vim b/syntax/omnimark.vim
index 315bfb78a..11c9edb0b 100644
--- a/syntax/omnimark.vim
+++ b/syntax/omnimark.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/omnimark.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'omnimark') == -1
 
 " Vim syntax file
diff --git a/syntax/opam.vim b/syntax/opam.vim
index a300b3b97..f9a8ee860 100644
--- a/syntax/opam.vim
+++ b/syntax/opam.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/opam.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/opencl.vim b/syntax/opencl.vim
index 57035ac00..8e82d0c46 100644
--- a/syntax/opencl.vim
+++ b/syntax/opencl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/opencl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
 
 " Vim syntax file
diff --git a/syntax/openroad.vim b/syntax/openroad.vim
index 1e5730cc5..022e4515f 100644
--- a/syntax/openroad.vim
+++ b/syntax/openroad.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/openroad.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'openroad') == -1
 
 " Vim syntax file
diff --git a/syntax/opl.vim b/syntax/opl.vim
index fcf3eb51e..8e19cc0f6 100644
--- a/syntax/opl.vim
+++ b/syntax/opl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/opl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opl') == -1
 
 " Vim syntax file
diff --git a/syntax/ora.vim b/syntax/ora.vim
index c8a43affd..68921f69a 100644
--- a/syntax/ora.vim
+++ b/syntax/ora.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ora.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ora') == -1
 
 " Vim syntax file
diff --git a/syntax/pamconf.vim b/syntax/pamconf.vim
index 3f6155da2..12832522b 100644
--- a/syntax/pamconf.vim
+++ b/syntax/pamconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pamconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pamconf') == -1
 
 " Vim syntax file
diff --git a/syntax/pamenv.vim b/syntax/pamenv.vim
index ac6e91298..49992c9a6 100644
--- a/syntax/pamenv.vim
+++ b/syntax/pamenv.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pamenv.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pamenv') == -1
 
 " Vim syntax file
diff --git a/syntax/papp.vim b/syntax/papp.vim
index 24efa4441..658da9cbb 100644
--- a/syntax/papp.vim
+++ b/syntax/papp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/papp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'papp') == -1
 
 " Vim syntax file for the "papp" file format (_p_erl _app_lication)
diff --git a/syntax/pascal.vim b/syntax/pascal.vim
index 8e9b0f75d..ebcdc30d0 100644
--- a/syntax/pascal.vim
+++ b/syntax/pascal.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pascal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pascal') == -1
 
 " Vim syntax file
diff --git a/syntax/passwd.vim b/syntax/passwd.vim
index c63bdc836..707dac365 100644
--- a/syntax/passwd.vim
+++ b/syntax/passwd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/passwd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'passwd') == -1
 
 " Vim syntax file
diff --git a/syntax/pccts.vim b/syntax/pccts.vim
index d28574b4f..353eb0e82 100644
--- a/syntax/pccts.vim
+++ b/syntax/pccts.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pccts.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pccts') == -1
 
 " Vim syntax file
diff --git a/syntax/pdf.vim b/syntax/pdf.vim
index 621ccacda..6ff6ed35d 100644
--- a/syntax/pdf.vim
+++ b/syntax/pdf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pdf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pdf') == -1
 
 " Vim syntax file
diff --git a/syntax/perl.vim b/syntax/perl.vim
index b7a10a19e..b4316b13a 100644
--- a/syntax/perl.vim
+++ b/syntax/perl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/perl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim syntax file
diff --git a/syntax/pf.vim b/syntax/pf.vim
index 11b78662b..cdd727c13 100644
--- a/syntax/pf.vim
+++ b/syntax/pf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pf') == -1
 
 " pf syntax file
diff --git a/syntax/pfmain.vim b/syntax/pfmain.vim
index 9ef352881..1afe6b79e 100644
--- a/syntax/pfmain.vim
+++ b/syntax/pfmain.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pfmain.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pfmain') == -1
 
 " Vim syntax file
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index c85b97cb4..4339eb427 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pgsql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pgsql') == -1
 
 " Vim syntax file
diff --git a/syntax/php.vim b/syntax/php.vim
index 5ad91253c..ef8382547 100644
--- a/syntax/php.vim
+++ b/syntax/php.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/php.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'php') == -1
 
 " Vim syntax file
diff --git a/syntax/pike.vim b/syntax/pike.vim
index ffbdb362d..617a7438a 100644
--- a/syntax/pike.vim
+++ b/syntax/pike.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pike.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pike') == -1
 
 " Vim syntax file
diff --git a/syntax/pilrc.vim b/syntax/pilrc.vim
index fdb80ca05..3c7c413ba 100644
--- a/syntax/pilrc.vim
+++ b/syntax/pilrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pilrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pilrc') == -1
 
 " Vim syntax file
diff --git a/syntax/pine.vim b/syntax/pine.vim
index 5bc607b76..ef1f39778 100644
--- a/syntax/pine.vim
+++ b/syntax/pine.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pine.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pine') == -1
 
 " Vim syntax file
diff --git a/syntax/pinfo.vim b/syntax/pinfo.vim
index 80c08406c..e2b8fcd74 100644
--- a/syntax/pinfo.vim
+++ b/syntax/pinfo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pinfo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pinfo') == -1
 
 " Vim syntax file
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index f8d7f4e69..84ad75fe7 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/plantuml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
 
 scriptencoding utf-8
diff --git a/syntax/pli.vim b/syntax/pli.vim
index 904a10569..c10363afa 100644
--- a/syntax/pli.vim
+++ b/syntax/pli.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pli.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pli') == -1
 
 " Vim syntax file
diff --git a/syntax/plm.vim b/syntax/plm.vim
index e58996dbd..c727f2faf 100644
--- a/syntax/plm.vim
+++ b/syntax/plm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/plm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plm') == -1
 
 " Vim syntax file
diff --git a/syntax/plp.vim b/syntax/plp.vim
index 6246b0b20..d5f98d600 100644
--- a/syntax/plp.vim
+++ b/syntax/plp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/plp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plp') == -1
 
 " Vim syntax file
diff --git a/syntax/plsql.vim b/syntax/plsql.vim
index 6797cd720..867a94983 100644
--- a/syntax/plsql.vim
+++ b/syntax/plsql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/plsql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plsql') == -1
 
 " Vim syntax file
diff --git a/syntax/po.vim b/syntax/po.vim
index f615205b7..efda99b82 100644
--- a/syntax/po.vim
+++ b/syntax/po.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/po.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'po') == -1
 
 " Vim syntax file
diff --git a/syntax/pod.vim b/syntax/pod.vim
index 737fe8420..a02921614 100644
--- a/syntax/pod.vim
+++ b/syntax/pod.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pod.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim syntax file
diff --git a/syntax/pony.vim b/syntax/pony.vim
index 9f790b5ad..770c82579 100644
--- a/syntax/pony.vim
+++ b/syntax/pony.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pony.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 
 " Vim syntax file
diff --git a/syntax/postscr.vim b/syntax/postscr.vim
index 3062adcc0..fdc83ceae 100644
--- a/syntax/postscr.vim
+++ b/syntax/postscr.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/postscr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'postscr') == -1
 
 " Vim syntax file
diff --git a/syntax/pov.vim b/syntax/pov.vim
index 13c7fb47b..357ddbc2f 100644
--- a/syntax/pov.vim
+++ b/syntax/pov.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pov.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pov') == -1
 
 " Vim syntax file
diff --git a/syntax/povini.vim b/syntax/povini.vim
index 56830e470..773124af1 100644
--- a/syntax/povini.vim
+++ b/syntax/povini.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/povini.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'povini') == -1
 
 " Vim syntax file
diff --git a/syntax/ppd.vim b/syntax/ppd.vim
index 6ef1b6c93..6418cde86 100644
--- a/syntax/ppd.vim
+++ b/syntax/ppd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ppd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ppd') == -1
 
 " Vim syntax file
diff --git a/syntax/ppwiz.vim b/syntax/ppwiz.vim
index 43510efdb..17d43a1e7 100644
--- a/syntax/ppwiz.vim
+++ b/syntax/ppwiz.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ppwiz.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ppwiz') == -1
 
 " Vim syntax file
diff --git a/syntax/privoxy.vim b/syntax/privoxy.vim
index 9911eb372..3660977b7 100644
--- a/syntax/privoxy.vim
+++ b/syntax/privoxy.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/privoxy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'privoxy') == -1
 
 " Vim syntax file
diff --git a/syntax/procmail.vim b/syntax/procmail.vim
index 4386f0c19..104f0bab9 100644
--- a/syntax/procmail.vim
+++ b/syntax/procmail.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/procmail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'procmail') == -1
 
 " Vim syntax file
diff --git a/syntax/prolog.vim b/syntax/prolog.vim
index 4d6cb0be5..60545b07d 100644
--- a/syntax/prolog.vim
+++ b/syntax/prolog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/prolog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
 
 " Vim syntax file
diff --git a/syntax/promela.vim b/syntax/promela.vim
index e32a71b18..6c09d59af 100644
--- a/syntax/promela.vim
+++ b/syntax/promela.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/promela.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'promela') == -1
 
 " Vim syntax file
diff --git a/syntax/proto.vim b/syntax/proto.vim
index ce232f53e..62d0fab9b 100644
--- a/syntax/proto.vim
+++ b/syntax/proto.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/proto.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protobuf') == -1
 
 " Protocol Buffers - Google's data interchange format
diff --git a/syntax/protocols.vim b/syntax/protocols.vim
index 275c5a09b..986530a96 100644
--- a/syntax/protocols.vim
+++ b/syntax/protocols.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/protocols.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protocols') == -1
 
 " Vim syntax file
diff --git a/syntax/ps1.vim b/syntax/ps1.vim
index 4a9751a8a..9d9d2f280 100644
--- a/syntax/ps1.vim
+++ b/syntax/ps1.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ps1.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Vim syntax file
diff --git a/syntax/ps1xml.vim b/syntax/ps1xml.vim
index 9c7478795..0032d2faa 100644
--- a/syntax/ps1xml.vim
+++ b/syntax/ps1xml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ps1xml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Vim syntax file
diff --git a/syntax/psf.vim b/syntax/psf.vim
index a76e8cfc4..2be429433 100644
--- a/syntax/psf.vim
+++ b/syntax/psf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/psf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'psf') == -1
 
 " Vim syntax file
diff --git a/syntax/pug.vim b/syntax/pug.vim
index d393dab67..880ea6d2a 100644
--- a/syntax/pug.vim
+++ b/syntax/pug.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pug.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
 
 " Vim syntax file
diff --git a/syntax/puppet.vim b/syntax/puppet.vim
index 744de1c83..9ca98f9a3 100644
--- a/syntax/puppet.vim
+++ b/syntax/puppet.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/puppet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Language:     Puppet
diff --git a/syntax/purescript.vim b/syntax/purescript.vim
index 346bc8e51..f8a396ceb 100644
--- a/syntax/purescript.vim
+++ b/syntax/purescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/purescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 
 " syntax highlighting for purescript
diff --git a/syntax/pyrex.vim b/syntax/pyrex.vim
index c90163ac8..9d7fa4648 100644
--- a/syntax/pyrex.vim
+++ b/syntax/pyrex.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/pyrex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pyrex') == -1
 
 " Vim syntax file
diff --git a/syntax/python.vim b/syntax/python.vim
index b6ea65295..b7dcac5a5 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/python.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python') == -1
 
 " For version 5.x: Clear all syntax items
diff --git a/syntax/qmake.vim b/syntax/qmake.vim
index 5639b994a..4f3a748fe 100644
--- a/syntax/qmake.vim
+++ b/syntax/qmake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/qmake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qmake') == -1
 
 " qmake project syntax file
diff --git a/syntax/qml.vim b/syntax/qml.vim
index 15f1d2558..3189be602 100644
--- a/syntax/qml.vim
+++ b/syntax/qml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/qml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
 
 
diff --git a/syntax/quake.vim b/syntax/quake.vim
index 34d553bbc..5d27ae2b1 100644
--- a/syntax/quake.vim
+++ b/syntax/quake.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/quake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'quake') == -1
 
 " Vim syntax file
diff --git a/syntax/racket.vim b/syntax/racket.vim
index 8bd46a88d..4988ac304 100644
--- a/syntax/racket.vim
+++ b/syntax/racket.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/racket.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
 
 " Vim syntax file
diff --git a/syntax/radiance.vim b/syntax/radiance.vim
index 245d46723..d608e0365 100644
--- a/syntax/radiance.vim
+++ b/syntax/radiance.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/radiance.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'radiance') == -1
 
 " Vim syntax file
diff --git a/syntax/ragel.vim b/syntax/ragel.vim
index 0ac49771b..605aeb18b 100644
--- a/syntax/ragel.vim
+++ b/syntax/ragel.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ragel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ragel') == -1
 
 " Vim syntax file
diff --git a/syntax/raku.vim b/syntax/raku.vim
index 008c3c4fd..510a2e23b 100644
--- a/syntax/raku.vim
+++ b/syntax/raku.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/raku.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raku') == -1
 
 " Vim syntax file
diff --git a/syntax/raml.vim b/syntax/raml.vim
index 69f7439c5..5ba1c9531 100644
--- a/syntax/raml.vim
+++ b/syntax/raml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/raml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
 
 " Vim syntax file
diff --git a/syntax/ratpoison.vim b/syntax/ratpoison.vim
index 9719e6381..ef8ad5a8c 100644
--- a/syntax/ratpoison.vim
+++ b/syntax/ratpoison.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ratpoison.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ratpoison') == -1
 
 " Vim syntax file
diff --git a/syntax/razor.vim b/syntax/razor.vim
index 63c08cf36..61429dfc1 100644
--- a/syntax/razor.vim
+++ b/syntax/razor.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/razor.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'razor') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/rc.vim b/syntax/rc.vim
index e20a43f92..092344046 100644
--- a/syntax/rc.vim
+++ b/syntax/rc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rc') == -1
 
 " Vim syntax file
diff --git a/syntax/rcs.vim b/syntax/rcs.vim
index 65ac8092d..62c7c81d8 100644
--- a/syntax/rcs.vim
+++ b/syntax/rcs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rcs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rcs') == -1
 
 " Vim syntax file
diff --git a/syntax/readline.vim b/syntax/readline.vim
index e4a0971ce..014802c0d 100644
--- a/syntax/readline.vim
+++ b/syntax/readline.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/readline.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'readline') == -1
 
 " Vim syntax file
diff --git a/syntax/reason.vim b/syntax/reason.vim
index f7188c68f..e98bf608f 100644
--- a/syntax/reason.vim
+++ b/syntax/reason.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/reason.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
 
 " Vim syntax file
diff --git a/syntax/rego.vim b/syntax/rego.vim
index 6a4fdec03..5fc0a6a2d 100644
--- a/syntax/rego.vim
+++ b/syntax/rego.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rego.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rego') == -1
 
 " Vim syntax file
diff --git a/syntax/remind.vim b/syntax/remind.vim
index a63b978fc..40501da6b 100644
--- a/syntax/remind.vim
+++ b/syntax/remind.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/remind.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'remind') == -1
 
 " Vim syntax file
diff --git a/syntax/requirements.vim b/syntax/requirements.vim
index e93928152..632891555 100644
--- a/syntax/requirements.vim
+++ b/syntax/requirements.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/requirements.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'requirements') == -1
 
 " the Requirements File Format syntax support for Vim
diff --git a/syntax/resolv.vim b/syntax/resolv.vim
index a847a7d78..0f0f1734f 100644
--- a/syntax/resolv.vim
+++ b/syntax/resolv.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/resolv.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'resolv') == -1
 
 " Vim syntax file
diff --git a/syntax/reva.vim b/syntax/reva.vim
index e8ff0c730..e4175f55c 100644
--- a/syntax/reva.vim
+++ b/syntax/reva.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/reva.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reva') == -1
 
 " Vim syntax file
diff --git a/syntax/rexx.vim b/syntax/rexx.vim
index 642e4305d..f9310fb82 100644
--- a/syntax/rexx.vim
+++ b/syntax/rexx.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rexx.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rexx') == -1
 
 " Vim syntax file
diff --git a/syntax/rhelp.vim b/syntax/rhelp.vim
index 42d3b0047..ca7af3153 100644
--- a/syntax/rhelp.vim
+++ b/syntax/rhelp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rhelp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
 
 " Vim syntax file
diff --git a/syntax/rib.vim b/syntax/rib.vim
index 2d1ceaddb..eac47d853 100644
--- a/syntax/rib.vim
+++ b/syntax/rib.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rib.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rib') == -1
 
 " Vim syntax file
diff --git a/syntax/rmd.vim b/syntax/rmd.vim
index 521998aea..dd8292cd9 100644
--- a/syntax/rmd.vim
+++ b/syntax/rmd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rmd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rmd') == -1
 
 " markdown Text with R statements
diff --git a/syntax/rnc.vim b/syntax/rnc.vim
index df6ba30c5..c07c7a0de 100644
--- a/syntax/rnc.vim
+++ b/syntax/rnc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rnc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnc') == -1
 
 " Vim syntax file
diff --git a/syntax/rng.vim b/syntax/rng.vim
index ba681ef3b..75de79f4c 100644
--- a/syntax/rng.vim
+++ b/syntax/rng.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rng.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rng') == -1
 
 " Vim syntax file
diff --git a/syntax/rnoweb-1.vim b/syntax/rnoweb-1.vim
index e3906c1c4..aa6b2b9e1 100644
--- a/syntax/rnoweb-1.vim
+++ b/syntax/rnoweb-1.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rnoweb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
 
 " Vim syntax file
diff --git a/syntax/rnoweb-2.vim b/syntax/rnoweb-2.vim
index 17a656dd3..daba14c7c 100644
--- a/syntax/rnoweb-2.vim
+++ b/syntax/rnoweb-2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rnoweb-2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnoweb') == -1
 
 " Vim syntax file
diff --git a/syntax/robots.vim b/syntax/robots.vim
index 724b70b9d..e2b5ecddb 100644
--- a/syntax/robots.vim
+++ b/syntax/robots.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/robots.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'robots') == -1
 
 " Vim syntax file
diff --git a/syntax/rpcgen.vim b/syntax/rpcgen.vim
index f15e6564a..ee911f4e0 100644
--- a/syntax/rpcgen.vim
+++ b/syntax/rpcgen.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rpcgen.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpcgen') == -1
 
 " Vim syntax file
diff --git a/syntax/rpl.vim b/syntax/rpl.vim
index be71c4d50..3f49ccf16 100644
--- a/syntax/rpl.vim
+++ b/syntax/rpl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 
 " Vim syntax file
diff --git a/syntax/rrst.vim b/syntax/rrst.vim
index f6d3dc236..576200485 100644
--- a/syntax/rrst.vim
+++ b/syntax/rrst.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rrst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rrst') == -1
 
 " reStructured Text with R statements
diff --git a/syntax/rst.vim b/syntax/rst.vim
index 4995af9fa..6a729d1d4 100644
--- a/syntax/rst.vim
+++ b/syntax/rst.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 
 " Vim reST syntax file
diff --git a/syntax/rtf.vim b/syntax/rtf.vim
index d795c9324..1528dab8a 100644
--- a/syntax/rtf.vim
+++ b/syntax/rtf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rtf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rtf') == -1
 
 " Vim syntax file
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index 898f811ee..f61566ec7 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/ruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim syntax file
diff --git a/syntax/rust.vim b/syntax/rust.vim
index a5f312bec..90fce408a 100644
--- a/syntax/rust.vim
+++ b/syntax/rust.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/rust.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Vim syntax file
diff --git a/syntax/samba.vim b/syntax/samba.vim
index 9d481ac3d..e9bff267c 100644
--- a/syntax/samba.vim
+++ b/syntax/samba.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/samba.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'samba') == -1
 
 " Vim syntax file
diff --git a/syntax/sas.vim b/syntax/sas.vim
index 1ae23c7fe..ba85b4fbe 100644
--- a/syntax/sas.vim
+++ b/syntax/sas.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sas.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sas') == -1
 
 " Vim syntax file
diff --git a/syntax/sass.vim b/syntax/sass.vim
index 4a49026fd..e9b4be3bc 100644
--- a/syntax/sass.vim
+++ b/syntax/sass.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sass.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
 
 " Vim syntax file
diff --git a/syntax/sather.vim b/syntax/sather.vim
index 9c3d4504b..70a1eaae6 100644
--- a/syntax/sather.vim
+++ b/syntax/sather.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sather.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sather') == -1
 
 " Vim syntax file
diff --git a/syntax/sbt.vim b/syntax/sbt.vim
index 2a2806243..ee59f9b18 100644
--- a/syntax/sbt.vim
+++ b/syntax/sbt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sbt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sbt') == -1
 
 " Vim syntax file
diff --git a/syntax/scala.vim b/syntax/scala.vim
index 10f884f4f..f4b0406d0 100644
--- a/syntax/scala.vim
+++ b/syntax/scala.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/scala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 " Vim syntax file
diff --git a/syntax/scheme.vim b/syntax/scheme.vim
index c8430939b..25fc6dcca 100644
--- a/syntax/scheme.vim
+++ b/syntax/scheme.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/scheme.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scheme') == -1
 
 " Vim syntax file
diff --git a/syntax/scilab.vim b/syntax/scilab.vim
index 033aa21d8..3b311f6c7 100644
--- a/syntax/scilab.vim
+++ b/syntax/scilab.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/scilab.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scilab') == -1
 
 "
diff --git a/syntax/screen.vim b/syntax/screen.vim
index b3fe603fc..bcafa9e20 100644
--- a/syntax/screen.vim
+++ b/syntax/screen.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/screen.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'screen') == -1
 
 " Vim syntax file
diff --git a/syntax/scss.vim b/syntax/scss.vim
index 5e40d35c3..73345678d 100644
--- a/syntax/scss.vim
+++ b/syntax/scss.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/scss.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
 
 " Vim syntax file
diff --git a/syntax/sd.vim b/syntax/sd.vim
index 9b220b72a..dde0f4f75 100644
--- a/syntax/sd.vim
+++ b/syntax/sd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sd') == -1
 
 " Language: streaming descriptor file
diff --git a/syntax/sdc.vim b/syntax/sdc.vim
index 286482ff6..4d9db3120 100644
--- a/syntax/sdc.vim
+++ b/syntax/sdc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sdc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sdc') == -1
 
 " Vim syntax file
diff --git a/syntax/sdl.vim b/syntax/sdl.vim
index 7d31fba06..1b13ac4a1 100644
--- a/syntax/sdl.vim
+++ b/syntax/sdl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sdl') == -1
 
 " Vim syntax file
diff --git a/syntax/sed.vim b/syntax/sed.vim
index 2e4690c7b..338b5cc37 100644
--- a/syntax/sed.vim
+++ b/syntax/sed.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sed.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sed') == -1
 
 " Vim syntax file
diff --git a/syntax/sensors.vim b/syntax/sensors.vim
index e0c1185a0..087e7fae4 100644
--- a/syntax/sensors.vim
+++ b/syntax/sensors.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sensors.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensors') == -1
 
 " Vim syntax file
diff --git a/syntax/services.vim b/syntax/services.vim
index 5e4debd93..fae3e65eb 100644
--- a/syntax/services.vim
+++ b/syntax/services.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/services.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'services') == -1
 
 " Vim syntax file
diff --git a/syntax/setserial.vim b/syntax/setserial.vim
index 63939544e..43a5f73ff 100644
--- a/syntax/setserial.vim
+++ b/syntax/setserial.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/setserial.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'setserial') == -1
 
 " Vim syntax file
diff --git a/syntax/sexplib.vim b/syntax/sexplib.vim
index 4d7fc1e14..ff6692442 100644
--- a/syntax/sexplib.vim
+++ b/syntax/sexplib.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sexplib.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim syntax file
diff --git a/syntax/sh.vim b/syntax/sh.vim
index 96a70e2f1..3abe2d9da 100644
--- a/syntax/sh.vim
+++ b/syntax/sh.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sh.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sh') == -1
 
 " Shebang
diff --git a/syntax/sieve.vim b/syntax/sieve.vim
index 21a8e1e89..8d8ad8f2a 100644
--- a/syntax/sieve.vim
+++ b/syntax/sieve.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sieve.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sieve') == -1
 
 " Vim syntax file
diff --git a/syntax/sil.vim b/syntax/sil.vim
index e1d55231d..a4bf53596 100644
--- a/syntax/sil.vim
+++ b/syntax/sil.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sil.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sil') == -1
 
 " This source file is part of the Swift.org open source project
diff --git a/syntax/simula.vim b/syntax/simula.vim
index 2806cfe79..5d83519ef 100644
--- a/syntax/simula.vim
+++ b/syntax/simula.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/simula.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'simula') == -1
 
 " Vim syntax file
diff --git a/syntax/sinda.vim b/syntax/sinda.vim
index b2b4ce091..27f22df60 100644
--- a/syntax/sinda.vim
+++ b/syntax/sinda.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sinda.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sinda') == -1
 
 " Vim syntax file
diff --git a/syntax/sisu.vim b/syntax/sisu.vim
index d67a14c92..f703e138c 100644
--- a/syntax/sisu.vim
+++ b/syntax/sisu.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sisu.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sisu') == -1
 
 " SiSU Vim syntax file
diff --git a/syntax/skill.vim b/syntax/skill.vim
index cddbb41a4..ed1c1975b 100644
--- a/syntax/skill.vim
+++ b/syntax/skill.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/skill.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'skill') == -1
 
 " Vim syntax file
diff --git a/syntax/slang.vim b/syntax/slang.vim
index 48f209b73..92bd79e39 100644
--- a/syntax/slang.vim
+++ b/syntax/slang.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/slang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slang') == -1
 
 " Vim syntax file
diff --git a/syntax/slice.vim b/syntax/slice.vim
index 8a158ee0a..6b595d08c 100644
--- a/syntax/slice.vim
+++ b/syntax/slice.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/slice.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slice') == -1
 
 " Vim syntax file
diff --git a/syntax/slim.vim b/syntax/slim.vim
index 40ad0a1d3..91f74f98f 100644
--- a/syntax/slim.vim
+++ b/syntax/slim.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/slim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
 
 " Vim syntax file
diff --git a/syntax/slime.vim b/syntax/slime.vim
index d6f3076c3..b47b79bc5 100644
--- a/syntax/slime.vim
+++ b/syntax/slime.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/slime.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slime') == -1
 
 " Vim syntax file
diff --git a/syntax/slpconf.vim b/syntax/slpconf.vim
index e134c596d..1c70cbff7 100644
--- a/syntax/slpconf.vim
+++ b/syntax/slpconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/slpconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpconf') == -1
 
 " Vim syntax file
diff --git a/syntax/slpreg.vim b/syntax/slpreg.vim
index d8f50cae6..26b5c09d8 100644
--- a/syntax/slpreg.vim
+++ b/syntax/slpreg.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/slpreg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpreg') == -1
 
 " Vim syntax file
diff --git a/syntax/slpspi.vim b/syntax/slpspi.vim
index bbf176ef0..7c78ff5b9 100644
--- a/syntax/slpspi.vim
+++ b/syntax/slpspi.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/slpspi.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpspi') == -1
 
 " Vim syntax file
diff --git a/syntax/slrnrc.vim b/syntax/slrnrc.vim
index 262044ac8..5f03453e4 100644
--- a/syntax/slrnrc.vim
+++ b/syntax/slrnrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/slrnrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slrnrc') == -1
 
 " Vim syntax file
diff --git a/syntax/slrnsc.vim b/syntax/slrnsc.vim
index 74d6ea691..3d168331b 100644
--- a/syntax/slrnsc.vim
+++ b/syntax/slrnsc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/slrnsc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slrnsc') == -1
 
 " Vim syntax file
diff --git a/syntax/sm.vim b/syntax/sm.vim
index 5ebe510ea..b1336a6c8 100644
--- a/syntax/sm.vim
+++ b/syntax/sm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sm') == -1
 
 " Vim syntax file
diff --git a/syntax/smarty.vim b/syntax/smarty.vim
index 5ac25bc62..edda9d81d 100644
--- a/syntax/smarty.vim
+++ b/syntax/smarty.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/smarty.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smarty') == -1
 
 " Vim syntax file
diff --git a/syntax/smcl.vim b/syntax/smcl.vim
index 57bac5586..024443564 100644
--- a/syntax/smcl.vim
+++ b/syntax/smcl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/smcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smcl') == -1
 
 " smcl.vim -- Vim syntax file for smcl files.
diff --git a/syntax/smhl.vim b/syntax/smhl.vim
index a36d647f1..6e827414c 100644
--- a/syntax/smhl.vim
+++ b/syntax/smhl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/smhl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax cluster _semantic contains=_semantic1,_semantic2,_semantic3,_semantic4,_semantic5,_semantic6,_semantic7,_semantic8,_semantic9,_semantic10,_semantic11,_semantic12,_semantic13,_semantic14,_semantic15,_semantic16,_semantic17,_semantic18,_semantic19,_semantic20,_semantic21,_semantic22,_semantic23,_semantic24,_semantic25
diff --git a/syntax/smith.vim b/syntax/smith.vim
index 7d3a67b79..10b5b55b9 100644
--- a/syntax/smith.vim
+++ b/syntax/smith.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/smith.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smith') == -1
 
 " Vim syntax file
diff --git a/syntax/sml.vim b/syntax/sml.vim
index b4ff495d2..1970e9998 100644
--- a/syntax/sml.vim
+++ b/syntax/sml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sml') == -1
 
 " Vim syntax file
diff --git a/syntax/smt2.vim b/syntax/smt2.vim
index 5fa941d40..0ca504ea2 100644
--- a/syntax/smt2.vim
+++ b/syntax/smt2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/smt2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smt2') == -1
 
 " Vim syntax file
diff --git a/syntax/snobol4.vim b/syntax/snobol4.vim
index 0f88911cc..a2787f15e 100644
--- a/syntax/snobol4.vim
+++ b/syntax/snobol4.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/snobol4.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'snobol4') == -1
 
 " Vim syntax file
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index ebf9549d5..4f2a15e59 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/solidity.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
 
 " Vim syntax file
diff --git a/syntax/spec.vim b/syntax/spec.vim
index 570dea78d..3d7cf35d7 100644
--- a/syntax/spec.vim
+++ b/syntax/spec.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/spec.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spec') == -1
 
 " Filename:    spec.vim
diff --git a/syntax/spice.vim b/syntax/spice.vim
index c168154a9..42c882cb6 100644
--- a/syntax/spice.vim
+++ b/syntax/spice.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/spice.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spice') == -1
 
 " Vim syntax file
diff --git a/syntax/spup.vim b/syntax/spup.vim
index 71af16f93..de3389956 100644
--- a/syntax/spup.vim
+++ b/syntax/spup.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/spup.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spup') == -1
 
 " Vim syntax file
diff --git a/syntax/spyce.vim b/syntax/spyce.vim
index 2c87ffb4a..24bf358d9 100644
--- a/syntax/spyce.vim
+++ b/syntax/spyce.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/spyce.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spyce') == -1
 
 " Vim syntax file
diff --git a/syntax/sql.vim b/syntax/sql.vim
index 54cc4673f..e0979489b 100644
--- a/syntax/sql.vim
+++ b/syntax/sql.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
 
 " Vim syntax file loader
diff --git a/syntax/sqlj.vim b/syntax/sqlj.vim
index b043fe5a2..74193bc3f 100644
--- a/syntax/sqlj.vim
+++ b/syntax/sqlj.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sqlj.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sqlj') == -1
 
 " Vim syntax file
diff --git a/syntax/sqloracle.vim b/syntax/sqloracle.vim
index eb3390ba8..494f8c916 100644
--- a/syntax/sqloracle.vim
+++ b/syntax/sqloracle.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sqloracle.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
 
 " Vim syntax file
diff --git a/syntax/sqr.vim b/syntax/sqr.vim
index f8812c0d9..89474ff3a 100644
--- a/syntax/sqr.vim
+++ b/syntax/sqr.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sqr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sqr') == -1
 
 " Vim syntax file
diff --git a/syntax/squid.vim b/syntax/squid.vim
index 2749a5305..05d4dd7e9 100644
--- a/syntax/squid.vim
+++ b/syntax/squid.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/squid.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'squid') == -1
 
 " Vim syntax file
diff --git a/syntax/srec.vim b/syntax/srec.vim
index 651480102..5375700e3 100644
--- a/syntax/srec.vim
+++ b/syntax/srec.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/srec.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'srec') == -1
 
 " Vim syntax file
diff --git a/syntax/sshconfig.vim b/syntax/sshconfig.vim
index c8e666d83..7ba0d05fe 100644
--- a/syntax/sshconfig.vim
+++ b/syntax/sshconfig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sshconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshconfig') == -1
 
 " Vim syntax file
diff --git a/syntax/sshdconfig.vim b/syntax/sshdconfig.vim
index 7e45086c6..49c9d1f69 100644
--- a/syntax/sshdconfig.vim
+++ b/syntax/sshdconfig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sshdconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshdconfig') == -1
 
 " Vim syntax file
diff --git a/syntax/st.vim b/syntax/st.vim
index a642ffa9b..c5ea48504 100644
--- a/syntax/st.vim
+++ b/syntax/st.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/st.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'st') == -1
 
 " Vim syntax file
diff --git a/syntax/stata.vim b/syntax/stata.vim
index 9098914b0..9a972ad01 100644
--- a/syntax/stata.vim
+++ b/syntax/stata.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/stata.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stata') == -1
 
 " stata.vim -- Vim syntax file for Stata do, ado, and class files.
diff --git a/syntax/stp.vim b/syntax/stp.vim
index f40a4eb22..04c70fe43 100644
--- a/syntax/stp.vim
+++ b/syntax/stp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/stp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stp') == -1
 
 " Vim syntax file
diff --git a/syntax/stylus.vim b/syntax/stylus.vim
index 36972ad68..0f32d2d83 100644
--- a/syntax/stylus.vim
+++ b/syntax/stylus.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/stylus.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
 
 " Vim syntax file
diff --git a/syntax/sudoers.vim b/syntax/sudoers.vim
index 298ddb9cc..4482fac7e 100644
--- a/syntax/sudoers.vim
+++ b/syntax/sudoers.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sudoers.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sudoers') == -1
 
 " Vim syntax file
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index 0654b2033..377964e69 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/svelte.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svelte') == -1
 
 " Vim syntax file
diff --git a/syntax/svg.vim b/syntax/svg.vim
index 979d0a704..676cfc9fd 100644
--- a/syntax/svg.vim
+++ b/syntax/svg.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/svg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svg') == -1
 
 " Vim syntax file
diff --git a/syntax/svn.vim b/syntax/svn.vim
index 6d1fa476e..ae7f7875f 100644
--- a/syntax/svn.vim
+++ b/syntax/svn.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/svn.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svn') == -1
 
 " Vim syntax file
diff --git a/syntax/swift.vim b/syntax/swift.vim
index 6c988338e..26d9d7a00 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/swift.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 
 " File: swift.vim
diff --git a/syntax/swiftgyb.vim b/syntax/swiftgyb.vim
index c9a8851bc..b85fe036c 100644
--- a/syntax/swiftgyb.vim
+++ b/syntax/swiftgyb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/swiftgyb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swiftgyb') == -1
 
 " This source file is part of the Swift.org open source project
diff --git a/syntax/sxhkdrc.vim b/syntax/sxhkdrc.vim
index c44ab0c0f..7f413409a 100644
--- a/syntax/sxhkdrc.vim
+++ b/syntax/sxhkdrc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sxhkdrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sxhkd') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/sysctl.vim b/syntax/sysctl.vim
index 0e8eb0bf7..1fccb9845 100644
--- a/syntax/sysctl.vim
+++ b/syntax/sysctl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/sysctl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sysctl') == -1
 
 " Vim syntax file
diff --git a/syntax/systemd.vim b/syntax/systemd.vim
index fdf4b764f..d72197193 100644
--- a/syntax/systemd.vim
+++ b/syntax/systemd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/systemd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemd') == -1
 
 " Filename:     systemd.vim
diff --git a/syntax/systemverilog.vim b/syntax/systemverilog.vim
index 83eecaa71..823780adc 100644
--- a/syntax/systemverilog.vim
+++ b/syntax/systemverilog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/systemverilog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemverilog') == -1
 
 " Vim syntax file
diff --git a/syntax/tablegen.vim b/syntax/tablegen.vim
index 41928648e..ab77c6238 100644
--- a/syntax/tablegen.vim
+++ b/syntax/tablegen.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tablegen.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 
 " Vim syntax file
diff --git a/syntax/tads.vim b/syntax/tads.vim
index e47375354..e47cad71d 100644
--- a/syntax/tads.vim
+++ b/syntax/tads.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tads.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tads') == -1
 
 " Vim syntax file
diff --git a/syntax/tags.vim b/syntax/tags.vim
index 9853f3955..b3b5b36d6 100644
--- a/syntax/tags.vim
+++ b/syntax/tags.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tags') == -1
 
 " Language:		tags
diff --git a/syntax/tak.vim b/syntax/tak.vim
index 275a57c93..149229392 100644
--- a/syntax/tak.vim
+++ b/syntax/tak.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tak.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tak') == -1
 
 " Vim syntax file
diff --git a/syntax/tap.vim b/syntax/tap.vim
index 6c7bed65c..ff491f39c 100644
--- a/syntax/tap.vim
+++ b/syntax/tap.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim syntax file
diff --git a/syntax/taskdata.vim b/syntax/taskdata.vim
index de9648979..e0b18445e 100644
--- a/syntax/taskdata.vim
+++ b/syntax/taskdata.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/taskdata.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'taskdata') == -1
 
 " Vim syntax file
diff --git a/syntax/taskedit.vim b/syntax/taskedit.vim
index 96f4a050b..d3674f906 100644
--- a/syntax/taskedit.vim
+++ b/syntax/taskedit.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/taskedit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'taskedit') == -1
 
 " Vim syntax file
diff --git a/syntax/tcl.vim b/syntax/tcl.vim
index 6946bcc78..f03c13477 100644
--- a/syntax/tcl.vim
+++ b/syntax/tcl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
 
 " Vim syntax file
diff --git a/syntax/template.vim b/syntax/template.vim
index 32b8bafed..c2cd69aa8 100644
--- a/syntax/template.vim
+++ b/syntax/template.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/template.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'template') == -1
 
 " Vim syntax file
diff --git a/syntax/teraterm.vim b/syntax/teraterm.vim
index bfa0d3a8e..db59b2310 100644
--- a/syntax/teraterm.vim
+++ b/syntax/teraterm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/teraterm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'teraterm') == -1
 
 " Vim syntax file
diff --git a/syntax/terminfo.vim b/syntax/terminfo.vim
index 45ae51269..2251ff6e1 100644
--- a/syntax/terminfo.vim
+++ b/syntax/terminfo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/terminfo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terminfo') == -1
 
 " Vim syntax file
diff --git a/syntax/terraform.vim b/syntax/terraform.vim
index 8854c0ba1..2339c23f9 100644
--- a/syntax/terraform.vim
+++ b/syntax/terraform.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/terraform.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 
 " Forked from Larry Gilbert's syntax file
diff --git a/syntax/tex.vim b/syntax/tex.vim
index a48c454af..ecbc66f7c 100644
--- a/syntax/tex.vim
+++ b/syntax/tex.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
 
 " Vim syntax file
diff --git a/syntax/texinfo.vim b/syntax/texinfo.vim
index f97713f4e..be333cd28 100644
--- a/syntax/texinfo.vim
+++ b/syntax/texinfo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/texinfo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'texinfo') == -1
 
 " Vim syntax file
diff --git a/syntax/texmf.vim b/syntax/texmf.vim
index e6da43cbc..f55de21c5 100644
--- a/syntax/texmf.vim
+++ b/syntax/texmf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/texmf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'texmf') == -1
 
 " Vim syntax file
diff --git a/syntax/textile.vim b/syntax/textile.vim
index 351269316..e5ccc7ae4 100644
--- a/syntax/textile.vim
+++ b/syntax/textile.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/textile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'textile') == -1
 
 "
diff --git a/syntax/tf.vim b/syntax/tf.vim
index bad76201e..0bc237858 100644
--- a/syntax/tf.vim
+++ b/syntax/tf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tf') == -1
 
 " Vim syntax file
diff --git a/syntax/thrift.vim b/syntax/thrift.vim
index 806845a60..aaa546a45 100644
--- a/syntax/thrift.vim
+++ b/syntax/thrift.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/thrift.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'thrift') == -1
 
 " Vim syntax file
diff --git a/syntax/tidy.vim b/syntax/tidy.vim
index 46e12bbaf..2ace1fc00 100644
--- a/syntax/tidy.vim
+++ b/syntax/tidy.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tidy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tidy') == -1
 
 " Vim syntax file
diff --git a/syntax/tilde.vim b/syntax/tilde.vim
index f31c7cdfa..d67f89ea4 100644
--- a/syntax/tilde.vim
+++ b/syntax/tilde.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tilde.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tilde') == -1
 
 " Vim syntax file
diff --git a/syntax/tli.vim b/syntax/tli.vim
index bbb5b4eb4..87b85fd4c 100644
--- a/syntax/tli.vim
+++ b/syntax/tli.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tli.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tli') == -1
 
 " Vim syntax file
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index d1cf1301b..f992751f3 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tmux.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1
 
 " Language: tmux(1) configuration file
diff --git a/syntax/toml.vim b/syntax/toml.vim
index 4838b0d94..43c6e87e9 100644
--- a/syntax/toml.vim
+++ b/syntax/toml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/toml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'toml') == -1
 
 " Language:   TOML
diff --git a/syntax/tpp.vim b/syntax/tpp.vim
index d9f280fd8..7057879fd 100644
--- a/syntax/tpp.vim
+++ b/syntax/tpp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tpp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tpp') == -1
 
 " Vim syntax file
diff --git a/syntax/tptp.vim b/syntax/tptp.vim
index f31b278d4..7c29b43f1 100644
--- a/syntax/tptp.vim
+++ b/syntax/tptp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tptp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tptp') == -1
 
 " Vim syntax file
diff --git a/syntax/trasys.vim b/syntax/trasys.vim
index 44abf3c4e..bd5214392 100644
--- a/syntax/trasys.vim
+++ b/syntax/trasys.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/trasys.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'trasys') == -1
 
 " Vim syntax file
diff --git a/syntax/treetop.vim b/syntax/treetop.vim
index 46103dc67..53cf77182 100644
--- a/syntax/treetop.vim
+++ b/syntax/treetop.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/treetop.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'treetop') == -1
 
 " Vim syntax file
diff --git a/syntax/trustees.vim b/syntax/trustees.vim
index d2ff0ab08..7a29a6670 100644
--- a/syntax/trustees.vim
+++ b/syntax/trustees.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/trustees.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'trustees') == -1
 
 " Vim syntax file
diff --git a/syntax/tsalt.vim b/syntax/tsalt.vim
index e0a4ade1f..733f16832 100644
--- a/syntax/tsalt.vim
+++ b/syntax/tsalt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tsalt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tsalt') == -1
 
 " Vim syntax file
diff --git a/syntax/tsscl.vim b/syntax/tsscl.vim
index ef5415b43..a20488bea 100644
--- a/syntax/tsscl.vim
+++ b/syntax/tsscl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tsscl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tsscl') == -1
 
 " Vim syntax file
diff --git a/syntax/tssgm.vim b/syntax/tssgm.vim
index 07a84ec36..f96c71cb3 100644
--- a/syntax/tssgm.vim
+++ b/syntax/tssgm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tssgm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tssgm') == -1
 
 " Vim syntax file
diff --git a/syntax/tssop.vim b/syntax/tssop.vim
index 89c6c893b..175a12eb4 100644
--- a/syntax/tssop.vim
+++ b/syntax/tssop.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tssop.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tssop') == -1
 
 " Vim syntax file
diff --git a/syntax/tt2.vim b/syntax/tt2.vim
index 426d32a3a..24cd9c662 100644
--- a/syntax/tt2.vim
+++ b/syntax/tt2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tt2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Language:      TT2 (Perl Template Toolkit)
diff --git a/syntax/tt2html.vim b/syntax/tt2html.vim
index 728819a5a..6ab610823 100644
--- a/syntax/tt2html.vim
+++ b/syntax/tt2html.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tt2html.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Language:      TT2 embedded with HTML
diff --git a/syntax/tt2js.vim b/syntax/tt2js.vim
index d576ac050..77110ff9b 100644
--- a/syntax/tt2js.vim
+++ b/syntax/tt2js.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/tt2js.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Language:      TT2 embedded with Javascript
diff --git a/syntax/twig.vim b/syntax/twig.vim
index e3e67b5d7..73e3ace85 100644
--- a/syntax/twig.vim
+++ b/syntax/twig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/twig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
 
 " Vim syntax file
diff --git a/syntax/typescript.vim b/syntax/typescript.vim
index 8a56e1837..e6a3e4142 100644
--- a/syntax/typescript.vim
+++ b/syntax/typescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/typescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " Vim syntax file
diff --git a/syntax/typescriptreact.vim b/syntax/typescriptreact.vim
index 7d55769b6..1eca36b38 100644
--- a/syntax/typescriptreact.vim
+++ b/syntax/typescriptreact.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/typescriptreact.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 if !exists("main_syntax")
diff --git a/syntax/uc.vim b/syntax/uc.vim
index 20c3ea80d..912e4e252 100644
--- a/syntax/uc.vim
+++ b/syntax/uc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/uc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'uc') == -1
 
 " Vim syntax file
diff --git a/syntax/udevconf.vim b/syntax/udevconf.vim
index b2d12123c..077cfe886 100644
--- a/syntax/udevconf.vim
+++ b/syntax/udevconf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/udevconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'udevconf') == -1
 
 " Vim syntax file
diff --git a/syntax/udevperm.vim b/syntax/udevperm.vim
index d47f34c1f..ee52607ff 100644
--- a/syntax/udevperm.vim
+++ b/syntax/udevperm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/udevperm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'udevperm') == -1
 
 " Vim syntax file
diff --git a/syntax/uil.vim b/syntax/uil.vim
index 81d834435..72569b54b 100644
--- a/syntax/uil.vim
+++ b/syntax/uil.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/uil.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'uil') == -1
 
 " Vim syntax file
diff --git a/syntax/unison.vim b/syntax/unison.vim
index 2578add82..7774a64c0 100644
--- a/syntax/unison.vim
+++ b/syntax/unison.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/unison.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'unison') == -1
 
 " Vim syntax file, adapted from Haskell file by John Williams <jrw@pobox.com>
diff --git a/syntax/updatedb.vim b/syntax/updatedb.vim
index d4479902b..f1cb406bd 100644
--- a/syntax/updatedb.vim
+++ b/syntax/updatedb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/updatedb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'updatedb') == -1
 
 " Vim syntax file
diff --git a/syntax/upstart.vim b/syntax/upstart.vim
index 2295ad54c..ca1c12750 100644
--- a/syntax/upstart.vim
+++ b/syntax/upstart.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/upstart.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'upstart') == -1
 
 " Vim syntax file
diff --git a/syntax/upstreamdat.vim b/syntax/upstreamdat.vim
index 0ae0db3a5..0f3b60a27 100644
--- a/syntax/upstreamdat.vim
+++ b/syntax/upstreamdat.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/upstreamdat.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'upstreamdat') == -1
 
 " Vim syntax file
diff --git a/syntax/upstreaminstalllog.vim b/syntax/upstreaminstalllog.vim
index b4e760833..7e7cf2489 100644
--- a/syntax/upstreaminstalllog.vim
+++ b/syntax/upstreaminstalllog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/upstreaminstalllog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'upstreaminstalllog') == -1
 
 " Vim syntax file
diff --git a/syntax/upstreamlog.vim b/syntax/upstreamlog.vim
index 8e50a9e68..0b0e9f26f 100644
--- a/syntax/upstreamlog.vim
+++ b/syntax/upstreamlog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/upstreamlog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'upstreamlog') == -1
 
 " Vim syntax file
diff --git a/syntax/usserverlog.vim b/syntax/usserverlog.vim
index c891affae..0711c54f4 100644
--- a/syntax/usserverlog.vim
+++ b/syntax/usserverlog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/usserverlog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'usserverlog') == -1
 
 " Vim syntax file
diff --git a/syntax/usw2kagtlog.vim b/syntax/usw2kagtlog.vim
index 8b3ee48be..53d2a08a4 100644
--- a/syntax/usw2kagtlog.vim
+++ b/syntax/usw2kagtlog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/usw2kagtlog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'usw2kagtlog') == -1
 
 " Vim syntax file
diff --git a/syntax/vala.vim b/syntax/vala.vim
index 1cf68e0a2..5854fdc9c 100644
--- a/syntax/vala.vim
+++ b/syntax/vala.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
 
 " Vim syntax file
diff --git a/syntax/vb.vim b/syntax/vb.vim
index 04e171ca2..869066666 100644
--- a/syntax/vb.vim
+++ b/syntax/vb.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
 
 " Vim syntax file
diff --git a/syntax/vbnet.vim b/syntax/vbnet.vim
index 0550ca031..695349ccc 100644
--- a/syntax/vbnet.vim
+++ b/syntax/vbnet.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vbnet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vbnet') == -1
 
 " Vim syntax file
diff --git a/syntax/vcl.vim b/syntax/vcl.vim
index e315fbf15..92bc17c30 100644
--- a/syntax/vcl.vim
+++ b/syntax/vcl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vcl') == -1
 
 " Vim syntax file
diff --git a/syntax/velocity.vim b/syntax/velocity.vim
index d044f914c..bf855de60 100644
--- a/syntax/velocity.vim
+++ b/syntax/velocity.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/velocity.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'velocity') == -1
 
 " Vim syntax file
diff --git a/syntax/vera.vim b/syntax/vera.vim
index 8213de17b..4238909c7 100644
--- a/syntax/vera.vim
+++ b/syntax/vera.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vera.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vera') == -1
 
 " Vim syntax file
diff --git a/syntax/verilog.vim b/syntax/verilog.vim
index cc00a76a0..d7d27f79d 100644
--- a/syntax/verilog.vim
+++ b/syntax/verilog.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/verilog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilog') == -1
 
 " Vim syntax file
diff --git a/syntax/verilogams.vim b/syntax/verilogams.vim
index bc65b3057..100ae92b8 100644
--- a/syntax/verilogams.vim
+++ b/syntax/verilogams.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/verilogams.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilogams') == -1
 
 " Vim syntax file
diff --git a/syntax/vgrindefs.vim b/syntax/vgrindefs.vim
index 7f6a46422..a6f6e86ac 100644
--- a/syntax/vgrindefs.vim
+++ b/syntax/vgrindefs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vgrindefs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vgrindefs') == -1
 
 " Vim syntax file
diff --git a/syntax/vhdl.vim b/syntax/vhdl.vim
index f29ecc1a2..75771c6f2 100644
--- a/syntax/vhdl.vim
+++ b/syntax/vhdl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vhdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vhdl') == -1
 
 " Vim syntax file
diff --git a/syntax/vimgo.vim b/syntax/vimgo.vim
index f33b5b1b5..f0b6fe42d 100644
--- a/syntax/vimgo.vim
+++ b/syntax/vimgo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vimgo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:current_syntax")
diff --git a/syntax/viminfo.vim b/syntax/viminfo.vim
index ca37f9e53..589398c42 100644
--- a/syntax/viminfo.vim
+++ b/syntax/viminfo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/viminfo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'viminfo') == -1
 
 " Vim syntax file
diff --git a/syntax/vlang.vim b/syntax/vlang.vim
index 883de7d3e..12f5e2767 100644
--- a/syntax/vlang.vim
+++ b/syntax/vlang.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vlang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'v') == -1
 
 " Vim syntax file
diff --git a/syntax/vmasm.vim b/syntax/vmasm.vim
index 2581e88c9..034a4b199 100644
--- a/syntax/vmasm.vim
+++ b/syntax/vmasm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vmasm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vmasm') == -1
 
 " Vim syntax file
diff --git a/syntax/voscm.vim b/syntax/voscm.vim
index cd883f6fc..24b43904c 100644
--- a/syntax/voscm.vim
+++ b/syntax/voscm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/voscm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'voscm') == -1
 
 " Vim syntax file
diff --git a/syntax/vrml.vim b/syntax/vrml.vim
index 0ee66705e..02fca957d 100644
--- a/syntax/vrml.vim
+++ b/syntax/vrml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vrml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vrml') == -1
 
 " Vim syntax file
diff --git a/syntax/vroom.vim b/syntax/vroom.vim
index 6d0a48497..00bf151f8 100644
--- a/syntax/vroom.vim
+++ b/syntax/vroom.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vroom.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vroom') == -1
 
 " Vim syntax file
diff --git a/syntax/vue.vim b/syntax/vue.vim
index 1e039a5f8..d516f4097 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/vue.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
 
 " Vim syntax file
diff --git a/syntax/wast.vim b/syntax/wast.vim
index d0b81718e..d47d344df 100644
--- a/syntax/wast.vim
+++ b/syntax/wast.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/wast.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wast') == -1
 
 " Vim syntax file
diff --git a/syntax/webmacro.vim b/syntax/webmacro.vim
index a5986b2ed..3e9add54c 100644
--- a/syntax/webmacro.vim
+++ b/syntax/webmacro.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/webmacro.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'webmacro') == -1
 
 " WebMacro syntax file
diff --git a/syntax/wget.vim b/syntax/wget.vim
index 62fafb2ae..e81980e06 100644
--- a/syntax/wget.vim
+++ b/syntax/wget.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/wget.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wget') == -1
 
 " Vim syntax file
diff --git a/syntax/winbatch.vim b/syntax/winbatch.vim
index d2494c8ca..3c7ad59be 100644
--- a/syntax/winbatch.vim
+++ b/syntax/winbatch.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/winbatch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'winbatch') == -1
 
 " Vim syntax file
diff --git a/syntax/wml.vim b/syntax/wml.vim
index 9ded9e190..be4b620ae 100644
--- a/syntax/wml.vim
+++ b/syntax/wml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/wml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wml') == -1
 
 " Vim syntax file
diff --git a/syntax/wsh.vim b/syntax/wsh.vim
index d18c715d4..bd132b3c5 100644
--- a/syntax/wsh.vim
+++ b/syntax/wsh.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/wsh.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wsh') == -1
 
 " Vim syntax file
diff --git a/syntax/wsml.vim b/syntax/wsml.vim
index f3a583490..ef8c3623c 100644
--- a/syntax/wsml.vim
+++ b/syntax/wsml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/wsml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wsml') == -1
 
 " Vim syntax file
diff --git a/syntax/wvdial.vim b/syntax/wvdial.vim
index 560060d2d..d9a47e26f 100644
--- a/syntax/wvdial.vim
+++ b/syntax/wvdial.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/wvdial.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wvdial') == -1
 
 " Vim syntax file
diff --git a/syntax/xdc.vim b/syntax/xdc.vim
index 4d583cd5a..8a7684404 100644
--- a/syntax/xdc.vim
+++ b/syntax/xdc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xdc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xdc') == -1
 
 " Vim syntax file
diff --git a/syntax/xdefaults.vim b/syntax/xdefaults.vim
index 704c24b14..78c7b8a80 100644
--- a/syntax/xdefaults.vim
+++ b/syntax/xdefaults.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xdefaults.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xdefaults') == -1
 
 " Vim syntax file
diff --git a/syntax/xf86conf.vim b/syntax/xf86conf.vim
index 1c2950578..90af49cb2 100644
--- a/syntax/xf86conf.vim
+++ b/syntax/xf86conf.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xf86conf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xf86conf') == -1
 
 " Vim syntax file
diff --git a/syntax/xhtml.vim b/syntax/xhtml.vim
index b1beead43..c58dc3c8b 100644
--- a/syntax/xhtml.vim
+++ b/syntax/xhtml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xhtml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xhtml') == -1
 
 " Vim syntax file
diff --git a/syntax/xinetd.vim b/syntax/xinetd.vim
index 2a59f43c0..c9ff0fc06 100644
--- a/syntax/xinetd.vim
+++ b/syntax/xinetd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xinetd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xinetd') == -1
 
 " Vim syntax file
diff --git a/syntax/xmath.vim b/syntax/xmath.vim
index 5824eddcd..068a279b9 100644
--- a/syntax/xmath.vim
+++ b/syntax/xmath.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xmath.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xmath') == -1
 
 " Vim syntax file
diff --git a/syntax/xml.vim b/syntax/xml.vim
index 7b1e6ce74..724f3cc6e 100644
--- a/syntax/xml.vim
+++ b/syntax/xml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xml') == -1
 
 " Vim syntax file
diff --git a/syntax/xmodmap.vim b/syntax/xmodmap.vim
index b0de83098..96fc01893 100644
--- a/syntax/xmodmap.vim
+++ b/syntax/xmodmap.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xmodmap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xmodmap') == -1
 
 " Vim syntax file
diff --git a/syntax/xpm.vim b/syntax/xpm.vim
index 7e741cad6..96289c11c 100644
--- a/syntax/xpm.vim
+++ b/syntax/xpm.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xpm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xpm') == -1
 
 " Vim syntax file
diff --git a/syntax/xpm2.vim b/syntax/xpm2.vim
index b1eebba9a..333d8b628 100644
--- a/syntax/xpm2.vim
+++ b/syntax/xpm2.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xpm2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xpm2') == -1
 
 " Vim syntax file
diff --git a/syntax/xquery.vim b/syntax/xquery.vim
index 8a154a951..b71b4c4ef 100644
--- a/syntax/xquery.vim
+++ b/syntax/xquery.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xquery.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xquery') == -1
 
 " Vim syntax file
diff --git a/syntax/xs.vim b/syntax/xs.vim
index da78f6b4f..80d559a5a 100644
--- a/syntax/xs.vim
+++ b/syntax/xs.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim syntax file
diff --git a/syntax/xsd.vim b/syntax/xsd.vim
index aa6358892..325486cf8 100644
--- a/syntax/xsd.vim
+++ b/syntax/xsd.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xsd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
 
 " Vim syntax file
diff --git a/syntax/xsl.vim b/syntax/xsl.vim
index c24d978cb..0a5d5cc8f 100644
--- a/syntax/xsl.vim
+++ b/syntax/xsl.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xsl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsl') == -1
 
 " Vim syntax file
diff --git a/syntax/xslt.vim b/syntax/xslt.vim
index 6efd3738b..2db1f3ea6 100644
--- a/syntax/xslt.vim
+++ b/syntax/xslt.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/xslt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xslt') == -1
 
 " Vim syntax file
diff --git a/syntax/yacc.vim b/syntax/yacc.vim
index 01992fadd..e687bb41d 100644
--- a/syntax/yacc.vim
+++ b/syntax/yacc.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yacc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yacc') == -1
 
 " Vim syntax file
diff --git a/syntax/yaml.vim b/syntax/yaml.vim
index 53e606846..a0fa5b9d4 100644
--- a/syntax/yaml.vim
+++ b/syntax/yaml.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 
 " Vim syntax file
diff --git a/syntax/yats.vim b/syntax/yats.vim
index bb98581e9..b3e95b05a 100644
--- a/syntax/yats.vim
+++ b/syntax/yats.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 runtime syntax/yats/typescript.vim
diff --git a/syntax/yats/css.vim b/syntax/yats/css.vim
index 219fc93fe..c4f3ae6ec 100644
--- a/syntax/yats/css.vim
+++ b/syntax/yats/css.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/css.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMStyle contained alignContent alignItems alignSelf animation
diff --git a/syntax/yats/dom-document.vim b/syntax/yats/dom-document.vim
index 2dfea5ec7..3d6d97628 100644
--- a/syntax/yats/dom-document.vim
+++ b/syntax/yats/dom-document.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/dom-document.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMDocProp contained activeElement body cookie defaultView
diff --git a/syntax/yats/dom-elem.vim b/syntax/yats/dom-elem.vim
index 0680b7a7f..32349a33b 100644
--- a/syntax/yats/dom-elem.vim
+++ b/syntax/yats/dom-elem.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/dom-elem.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMElemAttrs contained accessKey clientHeight clientLeft
diff --git a/syntax/yats/dom-event.vim b/syntax/yats/dom-event.vim
index f13af7262..698cd0e1d 100644
--- a/syntax/yats/dom-event.vim
+++ b/syntax/yats/dom-event.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/dom-event.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMEventTargetMethod contained addEventListener removeEventListener nextgroup=typescriptEventFuncCallArg
diff --git a/syntax/yats/dom-form.vim b/syntax/yats/dom-form.vim
index 222b3e15d..eecd8453f 100644
--- a/syntax/yats/dom-form.vim
+++ b/syntax/yats/dom-form.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/dom-form.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMFormProp contained acceptCharset action elements encoding
diff --git a/syntax/yats/dom-node.vim b/syntax/yats/dom-node.vim
index d55e82e1e..32e4142a1 100644
--- a/syntax/yats/dom-node.vim
+++ b/syntax/yats/dom-node.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/dom-node.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMNodeProp contained attributes baseURI baseURIObject childNodes
diff --git a/syntax/yats/dom-storage.vim b/syntax/yats/dom-storage.vim
index 21564a219..c34ab0172 100644
--- a/syntax/yats/dom-storage.vim
+++ b/syntax/yats/dom-storage.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/dom-storage.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMStorage contained sessionStorage localStorage
diff --git a/syntax/yats/ecma-402.vim b/syntax/yats/ecma-402.vim
index 2114485c2..98c103c2b 100644
--- a/syntax/yats/ecma-402.vim
+++ b/syntax/yats/ecma-402.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/ecma-402.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Intl
diff --git a/syntax/yats/es6-array.vim b/syntax/yats/es6-array.vim
index cc6ba71f1..2b658f257 100644
--- a/syntax/yats/es6-array.vim
+++ b/syntax/yats/es6-array.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-array.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Array nextgroup=typescriptGlobalArrayDot,typescriptFuncCallArg
diff --git a/syntax/yats/es6-date.vim b/syntax/yats/es6-date.vim
index ea2653cdb..cd91fa537 100644
--- a/syntax/yats/es6-date.vim
+++ b/syntax/yats/es6-date.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-date.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Date nextgroup=typescriptGlobalDateDot,typescriptFuncCallArg
diff --git a/syntax/yats/es6-function.vim b/syntax/yats/es6-function.vim
index 0ff39379d..14c137aec 100644
--- a/syntax/yats/es6-function.vim
+++ b/syntax/yats/es6-function.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-function.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Function
diff --git a/syntax/yats/es6-json.vim b/syntax/yats/es6-json.vim
index 682e8f06d..b01a878d8 100644
--- a/syntax/yats/es6-json.vim
+++ b/syntax/yats/es6-json.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-json.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName JSON nextgroup=typescriptGlobalJSONDot,typescriptFuncCallArg
diff --git a/syntax/yats/es6-map.vim b/syntax/yats/es6-map.vim
index 247d1112f..ec618928c 100644
--- a/syntax/yats/es6-map.vim
+++ b/syntax/yats/es6-map.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-map.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Map WeakMap
diff --git a/syntax/yats/es6-math.vim b/syntax/yats/es6-math.vim
index 03460ec1f..fd86a1907 100644
--- a/syntax/yats/es6-math.vim
+++ b/syntax/yats/es6-math.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-math.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Math nextgroup=typescriptGlobalMathDot,typescriptFuncCallArg
diff --git a/syntax/yats/es6-number.vim b/syntax/yats/es6-number.vim
index 109e29d3a..a090e49b7 100644
--- a/syntax/yats/es6-number.vim
+++ b/syntax/yats/es6-number.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-number.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Number nextgroup=typescriptGlobalNumberDot,typescriptFuncCallArg
diff --git a/syntax/yats/es6-object.vim b/syntax/yats/es6-object.vim
index 3043542d0..55c6f9435 100644
--- a/syntax/yats/es6-object.vim
+++ b/syntax/yats/es6-object.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-object.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Object nextgroup=typescriptGlobalObjectDot,typescriptFuncCallArg
diff --git a/syntax/yats/es6-promise.vim b/syntax/yats/es6-promise.vim
index 46851ed96..6c1b4e8ad 100644
--- a/syntax/yats/es6-promise.vim
+++ b/syntax/yats/es6-promise.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-promise.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Promise nextgroup=typescriptGlobalPromiseDot,typescriptFuncCallArg
diff --git a/syntax/yats/es6-proxy.vim b/syntax/yats/es6-proxy.vim
index 9bbd9b665..9451dbe5b 100644
--- a/syntax/yats/es6-proxy.vim
+++ b/syntax/yats/es6-proxy.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-proxy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Proxy
diff --git a/syntax/yats/es6-reflect.vim b/syntax/yats/es6-reflect.vim
index 2f3f6eadf..6e3de79eb 100644
--- a/syntax/yats/es6-reflect.vim
+++ b/syntax/yats/es6-reflect.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-reflect.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Reflect
diff --git a/syntax/yats/es6-regexp.vim b/syntax/yats/es6-regexp.vim
index 9a16ba820..a6c50632f 100644
--- a/syntax/yats/es6-regexp.vim
+++ b/syntax/yats/es6-regexp.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-regexp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName RegExp nextgroup=typescriptGlobalRegExpDot,typescriptFuncCallArg
diff --git a/syntax/yats/es6-set.vim b/syntax/yats/es6-set.vim
index 56048f3e3..024743bc3 100644
--- a/syntax/yats/es6-set.vim
+++ b/syntax/yats/es6-set.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-set.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Set WeakSet
diff --git a/syntax/yats/es6-string.vim b/syntax/yats/es6-string.vim
index d7275a1d7..f4ef7f36e 100644
--- a/syntax/yats/es6-string.vim
+++ b/syntax/yats/es6-string.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-string.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName String nextgroup=typescriptGlobalStringDot,typescriptFuncCallArg
diff --git a/syntax/yats/es6-symbol.vim b/syntax/yats/es6-symbol.vim
index 51b2621ee..2cfb65ddd 100644
--- a/syntax/yats/es6-symbol.vim
+++ b/syntax/yats/es6-symbol.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/es6-symbol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Symbol nextgroup=typescriptGlobalSymbolDot,typescriptFuncCallArg
diff --git a/syntax/yats/event.vim b/syntax/yats/event.vim
index 36a226832..31d0eab2f 100644
--- a/syntax/yats/event.vim
+++ b/syntax/yats/event.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/event.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptAnimationEvent contained animationend animationiteration
diff --git a/syntax/yats/node.vim b/syntax/yats/node.vim
index 25b4e26fa..e8bc4b8b7 100644
--- a/syntax/yats/node.vim
+++ b/syntax/yats/node.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/node.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName global process
diff --git a/syntax/yats/test.vim b/syntax/yats/test.vim
index 7a68aa7f6..a8fe78810 100644
--- a/syntax/yats/test.vim
+++ b/syntax/yats/test.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/test.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName describe
diff --git a/syntax/yats/typescript.vim b/syntax/yats/typescript.vim
index df99073e2..9d91a1ce3 100644
--- a/syntax/yats/typescript.vim
+++ b/syntax/yats/typescript.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/typescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Function Boolean
diff --git a/syntax/yats/web-blob.vim b/syntax/yats/web-blob.vim
index 7badb6daf..fedb24178 100644
--- a/syntax/yats/web-blob.vim
+++ b/syntax/yats/web-blob.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-blob.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Blob BlobBuilder
diff --git a/syntax/yats/web-console.vim b/syntax/yats/web-console.vim
index f3e7c73a7..d8b1ded49 100644
--- a/syntax/yats/web-console.vim
+++ b/syntax/yats/web-console.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-console.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName console
diff --git a/syntax/yats/web-crypto.vim b/syntax/yats/web-crypto.vim
index 4a9442c3c..910332429 100644
--- a/syntax/yats/web-crypto.vim
+++ b/syntax/yats/web-crypto.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-crypto.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptCryptoGlobal containedin=typescriptIdentifierName crypto
diff --git a/syntax/yats/web-encoding.vim b/syntax/yats/web-encoding.vim
index 077eaf9e8..8188b7e15 100644
--- a/syntax/yats/web-encoding.vim
+++ b/syntax/yats/web-encoding.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-encoding.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptEncodingGlobal containedin=typescriptIdentifierName TextEncoder
diff --git a/syntax/yats/web-fetch.vim b/syntax/yats/web-fetch.vim
index 9fd87e458..3c9019b67 100644
--- a/syntax/yats/web-fetch.vim
+++ b/syntax/yats/web-fetch.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-fetch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Headers Request
diff --git a/syntax/yats/web-geo.vim b/syntax/yats/web-geo.vim
index c439be295..b9b3447d0 100644
--- a/syntax/yats/web-geo.vim
+++ b/syntax/yats/web-geo.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-geo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Geolocation
diff --git a/syntax/yats/web-history.vim b/syntax/yats/web-history.vim
index 99cc5ccc1..d170d37d4 100644
--- a/syntax/yats/web-history.vim
+++ b/syntax/yats/web-history.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-history.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptBOMHistoryProp contained length current next previous state
diff --git a/syntax/yats/web-location.vim b/syntax/yats/web-location.vim
index 65f8869d2..0d92f7bdd 100644
--- a/syntax/yats/web-location.vim
+++ b/syntax/yats/web-location.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-location.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptBOMLocationProp contained href protocol host hostname port
diff --git a/syntax/yats/web-navigator.vim b/syntax/yats/web-navigator.vim
index 48fe9f7df..2a408b0fe 100644
--- a/syntax/yats/web-navigator.vim
+++ b/syntax/yats/web-navigator.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-navigator.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptBOMNavigatorProp contained battery buildID connection cookieEnabled
diff --git a/syntax/yats/web-network.vim b/syntax/yats/web-network.vim
index d717da5c5..71cd6fca3 100644
--- a/syntax/yats/web-network.vim
+++ b/syntax/yats/web-network.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-network.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName NetworkInformation
diff --git a/syntax/yats/web-payment.vim b/syntax/yats/web-payment.vim
index 748059678..2154a14a0 100644
--- a/syntax/yats/web-payment.vim
+++ b/syntax/yats/web-payment.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-payment.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName PaymentRequest
diff --git a/syntax/yats/web-service-worker.vim b/syntax/yats/web-service-worker.vim
index a44950fb9..9f4974726 100644
--- a/syntax/yats/web-service-worker.vim
+++ b/syntax/yats/web-service-worker.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-service-worker.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptServiceWorkerProp contained controller ready
diff --git a/syntax/yats/web-window.vim b/syntax/yats/web-window.vim
index eb6257fbe..04d57e98f 100644
--- a/syntax/yats/web-window.vim
+++ b/syntax/yats/web-window.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-window.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptBOMWindowProp containedin=typescriptIdentifierName applicationCache
diff --git a/syntax/yats/web-xhr.vim b/syntax/yats/web-xhr.vim
index b8a8f56e8..e88b6456b 100644
--- a/syntax/yats/web-xhr.vim
+++ b/syntax/yats/web-xhr.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web-xhr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptXHRGlobal containedin=typescriptIdentifierName XMLHttpRequest
diff --git a/syntax/yats/web.vim b/syntax/yats/web.vim
index 37bf5559d..4b4c1bddb 100644
--- a/syntax/yats/web.vim
+++ b/syntax/yats/web.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/yats/web.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptBOM containedin=typescriptIdentifierName AbortController
diff --git a/syntax/z8a.vim b/syntax/z8a.vim
index b2229bf78..fb4fa81e2 100644
--- a/syntax/z8a.vim
+++ b/syntax/z8a.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/z8a.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'z8a') == -1
 
 " Vim syntax file
diff --git a/syntax/zephir.vim b/syntax/zephir.vim
index 08125056d..a6fcd4533 100644
--- a/syntax/zephir.vim
+++ b/syntax/zephir.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/zephir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zephir') == -1
 
 " Copyright 2009 The Go Authors. All rights reserved.
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 95d52381f..380e4bae8 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/zig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Vim syntax file
diff --git a/syntax/zimbu.vim b/syntax/zimbu.vim
index 388e0206e..ed523e5d2 100644
--- a/syntax/zimbu.vim
+++ b/syntax/zimbu.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/zimbu.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zimbu') == -1
 
 " Vim syntax file
diff --git a/syntax/zir.vim b/syntax/zir.vim
index 906e892eb..ff3fc96de 100644
--- a/syntax/zir.vim
+++ b/syntax/zir.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/zir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Vim syntax file
diff --git a/syntax/zsh.vim b/syntax/zsh.vim
index 96a70e2f1..c8ccd47bd 100644
--- a/syntax/zsh.vim
+++ b/syntax/zsh.vim
@@ -1,3 +1,8 @@
+let files = filter(globpath(&rtp, 'syntax/zsh.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+if len(files) > 0
+  exec 'source ' . files[0]
+  finish
+endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sh') == -1
 
 " Shebang

From 20b31f533764c4c32582124de8d8a6f6c9499c8a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 24 Oct 2020 21:46:04 +0200
Subject: [PATCH 185/299] Fix warning in command line window, closes #604

---
 plugin/polyglot.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index f989d583e..bfd9c1a02 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -74,7 +74,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -
   if match(capture, 'checktime') == -1
     augroup polyglot-sensible
       au!
-      au CursorHold * checktime
+      au CursorHold * silent! checktime
     augroup END
   endif
 

From d73c4d156279bfbc2ea9fafcbacca5fc2bd6cfd1 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 24 Oct 2020 23:50:54 +0200
Subject: [PATCH 186/299] Fix recursive loading, closes #605

---
 autoload/LaTeXtoUnicode.vim             | 4 +++-
 autoload/RstFold.vim                    | 4 +++-
 autoload/ada.vim                        | 4 +++-
 autoload/cargo.vim                      | 4 +++-
 autoload/cargo/quickfix.vim             | 4 +++-
 autoload/clojurecomplete.vim            | 4 +++-
 autoload/coffee.vim                     | 4 +++-
 autoload/crystal/indent.vim             | 4 +++-
 autoload/crystal_lang.vim               | 4 +++-
 autoload/csv.vim                        | 4 +++-
 autoload/dart.vim                       | 4 +++-
 autoload/db/adapter/ecto.vim            | 4 +++-
 autoload/ecrystal.vim                   | 4 +++-
 autoload/elixir/indent.vim              | 4 +++-
 autoload/elixir/util.vim                | 4 +++-
 autoload/fish.vim                       | 4 +++-
 autoload/fsharp.vim                     | 4 +++-
 autoload/fzf_gitignore.vim              | 4 +++-
 autoload/go/config.vim                  | 4 +++-
 autoload/graphql.vim                    | 4 +++-
 autoload/htmlcomplete.vim               | 4 +++-
 autoload/jsonnet.vim                    | 4 +++-
 autoload/jsx_pretty/comment.vim         | 4 +++-
 autoload/jsx_pretty/indent.vim          | 4 +++-
 autoload/julia.vim                      | 4 +++-
 autoload/julia/doc.vim                  | 4 +++-
 autoload/julia_blocks.vim               | 4 +++-
 autoload/julia_latex_symbols.vim        | 4 +++-
 autoload/ledger.vim                     | 4 +++-
 autoload/nim.vim                        | 4 +++-
 autoload/pony.vim                       | 4 +++-
 autoload/puppet/align.vim               | 4 +++-
 autoload/puppet/ctags.vim               | 4 +++-
 autoload/puppet/format.vim              | 4 +++-
 autoload/python/utils.vim               | 4 +++-
 autoload/requirements.vim               | 4 +++-
 autoload/rubycomplete.vim               | 4 +++-
 autoload/rust.vim                       | 4 +++-
 autoload/rust/debugging.vim             | 4 +++-
 autoload/rust/delimitmate.vim           | 4 +++-
 autoload/rust/tags.vim                  | 4 +++-
 autoload/rustfmt.vim                    | 4 +++-
 autoload/smt2.vim                       | 4 +++-
 autoload/terraform.vim                  | 4 +++-
 autoload/vital/_crystal.vim             | 4 +++-
 autoload/vital/_crystal/ColorEcho.vim   | 4 +++-
 autoload/vital/_crystal/Data/List.vim   | 4 +++-
 autoload/vital/_crystal/Data/String.vim | 4 +++-
 autoload/vital/_crystal/Process.vim     | 4 +++-
 autoload/vital/_crystal/Web/JSON.vim    | 4 +++-
 autoload/vital/crystal.vim              | 4 +++-
 autoload/xml/aria.vim                   | 4 +++-
 autoload/xml/html5.vim                  | 4 +++-
 autoload/xml/xsd.vim                    | 4 +++-
 autoload/zig/config.vim                 | 4 +++-
 autoload/zig/fmt.vim                    | 4 +++-
 autoload/zig/list.vim                   | 4 +++-
 autoload/zig/util.vim                   | 4 +++-
 compiler/ant.vim                        | 4 +++-
 compiler/bdf.vim                        | 4 +++-
 compiler/cake.vim                       | 4 +++-
 compiler/cargo.vim                      | 4 +++-
 compiler/coffee.vim                     | 4 +++-
 compiler/credo.vim                      | 4 +++-
 compiler/cryptol.vim                    | 4 +++-
 compiler/cs.vim                         | 4 +++-
 compiler/cucumber.vim                   | 4 +++-
 compiler/dot.vim                        | 4 +++-
 compiler/eruby.vim                      | 4 +++-
 compiler/exunit.vim                     | 4 +++-
 compiler/fish.vim                       | 4 +++-
 compiler/go.vim                         | 4 +++-
 compiler/gradle.vim                     | 4 +++-
 compiler/gradlew.vim                    | 4 +++-
 compiler/haml.vim                       | 4 +++-
 compiler/ledger.vim                     | 4 +++-
 compiler/lilypond.vim                   | 4 +++-
 compiler/ls.vim                         | 4 +++-
 compiler/mix.vim                        | 4 +++-
 compiler/nim.vim                        | 4 +++-
 compiler/nix-build.vim                  | 4 +++-
 compiler/ocaml.vim                      | 4 +++-
 compiler/powershell.vim                 | 4 +++-
 compiler/python.vim                     | 4 +++-
 compiler/rake.vim                       | 4 +++-
 compiler/rspec.vim                      | 4 +++-
 compiler/ruby.vim                       | 4 +++-
 compiler/rubyunit.vim                   | 4 +++-
 compiler/rustc.vim                      | 4 +++-
 compiler/sass.vim                       | 4 +++-
 compiler/sbt.vim                        | 4 +++-
 compiler/swift.vim                      | 4 +++-
 compiler/tcl.vim                        | 4 +++-
 compiler/tex.vim                        | 4 +++-
 compiler/tidy.vim                       | 4 +++-
 compiler/typescript.vim                 | 4 +++-
 extras/flow.vim                         | 4 +++-
 extras/jsdoc.vim                        | 4 +++-
 extras/ngdoc.vim                        | 4 +++-
 ftplugin/8th.vim                        | 4 +++-
 ftplugin/a2ps.vim                       | 4 +++-
 ftplugin/aap.vim                        | 4 +++-
 ftplugin/abap.vim                       | 4 +++-
 ftplugin/abaqus.vim                     | 4 +++-
 ftplugin/ada.vim                        | 4 +++-
 ftplugin/alsaconf.vim                   | 4 +++-
 ftplugin/ansible.vim                    | 4 +++-
 ftplugin/ansible_hosts.vim              | 4 +++-
 ftplugin/ant.vim                        | 4 +++-
 ftplugin/arch.vim                       | 4 +++-
 ftplugin/art.vim                        | 4 +++-
 ftplugin/aspvbs.vim                     | 4 +++-
 ftplugin/automake.vim                   | 4 +++-
 ftplugin/awk.vim                        | 4 +++-
 ftplugin/bdf.vim                        | 4 +++-
 ftplugin/blade.vim                      | 4 +++-
 ftplugin/bst.vim                        | 4 +++-
 ftplugin/bzl.vim                        | 4 +++-
 ftplugin/caddyfile.vim                  | 4 +++-
 ftplugin/calendar.vim                   | 4 +++-
 ftplugin/cdrdaoconf.vim                 | 4 +++-
 ftplugin/cfg.vim                        | 4 +++-
 ftplugin/ch.vim                         | 4 +++-
 ftplugin/clojure.vim                    | 4 +++-
 ftplugin/cobol.vim                      | 4 +++-
 ftplugin/coffee.vim                     | 4 +++-
 ftplugin/conf.vim                       | 4 +++-
 ftplugin/config.vim                     | 4 +++-
 ftplugin/crm.vim                        | 4 +++-
 ftplugin/cryptol/folding.vim            | 4 +++-
 ftplugin/crystal.vim                    | 4 +++-
 ftplugin/cs.vim                         | 4 +++-
 ftplugin/csc.vim                        | 4 +++-
 ftplugin/css.vim                        | 4 +++-
 ftplugin/csv.vim                        | 4 +++-
 ftplugin/cucumber.vim                   | 4 +++-
 ftplugin/cvsrc.vim                      | 4 +++-
 ftplugin/dart.vim                       | 4 +++-
 ftplugin/debchangelog.vim               | 4 +++-
 ftplugin/debcontrol.vim                 | 4 +++-
 ftplugin/denyhosts.vim                  | 4 +++-
 ftplugin/dhall.vim                      | 4 +++-
 ftplugin/dictconf.vim                   | 4 +++-
 ftplugin/dictdconf.vim                  | 4 +++-
 ftplugin/diff.vim                       | 4 +++-
 ftplugin/dircolors.vim                  | 4 +++-
 ftplugin/docker-compose.vim             | 4 +++-
 ftplugin/dockerfile.vim                 | 4 +++-
 ftplugin/dosbatch.vim                   | 4 +++-
 ftplugin/dosini.vim                     | 4 +++-
 ftplugin/dtd.vim                        | 4 +++-
 ftplugin/dune.vim                       | 4 +++-
 ftplugin/ecrystal.vim                   | 4 +++-
 ftplugin/eelixir.vim                    | 4 +++-
 ftplugin/elinks.vim                     | 4 +++-
 ftplugin/elixir.vim                     | 4 +++-
 ftplugin/embeddedpuppet.vim             | 4 +++-
 ftplugin/ember-script.vim               | 4 +++-
 ftplugin/emblem.vim                     | 4 +++-
 ftplugin/eruby.vim                      | 4 +++-
 ftplugin/eterm.vim                      | 4 +++-
 ftplugin/falcon.vim                     | 4 +++-
 ftplugin/fennel.vim                     | 4 +++-
 ftplugin/fetchmail.vim                  | 4 +++-
 ftplugin/fish.vim                       | 4 +++-
 ftplugin/fortran.vim                    | 4 +++-
 ftplugin/framescript.vim                | 4 +++-
 ftplugin/fvwm.vim                       | 4 +++-
 ftplugin/gdb.vim                        | 4 +++-
 ftplugin/git.vim                        | 4 +++-
 ftplugin/gitcommit.vim                  | 4 +++-
 ftplugin/gitconfig.vim                  | 4 +++-
 ftplugin/gitignore.vim                  | 4 +++-
 ftplugin/gitrebase.vim                  | 4 +++-
 ftplugin/gitsendemail.vim               | 4 +++-
 ftplugin/gpg.vim                        | 4 +++-
 ftplugin/graphql.vim                    | 4 +++-
 ftplugin/groovy.vim                     | 4 +++-
 ftplugin/group.vim                      | 4 +++-
 ftplugin/grub.vim                       | 4 +++-
 ftplugin/haml.vim                       | 4 +++-
 ftplugin/hamster.vim                    | 4 +++-
 ftplugin/handlebars.vim                 | 4 +++-
 ftplugin/hcl.vim                        | 4 +++-
 ftplugin/help.vim                       | 4 +++-
 ftplugin/hgcommit.vim                   | 4 +++-
 ftplugin/hive.vim                       | 4 +++-
 ftplugin/hog.vim                        | 4 +++-
 ftplugin/hostconf.vim                   | 4 +++-
 ftplugin/hostsaccess.vim                | 4 +++-
 ftplugin/html.vim                       | 4 +++-
 ftplugin/htmldjango.vim                 | 4 +++-
 ftplugin/i3config.vim                   | 4 +++-
 ftplugin/idris.vim                      | 4 +++-
 ftplugin/idris2.vim                     | 4 +++-
 ftplugin/indent.vim                     | 4 +++-
 ftplugin/ion.vim                        | 4 +++-
 ftplugin/j.vim                          | 4 +++-
 ftplugin/java.vim                       | 4 +++-
 ftplugin/jproperties.vim                | 4 +++-
 ftplugin/jq.vim                         | 4 +++-
 ftplugin/json.vim                       | 4 +++-
 ftplugin/jsonnet.vim                    | 4 +++-
 ftplugin/jsp.vim                        | 4 +++-
 ftplugin/julia.vim                      | 4 +++-
 ftplugin/juliadoc.vim                   | 4 +++-
 ftplugin/kconfig.vim                    | 4 +++-
 ftplugin/kotlin.vim                     | 4 +++-
 ftplugin/kwt.vim                        | 4 +++-
 ftplugin/ld.vim                         | 4 +++-
 ftplugin/less.vim                       | 4 +++-
 ftplugin/lftp.vim                       | 4 +++-
 ftplugin/libao.vim                      | 4 +++-
 ftplugin/lilypond.vim                   | 4 +++-
 ftplugin/limits.vim                     | 4 +++-
 ftplugin/liquid.vim                     | 4 +++-
 ftplugin/lisp.vim                       | 4 +++-
 ftplugin/litcoffee.vim                  | 4 +++-
 ftplugin/llvm.vim                       | 4 +++-
 ftplugin/logcheck.vim                   | 4 +++-
 ftplugin/loginaccess.vim                | 4 +++-
 ftplugin/logindefs.vim                  | 4 +++-
 ftplugin/logtalk.vim                    | 4 +++-
 ftplugin/lprolog.vim                    | 4 +++-
 ftplugin/ls.vim                         | 4 +++-
 ftplugin/m4.vim                         | 4 +++-
 ftplugin/mail.vim                       | 4 +++-
 ftplugin/mailaliases.vim                | 4 +++-
 ftplugin/mailcap.vim                    | 4 +++-
 ftplugin/make.vim                       | 4 +++-
 ftplugin/mako.vim                       | 4 +++-
 ftplugin/manconf.vim                    | 4 +++-
 ftplugin/markdown.vim                   | 4 +++-
 ftplugin/meson.vim                      | 4 +++-
 ftplugin/mf.vim                         | 4 +++-
 ftplugin/mma.vim                        | 4 +++-
 ftplugin/modconf.vim                    | 4 +++-
 ftplugin/moon.vim                       | 4 +++-
 ftplugin/mp.vim                         | 4 +++-
 ftplugin/mplayerconf.vim                | 4 +++-
 ftplugin/mrxvtrc.vim                    | 4 +++-
 ftplugin/mustache.vim                   | 4 +++-
 ftplugin/muttrc.vim                     | 4 +++-
 ftplugin/nanorc.vim                     | 4 +++-
 ftplugin/neomuttrc.vim                  | 4 +++-
 ftplugin/netrc.vim                      | 4 +++-
 ftplugin/nginx.vim                      | 4 +++-
 ftplugin/nix.vim                        | 4 +++-
 ftplugin/nroff.vim                      | 4 +++-
 ftplugin/nsis.vim                       | 4 +++-
 ftplugin/oasis.vim                      | 4 +++-
 ftplugin/objc.vim                       | 4 +++-
 ftplugin/ocaml.vim                      | 4 +++-
 ftplugin/ocamlbuild_tags.vim            | 4 +++-
 ftplugin/occam.vim                      | 4 +++-
 ftplugin/omake.vim                      | 4 +++-
 ftplugin/opencl.vim                     | 4 +++-
 ftplugin/pamconf.vim                    | 4 +++-
 ftplugin/pascal.vim                     | 4 +++-
 ftplugin/passwd.vim                     | 4 +++-
 ftplugin/pdf.vim                        | 4 +++-
 ftplugin/perl.vim                       | 4 +++-
 ftplugin/pinfo.vim                      | 4 +++-
 ftplugin/plantuml.vim                   | 4 +++-
 ftplugin/pony.vim                       | 4 +++-
 ftplugin/postscr.vim                    | 4 +++-
 ftplugin/procmail.vim                   | 4 +++-
 ftplugin/prolog.vim                     | 4 +++-
 ftplugin/protocols.vim                  | 4 +++-
 ftplugin/ps1.vim                        | 4 +++-
 ftplugin/ps1xml.vim                     | 4 +++-
 ftplugin/pug.vim                        | 4 +++-
 ftplugin/puppet.vim                     | 4 +++-
 ftplugin/puppet_tagbar.vim              | 4 +++-
 ftplugin/purescript.vim                 | 4 +++-
 ftplugin/pyrex.vim                      | 4 +++-
 ftplugin/qml.vim                        | 4 +++-
 ftplugin/quake.vim                      | 4 +++-
 ftplugin/racket.vim                     | 4 +++-
 ftplugin/raku.vim                       | 4 +++-
 ftplugin/raml.vim                       | 4 +++-
 ftplugin/razor.vim                      | 4 +++-
 ftplugin/readline.vim                   | 4 +++-
 ftplugin/reva.vim                       | 4 +++-
 ftplugin/rmd.vim                        | 4 +++-
 ftplugin/rnc.vim                        | 4 +++-
 ftplugin/rnoweb.vim                     | 4 +++-
 ftplugin/rpl.vim                        | 4 +++-
 ftplugin/rrst.vim                       | 4 +++-
 ftplugin/rst.vim                        | 4 +++-
 ftplugin/ruby.vim                       | 4 +++-
 ftplugin/rust.vim                       | 4 +++-
 ftplugin/rust/tagbar.vim                | 4 +++-
 ftplugin/sass.vim                       | 4 +++-
 ftplugin/sbt.vim                        | 4 +++-
 ftplugin/scala.vim                      | 4 +++-
 ftplugin/scala.xpt.vim                  | 4 +++-
 ftplugin/scala/tagbar.vim               | 4 +++-
 ftplugin/scheme.vim                     | 4 +++-
 ftplugin/screen.vim                     | 4 +++-
 ftplugin/scss.vim                       | 4 +++-
 ftplugin/sensors.vim                    | 4 +++-
 ftplugin/services.vim                   | 4 +++-
 ftplugin/setserial.vim                  | 4 +++-
 ftplugin/sexplib.vim                    | 4 +++-
 ftplugin/sieve.vim                      | 4 +++-
 ftplugin/slim.vim                       | 4 +++-
 ftplugin/slpconf.vim                    | 4 +++-
 ftplugin/slpreg.vim                     | 4 +++-
 ftplugin/slpspi.vim                     | 4 +++-
 ftplugin/smt2.vim                       | 4 +++-
 ftplugin/solidity.vim                   | 4 +++-
 ftplugin/spec.vim                       | 4 +++-
 ftplugin/sql.vim                        | 4 +++-
 ftplugin/sshconfig.vim                  | 4 +++-
 ftplugin/stylus.vim                     | 4 +++-
 ftplugin/sudoers.vim                    | 4 +++-
 ftplugin/svelte.vim                     | 4 +++-
 ftplugin/swift.vim                      | 4 +++-
 ftplugin/swiftgyb.vim                   | 4 +++-
 ftplugin/sysctl.vim                     | 4 +++-
 ftplugin/systemd.vim                    | 4 +++-
 ftplugin/systemverilog.vim              | 4 +++-
 ftplugin/tablegen.vim                   | 4 +++-
 ftplugin/tcl.vim                        | 4 +++-
 ftplugin/terminfo.vim                   | 4 +++-
 ftplugin/terraform.vim                  | 4 +++-
 ftplugin/tex.vim                        | 4 +++-
 ftplugin/text.vim                       | 4 +++-
 ftplugin/textile.vim                    | 4 +++-
 ftplugin/tmux.vim                       | 4 +++-
 ftplugin/toml.vim                       | 4 +++-
 ftplugin/treetop.vim                    | 4 +++-
 ftplugin/tt2html.vim                    | 4 +++-
 ftplugin/twig.vim                       | 4 +++-
 ftplugin/typescript.vim                 | 4 +++-
 ftplugin/typescriptreact.vim            | 4 +++-
 ftplugin/udevconf.vim                   | 4 +++-
 ftplugin/udevperm.vim                   | 4 +++-
 ftplugin/updatedb.vim                   | 4 +++-
 ftplugin/vala.vim                       | 4 +++-
 ftplugin/vb.vim                         | 4 +++-
 ftplugin/verilog.vim                    | 4 +++-
 ftplugin/vhdl.vim                       | 4 +++-
 ftplugin/vlang.vim                      | 4 +++-
 ftplugin/vroom.vim                      | 4 +++-
 ftplugin/vue.vim                        | 4 +++-
 ftplugin/wast.vim                       | 4 +++-
 ftplugin/xdefaults.vim                  | 4 +++-
 ftplugin/xf86conf.vim                   | 4 +++-
 ftplugin/xhtml.vim                      | 4 +++-
 ftplugin/xinetd.vim                     | 4 +++-
 ftplugin/xmodmap.vim                    | 4 +++-
 ftplugin/xs.vim                         | 4 +++-
 ftplugin/xsd.vim                        | 4 +++-
 ftplugin/xslt.vim                       | 4 +++-
 ftplugin/yaml.vim                       | 4 +++-
 ftplugin/zig.vim                        | 4 +++-
 ftplugin/zimbu.vim                      | 4 +++-
 indent/Jenkinsfile.vim                  | 4 +++-
 indent/aap.vim                          | 4 +++-
 indent/ada.vim                          | 4 +++-
 indent/ansible.vim                      | 4 +++-
 indent/ant.vim                          | 4 +++-
 indent/applescript.vim                  | 4 +++-
 indent/arduino.vim                      | 4 +++-
 indent/autohotkey.vim                   | 4 +++-
 indent/automake.vim                     | 4 +++-
 indent/awk.vim                          | 4 +++-
 indent/bib.vim                          | 4 +++-
 indent/blade.vim                        | 4 +++-
 indent/bst.vim                          | 4 +++-
 indent/bzl.vim                          | 4 +++-
 indent/cabal.vim                        | 4 +++-
 indent/caddyfile.vim                    | 4 +++-
 indent/cdl.vim                          | 4 +++-
 indent/ch.vim                           | 4 +++-
 indent/chaiscript.vim                   | 4 +++-
 indent/clojure.vim                      | 4 +++-
 indent/cmake.vim                        | 4 +++-
 indent/cobol.vim                        | 4 +++-
 indent/coffee.vim                       | 4 +++-
 indent/config.vim                       | 4 +++-
 indent/crystal.vim                      | 4 +++-
 indent/cs.vim                           | 4 +++-
 indent/css.vim                          | 4 +++-
 indent/cucumber.vim                     | 4 +++-
 indent/cuda.vim                         | 4 +++-
 indent/cython.vim                       | 4 +++-
 indent/d.vim                            | 4 +++-
 indent/dart.vim                         | 4 +++-
 indent/dictconf.vim                     | 4 +++-
 indent/dictdconf.vim                    | 4 +++-
 indent/dosbatch.vim                     | 4 +++-
 indent/dtd.vim                          | 4 +++-
 indent/dune.vim                         | 4 +++-
 indent/dylan.vim                        | 4 +++-
 indent/ecrystal.vim                     | 4 +++-
 indent/eelixir.vim                      | 4 +++-
 indent/elixir.vim                       | 4 +++-
 indent/elm.vim                          | 4 +++-
 indent/ember-script.vim                 | 4 +++-
 indent/emblem.vim                       | 4 +++-
 indent/erlang.vim                       | 4 +++-
 indent/eruby.vim                        | 4 +++-
 indent/eterm.vim                        | 4 +++-
 indent/falcon.vim                       | 4 +++-
 indent/fennel.vim                       | 4 +++-
 indent/fish.vim                         | 4 +++-
 indent/fortran.vim                      | 4 +++-
 indent/framescript.vim                  | 4 +++-
 indent/fsharp.vim                       | 4 +++-
 indent/gdscript3.vim                    | 4 +++-
 indent/gitconfig.vim                    | 4 +++-
 indent/gitolite.vim                     | 4 +++-
 indent/glsl.vim                         | 4 +++-
 indent/go.vim                           | 4 +++-
 indent/gohtmltmpl.vim                   | 4 +++-
 indent/graphql.vim                      | 4 +++-
 indent/haml.vim                         | 4 +++-
 indent/hamster.vim                      | 4 +++-
 indent/handlebars.vim                   | 4 +++-
 indent/haskell.vim                      | 4 +++-
 indent/hcl.vim                          | 4 +++-
 indent/hog.vim                          | 4 +++-
 indent/html.vim                         | 4 +++-
 indent/htmldjango.vim                   | 4 +++-
 indent/idris.vim                        | 4 +++-
 indent/idris2.vim                       | 4 +++-
 indent/j.vim                            | 4 +++-
 indent/java.vim                         | 4 +++-
 indent/javascript.vim                   | 4 +++-
 indent/json.vim                         | 4 +++-
 indent/jsp.vim                          | 4 +++-
 indent/jst.vim                          | 4 +++-
 indent/julia.vim                        | 4 +++-
 indent/kotlin.vim                       | 4 +++-
 indent/ld.vim                           | 4 +++-
 indent/ledger.vim                       | 4 +++-
 indent/less.vim                         | 4 +++-
 indent/lifelines.vim                    | 4 +++-
 indent/lilypond.vim                     | 4 +++-
 indent/liquid.vim                       | 4 +++-
 indent/lisp.vim                         | 4 +++-
 indent/litcoffee.vim                    | 4 +++-
 indent/llvm.vim                         | 4 +++-
 indent/logtalk.vim                      | 4 +++-
 indent/ls.vim                           | 4 +++-
 indent/lua.vim                          | 4 +++-
 indent/mail.vim                         | 4 +++-
 indent/make.vim                         | 4 +++-
 indent/mako.vim                         | 4 +++-
 indent/markdown.vim                     | 4 +++-
 indent/meson.vim                        | 4 +++-
 indent/mf.vim                           | 4 +++-
 indent/moon.vim                         | 4 +++-
 indent/mp.vim                           | 4 +++-
 indent/mustache.vim                     | 4 +++-
 indent/nginx.vim                        | 4 +++-
 indent/nim.vim                          | 4 +++-
 indent/nix.vim                          | 4 +++-
 indent/nsis.vim                         | 4 +++-
 indent/ocaml.vim                        | 4 +++-
 indent/occam.vim                        | 4 +++-
 indent/octave.vim                       | 4 +++-
 indent/odin.vim                         | 4 +++-
 indent/omake.vim                        | 4 +++-
 indent/opencl.vim                       | 4 +++-
 indent/pascal.vim                       | 4 +++-
 indent/perl.vim                         | 4 +++-
 indent/pgsql.vim                        | 4 +++-
 indent/plantuml.vim                     | 4 +++-
 indent/pony.vim                         | 4 +++-
 indent/postscr.vim                      | 4 +++-
 indent/pov.vim                          | 4 +++-
 indent/prolog.vim                       | 4 +++-
 indent/proto.vim                        | 4 +++-
 indent/ps1.vim                          | 4 +++-
 indent/pug.vim                          | 4 +++-
 indent/puppet.vim                       | 4 +++-
 indent/purescript.vim                   | 4 +++-
 indent/pyrex.vim                        | 4 +++-
 indent/python.vim                       | 4 +++-
 indent/qml.vim                          | 4 +++-
 indent/racket.vim                       | 4 +++-
 indent/raku.vim                         | 4 +++-
 indent/razor.vim                        | 4 +++-
 indent/readline.vim                     | 4 +++-
 indent/reason.vim                       | 4 +++-
 indent/rmd.vim                          | 4 +++-
 indent/rnoweb.vim                       | 4 +++-
 indent/rpl.vim                          | 4 +++-
 indent/rrst.vim                         | 4 +++-
 indent/rst.vim                          | 4 +++-
 indent/ruby.vim                         | 4 +++-
 indent/rust.vim                         | 4 +++-
 indent/sas.vim                          | 4 +++-
 indent/sass.vim                         | 4 +++-
 indent/scala.vim                        | 4 +++-
 indent/scheme.vim                       | 4 +++-
 indent/scss.vim                         | 4 +++-
 indent/sdl.vim                          | 4 +++-
 indent/slim.vim                         | 4 +++-
 indent/slime.vim                        | 4 +++-
 indent/sml.vim                          | 4 +++-
 indent/solidity.vim                     | 4 +++-
 indent/sql.vim                          | 4 +++-
 indent/sshconfig.vim                    | 4 +++-
 indent/stylus.vim                       | 4 +++-
 indent/svelte.vim                       | 4 +++-
 indent/svg.vim                          | 4 +++-
 indent/swift.vim                        | 4 +++-
 indent/systemverilog.vim                | 4 +++-
 indent/tcl.vim                          | 4 +++-
 indent/teraterm.vim                     | 4 +++-
 indent/terraform.vim                    | 4 +++-
 indent/tex.vim                          | 4 +++-
 indent/tf.vim                           | 4 +++-
 indent/tilde.vim                        | 4 +++-
 indent/treetop.vim                      | 4 +++-
 indent/twig.vim                         | 4 +++-
 indent/typescript.vim                   | 4 +++-
 indent/typescriptreact.vim              | 4 +++-
 indent/vala.vim                         | 4 +++-
 indent/vb.vim                           | 4 +++-
 indent/velocity.vim                     | 4 +++-
 indent/verilog.vim                      | 4 +++-
 indent/vhdl.vim                         | 4 +++-
 indent/vlang.vim                        | 4 +++-
 indent/vroom.vim                        | 4 +++-
 indent/vue.vim                          | 4 +++-
 indent/wast.vim                         | 4 +++-
 indent/xf86conf.vim                     | 4 +++-
 indent/xhtml.vim                        | 4 +++-
 indent/xinetd.vim                       | 4 +++-
 indent/xsd.vim                          | 4 +++-
 indent/xslt.vim                         | 4 +++-
 indent/yacc.vim                         | 4 +++-
 indent/yaml.vim                         | 4 +++-
 indent/zig.vim                          | 4 +++-
 indent/zimbu.vim                        | 4 +++-
 scripts/build                           | 4 +++-
 syntax/8th.vim                          | 4 +++-
 syntax/Jenkinsfile.vim                  | 4 +++-
 syntax/a2ps.vim                         | 4 +++-
 syntax/a65.vim                          | 4 +++-
 syntax/aap.vim                          | 4 +++-
 syntax/abap.vim                         | 4 +++-
 syntax/abaqus.vim                       | 4 +++-
 syntax/abc.vim                          | 4 +++-
 syntax/abel.vim                         | 4 +++-
 syntax/acedb.vim                        | 4 +++-
 syntax/ada.vim                          | 4 +++-
 syntax/ahdl.vim                         | 4 +++-
 syntax/aidl.vim                         | 4 +++-
 syntax/alsaconf.vim                     | 4 +++-
 syntax/aml.vim                          | 4 +++-
 syntax/ampl.vim                         | 4 +++-
 syntax/ansible.vim                      | 4 +++-
 syntax/ansible_hosts.vim                | 4 +++-
 syntax/ant.vim                          | 4 +++-
 syntax/apache.vim                       | 4 +++-
 syntax/apachestyle.vim                  | 4 +++-
 syntax/apiblueprint.vim                 | 4 +++-
 syntax/applescript.vim                  | 4 +++-
 syntax/aptconf.vim                      | 4 +++-
 syntax/arch.vim                         | 4 +++-
 syntax/arduino.vim                      | 4 +++-
 syntax/art.vim                          | 4 +++-
 syntax/asciidoc.vim                     | 4 +++-
 syntax/asl.vim                          | 4 +++-
 syntax/asn.vim                          | 4 +++-
 syntax/aspperl.vim                      | 4 +++-
 syntax/aspvbs.vim                       | 4 +++-
 syntax/asterisk.vim                     | 4 +++-
 syntax/asteriskvm.vim                   | 4 +++-
 syntax/atlas.vim                        | 4 +++-
 syntax/autodoc.vim                      | 4 +++-
 syntax/autoit.vim                       | 4 +++-
 syntax/automake.vim                     | 4 +++-
 syntax/ave.vim                          | 4 +++-
 syntax/awk.vim                          | 4 +++-
 syntax/b.vim                            | 4 +++-
 syntax/basic.vim                        | 4 +++-
 syntax/basic/class.vim                  | 4 +++-
 syntax/basic/cluster.vim                | 4 +++-
 syntax/basic/decorator.vim              | 4 +++-
 syntax/basic/doc.vim                    | 4 +++-
 syntax/basic/function.vim               | 4 +++-
 syntax/basic/identifiers.vim            | 4 +++-
 syntax/basic/keyword.vim                | 4 +++-
 syntax/basic/literal.vim                | 4 +++-
 syntax/basic/members.vim                | 4 +++-
 syntax/basic/object.vim                 | 4 +++-
 syntax/basic/patch.vim                  | 4 +++-
 syntax/basic/reserved.vim               | 4 +++-
 syntax/basic/symbols.vim                | 4 +++-
 syntax/basic/type.vim                   | 4 +++-
 syntax/bc.vim                           | 4 +++-
 syntax/bdf.vim                          | 4 +++-
 syntax/bib.vim                          | 4 +++-
 syntax/bindzone.vim                     | 4 +++-
 syntax/blade.vim                        | 4 +++-
 syntax/blank.vim                        | 4 +++-
 syntax/brewfile.vim                     | 4 +++-
 syntax/bsdl.vim                         | 4 +++-
 syntax/bst.vim                          | 4 +++-
 syntax/bzl.vim                          | 4 +++-
 syntax/bzr.vim                          | 4 +++-
 syntax/c.vim                            | 4 +++-
 syntax/cabal-1.vim                      | 4 +++-
 syntax/cabal-2.vim                      | 4 +++-
 syntax/caddyfile.vim                    | 4 +++-
 syntax/calendar.vim                     | 4 +++-
 syntax/carp.vim                         | 4 +++-
 syntax/catalog.vim                      | 4 +++-
 syntax/cdl.vim                          | 4 +++-
 syntax/cdrdaoconf.vim                   | 4 +++-
 syntax/cdrtoc.vim                       | 4 +++-
 syntax/cf.vim                           | 4 +++-
 syntax/cfg.vim                          | 4 +++-
 syntax/ch.vim                           | 4 +++-
 syntax/chaiscript.vim                   | 4 +++-
 syntax/chaskell.vim                     | 4 +++-
 syntax/chill.vim                        | 4 +++-
 syntax/chordpro.vim                     | 4 +++-
 syntax/cl.vim                           | 4 +++-
 syntax/clean.vim                        | 4 +++-
 syntax/clojure.vim                      | 4 +++-
 syntax/cmake.vim                        | 4 +++-
 syntax/cmod.vim                         | 4 +++-
 syntax/cmusrc.vim                       | 4 +++-
 syntax/cobol.vim                        | 4 +++-
 syntax/coco.vim                         | 4 +++-
 syntax/coffee.vim                       | 4 +++-
 syntax/common.vim                       | 4 +++-
 syntax/conaryrecipe.vim                 | 4 +++-
 syntax/conf.vim                         | 4 +++-
 syntax/config.vim                       | 4 +++-
 syntax/cpp.vim                          | 4 +++-
 syntax/cql.vim                          | 4 +++-
 syntax/crm.vim                          | 4 +++-
 syntax/crontab.vim                      | 4 +++-
 syntax/cryptol.vim                      | 4 +++-
 syntax/crystal.vim                      | 4 +++-
 syntax/cs.vim                           | 4 +++-
 syntax/csc.vim                          | 4 +++-
 syntax/csdl.vim                         | 4 +++-
 syntax/csp.vim                          | 4 +++-
 syntax/css.vim                          | 4 +++-
 syntax/csv.vim                          | 4 +++-
 syntax/cterm.vim                        | 4 +++-
 syntax/cucumber.vim                     | 4 +++-
 syntax/cuda.vim                         | 4 +++-
 syntax/cuesheet.vim                     | 4 +++-
 syntax/cupl.vim                         | 4 +++-
 syntax/cuplsim.vim                      | 4 +++-
 syntax/cvs.vim                          | 4 +++-
 syntax/cvsrc.vim                        | 4 +++-
 syntax/cynpp.vim                        | 4 +++-
 syntax/d.vim                            | 4 +++-
 syntax/dart.vim                         | 4 +++-
 syntax/datascript.vim                   | 4 +++-
 syntax/dcd.vim                          | 4 +++-
 syntax/dcov.vim                         | 4 +++-
 syntax/dd.vim                           | 4 +++-
 syntax/ddoc.vim                         | 4 +++-
 syntax/debchangelog.vim                 | 4 +++-
 syntax/debcontrol.vim                   | 4 +++-
 syntax/debcopyright.vim                 | 4 +++-
 syntax/debsources.vim                   | 4 +++-
 syntax/def.vim                          | 4 +++-
 syntax/denyhosts.vim                    | 4 +++-
 syntax/desc.vim                         | 4 +++-
 syntax/desktop.vim                      | 4 +++-
 syntax/dhall.vim                        | 4 +++-
 syntax/dictconf.vim                     | 4 +++-
 syntax/dictdconf.vim                    | 4 +++-
 syntax/diff.vim                         | 4 +++-
 syntax/dircolors.vim                    | 4 +++-
 syntax/django.vim                       | 4 +++-
 syntax/dnsmasq.vim                      | 4 +++-
 syntax/docker-compose.vim               | 4 +++-
 syntax/dockerfile.vim                   | 4 +++-
 syntax/dosbatch.vim                     | 4 +++-
 syntax/dosini.vim                       | 4 +++-
 syntax/dot.vim                          | 4 +++-
 syntax/dracula.vim                      | 4 +++-
 syntax/dsdl.vim                         | 4 +++-
 syntax/dsl.vim                          | 4 +++-
 syntax/dtd.vim                          | 4 +++-
 syntax/dts.vim                          | 4 +++-
 syntax/dune.vim                         | 4 +++-
 syntax/dylan.vim                        | 4 +++-
 syntax/dylanintr.vim                    | 4 +++-
 syntax/dylanlid.vim                     | 4 +++-
 syntax/ecd.vim                          | 4 +++-
 syntax/ecrystal.vim                     | 4 +++-
 syntax/edif.vim                         | 4 +++-
 syntax/eelixir.vim                      | 4 +++-
 syntax/elf.vim                          | 4 +++-
 syntax/elinks.vim                       | 4 +++-
 syntax/elixir.vim                       | 4 +++-
 syntax/elm.vim                          | 4 +++-
 syntax/elmfilt.vim                      | 4 +++-
 syntax/embeddedpuppet.vim               | 4 +++-
 syntax/ember-script.vim                 | 4 +++-
 syntax/emblem.vim                       | 4 +++-
 syntax/erlang.vim                       | 4 +++-
 syntax/eruby.vim                        | 4 +++-
 syntax/esmtprc.vim                      | 4 +++-
 syntax/esqlc.vim                        | 4 +++-
 syntax/esterel.vim                      | 4 +++-
 syntax/eterm.vim                        | 4 +++-
 syntax/exim.vim                         | 4 +++-
 syntax/expect.vim                       | 4 +++-
 syntax/exports.vim                      | 4 +++-
 syntax/falcon.vim                       | 4 +++-
 syntax/fan.vim                          | 4 +++-
 syntax/fbs.vim                          | 4 +++-
 syntax/fennel.vim                       | 4 +++-
 syntax/ferm.vim                         | 4 +++-
 syntax/fetchmail.vim                    | 4 +++-
 syntax/fgl.vim                          | 4 +++-
 syntax/fish.vim                         | 4 +++-
 syntax/flow.vim                         | 4 +++-
 syntax/focexec.vim                      | 4 +++-
 syntax/forth.vim                        | 4 +++-
 syntax/fortran.vim                      | 4 +++-
 syntax/framescript.vim                  | 4 +++-
 syntax/freebasic.vim                    | 4 +++-
 syntax/fsharp.vim                       | 4 +++-
 syntax/fstab.vim                        | 4 +++-
 syntax/fvwm.vim                         | 4 +++-
 syntax/gdb.vim                          | 4 +++-
 syntax/gdmo.vim                         | 4 +++-
 syntax/gdscript3.vim                    | 4 +++-
 syntax/gedcom.vim                       | 4 +++-
 syntax/git.vim                          | 4 +++-
 syntax/gitcommit.vim                    | 4 +++-
 syntax/gitconfig.vim                    | 4 +++-
 syntax/gitignore.vim                    | 4 +++-
 syntax/gitolite.vim                     | 4 +++-
 syntax/gitrebase.vim                    | 4 +++-
 syntax/gitsendemail.vim                 | 4 +++-
 syntax/gkrellmrc.vim                    | 4 +++-
 syntax/glsl.vim                         | 4 +++-
 syntax/gmpl.vim                         | 4 +++-
 syntax/gnash.vim                        | 4 +++-
 syntax/gnuplot.vim                      | 4 +++-
 syntax/go.vim                           | 4 +++-
 syntax/godebugoutput.vim                | 4 +++-
 syntax/godebugstacktrace.vim            | 4 +++-
 syntax/godebugvariables.vim             | 4 +++-
 syntax/godefstack.vim                   | 4 +++-
 syntax/gohtmltmpl.vim                   | 4 +++-
 syntax/gomod.vim                        | 4 +++-
 syntax/gotexttmpl.vim                   | 4 +++-
 syntax/gp.vim                           | 4 +++-
 syntax/gpg.vim                          | 4 +++-
 syntax/grads.vim                        | 4 +++-
 syntax/graphql.vim                      | 4 +++-
 syntax/gretl.vim                        | 4 +++-
 syntax/groovy.vim                       | 4 +++-
 syntax/group.vim                        | 4 +++-
 syntax/grub.vim                         | 4 +++-
 syntax/gsl.vim                          | 4 +++-
 syntax/gsp.vim                          | 4 +++-
 syntax/gtkrc.vim                        | 4 +++-
 syntax/haml.vim                         | 4 +++-
 syntax/hamster.vim                      | 4 +++-
 syntax/handlebars.vim                   | 4 +++-
 syntax/haproxy.vim                      | 4 +++-
 syntax/haskell.vim                      | 4 +++-
 syntax/haste.vim                        | 4 +++-
 syntax/hastepreproc.vim                 | 4 +++-
 syntax/haxe.vim                         | 4 +++-
 syntax/hb.vim                           | 4 +++-
 syntax/hcl.vim                          | 4 +++-
 syntax/helm.vim                         | 4 +++-
 syntax/help.vim                         | 4 +++-
 syntax/hercules.vim                     | 4 +++-
 syntax/hex.vim                          | 4 +++-
 syntax/hgcommit.vim                     | 4 +++-
 syntax/hive.vim                         | 4 +++-
 syntax/hog.vim                          | 4 +++-
 syntax/hollywood.vim                    | 4 +++-
 syntax/hostconf.vim                     | 4 +++-
 syntax/hostsaccess.vim                  | 4 +++-
 syntax/html.vim                         | 4 +++-
 syntax/htmldjango.vim                   | 4 +++-
 syntax/htmlm4.vim                       | 4 +++-
 syntax/i3config.vim                     | 4 +++-
 syntax/ibasic.vim                       | 4 +++-
 syntax/icalendar.vim                    | 4 +++-
 syntax/icemenu.vim                      | 4 +++-
 syntax/icon.vim                         | 4 +++-
 syntax/idris.vim                        | 4 +++-
 syntax/idris2.vim                       | 4 +++-
 syntax/indent.vim                       | 4 +++-
 syntax/inform.vim                       | 4 +++-
 syntax/initng.vim                       | 4 +++-
 syntax/inittab.vim                      | 4 +++-
 syntax/ion.vim                          | 4 +++-
 syntax/ipfilter.vim                     | 4 +++-
 syntax/iss.vim                          | 4 +++-
 syntax/ist.vim                          | 4 +++-
 syntax/j.vim                            | 4 +++-
 syntax/jal.vim                          | 4 +++-
 syntax/jam.vim                          | 4 +++-
 syntax/java.vim                         | 4 +++-
 syntax/javacc.vim                       | 4 +++-
 syntax/javascript.vim                   | 4 +++-
 syntax/jess.vim                         | 4 +++-
 syntax/jgraph.vim                       | 4 +++-
 syntax/jinja2.vim                       | 4 +++-
 syntax/jovial.vim                       | 4 +++-
 syntax/jproperties.vim                  | 4 +++-
 syntax/jq.vim                           | 4 +++-
 syntax/json.vim                         | 4 +++-
 syntax/json5.vim                        | 4 +++-
 syntax/jsonnet.vim                      | 4 +++-
 syntax/jsp.vim                          | 4 +++-
 syntax/jst.vim                          | 4 +++-
 syntax/julia.vim                        | 4 +++-
 syntax/juliadoc.vim                     | 4 +++-
 syntax/kconfig.vim                      | 4 +++-
 syntax/kivy.vim                         | 4 +++-
 syntax/kix.vim                          | 4 +++-
 syntax/kotlin.vim                       | 4 +++-
 syntax/kscript.vim                      | 4 +++-
 syntax/kwt.vim                          | 4 +++-
 syntax/lace.vim                         | 4 +++-
 syntax/latte.vim                        | 4 +++-
 syntax/ld.vim                           | 4 +++-
 syntax/ldif.vim                         | 4 +++-
 syntax/ledger.vim                       | 4 +++-
 syntax/less.vim                         | 4 +++-
 syntax/lex.vim                          | 4 +++-
 syntax/lftp.vim                         | 4 +++-
 syntax/lhaskell.vim                     | 4 +++-
 syntax/libao.vim                        | 4 +++-
 syntax/lidris.vim                       | 4 +++-
 syntax/lidris2.vim                      | 4 +++-
 syntax/lifelines.vim                    | 4 +++-
 syntax/lilo.vim                         | 4 +++-
 syntax/lilypond-words.vim               | 4 +++-
 syntax/lilypond.vim                     | 4 +++-
 syntax/limits.vim                       | 4 +++-
 syntax/liquid.vim                       | 4 +++-
 syntax/lisp.vim                         | 4 +++-
 syntax/litcoffee.vim                    | 4 +++-
 syntax/lite.vim                         | 4 +++-
 syntax/litestep.vim                     | 4 +++-
 syntax/llvm.vim                         | 4 +++-
 syntax/log.vim                          | 4 +++-
 syntax/loginaccess.vim                  | 4 +++-
 syntax/logindefs.vim                    | 4 +++-
 syntax/logtalk.vim                      | 4 +++-
 syntax/lotos.vim                        | 4 +++-
 syntax/lout.vim                         | 4 +++-
 syntax/lpc.vim                          | 4 +++-
 syntax/lprolog.vim                      | 4 +++-
 syntax/ls.vim                           | 4 +++-
 syntax/lsl.vim                          | 4 +++-
 syntax/lss.vim                          | 4 +++-
 syntax/lua.vim                          | 4 +++-
 syntax/lynx.vim                         | 4 +++-
 syntax/m4.vim                           | 4 +++-
 syntax/mail.vim                         | 4 +++-
 syntax/mailaliases.vim                  | 4 +++-
 syntax/mailcap.vim                      | 4 +++-
 syntax/make.vim                         | 4 +++-
 syntax/mako.vim                         | 4 +++-
 syntax/mallard.vim                      | 4 +++-
 syntax/manconf.vim                      | 4 +++-
 syntax/maple.vim                        | 4 +++-
 syntax/markdown.vim                     | 4 +++-
 syntax/mason.vim                        | 4 +++-
 syntax/master.vim                       | 4 +++-
 syntax/mel.vim                          | 4 +++-
 syntax/merlin.vim                       | 4 +++-
 syntax/meson.vim                        | 4 +++-
 syntax/messages.vim                     | 4 +++-
 syntax/mf.vim                           | 4 +++-
 syntax/mgl.vim                          | 4 +++-
 syntax/mgp.vim                          | 4 +++-
 syntax/mib.vim                          | 4 +++-
 syntax/mix.vim                          | 4 +++-
 syntax/mma.vim                          | 4 +++-
 syntax/mmp.vim                          | 4 +++-
 syntax/modconf.vim                      | 4 +++-
 syntax/modula2.vim                      | 4 +++-
 syntax/modula3.vim                      | 4 +++-
 syntax/monk.vim                         | 4 +++-
 syntax/moo.vim                          | 4 +++-
 syntax/moon.vim                         | 4 +++-
 syntax/mp.vim                           | 4 +++-
 syntax/mplayerconf.vim                  | 4 +++-
 syntax/mrxvtrc.vim                      | 4 +++-
 syntax/msidl.vim                        | 4 +++-
 syntax/msql.vim                         | 4 +++-
 syntax/mupad.vim                        | 4 +++-
 syntax/murphi.vim                       | 4 +++-
 syntax/mush.vim                         | 4 +++-
 syntax/mustache.vim                     | 4 +++-
 syntax/muttrc.vim                       | 4 +++-
 syntax/mysql.vim                        | 4 +++-
 syntax/n1ql.vim                         | 4 +++-
 syntax/named.vim                        | 4 +++-
 syntax/nanorc.vim                       | 4 +++-
 syntax/natural.vim                      | 4 +++-
 syntax/ncf.vim                          | 4 +++-
 syntax/neomuttrc.vim                    | 4 +++-
 syntax/netrc.vim                        | 4 +++-
 syntax/nginx.vim                        | 4 +++-
 syntax/nim.vim                          | 4 +++-
 syntax/ninja.vim                        | 4 +++-
 syntax/nix.vim                          | 4 +++-
 syntax/nqc.vim                          | 4 +++-
 syntax/nroff.vim                        | 4 +++-
 syntax/nsis.vim                         | 4 +++-
 syntax/oasis.vim                        | 4 +++-
 syntax/obj.vim                          | 4 +++-
 syntax/ocaml.vim                        | 4 +++-
 syntax/ocamlbuild_tags.vim              | 4 +++-
 syntax/occam.vim                        | 4 +++-
 syntax/ocpbuild.vim                     | 4 +++-
 syntax/ocpbuildroot.vim                 | 4 +++-
 syntax/octave.vim                       | 4 +++-
 syntax/odin.vim                         | 4 +++-
 syntax/omake.vim                        | 4 +++-
 syntax/omnimark.vim                     | 4 +++-
 syntax/opam.vim                         | 4 +++-
 syntax/opencl.vim                       | 4 +++-
 syntax/openroad.vim                     | 4 +++-
 syntax/opl.vim                          | 4 +++-
 syntax/ora.vim                          | 4 +++-
 syntax/pamconf.vim                      | 4 +++-
 syntax/pamenv.vim                       | 4 +++-
 syntax/papp.vim                         | 4 +++-
 syntax/pascal.vim                       | 4 +++-
 syntax/passwd.vim                       | 4 +++-
 syntax/pccts.vim                        | 4 +++-
 syntax/pdf.vim                          | 4 +++-
 syntax/perl.vim                         | 4 +++-
 syntax/pf.vim                           | 4 +++-
 syntax/pfmain.vim                       | 4 +++-
 syntax/pgsql.vim                        | 4 +++-
 syntax/php.vim                          | 4 +++-
 syntax/pike.vim                         | 4 +++-
 syntax/pilrc.vim                        | 4 +++-
 syntax/pine.vim                         | 4 +++-
 syntax/pinfo.vim                        | 4 +++-
 syntax/plantuml.vim                     | 4 +++-
 syntax/pli.vim                          | 4 +++-
 syntax/plm.vim                          | 4 +++-
 syntax/plp.vim                          | 4 +++-
 syntax/plsql.vim                        | 4 +++-
 syntax/po.vim                           | 4 +++-
 syntax/pod.vim                          | 4 +++-
 syntax/pony.vim                         | 4 +++-
 syntax/postscr.vim                      | 4 +++-
 syntax/pov.vim                          | 4 +++-
 syntax/povini.vim                       | 4 +++-
 syntax/ppd.vim                          | 4 +++-
 syntax/ppwiz.vim                        | 4 +++-
 syntax/privoxy.vim                      | 4 +++-
 syntax/procmail.vim                     | 4 +++-
 syntax/prolog.vim                       | 4 +++-
 syntax/promela.vim                      | 4 +++-
 syntax/proto.vim                        | 4 +++-
 syntax/protocols.vim                    | 4 +++-
 syntax/ps1.vim                          | 4 +++-
 syntax/ps1xml.vim                       | 4 +++-
 syntax/psf.vim                          | 4 +++-
 syntax/pug.vim                          | 4 +++-
 syntax/puppet.vim                       | 4 +++-
 syntax/purescript.vim                   | 4 +++-
 syntax/pyrex.vim                        | 4 +++-
 syntax/python.vim                       | 4 +++-
 syntax/qmake.vim                        | 4 +++-
 syntax/qml.vim                          | 4 +++-
 syntax/quake.vim                        | 4 +++-
 syntax/racket.vim                       | 4 +++-
 syntax/radiance.vim                     | 4 +++-
 syntax/ragel.vim                        | 4 +++-
 syntax/raku.vim                         | 4 +++-
 syntax/raml.vim                         | 4 +++-
 syntax/ratpoison.vim                    | 4 +++-
 syntax/razor.vim                        | 4 +++-
 syntax/rc.vim                           | 4 +++-
 syntax/rcs.vim                          | 4 +++-
 syntax/readline.vim                     | 4 +++-
 syntax/reason.vim                       | 4 +++-
 syntax/rego.vim                         | 4 +++-
 syntax/remind.vim                       | 4 +++-
 syntax/requirements.vim                 | 4 +++-
 syntax/resolv.vim                       | 4 +++-
 syntax/reva.vim                         | 4 +++-
 syntax/rexx.vim                         | 4 +++-
 syntax/rhelp.vim                        | 4 +++-
 syntax/rib.vim                          | 4 +++-
 syntax/rmd.vim                          | 4 +++-
 syntax/rnc.vim                          | 4 +++-
 syntax/rng.vim                          | 4 +++-
 syntax/rnoweb-1.vim                     | 4 +++-
 syntax/rnoweb-2.vim                     | 4 +++-
 syntax/robots.vim                       | 4 +++-
 syntax/rpcgen.vim                       | 4 +++-
 syntax/rpl.vim                          | 4 +++-
 syntax/rrst.vim                         | 4 +++-
 syntax/rst.vim                          | 4 +++-
 syntax/rtf.vim                          | 4 +++-
 syntax/ruby.vim                         | 4 +++-
 syntax/rust.vim                         | 4 +++-
 syntax/samba.vim                        | 4 +++-
 syntax/sas.vim                          | 4 +++-
 syntax/sass.vim                         | 4 +++-
 syntax/sather.vim                       | 4 +++-
 syntax/sbt.vim                          | 4 +++-
 syntax/scala.vim                        | 4 +++-
 syntax/scheme.vim                       | 4 +++-
 syntax/scilab.vim                       | 4 +++-
 syntax/screen.vim                       | 4 +++-
 syntax/scss.vim                         | 4 +++-
 syntax/sd.vim                           | 4 +++-
 syntax/sdc.vim                          | 4 +++-
 syntax/sdl.vim                          | 4 +++-
 syntax/sed.vim                          | 4 +++-
 syntax/sensors.vim                      | 4 +++-
 syntax/services.vim                     | 4 +++-
 syntax/setserial.vim                    | 4 +++-
 syntax/sexplib.vim                      | 4 +++-
 syntax/sh.vim                           | 4 +++-
 syntax/sieve.vim                        | 4 +++-
 syntax/sil.vim                          | 4 +++-
 syntax/simula.vim                       | 4 +++-
 syntax/sinda.vim                        | 4 +++-
 syntax/sisu.vim                         | 4 +++-
 syntax/skill.vim                        | 4 +++-
 syntax/slang.vim                        | 4 +++-
 syntax/slice.vim                        | 4 +++-
 syntax/slim.vim                         | 4 +++-
 syntax/slime.vim                        | 4 +++-
 syntax/slpconf.vim                      | 4 +++-
 syntax/slpreg.vim                       | 4 +++-
 syntax/slpspi.vim                       | 4 +++-
 syntax/slrnrc.vim                       | 4 +++-
 syntax/slrnsc.vim                       | 4 +++-
 syntax/sm.vim                           | 4 +++-
 syntax/smarty.vim                       | 4 +++-
 syntax/smcl.vim                         | 4 +++-
 syntax/smhl.vim                         | 4 +++-
 syntax/smith.vim                        | 4 +++-
 syntax/sml.vim                          | 4 +++-
 syntax/smt2.vim                         | 4 +++-
 syntax/snobol4.vim                      | 4 +++-
 syntax/solidity.vim                     | 4 +++-
 syntax/spec.vim                         | 4 +++-
 syntax/spice.vim                        | 4 +++-
 syntax/spup.vim                         | 4 +++-
 syntax/spyce.vim                        | 4 +++-
 syntax/sql.vim                          | 4 +++-
 syntax/sqlj.vim                         | 4 +++-
 syntax/sqloracle.vim                    | 4 +++-
 syntax/sqr.vim                          | 4 +++-
 syntax/squid.vim                        | 4 +++-
 syntax/srec.vim                         | 4 +++-
 syntax/sshconfig.vim                    | 4 +++-
 syntax/sshdconfig.vim                   | 4 +++-
 syntax/st.vim                           | 4 +++-
 syntax/stata.vim                        | 4 +++-
 syntax/stp.vim                          | 4 +++-
 syntax/stylus.vim                       | 4 +++-
 syntax/sudoers.vim                      | 4 +++-
 syntax/svelte.vim                       | 4 +++-
 syntax/svg.vim                          | 4 +++-
 syntax/svn.vim                          | 4 +++-
 syntax/swift.vim                        | 4 +++-
 syntax/swiftgyb.vim                     | 4 +++-
 syntax/sxhkdrc.vim                      | 4 +++-
 syntax/sysctl.vim                       | 4 +++-
 syntax/systemd.vim                      | 4 +++-
 syntax/systemverilog.vim                | 4 +++-
 syntax/tablegen.vim                     | 4 +++-
 syntax/tads.vim                         | 4 +++-
 syntax/tags.vim                         | 4 +++-
 syntax/tak.vim                          | 4 +++-
 syntax/tap.vim                          | 4 +++-
 syntax/taskdata.vim                     | 4 +++-
 syntax/taskedit.vim                     | 4 +++-
 syntax/tcl.vim                          | 4 +++-
 syntax/template.vim                     | 4 +++-
 syntax/teraterm.vim                     | 4 +++-
 syntax/terminfo.vim                     | 4 +++-
 syntax/terraform.vim                    | 4 +++-
 syntax/tex.vim                          | 4 +++-
 syntax/texinfo.vim                      | 4 +++-
 syntax/texmf.vim                        | 4 +++-
 syntax/textile.vim                      | 4 +++-
 syntax/tf.vim                           | 4 +++-
 syntax/thrift.vim                       | 4 +++-
 syntax/tidy.vim                         | 4 +++-
 syntax/tilde.vim                        | 4 +++-
 syntax/tli.vim                          | 4 +++-
 syntax/tmux.vim                         | 4 +++-
 syntax/toml.vim                         | 4 +++-
 syntax/tpp.vim                          | 4 +++-
 syntax/tptp.vim                         | 4 +++-
 syntax/trasys.vim                       | 4 +++-
 syntax/treetop.vim                      | 4 +++-
 syntax/trustees.vim                     | 4 +++-
 syntax/tsalt.vim                        | 4 +++-
 syntax/tsscl.vim                        | 4 +++-
 syntax/tssgm.vim                        | 4 +++-
 syntax/tssop.vim                        | 4 +++-
 syntax/tt2.vim                          | 4 +++-
 syntax/tt2html.vim                      | 4 +++-
 syntax/tt2js.vim                        | 4 +++-
 syntax/twig.vim                         | 4 +++-
 syntax/typescript.vim                   | 4 +++-
 syntax/typescriptreact.vim              | 4 +++-
 syntax/uc.vim                           | 4 +++-
 syntax/udevconf.vim                     | 4 +++-
 syntax/udevperm.vim                     | 4 +++-
 syntax/uil.vim                          | 4 +++-
 syntax/unison.vim                       | 4 +++-
 syntax/updatedb.vim                     | 4 +++-
 syntax/upstart.vim                      | 4 +++-
 syntax/upstreamdat.vim                  | 4 +++-
 syntax/upstreaminstalllog.vim           | 4 +++-
 syntax/upstreamlog.vim                  | 4 +++-
 syntax/usserverlog.vim                  | 4 +++-
 syntax/usw2kagtlog.vim                  | 4 +++-
 syntax/vala.vim                         | 4 +++-
 syntax/vb.vim                           | 4 +++-
 syntax/vbnet.vim                        | 4 +++-
 syntax/vcl.vim                          | 4 +++-
 syntax/velocity.vim                     | 4 +++-
 syntax/vera.vim                         | 4 +++-
 syntax/verilog.vim                      | 4 +++-
 syntax/verilogams.vim                   | 4 +++-
 syntax/vgrindefs.vim                    | 4 +++-
 syntax/vhdl.vim                         | 4 +++-
 syntax/vimgo.vim                        | 4 +++-
 syntax/viminfo.vim                      | 4 +++-
 syntax/vlang.vim                        | 4 +++-
 syntax/vmasm.vim                        | 4 +++-
 syntax/voscm.vim                        | 4 +++-
 syntax/vrml.vim                         | 4 +++-
 syntax/vroom.vim                        | 4 +++-
 syntax/vue.vim                          | 4 +++-
 syntax/wast.vim                         | 4 +++-
 syntax/webmacro.vim                     | 4 +++-
 syntax/wget.vim                         | 4 +++-
 syntax/winbatch.vim                     | 4 +++-
 syntax/wml.vim                          | 4 +++-
 syntax/wsh.vim                          | 4 +++-
 syntax/wsml.vim                         | 4 +++-
 syntax/wvdial.vim                       | 4 +++-
 syntax/xdc.vim                          | 4 +++-
 syntax/xdefaults.vim                    | 4 +++-
 syntax/xf86conf.vim                     | 4 +++-
 syntax/xhtml.vim                        | 4 +++-
 syntax/xinetd.vim                       | 4 +++-
 syntax/xmath.vim                        | 4 +++-
 syntax/xml.vim                          | 4 +++-
 syntax/xmodmap.vim                      | 4 +++-
 syntax/xpm.vim                          | 4 +++-
 syntax/xpm2.vim                         | 4 +++-
 syntax/xquery.vim                       | 4 +++-
 syntax/xs.vim                           | 4 +++-
 syntax/xsd.vim                          | 4 +++-
 syntax/xsl.vim                          | 4 +++-
 syntax/xslt.vim                         | 4 +++-
 syntax/yacc.vim                         | 4 +++-
 syntax/yaml.vim                         | 4 +++-
 syntax/yats.vim                         | 4 +++-
 syntax/yats/css.vim                     | 4 +++-
 syntax/yats/dom-document.vim            | 4 +++-
 syntax/yats/dom-elem.vim                | 4 +++-
 syntax/yats/dom-event.vim               | 4 +++-
 syntax/yats/dom-form.vim                | 4 +++-
 syntax/yats/dom-node.vim                | 4 +++-
 syntax/yats/dom-storage.vim             | 4 +++-
 syntax/yats/ecma-402.vim                | 4 +++-
 syntax/yats/es6-array.vim               | 4 +++-
 syntax/yats/es6-date.vim                | 4 +++-
 syntax/yats/es6-function.vim            | 4 +++-
 syntax/yats/es6-json.vim                | 4 +++-
 syntax/yats/es6-map.vim                 | 4 +++-
 syntax/yats/es6-math.vim                | 4 +++-
 syntax/yats/es6-number.vim              | 4 +++-
 syntax/yats/es6-object.vim              | 4 +++-
 syntax/yats/es6-promise.vim             | 4 +++-
 syntax/yats/es6-proxy.vim               | 4 +++-
 syntax/yats/es6-reflect.vim             | 4 +++-
 syntax/yats/es6-regexp.vim              | 4 +++-
 syntax/yats/es6-set.vim                 | 4 +++-
 syntax/yats/es6-string.vim              | 4 +++-
 syntax/yats/es6-symbol.vim              | 4 +++-
 syntax/yats/event.vim                   | 4 +++-
 syntax/yats/node.vim                    | 4 +++-
 syntax/yats/test.vim                    | 4 +++-
 syntax/yats/typescript.vim              | 4 +++-
 syntax/yats/web-blob.vim                | 4 +++-
 syntax/yats/web-console.vim             | 4 +++-
 syntax/yats/web-crypto.vim              | 4 +++-
 syntax/yats/web-encoding.vim            | 4 +++-
 syntax/yats/web-fetch.vim               | 4 +++-
 syntax/yats/web-geo.vim                 | 4 +++-
 syntax/yats/web-history.vim             | 4 +++-
 syntax/yats/web-location.vim            | 4 +++-
 syntax/yats/web-navigator.vim           | 4 +++-
 syntax/yats/web-network.vim             | 4 +++-
 syntax/yats/web-payment.vim             | 4 +++-
 syntax/yats/web-service-worker.vim      | 4 +++-
 syntax/yats/web-window.vim              | 4 +++-
 syntax/yats/web-xhr.vim                 | 4 +++-
 syntax/yats/web.vim                     | 4 +++-
 syntax/z8a.vim                          | 4 +++-
 syntax/zephir.vim                       | 4 +++-
 syntax/zig.vim                          | 4 +++-
 syntax/zimbu.vim                        | 4 +++-
 syntax/zir.vim                          | 4 +++-
 syntax/zsh.vim                          | 4 +++-
 1227 files changed, 3681 insertions(+), 1227 deletions(-)

diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index 132437ed6..f498e5dfe 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/LaTeXtoUnicode.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/LaTeXtoUnicode.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/RstFold.vim b/autoload/RstFold.vim
index dc1044f76..926bc1b9c 100644
--- a/autoload/RstFold.vim
+++ b/autoload/RstFold.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/RstFold.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/RstFold.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/ada.vim b/autoload/ada.vim
index e01b83ae4..9a01456c6 100644
--- a/autoload/ada.vim
+++ b/autoload/ada.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/ada.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/ada.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/cargo.vim b/autoload/cargo.vim
index a8b35e731..068cfa893 100644
--- a/autoload/cargo.vim
+++ b/autoload/cargo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/cargo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/cargo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/cargo/quickfix.vim b/autoload/cargo/quickfix.vim
index 630928f55..7f3fffa1c 100644
--- a/autoload/cargo/quickfix.vim
+++ b/autoload/cargo/quickfix.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/cargo/quickfix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/cargo/quickfix.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index 70c1d4cea..02857c7ba 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/clojurecomplete.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/clojurecomplete.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/coffee.vim b/autoload/coffee.vim
index c3376640a..0388a589f 100644
--- a/autoload/coffee.vim
+++ b/autoload/coffee.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/coffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/coffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/crystal/indent.vim b/autoload/crystal/indent.vim
index d50c6e290..fbbf91fd0 100644
--- a/autoload/crystal/indent.vim
+++ b/autoload/crystal/indent.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/crystal/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/crystal/indent.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/crystal_lang.vim b/autoload/crystal_lang.vim
index 3b10ecbd3..1a1ad4216 100644
--- a/autoload/crystal_lang.vim
+++ b/autoload/crystal_lang.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/crystal_lang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/crystal_lang.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/csv.vim b/autoload/csv.vim
index a51163066..692ec2a3f 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/csv.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/csv.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/dart.vim b/autoload/dart.vim
index bbb1de213..ccd29b44b 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/dart.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/dart.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/db/adapter/ecto.vim b/autoload/db/adapter/ecto.vim
index f97301e9a..7eca12626 100644
--- a/autoload/db/adapter/ecto.vim
+++ b/autoload/db/adapter/ecto.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/db/adapter/ecto.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/db/adapter/ecto.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/ecrystal.vim b/autoload/ecrystal.vim
index 658d5bd8e..5225c7539 100644
--- a/autoload/ecrystal.vim
+++ b/autoload/ecrystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/ecrystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/ecrystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index 61015846e..ccd028815 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/elixir/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/elixir/indent.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/elixir/util.vim b/autoload/elixir/util.vim
index de7972def..7acc8814b 100644
--- a/autoload/elixir/util.vim
+++ b/autoload/elixir/util.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/elixir/util.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/elixir/util.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/fish.vim b/autoload/fish.vim
index 2cc6fcfbb..fb2dda135 100644
--- a/autoload/fish.vim
+++ b/autoload/fish.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/fish.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/fish.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index a7abc1d70..0331814c8 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/fsharp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/fsharp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/fzf_gitignore.vim b/autoload/fzf_gitignore.vim
index a482c0306..bd90be485 100644
--- a/autoload/fzf_gitignore.vim
+++ b/autoload/fzf_gitignore.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/fzf_gitignore.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/fzf_gitignore.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index c58b983a8..3ddde7408 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/go/config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/go/config.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/graphql.vim b/autoload/graphql.vim
index 49c63437f..b5ddd9fa6 100644
--- a/autoload/graphql.vim
+++ b/autoload/graphql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/graphql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/graphql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/htmlcomplete.vim b/autoload/htmlcomplete.vim
index ae83ea68b..7db1fdb90 100644
--- a/autoload/htmlcomplete.vim
+++ b/autoload/htmlcomplete.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/htmlcomplete.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/htmlcomplete.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/jsonnet.vim b/autoload/jsonnet.vim
index 0f1272db9..c05e2f86e 100644
--- a/autoload/jsonnet.vim
+++ b/autoload/jsonnet.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/jsonnet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/jsonnet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/jsx_pretty/comment.vim b/autoload/jsx_pretty/comment.vim
index 15442453f..5a9db3674 100644
--- a/autoload/jsx_pretty/comment.vim
+++ b/autoload/jsx_pretty/comment.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/jsx_pretty/comment.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/jsx_pretty/comment.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/jsx_pretty/indent.vim b/autoload/jsx_pretty/indent.vim
index 77d620389..34f88db07 100644
--- a/autoload/jsx_pretty/indent.vim
+++ b/autoload/jsx_pretty/indent.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/jsx_pretty/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/jsx_pretty/indent.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/julia.vim b/autoload/julia.vim
index daaa9f446..d76454a4a 100644
--- a/autoload/julia.vim
+++ b/autoload/julia.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/julia.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/julia.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/julia/doc.vim b/autoload/julia/doc.vim
index 7e6b5d317..e9e77d8c5 100644
--- a/autoload/julia/doc.vim
+++ b/autoload/julia/doc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/julia/doc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/julia/doc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/julia_blocks.vim b/autoload/julia_blocks.vim
index 634462d69..7dd87df9f 100644
--- a/autoload/julia_blocks.vim
+++ b/autoload/julia_blocks.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/julia_blocks.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/julia_blocks.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/julia_latex_symbols.vim b/autoload/julia_latex_symbols.vim
index 23101f784..5f4c98900 100644
--- a/autoload/julia_latex_symbols.vim
+++ b/autoload/julia_latex_symbols.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/julia_latex_symbols.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/julia_latex_symbols.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/ledger.vim b/autoload/ledger.vim
index cb7acfe7b..badcb1751 100644
--- a/autoload/ledger.vim
+++ b/autoload/ledger.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/ledger.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/ledger.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/nim.vim b/autoload/nim.vim
index cf7bb3786..fdf990fcf 100644
--- a/autoload/nim.vim
+++ b/autoload/nim.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/nim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/nim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/pony.vim b/autoload/pony.vim
index 85506e8b4..5f26c52b0 100644
--- a/autoload/pony.vim
+++ b/autoload/pony.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/pony.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/pony.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/puppet/align.vim b/autoload/puppet/align.vim
index 712b686b9..4fafac3da 100644
--- a/autoload/puppet/align.vim
+++ b/autoload/puppet/align.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/puppet/align.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/puppet/align.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/puppet/ctags.vim b/autoload/puppet/ctags.vim
index a86490bb2..fad4f87a6 100644
--- a/autoload/puppet/ctags.vim
+++ b/autoload/puppet/ctags.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/puppet/ctags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/puppet/ctags.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/puppet/format.vim b/autoload/puppet/format.vim
index 503378490..94fe42e75 100644
--- a/autoload/puppet/format.vim
+++ b/autoload/puppet/format.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/puppet/format.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/puppet/format.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/python/utils.vim b/autoload/python/utils.vim
index 283d785a4..4a02520dd 100644
--- a/autoload/python/utils.vim
+++ b/autoload/python/utils.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/python/utils.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/python/utils.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/requirements.vim b/autoload/requirements.vim
index 79be715c8..e945a6520 100644
--- a/autoload/requirements.vim
+++ b/autoload/requirements.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/requirements.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/requirements.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/rubycomplete.vim b/autoload/rubycomplete.vim
index 1e8a6f0d7..0b8871cbd 100644
--- a/autoload/rubycomplete.vim
+++ b/autoload/rubycomplete.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rubycomplete.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/rubycomplete.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/rust.vim b/autoload/rust.vim
index bab6a11fc..b8bef48d2 100644
--- a/autoload/rust.vim
+++ b/autoload/rust.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rust.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/rust.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/rust/debugging.vim b/autoload/rust/debugging.vim
index 3ddcc63cc..d16380b5a 100644
--- a/autoload/rust/debugging.vim
+++ b/autoload/rust/debugging.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rust/debugging.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/rust/debugging.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/rust/delimitmate.vim b/autoload/rust/delimitmate.vim
index c605742b7..a60dece75 100644
--- a/autoload/rust/delimitmate.vim
+++ b/autoload/rust/delimitmate.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rust/delimitmate.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/rust/delimitmate.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/rust/tags.vim b/autoload/rust/tags.vim
index 10ce9440f..84388174c 100644
--- a/autoload/rust/tags.vim
+++ b/autoload/rust/tags.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rust/tags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/rust/tags.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/rustfmt.vim b/autoload/rustfmt.vim
index c847219bb..2e2a10daa 100644
--- a/autoload/rustfmt.vim
+++ b/autoload/rustfmt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/rustfmt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/rustfmt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/smt2.vim b/autoload/smt2.vim
index b081d345d..7a9fa7f81 100644
--- a/autoload/smt2.vim
+++ b/autoload/smt2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/smt2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/smt2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index 2380a395a..e780440b6 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/terraform.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/terraform.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal.vim b/autoload/vital/_crystal.vim
index ffa302406..b8ac5d327 100644
--- a/autoload/vital/_crystal.vim
+++ b/autoload/vital/_crystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/ColorEcho.vim b/autoload/vital/_crystal/ColorEcho.vim
index 58996327d..59c0ec88a 100644
--- a/autoload/vital/_crystal/ColorEcho.vim
+++ b/autoload/vital/_crystal/ColorEcho.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/ColorEcho.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/ColorEcho.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/Data/List.vim b/autoload/vital/_crystal/Data/List.vim
index 064615256..b2045a2a2 100644
--- a/autoload/vital/_crystal/Data/List.vim
+++ b/autoload/vital/_crystal/Data/List.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/List.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/List.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/Data/String.vim b/autoload/vital/_crystal/Data/String.vim
index 7e6ced35a..8f6ddf3e4 100644
--- a/autoload/vital/_crystal/Data/String.vim
+++ b/autoload/vital/_crystal/Data/String.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/String.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/String.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/Process.vim b/autoload/vital/_crystal/Process.vim
index a7bbedade..315a4343e 100644
--- a/autoload/vital/_crystal/Process.vim
+++ b/autoload/vital/_crystal/Process.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Process.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Process.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/_crystal/Web/JSON.vim b/autoload/vital/_crystal/Web/JSON.vim
index 891bd2dcc..c17269cf0 100644
--- a/autoload/vital/_crystal/Web/JSON.vim
+++ b/autoload/vital/_crystal/Web/JSON.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Web/JSON.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Web/JSON.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/vital/crystal.vim b/autoload/vital/crystal.vim
index ca8c320ed..7674c4ef3 100644
--- a/autoload/vital/crystal.vim
+++ b/autoload/vital/crystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/vital/crystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/vital/crystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/xml/aria.vim b/autoload/xml/aria.vim
index 1cd801fe4..ff8a071c3 100644
--- a/autoload/xml/aria.vim
+++ b/autoload/xml/aria.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/xml/aria.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/xml/aria.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/xml/html5.vim b/autoload/xml/html5.vim
index 6e526be62..7bbc9586d 100644
--- a/autoload/xml/html5.vim
+++ b/autoload/xml/html5.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/xml/html5.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/xml/html5.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/xml/xsd.vim b/autoload/xml/xsd.vim
index ad3630daf..5757ae843 100644
--- a/autoload/xml/xsd.vim
+++ b/autoload/xml/xsd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/xml/xsd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/xml/xsd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/zig/config.vim b/autoload/zig/config.vim
index d4f1a298c..a35e73e88 100644
--- a/autoload/zig/config.vim
+++ b/autoload/zig/config.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/zig/config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/zig/config.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index b1ec0bbe9..c148ca2b3 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/zig/fmt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/zig/fmt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/zig/list.vim b/autoload/zig/list.vim
index 8ab57d424..382a98828 100644
--- a/autoload/zig/list.vim
+++ b/autoload/zig/list.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/zig/list.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/zig/list.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/autoload/zig/util.vim b/autoload/zig/util.vim
index 23d457584..0c8038023 100644
--- a/autoload/zig/util.vim
+++ b/autoload/zig/util.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'autoload/zig/util.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'autoload/zig/util.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/ant.vim b/compiler/ant.vim
index a893daaa6..32470076a 100644
--- a/compiler/ant.vim
+++ b/compiler/ant.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/ant.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/ant.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/bdf.vim b/compiler/bdf.vim
index 04903c2c4..2bf1c12f0 100644
--- a/compiler/bdf.vim
+++ b/compiler/bdf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/bdf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/bdf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/cake.vim b/compiler/cake.vim
index 3ebcd187f..d3ac35d37 100644
--- a/compiler/cake.vim
+++ b/compiler/cake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/cake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/cake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/cargo.vim b/compiler/cargo.vim
index f33a0a4c7..c8719dc9b 100644
--- a/compiler/cargo.vim
+++ b/compiler/cargo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/cargo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/cargo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/coffee.vim b/compiler/coffee.vim
index 8193a4a56..a9e1a6bfd 100644
--- a/compiler/coffee.vim
+++ b/compiler/coffee.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/coffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/coffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/credo.vim b/compiler/credo.vim
index 5ad1f452b..801e79d91 100644
--- a/compiler/credo.vim
+++ b/compiler/credo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/credo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/credo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/cryptol.vim b/compiler/cryptol.vim
index 3dca5026d..8cc53f38a 100644
--- a/compiler/cryptol.vim
+++ b/compiler/cryptol.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/cryptol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/cryptol.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/cs.vim b/compiler/cs.vim
index feea9751b..04a6938b1 100644
--- a/compiler/cs.vim
+++ b/compiler/cs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/cs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/cs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/cucumber.vim b/compiler/cucumber.vim
index c0ddbc6d9..4a4eba7e1 100644
--- a/compiler/cucumber.vim
+++ b/compiler/cucumber.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/cucumber.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/cucumber.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/dot.vim b/compiler/dot.vim
index 34be342a1..e1fc35edf 100644
--- a/compiler/dot.vim
+++ b/compiler/dot.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/dot.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/dot.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/eruby.vim b/compiler/eruby.vim
index 5d75d8690..b50b655a7 100644
--- a/compiler/eruby.vim
+++ b/compiler/eruby.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/eruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/eruby.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/exunit.vim b/compiler/exunit.vim
index 8f6d31121..97ea03411 100644
--- a/compiler/exunit.vim
+++ b/compiler/exunit.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/exunit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/exunit.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/fish.vim b/compiler/fish.vim
index 797abcc94..6dfb84f96 100644
--- a/compiler/fish.vim
+++ b/compiler/fish.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/fish.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/fish.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/go.vim b/compiler/go.vim
index 6a83f3dd7..1d7b873eb 100644
--- a/compiler/go.vim
+++ b/compiler/go.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/go.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/go.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/gradle.vim b/compiler/gradle.vim
index aa5b1917d..5fdb164a7 100644
--- a/compiler/gradle.vim
+++ b/compiler/gradle.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/gradle.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/gradle.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/gradlew.vim b/compiler/gradlew.vim
index 932ace2ca..3cfd0e80a 100644
--- a/compiler/gradlew.vim
+++ b/compiler/gradlew.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/gradlew.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/gradlew.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/haml.vim b/compiler/haml.vim
index 5593c2729..415a579c9 100644
--- a/compiler/haml.vim
+++ b/compiler/haml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/haml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/haml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/ledger.vim b/compiler/ledger.vim
index f74a27a20..70b89925e 100644
--- a/compiler/ledger.vim
+++ b/compiler/ledger.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/ledger.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/ledger.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/lilypond.vim b/compiler/lilypond.vim
index 986c27814..2ae68a3bd 100644
--- a/compiler/lilypond.vim
+++ b/compiler/lilypond.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/lilypond.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/lilypond.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/ls.vim b/compiler/ls.vim
index ab6b1c128..d177eaa37 100644
--- a/compiler/ls.vim
+++ b/compiler/ls.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/ls.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/ls.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/mix.vim b/compiler/mix.vim
index 13dd13403..9ba5216bd 100644
--- a/compiler/mix.vim
+++ b/compiler/mix.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/mix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/mix.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/nim.vim b/compiler/nim.vim
index b15e72214..1b8c21b10 100644
--- a/compiler/nim.vim
+++ b/compiler/nim.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/nim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/nim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/nix-build.vim b/compiler/nix-build.vim
index 9766965a7..0eb5f6946 100644
--- a/compiler/nix-build.vim
+++ b/compiler/nix-build.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/nix-build.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/nix-build.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/ocaml.vim b/compiler/ocaml.vim
index ad3186d96..a9170be5d 100644
--- a/compiler/ocaml.vim
+++ b/compiler/ocaml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/ocaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/ocaml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/powershell.vim b/compiler/powershell.vim
index 13e56ddf1..9cab203c3 100644
--- a/compiler/powershell.vim
+++ b/compiler/powershell.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/powershell.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/powershell.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/python.vim b/compiler/python.vim
index f453919cc..1a82a1cd1 100644
--- a/compiler/python.vim
+++ b/compiler/python.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/python.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/python.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/rake.vim b/compiler/rake.vim
index 05fce7bfb..acd08a354 100644
--- a/compiler/rake.vim
+++ b/compiler/rake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/rake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/rake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/rspec.vim b/compiler/rspec.vim
index 7b696c8ee..c3b4ea0e1 100644
--- a/compiler/rspec.vim
+++ b/compiler/rspec.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/rspec.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/rspec.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/ruby.vim b/compiler/ruby.vim
index 4fe2817fc..8f0127c96 100644
--- a/compiler/ruby.vim
+++ b/compiler/ruby.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/ruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/ruby.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/rubyunit.vim b/compiler/rubyunit.vim
index 862de9dc7..417b49c31 100644
--- a/compiler/rubyunit.vim
+++ b/compiler/rubyunit.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/rubyunit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/rubyunit.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/rustc.vim b/compiler/rustc.vim
index f9da25f22..f9953732a 100644
--- a/compiler/rustc.vim
+++ b/compiler/rustc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/rustc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/rustc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/sass.vim b/compiler/sass.vim
index 1f0668734..bf02fa84c 100644
--- a/compiler/sass.vim
+++ b/compiler/sass.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/sass.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/sass.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/sbt.vim b/compiler/sbt.vim
index f6333af5d..7bb2b1f9f 100644
--- a/compiler/sbt.vim
+++ b/compiler/sbt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/sbt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/sbt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/swift.vim b/compiler/swift.vim
index c90b3fa28..441d7b2f7 100644
--- a/compiler/swift.vim
+++ b/compiler/swift.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/swift.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/swift.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/tcl.vim b/compiler/tcl.vim
index e1d7779e8..184e17bb8 100644
--- a/compiler/tcl.vim
+++ b/compiler/tcl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/tcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/tcl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/tex.vim b/compiler/tex.vim
index 6f974124c..6d50eacde 100644
--- a/compiler/tex.vim
+++ b/compiler/tex.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/tex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/tex.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/tidy.vim b/compiler/tidy.vim
index ba44ce83f..380c8d889 100644
--- a/compiler/tidy.vim
+++ b/compiler/tidy.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/tidy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/tidy.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/compiler/typescript.vim b/compiler/typescript.vim
index e48600927..de3f1f0a8 100644
--- a/compiler/typescript.vim
+++ b/compiler/typescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'compiler/typescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'compiler/typescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/extras/flow.vim b/extras/flow.vim
index 5b9db5383..458067d49 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'extras/flow.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'extras/flow.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index d65badb23..63b816aaa 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'extras/jsdoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'extras/jsdoc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/extras/ngdoc.vim b/extras/ngdoc.vim
index 9ef799251..22a1a590c 100644
--- a/extras/ngdoc.vim
+++ b/extras/ngdoc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'extras/ngdoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'extras/ngdoc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/8th.vim b/ftplugin/8th.vim
index f6877548a..befe694bb 100644
--- a/ftplugin/8th.vim
+++ b/ftplugin/8th.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/8th.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/8th.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/a2ps.vim b/ftplugin/a2ps.vim
index 052a9fb84..d92fdf640 100644
--- a/ftplugin/a2ps.vim
+++ b/ftplugin/a2ps.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/a2ps.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/a2ps.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/aap.vim b/ftplugin/aap.vim
index d9f3213c3..2d9003180 100644
--- a/ftplugin/aap.vim
+++ b/ftplugin/aap.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/aap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/aap.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/abap.vim b/ftplugin/abap.vim
index 0ecefa794..96ab0d560 100644
--- a/ftplugin/abap.vim
+++ b/ftplugin/abap.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/abap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/abap.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/abaqus.vim b/ftplugin/abaqus.vim
index f6d21fa14..2214d4f46 100644
--- a/ftplugin/abaqus.vim
+++ b/ftplugin/abaqus.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/abaqus.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/abaqus.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ada.vim b/ftplugin/ada.vim
index 19dbdd20e..1d067182d 100644
--- a/ftplugin/ada.vim
+++ b/ftplugin/ada.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ada.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ada.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/alsaconf.vim b/ftplugin/alsaconf.vim
index 5aac50a43..a481b76ac 100644
--- a/ftplugin/alsaconf.vim
+++ b/ftplugin/alsaconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/alsaconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/alsaconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ansible.vim b/ftplugin/ansible.vim
index 32b30474f..cef2e9c4c 100644
--- a/ftplugin/ansible.vim
+++ b/ftplugin/ansible.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ansible.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ansible.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ansible_hosts.vim b/ftplugin/ansible_hosts.vim
index d93ef6f88..6f819a7ea 100644
--- a/ftplugin/ansible_hosts.vim
+++ b/ftplugin/ansible_hosts.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ansible_hosts.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ansible_hosts.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ant.vim b/ftplugin/ant.vim
index a69d4df07..184818a59 100644
--- a/ftplugin/ant.vim
+++ b/ftplugin/ant.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ant.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ant.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/arch.vim b/ftplugin/arch.vim
index e674fdb0f..5910287e9 100644
--- a/ftplugin/arch.vim
+++ b/ftplugin/arch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/arch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/arch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/art.vim b/ftplugin/art.vim
index 65d411dc1..edbc86a39 100644
--- a/ftplugin/art.vim
+++ b/ftplugin/art.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/art.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/art.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/aspvbs.vim b/ftplugin/aspvbs.vim
index 6c3c53df9..4899bfb33 100644
--- a/ftplugin/aspvbs.vim
+++ b/ftplugin/aspvbs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/aspvbs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/aspvbs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/automake.vim b/ftplugin/automake.vim
index f5c92bcc2..ed47025ce 100644
--- a/ftplugin/automake.vim
+++ b/ftplugin/automake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/automake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/automake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/awk.vim b/ftplugin/awk.vim
index 764edfd96..9bbeb2769 100644
--- a/ftplugin/awk.vim
+++ b/ftplugin/awk.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/awk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/awk.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/bdf.vim b/ftplugin/bdf.vim
index ae22bf31b..74b508717 100644
--- a/ftplugin/bdf.vim
+++ b/ftplugin/bdf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/bdf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/bdf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/blade.vim b/ftplugin/blade.vim
index 81020de73..4fa102d9e 100644
--- a/ftplugin/blade.vim
+++ b/ftplugin/blade.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/blade.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/blade.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/bst.vim b/ftplugin/bst.vim
index 5e49c1bc6..2539a1090 100644
--- a/ftplugin/bst.vim
+++ b/ftplugin/bst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/bst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/bst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/bzl.vim b/ftplugin/bzl.vim
index c65643a44..69c95d1d0 100644
--- a/ftplugin/bzl.vim
+++ b/ftplugin/bzl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/bzl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/bzl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/caddyfile.vim b/ftplugin/caddyfile.vim
index 5d480987f..f9725ee2a 100644
--- a/ftplugin/caddyfile.vim
+++ b/ftplugin/caddyfile.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/caddyfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/caddyfile.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/calendar.vim b/ftplugin/calendar.vim
index b5af5c1e4..12f843941 100644
--- a/ftplugin/calendar.vim
+++ b/ftplugin/calendar.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/calendar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/calendar.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/cdrdaoconf.vim b/ftplugin/cdrdaoconf.vim
index 478aaf9d8..f048ef9f2 100644
--- a/ftplugin/cdrdaoconf.vim
+++ b/ftplugin/cdrdaoconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/cdrdaoconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/cdrdaoconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/cfg.vim b/ftplugin/cfg.vim
index 472e5240a..6ed841bb1 100644
--- a/ftplugin/cfg.vim
+++ b/ftplugin/cfg.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/cfg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/cfg.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ch.vim b/ftplugin/ch.vim
index 5222c5e8c..cd71d7ecf 100644
--- a/ftplugin/ch.vim
+++ b/ftplugin/ch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index c04de2e30..6862f35d0 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/clojure.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/clojure.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/cobol.vim b/ftplugin/cobol.vim
index dec2d8c67..1441dfb03 100644
--- a/ftplugin/cobol.vim
+++ b/ftplugin/cobol.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/cobol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/cobol.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim
index 86a3e82fd..84fa245cc 100644
--- a/ftplugin/coffee.vim
+++ b/ftplugin/coffee.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/coffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/coffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/conf.vim b/ftplugin/conf.vim
index 3e6a45739..244827cbe 100644
--- a/ftplugin/conf.vim
+++ b/ftplugin/conf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/conf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/conf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/config.vim b/ftplugin/config.vim
index 050c6f00d..dbd82347f 100644
--- a/ftplugin/config.vim
+++ b/ftplugin/config.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/config.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/crm.vim b/ftplugin/crm.vim
index 83076461a..0ca01cd8a 100644
--- a/ftplugin/crm.vim
+++ b/ftplugin/crm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/crm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/crm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/cryptol/folding.vim b/ftplugin/cryptol/folding.vim
index d516f61fa..1dcdc109d 100644
--- a/ftplugin/cryptol/folding.vim
+++ b/ftplugin/cryptol/folding.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/cryptol/folding.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/cryptol/folding.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/crystal.vim b/ftplugin/crystal.vim
index eb8e8974e..5f4e981b2 100644
--- a/ftplugin/crystal.vim
+++ b/ftplugin/crystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/crystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/crystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/cs.vim b/ftplugin/cs.vim
index 72dbdfe08..9ee462312 100644
--- a/ftplugin/cs.vim
+++ b/ftplugin/cs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/cs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/cs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/csc.vim b/ftplugin/csc.vim
index 908a027a0..b0648a81a 100644
--- a/ftplugin/csc.vim
+++ b/ftplugin/csc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/csc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/csc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/css.vim b/ftplugin/css.vim
index 6209091b2..50d8f7145 100644
--- a/ftplugin/css.vim
+++ b/ftplugin/css.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/css.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/css.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/csv.vim b/ftplugin/csv.vim
index 125d06ed3..40d5f95c8 100644
--- a/ftplugin/csv.vim
+++ b/ftplugin/csv.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/csv.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/csv.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/cucumber.vim b/ftplugin/cucumber.vim
index 102541530..942467910 100644
--- a/ftplugin/cucumber.vim
+++ b/ftplugin/cucumber.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/cucumber.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/cucumber.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/cvsrc.vim b/ftplugin/cvsrc.vim
index 705787b92..84d059d77 100644
--- a/ftplugin/cvsrc.vim
+++ b/ftplugin/cvsrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/cvsrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/cvsrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim
index 147e657dd..52ac5bae1 100644
--- a/ftplugin/dart.vim
+++ b/ftplugin/dart.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/dart.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/dart.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/debchangelog.vim b/ftplugin/debchangelog.vim
index 355826f79..ba8b046b8 100644
--- a/ftplugin/debchangelog.vim
+++ b/ftplugin/debchangelog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/debchangelog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/debchangelog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/debcontrol.vim b/ftplugin/debcontrol.vim
index 647d59424..767fbb8ff 100644
--- a/ftplugin/debcontrol.vim
+++ b/ftplugin/debcontrol.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/debcontrol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/debcontrol.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/denyhosts.vim b/ftplugin/denyhosts.vim
index 3cadf87fc..35f1245b7 100644
--- a/ftplugin/denyhosts.vim
+++ b/ftplugin/denyhosts.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/denyhosts.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/denyhosts.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/dhall.vim b/ftplugin/dhall.vim
index 983877c03..76a6bd224 100644
--- a/ftplugin/dhall.vim
+++ b/ftplugin/dhall.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/dhall.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/dhall.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/dictconf.vim b/ftplugin/dictconf.vim
index 22f10401f..2b5467ce2 100644
--- a/ftplugin/dictconf.vim
+++ b/ftplugin/dictconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/dictconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/dictconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/dictdconf.vim b/ftplugin/dictdconf.vim
index 8f229104c..2d404814e 100644
--- a/ftplugin/dictdconf.vim
+++ b/ftplugin/dictdconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/dictdconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/dictdconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/diff.vim b/ftplugin/diff.vim
index 226956ca4..d6ff42bc0 100644
--- a/ftplugin/diff.vim
+++ b/ftplugin/diff.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/diff.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/diff.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/dircolors.vim b/ftplugin/dircolors.vim
index b9b2549e8..9043b6490 100644
--- a/ftplugin/dircolors.vim
+++ b/ftplugin/dircolors.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/dircolors.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/dircolors.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/docker-compose.vim b/ftplugin/docker-compose.vim
index 8e5c4fd3c..df33d6fda 100644
--- a/ftplugin/docker-compose.vim
+++ b/ftplugin/docker-compose.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/docker-compose.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/docker-compose.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/dockerfile.vim b/ftplugin/dockerfile.vim
index 239fd78c9..950a48bc5 100644
--- a/ftplugin/dockerfile.vim
+++ b/ftplugin/dockerfile.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/dockerfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/dockerfile.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/dosbatch.vim b/ftplugin/dosbatch.vim
index a90f06b7b..ada068653 100644
--- a/ftplugin/dosbatch.vim
+++ b/ftplugin/dosbatch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/dosbatch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/dosbatch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/dosini.vim b/ftplugin/dosini.vim
index 3e2689c08..1a841bf67 100644
--- a/ftplugin/dosini.vim
+++ b/ftplugin/dosini.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/dosini.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/dosini.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/dtd.vim b/ftplugin/dtd.vim
index 71e7535a1..26ad5061b 100644
--- a/ftplugin/dtd.vim
+++ b/ftplugin/dtd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/dtd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/dtd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/dune.vim b/ftplugin/dune.vim
index 6a6a88e96..fde69ca6f 100644
--- a/ftplugin/dune.vim
+++ b/ftplugin/dune.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/dune.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/dune.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ecrystal.vim b/ftplugin/ecrystal.vim
index 0aa94254b..d4854095c 100644
--- a/ftplugin/ecrystal.vim
+++ b/ftplugin/ecrystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ecrystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ecrystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index 06b74eec4..764ded0d1 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/eelixir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/eelixir.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/elinks.vim b/ftplugin/elinks.vim
index 57150b99a..ed6cdd681 100644
--- a/ftplugin/elinks.vim
+++ b/ftplugin/elinks.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/elinks.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/elinks.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index 2889a446d..db05c990d 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/elixir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/elixir.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/embeddedpuppet.vim b/ftplugin/embeddedpuppet.vim
index 0a3ccf6f4..c369e5c34 100644
--- a/ftplugin/embeddedpuppet.vim
+++ b/ftplugin/embeddedpuppet.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/embeddedpuppet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/embeddedpuppet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ember-script.vim b/ftplugin/ember-script.vim
index a1436b7b8..41f534424 100644
--- a/ftplugin/ember-script.vim
+++ b/ftplugin/ember-script.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ember-script.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ember-script.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/emblem.vim b/ftplugin/emblem.vim
index 7ddba5c20..655c843b8 100644
--- a/ftplugin/emblem.vim
+++ b/ftplugin/emblem.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/emblem.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/emblem.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/eruby.vim b/ftplugin/eruby.vim
index cd3e8be1f..3dc549ed6 100644
--- a/ftplugin/eruby.vim
+++ b/ftplugin/eruby.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/eruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/eruby.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/eterm.vim b/ftplugin/eterm.vim
index 33fa42f6c..135d75f83 100644
--- a/ftplugin/eterm.vim
+++ b/ftplugin/eterm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/eterm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/eterm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/falcon.vim b/ftplugin/falcon.vim
index c1095b58f..d278f58c1 100644
--- a/ftplugin/falcon.vim
+++ b/ftplugin/falcon.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/falcon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/falcon.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/fennel.vim b/ftplugin/fennel.vim
index 3dc46a7b8..5fb9afb69 100644
--- a/ftplugin/fennel.vim
+++ b/ftplugin/fennel.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/fennel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/fennel.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/fetchmail.vim b/ftplugin/fetchmail.vim
index a9d2abc96..a995bdfde 100644
--- a/ftplugin/fetchmail.vim
+++ b/ftplugin/fetchmail.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/fetchmail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/fetchmail.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
index 85bae2dc1..e79c0669e 100644
--- a/ftplugin/fish.vim
+++ b/ftplugin/fish.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/fish.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/fish.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/fortran.vim b/ftplugin/fortran.vim
index ca1e4ab49..4c7d7cdf9 100644
--- a/ftplugin/fortran.vim
+++ b/ftplugin/fortran.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/fortran.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/fortran.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/framescript.vim b/ftplugin/framescript.vim
index 48dd0d667..4ad99bf33 100644
--- a/ftplugin/framescript.vim
+++ b/ftplugin/framescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/framescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/framescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/fvwm.vim b/ftplugin/fvwm.vim
index ad662455d..201a28b58 100644
--- a/ftplugin/fvwm.vim
+++ b/ftplugin/fvwm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/fvwm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/fvwm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/gdb.vim b/ftplugin/gdb.vim
index 49606b747..1f4ed1a8d 100644
--- a/ftplugin/gdb.vim
+++ b/ftplugin/gdb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/gdb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/gdb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/git.vim b/ftplugin/git.vim
index b5401255c..78352e841 100644
--- a/ftplugin/git.vim
+++ b/ftplugin/git.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/git.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/git.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim
index a770f9114..cc5c4208f 100644
--- a/ftplugin/gitcommit.vim
+++ b/ftplugin/gitcommit.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/gitcommit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/gitcommit.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/gitconfig.vim b/ftplugin/gitconfig.vim
index 7d3336428..f9a935d9d 100644
--- a/ftplugin/gitconfig.vim
+++ b/ftplugin/gitconfig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/gitconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/gitconfig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/gitignore.vim b/ftplugin/gitignore.vim
index 09e7a5edb..ce45c58f6 100644
--- a/ftplugin/gitignore.vim
+++ b/ftplugin/gitignore.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/gitignore.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/gitignore.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim
index c471e5052..8e2178066 100644
--- a/ftplugin/gitrebase.vim
+++ b/ftplugin/gitrebase.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/gitrebase.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/gitrebase.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/gitsendemail.vim b/ftplugin/gitsendemail.vim
index 38fe9a94a..1ef62bd35 100644
--- a/ftplugin/gitsendemail.vim
+++ b/ftplugin/gitsendemail.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/gitsendemail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/gitsendemail.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/gpg.vim b/ftplugin/gpg.vim
index bcac352de..8d142e8bd 100644
--- a/ftplugin/gpg.vim
+++ b/ftplugin/gpg.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/gpg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/gpg.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim
index 5a4aabb54..6a3cbf30c 100644
--- a/ftplugin/graphql.vim
+++ b/ftplugin/graphql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/graphql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/graphql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/groovy.vim b/ftplugin/groovy.vim
index 5ad1d552d..ae879781d 100644
--- a/ftplugin/groovy.vim
+++ b/ftplugin/groovy.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/groovy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/groovy.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/group.vim b/ftplugin/group.vim
index 82a90570f..92aa848fe 100644
--- a/ftplugin/group.vim
+++ b/ftplugin/group.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/group.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/group.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/grub.vim b/ftplugin/grub.vim
index 2e91a3111..fe1a3fbdf 100644
--- a/ftplugin/grub.vim
+++ b/ftplugin/grub.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/grub.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/grub.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/haml.vim b/ftplugin/haml.vim
index c5b216e58..c262cc3ad 100644
--- a/ftplugin/haml.vim
+++ b/ftplugin/haml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/haml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/haml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/hamster.vim b/ftplugin/hamster.vim
index c89527b62..341a762da 100644
--- a/ftplugin/hamster.vim
+++ b/ftplugin/hamster.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/hamster.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/hamster.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/handlebars.vim b/ftplugin/handlebars.vim
index ef56d4c14..2dfb1aebd 100644
--- a/ftplugin/handlebars.vim
+++ b/ftplugin/handlebars.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/handlebars.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/handlebars.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/hcl.vim b/ftplugin/hcl.vim
index f7e9a57a6..1c5a830a7 100644
--- a/ftplugin/hcl.vim
+++ b/ftplugin/hcl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/hcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/hcl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/help.vim b/ftplugin/help.vim
index 92fc165c9..b320d73ad 100644
--- a/ftplugin/help.vim
+++ b/ftplugin/help.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/help.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/help.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/hgcommit.vim b/ftplugin/hgcommit.vim
index 6c4493218..fbcf61436 100644
--- a/ftplugin/hgcommit.vim
+++ b/ftplugin/hgcommit.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/hgcommit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/hgcommit.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/hive.vim b/ftplugin/hive.vim
index a95a17ad7..f5884dd82 100644
--- a/ftplugin/hive.vim
+++ b/ftplugin/hive.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/hive.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/hive.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/hog.vim b/ftplugin/hog.vim
index bd0ef9ffd..edceb700c 100644
--- a/ftplugin/hog.vim
+++ b/ftplugin/hog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/hog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/hog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/hostconf.vim b/ftplugin/hostconf.vim
index 72b955bdf..badef7eec 100644
--- a/ftplugin/hostconf.vim
+++ b/ftplugin/hostconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/hostconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/hostconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/hostsaccess.vim b/ftplugin/hostsaccess.vim
index 72434da31..60216fac1 100644
--- a/ftplugin/hostsaccess.vim
+++ b/ftplugin/hostsaccess.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/hostsaccess.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/hostsaccess.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index f78f9d77f..df1e6a283 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/html.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/html.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/htmldjango.vim b/ftplugin/htmldjango.vim
index 92ca3fe4e..3e512e675 100644
--- a/ftplugin/htmldjango.vim
+++ b/ftplugin/htmldjango.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/htmldjango.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/htmldjango.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/i3config.vim b/ftplugin/i3config.vim
index 628d01ced..36b8b8f93 100644
--- a/ftplugin/i3config.vim
+++ b/ftplugin/i3config.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/i3config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/i3config.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/idris.vim b/ftplugin/idris.vim
index 454591a5c..9827033b9 100644
--- a/ftplugin/idris.vim
+++ b/ftplugin/idris.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/idris.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/idris.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/idris2.vim b/ftplugin/idris2.vim
index 7e39f23ea..893953113 100644
--- a/ftplugin/idris2.vim
+++ b/ftplugin/idris2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/idris2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/idris2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/indent.vim b/ftplugin/indent.vim
index f426b9b3d..5a0d6c359 100644
--- a/ftplugin/indent.vim
+++ b/ftplugin/indent.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/indent.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ion.vim b/ftplugin/ion.vim
index c6cfd8a55..9db5c7a20 100644
--- a/ftplugin/ion.vim
+++ b/ftplugin/ion.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ion.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ion.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/j.vim b/ftplugin/j.vim
index 9dd87d9da..577cbd9db 100644
--- a/ftplugin/j.vim
+++ b/ftplugin/j.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/j.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/j.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
index 97a4af13f..829538127 100644
--- a/ftplugin/java.vim
+++ b/ftplugin/java.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/java.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/java.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/jproperties.vim b/ftplugin/jproperties.vim
index f9c282c1b..5839c9977 100644
--- a/ftplugin/jproperties.vim
+++ b/ftplugin/jproperties.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/jproperties.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/jproperties.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/jq.vim b/ftplugin/jq.vim
index 2fd91c555..fab7f20f6 100644
--- a/ftplugin/jq.vim
+++ b/ftplugin/jq.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/jq.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/jq.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/json.vim b/ftplugin/json.vim
index 682f24e95..9b2d90567 100644
--- a/ftplugin/json.vim
+++ b/ftplugin/json.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/json.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/json.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/jsonnet.vim b/ftplugin/jsonnet.vim
index b18fb7d47..4c35558ea 100644
--- a/ftplugin/jsonnet.vim
+++ b/ftplugin/jsonnet.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/jsonnet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/jsonnet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/jsp.vim b/ftplugin/jsp.vim
index c5eb1ae7f..9e186dc56 100644
--- a/ftplugin/jsp.vim
+++ b/ftplugin/jsp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/jsp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/jsp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index 96aaca5b3..488454219 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/julia.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/julia.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/juliadoc.vim b/ftplugin/juliadoc.vim
index 66c7f5568..9212e287d 100644
--- a/ftplugin/juliadoc.vim
+++ b/ftplugin/juliadoc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/juliadoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/juliadoc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/kconfig.vim b/ftplugin/kconfig.vim
index f25135f43..970e4abe9 100644
--- a/ftplugin/kconfig.vim
+++ b/ftplugin/kconfig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/kconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/kconfig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/kotlin.vim b/ftplugin/kotlin.vim
index 9c85505fd..a9eb39cfe 100644
--- a/ftplugin/kotlin.vim
+++ b/ftplugin/kotlin.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/kotlin.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/kotlin.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/kwt.vim b/ftplugin/kwt.vim
index 152b8903a..49953976b 100644
--- a/ftplugin/kwt.vim
+++ b/ftplugin/kwt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/kwt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/kwt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ld.vim b/ftplugin/ld.vim
index 3a6d6647b..1b9730d9f 100644
--- a/ftplugin/ld.vim
+++ b/ftplugin/ld.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ld.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ld.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/less.vim b/ftplugin/less.vim
index eb9d5b842..1eabb7b38 100644
--- a/ftplugin/less.vim
+++ b/ftplugin/less.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/less.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/less.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/lftp.vim b/ftplugin/lftp.vim
index a3ee81a88..4f246ecd8 100644
--- a/ftplugin/lftp.vim
+++ b/ftplugin/lftp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/lftp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/lftp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/libao.vim b/ftplugin/libao.vim
index cf3469a5a..154ac0ce8 100644
--- a/ftplugin/libao.vim
+++ b/ftplugin/libao.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/libao.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/libao.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/lilypond.vim b/ftplugin/lilypond.vim
index f8462fa31..0f19b5cf3 100644
--- a/ftplugin/lilypond.vim
+++ b/ftplugin/lilypond.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/lilypond.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/lilypond.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/limits.vim b/ftplugin/limits.vim
index 6dec8a527..6990030f8 100644
--- a/ftplugin/limits.vim
+++ b/ftplugin/limits.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/limits.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/limits.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/liquid.vim b/ftplugin/liquid.vim
index c7e42872f..75b093b9f 100644
--- a/ftplugin/liquid.vim
+++ b/ftplugin/liquid.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/liquid.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/liquid.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/lisp.vim b/ftplugin/lisp.vim
index 8de27ece0..d706128c6 100644
--- a/ftplugin/lisp.vim
+++ b/ftplugin/lisp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/lisp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/lisp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/litcoffee.vim b/ftplugin/litcoffee.vim
index f0c84c70a..6b70fe8b7 100644
--- a/ftplugin/litcoffee.vim
+++ b/ftplugin/litcoffee.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/litcoffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/litcoffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/llvm.vim b/ftplugin/llvm.vim
index 109dbb515..dcb43a4b6 100644
--- a/ftplugin/llvm.vim
+++ b/ftplugin/llvm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/llvm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/llvm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/logcheck.vim b/ftplugin/logcheck.vim
index 1dbcf551c..fb90af644 100644
--- a/ftplugin/logcheck.vim
+++ b/ftplugin/logcheck.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/logcheck.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/logcheck.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/loginaccess.vim b/ftplugin/loginaccess.vim
index c2850aedf..c9834df29 100644
--- a/ftplugin/loginaccess.vim
+++ b/ftplugin/loginaccess.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/loginaccess.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/loginaccess.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/logindefs.vim b/ftplugin/logindefs.vim
index c917bfb69..97ba09fcc 100644
--- a/ftplugin/logindefs.vim
+++ b/ftplugin/logindefs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/logindefs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/logindefs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/logtalk.vim b/ftplugin/logtalk.vim
index 6310b4c41..b4b58d365 100644
--- a/ftplugin/logtalk.vim
+++ b/ftplugin/logtalk.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/logtalk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/logtalk.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/lprolog.vim b/ftplugin/lprolog.vim
index edf3c23ed..bdd1d5b10 100644
--- a/ftplugin/lprolog.vim
+++ b/ftplugin/lprolog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/lprolog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/lprolog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ls.vim b/ftplugin/ls.vim
index 87eee4ba1..eb3cc5170 100644
--- a/ftplugin/ls.vim
+++ b/ftplugin/ls.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ls.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ls.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/m4.vim b/ftplugin/m4.vim
index 12c53b2f9..7ead0f448 100644
--- a/ftplugin/m4.vim
+++ b/ftplugin/m4.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/m4.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/m4.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/mail.vim b/ftplugin/mail.vim
index 567bb6f03..0fd2e39d0 100644
--- a/ftplugin/mail.vim
+++ b/ftplugin/mail.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/mail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/mail.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/mailaliases.vim b/ftplugin/mailaliases.vim
index 9ac29c76c..ed8ed24c9 100644
--- a/ftplugin/mailaliases.vim
+++ b/ftplugin/mailaliases.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/mailaliases.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/mailaliases.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/mailcap.vim b/ftplugin/mailcap.vim
index 5da2d9570..c3f7d6659 100644
--- a/ftplugin/mailcap.vim
+++ b/ftplugin/mailcap.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/mailcap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/mailcap.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/make.vim b/ftplugin/make.vim
index 635c81264..a077f5215 100644
--- a/ftplugin/make.vim
+++ b/ftplugin/make.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/make.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/make.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/mako.vim b/ftplugin/mako.vim
index a25fedf24..48cc40a1d 100644
--- a/ftplugin/mako.vim
+++ b/ftplugin/mako.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/mako.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/mako.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/manconf.vim b/ftplugin/manconf.vim
index 255f4f322..34b0173bf 100644
--- a/ftplugin/manconf.vim
+++ b/ftplugin/manconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/manconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/manconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index 2936ac00e..4209f306d 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/markdown.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/markdown.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/meson.vim b/ftplugin/meson.vim
index eb3105b52..41daf3eeb 100644
--- a/ftplugin/meson.vim
+++ b/ftplugin/meson.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/meson.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/meson.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/mf.vim b/ftplugin/mf.vim
index 4f63dc03e..395ebe465 100644
--- a/ftplugin/mf.vim
+++ b/ftplugin/mf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/mf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/mf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/mma.vim b/ftplugin/mma.vim
index b22ce1c9e..c173a1a2b 100644
--- a/ftplugin/mma.vim
+++ b/ftplugin/mma.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/mma.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/mma.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/modconf.vim b/ftplugin/modconf.vim
index bf73a0cc3..121cf3f88 100644
--- a/ftplugin/modconf.vim
+++ b/ftplugin/modconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/modconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/modconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/moon.vim b/ftplugin/moon.vim
index 09e9c7bc1..997facd77 100644
--- a/ftplugin/moon.vim
+++ b/ftplugin/moon.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/moon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/moon.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/mp.vim b/ftplugin/mp.vim
index 2cf65bb19..18d539cbd 100644
--- a/ftplugin/mp.vim
+++ b/ftplugin/mp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/mp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/mp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/mplayerconf.vim b/ftplugin/mplayerconf.vim
index a251ebf2f..0a9a5b977 100644
--- a/ftplugin/mplayerconf.vim
+++ b/ftplugin/mplayerconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/mplayerconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/mplayerconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/mrxvtrc.vim b/ftplugin/mrxvtrc.vim
index bfe04c1cd..66ed311c9 100644
--- a/ftplugin/mrxvtrc.vim
+++ b/ftplugin/mrxvtrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/mrxvtrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/mrxvtrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/mustache.vim b/ftplugin/mustache.vim
index 349ec2368..c6d4b22d2 100644
--- a/ftplugin/mustache.vim
+++ b/ftplugin/mustache.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/mustache.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/mustache.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/muttrc.vim b/ftplugin/muttrc.vim
index ebe868069..6efb6fe2c 100644
--- a/ftplugin/muttrc.vim
+++ b/ftplugin/muttrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/muttrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/muttrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/nanorc.vim b/ftplugin/nanorc.vim
index 1363191c6..d496dbe4f 100644
--- a/ftplugin/nanorc.vim
+++ b/ftplugin/nanorc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/nanorc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/nanorc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/neomuttrc.vim b/ftplugin/neomuttrc.vim
index a63769cb5..ef375cbd7 100644
--- a/ftplugin/neomuttrc.vim
+++ b/ftplugin/neomuttrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/neomuttrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/neomuttrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/netrc.vim b/ftplugin/netrc.vim
index 071362e48..8f3ab865c 100644
--- a/ftplugin/netrc.vim
+++ b/ftplugin/netrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/netrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/netrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/nginx.vim b/ftplugin/nginx.vim
index 13a50b2a7..ac28682ba 100644
--- a/ftplugin/nginx.vim
+++ b/ftplugin/nginx.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/nginx.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/nginx.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/nix.vim b/ftplugin/nix.vim
index 7863be6d6..c54c8234e 100644
--- a/ftplugin/nix.vim
+++ b/ftplugin/nix.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/nix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/nix.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/nroff.vim b/ftplugin/nroff.vim
index 091fb018c..2487c4316 100644
--- a/ftplugin/nroff.vim
+++ b/ftplugin/nroff.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/nroff.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/nroff.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/nsis.vim b/ftplugin/nsis.vim
index edbe91920..eecf536f2 100644
--- a/ftplugin/nsis.vim
+++ b/ftplugin/nsis.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/nsis.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/nsis.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/oasis.vim b/ftplugin/oasis.vim
index 0b2150d5c..d8f3988c3 100644
--- a/ftplugin/oasis.vim
+++ b/ftplugin/oasis.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/oasis.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/oasis.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/objc.vim b/ftplugin/objc.vim
index 909a14424..6f690a032 100644
--- a/ftplugin/objc.vim
+++ b/ftplugin/objc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/objc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/objc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index 1c92e7d9e..c3d952de3 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ocaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ocaml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ocamlbuild_tags.vim b/ftplugin/ocamlbuild_tags.vim
index 373ee28fa..75167bf7a 100644
--- a/ftplugin/ocamlbuild_tags.vim
+++ b/ftplugin/ocamlbuild_tags.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ocamlbuild_tags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ocamlbuild_tags.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/occam.vim b/ftplugin/occam.vim
index e5bf6b854..4a6d6aa93 100644
--- a/ftplugin/occam.vim
+++ b/ftplugin/occam.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/occam.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/occam.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/omake.vim b/ftplugin/omake.vim
index c78d15d02..7b04a99a0 100644
--- a/ftplugin/omake.vim
+++ b/ftplugin/omake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/omake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/omake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/opencl.vim b/ftplugin/opencl.vim
index 39416e67b..93132f10e 100644
--- a/ftplugin/opencl.vim
+++ b/ftplugin/opencl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/opencl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/opencl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/pamconf.vim b/ftplugin/pamconf.vim
index 7628224b3..548c262ae 100644
--- a/ftplugin/pamconf.vim
+++ b/ftplugin/pamconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/pamconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/pamconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/pascal.vim b/ftplugin/pascal.vim
index f33a19460..828e8d1eb 100644
--- a/ftplugin/pascal.vim
+++ b/ftplugin/pascal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/pascal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/pascal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/passwd.vim b/ftplugin/passwd.vim
index 2e3ff2203..3116758cb 100644
--- a/ftplugin/passwd.vim
+++ b/ftplugin/passwd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/passwd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/passwd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/pdf.vim b/ftplugin/pdf.vim
index d2acbeafa..97d77debe 100644
--- a/ftplugin/pdf.vim
+++ b/ftplugin/pdf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/pdf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/pdf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/perl.vim b/ftplugin/perl.vim
index e95319cce..5018676bc 100644
--- a/ftplugin/perl.vim
+++ b/ftplugin/perl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/perl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/perl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/pinfo.vim b/ftplugin/pinfo.vim
index d76a1fedd..86746f326 100644
--- a/ftplugin/pinfo.vim
+++ b/ftplugin/pinfo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/pinfo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/pinfo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/plantuml.vim b/ftplugin/plantuml.vim
index acfd5e03c..1ab7da139 100644
--- a/ftplugin/plantuml.vim
+++ b/ftplugin/plantuml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/plantuml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/plantuml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/pony.vim b/ftplugin/pony.vim
index bf1311f85..dee95d8e9 100644
--- a/ftplugin/pony.vim
+++ b/ftplugin/pony.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/pony.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/pony.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/postscr.vim b/ftplugin/postscr.vim
index 5539b765a..666313930 100644
--- a/ftplugin/postscr.vim
+++ b/ftplugin/postscr.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/postscr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/postscr.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/procmail.vim b/ftplugin/procmail.vim
index 381269946..1c82967e1 100644
--- a/ftplugin/procmail.vim
+++ b/ftplugin/procmail.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/procmail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/procmail.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/prolog.vim b/ftplugin/prolog.vim
index 1b92ed90a..a2a506023 100644
--- a/ftplugin/prolog.vim
+++ b/ftplugin/prolog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/prolog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/prolog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/protocols.vim b/ftplugin/protocols.vim
index fa268d397..d8cd8f650 100644
--- a/ftplugin/protocols.vim
+++ b/ftplugin/protocols.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/protocols.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/protocols.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ps1.vim b/ftplugin/ps1.vim
index 5d1622c82..b6d98258e 100644
--- a/ftplugin/ps1.vim
+++ b/ftplugin/ps1.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ps1.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ps1.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ps1xml.vim b/ftplugin/ps1xml.vim
index a859e919b..c9efc5ae1 100644
--- a/ftplugin/ps1xml.vim
+++ b/ftplugin/ps1xml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ps1xml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ps1xml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/pug.vim b/ftplugin/pug.vim
index 7b58b2ed2..3237029c0 100644
--- a/ftplugin/pug.vim
+++ b/ftplugin/pug.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/pug.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/pug.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index 0b9bd72d5..427375089 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/puppet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/puppet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/puppet_tagbar.vim b/ftplugin/puppet_tagbar.vim
index 68240b516..84751db17 100644
--- a/ftplugin/puppet_tagbar.vim
+++ b/ftplugin/puppet_tagbar.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/puppet_tagbar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/puppet_tagbar.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim
index 96be330b5..b53af764d 100644
--- a/ftplugin/purescript.vim
+++ b/ftplugin/purescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/purescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/purescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/pyrex.vim b/ftplugin/pyrex.vim
index 02b106841..6e275e3ab 100644
--- a/ftplugin/pyrex.vim
+++ b/ftplugin/pyrex.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/pyrex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/pyrex.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/qml.vim b/ftplugin/qml.vim
index e61e983c4..982b9ac76 100644
--- a/ftplugin/qml.vim
+++ b/ftplugin/qml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/qml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/qml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/quake.vim b/ftplugin/quake.vim
index 44e8f4f31..e3601fc8d 100644
--- a/ftplugin/quake.vim
+++ b/ftplugin/quake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/quake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/quake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/racket.vim b/ftplugin/racket.vim
index caf377cd5..bc3d76c9a 100644
--- a/ftplugin/racket.vim
+++ b/ftplugin/racket.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/racket.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/racket.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/raku.vim b/ftplugin/raku.vim
index c16c536e6..a56385d12 100644
--- a/ftplugin/raku.vim
+++ b/ftplugin/raku.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/raku.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/raku.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/raml.vim b/ftplugin/raml.vim
index 7c83588ee..ec1a3c4a4 100644
--- a/ftplugin/raml.vim
+++ b/ftplugin/raml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/raml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/raml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/razor.vim b/ftplugin/razor.vim
index 8e6c86a59..8b2296220 100644
--- a/ftplugin/razor.vim
+++ b/ftplugin/razor.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/razor.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/razor.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/readline.vim b/ftplugin/readline.vim
index afb4d3a87..ea38cd55e 100644
--- a/ftplugin/readline.vim
+++ b/ftplugin/readline.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/readline.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/readline.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/reva.vim b/ftplugin/reva.vim
index 52665d598..d82461dcc 100644
--- a/ftplugin/reva.vim
+++ b/ftplugin/reva.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/reva.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/reva.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/rmd.vim b/ftplugin/rmd.vim
index e62efad6b..b6a16c8c9 100644
--- a/ftplugin/rmd.vim
+++ b/ftplugin/rmd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/rmd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/rmd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/rnc.vim b/ftplugin/rnc.vim
index 0ede84a33..4873a22d8 100644
--- a/ftplugin/rnc.vim
+++ b/ftplugin/rnc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/rnc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/rnc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/rnoweb.vim b/ftplugin/rnoweb.vim
index c04a9dc24..21efcbfee 100644
--- a/ftplugin/rnoweb.vim
+++ b/ftplugin/rnoweb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/rnoweb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/rnoweb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/rpl.vim b/ftplugin/rpl.vim
index 011bd9451..af3318490 100644
--- a/ftplugin/rpl.vim
+++ b/ftplugin/rpl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/rpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/rpl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/rrst.vim b/ftplugin/rrst.vim
index 95945a637..6c0d51d4c 100644
--- a/ftplugin/rrst.vim
+++ b/ftplugin/rrst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/rrst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/rrst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index d1d71c29e..791de7b90 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/rst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/rst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index c20a08b26..5a7c6e7d1 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/ruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/ruby.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim
index 408a9199c..780baf392 100644
--- a/ftplugin/rust.vim
+++ b/ftplugin/rust.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/rust.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/rust.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/rust/tagbar.vim b/ftplugin/rust/tagbar.vim
index 875b766a9..1301ca81d 100644
--- a/ftplugin/rust/tagbar.vim
+++ b/ftplugin/rust/tagbar.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/rust/tagbar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/rust/tagbar.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/sass.vim b/ftplugin/sass.vim
index a5b66a835..3f4acf6eb 100644
--- a/ftplugin/sass.vim
+++ b/ftplugin/sass.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/sass.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/sass.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/sbt.vim b/ftplugin/sbt.vim
index 017f63ab0..260360c7b 100644
--- a/ftplugin/sbt.vim
+++ b/ftplugin/sbt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/sbt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/sbt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index 0d569e107..c80daabb2 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/scala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/scala.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/scala.xpt.vim b/ftplugin/scala.xpt.vim
index b49230a18..9df57081d 100644
--- a/ftplugin/scala.xpt.vim
+++ b/ftplugin/scala.xpt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/scala.xpt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/scala.xpt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index a60bf2351..8236d737a 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/scala/tagbar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/scala/tagbar.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/scheme.vim b/ftplugin/scheme.vim
index 6b791eecf..68ad8c8bc 100644
--- a/ftplugin/scheme.vim
+++ b/ftplugin/scheme.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/scheme.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/scheme.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/screen.vim b/ftplugin/screen.vim
index 83e5f7e34..2acc4b870 100644
--- a/ftplugin/screen.vim
+++ b/ftplugin/screen.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/screen.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/screen.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim
index 55db812ad..abed20d5c 100644
--- a/ftplugin/scss.vim
+++ b/ftplugin/scss.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/scss.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/scss.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/sensors.vim b/ftplugin/sensors.vim
index cc91a810d..dba05b65b 100644
--- a/ftplugin/sensors.vim
+++ b/ftplugin/sensors.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/sensors.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/sensors.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/services.vim b/ftplugin/services.vim
index 2c0f414ad..c4aaec818 100644
--- a/ftplugin/services.vim
+++ b/ftplugin/services.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/services.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/services.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/setserial.vim b/ftplugin/setserial.vim
index 50560bfec..4d588ae37 100644
--- a/ftplugin/setserial.vim
+++ b/ftplugin/setserial.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/setserial.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/setserial.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/sexplib.vim b/ftplugin/sexplib.vim
index 8b4029e23..16af8a15b 100644
--- a/ftplugin/sexplib.vim
+++ b/ftplugin/sexplib.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/sexplib.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/sexplib.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/sieve.vim b/ftplugin/sieve.vim
index b5d363923..9f59d80fa 100644
--- a/ftplugin/sieve.vim
+++ b/ftplugin/sieve.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/sieve.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/sieve.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/slim.vim b/ftplugin/slim.vim
index e15389d98..184b54d33 100644
--- a/ftplugin/slim.vim
+++ b/ftplugin/slim.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/slim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/slim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/slpconf.vim b/ftplugin/slpconf.vim
index 1140f20bd..14fa54362 100644
--- a/ftplugin/slpconf.vim
+++ b/ftplugin/slpconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/slpconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/slpconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/slpreg.vim b/ftplugin/slpreg.vim
index ca09dfb58..e4b4580ed 100644
--- a/ftplugin/slpreg.vim
+++ b/ftplugin/slpreg.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/slpreg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/slpreg.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/slpspi.vim b/ftplugin/slpspi.vim
index ef4722c94..9a042d4f9 100644
--- a/ftplugin/slpspi.vim
+++ b/ftplugin/slpspi.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/slpspi.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/slpspi.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/smt2.vim b/ftplugin/smt2.vim
index b39fe64d4..86dfa7205 100644
--- a/ftplugin/smt2.vim
+++ b/ftplugin/smt2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/smt2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/smt2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/solidity.vim b/ftplugin/solidity.vim
index 853c53d2d..43bfb3f43 100644
--- a/ftplugin/solidity.vim
+++ b/ftplugin/solidity.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/solidity.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/solidity.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/spec.vim b/ftplugin/spec.vim
index 900b0e49e..772e218a7 100644
--- a/ftplugin/spec.vim
+++ b/ftplugin/spec.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/spec.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/spec.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/sql.vim b/ftplugin/sql.vim
index befd023b4..bd49428ae 100644
--- a/ftplugin/sql.vim
+++ b/ftplugin/sql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/sql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/sql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/sshconfig.vim b/ftplugin/sshconfig.vim
index 9519f30b6..3c7c13fc0 100644
--- a/ftplugin/sshconfig.vim
+++ b/ftplugin/sshconfig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/sshconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/sshconfig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/stylus.vim b/ftplugin/stylus.vim
index c39decc3c..b5c8aaee1 100644
--- a/ftplugin/stylus.vim
+++ b/ftplugin/stylus.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/stylus.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/stylus.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/sudoers.vim b/ftplugin/sudoers.vim
index 26ce58364..3a09305ff 100644
--- a/ftplugin/sudoers.vim
+++ b/ftplugin/sudoers.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/sudoers.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/sudoers.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/svelte.vim b/ftplugin/svelte.vim
index d8bd58d5f..a7037418a 100644
--- a/ftplugin/svelte.vim
+++ b/ftplugin/svelte.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/svelte.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/svelte.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/swift.vim b/ftplugin/swift.vim
index d1e1de898..798a6b19c 100644
--- a/ftplugin/swift.vim
+++ b/ftplugin/swift.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/swift.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/swift.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/swiftgyb.vim b/ftplugin/swiftgyb.vim
index 0870048ba..878491128 100644
--- a/ftplugin/swiftgyb.vim
+++ b/ftplugin/swiftgyb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/swiftgyb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/swiftgyb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/sysctl.vim b/ftplugin/sysctl.vim
index d8dca8590..87e08de28 100644
--- a/ftplugin/sysctl.vim
+++ b/ftplugin/sysctl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/sysctl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/sysctl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/systemd.vim b/ftplugin/systemd.vim
index ee05ed2a5..a4ff2eb13 100644
--- a/ftplugin/systemd.vim
+++ b/ftplugin/systemd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/systemd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/systemd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/systemverilog.vim b/ftplugin/systemverilog.vim
index 6b088c6cf..4a322e038 100644
--- a/ftplugin/systemverilog.vim
+++ b/ftplugin/systemverilog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/systemverilog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/systemverilog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/tablegen.vim b/ftplugin/tablegen.vim
index 04b8c4e60..88516995f 100644
--- a/ftplugin/tablegen.vim
+++ b/ftplugin/tablegen.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/tablegen.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/tablegen.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/tcl.vim b/ftplugin/tcl.vim
index c2dfd0354..e1a6bf3e3 100644
--- a/ftplugin/tcl.vim
+++ b/ftplugin/tcl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/tcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/tcl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/terminfo.vim b/ftplugin/terminfo.vim
index ab948691a..9150f8c9c 100644
--- a/ftplugin/terminfo.vim
+++ b/ftplugin/terminfo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/terminfo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/terminfo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index 8edc509d0..2f6122c29 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/terraform.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/terraform.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/tex.vim b/ftplugin/tex.vim
index b2ab45609..308b859a3 100644
--- a/ftplugin/tex.vim
+++ b/ftplugin/tex.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/tex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/tex.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/text.vim b/ftplugin/text.vim
index 7c13d82f1..58f151a80 100644
--- a/ftplugin/text.vim
+++ b/ftplugin/text.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/text.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/text.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/textile.vim b/ftplugin/textile.vim
index d260e848d..6799e23a3 100644
--- a/ftplugin/textile.vim
+++ b/ftplugin/textile.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/textile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/textile.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/tmux.vim b/ftplugin/tmux.vim
index 4965032b5..53aafc806 100644
--- a/ftplugin/tmux.vim
+++ b/ftplugin/tmux.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/tmux.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/tmux.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
index ce5a9fa19..9d489fbcd 100644
--- a/ftplugin/toml.vim
+++ b/ftplugin/toml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/toml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/toml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/treetop.vim b/ftplugin/treetop.vim
index 628bd8911..4069f641a 100644
--- a/ftplugin/treetop.vim
+++ b/ftplugin/treetop.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/treetop.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/treetop.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/tt2html.vim b/ftplugin/tt2html.vim
index 6fb150fc8..de8b63774 100644
--- a/ftplugin/tt2html.vim
+++ b/ftplugin/tt2html.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/tt2html.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/tt2html.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/twig.vim b/ftplugin/twig.vim
index ea10d3db9..52b14150e 100644
--- a/ftplugin/twig.vim
+++ b/ftplugin/twig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/twig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/twig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index b99f5d9bb..fa14101b3 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/typescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/typescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/typescriptreact.vim b/ftplugin/typescriptreact.vim
index a52ab70c9..159f91b05 100644
--- a/ftplugin/typescriptreact.vim
+++ b/ftplugin/typescriptreact.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/typescriptreact.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/typescriptreact.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/udevconf.vim b/ftplugin/udevconf.vim
index e554c90bc..ccfd7155c 100644
--- a/ftplugin/udevconf.vim
+++ b/ftplugin/udevconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/udevconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/udevconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/udevperm.vim b/ftplugin/udevperm.vim
index 7fde3445a..47e415558 100644
--- a/ftplugin/udevperm.vim
+++ b/ftplugin/udevperm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/udevperm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/udevperm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/updatedb.vim b/ftplugin/updatedb.vim
index 7dd6476f0..f3bf376b4 100644
--- a/ftplugin/updatedb.vim
+++ b/ftplugin/updatedb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/updatedb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/updatedb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/vala.vim b/ftplugin/vala.vim
index 88f9ea7c0..7c4fcddcf 100644
--- a/ftplugin/vala.vim
+++ b/ftplugin/vala.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/vala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/vala.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/vb.vim b/ftplugin/vb.vim
index f591072e5..2989165cc 100644
--- a/ftplugin/vb.vim
+++ b/ftplugin/vb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/vb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/vb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/verilog.vim b/ftplugin/verilog.vim
index ff1109e52..ed2fd707a 100644
--- a/ftplugin/verilog.vim
+++ b/ftplugin/verilog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/verilog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/verilog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/vhdl.vim b/ftplugin/vhdl.vim
index 31aded2b3..81c6cadf2 100644
--- a/ftplugin/vhdl.vim
+++ b/ftplugin/vhdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/vhdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/vhdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/vlang.vim b/ftplugin/vlang.vim
index 8c597249d..0a04d5ea9 100644
--- a/ftplugin/vlang.vim
+++ b/ftplugin/vlang.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/vlang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/vlang.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/vroom.vim b/ftplugin/vroom.vim
index 835f13144..d13b5fe51 100644
--- a/ftplugin/vroom.vim
+++ b/ftplugin/vroom.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/vroom.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/vroom.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/vue.vim b/ftplugin/vue.vim
index e5bb5e43c..36e5293cb 100644
--- a/ftplugin/vue.vim
+++ b/ftplugin/vue.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/vue.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/vue.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/wast.vim b/ftplugin/wast.vim
index 7936da974..f6a103c7a 100644
--- a/ftplugin/wast.vim
+++ b/ftplugin/wast.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/wast.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/wast.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/xdefaults.vim b/ftplugin/xdefaults.vim
index 83fa9f91e..9431ee402 100644
--- a/ftplugin/xdefaults.vim
+++ b/ftplugin/xdefaults.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/xdefaults.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/xdefaults.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/xf86conf.vim b/ftplugin/xf86conf.vim
index 839dfaac9..d44adb27c 100644
--- a/ftplugin/xf86conf.vim
+++ b/ftplugin/xf86conf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/xf86conf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/xf86conf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/xhtml.vim b/ftplugin/xhtml.vim
index 68151ffbd..48c5ee71e 100644
--- a/ftplugin/xhtml.vim
+++ b/ftplugin/xhtml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/xhtml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/xhtml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/xinetd.vim b/ftplugin/xinetd.vim
index 25af06077..f0e459d56 100644
--- a/ftplugin/xinetd.vim
+++ b/ftplugin/xinetd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/xinetd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/xinetd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/xmodmap.vim b/ftplugin/xmodmap.vim
index e787380bb..7a2216a2f 100644
--- a/ftplugin/xmodmap.vim
+++ b/ftplugin/xmodmap.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/xmodmap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/xmodmap.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/xs.vim b/ftplugin/xs.vim
index 95d8a2283..0ebb13da2 100644
--- a/ftplugin/xs.vim
+++ b/ftplugin/xs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/xs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/xs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/xsd.vim b/ftplugin/xsd.vim
index f53f5bacd..6b58eb295 100644
--- a/ftplugin/xsd.vim
+++ b/ftplugin/xsd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/xsd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/xsd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/xslt.vim b/ftplugin/xslt.vim
index 76735f0a0..b4109e578 100644
--- a/ftplugin/xslt.vim
+++ b/ftplugin/xslt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/xslt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/xslt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim
index 44f716bff..5675a9e93 100644
--- a/ftplugin/yaml.vim
+++ b/ftplugin/yaml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/yaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/yaml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index 50f3aecdf..79d177e24 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/zig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/zig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/ftplugin/zimbu.vim b/ftplugin/zimbu.vim
index 6af9be4f0..d62996855 100644
--- a/ftplugin/zimbu.vim
+++ b/ftplugin/zimbu.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'ftplugin/zimbu.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'ftplugin/zimbu.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/Jenkinsfile.vim b/indent/Jenkinsfile.vim
index 286024798..438d69911 100644
--- a/indent/Jenkinsfile.vim
+++ b/indent/Jenkinsfile.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/Jenkinsfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/Jenkinsfile.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/aap.vim b/indent/aap.vim
index 41140acef..799112c86 100644
--- a/indent/aap.vim
+++ b/indent/aap.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/aap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/aap.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ada.vim b/indent/ada.vim
index 249c7afa3..3240a7958 100644
--- a/indent/ada.vim
+++ b/indent/ada.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ada.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/ada.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ansible.vim b/indent/ansible.vim
index 2632f8936..6686d9ab7 100644
--- a/indent/ansible.vim
+++ b/indent/ansible.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ansible.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/ansible.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ant.vim b/indent/ant.vim
index fc948477c..d0af9c745 100644
--- a/indent/ant.vim
+++ b/indent/ant.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ant.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/ant.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/applescript.vim b/indent/applescript.vim
index d58e92ccc..0e31d286e 100644
--- a/indent/applescript.vim
+++ b/indent/applescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/applescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/applescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/arduino.vim b/indent/arduino.vim
index a265ea02e..90c72c7c5 100644
--- a/indent/arduino.vim
+++ b/indent/arduino.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/arduino.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/arduino.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/autohotkey.vim b/indent/autohotkey.vim
index 1d0a09367..354ceeb93 100644
--- a/indent/autohotkey.vim
+++ b/indent/autohotkey.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/autohotkey.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/autohotkey.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/automake.vim b/indent/automake.vim
index 27272c5eb..4bded6f79 100644
--- a/indent/automake.vim
+++ b/indent/automake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/automake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/automake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/awk.vim b/indent/awk.vim
index 17082d356..5e802ecdd 100644
--- a/indent/awk.vim
+++ b/indent/awk.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/awk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/awk.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/bib.vim b/indent/bib.vim
index 802fa6889..619859fc5 100644
--- a/indent/bib.vim
+++ b/indent/bib.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/bib.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/bib.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/blade.vim b/indent/blade.vim
index 0ab2e45c1..efdecf321 100644
--- a/indent/blade.vim
+++ b/indent/blade.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/blade.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/blade.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/bst.vim b/indent/bst.vim
index ac2f9bfea..adc852ae5 100644
--- a/indent/bst.vim
+++ b/indent/bst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/bst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/bst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/bzl.vim b/indent/bzl.vim
index deea163ca..e41ba9c99 100644
--- a/indent/bzl.vim
+++ b/indent/bzl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/bzl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/bzl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cabal.vim b/indent/cabal.vim
index b81a82777..1698e16d4 100644
--- a/indent/cabal.vim
+++ b/indent/cabal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cabal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/cabal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/caddyfile.vim b/indent/caddyfile.vim
index b3a5c20e2..11980473e 100644
--- a/indent/caddyfile.vim
+++ b/indent/caddyfile.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/caddyfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/caddyfile.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cdl.vim b/indent/cdl.vim
index 8f9ded852..3f69f349e 100644
--- a/indent/cdl.vim
+++ b/indent/cdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/cdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ch.vim b/indent/ch.vim
index 023fff0a9..0b606769f 100644
--- a/indent/ch.vim
+++ b/indent/ch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/ch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/chaiscript.vim b/indent/chaiscript.vim
index 367f462cd..967f4ce0b 100644
--- a/indent/chaiscript.vim
+++ b/indent/chaiscript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/chaiscript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/chaiscript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 2b06814c4..c2dd0cdcc 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/clojure.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/clojure.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cmake.vim b/indent/cmake.vim
index dd7cd9b4a..30af204e8 100644
--- a/indent/cmake.vim
+++ b/indent/cmake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cmake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/cmake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cobol.vim b/indent/cobol.vim
index 9d17a6f73..e09bc85b7 100644
--- a/indent/cobol.vim
+++ b/indent/cobol.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cobol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/cobol.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/coffee.vim b/indent/coffee.vim
index 790bc2ce4..dca66e4e6 100644
--- a/indent/coffee.vim
+++ b/indent/coffee.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/coffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/coffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/config.vim b/indent/config.vim
index 73d5c09c5..4a500a02c 100644
--- a/indent/config.vim
+++ b/indent/config.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/config.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/crystal.vim b/indent/crystal.vim
index 3c554a3f7..c405f3584 100644
--- a/indent/crystal.vim
+++ b/indent/crystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/crystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/crystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cs.vim b/indent/cs.vim
index fd8f49de1..dad26529c 100644
--- a/indent/cs.vim
+++ b/indent/cs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/cs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/css.vim b/indent/css.vim
index 5b8dc7d2f..331317470 100644
--- a/indent/css.vim
+++ b/indent/css.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/css.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/css.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cucumber.vim b/indent/cucumber.vim
index a564e254c..52fad8488 100644
--- a/indent/cucumber.vim
+++ b/indent/cucumber.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cucumber.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/cucumber.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cuda.vim b/indent/cuda.vim
index 696843635..c878c4722 100644
--- a/indent/cuda.vim
+++ b/indent/cuda.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cuda.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/cuda.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/cython.vim b/indent/cython.vim
index 39bc24da8..c8b0e997e 100644
--- a/indent/cython.vim
+++ b/indent/cython.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/cython.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/cython.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/d.vim b/indent/d.vim
index 8fff519e1..7a0a195d7 100644
--- a/indent/d.vim
+++ b/indent/d.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/d.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/d.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dart.vim b/indent/dart.vim
index 87b3bbefc..aa9d99f93 100644
--- a/indent/dart.vim
+++ b/indent/dart.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dart.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/dart.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dictconf.vim b/indent/dictconf.vim
index d2035d80c..478d2b4c7 100644
--- a/indent/dictconf.vim
+++ b/indent/dictconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dictconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/dictconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dictdconf.vim b/indent/dictdconf.vim
index 891334e9b..fc9489393 100644
--- a/indent/dictdconf.vim
+++ b/indent/dictdconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dictdconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/dictdconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dosbatch.vim b/indent/dosbatch.vim
index 1baee7196..60949ddaa 100644
--- a/indent/dosbatch.vim
+++ b/indent/dosbatch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dosbatch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/dosbatch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dtd.vim b/indent/dtd.vim
index 9c035ee5d..7dfe14db5 100644
--- a/indent/dtd.vim
+++ b/indent/dtd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dtd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/dtd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dune.vim b/indent/dune.vim
index a0b2c3c36..563ed1989 100644
--- a/indent/dune.vim
+++ b/indent/dune.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dune.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/dune.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/dylan.vim b/indent/dylan.vim
index 39fc58300..f5a9c835a 100644
--- a/indent/dylan.vim
+++ b/indent/dylan.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/dylan.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/dylan.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ecrystal.vim b/indent/ecrystal.vim
index 8bd3580e4..2bca7b1b0 100644
--- a/indent/ecrystal.vim
+++ b/indent/ecrystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ecrystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/ecrystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/eelixir.vim b/indent/eelixir.vim
index cf0b54614..f45af4934 100644
--- a/indent/eelixir.vim
+++ b/indent/eelixir.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/eelixir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/eelixir.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/elixir.vim b/indent/elixir.vim
index 762516c70..a2854f172 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/elixir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/elixir.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/elm.vim b/indent/elm.vim
index a29a253e0..731f8f875 100644
--- a/indent/elm.vim
+++ b/indent/elm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/elm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/elm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ember-script.vim b/indent/ember-script.vim
index 465952155..de519c348 100644
--- a/indent/ember-script.vim
+++ b/indent/ember-script.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ember-script.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/ember-script.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/emblem.vim b/indent/emblem.vim
index ba4673b1f..7653e6fb2 100644
--- a/indent/emblem.vim
+++ b/indent/emblem.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/emblem.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/emblem.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/erlang.vim b/indent/erlang.vim
index 537b52f56..b66ccd592 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/erlang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/erlang.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/eruby.vim b/indent/eruby.vim
index 16f4b8f5a..7ba4bf526 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/eruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/eruby.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/eterm.vim b/indent/eterm.vim
index 87a3cd890..e0b391ef7 100644
--- a/indent/eterm.vim
+++ b/indent/eterm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/eterm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/eterm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/falcon.vim b/indent/falcon.vim
index 388a508c9..bdd716a26 100644
--- a/indent/falcon.vim
+++ b/indent/falcon.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/falcon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/falcon.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/fennel.vim b/indent/fennel.vim
index 9a85f3b20..cddb58271 100644
--- a/indent/fennel.vim
+++ b/indent/fennel.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/fennel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/fennel.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/fish.vim b/indent/fish.vim
index a5e2ab07b..f62375fb1 100644
--- a/indent/fish.vim
+++ b/indent/fish.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/fish.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/fish.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/fortran.vim b/indent/fortran.vim
index f56af8eee..cb00f26dd 100644
--- a/indent/fortran.vim
+++ b/indent/fortran.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/fortran.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/fortran.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/framescript.vim b/indent/framescript.vim
index ae2a2026f..de80fd70f 100644
--- a/indent/framescript.vim
+++ b/indent/framescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/framescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/framescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/fsharp.vim b/indent/fsharp.vim
index e743cfb38..cb4af8cc6 100644
--- a/indent/fsharp.vim
+++ b/indent/fsharp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/fsharp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/fsharp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/gdscript3.vim b/indent/gdscript3.vim
index f481ef716..7fb7c84f9 100644
--- a/indent/gdscript3.vim
+++ b/indent/gdscript3.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/gdscript3.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/gdscript3.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/gitconfig.vim b/indent/gitconfig.vim
index 4eb4b0e75..8155b3c7f 100644
--- a/indent/gitconfig.vim
+++ b/indent/gitconfig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/gitconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/gitconfig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/gitolite.vim b/indent/gitolite.vim
index 6a990ec6b..d0f3e820e 100644
--- a/indent/gitolite.vim
+++ b/indent/gitolite.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/gitolite.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/gitolite.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/glsl.vim b/indent/glsl.vim
index 34437a031..442db43d3 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/glsl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/glsl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/go.vim b/indent/go.vim
index 2ab791435..a70243ad9 100644
--- a/indent/go.vim
+++ b/indent/go.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/go.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/go.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/gohtmltmpl.vim b/indent/gohtmltmpl.vim
index f389cf355..ca2ad0609 100644
--- a/indent/gohtmltmpl.vim
+++ b/indent/gohtmltmpl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/gohtmltmpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/gohtmltmpl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/graphql.vim b/indent/graphql.vim
index 6612527b0..713381cb7 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/graphql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/graphql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/haml.vim b/indent/haml.vim
index 3b00ccb2c..8597f60db 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/haml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/haml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/hamster.vim b/indent/hamster.vim
index 0ec5252fa..2edb2e733 100644
--- a/indent/hamster.vim
+++ b/indent/hamster.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/hamster.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/hamster.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/handlebars.vim b/indent/handlebars.vim
index 77780ef7a..a2a9e4e37 100644
--- a/indent/handlebars.vim
+++ b/indent/handlebars.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/handlebars.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/handlebars.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/haskell.vim b/indent/haskell.vim
index 5267f3f34..7f4d4a966 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/haskell.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/haskell.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/hcl.vim b/indent/hcl.vim
index 7c054c83e..e193b83b5 100644
--- a/indent/hcl.vim
+++ b/indent/hcl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/hcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/hcl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/hog.vim b/indent/hog.vim
index 1fb5845eb..3280d67d7 100644
--- a/indent/hog.vim
+++ b/indent/hog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/hog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/hog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/html.vim b/indent/html.vim
index e3cac3104..c89222783 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/html.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/html.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/htmldjango.vim b/indent/htmldjango.vim
index 176546629..5e3b7fd11 100644
--- a/indent/htmldjango.vim
+++ b/indent/htmldjango.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/htmldjango.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/htmldjango.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/idris.vim b/indent/idris.vim
index 97e5386e9..f3884f124 100644
--- a/indent/idris.vim
+++ b/indent/idris.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/idris.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/idris.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/idris2.vim b/indent/idris2.vim
index 0870c3b8b..f2ea6e31d 100644
--- a/indent/idris2.vim
+++ b/indent/idris2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/idris2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/idris2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/j.vim b/indent/j.vim
index fdf4df814..dbea206c2 100644
--- a/indent/j.vim
+++ b/indent/j.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/j.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/j.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/java.vim b/indent/java.vim
index 67bdec6f7..06a20d7a6 100644
--- a/indent/java.vim
+++ b/indent/java.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/java.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/java.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/javascript.vim b/indent/javascript.vim
index bb19347cd..65acc8df8 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/javascript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/javascript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/json.vim b/indent/json.vim
index 62da1d7b8..71b269e73 100644
--- a/indent/json.vim
+++ b/indent/json.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/json.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/json.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/jsp.vim b/indent/jsp.vim
index cb7dd66c8..0cbfc2ee1 100644
--- a/indent/jsp.vim
+++ b/indent/jsp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/jsp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/jsp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/jst.vim b/indent/jst.vim
index 006bcf204..4920d6d7c 100644
--- a/indent/jst.vim
+++ b/indent/jst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/jst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/jst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/julia.vim b/indent/julia.vim
index 8b65d4a92..2db6fabab 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/julia.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/julia.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/kotlin.vim b/indent/kotlin.vim
index fca5e30d9..fdb8891c3 100644
--- a/indent/kotlin.vim
+++ b/indent/kotlin.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/kotlin.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/kotlin.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ld.vim b/indent/ld.vim
index 6b153d3be..9d671e54f 100644
--- a/indent/ld.vim
+++ b/indent/ld.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ld.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/ld.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ledger.vim b/indent/ledger.vim
index 6cb481554..a79be9c18 100644
--- a/indent/ledger.vim
+++ b/indent/ledger.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ledger.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/ledger.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/less.vim b/indent/less.vim
index 4c71822a1..45276bea1 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/less.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/less.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/lifelines.vim b/indent/lifelines.vim
index f6c540f61..3da037d15 100644
--- a/indent/lifelines.vim
+++ b/indent/lifelines.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/lifelines.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/lifelines.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/lilypond.vim b/indent/lilypond.vim
index ec62de557..792ffbbf2 100644
--- a/indent/lilypond.vim
+++ b/indent/lilypond.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/lilypond.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/lilypond.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/liquid.vim b/indent/liquid.vim
index b922e162a..5c0ba0209 100644
--- a/indent/liquid.vim
+++ b/indent/liquid.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/liquid.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/liquid.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/lisp.vim b/indent/lisp.vim
index 466928dc9..d920cf9ee 100644
--- a/indent/lisp.vim
+++ b/indent/lisp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/lisp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/lisp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/litcoffee.vim b/indent/litcoffee.vim
index b75f93ac1..c7d3d29be 100644
--- a/indent/litcoffee.vim
+++ b/indent/litcoffee.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/litcoffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/litcoffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/llvm.vim b/indent/llvm.vim
index 344430806..d57b3a125 100644
--- a/indent/llvm.vim
+++ b/indent/llvm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/llvm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/llvm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/logtalk.vim b/indent/logtalk.vim
index 437de8635..843dcc23a 100644
--- a/indent/logtalk.vim
+++ b/indent/logtalk.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/logtalk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/logtalk.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ls.vim b/indent/ls.vim
index fe959f3e5..41ebcac57 100644
--- a/indent/ls.vim
+++ b/indent/ls.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ls.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/ls.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/lua.vim b/indent/lua.vim
index e86c1b8d9..f4bc40f06 100644
--- a/indent/lua.vim
+++ b/indent/lua.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/lua.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/lua.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/mail.vim b/indent/mail.vim
index ff3f67a96..462bd9471 100644
--- a/indent/mail.vim
+++ b/indent/mail.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/mail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/mail.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/make.vim b/indent/make.vim
index 66553b2b2..f7aabdc59 100644
--- a/indent/make.vim
+++ b/indent/make.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/make.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/make.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/mako.vim b/indent/mako.vim
index 12dc3f0d3..27a09b051 100644
--- a/indent/mako.vim
+++ b/indent/mako.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/mako.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/mako.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/markdown.vim b/indent/markdown.vim
index 927e5ed70..0e0ff248a 100644
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/markdown.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/markdown.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/meson.vim b/indent/meson.vim
index 26dd22c33..6e055c7fc 100644
--- a/indent/meson.vim
+++ b/indent/meson.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/meson.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/meson.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/mf.vim b/indent/mf.vim
index 4bf6501ed..a0158dd15 100644
--- a/indent/mf.vim
+++ b/indent/mf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/mf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/mf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/moon.vim b/indent/moon.vim
index 202d2de61..d5c55ec4e 100644
--- a/indent/moon.vim
+++ b/indent/moon.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/moon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/moon.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/mp.vim b/indent/mp.vim
index d48e8ac4d..45f15f64a 100644
--- a/indent/mp.vim
+++ b/indent/mp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/mp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/mp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/mustache.vim b/indent/mustache.vim
index 05c58d365..f546461c7 100644
--- a/indent/mustache.vim
+++ b/indent/mustache.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/mustache.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/mustache.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/nginx.vim b/indent/nginx.vim
index 1dd748d17..c797da451 100644
--- a/indent/nginx.vim
+++ b/indent/nginx.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/nginx.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/nginx.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/nim.vim b/indent/nim.vim
index c4cc7e982..9a3e62f31 100644
--- a/indent/nim.vim
+++ b/indent/nim.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/nim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/nim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/nix.vim b/indent/nix.vim
index 7b3f3defa..15465a0ef 100644
--- a/indent/nix.vim
+++ b/indent/nix.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/nix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/nix.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/nsis.vim b/indent/nsis.vim
index d6aef5c06..61b29b4a0 100644
--- a/indent/nsis.vim
+++ b/indent/nsis.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/nsis.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/nsis.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index 1d4e2f669..d7a89a61c 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ocaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/ocaml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/occam.vim b/indent/occam.vim
index 06c9face3..d6fefc76d 100644
--- a/indent/occam.vim
+++ b/indent/occam.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/occam.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/occam.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/octave.vim b/indent/octave.vim
index ce6c6952b..f15e67455 100644
--- a/indent/octave.vim
+++ b/indent/octave.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/octave.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/octave.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/odin.vim b/indent/odin.vim
index 6cd93a9ac..5c94c67da 100644
--- a/indent/odin.vim
+++ b/indent/odin.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/odin.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/odin.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/omake.vim b/indent/omake.vim
index b5cc828cc..87ace1771 100644
--- a/indent/omake.vim
+++ b/indent/omake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/omake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/omake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/opencl.vim b/indent/opencl.vim
index 5c30574bb..6914df5fe 100644
--- a/indent/opencl.vim
+++ b/indent/opencl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/opencl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/opencl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/pascal.vim b/indent/pascal.vim
index 92177246e..f07cb0e4d 100644
--- a/indent/pascal.vim
+++ b/indent/pascal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/pascal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/pascal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/perl.vim b/indent/perl.vim
index d40e36298..4c671bc3b 100644
--- a/indent/perl.vim
+++ b/indent/perl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/perl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/perl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/pgsql.vim b/indent/pgsql.vim
index a0ece225b..ac967355a 100644
--- a/indent/pgsql.vim
+++ b/indent/pgsql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/pgsql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/pgsql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index 414ea9893..c0f3065b7 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/plantuml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/plantuml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/pony.vim b/indent/pony.vim
index 32a4c1078..51f668de2 100644
--- a/indent/pony.vim
+++ b/indent/pony.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/pony.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/pony.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/postscr.vim b/indent/postscr.vim
index 1f8e563c2..897976485 100644
--- a/indent/postscr.vim
+++ b/indent/postscr.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/postscr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/postscr.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/pov.vim b/indent/pov.vim
index 747a21358..1964b7b80 100644
--- a/indent/pov.vim
+++ b/indent/pov.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/pov.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/pov.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/prolog.vim b/indent/prolog.vim
index e4eb14dcb..cb97bf863 100644
--- a/indent/prolog.vim
+++ b/indent/prolog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/prolog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/prolog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/proto.vim b/indent/proto.vim
index d932d146d..8bf583622 100644
--- a/indent/proto.vim
+++ b/indent/proto.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/proto.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/proto.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ps1.vim b/indent/ps1.vim
index da13602a5..92222de8d 100644
--- a/indent/ps1.vim
+++ b/indent/ps1.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ps1.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/ps1.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/pug.vim b/indent/pug.vim
index 175abe39a..d0aadb622 100644
--- a/indent/pug.vim
+++ b/indent/pug.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/pug.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/pug.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/puppet.vim b/indent/puppet.vim
index 8a5366908..321bf9f85 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/puppet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/puppet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/purescript.vim b/indent/purescript.vim
index fb83604d5..fc6e2a26a 100644
--- a/indent/purescript.vim
+++ b/indent/purescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/purescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/purescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/pyrex.vim b/indent/pyrex.vim
index 9440efebe..061b71a85 100644
--- a/indent/pyrex.vim
+++ b/indent/pyrex.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/pyrex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/pyrex.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/python.vim b/indent/python.vim
index 8128d26c9..8e2ea0d7a 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/python.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/python.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/qml.vim b/indent/qml.vim
index 5d02a475a..944e72f23 100644
--- a/indent/qml.vim
+++ b/indent/qml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/qml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/qml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/racket.vim b/indent/racket.vim
index 966bb8ce0..626dde522 100644
--- a/indent/racket.vim
+++ b/indent/racket.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/racket.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/racket.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/raku.vim b/indent/raku.vim
index ef3976aff..052693cfa 100644
--- a/indent/raku.vim
+++ b/indent/raku.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/raku.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/raku.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/razor.vim b/indent/razor.vim
index 8465fb7f0..e35688e4c 100644
--- a/indent/razor.vim
+++ b/indent/razor.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/razor.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/razor.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/readline.vim b/indent/readline.vim
index 9aa70349b..53ef6f217 100644
--- a/indent/readline.vim
+++ b/indent/readline.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/readline.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/readline.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/reason.vim b/indent/reason.vim
index 11a6c4e01..490cdeafe 100644
--- a/indent/reason.vim
+++ b/indent/reason.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/reason.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/reason.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/rmd.vim b/indent/rmd.vim
index e52686b47..d95e442a3 100644
--- a/indent/rmd.vim
+++ b/indent/rmd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/rmd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/rmd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/rnoweb.vim b/indent/rnoweb.vim
index 54e7dab2a..4473d32d9 100644
--- a/indent/rnoweb.vim
+++ b/indent/rnoweb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/rnoweb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/rnoweb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/rpl.vim b/indent/rpl.vim
index bc674b4d2..f5df9afb1 100644
--- a/indent/rpl.vim
+++ b/indent/rpl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/rpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/rpl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/rrst.vim b/indent/rrst.vim
index 32fd82d35..5b3187b64 100644
--- a/indent/rrst.vim
+++ b/indent/rrst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/rrst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/rrst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/rst.vim b/indent/rst.vim
index 82e6a8124..2585df03b 100644
--- a/indent/rst.vim
+++ b/indent/rst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/rst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/rst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/ruby.vim b/indent/ruby.vim
index 37363d9f0..56a348a7f 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/ruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/ruby.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/rust.vim b/indent/rust.vim
index 69fdb0784..7f0fff27d 100644
--- a/indent/rust.vim
+++ b/indent/rust.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/rust.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/rust.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/sas.vim b/indent/sas.vim
index 4eac68cb9..671e213c9 100644
--- a/indent/sas.vim
+++ b/indent/sas.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/sas.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/sas.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/sass.vim b/indent/sass.vim
index d59a1abae..b3002bef7 100644
--- a/indent/sass.vim
+++ b/indent/sass.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/sass.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/sass.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/scala.vim b/indent/scala.vim
index f29f80b8f..62d677207 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/scala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/scala.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/scheme.vim b/indent/scheme.vim
index 1524ce887..2e0c747b7 100644
--- a/indent/scheme.vim
+++ b/indent/scheme.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/scheme.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/scheme.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/scss.vim b/indent/scss.vim
index c955aeb92..8d302d30d 100644
--- a/indent/scss.vim
+++ b/indent/scss.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/scss.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/scss.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/sdl.vim b/indent/sdl.vim
index eb6b783fb..3083b048f 100644
--- a/indent/sdl.vim
+++ b/indent/sdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/sdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/sdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/slim.vim b/indent/slim.vim
index 5c10c83c1..742834e0e 100644
--- a/indent/slim.vim
+++ b/indent/slim.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/slim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/slim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/slime.vim b/indent/slime.vim
index 366ad4e0f..77b902a24 100644
--- a/indent/slime.vim
+++ b/indent/slime.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/slime.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/slime.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/sml.vim b/indent/sml.vim
index b1d15bc1d..f36bac6c8 100644
--- a/indent/sml.vim
+++ b/indent/sml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/sml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/sml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/solidity.vim b/indent/solidity.vim
index a3c9b45d1..638a3239a 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/solidity.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/solidity.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/sql.vim b/indent/sql.vim
index 49b2a638c..82667f5a0 100644
--- a/indent/sql.vim
+++ b/indent/sql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/sql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/sql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/sshconfig.vim b/indent/sshconfig.vim
index a0d7f7d26..aedb02184 100644
--- a/indent/sshconfig.vim
+++ b/indent/sshconfig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/sshconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/sshconfig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/stylus.vim b/indent/stylus.vim
index 584f4de51..c89dafb30 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/stylus.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/stylus.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/svelte.vim b/indent/svelte.vim
index 00e65db67..599023a0d 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/svelte.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/svelte.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/svg.vim b/indent/svg.vim
index 5bf84360a..2057c3efe 100644
--- a/indent/svg.vim
+++ b/indent/svg.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/svg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/svg.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/swift.vim b/indent/swift.vim
index dc09cc5d0..48efb3549 100644
--- a/indent/swift.vim
+++ b/indent/swift.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/swift.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/swift.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/systemverilog.vim b/indent/systemverilog.vim
index 015a60ddc..a5c423b25 100644
--- a/indent/systemverilog.vim
+++ b/indent/systemverilog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/systemverilog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/systemverilog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/tcl.vim b/indent/tcl.vim
index be81acbd3..0eedaa29e 100644
--- a/indent/tcl.vim
+++ b/indent/tcl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/tcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/tcl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/teraterm.vim b/indent/teraterm.vim
index c55127b6d..c0e6d131b 100644
--- a/indent/teraterm.vim
+++ b/indent/teraterm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/teraterm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/teraterm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/terraform.vim b/indent/terraform.vim
index d0358e3d8..9639d47c0 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/terraform.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/terraform.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/tex.vim b/indent/tex.vim
index 71aea3f30..4da631a2c 100644
--- a/indent/tex.vim
+++ b/indent/tex.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/tex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/tex.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/tf.vim b/indent/tf.vim
index 0f388869a..096b1977e 100644
--- a/indent/tf.vim
+++ b/indent/tf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/tf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/tf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/tilde.vim b/indent/tilde.vim
index 30551dd35..b412a64bf 100644
--- a/indent/tilde.vim
+++ b/indent/tilde.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/tilde.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/tilde.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/treetop.vim b/indent/treetop.vim
index 1c5658469..01b80d68a 100644
--- a/indent/treetop.vim
+++ b/indent/treetop.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/treetop.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/treetop.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/twig.vim b/indent/twig.vim
index 0f52b6b0b..d9472ea47 100644
--- a/indent/twig.vim
+++ b/indent/twig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/twig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/twig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/typescript.vim b/indent/typescript.vim
index 53f716d2f..a95779065 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/typescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/typescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/typescriptreact.vim b/indent/typescriptreact.vim
index 52bb0eda1..a89ae88d1 100644
--- a/indent/typescriptreact.vim
+++ b/indent/typescriptreact.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/typescriptreact.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/typescriptreact.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/vala.vim b/indent/vala.vim
index ecf4cc296..cbcfbf2c5 100644
--- a/indent/vala.vim
+++ b/indent/vala.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/vala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/vala.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/vb.vim b/indent/vb.vim
index d4eaa2ec7..5e37b74e8 100644
--- a/indent/vb.vim
+++ b/indent/vb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/vb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/vb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/velocity.vim b/indent/velocity.vim
index 43015f067..ba1344bf3 100644
--- a/indent/velocity.vim
+++ b/indent/velocity.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/velocity.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/velocity.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/verilog.vim b/indent/verilog.vim
index 9e6fcddc9..02ed70a2f 100644
--- a/indent/verilog.vim
+++ b/indent/verilog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/verilog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/verilog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/vhdl.vim b/indent/vhdl.vim
index 55e8974ae..c129a7636 100644
--- a/indent/vhdl.vim
+++ b/indent/vhdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/vhdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/vhdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/vlang.vim b/indent/vlang.vim
index bfff3d37a..c5b9660a5 100644
--- a/indent/vlang.vim
+++ b/indent/vlang.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/vlang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/vlang.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/vroom.vim b/indent/vroom.vim
index 40ee746b2..832019d30 100644
--- a/indent/vroom.vim
+++ b/indent/vroom.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/vroom.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/vroom.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/vue.vim b/indent/vue.vim
index 41b8051b5..e53a528b3 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/vue.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/vue.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/wast.vim b/indent/wast.vim
index 870874c6d..52cb7ab6d 100644
--- a/indent/wast.vim
+++ b/indent/wast.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/wast.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/wast.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/xf86conf.vim b/indent/xf86conf.vim
index 7d1ccbe49..7932c428a 100644
--- a/indent/xf86conf.vim
+++ b/indent/xf86conf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/xf86conf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/xf86conf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/xhtml.vim b/indent/xhtml.vim
index 2f95f5926..7134ac81f 100644
--- a/indent/xhtml.vim
+++ b/indent/xhtml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/xhtml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/xhtml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/xinetd.vim b/indent/xinetd.vim
index 2056eb504..e2898b2d6 100644
--- a/indent/xinetd.vim
+++ b/indent/xinetd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/xinetd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/xinetd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/xsd.vim b/indent/xsd.vim
index bb0051f1a..685f44e13 100644
--- a/indent/xsd.vim
+++ b/indent/xsd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/xsd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/xsd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/xslt.vim b/indent/xslt.vim
index f86604316..d111bfba8 100644
--- a/indent/xslt.vim
+++ b/indent/xslt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/xslt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/xslt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/yacc.vim b/indent/yacc.vim
index c42be8bd1..c4b164026 100644
--- a/indent/yacc.vim
+++ b/indent/yacc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/yacc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/yacc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/yaml.vim b/indent/yaml.vim
index 7bb1c7da4..3fb7dcc9f 100644
--- a/indent/yaml.vim
+++ b/indent/yaml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/yaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/yaml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/zig.vim b/indent/zig.vim
index 3ce6b88c0..3f9d590f0 100644
--- a/indent/zig.vim
+++ b/indent/zig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/zig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/zig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/indent/zimbu.vim b/indent/zimbu.vim
index 593a65576..987b47274 100644
--- a/indent/zimbu.vim
+++ b/indent/zimbu.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'indent/zimbu.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'indent/zimbu.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/scripts/build b/scripts/build
index 7d678e434..86237647e 100755
--- a/scripts/build
+++ b/scripts/build
@@ -295,7 +295,9 @@ def copy_file(name, src, dest)
     open(dest, "w") do |output|
       if dest.match?(/\.vim$/) && !dest.match('after/')
         output << <<~EOF
-        let files = filter(globpath(&rtp, '#{dest}', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+        let s:base = expand("<sfile>:h:h")
+        let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+        let files = filter(globpath(&rtp, '#{dest}', 1, 1), Filter)
         if len(files) > 0
           exec 'source ' . files[0]
           finish
diff --git a/syntax/8th.vim b/syntax/8th.vim
index 77b0db4d8..646726967 100644
--- a/syntax/8th.vim
+++ b/syntax/8th.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/8th.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/8th.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/Jenkinsfile.vim b/syntax/Jenkinsfile.vim
index 6db426f3c..fbaa61334 100644
--- a/syntax/Jenkinsfile.vim
+++ b/syntax/Jenkinsfile.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/Jenkinsfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/Jenkinsfile.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/a2ps.vim b/syntax/a2ps.vim
index 1e19b5439..3616993d1 100644
--- a/syntax/a2ps.vim
+++ b/syntax/a2ps.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/a2ps.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/a2ps.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/a65.vim b/syntax/a65.vim
index 49ebfa54d..0e85dfb95 100644
--- a/syntax/a65.vim
+++ b/syntax/a65.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/a65.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/a65.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/aap.vim b/syntax/aap.vim
index 3bfbdf0ef..c8a3183af 100644
--- a/syntax/aap.vim
+++ b/syntax/aap.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/aap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/aap.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/abap.vim b/syntax/abap.vim
index f813d783e..49a06670d 100644
--- a/syntax/abap.vim
+++ b/syntax/abap.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/abap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/abap.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/abaqus.vim b/syntax/abaqus.vim
index 27617bca9..2ade8afb3 100644
--- a/syntax/abaqus.vim
+++ b/syntax/abaqus.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/abaqus.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/abaqus.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/abc.vim b/syntax/abc.vim
index 69e062402..7bb3ddd0c 100644
--- a/syntax/abc.vim
+++ b/syntax/abc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/abc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/abc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/abel.vim b/syntax/abel.vim
index be84cb0d5..a2bc783c7 100644
--- a/syntax/abel.vim
+++ b/syntax/abel.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/abel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/abel.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/acedb.vim b/syntax/acedb.vim
index 26de8945d..2f7382695 100644
--- a/syntax/acedb.vim
+++ b/syntax/acedb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/acedb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/acedb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ada.vim b/syntax/ada.vim
index aeea3449f..20e5d03c8 100644
--- a/syntax/ada.vim
+++ b/syntax/ada.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ada.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ada.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ahdl.vim b/syntax/ahdl.vim
index 825e7df37..decba2699 100644
--- a/syntax/ahdl.vim
+++ b/syntax/ahdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ahdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ahdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/aidl.vim b/syntax/aidl.vim
index 530e16268..b40c09fe5 100644
--- a/syntax/aidl.vim
+++ b/syntax/aidl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/aidl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/aidl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/alsaconf.vim b/syntax/alsaconf.vim
index 6331bbce5..9c922ae3a 100644
--- a/syntax/alsaconf.vim
+++ b/syntax/alsaconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/alsaconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/alsaconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/aml.vim b/syntax/aml.vim
index c5ed3a570..03bb47265 100644
--- a/syntax/aml.vim
+++ b/syntax/aml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/aml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/aml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ampl.vim b/syntax/ampl.vim
index 57b76abcd..c660def8e 100644
--- a/syntax/ampl.vim
+++ b/syntax/ampl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ampl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ampl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ansible.vim b/syntax/ansible.vim
index 7bbf5157e..2fd53e7fd 100644
--- a/syntax/ansible.vim
+++ b/syntax/ansible.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ansible.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ansible.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ansible_hosts.vim b/syntax/ansible_hosts.vim
index cb5f68c62..437de336c 100644
--- a/syntax/ansible_hosts.vim
+++ b/syntax/ansible_hosts.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ansible_hosts.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ansible_hosts.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ant.vim b/syntax/ant.vim
index ea81e2f54..417ddcfe1 100644
--- a/syntax/ant.vim
+++ b/syntax/ant.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ant.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ant.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/apache.vim b/syntax/apache.vim
index b18582631..6df4cd92a 100644
--- a/syntax/apache.vim
+++ b/syntax/apache.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/apache.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/apache.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/apachestyle.vim b/syntax/apachestyle.vim
index 57f40134c..27c904ec7 100644
--- a/syntax/apachestyle.vim
+++ b/syntax/apachestyle.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/apachestyle.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/apachestyle.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/apiblueprint.vim b/syntax/apiblueprint.vim
index 76c036113..7694fc1b8 100644
--- a/syntax/apiblueprint.vim
+++ b/syntax/apiblueprint.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/apiblueprint.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/apiblueprint.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/applescript.vim b/syntax/applescript.vim
index 8da47afba..298c8c06d 100644
--- a/syntax/applescript.vim
+++ b/syntax/applescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/applescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/applescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/aptconf.vim b/syntax/aptconf.vim
index 4d7b252f5..9ff3cbeed 100644
--- a/syntax/aptconf.vim
+++ b/syntax/aptconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/aptconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/aptconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/arch.vim b/syntax/arch.vim
index 3f9b913af..5f553c566 100644
--- a/syntax/arch.vim
+++ b/syntax/arch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/arch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/arch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/arduino.vim b/syntax/arduino.vim
index 8d29bf1e4..508dc205f 100644
--- a/syntax/arduino.vim
+++ b/syntax/arduino.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/arduino.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/arduino.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/art.vim b/syntax/art.vim
index 73e10e634..21adc885c 100644
--- a/syntax/art.vim
+++ b/syntax/art.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/art.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/art.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/asciidoc.vim b/syntax/asciidoc.vim
index afbc905fc..f82310b14 100644
--- a/syntax/asciidoc.vim
+++ b/syntax/asciidoc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/asciidoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/asciidoc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/asl.vim b/syntax/asl.vim
index bc8a09503..57a138c7a 100644
--- a/syntax/asl.vim
+++ b/syntax/asl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/asl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/asl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/asn.vim b/syntax/asn.vim
index d355ce435..334ef9d64 100644
--- a/syntax/asn.vim
+++ b/syntax/asn.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/asn.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/asn.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/aspperl.vim b/syntax/aspperl.vim
index 4a2c553db..1292a8647 100644
--- a/syntax/aspperl.vim
+++ b/syntax/aspperl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/aspperl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/aspperl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/aspvbs.vim b/syntax/aspvbs.vim
index b008f672f..cbabc6447 100644
--- a/syntax/aspvbs.vim
+++ b/syntax/aspvbs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/aspvbs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/aspvbs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/asterisk.vim b/syntax/asterisk.vim
index 7318d8472..672515f33 100644
--- a/syntax/asterisk.vim
+++ b/syntax/asterisk.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/asterisk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/asterisk.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/asteriskvm.vim b/syntax/asteriskvm.vim
index df563e2d0..9b8ffbc11 100644
--- a/syntax/asteriskvm.vim
+++ b/syntax/asteriskvm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/asteriskvm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/asteriskvm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/atlas.vim b/syntax/atlas.vim
index 4341c201b..39ee5b906 100644
--- a/syntax/atlas.vim
+++ b/syntax/atlas.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/atlas.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/atlas.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/autodoc.vim b/syntax/autodoc.vim
index c3ec62eb4..5091322d9 100644
--- a/syntax/autodoc.vim
+++ b/syntax/autodoc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/autodoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/autodoc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/autoit.vim b/syntax/autoit.vim
index 439202460..61faf1321 100644
--- a/syntax/autoit.vim
+++ b/syntax/autoit.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/autoit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/autoit.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/automake.vim b/syntax/automake.vim
index 86cc75788..8012a0514 100644
--- a/syntax/automake.vim
+++ b/syntax/automake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/automake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/automake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ave.vim b/syntax/ave.vim
index 340e3a5e7..80c7e9c63 100644
--- a/syntax/ave.vim
+++ b/syntax/ave.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ave.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ave.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/awk.vim b/syntax/awk.vim
index ae4c92ea3..c4648b2d1 100644
--- a/syntax/awk.vim
+++ b/syntax/awk.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/awk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/awk.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/b.vim b/syntax/b.vim
index c05ab6b27..b5eedb24a 100644
--- a/syntax/b.vim
+++ b/syntax/b.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/b.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/b.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic.vim b/syntax/basic.vim
index 24a8b0972..d444372cd 100644
--- a/syntax/basic.vim
+++ b/syntax/basic.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/class.vim b/syntax/basic/class.vim
index dea703aa4..4fc03dcf2 100644
--- a/syntax/basic/class.vim
+++ b/syntax/basic/class.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/class.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/class.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/cluster.vim b/syntax/basic/cluster.vim
index f5eb59d18..017c4ba91 100644
--- a/syntax/basic/cluster.vim
+++ b/syntax/basic/cluster.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/cluster.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/cluster.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/decorator.vim b/syntax/basic/decorator.vim
index 7f5456cd2..fc4b7e4d0 100644
--- a/syntax/basic/decorator.vim
+++ b/syntax/basic/decorator.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/decorator.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/decorator.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/doc.vim b/syntax/basic/doc.vim
index 2bf5d614f..81af2a9a3 100644
--- a/syntax/basic/doc.vim
+++ b/syntax/basic/doc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/doc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/doc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/function.vim b/syntax/basic/function.vim
index ac94b9a1e..c4ffef907 100644
--- a/syntax/basic/function.vim
+++ b/syntax/basic/function.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/function.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/function.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/identifiers.vim b/syntax/basic/identifiers.vim
index b03df0110..ce733f3e9 100644
--- a/syntax/basic/identifiers.vim
+++ b/syntax/basic/identifiers.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/identifiers.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/identifiers.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/keyword.vim b/syntax/basic/keyword.vim
index ddb4e8a12..45e45768c 100644
--- a/syntax/basic/keyword.vim
+++ b/syntax/basic/keyword.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/keyword.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/keyword.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/literal.vim b/syntax/basic/literal.vim
index 6f092fcc9..8458dcc6d 100644
--- a/syntax/basic/literal.vim
+++ b/syntax/basic/literal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/literal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/literal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/members.vim b/syntax/basic/members.vim
index 7362eaf95..65366dac6 100644
--- a/syntax/basic/members.vim
+++ b/syntax/basic/members.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/members.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/members.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/object.vim b/syntax/basic/object.vim
index 6f5d1f28b..869cf0634 100644
--- a/syntax/basic/object.vim
+++ b/syntax/basic/object.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/object.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/object.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/patch.vim b/syntax/basic/patch.vim
index a2ebd1dab..9d97817cc 100644
--- a/syntax/basic/patch.vim
+++ b/syntax/basic/patch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/patch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/patch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/reserved.vim b/syntax/basic/reserved.vim
index 0cfb36acc..3ba5c8ecb 100644
--- a/syntax/basic/reserved.vim
+++ b/syntax/basic/reserved.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/reserved.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/reserved.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/symbols.vim b/syntax/basic/symbols.vim
index 15490f80a..bc8db0dc3 100644
--- a/syntax/basic/symbols.vim
+++ b/syntax/basic/symbols.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/symbols.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/symbols.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim
index 378ecafec..9785545db 100644
--- a/syntax/basic/type.vim
+++ b/syntax/basic/type.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/basic/type.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/basic/type.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/bc.vim b/syntax/bc.vim
index 35533f845..8e14e85f5 100644
--- a/syntax/bc.vim
+++ b/syntax/bc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/bc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/bc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/bdf.vim b/syntax/bdf.vim
index 548ef1b3d..8cd0d16e7 100644
--- a/syntax/bdf.vim
+++ b/syntax/bdf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/bdf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/bdf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/bib.vim b/syntax/bib.vim
index f59ab6ecd..6f24e0161 100644
--- a/syntax/bib.vim
+++ b/syntax/bib.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/bib.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/bib.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/bindzone.vim b/syntax/bindzone.vim
index d59c993d3..f66cd0f97 100644
--- a/syntax/bindzone.vim
+++ b/syntax/bindzone.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/bindzone.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/bindzone.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/blade.vim b/syntax/blade.vim
index da81031d2..582df259d 100644
--- a/syntax/blade.vim
+++ b/syntax/blade.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/blade.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/blade.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/blank.vim b/syntax/blank.vim
index d5a80aa2d..e686351c3 100644
--- a/syntax/blank.vim
+++ b/syntax/blank.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/blank.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/blank.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/brewfile.vim b/syntax/brewfile.vim
index 1f52c49b2..383c18109 100644
--- a/syntax/brewfile.vim
+++ b/syntax/brewfile.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/brewfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/brewfile.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/bsdl.vim b/syntax/bsdl.vim
index d23bfb28c..2d6b8475d 100644
--- a/syntax/bsdl.vim
+++ b/syntax/bsdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/bsdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/bsdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/bst.vim b/syntax/bst.vim
index 87688f0c9..3e7c815de 100644
--- a/syntax/bst.vim
+++ b/syntax/bst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/bst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/bst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/bzl.vim b/syntax/bzl.vim
index aed4d6bb7..f5080a81e 100644
--- a/syntax/bzl.vim
+++ b/syntax/bzl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/bzl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/bzl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/bzr.vim b/syntax/bzr.vim
index c641d25db..10cefb1e0 100644
--- a/syntax/bzr.vim
+++ b/syntax/bzr.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/bzr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/bzr.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/c.vim b/syntax/c.vim
index 930bf5615..63c3494fd 100644
--- a/syntax/c.vim
+++ b/syntax/c.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/c.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/c.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cabal-1.vim b/syntax/cabal-1.vim
index 13618fbcb..45fa2bdf7 100644
--- a/syntax/cabal-1.vim
+++ b/syntax/cabal-1.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cabal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cabal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cabal-2.vim b/syntax/cabal-2.vim
index 8f502ea00..8b9f1431c 100644
--- a/syntax/cabal-2.vim
+++ b/syntax/cabal-2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cabal-2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cabal-2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/caddyfile.vim b/syntax/caddyfile.vim
index 59ee547c6..3b6930658 100644
--- a/syntax/caddyfile.vim
+++ b/syntax/caddyfile.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/caddyfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/caddyfile.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/calendar.vim b/syntax/calendar.vim
index 218b5db98..0e6e58476 100644
--- a/syntax/calendar.vim
+++ b/syntax/calendar.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/calendar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/calendar.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/carp.vim b/syntax/carp.vim
index 16976286d..5c99680db 100644
--- a/syntax/carp.vim
+++ b/syntax/carp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/carp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/carp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/catalog.vim b/syntax/catalog.vim
index 1949e1342..7fff5fda7 100644
--- a/syntax/catalog.vim
+++ b/syntax/catalog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/catalog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/catalog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cdl.vim b/syntax/cdl.vim
index d54fd30e6..409c1dc7b 100644
--- a/syntax/cdl.vim
+++ b/syntax/cdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cdrdaoconf.vim b/syntax/cdrdaoconf.vim
index 41285ff5c..b6f8b0537 100644
--- a/syntax/cdrdaoconf.vim
+++ b/syntax/cdrdaoconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cdrdaoconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cdrdaoconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cdrtoc.vim b/syntax/cdrtoc.vim
index 3392635c8..9cf118b46 100644
--- a/syntax/cdrtoc.vim
+++ b/syntax/cdrtoc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cdrtoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cdrtoc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cf.vim b/syntax/cf.vim
index 21d3f5a90..52b179871 100644
--- a/syntax/cf.vim
+++ b/syntax/cf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cfg.vim b/syntax/cfg.vim
index a70a77f5a..550203e73 100644
--- a/syntax/cfg.vim
+++ b/syntax/cfg.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cfg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cfg.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ch.vim b/syntax/ch.vim
index 0a6ee7c65..fd97c7ceb 100644
--- a/syntax/ch.vim
+++ b/syntax/ch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/chaiscript.vim b/syntax/chaiscript.vim
index 25653ce06..609d35ff6 100644
--- a/syntax/chaiscript.vim
+++ b/syntax/chaiscript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/chaiscript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/chaiscript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/chaskell.vim b/syntax/chaskell.vim
index 019a2d6b1..4ec9a93e3 100644
--- a/syntax/chaskell.vim
+++ b/syntax/chaskell.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/chaskell.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/chaskell.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/chill.vim b/syntax/chill.vim
index 5ff41bea6..18a706c6f 100644
--- a/syntax/chill.vim
+++ b/syntax/chill.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/chill.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/chill.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/chordpro.vim b/syntax/chordpro.vim
index 25dad67fe..0ac02291e 100644
--- a/syntax/chordpro.vim
+++ b/syntax/chordpro.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/chordpro.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/chordpro.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cl.vim b/syntax/cl.vim
index fe377a649..6e5d04201 100644
--- a/syntax/cl.vim
+++ b/syntax/cl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/clean.vim b/syntax/clean.vim
index fc6010129..91df7e010 100644
--- a/syntax/clean.vim
+++ b/syntax/clean.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/clean.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/clean.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index e4a21ac5a..be2285961 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/clojure.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/clojure.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cmake.vim b/syntax/cmake.vim
index 0ea44d78e..cae10e0d8 100644
--- a/syntax/cmake.vim
+++ b/syntax/cmake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cmake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cmake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cmod.vim b/syntax/cmod.vim
index 7d5fc7407..41058a32b 100644
--- a/syntax/cmod.vim
+++ b/syntax/cmod.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cmod.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cmod.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cmusrc.vim b/syntax/cmusrc.vim
index 9325e5503..8d9ff598d 100644
--- a/syntax/cmusrc.vim
+++ b/syntax/cmusrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cmusrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cmusrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cobol.vim b/syntax/cobol.vim
index 2d238c83f..4f324728e 100644
--- a/syntax/cobol.vim
+++ b/syntax/cobol.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cobol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cobol.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/coco.vim b/syntax/coco.vim
index 5d9142133..bd8ff87d8 100644
--- a/syntax/coco.vim
+++ b/syntax/coco.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/coco.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/coco.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/coffee.vim b/syntax/coffee.vim
index 043a907e2..893d85cc0 100644
--- a/syntax/coffee.vim
+++ b/syntax/coffee.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/coffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/coffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/common.vim b/syntax/common.vim
index 839254a68..d7785ba60 100644
--- a/syntax/common.vim
+++ b/syntax/common.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/common.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/common.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/conaryrecipe.vim b/syntax/conaryrecipe.vim
index f054be03e..c1e37f2cb 100644
--- a/syntax/conaryrecipe.vim
+++ b/syntax/conaryrecipe.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/conaryrecipe.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/conaryrecipe.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/conf.vim b/syntax/conf.vim
index 9d64dc7eb..a8c4b050a 100644
--- a/syntax/conf.vim
+++ b/syntax/conf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/conf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/conf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/config.vim b/syntax/config.vim
index d89e93c77..ea1d63acc 100644
--- a/syntax/config.vim
+++ b/syntax/config.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/config.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cpp.vim b/syntax/cpp.vim
index 26d1975fa..0e51f1dd8 100644
--- a/syntax/cpp.vim
+++ b/syntax/cpp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cpp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cpp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cql.vim b/syntax/cql.vim
index f07f817df..e575d2fc6 100644
--- a/syntax/cql.vim
+++ b/syntax/cql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/crm.vim b/syntax/crm.vim
index bfe5165a3..a110facb5 100644
--- a/syntax/crm.vim
+++ b/syntax/crm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/crm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/crm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/crontab.vim b/syntax/crontab.vim
index c858dab4c..12cebc776 100644
--- a/syntax/crontab.vim
+++ b/syntax/crontab.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/crontab.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/crontab.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cryptol.vim b/syntax/cryptol.vim
index c0256e54d..6f098e8c7 100644
--- a/syntax/cryptol.vim
+++ b/syntax/cryptol.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cryptol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cryptol.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index 0866b3837..4b3228937 100644
--- a/syntax/crystal.vim
+++ b/syntax/crystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/crystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/crystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cs.vim b/syntax/cs.vim
index 687c66c2f..f9a8a6ae5 100644
--- a/syntax/cs.vim
+++ b/syntax/cs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/csc.vim b/syntax/csc.vim
index 5ee5668a0..b94237276 100644
--- a/syntax/csc.vim
+++ b/syntax/csc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/csc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/csc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/csdl.vim b/syntax/csdl.vim
index fe6c088f9..dd9347663 100644
--- a/syntax/csdl.vim
+++ b/syntax/csdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/csdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/csdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/csp.vim b/syntax/csp.vim
index 4a3b862e4..70be4d479 100644
--- a/syntax/csp.vim
+++ b/syntax/csp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/csp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/csp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/css.vim b/syntax/css.vim
index 2cf2645ad..3ef886959 100644
--- a/syntax/css.vim
+++ b/syntax/css.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/css.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/css.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/csv.vim b/syntax/csv.vim
index 574ac3de6..a0dbfd96b 100644
--- a/syntax/csv.vim
+++ b/syntax/csv.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/csv.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/csv.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cterm.vim b/syntax/cterm.vim
index 85260cf2a..f037590d5 100644
--- a/syntax/cterm.vim
+++ b/syntax/cterm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cterm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cterm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cucumber.vim b/syntax/cucumber.vim
index 77123633a..521332e27 100644
--- a/syntax/cucumber.vim
+++ b/syntax/cucumber.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cucumber.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cucumber.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cuda.vim b/syntax/cuda.vim
index 73e7c0dfc..a65302b30 100644
--- a/syntax/cuda.vim
+++ b/syntax/cuda.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cuda.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cuda.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cuesheet.vim b/syntax/cuesheet.vim
index f60af6123..9e5df7ce5 100644
--- a/syntax/cuesheet.vim
+++ b/syntax/cuesheet.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cuesheet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cuesheet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cupl.vim b/syntax/cupl.vim
index 81807257d..98655e3c4 100644
--- a/syntax/cupl.vim
+++ b/syntax/cupl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cupl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cupl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cuplsim.vim b/syntax/cuplsim.vim
index 9f0ff45ce..304b311ce 100644
--- a/syntax/cuplsim.vim
+++ b/syntax/cuplsim.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cuplsim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cuplsim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cvs.vim b/syntax/cvs.vim
index 3b3011dac..b7a0fbf25 100644
--- a/syntax/cvs.vim
+++ b/syntax/cvs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cvs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cvs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cvsrc.vim b/syntax/cvsrc.vim
index 999baf5a3..4856394e2 100644
--- a/syntax/cvsrc.vim
+++ b/syntax/cvsrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cvsrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cvsrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/cynpp.vim b/syntax/cynpp.vim
index 5e870ae7c..f2e4da9c4 100644
--- a/syntax/cynpp.vim
+++ b/syntax/cynpp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/cynpp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/cynpp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/d.vim b/syntax/d.vim
index 5f3f051ba..2e3de64a7 100644
--- a/syntax/d.vim
+++ b/syntax/d.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/d.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/d.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dart.vim b/syntax/dart.vim
index 5b0c1a987..a2a1f8cf5 100644
--- a/syntax/dart.vim
+++ b/syntax/dart.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dart.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dart.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/datascript.vim b/syntax/datascript.vim
index 79a74867d..68738394f 100644
--- a/syntax/datascript.vim
+++ b/syntax/datascript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/datascript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/datascript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dcd.vim b/syntax/dcd.vim
index 17ffa8511..fd8cec39b 100644
--- a/syntax/dcd.vim
+++ b/syntax/dcd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dcd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dcd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dcov.vim b/syntax/dcov.vim
index 007a7b48f..1949e7548 100644
--- a/syntax/dcov.vim
+++ b/syntax/dcov.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dcov.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dcov.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dd.vim b/syntax/dd.vim
index c634232a4..9300e0d4d 100644
--- a/syntax/dd.vim
+++ b/syntax/dd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ddoc.vim b/syntax/ddoc.vim
index 5bca70824..189e53945 100644
--- a/syntax/ddoc.vim
+++ b/syntax/ddoc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ddoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ddoc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/debchangelog.vim b/syntax/debchangelog.vim
index e7040ab35..c22c95ab8 100644
--- a/syntax/debchangelog.vim
+++ b/syntax/debchangelog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/debchangelog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/debchangelog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/debcontrol.vim b/syntax/debcontrol.vim
index 0c246e561..6c8758e43 100644
--- a/syntax/debcontrol.vim
+++ b/syntax/debcontrol.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/debcontrol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/debcontrol.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/debcopyright.vim b/syntax/debcopyright.vim
index aded0ddaf..1bdcd5ff0 100644
--- a/syntax/debcopyright.vim
+++ b/syntax/debcopyright.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/debcopyright.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/debcopyright.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/debsources.vim b/syntax/debsources.vim
index daa308d46..3fce617bd 100644
--- a/syntax/debsources.vim
+++ b/syntax/debsources.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/debsources.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/debsources.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/def.vim b/syntax/def.vim
index 084559383..f8535e5da 100644
--- a/syntax/def.vim
+++ b/syntax/def.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/def.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/def.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/denyhosts.vim b/syntax/denyhosts.vim
index 7a716af81..8be396948 100644
--- a/syntax/denyhosts.vim
+++ b/syntax/denyhosts.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/denyhosts.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/denyhosts.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/desc.vim b/syntax/desc.vim
index 413fd67b1..943f87aff 100644
--- a/syntax/desc.vim
+++ b/syntax/desc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/desc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/desc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/desktop.vim b/syntax/desktop.vim
index 015f2f17d..9e149339b 100644
--- a/syntax/desktop.vim
+++ b/syntax/desktop.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/desktop.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/desktop.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dhall.vim b/syntax/dhall.vim
index a52161bb1..4c27d0fed 100644
--- a/syntax/dhall.vim
+++ b/syntax/dhall.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dhall.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dhall.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dictconf.vim b/syntax/dictconf.vim
index e72bf0df5..c515cf564 100644
--- a/syntax/dictconf.vim
+++ b/syntax/dictconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dictconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dictconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dictdconf.vim b/syntax/dictdconf.vim
index 85383c634..c30a900cb 100644
--- a/syntax/dictdconf.vim
+++ b/syntax/dictdconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dictdconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dictdconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/diff.vim b/syntax/diff.vim
index e9757b780..08b1f7dc8 100644
--- a/syntax/diff.vim
+++ b/syntax/diff.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/diff.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/diff.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dircolors.vim b/syntax/dircolors.vim
index dfd085a84..532978377 100644
--- a/syntax/dircolors.vim
+++ b/syntax/dircolors.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dircolors.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dircolors.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/django.vim b/syntax/django.vim
index 51a6a3e79..dfe540823 100644
--- a/syntax/django.vim
+++ b/syntax/django.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/django.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/django.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dnsmasq.vim b/syntax/dnsmasq.vim
index b9f6b5932..5373fea7c 100644
--- a/syntax/dnsmasq.vim
+++ b/syntax/dnsmasq.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dnsmasq.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dnsmasq.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/docker-compose.vim b/syntax/docker-compose.vim
index be0e07ef9..71648bbbb 100644
--- a/syntax/docker-compose.vim
+++ b/syntax/docker-compose.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/docker-compose.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/docker-compose.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dockerfile.vim b/syntax/dockerfile.vim
index 2480c7fc9..5bd4c9f93 100644
--- a/syntax/dockerfile.vim
+++ b/syntax/dockerfile.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dockerfile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dockerfile.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dosbatch.vim b/syntax/dosbatch.vim
index a9b93ceb5..ee42764db 100644
--- a/syntax/dosbatch.vim
+++ b/syntax/dosbatch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dosbatch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dosbatch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dosini.vim b/syntax/dosini.vim
index c052ba7c1..489332367 100644
--- a/syntax/dosini.vim
+++ b/syntax/dosini.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dosini.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dosini.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dot.vim b/syntax/dot.vim
index 1f8d50ba2..a2f442d39 100644
--- a/syntax/dot.vim
+++ b/syntax/dot.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dot.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dot.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dracula.vim b/syntax/dracula.vim
index 10c45b213..14b299228 100644
--- a/syntax/dracula.vim
+++ b/syntax/dracula.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dracula.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dracula.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dsdl.vim b/syntax/dsdl.vim
index db2ddb807..bf6818f9c 100644
--- a/syntax/dsdl.vim
+++ b/syntax/dsdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dsdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dsdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dsl.vim b/syntax/dsl.vim
index 602b17920..03fa01c75 100644
--- a/syntax/dsl.vim
+++ b/syntax/dsl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dsl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dsl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dtd.vim b/syntax/dtd.vim
index 2145b2f01..dfb0258ec 100644
--- a/syntax/dtd.vim
+++ b/syntax/dtd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dtd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dtd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dts.vim b/syntax/dts.vim
index 17a6f0be3..e326fdef6 100644
--- a/syntax/dts.vim
+++ b/syntax/dts.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dts.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dts.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dune.vim b/syntax/dune.vim
index 8433e47f6..e4fdfd80a 100644
--- a/syntax/dune.vim
+++ b/syntax/dune.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dune.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dune.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dylan.vim b/syntax/dylan.vim
index d1db4dc06..101cd3016 100644
--- a/syntax/dylan.vim
+++ b/syntax/dylan.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dylan.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dylan.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dylanintr.vim b/syntax/dylanintr.vim
index 65e645d68..ed531a47b 100644
--- a/syntax/dylanintr.vim
+++ b/syntax/dylanintr.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dylanintr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dylanintr.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/dylanlid.vim b/syntax/dylanlid.vim
index 0bdac4353..0ad321d67 100644
--- a/syntax/dylanlid.vim
+++ b/syntax/dylanlid.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/dylanlid.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/dylanlid.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ecd.vim b/syntax/ecd.vim
index ef0973f18..eee185937 100644
--- a/syntax/ecd.vim
+++ b/syntax/ecd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ecd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ecd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ecrystal.vim b/syntax/ecrystal.vim
index 7742ba154..bfcb07d84 100644
--- a/syntax/ecrystal.vim
+++ b/syntax/ecrystal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ecrystal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ecrystal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/edif.vim b/syntax/edif.vim
index 883cd77f8..4271733a9 100644
--- a/syntax/edif.vim
+++ b/syntax/edif.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/edif.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/edif.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index 92fe6a546..906a1d2b4 100644
--- a/syntax/eelixir.vim
+++ b/syntax/eelixir.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/eelixir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/eelixir.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/elf.vim b/syntax/elf.vim
index 4dc7148de..5da19f961 100644
--- a/syntax/elf.vim
+++ b/syntax/elf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/elf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/elf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/elinks.vim b/syntax/elinks.vim
index 41215404d..41b91fb3c 100644
--- a/syntax/elinks.vim
+++ b/syntax/elinks.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/elinks.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/elinks.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index 8dee7cc41..ce3d51da2 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/elixir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/elixir.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/elm.vim b/syntax/elm.vim
index 115c4edb8..a7551514d 100644
--- a/syntax/elm.vim
+++ b/syntax/elm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/elm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/elm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/elmfilt.vim b/syntax/elmfilt.vim
index d3e5820ca..22ca2d14f 100644
--- a/syntax/elmfilt.vim
+++ b/syntax/elmfilt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/elmfilt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/elmfilt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/embeddedpuppet.vim b/syntax/embeddedpuppet.vim
index eca80cedd..024f49afb 100644
--- a/syntax/embeddedpuppet.vim
+++ b/syntax/embeddedpuppet.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/embeddedpuppet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/embeddedpuppet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ember-script.vim b/syntax/ember-script.vim
index df931b378..8023bc729 100644
--- a/syntax/ember-script.vim
+++ b/syntax/ember-script.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ember-script.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ember-script.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/emblem.vim b/syntax/emblem.vim
index b080ad7b2..1c1971ffc 100644
--- a/syntax/emblem.vim
+++ b/syntax/emblem.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/emblem.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/emblem.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/erlang.vim b/syntax/erlang.vim
index 83f3be8bd..ad6cf13ae 100644
--- a/syntax/erlang.vim
+++ b/syntax/erlang.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/erlang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/erlang.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/eruby.vim b/syntax/eruby.vim
index 3be2b5de4..bb48261d6 100644
--- a/syntax/eruby.vim
+++ b/syntax/eruby.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/eruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/eruby.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/esmtprc.vim b/syntax/esmtprc.vim
index e9123c9a5..50d7f3849 100644
--- a/syntax/esmtprc.vim
+++ b/syntax/esmtprc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/esmtprc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/esmtprc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/esqlc.vim b/syntax/esqlc.vim
index ea13abded..90c757d8e 100644
--- a/syntax/esqlc.vim
+++ b/syntax/esqlc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/esqlc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/esqlc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/esterel.vim b/syntax/esterel.vim
index b2e9298d7..ac4618846 100644
--- a/syntax/esterel.vim
+++ b/syntax/esterel.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/esterel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/esterel.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/eterm.vim b/syntax/eterm.vim
index 1068f0d90..4e8ba54db 100644
--- a/syntax/eterm.vim
+++ b/syntax/eterm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/eterm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/eterm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/exim.vim b/syntax/exim.vim
index dda5ef5ce..8d73a6623 100644
--- a/syntax/exim.vim
+++ b/syntax/exim.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/exim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/exim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/expect.vim b/syntax/expect.vim
index 7ee59f561..28d3daf59 100644
--- a/syntax/expect.vim
+++ b/syntax/expect.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/expect.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/expect.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/exports.vim b/syntax/exports.vim
index 3587f07a0..6ec91b989 100644
--- a/syntax/exports.vim
+++ b/syntax/exports.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/exports.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/exports.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/falcon.vim b/syntax/falcon.vim
index 2b57e48bb..500bb08ec 100644
--- a/syntax/falcon.vim
+++ b/syntax/falcon.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/falcon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/falcon.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/fan.vim b/syntax/fan.vim
index 9f7c6efca..929f1f917 100644
--- a/syntax/fan.vim
+++ b/syntax/fan.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/fan.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/fan.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/fbs.vim b/syntax/fbs.vim
index 82b826b35..76da1e0b3 100644
--- a/syntax/fbs.vim
+++ b/syntax/fbs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/fbs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/fbs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/fennel.vim b/syntax/fennel.vim
index e25abac66..827abe04c 100644
--- a/syntax/fennel.vim
+++ b/syntax/fennel.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/fennel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/fennel.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ferm.vim b/syntax/ferm.vim
index 4a45b7396..55af4ac44 100644
--- a/syntax/ferm.vim
+++ b/syntax/ferm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ferm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ferm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/fetchmail.vim b/syntax/fetchmail.vim
index 2e4a2575d..2fb401d54 100644
--- a/syntax/fetchmail.vim
+++ b/syntax/fetchmail.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/fetchmail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/fetchmail.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/fgl.vim b/syntax/fgl.vim
index 01b4d3393..c115dd02d 100644
--- a/syntax/fgl.vim
+++ b/syntax/fgl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/fgl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/fgl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/fish.vim b/syntax/fish.vim
index 5e55660e4..9e39499f2 100644
--- a/syntax/fish.vim
+++ b/syntax/fish.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/fish.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/fish.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/flow.vim b/syntax/flow.vim
index 7999405cb..12a2b4d27 100644
--- a/syntax/flow.vim
+++ b/syntax/flow.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/flow.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/flow.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/focexec.vim b/syntax/focexec.vim
index e43e5e2f2..3e195913b 100644
--- a/syntax/focexec.vim
+++ b/syntax/focexec.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/focexec.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/focexec.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/forth.vim b/syntax/forth.vim
index d3c8d309e..c61b6a46c 100644
--- a/syntax/forth.vim
+++ b/syntax/forth.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/forth.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/forth.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/fortran.vim b/syntax/fortran.vim
index 505b9b813..ea2ccfa56 100644
--- a/syntax/fortran.vim
+++ b/syntax/fortran.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/fortran.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/fortran.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/framescript.vim b/syntax/framescript.vim
index 1f0b99bfd..ae7e80335 100644
--- a/syntax/framescript.vim
+++ b/syntax/framescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/framescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/framescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/freebasic.vim b/syntax/freebasic.vim
index ed844b746..955d03a14 100644
--- a/syntax/freebasic.vim
+++ b/syntax/freebasic.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/freebasic.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/freebasic.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/fsharp.vim b/syntax/fsharp.vim
index d623207b4..811ee00a5 100644
--- a/syntax/fsharp.vim
+++ b/syntax/fsharp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/fsharp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/fsharp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/fstab.vim b/syntax/fstab.vim
index 02fc6d8bd..6c0539f6c 100644
--- a/syntax/fstab.vim
+++ b/syntax/fstab.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/fstab.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/fstab.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/fvwm.vim b/syntax/fvwm.vim
index 425c4cd82..e244f9d7b 100644
--- a/syntax/fvwm.vim
+++ b/syntax/fvwm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/fvwm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/fvwm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gdb.vim b/syntax/gdb.vim
index d88b9b114..27aa26f53 100644
--- a/syntax/gdb.vim
+++ b/syntax/gdb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gdb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gdb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gdmo.vim b/syntax/gdmo.vim
index 370af4625..01327e5cf 100644
--- a/syntax/gdmo.vim
+++ b/syntax/gdmo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gdmo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gdmo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gdscript3.vim b/syntax/gdscript3.vim
index c14ac812b..2b943443f 100644
--- a/syntax/gdscript3.vim
+++ b/syntax/gdscript3.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gdscript3.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gdscript3.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gedcom.vim b/syntax/gedcom.vim
index 04628d098..64868eccf 100644
--- a/syntax/gedcom.vim
+++ b/syntax/gedcom.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gedcom.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gedcom.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/git.vim b/syntax/git.vim
index aa508353f..13d5f5fbc 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/git.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/git.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index 7e8babac8..5b0d5e773 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gitcommit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gitcommit.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gitconfig.vim b/syntax/gitconfig.vim
index 95a54b3eb..4aef73e30 100644
--- a/syntax/gitconfig.vim
+++ b/syntax/gitconfig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gitconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gitconfig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gitignore.vim b/syntax/gitignore.vim
index ba6238299..f946f6b7c 100644
--- a/syntax/gitignore.vim
+++ b/syntax/gitignore.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gitignore.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gitignore.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gitolite.vim b/syntax/gitolite.vim
index 56989389c..56f9268d1 100644
--- a/syntax/gitolite.vim
+++ b/syntax/gitolite.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gitolite.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gitolite.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index b36e99305..5cbda44c0 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/gitrebase.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gitrebase.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gitrebase.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gitsendemail.vim b/syntax/gitsendemail.vim
index 0d02129d4..d60e448a6 100644
--- a/syntax/gitsendemail.vim
+++ b/syntax/gitsendemail.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gitsendemail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gitsendemail.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gkrellmrc.vim b/syntax/gkrellmrc.vim
index acd8b85b2..1c9818699 100644
--- a/syntax/gkrellmrc.vim
+++ b/syntax/gkrellmrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gkrellmrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gkrellmrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/glsl.vim b/syntax/glsl.vim
index 12b30938b..a2bdb8b08 100644
--- a/syntax/glsl.vim
+++ b/syntax/glsl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/glsl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/glsl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gmpl.vim b/syntax/gmpl.vim
index 18c65bf4e..2b866453d 100644
--- a/syntax/gmpl.vim
+++ b/syntax/gmpl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gmpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gmpl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gnash.vim b/syntax/gnash.vim
index c1fdccf55..1adf335db 100644
--- a/syntax/gnash.vim
+++ b/syntax/gnash.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gnash.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gnash.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gnuplot.vim b/syntax/gnuplot.vim
index e66aa84ab..734dbbf7b 100644
--- a/syntax/gnuplot.vim
+++ b/syntax/gnuplot.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gnuplot.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gnuplot.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/go.vim b/syntax/go.vim
index 83fa7cb2c..f546b91a2 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/go.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/go.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/godebugoutput.vim b/syntax/godebugoutput.vim
index 9577ca2f2..483518bc7 100644
--- a/syntax/godebugoutput.vim
+++ b/syntax/godebugoutput.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/godebugoutput.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/godebugoutput.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/godebugstacktrace.vim b/syntax/godebugstacktrace.vim
index 117b04585..c3964205e 100644
--- a/syntax/godebugstacktrace.vim
+++ b/syntax/godebugstacktrace.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/godebugstacktrace.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/godebugstacktrace.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/godebugvariables.vim b/syntax/godebugvariables.vim
index bc3536904..51d9fa3fa 100644
--- a/syntax/godebugvariables.vim
+++ b/syntax/godebugvariables.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/godebugvariables.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/godebugvariables.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/godefstack.vim b/syntax/godefstack.vim
index 161296a2d..228a82370 100644
--- a/syntax/godefstack.vim
+++ b/syntax/godefstack.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/godefstack.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/godefstack.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gohtmltmpl.vim b/syntax/gohtmltmpl.vim
index 6c5a095e7..f38d95326 100644
--- a/syntax/gohtmltmpl.vim
+++ b/syntax/gohtmltmpl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gohtmltmpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gohtmltmpl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gomod.vim b/syntax/gomod.vim
index 190f39ece..4e3cf4840 100644
--- a/syntax/gomod.vim
+++ b/syntax/gomod.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gomod.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gomod.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gotexttmpl.vim b/syntax/gotexttmpl.vim
index 621324ec1..a4af59a9c 100644
--- a/syntax/gotexttmpl.vim
+++ b/syntax/gotexttmpl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gotexttmpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gotexttmpl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gp.vim b/syntax/gp.vim
index 3f6aaa67a..634bbd597 100644
--- a/syntax/gp.vim
+++ b/syntax/gp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gpg.vim b/syntax/gpg.vim
index b828cdc81..e227e22a3 100644
--- a/syntax/gpg.vim
+++ b/syntax/gpg.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gpg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gpg.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/grads.vim b/syntax/grads.vim
index 163f874cf..e9efe0500 100644
--- a/syntax/grads.vim
+++ b/syntax/grads.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/grads.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/grads.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/graphql.vim b/syntax/graphql.vim
index 834e98245..c3410528c 100644
--- a/syntax/graphql.vim
+++ b/syntax/graphql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/graphql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/graphql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gretl.vim b/syntax/gretl.vim
index 491342ce3..1ff069d43 100644
--- a/syntax/gretl.vim
+++ b/syntax/gretl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gretl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gretl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/groovy.vim b/syntax/groovy.vim
index acf9af510..0ccf8d34e 100644
--- a/syntax/groovy.vim
+++ b/syntax/groovy.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/groovy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/groovy.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/group.vim b/syntax/group.vim
index 0365cc96a..4b06fc071 100644
--- a/syntax/group.vim
+++ b/syntax/group.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/group.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/group.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/grub.vim b/syntax/grub.vim
index b276985d7..fafa46379 100644
--- a/syntax/grub.vim
+++ b/syntax/grub.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/grub.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/grub.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gsl.vim b/syntax/gsl.vim
index be4475272..9590530cb 100644
--- a/syntax/gsl.vim
+++ b/syntax/gsl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gsl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gsl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gsp.vim b/syntax/gsp.vim
index 3b3f3a9f2..1bbf3c0e6 100644
--- a/syntax/gsp.vim
+++ b/syntax/gsp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gsp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gsp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/gtkrc.vim b/syntax/gtkrc.vim
index 830490e88..1a6d86f4b 100644
--- a/syntax/gtkrc.vim
+++ b/syntax/gtkrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/gtkrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/gtkrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/haml.vim b/syntax/haml.vim
index 61c9c63a9..32c6f794e 100644
--- a/syntax/haml.vim
+++ b/syntax/haml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/haml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/haml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/hamster.vim b/syntax/hamster.vim
index 23fdb5f57..df1d17bce 100644
--- a/syntax/hamster.vim
+++ b/syntax/hamster.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/hamster.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/hamster.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/handlebars.vim b/syntax/handlebars.vim
index 3ecdbc549..1eba110a4 100644
--- a/syntax/handlebars.vim
+++ b/syntax/handlebars.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/handlebars.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/handlebars.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/haproxy.vim b/syntax/haproxy.vim
index b2796c48a..df9bfd90b 100644
--- a/syntax/haproxy.vim
+++ b/syntax/haproxy.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/haproxy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/haproxy.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/haskell.vim b/syntax/haskell.vim
index e1f1c3083..4f25ed8b0 100644
--- a/syntax/haskell.vim
+++ b/syntax/haskell.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/haskell.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/haskell.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/haste.vim b/syntax/haste.vim
index 33ab9fff0..1f75c9501 100644
--- a/syntax/haste.vim
+++ b/syntax/haste.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/haste.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/haste.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/hastepreproc.vim b/syntax/hastepreproc.vim
index 40e429190..3228740cc 100644
--- a/syntax/hastepreproc.vim
+++ b/syntax/hastepreproc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/hastepreproc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/hastepreproc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/haxe.vim b/syntax/haxe.vim
index 90f85dec1..1ca9f40a5 100644
--- a/syntax/haxe.vim
+++ b/syntax/haxe.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/haxe.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/haxe.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/hb.vim b/syntax/hb.vim
index b92ac3b23..524effc1c 100644
--- a/syntax/hb.vim
+++ b/syntax/hb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/hb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/hb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/hcl.vim b/syntax/hcl.vim
index 96db23bf1..b28e6d4f2 100644
--- a/syntax/hcl.vim
+++ b/syntax/hcl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/hcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/hcl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/helm.vim b/syntax/helm.vim
index c3c4e1ba7..012a44f8a 100644
--- a/syntax/helm.vim
+++ b/syntax/helm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/helm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/helm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/help.vim b/syntax/help.vim
index afd6588a2..53935fae9 100644
--- a/syntax/help.vim
+++ b/syntax/help.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/help.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/help.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/hercules.vim b/syntax/hercules.vim
index c08283e38..37a35d4ee 100644
--- a/syntax/hercules.vim
+++ b/syntax/hercules.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/hercules.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/hercules.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/hex.vim b/syntax/hex.vim
index 5ae880df4..dcf932cd9 100644
--- a/syntax/hex.vim
+++ b/syntax/hex.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/hex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/hex.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/hgcommit.vim b/syntax/hgcommit.vim
index ad96c5149..3c27e3b9c 100644
--- a/syntax/hgcommit.vim
+++ b/syntax/hgcommit.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/hgcommit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/hgcommit.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/hive.vim b/syntax/hive.vim
index 7bef1dc57..4c53ad7ca 100644
--- a/syntax/hive.vim
+++ b/syntax/hive.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/hive.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/hive.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/hog.vim b/syntax/hog.vim
index 1c6b89f6a..68b0b91fe 100644
--- a/syntax/hog.vim
+++ b/syntax/hog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/hog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/hog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/hollywood.vim b/syntax/hollywood.vim
index fef8c79e8..9ca2dea2d 100644
--- a/syntax/hollywood.vim
+++ b/syntax/hollywood.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/hollywood.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/hollywood.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/hostconf.vim b/syntax/hostconf.vim
index 90bb4937c..2c912bc6d 100644
--- a/syntax/hostconf.vim
+++ b/syntax/hostconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/hostconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/hostconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/hostsaccess.vim b/syntax/hostsaccess.vim
index 100462dc2..4882840e9 100644
--- a/syntax/hostsaccess.vim
+++ b/syntax/hostsaccess.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/hostsaccess.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/hostsaccess.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/html.vim b/syntax/html.vim
index d5699c3d4..a505da2a7 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/html.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/html.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/htmldjango.vim b/syntax/htmldjango.vim
index c16cbb801..0282f30c6 100644
--- a/syntax/htmldjango.vim
+++ b/syntax/htmldjango.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/htmldjango.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/htmldjango.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/htmlm4.vim b/syntax/htmlm4.vim
index 00915a951..834c86bf9 100644
--- a/syntax/htmlm4.vim
+++ b/syntax/htmlm4.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/htmlm4.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/htmlm4.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/i3config.vim b/syntax/i3config.vim
index 957048eaf..58dd81a01 100644
--- a/syntax/i3config.vim
+++ b/syntax/i3config.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/i3config.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/i3config.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ibasic.vim b/syntax/ibasic.vim
index 2725331f2..2959ff72b 100644
--- a/syntax/ibasic.vim
+++ b/syntax/ibasic.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ibasic.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ibasic.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/icalendar.vim b/syntax/icalendar.vim
index eb99cad2d..1912bad8c 100644
--- a/syntax/icalendar.vim
+++ b/syntax/icalendar.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/icalendar.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/icalendar.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/icemenu.vim b/syntax/icemenu.vim
index 68b309767..26efef5df 100644
--- a/syntax/icemenu.vim
+++ b/syntax/icemenu.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/icemenu.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/icemenu.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/icon.vim b/syntax/icon.vim
index d15d63ffa..e5adba2b1 100644
--- a/syntax/icon.vim
+++ b/syntax/icon.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/icon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/icon.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/idris.vim b/syntax/idris.vim
index 15833ee6c..34a7dc577 100644
--- a/syntax/idris.vim
+++ b/syntax/idris.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/idris.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/idris.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/idris2.vim b/syntax/idris2.vim
index aa7055788..b580cc02a 100644
--- a/syntax/idris2.vim
+++ b/syntax/idris2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/idris2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/idris2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/indent.vim b/syntax/indent.vim
index 4a11ae599..bccbfa6ba 100644
--- a/syntax/indent.vim
+++ b/syntax/indent.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/indent.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/indent.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/inform.vim b/syntax/inform.vim
index 4ec5703f1..86e56be40 100644
--- a/syntax/inform.vim
+++ b/syntax/inform.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/inform.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/inform.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/initng.vim b/syntax/initng.vim
index a9d74d3db..500d55702 100644
--- a/syntax/initng.vim
+++ b/syntax/initng.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/initng.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/initng.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/inittab.vim b/syntax/inittab.vim
index 534d2ce73..0f661b8f5 100644
--- a/syntax/inittab.vim
+++ b/syntax/inittab.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/inittab.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/inittab.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ion.vim b/syntax/ion.vim
index 96d329e2e..f8269815e 100644
--- a/syntax/ion.vim
+++ b/syntax/ion.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ion.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ion.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ipfilter.vim b/syntax/ipfilter.vim
index c550b547e..342ea34d3 100644
--- a/syntax/ipfilter.vim
+++ b/syntax/ipfilter.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ipfilter.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ipfilter.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/iss.vim b/syntax/iss.vim
index 4e28e36f5..970ada338 100644
--- a/syntax/iss.vim
+++ b/syntax/iss.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/iss.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/iss.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ist.vim b/syntax/ist.vim
index 390b9f7b2..feb2206c0 100644
--- a/syntax/ist.vim
+++ b/syntax/ist.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ist.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ist.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/j.vim b/syntax/j.vim
index 6275a955a..e9937a080 100644
--- a/syntax/j.vim
+++ b/syntax/j.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/j.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/j.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/jal.vim b/syntax/jal.vim
index c72c1394b..b34af2d15 100644
--- a/syntax/jal.vim
+++ b/syntax/jal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/jal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/jal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/jam.vim b/syntax/jam.vim
index 53091ba9d..2fd817fec 100644
--- a/syntax/jam.vim
+++ b/syntax/jam.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/jam.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/jam.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/java.vim b/syntax/java.vim
index 0ca7a1952..c7648f212 100644
--- a/syntax/java.vim
+++ b/syntax/java.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/java.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/java.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/javacc.vim b/syntax/javacc.vim
index f00bb0da7..e5c04192d 100644
--- a/syntax/javacc.vim
+++ b/syntax/javacc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/javacc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/javacc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 341e4a547..750ced5e1 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/javascript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/javascript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/jess.vim b/syntax/jess.vim
index 4f37959c7..34ec059ab 100644
--- a/syntax/jess.vim
+++ b/syntax/jess.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/jess.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/jess.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/jgraph.vim b/syntax/jgraph.vim
index d3b86a5a5..9fcf50b65 100644
--- a/syntax/jgraph.vim
+++ b/syntax/jgraph.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/jgraph.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/jgraph.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/jinja2.vim b/syntax/jinja2.vim
index 3cbf38df1..bb8a93fcb 100644
--- a/syntax/jinja2.vim
+++ b/syntax/jinja2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/jinja2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/jinja2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/jovial.vim b/syntax/jovial.vim
index 9a350a603..fa07dd9c5 100644
--- a/syntax/jovial.vim
+++ b/syntax/jovial.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/jovial.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/jovial.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/jproperties.vim b/syntax/jproperties.vim
index b8003df45..bac79637e 100644
--- a/syntax/jproperties.vim
+++ b/syntax/jproperties.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/jproperties.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/jproperties.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/jq.vim b/syntax/jq.vim
index dbfc6b52b..9cc0072f8 100644
--- a/syntax/jq.vim
+++ b/syntax/jq.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/jq.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/jq.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/json.vim b/syntax/json.vim
index fe718b34b..fa2b446fc 100644
--- a/syntax/json.vim
+++ b/syntax/json.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/json.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/json.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/json5.vim b/syntax/json5.vim
index d3904ff1d..73d7fb5c7 100644
--- a/syntax/json5.vim
+++ b/syntax/json5.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/json5.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/json5.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/jsonnet.vim b/syntax/jsonnet.vim
index c3142d85d..d8d60a13b 100644
--- a/syntax/jsonnet.vim
+++ b/syntax/jsonnet.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/jsonnet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/jsonnet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/jsp.vim b/syntax/jsp.vim
index f474f75e8..cc51e14c9 100644
--- a/syntax/jsp.vim
+++ b/syntax/jsp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/jsp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/jsp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/jst.vim b/syntax/jst.vim
index a364b5bf4..9715066e9 100644
--- a/syntax/jst.vim
+++ b/syntax/jst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/jst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/jst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 29e00bba9..86c43f514 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/julia.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/julia.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/juliadoc.vim b/syntax/juliadoc.vim
index 2ae435c2d..03eb59427 100644
--- a/syntax/juliadoc.vim
+++ b/syntax/juliadoc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/juliadoc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/juliadoc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/kconfig.vim b/syntax/kconfig.vim
index 5a0ec8520..ad3b03a7f 100644
--- a/syntax/kconfig.vim
+++ b/syntax/kconfig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/kconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/kconfig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/kivy.vim b/syntax/kivy.vim
index c71cff099..89ec78275 100644
--- a/syntax/kivy.vim
+++ b/syntax/kivy.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/kivy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/kivy.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/kix.vim b/syntax/kix.vim
index 1e56a02f4..74428bfa0 100644
--- a/syntax/kix.vim
+++ b/syntax/kix.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/kix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/kix.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index 4593234c0..c3475323c 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/kotlin.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/kotlin.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/kscript.vim b/syntax/kscript.vim
index caf54360b..605142bc2 100644
--- a/syntax/kscript.vim
+++ b/syntax/kscript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/kscript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/kscript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/kwt.vim b/syntax/kwt.vim
index b49013586..68aa9e91a 100644
--- a/syntax/kwt.vim
+++ b/syntax/kwt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/kwt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/kwt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lace.vim b/syntax/lace.vim
index 309a85bfb..2df0706df 100644
--- a/syntax/lace.vim
+++ b/syntax/lace.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lace.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lace.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/latte.vim b/syntax/latte.vim
index fe94d9cce..d2c16ae26 100644
--- a/syntax/latte.vim
+++ b/syntax/latte.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/latte.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/latte.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ld.vim b/syntax/ld.vim
index dc51e15f8..a4728d1b8 100644
--- a/syntax/ld.vim
+++ b/syntax/ld.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ld.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ld.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ldif.vim b/syntax/ldif.vim
index 5f8f89227..6d6ef0a0f 100644
--- a/syntax/ldif.vim
+++ b/syntax/ldif.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ldif.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ldif.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ledger.vim b/syntax/ledger.vim
index b768c8349..2afccaad1 100644
--- a/syntax/ledger.vim
+++ b/syntax/ledger.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ledger.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ledger.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/less.vim b/syntax/less.vim
index ee2a40bbb..27b556c0d 100644
--- a/syntax/less.vim
+++ b/syntax/less.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/less.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/less.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lex.vim b/syntax/lex.vim
index a4d62b119..94e84d375 100644
--- a/syntax/lex.vim
+++ b/syntax/lex.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lex.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lftp.vim b/syntax/lftp.vim
index 916954589..0845e2bbe 100644
--- a/syntax/lftp.vim
+++ b/syntax/lftp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lftp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lftp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lhaskell.vim b/syntax/lhaskell.vim
index a38b93c02..d40e915e1 100644
--- a/syntax/lhaskell.vim
+++ b/syntax/lhaskell.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lhaskell.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lhaskell.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/libao.vim b/syntax/libao.vim
index 0080efe35..97896ee97 100644
--- a/syntax/libao.vim
+++ b/syntax/libao.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/libao.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/libao.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lidris.vim b/syntax/lidris.vim
index 8f1ca1b30..b42197008 100644
--- a/syntax/lidris.vim
+++ b/syntax/lidris.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lidris.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lidris.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lidris2.vim b/syntax/lidris2.vim
index 277e10024..c78a09c8e 100644
--- a/syntax/lidris2.vim
+++ b/syntax/lidris2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lidris2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lidris2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lifelines.vim b/syntax/lifelines.vim
index 2f92a7ec7..44eb0c6d8 100644
--- a/syntax/lifelines.vim
+++ b/syntax/lifelines.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lifelines.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lifelines.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lilo.vim b/syntax/lilo.vim
index 66c6c9637..ac46d02ae 100644
--- a/syntax/lilo.vim
+++ b/syntax/lilo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lilo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lilo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lilypond-words.vim b/syntax/lilypond-words.vim
index 43ad7c3dd..b1ec97a08 100644
--- a/syntax/lilypond-words.vim
+++ b/syntax/lilypond-words.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lilypond-words.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lilypond-words.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lilypond.vim b/syntax/lilypond.vim
index 96b7df323..04a0f0e6a 100644
--- a/syntax/lilypond.vim
+++ b/syntax/lilypond.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lilypond.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lilypond.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/limits.vim b/syntax/limits.vim
index a8e434bfd..4ffd72aa8 100644
--- a/syntax/limits.vim
+++ b/syntax/limits.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/limits.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/limits.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/liquid.vim b/syntax/liquid.vim
index fd8640ee4..867e4a791 100644
--- a/syntax/liquid.vim
+++ b/syntax/liquid.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/liquid.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/liquid.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lisp.vim b/syntax/lisp.vim
index 9982330f7..b4ecb4398 100644
--- a/syntax/lisp.vim
+++ b/syntax/lisp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lisp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lisp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/litcoffee.vim b/syntax/litcoffee.vim
index 5c30b8059..f29cf5266 100644
--- a/syntax/litcoffee.vim
+++ b/syntax/litcoffee.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/litcoffee.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/litcoffee.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lite.vim b/syntax/lite.vim
index 4ffd53789..5e43d1d79 100644
--- a/syntax/lite.vim
+++ b/syntax/lite.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lite.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lite.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/litestep.vim b/syntax/litestep.vim
index ca0ad369d..72007dfb2 100644
--- a/syntax/litestep.vim
+++ b/syntax/litestep.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/litestep.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/litestep.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/llvm.vim b/syntax/llvm.vim
index c276bf1ae..8df887080 100644
--- a/syntax/llvm.vim
+++ b/syntax/llvm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/llvm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/llvm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/log.vim b/syntax/log.vim
index 42af83154..9f025f6d2 100644
--- a/syntax/log.vim
+++ b/syntax/log.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/log.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/log.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/loginaccess.vim b/syntax/loginaccess.vim
index ed9bbd745..3588ed959 100644
--- a/syntax/loginaccess.vim
+++ b/syntax/loginaccess.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/loginaccess.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/loginaccess.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/logindefs.vim b/syntax/logindefs.vim
index 6409a31e5..7b3fd00ba 100644
--- a/syntax/logindefs.vim
+++ b/syntax/logindefs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/logindefs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/logindefs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/logtalk.vim b/syntax/logtalk.vim
index 5deb393ea..e875c2d92 100644
--- a/syntax/logtalk.vim
+++ b/syntax/logtalk.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/logtalk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/logtalk.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lotos.vim b/syntax/lotos.vim
index 27f8512b5..fdd82b869 100644
--- a/syntax/lotos.vim
+++ b/syntax/lotos.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lotos.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lotos.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lout.vim b/syntax/lout.vim
index 4c8982acc..b2ab49e58 100644
--- a/syntax/lout.vim
+++ b/syntax/lout.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lout.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lout.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lpc.vim b/syntax/lpc.vim
index 6fbff0c50..e83fd6d2b 100644
--- a/syntax/lpc.vim
+++ b/syntax/lpc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lpc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lpc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lprolog.vim b/syntax/lprolog.vim
index 5541aa283..f3a9e06e8 100644
--- a/syntax/lprolog.vim
+++ b/syntax/lprolog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lprolog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lprolog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ls.vim b/syntax/ls.vim
index 056d0abe2..48d37a806 100644
--- a/syntax/ls.vim
+++ b/syntax/ls.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ls.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ls.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lsl.vim b/syntax/lsl.vim
index dfbec0c4b..f624d2a58 100644
--- a/syntax/lsl.vim
+++ b/syntax/lsl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lsl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lsl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lss.vim b/syntax/lss.vim
index a74543699..4384acdf3 100644
--- a/syntax/lss.vim
+++ b/syntax/lss.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lss.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lss.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lua.vim b/syntax/lua.vim
index 29ee33c6a..29d78de82 100644
--- a/syntax/lua.vim
+++ b/syntax/lua.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lua.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lua.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/lynx.vim b/syntax/lynx.vim
index 13c96b84e..fca7cc16c 100644
--- a/syntax/lynx.vim
+++ b/syntax/lynx.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/lynx.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/lynx.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/m4.vim b/syntax/m4.vim
index 772a6985a..04ff28cdd 100644
--- a/syntax/m4.vim
+++ b/syntax/m4.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/m4.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/m4.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mail.vim b/syntax/mail.vim
index dfa7069b5..ed88f97fc 100644
--- a/syntax/mail.vim
+++ b/syntax/mail.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mail.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mailaliases.vim b/syntax/mailaliases.vim
index d2a37c22e..6d2e9591c 100644
--- a/syntax/mailaliases.vim
+++ b/syntax/mailaliases.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mailaliases.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mailaliases.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mailcap.vim b/syntax/mailcap.vim
index 82fe7986e..0fa3da7c2 100644
--- a/syntax/mailcap.vim
+++ b/syntax/mailcap.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mailcap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mailcap.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/make.vim b/syntax/make.vim
index cb04511a7..3dc624586 100644
--- a/syntax/make.vim
+++ b/syntax/make.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/make.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/make.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mako.vim b/syntax/mako.vim
index 38aa67c30..aeaf4783e 100644
--- a/syntax/mako.vim
+++ b/syntax/mako.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mako.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mako.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mallard.vim b/syntax/mallard.vim
index 782c14467..f6d5664b6 100644
--- a/syntax/mallard.vim
+++ b/syntax/mallard.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mallard.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mallard.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/manconf.vim b/syntax/manconf.vim
index 6e70d99d4..09da2b349 100644
--- a/syntax/manconf.vim
+++ b/syntax/manconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/manconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/manconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/maple.vim b/syntax/maple.vim
index ddf0ab90e..2042ab045 100644
--- a/syntax/maple.vim
+++ b/syntax/maple.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/maple.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/maple.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index f4a809fc0..0cb4fa08e 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/markdown.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/markdown.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mason.vim b/syntax/mason.vim
index 6af8080da..11b39c5d9 100644
--- a/syntax/mason.vim
+++ b/syntax/mason.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mason.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mason.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/master.vim b/syntax/master.vim
index cd4d7bf45..bd2a48a4b 100644
--- a/syntax/master.vim
+++ b/syntax/master.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/master.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/master.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mel.vim b/syntax/mel.vim
index c0ab91094..bfbcbdbc9 100644
--- a/syntax/mel.vim
+++ b/syntax/mel.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mel.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/merlin.vim b/syntax/merlin.vim
index cf2292c32..8d6df186d 100644
--- a/syntax/merlin.vim
+++ b/syntax/merlin.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/merlin.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/merlin.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/meson.vim b/syntax/meson.vim
index 5153c88a8..593bc1b65 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/meson.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/meson.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/messages.vim b/syntax/messages.vim
index d9669ee55..e5fb68468 100644
--- a/syntax/messages.vim
+++ b/syntax/messages.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/messages.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/messages.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mf.vim b/syntax/mf.vim
index c1a01c0a1..120f502c0 100644
--- a/syntax/mf.vim
+++ b/syntax/mf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mgl.vim b/syntax/mgl.vim
index c5960af40..dc82b6903 100644
--- a/syntax/mgl.vim
+++ b/syntax/mgl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mgl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mgl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mgp.vim b/syntax/mgp.vim
index 2f9b545d2..146370bbf 100644
--- a/syntax/mgp.vim
+++ b/syntax/mgp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mgp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mgp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mib.vim b/syntax/mib.vim
index 238d31324..2427a6ff5 100644
--- a/syntax/mib.vim
+++ b/syntax/mib.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mib.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mib.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mix.vim b/syntax/mix.vim
index 90ad0b5a5..df9b09516 100644
--- a/syntax/mix.vim
+++ b/syntax/mix.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mix.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mma.vim b/syntax/mma.vim
index 01cbeb5dd..e51133c5d 100644
--- a/syntax/mma.vim
+++ b/syntax/mma.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mma.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mma.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mmp.vim b/syntax/mmp.vim
index 5431a451a..d0d827467 100644
--- a/syntax/mmp.vim
+++ b/syntax/mmp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mmp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mmp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/modconf.vim b/syntax/modconf.vim
index 5dc2a51b3..d94e9e11e 100644
--- a/syntax/modconf.vim
+++ b/syntax/modconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/modconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/modconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/modula2.vim b/syntax/modula2.vim
index a54d23096..1d14c554a 100644
--- a/syntax/modula2.vim
+++ b/syntax/modula2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/modula2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/modula2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/modula3.vim b/syntax/modula3.vim
index 4a520f2cb..0b64b9aa8 100644
--- a/syntax/modula3.vim
+++ b/syntax/modula3.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/modula3.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/modula3.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/monk.vim b/syntax/monk.vim
index 9c0365dd4..8f9438991 100644
--- a/syntax/monk.vim
+++ b/syntax/monk.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/monk.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/monk.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/moo.vim b/syntax/moo.vim
index 0d8f11aae..e36c587ea 100644
--- a/syntax/moo.vim
+++ b/syntax/moo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/moo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/moo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/moon.vim b/syntax/moon.vim
index 4d679a224..dba1188dc 100644
--- a/syntax/moon.vim
+++ b/syntax/moon.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/moon.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/moon.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mp.vim b/syntax/mp.vim
index 93be5d94e..92e57fb30 100644
--- a/syntax/mp.vim
+++ b/syntax/mp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mplayerconf.vim b/syntax/mplayerconf.vim
index 25a7bdbb5..dc50e1f47 100644
--- a/syntax/mplayerconf.vim
+++ b/syntax/mplayerconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mplayerconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mplayerconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mrxvtrc.vim b/syntax/mrxvtrc.vim
index 5d3affe07..c7fbdc96d 100644
--- a/syntax/mrxvtrc.vim
+++ b/syntax/mrxvtrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mrxvtrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mrxvtrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/msidl.vim b/syntax/msidl.vim
index e654e0a37..2f779e261 100644
--- a/syntax/msidl.vim
+++ b/syntax/msidl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/msidl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/msidl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/msql.vim b/syntax/msql.vim
index e9cf6edf5..aef3a3fdf 100644
--- a/syntax/msql.vim
+++ b/syntax/msql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/msql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/msql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mupad.vim b/syntax/mupad.vim
index 933a68ff9..deafcb309 100644
--- a/syntax/mupad.vim
+++ b/syntax/mupad.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mupad.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mupad.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/murphi.vim b/syntax/murphi.vim
index 7e1208a73..04e6faba4 100644
--- a/syntax/murphi.vim
+++ b/syntax/murphi.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/murphi.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/murphi.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mush.vim b/syntax/mush.vim
index ac7cb6f2c..902b0dbb2 100644
--- a/syntax/mush.vim
+++ b/syntax/mush.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mush.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mush.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mustache.vim b/syntax/mustache.vim
index a620e6a37..ebcc7f49d 100644
--- a/syntax/mustache.vim
+++ b/syntax/mustache.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mustache.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mustache.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/muttrc.vim b/syntax/muttrc.vim
index 0c4609e12..7d317e475 100644
--- a/syntax/muttrc.vim
+++ b/syntax/muttrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/muttrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/muttrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/mysql.vim b/syntax/mysql.vim
index 018a01e81..77de37a34 100644
--- a/syntax/mysql.vim
+++ b/syntax/mysql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/mysql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/mysql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/n1ql.vim b/syntax/n1ql.vim
index fa1648ef3..bf68e7b96 100644
--- a/syntax/n1ql.vim
+++ b/syntax/n1ql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/n1ql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/n1ql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/named.vim b/syntax/named.vim
index d422ef3e6..2ec365c31 100644
--- a/syntax/named.vim
+++ b/syntax/named.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/named.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/named.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/nanorc.vim b/syntax/nanorc.vim
index 93d6ecbe7..ed33bf256 100644
--- a/syntax/nanorc.vim
+++ b/syntax/nanorc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/nanorc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/nanorc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/natural.vim b/syntax/natural.vim
index 6c6b2d79d..02d72fbb0 100644
--- a/syntax/natural.vim
+++ b/syntax/natural.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/natural.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/natural.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ncf.vim b/syntax/ncf.vim
index 5f05580c1..0ecd27b08 100644
--- a/syntax/ncf.vim
+++ b/syntax/ncf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ncf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ncf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/neomuttrc.vim b/syntax/neomuttrc.vim
index 98c048b93..5e3929067 100644
--- a/syntax/neomuttrc.vim
+++ b/syntax/neomuttrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/neomuttrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/neomuttrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/netrc.vim b/syntax/netrc.vim
index 7c036ea6f..587267081 100644
--- a/syntax/netrc.vim
+++ b/syntax/netrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/netrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/netrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/nginx.vim b/syntax/nginx.vim
index 9a0be5db0..2c68c9e7d 100644
--- a/syntax/nginx.vim
+++ b/syntax/nginx.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/nginx.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/nginx.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/nim.vim b/syntax/nim.vim
index f01213c13..0286bea8b 100644
--- a/syntax/nim.vim
+++ b/syntax/nim.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/nim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/nim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ninja.vim b/syntax/ninja.vim
index 54dc9c6e6..e8a1c6232 100644
--- a/syntax/ninja.vim
+++ b/syntax/ninja.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ninja.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ninja.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/nix.vim b/syntax/nix.vim
index 047eded30..4b0557c62 100644
--- a/syntax/nix.vim
+++ b/syntax/nix.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/nix.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/nix.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/nqc.vim b/syntax/nqc.vim
index 16e601285..74424de6b 100644
--- a/syntax/nqc.vim
+++ b/syntax/nqc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/nqc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/nqc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/nroff.vim b/syntax/nroff.vim
index ea743fe68..bea5ddd17 100644
--- a/syntax/nroff.vim
+++ b/syntax/nroff.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/nroff.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/nroff.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/nsis.vim b/syntax/nsis.vim
index a3602d423..1577fd593 100644
--- a/syntax/nsis.vim
+++ b/syntax/nsis.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/nsis.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/nsis.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/oasis.vim b/syntax/oasis.vim
index 8534bcd4c..450cfade5 100644
--- a/syntax/oasis.vim
+++ b/syntax/oasis.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/oasis.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/oasis.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/obj.vim b/syntax/obj.vim
index cf4091674..9108089d2 100644
--- a/syntax/obj.vim
+++ b/syntax/obj.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/obj.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/obj.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index ce8c4b75c..3bdd77cd7 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ocaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ocaml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ocamlbuild_tags.vim b/syntax/ocamlbuild_tags.vim
index 469ce7b89..342324256 100644
--- a/syntax/ocamlbuild_tags.vim
+++ b/syntax/ocamlbuild_tags.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ocamlbuild_tags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ocamlbuild_tags.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/occam.vim b/syntax/occam.vim
index b0da63cbc..a69329fc0 100644
--- a/syntax/occam.vim
+++ b/syntax/occam.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/occam.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/occam.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ocpbuild.vim b/syntax/ocpbuild.vim
index e644d6de0..d3175eb12 100644
--- a/syntax/ocpbuild.vim
+++ b/syntax/ocpbuild.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ocpbuild.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ocpbuild.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ocpbuildroot.vim b/syntax/ocpbuildroot.vim
index cebc26b78..94ff36a52 100644
--- a/syntax/ocpbuildroot.vim
+++ b/syntax/ocpbuildroot.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ocpbuildroot.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ocpbuildroot.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/octave.vim b/syntax/octave.vim
index 686680a4a..331567c2a 100644
--- a/syntax/octave.vim
+++ b/syntax/octave.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/octave.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/octave.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/odin.vim b/syntax/odin.vim
index 23af11273..16036e431 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/odin.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/odin.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/omake.vim b/syntax/omake.vim
index 8de5c2fc6..38953ff56 100644
--- a/syntax/omake.vim
+++ b/syntax/omake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/omake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/omake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/omnimark.vim b/syntax/omnimark.vim
index 11c9edb0b..dc6cb0194 100644
--- a/syntax/omnimark.vim
+++ b/syntax/omnimark.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/omnimark.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/omnimark.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/opam.vim b/syntax/opam.vim
index f9a8ee860..f487e851d 100644
--- a/syntax/opam.vim
+++ b/syntax/opam.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/opam.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/opam.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/opencl.vim b/syntax/opencl.vim
index 8e82d0c46..6bcd63f3a 100644
--- a/syntax/opencl.vim
+++ b/syntax/opencl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/opencl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/opencl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/openroad.vim b/syntax/openroad.vim
index 022e4515f..be96596c5 100644
--- a/syntax/openroad.vim
+++ b/syntax/openroad.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/openroad.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/openroad.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/opl.vim b/syntax/opl.vim
index 8e19cc0f6..4feffec9a 100644
--- a/syntax/opl.vim
+++ b/syntax/opl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/opl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/opl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ora.vim b/syntax/ora.vim
index 68921f69a..87722362b 100644
--- a/syntax/ora.vim
+++ b/syntax/ora.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ora.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ora.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pamconf.vim b/syntax/pamconf.vim
index 12832522b..14c751ad3 100644
--- a/syntax/pamconf.vim
+++ b/syntax/pamconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pamconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pamconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pamenv.vim b/syntax/pamenv.vim
index 49992c9a6..2d158e4ad 100644
--- a/syntax/pamenv.vim
+++ b/syntax/pamenv.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pamenv.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pamenv.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/papp.vim b/syntax/papp.vim
index 658da9cbb..220aeee9c 100644
--- a/syntax/papp.vim
+++ b/syntax/papp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/papp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/papp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pascal.vim b/syntax/pascal.vim
index ebcdc30d0..038c55677 100644
--- a/syntax/pascal.vim
+++ b/syntax/pascal.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pascal.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pascal.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/passwd.vim b/syntax/passwd.vim
index 707dac365..ec8caae8b 100644
--- a/syntax/passwd.vim
+++ b/syntax/passwd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/passwd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/passwd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pccts.vim b/syntax/pccts.vim
index 353eb0e82..f9594aa3b 100644
--- a/syntax/pccts.vim
+++ b/syntax/pccts.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pccts.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pccts.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pdf.vim b/syntax/pdf.vim
index 6ff6ed35d..4a0a1c957 100644
--- a/syntax/pdf.vim
+++ b/syntax/pdf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pdf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pdf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/perl.vim b/syntax/perl.vim
index b4316b13a..f50a1dab8 100644
--- a/syntax/perl.vim
+++ b/syntax/perl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/perl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/perl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pf.vim b/syntax/pf.vim
index cdd727c13..9c37cba3c 100644
--- a/syntax/pf.vim
+++ b/syntax/pf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pfmain.vim b/syntax/pfmain.vim
index 1afe6b79e..311ad05db 100644
--- a/syntax/pfmain.vim
+++ b/syntax/pfmain.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pfmain.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pfmain.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 4339eb427..108cc268f 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pgsql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pgsql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/php.vim b/syntax/php.vim
index ef8382547..79302961b 100644
--- a/syntax/php.vim
+++ b/syntax/php.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/php.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/php.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pike.vim b/syntax/pike.vim
index 617a7438a..b089a3fff 100644
--- a/syntax/pike.vim
+++ b/syntax/pike.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pike.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pike.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pilrc.vim b/syntax/pilrc.vim
index 3c7c413ba..a463c82aa 100644
--- a/syntax/pilrc.vim
+++ b/syntax/pilrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pilrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pilrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pine.vim b/syntax/pine.vim
index ef1f39778..647de9ff0 100644
--- a/syntax/pine.vim
+++ b/syntax/pine.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pine.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pine.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pinfo.vim b/syntax/pinfo.vim
index e2b8fcd74..09404137c 100644
--- a/syntax/pinfo.vim
+++ b/syntax/pinfo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pinfo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pinfo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index 84ad75fe7..d4185ffb7 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/plantuml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/plantuml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pli.vim b/syntax/pli.vim
index c10363afa..72a075c0a 100644
--- a/syntax/pli.vim
+++ b/syntax/pli.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pli.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pli.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/plm.vim b/syntax/plm.vim
index c727f2faf..d81672e96 100644
--- a/syntax/plm.vim
+++ b/syntax/plm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/plm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/plm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/plp.vim b/syntax/plp.vim
index d5f98d600..29ac15034 100644
--- a/syntax/plp.vim
+++ b/syntax/plp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/plp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/plp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/plsql.vim b/syntax/plsql.vim
index 867a94983..c40575a85 100644
--- a/syntax/plsql.vim
+++ b/syntax/plsql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/plsql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/plsql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/po.vim b/syntax/po.vim
index efda99b82..217eebc38 100644
--- a/syntax/po.vim
+++ b/syntax/po.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/po.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/po.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pod.vim b/syntax/pod.vim
index a02921614..68c554602 100644
--- a/syntax/pod.vim
+++ b/syntax/pod.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pod.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pod.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pony.vim b/syntax/pony.vim
index 770c82579..a0d3d959a 100644
--- a/syntax/pony.vim
+++ b/syntax/pony.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pony.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pony.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/postscr.vim b/syntax/postscr.vim
index fdc83ceae..8aeea6309 100644
--- a/syntax/postscr.vim
+++ b/syntax/postscr.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/postscr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/postscr.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pov.vim b/syntax/pov.vim
index 357ddbc2f..5873d9345 100644
--- a/syntax/pov.vim
+++ b/syntax/pov.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pov.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pov.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/povini.vim b/syntax/povini.vim
index 773124af1..599429655 100644
--- a/syntax/povini.vim
+++ b/syntax/povini.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/povini.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/povini.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ppd.vim b/syntax/ppd.vim
index 6418cde86..7ba5a53c8 100644
--- a/syntax/ppd.vim
+++ b/syntax/ppd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ppd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ppd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ppwiz.vim b/syntax/ppwiz.vim
index 17d43a1e7..2cb20d708 100644
--- a/syntax/ppwiz.vim
+++ b/syntax/ppwiz.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ppwiz.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ppwiz.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/privoxy.vim b/syntax/privoxy.vim
index 3660977b7..31ffb85d2 100644
--- a/syntax/privoxy.vim
+++ b/syntax/privoxy.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/privoxy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/privoxy.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/procmail.vim b/syntax/procmail.vim
index 104f0bab9..137db9e45 100644
--- a/syntax/procmail.vim
+++ b/syntax/procmail.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/procmail.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/procmail.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/prolog.vim b/syntax/prolog.vim
index 60545b07d..2ba79f43a 100644
--- a/syntax/prolog.vim
+++ b/syntax/prolog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/prolog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/prolog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/promela.vim b/syntax/promela.vim
index 6c09d59af..f91e85884 100644
--- a/syntax/promela.vim
+++ b/syntax/promela.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/promela.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/promela.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/proto.vim b/syntax/proto.vim
index 62d0fab9b..cc1e6f9d4 100644
--- a/syntax/proto.vim
+++ b/syntax/proto.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/proto.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/proto.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/protocols.vim b/syntax/protocols.vim
index 986530a96..978f6810f 100644
--- a/syntax/protocols.vim
+++ b/syntax/protocols.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/protocols.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/protocols.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ps1.vim b/syntax/ps1.vim
index 9d9d2f280..8a80cf38a 100644
--- a/syntax/ps1.vim
+++ b/syntax/ps1.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ps1.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ps1.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ps1xml.vim b/syntax/ps1xml.vim
index 0032d2faa..3e341afdc 100644
--- a/syntax/ps1xml.vim
+++ b/syntax/ps1xml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ps1xml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ps1xml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/psf.vim b/syntax/psf.vim
index 2be429433..e5657e2cf 100644
--- a/syntax/psf.vim
+++ b/syntax/psf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/psf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/psf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pug.vim b/syntax/pug.vim
index 880ea6d2a..ceb6ebe21 100644
--- a/syntax/pug.vim
+++ b/syntax/pug.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pug.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pug.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/puppet.vim b/syntax/puppet.vim
index 9ca98f9a3..e6239a846 100644
--- a/syntax/puppet.vim
+++ b/syntax/puppet.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/puppet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/puppet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/purescript.vim b/syntax/purescript.vim
index f8a396ceb..259dab789 100644
--- a/syntax/purescript.vim
+++ b/syntax/purescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/purescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/purescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/pyrex.vim b/syntax/pyrex.vim
index 9d7fa4648..6ebb423b1 100644
--- a/syntax/pyrex.vim
+++ b/syntax/pyrex.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/pyrex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/pyrex.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/python.vim b/syntax/python.vim
index b7dcac5a5..8ace6f037 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/python.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/python.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/qmake.vim b/syntax/qmake.vim
index 4f3a748fe..74708ecea 100644
--- a/syntax/qmake.vim
+++ b/syntax/qmake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/qmake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/qmake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/qml.vim b/syntax/qml.vim
index 3189be602..e3006ebf2 100644
--- a/syntax/qml.vim
+++ b/syntax/qml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/qml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/qml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/quake.vim b/syntax/quake.vim
index 5d27ae2b1..413a1c562 100644
--- a/syntax/quake.vim
+++ b/syntax/quake.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/quake.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/quake.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/racket.vim b/syntax/racket.vim
index 4988ac304..ecd4eda61 100644
--- a/syntax/racket.vim
+++ b/syntax/racket.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/racket.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/racket.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/radiance.vim b/syntax/radiance.vim
index d608e0365..e77f64e20 100644
--- a/syntax/radiance.vim
+++ b/syntax/radiance.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/radiance.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/radiance.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ragel.vim b/syntax/ragel.vim
index 605aeb18b..37697ef75 100644
--- a/syntax/ragel.vim
+++ b/syntax/ragel.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ragel.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ragel.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/raku.vim b/syntax/raku.vim
index 510a2e23b..137fa7e06 100644
--- a/syntax/raku.vim
+++ b/syntax/raku.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/raku.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/raku.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/raml.vim b/syntax/raml.vim
index 5ba1c9531..a36847630 100644
--- a/syntax/raml.vim
+++ b/syntax/raml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/raml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/raml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ratpoison.vim b/syntax/ratpoison.vim
index ef8ad5a8c..b6e25067d 100644
--- a/syntax/ratpoison.vim
+++ b/syntax/ratpoison.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ratpoison.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ratpoison.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/razor.vim b/syntax/razor.vim
index 61429dfc1..de9247611 100644
--- a/syntax/razor.vim
+++ b/syntax/razor.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/razor.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/razor.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rc.vim b/syntax/rc.vim
index 092344046..d5b658c0b 100644
--- a/syntax/rc.vim
+++ b/syntax/rc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rcs.vim b/syntax/rcs.vim
index 62c7c81d8..4dfab84a7 100644
--- a/syntax/rcs.vim
+++ b/syntax/rcs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rcs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rcs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/readline.vim b/syntax/readline.vim
index 014802c0d..33a733f37 100644
--- a/syntax/readline.vim
+++ b/syntax/readline.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/readline.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/readline.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/reason.vim b/syntax/reason.vim
index e98bf608f..62b83c5f1 100644
--- a/syntax/reason.vim
+++ b/syntax/reason.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/reason.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/reason.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rego.vim b/syntax/rego.vim
index 5fc0a6a2d..c34a9780f 100644
--- a/syntax/rego.vim
+++ b/syntax/rego.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rego.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rego.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/remind.vim b/syntax/remind.vim
index 40501da6b..9ca10b49b 100644
--- a/syntax/remind.vim
+++ b/syntax/remind.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/remind.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/remind.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/requirements.vim b/syntax/requirements.vim
index 632891555..0167b41f8 100644
--- a/syntax/requirements.vim
+++ b/syntax/requirements.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/requirements.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/requirements.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/resolv.vim b/syntax/resolv.vim
index 0f0f1734f..b151ecd2d 100644
--- a/syntax/resolv.vim
+++ b/syntax/resolv.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/resolv.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/resolv.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/reva.vim b/syntax/reva.vim
index e4175f55c..0cc6c60d6 100644
--- a/syntax/reva.vim
+++ b/syntax/reva.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/reva.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/reva.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rexx.vim b/syntax/rexx.vim
index f9310fb82..fb9c6d559 100644
--- a/syntax/rexx.vim
+++ b/syntax/rexx.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rexx.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rexx.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rhelp.vim b/syntax/rhelp.vim
index ca7af3153..21c602d95 100644
--- a/syntax/rhelp.vim
+++ b/syntax/rhelp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rhelp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rhelp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rib.vim b/syntax/rib.vim
index eac47d853..279377fb3 100644
--- a/syntax/rib.vim
+++ b/syntax/rib.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rib.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rib.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rmd.vim b/syntax/rmd.vim
index dd8292cd9..555f102ab 100644
--- a/syntax/rmd.vim
+++ b/syntax/rmd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rmd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rmd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rnc.vim b/syntax/rnc.vim
index c07c7a0de..4226f53cf 100644
--- a/syntax/rnc.vim
+++ b/syntax/rnc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rnc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rnc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rng.vim b/syntax/rng.vim
index 75de79f4c..947f2436a 100644
--- a/syntax/rng.vim
+++ b/syntax/rng.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rng.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rng.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rnoweb-1.vim b/syntax/rnoweb-1.vim
index aa6b2b9e1..7e2f2a6fb 100644
--- a/syntax/rnoweb-1.vim
+++ b/syntax/rnoweb-1.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rnoweb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rnoweb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rnoweb-2.vim b/syntax/rnoweb-2.vim
index daba14c7c..f2c1b831c 100644
--- a/syntax/rnoweb-2.vim
+++ b/syntax/rnoweb-2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rnoweb-2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rnoweb-2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/robots.vim b/syntax/robots.vim
index e2b5ecddb..f6e428c03 100644
--- a/syntax/robots.vim
+++ b/syntax/robots.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/robots.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/robots.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rpcgen.vim b/syntax/rpcgen.vim
index ee911f4e0..4deb9a5cf 100644
--- a/syntax/rpcgen.vim
+++ b/syntax/rpcgen.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rpcgen.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rpcgen.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rpl.vim b/syntax/rpl.vim
index 3f49ccf16..3ebd63470 100644
--- a/syntax/rpl.vim
+++ b/syntax/rpl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rpl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rpl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rrst.vim b/syntax/rrst.vim
index 576200485..fde794cc2 100644
--- a/syntax/rrst.vim
+++ b/syntax/rrst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rrst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rrst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rst.vim b/syntax/rst.vim
index 6a729d1d4..337ade938 100644
--- a/syntax/rst.vim
+++ b/syntax/rst.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rst.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rst.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rtf.vim b/syntax/rtf.vim
index 1528dab8a..24b12498f 100644
--- a/syntax/rtf.vim
+++ b/syntax/rtf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rtf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rtf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index f61566ec7..8621075f6 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/ruby.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/ruby.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/rust.vim b/syntax/rust.vim
index 90fce408a..0c712813a 100644
--- a/syntax/rust.vim
+++ b/syntax/rust.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/rust.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/rust.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/samba.vim b/syntax/samba.vim
index e9bff267c..0f6910b69 100644
--- a/syntax/samba.vim
+++ b/syntax/samba.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/samba.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/samba.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sas.vim b/syntax/sas.vim
index ba85b4fbe..80490b6a1 100644
--- a/syntax/sas.vim
+++ b/syntax/sas.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sas.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sas.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sass.vim b/syntax/sass.vim
index e9b4be3bc..777a3b965 100644
--- a/syntax/sass.vim
+++ b/syntax/sass.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sass.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sass.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sather.vim b/syntax/sather.vim
index 70a1eaae6..f610e92d7 100644
--- a/syntax/sather.vim
+++ b/syntax/sather.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sather.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sather.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sbt.vim b/syntax/sbt.vim
index ee59f9b18..2a8d75fac 100644
--- a/syntax/sbt.vim
+++ b/syntax/sbt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sbt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sbt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/scala.vim b/syntax/scala.vim
index f4b0406d0..f6f2df9a4 100644
--- a/syntax/scala.vim
+++ b/syntax/scala.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/scala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/scala.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/scheme.vim b/syntax/scheme.vim
index 25fc6dcca..ee9c1ea4e 100644
--- a/syntax/scheme.vim
+++ b/syntax/scheme.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/scheme.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/scheme.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/scilab.vim b/syntax/scilab.vim
index 3b311f6c7..a551b8a29 100644
--- a/syntax/scilab.vim
+++ b/syntax/scilab.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/scilab.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/scilab.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/screen.vim b/syntax/screen.vim
index bcafa9e20..11da09e21 100644
--- a/syntax/screen.vim
+++ b/syntax/screen.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/screen.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/screen.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/scss.vim b/syntax/scss.vim
index 73345678d..03f311b73 100644
--- a/syntax/scss.vim
+++ b/syntax/scss.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/scss.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/scss.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sd.vim b/syntax/sd.vim
index dde0f4f75..ddc1c0ecc 100644
--- a/syntax/sd.vim
+++ b/syntax/sd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sdc.vim b/syntax/sdc.vim
index 4d9db3120..829954620 100644
--- a/syntax/sdc.vim
+++ b/syntax/sdc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sdc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sdc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sdl.vim b/syntax/sdl.vim
index 1b13ac4a1..c8a2b38e2 100644
--- a/syntax/sdl.vim
+++ b/syntax/sdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sed.vim b/syntax/sed.vim
index 338b5cc37..854c3229f 100644
--- a/syntax/sed.vim
+++ b/syntax/sed.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sed.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sed.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sensors.vim b/syntax/sensors.vim
index 087e7fae4..ae08c54cf 100644
--- a/syntax/sensors.vim
+++ b/syntax/sensors.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sensors.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sensors.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/services.vim b/syntax/services.vim
index fae3e65eb..a70be9274 100644
--- a/syntax/services.vim
+++ b/syntax/services.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/services.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/services.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/setserial.vim b/syntax/setserial.vim
index 43a5f73ff..271886997 100644
--- a/syntax/setserial.vim
+++ b/syntax/setserial.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/setserial.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/setserial.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sexplib.vim b/syntax/sexplib.vim
index ff6692442..65ae8b2bc 100644
--- a/syntax/sexplib.vim
+++ b/syntax/sexplib.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sexplib.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sexplib.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sh.vim b/syntax/sh.vim
index 3abe2d9da..f7f49184d 100644
--- a/syntax/sh.vim
+++ b/syntax/sh.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sh.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sh.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sieve.vim b/syntax/sieve.vim
index 8d8ad8f2a..1bf06c868 100644
--- a/syntax/sieve.vim
+++ b/syntax/sieve.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sieve.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sieve.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sil.vim b/syntax/sil.vim
index a4bf53596..8f49c690f 100644
--- a/syntax/sil.vim
+++ b/syntax/sil.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sil.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sil.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/simula.vim b/syntax/simula.vim
index 5d83519ef..95579e3b7 100644
--- a/syntax/simula.vim
+++ b/syntax/simula.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/simula.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/simula.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sinda.vim b/syntax/sinda.vim
index 27f22df60..6f257bbd2 100644
--- a/syntax/sinda.vim
+++ b/syntax/sinda.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sinda.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sinda.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sisu.vim b/syntax/sisu.vim
index f703e138c..7d5bedbac 100644
--- a/syntax/sisu.vim
+++ b/syntax/sisu.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sisu.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sisu.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/skill.vim b/syntax/skill.vim
index ed1c1975b..61f1a2e91 100644
--- a/syntax/skill.vim
+++ b/syntax/skill.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/skill.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/skill.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/slang.vim b/syntax/slang.vim
index 92bd79e39..b92ac736d 100644
--- a/syntax/slang.vim
+++ b/syntax/slang.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/slang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/slang.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/slice.vim b/syntax/slice.vim
index 6b595d08c..d9b16e64f 100644
--- a/syntax/slice.vim
+++ b/syntax/slice.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/slice.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/slice.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/slim.vim b/syntax/slim.vim
index 91f74f98f..4d6ee3d6c 100644
--- a/syntax/slim.vim
+++ b/syntax/slim.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/slim.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/slim.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/slime.vim b/syntax/slime.vim
index b47b79bc5..4420e95a1 100644
--- a/syntax/slime.vim
+++ b/syntax/slime.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/slime.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/slime.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/slpconf.vim b/syntax/slpconf.vim
index 1c70cbff7..93c081f50 100644
--- a/syntax/slpconf.vim
+++ b/syntax/slpconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/slpconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/slpconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/slpreg.vim b/syntax/slpreg.vim
index 26b5c09d8..5aa34439e 100644
--- a/syntax/slpreg.vim
+++ b/syntax/slpreg.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/slpreg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/slpreg.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/slpspi.vim b/syntax/slpspi.vim
index 7c78ff5b9..93607f486 100644
--- a/syntax/slpspi.vim
+++ b/syntax/slpspi.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/slpspi.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/slpspi.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/slrnrc.vim b/syntax/slrnrc.vim
index 5f03453e4..f609aff80 100644
--- a/syntax/slrnrc.vim
+++ b/syntax/slrnrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/slrnrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/slrnrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/slrnsc.vim b/syntax/slrnsc.vim
index 3d168331b..fdc527e8b 100644
--- a/syntax/slrnsc.vim
+++ b/syntax/slrnsc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/slrnsc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/slrnsc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sm.vim b/syntax/sm.vim
index b1336a6c8..7187d484e 100644
--- a/syntax/sm.vim
+++ b/syntax/sm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/smarty.vim b/syntax/smarty.vim
index edda9d81d..b6c245a33 100644
--- a/syntax/smarty.vim
+++ b/syntax/smarty.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/smarty.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/smarty.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/smcl.vim b/syntax/smcl.vim
index 024443564..6c83bb89f 100644
--- a/syntax/smcl.vim
+++ b/syntax/smcl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/smcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/smcl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/smhl.vim b/syntax/smhl.vim
index 6e827414c..3dbbd9d3d 100644
--- a/syntax/smhl.vim
+++ b/syntax/smhl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/smhl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/smhl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/smith.vim b/syntax/smith.vim
index 10b5b55b9..09a7aa879 100644
--- a/syntax/smith.vim
+++ b/syntax/smith.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/smith.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/smith.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sml.vim b/syntax/sml.vim
index 1970e9998..7e74d1689 100644
--- a/syntax/sml.vim
+++ b/syntax/sml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/smt2.vim b/syntax/smt2.vim
index 0ca504ea2..adae886d3 100644
--- a/syntax/smt2.vim
+++ b/syntax/smt2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/smt2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/smt2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/snobol4.vim b/syntax/snobol4.vim
index a2787f15e..b24798a05 100644
--- a/syntax/snobol4.vim
+++ b/syntax/snobol4.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/snobol4.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/snobol4.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index 4f2a15e59..90f48dac7 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/solidity.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/solidity.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/spec.vim b/syntax/spec.vim
index 3d7cf35d7..4dee097d5 100644
--- a/syntax/spec.vim
+++ b/syntax/spec.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/spec.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/spec.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/spice.vim b/syntax/spice.vim
index 42c882cb6..92ebb5f9e 100644
--- a/syntax/spice.vim
+++ b/syntax/spice.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/spice.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/spice.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/spup.vim b/syntax/spup.vim
index de3389956..51c4bb533 100644
--- a/syntax/spup.vim
+++ b/syntax/spup.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/spup.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/spup.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/spyce.vim b/syntax/spyce.vim
index 24bf358d9..e2a1a3d75 100644
--- a/syntax/spyce.vim
+++ b/syntax/spyce.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/spyce.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/spyce.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sql.vim b/syntax/sql.vim
index e0979489b..46fc5d67f 100644
--- a/syntax/sql.vim
+++ b/syntax/sql.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sql.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sql.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sqlj.vim b/syntax/sqlj.vim
index 74193bc3f..f2623dc46 100644
--- a/syntax/sqlj.vim
+++ b/syntax/sqlj.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sqlj.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sqlj.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sqloracle.vim b/syntax/sqloracle.vim
index 494f8c916..7eacd6e62 100644
--- a/syntax/sqloracle.vim
+++ b/syntax/sqloracle.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sqloracle.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sqloracle.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sqr.vim b/syntax/sqr.vim
index 89474ff3a..4524dea46 100644
--- a/syntax/sqr.vim
+++ b/syntax/sqr.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sqr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sqr.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/squid.vim b/syntax/squid.vim
index 05d4dd7e9..d9c620159 100644
--- a/syntax/squid.vim
+++ b/syntax/squid.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/squid.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/squid.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/srec.vim b/syntax/srec.vim
index 5375700e3..9c2b4ce33 100644
--- a/syntax/srec.vim
+++ b/syntax/srec.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/srec.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/srec.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sshconfig.vim b/syntax/sshconfig.vim
index 7ba0d05fe..5b6346f3a 100644
--- a/syntax/sshconfig.vim
+++ b/syntax/sshconfig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sshconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sshconfig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sshdconfig.vim b/syntax/sshdconfig.vim
index 49c9d1f69..1c6b6db53 100644
--- a/syntax/sshdconfig.vim
+++ b/syntax/sshdconfig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sshdconfig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sshdconfig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/st.vim b/syntax/st.vim
index c5ea48504..1b46c7b67 100644
--- a/syntax/st.vim
+++ b/syntax/st.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/st.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/st.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/stata.vim b/syntax/stata.vim
index 9a972ad01..be04f59c5 100644
--- a/syntax/stata.vim
+++ b/syntax/stata.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/stata.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/stata.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/stp.vim b/syntax/stp.vim
index 04c70fe43..bab05d2de 100644
--- a/syntax/stp.vim
+++ b/syntax/stp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/stp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/stp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/stylus.vim b/syntax/stylus.vim
index 0f32d2d83..a77c9fa18 100644
--- a/syntax/stylus.vim
+++ b/syntax/stylus.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/stylus.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/stylus.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sudoers.vim b/syntax/sudoers.vim
index 4482fac7e..aa16986f5 100644
--- a/syntax/sudoers.vim
+++ b/syntax/sudoers.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sudoers.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sudoers.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index 377964e69..c452182fe 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/svelte.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/svelte.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/svg.vim b/syntax/svg.vim
index 676cfc9fd..166e3e294 100644
--- a/syntax/svg.vim
+++ b/syntax/svg.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/svg.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/svg.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/svn.vim b/syntax/svn.vim
index ae7f7875f..33340ea98 100644
--- a/syntax/svn.vim
+++ b/syntax/svn.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/svn.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/svn.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/swift.vim b/syntax/swift.vim
index 26d9d7a00..b4207bb05 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/swift.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/swift.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/swiftgyb.vim b/syntax/swiftgyb.vim
index b85fe036c..39cad20da 100644
--- a/syntax/swiftgyb.vim
+++ b/syntax/swiftgyb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/swiftgyb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/swiftgyb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sxhkdrc.vim b/syntax/sxhkdrc.vim
index 7f413409a..cabfe4980 100644
--- a/syntax/sxhkdrc.vim
+++ b/syntax/sxhkdrc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sxhkdrc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sxhkdrc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/sysctl.vim b/syntax/sysctl.vim
index 1fccb9845..6e611f06a 100644
--- a/syntax/sysctl.vim
+++ b/syntax/sysctl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/sysctl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/sysctl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/systemd.vim b/syntax/systemd.vim
index d72197193..eccf6c8f1 100644
--- a/syntax/systemd.vim
+++ b/syntax/systemd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/systemd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/systemd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/systemverilog.vim b/syntax/systemverilog.vim
index 823780adc..dc27e532e 100644
--- a/syntax/systemverilog.vim
+++ b/syntax/systemverilog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/systemverilog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/systemverilog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tablegen.vim b/syntax/tablegen.vim
index ab77c6238..4cd21e325 100644
--- a/syntax/tablegen.vim
+++ b/syntax/tablegen.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tablegen.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tablegen.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tads.vim b/syntax/tads.vim
index e47cad71d..c38d4b570 100644
--- a/syntax/tads.vim
+++ b/syntax/tads.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tads.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tads.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tags.vim b/syntax/tags.vim
index b3b5b36d6..eb121a78f 100644
--- a/syntax/tags.vim
+++ b/syntax/tags.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tags.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tags.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tak.vim b/syntax/tak.vim
index 149229392..00b76ccb4 100644
--- a/syntax/tak.vim
+++ b/syntax/tak.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tak.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tak.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tap.vim b/syntax/tap.vim
index ff491f39c..d38b960b5 100644
--- a/syntax/tap.vim
+++ b/syntax/tap.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tap.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/taskdata.vim b/syntax/taskdata.vim
index e0b18445e..ca3165f98 100644
--- a/syntax/taskdata.vim
+++ b/syntax/taskdata.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/taskdata.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/taskdata.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/taskedit.vim b/syntax/taskedit.vim
index d3674f906..736805f64 100644
--- a/syntax/taskedit.vim
+++ b/syntax/taskedit.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/taskedit.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/taskedit.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tcl.vim b/syntax/tcl.vim
index f03c13477..76bd5eb89 100644
--- a/syntax/tcl.vim
+++ b/syntax/tcl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tcl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/template.vim b/syntax/template.vim
index c2cd69aa8..477c8e047 100644
--- a/syntax/template.vim
+++ b/syntax/template.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/template.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/template.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/teraterm.vim b/syntax/teraterm.vim
index db59b2310..44d66ef60 100644
--- a/syntax/teraterm.vim
+++ b/syntax/teraterm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/teraterm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/teraterm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/terminfo.vim b/syntax/terminfo.vim
index 2251ff6e1..1933c7341 100644
--- a/syntax/terminfo.vim
+++ b/syntax/terminfo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/terminfo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/terminfo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/terraform.vim b/syntax/terraform.vim
index 2339c23f9..e071ce8dd 100644
--- a/syntax/terraform.vim
+++ b/syntax/terraform.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/terraform.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/terraform.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tex.vim b/syntax/tex.vim
index ecbc66f7c..45d763cb9 100644
--- a/syntax/tex.vim
+++ b/syntax/tex.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tex.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tex.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/texinfo.vim b/syntax/texinfo.vim
index be333cd28..f76c9b60c 100644
--- a/syntax/texinfo.vim
+++ b/syntax/texinfo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/texinfo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/texinfo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/texmf.vim b/syntax/texmf.vim
index f55de21c5..ae1cbe36f 100644
--- a/syntax/texmf.vim
+++ b/syntax/texmf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/texmf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/texmf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/textile.vim b/syntax/textile.vim
index e5ccc7ae4..65a1953b9 100644
--- a/syntax/textile.vim
+++ b/syntax/textile.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/textile.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/textile.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tf.vim b/syntax/tf.vim
index 0bc237858..b12663cbd 100644
--- a/syntax/tf.vim
+++ b/syntax/tf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/thrift.vim b/syntax/thrift.vim
index aaa546a45..da97a7158 100644
--- a/syntax/thrift.vim
+++ b/syntax/thrift.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/thrift.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/thrift.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tidy.vim b/syntax/tidy.vim
index 2ace1fc00..4ba65155b 100644
--- a/syntax/tidy.vim
+++ b/syntax/tidy.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tidy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tidy.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tilde.vim b/syntax/tilde.vim
index d67f89ea4..11012e954 100644
--- a/syntax/tilde.vim
+++ b/syntax/tilde.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tilde.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tilde.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tli.vim b/syntax/tli.vim
index 87b85fd4c..c177878af 100644
--- a/syntax/tli.vim
+++ b/syntax/tli.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tli.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tli.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index f992751f3..9d72c5f77 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tmux.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tmux.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/toml.vim b/syntax/toml.vim
index 43c6e87e9..49d1141ae 100644
--- a/syntax/toml.vim
+++ b/syntax/toml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/toml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/toml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tpp.vim b/syntax/tpp.vim
index 7057879fd..c728e23df 100644
--- a/syntax/tpp.vim
+++ b/syntax/tpp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tpp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tpp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tptp.vim b/syntax/tptp.vim
index 7c29b43f1..81164ff58 100644
--- a/syntax/tptp.vim
+++ b/syntax/tptp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tptp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tptp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/trasys.vim b/syntax/trasys.vim
index bd5214392..23ce05874 100644
--- a/syntax/trasys.vim
+++ b/syntax/trasys.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/trasys.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/trasys.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/treetop.vim b/syntax/treetop.vim
index 53cf77182..b7dea5630 100644
--- a/syntax/treetop.vim
+++ b/syntax/treetop.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/treetop.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/treetop.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/trustees.vim b/syntax/trustees.vim
index 7a29a6670..f75142820 100644
--- a/syntax/trustees.vim
+++ b/syntax/trustees.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/trustees.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/trustees.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tsalt.vim b/syntax/tsalt.vim
index 733f16832..b7fed635a 100644
--- a/syntax/tsalt.vim
+++ b/syntax/tsalt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tsalt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tsalt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tsscl.vim b/syntax/tsscl.vim
index a20488bea..33079116a 100644
--- a/syntax/tsscl.vim
+++ b/syntax/tsscl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tsscl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tsscl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tssgm.vim b/syntax/tssgm.vim
index f96c71cb3..69b109215 100644
--- a/syntax/tssgm.vim
+++ b/syntax/tssgm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tssgm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tssgm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tssop.vim b/syntax/tssop.vim
index 175a12eb4..771c41819 100644
--- a/syntax/tssop.vim
+++ b/syntax/tssop.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tssop.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tssop.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tt2.vim b/syntax/tt2.vim
index 24cd9c662..5806a9890 100644
--- a/syntax/tt2.vim
+++ b/syntax/tt2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tt2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tt2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tt2html.vim b/syntax/tt2html.vim
index 6ab610823..bc614e00c 100644
--- a/syntax/tt2html.vim
+++ b/syntax/tt2html.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tt2html.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tt2html.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/tt2js.vim b/syntax/tt2js.vim
index 77110ff9b..430556127 100644
--- a/syntax/tt2js.vim
+++ b/syntax/tt2js.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/tt2js.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/tt2js.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/twig.vim b/syntax/twig.vim
index 73e3ace85..797680662 100644
--- a/syntax/twig.vim
+++ b/syntax/twig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/twig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/twig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/typescript.vim b/syntax/typescript.vim
index e6a3e4142..407a7b46b 100644
--- a/syntax/typescript.vim
+++ b/syntax/typescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/typescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/typescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/typescriptreact.vim b/syntax/typescriptreact.vim
index 1eca36b38..1adad053f 100644
--- a/syntax/typescriptreact.vim
+++ b/syntax/typescriptreact.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/typescriptreact.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/typescriptreact.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/uc.vim b/syntax/uc.vim
index 912e4e252..b820435be 100644
--- a/syntax/uc.vim
+++ b/syntax/uc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/uc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/uc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/udevconf.vim b/syntax/udevconf.vim
index 077cfe886..2d7a5f72c 100644
--- a/syntax/udevconf.vim
+++ b/syntax/udevconf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/udevconf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/udevconf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/udevperm.vim b/syntax/udevperm.vim
index ee52607ff..760d665f4 100644
--- a/syntax/udevperm.vim
+++ b/syntax/udevperm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/udevperm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/udevperm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/uil.vim b/syntax/uil.vim
index 72569b54b..cd46ea188 100644
--- a/syntax/uil.vim
+++ b/syntax/uil.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/uil.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/uil.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/unison.vim b/syntax/unison.vim
index 7774a64c0..90ca9c495 100644
--- a/syntax/unison.vim
+++ b/syntax/unison.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/unison.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/unison.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/updatedb.vim b/syntax/updatedb.vim
index f1cb406bd..b1a66d072 100644
--- a/syntax/updatedb.vim
+++ b/syntax/updatedb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/updatedb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/updatedb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/upstart.vim b/syntax/upstart.vim
index ca1c12750..66f233e3b 100644
--- a/syntax/upstart.vim
+++ b/syntax/upstart.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/upstart.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/upstart.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/upstreamdat.vim b/syntax/upstreamdat.vim
index 0f3b60a27..e05a0f8be 100644
--- a/syntax/upstreamdat.vim
+++ b/syntax/upstreamdat.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/upstreamdat.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/upstreamdat.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/upstreaminstalllog.vim b/syntax/upstreaminstalllog.vim
index 7e7cf2489..3e75d1098 100644
--- a/syntax/upstreaminstalllog.vim
+++ b/syntax/upstreaminstalllog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/upstreaminstalllog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/upstreaminstalllog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/upstreamlog.vim b/syntax/upstreamlog.vim
index 0b0e9f26f..b442718b9 100644
--- a/syntax/upstreamlog.vim
+++ b/syntax/upstreamlog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/upstreamlog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/upstreamlog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/usserverlog.vim b/syntax/usserverlog.vim
index 0711c54f4..c651909e2 100644
--- a/syntax/usserverlog.vim
+++ b/syntax/usserverlog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/usserverlog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/usserverlog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/usw2kagtlog.vim b/syntax/usw2kagtlog.vim
index 53d2a08a4..2467b8d92 100644
--- a/syntax/usw2kagtlog.vim
+++ b/syntax/usw2kagtlog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/usw2kagtlog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/usw2kagtlog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vala.vim b/syntax/vala.vim
index 5854fdc9c..c48851b34 100644
--- a/syntax/vala.vim
+++ b/syntax/vala.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vala.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vala.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vb.vim b/syntax/vb.vim
index 869066666..9269f59ea 100644
--- a/syntax/vb.vim
+++ b/syntax/vb.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vb.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vb.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vbnet.vim b/syntax/vbnet.vim
index 695349ccc..5a7776496 100644
--- a/syntax/vbnet.vim
+++ b/syntax/vbnet.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vbnet.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vbnet.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vcl.vim b/syntax/vcl.vim
index 92bc17c30..03ff7ee88 100644
--- a/syntax/vcl.vim
+++ b/syntax/vcl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vcl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vcl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/velocity.vim b/syntax/velocity.vim
index bf855de60..65f37fd98 100644
--- a/syntax/velocity.vim
+++ b/syntax/velocity.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/velocity.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/velocity.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vera.vim b/syntax/vera.vim
index 4238909c7..28ae65f3e 100644
--- a/syntax/vera.vim
+++ b/syntax/vera.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vera.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vera.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/verilog.vim b/syntax/verilog.vim
index d7d27f79d..92f8b68ff 100644
--- a/syntax/verilog.vim
+++ b/syntax/verilog.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/verilog.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/verilog.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/verilogams.vim b/syntax/verilogams.vim
index 100ae92b8..dd2c59948 100644
--- a/syntax/verilogams.vim
+++ b/syntax/verilogams.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/verilogams.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/verilogams.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vgrindefs.vim b/syntax/vgrindefs.vim
index a6f6e86ac..42f72018c 100644
--- a/syntax/vgrindefs.vim
+++ b/syntax/vgrindefs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vgrindefs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vgrindefs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vhdl.vim b/syntax/vhdl.vim
index 75771c6f2..b5cbe9cda 100644
--- a/syntax/vhdl.vim
+++ b/syntax/vhdl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vhdl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vhdl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vimgo.vim b/syntax/vimgo.vim
index f0b6fe42d..5066c4cf7 100644
--- a/syntax/vimgo.vim
+++ b/syntax/vimgo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vimgo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vimgo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/viminfo.vim b/syntax/viminfo.vim
index 589398c42..1c992da11 100644
--- a/syntax/viminfo.vim
+++ b/syntax/viminfo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/viminfo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/viminfo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vlang.vim b/syntax/vlang.vim
index 12f5e2767..b7b1ed4a6 100644
--- a/syntax/vlang.vim
+++ b/syntax/vlang.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vlang.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vlang.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vmasm.vim b/syntax/vmasm.vim
index 034a4b199..4c3176c3e 100644
--- a/syntax/vmasm.vim
+++ b/syntax/vmasm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vmasm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vmasm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/voscm.vim b/syntax/voscm.vim
index 24b43904c..e7bd12570 100644
--- a/syntax/voscm.vim
+++ b/syntax/voscm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/voscm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/voscm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vrml.vim b/syntax/vrml.vim
index 02fca957d..6f73ff546 100644
--- a/syntax/vrml.vim
+++ b/syntax/vrml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vrml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vrml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vroom.vim b/syntax/vroom.vim
index 00bf151f8..9af1a992d 100644
--- a/syntax/vroom.vim
+++ b/syntax/vroom.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vroom.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vroom.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/vue.vim b/syntax/vue.vim
index d516f4097..26d6d3f49 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/vue.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/vue.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/wast.vim b/syntax/wast.vim
index d47d344df..e76ad62cd 100644
--- a/syntax/wast.vim
+++ b/syntax/wast.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/wast.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/wast.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/webmacro.vim b/syntax/webmacro.vim
index 3e9add54c..e994d5d3f 100644
--- a/syntax/webmacro.vim
+++ b/syntax/webmacro.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/webmacro.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/webmacro.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/wget.vim b/syntax/wget.vim
index e81980e06..25b03c806 100644
--- a/syntax/wget.vim
+++ b/syntax/wget.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/wget.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/wget.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/winbatch.vim b/syntax/winbatch.vim
index 3c7ad59be..82f717a98 100644
--- a/syntax/winbatch.vim
+++ b/syntax/winbatch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/winbatch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/winbatch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/wml.vim b/syntax/wml.vim
index be4b620ae..e5c8ca504 100644
--- a/syntax/wml.vim
+++ b/syntax/wml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/wml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/wml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/wsh.vim b/syntax/wsh.vim
index bd132b3c5..019d97440 100644
--- a/syntax/wsh.vim
+++ b/syntax/wsh.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/wsh.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/wsh.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/wsml.vim b/syntax/wsml.vim
index ef8c3623c..7f38e798e 100644
--- a/syntax/wsml.vim
+++ b/syntax/wsml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/wsml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/wsml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/wvdial.vim b/syntax/wvdial.vim
index d9a47e26f..71407cb45 100644
--- a/syntax/wvdial.vim
+++ b/syntax/wvdial.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/wvdial.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/wvdial.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xdc.vim b/syntax/xdc.vim
index 8a7684404..8f06e618c 100644
--- a/syntax/xdc.vim
+++ b/syntax/xdc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xdc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xdc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xdefaults.vim b/syntax/xdefaults.vim
index 78c7b8a80..a37e9a968 100644
--- a/syntax/xdefaults.vim
+++ b/syntax/xdefaults.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xdefaults.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xdefaults.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xf86conf.vim b/syntax/xf86conf.vim
index 90af49cb2..168962a90 100644
--- a/syntax/xf86conf.vim
+++ b/syntax/xf86conf.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xf86conf.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xf86conf.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xhtml.vim b/syntax/xhtml.vim
index c58dc3c8b..eceec40e7 100644
--- a/syntax/xhtml.vim
+++ b/syntax/xhtml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xhtml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xhtml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xinetd.vim b/syntax/xinetd.vim
index c9ff0fc06..509f69eb2 100644
--- a/syntax/xinetd.vim
+++ b/syntax/xinetd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xinetd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xinetd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xmath.vim b/syntax/xmath.vim
index 068a279b9..24c59aa6b 100644
--- a/syntax/xmath.vim
+++ b/syntax/xmath.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xmath.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xmath.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xml.vim b/syntax/xml.vim
index 724f3cc6e..8491c7d7d 100644
--- a/syntax/xml.vim
+++ b/syntax/xml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xmodmap.vim b/syntax/xmodmap.vim
index 96fc01893..b63ab37e7 100644
--- a/syntax/xmodmap.vim
+++ b/syntax/xmodmap.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xmodmap.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xmodmap.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xpm.vim b/syntax/xpm.vim
index 96289c11c..e3f38b306 100644
--- a/syntax/xpm.vim
+++ b/syntax/xpm.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xpm.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xpm.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xpm2.vim b/syntax/xpm2.vim
index 333d8b628..d31a248fa 100644
--- a/syntax/xpm2.vim
+++ b/syntax/xpm2.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xpm2.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xpm2.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xquery.vim b/syntax/xquery.vim
index b71b4c4ef..607ea5523 100644
--- a/syntax/xquery.vim
+++ b/syntax/xquery.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xquery.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xquery.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xs.vim b/syntax/xs.vim
index 80d559a5a..cfeb65cab 100644
--- a/syntax/xs.vim
+++ b/syntax/xs.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xs.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xs.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xsd.vim b/syntax/xsd.vim
index 325486cf8..2ffc9cb94 100644
--- a/syntax/xsd.vim
+++ b/syntax/xsd.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xsd.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xsd.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xsl.vim b/syntax/xsl.vim
index 0a5d5cc8f..23a1499b9 100644
--- a/syntax/xsl.vim
+++ b/syntax/xsl.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xsl.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xsl.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/xslt.vim b/syntax/xslt.vim
index 2db1f3ea6..e5976009e 100644
--- a/syntax/xslt.vim
+++ b/syntax/xslt.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/xslt.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/xslt.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yacc.vim b/syntax/yacc.vim
index e687bb41d..70c63a4b8 100644
--- a/syntax/yacc.vim
+++ b/syntax/yacc.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yacc.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yacc.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yaml.vim b/syntax/yaml.vim
index a0fa5b9d4..d40cdfca2 100644
--- a/syntax/yaml.vim
+++ b/syntax/yaml.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yaml.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yaml.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats.vim b/syntax/yats.vim
index b3e95b05a..4475692f6 100644
--- a/syntax/yats.vim
+++ b/syntax/yats.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/css.vim b/syntax/yats/css.vim
index c4f3ae6ec..043fe1ba2 100644
--- a/syntax/yats/css.vim
+++ b/syntax/yats/css.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/css.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/css.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/dom-document.vim b/syntax/yats/dom-document.vim
index 3d6d97628..2063c5229 100644
--- a/syntax/yats/dom-document.vim
+++ b/syntax/yats/dom-document.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/dom-document.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/dom-document.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/dom-elem.vim b/syntax/yats/dom-elem.vim
index 32349a33b..23317a8ae 100644
--- a/syntax/yats/dom-elem.vim
+++ b/syntax/yats/dom-elem.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/dom-elem.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/dom-elem.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/dom-event.vim b/syntax/yats/dom-event.vim
index 698cd0e1d..be08f14a3 100644
--- a/syntax/yats/dom-event.vim
+++ b/syntax/yats/dom-event.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/dom-event.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/dom-event.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/dom-form.vim b/syntax/yats/dom-form.vim
index eecd8453f..8982bdfec 100644
--- a/syntax/yats/dom-form.vim
+++ b/syntax/yats/dom-form.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/dom-form.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/dom-form.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/dom-node.vim b/syntax/yats/dom-node.vim
index 32e4142a1..1367fa6b1 100644
--- a/syntax/yats/dom-node.vim
+++ b/syntax/yats/dom-node.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/dom-node.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/dom-node.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/dom-storage.vim b/syntax/yats/dom-storage.vim
index c34ab0172..198df1399 100644
--- a/syntax/yats/dom-storage.vim
+++ b/syntax/yats/dom-storage.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/dom-storage.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/dom-storage.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/ecma-402.vim b/syntax/yats/ecma-402.vim
index 98c103c2b..d7d15ed6f 100644
--- a/syntax/yats/ecma-402.vim
+++ b/syntax/yats/ecma-402.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/ecma-402.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/ecma-402.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-array.vim b/syntax/yats/es6-array.vim
index 2b658f257..7b91b44a6 100644
--- a/syntax/yats/es6-array.vim
+++ b/syntax/yats/es6-array.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-array.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-array.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-date.vim b/syntax/yats/es6-date.vim
index cd91fa537..706d82ef1 100644
--- a/syntax/yats/es6-date.vim
+++ b/syntax/yats/es6-date.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-date.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-date.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-function.vim b/syntax/yats/es6-function.vim
index 14c137aec..8c08aa3c7 100644
--- a/syntax/yats/es6-function.vim
+++ b/syntax/yats/es6-function.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-function.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-function.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-json.vim b/syntax/yats/es6-json.vim
index b01a878d8..1950012d7 100644
--- a/syntax/yats/es6-json.vim
+++ b/syntax/yats/es6-json.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-json.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-json.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-map.vim b/syntax/yats/es6-map.vim
index ec618928c..589b0ee03 100644
--- a/syntax/yats/es6-map.vim
+++ b/syntax/yats/es6-map.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-map.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-map.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-math.vim b/syntax/yats/es6-math.vim
index fd86a1907..188a9b9ab 100644
--- a/syntax/yats/es6-math.vim
+++ b/syntax/yats/es6-math.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-math.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-math.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-number.vim b/syntax/yats/es6-number.vim
index a090e49b7..f51e3c1e2 100644
--- a/syntax/yats/es6-number.vim
+++ b/syntax/yats/es6-number.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-number.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-number.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-object.vim b/syntax/yats/es6-object.vim
index 55c6f9435..1b2f9c336 100644
--- a/syntax/yats/es6-object.vim
+++ b/syntax/yats/es6-object.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-object.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-object.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-promise.vim b/syntax/yats/es6-promise.vim
index 6c1b4e8ad..6068cf944 100644
--- a/syntax/yats/es6-promise.vim
+++ b/syntax/yats/es6-promise.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-promise.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-promise.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-proxy.vim b/syntax/yats/es6-proxy.vim
index 9451dbe5b..1c6398ec6 100644
--- a/syntax/yats/es6-proxy.vim
+++ b/syntax/yats/es6-proxy.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-proxy.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-proxy.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-reflect.vim b/syntax/yats/es6-reflect.vim
index 6e3de79eb..6b3da9ffb 100644
--- a/syntax/yats/es6-reflect.vim
+++ b/syntax/yats/es6-reflect.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-reflect.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-reflect.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-regexp.vim b/syntax/yats/es6-regexp.vim
index a6c50632f..9a8d87255 100644
--- a/syntax/yats/es6-regexp.vim
+++ b/syntax/yats/es6-regexp.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-regexp.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-regexp.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-set.vim b/syntax/yats/es6-set.vim
index 024743bc3..b116d4fbb 100644
--- a/syntax/yats/es6-set.vim
+++ b/syntax/yats/es6-set.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-set.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-set.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-string.vim b/syntax/yats/es6-string.vim
index f4ef7f36e..acb6d5a20 100644
--- a/syntax/yats/es6-string.vim
+++ b/syntax/yats/es6-string.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-string.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-string.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/es6-symbol.vim b/syntax/yats/es6-symbol.vim
index 2cfb65ddd..b0c2cb04b 100644
--- a/syntax/yats/es6-symbol.vim
+++ b/syntax/yats/es6-symbol.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/es6-symbol.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/es6-symbol.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/event.vim b/syntax/yats/event.vim
index 31d0eab2f..4fb2ff6ff 100644
--- a/syntax/yats/event.vim
+++ b/syntax/yats/event.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/event.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/event.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/node.vim b/syntax/yats/node.vim
index e8bc4b8b7..98f859fd6 100644
--- a/syntax/yats/node.vim
+++ b/syntax/yats/node.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/node.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/node.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/test.vim b/syntax/yats/test.vim
index a8fe78810..7044a06af 100644
--- a/syntax/yats/test.vim
+++ b/syntax/yats/test.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/test.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/test.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/typescript.vim b/syntax/yats/typescript.vim
index 9d91a1ce3..82a33ae1e 100644
--- a/syntax/yats/typescript.vim
+++ b/syntax/yats/typescript.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/typescript.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/typescript.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-blob.vim b/syntax/yats/web-blob.vim
index fedb24178..7ec46b3a5 100644
--- a/syntax/yats/web-blob.vim
+++ b/syntax/yats/web-blob.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-blob.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-blob.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-console.vim b/syntax/yats/web-console.vim
index d8b1ded49..ad0325792 100644
--- a/syntax/yats/web-console.vim
+++ b/syntax/yats/web-console.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-console.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-console.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-crypto.vim b/syntax/yats/web-crypto.vim
index 910332429..f4647e264 100644
--- a/syntax/yats/web-crypto.vim
+++ b/syntax/yats/web-crypto.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-crypto.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-crypto.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-encoding.vim b/syntax/yats/web-encoding.vim
index 8188b7e15..1ba7a34c3 100644
--- a/syntax/yats/web-encoding.vim
+++ b/syntax/yats/web-encoding.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-encoding.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-encoding.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-fetch.vim b/syntax/yats/web-fetch.vim
index 3c9019b67..370bc4939 100644
--- a/syntax/yats/web-fetch.vim
+++ b/syntax/yats/web-fetch.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-fetch.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-fetch.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-geo.vim b/syntax/yats/web-geo.vim
index b9b3447d0..0777b4356 100644
--- a/syntax/yats/web-geo.vim
+++ b/syntax/yats/web-geo.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-geo.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-geo.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-history.vim b/syntax/yats/web-history.vim
index d170d37d4..380010237 100644
--- a/syntax/yats/web-history.vim
+++ b/syntax/yats/web-history.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-history.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-history.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-location.vim b/syntax/yats/web-location.vim
index 0d92f7bdd..bac99ca17 100644
--- a/syntax/yats/web-location.vim
+++ b/syntax/yats/web-location.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-location.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-location.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-navigator.vim b/syntax/yats/web-navigator.vim
index 2a408b0fe..800f42961 100644
--- a/syntax/yats/web-navigator.vim
+++ b/syntax/yats/web-navigator.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-navigator.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-navigator.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-network.vim b/syntax/yats/web-network.vim
index 71cd6fca3..88969b0b2 100644
--- a/syntax/yats/web-network.vim
+++ b/syntax/yats/web-network.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-network.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-network.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-payment.vim b/syntax/yats/web-payment.vim
index 2154a14a0..ee41c25ca 100644
--- a/syntax/yats/web-payment.vim
+++ b/syntax/yats/web-payment.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-payment.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-payment.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-service-worker.vim b/syntax/yats/web-service-worker.vim
index 9f4974726..9f58e8eaa 100644
--- a/syntax/yats/web-service-worker.vim
+++ b/syntax/yats/web-service-worker.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-service-worker.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-service-worker.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-window.vim b/syntax/yats/web-window.vim
index 04d57e98f..320aa37c2 100644
--- a/syntax/yats/web-window.vim
+++ b/syntax/yats/web-window.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-window.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-window.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web-xhr.vim b/syntax/yats/web-xhr.vim
index e88b6456b..8a29191c8 100644
--- a/syntax/yats/web-xhr.vim
+++ b/syntax/yats/web-xhr.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web-xhr.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web-xhr.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/yats/web.vim b/syntax/yats/web.vim
index 4b4c1bddb..960503519 100644
--- a/syntax/yats/web.vim
+++ b/syntax/yats/web.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/yats/web.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/yats/web.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/z8a.vim b/syntax/z8a.vim
index fb4fa81e2..856ed092e 100644
--- a/syntax/z8a.vim
+++ b/syntax/z8a.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/z8a.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/z8a.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/zephir.vim b/syntax/zephir.vim
index a6fcd4533..838b3cc9d 100644
--- a/syntax/zephir.vim
+++ b/syntax/zephir.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/zephir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/zephir.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 380e4bae8..f9d6fd5d1 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/zig.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/zig.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/zimbu.vim b/syntax/zimbu.vim
index ed523e5d2..e30c44962 100644
--- a/syntax/zimbu.vim
+++ b/syntax/zimbu.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/zimbu.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/zimbu.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/zir.vim b/syntax/zir.vim
index ff3fc96de..be14a54b6 100644
--- a/syntax/zir.vim
+++ b/syntax/zir.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/zir.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/zir.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish
diff --git a/syntax/zsh.vim b/syntax/zsh.vim
index c8ccd47bd..ac44ba264 100644
--- a/syntax/zsh.vim
+++ b/syntax/zsh.vim
@@ -1,4 +1,6 @@
-let files = filter(globpath(&rtp, 'syntax/zsh.vim', 1, 1), { _, v -> v !~ "vim-polyglot" && v !~ $VIMRUNTIME && v !~ "after" })
+let s:base = expand("<sfile>:h:h")
+let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
+let files = filter(globpath(&rtp, 'syntax/zsh.vim', 1, 1), Filter)
 if len(files) > 0
   exec 'source ' . files[0]
   finish

From cbde2571d4f79770ac552fe75440de72893bc73a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 25 Oct 2020 03:19:58 +0100
Subject: [PATCH 187/299] Respect symlinks for resolving vim-polyglot as
 fallback, closes #605

---
 after/ftplugin/cabal.vim                 |    6 +-
 after/ftplugin/coffee.vim                |    6 +-
 after/ftplugin/haskell.vim               |    6 +-
 after/ftplugin/html.vim                  |    6 +-
 after/ftplugin/idris.vim                 |    6 +-
 after/ftplugin/idris2.vim                |    6 +-
 after/ftplugin/javascript-1.vim          |    6 +-
 after/ftplugin/javascript-2.vim          |    6 +-
 after/ftplugin/javascriptreact.vim       |    6 +-
 after/ftplugin/jsx.vim                   |    6 +-
 after/ftplugin/llvm.vim                  |    6 +-
 after/ftplugin/puppet.vim                |    6 +-
 after/ftplugin/tsx.vim                   |    6 +-
 after/ftplugin/typescriptreact.vim       |    6 +-
 after/indent/html.vim                    |    6 +-
 after/indent/javascript-1.vim            |    6 +-
 after/indent/javascript-2.vim            |    6 +-
 after/indent/javascriptreact.vim         |    6 +-
 after/indent/jsx.vim                     |    6 +-
 after/indent/objc.vim                    |    6 +-
 after/indent/tsx.vim                     |    6 +-
 after/indent/typescript.vim              |    6 +-
 after/indent/typescriptreact.vim         |    6 +-
 after/syntax/c.vim                       |    6 +-
 after/syntax/coffee.vim                  |    6 +-
 after/syntax/cpp.vim                     |    6 +-
 after/syntax/haskell.vim                 |    6 +-
 after/syntax/help.vim                    |    6 +-
 after/syntax/html.vim                    |    6 +-
 after/syntax/html/aria.vim               |    6 +-
 after/syntax/html/electron.vim           |    6 +-
 after/syntax/html/rdfa.vim               |    6 +-
 after/syntax/idris.vim                   |    6 +-
 after/syntax/idris2.vim                  |    6 +-
 after/syntax/javascript.vim              |    6 +-
 after/syntax/javascript/graphql.vim      |    6 +-
 after/syntax/javascript/html5.vim        |    6 +-
 after/syntax/javascript/sql.vim          |    6 +-
 after/syntax/javascriptreact.vim         |    6 +-
 after/syntax/javascriptreact/graphql.vim |    6 +-
 after/syntax/jsx.vim                     |    6 +-
 after/syntax/jsx_pretty.vim              |    6 +-
 after/syntax/llvm.vim                    |    6 +-
 after/syntax/mdx.vim                     |    6 +-
 after/syntax/mma.vim                     |    6 +-
 after/syntax/objc.vim                    |    6 +-
 after/syntax/reason.vim                  |    6 +-
 after/syntax/reason/graphql.vim          |    6 +-
 after/syntax/rspec.vim                   |    6 +-
 after/syntax/ruby.vim                    |    6 +-
 after/syntax/rust.vim                    |    6 +-
 after/syntax/tsx.vim                     |    6 +-
 after/syntax/typescript/graphql.vim      |    6 +-
 after/syntax/typescriptreact.vim         |    6 +-
 after/syntax/typescriptreact/graphql.vim |    6 +-
 after/syntax/vue/graphql.vim             |    6 +-
 after/syntax/zsh.vim                     |    6 +-
 autoload/LaTeXtoUnicode.vim              |    9 +-
 autoload/RstFold.vim                     |    9 +-
 autoload/ada.vim                         |    9 +-
 autoload/cargo.vim                       |    9 +-
 autoload/cargo/quickfix.vim              |    9 +-
 autoload/clojurecomplete.vim             |    9 +-
 autoload/coffee.vim                      |    9 +-
 autoload/crystal/indent.vim              |   10 +-
 autoload/crystal_lang.vim                |    9 +-
 autoload/csv.vim                         |    9 +-
 autoload/dart.vim                        |    9 +-
 autoload/db/adapter/ecto.vim             |    9 +-
 autoload/ecrystal.vim                    |    9 +-
 autoload/elixir/indent.vim               |    9 +-
 autoload/elixir/util.vim                 |    9 +-
 autoload/fish.vim                        |    9 +-
 autoload/fsharp.vim                      |    9 +-
 autoload/fzf_gitignore.vim               |    9 +-
 autoload/go/config.vim                   |    9 +-
 autoload/graphql.vim                     |    9 +-
 autoload/htmlcomplete.vim                |    9 +-
 autoload/jsonnet.vim                     |    9 +-
 autoload/jsx_pretty/comment.vim          |    9 +-
 autoload/jsx_pretty/indent.vim           |    9 +-
 autoload/julia.vim                       |    9 +-
 autoload/julia/doc.vim                   |    9 +-
 autoload/julia_blocks.vim                |    9 +-
 autoload/julia_latex_symbols.vim         |    9 +-
 autoload/ledger.vim                      |    9 +-
 autoload/nim.vim                         |    9 +-
 autoload/polyglot/util.vim               |   64 ++
 autoload/pony.vim                        |    9 +-
 autoload/puppet/align.vim                |    9 +-
 autoload/puppet/ctags.vim                |    9 +-
 autoload/puppet/format.vim               |    9 +-
 autoload/python/utils.vim                |    9 +-
 autoload/requirements.vim                |    9 +-
 autoload/rubycomplete.vim                |    9 +-
 autoload/rust.vim                        |    9 +-
 autoload/rust/debugging.vim              |    9 +-
 autoload/rust/delimitmate.vim            |    9 +-
 autoload/rust/tags.vim                   |    9 +-
 autoload/rustfmt.vim                     |    9 +-
 autoload/smt2.vim                        |    9 +-
 autoload/terraform.vim                   |    9 +-
 autoload/vital/_crystal.vim              |    9 +-
 autoload/vital/_crystal/ColorEcho.vim    |    9 +-
 autoload/vital/_crystal/Data/List.vim    |    9 +-
 autoload/vital/_crystal/Data/String.vim  |    9 +-
 autoload/vital/_crystal/Process.vim      |    9 +-
 autoload/vital/_crystal/Web/JSON.vim     |    9 +-
 autoload/vital/crystal.vim               |    9 +-
 autoload/vital/crystal.vital             |    4 -
 autoload/xml/aria.vim                    |    9 +-
 autoload/xml/html5.vim                   |    9 +-
 autoload/xml/xsd.vim                     |    9 +-
 autoload/zig/config.vim                  |    9 +-
 autoload/zig/fmt.vim                     |    9 +-
 autoload/zig/list.vim                    |    9 +-
 autoload/zig/util.vim                    |    9 +-
 compiler/ant.vim                         |    9 +-
 compiler/bdf.vim                         |    9 +-
 compiler/cake.vim                        |    9 +-
 compiler/cargo.vim                       |    9 +-
 compiler/coffee.vim                      |    9 +-
 compiler/credo.vim                       |    9 +-
 compiler/cryptol.vim                     |    9 +-
 compiler/cs.vim                          |    9 +-
 compiler/cucumber.vim                    |    9 +-
 compiler/dot.vim                         |    9 +-
 compiler/eruby.vim                       |    9 +-
 compiler/exunit.vim                      |    9 +-
 compiler/fish.vim                        |    9 +-
 compiler/go.vim                          |    9 +-
 compiler/gradle.vim                      |    9 +-
 compiler/gradlew.vim                     |    9 +-
 compiler/haml.vim                        |    9 +-
 compiler/ledger.vim                      |    9 +-
 compiler/lilypond.vim                    |    9 +-
 compiler/ls.vim                          |    9 +-
 compiler/mix.vim                         |    9 +-
 compiler/nim.vim                         |    9 +-
 compiler/nix-build.vim                   |    9 +-
 compiler/ocaml.vim                       |    9 +-
 compiler/powershell.vim                  |    9 +-
 compiler/python.vim                      |    9 +-
 compiler/rake.vim                        |    9 +-
 compiler/rspec.vim                       |    9 +-
 compiler/ruby.vim                        |    9 +-
 compiler/rubyunit.vim                    |    9 +-
 compiler/rustc.vim                       |    9 +-
 compiler/sass.vim                        |    9 +-
 compiler/sbt.vim                         |    9 +-
 compiler/swift.vim                       |    9 +-
 compiler/tcl.vim                         |    9 +-
 compiler/tex.vim                         |    9 +-
 compiler/tidy.vim                        |    9 +-
 compiler/typescript.vim                  |    9 +-
 ctags/puppet.ctags                       |    4 -
 ctags/puppet_u.ctags                     |    4 -
 ctags/rust.ctags                         |    4 -
 ctags/scala.ctags                        |    4 -
 ctags/typescript.ctags                   |    4 -
 extras/flow.vim                          |    9 +-
 extras/jsdoc.vim                         |    9 +-
 extras/ngdoc.vim                         |    9 +-
 ftdetect/polyglot.vim                    | 1214 +++++++++++-----------
 ftplugin/8th.vim                         |    9 +-
 ftplugin/a2ps.vim                        |    9 +-
 ftplugin/aap.vim                         |    9 +-
 ftplugin/abap.vim                        |    9 +-
 ftplugin/abaqus.vim                      |    9 +-
 ftplugin/ada.vim                         |    9 +-
 ftplugin/alsaconf.vim                    |    9 +-
 ftplugin/ansible.vim                     |    9 +-
 ftplugin/ansible_hosts.vim               |    9 +-
 ftplugin/ant.vim                         |    9 +-
 ftplugin/arch.vim                        |    9 +-
 ftplugin/art.vim                         |    9 +-
 ftplugin/aspvbs.vim                      |    9 +-
 ftplugin/automake.vim                    |    9 +-
 ftplugin/awk.vim                         |    9 +-
 ftplugin/bdf.vim                         |    9 +-
 ftplugin/blade.vim                       |    9 +-
 ftplugin/bst.vim                         |    9 +-
 ftplugin/bzl.vim                         |    9 +-
 ftplugin/caddyfile.vim                   |    9 +-
 ftplugin/calendar.vim                    |    9 +-
 ftplugin/cdrdaoconf.vim                  |    9 +-
 ftplugin/cfg.vim                         |    9 +-
 ftplugin/ch.vim                          |    9 +-
 ftplugin/clojure.vim                     |    9 +-
 ftplugin/cobol.vim                       |    9 +-
 ftplugin/coffee.vim                      |    9 +-
 ftplugin/conf.vim                        |    9 +-
 ftplugin/config.vim                      |    9 +-
 ftplugin/crm.vim                         |    9 +-
 ftplugin/cryptol/folding.vim             |    9 +-
 ftplugin/crystal.vim                     |    9 +-
 ftplugin/cs.vim                          |    9 +-
 ftplugin/csc.vim                         |    9 +-
 ftplugin/css.vim                         |    9 +-
 ftplugin/csv.vim                         |    9 +-
 ftplugin/cucumber.vim                    |    9 +-
 ftplugin/cvsrc.vim                       |    9 +-
 ftplugin/dart.vim                        |    9 +-
 ftplugin/debchangelog.vim                |    9 +-
 ftplugin/debcontrol.vim                  |    9 +-
 ftplugin/denyhosts.vim                   |    9 +-
 ftplugin/dhall.vim                       |    9 +-
 ftplugin/dictconf.vim                    |    9 +-
 ftplugin/dictdconf.vim                   |    9 +-
 ftplugin/diff.vim                        |    9 +-
 ftplugin/dircolors.vim                   |    9 +-
 ftplugin/docker-compose.vim              |    9 +-
 ftplugin/dockerfile.vim                  |    9 +-
 ftplugin/dosbatch.vim                    |    9 +-
 ftplugin/dosini.vim                      |    9 +-
 ftplugin/dtd.vim                         |    9 +-
 ftplugin/dune.vim                        |    9 +-
 ftplugin/ecrystal.vim                    |    9 +-
 ftplugin/eelixir.vim                     |    9 +-
 ftplugin/elinks.vim                      |    9 +-
 ftplugin/elixir.vim                      |    9 +-
 ftplugin/embeddedpuppet.vim              |    9 +-
 ftplugin/ember-script.vim                |    9 +-
 ftplugin/emblem.vim                      |    9 +-
 ftplugin/eruby.vim                       |    9 +-
 ftplugin/eterm.vim                       |    9 +-
 ftplugin/falcon.vim                      |    9 +-
 ftplugin/fennel.vim                      |    9 +-
 ftplugin/fetchmail.vim                   |    9 +-
 ftplugin/fish.vim                        |    9 +-
 ftplugin/fortran.vim                     |    9 +-
 ftplugin/framescript.vim                 |    9 +-
 ftplugin/fvwm.vim                        |    9 +-
 ftplugin/gdb.vim                         |    9 +-
 ftplugin/git.vim                         |    9 +-
 ftplugin/gitcommit.vim                   |    9 +-
 ftplugin/gitconfig.vim                   |    9 +-
 ftplugin/gitignore.vim                   |    9 +-
 ftplugin/gitrebase.vim                   |    9 +-
 ftplugin/gitsendemail.vim                |    9 +-
 ftplugin/gpg.vim                         |    9 +-
 ftplugin/graphql.vim                     |    9 +-
 ftplugin/groovy.vim                      |    9 +-
 ftplugin/group.vim                       |    9 +-
 ftplugin/grub.vim                        |    9 +-
 ftplugin/haml.vim                        |    9 +-
 ftplugin/hamster.vim                     |    9 +-
 ftplugin/handlebars.vim                  |    9 +-
 ftplugin/hcl.vim                         |    9 +-
 ftplugin/help.vim                        |    9 +-
 ftplugin/hgcommit.vim                    |    9 +-
 ftplugin/hive.vim                        |    9 +-
 ftplugin/hog.vim                         |    9 +-
 ftplugin/hostconf.vim                    |    9 +-
 ftplugin/hostsaccess.vim                 |    9 +-
 ftplugin/html.vim                        |    9 +-
 ftplugin/htmldjango.vim                  |    9 +-
 ftplugin/i3config.vim                    |    9 +-
 ftplugin/idris.vim                       |    9 +-
 ftplugin/idris2.vim                      |    9 +-
 ftplugin/indent.vim                      |    9 +-
 ftplugin/ion.vim                         |    9 +-
 ftplugin/j.vim                           |    9 +-
 ftplugin/java.vim                        |    9 +-
 ftplugin/jproperties.vim                 |    9 +-
 ftplugin/jq.vim                          |    9 +-
 ftplugin/json.vim                        |    9 +-
 ftplugin/jsonnet.vim                     |    9 +-
 ftplugin/jsp.vim                         |    9 +-
 ftplugin/julia.vim                       |    9 +-
 ftplugin/juliadoc.vim                    |    9 +-
 ftplugin/kconfig.vim                     |    9 +-
 ftplugin/kotlin.vim                      |    9 +-
 ftplugin/kwt.vim                         |    9 +-
 ftplugin/ld.vim                          |    9 +-
 ftplugin/less.vim                        |    9 +-
 ftplugin/lftp.vim                        |    9 +-
 ftplugin/libao.vim                       |    9 +-
 ftplugin/lilypond.vim                    |    9 +-
 ftplugin/limits.vim                      |    9 +-
 ftplugin/liquid.vim                      |    9 +-
 ftplugin/lisp.vim                        |    9 +-
 ftplugin/litcoffee.vim                   |    9 +-
 ftplugin/llvm.vim                        |    9 +-
 ftplugin/logcheck.vim                    |    9 +-
 ftplugin/loginaccess.vim                 |    9 +-
 ftplugin/logindefs.vim                   |    9 +-
 ftplugin/logtalk.vim                     |    9 +-
 ftplugin/lprolog.vim                     |    9 +-
 ftplugin/ls.vim                          |    9 +-
 ftplugin/m4.vim                          |    9 +-
 ftplugin/mail.vim                        |    9 +-
 ftplugin/mailaliases.vim                 |    9 +-
 ftplugin/mailcap.vim                     |    9 +-
 ftplugin/make.vim                        |    9 +-
 ftplugin/mako.vim                        |    9 +-
 ftplugin/manconf.vim                     |    9 +-
 ftplugin/markdown.vim                    |    9 +-
 ftplugin/meson.vim                       |    9 +-
 ftplugin/mf.vim                          |    9 +-
 ftplugin/mma.vim                         |    9 +-
 ftplugin/modconf.vim                     |    9 +-
 ftplugin/moon.vim                        |    9 +-
 ftplugin/mp.vim                          |    9 +-
 ftplugin/mplayerconf.vim                 |    9 +-
 ftplugin/mrxvtrc.vim                     |    9 +-
 ftplugin/mustache.vim                    |    9 +-
 ftplugin/muttrc.vim                      |    9 +-
 ftplugin/nanorc.vim                      |    9 +-
 ftplugin/neomuttrc.vim                   |    9 +-
 ftplugin/netrc.vim                       |    9 +-
 ftplugin/nginx.vim                       |    9 +-
 ftplugin/nix.vim                         |    9 +-
 ftplugin/nroff.vim                       |    9 +-
 ftplugin/nsis.vim                        |    9 +-
 ftplugin/oasis.vim                       |    9 +-
 ftplugin/objc.vim                        |    9 +-
 ftplugin/ocaml.vim                       |    9 +-
 ftplugin/ocamlbuild_tags.vim             |    9 +-
 ftplugin/occam.vim                       |    9 +-
 ftplugin/omake.vim                       |    9 +-
 ftplugin/opencl.vim                      |    9 +-
 ftplugin/pamconf.vim                     |    9 +-
 ftplugin/pascal.vim                      |    9 +-
 ftplugin/passwd.vim                      |    9 +-
 ftplugin/pdf.vim                         |    9 +-
 ftplugin/perl.vim                        |    9 +-
 ftplugin/pinfo.vim                       |    9 +-
 ftplugin/plantuml.vim                    |    9 +-
 ftplugin/pony.vim                        |    9 +-
 ftplugin/postscr.vim                     |    9 +-
 ftplugin/procmail.vim                    |    9 +-
 ftplugin/prolog.vim                      |    9 +-
 ftplugin/protocols.vim                   |    9 +-
 ftplugin/ps1.vim                         |    9 +-
 ftplugin/ps1xml.vim                      |    9 +-
 ftplugin/pug.vim                         |    9 +-
 ftplugin/puppet.vim                      |    9 +-
 ftplugin/puppet_tagbar.vim               |    9 +-
 ftplugin/purescript.vim                  |    9 +-
 ftplugin/pyrex.vim                       |    9 +-
 ftplugin/qml.vim                         |    9 +-
 ftplugin/quake.vim                       |    9 +-
 ftplugin/racket.vim                      |    9 +-
 ftplugin/raku.vim                        |    9 +-
 ftplugin/raml.vim                        |    9 +-
 ftplugin/razor.vim                       |    9 +-
 ftplugin/readline.vim                    |    9 +-
 ftplugin/reva.vim                        |    9 +-
 ftplugin/rmd.vim                         |    9 +-
 ftplugin/rnc.vim                         |    9 +-
 ftplugin/rnoweb.vim                      |    9 +-
 ftplugin/rpl.vim                         |    9 +-
 ftplugin/rrst.vim                        |    9 +-
 ftplugin/rst.vim                         |    9 +-
 ftplugin/ruby.vim                        |   11 +-
 ftplugin/rust.vim                        |    9 +-
 ftplugin/rust/tagbar.vim                 |    9 +-
 ftplugin/sass.vim                        |    9 +-
 ftplugin/sbt.vim                         |    9 +-
 ftplugin/scala.vim                       |    9 +-
 ftplugin/scala.xpt.vim                   |    9 +-
 ftplugin/scala/tagbar.vim                |    9 +-
 ftplugin/scheme.vim                      |    9 +-
 ftplugin/screen.vim                      |    9 +-
 ftplugin/scss.vim                        |    9 +-
 ftplugin/sensors.vim                     |    9 +-
 ftplugin/services.vim                    |    9 +-
 ftplugin/setserial.vim                   |    9 +-
 ftplugin/sexplib.vim                     |    9 +-
 ftplugin/sieve.vim                       |    9 +-
 ftplugin/slim.vim                        |    9 +-
 ftplugin/slpconf.vim                     |    9 +-
 ftplugin/slpreg.vim                      |    9 +-
 ftplugin/slpspi.vim                      |    9 +-
 ftplugin/smt2.vim                        |    9 +-
 ftplugin/solidity.vim                    |    9 +-
 ftplugin/spec.vim                        |    9 +-
 ftplugin/sql.vim                         |    9 +-
 ftplugin/sshconfig.vim                   |    9 +-
 ftplugin/stylus.vim                      |    9 +-
 ftplugin/sudoers.vim                     |    9 +-
 ftplugin/svelte.vim                      |    9 +-
 ftplugin/swift.vim                       |    9 +-
 ftplugin/swiftgyb.vim                    |    9 +-
 ftplugin/sysctl.vim                      |    9 +-
 ftplugin/systemd.vim                     |    9 +-
 ftplugin/systemverilog.vim               |    9 +-
 ftplugin/tablegen.vim                    |    9 +-
 ftplugin/tcl.vim                         |    9 +-
 ftplugin/terminfo.vim                    |    9 +-
 ftplugin/terraform.vim                   |    9 +-
 ftplugin/tex.vim                         |    9 +-
 ftplugin/text.vim                        |    9 +-
 ftplugin/textile.vim                     |    9 +-
 ftplugin/tmux.vim                        |    9 +-
 ftplugin/toml.vim                        |    9 +-
 ftplugin/treetop.vim                     |    9 +-
 ftplugin/tt2html.vim                     |    9 +-
 ftplugin/twig.vim                        |    9 +-
 ftplugin/typescript.vim                  |    9 +-
 ftplugin/typescriptreact.vim             |    9 +-
 ftplugin/udevconf.vim                    |    9 +-
 ftplugin/udevperm.vim                    |    9 +-
 ftplugin/updatedb.vim                    |    9 +-
 ftplugin/vala.vim                        |    9 +-
 ftplugin/vb.vim                          |    9 +-
 ftplugin/verilog.vim                     |    9 +-
 ftplugin/vhdl.vim                        |    9 +-
 ftplugin/vlang.vim                       |    9 +-
 ftplugin/vroom.vim                       |    9 +-
 ftplugin/vue.vim                         |    9 +-
 ftplugin/wast.vim                        |    9 +-
 ftplugin/xdefaults.vim                   |    9 +-
 ftplugin/xf86conf.vim                    |    9 +-
 ftplugin/xhtml.vim                       |    9 +-
 ftplugin/xinetd.vim                      |    9 +-
 ftplugin/xmodmap.vim                     |    9 +-
 ftplugin/xs.vim                          |    9 +-
 ftplugin/xsd.vim                         |    9 +-
 ftplugin/xslt.vim                        |    9 +-
 ftplugin/yaml.vim                        |    9 +-
 ftplugin/zig.vim                         |    9 +-
 ftplugin/zimbu.vim                       |    9 +-
 indent/Jenkinsfile.vim                   |    9 +-
 indent/aap.vim                           |    9 +-
 indent/ada.vim                           |    9 +-
 indent/ansible.vim                       |    9 +-
 indent/ant.vim                           |    9 +-
 indent/applescript.vim                   |    9 +-
 indent/arduino.vim                       |    9 +-
 indent/autohotkey.vim                    |    9 +-
 indent/automake.vim                      |    9 +-
 indent/awk.vim                           |    9 +-
 indent/bib.vim                           |    9 +-
 indent/blade.vim                         |    9 +-
 indent/bst.vim                           |    9 +-
 indent/bzl.vim                           |    9 +-
 indent/cabal.vim                         |    9 +-
 indent/caddyfile.vim                     |    9 +-
 indent/cdl.vim                           |    9 +-
 indent/ch.vim                            |    9 +-
 indent/chaiscript.vim                    |    9 +-
 indent/clojure.vim                       |    9 +-
 indent/cmake.vim                         |    9 +-
 indent/cobol.vim                         |    9 +-
 indent/coffee.vim                        |    9 +-
 indent/config.vim                        |    9 +-
 indent/crystal.vim                       |    9 +-
 indent/cs.vim                            |    9 +-
 indent/css.vim                           |    9 +-
 indent/cucumber.vim                      |    9 +-
 indent/cuda.vim                          |    9 +-
 indent/cython.vim                        |    9 +-
 indent/d.vim                             |    9 +-
 indent/dart.vim                          |    9 +-
 indent/dictconf.vim                      |    9 +-
 indent/dictdconf.vim                     |    9 +-
 indent/dosbatch.vim                      |    9 +-
 indent/dtd.vim                           |    9 +-
 indent/dune.vim                          |    9 +-
 indent/dylan.vim                         |    9 +-
 indent/ecrystal.vim                      |    9 +-
 indent/eelixir.vim                       |    9 +-
 indent/elixir.vim                        |    9 +-
 indent/elm.vim                           |    9 +-
 indent/ember-script.vim                  |    9 +-
 indent/emblem.vim                        |    9 +-
 indent/erlang.vim                        |    9 +-
 indent/eruby.vim                         |    9 +-
 indent/eterm.vim                         |    9 +-
 indent/falcon.vim                        |    9 +-
 indent/fennel.vim                        |    9 +-
 indent/fish.vim                          |    9 +-
 indent/fortran.vim                       |    9 +-
 indent/framescript.vim                   |    9 +-
 indent/fsharp.vim                        |    9 +-
 indent/gdscript3.vim                     |    9 +-
 indent/gitconfig.vim                     |    9 +-
 indent/gitolite.vim                      |    9 +-
 indent/glsl.vim                          |    9 +-
 indent/go.vim                            |    9 +-
 indent/gohtmltmpl.vim                    |    9 +-
 indent/graphql.vim                       |    9 +-
 indent/haml.vim                          |    9 +-
 indent/hamster.vim                       |    9 +-
 indent/handlebars.vim                    |    9 +-
 indent/haskell.vim                       |    9 +-
 indent/hcl.vim                           |    9 +-
 indent/hog.vim                           |    9 +-
 indent/html.vim                          |    9 +-
 indent/htmldjango.vim                    |    9 +-
 indent/idris.vim                         |    9 +-
 indent/idris2.vim                        |    9 +-
 indent/j.vim                             |    9 +-
 indent/java.vim                          |    9 +-
 indent/javascript.vim                    |    9 +-
 indent/json.vim                          |    9 +-
 indent/jsp.vim                           |    9 +-
 indent/jst.vim                           |    9 +-
 indent/julia.vim                         |    9 +-
 indent/kotlin.vim                        |    9 +-
 indent/ld.vim                            |    9 +-
 indent/ledger.vim                        |    9 +-
 indent/less.vim                          |    9 +-
 indent/lifelines.vim                     |    9 +-
 indent/lilypond.vim                      |    9 +-
 indent/liquid.vim                        |    9 +-
 indent/lisp.vim                          |    9 +-
 indent/litcoffee.vim                     |    9 +-
 indent/llvm.vim                          |    9 +-
 indent/logtalk.vim                       |    9 +-
 indent/ls.vim                            |    9 +-
 indent/lua.vim                           |    9 +-
 indent/mail.vim                          |    9 +-
 indent/make.vim                          |    9 +-
 indent/mako.vim                          |    9 +-
 indent/markdown.vim                      |    9 +-
 indent/meson.vim                         |    9 +-
 indent/mf.vim                            |    9 +-
 indent/moon.vim                          |    9 +-
 indent/mp.vim                            |    9 +-
 indent/mustache.vim                      |    9 +-
 indent/nginx.vim                         |    9 +-
 indent/nim.vim                           |    9 +-
 indent/nix.vim                           |    9 +-
 indent/nsis.vim                          |    9 +-
 indent/ocaml.vim                         |    9 +-
 indent/occam.vim                         |    9 +-
 indent/octave.vim                        |    9 +-
 indent/odin.vim                          |    9 +-
 indent/omake.vim                         |    9 +-
 indent/opencl.vim                        |    9 +-
 indent/pascal.vim                        |    9 +-
 indent/perl.vim                          |    9 +-
 indent/pgsql.vim                         |    9 +-
 indent/plantuml.vim                      |    9 +-
 indent/pony.vim                          |    9 +-
 indent/postscr.vim                       |    9 +-
 indent/pov.vim                           |    9 +-
 indent/prolog.vim                        |    9 +-
 indent/proto.vim                         |    9 +-
 indent/ps1.vim                           |    9 +-
 indent/pug.vim                           |    9 +-
 indent/puppet.vim                        |    9 +-
 indent/purescript.vim                    |    9 +-
 indent/pyrex.vim                         |    9 +-
 indent/python.vim                        |    9 +-
 indent/qml.vim                           |    9 +-
 indent/racket.vim                        |    9 +-
 indent/raku.vim                          |    9 +-
 indent/razor.vim                         |    9 +-
 indent/readline.vim                      |    9 +-
 indent/reason.vim                        |    9 +-
 indent/rmd.vim                           |    9 +-
 indent/rnoweb.vim                        |    9 +-
 indent/rpl.vim                           |    9 +-
 indent/rrst.vim                          |    9 +-
 indent/rst.vim                           |    9 +-
 indent/ruby.vim                          |    9 +-
 indent/rust.vim                          |    9 +-
 indent/sas.vim                           |    9 +-
 indent/sass.vim                          |    9 +-
 indent/scala.vim                         |    9 +-
 indent/scheme.vim                        |    9 +-
 indent/scss.vim                          |    9 +-
 indent/sdl.vim                           |    9 +-
 indent/slim.vim                          |    9 +-
 indent/slime.vim                         |    9 +-
 indent/sml.vim                           |    9 +-
 indent/solidity.vim                      |    9 +-
 indent/sql.vim                           |    9 +-
 indent/sshconfig.vim                     |    9 +-
 indent/stylus.vim                        |    9 +-
 indent/svelte.vim                        |    9 +-
 indent/svg.vim                           |    9 +-
 indent/swift.vim                         |    9 +-
 indent/systemverilog.vim                 |   10 +-
 indent/tcl.vim                           |    9 +-
 indent/teraterm.vim                      |    9 +-
 indent/terraform.vim                     |    9 +-
 indent/tex.vim                           |    9 +-
 indent/tf.vim                            |    9 +-
 indent/tilde.vim                         |    9 +-
 indent/treetop.vim                       |    9 +-
 indent/twig.vim                          |    9 +-
 indent/typescript.vim                    |    9 +-
 indent/typescriptreact.vim               |   10 +-
 indent/vala.vim                          |    9 +-
 indent/vb.vim                            |    9 +-
 indent/velocity.vim                      |    9 +-
 indent/verilog.vim                       |    9 +-
 indent/vhdl.vim                          |    9 +-
 indent/vlang.vim                         |    9 +-
 indent/vroom.vim                         |    9 +-
 indent/vue.vim                           |    9 +-
 indent/wast.vim                          |    9 +-
 indent/xf86conf.vim                      |    9 +-
 indent/xhtml.vim                         |    9 +-
 indent/xinetd.vim                        |    9 +-
 indent/xsd.vim                           |    9 +-
 indent/xslt.vim                          |    9 +-
 indent/yacc.vim                          |    9 +-
 indent/yaml.vim                          |    9 +-
 indent/zig.vim                           |    9 +-
 indent/zimbu.vim                         |    9 +-
 plugin/polyglot.vim                      |    2 +-
 scripts/build                            |   35 +-
 syntax/8th.vim                           |    9 +-
 syntax/Jenkinsfile.vim                   |    9 +-
 syntax/a2ps.vim                          |    9 +-
 syntax/a65.vim                           |    9 +-
 syntax/aap.vim                           |    9 +-
 syntax/abap.vim                          |   10 +-
 syntax/abaqus.vim                        |    9 +-
 syntax/abc.vim                           |    9 +-
 syntax/abel.vim                          |    9 +-
 syntax/acedb.vim                         |    9 +-
 syntax/ada.vim                           |    9 +-
 syntax/ahdl.vim                          |    9 +-
 syntax/aidl.vim                          |    9 +-
 syntax/alsaconf.vim                      |    9 +-
 syntax/aml.vim                           |    9 +-
 syntax/ampl.vim                          |    9 +-
 syntax/ansible.vim                       |    9 +-
 syntax/ansible_hosts.vim                 |    9 +-
 syntax/ant.vim                           |    9 +-
 syntax/apache.vim                        |    9 +-
 syntax/apachestyle.vim                   |    9 +-
 syntax/apiblueprint.vim                  |    9 +-
 syntax/applescript.vim                   |    9 +-
 syntax/aptconf.vim                       |    9 +-
 syntax/arch.vim                          |    9 +-
 syntax/arduino.vim                       |    9 +-
 syntax/art.vim                           |    9 +-
 syntax/asciidoc.vim                      |    9 +-
 syntax/asl.vim                           |    9 +-
 syntax/asn.vim                           |    9 +-
 syntax/aspperl.vim                       |    9 +-
 syntax/aspvbs.vim                        |    9 +-
 syntax/asterisk.vim                      |    9 +-
 syntax/asteriskvm.vim                    |    9 +-
 syntax/atlas.vim                         |    9 +-
 syntax/autodoc.vim                       |    9 +-
 syntax/autoit.vim                        |    9 +-
 syntax/automake.vim                      |    9 +-
 syntax/ave.vim                           |    9 +-
 syntax/awk.vim                           |    9 +-
 syntax/b.vim                             |    9 +-
 syntax/basic.vim                         |    9 +-
 syntax/basic/class.vim                   |    9 +-
 syntax/basic/cluster.vim                 |    9 +-
 syntax/basic/decorator.vim               |    9 +-
 syntax/basic/doc.vim                     |    9 +-
 syntax/basic/function.vim                |    9 +-
 syntax/basic/identifiers.vim             |    9 +-
 syntax/basic/keyword.vim                 |    9 +-
 syntax/basic/literal.vim                 |    9 +-
 syntax/basic/members.vim                 |    9 +-
 syntax/basic/object.vim                  |    9 +-
 syntax/basic/patch.vim                   |    9 +-
 syntax/basic/reserved.vim                |    9 +-
 syntax/basic/symbols.vim                 |    9 +-
 syntax/basic/type.vim                    |    9 +-
 syntax/bc.vim                            |    9 +-
 syntax/bdf.vim                           |    9 +-
 syntax/bib.vim                           |    9 +-
 syntax/bindzone.vim                      |    9 +-
 syntax/blade.vim                         |    9 +-
 syntax/blank.vim                         |    9 +-
 syntax/brewfile.vim                      |    9 +-
 syntax/bsdl.vim                          |    9 +-
 syntax/bst.vim                           |    9 +-
 syntax/bzl.vim                           |    9 +-
 syntax/bzr.vim                           |    9 +-
 syntax/c.vim                             |    9 +-
 syntax/cabal-1.vim                       |    9 +-
 syntax/cabal-2.vim                       |    9 +-
 syntax/caddyfile.vim                     |    9 +-
 syntax/calendar.vim                      |    9 +-
 syntax/carp.vim                          |    9 +-
 syntax/catalog.vim                       |    9 +-
 syntax/cdl.vim                           |    9 +-
 syntax/cdrdaoconf.vim                    |    9 +-
 syntax/cdrtoc.vim                        |    9 +-
 syntax/cf.vim                            |    9 +-
 syntax/cfg.vim                           |    9 +-
 syntax/ch.vim                            |    9 +-
 syntax/chaiscript.vim                    |    9 +-
 syntax/chaskell.vim                      |    9 +-
 syntax/chill.vim                         |    9 +-
 syntax/chordpro.vim                      |    9 +-
 syntax/cl.vim                            |    9 +-
 syntax/clean.vim                         |    9 +-
 syntax/clojure.vim                       |    9 +-
 syntax/cmake.vim                         |    9 +-
 syntax/cmod.vim                          |    9 +-
 syntax/cmusrc.vim                        |    9 +-
 syntax/cobol.vim                         |    9 +-
 syntax/coco.vim                          |    9 +-
 syntax/coffee.vim                        |    9 +-
 syntax/common.vim                        |    9 +-
 syntax/conaryrecipe.vim                  |    9 +-
 syntax/conf.vim                          |    9 +-
 syntax/config.vim                        |    9 +-
 syntax/cpp.vim                           |    9 +-
 syntax/cql.vim                           |    9 +-
 syntax/crm.vim                           |    9 +-
 syntax/crontab.vim                       |    9 +-
 syntax/cryptol.vim                       |    9 +-
 syntax/crystal.vim                       |    9 +-
 syntax/cs.vim                            |    9 +-
 syntax/csc.vim                           |    9 +-
 syntax/csdl.vim                          |    9 +-
 syntax/csp.vim                           |    9 +-
 syntax/css.vim                           |    9 +-
 syntax/csv.vim                           |    9 +-
 syntax/cterm.vim                         |    9 +-
 syntax/cucumber.vim                      |    9 +-
 syntax/cuda.vim                          |    9 +-
 syntax/cuesheet.vim                      |    9 +-
 syntax/cupl.vim                          |    9 +-
 syntax/cuplsim.vim                       |    9 +-
 syntax/cvs.vim                           |    9 +-
 syntax/cvsrc.vim                         |    9 +-
 syntax/cynpp.vim                         |    9 +-
 syntax/d.vim                             |    9 +-
 syntax/dart.vim                          |    9 +-
 syntax/datascript.vim                    |    9 +-
 syntax/dcd.vim                           |    9 +-
 syntax/dcov.vim                          |    9 +-
 syntax/dd.vim                            |    9 +-
 syntax/ddoc.vim                          |    9 +-
 syntax/debchangelog.vim                  |    9 +-
 syntax/debcontrol.vim                    |    9 +-
 syntax/debcopyright.vim                  |    9 +-
 syntax/debsources.vim                    |    9 +-
 syntax/def.vim                           |    9 +-
 syntax/denyhosts.vim                     |    9 +-
 syntax/desc.vim                          |    9 +-
 syntax/desktop.vim                       |    9 +-
 syntax/dhall.vim                         |    9 +-
 syntax/dictconf.vim                      |    9 +-
 syntax/dictdconf.vim                     |    9 +-
 syntax/diff.vim                          |    9 +-
 syntax/dircolors.vim                     |    9 +-
 syntax/django.vim                        |    9 +-
 syntax/dnsmasq.vim                       |    9 +-
 syntax/docker-compose.vim                |    9 +-
 syntax/dockerfile.vim                    |    9 +-
 syntax/dosbatch.vim                      |    9 +-
 syntax/dosini.vim                        |    9 +-
 syntax/dot.vim                           |    9 +-
 syntax/dracula.vim                       |    9 +-
 syntax/dsdl.vim                          |    9 +-
 syntax/dsl.vim                           |    9 +-
 syntax/dtd.vim                           |    9 +-
 syntax/dts.vim                           |    9 +-
 syntax/dune.vim                          |    9 +-
 syntax/dylan.vim                         |    9 +-
 syntax/dylanintr.vim                     |    9 +-
 syntax/dylanlid.vim                      |    9 +-
 syntax/ecd.vim                           |    9 +-
 syntax/ecrystal.vim                      |    9 +-
 syntax/edif.vim                          |    9 +-
 syntax/eelixir.vim                       |    9 +-
 syntax/elf.vim                           |    9 +-
 syntax/elinks.vim                        |    9 +-
 syntax/elixir.vim                        |    9 +-
 syntax/elm.vim                           |    9 +-
 syntax/elmfilt.vim                       |    9 +-
 syntax/embeddedpuppet.vim                |    9 +-
 syntax/ember-script.vim                  |    9 +-
 syntax/emblem.vim                        |    9 +-
 syntax/erlang.vim                        |    9 +-
 syntax/eruby.vim                         |    9 +-
 syntax/esmtprc.vim                       |    9 +-
 syntax/esqlc.vim                         |    9 +-
 syntax/esterel.vim                       |    9 +-
 syntax/eterm.vim                         |    9 +-
 syntax/exim.vim                          |    9 +-
 syntax/expect.vim                        |    9 +-
 syntax/exports.vim                       |    9 +-
 syntax/falcon.vim                        |    9 +-
 syntax/fan.vim                           |    9 +-
 syntax/fbs.vim                           |    9 +-
 syntax/fennel.vim                        |    9 +-
 syntax/ferm.vim                          |    9 +-
 syntax/fetchmail.vim                     |    9 +-
 syntax/fgl.vim                           |    9 +-
 syntax/fish.vim                          |    9 +-
 syntax/flow.vim                          |    9 +-
 syntax/focexec.vim                       |    9 +-
 syntax/forth.vim                         |    9 +-
 syntax/fortran.vim                       |    9 +-
 syntax/framescript.vim                   |    9 +-
 syntax/freebasic.vim                     |    9 +-
 syntax/fsharp.vim                        |    9 +-
 syntax/fstab.vim                         |    9 +-
 syntax/fvwm.vim                          |    9 +-
 syntax/gdb.vim                           |    9 +-
 syntax/gdmo.vim                          |    9 +-
 syntax/gdscript3.vim                     |    9 +-
 syntax/gedcom.vim                        |    9 +-
 syntax/git.vim                           |    9 +-
 syntax/gitcommit.vim                     |    9 +-
 syntax/gitconfig.vim                     |    9 +-
 syntax/gitignore.vim                     |    9 +-
 syntax/gitolite.vim                      |    9 +-
 syntax/gitrebase.vim                     |    9 +-
 syntax/gitsendemail.vim                  |    9 +-
 syntax/gkrellmrc.vim                     |    9 +-
 syntax/glsl.vim                          |    9 +-
 syntax/gmpl.vim                          |    9 +-
 syntax/gnash.vim                         |    9 +-
 syntax/gnuplot.vim                       |    9 +-
 syntax/go.vim                            |    9 +-
 syntax/godebugoutput.vim                 |    9 +-
 syntax/godebugstacktrace.vim             |    9 +-
 syntax/godebugvariables.vim              |    9 +-
 syntax/godefstack.vim                    |    9 +-
 syntax/gohtmltmpl.vim                    |    9 +-
 syntax/gomod.vim                         |    9 +-
 syntax/gotexttmpl.vim                    |    9 +-
 syntax/gp.vim                            |    9 +-
 syntax/gpg.vim                           |    9 +-
 syntax/grads.vim                         |    9 +-
 syntax/graphql.vim                       |    9 +-
 syntax/gretl.vim                         |    9 +-
 syntax/groovy.vim                        |    9 +-
 syntax/group.vim                         |    9 +-
 syntax/grub.vim                          |    9 +-
 syntax/gsl.vim                           |    9 +-
 syntax/gsp.vim                           |    9 +-
 syntax/gtkrc.vim                         |    9 +-
 syntax/haml.vim                          |    9 +-
 syntax/hamster.vim                       |    9 +-
 syntax/handlebars.vim                    |    9 +-
 syntax/haproxy.vim                       |    9 +-
 syntax/haskell.vim                       |    9 +-
 syntax/haste.vim                         |    9 +-
 syntax/hastepreproc.vim                  |    9 +-
 syntax/haxe.vim                          |    9 +-
 syntax/hb.vim                            |    9 +-
 syntax/hcl.vim                           |    9 +-
 syntax/helm.vim                          |    9 +-
 syntax/help.vim                          |    9 +-
 syntax/hercules.vim                      |    9 +-
 syntax/hex.vim                           |    9 +-
 syntax/hgcommit.vim                      |    9 +-
 syntax/hive.vim                          |    9 +-
 syntax/hog.vim                           |    9 +-
 syntax/hollywood.vim                     |    9 +-
 syntax/hostconf.vim                      |    9 +-
 syntax/hostsaccess.vim                   |    9 +-
 syntax/html.vim                          |    9 +-
 syntax/htmldjango.vim                    |    9 +-
 syntax/htmlm4.vim                        |    9 +-
 syntax/i3config.vim                      |    9 +-
 syntax/ibasic.vim                        |    9 +-
 syntax/icalendar.vim                     |    9 +-
 syntax/icemenu.vim                       |    9 +-
 syntax/icon.vim                          |    9 +-
 syntax/idris.vim                         |    9 +-
 syntax/idris2.vim                        |    9 +-
 syntax/indent.vim                        |    9 +-
 syntax/inform.vim                        |    9 +-
 syntax/initng.vim                        |    9 +-
 syntax/inittab.vim                       |    9 +-
 syntax/ion.vim                           |    9 +-
 syntax/ipfilter.vim                      |    9 +-
 syntax/iss.vim                           |    9 +-
 syntax/ist.vim                           |    9 +-
 syntax/j.vim                             |    9 +-
 syntax/jal.vim                           |    9 +-
 syntax/jam.vim                           |    9 +-
 syntax/java.vim                          |    9 +-
 syntax/javacc.vim                        |    9 +-
 syntax/javascript.vim                    |    9 +-
 syntax/jess.vim                          |    9 +-
 syntax/jgraph.vim                        |    9 +-
 syntax/jinja2.vim                        |    9 +-
 syntax/jovial.vim                        |    9 +-
 syntax/jproperties.vim                   |    9 +-
 syntax/jq.vim                            |    9 +-
 syntax/json.vim                          |    9 +-
 syntax/json5.vim                         |    9 +-
 syntax/jsonnet.vim                       |    9 +-
 syntax/jsp.vim                           |    9 +-
 syntax/jst.vim                           |    9 +-
 syntax/julia.vim                         |    9 +-
 syntax/juliadoc.vim                      |    9 +-
 syntax/kconfig.vim                       |    9 +-
 syntax/kivy.vim                          |    9 +-
 syntax/kix.vim                           |    9 +-
 syntax/kotlin.vim                        |    9 +-
 syntax/kscript.vim                       |    9 +-
 syntax/kwt.vim                           |    9 +-
 syntax/lace.vim                          |    9 +-
 syntax/latte.vim                         |    9 +-
 syntax/ld.vim                            |    9 +-
 syntax/ldif.vim                          |    9 +-
 syntax/ledger.vim                        |    9 +-
 syntax/less.vim                          |    9 +-
 syntax/lex.vim                           |    9 +-
 syntax/lftp.vim                          |    9 +-
 syntax/lhaskell.vim                      |    9 +-
 syntax/libao.vim                         |    9 +-
 syntax/lidris.vim                        |    9 +-
 syntax/lidris2.vim                       |    9 +-
 syntax/lifelines.vim                     |    9 +-
 syntax/lilo.vim                          |    9 +-
 syntax/lilypond-words.vim                |    9 +-
 syntax/lilypond.vim                      |    9 +-
 syntax/limits.vim                        |    9 +-
 syntax/liquid.vim                        |    9 +-
 syntax/lisp.vim                          |    9 +-
 syntax/litcoffee.vim                     |    9 +-
 syntax/lite.vim                          |    9 +-
 syntax/litestep.vim                      |    9 +-
 syntax/llvm.vim                          |    9 +-
 syntax/log.vim                           |    9 +-
 syntax/loginaccess.vim                   |    9 +-
 syntax/logindefs.vim                     |    9 +-
 syntax/logtalk.vim                       |    9 +-
 syntax/lotos.vim                         |    9 +-
 syntax/lout.vim                          |    9 +-
 syntax/lpc.vim                           |    9 +-
 syntax/lprolog.vim                       |    9 +-
 syntax/ls.vim                            |    9 +-
 syntax/lsl.vim                           |    9 +-
 syntax/lss.vim                           |    9 +-
 syntax/lua.vim                           |    9 +-
 syntax/lynx.vim                          |    9 +-
 syntax/m4.vim                            |    9 +-
 syntax/mail.vim                          |    9 +-
 syntax/mailaliases.vim                   |    9 +-
 syntax/mailcap.vim                       |    9 +-
 syntax/make.vim                          |    9 +-
 syntax/mako.vim                          |    9 +-
 syntax/mallard.vim                       |    9 +-
 syntax/manconf.vim                       |    9 +-
 syntax/maple.vim                         |    9 +-
 syntax/markdown.vim                      |    9 +-
 syntax/mason.vim                         |    9 +-
 syntax/master.vim                        |    9 +-
 syntax/mel.vim                           |    9 +-
 syntax/merlin.vim                        |    9 +-
 syntax/meson.vim                         |    9 +-
 syntax/messages.vim                      |    9 +-
 syntax/mf.vim                            |    9 +-
 syntax/mgl.vim                           |    9 +-
 syntax/mgp.vim                           |    9 +-
 syntax/mib.vim                           |    9 +-
 syntax/mix.vim                           |    9 +-
 syntax/mma.vim                           |    9 +-
 syntax/mmp.vim                           |    9 +-
 syntax/modconf.vim                       |    9 +-
 syntax/modula2.vim                       |    9 +-
 syntax/modula3.vim                       |    9 +-
 syntax/monk.vim                          |    9 +-
 syntax/moo.vim                           |    9 +-
 syntax/moon.vim                          |    9 +-
 syntax/mp.vim                            |    9 +-
 syntax/mplayerconf.vim                   |    9 +-
 syntax/mrxvtrc.vim                       |    9 +-
 syntax/msidl.vim                         |    9 +-
 syntax/msql.vim                          |    9 +-
 syntax/mupad.vim                         |    9 +-
 syntax/murphi.vim                        |    9 +-
 syntax/mush.vim                          |    9 +-
 syntax/mustache.vim                      |    9 +-
 syntax/muttrc.vim                        |    9 +-
 syntax/mysql.vim                         |    9 +-
 syntax/n1ql.vim                          |    9 +-
 syntax/named.vim                         |    9 +-
 syntax/nanorc.vim                        |    9 +-
 syntax/natural.vim                       |    9 +-
 syntax/ncf.vim                           |    9 +-
 syntax/neomuttrc.vim                     |    9 +-
 syntax/netrc.vim                         |    9 +-
 syntax/nginx.vim                         |    9 +-
 syntax/nim.vim                           |    9 +-
 syntax/ninja.vim                         |    9 +-
 syntax/nix.vim                           |    9 +-
 syntax/nqc.vim                           |    9 +-
 syntax/nroff.vim                         |    9 +-
 syntax/nsis.vim                          |    9 +-
 syntax/oasis.vim                         |    9 +-
 syntax/obj.vim                           |    9 +-
 syntax/ocaml.vim                         |    9 +-
 syntax/ocamlbuild_tags.vim               |    9 +-
 syntax/occam.vim                         |    9 +-
 syntax/ocpbuild.vim                      |    9 +-
 syntax/ocpbuildroot.vim                  |    9 +-
 syntax/octave.vim                        |    9 +-
 syntax/odin.vim                          |    9 +-
 syntax/omake.vim                         |    9 +-
 syntax/omnimark.vim                      |    9 +-
 syntax/opam.vim                          |    9 +-
 syntax/opencl.vim                        |    9 +-
 syntax/openroad.vim                      |    9 +-
 syntax/opl.vim                           |    9 +-
 syntax/ora.vim                           |    9 +-
 syntax/pamconf.vim                       |    9 +-
 syntax/pamenv.vim                        |    9 +-
 syntax/papp.vim                          |    9 +-
 syntax/pascal.vim                        |    9 +-
 syntax/passwd.vim                        |    9 +-
 syntax/pccts.vim                         |    9 +-
 syntax/pdf.vim                           |    9 +-
 syntax/perl.vim                          |    9 +-
 syntax/pf.vim                            |    9 +-
 syntax/pfmain.vim                        |    9 +-
 syntax/pgsql.vim                         |    9 +-
 syntax/php.vim                           |    9 +-
 syntax/pike.vim                          |    9 +-
 syntax/pilrc.vim                         |    9 +-
 syntax/pine.vim                          |    9 +-
 syntax/pinfo.vim                         |    9 +-
 syntax/plantuml.vim                      |    9 +-
 syntax/pli.vim                           |    9 +-
 syntax/plm.vim                           |    9 +-
 syntax/plp.vim                           |    9 +-
 syntax/plsql.vim                         |    9 +-
 syntax/po.vim                            |    9 +-
 syntax/pod.vim                           |    9 +-
 syntax/pony.vim                          |    9 +-
 syntax/postscr.vim                       |    9 +-
 syntax/pov.vim                           |    9 +-
 syntax/povini.vim                        |    9 +-
 syntax/ppd.vim                           |    9 +-
 syntax/ppwiz.vim                         |    9 +-
 syntax/privoxy.vim                       |    9 +-
 syntax/procmail.vim                      |    9 +-
 syntax/prolog.vim                        |    9 +-
 syntax/promela.vim                       |    9 +-
 syntax/proto.vim                         |    9 +-
 syntax/protocols.vim                     |    9 +-
 syntax/ps1.vim                           |    9 +-
 syntax/ps1xml.vim                        |    9 +-
 syntax/psf.vim                           |    9 +-
 syntax/pug.vim                           |    9 +-
 syntax/puppet.vim                        |    9 +-
 syntax/purescript.vim                    |    9 +-
 syntax/pyrex.vim                         |    9 +-
 syntax/python.vim                        |    9 +-
 syntax/qmake.vim                         |    9 +-
 syntax/qml.vim                           |    9 +-
 syntax/quake.vim                         |    9 +-
 syntax/racket.vim                        |    9 +-
 syntax/radiance.vim                      |    9 +-
 syntax/ragel.vim                         |    9 +-
 syntax/raku.vim                          |    9 +-
 syntax/raml.vim                          |    9 +-
 syntax/ratpoison.vim                     |    9 +-
 syntax/razor.vim                         |    9 +-
 syntax/rc.vim                            |    9 +-
 syntax/rcs.vim                           |    9 +-
 syntax/readline.vim                      |    9 +-
 syntax/reason.vim                        |    9 +-
 syntax/rego.vim                          |    9 +-
 syntax/remind.vim                        |    9 +-
 syntax/requirements.vim                  |    9 +-
 syntax/resolv.vim                        |    9 +-
 syntax/reva.vim                          |    9 +-
 syntax/rexx.vim                          |    9 +-
 syntax/rhelp.vim                         |    9 +-
 syntax/rib.vim                           |    9 +-
 syntax/rmd.vim                           |    9 +-
 syntax/rnc.vim                           |    9 +-
 syntax/rng.vim                           |    9 +-
 syntax/rnoweb-1.vim                      |    9 +-
 syntax/rnoweb-2.vim                      |    9 +-
 syntax/robots.vim                        |    9 +-
 syntax/rpcgen.vim                        |    9 +-
 syntax/rpl.vim                           |    9 +-
 syntax/rrst.vim                          |    9 +-
 syntax/rst.vim                           |    9 +-
 syntax/rtf.vim                           |    9 +-
 syntax/ruby.vim                          |    9 +-
 syntax/rust.vim                          |    9 +-
 syntax/samba.vim                         |    9 +-
 syntax/sas.vim                           |    9 +-
 syntax/sass.vim                          |    9 +-
 syntax/sather.vim                        |    9 +-
 syntax/sbt.vim                           |    9 +-
 syntax/scala.vim                         |    9 +-
 syntax/scheme.vim                        |    9 +-
 syntax/scilab.vim                        |    9 +-
 syntax/screen.vim                        |    9 +-
 syntax/scss.vim                          |    9 +-
 syntax/sd.vim                            |    9 +-
 syntax/sdc.vim                           |    9 +-
 syntax/sdl.vim                           |    9 +-
 syntax/sed.vim                           |    9 +-
 syntax/sensors.vim                       |    9 +-
 syntax/services.vim                      |    9 +-
 syntax/setserial.vim                     |    9 +-
 syntax/sexplib.vim                       |    9 +-
 syntax/sh.vim                            |    9 +-
 syntax/sieve.vim                         |    9 +-
 syntax/sil.vim                           |    9 +-
 syntax/simula.vim                        |    9 +-
 syntax/sinda.vim                         |    9 +-
 syntax/sisu.vim                          |    9 +-
 syntax/skill.vim                         |    9 +-
 syntax/slang.vim                         |    9 +-
 syntax/slice.vim                         |    9 +-
 syntax/slim.vim                          |    9 +-
 syntax/slime.vim                         |    9 +-
 syntax/slpconf.vim                       |    9 +-
 syntax/slpreg.vim                        |    9 +-
 syntax/slpspi.vim                        |    9 +-
 syntax/slrnrc.vim                        |    9 +-
 syntax/slrnsc.vim                        |    9 +-
 syntax/sm.vim                            |    9 +-
 syntax/smarty.vim                        |    9 +-
 syntax/smcl.vim                          |    9 +-
 syntax/smhl.vim                          |    9 +-
 syntax/smith.vim                         |    9 +-
 syntax/sml.vim                           |    9 +-
 syntax/smt2.vim                          |    9 +-
 syntax/snobol4.vim                       |    9 +-
 syntax/solidity.vim                      |    9 +-
 syntax/spec.vim                          |    9 +-
 syntax/spice.vim                         |    9 +-
 syntax/spup.vim                          |    9 +-
 syntax/spyce.vim                         |    9 +-
 syntax/sql.vim                           |    9 +-
 syntax/sqlj.vim                          |    9 +-
 syntax/sqloracle.vim                     |    9 +-
 syntax/sqr.vim                           |    9 +-
 syntax/squid.vim                         |    9 +-
 syntax/srec.vim                          |    9 +-
 syntax/sshconfig.vim                     |    9 +-
 syntax/sshdconfig.vim                    |    9 +-
 syntax/st.vim                            |    9 +-
 syntax/stata.vim                         |    9 +-
 syntax/stp.vim                           |    9 +-
 syntax/stylus.vim                        |    9 +-
 syntax/sudoers.vim                       |    9 +-
 syntax/svelte.vim                        |    9 +-
 syntax/svg.vim                           |    9 +-
 syntax/svn.vim                           |    9 +-
 syntax/swift.vim                         |    9 +-
 syntax/swiftgyb.vim                      |    9 +-
 syntax/sxhkdrc.vim                       |    9 +-
 syntax/sysctl.vim                        |    9 +-
 syntax/systemd.vim                       |    9 +-
 syntax/systemverilog.vim                 |    9 +-
 syntax/tablegen.vim                      |    9 +-
 syntax/tads.vim                          |    9 +-
 syntax/tags.vim                          |    9 +-
 syntax/tak.vim                           |    9 +-
 syntax/tap.vim                           |    9 +-
 syntax/taskdata.vim                      |    9 +-
 syntax/taskedit.vim                      |    9 +-
 syntax/tcl.vim                           |    9 +-
 syntax/template.vim                      |    9 +-
 syntax/teraterm.vim                      |    9 +-
 syntax/terminfo.vim                      |    9 +-
 syntax/terraform.vim                     |    9 +-
 syntax/tex.vim                           |    9 +-
 syntax/texinfo.vim                       |    9 +-
 syntax/texmf.vim                         |    9 +-
 syntax/textile.vim                       |    9 +-
 syntax/tf.vim                            |    9 +-
 syntax/thrift.vim                        |    9 +-
 syntax/tidy.vim                          |    9 +-
 syntax/tilde.vim                         |    9 +-
 syntax/tli.vim                           |    9 +-
 syntax/tmux.vim                          |    9 +-
 syntax/toml.vim                          |    9 +-
 syntax/tpp.vim                           |    9 +-
 syntax/tptp.vim                          |    9 +-
 syntax/trasys.vim                        |    9 +-
 syntax/treetop.vim                       |    9 +-
 syntax/trustees.vim                      |    9 +-
 syntax/tsalt.vim                         |    9 +-
 syntax/tsscl.vim                         |    9 +-
 syntax/tssgm.vim                         |    9 +-
 syntax/tssop.vim                         |    9 +-
 syntax/tt2.vim                           |    9 +-
 syntax/tt2html.vim                       |    9 +-
 syntax/tt2js.vim                         |    9 +-
 syntax/twig.vim                          |    9 +-
 syntax/typescript.vim                    |    9 +-
 syntax/typescriptreact.vim               |   10 +-
 syntax/uc.vim                            |    9 +-
 syntax/udevconf.vim                      |    9 +-
 syntax/udevperm.vim                      |    9 +-
 syntax/uil.vim                           |    9 +-
 syntax/unison.vim                        |    9 +-
 syntax/updatedb.vim                      |    9 +-
 syntax/upstart.vim                       |    9 +-
 syntax/upstreamdat.vim                   |    9 +-
 syntax/upstreaminstalllog.vim            |    9 +-
 syntax/upstreamlog.vim                   |    9 +-
 syntax/usserverlog.vim                   |    9 +-
 syntax/usw2kagtlog.vim                   |    9 +-
 syntax/vala.vim                          |    9 +-
 syntax/vb.vim                            |    9 +-
 syntax/vbnet.vim                         |    9 +-
 syntax/vcl.vim                           |    9 +-
 syntax/velocity.vim                      |    9 +-
 syntax/vera.vim                          |    9 +-
 syntax/verilog.vim                       |    9 +-
 syntax/verilogams.vim                    |    9 +-
 syntax/vgrindefs.vim                     |    9 +-
 syntax/vhdl.vim                          |    9 +-
 syntax/vimgo.vim                         |    9 +-
 syntax/viminfo.vim                       |    9 +-
 syntax/vlang.vim                         |    9 +-
 syntax/vmasm.vim                         |    9 +-
 syntax/voscm.vim                         |    9 +-
 syntax/vrml.vim                          |    9 +-
 syntax/vroom.vim                         |    9 +-
 syntax/vue.vim                           |    9 +-
 syntax/wast.vim                          |    9 +-
 syntax/webmacro.vim                      |    9 +-
 syntax/wget.vim                          |    9 +-
 syntax/winbatch.vim                      |    9 +-
 syntax/wml.vim                           |    9 +-
 syntax/wsh.vim                           |    9 +-
 syntax/wsml.vim                          |    9 +-
 syntax/wvdial.vim                        |    9 +-
 syntax/xdc.vim                           |    9 +-
 syntax/xdefaults.vim                     |    9 +-
 syntax/xf86conf.vim                      |    9 +-
 syntax/xhtml.vim                         |    9 +-
 syntax/xinetd.vim                        |    9 +-
 syntax/xmath.vim                         |    9 +-
 syntax/xml.vim                           |    9 +-
 syntax/xmodmap.vim                       |    9 +-
 syntax/xpm.vim                           |    9 +-
 syntax/xpm2.vim                          |    9 +-
 syntax/xquery.vim                        |    9 +-
 syntax/xs.vim                            |    9 +-
 syntax/xsd.vim                           |    9 +-
 syntax/xsl.vim                           |    9 +-
 syntax/xslt.vim                          |    9 +-
 syntax/yacc.vim                          |    9 +-
 syntax/yaml.vim                          |    9 +-
 syntax/yats.vim                          |    9 +-
 syntax/yats/css.vim                      |    9 +-
 syntax/yats/dom-document.vim             |    9 +-
 syntax/yats/dom-elem.vim                 |    9 +-
 syntax/yats/dom-event.vim                |    9 +-
 syntax/yats/dom-form.vim                 |    9 +-
 syntax/yats/dom-node.vim                 |    9 +-
 syntax/yats/dom-storage.vim              |    9 +-
 syntax/yats/ecma-402.vim                 |    9 +-
 syntax/yats/es6-array.vim                |    9 +-
 syntax/yats/es6-date.vim                 |    9 +-
 syntax/yats/es6-function.vim             |    9 +-
 syntax/yats/es6-json.vim                 |    9 +-
 syntax/yats/es6-map.vim                  |    9 +-
 syntax/yats/es6-math.vim                 |    9 +-
 syntax/yats/es6-number.vim               |    9 +-
 syntax/yats/es6-object.vim               |    9 +-
 syntax/yats/es6-promise.vim              |    9 +-
 syntax/yats/es6-proxy.vim                |    9 +-
 syntax/yats/es6-reflect.vim              |    9 +-
 syntax/yats/es6-regexp.vim               |    9 +-
 syntax/yats/es6-set.vim                  |    9 +-
 syntax/yats/es6-string.vim               |    9 +-
 syntax/yats/es6-symbol.vim               |    9 +-
 syntax/yats/event.vim                    |    9 +-
 syntax/yats/node.vim                     |    9 +-
 syntax/yats/test.vim                     |    9 +-
 syntax/yats/typescript.vim               |    9 +-
 syntax/yats/web-blob.vim                 |    9 +-
 syntax/yats/web-console.vim              |    9 +-
 syntax/yats/web-crypto.vim               |    9 +-
 syntax/yats/web-encoding.vim             |    9 +-
 syntax/yats/web-fetch.vim                |    9 +-
 syntax/yats/web-geo.vim                  |    9 +-
 syntax/yats/web-history.vim              |    9 +-
 syntax/yats/web-location.vim             |    9 +-
 syntax/yats/web-navigator.vim            |    9 +-
 syntax/yats/web-network.vim              |    9 +-
 syntax/yats/web-payment.vim              |    9 +-
 syntax/yats/web-service-worker.vim       |    9 +-
 syntax/yats/web-window.vim               |    9 +-
 syntax/yats/web-xhr.vim                  |    9 +-
 syntax/yats/web.vim                      |    9 +-
 syntax/z8a.vim                           |    9 +-
 syntax/zephir.vim                        |    9 +-
 syntax/zig.vim                           |    9 +-
 syntax/zimbu.vim                         |    9 +-
 syntax/zir.vim                           |    9 +-
 syntax/zsh.vim                           |    9 +-
 1293 files changed, 2073 insertions(+), 10649 deletions(-)
 create mode 100644 autoload/polyglot/util.vim

diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 8009502d3..461f6a241 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,7 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
+if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
+  finish
+endif
 
 setlocal comments=s1fl:{-,mb:-,ex:-},:--
 setlocal iskeyword+=-,.,*
 setlocal commentstring=--\ %s
-
-endif
diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim
index 27c00bcb4..a039dd951 100644
--- a/after/ftplugin/coffee.vim
+++ b/after/ftplugin/coffee.vim
@@ -1,9 +1,9 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
+if !polyglot#util#IsEnabled('cjsx', expand('<sfile>:p'))
+  finish
+endif
 
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
   let b:match_words = '(:),\[:\],{:},<:>,' .
     \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
 endif
-
-endif
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index a617329c1..96ea4d047 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,6 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
+if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
+  finish
+endif
 
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--
 setlocal iskeyword+='
-
-endif
diff --git a/after/ftplugin/html.vim b/after/ftplugin/html.vim
index 50cdb2aec..6b0b48a21 100644
--- a/after/ftplugin/html.vim
+++ b/after/ftplugin/html.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+  finish
+endif
 
 " Maintainer:  	othree <othree@gmail.com>
 " URL:		      http://github.com/othree/html5.vim
@@ -9,5 +11,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " setlocal iskeyword+=-
 
 setlocal commentstring=<!--%s-->
-
-endif
diff --git a/after/ftplugin/idris.vim b/after/ftplugin/idris.vim
index 6c6815d56..4b38f4cee 100644
--- a/after/ftplugin/idris.vim
+++ b/after/ftplugin/idris.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
+if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
+  finish
+endif
 
 setlocal iskeyword+='
-
-endif
diff --git a/after/ftplugin/idris2.vim b/after/ftplugin/idris2.vim
index b96ae5b6c..b7f25573f 100644
--- a/after/ftplugin/idris2.vim
+++ b/after/ftplugin/idris2.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
+  finish
+endif
 
 setlocal iskeyword+='
-
-endif
diff --git a/after/ftplugin/javascript-1.vim b/after/ftplugin/javascript-1.vim
index 9f6c9314b..8480c6e71 100644
--- a/after/ftplugin/javascript-1.vim
+++ b/after/ftplugin/javascript-1.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
+  finish
+endif
 
 " Vim filetype plugin file
 " Language:     JavaScript
@@ -12,5 +14,3 @@ if exists('b:undo_ftplugin')
 else
   let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
 endif
-
-endif
diff --git a/after/ftplugin/javascript-2.vim b/after/ftplugin/javascript-2.vim
index 2992e9427..f56dd82a7 100644
--- a/after/ftplugin/javascript-2.vim
+++ b/after/ftplugin/javascript-2.vim
@@ -1,9 +1,9 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 if get(g:, 'vim_jsx_pretty_disable_js', 0)
   finish
 endif
 
 source <sfile>:h/jsx.vim
-
-endif
diff --git a/after/ftplugin/javascriptreact.vim b/after/ftplugin/javascriptreact.vim
index 265415d0e..be2ea1fc5 100644
--- a/after/ftplugin/javascriptreact.vim
+++ b/after/ftplugin/javascriptreact.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 source <sfile>:h/jsx.vim
-
-endif
diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
index 94f90c13f..f6f071311 100644
--- a/after/ftplugin/jsx.vim
+++ b/after/ftplugin/jsx.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim ftplugin file
@@ -31,5 +33,3 @@ augroup jsx_comment
 augroup end
 
 setlocal suffixesadd+=.jsx
-
-endif
diff --git a/after/ftplugin/llvm.vim b/after/ftplugin/llvm.vim
index fbd4b7fff..192bf2f57 100644
--- a/after/ftplugin/llvm.vim
+++ b/after/ftplugin/llvm.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
+if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
+  finish
+endif
 
 " Copyright (c) 2018 rhysd
 "
@@ -483,5 +485,3 @@ endfunction
 if !exists(':LLI')
     command! -buffer -nargs=? -bar -complete=file LLI call <SID>run_lli(<f-args>)
 endif
-
-endif
diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim
index 6ddb64e04..8cbc99721 100644
--- a/after/ftplugin/puppet.vim
+++ b/after/ftplugin/puppet.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
+if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+  finish
+endif
 
 if !exists('g:puppet_align_hashes')
     let g:puppet_align_hashes = 1
@@ -7,5 +9,3 @@ endif
 if g:puppet_align_hashes
     inoremap <buffer> <silent> => =><Esc>:call puppet#align#AlignHashrockets()<CR>$a
 endif
-
-endif
diff --git a/after/ftplugin/tsx.vim b/after/ftplugin/tsx.vim
index 96b5515a9..2b35ec46c 100644
--- a/after/ftplugin/tsx.vim
+++ b/after/ftplugin/tsx.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 " modified from html.vim
 " For matchit plugin
@@ -28,5 +30,3 @@ augroup jsx_comment
 augroup end
 
 setlocal suffixesadd+=.tsx
-
-endif
diff --git a/after/ftplugin/typescriptreact.vim b/after/ftplugin/typescriptreact.vim
index 3d8502911..07de9bb7b 100644
--- a/after/ftplugin/typescriptreact.vim
+++ b/after/ftplugin/typescriptreact.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 source <sfile>:h/tsx.vim
-
-endif
diff --git a/after/indent/html.vim b/after/indent/html.vim
index 3b9c7eb43..065106ca4 100644
--- a/after/indent/html.vim
+++ b/after/indent/html.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+  finish
+endif
 
 " Vim indent script for HTML
 " Header: "{{{
@@ -1060,5 +1062,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: fdm=marker ts=8 sw=2 tw=78
-
-endif
diff --git a/after/indent/javascript-1.vim b/after/indent/javascript-1.vim
index 2992e9427..f56dd82a7 100644
--- a/after/indent/javascript-1.vim
+++ b/after/indent/javascript-1.vim
@@ -1,9 +1,9 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 if get(g:, 'vim_jsx_pretty_disable_js', 0)
   finish
 endif
 
 source <sfile>:h/jsx.vim
-
-endif
diff --git a/after/indent/javascript-2.vim b/after/indent/javascript-2.vim
index 85e523121..24d297031 100644
--- a/after/indent/javascript-2.vim
+++ b/after/indent/javascript-2.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+  finish
+endif
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
 "
@@ -42,5 +44,3 @@ function GetJavascriptGraphQLIndent()
 
   return eval(b:indentexpr_base)
 endfunction
-
-endif
diff --git a/after/indent/javascriptreact.vim b/after/indent/javascriptreact.vim
index 265415d0e..be2ea1fc5 100644
--- a/after/indent/javascriptreact.vim
+++ b/after/indent/javascriptreact.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 source <sfile>:h/jsx.vim
-
-endif
diff --git a/after/indent/jsx.vim b/after/indent/jsx.vim
index fcd7b5adc..394f20b7d 100644
--- a/after/indent/jsx.vim
+++ b/after/indent/jsx.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim indent file
@@ -29,5 +31,3 @@ endfunction
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/after/indent/objc.vim b/after/indent/objc.vim
index 081e70335..ee6448612 100644
--- a/after/indent/objc.vim
+++ b/after/indent/objc.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
+if !polyglot#util#IsEnabled('objc', expand('<sfile>:p'))
+  finish
+endif
 
 " Vim indent file
 " Language:	Objective-C
@@ -93,5 +95,3 @@ endfunction
 " Restore 'cpo' options
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/after/indent/tsx.vim b/after/indent/tsx.vim
index 13312c03b..544568a75 100644
--- a/after/indent/tsx.vim
+++ b/after/indent/tsx.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim indent file
@@ -36,5 +38,3 @@ endfunction
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
index 45ef3492e..8f0172c1a 100644
--- a/after/indent/typescript.vim
+++ b/after/indent/typescript.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+  finish
+endif
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
 "
@@ -42,5 +44,3 @@ function GetTypescriptGraphQLIndent()
 
   return eval(b:indentexpr_base)
 endfunction
-
-endif
diff --git a/after/indent/typescriptreact.vim b/after/indent/typescriptreact.vim
index 3d8502911..07de9bb7b 100644
--- a/after/indent/typescriptreact.vim
+++ b/after/indent/typescriptreact.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 source <sfile>:h/tsx.vim
-
-endif
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index 80501e194..d0478e01d 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') == -1
+if !polyglot#util#IsEnabled('cpp-modern', expand('<sfile>:p'))
+  finish
+endif
 
 " ==============================================================================
 " Vim syntax file
@@ -66,5 +68,3 @@ if get(g:, 'cpp_simple_highlight', 0)
     hi link cTypedef      Statement
     hi link cLabel        Statement
 endif
-
-endif
diff --git a/after/syntax/coffee.vim b/after/syntax/coffee.vim
index fde51eb4a..9b9f38a38 100644
--- a/after/syntax/coffee.vim
+++ b/after/syntax/coffee.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
+if !polyglot#util#IsEnabled('cjsx', expand('<sfile>:p'))
+  finish
+endif
 
 if exists('b:current_syntax')
   let s:current_syntax=b:current_syntax
@@ -27,5 +29,3 @@ hi def link cjsxTagName         Function
 hi def link cjsxEntity          Statement
 hi def link cjsxEntityPunct     Type
 hi def link cjsxAttribProperty  Type
-
-endif
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index ec3f1fcfb..b59b98596 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') == -1
+if !polyglot#util#IsEnabled('cpp-modern', expand('<sfile>:p'))
+  finish
+endif
 
 " ==============================================================================
 " Vim syntax file
@@ -208,5 +210,3 @@ if get(g:, 'cpp_simple_highlight', 0)
     hi link cppExceptions   Statement
     hi link cppStorageClass Statement
 endif
-
-endif
diff --git a/after/syntax/haskell.vim b/after/syntax/haskell.vim
index ac1752981..e109b2d78 100644
--- a/after/syntax/haskell.vim
+++ b/after/syntax/haskell.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dhall') == -1
+if !polyglot#util#IsEnabled('dhall', expand('<sfile>:p'))
+  finish
+endif
 
 " store and remove current syntax value
 let old_syntax = b:current_syntax
@@ -13,5 +15,3 @@ hi def link quasiQuote Underlined
 
 " restore current syntax value
 let b:current_syntax = old_syntax
-
-endif
diff --git a/after/syntax/help.vim b/after/syntax/help.vim
index 16c46b299..a43546cf2 100644
--- a/after/syntax/help.vim
+++ b/after/syntax/help.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
+if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
+  finish
+endif
 
 " Extends standard help syntax with highlighting of Scala code.
 "
@@ -14,5 +16,3 @@ if has('conceal')
 else
   syntax region rgnScala matchgroup=Ignore start='!sc!' end='!/sc!' contains=@ScalaCode
 endif
-
-endif
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index c02c02a36..8bdc0b0f9 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+  finish
+endif
 
 " Vim syntax file
 " Language:     HTML (version 5.1)
@@ -196,5 +198,3 @@ syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffs
 " https://github.com/w3c/html/issues/694
 syntax region htmlComment start=+<!--+ end=+-->+ contains=@Spell
 syntax region htmlComment start=+<!DOCTYPE+ keepend end=+>+
-
-endif
diff --git a/after/syntax/html/aria.vim b/after/syntax/html/aria.vim
index 0c555e6ec..9e457bff9 100644
--- a/after/syntax/html/aria.vim
+++ b/after/syntax/html/aria.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+  finish
+endif
 
 " Vim syntax file
 " Language:     WAI-ARIA
@@ -75,5 +77,3 @@ syn match    htmlArg contained "\<aria-\%(\|labelledby\|owns\|posinset\|setsize\
 syn match    htmlArg contained "\<aria-\%(\|colcount\|colindex\|colspan\)\>"
 syn match    htmlArg contained "\<aria-\%(\|rowcount\|rowindex\|rowspan\)\>"
 
-
-endif
diff --git a/after/syntax/html/electron.vim b/after/syntax/html/electron.vim
index f51e1aeff..636e810da 100644
--- a/after/syntax/html/electron.vim
+++ b/after/syntax/html/electron.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+  finish
+endif
 
 " Vim syntax file
 " Language:     Electron
@@ -15,5 +17,3 @@ syn keyword htmlArg contained useragent disablewebsecurity partition allowpopups
 syn keyword htmlArg contained webpreferences blinkfeatures disableblinkfeatures
 syn keyword htmlArg contained guestinstance disableguestresize 
 
-
-endif
diff --git a/after/syntax/html/rdfa.vim b/after/syntax/html/rdfa.vim
index d772d43cf..ec7d714bc 100644
--- a/after/syntax/html/rdfa.vim
+++ b/after/syntax/html/rdfa.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+  finish
+endif
 
 " Vim syntax file
 " Language:     RDFa
@@ -11,5 +13,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " RDFa
 " http://www.w3.org/TR/rdfa-syntax/#s_syntax
 syn keyword htmlArg contained about content datatype href inlist prefix property rel resource rev src typeof vocab
-
-endif
diff --git a/after/syntax/idris.vim b/after/syntax/idris.vim
index 29d356321..01f5000e8 100644
--- a/after/syntax/idris.vim
+++ b/after/syntax/idris.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
+if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
+  finish
+endif
 
 " This script allows for unicode concealing of certain characters
 " For instance -> goes to →
@@ -78,5 +80,3 @@ hi link idrNiceOperator Operator
 hi! link Conceal Operator
 setlocal conceallevel=2
 
-
-endif
diff --git a/after/syntax/idris2.vim b/after/syntax/idris2.vim
index 85f674a99..279e5875c 100644
--- a/after/syntax/idris2.vim
+++ b/after/syntax/idris2.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
+  finish
+endif
 
 " This script allows for unicode concealing of certain characters
 " For instance -> goes to →
@@ -78,5 +80,3 @@ hi link idrNiceOperator Operator
 hi! link Conceal Operator
 setlocal conceallevel=2
 
-
-endif
diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim
index 2992e9427..f56dd82a7 100644
--- a/after/syntax/javascript.vim
+++ b/after/syntax/javascript.vim
@@ -1,9 +1,9 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 if get(g:, 'vim_jsx_pretty_disable_js', 0)
   finish
 endif
 
 source <sfile>:h/jsx.vim
-
-endif
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index 22557862d..c0c737420 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+  finish
+endif
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
 "
@@ -60,5 +62,3 @@ elseif graphql#has_syntax_group('javaScriptStringT')
   syn cluster javaScriptEmbededExpr add=graphqlTaggedTemplate
   syn cluster graphqlTaggedTemplate add=graphqlTemplateString
 endif
-
-endif
diff --git a/after/syntax/javascript/html5.vim b/after/syntax/javascript/html5.vim
index 42ab78ade..eaeaccb5d 100644
--- a/after/syntax/javascript/html5.vim
+++ b/after/syntax/javascript/html5.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+  finish
+endif
 
 " Vim syntax file
 " Language:	    HTML5 New Stuff
@@ -49,5 +51,3 @@ syn keyword javascriptDomElemAttrs indeterminate
 
 " select https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
 syn keyword javascriptDomElemAttrs onselectstart onselectchange
-
-endif
diff --git a/after/syntax/javascript/sql.vim b/after/syntax/javascript/sql.vim
index 8b45203c6..58e23b56b 100644
--- a/after/syntax/javascript/sql.vim
+++ b/after/syntax/javascript/sql.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript-sql') == -1
+if !polyglot#util#IsEnabled('javascript-sql', expand('<sfile>:p'))
+  finish
+endif
 
 " Vim plugin
 " Language: JavaScript
@@ -22,5 +24,3 @@ hi def link sqlTaggedTemplate jsTaggedTemplate
 
 syn cluster jsExpression add=sqlTaggedTemplate
 syn cluster sqlTaggedTemplate add=sqlTemplateString
-
-endif
diff --git a/after/syntax/javascriptreact.vim b/after/syntax/javascriptreact.vim
index 265415d0e..be2ea1fc5 100644
--- a/after/syntax/javascriptreact.vim
+++ b/after/syntax/javascriptreact.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 source <sfile>:h/jsx.vim
-
-endif
diff --git a/after/syntax/javascriptreact/graphql.vim b/after/syntax/javascriptreact/graphql.vim
index c86f9d237..52628a1a1 100644
--- a/after/syntax/javascriptreact/graphql.vim
+++ b/after/syntax/javascriptreact/graphql.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+  finish
+endif
 
 runtime! after/syntax/javascript/graphql.vim
-
-endif
diff --git a/after/syntax/jsx.vim b/after/syntax/jsx.vim
index 00c4b0791..0a7a7e1ee 100644
--- a/after/syntax/jsx.vim
+++ b/after/syntax/jsx.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim syntax file
@@ -55,5 +57,3 @@ let b:current_syntax = 'javascript.jsx'
 
 let &cpo = s:jsx_cpo
 unlet s:jsx_cpo
-
-endif
diff --git a/after/syntax/jsx_pretty.vim b/after/syntax/jsx_pretty.vim
index 9f14e4d46..f05969c50 100644
--- a/after/syntax/jsx_pretty.vim
+++ b/after/syntax/jsx_pretty.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 let s:highlight_close_tag = get(g:, 'vim_jsx_pretty_highlight_close_tag', 0)
 
@@ -221,5 +223,3 @@ if s:vim_jsx_pretty_colorful_config == 1
   highlight def link jsArrowFuncArgs Type
   highlight def link jsFuncArgs Type
 endif
-
-endif
diff --git a/after/syntax/llvm.vim b/after/syntax/llvm.vim
index 04d234a2e..6f3daebf3 100644
--- a/after/syntax/llvm.vim
+++ b/after/syntax/llvm.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
+if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
+  finish
+endif
 
 " Copyright (c) 2018 rhysd
 "
@@ -22,5 +24,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 
 syn keyword llvmKeyword attributes
 syn match llvmNoName /#\d\+\>/
-
-endif
diff --git a/after/syntax/mdx.vim b/after/syntax/mdx.vim
index 5538f881a..6fd7b9634 100644
--- a/after/syntax/mdx.vim
+++ b/after/syntax/mdx.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mdx') == -1
+if !polyglot#util#IsEnabled('mdx', expand('<sfile>:p'))
+  finish
+endif
 
 
 " based on mxw/vim-jsx
@@ -41,5 +43,3 @@ syn cluster jsExpression add=jsxRegion
 
 " Allow jsxRegion to contain reserved words.
 syn cluster javascriptNoReserved add=jsxRegion
-
-endif
diff --git a/after/syntax/mma.vim b/after/syntax/mma.vim
index c01de4d04..24d997554 100644
--- a/after/syntax/mma.vim
+++ b/after/syntax/mma.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
+if !polyglot#util#IsEnabled('mathematica', expand('<sfile>:p'))
+  finish
+endif
 
 "Vim conceal file
 " Language: Mathematica
@@ -1442,5 +1444,3 @@ endif
 hi! link Conceal Normal
 setlocal conceallevel=2
 
-
-endif
diff --git a/after/syntax/objc.vim b/after/syntax/objc.vim
index 093688b1f..0541758da 100644
--- a/after/syntax/objc.vim
+++ b/after/syntax/objc.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
+if !polyglot#util#IsEnabled('objc', expand('<sfile>:p'))
+  finish
+endif
 
 " ARC type modifiers
 syn keyword objcTypeModifier __bridge __bridge_retained __bridge_transfer __autoreleasing __strong __weak __unsafe_unretained
@@ -19,5 +21,3 @@ syn match objcDirective "@property\|@synthesize\|@dynamic\|@package"
 
 " Highlight property attributes as if they were type modifiers
 hi def link objcPropertyAttribute objcTypeModifier
-
-endif
diff --git a/after/syntax/reason.vim b/after/syntax/reason.vim
index 3be396903..f608bde10 100644
--- a/after/syntax/reason.vim
+++ b/after/syntax/reason.vim
@@ -1,4 +1,4 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
-
-
+if !polyglot#util#IsEnabled('reason', expand('<sfile>:p'))
+  finish
 endif
+
diff --git a/after/syntax/reason/graphql.vim b/after/syntax/reason/graphql.vim
index 4f4ba44c7..00fe9b5da 100644
--- a/after/syntax/reason/graphql.vim
+++ b/after/syntax/reason/graphql.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+  finish
+endif
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
 "
@@ -33,5 +35,3 @@ if exists('s:current_syntax')
 endif
 
 syntax region graphqlExtensionPoint matchgroup=Noise start=+\[%graphql\_s*{|+lc=10 end=+|}\_s*]+he=s+1 contains=@GraphQLSyntax keepend
-
-endif
diff --git a/after/syntax/rspec.vim b/after/syntax/rspec.vim
index 96ceb28ff..99905ddd6 100644
--- a/after/syntax/rspec.vim
+++ b/after/syntax/rspec.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rspec') == -1
+if !polyglot#util#IsEnabled('rspec', expand('<sfile>:p'))
+  finish
+endif
 
 "
 " An rspec syntax file
@@ -189,5 +191,3 @@ highlight link rspecMatchers Function
 highlight link rspecMessageExpectation Function
 
 let b:current_syntax = 'rspec'
-
-endif
diff --git a/after/syntax/ruby.vim b/after/syntax/ruby.vim
index 78503c94f..e57c1d709 100644
--- a/after/syntax/ruby.vim
+++ b/after/syntax/ruby.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yard') == -1
+if !polyglot#util#IsEnabled('yard', expand('<sfile>:p'))
+  finish
+endif
 
 " Ruby syntax extensions for highlighting YARD documentation.
 "
@@ -127,5 +129,3 @@ hi def link yardParametricType yardComment
 hi def link yardArrow yardComment
 hi def link yardHashAngle yardComment
 hi def link yardHashCurly yardComment
-
-endif
diff --git a/after/syntax/rust.vim b/after/syntax/rust.vim
index 0a54e2fc3..bf17e031b 100644
--- a/after/syntax/rust.vim
+++ b/after/syntax/rust.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+  finish
+endif
 
 scriptencoding utf-8
 
@@ -41,5 +43,3 @@ if !get(g:, 'rust_conceal_mod_path', 0)
 endif
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/after/syntax/tsx.vim b/after/syntax/tsx.vim
index 34a6005e4..d400f4104 100644
--- a/after/syntax/tsx.vim
+++ b/after/syntax/tsx.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim syntax file
@@ -59,5 +61,3 @@ let b:current_syntax = 'typescript.tsx'
 
 let &cpo = s:jsx_cpo
 unlet s:jsx_cpo
-
-endif
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index 5dd01e284..40425b895 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+  finish
+endif
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
 "
@@ -45,5 +47,3 @@ hi def link graphqlTemplateExpression typescriptTemplateSubstitution
 
 syn cluster typescriptExpression add=graphqlTaggedTemplate
 syn cluster graphqlTaggedTemplate add=graphqlTemplateString
-
-endif
diff --git a/after/syntax/typescriptreact.vim b/after/syntax/typescriptreact.vim
index 3d8502911..07de9bb7b 100644
--- a/after/syntax/typescriptreact.vim
+++ b/after/syntax/typescriptreact.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+  finish
+endif
 
 source <sfile>:h/tsx.vim
-
-endif
diff --git a/after/syntax/typescriptreact/graphql.vim b/after/syntax/typescriptreact/graphql.vim
index 62604d200..f9e7151fe 100644
--- a/after/syntax/typescriptreact/graphql.vim
+++ b/after/syntax/typescriptreact/graphql.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+  finish
+endif
 
 runtime! after/syntax/typescript/graphql.vim
-
-endif
diff --git a/after/syntax/vue/graphql.vim b/after/syntax/vue/graphql.vim
index c86f9d237..52628a1a1 100644
--- a/after/syntax/vue/graphql.vim
+++ b/after/syntax/vue/graphql.vim
@@ -1,5 +1,5 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+  finish
+endif
 
 runtime! after/syntax/javascript/graphql.vim
-
-endif
diff --git a/after/syntax/zsh.vim b/after/syntax/zsh.vim
index 30f93b63f..5e9ff75c1 100644
--- a/after/syntax/zsh.vim
+++ b/after/syntax/zsh.vim
@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zinit') == -1
+if !polyglot#util#IsEnabled('zinit', expand('<sfile>:p'))
+  finish
+endif
 
 " Copyright (c) 2019 Sebastian Gniazdowski
 "
@@ -122,5 +124,3 @@ highlight def link ZinitSnippetUrl2        Macro
 highlight def link ZinitSnippetUrl3        Macro
 highlight def link ZinitSnippetUrl4        Macro
 highlight def link ZinitTrailingWhiteSpace Error
-
-endif
diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index f498e5dfe..bf0c7cc23 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/LaTeXtoUnicode.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Support for LaTex-to-Unicode conversion as in the Julia REPL "
@@ -659,5 +654,3 @@ function! LaTeXtoUnicode#Toggle()
   endif
   return ''
 endfunction
-
-endif
diff --git a/autoload/RstFold.vim b/autoload/RstFold.vim
index 926bc1b9c..f340565b7 100644
--- a/autoload/RstFold.vim
+++ b/autoload/RstFold.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/RstFold.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 
 " Author: Antony Lee <anntzer.lee@gmail.com>
 " Description: Helper functions for reStructuredText syntax folding
@@ -69,5 +64,3 @@ function RstFold#GetRstFoldText()
   let text = thisline =~ '^\([=`:.''"~^_*+#-]\)\1\+$' ? getline(v:foldstart + 1) : thisline
   return indent . text
 endfunction
-
-endif
diff --git a/autoload/ada.vim b/autoload/ada.vim
index 9a01456c6..e54d05e22 100644
--- a/autoload/ada.vim
+++ b/autoload/ada.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/ada.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ada', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ada') == -1
 
 "------------------------------------------------------------------------------
 "  Description: Perform Ada specific completion & tagging.
@@ -644,5 +639,3 @@ finish " 1}}}
 "------------------------------------------------------------------------------
 " vim: textwidth=78 wrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
 " vim: foldmethod=marker
-
-endif
diff --git a/autoload/cargo.vim b/autoload/cargo.vim
index 068cfa893..232dca796 100644
--- a/autoload/cargo.vim
+++ b/autoload/cargo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/cargo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 function! cargo#Load()
     " Utility call to get this script loaded, for debugging
@@ -154,5 +149,3 @@ function! cargo#runtarget(args)
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/autoload/cargo/quickfix.vim b/autoload/cargo/quickfix.vim
index 7f3fffa1c..536e09e87 100644
--- a/autoload/cargo/quickfix.vim
+++ b/autoload/cargo/quickfix.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/cargo/quickfix.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 function! cargo#quickfix#CmdPre() abort
     if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo' &&
@@ -34,5 +29,3 @@ function! cargo#quickfix#CmdPost() abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index 02857c7ba..ebecd5cda 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/clojurecomplete.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('clojure', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 
 " Vim completion script
 " Language:     Clojure
@@ -29,5 +24,3 @@ function! clojurecomplete#Complete(findstart, base)
 endfunction
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif
diff --git a/autoload/coffee.vim b/autoload/coffee.vim
index 0388a589f..12ea3f97b 100644
--- a/autoload/coffee.vim
+++ b/autoload/coffee.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/coffee.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -61,5 +56,3 @@ function! coffee#CoffeeSetUpErrorFormat()
                          \%f:%l:%c:\ error:\ %m,
                          \%-G%.%#
 endfunction
-
-endif
diff --git a/autoload/crystal/indent.vim b/autoload/crystal/indent.vim
index fbbf91fd0..488874694 100644
--- a/autoload/crystal/indent.vim
+++ b/autoload/crystal/indent.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/crystal/indent.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " Variables {{{1
 " =========
@@ -1047,5 +1042,4 @@ endfunction
 
 " }}}1
 
-" vim:sw=2 sts=2 ts=8 fdm=marker et:
-endif
+" vim:sw=2 sts=2 ts=8 fdm=marker et:
\ No newline at end of file
diff --git a/autoload/crystal_lang.vim b/autoload/crystal_lang.vim
index 1a1ad4216..87060a642 100644
--- a/autoload/crystal_lang.vim
+++ b/autoload/crystal_lang.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/crystal_lang.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 let s:V = vital#crystal#new()
 let s:P = s:V.import('Process')
@@ -370,5 +365,3 @@ function! crystal_lang#expand(file, pos, ...) abort
 endfunction
 
 " vim: sw=2 sts=2 et:
-
-endif
diff --git a/autoload/csv.vim b/autoload/csv.vim
index 692ec2a3f..20b519234 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/csv.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('csv', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csv') == -1
 
 " Filetype plugin for editing CSV files. "{{{1
 " Author:  Christian Brabandt <cb@256bit.org>
@@ -3203,5 +3198,3 @@ endfun
 
 " Vim Modeline " {{{2
 " vim: set foldmethod=marker et sw=0 sts=-1 ts=4:
-
-endif
diff --git a/autoload/dart.vim b/autoload/dart.vim
index ccd29b44b..1e2c0e07d 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/dart.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dart', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 
 
 function! s:error(text) abort
@@ -190,5 +185,3 @@ function! dart#setModifiable() abort
     setlocal nomodifiable
   endif
 endfunction
-
-endif
diff --git a/autoload/db/adapter/ecto.vim b/autoload/db/adapter/ecto.vim
index 7eca12626..af5da6ae1 100644
--- a/autoload/db/adapter/ecto.vim
+++ b/autoload/db/adapter/ecto.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/db/adapter/ecto.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 let s:path = expand('<sfile>:h')
 let s:cmd = join(['mix', 'run', '--no-start', '--no-compile', shellescape(s:path.'/get_repos.exs')])
@@ -27,5 +22,3 @@ endfunction
 function! db#adapter#ecto#complete_opaque(url) abort
     return map(s:repo_list(), 'v:val[0]')
 endfunction
-
-endif
diff --git a/autoload/ecrystal.vim b/autoload/ecrystal.vim
index 5225c7539..43a49edd9 100644
--- a/autoload/ecrystal.vim
+++ b/autoload/ecrystal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/ecrystal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 let s:ecrystal_extensions = {
       \ 'cr': 'crystal',
@@ -39,5 +34,3 @@ function! ecrystal#SetSubtype() abort
 endfunction
 
 " vim: sw=2 sts=2 et:
-
-endif
diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index ccd028815..7286de16b 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/elixir/indent.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if !exists("g:elixir_indent_max_lookbehind")
   let g:elixir_indent_max_lookbehind = 30
@@ -378,5 +373,3 @@ function! elixir#indent#handle_inside_generic_block(context)
     return -1
   endif
 endfunction
-
-endif
diff --git a/autoload/elixir/util.vim b/autoload/elixir/util.vim
index 7acc8814b..e5c660f37 100644
--- a/autoload/elixir/util.vim
+++ b/autoload/elixir/util.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/elixir/util.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 function! elixir#util#get_filename(word) abort
   let word = a:word
@@ -31,5 +26,3 @@ function! elixir#util#get_filename(word) abort
 
   return word
 endfunction
-
-endif
diff --git a/autoload/fish.vim b/autoload/fish.vim
index fb2dda135..c9b498a83 100644
--- a/autoload/fish.vim
+++ b/autoload/fish.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/fish.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fish', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 
 function! fish#Indent()
     let l:prevlnum = prevnonblank(v:lnum - 1)
@@ -92,5 +87,3 @@ endfunction
 function! fish#errorformat()
     return '%Afish: %m,%-G%*\\ ^,%-Z%f (line %l):%s'
 endfunction
-
-endif
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index 0331814c8..525952ba1 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/fsharp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fsharp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
 
 " Vim autoload functions
 
@@ -520,5 +515,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=4 et sts=4
-
-endif
diff --git a/autoload/fzf_gitignore.vim b/autoload/fzf_gitignore.vim
index bd90be485..f7914f242 100644
--- a/autoload/fzf_gitignore.vim
+++ b/autoload/fzf_gitignore.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/fzf_gitignore.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gitignore', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
 
 scriptencoding utf-8
 
@@ -44,5 +39,3 @@ function! fzf_gitignore#run() abort
 endfunction
 
 " vim: ts=2 et sw=2
-
-endif
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index 3ddde7408..d11bc8d9b 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/go/config.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " don't spam the user when Vim is started in Vi compatibility mode
 let s:cpo_save = &cpo
@@ -630,5 +625,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/autoload/graphql.vim b/autoload/graphql.vim
index b5ddd9fa6..b92751bb1 100644
--- a/autoload/graphql.vim
+++ b/autoload/graphql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/graphql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
 "
@@ -42,5 +37,3 @@ endfunction
 function! graphql#javascript_tags() abort
   return get(g:, 'graphql_javascript_tags', ['gql', 'graphql', 'Relay.QL'])
 endfunction
-
-endif
diff --git a/autoload/htmlcomplete.vim b/autoload/htmlcomplete.vim
index 7db1fdb90..5b1b4ac52 100644
--- a/autoload/htmlcomplete.vim
+++ b/autoload/htmlcomplete.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/htmlcomplete.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 
 " Vim completion script
 " Language:     HTML and XHTML
@@ -848,5 +843,3 @@ function! htmlcomplete#CheckDoctype() " {{{
 endfunction
 " }}}
 " vim:set foldmethod=marker:
-
-endif
diff --git a/autoload/jsonnet.vim b/autoload/jsonnet.vim
index c05e2f86e..b93864636 100644
--- a/autoload/jsonnet.vim
+++ b/autoload/jsonnet.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/jsonnet.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jsonnet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsonnet') == -1
 
 
 
@@ -132,5 +127,3 @@ function! jsonnet#Format()
 endfunction
 
 
-
-endif
diff --git a/autoload/jsx_pretty/comment.vim b/autoload/jsx_pretty/comment.vim
index 5a9db3674..44dbf803d 100644
--- a/autoload/jsx_pretty/comment.vim
+++ b/autoload/jsx_pretty/comment.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/jsx_pretty/comment.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
 
 function! jsx_pretty#comment#update_commentstring(original)
   let line = getline(".")
@@ -44,5 +39,3 @@ function! s:syn_contains(lnum, cnum, syn_name)
   let syn_names = map(stack, 'synIDattr(v:val, "name")')
   return index(syn_names, a:syn_name) >= 0
 endfunction
-
-endif
diff --git a/autoload/jsx_pretty/indent.vim b/autoload/jsx_pretty/indent.vim
index 34f88db07..3c5585a84 100644
--- a/autoload/jsx_pretty/indent.vim
+++ b/autoload/jsx_pretty/indent.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/jsx_pretty/indent.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
 
 if exists('*shiftwidth')
   function! s:sw()
@@ -309,5 +304,3 @@ function! jsx_pretty#indent#get(js_indent)
 
   return a:js_indent()
 endfunction
-
-endif
diff --git a/autoload/julia.vim b/autoload/julia.vim
index d76454a4a..e747028a3 100644
--- a/autoload/julia.vim
+++ b/autoload/julia.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/julia.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 function! julia#set_syntax_version(jvers)
   echo "The julia#set_syntax_version function is deprecated"
@@ -172,5 +167,3 @@ function! julia#gotodefinition()
 endfunction
 
 endif
-
-endif
diff --git a/autoload/julia/doc.vim b/autoload/julia/doc.vim
index e9e77d8c5..258c00648 100644
--- a/autoload/julia/doc.vim
+++ b/autoload/julia/doc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/julia/doc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " path to the julia binary to communicate with
 if has('win32') || has('win64')
@@ -249,5 +244,3 @@ function! s:likely(str) abort
   let output = systemlist(cmd)
   return split(matchstr(output[0], '\C^search: \zs.*'))
 endfunction
-
-endif
diff --git a/autoload/julia_blocks.vim b/autoload/julia_blocks.vim
index 7dd87df9f..6be2ba79a 100644
--- a/autoload/julia_blocks.vim
+++ b/autoload/julia_blocks.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/julia_blocks.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Facilities for moving around Julia blocks (e.g. if/end, function/end etc.)
 " (AKA a collection of horrible hacks)
@@ -801,5 +796,3 @@ function! s:cursor_moved(...)
   let b:jlblk_did_select = b:jlblk_doing_select
   let b:jlblk_doing_select = 0
 endfunction
-
-endif
diff --git a/autoload/julia_latex_symbols.vim b/autoload/julia_latex_symbols.vim
index 5f4c98900..7f6fe0072 100644
--- a/autoload/julia_latex_symbols.vim
+++ b/autoload/julia_latex_symbols.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/julia_latex_symbols.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " This file is autogenerated from the script 'generate_latex_symbols_table.jl'
 " The symbols are based on Julia version 1.5.0-DEV.67
@@ -3339,5 +3334,3 @@ function! julia_latex_symbols#get_dict()
     \ '\:baggage_claim:': '🛄',
     \ '\:left_luggage:': '🛅'}
 endfunction
-
-endif
diff --git a/autoload/ledger.vim b/autoload/ledger.vim
index badcb1751..5b3f22033 100644
--- a/autoload/ledger.vim
+++ b/autoload/ledger.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/ledger.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ledger', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ledger') == -1
 
 scriptencoding utf-8
 " vim:ts=2:sw=2:sts=2:foldmethod=marker
@@ -747,5 +742,3 @@ function! ledger#show_balance(file, ...) abort
   endif
 endf
 " }}}
-
-endif
diff --git a/autoload/nim.vim b/autoload/nim.vim
index fdf990fcf..7bdfa867f 100644
--- a/autoload/nim.vim
+++ b/autoload/nim.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/nim.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nim', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 
 let g:nim_log = []
 let s:plugin_path = escape(expand('<sfile>:p:h'), '\')
@@ -245,5 +240,3 @@ if exists('g:SyntasticRegistry')
       \ 'filetype': 'nim',
       \ 'name': 'nim'})
 endif
-
-endif
diff --git a/autoload/polyglot/util.vim b/autoload/polyglot/util.vim
new file mode 100644
index 000000000..6d5caf882
--- /dev/null
+++ b/autoload/polyglot/util.vim
@@ -0,0 +1,64 @@
+" Restore 'cpoptions'
+let s:cpo_save = &cpo
+set cpo&vim
+
+let s:disabled_packages = {}
+let s:new_polyglot_disabled = []
+
+if exists('g:polyglot_disabled')
+  for pkg in g:polyglot_disabled
+    let base = split(pkg, '\.')
+    if len(base) > 0
+      let s:disabled_packages[pkg] = 1
+      call add(s:new_polyglot_disabled, base[0]) 
+    endif
+  endfor
+else
+  let g:polyglot_disabled_not_set = 1
+endif
+
+
+let s:base = expand('<sfile>:p:h:h:h')
+
+func polyglot#util#Filter(idx, val)
+  let val = fnamemodify(a:val . '/', ':p:h')
+  return resolve(val) !=? s:base && stridx(val, $VIMRUNTIME) == -1 && val !~? '/after$'
+endfunc
+
+let s:rtp = join(filter(split(&rtp, ','), function('polyglot#util#Filter')), ',')
+
+func polyglot#util#IsEnabled(type, file)
+  if a:file != "ftdetect"
+    let file = a:file[len(s:base) + 1:]
+    let files = globpath(s:rtp, file, 1, 1)
+    if !empty(files)
+      exec 'source' files[0]
+      return 0
+    endif
+  endif
+  if a:type == "jsx"
+    return !has_key(s:disabled_packages, "jsx") && !has_key(s:disabled_packages, "javascript")
+  endif
+  return !has_key(s:disabled_packages, a:type)
+endfunc
+
+func! polyglot#util#Verify()
+  if exists("g:polyglot_disabled_not_set")
+    if exists("g:polyglot_disabled")
+      echohl WarningMsg
+      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
+      echohl None
+    endif
+
+    unlet g:polyglot_disabled_not_set
+  endif
+endfunc
+
+" Save polyglot_disabled without postfixes
+if exists('g:polyglot_disabled')
+  let g:polyglot_disabled = s:new_polyglot_disabled
+endif
+
+" Restore 'cpoptions'
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/autoload/pony.vim b/autoload/pony.vim
index 5f26c52b0..78386b6b6 100644
--- a/autoload/pony.vim
+++ b/autoload/pony.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/pony.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pony', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 
 " Vim plugin file
 " Language:     Pony
@@ -539,5 +534,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/autoload/puppet/align.vim b/autoload/puppet/align.vim
index 4fafac3da..51254120b 100644
--- a/autoload/puppet/align.vim
+++ b/autoload/puppet/align.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/puppet/align.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 function! puppet#align#IndentLevel(lnum)
     return indent(a:lnum) / &shiftwidth
@@ -75,5 +70,3 @@ function! puppet#align#AlignHashrockets(...) abort
         endif
     endfor
 endfunction
-
-endif
diff --git a/autoload/puppet/ctags.vim b/autoload/puppet/ctags.vim
index fad4f87a6..a1d1577ae 100644
--- a/autoload/puppet/ctags.vim
+++ b/autoload/puppet/ctags.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/puppet/ctags.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 
 if !exists('s:ctags_type')
@@ -43,5 +38,3 @@ function! puppet#ctags#Type()
   return s:ctags_type
 endfunction
 
-
-endif
diff --git a/autoload/puppet/format.vim b/autoload/puppet/format.vim
index 94fe42e75..96b447b64 100644
--- a/autoload/puppet/format.vim
+++ b/autoload/puppet/format.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/puppet/format.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 "
 " Simple format using puppet's l:indents and align hashrockets function
@@ -77,5 +72,3 @@ function! puppet#format#Fallback(start_lnum, end_lnum) abort
 
 endfunction
 
-
-endif
diff --git a/autoload/python/utils.vim b/autoload/python/utils.vim
index 4a02520dd..4517f00de 100644
--- a/autoload/python/utils.vim
+++ b/autoload/python/utils.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/python/utils.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('python-compiler', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
 
 " Sometimes Python issues debugging messages
 " which don't belong to a call stack context
@@ -24,5 +19,3 @@ function! python#utils#fix_qflist() " {{{
     call setqflist(l:traceback)
   endif
 endfunction " }}}
-
-endif
diff --git a/autoload/requirements.vim b/autoload/requirements.vim
index e945a6520..ad2e747a2 100644
--- a/autoload/requirements.vim
+++ b/autoload/requirements.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/requirements.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('requirements', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'requirements') == -1
 
 " the Requirements File Format syntax support for Vim
 " Version: 1.5.3
@@ -39,5 +34,3 @@ set cpo&vim
 let &cpo = s:save_cpo
 unlet s:save_cpo
 " vim: et sw=4 ts=4 sts=4:
-
-endif
diff --git a/autoload/rubycomplete.vim b/autoload/rubycomplete.vim
index 0b8871cbd..9551c965f 100644
--- a/autoload/rubycomplete.vim
+++ b/autoload/rubycomplete.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/rubycomplete.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim completion script
 " Language:		Ruby
@@ -878,5 +873,3 @@ call s:DefRuby()
 "}}} ruby-side code
 
 " vim:tw=78:sw=4:ts=8:et:fdm=marker:ft=vim:norl:
-
-endif
diff --git a/autoload/rust.vim b/autoload/rust.vim
index b8bef48d2..a8f5bfa35 100644
--- a/autoload/rust.vim
+++ b/autoload/rust.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/rust.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Description: Helper functions for Rust commands/mappings
 " Last Modified: May 27, 2014
@@ -577,5 +572,3 @@ endfunction
 " }}}1
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/autoload/rust/debugging.vim b/autoload/rust/debugging.vim
index d16380b5a..9096333b5 100644
--- a/autoload/rust/debugging.vim
+++ b/autoload/rust/debugging.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/rust/debugging.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.vim
 
@@ -110,5 +105,3 @@ function! rust#debugging#InfoToFile(filename) abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/autoload/rust/delimitmate.vim b/autoload/rust/delimitmate.vim
index a60dece75..7d2d18176 100644
--- a/autoload/rust/delimitmate.vim
+++ b/autoload/rust/delimitmate.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/rust/delimitmate.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 let s:delimitMate_extra_excluded_regions = ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
 
@@ -51,5 +46,3 @@ endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
 
-
-endif
diff --git a/autoload/rust/tags.vim b/autoload/rust/tags.vim
index 84388174c..8ffa4d511 100644
--- a/autoload/rust/tags.vim
+++ b/autoload/rust/tags.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/rust/tags.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Tagbar support code, for the sake of not automatically overriding its
 " configuration in case Universal Ctags is detected.
@@ -25,5 +20,3 @@ function! rust#tags#IsUCtags() abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/autoload/rustfmt.vim b/autoload/rustfmt.vim
index 2e2a10daa..81ebe56e8 100644
--- a/autoload/rustfmt.vim
+++ b/autoload/rustfmt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/rustfmt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Author: Stephen Sugden <stephen@stephensugden.com>
 "
@@ -267,5 +262,3 @@ endfunction
 
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/autoload/smt2.vim b/autoload/smt2.vim
index 7a9fa7f81..0d328529a 100644
--- a/autoload/smt2.vim
+++ b/autoload/smt2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/smt2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('smt2', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smt2') == -1
 
 " Invokes the solver on current file
 function! smt2#RunSolver()
@@ -37,5 +32,3 @@ function! smt2#PrintSolverVersion()
     silent !clear
     execute "!" . g:smt2_solver_command . " " . g:smt2_solver_version_switch
 endfunction
-
-endif
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index e780440b6..7c4e33da8 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/terraform.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('terraform', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 
 let s:cpo_save = &cpoptions
 set cpoptions&vim
@@ -86,5 +81,3 @@ endfunction
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/autoload/vital/_crystal.vim b/autoload/vital/_crystal.vim
index b8ac5d327..b328af906 100644
--- a/autoload/vital/_crystal.vim
+++ b/autoload/vital/_crystal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 let s:_plugin_name = expand('<sfile>:t:r')
 
@@ -16,5 +11,3 @@ endfunction
 function! vital#{s:_plugin_name}#function(funcname) abort
   silent! return function(a:funcname)
 endfunction
-
-endif
diff --git a/autoload/vital/_crystal/ColorEcho.vim b/autoload/vital/_crystal/ColorEcho.vim
index 59c0ec88a..7180dce6b 100644
--- a/autoload/vital/_crystal/ColorEcho.vim
+++ b/autoload/vital/_crystal/ColorEcho.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/ColorEcho.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -189,5 +184,3 @@ function! s:echo(str) abort
     let echorizer = s:get_echorizer(a:str)
     call echorizer.echo()
 endfunction
-
-endif
diff --git a/autoload/vital/_crystal/Data/List.vim b/autoload/vital/_crystal/Data/List.vim
index b2045a2a2..68f87490d 100644
--- a/autoload/vital/_crystal/Data/List.vim
+++ b/autoload/vital/_crystal/Data/List.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/List.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -465,5 +460,3 @@ function! s:combinations(list, r) abort
 endfunction
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif
diff --git a/autoload/vital/_crystal/Data/String.vim b/autoload/vital/_crystal/Data/String.vim
index 8f6ddf3e4..67cd217cd 100644
--- a/autoload/vital/_crystal/Data/String.vim
+++ b/autoload/vital/_crystal/Data/String.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Data/String.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -629,5 +624,3 @@ function! s:split_posix_text(text, ...) abort
 endfunction
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif
diff --git a/autoload/vital/_crystal/Process.vim b/autoload/vital/_crystal/Process.vim
index 315a4343e..2da1a0162 100644
--- a/autoload/vital/_crystal/Process.vim
+++ b/autoload/vital/_crystal/Process.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Process.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -174,5 +169,3 @@ endif
 
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif
diff --git a/autoload/vital/_crystal/Web/JSON.vim b/autoload/vital/_crystal/Web/JSON.vim
index c17269cf0..a1d01238e 100644
--- a/autoload/vital/_crystal/Web/JSON.vim
+++ b/autoload/vital/_crystal/Web/JSON.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/vital/_crystal/Web/JSON.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -180,5 +175,3 @@ endfunction
 " @vimlint(EVL102, 0, l:ns)
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif
diff --git a/autoload/vital/crystal.vim b/autoload/vital/crystal.vim
index 7674c4ef3..68938d83e 100644
--- a/autoload/vital/crystal.vim
+++ b/autoload/vital/crystal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/vital/crystal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 let s:plugin_name = expand('<sfile>:t:r')
 let s:vital_base_dir = expand('<sfile>:h')
@@ -335,5 +330,3 @@ else
     return a:list
   endfunction
 endif
-
-endif
diff --git a/autoload/vital/crystal.vital b/autoload/vital/crystal.vital
index 4a13eb01f..0ad94eb54 100644
--- a/autoload/vital/crystal.vital
+++ b/autoload/vital/crystal.vital
@@ -1,10 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-
 crystal
 bee84ae23effb0510137ad177e98c94d8b3657a6
 
 Process
 Web.JSON
 ColorEcho
-
-endif
diff --git a/autoload/xml/aria.vim b/autoload/xml/aria.vim
index ff8a071c3..7a106e0af 100644
--- a/autoload/xml/aria.vim
+++ b/autoload/xml/aria.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/xml/aria.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 
 " Vim completion for WAI-ARIA data file
 " Language:       HTML + WAI-ARIA
@@ -464,5 +459,3 @@ let g:xmldata_aria = {
     \ 'default_role': default_role,
     \ 'vimariaattrinfo': aria_attributes_value
 \ }
-
-endif
diff --git a/autoload/xml/html5.vim b/autoload/xml/html5.vim
index 7bbc9586d..a88808e04 100644
--- a/autoload/xml/html5.vim
+++ b/autoload/xml/html5.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/xml/html5.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 
 " Vim completion for HTML5 data file
 " Language:	    HTML (version 5.1 Draft 2016 Jan 13)
@@ -882,5 +877,3 @@ let g:xmldata_html5 = {
     \ 'wbr': ['/>', ''],
 \ },
 \ }
-
-endif
diff --git a/autoload/xml/xsd.vim b/autoload/xml/xsd.vim
index 5757ae843..71b0ec89c 100644
--- a/autoload/xml/xsd.vim
+++ b/autoload/xml/xsd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/xml/xsd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xsd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
 
 " Author: Thomas Barthel
 " Last change: 2007 May 8
@@ -137,5 +132,3 @@ let g:xmldata_xsd = {
 		\ [],
 		\ {'source' : [], 'id' : [], 'xml' : []} ]
 	\ }
-
-endif
diff --git a/autoload/zig/config.vim b/autoload/zig/config.vim
index a35e73e88..ed373f56b 100644
--- a/autoload/zig/config.vim
+++ b/autoload/zig/config.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/zig/config.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 function! zig#config#ListTypeCommands() abort
   return get(g:, 'zig_list_type_commands', {})
@@ -46,5 +41,3 @@ endfunction
 function! zig#config#Debug() abort
   return get(g:, 'zig_debug', [])
 endfunction
-
-endif
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index c148ca2b3..bdc21290c 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/zig/fmt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Adapted from fatih/vim-go: autoload/go/fmt.vim
 "
@@ -173,5 +168,3 @@ function! zig#fmt#ToggleFmtAutoSave() abort
 endfunction
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/autoload/zig/list.vim b/autoload/zig/list.vim
index 382a98828..d09dd76e1 100644
--- a/autoload/zig/list.vim
+++ b/autoload/zig/list.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/zig/list.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Adapted from fatih/vim-go: autoload/go/list.vim
 "
@@ -165,5 +160,3 @@ function! zig#list#Type(for) abort
 endfunction
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/autoload/zig/util.vim b/autoload/zig/util.vim
index 0c8038023..baa2d32c9 100644
--- a/autoload/zig/util.vim
+++ b/autoload/zig/util.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/zig/util.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Adapted from vim-go: autoload/go/util.vim
 "
@@ -397,5 +392,3 @@ function! zig#util#HasDebug(flag)
 endfunction
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/compiler/ant.vim b/compiler/ant.vim
index 32470076a..8d1b66fb3 100644
--- a/compiler/ant.vim
+++ b/compiler/ant.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/ant.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ant', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ant') == -1
 
 " Vim Compiler File
 " Compiler:	ant
@@ -45,5 +40,3 @@ CompilerSet errorformat=\ %#[%.%#]\ %#%f:%l:%v:%*\\d:%*\\d:\ %t%[%^:]%#:%m,
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/compiler/bdf.vim b/compiler/bdf.vim
index 2bf1c12f0..097d6b00c 100644
--- a/compiler/bdf.vim
+++ b/compiler/bdf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/bdf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bdf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bdf') == -1
 
 " Vim compiler file
 " Compiler:             BDF to PCF Conversion
@@ -29,5 +24,3 @@ setlocal errorformat=%ABDF\ %trror\ on\ line\ %l:\ %m,
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/compiler/cake.vim b/compiler/cake.vim
index d3ac35d37..993bf1cf5 100644
--- a/compiler/cake.vim
+++ b/compiler/cake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/cake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -22,5 +17,3 @@ call coffee#CoffeeSetUpVariables()
 exec 'CompilerSet makeprg=' . escape(g:coffee_cake . ' ' .
 \                                    g:coffee_cake_options . ' $*', ' ')
 call coffee#CoffeeSetUpErrorFormat()
-
-endif
diff --git a/compiler/cargo.vim b/compiler/cargo.vim
index c8719dc9b..925699393 100644
--- a/compiler/cargo.vim
+++ b/compiler/cargo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/cargo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Vim compiler file
 " Compiler:         Cargo Compiler
@@ -56,5 +51,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/compiler/coffee.vim b/compiler/coffee.vim
index a9e1a6bfd..c5dcce7f5 100644
--- a/compiler/coffee.vim
+++ b/compiler/coffee.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/coffee.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -89,5 +84,3 @@ augroup CoffeeUpdateMakePrg
     autocmd BufWritePre,BufFilePost          call s:UpdateMakePrg()
   endif
 augroup END
-
-endif
diff --git a/compiler/credo.vim b/compiler/credo.vim
index 801e79d91..e39c6b7c7 100644
--- a/compiler/credo.vim
+++ b/compiler/credo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/credo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists('current_compiler')
     finish
@@ -18,5 +13,3 @@ endif
 
 CompilerSet errorformat=%f:%l:%c:\ %t:\ %m,%f:%l:\ %t:\ %m
 CompilerSet makeprg=mix\ credo\ suggest\ --format=flycheck
-
-endif
diff --git a/compiler/cryptol.vim b/compiler/cryptol.vim
index 8cc53f38a..062109ac6 100644
--- a/compiler/cryptol.vim
+++ b/compiler/cryptol.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/cryptol.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cryptol', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
 
 " Vim compiler file
 " Compiler:         Cryptol version 1.8.19-academic Compiler
@@ -27,5 +22,3 @@ CompilerSet errorformat&     " use the default 'errorformat'
 
 " "%<" means the current file name without extension.
 CompilerSet makeprg=cryptol\ -o\ %<\ %
-
-endif
diff --git a/compiler/cs.vim b/compiler/cs.vim
index 04a6938b1..195887cf8 100644
--- a/compiler/cs.vim
+++ b/compiler/cs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/cs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cs', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
 
 " Vim compiler file
 " Compiler:               Microsoft Visual Studio C#
@@ -33,5 +28,3 @@ CompilerSet makeprg=csc\ %:S
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/compiler/cucumber.vim b/compiler/cucumber.vim
index 4a4eba7e1..a41c0de4a 100644
--- a/compiler/cucumber.vim
+++ b/compiler/cucumber.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/cucumber.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cucumber', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 
 " Vim compiler file
 " Compiler:	Cucumber
@@ -36,5 +31,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
-
-endif
diff --git a/compiler/dot.vim b/compiler/dot.vim
index e1fc35edf..5002e5ff3 100644
--- a/compiler/dot.vim
+++ b/compiler/dot.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/dot.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dot', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dot') == -1
 
 " Vim compiler file
 " Compiler:     ATT dot
@@ -22,5 +17,3 @@ if exists(":CompilerSet") != 2		" older Vim always used :setlocal
 endif
 
 CompilerSet makeprg=dot\ -T$*\ \"%:p\"\ -o\ \"%:p:r.$*\"
-
-endif
diff --git a/compiler/eruby.vim b/compiler/eruby.vim
index b50b655a7..dd006baab 100644
--- a/compiler/eruby.vim
+++ b/compiler/eruby.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/eruby.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim compiler file
 " Language:		eRuby
@@ -46,5 +41,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/compiler/exunit.vim b/compiler/exunit.vim
index 97ea03411..2a52eff89 100644
--- a/compiler/exunit.vim
+++ b/compiler/exunit.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/exunit.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists("current_compiler")
   finish
@@ -32,5 +27,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/compiler/fish.vim b/compiler/fish.vim
index 6dfb84f96..1ae935f8f 100644
--- a/compiler/fish.vim
+++ b/compiler/fish.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/fish.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fish', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 
 if exists('current_compiler')
     finish
@@ -14,5 +9,3 @@ let current_compiler = 'fish'
 
 CompilerSet makeprg=fish\ --no-execute\ %
 execute 'CompilerSet errorformat='.escape(fish#errorformat(), ' ')
-
-endif
diff --git a/compiler/go.vim b/compiler/go.vim
index 1d7b873eb..fba6a94fc 100644
--- a/compiler/go.vim
+++ b/compiler/go.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/go.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " Copyright 2013 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
@@ -55,5 +50,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/compiler/gradle.vim b/compiler/gradle.vim
index 5fdb164a7..7790daacc 100644
--- a/compiler/gradle.vim
+++ b/compiler/gradle.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/gradle.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gradle', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gradle') == -1
 
 " Vim Compiler File
 " Compiler: gradle
@@ -31,5 +26,3 @@ CompilerSet errorformat=
     \%E%f:\ %\\d%\\+:\ %m\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
     \%E%>%f:\ %\\d%\\+:\ %m,%C\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
     \%-G%.%#
-
-endif
diff --git a/compiler/gradlew.vim b/compiler/gradlew.vim
index 3cfd0e80a..68f23d76c 100644
--- a/compiler/gradlew.vim
+++ b/compiler/gradlew.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/gradlew.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gradle', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gradle') == -1
 
 " Vim Compiler File
 " Compiler: gradlew
@@ -31,5 +26,3 @@ CompilerSet errorformat=
     \%E%f:\ %\\d%\\+:\ %m\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
     \%E%>%f:\ %\\d%\\+:\ %m,%C\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
     \%-G%.%#
-
-endif
diff --git a/compiler/haml.vim b/compiler/haml.vim
index 415a579c9..08a64bc55 100644
--- a/compiler/haml.vim
+++ b/compiler/haml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/haml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 
 " Vim compiler file
 " Compiler:	Haml
@@ -35,5 +30,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
-
-endif
diff --git a/compiler/ledger.vim b/compiler/ledger.vim
index 70b89925e..e02205826 100644
--- a/compiler/ledger.vim
+++ b/compiler/ledger.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/ledger.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ledger', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ledger') == -1
 
 " Vim Compiler File
 " Compiler:	ledger
@@ -39,5 +34,3 @@ if !g:ledger_is_hledger
 else
 	exe 'CompilerSet makeprg=('.substitute(g:ledger_bin, ' ', '\\ ', 'g').'\ -f\ ' . shellescape(expand(g:ledger_main)) . '\ print\ '.substitute(g:ledger_extra_options, ' ', '\\ ', 'g').'\ >\ /dev/null)'
 endif
-
-endif
diff --git a/compiler/lilypond.vim b/compiler/lilypond.vim
index 2ae68a3bd..cbe15bbbb 100644
--- a/compiler/lilypond.vim
+++ b/compiler/lilypond.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/lilypond.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lilypond', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 
 " LilyPond compiler file
 " Language:     LilyPond
@@ -26,5 +21,3 @@ setlocal makeprg=lilypond\ $*
 " (how to see multiple-line error messages?)
 setlocal errorformat=%f:%l:%c:\ %m,%f:%l:\ %m,In\ file\ included\ from\ %f:%l:,\^I\^Ifrom\ %f:%l%m
 "
-
-endif
diff --git a/compiler/ls.vim b/compiler/ls.vim
index d177eaa37..69c6977f9 100644
--- a/compiler/ls.vim
+++ b/compiler/ls.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/ls.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('livescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 
 " Language:    LiveScript
 " Maintainer:  George Zahariev
@@ -81,5 +76,3 @@ augroup LiveScriptUpdateMakePrg
     autocmd BufFilePost,BufWritePost          call s:UpdateMakePrg()
   endif
 augroup END
-
-endif
diff --git a/compiler/mix.vim b/compiler/mix.vim
index 9ba5216bd..e9e781c5b 100644
--- a/compiler/mix.vim
+++ b/compiler/mix.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/mix.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists('current_compiler')
     finish
@@ -23,5 +18,3 @@ CompilerSet errorformat=
             \%E==\ Compilation\ error\ in\ file\ %f\ ==,
             \%C**\ (%\\w%\\+)\ %f:%l:\ %m,%Z
 
-
-endif
diff --git a/compiler/nim.vim b/compiler/nim.vim
index 1b8c21b10..e7ed69366 100644
--- a/compiler/nim.vim
+++ b/compiler/nim.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/nim.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nim', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 
 if exists('current_compiler')
   finish
@@ -32,5 +27,3 @@ unlet s:cpo_save
 
 let g:syntastic_nim_checkers = ['nim']
 
-
-endif
diff --git a/compiler/nix-build.vim b/compiler/nix-build.vim
index 0eb5f6946..89a2453bc 100644
--- a/compiler/nix-build.vim
+++ b/compiler/nix-build.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/nix-build.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nix', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 
 if exists('current_compiler')
     finish
@@ -18,5 +13,3 @@ endif
 
 CompilerSet errorformat=error:\ %m\ at\ %f:%l:%c,builder\ for\ \'%m\'\ failed\ with\ exit\ code\ %n,fixed-output\ derivation\ produced\ path\ \'%s\'\ with\ %m
 CompilerSet makeprg=nix-build
-
-endif
diff --git a/compiler/ocaml.vim b/compiler/ocaml.vim
index a9170be5d..92582d675 100644
--- a/compiler/ocaml.vim
+++ b/compiler/ocaml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/ocaml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim Compiler File
 " Compiler:    ocaml
@@ -63,5 +58,3 @@ CompilerSet errorformat =
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/compiler/powershell.vim b/compiler/powershell.vim
index 9cab203c3..e4d5d4106 100644
--- a/compiler/powershell.vim
+++ b/compiler/powershell.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/powershell.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Compiler:	powershell
 " Run ps1 scripts in powershell and process their output. Quickly jump through
@@ -90,5 +85,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
-
-endif
diff --git a/compiler/python.vim b/compiler/python.vim
index 1a82a1cd1..670ebdb4c 100644
--- a/compiler/python.vim
+++ b/compiler/python.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/python.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('python-compiler', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
 
 " Vim compiler file
 " Compiler:	Unit testing tool for Python
@@ -74,5 +69,3 @@ else
 endif
 
 " vim:foldmethod=marker:foldlevel=0
-
-endif
diff --git a/compiler/rake.vim b/compiler/rake.vim
index acd08a354..f8c3186c3 100644
--- a/compiler/rake.vim
+++ b/compiler/rake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/rake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim compiler file
 " Language:		Rake
@@ -46,5 +41,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/compiler/rspec.vim b/compiler/rspec.vim
index c3b4ea0e1..c443c7357 100644
--- a/compiler/rspec.vim
+++ b/compiler/rspec.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/rspec.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim compiler file
 " Language:		RSpec
@@ -42,5 +37,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/compiler/ruby.vim b/compiler/ruby.vim
index 8f0127c96..53dc01066 100644
--- a/compiler/ruby.vim
+++ b/compiler/ruby.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/ruby.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim compiler file
 " Language:		Ruby
@@ -51,5 +46,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/compiler/rubyunit.vim b/compiler/rubyunit.vim
index 417b49c31..eb6c3d8e6 100644
--- a/compiler/rubyunit.vim
+++ b/compiler/rubyunit.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/rubyunit.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim compiler file
 " Language:		Test::Unit - Ruby Unit Testing Framework
@@ -42,5 +37,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/compiler/rustc.vim b/compiler/rustc.vim
index f9953732a..66827050c 100644
--- a/compiler/rustc.vim
+++ b/compiler/rustc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/rustc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Vim compiler file
 " Compiler:         Rust Compiler
@@ -64,5 +59,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/compiler/sass.vim b/compiler/sass.vim
index bf02fa84c..5a1ee5324 100644
--- a/compiler/sass.vim
+++ b/compiler/sass.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/sass.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sass', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
 
 " Vim compiler file
 " Compiler:	Sass
@@ -37,5 +32,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
-
-endif
diff --git a/compiler/sbt.vim b/compiler/sbt.vim
index 7bb2b1f9f..15f81ff34 100644
--- a/compiler/sbt.vim
+++ b/compiler/sbt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/sbt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 " Vim compiler file
 " Language:             Scala SBT (http://www.scala-sbt.org/)
@@ -37,5 +32,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/compiler/swift.vim b/compiler/swift.vim
index 441d7b2f7..39dbe99ac 100644
--- a/compiler/swift.vim
+++ b/compiler/swift.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/swift.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('swift', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 
 " Vim compiler file
 " Compiler:         Swift Compiler
@@ -46,5 +41,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/compiler/tcl.vim b/compiler/tcl.vim
index 184e17bb8..c73d69d5a 100644
--- a/compiler/tcl.vim
+++ b/compiler/tcl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/tcl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tcl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
 
 " Vim compiler file
 " Compiler:	tcl
@@ -24,5 +19,3 @@ endif
 CompilerSet makeprg=tcl
 
 CompilerSet errorformat=%EError:\ %m,%+Z\ %\\{4}(file\ \"%f\"\ line\ %l),%-G%.%#
-
-endif
diff --git a/compiler/tex.vim b/compiler/tex.vim
index 6d50eacde..7076d04ad 100644
--- a/compiler/tex.vim
+++ b/compiler/tex.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/tex.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tex', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
 
 " Vim compiler file
 " Compiler:     TeX
@@ -74,5 +69,3 @@ CompilerSet errorformat=%E!\ LaTeX\ %trror:\ %m,
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/compiler/tidy.vim b/compiler/tidy.vim
index 380c8d889..7f7f12af9 100644
--- a/compiler/tidy.vim
+++ b/compiler/tidy.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/tidy.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tidy', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tidy') == -1
 
 " Vim compiler file
 " Compiler:	HTML Tidy
@@ -26,5 +21,3 @@ CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ %:S
 " foo.html:8:1: Warning: inserting missing 'foobar' element
 " foo.html:9:2: Error: <foobar> is not recognized!
 CompilerSet errorformat=%f:%l:%c:\ %trror:%m,%f:%l:%c:\ %tarning:%m,%-G%.%#
-
-endif
diff --git a/compiler/typescript.vim b/compiler/typescript.vim
index de3f1f0a8..d004226c0 100644
--- a/compiler/typescript.vim
+++ b/compiler/typescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'compiler/typescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 if exists('current_compiler')
   finish
@@ -28,5 +23,3 @@ endif
 let &l:makeprg = g:typescript_compiler_binary . ' ' . g:typescript_compiler_options . ' $* %'
 
 CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m
-
-endif
diff --git a/ctags/puppet.ctags b/ctags/puppet.ctags
index 6aa9a13cd..ba9ca1809 100644
--- a/ctags/puppet.ctags
+++ b/ctags/puppet.ctags
@@ -1,5 +1,3 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-
 --langdef=puppet
 --langmap=puppet:.pp
 --regex-puppet=/^[[:space:]]*class[[:space:]]*([a-z][a-zA-Z0-9_:\-]+)/\1/c,class/
@@ -12,5 +10,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 --regex-puppet=/([A-Z][a-zA-Z0-9_:]+)[[:space:]]*\{/\1/f,default/
 --regex-puppet=/^[[:space:]]*type[[:space:]]*([A-Z][a-zA-Z0-9_:]*)[[:space:]]*=/\1/t,type/
 --regex-puppet=/^[[:space:]]*function[[:space:]]*([a-zA-Z0-9_:]*)[[:space:]]*/\1/u,function/
-
-endif
diff --git a/ctags/puppet_u.ctags b/ctags/puppet_u.ctags
index 9770cfd0b..3a5d380ed 100644
--- a/ctags/puppet_u.ctags
+++ b/ctags/puppet_u.ctags
@@ -1,5 +1,3 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-
 --langdef=puppet
     --map-puppet=+.pp
     --regex-puppet=/^[[:space:]]*node[[:space:]]*[\'|\"]*([a-zA-Z0-9_\.\-]+)[\'|\"]*/\1/n,node/{scope=set}
@@ -12,5 +10,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
     --regex-puppet=/^[[:space:]]*site[[:space:]]*([a-zA-Z0-9_\-]+)/\1/s,site/
     --regex-puppet=/^[[:space:]]*type[[:space:]]*([A-Z][a-zA-Z0-9_:]*)[[:space:]]*=/\1/t,type/
     --regex-puppet=/^[[:space:]]*function[[:space:]]*([a-zA-Z0-9_:]*)[[:space:]]*/\1/u,function/
-
-endif
diff --git a/ctags/rust.ctags b/ctags/rust.ctags
index 7971672fe..d4f474e65 100644
--- a/ctags/rust.ctags
+++ b/ctags/rust.ctags
@@ -1,5 +1,3 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-
 --langdef=Rust
 --langmap=Rust:.rs
 --regex-Rust=/^[ \t]*(#\[[^\]]\][ \t]*)*(pub[ \t]+)?(extern[ \t]+)?("[^"]+"[ \t]+)?(unsafe[ \t]+)?fn[ \t]+([a-zA-Z0-9_]+)/\6/f,functions,function definitions/
@@ -11,5 +9,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 --regex-Rust=/^[ \t]*(pub[ \t]+)?trait[ \t]+([a-zA-Z0-9_]+)/\2/t,traits,traits/
 --regex-Rust=/^[ \t]*(pub[ \t]+)?impl([ \t\n]*<[^>]*>)?[ \t]+(([a-zA-Z0-9_:]+)[ \t]*(<[^>]*>)?[ \t]+(for)[ \t]+)?([a-zA-Z0-9_]+)/\4 \6 \7/i,impls,trait implementations/
 --regex-Rust=/^[ \t]*macro_rules![ \t]+([a-zA-Z0-9_]+)/\1/d,macros,macro definitions/
-
-endif
diff --git a/ctags/scala.ctags b/ctags/scala.ctags
index b640767b2..b7d312505 100644
--- a/ctags/scala.ctags
+++ b/ctags/scala.ctags
@@ -1,5 +1,3 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-
 --langdef=scala
 --langmap=scala:.scala
 
@@ -13,5 +11,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 --regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy|override|private[^ ]*|protected)[ \t]*)*val[ \t]+([a-zA-Z0-9_]+)/\3/V,values/
 --regex-scala=/^[ \t]*((abstract|final|sealed|implicit|lazy|override|private[^ ]*|protected)[ \t]*)*var[ \t]+([a-zA-Z0-9_]+)/\3/v,variables/
 --regex-scala=/^[ \t]*package[ \t]+([a-zA-Z0-9_.]+)/\1/p,packages/
-
-endif
diff --git a/ctags/typescript.ctags b/ctags/typescript.ctags
index bd4b0e948..5c7eb9dc9 100644
--- a/ctags/typescript.ctags
+++ b/ctags/typescript.ctags
@@ -1,5 +1,3 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
-
 --langdef=typescript
 --langmap=typescript:.ts
 --regex-typescript=/^[ \t]*(export)?[ \t]*class[ \t]+([a-zA-Z0-9_]+)/\2/c,classes/
@@ -13,5 +11,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') ==
 --regex-typescript=/^[ \t]*(export)?[ \t]*(public|private)[ \t]+(static|readonly)?[ \t]*([a-zA-Z0-9_]+)/\4/m,members/
 --regex-typescript=/^[ \t]*(export)?[ \t]*interface[ \t]+([a-zA-Z0-9_]+)/\2/i,interfaces/
 --regex-typescript=/^[ \t]*(export)?[ \t]*enum[ \t]+([a-zA-Z0-9_]+)/\2/e,enums/
-
-endif
diff --git a/extras/flow.vim b/extras/flow.vim
index 458067d49..69823efe9 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'extras/flow.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
 syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
@@ -116,5 +111,3 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowObjectFuncName     jsObjectFuncName
   delcommand HiLink
 endif
-
-endif
diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index 63b816aaa..4a71cc663 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'extras/jsdoc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 "" syntax coloring for javadoc comments (HTML)
 syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
@@ -46,5 +41,3 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsDocParam             Label
   delcommand HiLink
 endif
-
-endif
diff --git a/extras/ngdoc.vim b/extras/ngdoc.vim
index 22a1a590c..9936387b7 100644
--- a/extras/ngdoc.vim
+++ b/extras/ngdoc.vim
@@ -1,14 +1,7 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'extras/ngdoc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
 syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
 syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
-
-endif
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 2f85f2ff5..d259dc279 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -26,21 +26,6 @@ let did_load_filetypes = 1
 " Be consistent across different systems
 set nofileignorecase
 
-let s:disabled_packages = {}
-let s:new_polyglot_disabled = []
-
-if exists('g:polyglot_disabled')
-  for pkg in g:polyglot_disabled
-    let base = split(pkg, '\.')
-    if len(base) > 0
-      let s:disabled_packages[pkg] = 1
-      call add(s:new_polyglot_disabled, base[0]) 
-    endif
-  endfor
-else
-  let g:polyglot_disabled_not_set = 1
-endif
-
 function! s:SetDefault(name, value)
   if !exists(a:name)
     let {a:name} = a:value
@@ -116,757 +101,757 @@ runtime! ftdetect/*.vim
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
-if !has_key(s:disabled_packages, 'context')
+if polyglot#util#IsEnabled('context', 'ftdetect')
   au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi setf context
 endif
 
-if !has_key(s:disabled_packages, 'xpm2')
+if polyglot#util#IsEnabled('xpm2', 'ftdetect')
   au BufNewFile,BufRead *.xpm2 setf xpm2
 endif
 
-if !has_key(s:disabled_packages, 'xpm')
+if polyglot#util#IsEnabled('xpm', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
   au BufNewFile,BufRead *.xpm setf xpm
 endif
 
-if !has_key(s:disabled_packages, 'man')
+if polyglot#util#IsEnabled('man', 'ftdetect')
   au BufNewFile,BufRead *.1,*.1in,*.1m,*.1x,*.2,*.3,*.3in,*.3m,*.3p,*.3pm,*.3qt,*.3x,*.4,*.5,*.6,*.7,*.8,*.9,*.man,*.mdoc setf man
 endif
 
-if !has_key(s:disabled_packages, 'xf86conf')
+if polyglot#util#IsEnabled('xf86conf', 'ftdetect')
   au BufNewFile,BufRead */xorg.conf.d/*.conf,xorg.conf,xorg.conf-4 setf xf86conf
   au BufNewFile,BufRead XF86Config-4* call s:StarSetf('xf86conf')
   au BufNewFile,BufRead XF86Config* call s:StarSetf('xf86conf')
 endif
 
-if !has_key(s:disabled_packages, 'pullrequest')
+if polyglot#util#IsEnabled('pullrequest', 'ftdetect')
   au BufNewFile,BufRead PULLREQ_EDITMSG setf pullrequest
 endif
 
-if !has_key(s:disabled_packages, 'text')
+if polyglot#util#IsEnabled('text', 'ftdetect')
   au BufNewFile,BufRead *.text,README setf text
 endif
 
-if !has_key(s:disabled_packages, 'svn')
+if polyglot#util#IsEnabled('svn', 'ftdetect')
   au BufNewFile,BufRead svn-commit*.tmp setf svn
 endif
 
-if !has_key(s:disabled_packages, 'logcheck')
+if polyglot#util#IsEnabled('logcheck', 'ftdetect')
   au BufNewFile,BufRead */etc/logcheck/*.d*/* call s:StarSetf('logcheck')
 endif
 
-if !has_key(s:disabled_packages, 'fvwm')
+if polyglot#util#IsEnabled('fvwm', 'ftdetect')
   au BufNewFile,BufRead */.fvwm/* call s:StarSetf('fvwm')
 endif
 
-if !has_key(s:disabled_packages, 'crontab')
+if polyglot#util#IsEnabled('crontab', 'ftdetect')
   au BufNewFile,BufRead crontab setf crontab
   au BufNewFile,BufRead crontab.* call s:StarSetf('crontab')
   au BufNewFile,BufRead */etc/cron.d/* call s:StarSetf('crontab')
 endif
 
-if !has_key(s:disabled_packages, 'bzr')
+if polyglot#util#IsEnabled('bzr', 'ftdetect')
   au BufNewFile,BufRead bzr_log.* call s:StarSetf('bzr')
 endif
 
-if !has_key(s:disabled_packages, 'asteriskvm')
+if polyglot#util#IsEnabled('asteriskvm', 'ftdetect')
   au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
 endif
 
-if !has_key(s:disabled_packages, 'asterisk')
+if polyglot#util#IsEnabled('asterisk', 'ftdetect')
   au BufNewFile,BufRead *asterisk/*.conf* call s:StarSetf('asterisk')
 endif
 
-if !has_key(s:disabled_packages, 'apachestyle')
+if polyglot#util#IsEnabled('apachestyle', 'ftdetect')
   au BufNewFile,BufRead proftpd.conf* call s:StarSetf('apachestyle')
   au BufNewFile,BufRead */etc/proftpd/conf.*/* call s:StarSetf('apachestyle')
   au BufNewFile,BufRead */etc/proftpd/*.conf* call s:StarSetf('apachestyle')
 endif
 
-if !has_key(s:disabled_packages, 'z8a')
+if polyglot#util#IsEnabled('z8a', 'ftdetect')
   au BufNewFile,BufRead *.z8a setf z8a
 endif
 
-if !has_key(s:disabled_packages, 'zimbutempl')
+if polyglot#util#IsEnabled('zimbutempl', 'ftdetect')
   au BufNewFile,BufRead *.zut setf zimbutempl
 endif
 
-if !has_key(s:disabled_packages, 'zimbu')
+if polyglot#util#IsEnabled('zimbu', 'ftdetect')
   au BufNewFile,BufRead *.zu setf zimbu
 endif
 
-if !has_key(s:disabled_packages, 'yacc')
+if polyglot#util#IsEnabled('yacc', 'ftdetect')
   au BufNewFile,BufRead *.y++,*.yxx,*.yy setf yacc
 endif
 
-if !has_key(s:disabled_packages, 'xslt')
+if polyglot#util#IsEnabled('xslt', 'ftdetect')
   au BufNewFile,BufRead *.xsl,*.xslt setf xslt
 endif
 
-if !has_key(s:disabled_packages, 'xsd')
+if polyglot#util#IsEnabled('xsd', 'ftdetect')
   au BufNewFile,BufRead *.xsd setf xsd
 endif
 
-if !has_key(s:disabled_packages, 'xquery')
+if polyglot#util#IsEnabled('xquery', 'ftdetect')
   au BufNewFile,BufRead *.xq,*.xql,*.xqm,*.xquery,*.xqy setf xquery
 endif
 
-if !has_key(s:disabled_packages, 'xmodmap')
+if polyglot#util#IsEnabled('xmodmap', 'ftdetect')
   au BufNewFile,BufRead *Xmodmap setf xmodmap
   au BufNewFile,BufRead *xmodmap* call s:StarSetf('xmodmap')
 endif
 
-if !has_key(s:disabled_packages, 'xmath')
+if polyglot#util#IsEnabled('xmath', 'ftdetect')
   au BufNewFile,BufRead *.msc,*.msf setf xmath
 endif
 
-if !has_key(s:disabled_packages, 'xdefaults')
+if polyglot#util#IsEnabled('xdefaults', 'ftdetect')
   au BufNewFile,BufRead *.ad,{.,}Xdefaults,{.,}Xpdefaults,{.,}Xresources,xdm-config setf xdefaults
   au BufNewFile,BufRead Xresources* call s:StarSetf('xdefaults')
   au BufNewFile,BufRead */app-defaults/* call s:StarSetf('xdefaults')
   au BufNewFile,BufRead */Xresources/* call s:StarSetf('xdefaults')
 endif
 
-if !has_key(s:disabled_packages, 'xinetd')
+if polyglot#util#IsEnabled('xinetd', 'ftdetect')
   au BufNewFile,BufRead */etc/xinetd.conf setf xinetd
   au BufNewFile,BufRead */etc/xinetd.d/* call s:StarSetf('xinetd')
 endif
 
-if !has_key(s:disabled_packages, 'xhtml')
+if polyglot#util#IsEnabled('xhtml', 'ftdetect')
   au BufNewFile,BufRead *.xht,*.xhtml setf xhtml
 endif
 
-if !has_key(s:disabled_packages, 'wsh')
+if polyglot#util#IsEnabled('wsh', 'ftdetect')
   au BufNewFile,BufRead *.ws[fc] setf wsh
 endif
 
-if !has_key(s:disabled_packages, 'cvs')
+if polyglot#util#IsEnabled('cvs', 'ftdetect')
   au BufNewFile,BufRead cvs\d\+ setf cvs
 endif
 
-if !has_key(s:disabled_packages, 'cvsrc')
+if polyglot#util#IsEnabled('cvsrc', 'ftdetect')
   au BufNewFile,BufRead {.,}cvsrc setf cvsrc
 endif
 
-if !has_key(s:disabled_packages, 'wvdial')
+if polyglot#util#IsEnabled('wvdial', 'ftdetect')
   au BufNewFile,BufRead {.,}wvdialrc,wvdial.conf setf wvdial
 endif
 
-if !has_key(s:disabled_packages, 'wsml')
+if polyglot#util#IsEnabled('wsml', 'ftdetect')
   au BufNewFile,BufRead *.wsml setf wsml
 endif
 
-if !has_key(s:disabled_packages, 'winbatch')
+if polyglot#util#IsEnabled('winbatch', 'ftdetect')
   au BufNewFile,BufRead *.wbt setf winbatch
 endif
 
-if !has_key(s:disabled_packages, 'wml')
+if polyglot#util#IsEnabled('wml', 'ftdetect')
   au BufNewFile,BufRead *.wml setf wml
 endif
 
-if !has_key(s:disabled_packages, 'wget')
+if polyglot#util#IsEnabled('wget', 'ftdetect')
   au BufNewFile,BufRead {.,}wgetrc,wgetrc setf wget
 endif
 
-if !has_key(s:disabled_packages, 'webmacro')
+if polyglot#util#IsEnabled('webmacro', 'ftdetect')
   au BufNewFile,BufRead *.wm setf webmacro
 endif
 
-if !has_key(s:disabled_packages, 'wast')
+if polyglot#util#IsEnabled('wast', 'ftdetect')
   au BufNewFile,BufRead *.wast,*.wat setf wast
 endif
 
-if !has_key(s:disabled_packages, 'vroom')
+if polyglot#util#IsEnabled('vroom', 'ftdetect')
   au BufNewFile,BufRead *.vroom setf vroom
 endif
 
-if !has_key(s:disabled_packages, 'vrml')
+if polyglot#util#IsEnabled('vrml', 'ftdetect')
   au BufNewFile,BufRead *.wrl setf vrml
 endif
 
-if !has_key(s:disabled_packages, 'vgrindefs')
+if polyglot#util#IsEnabled('vgrindefs', 'ftdetect')
   au BufNewFile,BufRead vgrindefs setf vgrindefs
 endif
 
-if !has_key(s:disabled_packages, 'viminfo')
+if polyglot#util#IsEnabled('viminfo', 'ftdetect')
   au BufNewFile,BufRead {.,}viminfo,_viminfo setf viminfo
 endif
 
-if !has_key(s:disabled_packages, 'vim')
+if polyglot#util#IsEnabled('vim', 'ftdetect')
   au BufNewFile,BufRead *.vba,*.vim,{.,}exrc,_exrc setf vim
   au BufNewFile,BufRead *vimrc* call s:StarSetf('vim')
 endif
 
-if !has_key(s:disabled_packages, 'vhdl')
+if polyglot#util#IsEnabled('vhdl', 'ftdetect')
   au BufNewFile,BufRead *.hdl,*.vbe,*.vhd,*.vhdl,*.vho,*.vst setf vhdl
   au BufNewFile,BufRead *.vhdl_[0-9]* call s:StarSetf('vhdl')
 endif
 
-if !has_key(s:disabled_packages, 'systemverilog')
+if polyglot#util#IsEnabled('systemverilog', 'ftdetect')
   au BufNewFile,BufRead *.sv,*.svh setf systemverilog
 endif
 
-if !has_key(s:disabled_packages, 'verilogams')
+if polyglot#util#IsEnabled('verilogams', 'ftdetect')
   au BufNewFile,BufRead *.va,*.vams setf verilogams
 endif
 
-if !has_key(s:disabled_packages, 'verilog')
+if polyglot#util#IsEnabled('verilog', 'ftdetect')
   au BufNewFile,BufRead *.v setf verilog
 endif
 
-if !has_key(s:disabled_packages, 'vera')
+if polyglot#util#IsEnabled('vera', 'ftdetect')
   au BufNewFile,BufRead *.vr,*.vrh,*.vri setf vera
 endif
 
-if !has_key(s:disabled_packages, 'upstart')
+if polyglot#util#IsEnabled('upstart', 'ftdetect')
   au BufNewFile,BufRead */.config/upstart/*.conf,*/.config/upstart/*.override,*/.init/*.conf,*/.init/*.override,*/etc/init/*.conf,*/etc/init/*.override,*/usr/share/upstart/*.conf,*/usr/share/upstart/*.override setf upstart
 endif
 
-if !has_key(s:disabled_packages, 'updatedb')
+if polyglot#util#IsEnabled('updatedb', 'ftdetect')
   au BufNewFile,BufRead */etc/updatedb.conf setf updatedb
 endif
 
-if !has_key(s:disabled_packages, 'uc')
+if polyglot#util#IsEnabled('uc', 'ftdetect')
   au BufNewFile,BufRead *.uc setf uc
 endif
 
-if !has_key(s:disabled_packages, 'udevperm')
+if polyglot#util#IsEnabled('udevperm', 'ftdetect')
   au BufNewFile,BufRead */etc/udev/permissions.d/*.permissions setf udevperm
 endif
 
-if !has_key(s:disabled_packages, 'udevconf')
+if polyglot#util#IsEnabled('udevconf', 'ftdetect')
   au BufNewFile,BufRead */etc/udev/udev.conf setf udevconf
 endif
 
-if !has_key(s:disabled_packages, 'uil')
+if polyglot#util#IsEnabled('uil', 'ftdetect')
   au BufNewFile,BufRead *.uil,*.uit setf uil
 endif
 
-if !has_key(s:disabled_packages, 'tsscl')
+if polyglot#util#IsEnabled('tsscl', 'ftdetect')
   au BufNewFile,BufRead *.tsscl setf tsscl
 endif
 
-if !has_key(s:disabled_packages, 'tssop')
+if polyglot#util#IsEnabled('tssop', 'ftdetect')
   au BufNewFile,BufRead *.tssop setf tssop
 endif
 
-if !has_key(s:disabled_packages, 'tssgm')
+if polyglot#util#IsEnabled('tssgm', 'ftdetect')
   au BufNewFile,BufRead *.tssgm setf tssgm
 endif
 
-if !has_key(s:disabled_packages, 'trustees')
+if polyglot#util#IsEnabled('trustees', 'ftdetect')
   au BufNewFile,BufRead trustees.conf setf trustees
 endif
 
-if !has_key(s:disabled_packages, 'treetop')
+if polyglot#util#IsEnabled('treetop', 'ftdetect')
   au BufNewFile,BufRead *.treetop setf treetop
 endif
 
-if !has_key(s:disabled_packages, 'tpp')
+if polyglot#util#IsEnabled('tpp', 'ftdetect')
   au BufNewFile,BufRead *.tpp setf tpp
 endif
 
-if !has_key(s:disabled_packages, 'tidy')
+if polyglot#util#IsEnabled('tidy', 'ftdetect')
   au BufNewFile,BufRead {.,}tidyrc,tidy.conf,tidyrc setf tidy
 endif
 
-if !has_key(s:disabled_packages, 'texmf')
+if polyglot#util#IsEnabled('texmf', 'ftdetect')
   au BufNewFile,BufRead texmf.cnf setf texmf
 endif
 
-if !has_key(s:disabled_packages, 'texinfo')
+if polyglot#util#IsEnabled('texinfo', 'ftdetect')
   au BufNewFile,BufRead *.texi,*.texinfo,*.txi setf texinfo
 endif
 
-if !has_key(s:disabled_packages, 'tex')
+if polyglot#util#IsEnabled('tex', 'ftdetect')
   au BufNewFile,BufRead *.bbl,*.dtx,*.latex,*.ltx,*.sty setf tex
 endif
 
-if !has_key(s:disabled_packages, 'terminfo')
+if polyglot#util#IsEnabled('terminfo', 'ftdetect')
   au BufNewFile,BufRead *.ti setf terminfo
 endif
 
-if !has_key(s:disabled_packages, 'teraterm')
+if polyglot#util#IsEnabled('teraterm', 'ftdetect')
   au BufNewFile,BufRead *.ttl setf teraterm
 endif
 
-if !has_key(s:disabled_packages, 'tsalt')
+if polyglot#util#IsEnabled('tsalt', 'ftdetect')
   au BufNewFile,BufRead *.slt setf tsalt
 endif
 
-if !has_key(s:disabled_packages, 'tli')
+if polyglot#util#IsEnabled('tli', 'ftdetect')
   au BufNewFile,BufRead *.tli setf tli
 endif
 
-if !has_key(s:disabled_packages, 'tcl')
+if polyglot#util#IsEnabled('tcl', 'ftdetect')
   au BufNewFile,BufRead *.itcl,*.itk,*.jacl,*.tcl,*.tk setf tcl
 endif
 
-if !has_key(s:disabled_packages, 'taskedit')
+if polyglot#util#IsEnabled('taskedit', 'ftdetect')
   au BufNewFile,BufRead *.task setf taskedit
 endif
 
-if !has_key(s:disabled_packages, 'taskdata')
+if polyglot#util#IsEnabled('taskdata', 'ftdetect')
   au BufNewFile,BufRead {pending,completed,undo}.data setf taskdata
 endif
 
-if !has_key(s:disabled_packages, 'tak')
+if polyglot#util#IsEnabled('tak', 'ftdetect')
   au BufNewFile,BufRead *.tak setf tak
 endif
 
-if !has_key(s:disabled_packages, 'tags')
+if polyglot#util#IsEnabled('tags', 'ftdetect')
   au BufNewFile,BufRead tags setf tags
 endif
 
-if !has_key(s:disabled_packages, 'sudoers')
+if polyglot#util#IsEnabled('sudoers', 'ftdetect')
   au BufNewFile,BufRead */etc/sudoers,sudoers.tmp setf sudoers
 endif
 
-if !has_key(s:disabled_packages, 'sdc')
+if polyglot#util#IsEnabled('sdc', 'ftdetect')
   au BufNewFile,BufRead *.sdc setf sdc
 endif
 
-if !has_key(s:disabled_packages, 'sysctl')
+if polyglot#util#IsEnabled('sysctl', 'ftdetect')
   au BufNewFile,BufRead */etc/sysctl.conf,*/etc/sysctl.d/*.conf setf sysctl
 endif
 
-if !has_key(s:disabled_packages, 'sil')
+if polyglot#util#IsEnabled('sil', 'ftdetect')
   au BufNewFile,BufRead *.sil setf sil
 endif
 
-if !has_key(s:disabled_packages, 'swiftgyb')
+if polyglot#util#IsEnabled('swiftgyb', 'ftdetect')
   au BufNewFile,BufRead *.swift.gyb setf swiftgyb
 endif
 
-if !has_key(s:disabled_packages, 'voscm')
+if polyglot#util#IsEnabled('voscm', 'ftdetect')
   au BufNewFile,BufRead *.cm setf voscm
 endif
 
-if !has_key(s:disabled_packages, 'sml')
+if polyglot#util#IsEnabled('sml', 'ftdetect')
   au BufNewFile,BufRead *.sml setf sml
 endif
 
-if !has_key(s:disabled_packages, 'stp')
+if polyglot#util#IsEnabled('stp', 'ftdetect')
   au BufNewFile,BufRead *.stp setf stp
 endif
 
-if !has_key(s:disabled_packages, 'smcl')
+if polyglot#util#IsEnabled('smcl', 'ftdetect')
   au BufNewFile,BufRead *.hlp,*.ihlp,*.smcl setf smcl
 endif
 
-if !has_key(s:disabled_packages, 'stata')
+if polyglot#util#IsEnabled('stata', 'ftdetect')
   au BufNewFile,BufRead *.ado,*.do,*.imata,*.mata setf stata
 endif
 
-if !has_key(s:disabled_packages, 'sshdconfig')
+if polyglot#util#IsEnabled('sshdconfig', 'ftdetect')
   au BufNewFile,BufRead */etc/ssh/sshd_config.d/*.conf,sshd_config setf sshdconfig
 endif
 
-if !has_key(s:disabled_packages, 'sshconfig')
+if polyglot#util#IsEnabled('sshconfig', 'ftdetect')
   au BufNewFile,BufRead */.ssh/config,*/etc/ssh/ssh_config.d/*.conf,ssh_config setf sshconfig
 endif
 
-if !has_key(s:disabled_packages, 'sqr')
+if polyglot#util#IsEnabled('sqr', 'ftdetect')
   au BufNewFile,BufRead *.sqi,*.sqr setf sqr
 endif
 
-if !has_key(s:disabled_packages, 'sqlj')
+if polyglot#util#IsEnabled('sqlj', 'ftdetect')
   au BufNewFile,BufRead *.sqlj setf sqlj
 endif
 
-if !has_key(s:disabled_packages, 'squid')
+if polyglot#util#IsEnabled('squid', 'ftdetect')
   au BufNewFile,BufRead squid.conf setf squid
 endif
 
-if !has_key(s:disabled_packages, 'spice')
+if polyglot#util#IsEnabled('spice', 'ftdetect')
   au BufNewFile,BufRead *.sp,*.spice setf spice
 endif
 
-if !has_key(s:disabled_packages, 'slice')
+if polyglot#util#IsEnabled('slice', 'ftdetect')
   au BufNewFile,BufRead *.ice setf slice
 endif
 
-if !has_key(s:disabled_packages, 'spup')
+if polyglot#util#IsEnabled('spup', 'ftdetect')
   au BufNewFile,BufRead *.spd,*.spdata,*.speedup setf spup
 endif
 
-if !has_key(s:disabled_packages, 'hog')
+if polyglot#util#IsEnabled('hog', 'ftdetect')
   au BufNewFile,BufRead *.hog,snort.conf,vision.conf setf hog
 endif
 
-if !has_key(s:disabled_packages, 'mib')
+if polyglot#util#IsEnabled('mib', 'ftdetect')
   au BufNewFile,BufRead *.mib,*.my setf mib
 endif
 
-if !has_key(s:disabled_packages, 'snobol4')
+if polyglot#util#IsEnabled('snobol4', 'ftdetect')
   au BufNewFile,BufRead *.sno,*.spt setf snobol4
 endif
 
-if !has_key(s:disabled_packages, 'smith')
+if polyglot#util#IsEnabled('smith', 'ftdetect')
   au BufNewFile,BufRead *.smith,*.smt setf smith
 endif
 
-if !has_key(s:disabled_packages, 'st')
+if polyglot#util#IsEnabled('st', 'ftdetect')
   au BufNewFile,BufRead *.st setf st
 endif
 
-if !has_key(s:disabled_packages, 'slrnsc')
+if polyglot#util#IsEnabled('slrnsc', 'ftdetect')
   au BufNewFile,BufRead *.score setf slrnsc
 endif
 
-if !has_key(s:disabled_packages, 'slrnrc')
+if polyglot#util#IsEnabled('slrnrc', 'ftdetect')
   au BufNewFile,BufRead {.,}slrnrc setf slrnrc
 endif
 
-if !has_key(s:disabled_packages, 'skill')
+if polyglot#util#IsEnabled('skill', 'ftdetect')
   au BufNewFile,BufRead *.cdf,*.il,*.ils setf skill
 endif
 
-if !has_key(s:disabled_packages, 'sisu')
+if polyglot#util#IsEnabled('sisu', 'ftdetect')
   au BufNewFile,BufRead *.-sst,*.-sst.meta,*._sst,*._sst.meta,*.ssi,*.ssm,*.sst,*.sst.meta setf sisu
 endif
 
-if !has_key(s:disabled_packages, 'sinda')
+if polyglot#util#IsEnabled('sinda', 'ftdetect')
   au BufNewFile,BufRead *.s85,*.sin setf sinda
 endif
 
-if !has_key(s:disabled_packages, 'simula')
+if polyglot#util#IsEnabled('simula', 'ftdetect')
   au BufNewFile,BufRead *.sim setf simula
 endif
 
-if !has_key(s:disabled_packages, 'screen')
+if polyglot#util#IsEnabled('screen', 'ftdetect')
   au BufNewFile,BufRead {.,}screenrc,screenrc setf screen
 endif
 
-if !has_key(s:disabled_packages, 'scheme')
+if polyglot#util#IsEnabled('scheme', 'ftdetect')
   au BufNewFile,BufRead *.rkt,*.scm,*.ss setf scheme
 endif
 
-if !has_key(s:disabled_packages, 'catalog')
+if polyglot#util#IsEnabled('catalog', 'ftdetect')
   au BufNewFile,BufRead catalog setf catalog
   au BufNewFile,BufRead sgml.catalog* call s:StarSetf('catalog')
 endif
 
-if !has_key(s:disabled_packages, 'setserial')
+if polyglot#util#IsEnabled('setserial', 'ftdetect')
   au BufNewFile,BufRead */etc/serial.conf setf setserial
 endif
 
-if !has_key(s:disabled_packages, 'slpspi')
+if polyglot#util#IsEnabled('slpspi', 'ftdetect')
   au BufNewFile,BufRead */etc/slp.spi setf slpspi
 endif
 
-if !has_key(s:disabled_packages, 'spyce')
+if polyglot#util#IsEnabled('spyce', 'ftdetect')
   au BufNewFile,BufRead *.spi,*.spy setf spyce
 endif
 
-if !has_key(s:disabled_packages, 'slpreg')
+if polyglot#util#IsEnabled('slpreg', 'ftdetect')
   au BufNewFile,BufRead */etc/slp.reg setf slpreg
 endif
 
-if !has_key(s:disabled_packages, 'slpconf')
+if polyglot#util#IsEnabled('slpconf', 'ftdetect')
   au BufNewFile,BufRead */etc/slp.conf setf slpconf
 endif
 
-if !has_key(s:disabled_packages, 'services')
+if polyglot#util#IsEnabled('services', 'ftdetect')
   au BufNewFile,BufRead */etc/services setf services
 endif
 
-if !has_key(s:disabled_packages, 'sm')
+if polyglot#util#IsEnabled('sm', 'ftdetect')
   au BufNewFile,BufRead sendmail.cf setf sm
 endif
 
-if !has_key(s:disabled_packages, 'sieve')
+if polyglot#util#IsEnabled('sieve', 'ftdetect')
   au BufNewFile,BufRead *.sieve,*.siv setf sieve
 endif
 
-if !has_key(s:disabled_packages, 'sdl')
+if polyglot#util#IsEnabled('sdl', 'ftdetect')
   au BufNewFile,BufRead *.pr,*.sdl setf sdl
 endif
 
-if !has_key(s:disabled_packages, 'sd')
+if polyglot#util#IsEnabled('sd', 'ftdetect')
   au BufNewFile,BufRead *.sd setf sd
 endif
 
-if !has_key(s:disabled_packages, 'scilab')
+if polyglot#util#IsEnabled('scilab', 'ftdetect')
   au BufNewFile,BufRead *.sce,*.sci setf scilab
 endif
 
-if !has_key(s:disabled_packages, 'sbt')
+if polyglot#util#IsEnabled('sbt', 'ftdetect')
   au BufNewFile,BufRead *.sbt setf sbt
 endif
 
-if !has_key(s:disabled_packages, 'sather')
+if polyglot#util#IsEnabled('sather', 'ftdetect')
   au BufNewFile,BufRead *.sa setf sather
 endif
 
-if !has_key(s:disabled_packages, 'sass')
+if polyglot#util#IsEnabled('sass', 'ftdetect')
   au BufNewFile,BufRead *.sass setf sass
 endif
 
-if !has_key(s:disabled_packages, 'sas')
+if polyglot#util#IsEnabled('sas', 'ftdetect')
   au BufNewFile,BufRead *.sas setf sas
 endif
 
-if !has_key(s:disabled_packages, 'samba')
+if polyglot#util#IsEnabled('samba', 'ftdetect')
   au BufNewFile,BufRead smb.conf setf samba
 endif
 
-if !has_key(s:disabled_packages, 'slang')
+if polyglot#util#IsEnabled('slang', 'ftdetect')
   au BufNewFile,BufRead *.sl setf slang
 endif
 
-if !has_key(s:disabled_packages, 'rtf')
+if polyglot#util#IsEnabled('rtf', 'ftdetect')
   au BufNewFile,BufRead *.rtf setf rtf
 endif
 
-if !has_key(s:disabled_packages, 'rpcgen')
+if polyglot#util#IsEnabled('rpcgen', 'ftdetect')
   au BufNewFile,BufRead *.x setf rpcgen
 endif
 
-if !has_key(s:disabled_packages, 'robots')
+if polyglot#util#IsEnabled('robots', 'ftdetect')
   au BufNewFile,BufRead robots.txt setf robots
 endif
 
-if !has_key(s:disabled_packages, 'rpl')
+if polyglot#util#IsEnabled('rpl', 'ftdetect')
   au BufNewFile,BufRead *.rpl setf rpl
 endif
 
-if !has_key(s:disabled_packages, 'rng')
+if polyglot#util#IsEnabled('rng', 'ftdetect')
   au BufNewFile,BufRead *.rng setf rng
 endif
 
-if !has_key(s:disabled_packages, 'rnc')
+if polyglot#util#IsEnabled('rnc', 'ftdetect')
   au BufNewFile,BufRead *.rnc setf rnc
 endif
 
-if !has_key(s:disabled_packages, 'resolv')
+if polyglot#util#IsEnabled('resolv', 'ftdetect')
   au BufNewFile,BufRead resolv.conf setf resolv
 endif
 
-if !has_key(s:disabled_packages, 'remind')
+if polyglot#util#IsEnabled('remind', 'ftdetect')
   au BufNewFile,BufRead *.rem,*.remind,{.,}reminders setf remind
   au BufNewFile,BufRead .reminders* call s:StarSetf('remind')
 endif
 
-if !has_key(s:disabled_packages, 'rrst')
+if polyglot#util#IsEnabled('rrst', 'ftdetect')
   au BufNewFile,BufRead *.rrst,*.srst setf rrst
 endif
 
-if !has_key(s:disabled_packages, 'rmd')
+if polyglot#util#IsEnabled('rmd', 'ftdetect')
   au BufNewFile,BufRead *.rmd,*.smd setf rmd
 endif
 
-if !has_key(s:disabled_packages, 'rnoweb')
+if polyglot#util#IsEnabled('rnoweb', 'ftdetect')
   au BufNewFile,BufRead *.rnw,*.snw setf rnoweb
 endif
 
-if !has_key(s:disabled_packages, 'rexx')
+if polyglot#util#IsEnabled('rexx', 'ftdetect')
   au BufNewFile,BufRead *.jrexx,*.orx,*.rex,*.rexx,*.rexxj,*.rxj,*.rxo,*.testGroup,*.testUnit setf rexx
 endif
 
-if !has_key(s:disabled_packages, 'rego')
+if polyglot#util#IsEnabled('rego', 'ftdetect')
   au BufNewFile,BufRead *.rego setf rego
 endif
 
-if !has_key(s:disabled_packages, 'rib')
+if polyglot#util#IsEnabled('rib', 'ftdetect')
   au BufNewFile,BufRead *.rib setf rib
 endif
 
-if !has_key(s:disabled_packages, 'readline')
+if polyglot#util#IsEnabled('readline', 'ftdetect')
   au BufNewFile,BufRead {.,}inputrc,inputrc setf readline
 endif
 
-if !has_key(s:disabled_packages, 'rcs')
+if polyglot#util#IsEnabled('rcs', 'ftdetect')
   au BufNewFile,BufRead *\,v setf rcs
 endif
 
-if !has_key(s:disabled_packages, 'ratpoison')
+if polyglot#util#IsEnabled('ratpoison', 'ftdetect')
   au BufNewFile,BufRead {.,}ratpoisonrc,ratpoisonrc setf ratpoison
 endif
 
-if !has_key(s:disabled_packages, 'radiance')
+if polyglot#util#IsEnabled('radiance', 'ftdetect')
   au BufNewFile,BufRead *.mat,*.rad setf radiance
 endif
 
-if !has_key(s:disabled_packages, 'pyrex')
+if polyglot#util#IsEnabled('pyrex', 'ftdetect')
   au BufNewFile,BufRead *.pxd,*.pyx setf pyrex
 endif
 
-if !has_key(s:disabled_packages, 'protocols')
+if polyglot#util#IsEnabled('protocols', 'ftdetect')
   au BufNewFile,BufRead */etc/protocols setf protocols
 endif
 
-if !has_key(s:disabled_packages, 'promela')
+if polyglot#util#IsEnabled('promela', 'ftdetect')
   au BufNewFile,BufRead *.pml setf promela
 endif
 
-if !has_key(s:disabled_packages, 'psf')
+if polyglot#util#IsEnabled('psf', 'ftdetect')
   au BufNewFile,BufRead *.psf setf psf
 endif
 
-if !has_key(s:disabled_packages, 'procmail')
+if polyglot#util#IsEnabled('procmail', 'ftdetect')
   au BufNewFile,BufRead {.,}procmail,{.,}procmailrc setf procmail
 endif
 
-if !has_key(s:disabled_packages, 'privoxy')
+if polyglot#util#IsEnabled('privoxy', 'ftdetect')
   au BufNewFile,BufRead *.action setf privoxy
 endif
 
-if !has_key(s:disabled_packages, 'proc')
+if polyglot#util#IsEnabled('proc', 'ftdetect')
   au BufNewFile,BufRead *.pc setf proc
 endif
 
-if !has_key(s:disabled_packages, 'obj')
+if polyglot#util#IsEnabled('obj', 'ftdetect')
   au BufNewFile,BufRead *.obj setf obj
 endif
 
-if !has_key(s:disabled_packages, 'ppwiz')
+if polyglot#util#IsEnabled('ppwiz', 'ftdetect')
   au BufNewFile,BufRead *.ih,*.it setf ppwiz
 endif
 
-if !has_key(s:disabled_packages, 'pccts')
+if polyglot#util#IsEnabled('pccts', 'ftdetect')
   au BufNewFile,BufRead *.g setf pccts
 endif
 
-if !has_key(s:disabled_packages, 'povini')
+if polyglot#util#IsEnabled('povini', 'ftdetect')
   au BufNewFile,BufRead {.,}povrayrc setf povini
 endif
 
-if !has_key(s:disabled_packages, 'pov')
+if polyglot#util#IsEnabled('pov', 'ftdetect')
   au BufNewFile,BufRead *.pov setf pov
 endif
 
-if !has_key(s:disabled_packages, 'ppd')
+if polyglot#util#IsEnabled('ppd', 'ftdetect')
   au BufNewFile,BufRead *.ppd setf ppd
 endif
 
-if !has_key(s:disabled_packages, 'postscr')
+if polyglot#util#IsEnabled('postscr', 'ftdetect')
   au BufNewFile,BufRead *.afm,*.ai,*.eps,*.epsf,*.epsi,*.pfa,*.ps setf postscr
 endif
 
-if !has_key(s:disabled_packages, 'pfmain')
+if polyglot#util#IsEnabled('pfmain', 'ftdetect')
   au BufNewFile,BufRead main.cf setf pfmain
 endif
 
-if !has_key(s:disabled_packages, 'po')
+if polyglot#util#IsEnabled('po', 'ftdetect')
   au BufNewFile,BufRead *.po,*.pot setf po
 endif
 
-if !has_key(s:disabled_packages, 'plp')
+if polyglot#util#IsEnabled('plp', 'ftdetect')
   au BufNewFile,BufRead *.plp setf plp
 endif
 
-if !has_key(s:disabled_packages, 'plsql')
+if polyglot#util#IsEnabled('plsql', 'ftdetect')
   au BufNewFile,BufRead *.pls,*.plsql setf plsql
 endif
 
-if !has_key(s:disabled_packages, 'plm')
+if polyglot#util#IsEnabled('plm', 'ftdetect')
   au BufNewFile,BufRead *.p36,*.pac,*.plm setf plm
 endif
 
-if !has_key(s:disabled_packages, 'pli')
+if polyglot#util#IsEnabled('pli', 'ftdetect')
   au BufNewFile,BufRead *.pl1,*.pli setf pli
 endif
 
-if !has_key(s:disabled_packages, 'pine')
+if polyglot#util#IsEnabled('pine', 'ftdetect')
   au BufNewFile,BufRead {.,}pinerc,{.,}pinercex,pinerc,pinercex setf pine
 endif
 
-if !has_key(s:disabled_packages, 'pilrc')
+if polyglot#util#IsEnabled('pilrc', 'ftdetect')
   au BufNewFile,BufRead *.rcp setf pilrc
 endif
 
-if !has_key(s:disabled_packages, 'pinfo')
+if polyglot#util#IsEnabled('pinfo', 'ftdetect')
   au BufNewFile,BufRead */.pinforc,*/etc/pinforc setf pinfo
 endif
 
-if !has_key(s:disabled_packages, 'cmod')
+if polyglot#util#IsEnabled('cmod', 'ftdetect')
   au BufNewFile,BufRead *.cmod setf cmod
 endif
 
-if !has_key(s:disabled_packages, 'pike')
+if polyglot#util#IsEnabled('pike', 'ftdetect')
   au BufNewFile,BufRead *.pike,*.pmod setf pike
 endif
 
-if !has_key(s:disabled_packages, 'pcmk')
+if polyglot#util#IsEnabled('pcmk', 'ftdetect')
   au BufNewFile,BufRead *.pcmk setf pcmk
 endif
 
-if !has_key(s:disabled_packages, 'pdf')
+if polyglot#util#IsEnabled('pdf', 'ftdetect')
   au BufNewFile,BufRead *.pdf setf pdf
 endif
 
-if !has_key(s:disabled_packages, 'pascal')
+if polyglot#util#IsEnabled('pascal', 'ftdetect')
   au BufNewFile,BufRead *.dpr,*.lpr,*.pas,*.pp setf pascal
 endif
 
-if !has_key(s:disabled_packages, 'passwd')
+if polyglot#util#IsEnabled('passwd', 'ftdetect')
   au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
 endif
 
-if !has_key(s:disabled_packages, 'papp')
+if polyglot#util#IsEnabled('papp', 'ftdetect')
   au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp
 endif
 
-if !has_key(s:disabled_packages, 'pamenv')
+if polyglot#util#IsEnabled('pamenv', 'ftdetect')
   au BufNewFile,BufRead {.,}pam_environment,pam_env.conf setf pamenv
 endif
 
-if !has_key(s:disabled_packages, 'pamconf')
+if polyglot#util#IsEnabled('pamconf', 'ftdetect')
   au BufNewFile,BufRead */etc/pam.conf setf pamconf
   au BufNewFile,BufRead */etc/pam.d/* call s:StarSetf('pamconf')
 endif
 
-if !has_key(s:disabled_packages, 'pf')
+if polyglot#util#IsEnabled('pf', 'ftdetect')
   au BufNewFile,BufRead pf.conf setf pf
 endif
 
-if !has_key(s:disabled_packages, 'ora')
+if polyglot#util#IsEnabled('ora', 'ftdetect')
   au BufNewFile,BufRead *.ora setf ora
 endif
 
-if !has_key(s:disabled_packages, 'opl')
+if polyglot#util#IsEnabled('opl', 'ftdetect')
   au BufNewFile,BufRead *.[Oo][Pp][Ll] setf opl
 endif
 
-if !has_key(s:disabled_packages, 'openroad')
+if polyglot#util#IsEnabled('openroad', 'ftdetect')
   au BufNewFile,BufRead *.or setf openroad
 endif
 
-if !has_key(s:disabled_packages, 'omnimark')
+if polyglot#util#IsEnabled('omnimark', 'ftdetect')
   au BufNewFile,BufRead *.xin,*.xom setf omnimark
 endif
 
-if !has_key(s:disabled_packages, 'occam')
+if polyglot#util#IsEnabled('occam', 'ftdetect')
   au BufNewFile,BufRead *.occ setf occam
 endif
 
-if !has_key(s:disabled_packages, 'nsis')
+if polyglot#util#IsEnabled('nsis', 'ftdetect')
   au BufNewFile,BufRead *.nsh,*.nsi setf nsis
 endif
 
-if !has_key(s:disabled_packages, 'nqc')
+if polyglot#util#IsEnabled('nqc', 'ftdetect')
   au BufNewFile,BufRead *.nqc setf nqc
 endif
 
-if !has_key(s:disabled_packages, 'nroff')
+if polyglot#util#IsEnabled('nroff', 'ftdetect')
   au BufNewFile,BufRead *.mom,*.nr,*.roff,*.tmac,*.tr setf nroff
   au BufNewFile,BufRead tmac.* call s:StarSetf('nroff')
 endif
 
-if !has_key(s:disabled_packages, 'ncf')
+if polyglot#util#IsEnabled('ncf', 'ftdetect')
   au BufNewFile,BufRead *.ncf setf ncf
 endif
 
-if !has_key(s:disabled_packages, 'ninja')
+if polyglot#util#IsEnabled('ninja', 'ftdetect')
   au BufNewFile,BufRead *.ninja setf ninja
 endif
 
-if !has_key(s:disabled_packages, 'netrc')
+if polyglot#util#IsEnabled('netrc', 'ftdetect')
   au BufNewFile,BufRead {.,}netrc setf netrc
 endif
 
-if !has_key(s:disabled_packages, 'neomuttrc')
+if polyglot#util#IsEnabled('neomuttrc', 'ftdetect')
   au BufNewFile,BufRead Neomuttrc setf neomuttrc
   au BufNewFile,BufRead neomuttrc* call s:StarSetf('neomuttrc')
   au BufNewFile,BufRead Neomuttrc* call s:StarSetf('neomuttrc')
@@ -874,27 +859,27 @@ if !has_key(s:disabled_packages, 'neomuttrc')
   au BufNewFile,BufRead */.neomutt/neomuttrc* call s:StarSetf('neomuttrc')
 endif
 
-if !has_key(s:disabled_packages, 'natural')
+if polyglot#util#IsEnabled('natural', 'ftdetect')
   au BufNewFile,BufRead *.NS[ACGLMNPS] setf natural
 endif
 
-if !has_key(s:disabled_packages, 'nanorc')
+if polyglot#util#IsEnabled('nanorc', 'ftdetect')
   au BufNewFile,BufRead *.nanorc,*/etc/nanorc setf nanorc
 endif
 
-if !has_key(s:disabled_packages, 'n1ql')
+if polyglot#util#IsEnabled('n1ql', 'ftdetect')
   au BufNewFile,BufRead *.n1ql,*.nql setf n1ql
 endif
 
-if !has_key(s:disabled_packages, 'mush')
+if polyglot#util#IsEnabled('mush', 'ftdetect')
   au BufNewFile,BufRead *.mush setf mush
 endif
 
-if !has_key(s:disabled_packages, 'mupad')
+if polyglot#util#IsEnabled('mupad', 'ftdetect')
   au BufNewFile,BufRead *.mu setf mupad
 endif
 
-if !has_key(s:disabled_packages, 'muttrc')
+if polyglot#util#IsEnabled('muttrc', 'ftdetect')
   au BufNewFile,BufRead Mutt{ng,}rc setf muttrc
   au BufNewFile,BufRead mutt{ng,}rc* call s:StarSetf('muttrc')
   au BufNewFile,BufRead Mutt{ng,}rc* call s:StarSetf('muttrc')
@@ -903,1006 +888,1006 @@ if !has_key(s:disabled_packages, 'muttrc')
   au BufNewFile,BufRead */.mutt{ng,}/mutt{ng,}rc* call s:StarSetf('muttrc')
 endif
 
-if !has_key(s:disabled_packages, 'msql')
+if polyglot#util#IsEnabled('msql', 'ftdetect')
   au BufNewFile,BufRead *.msql setf msql
 endif
 
-if !has_key(s:disabled_packages, 'mrxvtrc')
+if polyglot#util#IsEnabled('mrxvtrc', 'ftdetect')
   au BufNewFile,BufRead {.,}mrxvtrc,mrxvtrc setf mrxvtrc
 endif
 
-if !has_key(s:disabled_packages, 'srec')
+if polyglot#util#IsEnabled('srec', 'ftdetect')
   au BufNewFile,BufRead *.mot,*.s19,*.s28,*.s37,*.srec setf srec
 endif
 
-if !has_key(s:disabled_packages, 'mplayerconf')
+if polyglot#util#IsEnabled('mplayerconf', 'ftdetect')
   au BufNewFile,BufRead */.mplayer/config,mplayer.conf setf mplayerconf
 endif
 
-if !has_key(s:disabled_packages, 'modconf')
+if polyglot#util#IsEnabled('modconf', 'ftdetect')
   au BufNewFile,BufRead */etc/conf.modules,*/etc/modules,*/etc/modules.conf setf modconf
   au BufNewFile,BufRead */etc/modprobe.* call s:StarSetf('modconf')
 endif
 
-if !has_key(s:disabled_packages, 'moo')
+if polyglot#util#IsEnabled('moo', 'ftdetect')
   au BufNewFile,BufRead *.moo setf moo
 endif
 
-if !has_key(s:disabled_packages, 'monk')
+if polyglot#util#IsEnabled('monk', 'ftdetect')
   au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc setf monk
 endif
 
-if !has_key(s:disabled_packages, 'modula3')
+if polyglot#util#IsEnabled('modula3', 'ftdetect')
   au BufNewFile,BufRead *.[mi][3g] setf modula3
 endif
 
-if !has_key(s:disabled_packages, 'modula2')
+if polyglot#util#IsEnabled('modula2', 'ftdetect')
   au BufNewFile,BufRead *.DEF,*.MOD,*.m2,*.mi setf modula2
 endif
 
-if !has_key(s:disabled_packages, 'mmp')
+if polyglot#util#IsEnabled('mmp', 'ftdetect')
   au BufNewFile,BufRead *.mmp setf mmp
 endif
 
-if !has_key(s:disabled_packages, 'mix')
+if polyglot#util#IsEnabled('mix', 'ftdetect')
   au BufNewFile,BufRead *.mix,*.mixal setf mix
 endif
 
-if !has_key(s:disabled_packages, 'mgl')
+if polyglot#util#IsEnabled('mgl', 'ftdetect')
   au BufNewFile,BufRead *.mgl setf mgl
 endif
 
-if !has_key(s:disabled_packages, 'mp')
+if polyglot#util#IsEnabled('mp', 'ftdetect')
   au BufNewFile,BufRead *.mp setf mp
 endif
 
-if !has_key(s:disabled_packages, 'mf')
+if polyglot#util#IsEnabled('mf', 'ftdetect')
   au BufNewFile,BufRead *.mf setf mf
 endif
 
-if !has_key(s:disabled_packages, 'messages')
+if polyglot#util#IsEnabled('messages', 'ftdetect')
   au BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.[0-9]*,-[0-9]*} setf messages
 endif
 
-if !has_key(s:disabled_packages, 'hgcommit')
+if polyglot#util#IsEnabled('hgcommit', 'ftdetect')
   au BufNewFile,BufRead hg-editor-*.txt setf hgcommit
 endif
 
-if !has_key(s:disabled_packages, 'mel')
+if polyglot#util#IsEnabled('mel', 'ftdetect')
   au BufNewFile,BufRead *.mel setf mel
 endif
 
-if !has_key(s:disabled_packages, 'map')
+if polyglot#util#IsEnabled('map', 'ftdetect')
   au BufNewFile,BufRead *.map setf map
 endif
 
-if !has_key(s:disabled_packages, 'maple')
+if polyglot#util#IsEnabled('maple', 'ftdetect')
   au BufNewFile,BufRead *.mpl,*.mv,*.mws setf maple
 endif
 
-if !has_key(s:disabled_packages, 'manconf')
+if polyglot#util#IsEnabled('manconf', 'ftdetect')
   au BufNewFile,BufRead */etc/man.conf,man.config setf manconf
 endif
 
-if !has_key(s:disabled_packages, 'mallard')
+if polyglot#util#IsEnabled('mallard', 'ftdetect')
   au BufNewFile,BufRead *.page setf mallard
 endif
 
-if !has_key(s:disabled_packages, 'ist')
+if polyglot#util#IsEnabled('ist', 'ftdetect')
   au BufNewFile,BufRead *.ist,*.mst setf ist
 endif
 
-if !has_key(s:disabled_packages, 'mailcap')
+if polyglot#util#IsEnabled('mailcap', 'ftdetect')
   au BufNewFile,BufRead {.,}mailcap,mailcap setf mailcap
 endif
 
-if !has_key(s:disabled_packages, 'mailaliases')
+if polyglot#util#IsEnabled('mailaliases', 'ftdetect')
   au BufNewFile,BufRead */etc/aliases,*/etc/mail/aliases setf mailaliases
 endif
 
-if !has_key(s:disabled_packages, 'mail')
+if polyglot#util#IsEnabled('mail', 'ftdetect')
   au BufNewFile,BufRead *.eml,{.,}article,{.,}article.\d\+,{.,}followup,{.,}letter,{.,}letter.\d\+,/tmp/SLRN[0-9A-Z.]\+,ae\d\+.txt,mutt[[:alnum:]_-]\\\{6\},mutt{ng,}-*-\w\+,neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},pico.\d\+,snd.\d\+,{neo,}mutt[[:alnum:]._-]\\\{6\} setf mail
   au BufNewFile,BufRead reportbug-* call s:StarSetf('mail')
 endif
 
-if !has_key(s:disabled_packages, 'mgp')
+if polyglot#util#IsEnabled('mgp', 'ftdetect')
   au BufNewFile,BufRead *.mgp setf mgp
 endif
 
-if !has_key(s:disabled_packages, 'lss')
+if polyglot#util#IsEnabled('lss', 'ftdetect')
   au BufNewFile,BufRead *.lss setf lss
 endif
 
-if !has_key(s:disabled_packages, 'lsl')
+if polyglot#util#IsEnabled('lsl', 'ftdetect')
   au BufNewFile,BufRead *.lsl setf lsl
 endif
 
-if !has_key(s:disabled_packages, 'lout')
+if polyglot#util#IsEnabled('lout', 'ftdetect')
   au BufNewFile,BufRead *.lou,*.lout setf lout
 endif
 
-if !has_key(s:disabled_packages, 'lotos')
+if polyglot#util#IsEnabled('lotos', 'ftdetect')
   au BufNewFile,BufRead *.lot,*.lotos setf lotos
 endif
 
-if !has_key(s:disabled_packages, 'logtalk')
+if polyglot#util#IsEnabled('logtalk', 'ftdetect')
   au BufNewFile,BufRead *.lgt setf logtalk
 endif
 
-if !has_key(s:disabled_packages, 'logindefs')
+if polyglot#util#IsEnabled('logindefs', 'ftdetect')
   au BufNewFile,BufRead */etc/login.defs setf logindefs
 endif
 
-if !has_key(s:disabled_packages, 'loginaccess')
+if polyglot#util#IsEnabled('loginaccess', 'ftdetect')
   au BufNewFile,BufRead */etc/login.access setf loginaccess
 endif
 
-if !has_key(s:disabled_packages, 'litestep')
+if polyglot#util#IsEnabled('litestep', 'ftdetect')
   au BufNewFile,BufRead */LiteStep/*/*.rc setf litestep
 endif
 
-if !has_key(s:disabled_packages, 'lite')
+if polyglot#util#IsEnabled('lite', 'ftdetect')
   au BufNewFile,BufRead *.lite,*.lt setf lite
 endif
 
-if !has_key(s:disabled_packages, 'liquid')
+if polyglot#util#IsEnabled('liquid', 'ftdetect')
   au BufNewFile,BufRead *.liquid setf liquid
 endif
 
-if !has_key(s:disabled_packages, 'lisp')
+if polyglot#util#IsEnabled('lisp', 'ftdetect')
   au BufNewFile,BufRead *.cl,*.el,*.lisp,*.lsp,{.,}emacs,{.,}sawfishrc,{.,}sbclrc,sbclrc setf lisp
 endif
 
-if !has_key(s:disabled_packages, 'lilo')
+if polyglot#util#IsEnabled('lilo', 'ftdetect')
   au BufNewFile,BufRead lilo.conf setf lilo
   au BufNewFile,BufRead lilo.conf* call s:StarSetf('lilo')
 endif
 
-if !has_key(s:disabled_packages, 'lifelines')
+if polyglot#util#IsEnabled('lifelines', 'ftdetect')
   au BufNewFile,BufRead *.ll setf lifelines
 endif
 
-if !has_key(s:disabled_packages, 'lftp')
+if polyglot#util#IsEnabled('lftp', 'ftdetect')
   au BufNewFile,BufRead *lftp/rc,{.,}lftprc,lftp.conf setf lftp
 endif
 
-if !has_key(s:disabled_packages, 'sensors')
+if polyglot#util#IsEnabled('sensors', 'ftdetect')
   au BufNewFile,BufRead */etc/sensors.conf,*/etc/sensors3.conf setf sensors
 endif
 
-if !has_key(s:disabled_packages, 'libao')
+if polyglot#util#IsEnabled('libao', 'ftdetect')
   au BufNewFile,BufRead */.libao,*/etc/libao.conf setf libao
 endif
 
-if !has_key(s:disabled_packages, 'lex')
+if polyglot#util#IsEnabled('lex', 'ftdetect')
   au BufNewFile,BufRead *.l,*.l++,*.lex,*.lxx setf lex
 endif
 
-if !has_key(s:disabled_packages, 'ld')
+if polyglot#util#IsEnabled('ld', 'ftdetect')
   au BufNewFile,BufRead *.ld setf ld
 endif
 
-if !has_key(s:disabled_packages, 'ldif')
+if polyglot#util#IsEnabled('ldif', 'ftdetect')
   au BufNewFile,BufRead *.ldif setf ldif
 endif
 
-if !has_key(s:disabled_packages, 'lprolog')
+if polyglot#util#IsEnabled('lprolog', 'ftdetect')
   au BufNewFile,BufRead *.sig setf lprolog
 endif
 
-if !has_key(s:disabled_packages, 'limits')
+if polyglot#util#IsEnabled('limits', 'ftdetect')
   au BufNewFile,BufRead */etc/*limits.conf,*/etc/*limits.d/*.conf,*/etc/limits setf limits
 endif
 
-if !has_key(s:disabled_packages, 'latte')
+if polyglot#util#IsEnabled('latte', 'ftdetect')
   au BufNewFile,BufRead *.latte,*.lte setf latte
 endif
 
-if !has_key(s:disabled_packages, 'lace')
+if polyglot#util#IsEnabled('lace', 'ftdetect')
   au BufNewFile,BufRead *.ACE,*.ace setf lace
 endif
 
-if !has_key(s:disabled_packages, 'kconfig')
+if polyglot#util#IsEnabled('kconfig', 'ftdetect')
   au BufNewFile,BufRead Kconfig,Kconfig.debug setf kconfig
   au BufNewFile,BufRead Kconfig.* call s:StarSetf('kconfig')
 endif
 
-if !has_key(s:disabled_packages, 'kscript')
+if polyglot#util#IsEnabled('kscript', 'ftdetect')
   au BufNewFile,BufRead *.ks setf kscript
 endif
 
-if !has_key(s:disabled_packages, 'kivy')
+if polyglot#util#IsEnabled('kivy', 'ftdetect')
   au BufNewFile,BufRead *.kv setf kivy
 endif
 
-if !has_key(s:disabled_packages, 'kwt')
+if polyglot#util#IsEnabled('kwt', 'ftdetect')
   au BufNewFile,BufRead *.k setf kwt
 endif
 
-if !has_key(s:disabled_packages, 'kix')
+if polyglot#util#IsEnabled('kix', 'ftdetect')
   au BufNewFile,BufRead *.kix setf kix
 endif
 
-if !has_key(s:disabled_packages, 'jovial')
+if polyglot#util#IsEnabled('jovial', 'ftdetect')
   au BufNewFile,BufRead *.j73,*.jov,*.jovial setf jovial
 endif
 
-if !has_key(s:disabled_packages, 'jgraph')
+if polyglot#util#IsEnabled('jgraph', 'ftdetect')
   au BufNewFile,BufRead *.jgr setf jgraph
 endif
 
-if !has_key(s:disabled_packages, 'jess')
+if polyglot#util#IsEnabled('jess', 'ftdetect')
   au BufNewFile,BufRead *.clp setf jess
 endif
 
-if !has_key(s:disabled_packages, 'jproperties')
+if polyglot#util#IsEnabled('jproperties', 'ftdetect')
   au BufNewFile,BufRead *.properties,*.properties_??,*.properties_??_?? setf jproperties
   au BufNewFile,BufRead *.properties_??_??_* call s:StarSetf('jproperties')
 endif
 
-if !has_key(s:disabled_packages, 'jsp')
+if polyglot#util#IsEnabled('jsp', 'ftdetect')
   au BufNewFile,BufRead *.jsp setf jsp
 endif
 
-if !has_key(s:disabled_packages, 'javacc')
+if polyglot#util#IsEnabled('javacc', 'ftdetect')
   au BufNewFile,BufRead *.jj,*.jjt setf javacc
 endif
 
-if !has_key(s:disabled_packages, 'java')
+if polyglot#util#IsEnabled('java', 'ftdetect')
   au BufNewFile,BufRead *.jav,*.java setf java
 endif
 
-if !has_key(s:disabled_packages, 'jam')
+if polyglot#util#IsEnabled('jam', 'ftdetect')
   au BufNewFile,BufRead *.jpl,*.jpr setf jam
   au BufNewFile,BufRead Prl*.* call s:StarSetf('jam')
   au BufNewFile,BufRead JAM*.* call s:StarSetf('jam')
 endif
 
-if !has_key(s:disabled_packages, 'jal')
+if polyglot#util#IsEnabled('jal', 'ftdetect')
   au BufNewFile,BufRead *.JAL,*.jal setf jal
 endif
 
-if !has_key(s:disabled_packages, 'j')
+if polyglot#util#IsEnabled('j', 'ftdetect')
   au BufNewFile,BufRead *.ijs setf j
 endif
 
-if !has_key(s:disabled_packages, 'iss')
+if polyglot#util#IsEnabled('iss', 'ftdetect')
   au BufNewFile,BufRead *.iss setf iss
 endif
 
-if !has_key(s:disabled_packages, 'inittab')
+if polyglot#util#IsEnabled('inittab', 'ftdetect')
   au BufNewFile,BufRead inittab setf inittab
 endif
 
-if !has_key(s:disabled_packages, 'fgl')
+if polyglot#util#IsEnabled('fgl', 'ftdetect')
   au BufNewFile,BufRead *.4gh,*.4gl,*.m4gl setf fgl
 endif
 
-if !has_key(s:disabled_packages, 'ipfilter')
+if polyglot#util#IsEnabled('ipfilter', 'ftdetect')
   au BufNewFile,BufRead ipf.conf,ipf.rules,ipf6.conf setf ipfilter
 endif
 
-if !has_key(s:disabled_packages, 'usw2kagtlog')
+if polyglot#util#IsEnabled('usw2kagtlog', 'ftdetect')
   au BufNewFile,BufRead *.usw2kagt.log\c,usw2kagt.*.log\c,usw2kagt.log\c setf usw2kagtlog
 endif
 
-if !has_key(s:disabled_packages, 'usserverlog')
+if polyglot#util#IsEnabled('usserverlog', 'ftdetect')
   au BufNewFile,BufRead *.usserver.log\c,usserver.*.log\c,usserver.log\c setf usserverlog
 endif
 
-if !has_key(s:disabled_packages, 'upstreaminstalllog')
+if polyglot#util#IsEnabled('upstreaminstalllog', 'ftdetect')
   au BufNewFile,BufRead *.upstreaminstall.log\c,upstreaminstall.*.log\c,upstreaminstall.log\c setf upstreaminstalllog
 endif
 
-if !has_key(s:disabled_packages, 'upstreamlog')
+if polyglot#util#IsEnabled('upstreamlog', 'ftdetect')
   au BufNewFile,BufRead *.upstream.log\c,UPSTREAM-*.log\c,fdrupstream.log,upstream.*.log\c,upstream.log\c setf upstreamlog
 endif
 
-if !has_key(s:disabled_packages, 'upstreamdat')
+if polyglot#util#IsEnabled('upstreamdat', 'ftdetect')
   au BufNewFile,BufRead *.upstream.dat\c,upstream.*.dat\c,upstream.dat\c setf upstreamdat
 endif
 
-if !has_key(s:disabled_packages, 'initng')
+if polyglot#util#IsEnabled('initng', 'ftdetect')
   au BufNewFile,BufRead *.ii,*/etc/initng/*/*.i setf initng
 endif
 
-if !has_key(s:disabled_packages, 'inform')
+if polyglot#util#IsEnabled('inform', 'ftdetect')
   au BufNewFile,BufRead *.INF,*.inf setf inform
 endif
 
-if !has_key(s:disabled_packages, 'indent')
+if polyglot#util#IsEnabled('indent', 'ftdetect')
   au BufNewFile,BufRead {.,}indent.pro,indentrc setf indent
 endif
 
-if !has_key(s:disabled_packages, 'icemenu')
+if polyglot#util#IsEnabled('icemenu', 'ftdetect')
   au BufNewFile,BufRead */.icewm/menu setf icemenu
 endif
 
-if !has_key(s:disabled_packages, 'msidl')
+if polyglot#util#IsEnabled('msidl', 'ftdetect')
   au BufNewFile,BufRead *.mof,*.odl setf msidl
 endif
 
-if !has_key(s:disabled_packages, 'icon')
+if polyglot#util#IsEnabled('icon', 'ftdetect')
   au BufNewFile,BufRead *.icn setf icon
 endif
 
-if !has_key(s:disabled_packages, 'httest')
+if polyglot#util#IsEnabled('httest', 'ftdetect')
   au BufNewFile,BufRead *.htb,*.htt setf httest
 endif
 
-if !has_key(s:disabled_packages, 'hb')
+if polyglot#util#IsEnabled('hb', 'ftdetect')
   au BufNewFile,BufRead *.hb setf hb
 endif
 
-if !has_key(s:disabled_packages, 'hostsaccess')
+if polyglot#util#IsEnabled('hostsaccess', 'ftdetect')
   au BufNewFile,BufRead */etc/hosts.allow,*/etc/hosts.deny setf hostsaccess
 endif
 
-if !has_key(s:disabled_packages, 'hostconf')
+if polyglot#util#IsEnabled('hostconf', 'ftdetect')
   au BufNewFile,BufRead */etc/host.conf setf hostconf
 endif
 
-if !has_key(s:disabled_packages, 'template')
+if polyglot#util#IsEnabled('template', 'ftdetect')
   au BufNewFile,BufRead *.tmpl setf template
 endif
 
-if !has_key(s:disabled_packages, 'htmlm4')
+if polyglot#util#IsEnabled('htmlm4', 'ftdetect')
   au BufNewFile,BufRead *.html.m4 setf htmlm4
 endif
 
-if !has_key(s:disabled_packages, 'tilde')
+if polyglot#util#IsEnabled('tilde', 'ftdetect')
   au BufNewFile,BufRead *.t.html setf tilde
 endif
 
-if !has_key(s:disabled_packages, 'html')
+if polyglot#util#IsEnabled('html', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
   au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
 endif
 
-if !has_key(s:disabled_packages, 'hollywood')
+if polyglot#util#IsEnabled('hollywood', 'ftdetect')
   au BufNewFile,BufRead *.hws setf hollywood
 endif
 
-if !has_key(s:disabled_packages, 'hex')
+if polyglot#util#IsEnabled('hex', 'ftdetect')
   au BufNewFile,BufRead *.h32,*.hex setf hex
 endif
 
-if !has_key(s:disabled_packages, 'hercules')
+if polyglot#util#IsEnabled('hercules', 'ftdetect')
   au BufNewFile,BufRead *.errsum,*.ev,*.sum,*.vc setf hercules
 endif
 
-if !has_key(s:disabled_packages, 'hastepreproc')
+if polyglot#util#IsEnabled('hastepreproc', 'ftdetect')
   au BufNewFile,BufRead *.htpp setf hastepreproc
 endif
 
-if !has_key(s:disabled_packages, 'haste')
+if polyglot#util#IsEnabled('haste', 'ftdetect')
   au BufNewFile,BufRead *.ht setf haste
 endif
 
-if !has_key(s:disabled_packages, 'chaskell')
+if polyglot#util#IsEnabled('chaskell', 'ftdetect')
   au BufNewFile,BufRead *.chs setf chaskell
 endif
 
-if !has_key(s:disabled_packages, 'lhaskell')
+if polyglot#util#IsEnabled('lhaskell', 'ftdetect')
   au BufNewFile,BufRead *.lhs setf lhaskell
 endif
 
-if !has_key(s:disabled_packages, 'gtkrc')
+if polyglot#util#IsEnabled('gtkrc', 'ftdetect')
   au BufNewFile,BufRead {.,}gtkrc,gtkrc setf gtkrc
   au BufNewFile,BufRead gtkrc* call s:StarSetf('gtkrc')
   au BufNewFile,BufRead .gtkrc* call s:StarSetf('gtkrc')
 endif
 
-if !has_key(s:disabled_packages, 'group')
+if polyglot#util#IsEnabled('group', 'ftdetect')
   au BufNewFile,BufRead */etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/etc/gshadow-,*/etc/gshadow.edit,*/var/backups/group.bak,*/var/backups/gshadow.bak setf group
 endif
 
-if !has_key(s:disabled_packages, 'gsp')
+if polyglot#util#IsEnabled('gsp', 'ftdetect')
   au BufNewFile,BufRead *.gsp setf gsp
 endif
 
-if !has_key(s:disabled_packages, 'gretl')
+if polyglot#util#IsEnabled('gretl', 'ftdetect')
   au BufNewFile,BufRead *.gretl setf gretl
 endif
 
-if !has_key(s:disabled_packages, 'grads')
+if polyglot#util#IsEnabled('grads', 'ftdetect')
   au BufNewFile,BufRead *.gs setf grads
 endif
 
-if !has_key(s:disabled_packages, 'gitolite')
+if polyglot#util#IsEnabled('gitolite', 'ftdetect')
   au BufNewFile,BufRead gitolite.conf setf gitolite
   au BufNewFile,BufRead */gitolite-admin/conf/* call s:StarSetf('gitolite')
 endif
 
-if !has_key(s:disabled_packages, 'gnash')
+if polyglot#util#IsEnabled('gnash', 'ftdetect')
   au BufNewFile,BufRead {.,}gnashpluginrc,{.,}gnashrc,gnashpluginrc,gnashrc setf gnash
 endif
 
-if !has_key(s:disabled_packages, 'gpg')
+if polyglot#util#IsEnabled('gpg', 'ftdetect')
   au BufNewFile,BufRead */.gnupg/gpg.conf,*/.gnupg/options,*/usr/*/gnupg/options.skel setf gpg
 endif
 
-if !has_key(s:disabled_packages, 'gp')
+if polyglot#util#IsEnabled('gp', 'ftdetect')
   au BufNewFile,BufRead *.gp,{.,}gprc setf gp
 endif
 
-if !has_key(s:disabled_packages, 'gkrellmrc')
+if polyglot#util#IsEnabled('gkrellmrc', 'ftdetect')
   au BufNewFile,BufRead gkrellmrc,gkrellmrc_? setf gkrellmrc
 endif
 
-if !has_key(s:disabled_packages, 'gedcom')
+if polyglot#util#IsEnabled('gedcom', 'ftdetect')
   au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
   au BufNewFile,BufRead */tmp/lltmp* call s:StarSetf('gedcom')
 endif
 
-if !has_key(s:disabled_packages, 'gdmo')
+if polyglot#util#IsEnabled('gdmo', 'ftdetect')
   au BufNewFile,BufRead *.gdmo,*.mo setf gdmo
 endif
 
-if !has_key(s:disabled_packages, 'gdb')
+if polyglot#util#IsEnabled('gdb', 'ftdetect')
   au BufNewFile,BufRead {.,}gdbinit setf gdb
 endif
 
-if !has_key(s:disabled_packages, 'fstab')
+if polyglot#util#IsEnabled('fstab', 'ftdetect')
   au BufNewFile,BufRead fstab,mtab setf fstab
 endif
 
-if !has_key(s:disabled_packages, 'framescript')
+if polyglot#util#IsEnabled('framescript', 'ftdetect')
   au BufNewFile,BufRead *.fsl setf framescript
 endif
 
-if !has_key(s:disabled_packages, 'fortran')
+if polyglot#util#IsEnabled('fortran', 'ftdetect')
   au BufNewFile,BufRead *.f,*.f03,*.f08,*.f77,*.f90,*.f95,*.for,*.fortran,*.fpp,*.ftn setf fortran
 endif
 
-if !has_key(s:disabled_packages, 'reva')
+if polyglot#util#IsEnabled('reva', 'ftdetect')
   au BufNewFile,BufRead *.frt setf reva
 endif
 
-if !has_key(s:disabled_packages, 'focexec')
+if polyglot#util#IsEnabled('focexec', 'ftdetect')
   au BufNewFile,BufRead *.fex,*.focexec setf focexec
 endif
 
-if !has_key(s:disabled_packages, 'fetchmail')
+if polyglot#util#IsEnabled('fetchmail', 'ftdetect')
   au BufNewFile,BufRead {.,}fetchmailrc setf fetchmail
 endif
 
-if !has_key(s:disabled_packages, 'factor')
+if polyglot#util#IsEnabled('factor', 'ftdetect')
   au BufNewFile,BufRead *.factor setf factor
 endif
 
-if !has_key(s:disabled_packages, 'fan')
+if polyglot#util#IsEnabled('fan', 'ftdetect')
   au BufNewFile,BufRead *.fan,*.fwt setf fan
 endif
 
-if !has_key(s:disabled_packages, 'falcon')
+if polyglot#util#IsEnabled('falcon', 'ftdetect')
   au BufNewFile,BufRead *.fal setf falcon
 endif
 
-if !has_key(s:disabled_packages, 'exports')
+if polyglot#util#IsEnabled('exports', 'ftdetect')
   au BufNewFile,BufRead exports setf exports
 endif
 
-if !has_key(s:disabled_packages, 'expect')
+if polyglot#util#IsEnabled('expect', 'ftdetect')
   au BufNewFile,BufRead *.exp setf expect
 endif
 
-if !has_key(s:disabled_packages, 'exim')
+if polyglot#util#IsEnabled('exim', 'ftdetect')
   au BufNewFile,BufRead exim.conf setf exim
 endif
 
-if !has_key(s:disabled_packages, 'csc')
+if polyglot#util#IsEnabled('csc', 'ftdetect')
   au BufNewFile,BufRead *.csc setf csc
 endif
 
-if !has_key(s:disabled_packages, 'esterel')
+if polyglot#util#IsEnabled('esterel', 'ftdetect')
   au BufNewFile,BufRead *.strl setf esterel
 endif
 
-if !has_key(s:disabled_packages, 'esqlc')
+if polyglot#util#IsEnabled('esqlc', 'ftdetect')
   au BufNewFile,BufRead *.EC,*.ec setf esqlc
 endif
 
-if !has_key(s:disabled_packages, 'esmtprc')
+if polyglot#util#IsEnabled('esmtprc', 'ftdetect')
   au BufNewFile,BufRead *esmtprc setf esmtprc
 endif
 
-if !has_key(s:disabled_packages, 'elmfilt')
+if polyglot#util#IsEnabled('elmfilt', 'ftdetect')
   au BufNewFile,BufRead filter-rules setf elmfilt
 endif
 
-if !has_key(s:disabled_packages, 'elinks')
+if polyglot#util#IsEnabled('elinks', 'ftdetect')
   au BufNewFile,BufRead elinks.conf setf elinks
 endif
 
-if !has_key(s:disabled_packages, 'ecd')
+if polyglot#util#IsEnabled('ecd', 'ftdetect')
   au BufNewFile,BufRead *.ecd setf ecd
 endif
 
-if !has_key(s:disabled_packages, 'edif')
+if polyglot#util#IsEnabled('edif', 'ftdetect')
   au BufNewFile,BufRead *.ed\(f\|if\|o\) setf edif
 endif
 
-if !has_key(s:disabled_packages, 'dts')
+if polyglot#util#IsEnabled('dts', 'ftdetect')
   au BufNewFile,BufRead *.dts,*.dtsi setf dts
 endif
 
-if !has_key(s:disabled_packages, 'dtd')
+if polyglot#util#IsEnabled('dtd', 'ftdetect')
   au BufNewFile,BufRead *.dtd setf dtd
 endif
 
-if !has_key(s:disabled_packages, 'dsl')
+if polyglot#util#IsEnabled('dsl', 'ftdetect')
   au BufNewFile,BufRead *.dsl setf dsl
 endif
 
-if !has_key(s:disabled_packages, 'datascript')
+if polyglot#util#IsEnabled('datascript', 'ftdetect')
   au BufNewFile,BufRead *.ds setf datascript
 endif
 
-if !has_key(s:disabled_packages, 'dracula')
+if polyglot#util#IsEnabled('dracula', 'ftdetect')
   au BufNewFile,BufRead *.drac,*.drc,*lpe,*lvs setf dracula
   au BufNewFile,BufRead drac.* call s:StarSetf('dracula')
 endif
 
-if !has_key(s:disabled_packages, 'def')
+if polyglot#util#IsEnabled('def', 'ftdetect')
   au BufNewFile,BufRead *.def setf def
 endif
 
-if !has_key(s:disabled_packages, 'dylan')
+if polyglot#util#IsEnabled('dylan', 'ftdetect')
   au BufNewFile,BufRead *.dylan setf dylan
 endif
 
-if !has_key(s:disabled_packages, 'dylanintr')
+if polyglot#util#IsEnabled('dylanintr', 'ftdetect')
   au BufNewFile,BufRead *.intr setf dylanintr
 endif
 
-if !has_key(s:disabled_packages, 'dylanlid')
+if polyglot#util#IsEnabled('dylanlid', 'ftdetect')
   au BufNewFile,BufRead *.lid setf dylanlid
 endif
 
-if !has_key(s:disabled_packages, 'dot')
+if polyglot#util#IsEnabled('dot', 'ftdetect')
   au BufNewFile,BufRead *.dot,*.gv setf dot
 endif
 
-if !has_key(s:disabled_packages, 'dircolors')
+if polyglot#util#IsEnabled('dircolors', 'ftdetect')
   au BufNewFile,BufRead */etc/DIR_COLORS,{.,}dir_colors,{.,}dircolors setf dircolors
 endif
 
-if !has_key(s:disabled_packages, 'diff')
+if polyglot#util#IsEnabled('diff', 'ftdetect')
   au BufNewFile,BufRead *.diff,*.rej setf diff
 endif
 
-if !has_key(s:disabled_packages, 'dictdconf')
+if polyglot#util#IsEnabled('dictdconf', 'ftdetect')
   au BufNewFile,BufRead dictd.conf setf dictdconf
 endif
 
-if !has_key(s:disabled_packages, 'dictconf')
+if polyglot#util#IsEnabled('dictconf', 'ftdetect')
   au BufNewFile,BufRead {.,}dictrc,dict.conf setf dictconf
 endif
 
-if !has_key(s:disabled_packages, 'desktop')
+if polyglot#util#IsEnabled('desktop', 'ftdetect')
   au BufNewFile,BufRead *.desktop,*.directory setf desktop
 endif
 
-if !has_key(s:disabled_packages, 'desc')
+if polyglot#util#IsEnabled('desc', 'ftdetect')
   au BufNewFile,BufRead *.desc setf desc
 endif
 
-if !has_key(s:disabled_packages, 'dnsmasq')
+if polyglot#util#IsEnabled('dnsmasq', 'ftdetect')
   au BufNewFile,BufRead */etc/dnsmasq.conf setf dnsmasq
   au BufNewFile,BufRead */etc/dnsmasq.d/* call s:StarSetf('dnsmasq')
 endif
 
-if !has_key(s:disabled_packages, 'denyhosts')
+if polyglot#util#IsEnabled('denyhosts', 'ftdetect')
   au BufNewFile,BufRead denyhosts.conf setf denyhosts
 endif
 
-if !has_key(s:disabled_packages, 'debsources')
+if polyglot#util#IsEnabled('debsources', 'ftdetect')
   au BufNewFile,BufRead */etc/apt/sources.list,*/etc/apt/sources.list.d/*.list setf debsources
 endif
 
-if !has_key(s:disabled_packages, 'debcopyright')
+if polyglot#util#IsEnabled('debcopyright', 'ftdetect')
   au BufNewFile,BufRead */debian/copyright setf debcopyright
 endif
 
-if !has_key(s:disabled_packages, 'debcontrol')
+if polyglot#util#IsEnabled('debcontrol', 'ftdetect')
   au BufNewFile,BufRead */debian/control setf debcontrol
 endif
 
-if !has_key(s:disabled_packages, 'cuplsim')
+if polyglot#util#IsEnabled('cuplsim', 'ftdetect')
   au BufNewFile,BufRead *.si setf cuplsim
 endif
 
-if !has_key(s:disabled_packages, 'cupl')
+if polyglot#util#IsEnabled('cupl', 'ftdetect')
   au BufNewFile,BufRead *.pld setf cupl
 endif
 
-if !has_key(s:disabled_packages, 'csp')
+if polyglot#util#IsEnabled('csp', 'ftdetect')
   au BufNewFile,BufRead *.csp,*.fdr setf csp
 endif
 
-if !has_key(s:disabled_packages, 'quake')
+if polyglot#util#IsEnabled('quake', 'ftdetect')
   au BufNewFile,BufRead *baseq[2-3]/*.cfg,*id1/*.cfg,*quake[1-3]/*.cfg setf quake
 endif
 
-if !has_key(s:disabled_packages, 'lynx')
+if polyglot#util#IsEnabled('lynx', 'ftdetect')
   au BufNewFile,BufRead lynx.cfg setf lynx
 endif
 
-if !has_key(s:disabled_packages, 'eterm')
+if polyglot#util#IsEnabled('eterm', 'ftdetect')
   au BufNewFile,BufRead *Eterm/*.cfg setf eterm
 endif
 
-if !has_key(s:disabled_packages, 'dcd')
+if polyglot#util#IsEnabled('dcd', 'ftdetect')
   au BufNewFile,BufRead *.dcd setf dcd
 endif
 
-if !has_key(s:disabled_packages, 'dockerfile')
+if polyglot#util#IsEnabled('dockerfile', 'ftdetect')
   au BufNewFile,BufRead *.Dockerfile,*.dock,Containerfile,Dockerfile,dockerfile setf dockerfile
   au BufNewFile,BufRead Dockerfile* call s:StarSetf('dockerfile')
 endif
 
-if !has_key(s:disabled_packages, 'cuda')
+if polyglot#util#IsEnabled('cuda', 'ftdetect')
   au BufNewFile,BufRead *.cu,*.cuh setf cuda
 endif
 
-if !has_key(s:disabled_packages, 'config')
+if polyglot#util#IsEnabled('config', 'ftdetect')
   au BufNewFile,BufRead Pipfile,configure.ac,configure.in setf config
   au BufNewFile,BufRead /etc/hostname.* call s:StarSetf('config')
 endif
 
-if !has_key(s:disabled_packages, 'cf')
+if polyglot#util#IsEnabled('cf', 'ftdetect')
   au BufNewFile,BufRead *.cfc,*.cfi,*.cfm setf cf
 endif
 
-if !has_key(s:disabled_packages, 'coco')
+if polyglot#util#IsEnabled('coco', 'ftdetect')
   au BufNewFile,BufRead *.atg setf coco
 endif
 
-if !has_key(s:disabled_packages, 'cobol')
+if polyglot#util#IsEnabled('cobol', 'ftdetect')
   au BufNewFile,BufRead *.cbl,*.cob,*.lib setf cobol
 endif
 
-if !has_key(s:disabled_packages, 'cmusrc')
+if polyglot#util#IsEnabled('cmusrc', 'ftdetect')
   au BufNewFile,BufRead */.cmus/{autosave,rc,command-history,*.theme},*/cmus/{rc,*.theme} setf cmusrc
 endif
 
-if !has_key(s:disabled_packages, 'cl')
+if polyglot#util#IsEnabled('cl', 'ftdetect')
   au BufNewFile,BufRead *.eni setf cl
 endif
 
-if !has_key(s:disabled_packages, 'clean')
+if polyglot#util#IsEnabled('clean', 'ftdetect')
   au BufNewFile,BufRead *.dcl,*.icl setf clean
 endif
 
-if !has_key(s:disabled_packages, 'chordpro')
+if polyglot#util#IsEnabled('chordpro', 'ftdetect')
   au BufNewFile,BufRead *.cho,*.chopro,*.chordpro,*.crd,*.crdpro setf chordpro
 endif
 
-if !has_key(s:disabled_packages, 'chill')
+if polyglot#util#IsEnabled('chill', 'ftdetect')
   au BufNewFile,BufRead *..ch setf chill
 endif
 
-if !has_key(s:disabled_packages, 'debchangelog')
+if polyglot#util#IsEnabled('debchangelog', 'ftdetect')
   au BufNewFile,BufRead */debian/changelog,NEWS.Debian,NEWS.dch,changelog.Debian,changelog.dch setf debchangelog
 endif
 
-if !has_key(s:disabled_packages, 'cterm')
+if polyglot#util#IsEnabled('cterm', 'ftdetect')
   au BufNewFile,BufRead *.con setf cterm
 endif
 
-if !has_key(s:disabled_packages, 'css')
+if polyglot#util#IsEnabled('css', 'ftdetect')
   au BufNewFile,BufRead *.css setf css
 endif
 
-if !has_key(s:disabled_packages, 'ch')
+if polyglot#util#IsEnabled('ch', 'ftdetect')
   au BufNewFile,BufRead *.chf setf ch
 endif
 
-if !has_key(s:disabled_packages, 'cynpp')
+if polyglot#util#IsEnabled('cynpp', 'ftdetect')
   au BufNewFile,BufRead *.cyn setf cynpp
 endif
 
-if !has_key(s:disabled_packages, 'crm')
+if polyglot#util#IsEnabled('crm', 'ftdetect')
   au BufNewFile,BufRead *.crm setf crm
 endif
 
-if !has_key(s:disabled_packages, 'conaryrecipe')
+if polyglot#util#IsEnabled('conaryrecipe', 'ftdetect')
   au BufNewFile,BufRead *.recipe setf conaryrecipe
 endif
 
-if !has_key(s:disabled_packages, 'cdl')
+if polyglot#util#IsEnabled('cdl', 'ftdetect')
   au BufNewFile,BufRead *.cdl setf cdl
 endif
 
-if !has_key(s:disabled_packages, 'chaiscript')
+if polyglot#util#IsEnabled('chaiscript', 'ftdetect')
   au BufNewFile,BufRead *.chai setf chaiscript
 endif
 
-if !has_key(s:disabled_packages, 'cfengine')
+if polyglot#util#IsEnabled('cfengine', 'ftdetect')
   au BufNewFile,BufRead cfengine.conf setf cfengine
 endif
 
-if !has_key(s:disabled_packages, 'cdrdaoconf')
+if polyglot#util#IsEnabled('cdrdaoconf', 'ftdetect')
   au BufNewFile,BufRead */etc/cdrdao.conf,*/etc/default/cdrdao,*/etc/defaults/cdrdao,{.,}cdrdao setf cdrdaoconf
 endif
 
-if !has_key(s:disabled_packages, 'cdrtoc')
+if polyglot#util#IsEnabled('cdrtoc', 'ftdetect')
   au BufNewFile,BufRead *.toc setf cdrtoc
 endif
 
-if !has_key(s:disabled_packages, 'cabal')
+if polyglot#util#IsEnabled('cabal', 'ftdetect')
   au BufNewFile,BufRead *.cabal setf cabal
 endif
 
-if !has_key(s:disabled_packages, 'csdl')
+if polyglot#util#IsEnabled('csdl', 'ftdetect')
   au BufNewFile,BufRead *.csdl setf csdl
 endif
 
-if !has_key(s:disabled_packages, 'cs')
+if polyglot#util#IsEnabled('cs', 'ftdetect')
   au BufNewFile,BufRead *.cs setf cs
 endif
 
-if !has_key(s:disabled_packages, 'calendar')
+if polyglot#util#IsEnabled('calendar', 'ftdetect')
   au BufNewFile,BufRead calendar setf calendar
   au BufNewFile,BufRead */share/calendar/calendar.* call s:StarSetf('calendar')
   au BufNewFile,BufRead */share/calendar/*/calendar.* call s:StarSetf('calendar')
   au BufNewFile,BufRead */.calendar/* call s:StarSetf('calendar')
 endif
 
-if !has_key(s:disabled_packages, 'lpc')
+if polyglot#util#IsEnabled('lpc', 'ftdetect')
   au BufNewFile,BufRead *.lpc,*.ulpc setf lpc
 endif
 
-if !has_key(s:disabled_packages, 'bsdl')
+if polyglot#util#IsEnabled('bsdl', 'ftdetect')
   au BufNewFile,BufRead *.bsdl,*bsd setf bsdl
 endif
 
-if !has_key(s:disabled_packages, 'blank')
+if polyglot#util#IsEnabled('blank', 'ftdetect')
   au BufNewFile,BufRead *.bl setf blank
 endif
 
-if !has_key(s:disabled_packages, 'bindzone')
+if polyglot#util#IsEnabled('bindzone', 'ftdetect')
   au BufNewFile,BufRead named.root setf bindzone
   au BufNewFile,BufRead */named/db.* call s:StarSetf('bindzone')
   au BufNewFile,BufRead */bind/db.* call s:StarSetf('bindzone')
 endif
 
-if !has_key(s:disabled_packages, 'named')
+if polyglot#util#IsEnabled('named', 'ftdetect')
   au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key setf named
 endif
 
-if !has_key(s:disabled_packages, 'bst')
+if polyglot#util#IsEnabled('bst', 'ftdetect')
   au BufNewFile,BufRead *.bst setf bst
 endif
 
-if !has_key(s:disabled_packages, 'bib')
+if polyglot#util#IsEnabled('bib', 'ftdetect')
   au BufNewFile,BufRead *.bib setf bib
 endif
 
-if !has_key(s:disabled_packages, 'bdf')
+if polyglot#util#IsEnabled('bdf', 'ftdetect')
   au BufNewFile,BufRead *.bdf setf bdf
 endif
 
-if !has_key(s:disabled_packages, 'bc')
+if polyglot#util#IsEnabled('bc', 'ftdetect')
   au BufNewFile,BufRead *.bc setf bc
 endif
 
-if !has_key(s:disabled_packages, 'dosbatch')
+if polyglot#util#IsEnabled('dosbatch', 'ftdetect')
   au BufNewFile,BufRead *.bat,*.sys setf dosbatch
 endif
 
-if !has_key(s:disabled_packages, 'hamster')
+if polyglot#util#IsEnabled('hamster', 'ftdetect')
   au BufNewFile,BufRead *.hsc,*.hsm setf hamster
 endif
 
-if !has_key(s:disabled_packages, 'freebasic')
+if polyglot#util#IsEnabled('freebasic', 'ftdetect')
   au BufNewFile,BufRead *.bi,*.fb setf freebasic
 endif
 
-if !has_key(s:disabled_packages, 'ibasic')
+if polyglot#util#IsEnabled('ibasic', 'ftdetect')
   au BufNewFile,BufRead *.iba,*.ibi setf ibasic
 endif
 
-if !has_key(s:disabled_packages, 'b')
+if polyglot#util#IsEnabled('b', 'ftdetect')
   au BufNewFile,BufRead *.imp,*.mch,*.ref setf b
 endif
 
-if !has_key(s:disabled_packages, 'sql')
+if polyglot#util#IsEnabled('sql', 'ftdetect')
   au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw setf sql
 endif
 
-if !has_key(s:disabled_packages, 'gitignore')
+if polyglot#util#IsEnabled('gitignore', 'ftdetect')
   au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore setf gitignore
 endif
 
-if !has_key(s:disabled_packages, 'tads')
+if polyglot#util#IsEnabled('tads', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
 endif
 
-if !has_key(s:disabled_packages, 'prolog')
+if polyglot#util#IsEnabled('prolog', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap setf prolog
 endif
 
-if !has_key(s:disabled_packages, 'bzl')
+if polyglot#util#IsEnabled('bzl', 'ftdetect')
   au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE setf bzl
 endif
 
-if !has_key(s:disabled_packages, 'odin')
+if polyglot#util#IsEnabled('odin', 'ftdetect')
   au BufNewFile,BufRead *.odin setf odin
 endif
 
-if !has_key(s:disabled_packages, 'dosini')
+if polyglot#util#IsEnabled('dosini', 'ftdetect')
   au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec setf dosini
   au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
   au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
 endif
 
-if !has_key(s:disabled_packages, 'spec')
+if polyglot#util#IsEnabled('spec', 'ftdetect')
   au BufNewFile,BufRead *.spec setf spec
 endif
 
-if !has_key(s:disabled_packages, 'visual-basic')
+if polyglot#util#IsEnabled('visual-basic', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.bas call polyglot#detect#Bas()
   au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs setf vb
 endif
 
-if !has_key(s:disabled_packages, 'basic')
+if polyglot#util#IsEnabled('basic', 'ftdetect')
   au BufNewFile,BufRead *.basic setf basic
 endif
 
-if !has_key(s:disabled_packages, 'trasys')
+if polyglot#util#IsEnabled('trasys', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
 endif
 
-if !has_key(s:disabled_packages, 'zig')
+if polyglot#util#IsEnabled('zig', 'ftdetect')
   au BufNewFile,BufRead *.zir setf zir
   au BufNewFile,BufRead *.zig,*.zir setf zig
 endif
 
-if !has_key(s:disabled_packages, 'zephir')
+if polyglot#util#IsEnabled('zephir', 'ftdetect')
   au BufNewFile,BufRead *.zep setf zephir
 endif
 
-if !has_key(s:disabled_packages, 'help')
+if polyglot#util#IsEnabled('help', 'ftdetect')
   au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt setf help
 endif
 
-if !has_key(s:disabled_packages, 'helm')
+if polyglot#util#IsEnabled('helm', 'ftdetect')
   au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml setf helm
 endif
 
-if !has_key(s:disabled_packages, 'smarty')
+if polyglot#util#IsEnabled('smarty', 'ftdetect')
   au BufNewFile,BufRead *.tpl setf smarty
 endif
 
-if !has_key(s:disabled_packages, 'ansible')
+if polyglot#util#IsEnabled('ansible', 'ftdetect')
   au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml setf yaml.ansible
   au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
   au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
 endif
 
-if !has_key(s:disabled_packages, 'xsl')
+if polyglot#util#IsEnabled('xsl', 'ftdetect')
   au BufNewFile,BufRead *.xsl,*.xslt setf xsl
 endif
 
-if !has_key(s:disabled_packages, 'xdc')
+if polyglot#util#IsEnabled('xdc', 'ftdetect')
   au BufNewFile,BufRead *.xdc setf xdc
 endif
 
-if !has_key(s:disabled_packages, 'vue')
+if polyglot#util#IsEnabled('vue', 'ftdetect')
   au BufNewFile,BufRead *.vue,*.wpy setf vue
 endif
 
-if !has_key(s:disabled_packages, 'vmasm')
+if polyglot#util#IsEnabled('vmasm', 'ftdetect')
   au BufNewFile,BufRead *.mar setf vmasm
 endif
 
-if !has_key(s:disabled_packages, 'velocity')
+if polyglot#util#IsEnabled('velocity', 'ftdetect')
   au BufNewFile,BufRead *.vm setf velocity
 endif
 
-if !has_key(s:disabled_packages, 'vcl')
+if polyglot#util#IsEnabled('vcl', 'ftdetect')
   au BufNewFile,BufRead *.vcl setf vcl
 endif
 
-if !has_key(s:disabled_packages, 'vbnet')
+if polyglot#util#IsEnabled('vbnet', 'ftdetect')
   au BufNewFile,BufRead *.vb,*.vbhtml setf vbnet
 endif
 
-if !has_key(s:disabled_packages, 'vala')
+if polyglot#util#IsEnabled('vala', 'ftdetect')
   au BufNewFile,BufRead *.vala,*.valadoc,*.vapi setf vala
 endif
 
-if !has_key(s:disabled_packages, 'v')
+if polyglot#util#IsEnabled('v', 'ftdetect')
   au BufNewFile,BufRead *.v,*.vsh,*.vv setf vlang
 endif
 
-if !has_key(s:disabled_packages, 'unison')
+if polyglot#util#IsEnabled('unison', 'ftdetect')
   au BufNewFile,BufRead *.u,*.uu setf unison
 endif
 
-if !has_key(s:disabled_packages, 'typescript')
+if polyglot#util#IsEnabled('typescript', 'ftdetect')
   au BufNewFile,BufRead *.ts setf typescript
   au BufNewFile,BufRead *.tsx setf typescriptreact
 endif
 
-if !has_key(s:disabled_packages, 'twig')
+if polyglot#util#IsEnabled('twig', 'ftdetect')
   au BufNewFile,BufRead *.twig setf html.twig
   au BufNewFile,BufRead *.xml.twig setf xml.twig
 endif
 
-if !has_key(s:disabled_packages, 'tptp')
+if polyglot#util#IsEnabled('tptp', 'ftdetect')
   au BufNewFile,BufRead *.ax,*.p,*.tptp setf tptp
 endif
 
-if !has_key(s:disabled_packages, 'toml')
+if polyglot#util#IsEnabled('toml', 'ftdetect')
   au BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock setf toml
 endif
 
-if !has_key(s:disabled_packages, 'tmux')
+if polyglot#util#IsEnabled('tmux', 'ftdetect')
   au BufNewFile,BufRead {.,}tmux*.conf setf tmux
 endif
 
-if !has_key(s:disabled_packages, 'thrift')
+if polyglot#util#IsEnabled('thrift', 'ftdetect')
   au BufNewFile,BufRead *.thrift setf thrift
 endif
 
-if !has_key(s:disabled_packages, 'textile')
+if polyglot#util#IsEnabled('textile', 'ftdetect')
   au BufNewFile,BufRead *.textile setf textile
 endif
 
-if !has_key(s:disabled_packages, 'terraform')
+if polyglot#util#IsEnabled('terraform', 'ftdetect')
   au BufNewFile,BufRead *.tf,*.tfvars setf terraform
 endif
 
-if !has_key(s:disabled_packages, 'tf')
+if polyglot#util#IsEnabled('tf', 'ftdetect')
   au BufNewFile,BufRead *.tf,{.,}tfrc,tfrc setf tf
 endif
 
-if !has_key(s:disabled_packages, 'systemd')
+if polyglot#util#IsEnabled('systemd', 'ftdetect')
   au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf setf systemd
   au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
 endif
 
-if !has_key(s:disabled_packages, 'sxhkd')
+if polyglot#util#IsEnabled('sxhkd', 'ftdetect')
   au BufNewFile,BufRead *.sxhkdrc,sxhkdrc setf sxhkdrc
 endif
 
-if !has_key(s:disabled_packages, 'swift')
+if polyglot#util#IsEnabled('swift', 'ftdetect')
   au BufNewFile,BufRead *.swift setf swift
 endif
 
-if !has_key(s:disabled_packages, 'svg')
+if polyglot#util#IsEnabled('svg', 'ftdetect')
   au BufNewFile,BufRead *.svg setf svg
 endif
 
-if !has_key(s:disabled_packages, 'svelte')
+if polyglot#util#IsEnabled('svelte', 'ftdetect')
   au BufNewFile,BufRead *.svelte setf svelte
 endif
 
-if !has_key(s:disabled_packages, 'stylus')
+if polyglot#util#IsEnabled('stylus', 'ftdetect')
   au BufNewFile,BufRead *.styl,*.stylus setf stylus
 endif
 
-if !has_key(s:disabled_packages, 'solidity')
+if polyglot#util#IsEnabled('solidity', 'ftdetect')
   au BufNewFile,BufRead *.sol setf solidity
 endif
 
-if !has_key(s:disabled_packages, 'smt2')
+if polyglot#util#IsEnabled('smt2', 'ftdetect')
   au BufNewFile,BufRead *.smt,*.smt2 setf smt2
 endif
 
-if !has_key(s:disabled_packages, 'slime')
+if polyglot#util#IsEnabled('slime', 'ftdetect')
   au BufNewFile,BufRead *.slime setf slime
 endif
 
-if !has_key(s:disabled_packages, 'slim')
+if polyglot#util#IsEnabled('slim', 'ftdetect')
   au BufNewFile,BufRead *.slim setf slim
 endif
 
-if !has_key(s:disabled_packages, 'sh')
+if polyglot#util#IsEnabled('sh', 'ftdetect')
   au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile setf sh
   au BufNewFile,BufRead *.zsh,*/etc/zprofile,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
   au BufNewFile,BufRead .zsh* call s:StarSetf('zsh')
@@ -1910,132 +1895,132 @@ if !has_key(s:disabled_packages, 'sh')
   au BufNewFile,BufRead .zcompdump* call s:StarSetf('zsh')
 endif
 
-if !has_key(s:disabled_packages, 'scss')
+if polyglot#util#IsEnabled('scss', 'ftdetect')
   au BufNewFile,BufRead *.scss setf scss
 endif
 
-if !has_key(s:disabled_packages, 'scala')
+if polyglot#util#IsEnabled('scala', 'ftdetect')
   au BufNewFile,BufRead *.kojo,*.sc,*.scala setf scala
 endif
 
-if !has_key(s:disabled_packages, 'rust')
+if polyglot#util#IsEnabled('rust', 'ftdetect')
   au BufNewFile,BufRead *.rs,*.rs.in setf rust
 endif
 
-if !has_key(s:disabled_packages, 'brewfile')
+if polyglot#util#IsEnabled('brewfile', 'ftdetect')
   au BufNewFile,BufRead Brewfile setf brewfile
 endif
 
-if !has_key(s:disabled_packages, 'rspec')
+if polyglot#util#IsEnabled('rspec', 'ftdetect')
   au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
 endif
 
-if !has_key(s:disabled_packages, 'ruby')
+if polyglot#util#IsEnabled('ruby', 'ftdetect')
   au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Routefile,Snapfile,Thorfile,Vagrantfile,[Rr]antfile,buildfile,vagrantfile setf ruby
   au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
   au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml setf eruby
 endif
 
-if !has_key(s:disabled_packages, 'rst')
+if polyglot#util#IsEnabled('rst', 'ftdetect')
   au BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt setf rst
 endif
 
-if !has_key(s:disabled_packages, 'reason')
+if polyglot#util#IsEnabled('reason', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.re call polyglot#detect#Re()
   au BufNewFile,BufRead *.rei setf reason
 endif
 
-if !has_key(s:disabled_packages, 'razor')
+if polyglot#util#IsEnabled('razor', 'ftdetect')
   au BufNewFile,BufRead *.cshtml,*.razor setf razor
 endif
 
-if !has_key(s:disabled_packages, 'raml')
+if polyglot#util#IsEnabled('raml', 'ftdetect')
   au BufNewFile,BufRead *.raml setf raml
 endif
 
-if !has_key(s:disabled_packages, 'raku')
+if polyglot#util#IsEnabled('raku', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
   au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
   au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 setf raku
 endif
 
-if !has_key(s:disabled_packages, 'ragel')
+if polyglot#util#IsEnabled('ragel', 'ftdetect')
   au BufNewFile,BufRead *.rl setf ragel
 endif
 
-if !has_key(s:disabled_packages, 'racket')
+if polyglot#util#IsEnabled('racket', 'ftdetect')
   au BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl setf racket
 endif
 
-if !has_key(s:disabled_packages, 'r-lang')
+if polyglot#util#IsEnabled('r-lang', 'ftdetect')
   au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist setf r
   au BufNewFile,BufRead *.rd setf rhelp
 endif
 
-if !has_key(s:disabled_packages, 'qml')
+if polyglot#util#IsEnabled('qml', 'ftdetect')
   au BufNewFile,BufRead *.qbs,*.qml setf qml
 endif
 
-if !has_key(s:disabled_packages, 'qmake')
+if polyglot#util#IsEnabled('qmake', 'ftdetect')
   au BufNewFile,BufRead *.pri,*.pro setf qmake
 endif
 
-if !has_key(s:disabled_packages, 'requirements')
+if polyglot#util#IsEnabled('requirements', 'ftdetect')
   au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} setf requirements
 endif
 
-if !has_key(s:disabled_packages, 'python')
+if polyglot#util#IsEnabled('python', 'ftdetect')
   au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript setf python
 endif
 
-if !has_key(s:disabled_packages, 'purescript')
+if polyglot#util#IsEnabled('purescript', 'ftdetect')
   au BufNewFile,BufRead *.purs setf purescript
 endif
 
-if !has_key(s:disabled_packages, 'puppet')
+if polyglot#util#IsEnabled('puppet', 'ftdetect')
   au BufNewFile,BufRead *.pp,Modulefile setf puppet
   au BufNewFile,BufRead *.epp setf embeddedpuppet
 endif
 
-if !has_key(s:disabled_packages, 'pug')
+if polyglot#util#IsEnabled('pug', 'ftdetect')
   au BufNewFile,BufRead *.jade,*.pug setf pug
 endif
 
-if !has_key(s:disabled_packages, 'protobuf')
+if polyglot#util#IsEnabled('protobuf', 'ftdetect')
   au BufNewFile,BufRead *.proto setf proto
 endif
 
-if !has_key(s:disabled_packages, 'powershell')
+if polyglot#util#IsEnabled('powershell', 'ftdetect')
   au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc setf ps1
   au BufNewFile,BufRead *.ps1xml setf ps1xml
 endif
 
-if !has_key(s:disabled_packages, 'pony')
+if polyglot#util#IsEnabled('pony', 'ftdetect')
   au BufNewFile,BufRead *.pony setf pony
 endif
 
-if !has_key(s:disabled_packages, 'plantuml')
+if polyglot#util#IsEnabled('plantuml', 'ftdetect')
   au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml setf plantuml
 endif
 
-if !has_key(s:disabled_packages, 'blade')
+if polyglot#util#IsEnabled('blade', 'ftdetect')
   au BufNewFile,BufRead *.blade,*.blade.php setf blade
 endif
 
-if !has_key(s:disabled_packages, 'php')
+if polyglot#util#IsEnabled('php', 'ftdetect')
   au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.php9,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile setf php
 endif
 
-if !has_key(s:disabled_packages, 'cql')
+if polyglot#util#IsEnabled('cql', 'ftdetect')
   au BufNewFile,BufRead *.cql setf cql
 endif
 
-if !has_key(s:disabled_packages, 'pgsql')
+if polyglot#util#IsEnabled('pgsql', 'ftdetect')
   au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
 endif
 
-if !has_key(s:disabled_packages, 'perl')
+if polyglot#util#IsEnabled('perl', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
   au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
   au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
@@ -2047,20 +2032,20 @@ if !has_key(s:disabled_packages, 'perl')
   au BufNewFile,BufRead *.xs setf xs
 endif
 
-if !has_key(s:disabled_packages, 'rc')
+if polyglot#util#IsEnabled('rc', 'ftdetect')
   au BufNewFile,BufRead *.rc,*.rch setf rc
 endif
 
-if !has_key(s:disabled_packages, 'opencl')
+if polyglot#util#IsEnabled('opencl', 'ftdetect')
   au BufNewFile,BufRead *.cl,*.opencl setf opencl
 endif
 
-if !has_key(s:disabled_packages, 'octave')
+if polyglot#util#IsEnabled('octave', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
   au BufNewFile,BufRead *.oct setf octave
 endif
 
-if !has_key(s:disabled_packages, 'ocaml')
+if polyglot#util#IsEnabled('ocaml', 'ftdetect')
   au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit setf ocaml
   au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in setf omake
   au BufNewFile,BufRead *.opam,*.opam.template,opam setf opam
@@ -2072,48 +2057,48 @@ if !has_key(s:disabled_packages, 'ocaml')
   au BufNewFile,BufRead *.sexp setf sexplib
 endif
 
-if !has_key(s:disabled_packages, 'objc')
+if polyglot#util#IsEnabled('objc', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
   au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
 endif
 
-if !has_key(s:disabled_packages, 'nix')
+if polyglot#util#IsEnabled('nix', 'ftdetect')
   au BufNewFile,BufRead *.nix setf nix
 endif
 
-if !has_key(s:disabled_packages, 'nim')
+if polyglot#util#IsEnabled('nim', 'ftdetect')
   au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg setf nim
 endif
 
-if !has_key(s:disabled_packages, 'nginx')
+if polyglot#util#IsEnabled('nginx', 'ftdetect')
   au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf setf nginx
   au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
   au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
 endif
 
-if !has_key(s:disabled_packages, 'murphi')
+if polyglot#util#IsEnabled('murphi', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
 endif
 
-if !has_key(s:disabled_packages, 'moonscript')
+if polyglot#util#IsEnabled('moonscript', 'ftdetect')
   au BufNewFile,BufRead *.moon setf moon
 endif
 
-if !has_key(s:disabled_packages, 'meson')
+if polyglot#util#IsEnabled('meson', 'ftdetect')
   au BufNewFile,BufRead meson.build,meson_options.txt setf meson
   au BufNewFile,BufRead *.wrap setf dosini
 endif
 
-if !has_key(s:disabled_packages, 'mdx')
+if polyglot#util#IsEnabled('mdx', 'ftdetect')
   au BufNewFile,BufRead *.mdx setf markdown.mdx
 endif
 
-if !has_key(s:disabled_packages, 'mathematica')
+if polyglot#util#IsEnabled('mathematica', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
   au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt setf mma
 endif
 
-if !has_key(s:disabled_packages, 'mako')
+if polyglot#util#IsEnabled('mako', 'ftdetect')
   au BufNewFile,BufRead *.mako,*.mao setf mako
   au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
@@ -2121,172 +2106,172 @@ if !has_key(s:disabled_packages, 'mako')
   au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
 endif
 
-if !has_key(s:disabled_packages, 'm4')
+if polyglot#util#IsEnabled('m4', 'ftdetect')
   au BufNewFile,BufRead *.at,*.m4 setf m4
 endif
 
-if !has_key(s:disabled_packages, 'lua')
+if polyglot#util#IsEnabled('lua', 'ftdetect')
   au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc setf lua
 endif
 
-if !has_key(s:disabled_packages, 'log')
+if polyglot#util#IsEnabled('log', 'ftdetect')
   au BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log setf log
 endif
 
-if !has_key(s:disabled_packages, 'llvm')
+if polyglot#util#IsEnabled('llvm', 'ftdetect')
   au BufNewFile,BufRead *.ll setf llvm
   au BufNewFile,BufRead *.td setf tablegen
 endif
 
-if !has_key(s:disabled_packages, 'livescript')
+if polyglot#util#IsEnabled('livescript', 'ftdetect')
   au BufNewFile,BufRead *._ls,*.ls,Slakefile setf livescript
 endif
 
-if !has_key(s:disabled_packages, 'lilypond')
+if polyglot#util#IsEnabled('lilypond', 'ftdetect')
   au BufNewFile,BufRead *.ily,*.ly setf lilypond
 endif
 
-if !has_key(s:disabled_packages, 'less')
+if polyglot#util#IsEnabled('less', 'ftdetect')
   au BufNewFile,BufRead *.less setf less
 endif
 
-if !has_key(s:disabled_packages, 'ledger')
+if polyglot#util#IsEnabled('ledger', 'ftdetect')
   au BufNewFile,BufRead *.journal,*.ldg,*.ledger setf ledger
 endif
 
-if !has_key(s:disabled_packages, 'kotlin')
+if polyglot#util#IsEnabled('kotlin', 'ftdetect')
   au BufNewFile,BufRead *.kt,*.ktm,*.kts setf kotlin
 endif
 
-if !has_key(s:disabled_packages, 'julia')
+if polyglot#util#IsEnabled('julia', 'ftdetect')
   au BufNewFile,BufRead *.jl setf julia
 endif
 
-if !has_key(s:disabled_packages, 'jst')
+if polyglot#util#IsEnabled('jst', 'ftdetect')
   au BufNewFile,BufRead *.ect,*.ejs,*.jst setf jst
 endif
 
-if !has_key(s:disabled_packages, 'jsonnet')
+if polyglot#util#IsEnabled('jsonnet', 'ftdetect')
   au BufNewFile,BufRead *.jsonnet,*.libsonnet setf jsonnet
 endif
 
-if !has_key(s:disabled_packages, 'json')
+if polyglot#util#IsEnabled('json', 'ftdetect')
   au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
 endif
 
-if !has_key(s:disabled_packages, 'json5')
+if polyglot#util#IsEnabled('json5', 'ftdetect')
   au BufNewFile,BufRead *.json5 setf json5
 endif
 
-if !has_key(s:disabled_packages, 'jq')
+if polyglot#util#IsEnabled('jq', 'ftdetect')
   au BufNewFile,BufRead *.jq,{.,}jqrc setf jq
   au BufNewFile,BufRead .jqrc* call s:StarSetf('jq')
 endif
 
-if !has_key(s:disabled_packages, 'htmldjango')
+if polyglot#util#IsEnabled('htmldjango', 'ftdetect')
   au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk setf htmldjango
 endif
 
-if !has_key(s:disabled_packages, 'jenkins')
+if polyglot#util#IsEnabled('jenkins', 'ftdetect')
   au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile setf Jenkinsfile
   au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
-if !has_key(s:disabled_packages, 'ion')
+if polyglot#util#IsEnabled('ion', 'ftdetect')
   au BufNewFile,BufRead *.ion,~/.config/ion/initrc setf ion
 endif
 
-if !has_key(s:disabled_packages, 'idris2')
+if polyglot#util#IsEnabled('idris2', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
   au BufNewFile,BufRead *.ipkg,idris-response setf idris2
   au BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
 endif
 
-if !has_key(s:disabled_packages, 'idris')
+if polyglot#util#IsEnabled('idris', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
   au BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
   au BufNewFile,BufRead idris-response setf idris
 endif
 
-if !has_key(s:disabled_packages, 'icalendar')
+if polyglot#util#IsEnabled('icalendar', 'ftdetect')
   au BufNewFile,BufRead *.ics setf icalendar
 endif
 
-if !has_key(s:disabled_packages, 'i3')
+if polyglot#util#IsEnabled('i3', 'ftdetect')
   au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config setf i3config
 endif
 
-if !has_key(s:disabled_packages, 'hive')
+if polyglot#util#IsEnabled('hive', 'ftdetect')
   au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
 endif
 
-if !has_key(s:disabled_packages, 'hcl')
+if polyglot#util#IsEnabled('hcl', 'ftdetect')
   au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile setf hcl
 endif
 
-if !has_key(s:disabled_packages, 'haxe')
+if polyglot#util#IsEnabled('haxe', 'ftdetect')
   au BufNewFile,BufRead *.hx,*.hxsl setf haxe
 endif
 
-if !has_key(s:disabled_packages, 'haskell')
+if polyglot#util#IsEnabled('haskell', 'ftdetect')
   au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig setf haskell
 endif
 
-if !has_key(s:disabled_packages, 'haproxy')
+if polyglot#util#IsEnabled('haproxy', 'ftdetect')
   au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
   au BufNewFile,BufRead haproxy*.cfg* call s:StarSetf('haproxy')
 endif
 
-if !has_key(s:disabled_packages, 'handlebars')
+if polyglot#util#IsEnabled('handlebars', 'ftdetect')
   au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache setf html.mustache
   au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs setf html.handlebars
 endif
 
-if !has_key(s:disabled_packages, 'haml')
+if polyglot#util#IsEnabled('haml', 'ftdetect')
   au BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc setf haml
 endif
 
-if !has_key(s:disabled_packages, 'grub')
+if polyglot#util#IsEnabled('grub', 'ftdetect')
   au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf setf grub
 endif
 
-if !has_key(s:disabled_packages, 'groovy')
+if polyglot#util#IsEnabled('groovy', 'ftdetect')
   au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile setf groovy
 endif
 
-if !has_key(s:disabled_packages, 'graphql')
+if polyglot#util#IsEnabled('graphql', 'ftdetect')
   au BufNewFile,BufRead *.gql,*.graphql,*.graphqls setf graphql
 endif
 
-if !has_key(s:disabled_packages, 'jsx')
+if polyglot#util#IsEnabled('jsx', 'ftdetect')
   au BufNewFile,BufRead *.jsx setf javascriptreact
 endif
 
-if !has_key(s:disabled_packages, 'javascript')
+if polyglot#util#IsEnabled('javascript', 'ftdetect')
   au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
   au BufNewFile,BufRead *.flow setf flow
 endif
 
-if !has_key(s:disabled_packages, 'go')
+if polyglot#util#IsEnabled('go', 'ftdetect')
   au BufNewFile,BufRead *.go setf go
   au BufNewFile,BufRead go.mod setf gomod
   au BufNewFile,BufRead *.tmpl setf gohtmltmpl
 endif
 
-if !has_key(s:disabled_packages, 'gnuplot')
+if polyglot#util#IsEnabled('gnuplot', 'ftdetect')
   au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt setf gnuplot
 endif
 
-if !has_key(s:disabled_packages, 'gmpl')
+if polyglot#util#IsEnabled('gmpl', 'ftdetect')
   au BufNewFile,BufRead *.mod setf gmpl
 endif
 
-if !has_key(s:disabled_packages, 'glsl')
+if polyglot#util#IsEnabled('glsl', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
 endif
 
-if !has_key(s:disabled_packages, 'git')
+if polyglot#util#IsEnabled('git', 'ftdetect')
   au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules setf gitconfig
   au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
   au BufNewFile,BufRead git-rebase-todo setf gitrebase
@@ -2294,74 +2279,74 @@ if !has_key(s:disabled_packages, 'git')
   au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
 endif
 
-if !has_key(s:disabled_packages, 'gdscript')
+if polyglot#util#IsEnabled('gdscript', 'ftdetect')
   au BufNewFile,BufRead *.gd setf gdscript3
 endif
 
-if !has_key(s:disabled_packages, 'fsharp')
+if polyglot#util#IsEnabled('fsharp', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.fsi,*.fsx setf fsharp
 endif
 
-if !has_key(s:disabled_packages, 'forth')
+if polyglot#util#IsEnabled('forth', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.ft,*.fth setf forth
 endif
 
-if !has_key(s:disabled_packages, 'flatbuffers')
+if polyglot#util#IsEnabled('flatbuffers', 'ftdetect')
   au BufNewFile,BufRead *.fbs setf fbs
 endif
 
-if !has_key(s:disabled_packages, 'fish')
+if polyglot#util#IsEnabled('fish', 'ftdetect')
   au BufNewFile,BufRead *.fish setf fish
 endif
 
-if !has_key(s:disabled_packages, 'ferm')
+if polyglot#util#IsEnabled('ferm', 'ftdetect')
   au BufNewFile,BufRead *.ferm,ferm.conf setf ferm
 endif
 
-if !has_key(s:disabled_packages, 'fennel')
+if polyglot#util#IsEnabled('fennel', 'ftdetect')
   au BufNewFile,BufRead *.fnl setf fennel
 endif
 
-if !has_key(s:disabled_packages, 'erlang')
+if polyglot#util#IsEnabled('erlang', 'ftdetect')
   au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock setf erlang
 endif
 
-if !has_key(s:disabled_packages, 'emblem')
+if polyglot#util#IsEnabled('emblem', 'ftdetect')
   au BufNewFile,BufRead *.em,*.emblem setf emblem
 endif
 
-if !has_key(s:disabled_packages, 'emberscript')
+if polyglot#util#IsEnabled('emberscript', 'ftdetect')
   au BufNewFile,BufRead *.em,*.emberscript setf ember-script
 endif
 
-if !has_key(s:disabled_packages, 'elm')
+if polyglot#util#IsEnabled('elm', 'ftdetect')
   au BufNewFile,BufRead *.elm setf elm
 endif
 
-if !has_key(s:disabled_packages, 'elixir')
+if polyglot#util#IsEnabled('elixir', 'ftdetect')
   au BufNewFile,BufRead *.ex,*.exs,mix.lock setf elixir
   au BufNewFile,BufRead *.eex,*.leex setf eelixir
 endif
 
-if !has_key(s:disabled_packages, 'docker-compose')
+if polyglot#util#IsEnabled('docker-compose', 'ftdetect')
   au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml setf yaml.docker-compose
 endif
 
-if !has_key(s:disabled_packages, 'yaml')
+if polyglot#util#IsEnabled('yaml', 'ftdetect')
   au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock setf yaml
 endif
 
-if !has_key(s:disabled_packages, 'mysql')
+if polyglot#util#IsEnabled('mysql', 'ftdetect')
   au BufNewFile,BufRead *.mysql setf mysql
 endif
 
-if !has_key(s:disabled_packages, 'sed')
+if polyglot#util#IsEnabled('sed', 'ftdetect')
   au BufNewFile,BufRead *.sed setf sed
 endif
 
-if !has_key(s:disabled_packages, 'dlang')
+if polyglot#util#IsEnabled('dlang', 'ftdetect')
   au BufNewFile,BufRead *.d,*.di setf d
   au BufNewFile,BufRead *.lst setf dcov
   au BufNewFile,BufRead *.dd setf dd
@@ -2369,138 +2354,138 @@ if !has_key(s:disabled_packages, 'dlang')
   au BufNewFile,BufRead *.sdl setf dsdl
 endif
 
-if !has_key(s:disabled_packages, 'dhall')
+if polyglot#util#IsEnabled('dhall', 'ftdetect')
   au BufNewFile,BufRead *.dhall setf dhall
 endif
 
-if !has_key(s:disabled_packages, 'dart')
+if polyglot#util#IsEnabled('dart', 'ftdetect')
   au BufNewFile,BufRead *.dart,*.drt setf dart
 endif
 
-if !has_key(s:disabled_packages, 'cue')
+if polyglot#util#IsEnabled('cue', 'ftdetect')
   au BufNewFile,BufRead *.cue setf cuesheet
 endif
 
-if !has_key(s:disabled_packages, 'cucumber')
+if polyglot#util#IsEnabled('cucumber', 'ftdetect')
   au BufNewFile,BufRead *.feature,*.story setf cucumber
 endif
 
-if !has_key(s:disabled_packages, 'crystal')
+if polyglot#util#IsEnabled('crystal', 'ftdetect')
   au BufNewFile,BufRead *.cr,Projectfile setf crystal
   au BufNewFile,BufRead *.ecr setf ecrystal
 endif
 
-if !has_key(s:disabled_packages, 'cryptol')
+if polyglot#util#IsEnabled('cryptol', 'ftdetect')
   au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl setf cryptol
 endif
 
-if !has_key(s:disabled_packages, 'coffee-script')
+if polyglot#util#IsEnabled('coffee-script', 'ftdetect')
   au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile setf coffee
   au BufNewFile,BufRead *.coffee.md,*.litcoffee setf litcoffee
 endif
 
-if !has_key(s:disabled_packages, 'markdown')
+if polyglot#util#IsEnabled('markdown', 'ftdetect')
   au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr setf markdown
 endif
 
-if !has_key(s:disabled_packages, 'cmake')
+if polyglot#util#IsEnabled('cmake', 'ftdetect')
   au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt setf cmake
 endif
 
-if !has_key(s:disabled_packages, 'clojure')
+if polyglot#util#IsEnabled('clojure', 'ftdetect')
   au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config setf clojure
 endif
 
-if !has_key(s:disabled_packages, 'carp')
+if polyglot#util#IsEnabled('carp', 'ftdetect')
   au BufNewFile,BufRead *.carp setf carp
 endif
 
-if !has_key(s:disabled_packages, 'caddyfile')
+if polyglot#util#IsEnabled('caddyfile', 'ftdetect')
   au BufNewFile,BufRead Caddyfile setf caddyfile
 endif
 
-if !has_key(s:disabled_packages, 'awk')
+if polyglot#util#IsEnabled('awk', 'ftdetect')
   au BufNewFile,BufRead *.awk,*.gawk setf awk
 endif
 
-if !has_key(s:disabled_packages, 'ave')
+if polyglot#util#IsEnabled('ave', 'ftdetect')
   au BufNewFile,BufRead *.ave setf ave
 endif
 
-if !has_key(s:disabled_packages, 'autoit')
+if polyglot#util#IsEnabled('autoit', 'ftdetect')
   au BufNewFile,BufRead *.au3 setf autoit
 endif
 
-if !has_key(s:disabled_packages, 'atlas')
+if polyglot#util#IsEnabled('atlas', 'ftdetect')
   au BufNewFile,BufRead *.as,*.atl setf atlas
 endif
 
-if !has_key(s:disabled_packages, 'aspperl')
+if polyglot#util#IsEnabled('aspperl', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
 endif
 
-if !has_key(s:disabled_packages, 'aspvbs')
+if polyglot#util#IsEnabled('aspvbs', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
   au BufNewFile,BufRead,BufWritePost *.asa call polyglot#detect#Asa()
 endif
 
-if !has_key(s:disabled_packages, 'asn')
+if polyglot#util#IsEnabled('asn', 'ftdetect')
   au BufNewFile,BufRead *.asn,*.asn1 setf asn
 endif
 
-if !has_key(s:disabled_packages, 'automake')
+if polyglot#util#IsEnabled('automake', 'ftdetect')
   au BufNewFile,BufRead GNUmakefile.am,[mM]akefile.am setf automake
 endif
 
-if !has_key(s:disabled_packages, 'elf')
+if polyglot#util#IsEnabled('elf', 'ftdetect')
   au BufNewFile,BufRead *.am setf elf
 endif
 
-if !has_key(s:disabled_packages, 'make')
+if polyglot#util#IsEnabled('make', 'ftdetect')
   au BufNewFile,BufRead *.dsp,*.mak,*.mk,*[mM]akefile setf make
 endif
 
-if !has_key(s:disabled_packages, 'autohotkey')
+if polyglot#util#IsEnabled('autohotkey', 'ftdetect')
   au BufNewFile,BufRead *.ahk,*.ahkl setf autohotkey
 endif
 
-if !has_key(s:disabled_packages, 'asciidoc')
+if polyglot#util#IsEnabled('asciidoc', 'ftdetect')
   au BufNewFile,BufRead *.adoc,*.asc,*.asciidoc setf asciidoc
 endif
 
-if !has_key(s:disabled_packages, 'art')
+if polyglot#util#IsEnabled('art', 'ftdetect')
   au BufNewFile,BufRead *.art setf art
 endif
 
-if !has_key(s:disabled_packages, 'arduino')
+if polyglot#util#IsEnabled('arduino', 'ftdetect')
   au BufNewFile,BufRead *.ino,*.pde setf arduino
 endif
 
-if !has_key(s:disabled_packages, 'c/c++')
+if polyglot#util#IsEnabled('c/c++', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
   au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp setf cpp
   au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
   au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
 endif
 
-if !has_key(s:disabled_packages, 'arch')
+if polyglot#util#IsEnabled('arch', 'ftdetect')
   au BufNewFile,BufRead {.,}arch-inventory,=tagging-method setf arch
 endif
 
-if !has_key(s:disabled_packages, 'aptconf')
+if polyglot#util#IsEnabled('aptconf', 'ftdetect')
   au BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf setf aptconf
   au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
 endif
 
-if !has_key(s:disabled_packages, 'applescript')
+if polyglot#util#IsEnabled('applescript', 'ftdetect')
   au BufNewFile,BufRead *.applescript,*.scpt setf applescript
 endif
 
-if !has_key(s:disabled_packages, 'apiblueprint')
+if polyglot#util#IsEnabled('apiblueprint', 'ftdetect')
   au BufNewFile,BufRead *.apib setf apiblueprint
 endif
 
-if !has_key(s:disabled_packages, 'apache')
+if polyglot#util#IsEnabled('apache', 'ftdetect')
   au BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess setf apache
   au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
   au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
@@ -2514,101 +2499,101 @@ if !has_key(s:disabled_packages, 'apache')
   au BufNewFile,BufRead */etc/apache2/*.conf* call s:StarSetf('apache')
 endif
 
-if !has_key(s:disabled_packages, 'ant')
+if polyglot#util#IsEnabled('ant', 'ftdetect')
   au BufNewFile,BufRead build.xml setf ant
 endif
 
-if !has_key(s:disabled_packages, 'xml')
+if polyglot#util#IsEnabled('xml', 'ftdetect')
   au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
 endif
 
-if !has_key(s:disabled_packages, 'csv')
+if polyglot#util#IsEnabled('csv', 'ftdetect')
   au BufNewFile,BufRead *.csv,*.tab,*.tsv setf csv
 endif
 
-if !has_key(s:disabled_packages, 'ampl')
+if polyglot#util#IsEnabled('ampl', 'ftdetect')
   " AMPL
   au BufNewFile,BufRead *.run setf ampl
 endif
 
-if !has_key(s:disabled_packages, 'aml')
+if polyglot#util#IsEnabled('aml', 'ftdetect')
   au BufNewFile,BufRead *.aml setf aml
 endif
 
-if !has_key(s:disabled_packages, 'alsaconf')
+if polyglot#util#IsEnabled('alsaconf', 'ftdetect')
   au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc setf alsaconf
 endif
 
-if !has_key(s:disabled_packages, 'conf')
+if polyglot#util#IsEnabled('conf', 'ftdetect')
   au BufNewFile,BufRead *.conf,*/etc/hosts,auto.master,config setf conf
 endif
 
-if !has_key(s:disabled_packages, 'master')
+if polyglot#util#IsEnabled('master', 'ftdetect')
   au BufNewFile,BufRead *.mas,*.master setf master
 endif
 
-if !has_key(s:disabled_packages, 'aidl')
+if polyglot#util#IsEnabled('aidl', 'ftdetect')
   " AIDL
   au BufNewFile,BufRead *.aidl setf aidl
 endif
 
-if !has_key(s:disabled_packages, 'ahdl')
+if polyglot#util#IsEnabled('ahdl', 'ftdetect')
   " AHDL
   au BufNewFile,BufRead *.tdf setf ahdl
 endif
 
-if !has_key(s:disabled_packages, 'ada')
+if polyglot#util#IsEnabled('ada', 'ftdetect')
   " Ada (83, 9X, 95)
   au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr setf ada
 endif
 
-if !has_key(s:disabled_packages, 'acpiasl')
+if polyglot#util#IsEnabled('acpiasl', 'ftdetect')
   au BufNewFile,BufRead *.asl,*.dsl setf asl
 endif
 
-if !has_key(s:disabled_packages, 'acedb')
+if polyglot#util#IsEnabled('acedb', 'ftdetect')
   " AceDB
   au BufNewFile,BufRead *.wrm setf acedb
 endif
 
-if !has_key(s:disabled_packages, 'abel')
+if polyglot#util#IsEnabled('abel', 'ftdetect')
   " ABEL
   au BufNewFile,BufRead *.abl setf abel
 endif
 
-if !has_key(s:disabled_packages, 'abc')
+if polyglot#util#IsEnabled('abc', 'ftdetect')
   " ABC music notation
   au BufNewFile,BufRead *.abc setf abc
 endif
 
-if !has_key(s:disabled_packages, 'abaqus')
+if polyglot#util#IsEnabled('abaqus', 'ftdetect')
   au BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
 endif
 
-if !has_key(s:disabled_packages, 'abap')
+if polyglot#util#IsEnabled('abap', 'ftdetect')
   " ABAB/4
   au BufNewFile,BufRead *.abap setf abap
 endif
 
-if !has_key(s:disabled_packages, 'aap')
+if polyglot#util#IsEnabled('aap', 'ftdetect')
   " A-A-P recipe
   au BufNewFile,BufRead *.aap setf aap
 endif
 
-if !has_key(s:disabled_packages, 'a65')
+if polyglot#util#IsEnabled('a65', 'ftdetect')
   " XA65 MOS6510 cross assembler
   au BufNewFile,BufRead *.a65 setf a65
 endif
 
-if !has_key(s:disabled_packages, 'a2ps')
+if polyglot#util#IsEnabled('a2ps', 'ftdetect')
   au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc setf a2ps
 endif
 
-if !has_key(s:disabled_packages, 'cfg')
+if polyglot#util#IsEnabled('cfg', 'ftdetect')
   au BufNewFile,BufRead *.cfg,*.hgrc,*hgrc setf cfg
 endif
 
-if !has_key(s:disabled_packages, '8th')
+if polyglot#util#IsEnabled('8th', 'ftdetect')
   " 8th (Firth-derivative)
   au BufNewFile,BufRead *.8th setf 8th
 endif
@@ -2635,7 +2620,7 @@ au FileType * au! polyglot-observer
 augroup END
 
 
-if !has_key(s:disabled_packages, 'autoindent')
+if polyglot#util#IsEnabled('autoindent', 'ftdetect')
   " Code below re-implements sleuth for vim-polyglot
   let g:loaded_sleuth = 1
 
@@ -2873,24 +2858,7 @@ if !has_key(s:disabled_packages, 'autoindent')
   command! -bar -bang Sleuth call s:detect_indent()
 endif
 
-func! s:verify()
-  if exists("g:polyglot_disabled_not_set")
-    if exists("g:polyglot_disabled")
-      echohl WarningMsg
-      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
-      echohl None
-    endif
-
-    unlet g:polyglot_disabled_not_set
-  endif
-endfunc
-
-au VimEnter * call s:verify()
-
-" Save polyglot_disabled without postfixes
-if exists('g:polyglot_disabled')
-  let g:polyglot_disabled = s:new_polyglot_disabled
-endif
+au VimEnter * call polyglot#util#Verify()
 
 augroup filetypedetect
 
@@ -3486,14 +3454,14 @@ au BufNewFile,BufRead *.txt
 augroup END
 
 " Use the filetype detect plugins.  They may overrule any of the previously
-" detected filetypes.
+" detected filetypes. No need to load if everything is enabled
 if exists("did_load_filetypes") && exists("g:polyglot_disabled")
   unlet did_load_filetypes
   runtime! extras/filetype.vim
 endif
 
 
-if !has_key(s:disabled_packages, 'sensible')
+if polyglot#util#IsEnabled('sensible', 'ftdetect')
   " Reload unchanged files automatically.
   set autoread
 
diff --git a/ftplugin/8th.vim b/ftplugin/8th.vim
index befe694bb..5199a7bfd 100644
--- a/ftplugin/8th.vim
+++ b/ftplugin/8th.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/8th.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('8th', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '8th') == -1
 
 " Vim ftplugin file
 " Language:	8th
@@ -32,5 +27,3 @@ setlocal fo=tcrqol
 setlocal matchpairs+=\::;
 setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
 setlocal suffixesadd=.8th
-
-endif
diff --git a/ftplugin/a2ps.vim b/ftplugin/a2ps.vim
index d92fdf640..dfcefea79 100644
--- a/ftplugin/a2ps.vim
+++ b/ftplugin/a2ps.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/a2ps.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('a2ps', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'a2ps') == -1
 
 " Vim filetype plugin file
 " Language:             a2ps(1) configuration file
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/aap.vim b/ftplugin/aap.vim
index 2d9003180..00588ae93 100644
--- a/ftplugin/aap.vim
+++ b/ftplugin/aap.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/aap.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('aap', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aap') == -1
 
 " Vim filetype plugin file
 " Language:	Aap recipe
@@ -32,5 +27,3 @@ setlocal comments=s:#\ -,m:#\ \ ,e:#,n:#,fb:-
 
 " Expand tabs to spaces to avoid trouble.
 setlocal expandtab
-
-endif
diff --git a/ftplugin/abap.vim b/ftplugin/abap.vim
index 96ab0d560..eced7b2ba 100644
--- a/ftplugin/abap.vim
+++ b/ftplugin/abap.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/abap.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('abap', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'abap') == -1
 
 " Vim filetype plugin file
 " Language:	ABAP
@@ -36,5 +31,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set sw=4 sts=4 et tw=80 :
-
-endif
diff --git a/ftplugin/abaqus.vim b/ftplugin/abaqus.vim
index 2214d4f46..fb3bd11ed 100644
--- a/ftplugin/abaqus.vim
+++ b/ftplugin/abaqus.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/abaqus.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('abaqus', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'abaqus') == -1
 
 " Vim filetype plugin file
 " Language:     Abaqus finite element input file (www.abaqus.com)
@@ -104,5 +99,3 @@ let b:undo_ftplugin = "let s:cpo_save = &cpoptions|"
 " Restore saved compatibility options
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/ada.vim b/ftplugin/ada.vim
index 1d067182d..62d252fdd 100644
--- a/ftplugin/ada.vim
+++ b/ftplugin/ada.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ada.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ada', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ada') == -1
 
 "------------------------------------------------------------------------------
 "  Description: Perform Ada specific completion & tagging.
@@ -217,5 +212,3 @@ finish " 1}}}
 "------------------------------------------------------------------------------
 " vim: textwidth=78 nowrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
 " vim: foldmethod=marker
-
-endif
diff --git a/ftplugin/alsaconf.vim b/ftplugin/alsaconf.vim
index a481b76ac..093c2ab14 100644
--- a/ftplugin/alsaconf.vim
+++ b/ftplugin/alsaconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/alsaconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('alsaconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'alsaconf') == -1
 
 " Vim filetype plugin file
 " Language:             alsaconf(8) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/ansible.vim b/ftplugin/ansible.vim
index cef2e9c4c..e6676ccfa 100644
--- a/ftplugin/ansible.vim
+++ b/ftplugin/ansible.vim
@@ -1,13 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ansible.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 set isfname+=@-@
 set path+=./../templates,./../files,templates,files
-
-endif
diff --git a/ftplugin/ansible_hosts.vim b/ftplugin/ansible_hosts.vim
index 6f819a7ea..d6854c205 100644
--- a/ftplugin/ansible_hosts.vim
+++ b/ftplugin/ansible_hosts.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ansible_hosts.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 if exists("b:did_ftplugin")
   finish
@@ -16,5 +11,3 @@ endif
 setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions-=c
 
 let b:undo_ftplugin = "setl comments< commentstring< formatoptions<"
-
-endif
diff --git a/ftplugin/ant.vim b/ftplugin/ant.vim
index 184818a59..799e03ec3 100644
--- a/ftplugin/ant.vim
+++ b/ftplugin/ant.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ant.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ant', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ant') == -1
 
 " Vim filetype plugin file
 " Language:	ant
@@ -51,5 +46,3 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/arch.vim b/ftplugin/arch.vim
index 5910287e9..755963a5c 100644
--- a/ftplugin/arch.vim
+++ b/ftplugin/arch.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/arch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('arch', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arch') == -1
 
 " Vim filetype plugin file
 " Language:             GNU Arch inventory file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/art.vim b/ftplugin/art.vim
index edbc86a39..7b1c43984 100644
--- a/ftplugin/art.vim
+++ b/ftplugin/art.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/art.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('art', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'art') == -1
 
 " Vim filetype plugin
 " Language:      ART-IM and ART*Enterprise
@@ -22,5 +17,3 @@ run ftplugin/lisp.vim
 
 setl lw-=if
 setl lw+=def-art-fun,deffacts,defglobal,defrule,defschema,for,schema,while
-
-endif
diff --git a/ftplugin/aspvbs.vim b/ftplugin/aspvbs.vim
index 4899bfb33..03f38e298 100644
--- a/ftplugin/aspvbs.vim
+++ b/ftplugin/aspvbs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/aspvbs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('aspvbs', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aspvbs') == -1
 
 " Vim filetype plugin file
 " Language:	aspvbs
@@ -67,5 +62,3 @@ let b:undo_ftplugin = "unlet! b:match_words b:match_ignorecase b:browsefilter |
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/automake.vim b/ftplugin/automake.vim
index ed47025ce..f3e317579 100644
--- a/ftplugin/automake.vim
+++ b/ftplugin/automake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/automake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('automake', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'automake') == -1
 
 " Vim filetype plugin file
 " Language:             Automake
@@ -23,5 +18,3 @@ runtime! ftplugin/make.vim ftplugin/make_*.vim ftplugin/make/*.vim
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/awk.vim b/ftplugin/awk.vim
index 9bbeb2769..9ff6adf6b 100644
--- a/ftplugin/awk.vim
+++ b/ftplugin/awk.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/awk.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('awk', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'awk') == -1
 
 " Vim filetype plugin
 " Language:	awk, nawk, gawk, mawk
@@ -62,5 +57,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8
-
-endif
diff --git a/ftplugin/bdf.vim b/ftplugin/bdf.vim
index 74b508717..aaf1def01 100644
--- a/ftplugin/bdf.vim
+++ b/ftplugin/bdf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/bdf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bdf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bdf') == -1
 
 " Vim filetype plugin file
 " Language:             BDF font definition
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/blade.vim b/ftplugin/blade.vim
index 4fa102d9e..ee75475e2 100644
--- a/ftplugin/blade.vim
+++ b/ftplugin/blade.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/blade.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('blade', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 
 " Vim filetype plugin
 " Language:     Blade (Laravel)
@@ -40,5 +35,3 @@ if exists('loaded_matchit') && exists('b:match_words')
     let b:match_skip = 'synIDattr(synID(line("."), col("."), 0), "name") !=# "bladeKeyword"'
     let b:match_ignorecase = 0
 endif
-
-endif
diff --git a/ftplugin/bst.vim b/ftplugin/bst.vim
index 2539a1090..26555cc7d 100644
--- a/ftplugin/bst.vim
+++ b/ftplugin/bst.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/bst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bst') == -1
 
 " Vim filetype plugin file
 " Language:	bst
@@ -22,5 +17,3 @@ setlocal comments=:%
 setlocal fo-=t fo+=croql
 
 let b:undo_ftplugin = "setlocal com< cms< fo<"
-
-endif
diff --git a/ftplugin/bzl.vim b/ftplugin/bzl.vim
index 69c95d1d0..71b7ceaa0 100644
--- a/ftplugin/bzl.vim
+++ b/ftplugin/bzl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/bzl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bzl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
 
 " Vim filetype plugin file
 " Language:	Bazel (http://bazel.io)
@@ -101,5 +96,3 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/caddyfile.vim b/ftplugin/caddyfile.vim
index f9725ee2a..206ed69e9 100644
--- a/ftplugin/caddyfile.vim
+++ b/ftplugin/caddyfile.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/caddyfile.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('caddyfile', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
 
 " Language:	    Caddyfile
 " Author:	    Josh Glendenning <josh@isobit.io>
@@ -31,5 +26,3 @@ else
 	let g:NERDCustomDelimiters = {'caddyfile': s:delimiters}
 endif
 unlet s:delimiters
-
-endif
diff --git a/ftplugin/calendar.vim b/ftplugin/calendar.vim
index 12f843941..732627594 100644
--- a/ftplugin/calendar.vim
+++ b/ftplugin/calendar.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/calendar.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('calendar', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'calendar') == -1
 
 " Vim filetype plugin file
 " Language:             calendar(1) input file
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/cdrdaoconf.vim b/ftplugin/cdrdaoconf.vim
index f048ef9f2..1f6fccdf6 100644
--- a/ftplugin/cdrdaoconf.vim
+++ b/ftplugin/cdrdaoconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/cdrdaoconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cdrdaoconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdrdaoconf') == -1
 
 " Vim filetype plugin file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
@@ -25,5 +20,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/cfg.vim b/ftplugin/cfg.vim
index 6ed841bb1..2291a2690 100644
--- a/ftplugin/cfg.vim
+++ b/ftplugin/cfg.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/cfg.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cfg', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cfg') == -1
 
 " Vim filetype plugin file
 " Language:		Configuration File
@@ -26,5 +21,3 @@ setlocal commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/ch.vim b/ftplugin/ch.vim
index cd71d7ecf..95865364a 100644
--- a/ftplugin/ch.vim
+++ b/ftplugin/ch.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ch', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ch') == -1
 
 " Vim filetype plugin file
 " Language:     Ch
@@ -24,5 +19,3 @@ endif
 
 " Behaves just like C
 runtime! ftplugin/c.vim ftplugin/c_*.vim ftplugin/c/*.vim
-
-endif
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 6862f35d0..641aaac18 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/clojure.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('clojure', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 
 " Vim filetype plugin file
 " Language:     Clojure
@@ -102,5 +97,3 @@ let &cpo = s:cpo_save
 unlet! s:cpo_save s:setting s:dir
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif
diff --git a/ftplugin/cobol.vim b/ftplugin/cobol.vim
index 1441dfb03..89bb817ab 100644
--- a/ftplugin/cobol.vim
+++ b/ftplugin/cobol.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/cobol.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cobol', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cobol') == -1
 
 " Vim filetype plugin file
 " Language:	cobol
@@ -276,5 +271,3 @@ function! s:toend(direction)
         exe "keepjumps ".keep
     endif
 endfunction
-
-endif
diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim
index 84fa245cc..9a493b96d 100644
--- a/ftplugin/coffee.vim
+++ b/ftplugin/coffee.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/coffee.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -412,5 +407,3 @@ command! -buffer -range=% -bar -nargs=* CoffeeRun
 \        call s:CoffeeRun(<line1>, <line2>, <q-args>)
 command! -buffer -range=% -bang -bar -nargs=* CoffeeLint
 \        call s:CoffeeLint(<line1>, <line2>, <q-bang>, <q-args>)
-
-endif
diff --git a/ftplugin/conf.vim b/ftplugin/conf.vim
index 244827cbe..8ba8a0bd3 100644
--- a/ftplugin/conf.vim
+++ b/ftplugin/conf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/conf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('conf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'conf') == -1
 
 " Vim filetype plugin file
 " Language:             generic configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/config.vim b/ftplugin/config.vim
index dbd82347f..dd85e65d8 100644
--- a/ftplugin/config.vim
+++ b/ftplugin/config.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/config.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('config', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'config') == -1
 
 " Vim filetype plugin file
 " Language:	config
@@ -49,5 +44,3 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . b:undo_ftplugin
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/crm.vim b/ftplugin/crm.vim
index 0ca01cd8a..46388ca1c 100644
--- a/ftplugin/crm.vim
+++ b/ftplugin/crm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/crm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crm') == -1
 
 " Vim filetype plugin file
 " Language:             CRM114
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/cryptol/folding.vim b/ftplugin/cryptol/folding.vim
index 1dcdc109d..717ecadba 100644
--- a/ftplugin/cryptol/folding.vim
+++ b/ftplugin/cryptol/folding.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/cryptol/folding.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cryptol', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
 
 " Copyright © 2013 Edward O'Callaghan. All Rights Reserved.
 
@@ -53,5 +48,3 @@ function! GetPotionFold(lnum)
         return '>' . next_indent
     endif
 endfunction
-
-endif
diff --git a/ftplugin/crystal.vim b/ftplugin/crystal.vim
index 5f4e981b2..7f3914344 100644
--- a/ftplugin/crystal.vim
+++ b/ftplugin/crystal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/crystal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 if exists('b:did_ftplugin')
   finish
@@ -90,5 +85,3 @@ if exists('g:AutoPairsLoaded')
 endif
 
 " vim: sw=2 sts=2 et:
-
-endif
diff --git a/ftplugin/cs.vim b/ftplugin/cs.vim
index 9ee462312..cfefde110 100644
--- a/ftplugin/cs.vim
+++ b/ftplugin/cs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/cs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cs', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
 
 " Vim filetype plugin file
 " Language:	C#
@@ -36,5 +31,3 @@ endif
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/ftplugin/csc.vim b/ftplugin/csc.vim
index b0648a81a..a596b93d7 100644
--- a/ftplugin/csc.vim
+++ b/ftplugin/csc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/csc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('csc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csc') == -1
 
 " Vim filetype plugin file
 " Language:	csc
@@ -34,5 +29,3 @@ let b:undo_ftplugin = "unlet! b:match_words"
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/css.vim b/ftplugin/css.vim
index 50d8f7145..6c8a3562b 100644
--- a/ftplugin/css.vim
+++ b/ftplugin/css.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/css.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('css', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'css') == -1
 
 " Vim filetype plugin file
 " Language:		CSS
@@ -31,5 +26,3 @@ let &l:include = '^\s*@import\s\+\%(url(\)\='
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/csv.vim b/ftplugin/csv.vim
index 40d5f95c8..f479a6ffb 100644
--- a/ftplugin/csv.vim
+++ b/ftplugin/csv.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/csv.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('csv', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csv') == -1
 
 " Filetype plugin for editing CSV files. "{{{1
 " Author:  Christian Brabandt <cb@256bit.org>
@@ -41,5 +36,3 @@ unlet s:cpo_save
 
 " Vim Modeline " {{{2
 " vim: set foldmethod=marker et sw=0 sts=-1 ts=4:
-
-endif
diff --git a/ftplugin/cucumber.vim b/ftplugin/cucumber.vim
index 942467910..ab1e52fad 100644
--- a/ftplugin/cucumber.vim
+++ b/ftplugin/cucumber.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/cucumber.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cucumber', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 
 " Vim filetype plugin
 " Language:	Cucumber
@@ -157,5 +152,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:set sts=2 sw=2:
-
-endif
diff --git a/ftplugin/cvsrc.vim b/ftplugin/cvsrc.vim
index 84d059d77..a80491428 100644
--- a/ftplugin/cvsrc.vim
+++ b/ftplugin/cvsrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/cvsrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cvsrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cvsrc') == -1
 
 " Vim filetype plugin file
 " Language:             cvs(1) RC file
@@ -26,5 +21,3 @@ setlocal comments= commentstring= formatoptions-=tcroql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim
index 52ac5bae1..b402543de 100644
--- a/ftplugin/dart.vim
+++ b/ftplugin/dart.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/dart.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dart', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 
 if exists('b:did_ftplugin')
   finish
@@ -37,5 +32,3 @@ setlocal isfname+=:
 setlocal iskeyword+=$
 
 let b:undo_ftplugin = 'setl et< fo< sw< sts< com< cms< inex< isf<'
-
-endif
diff --git a/ftplugin/debchangelog.vim b/ftplugin/debchangelog.vim
index ba8b046b8..13904dc90 100644
--- a/ftplugin/debchangelog.vim
+++ b/ftplugin/debchangelog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/debchangelog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('debchangelog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debchangelog') == -1
 
 " Vim filetype plugin file (GUI menu, folding and completion)
 " Language:     Debian Changelog
@@ -390,5 +385,3 @@ setlocal omnifunc=DebCompleteBugs
 " }}}
 
 " vim: set foldmethod=marker:
-
-endif
diff --git a/ftplugin/debcontrol.vim b/ftplugin/debcontrol.vim
index 767fbb8ff..e6109e737 100644
--- a/ftplugin/debcontrol.vim
+++ b/ftplugin/debcontrol.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/debcontrol.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('debcontrol', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debcontrol') == -1
 
 " Vim filetype plugin file (GUI menu and folding)
 " Language:     Debian control files
@@ -77,5 +72,3 @@ function! DebControlFold(l)
 endfunction
 
 " }}}1
-
-endif
diff --git a/ftplugin/denyhosts.vim b/ftplugin/denyhosts.vim
index 35f1245b7..41a54a12a 100644
--- a/ftplugin/denyhosts.vim
+++ b/ftplugin/denyhosts.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/denyhosts.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('denyhosts', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'denyhosts') == -1
 
 " Vim filetype plugin file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
@@ -25,5 +20,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/dhall.vim b/ftplugin/dhall.vim
index 76a6bd224..d0a702ea5 100644
--- a/ftplugin/dhall.vim
+++ b/ftplugin/dhall.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/dhall.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dhall', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dhall') == -1
 
 if exists('b:dhall_ftplugin')
 	finish
@@ -50,5 +45,3 @@ if exists('g:dhall_format')
 endif
 
 au BufNewFile,BufRead *.dhall setl shiftwidth=2
-
-endif
diff --git a/ftplugin/dictconf.vim b/ftplugin/dictconf.vim
index 2b5467ce2..048a49180 100644
--- a/ftplugin/dictconf.vim
+++ b/ftplugin/dictconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/dictconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dictconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictconf') == -1
 
 " Vim filetype plugin file
 " Language:             dict(1) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/dictdconf.vim b/ftplugin/dictdconf.vim
index 2d404814e..6b3c11747 100644
--- a/ftplugin/dictdconf.vim
+++ b/ftplugin/dictdconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/dictdconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dictdconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictdconf') == -1
 
 " Vim filetype plugin file
 " Language:             dictd(8) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/diff.vim b/ftplugin/diff.vim
index d6ff42bc0..7a04c881e 100644
--- a/ftplugin/diff.vim
+++ b/ftplugin/diff.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/diff.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('diff', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'diff') == -1
 
 " Vim filetype plugin file
 " Language:	Diff
@@ -25,5 +20,3 @@ setlocal nomodeline
 
 " If there are comments they start with #
 let &commentstring = "# %s"
-
-endif
diff --git a/ftplugin/dircolors.vim b/ftplugin/dircolors.vim
index 9043b6490..1ae606485 100644
--- a/ftplugin/dircolors.vim
+++ b/ftplugin/dircolors.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/dircolors.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dircolors', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dircolors') == -1
 
 " Vim filetype plugin file
 " Language:             dircolors(1) input file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/docker-compose.vim b/ftplugin/docker-compose.vim
index df33d6fda..89cc86475 100644
--- a/ftplugin/docker-compose.vim
+++ b/ftplugin/docker-compose.vim
@@ -1,16 +1,9 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/docker-compose.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('docker-compose', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'docker-compose') == -1
 
 " Define comment string
 setlocal commentstring=#\ %s
 
 " Enable automatic comment insertion
 setlocal formatoptions+=cro
-
-endif
diff --git a/ftplugin/dockerfile.vim b/ftplugin/dockerfile.vim
index 950a48bc5..62d99f39d 100644
--- a/ftplugin/dockerfile.vim
+++ b/ftplugin/dockerfile.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/dockerfile.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dockerfile', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
 
 " Vim filetype plugin
 " Language:	Dockerfile
@@ -23,5 +18,3 @@ let b:did_ftplugin = 1
 let b:undo_ftplugin = "setl commentstring<"
 
 setlocal commentstring=#\ %s
-
-endif
diff --git a/ftplugin/dosbatch.vim b/ftplugin/dosbatch.vim
index ada068653..902ed8f72 100644
--- a/ftplugin/dosbatch.vim
+++ b/ftplugin/dosbatch.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/dosbatch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dosbatch', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosbatch') == -1
 
 " Vim filetype plugin file
 " Language:    MS-DOS .bat files
@@ -47,5 +42,3 @@ let b:undo_ftplugin = "setlocal comments< formatoptions< keywordprg<"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/dosini.vim b/ftplugin/dosini.vim
index 1a841bf67..394b98bdd 100644
--- a/ftplugin/dosini.vim
+++ b/ftplugin/dosini.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/dosini.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dosini', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosini') == -1
 
 " Vim filetype plugin file
 " Language:             Configuration File (ini file) for MSDOS/MS Windows
@@ -26,5 +21,3 @@ setlocal comments=:; commentstring=;\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/dtd.vim b/ftplugin/dtd.vim
index 26ad5061b..d428a845c 100644
--- a/ftplugin/dtd.vim
+++ b/ftplugin/dtd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/dtd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dtd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dtd') == -1
 
 " Vim filetype plugin file
 " Language:	dtd
@@ -47,5 +42,3 @@ let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions<" .
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/dune.vim b/ftplugin/dune.vim
index fde69ca6f..4454e1d2a 100644
--- a/ftplugin/dune.vim
+++ b/ftplugin/dune.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/dune.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 if exists("b:did_ftplugin")
   finish
@@ -17,5 +12,3 @@ set lisp
 " Comment string
 setl commentstring=;\ %s
 setl comments=:;
-
-endif
diff --git a/ftplugin/ecrystal.vim b/ftplugin/ecrystal.vim
index d4854095c..5057546de 100644
--- a/ftplugin/ecrystal.vim
+++ b/ftplugin/ecrystal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ecrystal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " Filetype plugin for https://crystal-lang.org/api/0.35.1/ECR.html
 if exists('b:did_ftplugin')
@@ -104,5 +99,3 @@ let b:undo_ftplugin = 'setlocal comments< commentstring< shiftwidth<' .
       \ '| unlet! b:browsefilter b:match_words ' .
       \ '| unlet! b:AutoPairs ' .
       \ '| ' . s:undo_ftplugin
-
-endif
diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index 764ded0d1..914a5d704 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/eelixir.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists("b:did_ftplugin")
   finish
@@ -114,5 +109,3 @@ let b:undo_ftplugin = "setl cms< " .
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 
 let &cpo = s:save_cpo
-
-endif
diff --git a/ftplugin/elinks.vim b/ftplugin/elinks.vim
index ed6cdd681..ca68f8475 100644
--- a/ftplugin/elinks.vim
+++ b/ftplugin/elinks.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/elinks.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elinks', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elinks') == -1
 
 " Vim filetype plugin file
 " Language:             elinks(1) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index db05c990d..d16a45d8c 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/elixir.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists('b:did_ftplugin')
   finish
@@ -58,5 +53,3 @@ onoremap <buffer> <silent> <expr> [] ':silent keeppatterns ?'.b:block_end  .'<CR
 
 let b:undo_ftplugin = 'setlocal sw< sts< et< isk< com< cms< path< inex< sua< def< fo<'.
       \ '| unlet! b:match_ignorecase b:match_words b:block_begin b:block_end'
-
-endif
diff --git a/ftplugin/embeddedpuppet.vim b/ftplugin/embeddedpuppet.vim
index c369e5c34..344e93ae3 100644
--- a/ftplugin/embeddedpuppet.vim
+++ b/ftplugin/embeddedpuppet.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/embeddedpuppet.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Vim filetype plugin
 " Language:             embedded puppet
@@ -82,5 +77,3 @@ let b:undo_ftplugin = "setl cms< "
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-
-endif
diff --git a/ftplugin/ember-script.vim b/ftplugin/ember-script.vim
index 41f534424..792e38865 100644
--- a/ftplugin/ember-script.vim
+++ b/ftplugin/ember-script.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ember-script.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('emberscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
 
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
@@ -28,5 +23,3 @@ else
 endif
 setlocal comments=:#
 setlocal commentstring=#\ %s
-
-endif
diff --git a/ftplugin/emblem.vim b/ftplugin/emblem.vim
index 655c843b8..3351f5331 100644
--- a/ftplugin/emblem.vim
+++ b/ftplugin/emblem.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/emblem.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('emblem', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
@@ -24,5 +19,3 @@ setlocal smartindent
 setlocal formatoptions=q
 setlocal comments=:/
 setlocal commentstring=/\ %s
-
-endif
diff --git a/ftplugin/eruby.vim b/ftplugin/eruby.vim
index 3dc549ed6..f6a8e6598 100644
--- a/ftplugin/eruby.vim
+++ b/ftplugin/eruby.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/eruby.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim filetype plugin
 " Language:		eRuby
@@ -138,5 +133,3 @@ function! ErubyAtCursor() abort
 endfunction
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/ftplugin/eterm.vim b/ftplugin/eterm.vim
index 135d75f83..fc163ccfb 100644
--- a/ftplugin/eterm.vim
+++ b/ftplugin/eterm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/eterm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('eterm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'eterm') == -1
 
 " Vim filetype plugin file
 " Language:             eterm(1) configuration file
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/falcon.vim b/ftplugin/falcon.vim
index d278f58c1..5eeab00fd 100644
--- a/ftplugin/falcon.vim
+++ b/ftplugin/falcon.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/falcon.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('falcon', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'falcon') == -1
 
 " Vim filetype plugin file
 " Language:     Falcon
@@ -56,5 +51,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set sw=4 sts=4 et tw=80 :
-
-endif
diff --git a/ftplugin/fennel.vim b/ftplugin/fennel.vim
index 5fb9afb69..926bc8790 100644
--- a/ftplugin/fennel.vim
+++ b/ftplugin/fennel.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/fennel.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fennel', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fennel') == -1
 
 " Vim filetype plugin file
 " Language: FENNEL
@@ -33,5 +28,3 @@ setlocal comments=n:;
 setlocal commentstring=;\ %s
 
 let &cpo = s:cpo_save
-
-endif
diff --git a/ftplugin/fetchmail.vim b/ftplugin/fetchmail.vim
index a995bdfde..eaaf3e25c 100644
--- a/ftplugin/fetchmail.vim
+++ b/ftplugin/fetchmail.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/fetchmail.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fetchmail', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fetchmail') == -1
 
 " Vim filetype plugin file
 " Language:             fetchmail(1) RC File
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
index e79c0669e..8ead1ce33 100644
--- a/ftplugin/fish.vim
+++ b/ftplugin/fish.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/fish.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fish', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 
 setlocal comments=:#
 setlocal commentstring=#%s
@@ -45,5 +40,3 @@ let b:match_words =
 let b:endwise_addition = 'end'
 let b:endwise_words = 'begin,function,if,switch,while,for'
 let b:endwise_syngroups = 'fishKeyword,fishConditional,fishRepeat'
-
-endif
diff --git a/ftplugin/fortran.vim b/ftplugin/fortran.vim
index 4c7d7cdf9..b951347c8 100644
--- a/ftplugin/fortran.vim
+++ b/ftplugin/fortran.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/fortran.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fortran', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
 
 " Vim settings file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, 77, 66)
@@ -140,5 +135,3 @@ let &cpoptions=s:cposet
 unlet s:cposet
 
 " vim:sw=2
-
-endif
diff --git a/ftplugin/framescript.vim b/ftplugin/framescript.vim
index 4ad99bf33..514f3c946 100644
--- a/ftplugin/framescript.vim
+++ b/ftplugin/framescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/framescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('framescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'framescript') == -1
 
 " Vim ftplugin file
 " Language:             FrameScript
@@ -37,5 +32,3 @@ endif
 
 let &cpo = s:cpo_save 
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/fvwm.vim b/ftplugin/fvwm.vim
index 201a28b58..0f6de2db8 100644
--- a/ftplugin/fvwm.vim
+++ b/ftplugin/fvwm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/fvwm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fvwm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fvwm') == -1
 
 " Created	: Tue 09 May 2006 02:07:31 PM CDT
 " Modified	: Tue 09 May 2006 02:07:31 PM CDT
@@ -21,5 +16,3 @@ let b:undo_ftplugin = "setl com< cms< fo<"
 
 setlocal comments=:# commentstring=#\ %s
 setlocal formatoptions-=t formatoptions+=croql
-
-endif
diff --git a/ftplugin/gdb.vim b/ftplugin/gdb.vim
index 1f4ed1a8d..03fe25654 100644
--- a/ftplugin/gdb.vim
+++ b/ftplugin/gdb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/gdb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gdb', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdb') == -1
 
 " Vim filetype plugin file
 " Language:	gdb
@@ -19,5 +14,3 @@ setlocal commentstring=#%s
 
 " Undo the stuff we changed.
 let b:undo_ftplugin = "setlocal cms<"
-
-endif
diff --git a/ftplugin/git.vim b/ftplugin/git.vim
index 78352e841..13ae96b6f 100644
--- a/ftplugin/git.vim
+++ b/ftplugin/git.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/git.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim filetype plugin
 " Language:	generic git output
@@ -48,5 +43,3 @@ endif
 
 setlocal includeexpr=substitute(v:fname,'^[^/]\\+/','','')
 let b:undo_ftplugin = "setl keywordprg< path< includeexpr<"
-
-endif
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim
index cc5c4208f..47f82b176 100644
--- a/ftplugin/gitcommit.vim
+++ b/ftplugin/gitcommit.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/gitcommit.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim filetype plugin
 " Language:	git commit file
@@ -74,5 +69,3 @@ function! s:gitdiffcached(bang,gitdir,...)
   nnoremap <buffer> <silent> q :q<CR>
   setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git
 endfunction
-
-endif
diff --git a/ftplugin/gitconfig.vim b/ftplugin/gitconfig.vim
index f9a935d9d..44f66a294 100644
--- a/ftplugin/gitconfig.vim
+++ b/ftplugin/gitconfig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/gitconfig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim filetype plugin
 " Language:	git config file
@@ -22,5 +17,3 @@ setlocal formatoptions-=t formatoptions+=croql
 setlocal comments=:#,:; commentstring=;\ %s
 
 let b:undo_ftplugin = "setl fo< com< cms<"
-
-endif
diff --git a/ftplugin/gitignore.vim b/ftplugin/gitignore.vim
index ce45c58f6..48495472b 100644
--- a/ftplugin/gitignore.vim
+++ b/ftplugin/gitignore.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/gitignore.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gitignore', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
 
 scriptencoding utf-8
 
@@ -23,5 +18,3 @@ setlocal commentstring=#\ %s
 let b:undo_ftplugin = 'setlocal commentstring<'
 
 " vim: ts=2 et sw=2
-
-endif
diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim
index 8e2178066..c07554e07 100644
--- a/ftplugin/gitrebase.vim
+++ b/ftplugin/gitrebase.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/gitrebase.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim filetype plugin
 " Language:	git rebase --interactive
@@ -55,5 +50,3 @@ nnoremap <buffer> <silent> <C-A> :<C-U><C-R>=v:count1<CR>Cycle<CR>
 nnoremap <buffer> <silent> <C-X> :<C-U><C-R>=v:count1<CR>Cycle!<CR>
 
 let b:undo_ftplugin = b:undo_ftplugin . "|exe 'nunmap <buffer> K'|exe 'nunmap <buffer> <C-A>'|exe 'nunmap <buffer> <C-X>'"
-
-endif
diff --git a/ftplugin/gitsendemail.vim b/ftplugin/gitsendemail.vim
index 1ef62bd35..a8e269956 100644
--- a/ftplugin/gitsendemail.vim
+++ b/ftplugin/gitsendemail.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/gitsendemail.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim filetype plugin
 " Language:	git send-email message
@@ -13,5 +8,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 " Last Change:	2009 Dec 24
 
 runtime! ftplugin/mail.vim
-
-endif
diff --git a/ftplugin/gpg.vim b/ftplugin/gpg.vim
index 8d142e8bd..9089768ce 100644
--- a/ftplugin/gpg.vim
+++ b/ftplugin/gpg.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/gpg.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gpg', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gpg') == -1
 
 " Vim filetype plugin file
 " Language:             gpg(1) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim
index 6a3cbf30c..56b29f892 100644
--- a/ftplugin/graphql.vim
+++ b/ftplugin/graphql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/graphql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
 "
@@ -44,5 +39,3 @@ setlocal shiftwidth=2
 setlocal expandtab
 
 let b:undo_ftplugin = 'setlocal com< cms< fo< isk< sts< sw< et<'
-
-endif
diff --git a/ftplugin/groovy.vim b/ftplugin/groovy.vim
index ae879781d..cf78a14e8 100644
--- a/ftplugin/groovy.vim
+++ b/ftplugin/groovy.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/groovy.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('groovy', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy') == -1
 
 " Vim filetype plugin file
 " Language:	groovy
@@ -26,5 +21,3 @@ setlocal commentstring=//%s
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/group.vim b/ftplugin/group.vim
index 92aa848fe..357f43cfb 100644
--- a/ftplugin/group.vim
+++ b/ftplugin/group.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/group.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('group', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'group') == -1
 
 " Vim filetype plugin file
 " Language:             group(5) user group file
@@ -26,5 +21,3 @@ setlocal comments= commentstring= formatoptions-=tcroq formatoptions+=l
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/grub.vim b/ftplugin/grub.vim
index fe1a3fbdf..d707032b1 100644
--- a/ftplugin/grub.vim
+++ b/ftplugin/grub.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/grub.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('grub', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'grub') == -1
 
 " Vim filetype plugin file
 " Language:             grub(8) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/haml.vim b/ftplugin/haml.vim
index c262cc3ad..95b57af69 100644
--- a/ftplugin/haml.vim
+++ b/ftplugin/haml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/haml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 
 " Vim filetype plugin
 " Language:	Haml
@@ -78,5 +73,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/hamster.vim b/ftplugin/hamster.vim
index 341a762da..780774332 100644
--- a/ftplugin/hamster.vim
+++ b/ftplugin/hamster.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/hamster.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hamster', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hamster') == -1
 
 " Vim filetype plugin
 " Language:    Hamster Script
@@ -69,5 +64,3 @@ setlocal ignorecase
 let &cpo = s:cpo_save
 unlet s:cpo_save
 setlocal cpo+=M		" makes \%( match \)
-
-endif
diff --git a/ftplugin/handlebars.vim b/ftplugin/handlebars.vim
index 2dfb1aebd..0ebcc9b73 100644
--- a/ftplugin/handlebars.vim
+++ b/ftplugin/handlebars.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/handlebars.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 if exists('b:loaded_mustache_handlebars')
   finish
@@ -130,5 +125,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nofoldenable
-
-endif
diff --git a/ftplugin/hcl.vim b/ftplugin/hcl.vim
index 1c5a830a7..8c55f9a5c 100644
--- a/ftplugin/hcl.vim
+++ b/ftplugin/hcl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/hcl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hcl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hcl') == -1
 
 " File: ftplugin/hcl.vim
 " Author: BABAROT <b4b4r07@gmail.com>
@@ -44,5 +39,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: set et sw=4 ts=4:
-
-endif
diff --git a/ftplugin/help.vim b/ftplugin/help.vim
index b320d73ad..dcb63826c 100644
--- a/ftplugin/help.vim
+++ b/ftplugin/help.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/help.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('help', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'help') == -1
 
 " Vim filetype plugin file
 " Language:             Vim help file
@@ -104,5 +99,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/hgcommit.vim b/ftplugin/hgcommit.vim
index fbcf61436..d101a6254 100644
--- a/ftplugin/hgcommit.vim
+++ b/ftplugin/hgcommit.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/hgcommit.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hgcommit', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hgcommit') == -1
 
 " Vim filetype plugin file
 " Language:	hg (Mercurial) commit file
@@ -23,5 +18,3 @@ let b:did_ftplugin = 1
 setlocal nomodeline
 
 let b:undo_ftplugin = 'setl modeline<'
-
-endif
diff --git a/ftplugin/hive.vim b/ftplugin/hive.vim
index f5884dd82..e1fe2dff5 100644
--- a/ftplugin/hive.vim
+++ b/ftplugin/hive.vim
@@ -1,13 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/hive.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hive', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hive') == -1
 
 setlocal comments=:--
 setlocal commentstring=--\ %s
-
-endif
diff --git a/ftplugin/hog.vim b/ftplugin/hog.vim
index edceb700c..4b198d704 100644
--- a/ftplugin/hog.vim
+++ b/ftplugin/hog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/hog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hog') == -1
 
 " Vim filetype plugin
 " Language:     hog (snort.conf)
@@ -46,5 +41,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/hostconf.vim b/ftplugin/hostconf.vim
index badef7eec..bb680b8ec 100644
--- a/ftplugin/hostconf.vim
+++ b/ftplugin/hostconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/hostconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hostconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hostconf') == -1
 
 " Vim filetype plugin file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
@@ -25,5 +20,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/hostsaccess.vim b/ftplugin/hostsaccess.vim
index 60216fac1..1617577b9 100644
--- a/ftplugin/hostsaccess.vim
+++ b/ftplugin/hostsaccess.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/hostsaccess.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hostsaccess', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hostsaccess') == -1
 
 " Vim filetype plugin file
 " Language:             hosts_access(5) control file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index df1e6a283..b48d0cd77 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/html.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('html', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html') == -1
 
 " Vim filetype plugin file
 " Language:	html
@@ -58,5 +53,3 @@ let b:undo_ftplugin = "setlocal commentstring< matchpairs< omnifunc< comments< f
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/htmldjango.vim b/ftplugin/htmldjango.vim
index 3e512e675..6da812a41 100644
--- a/ftplugin/htmldjango.vim
+++ b/ftplugin/htmldjango.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/htmldjango.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('htmldjango', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
 
 " Vim filetype plugin file
 " Language:	Django HTML template
@@ -20,5 +15,3 @@ endif
 " Use HTML and Django template ftplugins.
 runtime! ftplugin/html.vim
 runtime! ftplugin/django.vim
-
-endif
diff --git a/ftplugin/i3config.vim b/ftplugin/i3config.vim
index 36b8b8f93..dc4182fbc 100644
--- a/ftplugin/i3config.vim
+++ b/ftplugin/i3config.vim
@@ -1,12 +1,5 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/i3config.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('i3', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'i3') == -1
 
 setlocal commentstring=#\ %s
-
-endif
diff --git a/ftplugin/idris.vim b/ftplugin/idris.vim
index 9827033b9..f3201a08b 100644
--- a/ftplugin/idris.vim
+++ b/ftplugin/idris.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/idris.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 
 if bufname('%') == "idris-response"
   finish
@@ -349,5 +344,3 @@ menu Idris.Proof\ Search\ with\ hints <LocalLeader>p
 
 au BufHidden idris-response call IdrisHideResponseWin()
 au BufEnter idris-response call IdrisShowResponseWin()
-
-endif
diff --git a/ftplugin/idris2.vim b/ftplugin/idris2.vim
index 893953113..97337057e 100644
--- a/ftplugin/idris2.vim
+++ b/ftplugin/idris2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/idris2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
 
 if bufname('%') == "idris-response"
   finish
@@ -337,5 +332,3 @@ menu Idris.Proof\ Search\ with\ hints <LocalLeader>p
 
 au BufHidden idris-response call IdrisHideResponseWin()
 au BufEnter idris-response call IdrisShowResponseWin()
-
-endif
diff --git a/ftplugin/indent.vim b/ftplugin/indent.vim
index 5a0d6c359..d3ee4f74a 100644
--- a/ftplugin/indent.vim
+++ b/ftplugin/indent.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/indent.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('indent', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'indent') == -1
 
 " Vim filetype plugin file
 " Language:             indent(1) configuration file
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/ion.vim b/ftplugin/ion.vim
index 9db5c7a20..8835e2911 100644
--- a/ftplugin/ion.vim
+++ b/ftplugin/ion.vim
@@ -1,16 +1,9 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ion.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ion', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ion') == -1
 
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
 
 setlocal commentstring=#%s
-
-endif
diff --git a/ftplugin/j.vim b/ftplugin/j.vim
index 577cbd9db..4b4669ff2 100644
--- a/ftplugin/j.vim
+++ b/ftplugin/j.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/j.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('j', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'j') == -1
 
 " Vim filetype plugin
 " Language:	J
@@ -88,5 +83,3 @@ endif
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
index 829538127..5a7dc9e02 100644
--- a/ftplugin/java.vim
+++ b/ftplugin/java.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/java.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('java', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'java') == -1
 
 " Vim filetype plugin file
 " Language:	Java
@@ -58,5 +53,3 @@ let b:undo_ftplugin = "setlocal suffixes< suffixesadd<" .
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/jproperties.vim b/ftplugin/jproperties.vim
index 5839c9977..b67a00c3b 100644
--- a/ftplugin/jproperties.vim
+++ b/ftplugin/jproperties.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/jproperties.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jproperties', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jproperties') == -1
 
 " Vim filetype plugin
 " Language:	Java properties file
@@ -22,5 +17,3 @@ setlocal comments=:#,:!
 setlocal commentstring=#\ %s
 
 let b:undo_ftplugin = "setl cms< com< fo<"
-
-endif
diff --git a/ftplugin/jq.vim b/ftplugin/jq.vim
index fab7f20f6..ae05d442c 100644
--- a/ftplugin/jq.vim
+++ b/ftplugin/jq.vim
@@ -1,12 +1,5 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/jq.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jq', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jq') == -1
 
 setlocal commentstring=#%s
-
-endif
diff --git a/ftplugin/json.vim b/ftplugin/json.vim
index 9b2d90567..f55b4b0af 100644
--- a/ftplugin/json.vim
+++ b/ftplugin/json.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/json.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('json', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 
 " Vim syntax file
 " Language:	JSON
@@ -45,5 +40,3 @@ if has('conceal')
 	"maybe g:vim_json_syntax_conceal could be settable to 0,1,2 to map
 	"directly to vim's conceallevels? unsure if anyone cares
 endif
-
-endif
diff --git a/ftplugin/jsonnet.vim b/ftplugin/jsonnet.vim
index 4c35558ea..00dcfb7ce 100644
--- a/ftplugin/jsonnet.vim
+++ b/ftplugin/jsonnet.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/jsonnet.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jsonnet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsonnet') == -1
 
 
 
@@ -16,5 +11,3 @@ command! -nargs=0 JsonnetFmt call jsonnet#Format()
 setlocal commentstring=//\ %s
 
 
-
-endif
diff --git a/ftplugin/jsp.vim b/ftplugin/jsp.vim
index 9e186dc56..68e9e03b6 100644
--- a/ftplugin/jsp.vim
+++ b/ftplugin/jsp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/jsp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jsp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsp') == -1
 
 " Vim filetype plugin file
 " Language:	jsp
@@ -74,5 +69,3 @@ let b:undo_ftplugin = "unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index 488454219..cc3530996 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/julia.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Vim filetype plugin file
 " Language:	Julia
@@ -122,5 +117,3 @@ let b:undo_ftplugin .= " | delcommand JuliaDoc | delcommand JuliaDocKeywordprg"
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/juliadoc.vim b/ftplugin/juliadoc.vim
index 9212e287d..d961f6977 100644
--- a/ftplugin/juliadoc.vim
+++ b/ftplugin/juliadoc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/juliadoc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Vim filetype plugin file
 " Language: Julia document
@@ -37,5 +32,3 @@ let b:undo_ftplugin .= " | delcommand JuliaDoc | delcommand JuliaDocKeywordprg"
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/kconfig.vim b/ftplugin/kconfig.vim
index 970e4abe9..a02b473ae 100644
--- a/ftplugin/kconfig.vim
+++ b/ftplugin/kconfig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/kconfig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('kconfig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kconfig') == -1
 
 " Vim filetype plugin file
 " Vim syntax file
@@ -34,5 +29,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/kotlin.vim b/ftplugin/kotlin.vim
index a9eb39cfe..5e04d995d 100644
--- a/ftplugin/kotlin.vim
+++ b/ftplugin/kotlin.vim
@@ -1,16 +1,9 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/kotlin.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('kotlin', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
 
 if exists('b:did_ftplugin') | finish | endif
 let b:did_ftplugin = 1
 
 setlocal comments=://
 setlocal commentstring=//\ %s
-
-endif
diff --git a/ftplugin/kwt.vim b/ftplugin/kwt.vim
index 49953976b..2a5464592 100644
--- a/ftplugin/kwt.vim
+++ b/ftplugin/kwt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/kwt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('kwt', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kwt') == -1
 
 " Vim filetype plugin file
 " Language:	Kimwitu++
@@ -39,5 +34,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/ld.vim b/ftplugin/ld.vim
index 1b9730d9f..a748663c9 100644
--- a/ftplugin/ld.vim
+++ b/ftplugin/ld.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ld.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ld', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ld') == -1
 
 " Vim filetype plugin file
 " Language:             ld(1) script
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/less.vim b/ftplugin/less.vim
index 1eabb7b38..87b66ecf4 100644
--- a/ftplugin/less.vim
+++ b/ftplugin/less.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/less.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('less', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 
 " Vim filetype plugin
 " Language:	less
@@ -27,5 +22,3 @@ setlocal comments=:// commentstring=//\ %s
 
 setlocal omnifunc=csscomplete#CompleteCSS
 setlocal suffixesadd=.less
-
-endif
diff --git a/ftplugin/lftp.vim b/ftplugin/lftp.vim
index 4f246ecd8..0088fab09 100644
--- a/ftplugin/lftp.vim
+++ b/ftplugin/lftp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/lftp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lftp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lftp') == -1
 
 " Vim filetype plugin file
 " Language:             lftp(1) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/libao.vim b/ftplugin/libao.vim
index 154ac0ce8..9829dfa1e 100644
--- a/ftplugin/libao.vim
+++ b/ftplugin/libao.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/libao.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('libao', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'libao') == -1
 
 " Vim filetype plugin file
 " Language:             libao.conf(5) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/lilypond.vim b/ftplugin/lilypond.vim
index 0f19b5cf3..21b384978 100644
--- a/ftplugin/lilypond.vim
+++ b/ftplugin/lilypond.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/lilypond.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lilypond', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 
 " LilyPond filetype plugin
 " Language:     LilyPond (ft=ly)
@@ -64,5 +59,3 @@ setlocal dictionary-=$VIM/syntax/lilypond-words dictionary+=$VIM/syntax/lilypond
 setlocal complete-=k complete+=k
 "
 setlocal showmatch
-
-endif
diff --git a/ftplugin/limits.vim b/ftplugin/limits.vim
index 6990030f8..82828bb22 100644
--- a/ftplugin/limits.vim
+++ b/ftplugin/limits.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/limits.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('limits', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'limits') == -1
 
 " Vim filetype plugin file
 " Language:             limits(5) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/liquid.vim b/ftplugin/liquid.vim
index 75b093b9f..1b8a5d05e 100644
--- a/ftplugin/liquid.vim
+++ b/ftplugin/liquid.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/liquid.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('liquid', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
 
 " Vim filetype plugin
 " Language:     Liquid
@@ -68,5 +63,3 @@ endif
 setlocal commentstring={%\ comment\ %}%s{%\ endcomment\ %}
 
 let b:undo_ftplugin .= 'setl cms< | unlet! b:browsefilter b:match_words'
-
-endif
diff --git a/ftplugin/lisp.vim b/ftplugin/lisp.vim
index d706128c6..c6b097b1e 100644
--- a/ftplugin/lisp.vim
+++ b/ftplugin/lisp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/lisp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lisp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lisp') == -1
 
 " Vim filetype plugin
 " Language:      Lisp
@@ -33,5 +28,3 @@ setl commentstring=;%s
 setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|#
 
 let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp< commentstring<"
-
-endif
diff --git a/ftplugin/litcoffee.vim b/ftplugin/litcoffee.vim
index 6b70fe8b7..75af16cd2 100644
--- a/ftplugin/litcoffee.vim
+++ b/ftplugin/litcoffee.vim
@@ -1,12 +1,5 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/litcoffee.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 runtime ftplugin/coffee.vim
-
-endif
diff --git a/ftplugin/llvm.vim b/ftplugin/llvm.vim
index dcb43a4b6..67da6358a 100644
--- a/ftplugin/llvm.vim
+++ b/ftplugin/llvm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/llvm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 
 " Vim filetype plugin file
 " Language: LLVM Assembly
@@ -19,5 +14,3 @@ let b:did_ftplugin = 1
 setlocal softtabstop=2 shiftwidth=2
 setlocal expandtab
 setlocal comments+=:;
-
-endif
diff --git a/ftplugin/logcheck.vim b/ftplugin/logcheck.vim
index fb90af644..c69142ae5 100644
--- a/ftplugin/logcheck.vim
+++ b/ftplugin/logcheck.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/logcheck.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('logcheck', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logcheck') == -1
 
 " Vim filetype plugin file
 " Language:    Logcheck
@@ -24,5 +19,3 @@ let b:undo_ftplugin = 'setl fo<'
 " Do not hard-wrap non-comment lines since each line is a self-contained
 " regular expression
 setlocal formatoptions-=t
-
-endif
diff --git a/ftplugin/loginaccess.vim b/ftplugin/loginaccess.vim
index c9834df29..5ad28b4cb 100644
--- a/ftplugin/loginaccess.vim
+++ b/ftplugin/loginaccess.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/loginaccess.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('loginaccess', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'loginaccess') == -1
 
 " Vim filetype plugin file
 " Language:             login.access(5) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/logindefs.vim b/ftplugin/logindefs.vim
index 97ba09fcc..5c8f91d85 100644
--- a/ftplugin/logindefs.vim
+++ b/ftplugin/logindefs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/logindefs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('logindefs', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logindefs') == -1
 
 " Vim filetype plugin file
 " Language:             login.defs(5) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/logtalk.vim b/ftplugin/logtalk.vim
index b4b58d365..2c75d4b5e 100644
--- a/ftplugin/logtalk.vim
+++ b/ftplugin/logtalk.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/logtalk.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('logtalk', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logtalk') == -1
 
 " Logtalk filetype plugin file
 " Language:         Logtalk
@@ -26,5 +21,3 @@ setlocal fdn=10
 setlocal fdc=2
 setlocal autoindent
 setlocal dict=$VIMRUNTIME/ftplugin/logtalk.dict
-
-endif
diff --git a/ftplugin/lprolog.vim b/ftplugin/lprolog.vim
index bdd1d5b10..ca24c8d5f 100644
--- a/ftplugin/lprolog.vim
+++ b/ftplugin/lprolog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/lprolog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lprolog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lprolog') == -1
 
 " Vim settings file
 " Language:     LambdaProlog (Teyjus)
@@ -44,5 +39,3 @@ if !exists("no_plugin_maps") && !exists("no_lprolog_maps")
   vnoremap <buffer> <Plug>BUncomOn <ESC>:'<,'><CR>`<O<ESC>0i/*<ESC>`>o<ESC>0i*/<ESC>`<
   vnoremap <buffer> <Plug>BUncomOff <ESC>:'<,'><CR>`<dd`>dd`<
 endif
-
-endif
diff --git a/ftplugin/ls.vim b/ftplugin/ls.vim
index eb3cc5170..985422229 100644
--- a/ftplugin/ls.vim
+++ b/ftplugin/ls.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ls.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('livescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 
 " Language:    LiveScript
 " Maintainer:  George Zahariev
@@ -211,5 +206,3 @@ command! -range=% -bar -nargs=* -complete=customlist,s:LiveScriptCompileComplete
 \        LiveScriptCompile call s:LiveScriptCompile(<line1>, <line2>, <q-args>)
 " Run some LiveScript.
 command! -range=% -bar LiveScriptRun <line1>,<line2>:w !lsc -sp
-
-endif
diff --git a/ftplugin/m4.vim b/ftplugin/m4.vim
index 7ead0f448..51c935ae0 100644
--- a/ftplugin/m4.vim
+++ b/ftplugin/m4.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/m4.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('m4', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'm4') == -1
 
 " Vim filetype plugin file
 " Language:             m4
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/mail.vim b/ftplugin/mail.vim
index 0fd2e39d0..eb2bf8b41 100644
--- a/ftplugin/mail.vim
+++ b/ftplugin/mail.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/mail.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mail', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mail') == -1
 
 " Vim filetype plugin file
 " Language:	Mail
@@ -45,5 +40,3 @@ if !exists("no_plugin_maps") && !exists("no_mail_maps")
   vnoremap <buffer> <Plug>MailQuote :s/^/> /<CR>:noh<CR>``
   nnoremap <buffer> <Plug>MailQuote :.,$s/^/> /<CR>:noh<CR>``
 endif
-
-endif
diff --git a/ftplugin/mailaliases.vim b/ftplugin/mailaliases.vim
index ed8ed24c9..7fd68c4a0 100644
--- a/ftplugin/mailaliases.vim
+++ b/ftplugin/mailaliases.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/mailaliases.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mailaliases', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mailaliases') == -1
 
 " Vim filetype plugin file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
@@ -25,5 +20,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/mailcap.vim b/ftplugin/mailcap.vim
index c3f7d6659..a47cf59c2 100644
--- a/ftplugin/mailcap.vim
+++ b/ftplugin/mailcap.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/mailcap.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mailcap', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mailcap') == -1
 
 " Vim filetype plugin file
 " Language:             Mailcap configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/make.vim b/ftplugin/make.vim
index a077f5215..02b0e3204 100644
--- a/ftplugin/make.vim
+++ b/ftplugin/make.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/make.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('make', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'make') == -1
 
 " Vim filetype plugin file
 " Language:	Make
@@ -40,5 +35,3 @@ let &l:include = '^\s*include'
 if exists("loaded_matchit")
   let b:match_words = '^ *ifn\=\(eq\|def\)\>:^ *else\(\s\+ifn\=\(eq\|def\)\)\=\>:^ *endif\>,\<define\>:\<endef\>,^!\s*if\(n\=def\)\=\>:^!\s*else\(if\(n\=def\)\=\)\=\>:^!\s*endif\>'
 endif
-
-endif
diff --git a/ftplugin/mako.vim b/ftplugin/mako.vim
index 48cc40a1d..c68d6d67d 100644
--- a/ftplugin/mako.vim
+++ b/ftplugin/mako.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/mako.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mako', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
 
 " Vim filetype plugin file
 " Language:     Mako
@@ -26,5 +21,3 @@ if exists("loaded_matchit")
   \ "<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>," .
   \ "<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>"
 endif
-
-endif
diff --git a/ftplugin/manconf.vim b/ftplugin/manconf.vim
index 34b0173bf..51490f66c 100644
--- a/ftplugin/manconf.vim
+++ b/ftplugin/manconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/manconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('manconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'manconf') == -1
 
 " Vim filetype plugin file
 " Language:             man.conf(5) - man configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index 4209f306d..03530bc9f 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/markdown.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('markdown', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
 
 "TODO print messages when on visual mode. I only see VISUAL, not the messages.
 
@@ -884,5 +879,3 @@ augroup Mkd
     autocmd InsertEnter,InsertLeave <buffer> call s:MarkdownRefreshSyntax(0)
     autocmd CursorHold,CursorHoldI <buffer> call s:MarkdownRefreshSyntax(0)
 augroup END
-
-endif
diff --git a/ftplugin/meson.vim b/ftplugin/meson.vim
index 41daf3eeb..75c9d90da 100644
--- a/ftplugin/meson.vim
+++ b/ftplugin/meson.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/meson.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('meson', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1
 
 " Vim filetype plugin file
 " Language:	meson
@@ -26,5 +21,3 @@ setlocal softtabstop=2
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/ftplugin/mf.vim b/ftplugin/mf.vim
index 395ebe465..06af3469a 100644
--- a/ftplugin/mf.vim
+++ b/ftplugin/mf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/mf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mf') == -1
 
 " Vim filetype plugin file
 " Language:           METAFONT
@@ -77,5 +72,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/mma.vim b/ftplugin/mma.vim
index c173a1a2b..2dc9cd61a 100644
--- a/ftplugin/mma.vim
+++ b/ftplugin/mma.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/mma.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mathematica', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
 
 "Vim filetype plugin
 " Language: Mathematica
@@ -66,5 +61,3 @@ unlet s:cpo_save
 "}
 
 " vim: set foldmarker={,} foldlevel=0 foldmethod=marker:
-
-endif
diff --git a/ftplugin/modconf.vim b/ftplugin/modconf.vim
index 121cf3f88..26eb4a887 100644
--- a/ftplugin/modconf.vim
+++ b/ftplugin/modconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/modconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('modconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'modconf') == -1
 
 " Vim filetype plugin file
 " Language:             modules.conf(5) configuration file
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/moon.vim b/ftplugin/moon.vim
index 997facd77..a4c0140f9 100644
--- a/ftplugin/moon.vim
+++ b/ftplugin/moon.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/moon.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('moonscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
 
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
@@ -23,5 +18,3 @@ setlocal comments=:--
 setlocal commentstring=--\ %s
 
 let b:undo_ftplugin = "setlocal commentstring< comments< formatoptions<"
-
-endif
diff --git a/ftplugin/mp.vim b/ftplugin/mp.vim
index 18d539cbd..d73c51ac8 100644
--- a/ftplugin/mp.vim
+++ b/ftplugin/mp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/mp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mp') == -1
 
 " Vim filetype plugin file
 " Language:           MetaPost
@@ -89,5 +84,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/mplayerconf.vim b/ftplugin/mplayerconf.vim
index 0a9a5b977..34166238b 100644
--- a/ftplugin/mplayerconf.vim
+++ b/ftplugin/mplayerconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/mplayerconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mplayerconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mplayerconf') == -1
 
 " Vim filetype plugin file
 " Language:             mplayer(1) configuration file
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/mrxvtrc.vim b/ftplugin/mrxvtrc.vim
index 66ed311c9..6af765271 100644
--- a/ftplugin/mrxvtrc.vim
+++ b/ftplugin/mrxvtrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/mrxvtrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mrxvtrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mrxvtrc') == -1
 
 " Created	: Wed 26 Apr 2006 01:20:53 AM CDT
 " Modified	: Fri 28 Apr 2006 03:24:01 AM CDT
@@ -29,5 +24,3 @@ let b:undo_ftplugin = "setl com< cms< fo<"
 
 setlocal comments=:!,:# commentstring=#\ %s
 setlocal formatoptions-=t formatoptions+=croql
-
-endif
diff --git a/ftplugin/mustache.vim b/ftplugin/mustache.vim
index c6d4b22d2..c494c1956 100644
--- a/ftplugin/mustache.vim
+++ b/ftplugin/mustache.vim
@@ -1,12 +1,5 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/mustache.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 runtime! ftplugin/handlebars*.vim ftplugin/handlebars/*.vim
-
-endif
diff --git a/ftplugin/muttrc.vim b/ftplugin/muttrc.vim
index 6efb6fe2c..cd4321be8 100644
--- a/ftplugin/muttrc.vim
+++ b/ftplugin/muttrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/muttrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('muttrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'muttrc') == -1
 
 " Vim filetype plugin file
 " Language:             mutt RC File
@@ -29,5 +24,3 @@ let &l:include = '^\s*source\>'
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/nanorc.vim b/ftplugin/nanorc.vim
index d496dbe4f..f558d6716 100644
--- a/ftplugin/nanorc.vim
+++ b/ftplugin/nanorc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/nanorc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nanorc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nanorc') == -1
 
 " Vim filetype plugin file
 " Language:             nanorc(5) - GNU nano configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/neomuttrc.vim b/ftplugin/neomuttrc.vim
index ef375cbd7..a20c2c4da 100644
--- a/ftplugin/neomuttrc.vim
+++ b/ftplugin/neomuttrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/neomuttrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('neomuttrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'neomuttrc') == -1
 
 " Vim filetype plugin file
 " Language:             NeoMutt RC File
@@ -30,5 +25,3 @@ let &l:include = '^\s*source\>'
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/netrc.vim b/ftplugin/netrc.vim
index 8f3ab865c..73eeeee10 100644
--- a/ftplugin/netrc.vim
+++ b/ftplugin/netrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/netrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('netrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'netrc') == -1
 
 " Vim filetype plugin file
 " Language:             netrc(5) configuration file
@@ -26,5 +21,3 @@ setlocal comments= commentstring= formatoptions-=tcroq formatoptions+=l
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/nginx.vim b/ftplugin/nginx.vim
index ac28682ba..4befc51b3 100644
--- a/ftplugin/nginx.vim
+++ b/ftplugin/nginx.vim
@@ -1,12 +1,5 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/nginx.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nginx', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
 
 setlocal commentstring=#\ %s
-
-endif
diff --git a/ftplugin/nix.vim b/ftplugin/nix.vim
index c54c8234e..9b998729b 100644
--- a/ftplugin/nix.vim
+++ b/ftplugin/nix.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/nix.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nix', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 
 " Vim filetype plugin
 " Language:    Nix
@@ -28,5 +23,3 @@ if get(g:, 'nix_recommended_style', 1)
     \ softtabstop=2
     \ expandtab 
 endif
-
-endif
diff --git a/ftplugin/nroff.vim b/ftplugin/nroff.vim
index 2487c4316..1d56daa98 100644
--- a/ftplugin/nroff.vim
+++ b/ftplugin/nroff.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/nroff.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nroff', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nroff') == -1
 
 " Vim filetype plugin
 " Language:	roff(7)
@@ -18,5 +13,3 @@ endif
 let b:did_ftplugin = 1
 
 setlocal commentstring=.\\\"%s
-
-endif
diff --git a/ftplugin/nsis.vim b/ftplugin/nsis.vim
index eecf536f2..697f2d67d 100644
--- a/ftplugin/nsis.vim
+++ b/ftplugin/nsis.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/nsis.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nsis', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nsis') == -1
 
 " Vim ftplugin file
 " Language:		NSIS script
@@ -50,5 +45,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/oasis.vim b/ftplugin/oasis.vim
index d8f3988c3..cfe932fea 100644
--- a/ftplugin/oasis.vim
+++ b/ftplugin/oasis.vim
@@ -1,14 +1,7 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/oasis.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 
 setlocal comments=:#
 setlocal commentstring=#\ %s
-
-endif
diff --git a/ftplugin/objc.vim b/ftplugin/objc.vim
index 6f690a032..2d108e5bf 100644
--- a/ftplugin/objc.vim
+++ b/ftplugin/objc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/objc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('objc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
 
 " Use C++ style comment strings with commentary.vim
 setl commentstring=//%s
@@ -13,5 +8,3 @@ setl commentstring=//%s
 " Search for include files inside frameworks (used for gf etc.)
 setl includeexpr=substitute(v:fname,'\\([^/]\\+\\)/\\(.\\+\\)','/System/Library/Frameworks/\\1.framework/Headers/\\2','')
 
-
-endif
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index c3d952de3..d9e56533a 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ocaml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Language:    OCaml
 " Maintainer:  David Baelde        <firstname.name@ens-lyon.org>
@@ -648,5 +643,3 @@ let &cpoptions=s:cposet
 unlet s:cposet
 
 " vim:sw=2 fdm=indent
-
-endif
diff --git a/ftplugin/ocamlbuild_tags.vim b/ftplugin/ocamlbuild_tags.vim
index 75167bf7a..cfe932fea 100644
--- a/ftplugin/ocamlbuild_tags.vim
+++ b/ftplugin/ocamlbuild_tags.vim
@@ -1,14 +1,7 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ocamlbuild_tags.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 
 setlocal comments=:#
 setlocal commentstring=#\ %s
-
-endif
diff --git a/ftplugin/occam.vim b/ftplugin/occam.vim
index 4a6d6aa93..766c71fb6 100644
--- a/ftplugin/occam.vim
+++ b/ftplugin/occam.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/occam.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('occam', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'occam') == -1
 
 " Vim filetype plugin file
 " Language:	occam
@@ -56,5 +51,3 @@ let b:undo_ftplugin = "setlocal shiftwidth< softtabstop< expandtab<"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/ftplugin/omake.vim b/ftplugin/omake.vim
index 7b04a99a0..e75e09b30 100644
--- a/ftplugin/omake.vim
+++ b/ftplugin/omake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/omake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim filetype plugin file
 " Language:	OMake
@@ -31,5 +26,3 @@ setlocal expandtab
 
 " Including files.
 let &l:include = '^\s*include'
-
-endif
diff --git a/ftplugin/opencl.vim b/ftplugin/opencl.vim
index 93132f10e..ab8943618 100644
--- a/ftplugin/opencl.vim
+++ b/ftplugin/opencl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/opencl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('opencl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
 
 if exists("b:did_ftplugin") | finish | endif
 
@@ -22,5 +17,3 @@ setlocal smarttab
 setlocal smartindent
 
 let b:did_ftplugin = 1
-
-endif
diff --git a/ftplugin/pamconf.vim b/ftplugin/pamconf.vim
index 548c262ae..09dada128 100644
--- a/ftplugin/pamconf.vim
+++ b/ftplugin/pamconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/pamconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pamconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pamconf') == -1
 
 " Vim filetype plugin file
 " Language:             pam(8) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/pascal.vim b/ftplugin/pascal.vim
index 828e8d1eb..542343da3 100644
--- a/ftplugin/pascal.vim
+++ b/ftplugin/pascal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/pascal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pascal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pascal') == -1
 
 " Vim filetype plugin file
 " Language:	pascal
@@ -27,5 +22,3 @@ endif
 
 " Undo the stuff we changed.
 let b:undo_ftplugin = "unlet! b:match_words"
-
-endif
diff --git a/ftplugin/passwd.vim b/ftplugin/passwd.vim
index 3116758cb..70aa41c2a 100644
--- a/ftplugin/passwd.vim
+++ b/ftplugin/passwd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/passwd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('passwd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'passwd') == -1
 
 " Vim filetype plugin file
 " Language:             passwd(5) password file
@@ -26,5 +21,3 @@ setlocal comments= commentstring= formatoptions-=tcroq formatoptions+=l
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/pdf.vim b/ftplugin/pdf.vim
index 97d77debe..bf637d0fc 100644
--- a/ftplugin/pdf.vim
+++ b/ftplugin/pdf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/pdf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pdf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pdf') == -1
 
 " Vim filetype plugin file
 " Language:	PDF
@@ -96,5 +91,3 @@ function! s:notag()
     echo "E426: tag not found"
     echohl NONE
 endfunction
-
-endif
diff --git a/ftplugin/perl.vim b/ftplugin/perl.vim
index 5018676bc..33475a85b 100644
--- a/ftplugin/perl.vim
+++ b/ftplugin/perl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/perl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim filetype plugin file
 " Language:      Perl
@@ -96,5 +91,3 @@ let b:match_words = '\<if\>:\<elsif\>:\<else\>'
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/pinfo.vim b/ftplugin/pinfo.vim
index 86746f326..72ed6b958 100644
--- a/ftplugin/pinfo.vim
+++ b/ftplugin/pinfo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/pinfo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pinfo', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pinfo') == -1
 
 " Vim filetype plugin file
 " Language:             pinfo(1) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/plantuml.vim b/ftplugin/plantuml.vim
index 1ab7da139..5146b2433 100644
--- a/ftplugin/plantuml.vim
+++ b/ftplugin/plantuml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/plantuml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('plantuml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
 
 scriptencoding utf-8
 " Vim filetype plugin file
@@ -51,5 +46,3 @@ let b:endwise_syngroups = 'plantumlKeyword,plantumlPreProc'
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/pony.vim b/ftplugin/pony.vim
index dee95d8e9..7d2d684e8 100644
--- a/ftplugin/pony.vim
+++ b/ftplugin/pony.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/pony.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pony', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 
 " Vim filetype plugin file
 " Language:     Pony
@@ -47,5 +42,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:did_ftplugin = 1
-
-endif
diff --git a/ftplugin/postscr.vim b/ftplugin/postscr.vim
index 666313930..e2926fb0d 100644
--- a/ftplugin/postscr.vim
+++ b/ftplugin/postscr.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/postscr.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('postscr', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'postscr') == -1
 
 " Vim filetype plugin file
 " Language:	PostScript
@@ -45,5 +40,3 @@ let b:undo_ftplugin = "setlocal comments< formatoptions<"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/procmail.vim b/ftplugin/procmail.vim
index 1c82967e1..fed5e4d4a 100644
--- a/ftplugin/procmail.vim
+++ b/ftplugin/procmail.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/procmail.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('procmail', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'procmail') == -1
 
 " Vim filetype plugin file
 " Language:             procmail(1) configuration file
@@ -28,5 +23,3 @@ let &l:include = '^\s*INCLUDERC\>'
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/prolog.vim b/ftplugin/prolog.vim
index a2a506023..0ed3fccf7 100644
--- a/ftplugin/prolog.vim
+++ b/ftplugin/prolog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/prolog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('prolog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
 
 " Vim filetype plugin file
 " Language:             Prolog
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/protocols.vim b/ftplugin/protocols.vim
index d8cd8f650..da0a66998 100644
--- a/ftplugin/protocols.vim
+++ b/ftplugin/protocols.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/protocols.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('protocols', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protocols') == -1
 
 " Vim filetype plugin file
 " Language:             protocols(5) - Internet protocols definition file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/ps1.vim b/ftplugin/ps1.vim
index b6d98258e..25c015cb3 100644
--- a/ftplugin/ps1.vim
+++ b/ftplugin/ps1.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ps1.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Vim filetype plugin file
 " Language:           Windows PowerShell
@@ -63,5 +58,3 @@ setlocal keywordprg=:GetHelp
 let b:undo_ftplugin = "setlocal tw< cms< fo< iskeyword< keywordprg<" .
 			\ " | unlet! b:browsefilter"
 
-
-endif
diff --git a/ftplugin/ps1xml.vim b/ftplugin/ps1xml.vim
index c9efc5ae1..e8afcf6a1 100644
--- a/ftplugin/ps1xml.vim
+++ b/ftplugin/ps1xml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ps1xml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Vim filetype plugin file
 " Language:           Windows PowerShell
@@ -38,5 +33,3 @@ endif
 let b:undo_ftplugin = "setlocal tw< cms< fo<" .
       \ " | unlet! b:browsefilter"
 
-
-endif
diff --git a/ftplugin/pug.vim b/ftplugin/pug.vim
index 3237029c0..4be43d551 100644
--- a/ftplugin/pug.vim
+++ b/ftplugin/pug.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/pug.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pug', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
 
 " Vim filetype plugin
 " Language: Pug
@@ -64,5 +59,3 @@ let b:undo_ftplugin = "setl cms< com< "
 let &cpo = s:save_cpo
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index 427375089..6c8ec6333 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/puppet.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Vim filetype plugin
 " Language:             Puppet
@@ -35,5 +30,3 @@ let b:undo_ftplugin = "
     \| setlocal keywordprg< iskeyword< comments< commentstring<
     \| setlocal formatoptions< formatexpr<
     \"
-
-endif
diff --git a/ftplugin/puppet_tagbar.vim b/ftplugin/puppet_tagbar.vim
index 84751db17..6724b3a04 100644
--- a/ftplugin/puppet_tagbar.vim
+++ b/ftplugin/puppet_tagbar.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/puppet_tagbar.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Puppet set up for Tagbar plugin
 " (https://github.com/majutsushi/tagbar).
@@ -51,5 +46,3 @@ endif
 
 let g:tagbar_type_puppet.deffile = puppet#ctags#OptionFile()
 
-
-endif
diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim
index b53af764d..366b2da2b 100644
--- a/ftplugin/purescript.vim
+++ b/ftplugin/purescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/purescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('purescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--\ \|,:--
 setlocal commentstring=--\ %s
@@ -46,5 +41,3 @@ fun! InitPureScript()
   call add(s:PS, [dir, &l:path])
 endfun
 call InitPureScript()
-
-endif
diff --git a/ftplugin/pyrex.vim b/ftplugin/pyrex.vim
index 6e275e3ab..5c64042cc 100644
--- a/ftplugin/pyrex.vim
+++ b/ftplugin/pyrex.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/pyrex.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pyrex', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pyrex') == -1
 
 " Vim filetype plugin file
 " Language:	Pyrex
@@ -34,5 +29,3 @@ endif
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/ftplugin/qml.vim b/ftplugin/qml.vim
index 982b9ac76..ae94d461d 100644
--- a/ftplugin/qml.vim
+++ b/ftplugin/qml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/qml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('qml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
 
 " Vim filetype plugin file
 " Language: qml
@@ -44,5 +39,3 @@ setlocal formatoptions+=croql
 
 let &cpoptions = s:cpoptions_save
 unlet s:cpoptions_save
-
-endif
diff --git a/ftplugin/quake.vim b/ftplugin/quake.vim
index e3601fc8d..03b49c0ae 100644
--- a/ftplugin/quake.vim
+++ b/ftplugin/quake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/quake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('quake', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'quake') == -1
 
 " Vim filetype plugin file
 " Language:             Quake[1-3] configuration file
@@ -26,5 +21,3 @@ setlocal comments=:// commentstring=//\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/racket.vim b/ftplugin/racket.vim
index bc3d76c9a..ad4be8c87 100644
--- a/ftplugin/racket.vim
+++ b/ftplugin/racket.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/racket.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('racket', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
 
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
@@ -83,5 +78,3 @@ let b:undo_ftplugin =
       \. "| setl makeprg< commentstring<"
       \. "| nunmap <buffer> K"
       \. "| vunmap <buffer> K"
-
-endif
diff --git a/ftplugin/raku.vim b/ftplugin/raku.vim
index a56385d12..8f9a55ecd 100644
--- a/ftplugin/raku.vim
+++ b/ftplugin/raku.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/raku.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('raku', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raku') == -1
 
 " Vim filetype plugin file
 " Language:      Raku
@@ -150,5 +145,3 @@ let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< isk< kp< path
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/raml.vim b/ftplugin/raml.vim
index ec1a3c4a4..fecbba665 100644
--- a/ftplugin/raml.vim
+++ b/ftplugin/raml.vim
@@ -1,12 +1,5 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/raml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('raml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
 
 set ts=2 sts=2 sw=2 et
-
-endif
diff --git a/ftplugin/razor.vim b/ftplugin/razor.vim
index 8b2296220..4bd0bc4a7 100644
--- a/ftplugin/razor.vim
+++ b/ftplugin/razor.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/razor.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('razor', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'razor') == -1
 
 if exists("b:did_ftplugin")
   finish
@@ -13,5 +8,3 @@ endif
 let b:did_ftplugin = 1
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/readline.vim b/ftplugin/readline.vim
index ea38cd55e..b1a0a0bc2 100644
--- a/ftplugin/readline.vim
+++ b/ftplugin/readline.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/readline.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('readline', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'readline') == -1
 
 " Vim filetype plugin file
 " Language:             readline(3) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/reva.vim b/ftplugin/reva.vim
index d82461dcc..b5211a02e 100644
--- a/ftplugin/reva.vim
+++ b/ftplugin/reva.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/reva.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('reva', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reva') == -1
 
 " Vim ftplugin file
 " Language:	Reva Forth
@@ -32,5 +27,3 @@ setlocal com=s1:/*,mb:*,ex:*/,:\|,:\\
 setlocal fo=tcrqol
 setlocal matchpairs+=\::;
 setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
-
-endif
diff --git a/ftplugin/rmd.vim b/ftplugin/rmd.vim
index b6a16c8c9..f0e6ce6fa 100644
--- a/ftplugin/rmd.vim
+++ b/ftplugin/rmd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/rmd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rmd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rmd') == -1
 
 " Vim filetype plugin file
 " Language: R Markdown file
@@ -70,5 +65,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2
-
-endif
diff --git a/ftplugin/rnc.vim b/ftplugin/rnc.vim
index 4873a22d8..86645ab42 100644
--- a/ftplugin/rnc.vim
+++ b/ftplugin/rnc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/rnc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rnc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnc') == -1
 
 " Vim filetype plugin file
 " Language:             Relax NG compact syntax
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/rnoweb.vim b/ftplugin/rnoweb.vim
index 21efcbfee..44e4d0fc8 100644
--- a/ftplugin/rnoweb.vim
+++ b/ftplugin/rnoweb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/rnoweb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rnoweb', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnoweb') == -1
 
 " Vim filetype plugin file
 " Language: Rnoweb
@@ -48,5 +43,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2
-
-endif
diff --git a/ftplugin/rpl.vim b/ftplugin/rpl.vim
index af3318490..3324ea9bd 100644
--- a/ftplugin/rpl.vim
+++ b/ftplugin/rpl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/rpl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rpl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 
 " Vim filetype plugin file
 " Language:     RPL/2
@@ -29,5 +24,3 @@ setlocal fo-=t fo+=croql
 setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
 
 let b:undo_ftplugin = "setlocal fo< comments<"
-
-endif
diff --git a/ftplugin/rrst.vim b/ftplugin/rrst.vim
index 6c0d51d4c..dd8b1238d 100644
--- a/ftplugin/rrst.vim
+++ b/ftplugin/rrst.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/rrst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rrst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rrst') == -1
 
 " Vim filetype plugin file
 " Language: reStructuredText documentation format with R code
@@ -61,5 +56,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2
-
-endif
diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index 791de7b90..105544036 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/rst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 
 " reStructuredText filetype plugin file
 " Language: reStructuredText documentation format
@@ -54,5 +49,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index 5a7c6e7d1..d2bd231a3 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -1,18 +1,13 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/ruby.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim filetype plugin
 " Language:		Ruby
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-
+loadedbad
 if (exists("b:did_ftplugin"))
   finish
 endif
@@ -443,5 +438,3 @@ endfunction
 "
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim
index 780baf392..b5e3b7711 100644
--- a/ftplugin/rust.vim
+++ b/ftplugin/rust.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/rust.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Language:     Rust
 " Description:  Vim ftplugin for Rust
@@ -207,5 +202,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/ftplugin/rust/tagbar.vim b/ftplugin/rust/tagbar.vim
index 1301ca81d..f8ccbf759 100644
--- a/ftplugin/rust/tagbar.vim
+++ b/ftplugin/rust/tagbar.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/rust/tagbar.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
@@ -47,5 +42,3 @@ unlet s:save_cpo
 
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/ftplugin/sass.vim b/ftplugin/sass.vim
index 3f4acf6eb..ec303c12e 100644
--- a/ftplugin/sass.vim
+++ b/ftplugin/sass.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/sass.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sass', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
 
 " Vim filetype plugin
 " Language:	Sass
@@ -44,5 +39,3 @@ function! SassIncludeExpr(file) abort
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/sbt.vim b/ftplugin/sbt.vim
index 260360c7b..9d6b64293 100644
--- a/ftplugin/sbt.vim
+++ b/ftplugin/sbt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/sbt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sbt', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sbt') == -1
 
 " Vim filetype plugin file
 " Language:     sbt
@@ -22,5 +17,3 @@ let b:did_ftplugin = 1
 
 runtime! ftplugin/scala.vim
 
-
-endif
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index c80daabb2..29bb92384 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/scala.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 " Vim filetype plugin
 " Language:             Scala
@@ -183,5 +178,3 @@ noremap <script> <buffer> <silent> ]] :call <SID>NextSection(0)<cr>
 noremap <script> <buffer> <silent> [[ :call <SID>NextSection(1)<cr>
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/ftplugin/scala.xpt.vim b/ftplugin/scala.xpt.vim
index 9df57081d..e18ced847 100644
--- a/ftplugin/scala.xpt.vim
+++ b/ftplugin/scala.xpt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/scala.xpt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 
 XPTemplate priority=lang
@@ -36,5 +31,3 @@ trait `derived^`trait^Component extends `trait^Component {
 		`body2^
 	}
 }
-
-endif
diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index 8236d737a..c290af07a 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/scala/tagbar.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 "
 " Support for Tagbar -- https://github.com/majutsushi/tagbar
@@ -38,5 +33,3 @@ let g:tagbar_type_scala = {
 if get(g:, 'scala_use_builtin_tagbar_defs', 1)
   let g:tagbar_type_scala.deffile = expand('<sfile>:p:h:h:h') . '/ctags/scala.ctags'
 endif
-
-endif
diff --git a/ftplugin/scheme.vim b/ftplugin/scheme.vim
index 68ad8c8bc..edbcfa0c4 100644
--- a/ftplugin/scheme.vim
+++ b/ftplugin/scheme.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/scheme.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scheme', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scheme') == -1
 
 " Vim filetype plugin file
 " Language: Scheme (R7RS)
@@ -64,5 +59,3 @@ unlet b:did_scheme_ftplugin
 let b:did_ftplugin = 1
 let &cpo = s:cpo
 unlet s:cpo
-
-endif
diff --git a/ftplugin/screen.vim b/ftplugin/screen.vim
index 2acc4b870..d2da63982 100644
--- a/ftplugin/screen.vim
+++ b/ftplugin/screen.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/screen.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('screen', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'screen') == -1
 
 " Vim filetype plugin file
 " Language:             screen(1) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim
index abed20d5c..78cbe9587 100644
--- a/ftplugin/scss.vim
+++ b/ftplugin/scss.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/scss.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scss', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
 
 if exists('b:did_indent') && b:did_indent
   " be kind. allow users to override this. Does it work?
@@ -20,5 +15,3 @@ setlocal formatoptions+=ro
 
 " SCSS comments are either /* */ or //
 setlocal comments=s1:/*,mb:*,ex:*/,://
-
-endif
diff --git a/ftplugin/sensors.vim b/ftplugin/sensors.vim
index dba05b65b..3d9109ea8 100644
--- a/ftplugin/sensors.vim
+++ b/ftplugin/sensors.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/sensors.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sensors', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensors') == -1
 
 " Vim filetype plugin file
 " Language:             sensors.conf(5) - libsensors configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/services.vim b/ftplugin/services.vim
index c4aaec818..84afa274f 100644
--- a/ftplugin/services.vim
+++ b/ftplugin/services.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/services.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('services', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'services') == -1
 
 " Vim filetype plugin file
 " Language:             services(5) - Internet network services list
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/setserial.vim b/ftplugin/setserial.vim
index 4d588ae37..5bbe71824 100644
--- a/ftplugin/setserial.vim
+++ b/ftplugin/setserial.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/setserial.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('setserial', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'setserial') == -1
 
 " Vim filetype plugin file
 " Language:             setserial(8) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/sexplib.vim b/ftplugin/sexplib.vim
index 16af8a15b..c019c9e43 100644
--- a/ftplugin/sexplib.vim
+++ b/ftplugin/sexplib.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/sexplib.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Language:    Sexplib
 " Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
@@ -21,5 +16,3 @@ let b:did_ftplugin=1
 " Comment string
 setl commentstring=;\ %s
 setl comments=:;
-
-endif
diff --git a/ftplugin/sieve.vim b/ftplugin/sieve.vim
index 9f59d80fa..596fdd80f 100644
--- a/ftplugin/sieve.vim
+++ b/ftplugin/sieve.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/sieve.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sieve', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sieve') == -1
 
 " Vim filetype plugin file
 " Language:             Sieve filtering language input file
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/slim.vim b/ftplugin/slim.vim
index 184b54d33..46b72c086 100644
--- a/ftplugin/slim.vim
+++ b/ftplugin/slim.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/slim.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slim', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
 
 if exists("b:did_ftplugin")
   finish
@@ -32,5 +27,3 @@ let b:undo_ftplugin = "setl isk<" . " | " . s:undo_ftplugin
 
 setlocal iskeyword+=-
 setlocal commentstring=/%s
-
-endif
diff --git a/ftplugin/slpconf.vim b/ftplugin/slpconf.vim
index 14fa54362..e036286c8 100644
--- a/ftplugin/slpconf.vim
+++ b/ftplugin/slpconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/slpconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slpconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpconf') == -1
 
 " Vim filetype plugin file
 " Language:             RFC 2614 - An API for Service Location configuration file
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/slpreg.vim b/ftplugin/slpreg.vim
index e4b4580ed..f3b64456f 100644
--- a/ftplugin/slpreg.vim
+++ b/ftplugin/slpreg.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/slpreg.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slpreg', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpreg') == -1
 
 " Vim filetype plugin file
 " Language:             RFC 2614 - An API for Service Location registration file
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/slpspi.vim b/ftplugin/slpspi.vim
index 9a042d4f9..5e6641ba7 100644
--- a/ftplugin/slpspi.vim
+++ b/ftplugin/slpspi.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/slpspi.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slpspi', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpspi') == -1
 
 " Vim filetype plugin file
 " Language:             RFC 2614 - An API for Service Location SPI file
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/smt2.vim b/ftplugin/smt2.vim
index 86dfa7205..03b5ba2b6 100644
--- a/ftplugin/smt2.vim
+++ b/ftplugin/smt2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/smt2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('smt2', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smt2') == -1
 
 setlocal iskeyword+=-,:,#,',$
 
@@ -32,5 +27,3 @@ nnoremap <silent> <buffer> <localleader>v :call smt2#PrintSolverVersion()<cr>
 
 " Comment String
 setlocal commentstring=;%s
-
-endif
diff --git a/ftplugin/solidity.vim b/ftplugin/solidity.vim
index 43bfb3f43..1d52826ee 100644
--- a/ftplugin/solidity.vim
+++ b/ftplugin/solidity.vim
@@ -1,12 +1,5 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/solidity.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('solidity', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
 
 setlocal commentstring=//\ %s
-
-endif
diff --git a/ftplugin/spec.vim b/ftplugin/spec.vim
index 772e218a7..a7b9f9cd8 100644
--- a/ftplugin/spec.vim
+++ b/ftplugin/spec.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/spec.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('spec', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spec') == -1
 
 " Plugin to update the %changelog section of RPM spec files
 " Filename: spec.vim
@@ -215,5 +210,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:undo_ftplugin = "unlet! b:match_ignorecase b:match_words"
-
-endif
diff --git a/ftplugin/sql.vim b/ftplugin/sql.vim
index bd49428ae..3338aed8f 100644
--- a/ftplugin/sql.vim
+++ b/ftplugin/sql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/sql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
 
 " SQL filetype plugin file
 " Language:    SQL (Common for Oracle, Microsoft SQL Server, Sybase)
@@ -555,5 +550,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:sw=4:
-
-endif
diff --git a/ftplugin/sshconfig.vim b/ftplugin/sshconfig.vim
index 3c7c13fc0..b68be8b14 100644
--- a/ftplugin/sshconfig.vim
+++ b/ftplugin/sshconfig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/sshconfig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sshconfig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshconfig') == -1
 
 " Vim filetype plugin file
 " Language:             OpenSSH client configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/stylus.vim b/ftplugin/stylus.vim
index b5c8aaee1..538a491a9 100644
--- a/ftplugin/stylus.vim
+++ b/ftplugin/stylus.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/stylus.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('stylus', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
 
 " Vim filetype plugin
 " Language: Stylus
@@ -70,5 +65,3 @@ let &cpo = s:save_cpo
 command! Stylus !clear; cat % | stylus
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/sudoers.vim b/ftplugin/sudoers.vim
index 3a09305ff..e085e5a63 100644
--- a/ftplugin/sudoers.vim
+++ b/ftplugin/sudoers.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/sudoers.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sudoers', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sudoers') == -1
 
 " Vim filetype plugin file
 " Language:             sudoers(5) configuration files
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/svelte.vim b/ftplugin/svelte.vim
index a7037418a..132e6bbe6 100644
--- a/ftplugin/svelte.vim
+++ b/ftplugin/svelte.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/svelte.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('svelte', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svelte') == -1
 
 " Vim filetype plugin
 " Language:   Svelte 3 (HTML/JavaScript)
@@ -50,5 +45,3 @@ if exists('g:loaded_ale')
     let b:ale_linters = ['stylelint', 'eslint']
   endif
 endif
-
-endif
diff --git a/ftplugin/swift.vim b/ftplugin/swift.vim
index 798a6b19c..830acfb7c 100644
--- a/ftplugin/swift.vim
+++ b/ftplugin/swift.vim
@@ -1,15 +1,8 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/swift.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('swift', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 
 setlocal commentstring=//\ %s
 " @-@ adds the literal @ to iskeyword for @IBAction and similar
 setlocal iskeyword+=@-@,#
 setlocal completefunc=syntaxcomplete#Complete
-
-endif
diff --git a/ftplugin/swiftgyb.vim b/ftplugin/swiftgyb.vim
index 878491128..6468b9cdd 100644
--- a/ftplugin/swiftgyb.vim
+++ b/ftplugin/swiftgyb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/swiftgyb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('swiftgyb', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swiftgyb') == -1
 
 " This source file is part of the Swift.org open source project
 "
@@ -18,5 +13,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swiftgyb') == -
 " Vim maintainer: Emir SARI <bitigchi@me.com>
 
 runtime! ftplugin/swift.vim
-
-endif
diff --git a/ftplugin/sysctl.vim b/ftplugin/sysctl.vim
index 87e08de28..efb8ce6b1 100644
--- a/ftplugin/sysctl.vim
+++ b/ftplugin/sysctl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/sysctl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sysctl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sysctl') == -1
 
 " Vim filetype plugin file
 " Language:             sysctl.conf(5) configuration file
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/systemd.vim b/ftplugin/systemd.vim
index a4ff2eb13..26adf612f 100644
--- a/ftplugin/systemd.vim
+++ b/ftplugin/systemd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/systemd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('systemd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemd') == -1
 
 " Vim filetype plugin file
 " Language:             systemd unit files
@@ -29,5 +24,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-
-endif
diff --git a/ftplugin/systemverilog.vim b/ftplugin/systemverilog.vim
index 4a322e038..2f0a72440 100644
--- a/ftplugin/systemverilog.vim
+++ b/ftplugin/systemverilog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/systemverilog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('systemverilog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemverilog') == -1
 
 " Vim filetype plugin file
 " Language:    SystemVerilog
@@ -18,5 +13,3 @@ endif
 
 " Behaves just like Verilog
 runtime! ftplugin/verilog.vim
-
-endif
diff --git a/ftplugin/tablegen.vim b/ftplugin/tablegen.vim
index 88516995f..28bd6fdd3 100644
--- a/ftplugin/tablegen.vim
+++ b/ftplugin/tablegen.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/tablegen.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 
 " Vim filetype plugin file
 " Language: LLVM TableGen
@@ -19,5 +14,3 @@ let b:did_ftplugin = 1
 setlocal matchpairs+=<:>
 setlocal softtabstop=2 shiftwidth=2
 setlocal expandtab
-
-endif
diff --git a/ftplugin/tcl.vim b/ftplugin/tcl.vim
index e1a6bf3e3..7ba25f7f6 100644
--- a/ftplugin/tcl.vim
+++ b/ftplugin/tcl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/tcl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tcl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
 
 " Vim filetype plugin file
 " Language:         Tcl
@@ -44,5 +39,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set et ts=4 sw=4 tw=78:
-
-endif
diff --git a/ftplugin/terminfo.vim b/ftplugin/terminfo.vim
index 9150f8c9c..a83ca282e 100644
--- a/ftplugin/terminfo.vim
+++ b/ftplugin/terminfo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/terminfo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('terminfo', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terminfo') == -1
 
 " Vim filetype plugin file
 " Language:             terminfo(5) definition
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index 2f6122c29..63e74df7a 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/terraform.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('terraform', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 
 " terraform.vim - basic vim/terraform integration
 " Maintainer: HashiVim <https://github.com/hashivim>
@@ -68,5 +63,3 @@ endif
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/tex.vim b/ftplugin/tex.vim
index 308b859a3..53b95e3f0 100644
--- a/ftplugin/tex.vim
+++ b/ftplugin/tex.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/tex.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tex', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
 
 " LaTeX filetype plugin
 " Language:     LaTeX (ft=tex)
@@ -53,5 +48,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:sts=2:sw=2:
-
-endif
diff --git a/ftplugin/text.vim b/ftplugin/text.vim
index 58f151a80..99d387f5a 100644
--- a/ftplugin/text.vim
+++ b/ftplugin/text.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/text.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('text', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'text') == -1
 
 " Vim filetype plugin
 " Language:		Text
@@ -25,5 +20,3 @@ let b:undo_ftplugin = 'setlocal comments< commentstring<'
 " for Mail quoted text with '>'.
 setlocal comments=fb:-,fb:*,n:>
 setlocal commentstring=
-
-endif
diff --git a/ftplugin/textile.vim b/ftplugin/textile.vim
index 6799e23a3..968289429 100644
--- a/ftplugin/textile.vim
+++ b/ftplugin/textile.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/textile.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('textile', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'textile') == -1
 
 " textile.vim
 "
@@ -66,5 +61,3 @@ function! TextileRenderBufferToTab()
   set syntax=html
 endfunction
 
-
-endif
diff --git a/ftplugin/tmux.vim b/ftplugin/tmux.vim
index 53aafc806..c598635f6 100644
--- a/ftplugin/tmux.vim
+++ b/ftplugin/tmux.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/tmux.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tmux', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1
 
 " Vim filetype plugin file
 " Language: tmux(1) configuration file
@@ -22,5 +17,3 @@ let b:undo_ftplugin = "setlocal comments< commentstring<"
 
 setlocal comments=:#
 setlocal commentstring=#\ %s
-
-endif
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
index 9d489fbcd..fb12e87c6 100644
--- a/ftplugin/toml.vim
+++ b/ftplugin/toml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/toml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('toml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'toml') == -1
 
 " File: ftplugin/toml.vim
 " Author: Kevin Ballard <kevin@sb.org>
@@ -28,5 +23,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: set et sw=4 ts=4:
-
-endif
diff --git a/ftplugin/treetop.vim b/ftplugin/treetop.vim
index 4069f641a..65a43fb79 100644
--- a/ftplugin/treetop.vim
+++ b/ftplugin/treetop.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/treetop.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('treetop', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'treetop') == -1
 
 " Vim filetype plugin file
 " Language:             Treetop
@@ -26,5 +21,3 @@ let b:undo_ftplugin = "setl com< cms< fo<"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/tt2html.vim b/ftplugin/tt2html.vim
index de8b63774..c1c47c56d 100644
--- a/ftplugin/tt2html.vim
+++ b/ftplugin/tt2html.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/tt2html.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Language:      TT2 embedded with HTML
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -20,5 +15,3 @@ endif
 
 " Just use the HTML plugin for now.
 runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
-
-endif
diff --git a/ftplugin/twig.vim b/ftplugin/twig.vim
index 52b14150e..ac52d1b9e 100644
--- a/ftplugin/twig.vim
+++ b/ftplugin/twig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/twig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('twig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
 
 " Vim filetype plugin
 " Language: Twig
@@ -47,5 +42,3 @@ else
 endif
 
 " vim:set sw=2:
-
-endif
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index fa14101b3..4eece3201 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/typescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " set Vi-incompatible, compiler and commentstring
 
@@ -89,5 +84,3 @@ let g:tagbar_type_typescript = {
 if get(g:, 'typescript_use_builtin_tagbar_defs', 1)
   let g:tagbar_type_typescript.deffile = expand('<sfile>:p:h:h') . '/ctags/typescript.ctags'
 endif
-
-endif
diff --git a/ftplugin/typescriptreact.vim b/ftplugin/typescriptreact.vim
index 159f91b05..7f60b3f9e 100644
--- a/ftplugin/typescriptreact.vim
+++ b/ftplugin/typescriptreact.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/typescriptreact.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " modified from mxw/vim-jsx from html.vim
 if exists("loaded_matchit") && !exists('b:tsx_match_words')
@@ -22,5 +17,3 @@ setlocal comments=s1:/*,mb:*,ex:*/,://
 setlocal formatoptions-=t formatoptions+=croql
 
 set suffixesadd+=.tsx
-
-endif
diff --git a/ftplugin/udevconf.vim b/ftplugin/udevconf.vim
index ccfd7155c..d82aea9eb 100644
--- a/ftplugin/udevconf.vim
+++ b/ftplugin/udevconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/udevconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('udevconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'udevconf') == -1
 
 " Vim filetype plugin file
 " Language:             udev(8) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/udevperm.vim b/ftplugin/udevperm.vim
index 47e415558..bdafc586a 100644
--- a/ftplugin/udevperm.vim
+++ b/ftplugin/udevperm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/udevperm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('udevperm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'udevperm') == -1
 
 " Vim filetype plugin file
 " Language:             udev(8) permissions file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/updatedb.vim b/ftplugin/updatedb.vim
index f3bf376b4..48f24051b 100644
--- a/ftplugin/updatedb.vim
+++ b/ftplugin/updatedb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/updatedb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('updatedb', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'updatedb') == -1
 
 " Vim filetype plugin file
 " Language:             updatedb.conf(5) configuration file
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/vala.vim b/ftplugin/vala.vim
index 7c4fcddcf..32d41d1b1 100644
--- a/ftplugin/vala.vim
+++ b/ftplugin/vala.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/vala.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
 
 if exists('b:did_ftplugin')
   finish
@@ -54,5 +49,3 @@ if (has("browsefilter")) && !exists("b:browsefilter")
         \ "Vala Vapi Files (*.vapi)\t*.vapi\n" .
         \ "All Files (*.*)\t*.*\n"
 endif
-
-endif
diff --git a/ftplugin/vb.vim b/ftplugin/vb.vim
index 2989165cc..23cbd0acf 100644
--- a/ftplugin/vb.vim
+++ b/ftplugin/vb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/vb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('visual-basic', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
 
 " Vim filetype plugin file
 " Language:	VisualBasic (ft=vb)
@@ -52,5 +47,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/verilog.vim b/ftplugin/verilog.vim
index ed2fd707a..5b1233353 100644
--- a/ftplugin/verilog.vim
+++ b/ftplugin/verilog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/verilog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('verilog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilog') == -1
 
 " Vim filetype plugin file
 " Language:	Verilog HDL
@@ -73,5 +68,3 @@ endif
 " Reset 'cpoptions' back to the user's setting
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/vhdl.vim b/ftplugin/vhdl.vim
index 81c6cadf2..0e98087c5 100644
--- a/ftplugin/vhdl.vim
+++ b/ftplugin/vhdl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/vhdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vhdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vhdl') == -1
 
 " VHDL filetype plugin
 " Language:    VHDL
@@ -95,5 +90,3 @@ vnoremap <buffer><silent>][ :<C-u>cal <SID>CountWrapper('][')<CR>
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/vlang.vim b/ftplugin/vlang.vim
index 0a04d5ea9..a3d3ceac2 100644
--- a/ftplugin/vlang.vim
+++ b/ftplugin/vlang.vim
@@ -1,13 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/vlang.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('v', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'v') == -1
 
 setlocal commentstring=//\ %s
 setlocal makeprg=v\ %
-
-endif
diff --git a/ftplugin/vroom.vim b/ftplugin/vroom.vim
index d13b5fe51..b73c76f3e 100644
--- a/ftplugin/vroom.vim
+++ b/ftplugin/vroom.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/vroom.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vroom', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vroom') == -1
 
 " Vim filetype plugin file
 " Language:	Vroom (vim testing and executable documentation)
@@ -42,5 +37,3 @@ setlocal commentstring=
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/vue.vim b/ftplugin/vue.vim
index 36e5293cb..6cc068c61 100644
--- a/ftplugin/vue.vim
+++ b/ftplugin/vue.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/vue.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vue', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
 
 " Vim filetype plugin
 " Language: Vue.js
@@ -26,5 +21,3 @@ if !exists('g:no_plugin_maps') && !exists('g:no_vue_maps')
   nnoremap <silent> <buffer> [] :call search('^</\(template\<Bar>script\<Bar>style\)', 'bW')<CR>
   nnoremap <silent> <buffer> ][ :call search('^</\(template\<Bar>script\<Bar>style\)', 'W')<CR>
 endif
-
-endif
diff --git a/ftplugin/wast.vim b/ftplugin/wast.vim
index f6a103c7a..8e8b16b2d 100644
--- a/ftplugin/wast.vim
+++ b/ftplugin/wast.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/wast.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('wast', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wast') == -1
 
 " Vim filetype plugin file
 " Language:     WebAssembly
@@ -24,5 +19,3 @@ setlocal formatoptions-=t
 setlocal iskeyword+=$,.,/
 
 let b:undo_ftplugin = "setlocal comments< commentstring< formatoptions< iskeyword<"
-
-endif
diff --git a/ftplugin/xdefaults.vim b/ftplugin/xdefaults.vim
index 9431ee402..9c7c7731a 100644
--- a/ftplugin/xdefaults.vim
+++ b/ftplugin/xdefaults.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/xdefaults.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xdefaults', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xdefaults') == -1
 
 " Vim filetype plugin file
 " Language:             X resources files like ~/.Xdefaults (xrdb)
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/xf86conf.vim b/ftplugin/xf86conf.vim
index d44adb27c..62e7e0e6d 100644
--- a/ftplugin/xf86conf.vim
+++ b/ftplugin/xf86conf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/xf86conf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xf86conf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xf86conf') == -1
 
 " Vim filetype plugin file
 " Language:             XFree86 Configuration File
@@ -26,5 +21,3 @@ setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/xhtml.vim b/ftplugin/xhtml.vim
index 48c5ee71e..a2f6a7246 100644
--- a/ftplugin/xhtml.vim
+++ b/ftplugin/xhtml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/xhtml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xhtml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xhtml') == -1
 
 " Vim filetype plugin file
 " Language:	xhtml
@@ -74,5 +69,3 @@ let b:undo_ftplugin = "unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/xinetd.vim b/ftplugin/xinetd.vim
index f0e459d56..c489135c8 100644
--- a/ftplugin/xinetd.vim
+++ b/ftplugin/xinetd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/xinetd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xinetd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xinetd') == -1
 
 " Vim filetype plugin file
 " Language:             xinetd.conf(5) configuration file
@@ -27,5 +22,3 @@ setlocal formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/xmodmap.vim b/ftplugin/xmodmap.vim
index 7a2216a2f..c80fbd349 100644
--- a/ftplugin/xmodmap.vim
+++ b/ftplugin/xmodmap.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/xmodmap.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xmodmap', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xmodmap') == -1
 
 " Vim filetype plugin file
 " Language:             xmodmap(1) definition file
@@ -26,5 +21,3 @@ setlocal comments=:! commentstring=!\ %s formatoptions-=t formatoptions+=croql
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/xs.vim b/ftplugin/xs.vim
index 0ebb13da2..a3f996a88 100644
--- a/ftplugin/xs.vim
+++ b/ftplugin/xs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/xs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim filetype plugin file
 " Language:      XS (Perl extension interface language)
@@ -21,5 +16,3 @@ endif
 
 " Just use the C plugin for now.
 runtime! ftplugin/c.vim ftplugin/c_*.vim ftplugin/c/*.vim
-
-endif
diff --git a/ftplugin/xsd.vim b/ftplugin/xsd.vim
index 6b58eb295..d48496827 100644
--- a/ftplugin/xsd.vim
+++ b/ftplugin/xsd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/xsd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xsd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
 
 " Vim filetype plugin file
 " Language:	xsd
@@ -46,5 +41,3 @@ let b:undo_ftplugin = "unlet! b:browsefilter | " . s:undo_ftplugin
 " Restore the saved compatibility options.
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/ftplugin/xslt.vim b/ftplugin/xslt.vim
index b4109e578..034cefbb3 100644
--- a/ftplugin/xslt.vim
+++ b/ftplugin/xslt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/xslt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xslt', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xslt') == -1
 
 " Vim filetype plugin file
 " Language:	xslt
@@ -23,5 +18,3 @@ let b:did_ftplugin = 1
 if has("gui_win32") && exists("b:browsefilter")
     let  b:browsefilter="XSLT Files (*.xsl,*.xslt)\t*.xsl;*.xslt\n" . b:browsefilter
 endif
-
-endif
diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim
index 5675a9e93..5ffdb31a9 100644
--- a/ftplugin/yaml.vim
+++ b/ftplugin/yaml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/yaml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('yaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 
 " Vim filetype plugin file
 " Language:             YAML (YAML Ain't Markup Language)
@@ -32,5 +27,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index 79d177e24..7762b8772 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/zig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -54,5 +49,3 @@ let b:undo_ftplugin =
 let &cpo = s:cpo_orig
 unlet s:cpo_orig
 " vim: tabstop=8 shiftwidth=4 softtabstop=4 expandtab
-
-endif
diff --git a/ftplugin/zimbu.vim b/ftplugin/zimbu.vim
index d62996855..71575497f 100644
--- a/ftplugin/zimbu.vim
+++ b/ftplugin/zimbu.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'ftplugin/zimbu.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zimbu', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zimbu') == -1
 
 " Vim filetype plugin file
 " Language:	Zimbu
@@ -160,5 +155,3 @@ endfunc
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/Jenkinsfile.vim b/indent/Jenkinsfile.vim
index 438d69911..74390b236 100644
--- a/indent/Jenkinsfile.vim
+++ b/indent/Jenkinsfile.vim
@@ -1,12 +1,5 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/Jenkinsfile.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jenkins', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jenkins') == -1
 
 runtime indent/groovy.vim
-
-endif
diff --git a/indent/aap.vim b/indent/aap.vim
index 799112c86..fde2ebc44 100644
--- a/indent/aap.vim
+++ b/indent/aap.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/aap.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('aap', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aap') == -1
 
 " Vim indent file
 " Language:	Aap recipe
@@ -19,5 +14,3 @@ endif
 
 " Works mostly like Python.
 runtime! indent/python.vim
-
-endif
diff --git a/indent/ada.vim b/indent/ada.vim
index 3240a7958..6c924fbce 100644
--- a/indent/ada.vim
+++ b/indent/ada.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/ada.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ada', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ada') == -1
 
 "------------------------------------------------------------------------------
 "  Description: Vim Ada indent file
@@ -315,5 +310,3 @@ finish " 1}}}
 "------------------------------------------------------------------------------
 " vim: textwidth=78 wrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
 " vim: foldmethod=marker
-
-endif
diff --git a/indent/ansible.vim b/indent/ansible.vim
index 6686d9ab7..f6a9cbef0 100644
--- a/indent/ansible.vim
+++ b/indent/ansible.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/ansible.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 let s:save_cpo = &cpo
 set cpo&vim
@@ -66,5 +61,3 @@ function GetAnsibleIndent(lnum)
 endfunction
 
 let &cpo = s:save_cpo
-
-endif
diff --git a/indent/ant.vim b/indent/ant.vim
index d0af9c745..e6a466887 100644
--- a/indent/ant.vim
+++ b/indent/ant.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/ant.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ant', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ant') == -1
 
 " Vim indent file
 " Language:    ANT files
@@ -19,5 +14,3 @@ endif
 
 " Use XML formatting rules
 runtime! indent/xml.vim
-
-endif
diff --git a/indent/applescript.vim b/indent/applescript.vim
index 0e31d286e..88fc68356 100644
--- a/indent/applescript.vim
+++ b/indent/applescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/applescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('applescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
 
 "Plugin Name: applescript indent file.
 "Author: mityu
@@ -84,5 +79,3 @@ let &cpo=s:cpo_save
 unlet s:cpo_save
 
 " vim: foldmethod=marker
-
-endif
diff --git a/indent/arduino.vim b/indent/arduino.vim
index 90c72c7c5..ede5e1e68 100644
--- a/indent/arduino.vim
+++ b/indent/arduino.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/arduino.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('arduino', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
 
 " Vim indent file
 " Language:	Arduino
@@ -22,5 +17,3 @@ let b:did_indent = 1
 setlocal cindent
 
 let b:undo_indent = "setl cin<"
-
-endif
diff --git a/indent/autohotkey.vim b/indent/autohotkey.vim
index 354ceeb93..99d8b6d5b 100644
--- a/indent/autohotkey.vim
+++ b/indent/autohotkey.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/autohotkey.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('autohotkey', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'autohotkey') == -1
 
 " Vim indent file
 " Language:   AutoHotkey
@@ -226,5 +221,3 @@ function! GetAutoHotkeyIndent()
 endfunction
 
 let b:did_indent = 1
-
-endif
diff --git a/indent/automake.vim b/indent/automake.vim
index 4bded6f79..4fd489fae 100644
--- a/indent/automake.vim
+++ b/indent/automake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/automake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('automake', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'automake') == -1
 
 " Vim indent file
 " Language:    	    automake
@@ -18,5 +13,3 @@ endif
 
 " same as makefile indenting for now.
 runtime! indent/make.vim
-
-endif
diff --git a/indent/awk.vim b/indent/awk.vim
index 5e802ecdd..ba18e12e1 100644
--- a/indent/awk.vim
+++ b/indent/awk.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/awk.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('awk', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'awk') == -1
 
 "  vim: set sw=3 sts=3:
 
@@ -239,5 +234,3 @@ function! s:Safe_indent( base, wordlen, this_line )
    endif
    return indent + a:wordlen
 endfunction
-
-endif
diff --git a/indent/bib.vim b/indent/bib.vim
index 619859fc5..37622c701 100644
--- a/indent/bib.vim
+++ b/indent/bib.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/bib.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bib', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bib') == -1
 
 " Vim indent file
 " Language:      BibTeX
@@ -22,5 +17,3 @@ let b:did_indent = 1
 setlocal cindent
 
 let b:undo_indent = "setl cin<"
-
-endif
diff --git a/indent/blade.vim b/indent/blade.vim
index efdecf321..a16266c14 100644
--- a/indent/blade.vim
+++ b/indent/blade.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/blade.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('blade', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 
 " Vim indent file
 " Language:     Blade (Laravel)
@@ -102,5 +97,3 @@ function! GetBladeIndent()
 
     return indent
 endfunction
-
-endif
diff --git a/indent/bst.vim b/indent/bst.vim
index adc852ae5..29ae2961f 100644
--- a/indent/bst.vim
+++ b/indent/bst.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/bst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bst') == -1
 
 " Vim indent file
 " Language:	bst
@@ -82,5 +77,3 @@ function! GetBstIndent(lnum) abort
     let ind = ind - shiftwidth() * s:count(fakeline,'}')
     return ind
 endfunction
-
-endif
diff --git a/indent/bzl.vim b/indent/bzl.vim
index e41ba9c99..2ee9d707a 100644
--- a/indent/bzl.vim
+++ b/indent/bzl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/bzl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bzl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
 
 " Vim indent file
 " Language:	Bazel (http://bazel.io)
@@ -101,5 +96,3 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/indent/cabal.vim b/indent/cabal.vim
index 1698e16d4..e65eee71e 100644
--- a/indent/cabal.vim
+++ b/indent/cabal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/cabal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 
 " indentation for cabal
 "
@@ -38,5 +33,3 @@ function! GetCabalIndent()
     return match(l:prevline, '\S')
   endif
 endfunction
-
-endif
diff --git a/indent/caddyfile.vim b/indent/caddyfile.vim
index 11980473e..1db00f220 100644
--- a/indent/caddyfile.vim
+++ b/indent/caddyfile.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/caddyfile.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('caddyfile', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
 
 if exists('b:did_indent')
 	finish
@@ -48,5 +43,3 @@ function! GetCaddyfileIndent(lnum)
 
 	return ind
 endfunction
-
-endif
diff --git a/indent/cdl.vim b/indent/cdl.vim
index 3f69f349e..e52b80827 100644
--- a/indent/cdl.vim
+++ b/indent/cdl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/cdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdl') == -1
 
 " Description:	Comshare Dimension Definition Language (CDL)
 " Author:	Raul Segura Acevedo <raulseguraaceved@netscape.net>
@@ -136,5 +131,3 @@ fun! CdlGetIndent(lnum)
 
   return ind
 endfun
-
-endif
diff --git a/indent/ch.vim b/indent/ch.vim
index 0b606769f..bcee5c3c7 100644
--- a/indent/ch.vim
+++ b/indent/ch.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/ch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ch', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ch') == -1
 
 " Vim indent file
 " Language:	Ch
@@ -25,5 +20,3 @@ let b:did_indent = 1
 
 " Ch indenting is built-in, thus this is very simple
 setlocal cindent
-
-endif
diff --git a/indent/chaiscript.vim b/indent/chaiscript.vim
index 967f4ce0b..ba2908f95 100644
--- a/indent/chaiscript.vim
+++ b/indent/chaiscript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/chaiscript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('chaiscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chaiscript') == -1
 
 " Vim indent file
 " Language:     ChaiScript
@@ -57,5 +52,3 @@ function! GetChaiScriptIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/clojure.vim b/indent/clojure.vim
index c2dd0cdcc..72bff69f9 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/clojure.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('clojure', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 
 " Vim indent file
 " Language:     Clojure
@@ -410,5 +405,3 @@ let &cpo = s:save_cpo
 unlet! s:save_cpo
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif
diff --git a/indent/cmake.vim b/indent/cmake.vim
index 30af204e8..49e8fd961 100644
--- a/indent/cmake.vim
+++ b/indent/cmake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/cmake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cmake', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmake') == -1
 
 " Vim indent file
 " Language:     CMake (ft=cmake)
@@ -96,5 +91,3 @@ endfun
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/indent/cobol.vim b/indent/cobol.vim
index e09bc85b7..c962a0d00 100644
--- a/indent/cobol.vim
+++ b/indent/cobol.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/cobol.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cobol', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cobol') == -1
 
 " Vim indent file
 " Language:	cobol
@@ -230,5 +225,3 @@ function! GetCobolIndent(lnum) abort
     endif
     return ind < bshft ? bshft : ind
 endfunction
-
-endif
diff --git a/indent/coffee.vim b/indent/coffee.vim
index dca66e4e6..6fc21afc7 100644
--- a/indent/coffee.vim
+++ b/indent/coffee.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/coffee.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -435,5 +430,3 @@ function! GetCoffeeIndent(curlnum)
   " No special rules applied, so use the default policy.
   exec 'return' s:GetDefaultPolicy(a:curlnum)
 endfunction
-
-endif
diff --git a/indent/config.vim b/indent/config.vim
index 4a500a02c..096f5b405 100644
--- a/indent/config.vim
+++ b/indent/config.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/config.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('config', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'config') == -1
 
 " Vim indent file
 " Language:             Autoconf configure.{ac,in} file
@@ -89,5 +84,3 @@ function GetConfigIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/crystal.vim b/indent/crystal.vim
index c405f3584..9b3a8d532 100644
--- a/indent/crystal.vim
+++ b/indent/crystal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/crystal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " Initialization {{{1
 " ==============
@@ -117,5 +112,3 @@ endfunction
 " }}}1
 
 " vim:sw=2 sts=2 ts=8 fdm=marker et:
-
-endif
diff --git a/indent/cs.vim b/indent/cs.vim
index dad26529c..60e2a61de 100644
--- a/indent/cs.vim
+++ b/indent/cs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/cs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cs', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
 
 " Vim indent file
 " Language:            C#
@@ -80,5 +75,3 @@ let &cpoptions = s:save_cpo
 unlet s:save_cpo
 
 " vim:et:sw=2:sts=2
-
-endif
diff --git a/indent/css.vim b/indent/css.vim
index 331317470..a831c77b3 100644
--- a/indent/css.vim
+++ b/indent/css.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/css.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('css', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'css') == -1
 
 " Vim indent file
 " Language:	    CSS
@@ -91,5 +86,3 @@ endfunction
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/indent/cucumber.vim b/indent/cucumber.vim
index 52fad8488..72826cca4 100644
--- a/indent/cucumber.vim
+++ b/indent/cucumber.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/cucumber.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cucumber', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 
 " Vim indent file
 " Language:	Cucumber
@@ -82,5 +77,3 @@ function! GetCucumberIndent()
 endfunction
 
 " vim:set sts=2 sw=2:
-
-endif
diff --git a/indent/cuda.vim b/indent/cuda.vim
index c878c4722..10c26fd69 100644
--- a/indent/cuda.vim
+++ b/indent/cuda.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/cuda.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cuda', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cuda') == -1
 
 " Vim indent file
 " Language:	CUDA
@@ -22,5 +17,3 @@ let b:did_indent = 1
 setlocal cindent
 
 let b:undo_indent = "setl cin<"
-
-endif
diff --git a/indent/cython.vim b/indent/cython.vim
index c8b0e997e..5f13b77ef 100644
--- a/indent/cython.vim
+++ b/indent/cython.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/cython.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('python-indent', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-indent') == -1
 
 " PEP8 compatible Python indent file
 " Language:         Python
@@ -461,5 +456,3 @@ function! GetPythonPEPIndent(lnum)
 
     return s:indent_like_previous_line(a:lnum)
 endfunction
-
-endif
diff --git a/indent/d.vim b/indent/d.vim
index 7a0a195d7..c121801bc 100644
--- a/indent/d.vim
+++ b/indent/d.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/d.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 " Vim indent file for the D programming language (version 1.076 and 2.063).
 "
@@ -84,5 +79,3 @@ function GetDIndent()
 
   return cind
 endfunction
-
-endif
diff --git a/indent/dart.vim b/indent/dart.vim
index aa9d99f93..45bedcf80 100644
--- a/indent/dart.vim
+++ b/indent/dart.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/dart.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dart', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 
 if exists('b:did_indent')
   finish
@@ -42,5 +37,3 @@ function! DartIndent()
 
   return indentTo
 endfunction
-
-endif
diff --git a/indent/dictconf.vim b/indent/dictconf.vim
index 478d2b4c7..c721105c5 100644
--- a/indent/dictconf.vim
+++ b/indent/dictconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/dictconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dictconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictconf') == -1
 
 " Vim indent file
 " Language:             dict(1) configuration file
@@ -20,5 +15,3 @@ let b:did_indent = 1
 setlocal indentkeys=0{,0},!^F,o,O cinwords= autoindent smartindent
 setlocal nosmartindent
 inoremap <buffer> # X#
-
-endif
diff --git a/indent/dictdconf.vim b/indent/dictdconf.vim
index fc9489393..68460d330 100644
--- a/indent/dictdconf.vim
+++ b/indent/dictdconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/dictdconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dictdconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictdconf') == -1
 
 " Vim indent file
 " Language:             dictd(8) configuration file
@@ -20,5 +15,3 @@ let b:did_indent = 1
 setlocal indentkeys=0{,0},!^F,o,O cinwords= autoindent smartindent
 setlocal nosmartindent
 inoremap <buffer> # X#
-
-endif
diff --git a/indent/dosbatch.vim b/indent/dosbatch.vim
index 60949ddaa..0f7dec485 100644
--- a/indent/dosbatch.vim
+++ b/indent/dosbatch.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/dosbatch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dosbatch', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosbatch') == -1
 
 " Vim indent file
 " Language:	MSDOS batch file (with NT command extensions)
@@ -66,5 +61,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8 sw=2 sts=2
-
-endif
diff --git a/indent/dtd.vim b/indent/dtd.vim
index 7dfe14db5..0653c474a 100644
--- a/indent/dtd.vim
+++ b/indent/dtd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/dtd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dtd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dtd') == -1
 
 " Vim indent file
 " Language:    	    DTD (Document Type Definition for XML)
@@ -332,5 +327,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/dune.vim b/indent/dune.vim
index 563ed1989..f2c066155 100644
--- a/indent/dune.vim
+++ b/indent/dune.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/dune.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim indent file
 " Language: dune
@@ -17,5 +12,3 @@ let b:did_indent = 1
 
 " dune format-dune-file uses 1 space to indent
 set softtabstop=1 shiftwidth=1 expandtab
-
-endif
diff --git a/indent/dylan.vim b/indent/dylan.vim
index f5a9c835a..da2e5bc00 100644
--- a/indent/dylan.vim
+++ b/indent/dylan.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/dylan.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dylan', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylan') == -1
 
 " Vim indent file
 " Language:	Dylan
@@ -97,5 +92,3 @@ function DylanGetIndent()
 endfunction
 
 " vim:sw=2 tw=130
-
-endif
diff --git a/indent/ecrystal.vim b/indent/ecrystal.vim
index 2bca7b1b0..483f9d0cd 100644
--- a/indent/ecrystal.vim
+++ b/indent/ecrystal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/ecrystal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " Setup {{{1
 " =====
@@ -483,5 +478,3 @@ endfunction
 " }}}
 
 " vim:fdm=marker
-
-endif
diff --git a/indent/eelixir.vim b/indent/eelixir.vim
index f45af4934..56081e231 100644
--- a/indent/eelixir.vim
+++ b/indent/eelixir.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/eelixir.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists("b:did_indent")
   finish
@@ -79,5 +74,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/elixir.vim b/indent/elixir.vim
index a2854f172..4d135c2ee 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/elixir.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists("b:did_indent")
   finish
@@ -22,5 +17,3 @@ setlocal indentkeys+=*<Return>,=->,=\|>,=<>,0},0],0)
 function! elixir#indent(lnum)
   return elixir#indent#indent(a:lnum)
 endfunction
-
-endif
diff --git a/indent/elm.vim b/indent/elm.vim
index 731f8f875..4a8a540a0 100644
--- a/indent/elm.vim
+++ b/indent/elm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/elm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 
 " indentation for Elm (https://elm-lang.org/)
 
@@ -119,5 +114,3 @@ function! GetElmIndent()
 
 	return l:ind
 endfunc
-
-endif
diff --git a/indent/ember-script.vim b/indent/ember-script.vim
index de519c348..0e9bdc93b 100644
--- a/indent/ember-script.vim
+++ b/indent/ember-script.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/ember-script.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('emberscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
 
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
@@ -21,5 +16,3 @@ endif
 runtime! indent/coffee.vim
 unlet! b:did_indent
 let b:did_indent = 1
-
-endif
diff --git a/indent/emblem.vim b/indent/emblem.vim
index 7653e6fb2..86937ed90 100644
--- a/indent/emblem.vim
+++ b/indent/emblem.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/emblem.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('emblem', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
@@ -13,5 +8,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 " Version:     2.0.1
 " Last Change: 2016 Jul 6
 " License:     ISC
-
-endif
diff --git a/indent/erlang.vim b/indent/erlang.vim
index b66ccd592..2a35b1af5 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/erlang.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('erlang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
 
 " Vim indent file
 " Language:     Erlang (http://www.erlang.org)
@@ -1490,5 +1485,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 et fdm=marker
-
-endif
diff --git a/indent/eruby.vim b/indent/eruby.vim
index 7ba4bf526..98e5b8a0b 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/eruby.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim indent file
 " Language:		eRuby
@@ -117,5 +112,3 @@ let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
 " vim:set sw=2 sts=2 ts=8 noet:
-
-endif
diff --git a/indent/eterm.vim b/indent/eterm.vim
index e0b391ef7..d0a68a7c7 100644
--- a/indent/eterm.vim
+++ b/indent/eterm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/eterm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('eterm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'eterm') == -1
 
 " Vim indent file
 " Language:             Eterm configuration file
@@ -43,5 +38,3 @@ function GetEtermIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/falcon.vim b/indent/falcon.vim
index bdd716a26..a92a517bf 100644
--- a/indent/falcon.vim
+++ b/indent/falcon.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/falcon.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('falcon', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'falcon') == -1
 
 " Vim indent file
 " Language: Falcon
@@ -458,5 +453,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set sw=4 sts=4 et tw=80 :
-
-endif
diff --git a/indent/fennel.vim b/indent/fennel.vim
index cddb58271..90ccd467d 100644
--- a/indent/fennel.vim
+++ b/indent/fennel.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/fennel.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fennel', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fennel') == -1
 
 " Vim filetype plugin file
 " Language: FENNEL
@@ -333,5 +328,3 @@ endif
 
 let &cpo = s:save_cpo
 unlet! s:save_cpo
-
-endif
diff --git a/indent/fish.vim b/indent/fish.vim
index f62375fb1..5b314c7fa 100644
--- a/indent/fish.vim
+++ b/indent/fish.vim
@@ -1,13 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/fish.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fish', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 
 setlocal indentexpr=fish#Indent()
 setlocal indentkeys+==end,=else,=case
-
-endif
diff --git a/indent/fortran.vim b/indent/fortran.vim
index cb00f26dd..7aac6b5b4 100644
--- a/indent/fortran.vim
+++ b/indent/fortran.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/fortran.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fortran', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
 
 " Vim indent file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
@@ -226,5 +221,3 @@ let &cpoptions=s:cposet
 unlet s:cposet
 
 " vim:sw=2 tw=130
-
-endif
diff --git a/indent/framescript.vim b/indent/framescript.vim
index de80fd70f..6371d8cba 100644
--- a/indent/framescript.vim
+++ b/indent/framescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/framescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('framescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'framescript') == -1
 
 " Vim indent file
 " Language:             FrameScript
@@ -48,5 +43,3 @@ function GetFrameScriptIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/fsharp.vim b/indent/fsharp.vim
index cb4af8cc6..0ab8dfff2 100644
--- a/indent/fsharp.vim
+++ b/indent/fsharp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/fsharp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fsharp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
 
 " Vim indent file
 " Language:     FSharp
@@ -256,5 +251,3 @@ function! GetFsharpIndent()
 endfunction
 
 " vim: sw=4 et sts=4
-
-endif
diff --git a/indent/gdscript3.vim b/indent/gdscript3.vim
index 7fb7c84f9..93f4c26e5 100644
--- a/indent/gdscript3.vim
+++ b/indent/gdscript3.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/gdscript3.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gdscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdscript') == -1
 
 " Vim indent file
 " Language:		Python
@@ -207,5 +202,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:sw=2
-
-endif
diff --git a/indent/gitconfig.vim b/indent/gitconfig.vim
index 8155b3c7f..5cdd4ce44 100644
--- a/indent/gitconfig.vim
+++ b/indent/gitconfig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/gitconfig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim indent file
 " Language:	git config file
@@ -45,5 +40,3 @@ function! GetGitconfigIndent()
     return -1
   endif
 endfunction
-
-endif
diff --git a/indent/gitolite.vim b/indent/gitolite.vim
index d0f3e820e..c6517e79b 100644
--- a/indent/gitolite.vim
+++ b/indent/gitolite.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/gitolite.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gitolite', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitolite') == -1
 
 " Vim indent file
 " Language:	gitolite configuration
@@ -56,5 +51,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/glsl.vim b/indent/glsl.vim
index 442db43d3..db9b0ddb5 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/glsl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('glsl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
 
 " Language: OpenGL Shading Language
 " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
@@ -18,5 +13,3 @@ setlocal autoindent cindent
 setlocal formatoptions+=roq
 
 " vim:set sts=2 sw=2 :
-
-endif
diff --git a/indent/go.vim b/indent/go.vim
index a70243ad9..f3ee7ef72 100644
--- a/indent/go.vim
+++ b/indent/go.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/go.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " Copyright 2011 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
@@ -93,5 +88,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/indent/gohtmltmpl.vim b/indent/gohtmltmpl.vim
index ca2ad0609..f714d9df4 100644
--- a/indent/gohtmltmpl.vim
+++ b/indent/gohtmltmpl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/gohtmltmpl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:did_indent")
   finish
@@ -61,5 +56,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/indent/graphql.vim b/indent/graphql.vim
index 713381cb7..a02b28852 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/graphql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
 "
@@ -114,5 +109,3 @@ endfunction
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/haml.vim b/indent/haml.vim
index 8597f60db..9f5be96cf 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/haml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 
 " Vim indent file
 " Language:	Haml
@@ -81,5 +76,3 @@ function! GetHamlIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/hamster.vim b/indent/hamster.vim
index 2edb2e733..43411745f 100644
--- a/indent/hamster.vim
+++ b/indent/hamster.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/hamster.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hamster', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hamster') == -1
 
 " Vim indent file
 " Language:    Hamster Script 
@@ -62,5 +57,3 @@ function HamGetFreeIndent()
 endfunction
 
 " vim:sw=2 tw=80
-
-endif
diff --git a/indent/handlebars.vim b/indent/handlebars.vim
index a2a9e4e37..f58aa660b 100644
--- a/indent/handlebars.vim
+++ b/indent/handlebars.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/handlebars.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 " Mustache & Handlebars syntax
 " Language:	Mustache, Handlebars
@@ -132,5 +127,3 @@ function! GetHandlebarsIndent(...)
 
   return ind
 endfunction
-
-endif
diff --git a/indent/haskell.vim b/indent/haskell.vim
index 7f4d4a966..19f4e0760 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/haskell.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 
 " indentation for haskell
 "
@@ -516,5 +511,3 @@ function! GetHaskellIndent()
 
   return -1
 endfunction
-
-endif
diff --git a/indent/hcl.vim b/indent/hcl.vim
index e193b83b5..a0cd2b07b 100644
--- a/indent/hcl.vim
+++ b/indent/hcl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/hcl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hcl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hcl') == -1
 
 if exists('b:did_indent')
   finish
@@ -18,5 +13,3 @@ setlocal cindent
 
 " don't de-indent comments (cindent treats them like preprocessor directives)
 setlocal cinkeys-=0#
-
-endif
diff --git a/indent/hog.vim b/indent/hog.vim
index 3280d67d7..a7607314c 100644
--- a/indent/hog.vim
+++ b/indent/hog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/hog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hog') == -1
 
 " Vim indent file
 " Language:     hog (Snort.conf)
@@ -84,5 +79,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/html.vim b/indent/html.vim
index c89222783..b6ade453c 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/html.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('html', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html') == -1
 
 " Vim indent script for HTML
 " Maintainer:	Bram Moolenaar
@@ -1087,5 +1082,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: fdm=marker ts=8 sw=2 tw=78
-
-endif
diff --git a/indent/htmldjango.vim b/indent/htmldjango.vim
index 5e3b7fd11..27ba1b06a 100644
--- a/indent/htmldjango.vim
+++ b/indent/htmldjango.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/htmldjango.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('htmldjango', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
 
 " Vim indent file
 " Language:	Django HTML template
@@ -19,5 +14,3 @@ endif
 
 " Use HTML formatting rules.
 runtime! indent/html.vim
-
-endif
diff --git a/indent/idris.vim b/indent/idris.vim
index f3884f124..ffa22afdc 100644
--- a/indent/idris.vim
+++ b/indent/idris.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/idris.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 
 " indentation for idris (idris-lang.org)
 "
@@ -151,5 +146,3 @@ function! GetIdrisIndent()
 
   return match(prevline, '\S')
 endfunction
-
-endif
diff --git a/indent/idris2.vim b/indent/idris2.vim
index f2ea6e31d..81b816f85 100644
--- a/indent/idris2.vim
+++ b/indent/idris2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/idris2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
 
 " indentation for idris (idris-lang.org)
 "
@@ -151,5 +146,3 @@ function! GetIdrisIndent()
 
   return match(prevline, '\S')
 endfunction
-
-endif
diff --git a/indent/j.vim b/indent/j.vim
index dbea206c2..1c51552a4 100644
--- a/indent/j.vim
+++ b/indent/j.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/j.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('j', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'j') == -1
 
 " Vim indent file
 " Language:	J
@@ -57,5 +52,3 @@ function GetJIndent() abort
   endif
   return l:indent
 endfunction
-
-endif
diff --git a/indent/java.vim b/indent/java.vim
index 06a20d7a6..c61901228 100644
--- a/indent/java.vim
+++ b/indent/java.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/java.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('java', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'java') == -1
 
 " Vim indent file
 " Language:	Java
@@ -157,5 +152,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vi: sw=2 et
-
-endif
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 65acc8df8..40a6bb5da 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/javascript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 " Vim indent file
 " Language: Javascript
@@ -484,5 +479,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/json.vim b/indent/json.vim
index 71b269e73..a2e0b6d61 100644
--- a/indent/json.vim
+++ b/indent/json.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/json.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('json', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 
 " Vim indent file
 " Language:		JSON
@@ -184,5 +179,3 @@ unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 noet:
 
-
-endif
diff --git a/indent/jsp.vim b/indent/jsp.vim
index 0cbfc2ee1..4ff51051e 100644
--- a/indent/jsp.vim
+++ b/indent/jsp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/jsp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jsp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsp') == -1
 
 " Vim filetype indent file
 " Language:    JSP files
@@ -24,5 +19,3 @@ endif
 runtime! indent/html.vim
 
 
-
-endif
diff --git a/indent/jst.vim b/indent/jst.vim
index 4920d6d7c..507e8b562 100644
--- a/indent/jst.vim
+++ b/indent/jst.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/jst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
 
 if exists("b:did_indent")
   finish
@@ -82,5 +77,3 @@ endfunction
 
 " vim:set sw=2 sts=2 ts=8 noet:
 
-
-endif
diff --git a/indent/julia.vim b/indent/julia.vim
index 2db6fabab..3ea209a1f 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/julia.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Vim indent file
 " Language:	Julia
@@ -493,5 +488,3 @@ function GetJuliaIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/kotlin.vim b/indent/kotlin.vim
index fdb8891c3..996b2fd77 100644
--- a/indent/kotlin.vim
+++ b/indent/kotlin.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/kotlin.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('kotlin', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
 
 " Vim indent file
 " Language: Kotlin
@@ -63,5 +58,3 @@ function! GetKotlinIndent()
 
     return prev_indent
 endfunction
-
-endif
diff --git a/indent/ld.vim b/indent/ld.vim
index 9d671e54f..550b70325 100644
--- a/indent/ld.vim
+++ b/indent/ld.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/ld.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ld', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ld') == -1
 
 " Vim indent file
 " Language:             ld(1) script
@@ -91,5 +86,3 @@ function GetLDIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/ledger.vim b/indent/ledger.vim
index a79be9c18..110376106 100644
--- a/indent/ledger.vim
+++ b/indent/ledger.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/ledger.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ledger', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ledger') == -1
 
 " Vim filetype indent file
 " filetype: ledger
@@ -55,5 +50,3 @@ function GetLedgerIndent(...)
     return 0
   endif
 endf
-
-endif
diff --git a/indent/less.vim b/indent/less.vim
index 45276bea1..6ce917af4 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/less.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('less', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 
 " Vim indent file
 " Language:	less
@@ -20,5 +15,3 @@ endif
 runtime! indent/css.vim
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/lifelines.vim b/indent/lifelines.vim
index 3da037d15..70f21aa22 100644
--- a/indent/lifelines.vim
+++ b/indent/lifelines.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/lifelines.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lifelines', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lifelines') == -1
 
 " Vim indent file
 " Language:	LifeLines
@@ -31,5 +26,3 @@ setlocal cinoptions+=*500
 
 let b:undo_indent = "setl cin< cino< cinw<"
 " vim: ts=8 sw=4
-
-endif
diff --git a/indent/lilypond.vim b/indent/lilypond.vim
index 792ffbbf2..cdb418dab 100644
--- a/indent/lilypond.vim
+++ b/indent/lilypond.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/lilypond.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lilypond', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 
 " LilyPond indent file
 " Language:     LilyPond
@@ -67,5 +62,3 @@ endfunction
 "
 "
 "
-
-endif
diff --git a/indent/liquid.vim b/indent/liquid.vim
index 5c0ba0209..f3fb43a95 100644
--- a/indent/liquid.vim
+++ b/indent/liquid.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/liquid.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('liquid', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
 
 " Vim indent file
 " Language:     Liquid
@@ -70,5 +65,3 @@ function! GetLiquidIndent(...)
   let ind -= sw * s:count(cline,'{%\s*end\w*$')
   return ind
 endfunction
-
-endif
diff --git a/indent/lisp.vim b/indent/lisp.vim
index d920cf9ee..88a08b724 100644
--- a/indent/lisp.vim
+++ b/indent/lisp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/lisp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lisp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lisp') == -1
 
 " Vim indent file
 " Language:	Lisp
@@ -22,5 +17,3 @@ let b:did_indent = 1
 setlocal ai nosi
 
 let b:undo_indent = "setl ai< si<"
-
-endif
diff --git a/indent/litcoffee.vim b/indent/litcoffee.vim
index c7d3d29be..0515201f1 100644
--- a/indent/litcoffee.vim
+++ b/indent/litcoffee.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/litcoffee.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 if exists('b:did_indent')
   finish
@@ -29,5 +24,3 @@ function GetLitCoffeeIndent()
   endif
 endfunc
 
-
-endif
diff --git a/indent/llvm.vim b/indent/llvm.vim
index d57b3a125..53c6f999b 100644
--- a/indent/llvm.vim
+++ b/indent/llvm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/llvm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 
 " Vim indent file
 " Language:   llvm
@@ -79,5 +74,3 @@ function! GetLLVMIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/logtalk.vim b/indent/logtalk.vim
index 843dcc23a..863afedaa 100644
--- a/indent/logtalk.vim
+++ b/indent/logtalk.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/logtalk.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('logtalk', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logtalk') == -1
 
 "  Maintainer:	Paulo Moura <pmoura@logtalk.org>
 "  Revised on:	2018.08.04
@@ -71,5 +66,3 @@ function! GetLogtalkIndent()
 	endif
 	return ind
 endfunction
-
-endif
diff --git a/indent/ls.vim b/indent/ls.vim
index 41ebcac57..591ccf768 100644
--- a/indent/ls.vim
+++ b/indent/ls.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/ls.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('livescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 
 " Language:    LiveScript
 " Maintainer:  George Zahariev
@@ -271,5 +266,3 @@ function! GetLiveScriptIndent(curlinenum)
 
   return indent
 endfunction
-
-endif
diff --git a/indent/lua.vim b/indent/lua.vim
index f4bc40f06..537a390c8 100644
--- a/indent/lua.vim
+++ b/indent/lua.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/lua.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lua', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lua') == -1
 
 " Vim indent file
 " Language: Lua
@@ -135,5 +130,3 @@ function GetLuaIndent()
   return indent(prev_line) + (shiftwidth() * i)
 
 endfunction
-
-endif
diff --git a/indent/mail.vim b/indent/mail.vim
index 462bd9471..5899c2a46 100644
--- a/indent/mail.vim
+++ b/indent/mail.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/mail.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mail', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mail') == -1
 
 " Vim indent file
 " Language:	Mail
@@ -20,5 +15,3 @@ let b:did_indent = 1
 " What works best is auto-indenting, disable other indenting.
 " For formatting see the ftplugin.
 setlocal autoindent nosmartindent nocindent indentexpr=
-
-endif
diff --git a/indent/make.vim b/indent/make.vim
index f7aabdc59..0fe68ecb8 100644
--- a/indent/make.vim
+++ b/indent/make.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/make.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('make', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'make') == -1
 
 " Vim indent file
 " Language:             Makefile
@@ -123,5 +118,3 @@ function GetMakeIndent()
     endif
   endif
 endfunction
-
-endif
diff --git a/indent/mako.vim b/indent/mako.vim
index 27a09b051..34d7dbf66 100644
--- a/indent/mako.vim
+++ b/indent/mako.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/mako.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mako', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
 
 " Vim indent file
 " Language: Mako
@@ -435,5 +430,3 @@ fun! <SID>HtmlIndentSum(lnum, style)
 endfun
 
 " vim: set ts=4 sw=4:
-
-endif
diff --git a/indent/markdown.vim b/indent/markdown.vim
index 0e0ff248a..10c576d70 100644
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/markdown.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('markdown', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
 
 if exists("b:did_indent") | finish | endif
 let b:did_indent = 1
@@ -82,5 +77,3 @@ function GetMarkdownIndent()
         return ind
     endif
 endfunction
-
-endif
diff --git a/indent/meson.vim b/indent/meson.vim
index 6e055c7fc..d2bd16634 100644
--- a/indent/meson.vim
+++ b/indent/meson.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/meson.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('meson', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1
 
 " Vim indent file
 " Language:		Meson
@@ -187,5 +182,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:sw=2
-
-endif
diff --git a/indent/mf.vim b/indent/mf.vim
index a0158dd15..24c13c7b1 100644
--- a/indent/mf.vim
+++ b/indent/mf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/mf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mf') == -1
 
 " METAFONT indent file
 " Language:    METAFONT
@@ -13,5 +8,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mf') == -1
 " Last Change: 2016 Oct 1
 
 runtime! indent/mp.vim
-
-endif
diff --git a/indent/moon.vim b/indent/moon.vim
index d5c55ec4e..a71db55c7 100644
--- a/indent/moon.vim
+++ b/indent/moon.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/moon.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('moonscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
 
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
@@ -330,5 +325,3 @@ function! GetMoonIndent(curlinenum)
 
   return indent
 endfunction
-
-endif
diff --git a/indent/mp.vim b/indent/mp.vim
index 45f15f64a..6dca244ae 100644
--- a/indent/mp.vim
+++ b/indent/mp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/mp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mp') == -1
 
 " MetaPost indent file
 " Language:           MetaPost
@@ -367,5 +362,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:sw=2:fdm=marker
-
-endif
diff --git a/indent/mustache.vim b/indent/mustache.vim
index f546461c7..a7a0d3c31 100644
--- a/indent/mustache.vim
+++ b/indent/mustache.vim
@@ -1,12 +1,5 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/mustache.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 runtime! indent/handlebars.vim
-
-endif
diff --git a/indent/nginx.vim b/indent/nginx.vim
index c797da451..cd0af59f4 100644
--- a/indent/nginx.vim
+++ b/indent/nginx.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/nginx.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nginx', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
 
 if exists("b:did_indent")
     finish
@@ -18,5 +13,3 @@ setlocal indentexpr=
 setlocal cindent
 " Just make sure that the comments are not reset as defs would be.
 setlocal cinkeys-=0#
-
-endif
diff --git a/indent/nim.vim b/indent/nim.vim
index 9a3e62f31..25747ec51 100644
--- a/indent/nim.vim
+++ b/indent/nim.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/nim.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nim', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -149,5 +144,3 @@ endfunction
 
 " vim:sw=2
 
-
-endif
diff --git a/indent/nix.vim b/indent/nix.vim
index 15465a0ef..24b19cdc8 100644
--- a/indent/nix.vim
+++ b/indent/nix.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/nix.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nix', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 
 " Vim indent file
 " Language:    Nix
@@ -110,5 +105,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/nsis.vim b/indent/nsis.vim
index 61b29b4a0..ed4bd1616 100644
--- a/indent/nsis.vim
+++ b/indent/nsis.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/nsis.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nsis', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nsis') == -1
 
 " Vim indent file
 " Language:		NSIS script
@@ -98,5 +93,3 @@ function! GetNsisIndent(lnum)
 endfunction
 
 " vim: ts=8 sw=2 sts=2
-
-endif
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index d7a89a61c..3a0e70cf0 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/ocaml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim indent file
 " Language:     OCaml
@@ -281,5 +276,3 @@ function! GetOCamlIndent()
 endfunction
 
 " vim:sw=2
-
-endif
diff --git a/indent/occam.vim b/indent/occam.vim
index d6fefc76d..fea8e44d2 100644
--- a/indent/occam.vim
+++ b/indent/occam.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/occam.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('occam', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'occam') == -1
 
 " Vim indent file
 " Language:	occam
@@ -194,5 +189,3 @@ endfunction
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/indent/octave.vim b/indent/octave.vim
index f15e67455..fbbf03146 100644
--- a/indent/octave.vim
+++ b/indent/octave.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/octave.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('octave', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'octave') == -1
 
 " Vim indent file
 " Language:            Octave
@@ -80,5 +75,3 @@ endfunction
 
 setlocal indentexpr=GetOctaveIndent()
 setlocal autoindent
-
-endif
diff --git a/indent/odin.vim b/indent/odin.vim
index 5c94c67da..50f247bd5 100644
--- a/indent/odin.vim
+++ b/indent/odin.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/odin.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('odin', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'odin') == -1
 
 if exists("b:did_indent")
   finish
@@ -44,5 +39,3 @@ function! GetOdinIndent(lnum)
 
   return ind
 endfunction
-
-endif
diff --git a/indent/omake.vim b/indent/omake.vim
index 87ace1771..3f1e550d1 100644
--- a/indent/omake.vim
+++ b/indent/omake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/omake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim indent file
 " Language:         OMakefile
@@ -121,5 +116,3 @@ function GetMakeIndent()
     endif
   endif
 endfunction
-
-endif
diff --git a/indent/opencl.vim b/indent/opencl.vim
index 6914df5fe..75d7059cc 100644
--- a/indent/opencl.vim
+++ b/indent/opencl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/opencl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('opencl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -17,5 +12,3 @@ if version > 600
 endif
 
 let b:did_indent = 1
-
-endif
diff --git a/indent/pascal.vim b/indent/pascal.vim
index f07cb0e4d..a58cb87bf 100644
--- a/indent/pascal.vim
+++ b/indent/pascal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/pascal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pascal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pascal') == -1
 
 " Vim indent file
 " Language:    Pascal
@@ -235,5 +230,3 @@ function! GetPascalIndent( line_num )
 	return indnt
 endfunction
 
-
-endif
diff --git a/indent/perl.vim b/indent/perl.vim
index 4c671bc3b..c0871db67 100644
--- a/indent/perl.vim
+++ b/indent/perl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/perl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim indent file
 " Language:      Perl 5
@@ -187,5 +182,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=8:sts=4:sw=4:expandtab:ft=vim
-
-endif
diff --git a/indent/pgsql.vim b/indent/pgsql.vim
index ac967355a..4a3e91446 100644
--- a/indent/pgsql.vim
+++ b/indent/pgsql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/pgsql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pgsql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pgsql') == -1
 
 " Vim indent file
 " Language:    SQL
@@ -396,5 +391,3 @@ endfunction
 let &cpo= s:keepcpo
 unlet s:keepcpo
 " vim: ts=4 fdm=marker sw=4
-
-endif
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index c0f3065b7..1620a7c61 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/plantuml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('plantuml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
 
 scriptencoding utf-8
 " Vim indent file
@@ -92,5 +87,3 @@ function! s:getIncIndent() abort
         \ '^\s*skinparam\>.*{\s*$\|' .
         \ s:typeKeywordIncPattern()
 endfunction
-
-endif
diff --git a/indent/pony.vim b/indent/pony.vim
index 51f668de2..7d1dc3d22 100644
--- a/indent/pony.vim
+++ b/indent/pony.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/pony.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pony', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 
 " Vim indent file
 " Language:     Pony
@@ -44,5 +39,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:did_indent = 1
-
-endif
diff --git a/indent/postscr.vim b/indent/postscr.vim
index 897976485..ba7ce4197 100644
--- a/indent/postscr.vim
+++ b/indent/postscr.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/postscr.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('postscr', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'postscr') == -1
 
 " PostScript indent file
 " Language:    PostScript
@@ -75,5 +70,3 @@ function! PostscrIndentGet(lnum)
 endfunction
 
 " vim:sw=2
-
-endif
diff --git a/indent/pov.vim b/indent/pov.vim
index 1964b7b80..13e0f96f5 100644
--- a/indent/pov.vim
+++ b/indent/pov.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/pov.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pov', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pov') == -1
 
 " Vim indent file
 " Language: PoV-Ray Scene Description Language
@@ -91,5 +86,3 @@ function GetPoVRayIndent()
 
   return final < 0 ? 0 : final
 endfunction
-
-endif
diff --git a/indent/prolog.vim b/indent/prolog.vim
index cb97bf863..420edee7d 100644
--- a/indent/prolog.vim
+++ b/indent/prolog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/prolog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('prolog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
 
 "  vim: set sw=4 sts=4:
 "  Maintainer	: Gergely Kontra <kgergely@mcl.hu>
@@ -74,5 +69,3 @@ function! GetPrologIndent()
     endif
     return ind
 endfunction
-
-endif
diff --git a/indent/proto.vim b/indent/proto.vim
index 8bf583622..8fa33fd67 100644
--- a/indent/proto.vim
+++ b/indent/proto.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/proto.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('protobuf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protobuf') == -1
 
 " Vim indent file
 " Language:	Protobuf
@@ -24,5 +19,3 @@ setlocal expandtab
 setlocal shiftwidth=2
 
 let b:undo_indent = "setl cin<"
-
-endif
diff --git a/indent/ps1.vim b/indent/ps1.vim
index 92222de8d..ac6b83fe1 100644
--- a/indent/ps1.vim
+++ b/indent/ps1.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/ps1.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Vim indent file
 " Language:           Windows PowerShell
@@ -27,5 +22,3 @@ inoremap <buffer> # X#
 
 let b:undo_indent = "setl si<"
 
-
-endif
diff --git a/indent/pug.vim b/indent/pug.vim
index d0aadb622..20703d8cc 100644
--- a/indent/pug.vim
+++ b/indent/pug.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/pug.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pug', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
 
 " Vim indent file
 " Language: Pug
@@ -77,5 +72,3 @@ function! GetPugIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/puppet.vim b/indent/puppet.vim
index 321bf9f85..1f0a8e3c8 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/puppet.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Vim indent file
 " Language: Puppet
@@ -146,5 +141,3 @@ function! GetPuppetIndent(...)
 
     return ind
 endfunction
-
-endif
diff --git a/indent/purescript.vim b/indent/purescript.vim
index fc6e2a26a..b040855a0 100644
--- a/indent/purescript.vim
+++ b/indent/purescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/purescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('purescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 
 " indentation for purescript
 "
@@ -283,5 +278,3 @@ function! GetPurescriptIndent()
 
   return match(prevline, '\S')
 endfunction
-
-endif
diff --git a/indent/pyrex.vim b/indent/pyrex.vim
index 061b71a85..9ffe4c12c 100644
--- a/indent/pyrex.vim
+++ b/indent/pyrex.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/pyrex.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pyrex', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pyrex') == -1
 
 " Vim indent file
 " Language:	Pyrex
@@ -20,5 +15,3 @@ endif
 
 " Use Python formatting rules
 runtime! indent/python.vim
-
-endif
diff --git a/indent/python.vim b/indent/python.vim
index 8e2ea0d7a..5f13b77ef 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/python.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('python-indent', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-indent') == -1
 
 " PEP8 compatible Python indent file
 " Language:         Python
@@ -461,5 +456,3 @@ function! GetPythonPEPIndent(lnum)
 
     return s:indent_like_previous_line(a:lnum)
 endfunction
-
-endif
diff --git a/indent/qml.vim b/indent/qml.vim
index 944e72f23..480e9d8f6 100644
--- a/indent/qml.vim
+++ b/indent/qml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/qml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('qml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
 
 " Vim indent file
 " Language:     QML
@@ -66,5 +61,3 @@ function! GetJsIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/racket.vim b/indent/racket.vim
index 626dde522..ceeec45ce 100644
--- a/indent/racket.vim
+++ b/indent/racket.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/racket.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('racket', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
 
 " Language:     Racket
 " Maintainer:   Will Langstroth <will@langstroth.com>
@@ -19,5 +14,3 @@ let b:did_indent = 1
 setlocal ai nosi
 
 let b:undo_indent = "setl ai< si<"
-
-endif
diff --git a/indent/raku.vim b/indent/raku.vim
index 052693cfa..1c759b70b 100644
--- a/indent/raku.vim
+++ b/indent/raku.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/raku.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('raku', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raku') == -1
 
 " Vim indent file
 " Language:      Raku
@@ -134,5 +129,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=8:sts=4:sw=4:expandtab:ft=vim
-
-endif
diff --git a/indent/razor.vim b/indent/razor.vim
index e35688e4c..2708d10ee 100644
--- a/indent/razor.vim
+++ b/indent/razor.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/razor.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('razor', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'razor') == -1
 
 " Vim indent file
 " Language:	    Razor
@@ -17,5 +12,3 @@ if exists("b:did_indent")
 endif
 runtime! indent/html.vim
 runtime! indent/javscript.vim
-
-endif
diff --git a/indent/readline.vim b/indent/readline.vim
index 53ef6f217..3c79245b3 100644
--- a/indent/readline.vim
+++ b/indent/readline.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/readline.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('readline', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'readline') == -1
 
 " Vim indent file
 " Language:             readline configuration file
@@ -43,5 +38,3 @@ function GetReadlineIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/reason.vim b/indent/reason.vim
index 490cdeafe..4a5160bd1 100644
--- a/indent/reason.vim
+++ b/indent/reason.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/reason.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('reason', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
 
 " Vim indent file
 " Language:         Reason (adapted from Rust)
@@ -224,5 +219,3 @@ function GetReasonIndent(lnum)
 	" Fall back on cindent, which does it mostly right
 	return cindent(a:lnum)
 endfunction
-
-endif
diff --git a/indent/rmd.vim b/indent/rmd.vim
index d95e442a3..a5c440909 100644
--- a/indent/rmd.vim
+++ b/indent/rmd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/rmd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rmd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rmd') == -1
 
 " Vim indent file
 " Language:	Rmd
@@ -73,5 +68,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2
-
-endif
diff --git a/indent/rnoweb.vim b/indent/rnoweb.vim
index 4473d32d9..350e6d9bc 100644
--- a/indent/rnoweb.vim
+++ b/indent/rnoweb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/rnoweb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rnoweb', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnoweb') == -1
 
 " Vim indent file
 " Language:	Rnoweb
@@ -54,5 +49,3 @@ function GetRnowebIndent()
 endfunction
 
 " vim: sw=2
-
-endif
diff --git a/indent/rpl.vim b/indent/rpl.vim
index f5df9afb1..3e11fabea 100644
--- a/indent/rpl.vim
+++ b/indent/rpl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/rpl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rpl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 
 " Vim indent file
 " Language:	RPL/2
@@ -70,5 +65,3 @@ function RplGetFreeIndent()
 endfunction
 
 " vim:sw=2 tw=130
-
-endif
diff --git a/indent/rrst.vim b/indent/rrst.vim
index 5b3187b64..3d31f1eb8 100644
--- a/indent/rrst.vim
+++ b/indent/rrst.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/rrst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rrst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rrst') == -1
 
 " Vim indent file
 " Language:	Rrst
@@ -54,5 +49,3 @@ function GetRrstIndent()
 endfunction
 
 " vim: sw=2
-
-endif
diff --git a/indent/rst.vim b/indent/rst.vim
index 2585df03b..8fbb3d175 100644
--- a/indent/rst.vim
+++ b/indent/rst.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/rst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 
 " Vim indent file
 " Vim reST indent file
@@ -82,5 +77,3 @@ function GetRSTIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/ruby.vim b/indent/ruby.vim
index 56a348a7f..2fe4a374b 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/ruby.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim indent file
 " Language:		Ruby
@@ -971,5 +966,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/indent/rust.vim b/indent/rust.vim
index 7f0fff27d..395e74093 100644
--- a/indent/rust.vim
+++ b/indent/rust.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/rust.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Vim indent file
 " Language:         Rust
@@ -291,5 +286,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/indent/sas.vim b/indent/sas.vim
index 671e213c9..eb2afdf11 100644
--- a/indent/sas.vim
+++ b/indent/sas.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/sas.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sas', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sas') == -1
 
 " Vim indent file
 " Language:     SAS
@@ -145,5 +140,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/sass.vim b/indent/sass.vim
index b3002bef7..4f4971a04 100644
--- a/indent/sass.vim
+++ b/indent/sass.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/sass.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sass', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
 
 " Vim indent file
 " Language:	Sass
@@ -45,5 +40,3 @@ function! GetSassIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/scala.vim b/indent/scala.vim
index 62d677207..adddc5544 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/scala.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 " Vim indent file
 " Language         : Scala (http://scala-lang.org/)
@@ -613,5 +608,3 @@ endfunction
 
 " vim:set sw=2 sts=2 ts=8 et:
 " vim600:fdm=marker fdl=1 fdc=0:
-
-endif
diff --git a/indent/scheme.vim b/indent/scheme.vim
index 2e0c747b7..475d9cd5f 100644
--- a/indent/scheme.vim
+++ b/indent/scheme.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/scheme.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scheme', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scheme') == -1
 
 " Vim indent file
 " Language: Scheme
@@ -21,5 +16,3 @@ endif
 
 " Use the Lisp indenting
 runtime! indent/lisp.vim
-
-endif
diff --git a/indent/scss.vim b/indent/scss.vim
index 8d302d30d..80a43bd2b 100644
--- a/indent/scss.vim
+++ b/indent/scss.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/scss.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scss', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
 
 " Vim indent file
 " Language    : SCSS (Sassy CSS)
@@ -96,5 +91,3 @@ unlet s:keepcpo
 
 " vim:set et ts=2 sw=2:
 
-
-endif
diff --git a/indent/sdl.vim b/indent/sdl.vim
index 3083b048f..470b7328f 100644
--- a/indent/sdl.vim
+++ b/indent/sdl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/sdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sdl') == -1
 
 " Vim indent file
 " Language:	SDL
@@ -100,5 +95,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:sw=2
-
-endif
diff --git a/indent/slim.vim b/indent/slim.vim
index 742834e0e..95eda92d8 100644
--- a/indent/slim.vim
+++ b/indent/slim.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/slim.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slim', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
 
 " Vim indent file
 " Language:	Slim
@@ -82,5 +77,3 @@ function! GetSlimIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/slime.vim b/indent/slime.vim
index 77b902a24..2ba345f13 100644
--- a/indent/slime.vim
+++ b/indent/slime.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/slime.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slime', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slime') == -1
 
 " Vim indent file
 " Language:	Slime
@@ -82,5 +77,3 @@ function! GetSlimeIndent()
 endfunction
 
 " vim:set sw=2:
-
-endif
diff --git a/indent/sml.vim b/indent/sml.vim
index f36bac6c8..0bc7a389d 100644
--- a/indent/sml.vim
+++ b/indent/sml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/sml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sml') == -1
 
 " Vim indent file
 " Language:     SML
@@ -224,5 +219,3 @@ function! GetSMLIndent()
 endfunction
 
 " vim:sw=2
-
-endif
diff --git a/indent/solidity.vim b/indent/solidity.vim
index 638a3239a..a7844596a 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/solidity.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('solidity', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
 
 " Vim indent file
 " Language: Solidity
@@ -446,5 +441,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/sql.vim b/indent/sql.vim
index 82667f5a0..34c745702 100644
--- a/indent/sql.vim
+++ b/indent/sql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/sql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
 
 " Vim indent file loader
 " Language:    SQL
@@ -46,5 +41,3 @@ exec 'runtime indent/'.filename.'.vim'
 
 
 " vim:sw=4:
-
-endif
diff --git a/indent/sshconfig.vim b/indent/sshconfig.vim
index aedb02184..4d2b3d9b9 100644
--- a/indent/sshconfig.vim
+++ b/indent/sshconfig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/sshconfig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sshconfig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshconfig') == -1
 
 " Vim indent file
 " Language: ssh config file
@@ -41,5 +36,3 @@ function GetSshconfigIndent(lnum)
     return indent(prev_lnum)
   endif
 endfunction
-
-endif
diff --git a/indent/stylus.vim b/indent/stylus.vim
index c89dafb30..3265e301e 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/stylus.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('stylus', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
 
 " Vim indent file
 " Language: Stylus
@@ -136,5 +131,3 @@ function! GetStylusIndent()
 endfunction
 
 " vim:set sw=2;
-
-endif
diff --git a/indent/svelte.vim b/indent/svelte.vim
index 599023a0d..e8940f421 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/svelte.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('svelte', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svelte') == -1
 
 " Vim indent file
 " Language:   Svelte 3 (HTML/JavaScript)
@@ -151,5 +146,3 @@ function! GetSvelteIndent()
 
   return indent
 endfunction
-
-endif
diff --git a/indent/svg.vim b/indent/svg.vim
index 2057c3efe..198efb46a 100644
--- a/indent/svg.vim
+++ b/indent/svg.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/svg.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('svg-indent', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svg-indent') == -1
 
 " Vim indent file
 "
@@ -112,5 +107,3 @@ endfun
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/indent/swift.vim b/indent/swift.vim
index 48efb3549..5c17fc63d 100644
--- a/indent/swift.vim
+++ b/indent/swift.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/swift.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('swift', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 
 " File: swift.vim
 " Author: Keith Smiley
@@ -301,5 +296,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/systemverilog.vim b/indent/systemverilog.vim
index a5c423b25..43267f6dd 100644
--- a/indent/systemverilog.vim
+++ b/indent/systemverilog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/systemverilog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('systemverilog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemverilog') == -1
 
 " Vim indent file
 " Language:    SystemVerilog
@@ -236,5 +231,4 @@ endfunction
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:sw=2
-endif
+" vim:sw=2
\ No newline at end of file
diff --git a/indent/tcl.vim b/indent/tcl.vim
index 0eedaa29e..8ea5dcc5f 100644
--- a/indent/tcl.vim
+++ b/indent/tcl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/tcl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tcl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
 
 " Vim indent file
 " Language:	    	Tcl
@@ -108,5 +103,3 @@ function GetTclIndent()
   
   return ind
 endfunction
-
-endif
diff --git a/indent/teraterm.vim b/indent/teraterm.vim
index c0e6d131b..66ad449fe 100644
--- a/indent/teraterm.vim
+++ b/indent/teraterm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/teraterm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('teraterm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'teraterm') == -1
 
 " Vim indent file
 " Language:	Tera Term Language (TTL)
@@ -62,5 +57,3 @@ function! GetTeraTermIndent(lnum)
 endfunction
 
 " vim: ts=8 sw=2 sts=2
-
-endif
diff --git a/indent/terraform.vim b/indent/terraform.vim
index 9639d47c0..ab932dabf 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/terraform.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('terraform', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 
 " Only load this file if no other indent file was loaded
 if exists('b:did_indent')
@@ -71,5 +66,3 @@ endfunction
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/tex.vim b/indent/tex.vim
index 4da631a2c..221849399 100644
--- a/indent/tex.vim
+++ b/indent/tex.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/tex.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tex', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
 
 " Vim indent file
 " Language:     LaTeX
@@ -430,5 +425,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: set sw=4 textwidth=80:
-
-endif
diff --git a/indent/tf.vim b/indent/tf.vim
index 096b1977e..5c12f112d 100644
--- a/indent/tf.vim
+++ b/indent/tf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/tf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tf') == -1
 
 " Vim indent file
 " Language:     tf (TinyFugue)
@@ -79,5 +74,3 @@ function GetTFIndent()
 	return ind
 
 endfunction
-
-endif
diff --git a/indent/tilde.vim b/indent/tilde.vim
index b412a64bf..8df3ede75 100644
--- a/indent/tilde.vim
+++ b/indent/tilde.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/tilde.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tilde', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tilde') == -1
 
 "Description: Indent scheme for the tilde weblanguage
 "Author: Tobias Rundström <tobi@tobi.nu>
@@ -43,5 +38,3 @@ function GetTildeIndent(lnum)
 		return -1
 	endif
 endfunction
-
-endif
diff --git a/indent/treetop.vim b/indent/treetop.vim
index 01b80d68a..d54e61598 100644
--- a/indent/treetop.vim
+++ b/indent/treetop.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/treetop.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('treetop', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'treetop') == -1
 
 " Vim indent file
 " Language:             Treetop
@@ -45,5 +40,3 @@ function GetTreetopIndent()
 
   retur ind
 endfunction
-
-endif
diff --git a/indent/twig.vim b/indent/twig.vim
index d9472ea47..82087c331 100644
--- a/indent/twig.vim
+++ b/indent/twig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/twig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('twig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
 
 if exists("b:ran_once")
 	finish
@@ -83,5 +78,3 @@ fun! s:BuildStructures()
 endfun
 
 call s:BuildStructures()
-
-endif
diff --git a/indent/typescript.vim b/indent/typescript.vim
index a95779065..cc742b973 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/typescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " Vim indent file
 " Language: TypeScript
@@ -508,5 +503,3 @@ function! Fixedgq(lnum, count)
 
     return 0
 endfunction
-
-endif
diff --git a/indent/typescriptreact.vim b/indent/typescriptreact.vim
index a89ae88d1..8253a2887 100644
--- a/indent/typescriptreact.vim
+++ b/indent/typescriptreact.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/typescriptreact.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 exe 'runtime! indent/typescript.vim'
 " Save the current JavaScript indentexpr.
@@ -117,5 +112,4 @@ fu! GetTsxIndent()
   endif
 
   return ind
-endfu
-endif
+endfu
\ No newline at end of file
diff --git a/indent/vala.vim b/indent/vala.vim
index cbcfbf2c5..de3f0fd49 100644
--- a/indent/vala.vim
+++ b/indent/vala.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/vala.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
 
 " Vim indent file
 " Language:         Vala
@@ -90,5 +85,3 @@ function GetValaIndent(lnum)
 	" Fall back on cindent, which does it mostly right
 	return cindent(a:lnum)
 endfunction
-
-endif
diff --git a/indent/vb.vim b/indent/vb.vim
index 5e37b74e8..4eb977c86 100644
--- a/indent/vb.vim
+++ b/indent/vb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/vb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('visual-basic', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
 
 " Vim indent file
 " Language:	VisualBasic (ft=vb) / Basic (ft=basic) / SaxBasic (ft=vb)
@@ -85,5 +80,3 @@ fun! VbGetIndent(lnum)
 endfun
 
 " vim:sw=4
-
-endif
diff --git a/indent/velocity.vim b/indent/velocity.vim
index ba1344bf3..01af414be 100644
--- a/indent/velocity.vim
+++ b/indent/velocity.vim
@@ -1,16 +1,9 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/velocity.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('velocity', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'velocity') == -1
 
 if exists("b:did_indent")
     finish
 endif
 
 runtime! indent/html.vim
-
-endif
diff --git a/indent/verilog.vim b/indent/verilog.vim
index 02ed70a2f..06d0a2fb9 100644
--- a/indent/verilog.vim
+++ b/indent/verilog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/verilog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('verilog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilog') == -1
 
 " Language:     Verilog HDL
 " Maintainer:	Chih-Tsun Huang <cthuang@cs.nthu.edu.tw>
@@ -236,5 +231,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:sw=2
-
-endif
diff --git a/indent/vhdl.vim b/indent/vhdl.vim
index c129a7636..fd2c2f827 100644
--- a/indent/vhdl.vim
+++ b/indent/vhdl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/vhdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vhdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vhdl') == -1
 
 " VHDL indent ('93 syntax)
 " Language:    VHDL
@@ -442,5 +437,3 @@ function GetVHDLindent()
   " return leftover filtered indent
   return ind
 endfunction
-
-endif
diff --git a/indent/vlang.vim b/indent/vlang.vim
index c5b9660a5..58680a455 100644
--- a/indent/vlang.vim
+++ b/indent/vlang.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/vlang.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('v', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'v') == -1
 
 " Based on the Go identation file.
 "
@@ -73,5 +68,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/indent/vroom.vim b/indent/vroom.vim
index 832019d30..47a680295 100644
--- a/indent/vroom.vim
+++ b/indent/vroom.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/vroom.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vroom', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vroom') == -1
 
 " Vim indent file
 " Language:	Vroom (vim testing and executable documentation)
@@ -28,5 +23,3 @@ setlocal autoindent
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/indent/vue.vim b/indent/vue.vim
index e53a528b3..b4f37cc23 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/vue.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vue', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
 
 " Vim indent file
 " Language: Vue.js
@@ -71,5 +66,3 @@ function! GetVueIndent()
 
   return indent
 endfunction
-
-endif
diff --git a/indent/wast.vim b/indent/wast.vim
index 52cb7ab6d..97bd3c8de 100644
--- a/indent/wast.vim
+++ b/indent/wast.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/wast.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('wast', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wast') == -1
 
 " Vim indent file
 " Language:     WebAssembly
@@ -24,5 +19,3 @@ setlocal indentexpr=lispindent('.')
 setlocal noautoindent nosmartindent
 
 let b:undo_indent = "setl lisp< indentexpr<"
-
-endif
diff --git a/indent/xf86conf.vim b/indent/xf86conf.vim
index 7932c428a..287888c92 100644
--- a/indent/xf86conf.vim
+++ b/indent/xf86conf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/xf86conf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xf86conf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xf86conf') == -1
 
 " Vim indent file
 " Language:             XFree86 Configuration File
@@ -44,5 +39,3 @@ function GetXF86ConfIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/xhtml.vim b/indent/xhtml.vim
index 7134ac81f..4f4382b38 100644
--- a/indent/xhtml.vim
+++ b/indent/xhtml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/xhtml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xhtml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xhtml') == -1
 
 " Vim indent file
 " Language:	XHTML
@@ -19,5 +14,3 @@ endif
 
 " Handled like HTML for now.
 runtime! indent/html.vim
-
-endif
diff --git a/indent/xinetd.vim b/indent/xinetd.vim
index e2898b2d6..0443b36ed 100644
--- a/indent/xinetd.vim
+++ b/indent/xinetd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/xinetd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xinetd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xinetd') == -1
 
 " Vim indent file
 " Language:             xinetd.conf(5) configuration file
@@ -62,5 +57,3 @@ endfunction
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/indent/xsd.vim b/indent/xsd.vim
index 685f44e13..9d0e095ff 100644
--- a/indent/xsd.vim
+++ b/indent/xsd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/xsd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xsd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
 
 " Vim indent file
 " Language: 	.xsd files (XML Schema)
@@ -20,5 +15,3 @@ endif
 " Use XML formatting rules
 runtime! indent/xml.vim
 
-
-endif
diff --git a/indent/xslt.vim b/indent/xslt.vim
index d111bfba8..c1793e1b9 100644
--- a/indent/xslt.vim
+++ b/indent/xslt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/xslt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xslt', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xslt') == -1
 
 " Vim indent file
 " Language:    XSLT .xslt files
@@ -20,5 +15,3 @@ endif
 " Use XML formatting rules
 runtime! indent/xml.vim
 
-
-endif
diff --git a/indent/yacc.vim b/indent/yacc.vim
index c4b164026..37752e48f 100644
--- a/indent/yacc.vim
+++ b/indent/yacc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/yacc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('yacc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yacc') == -1
 
 " Vim indent file
 " Language:             YACC input file
@@ -48,5 +43,3 @@ function GetYaccIndent()
 
   return ind
 endfunction
-
-endif
diff --git a/indent/yaml.vim b/indent/yaml.vim
index 3fb7dcc9f..274190dad 100644
--- a/indent/yaml.vim
+++ b/indent/yaml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/yaml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('yaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 
 " Vim indent file
 " Language:         YAML
@@ -162,5 +157,3 @@ function GetYAMLIndent(lnum)
 endfunction
 
 let &cpo = s:save_cpo
-
-endif
diff --git a/indent/zig.vim b/indent/zig.vim
index 3f9d590f0..c8ff33db2 100644
--- a/indent/zig.vim
+++ b/indent/zig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/zig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " indent/zig.vim
 
@@ -83,5 +78,3 @@ function! GetZigIndent(lnum)
 
     return cindent(a:lnum)
 endfunction
-
-endif
diff --git a/indent/zimbu.vim b/indent/zimbu.vim
index 987b47274..c6d99cc4d 100644
--- a/indent/zimbu.vim
+++ b/indent/zimbu.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'indent/zimbu.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zimbu', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zimbu') == -1
 
 " Vim indent file
 " Language:	Zimbu
@@ -135,5 +130,3 @@ endfunc
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index bfd9c1a02..ac828475b 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -17,7 +17,7 @@ endif
 " and (mostly comments) from https://github.com/sheerun/vimrc
 "
 " Only settings that matter for proper editing are left
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -1
+if polyglot#util#IsEnabled('sensible', 'ftdetect')
   " Allow backspace in insert mode.
   if &backspace == ""
     set backspace=indent,eol,start
diff --git a/scripts/build b/scripts/build
index 86237647e..7d069d949 100755
--- a/scripts/build
+++ b/scripts/build
@@ -293,33 +293,26 @@ def copy_file(name, src, dest)
 
   open(src, "r") do |input|
     open(dest, "w") do |output|
-      if dest.match?(/\.vim$/) && !dest.match('after/')
+      if dest.match?(/\.vim$/)
         output << <<~EOF
-        let s:base = expand("<sfile>:h:h")
-        let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-        let files = filter(globpath(&rtp, '#{dest}', 1, 1), Filter)
-        if len(files) > 0
-          exec 'source ' . files[0]
+        if !polyglot#util#IsEnabled('#{name}', expand('<sfile>:p'))
           finish
         endif
+
         EOF
       end
-      if name == "jsx"
-        output << "if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)\n\n"
-      else
-        output << "if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '#{name}') == -1\n\n"
-      end
       contents = File.read(input)
-      # fix encoding if required
-      contents.gsub!(/!@#%#/, "") rescue contents = contents.force_encoding('iso-8859-1').encode('utf-8')
-      # ..= is feature of new vims...
-      contents.gsub!(' ..= ', ' .= ')
-      # https://github.com/vim/vim/pull/7091 
-      contents.gsub!(/set(local)? fileencoding=utf-8/, '')
-      contents.gsub!(/ fileencoding=utf-8/, '')
-      contents.gsub!('À-ÿ', '\u00ac-\uffff')
+      if dest.match?(/\.vim$/)
+        # fix encoding if required
+        contents.gsub!(/!@#%#/, "") rescue contents = contents.force_encoding('iso-8859-1').encode('utf-8')
+        # ..= is feature of new vims...
+        contents.gsub!(' ..= ', ' .= ')
+        # https://github.com/vim/vim/pull/7091 
+        contents.gsub!(/set(local)? fileencoding=utf-8/, '')
+        contents.gsub!(/ fileencoding=utf-8/, '')
+        contents.gsub!('À-ÿ', '\u00ac-\uffff')
+      end
       output << contents
-      output << "\nendif\n"
     end
   end
 end
@@ -681,7 +674,7 @@ def generate_ftdetect(packages, heuristics)
     end
 
     if package_autocommands.flatten.size > 0
-      output << "if !has_key(s:disabled_packages, '#{package["name"]}')\n"
+      output << "if polyglot#util#IsEnabled('#{package["name"]}', 'ftdetect')\n"
       output << indent(package_autocommands.map { |pc| pc.reverse.join("\n") }.join("\n\n"), 2)
       output << "\nendif\n\n"
     end
diff --git a/syntax/8th.vim b/syntax/8th.vim
index 646726967..1a32143f0 100644
--- a/syntax/8th.vim
+++ b/syntax/8th.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/8th.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('8th', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '8th') == -1
 
 " Vim syntax file
 " Language:     8th
@@ -342,5 +337,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8:sw=4:nocindent:smartindent:
-
-endif
diff --git a/syntax/Jenkinsfile.vim b/syntax/Jenkinsfile.vim
index fbaa61334..b9c6b9c29 100644
--- a/syntax/Jenkinsfile.vim
+++ b/syntax/Jenkinsfile.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/Jenkinsfile.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jenkins', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jenkins') == -1
 
 runtime syntax/groovy.vim
 syn keyword jenkinsfileBuiltInVariable currentBuild
@@ -133,5 +128,3 @@ hi link jenkinsFileDockerKeyword     jenkinsfilePipelineStep
 let b:current_syntax = 'Jenkinsfile'
 
 " vim:set et sw=0 ts=2 ft=vim tw=78:
-
-endif
diff --git a/syntax/a2ps.vim b/syntax/a2ps.vim
index 3616993d1..b0f2b98a7 100644
--- a/syntax/a2ps.vim
+++ b/syntax/a2ps.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/a2ps.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('a2ps', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'a2ps') == -1
 
 " Vim syntax file
 " Language:             a2ps(1) configuration file
@@ -78,5 +73,3 @@ let b:current_syntax = "a2ps"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/a65.vim b/syntax/a65.vim
index 0e85dfb95..5faf43f48 100644
--- a/syntax/a65.vim
+++ b/syntax/a65.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/a65.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('a65', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'a65') == -1
 
 " Vim syntax file
 " Language:	xa 6502 cross assembler
@@ -160,5 +155,3 @@ hi def link a65HiLo	Number
 
 
 let b:current_syntax = "a65"
-
-endif
diff --git a/syntax/aap.vim b/syntax/aap.vim
index c8a3183af..4b714ec7d 100644
--- a/syntax/aap.vim
+++ b/syntax/aap.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/aap.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('aap', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aap') == -1
 
 " Vim syntax file
 " Language:	A-A-P recipe
@@ -165,5 +160,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/abap.vim b/syntax/abap.vim
index 49a06670d..88e763c48 100644
--- a/syntax/abap.vim
+++ b/syntax/abap.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/abap.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('abap', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'abap') == -1
 
 " Vim ABAP syntax file
 "    Language: SAP - ABAP/R4
@@ -202,5 +197,4 @@ hi def link abapHex            Number
 
 let b:current_syntax = "abap"
 
-" vim: ts=8 sw=2
-endif
+" vim: ts=8 sw=2
\ No newline at end of file
diff --git a/syntax/abaqus.vim b/syntax/abaqus.vim
index 2ade8afb3..6f4d7e11c 100644
--- a/syntax/abaqus.vim
+++ b/syntax/abaqus.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/abaqus.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('abaqus', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'abaqus') == -1
 
 " Vim syntax file
 " Language:	Abaqus finite element input file (www.hks.com)
@@ -42,5 +37,3 @@ hi def link abaqusBadLine    Error
 
 
 let b:current_syntax = "abaqus"
-
-endif
diff --git a/syntax/abc.vim b/syntax/abc.vim
index 7bb3ddd0c..8bbd911ae 100644
--- a/syntax/abc.vim
+++ b/syntax/abc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/abc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('abc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'abc') == -1
 
 " Vim syntax file
 " Language:	abc music notation language
@@ -58,5 +53,3 @@ hi def link abcNote			Constant
 let b:current_syntax = "abc"
 
 " vim: ts=4
-
-endif
diff --git a/syntax/abel.vim b/syntax/abel.vim
index a2bc783c7..388a1727e 100644
--- a/syntax/abel.vim
+++ b/syntax/abel.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/abel.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('abel', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'abel') == -1
 
 " Vim syntax file
 " Language:	ABEL
@@ -168,5 +163,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=8
-
-endif
diff --git a/syntax/acedb.vim b/syntax/acedb.vim
index 2f7382695..7624743d7 100644
--- a/syntax/acedb.vim
+++ b/syntax/acedb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/acedb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('acedb', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'acedb') == -1
 
 " Vim syntax file
 " Language:	AceDB model files
@@ -117,5 +112,3 @@ let b:current_syntax = "acedb"
 " The structure of the model.wrm file is sensitive to mixed tab and space
 " indentation and assumes tabs are 8 so...
 se ts=8
-
-endif
diff --git a/syntax/ada.vim b/syntax/ada.vim
index 20e5d03c8..1cfae1296 100644
--- a/syntax/ada.vim
+++ b/syntax/ada.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ada.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ada', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ada') == -1
 
 "----------------------------------------------------------------------------
 "  Description: Vim Ada syntax file
@@ -375,5 +370,3 @@ finish " 1}}}
 "------------------------------------------------------------------------------
 "vim: textwidth=78 nowrap tabstop=8 shiftwidth=3 softtabstop=3 noexpandtab
 "vim: foldmethod=marker
-
-endif
diff --git a/syntax/ahdl.vim b/syntax/ahdl.vim
index decba2699..fb5786b0a 100644
--- a/syntax/ahdl.vim
+++ b/syntax/ahdl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ahdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ahdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ahdl') == -1
 
 " Vim syn file
 " Language:	Altera AHDL
@@ -88,5 +83,3 @@ hi def link ahdlTodo		Todo
 
 let b:current_syntax = "ahdl"
 " vim:ts=8
-
-endif
diff --git a/syntax/aidl.vim b/syntax/aidl.vim
index b40c09fe5..edc857bee 100644
--- a/syntax/aidl.vim
+++ b/syntax/aidl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/aidl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('aidl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aidl') == -1
 
 " Vim syntax file
 " Language:	aidl (Android Interface Definition Language)
@@ -30,5 +25,3 @@ hi def link aidlParamDir StorageClass
 hi def link aidlKeyword Keyword
 
 let b:current_syntax = "aidl"
-
-endif
diff --git a/syntax/alsaconf.vim b/syntax/alsaconf.vim
index 9c922ae3a..ea944b587 100644
--- a/syntax/alsaconf.vim
+++ b/syntax/alsaconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/alsaconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('alsaconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'alsaconf') == -1
 
 " Vim syntax file
 " Language:             alsaconf(8) configuration file
@@ -56,5 +51,3 @@ let b:current_syntax = "alsaconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/aml.vim b/syntax/aml.vim
index 03bb47265..8a4221d1b 100644
--- a/syntax/aml.vim
+++ b/syntax/aml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/aml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('aml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aml') == -1
 
 " Vim syntax file
 " Language:	AML (ARC/INFO Arc Macro Language)
@@ -151,5 +146,3 @@ hi def link amlTab	amlArcCmd
 
 
 let b:current_syntax = "aml"
-
-endif
diff --git a/syntax/ampl.vim b/syntax/ampl.vim
index c660def8e..d67e209d9 100644
--- a/syntax/ampl.vim
+++ b/syntax/ampl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ampl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ampl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ampl') == -1
 
 " Language:     ampl (A Mathematical Programming Language)
 " Maintainer:   Krief David <david.krief@etu.enseeiht.fr> or <david_krief@hotmail.com>
@@ -147,5 +142,3 @@ let b:current_syntax = "ampl"
 " vim: ts=8
 
 
-
-endif
diff --git a/syntax/ansible.vim b/syntax/ansible.vim
index 2fd53e7fd..a66ad006e 100644
--- a/syntax/ansible.vim
+++ b/syntax/ansible.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ansible.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 " Vim syntax file
 " Language: Ansible YAML/Jinja templates
@@ -118,5 +113,3 @@ else
 endif
 
 let b:current_syntax = "ansible"
-
-endif
diff --git a/syntax/ansible_hosts.vim b/syntax/ansible_hosts.vim
index 437de336c..910ad315e 100644
--- a/syntax/ansible_hosts.vim
+++ b/syntax/ansible_hosts.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ansible_hosts.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 " Vim syntax file
 " Language: Ansible hosts files
@@ -38,5 +33,3 @@ if exists("g:ansible_attribute_highlight")
 endif
 
 let b:current_syntax = "ansible_hosts"
-
-endif
diff --git a/syntax/ant.vim b/syntax/ant.vim
index 417ddcfe1..31ac7d705 100644
--- a/syntax/ant.vim
+++ b/syntax/ant.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ant.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ant', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ant') == -1
 
 " Vim syntax file
 " Language:	ANT build file (xml)
@@ -104,5 +99,3 @@ let &cpo = s:ant_cpo_save
 unlet s:ant_cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/apache.vim b/syntax/apache.vim
index 6df4cd92a..cf2bc3499 100644
--- a/syntax/apache.vim
+++ b/syntax/apache.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/apache.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('apache', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apache') == -1
 
 " Vim syntax file
 " Language: Apache configuration (httpd.conf, srm.conf, access.conf, .htaccess)
@@ -210,5 +205,3 @@ hi def link apacheUserID Number
 
 
 let b:current_syntax = "apache"
-
-endif
diff --git a/syntax/apachestyle.vim b/syntax/apachestyle.vim
index 27c904ec7..cfa084ebb 100644
--- a/syntax/apachestyle.vim
+++ b/syntax/apachestyle.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/apachestyle.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('apachestyle', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apachestyle') == -1
 
 " Vim syntax file
 " Language:	Apache-Style configuration files (proftpd.conf/apache.conf/..)
@@ -61,5 +56,3 @@ hi def link apTagError	Error
 
 let b:current_syntax = "apachestyle"
 " vim: ts=8
-
-endif
diff --git a/syntax/apiblueprint.vim b/syntax/apiblueprint.vim
index 7694fc1b8..018d8e2ba 100644
--- a/syntax/apiblueprint.vim
+++ b/syntax/apiblueprint.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/apiblueprint.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('apiblueprint', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apiblueprint') == -1
 
 runtime! syntax/markdown.vim
 unlet! b:current_syntax
@@ -41,5 +36,3 @@ highlight default link apibActionRelationKey Identifier
 
 let b:current_syntax = 'apiblueprint'
 
-
-endif
diff --git a/syntax/applescript.vim b/syntax/applescript.vim
index 298c8c06d..85af24c38 100644
--- a/syntax/applescript.vim
+++ b/syntax/applescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/applescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('applescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'applescript') == -1
 
 " Vim syntax file
 " Language:    AppleScript
@@ -252,5 +247,3 @@ hi def link scptTodo Todo
 
 let b:current_syntax = "applescript"
 
-
-endif
diff --git a/syntax/aptconf.vim b/syntax/aptconf.vim
index 9ff3cbeed..083f23904 100644
--- a/syntax/aptconf.vim
+++ b/syntax/aptconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/aptconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('aptconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aptconf') == -1
 
 " Vim syntax file
 " Language:	APT config file
@@ -581,5 +576,3 @@ let b:current_syntax = "aptconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/arch.vim b/syntax/arch.vim
index 5f553c566..933579581 100644
--- a/syntax/arch.vim
+++ b/syntax/arch.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/arch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('arch', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arch') == -1
 
 " Vim syntax file
 " Language:             GNU Arch inventory file
@@ -48,5 +43,3 @@ let b:current_syntax = "arch"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/arduino.vim b/syntax/arduino.vim
index 508dc205f..6106a8f77 100644
--- a/syntax/arduino.vim
+++ b/syntax/arduino.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/arduino.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('arduino', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'arduino') == -1
 
 " Vim syntax file
 " Language:    Arduino
@@ -173,5 +168,3 @@ hi def link arduinoType Type
 hi def link arduinoConstant Constant
 hi def link arduinoFunc Function
 hi def link arduinoIdentifier Identifier
-
-endif
diff --git a/syntax/art.vim b/syntax/art.vim
index 21adc885c..2845054f2 100644
--- a/syntax/art.vim
+++ b/syntax/art.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/art.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('art', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'art') == -1
 
 " Vim syntax file
 " Language:      ART-IM and ART*Enterprise
@@ -57,5 +52,3 @@ let b:current_syntax = "art"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/asciidoc.vim b/syntax/asciidoc.vim
index f82310b14..b6b41b0b5 100644
--- a/syntax/asciidoc.vim
+++ b/syntax/asciidoc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/asciidoc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('asciidoc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asciidoc') == -1
 
 " Vim syntax file
 " Language:     AsciiDoc
@@ -190,5 +185,3 @@ hi def link asciidocURL Macro
 let b:current_syntax = "asciidoc"
 
 " vim: wrap et sw=2 sts=2:
-
-endif
diff --git a/syntax/asl.vim b/syntax/asl.vim
index 57a138c7a..3e2840fea 100644
--- a/syntax/asl.vim
+++ b/syntax/asl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/asl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('acpiasl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'acpiasl') == -1
 
 " Vim syntax file
 " Language: ACPI ASL files
@@ -115,5 +110,3 @@ hi def link aslNumber            Number
 let b:current_syntax = "asl"
 syn sync minlines=200
 
-
-endif
diff --git a/syntax/asn.vim b/syntax/asn.vim
index 334ef9d64..e2bb53e02 100644
--- a/syntax/asn.vim
+++ b/syntax/asn.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/asn.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('asn', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asn') == -1
 
 " Vim syntax file
 " Language:	ASN.1
@@ -80,5 +75,3 @@ unlet s:cpo_save
 let b:current_syntax = "asn"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/aspperl.vim b/syntax/aspperl.vim
index 1292a8647..3509b1a29 100644
--- a/syntax/aspperl.vim
+++ b/syntax/aspperl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/aspperl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('aspperl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aspperl') == -1
 
 " Vim syntax file
 " Language:	Active State's PerlScript (ASP)
@@ -32,5 +27,3 @@ syn region  AspPerlScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<%=\
 syn region  AspPerlScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<script\s\+language="\=perlscript"\=[^>]*>+ end=+</script>+ contains=@AspPerlScript
 
 let b:current_syntax = "aspperl"
-
-endif
diff --git a/syntax/aspvbs.vim b/syntax/aspvbs.vim
index cbabc6447..a6d2f3357 100644
--- a/syntax/aspvbs.vim
+++ b/syntax/aspvbs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/aspvbs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('aspvbs', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aspvbs') == -1
 
 " Vim syntax file
 " Language:	Microsoft VBScript Web Content (ASP)
@@ -189,5 +184,3 @@ if main_syntax == 'aspvbs'
 endif
 
 " vim: ts=8:sw=2:sts=0:noet
-
-endif
diff --git a/syntax/asterisk.vim b/syntax/asterisk.vim
index 672515f33..e412aa9f2 100644
--- a/syntax/asterisk.vim
+++ b/syntax/asterisk.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/asterisk.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('asterisk', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asterisk') == -1
 
 " Vim syntax file
 " Language:	Asterisk config file
@@ -95,5 +90,3 @@ hi def link        asteriskError           Error
 let b:current_syntax = "asterisk" 
 " vim: ts=8 sw=2
 
-
-endif
diff --git a/syntax/asteriskvm.vim b/syntax/asteriskvm.vim
index 9b8ffbc11..6e18807bf 100644
--- a/syntax/asteriskvm.vim
+++ b/syntax/asteriskvm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/asteriskvm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('asteriskvm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asteriskvm') == -1
 
 " Vim syntax file
 " Language:	Asterisk voicemail config file
@@ -58,5 +53,3 @@ let b:current_syntax = "asteriskvm"
 
 " vim: ts=8 sw=2
 
-
-endif
diff --git a/syntax/atlas.vim b/syntax/atlas.vim
index 39ee5b906..30336eaef 100644
--- a/syntax/atlas.vim
+++ b/syntax/atlas.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/atlas.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('atlas', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'atlas') == -1
 
 " Vim syntax file
 " Language:	ATLAS
@@ -92,5 +87,3 @@ hi def link atlasSpecial		Special
 let b:current_syntax = "atlas"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/autodoc.vim b/syntax/autodoc.vim
index 5091322d9..f386e3aa5 100644
--- a/syntax/autodoc.vim
+++ b/syntax/autodoc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/autodoc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('autodoc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'autodoc') == -1
 
 " Vim syntax file
 " Language:	Autodoc
@@ -108,5 +103,3 @@ let b:current_syntax = "autodoc"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/autoit.vim b/syntax/autoit.vim
index 61faf1321..80f921ad5 100644
--- a/syntax/autoit.vim
+++ b/syntax/autoit.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/autoit.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('autoit', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'autoit') == -1
 
 " Vim syntax file
 "
@@ -1131,5 +1126,3 @@ syn sync minlines=50
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/syntax/automake.vim b/syntax/automake.vim
index 8012a0514..62f7fa450 100644
--- a/syntax/automake.vim
+++ b/syntax/automake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/automake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('automake', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'automake') == -1
 
 " Vim syntax file
 " Language: automake Makefile.am
@@ -84,5 +79,3 @@ hi def link automakeMakeBString makeBString
 let b:current_syntax = 'automake'
 
 " vi: ts=8 sw=4 sts=4
-
-endif
diff --git a/syntax/ave.vim b/syntax/ave.vim
index 80c7e9c63..30084a913 100644
--- a/syntax/ave.vim
+++ b/syntax/ave.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ave.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ave', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ave') == -1
 
 " Vim syntax file
 " Copyright by Jan-Oliver Wagner
@@ -86,5 +81,3 @@ hi def link aveTypos		Error
 
 
 let b:current_syntax = "ave"
-
-endif
diff --git a/syntax/awk.vim b/syntax/awk.vim
index c4648b2d1..d8a8c8c38 100644
--- a/syntax/awk.vim
+++ b/syntax/awk.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/awk.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('awk', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'awk') == -1
 
 " Vim syntax file
 " Language:	awk, nawk, gawk, mawk
@@ -223,5 +218,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/b.vim b/syntax/b.vim
index b5eedb24a..b0ddde41f 100644
--- a/syntax/b.vim
+++ b/syntax/b.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/b.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('b', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'b') == -1
 
 " Vim syntax file
 " Language:	B (A Formal Method with refinement and mathematical proof)
@@ -121,5 +116,3 @@ hi def link bTodo		Todo
 let b:current_syntax = "b"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/basic.vim b/syntax/basic.vim
index d444372cd..056bbc17b 100644
--- a/syntax/basic.vim
+++ b/syntax/basic.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('basic', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'basic') == -1
 
 " Vim syntax file
 " Language:	BASIC
@@ -173,5 +168,3 @@ let b:current_syntax = "basic"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/basic/class.vim b/syntax/basic/class.vim
index 4fc03dcf2..734df1ba5 100644
--- a/syntax/basic/class.vim
+++ b/syntax/basic/class.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/class.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "don't add typescriptMembers to nextgroup, let outer scope match it
 " so we won't match abstract method outside abstract class
@@ -72,5 +67,3 @@ syntax region typescriptInterfaceTypeArguments matchgroup=typescriptTypeBrackets
   \ contained skipwhite
 
 syntax match typescriptInterfaceComma /,/ contained nextgroup=typescriptInterfaceHeritage skipwhite skipnl
-
-endif
diff --git a/syntax/basic/cluster.vim b/syntax/basic/cluster.vim
index 017c4ba91..c601ca431 100644
--- a/syntax/basic/cluster.vim
+++ b/syntax/basic/cluster.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/cluster.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "Block VariableStatement EmptyStatement ExpressionStatement IfStatement IterationStatement ContinueStatement BreakStatement ReturnStatement WithStatement LabelledStatement SwitchStatement ThrowStatement TryStatement DebuggerStatement
 syntax cluster typescriptStatement
@@ -45,5 +40,3 @@ syntax cluster typescriptValue
   \ contains=@typescriptExpression,typescriptObjectLiteral
 
 syntax cluster typescriptEventExpression       contains=typescriptArrowFuncDef,typescriptParenExp,@typescriptValue,typescriptRegexpString,@typescriptEventTypes,typescriptOperator,typescriptGlobal,jsxRegion
-
-endif
diff --git a/syntax/basic/decorator.vim b/syntax/basic/decorator.vim
index fc4b7e4d0..3eeb22a81 100644
--- a/syntax/basic/decorator.vim
+++ b/syntax/basic/decorator.vim
@@ -1,14 +1,7 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/decorator.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax match typescriptDecorator /@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>/
   \ nextgroup=typescriptFuncCallArg,typescriptTypeArguments
   \ contains=@_semantic,typescriptDotNotation
-
-endif
diff --git a/syntax/basic/doc.vim b/syntax/basic/doc.vim
index 81af2a9a3..54d827a62 100644
--- a/syntax/basic/doc.vim
+++ b/syntax/basic/doc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/doc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "Syntax coloring for Node.js shebang line
 syntax match   shellbang "^#!.*node\>"
@@ -91,5 +86,3 @@ if exists("main_syntax") && main_syntax == "typescript"
 endif
 
 syntax case match
-
-endif
diff --git a/syntax/basic/function.vim b/syntax/basic/function.vim
index c4ffef907..9cda9e8da 100644
--- a/syntax/basic/function.vim
+++ b/syntax/basic/function.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/function.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptAsyncFuncKeyword      async
   \ nextgroup=typescriptFuncKeyword,typescriptArrowFuncDef
@@ -74,5 +69,3 @@ syntax region typescriptParamImpl matchgroup=typescriptParens
   \ contains=typescriptDecorator,@typescriptParameterList,@typescriptComments
   \ nextgroup=typescriptReturnAnnotation,typescriptBlock
   \ contained skipwhite skipnl
-
-endif
diff --git a/syntax/basic/identifiers.vim b/syntax/basic/identifiers.vim
index ce733f3e9..1f4d0a0be 100644
--- a/syntax/basic/identifiers.vim
+++ b/syntax/basic/identifiers.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/identifiers.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax cluster afterIdentifier contains=
   \ typescriptDotNotation,
@@ -86,5 +81,3 @@ syntax region typescriptObjectDestructure matchgroup=typescriptBraces
   \ contains=typescriptDestructureString,@typescriptDestructureVariables,@typescriptComments
   \ nextgroup=typescriptTypeAnnotation,typescriptAssign
   \ transparent contained skipwhite skipempty fold
-
-endif
diff --git a/syntax/basic/keyword.vim b/syntax/basic/keyword.vim
index 45e45768c..ec10ebdcf 100644
--- a/syntax/basic/keyword.vim
+++ b/syntax/basic/keyword.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/keyword.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "Import
 syntax keyword typescriptImport                from as
@@ -103,5 +98,3 @@ syntax cluster typescriptAmbients contains=
   \ typescriptAbstract,
   \ typescriptEnumKeyword,typescriptEnum,
   \ typescriptModule
-
-endif
diff --git a/syntax/basic/literal.vim b/syntax/basic/literal.vim
index 8458dcc6d..c8e1ba2c9 100644
--- a/syntax/basic/literal.vim
+++ b/syntax/basic/literal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/literal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 "Syntax in the JavaScript code
 
@@ -48,5 +43,3 @@ syntax match typescriptNumber /\<0[oO][0-7][0-7_]*\>/       nextgroup=@typescrip
 syntax match typescriptNumber /\<0[xX][0-9a-fA-F][0-9a-fA-F_]*\>/ nextgroup=@typescriptSymbols skipwhite skipempty
 syntax match typescriptNumber /\<\%(\d[0-9_]*\%(\.\d[0-9_]*\)\=\|\.\d[0-9_]*\)\%([eE][+-]\=\d[0-9_]*\)\=\>/
   \ nextgroup=typescriptSymbols skipwhite skipempty
-
-endif
diff --git a/syntax/basic/members.vim b/syntax/basic/members.vim
index 65366dac6..27bf8496d 100644
--- a/syntax/basic/members.vim
+++ b/syntax/basic/members.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/members.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptConstructor           contained constructor
   \ nextgroup=@typescriptCallSignature
@@ -53,5 +48,3 @@ syntax region  typescriptComputedMember   contained matchgroup=typescriptPropert
   \ contains=@typescriptValue,typescriptMember,typescriptMappedIn
   \ nextgroup=@memberNextGroup
   \ skipwhite skipempty
-
-endif
diff --git a/syntax/basic/object.vim b/syntax/basic/object.vim
index 869cf0634..86585e499 100644
--- a/syntax/basic/object.vim
+++ b/syntax/basic/object.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/object.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax region  typescriptObjectLiteral         matchgroup=typescriptBraces
   \ start=/{/ end=/}/
@@ -37,5 +32,3 @@ syntax match typescriptRestOrSpread /\.\.\./ contained
 syntax match typescriptObjectSpread /\.\.\./ contained containedin=typescriptObjectLiteral,typescriptArray nextgroup=@typescriptValue
 
 syntax match typescriptObjectColon contained /:/ nextgroup=@typescriptValue skipwhite skipempty
-
-endif
diff --git a/syntax/basic/patch.vim b/syntax/basic/patch.vim
index 9d97817cc..669cd8e08 100644
--- a/syntax/basic/patch.vim
+++ b/syntax/basic/patch.vim
@@ -1,16 +1,9 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/patch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " patch for generated code
 syntax keyword typescriptGlobal Promise
   \ nextgroup=typescriptGlobalPromiseDot,typescriptFuncCallArg,typescriptTypeArguments oneline
 syntax keyword typescriptGlobal Map WeakMap
   \ nextgroup=typescriptGlobalPromiseDot,typescriptFuncCallArg,typescriptTypeArguments oneline
-
-endif
diff --git a/syntax/basic/reserved.vim b/syntax/basic/reserved.vim
index 3ba5c8ecb..0b2d88c90 100644
--- a/syntax/basic/reserved.vim
+++ b/syntax/basic/reserved.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/reserved.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax cluster typescriptStrings               contains=typescriptProp,typescriptString,typescriptTemplate,@typescriptComments,typescriptDocComment,typescriptRegexpString,typescriptPropertyName
 
@@ -38,5 +33,3 @@ syntax keyword typescriptReserved containedin=ALLBUT,@typescriptNoReserved volat
 syntax keyword typescriptReserved containedin=ALLBUT,@typescriptNoReserved class
 syntax keyword typescriptReserved containedin=ALLBUT,@typescriptNoReserved var
 syntax keyword typescriptReserved containedin=ALLBUT,@typescriptNoReserved function
-
-endif
diff --git a/syntax/basic/symbols.vim b/syntax/basic/symbols.vim
index bc8db0dc3..586460649 100644
--- a/syntax/basic/symbols.vim
+++ b/syntax/basic/symbols.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/symbols.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " + - ^ ~
 syntax match typescriptUnaryOp /[+\-~!]/
@@ -47,5 +42,3 @@ syntax match   typescriptBinaryOp contained /-\(-\|=\)\?/ nextgroup=@typescriptV
 syntax match typescriptBinaryOp contained /\*\*=\?/ nextgroup=@typescriptValue
 
 syntax cluster typescriptSymbols               contains=typescriptBinaryOp,typescriptKeywordOp,typescriptTernary,typescriptAssign,typescriptCastKeyword
-
-endif
diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim
index 9785545db..03fe8de83 100644
--- a/syntax/basic/type.vim
+++ b/syntax/basic/type.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/basic/type.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " Types
 syntax match typescriptOptionalMark /?/ contained
@@ -221,5 +216,3 @@ syntax region typescriptAliasDeclaration matchgroup=typescriptUnion
 syntax keyword typescriptReadonlyArrayKeyword readonly
   \ nextgroup=@typescriptPrimaryType
   \ skipwhite
-
-endif
diff --git a/syntax/bc.vim b/syntax/bc.vim
index 8e14e85f5..fb135745a 100644
--- a/syntax/bc.vim
+++ b/syntax/bc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/bc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bc') == -1
 
 " Vim syntax file
 " Language:	bc - An arbitrary precision calculator language
@@ -73,5 +68,3 @@ hi def link bcParenError		Error
 
 let b:current_syntax = "bc"
 " vim: ts=8
-
-endif
diff --git a/syntax/bdf.vim b/syntax/bdf.vim
index 8cd0d16e7..86d931d34 100644
--- a/syntax/bdf.vim
+++ b/syntax/bdf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/bdf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bdf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bdf') == -1
 
 " Vim syntax file
 " Language:             BDF font definition
@@ -104,5 +99,3 @@ let b:current_syntax = "bdf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/bib.vim b/syntax/bib.vim
index 6f24e0161..844237a8b 100644
--- a/syntax/bib.vim
+++ b/syntax/bib.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/bib.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bib', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bib') == -1
 
 " Vim syntax file
 " Language:	BibTeX (bibliographic database format for (La)TeX)
@@ -128,5 +123,3 @@ let b:current_syntax = "bib"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/bindzone.vim b/syntax/bindzone.vim
index f66cd0f97..fd03e71ad 100644
--- a/syntax/bindzone.vim
+++ b/syntax/bindzone.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/bindzone.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bindzone', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bindzone') == -1
 
 " Vim syntax file
 " Language:     BIND zone files (RFC 1035)
@@ -104,5 +99,3 @@ hi def link zoneComment      Comment
 let b:current_syntax = "bindzone"
 
 " vim:sts=2 sw=2
-
-endif
diff --git a/syntax/blade.vim b/syntax/blade.vim
index 582df259d..49abd937a 100644
--- a/syntax/blade.vim
+++ b/syntax/blade.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/blade.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('blade', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 
 " Vim syntax file
 " Language:     Blade (Laravel)
@@ -80,5 +75,3 @@ let b:current_syntax = 'blade'
 if exists('main_syntax') && main_syntax == 'blade'
     unlet main_syntax
 endif
-
-endif
diff --git a/syntax/blank.vim b/syntax/blank.vim
index e686351c3..81170873c 100644
--- a/syntax/blank.vim
+++ b/syntax/blank.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/blank.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('blank', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blank') == -1
 
 " Vim syntax file
 " Language:     Blank 1.4.1
@@ -46,5 +41,3 @@ let b:current_syntax = "blank"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/brewfile.vim b/syntax/brewfile.vim
index 383c18109..0d1aea793 100644
--- a/syntax/brewfile.vim
+++ b/syntax/brewfile.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/brewfile.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('brewfile', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'brewfile') == -1
 
 " Vim syntax file
 " Language:    Brewfile
@@ -26,5 +21,3 @@ syn keyword brewfileDirective brew cask tap mas cask_args
 hi def link brewfileDirective Keyword
 
 let b:current_syntax = "brewfile"
-
-endif
diff --git a/syntax/bsdl.vim b/syntax/bsdl.vim
index 2d6b8475d..e77d53efa 100644
--- a/syntax/bsdl.vim
+++ b/syntax/bsdl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/bsdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bsdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bsdl') == -1
 
 " Vim syntax file
 " Language:	Boundary Scan Description Language (BSDL)
@@ -24,5 +19,3 @@ unlet b:current_syntax
 let b:current_syntax = "bsdl"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/bst.vim b/syntax/bst.vim
index 3e7c815de..1a37e95c5 100644
--- a/syntax/bst.vim
+++ b/syntax/bst.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/bst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bst') == -1
 
 " Vim syntax file
 " Language:     BibTeX Bibliography Style
@@ -77,5 +72,3 @@ hi def link bstError             Error
 let b:current_syntax = "bst"
 
 " vim:set ft=vim sts=4 sw=4:
-
-endif
diff --git a/syntax/bzl.vim b/syntax/bzl.vim
index f5080a81e..0163a0e29 100644
--- a/syntax/bzl.vim
+++ b/syntax/bzl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/bzl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bzl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
 
 " Vim syntax file
 " Language:	Bazel (http://bazel.io)
@@ -23,5 +18,3 @@ let b:current_syntax = 'bzl'
 
 syn region bzlRule start='^\w\+($' end='^)\n*' transparent fold
 syn region bzlList start='\[' end='\]' transparent fold
-
-endif
diff --git a/syntax/bzr.vim b/syntax/bzr.vim
index 10cefb1e0..07bc7fa14 100644
--- a/syntax/bzr.vim
+++ b/syntax/bzr.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/bzr.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('bzr', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzr') == -1
 
 " Vim syntax file
 " Language:     Bazaar (bzr) commit file
@@ -57,5 +52,3 @@ hi def link bzrUnknown    Special
 
 
 let b:current_syntax = "bzr"
-
-endif
diff --git a/syntax/c.vim b/syntax/c.vim
index 63c3494fd..cbcb70861 100644
--- a/syntax/c.vim
+++ b/syntax/c.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/c.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('c/c++', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c/c++') == -1
 
 " Vim syntax file
 " Language:	C
@@ -517,5 +512,3 @@ unlet s:ft
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/cabal-1.vim b/syntax/cabal-1.vim
index 45fa2bdf7..d2192fd4e 100644
--- a/syntax/cabal-1.vim
+++ b/syntax/cabal-1.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cabal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 
 " syntax highlighting for cabal
 "
@@ -58,5 +53,3 @@ highlight def link cabalDocNewline Operator
 highlight def link cabalDocCode Macro
 
 let b:current_syntax = "cabal"
-
-endif
diff --git a/syntax/cabal-2.vim b/syntax/cabal-2.vim
index 8b9f1431c..9e9d441c2 100644
--- a/syntax/cabal-2.vim
+++ b/syntax/cabal-2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cabal-2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cabal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cabal') == -1
 
 " Vim syntax file
 " Language:     Haskell Cabal Build file
@@ -251,5 +246,3 @@ let &cpo = s:cpo_save
 unlet! s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/caddyfile.vim b/syntax/caddyfile.vim
index 3b6930658..93503a873 100644
--- a/syntax/caddyfile.vim
+++ b/syntax/caddyfile.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/caddyfile.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('caddyfile', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
 
 " Language: Caddyfile
 " Author:   Josh Glendenning <josh@isobit.io>
@@ -36,5 +31,3 @@ hi link caddyString String
 hi link caddyComment Comment
 
 let b:current_syntax = "caddyfile"
-
-endif
diff --git a/syntax/calendar.vim b/syntax/calendar.vim
index 0e6e58476..4b154111d 100644
--- a/syntax/calendar.vim
+++ b/syntax/calendar.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/calendar.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('calendar', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'calendar') == -1
 
 " Vim syntax file
 " Language:             calendar(1) input file
@@ -117,5 +112,3 @@ let b:current_syntax = "calendar"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/carp.vim b/syntax/carp.vim
index 5c99680db..9fdeef0a0 100644
--- a/syntax/carp.vim
+++ b/syntax/carp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/carp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('carp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'carp') == -1
 
 " Vim syntax file
 " Language:     Carp
@@ -172,5 +167,3 @@ if version >= 508 || !exists("carp_syntax_init")
 endif
 
 let b:current_syntax = "carp"
-
-endif
diff --git a/syntax/catalog.vim b/syntax/catalog.vim
index 7fff5fda7..f9054ef10 100644
--- a/syntax/catalog.vim
+++ b/syntax/catalog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/catalog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('catalog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'catalog') == -1
 
 " Vim syntax file
 " Language:	sgml catalog file
@@ -37,5 +32,3 @@ hi def link catalogTodo			     Todo
 hi def link catalogKeyword		     Statement
 
 let b:current_syntax = "catalog"
-
-endif
diff --git a/syntax/cdl.vim b/syntax/cdl.vim
index 409c1dc7b..da8ef432b 100644
--- a/syntax/cdl.vim
+++ b/syntax/cdl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdl') == -1
 
 " Vim syntax file
 " Language: Comshare Dimension Definition Language
@@ -85,5 +80,3 @@ hi def link cdlConditional	Conditional
 let b:current_syntax = "cdl"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/cdrdaoconf.vim b/syntax/cdrdaoconf.vim
index b6f8b0537..0a36a716e 100644
--- a/syntax/cdrdaoconf.vim
+++ b/syntax/cdrdaoconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cdrdaoconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cdrdaoconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdrdaoconf') == -1
 
 " Vim syntax file
 " Language:             cdrdao(1) configuration file
@@ -146,5 +141,3 @@ let b:current_syntax = "cdrdaoconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/cdrtoc.vim b/syntax/cdrtoc.vim
index 9cf118b46..52fc45fb2 100644
--- a/syntax/cdrtoc.vim
+++ b/syntax/cdrtoc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cdrtoc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cdrtoc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cdrtoc') == -1
 
 " Vim syntax file
 " Language:             cdrdao(1) TOC file
@@ -544,5 +539,3 @@ let b:current_syntax = "cdrtoc"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/cf.vim b/syntax/cf.vim
index 52b179871..4f093a9d2 100644
--- a/syntax/cf.vim
+++ b/syntax/cf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cf') == -1
 
 " Vim syntax file
 "
@@ -1025,5 +1020,3 @@ let b:current_syntax = "cfml"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/cfg.vim b/syntax/cfg.vim
index 550203e73..ce289bf35 100644
--- a/syntax/cfg.vim
+++ b/syntax/cfg.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cfg.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cfg', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cfg') == -1
 
 " Vim syntax file
 " Language:	Good old CFG files
@@ -55,5 +50,3 @@ hi def link UncPath      Directory
 
 let b:current_syntax = "cfg"
 " vim:ts=8
-
-endif
diff --git a/syntax/ch.vim b/syntax/ch.vim
index fd97c7ceb..389531e4d 100644
--- a/syntax/ch.vim
+++ b/syntax/ch.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ch', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ch') == -1
 
 " Vim syntax file
 " Language:     Ch
@@ -45,5 +40,3 @@ hi def link chStructure		Structure
 let b:current_syntax = "ch"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/chaiscript.vim b/syntax/chaiscript.vim
index 609d35ff6..7b4df2824 100644
--- a/syntax/chaiscript.vim
+++ b/syntax/chaiscript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/chaiscript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('chaiscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chaiscript') == -1
 
 " Vim syntax file
 " Language:	ChaiScript
@@ -101,5 +96,3 @@ hi def link chaiscriptEval	        Special
 let b:current_syntax = "chaiscript"
 
 " vim: nowrap sw=2 sts=2 ts=8 noet
-
-endif
diff --git a/syntax/chaskell.vim b/syntax/chaskell.vim
index 4ec9a93e3..256912081 100644
--- a/syntax/chaskell.vim
+++ b/syntax/chaskell.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/chaskell.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('chaskell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chaskell') == -1
 
 " Vim syntax file
 " Language:	Haskell supporting c2hs binding hooks
@@ -21,5 +16,3 @@ let b:hs_chs=1
 runtime! syntax/haskell.vim
 
 " vim: ts=8
-
-endif
diff --git a/syntax/chill.vim b/syntax/chill.vim
index 18a706c6f..313dc67a3 100644
--- a/syntax/chill.vim
+++ b/syntax/chill.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/chill.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('chill', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chill') == -1
 
 " Vim syntax file
 " Language:	CHILL
@@ -185,5 +180,3 @@ hi def link chillBracket	Delimiter
 let b:current_syntax = "chill"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/chordpro.vim b/syntax/chordpro.vim
index 0ac02291e..b3f5b5bd3 100644
--- a/syntax/chordpro.vim
+++ b/syntax/chordpro.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/chordpro.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('chordpro', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'chordpro') == -1
 
 " Vim syntax file
 " Language:     ChordPro (v. 3.6.2)
@@ -74,5 +69,3 @@ let b:current_syntax = "chordpro"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/cl.vim b/syntax/cl.vim
index 6e5d04201..fa5c807c2 100644
--- a/syntax/cl.vim
+++ b/syntax/cl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cl') == -1
 
 " Vim syntax file
 " Language:		CL
@@ -105,5 +100,3 @@ hi def link clStatement	Statement
 let b:current_syntax = "cl"
 
 " vim: ts=8 sw=8
-
-endif
diff --git a/syntax/clean.vim b/syntax/clean.vim
index 91df7e010..a5ffc6fcf 100644
--- a/syntax/clean.vim
+++ b/syntax/clean.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/clean.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('clean', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clean') == -1
 
 " Vim syntax file
 " Language:		Clean
@@ -97,5 +92,3 @@ let b:current_syntax = "clean"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=4
-
-endif
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index be2285961..eb118543d 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/clojure.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('clojure', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
 
 " Vim syntax file
 " Language:     Clojure
@@ -230,5 +225,3 @@ let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif
diff --git a/syntax/cmake.vim b/syntax/cmake.vim
index cae10e0d8..12c22895d 100644
--- a/syntax/cmake.vim
+++ b/syntax/cmake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cmake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cmake', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmake') == -1
 
 " Vim syntax file
 " Program:      CMake - Cross-Platform Makefile Generator
@@ -3781,5 +3776,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim: set nowrap:
-
-endif
diff --git a/syntax/cmod.vim b/syntax/cmod.vim
index 41058a32b..a0eeb3e65 100644
--- a/syntax/cmod.vim
+++ b/syntax/cmod.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cmod.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cmod', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmod') == -1
 
 " Vim syntax file
 " Language:		Cmod
@@ -151,5 +146,3 @@ let b:current_syntax = "cmod"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/cmusrc.vim b/syntax/cmusrc.vim
index 8d9ff598d..7dc2b94dd 100644
--- a/syntax/cmusrc.vim
+++ b/syntax/cmusrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cmusrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cmusrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmusrc') == -1
 
 " Vim syntax file
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
@@ -316,5 +311,3 @@ let b:current_syntax = "cmusrc"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/cobol.vim b/syntax/cobol.vim
index 4f324728e..8cf9fb433 100644
--- a/syntax/cobol.vim
+++ b/syntax/cobol.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cobol.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cobol', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cobol') == -1
 
 " Vim syntax file
 " Language:     COBOL
@@ -267,5 +262,3 @@ hi def link cobolStart          Comment
 let b:current_syntax = "cobol"
 
 " vim: ts=6 nowrap
-
-endif
diff --git a/syntax/coco.vim b/syntax/coco.vim
index bd8ff87d8..1f01932ff 100644
--- a/syntax/coco.vim
+++ b/syntax/coco.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/coco.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('coco', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coco') == -1
 
 " Vim syntax file
 " Language:     Coco/R
@@ -39,5 +34,3 @@ hi def link cocoOperator         Operator
 hi def link cocoProductionCode   Statement
 hi def link cocoPragma           Special
 
-
-endif
diff --git a/syntax/coffee.vim b/syntax/coffee.vim
index 893d85cc0..837481ca9 100644
--- a/syntax/coffee.vim
+++ b/syntax/coffee.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/coffee.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -228,5 +223,3 @@ syn cluster coffeeAll contains=coffeeStatement,coffeeRepeat,coffeeConditional,
 if !exists('b:current_syntax')
   let b:current_syntax = 'coffee'
 endif
-
-endif
diff --git a/syntax/common.vim b/syntax/common.vim
index d7785ba60..739696250 100644
--- a/syntax/common.vim
+++ b/syntax/common.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/common.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " Define the default highlighting.
 " For version 5.8 and later: only when an item doesn't have highlighting yet
@@ -179,5 +174,3 @@ if exists("did_typescript_hilink")
   delcommand HiLink
   unlet did_typescript_hilink
 endif
-
-endif
diff --git a/syntax/conaryrecipe.vim b/syntax/conaryrecipe.vim
index c1e37f2cb..4af5618ce 100644
--- a/syntax/conaryrecipe.vim
+++ b/syntax/conaryrecipe.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/conaryrecipe.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('conaryrecipe', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'conaryrecipe') == -1
 
 " Vim syntax file
 " Language:	Conary Recipe
@@ -144,5 +139,3 @@ hi def link conaryUseFlag		Typedef
 
 let b:current_syntax = "conaryrecipe"
 
-
-endif
diff --git a/syntax/conf.vim b/syntax/conf.vim
index a8c4b050a..a5e43e327 100644
--- a/syntax/conf.vim
+++ b/syntax/conf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/conf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('conf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'conf') == -1
 
 " Vim syntax file
 " Language:	generic configure file
@@ -33,5 +28,3 @@ hi def link confString	String
 let b:current_syntax = "conf"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/config.vim b/syntax/config.vim
index ea1d63acc..a034d772a 100644
--- a/syntax/config.vim
+++ b/syntax/config.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/config.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('config', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'config') == -1
 
 " Vim syntax file
 " Language:		configure.in script: M4 with sh
@@ -61,5 +56,3 @@ hi def link configmsg       String
 let b:current_syntax = "config"
 
 " vim: ts=4
-
-endif
diff --git a/syntax/cpp.vim b/syntax/cpp.vim
index 0e51f1dd8..90bed7a5e 100644
--- a/syntax/cpp.vim
+++ b/syntax/cpp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cpp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('c/c++', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c/c++') == -1
 
 " Vim syntax file
 " Language:	C++
@@ -102,5 +97,3 @@ hi def link cppModule		Include
 let b:current_syntax = "cpp"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/cql.vim b/syntax/cql.vim
index e575d2fc6..e51240329 100644
--- a/syntax/cql.vim
+++ b/syntax/cql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cql') == -1
 
 " Vim syntax file
 " Language:     cql
@@ -138,5 +133,3 @@ endif
 
 let b:current_syntax = "cql"
 
-
-endif
diff --git a/syntax/crm.vim b/syntax/crm.vim
index a110facb5..1b6b8a66f 100644
--- a/syntax/crm.vim
+++ b/syntax/crm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/crm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crm') == -1
 
 " Vim syntax file
 " Language:             CRM114
@@ -48,5 +43,3 @@ let b:current_syntax = "crm"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/crontab.vim b/syntax/crontab.vim
index 12cebc776..7bedcadc6 100644
--- a/syntax/crontab.vim
+++ b/syntax/crontab.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/crontab.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crontab', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crontab') == -1
 
 " Vim syntax file
 " Language: crontab
@@ -74,5 +69,3 @@ hi def link crontabCmnt		Comment
 let b:current_syntax = "crontab"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/cryptol.vim b/syntax/cryptol.vim
index 6f098e8c7..eb55af0af 100644
--- a/syntax/cryptol.vim
+++ b/syntax/cryptol.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cryptol.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cryptol', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
 
 " Vim syntax file
 " Language:	Cryptol
@@ -120,5 +115,3 @@ endif
 let b:current_syntax = "cryptol"
 
 " Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
-
-endif
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index 4b3228937..02aea4383 100644
--- a/syntax/crystal.vim
+++ b/syntax/crystal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/crystal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 " Language: Crystal
 " Maintainer:
@@ -502,5 +497,3 @@ let b:current_syntax = 'crystal'
 delc SynFold
 
 " vim: sw=2 sts=2 et:
-
-endif
diff --git a/syntax/cs.vim b/syntax/cs.vim
index f9a8a6ae5..e416cf7f8 100644
--- a/syntax/cs.vim
+++ b/syntax/cs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cs', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cs') == -1
 
 " Vim syntax file
 " Language:            C#
@@ -228,5 +223,3 @@ let &cpoptions = s:save_cpo
 unlet s:save_cpo
 
 " vim: vts=16,28
-
-endif
diff --git a/syntax/csc.vim b/syntax/csc.vim
index b94237276..dfddecc3a 100644
--- a/syntax/csc.vim
+++ b/syntax/csc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/csc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('csc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csc') == -1
 
 " Vim syntax file
 " Language: Essbase script
@@ -198,5 +193,3 @@ let b:current_syntax = "csc"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/csdl.vim b/syntax/csdl.vim
index dd9347663..5064bc774 100644
--- a/syntax/csdl.vim
+++ b/syntax/csdl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/csdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('csdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csdl') == -1
 
 " Vim syntax file
 " Language: Curated Stream Definition Language (CSDL)
@@ -543,5 +538,3 @@ highlight link csdlTarget Constant
 highlight link csdlComment Comment
 "
 let b:current_syntax = "csdl"
-
-endif
diff --git a/syntax/csp.vim b/syntax/csp.vim
index 70be4d479..341906b6c 100644
--- a/syntax/csp.vim
+++ b/syntax/csp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/csp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('csp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csp') == -1
 
 " Vim syntax file
 " Language:	CSP (Communication Sequential Processes, using FDR input syntax)
@@ -189,5 +184,3 @@ hi def link cspReservedIdentifier	Error
 let b:current_syntax = "csp"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/css.vim b/syntax/css.vim
index 3ef886959..95ee1e751 100644
--- a/syntax/css.vim
+++ b/syntax/css.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/css.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('css', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'css') == -1
 
 " Vim syntax file
 " Language:     Cascading Style Sheets
@@ -660,5 +655,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/csv.vim b/syntax/csv.vim
index a0dbfd96b..138ae5476 100644
--- a/syntax/csv.vim
+++ b/syntax/csv.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/csv.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('csv', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'csv') == -1
 
 " A simple syntax highlighting, simply alternate colors between two
 " adjacent columns
@@ -176,5 +171,3 @@ let b:current_syntax="csv"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: set foldmethod=marker et sw=0 sts=-1 ts=4:
-
-endif
diff --git a/syntax/cterm.vim b/syntax/cterm.vim
index f037590d5..9f30bf5b0 100644
--- a/syntax/cterm.vim
+++ b/syntax/cterm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cterm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cterm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cterm') == -1
 
 " Vim syntax file
 " Language:	Century Term Command Script
@@ -184,5 +179,3 @@ hi def link ctermNumber		Number
 let b:current_syntax = "cterm"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/cucumber.vim b/syntax/cucumber.vim
index 521332e27..26a236a62 100644
--- a/syntax/cucumber.vim
+++ b/syntax/cucumber.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cucumber.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cucumber', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 
 " Vim syntax file
 " Language:     Cucumber
@@ -149,5 +144,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:set sts=2 sw=2:
-
-endif
diff --git a/syntax/cuda.vim b/syntax/cuda.vim
index a65302b30..3296fec52 100644
--- a/syntax/cuda.vim
+++ b/syntax/cuda.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cuda.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cuda', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cuda') == -1
 
 " Vim syntax file
 " Language:	CUDA (NVIDIA Compute Unified Device Architecture)
@@ -72,5 +67,3 @@ hi def link cudaConstant	Constant
 let b:current_syntax = "cuda"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/cuesheet.vim b/syntax/cuesheet.vim
index 9e5df7ce5..380edb1e9 100644
--- a/syntax/cuesheet.vim
+++ b/syntax/cuesheet.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cuesheet.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cue', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cue') == -1
 
 " Language:    Cue sheet
 " Maintainer:  Matěj Grabovský
@@ -33,5 +28,3 @@ syn match Number /\<\d\+\%(:\d\{2}\)\{2}\>/
 let b:current_syntax='cuesheet'
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/syntax/cupl.vim b/syntax/cupl.vim
index 98655e3c4..43488e565 100644
--- a/syntax/cupl.vim
+++ b/syntax/cupl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cupl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cupl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cupl') == -1
 
 " Vim syntax file
 " Language:	CUPL
@@ -131,5 +126,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=8
-
-endif
diff --git a/syntax/cuplsim.vim b/syntax/cuplsim.vim
index 304b311ce..d46278703 100644
--- a/syntax/cuplsim.vim
+++ b/syntax/cuplsim.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cuplsim.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cuplsim', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cuplsim') == -1
 
 " Vim syntax file
 " Language:	CUPL simulation
@@ -70,5 +65,3 @@ hi def link cuplsimOrderFormat	cuplNumber
 
 let b:current_syntax = "cuplsim"
 " vim:ts=8
-
-endif
diff --git a/syntax/cvs.vim b/syntax/cvs.vim
index b7a0fbf25..9a0b6e114 100644
--- a/syntax/cvs.vim
+++ b/syntax/cvs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cvs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cvs', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cvs') == -1
 
 " Vim syntax file
 " Language:	CVS commit file
@@ -36,5 +31,3 @@ hi def link cvsCom		Statement
 
 
 let b:current_syntax = "cvs"
-
-endif
diff --git a/syntax/cvsrc.vim b/syntax/cvsrc.vim
index 4856394e2..13b2f417b 100644
--- a/syntax/cvsrc.vim
+++ b/syntax/cvsrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cvsrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cvsrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cvsrc') == -1
 
 " Vim syntax file
 " Language:             cvs(1) RC file
@@ -46,5 +41,3 @@ let b:current_syntax = "cvsrc"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/cynpp.vim b/syntax/cynpp.vim
index f2e4da9c4..395621b68 100644
--- a/syntax/cynpp.vim
+++ b/syntax/cynpp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/cynpp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('cynpp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cynpp') == -1
 
 " Vim syntax file
 " Language:     Cyn++
@@ -57,5 +52,3 @@ hi def link cynppMacro  Statement
 
 
 let b:current_syntax = "cynpp"
-
-endif
diff --git a/syntax/d.vim b/syntax/d.vim
index 2e3de64a7..3473a23a4 100644
--- a/syntax/d.vim
+++ b/syntax/d.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/d.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 " Vim syntax file for the D programming language (version 1.076 and 2.069).
 "
@@ -580,5 +575,3 @@ syn keyword dAsmOpCode contained	adc
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/dart.vim b/syntax/dart.vim
index a2a1f8cf5..ef17f0ed1 100644
--- a/syntax/dart.vim
+++ b/syntax/dart.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dart.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dart', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
 
 " Vim syntax file " Language: Dart
 " Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
@@ -149,5 +144,3 @@ let b:spell_options = 'contained'
 if g:main_syntax is# 'dart'
   unlet g:main_syntax
 endif
-
-endif
diff --git a/syntax/datascript.vim b/syntax/datascript.vim
index 68738394f..e0138e6cf 100644
--- a/syntax/datascript.vim
+++ b/syntax/datascript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/datascript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('datascript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'datascript') == -1
 
 " Vim syntax file
 " Language:	DataScript
@@ -109,5 +104,3 @@ let b:current_syntax = "datascript"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/syntax/dcd.vim b/syntax/dcd.vim
index fd8cec39b..f94b451a1 100644
--- a/syntax/dcd.vim
+++ b/syntax/dcd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dcd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dcd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dcd') == -1
 
 " Vim syntax file
 " Language:	WildPackets EtherPeek Decoder (.dcd) file
@@ -58,5 +53,3 @@ hi def link dcdComment		Comment
 
 
 let b:current_syntax = "dcd"
-
-endif
diff --git a/syntax/dcov.vim b/syntax/dcov.vim
index 1949e7548..3d70df069 100644
--- a/syntax/dcov.vim
+++ b/syntax/dcov.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dcov.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 " Vim syntax file for coverage information for the reference compiler (DMD) of
 " the D programming language.
@@ -58,5 +53,3 @@ hi def link dcovLow                     Operator
 hi def link dcovPartial                 Structure
 
 let b:current_syntax = "dcov"
-
-endif
diff --git a/syntax/dd.vim b/syntax/dd.vim
index 9300e0d4d..ca81f45b3 100644
--- a/syntax/dd.vim
+++ b/syntax/dd.vim
@@ -1,12 +1,5 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 runtime! /syntax/ddoc.vim
-
-endif
diff --git a/syntax/ddoc.vim b/syntax/ddoc.vim
index 189e53945..80bb2e2cd 100644
--- a/syntax/ddoc.vim
+++ b/syntax/ddoc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ddoc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 if &filetype == "ddoc"
     "ddoc file type
@@ -89,5 +84,3 @@ elseif &filetype == "d"
     hi! def link ddocIdentifierNestedDecl  Macro
     hi! def link ddocKeyword               Macro
 endif
-
-endif
diff --git a/syntax/debchangelog.vim b/syntax/debchangelog.vim
index c22c95ab8..36fc627d0 100644
--- a/syntax/debchangelog.vim
+++ b/syntax/debchangelog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/debchangelog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('debchangelog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debchangelog') == -1
 
 " Vim syntax file
 " Language:    Debian changelog files
@@ -83,5 +78,3 @@ hi def link debchangelogEmail   Special
 let b:current_syntax = 'debchangelog'
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/debcontrol.vim b/syntax/debcontrol.vim
index 6c8758e43..76d6728f1 100644
--- a/syntax/debcontrol.vim
+++ b/syntax/debcontrol.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/debcontrol.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('debcontrol', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debcontrol') == -1
 
 " Vim syntax file
 " Language:    Debian control files
@@ -150,5 +145,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/debcopyright.vim b/syntax/debcopyright.vim
index 1bdcd5ff0..674a3e00a 100644
--- a/syntax/debcopyright.vim
+++ b/syntax/debcopyright.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/debcopyright.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('debcopyright', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debcopyright') == -1
 
 " Vim syntax file
 " Language:    Debian copyright file
@@ -40,5 +35,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/debsources.vim b/syntax/debsources.vim
index 3fce617bd..69fde2288 100644
--- a/syntax/debsources.vim
+++ b/syntax/debsources.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/debsources.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('debsources', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'debsources') == -1
 
 " Vim syntax file
 " Language:     Debian sources.list
@@ -63,5 +58,3 @@ hi def link debsourcesComment                 Comment
 hi def link debsourcesUri                     Constant
 
 let b:current_syntax = 'debsources'
-
-endif
diff --git a/syntax/def.vim b/syntax/def.vim
index f8535e5da..5c6138178 100644
--- a/syntax/def.vim
+++ b/syntax/def.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/def.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('def', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'def') == -1
 
 " Vim syntax file
 " Language:	Microsoft Module-Definition (.def) File
@@ -51,5 +46,3 @@ hi def link defOrdinal	Operator
 let b:current_syntax = "def"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/denyhosts.vim b/syntax/denyhosts.vim
index 8be396948..9372c53c2 100644
--- a/syntax/denyhosts.vim
+++ b/syntax/denyhosts.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/denyhosts.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('denyhosts', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'denyhosts') == -1
 
 " Vim syntax file
 " Language:             denyhosts configuration file
@@ -296,5 +291,3 @@ let b:current_syntax = "denyhosts"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/desc.vim b/syntax/desc.vim
index 943f87aff..ba14a1e3c 100644
--- a/syntax/desc.vim
+++ b/syntax/desc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/desc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('desc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'desc') == -1
 
 " Vim syntax file
 " Language:	T2 / ROCK Linux .desc
@@ -95,5 +90,3 @@ hi def link descText		Comment
 
 
 let b:current_syntax = "desc"
-
-endif
diff --git a/syntax/desktop.vim b/syntax/desktop.vim
index 9e149339b..c1d5a9eaa 100644
--- a/syntax/desktop.vim
+++ b/syntax/desktop.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/desktop.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('desktop', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'desktop') == -1
 
 " Vim syntax file
 " Language: XDG desktop entry
@@ -274,5 +269,3 @@ let b:current_syntax = "desktop"
 let &cpo = s:cpo_save
 
 " vim:ts=8:sw=2:fdm=marker
-
-endif
diff --git a/syntax/dhall.vim b/syntax/dhall.vim
index 4c27d0fed..e59575078 100644
--- a/syntax/dhall.vim
+++ b/syntax/dhall.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dhall.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dhall', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dhall') == -1
 
 scriptencoding utf-8
 
@@ -71,5 +66,3 @@ highlight link dhallMultilineComment Comment
 highlight link dhallHash Keyword
 
 let b:current_syntax = 'dhall'
-
-endif
diff --git a/syntax/dictconf.vim b/syntax/dictconf.vim
index c515cf564..44efc3522 100644
--- a/syntax/dictconf.vim
+++ b/syntax/dictconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dictconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dictconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictconf') == -1
 
 " Vim syntax file
 " Language:             dict(1) configuration file
@@ -87,5 +82,3 @@ let b:current_syntax = "dictconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/dictdconf.vim b/syntax/dictdconf.vim
index c30a900cb..5fb5ebf38 100644
--- a/syntax/dictdconf.vim
+++ b/syntax/dictdconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dictdconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dictdconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dictdconf') == -1
 
 " Vim syntax file
 " Language:             dictd(8) configuration file
@@ -153,5 +148,3 @@ let b:current_syntax = "dictdconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/diff.vim b/syntax/diff.vim
index 08b1f7dc8..43f99fb11 100644
--- a/syntax/diff.vim
+++ b/syntax/diff.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/diff.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('diff', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'diff') == -1
 
 " Vim syntax file
 " Language:	Diff (context or unified)
@@ -389,5 +384,3 @@ hi def link diffComment		Comment
 let b:current_syntax = "diff"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/dircolors.vim b/syntax/dircolors.vim
index 532978377..ce5d3cd40 100644
--- a/syntax/dircolors.vim
+++ b/syntax/dircolors.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dircolors.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dircolors', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dircolors') == -1
 
 " Vim syntax file
 " Language:        dircolors(1) input file
@@ -229,5 +224,3 @@ let b:current_syntax = "dircolors"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/django.vim b/syntax/django.vim
index dfe540823..9912b8c55 100644
--- a/syntax/django.vim
+++ b/syntax/django.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/django.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('htmldjango', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
 
 " Vim syntax file
 " Language:	Django template
@@ -90,5 +85,3 @@ hi def link djangoTodo Todo
 
 
 let b:current_syntax = "django"
-
-endif
diff --git a/syntax/dnsmasq.vim b/syntax/dnsmasq.vim
index 5373fea7c..d523fe231 100644
--- a/syntax/dnsmasq.vim
+++ b/syntax/dnsmasq.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dnsmasq.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dnsmasq', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dnsmasq') == -1
 
 " Vim syntax file
 " Maintainer:	Thilo Six
@@ -249,5 +244,3 @@ let b:current_syntax = "dnsmasq"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-
-endif
diff --git a/syntax/docker-compose.vim b/syntax/docker-compose.vim
index 71648bbbb..9290403da 100644
--- a/syntax/docker-compose.vim
+++ b/syntax/docker-compose.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/docker-compose.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('docker-compose', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'docker-compose') == -1
 
 " Vim syntax file
 " Language: Dockerfile
@@ -87,5 +82,3 @@ hi link dockercomposeTodo      Todo
 hi link bashStatement       Function
 
 let b:current_syntax = "dockercompose"
-
-endif
diff --git a/syntax/dockerfile.vim b/syntax/dockerfile.vim
index 5bd4c9f93..7c2ff2808 100644
--- a/syntax/dockerfile.vim
+++ b/syntax/dockerfile.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dockerfile.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dockerfile', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
 
 " dockerfile.vim - Syntax highlighting for Dockerfiles
 " Maintainer:   Honza Pokorny <https://honza.ca>
@@ -52,5 +47,3 @@ hi def link dockerfileComment Comment
 hi def link dockerfileOption Special
 
 let b:current_syntax = "dockerfile"
-
-endif
diff --git a/syntax/dosbatch.vim b/syntax/dosbatch.vim
index ee42764db..49d473148 100644
--- a/syntax/dosbatch.vim
+++ b/syntax/dosbatch.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dosbatch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dosbatch', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosbatch') == -1
 
 " Vim syntax file
 " Language:	MSDOS batch file (with NT command extensions)
@@ -154,5 +149,3 @@ hi def link dosbatchCmd		PreProc
 let b:current_syntax = "dosbatch"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/dosini.vim b/syntax/dosini.vim
index 489332367..fd8bb3a7f 100644
--- a/syntax/dosini.vim
+++ b/syntax/dosini.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dosini.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dosini', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dosini') == -1
 
 " Vim syntax file
 " Language:               Configuration File (ini file) for MSDOS/MS Windows
@@ -47,5 +42,3 @@ hi def link dosiniValue    String
 let b:current_syntax = "dosini"
 
 " vim: sts=2 sw=2 et
-
-endif
diff --git a/syntax/dot.vim b/syntax/dot.vim
index a2f442d39..57733404b 100644
--- a/syntax/dot.vim
+++ b/syntax/dot.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dot.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dot', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dot') == -1
 
 " Vim syntax file
 " Language:     Dot
@@ -104,5 +99,3 @@ hi def link dotIdentifier	 Identifier
 let b:current_syntax = "dot"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/dracula.vim b/syntax/dracula.vim
index 14b299228..df90e153e 100644
--- a/syntax/dracula.vim
+++ b/syntax/dracula.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dracula.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dracula', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dracula') == -1
 
 " Vim syntax file
 " Language:	Dracula
@@ -79,5 +74,3 @@ hi def link draculaPreProc    PreProc
 let b:current_syntax = "dracula"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/dsdl.vim b/syntax/dsdl.vim
index bf6818f9c..d66e483ef 100644
--- a/syntax/dsdl.vim
+++ b/syntax/dsdl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dsdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dlang') == -1
 
 " Vim syntax file for DUB configurations."
 "
@@ -97,5 +92,3 @@ hi def link dsdlStatement            Statement
 hi def link dsdlAttribute            Tag
 
 let b:current_syntax = "dsdl"
-
-endif
diff --git a/syntax/dsl.vim b/syntax/dsl.vim
index 03fa01c75..5b0972dd2 100644
--- a/syntax/dsl.vim
+++ b/syntax/dsl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dsl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dsl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dsl') == -1
 
 " Vim syntax file
 " Language:	DSSSL
@@ -45,5 +40,3 @@ hi def link dslComment		Comment
 hi def link dslCondDelim	Type
 
 let b:current_syntax = "dsl"
-
-endif
diff --git a/syntax/dtd.vim b/syntax/dtd.vim
index dfb0258ec..f2510263e 100644
--- a/syntax/dtd.vim
+++ b/syntax/dtd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dtd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dtd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dtd') == -1
 
 " Vim syntax file
 " Language: DTD (Document Type Definition for XML)
@@ -168,5 +163,3 @@ unlet s:dtd_cpo_save
 let b:current_syntax = "dtd"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/dts.vim b/syntax/dts.vim
index e326fdef6..66cfd3708 100644
--- a/syntax/dts.vim
+++ b/syntax/dts.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dts.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dts', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dts') == -1
 
 " Vim syntax file
 " Language:	dts/dtsi (device tree files)
@@ -37,5 +32,3 @@ hi def link dtsReference        Macro
 hi def link dtsComment          Comment
 hi def link dtsCommentInner     Comment 
 hi def link dtsCommentLine      Comment
-
-endif
diff --git a/syntax/dune.vim b/syntax/dune.vim
index e4fdfd80a..5fb01ff40 100644
--- a/syntax/dune.vim
+++ b/syntax/dune.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dune.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 if exists("b:current_syntax")
     finish
@@ -43,5 +38,3 @@ syn match duneVar '\${\k\+\(:\k\+\)\?}' containedin=lispSymbol
 hi def link duneVar Identifier
 
 let b:current_syntax = "dune"
-
-endif
diff --git a/syntax/dylan.vim b/syntax/dylan.vim
index 101cd3016..811039186 100644
--- a/syntax/dylan.vim
+++ b/syntax/dylan.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dylan.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dylan', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylan') == -1
 
 " Vim syntax file
 " Language:	Dylan
@@ -99,5 +94,3 @@ hi def link dylanVariable		Identifier
 let b:current_syntax = "dylan"
 
 " vim:ts=8
-
-endif
diff --git a/syntax/dylanintr.vim b/syntax/dylanintr.vim
index ed531a47b..b01740c8e 100644
--- a/syntax/dylanintr.vim
+++ b/syntax/dylanintr.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dylanintr.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dylanintr', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylanintr') == -1
 
 " Vim syntax file
 " Language:	Dylan
@@ -46,5 +41,3 @@ hi def link dylanintrInclude	Include
 let b:current_syntax = "dylanintr"
 
 " vim:ts=8
-
-endif
diff --git a/syntax/dylanlid.vim b/syntax/dylanlid.vim
index 0ad321d67..c847ab441 100644
--- a/syntax/dylanlid.vim
+++ b/syntax/dylanlid.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/dylanlid.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('dylanlid', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dylanlid') == -1
 
 " Vim syntax file
 " Language:	Dylan Library Interface Files
@@ -36,5 +31,3 @@ hi def link dylanlidEntry		String
 let b:current_syntax = "dylanlid"
 
 " vim:ts=8
-
-endif
diff --git a/syntax/ecd.vim b/syntax/ecd.vim
index eee185937..2a953b6c0 100644
--- a/syntax/ecd.vim
+++ b/syntax/ecd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ecd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ecd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ecd') == -1
 
 " Vim syntax file
 " Language:	ecd (Embedix Component Description) files
@@ -51,5 +46,3 @@ hi def link ecdTagError	Error
 
 let b:current_syntax = "ecd"
 " vim: ts=8
-
-endif
diff --git a/syntax/ecrystal.vim b/syntax/ecrystal.vim
index bfcb07d84..84166ed9f 100644
--- a/syntax/ecrystal.vim
+++ b/syntax/ecrystal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ecrystal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
 
 if &syntax !~# '\<ecrystal\>' || get(b:, 'current_syntax') =~# '\<ecrystal\>'
   finish
@@ -40,5 +35,3 @@ let b:current_syntax = 'ecrystal'
 if exists('main_syntax') && main_syntax ==# 'ecrystal'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/edif.vim b/syntax/edif.vim
index 4271733a9..bbe99d1d1 100644
--- a/syntax/edif.vim
+++ b/syntax/edif.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/edif.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('edif', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'edif') == -1
 
 " Vim syntax file
 " Language:     EDIF (Electronic Design Interchange Format)
@@ -52,5 +47,3 @@ hi def link edifError		Error
 hi def link edifString		String
 
 let b:current_syntax = "edif"
-
-endif
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index 906a1d2b4..947a3cbea 100644
--- a/syntax/eelixir.vim
+++ b/syntax/eelixir.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/eelixir.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if exists("b:current_syntax")
   finish
@@ -77,5 +72,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/elf.vim b/syntax/elf.vim
index 5da19f961..e5532b7fc 100644
--- a/syntax/elf.vim
+++ b/syntax/elf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/elf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elf') == -1
 
 " Vim syntax file
 " Language:    ELF
@@ -89,5 +84,3 @@ hi def link elfPunct Delimiter
 let b:current_syntax = "elf"
 
 " vim:ts=8:sw=4:nocindent:smartindent:
-
-endif
diff --git a/syntax/elinks.vim b/syntax/elinks.vim
index 41b91fb3c..4b90f02b7 100644
--- a/syntax/elinks.vim
+++ b/syntax/elinks.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/elinks.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elinks', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elinks') == -1
 
 " Vim syntax file
 " Language:             elinks(1) configuration file
@@ -195,5 +190,3 @@ let b:current_syntax = "elinks"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index ce3d51da2..70b76e3de 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/elixir.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 
 if !exists("main_syntax")
   if exists("b:current_syntax")
@@ -251,5 +246,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/elm.vim b/syntax/elm.vim
index a7551514d..ae095a1bb 100644
--- a/syntax/elm.vim
+++ b/syntax/elm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/elm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
 
 " syntax highlighting for Elm (https://elm-lang.org/)
 
@@ -106,5 +101,3 @@ hi def link elmModule Type
 syn sync minlines=500
 
 let b:current_syntax = 'elm'
-
-endif
diff --git a/syntax/elmfilt.vim b/syntax/elmfilt.vim
index 22ca2d14f..1a83f8e98 100644
--- a/syntax/elmfilt.vim
+++ b/syntax/elmfilt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/elmfilt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('elmfilt', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elmfilt') == -1
 
 " Vim syntax file
 " Language:	Elm Filter rules
@@ -65,5 +60,3 @@ endif
 
 let b:current_syntax = "elmfilt"
 " vim: ts=9
-
-endif
diff --git a/syntax/embeddedpuppet.vim b/syntax/embeddedpuppet.vim
index 024f49afb..1540cb025 100644
--- a/syntax/embeddedpuppet.vim
+++ b/syntax/embeddedpuppet.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/embeddedpuppet.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Vim syntax plugin
 " Language:             embedded puppet
@@ -36,5 +31,3 @@ hi def link ePuppetComment                Comment
 
 let b:current_syntax = "embeddedpuppet"
 
-
-endif
diff --git a/syntax/ember-script.vim b/syntax/ember-script.vim
index 8023bc729..e82219306 100644
--- a/syntax/ember-script.vim
+++ b/syntax/ember-script.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ember-script.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('emberscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emberscript') == -1
 
 " Language:    ember-script
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>>
@@ -38,5 +33,3 @@ syn match emEach /\v\@each/ display
 hi def link emEach Special
 
 let b:current_syntax = 'ember-script'
-
-endif
diff --git a/syntax/emblem.vim b/syntax/emblem.vim
index 1c1971ffc..08670626e 100644
--- a/syntax/emblem.vim
+++ b/syntax/emblem.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/emblem.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('emblem', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'emblem') == -1
 
 " Language:    emblem
 " Maintainer:  Yulij Andreevich Lesov <yalesov@gmail.com>
@@ -178,5 +173,3 @@ hi def link eblId       Constant
 hi def link eblClass    Identifier
 
 let b:current_syntax = 'emblem'
-
-endif
diff --git a/syntax/erlang.vim b/syntax/erlang.vim
index ad6cf13ae..434aeb583 100644
--- a/syntax/erlang.vim
+++ b/syntax/erlang.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/erlang.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('erlang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
 
 " Vim syntax file
 " Language:     Erlang (http://www.erlang.org)
@@ -268,5 +263,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 et
-
-endif
diff --git a/syntax/eruby.vim b/syntax/eruby.vim
index bb48261d6..b129bef75 100644
--- a/syntax/eruby.vim
+++ b/syntax/eruby.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/eruby.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim syntax file
 " Language:		eRuby
@@ -87,5 +82,3 @@ if main_syntax == 'eruby'
 endif
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/syntax/esmtprc.vim b/syntax/esmtprc.vim
index 50d7f3849..13e6b5d7c 100644
--- a/syntax/esmtprc.vim
+++ b/syntax/esmtprc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/esmtprc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('esmtprc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'esmtprc') == -1
 
 " Vim syntax file
 " Language:	Esmtp setup file (based on esmtp 0.5.0)
@@ -38,5 +33,3 @@ highlight link esmtprcIdentifier 	Identifier
 highlight link esmtprcFulladd		Include
 
 let b:current_syntax = "esmtprc"
-
-endif
diff --git a/syntax/esqlc.vim b/syntax/esqlc.vim
index 90c757d8e..038dd3071 100644
--- a/syntax/esqlc.vim
+++ b/syntax/esqlc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/esqlc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('esqlc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'esqlc') == -1
 
 " Vim syntax file
 " Language:	ESQL-C
@@ -65,5 +60,3 @@ hi def link esqlcPreProc	PreProc
 
 let b:current_syntax = "esqlc"
 
-
-endif
diff --git a/syntax/esterel.vim b/syntax/esterel.vim
index ac4618846..69984e9b8 100644
--- a/syntax/esterel.vim
+++ b/syntax/esterel.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/esterel.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('esterel', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'esterel') == -1
 
 " Vim syntax file
 " Language:			ESTEREL
@@ -85,5 +80,3 @@ hi def link esterelSpecial		Special
 
 
 let b:current_syntax = "esterel"
-
-endif
diff --git a/syntax/eterm.vim b/syntax/eterm.vim
index 4e8ba54db..306b19d72 100644
--- a/syntax/eterm.vim
+++ b/syntax/eterm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/eterm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('eterm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'eterm') == -1
 
 " Vim syntax file
 " Language:             eterm(1) configuration file
@@ -436,5 +431,3 @@ let b:current_syntax = "eterm"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/exim.vim b/syntax/exim.vim
index 8d73a6623..cd6a0c65e 100644
--- a/syntax/exim.vim
+++ b/syntax/exim.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/exim.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('exim', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'exim') == -1
 
 " Vim syntax file
 " This is a GENERATED FILE. Please always refer to source file at the URI below.
@@ -112,5 +107,3 @@ hi def link eximTransport Identifier
 
 
 let b:current_syntax = "exim"
-
-endif
diff --git a/syntax/expect.vim b/syntax/expect.vim
index 28d3daf59..439d5d3e7 100644
--- a/syntax/expect.vim
+++ b/syntax/expect.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/expect.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('expect', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'expect') == -1
 
 " Vim syntax file
 " Language:	Expect
@@ -110,5 +105,3 @@ hi def link expectTodo		Todo
 let b:current_syntax = "expect"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/exports.vim b/syntax/exports.vim
index 6ec91b989..a47d6536f 100644
--- a/syntax/exports.vim
+++ b/syntax/exports.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/exports.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('exports', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'exports') == -1
 
 " Vim syntax file
 " Language:	exports
@@ -65,5 +60,3 @@ endif
 
 let b:current_syntax = "exports"
 " vim: ts=10
-
-endif
diff --git a/syntax/falcon.vim b/syntax/falcon.vim
index 500bb08ec..b00183893 100644
--- a/syntax/falcon.vim
+++ b/syntax/falcon.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/falcon.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('falcon', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'falcon') == -1
 
 " Vim syntax file
 " Language:     Falcon
@@ -204,5 +199,3 @@ let b:current_syntax = "falcon"
 
 " vim: set sw=4 sts=4 et tw=80 :
 
-
-endif
diff --git a/syntax/fan.vim b/syntax/fan.vim
index 929f1f917..0d1d733a1 100644
--- a/syntax/fan.vim
+++ b/syntax/fan.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/fan.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fan', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fan') == -1
 
 " Vim syntax file
 " Language:     Fantom
@@ -139,5 +134,3 @@ hi def link fanSpaceError		Error
 let b:current_syntax = "fan"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/fbs.vim b/syntax/fbs.vim
index 76da1e0b3..eca7d5d95 100644
--- a/syntax/fbs.vim
+++ b/syntax/fbs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/fbs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('flatbuffers', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'flatbuffers') == -1
 
 if exists("b:current_syntax")
   finish
@@ -59,5 +54,3 @@ if version >= 508 || !exists("did_proto_syn_inits")
 endif
 
 let b:current_syntax = "fbs"
-
-endif
diff --git a/syntax/fennel.vim b/syntax/fennel.vim
index 827abe04c..918d28867 100644
--- a/syntax/fennel.vim
+++ b/syntax/fennel.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/fennel.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fennel', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fennel') == -1
 
 " Vim syntax file
 " Language: FENNEL
@@ -290,5 +285,3 @@ let b:current_syntax = "fennel"
 
 let &cpo = s:cpo_sav
 unlet! s:cpo_sav
-
-endif
diff --git a/syntax/ferm.vim b/syntax/ferm.vim
index 55af4ac44..f3ed88095 100644
--- a/syntax/ferm.vim
+++ b/syntax/ferm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ferm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ferm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ferm') == -1
 
 "============================================================================
 " ferm syntax highlighter
@@ -210,5 +205,3 @@ endif
 " Autoconfigure vim indentation settings
 " vim:ts=4:sw=4:sts=4:fdm=marker:iskeyword+=-
 
-
-endif
diff --git a/syntax/fetchmail.vim b/syntax/fetchmail.vim
index 2fb401d54..e69130f7f 100644
--- a/syntax/fetchmail.vim
+++ b/syntax/fetchmail.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/fetchmail.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fetchmail', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fetchmail') == -1
 
 " Vim syntax file
 " Language:             fetchmail(1) RC File
@@ -82,5 +77,3 @@ let b:current_syntax = "fetchmail"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/fgl.vim b/syntax/fgl.vim
index c115dd02d..24cccde9f 100644
--- a/syntax/fgl.vim
+++ b/syntax/fgl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/fgl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fgl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fgl') == -1
 
 " Vim syntax file
 " Language:	Informix 4GL
@@ -141,5 +136,3 @@ hi def link fglType	Type
 let b:current_syntax = "fgl"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/fish.vim b/syntax/fish.vim
index 9e39499f2..c2ffeb1af 100644
--- a/syntax/fish.vim
+++ b/syntax/fish.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/fish.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fish', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 
 if exists('b:current_syntax')
     finish
@@ -44,5 +39,3 @@ highlight default link fishStatement Statement
 highlight default link fishCommandSub fishStatement
 
 let b:current_syntax = 'fish'
-
-endif
diff --git a/syntax/flow.vim b/syntax/flow.vim
index 12a2b4d27..ec6f583ba 100644
--- a/syntax/flow.vim
+++ b/syntax/flow.vim
@@ -1,13 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/flow.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 runtime syntax/javascript.vim
 runtime extras/flow.vim
-
-endif
diff --git a/syntax/focexec.vim b/syntax/focexec.vim
index 3e195913b..7bc93bace 100644
--- a/syntax/focexec.vim
+++ b/syntax/focexec.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/focexec.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('focexec', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'focexec') == -1
 
 " Vim syntax file
 " Language:	Focus Executable
@@ -95,5 +90,3 @@ hi def link focexecFuse		Function
 let b:current_syntax = "focexec"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/forth.vim b/syntax/forth.vim
index c61b6a46c..1bf4946f5 100644
--- a/syntax/forth.vim
+++ b/syntax/forth.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/forth.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('forth', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'forth') == -1
 
 " Vim syntax file
 " Language:    FORTH
@@ -269,5 +264,3 @@ let b:current_syntax = "forth"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim:ts=8:sw=4:nocindent:smartindent:
-
-endif
diff --git a/syntax/fortran.vim b/syntax/fortran.vim
index ea2ccfa56..5acdf58ff 100644
--- a/syntax/fortran.vim
+++ b/syntax/fortran.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/fortran.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fortran', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fortran') == -1
 
 " Vim syntax file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
@@ -553,5 +548,3 @@ let b:current_syntax = "fortran"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8 tw=132
-
-endif
diff --git a/syntax/framescript.vim b/syntax/framescript.vim
index ae7e80335..59de43f51 100644
--- a/syntax/framescript.vim
+++ b/syntax/framescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/framescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('framescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'framescript') == -1
 
 " Vim syntax file
 " Language:             FrameScript v4.0
@@ -498,5 +493,3 @@ let b:current_syntax = "framescript"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/freebasic.vim b/syntax/freebasic.vim
index 955d03a14..42a16b14f 100644
--- a/syntax/freebasic.vim
+++ b/syntax/freebasic.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/freebasic.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('freebasic', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'freebasic') == -1
 
 " Vim syntax file
 " Language:    FreeBasic
@@ -264,5 +259,3 @@ hi def link freebasicTodo		Todo
 let b:current_syntax = "freebasic"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/fsharp.vim b/syntax/fsharp.vim
index 811ee00a5..209639b16 100644
--- a/syntax/fsharp.vim
+++ b/syntax/fsharp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/fsharp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fsharp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
 
 " Vim syntax file
 " Language:     F#
@@ -281,5 +276,3 @@ endif
 let b:current_syntax = 'fsharp'
 
 " vim: sw=4 et sts=4
-
-endif
diff --git a/syntax/fstab.vim b/syntax/fstab.vim
index 6c0539f6c..a4c44bb43 100644
--- a/syntax/fstab.vim
+++ b/syntax/fstab.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/fstab.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fstab', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fstab') == -1
 
 " Vim syntax file
 " Language: fstab file
@@ -298,5 +293,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8 ft=vim
-
-endif
diff --git a/syntax/fvwm.vim b/syntax/fvwm.vim
index e244f9d7b..7ea554d2e 100644
--- a/syntax/fvwm.vim
+++ b/syntax/fvwm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/fvwm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('fvwm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fvwm') == -1
 
 " Vim syntax file for Fvwm-2.5.22
 " Language:		Fvwm{1,2} configuration file
@@ -649,5 +644,3 @@ let b:current_syntax = "fvwm"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/syntax/gdb.vim b/syntax/gdb.vim
index 27aa26f53..31eceac07 100644
--- a/syntax/gdb.vim
+++ b/syntax/gdb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gdb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gdb', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdb') == -1
 
 " Vim syntax file
 " Language:	GDB command files
@@ -110,5 +105,3 @@ let b:current_syntax = "gdb"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/gdmo.vim b/syntax/gdmo.vim
index 01327e5cf..86f827a6f 100644
--- a/syntax/gdmo.vim
+++ b/syntax/gdmo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gdmo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gdmo', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdmo') == -1
 
 " Vim syntax file
 " Language:	GDMO
@@ -90,5 +85,3 @@ hi def link gdmoType	      Type
 let b:current_syntax = "gdmo"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/gdscript3.vim b/syntax/gdscript3.vim
index 2b943443f..b7bc35b43 100644
--- a/syntax/gdscript3.vim
+++ b/syntax/gdscript3.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gdscript3.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gdscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdscript') == -1
 
 " Syntax file for GDScript
 
@@ -104,5 +99,3 @@ hi def link gdTodo    Todo
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/syntax/gedcom.vim b/syntax/gedcom.vim
index 64868eccf..67609240c 100644
--- a/syntax/gedcom.vim
+++ b/syntax/gedcom.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gedcom.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gedcom', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gedcom') == -1
 
 " Vim syntax file
 " Language:	Gedcom
@@ -60,5 +55,3 @@ hi def link gedcom_date Constant
 
 
 let b:current_syntax = "gedcom"
-
-endif
diff --git a/syntax/git.vim b/syntax/git.vim
index 13d5f5fbc..73f7d44eb 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/git.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim syntax file
 " Language:	generic git output
@@ -87,5 +82,3 @@ hi def link gitDiffAdded         diffAdded
 hi def link gitDiffRemoved       diffRemoved
 
 let b:current_syntax = "git"
-
-endif
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index 5b0d5e773..0ae05f810 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gitcommit.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim syntax file
 " Language:	git commit file
@@ -100,5 +95,3 @@ hi def link gitcommitArrow		gitcommitComment
 hi def link gitcommitBlank		Error
 
 let b:current_syntax = "gitcommit"
-
-endif
diff --git a/syntax/gitconfig.vim b/syntax/gitconfig.vim
index 4aef73e30..e0a91a2c9 100644
--- a/syntax/gitconfig.vim
+++ b/syntax/gitconfig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gitconfig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim syntax file
 " Language:	git config file
@@ -43,5 +38,3 @@ hi def link gitconfigEscape		Special
 hi def link gitconfigError		Error
 
 let b:current_syntax = "gitconfig"
-
-endif
diff --git a/syntax/gitignore.vim b/syntax/gitignore.vim
index f946f6b7c..177713f8b 100644
--- a/syntax/gitignore.vim
+++ b/syntax/gitignore.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gitignore.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gitignore', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
 
 scriptencoding utf-8
 
@@ -36,5 +31,3 @@ highlight default link gitignoreSet Character
 let b:current_syntax = 'gitignore'
 
 " vim: ts=2 et sw=2
-
-endif
diff --git a/syntax/gitolite.vim b/syntax/gitolite.vim
index 56f9268d1..286fa1b4f 100644
--- a/syntax/gitolite.vim
+++ b/syntax/gitolite.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gitolite.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gitolite', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitolite') == -1
 
 " Vim syntax file
 " Language:	gitolite configuration
@@ -101,5 +96,3 @@ let b:current_syntax = "gitolite"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index 5cbda44c0..344a92696 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/gitrebase.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gitrebase.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim syntax file
 " Language:	git rebase --interactive
@@ -64,5 +59,3 @@ hi def link gitrebaseMergeComment   gitrebaseComment
 hi def link gitrebaseName           Tag
 
 let b:current_syntax = "gitrebase"
-
-endif
diff --git a/syntax/gitsendemail.vim b/syntax/gitsendemail.vim
index d60e448a6..41e0bec82 100644
--- a/syntax/gitsendemail.vim
+++ b/syntax/gitsendemail.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gitsendemail.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'git') == -1
 
 " Vim syntax file
 " Language:	git send-email message
@@ -30,5 +25,3 @@ syn match   gitsendemailComment "^GIT:.*"
 hi def link gitsendemailComment Comment
 
 let b:current_syntax = "gitsendemail"
-
-endif
diff --git a/syntax/gkrellmrc.vim b/syntax/gkrellmrc.vim
index 1c9818699..68ba85fb0 100644
--- a/syntax/gkrellmrc.vim
+++ b/syntax/gkrellmrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gkrellmrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gkrellmrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gkrellmrc') == -1
 
 " Vim syntax file
 " This is a GENERATED FILE. Please always refer to source file at the URI below.
@@ -82,5 +77,3 @@ hi def link gkrellmrcStyleCmd Statement
 
 
 let b:current_syntax = "gkrellmrc"
-
-endif
diff --git a/syntax/glsl.vim b/syntax/glsl.vim
index a2bdb8b08..fa81f97a1 100644
--- a/syntax/glsl.vim
+++ b/syntax/glsl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/glsl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('glsl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
 
 " Language: OpenGL Shading Language
 " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
@@ -682,5 +677,3 @@ if !exists("b:current_syntax")
 endif
 
 " vim:set sts=2 sw=2 :
-
-endif
diff --git a/syntax/gmpl.vim b/syntax/gmpl.vim
index 2b866453d..0b410ee82 100644
--- a/syntax/gmpl.vim
+++ b/syntax/gmpl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gmpl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gmpl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gmpl') == -1
 
 " Vim syntax file
 " Language: GMPL
@@ -125,5 +120,3 @@ hi def link gmplType Type
 hi def link gmplLabel Keyword
 hi def link gmplString String
 hi def link gmplStringToken Special 
-
-endif
diff --git a/syntax/gnash.vim b/syntax/gnash.vim
index 1adf335db..6109254b4 100644
--- a/syntax/gnash.vim
+++ b/syntax/gnash.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gnash.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gnash', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gnash') == -1
 
 " Vim syntax file
 " Maintainer: 	Thilo Six
@@ -103,5 +98,3 @@ hi def link GnashKeyword    Keyword
 
 let b:current_syntax = "gnash"
 
-
-endif
diff --git a/syntax/gnuplot.vim b/syntax/gnuplot.vim
index 734dbbf7b..ae42ab8ac 100644
--- a/syntax/gnuplot.vim
+++ b/syntax/gnuplot.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gnuplot.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gnuplot', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gnuplot') == -1
 
 " Vim syntax file
 " Language:	gnuplot 4.7.0
@@ -561,5 +556,3 @@ endif
 let b:current_syntax = "gnuplot"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/go.vim b/syntax/go.vim
index f546b91a2..b28002ec5 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/go.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " Copyright 2009 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
@@ -452,5 +447,3 @@ syn sync minlines=500
 let b:current_syntax = "go"
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/godebugoutput.vim b/syntax/godebugoutput.vim
index 483518bc7..e02d85236 100644
--- a/syntax/godebugoutput.vim
+++ b/syntax/godebugoutput.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/godebugoutput.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:current_syntax")
   finish
@@ -20,5 +15,3 @@ hi def link godebugOutputErr Comment
 hi def link godebugOutputOut Normal
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/godebugstacktrace.vim b/syntax/godebugstacktrace.vim
index c3964205e..0e25da3b1 100644
--- a/syntax/godebugstacktrace.vim
+++ b/syntax/godebugstacktrace.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/godebugstacktrace.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:current_syntax")
   finish
@@ -18,5 +13,3 @@ let b:current_syntax = "godebugoutput"
 hi def link godebugStacktrace SpecialKey
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/godebugvariables.vim b/syntax/godebugvariables.vim
index 51d9fa3fa..1148a534c 100644
--- a/syntax/godebugvariables.vim
+++ b/syntax/godebugvariables.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/godebugvariables.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:current_syntax")
   finish
@@ -30,5 +25,3 @@ hi def link goType Type
 hi def link goBoolean Boolean
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/godefstack.vim b/syntax/godefstack.vim
index 228a82370..c20dd5a7d 100644
--- a/syntax/godefstack.vim
+++ b/syntax/godefstack.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/godefstack.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:current_syntax")
   finish
@@ -27,5 +22,3 @@ hi def link godefStackFilename          Directory
 hi def link godefStackEntryLocationNumber LineNr
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/gohtmltmpl.vim b/syntax/gohtmltmpl.vim
index f38d95326..86d59daaa 100644
--- a/syntax/gohtmltmpl.vim
+++ b/syntax/gohtmltmpl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gohtmltmpl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:current_syntax")
   finish
@@ -24,5 +19,3 @@ syn cluster htmlPreproc add=gotplAction,goTplComment
 let b:current_syntax = "gohtmltmpl"
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/gomod.vim b/syntax/gomod.vim
index 4e3cf4840..56790034a 100644
--- a/syntax/gomod.vim
+++ b/syntax/gomod.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gomod.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " gomod.vim: Vim syntax file for go.mod file
 "
@@ -99,5 +94,3 @@ syntax match gomodVersion "v[2-9]\{1}\d*\.\d\+\.\d\+\%(+\%([0-9A-Za-z-]\+\)\%(\.
 highlight default link gomodVersion Identifier
 
 let b:current_syntax = "gomod"
-
-endif
diff --git a/syntax/gotexttmpl.vim b/syntax/gotexttmpl.vim
index a4af59a9c..6accca5f4 100644
--- a/syntax/gotexttmpl.vim
+++ b/syntax/gotexttmpl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gotexttmpl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 " Copyright 2011 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
@@ -92,5 +87,3 @@ hi def link goTplComment Comment
 let b:current_syntax = "gotexttmpl"
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/gp.vim b/syntax/gp.vim
index 634bbd597..b60abfd39 100644
--- a/syntax/gp.vim
+++ b/syntax/gp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gp') == -1
 
 " Vim syntax file
 " Language:	gp (version 2.5)
@@ -90,5 +85,3 @@ let b:current_syntax = "gp"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/gpg.vim b/syntax/gpg.vim
index e227e22a3..f02d6f944 100644
--- a/syntax/gpg.vim
+++ b/syntax/gpg.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gpg.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gpg', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gpg') == -1
 
 " Vim syntax file
 " Language:             gpg(1) configuration file
@@ -112,5 +107,3 @@ let b:current_syntax = "gpg"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/grads.vim b/syntax/grads.vim
index e9efe0500..d733850e9 100644
--- a/syntax/grads.vim
+++ b/syntax/grads.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/grads.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('grads', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'grads') == -1
 
 " Vim syntax file
 " Language:	grads (GrADS scripts)
@@ -80,5 +75,3 @@ hi def link gradsTypos		Error
 
 
 let b:current_syntax = "grads"
-
-endif
diff --git a/syntax/graphql.vim b/syntax/graphql.vim
index c3410528c..58d7584a9 100644
--- a/syntax/graphql.vim
+++ b/syntax/graphql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/graphql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
 
 " Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
 "
@@ -102,5 +97,3 @@ hi def link graphqlVariable         Identifier
 syn sync minlines=500
 
 let b:current_syntax = 'graphql'
-
-endif
diff --git a/syntax/gretl.vim b/syntax/gretl.vim
index 1ff069d43..43a41a37b 100644
--- a/syntax/gretl.vim
+++ b/syntax/gretl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gretl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gretl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gretl') == -1
 
 " Vim syntax file
 " Language:	gretl (http://gretl.sf.net)
@@ -92,5 +87,3 @@ hi def link gArrow	       Repeat
 let b:current_syntax="gretl"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/groovy.vim b/syntax/groovy.vim
index 0ccf8d34e..bfa9ab4ce 100644
--- a/syntax/groovy.vim
+++ b/syntax/groovy.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/groovy.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('groovy', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy') == -1
 
 " Vim syntax file
 " Language:	Groovy
@@ -457,5 +452,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/group.vim b/syntax/group.vim
index 4b06fc071..ca808bc80 100644
--- a/syntax/group.vim
+++ b/syntax/group.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/group.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('group', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'group') == -1
 
 " Vim syntax file
 " Language:             group(5) user group file
@@ -59,5 +54,3 @@ let b:current_syntax = "group"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/grub.vim b/syntax/grub.vim
index fafa46379..ff980818a 100644
--- a/syntax/grub.vim
+++ b/syntax/grub.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/grub.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('grub', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'grub') == -1
 
 " Vim syntax file
 " Language:             grub(8) configuration file
@@ -100,5 +95,3 @@ let b:current_syntax = "grub"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/gsl.vim b/syntax/gsl.vim
index 9590530cb..fa65bfc37 100644
--- a/syntax/gsl.vim
+++ b/syntax/gsl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gsl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gdscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gdscript') == -1
 
 " Syntax file for Godot Shading Language
 
@@ -66,5 +61,3 @@ hi def link gslTodo    Todo
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/syntax/gsp.vim b/syntax/gsp.vim
index 1bbf3c0e6..fd7d3848c 100644
--- a/syntax/gsp.vim
+++ b/syntax/gsp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gsp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gsp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gsp') == -1
 
 " Vim syntax file
 " Language:	GSP - GNU Server Pages (v. 0.86)
@@ -61,5 +56,3 @@ endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/gtkrc.vim b/syntax/gtkrc.vim
index 1a6d86f4b..4de03a65a 100644
--- a/syntax/gtkrc.vim
+++ b/syntax/gtkrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/gtkrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('gtkrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gtkrc') == -1
 
 " Vim syntax file
 " This is a GENERATED FILE. Please always refer to source file at the URI below.
@@ -133,5 +128,3 @@ hi def link gtkrcError Error
 
 
 let b:current_syntax = "gtkrc"
-
-endif
diff --git a/syntax/haml.vim b/syntax/haml.vim
index 32c6f794e..5622da7dd 100644
--- a/syntax/haml.vim
+++ b/syntax/haml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/haml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 
 " Vim syntax file
 " Language:	Haml
@@ -116,5 +111,3 @@ if main_syntax == "haml"
 endif
 
 " vim:set sw=2:
-
-endif
diff --git a/syntax/hamster.vim b/syntax/hamster.vim
index df1d17bce..956e0acae 100644
--- a/syntax/hamster.vim
+++ b/syntax/hamster.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/hamster.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hamster', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hamster') == -1
 
 " Vim syntax file
 " Language:    Hamster Scripting Language
@@ -377,5 +372,3 @@ hi def link hamsterFunction	Function
 let b:current_syntax = "hamster"
 
 " vim:sw=4
-
-endif
diff --git a/syntax/handlebars.vim b/syntax/handlebars.vim
index 1eba110a4..e16e9a044 100644
--- a/syntax/handlebars.vim
+++ b/syntax/handlebars.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/handlebars.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 " Mustache & Handlebars syntax
 " Language:	Mustache, Handlebars
@@ -113,5 +108,3 @@ syn region mustacheScriptTemplate start=+<script [^>]*type *=[^>]*text/\(mustach
 
 let b:current_syntax = "handlebars"
 delcommand HtmlHiLink
-
-endif
diff --git a/syntax/haproxy.vim b/syntax/haproxy.vim
index df9bfd90b..4871305ed 100644
--- a/syntax/haproxy.vim
+++ b/syntax/haproxy.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/haproxy.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haproxy', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haproxy') == -1
 
 " Vim syntax file
 " Language:    HAproxy
@@ -363,5 +358,3 @@ delcommand HiLink
 
 let b:current_syntax = "haproxy"
 " vim: ts=8
-
-endif
diff --git a/syntax/haskell.vim b/syntax/haskell.vim
index 4f25ed8b0..0171244b1 100644
--- a/syntax/haskell.vim
+++ b/syntax/haskell.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/haskell.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 
 " syntax highlighting for haskell
 "
@@ -215,5 +210,3 @@ if get(g:, 'haskell_backpack', 0)
   highlight def link haskellBackpackDependency Include
 endif
 let b:current_syntax = "haskell"
-
-endif
diff --git a/syntax/haste.vim b/syntax/haste.vim
index 1f75c9501..581c7b121 100644
--- a/syntax/haste.vim
+++ b/syntax/haste.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/haste.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haste', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haste') == -1
 
 " Vim syntax file
 " Language:	HASTE - a language for VLSI IC programming
@@ -149,5 +144,3 @@ hi def link hasteInclude	Include
 let b:current_syntax = "haste"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/hastepreproc.vim b/syntax/hastepreproc.vim
index 3228740cc..7d599defb 100644
--- a/syntax/hastepreproc.vim
+++ b/syntax/hastepreproc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/hastepreproc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hastepreproc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hastepreproc') == -1
 
 " Vim syntax file
 " Language:	Haste preprocessor files 
@@ -45,5 +40,3 @@ hi def link hastepreprocError	Error
 let b:current_syntax = "hastepreproc"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/haxe.vim b/syntax/haxe.vim
index 1ca9f40a5..9e12de94c 100644
--- a/syntax/haxe.vim
+++ b/syntax/haxe.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/haxe.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('haxe', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haxe') == -1
 
 " Vim syntax file
 " Language:     haxe
@@ -434,5 +429,3 @@ if main_syntax == 'haxe'
   unlet main_syntax
 endif
 let b:spell_options="contained"
-
-endif
diff --git a/syntax/hb.vim b/syntax/hb.vim
index 524effc1c..ffc392aa5 100644
--- a/syntax/hb.vim
+++ b/syntax/hb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/hb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hb', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hb') == -1
 
 " Vim syntax file
 " Language:	Hyper Builder
@@ -96,5 +91,3 @@ let b:current_syntax = "hb"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/hcl.vim b/syntax/hcl.vim
index b28e6d4f2..ed2cef864 100644
--- a/syntax/hcl.vim
+++ b/syntax/hcl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/hcl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hcl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hcl') == -1
 
 
 if exists("b:current_syntax")
@@ -51,5 +46,3 @@ hi def link hclInterpolation            String
 hi def link hclSimpleString             PreProc
 
 let b:current_syntax = "hcl"
-
-endif
diff --git a/syntax/helm.vim b/syntax/helm.vim
index 012a44f8a..6182cbd8e 100644
--- a/syntax/helm.vim
+++ b/syntax/helm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/helm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('helm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'helm') == -1
 
 if exists("b:current_syntax")
   finish
@@ -98,5 +93,3 @@ hi def link goTplComment Comment
 let b:current_syntax = "helm"
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/help.vim b/syntax/help.vim
index 53935fae9..7bc7dac04 100644
--- a/syntax/help.vim
+++ b/syntax/help.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/help.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('help', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'help') == -1
 
 " Vim syntax file
 " Language:	Vim help file
@@ -220,5 +215,3 @@ let b:current_syntax = "help"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/hercules.vim b/syntax/hercules.vim
index 37a35d4ee..e3f429d1d 100644
--- a/syntax/hercules.vim
+++ b/syntax/hercules.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/hercules.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hercules', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hercules') == -1
 
 " Vim syntax file
 " Language:	Hercules
@@ -126,5 +121,3 @@ hi def link herculesError      Error
 let b:current_syntax = "hercules"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/hex.vim b/syntax/hex.vim
index dcf932cd9..d1d753a63 100644
--- a/syntax/hex.vim
+++ b/syntax/hex.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/hex.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hex', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hex') == -1
 
 " Vim syntax file
 " Language:	Intel HEX
@@ -96,5 +91,3 @@ hi def link hexChecksum            DiffChange
 let b:current_syntax = "hex"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/hgcommit.vim b/syntax/hgcommit.vim
index 3c27e3b9c..1326ef3be 100644
--- a/syntax/hgcommit.vim
+++ b/syntax/hgcommit.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/hgcommit.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hgcommit', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hgcommit') == -1
 
 " Vim syntax file
 " Language:	hg (Mercurial) commit file
@@ -34,5 +29,3 @@ hi def link hgcommitChanged Special
 hi def link hgcommitRemoved Constant
 
 let b:current_syntax = "hgcommit"
-
-endif
diff --git a/syntax/hive.vim b/syntax/hive.vim
index 4c53ad7ca..c03321d76 100644
--- a/syntax/hive.vim
+++ b/syntax/hive.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/hive.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hive', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hive') == -1
 
 " Vim syntax file
 " Language: HIVE Query Language
@@ -142,5 +137,3 @@ hi link hiveVar Special
 let b:current_syntax = "hive"
 
 " vim: ts=4
-
-endif
diff --git a/syntax/hog.vim b/syntax/hog.vim
index 68b0b91fe..96540cfa8 100644
--- a/syntax/hog.vim
+++ b/syntax/hog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/hog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hog') == -1
 
 " Vim syntax file
 " Language: hog (Snort.conf + .rules)
@@ -215,5 +210,3 @@ hi link HogFileTypeOpt HogRuleOption
 hi link NotASemiColn     HogRuleChars
 
 let b:current_syntax = "hog"
-
-endif
diff --git a/syntax/hollywood.vim b/syntax/hollywood.vim
index 9ca2dea2d..0ba407dad 100644
--- a/syntax/hollywood.vim
+++ b/syntax/hollywood.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/hollywood.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hollywood', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hollywood') == -1
 
 " Vim syntax file
 " Language:     Hollywood 8.0	
@@ -188,5 +183,3 @@ let b:current_syntax = "hollywood"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: et ts=8 sw=2
-
-endif
diff --git a/syntax/hostconf.vim b/syntax/hostconf.vim
index 2c912bc6d..bf740b64f 100644
--- a/syntax/hostconf.vim
+++ b/syntax/hostconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/hostconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hostconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hostconf') == -1
 
 " Vim syntax file
 " Language:             host.conf(5) configuration file
@@ -154,5 +149,3 @@ let b:current_syntax = "hostconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/hostsaccess.vim b/syntax/hostsaccess.vim
index 4882840e9..9e905ff9a 100644
--- a/syntax/hostsaccess.vim
+++ b/syntax/hostsaccess.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/hostsaccess.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('hostsaccess', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'hostsaccess') == -1
 
 " Vim syntax file
 " Language:	hosts.deny, hosts.allow configuration files
@@ -30,5 +25,3 @@ unlet b:current_syntax
 
 let b:current_syntax = "hostsaccess"
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/html.vim b/syntax/html.vim
index a505da2a7..23d334467 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/html.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('html', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html') == -1
 
 " Vim syntax file
 " Language:             HTML
@@ -345,5 +340,3 @@ endif
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/htmldjango.vim b/syntax/htmldjango.vim
index 0282f30c6..cd7e46607 100644
--- a/syntax/htmldjango.vim
+++ b/syntax/htmldjango.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/htmldjango.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('htmldjango', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
 
 " Vim syntax file
 " Language:	Django HTML template
@@ -33,5 +28,3 @@ syn region djangoComment start="{%\s*comment\(\s\+.\{-}\)\?%}" end="{%\s*endcomm
 syn region djangoComBlock start="{#" end="#}" contains=djangoTodo containedin=ALLBUT,@djangoBlocks
 
 let b:current_syntax = "htmldjango"
-
-endif
diff --git a/syntax/htmlm4.vim b/syntax/htmlm4.vim
index 834c86bf9..6294526fd 100644
--- a/syntax/htmlm4.vim
+++ b/syntax/htmlm4.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/htmlm4.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('htmlm4', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmlm4') == -1
 
 " Vim syntax file
 " Language:	HTML and M4
@@ -38,5 +33,3 @@ let b:current_syntax = "htmlm4"
 if main_syntax == 'htmlm4'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/i3config.vim b/syntax/i3config.vim
index 58dd81a01..c1c78ebb0 100644
--- a/syntax/i3config.vim
+++ b/syntax/i3config.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/i3config.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('i3', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'i3') == -1
 
 " Vim syntax file
 " Language: i3 config file
@@ -266,5 +261,3 @@ hi! def link i3ConfigVariable                        Statement
 hi! def link i3ConfigArbitraryCommand                Type
 
 let b:current_syntax = "i3config"
-
-endif
diff --git a/syntax/ibasic.vim b/syntax/ibasic.vim
index 2959ff72b..d80f9caa2 100644
--- a/syntax/ibasic.vim
+++ b/syntax/ibasic.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ibasic.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ibasic', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ibasic') == -1
 
 " Vim syntax file
 " Language:	ibasic
@@ -183,5 +178,3 @@ hi def link ibasicMathOperator		Operator
 let b:current_syntax = "ibasic"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/icalendar.vim b/syntax/icalendar.vim
index 1912bad8c..7815de41c 100644
--- a/syntax/icalendar.vim
+++ b/syntax/icalendar.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/icalendar.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('icalendar', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'icalendar') == -1
 
 " Vim syntax file
 " Language:      icalendar <http://www.ietf.org/rfc/rfc2445.txt>
@@ -62,5 +57,3 @@ let b:current_syntax = "icalendar"
 "EOF vim: tw=78:ft=vim:ts=8
 
 
-
-endif
diff --git a/syntax/icemenu.vim b/syntax/icemenu.vim
index 26efef5df..928e5c179 100644
--- a/syntax/icemenu.vim
+++ b/syntax/icemenu.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/icemenu.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('icemenu', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'icemenu') == -1
 
 " Vim syntax file
 " Language:	Icewm Menu
@@ -41,5 +36,3 @@ highlight link _ids Type
 highlight link _icon Special
 
 let b:current_syntax = "IceMenu"
-
-endif
diff --git a/syntax/icon.vim b/syntax/icon.vim
index e5adba2b1..4f538f3d2 100644
--- a/syntax/icon.vim
+++ b/syntax/icon.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/icon.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('icon', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'icon') == -1
 
 " Vim syntax file
 " Language:	Icon
@@ -206,5 +201,3 @@ hi def link iconKeyword		Operator
 
 let b:current_syntax = "icon"
 
-
-endif
diff --git a/syntax/idris.vim b/syntax/idris.vim
index 34a7dc577..2b6293a6c 100644
--- a/syntax/idris.vim
+++ b/syntax/idris.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/idris.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 
 " syntax highlighting for idris (idris-lang.org)
 "
@@ -96,5 +91,3 @@ highlight def link idrisChar String
 highlight def link idrisBacktick Operator
 
 let b:current_syntax = "idris"
-
-endif
diff --git a/syntax/idris2.vim b/syntax/idris2.vim
index b580cc02a..cf6babd96 100644
--- a/syntax/idris2.vim
+++ b/syntax/idris2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/idris2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
 
 " syntax highlighting for Idris 2 (idris-lang.org)
 "
@@ -88,5 +83,3 @@ highlight def link idrisChar String
 highlight def link idrisBacktick Operator
 
 let b:current_syntax = "idris2"
-
-endif
diff --git a/syntax/indent.vim b/syntax/indent.vim
index bccbfa6ba..d01a007c0 100644
--- a/syntax/indent.vim
+++ b/syntax/indent.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/indent.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('indent', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'indent') == -1
 
 " Vim syntax file
 " Language:             indent(1) configuration file
@@ -159,5 +154,3 @@ let b:current_syntax = "indent"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/inform.vim b/syntax/inform.vim
index 86e56be40..29e3f80ff 100644
--- a/syntax/inform.vim
+++ b/syntax/inform.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/inform.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('inform', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'inform') == -1
 
 " Vim syntax file
 " Language:     Inform
@@ -399,5 +394,3 @@ hi def link informBadStrUnicode	informError
 let b:current_syntax = "inform"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/initng.vim b/syntax/initng.vim
index 500d55702..4950ace9b 100644
--- a/syntax/initng.vim
+++ b/syntax/initng.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/initng.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('initng', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'initng') == -1
 
 " Vim syntax file
 " Language:	initng .i files
@@ -98,5 +93,3 @@ hi def link	initngSubstMacro		Comment
 hi def link	initngDefine			Macro
 
 let b:current_syntax = "initng"
-
-endif
diff --git a/syntax/inittab.vim b/syntax/inittab.vim
index 0f661b8f5..a024d4a2f 100644
--- a/syntax/inittab.vim
+++ b/syntax/inittab.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/inittab.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('inittab', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'inittab') == -1
 
 " Vim syntax file
 " Language: SysV-compatible init process control file `inittab'
@@ -69,5 +64,3 @@ hi def link inittabShCommand Statement
 
 
 let b:current_syntax = "inittab"
-
-endif
diff --git a/syntax/ion.vim b/syntax/ion.vim
index f8269815e..0f1f82f16 100644
--- a/syntax/ion.vim
+++ b/syntax/ion.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ion.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ion', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ion') == -1
 
 if v:version < 600
   syntax clear
@@ -90,5 +85,3 @@ hi def link ionProcess PreProc
 hi def link ionComment Comment
 hi def link ionOperator Operator
 hi def link ionFlag Boolean
-
-endif
diff --git a/syntax/ipfilter.vim b/syntax/ipfilter.vim
index 342ea34d3..a5db250ae 100644
--- a/syntax/ipfilter.vim
+++ b/syntax/ipfilter.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ipfilter.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ipfilter', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ipfilter') == -1
 
 " ipfilter syntax file
 " Language: ipfilter configuration file
@@ -61,5 +56,3 @@ hi def link IPFNetmask	String
 hi def link IPFAny		Statement
 hi def link IPFProto	Identifier
 
-
-endif
diff --git a/syntax/iss.vim b/syntax/iss.vim
index 970ada338..a1051986e 100644
--- a/syntax/iss.vim
+++ b/syntax/iss.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/iss.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('iss', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'iss') == -1
 
 " Vim syntax file
 " Language:             Inno Setup File (iss file) and My InnoSetup extension
@@ -143,5 +138,3 @@ hi def link issTasksFlags		Keyword
 let b:current_syntax = "iss"
 
 " vim:ts=8
-
-endif
diff --git a/syntax/ist.vim b/syntax/ist.vim
index feb2206c0..f6a2da1fb 100644
--- a/syntax/ist.vim
+++ b/syntax/ist.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ist.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ist', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ist') == -1
 
 " Vim syntax file
 " Language:	Makeindex style file, *.ist
@@ -65,5 +60,3 @@ let b:current_syntax = "ist"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/j.vim b/syntax/j.vim
index e9937a080..79478af87 100644
--- a/syntax/j.vim
+++ b/syntax/j.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/j.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('j', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'j') == -1
 
 " Vim syntax file
 " Language:	J
@@ -153,5 +148,3 @@ let b:current_syntax = 'j'
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif
diff --git a/syntax/jal.vim b/syntax/jal.vim
index b34af2d15..26600dd35 100644
--- a/syntax/jal.vim
+++ b/syntax/jal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/jal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jal') == -1
 
 " Vim syntax file
 " Language:	JAL
@@ -243,5 +238,3 @@ hi def link picIdentifier		Identifier
 let b:current_syntax = "jal"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/jam.vim b/syntax/jam.vim
index 2fd817fec..94dd8ca1c 100644
--- a/syntax/jam.vim
+++ b/syntax/jam.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/jam.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jam', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jam') == -1
 
 " Vim syntax file
 " Language:	JAM
@@ -247,5 +242,3 @@ let b:current_syntax = "jam"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/java.vim b/syntax/java.vim
index c7648f212..5ca7e1056 100644
--- a/syntax/java.vim
+++ b/syntax/java.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/java.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('java', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'java') == -1
 
 " Vim syntax file
 " Language:	Java
@@ -362,5 +357,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/javacc.vim b/syntax/javacc.vim
index e5c04192d..2ffc3e93e 100644
--- a/syntax/javacc.vim
+++ b/syntax/javacc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/javacc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('javacc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javacc') == -1
 
 " Vim syntax file
 " Language:	JavaCC, a Java Compiler Compiler written by JavaSoft
@@ -72,5 +67,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 750ced5e1..65b351a97 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/javascript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 
 " Vim syntax file
 " Language:     JavaScript
@@ -400,5 +395,3 @@ let b:current_syntax = "javascript"
 if main_syntax == 'javascript'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/jess.vim b/syntax/jess.vim
index 34ec059ab..8897782a2 100644
--- a/syntax/jess.vim
+++ b/syntax/jess.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/jess.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jess', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jess') == -1
 
 " Vim syntax file
 " Language:	Jess
@@ -151,5 +146,3 @@ hi def link jessVar		Identifier
 let b:current_syntax = "jess"
 
 " vim: ts=18
-
-endif
diff --git a/syntax/jgraph.vim b/syntax/jgraph.vim
index 9fcf50b65..e27f40b59 100644
--- a/syntax/jgraph.vim
+++ b/syntax/jgraph.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/jgraph.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jgraph', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jgraph') == -1
 
 " Vim syntax file
 " Language:	jgraph (graph plotting utility)
@@ -52,5 +47,3 @@ hi def link jgraphNumber	Number
 
 
 let b:current_syntax = "jgraph"
-
-endif
diff --git a/syntax/jinja2.vim b/syntax/jinja2.vim
index bb8a93fcb..ccecd45c2 100644
--- a/syntax/jinja2.vim
+++ b/syntax/jinja2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/jinja2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 
 " Vim syntax file
 " Language: Jinja2 - with special modifications for compound-filetype
@@ -104,5 +99,3 @@ if !exists("did_jinja_syn_inits")
 endif
 
 let b:current_syntax = "jinja2"
-
-endif
diff --git a/syntax/jovial.vim b/syntax/jovial.vim
index fa07dd9c5..7b34dea08 100644
--- a/syntax/jovial.vim
+++ b/syntax/jovial.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/jovial.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jovial', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jovial') == -1
 
 " Vim syntax file
 " Language: JOVIAL J73
@@ -117,5 +112,3 @@ hi def link jovialTypedef Typedef
 let b:current_syntax = "jovial"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/jproperties.vim b/syntax/jproperties.vim
index bac79637e..1b28bc00a 100644
--- a/syntax/jproperties.vim
+++ b/syntax/jproperties.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/jproperties.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jproperties', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jproperties') == -1
 
 " Vim syntax file
 " Language:	Java Properties resource file (*.properties[_*])
@@ -142,5 +137,3 @@ hi def link jpropertiesError	Error
 let b:current_syntax = "jproperties"
 
 " vim:ts=8
-
-endif
diff --git a/syntax/jq.vim b/syntax/jq.vim
index 9cc0072f8..11ec862e9 100644
--- a/syntax/jq.vim
+++ b/syntax/jq.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/jq.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jq', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jq') == -1
 
 " Vim syntax file
 " Language:	jq
@@ -137,5 +132,3 @@ hi link jqConditional            Conditional
 "hi link jqInclude                Include
 "hi link jqDecorator              Define
 hi link jqNumber                 Number
-
-endif
diff --git a/syntax/json.vim b/syntax/json.vim
index fa2b446fc..e6395acab 100644
--- a/syntax/json.vim
+++ b/syntax/json.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/json.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('json', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json') == -1
 
 " Vim syntax file
 " Language:	JSON
@@ -146,5 +141,3 @@ endif
 "The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 "THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 "See https://twitter.com/elzr/status/294964017926119424
-
-endif
diff --git a/syntax/json5.vim b/syntax/json5.vim
index 73d7fb5c7..def6b7477 100644
--- a/syntax/json5.vim
+++ b/syntax/json5.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/json5.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('json5', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'json5') == -1
 
 " Modified from the original taken from https://github.com/gutenye/json5.vim
 
@@ -74,5 +69,3 @@ if !exists('b:current_syntax')
   let b:current_syntax = 'json5'
 endif
 
-
-endif
diff --git a/syntax/jsonnet.vim b/syntax/jsonnet.vim
index d8d60a13b..c2aa40cc3 100644
--- a/syntax/jsonnet.vim
+++ b/syntax/jsonnet.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/jsonnet.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jsonnet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsonnet') == -1
 
 " Copyright 2014 Google Inc. All rights reserved.
 "
@@ -141,5 +136,3 @@ syntax keyword Constant true false null
 syntax keyword Underlined error
 
 
-
-endif
diff --git a/syntax/jsp.vim b/syntax/jsp.vim
index cc51e14c9..49436c2f1 100644
--- a/syntax/jsp.vim
+++ b/syntax/jsp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/jsp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jsp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsp') == -1
 
 " Vim syntax file
 " Language:	JSP (Java Server Pages)
@@ -75,5 +70,3 @@ endif
 let b:current_syntax = "jsp"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/jst.vim b/syntax/jst.vim
index 9715066e9..ce4f1f0bd 100644
--- a/syntax/jst.vim
+++ b/syntax/jst.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/jst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('jst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jst') == -1
 
 if exists("b:current_syntax")
   finish
@@ -94,5 +89,3 @@ if exists("loaded_matchit")
 endif
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 86c43f514..0cbe23ec0 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/julia.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Vim syntax file
 " Language:	julia
@@ -502,5 +497,3 @@ hi def link juliaError			Error
 syntax sync fromstart
 
 let b:current_syntax = "julia"
-
-endif
diff --git a/syntax/juliadoc.vim b/syntax/juliadoc.vim
index 03eb59427..5e2a32e37 100644
--- a/syntax/juliadoc.vim
+++ b/syntax/juliadoc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/juliadoc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
 
 " Vim syntax file for julia document view
 scriptencoding utf-8
@@ -72,5 +67,3 @@ highlight default link juliadocAdmonitionsType Todo
 highlight default link juliadocAdmonitionsTitle Title
 
 let b:current_syntax = "juliadoc"
-
-endif
diff --git a/syntax/kconfig.vim b/syntax/kconfig.vim
index ad3b03a7f..9780aacd7 100644
--- a/syntax/kconfig.vim
+++ b/syntax/kconfig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/kconfig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('kconfig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kconfig') == -1
 
 " Vim syntax file
 " Maintainer:           Christian Brabandt <cb@256bit.org>
@@ -746,5 +741,3 @@ let b:current_syntax = "kconfig"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/kivy.vim b/syntax/kivy.vim
index 89ec78275..998f36928 100644
--- a/syntax/kivy.vim
+++ b/syntax/kivy.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/kivy.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('kivy', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kivy') == -1
 
 " Vim syntax file
 " Language:    Kivy
@@ -43,5 +38,3 @@ hi def link kivyAttribute Label
 let b:current_syntax = "kivy"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/kix.vim b/syntax/kix.vim
index 74428bfa0..182a3cb7f 100644
--- a/syntax/kix.vim
+++ b/syntax/kix.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/kix.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('kix', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kix') == -1
 
 " Vim syntax file
 " Language:	KixTart 95, Kix2001 Windows script language http://kixtart.org/
@@ -177,5 +172,3 @@ hi def link kixForEachOK		Conditional
 let b:current_syntax = "kix"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index c3475323c..268c97686 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/kotlin.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('kotlin', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kotlin') == -1
 
 " Vim syntax file
 " Language: Kotlin
@@ -145,5 +140,3 @@ hi def link ktExclExcl Special
 hi def link ktArrow Structure
 
 let b:current_syntax = 'kotlin'
-
-endif
diff --git a/syntax/kscript.vim b/syntax/kscript.vim
index 605142bc2..d460e1520 100644
--- a/syntax/kscript.vim
+++ b/syntax/kscript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/kscript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('kscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kscript') == -1
 
 " Vim syntax file
 " Language:	kscript
@@ -64,5 +59,3 @@ hi def link kscriptHardCoded		Statement
 let b:current_syntax = "kscript"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/kwt.vim b/syntax/kwt.vim
index 68aa9e91a..7e8951599 100644
--- a/syntax/kwt.vim
+++ b/syntax/kwt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/kwt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('kwt', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'kwt') == -1
 
 " Vim syntax file
 " Language:	kimwitu++
@@ -77,5 +72,3 @@ syn sync lines=300
 let b:current_syntax = "kwt"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/lace.vim b/syntax/lace.vim
index 2df0706df..87b35e6c7 100644
--- a/syntax/lace.vim
+++ b/syntax/lace.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lace.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lace', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lace') == -1
 
 " Vim syntax file
 " Language:		lace
@@ -129,5 +124,3 @@ hi def link laceTodo				Todo
 let b:current_syntax = "lace"
 
 " vim: ts=4
-
-endif
diff --git a/syntax/latte.vim b/syntax/latte.vim
index d2c16ae26..ee4e34cd8 100644
--- a/syntax/latte.vim
+++ b/syntax/latte.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/latte.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('latte', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latte') == -1
 
 " Vim syntax file
 " Language:	Latte
@@ -88,5 +83,3 @@ hi def link latteError			Error
 
 
 let b:current_syntax = "latte"
-
-endif
diff --git a/syntax/ld.vim b/syntax/ld.vim
index a4728d1b8..b52936916 100644
--- a/syntax/ld.vim
+++ b/syntax/ld.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ld.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ld', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ld') == -1
 
 " Vim syntax file
 " Language:             ld(1) script
@@ -88,5 +83,3 @@ let b:current_syntax = "ld"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/ldif.vim b/syntax/ldif.vim
index 6d6ef0a0f..c5177febf 100644
--- a/syntax/ldif.vim
+++ b/syntax/ldif.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ldif.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ldif', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ldif') == -1
 
 " Vim syntax file
 " Language:	LDAP LDIF
@@ -40,5 +35,3 @@ hi def link ldifComment		Comment
 
 
 let b:current_syntax = "ldif"
-
-endif
diff --git a/syntax/ledger.vim b/syntax/ledger.vim
index 2afccaad1..9f5230097 100644
--- a/syntax/ledger.vim
+++ b/syntax/ledger.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ledger.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ledger', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ledger') == -1
 
 " Vim syntax file
 " filetype: ledger
@@ -139,5 +134,3 @@ syn sync clear
 syn sync match ledgerSync grouphere ledgerTransaction "^[[:digit:]~=]"
  
 let b:current_syntax = b:is_hledger ? 'hledger' : 'ledger'
-
-endif
diff --git a/syntax/less.vim b/syntax/less.vim
index 27b556c0d..a7224eaa4 100644
--- a/syntax/less.vim
+++ b/syntax/less.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/less.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('less', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 
 " Vim syntax file
 " Language:	less
@@ -85,5 +80,3 @@ hi def link lessMedia                   cssMedia
 let b:current_syntax = "less"
 
 " vim:set sw=2:
-
-endif
diff --git a/syntax/lex.vim b/syntax/lex.vim
index 94e84d375..517dc247c 100644
--- a/syntax/lex.vim
+++ b/syntax/lex.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lex.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lex', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lex') == -1
 
 " Vim syntax file
 " Language:	Lex and Flex
@@ -195,5 +190,3 @@ endif
 let b:current_syntax = "lex"
 
 " vim:ts=8
-
-endif
diff --git a/syntax/lftp.vim b/syntax/lftp.vim
index 0845e2bbe..92711ff52 100644
--- a/syntax/lftp.vim
+++ b/syntax/lftp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lftp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lftp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lftp') == -1
 
 " Vim syntax file
 " Language:             lftp(1) configuration file
@@ -159,5 +154,3 @@ let b:current_syntax = "lftp"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/lhaskell.vim b/syntax/lhaskell.vim
index d40e915e1..19319c19b 100644
--- a/syntax/lhaskell.vim
+++ b/syntax/lhaskell.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lhaskell.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lhaskell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lhaskell') == -1
 
 " Vim syntax file
 " Language:		Haskell with literate comments, Bird style,
@@ -130,5 +125,3 @@ unlet s:oldcolumn
 let b:current_syntax = "lhaskell"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/libao.vim b/syntax/libao.vim
index 97896ee97..f41a9cf0e 100644
--- a/syntax/libao.vim
+++ b/syntax/libao.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/libao.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('libao', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'libao') == -1
 
 " Vim syntax file
 " Language:             libao.conf(5) configuration file
@@ -34,5 +29,3 @@ let b:current_syntax = "libao"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/lidris.vim b/syntax/lidris.vim
index b42197008..612b52e11 100644
--- a/syntax/lidris.vim
+++ b/syntax/lidris.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lidris.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 
 " Vim syntax file
 " Language:    Literate Idris
@@ -29,5 +24,3 @@ syntax match  lidrisBirdTrack "^>" contained
 hi def link   lidrisBirdTrack Comment
 
 let b:current_syntax = "lidris"
-
-endif
diff --git a/syntax/lidris2.vim b/syntax/lidris2.vim
index c78a09c8e..7b9b1a9c3 100644
--- a/syntax/lidris2.vim
+++ b/syntax/lidris2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lidris2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
 
 " Vim syntax file
 " Language:    Literate Idris 2
@@ -29,5 +24,3 @@ syntax match  lidrisBirdTrack "^>" contained
 hi def link   lidrisBirdTrack Comment
 
 let b:current_syntax = "lidris2"
-
-endif
diff --git a/syntax/lifelines.vim b/syntax/lifelines.vim
index 44eb0c6d8..f7f50e092 100644
--- a/syntax/lifelines.vim
+++ b/syntax/lifelines.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lifelines.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lifelines', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lifelines') == -1
 
 " Vim syntax file
 " Language:	LifeLines (v 3.0.62) <http://lifelines.sourceforge.net>
@@ -161,5 +156,3 @@ hi def link lifelinesDecl		PreProc
 let b:current_syntax = "lifelines"
 
 " vim: ts=8 sw=4
-
-endif
diff --git a/syntax/lilo.vim b/syntax/lilo.vim
index ac46d02ae..92d73e9db 100644
--- a/syntax/lilo.vim
+++ b/syntax/lilo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lilo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lilo', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilo') == -1
 
 " Vim syntax file
 " Language: lilo configuration (lilo.conf)
@@ -181,5 +176,3 @@ hi def link liloDisk               Preproc
 
 
 let b:current_syntax = "lilo"
-
-endif
diff --git a/syntax/lilypond-words.vim b/syntax/lilypond-words.vim
index b1ec97a08..292dac271 100644
--- a/syntax/lilypond-words.vim
+++ b/syntax/lilypond-words.vim
@@ -1,14 +1,7 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lilypond-words.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lilypond', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 
 syn match lilyKeyword "[-_^]\?\\\(xNotesOn\|xNotesOff\|xNote\|wordwrap-string-internal\|wordwrap-string\|wordwrap-lines\|wordwrap-internal\|wordwrap-field\|wordwrap\|withMusicProperty\|with-url\|with-link\|with-dimensions\|with-color\|with\|whiteout\|whiteTriangleMarkup\|walkerHeadsMinor\|walkerHeads\|vspace\|void\|voiceTwoStyle\|voiceTwo\|voiceThreeStyle\|voiceThree\|voiceOneStyle\|voiceOne\|voiceNeutralStyle\|voiceFourStyle\|voiceFour\|vocalName\|virgula\|virga\|verylongfermata\|versus\|version\|verbatim-file\|vcenter\|varcoda\|upright\|upprall\|upmordent\|upbow\|up\|unset\|unit\|unfoldRepeats\|undo\|underline\|unaCorda\|unHideNotes\|typewriter\|type\|tweak\|turn\|tupletUp\|tupletSpan\|tupletNeutral\|tupletDown\|tuplet\|trill\|triangle\|treCorde\|transposition\|transposedCueDuring\|transpose\|transparent\|translate-scaled\|translate\|topLevelAlignment\|tocTitleMarkup\|tocItemWithDotsMarkup\|tocItemMarkup\|tocItem\|tiny\|timing\|times\|timeSignatureSettings\|timeSignatureFraction\|time\|tied-lyric\|tieWaitForNote\|tieUp\|tieSolid\|tieNeutral\|tieHalfSolid\|tieHalfDashed\|tieDown\|tieDotted\|tieDashed\|tieDashPattern\|thumb\|textSpannerUp\|textSpannerNeutral\|textSpannerDown\|textLengthOn\|textLengthOff\|text\|tenuto\|temporary\|tempoWholesPerMinute\|tempo\|teeny\|tag\|table-of-contents\|tablatureFormat\|tabStaffLineLayoutFunction\|tabFullNotation\|systemStartDelimiter\|sustainOn\|sustainOff\|super\|subdivideBeams\|sub\|styledNoteHeads\|strut\|stropha\|strokeFingerOrientations\|stringTunings\|stringOneTopmost\|stringNumberOrientations\|stopped\|stopTrillSpan\|stopTextSpan\|stopStaff\|stopSlashedGraceMusic\|stopMeasureCount\|stopGroup\|stopGraceSlur\|stopGraceMusic\|stopAppoggiaturaMusic\|stopAcciaccaturaMusic\|stop\|stencil\|stemUp\|stemNeutral\|stemDown\|startTrillSpan\|startTextSpan\|startStaff\|startSlashedGraceMusic\|startRepeatType\|startMeasureCount\|startGroup\|startGraceSlur\|startGraceMusic\|startAppoggiaturaMusic\|startAcciaccaturaMusic\|start\|staccato\|staccatissimo\|squashedPosition\|spp\|spacingTweaks\|sp\|southernHarmonyHeadsMinor\|southernHarmonyHeads\|sostenutoOn\|sostenutoOff\|soloText\|soloIIText\|snappizzicato\|smaller\|smallCaps\|small\|slurUp\|slurSolid\|slurNeutral\|slurHalfSolid\|slurHalfDashed\|slurDown\|slurDotted\|slurDashed\|slurDashPattern\|slashedGrace\|slashed-digit\|slashChordSeparator\|skipTypesetting\|skip\|single\|simultaneous\|simple\|signumcongruentiae\|showStaffSwitch\|showSplitTiedTabNotes\|shortfermata\|shortVocalName\|shortInstrumentName\|shiftOnnn\|shiftOnn\|shiftOn\|shiftOff\|shiftDurations\|sharp\|shape\|sfz\|sfp\|sff\|sf\|settingsFrom\|setDefaultDurationToQuarter\|set\|sesquisharp\|sesquiflat\|sequential\|semisharp\|semiflat\|semicirculus\|semiGermanChords\|segno\|searchForVoice\|scriptDefinitions\|score\|scaleDurations\|scale\|sans\|sacredHarpHeadsMinor\|sacredHarpHeads\|rtoe\|rounded-box\|rotate\|roman\|rightHandFinger\|right-column\|right-brace\|right-align\|right\|rheel\|rfz\|revertTimeSignatureSettings\|revert\|reverseturn\|retrograde\|restrainOpenStrings\|rest-by-number\|rest\|responsum\|resetRelativeOctave\|replace\|repeatTie\|repeatCountVisibility\|repeat\|removeWithTag\|remove\|relative\|rehearsalMark\|raise\|quotedEventTypes\|quotedCueEventTypes\|quoteDuring\|quilisma\|put-adjacent\|pushToTag\|pt\|property-recursive\|printPartCombineTexts\|printKeyCancellation\|predefinedFretboardsOn\|predefinedFretboardsOff\|predefinedDiagramTable\|prallup\|prallprall\|prallmordent\|pralldown\|prall\|ppppp\|pppp\|ppp\|pp\|powerChords\|powerChordSymbol\|powerChordExceptions\|postscript\|portato\|pointAndClickTypes\|pointAndClickOn\|pointAndClickOff\|pitchedTrill\|phrygian\|phrasingSlurUp\|phrasingSlurSolid\|phrasingSlurNeutral\|phrasingSlurHalfSolid\|phrasingSlurHalfDashed\|phrasingSlurDown\|phrasingSlurDotted\|phrasingSlurDashed\|phrasingSlurDashPattern\|pes\|pedalUnaCordaStyle\|pedalUnaCordaStrings\|pedalSustainStyle\|pedalSustainStrings\|pedalSostenutoStyle\|pedalSostenutoStrings\|pattern\|path\|partialJazzMusic\|partialJazzExceptions\|partial\|partcombineUp\|partcombineUnisonoOnce\|partcombineUnisono\|partcombineSoloIOnce\|partcombineSoloIIOnce\|partcombineSoloII\|partcombineSoloI\|partcombineForce\|partcombineDown\|partcombineChordsOnce\|partcombineChords\|partcombineAutomaticOnce\|partcombineAutomatic\|partcombineApartOnce\|partcombineApart\|partcombine\|partCombineTextsOnNote\|partCombineListener\|parenthesize\|parallelMusic\|paper\|palmMuteOn\|palmMuteOff\|palmMute\|pageTurn\|pageBreak\|page-ref\|page-link\|pad-x\|pad-to-box\|pad-markup\|pad-around\|p\|overrideTimeSignatureSettings\|overrideProperty\|override-lines\|override\|oval\|ottava\|oriscus\|open\|oneVoice\|once\|on-the-fly\|omit\|offset\|octaveCheck\|numericTimeSignature\|number\|null\|notemode\|noteToFretFunction\|note-by-number\|note\|normalsize\|normal-text\|normal-size-super\|normal-size-sub\|noPageTurn\|noPageBreak\|noChordSymbol\|noBreak\|noBeam\|newSpacingSection\|new\|neumeDemoLayout\|natural\|name\|musicglyph\|musicMap\|mp\|mordent\|modalTranspose\|modalInversion\|mm\|mixolydian\|minorChordModifier\|minor\|midiInstrument\|midiChannelMapping\|midi\|middleCPosition\|middleCClefPosition\|mf\|metronomeMarkFormatter\|mergeDifferentlyHeadedOn\|mergeDifferentlyHeadedOff\|mergeDifferentlyDottedOn\|mergeDifferentlyDottedOff\|melismaEnd\|melismaBusyProperties\|melisma\|medium\|maxima\|markuplist\|markup\|markletter\|markalphabet\|markLengthOn\|markLengthOff\|markFormatter\|mark\|marcato\|map-markup-commands\|makeClusters\|majorSevenSymbol\|major\|maininput\|magnify\|lyricsto\|lyrics\|lyricmode\|lyricMelismaAlignment\|lydian\|ltoe\|lower\|lookup\|longfermata\|longa\|locrian\|localKeySignature\|lineprall\|linea\|line\|ligature\|lheel\|left-column\|left-brace\|left-align\|left\|layout\|larger\|large\|languageSaveAndChange\|languageRestore\|language\|laissezVibrer\|label\|killCues\|kievanOn\|kievanOff\|keyAlterationOrder\|key\|keepWithTag\|keepAliveInterfaces\|justify-string\|justify-field\|justify\|justified-lines\|italic\|italianChords\|ionian\|inversion\|interscoreline\|instrumentTransposition\|instrumentSwitch\|instrumentName\|instrumentEqualizer\|indent\|include\|inclinatum\|inStaffSegno\|in\|improvisationOn\|improvisationOff\|implicitTimeSignatureVisibility\|ij\|iij\|ignoreFiguredBassRest\|ignoreBarChecks\|ignatzekExceptions\|ignatzekExceptionMusic\|ictus\|huge\|hspace\|highStringOne\|hideStaffSwitch\|hideSplitTiedTabNotes\|hideNotes\|hide\|header\|hcenter-in\|hbracket\|harp-pedal\|harmonicsOn\|harmonicsOff\|harmonicNote\|harmonicByRatio\|harmonicByFret\|harmonicAccidentals\|harmonic\|handleNegativeFrets\|halign\|halfopen\|grobdescriptions\|graceSettings\|grace\|glissando\|germanChords\|general-align\|fz\|funkHeadsMinor\|funkHeads\|fullJazzExceptions\|fromproperty\|fret-diagram-verbose\|fret-diagram-terse\|fret-diagram\|frenchChords\|fraction\|fp\|footnote\|fontsize\|fontSize\|fontCaps\|flexa\|flat\|flageolet\|firstClef\|fingeringOrientations\|finger\|finalis\|filled-box\|fill-with-pattern\|fill-line\|figures\|figuremode\|figuredBassFormatter\|fffff\|ffff\|fff\|ff\|fermataMarkup\|fermata\|featherDurations\|f\|eyeglasses\|extraNatural\|explicitKeySignatureVisibility\|explicitCueClefVisibility\|explicitClefVisibility\|expandFullBarRests\|eventChords\|espressivo\|epsfile\|episemInitium\|episemFinis\|endincipit\|enddim\|enddecresc\|enddecr\|endcresc\|endcr\|endSpanners\|endRepeatType\|ellipse\|easyHeadsOn\|easyHeadsOff\|dynamicUp\|dynamicNeutral\|dynamicDown\|dynamicAbsoluteVolumeFunction\|dynamic\|drums\|drummode\|drumStyleTable\|drumPitchTable\|draw-line\|draw-hline\|draw-dotted-line\|draw-dashed-line\|draw-circle\|downprall\|downmordent\|downbow\|down\|doublesharp\|doubleflat\|doubleRepeatType\|dotsUp\|dotsNeutral\|dotsDown\|dorian\|divisioMinima\|divisioMaxima\|divisioMaior\|displayScheme\|displayMusic\|displayLilyMusic\|dir-column\|dimTextDim\|dimTextDecresc\|dimTextDecr\|dimHairpin\|dim\|description\|descendens\|deprecatedenddim\|deprecatedendcresc\|deprecateddim\|deprecatedcresc\|denies\|deminutum\|defineBarLine\|defaultchild\|defaultTimeSignature\|defaultNoteHeads\|defaultBarType\|default\|decrescendoSpanner\|decresc\|decr\|deadNotesOn\|deadNotesOff\|deadNote\|dashUnderscore\|dashPlus\|dashLarger\|dashHat\|dashDot\|dashDash\|dashBang\|cueDuringWithClef\|cueDuring\|cueClefUnset\|cueClefTranspositionFormatter\|cueClef\|crossStaff\|crescendoSpanner\|crescTextCresc\|crescHairpin\|cresc\|createSpacing\|cr\|context\|consists\|concat\|compressFullBarRests\|compoundMeter\|command-name\|combine\|column-lines\|column\|coda\|cm\|clefTranspositionFormatter\|clefTransposition\|clefPosition\|clefGlyph\|clef\|circulus\|circle\|chords\|chordmodifiers\|chordmode\|chordRootNamer\|chordPrefixSpacer\|chordNoteNamer\|chordNameSeparator\|chordNameLowercaseMinor\|chordNameFunction\|chordNameExceptionsPartial\|chordNameExceptionsFull\|chordNameExceptions\|char\|change\|center-column\|center-align\|center\|cavum\|caps\|caesura\|cadenzaOn\|cadenzaOff\|breve\|breathe\|breakDynamicSpan\|break\|bracket\|box\|bookpart\|bookOutputSuffix\|bookOutputName\|book\|bold\|blackTriangleMarkup\|bigger\|bendAfter\|beamHalfMeasure\|beam\|bassStaffProperties\|bassFigureStaffAlignmentUp\|bassFigureStaffAlignmentNeutral\|bassFigureStaffAlignmentDown\|bassFigureExtendersOn\|bassFigureExtendersOff\|barNumberVisibility\|barNumberFormatter\|barNumberCheck\|barCheckSynchronize\|barAlways\|bar\|balloonText\|balloonLengthOn\|balloonLengthOff\|balloonGrobText\|backslashed-digit\|automaticBars\|autochange\|autoCautionaries\|autoBeaming\|autoBeamOn\|autoBeamOff\|autoBeamCheck\|autoAccidentals\|auto-footnote\|augmentum\|auctum\|assertBeamSlope\|assertBeamQuant\|ascendens\|arrow-head\|arpeggioParenthesisDashed\|arpeggioParenthesis\|arpeggioNormal\|arpeggioBracket\|arpeggioArrowUp\|arpeggioArrowDown\|arpeggio\|appoggiatura\|applyOutput\|applyMusic\|applyContext\|appendToTag\|alternative\|alterBroken\|allowVoltaHook\|allowPageTurn\|alias\|aikenHeadsMinor\|aikenHeads\|afterGraceFraction\|afterGrace\|aeolian\|addlyrics\|additionalPitchPrefix\|addQuote\|addInstrumentDefinition\|accidentalStyle\|acciaccatura\|accepts\|accentus\|accent\|absolute\|abs-fontsize\|aDueText\|RemoveEmptyTabStaffContext\|RemoveEmptyStaffContext\|RemoveEmptyRhythmicStaffContext\|RemoveEmptyDrumStaffContext\|IJ\|IIJ\|C\|B\|AncientRemoveEmptyStaffContext\|A\|n\)\(\A\|\n\)"me=e-1
 syn match lilyReservedWord "\(\A\|\n\)\(warnings\|staff\|spacing\|signature\|shift\|routine\|notes\|handler\|corrected\|beams\|arpeggios\|Volta_engraver\|Voice\|Vertical_align_engraver\|Vaticana_ligature_engraver\|VaticanaVoice\|VaticanaStaff\|Tweak_engraver\|Tuplet_engraver\|Trill_spanner_engraver\|Timing_translator\|Time_signature_performer\|Time_signature_engraver\|Tie_performer\|Tie_engraver\|Text_spanner_engraver\|Text_engraver\|Tempo_performer\|Tab_tie_follow_engraver\|Tab_staff_symbol_engraver\|Tab_note_heads_engraver\|TabVoice\|TabStaff\|System_start_delimiter_engraver\|Stem_engraver\|Stanza_number_engraver\|Stanza_number_align_engraver\|Staff_symbol_engraver\|Staff_performer\|Staff_collecting_engraver\|StaffGroup\|Staff\|Spanner_break_forbid_engraver\|Span_bar_stub_engraver\|Span_bar_engraver\|Span_arpeggio_engraver\|Spacing_engraver\|Slur_performer\|Slur_engraver\|Slash_repeat_engraver\|Separating_line_group_engraver\|Script_row_engraver\|Script_engraver\|Script_column_engraver\|Score\|Rhythmic_column_engraver\|RhythmicStaff\|Rest_engraver\|Rest_collision_engraver\|Repeat_tie_engraver\|Repeat_acknowledge_engraver\|Pure_from_neighbor_engraver\|Pitched_trill_engraver\|Pitch_squash_engraver\|Piano_pedal_performer\|Piano_pedal_engraver\|Piano_pedal_align_engraver\|PianoStaff\|Phrasing_slur_engraver\|PetrucciVoice\|PetrucciStaff\|Percent_repeat_engraver\|Part_combine_engraver\|Parenthesis_engraver\|Paper_column_engraver\|Output_property_engraver\|Ottava_spanner_engraver\|NullVoice\|Note_spacing_engraver\|Note_performer\|Note_name_engraver\|Note_heads_engraver\|Note_head_line_engraver\|NoteNames\|New_fingering_engraver\|Multi_measure_rest_engraver\|Midi_control_function_performer\|Metronome_mark_engraver\|Mensural_ligature_engraver\|MensuralVoice\|MensuralStaff\|Mark_engraver\|Lyrics\|Lyric_performer\|Lyric_engraver\|Ligature_bracket_engraver\|Ledger_line_engraver\|Laissez_vibrer_engraver\|Kievan_ligature_engraver\|KievanVoice\|KievanStaff\|Key_performer\|Key_engraver\|Keep_alive_together_engraver\|Instrument_switch_engraver\|Instrument_name_engraver\|Hyphen_engraver\|Grob_pq_engraver\|GregorianTranscriptionVoice\|GregorianTranscriptionStaff\|GrandStaff\|Grace_spacing_engraver\|Grace_engraver\|Grace_beam_engraver\|Grace_auto_beam_engraver\|Global\|Glissando_engraver\|Fretboard_engraver\|FretBoards\|Forbid_line_break_engraver\|Footnote_engraver\|Font_size_engraver\|Fingering_engraver\|Fingering_column_engraver\|Figured_bass_position_engraver\|Figured_bass_engraver\|FiguredBass\|Extender_engraver\|Episema_engraver\|Dynamics\|Dynamic_performer\|Dynamic_engraver\|Dynamic_align_engraver\|Drum_notes_engraver\|Drum_note_performer\|DrumVoice\|DrumStaff\|Double_percent_repeat_engraver\|Dots_engraver\|Dot_column_engraver\|Devnull\|Default_bar_line_engraver\|Custos_engraver\|Cue_clef_engraver\|CueVoice\|Control_track_performer\|Concurrent_hairpin_engraver\|Collision_engraver\|Cluster_spanner_engraver\|Clef_engraver\|Chord_tremolo_engraver\|Chord_name_engraver\|ChordNames\|ChordNameVoice\|ChoirStaff\|Breathing_sign_engraver\|Break_align_engraver\|Bend_engraver\|Beam_performer\|Beam_engraver\|Beam_collision_engraver\|Bar_number_engraver\|Bar_engraver\|Axis_group_engraver\|Auto_beam_engraver\|Arpeggio_engraver\|Accidental_engraver\|Score\)\(\A\|\n\)"ms=s+1,me=e-1
 syn match lilyNote "\<\(\(\(solx\|soltcs\|soltcb\|solstqt\|solss\|solsqt\|solsd\|solsb\|sols\|solkk\|solk\|soldsd\|soldd\|sold\|solcs\|solcb\|solbtqt\|solbsb\|solbqt\|solbb\|solb\|sol\|six\|sitcs\|sitcb\|sistqt\|siss\|sisqt\|sisd\|sisb\|sis\|sikk\|sik\|sidsd\|sidd\|sid\|sics\|sicb\|sibtqt\|sibsb\|sibqt\|sibb\|sib\|si\|rex\|retcs\|retcb\|restqt\|ress\|resqt\|resd\|resb\|res\|rekk\|rek\|redsd\|redd\|red\|recs\|recb\|rebtqt\|rebsb\|rebqt\|rebb\|reb\|re\|mix\|mitcs\|mitcb\|mistqt\|miss\|misqt\|misd\|misb\|mis\|mikk\|mik\|midsd\|midd\|mid\|mics\|micb\|mibtqt\|mibsb\|mibqt\|mibb\|mib\|mi\|lax\|latcs\|latcb\|lastqt\|lass\|lasqt\|lasd\|lasb\|las\|lakk\|lak\|ladsd\|ladd\|lad\|lacs\|lacb\|labtqt\|labsb\|labqt\|labb\|lab\|la\|hississ\|hiss\|hisis\|hisih\|his\|hih\|hessess\|heses\|heseh\|h\|gx\|gtqs\|gtqf\|gss\|gsharpsharp\|gsharp\|gs\|gqs\|gqf\|gississ\|giss\|gisis\|gisih\|gis\|gih\|gflatflat\|gflat\|gff\|gf\|gessess\|gess\|geses\|geseh\|ges\|geh\|g\|fx\|ftqs\|ftqf\|fss\|fsharpsharp\|fsharp\|fs\|fqs\|fqf\|fississ\|fiss\|fisis\|fisih\|fis\|fih\|fflatflat\|fflat\|fff\|ff\|fessess\|fess\|feses\|feseh\|fes\|feh\|fax\|fatcs\|fatcb\|fastqt\|fass\|fasqt\|fasd\|fasb\|fas\|fakk\|fak\|fadsd\|fadd\|fad\|facs\|facb\|fabtqt\|fabsb\|fabqt\|fabb\|fab\|fa\|f\|ex\|etqs\|etqf\|essess\|ess\|esharpsharp\|esharp\|eses\|eseh\|es\|eqs\|eqf\|eississ\|eiss\|eisis\|eisih\|eis\|eih\|eflatflat\|eflat\|eff\|ef\|eessess\|eess\|eeses\|eeseh\|ees\|eeh\|e\|dx\|dtqs\|dtqf\|dss\|dsharpsharp\|dsharp\|ds\|dqs\|dqf\|dox\|dotcs\|dotcb\|dostqt\|doss\|dosqt\|dosd\|dosb\|dos\|dokk\|dok\|dodsd\|dodd\|dod\|docs\|docb\|dobtqt\|dobsb\|dobqt\|dobb\|dob\|do\|dississ\|diss\|disis\|disih\|dis\|dih\|dflatflat\|dflat\|dff\|df\|dessess\|dess\|deses\|deseh\|des\|deh\|d\|cx\|ctqs\|ctqf\|css\|csharpsharp\|csharp\|cs\|cqs\|cqf\|cississ\|ciss\|cisis\|cisih\|cis\|cih\|cflatflat\|cflat\|cff\|cf\|cessess\|cess\|ceses\|ceseh\|ces\|ceh\|c\|bx\|btqs\|btqf\|bss\|bsharpsharp\|bsharp\|bs\|bqs\|bqf\|bisis\|bisih\|bis\|bih\|bflatflat\|bflat\|bff\|bf\|bess\|beses\|beseh\|bes\|beh\|bb\|b\|ax\|atqs\|atqf\|assess\|ass\|asharpsharp\|asharp\|ases\|aseh\|asas\|asah\|as\|aqs\|aqf\|aississ\|aiss\|aisis\|aisih\|ais\|aih\|aflatflat\|aflat\|aff\|af\|aessess\|aess\|aeses\|aeseh\|aes\|aeh\|a\|a\)\([,']\)\{,4}\([?!]\)\?\)\|s\|r\|R\|q\)\(\(128\|64\|32\|16\|8\|4\|2\|1\|\\breve\|\\longa\|\\maxima\)[.]\{,8}\)\?\(\A\|\n\)"me=e-1
-
-endif
diff --git a/syntax/lilypond.vim b/syntax/lilypond.vim
index 04a0f0e6a..b0792abf6 100644
--- a/syntax/lilypond.vim
+++ b/syntax/lilypond.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lilypond.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lilypond', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 
 " LilyPond syntax file
 " Language:	LilyPond
@@ -94,5 +89,3 @@ if version >= 508 || !exists("did_lily_syn_inits")
 endif
 
 let b:current_syntax = "lilypond"
-
-endif
diff --git a/syntax/limits.vim b/syntax/limits.vim
index 4ffd72aa8..b1057fb78 100644
--- a/syntax/limits.vim
+++ b/syntax/limits.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/limits.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('limits', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'limits') == -1
 
 " Vim syntax file
 " Language:             limits(5) configuration file
@@ -51,5 +46,3 @@ let b:current_syntax = "limits"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/liquid.vim b/syntax/liquid.vim
index 867e4a791..ad738fb56 100644
--- a/syntax/liquid.vim
+++ b/syntax/liquid.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/liquid.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('liquid', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'liquid') == -1
 
 " Vim syntax file
 " Language:     Liquid
@@ -145,5 +140,3 @@ let b:current_syntax = 'liquid'
 if exists('main_syntax') && main_syntax == 'liquid'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/lisp.vim b/syntax/lisp.vim
index b4ecb4398..501bd6551 100644
--- a/syntax/lisp.vim
+++ b/syntax/lisp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lisp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lisp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lisp') == -1
 
 " Vim syntax file
 " Language:    Lisp
@@ -627,5 +622,3 @@ let b:current_syntax = "lisp"
 
 " ---------------------------------------------------------------------
 " vim: ts=8 nowrap fdm=marker
-
-endif
diff --git a/syntax/litcoffee.vim b/syntax/litcoffee.vim
index f29cf5266..6ddfce8ad 100644
--- a/syntax/litcoffee.vim
+++ b/syntax/litcoffee.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/litcoffee.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 
 " Language:   Literate CoffeeScript
 " Maintainer: Michael Smith <michael@diglumi.com>
@@ -30,5 +25,3 @@ syn region inlineCoffee start='^    \|\t' end='$' contains=@coffee
 highlight default link notCoffee Comment
 
 let b:current_syntax = "litcoffee"
-
-endif
diff --git a/syntax/lite.vim b/syntax/lite.vim
index 5e43d1d79..73664c67f 100644
--- a/syntax/lite.vim
+++ b/syntax/lite.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lite.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lite', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lite') == -1
 
 " Vim syntax file
 " Language:	lite
@@ -175,5 +170,3 @@ if main_syntax == 'lite'
 endif
 
 " vim: ts=8
-
-endif
diff --git a/syntax/litestep.vim b/syntax/litestep.vim
index 72007dfb2..eedf27305 100644
--- a/syntax/litestep.vim
+++ b/syntax/litestep.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/litestep.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('litestep', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'litestep') == -1
 
 " Vim syntax file
 " Language:             LiteStep RC file
@@ -276,5 +271,3 @@ let b:current_syntax = "litestep"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/llvm.vim b/syntax/llvm.vim
index 8df887080..d98c255de 100644
--- a/syntax/llvm.vim
+++ b/syntax/llvm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/llvm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 
 " Vim syntax file
 " Language:   llvm
@@ -243,5 +238,3 @@ if version >= 508 || !exists("did_c_syn_inits")
 endif
 
 let b:current_syntax = "llvm"
-
-endif
diff --git a/syntax/log.vim b/syntax/log.vim
index 9f025f6d2..8c5b5ec25 100644
--- a/syntax/log.vim
+++ b/syntax/log.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/log.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('log', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'log') == -1
 
 " Vim syntax file
 " Language:         Generic log file
@@ -168,5 +163,3 @@ let b:current_syntax = 'log'
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
 
-
-endif
diff --git a/syntax/loginaccess.vim b/syntax/loginaccess.vim
index 3588ed959..6dc8d6a9d 100644
--- a/syntax/loginaccess.vim
+++ b/syntax/loginaccess.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/loginaccess.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('loginaccess', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'loginaccess') == -1
 
 " Vim syntax file
 " Language:             login.access(5) configuration file
@@ -103,5 +98,3 @@ let b:current_syntax = "loginaccess"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/logindefs.vim b/syntax/logindefs.vim
index 7b3fd00ba..9773f12d1 100644
--- a/syntax/logindefs.vim
+++ b/syntax/logindefs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/logindefs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('logindefs', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logindefs') == -1
 
 " Vim syntax file
 " Language:             login.defs(5) configuration file
@@ -181,5 +176,3 @@ let b:current_syntax = "logindefs"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/logtalk.vim b/syntax/logtalk.vim
index e875c2d92..48c6621ab 100644
--- a/syntax/logtalk.vim
+++ b/syntax/logtalk.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/logtalk.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('logtalk', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'logtalk') == -1
 
 " Vim syntax file
 "
@@ -461,5 +456,3 @@ let b:current_syntax = "logtalk"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/lotos.vim b/syntax/lotos.vim
index fdd82b869..e66f14428 100644
--- a/syntax/lotos.vim
+++ b/syntax/lotos.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lotos.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lotos', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lotos') == -1
 
 " Vim syntax file
 " Language:	LOTOS (Language Of Temporal Ordering Specifications, IS8807)
@@ -76,5 +71,3 @@ hi def link lotosDelimiter		String
 let b:current_syntax = "lotos"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/lout.vim b/syntax/lout.vim
index b2ab49e58..9d7c28a91 100644
--- a/syntax/lout.vim
+++ b/syntax/lout.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lout.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lout', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lout') == -1
 
 " Vim syntax file
 " Language:    Lout
@@ -142,5 +137,3 @@ let &cpo=s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=8:sw=4:nocindent:smartindent:
-
-endif
diff --git a/syntax/lpc.vim b/syntax/lpc.vim
index e83fd6d2b..de5bc3c74 100644
--- a/syntax/lpc.vim
+++ b/syntax/lpc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lpc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lpc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lpc') == -1
 
 " Vim syntax file
 " Language:	LPC
@@ -454,5 +449,3 @@ unlet s:cpo_save
 
 " vim:ts=8:nosta:sw=2:ai:si:
 " vim600:set fdm=marker: }}}1
-
-endif
diff --git a/syntax/lprolog.vim b/syntax/lprolog.vim
index f3a9e06e8..c8454ca6a 100644
--- a/syntax/lprolog.vim
+++ b/syntax/lprolog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lprolog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lprolog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lprolog') == -1
 
 " Vim syntax file
 " Language:     LambdaProlog (Teyjus)
@@ -131,5 +126,3 @@ hi def link lprologClause	    Type
 let b:current_syntax = "lprolog"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/ls.vim b/syntax/ls.vim
index 48d37a806..770554512 100644
--- a/syntax/ls.vim
+++ b/syntax/ls.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ls.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('livescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 
 " Language:    LiveScript "
 " Maintainer:  George Zahariev
@@ -143,5 +138,3 @@ highlight default link lsSpaceError Error
 if !exists('b:current_syntax')
   let b:current_syntax = 'livescript'
 endif
-
-endif
diff --git a/syntax/lsl.vim b/syntax/lsl.vim
index f624d2a58..bede1c1e4 100644
--- a/syntax/lsl.vim
+++ b/syntax/lsl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lsl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lsl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lsl') == -1
 
 " Vim syntax file
 " Language:	Linden Scripting Language
@@ -284,5 +279,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim: ts=8
-
-endif
diff --git a/syntax/lss.vim b/syntax/lss.vim
index 4384acdf3..ce3a8c8eb 100644
--- a/syntax/lss.vim
+++ b/syntax/lss.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lss.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lss', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lss') == -1
 
 " Vim syntax file
 " Language:	Lynx 2.7.1 style file
@@ -130,5 +125,3 @@ hi def lssWhiteBg		ctermbg=white ctermfg=black
 let b:current_syntax = "lss"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/lua.vim b/syntax/lua.vim
index 29d78de82..a88cda514 100644
--- a/syntax/lua.vim
+++ b/syntax/lua.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lua.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lua', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lua') == -1
 
 " Vim syntax file
 " Language: Lua
@@ -268,5 +263,3 @@ let b:current_syntax = "lua"
 if main_syntax == 'lua'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/lynx.vim b/syntax/lynx.vim
index fca7cc16c..3f8193193 100644
--- a/syntax/lynx.vim
+++ b/syntax/lynx.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/lynx.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('lynx', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lynx') == -1
 
 " Vim syntax file
 " Language:	Lynx configuration file (lynx.cfg)
@@ -147,5 +142,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8 fdm=marker:
-
-endif
diff --git a/syntax/m4.vim b/syntax/m4.vim
index 04ff28cdd..9c872bb26 100644
--- a/syntax/m4.vim
+++ b/syntax/m4.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/m4.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('m4', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'm4') == -1
 
 " Vim syntax file
 " Language:		M4
@@ -67,5 +62,3 @@ if main_syntax == 'm4'
 endif
 
 " vim: ts=4
-
-endif
diff --git a/syntax/mail.vim b/syntax/mail.vim
index ed88f97fc..ff2bb7977 100644
--- a/syntax/mail.vim
+++ b/syntax/mail.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mail.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mail', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mail') == -1
 
 " Vim syntax file
 " Language:		Mail file
@@ -119,5 +114,3 @@ let b:current_syntax = "mail"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/mailaliases.vim b/syntax/mailaliases.vim
index 6d2e9591c..337eaceaa 100644
--- a/syntax/mailaliases.vim
+++ b/syntax/mailaliases.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mailaliases.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mailaliases', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mailaliases') == -1
 
 " Vim syntax file
 " Language:             aliases(5) local alias database file
@@ -78,5 +73,3 @@ let b:current_syntax = "mailaliases"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/mailcap.vim b/syntax/mailcap.vim
index 0fa3da7c2..1af4e0b99 100644
--- a/syntax/mailcap.vim
+++ b/syntax/mailcap.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mailcap.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mailcap', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mailcap') == -1
 
 " Vim syntax file
 " Language:	Mailcap configuration file
@@ -42,5 +37,3 @@ hi def link mailcapString	String
 let b:current_syntax = "mailcap"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/make.vim b/syntax/make.vim
index 3dc624586..b1e882741 100644
--- a/syntax/make.vim
+++ b/syntax/make.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/make.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('make', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'make') == -1
 
 " Vim syntax file
 " Language:	Makefile
@@ -151,5 +146,3 @@ let b:current_syntax = "make"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/mako.vim b/syntax/mako.vim
index aeaf4783e..f1c75b872 100644
--- a/syntax/mako.vim
+++ b/syntax/mako.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mako.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mako', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mako') == -1
 
 " Vim syntax file
 " Language:     Mako
@@ -110,5 +105,3 @@ if version >= 508 || !exists("did_mako_syn_inits")
 endif
 
 let b:current_syntax = b:mako_outer_lang
-
-endif
diff --git a/syntax/mallard.vim b/syntax/mallard.vim
index f6d5664b6..bb4a789ea 100644
--- a/syntax/mallard.vim
+++ b/syntax/mallard.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mallard.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mallard', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mallard') == -1
 
 " Vim syntax file
 " Language:    Mallard
@@ -44,5 +39,3 @@ hi def link mallardTitle    Title
 hi def mallardEmphasis term=italic cterm=italic gui=italic
 
 let b:current_syntax = "mallard"
-
-endif
diff --git a/syntax/manconf.vim b/syntax/manconf.vim
index 09da2b349..d578fa6ad 100644
--- a/syntax/manconf.vim
+++ b/syntax/manconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/manconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('manconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'manconf') == -1
 
 " Vim syntax file
 " Language:             man.conf(5) - man configuration file
@@ -124,5 +119,3 @@ let b:current_syntax = "manconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/maple.vim b/syntax/maple.vim
index 2042ab045..5d72a609a 100644
--- a/syntax/maple.vim
+++ b/syntax/maple.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/maple.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('maple', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'maple') == -1
 
 " Vim syntax file
 " Language:	Maple V (based on release 4)
@@ -629,5 +624,3 @@ endif
 " Current Syntax: {{{1
 let b:current_syntax = "maple"
 " vim: ts=20 fdm=marker
-
-endif
diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index 0cb4fa08e..de27f7ab0 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/markdown.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('markdown', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
 
 " Vim syntax file
 " Language:	Markdown
@@ -191,5 +186,3 @@ let b:current_syntax = "mkd"
 
 delcommand HtmlHiLink
 " vim: ts=8
-
-endif
diff --git a/syntax/mason.vim b/syntax/mason.vim
index 11b39c5d9..8af033aca 100644
--- a/syntax/mason.vim
+++ b/syntax/mason.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mason.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim syntax file
 " Language:     Mason (Perl embedded in HTML)
@@ -90,5 +85,3 @@ let b:current_syntax = "mason"
 if main_syntax == 'mason'
 	unlet main_syntax
 endif
-
-endif
diff --git a/syntax/master.vim b/syntax/master.vim
index bd2a48a4b..304c45a76 100644
--- a/syntax/master.vim
+++ b/syntax/master.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/master.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('master', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'master') == -1
 
 " Vim syntax file
 " Language:	Focus Master File
@@ -44,5 +39,3 @@ hi def link masterString  String
 let b:current_syntax = "master"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/mel.vim b/syntax/mel.vim
index bfbcbdbc9..88d2bd6ca 100644
--- a/syntax/mel.vim
+++ b/syntax/mel.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mel.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mel', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mel') == -1
 
 " Vim syntax file
 " Language:	MEL (Maya Extension Language)
@@ -115,5 +110,3 @@ hi def link melCommentError melError
 
 
 let b:current_syntax = "mel"
-
-endif
diff --git a/syntax/merlin.vim b/syntax/merlin.vim
index 8d6df186d..995947046 100644
--- a/syntax/merlin.vim
+++ b/syntax/merlin.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/merlin.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('reason', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
 
 " Vim syntax file for editing merlin project files
 if exists("b:current_syntax")
@@ -20,5 +15,3 @@ hi link merlinComment Comment
 
 let b:current_syntax = "merlin"
 
-
-endif
diff --git a/syntax/meson.vim b/syntax/meson.vim
index 593bc1b65..9f3e2a421 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/meson.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('meson', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1
 
 " Vim syntax file
 " Language:	Meson
@@ -174,5 +169,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 noet:
-
-endif
diff --git a/syntax/messages.vim b/syntax/messages.vim
index e5fb68468..3a9f060cb 100644
--- a/syntax/messages.vim
+++ b/syntax/messages.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/messages.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('messages', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'messages') == -1
 
 " Vim syntax file
 " Language:         /var/log/messages file
@@ -80,5 +75,3 @@ let b:current_syntax = "messages"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/mf.vim b/syntax/mf.vim
index 120f502c0..879605568 100644
--- a/syntax/mf.vim
+++ b/syntax/mf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mf') == -1
 
 " Vim syntax file
 " Language:           METAFONT
@@ -302,5 +297,3 @@ hi def link mfTodoComment  Todo
 let b:current_syntax = "mf"
 
 " vim:sw=2
-
-endif
diff --git a/syntax/mgl.vim b/syntax/mgl.vim
index dc82b6903..21eb16c67 100644
--- a/syntax/mgl.vim
+++ b/syntax/mgl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mgl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mgl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mgl') == -1
 
 " Vim syntax file
 " Language:	MGL
@@ -124,5 +119,3 @@ hi def link mglType		Type
 let b:current_syntax = "mgl"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/mgp.vim b/syntax/mgp.vim
index 146370bbf..dbcc965c3 100644
--- a/syntax/mgp.vim
+++ b/syntax/mgp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mgp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mgp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mgp') == -1
 
 " Vim syntax file
 " Language:     mgp - MaGic Point
@@ -76,5 +71,3 @@ hi def link mgpDefine	Define
 
 
 let b:current_syntax = "mgp"
-
-endif
diff --git a/syntax/mib.vim b/syntax/mib.vim
index 2427a6ff5..67ca47bf9 100644
--- a/syntax/mib.vim
+++ b/syntax/mib.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mib.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mib', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mib') == -1
 
 " Vim syntax file
 " Language:        Vim syntax file for SNMPv1 and SNMPv2 MIB and SMI files
@@ -64,5 +59,3 @@ hi def link mibEpilogue	     SpecialChar
 hi def link mibValue         Structure
 
 let b:current_syntax = "mib"
-
-endif
diff --git a/syntax/mix.vim b/syntax/mix.vim
index df9b09516..1b14d6a54 100644
--- a/syntax/mix.vim
+++ b/syntax/mix.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mix.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mix', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mix') == -1
 
 " Vim syntax file
 " Language:	MIX (Donald Knuth's assembly language used in TAOCP)
@@ -91,5 +86,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/mma.vim b/syntax/mma.vim
index e51133c5d..c9c0f6ee4 100644
--- a/syntax/mma.vim
+++ b/syntax/mma.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mma.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mathematica', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
 
 "Vim syntax file
 " Language: Mathematica
@@ -1366,5 +1361,3 @@ let b:current_syntax = "mma"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/mmp.vim b/syntax/mmp.vim
index d0d827467..55e946e4e 100644
--- a/syntax/mmp.vim
+++ b/syntax/mmp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mmp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mmp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mmp') == -1
 
 " Vim syntax file
 " Language:	Symbian meta-makefile definition (MMP)
@@ -56,5 +51,3 @@ endif
 let b:current_syntax = "mmp"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/modconf.vim b/syntax/modconf.vim
index d94e9e11e..dcf1ffa73 100644
--- a/syntax/modconf.vim
+++ b/syntax/modconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/modconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('modconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'modconf') == -1
 
 " Vim syntax file
 " Language:             modules.conf(5) configuration file
@@ -51,5 +46,3 @@ let b:current_syntax = "modconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/modula2.vim b/syntax/modula2.vim
index 1d14c554a..9a6d3d72c 100644
--- a/syntax/modula2.vim
+++ b/syntax/modula2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/modula2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('modula2', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'modula2') == -1
 
 " Vim syntax file
 " Language:	Modula 2
@@ -80,5 +75,3 @@ hi def link modula2Set		String
 let b:current_syntax = "modula2"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/modula3.vim b/syntax/modula3.vim
index 0b64b9aa8..d27fb0e27 100644
--- a/syntax/modula3.vim
+++ b/syntax/modula3.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/modula3.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('modula3', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'modula3') == -1
 
 " Vim syntax file
 " Language:	Modula-3
@@ -66,5 +61,3 @@ let b:current_syntax = "modula3"
 "I prefer to use this...
 "set ai
 "vim: ts=8
-
-endif
diff --git a/syntax/monk.vim b/syntax/monk.vim
index 8f9438991..ebea4a3d3 100644
--- a/syntax/monk.vim
+++ b/syntax/monk.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/monk.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('monk', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'monk') == -1
 
 " Vim syntax file
 " Language: Monk (See-Beyond Technologies)
@@ -224,5 +219,3 @@ let b:current_syntax = "monk"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/moo.vim b/syntax/moo.vim
index e36c587ea..20461bf25 100644
--- a/syntax/moo.vim
+++ b/syntax/moo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/moo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('moo', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moo') == -1
 
 " Vim syntax file
 " Language:	MOO
@@ -180,5 +175,3 @@ hi def link mooNonCode PreProc
 let b:current_syntax = "moo"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/moon.vim b/syntax/moon.vim
index dba1188dc..d75034824 100644
--- a/syntax/moon.vim
+++ b/syntax/moon.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/moon.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('moonscript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'moonscript') == -1
 
 " Language:    MoonScript
 " Maintainer:  leafo <leafot@gmail.com>
@@ -324,5 +319,3 @@ syn cluster moonAll contains=moonStatement,moonRepeat,moonConditional,
 if !exists('b:current_syntax')
   let b:current_syntax = 'moon'
 endif
-
-endif
diff --git a/syntax/mp.vim b/syntax/mp.vim
index 92e57fb30..95564a11e 100644
--- a/syntax/mp.vim
+++ b/syntax/mp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mp') == -1
 
 " Vim syntax file
 " Language:           MetaPost
@@ -776,5 +771,3 @@ let &cpo = s:cpo_sav
 unlet! s:cpo_sav
 
 " vim:sw=2
-
-endif
diff --git a/syntax/mplayerconf.vim b/syntax/mplayerconf.vim
index dc50e1f47..6d8ca035c 100644
--- a/syntax/mplayerconf.vim
+++ b/syntax/mplayerconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mplayerconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mplayerconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mplayerconf') == -1
 
 " Vim syntax file
 " Language:             mplayer(1) configuration file
@@ -135,5 +130,3 @@ let b:current_syntax = "mplayerconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/mrxvtrc.vim b/syntax/mrxvtrc.vim
index c7fbdc96d..61d773ae6 100644
--- a/syntax/mrxvtrc.vim
+++ b/syntax/mrxvtrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mrxvtrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mrxvtrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mrxvtrc') == -1
 
 " Description	: Vim syntax file for mrxvtrc (for mrxvt-0.5.0 and up)
 " Created	: Wed 26 Apr 2006 01:20:53 AM CDT
@@ -289,5 +284,3 @@ let b:current_syntax = "mrxvtrc"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/msidl.vim b/syntax/msidl.vim
index 2f779e261..1734105e3 100644
--- a/syntax/msidl.vim
+++ b/syntax/msidl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/msidl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('msidl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'msidl') == -1
 
 " Vim syntax file
 " Language:     MS IDL (Microsoft dialect of Interface Description Language)
@@ -91,5 +86,3 @@ let b:current_syntax = "msidl"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vi: set ts=8 sw=4:
-
-endif
diff --git a/syntax/msql.vim b/syntax/msql.vim
index aef3a3fdf..b8f058e5b 100644
--- a/syntax/msql.vim
+++ b/syntax/msql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/msql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('msql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'msql') == -1
 
 " Vim syntax file
 " Language:	msql
@@ -90,5 +85,3 @@ if main_syntax == 'msql'
 endif
 
 " vim: ts=8
-
-endif
diff --git a/syntax/mupad.vim b/syntax/mupad.vim
index deafcb309..924d0806d 100644
--- a/syntax/mupad.vim
+++ b/syntax/mupad.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mupad.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mupad', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mupad') == -1
 
 " Vim syntax file
 " Language:    MuPAD source
@@ -290,5 +285,3 @@ hi def link mupadIdentifier	Identifier
 
 
 " TODO  More comprehensive listing.
-
-endif
diff --git a/syntax/murphi.vim b/syntax/murphi.vim
index 04e6faba4..ab38abf46 100644
--- a/syntax/murphi.vim
+++ b/syntax/murphi.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/murphi.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('murphi', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'murphi') == -1
 
 " Vim syntax file
 " Language: Murphi model checking language
@@ -133,5 +128,3 @@ hi def link murphiError          Error
 hi def link murphiTodo           Todo
 
 let b:current_syntax = "murphi"
-
-endif
diff --git a/syntax/mush.vim b/syntax/mush.vim
index 902b0dbb2..329cb5c30 100644
--- a/syntax/mush.vim
+++ b/syntax/mush.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mush.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mush', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mush') == -1
 
 " MUSHcode syntax file
 " Maintainer: Rick Bird <nveid@nveid.com>
@@ -222,5 +217,3 @@ hi def link mushCommentString mushString
 let b:current_syntax = "mush"
 
 " mush: ts=17
-
-endif
diff --git a/syntax/mustache.vim b/syntax/mustache.vim
index ebcc7f49d..ece71e3cc 100644
--- a/syntax/mustache.vim
+++ b/syntax/mustache.vim
@@ -1,12 +1,5 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mustache.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
 runtime! syntax/handlebars.vim
-
-endif
diff --git a/syntax/muttrc.vim b/syntax/muttrc.vim
index 7d317e475..c7c863dd0 100644
--- a/syntax/muttrc.vim
+++ b/syntax/muttrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/muttrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('muttrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'muttrc') == -1
 
 " Vim syntax file
 " Language:	Mutt setup files
@@ -828,5 +823,3 @@ let b:current_syntax = "muttrc"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 "EOF	vim: ts=8 noet tw=100 sw=8 sts=0 ft=vim
-
-endif
diff --git a/syntax/mysql.vim b/syntax/mysql.vim
index 77de37a34..a90e89201 100644
--- a/syntax/mysql.vim
+++ b/syntax/mysql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/mysql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('mysql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mysql') == -1
 
 " Vim syntax file
 " Language:     mysql
@@ -295,5 +290,3 @@ hi def link mysqlFunction           Function
 
 let b:current_syntax = "mysql"
 
-
-endif
diff --git a/syntax/n1ql.vim b/syntax/n1ql.vim
index bf68e7b96..b2133f27c 100644
--- a/syntax/n1ql.vim
+++ b/syntax/n1ql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/n1ql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('n1ql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'n1ql') == -1
 
 " Vim syntax file
 " Language:    N1QL / Couchbase Server
@@ -441,5 +436,3 @@ hi def link n1qlTODO       Todo
 hi def link n1qlType       Type
 
 let b:current_syntax = "n1ql"
-
-endif
diff --git a/syntax/named.vim b/syntax/named.vim
index 2ec365c31..f3997ee73 100644
--- a/syntax/named.vim
+++ b/syntax/named.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/named.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('named', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'named') == -1
 
 " Vim syntax file
 " Language:	BIND configuration file
@@ -236,5 +231,3 @@ unlet s:save_cpo
 let b:current_syntax = "named"
 
 " vim: ts=17
-
-endif
diff --git a/syntax/nanorc.vim b/syntax/nanorc.vim
index ed33bf256..fa68d216c 100644
--- a/syntax/nanorc.vim
+++ b/syntax/nanorc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/nanorc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nanorc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nanorc') == -1
 
 " Vim syntax file
 " Language:             nanorc(5) - GNU nano configuration file
@@ -250,5 +245,3 @@ let b:current_syntax = "nanorc"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/natural.vim b/syntax/natural.vim
index 02d72fbb0..b58c22f29 100644
--- a/syntax/natural.vim
+++ b/syntax/natural.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/natural.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('natural', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'natural') == -1
 
 " Vim syntax file
 "
@@ -208,5 +203,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set ts=8 sw=8 noet ft=vim list:
-
-endif
diff --git a/syntax/ncf.vim b/syntax/ncf.vim
index 0ecd27b08..a4552f6f0 100644
--- a/syntax/ncf.vim
+++ b/syntax/ncf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ncf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ncf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ncf') == -1
 
 " Vim syntax file
 " Language:     Novell "NCF" Batch File
@@ -254,5 +249,3 @@ hi def link ncfSetCommandsBindCon   ncfSetCommands
 
 
 let b:current_syntax = "ncf"
-
-endif
diff --git a/syntax/neomuttrc.vim b/syntax/neomuttrc.vim
index 5e3929067..afac90fc6 100644
--- a/syntax/neomuttrc.vim
+++ b/syntax/neomuttrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/neomuttrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('neomuttrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'neomuttrc') == -1
 
 " Vim syntax file
 " Language:	NeoMutt setup files
@@ -868,5 +863,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8 noet tw=100 sw=8 sts=0 ft=vim isk+=-
-
-endif
diff --git a/syntax/netrc.vim b/syntax/netrc.vim
index 587267081..05ecbc0ac 100644
--- a/syntax/netrc.vim
+++ b/syntax/netrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/netrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('netrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'netrc') == -1
 
 " Vim syntax file
 " Language:             netrc(5) configuration file
@@ -59,5 +54,3 @@ let b:current_syntax = "netrc"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/nginx.vim b/syntax/nginx.vim
index 2c68c9e7d..565fe7760 100644
--- a/syntax/nginx.vim
+++ b/syntax/nginx.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/nginx.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nginx', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
 
 " Vim syntax file
 " Language: nginx.conf
@@ -2315,5 +2310,3 @@ hi link ngxGzipOn Error
 hi link ngxSSLCipherInsecure Error
 
 hi link ngxThirdPartyLuaBlock Function
-
-endif
diff --git a/syntax/nim.vim b/syntax/nim.vim
index 0286bea8b..0ab2c10b5 100644
--- a/syntax/nim.vim
+++ b/syntax/nim.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/nim.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nim', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -211,5 +206,3 @@ endif
 
 let b:current_syntax = 'nim'
 
-
-endif
diff --git a/syntax/ninja.vim b/syntax/ninja.vim
index e8a1c6232..77423ce7a 100644
--- a/syntax/ninja.vim
+++ b/syntax/ninja.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ninja.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ninja', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ninja') == -1
 
 " ninja build file syntax.
 " Language: ninja build file as described at
@@ -94,5 +89,3 @@ let b:current_syntax = "ninja"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/nix.vim b/syntax/nix.vim
index 4b0557c62..1d4ba43d8 100644
--- a/syntax/nix.vim
+++ b/syntax/nix.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/nix.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nix', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 
 " Vim syntax file
 " Language:    Nix
@@ -204,5 +199,3 @@ hi def link nixWithExprKeyword           Keyword
 syn sync fromstart
 
 let b:current_syntax = "nix"
-
-endif
diff --git a/syntax/nqc.vim b/syntax/nqc.vim
index 74424de6b..7d7c88469 100644
--- a/syntax/nqc.vim
+++ b/syntax/nqc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/nqc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nqc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nqc') == -1
 
 " Vim syntax file
 " Language:	NQC - Not Quite C, for LEGO mindstorms
@@ -372,5 +367,3 @@ hi def link nqcCppOut		Comment
 let b:current_syntax = "nqc"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/nroff.vim b/syntax/nroff.vim
index bea5ddd17..f99eff57e 100644
--- a/syntax/nroff.vim
+++ b/syntax/nroff.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/nroff.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nroff', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nroff') == -1
 
 " VIM syntax file
 " Language:	nroff/groff
@@ -256,5 +251,3 @@ let b:current_syntax = "nroff"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim600: set fdm=marker fdl=2:
-
-endif
diff --git a/syntax/nsis.vim b/syntax/nsis.vim
index 1577fd593..01c90244c 100644
--- a/syntax/nsis.vim
+++ b/syntax/nsis.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/nsis.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('nsis', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nsis') == -1
 
 " Vim syntax file
 " Language:		NSIS script, for version of NSIS 3.03 and later
@@ -689,5 +684,3 @@ let b:current_syntax = "nsis"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/oasis.vim b/syntax/oasis.vim
index 450cfade5..0acafa835 100644
--- a/syntax/oasis.vim
+++ b/syntax/oasis.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/oasis.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 if exists("b:current_syntax")
     finish
@@ -102,5 +97,3 @@ highlight link oasisString String
 highlight link oasisVersion Number
 
 let b:current_syntax = "oasis"
-
-endif
diff --git a/syntax/obj.vim b/syntax/obj.vim
index 9108089d2..3c36958e9 100644
--- a/syntax/obj.vim
+++ b/syntax/obj.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/obj.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('obj', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'obj') == -1
 
 " Vim syntax file
 " Language:	3D wavefront's obj file
@@ -90,5 +85,3 @@ hi def link objKeywords        Keyword
 let b:current_syntax = "obj"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index 3bdd77cd7..8cf6fb67e 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ocaml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim syntax file
 " Language:     OCaml
@@ -394,5 +389,3 @@ hi def link ocamlPpxEncl       ocamlEncl
 let b:current_syntax = "ocaml"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/ocamlbuild_tags.vim b/syntax/ocamlbuild_tags.vim
index 342324256..d814c5267 100644
--- a/syntax/ocamlbuild_tags.vim
+++ b/syntax/ocamlbuild_tags.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ocamlbuild_tags.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 if exists("b:current_syntax")
   finish
@@ -47,5 +42,3 @@ hi! link ocamlbuild_tagsComment Comment
 hi link ocamlbuild_tagsFindlibPkg Identifier
 
 let b:current_syntax = "ocamlbuild_tags"
-
-endif
diff --git a/syntax/occam.vim b/syntax/occam.vim
index a69329fc0..11c715eb5 100644
--- a/syntax/occam.vim
+++ b/syntax/occam.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/occam.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('occam', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'occam') == -1
 
 " Vim syntax file
 " Language:	occam
@@ -123,5 +118,3 @@ hi def link occamParantheses Delimiter
 
 let b:current_syntax = "occam"
 
-
-endif
diff --git a/syntax/ocpbuild.vim b/syntax/ocpbuild.vim
index d3175eb12..ac30f6b3e 100644
--- a/syntax/ocpbuild.vim
+++ b/syntax/ocpbuild.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ocpbuild.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim syntax file
 " Language: ocp-build files
@@ -57,5 +52,3 @@ hi def link ocpPreProc      PreProc
 
 let b:current_syntax = "ocpbuild"
 
-
-endif
diff --git a/syntax/ocpbuildroot.vim b/syntax/ocpbuildroot.vim
index 94ff36a52..58a7dfa15 100644
--- a/syntax/ocpbuildroot.vim
+++ b/syntax/ocpbuildroot.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ocpbuildroot.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim syntax file
 " Language: ocp-build.root files
@@ -60,5 +55,3 @@ hi def link ocprNumber        Number
 
 let b:current_syntax = "ocpbuildroot"
 
-
-endif
diff --git a/syntax/octave.vim b/syntax/octave.vim
index 331567c2a..d92377a85 100644
--- a/syntax/octave.vim
+++ b/syntax/octave.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/octave.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('octave', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'octave') == -1
 
 " Vim syntax file
 " Language:             Octave
@@ -735,5 +730,3 @@ endif
 let b:current_syntax = "octave"
 
 "EOF	vim: ts=2 et tw=80 sw=2 sts=0
-
-endif
diff --git a/syntax/odin.vim b/syntax/odin.vim
index 16036e431..5600f7a44 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/odin.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('odin', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'odin') == -1
 
 if exists("b:current_syntax")
   finish
@@ -183,5 +178,3 @@ highlight link odinFloat Float
 highlight link odinHex Number
 
 let b:current_syntax = "odin"
-
-endif
diff --git a/syntax/omake.vim b/syntax/omake.vim
index 38953ff56..fb0f9a19d 100644
--- a/syntax/omake.vim
+++ b/syntax/omake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/omake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim syntax file
 " Language:	OMakefile
@@ -135,5 +130,3 @@ hi def link omakeRuleOption Type
 
 let b:current_syntax = "omake"
 " vim: ts=8
-
-endif
diff --git a/syntax/omnimark.vim b/syntax/omnimark.vim
index dc6cb0194..a27c20072 100644
--- a/syntax/omnimark.vim
+++ b/syntax/omnimark.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/omnimark.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('omnimark', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'omnimark') == -1
 
 " Vim syntax file
 " Language:	Omnimark
@@ -113,5 +108,3 @@ let b:current_syntax = "omnimark"
 
 " vim: ts=8
 
-
-endif
diff --git a/syntax/opam.vim b/syntax/opam.vim
index f487e851d..338d77be8 100644
--- a/syntax/opam.vim
+++ b/syntax/opam.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/opam.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 if exists("b:current_syntax")
   finish
@@ -38,5 +33,3 @@ hi link opamInterpolate Identifier
 let b:current_syntax = "opam"
 
 " vim: ts=2 sw=2
-
-endif
diff --git a/syntax/opencl.vim b/syntax/opencl.vim
index 6bcd63f3a..db5cca84e 100644
--- a/syntax/opencl.vim
+++ b/syntax/opencl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/opencl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('opencl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opencl') == -1
 
 " Vim syntax file
 " Language:	OpenCL (Open Computing Language)
@@ -164,5 +159,3 @@ hi def link clStatement         Statement
 let b:current_syntax = "opencl"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/openroad.vim b/syntax/openroad.vim
index be96596c5..af0927037 100644
--- a/syntax/openroad.vim
+++ b/syntax/openroad.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/openroad.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('openroad', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'openroad') == -1
 
 " Vim syntax file
 " Language:		CA-OpenROAD
@@ -259,5 +254,3 @@ hi def link openroadTodo		Todo
 
 
 let b:current_syntax = "openroad"
-
-endif
diff --git a/syntax/opl.vim b/syntax/opl.vim
index 4feffec9a..1ba40a2ec 100644
--- a/syntax/opl.vim
+++ b/syntax/opl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/opl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('opl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'opl') == -1
 
 " Vim syntax file
 " Language:	OPL
@@ -96,5 +91,3 @@ let b:current_syntax = "opl"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/ora.vim b/syntax/ora.vim
index 87722362b..96d91a306 100644
--- a/syntax/ora.vim
+++ b/syntax/ora.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ora.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ora', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ora') == -1
 
 " Vim syntax file
 " Language:	Oracle config files (.ora) (Oracle 8i, ver. 8.1.5)
@@ -471,5 +466,3 @@ if main_syntax == 'ora'
 endif
 
 " vim: ts=8
-
-endif
diff --git a/syntax/pamconf.vim b/syntax/pamconf.vim
index 14c751ad3..66c7d74f4 100644
--- a/syntax/pamconf.vim
+++ b/syntax/pamconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pamconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pamconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pamconf') == -1
 
 " Vim syntax file
 " Language:             pam(8) configuration file
@@ -138,5 +133,3 @@ let b:current_syntax = "pamconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/pamenv.vim b/syntax/pamenv.vim
index 2d158e4ad..75a0c4eb1 100644
--- a/syntax/pamenv.vim
+++ b/syntax/pamenv.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pamenv.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pamenv', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pamenv') == -1
 
 " Vim syntax file
 " Language:             pam_env.conf(5) configuration file
@@ -35,5 +30,3 @@ hi def link     pamenvValue             String
 hi def link     pamenvValueWithQuote    String
 
 let b:current_syntax = "pamenv"
-
-endif
diff --git a/syntax/papp.vim b/syntax/papp.vim
index 220aeee9c..d07ca3e49 100644
--- a/syntax/papp.vim
+++ b/syntax/papp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/papp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('papp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'papp') == -1
 
 " Vim syntax file for the "papp" file format (_p_erl _app_lication)
 "
@@ -83,5 +78,3 @@ hi def link papp_prep		preCondit
 hi def link papp_gettext	String
 
 let b:current_syntax = "papp"
-
-endif
diff --git a/syntax/pascal.vim b/syntax/pascal.vim
index 038c55677..76344e18d 100644
--- a/syntax/pascal.vim
+++ b/syntax/pascal.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pascal.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pascal', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pascal') == -1
 
 " Vim syntax file
 " Language:	Pascal
@@ -367,5 +362,3 @@ hi def link pascalShowTab		Error
 let b:current_syntax = "pascal"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/passwd.vim b/syntax/passwd.vim
index ec8caae8b..25ba4a09b 100644
--- a/syntax/passwd.vim
+++ b/syntax/passwd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/passwd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('passwd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'passwd') == -1
 
 " Vim syntax file
 " Language:             passwd(5) password file
@@ -78,5 +73,3 @@ let b:current_syntax = "passwd"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/pccts.vim b/syntax/pccts.vim
index f9594aa3b..4f0fba7a9 100644
--- a/syntax/pccts.vim
+++ b/syntax/pccts.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pccts.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pccts', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pccts') == -1
 
 " Vim syntax file
 " Language:	PCCTS
@@ -96,5 +91,3 @@ hi def link pcctsSpecialChar	SpecialChar
 let b:current_syntax = "pccts"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/pdf.vim b/syntax/pdf.vim
index 4a0a1c957..a0012c316 100644
--- a/syntax/pdf.vim
+++ b/syntax/pdf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pdf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pdf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pdf') == -1
 
 " Vim syntax file
 " Language:	PDF
@@ -80,5 +75,3 @@ hi def link pdfPreProc      PreProc
 hi def link pdfComment      Comment
 
 let b:current_syntax = "pdf"
-
-endif
diff --git a/syntax/perl.vim b/syntax/perl.vim
index f50a1dab8..bea6df6b5 100644
--- a/syntax/perl.vim
+++ b/syntax/perl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/perl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim syntax file
 " Language:      Perl 5
@@ -589,5 +584,3 @@ unlet s:cpo_save
 
 " XXX Change to sts=4:sw=4
 " vim:ts=8:sts=2:sw=2:expandtab:ft=vim
-
-endif
diff --git a/syntax/pf.vim b/syntax/pf.vim
index 9c37cba3c..8d8554a19 100644
--- a/syntax/pf.vim
+++ b/syntax/pf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pf') == -1
 
 " pf syntax file
 " Language:        OpenBSD packet filter configuration (pf.conf)
@@ -340,5 +335,3 @@ syn keyword	pfService	zabbix-agent
 syn keyword	pfService	zabbix-trapper
 syn keyword	pfService	zebra
 syn keyword	pfService	zebrasrv
-
-endif
diff --git a/syntax/pfmain.vim b/syntax/pfmain.vim
index 311ad05db..7ba7e62c3 100644
--- a/syntax/pfmain.vim
+++ b/syntax/pfmain.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pfmain.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pfmain', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pfmain') == -1
 
 " Vim syntax file
 " Language:	Postfix main.cf configuration
@@ -1842,5 +1837,3 @@ hi def link pfmainSpecial	Special
 let b:current_syntax = "pfmain"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 108cc268f..92163f6c9 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pgsql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pgsql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pgsql') == -1
 
 " Vim syntax file
 " Language:     SQL (PostgreSQL dialect), PL/pgSQL, PL/…, PostGIS, …
@@ -2022,5 +2017,3 @@ hi def link sqlCreateTextSearchKeyword sqlKeyword
 
 let b:current_syntax = "sql"
 
-
-endif
diff --git a/syntax/php.vim b/syntax/php.vim
index 79302961b..ffb5c64d7 100644
--- a/syntax/php.vim
+++ b/syntax/php.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/php.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('php', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'php') == -1
 
 " Vim syntax file
 " Language: PHP 5.3 & up
@@ -1055,5 +1050,3 @@ endif
 " }}}
 
 " vim: ts=8 sts=2 sw=2 fdm=marker expandtab
-
-endif
diff --git a/syntax/pike.vim b/syntax/pike.vim
index b089a3fff..2a4acce42 100644
--- a/syntax/pike.vim
+++ b/syntax/pike.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pike.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pike', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pike') == -1
 
 " Vim syntax file
 " Language:		Pike
@@ -393,5 +388,3 @@ let b:current_syntax = "pike"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/pilrc.vim b/syntax/pilrc.vim
index a463c82aa..fd6ecad6e 100644
--- a/syntax/pilrc.vim
+++ b/syntax/pilrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pilrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pilrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pilrc') == -1
 
 " Vim syntax file
 " Language:	pilrc - a resource compiler for Palm OS development
@@ -143,5 +138,3 @@ hi def link pilrcIdentifier		Number
 
 
 let b:current_syntax = "pilrc"
-
-endif
diff --git a/syntax/pine.vim b/syntax/pine.vim
index 647de9ff0..344aa0f44 100644
--- a/syntax/pine.vim
+++ b/syntax/pine.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pine.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pine', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pine') == -1
 
 " Vim syntax file
 " Language:	Pine (email program) run commands
@@ -362,5 +357,3 @@ hi def link pineOption	Macro
 let b:current_syntax = "pine"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/pinfo.vim b/syntax/pinfo.vim
index 09404137c..6319ef5d3 100644
--- a/syntax/pinfo.vim
+++ b/syntax/pinfo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pinfo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pinfo', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pinfo') == -1
 
 " Vim syntax file
 " Language:             pinfo(1) configuration file
@@ -117,5 +112,3 @@ let b:current_syntax = "pinfo"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index d4185ffb7..594a56158 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/plantuml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('plantuml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
 
 scriptencoding utf-8
 " Vim syntax file
@@ -415,5 +410,3 @@ highlight default link plantumlStereotype Type
 
 let &cpoptions=s:cpo_orig
 unlet s:cpo_orig
-
-endif
diff --git a/syntax/pli.vim b/syntax/pli.vim
index 72a075c0a..9f935118b 100644
--- a/syntax/pli.vim
+++ b/syntax/pli.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pli.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pli', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pli') == -1
 
 " Vim syntax file
 " Modified from  http://plnet.org/files/vim/
@@ -273,5 +268,3 @@ hi def link pl1Todo            Todo
 
 
 let b:current_syntax = "pl1"
-
-endif
diff --git a/syntax/plm.vim b/syntax/plm.vim
index d81672e96..9bce4e0c9 100644
--- a/syntax/plm.vim
+++ b/syntax/plm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/plm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('plm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plm') == -1
 
 " Vim syntax file
 " Language:	PL/M
@@ -141,5 +136,3 @@ let b:current_syntax = "plm"
 
 " vim: ts=8 sw=2
 
-
-endif
diff --git a/syntax/plp.vim b/syntax/plp.vim
index 29ac15034..34ab92903 100644
--- a/syntax/plp.vim
+++ b/syntax/plp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/plp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('plp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plp') == -1
 
 " Vim syntax file
 " Language:	PLP (Perl in HTML)
@@ -44,5 +39,3 @@ syn region  PLPinclude keepend matchgroup=Delimiter start=+<(+ end=+)>+
 
 let b:current_syntax = "plp"
 
-
-endif
diff --git a/syntax/plsql.vim b/syntax/plsql.vim
index c40575a85..ce0a7eb18 100644
--- a/syntax/plsql.vim
+++ b/syntax/plsql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/plsql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('plsql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plsql') == -1
 
 " Vim syntax file
 " Language: Oracle Procedureal SQL (PL/SQL)
@@ -271,5 +266,3 @@ hi def link plsqlTodo		Todo
 let b:current_syntax = "plsql"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/po.vim b/syntax/po.vim
index 217eebc38..c852b71cc 100644
--- a/syntax/po.vim
+++ b/syntax/po.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/po.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('po', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'po') == -1
 
 " Vim syntax file
 " Language:	po (gettext)
@@ -140,5 +135,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:set ts=8 sts=2 sw=2 noet:
-
-endif
diff --git a/syntax/pod.vim b/syntax/pod.vim
index 68c554602..d67b15cc4 100644
--- a/syntax/pod.vim
+++ b/syntax/pod.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pod.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim syntax file
 " Language:      Perl POD format
@@ -182,5 +177,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/pony.vim b/syntax/pony.vim
index a0d3d959a..dcb3bc1a7 100644
--- a/syntax/pony.vim
+++ b/syntax/pony.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pony.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pony', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
 
 " Vim syntax file
 " Language:     Pony
@@ -234,5 +229,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 let b:current_syntax = 'pony'
-
-endif
diff --git a/syntax/postscr.vim b/syntax/postscr.vim
index 8aeea6309..6053453aa 100644
--- a/syntax/postscr.vim
+++ b/syntax/postscr.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/postscr.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('postscr', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'postscr') == -1
 
 " Vim syntax file
 " Language:     PostScript - all Levels, selectable
@@ -787,5 +782,3 @@ endif
 let b:current_syntax = "postscr"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/pov.vim b/syntax/pov.vim
index 5873d9345..79fe9210c 100644
--- a/syntax/pov.vim
+++ b/syntax/pov.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pov.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pov', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pov') == -1
 
 " Vim syntax file
 " Language: PoV-Ray(tm) 3.7 Scene Description Language
@@ -151,5 +146,3 @@ hi def link povCommentError povError
 hi def link povError Error
 
 let b:current_syntax = "pov"
-
-endif
diff --git a/syntax/povini.vim b/syntax/povini.vim
index 599429655..9dce65b3f 100644
--- a/syntax/povini.vim
+++ b/syntax/povini.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/povini.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('povini', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'povini') == -1
 
 " Vim syntax file
 " Language: PoV-Ray(tm) 3.7 configuration/initialization files
@@ -63,5 +58,3 @@ hi def link poviniBool Constant
 hi def link poviniNumber Number
 
 let b:current_syntax = "povini"
-
-endif
diff --git a/syntax/ppd.vim b/syntax/ppd.vim
index 7ba5a53c8..d1dd040da 100644
--- a/syntax/ppd.vim
+++ b/syntax/ppd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ppd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ppd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ppd') == -1
 
 " Vim syntax file
 " Language:	PPD (PostScript printer description) file
@@ -42,5 +37,3 @@ hi def link ppdContraints		Special
 let b:current_syntax = "ppd"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/ppwiz.vim b/syntax/ppwiz.vim
index 2cb20d708..c32b32d5b 100644
--- a/syntax/ppwiz.vim
+++ b/syntax/ppwiz.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ppwiz.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ppwiz', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ppwiz') == -1
 
 " Vim syntax file
 " Language:     PPWizard (preprocessor by Dennis Bareis)
@@ -91,5 +86,3 @@ let b:current_syntax = "ppwiz"
 
 " vim: ts=4
 
-
-endif
diff --git a/syntax/privoxy.vim b/syntax/privoxy.vim
index 31ffb85d2..6dfe03b6c 100644
--- a/syntax/privoxy.vim
+++ b/syntax/privoxy.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/privoxy.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('privoxy', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'privoxy') == -1
 
 " Vim syntax file
 " Language:	Privoxy actions file
@@ -78,5 +73,3 @@ let b:current_syntax = "privoxy"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/procmail.vim b/syntax/procmail.vim
index 137db9e45..f10d3eb13 100644
--- a/syntax/procmail.vim
+++ b/syntax/procmail.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/procmail.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('procmail', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'procmail') == -1
 
 " Vim syntax file
 " Language:	Procmail definition file
@@ -61,5 +56,3 @@ hi def link procmailString String
 let b:current_syntax = "procmail"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/prolog.vim b/syntax/prolog.vim
index 2ba79f43a..a38a82b71 100644
--- a/syntax/prolog.vim
+++ b/syntax/prolog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/prolog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('prolog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
 
 " Vim syntax file
 " Language:    PROLOG
@@ -125,5 +120,3 @@ endif
 let b:current_syntax = "prolog"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/promela.vim b/syntax/promela.vim
index f91e85884..608628602 100644
--- a/syntax/promela.vim
+++ b/syntax/promela.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/promela.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('promela', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'promela') == -1
 
 " Vim syntax file
 " Language:			ProMeLa
@@ -60,5 +55,3 @@ hi def link promelaString		String
 hi def link promelaTodo	        Todo
 
 let b:current_syntax = "promela"
-
-endif
diff --git a/syntax/proto.vim b/syntax/proto.vim
index cc1e6f9d4..95d604c1f 100644
--- a/syntax/proto.vim
+++ b/syntax/proto.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/proto.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('protobuf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protobuf') == -1
 
 " Protocol Buffers - Google's data interchange format
 " Copyright 2008 Google Inc.  All rights reserved.
@@ -114,5 +109,3 @@ if version >= 508 || !exists("did_proto_syn_inits")
 endif
 
 let b:current_syntax = "proto"
-
-endif
diff --git a/syntax/protocols.vim b/syntax/protocols.vim
index 978f6810f..0a53772c2 100644
--- a/syntax/protocols.vim
+++ b/syntax/protocols.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/protocols.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('protocols', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'protocols') == -1
 
 " Vim syntax file
 " Language:             protocols(5) - Internet protocols definition file
@@ -51,5 +46,3 @@ let b:current_syntax = "protocols"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/ps1.vim b/syntax/ps1.vim
index 8a80cf38a..d7c5ecda4 100644
--- a/syntax/ps1.vim
+++ b/syntax/ps1.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ps1.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Vim syntax file
 " Language:           Windows PowerShell
@@ -200,5 +195,3 @@ if version >= 508 || !exists("did_ps1_syn_inits")
 endif
 
 let b:current_syntax = "ps1"
-
-endif
diff --git a/syntax/ps1xml.vim b/syntax/ps1xml.vim
index 3e341afdc..06ff97da0 100644
--- a/syntax/ps1xml.vim
+++ b/syntax/ps1xml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ps1xml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'powershell') == -1
 
 " Vim syntax file
 " Language:           Windows PowerShell XML
@@ -63,5 +58,3 @@ let b:current_syntax = "ps1xml"
 let &cpo = s:ps1xml_cpo_save
 unlet s:ps1xml_cpo_save
 
-
-endif
diff --git a/syntax/psf.vim b/syntax/psf.vim
index e5657e2cf..25176c960 100644
--- a/syntax/psf.vim
+++ b/syntax/psf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/psf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('psf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'psf') == -1
 
 " Vim syntax file
 " Language:	Software Distributor product specification file
@@ -98,5 +93,3 @@ hi def link psfComment      Comment
 syn sync lines=100
 
 let b:current_syntax = "psf"
-
-endif
diff --git a/syntax/pug.vim b/syntax/pug.vim
index ceb6ebe21..94ee0dac0 100644
--- a/syntax/pug.vim
+++ b/syntax/pug.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pug.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pug', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pug') == -1
 
 " Vim syntax file
 " Language: Pug
@@ -121,5 +116,3 @@ let b:current_syntax = "pug"
 if main_syntax == "pug"
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/puppet.vim b/syntax/puppet.vim
index e6239a846..1df1015df 100644
--- a/syntax/puppet.vim
+++ b/syntax/puppet.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/puppet.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
 
 " Language:     Puppet
 " Maintainer:   Voxpupuli
@@ -443,5 +438,3 @@ HiLink puppetComment              Comment
 delcommand HiLink
 
 let b:current_syntax = "puppet"
-
-endif
diff --git a/syntax/purescript.vim b/syntax/purescript.vim
index 259dab789..d6ef897cc 100644
--- a/syntax/purescript.vim
+++ b/syntax/purescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/purescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('purescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
 
 " syntax highlighting for purescript
 "
@@ -224,5 +219,3 @@ highlight def link purescriptType Type
 highlight def link purescriptComment Comment
 
 let b:current_syntax = "purescript"
-
-endif
diff --git a/syntax/pyrex.vim b/syntax/pyrex.vim
index 6ebb423b1..8699c29ad 100644
--- a/syntax/pyrex.vim
+++ b/syntax/pyrex.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/pyrex.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('pyrex', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pyrex') == -1
 
 " Vim syntax file
 " Language:	Pyrex
@@ -58,5 +53,3 @@ hi def link pyrexForFrom		Statement
 
 
 let b:current_syntax = "pyrex"
-
-endif
diff --git a/syntax/python.vim b/syntax/python.vim
index 8ace6f037..35df5989e 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/python.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('python', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python') == -1
 
 " For version 5.x: Clear all syntax items
 " For versions greater than 6.x: Quit when a syntax file was already loaded
@@ -515,5 +510,3 @@ if v:version >= 508 || !exists('did_python_syn_inits')
 endif
 
 let b:current_syntax = 'python'
-
-endif
diff --git a/syntax/qmake.vim b/syntax/qmake.vim
index 74708ecea..6961bbc89 100644
--- a/syntax/qmake.vim
+++ b/syntax/qmake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/qmake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('qmake', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qmake') == -1
 
 " qmake project syntax file
 " Language:     qmake project
@@ -306,5 +301,3 @@ hi def link qmakeQtConfiguration PreProc
 hi def link qmakeScope Conditional
 
 let b:current_syntax = "qmake"
-
-endif
diff --git a/syntax/qml.vim b/syntax/qml.vim
index e3006ebf2..18b0799d8 100644
--- a/syntax/qml.vim
+++ b/syntax/qml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/qml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('qml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'qml') == -1
 
 
 " Vim syntax file
@@ -149,5 +144,3 @@ let b:current_syntax = "qml"
 if main_syntax == 'qml'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/quake.vim b/syntax/quake.vim
index 413a1c562..ec467a5e7 100644
--- a/syntax/quake.vim
+++ b/syntax/quake.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/quake.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('quake', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'quake') == -1
 
 " Vim syntax file
 " Language:             Quake[1-3] configuration file
@@ -177,5 +172,3 @@ let b:current_syntax = "quake"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/racket.vim b/syntax/racket.vim
index ecd4eda61..25483dea7 100644
--- a/syntax/racket.vim
+++ b/syntax/racket.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/racket.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('racket', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
 
 " Vim syntax file
 " Language:     Racket
@@ -668,5 +663,3 @@ if version >= 508 || !exists("did_racket_syntax_inits")
 endif
 
 let b:current_syntax = "racket"
-
-endif
diff --git a/syntax/radiance.vim b/syntax/radiance.vim
index e77f64e20..1e4d06315 100644
--- a/syntax/radiance.vim
+++ b/syntax/radiance.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/radiance.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('radiance', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'radiance') == -1
 
 " Vim syntax file
 " Language:     Radiance Scene Description
@@ -149,5 +144,3 @@ hi def link radianceTodo		Todo
 let b:current_syntax = "radiance"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/ragel.vim b/syntax/ragel.vim
index 37697ef75..496c6ad41 100644
--- a/syntax/ragel.vim
+++ b/syntax/ragel.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ragel.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ragel', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ragel') == -1
 
 " Vim syntax file
 "
@@ -171,5 +166,3 @@ hi link caseLabelKeyword Keyword
 hi link beginRL Type
  
 let b:current_syntax = "ragel"
-
-endif
diff --git a/syntax/raku.vim b/syntax/raku.vim
index 137fa7e06..d15f0307d 100644
--- a/syntax/raku.vim
+++ b/syntax/raku.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/raku.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('raku', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raku') == -1
 
 " Vim syntax file
 " Language:      Raku
@@ -1977,5 +1972,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:ts=8:sts=4:sw=4:expandtab:ft=vim
-
-endif
diff --git a/syntax/raml.vim b/syntax/raml.vim
index a36847630..95f4955c6 100644
--- a/syntax/raml.vim
+++ b/syntax/raml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/raml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('raml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
 
 " Vim syntax file
 " Language:    RAML (RESTful API Modeling Language)
@@ -113,5 +108,3 @@ let b:current_syntax = "raml"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/ratpoison.vim b/syntax/ratpoison.vim
index b6e25067d..8209610ff 100644
--- a/syntax/ratpoison.vim
+++ b/syntax/ratpoison.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ratpoison.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ratpoison', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ratpoison') == -1
 
 " Vim syntax file
 " Language:	Ratpoison configuration/commands file ( /etc/ratpoisonrc ~/.ratpoisonrc )
@@ -274,5 +269,3 @@ hi def link ratpoisonWinListArg	Constant
 let b:current_syntax = "ratpoison"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/razor.vim b/syntax/razor.vim
index de9247611..5f97015a0 100644
--- a/syntax/razor.vim
+++ b/syntax/razor.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/razor.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('razor', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'razor') == -1
 
 if exists("b:current_syntax")
   finish
@@ -58,5 +53,3 @@ hi def link rUsing Preproc
 hi def link rNamespace Type
 
 let b:current_syntax = "razor"
-
-endif
diff --git a/syntax/rc.vim b/syntax/rc.vim
index d5b658c0b..c93d123f1 100644
--- a/syntax/rc.vim
+++ b/syntax/rc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rc') == -1
 
 " Vim syntax file
 " Language:	M$ Resource files (*.rc)
@@ -197,5 +192,3 @@ hi def rcCommonAttribute	ctermfg=Brown guifg=Brown
 let b:current_syntax = "rc"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/rcs.vim b/syntax/rcs.vim
index 4dfab84a7..6657b1d88 100644
--- a/syntax/rcs.vim
+++ b/syntax/rcs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rcs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rcs', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rcs') == -1
 
 " Vim syntax file
 " Language:     RCS file
@@ -70,5 +65,3 @@ hi def link rcsEOFError    Error
 
 
 let b:current_syntax = "rcs"
-
-endif
diff --git a/syntax/readline.vim b/syntax/readline.vim
index 33a733f37..3a98c71f7 100644
--- a/syntax/readline.vim
+++ b/syntax/readline.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/readline.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('readline', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'readline') == -1
 
 " Vim syntax file
 " Language:             readline(3) configuration file
@@ -418,5 +413,3 @@ let b:current_syntax = 'readline'
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/reason.vim b/syntax/reason.vim
index 62b83c5f1..6d7917474 100644
--- a/syntax/reason.vim
+++ b/syntax/reason.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/reason.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('reason', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
 
 " Vim syntax file
 " Language:     Reason (Forked from Rust)
@@ -257,5 +252,3 @@ syn sync minlines=200
 syn sync maxlines=500
 
 let b:current_syntax = "reason"
-
-endif
diff --git a/syntax/rego.vim b/syntax/rego.vim
index c34a9780f..2c3eed953 100644
--- a/syntax/rego.vim
+++ b/syntax/rego.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rego.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rego', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rego') == -1
 
 " Vim syntax file
 " Language: rego policy language
@@ -96,5 +91,3 @@ hi def link     regoComment           Comment
 hi def link     regoTodo              Todo
 
 let b:current_syntax = 'rego'
-
-endif
diff --git a/syntax/remind.vim b/syntax/remind.vim
index 9ca10b49b..cf40268c3 100644
--- a/syntax/remind.vim
+++ b/syntax/remind.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/remind.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('remind', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'remind') == -1
 
 " Vim syntax file
 " Language:	Remind
@@ -80,5 +75,3 @@ hi def link remindWarning		Error
 let b:current_syntax = "remind"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/requirements.vim b/syntax/requirements.vim
index 0167b41f8..bf9b4a4f4 100644
--- a/syntax/requirements.vim
+++ b/syntax/requirements.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/requirements.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('requirements', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'requirements') == -1
 
 " the Requirements File Format syntax support for Vim
 " Version: 1.5.3
@@ -60,5 +55,3 @@ hi link requirementsEnvironmentMarkers Macro
 let b:current_syntax = "requirements"
 
 " vim: et sw=4 ts=4 sts=4:
-
-endif
diff --git a/syntax/resolv.vim b/syntax/resolv.vim
index b151ecd2d..c28ce3b65 100644
--- a/syntax/resolv.vim
+++ b/syntax/resolv.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/resolv.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('resolv', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'resolv') == -1
 
 " Vim syntax file
 " Language: resolver configuration file
@@ -126,5 +121,3 @@ hi def link resolvIPSpecial Special
 let b:current_syntax = "resolv"
 
 " vim: ts=8 ft=vim
-
-endif
diff --git a/syntax/reva.vim b/syntax/reva.vim
index 0cc6c60d6..66b83f770 100644
--- a/syntax/reva.vim
+++ b/syntax/reva.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/reva.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('reva', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reva') == -1
 
 " Vim syntax file
 " Language:	Reva Forth
@@ -198,5 +193,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8:sw=4:nocindent:smartindent:
-
-endif
diff --git a/syntax/rexx.vim b/syntax/rexx.vim
index fb9c6d559..9573bdd07 100644
--- a/syntax/rexx.vim
+++ b/syntax/rexx.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rexx.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rexx', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rexx') == -1
 
 " Vim syntax file
 " Language:	Rexx
@@ -325,5 +320,3 @@ hi def link rexxForward2           rexxForward
 let b:current_syntax = "rexx"
 
 "vim: ts=8
-
-endif
diff --git a/syntax/rhelp.vim b/syntax/rhelp.vim
index 21c602d95..3801a371f 100644
--- a/syntax/rhelp.vim
+++ b/syntax/rhelp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rhelp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('r-lang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
 
 " Vim syntax file
 " Language:    R Help File
@@ -162,5 +157,3 @@ endif
 
 let   b:current_syntax = "rhelp"
 " vim: foldmethod=marker:
-
-endif
diff --git a/syntax/rib.vim b/syntax/rib.vim
index 279377fb3..522e283be 100644
--- a/syntax/rib.vim
+++ b/syntax/rib.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rib.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rib', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rib') == -1
 
 " Vim syntax file
 " Language:	Renderman Interface Bytestream
@@ -69,5 +64,3 @@ hi def link ribFloat		Float
 let b:current_syntax = "rib"
 
 " Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
-
-endif
diff --git a/syntax/rmd.vim b/syntax/rmd.vim
index 555f102ab..b3b904f39 100644
--- a/syntax/rmd.vim
+++ b/syntax/rmd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rmd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rmd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rmd') == -1
 
 " markdown Text with R statements
 " Language: markdown with R code chunks
@@ -125,5 +120,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/rnc.vim b/syntax/rnc.vim
index 4226f53cf..2a3208373 100644
--- a/syntax/rnc.vim
+++ b/syntax/rnc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rnc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rnc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnc') == -1
 
 " Vim syntax file
 " Language:             Relax NG compact syntax
@@ -75,5 +70,3 @@ let b:current_syntax = "rnc"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/rng.vim b/syntax/rng.vim
index 947f2436a..64d93980c 100644
--- a/syntax/rng.vim
+++ b/syntax/rng.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rng.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rng', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rng') == -1
 
 " Vim syntax file
 " Language:    RELAX NG
@@ -32,5 +27,3 @@ syn keyword rngTagName parentRef ref start text value zeroOrMore contained
 hi def link rngTagName Statement
 
 let b:current_syntax = 'rng'
-
-endif
diff --git a/syntax/rnoweb-1.vim b/syntax/rnoweb-1.vim
index 7e2f2a6fb..bcc15f6d0 100644
--- a/syntax/rnoweb-1.vim
+++ b/syntax/rnoweb-1.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rnoweb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('r-lang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'r-lang') == -1
 
 " Vim syntax file
 " Language:    R noweb Files
@@ -63,5 +58,3 @@ hi def link rnowebChunkReference Delimiter
 
 let   b:current_syntax = "rnoweb"
 " vim: foldmethod=marker:
-
-endif
diff --git a/syntax/rnoweb-2.vim b/syntax/rnoweb-2.vim
index f2c1b831c..a3d4dc54b 100644
--- a/syntax/rnoweb-2.vim
+++ b/syntax/rnoweb-2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rnoweb-2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rnoweb', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rnoweb') == -1
 
 " Vim syntax file
 " Language:    R noweb Files
@@ -59,5 +54,3 @@ hi def link rnowebChunkReference Delimiter
 
 let   b:current_syntax = "rnoweb"
 " vim: foldmethod=marker:
-
-endif
diff --git a/syntax/robots.vim b/syntax/robots.vim
index f6e428c03..acf8767f2 100644
--- a/syntax/robots.vim
+++ b/syntax/robots.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/robots.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('robots', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'robots') == -1
 
 " Vim syntax file
 " Language:	"Robots.txt" files
@@ -64,5 +59,3 @@ let b:current_syntax = "robots"
 
 " vim: ts=8 sw=2
 
-
-endif
diff --git a/syntax/rpcgen.vim b/syntax/rpcgen.vim
index 4deb9a5cf..b93026bb5 100644
--- a/syntax/rpcgen.vim
+++ b/syntax/rpcgen.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rpcgen.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rpcgen', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpcgen') == -1
 
 " Vim syntax file
 " Language:	rpcgen
@@ -53,5 +48,3 @@ endif
 let b:current_syntax = "rpcgen"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/rpl.vim b/syntax/rpl.vim
index 3ebd63470..a37b1bdee 100644
--- a/syntax/rpl.vim
+++ b/syntax/rpl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rpl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rpl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rpl') == -1
 
 " Vim syntax file
 " Language:	RPL/2
@@ -490,5 +485,3 @@ let b:current_syntax = "rpl"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8 tw=132
-
-endif
diff --git a/syntax/rrst.vim b/syntax/rrst.vim
index fde794cc2..76cb44cd7 100644
--- a/syntax/rrst.vim
+++ b/syntax/rrst.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rrst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rrst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rrst') == -1
 
 " reStructured Text with R statements
 " Language: reST with R code chunks
@@ -50,5 +45,3 @@ hi def link rrstInlineDelim Special
 let b:current_syntax = "rrst"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/rst.vim b/syntax/rst.vim
index 337ade938..a0988ff80 100644
--- a/syntax/rst.vim
+++ b/syntax/rst.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rst.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rst', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
 
 " Vim reST syntax file
 " Language: reStructuredText documentation format
@@ -307,5 +302,3 @@ let b:current_syntax = "rst"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/rtf.vim b/syntax/rtf.vim
index 24b12498f..5fe3b6f54 100644
--- a/syntax/rtf.vim
+++ b/syntax/rtf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rtf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rtf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rtf') == -1
 
 " Vim syntax file
 " Language:	Rich Text Format
@@ -82,5 +77,3 @@ hi def link rtfBlue	rtfBlue
 let b:current_syntax = "rtf"
 
 " vim:ts=8
-
-endif
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index 8621075f6..4342b8969 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/ruby.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 
 " Vim syntax file
 " Language:		Ruby
@@ -602,5 +597,3 @@ unlet! s:cpo_sav
 delc SynFold
 
 " vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
-
-endif
diff --git a/syntax/rust.vim b/syntax/rust.vim
index 0c712813a..108dd3aac 100644
--- a/syntax/rust.vim
+++ b/syntax/rust.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/rust.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Vim syntax file
 " Language:     Rust
@@ -394,5 +389,3 @@ syn sync maxlines=500
 let b:current_syntax = "rust"
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/syntax/samba.vim b/syntax/samba.vim
index 0f6910b69..2fe964f72 100644
--- a/syntax/samba.vim
+++ b/syntax/samba.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/samba.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('samba', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'samba') == -1
 
 " Vim syntax file
 " Language:	samba configuration files (smb.conf)
@@ -125,5 +120,3 @@ hi def link sambaBoolean   Constant
 let b:current_syntax = "samba"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/sas.vim b/syntax/sas.vim
index 80490b6a1..f828bc568 100644
--- a/syntax/sas.vim
+++ b/syntax/sas.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sas.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sas', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sas') == -1
 
 " Vim syntax file
 " Language:     SAS
@@ -272,5 +267,3 @@ let b:current_syntax = "sas"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/sass.vim b/syntax/sass.vim
index 777a3b965..6f35d7a1f 100644
--- a/syntax/sass.vim
+++ b/syntax/sass.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sass.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sass', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sass') == -1
 
 " Vim syntax file
 " Language:	Sass
@@ -112,5 +107,3 @@ hi def link sassClass                   Type
 let b:current_syntax = "sass"
 
 " vim:set sw=2:
-
-endif
diff --git a/syntax/sather.vim b/syntax/sather.vim
index f610e92d7..0cde99c49 100644
--- a/syntax/sather.vim
+++ b/syntax/sather.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sather.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sather', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sather') == -1
 
 " Vim syntax file
 " Language:	Sather/pSather
@@ -99,5 +94,3 @@ hi def link satherExternal		PreCondit
 let b:current_syntax = "sather"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/sbt.vim b/syntax/sbt.vim
index 2a8d75fac..81d539a71 100644
--- a/syntax/sbt.vim
+++ b/syntax/sbt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sbt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sbt', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sbt') == -1
 
 " Vim syntax file
 " Language:    sbt
@@ -39,5 +34,3 @@ hi link sbtComment Comment
 hi link sbtLineComment Comment
 hi link sbtDocComment Comment
 
-
-endif
diff --git a/syntax/scala.vim b/syntax/scala.vim
index f6f2df9a4..fa97b867d 100644
--- a/syntax/scala.vim
+++ b/syntax/scala.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/scala.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 
 " Vim syntax file
 " Language:             Scala
@@ -238,5 +233,3 @@ if main_syntax ==# 'scala'
 endif
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif
diff --git a/syntax/scheme.vim b/syntax/scheme.vim
index ee9c1ea4e..b86a766e7 100644
--- a/syntax/scheme.vim
+++ b/syntax/scheme.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/scheme.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scheme', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scheme') == -1
 
 " Vim syntax file
 " Language: Scheme (R7RS)
@@ -471,5 +466,3 @@ unlet b:did_scheme_syntax
 let b:current_syntax = 'scheme'
 let &cpo = s:cpo
 unlet s:cpo
-
-endif
diff --git a/syntax/scilab.vim b/syntax/scilab.vim
index a551b8a29..b11d57acb 100644
--- a/syntax/scilab.vim
+++ b/syntax/scilab.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/scilab.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scilab', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scilab') == -1
 
 "
 " Vim syntax file
@@ -109,5 +104,3 @@ hi def link scilabOverload				Special
 let b:current_syntax = "scilab"
 
 "EOF	vim: ts=4 noet tw=100 sw=4 sts=0
-
-endif
diff --git a/syntax/screen.vim b/syntax/screen.vim
index 11da09e21..c4cd11ec0 100644
--- a/syntax/screen.vim
+++ b/syntax/screen.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/screen.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('screen', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'screen') == -1
 
 " Vim syntax file
 " Language:             screen(1) configuration file
@@ -267,5 +262,3 @@ let b:current_syntax = "screen"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/scss.vim b/syntax/scss.vim
index 03f311b73..a4a9e0a3e 100644
--- a/syntax/scss.vim
+++ b/syntax/scss.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/scss.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('scss', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
 
 " Vim syntax file
 " Language:    SCSS (Sassy CSS)
@@ -230,5 +225,3 @@ let b:current_syntax = "scss"
 if main_syntax == 'scss'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/sd.vim b/syntax/sd.vim
index ddc1c0ecc..5cd8917c3 100644
--- a/syntax/sd.vim
+++ b/syntax/sd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sd') == -1
 
 " Language: streaming descriptor file
 " Maintainer: Puria Nafisi Azizi (pna) <pna@netstudent.polito.it>
@@ -78,5 +73,3 @@ let b:current_syntax = "sd"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/sdc.vim b/syntax/sdc.vim
index 829954620..79314578c 100644
--- a/syntax/sdc.vim
+++ b/syntax/sdc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sdc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sdc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sdc') == -1
 
 " Vim syntax file
 " Language:     SDC - Synopsys Design Constraints
@@ -48,5 +43,3 @@ hi def link sdcFlags		Special
 let b:current_syntax = "sdc"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/sdl.vim b/syntax/sdl.vim
index c8a2b38e2..1551ccc56 100644
--- a/syntax/sdl.vim
+++ b/syntax/sdl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sdl') == -1
 
 " Vim syntax file
 " Language:	SDL
@@ -160,5 +155,3 @@ delcommand Hi
 let b:current_syntax = "sdl"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/sed.vim b/syntax/sed.vim
index 854c3229f..8d2349da8 100644
--- a/syntax/sed.vim
+++ b/syntax/sed.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sed.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sed', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sed') == -1
 
 " Vim syntax file
 " Language:	sed
@@ -117,5 +112,3 @@ unlet __sed_i __sed_last __sed_delimiter __sed_metacharacters
 let b:current_syntax = "sed"
 
 " vim: sts=4 sw=4 ts=8
-
-endif
diff --git a/syntax/sensors.vim b/syntax/sensors.vim
index ae08c54cf..c2411eed5 100644
--- a/syntax/sensors.vim
+++ b/syntax/sensors.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sensors.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sensors', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensors') == -1
 
 " Vim syntax file
 " Language:             sensors.conf(5) - libsensors configuration file
@@ -59,5 +54,3 @@ let b:current_syntax = "sensors"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/services.vim b/syntax/services.vim
index a70be9274..2b5b6f249 100644
--- a/syntax/services.vim
+++ b/syntax/services.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/services.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('services', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'services') == -1
 
 " Vim syntax file
 " Language:             services(5) - Internet network services list
@@ -61,5 +56,3 @@ let b:current_syntax = "services"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/setserial.vim b/syntax/setserial.vim
index 271886997..ac7f9d70f 100644
--- a/syntax/setserial.vim
+++ b/syntax/setserial.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/setserial.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('setserial', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'setserial') == -1
 
 " Vim syntax file
 " Language:             setserial(8) configuration file
@@ -127,5 +122,3 @@ let b:current_syntax = "setserial"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/sexplib.vim b/syntax/sexplib.vim
index 65ae8b2bc..2e3382036 100644
--- a/syntax/sexplib.vim
+++ b/syntax/sexplib.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sexplib.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 
 " Vim syntax file
 " Language:     S-expressions as used in Sexplib
@@ -95,5 +90,3 @@ endif
 let b:current_syntax = "sexplib"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/sh.vim b/syntax/sh.vim
index f7f49184d..fc5810af9 100644
--- a/syntax/sh.vim
+++ b/syntax/sh.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sh.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sh', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sh') == -1
 
 " Shebang
 syn match shShebang "^#!.*$" containedin=shComment
@@ -63,5 +58,3 @@ hi def link shSemicolon Delimiter
 hi def link shShebang PreProc
 hi def link zshDelim Delimiter
 hi def link zshFlag Special
-
-endif
diff --git a/syntax/sieve.vim b/syntax/sieve.vim
index 1bf06c868..1374df78a 100644
--- a/syntax/sieve.vim
+++ b/syntax/sieve.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sieve.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sieve', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sieve') == -1
 
 " Vim syntax file
 " Language:             Sieve filtering language input file
@@ -62,5 +57,3 @@ let b:current_syntax = "sieve"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/sil.vim b/syntax/sil.vim
index 8f49c690f..06bcda913 100644
--- a/syntax/sil.vim
+++ b/syntax/sil.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sil.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sil', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sil') == -1
 
 " This source file is part of the Swift.org open source project
 "
@@ -185,5 +180,3 @@ let b:current_syntax = "sil"
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
-
-endif
diff --git a/syntax/simula.vim b/syntax/simula.vim
index 95579e3b7..f9fb68e7d 100644
--- a/syntax/simula.vim
+++ b/syntax/simula.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/simula.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('simula', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'simula') == -1
 
 " Vim syntax file
 " Language:	Simula
@@ -94,5 +89,3 @@ hi def link simulaType			Type
 
 let b:current_syntax = "simula"
 " vim: sts=4 sw=4 ts=8
-
-endif
diff --git a/syntax/sinda.vim b/syntax/sinda.vim
index 6f257bbd2..7d2a6cadf 100644
--- a/syntax/sinda.vim
+++ b/syntax/sinda.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sinda.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sinda', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sinda') == -1
 
 " Vim syntax file
 " Language:     sinda85, sinda/fluint input file
@@ -136,5 +131,3 @@ hi def link sindaTodo		Todo
 let b:current_syntax = "sinda"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/sisu.vim b/syntax/sisu.vim
index 7d5bedbac..a2aeeb3cd 100644
--- a/syntax/sisu.vim
+++ b/syntax/sisu.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sisu.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sisu', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sisu') == -1
 
 " SiSU Vim syntax file
 " SiSU Maintainer: Ralph Amissah <ralph.amissah@gmail.com>
@@ -282,5 +277,3 @@ hi def link sisu_error                 Error
 let b:current_syntax = "sisu"
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/skill.vim b/syntax/skill.vim
index 61f1a2e91..5304a8dd4 100644
--- a/syntax/skill.vim
+++ b/syntax/skill.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/skill.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('skill', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'skill') == -1
 
 " Vim syntax file
 " Language:		SKILL
@@ -556,5 +551,3 @@ hi def link skillCommentError	Error
 let b:current_syntax = "skill"
 
 " vim: ts=4
-
-endif
diff --git a/syntax/slang.vim b/syntax/slang.vim
index b92ac736d..49e436357 100644
--- a/syntax/slang.vim
+++ b/syntax/slang.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/slang.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slang', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slang') == -1
 
 " Vim syntax file
 " Language:	S-Lang
@@ -96,5 +91,3 @@ hi def link slangDelim		Delimiter
 let b:current_syntax = "slang"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/slice.vim b/syntax/slice.vim
index d9b16e64f..a22648198 100644
--- a/syntax/slice.vim
+++ b/syntax/slice.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/slice.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slice', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slice') == -1
 
 " Vim syntax file
 " Language:	Slice (ZeroC's Specification Language for Ice)
@@ -85,5 +80,3 @@ hi def link sliceNumberError Special
 let b:current_syntax = "slice"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/slim.vim b/syntax/slim.vim
index 4d6ee3d6c..de32f92fb 100644
--- a/syntax/slim.vim
+++ b/syntax/slim.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/slim.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slim', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slim') == -1
 
 " Vim syntax file
 " Language: Slim
@@ -118,5 +113,3 @@ hi def link slimInlineTagChar             Delimiter
 hi def link slimFilter                    PreProc
 
 let b:current_syntax = "slim"
-
-endif
diff --git a/syntax/slime.vim b/syntax/slime.vim
index 4420e95a1..e00fd5493 100644
--- a/syntax/slime.vim
+++ b/syntax/slime.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/slime.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slime', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slime') == -1
 
 " Vim syntax file
 " Language: slime
@@ -109,5 +104,3 @@ hi def link slimeWrappedAttrsDelimiter     Delimiter
 hi def link slimeInlineTagChar             Delimiter
 
 let b:current_syntax = "slime"
-
-endif
diff --git a/syntax/slpconf.vim b/syntax/slpconf.vim
index 93c081f50..20c4f639c 100644
--- a/syntax/slpconf.vim
+++ b/syntax/slpconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/slpconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slpconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpconf') == -1
 
 " Vim syntax file
 " Language:             RFC 2614 - An API for Service Location configuration file
@@ -280,5 +275,3 @@ let b:current_syntax = "slpconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/slpreg.vim b/syntax/slpreg.vim
index 5aa34439e..0c7f07a98 100644
--- a/syntax/slpreg.vim
+++ b/syntax/slpreg.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/slpreg.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slpreg', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpreg') == -1
 
 " Vim syntax file
 " Language:             RFC 2614 - An API for Service Location registration file
@@ -129,5 +124,3 @@ let b:current_syntax = "slpreg"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/slpspi.vim b/syntax/slpspi.vim
index 93607f486..83034fece 100644
--- a/syntax/slpspi.vim
+++ b/syntax/slpspi.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/slpspi.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slpspi', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slpspi') == -1
 
 " Vim syntax file
 " Language:             RFC 2614 - An API for Service Location SPI file
@@ -46,5 +41,3 @@ let b:current_syntax = "slpspi"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/slrnrc.vim b/syntax/slrnrc.vim
index f609aff80..1683be97b 100644
--- a/syntax/slrnrc.vim
+++ b/syntax/slrnrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/slrnrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slrnrc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slrnrc') == -1
 
 " Vim syntax file
 " Language:	Slrn setup file (based on slrn 0.9.8.1)
@@ -188,5 +183,3 @@ hi def link slrnrcUnsetkey		slrnrcSetkey
 let b:current_syntax = "slrnrc"
 
 "EOF	vim: ts=8 noet tw=120 sw=8 sts=0
-
-endif
diff --git a/syntax/slrnsc.vim b/syntax/slrnsc.vim
index fdc527e8b..6cc627197 100644
--- a/syntax/slrnsc.vim
+++ b/syntax/slrnsc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/slrnsc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('slrnsc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'slrnsc') == -1
 
 " Vim syntax file
 " Language:	Slrn score file (based on slrn 0.9.8.0)
@@ -75,5 +70,3 @@ hi def link slrnscInclude		Keyword
 let b:current_syntax = "slrnsc"
 
 "EOF	vim: ts=8 noet tw=200 sw=8 sts=0
-
-endif
diff --git a/syntax/sm.vim b/syntax/sm.vim
index 7187d484e..a4b7379f8 100644
--- a/syntax/sm.vim
+++ b/syntax/sm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sm') == -1
 
 " Vim syntax file
 " Language:	sendmail
@@ -87,5 +82,3 @@ hi def link smVar		String
 let b:current_syntax = "sm"
 
 " vim: ts=18
-
-endif
diff --git a/syntax/smarty.vim b/syntax/smarty.vim
index b6c245a33..30d82d063 100644
--- a/syntax/smarty.vim
+++ b/syntax/smarty.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/smarty.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('smarty', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smarty') == -1
 
 " Vim syntax file
 " Language:	Smarty Templates
@@ -83,5 +78,3 @@ if main_syntax == 'smarty'
 endif
 
 " vim: ts=8
-
-endif
diff --git a/syntax/smcl.vim b/syntax/smcl.vim
index 6c83bb89f..50b657d43 100644
--- a/syntax/smcl.vim
+++ b/syntax/smcl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/smcl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('smcl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smcl') == -1
 
 " smcl.vim -- Vim syntax file for smcl files.
 " Language:	SMCL -- Stata Markup and Control Language
@@ -314,5 +309,3 @@ hi def link smclString		String
 let b:current_syntax = "smcl"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/smhl.vim b/syntax/smhl.vim
index 3dbbd9d3d..7ab328a5a 100644
--- a/syntax/smhl.vim
+++ b/syntax/smhl.vim
@@ -1,13 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/smhl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax cluster _semantic contains=_semantic1,_semantic2,_semantic3,_semantic4,_semantic5,_semantic6,_semantic7,_semantic8,_semantic9,_semantic10,_semantic11,_semantic12,_semantic13,_semantic14,_semantic15,_semantic16,_semantic17,_semantic18,_semantic19,_semantic20,_semantic21,_semantic22,_semantic23,_semantic24,_semantic25
 
-
-endif
diff --git a/syntax/smith.vim b/syntax/smith.vim
index 09a7aa879..4dd4e5134 100644
--- a/syntax/smith.vim
+++ b/syntax/smith.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/smith.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('smith', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smith') == -1
 
 " Vim syntax file
 " Language:	SMITH
@@ -46,5 +41,3 @@ hi def link smithNumber	Number
 let b:current_syntax = "smith"
 
 " vim: ts=2
-
-endif
diff --git a/syntax/sml.vim b/syntax/sml.vim
index 7e74d1689..5788d7580 100644
--- a/syntax/sml.vim
+++ b/syntax/sml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sml') == -1
 
 " Vim syntax file
 " Language:     SML
@@ -224,5 +219,3 @@ hi def link smlEncl	 Keyword
 let b:current_syntax = "sml"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/smt2.vim b/syntax/smt2.vim
index adae886d3..b70c95f4d 100644
--- a/syntax/smt2.vim
+++ b/syntax/smt2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/smt2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('smt2', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smt2') == -1
 
 " Vim syntax file
 " " Language:     SMT-LIB2 with Z3's extensions
@@ -182,5 +177,3 @@ highlight def link smt2Binary      Number
 highlight def link smt2Int         Number
 highlight def link smt2Delimiter   Delimiter
 highlight def link smt2Error       Error
-
-endif
diff --git a/syntax/snobol4.vim b/syntax/snobol4.vim
index b24798a05..d100fb4a6 100644
--- a/syntax/snobol4.vim
+++ b/syntax/snobol4.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/snobol4.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('snobol4', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'snobol4') == -1
 
 " Vim syntax file
 " Language:     SNOBOL4
@@ -120,5 +115,3 @@ endif
 
 let b:current_syntax = "snobol4"
 " vim: ts=8
-
-endif
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index 90f48dac7..3bde3b8ae 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/solidity.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('solidity', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
 
 " Vim syntax file
 " Language:     Solidity
@@ -155,5 +150,3 @@ syn region  solComment           start="/\*"  end="\*/" contains=solCommentTodo,
 hi def link solCommentTodo       Comment
 hi def link solLineComment       Comment
 hi def link solComment           Comment
-
-endif
diff --git a/syntax/spec.vim b/syntax/spec.vim
index 4dee097d5..3a6772da1 100644
--- a/syntax/spec.vim
+++ b/syntax/spec.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/spec.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('spec', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spec') == -1
 
 " Filename:    spec.vim
 " Purpose:     Vim syntax file
@@ -233,5 +228,3 @@ hi def link specListedFilesShare		Statement
 let b:current_syntax = "spec"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/spice.vim b/syntax/spice.vim
index 92ebb5f9e..becd3de9c 100644
--- a/syntax/spice.vim
+++ b/syntax/spice.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/spice.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('spice', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spice') == -1
 
 " Vim syntax file
 " Language:	Spice circuit simulator input netlist
@@ -82,5 +77,3 @@ let b:current_syntax = "spice"
 "   so <sfile>:p:h/spice.vim
 
 " vim: ts=8
-
-endif
diff --git a/syntax/spup.vim b/syntax/spup.vim
index 51c4bb533..b4f16b2f5 100644
--- a/syntax/spup.vim
+++ b/syntax/spup.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/spup.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('spup', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spup') == -1
 
 " Vim syntax file
 " Language:     Speedup, plant simulator from AspenTech
@@ -276,5 +271,3 @@ let b:current_syntax = "spup"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim:ts=8
-
-endif
diff --git a/syntax/spyce.vim b/syntax/spyce.vim
index e2a1a3d75..f5f5e0929 100644
--- a/syntax/spyce.vim
+++ b/syntax/spyce.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/spyce.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('spyce', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'spyce') == -1
 
 " Vim syntax file
 " Language:	   SPYCE
@@ -111,5 +106,3 @@ if main_syntax == 'spyce'
   unlet main_syntax
 endif
 
-
-endif
diff --git a/syntax/sql.vim b/syntax/sql.vim
index 46fc5d67f..6ec02f7fa 100644
--- a/syntax/sql.vim
+++ b/syntax/sql.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sql.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
 
 " Vim syntax file loader
 " Language:    SQL
@@ -43,5 +38,3 @@ endif
 exec 'runtime syntax/'.filename.'.vim'
 
 " vim:sw=4:
-
-endif
diff --git a/syntax/sqlj.vim b/syntax/sqlj.vim
index f2623dc46..bf3c0b744 100644
--- a/syntax/sqlj.vim
+++ b/syntax/sqlj.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sqlj.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sqlj', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sqlj') == -1
 
 " Vim syntax file
 " Language:	sqlj
@@ -98,5 +93,3 @@ hi def link sqljPre	PreProc
 
 let b:current_syntax = "sqlj"
 
-
-endif
diff --git a/syntax/sqloracle.vim b/syntax/sqloracle.vim
index 7eacd6e62..f1fd838fb 100644
--- a/syntax/sqloracle.vim
+++ b/syntax/sqloracle.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sqloracle.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sql', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sql') == -1
 
 " Vim syntax file
 " Language:	SQL, PL/SQL (Oracle 11g)
@@ -157,5 +152,3 @@ hi def link sqlTodo		Todo
 
 let b:current_syntax = "sql"
 " vim: ts=8
-
-endif
diff --git a/syntax/sqr.vim b/syntax/sqr.vim
index 4524dea46..2ac1dbfb7 100644
--- a/syntax/sqr.vim
+++ b/syntax/sqr.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sqr.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sqr', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sqr') == -1
 
 " Vim syntax file
 "    Language: Structured Query Report Writer (SQR)
@@ -269,5 +264,3 @@ hi def link sqrError Error
 let b:current_syntax = "sqr"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/squid.vim b/syntax/squid.vim
index d9c620159..f95957ba8 100644
--- a/syntax/squid.vim
+++ b/syntax/squid.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/squid.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('squid', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'squid') == -1
 
 " Vim syntax file
 " Language:	Squid config file
@@ -147,5 +142,3 @@ hi def link squidRegexOpt	Special
 let b:current_syntax = "squid"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/srec.vim b/syntax/srec.vim
index 9c2b4ce33..20e2604d3 100644
--- a/syntax/srec.vim
+++ b/syntax/srec.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/srec.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('srec', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'srec') == -1
 
 " Vim syntax file
 " Language:	Motorola S-Record
@@ -90,5 +85,3 @@ hi def link srecChecksum            DiffChange
 let b:current_syntax = "srec"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/sshconfig.vim b/syntax/sshconfig.vim
index 5b6346f3a..bebb7bb67 100644
--- a/syntax/sshconfig.vim
+++ b/syntax/sshconfig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sshconfig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sshconfig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshconfig') == -1
 
 " Vim syntax file
 " Language:	OpenSSH client configuration file (ssh_config)
@@ -284,5 +279,3 @@ hi def link sshconfigDeprecated     Error
 let b:current_syntax = "sshconfig"
 
 " vim:set ts=8 sw=2 sts=2:
-
-endif
diff --git a/syntax/sshdconfig.vim b/syntax/sshdconfig.vim
index 1c6b6db53..ef25dab01 100644
--- a/syntax/sshdconfig.vim
+++ b/syntax/sshdconfig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sshdconfig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sshdconfig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sshdconfig') == -1
 
 " Vim syntax file
 " Language:	OpenSSH server configuration file (sshd_config)
@@ -289,5 +284,3 @@ hi def link sshdconfigMatch                Type
 let b:current_syntax = "sshdconfig"
 
 " vim:set ts=8 sw=2 sts=2:
-
-endif
diff --git a/syntax/st.vim b/syntax/st.vim
index 1b46c7b67..865af7d46 100644
--- a/syntax/st.vim
+++ b/syntax/st.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/st.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('st', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'st') == -1
 
 " Vim syntax file
 " Language:	Smalltalk
@@ -102,5 +97,3 @@ let b:current_syntax = "st"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/stata.vim b/syntax/stata.vim
index be04f59c5..27c7afcd8 100644
--- a/syntax/stata.vim
+++ b/syntax/stata.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/stata.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('stata', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stata') == -1
 
 " stata.vim -- Vim syntax file for Stata do, ado, and class files.
 " Language:	Stata and/or Mata
@@ -457,5 +452,3 @@ hi def link stataString		String
 let b:current_syntax = "stata"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/stp.vim b/syntax/stp.vim
index bab05d2de..f43740b9e 100644
--- a/syntax/stp.vim
+++ b/syntax/stp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/stp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('stp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stp') == -1
 
 " Vim syntax file
 "    Language: Stored Procedures (STP)
@@ -161,5 +156,3 @@ hi def link stpRepeat Repeat
 let b:current_syntax = "stp"
 
 " vim ts=8 sw=2
-
-endif
diff --git a/syntax/stylus.vim b/syntax/stylus.vim
index a77c9fa18..bf8269210 100644
--- a/syntax/stylus.vim
+++ b/syntax/stylus.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/stylus.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('stylus', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'stylus') == -1
 
 " Vim syntax file
 " Language:	CSS3
@@ -383,5 +378,3 @@ hi def link stylusIdChar                Special
 let b:current_syntax = "stylus"
 
 " vim:set sw=2:
-
-endif
diff --git a/syntax/sudoers.vim b/syntax/sudoers.vim
index aa16986f5..053dc1f9c 100644
--- a/syntax/sudoers.vim
+++ b/syntax/sudoers.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sudoers.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sudoers', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sudoers') == -1
 
 " Vim syntax file
 " Language:             sudoers(5) configuration files
@@ -396,5 +391,3 @@ let b:current_syntax = "sudoers"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index c452182fe..d50f16c1f 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/svelte.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('svelte', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svelte') == -1
 
 " Vim syntax file
 " Language:   Svelte 3 (HTML/JavaScript)
@@ -127,5 +122,3 @@ let b:current_syntax = "svelte"
 
 " Sync from start because of the wacky nesting.
 syntax sync fromstart
-
-endif
diff --git a/syntax/svg.vim b/syntax/svg.vim
index 166e3e294..17302f792 100644
--- a/syntax/svg.vim
+++ b/syntax/svg.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/svg.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('svg', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svg') == -1
 
 " Vim syntax file
 " Language:	SVG
@@ -152,5 +147,3 @@ if main_syntax == 'svg'
 endif
 
 " vim: ts=8
-
-endif
diff --git a/syntax/svn.vim b/syntax/svn.vim
index 33340ea98..29c3b99e9 100644
--- a/syntax/svn.vim
+++ b/syntax/svn.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/svn.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('svn', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'svn') == -1
 
 " Vim syntax file
 " Language:     Subversion (svn) commit file
@@ -63,5 +58,3 @@ hi def link svnRenamed     Special
 
 
 let b:current_syntax = "svn"
-
-endif
diff --git a/syntax/swift.vim b/syntax/swift.vim
index b4207bb05..b4fa59e99 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/swift.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('swift', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swift') == -1
 
 " File: swift.vim
 " Author: Keith Smiley
@@ -312,5 +307,3 @@ highlight default link swiftLineDirective PreProc
 syn sync minlines=100
 
 let b:current_syntax = "swift"
-
-endif
diff --git a/syntax/swiftgyb.vim b/syntax/swiftgyb.vim
index 39cad20da..f647c6760 100644
--- a/syntax/swiftgyb.vim
+++ b/syntax/swiftgyb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/swiftgyb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('swiftgyb', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'swiftgyb') == -1
 
 " This source file is part of the Swift.org open source project
 "
@@ -31,5 +26,3 @@ hi def link gybPythonCode CursorLineNr
 
 let b:current_syntax = "swiftgyb"
 
-
-endif
diff --git a/syntax/sxhkdrc.vim b/syntax/sxhkdrc.vim
index cabfe4980..f0c28fada 100644
--- a/syntax/sxhkdrc.vim
+++ b/syntax/sxhkdrc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sxhkdrc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sxhkd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sxhkd') == -1
 
 if exists("b:current_syntax")
     finish
@@ -33,5 +28,3 @@ hi def link sxHotkeySep Delimiter
 hi def link sxSequenceSep Delimiter
 
 let b:current_syntax = "sxhkdrc"
-
-endif
diff --git a/syntax/sysctl.vim b/syntax/sysctl.vim
index 6e611f06a..cd2e288a2 100644
--- a/syntax/sysctl.vim
+++ b/syntax/sysctl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/sysctl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sysctl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sysctl') == -1
 
 " Vim syntax file
 " Language:             sysctl.conf(5) configuration file
@@ -46,5 +41,3 @@ let b:current_syntax = "sysctl"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/systemd.vim b/syntax/systemd.vim
index eccf6c8f1..035580e3a 100644
--- a/syntax/systemd.vim
+++ b/syntax/systemd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/systemd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('systemd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemd') == -1
 
 " Filename:     systemd.vim
 " Purpose:      Vim syntax file
@@ -391,5 +386,3 @@ hi def link sdCapFlags          Identifier
 
 let b:current_syntax = "systemd"
 " vim: fdm=marker
-
-endif
diff --git a/syntax/systemverilog.vim b/syntax/systemverilog.vim
index dc27e532e..8e79ae47d 100644
--- a/syntax/systemverilog.vim
+++ b/syntax/systemverilog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/systemverilog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('systemverilog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'systemverilog') == -1
 
 " Vim syntax file
 " Language:    SystemVerilog
@@ -92,5 +87,3 @@ hi def link systemverilogNumber          Number
 let b:current_syntax = "systemverilog"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/tablegen.vim b/syntax/tablegen.vim
index 4cd21e325..6fda1acf1 100644
--- a/syntax/tablegen.vim
+++ b/syntax/tablegen.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tablegen.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 
 " Vim syntax file
 " Language:   TableGen
@@ -61,5 +56,3 @@ if version >= 508 || !exists("did_c_syn_inits")
 endif
 
 let b:current_syntax = "tablegen"
-
-endif
diff --git a/syntax/tads.vim b/syntax/tads.vim
index c38d4b570..68e35de88 100644
--- a/syntax/tads.vim
+++ b/syntax/tads.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tads.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tads', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tads') == -1
 
 " Vim syntax file
 " Language:	TADS
@@ -178,5 +173,3 @@ let b:current_syntax = "tads"
 " 10/22/99 Misspelled Moolenaar (sorry!), c_minlines to tads_minlines
 "
 " vim: ts=8
-
-endif
diff --git a/syntax/tags.vim b/syntax/tags.vim
index eb121a78f..e609bc4bd 100644
--- a/syntax/tags.vim
+++ b/syntax/tags.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tags.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tags', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tags') == -1
 
 " Language:		tags
 " Maintainer:	Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
@@ -38,5 +33,3 @@ if !exists("skip_drchip_tags_inits")
 endif
 
 let b:current_syntax = "tags"
-
-endif
diff --git a/syntax/tak.vim b/syntax/tak.vim
index 00b76ccb4..1c1d259b1 100644
--- a/syntax/tak.vim
+++ b/syntax/tak.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tak.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tak', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tak') == -1
 
 " Vim syntax file
 " Language:     TAK2, TAK3, TAK2000 thermal modeling input file
@@ -126,5 +121,3 @@ hi def link takTodo		Todo
 let b:current_syntax = "tak"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/tap.vim b/syntax/tap.vim
index d38b960b5..404b4370e 100644
--- a/syntax/tap.vim
+++ b/syntax/tap.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tap.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim syntax file
 " Language:    Verbose TAP Output
@@ -104,5 +99,3 @@ if !exists("did_tapverboseoutput_syntax_inits")
 endif
 
 let b:current_syntax="tapVerboseOutput"
-
-endif
diff --git a/syntax/taskdata.vim b/syntax/taskdata.vim
index ca3165f98..30a0e0138 100644
--- a/syntax/taskdata.vim
+++ b/syntax/taskdata.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/taskdata.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('taskdata', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'taskdata') == -1
 
 " Vim syntax file
 " Language:	task data
@@ -52,5 +47,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:noexpandtab
-
-endif
diff --git a/syntax/taskedit.vim b/syntax/taskedit.vim
index 736805f64..547464389 100644
--- a/syntax/taskedit.vim
+++ b/syntax/taskedit.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/taskedit.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('taskedit', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'taskedit') == -1
 
 " Vim syntax file
 " Language:	support for 'task 42 edit'
@@ -44,5 +39,3 @@ let &cpo = s:keepcpo
 unlet s:keepcpo
 
 " vim:noexpandtab
-
-endif
diff --git a/syntax/tcl.vim b/syntax/tcl.vim
index 76bd5eb89..2066a1f9b 100644
--- a/syntax/tcl.vim
+++ b/syntax/tcl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tcl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tcl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tcl') == -1
 
 " Vim syntax file
 " Language:	Tcl/Tk
@@ -281,5 +276,3 @@ hi def link tclVarRef		Identifier
 let b:current_syntax = "tcl"
 
 " vim: ts=8 noet nolist
-
-endif
diff --git a/syntax/template.vim b/syntax/template.vim
index 477c8e047..02c7fd7dd 100644
--- a/syntax/template.vim
+++ b/syntax/template.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/template.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('template', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'template') == -1
 
 " Vim syntax file
 " Language:	Generic template
@@ -22,5 +17,3 @@ endif
 " If you know how to recognize a more specific type for *.tmpl suggest a
 " change to runtime/scripts.vim.
 runtime! syntax/html.vim
-
-endif
diff --git a/syntax/teraterm.vim b/syntax/teraterm.vim
index 44d66ef60..195e933e9 100644
--- a/syntax/teraterm.vim
+++ b/syntax/teraterm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/teraterm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('teraterm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'teraterm') == -1
 
 " Vim syntax file
 " Language:	Tera Term Language (TTL)
@@ -147,5 +142,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim: ts=8 sw=2 sts=2
-
-endif
diff --git a/syntax/terminfo.vim b/syntax/terminfo.vim
index 1933c7341..fe90c4b08 100644
--- a/syntax/terminfo.vim
+++ b/syntax/terminfo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/terminfo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('terminfo', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terminfo') == -1
 
 " Vim syntax file
 " Language:             terminfo(5) definition
@@ -100,5 +95,3 @@ let b:current_syntax = "terminfo"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/terraform.vim b/syntax/terraform.vim
index e071ce8dd..2c533caa3 100644
--- a/syntax/terraform.vim
+++ b/syntax/terraform.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/terraform.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('terraform', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
 
 " Forked from Larry Gilbert's syntax file
 " github.com/L2G/vim-syntax-terraform
@@ -78,5 +73,3 @@ let b:current_syntax = 'terraform'
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/tex.vim b/syntax/tex.vim
index 45d763cb9..a1ecf32fd 100644
--- a/syntax/tex.vim
+++ b/syntax/tex.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tex.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tex', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tex') == -1
 
 " Vim syntax file
 " Language:	TeX
@@ -1347,5 +1342,3 @@ let   b:current_syntax = "tex"
 let &cpo               = s:keepcpo
 unlet s:keepcpo
 " vim: ts=8 fdm=marker
-
-endif
diff --git a/syntax/texinfo.vim b/syntax/texinfo.vim
index f76c9b60c..d863d6fe4 100644
--- a/syntax/texinfo.vim
+++ b/syntax/texinfo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/texinfo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('texinfo', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'texinfo') == -1
 
 " Vim syntax file
 " Language:	Texinfo (macro package for TeX)
@@ -403,5 +398,3 @@ if main_syntax == 'texinfo'
 endif
 
 " vim: ts=8
-
-endif
diff --git a/syntax/texmf.vim b/syntax/texmf.vim
index ae1cbe36f..48445470e 100644
--- a/syntax/texmf.vim
+++ b/syntax/texmf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/texmf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('texmf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'texmf') == -1
 
 " Vim syntax file
 " This is a GENERATED FILE. Please always refer to source file at the URI below.
@@ -81,5 +76,3 @@ hi def link texmfError Error
 
 
 let b:current_syntax = "texmf"
-
-endif
diff --git a/syntax/textile.vim b/syntax/textile.vim
index 65a1953b9..6c056026a 100644
--- a/syntax/textile.vim
+++ b/syntax/textile.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/textile.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('textile', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'textile') == -1
 
 "
 "   You will have to restart vim for this to take effect.  In any case
@@ -98,5 +93,3 @@ if version >= 508 || !exists("did_txt_syn_inits")
 endif
 
 " vim: set ai et sw=4 :
-
-endif
diff --git a/syntax/tf.vim b/syntax/tf.vim
index b12663cbd..d69fdf6d5 100644
--- a/syntax/tf.vim
+++ b/syntax/tf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tf') == -1
 
 " Vim syntax file
 " Language:	tf
@@ -203,5 +198,3 @@ if main_syntax == 'tf'
 endif
 
 " vim: ts=8
-
-endif
diff --git a/syntax/thrift.vim b/syntax/thrift.vim
index da97a7158..c842878f4 100644
--- a/syntax/thrift.vim
+++ b/syntax/thrift.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/thrift.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('thrift', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'thrift') == -1
 
 " Vim syntax file
 " Language: Thrift
@@ -104,5 +99,3 @@ endif
 
 let b:current_syntax = "thrift"
 
-
-endif
diff --git a/syntax/tidy.vim b/syntax/tidy.vim
index 4ba65155b..a10aeb94c 100644
--- a/syntax/tidy.vim
+++ b/syntax/tidy.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tidy.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tidy', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tidy') == -1
 
 " Vim syntax file
 " Language:	HMTL Tidy configuration file (/etc/tidyrc ~/.tidyrc)
@@ -142,5 +137,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/tilde.vim b/syntax/tilde.vim
index 11012e954..8a25493bc 100644
--- a/syntax/tilde.vim
+++ b/syntax/tilde.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tilde.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tilde', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tilde') == -1
 
 " Vim syntax file
 " This file works only for Vim6.x
@@ -48,5 +43,3 @@ hi def link	tildeSymtab	Identifier
 hi def link	tildeError	Error
 
 let b:current_syntax = "tilde"
-
-endif
diff --git a/syntax/tli.vim b/syntax/tli.vim
index c177878af..e5ce202d5 100644
--- a/syntax/tli.vim
+++ b/syntax/tli.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tli.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tli', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tli') == -1
 
 " Vim syntax file
 " Language:	TealInfo source files (*.tli)
@@ -65,5 +60,3 @@ hi def link tliStyle      PreProc
 let b:current_syntax = "tli"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index 9d72c5f77..fbd7099da 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tmux.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tmux', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tmux') == -1
 
 " Language: tmux(1) configuration file
 " Version: 3.1b (git-769ae106)
@@ -126,5 +121,3 @@ syn keyword tmuxCommands
 
 let &cpo = s:original_cpo
 unlet! s:original_cpo s:bg s:i
-
-endif
diff --git a/syntax/toml.vim b/syntax/toml.vim
index 49d1141ae..5428296f0 100644
--- a/syntax/toml.vim
+++ b/syntax/toml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/toml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('toml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'toml') == -1
 
 " Language:   TOML
 " Maintainer: Caleb Spare <cespare@gmail.com>
@@ -83,5 +78,3 @@ hi def link tomlComment Comment
 syn sync minlines=500
 
 let b:current_syntax = 'toml'
-
-endif
diff --git a/syntax/tpp.vim b/syntax/tpp.vim
index c728e23df..f0dc9902c 100644
--- a/syntax/tpp.vim
+++ b/syntax/tpp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tpp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tpp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tpp') == -1
 
 " Vim syntax file
 " Language: tpp - Text Presentation Program
@@ -90,5 +85,3 @@ hi def link tppTimeOption			Error
 let b:current_syntax = 'tpp'
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/tptp.vim b/syntax/tptp.vim
index 81164ff58..089c37df4 100644
--- a/syntax/tptp.vim
+++ b/syntax/tptp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tptp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tptp', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tptp') == -1
 
 " Vim syntax file
 " Language:		TPTP
@@ -155,5 +150,3 @@ end
 let b:current_syntax = "tptp"
 
 " vim: ts=8 sw=8
-
-endif
diff --git a/syntax/trasys.vim b/syntax/trasys.vim
index 23ce05874..ae48e83b4 100644
--- a/syntax/trasys.vim
+++ b/syntax/trasys.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/trasys.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('trasys', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'trasys') == -1
 
 " Vim syntax file
 " Language:     TRASYS input file
@@ -167,5 +162,3 @@ hi def link trasysTodo		Todo
 let b:current_syntax = "trasys"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/treetop.vim b/syntax/treetop.vim
index b7dea5630..aceec282d 100644
--- a/syntax/treetop.vim
+++ b/syntax/treetop.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/treetop.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('treetop', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'treetop') == -1
 
 " Vim syntax file
 " Language:             Treetop
@@ -117,5 +112,3 @@ let b:current_syntax = 'treetop'
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/trustees.vim b/syntax/trustees.vim
index f75142820..1e4826b1e 100644
--- a/syntax/trustees.vim
+++ b/syntax/trustees.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/trustees.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('trustees', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'trustees') == -1
 
 " Vim syntax file
 " Language:     trustees
@@ -49,5 +44,3 @@ syntax match tfsRuleWho ~\(\*\|[+]\{0,1\}[a-zA-Z0-9/]\+\)~ contained contains=tf
 highlight link tfsRuleWho Identifier
 syntax match tfsRuleWhat ~[RWEBXODCU!]\+~ contained contains=tfsSpecialChar
 highlight link tfsRuleWhat Structure
-
-endif
diff --git a/syntax/tsalt.vim b/syntax/tsalt.vim
index b7fed635a..62a0cc3b2 100644
--- a/syntax/tsalt.vim
+++ b/syntax/tsalt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tsalt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tsalt', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tsalt') == -1
 
 " Vim syntax file
 " Language:	Telix (Modem Comm Program) SALT Script
@@ -213,5 +208,3 @@ let b:current_syntax = "tsalt"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8
-
-endif
diff --git a/syntax/tsscl.vim b/syntax/tsscl.vim
index 33079116a..37a166dca 100644
--- a/syntax/tsscl.vim
+++ b/syntax/tsscl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tsscl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tsscl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tsscl') == -1
 
 " Vim syntax file
 " Language:     TSS (Thermal Synthesizer System) Command Line
@@ -211,5 +206,3 @@ hi def link tssclScientific	Number
 let b:current_syntax = "tsscl"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/tssgm.vim b/syntax/tssgm.vim
index 69b109215..1d11bfdc5 100644
--- a/syntax/tssgm.vim
+++ b/syntax/tssgm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tssgm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tssgm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tssgm') == -1
 
 " Vim syntax file
 " Language:     TSS (Thermal Synthesizer System) Geometry
@@ -105,5 +100,3 @@ hi def link tssgmScientific	Float
 let b:current_syntax = "tssgm"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/tssop.vim b/syntax/tssop.vim
index 771c41819..7ad292447 100644
--- a/syntax/tssop.vim
+++ b/syntax/tssop.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tssop.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('tssop', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tssop') == -1
 
 " Vim syntax file
 " Language:     TSS (Thermal Synthesizer System) Optics
@@ -81,5 +76,3 @@ hi def link tssopScientific	Float
 let b:current_syntax = "tssop"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/tt2.vim b/syntax/tt2.vim
index 5806a9890..c5a0dcda4 100644
--- a/syntax/tt2.vim
+++ b/syntax/tt2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tt2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Language:      TT2 (Perl Template Toolkit)
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -217,5 +212,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:ts=4:sw=4
-
-endif
diff --git a/syntax/tt2html.vim b/syntax/tt2html.vim
index bc614e00c..28c2478ee 100644
--- a/syntax/tt2html.vim
+++ b/syntax/tt2html.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tt2html.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Language:      TT2 embedded with HTML
 " Maintainer:    vim-perl <vim-perl@googlegroups.com>
@@ -27,5 +22,3 @@ unlet b:current_syntax
 syn cluster htmlPreProc add=@tt2_top_cluster
 
 let b:current_syntax = "tt2html"
-
-endif
diff --git a/syntax/tt2js.vim b/syntax/tt2js.vim
index 430556127..d85d72d86 100644
--- a/syntax/tt2js.vim
+++ b/syntax/tt2js.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/tt2js.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Language:      TT2 embedded with Javascript
 " Maintainer:    Andy Lester <andy@petdance.com>
@@ -27,5 +22,3 @@ unlet b:current_syntax
 syn cluster javascriptPreProc add=@tt2_top_cluster
 
 let b:current_syntax = "tt2js"
-
-endif
diff --git a/syntax/twig.vim b/syntax/twig.vim
index 797680662..13b44f114 100644
--- a/syntax/twig.vim
+++ b/syntax/twig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/twig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('twig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
 
 " Vim syntax file
 " Language:	Twig template
@@ -121,5 +116,3 @@ if version >= 508 || !exists("did_twig_syn_inits")
 
   delcommand HiLink
 endif
-
-endif
diff --git a/syntax/typescript.vim b/syntax/typescript.vim
index 407a7b46b..e8f98a13f 100644
--- a/syntax/typescript.vim
+++ b/syntax/typescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/typescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 " Vim syntax file
 " Language:     TypeScript
@@ -39,5 +34,3 @@ let b:current_syntax = "typescript"
 if main_syntax == 'typescript'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/typescriptreact.vim b/syntax/typescriptreact.vim
index 1adad053f..c8b2af3f4 100644
--- a/syntax/typescriptreact.vim
+++ b/syntax/typescriptreact.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/typescriptreact.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 if !exists("main_syntax")
   if exists("b:current_syntax")
@@ -148,5 +143,4 @@ highlight def link tsxCloseString Identifier
 let b:current_syntax = "typescriptreact"
 if main_syntax == 'typescriptreact'
   unlet main_syntax
-endif
-endif
+endif
\ No newline at end of file
diff --git a/syntax/uc.vim b/syntax/uc.vim
index b820435be..068553b27 100644
--- a/syntax/uc.vim
+++ b/syntax/uc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/uc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('uc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'uc') == -1
 
 " Vim syntax file
 " Language:	UnrealScript
@@ -172,5 +167,3 @@ if main_syntax == 'uc'
 endif
 
 " vim: ts=8
-
-endif
diff --git a/syntax/udevconf.vim b/syntax/udevconf.vim
index 2d7a5f72c..5d8b5fca0 100644
--- a/syntax/udevconf.vim
+++ b/syntax/udevconf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/udevconf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('udevconf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'udevconf') == -1
 
 " Vim syntax file
 " Language:             udev(8) configuration file
@@ -46,5 +41,3 @@ let b:current_syntax = "udevconf"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/udevperm.vim b/syntax/udevperm.vim
index 760d665f4..1725d9f9a 100644
--- a/syntax/udevperm.vim
+++ b/syntax/udevperm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/udevperm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('udevperm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'udevperm') == -1
 
 " Vim syntax file
 " Language:             udev(8) permissions file
@@ -76,5 +71,3 @@ let b:current_syntax = "udevperm"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/uil.vim b/syntax/uil.vim
index cd46ea188..a6ddf8c48 100644
--- a/syntax/uil.vim
+++ b/syntax/uil.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/uil.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('uil', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'uil') == -1
 
 " Vim syntax file
 " Language:	Motif UIL (User Interface Language)
@@ -82,5 +77,3 @@ hi def link uilTodo		Todo
 let b:current_syntax = "uil"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/unison.vim b/syntax/unison.vim
index 90ca9c495..f069b99bf 100644
--- a/syntax/unison.vim
+++ b/syntax/unison.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/unison.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('unison', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'unison') == -1
 
 " Vim syntax file, adapted from Haskell file by John Williams <jrw@pobox.com>
 "
@@ -161,5 +156,3 @@ endif
 let b:current_syntax = "unison"
 
 " Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim
-
-endif
diff --git a/syntax/updatedb.vim b/syntax/updatedb.vim
index b1a66d072..02233978c 100644
--- a/syntax/updatedb.vim
+++ b/syntax/updatedb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/updatedb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('updatedb', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'updatedb') == -1
 
 " Vim syntax file
 " Language:             updatedb.conf(5) configuration file
@@ -48,5 +43,3 @@ let b:current_syntax = "updatedb"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/upstart.vim b/syntax/upstart.vim
index 66f233e3b..4df94c19b 100644
--- a/syntax/upstart.vim
+++ b/syntax/upstart.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/upstart.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('upstart', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'upstart') == -1
 
 " Vim syntax file
 " Language:	Upstart job files
@@ -118,5 +113,3 @@ hi def link upstartOption    Type
 hi def link upstartEvent     Define
 
 let b:current_syntax = "upstart"
-
-endif
diff --git a/syntax/upstreamdat.vim b/syntax/upstreamdat.vim
index e05a0f8be..2239f33db 100644
--- a/syntax/upstreamdat.vim
+++ b/syntax/upstreamdat.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/upstreamdat.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('upstreamdat', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'upstreamdat') == -1
 
 " Vim syntax file
 " Language:		Innovation Data Processing upstream.dat file
@@ -312,5 +307,3 @@ hi def link upstreamdat_Parameter Type
 hi def link upstreamdat_Comment Comment
 
 let b:current_syntax = "upstreamdat"
-
-endif
diff --git a/syntax/upstreaminstalllog.vim b/syntax/upstreaminstalllog.vim
index 3e75d1098..b6703103b 100644
--- a/syntax/upstreaminstalllog.vim
+++ b/syntax/upstreaminstalllog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/upstreaminstalllog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('upstreaminstalllog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'upstreaminstalllog') == -1
 
 " Vim syntax file
 " Language:             Innovation Data Processing UPSTREAMInstall.log file
@@ -34,5 +29,3 @@ hi def link upstreaminstalllog_MsgW	Constant
 hi def link upstreaminstalllog_IPaddr	Identifier
 
 let b:current_syntax = "upstreaminstalllog"
-
-endif
diff --git a/syntax/upstreamlog.vim b/syntax/upstreamlog.vim
index b442718b9..8a885654e 100644
--- a/syntax/upstreamlog.vim
+++ b/syntax/upstreamlog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/upstreamlog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('upstreamlog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'upstreamlog') == -1
 
 " Vim syntax file
 " Language:             Innovation Data Processing upstream.log file
@@ -61,5 +56,3 @@ hi def link upstreamlog_Profile	Identifier
 hi def link upstreamlog_Target	Identifier
 
 let b:current_syntax = "upstreamlog"
-
-endif
diff --git a/syntax/usserverlog.vim b/syntax/usserverlog.vim
index c651909e2..61b6a56a1 100644
--- a/syntax/usserverlog.vim
+++ b/syntax/usserverlog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/usserverlog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('usserverlog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'usserverlog') == -1
 
 " Vim syntax file
 " Language:             Innovation Data Processing usserver.log file
@@ -67,5 +62,3 @@ hi def link usserverlog_Profile	Identifier
 hi def link usserverlog_Target	Identifier
 
 let b:current_syntax = "usserverlog"
-
-endif
diff --git a/syntax/usw2kagtlog.vim b/syntax/usw2kagtlog.vim
index 2467b8d92..f748b037e 100644
--- a/syntax/usw2kagtlog.vim
+++ b/syntax/usw2kagtlog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/usw2kagtlog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('usw2kagtlog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'usw2kagtlog') == -1
 
 " Vim syntax file
 " Language:             Innovation Data Processing USW2KAgt.log file
@@ -61,5 +56,3 @@ hi def link usw2kagtlog_Target		Identifier
 hi def link usw2kagtlog_Agentword	Special
 
 let b:current_syntax = "usw2kagentlog"
-
-endif
diff --git a/syntax/vala.vim b/syntax/vala.vim
index c48851b34..36f035c72 100644
--- a/syntax/vala.vim
+++ b/syntax/vala.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vala.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vala', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
 
 " Vim syntax file
 " Language:	Vala
@@ -241,5 +236,3 @@ let &cpo = s:vala_cpo_save
 unlet s:vala_cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/vb.vim b/syntax/vb.vim
index 9269f59ea..8edd7882a 100644
--- a/syntax/vb.vim
+++ b/syntax/vb.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vb.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('visual-basic', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
 
 " Vim syntax file
 " Language:	Visual Basic
@@ -372,5 +367,3 @@ hi def link vbTypeSpecifier	Type
 let b:current_syntax = "vb"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/vbnet.vim b/syntax/vbnet.vim
index 5a7776496..cf94d7b5c 100644
--- a/syntax/vbnet.vim
+++ b/syntax/vbnet.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vbnet.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vbnet', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vbnet') == -1
 
 " Vim syntax file
 " Language:     VB.NET
@@ -438,5 +433,3 @@ endif
 let b:current_syntax = "vbnet"
 
 " vim:set ft=vim sts=4 sw=4:
-
-endif
diff --git a/syntax/vcl.vim b/syntax/vcl.vim
index 03ff7ee88..33aab04a8 100644
--- a/syntax/vcl.vim
+++ b/syntax/vcl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vcl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vcl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vcl') == -1
 
 " Vim syntax file
 " Filename:     vcl.vim
@@ -113,5 +108,3 @@ hi link vclModes            Operator
 hi link vclOption           Identifier
 hi link vclNumber           Number
 hi link vclNumberTime       Number
-
-endif
diff --git a/syntax/velocity.vim b/syntax/velocity.vim
index 65f37fd98..dffcd3948 100644
--- a/syntax/velocity.vim
+++ b/syntax/velocity.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/velocity.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('velocity', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'velocity') == -1
 
 " Vim syntax file
 " Language:	Velocity HTML template
@@ -74,5 +69,3 @@ if version >= 508 || !exists("did_velocity_syn_inits")
 endif
 
 let b:current_syntax = "velocity"
-
-endif
diff --git a/syntax/vera.vim b/syntax/vera.vim
index 28ae65f3e..45a07df1e 100644
--- a/syntax/vera.vim
+++ b/syntax/vera.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vera.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vera', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vera') == -1
 
 " Vim syntax file
 " Language:	Vera
@@ -355,5 +350,3 @@ hi def link veraCppOut		Comment
 let b:current_syntax = "vera"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/verilog.vim b/syntax/verilog.vim
index 92f8b68ff..3898636fd 100644
--- a/syntax/verilog.vim
+++ b/syntax/verilog.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/verilog.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('verilog', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilog') == -1
 
 " Vim syntax file
 " Language:	Verilog
@@ -126,5 +121,3 @@ hi def link verilogEscape		 Special
 let b:current_syntax = "verilog"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/verilogams.vim b/syntax/verilogams.vim
index dd2c59948..a77a3dcd2 100644
--- a/syntax/verilogams.vim
+++ b/syntax/verilogams.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/verilogams.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('verilogams', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'verilogams') == -1
 
 " Vim syntax file
 " Language:    Verilog-AMS
@@ -139,5 +134,3 @@ hi def link verilogamsSystask      Function
 let b:current_syntax = "verilogams"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/vgrindefs.vim b/syntax/vgrindefs.vim
index 42f72018c..085f51ec2 100644
--- a/syntax/vgrindefs.vim
+++ b/syntax/vgrindefs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vgrindefs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vgrindefs', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vgrindefs') == -1
 
 " Vim syntax file
 " Language:	Vgrindefs
@@ -52,5 +47,3 @@ hi def link vgrindefsComment	Comment
 let b:current_syntax = "vgrindefs"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/vhdl.vim b/syntax/vhdl.vim
index b5cbe9cda..4f4a19ecd 100644
--- a/syntax/vhdl.vim
+++ b/syntax/vhdl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vhdl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vhdl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vhdl') == -1
 
 " Vim syntax file
 " Language:		VHDL [VHSIC (Very High Speed Integrated Circuit) Hardware Description Language]
@@ -275,5 +270,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/vimgo.vim b/syntax/vimgo.vim
index 5066c4cf7..df82a7090 100644
--- a/syntax/vimgo.vim
+++ b/syntax/vimgo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vimgo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 
 if exists("b:current_syntax")
   finish
@@ -20,5 +15,3 @@ hi def link goInterface Type
 hi def link goTitle Label
 
 " vim: sw=2 ts=2 et
-
-endif
diff --git a/syntax/viminfo.vim b/syntax/viminfo.vim
index 1c992da11..5d5c54549 100644
--- a/syntax/viminfo.vim
+++ b/syntax/viminfo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/viminfo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('viminfo', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'viminfo') == -1
 
 " Vim syntax file
 " Language:	Vim .viminfo file
@@ -55,5 +50,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/vlang.vim b/syntax/vlang.vim
index b7b1ed4a6..5c6e47fd8 100644
--- a/syntax/vlang.vim
+++ b/syntax/vlang.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vlang.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('v', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'v') == -1
 
 " Vim syntax file
 " Language:	V
@@ -273,5 +268,3 @@ syn sync minlines=500
 let b:current_syntax = 'vlang'
 
 " vim: sw=2 sts=2 et
-
-endif
diff --git a/syntax/vmasm.vim b/syntax/vmasm.vim
index 4c3176c3e..486a3327a 100644
--- a/syntax/vmasm.vim
+++ b/syntax/vmasm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vmasm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vmasm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vmasm') == -1
 
 " Vim syntax file
 " Language:	(VAX) Macro Assembly
@@ -245,5 +240,3 @@ hi def link vmasmLabel		Type
 let b:current_syntax = "vmasm"
 
 " vim: ts=8 sw=2
-
-endif
diff --git a/syntax/voscm.vim b/syntax/voscm.vim
index e7bd12570..dbc11b38f 100644
--- a/syntax/voscm.vim
+++ b/syntax/voscm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/voscm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('voscm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'voscm') == -1
 
 " Vim syntax file
 " Language:	VOS CM macro
@@ -101,5 +96,3 @@ hi def link voscmError         	Error
 let b:current_syntax = "voscm"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/vrml.vim b/syntax/vrml.vim
index 6f73ff546..4447cf78c 100644
--- a/syntax/vrml.vim
+++ b/syntax/vrml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vrml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vrml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vrml') == -1
 
 " Vim syntax file
 " Language:	   VRML97
@@ -229,5 +224,3 @@ hi def link VRMLTypes      Identifier
 let b:current_syntax = "vrml"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/vroom.vim b/syntax/vroom.vim
index 9af1a992d..ea22628c9 100644
--- a/syntax/vroom.vim
+++ b/syntax/vroom.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vroom.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vroom', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vroom') == -1
 
 " Vim syntax file
 " Language:	Vroom (vim testing and executable documentation)
@@ -117,5 +112,3 @@ let b:current_syntax = 'vroom'
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/vue.vim b/syntax/vue.vim
index 26d6d3f49..126d9c82e 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/vue.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('vue', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
 
 " Vim syntax file
 " Language: Vue.js
@@ -85,5 +80,3 @@ syn match   htmlArg "[@v:][-:.0-9_a-z]*\>" contained
 syntax sync fromstart
 
 let b:current_syntax = "vue"
-
-endif
diff --git a/syntax/wast.vim b/syntax/wast.vim
index e76ad62cd..ea2c64908 100644
--- a/syntax/wast.vim
+++ b/syntax/wast.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/wast.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('wast', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wast') == -1
 
 " Vim syntax file
 " Language:     WebAssembly
@@ -91,5 +86,3 @@ let b:current_syntax = "wast"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/webmacro.vim b/syntax/webmacro.vim
index e994d5d3f..0120c18a9 100644
--- a/syntax/webmacro.vim
+++ b/syntax/webmacro.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/webmacro.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('webmacro', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'webmacro') == -1
 
 " WebMacro syntax file
 " Language:     WebMacro
@@ -74,5 +69,3 @@ let b:current_syntax = "webmacro"
 if main_syntax == 'webmacro'
   unlet main_syntax
 endif
-
-endif
diff --git a/syntax/wget.vim b/syntax/wget.vim
index 25b03c806..b5c41e921 100644
--- a/syntax/wget.vim
+++ b/syntax/wget.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/wget.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('wget', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wget') == -1
 
 " Vim syntax file
 " Language:     Wget configuration file (/etc/wgetrc ~/.wgetrc)
@@ -196,5 +191,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: ts=8 fdm=marker:
-
-endif
diff --git a/syntax/winbatch.vim b/syntax/winbatch.vim
index 82f717a98..5b7eff689 100644
--- a/syntax/winbatch.vim
+++ b/syntax/winbatch.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/winbatch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('winbatch', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'winbatch') == -1
 
 " Vim syntax file
 " Language:	WinBatch/Webbatch (*.wbt, *.web)
@@ -181,5 +176,3 @@ hi def link winbatchConstant	StorageClass
 let b:current_syntax = "winbatch"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/wml.vim b/syntax/wml.vim
index e5c8ca504..462fefe5c 100644
--- a/syntax/wml.vim
+++ b/syntax/wml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/wml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('wml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wml') == -1
 
 " Vim syntax file
 " Language:     WML - Website MetaLanguage
@@ -157,5 +152,3 @@ hi def link wmlSharpBang	PreProc
 
 
 let b:current_syntax = "wml"
-
-endif
diff --git a/syntax/wsh.vim b/syntax/wsh.vim
index 019d97440..732430679 100644
--- a/syntax/wsh.vim
+++ b/syntax/wsh.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/wsh.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('wsh', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wsh') == -1
 
 " Vim syntax file
 " Language:	Windows Scripting Host
@@ -52,5 +47,3 @@ let b:current_syntax = "wsh"
 
 let &cpo = s:wsh_cpo_save
 unlet s:wsh_cpo_save
-
-endif
diff --git a/syntax/wsml.vim b/syntax/wsml.vim
index 7f38e798e..e141292dd 100644
--- a/syntax/wsml.vim
+++ b/syntax/wsml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/wsml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('wsml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wsml') == -1
 
 " Vim syntax file
 " Language:     WSML
@@ -120,5 +115,3 @@ hi def link wsmlCommentStar		wsmlComment
 let b:current_syntax = "wsml"
 let b:spell_options="contained"
 
-
-endif
diff --git a/syntax/wvdial.vim b/syntax/wvdial.vim
index 71407cb45..eff51cb89 100644
--- a/syntax/wvdial.vim
+++ b/syntax/wvdial.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/wvdial.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('wvdial', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'wvdial') == -1
 
 " Vim syntax file
 " Language:     Configuration file for WvDial
@@ -35,5 +30,3 @@ hi def link wvdialEqual     Statement
 let b:current_syntax = "wvdial"
 
 "EOF vim: tw=78:ft=vim:ts=8
-
-endif
diff --git a/syntax/xdc.vim b/syntax/xdc.vim
index 8f06e618c..b83415d33 100644
--- a/syntax/xdc.vim
+++ b/syntax/xdc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xdc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xdc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xdc') == -1
 
 " Vim syntax file
 " Language:     XDC - Xilinx Design Constraints
@@ -200,5 +195,3 @@ highligh default link xdcFlags                                Special
 let b:current_syntax = "xdc"
 
 " vim: fileformat=unix tabstop=2 shiftwidth=2 expandtab
-
-endif
diff --git a/syntax/xdefaults.vim b/syntax/xdefaults.vim
index a37e9a968..7bfedc24a 100644
--- a/syntax/xdefaults.vim
+++ b/syntax/xdefaults.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xdefaults.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xdefaults', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xdefaults') == -1
 
 " Vim syntax file
 " Language:	X resources files like ~/.Xdefaults (xrdb)
@@ -139,5 +134,3 @@ hi def link xdefaultsTodo		Todo
 let b:current_syntax = "xdefaults"
 
 " vim:ts=8
-
-endif
diff --git a/syntax/xf86conf.vim b/syntax/xf86conf.vim
index 168962a90..7f3e3847c 100644
--- a/syntax/xf86conf.vim
+++ b/syntax/xf86conf.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xf86conf.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xf86conf', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xf86conf') == -1
 
 " Vim syntax file
 " This is a GENERATED FILE. Please always refer to source file at the URI below.
@@ -212,5 +207,3 @@ hi def link xf86confString String
 hi def link xf86confValue Constant
 
 let b:current_syntax = "xf86conf"
-
-endif
diff --git a/syntax/xhtml.vim b/syntax/xhtml.vim
index eceec40e7..72fc71dfe 100644
--- a/syntax/xhtml.vim
+++ b/syntax/xhtml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xhtml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xhtml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xhtml') == -1
 
 " Vim syntax file
 " Language:	XHTML
@@ -18,5 +13,3 @@ runtime! syntax/html.vim
 let b:current_syntax = "xhtml"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/xinetd.vim b/syntax/xinetd.vim
index 509f69eb2..eb5a7127d 100644
--- a/syntax/xinetd.vim
+++ b/syntax/xinetd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xinetd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xinetd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xinetd') == -1
 
 " Vim syntax file
 " Language:             xinetd.conf(5) configuration file
@@ -354,5 +349,3 @@ let b:current_syntax = "xinetd"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/xmath.vim b/syntax/xmath.vim
index 24c59aa6b..e4a55d263 100644
--- a/syntax/xmath.vim
+++ b/syntax/xmath.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xmath.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xmath', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xmath') == -1
 
 " Vim syntax file
 " Language:	xmath (a simulation tool)
@@ -232,5 +227,3 @@ endif
 let b:current_syntax = "xmath"
 
 " vim: ts=17
-
-endif
diff --git a/syntax/xml.vim b/syntax/xml.vim
index 8491c7d7d..e1244bfb0 100644
--- a/syntax/xml.vim
+++ b/syntax/xml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xml') == -1
 
 " Vim syntax file
 " Language:	XML
@@ -355,5 +350,3 @@ let &cpo = s:xml_cpo_save
 unlet s:xml_cpo_save
 
 " vim: ts=8
-
-endif
diff --git a/syntax/xmodmap.vim b/syntax/xmodmap.vim
index b63ab37e7..81c42c5de 100644
--- a/syntax/xmodmap.vim
+++ b/syntax/xmodmap.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xmodmap.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xmodmap', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xmodmap') == -1
 
 " Vim syntax file
 " Language:             xmodmap(1) definition file
@@ -684,5 +679,3 @@ let b:current_syntax = "xmodmap"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/xpm.vim b/syntax/xpm.vim
index e3f38b306..d1a93f22a 100644
--- a/syntax/xpm.vim
+++ b/syntax/xpm.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xpm.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xpm', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xpm') == -1
 
 " Vim syntax file
 " Language:	X Pixmap
@@ -145,5 +140,3 @@ hi def link xpmPixelString	String
 let b:current_syntax = "xpm"
 
 " vim: ts=8:sw=3:noet:
-
-endif
diff --git a/syntax/xpm2.vim b/syntax/xpm2.vim
index d31a248fa..48ec5b56f 100644
--- a/syntax/xpm2.vim
+++ b/syntax/xpm2.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xpm2.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xpm2', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xpm2') == -1
 
 " Vim syntax file
 " Language:	X Pixmap v2
@@ -160,5 +155,3 @@ let b:current_syntax = "xpm2"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 " vim: ts=8:sw=2:noet:
-
-endif
diff --git a/syntax/xquery.vim b/syntax/xquery.vim
index 607ea5523..580396966 100644
--- a/syntax/xquery.vim
+++ b/syntax/xquery.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xquery.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xquery', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xquery') == -1
 
 " Vim syntax file
 " Language:	XQuery
@@ -89,5 +84,3 @@ hi def link xqExist     Operator
 "hi link xmlEndTag   Structure
 
 let b:current_syntax = "xquery"
-
-endif
diff --git a/syntax/xs.vim b/syntax/xs.vim
index cfeb65cab..9b7b27170 100644
--- a/syntax/xs.vim
+++ b/syntax/xs.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xs.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
 
 " Vim syntax file
 " Language:    XS (Perl extension interface language)
@@ -3684,5 +3679,3 @@ hi def link xsMacro      Macro
 let b:current_syntax = "xs"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/xsd.vim b/syntax/xsd.vim
index 2ffc9cb94..8f3a47cb0 100644
--- a/syntax/xsd.vim
+++ b/syntax/xsd.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xsd.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xsd', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsd') == -1
 
 " Vim syntax file
 " Language:	XSD (XML Schema)
@@ -68,5 +63,3 @@ syn match xsdElement '\%(xsd:\)\@<=unique'
 hi def link xsdElement Statement
 
 " vim: ts=8
-
-endif
diff --git a/syntax/xsl.vim b/syntax/xsl.vim
index 23a1499b9..8ca73411c 100644
--- a/syntax/xsl.vim
+++ b/syntax/xsl.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xsl.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xsl', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsl') == -1
 
 " Vim syntax file
 " Language:	XSLT 1.0
@@ -544,5 +539,3 @@ let b:current_syntax = "xsl"
 "unlet s:xml_cpo_save
 
 " vim: ts=4:sw=4
-
-endif
diff --git a/syntax/xslt.vim b/syntax/xslt.vim
index e5976009e..ad0f37bb2 100644
--- a/syntax/xslt.vim
+++ b/syntax/xslt.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/xslt.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('xslt', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xslt') == -1
 
 " Vim syntax file
 " Language:	XSLT
@@ -78,5 +73,3 @@ syn match xslElement '\%(xsl:\)\@<=with-param'
 hi def link xslElement Statement
 
 " vim: ts=8
-
-endif
diff --git a/syntax/yacc.vim b/syntax/yacc.vim
index 70c63a4b8..3dd9742a2 100644
--- a/syntax/yacc.vim
+++ b/syntax/yacc.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yacc.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('yacc', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yacc') == -1
 
 " Vim syntax file
 " Language:	Yacc
@@ -127,5 +122,3 @@ let b:current_syntax = "yacc"
 " ---------------------------------------------------------------------
 "  Modelines: {{{1
 " vim: ts=15 fdm=marker
-
-endif
diff --git a/syntax/yaml.vim b/syntax/yaml.vim
index d40cdfca2..8b82460c1 100644
--- a/syntax/yaml.vim
+++ b/syntax/yaml.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yaml.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('yaml', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 
 " Vim syntax file
 " Language:         YAML (YAML Ain't Markup Language) 1.2
@@ -250,5 +245,3 @@ delfunction s:SimplifyToAssumeAllPrintable
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif
diff --git a/syntax/yats.vim b/syntax/yats.vim
index 4475692f6..f790a3fbc 100644
--- a/syntax/yats.vim
+++ b/syntax/yats.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 runtime syntax/yats/typescript.vim
 runtime syntax/yats/es6-number.vim
@@ -53,5 +48,3 @@ runtime syntax/yats/css.vim
 let typescript_props = 1
 
 runtime syntax/yats/event.vim
-
-endif
diff --git a/syntax/yats/css.vim b/syntax/yats/css.vim
index 043fe1ba2..af9baf695 100644
--- a/syntax/yats/css.vim
+++ b/syntax/yats/css.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/css.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMStyle contained alignContent alignItems alignSelf animation
 syntax keyword typescriptDOMStyle contained animationDelay animationDirection animationDuration
@@ -78,5 +73,3 @@ syntax keyword typescriptDOMStyle contained whiteSpace width willChange wordBrea
 syntax keyword typescriptDOMStyle contained wordSpacing wordWrap writingMode zIndex
 if exists("did_typescript_hilink") | HiLink typescriptDOMStyle Keyword
 endif
-
-endif
diff --git a/syntax/yats/dom-document.vim b/syntax/yats/dom-document.vim
index 2063c5229..0c5062883 100644
--- a/syntax/yats/dom-document.vim
+++ b/syntax/yats/dom-document.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/dom-document.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMDocProp contained activeElement body cookie defaultView
 syntax keyword typescriptDOMDocProp contained designMode dir domain embeds forms head
@@ -39,5 +34,3 @@ syntax keyword typescriptDOMDocMethod contained querySelectorAll write writeln n
 syntax cluster props add=typescriptDOMDocMethod
 if exists("did_typescript_hilink") | HiLink typescriptDOMDocMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/dom-elem.vim b/syntax/yats/dom-elem.vim
index 23317a8ae..438d0fd55 100644
--- a/syntax/yats/dom-elem.vim
+++ b/syntax/yats/dom-elem.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/dom-elem.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMElemAttrs contained accessKey clientHeight clientLeft
 syntax keyword typescriptDOMElemAttrs contained clientTop clientWidth id innerHTML
@@ -30,5 +25,3 @@ syntax keyword typescriptDOMElemFuncs contained setAttributeNodeNS setCapture su
 syntax keyword typescriptDOMElemFuncs contained getAttribute
 if exists("did_typescript_hilink") | HiLink typescriptDOMElemFuncs Keyword
 endif
-
-endif
diff --git a/syntax/yats/dom-event.vim b/syntax/yats/dom-event.vim
index be08f14a3..15a9a79d0 100644
--- a/syntax/yats/dom-event.vim
+++ b/syntax/yats/dom-event.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/dom-event.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMEventTargetMethod contained addEventListener removeEventListener nextgroup=typescriptEventFuncCallArg
 syntax keyword typescriptDOMEventTargetMethod contained dispatchEvent waitUntil nextgroup=typescriptEventFuncCallArg
@@ -70,5 +65,3 @@ syntax keyword typescriptDOMEventMethod contained stopPropagation respondWith de
 syntax cluster props add=typescriptDOMEventMethod
 if exists("did_typescript_hilink") | HiLink typescriptDOMEventMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/dom-form.vim b/syntax/yats/dom-form.vim
index 8982bdfec..5ff6e88f4 100644
--- a/syntax/yats/dom-form.vim
+++ b/syntax/yats/dom-form.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/dom-form.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMFormProp contained acceptCharset action elements encoding
 syntax keyword typescriptDOMFormProp contained enctype length method name target
@@ -16,5 +11,3 @@ syntax keyword typescriptDOMFormMethod contained reportValidity reset submit nex
 syntax cluster props add=typescriptDOMFormMethod
 if exists("did_typescript_hilink") | HiLink typescriptDOMFormMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/dom-node.vim b/syntax/yats/dom-node.vim
index 1367fa6b1..c6cd3283f 100644
--- a/syntax/yats/dom-node.vim
+++ b/syntax/yats/dom-node.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/dom-node.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMNodeProp contained attributes baseURI baseURIObject childNodes
 syntax keyword typescriptDOMNodeProp contained firstChild lastChild localName namespaceURI
@@ -32,5 +27,3 @@ syntax keyword typescriptDOMNodeType contained COMMENT_NODE DOCUMENT_NODE DOCUME
 syntax keyword typescriptDOMNodeType contained DOCUMENT_FRAGMENT_NODE NOTATION_NODE
 if exists("did_typescript_hilink") | HiLink typescriptDOMNodeType Keyword
 endif
-
-endif
diff --git a/syntax/yats/dom-storage.vim b/syntax/yats/dom-storage.vim
index 198df1399..19719e5a2 100644
--- a/syntax/yats/dom-storage.vim
+++ b/syntax/yats/dom-storage.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/dom-storage.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptDOMStorage contained sessionStorage localStorage
 if exists("did_typescript_hilink") | HiLink typescriptDOMStorage Keyword
@@ -19,5 +14,3 @@ syntax keyword typescriptDOMStorageMethod contained clear nextgroup=typescriptFu
 syntax cluster props add=typescriptDOMStorageMethod
 if exists("did_typescript_hilink") | HiLink typescriptDOMStorageMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/ecma-402.vim b/syntax/yats/ecma-402.vim
index d7d15ed6f..fca87fdf9 100644
--- a/syntax/yats/ecma-402.vim
+++ b/syntax/yats/ecma-402.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/ecma-402.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Intl
 syntax keyword typescriptIntlMethod contained Collator DateTimeFormat NumberFormat nextgroup=typescriptFuncCallArg
@@ -13,5 +8,3 @@ syntax keyword typescriptIntlMethod contained PluralRules nextgroup=typescriptFu
 syntax cluster props add=typescriptIntlMethod
 if exists("did_typescript_hilink") | HiLink typescriptIntlMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-array.vim b/syntax/yats/es6-array.vim
index 7b91b44a6..9ea46a11f 100644
--- a/syntax/yats/es6-array.vim
+++ b/syntax/yats/es6-array.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-array.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Array nextgroup=typescriptGlobalArrayDot,typescriptFuncCallArg
 syntax match   typescriptGlobalArrayDot /\./ contained nextgroup=typescriptArrayStaticMethod,typescriptProp
@@ -21,5 +16,3 @@ syntax keyword typescriptArrayMethod contained toSource toString unshift nextgro
 syntax cluster props add=typescriptArrayMethod
 if exists("did_typescript_hilink") | HiLink typescriptArrayMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-date.vim b/syntax/yats/es6-date.vim
index 706d82ef1..254038281 100644
--- a/syntax/yats/es6-date.vim
+++ b/syntax/yats/es6-date.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-date.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Date nextgroup=typescriptGlobalDateDot,typescriptFuncCallArg
 syntax match   typescriptGlobalDateDot /\./ contained nextgroup=typescriptDateStaticMethod,typescriptProp
@@ -29,5 +24,3 @@ syntax keyword typescriptDateMethod contained valueOf nextgroup=typescriptFuncCa
 syntax cluster props add=typescriptDateMethod
 if exists("did_typescript_hilink") | HiLink typescriptDateMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-function.vim b/syntax/yats/es6-function.vim
index 8c08aa3c7..0f39d0be2 100644
--- a/syntax/yats/es6-function.vim
+++ b/syntax/yats/es6-function.vim
@@ -1,16 +1,9 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-function.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Function
 syntax keyword typescriptFunctionMethod contained apply bind call nextgroup=typescriptFuncCallArg
 syntax cluster props add=typescriptFunctionMethod
 if exists("did_typescript_hilink") | HiLink typescriptFunctionMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-json.vim b/syntax/yats/es6-json.vim
index 1950012d7..f1d1d488a 100644
--- a/syntax/yats/es6-json.vim
+++ b/syntax/yats/es6-json.vim
@@ -1,16 +1,9 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-json.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName JSON nextgroup=typescriptGlobalJSONDot,typescriptFuncCallArg
 syntax match   typescriptGlobalJSONDot /\./ contained nextgroup=typescriptJSONStaticMethod,typescriptProp
 syntax keyword typescriptJSONStaticMethod contained parse stringify nextgroup=typescriptFuncCallArg
 if exists("did_typescript_hilink") | HiLink typescriptJSONStaticMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-map.vim b/syntax/yats/es6-map.vim
index 589b0ee03..97e2558d1 100644
--- a/syntax/yats/es6-map.vim
+++ b/syntax/yats/es6-map.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-map.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Map WeakMap
 syntax keyword typescriptES6MapProp contained size
@@ -17,5 +12,3 @@ syntax keyword typescriptES6MapMethod contained keys set values nextgroup=typesc
 syntax cluster props add=typescriptES6MapMethod
 if exists("did_typescript_hilink") | HiLink typescriptES6MapMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-math.vim b/syntax/yats/es6-math.vim
index 188a9b9ab..0490f22e2 100644
--- a/syntax/yats/es6-math.vim
+++ b/syntax/yats/es6-math.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-math.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Math nextgroup=typescriptGlobalMathDot,typescriptFuncCallArg
 syntax match   typescriptGlobalMathDot /\./ contained nextgroup=typescriptMathStaticProp,typescriptMathStaticMethod,typescriptProp
@@ -21,5 +16,3 @@ syntax keyword typescriptMathStaticMethod contained min pow random round sign si
 syntax keyword typescriptMathStaticMethod contained sinh sqrt tan tanh trunc nextgroup=typescriptFuncCallArg
 if exists("did_typescript_hilink") | HiLink typescriptMathStaticMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-number.vim b/syntax/yats/es6-number.vim
index f51e3c1e2..1fb37cb68 100644
--- a/syntax/yats/es6-number.vim
+++ b/syntax/yats/es6-number.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-number.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Number nextgroup=typescriptGlobalNumberDot,typescriptFuncCallArg
 syntax match   typescriptGlobalNumberDot /\./ contained nextgroup=typescriptNumberStaticProp,typescriptNumberStaticMethod,typescriptProp
@@ -23,5 +18,3 @@ syntax keyword typescriptNumberMethod contained toPrecision toSource toString va
 syntax cluster props add=typescriptNumberMethod
 if exists("did_typescript_hilink") | HiLink typescriptNumberMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-object.vim b/syntax/yats/es6-object.vim
index 1b2f9c336..750571d73 100644
--- a/syntax/yats/es6-object.vim
+++ b/syntax/yats/es6-object.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-object.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Object nextgroup=typescriptGlobalObjectDot,typescriptFuncCallArg
 syntax match   typescriptGlobalObjectDot /\./ contained nextgroup=typescriptObjectStaticMethod,typescriptProp
@@ -24,5 +19,3 @@ syntax keyword typescriptObjectMethod contained setPrototypeOf nextgroup=typescr
 syntax cluster props add=typescriptObjectMethod
 if exists("did_typescript_hilink") | HiLink typescriptObjectMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-promise.vim b/syntax/yats/es6-promise.vim
index 6068cf944..5cb97747e 100644
--- a/syntax/yats/es6-promise.vim
+++ b/syntax/yats/es6-promise.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-promise.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Promise nextgroup=typescriptGlobalPromiseDot,typescriptFuncCallArg
 syntax match   typescriptGlobalPromiseDot /\./ contained nextgroup=typescriptPromiseStaticMethod,typescriptProp
@@ -16,5 +11,3 @@ syntax keyword typescriptPromiseMethod contained then catch finally nextgroup=ty
 syntax cluster props add=typescriptPromiseMethod
 if exists("did_typescript_hilink") | HiLink typescriptPromiseMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-proxy.vim b/syntax/yats/es6-proxy.vim
index 1c6398ec6..6bfd693c0 100644
--- a/syntax/yats/es6-proxy.vim
+++ b/syntax/yats/es6-proxy.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-proxy.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Proxy
 syntax keyword typescriptProxyAPI contained getOwnPropertyDescriptor getOwnPropertyNames
@@ -14,5 +9,3 @@ syntax keyword typescriptProxyAPI contained preventExtensions has hasOwn get set
 syntax keyword typescriptProxyAPI contained iterate ownKeys apply construct
 if exists("did_typescript_hilink") | HiLink typescriptProxyAPI Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-reflect.vim b/syntax/yats/es6-reflect.vim
index 6b3da9ffb..9bc7c6be3 100644
--- a/syntax/yats/es6-reflect.vim
+++ b/syntax/yats/es6-reflect.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-reflect.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Reflect
 syntax keyword typescriptReflectMethod contained apply construct defineProperty deleteProperty nextgroup=typescriptFuncCallArg
@@ -15,5 +10,3 @@ syntax keyword typescriptReflectMethod contained preventExtensions set setProtot
 syntax cluster props add=typescriptReflectMethod
 if exists("did_typescript_hilink") | HiLink typescriptReflectMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-regexp.vim b/syntax/yats/es6-regexp.vim
index 9a8d87255..dfa4932b9 100644
--- a/syntax/yats/es6-regexp.vim
+++ b/syntax/yats/es6-regexp.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-regexp.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName RegExp nextgroup=typescriptGlobalRegExpDot,typescriptFuncCallArg
 syntax match   typescriptGlobalRegExpDot /\./ contained nextgroup=typescriptRegExpStaticProp,typescriptProp
@@ -20,5 +15,3 @@ syntax keyword typescriptRegExpMethod contained exec test nextgroup=typescriptFu
 syntax cluster props add=typescriptRegExpMethod
 if exists("did_typescript_hilink") | HiLink typescriptRegExpMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-set.vim b/syntax/yats/es6-set.vim
index b116d4fbb..c6ce4695b 100644
--- a/syntax/yats/es6-set.vim
+++ b/syntax/yats/es6-set.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-set.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Set WeakSet
 syntax keyword typescriptES6SetProp contained size
@@ -17,5 +12,3 @@ syntax keyword typescriptES6SetMethod contained values nextgroup=typescriptFuncC
 syntax cluster props add=typescriptES6SetMethod
 if exists("did_typescript_hilink") | HiLink typescriptES6SetMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-string.vim b/syntax/yats/es6-string.vim
index acb6d5a20..99ce6c775 100644
--- a/syntax/yats/es6-string.vim
+++ b/syntax/yats/es6-string.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-string.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName String nextgroup=typescriptGlobalStringDot,typescriptFuncCallArg
 syntax match   typescriptGlobalStringDot /\./ contained nextgroup=typescriptStringStaticMethod,typescriptProp
@@ -23,5 +18,3 @@ syntax keyword typescriptStringMethod contained valueOf nextgroup=typescriptFunc
 syntax cluster props add=typescriptStringMethod
 if exists("did_typescript_hilink") | HiLink typescriptStringMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/es6-symbol.vim b/syntax/yats/es6-symbol.vim
index b0c2cb04b..5935f5ef3 100644
--- a/syntax/yats/es6-symbol.vim
+++ b/syntax/yats/es6-symbol.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/es6-symbol.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Symbol nextgroup=typescriptGlobalSymbolDot,typescriptFuncCallArg
 syntax match   typescriptGlobalSymbolDot /\./ contained nextgroup=typescriptSymbolStaticProp,typescriptSymbolStaticMethod,typescriptProp
@@ -18,5 +13,3 @@ endif
 syntax keyword typescriptSymbolStaticMethod contained for keyFor nextgroup=typescriptFuncCallArg
 if exists("did_typescript_hilink") | HiLink typescriptSymbolStaticMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/event.vim b/syntax/yats/event.vim
index 4fb2ff6ff..46c54913a 100644
--- a/syntax/yats/event.vim
+++ b/syntax/yats/event.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/event.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptAnimationEvent contained animationend animationiteration
 syntax keyword typescriptAnimationEvent contained animationstart beginEvent endEvent
@@ -166,5 +161,3 @@ syntax keyword typescriptServiceWorkerEvent contained install activate fetch
 syntax cluster events add=typescriptServiceWorkerEvent
 if exists("did_typescript_hilink") | HiLink typescriptServiceWorkerEvent Title
 endif
-
-endif
diff --git a/syntax/yats/node.vim b/syntax/yats/node.vim
index 98f859fd6..375f7dbd9 100644
--- a/syntax/yats/node.vim
+++ b/syntax/yats/node.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/node.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName global process
 syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName console Buffer
@@ -16,5 +11,3 @@ syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName setInte
 syntax keyword typescriptNodeGlobal containedin=typescriptIdentifierName clearInterval
 if exists("did_typescript_hilink") | HiLink typescriptNodeGlobal Structure
 endif
-
-endif
diff --git a/syntax/yats/test.vim b/syntax/yats/test.vim
index 7044a06af..bb4a60cbb 100644
--- a/syntax/yats/test.vim
+++ b/syntax/yats/test.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/test.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName describe
 syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName it test before
@@ -14,5 +9,3 @@ syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName afterEa
 syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName beforeAll
 syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName afterAll
 syntax keyword typescriptTestGlobal containedin=typescriptIdentifierName expect assert
-
-endif
diff --git a/syntax/yats/typescript.vim b/syntax/yats/typescript.vim
index 82a33ae1e..5bdde783d 100644
--- a/syntax/yats/typescript.vim
+++ b/syntax/yats/typescript.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/typescript.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Function Boolean
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Error EvalError
@@ -38,5 +33,3 @@ syntax keyword typescriptGlobalMethod containedin=typescriptIdentifierName encod
 syntax cluster props add=typescriptGlobalMethod
 if exists("did_typescript_hilink") | HiLink typescriptGlobalMethod Structure
 endif
-
-endif
diff --git a/syntax/yats/web-blob.vim b/syntax/yats/web-blob.vim
index 7ec46b3a5..b9f4c78a3 100644
--- a/syntax/yats/web-blob.vim
+++ b/syntax/yats/web-blob.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-blob.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Blob BlobBuilder
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName File FileReader
@@ -44,5 +39,3 @@ endif
 syntax keyword typescriptURLStaticMethod contained createObjectURL revokeObjectURL nextgroup=typescriptFuncCallArg
 if exists("did_typescript_hilink") | HiLink typescriptURLStaticMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/web-console.vim b/syntax/yats/web-console.vim
index ad0325792..ff40a3fa2 100644
--- a/syntax/yats/web-console.vim
+++ b/syntax/yats/web-console.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-console.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName console
 syntax keyword typescriptConsoleMethod contained count dir error group groupCollapsed nextgroup=typescriptFuncCallArg
@@ -14,5 +9,3 @@ syntax keyword typescriptConsoleMethod contained warn nextgroup=typescriptFuncCa
 syntax cluster props add=typescriptConsoleMethod
 if exists("did_typescript_hilink") | HiLink typescriptConsoleMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/web-crypto.vim b/syntax/yats/web-crypto.vim
index f4647e264..0e2f38aab 100644
--- a/syntax/yats/web-crypto.vim
+++ b/syntax/yats/web-crypto.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-crypto.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptCryptoGlobal containedin=typescriptIdentifierName crypto
 if exists("did_typescript_hilink") | HiLink typescriptCryptoGlobal Structure
@@ -23,5 +18,3 @@ syntax keyword typescriptCryptoMethod contained getRandomValues nextgroup=typesc
 syntax cluster props add=typescriptCryptoMethod
 if exists("did_typescript_hilink") | HiLink typescriptCryptoMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/web-encoding.vim b/syntax/yats/web-encoding.vim
index 1ba7a34c3..8728b5c21 100644
--- a/syntax/yats/web-encoding.vim
+++ b/syntax/yats/web-encoding.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-encoding.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptEncodingGlobal containedin=typescriptIdentifierName TextEncoder
 syntax keyword typescriptEncodingGlobal containedin=typescriptIdentifierName TextDecoder
@@ -19,5 +14,3 @@ syntax keyword typescriptEncodingMethod contained encode decode nextgroup=typesc
 syntax cluster props add=typescriptEncodingMethod
 if exists("did_typescript_hilink") | HiLink typescriptEncodingMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/web-fetch.vim b/syntax/yats/web-fetch.vim
index 370bc4939..7a815e91a 100644
--- a/syntax/yats/web-fetch.vim
+++ b/syntax/yats/web-fetch.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-fetch.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Headers Request
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Response
@@ -35,5 +30,3 @@ syntax keyword typescriptResponseMethod contained clone nextgroup=typescriptFunc
 syntax cluster props add=typescriptResponseMethod
 if exists("did_typescript_hilink") | HiLink typescriptResponseMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/web-geo.vim b/syntax/yats/web-geo.vim
index 0777b4356..b3d5e85a3 100644
--- a/syntax/yats/web-geo.vim
+++ b/syntax/yats/web-geo.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-geo.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Geolocation
 syntax keyword typescriptGeolocationMethod contained getCurrentPosition watchPosition nextgroup=typescriptFuncCallArg
@@ -13,5 +8,3 @@ syntax keyword typescriptGeolocationMethod contained clearWatch nextgroup=typesc
 syntax cluster props add=typescriptGeolocationMethod
 if exists("did_typescript_hilink") | HiLink typescriptGeolocationMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/web-history.vim b/syntax/yats/web-history.vim
index 380010237..e4f05850f 100644
--- a/syntax/yats/web-history.vim
+++ b/syntax/yats/web-history.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-history.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptBOMHistoryProp contained length current next previous state
 syntax keyword typescriptBOMHistoryProp contained scrollRestoration
@@ -16,5 +11,3 @@ syntax keyword typescriptBOMHistoryMethod contained back forward go pushState re
 syntax cluster props add=typescriptBOMHistoryMethod
 if exists("did_typescript_hilink") | HiLink typescriptBOMHistoryMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/web-location.vim b/syntax/yats/web-location.vim
index bac99ca17..6484f74bf 100644
--- a/syntax/yats/web-location.vim
+++ b/syntax/yats/web-location.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-location.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptBOMLocationProp contained href protocol host hostname port
 syntax keyword typescriptBOMLocationProp contained pathname search hash username password
@@ -17,5 +12,3 @@ syntax keyword typescriptBOMLocationMethod contained assign reload replace toStr
 syntax cluster props add=typescriptBOMLocationMethod
 if exists("did_typescript_hilink") | HiLink typescriptBOMLocationMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/web-navigator.vim b/syntax/yats/web-navigator.vim
index 800f42961..020212d35 100644
--- a/syntax/yats/web-navigator.vim
+++ b/syntax/yats/web-navigator.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-navigator.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptBOMNavigatorProp contained battery buildID connection cookieEnabled
 syntax keyword typescriptBOMNavigatorProp contained doNotTrack maxTouchPoints oscpu
@@ -27,5 +22,3 @@ syntax keyword typescriptServiceWorkerMethod contained register nextgroup=typesc
 syntax cluster props add=typescriptServiceWorkerMethod
 if exists("did_typescript_hilink") | HiLink typescriptServiceWorkerMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/web-network.vim b/syntax/yats/web-network.vim
index 88969b0b2..bffc3f522 100644
--- a/syntax/yats/web-network.vim
+++ b/syntax/yats/web-network.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-network.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName NetworkInformation
 syntax keyword typescriptBOMNetworkProp contained downlink downlinkMax effectiveType
@@ -13,5 +8,3 @@ syntax keyword typescriptBOMNetworkProp contained rtt type
 syntax cluster props add=typescriptBOMNetworkProp
 if exists("did_typescript_hilink") | HiLink typescriptBOMNetworkProp Keyword
 endif
-
-endif
diff --git a/syntax/yats/web-payment.vim b/syntax/yats/web-payment.vim
index ee41c25ca..43b429db6 100644
--- a/syntax/yats/web-payment.vim
+++ b/syntax/yats/web-payment.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-payment.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName PaymentRequest
 syntax keyword typescriptPaymentMethod contained show abort canMakePayment nextgroup=typescriptFuncCallArg
@@ -40,5 +35,3 @@ syntax keyword typescriptPaymentShippingOptionProp contained id label amount sel
 syntax cluster props add=typescriptPaymentShippingOptionProp
 if exists("did_typescript_hilink") | HiLink typescriptPaymentShippingOptionProp Keyword
 endif
-
-endif
diff --git a/syntax/yats/web-service-worker.vim b/syntax/yats/web-service-worker.vim
index 9f58e8eaa..708a7b9dd 100644
--- a/syntax/yats/web-service-worker.vim
+++ b/syntax/yats/web-service-worker.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-service-worker.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptServiceWorkerProp contained controller ready
 syntax cluster props add=typescriptServiceWorkerProp
@@ -21,5 +16,3 @@ syntax keyword typescriptCacheMethod contained keys nextgroup=typescriptFuncCall
 syntax cluster props add=typescriptCacheMethod
 if exists("did_typescript_hilink") | HiLink typescriptCacheMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/web-window.vim b/syntax/yats/web-window.vim
index 320aa37c2..13a40f927 100644
--- a/syntax/yats/web-window.vim
+++ b/syntax/yats/web-window.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-window.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptBOMWindowProp containedin=typescriptIdentifierName applicationCache
 syntax keyword typescriptBOMWindowProp containedin=typescriptIdentifierName closed
@@ -116,5 +111,3 @@ syntax keyword typescriptBOMWindowCons containedin=typescriptIdentifierName Quer
 syntax keyword typescriptBOMWindowCons containedin=typescriptIdentifierName XMLSerializer
 if exists("did_typescript_hilink") | HiLink typescriptBOMWindowCons Structure
 endif
-
-endif
diff --git a/syntax/yats/web-xhr.vim b/syntax/yats/web-xhr.vim
index 8a29191c8..ef70d0b24 100644
--- a/syntax/yats/web-xhr.vim
+++ b/syntax/yats/web-xhr.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web-xhr.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptXHRGlobal containedin=typescriptIdentifierName XMLHttpRequest
 if exists("did_typescript_hilink") | HiLink typescriptXHRGlobal Structure
@@ -21,5 +16,3 @@ syntax keyword typescriptXHRMethod contained open overrideMimeType send setReque
 syntax cluster props add=typescriptXHRMethod
 if exists("did_typescript_hilink") | HiLink typescriptXHRMethod Keyword
 endif
-
-endif
diff --git a/syntax/yats/web.vim b/syntax/yats/web.vim
index 960503519..fa7d36931 100644
--- a/syntax/yats/web.vim
+++ b/syntax/yats/web.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/yats/web.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 
 syntax keyword typescriptBOM containedin=typescriptIdentifierName AbortController
 syntax keyword typescriptBOM containedin=typescriptIdentifierName AbstractWorker AnalyserNode
@@ -256,5 +251,3 @@ syntax keyword typescriptBOM containedin=typescriptIdentifierName XDomainRequest
 syntax keyword typescriptBOM containedin=typescriptIdentifierName XMLHttpRequestEventTarget
 if exists("did_typescript_hilink") | HiLink typescriptBOM Structure
 endif
-
-endif
diff --git a/syntax/z8a.vim b/syntax/z8a.vim
index 856ed092e..c43253f13 100644
--- a/syntax/z8a.vim
+++ b/syntax/z8a.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/z8a.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('z8a', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'z8a') == -1
 
 " Vim syntax file
 " Language:	Z80 assembler asz80
@@ -108,5 +103,3 @@ hi def link z8aString		String
 
 let b:current_syntax = "z8a"
 " vim: ts=8
-
-endif
diff --git a/syntax/zephir.vim b/syntax/zephir.vim
index 838b3cc9d..54bfa05ed 100644
--- a/syntax/zephir.vim
+++ b/syntax/zephir.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/zephir.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zephir', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zephir') == -1
 
 " Copyright 2009 The Go Authors. All rights reserved.
 if exists("b:current_syntax")
@@ -140,5 +135,3 @@ syn sync minlines=500
 
 let b:current_syntax = "zephir"
 syn match       zepTypeHits          "<\w+>" contained display
-
-endif
diff --git a/syntax/zig.vim b/syntax/zig.vim
index f9d6fd5d1..0790689da 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/zig.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Vim syntax file
 " Language: Zig
@@ -111,5 +106,3 @@ hi def link zigStructure Structure
 hi def link zigStatement Statement
 hi def link zigConditional Conditional
 hi def link zigRepeat Repeat
-
-endif
diff --git a/syntax/zimbu.vim b/syntax/zimbu.vim
index e30c44962..3e1931219 100644
--- a/syntax/zimbu.vim
+++ b/syntax/zimbu.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/zimbu.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zimbu', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zimbu') == -1
 
 " Vim syntax file
 " Language:	Zimbu
@@ -167,5 +162,3 @@ hi def link zimbuError		Error
 let b:current_syntax = "zimbu"
 
 " vim: ts=8
-
-endif
diff --git a/syntax/zir.vim b/syntax/zir.vim
index be14a54b6..10033967c 100644
--- a/syntax/zir.vim
+++ b/syntax/zir.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/zir.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'zig') == -1
 
 " Vim syntax file
 " Language: Zir
@@ -57,5 +52,3 @@ hi def link zirBinNumber Constant
 
 hi def link zirGlobal Identifier
 hi def link zirLocal  Identifier
-
-endif
diff --git a/syntax/zsh.vim b/syntax/zsh.vim
index ac44ba264..fc5810af9 100644
--- a/syntax/zsh.vim
+++ b/syntax/zsh.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'syntax/zsh.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('sh', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sh') == -1
 
 " Shebang
 syn match shShebang "^#!.*$" containedin=shComment
@@ -63,5 +58,3 @@ hi def link shSemicolon Delimiter
 hi def link shShebang PreProc
 hi def link zshDelim Delimiter
 hi def link zshFlag Special
-
-endif

From 48d0bc7556ed5d0f697c814350dbcc101c2c025d Mon Sep 17 00:00:00 2001
From: ichizok <gclient.gaap@gmail.com>
Date: Sun, 25 Oct 2020 19:10:44 +0900
Subject: [PATCH 188/299] Fix the filter of 'rtp' (#606)

On Windows, should handle both slash and backslash as the path separator
in checking a path in 'rtp'.
---
 autoload/polyglot/util.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autoload/polyglot/util.vim b/autoload/polyglot/util.vim
index 6d5caf882..f0fd0388a 100644
--- a/autoload/polyglot/util.vim
+++ b/autoload/polyglot/util.vim
@@ -10,7 +10,7 @@ if exists('g:polyglot_disabled')
     let base = split(pkg, '\.')
     if len(base) > 0
       let s:disabled_packages[pkg] = 1
-      call add(s:new_polyglot_disabled, base[0]) 
+      call add(s:new_polyglot_disabled, base[0])
     endif
   endfor
 else
@@ -22,7 +22,7 @@ let s:base = expand('<sfile>:p:h:h:h')
 
 func polyglot#util#Filter(idx, val)
   let val = fnamemodify(a:val . '/', ':p:h')
-  return resolve(val) !=? s:base && stridx(val, $VIMRUNTIME) == -1 && val !~? '/after$'
+  return resolve(val) !=? s:base && stridx(val, $VIMRUNTIME) == -1 && val !~? '[/\\]after$'
 endfunc
 
 let s:rtp = join(filter(split(&rtp, ','), function('polyglot#util#Filter')), ',')

From 81ada1101ecbb0bc6dbaeef42e997e62129b36cc Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 25 Oct 2020 11:11:45 +0100
Subject: [PATCH 189/299] Remove debugging code, closes #607

---
 ftplugin/ruby.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index d2bd231a3..cbf047e0d 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -7,7 +7,7 @@ endif
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-loadedbad
+
 if (exists("b:did_ftplugin"))
   finish
 endif

From 45a7512dea0599efaf96e8a2cad3fac7be61cf5d Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 25 Oct 2020 20:33:44 +0100
Subject: [PATCH 190/299] Preserve loading order of plugins, fixes #608

---
 after/ftplugin/cabal.vim                 |    2 +-
 after/ftplugin/coffee.vim                |    2 +-
 after/ftplugin/haskell.vim               |    2 +-
 after/ftplugin/html.vim                  |    2 +-
 after/ftplugin/idris.vim                 |    2 +-
 after/ftplugin/idris2.vim                |    2 +-
 after/ftplugin/javascript-1.vim          |    2 +-
 after/ftplugin/javascript-2.vim          |    2 +-
 after/ftplugin/javascriptreact.vim       |    2 +-
 after/ftplugin/jsx.vim                   |    2 +-
 after/ftplugin/llvm.vim                  |    2 +-
 after/ftplugin/puppet.vim                |    2 +-
 after/ftplugin/tsx.vim                   |    2 +-
 after/ftplugin/typescriptreact.vim       |    2 +-
 after/indent/html.vim                    |    2 +-
 after/indent/javascript-1.vim            |    2 +-
 after/indent/javascript-2.vim            |    2 +-
 after/indent/javascriptreact.vim         |    2 +-
 after/indent/jsx.vim                     |    2 +-
 after/indent/objc.vim                    |    2 +-
 after/indent/tsx.vim                     |    2 +-
 after/indent/typescript.vim              |    2 +-
 after/indent/typescriptreact.vim         |    2 +-
 after/syntax/c.vim                       |    2 +-
 after/syntax/coffee.vim                  |    2 +-
 after/syntax/cpp.vim                     |    2 +-
 after/syntax/haskell.vim                 |    2 +-
 after/syntax/help.vim                    |    2 +-
 after/syntax/html.vim                    |    2 +-
 after/syntax/html/aria.vim               |    2 +-
 after/syntax/html/electron.vim           |    2 +-
 after/syntax/html/rdfa.vim               |    2 +-
 after/syntax/idris.vim                   |    2 +-
 after/syntax/idris2.vim                  |    2 +-
 after/syntax/javascript.vim              |    2 +-
 after/syntax/javascript/graphql.vim      |    2 +-
 after/syntax/javascript/html5.vim        |    2 +-
 after/syntax/javascript/sql.vim          |    2 +-
 after/syntax/javascriptreact.vim         |    2 +-
 after/syntax/javascriptreact/graphql.vim |    2 +-
 after/syntax/jsx.vim                     |    2 +-
 after/syntax/jsx_pretty.vim              |    2 +-
 after/syntax/llvm.vim                    |    2 +-
 after/syntax/mdx.vim                     |    2 +-
 after/syntax/mma.vim                     |    2 +-
 after/syntax/objc.vim                    |    2 +-
 after/syntax/reason.vim                  |    2 +-
 after/syntax/reason/graphql.vim          |    2 +-
 after/syntax/rspec.vim                   |    2 +-
 after/syntax/ruby.vim                    |    2 +-
 after/syntax/rust.vim                    |    2 +-
 after/syntax/tsx.vim                     |    2 +-
 after/syntax/typescript/graphql.vim      |    2 +-
 after/syntax/typescriptreact.vim         |    2 +-
 after/syntax/typescriptreact/graphql.vim |    2 +-
 after/syntax/vue/graphql.vim             |    2 +-
 after/syntax/zsh.vim                     |    2 +-
 autoload/LaTeXtoUnicode.vim              |    2 +-
 autoload/RstFold.vim                     |    2 +-
 autoload/ada.vim                         |    2 +-
 autoload/cargo.vim                       |    2 +-
 autoload/cargo/quickfix.vim              |    2 +-
 autoload/clojurecomplete.vim             |    2 +-
 autoload/coffee.vim                      |    2 +-
 autoload/crystal/indent.vim              |    2 +-
 autoload/crystal_lang.vim                |    2 +-
 autoload/csv.vim                         |    2 +-
 autoload/dart.vim                        |    2 +-
 autoload/db/adapter/ecto.vim             |    2 +-
 autoload/ecrystal.vim                    |    2 +-
 autoload/elixir/indent.vim               |    2 +-
 autoload/elixir/util.vim                 |    2 +-
 autoload/fish.vim                        |    2 +-
 autoload/fsharp.vim                      |    2 +-
 autoload/fzf_gitignore.vim               |    2 +-
 autoload/go/config.vim                   |    2 +-
 autoload/graphql.vim                     |    2 +-
 autoload/htmlcomplete.vim                |    2 +-
 autoload/jsonnet.vim                     |    2 +-
 autoload/jsx_pretty/comment.vim          |    2 +-
 autoload/jsx_pretty/indent.vim           |    2 +-
 autoload/julia.vim                       |    2 +-
 autoload/julia/doc.vim                   |    2 +-
 autoload/julia_blocks.vim                |    2 +-
 autoload/julia_latex_symbols.vim         |    2 +-
 autoload/ledger.vim                      |    2 +-
 autoload/nim.vim                         |    2 +-
 autoload/polyglot/util.vim               |   64 --
 autoload/pony.vim                        |    2 +-
 autoload/puppet/align.vim                |    2 +-
 autoload/puppet/ctags.vim                |    2 +-
 autoload/puppet/format.vim               |    2 +-
 autoload/python/utils.vim                |    2 +-
 autoload/requirements.vim                |    2 +-
 autoload/rubycomplete.vim                |    2 +-
 autoload/rust.vim                        |    2 +-
 autoload/rust/debugging.vim              |    2 +-
 autoload/rust/delimitmate.vim            |    2 +-
 autoload/rust/tags.vim                   |    2 +-
 autoload/rustfmt.vim                     |    2 +-
 autoload/smt2.vim                        |    2 +-
 autoload/terraform.vim                   |    2 +-
 autoload/vital/_crystal.vim              |    2 +-
 autoload/vital/_crystal/ColorEcho.vim    |    2 +-
 autoload/vital/_crystal/Data/List.vim    |    2 +-
 autoload/vital/_crystal/Data/String.vim  |    2 +-
 autoload/vital/_crystal/Process.vim      |    2 +-
 autoload/vital/_crystal/Web/JSON.vim     |    2 +-
 autoload/vital/crystal.vim               |    2 +-
 autoload/xml/aria.vim                    |    2 +-
 autoload/xml/html5.vim                   |    2 +-
 autoload/xml/xsd.vim                     |    2 +-
 autoload/zig/config.vim                  |    2 +-
 autoload/zig/fmt.vim                     |    2 +-
 autoload/zig/list.vim                    |    2 +-
 autoload/zig/util.vim                    |    2 +-
 compiler/ant.vim                         |    2 +-
 compiler/bdf.vim                         |    2 +-
 compiler/cake.vim                        |    2 +-
 compiler/cargo.vim                       |    2 +-
 compiler/coffee.vim                      |    2 +-
 compiler/credo.vim                       |    2 +-
 compiler/cryptol.vim                     |    2 +-
 compiler/cs.vim                          |    2 +-
 compiler/cucumber.vim                    |    2 +-
 compiler/dot.vim                         |    2 +-
 compiler/eruby.vim                       |    2 +-
 compiler/exunit.vim                      |    2 +-
 compiler/fish.vim                        |    2 +-
 compiler/go.vim                          |    2 +-
 compiler/gradle.vim                      |    2 +-
 compiler/gradlew.vim                     |    2 +-
 compiler/haml.vim                        |    2 +-
 compiler/ledger.vim                      |    2 +-
 compiler/lilypond.vim                    |    2 +-
 compiler/ls.vim                          |    2 +-
 compiler/mix.vim                         |    2 +-
 compiler/nim.vim                         |    2 +-
 compiler/nix-build.vim                   |    2 +-
 compiler/ocaml.vim                       |    2 +-
 compiler/powershell.vim                  |    2 +-
 compiler/python.vim                      |    2 +-
 compiler/rake.vim                        |    2 +-
 compiler/rspec.vim                       |    2 +-
 compiler/ruby.vim                        |    2 +-
 compiler/rubyunit.vim                    |    2 +-
 compiler/rustc.vim                       |    2 +-
 compiler/sass.vim                        |    2 +-
 compiler/sbt.vim                         |    2 +-
 compiler/swift.vim                       |    2 +-
 compiler/tcl.vim                         |    2 +-
 compiler/tex.vim                         |    2 +-
 compiler/tidy.vim                        |    2 +-
 compiler/typescript.vim                  |    2 +-
 extras/flow.vim                          |    2 +-
 extras/jsdoc.vim                         |    2 +-
 extras/ngdoc.vim                         |    2 +-
 ftdetect/polyglot.vim                    | 1279 ++++++++++++----------
 ftplugin/8th.vim                         |    2 +-
 ftplugin/a2ps.vim                        |    2 +-
 ftplugin/aap.vim                         |    2 +-
 ftplugin/abap.vim                        |    2 +-
 ftplugin/abaqus.vim                      |    2 +-
 ftplugin/ada.vim                         |    2 +-
 ftplugin/alsaconf.vim                    |    2 +-
 ftplugin/ansible.vim                     |    2 +-
 ftplugin/ansible_hosts.vim               |    2 +-
 ftplugin/ant.vim                         |    2 +-
 ftplugin/arch.vim                        |    2 +-
 ftplugin/art.vim                         |    2 +-
 ftplugin/aspvbs.vim                      |    2 +-
 ftplugin/automake.vim                    |    2 +-
 ftplugin/awk.vim                         |    2 +-
 ftplugin/bdf.vim                         |    2 +-
 ftplugin/blade.vim                       |    2 +-
 ftplugin/bst.vim                         |    2 +-
 ftplugin/bzl.vim                         |    2 +-
 ftplugin/caddyfile.vim                   |    2 +-
 ftplugin/calendar.vim                    |    2 +-
 ftplugin/cdrdaoconf.vim                  |    2 +-
 ftplugin/cfg.vim                         |    2 +-
 ftplugin/ch.vim                          |    2 +-
 ftplugin/clojure.vim                     |    2 +-
 ftplugin/cobol.vim                       |    2 +-
 ftplugin/coffee.vim                      |    2 +-
 ftplugin/conf.vim                        |    2 +-
 ftplugin/config.vim                      |    2 +-
 ftplugin/crm.vim                         |    2 +-
 ftplugin/cryptol/folding.vim             |    2 +-
 ftplugin/crystal.vim                     |    2 +-
 ftplugin/cs.vim                          |    2 +-
 ftplugin/csc.vim                         |    2 +-
 ftplugin/css.vim                         |    2 +-
 ftplugin/csv.vim                         |    2 +-
 ftplugin/cucumber.vim                    |    2 +-
 ftplugin/cvsrc.vim                       |    2 +-
 ftplugin/dart.vim                        |    2 +-
 ftplugin/debchangelog.vim                |    2 +-
 ftplugin/debcontrol.vim                  |    2 +-
 ftplugin/denyhosts.vim                   |    2 +-
 ftplugin/dhall.vim                       |    2 +-
 ftplugin/dictconf.vim                    |    2 +-
 ftplugin/dictdconf.vim                   |    2 +-
 ftplugin/diff.vim                        |    2 +-
 ftplugin/dircolors.vim                   |    2 +-
 ftplugin/docker-compose.vim              |    2 +-
 ftplugin/dockerfile.vim                  |    2 +-
 ftplugin/dosbatch.vim                    |    2 +-
 ftplugin/dosini.vim                      |    2 +-
 ftplugin/dtd.vim                         |    2 +-
 ftplugin/dune.vim                        |    2 +-
 ftplugin/ecrystal.vim                    |    2 +-
 ftplugin/eelixir.vim                     |    2 +-
 ftplugin/elinks.vim                      |    2 +-
 ftplugin/elixir.vim                      |    2 +-
 ftplugin/embeddedpuppet.vim              |    2 +-
 ftplugin/ember-script.vim                |    2 +-
 ftplugin/emblem.vim                      |    2 +-
 ftplugin/eruby.vim                       |    2 +-
 ftplugin/eterm.vim                       |    2 +-
 ftplugin/falcon.vim                      |    2 +-
 ftplugin/fennel.vim                      |    2 +-
 ftplugin/fetchmail.vim                   |    2 +-
 ftplugin/fish.vim                        |    2 +-
 ftplugin/fortran.vim                     |    2 +-
 ftplugin/framescript.vim                 |    2 +-
 ftplugin/fvwm.vim                        |    2 +-
 ftplugin/gdb.vim                         |    2 +-
 ftplugin/git.vim                         |    2 +-
 ftplugin/gitcommit.vim                   |    2 +-
 ftplugin/gitconfig.vim                   |    2 +-
 ftplugin/gitignore.vim                   |    2 +-
 ftplugin/gitrebase.vim                   |    2 +-
 ftplugin/gitsendemail.vim                |    2 +-
 ftplugin/gpg.vim                         |    2 +-
 ftplugin/graphql.vim                     |    2 +-
 ftplugin/groovy.vim                      |    2 +-
 ftplugin/group.vim                       |    2 +-
 ftplugin/grub.vim                        |    2 +-
 ftplugin/haml.vim                        |    2 +-
 ftplugin/hamster.vim                     |    2 +-
 ftplugin/handlebars.vim                  |    2 +-
 ftplugin/hcl.vim                         |    2 +-
 ftplugin/help.vim                        |    2 +-
 ftplugin/hgcommit.vim                    |    2 +-
 ftplugin/hive.vim                        |    2 +-
 ftplugin/hog.vim                         |    2 +-
 ftplugin/hostconf.vim                    |    2 +-
 ftplugin/hostsaccess.vim                 |    2 +-
 ftplugin/html.vim                        |    2 +-
 ftplugin/htmldjango.vim                  |    2 +-
 ftplugin/i3config.vim                    |    2 +-
 ftplugin/idris.vim                       |    2 +-
 ftplugin/idris2.vim                      |    2 +-
 ftplugin/indent.vim                      |    2 +-
 ftplugin/ion.vim                         |    2 +-
 ftplugin/j.vim                           |    2 +-
 ftplugin/java.vim                        |    2 +-
 ftplugin/jproperties.vim                 |    2 +-
 ftplugin/jq.vim                          |    2 +-
 ftplugin/json.vim                        |    2 +-
 ftplugin/jsonnet.vim                     |    2 +-
 ftplugin/jsp.vim                         |    2 +-
 ftplugin/julia.vim                       |    2 +-
 ftplugin/juliadoc.vim                    |    2 +-
 ftplugin/kconfig.vim                     |    2 +-
 ftplugin/kotlin.vim                      |    2 +-
 ftplugin/kwt.vim                         |    2 +-
 ftplugin/ld.vim                          |    2 +-
 ftplugin/less.vim                        |    2 +-
 ftplugin/lftp.vim                        |    2 +-
 ftplugin/libao.vim                       |    2 +-
 ftplugin/lilypond.vim                    |    2 +-
 ftplugin/limits.vim                      |    2 +-
 ftplugin/liquid.vim                      |    2 +-
 ftplugin/lisp.vim                        |    2 +-
 ftplugin/litcoffee.vim                   |    2 +-
 ftplugin/llvm.vim                        |    2 +-
 ftplugin/logcheck.vim                    |    2 +-
 ftplugin/loginaccess.vim                 |    2 +-
 ftplugin/logindefs.vim                   |    2 +-
 ftplugin/logtalk.vim                     |    2 +-
 ftplugin/lprolog.vim                     |    2 +-
 ftplugin/ls.vim                          |    2 +-
 ftplugin/m4.vim                          |    2 +-
 ftplugin/mail.vim                        |    2 +-
 ftplugin/mailaliases.vim                 |    2 +-
 ftplugin/mailcap.vim                     |    2 +-
 ftplugin/make.vim                        |    2 +-
 ftplugin/mako.vim                        |    2 +-
 ftplugin/manconf.vim                     |    2 +-
 ftplugin/markdown.vim                    |    2 +-
 ftplugin/meson.vim                       |    2 +-
 ftplugin/mf.vim                          |    2 +-
 ftplugin/mma.vim                         |    2 +-
 ftplugin/modconf.vim                     |    2 +-
 ftplugin/moon.vim                        |    2 +-
 ftplugin/mp.vim                          |    2 +-
 ftplugin/mplayerconf.vim                 |    2 +-
 ftplugin/mrxvtrc.vim                     |    2 +-
 ftplugin/mustache.vim                    |    2 +-
 ftplugin/muttrc.vim                      |    2 +-
 ftplugin/nanorc.vim                      |    2 +-
 ftplugin/neomuttrc.vim                   |    2 +-
 ftplugin/netrc.vim                       |    2 +-
 ftplugin/nginx.vim                       |    2 +-
 ftplugin/nix.vim                         |    2 +-
 ftplugin/nroff.vim                       |    2 +-
 ftplugin/nsis.vim                        |    2 +-
 ftplugin/oasis.vim                       |    2 +-
 ftplugin/objc.vim                        |    2 +-
 ftplugin/ocaml.vim                       |    2 +-
 ftplugin/ocamlbuild_tags.vim             |    2 +-
 ftplugin/occam.vim                       |    2 +-
 ftplugin/omake.vim                       |    2 +-
 ftplugin/opencl.vim                      |    2 +-
 ftplugin/pamconf.vim                     |    2 +-
 ftplugin/pascal.vim                      |    2 +-
 ftplugin/passwd.vim                      |    2 +-
 ftplugin/pdf.vim                         |    2 +-
 ftplugin/perl.vim                        |    2 +-
 ftplugin/pinfo.vim                       |    2 +-
 ftplugin/plantuml.vim                    |    2 +-
 ftplugin/pony.vim                        |    2 +-
 ftplugin/postscr.vim                     |    2 +-
 ftplugin/procmail.vim                    |    2 +-
 ftplugin/prolog.vim                      |    2 +-
 ftplugin/protocols.vim                   |    2 +-
 ftplugin/ps1.vim                         |    2 +-
 ftplugin/ps1xml.vim                      |    2 +-
 ftplugin/pug.vim                         |    2 +-
 ftplugin/puppet.vim                      |    2 +-
 ftplugin/puppet_tagbar.vim               |    2 +-
 ftplugin/purescript.vim                  |    2 +-
 ftplugin/pyrex.vim                       |    2 +-
 ftplugin/qml.vim                         |    2 +-
 ftplugin/quake.vim                       |    2 +-
 ftplugin/racket.vim                      |    2 +-
 ftplugin/raku.vim                        |    2 +-
 ftplugin/raml.vim                        |    2 +-
 ftplugin/razor.vim                       |    2 +-
 ftplugin/readline.vim                    |    2 +-
 ftplugin/reva.vim                        |    2 +-
 ftplugin/rmd.vim                         |    2 +-
 ftplugin/rnc.vim                         |    2 +-
 ftplugin/rnoweb.vim                      |    2 +-
 ftplugin/rpl.vim                         |    2 +-
 ftplugin/rrst.vim                        |    2 +-
 ftplugin/rst.vim                         |    2 +-
 ftplugin/ruby.vim                        |    2 +-
 ftplugin/rust.vim                        |    2 +-
 ftplugin/rust/tagbar.vim                 |    2 +-
 ftplugin/sass.vim                        |    2 +-
 ftplugin/sbt.vim                         |    2 +-
 ftplugin/scala.vim                       |    2 +-
 ftplugin/scala.xpt.vim                   |    2 +-
 ftplugin/scala/tagbar.vim                |    2 +-
 ftplugin/scheme.vim                      |    2 +-
 ftplugin/screen.vim                      |    2 +-
 ftplugin/scss.vim                        |    2 +-
 ftplugin/sensors.vim                     |    2 +-
 ftplugin/services.vim                    |    2 +-
 ftplugin/setserial.vim                   |    2 +-
 ftplugin/sexplib.vim                     |    2 +-
 ftplugin/sieve.vim                       |    2 +-
 ftplugin/slim.vim                        |    2 +-
 ftplugin/slpconf.vim                     |    2 +-
 ftplugin/slpreg.vim                      |    2 +-
 ftplugin/slpspi.vim                      |    2 +-
 ftplugin/smt2.vim                        |    2 +-
 ftplugin/solidity.vim                    |    2 +-
 ftplugin/spec.vim                        |    2 +-
 ftplugin/sql.vim                         |    2 +-
 ftplugin/sshconfig.vim                   |    2 +-
 ftplugin/stylus.vim                      |    2 +-
 ftplugin/sudoers.vim                     |    2 +-
 ftplugin/svelte.vim                      |    2 +-
 ftplugin/swift.vim                       |    2 +-
 ftplugin/swiftgyb.vim                    |    2 +-
 ftplugin/sysctl.vim                      |    2 +-
 ftplugin/systemd.vim                     |    2 +-
 ftplugin/systemverilog.vim               |    2 +-
 ftplugin/tablegen.vim                    |    2 +-
 ftplugin/tcl.vim                         |    2 +-
 ftplugin/terminfo.vim                    |    2 +-
 ftplugin/terraform.vim                   |    2 +-
 ftplugin/tex.vim                         |    2 +-
 ftplugin/text.vim                        |    2 +-
 ftplugin/textile.vim                     |    2 +-
 ftplugin/tmux.vim                        |    2 +-
 ftplugin/toml.vim                        |    2 +-
 ftplugin/treetop.vim                     |    2 +-
 ftplugin/tt2html.vim                     |    2 +-
 ftplugin/twig.vim                        |    2 +-
 ftplugin/typescript.vim                  |    2 +-
 ftplugin/typescriptreact.vim             |    2 +-
 ftplugin/udevconf.vim                    |    2 +-
 ftplugin/udevperm.vim                    |    2 +-
 ftplugin/updatedb.vim                    |    2 +-
 ftplugin/vala.vim                        |    2 +-
 ftplugin/vb.vim                          |    2 +-
 ftplugin/verilog.vim                     |    2 +-
 ftplugin/vhdl.vim                        |    2 +-
 ftplugin/vlang.vim                       |    2 +-
 ftplugin/vroom.vim                       |    2 +-
 ftplugin/vue.vim                         |    2 +-
 ftplugin/wast.vim                        |    2 +-
 ftplugin/xdefaults.vim                   |    2 +-
 ftplugin/xf86conf.vim                    |    2 +-
 ftplugin/xhtml.vim                       |    2 +-
 ftplugin/xinetd.vim                      |    2 +-
 ftplugin/xmodmap.vim                     |    2 +-
 ftplugin/xs.vim                          |    2 +-
 ftplugin/xsd.vim                         |    2 +-
 ftplugin/xslt.vim                        |    2 +-
 ftplugin/yaml.vim                        |    2 +-
 ftplugin/zig.vim                         |    2 +-
 ftplugin/zimbu.vim                       |    2 +-
 indent/Jenkinsfile.vim                   |    2 +-
 indent/aap.vim                           |    2 +-
 indent/ada.vim                           |    2 +-
 indent/ansible.vim                       |    2 +-
 indent/ant.vim                           |    2 +-
 indent/applescript.vim                   |    2 +-
 indent/arduino.vim                       |    2 +-
 indent/autohotkey.vim                    |    2 +-
 indent/automake.vim                      |    2 +-
 indent/awk.vim                           |    2 +-
 indent/bib.vim                           |    2 +-
 indent/blade.vim                         |    2 +-
 indent/bst.vim                           |    2 +-
 indent/bzl.vim                           |    2 +-
 indent/cabal.vim                         |    2 +-
 indent/caddyfile.vim                     |    2 +-
 indent/cdl.vim                           |    2 +-
 indent/ch.vim                            |    2 +-
 indent/chaiscript.vim                    |    2 +-
 indent/clojure.vim                       |    2 +-
 indent/cmake.vim                         |    2 +-
 indent/cobol.vim                         |    2 +-
 indent/coffee.vim                        |    2 +-
 indent/config.vim                        |    2 +-
 indent/crystal.vim                       |    2 +-
 indent/cs.vim                            |    2 +-
 indent/css.vim                           |    2 +-
 indent/cucumber.vim                      |    2 +-
 indent/cuda.vim                          |    2 +-
 indent/cython.vim                        |    2 +-
 indent/d.vim                             |    2 +-
 indent/dart.vim                          |    2 +-
 indent/dictconf.vim                      |    2 +-
 indent/dictdconf.vim                     |    2 +-
 indent/dosbatch.vim                      |    2 +-
 indent/dtd.vim                           |    2 +-
 indent/dune.vim                          |    2 +-
 indent/dylan.vim                         |    2 +-
 indent/ecrystal.vim                      |    2 +-
 indent/eelixir.vim                       |    2 +-
 indent/elixir.vim                        |    2 +-
 indent/elm.vim                           |    2 +-
 indent/ember-script.vim                  |    2 +-
 indent/emblem.vim                        |    2 +-
 indent/erlang.vim                        |    2 +-
 indent/eruby.vim                         |    2 +-
 indent/eterm.vim                         |    2 +-
 indent/falcon.vim                        |    2 +-
 indent/fennel.vim                        |    2 +-
 indent/fish.vim                          |    2 +-
 indent/fortran.vim                       |    2 +-
 indent/framescript.vim                   |    2 +-
 indent/fsharp.vim                        |    2 +-
 indent/gdscript3.vim                     |    2 +-
 indent/gitconfig.vim                     |    2 +-
 indent/gitolite.vim                      |    2 +-
 indent/glsl.vim                          |    2 +-
 indent/go.vim                            |    2 +-
 indent/gohtmltmpl.vim                    |    2 +-
 indent/graphql.vim                       |    2 +-
 indent/haml.vim                          |    2 +-
 indent/hamster.vim                       |    2 +-
 indent/handlebars.vim                    |    2 +-
 indent/haskell.vim                       |    2 +-
 indent/hcl.vim                           |    2 +-
 indent/hog.vim                           |    2 +-
 indent/html.vim                          |    2 +-
 indent/htmldjango.vim                    |    2 +-
 indent/idris.vim                         |    2 +-
 indent/idris2.vim                        |    2 +-
 indent/j.vim                             |    2 +-
 indent/java.vim                          |    2 +-
 indent/javascript.vim                    |    2 +-
 indent/json.vim                          |    2 +-
 indent/jsp.vim                           |    2 +-
 indent/jst.vim                           |    2 +-
 indent/julia.vim                         |    2 +-
 indent/kotlin.vim                        |    2 +-
 indent/ld.vim                            |    2 +-
 indent/ledger.vim                        |    2 +-
 indent/less.vim                          |    2 +-
 indent/lifelines.vim                     |    2 +-
 indent/lilypond.vim                      |    2 +-
 indent/liquid.vim                        |    2 +-
 indent/lisp.vim                          |    2 +-
 indent/litcoffee.vim                     |    2 +-
 indent/llvm.vim                          |    2 +-
 indent/logtalk.vim                       |    2 +-
 indent/ls.vim                            |    2 +-
 indent/lua.vim                           |    2 +-
 indent/mail.vim                          |    2 +-
 indent/make.vim                          |    2 +-
 indent/mako.vim                          |    2 +-
 indent/markdown.vim                      |    2 +-
 indent/meson.vim                         |    2 +-
 indent/mf.vim                            |    2 +-
 indent/moon.vim                          |    2 +-
 indent/mp.vim                            |    2 +-
 indent/mustache.vim                      |    2 +-
 indent/nginx.vim                         |    2 +-
 indent/nim.vim                           |    2 +-
 indent/nix.vim                           |    2 +-
 indent/nsis.vim                          |    2 +-
 indent/ocaml.vim                         |    2 +-
 indent/occam.vim                         |    2 +-
 indent/octave.vim                        |    2 +-
 indent/odin.vim                          |    2 +-
 indent/omake.vim                         |    2 +-
 indent/opencl.vim                        |    2 +-
 indent/pascal.vim                        |    2 +-
 indent/perl.vim                          |    2 +-
 indent/pgsql.vim                         |    2 +-
 indent/plantuml.vim                      |    2 +-
 indent/pony.vim                          |    2 +-
 indent/postscr.vim                       |    2 +-
 indent/pov.vim                           |    2 +-
 indent/prolog.vim                        |    2 +-
 indent/proto.vim                         |    2 +-
 indent/ps1.vim                           |    2 +-
 indent/pug.vim                           |    2 +-
 indent/puppet.vim                        |    2 +-
 indent/purescript.vim                    |    2 +-
 indent/pyrex.vim                         |    2 +-
 indent/python.vim                        |    2 +-
 indent/qml.vim                           |    2 +-
 indent/racket.vim                        |    2 +-
 indent/raku.vim                          |    2 +-
 indent/razor.vim                         |    2 +-
 indent/readline.vim                      |    2 +-
 indent/reason.vim                        |    2 +-
 indent/rmd.vim                           |    2 +-
 indent/rnoweb.vim                        |    2 +-
 indent/rpl.vim                           |    2 +-
 indent/rrst.vim                          |    2 +-
 indent/rst.vim                           |    2 +-
 indent/ruby.vim                          |    2 +-
 indent/rust.vim                          |    2 +-
 indent/sas.vim                           |    2 +-
 indent/sass.vim                          |    2 +-
 indent/scala.vim                         |    2 +-
 indent/scheme.vim                        |    2 +-
 indent/scss.vim                          |    2 +-
 indent/sdl.vim                           |    2 +-
 indent/slim.vim                          |    2 +-
 indent/slime.vim                         |    2 +-
 indent/sml.vim                           |    2 +-
 indent/solidity.vim                      |    2 +-
 indent/sql.vim                           |    2 +-
 indent/sshconfig.vim                     |    2 +-
 indent/stylus.vim                        |    2 +-
 indent/svelte.vim                        |    2 +-
 indent/svg.vim                           |    2 +-
 indent/swift.vim                         |    2 +-
 indent/systemverilog.vim                 |    2 +-
 indent/tcl.vim                           |    2 +-
 indent/teraterm.vim                      |    2 +-
 indent/terraform.vim                     |    2 +-
 indent/tex.vim                           |    2 +-
 indent/tf.vim                            |    2 +-
 indent/tilde.vim                         |    2 +-
 indent/treetop.vim                       |    2 +-
 indent/twig.vim                          |    2 +-
 indent/typescript.vim                    |    2 +-
 indent/typescriptreact.vim               |    2 +-
 indent/vala.vim                          |    2 +-
 indent/vb.vim                            |    2 +-
 indent/velocity.vim                      |    2 +-
 indent/verilog.vim                       |    2 +-
 indent/vhdl.vim                          |    2 +-
 indent/vlang.vim                         |    2 +-
 indent/vroom.vim                         |    2 +-
 indent/vue.vim                           |    2 +-
 indent/wast.vim                          |    2 +-
 indent/xf86conf.vim                      |    2 +-
 indent/xhtml.vim                         |    2 +-
 indent/xinetd.vim                        |    2 +-
 indent/xsd.vim                           |    2 +-
 indent/xslt.vim                          |    2 +-
 indent/yacc.vim                          |    2 +-
 indent/yaml.vim                          |    2 +-
 indent/zig.vim                           |    2 +-
 indent/zimbu.vim                         |    2 +-
 plugin/polyglot.vim                      |    2 +-
 scripts/build                            |    4 +-
 syntax/8th.vim                           |    2 +-
 syntax/Jenkinsfile.vim                   |    2 +-
 syntax/a2ps.vim                          |    2 +-
 syntax/a65.vim                           |    2 +-
 syntax/aap.vim                           |    2 +-
 syntax/abap.vim                          |    2 +-
 syntax/abaqus.vim                        |    2 +-
 syntax/abc.vim                           |    2 +-
 syntax/abel.vim                          |    2 +-
 syntax/acedb.vim                         |    2 +-
 syntax/ada.vim                           |    2 +-
 syntax/ahdl.vim                          |    2 +-
 syntax/aidl.vim                          |    2 +-
 syntax/alsaconf.vim                      |    2 +-
 syntax/aml.vim                           |    2 +-
 syntax/ampl.vim                          |    2 +-
 syntax/ansible.vim                       |    2 +-
 syntax/ansible_hosts.vim                 |    2 +-
 syntax/ant.vim                           |    2 +-
 syntax/apache.vim                        |    2 +-
 syntax/apachestyle.vim                   |    2 +-
 syntax/apiblueprint.vim                  |    2 +-
 syntax/applescript.vim                   |    2 +-
 syntax/aptconf.vim                       |    2 +-
 syntax/arch.vim                          |    2 +-
 syntax/arduino.vim                       |    2 +-
 syntax/art.vim                           |    2 +-
 syntax/asciidoc.vim                      |    2 +-
 syntax/asl.vim                           |    2 +-
 syntax/asn.vim                           |    2 +-
 syntax/aspperl.vim                       |    2 +-
 syntax/aspvbs.vim                        |    2 +-
 syntax/asterisk.vim                      |    2 +-
 syntax/asteriskvm.vim                    |    2 +-
 syntax/atlas.vim                         |    2 +-
 syntax/autodoc.vim                       |    2 +-
 syntax/autoit.vim                        |    2 +-
 syntax/automake.vim                      |    2 +-
 syntax/ave.vim                           |    2 +-
 syntax/awk.vim                           |    2 +-
 syntax/b.vim                             |    2 +-
 syntax/basic.vim                         |    2 +-
 syntax/basic/class.vim                   |    2 +-
 syntax/basic/cluster.vim                 |    2 +-
 syntax/basic/decorator.vim               |    2 +-
 syntax/basic/doc.vim                     |    2 +-
 syntax/basic/function.vim                |    2 +-
 syntax/basic/identifiers.vim             |    2 +-
 syntax/basic/keyword.vim                 |    2 +-
 syntax/basic/literal.vim                 |    2 +-
 syntax/basic/members.vim                 |    2 +-
 syntax/basic/object.vim                  |    2 +-
 syntax/basic/patch.vim                   |    2 +-
 syntax/basic/reserved.vim                |    2 +-
 syntax/basic/symbols.vim                 |    2 +-
 syntax/basic/type.vim                    |    2 +-
 syntax/bc.vim                            |    2 +-
 syntax/bdf.vim                           |    2 +-
 syntax/bib.vim                           |    2 +-
 syntax/bindzone.vim                      |    2 +-
 syntax/blade.vim                         |    2 +-
 syntax/blank.vim                         |    2 +-
 syntax/brewfile.vim                      |    2 +-
 syntax/bsdl.vim                          |    2 +-
 syntax/bst.vim                           |    2 +-
 syntax/bzl.vim                           |    2 +-
 syntax/bzr.vim                           |    2 +-
 syntax/c.vim                             |    2 +-
 syntax/cabal-1.vim                       |    2 +-
 syntax/cabal-2.vim                       |    2 +-
 syntax/caddyfile.vim                     |    2 +-
 syntax/calendar.vim                      |    2 +-
 syntax/carp.vim                          |    2 +-
 syntax/catalog.vim                       |    2 +-
 syntax/cdl.vim                           |    2 +-
 syntax/cdrdaoconf.vim                    |    2 +-
 syntax/cdrtoc.vim                        |    2 +-
 syntax/cf.vim                            |    2 +-
 syntax/cfg.vim                           |    2 +-
 syntax/ch.vim                            |    2 +-
 syntax/chaiscript.vim                    |    2 +-
 syntax/chaskell.vim                      |    2 +-
 syntax/chill.vim                         |    2 +-
 syntax/chordpro.vim                      |    2 +-
 syntax/cl.vim                            |    2 +-
 syntax/clean.vim                         |    2 +-
 syntax/clojure.vim                       |    2 +-
 syntax/cmake.vim                         |    2 +-
 syntax/cmod.vim                          |    2 +-
 syntax/cmusrc.vim                        |    2 +-
 syntax/cobol.vim                         |    2 +-
 syntax/coco.vim                          |    2 +-
 syntax/coffee.vim                        |    2 +-
 syntax/common.vim                        |    2 +-
 syntax/conaryrecipe.vim                  |    2 +-
 syntax/conf.vim                          |    2 +-
 syntax/config.vim                        |    2 +-
 syntax/cpp.vim                           |    2 +-
 syntax/cql.vim                           |    2 +-
 syntax/crm.vim                           |    2 +-
 syntax/crontab.vim                       |    2 +-
 syntax/cryptol.vim                       |    2 +-
 syntax/crystal.vim                       |    2 +-
 syntax/cs.vim                            |    2 +-
 syntax/csc.vim                           |    2 +-
 syntax/csdl.vim                          |    2 +-
 syntax/csp.vim                           |    2 +-
 syntax/css.vim                           |    2 +-
 syntax/csv.vim                           |    2 +-
 syntax/cterm.vim                         |    2 +-
 syntax/cucumber.vim                      |    2 +-
 syntax/cuda.vim                          |    2 +-
 syntax/cuesheet.vim                      |    2 +-
 syntax/cupl.vim                          |    2 +-
 syntax/cuplsim.vim                       |    2 +-
 syntax/cvs.vim                           |    2 +-
 syntax/cvsrc.vim                         |    2 +-
 syntax/cynpp.vim                         |    2 +-
 syntax/d.vim                             |    2 +-
 syntax/dart.vim                          |    2 +-
 syntax/datascript.vim                    |    2 +-
 syntax/dcd.vim                           |    2 +-
 syntax/dcov.vim                          |    2 +-
 syntax/dd.vim                            |    2 +-
 syntax/ddoc.vim                          |    2 +-
 syntax/debchangelog.vim                  |    2 +-
 syntax/debcontrol.vim                    |    2 +-
 syntax/debcopyright.vim                  |    2 +-
 syntax/debsources.vim                    |    2 +-
 syntax/def.vim                           |    2 +-
 syntax/denyhosts.vim                     |    2 +-
 syntax/desc.vim                          |    2 +-
 syntax/desktop.vim                       |    2 +-
 syntax/dhall.vim                         |    2 +-
 syntax/dictconf.vim                      |    2 +-
 syntax/dictdconf.vim                     |    2 +-
 syntax/diff.vim                          |    2 +-
 syntax/dircolors.vim                     |    2 +-
 syntax/django.vim                        |    2 +-
 syntax/dnsmasq.vim                       |    2 +-
 syntax/docker-compose.vim                |    2 +-
 syntax/dockerfile.vim                    |    2 +-
 syntax/dosbatch.vim                      |    2 +-
 syntax/dosini.vim                        |    2 +-
 syntax/dot.vim                           |    2 +-
 syntax/dracula.vim                       |    2 +-
 syntax/dsdl.vim                          |    2 +-
 syntax/dsl.vim                           |    2 +-
 syntax/dtd.vim                           |    2 +-
 syntax/dts.vim                           |    2 +-
 syntax/dune.vim                          |    2 +-
 syntax/dylan.vim                         |    2 +-
 syntax/dylanintr.vim                     |    2 +-
 syntax/dylanlid.vim                      |    2 +-
 syntax/ecd.vim                           |    2 +-
 syntax/ecrystal.vim                      |    2 +-
 syntax/edif.vim                          |    2 +-
 syntax/eelixir.vim                       |    2 +-
 syntax/elf.vim                           |    2 +-
 syntax/elinks.vim                        |    2 +-
 syntax/elixir.vim                        |    2 +-
 syntax/elm.vim                           |    2 +-
 syntax/elmfilt.vim                       |    2 +-
 syntax/embeddedpuppet.vim                |    2 +-
 syntax/ember-script.vim                  |    2 +-
 syntax/emblem.vim                        |    2 +-
 syntax/erlang.vim                        |    2 +-
 syntax/eruby.vim                         |    2 +-
 syntax/esmtprc.vim                       |    2 +-
 syntax/esqlc.vim                         |    2 +-
 syntax/esterel.vim                       |    2 +-
 syntax/eterm.vim                         |    2 +-
 syntax/exim.vim                          |    2 +-
 syntax/expect.vim                        |    2 +-
 syntax/exports.vim                       |    2 +-
 syntax/falcon.vim                        |    2 +-
 syntax/fan.vim                           |    2 +-
 syntax/fbs.vim                           |    2 +-
 syntax/fennel.vim                        |    2 +-
 syntax/ferm.vim                          |    2 +-
 syntax/fetchmail.vim                     |    2 +-
 syntax/fgl.vim                           |    2 +-
 syntax/fish.vim                          |    2 +-
 syntax/flow.vim                          |    2 +-
 syntax/focexec.vim                       |    2 +-
 syntax/forth.vim                         |    2 +-
 syntax/fortran.vim                       |    2 +-
 syntax/framescript.vim                   |    2 +-
 syntax/freebasic.vim                     |    2 +-
 syntax/fsharp.vim                        |    2 +-
 syntax/fstab.vim                         |    2 +-
 syntax/fvwm.vim                          |    2 +-
 syntax/gdb.vim                           |    2 +-
 syntax/gdmo.vim                          |    2 +-
 syntax/gdscript3.vim                     |    2 +-
 syntax/gedcom.vim                        |    2 +-
 syntax/git.vim                           |    2 +-
 syntax/gitcommit.vim                     |    2 +-
 syntax/gitconfig.vim                     |    2 +-
 syntax/gitignore.vim                     |    2 +-
 syntax/gitolite.vim                      |    2 +-
 syntax/gitrebase.vim                     |    2 +-
 syntax/gitsendemail.vim                  |    2 +-
 syntax/gkrellmrc.vim                     |    2 +-
 syntax/glsl.vim                          |    2 +-
 syntax/gmpl.vim                          |    2 +-
 syntax/gnash.vim                         |    2 +-
 syntax/gnuplot.vim                       |    2 +-
 syntax/go.vim                            |    2 +-
 syntax/godebugoutput.vim                 |    2 +-
 syntax/godebugstacktrace.vim             |    2 +-
 syntax/godebugvariables.vim              |    2 +-
 syntax/godefstack.vim                    |    2 +-
 syntax/gohtmltmpl.vim                    |    2 +-
 syntax/gomod.vim                         |    2 +-
 syntax/gotexttmpl.vim                    |    2 +-
 syntax/gp.vim                            |    2 +-
 syntax/gpg.vim                           |    2 +-
 syntax/grads.vim                         |    2 +-
 syntax/graphql.vim                       |    2 +-
 syntax/gretl.vim                         |    2 +-
 syntax/groovy.vim                        |    2 +-
 syntax/group.vim                         |    2 +-
 syntax/grub.vim                          |    2 +-
 syntax/gsl.vim                           |    2 +-
 syntax/gsp.vim                           |    2 +-
 syntax/gtkrc.vim                         |    2 +-
 syntax/haml.vim                          |    2 +-
 syntax/hamster.vim                       |    2 +-
 syntax/handlebars.vim                    |    2 +-
 syntax/haproxy.vim                       |    2 +-
 syntax/haskell.vim                       |    2 +-
 syntax/haste.vim                         |    2 +-
 syntax/hastepreproc.vim                  |    2 +-
 syntax/haxe.vim                          |    2 +-
 syntax/hb.vim                            |    2 +-
 syntax/hcl.vim                           |    2 +-
 syntax/helm.vim                          |    2 +-
 syntax/help.vim                          |    2 +-
 syntax/hercules.vim                      |    2 +-
 syntax/hex.vim                           |    2 +-
 syntax/hgcommit.vim                      |    2 +-
 syntax/hive.vim                          |    2 +-
 syntax/hog.vim                           |    2 +-
 syntax/hollywood.vim                     |    2 +-
 syntax/hostconf.vim                      |    2 +-
 syntax/hostsaccess.vim                   |    2 +-
 syntax/html.vim                          |    2 +-
 syntax/htmldjango.vim                    |    2 +-
 syntax/htmlm4.vim                        |    2 +-
 syntax/i3config.vim                      |    2 +-
 syntax/ibasic.vim                        |    2 +-
 syntax/icalendar.vim                     |    2 +-
 syntax/icemenu.vim                       |    2 +-
 syntax/icon.vim                          |    2 +-
 syntax/idris.vim                         |    2 +-
 syntax/idris2.vim                        |    2 +-
 syntax/indent.vim                        |    2 +-
 syntax/inform.vim                        |    2 +-
 syntax/initng.vim                        |    2 +-
 syntax/inittab.vim                       |    2 +-
 syntax/ion.vim                           |    2 +-
 syntax/ipfilter.vim                      |    2 +-
 syntax/iss.vim                           |    2 +-
 syntax/ist.vim                           |    2 +-
 syntax/j.vim                             |    2 +-
 syntax/jal.vim                           |    2 +-
 syntax/jam.vim                           |    2 +-
 syntax/java.vim                          |    2 +-
 syntax/javacc.vim                        |    2 +-
 syntax/javascript.vim                    |    2 +-
 syntax/jess.vim                          |    2 +-
 syntax/jgraph.vim                        |    2 +-
 syntax/jinja2.vim                        |    2 +-
 syntax/jovial.vim                        |    2 +-
 syntax/jproperties.vim                   |    2 +-
 syntax/jq.vim                            |    2 +-
 syntax/json.vim                          |    2 +-
 syntax/json5.vim                         |    2 +-
 syntax/jsonnet.vim                       |    2 +-
 syntax/jsp.vim                           |    2 +-
 syntax/jst.vim                           |    2 +-
 syntax/julia.vim                         |    2 +-
 syntax/juliadoc.vim                      |    2 +-
 syntax/kconfig.vim                       |    2 +-
 syntax/kivy.vim                          |    2 +-
 syntax/kix.vim                           |    2 +-
 syntax/kotlin.vim                        |    2 +-
 syntax/kscript.vim                       |    2 +-
 syntax/kwt.vim                           |    2 +-
 syntax/lace.vim                          |    2 +-
 syntax/latte.vim                         |    2 +-
 syntax/ld.vim                            |    2 +-
 syntax/ldif.vim                          |    2 +-
 syntax/ledger.vim                        |    2 +-
 syntax/less.vim                          |    2 +-
 syntax/lex.vim                           |    2 +-
 syntax/lftp.vim                          |    2 +-
 syntax/lhaskell.vim                      |    2 +-
 syntax/libao.vim                         |    2 +-
 syntax/lidris.vim                        |    2 +-
 syntax/lidris2.vim                       |    2 +-
 syntax/lifelines.vim                     |    2 +-
 syntax/lilo.vim                          |    2 +-
 syntax/lilypond-words.vim                |    2 +-
 syntax/lilypond.vim                      |    2 +-
 syntax/limits.vim                        |    2 +-
 syntax/liquid.vim                        |    2 +-
 syntax/lisp.vim                          |    2 +-
 syntax/litcoffee.vim                     |    2 +-
 syntax/lite.vim                          |    2 +-
 syntax/litestep.vim                      |    2 +-
 syntax/llvm.vim                          |    2 +-
 syntax/log.vim                           |    2 +-
 syntax/loginaccess.vim                   |    2 +-
 syntax/logindefs.vim                     |    2 +-
 syntax/logtalk.vim                       |    2 +-
 syntax/lotos.vim                         |    2 +-
 syntax/lout.vim                          |    2 +-
 syntax/lpc.vim                           |    2 +-
 syntax/lprolog.vim                       |    2 +-
 syntax/ls.vim                            |    2 +-
 syntax/lsl.vim                           |    2 +-
 syntax/lss.vim                           |    2 +-
 syntax/lua.vim                           |    2 +-
 syntax/lynx.vim                          |    2 +-
 syntax/m4.vim                            |    2 +-
 syntax/mail.vim                          |    2 +-
 syntax/mailaliases.vim                   |    2 +-
 syntax/mailcap.vim                       |    2 +-
 syntax/make.vim                          |    2 +-
 syntax/mako.vim                          |    2 +-
 syntax/mallard.vim                       |    2 +-
 syntax/manconf.vim                       |    2 +-
 syntax/maple.vim                         |    2 +-
 syntax/markdown.vim                      |    2 +-
 syntax/mason.vim                         |    2 +-
 syntax/master.vim                        |    2 +-
 syntax/mel.vim                           |    2 +-
 syntax/merlin.vim                        |    2 +-
 syntax/meson.vim                         |    2 +-
 syntax/messages.vim                      |    2 +-
 syntax/mf.vim                            |    2 +-
 syntax/mgl.vim                           |    2 +-
 syntax/mgp.vim                           |    2 +-
 syntax/mib.vim                           |    2 +-
 syntax/mix.vim                           |    2 +-
 syntax/mma.vim                           |    2 +-
 syntax/mmp.vim                           |    2 +-
 syntax/modconf.vim                       |    2 +-
 syntax/modula2.vim                       |    2 +-
 syntax/modula3.vim                       |    2 +-
 syntax/monk.vim                          |    2 +-
 syntax/moo.vim                           |    2 +-
 syntax/moon.vim                          |    2 +-
 syntax/mp.vim                            |    2 +-
 syntax/mplayerconf.vim                   |    2 +-
 syntax/mrxvtrc.vim                       |    2 +-
 syntax/msidl.vim                         |    2 +-
 syntax/msql.vim                          |    2 +-
 syntax/mupad.vim                         |    2 +-
 syntax/murphi.vim                        |    2 +-
 syntax/mush.vim                          |    2 +-
 syntax/mustache.vim                      |    2 +-
 syntax/muttrc.vim                        |    2 +-
 syntax/mysql.vim                         |    2 +-
 syntax/n1ql.vim                          |    2 +-
 syntax/named.vim                         |    2 +-
 syntax/nanorc.vim                        |    2 +-
 syntax/natural.vim                       |    2 +-
 syntax/ncf.vim                           |    2 +-
 syntax/neomuttrc.vim                     |    2 +-
 syntax/netrc.vim                         |    2 +-
 syntax/nginx.vim                         |    2 +-
 syntax/nim.vim                           |    2 +-
 syntax/ninja.vim                         |    2 +-
 syntax/nix.vim                           |    2 +-
 syntax/nqc.vim                           |    2 +-
 syntax/nroff.vim                         |    2 +-
 syntax/nsis.vim                          |    2 +-
 syntax/oasis.vim                         |    2 +-
 syntax/obj.vim                           |    2 +-
 syntax/ocaml.vim                         |    2 +-
 syntax/ocamlbuild_tags.vim               |    2 +-
 syntax/occam.vim                         |    2 +-
 syntax/ocpbuild.vim                      |    2 +-
 syntax/ocpbuildroot.vim                  |    2 +-
 syntax/octave.vim                        |    2 +-
 syntax/odin.vim                          |    2 +-
 syntax/omake.vim                         |    2 +-
 syntax/omnimark.vim                      |    2 +-
 syntax/opam.vim                          |    2 +-
 syntax/opencl.vim                        |    2 +-
 syntax/openroad.vim                      |    2 +-
 syntax/opl.vim                           |    2 +-
 syntax/ora.vim                           |    2 +-
 syntax/pamconf.vim                       |    2 +-
 syntax/pamenv.vim                        |    2 +-
 syntax/papp.vim                          |    2 +-
 syntax/pascal.vim                        |    2 +-
 syntax/passwd.vim                        |    2 +-
 syntax/pccts.vim                         |    2 +-
 syntax/pdf.vim                           |    2 +-
 syntax/perl.vim                          |    2 +-
 syntax/pf.vim                            |    2 +-
 syntax/pfmain.vim                        |    2 +-
 syntax/pgsql.vim                         |    2 +-
 syntax/php.vim                           |    2 +-
 syntax/pike.vim                          |    2 +-
 syntax/pilrc.vim                         |    2 +-
 syntax/pine.vim                          |    2 +-
 syntax/pinfo.vim                         |    2 +-
 syntax/plantuml.vim                      |    2 +-
 syntax/pli.vim                           |    2 +-
 syntax/plm.vim                           |    2 +-
 syntax/plp.vim                           |    2 +-
 syntax/plsql.vim                         |    2 +-
 syntax/po.vim                            |    2 +-
 syntax/pod.vim                           |    2 +-
 syntax/pony.vim                          |    2 +-
 syntax/postscr.vim                       |    2 +-
 syntax/pov.vim                           |    2 +-
 syntax/povini.vim                        |    2 +-
 syntax/ppd.vim                           |    2 +-
 syntax/ppwiz.vim                         |    2 +-
 syntax/privoxy.vim                       |    2 +-
 syntax/procmail.vim                      |    2 +-
 syntax/prolog.vim                        |    2 +-
 syntax/promela.vim                       |    2 +-
 syntax/proto.vim                         |    2 +-
 syntax/protocols.vim                     |    2 +-
 syntax/ps1.vim                           |    2 +-
 syntax/ps1xml.vim                        |    2 +-
 syntax/psf.vim                           |    2 +-
 syntax/pug.vim                           |    2 +-
 syntax/puppet.vim                        |    2 +-
 syntax/purescript.vim                    |    2 +-
 syntax/pyrex.vim                         |    2 +-
 syntax/python.vim                        |    2 +-
 syntax/qmake.vim                         |    2 +-
 syntax/qml.vim                           |    2 +-
 syntax/quake.vim                         |    2 +-
 syntax/racket.vim                        |    2 +-
 syntax/radiance.vim                      |    2 +-
 syntax/ragel.vim                         |    2 +-
 syntax/raku.vim                          |    2 +-
 syntax/raml.vim                          |    2 +-
 syntax/ratpoison.vim                     |    2 +-
 syntax/razor.vim                         |    2 +-
 syntax/rc.vim                            |    2 +-
 syntax/rcs.vim                           |    2 +-
 syntax/readline.vim                      |    2 +-
 syntax/reason.vim                        |    2 +-
 syntax/rego.vim                          |    2 +-
 syntax/remind.vim                        |    2 +-
 syntax/requirements.vim                  |    2 +-
 syntax/resolv.vim                        |    2 +-
 syntax/reva.vim                          |    2 +-
 syntax/rexx.vim                          |    2 +-
 syntax/rhelp.vim                         |    2 +-
 syntax/rib.vim                           |    2 +-
 syntax/rmd.vim                           |    2 +-
 syntax/rnc.vim                           |    2 +-
 syntax/rng.vim                           |    2 +-
 syntax/rnoweb-1.vim                      |    2 +-
 syntax/rnoweb-2.vim                      |    2 +-
 syntax/robots.vim                        |    2 +-
 syntax/rpcgen.vim                        |    2 +-
 syntax/rpl.vim                           |    2 +-
 syntax/rrst.vim                          |    2 +-
 syntax/rst.vim                           |    2 +-
 syntax/rtf.vim                           |    2 +-
 syntax/ruby.vim                          |    2 +-
 syntax/rust.vim                          |    2 +-
 syntax/samba.vim                         |    2 +-
 syntax/sas.vim                           |    2 +-
 syntax/sass.vim                          |    2 +-
 syntax/sather.vim                        |    2 +-
 syntax/sbt.vim                           |    2 +-
 syntax/scala.vim                         |    2 +-
 syntax/scheme.vim                        |    2 +-
 syntax/scilab.vim                        |    2 +-
 syntax/screen.vim                        |    2 +-
 syntax/scss.vim                          |    2 +-
 syntax/sd.vim                            |    2 +-
 syntax/sdc.vim                           |    2 +-
 syntax/sdl.vim                           |    2 +-
 syntax/sed.vim                           |    2 +-
 syntax/sensors.vim                       |    2 +-
 syntax/services.vim                      |    2 +-
 syntax/setserial.vim                     |    2 +-
 syntax/sexplib.vim                       |    2 +-
 syntax/sh.vim                            |    2 +-
 syntax/sieve.vim                         |    2 +-
 syntax/sil.vim                           |    2 +-
 syntax/simula.vim                        |    2 +-
 syntax/sinda.vim                         |    2 +-
 syntax/sisu.vim                          |    2 +-
 syntax/skill.vim                         |    2 +-
 syntax/slang.vim                         |    2 +-
 syntax/slice.vim                         |    2 +-
 syntax/slim.vim                          |    2 +-
 syntax/slime.vim                         |    2 +-
 syntax/slpconf.vim                       |    2 +-
 syntax/slpreg.vim                        |    2 +-
 syntax/slpspi.vim                        |    2 +-
 syntax/slrnrc.vim                        |    2 +-
 syntax/slrnsc.vim                        |    2 +-
 syntax/sm.vim                            |    2 +-
 syntax/smarty.vim                        |    2 +-
 syntax/smcl.vim                          |    2 +-
 syntax/smhl.vim                          |    2 +-
 syntax/smith.vim                         |    2 +-
 syntax/sml.vim                           |    2 +-
 syntax/smt2.vim                          |    2 +-
 syntax/snobol4.vim                       |    2 +-
 syntax/solidity.vim                      |    2 +-
 syntax/spec.vim                          |    2 +-
 syntax/spice.vim                         |    2 +-
 syntax/spup.vim                          |    2 +-
 syntax/spyce.vim                         |    2 +-
 syntax/sql.vim                           |    2 +-
 syntax/sqlj.vim                          |    2 +-
 syntax/sqloracle.vim                     |    2 +-
 syntax/sqr.vim                           |    2 +-
 syntax/squid.vim                         |    2 +-
 syntax/srec.vim                          |    2 +-
 syntax/sshconfig.vim                     |    2 +-
 syntax/sshdconfig.vim                    |    2 +-
 syntax/st.vim                            |    2 +-
 syntax/stata.vim                         |    2 +-
 syntax/stp.vim                           |    2 +-
 syntax/stylus.vim                        |    2 +-
 syntax/sudoers.vim                       |    2 +-
 syntax/svelte.vim                        |    2 +-
 syntax/svg.vim                           |    2 +-
 syntax/svn.vim                           |    2 +-
 syntax/swift.vim                         |    2 +-
 syntax/swiftgyb.vim                      |    2 +-
 syntax/sxhkdrc.vim                       |    2 +-
 syntax/sysctl.vim                        |    2 +-
 syntax/systemd.vim                       |    2 +-
 syntax/systemverilog.vim                 |    2 +-
 syntax/tablegen.vim                      |    2 +-
 syntax/tads.vim                          |    2 +-
 syntax/tags.vim                          |    2 +-
 syntax/tak.vim                           |    2 +-
 syntax/tap.vim                           |    2 +-
 syntax/taskdata.vim                      |    2 +-
 syntax/taskedit.vim                      |    2 +-
 syntax/tcl.vim                           |    2 +-
 syntax/template.vim                      |    2 +-
 syntax/teraterm.vim                      |    2 +-
 syntax/terminfo.vim                      |    2 +-
 syntax/terraform.vim                     |    2 +-
 syntax/tex.vim                           |    2 +-
 syntax/texinfo.vim                       |    2 +-
 syntax/texmf.vim                         |    2 +-
 syntax/textile.vim                       |    2 +-
 syntax/tf.vim                            |    2 +-
 syntax/thrift.vim                        |    2 +-
 syntax/tidy.vim                          |    2 +-
 syntax/tilde.vim                         |    2 +-
 syntax/tli.vim                           |    2 +-
 syntax/tmux.vim                          |    2 +-
 syntax/toml.vim                          |    2 +-
 syntax/tpp.vim                           |    2 +-
 syntax/tptp.vim                          |    2 +-
 syntax/trasys.vim                        |    2 +-
 syntax/treetop.vim                       |    2 +-
 syntax/trustees.vim                      |    2 +-
 syntax/tsalt.vim                         |    2 +-
 syntax/tsscl.vim                         |    2 +-
 syntax/tssgm.vim                         |    2 +-
 syntax/tssop.vim                         |    2 +-
 syntax/tt2.vim                           |    2 +-
 syntax/tt2html.vim                       |    2 +-
 syntax/tt2js.vim                         |    2 +-
 syntax/twig.vim                          |    2 +-
 syntax/typescript.vim                    |    2 +-
 syntax/typescriptreact.vim               |    2 +-
 syntax/uc.vim                            |    2 +-
 syntax/udevconf.vim                      |    2 +-
 syntax/udevperm.vim                      |    2 +-
 syntax/uil.vim                           |    2 +-
 syntax/unison.vim                        |    2 +-
 syntax/updatedb.vim                      |    2 +-
 syntax/upstart.vim                       |    2 +-
 syntax/upstreamdat.vim                   |    2 +-
 syntax/upstreaminstalllog.vim            |    2 +-
 syntax/upstreamlog.vim                   |    2 +-
 syntax/usserverlog.vim                   |    2 +-
 syntax/usw2kagtlog.vim                   |    2 +-
 syntax/vala.vim                          |    2 +-
 syntax/vb.vim                            |    2 +-
 syntax/vbnet.vim                         |    2 +-
 syntax/vcl.vim                           |    2 +-
 syntax/velocity.vim                      |    2 +-
 syntax/vera.vim                          |    2 +-
 syntax/verilog.vim                       |    2 +-
 syntax/verilogams.vim                    |    2 +-
 syntax/vgrindefs.vim                     |    2 +-
 syntax/vhdl.vim                          |    2 +-
 syntax/vimgo.vim                         |    2 +-
 syntax/viminfo.vim                       |    2 +-
 syntax/vlang.vim                         |    2 +-
 syntax/vmasm.vim                         |    2 +-
 syntax/voscm.vim                         |    2 +-
 syntax/vrml.vim                          |    2 +-
 syntax/vroom.vim                         |    2 +-
 syntax/vue.vim                           |    2 +-
 syntax/wast.vim                          |    2 +-
 syntax/webmacro.vim                      |    2 +-
 syntax/wget.vim                          |    2 +-
 syntax/winbatch.vim                      |    2 +-
 syntax/wml.vim                           |    2 +-
 syntax/wsh.vim                           |    2 +-
 syntax/wsml.vim                          |    2 +-
 syntax/wvdial.vim                        |    2 +-
 syntax/xdc.vim                           |    2 +-
 syntax/xdefaults.vim                     |    2 +-
 syntax/xf86conf.vim                      |    2 +-
 syntax/xhtml.vim                         |    2 +-
 syntax/xinetd.vim                        |    2 +-
 syntax/xmath.vim                         |    2 +-
 syntax/xml.vim                           |    2 +-
 syntax/xmodmap.vim                       |    2 +-
 syntax/xpm.vim                           |    2 +-
 syntax/xpm2.vim                          |    2 +-
 syntax/xquery.vim                        |    2 +-
 syntax/xs.vim                            |    2 +-
 syntax/xsd.vim                           |    2 +-
 syntax/xsl.vim                           |    2 +-
 syntax/xslt.vim                          |    2 +-
 syntax/yacc.vim                          |    2 +-
 syntax/yaml.vim                          |    2 +-
 syntax/yats.vim                          |    2 +-
 syntax/yats/css.vim                      |    2 +-
 syntax/yats/dom-document.vim             |    2 +-
 syntax/yats/dom-elem.vim                 |    2 +-
 syntax/yats/dom-event.vim                |    2 +-
 syntax/yats/dom-form.vim                 |    2 +-
 syntax/yats/dom-node.vim                 |    2 +-
 syntax/yats/dom-storage.vim              |    2 +-
 syntax/yats/ecma-402.vim                 |    2 +-
 syntax/yats/es6-array.vim                |    2 +-
 syntax/yats/es6-date.vim                 |    2 +-
 syntax/yats/es6-function.vim             |    2 +-
 syntax/yats/es6-json.vim                 |    2 +-
 syntax/yats/es6-map.vim                  |    2 +-
 syntax/yats/es6-math.vim                 |    2 +-
 syntax/yats/es6-number.vim               |    2 +-
 syntax/yats/es6-object.vim               |    2 +-
 syntax/yats/es6-promise.vim              |    2 +-
 syntax/yats/es6-proxy.vim                |    2 +-
 syntax/yats/es6-reflect.vim              |    2 +-
 syntax/yats/es6-regexp.vim               |    2 +-
 syntax/yats/es6-set.vim                  |    2 +-
 syntax/yats/es6-string.vim               |    2 +-
 syntax/yats/es6-symbol.vim               |    2 +-
 syntax/yats/event.vim                    |    2 +-
 syntax/yats/node.vim                     |    2 +-
 syntax/yats/test.vim                     |    2 +-
 syntax/yats/typescript.vim               |    2 +-
 syntax/yats/web-blob.vim                 |    2 +-
 syntax/yats/web-console.vim              |    2 +-
 syntax/yats/web-crypto.vim               |    2 +-
 syntax/yats/web-encoding.vim             |    2 +-
 syntax/yats/web-fetch.vim                |    2 +-
 syntax/yats/web-geo.vim                  |    2 +-
 syntax/yats/web-history.vim              |    2 +-
 syntax/yats/web-location.vim             |    2 +-
 syntax/yats/web-navigator.vim            |    2 +-
 syntax/yats/web-network.vim              |    2 +-
 syntax/yats/web-payment.vim              |    2 +-
 syntax/yats/web-service-worker.vim       |    2 +-
 syntax/yats/web-window.vim               |    2 +-
 syntax/yats/web-xhr.vim                  |    2 +-
 syntax/yats/web.vim                      |    2 +-
 syntax/z8a.vim                           |    2 +-
 syntax/zephir.vim                        |    2 +-
 syntax/zig.vim                           |    2 +-
 syntax/zimbu.vim                         |    2 +-
 syntax/zir.vim                           |    2 +-
 syntax/zsh.vim                           |    2 +-
 1287 files changed, 1963 insertions(+), 1952 deletions(-)
 delete mode 100644 autoload/polyglot/util.vim

diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 461f6a241..80757d8e7 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim
index a039dd951..f6a750f63 100644
--- a/after/ftplugin/coffee.vim
+++ b/after/ftplugin/coffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cjsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cjsx')
   finish
 endif
 
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index 96ea4d047..03446e8ba 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/after/ftplugin/html.vim b/after/ftplugin/html.vim
index 6b0b48a21..ab2a8f2b0 100644
--- a/after/ftplugin/html.vim
+++ b/after/ftplugin/html.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/ftplugin/idris.vim b/after/ftplugin/idris.vim
index 4b38f4cee..1b973639c 100644
--- a/after/ftplugin/idris.vim
+++ b/after/ftplugin/idris.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/after/ftplugin/idris2.vim b/after/ftplugin/idris2.vim
index b7f25573f..55a57ff25 100644
--- a/after/ftplugin/idris2.vim
+++ b/after/ftplugin/idris2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-1.vim b/after/ftplugin/javascript-1.vim
index 8480c6e71..4ffa2117f 100644
--- a/after/ftplugin/javascript-1.vim
+++ b/after/ftplugin/javascript-1.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-2.vim b/after/ftplugin/javascript-2.vim
index f56dd82a7..5a311439f 100644
--- a/after/ftplugin/javascript-2.vim
+++ b/after/ftplugin/javascript-2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/javascriptreact.vim b/after/ftplugin/javascriptreact.vim
index be2ea1fc5..a757cdd74 100644
--- a/after/ftplugin/javascriptreact.vim
+++ b/after/ftplugin/javascriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
index f6f071311..02451a80f 100644
--- a/after/ftplugin/jsx.vim
+++ b/after/ftplugin/jsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/llvm.vim b/after/ftplugin/llvm.vim
index 192bf2f57..844021993 100644
--- a/after/ftplugin/llvm.vim
+++ b/after/ftplugin/llvm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim
index 8cbc99721..64b1699bb 100644
--- a/after/ftplugin/puppet.vim
+++ b/after/ftplugin/puppet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/after/ftplugin/tsx.vim b/after/ftplugin/tsx.vim
index 2b35ec46c..8c687fa62 100644
--- a/after/ftplugin/tsx.vim
+++ b/after/ftplugin/tsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/typescriptreact.vim b/after/ftplugin/typescriptreact.vim
index 07de9bb7b..75f2e3bb0 100644
--- a/after/ftplugin/typescriptreact.vim
+++ b/after/ftplugin/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/html.vim b/after/indent/html.vim
index 065106ca4..f33b27a18 100644
--- a/after/indent/html.vim
+++ b/after/indent/html.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/indent/javascript-1.vim b/after/indent/javascript-1.vim
index f56dd82a7..5a311439f 100644
--- a/after/indent/javascript-1.vim
+++ b/after/indent/javascript-1.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/javascript-2.vim b/after/indent/javascript-2.vim
index 24d297031..3177c0cbc 100644
--- a/after/indent/javascript-2.vim
+++ b/after/indent/javascript-2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/indent/javascriptreact.vim b/after/indent/javascriptreact.vim
index be2ea1fc5..a757cdd74 100644
--- a/after/indent/javascriptreact.vim
+++ b/after/indent/javascriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/jsx.vim b/after/indent/jsx.vim
index 394f20b7d..1ba02c466 100644
--- a/after/indent/jsx.vim
+++ b/after/indent/jsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/objc.vim b/after/indent/objc.vim
index ee6448612..13d4d32d1 100644
--- a/after/indent/objc.vim
+++ b/after/indent/objc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('objc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'objc')
   finish
 endif
 
diff --git a/after/indent/tsx.vim b/after/indent/tsx.vim
index 544568a75..f29ccbaf7 100644
--- a/after/indent/tsx.vim
+++ b/after/indent/tsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
index 8f0172c1a..1294bc59e 100644
--- a/after/indent/typescript.vim
+++ b/after/indent/typescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/indent/typescriptreact.vim b/after/indent/typescriptreact.vim
index 07de9bb7b..75f2e3bb0 100644
--- a/after/indent/typescriptreact.vim
+++ b/after/indent/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index d0478e01d..104976707 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cpp-modern', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cpp-modern')
   finish
 endif
 
diff --git a/after/syntax/coffee.vim b/after/syntax/coffee.vim
index 9b9f38a38..debd9aa90 100644
--- a/after/syntax/coffee.vim
+++ b/after/syntax/coffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cjsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cjsx')
   finish
 endif
 
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index b59b98596..517404f0c 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cpp-modern', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cpp-modern')
   finish
 endif
 
diff --git a/after/syntax/haskell.vim b/after/syntax/haskell.vim
index e109b2d78..61d828d2c 100644
--- a/after/syntax/haskell.vim
+++ b/after/syntax/haskell.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dhall', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dhall')
   finish
 endif
 
diff --git a/after/syntax/help.vim b/after/syntax/help.vim
index a43546cf2..0ee4a9caa 100644
--- a/after/syntax/help.vim
+++ b/after/syntax/help.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index 8bdc0b0f9..56ba064c5 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/html/aria.vim b/after/syntax/html/aria.vim
index 9e457bff9..ed5a83832 100644
--- a/after/syntax/html/aria.vim
+++ b/after/syntax/html/aria.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/html/electron.vim b/after/syntax/html/electron.vim
index 636e810da..d7bfa90fc 100644
--- a/after/syntax/html/electron.vim
+++ b/after/syntax/html/electron.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/html/rdfa.vim b/after/syntax/html/rdfa.vim
index ec7d714bc..529c2fcd6 100644
--- a/after/syntax/html/rdfa.vim
+++ b/after/syntax/html/rdfa.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/idris.vim b/after/syntax/idris.vim
index 01f5000e8..18a31e8a5 100644
--- a/after/syntax/idris.vim
+++ b/after/syntax/idris.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/after/syntax/idris2.vim b/after/syntax/idris2.vim
index 279e5875c..6371b9371 100644
--- a/after/syntax/idris2.vim
+++ b/after/syntax/idris2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim
index f56dd82a7..5a311439f 100644
--- a/after/syntax/javascript.vim
+++ b/after/syntax/javascript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index c0c737420..6044d6ae9 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/javascript/html5.vim b/after/syntax/javascript/html5.vim
index eaeaccb5d..683202d14 100644
--- a/after/syntax/javascript/html5.vim
+++ b/after/syntax/javascript/html5.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/javascript/sql.vim b/after/syntax/javascript/sql.vim
index 58e23b56b..f4feb7586 100644
--- a/after/syntax/javascript/sql.vim
+++ b/after/syntax/javascript/sql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('javascript-sql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'javascript-sql')
   finish
 endif
 
diff --git a/after/syntax/javascriptreact.vim b/after/syntax/javascriptreact.vim
index be2ea1fc5..a757cdd74 100644
--- a/after/syntax/javascriptreact.vim
+++ b/after/syntax/javascriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/javascriptreact/graphql.vim b/after/syntax/javascriptreact/graphql.vim
index 52628a1a1..308c17d7a 100644
--- a/after/syntax/javascriptreact/graphql.vim
+++ b/after/syntax/javascriptreact/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/jsx.vim b/after/syntax/jsx.vim
index 0a7a7e1ee..c8b8aa5df 100644
--- a/after/syntax/jsx.vim
+++ b/after/syntax/jsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/jsx_pretty.vim b/after/syntax/jsx_pretty.vim
index f05969c50..a6cb8a90c 100644
--- a/after/syntax/jsx_pretty.vim
+++ b/after/syntax/jsx_pretty.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/llvm.vim b/after/syntax/llvm.vim
index 6f3daebf3..e38d50414 100644
--- a/after/syntax/llvm.vim
+++ b/after/syntax/llvm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/after/syntax/mdx.vim b/after/syntax/mdx.vim
index 6fd7b9634..26ebf1984 100644
--- a/after/syntax/mdx.vim
+++ b/after/syntax/mdx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mdx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mdx')
   finish
 endif
 
diff --git a/after/syntax/mma.vim b/after/syntax/mma.vim
index 24d997554..2509d210c 100644
--- a/after/syntax/mma.vim
+++ b/after/syntax/mma.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mathematica', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mathematica')
   finish
 endif
 
diff --git a/after/syntax/objc.vim b/after/syntax/objc.vim
index 0541758da..78e41fd1e 100644
--- a/after/syntax/objc.vim
+++ b/after/syntax/objc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('objc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'objc')
   finish
 endif
 
diff --git a/after/syntax/reason.vim b/after/syntax/reason.vim
index f608bde10..0df633cbe 100644
--- a/after/syntax/reason.vim
+++ b/after/syntax/reason.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('reason', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'reason')
   finish
 endif
 
diff --git a/after/syntax/reason/graphql.vim b/after/syntax/reason/graphql.vim
index 00fe9b5da..2a54c4027 100644
--- a/after/syntax/reason/graphql.vim
+++ b/after/syntax/reason/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/rspec.vim b/after/syntax/rspec.vim
index 99905ddd6..355fe5247 100644
--- a/after/syntax/rspec.vim
+++ b/after/syntax/rspec.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rspec', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rspec')
   finish
 endif
 
diff --git a/after/syntax/ruby.vim b/after/syntax/ruby.vim
index e57c1d709..dea6003a3 100644
--- a/after/syntax/ruby.vim
+++ b/after/syntax/ruby.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('yard', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'yard')
   finish
 endif
 
diff --git a/after/syntax/rust.vim b/after/syntax/rust.vim
index bf17e031b..638c6dd80 100644
--- a/after/syntax/rust.vim
+++ b/after/syntax/rust.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/after/syntax/tsx.vim b/after/syntax/tsx.vim
index d400f4104..f3b436356 100644
--- a/after/syntax/tsx.vim
+++ b/after/syntax/tsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index 40425b895..cccdbc3e1 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/typescriptreact.vim b/after/syntax/typescriptreact.vim
index 07de9bb7b..75f2e3bb0 100644
--- a/after/syntax/typescriptreact.vim
+++ b/after/syntax/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/typescriptreact/graphql.vim b/after/syntax/typescriptreact/graphql.vim
index f9e7151fe..aa60a3aaa 100644
--- a/after/syntax/typescriptreact/graphql.vim
+++ b/after/syntax/typescriptreact/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/vue/graphql.vim b/after/syntax/vue/graphql.vim
index 52628a1a1..308c17d7a 100644
--- a/after/syntax/vue/graphql.vim
+++ b/after/syntax/vue/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/zsh.vim b/after/syntax/zsh.vim
index 5e9ff75c1..fc63d3c57 100644
--- a/after/syntax/zsh.vim
+++ b/after/syntax/zsh.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zinit', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zinit')
   finish
 endif
 
diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index bf0c7cc23..250d001a2 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/autoload/RstFold.vim b/autoload/RstFold.vim
index f340565b7..2907bc807 100644
--- a/autoload/RstFold.vim
+++ b/autoload/RstFold.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rst', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rst')
   finish
 endif
 
diff --git a/autoload/ada.vim b/autoload/ada.vim
index e54d05e22..207b3d07e 100644
--- a/autoload/ada.vim
+++ b/autoload/ada.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ada', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ada')
   finish
 endif
 
diff --git a/autoload/cargo.vim b/autoload/cargo.vim
index 232dca796..64caa2e23 100644
--- a/autoload/cargo.vim
+++ b/autoload/cargo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/cargo/quickfix.vim b/autoload/cargo/quickfix.vim
index 536e09e87..2cd41aa08 100644
--- a/autoload/cargo/quickfix.vim
+++ b/autoload/cargo/quickfix.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index ebecd5cda..9b724f384 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('clojure', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'clojure')
   finish
 endif
 
diff --git a/autoload/coffee.vim b/autoload/coffee.vim
index 12ea3f97b..b792182c8 100644
--- a/autoload/coffee.vim
+++ b/autoload/coffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/autoload/crystal/indent.vim b/autoload/crystal/indent.vim
index 488874694..cb40350f3 100644
--- a/autoload/crystal/indent.vim
+++ b/autoload/crystal/indent.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/crystal_lang.vim b/autoload/crystal_lang.vim
index 87060a642..911bb2416 100644
--- a/autoload/crystal_lang.vim
+++ b/autoload/crystal_lang.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/csv.vim b/autoload/csv.vim
index 20b519234..72402ce70 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('csv', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'csv')
   finish
 endif
 
diff --git a/autoload/dart.vim b/autoload/dart.vim
index 1e2c0e07d..308f68f3c 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dart', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dart')
   finish
 endif
 
diff --git a/autoload/db/adapter/ecto.vim b/autoload/db/adapter/ecto.vim
index af5da6ae1..b2179ab13 100644
--- a/autoload/db/adapter/ecto.vim
+++ b/autoload/db/adapter/ecto.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/autoload/ecrystal.vim b/autoload/ecrystal.vim
index 43a49edd9..c8679dec3 100644
--- a/autoload/ecrystal.vim
+++ b/autoload/ecrystal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index 7286de16b..d21cceb3f 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/autoload/elixir/util.vim b/autoload/elixir/util.vim
index e5c660f37..04d62b7df 100644
--- a/autoload/elixir/util.vim
+++ b/autoload/elixir/util.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/autoload/fish.vim b/autoload/fish.vim
index c9b498a83..e792f9a83 100644
--- a/autoload/fish.vim
+++ b/autoload/fish.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fish', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fish')
   finish
 endif
 
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index 525952ba1..e53bc68b8 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fsharp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fsharp')
   finish
 endif
 
diff --git a/autoload/fzf_gitignore.vim b/autoload/fzf_gitignore.vim
index f7914f242..c3426aa4b 100644
--- a/autoload/fzf_gitignore.vim
+++ b/autoload/fzf_gitignore.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gitignore', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gitignore')
   finish
 endif
 
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index d11bc8d9b..03b6c279d 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/autoload/graphql.vim b/autoload/graphql.vim
index b92751bb1..bfb879102 100644
--- a/autoload/graphql.vim
+++ b/autoload/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/autoload/htmlcomplete.vim b/autoload/htmlcomplete.vim
index 5b1b4ac52..bc124ac6a 100644
--- a/autoload/htmlcomplete.vim
+++ b/autoload/htmlcomplete.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/autoload/jsonnet.vim b/autoload/jsonnet.vim
index b93864636..b5303868f 100644
--- a/autoload/jsonnet.vim
+++ b/autoload/jsonnet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsonnet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsonnet')
   finish
 endif
 
diff --git a/autoload/jsx_pretty/comment.vim b/autoload/jsx_pretty/comment.vim
index 44dbf803d..3f31ded8b 100644
--- a/autoload/jsx_pretty/comment.vim
+++ b/autoload/jsx_pretty/comment.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/autoload/jsx_pretty/indent.vim b/autoload/jsx_pretty/indent.vim
index 3c5585a84..d425dd383 100644
--- a/autoload/jsx_pretty/indent.vim
+++ b/autoload/jsx_pretty/indent.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/autoload/julia.vim b/autoload/julia.vim
index e747028a3..fbec59d73 100644
--- a/autoload/julia.vim
+++ b/autoload/julia.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/autoload/julia/doc.vim b/autoload/julia/doc.vim
index 258c00648..c683d5cda 100644
--- a/autoload/julia/doc.vim
+++ b/autoload/julia/doc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/autoload/julia_blocks.vim b/autoload/julia_blocks.vim
index 6be2ba79a..3ac07914f 100644
--- a/autoload/julia_blocks.vim
+++ b/autoload/julia_blocks.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/autoload/julia_latex_symbols.vim b/autoload/julia_latex_symbols.vim
index 7f6fe0072..425b8603b 100644
--- a/autoload/julia_latex_symbols.vim
+++ b/autoload/julia_latex_symbols.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/autoload/ledger.vim b/autoload/ledger.vim
index 5b3f22033..452463316 100644
--- a/autoload/ledger.vim
+++ b/autoload/ledger.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ledger', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ledger')
   finish
 endif
 
diff --git a/autoload/nim.vim b/autoload/nim.vim
index 7bdfa867f..c913af993 100644
--- a/autoload/nim.vim
+++ b/autoload/nim.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nim', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nim')
   finish
 endif
 
diff --git a/autoload/polyglot/util.vim b/autoload/polyglot/util.vim
deleted file mode 100644
index f0fd0388a..000000000
--- a/autoload/polyglot/util.vim
+++ /dev/null
@@ -1,64 +0,0 @@
-" Restore 'cpoptions'
-let s:cpo_save = &cpo
-set cpo&vim
-
-let s:disabled_packages = {}
-let s:new_polyglot_disabled = []
-
-if exists('g:polyglot_disabled')
-  for pkg in g:polyglot_disabled
-    let base = split(pkg, '\.')
-    if len(base) > 0
-      let s:disabled_packages[pkg] = 1
-      call add(s:new_polyglot_disabled, base[0])
-    endif
-  endfor
-else
-  let g:polyglot_disabled_not_set = 1
-endif
-
-
-let s:base = expand('<sfile>:p:h:h:h')
-
-func polyglot#util#Filter(idx, val)
-  let val = fnamemodify(a:val . '/', ':p:h')
-  return resolve(val) !=? s:base && stridx(val, $VIMRUNTIME) == -1 && val !~? '[/\\]after$'
-endfunc
-
-let s:rtp = join(filter(split(&rtp, ','), function('polyglot#util#Filter')), ',')
-
-func polyglot#util#IsEnabled(type, file)
-  if a:file != "ftdetect"
-    let file = a:file[len(s:base) + 1:]
-    let files = globpath(s:rtp, file, 1, 1)
-    if !empty(files)
-      exec 'source' files[0]
-      return 0
-    endif
-  endif
-  if a:type == "jsx"
-    return !has_key(s:disabled_packages, "jsx") && !has_key(s:disabled_packages, "javascript")
-  endif
-  return !has_key(s:disabled_packages, a:type)
-endfunc
-
-func! polyglot#util#Verify()
-  if exists("g:polyglot_disabled_not_set")
-    if exists("g:polyglot_disabled")
-      echohl WarningMsg
-      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
-      echohl None
-    endif
-
-    unlet g:polyglot_disabled_not_set
-  endif
-endfunc
-
-" Save polyglot_disabled without postfixes
-if exists('g:polyglot_disabled')
-  let g:polyglot_disabled = s:new_polyglot_disabled
-endif
-
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save
diff --git a/autoload/pony.vim b/autoload/pony.vim
index 78386b6b6..d24bbd234 100644
--- a/autoload/pony.vim
+++ b/autoload/pony.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pony', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pony')
   finish
 endif
 
diff --git a/autoload/puppet/align.vim b/autoload/puppet/align.vim
index 51254120b..d9af9bd37 100644
--- a/autoload/puppet/align.vim
+++ b/autoload/puppet/align.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/autoload/puppet/ctags.vim b/autoload/puppet/ctags.vim
index a1d1577ae..6e296b968 100644
--- a/autoload/puppet/ctags.vim
+++ b/autoload/puppet/ctags.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/autoload/puppet/format.vim b/autoload/puppet/format.vim
index 96b447b64..f08053635 100644
--- a/autoload/puppet/format.vim
+++ b/autoload/puppet/format.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/autoload/python/utils.vim b/autoload/python/utils.vim
index 4517f00de..7782add11 100644
--- a/autoload/python/utils.vim
+++ b/autoload/python/utils.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('python-compiler', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'python-compiler')
   finish
 endif
 
diff --git a/autoload/requirements.vim b/autoload/requirements.vim
index ad2e747a2..e222ce2ff 100644
--- a/autoload/requirements.vim
+++ b/autoload/requirements.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('requirements', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'requirements')
   finish
 endif
 
diff --git a/autoload/rubycomplete.vim b/autoload/rubycomplete.vim
index 9551c965f..d25c23b62 100644
--- a/autoload/rubycomplete.vim
+++ b/autoload/rubycomplete.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/autoload/rust.vim b/autoload/rust.vim
index a8f5bfa35..6c6fbe139 100644
--- a/autoload/rust.vim
+++ b/autoload/rust.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/rust/debugging.vim b/autoload/rust/debugging.vim
index 9096333b5..d200e9fc7 100644
--- a/autoload/rust/debugging.vim
+++ b/autoload/rust/debugging.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/rust/delimitmate.vim b/autoload/rust/delimitmate.vim
index 7d2d18176..25735f9c7 100644
--- a/autoload/rust/delimitmate.vim
+++ b/autoload/rust/delimitmate.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/rust/tags.vim b/autoload/rust/tags.vim
index 8ffa4d511..1acbb5bb6 100644
--- a/autoload/rust/tags.vim
+++ b/autoload/rust/tags.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/rustfmt.vim b/autoload/rustfmt.vim
index 81ebe56e8..1d6f91ed4 100644
--- a/autoload/rustfmt.vim
+++ b/autoload/rustfmt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/smt2.vim b/autoload/smt2.vim
index 0d328529a..85bd62184 100644
--- a/autoload/smt2.vim
+++ b/autoload/smt2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('smt2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'smt2')
   finish
 endif
 
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index 7c4e33da8..e3a7908f9 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('terraform', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'terraform')
   finish
 endif
 
diff --git a/autoload/vital/_crystal.vim b/autoload/vital/_crystal.vim
index b328af906..c93828a25 100644
--- a/autoload/vital/_crystal.vim
+++ b/autoload/vital/_crystal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/ColorEcho.vim b/autoload/vital/_crystal/ColorEcho.vim
index 7180dce6b..61e22f171 100644
--- a/autoload/vital/_crystal/ColorEcho.vim
+++ b/autoload/vital/_crystal/ColorEcho.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/Data/List.vim b/autoload/vital/_crystal/Data/List.vim
index 68f87490d..0af74f788 100644
--- a/autoload/vital/_crystal/Data/List.vim
+++ b/autoload/vital/_crystal/Data/List.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/Data/String.vim b/autoload/vital/_crystal/Data/String.vim
index 67cd217cd..66d58ae09 100644
--- a/autoload/vital/_crystal/Data/String.vim
+++ b/autoload/vital/_crystal/Data/String.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/Process.vim b/autoload/vital/_crystal/Process.vim
index 2da1a0162..31b6b890f 100644
--- a/autoload/vital/_crystal/Process.vim
+++ b/autoload/vital/_crystal/Process.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/Web/JSON.vim b/autoload/vital/_crystal/Web/JSON.vim
index a1d01238e..bcf96f858 100644
--- a/autoload/vital/_crystal/Web/JSON.vim
+++ b/autoload/vital/_crystal/Web/JSON.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/vital/crystal.vim b/autoload/vital/crystal.vim
index 68938d83e..a73b19ba7 100644
--- a/autoload/vital/crystal.vim
+++ b/autoload/vital/crystal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/xml/aria.vim b/autoload/xml/aria.vim
index 7a106e0af..f4d0d4d6a 100644
--- a/autoload/xml/aria.vim
+++ b/autoload/xml/aria.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/autoload/xml/html5.vim b/autoload/xml/html5.vim
index a88808e04..c2a78b6e8 100644
--- a/autoload/xml/html5.vim
+++ b/autoload/xml/html5.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/autoload/xml/xsd.vim b/autoload/xml/xsd.vim
index 71b0ec89c..478003f95 100644
--- a/autoload/xml/xsd.vim
+++ b/autoload/xml/xsd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xsd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xsd')
   finish
 endif
 
diff --git a/autoload/zig/config.vim b/autoload/zig/config.vim
index ed373f56b..76f2939ca 100644
--- a/autoload/zig/config.vim
+++ b/autoload/zig/config.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index bdc21290c..dd01a44b4 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/autoload/zig/list.vim b/autoload/zig/list.vim
index d09dd76e1..083e336bf 100644
--- a/autoload/zig/list.vim
+++ b/autoload/zig/list.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/autoload/zig/util.vim b/autoload/zig/util.vim
index baa2d32c9..3c7e8b617 100644
--- a/autoload/zig/util.vim
+++ b/autoload/zig/util.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/compiler/ant.vim b/compiler/ant.vim
index 8d1b66fb3..1f927dbce 100644
--- a/compiler/ant.vim
+++ b/compiler/ant.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ant', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ant')
   finish
 endif
 
diff --git a/compiler/bdf.vim b/compiler/bdf.vim
index 097d6b00c..79fb26631 100644
--- a/compiler/bdf.vim
+++ b/compiler/bdf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bdf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bdf')
   finish
 endif
 
diff --git a/compiler/cake.vim b/compiler/cake.vim
index 993bf1cf5..c053759a1 100644
--- a/compiler/cake.vim
+++ b/compiler/cake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/compiler/cargo.vim b/compiler/cargo.vim
index 925699393..4854e4d9e 100644
--- a/compiler/cargo.vim
+++ b/compiler/cargo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/compiler/coffee.vim b/compiler/coffee.vim
index c5dcce7f5..e16c425d3 100644
--- a/compiler/coffee.vim
+++ b/compiler/coffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/compiler/credo.vim b/compiler/credo.vim
index e39c6b7c7..767452c71 100644
--- a/compiler/credo.vim
+++ b/compiler/credo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/compiler/cryptol.vim b/compiler/cryptol.vim
index 062109ac6..7454ad5df 100644
--- a/compiler/cryptol.vim
+++ b/compiler/cryptol.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cryptol', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cryptol')
   finish
 endif
 
diff --git a/compiler/cs.vim b/compiler/cs.vim
index 195887cf8..195f1437a 100644
--- a/compiler/cs.vim
+++ b/compiler/cs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cs', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cs')
   finish
 endif
 
diff --git a/compiler/cucumber.vim b/compiler/cucumber.vim
index a41c0de4a..b2aef45d7 100644
--- a/compiler/cucumber.vim
+++ b/compiler/cucumber.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cucumber', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cucumber')
   finish
 endif
 
diff --git a/compiler/dot.vim b/compiler/dot.vim
index 5002e5ff3..f2d659671 100644
--- a/compiler/dot.vim
+++ b/compiler/dot.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dot', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dot')
   finish
 endif
 
diff --git a/compiler/eruby.vim b/compiler/eruby.vim
index dd006baab..426a8212b 100644
--- a/compiler/eruby.vim
+++ b/compiler/eruby.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/compiler/exunit.vim b/compiler/exunit.vim
index 2a52eff89..7f9bf656d 100644
--- a/compiler/exunit.vim
+++ b/compiler/exunit.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/compiler/fish.vim b/compiler/fish.vim
index 1ae935f8f..8ab152a6e 100644
--- a/compiler/fish.vim
+++ b/compiler/fish.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fish', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fish')
   finish
 endif
 
diff --git a/compiler/go.vim b/compiler/go.vim
index fba6a94fc..c01c9e525 100644
--- a/compiler/go.vim
+++ b/compiler/go.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/compiler/gradle.vim b/compiler/gradle.vim
index 7790daacc..1f59118ed 100644
--- a/compiler/gradle.vim
+++ b/compiler/gradle.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gradle', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gradle')
   finish
 endif
 
diff --git a/compiler/gradlew.vim b/compiler/gradlew.vim
index 68f23d76c..82fdbdd81 100644
--- a/compiler/gradlew.vim
+++ b/compiler/gradlew.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gradle', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gradle')
   finish
 endif
 
diff --git a/compiler/haml.vim b/compiler/haml.vim
index 08a64bc55..b72ab353c 100644
--- a/compiler/haml.vim
+++ b/compiler/haml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haml')
   finish
 endif
 
diff --git a/compiler/ledger.vim b/compiler/ledger.vim
index e02205826..49eb3750f 100644
--- a/compiler/ledger.vim
+++ b/compiler/ledger.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ledger', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ledger')
   finish
 endif
 
diff --git a/compiler/lilypond.vim b/compiler/lilypond.vim
index cbe15bbbb..6e7dd94f1 100644
--- a/compiler/lilypond.vim
+++ b/compiler/lilypond.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lilypond', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lilypond')
   finish
 endif
 
diff --git a/compiler/ls.vim b/compiler/ls.vim
index 69c6977f9..b937052c7 100644
--- a/compiler/ls.vim
+++ b/compiler/ls.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('livescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'livescript')
   finish
 endif
 
diff --git a/compiler/mix.vim b/compiler/mix.vim
index e9e781c5b..dfbf004b0 100644
--- a/compiler/mix.vim
+++ b/compiler/mix.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/compiler/nim.vim b/compiler/nim.vim
index e7ed69366..510350703 100644
--- a/compiler/nim.vim
+++ b/compiler/nim.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nim', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nim')
   finish
 endif
 
diff --git a/compiler/nix-build.vim b/compiler/nix-build.vim
index 89a2453bc..aa8932c10 100644
--- a/compiler/nix-build.vim
+++ b/compiler/nix-build.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nix', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nix')
   finish
 endif
 
diff --git a/compiler/ocaml.vim b/compiler/ocaml.vim
index 92582d675..00cc30f44 100644
--- a/compiler/ocaml.vim
+++ b/compiler/ocaml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/compiler/powershell.vim b/compiler/powershell.vim
index e4d5d4106..436829557 100644
--- a/compiler/powershell.vim
+++ b/compiler/powershell.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'powershell')
   finish
 endif
 
diff --git a/compiler/python.vim b/compiler/python.vim
index 670ebdb4c..29e9acb81 100644
--- a/compiler/python.vim
+++ b/compiler/python.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('python-compiler', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'python-compiler')
   finish
 endif
 
diff --git a/compiler/rake.vim b/compiler/rake.vim
index f8c3186c3..4843c55d3 100644
--- a/compiler/rake.vim
+++ b/compiler/rake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/compiler/rspec.vim b/compiler/rspec.vim
index c443c7357..541e2f62f 100644
--- a/compiler/rspec.vim
+++ b/compiler/rspec.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/compiler/ruby.vim b/compiler/ruby.vim
index 53dc01066..9ec9a2268 100644
--- a/compiler/ruby.vim
+++ b/compiler/ruby.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/compiler/rubyunit.vim b/compiler/rubyunit.vim
index eb6c3d8e6..11c8276ce 100644
--- a/compiler/rubyunit.vim
+++ b/compiler/rubyunit.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/compiler/rustc.vim b/compiler/rustc.vim
index 66827050c..80091673f 100644
--- a/compiler/rustc.vim
+++ b/compiler/rustc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/compiler/sass.vim b/compiler/sass.vim
index 5a1ee5324..852d3e098 100644
--- a/compiler/sass.vim
+++ b/compiler/sass.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sass', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sass')
   finish
 endif
 
diff --git a/compiler/sbt.vim b/compiler/sbt.vim
index 15f81ff34..24fc2d095 100644
--- a/compiler/sbt.vim
+++ b/compiler/sbt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/compiler/swift.vim b/compiler/swift.vim
index 39dbe99ac..c89bfe5a3 100644
--- a/compiler/swift.vim
+++ b/compiler/swift.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('swift', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'swift')
   finish
 endif
 
diff --git a/compiler/tcl.vim b/compiler/tcl.vim
index c73d69d5a..3cdf82499 100644
--- a/compiler/tcl.vim
+++ b/compiler/tcl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tcl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tcl')
   finish
 endif
 
diff --git a/compiler/tex.vim b/compiler/tex.vim
index 7076d04ad..497b58772 100644
--- a/compiler/tex.vim
+++ b/compiler/tex.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tex', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tex')
   finish
 endif
 
diff --git a/compiler/tidy.vim b/compiler/tidy.vim
index 7f7f12af9..0c635fb8f 100644
--- a/compiler/tidy.vim
+++ b/compiler/tidy.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tidy', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tidy')
   finish
 endif
 
diff --git a/compiler/typescript.vim b/compiler/typescript.vim
index d004226c0..4910a95e0 100644
--- a/compiler/typescript.vim
+++ b/compiler/typescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/extras/flow.vim b/extras/flow.vim
index 69823efe9..e13bdeaa6 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index 4a71cc663..7e6f2b559 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/extras/ngdoc.vim b/extras/ngdoc.vim
index 9936387b7..46102a7d5 100644
--- a/extras/ngdoc.vim
+++ b/extras/ngdoc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index d259dc279..19d459ca0 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -8,7 +8,6 @@ if exists("did_load_polyglot")
   finish
 endif
 
-
 let did_load_polyglot = 1
 
 " Switch to compatible mode for the time being
@@ -20,6 +19,35 @@ if exists("did_load_filetypes")
   au! filetypedetect
 endif
 
+let g:polyglot_is_disabled = {}
+let s:new_polyglot_disabled = []
+
+if exists('g:polyglot_disabled')
+  for pkg in g:polyglot_disabled
+    let base = split(pkg, '\.')
+    if len(base) > 0
+      let g:polyglot_is_disabled[pkg] = 1
+      call add(s:new_polyglot_disabled, base[0])
+    endif
+  endfor
+else
+  let g:polyglot_disabled_not_set = 1
+endif
+
+func! PolyglotVerify()
+  if exists("g:polyglot_disabled_not_set")
+    if exists("g:polyglot_disabled")
+      echohl WarningMsg
+      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
+      echohl None
+    endif
+
+    unlet g:polyglot_disabled_not_set
+  endif
+endfun
+
+au VimEnter * call PolyglotVerify()
+
 " Prevent filetype.vim of vim from loading again
 let did_load_filetypes = 1
 
@@ -92,766 +120,769 @@ endfunc
 
 augroup polyglot-observer | augroup END
 
-augroup filetypedetect
-
 " Load user-defined filetype.vim and oter plugins ftdetect first
 " This is to use polyglot-defined ftdetect always as fallback to user settings
-runtime! filetype.vim
-runtime! ftdetect/*.vim
+augroup filetypedetect
+  runtime! filetype.vim
+  runtime! ftdetect/*.vim
+augroup END
+
+
+augroup filetypedetect
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
-if polyglot#util#IsEnabled('context', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'context')
   au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi setf context
 endif
 
-if polyglot#util#IsEnabled('xpm2', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xpm2')
   au BufNewFile,BufRead *.xpm2 setf xpm2
 endif
 
-if polyglot#util#IsEnabled('xpm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xpm')
   au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
   au BufNewFile,BufRead *.xpm setf xpm
 endif
 
-if polyglot#util#IsEnabled('man', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'man')
   au BufNewFile,BufRead *.1,*.1in,*.1m,*.1x,*.2,*.3,*.3in,*.3m,*.3p,*.3pm,*.3qt,*.3x,*.4,*.5,*.6,*.7,*.8,*.9,*.man,*.mdoc setf man
 endif
 
-if polyglot#util#IsEnabled('xf86conf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xf86conf')
   au BufNewFile,BufRead */xorg.conf.d/*.conf,xorg.conf,xorg.conf-4 setf xf86conf
   au BufNewFile,BufRead XF86Config-4* call s:StarSetf('xf86conf')
   au BufNewFile,BufRead XF86Config* call s:StarSetf('xf86conf')
 endif
 
-if polyglot#util#IsEnabled('pullrequest', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pullrequest')
   au BufNewFile,BufRead PULLREQ_EDITMSG setf pullrequest
 endif
 
-if polyglot#util#IsEnabled('text', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'text')
   au BufNewFile,BufRead *.text,README setf text
 endif
 
-if polyglot#util#IsEnabled('svn', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'svn')
   au BufNewFile,BufRead svn-commit*.tmp setf svn
 endif
 
-if polyglot#util#IsEnabled('logcheck', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'logcheck')
   au BufNewFile,BufRead */etc/logcheck/*.d*/* call s:StarSetf('logcheck')
 endif
 
-if polyglot#util#IsEnabled('fvwm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'fvwm')
   au BufNewFile,BufRead */.fvwm/* call s:StarSetf('fvwm')
 endif
 
-if polyglot#util#IsEnabled('crontab', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'crontab')
   au BufNewFile,BufRead crontab setf crontab
   au BufNewFile,BufRead crontab.* call s:StarSetf('crontab')
   au BufNewFile,BufRead */etc/cron.d/* call s:StarSetf('crontab')
 endif
 
-if polyglot#util#IsEnabled('bzr', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'bzr')
   au BufNewFile,BufRead bzr_log.* call s:StarSetf('bzr')
 endif
 
-if polyglot#util#IsEnabled('asteriskvm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'asteriskvm')
   au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
 endif
 
-if polyglot#util#IsEnabled('asterisk', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'asterisk')
   au BufNewFile,BufRead *asterisk/*.conf* call s:StarSetf('asterisk')
 endif
 
-if polyglot#util#IsEnabled('apachestyle', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'apachestyle')
   au BufNewFile,BufRead proftpd.conf* call s:StarSetf('apachestyle')
   au BufNewFile,BufRead */etc/proftpd/conf.*/* call s:StarSetf('apachestyle')
   au BufNewFile,BufRead */etc/proftpd/*.conf* call s:StarSetf('apachestyle')
 endif
 
-if polyglot#util#IsEnabled('z8a', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'z8a')
   au BufNewFile,BufRead *.z8a setf z8a
 endif
 
-if polyglot#util#IsEnabled('zimbutempl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'zimbutempl')
   au BufNewFile,BufRead *.zut setf zimbutempl
 endif
 
-if polyglot#util#IsEnabled('zimbu', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'zimbu')
   au BufNewFile,BufRead *.zu setf zimbu
 endif
 
-if polyglot#util#IsEnabled('yacc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'yacc')
   au BufNewFile,BufRead *.y++,*.yxx,*.yy setf yacc
 endif
 
-if polyglot#util#IsEnabled('xslt', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xslt')
   au BufNewFile,BufRead *.xsl,*.xslt setf xslt
 endif
 
-if polyglot#util#IsEnabled('xsd', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xsd')
   au BufNewFile,BufRead *.xsd setf xsd
 endif
 
-if polyglot#util#IsEnabled('xquery', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xquery')
   au BufNewFile,BufRead *.xq,*.xql,*.xqm,*.xquery,*.xqy setf xquery
 endif
 
-if polyglot#util#IsEnabled('xmodmap', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xmodmap')
   au BufNewFile,BufRead *Xmodmap setf xmodmap
   au BufNewFile,BufRead *xmodmap* call s:StarSetf('xmodmap')
 endif
 
-if polyglot#util#IsEnabled('xmath', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xmath')
   au BufNewFile,BufRead *.msc,*.msf setf xmath
 endif
 
-if polyglot#util#IsEnabled('xdefaults', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xdefaults')
   au BufNewFile,BufRead *.ad,{.,}Xdefaults,{.,}Xpdefaults,{.,}Xresources,xdm-config setf xdefaults
   au BufNewFile,BufRead Xresources* call s:StarSetf('xdefaults')
   au BufNewFile,BufRead */app-defaults/* call s:StarSetf('xdefaults')
   au BufNewFile,BufRead */Xresources/* call s:StarSetf('xdefaults')
 endif
 
-if polyglot#util#IsEnabled('xinetd', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xinetd')
   au BufNewFile,BufRead */etc/xinetd.conf setf xinetd
   au BufNewFile,BufRead */etc/xinetd.d/* call s:StarSetf('xinetd')
 endif
 
-if polyglot#util#IsEnabled('xhtml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xhtml')
   au BufNewFile,BufRead *.xht,*.xhtml setf xhtml
 endif
 
-if polyglot#util#IsEnabled('wsh', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'wsh')
   au BufNewFile,BufRead *.ws[fc] setf wsh
 endif
 
-if polyglot#util#IsEnabled('cvs', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cvs')
   au BufNewFile,BufRead cvs\d\+ setf cvs
 endif
 
-if polyglot#util#IsEnabled('cvsrc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cvsrc')
   au BufNewFile,BufRead {.,}cvsrc setf cvsrc
 endif
 
-if polyglot#util#IsEnabled('wvdial', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'wvdial')
   au BufNewFile,BufRead {.,}wvdialrc,wvdial.conf setf wvdial
 endif
 
-if polyglot#util#IsEnabled('wsml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'wsml')
   au BufNewFile,BufRead *.wsml setf wsml
 endif
 
-if polyglot#util#IsEnabled('winbatch', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'winbatch')
   au BufNewFile,BufRead *.wbt setf winbatch
 endif
 
-if polyglot#util#IsEnabled('wml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'wml')
   au BufNewFile,BufRead *.wml setf wml
 endif
 
-if polyglot#util#IsEnabled('wget', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'wget')
   au BufNewFile,BufRead {.,}wgetrc,wgetrc setf wget
 endif
 
-if polyglot#util#IsEnabled('webmacro', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'webmacro')
   au BufNewFile,BufRead *.wm setf webmacro
 endif
 
-if polyglot#util#IsEnabled('wast', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'wast')
   au BufNewFile,BufRead *.wast,*.wat setf wast
 endif
 
-if polyglot#util#IsEnabled('vroom', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'vroom')
   au BufNewFile,BufRead *.vroom setf vroom
 endif
 
-if polyglot#util#IsEnabled('vrml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'vrml')
   au BufNewFile,BufRead *.wrl setf vrml
 endif
 
-if polyglot#util#IsEnabled('vgrindefs', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'vgrindefs')
   au BufNewFile,BufRead vgrindefs setf vgrindefs
 endif
 
-if polyglot#util#IsEnabled('viminfo', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'viminfo')
   au BufNewFile,BufRead {.,}viminfo,_viminfo setf viminfo
 endif
 
-if polyglot#util#IsEnabled('vim', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'vim')
   au BufNewFile,BufRead *.vba,*.vim,{.,}exrc,_exrc setf vim
   au BufNewFile,BufRead *vimrc* call s:StarSetf('vim')
 endif
 
-if polyglot#util#IsEnabled('vhdl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'vhdl')
   au BufNewFile,BufRead *.hdl,*.vbe,*.vhd,*.vhdl,*.vho,*.vst setf vhdl
   au BufNewFile,BufRead *.vhdl_[0-9]* call s:StarSetf('vhdl')
 endif
 
-if polyglot#util#IsEnabled('systemverilog', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'systemverilog')
   au BufNewFile,BufRead *.sv,*.svh setf systemverilog
 endif
 
-if polyglot#util#IsEnabled('verilogams', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'verilogams')
   au BufNewFile,BufRead *.va,*.vams setf verilogams
 endif
 
-if polyglot#util#IsEnabled('verilog', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'verilog')
   au BufNewFile,BufRead *.v setf verilog
 endif
 
-if polyglot#util#IsEnabled('vera', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'vera')
   au BufNewFile,BufRead *.vr,*.vrh,*.vri setf vera
 endif
 
-if polyglot#util#IsEnabled('upstart', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'upstart')
   au BufNewFile,BufRead */.config/upstart/*.conf,*/.config/upstart/*.override,*/.init/*.conf,*/.init/*.override,*/etc/init/*.conf,*/etc/init/*.override,*/usr/share/upstart/*.conf,*/usr/share/upstart/*.override setf upstart
 endif
 
-if polyglot#util#IsEnabled('updatedb', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'updatedb')
   au BufNewFile,BufRead */etc/updatedb.conf setf updatedb
 endif
 
-if polyglot#util#IsEnabled('uc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'uc')
   au BufNewFile,BufRead *.uc setf uc
 endif
 
-if polyglot#util#IsEnabled('udevperm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'udevperm')
   au BufNewFile,BufRead */etc/udev/permissions.d/*.permissions setf udevperm
 endif
 
-if polyglot#util#IsEnabled('udevconf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'udevconf')
   au BufNewFile,BufRead */etc/udev/udev.conf setf udevconf
 endif
 
-if polyglot#util#IsEnabled('uil', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'uil')
   au BufNewFile,BufRead *.uil,*.uit setf uil
 endif
 
-if polyglot#util#IsEnabled('tsscl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tsscl')
   au BufNewFile,BufRead *.tsscl setf tsscl
 endif
 
-if polyglot#util#IsEnabled('tssop', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tssop')
   au BufNewFile,BufRead *.tssop setf tssop
 endif
 
-if polyglot#util#IsEnabled('tssgm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tssgm')
   au BufNewFile,BufRead *.tssgm setf tssgm
 endif
 
-if polyglot#util#IsEnabled('trustees', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'trustees')
   au BufNewFile,BufRead trustees.conf setf trustees
 endif
 
-if polyglot#util#IsEnabled('treetop', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'treetop')
   au BufNewFile,BufRead *.treetop setf treetop
 endif
 
-if polyglot#util#IsEnabled('tpp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tpp')
   au BufNewFile,BufRead *.tpp setf tpp
 endif
 
-if polyglot#util#IsEnabled('tidy', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tidy')
   au BufNewFile,BufRead {.,}tidyrc,tidy.conf,tidyrc setf tidy
 endif
 
-if polyglot#util#IsEnabled('texmf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'texmf')
   au BufNewFile,BufRead texmf.cnf setf texmf
 endif
 
-if polyglot#util#IsEnabled('texinfo', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'texinfo')
   au BufNewFile,BufRead *.texi,*.texinfo,*.txi setf texinfo
 endif
 
-if polyglot#util#IsEnabled('tex', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tex')
   au BufNewFile,BufRead *.bbl,*.dtx,*.latex,*.ltx,*.sty setf tex
 endif
 
-if polyglot#util#IsEnabled('terminfo', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'terminfo')
   au BufNewFile,BufRead *.ti setf terminfo
 endif
 
-if polyglot#util#IsEnabled('teraterm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'teraterm')
   au BufNewFile,BufRead *.ttl setf teraterm
 endif
 
-if polyglot#util#IsEnabled('tsalt', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tsalt')
   au BufNewFile,BufRead *.slt setf tsalt
 endif
 
-if polyglot#util#IsEnabled('tli', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tli')
   au BufNewFile,BufRead *.tli setf tli
 endif
 
-if polyglot#util#IsEnabled('tcl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tcl')
   au BufNewFile,BufRead *.itcl,*.itk,*.jacl,*.tcl,*.tk setf tcl
 endif
 
-if polyglot#util#IsEnabled('taskedit', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'taskedit')
   au BufNewFile,BufRead *.task setf taskedit
 endif
 
-if polyglot#util#IsEnabled('taskdata', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'taskdata')
   au BufNewFile,BufRead {pending,completed,undo}.data setf taskdata
 endif
 
-if polyglot#util#IsEnabled('tak', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tak')
   au BufNewFile,BufRead *.tak setf tak
 endif
 
-if polyglot#util#IsEnabled('tags', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tags')
   au BufNewFile,BufRead tags setf tags
 endif
 
-if polyglot#util#IsEnabled('sudoers', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sudoers')
   au BufNewFile,BufRead */etc/sudoers,sudoers.tmp setf sudoers
 endif
 
-if polyglot#util#IsEnabled('sdc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sdc')
   au BufNewFile,BufRead *.sdc setf sdc
 endif
 
-if polyglot#util#IsEnabled('sysctl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sysctl')
   au BufNewFile,BufRead */etc/sysctl.conf,*/etc/sysctl.d/*.conf setf sysctl
 endif
 
-if polyglot#util#IsEnabled('sil', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sil')
   au BufNewFile,BufRead *.sil setf sil
 endif
 
-if polyglot#util#IsEnabled('swiftgyb', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'swiftgyb')
   au BufNewFile,BufRead *.swift.gyb setf swiftgyb
 endif
 
-if polyglot#util#IsEnabled('voscm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'voscm')
   au BufNewFile,BufRead *.cm setf voscm
 endif
 
-if polyglot#util#IsEnabled('sml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sml')
   au BufNewFile,BufRead *.sml setf sml
 endif
 
-if polyglot#util#IsEnabled('stp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'stp')
   au BufNewFile,BufRead *.stp setf stp
 endif
 
-if polyglot#util#IsEnabled('smcl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'smcl')
   au BufNewFile,BufRead *.hlp,*.ihlp,*.smcl setf smcl
 endif
 
-if polyglot#util#IsEnabled('stata', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'stata')
   au BufNewFile,BufRead *.ado,*.do,*.imata,*.mata setf stata
 endif
 
-if polyglot#util#IsEnabled('sshdconfig', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sshdconfig')
   au BufNewFile,BufRead */etc/ssh/sshd_config.d/*.conf,sshd_config setf sshdconfig
 endif
 
-if polyglot#util#IsEnabled('sshconfig', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sshconfig')
   au BufNewFile,BufRead */.ssh/config,*/etc/ssh/ssh_config.d/*.conf,ssh_config setf sshconfig
 endif
 
-if polyglot#util#IsEnabled('sqr', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sqr')
   au BufNewFile,BufRead *.sqi,*.sqr setf sqr
 endif
 
-if polyglot#util#IsEnabled('sqlj', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sqlj')
   au BufNewFile,BufRead *.sqlj setf sqlj
 endif
 
-if polyglot#util#IsEnabled('squid', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'squid')
   au BufNewFile,BufRead squid.conf setf squid
 endif
 
-if polyglot#util#IsEnabled('spice', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'spice')
   au BufNewFile,BufRead *.sp,*.spice setf spice
 endif
 
-if polyglot#util#IsEnabled('slice', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'slice')
   au BufNewFile,BufRead *.ice setf slice
 endif
 
-if polyglot#util#IsEnabled('spup', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'spup')
   au BufNewFile,BufRead *.spd,*.spdata,*.speedup setf spup
 endif
 
-if polyglot#util#IsEnabled('hog', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'hog')
   au BufNewFile,BufRead *.hog,snort.conf,vision.conf setf hog
 endif
 
-if polyglot#util#IsEnabled('mib', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mib')
   au BufNewFile,BufRead *.mib,*.my setf mib
 endif
 
-if polyglot#util#IsEnabled('snobol4', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'snobol4')
   au BufNewFile,BufRead *.sno,*.spt setf snobol4
 endif
 
-if polyglot#util#IsEnabled('smith', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'smith')
   au BufNewFile,BufRead *.smith,*.smt setf smith
 endif
 
-if polyglot#util#IsEnabled('st', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'st')
   au BufNewFile,BufRead *.st setf st
 endif
 
-if polyglot#util#IsEnabled('slrnsc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'slrnsc')
   au BufNewFile,BufRead *.score setf slrnsc
 endif
 
-if polyglot#util#IsEnabled('slrnrc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'slrnrc')
   au BufNewFile,BufRead {.,}slrnrc setf slrnrc
 endif
 
-if polyglot#util#IsEnabled('skill', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'skill')
   au BufNewFile,BufRead *.cdf,*.il,*.ils setf skill
 endif
 
-if polyglot#util#IsEnabled('sisu', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sisu')
   au BufNewFile,BufRead *.-sst,*.-sst.meta,*._sst,*._sst.meta,*.ssi,*.ssm,*.sst,*.sst.meta setf sisu
 endif
 
-if polyglot#util#IsEnabled('sinda', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sinda')
   au BufNewFile,BufRead *.s85,*.sin setf sinda
 endif
 
-if polyglot#util#IsEnabled('simula', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'simula')
   au BufNewFile,BufRead *.sim setf simula
 endif
 
-if polyglot#util#IsEnabled('screen', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'screen')
   au BufNewFile,BufRead {.,}screenrc,screenrc setf screen
 endif
 
-if polyglot#util#IsEnabled('scheme', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'scheme')
   au BufNewFile,BufRead *.rkt,*.scm,*.ss setf scheme
 endif
 
-if polyglot#util#IsEnabled('catalog', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'catalog')
   au BufNewFile,BufRead catalog setf catalog
   au BufNewFile,BufRead sgml.catalog* call s:StarSetf('catalog')
 endif
 
-if polyglot#util#IsEnabled('setserial', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'setserial')
   au BufNewFile,BufRead */etc/serial.conf setf setserial
 endif
 
-if polyglot#util#IsEnabled('slpspi', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'slpspi')
   au BufNewFile,BufRead */etc/slp.spi setf slpspi
 endif
 
-if polyglot#util#IsEnabled('spyce', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'spyce')
   au BufNewFile,BufRead *.spi,*.spy setf spyce
 endif
 
-if polyglot#util#IsEnabled('slpreg', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'slpreg')
   au BufNewFile,BufRead */etc/slp.reg setf slpreg
 endif
 
-if polyglot#util#IsEnabled('slpconf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'slpconf')
   au BufNewFile,BufRead */etc/slp.conf setf slpconf
 endif
 
-if polyglot#util#IsEnabled('services', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'services')
   au BufNewFile,BufRead */etc/services setf services
 endif
 
-if polyglot#util#IsEnabled('sm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sm')
   au BufNewFile,BufRead sendmail.cf setf sm
 endif
 
-if polyglot#util#IsEnabled('sieve', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sieve')
   au BufNewFile,BufRead *.sieve,*.siv setf sieve
 endif
 
-if polyglot#util#IsEnabled('sdl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sdl')
   au BufNewFile,BufRead *.pr,*.sdl setf sdl
 endif
 
-if polyglot#util#IsEnabled('sd', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sd')
   au BufNewFile,BufRead *.sd setf sd
 endif
 
-if polyglot#util#IsEnabled('scilab', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'scilab')
   au BufNewFile,BufRead *.sce,*.sci setf scilab
 endif
 
-if polyglot#util#IsEnabled('sbt', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sbt')
   au BufNewFile,BufRead *.sbt setf sbt
 endif
 
-if polyglot#util#IsEnabled('sather', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sather')
   au BufNewFile,BufRead *.sa setf sather
 endif
 
-if polyglot#util#IsEnabled('sass', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sass')
   au BufNewFile,BufRead *.sass setf sass
 endif
 
-if polyglot#util#IsEnabled('sas', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sas')
   au BufNewFile,BufRead *.sas setf sas
 endif
 
-if polyglot#util#IsEnabled('samba', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'samba')
   au BufNewFile,BufRead smb.conf setf samba
 endif
 
-if polyglot#util#IsEnabled('slang', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'slang')
   au BufNewFile,BufRead *.sl setf slang
 endif
 
-if polyglot#util#IsEnabled('rtf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rtf')
   au BufNewFile,BufRead *.rtf setf rtf
 endif
 
-if polyglot#util#IsEnabled('rpcgen', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rpcgen')
   au BufNewFile,BufRead *.x setf rpcgen
 endif
 
-if polyglot#util#IsEnabled('robots', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'robots')
   au BufNewFile,BufRead robots.txt setf robots
 endif
 
-if polyglot#util#IsEnabled('rpl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rpl')
   au BufNewFile,BufRead *.rpl setf rpl
 endif
 
-if polyglot#util#IsEnabled('rng', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rng')
   au BufNewFile,BufRead *.rng setf rng
 endif
 
-if polyglot#util#IsEnabled('rnc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rnc')
   au BufNewFile,BufRead *.rnc setf rnc
 endif
 
-if polyglot#util#IsEnabled('resolv', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'resolv')
   au BufNewFile,BufRead resolv.conf setf resolv
 endif
 
-if polyglot#util#IsEnabled('remind', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'remind')
   au BufNewFile,BufRead *.rem,*.remind,{.,}reminders setf remind
   au BufNewFile,BufRead .reminders* call s:StarSetf('remind')
 endif
 
-if polyglot#util#IsEnabled('rrst', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rrst')
   au BufNewFile,BufRead *.rrst,*.srst setf rrst
 endif
 
-if polyglot#util#IsEnabled('rmd', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rmd')
   au BufNewFile,BufRead *.rmd,*.smd setf rmd
 endif
 
-if polyglot#util#IsEnabled('rnoweb', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rnoweb')
   au BufNewFile,BufRead *.rnw,*.snw setf rnoweb
 endif
 
-if polyglot#util#IsEnabled('rexx', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rexx')
   au BufNewFile,BufRead *.jrexx,*.orx,*.rex,*.rexx,*.rexxj,*.rxj,*.rxo,*.testGroup,*.testUnit setf rexx
 endif
 
-if polyglot#util#IsEnabled('rego', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rego')
   au BufNewFile,BufRead *.rego setf rego
 endif
 
-if polyglot#util#IsEnabled('rib', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rib')
   au BufNewFile,BufRead *.rib setf rib
 endif
 
-if polyglot#util#IsEnabled('readline', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'readline')
   au BufNewFile,BufRead {.,}inputrc,inputrc setf readline
 endif
 
-if polyglot#util#IsEnabled('rcs', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rcs')
   au BufNewFile,BufRead *\,v setf rcs
 endif
 
-if polyglot#util#IsEnabled('ratpoison', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ratpoison')
   au BufNewFile,BufRead {.,}ratpoisonrc,ratpoisonrc setf ratpoison
 endif
 
-if polyglot#util#IsEnabled('radiance', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'radiance')
   au BufNewFile,BufRead *.mat,*.rad setf radiance
 endif
 
-if polyglot#util#IsEnabled('pyrex', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pyrex')
   au BufNewFile,BufRead *.pxd,*.pyx setf pyrex
 endif
 
-if polyglot#util#IsEnabled('protocols', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'protocols')
   au BufNewFile,BufRead */etc/protocols setf protocols
 endif
 
-if polyglot#util#IsEnabled('promela', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'promela')
   au BufNewFile,BufRead *.pml setf promela
 endif
 
-if polyglot#util#IsEnabled('psf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'psf')
   au BufNewFile,BufRead *.psf setf psf
 endif
 
-if polyglot#util#IsEnabled('procmail', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'procmail')
   au BufNewFile,BufRead {.,}procmail,{.,}procmailrc setf procmail
 endif
 
-if polyglot#util#IsEnabled('privoxy', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'privoxy')
   au BufNewFile,BufRead *.action setf privoxy
 endif
 
-if polyglot#util#IsEnabled('proc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'proc')
   au BufNewFile,BufRead *.pc setf proc
 endif
 
-if polyglot#util#IsEnabled('obj', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'obj')
   au BufNewFile,BufRead *.obj setf obj
 endif
 
-if polyglot#util#IsEnabled('ppwiz', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ppwiz')
   au BufNewFile,BufRead *.ih,*.it setf ppwiz
 endif
 
-if polyglot#util#IsEnabled('pccts', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pccts')
   au BufNewFile,BufRead *.g setf pccts
 endif
 
-if polyglot#util#IsEnabled('povini', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'povini')
   au BufNewFile,BufRead {.,}povrayrc setf povini
 endif
 
-if polyglot#util#IsEnabled('pov', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pov')
   au BufNewFile,BufRead *.pov setf pov
 endif
 
-if polyglot#util#IsEnabled('ppd', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ppd')
   au BufNewFile,BufRead *.ppd setf ppd
 endif
 
-if polyglot#util#IsEnabled('postscr', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'postscr')
   au BufNewFile,BufRead *.afm,*.ai,*.eps,*.epsf,*.epsi,*.pfa,*.ps setf postscr
 endif
 
-if polyglot#util#IsEnabled('pfmain', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pfmain')
   au BufNewFile,BufRead main.cf setf pfmain
 endif
 
-if polyglot#util#IsEnabled('po', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'po')
   au BufNewFile,BufRead *.po,*.pot setf po
 endif
 
-if polyglot#util#IsEnabled('plp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'plp')
   au BufNewFile,BufRead *.plp setf plp
 endif
 
-if polyglot#util#IsEnabled('plsql', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'plsql')
   au BufNewFile,BufRead *.pls,*.plsql setf plsql
 endif
 
-if polyglot#util#IsEnabled('plm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'plm')
   au BufNewFile,BufRead *.p36,*.pac,*.plm setf plm
 endif
 
-if polyglot#util#IsEnabled('pli', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pli')
   au BufNewFile,BufRead *.pl1,*.pli setf pli
 endif
 
-if polyglot#util#IsEnabled('pine', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pine')
   au BufNewFile,BufRead {.,}pinerc,{.,}pinercex,pinerc,pinercex setf pine
 endif
 
-if polyglot#util#IsEnabled('pilrc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pilrc')
   au BufNewFile,BufRead *.rcp setf pilrc
 endif
 
-if polyglot#util#IsEnabled('pinfo', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pinfo')
   au BufNewFile,BufRead */.pinforc,*/etc/pinforc setf pinfo
 endif
 
-if polyglot#util#IsEnabled('cmod', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cmod')
   au BufNewFile,BufRead *.cmod setf cmod
 endif
 
-if polyglot#util#IsEnabled('pike', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pike')
   au BufNewFile,BufRead *.pike,*.pmod setf pike
 endif
 
-if polyglot#util#IsEnabled('pcmk', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pcmk')
   au BufNewFile,BufRead *.pcmk setf pcmk
 endif
 
-if polyglot#util#IsEnabled('pdf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pdf')
   au BufNewFile,BufRead *.pdf setf pdf
 endif
 
-if polyglot#util#IsEnabled('pascal', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pascal')
   au BufNewFile,BufRead *.dpr,*.lpr,*.pas,*.pp setf pascal
 endif
 
-if polyglot#util#IsEnabled('passwd', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'passwd')
   au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
 endif
 
-if polyglot#util#IsEnabled('papp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'papp')
   au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp
 endif
 
-if polyglot#util#IsEnabled('pamenv', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pamenv')
   au BufNewFile,BufRead {.,}pam_environment,pam_env.conf setf pamenv
 endif
 
-if polyglot#util#IsEnabled('pamconf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pamconf')
   au BufNewFile,BufRead */etc/pam.conf setf pamconf
   au BufNewFile,BufRead */etc/pam.d/* call s:StarSetf('pamconf')
 endif
 
-if polyglot#util#IsEnabled('pf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pf')
   au BufNewFile,BufRead pf.conf setf pf
 endif
 
-if polyglot#util#IsEnabled('ora', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ora')
   au BufNewFile,BufRead *.ora setf ora
 endif
 
-if polyglot#util#IsEnabled('opl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'opl')
   au BufNewFile,BufRead *.[Oo][Pp][Ll] setf opl
 endif
 
-if polyglot#util#IsEnabled('openroad', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'openroad')
   au BufNewFile,BufRead *.or setf openroad
 endif
 
-if polyglot#util#IsEnabled('omnimark', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'omnimark')
   au BufNewFile,BufRead *.xin,*.xom setf omnimark
 endif
 
-if polyglot#util#IsEnabled('occam', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'occam')
   au BufNewFile,BufRead *.occ setf occam
 endif
 
-if polyglot#util#IsEnabled('nsis', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'nsis')
   au BufNewFile,BufRead *.nsh,*.nsi setf nsis
 endif
 
-if polyglot#util#IsEnabled('nqc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'nqc')
   au BufNewFile,BufRead *.nqc setf nqc
 endif
 
-if polyglot#util#IsEnabled('nroff', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'nroff')
   au BufNewFile,BufRead *.mom,*.nr,*.roff,*.tmac,*.tr setf nroff
   au BufNewFile,BufRead tmac.* call s:StarSetf('nroff')
 endif
 
-if polyglot#util#IsEnabled('ncf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ncf')
   au BufNewFile,BufRead *.ncf setf ncf
 endif
 
-if polyglot#util#IsEnabled('ninja', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ninja')
   au BufNewFile,BufRead *.ninja setf ninja
 endif
 
-if polyglot#util#IsEnabled('netrc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'netrc')
   au BufNewFile,BufRead {.,}netrc setf netrc
 endif
 
-if polyglot#util#IsEnabled('neomuttrc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'neomuttrc')
   au BufNewFile,BufRead Neomuttrc setf neomuttrc
   au BufNewFile,BufRead neomuttrc* call s:StarSetf('neomuttrc')
   au BufNewFile,BufRead Neomuttrc* call s:StarSetf('neomuttrc')
@@ -859,27 +890,27 @@ if polyglot#util#IsEnabled('neomuttrc', 'ftdetect')
   au BufNewFile,BufRead */.neomutt/neomuttrc* call s:StarSetf('neomuttrc')
 endif
 
-if polyglot#util#IsEnabled('natural', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'natural')
   au BufNewFile,BufRead *.NS[ACGLMNPS] setf natural
 endif
 
-if polyglot#util#IsEnabled('nanorc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'nanorc')
   au BufNewFile,BufRead *.nanorc,*/etc/nanorc setf nanorc
 endif
 
-if polyglot#util#IsEnabled('n1ql', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'n1ql')
   au BufNewFile,BufRead *.n1ql,*.nql setf n1ql
 endif
 
-if polyglot#util#IsEnabled('mush', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mush')
   au BufNewFile,BufRead *.mush setf mush
 endif
 
-if polyglot#util#IsEnabled('mupad', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mupad')
   au BufNewFile,BufRead *.mu setf mupad
 endif
 
-if polyglot#util#IsEnabled('muttrc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'muttrc')
   au BufNewFile,BufRead Mutt{ng,}rc setf muttrc
   au BufNewFile,BufRead mutt{ng,}rc* call s:StarSetf('muttrc')
   au BufNewFile,BufRead Mutt{ng,}rc* call s:StarSetf('muttrc')
@@ -888,1006 +919,1006 @@ if polyglot#util#IsEnabled('muttrc', 'ftdetect')
   au BufNewFile,BufRead */.mutt{ng,}/mutt{ng,}rc* call s:StarSetf('muttrc')
 endif
 
-if polyglot#util#IsEnabled('msql', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'msql')
   au BufNewFile,BufRead *.msql setf msql
 endif
 
-if polyglot#util#IsEnabled('mrxvtrc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mrxvtrc')
   au BufNewFile,BufRead {.,}mrxvtrc,mrxvtrc setf mrxvtrc
 endif
 
-if polyglot#util#IsEnabled('srec', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'srec')
   au BufNewFile,BufRead *.mot,*.s19,*.s28,*.s37,*.srec setf srec
 endif
 
-if polyglot#util#IsEnabled('mplayerconf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mplayerconf')
   au BufNewFile,BufRead */.mplayer/config,mplayer.conf setf mplayerconf
 endif
 
-if polyglot#util#IsEnabled('modconf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'modconf')
   au BufNewFile,BufRead */etc/conf.modules,*/etc/modules,*/etc/modules.conf setf modconf
   au BufNewFile,BufRead */etc/modprobe.* call s:StarSetf('modconf')
 endif
 
-if polyglot#util#IsEnabled('moo', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'moo')
   au BufNewFile,BufRead *.moo setf moo
 endif
 
-if polyglot#util#IsEnabled('monk', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'monk')
   au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc setf monk
 endif
 
-if polyglot#util#IsEnabled('modula3', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'modula3')
   au BufNewFile,BufRead *.[mi][3g] setf modula3
 endif
 
-if polyglot#util#IsEnabled('modula2', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'modula2')
   au BufNewFile,BufRead *.DEF,*.MOD,*.m2,*.mi setf modula2
 endif
 
-if polyglot#util#IsEnabled('mmp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mmp')
   au BufNewFile,BufRead *.mmp setf mmp
 endif
 
-if polyglot#util#IsEnabled('mix', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mix')
   au BufNewFile,BufRead *.mix,*.mixal setf mix
 endif
 
-if polyglot#util#IsEnabled('mgl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mgl')
   au BufNewFile,BufRead *.mgl setf mgl
 endif
 
-if polyglot#util#IsEnabled('mp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mp')
   au BufNewFile,BufRead *.mp setf mp
 endif
 
-if polyglot#util#IsEnabled('mf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mf')
   au BufNewFile,BufRead *.mf setf mf
 endif
 
-if polyglot#util#IsEnabled('messages', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'messages')
   au BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.[0-9]*,-[0-9]*} setf messages
 endif
 
-if polyglot#util#IsEnabled('hgcommit', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'hgcommit')
   au BufNewFile,BufRead hg-editor-*.txt setf hgcommit
 endif
 
-if polyglot#util#IsEnabled('mel', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mel')
   au BufNewFile,BufRead *.mel setf mel
 endif
 
-if polyglot#util#IsEnabled('map', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'map')
   au BufNewFile,BufRead *.map setf map
 endif
 
-if polyglot#util#IsEnabled('maple', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'maple')
   au BufNewFile,BufRead *.mpl,*.mv,*.mws setf maple
 endif
 
-if polyglot#util#IsEnabled('manconf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'manconf')
   au BufNewFile,BufRead */etc/man.conf,man.config setf manconf
 endif
 
-if polyglot#util#IsEnabled('mallard', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mallard')
   au BufNewFile,BufRead *.page setf mallard
 endif
 
-if polyglot#util#IsEnabled('ist', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ist')
   au BufNewFile,BufRead *.ist,*.mst setf ist
 endif
 
-if polyglot#util#IsEnabled('mailcap', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mailcap')
   au BufNewFile,BufRead {.,}mailcap,mailcap setf mailcap
 endif
 
-if polyglot#util#IsEnabled('mailaliases', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mailaliases')
   au BufNewFile,BufRead */etc/aliases,*/etc/mail/aliases setf mailaliases
 endif
 
-if polyglot#util#IsEnabled('mail', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mail')
   au BufNewFile,BufRead *.eml,{.,}article,{.,}article.\d\+,{.,}followup,{.,}letter,{.,}letter.\d\+,/tmp/SLRN[0-9A-Z.]\+,ae\d\+.txt,mutt[[:alnum:]_-]\\\{6\},mutt{ng,}-*-\w\+,neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},pico.\d\+,snd.\d\+,{neo,}mutt[[:alnum:]._-]\\\{6\} setf mail
   au BufNewFile,BufRead reportbug-* call s:StarSetf('mail')
 endif
 
-if polyglot#util#IsEnabled('mgp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mgp')
   au BufNewFile,BufRead *.mgp setf mgp
 endif
 
-if polyglot#util#IsEnabled('lss', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lss')
   au BufNewFile,BufRead *.lss setf lss
 endif
 
-if polyglot#util#IsEnabled('lsl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lsl')
   au BufNewFile,BufRead *.lsl setf lsl
 endif
 
-if polyglot#util#IsEnabled('lout', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lout')
   au BufNewFile,BufRead *.lou,*.lout setf lout
 endif
 
-if polyglot#util#IsEnabled('lotos', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lotos')
   au BufNewFile,BufRead *.lot,*.lotos setf lotos
 endif
 
-if polyglot#util#IsEnabled('logtalk', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'logtalk')
   au BufNewFile,BufRead *.lgt setf logtalk
 endif
 
-if polyglot#util#IsEnabled('logindefs', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'logindefs')
   au BufNewFile,BufRead */etc/login.defs setf logindefs
 endif
 
-if polyglot#util#IsEnabled('loginaccess', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'loginaccess')
   au BufNewFile,BufRead */etc/login.access setf loginaccess
 endif
 
-if polyglot#util#IsEnabled('litestep', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'litestep')
   au BufNewFile,BufRead */LiteStep/*/*.rc setf litestep
 endif
 
-if polyglot#util#IsEnabled('lite', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lite')
   au BufNewFile,BufRead *.lite,*.lt setf lite
 endif
 
-if polyglot#util#IsEnabled('liquid', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'liquid')
   au BufNewFile,BufRead *.liquid setf liquid
 endif
 
-if polyglot#util#IsEnabled('lisp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lisp')
   au BufNewFile,BufRead *.cl,*.el,*.lisp,*.lsp,{.,}emacs,{.,}sawfishrc,{.,}sbclrc,sbclrc setf lisp
 endif
 
-if polyglot#util#IsEnabled('lilo', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lilo')
   au BufNewFile,BufRead lilo.conf setf lilo
   au BufNewFile,BufRead lilo.conf* call s:StarSetf('lilo')
 endif
 
-if polyglot#util#IsEnabled('lifelines', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lifelines')
   au BufNewFile,BufRead *.ll setf lifelines
 endif
 
-if polyglot#util#IsEnabled('lftp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lftp')
   au BufNewFile,BufRead *lftp/rc,{.,}lftprc,lftp.conf setf lftp
 endif
 
-if polyglot#util#IsEnabled('sensors', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sensors')
   au BufNewFile,BufRead */etc/sensors.conf,*/etc/sensors3.conf setf sensors
 endif
 
-if polyglot#util#IsEnabled('libao', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'libao')
   au BufNewFile,BufRead */.libao,*/etc/libao.conf setf libao
 endif
 
-if polyglot#util#IsEnabled('lex', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lex')
   au BufNewFile,BufRead *.l,*.l++,*.lex,*.lxx setf lex
 endif
 
-if polyglot#util#IsEnabled('ld', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ld')
   au BufNewFile,BufRead *.ld setf ld
 endif
 
-if polyglot#util#IsEnabled('ldif', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ldif')
   au BufNewFile,BufRead *.ldif setf ldif
 endif
 
-if polyglot#util#IsEnabled('lprolog', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lprolog')
   au BufNewFile,BufRead *.sig setf lprolog
 endif
 
-if polyglot#util#IsEnabled('limits', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'limits')
   au BufNewFile,BufRead */etc/*limits.conf,*/etc/*limits.d/*.conf,*/etc/limits setf limits
 endif
 
-if polyglot#util#IsEnabled('latte', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'latte')
   au BufNewFile,BufRead *.latte,*.lte setf latte
 endif
 
-if polyglot#util#IsEnabled('lace', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lace')
   au BufNewFile,BufRead *.ACE,*.ace setf lace
 endif
 
-if polyglot#util#IsEnabled('kconfig', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'kconfig')
   au BufNewFile,BufRead Kconfig,Kconfig.debug setf kconfig
   au BufNewFile,BufRead Kconfig.* call s:StarSetf('kconfig')
 endif
 
-if polyglot#util#IsEnabled('kscript', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'kscript')
   au BufNewFile,BufRead *.ks setf kscript
 endif
 
-if polyglot#util#IsEnabled('kivy', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'kivy')
   au BufNewFile,BufRead *.kv setf kivy
 endif
 
-if polyglot#util#IsEnabled('kwt', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'kwt')
   au BufNewFile,BufRead *.k setf kwt
 endif
 
-if polyglot#util#IsEnabled('kix', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'kix')
   au BufNewFile,BufRead *.kix setf kix
 endif
 
-if polyglot#util#IsEnabled('jovial', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'jovial')
   au BufNewFile,BufRead *.j73,*.jov,*.jovial setf jovial
 endif
 
-if polyglot#util#IsEnabled('jgraph', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'jgraph')
   au BufNewFile,BufRead *.jgr setf jgraph
 endif
 
-if polyglot#util#IsEnabled('jess', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'jess')
   au BufNewFile,BufRead *.clp setf jess
 endif
 
-if polyglot#util#IsEnabled('jproperties', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'jproperties')
   au BufNewFile,BufRead *.properties,*.properties_??,*.properties_??_?? setf jproperties
   au BufNewFile,BufRead *.properties_??_??_* call s:StarSetf('jproperties')
 endif
 
-if polyglot#util#IsEnabled('jsp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'jsp')
   au BufNewFile,BufRead *.jsp setf jsp
 endif
 
-if polyglot#util#IsEnabled('javacc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'javacc')
   au BufNewFile,BufRead *.jj,*.jjt setf javacc
 endif
 
-if polyglot#util#IsEnabled('java', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'java')
   au BufNewFile,BufRead *.jav,*.java setf java
 endif
 
-if polyglot#util#IsEnabled('jam', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'jam')
   au BufNewFile,BufRead *.jpl,*.jpr setf jam
   au BufNewFile,BufRead Prl*.* call s:StarSetf('jam')
   au BufNewFile,BufRead JAM*.* call s:StarSetf('jam')
 endif
 
-if polyglot#util#IsEnabled('jal', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'jal')
   au BufNewFile,BufRead *.JAL,*.jal setf jal
 endif
 
-if polyglot#util#IsEnabled('j', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'j')
   au BufNewFile,BufRead *.ijs setf j
 endif
 
-if polyglot#util#IsEnabled('iss', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'iss')
   au BufNewFile,BufRead *.iss setf iss
 endif
 
-if polyglot#util#IsEnabled('inittab', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'inittab')
   au BufNewFile,BufRead inittab setf inittab
 endif
 
-if polyglot#util#IsEnabled('fgl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'fgl')
   au BufNewFile,BufRead *.4gh,*.4gl,*.m4gl setf fgl
 endif
 
-if polyglot#util#IsEnabled('ipfilter', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ipfilter')
   au BufNewFile,BufRead ipf.conf,ipf.rules,ipf6.conf setf ipfilter
 endif
 
-if polyglot#util#IsEnabled('usw2kagtlog', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'usw2kagtlog')
   au BufNewFile,BufRead *.usw2kagt.log\c,usw2kagt.*.log\c,usw2kagt.log\c setf usw2kagtlog
 endif
 
-if polyglot#util#IsEnabled('usserverlog', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'usserverlog')
   au BufNewFile,BufRead *.usserver.log\c,usserver.*.log\c,usserver.log\c setf usserverlog
 endif
 
-if polyglot#util#IsEnabled('upstreaminstalllog', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'upstreaminstalllog')
   au BufNewFile,BufRead *.upstreaminstall.log\c,upstreaminstall.*.log\c,upstreaminstall.log\c setf upstreaminstalllog
 endif
 
-if polyglot#util#IsEnabled('upstreamlog', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'upstreamlog')
   au BufNewFile,BufRead *.upstream.log\c,UPSTREAM-*.log\c,fdrupstream.log,upstream.*.log\c,upstream.log\c setf upstreamlog
 endif
 
-if polyglot#util#IsEnabled('upstreamdat', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'upstreamdat')
   au BufNewFile,BufRead *.upstream.dat\c,upstream.*.dat\c,upstream.dat\c setf upstreamdat
 endif
 
-if polyglot#util#IsEnabled('initng', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'initng')
   au BufNewFile,BufRead *.ii,*/etc/initng/*/*.i setf initng
 endif
 
-if polyglot#util#IsEnabled('inform', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'inform')
   au BufNewFile,BufRead *.INF,*.inf setf inform
 endif
 
-if polyglot#util#IsEnabled('indent', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'indent')
   au BufNewFile,BufRead {.,}indent.pro,indentrc setf indent
 endif
 
-if polyglot#util#IsEnabled('icemenu', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'icemenu')
   au BufNewFile,BufRead */.icewm/menu setf icemenu
 endif
 
-if polyglot#util#IsEnabled('msidl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'msidl')
   au BufNewFile,BufRead *.mof,*.odl setf msidl
 endif
 
-if polyglot#util#IsEnabled('icon', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'icon')
   au BufNewFile,BufRead *.icn setf icon
 endif
 
-if polyglot#util#IsEnabled('httest', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'httest')
   au BufNewFile,BufRead *.htb,*.htt setf httest
 endif
 
-if polyglot#util#IsEnabled('hb', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'hb')
   au BufNewFile,BufRead *.hb setf hb
 endif
 
-if polyglot#util#IsEnabled('hostsaccess', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'hostsaccess')
   au BufNewFile,BufRead */etc/hosts.allow,*/etc/hosts.deny setf hostsaccess
 endif
 
-if polyglot#util#IsEnabled('hostconf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'hostconf')
   au BufNewFile,BufRead */etc/host.conf setf hostconf
 endif
 
-if polyglot#util#IsEnabled('template', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'template')
   au BufNewFile,BufRead *.tmpl setf template
 endif
 
-if polyglot#util#IsEnabled('htmlm4', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'htmlm4')
   au BufNewFile,BufRead *.html.m4 setf htmlm4
 endif
 
-if polyglot#util#IsEnabled('tilde', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tilde')
   au BufNewFile,BufRead *.t.html setf tilde
 endif
 
-if polyglot#util#IsEnabled('html', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'html')
   au BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
   au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
 endif
 
-if polyglot#util#IsEnabled('hollywood', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'hollywood')
   au BufNewFile,BufRead *.hws setf hollywood
 endif
 
-if polyglot#util#IsEnabled('hex', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'hex')
   au BufNewFile,BufRead *.h32,*.hex setf hex
 endif
 
-if polyglot#util#IsEnabled('hercules', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'hercules')
   au BufNewFile,BufRead *.errsum,*.ev,*.sum,*.vc setf hercules
 endif
 
-if polyglot#util#IsEnabled('hastepreproc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'hastepreproc')
   au BufNewFile,BufRead *.htpp setf hastepreproc
 endif
 
-if polyglot#util#IsEnabled('haste', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'haste')
   au BufNewFile,BufRead *.ht setf haste
 endif
 
-if polyglot#util#IsEnabled('chaskell', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'chaskell')
   au BufNewFile,BufRead *.chs setf chaskell
 endif
 
-if polyglot#util#IsEnabled('lhaskell', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lhaskell')
   au BufNewFile,BufRead *.lhs setf lhaskell
 endif
 
-if polyglot#util#IsEnabled('gtkrc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gtkrc')
   au BufNewFile,BufRead {.,}gtkrc,gtkrc setf gtkrc
   au BufNewFile,BufRead gtkrc* call s:StarSetf('gtkrc')
   au BufNewFile,BufRead .gtkrc* call s:StarSetf('gtkrc')
 endif
 
-if polyglot#util#IsEnabled('group', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'group')
   au BufNewFile,BufRead */etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/etc/gshadow-,*/etc/gshadow.edit,*/var/backups/group.bak,*/var/backups/gshadow.bak setf group
 endif
 
-if polyglot#util#IsEnabled('gsp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gsp')
   au BufNewFile,BufRead *.gsp setf gsp
 endif
 
-if polyglot#util#IsEnabled('gretl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gretl')
   au BufNewFile,BufRead *.gretl setf gretl
 endif
 
-if polyglot#util#IsEnabled('grads', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'grads')
   au BufNewFile,BufRead *.gs setf grads
 endif
 
-if polyglot#util#IsEnabled('gitolite', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gitolite')
   au BufNewFile,BufRead gitolite.conf setf gitolite
   au BufNewFile,BufRead */gitolite-admin/conf/* call s:StarSetf('gitolite')
 endif
 
-if polyglot#util#IsEnabled('gnash', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gnash')
   au BufNewFile,BufRead {.,}gnashpluginrc,{.,}gnashrc,gnashpluginrc,gnashrc setf gnash
 endif
 
-if polyglot#util#IsEnabled('gpg', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gpg')
   au BufNewFile,BufRead */.gnupg/gpg.conf,*/.gnupg/options,*/usr/*/gnupg/options.skel setf gpg
 endif
 
-if polyglot#util#IsEnabled('gp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gp')
   au BufNewFile,BufRead *.gp,{.,}gprc setf gp
 endif
 
-if polyglot#util#IsEnabled('gkrellmrc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gkrellmrc')
   au BufNewFile,BufRead gkrellmrc,gkrellmrc_? setf gkrellmrc
 endif
 
-if polyglot#util#IsEnabled('gedcom', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gedcom')
   au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
   au BufNewFile,BufRead */tmp/lltmp* call s:StarSetf('gedcom')
 endif
 
-if polyglot#util#IsEnabled('gdmo', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gdmo')
   au BufNewFile,BufRead *.gdmo,*.mo setf gdmo
 endif
 
-if polyglot#util#IsEnabled('gdb', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gdb')
   au BufNewFile,BufRead {.,}gdbinit setf gdb
 endif
 
-if polyglot#util#IsEnabled('fstab', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'fstab')
   au BufNewFile,BufRead fstab,mtab setf fstab
 endif
 
-if polyglot#util#IsEnabled('framescript', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'framescript')
   au BufNewFile,BufRead *.fsl setf framescript
 endif
 
-if polyglot#util#IsEnabled('fortran', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'fortran')
   au BufNewFile,BufRead *.f,*.f03,*.f08,*.f77,*.f90,*.f95,*.for,*.fortran,*.fpp,*.ftn setf fortran
 endif
 
-if polyglot#util#IsEnabled('reva', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'reva')
   au BufNewFile,BufRead *.frt setf reva
 endif
 
-if polyglot#util#IsEnabled('focexec', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'focexec')
   au BufNewFile,BufRead *.fex,*.focexec setf focexec
 endif
 
-if polyglot#util#IsEnabled('fetchmail', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'fetchmail')
   au BufNewFile,BufRead {.,}fetchmailrc setf fetchmail
 endif
 
-if polyglot#util#IsEnabled('factor', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'factor')
   au BufNewFile,BufRead *.factor setf factor
 endif
 
-if polyglot#util#IsEnabled('fan', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'fan')
   au BufNewFile,BufRead *.fan,*.fwt setf fan
 endif
 
-if polyglot#util#IsEnabled('falcon', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'falcon')
   au BufNewFile,BufRead *.fal setf falcon
 endif
 
-if polyglot#util#IsEnabled('exports', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'exports')
   au BufNewFile,BufRead exports setf exports
 endif
 
-if polyglot#util#IsEnabled('expect', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'expect')
   au BufNewFile,BufRead *.exp setf expect
 endif
 
-if polyglot#util#IsEnabled('exim', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'exim')
   au BufNewFile,BufRead exim.conf setf exim
 endif
 
-if polyglot#util#IsEnabled('csc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'csc')
   au BufNewFile,BufRead *.csc setf csc
 endif
 
-if polyglot#util#IsEnabled('esterel', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'esterel')
   au BufNewFile,BufRead *.strl setf esterel
 endif
 
-if polyglot#util#IsEnabled('esqlc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'esqlc')
   au BufNewFile,BufRead *.EC,*.ec setf esqlc
 endif
 
-if polyglot#util#IsEnabled('esmtprc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'esmtprc')
   au BufNewFile,BufRead *esmtprc setf esmtprc
 endif
 
-if polyglot#util#IsEnabled('elmfilt', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'elmfilt')
   au BufNewFile,BufRead filter-rules setf elmfilt
 endif
 
-if polyglot#util#IsEnabled('elinks', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'elinks')
   au BufNewFile,BufRead elinks.conf setf elinks
 endif
 
-if polyglot#util#IsEnabled('ecd', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ecd')
   au BufNewFile,BufRead *.ecd setf ecd
 endif
 
-if polyglot#util#IsEnabled('edif', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'edif')
   au BufNewFile,BufRead *.ed\(f\|if\|o\) setf edif
 endif
 
-if polyglot#util#IsEnabled('dts', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dts')
   au BufNewFile,BufRead *.dts,*.dtsi setf dts
 endif
 
-if polyglot#util#IsEnabled('dtd', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dtd')
   au BufNewFile,BufRead *.dtd setf dtd
 endif
 
-if polyglot#util#IsEnabled('dsl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dsl')
   au BufNewFile,BufRead *.dsl setf dsl
 endif
 
-if polyglot#util#IsEnabled('datascript', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'datascript')
   au BufNewFile,BufRead *.ds setf datascript
 endif
 
-if polyglot#util#IsEnabled('dracula', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dracula')
   au BufNewFile,BufRead *.drac,*.drc,*lpe,*lvs setf dracula
   au BufNewFile,BufRead drac.* call s:StarSetf('dracula')
 endif
 
-if polyglot#util#IsEnabled('def', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'def')
   au BufNewFile,BufRead *.def setf def
 endif
 
-if polyglot#util#IsEnabled('dylan', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dylan')
   au BufNewFile,BufRead *.dylan setf dylan
 endif
 
-if polyglot#util#IsEnabled('dylanintr', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dylanintr')
   au BufNewFile,BufRead *.intr setf dylanintr
 endif
 
-if polyglot#util#IsEnabled('dylanlid', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dylanlid')
   au BufNewFile,BufRead *.lid setf dylanlid
 endif
 
-if polyglot#util#IsEnabled('dot', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dot')
   au BufNewFile,BufRead *.dot,*.gv setf dot
 endif
 
-if polyglot#util#IsEnabled('dircolors', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dircolors')
   au BufNewFile,BufRead */etc/DIR_COLORS,{.,}dir_colors,{.,}dircolors setf dircolors
 endif
 
-if polyglot#util#IsEnabled('diff', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'diff')
   au BufNewFile,BufRead *.diff,*.rej setf diff
 endif
 
-if polyglot#util#IsEnabled('dictdconf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dictdconf')
   au BufNewFile,BufRead dictd.conf setf dictdconf
 endif
 
-if polyglot#util#IsEnabled('dictconf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dictconf')
   au BufNewFile,BufRead {.,}dictrc,dict.conf setf dictconf
 endif
 
-if polyglot#util#IsEnabled('desktop', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'desktop')
   au BufNewFile,BufRead *.desktop,*.directory setf desktop
 endif
 
-if polyglot#util#IsEnabled('desc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'desc')
   au BufNewFile,BufRead *.desc setf desc
 endif
 
-if polyglot#util#IsEnabled('dnsmasq', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dnsmasq')
   au BufNewFile,BufRead */etc/dnsmasq.conf setf dnsmasq
   au BufNewFile,BufRead */etc/dnsmasq.d/* call s:StarSetf('dnsmasq')
 endif
 
-if polyglot#util#IsEnabled('denyhosts', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'denyhosts')
   au BufNewFile,BufRead denyhosts.conf setf denyhosts
 endif
 
-if polyglot#util#IsEnabled('debsources', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'debsources')
   au BufNewFile,BufRead */etc/apt/sources.list,*/etc/apt/sources.list.d/*.list setf debsources
 endif
 
-if polyglot#util#IsEnabled('debcopyright', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'debcopyright')
   au BufNewFile,BufRead */debian/copyright setf debcopyright
 endif
 
-if polyglot#util#IsEnabled('debcontrol', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'debcontrol')
   au BufNewFile,BufRead */debian/control setf debcontrol
 endif
 
-if polyglot#util#IsEnabled('cuplsim', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cuplsim')
   au BufNewFile,BufRead *.si setf cuplsim
 endif
 
-if polyglot#util#IsEnabled('cupl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cupl')
   au BufNewFile,BufRead *.pld setf cupl
 endif
 
-if polyglot#util#IsEnabled('csp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'csp')
   au BufNewFile,BufRead *.csp,*.fdr setf csp
 endif
 
-if polyglot#util#IsEnabled('quake', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'quake')
   au BufNewFile,BufRead *baseq[2-3]/*.cfg,*id1/*.cfg,*quake[1-3]/*.cfg setf quake
 endif
 
-if polyglot#util#IsEnabled('lynx', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lynx')
   au BufNewFile,BufRead lynx.cfg setf lynx
 endif
 
-if polyglot#util#IsEnabled('eterm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'eterm')
   au BufNewFile,BufRead *Eterm/*.cfg setf eterm
 endif
 
-if polyglot#util#IsEnabled('dcd', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dcd')
   au BufNewFile,BufRead *.dcd setf dcd
 endif
 
-if polyglot#util#IsEnabled('dockerfile', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dockerfile')
   au BufNewFile,BufRead *.Dockerfile,*.dock,Containerfile,Dockerfile,dockerfile setf dockerfile
   au BufNewFile,BufRead Dockerfile* call s:StarSetf('dockerfile')
 endif
 
-if polyglot#util#IsEnabled('cuda', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cuda')
   au BufNewFile,BufRead *.cu,*.cuh setf cuda
 endif
 
-if polyglot#util#IsEnabled('config', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'config')
   au BufNewFile,BufRead Pipfile,configure.ac,configure.in setf config
   au BufNewFile,BufRead /etc/hostname.* call s:StarSetf('config')
 endif
 
-if polyglot#util#IsEnabled('cf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cf')
   au BufNewFile,BufRead *.cfc,*.cfi,*.cfm setf cf
 endif
 
-if polyglot#util#IsEnabled('coco', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'coco')
   au BufNewFile,BufRead *.atg setf coco
 endif
 
-if polyglot#util#IsEnabled('cobol', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cobol')
   au BufNewFile,BufRead *.cbl,*.cob,*.lib setf cobol
 endif
 
-if polyglot#util#IsEnabled('cmusrc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cmusrc')
   au BufNewFile,BufRead */.cmus/{autosave,rc,command-history,*.theme},*/cmus/{rc,*.theme} setf cmusrc
 endif
 
-if polyglot#util#IsEnabled('cl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cl')
   au BufNewFile,BufRead *.eni setf cl
 endif
 
-if polyglot#util#IsEnabled('clean', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'clean')
   au BufNewFile,BufRead *.dcl,*.icl setf clean
 endif
 
-if polyglot#util#IsEnabled('chordpro', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'chordpro')
   au BufNewFile,BufRead *.cho,*.chopro,*.chordpro,*.crd,*.crdpro setf chordpro
 endif
 
-if polyglot#util#IsEnabled('chill', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'chill')
   au BufNewFile,BufRead *..ch setf chill
 endif
 
-if polyglot#util#IsEnabled('debchangelog', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'debchangelog')
   au BufNewFile,BufRead */debian/changelog,NEWS.Debian,NEWS.dch,changelog.Debian,changelog.dch setf debchangelog
 endif
 
-if polyglot#util#IsEnabled('cterm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cterm')
   au BufNewFile,BufRead *.con setf cterm
 endif
 
-if polyglot#util#IsEnabled('css', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'css')
   au BufNewFile,BufRead *.css setf css
 endif
 
-if polyglot#util#IsEnabled('ch', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ch')
   au BufNewFile,BufRead *.chf setf ch
 endif
 
-if polyglot#util#IsEnabled('cynpp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cynpp')
   au BufNewFile,BufRead *.cyn setf cynpp
 endif
 
-if polyglot#util#IsEnabled('crm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'crm')
   au BufNewFile,BufRead *.crm setf crm
 endif
 
-if polyglot#util#IsEnabled('conaryrecipe', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'conaryrecipe')
   au BufNewFile,BufRead *.recipe setf conaryrecipe
 endif
 
-if polyglot#util#IsEnabled('cdl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cdl')
   au BufNewFile,BufRead *.cdl setf cdl
 endif
 
-if polyglot#util#IsEnabled('chaiscript', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'chaiscript')
   au BufNewFile,BufRead *.chai setf chaiscript
 endif
 
-if polyglot#util#IsEnabled('cfengine', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cfengine')
   au BufNewFile,BufRead cfengine.conf setf cfengine
 endif
 
-if polyglot#util#IsEnabled('cdrdaoconf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cdrdaoconf')
   au BufNewFile,BufRead */etc/cdrdao.conf,*/etc/default/cdrdao,*/etc/defaults/cdrdao,{.,}cdrdao setf cdrdaoconf
 endif
 
-if polyglot#util#IsEnabled('cdrtoc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cdrtoc')
   au BufNewFile,BufRead *.toc setf cdrtoc
 endif
 
-if polyglot#util#IsEnabled('cabal', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cabal')
   au BufNewFile,BufRead *.cabal setf cabal
 endif
 
-if polyglot#util#IsEnabled('csdl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'csdl')
   au BufNewFile,BufRead *.csdl setf csdl
 endif
 
-if polyglot#util#IsEnabled('cs', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cs')
   au BufNewFile,BufRead *.cs setf cs
 endif
 
-if polyglot#util#IsEnabled('calendar', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'calendar')
   au BufNewFile,BufRead calendar setf calendar
   au BufNewFile,BufRead */share/calendar/calendar.* call s:StarSetf('calendar')
   au BufNewFile,BufRead */share/calendar/*/calendar.* call s:StarSetf('calendar')
   au BufNewFile,BufRead */.calendar/* call s:StarSetf('calendar')
 endif
 
-if polyglot#util#IsEnabled('lpc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lpc')
   au BufNewFile,BufRead *.lpc,*.ulpc setf lpc
 endif
 
-if polyglot#util#IsEnabled('bsdl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'bsdl')
   au BufNewFile,BufRead *.bsdl,*bsd setf bsdl
 endif
 
-if polyglot#util#IsEnabled('blank', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'blank')
   au BufNewFile,BufRead *.bl setf blank
 endif
 
-if polyglot#util#IsEnabled('bindzone', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'bindzone')
   au BufNewFile,BufRead named.root setf bindzone
   au BufNewFile,BufRead */named/db.* call s:StarSetf('bindzone')
   au BufNewFile,BufRead */bind/db.* call s:StarSetf('bindzone')
 endif
 
-if polyglot#util#IsEnabled('named', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'named')
   au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key setf named
 endif
 
-if polyglot#util#IsEnabled('bst', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'bst')
   au BufNewFile,BufRead *.bst setf bst
 endif
 
-if polyglot#util#IsEnabled('bib', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'bib')
   au BufNewFile,BufRead *.bib setf bib
 endif
 
-if polyglot#util#IsEnabled('bdf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'bdf')
   au BufNewFile,BufRead *.bdf setf bdf
 endif
 
-if polyglot#util#IsEnabled('bc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'bc')
   au BufNewFile,BufRead *.bc setf bc
 endif
 
-if polyglot#util#IsEnabled('dosbatch', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dosbatch')
   au BufNewFile,BufRead *.bat,*.sys setf dosbatch
 endif
 
-if polyglot#util#IsEnabled('hamster', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'hamster')
   au BufNewFile,BufRead *.hsc,*.hsm setf hamster
 endif
 
-if polyglot#util#IsEnabled('freebasic', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'freebasic')
   au BufNewFile,BufRead *.bi,*.fb setf freebasic
 endif
 
-if polyglot#util#IsEnabled('ibasic', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ibasic')
   au BufNewFile,BufRead *.iba,*.ibi setf ibasic
 endif
 
-if polyglot#util#IsEnabled('b', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'b')
   au BufNewFile,BufRead *.imp,*.mch,*.ref setf b
 endif
 
-if polyglot#util#IsEnabled('sql', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sql')
   au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw setf sql
 endif
 
-if polyglot#util#IsEnabled('gitignore', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gitignore')
   au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore setf gitignore
 endif
 
-if polyglot#util#IsEnabled('tads', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tads')
   au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
 endif
 
-if polyglot#util#IsEnabled('prolog', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'prolog')
   au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap setf prolog
 endif
 
-if polyglot#util#IsEnabled('bzl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'bzl')
   au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE setf bzl
 endif
 
-if polyglot#util#IsEnabled('odin', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'odin')
   au BufNewFile,BufRead *.odin setf odin
 endif
 
-if polyglot#util#IsEnabled('dosini', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dosini')
   au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec setf dosini
   au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
   au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
 endif
 
-if polyglot#util#IsEnabled('spec', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'spec')
   au BufNewFile,BufRead *.spec setf spec
 endif
 
-if polyglot#util#IsEnabled('visual-basic', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'visual-basic')
   au BufNewFile,BufRead,BufWritePost *.bas call polyglot#detect#Bas()
   au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs setf vb
 endif
 
-if polyglot#util#IsEnabled('basic', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'basic')
   au BufNewFile,BufRead *.basic setf basic
 endif
 
-if polyglot#util#IsEnabled('trasys', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'trasys')
   au BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
 endif
 
-if polyglot#util#IsEnabled('zig', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'zig')
   au BufNewFile,BufRead *.zir setf zir
   au BufNewFile,BufRead *.zig,*.zir setf zig
 endif
 
-if polyglot#util#IsEnabled('zephir', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'zephir')
   au BufNewFile,BufRead *.zep setf zephir
 endif
 
-if polyglot#util#IsEnabled('help', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'help')
   au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt setf help
 endif
 
-if polyglot#util#IsEnabled('helm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'helm')
   au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml setf helm
 endif
 
-if polyglot#util#IsEnabled('smarty', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'smarty')
   au BufNewFile,BufRead *.tpl setf smarty
 endif
 
-if polyglot#util#IsEnabled('ansible', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ansible')
   au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml setf yaml.ansible
   au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
   au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
 endif
 
-if polyglot#util#IsEnabled('xsl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xsl')
   au BufNewFile,BufRead *.xsl,*.xslt setf xsl
 endif
 
-if polyglot#util#IsEnabled('xdc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xdc')
   au BufNewFile,BufRead *.xdc setf xdc
 endif
 
-if polyglot#util#IsEnabled('vue', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'vue')
   au BufNewFile,BufRead *.vue,*.wpy setf vue
 endif
 
-if polyglot#util#IsEnabled('vmasm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'vmasm')
   au BufNewFile,BufRead *.mar setf vmasm
 endif
 
-if polyglot#util#IsEnabled('velocity', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'velocity')
   au BufNewFile,BufRead *.vm setf velocity
 endif
 
-if polyglot#util#IsEnabled('vcl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'vcl')
   au BufNewFile,BufRead *.vcl setf vcl
 endif
 
-if polyglot#util#IsEnabled('vbnet', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'vbnet')
   au BufNewFile,BufRead *.vb,*.vbhtml setf vbnet
 endif
 
-if polyglot#util#IsEnabled('vala', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'vala')
   au BufNewFile,BufRead *.vala,*.valadoc,*.vapi setf vala
 endif
 
-if polyglot#util#IsEnabled('v', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'v')
   au BufNewFile,BufRead *.v,*.vsh,*.vv setf vlang
 endif
 
-if polyglot#util#IsEnabled('unison', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'unison')
   au BufNewFile,BufRead *.u,*.uu setf unison
 endif
 
-if polyglot#util#IsEnabled('typescript', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'typescript')
   au BufNewFile,BufRead *.ts setf typescript
   au BufNewFile,BufRead *.tsx setf typescriptreact
 endif
 
-if polyglot#util#IsEnabled('twig', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'twig')
   au BufNewFile,BufRead *.twig setf html.twig
   au BufNewFile,BufRead *.xml.twig setf xml.twig
 endif
 
-if polyglot#util#IsEnabled('tptp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tptp')
   au BufNewFile,BufRead *.ax,*.p,*.tptp setf tptp
 endif
 
-if polyglot#util#IsEnabled('toml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'toml')
   au BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock setf toml
 endif
 
-if polyglot#util#IsEnabled('tmux', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tmux')
   au BufNewFile,BufRead {.,}tmux*.conf setf tmux
 endif
 
-if polyglot#util#IsEnabled('thrift', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'thrift')
   au BufNewFile,BufRead *.thrift setf thrift
 endif
 
-if polyglot#util#IsEnabled('textile', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'textile')
   au BufNewFile,BufRead *.textile setf textile
 endif
 
-if polyglot#util#IsEnabled('terraform', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'terraform')
   au BufNewFile,BufRead *.tf,*.tfvars setf terraform
 endif
 
-if polyglot#util#IsEnabled('tf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'tf')
   au BufNewFile,BufRead *.tf,{.,}tfrc,tfrc setf tf
 endif
 
-if polyglot#util#IsEnabled('systemd', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'systemd')
   au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf setf systemd
   au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
 endif
 
-if polyglot#util#IsEnabled('sxhkd', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sxhkd')
   au BufNewFile,BufRead *.sxhkdrc,sxhkdrc setf sxhkdrc
 endif
 
-if polyglot#util#IsEnabled('swift', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'swift')
   au BufNewFile,BufRead *.swift setf swift
 endif
 
-if polyglot#util#IsEnabled('svg', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'svg')
   au BufNewFile,BufRead *.svg setf svg
 endif
 
-if polyglot#util#IsEnabled('svelte', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'svelte')
   au BufNewFile,BufRead *.svelte setf svelte
 endif
 
-if polyglot#util#IsEnabled('stylus', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'stylus')
   au BufNewFile,BufRead *.styl,*.stylus setf stylus
 endif
 
-if polyglot#util#IsEnabled('solidity', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'solidity')
   au BufNewFile,BufRead *.sol setf solidity
 endif
 
-if polyglot#util#IsEnabled('smt2', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'smt2')
   au BufNewFile,BufRead *.smt,*.smt2 setf smt2
 endif
 
-if polyglot#util#IsEnabled('slime', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'slime')
   au BufNewFile,BufRead *.slime setf slime
 endif
 
-if polyglot#util#IsEnabled('slim', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'slim')
   au BufNewFile,BufRead *.slim setf slim
 endif
 
-if polyglot#util#IsEnabled('sh', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sh')
   au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile setf sh
   au BufNewFile,BufRead *.zsh,*/etc/zprofile,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
   au BufNewFile,BufRead .zsh* call s:StarSetf('zsh')
@@ -1895,132 +1926,132 @@ if polyglot#util#IsEnabled('sh', 'ftdetect')
   au BufNewFile,BufRead .zcompdump* call s:StarSetf('zsh')
 endif
 
-if polyglot#util#IsEnabled('scss', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'scss')
   au BufNewFile,BufRead *.scss setf scss
 endif
 
-if polyglot#util#IsEnabled('scala', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'scala')
   au BufNewFile,BufRead *.kojo,*.sc,*.scala setf scala
 endif
 
-if polyglot#util#IsEnabled('rust', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rust')
   au BufNewFile,BufRead *.rs,*.rs.in setf rust
 endif
 
-if polyglot#util#IsEnabled('brewfile', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'brewfile')
   au BufNewFile,BufRead Brewfile setf brewfile
 endif
 
-if polyglot#util#IsEnabled('rspec', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rspec')
   au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
 endif
 
-if polyglot#util#IsEnabled('ruby', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ruby')
   au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Routefile,Snapfile,Thorfile,Vagrantfile,[Rr]antfile,buildfile,vagrantfile setf ruby
   au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
   au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml setf eruby
 endif
 
-if polyglot#util#IsEnabled('rst', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rst')
   au BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt setf rst
 endif
 
-if polyglot#util#IsEnabled('reason', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'reason')
   au BufNewFile,BufRead,BufWritePost *.re call polyglot#detect#Re()
   au BufNewFile,BufRead *.rei setf reason
 endif
 
-if polyglot#util#IsEnabled('razor', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'razor')
   au BufNewFile,BufRead *.cshtml,*.razor setf razor
 endif
 
-if polyglot#util#IsEnabled('raml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'raml')
   au BufNewFile,BufRead *.raml setf raml
 endif
 
-if polyglot#util#IsEnabled('raku', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'raku')
   au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
   au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
   au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 setf raku
 endif
 
-if polyglot#util#IsEnabled('ragel', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ragel')
   au BufNewFile,BufRead *.rl setf ragel
 endif
 
-if polyglot#util#IsEnabled('racket', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'racket')
   au BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl setf racket
 endif
 
-if polyglot#util#IsEnabled('r-lang', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'r-lang')
   au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist setf r
   au BufNewFile,BufRead *.rd setf rhelp
 endif
 
-if polyglot#util#IsEnabled('qml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'qml')
   au BufNewFile,BufRead *.qbs,*.qml setf qml
 endif
 
-if polyglot#util#IsEnabled('qmake', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'qmake')
   au BufNewFile,BufRead *.pri,*.pro setf qmake
 endif
 
-if polyglot#util#IsEnabled('requirements', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'requirements')
   au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} setf requirements
 endif
 
-if polyglot#util#IsEnabled('python', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'python')
   au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript setf python
 endif
 
-if polyglot#util#IsEnabled('purescript', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'purescript')
   au BufNewFile,BufRead *.purs setf purescript
 endif
 
-if polyglot#util#IsEnabled('puppet', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'puppet')
   au BufNewFile,BufRead *.pp,Modulefile setf puppet
   au BufNewFile,BufRead *.epp setf embeddedpuppet
 endif
 
-if polyglot#util#IsEnabled('pug', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pug')
   au BufNewFile,BufRead *.jade,*.pug setf pug
 endif
 
-if polyglot#util#IsEnabled('protobuf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'protobuf')
   au BufNewFile,BufRead *.proto setf proto
 endif
 
-if polyglot#util#IsEnabled('powershell', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'powershell')
   au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc setf ps1
   au BufNewFile,BufRead *.ps1xml setf ps1xml
 endif
 
-if polyglot#util#IsEnabled('pony', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pony')
   au BufNewFile,BufRead *.pony setf pony
 endif
 
-if polyglot#util#IsEnabled('plantuml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'plantuml')
   au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml setf plantuml
 endif
 
-if polyglot#util#IsEnabled('blade', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'blade')
   au BufNewFile,BufRead *.blade,*.blade.php setf blade
 endif
 
-if polyglot#util#IsEnabled('php', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'php')
   au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.php9,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile setf php
 endif
 
-if polyglot#util#IsEnabled('cql', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cql')
   au BufNewFile,BufRead *.cql setf cql
 endif
 
-if polyglot#util#IsEnabled('pgsql', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'pgsql')
   au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
 endif
 
-if polyglot#util#IsEnabled('perl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'perl')
   au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
   au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
   au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
@@ -2032,20 +2063,20 @@ if polyglot#util#IsEnabled('perl', 'ftdetect')
   au BufNewFile,BufRead *.xs setf xs
 endif
 
-if polyglot#util#IsEnabled('rc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'rc')
   au BufNewFile,BufRead *.rc,*.rch setf rc
 endif
 
-if polyglot#util#IsEnabled('opencl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'opencl')
   au BufNewFile,BufRead *.cl,*.opencl setf opencl
 endif
 
-if polyglot#util#IsEnabled('octave', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'octave')
   au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
   au BufNewFile,BufRead *.oct setf octave
 endif
 
-if polyglot#util#IsEnabled('ocaml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit setf ocaml
   au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in setf omake
   au BufNewFile,BufRead *.opam,*.opam.template,opam setf opam
@@ -2057,48 +2088,48 @@ if polyglot#util#IsEnabled('ocaml', 'ftdetect')
   au BufNewFile,BufRead *.sexp setf sexplib
 endif
 
-if polyglot#util#IsEnabled('objc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'objc')
   au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
   au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
 endif
 
-if polyglot#util#IsEnabled('nix', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'nix')
   au BufNewFile,BufRead *.nix setf nix
 endif
 
-if polyglot#util#IsEnabled('nim', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'nim')
   au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg setf nim
 endif
 
-if polyglot#util#IsEnabled('nginx', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'nginx')
   au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf setf nginx
   au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
   au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
 endif
 
-if polyglot#util#IsEnabled('murphi', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'murphi')
   au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
 endif
 
-if polyglot#util#IsEnabled('moonscript', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'moonscript')
   au BufNewFile,BufRead *.moon setf moon
 endif
 
-if polyglot#util#IsEnabled('meson', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'meson')
   au BufNewFile,BufRead meson.build,meson_options.txt setf meson
   au BufNewFile,BufRead *.wrap setf dosini
 endif
 
-if polyglot#util#IsEnabled('mdx', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mdx')
   au BufNewFile,BufRead *.mdx setf markdown.mdx
 endif
 
-if polyglot#util#IsEnabled('mathematica', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mathematica')
   au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
   au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt setf mma
 endif
 
-if polyglot#util#IsEnabled('mako', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mako')
   au BufNewFile,BufRead *.mako,*.mao setf mako
   au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
   au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
@@ -2106,172 +2137,172 @@ if polyglot#util#IsEnabled('mako', 'ftdetect')
   au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
 endif
 
-if polyglot#util#IsEnabled('m4', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'm4')
   au BufNewFile,BufRead *.at,*.m4 setf m4
 endif
 
-if polyglot#util#IsEnabled('lua', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lua')
   au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc setf lua
 endif
 
-if polyglot#util#IsEnabled('log', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'log')
   au BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log setf log
 endif
 
-if polyglot#util#IsEnabled('llvm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'llvm')
   au BufNewFile,BufRead *.ll setf llvm
   au BufNewFile,BufRead *.td setf tablegen
 endif
 
-if polyglot#util#IsEnabled('livescript', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'livescript')
   au BufNewFile,BufRead *._ls,*.ls,Slakefile setf livescript
 endif
 
-if polyglot#util#IsEnabled('lilypond', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'lilypond')
   au BufNewFile,BufRead *.ily,*.ly setf lilypond
 endif
 
-if polyglot#util#IsEnabled('less', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'less')
   au BufNewFile,BufRead *.less setf less
 endif
 
-if polyglot#util#IsEnabled('ledger', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ledger')
   au BufNewFile,BufRead *.journal,*.ldg,*.ledger setf ledger
 endif
 
-if polyglot#util#IsEnabled('kotlin', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'kotlin')
   au BufNewFile,BufRead *.kt,*.ktm,*.kts setf kotlin
 endif
 
-if polyglot#util#IsEnabled('julia', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'julia')
   au BufNewFile,BufRead *.jl setf julia
 endif
 
-if polyglot#util#IsEnabled('jst', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'jst')
   au BufNewFile,BufRead *.ect,*.ejs,*.jst setf jst
 endif
 
-if polyglot#util#IsEnabled('jsonnet', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'jsonnet')
   au BufNewFile,BufRead *.jsonnet,*.libsonnet setf jsonnet
 endif
 
-if polyglot#util#IsEnabled('json', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'json')
   au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
 endif
 
-if polyglot#util#IsEnabled('json5', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'json5')
   au BufNewFile,BufRead *.json5 setf json5
 endif
 
-if polyglot#util#IsEnabled('jq', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'jq')
   au BufNewFile,BufRead *.jq,{.,}jqrc setf jq
   au BufNewFile,BufRead .jqrc* call s:StarSetf('jq')
 endif
 
-if polyglot#util#IsEnabled('htmldjango', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'htmldjango')
   au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk setf htmldjango
 endif
 
-if polyglot#util#IsEnabled('jenkins', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'jenkins')
   au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile setf Jenkinsfile
   au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
-if polyglot#util#IsEnabled('ion', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ion')
   au BufNewFile,BufRead *.ion,~/.config/ion/initrc setf ion
 endif
 
-if polyglot#util#IsEnabled('idris2', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'idris2')
   au BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
   au BufNewFile,BufRead *.ipkg,idris-response setf idris2
   au BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
 endif
 
-if polyglot#util#IsEnabled('idris', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'idris')
   au BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
   au BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
   au BufNewFile,BufRead idris-response setf idris
 endif
 
-if polyglot#util#IsEnabled('icalendar', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'icalendar')
   au BufNewFile,BufRead *.ics setf icalendar
 endif
 
-if polyglot#util#IsEnabled('i3', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'i3')
   au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config setf i3config
 endif
 
-if polyglot#util#IsEnabled('hive', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'hive')
   au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
 endif
 
-if polyglot#util#IsEnabled('hcl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'hcl')
   au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile setf hcl
 endif
 
-if polyglot#util#IsEnabled('haxe', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'haxe')
   au BufNewFile,BufRead *.hx,*.hxsl setf haxe
 endif
 
-if polyglot#util#IsEnabled('haskell', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'haskell')
   au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig setf haskell
 endif
 
-if polyglot#util#IsEnabled('haproxy', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'haproxy')
   au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
   au BufNewFile,BufRead haproxy*.cfg* call s:StarSetf('haproxy')
 endif
 
-if polyglot#util#IsEnabled('handlebars', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'handlebars')
   au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache setf html.mustache
   au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs setf html.handlebars
 endif
 
-if polyglot#util#IsEnabled('haml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'haml')
   au BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc setf haml
 endif
 
-if polyglot#util#IsEnabled('grub', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'grub')
   au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf setf grub
 endif
 
-if polyglot#util#IsEnabled('groovy', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'groovy')
   au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile setf groovy
 endif
 
-if polyglot#util#IsEnabled('graphql', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'graphql')
   au BufNewFile,BufRead *.gql,*.graphql,*.graphqls setf graphql
 endif
 
-if polyglot#util#IsEnabled('jsx', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'jsx')
   au BufNewFile,BufRead *.jsx setf javascriptreact
 endif
 
-if polyglot#util#IsEnabled('javascript', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'javascript')
   au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
   au BufNewFile,BufRead *.flow setf flow
 endif
 
-if polyglot#util#IsEnabled('go', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'go')
   au BufNewFile,BufRead *.go setf go
   au BufNewFile,BufRead go.mod setf gomod
   au BufNewFile,BufRead *.tmpl setf gohtmltmpl
 endif
 
-if polyglot#util#IsEnabled('gnuplot', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gnuplot')
   au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt setf gnuplot
 endif
 
-if polyglot#util#IsEnabled('gmpl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gmpl')
   au BufNewFile,BufRead *.mod setf gmpl
 endif
 
-if polyglot#util#IsEnabled('glsl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'glsl')
   au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
 endif
 
-if polyglot#util#IsEnabled('git', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'git')
   au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules setf gitconfig
   au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
   au BufNewFile,BufRead git-rebase-todo setf gitrebase
@@ -2279,74 +2310,74 @@ if polyglot#util#IsEnabled('git', 'ftdetect')
   au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
 endif
 
-if polyglot#util#IsEnabled('gdscript', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'gdscript')
   au BufNewFile,BufRead *.gd setf gdscript3
 endif
 
-if polyglot#util#IsEnabled('fsharp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'fsharp')
   au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.fsi,*.fsx setf fsharp
 endif
 
-if polyglot#util#IsEnabled('forth', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'forth')
   au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.ft,*.fth setf forth
 endif
 
-if polyglot#util#IsEnabled('flatbuffers', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'flatbuffers')
   au BufNewFile,BufRead *.fbs setf fbs
 endif
 
-if polyglot#util#IsEnabled('fish', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'fish')
   au BufNewFile,BufRead *.fish setf fish
 endif
 
-if polyglot#util#IsEnabled('ferm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ferm')
   au BufNewFile,BufRead *.ferm,ferm.conf setf ferm
 endif
 
-if polyglot#util#IsEnabled('fennel', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'fennel')
   au BufNewFile,BufRead *.fnl setf fennel
 endif
 
-if polyglot#util#IsEnabled('erlang', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'erlang')
   au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock setf erlang
 endif
 
-if polyglot#util#IsEnabled('emblem', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'emblem')
   au BufNewFile,BufRead *.em,*.emblem setf emblem
 endif
 
-if polyglot#util#IsEnabled('emberscript', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'emberscript')
   au BufNewFile,BufRead *.em,*.emberscript setf ember-script
 endif
 
-if polyglot#util#IsEnabled('elm', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'elm')
   au BufNewFile,BufRead *.elm setf elm
 endif
 
-if polyglot#util#IsEnabled('elixir', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'elixir')
   au BufNewFile,BufRead *.ex,*.exs,mix.lock setf elixir
   au BufNewFile,BufRead *.eex,*.leex setf eelixir
 endif
 
-if polyglot#util#IsEnabled('docker-compose', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'docker-compose')
   au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml setf yaml.docker-compose
 endif
 
-if polyglot#util#IsEnabled('yaml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'yaml')
   au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock setf yaml
 endif
 
-if polyglot#util#IsEnabled('mysql', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'mysql')
   au BufNewFile,BufRead *.mysql setf mysql
 endif
 
-if polyglot#util#IsEnabled('sed', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sed')
   au BufNewFile,BufRead *.sed setf sed
 endif
 
-if polyglot#util#IsEnabled('dlang', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dlang')
   au BufNewFile,BufRead *.d,*.di setf d
   au BufNewFile,BufRead *.lst setf dcov
   au BufNewFile,BufRead *.dd setf dd
@@ -2354,138 +2385,138 @@ if polyglot#util#IsEnabled('dlang', 'ftdetect')
   au BufNewFile,BufRead *.sdl setf dsdl
 endif
 
-if polyglot#util#IsEnabled('dhall', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dhall')
   au BufNewFile,BufRead *.dhall setf dhall
 endif
 
-if polyglot#util#IsEnabled('dart', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'dart')
   au BufNewFile,BufRead *.dart,*.drt setf dart
 endif
 
-if polyglot#util#IsEnabled('cue', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cue')
   au BufNewFile,BufRead *.cue setf cuesheet
 endif
 
-if polyglot#util#IsEnabled('cucumber', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cucumber')
   au BufNewFile,BufRead *.feature,*.story setf cucumber
 endif
 
-if polyglot#util#IsEnabled('crystal', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'crystal')
   au BufNewFile,BufRead *.cr,Projectfile setf crystal
   au BufNewFile,BufRead *.ecr setf ecrystal
 endif
 
-if polyglot#util#IsEnabled('cryptol', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cryptol')
   au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl setf cryptol
 endif
 
-if polyglot#util#IsEnabled('coffee-script', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'coffee-script')
   au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile setf coffee
   au BufNewFile,BufRead *.coffee.md,*.litcoffee setf litcoffee
 endif
 
-if polyglot#util#IsEnabled('markdown', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'markdown')
   au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr setf markdown
 endif
 
-if polyglot#util#IsEnabled('cmake', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cmake')
   au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt setf cmake
 endif
 
-if polyglot#util#IsEnabled('clojure', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'clojure')
   au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config setf clojure
 endif
 
-if polyglot#util#IsEnabled('carp', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'carp')
   au BufNewFile,BufRead *.carp setf carp
 endif
 
-if polyglot#util#IsEnabled('caddyfile', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'caddyfile')
   au BufNewFile,BufRead Caddyfile setf caddyfile
 endif
 
-if polyglot#util#IsEnabled('awk', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'awk')
   au BufNewFile,BufRead *.awk,*.gawk setf awk
 endif
 
-if polyglot#util#IsEnabled('ave', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ave')
   au BufNewFile,BufRead *.ave setf ave
 endif
 
-if polyglot#util#IsEnabled('autoit', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'autoit')
   au BufNewFile,BufRead *.au3 setf autoit
 endif
 
-if polyglot#util#IsEnabled('atlas', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'atlas')
   au BufNewFile,BufRead *.as,*.atl setf atlas
 endif
 
-if polyglot#util#IsEnabled('aspperl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'aspperl')
   au BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
 endif
 
-if polyglot#util#IsEnabled('aspvbs', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'aspvbs')
   au BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
   au BufNewFile,BufRead,BufWritePost *.asa call polyglot#detect#Asa()
 endif
 
-if polyglot#util#IsEnabled('asn', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'asn')
   au BufNewFile,BufRead *.asn,*.asn1 setf asn
 endif
 
-if polyglot#util#IsEnabled('automake', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'automake')
   au BufNewFile,BufRead GNUmakefile.am,[mM]akefile.am setf automake
 endif
 
-if polyglot#util#IsEnabled('elf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'elf')
   au BufNewFile,BufRead *.am setf elf
 endif
 
-if polyglot#util#IsEnabled('make', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'make')
   au BufNewFile,BufRead *.dsp,*.mak,*.mk,*[mM]akefile setf make
 endif
 
-if polyglot#util#IsEnabled('autohotkey', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'autohotkey')
   au BufNewFile,BufRead *.ahk,*.ahkl setf autohotkey
 endif
 
-if polyglot#util#IsEnabled('asciidoc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'asciidoc')
   au BufNewFile,BufRead *.adoc,*.asc,*.asciidoc setf asciidoc
 endif
 
-if polyglot#util#IsEnabled('art', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'art')
   au BufNewFile,BufRead *.art setf art
 endif
 
-if polyglot#util#IsEnabled('arduino', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'arduino')
   au BufNewFile,BufRead *.ino,*.pde setf arduino
 endif
 
-if polyglot#util#IsEnabled('c/c++', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'c/c++')
   au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
   au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp setf cpp
   au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
   au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
 endif
 
-if polyglot#util#IsEnabled('arch', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'arch')
   au BufNewFile,BufRead {.,}arch-inventory,=tagging-method setf arch
 endif
 
-if polyglot#util#IsEnabled('aptconf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'aptconf')
   au BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf setf aptconf
   au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
 endif
 
-if polyglot#util#IsEnabled('applescript', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'applescript')
   au BufNewFile,BufRead *.applescript,*.scpt setf applescript
 endif
 
-if polyglot#util#IsEnabled('apiblueprint', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'apiblueprint')
   au BufNewFile,BufRead *.apib setf apiblueprint
 endif
 
-if polyglot#util#IsEnabled('apache', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'apache')
   au BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess setf apache
   au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
   au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
@@ -2499,101 +2530,101 @@ if polyglot#util#IsEnabled('apache', 'ftdetect')
   au BufNewFile,BufRead */etc/apache2/*.conf* call s:StarSetf('apache')
 endif
 
-if polyglot#util#IsEnabled('ant', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ant')
   au BufNewFile,BufRead build.xml setf ant
 endif
 
-if polyglot#util#IsEnabled('xml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'xml')
   au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
 endif
 
-if polyglot#util#IsEnabled('csv', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'csv')
   au BufNewFile,BufRead *.csv,*.tab,*.tsv setf csv
 endif
 
-if polyglot#util#IsEnabled('ampl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ampl')
   " AMPL
   au BufNewFile,BufRead *.run setf ampl
 endif
 
-if polyglot#util#IsEnabled('aml', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'aml')
   au BufNewFile,BufRead *.aml setf aml
 endif
 
-if polyglot#util#IsEnabled('alsaconf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'alsaconf')
   au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc setf alsaconf
 endif
 
-if polyglot#util#IsEnabled('conf', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'conf')
   au BufNewFile,BufRead *.conf,*/etc/hosts,auto.master,config setf conf
 endif
 
-if polyglot#util#IsEnabled('master', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'master')
   au BufNewFile,BufRead *.mas,*.master setf master
 endif
 
-if polyglot#util#IsEnabled('aidl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'aidl')
   " AIDL
   au BufNewFile,BufRead *.aidl setf aidl
 endif
 
-if polyglot#util#IsEnabled('ahdl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ahdl')
   " AHDL
   au BufNewFile,BufRead *.tdf setf ahdl
 endif
 
-if polyglot#util#IsEnabled('ada', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'ada')
   " Ada (83, 9X, 95)
   au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr setf ada
 endif
 
-if polyglot#util#IsEnabled('acpiasl', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'acpiasl')
   au BufNewFile,BufRead *.asl,*.dsl setf asl
 endif
 
-if polyglot#util#IsEnabled('acedb', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'acedb')
   " AceDB
   au BufNewFile,BufRead *.wrm setf acedb
 endif
 
-if polyglot#util#IsEnabled('abel', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'abel')
   " ABEL
   au BufNewFile,BufRead *.abl setf abel
 endif
 
-if polyglot#util#IsEnabled('abc', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'abc')
   " ABC music notation
   au BufNewFile,BufRead *.abc setf abc
 endif
 
-if polyglot#util#IsEnabled('abaqus', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'abaqus')
   au BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
 endif
 
-if polyglot#util#IsEnabled('abap', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'abap')
   " ABAB/4
   au BufNewFile,BufRead *.abap setf abap
 endif
 
-if polyglot#util#IsEnabled('aap', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'aap')
   " A-A-P recipe
   au BufNewFile,BufRead *.aap setf aap
 endif
 
-if polyglot#util#IsEnabled('a65', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'a65')
   " XA65 MOS6510 cross assembler
   au BufNewFile,BufRead *.a65 setf a65
 endif
 
-if polyglot#util#IsEnabled('a2ps', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'a2ps')
   au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc setf a2ps
 endif
 
-if polyglot#util#IsEnabled('cfg', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'cfg')
   au BufNewFile,BufRead *.cfg,*.hgrc,*hgrc setf cfg
 endif
 
-if polyglot#util#IsEnabled('8th', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, '8th')
   " 8th (Firth-derivative)
   au BufNewFile,BufRead *.8th setf 8th
 endif
@@ -2620,7 +2651,7 @@ au FileType * au! polyglot-observer
 augroup END
 
 
-if polyglot#util#IsEnabled('autoindent', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'autoindent')
   " Code below re-implements sleuth for vim-polyglot
   let g:loaded_sleuth = 1
 
@@ -2858,8 +2889,6 @@ if polyglot#util#IsEnabled('autoindent', 'ftdetect')
   command! -bar -bang Sleuth call s:detect_indent()
 endif
 
-au VimEnter * call polyglot#util#Verify()
-
 augroup filetypedetect
 
 " Ignored extensions
@@ -3461,21 +3490,67 @@ if exists("did_load_filetypes") && exists("g:polyglot_disabled")
 endif
 
 
-if polyglot#util#IsEnabled('sensible', 'ftdetect')
-  " Reload unchanged files automatically.
-  set autoread
+let s:runtime = resolve($VIMRUNTIME)
+let s:base = resolve(expand('<sfile>:p:h:h'))
 
-  " Disable swap, it doesn't play well with autoread
-  set noswapfile
+func! s:process_rtp(rtp)
+  " Remove vim-polyglot from paths and make everything absolute
+  let rtp = []
+  for path in a:rtp[1:-2]
+    let abspath = resolve(path)
+    if stridx(abspath, s:base) != 0
+      call add(rtp, abspath)
+    endif
+  endfor
+  let result = [a:rtp[0]]
+  " Then all other stuff (until vimruntime)
+  let i = 0
+  for path in rtp[0:-1]
+    if path == s:runtime
+      break
+    endif
+    call add(result, path)
+    let i = i + 1
+  endfor
+  " Then vim-polyglot
+  call add(result, s:base)
+  " Then all other files, until after-files
+  for path in rtp[i:-1]
+    if match(path, '[/\\]after$') > -1
+      break
+    endif
+    call add(result, path)
+    let i = i + 1
+  endfor
+  " Then vim-polyglot after path
+  call add(result, s:base . '/after')
+  " Then all other after paths
+  for path in rtp[i:-2]
+    call add(result, path)
+  endfor
+  " User's after directory is always last
+  call add(result, a:rtp[-1])
+  return result
+endfunc
 
-  " Enable highlighted case-insensitive incremential search.
-  set incsearch
+" We want vim-polyglot files to load only as fallback
+let &rtp = join(s:process_rtp(split(&rtp, ',')), ',')
 
+if !has_key(g:polyglot_is_disabled, 'sensible')
   " Use utf-8 encoding by default
   set encoding=utf-8
 
+  " Reload unchanged files automatically.
+  set autoread
+
+  " Disable swap, it doesn't play well with autoread
+  set noswapfile
+
   " Autoindent when starting new line, or using `o` or `O`.
   set autoindent
+
+  " Enable highlighted case-insensitive incremential search.
+  set incsearch
 endif
 
 " Restore 'cpoptions'
diff --git a/ftplugin/8th.vim b/ftplugin/8th.vim
index 5199a7bfd..e5f2f0560 100644
--- a/ftplugin/8th.vim
+++ b/ftplugin/8th.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('8th', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, '8th')
   finish
 endif
 
diff --git a/ftplugin/a2ps.vim b/ftplugin/a2ps.vim
index dfcefea79..a247bfb10 100644
--- a/ftplugin/a2ps.vim
+++ b/ftplugin/a2ps.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('a2ps', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'a2ps')
   finish
 endif
 
diff --git a/ftplugin/aap.vim b/ftplugin/aap.vim
index 00588ae93..3e67cc0a6 100644
--- a/ftplugin/aap.vim
+++ b/ftplugin/aap.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('aap', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'aap')
   finish
 endif
 
diff --git a/ftplugin/abap.vim b/ftplugin/abap.vim
index eced7b2ba..d80412934 100644
--- a/ftplugin/abap.vim
+++ b/ftplugin/abap.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('abap', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'abap')
   finish
 endif
 
diff --git a/ftplugin/abaqus.vim b/ftplugin/abaqus.vim
index fb3bd11ed..b800d1864 100644
--- a/ftplugin/abaqus.vim
+++ b/ftplugin/abaqus.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('abaqus', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'abaqus')
   finish
 endif
 
diff --git a/ftplugin/ada.vim b/ftplugin/ada.vim
index 62d252fdd..2025e9b65 100644
--- a/ftplugin/ada.vim
+++ b/ftplugin/ada.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ada', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ada')
   finish
 endif
 
diff --git a/ftplugin/alsaconf.vim b/ftplugin/alsaconf.vim
index 093c2ab14..2bdbe06c2 100644
--- a/ftplugin/alsaconf.vim
+++ b/ftplugin/alsaconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('alsaconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'alsaconf')
   finish
 endif
 
diff --git a/ftplugin/ansible.vim b/ftplugin/ansible.vim
index e6676ccfa..44def5621 100644
--- a/ftplugin/ansible.vim
+++ b/ftplugin/ansible.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ansible')
   finish
 endif
 
diff --git a/ftplugin/ansible_hosts.vim b/ftplugin/ansible_hosts.vim
index d6854c205..b4f3b6658 100644
--- a/ftplugin/ansible_hosts.vim
+++ b/ftplugin/ansible_hosts.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ansible')
   finish
 endif
 
diff --git a/ftplugin/ant.vim b/ftplugin/ant.vim
index 799e03ec3..e4414e002 100644
--- a/ftplugin/ant.vim
+++ b/ftplugin/ant.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ant', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ant')
   finish
 endif
 
diff --git a/ftplugin/arch.vim b/ftplugin/arch.vim
index 755963a5c..288140d67 100644
--- a/ftplugin/arch.vim
+++ b/ftplugin/arch.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('arch', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'arch')
   finish
 endif
 
diff --git a/ftplugin/art.vim b/ftplugin/art.vim
index 7b1c43984..7dd4a1cf0 100644
--- a/ftplugin/art.vim
+++ b/ftplugin/art.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('art', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'art')
   finish
 endif
 
diff --git a/ftplugin/aspvbs.vim b/ftplugin/aspvbs.vim
index 03f38e298..86c3d3158 100644
--- a/ftplugin/aspvbs.vim
+++ b/ftplugin/aspvbs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('aspvbs', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'aspvbs')
   finish
 endif
 
diff --git a/ftplugin/automake.vim b/ftplugin/automake.vim
index f3e317579..d7ab44e98 100644
--- a/ftplugin/automake.vim
+++ b/ftplugin/automake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('automake', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'automake')
   finish
 endif
 
diff --git a/ftplugin/awk.vim b/ftplugin/awk.vim
index 9ff6adf6b..13d7acb67 100644
--- a/ftplugin/awk.vim
+++ b/ftplugin/awk.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('awk', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'awk')
   finish
 endif
 
diff --git a/ftplugin/bdf.vim b/ftplugin/bdf.vim
index aaf1def01..7485eb7dd 100644
--- a/ftplugin/bdf.vim
+++ b/ftplugin/bdf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bdf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bdf')
   finish
 endif
 
diff --git a/ftplugin/blade.vim b/ftplugin/blade.vim
index ee75475e2..1f88c839e 100644
--- a/ftplugin/blade.vim
+++ b/ftplugin/blade.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('blade', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'blade')
   finish
 endif
 
diff --git a/ftplugin/bst.vim b/ftplugin/bst.vim
index 26555cc7d..1c150d931 100644
--- a/ftplugin/bst.vim
+++ b/ftplugin/bst.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bst', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bst')
   finish
 endif
 
diff --git a/ftplugin/bzl.vim b/ftplugin/bzl.vim
index 71b7ceaa0..3d1d22efc 100644
--- a/ftplugin/bzl.vim
+++ b/ftplugin/bzl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bzl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bzl')
   finish
 endif
 
diff --git a/ftplugin/caddyfile.vim b/ftplugin/caddyfile.vim
index 206ed69e9..363fbc566 100644
--- a/ftplugin/caddyfile.vim
+++ b/ftplugin/caddyfile.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('caddyfile', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'caddyfile')
   finish
 endif
 
diff --git a/ftplugin/calendar.vim b/ftplugin/calendar.vim
index 732627594..8952a9b72 100644
--- a/ftplugin/calendar.vim
+++ b/ftplugin/calendar.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('calendar', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'calendar')
   finish
 endif
 
diff --git a/ftplugin/cdrdaoconf.vim b/ftplugin/cdrdaoconf.vim
index 1f6fccdf6..ea14cfc42 100644
--- a/ftplugin/cdrdaoconf.vim
+++ b/ftplugin/cdrdaoconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cdrdaoconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cdrdaoconf')
   finish
 endif
 
diff --git a/ftplugin/cfg.vim b/ftplugin/cfg.vim
index 2291a2690..db6374816 100644
--- a/ftplugin/cfg.vim
+++ b/ftplugin/cfg.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cfg', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cfg')
   finish
 endif
 
diff --git a/ftplugin/ch.vim b/ftplugin/ch.vim
index 95865364a..8249bbc96 100644
--- a/ftplugin/ch.vim
+++ b/ftplugin/ch.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ch', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ch')
   finish
 endif
 
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 641aaac18..170fc30eb 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('clojure', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'clojure')
   finish
 endif
 
diff --git a/ftplugin/cobol.vim b/ftplugin/cobol.vim
index 89bb817ab..40b0a8e9c 100644
--- a/ftplugin/cobol.vim
+++ b/ftplugin/cobol.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cobol', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cobol')
   finish
 endif
 
diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim
index 9a493b96d..f973deb5d 100644
--- a/ftplugin/coffee.vim
+++ b/ftplugin/coffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/ftplugin/conf.vim b/ftplugin/conf.vim
index 8ba8a0bd3..51fb01fce 100644
--- a/ftplugin/conf.vim
+++ b/ftplugin/conf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('conf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'conf')
   finish
 endif
 
diff --git a/ftplugin/config.vim b/ftplugin/config.vim
index dd85e65d8..e2fd9605b 100644
--- a/ftplugin/config.vim
+++ b/ftplugin/config.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('config', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'config')
   finish
 endif
 
diff --git a/ftplugin/crm.vim b/ftplugin/crm.vim
index 46388ca1c..85465223b 100644
--- a/ftplugin/crm.vim
+++ b/ftplugin/crm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crm')
   finish
 endif
 
diff --git a/ftplugin/cryptol/folding.vim b/ftplugin/cryptol/folding.vim
index 717ecadba..865a1e594 100644
--- a/ftplugin/cryptol/folding.vim
+++ b/ftplugin/cryptol/folding.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cryptol', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cryptol')
   finish
 endif
 
diff --git a/ftplugin/crystal.vim b/ftplugin/crystal.vim
index 7f3914344..76bbb6ad5 100644
--- a/ftplugin/crystal.vim
+++ b/ftplugin/crystal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/ftplugin/cs.vim b/ftplugin/cs.vim
index cfefde110..7dc16fe34 100644
--- a/ftplugin/cs.vim
+++ b/ftplugin/cs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cs', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cs')
   finish
 endif
 
diff --git a/ftplugin/csc.vim b/ftplugin/csc.vim
index a596b93d7..40b65687d 100644
--- a/ftplugin/csc.vim
+++ b/ftplugin/csc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('csc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'csc')
   finish
 endif
 
diff --git a/ftplugin/css.vim b/ftplugin/css.vim
index 6c8a3562b..b9446bfd6 100644
--- a/ftplugin/css.vim
+++ b/ftplugin/css.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('css', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'css')
   finish
 endif
 
diff --git a/ftplugin/csv.vim b/ftplugin/csv.vim
index f479a6ffb..40d3577b8 100644
--- a/ftplugin/csv.vim
+++ b/ftplugin/csv.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('csv', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'csv')
   finish
 endif
 
diff --git a/ftplugin/cucumber.vim b/ftplugin/cucumber.vim
index ab1e52fad..c53cb6312 100644
--- a/ftplugin/cucumber.vim
+++ b/ftplugin/cucumber.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cucumber', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cucumber')
   finish
 endif
 
diff --git a/ftplugin/cvsrc.vim b/ftplugin/cvsrc.vim
index a80491428..6e888f10e 100644
--- a/ftplugin/cvsrc.vim
+++ b/ftplugin/cvsrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cvsrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cvsrc')
   finish
 endif
 
diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim
index b402543de..5050378fb 100644
--- a/ftplugin/dart.vim
+++ b/ftplugin/dart.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dart', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dart')
   finish
 endif
 
diff --git a/ftplugin/debchangelog.vim b/ftplugin/debchangelog.vim
index 13904dc90..746de50bd 100644
--- a/ftplugin/debchangelog.vim
+++ b/ftplugin/debchangelog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('debchangelog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'debchangelog')
   finish
 endif
 
diff --git a/ftplugin/debcontrol.vim b/ftplugin/debcontrol.vim
index e6109e737..c4307414e 100644
--- a/ftplugin/debcontrol.vim
+++ b/ftplugin/debcontrol.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('debcontrol', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'debcontrol')
   finish
 endif
 
diff --git a/ftplugin/denyhosts.vim b/ftplugin/denyhosts.vim
index 41a54a12a..bda92b121 100644
--- a/ftplugin/denyhosts.vim
+++ b/ftplugin/denyhosts.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('denyhosts', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'denyhosts')
   finish
 endif
 
diff --git a/ftplugin/dhall.vim b/ftplugin/dhall.vim
index d0a702ea5..1b90832ce 100644
--- a/ftplugin/dhall.vim
+++ b/ftplugin/dhall.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dhall', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dhall')
   finish
 endif
 
diff --git a/ftplugin/dictconf.vim b/ftplugin/dictconf.vim
index 048a49180..d56fa358c 100644
--- a/ftplugin/dictconf.vim
+++ b/ftplugin/dictconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dictconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dictconf')
   finish
 endif
 
diff --git a/ftplugin/dictdconf.vim b/ftplugin/dictdconf.vim
index 6b3c11747..b05d75204 100644
--- a/ftplugin/dictdconf.vim
+++ b/ftplugin/dictdconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dictdconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dictdconf')
   finish
 endif
 
diff --git a/ftplugin/diff.vim b/ftplugin/diff.vim
index 7a04c881e..4343638c8 100644
--- a/ftplugin/diff.vim
+++ b/ftplugin/diff.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('diff', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'diff')
   finish
 endif
 
diff --git a/ftplugin/dircolors.vim b/ftplugin/dircolors.vim
index 1ae606485..92df4c031 100644
--- a/ftplugin/dircolors.vim
+++ b/ftplugin/dircolors.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dircolors', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dircolors')
   finish
 endif
 
diff --git a/ftplugin/docker-compose.vim b/ftplugin/docker-compose.vim
index 89cc86475..32c91d532 100644
--- a/ftplugin/docker-compose.vim
+++ b/ftplugin/docker-compose.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('docker-compose', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'docker-compose')
   finish
 endif
 
diff --git a/ftplugin/dockerfile.vim b/ftplugin/dockerfile.vim
index 62d99f39d..79388fb08 100644
--- a/ftplugin/dockerfile.vim
+++ b/ftplugin/dockerfile.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dockerfile', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dockerfile')
   finish
 endif
 
diff --git a/ftplugin/dosbatch.vim b/ftplugin/dosbatch.vim
index 902ed8f72..434f5772e 100644
--- a/ftplugin/dosbatch.vim
+++ b/ftplugin/dosbatch.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dosbatch', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dosbatch')
   finish
 endif
 
diff --git a/ftplugin/dosini.vim b/ftplugin/dosini.vim
index 394b98bdd..1f9c82891 100644
--- a/ftplugin/dosini.vim
+++ b/ftplugin/dosini.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dosini', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dosini')
   finish
 endif
 
diff --git a/ftplugin/dtd.vim b/ftplugin/dtd.vim
index d428a845c..d8f2aa22b 100644
--- a/ftplugin/dtd.vim
+++ b/ftplugin/dtd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dtd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dtd')
   finish
 endif
 
diff --git a/ftplugin/dune.vim b/ftplugin/dune.vim
index 4454e1d2a..9bd424c88 100644
--- a/ftplugin/dune.vim
+++ b/ftplugin/dune.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/ftplugin/ecrystal.vim b/ftplugin/ecrystal.vim
index 5057546de..81d0fad78 100644
--- a/ftplugin/ecrystal.vim
+++ b/ftplugin/ecrystal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index 914a5d704..1b337f581 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/ftplugin/elinks.vim b/ftplugin/elinks.vim
index ca68f8475..3288cc53a 100644
--- a/ftplugin/elinks.vim
+++ b/ftplugin/elinks.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elinks', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elinks')
   finish
 endif
 
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index d16a45d8c..04fd66a1b 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/ftplugin/embeddedpuppet.vim b/ftplugin/embeddedpuppet.vim
index 344e93ae3..e7da63d2c 100644
--- a/ftplugin/embeddedpuppet.vim
+++ b/ftplugin/embeddedpuppet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/ftplugin/ember-script.vim b/ftplugin/ember-script.vim
index 792e38865..3180ea72d 100644
--- a/ftplugin/ember-script.vim
+++ b/ftplugin/ember-script.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('emberscript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'emberscript')
   finish
 endif
 
diff --git a/ftplugin/emblem.vim b/ftplugin/emblem.vim
index 3351f5331..9e102c0bd 100644
--- a/ftplugin/emblem.vim
+++ b/ftplugin/emblem.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('emblem', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'emblem')
   finish
 endif
 
diff --git a/ftplugin/eruby.vim b/ftplugin/eruby.vim
index f6a8e6598..af7415792 100644
--- a/ftplugin/eruby.vim
+++ b/ftplugin/eruby.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/ftplugin/eterm.vim b/ftplugin/eterm.vim
index fc163ccfb..d121fdf32 100644
--- a/ftplugin/eterm.vim
+++ b/ftplugin/eterm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('eterm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'eterm')
   finish
 endif
 
diff --git a/ftplugin/falcon.vim b/ftplugin/falcon.vim
index 5eeab00fd..727fcfcb2 100644
--- a/ftplugin/falcon.vim
+++ b/ftplugin/falcon.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('falcon', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'falcon')
   finish
 endif
 
diff --git a/ftplugin/fennel.vim b/ftplugin/fennel.vim
index 926bc8790..1cbb2d33e 100644
--- a/ftplugin/fennel.vim
+++ b/ftplugin/fennel.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fennel', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fennel')
   finish
 endif
 
diff --git a/ftplugin/fetchmail.vim b/ftplugin/fetchmail.vim
index eaaf3e25c..8b86ea1af 100644
--- a/ftplugin/fetchmail.vim
+++ b/ftplugin/fetchmail.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fetchmail', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fetchmail')
   finish
 endif
 
diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
index 8ead1ce33..88f6a2756 100644
--- a/ftplugin/fish.vim
+++ b/ftplugin/fish.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fish', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fish')
   finish
 endif
 
diff --git a/ftplugin/fortran.vim b/ftplugin/fortran.vim
index b951347c8..a4ae9adeb 100644
--- a/ftplugin/fortran.vim
+++ b/ftplugin/fortran.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fortran', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fortran')
   finish
 endif
 
diff --git a/ftplugin/framescript.vim b/ftplugin/framescript.vim
index 514f3c946..f3ae64810 100644
--- a/ftplugin/framescript.vim
+++ b/ftplugin/framescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('framescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'framescript')
   finish
 endif
 
diff --git a/ftplugin/fvwm.vim b/ftplugin/fvwm.vim
index 0f6de2db8..ed3fb40d1 100644
--- a/ftplugin/fvwm.vim
+++ b/ftplugin/fvwm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fvwm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fvwm')
   finish
 endif
 
diff --git a/ftplugin/gdb.vim b/ftplugin/gdb.vim
index 03fe25654..655fb6017 100644
--- a/ftplugin/gdb.vim
+++ b/ftplugin/gdb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gdb', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gdb')
   finish
 endif
 
diff --git a/ftplugin/git.vim b/ftplugin/git.vim
index 13ae96b6f..2b907e52d 100644
--- a/ftplugin/git.vim
+++ b/ftplugin/git.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim
index 47f82b176..026f898eb 100644
--- a/ftplugin/gitcommit.vim
+++ b/ftplugin/gitcommit.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/ftplugin/gitconfig.vim b/ftplugin/gitconfig.vim
index 44f66a294..2d98aaf78 100644
--- a/ftplugin/gitconfig.vim
+++ b/ftplugin/gitconfig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/ftplugin/gitignore.vim b/ftplugin/gitignore.vim
index 48495472b..bfb857023 100644
--- a/ftplugin/gitignore.vim
+++ b/ftplugin/gitignore.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gitignore', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gitignore')
   finish
 endif
 
diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim
index c07554e07..524663c7c 100644
--- a/ftplugin/gitrebase.vim
+++ b/ftplugin/gitrebase.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/ftplugin/gitsendemail.vim b/ftplugin/gitsendemail.vim
index a8e269956..44be6a7d8 100644
--- a/ftplugin/gitsendemail.vim
+++ b/ftplugin/gitsendemail.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/ftplugin/gpg.vim b/ftplugin/gpg.vim
index 9089768ce..f6e934912 100644
--- a/ftplugin/gpg.vim
+++ b/ftplugin/gpg.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gpg', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gpg')
   finish
 endif
 
diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim
index 56b29f892..177df4798 100644
--- a/ftplugin/graphql.vim
+++ b/ftplugin/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/ftplugin/groovy.vim b/ftplugin/groovy.vim
index cf78a14e8..d87b3d567 100644
--- a/ftplugin/groovy.vim
+++ b/ftplugin/groovy.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('groovy', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'groovy')
   finish
 endif
 
diff --git a/ftplugin/group.vim b/ftplugin/group.vim
index 357f43cfb..2a2758314 100644
--- a/ftplugin/group.vim
+++ b/ftplugin/group.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('group', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'group')
   finish
 endif
 
diff --git a/ftplugin/grub.vim b/ftplugin/grub.vim
index d707032b1..b354f0332 100644
--- a/ftplugin/grub.vim
+++ b/ftplugin/grub.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('grub', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'grub')
   finish
 endif
 
diff --git a/ftplugin/haml.vim b/ftplugin/haml.vim
index 95b57af69..e5f020499 100644
--- a/ftplugin/haml.vim
+++ b/ftplugin/haml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haml')
   finish
 endif
 
diff --git a/ftplugin/hamster.vim b/ftplugin/hamster.vim
index 780774332..bb8c36e78 100644
--- a/ftplugin/hamster.vim
+++ b/ftplugin/hamster.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hamster', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hamster')
   finish
 endif
 
diff --git a/ftplugin/handlebars.vim b/ftplugin/handlebars.vim
index 0ebcc9b73..bbe46ea45 100644
--- a/ftplugin/handlebars.vim
+++ b/ftplugin/handlebars.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'handlebars')
   finish
 endif
 
diff --git a/ftplugin/hcl.vim b/ftplugin/hcl.vim
index 8c55f9a5c..8d0590445 100644
--- a/ftplugin/hcl.vim
+++ b/ftplugin/hcl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hcl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hcl')
   finish
 endif
 
diff --git a/ftplugin/help.vim b/ftplugin/help.vim
index dcb63826c..18d1498e8 100644
--- a/ftplugin/help.vim
+++ b/ftplugin/help.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('help', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'help')
   finish
 endif
 
diff --git a/ftplugin/hgcommit.vim b/ftplugin/hgcommit.vim
index d101a6254..a297f0063 100644
--- a/ftplugin/hgcommit.vim
+++ b/ftplugin/hgcommit.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hgcommit', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hgcommit')
   finish
 endif
 
diff --git a/ftplugin/hive.vim b/ftplugin/hive.vim
index e1fe2dff5..0e9cfd8e2 100644
--- a/ftplugin/hive.vim
+++ b/ftplugin/hive.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hive', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hive')
   finish
 endif
 
diff --git a/ftplugin/hog.vim b/ftplugin/hog.vim
index 4b198d704..62c42f7e7 100644
--- a/ftplugin/hog.vim
+++ b/ftplugin/hog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hog')
   finish
 endif
 
diff --git a/ftplugin/hostconf.vim b/ftplugin/hostconf.vim
index bb680b8ec..126940175 100644
--- a/ftplugin/hostconf.vim
+++ b/ftplugin/hostconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hostconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hostconf')
   finish
 endif
 
diff --git a/ftplugin/hostsaccess.vim b/ftplugin/hostsaccess.vim
index 1617577b9..9c12ca31f 100644
--- a/ftplugin/hostsaccess.vim
+++ b/ftplugin/hostsaccess.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hostsaccess', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hostsaccess')
   finish
 endif
 
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index b48d0cd77..414160793 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html')
   finish
 endif
 
diff --git a/ftplugin/htmldjango.vim b/ftplugin/htmldjango.vim
index 6da812a41..deaa50c4c 100644
--- a/ftplugin/htmldjango.vim
+++ b/ftplugin/htmldjango.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('htmldjango', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'htmldjango')
   finish
 endif
 
diff --git a/ftplugin/i3config.vim b/ftplugin/i3config.vim
index dc4182fbc..dfdbbeb3a 100644
--- a/ftplugin/i3config.vim
+++ b/ftplugin/i3config.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('i3', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'i3')
   finish
 endif
 
diff --git a/ftplugin/idris.vim b/ftplugin/idris.vim
index f3201a08b..994ac63ed 100644
--- a/ftplugin/idris.vim
+++ b/ftplugin/idris.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/ftplugin/idris2.vim b/ftplugin/idris2.vim
index 97337057e..5596bbbd0 100644
--- a/ftplugin/idris2.vim
+++ b/ftplugin/idris2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/ftplugin/indent.vim b/ftplugin/indent.vim
index d3ee4f74a..96cc9a102 100644
--- a/ftplugin/indent.vim
+++ b/ftplugin/indent.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('indent', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'indent')
   finish
 endif
 
diff --git a/ftplugin/ion.vim b/ftplugin/ion.vim
index 8835e2911..7401d0b5a 100644
--- a/ftplugin/ion.vim
+++ b/ftplugin/ion.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ion', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ion')
   finish
 endif
 
diff --git a/ftplugin/j.vim b/ftplugin/j.vim
index 4b4669ff2..62b60ed34 100644
--- a/ftplugin/j.vim
+++ b/ftplugin/j.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('j', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'j')
   finish
 endif
 
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
index 5a7dc9e02..ec8d4f5b6 100644
--- a/ftplugin/java.vim
+++ b/ftplugin/java.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('java', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'java')
   finish
 endif
 
diff --git a/ftplugin/jproperties.vim b/ftplugin/jproperties.vim
index b67a00c3b..a0a2152df 100644
--- a/ftplugin/jproperties.vim
+++ b/ftplugin/jproperties.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jproperties', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jproperties')
   finish
 endif
 
diff --git a/ftplugin/jq.vim b/ftplugin/jq.vim
index ae05d442c..cfabd2cbd 100644
--- a/ftplugin/jq.vim
+++ b/ftplugin/jq.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jq', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jq')
   finish
 endif
 
diff --git a/ftplugin/json.vim b/ftplugin/json.vim
index f55b4b0af..22eaa5061 100644
--- a/ftplugin/json.vim
+++ b/ftplugin/json.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('json', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'json')
   finish
 endif
 
diff --git a/ftplugin/jsonnet.vim b/ftplugin/jsonnet.vim
index 00dcfb7ce..aff7d8808 100644
--- a/ftplugin/jsonnet.vim
+++ b/ftplugin/jsonnet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsonnet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsonnet')
   finish
 endif
 
diff --git a/ftplugin/jsp.vim b/ftplugin/jsp.vim
index 68e9e03b6..9de79fd29 100644
--- a/ftplugin/jsp.vim
+++ b/ftplugin/jsp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsp')
   finish
 endif
 
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index cc3530996..2416e3881 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/ftplugin/juliadoc.vim b/ftplugin/juliadoc.vim
index d961f6977..b5fd1f1e4 100644
--- a/ftplugin/juliadoc.vim
+++ b/ftplugin/juliadoc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/ftplugin/kconfig.vim b/ftplugin/kconfig.vim
index a02b473ae..c0ed75097 100644
--- a/ftplugin/kconfig.vim
+++ b/ftplugin/kconfig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('kconfig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'kconfig')
   finish
 endif
 
diff --git a/ftplugin/kotlin.vim b/ftplugin/kotlin.vim
index 5e04d995d..a9aee55b2 100644
--- a/ftplugin/kotlin.vim
+++ b/ftplugin/kotlin.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('kotlin', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'kotlin')
   finish
 endif
 
diff --git a/ftplugin/kwt.vim b/ftplugin/kwt.vim
index 2a5464592..89c914eef 100644
--- a/ftplugin/kwt.vim
+++ b/ftplugin/kwt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('kwt', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'kwt')
   finish
 endif
 
diff --git a/ftplugin/ld.vim b/ftplugin/ld.vim
index a748663c9..5de5b71a9 100644
--- a/ftplugin/ld.vim
+++ b/ftplugin/ld.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ld', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ld')
   finish
 endif
 
diff --git a/ftplugin/less.vim b/ftplugin/less.vim
index 87b66ecf4..4946b22cf 100644
--- a/ftplugin/less.vim
+++ b/ftplugin/less.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('less', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'less')
   finish
 endif
 
diff --git a/ftplugin/lftp.vim b/ftplugin/lftp.vim
index 0088fab09..a5fa4dcd3 100644
--- a/ftplugin/lftp.vim
+++ b/ftplugin/lftp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lftp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lftp')
   finish
 endif
 
diff --git a/ftplugin/libao.vim b/ftplugin/libao.vim
index 9829dfa1e..49700d8ff 100644
--- a/ftplugin/libao.vim
+++ b/ftplugin/libao.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('libao', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'libao')
   finish
 endif
 
diff --git a/ftplugin/lilypond.vim b/ftplugin/lilypond.vim
index 21b384978..5963cdafc 100644
--- a/ftplugin/lilypond.vim
+++ b/ftplugin/lilypond.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lilypond', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lilypond')
   finish
 endif
 
diff --git a/ftplugin/limits.vim b/ftplugin/limits.vim
index 82828bb22..db9fd7570 100644
--- a/ftplugin/limits.vim
+++ b/ftplugin/limits.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('limits', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'limits')
   finish
 endif
 
diff --git a/ftplugin/liquid.vim b/ftplugin/liquid.vim
index 1b8a5d05e..4eaa80942 100644
--- a/ftplugin/liquid.vim
+++ b/ftplugin/liquid.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('liquid', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'liquid')
   finish
 endif
 
diff --git a/ftplugin/lisp.vim b/ftplugin/lisp.vim
index c6b097b1e..5425a34ca 100644
--- a/ftplugin/lisp.vim
+++ b/ftplugin/lisp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lisp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lisp')
   finish
 endif
 
diff --git a/ftplugin/litcoffee.vim b/ftplugin/litcoffee.vim
index 75af16cd2..622b368df 100644
--- a/ftplugin/litcoffee.vim
+++ b/ftplugin/litcoffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/ftplugin/llvm.vim b/ftplugin/llvm.vim
index 67da6358a..a21fe96dd 100644
--- a/ftplugin/llvm.vim
+++ b/ftplugin/llvm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/ftplugin/logcheck.vim b/ftplugin/logcheck.vim
index c69142ae5..eb009fc2e 100644
--- a/ftplugin/logcheck.vim
+++ b/ftplugin/logcheck.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('logcheck', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'logcheck')
   finish
 endif
 
diff --git a/ftplugin/loginaccess.vim b/ftplugin/loginaccess.vim
index 5ad28b4cb..028ebd5e9 100644
--- a/ftplugin/loginaccess.vim
+++ b/ftplugin/loginaccess.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('loginaccess', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'loginaccess')
   finish
 endif
 
diff --git a/ftplugin/logindefs.vim b/ftplugin/logindefs.vim
index 5c8f91d85..8c615834a 100644
--- a/ftplugin/logindefs.vim
+++ b/ftplugin/logindefs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('logindefs', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'logindefs')
   finish
 endif
 
diff --git a/ftplugin/logtalk.vim b/ftplugin/logtalk.vim
index 2c75d4b5e..d672350f6 100644
--- a/ftplugin/logtalk.vim
+++ b/ftplugin/logtalk.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('logtalk', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'logtalk')
   finish
 endif
 
diff --git a/ftplugin/lprolog.vim b/ftplugin/lprolog.vim
index ca24c8d5f..1ed7120db 100644
--- a/ftplugin/lprolog.vim
+++ b/ftplugin/lprolog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lprolog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lprolog')
   finish
 endif
 
diff --git a/ftplugin/ls.vim b/ftplugin/ls.vim
index 985422229..51fb7fb81 100644
--- a/ftplugin/ls.vim
+++ b/ftplugin/ls.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('livescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'livescript')
   finish
 endif
 
diff --git a/ftplugin/m4.vim b/ftplugin/m4.vim
index 51c935ae0..9cd3bfedf 100644
--- a/ftplugin/m4.vim
+++ b/ftplugin/m4.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('m4', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'm4')
   finish
 endif
 
diff --git a/ftplugin/mail.vim b/ftplugin/mail.vim
index eb2bf8b41..132f3b77d 100644
--- a/ftplugin/mail.vim
+++ b/ftplugin/mail.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mail', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mail')
   finish
 endif
 
diff --git a/ftplugin/mailaliases.vim b/ftplugin/mailaliases.vim
index 7fd68c4a0..9b04c535e 100644
--- a/ftplugin/mailaliases.vim
+++ b/ftplugin/mailaliases.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mailaliases', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mailaliases')
   finish
 endif
 
diff --git a/ftplugin/mailcap.vim b/ftplugin/mailcap.vim
index a47cf59c2..591414fa5 100644
--- a/ftplugin/mailcap.vim
+++ b/ftplugin/mailcap.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mailcap', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mailcap')
   finish
 endif
 
diff --git a/ftplugin/make.vim b/ftplugin/make.vim
index 02b0e3204..f52a8491d 100644
--- a/ftplugin/make.vim
+++ b/ftplugin/make.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('make', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'make')
   finish
 endif
 
diff --git a/ftplugin/mako.vim b/ftplugin/mako.vim
index c68d6d67d..f26d03ec7 100644
--- a/ftplugin/mako.vim
+++ b/ftplugin/mako.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mako', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mako')
   finish
 endif
 
diff --git a/ftplugin/manconf.vim b/ftplugin/manconf.vim
index 51490f66c..5f3acd958 100644
--- a/ftplugin/manconf.vim
+++ b/ftplugin/manconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('manconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'manconf')
   finish
 endif
 
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index 03530bc9f..a175f7ed7 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('markdown', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'markdown')
   finish
 endif
 
diff --git a/ftplugin/meson.vim b/ftplugin/meson.vim
index 75c9d90da..0a3971f49 100644
--- a/ftplugin/meson.vim
+++ b/ftplugin/meson.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('meson', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'meson')
   finish
 endif
 
diff --git a/ftplugin/mf.vim b/ftplugin/mf.vim
index 06af3469a..c66116700 100644
--- a/ftplugin/mf.vim
+++ b/ftplugin/mf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mf')
   finish
 endif
 
diff --git a/ftplugin/mma.vim b/ftplugin/mma.vim
index 2dc9cd61a..7c50bbd23 100644
--- a/ftplugin/mma.vim
+++ b/ftplugin/mma.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mathematica', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mathematica')
   finish
 endif
 
diff --git a/ftplugin/modconf.vim b/ftplugin/modconf.vim
index 26eb4a887..e47b54e23 100644
--- a/ftplugin/modconf.vim
+++ b/ftplugin/modconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('modconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'modconf')
   finish
 endif
 
diff --git a/ftplugin/moon.vim b/ftplugin/moon.vim
index a4c0140f9..edfeccb3f 100644
--- a/ftplugin/moon.vim
+++ b/ftplugin/moon.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('moonscript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'moonscript')
   finish
 endif
 
diff --git a/ftplugin/mp.vim b/ftplugin/mp.vim
index d73c51ac8..1817ef3c2 100644
--- a/ftplugin/mp.vim
+++ b/ftplugin/mp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mp')
   finish
 endif
 
diff --git a/ftplugin/mplayerconf.vim b/ftplugin/mplayerconf.vim
index 34166238b..92b00892f 100644
--- a/ftplugin/mplayerconf.vim
+++ b/ftplugin/mplayerconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mplayerconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mplayerconf')
   finish
 endif
 
diff --git a/ftplugin/mrxvtrc.vim b/ftplugin/mrxvtrc.vim
index 6af765271..88c422eaf 100644
--- a/ftplugin/mrxvtrc.vim
+++ b/ftplugin/mrxvtrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mrxvtrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mrxvtrc')
   finish
 endif
 
diff --git a/ftplugin/mustache.vim b/ftplugin/mustache.vim
index c494c1956..a9bfced54 100644
--- a/ftplugin/mustache.vim
+++ b/ftplugin/mustache.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'handlebars')
   finish
 endif
 
diff --git a/ftplugin/muttrc.vim b/ftplugin/muttrc.vim
index cd4321be8..1a21184b1 100644
--- a/ftplugin/muttrc.vim
+++ b/ftplugin/muttrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('muttrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'muttrc')
   finish
 endif
 
diff --git a/ftplugin/nanorc.vim b/ftplugin/nanorc.vim
index f558d6716..e7e37557f 100644
--- a/ftplugin/nanorc.vim
+++ b/ftplugin/nanorc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nanorc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nanorc')
   finish
 endif
 
diff --git a/ftplugin/neomuttrc.vim b/ftplugin/neomuttrc.vim
index a20c2c4da..2d2739a1d 100644
--- a/ftplugin/neomuttrc.vim
+++ b/ftplugin/neomuttrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('neomuttrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'neomuttrc')
   finish
 endif
 
diff --git a/ftplugin/netrc.vim b/ftplugin/netrc.vim
index 73eeeee10..d60f01740 100644
--- a/ftplugin/netrc.vim
+++ b/ftplugin/netrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('netrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'netrc')
   finish
 endif
 
diff --git a/ftplugin/nginx.vim b/ftplugin/nginx.vim
index 4befc51b3..464b898ac 100644
--- a/ftplugin/nginx.vim
+++ b/ftplugin/nginx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nginx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nginx')
   finish
 endif
 
diff --git a/ftplugin/nix.vim b/ftplugin/nix.vim
index 9b998729b..b8d6f5eca 100644
--- a/ftplugin/nix.vim
+++ b/ftplugin/nix.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nix', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nix')
   finish
 endif
 
diff --git a/ftplugin/nroff.vim b/ftplugin/nroff.vim
index 1d56daa98..f7e29ce2d 100644
--- a/ftplugin/nroff.vim
+++ b/ftplugin/nroff.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nroff', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nroff')
   finish
 endif
 
diff --git a/ftplugin/nsis.vim b/ftplugin/nsis.vim
index 697f2d67d..12254f924 100644
--- a/ftplugin/nsis.vim
+++ b/ftplugin/nsis.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nsis', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nsis')
   finish
 endif
 
diff --git a/ftplugin/oasis.vim b/ftplugin/oasis.vim
index cfe932fea..0066807e8 100644
--- a/ftplugin/oasis.vim
+++ b/ftplugin/oasis.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/ftplugin/objc.vim b/ftplugin/objc.vim
index 2d108e5bf..1ba3e6333 100644
--- a/ftplugin/objc.vim
+++ b/ftplugin/objc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('objc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'objc')
   finish
 endif
 
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index d9e56533a..b5859598e 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/ftplugin/ocamlbuild_tags.vim b/ftplugin/ocamlbuild_tags.vim
index cfe932fea..0066807e8 100644
--- a/ftplugin/ocamlbuild_tags.vim
+++ b/ftplugin/ocamlbuild_tags.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/ftplugin/occam.vim b/ftplugin/occam.vim
index 766c71fb6..f8fb78ccd 100644
--- a/ftplugin/occam.vim
+++ b/ftplugin/occam.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('occam', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'occam')
   finish
 endif
 
diff --git a/ftplugin/omake.vim b/ftplugin/omake.vim
index e75e09b30..10669285d 100644
--- a/ftplugin/omake.vim
+++ b/ftplugin/omake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/ftplugin/opencl.vim b/ftplugin/opencl.vim
index ab8943618..c15c06275 100644
--- a/ftplugin/opencl.vim
+++ b/ftplugin/opencl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('opencl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'opencl')
   finish
 endif
 
diff --git a/ftplugin/pamconf.vim b/ftplugin/pamconf.vim
index 09dada128..f6867e466 100644
--- a/ftplugin/pamconf.vim
+++ b/ftplugin/pamconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pamconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pamconf')
   finish
 endif
 
diff --git a/ftplugin/pascal.vim b/ftplugin/pascal.vim
index 542343da3..4546ed74d 100644
--- a/ftplugin/pascal.vim
+++ b/ftplugin/pascal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pascal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pascal')
   finish
 endif
 
diff --git a/ftplugin/passwd.vim b/ftplugin/passwd.vim
index 70aa41c2a..a963340d6 100644
--- a/ftplugin/passwd.vim
+++ b/ftplugin/passwd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('passwd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'passwd')
   finish
 endif
 
diff --git a/ftplugin/pdf.vim b/ftplugin/pdf.vim
index bf637d0fc..882cdd2c3 100644
--- a/ftplugin/pdf.vim
+++ b/ftplugin/pdf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pdf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pdf')
   finish
 endif
 
diff --git a/ftplugin/perl.vim b/ftplugin/perl.vim
index 33475a85b..69657fefb 100644
--- a/ftplugin/perl.vim
+++ b/ftplugin/perl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/ftplugin/pinfo.vim b/ftplugin/pinfo.vim
index 72ed6b958..aafc69385 100644
--- a/ftplugin/pinfo.vim
+++ b/ftplugin/pinfo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pinfo', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pinfo')
   finish
 endif
 
diff --git a/ftplugin/plantuml.vim b/ftplugin/plantuml.vim
index 5146b2433..88ec433c8 100644
--- a/ftplugin/plantuml.vim
+++ b/ftplugin/plantuml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('plantuml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'plantuml')
   finish
 endif
 
diff --git a/ftplugin/pony.vim b/ftplugin/pony.vim
index 7d2d684e8..7a6cb9cf2 100644
--- a/ftplugin/pony.vim
+++ b/ftplugin/pony.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pony', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pony')
   finish
 endif
 
diff --git a/ftplugin/postscr.vim b/ftplugin/postscr.vim
index e2926fb0d..84345a671 100644
--- a/ftplugin/postscr.vim
+++ b/ftplugin/postscr.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('postscr', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'postscr')
   finish
 endif
 
diff --git a/ftplugin/procmail.vim b/ftplugin/procmail.vim
index fed5e4d4a..9f7337e9d 100644
--- a/ftplugin/procmail.vim
+++ b/ftplugin/procmail.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('procmail', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'procmail')
   finish
 endif
 
diff --git a/ftplugin/prolog.vim b/ftplugin/prolog.vim
index 0ed3fccf7..46306162d 100644
--- a/ftplugin/prolog.vim
+++ b/ftplugin/prolog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('prolog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'prolog')
   finish
 endif
 
diff --git a/ftplugin/protocols.vim b/ftplugin/protocols.vim
index da0a66998..608a1767d 100644
--- a/ftplugin/protocols.vim
+++ b/ftplugin/protocols.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('protocols', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'protocols')
   finish
 endif
 
diff --git a/ftplugin/ps1.vim b/ftplugin/ps1.vim
index 25c015cb3..93e206e9f 100644
--- a/ftplugin/ps1.vim
+++ b/ftplugin/ps1.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'powershell')
   finish
 endif
 
diff --git a/ftplugin/ps1xml.vim b/ftplugin/ps1xml.vim
index e8afcf6a1..4014865bb 100644
--- a/ftplugin/ps1xml.vim
+++ b/ftplugin/ps1xml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'powershell')
   finish
 endif
 
diff --git a/ftplugin/pug.vim b/ftplugin/pug.vim
index 4be43d551..b29b12ade 100644
--- a/ftplugin/pug.vim
+++ b/ftplugin/pug.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pug', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pug')
   finish
 endif
 
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index 6c8ec6333..c4fe70fa3 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/ftplugin/puppet_tagbar.vim b/ftplugin/puppet_tagbar.vim
index 6724b3a04..5c5675464 100644
--- a/ftplugin/puppet_tagbar.vim
+++ b/ftplugin/puppet_tagbar.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim
index 366b2da2b..e21e6ddeb 100644
--- a/ftplugin/purescript.vim
+++ b/ftplugin/purescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('purescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'purescript')
   finish
 endif
 
diff --git a/ftplugin/pyrex.vim b/ftplugin/pyrex.vim
index 5c64042cc..c3e81272b 100644
--- a/ftplugin/pyrex.vim
+++ b/ftplugin/pyrex.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pyrex', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pyrex')
   finish
 endif
 
diff --git a/ftplugin/qml.vim b/ftplugin/qml.vim
index ae94d461d..e725ba510 100644
--- a/ftplugin/qml.vim
+++ b/ftplugin/qml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('qml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'qml')
   finish
 endif
 
diff --git a/ftplugin/quake.vim b/ftplugin/quake.vim
index 03b49c0ae..47f61ef17 100644
--- a/ftplugin/quake.vim
+++ b/ftplugin/quake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('quake', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'quake')
   finish
 endif
 
diff --git a/ftplugin/racket.vim b/ftplugin/racket.vim
index ad4be8c87..413dd6271 100644
--- a/ftplugin/racket.vim
+++ b/ftplugin/racket.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('racket', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'racket')
   finish
 endif
 
diff --git a/ftplugin/raku.vim b/ftplugin/raku.vim
index 8f9a55ecd..ec2bcccdf 100644
--- a/ftplugin/raku.vim
+++ b/ftplugin/raku.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('raku', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'raku')
   finish
 endif
 
diff --git a/ftplugin/raml.vim b/ftplugin/raml.vim
index fecbba665..4eb1e58ff 100644
--- a/ftplugin/raml.vim
+++ b/ftplugin/raml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('raml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'raml')
   finish
 endif
 
diff --git a/ftplugin/razor.vim b/ftplugin/razor.vim
index 4bd0bc4a7..d5458d472 100644
--- a/ftplugin/razor.vim
+++ b/ftplugin/razor.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('razor', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'razor')
   finish
 endif
 
diff --git a/ftplugin/readline.vim b/ftplugin/readline.vim
index b1a0a0bc2..9a3030fb6 100644
--- a/ftplugin/readline.vim
+++ b/ftplugin/readline.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('readline', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'readline')
   finish
 endif
 
diff --git a/ftplugin/reva.vim b/ftplugin/reva.vim
index b5211a02e..3163440c9 100644
--- a/ftplugin/reva.vim
+++ b/ftplugin/reva.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('reva', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'reva')
   finish
 endif
 
diff --git a/ftplugin/rmd.vim b/ftplugin/rmd.vim
index f0e6ce6fa..fbe784232 100644
--- a/ftplugin/rmd.vim
+++ b/ftplugin/rmd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rmd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rmd')
   finish
 endif
 
diff --git a/ftplugin/rnc.vim b/ftplugin/rnc.vim
index 86645ab42..efd596e8a 100644
--- a/ftplugin/rnc.vim
+++ b/ftplugin/rnc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rnc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rnc')
   finish
 endif
 
diff --git a/ftplugin/rnoweb.vim b/ftplugin/rnoweb.vim
index 44e4d0fc8..b049d7d94 100644
--- a/ftplugin/rnoweb.vim
+++ b/ftplugin/rnoweb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rnoweb', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rnoweb')
   finish
 endif
 
diff --git a/ftplugin/rpl.vim b/ftplugin/rpl.vim
index 3324ea9bd..94af1a684 100644
--- a/ftplugin/rpl.vim
+++ b/ftplugin/rpl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rpl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rpl')
   finish
 endif
 
diff --git a/ftplugin/rrst.vim b/ftplugin/rrst.vim
index dd8b1238d..1708b9758 100644
--- a/ftplugin/rrst.vim
+++ b/ftplugin/rrst.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rrst', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rrst')
   finish
 endif
 
diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index 105544036..29c7da66c 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rst', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rst')
   finish
 endif
 
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index cbf047e0d..cf1b8f4f3 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim
index b5e3b7711..02664bd91 100644
--- a/ftplugin/rust.vim
+++ b/ftplugin/rust.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/ftplugin/rust/tagbar.vim b/ftplugin/rust/tagbar.vim
index f8ccbf759..5de12f9ca 100644
--- a/ftplugin/rust/tagbar.vim
+++ b/ftplugin/rust/tagbar.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/ftplugin/sass.vim b/ftplugin/sass.vim
index ec303c12e..7e20a9f32 100644
--- a/ftplugin/sass.vim
+++ b/ftplugin/sass.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sass', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sass')
   finish
 endif
 
diff --git a/ftplugin/sbt.vim b/ftplugin/sbt.vim
index 9d6b64293..a6e8ac720 100644
--- a/ftplugin/sbt.vim
+++ b/ftplugin/sbt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sbt', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sbt')
   finish
 endif
 
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index 29bb92384..1edd9b47a 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/ftplugin/scala.xpt.vim b/ftplugin/scala.xpt.vim
index e18ced847..6bb1f8bad 100644
--- a/ftplugin/scala.xpt.vim
+++ b/ftplugin/scala.xpt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index c290af07a..02eeb7ad7 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/ftplugin/scheme.vim b/ftplugin/scheme.vim
index edbcfa0c4..279bd667a 100644
--- a/ftplugin/scheme.vim
+++ b/ftplugin/scheme.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scheme', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scheme')
   finish
 endif
 
diff --git a/ftplugin/screen.vim b/ftplugin/screen.vim
index d2da63982..cfe815fc0 100644
--- a/ftplugin/screen.vim
+++ b/ftplugin/screen.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('screen', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'screen')
   finish
 endif
 
diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim
index 78cbe9587..3f9bf7bc6 100644
--- a/ftplugin/scss.vim
+++ b/ftplugin/scss.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scss', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scss')
   finish
 endif
 
diff --git a/ftplugin/sensors.vim b/ftplugin/sensors.vim
index 3d9109ea8..9ef23447e 100644
--- a/ftplugin/sensors.vim
+++ b/ftplugin/sensors.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sensors', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sensors')
   finish
 endif
 
diff --git a/ftplugin/services.vim b/ftplugin/services.vim
index 84afa274f..c23297cb4 100644
--- a/ftplugin/services.vim
+++ b/ftplugin/services.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('services', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'services')
   finish
 endif
 
diff --git a/ftplugin/setserial.vim b/ftplugin/setserial.vim
index 5bbe71824..308863aa4 100644
--- a/ftplugin/setserial.vim
+++ b/ftplugin/setserial.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('setserial', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'setserial')
   finish
 endif
 
diff --git a/ftplugin/sexplib.vim b/ftplugin/sexplib.vim
index c019c9e43..3546c5f89 100644
--- a/ftplugin/sexplib.vim
+++ b/ftplugin/sexplib.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/ftplugin/sieve.vim b/ftplugin/sieve.vim
index 596fdd80f..370a9e817 100644
--- a/ftplugin/sieve.vim
+++ b/ftplugin/sieve.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sieve', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sieve')
   finish
 endif
 
diff --git a/ftplugin/slim.vim b/ftplugin/slim.vim
index 46b72c086..7b51ffd8f 100644
--- a/ftplugin/slim.vim
+++ b/ftplugin/slim.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slim', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slim')
   finish
 endif
 
diff --git a/ftplugin/slpconf.vim b/ftplugin/slpconf.vim
index e036286c8..b7ee39a54 100644
--- a/ftplugin/slpconf.vim
+++ b/ftplugin/slpconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slpconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slpconf')
   finish
 endif
 
diff --git a/ftplugin/slpreg.vim b/ftplugin/slpreg.vim
index f3b64456f..bb25237b9 100644
--- a/ftplugin/slpreg.vim
+++ b/ftplugin/slpreg.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slpreg', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slpreg')
   finish
 endif
 
diff --git a/ftplugin/slpspi.vim b/ftplugin/slpspi.vim
index 5e6641ba7..1653681f0 100644
--- a/ftplugin/slpspi.vim
+++ b/ftplugin/slpspi.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slpspi', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slpspi')
   finish
 endif
 
diff --git a/ftplugin/smt2.vim b/ftplugin/smt2.vim
index 03b5ba2b6..243ee2a9c 100644
--- a/ftplugin/smt2.vim
+++ b/ftplugin/smt2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('smt2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'smt2')
   finish
 endif
 
diff --git a/ftplugin/solidity.vim b/ftplugin/solidity.vim
index 1d52826ee..a9b4e671b 100644
--- a/ftplugin/solidity.vim
+++ b/ftplugin/solidity.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('solidity', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'solidity')
   finish
 endif
 
diff --git a/ftplugin/spec.vim b/ftplugin/spec.vim
index a7b9f9cd8..8d7a14b59 100644
--- a/ftplugin/spec.vim
+++ b/ftplugin/spec.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('spec', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'spec')
   finish
 endif
 
diff --git a/ftplugin/sql.vim b/ftplugin/sql.vim
index 3338aed8f..a187c6eed 100644
--- a/ftplugin/sql.vim
+++ b/ftplugin/sql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sql')
   finish
 endif
 
diff --git a/ftplugin/sshconfig.vim b/ftplugin/sshconfig.vim
index b68be8b14..8fc369641 100644
--- a/ftplugin/sshconfig.vim
+++ b/ftplugin/sshconfig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sshconfig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sshconfig')
   finish
 endif
 
diff --git a/ftplugin/stylus.vim b/ftplugin/stylus.vim
index 538a491a9..89a6272e2 100644
--- a/ftplugin/stylus.vim
+++ b/ftplugin/stylus.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('stylus', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'stylus')
   finish
 endif
 
diff --git a/ftplugin/sudoers.vim b/ftplugin/sudoers.vim
index e085e5a63..3ae23eb13 100644
--- a/ftplugin/sudoers.vim
+++ b/ftplugin/sudoers.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sudoers', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sudoers')
   finish
 endif
 
diff --git a/ftplugin/svelte.vim b/ftplugin/svelte.vim
index 132e6bbe6..28af186a0 100644
--- a/ftplugin/svelte.vim
+++ b/ftplugin/svelte.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('svelte', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'svelte')
   finish
 endif
 
diff --git a/ftplugin/swift.vim b/ftplugin/swift.vim
index 830acfb7c..bae53a345 100644
--- a/ftplugin/swift.vim
+++ b/ftplugin/swift.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('swift', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'swift')
   finish
 endif
 
diff --git a/ftplugin/swiftgyb.vim b/ftplugin/swiftgyb.vim
index 6468b9cdd..75aee251b 100644
--- a/ftplugin/swiftgyb.vim
+++ b/ftplugin/swiftgyb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('swiftgyb', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'swiftgyb')
   finish
 endif
 
diff --git a/ftplugin/sysctl.vim b/ftplugin/sysctl.vim
index efb8ce6b1..d57cd390a 100644
--- a/ftplugin/sysctl.vim
+++ b/ftplugin/sysctl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sysctl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sysctl')
   finish
 endif
 
diff --git a/ftplugin/systemd.vim b/ftplugin/systemd.vim
index 26adf612f..cf8e76db3 100644
--- a/ftplugin/systemd.vim
+++ b/ftplugin/systemd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('systemd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'systemd')
   finish
 endif
 
diff --git a/ftplugin/systemverilog.vim b/ftplugin/systemverilog.vim
index 2f0a72440..1a0823c71 100644
--- a/ftplugin/systemverilog.vim
+++ b/ftplugin/systemverilog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('systemverilog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'systemverilog')
   finish
 endif
 
diff --git a/ftplugin/tablegen.vim b/ftplugin/tablegen.vim
index 28bd6fdd3..1fdf05159 100644
--- a/ftplugin/tablegen.vim
+++ b/ftplugin/tablegen.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/ftplugin/tcl.vim b/ftplugin/tcl.vim
index 7ba25f7f6..d359b3f87 100644
--- a/ftplugin/tcl.vim
+++ b/ftplugin/tcl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tcl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tcl')
   finish
 endif
 
diff --git a/ftplugin/terminfo.vim b/ftplugin/terminfo.vim
index a83ca282e..4bc23398d 100644
--- a/ftplugin/terminfo.vim
+++ b/ftplugin/terminfo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('terminfo', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'terminfo')
   finish
 endif
 
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index 63e74df7a..191fd3f15 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('terraform', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'terraform')
   finish
 endif
 
diff --git a/ftplugin/tex.vim b/ftplugin/tex.vim
index 53b95e3f0..17b3e2a76 100644
--- a/ftplugin/tex.vim
+++ b/ftplugin/tex.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tex', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tex')
   finish
 endif
 
diff --git a/ftplugin/text.vim b/ftplugin/text.vim
index 99d387f5a..1f14648da 100644
--- a/ftplugin/text.vim
+++ b/ftplugin/text.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('text', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'text')
   finish
 endif
 
diff --git a/ftplugin/textile.vim b/ftplugin/textile.vim
index 968289429..e636bd55f 100644
--- a/ftplugin/textile.vim
+++ b/ftplugin/textile.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('textile', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'textile')
   finish
 endif
 
diff --git a/ftplugin/tmux.vim b/ftplugin/tmux.vim
index c598635f6..34ad2f15e 100644
--- a/ftplugin/tmux.vim
+++ b/ftplugin/tmux.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tmux', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tmux')
   finish
 endif
 
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
index fb12e87c6..b510817f8 100644
--- a/ftplugin/toml.vim
+++ b/ftplugin/toml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('toml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'toml')
   finish
 endif
 
diff --git a/ftplugin/treetop.vim b/ftplugin/treetop.vim
index 65a43fb79..44f4e5302 100644
--- a/ftplugin/treetop.vim
+++ b/ftplugin/treetop.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('treetop', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'treetop')
   finish
 endif
 
diff --git a/ftplugin/tt2html.vim b/ftplugin/tt2html.vim
index c1c47c56d..e6496e616 100644
--- a/ftplugin/tt2html.vim
+++ b/ftplugin/tt2html.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/ftplugin/twig.vim b/ftplugin/twig.vim
index ac52d1b9e..7635a4fbd 100644
--- a/ftplugin/twig.vim
+++ b/ftplugin/twig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('twig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'twig')
   finish
 endif
 
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index 4eece3201..ff2b5baa0 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/ftplugin/typescriptreact.vim b/ftplugin/typescriptreact.vim
index 7f60b3f9e..e5780918f 100644
--- a/ftplugin/typescriptreact.vim
+++ b/ftplugin/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/ftplugin/udevconf.vim b/ftplugin/udevconf.vim
index d82aea9eb..72eef04aa 100644
--- a/ftplugin/udevconf.vim
+++ b/ftplugin/udevconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('udevconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'udevconf')
   finish
 endif
 
diff --git a/ftplugin/udevperm.vim b/ftplugin/udevperm.vim
index bdafc586a..56f956fb6 100644
--- a/ftplugin/udevperm.vim
+++ b/ftplugin/udevperm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('udevperm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'udevperm')
   finish
 endif
 
diff --git a/ftplugin/updatedb.vim b/ftplugin/updatedb.vim
index 48f24051b..5dbc78a76 100644
--- a/ftplugin/updatedb.vim
+++ b/ftplugin/updatedb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('updatedb', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'updatedb')
   finish
 endif
 
diff --git a/ftplugin/vala.vim b/ftplugin/vala.vim
index 32d41d1b1..a76bb1ae5 100644
--- a/ftplugin/vala.vim
+++ b/ftplugin/vala.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vala', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vala')
   finish
 endif
 
diff --git a/ftplugin/vb.vim b/ftplugin/vb.vim
index 23cbd0acf..4f5ae89c5 100644
--- a/ftplugin/vb.vim
+++ b/ftplugin/vb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('visual-basic', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'visual-basic')
   finish
 endif
 
diff --git a/ftplugin/verilog.vim b/ftplugin/verilog.vim
index 5b1233353..fe059573b 100644
--- a/ftplugin/verilog.vim
+++ b/ftplugin/verilog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('verilog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'verilog')
   finish
 endif
 
diff --git a/ftplugin/vhdl.vim b/ftplugin/vhdl.vim
index 0e98087c5..8861b614c 100644
--- a/ftplugin/vhdl.vim
+++ b/ftplugin/vhdl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vhdl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vhdl')
   finish
 endif
 
diff --git a/ftplugin/vlang.vim b/ftplugin/vlang.vim
index a3d3ceac2..de4d7e03c 100644
--- a/ftplugin/vlang.vim
+++ b/ftplugin/vlang.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('v', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'v')
   finish
 endif
 
diff --git a/ftplugin/vroom.vim b/ftplugin/vroom.vim
index b73c76f3e..982b2631f 100644
--- a/ftplugin/vroom.vim
+++ b/ftplugin/vroom.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vroom', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vroom')
   finish
 endif
 
diff --git a/ftplugin/vue.vim b/ftplugin/vue.vim
index 6cc068c61..44f1e258f 100644
--- a/ftplugin/vue.vim
+++ b/ftplugin/vue.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vue', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vue')
   finish
 endif
 
diff --git a/ftplugin/wast.vim b/ftplugin/wast.vim
index 8e8b16b2d..6e4aad479 100644
--- a/ftplugin/wast.vim
+++ b/ftplugin/wast.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('wast', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'wast')
   finish
 endif
 
diff --git a/ftplugin/xdefaults.vim b/ftplugin/xdefaults.vim
index 9c7c7731a..fadb27020 100644
--- a/ftplugin/xdefaults.vim
+++ b/ftplugin/xdefaults.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xdefaults', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xdefaults')
   finish
 endif
 
diff --git a/ftplugin/xf86conf.vim b/ftplugin/xf86conf.vim
index 62e7e0e6d..3b0fd9fb1 100644
--- a/ftplugin/xf86conf.vim
+++ b/ftplugin/xf86conf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xf86conf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xf86conf')
   finish
 endif
 
diff --git a/ftplugin/xhtml.vim b/ftplugin/xhtml.vim
index a2f6a7246..db379aa6a 100644
--- a/ftplugin/xhtml.vim
+++ b/ftplugin/xhtml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xhtml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xhtml')
   finish
 endif
 
diff --git a/ftplugin/xinetd.vim b/ftplugin/xinetd.vim
index c489135c8..618cf2d19 100644
--- a/ftplugin/xinetd.vim
+++ b/ftplugin/xinetd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xinetd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xinetd')
   finish
 endif
 
diff --git a/ftplugin/xmodmap.vim b/ftplugin/xmodmap.vim
index c80fbd349..32a1aa278 100644
--- a/ftplugin/xmodmap.vim
+++ b/ftplugin/xmodmap.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xmodmap', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xmodmap')
   finish
 endif
 
diff --git a/ftplugin/xs.vim b/ftplugin/xs.vim
index a3f996a88..b3ddbf61c 100644
--- a/ftplugin/xs.vim
+++ b/ftplugin/xs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/ftplugin/xsd.vim b/ftplugin/xsd.vim
index d48496827..236fc52fb 100644
--- a/ftplugin/xsd.vim
+++ b/ftplugin/xsd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xsd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xsd')
   finish
 endif
 
diff --git a/ftplugin/xslt.vim b/ftplugin/xslt.vim
index 034cefbb3..35ca3a1dd 100644
--- a/ftplugin/xslt.vim
+++ b/ftplugin/xslt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xslt', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xslt')
   finish
 endif
 
diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim
index 5ffdb31a9..22d31afb0 100644
--- a/ftplugin/yaml.vim
+++ b/ftplugin/yaml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('yaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'yaml')
   finish
 endif
 
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index 7762b8772..da9fafc64 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/ftplugin/zimbu.vim b/ftplugin/zimbu.vim
index 71575497f..3531f9cc3 100644
--- a/ftplugin/zimbu.vim
+++ b/ftplugin/zimbu.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zimbu', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zimbu')
   finish
 endif
 
diff --git a/indent/Jenkinsfile.vim b/indent/Jenkinsfile.vim
index 74390b236..0590e34bc 100644
--- a/indent/Jenkinsfile.vim
+++ b/indent/Jenkinsfile.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jenkins', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jenkins')
   finish
 endif
 
diff --git a/indent/aap.vim b/indent/aap.vim
index fde2ebc44..1694a400d 100644
--- a/indent/aap.vim
+++ b/indent/aap.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('aap', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'aap')
   finish
 endif
 
diff --git a/indent/ada.vim b/indent/ada.vim
index 6c924fbce..a07c3f02b 100644
--- a/indent/ada.vim
+++ b/indent/ada.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ada', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ada')
   finish
 endif
 
diff --git a/indent/ansible.vim b/indent/ansible.vim
index f6a9cbef0..18d470174 100644
--- a/indent/ansible.vim
+++ b/indent/ansible.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ansible')
   finish
 endif
 
diff --git a/indent/ant.vim b/indent/ant.vim
index e6a466887..4ec29f398 100644
--- a/indent/ant.vim
+++ b/indent/ant.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ant', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ant')
   finish
 endif
 
diff --git a/indent/applescript.vim b/indent/applescript.vim
index 88fc68356..6639b6c53 100644
--- a/indent/applescript.vim
+++ b/indent/applescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('applescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'applescript')
   finish
 endif
 
diff --git a/indent/arduino.vim b/indent/arduino.vim
index ede5e1e68..37d887cf5 100644
--- a/indent/arduino.vim
+++ b/indent/arduino.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('arduino', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'arduino')
   finish
 endif
 
diff --git a/indent/autohotkey.vim b/indent/autohotkey.vim
index 99d8b6d5b..f8d520756 100644
--- a/indent/autohotkey.vim
+++ b/indent/autohotkey.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('autohotkey', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'autohotkey')
   finish
 endif
 
diff --git a/indent/automake.vim b/indent/automake.vim
index 4fd489fae..1b5d95677 100644
--- a/indent/automake.vim
+++ b/indent/automake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('automake', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'automake')
   finish
 endif
 
diff --git a/indent/awk.vim b/indent/awk.vim
index ba18e12e1..37e5dfdcc 100644
--- a/indent/awk.vim
+++ b/indent/awk.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('awk', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'awk')
   finish
 endif
 
diff --git a/indent/bib.vim b/indent/bib.vim
index 37622c701..73433714c 100644
--- a/indent/bib.vim
+++ b/indent/bib.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bib', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bib')
   finish
 endif
 
diff --git a/indent/blade.vim b/indent/blade.vim
index a16266c14..45292d192 100644
--- a/indent/blade.vim
+++ b/indent/blade.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('blade', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'blade')
   finish
 endif
 
diff --git a/indent/bst.vim b/indent/bst.vim
index 29ae2961f..96863e20b 100644
--- a/indent/bst.vim
+++ b/indent/bst.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bst', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bst')
   finish
 endif
 
diff --git a/indent/bzl.vim b/indent/bzl.vim
index 2ee9d707a..2c5faccf1 100644
--- a/indent/bzl.vim
+++ b/indent/bzl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bzl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bzl')
   finish
 endif
 
diff --git a/indent/cabal.vim b/indent/cabal.vim
index e65eee71e..62a68b74a 100644
--- a/indent/cabal.vim
+++ b/indent/cabal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/indent/caddyfile.vim b/indent/caddyfile.vim
index 1db00f220..f12a16157 100644
--- a/indent/caddyfile.vim
+++ b/indent/caddyfile.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('caddyfile', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'caddyfile')
   finish
 endif
 
diff --git a/indent/cdl.vim b/indent/cdl.vim
index e52b80827..483cb1d43 100644
--- a/indent/cdl.vim
+++ b/indent/cdl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cdl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cdl')
   finish
 endif
 
diff --git a/indent/ch.vim b/indent/ch.vim
index bcee5c3c7..34997e55d 100644
--- a/indent/ch.vim
+++ b/indent/ch.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ch', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ch')
   finish
 endif
 
diff --git a/indent/chaiscript.vim b/indent/chaiscript.vim
index ba2908f95..e0639e887 100644
--- a/indent/chaiscript.vim
+++ b/indent/chaiscript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('chaiscript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'chaiscript')
   finish
 endif
 
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 72bff69f9..7e4de1ab7 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('clojure', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'clojure')
   finish
 endif
 
diff --git a/indent/cmake.vim b/indent/cmake.vim
index 49e8fd961..a5c1af081 100644
--- a/indent/cmake.vim
+++ b/indent/cmake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cmake', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cmake')
   finish
 endif
 
diff --git a/indent/cobol.vim b/indent/cobol.vim
index c962a0d00..d0c9f7032 100644
--- a/indent/cobol.vim
+++ b/indent/cobol.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cobol', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cobol')
   finish
 endif
 
diff --git a/indent/coffee.vim b/indent/coffee.vim
index 6fc21afc7..dbac1e6dd 100644
--- a/indent/coffee.vim
+++ b/indent/coffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/indent/config.vim b/indent/config.vim
index 096f5b405..e43819286 100644
--- a/indent/config.vim
+++ b/indent/config.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('config', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'config')
   finish
 endif
 
diff --git a/indent/crystal.vim b/indent/crystal.vim
index 9b3a8d532..4883caa84 100644
--- a/indent/crystal.vim
+++ b/indent/crystal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/indent/cs.vim b/indent/cs.vim
index 60e2a61de..7ed30637a 100644
--- a/indent/cs.vim
+++ b/indent/cs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cs', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cs')
   finish
 endif
 
diff --git a/indent/css.vim b/indent/css.vim
index a831c77b3..3346bde63 100644
--- a/indent/css.vim
+++ b/indent/css.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('css', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'css')
   finish
 endif
 
diff --git a/indent/cucumber.vim b/indent/cucumber.vim
index 72826cca4..7b0493faa 100644
--- a/indent/cucumber.vim
+++ b/indent/cucumber.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cucumber', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cucumber')
   finish
 endif
 
diff --git a/indent/cuda.vim b/indent/cuda.vim
index 10c26fd69..0c65b2b2b 100644
--- a/indent/cuda.vim
+++ b/indent/cuda.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cuda', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cuda')
   finish
 endif
 
diff --git a/indent/cython.vim b/indent/cython.vim
index 5f13b77ef..951a0cb1e 100644
--- a/indent/cython.vim
+++ b/indent/cython.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('python-indent', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'python-indent')
   finish
 endif
 
diff --git a/indent/d.vim b/indent/d.vim
index c121801bc..2383b6ac1 100644
--- a/indent/d.vim
+++ b/indent/d.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dlang')
   finish
 endif
 
diff --git a/indent/dart.vim b/indent/dart.vim
index 45bedcf80..09e6e7893 100644
--- a/indent/dart.vim
+++ b/indent/dart.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dart', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dart')
   finish
 endif
 
diff --git a/indent/dictconf.vim b/indent/dictconf.vim
index c721105c5..444bba5e3 100644
--- a/indent/dictconf.vim
+++ b/indent/dictconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dictconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dictconf')
   finish
 endif
 
diff --git a/indent/dictdconf.vim b/indent/dictdconf.vim
index 68460d330..f634e2a3c 100644
--- a/indent/dictdconf.vim
+++ b/indent/dictdconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dictdconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dictdconf')
   finish
 endif
 
diff --git a/indent/dosbatch.vim b/indent/dosbatch.vim
index 0f7dec485..931430c92 100644
--- a/indent/dosbatch.vim
+++ b/indent/dosbatch.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dosbatch', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dosbatch')
   finish
 endif
 
diff --git a/indent/dtd.vim b/indent/dtd.vim
index 0653c474a..a478a2cbe 100644
--- a/indent/dtd.vim
+++ b/indent/dtd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dtd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dtd')
   finish
 endif
 
diff --git a/indent/dune.vim b/indent/dune.vim
index f2c066155..4dc3695a0 100644
--- a/indent/dune.vim
+++ b/indent/dune.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/indent/dylan.vim b/indent/dylan.vim
index da2e5bc00..82a229158 100644
--- a/indent/dylan.vim
+++ b/indent/dylan.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dylan', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dylan')
   finish
 endif
 
diff --git a/indent/ecrystal.vim b/indent/ecrystal.vim
index 483f9d0cd..b4007611b 100644
--- a/indent/ecrystal.vim
+++ b/indent/ecrystal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/indent/eelixir.vim b/indent/eelixir.vim
index 56081e231..1f6caea47 100644
--- a/indent/eelixir.vim
+++ b/indent/eelixir.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/indent/elixir.vim b/indent/elixir.vim
index 4d135c2ee..4533ed09e 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/indent/elm.vim b/indent/elm.vim
index 4a8a540a0..63910f712 100644
--- a/indent/elm.vim
+++ b/indent/elm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elm')
   finish
 endif
 
diff --git a/indent/ember-script.vim b/indent/ember-script.vim
index 0e9bdc93b..21da5892b 100644
--- a/indent/ember-script.vim
+++ b/indent/ember-script.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('emberscript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'emberscript')
   finish
 endif
 
diff --git a/indent/emblem.vim b/indent/emblem.vim
index 86937ed90..c69c8961d 100644
--- a/indent/emblem.vim
+++ b/indent/emblem.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('emblem', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'emblem')
   finish
 endif
 
diff --git a/indent/erlang.vim b/indent/erlang.vim
index 2a35b1af5..5630d900c 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('erlang', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'erlang')
   finish
 endif
 
diff --git a/indent/eruby.vim b/indent/eruby.vim
index 98e5b8a0b..9eaa428db 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/indent/eterm.vim b/indent/eterm.vim
index d0a68a7c7..38de67e3c 100644
--- a/indent/eterm.vim
+++ b/indent/eterm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('eterm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'eterm')
   finish
 endif
 
diff --git a/indent/falcon.vim b/indent/falcon.vim
index a92a517bf..56598a39c 100644
--- a/indent/falcon.vim
+++ b/indent/falcon.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('falcon', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'falcon')
   finish
 endif
 
diff --git a/indent/fennel.vim b/indent/fennel.vim
index 90ccd467d..687e15ace 100644
--- a/indent/fennel.vim
+++ b/indent/fennel.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fennel', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fennel')
   finish
 endif
 
diff --git a/indent/fish.vim b/indent/fish.vim
index 5b314c7fa..3a6f0352c 100644
--- a/indent/fish.vim
+++ b/indent/fish.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fish', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fish')
   finish
 endif
 
diff --git a/indent/fortran.vim b/indent/fortran.vim
index 7aac6b5b4..db7cd52b0 100644
--- a/indent/fortran.vim
+++ b/indent/fortran.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fortran', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fortran')
   finish
 endif
 
diff --git a/indent/framescript.vim b/indent/framescript.vim
index 6371d8cba..359518a15 100644
--- a/indent/framescript.vim
+++ b/indent/framescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('framescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'framescript')
   finish
 endif
 
diff --git a/indent/fsharp.vim b/indent/fsharp.vim
index 0ab8dfff2..fc9e45ed1 100644
--- a/indent/fsharp.vim
+++ b/indent/fsharp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fsharp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fsharp')
   finish
 endif
 
diff --git a/indent/gdscript3.vim b/indent/gdscript3.vim
index 93f4c26e5..b9ee7ca68 100644
--- a/indent/gdscript3.vim
+++ b/indent/gdscript3.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gdscript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gdscript')
   finish
 endif
 
diff --git a/indent/gitconfig.vim b/indent/gitconfig.vim
index 5cdd4ce44..a53044b94 100644
--- a/indent/gitconfig.vim
+++ b/indent/gitconfig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/indent/gitolite.vim b/indent/gitolite.vim
index c6517e79b..892921802 100644
--- a/indent/gitolite.vim
+++ b/indent/gitolite.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gitolite', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gitolite')
   finish
 endif
 
diff --git a/indent/glsl.vim b/indent/glsl.vim
index db9b0ddb5..3784e6593 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('glsl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'glsl')
   finish
 endif
 
diff --git a/indent/go.vim b/indent/go.vim
index f3ee7ef72..cdb1de21d 100644
--- a/indent/go.vim
+++ b/indent/go.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/indent/gohtmltmpl.vim b/indent/gohtmltmpl.vim
index f714d9df4..93543339b 100644
--- a/indent/gohtmltmpl.vim
+++ b/indent/gohtmltmpl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/indent/graphql.vim b/indent/graphql.vim
index a02b28852..b98f3760f 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/indent/haml.vim b/indent/haml.vim
index 9f5be96cf..8fa3f46dd 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haml')
   finish
 endif
 
diff --git a/indent/hamster.vim b/indent/hamster.vim
index 43411745f..615e3ee21 100644
--- a/indent/hamster.vim
+++ b/indent/hamster.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hamster', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hamster')
   finish
 endif
 
diff --git a/indent/handlebars.vim b/indent/handlebars.vim
index f58aa660b..bac5f5a22 100644
--- a/indent/handlebars.vim
+++ b/indent/handlebars.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'handlebars')
   finish
 endif
 
diff --git a/indent/haskell.vim b/indent/haskell.vim
index 19f4e0760..4820b4da7 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/indent/hcl.vim b/indent/hcl.vim
index a0cd2b07b..f9dea7866 100644
--- a/indent/hcl.vim
+++ b/indent/hcl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hcl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hcl')
   finish
 endif
 
diff --git a/indent/hog.vim b/indent/hog.vim
index a7607314c..5e32c80a2 100644
--- a/indent/hog.vim
+++ b/indent/hog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hog')
   finish
 endif
 
diff --git a/indent/html.vim b/indent/html.vim
index b6ade453c..77cc3e94b 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html')
   finish
 endif
 
diff --git a/indent/htmldjango.vim b/indent/htmldjango.vim
index 27ba1b06a..33feb7cc4 100644
--- a/indent/htmldjango.vim
+++ b/indent/htmldjango.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('htmldjango', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'htmldjango')
   finish
 endif
 
diff --git a/indent/idris.vim b/indent/idris.vim
index ffa22afdc..964f20d7b 100644
--- a/indent/idris.vim
+++ b/indent/idris.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/indent/idris2.vim b/indent/idris2.vim
index 81b816f85..40ed0c4e7 100644
--- a/indent/idris2.vim
+++ b/indent/idris2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/indent/j.vim b/indent/j.vim
index 1c51552a4..67fd7619f 100644
--- a/indent/j.vim
+++ b/indent/j.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('j', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'j')
   finish
 endif
 
diff --git a/indent/java.vim b/indent/java.vim
index c61901228..dcf300812 100644
--- a/indent/java.vim
+++ b/indent/java.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('java', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'java')
   finish
 endif
 
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 40a6bb5da..b2204dfe5 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/indent/json.vim b/indent/json.vim
index a2e0b6d61..f2775b0bf 100644
--- a/indent/json.vim
+++ b/indent/json.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('json', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'json')
   finish
 endif
 
diff --git a/indent/jsp.vim b/indent/jsp.vim
index 4ff51051e..e1b5b8dea 100644
--- a/indent/jsp.vim
+++ b/indent/jsp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsp')
   finish
 endif
 
diff --git a/indent/jst.vim b/indent/jst.vim
index 507e8b562..018b4441b 100644
--- a/indent/jst.vim
+++ b/indent/jst.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jst', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jst')
   finish
 endif
 
diff --git a/indent/julia.vim b/indent/julia.vim
index 3ea209a1f..8b21464f9 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/indent/kotlin.vim b/indent/kotlin.vim
index 996b2fd77..ebedbe30f 100644
--- a/indent/kotlin.vim
+++ b/indent/kotlin.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('kotlin', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'kotlin')
   finish
 endif
 
diff --git a/indent/ld.vim b/indent/ld.vim
index 550b70325..43c11a636 100644
--- a/indent/ld.vim
+++ b/indent/ld.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ld', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ld')
   finish
 endif
 
diff --git a/indent/ledger.vim b/indent/ledger.vim
index 110376106..d1ab3682d 100644
--- a/indent/ledger.vim
+++ b/indent/ledger.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ledger', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ledger')
   finish
 endif
 
diff --git a/indent/less.vim b/indent/less.vim
index 6ce917af4..83fad12d6 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('less', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'less')
   finish
 endif
 
diff --git a/indent/lifelines.vim b/indent/lifelines.vim
index 70f21aa22..b3ab480d1 100644
--- a/indent/lifelines.vim
+++ b/indent/lifelines.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lifelines', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lifelines')
   finish
 endif
 
diff --git a/indent/lilypond.vim b/indent/lilypond.vim
index cdb418dab..aec3f584e 100644
--- a/indent/lilypond.vim
+++ b/indent/lilypond.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lilypond', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lilypond')
   finish
 endif
 
diff --git a/indent/liquid.vim b/indent/liquid.vim
index f3fb43a95..3ed8f3f8b 100644
--- a/indent/liquid.vim
+++ b/indent/liquid.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('liquid', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'liquid')
   finish
 endif
 
diff --git a/indent/lisp.vim b/indent/lisp.vim
index 88a08b724..7b1d2523c 100644
--- a/indent/lisp.vim
+++ b/indent/lisp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lisp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lisp')
   finish
 endif
 
diff --git a/indent/litcoffee.vim b/indent/litcoffee.vim
index 0515201f1..c9fb53284 100644
--- a/indent/litcoffee.vim
+++ b/indent/litcoffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/indent/llvm.vim b/indent/llvm.vim
index 53c6f999b..4dac2ef1a 100644
--- a/indent/llvm.vim
+++ b/indent/llvm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/indent/logtalk.vim b/indent/logtalk.vim
index 863afedaa..54ae3b6ef 100644
--- a/indent/logtalk.vim
+++ b/indent/logtalk.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('logtalk', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'logtalk')
   finish
 endif
 
diff --git a/indent/ls.vim b/indent/ls.vim
index 591ccf768..3b616659c 100644
--- a/indent/ls.vim
+++ b/indent/ls.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('livescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'livescript')
   finish
 endif
 
diff --git a/indent/lua.vim b/indent/lua.vim
index 537a390c8..a13892262 100644
--- a/indent/lua.vim
+++ b/indent/lua.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lua', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lua')
   finish
 endif
 
diff --git a/indent/mail.vim b/indent/mail.vim
index 5899c2a46..ab2c15d1b 100644
--- a/indent/mail.vim
+++ b/indent/mail.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mail', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mail')
   finish
 endif
 
diff --git a/indent/make.vim b/indent/make.vim
index 0fe68ecb8..70e6cec62 100644
--- a/indent/make.vim
+++ b/indent/make.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('make', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'make')
   finish
 endif
 
diff --git a/indent/mako.vim b/indent/mako.vim
index 34d7dbf66..fe53c80ec 100644
--- a/indent/mako.vim
+++ b/indent/mako.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mako', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mako')
   finish
 endif
 
diff --git a/indent/markdown.vim b/indent/markdown.vim
index 10c576d70..2ec68fa5d 100644
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('markdown', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'markdown')
   finish
 endif
 
diff --git a/indent/meson.vim b/indent/meson.vim
index d2bd16634..88157453b 100644
--- a/indent/meson.vim
+++ b/indent/meson.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('meson', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'meson')
   finish
 endif
 
diff --git a/indent/mf.vim b/indent/mf.vim
index 24c13c7b1..fe24bf75e 100644
--- a/indent/mf.vim
+++ b/indent/mf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mf')
   finish
 endif
 
diff --git a/indent/moon.vim b/indent/moon.vim
index a71db55c7..a3a03dfcc 100644
--- a/indent/moon.vim
+++ b/indent/moon.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('moonscript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'moonscript')
   finish
 endif
 
diff --git a/indent/mp.vim b/indent/mp.vim
index 6dca244ae..c08806619 100644
--- a/indent/mp.vim
+++ b/indent/mp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mp')
   finish
 endif
 
diff --git a/indent/mustache.vim b/indent/mustache.vim
index a7a0d3c31..5715ef4a9 100644
--- a/indent/mustache.vim
+++ b/indent/mustache.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'handlebars')
   finish
 endif
 
diff --git a/indent/nginx.vim b/indent/nginx.vim
index cd0af59f4..6ddf90f3d 100644
--- a/indent/nginx.vim
+++ b/indent/nginx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nginx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nginx')
   finish
 endif
 
diff --git a/indent/nim.vim b/indent/nim.vim
index 25747ec51..fab42ed12 100644
--- a/indent/nim.vim
+++ b/indent/nim.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nim', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nim')
   finish
 endif
 
diff --git a/indent/nix.vim b/indent/nix.vim
index 24b19cdc8..6c869de5a 100644
--- a/indent/nix.vim
+++ b/indent/nix.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nix', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nix')
   finish
 endif
 
diff --git a/indent/nsis.vim b/indent/nsis.vim
index ed4bd1616..d2abb517e 100644
--- a/indent/nsis.vim
+++ b/indent/nsis.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nsis', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nsis')
   finish
 endif
 
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index 3a0e70cf0..8947957e8 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/indent/occam.vim b/indent/occam.vim
index fea8e44d2..125cc09e2 100644
--- a/indent/occam.vim
+++ b/indent/occam.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('occam', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'occam')
   finish
 endif
 
diff --git a/indent/octave.vim b/indent/octave.vim
index fbbf03146..a5c62751b 100644
--- a/indent/octave.vim
+++ b/indent/octave.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('octave', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'octave')
   finish
 endif
 
diff --git a/indent/odin.vim b/indent/odin.vim
index 50f247bd5..3a5bd9cc3 100644
--- a/indent/odin.vim
+++ b/indent/odin.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('odin', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'odin')
   finish
 endif
 
diff --git a/indent/omake.vim b/indent/omake.vim
index 3f1e550d1..ad84209ef 100644
--- a/indent/omake.vim
+++ b/indent/omake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/indent/opencl.vim b/indent/opencl.vim
index 75d7059cc..56f08bc4f 100644
--- a/indent/opencl.vim
+++ b/indent/opencl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('opencl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'opencl')
   finish
 endif
 
diff --git a/indent/pascal.vim b/indent/pascal.vim
index a58cb87bf..8bdc2fdda 100644
--- a/indent/pascal.vim
+++ b/indent/pascal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pascal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pascal')
   finish
 endif
 
diff --git a/indent/perl.vim b/indent/perl.vim
index c0871db67..0f30c8862 100644
--- a/indent/perl.vim
+++ b/indent/perl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/indent/pgsql.vim b/indent/pgsql.vim
index 4a3e91446..9a481da2c 100644
--- a/indent/pgsql.vim
+++ b/indent/pgsql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pgsql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pgsql')
   finish
 endif
 
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index 1620a7c61..14044bbfb 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('plantuml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'plantuml')
   finish
 endif
 
diff --git a/indent/pony.vim b/indent/pony.vim
index 7d1dc3d22..bbf418067 100644
--- a/indent/pony.vim
+++ b/indent/pony.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pony', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pony')
   finish
 endif
 
diff --git a/indent/postscr.vim b/indent/postscr.vim
index ba7ce4197..253b92022 100644
--- a/indent/postscr.vim
+++ b/indent/postscr.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('postscr', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'postscr')
   finish
 endif
 
diff --git a/indent/pov.vim b/indent/pov.vim
index 13e0f96f5..c30cdc226 100644
--- a/indent/pov.vim
+++ b/indent/pov.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pov', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pov')
   finish
 endif
 
diff --git a/indent/prolog.vim b/indent/prolog.vim
index 420edee7d..ff7760e0b 100644
--- a/indent/prolog.vim
+++ b/indent/prolog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('prolog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'prolog')
   finish
 endif
 
diff --git a/indent/proto.vim b/indent/proto.vim
index 8fa33fd67..f63aa31c7 100644
--- a/indent/proto.vim
+++ b/indent/proto.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('protobuf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'protobuf')
   finish
 endif
 
diff --git a/indent/ps1.vim b/indent/ps1.vim
index ac6b83fe1..9dc742b64 100644
--- a/indent/ps1.vim
+++ b/indent/ps1.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'powershell')
   finish
 endif
 
diff --git a/indent/pug.vim b/indent/pug.vim
index 20703d8cc..40bb8e831 100644
--- a/indent/pug.vim
+++ b/indent/pug.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pug', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pug')
   finish
 endif
 
diff --git a/indent/puppet.vim b/indent/puppet.vim
index 1f0a8e3c8..8ee706af0 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/indent/purescript.vim b/indent/purescript.vim
index b040855a0..f2867dd9a 100644
--- a/indent/purescript.vim
+++ b/indent/purescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('purescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'purescript')
   finish
 endif
 
diff --git a/indent/pyrex.vim b/indent/pyrex.vim
index 9ffe4c12c..77c936fa1 100644
--- a/indent/pyrex.vim
+++ b/indent/pyrex.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pyrex', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pyrex')
   finish
 endif
 
diff --git a/indent/python.vim b/indent/python.vim
index 5f13b77ef..951a0cb1e 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('python-indent', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'python-indent')
   finish
 endif
 
diff --git a/indent/qml.vim b/indent/qml.vim
index 480e9d8f6..6859ec34f 100644
--- a/indent/qml.vim
+++ b/indent/qml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('qml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'qml')
   finish
 endif
 
diff --git a/indent/racket.vim b/indent/racket.vim
index ceeec45ce..cb9934ead 100644
--- a/indent/racket.vim
+++ b/indent/racket.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('racket', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'racket')
   finish
 endif
 
diff --git a/indent/raku.vim b/indent/raku.vim
index 1c759b70b..f664f6228 100644
--- a/indent/raku.vim
+++ b/indent/raku.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('raku', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'raku')
   finish
 endif
 
diff --git a/indent/razor.vim b/indent/razor.vim
index 2708d10ee..41efb5bdf 100644
--- a/indent/razor.vim
+++ b/indent/razor.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('razor', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'razor')
   finish
 endif
 
diff --git a/indent/readline.vim b/indent/readline.vim
index 3c79245b3..d36d1a8f6 100644
--- a/indent/readline.vim
+++ b/indent/readline.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('readline', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'readline')
   finish
 endif
 
diff --git a/indent/reason.vim b/indent/reason.vim
index 4a5160bd1..ea7d4ebc7 100644
--- a/indent/reason.vim
+++ b/indent/reason.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('reason', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'reason')
   finish
 endif
 
diff --git a/indent/rmd.vim b/indent/rmd.vim
index a5c440909..afeddd383 100644
--- a/indent/rmd.vim
+++ b/indent/rmd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rmd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rmd')
   finish
 endif
 
diff --git a/indent/rnoweb.vim b/indent/rnoweb.vim
index 350e6d9bc..fc6c227e9 100644
--- a/indent/rnoweb.vim
+++ b/indent/rnoweb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rnoweb', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rnoweb')
   finish
 endif
 
diff --git a/indent/rpl.vim b/indent/rpl.vim
index 3e11fabea..11e39f537 100644
--- a/indent/rpl.vim
+++ b/indent/rpl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rpl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rpl')
   finish
 endif
 
diff --git a/indent/rrst.vim b/indent/rrst.vim
index 3d31f1eb8..9718b8602 100644
--- a/indent/rrst.vim
+++ b/indent/rrst.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rrst', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rrst')
   finish
 endif
 
diff --git a/indent/rst.vim b/indent/rst.vim
index 8fbb3d175..94cb44dc1 100644
--- a/indent/rst.vim
+++ b/indent/rst.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rst', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rst')
   finish
 endif
 
diff --git a/indent/ruby.vim b/indent/ruby.vim
index 2fe4a374b..614f359fb 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/indent/rust.vim b/indent/rust.vim
index 395e74093..733bf7c24 100644
--- a/indent/rust.vim
+++ b/indent/rust.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/indent/sas.vim b/indent/sas.vim
index eb2afdf11..320afdf7b 100644
--- a/indent/sas.vim
+++ b/indent/sas.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sas', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sas')
   finish
 endif
 
diff --git a/indent/sass.vim b/indent/sass.vim
index 4f4971a04..602ed1ef9 100644
--- a/indent/sass.vim
+++ b/indent/sass.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sass', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sass')
   finish
 endif
 
diff --git a/indent/scala.vim b/indent/scala.vim
index adddc5544..05a10bef7 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/indent/scheme.vim b/indent/scheme.vim
index 475d9cd5f..670324f00 100644
--- a/indent/scheme.vim
+++ b/indent/scheme.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scheme', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scheme')
   finish
 endif
 
diff --git a/indent/scss.vim b/indent/scss.vim
index 80a43bd2b..95c947d5a 100644
--- a/indent/scss.vim
+++ b/indent/scss.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scss', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scss')
   finish
 endif
 
diff --git a/indent/sdl.vim b/indent/sdl.vim
index 470b7328f..f253c8368 100644
--- a/indent/sdl.vim
+++ b/indent/sdl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sdl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sdl')
   finish
 endif
 
diff --git a/indent/slim.vim b/indent/slim.vim
index 95eda92d8..a33b20955 100644
--- a/indent/slim.vim
+++ b/indent/slim.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slim', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slim')
   finish
 endif
 
diff --git a/indent/slime.vim b/indent/slime.vim
index 2ba345f13..db8e35558 100644
--- a/indent/slime.vim
+++ b/indent/slime.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slime', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slime')
   finish
 endif
 
diff --git a/indent/sml.vim b/indent/sml.vim
index 0bc7a389d..d70b6d0c5 100644
--- a/indent/sml.vim
+++ b/indent/sml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sml')
   finish
 endif
 
diff --git a/indent/solidity.vim b/indent/solidity.vim
index a7844596a..bbf7c63c6 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('solidity', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'solidity')
   finish
 endif
 
diff --git a/indent/sql.vim b/indent/sql.vim
index 34c745702..9ce069106 100644
--- a/indent/sql.vim
+++ b/indent/sql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sql')
   finish
 endif
 
diff --git a/indent/sshconfig.vim b/indent/sshconfig.vim
index 4d2b3d9b9..b68e02ba0 100644
--- a/indent/sshconfig.vim
+++ b/indent/sshconfig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sshconfig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sshconfig')
   finish
 endif
 
diff --git a/indent/stylus.vim b/indent/stylus.vim
index 3265e301e..070c10656 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('stylus', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'stylus')
   finish
 endif
 
diff --git a/indent/svelte.vim b/indent/svelte.vim
index e8940f421..dbd33877b 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('svelte', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'svelte')
   finish
 endif
 
diff --git a/indent/svg.vim b/indent/svg.vim
index 198efb46a..af0cb1db9 100644
--- a/indent/svg.vim
+++ b/indent/svg.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('svg-indent', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'svg-indent')
   finish
 endif
 
diff --git a/indent/swift.vim b/indent/swift.vim
index 5c17fc63d..5b5d88bdd 100644
--- a/indent/swift.vim
+++ b/indent/swift.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('swift', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'swift')
   finish
 endif
 
diff --git a/indent/systemverilog.vim b/indent/systemverilog.vim
index 43267f6dd..9a1353ec6 100644
--- a/indent/systemverilog.vim
+++ b/indent/systemverilog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('systemverilog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'systemverilog')
   finish
 endif
 
diff --git a/indent/tcl.vim b/indent/tcl.vim
index 8ea5dcc5f..01be424e3 100644
--- a/indent/tcl.vim
+++ b/indent/tcl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tcl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tcl')
   finish
 endif
 
diff --git a/indent/teraterm.vim b/indent/teraterm.vim
index 66ad449fe..95e76144c 100644
--- a/indent/teraterm.vim
+++ b/indent/teraterm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('teraterm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'teraterm')
   finish
 endif
 
diff --git a/indent/terraform.vim b/indent/terraform.vim
index ab932dabf..e0c65b611 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('terraform', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'terraform')
   finish
 endif
 
diff --git a/indent/tex.vim b/indent/tex.vim
index 221849399..f304c092c 100644
--- a/indent/tex.vim
+++ b/indent/tex.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tex', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tex')
   finish
 endif
 
diff --git a/indent/tf.vim b/indent/tf.vim
index 5c12f112d..8b202dc27 100644
--- a/indent/tf.vim
+++ b/indent/tf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tf')
   finish
 endif
 
diff --git a/indent/tilde.vim b/indent/tilde.vim
index 8df3ede75..b14d3c378 100644
--- a/indent/tilde.vim
+++ b/indent/tilde.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tilde', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tilde')
   finish
 endif
 
diff --git a/indent/treetop.vim b/indent/treetop.vim
index d54e61598..6d4314ab7 100644
--- a/indent/treetop.vim
+++ b/indent/treetop.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('treetop', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'treetop')
   finish
 endif
 
diff --git a/indent/twig.vim b/indent/twig.vim
index 82087c331..3101f00be 100644
--- a/indent/twig.vim
+++ b/indent/twig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('twig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'twig')
   finish
 endif
 
diff --git a/indent/typescript.vim b/indent/typescript.vim
index cc742b973..cb36ad1b3 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/indent/typescriptreact.vim b/indent/typescriptreact.vim
index 8253a2887..6385bf07c 100644
--- a/indent/typescriptreact.vim
+++ b/indent/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/indent/vala.vim b/indent/vala.vim
index de3f0fd49..c68bf7eb7 100644
--- a/indent/vala.vim
+++ b/indent/vala.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vala', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vala')
   finish
 endif
 
diff --git a/indent/vb.vim b/indent/vb.vim
index 4eb977c86..deb6ee866 100644
--- a/indent/vb.vim
+++ b/indent/vb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('visual-basic', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'visual-basic')
   finish
 endif
 
diff --git a/indent/velocity.vim b/indent/velocity.vim
index 01af414be..7bc9b3e5e 100644
--- a/indent/velocity.vim
+++ b/indent/velocity.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('velocity', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'velocity')
   finish
 endif
 
diff --git a/indent/verilog.vim b/indent/verilog.vim
index 06d0a2fb9..f14928274 100644
--- a/indent/verilog.vim
+++ b/indent/verilog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('verilog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'verilog')
   finish
 endif
 
diff --git a/indent/vhdl.vim b/indent/vhdl.vim
index fd2c2f827..6da3aa60c 100644
--- a/indent/vhdl.vim
+++ b/indent/vhdl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vhdl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vhdl')
   finish
 endif
 
diff --git a/indent/vlang.vim b/indent/vlang.vim
index 58680a455..632469b65 100644
--- a/indent/vlang.vim
+++ b/indent/vlang.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('v', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'v')
   finish
 endif
 
diff --git a/indent/vroom.vim b/indent/vroom.vim
index 47a680295..6952b92c6 100644
--- a/indent/vroom.vim
+++ b/indent/vroom.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vroom', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vroom')
   finish
 endif
 
diff --git a/indent/vue.vim b/indent/vue.vim
index b4f37cc23..53be97da5 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vue', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vue')
   finish
 endif
 
diff --git a/indent/wast.vim b/indent/wast.vim
index 97bd3c8de..4483cb6c3 100644
--- a/indent/wast.vim
+++ b/indent/wast.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('wast', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'wast')
   finish
 endif
 
diff --git a/indent/xf86conf.vim b/indent/xf86conf.vim
index 287888c92..1454c9e59 100644
--- a/indent/xf86conf.vim
+++ b/indent/xf86conf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xf86conf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xf86conf')
   finish
 endif
 
diff --git a/indent/xhtml.vim b/indent/xhtml.vim
index 4f4382b38..f660238e1 100644
--- a/indent/xhtml.vim
+++ b/indent/xhtml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xhtml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xhtml')
   finish
 endif
 
diff --git a/indent/xinetd.vim b/indent/xinetd.vim
index 0443b36ed..4ed0b2731 100644
--- a/indent/xinetd.vim
+++ b/indent/xinetd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xinetd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xinetd')
   finish
 endif
 
diff --git a/indent/xsd.vim b/indent/xsd.vim
index 9d0e095ff..20db18144 100644
--- a/indent/xsd.vim
+++ b/indent/xsd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xsd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xsd')
   finish
 endif
 
diff --git a/indent/xslt.vim b/indent/xslt.vim
index c1793e1b9..fd3de3198 100644
--- a/indent/xslt.vim
+++ b/indent/xslt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xslt', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xslt')
   finish
 endif
 
diff --git a/indent/yacc.vim b/indent/yacc.vim
index 37752e48f..e14907a40 100644
--- a/indent/yacc.vim
+++ b/indent/yacc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('yacc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'yacc')
   finish
 endif
 
diff --git a/indent/yaml.vim b/indent/yaml.vim
index 274190dad..c3a5d7cd1 100644
--- a/indent/yaml.vim
+++ b/indent/yaml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('yaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'yaml')
   finish
 endif
 
diff --git a/indent/zig.vim b/indent/zig.vim
index c8ff33db2..73a65858e 100644
--- a/indent/zig.vim
+++ b/indent/zig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/indent/zimbu.vim b/indent/zimbu.vim
index c6d99cc4d..1ad43f892 100644
--- a/indent/zimbu.vim
+++ b/indent/zimbu.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zimbu', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zimbu')
   finish
 endif
 
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index ac828475b..c0639057f 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -17,7 +17,7 @@ endif
 " and (mostly comments) from https://github.com/sheerun/vimrc
 "
 " Only settings that matter for proper editing are left
-if polyglot#util#IsEnabled('sensible', 'ftdetect')
+if !has_key(g:polyglot_is_disabled, 'sensible')
   " Allow backspace in insert mode.
   if &backspace == ""
     set backspace=indent,eol,start
diff --git a/scripts/build b/scripts/build
index 7d069d949..f6910e729 100755
--- a/scripts/build
+++ b/scripts/build
@@ -295,7 +295,7 @@ def copy_file(name, src, dest)
     open(dest, "w") do |output|
       if dest.match?(/\.vim$/)
         output << <<~EOF
-        if !polyglot#util#IsEnabled('#{name}', expand('<sfile>:p'))
+        if !has_key(g:polyglot_is_disabled, '#{name}')
           finish
         endif
 
@@ -674,7 +674,7 @@ def generate_ftdetect(packages, heuristics)
     end
 
     if package_autocommands.flatten.size > 0
-      output << "if polyglot#util#IsEnabled('#{package["name"]}', 'ftdetect')\n"
+      output << "if !has_key(g:polyglot_is_disabled, '#{package["name"]}')\n"
       output << indent(package_autocommands.map { |pc| pc.reverse.join("\n") }.join("\n\n"), 2)
       output << "\nendif\n\n"
     end
diff --git a/syntax/8th.vim b/syntax/8th.vim
index 1a32143f0..9c6a1e0f0 100644
--- a/syntax/8th.vim
+++ b/syntax/8th.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('8th', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, '8th')
   finish
 endif
 
diff --git a/syntax/Jenkinsfile.vim b/syntax/Jenkinsfile.vim
index b9c6b9c29..a8ae78b8f 100644
--- a/syntax/Jenkinsfile.vim
+++ b/syntax/Jenkinsfile.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jenkins', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jenkins')
   finish
 endif
 
diff --git a/syntax/a2ps.vim b/syntax/a2ps.vim
index b0f2b98a7..7fcf9ee27 100644
--- a/syntax/a2ps.vim
+++ b/syntax/a2ps.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('a2ps', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'a2ps')
   finish
 endif
 
diff --git a/syntax/a65.vim b/syntax/a65.vim
index 5faf43f48..fcfa35bb4 100644
--- a/syntax/a65.vim
+++ b/syntax/a65.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('a65', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'a65')
   finish
 endif
 
diff --git a/syntax/aap.vim b/syntax/aap.vim
index 4b714ec7d..4d1db9b3e 100644
--- a/syntax/aap.vim
+++ b/syntax/aap.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('aap', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'aap')
   finish
 endif
 
diff --git a/syntax/abap.vim b/syntax/abap.vim
index 88e763c48..9d2e47757 100644
--- a/syntax/abap.vim
+++ b/syntax/abap.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('abap', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'abap')
   finish
 endif
 
diff --git a/syntax/abaqus.vim b/syntax/abaqus.vim
index 6f4d7e11c..57860708d 100644
--- a/syntax/abaqus.vim
+++ b/syntax/abaqus.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('abaqus', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'abaqus')
   finish
 endif
 
diff --git a/syntax/abc.vim b/syntax/abc.vim
index 8bbd911ae..c1e6fb041 100644
--- a/syntax/abc.vim
+++ b/syntax/abc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('abc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'abc')
   finish
 endif
 
diff --git a/syntax/abel.vim b/syntax/abel.vim
index 388a1727e..0299f9920 100644
--- a/syntax/abel.vim
+++ b/syntax/abel.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('abel', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'abel')
   finish
 endif
 
diff --git a/syntax/acedb.vim b/syntax/acedb.vim
index 7624743d7..cd1d6b59a 100644
--- a/syntax/acedb.vim
+++ b/syntax/acedb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('acedb', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'acedb')
   finish
 endif
 
diff --git a/syntax/ada.vim b/syntax/ada.vim
index 1cfae1296..f4ff3025a 100644
--- a/syntax/ada.vim
+++ b/syntax/ada.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ada', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ada')
   finish
 endif
 
diff --git a/syntax/ahdl.vim b/syntax/ahdl.vim
index fb5786b0a..9436bd2a4 100644
--- a/syntax/ahdl.vim
+++ b/syntax/ahdl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ahdl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ahdl')
   finish
 endif
 
diff --git a/syntax/aidl.vim b/syntax/aidl.vim
index edc857bee..3f8188aab 100644
--- a/syntax/aidl.vim
+++ b/syntax/aidl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('aidl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'aidl')
   finish
 endif
 
diff --git a/syntax/alsaconf.vim b/syntax/alsaconf.vim
index ea944b587..6e289c963 100644
--- a/syntax/alsaconf.vim
+++ b/syntax/alsaconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('alsaconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'alsaconf')
   finish
 endif
 
diff --git a/syntax/aml.vim b/syntax/aml.vim
index 8a4221d1b..c7c713a87 100644
--- a/syntax/aml.vim
+++ b/syntax/aml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('aml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'aml')
   finish
 endif
 
diff --git a/syntax/ampl.vim b/syntax/ampl.vim
index d67e209d9..15e7de977 100644
--- a/syntax/ampl.vim
+++ b/syntax/ampl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ampl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ampl')
   finish
 endif
 
diff --git a/syntax/ansible.vim b/syntax/ansible.vim
index a66ad006e..2777a0da1 100644
--- a/syntax/ansible.vim
+++ b/syntax/ansible.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ansible')
   finish
 endif
 
diff --git a/syntax/ansible_hosts.vim b/syntax/ansible_hosts.vim
index 910ad315e..7879f551d 100644
--- a/syntax/ansible_hosts.vim
+++ b/syntax/ansible_hosts.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ansible')
   finish
 endif
 
diff --git a/syntax/ant.vim b/syntax/ant.vim
index 31ac7d705..ee389234d 100644
--- a/syntax/ant.vim
+++ b/syntax/ant.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ant', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ant')
   finish
 endif
 
diff --git a/syntax/apache.vim b/syntax/apache.vim
index cf2bc3499..85145770a 100644
--- a/syntax/apache.vim
+++ b/syntax/apache.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('apache', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'apache')
   finish
 endif
 
diff --git a/syntax/apachestyle.vim b/syntax/apachestyle.vim
index cfa084ebb..8af07a1a7 100644
--- a/syntax/apachestyle.vim
+++ b/syntax/apachestyle.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('apachestyle', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'apachestyle')
   finish
 endif
 
diff --git a/syntax/apiblueprint.vim b/syntax/apiblueprint.vim
index 018d8e2ba..12be8c88f 100644
--- a/syntax/apiblueprint.vim
+++ b/syntax/apiblueprint.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('apiblueprint', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'apiblueprint')
   finish
 endif
 
diff --git a/syntax/applescript.vim b/syntax/applescript.vim
index 85af24c38..de31e2843 100644
--- a/syntax/applescript.vim
+++ b/syntax/applescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('applescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'applescript')
   finish
 endif
 
diff --git a/syntax/aptconf.vim b/syntax/aptconf.vim
index 083f23904..bf9142a3e 100644
--- a/syntax/aptconf.vim
+++ b/syntax/aptconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('aptconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'aptconf')
   finish
 endif
 
diff --git a/syntax/arch.vim b/syntax/arch.vim
index 933579581..6b43e94c4 100644
--- a/syntax/arch.vim
+++ b/syntax/arch.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('arch', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'arch')
   finish
 endif
 
diff --git a/syntax/arduino.vim b/syntax/arduino.vim
index 6106a8f77..fe233eefe 100644
--- a/syntax/arduino.vim
+++ b/syntax/arduino.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('arduino', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'arduino')
   finish
 endif
 
diff --git a/syntax/art.vim b/syntax/art.vim
index 2845054f2..b9cd2a882 100644
--- a/syntax/art.vim
+++ b/syntax/art.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('art', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'art')
   finish
 endif
 
diff --git a/syntax/asciidoc.vim b/syntax/asciidoc.vim
index b6b41b0b5..9823a863d 100644
--- a/syntax/asciidoc.vim
+++ b/syntax/asciidoc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('asciidoc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'asciidoc')
   finish
 endif
 
diff --git a/syntax/asl.vim b/syntax/asl.vim
index 3e2840fea..cdfd0f8b9 100644
--- a/syntax/asl.vim
+++ b/syntax/asl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('acpiasl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'acpiasl')
   finish
 endif
 
diff --git a/syntax/asn.vim b/syntax/asn.vim
index e2bb53e02..4ae583e9a 100644
--- a/syntax/asn.vim
+++ b/syntax/asn.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('asn', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'asn')
   finish
 endif
 
diff --git a/syntax/aspperl.vim b/syntax/aspperl.vim
index 3509b1a29..e81b54daf 100644
--- a/syntax/aspperl.vim
+++ b/syntax/aspperl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('aspperl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'aspperl')
   finish
 endif
 
diff --git a/syntax/aspvbs.vim b/syntax/aspvbs.vim
index a6d2f3357..84e20ae16 100644
--- a/syntax/aspvbs.vim
+++ b/syntax/aspvbs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('aspvbs', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'aspvbs')
   finish
 endif
 
diff --git a/syntax/asterisk.vim b/syntax/asterisk.vim
index e412aa9f2..ad982bd47 100644
--- a/syntax/asterisk.vim
+++ b/syntax/asterisk.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('asterisk', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'asterisk')
   finish
 endif
 
diff --git a/syntax/asteriskvm.vim b/syntax/asteriskvm.vim
index 6e18807bf..442bb593d 100644
--- a/syntax/asteriskvm.vim
+++ b/syntax/asteriskvm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('asteriskvm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'asteriskvm')
   finish
 endif
 
diff --git a/syntax/atlas.vim b/syntax/atlas.vim
index 30336eaef..a94be1608 100644
--- a/syntax/atlas.vim
+++ b/syntax/atlas.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('atlas', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'atlas')
   finish
 endif
 
diff --git a/syntax/autodoc.vim b/syntax/autodoc.vim
index f386e3aa5..4da968dab 100644
--- a/syntax/autodoc.vim
+++ b/syntax/autodoc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('autodoc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'autodoc')
   finish
 endif
 
diff --git a/syntax/autoit.vim b/syntax/autoit.vim
index 80f921ad5..c9c687a24 100644
--- a/syntax/autoit.vim
+++ b/syntax/autoit.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('autoit', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'autoit')
   finish
 endif
 
diff --git a/syntax/automake.vim b/syntax/automake.vim
index 62f7fa450..1e61b27f5 100644
--- a/syntax/automake.vim
+++ b/syntax/automake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('automake', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'automake')
   finish
 endif
 
diff --git a/syntax/ave.vim b/syntax/ave.vim
index 30084a913..a0e5bb74e 100644
--- a/syntax/ave.vim
+++ b/syntax/ave.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ave', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ave')
   finish
 endif
 
diff --git a/syntax/awk.vim b/syntax/awk.vim
index d8a8c8c38..19d8000f5 100644
--- a/syntax/awk.vim
+++ b/syntax/awk.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('awk', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'awk')
   finish
 endif
 
diff --git a/syntax/b.vim b/syntax/b.vim
index b0ddde41f..2dde00cd9 100644
--- a/syntax/b.vim
+++ b/syntax/b.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('b', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'b')
   finish
 endif
 
diff --git a/syntax/basic.vim b/syntax/basic.vim
index 056bbc17b..565bf678b 100644
--- a/syntax/basic.vim
+++ b/syntax/basic.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('basic', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'basic')
   finish
 endif
 
diff --git a/syntax/basic/class.vim b/syntax/basic/class.vim
index 734df1ba5..b4e1d752d 100644
--- a/syntax/basic/class.vim
+++ b/syntax/basic/class.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/cluster.vim b/syntax/basic/cluster.vim
index c601ca431..6561c9d6a 100644
--- a/syntax/basic/cluster.vim
+++ b/syntax/basic/cluster.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/decorator.vim b/syntax/basic/decorator.vim
index 3eeb22a81..cb1312853 100644
--- a/syntax/basic/decorator.vim
+++ b/syntax/basic/decorator.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/doc.vim b/syntax/basic/doc.vim
index 54d827a62..4d5f8a273 100644
--- a/syntax/basic/doc.vim
+++ b/syntax/basic/doc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/function.vim b/syntax/basic/function.vim
index 9cda9e8da..14a2deeb4 100644
--- a/syntax/basic/function.vim
+++ b/syntax/basic/function.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/identifiers.vim b/syntax/basic/identifiers.vim
index 1f4d0a0be..4fe4b565e 100644
--- a/syntax/basic/identifiers.vim
+++ b/syntax/basic/identifiers.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/keyword.vim b/syntax/basic/keyword.vim
index ec10ebdcf..41c4f9d2e 100644
--- a/syntax/basic/keyword.vim
+++ b/syntax/basic/keyword.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/literal.vim b/syntax/basic/literal.vim
index c8e1ba2c9..30411cb64 100644
--- a/syntax/basic/literal.vim
+++ b/syntax/basic/literal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/members.vim b/syntax/basic/members.vim
index 27bf8496d..e1c4589a8 100644
--- a/syntax/basic/members.vim
+++ b/syntax/basic/members.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/object.vim b/syntax/basic/object.vim
index 86585e499..ccc20304d 100644
--- a/syntax/basic/object.vim
+++ b/syntax/basic/object.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/patch.vim b/syntax/basic/patch.vim
index 669cd8e08..475c050db 100644
--- a/syntax/basic/patch.vim
+++ b/syntax/basic/patch.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/reserved.vim b/syntax/basic/reserved.vim
index 0b2d88c90..a60af5908 100644
--- a/syntax/basic/reserved.vim
+++ b/syntax/basic/reserved.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/symbols.vim b/syntax/basic/symbols.vim
index 586460649..5c83116af 100644
--- a/syntax/basic/symbols.vim
+++ b/syntax/basic/symbols.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim
index 03fe8de83..c448f2c84 100644
--- a/syntax/basic/type.vim
+++ b/syntax/basic/type.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/bc.vim b/syntax/bc.vim
index fb135745a..68b244783 100644
--- a/syntax/bc.vim
+++ b/syntax/bc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bc')
   finish
 endif
 
diff --git a/syntax/bdf.vim b/syntax/bdf.vim
index 86d931d34..7deb6f152 100644
--- a/syntax/bdf.vim
+++ b/syntax/bdf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bdf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bdf')
   finish
 endif
 
diff --git a/syntax/bib.vim b/syntax/bib.vim
index 844237a8b..ccc994c64 100644
--- a/syntax/bib.vim
+++ b/syntax/bib.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bib', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bib')
   finish
 endif
 
diff --git a/syntax/bindzone.vim b/syntax/bindzone.vim
index fd03e71ad..dd157ce27 100644
--- a/syntax/bindzone.vim
+++ b/syntax/bindzone.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bindzone', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bindzone')
   finish
 endif
 
diff --git a/syntax/blade.vim b/syntax/blade.vim
index 49abd937a..76258fd8b 100644
--- a/syntax/blade.vim
+++ b/syntax/blade.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('blade', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'blade')
   finish
 endif
 
diff --git a/syntax/blank.vim b/syntax/blank.vim
index 81170873c..f32e3f3cf 100644
--- a/syntax/blank.vim
+++ b/syntax/blank.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('blank', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'blank')
   finish
 endif
 
diff --git a/syntax/brewfile.vim b/syntax/brewfile.vim
index 0d1aea793..ea5e0f9e1 100644
--- a/syntax/brewfile.vim
+++ b/syntax/brewfile.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('brewfile', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'brewfile')
   finish
 endif
 
diff --git a/syntax/bsdl.vim b/syntax/bsdl.vim
index e77d53efa..245708ca7 100644
--- a/syntax/bsdl.vim
+++ b/syntax/bsdl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bsdl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bsdl')
   finish
 endif
 
diff --git a/syntax/bst.vim b/syntax/bst.vim
index 1a37e95c5..8fb3bd8be 100644
--- a/syntax/bst.vim
+++ b/syntax/bst.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bst', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bst')
   finish
 endif
 
diff --git a/syntax/bzl.vim b/syntax/bzl.vim
index 0163a0e29..fe309354a 100644
--- a/syntax/bzl.vim
+++ b/syntax/bzl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bzl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bzl')
   finish
 endif
 
diff --git a/syntax/bzr.vim b/syntax/bzr.vim
index 07bc7fa14..ae7ac3575 100644
--- a/syntax/bzr.vim
+++ b/syntax/bzr.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('bzr', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'bzr')
   finish
 endif
 
diff --git a/syntax/c.vim b/syntax/c.vim
index cbcb70861..bedac0770 100644
--- a/syntax/c.vim
+++ b/syntax/c.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('c/c++', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'c/c++')
   finish
 endif
 
diff --git a/syntax/cabal-1.vim b/syntax/cabal-1.vim
index d2192fd4e..0389eee7e 100644
--- a/syntax/cabal-1.vim
+++ b/syntax/cabal-1.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/syntax/cabal-2.vim b/syntax/cabal-2.vim
index 9e9d441c2..1467ee311 100644
--- a/syntax/cabal-2.vim
+++ b/syntax/cabal-2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cabal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cabal')
   finish
 endif
 
diff --git a/syntax/caddyfile.vim b/syntax/caddyfile.vim
index 93503a873..ce62be88b 100644
--- a/syntax/caddyfile.vim
+++ b/syntax/caddyfile.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('caddyfile', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'caddyfile')
   finish
 endif
 
diff --git a/syntax/calendar.vim b/syntax/calendar.vim
index 4b154111d..dd9984946 100644
--- a/syntax/calendar.vim
+++ b/syntax/calendar.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('calendar', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'calendar')
   finish
 endif
 
diff --git a/syntax/carp.vim b/syntax/carp.vim
index 9fdeef0a0..1d62f7caf 100644
--- a/syntax/carp.vim
+++ b/syntax/carp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('carp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'carp')
   finish
 endif
 
diff --git a/syntax/catalog.vim b/syntax/catalog.vim
index f9054ef10..a6aa01d47 100644
--- a/syntax/catalog.vim
+++ b/syntax/catalog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('catalog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'catalog')
   finish
 endif
 
diff --git a/syntax/cdl.vim b/syntax/cdl.vim
index da8ef432b..4084adac7 100644
--- a/syntax/cdl.vim
+++ b/syntax/cdl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cdl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cdl')
   finish
 endif
 
diff --git a/syntax/cdrdaoconf.vim b/syntax/cdrdaoconf.vim
index 0a36a716e..98fd01116 100644
--- a/syntax/cdrdaoconf.vim
+++ b/syntax/cdrdaoconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cdrdaoconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cdrdaoconf')
   finish
 endif
 
diff --git a/syntax/cdrtoc.vim b/syntax/cdrtoc.vim
index 52fc45fb2..f2d5b8cb0 100644
--- a/syntax/cdrtoc.vim
+++ b/syntax/cdrtoc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cdrtoc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cdrtoc')
   finish
 endif
 
diff --git a/syntax/cf.vim b/syntax/cf.vim
index 4f093a9d2..45475d0e2 100644
--- a/syntax/cf.vim
+++ b/syntax/cf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cf')
   finish
 endif
 
diff --git a/syntax/cfg.vim b/syntax/cfg.vim
index ce289bf35..484b750cc 100644
--- a/syntax/cfg.vim
+++ b/syntax/cfg.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cfg', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cfg')
   finish
 endif
 
diff --git a/syntax/ch.vim b/syntax/ch.vim
index 389531e4d..4ac949cfc 100644
--- a/syntax/ch.vim
+++ b/syntax/ch.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ch', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ch')
   finish
 endif
 
diff --git a/syntax/chaiscript.vim b/syntax/chaiscript.vim
index 7b4df2824..dfb536133 100644
--- a/syntax/chaiscript.vim
+++ b/syntax/chaiscript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('chaiscript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'chaiscript')
   finish
 endif
 
diff --git a/syntax/chaskell.vim b/syntax/chaskell.vim
index 256912081..d819aa975 100644
--- a/syntax/chaskell.vim
+++ b/syntax/chaskell.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('chaskell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'chaskell')
   finish
 endif
 
diff --git a/syntax/chill.vim b/syntax/chill.vim
index 313dc67a3..862ce04cf 100644
--- a/syntax/chill.vim
+++ b/syntax/chill.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('chill', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'chill')
   finish
 endif
 
diff --git a/syntax/chordpro.vim b/syntax/chordpro.vim
index b3f5b5bd3..10b770489 100644
--- a/syntax/chordpro.vim
+++ b/syntax/chordpro.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('chordpro', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'chordpro')
   finish
 endif
 
diff --git a/syntax/cl.vim b/syntax/cl.vim
index fa5c807c2..3e9bf6d27 100644
--- a/syntax/cl.vim
+++ b/syntax/cl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cl')
   finish
 endif
 
diff --git a/syntax/clean.vim b/syntax/clean.vim
index a5ffc6fcf..1cfbca8d3 100644
--- a/syntax/clean.vim
+++ b/syntax/clean.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('clean', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'clean')
   finish
 endif
 
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index eb118543d..56c576d85 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('clojure', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'clojure')
   finish
 endif
 
diff --git a/syntax/cmake.vim b/syntax/cmake.vim
index 12c22895d..b6a9a7f5f 100644
--- a/syntax/cmake.vim
+++ b/syntax/cmake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cmake', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cmake')
   finish
 endif
 
diff --git a/syntax/cmod.vim b/syntax/cmod.vim
index a0eeb3e65..e23f1609c 100644
--- a/syntax/cmod.vim
+++ b/syntax/cmod.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cmod', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cmod')
   finish
 endif
 
diff --git a/syntax/cmusrc.vim b/syntax/cmusrc.vim
index 7dc2b94dd..e9384d2b4 100644
--- a/syntax/cmusrc.vim
+++ b/syntax/cmusrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cmusrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cmusrc')
   finish
 endif
 
diff --git a/syntax/cobol.vim b/syntax/cobol.vim
index 8cf9fb433..e1ab7a14d 100644
--- a/syntax/cobol.vim
+++ b/syntax/cobol.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cobol', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cobol')
   finish
 endif
 
diff --git a/syntax/coco.vim b/syntax/coco.vim
index 1f01932ff..6d92790e3 100644
--- a/syntax/coco.vim
+++ b/syntax/coco.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('coco', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'coco')
   finish
 endif
 
diff --git a/syntax/coffee.vim b/syntax/coffee.vim
index 837481ca9..f6f54f72e 100644
--- a/syntax/coffee.vim
+++ b/syntax/coffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/syntax/common.vim b/syntax/common.vim
index 739696250..87823ef5f 100644
--- a/syntax/common.vim
+++ b/syntax/common.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/conaryrecipe.vim b/syntax/conaryrecipe.vim
index 4af5618ce..95a57d598 100644
--- a/syntax/conaryrecipe.vim
+++ b/syntax/conaryrecipe.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('conaryrecipe', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'conaryrecipe')
   finish
 endif
 
diff --git a/syntax/conf.vim b/syntax/conf.vim
index a5e43e327..b6c8f48db 100644
--- a/syntax/conf.vim
+++ b/syntax/conf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('conf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'conf')
   finish
 endif
 
diff --git a/syntax/config.vim b/syntax/config.vim
index a034d772a..b7f891e22 100644
--- a/syntax/config.vim
+++ b/syntax/config.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('config', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'config')
   finish
 endif
 
diff --git a/syntax/cpp.vim b/syntax/cpp.vim
index 90bed7a5e..b5991bfc8 100644
--- a/syntax/cpp.vim
+++ b/syntax/cpp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('c/c++', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'c/c++')
   finish
 endif
 
diff --git a/syntax/cql.vim b/syntax/cql.vim
index e51240329..6f6a7d5d5 100644
--- a/syntax/cql.vim
+++ b/syntax/cql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cql')
   finish
 endif
 
diff --git a/syntax/crm.vim b/syntax/crm.vim
index 1b6b8a66f..020ab4d0b 100644
--- a/syntax/crm.vim
+++ b/syntax/crm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crm')
   finish
 endif
 
diff --git a/syntax/crontab.vim b/syntax/crontab.vim
index 7bedcadc6..eaf28b259 100644
--- a/syntax/crontab.vim
+++ b/syntax/crontab.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crontab', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crontab')
   finish
 endif
 
diff --git a/syntax/cryptol.vim b/syntax/cryptol.vim
index eb55af0af..76c3524fc 100644
--- a/syntax/cryptol.vim
+++ b/syntax/cryptol.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cryptol', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cryptol')
   finish
 endif
 
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index 02aea4383..866497d61 100644
--- a/syntax/crystal.vim
+++ b/syntax/crystal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/syntax/cs.vim b/syntax/cs.vim
index e416cf7f8..42646884a 100644
--- a/syntax/cs.vim
+++ b/syntax/cs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cs', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cs')
   finish
 endif
 
diff --git a/syntax/csc.vim b/syntax/csc.vim
index dfddecc3a..90e866d1a 100644
--- a/syntax/csc.vim
+++ b/syntax/csc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('csc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'csc')
   finish
 endif
 
diff --git a/syntax/csdl.vim b/syntax/csdl.vim
index 5064bc774..35d5df4c2 100644
--- a/syntax/csdl.vim
+++ b/syntax/csdl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('csdl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'csdl')
   finish
 endif
 
diff --git a/syntax/csp.vim b/syntax/csp.vim
index 341906b6c..1ade70a88 100644
--- a/syntax/csp.vim
+++ b/syntax/csp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('csp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'csp')
   finish
 endif
 
diff --git a/syntax/css.vim b/syntax/css.vim
index 95ee1e751..57976baa5 100644
--- a/syntax/css.vim
+++ b/syntax/css.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('css', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'css')
   finish
 endif
 
diff --git a/syntax/csv.vim b/syntax/csv.vim
index 138ae5476..6ae4b8026 100644
--- a/syntax/csv.vim
+++ b/syntax/csv.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('csv', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'csv')
   finish
 endif
 
diff --git a/syntax/cterm.vim b/syntax/cterm.vim
index 9f30bf5b0..4c63fa6e8 100644
--- a/syntax/cterm.vim
+++ b/syntax/cterm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cterm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cterm')
   finish
 endif
 
diff --git a/syntax/cucumber.vim b/syntax/cucumber.vim
index 26a236a62..5c32b25d5 100644
--- a/syntax/cucumber.vim
+++ b/syntax/cucumber.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cucumber', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cucumber')
   finish
 endif
 
diff --git a/syntax/cuda.vim b/syntax/cuda.vim
index 3296fec52..d3a6bd403 100644
--- a/syntax/cuda.vim
+++ b/syntax/cuda.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cuda', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cuda')
   finish
 endif
 
diff --git a/syntax/cuesheet.vim b/syntax/cuesheet.vim
index 380edb1e9..7588e1930 100644
--- a/syntax/cuesheet.vim
+++ b/syntax/cuesheet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cue', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cue')
   finish
 endif
 
diff --git a/syntax/cupl.vim b/syntax/cupl.vim
index 43488e565..11ed7e0f9 100644
--- a/syntax/cupl.vim
+++ b/syntax/cupl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cupl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cupl')
   finish
 endif
 
diff --git a/syntax/cuplsim.vim b/syntax/cuplsim.vim
index d46278703..a66c1dc82 100644
--- a/syntax/cuplsim.vim
+++ b/syntax/cuplsim.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cuplsim', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cuplsim')
   finish
 endif
 
diff --git a/syntax/cvs.vim b/syntax/cvs.vim
index 9a0b6e114..1b1b24293 100644
--- a/syntax/cvs.vim
+++ b/syntax/cvs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cvs', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cvs')
   finish
 endif
 
diff --git a/syntax/cvsrc.vim b/syntax/cvsrc.vim
index 13b2f417b..40944a23f 100644
--- a/syntax/cvsrc.vim
+++ b/syntax/cvsrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cvsrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cvsrc')
   finish
 endif
 
diff --git a/syntax/cynpp.vim b/syntax/cynpp.vim
index 395621b68..12e96d604 100644
--- a/syntax/cynpp.vim
+++ b/syntax/cynpp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cynpp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cynpp')
   finish
 endif
 
diff --git a/syntax/d.vim b/syntax/d.vim
index 3473a23a4..469913803 100644
--- a/syntax/d.vim
+++ b/syntax/d.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dlang')
   finish
 endif
 
diff --git a/syntax/dart.vim b/syntax/dart.vim
index ef17f0ed1..f337fd3de 100644
--- a/syntax/dart.vim
+++ b/syntax/dart.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dart', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dart')
   finish
 endif
 
diff --git a/syntax/datascript.vim b/syntax/datascript.vim
index e0138e6cf..40668cdd9 100644
--- a/syntax/datascript.vim
+++ b/syntax/datascript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('datascript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'datascript')
   finish
 endif
 
diff --git a/syntax/dcd.vim b/syntax/dcd.vim
index f94b451a1..5399fee1e 100644
--- a/syntax/dcd.vim
+++ b/syntax/dcd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dcd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dcd')
   finish
 endif
 
diff --git a/syntax/dcov.vim b/syntax/dcov.vim
index 3d70df069..b7733fdd2 100644
--- a/syntax/dcov.vim
+++ b/syntax/dcov.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dlang')
   finish
 endif
 
diff --git a/syntax/dd.vim b/syntax/dd.vim
index ca81f45b3..924cf79a9 100644
--- a/syntax/dd.vim
+++ b/syntax/dd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dlang')
   finish
 endif
 
diff --git a/syntax/ddoc.vim b/syntax/ddoc.vim
index 80bb2e2cd..3e1da3679 100644
--- a/syntax/ddoc.vim
+++ b/syntax/ddoc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dlang')
   finish
 endif
 
diff --git a/syntax/debchangelog.vim b/syntax/debchangelog.vim
index 36fc627d0..dacbe619b 100644
--- a/syntax/debchangelog.vim
+++ b/syntax/debchangelog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('debchangelog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'debchangelog')
   finish
 endif
 
diff --git a/syntax/debcontrol.vim b/syntax/debcontrol.vim
index 76d6728f1..3ad42c3bf 100644
--- a/syntax/debcontrol.vim
+++ b/syntax/debcontrol.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('debcontrol', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'debcontrol')
   finish
 endif
 
diff --git a/syntax/debcopyright.vim b/syntax/debcopyright.vim
index 674a3e00a..a09ecdc20 100644
--- a/syntax/debcopyright.vim
+++ b/syntax/debcopyright.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('debcopyright', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'debcopyright')
   finish
 endif
 
diff --git a/syntax/debsources.vim b/syntax/debsources.vim
index 69fde2288..94ee69b59 100644
--- a/syntax/debsources.vim
+++ b/syntax/debsources.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('debsources', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'debsources')
   finish
 endif
 
diff --git a/syntax/def.vim b/syntax/def.vim
index 5c6138178..7cb4175d8 100644
--- a/syntax/def.vim
+++ b/syntax/def.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('def', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'def')
   finish
 endif
 
diff --git a/syntax/denyhosts.vim b/syntax/denyhosts.vim
index 9372c53c2..b79e6820e 100644
--- a/syntax/denyhosts.vim
+++ b/syntax/denyhosts.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('denyhosts', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'denyhosts')
   finish
 endif
 
diff --git a/syntax/desc.vim b/syntax/desc.vim
index ba14a1e3c..9ca33453b 100644
--- a/syntax/desc.vim
+++ b/syntax/desc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('desc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'desc')
   finish
 endif
 
diff --git a/syntax/desktop.vim b/syntax/desktop.vim
index c1d5a9eaa..0b5626611 100644
--- a/syntax/desktop.vim
+++ b/syntax/desktop.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('desktop', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'desktop')
   finish
 endif
 
diff --git a/syntax/dhall.vim b/syntax/dhall.vim
index e59575078..12b9fa764 100644
--- a/syntax/dhall.vim
+++ b/syntax/dhall.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dhall', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dhall')
   finish
 endif
 
diff --git a/syntax/dictconf.vim b/syntax/dictconf.vim
index 44efc3522..67db8bd6d 100644
--- a/syntax/dictconf.vim
+++ b/syntax/dictconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dictconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dictconf')
   finish
 endif
 
diff --git a/syntax/dictdconf.vim b/syntax/dictdconf.vim
index 5fb5ebf38..cfea1c5dc 100644
--- a/syntax/dictdconf.vim
+++ b/syntax/dictdconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dictdconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dictdconf')
   finish
 endif
 
diff --git a/syntax/diff.vim b/syntax/diff.vim
index 43f99fb11..5d614ef81 100644
--- a/syntax/diff.vim
+++ b/syntax/diff.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('diff', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'diff')
   finish
 endif
 
diff --git a/syntax/dircolors.vim b/syntax/dircolors.vim
index ce5d3cd40..2f2c1884a 100644
--- a/syntax/dircolors.vim
+++ b/syntax/dircolors.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dircolors', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dircolors')
   finish
 endif
 
diff --git a/syntax/django.vim b/syntax/django.vim
index 9912b8c55..e5e0a922d 100644
--- a/syntax/django.vim
+++ b/syntax/django.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('htmldjango', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'htmldjango')
   finish
 endif
 
diff --git a/syntax/dnsmasq.vim b/syntax/dnsmasq.vim
index d523fe231..4dcd92e1f 100644
--- a/syntax/dnsmasq.vim
+++ b/syntax/dnsmasq.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dnsmasq', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dnsmasq')
   finish
 endif
 
diff --git a/syntax/docker-compose.vim b/syntax/docker-compose.vim
index 9290403da..2c063a930 100644
--- a/syntax/docker-compose.vim
+++ b/syntax/docker-compose.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('docker-compose', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'docker-compose')
   finish
 endif
 
diff --git a/syntax/dockerfile.vim b/syntax/dockerfile.vim
index 7c2ff2808..5360f0f1a 100644
--- a/syntax/dockerfile.vim
+++ b/syntax/dockerfile.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dockerfile', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dockerfile')
   finish
 endif
 
diff --git a/syntax/dosbatch.vim b/syntax/dosbatch.vim
index 49d473148..8f8e0221e 100644
--- a/syntax/dosbatch.vim
+++ b/syntax/dosbatch.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dosbatch', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dosbatch')
   finish
 endif
 
diff --git a/syntax/dosini.vim b/syntax/dosini.vim
index fd8bb3a7f..1af9399a4 100644
--- a/syntax/dosini.vim
+++ b/syntax/dosini.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dosini', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dosini')
   finish
 endif
 
diff --git a/syntax/dot.vim b/syntax/dot.vim
index 57733404b..95cfde679 100644
--- a/syntax/dot.vim
+++ b/syntax/dot.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dot', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dot')
   finish
 endif
 
diff --git a/syntax/dracula.vim b/syntax/dracula.vim
index df90e153e..b1fbc9ace 100644
--- a/syntax/dracula.vim
+++ b/syntax/dracula.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dracula', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dracula')
   finish
 endif
 
diff --git a/syntax/dsdl.vim b/syntax/dsdl.vim
index d66e483ef..c6a9373a6 100644
--- a/syntax/dsdl.vim
+++ b/syntax/dsdl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dlang', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dlang')
   finish
 endif
 
diff --git a/syntax/dsl.vim b/syntax/dsl.vim
index 5b0972dd2..0a10dd402 100644
--- a/syntax/dsl.vim
+++ b/syntax/dsl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dsl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dsl')
   finish
 endif
 
diff --git a/syntax/dtd.vim b/syntax/dtd.vim
index f2510263e..b6f937648 100644
--- a/syntax/dtd.vim
+++ b/syntax/dtd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dtd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dtd')
   finish
 endif
 
diff --git a/syntax/dts.vim b/syntax/dts.vim
index 66cfd3708..6a6d3948f 100644
--- a/syntax/dts.vim
+++ b/syntax/dts.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dts', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dts')
   finish
 endif
 
diff --git a/syntax/dune.vim b/syntax/dune.vim
index 5fb01ff40..dbab17325 100644
--- a/syntax/dune.vim
+++ b/syntax/dune.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/dylan.vim b/syntax/dylan.vim
index 811039186..cc22c8f09 100644
--- a/syntax/dylan.vim
+++ b/syntax/dylan.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dylan', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dylan')
   finish
 endif
 
diff --git a/syntax/dylanintr.vim b/syntax/dylanintr.vim
index b01740c8e..4c049266e 100644
--- a/syntax/dylanintr.vim
+++ b/syntax/dylanintr.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dylanintr', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dylanintr')
   finish
 endif
 
diff --git a/syntax/dylanlid.vim b/syntax/dylanlid.vim
index c847ab441..b8bb2b269 100644
--- a/syntax/dylanlid.vim
+++ b/syntax/dylanlid.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dylanlid', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dylanlid')
   finish
 endif
 
diff --git a/syntax/ecd.vim b/syntax/ecd.vim
index 2a953b6c0..2d2feb806 100644
--- a/syntax/ecd.vim
+++ b/syntax/ecd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ecd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ecd')
   finish
 endif
 
diff --git a/syntax/ecrystal.vim b/syntax/ecrystal.vim
index 84166ed9f..e44fcba6f 100644
--- a/syntax/ecrystal.vim
+++ b/syntax/ecrystal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('crystal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/syntax/edif.vim b/syntax/edif.vim
index bbe99d1d1..418429112 100644
--- a/syntax/edif.vim
+++ b/syntax/edif.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('edif', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'edif')
   finish
 endif
 
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index 947a3cbea..70671ee69 100644
--- a/syntax/eelixir.vim
+++ b/syntax/eelixir.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/syntax/elf.vim b/syntax/elf.vim
index e5532b7fc..1e0d7dddb 100644
--- a/syntax/elf.vim
+++ b/syntax/elf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elf')
   finish
 endif
 
diff --git a/syntax/elinks.vim b/syntax/elinks.vim
index 4b90f02b7..e968866e0 100644
--- a/syntax/elinks.vim
+++ b/syntax/elinks.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elinks', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elinks')
   finish
 endif
 
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index 70b76e3de..d612da48c 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elixir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/syntax/elm.vim b/syntax/elm.vim
index ae095a1bb..b655ff174 100644
--- a/syntax/elm.vim
+++ b/syntax/elm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elm')
   finish
 endif
 
diff --git a/syntax/elmfilt.vim b/syntax/elmfilt.vim
index 1a83f8e98..cb2b5fc4d 100644
--- a/syntax/elmfilt.vim
+++ b/syntax/elmfilt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('elmfilt', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'elmfilt')
   finish
 endif
 
diff --git a/syntax/embeddedpuppet.vim b/syntax/embeddedpuppet.vim
index 1540cb025..a99d85537 100644
--- a/syntax/embeddedpuppet.vim
+++ b/syntax/embeddedpuppet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/syntax/ember-script.vim b/syntax/ember-script.vim
index e82219306..ed84783e8 100644
--- a/syntax/ember-script.vim
+++ b/syntax/ember-script.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('emberscript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'emberscript')
   finish
 endif
 
diff --git a/syntax/emblem.vim b/syntax/emblem.vim
index 08670626e..be352a391 100644
--- a/syntax/emblem.vim
+++ b/syntax/emblem.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('emblem', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'emblem')
   finish
 endif
 
diff --git a/syntax/erlang.vim b/syntax/erlang.vim
index 434aeb583..9ba63a789 100644
--- a/syntax/erlang.vim
+++ b/syntax/erlang.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('erlang', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'erlang')
   finish
 endif
 
diff --git a/syntax/eruby.vim b/syntax/eruby.vim
index b129bef75..9dbc9264a 100644
--- a/syntax/eruby.vim
+++ b/syntax/eruby.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/syntax/esmtprc.vim b/syntax/esmtprc.vim
index 13e6b5d7c..687d981ae 100644
--- a/syntax/esmtprc.vim
+++ b/syntax/esmtprc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('esmtprc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'esmtprc')
   finish
 endif
 
diff --git a/syntax/esqlc.vim b/syntax/esqlc.vim
index 038dd3071..48f7a2e3e 100644
--- a/syntax/esqlc.vim
+++ b/syntax/esqlc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('esqlc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'esqlc')
   finish
 endif
 
diff --git a/syntax/esterel.vim b/syntax/esterel.vim
index 69984e9b8..84ccfb437 100644
--- a/syntax/esterel.vim
+++ b/syntax/esterel.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('esterel', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'esterel')
   finish
 endif
 
diff --git a/syntax/eterm.vim b/syntax/eterm.vim
index 306b19d72..1da49675d 100644
--- a/syntax/eterm.vim
+++ b/syntax/eterm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('eterm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'eterm')
   finish
 endif
 
diff --git a/syntax/exim.vim b/syntax/exim.vim
index cd6a0c65e..75e18e789 100644
--- a/syntax/exim.vim
+++ b/syntax/exim.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('exim', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'exim')
   finish
 endif
 
diff --git a/syntax/expect.vim b/syntax/expect.vim
index 439d5d3e7..1c397fa26 100644
--- a/syntax/expect.vim
+++ b/syntax/expect.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('expect', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'expect')
   finish
 endif
 
diff --git a/syntax/exports.vim b/syntax/exports.vim
index a47d6536f..25731dc23 100644
--- a/syntax/exports.vim
+++ b/syntax/exports.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('exports', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'exports')
   finish
 endif
 
diff --git a/syntax/falcon.vim b/syntax/falcon.vim
index b00183893..ac71567be 100644
--- a/syntax/falcon.vim
+++ b/syntax/falcon.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('falcon', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'falcon')
   finish
 endif
 
diff --git a/syntax/fan.vim b/syntax/fan.vim
index 0d1d733a1..3e833710d 100644
--- a/syntax/fan.vim
+++ b/syntax/fan.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fan', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fan')
   finish
 endif
 
diff --git a/syntax/fbs.vim b/syntax/fbs.vim
index eca7d5d95..c83b3fb8f 100644
--- a/syntax/fbs.vim
+++ b/syntax/fbs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('flatbuffers', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'flatbuffers')
   finish
 endif
 
diff --git a/syntax/fennel.vim b/syntax/fennel.vim
index 918d28867..a622754e8 100644
--- a/syntax/fennel.vim
+++ b/syntax/fennel.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fennel', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fennel')
   finish
 endif
 
diff --git a/syntax/ferm.vim b/syntax/ferm.vim
index f3ed88095..f80f84356 100644
--- a/syntax/ferm.vim
+++ b/syntax/ferm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ferm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ferm')
   finish
 endif
 
diff --git a/syntax/fetchmail.vim b/syntax/fetchmail.vim
index e69130f7f..e1e5f18a6 100644
--- a/syntax/fetchmail.vim
+++ b/syntax/fetchmail.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fetchmail', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fetchmail')
   finish
 endif
 
diff --git a/syntax/fgl.vim b/syntax/fgl.vim
index 24cccde9f..33c04842c 100644
--- a/syntax/fgl.vim
+++ b/syntax/fgl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fgl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fgl')
   finish
 endif
 
diff --git a/syntax/fish.vim b/syntax/fish.vim
index c2ffeb1af..83fcdb365 100644
--- a/syntax/fish.vim
+++ b/syntax/fish.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fish', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fish')
   finish
 endif
 
diff --git a/syntax/flow.vim b/syntax/flow.vim
index ec6f583ba..8ede56062 100644
--- a/syntax/flow.vim
+++ b/syntax/flow.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/syntax/focexec.vim b/syntax/focexec.vim
index 7bc93bace..a595e9245 100644
--- a/syntax/focexec.vim
+++ b/syntax/focexec.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('focexec', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'focexec')
   finish
 endif
 
diff --git a/syntax/forth.vim b/syntax/forth.vim
index 1bf4946f5..9c14ed310 100644
--- a/syntax/forth.vim
+++ b/syntax/forth.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('forth', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'forth')
   finish
 endif
 
diff --git a/syntax/fortran.vim b/syntax/fortran.vim
index 5acdf58ff..33af90516 100644
--- a/syntax/fortran.vim
+++ b/syntax/fortran.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fortran', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fortran')
   finish
 endif
 
diff --git a/syntax/framescript.vim b/syntax/framescript.vim
index 59de43f51..bcc41b804 100644
--- a/syntax/framescript.vim
+++ b/syntax/framescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('framescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'framescript')
   finish
 endif
 
diff --git a/syntax/freebasic.vim b/syntax/freebasic.vim
index 42a16b14f..ce6350f92 100644
--- a/syntax/freebasic.vim
+++ b/syntax/freebasic.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('freebasic', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'freebasic')
   finish
 endif
 
diff --git a/syntax/fsharp.vim b/syntax/fsharp.vim
index 209639b16..17c78eeba 100644
--- a/syntax/fsharp.vim
+++ b/syntax/fsharp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fsharp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fsharp')
   finish
 endif
 
diff --git a/syntax/fstab.vim b/syntax/fstab.vim
index a4c44bb43..f4d7a8b61 100644
--- a/syntax/fstab.vim
+++ b/syntax/fstab.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fstab', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fstab')
   finish
 endif
 
diff --git a/syntax/fvwm.vim b/syntax/fvwm.vim
index 7ea554d2e..7ff6e349e 100644
--- a/syntax/fvwm.vim
+++ b/syntax/fvwm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('fvwm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'fvwm')
   finish
 endif
 
diff --git a/syntax/gdb.vim b/syntax/gdb.vim
index 31eceac07..b752b763f 100644
--- a/syntax/gdb.vim
+++ b/syntax/gdb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gdb', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gdb')
   finish
 endif
 
diff --git a/syntax/gdmo.vim b/syntax/gdmo.vim
index 86f827a6f..129ef5765 100644
--- a/syntax/gdmo.vim
+++ b/syntax/gdmo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gdmo', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gdmo')
   finish
 endif
 
diff --git a/syntax/gdscript3.vim b/syntax/gdscript3.vim
index b7bc35b43..c5a14154d 100644
--- a/syntax/gdscript3.vim
+++ b/syntax/gdscript3.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gdscript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gdscript')
   finish
 endif
 
diff --git a/syntax/gedcom.vim b/syntax/gedcom.vim
index 67609240c..49a98aa3d 100644
--- a/syntax/gedcom.vim
+++ b/syntax/gedcom.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gedcom', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gedcom')
   finish
 endif
 
diff --git a/syntax/git.vim b/syntax/git.vim
index 73f7d44eb..da953d5e2 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index 0ae05f810..36fb3cda5 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/syntax/gitconfig.vim b/syntax/gitconfig.vim
index e0a91a2c9..402aa3dc3 100644
--- a/syntax/gitconfig.vim
+++ b/syntax/gitconfig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/syntax/gitignore.vim b/syntax/gitignore.vim
index 177713f8b..16021dd2b 100644
--- a/syntax/gitignore.vim
+++ b/syntax/gitignore.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gitignore', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gitignore')
   finish
 endif
 
diff --git a/syntax/gitolite.vim b/syntax/gitolite.vim
index 286fa1b4f..377d32b36 100644
--- a/syntax/gitolite.vim
+++ b/syntax/gitolite.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gitolite', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gitolite')
   finish
 endif
 
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index 344a92696..5a4ec9138 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/gitrebase.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/syntax/gitsendemail.vim b/syntax/gitsendemail.vim
index 41e0bec82..36205c37b 100644
--- a/syntax/gitsendemail.vim
+++ b/syntax/gitsendemail.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('git', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/syntax/gkrellmrc.vim b/syntax/gkrellmrc.vim
index 68ba85fb0..da1483af3 100644
--- a/syntax/gkrellmrc.vim
+++ b/syntax/gkrellmrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gkrellmrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gkrellmrc')
   finish
 endif
 
diff --git a/syntax/glsl.vim b/syntax/glsl.vim
index fa81f97a1..e911f6042 100644
--- a/syntax/glsl.vim
+++ b/syntax/glsl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('glsl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'glsl')
   finish
 endif
 
diff --git a/syntax/gmpl.vim b/syntax/gmpl.vim
index 0b410ee82..afcfc9f69 100644
--- a/syntax/gmpl.vim
+++ b/syntax/gmpl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gmpl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gmpl')
   finish
 endif
 
diff --git a/syntax/gnash.vim b/syntax/gnash.vim
index 6109254b4..72d3dac72 100644
--- a/syntax/gnash.vim
+++ b/syntax/gnash.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gnash', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gnash')
   finish
 endif
 
diff --git a/syntax/gnuplot.vim b/syntax/gnuplot.vim
index ae42ab8ac..66f4e0ec3 100644
--- a/syntax/gnuplot.vim
+++ b/syntax/gnuplot.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gnuplot', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gnuplot')
   finish
 endif
 
diff --git a/syntax/go.vim b/syntax/go.vim
index b28002ec5..249dcee73 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/godebugoutput.vim b/syntax/godebugoutput.vim
index e02d85236..973693ec4 100644
--- a/syntax/godebugoutput.vim
+++ b/syntax/godebugoutput.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/godebugstacktrace.vim b/syntax/godebugstacktrace.vim
index 0e25da3b1..d0f8ef3fb 100644
--- a/syntax/godebugstacktrace.vim
+++ b/syntax/godebugstacktrace.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/godebugvariables.vim b/syntax/godebugvariables.vim
index 1148a534c..53ae8f6b5 100644
--- a/syntax/godebugvariables.vim
+++ b/syntax/godebugvariables.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/godefstack.vim b/syntax/godefstack.vim
index c20dd5a7d..7fd734051 100644
--- a/syntax/godefstack.vim
+++ b/syntax/godefstack.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/gohtmltmpl.vim b/syntax/gohtmltmpl.vim
index 86d59daaa..ae3b3e995 100644
--- a/syntax/gohtmltmpl.vim
+++ b/syntax/gohtmltmpl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/gomod.vim b/syntax/gomod.vim
index 56790034a..be365be3f 100644
--- a/syntax/gomod.vim
+++ b/syntax/gomod.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/gotexttmpl.vim b/syntax/gotexttmpl.vim
index 6accca5f4..10867dc3c 100644
--- a/syntax/gotexttmpl.vim
+++ b/syntax/gotexttmpl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/gp.vim b/syntax/gp.vim
index b60abfd39..f870ed1f6 100644
--- a/syntax/gp.vim
+++ b/syntax/gp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gp')
   finish
 endif
 
diff --git a/syntax/gpg.vim b/syntax/gpg.vim
index f02d6f944..a9125e3d8 100644
--- a/syntax/gpg.vim
+++ b/syntax/gpg.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gpg', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gpg')
   finish
 endif
 
diff --git a/syntax/grads.vim b/syntax/grads.vim
index d733850e9..b0b406b0b 100644
--- a/syntax/grads.vim
+++ b/syntax/grads.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('grads', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'grads')
   finish
 endif
 
diff --git a/syntax/graphql.vim b/syntax/graphql.vim
index 58d7584a9..c47a8036c 100644
--- a/syntax/graphql.vim
+++ b/syntax/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/syntax/gretl.vim b/syntax/gretl.vim
index 43a41a37b..f7e098f07 100644
--- a/syntax/gretl.vim
+++ b/syntax/gretl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gretl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gretl')
   finish
 endif
 
diff --git a/syntax/groovy.vim b/syntax/groovy.vim
index bfa9ab4ce..e24d9fbb3 100644
--- a/syntax/groovy.vim
+++ b/syntax/groovy.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('groovy', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'groovy')
   finish
 endif
 
diff --git a/syntax/group.vim b/syntax/group.vim
index ca808bc80..144ec1266 100644
--- a/syntax/group.vim
+++ b/syntax/group.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('group', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'group')
   finish
 endif
 
diff --git a/syntax/grub.vim b/syntax/grub.vim
index ff980818a..ec70e514d 100644
--- a/syntax/grub.vim
+++ b/syntax/grub.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('grub', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'grub')
   finish
 endif
 
diff --git a/syntax/gsl.vim b/syntax/gsl.vim
index fa65bfc37..a83fbbe83 100644
--- a/syntax/gsl.vim
+++ b/syntax/gsl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gdscript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gdscript')
   finish
 endif
 
diff --git a/syntax/gsp.vim b/syntax/gsp.vim
index fd7d3848c..a8ca520a0 100644
--- a/syntax/gsp.vim
+++ b/syntax/gsp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gsp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gsp')
   finish
 endif
 
diff --git a/syntax/gtkrc.vim b/syntax/gtkrc.vim
index 4de03a65a..1ad0ef0a2 100644
--- a/syntax/gtkrc.vim
+++ b/syntax/gtkrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('gtkrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'gtkrc')
   finish
 endif
 
diff --git a/syntax/haml.vim b/syntax/haml.vim
index 5622da7dd..8cac3c6bc 100644
--- a/syntax/haml.vim
+++ b/syntax/haml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haml')
   finish
 endif
 
diff --git a/syntax/hamster.vim b/syntax/hamster.vim
index 956e0acae..14ee8eb42 100644
--- a/syntax/hamster.vim
+++ b/syntax/hamster.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hamster', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hamster')
   finish
 endif
 
diff --git a/syntax/handlebars.vim b/syntax/handlebars.vim
index e16e9a044..c56a9aa4f 100644
--- a/syntax/handlebars.vim
+++ b/syntax/handlebars.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'handlebars')
   finish
 endif
 
diff --git a/syntax/haproxy.vim b/syntax/haproxy.vim
index 4871305ed..41cdc8606 100644
--- a/syntax/haproxy.vim
+++ b/syntax/haproxy.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haproxy', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haproxy')
   finish
 endif
 
diff --git a/syntax/haskell.vim b/syntax/haskell.vim
index 0171244b1..786eb3c6f 100644
--- a/syntax/haskell.vim
+++ b/syntax/haskell.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/syntax/haste.vim b/syntax/haste.vim
index 581c7b121..0133f29a1 100644
--- a/syntax/haste.vim
+++ b/syntax/haste.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haste', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haste')
   finish
 endif
 
diff --git a/syntax/hastepreproc.vim b/syntax/hastepreproc.vim
index 7d599defb..61631aaf8 100644
--- a/syntax/hastepreproc.vim
+++ b/syntax/hastepreproc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hastepreproc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hastepreproc')
   finish
 endif
 
diff --git a/syntax/haxe.vim b/syntax/haxe.vim
index 9e12de94c..a78271a51 100644
--- a/syntax/haxe.vim
+++ b/syntax/haxe.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haxe', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haxe')
   finish
 endif
 
diff --git a/syntax/hb.vim b/syntax/hb.vim
index ffc392aa5..81bb1b043 100644
--- a/syntax/hb.vim
+++ b/syntax/hb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hb', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hb')
   finish
 endif
 
diff --git a/syntax/hcl.vim b/syntax/hcl.vim
index ed2cef864..3dde1b54c 100644
--- a/syntax/hcl.vim
+++ b/syntax/hcl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hcl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hcl')
   finish
 endif
 
diff --git a/syntax/helm.vim b/syntax/helm.vim
index 6182cbd8e..4cafa0092 100644
--- a/syntax/helm.vim
+++ b/syntax/helm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('helm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'helm')
   finish
 endif
 
diff --git a/syntax/help.vim b/syntax/help.vim
index 7bc7dac04..e5e618dc9 100644
--- a/syntax/help.vim
+++ b/syntax/help.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('help', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'help')
   finish
 endif
 
diff --git a/syntax/hercules.vim b/syntax/hercules.vim
index e3f429d1d..1588de8bc 100644
--- a/syntax/hercules.vim
+++ b/syntax/hercules.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hercules', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hercules')
   finish
 endif
 
diff --git a/syntax/hex.vim b/syntax/hex.vim
index d1d753a63..36b3bbdd3 100644
--- a/syntax/hex.vim
+++ b/syntax/hex.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hex', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hex')
   finish
 endif
 
diff --git a/syntax/hgcommit.vim b/syntax/hgcommit.vim
index 1326ef3be..f294b0865 100644
--- a/syntax/hgcommit.vim
+++ b/syntax/hgcommit.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hgcommit', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hgcommit')
   finish
 endif
 
diff --git a/syntax/hive.vim b/syntax/hive.vim
index c03321d76..85fd8cb88 100644
--- a/syntax/hive.vim
+++ b/syntax/hive.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hive', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hive')
   finish
 endif
 
diff --git a/syntax/hog.vim b/syntax/hog.vim
index 96540cfa8..4a44d6eb9 100644
--- a/syntax/hog.vim
+++ b/syntax/hog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hog')
   finish
 endif
 
diff --git a/syntax/hollywood.vim b/syntax/hollywood.vim
index 0ba407dad..291291f48 100644
--- a/syntax/hollywood.vim
+++ b/syntax/hollywood.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hollywood', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hollywood')
   finish
 endif
 
diff --git a/syntax/hostconf.vim b/syntax/hostconf.vim
index bf740b64f..01ed2fae1 100644
--- a/syntax/hostconf.vim
+++ b/syntax/hostconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hostconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hostconf')
   finish
 endif
 
diff --git a/syntax/hostsaccess.vim b/syntax/hostsaccess.vim
index 9e905ff9a..91aa131a9 100644
--- a/syntax/hostsaccess.vim
+++ b/syntax/hostsaccess.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('hostsaccess', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'hostsaccess')
   finish
 endif
 
diff --git a/syntax/html.vim b/syntax/html.vim
index 23d334467..ed3b61f15 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html')
   finish
 endif
 
diff --git a/syntax/htmldjango.vim b/syntax/htmldjango.vim
index cd7e46607..c29c081e0 100644
--- a/syntax/htmldjango.vim
+++ b/syntax/htmldjango.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('htmldjango', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'htmldjango')
   finish
 endif
 
diff --git a/syntax/htmlm4.vim b/syntax/htmlm4.vim
index 6294526fd..415f74569 100644
--- a/syntax/htmlm4.vim
+++ b/syntax/htmlm4.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('htmlm4', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'htmlm4')
   finish
 endif
 
diff --git a/syntax/i3config.vim b/syntax/i3config.vim
index c1c78ebb0..3fee98609 100644
--- a/syntax/i3config.vim
+++ b/syntax/i3config.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('i3', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'i3')
   finish
 endif
 
diff --git a/syntax/ibasic.vim b/syntax/ibasic.vim
index d80f9caa2..4e8dc07c2 100644
--- a/syntax/ibasic.vim
+++ b/syntax/ibasic.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ibasic', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ibasic')
   finish
 endif
 
diff --git a/syntax/icalendar.vim b/syntax/icalendar.vim
index 7815de41c..3792a7131 100644
--- a/syntax/icalendar.vim
+++ b/syntax/icalendar.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('icalendar', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'icalendar')
   finish
 endif
 
diff --git a/syntax/icemenu.vim b/syntax/icemenu.vim
index 928e5c179..8c61c8b77 100644
--- a/syntax/icemenu.vim
+++ b/syntax/icemenu.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('icemenu', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'icemenu')
   finish
 endif
 
diff --git a/syntax/icon.vim b/syntax/icon.vim
index 4f538f3d2..ff2c11daa 100644
--- a/syntax/icon.vim
+++ b/syntax/icon.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('icon', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'icon')
   finish
 endif
 
diff --git a/syntax/idris.vim b/syntax/idris.vim
index 2b6293a6c..b0b04850c 100644
--- a/syntax/idris.vim
+++ b/syntax/idris.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/syntax/idris2.vim b/syntax/idris2.vim
index cf6babd96..db1f6ea75 100644
--- a/syntax/idris2.vim
+++ b/syntax/idris2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/syntax/indent.vim b/syntax/indent.vim
index d01a007c0..7a4d5e91c 100644
--- a/syntax/indent.vim
+++ b/syntax/indent.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('indent', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'indent')
   finish
 endif
 
diff --git a/syntax/inform.vim b/syntax/inform.vim
index 29e3f80ff..2345e18bd 100644
--- a/syntax/inform.vim
+++ b/syntax/inform.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('inform', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'inform')
   finish
 endif
 
diff --git a/syntax/initng.vim b/syntax/initng.vim
index 4950ace9b..99541758e 100644
--- a/syntax/initng.vim
+++ b/syntax/initng.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('initng', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'initng')
   finish
 endif
 
diff --git a/syntax/inittab.vim b/syntax/inittab.vim
index a024d4a2f..72348a2f1 100644
--- a/syntax/inittab.vim
+++ b/syntax/inittab.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('inittab', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'inittab')
   finish
 endif
 
diff --git a/syntax/ion.vim b/syntax/ion.vim
index 0f1f82f16..2b2706082 100644
--- a/syntax/ion.vim
+++ b/syntax/ion.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ion', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ion')
   finish
 endif
 
diff --git a/syntax/ipfilter.vim b/syntax/ipfilter.vim
index a5db250ae..7882eac6a 100644
--- a/syntax/ipfilter.vim
+++ b/syntax/ipfilter.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ipfilter', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ipfilter')
   finish
 endif
 
diff --git a/syntax/iss.vim b/syntax/iss.vim
index a1051986e..d709bc2f1 100644
--- a/syntax/iss.vim
+++ b/syntax/iss.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('iss', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'iss')
   finish
 endif
 
diff --git a/syntax/ist.vim b/syntax/ist.vim
index f6a2da1fb..433fcea70 100644
--- a/syntax/ist.vim
+++ b/syntax/ist.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ist', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ist')
   finish
 endif
 
diff --git a/syntax/j.vim b/syntax/j.vim
index 79478af87..074555539 100644
--- a/syntax/j.vim
+++ b/syntax/j.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('j', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'j')
   finish
 endif
 
diff --git a/syntax/jal.vim b/syntax/jal.vim
index 26600dd35..efb2d4364 100644
--- a/syntax/jal.vim
+++ b/syntax/jal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jal')
   finish
 endif
 
diff --git a/syntax/jam.vim b/syntax/jam.vim
index 94dd8ca1c..33532601c 100644
--- a/syntax/jam.vim
+++ b/syntax/jam.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jam', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jam')
   finish
 endif
 
diff --git a/syntax/java.vim b/syntax/java.vim
index 5ca7e1056..bef8f40e2 100644
--- a/syntax/java.vim
+++ b/syntax/java.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('java', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'java')
   finish
 endif
 
diff --git a/syntax/javacc.vim b/syntax/javacc.vim
index 2ffc3e93e..83e344868 100644
--- a/syntax/javacc.vim
+++ b/syntax/javacc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('javacc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'javacc')
   finish
 endif
 
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 65b351a97..823eec2ec 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/syntax/jess.vim b/syntax/jess.vim
index 8897782a2..8f14dff63 100644
--- a/syntax/jess.vim
+++ b/syntax/jess.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jess', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jess')
   finish
 endif
 
diff --git a/syntax/jgraph.vim b/syntax/jgraph.vim
index e27f40b59..32ec93520 100644
--- a/syntax/jgraph.vim
+++ b/syntax/jgraph.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jgraph', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jgraph')
   finish
 endif
 
diff --git a/syntax/jinja2.vim b/syntax/jinja2.vim
index ccecd45c2..f7ca3ad4a 100644
--- a/syntax/jinja2.vim
+++ b/syntax/jinja2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ansible', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ansible')
   finish
 endif
 
diff --git a/syntax/jovial.vim b/syntax/jovial.vim
index 7b34dea08..745473011 100644
--- a/syntax/jovial.vim
+++ b/syntax/jovial.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jovial', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jovial')
   finish
 endif
 
diff --git a/syntax/jproperties.vim b/syntax/jproperties.vim
index 1b28bc00a..f4edfd93d 100644
--- a/syntax/jproperties.vim
+++ b/syntax/jproperties.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jproperties', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jproperties')
   finish
 endif
 
diff --git a/syntax/jq.vim b/syntax/jq.vim
index 11ec862e9..1597620cb 100644
--- a/syntax/jq.vim
+++ b/syntax/jq.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jq', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jq')
   finish
 endif
 
diff --git a/syntax/json.vim b/syntax/json.vim
index e6395acab..5f988ca82 100644
--- a/syntax/json.vim
+++ b/syntax/json.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('json', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'json')
   finish
 endif
 
diff --git a/syntax/json5.vim b/syntax/json5.vim
index def6b7477..a64982682 100644
--- a/syntax/json5.vim
+++ b/syntax/json5.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('json5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'json5')
   finish
 endif
 
diff --git a/syntax/jsonnet.vim b/syntax/jsonnet.vim
index c2aa40cc3..54dfa2d79 100644
--- a/syntax/jsonnet.vim
+++ b/syntax/jsonnet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsonnet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsonnet')
   finish
 endif
 
diff --git a/syntax/jsp.vim b/syntax/jsp.vim
index 49436c2f1..221b7a70d 100644
--- a/syntax/jsp.vim
+++ b/syntax/jsp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsp')
   finish
 endif
 
diff --git a/syntax/jst.vim b/syntax/jst.vim
index ce4f1f0bd..907b30316 100644
--- a/syntax/jst.vim
+++ b/syntax/jst.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jst', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jst')
   finish
 endif
 
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 0cbe23ec0..1d0c805b5 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/syntax/juliadoc.vim b/syntax/juliadoc.vim
index 5e2a32e37..29c9e317a 100644
--- a/syntax/juliadoc.vim
+++ b/syntax/juliadoc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('julia', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/syntax/kconfig.vim b/syntax/kconfig.vim
index 9780aacd7..933d32f82 100644
--- a/syntax/kconfig.vim
+++ b/syntax/kconfig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('kconfig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'kconfig')
   finish
 endif
 
diff --git a/syntax/kivy.vim b/syntax/kivy.vim
index 998f36928..808f6c84b 100644
--- a/syntax/kivy.vim
+++ b/syntax/kivy.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('kivy', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'kivy')
   finish
 endif
 
diff --git a/syntax/kix.vim b/syntax/kix.vim
index 182a3cb7f..50d135c99 100644
--- a/syntax/kix.vim
+++ b/syntax/kix.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('kix', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'kix')
   finish
 endif
 
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index 268c97686..51f3a4033 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('kotlin', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'kotlin')
   finish
 endif
 
diff --git a/syntax/kscript.vim b/syntax/kscript.vim
index d460e1520..8228cc201 100644
--- a/syntax/kscript.vim
+++ b/syntax/kscript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('kscript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'kscript')
   finish
 endif
 
diff --git a/syntax/kwt.vim b/syntax/kwt.vim
index 7e8951599..116c2fa03 100644
--- a/syntax/kwt.vim
+++ b/syntax/kwt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('kwt', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'kwt')
   finish
 endif
 
diff --git a/syntax/lace.vim b/syntax/lace.vim
index 87b35e6c7..e42693d0c 100644
--- a/syntax/lace.vim
+++ b/syntax/lace.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lace', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lace')
   finish
 endif
 
diff --git a/syntax/latte.vim b/syntax/latte.vim
index ee4e34cd8..55708431e 100644
--- a/syntax/latte.vim
+++ b/syntax/latte.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('latte', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'latte')
   finish
 endif
 
diff --git a/syntax/ld.vim b/syntax/ld.vim
index b52936916..37cb698e9 100644
--- a/syntax/ld.vim
+++ b/syntax/ld.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ld', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ld')
   finish
 endif
 
diff --git a/syntax/ldif.vim b/syntax/ldif.vim
index c5177febf..01ee2cd57 100644
--- a/syntax/ldif.vim
+++ b/syntax/ldif.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ldif', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ldif')
   finish
 endif
 
diff --git a/syntax/ledger.vim b/syntax/ledger.vim
index 9f5230097..d3758d84a 100644
--- a/syntax/ledger.vim
+++ b/syntax/ledger.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ledger', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ledger')
   finish
 endif
 
diff --git a/syntax/less.vim b/syntax/less.vim
index a7224eaa4..daa829498 100644
--- a/syntax/less.vim
+++ b/syntax/less.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('less', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'less')
   finish
 endif
 
diff --git a/syntax/lex.vim b/syntax/lex.vim
index 517dc247c..ebeb6f126 100644
--- a/syntax/lex.vim
+++ b/syntax/lex.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lex', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lex')
   finish
 endif
 
diff --git a/syntax/lftp.vim b/syntax/lftp.vim
index 92711ff52..29e35ada9 100644
--- a/syntax/lftp.vim
+++ b/syntax/lftp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lftp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lftp')
   finish
 endif
 
diff --git a/syntax/lhaskell.vim b/syntax/lhaskell.vim
index 19319c19b..2db773e69 100644
--- a/syntax/lhaskell.vim
+++ b/syntax/lhaskell.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lhaskell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lhaskell')
   finish
 endif
 
diff --git a/syntax/libao.vim b/syntax/libao.vim
index f41a9cf0e..d5dce92e9 100644
--- a/syntax/libao.vim
+++ b/syntax/libao.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('libao', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'libao')
   finish
 endif
 
diff --git a/syntax/lidris.vim b/syntax/lidris.vim
index 612b52e11..8396c699b 100644
--- a/syntax/lidris.vim
+++ b/syntax/lidris.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/syntax/lidris2.vim b/syntax/lidris2.vim
index 7b9b1a9c3..ba83b3b21 100644
--- a/syntax/lidris2.vim
+++ b/syntax/lidris2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/syntax/lifelines.vim b/syntax/lifelines.vim
index f7f50e092..d6cc7b3dc 100644
--- a/syntax/lifelines.vim
+++ b/syntax/lifelines.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lifelines', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lifelines')
   finish
 endif
 
diff --git a/syntax/lilo.vim b/syntax/lilo.vim
index 92d73e9db..c3fbe021e 100644
--- a/syntax/lilo.vim
+++ b/syntax/lilo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lilo', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lilo')
   finish
 endif
 
diff --git a/syntax/lilypond-words.vim b/syntax/lilypond-words.vim
index 292dac271..5376893d8 100644
--- a/syntax/lilypond-words.vim
+++ b/syntax/lilypond-words.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lilypond', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lilypond')
   finish
 endif
 
diff --git a/syntax/lilypond.vim b/syntax/lilypond.vim
index b0792abf6..8bc2d63b6 100644
--- a/syntax/lilypond.vim
+++ b/syntax/lilypond.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lilypond', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lilypond')
   finish
 endif
 
diff --git a/syntax/limits.vim b/syntax/limits.vim
index b1057fb78..31bda9ee8 100644
--- a/syntax/limits.vim
+++ b/syntax/limits.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('limits', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'limits')
   finish
 endif
 
diff --git a/syntax/liquid.vim b/syntax/liquid.vim
index ad738fb56..34d1971d9 100644
--- a/syntax/liquid.vim
+++ b/syntax/liquid.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('liquid', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'liquid')
   finish
 endif
 
diff --git a/syntax/lisp.vim b/syntax/lisp.vim
index 501bd6551..0ca370c97 100644
--- a/syntax/lisp.vim
+++ b/syntax/lisp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lisp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lisp')
   finish
 endif
 
diff --git a/syntax/litcoffee.vim b/syntax/litcoffee.vim
index 6ddfce8ad..3295ad71f 100644
--- a/syntax/litcoffee.vim
+++ b/syntax/litcoffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('coffee-script', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/syntax/lite.vim b/syntax/lite.vim
index 73664c67f..0a6f3f3cf 100644
--- a/syntax/lite.vim
+++ b/syntax/lite.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lite', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lite')
   finish
 endif
 
diff --git a/syntax/litestep.vim b/syntax/litestep.vim
index eedf27305..f456f4c2a 100644
--- a/syntax/litestep.vim
+++ b/syntax/litestep.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('litestep', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'litestep')
   finish
 endif
 
diff --git a/syntax/llvm.vim b/syntax/llvm.vim
index d98c255de..9c111c6e2 100644
--- a/syntax/llvm.vim
+++ b/syntax/llvm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/syntax/log.vim b/syntax/log.vim
index 8c5b5ec25..e045d715c 100644
--- a/syntax/log.vim
+++ b/syntax/log.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('log', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'log')
   finish
 endif
 
diff --git a/syntax/loginaccess.vim b/syntax/loginaccess.vim
index 6dc8d6a9d..4ec1ddeb0 100644
--- a/syntax/loginaccess.vim
+++ b/syntax/loginaccess.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('loginaccess', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'loginaccess')
   finish
 endif
 
diff --git a/syntax/logindefs.vim b/syntax/logindefs.vim
index 9773f12d1..a7809ed09 100644
--- a/syntax/logindefs.vim
+++ b/syntax/logindefs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('logindefs', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'logindefs')
   finish
 endif
 
diff --git a/syntax/logtalk.vim b/syntax/logtalk.vim
index 48c6621ab..1bca4267d 100644
--- a/syntax/logtalk.vim
+++ b/syntax/logtalk.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('logtalk', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'logtalk')
   finish
 endif
 
diff --git a/syntax/lotos.vim b/syntax/lotos.vim
index e66f14428..e719cb4bf 100644
--- a/syntax/lotos.vim
+++ b/syntax/lotos.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lotos', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lotos')
   finish
 endif
 
diff --git a/syntax/lout.vim b/syntax/lout.vim
index 9d7c28a91..6376bef91 100644
--- a/syntax/lout.vim
+++ b/syntax/lout.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lout', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lout')
   finish
 endif
 
diff --git a/syntax/lpc.vim b/syntax/lpc.vim
index de5bc3c74..53dbffffc 100644
--- a/syntax/lpc.vim
+++ b/syntax/lpc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lpc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lpc')
   finish
 endif
 
diff --git a/syntax/lprolog.vim b/syntax/lprolog.vim
index c8454ca6a..2c52f60e5 100644
--- a/syntax/lprolog.vim
+++ b/syntax/lprolog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lprolog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lprolog')
   finish
 endif
 
diff --git a/syntax/ls.vim b/syntax/ls.vim
index 770554512..489efc718 100644
--- a/syntax/ls.vim
+++ b/syntax/ls.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('livescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'livescript')
   finish
 endif
 
diff --git a/syntax/lsl.vim b/syntax/lsl.vim
index bede1c1e4..d4f6e6f83 100644
--- a/syntax/lsl.vim
+++ b/syntax/lsl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lsl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lsl')
   finish
 endif
 
diff --git a/syntax/lss.vim b/syntax/lss.vim
index ce3a8c8eb..8b5dab6ab 100644
--- a/syntax/lss.vim
+++ b/syntax/lss.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lss', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lss')
   finish
 endif
 
diff --git a/syntax/lua.vim b/syntax/lua.vim
index a88cda514..fb8412b95 100644
--- a/syntax/lua.vim
+++ b/syntax/lua.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lua', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lua')
   finish
 endif
 
diff --git a/syntax/lynx.vim b/syntax/lynx.vim
index 3f8193193..f6d3159e5 100644
--- a/syntax/lynx.vim
+++ b/syntax/lynx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('lynx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'lynx')
   finish
 endif
 
diff --git a/syntax/m4.vim b/syntax/m4.vim
index 9c872bb26..c015eeb8b 100644
--- a/syntax/m4.vim
+++ b/syntax/m4.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('m4', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'm4')
   finish
 endif
 
diff --git a/syntax/mail.vim b/syntax/mail.vim
index ff2bb7977..08bd20980 100644
--- a/syntax/mail.vim
+++ b/syntax/mail.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mail', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mail')
   finish
 endif
 
diff --git a/syntax/mailaliases.vim b/syntax/mailaliases.vim
index 337eaceaa..b67f6771d 100644
--- a/syntax/mailaliases.vim
+++ b/syntax/mailaliases.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mailaliases', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mailaliases')
   finish
 endif
 
diff --git a/syntax/mailcap.vim b/syntax/mailcap.vim
index 1af4e0b99..cb197f8c7 100644
--- a/syntax/mailcap.vim
+++ b/syntax/mailcap.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mailcap', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mailcap')
   finish
 endif
 
diff --git a/syntax/make.vim b/syntax/make.vim
index b1e882741..b096cc525 100644
--- a/syntax/make.vim
+++ b/syntax/make.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('make', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'make')
   finish
 endif
 
diff --git a/syntax/mako.vim b/syntax/mako.vim
index f1c75b872..a232f52a1 100644
--- a/syntax/mako.vim
+++ b/syntax/mako.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mako', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mako')
   finish
 endif
 
diff --git a/syntax/mallard.vim b/syntax/mallard.vim
index bb4a789ea..b21148866 100644
--- a/syntax/mallard.vim
+++ b/syntax/mallard.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mallard', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mallard')
   finish
 endif
 
diff --git a/syntax/manconf.vim b/syntax/manconf.vim
index d578fa6ad..4dbee625c 100644
--- a/syntax/manconf.vim
+++ b/syntax/manconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('manconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'manconf')
   finish
 endif
 
diff --git a/syntax/maple.vim b/syntax/maple.vim
index 5d72a609a..71508463a 100644
--- a/syntax/maple.vim
+++ b/syntax/maple.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('maple', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'maple')
   finish
 endif
 
diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index de27f7ab0..56e349e46 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('markdown', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'markdown')
   finish
 endif
 
diff --git a/syntax/mason.vim b/syntax/mason.vim
index 8af033aca..afbe3389e 100644
--- a/syntax/mason.vim
+++ b/syntax/mason.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/master.vim b/syntax/master.vim
index 304c45a76..db51765e4 100644
--- a/syntax/master.vim
+++ b/syntax/master.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('master', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'master')
   finish
 endif
 
diff --git a/syntax/mel.vim b/syntax/mel.vim
index 88d2bd6ca..02821a5d9 100644
--- a/syntax/mel.vim
+++ b/syntax/mel.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mel', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mel')
   finish
 endif
 
diff --git a/syntax/merlin.vim b/syntax/merlin.vim
index 995947046..4c6b9cd24 100644
--- a/syntax/merlin.vim
+++ b/syntax/merlin.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('reason', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'reason')
   finish
 endif
 
diff --git a/syntax/meson.vim b/syntax/meson.vim
index 9f3e2a421..0ad43cc13 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('meson', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'meson')
   finish
 endif
 
diff --git a/syntax/messages.vim b/syntax/messages.vim
index 3a9f060cb..fc11c54da 100644
--- a/syntax/messages.vim
+++ b/syntax/messages.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('messages', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'messages')
   finish
 endif
 
diff --git a/syntax/mf.vim b/syntax/mf.vim
index 879605568..08115912e 100644
--- a/syntax/mf.vim
+++ b/syntax/mf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mf')
   finish
 endif
 
diff --git a/syntax/mgl.vim b/syntax/mgl.vim
index 21eb16c67..e8ee3fe61 100644
--- a/syntax/mgl.vim
+++ b/syntax/mgl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mgl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mgl')
   finish
 endif
 
diff --git a/syntax/mgp.vim b/syntax/mgp.vim
index dbcc965c3..d9e5ced1b 100644
--- a/syntax/mgp.vim
+++ b/syntax/mgp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mgp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mgp')
   finish
 endif
 
diff --git a/syntax/mib.vim b/syntax/mib.vim
index 67ca47bf9..ed0155fe4 100644
--- a/syntax/mib.vim
+++ b/syntax/mib.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mib', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mib')
   finish
 endif
 
diff --git a/syntax/mix.vim b/syntax/mix.vim
index 1b14d6a54..b28f9dbe8 100644
--- a/syntax/mix.vim
+++ b/syntax/mix.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mix', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mix')
   finish
 endif
 
diff --git a/syntax/mma.vim b/syntax/mma.vim
index c9c0f6ee4..663ca18bd 100644
--- a/syntax/mma.vim
+++ b/syntax/mma.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mathematica', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mathematica')
   finish
 endif
 
diff --git a/syntax/mmp.vim b/syntax/mmp.vim
index 55e946e4e..1ea49fa58 100644
--- a/syntax/mmp.vim
+++ b/syntax/mmp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mmp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mmp')
   finish
 endif
 
diff --git a/syntax/modconf.vim b/syntax/modconf.vim
index dcf1ffa73..fd9f0da87 100644
--- a/syntax/modconf.vim
+++ b/syntax/modconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('modconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'modconf')
   finish
 endif
 
diff --git a/syntax/modula2.vim b/syntax/modula2.vim
index 9a6d3d72c..dd3111e75 100644
--- a/syntax/modula2.vim
+++ b/syntax/modula2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('modula2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'modula2')
   finish
 endif
 
diff --git a/syntax/modula3.vim b/syntax/modula3.vim
index d27fb0e27..370252931 100644
--- a/syntax/modula3.vim
+++ b/syntax/modula3.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('modula3', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'modula3')
   finish
 endif
 
diff --git a/syntax/monk.vim b/syntax/monk.vim
index ebea4a3d3..3c598dded 100644
--- a/syntax/monk.vim
+++ b/syntax/monk.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('monk', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'monk')
   finish
 endif
 
diff --git a/syntax/moo.vim b/syntax/moo.vim
index 20461bf25..c14d4fa5c 100644
--- a/syntax/moo.vim
+++ b/syntax/moo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('moo', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'moo')
   finish
 endif
 
diff --git a/syntax/moon.vim b/syntax/moon.vim
index d75034824..329a283a0 100644
--- a/syntax/moon.vim
+++ b/syntax/moon.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('moonscript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'moonscript')
   finish
 endif
 
diff --git a/syntax/mp.vim b/syntax/mp.vim
index 95564a11e..4e915cc65 100644
--- a/syntax/mp.vim
+++ b/syntax/mp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mp')
   finish
 endif
 
diff --git a/syntax/mplayerconf.vim b/syntax/mplayerconf.vim
index 6d8ca035c..d97b01557 100644
--- a/syntax/mplayerconf.vim
+++ b/syntax/mplayerconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mplayerconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mplayerconf')
   finish
 endif
 
diff --git a/syntax/mrxvtrc.vim b/syntax/mrxvtrc.vim
index 61d773ae6..592d5c771 100644
--- a/syntax/mrxvtrc.vim
+++ b/syntax/mrxvtrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mrxvtrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mrxvtrc')
   finish
 endif
 
diff --git a/syntax/msidl.vim b/syntax/msidl.vim
index 1734105e3..a86f271f5 100644
--- a/syntax/msidl.vim
+++ b/syntax/msidl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('msidl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'msidl')
   finish
 endif
 
diff --git a/syntax/msql.vim b/syntax/msql.vim
index b8f058e5b..43e19921a 100644
--- a/syntax/msql.vim
+++ b/syntax/msql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('msql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'msql')
   finish
 endif
 
diff --git a/syntax/mupad.vim b/syntax/mupad.vim
index 924d0806d..07dc80aa4 100644
--- a/syntax/mupad.vim
+++ b/syntax/mupad.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mupad', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mupad')
   finish
 endif
 
diff --git a/syntax/murphi.vim b/syntax/murphi.vim
index ab38abf46..667877967 100644
--- a/syntax/murphi.vim
+++ b/syntax/murphi.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('murphi', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'murphi')
   finish
 endif
 
diff --git a/syntax/mush.vim b/syntax/mush.vim
index 329cb5c30..dce86542e 100644
--- a/syntax/mush.vim
+++ b/syntax/mush.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mush', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mush')
   finish
 endif
 
diff --git a/syntax/mustache.vim b/syntax/mustache.vim
index ece71e3cc..3f0db4191 100644
--- a/syntax/mustache.vim
+++ b/syntax/mustache.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('handlebars', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'handlebars')
   finish
 endif
 
diff --git a/syntax/muttrc.vim b/syntax/muttrc.vim
index c7c863dd0..62991e530 100644
--- a/syntax/muttrc.vim
+++ b/syntax/muttrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('muttrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'muttrc')
   finish
 endif
 
diff --git a/syntax/mysql.vim b/syntax/mysql.vim
index a90e89201..8012997b3 100644
--- a/syntax/mysql.vim
+++ b/syntax/mysql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mysql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mysql')
   finish
 endif
 
diff --git a/syntax/n1ql.vim b/syntax/n1ql.vim
index b2133f27c..a007475fa 100644
--- a/syntax/n1ql.vim
+++ b/syntax/n1ql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('n1ql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'n1ql')
   finish
 endif
 
diff --git a/syntax/named.vim b/syntax/named.vim
index f3997ee73..b8684bde1 100644
--- a/syntax/named.vim
+++ b/syntax/named.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('named', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'named')
   finish
 endif
 
diff --git a/syntax/nanorc.vim b/syntax/nanorc.vim
index fa68d216c..57d8d2829 100644
--- a/syntax/nanorc.vim
+++ b/syntax/nanorc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nanorc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nanorc')
   finish
 endif
 
diff --git a/syntax/natural.vim b/syntax/natural.vim
index b58c22f29..bb9093ff4 100644
--- a/syntax/natural.vim
+++ b/syntax/natural.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('natural', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'natural')
   finish
 endif
 
diff --git a/syntax/ncf.vim b/syntax/ncf.vim
index a4552f6f0..832545997 100644
--- a/syntax/ncf.vim
+++ b/syntax/ncf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ncf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ncf')
   finish
 endif
 
diff --git a/syntax/neomuttrc.vim b/syntax/neomuttrc.vim
index afac90fc6..a43fb35b5 100644
--- a/syntax/neomuttrc.vim
+++ b/syntax/neomuttrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('neomuttrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'neomuttrc')
   finish
 endif
 
diff --git a/syntax/netrc.vim b/syntax/netrc.vim
index 05ecbc0ac..58e142589 100644
--- a/syntax/netrc.vim
+++ b/syntax/netrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('netrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'netrc')
   finish
 endif
 
diff --git a/syntax/nginx.vim b/syntax/nginx.vim
index 565fe7760..fc2ec5ca3 100644
--- a/syntax/nginx.vim
+++ b/syntax/nginx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nginx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nginx')
   finish
 endif
 
diff --git a/syntax/nim.vim b/syntax/nim.vim
index 0ab2c10b5..41b943cc5 100644
--- a/syntax/nim.vim
+++ b/syntax/nim.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nim', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nim')
   finish
 endif
 
diff --git a/syntax/ninja.vim b/syntax/ninja.vim
index 77423ce7a..5a5717fd0 100644
--- a/syntax/ninja.vim
+++ b/syntax/ninja.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ninja', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ninja')
   finish
 endif
 
diff --git a/syntax/nix.vim b/syntax/nix.vim
index 1d4ba43d8..66f88199f 100644
--- a/syntax/nix.vim
+++ b/syntax/nix.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nix', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nix')
   finish
 endif
 
diff --git a/syntax/nqc.vim b/syntax/nqc.vim
index 7d7c88469..c5fd12b32 100644
--- a/syntax/nqc.vim
+++ b/syntax/nqc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nqc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nqc')
   finish
 endif
 
diff --git a/syntax/nroff.vim b/syntax/nroff.vim
index f99eff57e..915d6a232 100644
--- a/syntax/nroff.vim
+++ b/syntax/nroff.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nroff', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nroff')
   finish
 endif
 
diff --git a/syntax/nsis.vim b/syntax/nsis.vim
index 01c90244c..b930ae3c3 100644
--- a/syntax/nsis.vim
+++ b/syntax/nsis.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('nsis', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'nsis')
   finish
 endif
 
diff --git a/syntax/oasis.vim b/syntax/oasis.vim
index 0acafa835..3008d4899 100644
--- a/syntax/oasis.vim
+++ b/syntax/oasis.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/obj.vim b/syntax/obj.vim
index 3c36958e9..5a9d0a298 100644
--- a/syntax/obj.vim
+++ b/syntax/obj.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('obj', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'obj')
   finish
 endif
 
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index 8cf6fb67e..bfe6e1e3f 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/ocamlbuild_tags.vim b/syntax/ocamlbuild_tags.vim
index d814c5267..d1f968c19 100644
--- a/syntax/ocamlbuild_tags.vim
+++ b/syntax/ocamlbuild_tags.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/occam.vim b/syntax/occam.vim
index 11c715eb5..f86a17c9e 100644
--- a/syntax/occam.vim
+++ b/syntax/occam.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('occam', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'occam')
   finish
 endif
 
diff --git a/syntax/ocpbuild.vim b/syntax/ocpbuild.vim
index ac30f6b3e..c6df2b2b0 100644
--- a/syntax/ocpbuild.vim
+++ b/syntax/ocpbuild.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/ocpbuildroot.vim b/syntax/ocpbuildroot.vim
index 58a7dfa15..163790574 100644
--- a/syntax/ocpbuildroot.vim
+++ b/syntax/ocpbuildroot.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/octave.vim b/syntax/octave.vim
index d92377a85..889f45a69 100644
--- a/syntax/octave.vim
+++ b/syntax/octave.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('octave', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'octave')
   finish
 endif
 
diff --git a/syntax/odin.vim b/syntax/odin.vim
index 5600f7a44..d401c2e63 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('odin', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'odin')
   finish
 endif
 
diff --git a/syntax/omake.vim b/syntax/omake.vim
index fb0f9a19d..c3225b0a7 100644
--- a/syntax/omake.vim
+++ b/syntax/omake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/omnimark.vim b/syntax/omnimark.vim
index a27c20072..73668e810 100644
--- a/syntax/omnimark.vim
+++ b/syntax/omnimark.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('omnimark', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'omnimark')
   finish
 endif
 
diff --git a/syntax/opam.vim b/syntax/opam.vim
index 338d77be8..0f9a448bd 100644
--- a/syntax/opam.vim
+++ b/syntax/opam.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/opencl.vim b/syntax/opencl.vim
index db5cca84e..0aff1fc6a 100644
--- a/syntax/opencl.vim
+++ b/syntax/opencl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('opencl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'opencl')
   finish
 endif
 
diff --git a/syntax/openroad.vim b/syntax/openroad.vim
index af0927037..3fded9239 100644
--- a/syntax/openroad.vim
+++ b/syntax/openroad.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('openroad', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'openroad')
   finish
 endif
 
diff --git a/syntax/opl.vim b/syntax/opl.vim
index 1ba40a2ec..e177ff34d 100644
--- a/syntax/opl.vim
+++ b/syntax/opl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('opl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'opl')
   finish
 endif
 
diff --git a/syntax/ora.vim b/syntax/ora.vim
index 96d91a306..ff465a6d8 100644
--- a/syntax/ora.vim
+++ b/syntax/ora.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ora', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ora')
   finish
 endif
 
diff --git a/syntax/pamconf.vim b/syntax/pamconf.vim
index 66c7d74f4..de31e7814 100644
--- a/syntax/pamconf.vim
+++ b/syntax/pamconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pamconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pamconf')
   finish
 endif
 
diff --git a/syntax/pamenv.vim b/syntax/pamenv.vim
index 75a0c4eb1..c5af0cc10 100644
--- a/syntax/pamenv.vim
+++ b/syntax/pamenv.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pamenv', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pamenv')
   finish
 endif
 
diff --git a/syntax/papp.vim b/syntax/papp.vim
index d07ca3e49..4d12eb2c9 100644
--- a/syntax/papp.vim
+++ b/syntax/papp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('papp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'papp')
   finish
 endif
 
diff --git a/syntax/pascal.vim b/syntax/pascal.vim
index 76344e18d..783116d73 100644
--- a/syntax/pascal.vim
+++ b/syntax/pascal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pascal', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pascal')
   finish
 endif
 
diff --git a/syntax/passwd.vim b/syntax/passwd.vim
index 25ba4a09b..ff0fbc906 100644
--- a/syntax/passwd.vim
+++ b/syntax/passwd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('passwd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'passwd')
   finish
 endif
 
diff --git a/syntax/pccts.vim b/syntax/pccts.vim
index 4f0fba7a9..3cb252902 100644
--- a/syntax/pccts.vim
+++ b/syntax/pccts.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pccts', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pccts')
   finish
 endif
 
diff --git a/syntax/pdf.vim b/syntax/pdf.vim
index a0012c316..e300364f6 100644
--- a/syntax/pdf.vim
+++ b/syntax/pdf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pdf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pdf')
   finish
 endif
 
diff --git a/syntax/perl.vim b/syntax/perl.vim
index bea6df6b5..ce136bf65 100644
--- a/syntax/perl.vim
+++ b/syntax/perl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/pf.vim b/syntax/pf.vim
index 8d8554a19..6a7335fd1 100644
--- a/syntax/pf.vim
+++ b/syntax/pf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pf')
   finish
 endif
 
diff --git a/syntax/pfmain.vim b/syntax/pfmain.vim
index 7ba7e62c3..65ce3d9e1 100644
--- a/syntax/pfmain.vim
+++ b/syntax/pfmain.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pfmain', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pfmain')
   finish
 endif
 
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 92163f6c9..dc2100bfd 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pgsql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pgsql')
   finish
 endif
 
diff --git a/syntax/php.vim b/syntax/php.vim
index ffb5c64d7..f221f492c 100644
--- a/syntax/php.vim
+++ b/syntax/php.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('php', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'php')
   finish
 endif
 
diff --git a/syntax/pike.vim b/syntax/pike.vim
index 2a4acce42..9248cc9d7 100644
--- a/syntax/pike.vim
+++ b/syntax/pike.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pike', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pike')
   finish
 endif
 
diff --git a/syntax/pilrc.vim b/syntax/pilrc.vim
index fd6ecad6e..72c76ecc5 100644
--- a/syntax/pilrc.vim
+++ b/syntax/pilrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pilrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pilrc')
   finish
 endif
 
diff --git a/syntax/pine.vim b/syntax/pine.vim
index 344aa0f44..0cec064ee 100644
--- a/syntax/pine.vim
+++ b/syntax/pine.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pine', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pine')
   finish
 endif
 
diff --git a/syntax/pinfo.vim b/syntax/pinfo.vim
index 6319ef5d3..d1602cb13 100644
--- a/syntax/pinfo.vim
+++ b/syntax/pinfo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pinfo', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pinfo')
   finish
 endif
 
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index 594a56158..320f35604 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('plantuml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'plantuml')
   finish
 endif
 
diff --git a/syntax/pli.vim b/syntax/pli.vim
index 9f935118b..b57310166 100644
--- a/syntax/pli.vim
+++ b/syntax/pli.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pli', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pli')
   finish
 endif
 
diff --git a/syntax/plm.vim b/syntax/plm.vim
index 9bce4e0c9..cb3e761b7 100644
--- a/syntax/plm.vim
+++ b/syntax/plm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('plm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'plm')
   finish
 endif
 
diff --git a/syntax/plp.vim b/syntax/plp.vim
index 34ab92903..d2bda89e7 100644
--- a/syntax/plp.vim
+++ b/syntax/plp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('plp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'plp')
   finish
 endif
 
diff --git a/syntax/plsql.vim b/syntax/plsql.vim
index ce0a7eb18..07b4a4db7 100644
--- a/syntax/plsql.vim
+++ b/syntax/plsql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('plsql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'plsql')
   finish
 endif
 
diff --git a/syntax/po.vim b/syntax/po.vim
index c852b71cc..f6cf63cba 100644
--- a/syntax/po.vim
+++ b/syntax/po.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('po', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'po')
   finish
 endif
 
diff --git a/syntax/pod.vim b/syntax/pod.vim
index d67b15cc4..7f7790542 100644
--- a/syntax/pod.vim
+++ b/syntax/pod.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/pony.vim b/syntax/pony.vim
index dcb3bc1a7..7374fb6f7 100644
--- a/syntax/pony.vim
+++ b/syntax/pony.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pony', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pony')
   finish
 endif
 
diff --git a/syntax/postscr.vim b/syntax/postscr.vim
index 6053453aa..0f4725ec5 100644
--- a/syntax/postscr.vim
+++ b/syntax/postscr.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('postscr', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'postscr')
   finish
 endif
 
diff --git a/syntax/pov.vim b/syntax/pov.vim
index 79fe9210c..6ee9c7157 100644
--- a/syntax/pov.vim
+++ b/syntax/pov.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pov', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pov')
   finish
 endif
 
diff --git a/syntax/povini.vim b/syntax/povini.vim
index 9dce65b3f..24cb9ed94 100644
--- a/syntax/povini.vim
+++ b/syntax/povini.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('povini', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'povini')
   finish
 endif
 
diff --git a/syntax/ppd.vim b/syntax/ppd.vim
index d1dd040da..71c579e20 100644
--- a/syntax/ppd.vim
+++ b/syntax/ppd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ppd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ppd')
   finish
 endif
 
diff --git a/syntax/ppwiz.vim b/syntax/ppwiz.vim
index c32b32d5b..1bce02ff5 100644
--- a/syntax/ppwiz.vim
+++ b/syntax/ppwiz.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ppwiz', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ppwiz')
   finish
 endif
 
diff --git a/syntax/privoxy.vim b/syntax/privoxy.vim
index 6dfe03b6c..82529f449 100644
--- a/syntax/privoxy.vim
+++ b/syntax/privoxy.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('privoxy', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'privoxy')
   finish
 endif
 
diff --git a/syntax/procmail.vim b/syntax/procmail.vim
index f10d3eb13..7ca368e46 100644
--- a/syntax/procmail.vim
+++ b/syntax/procmail.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('procmail', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'procmail')
   finish
 endif
 
diff --git a/syntax/prolog.vim b/syntax/prolog.vim
index a38a82b71..9498e5f31 100644
--- a/syntax/prolog.vim
+++ b/syntax/prolog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('prolog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'prolog')
   finish
 endif
 
diff --git a/syntax/promela.vim b/syntax/promela.vim
index 608628602..fb7ef3e2b 100644
--- a/syntax/promela.vim
+++ b/syntax/promela.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('promela', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'promela')
   finish
 endif
 
diff --git a/syntax/proto.vim b/syntax/proto.vim
index 95d604c1f..ac6bf5448 100644
--- a/syntax/proto.vim
+++ b/syntax/proto.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('protobuf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'protobuf')
   finish
 endif
 
diff --git a/syntax/protocols.vim b/syntax/protocols.vim
index 0a53772c2..9abdacd4d 100644
--- a/syntax/protocols.vim
+++ b/syntax/protocols.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('protocols', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'protocols')
   finish
 endif
 
diff --git a/syntax/ps1.vim b/syntax/ps1.vim
index d7c5ecda4..97901fbc2 100644
--- a/syntax/ps1.vim
+++ b/syntax/ps1.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'powershell')
   finish
 endif
 
diff --git a/syntax/ps1xml.vim b/syntax/ps1xml.vim
index 06ff97da0..a0b582364 100644
--- a/syntax/ps1xml.vim
+++ b/syntax/ps1xml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('powershell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'powershell')
   finish
 endif
 
diff --git a/syntax/psf.vim b/syntax/psf.vim
index 25176c960..6ae651d5f 100644
--- a/syntax/psf.vim
+++ b/syntax/psf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('psf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'psf')
   finish
 endif
 
diff --git a/syntax/pug.vim b/syntax/pug.vim
index 94ee0dac0..8f9788283 100644
--- a/syntax/pug.vim
+++ b/syntax/pug.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pug', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pug')
   finish
 endif
 
diff --git a/syntax/puppet.vim b/syntax/puppet.vim
index 1df1015df..e4ccbd4cd 100644
--- a/syntax/puppet.vim
+++ b/syntax/puppet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/syntax/purescript.vim b/syntax/purescript.vim
index d6ef897cc..b98676dfc 100644
--- a/syntax/purescript.vim
+++ b/syntax/purescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('purescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'purescript')
   finish
 endif
 
diff --git a/syntax/pyrex.vim b/syntax/pyrex.vim
index 8699c29ad..b8ff3ee45 100644
--- a/syntax/pyrex.vim
+++ b/syntax/pyrex.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('pyrex', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'pyrex')
   finish
 endif
 
diff --git a/syntax/python.vim b/syntax/python.vim
index 35df5989e..15c030a69 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('python', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'python')
   finish
 endif
 
diff --git a/syntax/qmake.vim b/syntax/qmake.vim
index 6961bbc89..e4736e67f 100644
--- a/syntax/qmake.vim
+++ b/syntax/qmake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('qmake', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'qmake')
   finish
 endif
 
diff --git a/syntax/qml.vim b/syntax/qml.vim
index 18b0799d8..5c3c4c387 100644
--- a/syntax/qml.vim
+++ b/syntax/qml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('qml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'qml')
   finish
 endif
 
diff --git a/syntax/quake.vim b/syntax/quake.vim
index ec467a5e7..68136c0e1 100644
--- a/syntax/quake.vim
+++ b/syntax/quake.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('quake', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'quake')
   finish
 endif
 
diff --git a/syntax/racket.vim b/syntax/racket.vim
index 25483dea7..100e7d174 100644
--- a/syntax/racket.vim
+++ b/syntax/racket.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('racket', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'racket')
   finish
 endif
 
diff --git a/syntax/radiance.vim b/syntax/radiance.vim
index 1e4d06315..8635aec02 100644
--- a/syntax/radiance.vim
+++ b/syntax/radiance.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('radiance', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'radiance')
   finish
 endif
 
diff --git a/syntax/ragel.vim b/syntax/ragel.vim
index 496c6ad41..82694d0ee 100644
--- a/syntax/ragel.vim
+++ b/syntax/ragel.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ragel', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ragel')
   finish
 endif
 
diff --git a/syntax/raku.vim b/syntax/raku.vim
index d15f0307d..7a3ce951c 100644
--- a/syntax/raku.vim
+++ b/syntax/raku.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('raku', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'raku')
   finish
 endif
 
diff --git a/syntax/raml.vim b/syntax/raml.vim
index 95f4955c6..b0c167899 100644
--- a/syntax/raml.vim
+++ b/syntax/raml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('raml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'raml')
   finish
 endif
 
diff --git a/syntax/ratpoison.vim b/syntax/ratpoison.vim
index 8209610ff..b6ea350ce 100644
--- a/syntax/ratpoison.vim
+++ b/syntax/ratpoison.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ratpoison', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ratpoison')
   finish
 endif
 
diff --git a/syntax/razor.vim b/syntax/razor.vim
index 5f97015a0..3d064960a 100644
--- a/syntax/razor.vim
+++ b/syntax/razor.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('razor', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'razor')
   finish
 endif
 
diff --git a/syntax/rc.vim b/syntax/rc.vim
index c93d123f1..d284143af 100644
--- a/syntax/rc.vim
+++ b/syntax/rc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rc')
   finish
 endif
 
diff --git a/syntax/rcs.vim b/syntax/rcs.vim
index 6657b1d88..73f6769ce 100644
--- a/syntax/rcs.vim
+++ b/syntax/rcs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rcs', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rcs')
   finish
 endif
 
diff --git a/syntax/readline.vim b/syntax/readline.vim
index 3a98c71f7..a9cfc59cc 100644
--- a/syntax/readline.vim
+++ b/syntax/readline.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('readline', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'readline')
   finish
 endif
 
diff --git a/syntax/reason.vim b/syntax/reason.vim
index 6d7917474..cfc43bd68 100644
--- a/syntax/reason.vim
+++ b/syntax/reason.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('reason', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'reason')
   finish
 endif
 
diff --git a/syntax/rego.vim b/syntax/rego.vim
index 2c3eed953..5c0cfd521 100644
--- a/syntax/rego.vim
+++ b/syntax/rego.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rego', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rego')
   finish
 endif
 
diff --git a/syntax/remind.vim b/syntax/remind.vim
index cf40268c3..74dcd7919 100644
--- a/syntax/remind.vim
+++ b/syntax/remind.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('remind', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'remind')
   finish
 endif
 
diff --git a/syntax/requirements.vim b/syntax/requirements.vim
index bf9b4a4f4..296541d5f 100644
--- a/syntax/requirements.vim
+++ b/syntax/requirements.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('requirements', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'requirements')
   finish
 endif
 
diff --git a/syntax/resolv.vim b/syntax/resolv.vim
index c28ce3b65..0e4925335 100644
--- a/syntax/resolv.vim
+++ b/syntax/resolv.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('resolv', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'resolv')
   finish
 endif
 
diff --git a/syntax/reva.vim b/syntax/reva.vim
index 66b83f770..4af2b2f79 100644
--- a/syntax/reva.vim
+++ b/syntax/reva.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('reva', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'reva')
   finish
 endif
 
diff --git a/syntax/rexx.vim b/syntax/rexx.vim
index 9573bdd07..863526b29 100644
--- a/syntax/rexx.vim
+++ b/syntax/rexx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rexx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rexx')
   finish
 endif
 
diff --git a/syntax/rhelp.vim b/syntax/rhelp.vim
index 3801a371f..c54ef18af 100644
--- a/syntax/rhelp.vim
+++ b/syntax/rhelp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('r-lang', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'r-lang')
   finish
 endif
 
diff --git a/syntax/rib.vim b/syntax/rib.vim
index 522e283be..5999744d3 100644
--- a/syntax/rib.vim
+++ b/syntax/rib.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rib', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rib')
   finish
 endif
 
diff --git a/syntax/rmd.vim b/syntax/rmd.vim
index b3b904f39..08194ef85 100644
--- a/syntax/rmd.vim
+++ b/syntax/rmd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rmd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rmd')
   finish
 endif
 
diff --git a/syntax/rnc.vim b/syntax/rnc.vim
index 2a3208373..8a09091de 100644
--- a/syntax/rnc.vim
+++ b/syntax/rnc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rnc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rnc')
   finish
 endif
 
diff --git a/syntax/rng.vim b/syntax/rng.vim
index 64d93980c..8783ac453 100644
--- a/syntax/rng.vim
+++ b/syntax/rng.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rng', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rng')
   finish
 endif
 
diff --git a/syntax/rnoweb-1.vim b/syntax/rnoweb-1.vim
index bcc15f6d0..767a06a34 100644
--- a/syntax/rnoweb-1.vim
+++ b/syntax/rnoweb-1.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('r-lang', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'r-lang')
   finish
 endif
 
diff --git a/syntax/rnoweb-2.vim b/syntax/rnoweb-2.vim
index a3d4dc54b..9c28c37a0 100644
--- a/syntax/rnoweb-2.vim
+++ b/syntax/rnoweb-2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rnoweb', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rnoweb')
   finish
 endif
 
diff --git a/syntax/robots.vim b/syntax/robots.vim
index acf8767f2..2bd69f1ca 100644
--- a/syntax/robots.vim
+++ b/syntax/robots.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('robots', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'robots')
   finish
 endif
 
diff --git a/syntax/rpcgen.vim b/syntax/rpcgen.vim
index b93026bb5..285d1e63c 100644
--- a/syntax/rpcgen.vim
+++ b/syntax/rpcgen.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rpcgen', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rpcgen')
   finish
 endif
 
diff --git a/syntax/rpl.vim b/syntax/rpl.vim
index a37b1bdee..62b469bd3 100644
--- a/syntax/rpl.vim
+++ b/syntax/rpl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rpl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rpl')
   finish
 endif
 
diff --git a/syntax/rrst.vim b/syntax/rrst.vim
index 76cb44cd7..cd11bf585 100644
--- a/syntax/rrst.vim
+++ b/syntax/rrst.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rrst', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rrst')
   finish
 endif
 
diff --git a/syntax/rst.vim b/syntax/rst.vim
index a0988ff80..73db95424 100644
--- a/syntax/rst.vim
+++ b/syntax/rst.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rst', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rst')
   finish
 endif
 
diff --git a/syntax/rtf.vim b/syntax/rtf.vim
index 5fe3b6f54..c188f2152 100644
--- a/syntax/rtf.vim
+++ b/syntax/rtf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rtf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rtf')
   finish
 endif
 
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index 4342b8969..d63cc7c53 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ruby', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/syntax/rust.vim b/syntax/rust.vim
index 108dd3aac..d18fb3a05 100644
--- a/syntax/rust.vim
+++ b/syntax/rust.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/syntax/samba.vim b/syntax/samba.vim
index 2fe964f72..06938b708 100644
--- a/syntax/samba.vim
+++ b/syntax/samba.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('samba', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'samba')
   finish
 endif
 
diff --git a/syntax/sas.vim b/syntax/sas.vim
index f828bc568..66f03047d 100644
--- a/syntax/sas.vim
+++ b/syntax/sas.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sas', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sas')
   finish
 endif
 
diff --git a/syntax/sass.vim b/syntax/sass.vim
index 6f35d7a1f..1711d6419 100644
--- a/syntax/sass.vim
+++ b/syntax/sass.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sass', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sass')
   finish
 endif
 
diff --git a/syntax/sather.vim b/syntax/sather.vim
index 0cde99c49..ada04313a 100644
--- a/syntax/sather.vim
+++ b/syntax/sather.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sather', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sather')
   finish
 endif
 
diff --git a/syntax/sbt.vim b/syntax/sbt.vim
index 81d539a71..61802fba2 100644
--- a/syntax/sbt.vim
+++ b/syntax/sbt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sbt', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sbt')
   finish
 endif
 
diff --git a/syntax/scala.vim b/syntax/scala.vim
index fa97b867d..ba22ecb19 100644
--- a/syntax/scala.vim
+++ b/syntax/scala.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/syntax/scheme.vim b/syntax/scheme.vim
index b86a766e7..2fc96d71c 100644
--- a/syntax/scheme.vim
+++ b/syntax/scheme.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scheme', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scheme')
   finish
 endif
 
diff --git a/syntax/scilab.vim b/syntax/scilab.vim
index b11d57acb..128c84c9c 100644
--- a/syntax/scilab.vim
+++ b/syntax/scilab.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scilab', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scilab')
   finish
 endif
 
diff --git a/syntax/screen.vim b/syntax/screen.vim
index c4cd11ec0..c4ecb1370 100644
--- a/syntax/screen.vim
+++ b/syntax/screen.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('screen', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'screen')
   finish
 endif
 
diff --git a/syntax/scss.vim b/syntax/scss.vim
index a4a9e0a3e..3da765485 100644
--- a/syntax/scss.vim
+++ b/syntax/scss.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scss', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scss')
   finish
 endif
 
diff --git a/syntax/sd.vim b/syntax/sd.vim
index 5cd8917c3..275e88989 100644
--- a/syntax/sd.vim
+++ b/syntax/sd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sd')
   finish
 endif
 
diff --git a/syntax/sdc.vim b/syntax/sdc.vim
index 79314578c..f310957da 100644
--- a/syntax/sdc.vim
+++ b/syntax/sdc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sdc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sdc')
   finish
 endif
 
diff --git a/syntax/sdl.vim b/syntax/sdl.vim
index 1551ccc56..c1892ac77 100644
--- a/syntax/sdl.vim
+++ b/syntax/sdl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sdl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sdl')
   finish
 endif
 
diff --git a/syntax/sed.vim b/syntax/sed.vim
index 8d2349da8..ad9cc1e3d 100644
--- a/syntax/sed.vim
+++ b/syntax/sed.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sed', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sed')
   finish
 endif
 
diff --git a/syntax/sensors.vim b/syntax/sensors.vim
index c2411eed5..37ffbd575 100644
--- a/syntax/sensors.vim
+++ b/syntax/sensors.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sensors', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sensors')
   finish
 endif
 
diff --git a/syntax/services.vim b/syntax/services.vim
index 2b5b6f249..3315a1b7b 100644
--- a/syntax/services.vim
+++ b/syntax/services.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('services', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'services')
   finish
 endif
 
diff --git a/syntax/setserial.vim b/syntax/setserial.vim
index ac7f9d70f..d1825b3f6 100644
--- a/syntax/setserial.vim
+++ b/syntax/setserial.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('setserial', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'setserial')
   finish
 endif
 
diff --git a/syntax/sexplib.vim b/syntax/sexplib.vim
index 2e3382036..1d6f27fa1 100644
--- a/syntax/sexplib.vim
+++ b/syntax/sexplib.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('ocaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/sh.vim b/syntax/sh.vim
index fc5810af9..11d5f394f 100644
--- a/syntax/sh.vim
+++ b/syntax/sh.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sh', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sh')
   finish
 endif
 
diff --git a/syntax/sieve.vim b/syntax/sieve.vim
index 1374df78a..29b4a0977 100644
--- a/syntax/sieve.vim
+++ b/syntax/sieve.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sieve', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sieve')
   finish
 endif
 
diff --git a/syntax/sil.vim b/syntax/sil.vim
index 06bcda913..c6c63d053 100644
--- a/syntax/sil.vim
+++ b/syntax/sil.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sil', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sil')
   finish
 endif
 
diff --git a/syntax/simula.vim b/syntax/simula.vim
index f9fb68e7d..803567e34 100644
--- a/syntax/simula.vim
+++ b/syntax/simula.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('simula', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'simula')
   finish
 endif
 
diff --git a/syntax/sinda.vim b/syntax/sinda.vim
index 7d2a6cadf..648c16662 100644
--- a/syntax/sinda.vim
+++ b/syntax/sinda.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sinda', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sinda')
   finish
 endif
 
diff --git a/syntax/sisu.vim b/syntax/sisu.vim
index a2aeeb3cd..723b298e4 100644
--- a/syntax/sisu.vim
+++ b/syntax/sisu.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sisu', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sisu')
   finish
 endif
 
diff --git a/syntax/skill.vim b/syntax/skill.vim
index 5304a8dd4..5c4c9df23 100644
--- a/syntax/skill.vim
+++ b/syntax/skill.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('skill', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'skill')
   finish
 endif
 
diff --git a/syntax/slang.vim b/syntax/slang.vim
index 49e436357..d65c8608d 100644
--- a/syntax/slang.vim
+++ b/syntax/slang.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slang', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slang')
   finish
 endif
 
diff --git a/syntax/slice.vim b/syntax/slice.vim
index a22648198..4142f3b8a 100644
--- a/syntax/slice.vim
+++ b/syntax/slice.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slice', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slice')
   finish
 endif
 
diff --git a/syntax/slim.vim b/syntax/slim.vim
index de32f92fb..d4ae63672 100644
--- a/syntax/slim.vim
+++ b/syntax/slim.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slim', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slim')
   finish
 endif
 
diff --git a/syntax/slime.vim b/syntax/slime.vim
index e00fd5493..652454db4 100644
--- a/syntax/slime.vim
+++ b/syntax/slime.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slime', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slime')
   finish
 endif
 
diff --git a/syntax/slpconf.vim b/syntax/slpconf.vim
index 20c4f639c..a617ddb36 100644
--- a/syntax/slpconf.vim
+++ b/syntax/slpconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slpconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slpconf')
   finish
 endif
 
diff --git a/syntax/slpreg.vim b/syntax/slpreg.vim
index 0c7f07a98..7e2f28670 100644
--- a/syntax/slpreg.vim
+++ b/syntax/slpreg.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slpreg', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slpreg')
   finish
 endif
 
diff --git a/syntax/slpspi.vim b/syntax/slpspi.vim
index 83034fece..c58f6c919 100644
--- a/syntax/slpspi.vim
+++ b/syntax/slpspi.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slpspi', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slpspi')
   finish
 endif
 
diff --git a/syntax/slrnrc.vim b/syntax/slrnrc.vim
index 1683be97b..9c455b9ae 100644
--- a/syntax/slrnrc.vim
+++ b/syntax/slrnrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slrnrc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slrnrc')
   finish
 endif
 
diff --git a/syntax/slrnsc.vim b/syntax/slrnsc.vim
index 6cc627197..444580d33 100644
--- a/syntax/slrnsc.vim
+++ b/syntax/slrnsc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('slrnsc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'slrnsc')
   finish
 endif
 
diff --git a/syntax/sm.vim b/syntax/sm.vim
index a4b7379f8..1dd950be5 100644
--- a/syntax/sm.vim
+++ b/syntax/sm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sm')
   finish
 endif
 
diff --git a/syntax/smarty.vim b/syntax/smarty.vim
index 30d82d063..eae2ade31 100644
--- a/syntax/smarty.vim
+++ b/syntax/smarty.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('smarty', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'smarty')
   finish
 endif
 
diff --git a/syntax/smcl.vim b/syntax/smcl.vim
index 50b657d43..afe342b6c 100644
--- a/syntax/smcl.vim
+++ b/syntax/smcl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('smcl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'smcl')
   finish
 endif
 
diff --git a/syntax/smhl.vim b/syntax/smhl.vim
index 7ab328a5a..a46db9087 100644
--- a/syntax/smhl.vim
+++ b/syntax/smhl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/smith.vim b/syntax/smith.vim
index 4dd4e5134..8b4449d44 100644
--- a/syntax/smith.vim
+++ b/syntax/smith.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('smith', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'smith')
   finish
 endif
 
diff --git a/syntax/sml.vim b/syntax/sml.vim
index 5788d7580..3656b2d39 100644
--- a/syntax/sml.vim
+++ b/syntax/sml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sml')
   finish
 endif
 
diff --git a/syntax/smt2.vim b/syntax/smt2.vim
index b70c95f4d..8ee8c2ac5 100644
--- a/syntax/smt2.vim
+++ b/syntax/smt2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('smt2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'smt2')
   finish
 endif
 
diff --git a/syntax/snobol4.vim b/syntax/snobol4.vim
index d100fb4a6..e5ce00ebd 100644
--- a/syntax/snobol4.vim
+++ b/syntax/snobol4.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('snobol4', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'snobol4')
   finish
 endif
 
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index 3bde3b8ae..a1bca69e3 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('solidity', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'solidity')
   finish
 endif
 
diff --git a/syntax/spec.vim b/syntax/spec.vim
index 3a6772da1..c7ccc4d21 100644
--- a/syntax/spec.vim
+++ b/syntax/spec.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('spec', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'spec')
   finish
 endif
 
diff --git a/syntax/spice.vim b/syntax/spice.vim
index becd3de9c..44e5a3307 100644
--- a/syntax/spice.vim
+++ b/syntax/spice.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('spice', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'spice')
   finish
 endif
 
diff --git a/syntax/spup.vim b/syntax/spup.vim
index b4f16b2f5..6112ac179 100644
--- a/syntax/spup.vim
+++ b/syntax/spup.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('spup', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'spup')
   finish
 endif
 
diff --git a/syntax/spyce.vim b/syntax/spyce.vim
index f5f5e0929..297cac6d7 100644
--- a/syntax/spyce.vim
+++ b/syntax/spyce.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('spyce', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'spyce')
   finish
 endif
 
diff --git a/syntax/sql.vim b/syntax/sql.vim
index 6ec02f7fa..15c09ff2c 100644
--- a/syntax/sql.vim
+++ b/syntax/sql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sql')
   finish
 endif
 
diff --git a/syntax/sqlj.vim b/syntax/sqlj.vim
index bf3c0b744..e4010e2c5 100644
--- a/syntax/sqlj.vim
+++ b/syntax/sqlj.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sqlj', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sqlj')
   finish
 endif
 
diff --git a/syntax/sqloracle.vim b/syntax/sqloracle.vim
index f1fd838fb..921f0236b 100644
--- a/syntax/sqloracle.vim
+++ b/syntax/sqloracle.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sql')
   finish
 endif
 
diff --git a/syntax/sqr.vim b/syntax/sqr.vim
index 2ac1dbfb7..cb2a901ad 100644
--- a/syntax/sqr.vim
+++ b/syntax/sqr.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sqr', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sqr')
   finish
 endif
 
diff --git a/syntax/squid.vim b/syntax/squid.vim
index f95957ba8..2e10ac7d6 100644
--- a/syntax/squid.vim
+++ b/syntax/squid.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('squid', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'squid')
   finish
 endif
 
diff --git a/syntax/srec.vim b/syntax/srec.vim
index 20e2604d3..02c29436a 100644
--- a/syntax/srec.vim
+++ b/syntax/srec.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('srec', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'srec')
   finish
 endif
 
diff --git a/syntax/sshconfig.vim b/syntax/sshconfig.vim
index bebb7bb67..7c9b16803 100644
--- a/syntax/sshconfig.vim
+++ b/syntax/sshconfig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sshconfig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sshconfig')
   finish
 endif
 
diff --git a/syntax/sshdconfig.vim b/syntax/sshdconfig.vim
index ef25dab01..b47ba9713 100644
--- a/syntax/sshdconfig.vim
+++ b/syntax/sshdconfig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sshdconfig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sshdconfig')
   finish
 endif
 
diff --git a/syntax/st.vim b/syntax/st.vim
index 865af7d46..1a08c203c 100644
--- a/syntax/st.vim
+++ b/syntax/st.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('st', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'st')
   finish
 endif
 
diff --git a/syntax/stata.vim b/syntax/stata.vim
index 27c7afcd8..12faf80e0 100644
--- a/syntax/stata.vim
+++ b/syntax/stata.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('stata', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'stata')
   finish
 endif
 
diff --git a/syntax/stp.vim b/syntax/stp.vim
index f43740b9e..787590b5d 100644
--- a/syntax/stp.vim
+++ b/syntax/stp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('stp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'stp')
   finish
 endif
 
diff --git a/syntax/stylus.vim b/syntax/stylus.vim
index bf8269210..fdd4c3712 100644
--- a/syntax/stylus.vim
+++ b/syntax/stylus.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('stylus', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'stylus')
   finish
 endif
 
diff --git a/syntax/sudoers.vim b/syntax/sudoers.vim
index 053dc1f9c..d2ae719a5 100644
--- a/syntax/sudoers.vim
+++ b/syntax/sudoers.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sudoers', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sudoers')
   finish
 endif
 
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index d50f16c1f..848569439 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('svelte', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'svelte')
   finish
 endif
 
diff --git a/syntax/svg.vim b/syntax/svg.vim
index 17302f792..7746da37b 100644
--- a/syntax/svg.vim
+++ b/syntax/svg.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('svg', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'svg')
   finish
 endif
 
diff --git a/syntax/svn.vim b/syntax/svn.vim
index 29c3b99e9..3ff758eb4 100644
--- a/syntax/svn.vim
+++ b/syntax/svn.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('svn', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'svn')
   finish
 endif
 
diff --git a/syntax/swift.vim b/syntax/swift.vim
index b4fa59e99..102eedb65 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('swift', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'swift')
   finish
 endif
 
diff --git a/syntax/swiftgyb.vim b/syntax/swiftgyb.vim
index f647c6760..d4d27da2f 100644
--- a/syntax/swiftgyb.vim
+++ b/syntax/swiftgyb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('swiftgyb', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'swiftgyb')
   finish
 endif
 
diff --git a/syntax/sxhkdrc.vim b/syntax/sxhkdrc.vim
index f0c28fada..e4950e6c6 100644
--- a/syntax/sxhkdrc.vim
+++ b/syntax/sxhkdrc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sxhkd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sxhkd')
   finish
 endif
 
diff --git a/syntax/sysctl.vim b/syntax/sysctl.vim
index cd2e288a2..c67ca83ae 100644
--- a/syntax/sysctl.vim
+++ b/syntax/sysctl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sysctl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sysctl')
   finish
 endif
 
diff --git a/syntax/systemd.vim b/syntax/systemd.vim
index 035580e3a..d26fdf1dd 100644
--- a/syntax/systemd.vim
+++ b/syntax/systemd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('systemd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'systemd')
   finish
 endif
 
diff --git a/syntax/systemverilog.vim b/syntax/systemverilog.vim
index 8e79ae47d..5be897bd8 100644
--- a/syntax/systemverilog.vim
+++ b/syntax/systemverilog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('systemverilog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'systemverilog')
   finish
 endif
 
diff --git a/syntax/tablegen.vim b/syntax/tablegen.vim
index 6fda1acf1..6701d9a27 100644
--- a/syntax/tablegen.vim
+++ b/syntax/tablegen.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/syntax/tads.vim b/syntax/tads.vim
index 68e35de88..5267823bf 100644
--- a/syntax/tads.vim
+++ b/syntax/tads.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tads', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tads')
   finish
 endif
 
diff --git a/syntax/tags.vim b/syntax/tags.vim
index e609bc4bd..19ca19b41 100644
--- a/syntax/tags.vim
+++ b/syntax/tags.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tags', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tags')
   finish
 endif
 
diff --git a/syntax/tak.vim b/syntax/tak.vim
index 1c1d259b1..435127426 100644
--- a/syntax/tak.vim
+++ b/syntax/tak.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tak', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tak')
   finish
 endif
 
diff --git a/syntax/tap.vim b/syntax/tap.vim
index 404b4370e..2ff30f830 100644
--- a/syntax/tap.vim
+++ b/syntax/tap.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/taskdata.vim b/syntax/taskdata.vim
index 30a0e0138..6ef63d445 100644
--- a/syntax/taskdata.vim
+++ b/syntax/taskdata.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('taskdata', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'taskdata')
   finish
 endif
 
diff --git a/syntax/taskedit.vim b/syntax/taskedit.vim
index 547464389..fcf1ad44c 100644
--- a/syntax/taskedit.vim
+++ b/syntax/taskedit.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('taskedit', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'taskedit')
   finish
 endif
 
diff --git a/syntax/tcl.vim b/syntax/tcl.vim
index 2066a1f9b..a7751ef85 100644
--- a/syntax/tcl.vim
+++ b/syntax/tcl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tcl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tcl')
   finish
 endif
 
diff --git a/syntax/template.vim b/syntax/template.vim
index 02c7fd7dd..ae8ddeed6 100644
--- a/syntax/template.vim
+++ b/syntax/template.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('template', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'template')
   finish
 endif
 
diff --git a/syntax/teraterm.vim b/syntax/teraterm.vim
index 195e933e9..ed458f8ec 100644
--- a/syntax/teraterm.vim
+++ b/syntax/teraterm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('teraterm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'teraterm')
   finish
 endif
 
diff --git a/syntax/terminfo.vim b/syntax/terminfo.vim
index fe90c4b08..e9056affb 100644
--- a/syntax/terminfo.vim
+++ b/syntax/terminfo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('terminfo', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'terminfo')
   finish
 endif
 
diff --git a/syntax/terraform.vim b/syntax/terraform.vim
index 2c533caa3..786a3bba9 100644
--- a/syntax/terraform.vim
+++ b/syntax/terraform.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('terraform', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'terraform')
   finish
 endif
 
diff --git a/syntax/tex.vim b/syntax/tex.vim
index a1ecf32fd..f65d554af 100644
--- a/syntax/tex.vim
+++ b/syntax/tex.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tex', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tex')
   finish
 endif
 
diff --git a/syntax/texinfo.vim b/syntax/texinfo.vim
index d863d6fe4..16a878ada 100644
--- a/syntax/texinfo.vim
+++ b/syntax/texinfo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('texinfo', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'texinfo')
   finish
 endif
 
diff --git a/syntax/texmf.vim b/syntax/texmf.vim
index 48445470e..3ecd4a99e 100644
--- a/syntax/texmf.vim
+++ b/syntax/texmf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('texmf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'texmf')
   finish
 endif
 
diff --git a/syntax/textile.vim b/syntax/textile.vim
index 6c056026a..1bdce409a 100644
--- a/syntax/textile.vim
+++ b/syntax/textile.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('textile', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'textile')
   finish
 endif
 
diff --git a/syntax/tf.vim b/syntax/tf.vim
index d69fdf6d5..1202c51ab 100644
--- a/syntax/tf.vim
+++ b/syntax/tf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tf')
   finish
 endif
 
diff --git a/syntax/thrift.vim b/syntax/thrift.vim
index c842878f4..7a0dd5dc6 100644
--- a/syntax/thrift.vim
+++ b/syntax/thrift.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('thrift', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'thrift')
   finish
 endif
 
diff --git a/syntax/tidy.vim b/syntax/tidy.vim
index a10aeb94c..f61d5aa03 100644
--- a/syntax/tidy.vim
+++ b/syntax/tidy.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tidy', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tidy')
   finish
 endif
 
diff --git a/syntax/tilde.vim b/syntax/tilde.vim
index 8a25493bc..2985ce1fc 100644
--- a/syntax/tilde.vim
+++ b/syntax/tilde.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tilde', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tilde')
   finish
 endif
 
diff --git a/syntax/tli.vim b/syntax/tli.vim
index e5ce202d5..7360e1634 100644
--- a/syntax/tli.vim
+++ b/syntax/tli.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tli', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tli')
   finish
 endif
 
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index fbd7099da..4051be631 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tmux', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tmux')
   finish
 endif
 
diff --git a/syntax/toml.vim b/syntax/toml.vim
index 5428296f0..1cf2abc90 100644
--- a/syntax/toml.vim
+++ b/syntax/toml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('toml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'toml')
   finish
 endif
 
diff --git a/syntax/tpp.vim b/syntax/tpp.vim
index f0dc9902c..43278ae1e 100644
--- a/syntax/tpp.vim
+++ b/syntax/tpp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tpp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tpp')
   finish
 endif
 
diff --git a/syntax/tptp.vim b/syntax/tptp.vim
index 089c37df4..414789a6c 100644
--- a/syntax/tptp.vim
+++ b/syntax/tptp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tptp', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tptp')
   finish
 endif
 
diff --git a/syntax/trasys.vim b/syntax/trasys.vim
index ae48e83b4..5cc2b8e4d 100644
--- a/syntax/trasys.vim
+++ b/syntax/trasys.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('trasys', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'trasys')
   finish
 endif
 
diff --git a/syntax/treetop.vim b/syntax/treetop.vim
index aceec282d..461cb2165 100644
--- a/syntax/treetop.vim
+++ b/syntax/treetop.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('treetop', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'treetop')
   finish
 endif
 
diff --git a/syntax/trustees.vim b/syntax/trustees.vim
index 1e4826b1e..9ae435cd1 100644
--- a/syntax/trustees.vim
+++ b/syntax/trustees.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('trustees', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'trustees')
   finish
 endif
 
diff --git a/syntax/tsalt.vim b/syntax/tsalt.vim
index 62a0cc3b2..83b878786 100644
--- a/syntax/tsalt.vim
+++ b/syntax/tsalt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tsalt', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tsalt')
   finish
 endif
 
diff --git a/syntax/tsscl.vim b/syntax/tsscl.vim
index 37a166dca..0468a010b 100644
--- a/syntax/tsscl.vim
+++ b/syntax/tsscl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tsscl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tsscl')
   finish
 endif
 
diff --git a/syntax/tssgm.vim b/syntax/tssgm.vim
index 1d11bfdc5..e7aa39285 100644
--- a/syntax/tssgm.vim
+++ b/syntax/tssgm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tssgm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tssgm')
   finish
 endif
 
diff --git a/syntax/tssop.vim b/syntax/tssop.vim
index 7ad292447..ed3a47502 100644
--- a/syntax/tssop.vim
+++ b/syntax/tssop.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('tssop', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'tssop')
   finish
 endif
 
diff --git a/syntax/tt2.vim b/syntax/tt2.vim
index c5a0dcda4..30cf72b2f 100644
--- a/syntax/tt2.vim
+++ b/syntax/tt2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/tt2html.vim b/syntax/tt2html.vim
index 28c2478ee..b95410526 100644
--- a/syntax/tt2html.vim
+++ b/syntax/tt2html.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/tt2js.vim b/syntax/tt2js.vim
index d85d72d86..af01db8df 100644
--- a/syntax/tt2js.vim
+++ b/syntax/tt2js.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/twig.vim b/syntax/twig.vim
index 13b44f114..76905e74b 100644
--- a/syntax/twig.vim
+++ b/syntax/twig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('twig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'twig')
   finish
 endif
 
diff --git a/syntax/typescript.vim b/syntax/typescript.vim
index e8f98a13f..76f8b21fc 100644
--- a/syntax/typescript.vim
+++ b/syntax/typescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/typescriptreact.vim b/syntax/typescriptreact.vim
index c8b2af3f4..96dd5e071 100644
--- a/syntax/typescriptreact.vim
+++ b/syntax/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/uc.vim b/syntax/uc.vim
index 068553b27..409e197ba 100644
--- a/syntax/uc.vim
+++ b/syntax/uc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('uc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'uc')
   finish
 endif
 
diff --git a/syntax/udevconf.vim b/syntax/udevconf.vim
index 5d8b5fca0..80bb6643a 100644
--- a/syntax/udevconf.vim
+++ b/syntax/udevconf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('udevconf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'udevconf')
   finish
 endif
 
diff --git a/syntax/udevperm.vim b/syntax/udevperm.vim
index 1725d9f9a..452def81b 100644
--- a/syntax/udevperm.vim
+++ b/syntax/udevperm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('udevperm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'udevperm')
   finish
 endif
 
diff --git a/syntax/uil.vim b/syntax/uil.vim
index a6ddf8c48..38ce3104d 100644
--- a/syntax/uil.vim
+++ b/syntax/uil.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('uil', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'uil')
   finish
 endif
 
diff --git a/syntax/unison.vim b/syntax/unison.vim
index f069b99bf..d11cac2cb 100644
--- a/syntax/unison.vim
+++ b/syntax/unison.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('unison', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'unison')
   finish
 endif
 
diff --git a/syntax/updatedb.vim b/syntax/updatedb.vim
index 02233978c..1507acad7 100644
--- a/syntax/updatedb.vim
+++ b/syntax/updatedb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('updatedb', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'updatedb')
   finish
 endif
 
diff --git a/syntax/upstart.vim b/syntax/upstart.vim
index 4df94c19b..29d716adf 100644
--- a/syntax/upstart.vim
+++ b/syntax/upstart.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('upstart', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'upstart')
   finish
 endif
 
diff --git a/syntax/upstreamdat.vim b/syntax/upstreamdat.vim
index 2239f33db..5d2ad7375 100644
--- a/syntax/upstreamdat.vim
+++ b/syntax/upstreamdat.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('upstreamdat', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'upstreamdat')
   finish
 endif
 
diff --git a/syntax/upstreaminstalllog.vim b/syntax/upstreaminstalllog.vim
index b6703103b..1b7d28882 100644
--- a/syntax/upstreaminstalllog.vim
+++ b/syntax/upstreaminstalllog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('upstreaminstalllog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'upstreaminstalllog')
   finish
 endif
 
diff --git a/syntax/upstreamlog.vim b/syntax/upstreamlog.vim
index 8a885654e..99dcf4e6b 100644
--- a/syntax/upstreamlog.vim
+++ b/syntax/upstreamlog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('upstreamlog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'upstreamlog')
   finish
 endif
 
diff --git a/syntax/usserverlog.vim b/syntax/usserverlog.vim
index 61b6a56a1..c6fca68a7 100644
--- a/syntax/usserverlog.vim
+++ b/syntax/usserverlog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('usserverlog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'usserverlog')
   finish
 endif
 
diff --git a/syntax/usw2kagtlog.vim b/syntax/usw2kagtlog.vim
index f748b037e..c83378367 100644
--- a/syntax/usw2kagtlog.vim
+++ b/syntax/usw2kagtlog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('usw2kagtlog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'usw2kagtlog')
   finish
 endif
 
diff --git a/syntax/vala.vim b/syntax/vala.vim
index 36f035c72..71a0e677c 100644
--- a/syntax/vala.vim
+++ b/syntax/vala.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vala', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vala')
   finish
 endif
 
diff --git a/syntax/vb.vim b/syntax/vb.vim
index 8edd7882a..fef5186e2 100644
--- a/syntax/vb.vim
+++ b/syntax/vb.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('visual-basic', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'visual-basic')
   finish
 endif
 
diff --git a/syntax/vbnet.vim b/syntax/vbnet.vim
index cf94d7b5c..4ed37c331 100644
--- a/syntax/vbnet.vim
+++ b/syntax/vbnet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vbnet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vbnet')
   finish
 endif
 
diff --git a/syntax/vcl.vim b/syntax/vcl.vim
index 33aab04a8..6d0c358b4 100644
--- a/syntax/vcl.vim
+++ b/syntax/vcl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vcl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vcl')
   finish
 endif
 
diff --git a/syntax/velocity.vim b/syntax/velocity.vim
index dffcd3948..73250c12a 100644
--- a/syntax/velocity.vim
+++ b/syntax/velocity.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('velocity', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'velocity')
   finish
 endif
 
diff --git a/syntax/vera.vim b/syntax/vera.vim
index 45a07df1e..3d2ab2564 100644
--- a/syntax/vera.vim
+++ b/syntax/vera.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vera', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vera')
   finish
 endif
 
diff --git a/syntax/verilog.vim b/syntax/verilog.vim
index 3898636fd..f91718315 100644
--- a/syntax/verilog.vim
+++ b/syntax/verilog.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('verilog', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'verilog')
   finish
 endif
 
diff --git a/syntax/verilogams.vim b/syntax/verilogams.vim
index a77a3dcd2..cd5a4a7f7 100644
--- a/syntax/verilogams.vim
+++ b/syntax/verilogams.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('verilogams', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'verilogams')
   finish
 endif
 
diff --git a/syntax/vgrindefs.vim b/syntax/vgrindefs.vim
index 085f51ec2..6cd64e021 100644
--- a/syntax/vgrindefs.vim
+++ b/syntax/vgrindefs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vgrindefs', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vgrindefs')
   finish
 endif
 
diff --git a/syntax/vhdl.vim b/syntax/vhdl.vim
index 4f4a19ecd..b38bb3b63 100644
--- a/syntax/vhdl.vim
+++ b/syntax/vhdl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vhdl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vhdl')
   finish
 endif
 
diff --git a/syntax/vimgo.vim b/syntax/vimgo.vim
index df82a7090..6c54462a1 100644
--- a/syntax/vimgo.vim
+++ b/syntax/vimgo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('go', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/viminfo.vim b/syntax/viminfo.vim
index 5d5c54549..0df29fd48 100644
--- a/syntax/viminfo.vim
+++ b/syntax/viminfo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('viminfo', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'viminfo')
   finish
 endif
 
diff --git a/syntax/vlang.vim b/syntax/vlang.vim
index 5c6e47fd8..4592a80cc 100644
--- a/syntax/vlang.vim
+++ b/syntax/vlang.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('v', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'v')
   finish
 endif
 
diff --git a/syntax/vmasm.vim b/syntax/vmasm.vim
index 486a3327a..ee6bf5a8c 100644
--- a/syntax/vmasm.vim
+++ b/syntax/vmasm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vmasm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vmasm')
   finish
 endif
 
diff --git a/syntax/voscm.vim b/syntax/voscm.vim
index dbc11b38f..9cb010731 100644
--- a/syntax/voscm.vim
+++ b/syntax/voscm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('voscm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'voscm')
   finish
 endif
 
diff --git a/syntax/vrml.vim b/syntax/vrml.vim
index 4447cf78c..a1c461d62 100644
--- a/syntax/vrml.vim
+++ b/syntax/vrml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vrml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vrml')
   finish
 endif
 
diff --git a/syntax/vroom.vim b/syntax/vroom.vim
index ea22628c9..2036b6abb 100644
--- a/syntax/vroom.vim
+++ b/syntax/vroom.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vroom', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vroom')
   finish
 endif
 
diff --git a/syntax/vue.vim b/syntax/vue.vim
index 126d9c82e..ad4d65178 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('vue', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'vue')
   finish
 endif
 
diff --git a/syntax/wast.vim b/syntax/wast.vim
index ea2c64908..70e70b38f 100644
--- a/syntax/wast.vim
+++ b/syntax/wast.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('wast', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'wast')
   finish
 endif
 
diff --git a/syntax/webmacro.vim b/syntax/webmacro.vim
index 0120c18a9..4cda57bc6 100644
--- a/syntax/webmacro.vim
+++ b/syntax/webmacro.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('webmacro', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'webmacro')
   finish
 endif
 
diff --git a/syntax/wget.vim b/syntax/wget.vim
index b5c41e921..268f8a6b8 100644
--- a/syntax/wget.vim
+++ b/syntax/wget.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('wget', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'wget')
   finish
 endif
 
diff --git a/syntax/winbatch.vim b/syntax/winbatch.vim
index 5b7eff689..ae8e99822 100644
--- a/syntax/winbatch.vim
+++ b/syntax/winbatch.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('winbatch', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'winbatch')
   finish
 endif
 
diff --git a/syntax/wml.vim b/syntax/wml.vim
index 462fefe5c..a3a980a7b 100644
--- a/syntax/wml.vim
+++ b/syntax/wml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('wml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'wml')
   finish
 endif
 
diff --git a/syntax/wsh.vim b/syntax/wsh.vim
index 732430679..eebdd822e 100644
--- a/syntax/wsh.vim
+++ b/syntax/wsh.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('wsh', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'wsh')
   finish
 endif
 
diff --git a/syntax/wsml.vim b/syntax/wsml.vim
index e141292dd..f34cc9107 100644
--- a/syntax/wsml.vim
+++ b/syntax/wsml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('wsml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'wsml')
   finish
 endif
 
diff --git a/syntax/wvdial.vim b/syntax/wvdial.vim
index eff51cb89..7f0884faf 100644
--- a/syntax/wvdial.vim
+++ b/syntax/wvdial.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('wvdial', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'wvdial')
   finish
 endif
 
diff --git a/syntax/xdc.vim b/syntax/xdc.vim
index b83415d33..d4b93cc97 100644
--- a/syntax/xdc.vim
+++ b/syntax/xdc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xdc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xdc')
   finish
 endif
 
diff --git a/syntax/xdefaults.vim b/syntax/xdefaults.vim
index 7bfedc24a..16bf2db38 100644
--- a/syntax/xdefaults.vim
+++ b/syntax/xdefaults.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xdefaults', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xdefaults')
   finish
 endif
 
diff --git a/syntax/xf86conf.vim b/syntax/xf86conf.vim
index 7f3e3847c..ab629510e 100644
--- a/syntax/xf86conf.vim
+++ b/syntax/xf86conf.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xf86conf', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xf86conf')
   finish
 endif
 
diff --git a/syntax/xhtml.vim b/syntax/xhtml.vim
index 72fc71dfe..3df25ee23 100644
--- a/syntax/xhtml.vim
+++ b/syntax/xhtml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xhtml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xhtml')
   finish
 endif
 
diff --git a/syntax/xinetd.vim b/syntax/xinetd.vim
index eb5a7127d..a1b180ae9 100644
--- a/syntax/xinetd.vim
+++ b/syntax/xinetd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xinetd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xinetd')
   finish
 endif
 
diff --git a/syntax/xmath.vim b/syntax/xmath.vim
index e4a55d263..f319d9bb1 100644
--- a/syntax/xmath.vim
+++ b/syntax/xmath.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xmath', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xmath')
   finish
 endif
 
diff --git a/syntax/xml.vim b/syntax/xml.vim
index e1244bfb0..21e469fe4 100644
--- a/syntax/xml.vim
+++ b/syntax/xml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xml')
   finish
 endif
 
diff --git a/syntax/xmodmap.vim b/syntax/xmodmap.vim
index 81c42c5de..2d4ebf959 100644
--- a/syntax/xmodmap.vim
+++ b/syntax/xmodmap.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xmodmap', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xmodmap')
   finish
 endif
 
diff --git a/syntax/xpm.vim b/syntax/xpm.vim
index d1a93f22a..5b0ebb180 100644
--- a/syntax/xpm.vim
+++ b/syntax/xpm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xpm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xpm')
   finish
 endif
 
diff --git a/syntax/xpm2.vim b/syntax/xpm2.vim
index 48ec5b56f..94dc8b90a 100644
--- a/syntax/xpm2.vim
+++ b/syntax/xpm2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xpm2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xpm2')
   finish
 endif
 
diff --git a/syntax/xquery.vim b/syntax/xquery.vim
index 580396966..e7bfa52da 100644
--- a/syntax/xquery.vim
+++ b/syntax/xquery.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xquery', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xquery')
   finish
 endif
 
diff --git a/syntax/xs.vim b/syntax/xs.vim
index 9b7b27170..4c7b63296 100644
--- a/syntax/xs.vim
+++ b/syntax/xs.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('perl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/xsd.vim b/syntax/xsd.vim
index 8f3a47cb0..0bd9e64cd 100644
--- a/syntax/xsd.vim
+++ b/syntax/xsd.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xsd', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xsd')
   finish
 endif
 
diff --git a/syntax/xsl.vim b/syntax/xsl.vim
index 8ca73411c..112c041c0 100644
--- a/syntax/xsl.vim
+++ b/syntax/xsl.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xsl', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xsl')
   finish
 endif
 
diff --git a/syntax/xslt.vim b/syntax/xslt.vim
index ad0f37bb2..9a884ca97 100644
--- a/syntax/xslt.vim
+++ b/syntax/xslt.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('xslt', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'xslt')
   finish
 endif
 
diff --git a/syntax/yacc.vim b/syntax/yacc.vim
index 3dd9742a2..5bfd6611e 100644
--- a/syntax/yacc.vim
+++ b/syntax/yacc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('yacc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'yacc')
   finish
 endif
 
diff --git a/syntax/yaml.vim b/syntax/yaml.vim
index 8b82460c1..fa243b60d 100644
--- a/syntax/yaml.vim
+++ b/syntax/yaml.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('yaml', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'yaml')
   finish
 endif
 
diff --git a/syntax/yats.vim b/syntax/yats.vim
index f790a3fbc..255f133a8 100644
--- a/syntax/yats.vim
+++ b/syntax/yats.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/css.vim b/syntax/yats/css.vim
index af9baf695..2baf78d39 100644
--- a/syntax/yats/css.vim
+++ b/syntax/yats/css.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/dom-document.vim b/syntax/yats/dom-document.vim
index 0c5062883..d8582220f 100644
--- a/syntax/yats/dom-document.vim
+++ b/syntax/yats/dom-document.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/dom-elem.vim b/syntax/yats/dom-elem.vim
index 438d0fd55..916a49323 100644
--- a/syntax/yats/dom-elem.vim
+++ b/syntax/yats/dom-elem.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/dom-event.vim b/syntax/yats/dom-event.vim
index 15a9a79d0..ce8d1f5a3 100644
--- a/syntax/yats/dom-event.vim
+++ b/syntax/yats/dom-event.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/dom-form.vim b/syntax/yats/dom-form.vim
index 5ff6e88f4..4e6cc8490 100644
--- a/syntax/yats/dom-form.vim
+++ b/syntax/yats/dom-form.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/dom-node.vim b/syntax/yats/dom-node.vim
index c6cd3283f..d6675be20 100644
--- a/syntax/yats/dom-node.vim
+++ b/syntax/yats/dom-node.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/dom-storage.vim b/syntax/yats/dom-storage.vim
index 19719e5a2..8067089d8 100644
--- a/syntax/yats/dom-storage.vim
+++ b/syntax/yats/dom-storage.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/ecma-402.vim b/syntax/yats/ecma-402.vim
index fca87fdf9..b0321c83e 100644
--- a/syntax/yats/ecma-402.vim
+++ b/syntax/yats/ecma-402.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-array.vim b/syntax/yats/es6-array.vim
index 9ea46a11f..6f300ac50 100644
--- a/syntax/yats/es6-array.vim
+++ b/syntax/yats/es6-array.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-date.vim b/syntax/yats/es6-date.vim
index 254038281..2bfcc54c3 100644
--- a/syntax/yats/es6-date.vim
+++ b/syntax/yats/es6-date.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-function.vim b/syntax/yats/es6-function.vim
index 0f39d0be2..cb991a931 100644
--- a/syntax/yats/es6-function.vim
+++ b/syntax/yats/es6-function.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-json.vim b/syntax/yats/es6-json.vim
index f1d1d488a..622b941ac 100644
--- a/syntax/yats/es6-json.vim
+++ b/syntax/yats/es6-json.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-map.vim b/syntax/yats/es6-map.vim
index 97e2558d1..dbbc651ca 100644
--- a/syntax/yats/es6-map.vim
+++ b/syntax/yats/es6-map.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-math.vim b/syntax/yats/es6-math.vim
index 0490f22e2..0e950556c 100644
--- a/syntax/yats/es6-math.vim
+++ b/syntax/yats/es6-math.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-number.vim b/syntax/yats/es6-number.vim
index 1fb37cb68..810d58f2b 100644
--- a/syntax/yats/es6-number.vim
+++ b/syntax/yats/es6-number.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-object.vim b/syntax/yats/es6-object.vim
index 750571d73..6a8e9354c 100644
--- a/syntax/yats/es6-object.vim
+++ b/syntax/yats/es6-object.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-promise.vim b/syntax/yats/es6-promise.vim
index 5cb97747e..bcbbf91f3 100644
--- a/syntax/yats/es6-promise.vim
+++ b/syntax/yats/es6-promise.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-proxy.vim b/syntax/yats/es6-proxy.vim
index 6bfd693c0..55aaeb7b8 100644
--- a/syntax/yats/es6-proxy.vim
+++ b/syntax/yats/es6-proxy.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-reflect.vim b/syntax/yats/es6-reflect.vim
index 9bc7c6be3..ff9455547 100644
--- a/syntax/yats/es6-reflect.vim
+++ b/syntax/yats/es6-reflect.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-regexp.vim b/syntax/yats/es6-regexp.vim
index dfa4932b9..c55bc5323 100644
--- a/syntax/yats/es6-regexp.vim
+++ b/syntax/yats/es6-regexp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-set.vim b/syntax/yats/es6-set.vim
index c6ce4695b..d35e26346 100644
--- a/syntax/yats/es6-set.vim
+++ b/syntax/yats/es6-set.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-string.vim b/syntax/yats/es6-string.vim
index 99ce6c775..0369bb1c3 100644
--- a/syntax/yats/es6-string.vim
+++ b/syntax/yats/es6-string.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-symbol.vim b/syntax/yats/es6-symbol.vim
index 5935f5ef3..7af3b5d32 100644
--- a/syntax/yats/es6-symbol.vim
+++ b/syntax/yats/es6-symbol.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/event.vim b/syntax/yats/event.vim
index 46c54913a..da4689951 100644
--- a/syntax/yats/event.vim
+++ b/syntax/yats/event.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/node.vim b/syntax/yats/node.vim
index 375f7dbd9..9cae877ae 100644
--- a/syntax/yats/node.vim
+++ b/syntax/yats/node.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/test.vim b/syntax/yats/test.vim
index bb4a60cbb..19b9fd67b 100644
--- a/syntax/yats/test.vim
+++ b/syntax/yats/test.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/typescript.vim b/syntax/yats/typescript.vim
index 5bdde783d..bc137218d 100644
--- a/syntax/yats/typescript.vim
+++ b/syntax/yats/typescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-blob.vim b/syntax/yats/web-blob.vim
index b9f4c78a3..aa0b63317 100644
--- a/syntax/yats/web-blob.vim
+++ b/syntax/yats/web-blob.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-console.vim b/syntax/yats/web-console.vim
index ff40a3fa2..b425430ef 100644
--- a/syntax/yats/web-console.vim
+++ b/syntax/yats/web-console.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-crypto.vim b/syntax/yats/web-crypto.vim
index 0e2f38aab..8160a2af7 100644
--- a/syntax/yats/web-crypto.vim
+++ b/syntax/yats/web-crypto.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-encoding.vim b/syntax/yats/web-encoding.vim
index 8728b5c21..8daef399d 100644
--- a/syntax/yats/web-encoding.vim
+++ b/syntax/yats/web-encoding.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-fetch.vim b/syntax/yats/web-fetch.vim
index 7a815e91a..79f4b2188 100644
--- a/syntax/yats/web-fetch.vim
+++ b/syntax/yats/web-fetch.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-geo.vim b/syntax/yats/web-geo.vim
index b3d5e85a3..3bb9ceb95 100644
--- a/syntax/yats/web-geo.vim
+++ b/syntax/yats/web-geo.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-history.vim b/syntax/yats/web-history.vim
index e4f05850f..6301a7c9d 100644
--- a/syntax/yats/web-history.vim
+++ b/syntax/yats/web-history.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-location.vim b/syntax/yats/web-location.vim
index 6484f74bf..6cbba7ba7 100644
--- a/syntax/yats/web-location.vim
+++ b/syntax/yats/web-location.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-navigator.vim b/syntax/yats/web-navigator.vim
index 020212d35..1c839e2e0 100644
--- a/syntax/yats/web-navigator.vim
+++ b/syntax/yats/web-navigator.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-network.vim b/syntax/yats/web-network.vim
index bffc3f522..2814a2434 100644
--- a/syntax/yats/web-network.vim
+++ b/syntax/yats/web-network.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-payment.vim b/syntax/yats/web-payment.vim
index 43b429db6..ce3741401 100644
--- a/syntax/yats/web-payment.vim
+++ b/syntax/yats/web-payment.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-service-worker.vim b/syntax/yats/web-service-worker.vim
index 708a7b9dd..fc039900a 100644
--- a/syntax/yats/web-service-worker.vim
+++ b/syntax/yats/web-service-worker.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-window.vim b/syntax/yats/web-window.vim
index 13a40f927..7e7ff43ef 100644
--- a/syntax/yats/web-window.vim
+++ b/syntax/yats/web-window.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-xhr.vim b/syntax/yats/web-xhr.vim
index ef70d0b24..d6dd2590f 100644
--- a/syntax/yats/web-xhr.vim
+++ b/syntax/yats/web-xhr.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web.vim b/syntax/yats/web.vim
index fa7d36931..f0b18686c 100644
--- a/syntax/yats/web.vim
+++ b/syntax/yats/web.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('typescript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/z8a.vim b/syntax/z8a.vim
index c43253f13..fd9a4e641 100644
--- a/syntax/z8a.vim
+++ b/syntax/z8a.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('z8a', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'z8a')
   finish
 endif
 
diff --git a/syntax/zephir.vim b/syntax/zephir.vim
index 54bfa05ed..04aaa7d29 100644
--- a/syntax/zephir.vim
+++ b/syntax/zephir.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zephir', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zephir')
   finish
 endif
 
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 0790689da..66ccb58d5 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/syntax/zimbu.vim b/syntax/zimbu.vim
index 3e1931219..23b2b7076 100644
--- a/syntax/zimbu.vim
+++ b/syntax/zimbu.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zimbu', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zimbu')
   finish
 endif
 
diff --git a/syntax/zir.vim b/syntax/zir.vim
index 10033967c..b1cfb5cab 100644
--- a/syntax/zir.vim
+++ b/syntax/zir.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zig', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/syntax/zsh.vim b/syntax/zsh.vim
index fc5810af9..11d5f394f 100644
--- a/syntax/zsh.vim
+++ b/syntax/zsh.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('sh', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'sh')
   finish
 endif
 

From ba3fe9e1ae6b2198a152cfa6a357cadc8c04dd14 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 25 Oct 2020 20:40:49 +0100
Subject: [PATCH 191/299] Fix loading when vim8 packages are used

---
 plugin/polyglot.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index c0639057f..bfd9c1a02 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -17,7 +17,7 @@ endif
 " and (mostly comments) from https://github.com/sheerun/vimrc
 "
 " Only settings that matter for proper editing are left
-if !has_key(g:polyglot_is_disabled, 'sensible')
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -1
   " Allow backspace in insert mode.
   if &backspace == ""
     set backspace=indent,eol,start

From 28388008327aacfc48db3c31f415564d93cd983f Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 25 Oct 2020 21:08:27 +0100
Subject: [PATCH 192/299] Fix conditions, #608

---
 after/ftplugin/cabal.vim                 | 2 +-
 after/ftplugin/coffee.vim                | 2 +-
 after/ftplugin/haskell.vim               | 2 +-
 after/ftplugin/html.vim                  | 2 +-
 after/ftplugin/idris.vim                 | 2 +-
 after/ftplugin/idris2.vim                | 2 +-
 after/ftplugin/javascript-1.vim          | 2 +-
 after/ftplugin/javascript-2.vim          | 2 +-
 after/ftplugin/javascriptreact.vim       | 2 +-
 after/ftplugin/jsx.vim                   | 2 +-
 after/ftplugin/llvm.vim                  | 2 +-
 after/ftplugin/puppet.vim                | 2 +-
 after/ftplugin/tsx.vim                   | 2 +-
 after/ftplugin/typescriptreact.vim       | 2 +-
 after/indent/html.vim                    | 2 +-
 after/indent/javascript-1.vim            | 2 +-
 after/indent/javascript-2.vim            | 2 +-
 after/indent/javascriptreact.vim         | 2 +-
 after/indent/jsx.vim                     | 2 +-
 after/indent/objc.vim                    | 2 +-
 after/indent/tsx.vim                     | 2 +-
 after/indent/typescript.vim              | 2 +-
 after/indent/typescriptreact.vim         | 2 +-
 after/syntax/c.vim                       | 2 +-
 after/syntax/coffee.vim                  | 2 +-
 after/syntax/cpp.vim                     | 2 +-
 after/syntax/haskell.vim                 | 2 +-
 after/syntax/help.vim                    | 2 +-
 after/syntax/html.vim                    | 2 +-
 after/syntax/html/aria.vim               | 2 +-
 after/syntax/html/electron.vim           | 2 +-
 after/syntax/html/rdfa.vim               | 2 +-
 after/syntax/idris.vim                   | 2 +-
 after/syntax/idris2.vim                  | 2 +-
 after/syntax/javascript.vim              | 2 +-
 after/syntax/javascript/graphql.vim      | 2 +-
 after/syntax/javascript/html5.vim        | 2 +-
 after/syntax/javascript/sql.vim          | 2 +-
 after/syntax/javascriptreact.vim         | 2 +-
 after/syntax/javascriptreact/graphql.vim | 2 +-
 after/syntax/jsx.vim                     | 2 +-
 after/syntax/jsx_pretty.vim              | 2 +-
 after/syntax/llvm.vim                    | 2 +-
 after/syntax/mdx.vim                     | 2 +-
 after/syntax/mma.vim                     | 2 +-
 after/syntax/objc.vim                    | 2 +-
 after/syntax/reason.vim                  | 2 +-
 after/syntax/reason/graphql.vim          | 2 +-
 after/syntax/rspec.vim                   | 2 +-
 after/syntax/ruby.vim                    | 2 +-
 after/syntax/rust.vim                    | 2 +-
 after/syntax/tsx.vim                     | 2 +-
 after/syntax/typescript/graphql.vim      | 2 +-
 after/syntax/typescriptreact.vim         | 2 +-
 after/syntax/typescriptreact/graphql.vim | 2 +-
 after/syntax/vue/graphql.vim             | 2 +-
 after/syntax/zsh.vim                     | 2 +-
 autoload/LaTeXtoUnicode.vim              | 2 +-
 autoload/RstFold.vim                     | 2 +-
 autoload/ada.vim                         | 2 +-
 autoload/cargo.vim                       | 2 +-
 autoload/cargo/quickfix.vim              | 2 +-
 autoload/clojurecomplete.vim             | 2 +-
 autoload/coffee.vim                      | 2 +-
 autoload/crystal/indent.vim              | 2 +-
 autoload/crystal_lang.vim                | 2 +-
 autoload/csv.vim                         | 2 +-
 autoload/dart.vim                        | 2 +-
 autoload/db/adapter/ecto.vim             | 2 +-
 autoload/ecrystal.vim                    | 2 +-
 autoload/elixir/indent.vim               | 2 +-
 autoload/elixir/util.vim                 | 2 +-
 autoload/fish.vim                        | 2 +-
 autoload/fsharp.vim                      | 2 +-
 autoload/fzf_gitignore.vim               | 2 +-
 autoload/go/config.vim                   | 2 +-
 autoload/graphql.vim                     | 2 +-
 autoload/htmlcomplete.vim                | 2 +-
 autoload/jsonnet.vim                     | 2 +-
 autoload/jsx_pretty/comment.vim          | 2 +-
 autoload/jsx_pretty/indent.vim           | 2 +-
 autoload/julia.vim                       | 2 +-
 autoload/julia/doc.vim                   | 2 +-
 autoload/julia_blocks.vim                | 2 +-
 autoload/julia_latex_symbols.vim         | 2 +-
 autoload/ledger.vim                      | 2 +-
 autoload/nim.vim                         | 2 +-
 autoload/pony.vim                        | 2 +-
 autoload/puppet/align.vim                | 2 +-
 autoload/puppet/ctags.vim                | 2 +-
 autoload/puppet/format.vim               | 2 +-
 autoload/python/utils.vim                | 2 +-
 autoload/requirements.vim                | 2 +-
 autoload/rubycomplete.vim                | 2 +-
 autoload/rust.vim                        | 2 +-
 autoload/rust/debugging.vim              | 2 +-
 autoload/rust/delimitmate.vim            | 2 +-
 autoload/rust/tags.vim                   | 2 +-
 autoload/rustfmt.vim                     | 2 +-
 autoload/smt2.vim                        | 2 +-
 autoload/terraform.vim                   | 2 +-
 autoload/vital/_crystal.vim              | 2 +-
 autoload/vital/_crystal/ColorEcho.vim    | 2 +-
 autoload/vital/_crystal/Data/List.vim    | 2 +-
 autoload/vital/_crystal/Data/String.vim  | 2 +-
 autoload/vital/_crystal/Process.vim      | 2 +-
 autoload/vital/_crystal/Web/JSON.vim     | 2 +-
 autoload/vital/crystal.vim               | 2 +-
 autoload/xml/aria.vim                    | 2 +-
 autoload/xml/html5.vim                   | 2 +-
 autoload/xml/xsd.vim                     | 2 +-
 autoload/zig/config.vim                  | 2 +-
 autoload/zig/fmt.vim                     | 2 +-
 autoload/zig/list.vim                    | 2 +-
 autoload/zig/util.vim                    | 2 +-
 compiler/ant.vim                         | 2 +-
 compiler/bdf.vim                         | 2 +-
 compiler/cake.vim                        | 2 +-
 compiler/cargo.vim                       | 2 +-
 compiler/coffee.vim                      | 2 +-
 compiler/credo.vim                       | 2 +-
 compiler/cryptol.vim                     | 2 +-
 compiler/cs.vim                          | 2 +-
 compiler/cucumber.vim                    | 2 +-
 compiler/dot.vim                         | 2 +-
 compiler/eruby.vim                       | 2 +-
 compiler/exunit.vim                      | 2 +-
 compiler/fish.vim                        | 2 +-
 compiler/go.vim                          | 2 +-
 compiler/gradle.vim                      | 2 +-
 compiler/gradlew.vim                     | 2 +-
 compiler/haml.vim                        | 2 +-
 compiler/ledger.vim                      | 2 +-
 compiler/lilypond.vim                    | 2 +-
 compiler/ls.vim                          | 2 +-
 compiler/mix.vim                         | 2 +-
 compiler/nim.vim                         | 2 +-
 compiler/nix-build.vim                   | 2 +-
 compiler/ocaml.vim                       | 2 +-
 compiler/powershell.vim                  | 2 +-
 compiler/python.vim                      | 2 +-
 compiler/rake.vim                        | 2 +-
 compiler/rspec.vim                       | 2 +-
 compiler/ruby.vim                        | 2 +-
 compiler/rubyunit.vim                    | 2 +-
 compiler/rustc.vim                       | 2 +-
 compiler/sass.vim                        | 2 +-
 compiler/sbt.vim                         | 2 +-
 compiler/swift.vim                       | 2 +-
 compiler/tcl.vim                         | 2 +-
 compiler/tex.vim                         | 2 +-
 compiler/tidy.vim                        | 2 +-
 compiler/typescript.vim                  | 2 +-
 extras/flow.vim                          | 2 +-
 extras/jsdoc.vim                         | 2 +-
 extras/ngdoc.vim                         | 2 +-
 ftplugin/8th.vim                         | 2 +-
 ftplugin/a2ps.vim                        | 2 +-
 ftplugin/aap.vim                         | 2 +-
 ftplugin/abap.vim                        | 2 +-
 ftplugin/abaqus.vim                      | 2 +-
 ftplugin/ada.vim                         | 2 +-
 ftplugin/alsaconf.vim                    | 2 +-
 ftplugin/ansible.vim                     | 2 +-
 ftplugin/ansible_hosts.vim               | 2 +-
 ftplugin/ant.vim                         | 2 +-
 ftplugin/arch.vim                        | 2 +-
 ftplugin/art.vim                         | 2 +-
 ftplugin/aspvbs.vim                      | 2 +-
 ftplugin/automake.vim                    | 2 +-
 ftplugin/awk.vim                         | 2 +-
 ftplugin/bdf.vim                         | 2 +-
 ftplugin/blade.vim                       | 2 +-
 ftplugin/bst.vim                         | 2 +-
 ftplugin/bzl.vim                         | 2 +-
 ftplugin/caddyfile.vim                   | 2 +-
 ftplugin/calendar.vim                    | 2 +-
 ftplugin/cdrdaoconf.vim                  | 2 +-
 ftplugin/cfg.vim                         | 2 +-
 ftplugin/ch.vim                          | 2 +-
 ftplugin/clojure.vim                     | 2 +-
 ftplugin/cobol.vim                       | 2 +-
 ftplugin/coffee.vim                      | 2 +-
 ftplugin/conf.vim                        | 2 +-
 ftplugin/config.vim                      | 2 +-
 ftplugin/crm.vim                         | 2 +-
 ftplugin/cryptol/folding.vim             | 2 +-
 ftplugin/crystal.vim                     | 2 +-
 ftplugin/cs.vim                          | 2 +-
 ftplugin/csc.vim                         | 2 +-
 ftplugin/css.vim                         | 2 +-
 ftplugin/csv.vim                         | 2 +-
 ftplugin/cucumber.vim                    | 2 +-
 ftplugin/cvsrc.vim                       | 2 +-
 ftplugin/dart.vim                        | 2 +-
 ftplugin/debchangelog.vim                | 2 +-
 ftplugin/debcontrol.vim                  | 2 +-
 ftplugin/denyhosts.vim                   | 2 +-
 ftplugin/dhall.vim                       | 2 +-
 ftplugin/dictconf.vim                    | 2 +-
 ftplugin/dictdconf.vim                   | 2 +-
 ftplugin/diff.vim                        | 2 +-
 ftplugin/dircolors.vim                   | 2 +-
 ftplugin/docker-compose.vim              | 2 +-
 ftplugin/dockerfile.vim                  | 2 +-
 ftplugin/dosbatch.vim                    | 2 +-
 ftplugin/dosini.vim                      | 2 +-
 ftplugin/dtd.vim                         | 2 +-
 ftplugin/dune.vim                        | 2 +-
 ftplugin/ecrystal.vim                    | 2 +-
 ftplugin/eelixir.vim                     | 2 +-
 ftplugin/elinks.vim                      | 2 +-
 ftplugin/elixir.vim                      | 2 +-
 ftplugin/embeddedpuppet.vim              | 2 +-
 ftplugin/ember-script.vim                | 2 +-
 ftplugin/emblem.vim                      | 2 +-
 ftplugin/eruby.vim                       | 2 +-
 ftplugin/eterm.vim                       | 2 +-
 ftplugin/falcon.vim                      | 2 +-
 ftplugin/fennel.vim                      | 2 +-
 ftplugin/fetchmail.vim                   | 2 +-
 ftplugin/fish.vim                        | 2 +-
 ftplugin/fortran.vim                     | 2 +-
 ftplugin/framescript.vim                 | 2 +-
 ftplugin/fvwm.vim                        | 2 +-
 ftplugin/gdb.vim                         | 2 +-
 ftplugin/git.vim                         | 2 +-
 ftplugin/gitcommit.vim                   | 2 +-
 ftplugin/gitconfig.vim                   | 2 +-
 ftplugin/gitignore.vim                   | 2 +-
 ftplugin/gitrebase.vim                   | 2 +-
 ftplugin/gitsendemail.vim                | 2 +-
 ftplugin/gpg.vim                         | 2 +-
 ftplugin/graphql.vim                     | 2 +-
 ftplugin/groovy.vim                      | 2 +-
 ftplugin/group.vim                       | 2 +-
 ftplugin/grub.vim                        | 2 +-
 ftplugin/haml.vim                        | 2 +-
 ftplugin/hamster.vim                     | 2 +-
 ftplugin/handlebars.vim                  | 2 +-
 ftplugin/hcl.vim                         | 2 +-
 ftplugin/help.vim                        | 2 +-
 ftplugin/hgcommit.vim                    | 2 +-
 ftplugin/hive.vim                        | 2 +-
 ftplugin/hog.vim                         | 2 +-
 ftplugin/hostconf.vim                    | 2 +-
 ftplugin/hostsaccess.vim                 | 2 +-
 ftplugin/html.vim                        | 2 +-
 ftplugin/htmldjango.vim                  | 2 +-
 ftplugin/i3config.vim                    | 2 +-
 ftplugin/idris.vim                       | 2 +-
 ftplugin/idris2.vim                      | 2 +-
 ftplugin/indent.vim                      | 2 +-
 ftplugin/ion.vim                         | 2 +-
 ftplugin/j.vim                           | 2 +-
 ftplugin/java.vim                        | 2 +-
 ftplugin/jproperties.vim                 | 2 +-
 ftplugin/jq.vim                          | 2 +-
 ftplugin/json.vim                        | 2 +-
 ftplugin/jsonnet.vim                     | 2 +-
 ftplugin/jsp.vim                         | 2 +-
 ftplugin/julia.vim                       | 2 +-
 ftplugin/juliadoc.vim                    | 2 +-
 ftplugin/kconfig.vim                     | 2 +-
 ftplugin/kotlin.vim                      | 2 +-
 ftplugin/kwt.vim                         | 2 +-
 ftplugin/ld.vim                          | 2 +-
 ftplugin/less.vim                        | 2 +-
 ftplugin/lftp.vim                        | 2 +-
 ftplugin/libao.vim                       | 2 +-
 ftplugin/lilypond.vim                    | 2 +-
 ftplugin/limits.vim                      | 2 +-
 ftplugin/liquid.vim                      | 2 +-
 ftplugin/lisp.vim                        | 2 +-
 ftplugin/litcoffee.vim                   | 2 +-
 ftplugin/llvm.vim                        | 2 +-
 ftplugin/logcheck.vim                    | 2 +-
 ftplugin/loginaccess.vim                 | 2 +-
 ftplugin/logindefs.vim                   | 2 +-
 ftplugin/logtalk.vim                     | 2 +-
 ftplugin/lprolog.vim                     | 2 +-
 ftplugin/ls.vim                          | 2 +-
 ftplugin/m4.vim                          | 2 +-
 ftplugin/mail.vim                        | 2 +-
 ftplugin/mailaliases.vim                 | 2 +-
 ftplugin/mailcap.vim                     | 2 +-
 ftplugin/make.vim                        | 2 +-
 ftplugin/mako.vim                        | 2 +-
 ftplugin/manconf.vim                     | 2 +-
 ftplugin/markdown.vim                    | 2 +-
 ftplugin/meson.vim                       | 2 +-
 ftplugin/mf.vim                          | 2 +-
 ftplugin/mma.vim                         | 2 +-
 ftplugin/modconf.vim                     | 2 +-
 ftplugin/moon.vim                        | 2 +-
 ftplugin/mp.vim                          | 2 +-
 ftplugin/mplayerconf.vim                 | 2 +-
 ftplugin/mrxvtrc.vim                     | 2 +-
 ftplugin/mustache.vim                    | 2 +-
 ftplugin/muttrc.vim                      | 2 +-
 ftplugin/nanorc.vim                      | 2 +-
 ftplugin/neomuttrc.vim                   | 2 +-
 ftplugin/netrc.vim                       | 2 +-
 ftplugin/nginx.vim                       | 2 +-
 ftplugin/nix.vim                         | 2 +-
 ftplugin/nroff.vim                       | 2 +-
 ftplugin/nsis.vim                        | 2 +-
 ftplugin/oasis.vim                       | 2 +-
 ftplugin/objc.vim                        | 2 +-
 ftplugin/ocaml.vim                       | 2 +-
 ftplugin/ocamlbuild_tags.vim             | 2 +-
 ftplugin/occam.vim                       | 2 +-
 ftplugin/omake.vim                       | 2 +-
 ftplugin/opencl.vim                      | 2 +-
 ftplugin/pamconf.vim                     | 2 +-
 ftplugin/pascal.vim                      | 2 +-
 ftplugin/passwd.vim                      | 2 +-
 ftplugin/pdf.vim                         | 2 +-
 ftplugin/perl.vim                        | 2 +-
 ftplugin/pinfo.vim                       | 2 +-
 ftplugin/plantuml.vim                    | 2 +-
 ftplugin/pony.vim                        | 2 +-
 ftplugin/postscr.vim                     | 2 +-
 ftplugin/procmail.vim                    | 2 +-
 ftplugin/prolog.vim                      | 2 +-
 ftplugin/protocols.vim                   | 2 +-
 ftplugin/ps1.vim                         | 2 +-
 ftplugin/ps1xml.vim                      | 2 +-
 ftplugin/pug.vim                         | 2 +-
 ftplugin/puppet.vim                      | 2 +-
 ftplugin/puppet_tagbar.vim               | 2 +-
 ftplugin/purescript.vim                  | 2 +-
 ftplugin/pyrex.vim                       | 2 +-
 ftplugin/qml.vim                         | 2 +-
 ftplugin/quake.vim                       | 2 +-
 ftplugin/racket.vim                      | 2 +-
 ftplugin/raku.vim                        | 2 +-
 ftplugin/raml.vim                        | 2 +-
 ftplugin/razor.vim                       | 2 +-
 ftplugin/readline.vim                    | 2 +-
 ftplugin/reva.vim                        | 2 +-
 ftplugin/rmd.vim                         | 2 +-
 ftplugin/rnc.vim                         | 2 +-
 ftplugin/rnoweb.vim                      | 2 +-
 ftplugin/rpl.vim                         | 2 +-
 ftplugin/rrst.vim                        | 2 +-
 ftplugin/rst.vim                         | 2 +-
 ftplugin/ruby.vim                        | 2 +-
 ftplugin/rust.vim                        | 2 +-
 ftplugin/rust/tagbar.vim                 | 2 +-
 ftplugin/sass.vim                        | 2 +-
 ftplugin/sbt.vim                         | 2 +-
 ftplugin/scala.vim                       | 2 +-
 ftplugin/scala.xpt.vim                   | 2 +-
 ftplugin/scala/tagbar.vim                | 2 +-
 ftplugin/scheme.vim                      | 2 +-
 ftplugin/screen.vim                      | 2 +-
 ftplugin/scss.vim                        | 2 +-
 ftplugin/sensors.vim                     | 2 +-
 ftplugin/services.vim                    | 2 +-
 ftplugin/setserial.vim                   | 2 +-
 ftplugin/sexplib.vim                     | 2 +-
 ftplugin/sieve.vim                       | 2 +-
 ftplugin/slim.vim                        | 2 +-
 ftplugin/slpconf.vim                     | 2 +-
 ftplugin/slpreg.vim                      | 2 +-
 ftplugin/slpspi.vim                      | 2 +-
 ftplugin/smt2.vim                        | 2 +-
 ftplugin/solidity.vim                    | 2 +-
 ftplugin/spec.vim                        | 2 +-
 ftplugin/sql.vim                         | 2 +-
 ftplugin/sshconfig.vim                   | 2 +-
 ftplugin/stylus.vim                      | 2 +-
 ftplugin/sudoers.vim                     | 2 +-
 ftplugin/svelte.vim                      | 2 +-
 ftplugin/swift.vim                       | 2 +-
 ftplugin/swiftgyb.vim                    | 2 +-
 ftplugin/sysctl.vim                      | 2 +-
 ftplugin/systemd.vim                     | 2 +-
 ftplugin/systemverilog.vim               | 2 +-
 ftplugin/tablegen.vim                    | 2 +-
 ftplugin/tcl.vim                         | 2 +-
 ftplugin/terminfo.vim                    | 2 +-
 ftplugin/terraform.vim                   | 2 +-
 ftplugin/tex.vim                         | 2 +-
 ftplugin/text.vim                        | 2 +-
 ftplugin/textile.vim                     | 2 +-
 ftplugin/tmux.vim                        | 2 +-
 ftplugin/toml.vim                        | 2 +-
 ftplugin/treetop.vim                     | 2 +-
 ftplugin/tt2html.vim                     | 2 +-
 ftplugin/twig.vim                        | 2 +-
 ftplugin/typescript.vim                  | 2 +-
 ftplugin/typescriptreact.vim             | 2 +-
 ftplugin/udevconf.vim                    | 2 +-
 ftplugin/udevperm.vim                    | 2 +-
 ftplugin/updatedb.vim                    | 2 +-
 ftplugin/vala.vim                        | 2 +-
 ftplugin/vb.vim                          | 2 +-
 ftplugin/verilog.vim                     | 2 +-
 ftplugin/vhdl.vim                        | 2 +-
 ftplugin/vlang.vim                       | 2 +-
 ftplugin/vroom.vim                       | 2 +-
 ftplugin/vue.vim                         | 2 +-
 ftplugin/wast.vim                        | 2 +-
 ftplugin/xdefaults.vim                   | 2 +-
 ftplugin/xf86conf.vim                    | 2 +-
 ftplugin/xhtml.vim                       | 2 +-
 ftplugin/xinetd.vim                      | 2 +-
 ftplugin/xmodmap.vim                     | 2 +-
 ftplugin/xs.vim                          | 2 +-
 ftplugin/xsd.vim                         | 2 +-
 ftplugin/xslt.vim                        | 2 +-
 ftplugin/yaml.vim                        | 2 +-
 ftplugin/zig.vim                         | 2 +-
 ftplugin/zimbu.vim                       | 2 +-
 indent/Jenkinsfile.vim                   | 2 +-
 indent/aap.vim                           | 2 +-
 indent/ada.vim                           | 2 +-
 indent/ansible.vim                       | 2 +-
 indent/ant.vim                           | 2 +-
 indent/applescript.vim                   | 2 +-
 indent/arduino.vim                       | 2 +-
 indent/autohotkey.vim                    | 2 +-
 indent/automake.vim                      | 2 +-
 indent/awk.vim                           | 2 +-
 indent/bib.vim                           | 2 +-
 indent/blade.vim                         | 2 +-
 indent/bst.vim                           | 2 +-
 indent/bzl.vim                           | 2 +-
 indent/cabal.vim                         | 2 +-
 indent/caddyfile.vim                     | 2 +-
 indent/cdl.vim                           | 2 +-
 indent/ch.vim                            | 2 +-
 indent/chaiscript.vim                    | 2 +-
 indent/clojure.vim                       | 2 +-
 indent/cmake.vim                         | 2 +-
 indent/cobol.vim                         | 2 +-
 indent/coffee.vim                        | 2 +-
 indent/config.vim                        | 2 +-
 indent/crystal.vim                       | 2 +-
 indent/cs.vim                            | 2 +-
 indent/css.vim                           | 2 +-
 indent/cucumber.vim                      | 2 +-
 indent/cuda.vim                          | 2 +-
 indent/cython.vim                        | 2 +-
 indent/d.vim                             | 2 +-
 indent/dart.vim                          | 2 +-
 indent/dictconf.vim                      | 2 +-
 indent/dictdconf.vim                     | 2 +-
 indent/dosbatch.vim                      | 2 +-
 indent/dtd.vim                           | 2 +-
 indent/dune.vim                          | 2 +-
 indent/dylan.vim                         | 2 +-
 indent/ecrystal.vim                      | 2 +-
 indent/eelixir.vim                       | 2 +-
 indent/elixir.vim                        | 2 +-
 indent/elm.vim                           | 2 +-
 indent/ember-script.vim                  | 2 +-
 indent/emblem.vim                        | 2 +-
 indent/erlang.vim                        | 2 +-
 indent/eruby.vim                         | 2 +-
 indent/eterm.vim                         | 2 +-
 indent/falcon.vim                        | 2 +-
 indent/fennel.vim                        | 2 +-
 indent/fish.vim                          | 2 +-
 indent/fortran.vim                       | 2 +-
 indent/framescript.vim                   | 2 +-
 indent/fsharp.vim                        | 2 +-
 indent/gdscript3.vim                     | 2 +-
 indent/gitconfig.vim                     | 2 +-
 indent/gitolite.vim                      | 2 +-
 indent/glsl.vim                          | 2 +-
 indent/go.vim                            | 2 +-
 indent/gohtmltmpl.vim                    | 2 +-
 indent/graphql.vim                       | 2 +-
 indent/haml.vim                          | 2 +-
 indent/hamster.vim                       | 2 +-
 indent/handlebars.vim                    | 2 +-
 indent/haskell.vim                       | 2 +-
 indent/hcl.vim                           | 2 +-
 indent/hog.vim                           | 2 +-
 indent/html.vim                          | 2 +-
 indent/htmldjango.vim                    | 2 +-
 indent/idris.vim                         | 2 +-
 indent/idris2.vim                        | 2 +-
 indent/j.vim                             | 2 +-
 indent/java.vim                          | 2 +-
 indent/javascript.vim                    | 2 +-
 indent/json.vim                          | 2 +-
 indent/jsp.vim                           | 2 +-
 indent/jst.vim                           | 2 +-
 indent/julia.vim                         | 2 +-
 indent/kotlin.vim                        | 2 +-
 indent/ld.vim                            | 2 +-
 indent/ledger.vim                        | 2 +-
 indent/less.vim                          | 2 +-
 indent/lifelines.vim                     | 2 +-
 indent/lilypond.vim                      | 2 +-
 indent/liquid.vim                        | 2 +-
 indent/lisp.vim                          | 2 +-
 indent/litcoffee.vim                     | 2 +-
 indent/llvm.vim                          | 2 +-
 indent/logtalk.vim                       | 2 +-
 indent/ls.vim                            | 2 +-
 indent/lua.vim                           | 2 +-
 indent/mail.vim                          | 2 +-
 indent/make.vim                          | 2 +-
 indent/mako.vim                          | 2 +-
 indent/markdown.vim                      | 2 +-
 indent/meson.vim                         | 2 +-
 indent/mf.vim                            | 2 +-
 indent/moon.vim                          | 2 +-
 indent/mp.vim                            | 2 +-
 indent/mustache.vim                      | 2 +-
 indent/nginx.vim                         | 2 +-
 indent/nim.vim                           | 2 +-
 indent/nix.vim                           | 2 +-
 indent/nsis.vim                          | 2 +-
 indent/ocaml.vim                         | 2 +-
 indent/occam.vim                         | 2 +-
 indent/octave.vim                        | 2 +-
 indent/odin.vim                          | 2 +-
 indent/omake.vim                         | 2 +-
 indent/opencl.vim                        | 2 +-
 indent/pascal.vim                        | 2 +-
 indent/perl.vim                          | 2 +-
 indent/pgsql.vim                         | 2 +-
 indent/plantuml.vim                      | 2 +-
 indent/pony.vim                          | 2 +-
 indent/postscr.vim                       | 2 +-
 indent/pov.vim                           | 2 +-
 indent/prolog.vim                        | 2 +-
 indent/proto.vim                         | 2 +-
 indent/ps1.vim                           | 2 +-
 indent/pug.vim                           | 2 +-
 indent/puppet.vim                        | 2 +-
 indent/purescript.vim                    | 2 +-
 indent/pyrex.vim                         | 2 +-
 indent/python.vim                        | 2 +-
 indent/qml.vim                           | 2 +-
 indent/racket.vim                        | 2 +-
 indent/raku.vim                          | 2 +-
 indent/razor.vim                         | 2 +-
 indent/readline.vim                      | 2 +-
 indent/reason.vim                        | 2 +-
 indent/rmd.vim                           | 2 +-
 indent/rnoweb.vim                        | 2 +-
 indent/rpl.vim                           | 2 +-
 indent/rrst.vim                          | 2 +-
 indent/rst.vim                           | 2 +-
 indent/ruby.vim                          | 2 +-
 indent/rust.vim                          | 2 +-
 indent/sas.vim                           | 2 +-
 indent/sass.vim                          | 2 +-
 indent/scala.vim                         | 2 +-
 indent/scheme.vim                        | 2 +-
 indent/scss.vim                          | 2 +-
 indent/sdl.vim                           | 2 +-
 indent/slim.vim                          | 2 +-
 indent/slime.vim                         | 2 +-
 indent/sml.vim                           | 2 +-
 indent/solidity.vim                      | 2 +-
 indent/sql.vim                           | 2 +-
 indent/sshconfig.vim                     | 2 +-
 indent/stylus.vim                        | 2 +-
 indent/svelte.vim                        | 2 +-
 indent/svg.vim                           | 2 +-
 indent/swift.vim                         | 2 +-
 indent/systemverilog.vim                 | 2 +-
 indent/tcl.vim                           | 2 +-
 indent/teraterm.vim                      | 2 +-
 indent/terraform.vim                     | 2 +-
 indent/tex.vim                           | 2 +-
 indent/tf.vim                            | 2 +-
 indent/tilde.vim                         | 2 +-
 indent/treetop.vim                       | 2 +-
 indent/twig.vim                          | 2 +-
 indent/typescript.vim                    | 2 +-
 indent/typescriptreact.vim               | 2 +-
 indent/vala.vim                          | 2 +-
 indent/vb.vim                            | 2 +-
 indent/velocity.vim                      | 2 +-
 indent/verilog.vim                       | 2 +-
 indent/vhdl.vim                          | 2 +-
 indent/vlang.vim                         | 2 +-
 indent/vroom.vim                         | 2 +-
 indent/vue.vim                           | 2 +-
 indent/wast.vim                          | 2 +-
 indent/xf86conf.vim                      | 2 +-
 indent/xhtml.vim                         | 2 +-
 indent/xinetd.vim                        | 2 +-
 indent/xsd.vim                           | 2 +-
 indent/xslt.vim                          | 2 +-
 indent/yacc.vim                          | 2 +-
 indent/yaml.vim                          | 2 +-
 indent/zig.vim                           | 2 +-
 indent/zimbu.vim                         | 2 +-
 scripts/build                            | 2 +-
 syntax/8th.vim                           | 2 +-
 syntax/Jenkinsfile.vim                   | 2 +-
 syntax/a2ps.vim                          | 2 +-
 syntax/a65.vim                           | 2 +-
 syntax/aap.vim                           | 2 +-
 syntax/abap.vim                          | 2 +-
 syntax/abaqus.vim                        | 2 +-
 syntax/abc.vim                           | 2 +-
 syntax/abel.vim                          | 2 +-
 syntax/acedb.vim                         | 2 +-
 syntax/ada.vim                           | 2 +-
 syntax/ahdl.vim                          | 2 +-
 syntax/aidl.vim                          | 2 +-
 syntax/alsaconf.vim                      | 2 +-
 syntax/aml.vim                           | 2 +-
 syntax/ampl.vim                          | 2 +-
 syntax/ansible.vim                       | 2 +-
 syntax/ansible_hosts.vim                 | 2 +-
 syntax/ant.vim                           | 2 +-
 syntax/apache.vim                        | 2 +-
 syntax/apachestyle.vim                   | 2 +-
 syntax/apiblueprint.vim                  | 2 +-
 syntax/applescript.vim                   | 2 +-
 syntax/aptconf.vim                       | 2 +-
 syntax/arch.vim                          | 2 +-
 syntax/arduino.vim                       | 2 +-
 syntax/art.vim                           | 2 +-
 syntax/asciidoc.vim                      | 2 +-
 syntax/asl.vim                           | 2 +-
 syntax/asn.vim                           | 2 +-
 syntax/aspperl.vim                       | 2 +-
 syntax/aspvbs.vim                        | 2 +-
 syntax/asterisk.vim                      | 2 +-
 syntax/asteriskvm.vim                    | 2 +-
 syntax/atlas.vim                         | 2 +-
 syntax/autodoc.vim                       | 2 +-
 syntax/autoit.vim                        | 2 +-
 syntax/automake.vim                      | 2 +-
 syntax/ave.vim                           | 2 +-
 syntax/awk.vim                           | 2 +-
 syntax/b.vim                             | 2 +-
 syntax/basic.vim                         | 2 +-
 syntax/basic/class.vim                   | 2 +-
 syntax/basic/cluster.vim                 | 2 +-
 syntax/basic/decorator.vim               | 2 +-
 syntax/basic/doc.vim                     | 2 +-
 syntax/basic/function.vim                | 2 +-
 syntax/basic/identifiers.vim             | 2 +-
 syntax/basic/keyword.vim                 | 2 +-
 syntax/basic/literal.vim                 | 2 +-
 syntax/basic/members.vim                 | 2 +-
 syntax/basic/object.vim                  | 2 +-
 syntax/basic/patch.vim                   | 2 +-
 syntax/basic/reserved.vim                | 2 +-
 syntax/basic/symbols.vim                 | 2 +-
 syntax/basic/type.vim                    | 2 +-
 syntax/bc.vim                            | 2 +-
 syntax/bdf.vim                           | 2 +-
 syntax/bib.vim                           | 2 +-
 syntax/bindzone.vim                      | 2 +-
 syntax/blade.vim                         | 2 +-
 syntax/blank.vim                         | 2 +-
 syntax/brewfile.vim                      | 2 +-
 syntax/bsdl.vim                          | 2 +-
 syntax/bst.vim                           | 2 +-
 syntax/bzl.vim                           | 2 +-
 syntax/bzr.vim                           | 2 +-
 syntax/c.vim                             | 2 +-
 syntax/cabal-1.vim                       | 2 +-
 syntax/cabal-2.vim                       | 2 +-
 syntax/caddyfile.vim                     | 2 +-
 syntax/calendar.vim                      | 2 +-
 syntax/carp.vim                          | 2 +-
 syntax/catalog.vim                       | 2 +-
 syntax/cdl.vim                           | 2 +-
 syntax/cdrdaoconf.vim                    | 2 +-
 syntax/cdrtoc.vim                        | 2 +-
 syntax/cf.vim                            | 2 +-
 syntax/cfg.vim                           | 2 +-
 syntax/ch.vim                            | 2 +-
 syntax/chaiscript.vim                    | 2 +-
 syntax/chaskell.vim                      | 2 +-
 syntax/chill.vim                         | 2 +-
 syntax/chordpro.vim                      | 2 +-
 syntax/cl.vim                            | 2 +-
 syntax/clean.vim                         | 2 +-
 syntax/clojure.vim                       | 2 +-
 syntax/cmake.vim                         | 2 +-
 syntax/cmod.vim                          | 2 +-
 syntax/cmusrc.vim                        | 2 +-
 syntax/cobol.vim                         | 2 +-
 syntax/coco.vim                          | 2 +-
 syntax/coffee.vim                        | 2 +-
 syntax/common.vim                        | 2 +-
 syntax/conaryrecipe.vim                  | 2 +-
 syntax/conf.vim                          | 2 +-
 syntax/config.vim                        | 2 +-
 syntax/cpp.vim                           | 2 +-
 syntax/cql.vim                           | 2 +-
 syntax/crm.vim                           | 2 +-
 syntax/crontab.vim                       | 2 +-
 syntax/cryptol.vim                       | 2 +-
 syntax/crystal.vim                       | 2 +-
 syntax/cs.vim                            | 2 +-
 syntax/csc.vim                           | 2 +-
 syntax/csdl.vim                          | 2 +-
 syntax/csp.vim                           | 2 +-
 syntax/css.vim                           | 2 +-
 syntax/csv.vim                           | 2 +-
 syntax/cterm.vim                         | 2 +-
 syntax/cucumber.vim                      | 2 +-
 syntax/cuda.vim                          | 2 +-
 syntax/cuesheet.vim                      | 2 +-
 syntax/cupl.vim                          | 2 +-
 syntax/cuplsim.vim                       | 2 +-
 syntax/cvs.vim                           | 2 +-
 syntax/cvsrc.vim                         | 2 +-
 syntax/cynpp.vim                         | 2 +-
 syntax/d.vim                             | 2 +-
 syntax/dart.vim                          | 2 +-
 syntax/datascript.vim                    | 2 +-
 syntax/dcd.vim                           | 2 +-
 syntax/dcov.vim                          | 2 +-
 syntax/dd.vim                            | 2 +-
 syntax/ddoc.vim                          | 2 +-
 syntax/debchangelog.vim                  | 2 +-
 syntax/debcontrol.vim                    | 2 +-
 syntax/debcopyright.vim                  | 2 +-
 syntax/debsources.vim                    | 2 +-
 syntax/def.vim                           | 2 +-
 syntax/denyhosts.vim                     | 2 +-
 syntax/desc.vim                          | 2 +-
 syntax/desktop.vim                       | 2 +-
 syntax/dhall.vim                         | 2 +-
 syntax/dictconf.vim                      | 2 +-
 syntax/dictdconf.vim                     | 2 +-
 syntax/diff.vim                          | 2 +-
 syntax/dircolors.vim                     | 2 +-
 syntax/django.vim                        | 2 +-
 syntax/dnsmasq.vim                       | 2 +-
 syntax/docker-compose.vim                | 2 +-
 syntax/dockerfile.vim                    | 2 +-
 syntax/dosbatch.vim                      | 2 +-
 syntax/dosini.vim                        | 2 +-
 syntax/dot.vim                           | 2 +-
 syntax/dracula.vim                       | 2 +-
 syntax/dsdl.vim                          | 2 +-
 syntax/dsl.vim                           | 2 +-
 syntax/dtd.vim                           | 2 +-
 syntax/dts.vim                           | 2 +-
 syntax/dune.vim                          | 2 +-
 syntax/dylan.vim                         | 2 +-
 syntax/dylanintr.vim                     | 2 +-
 syntax/dylanlid.vim                      | 2 +-
 syntax/ecd.vim                           | 2 +-
 syntax/ecrystal.vim                      | 2 +-
 syntax/edif.vim                          | 2 +-
 syntax/eelixir.vim                       | 2 +-
 syntax/elf.vim                           | 2 +-
 syntax/elinks.vim                        | 2 +-
 syntax/elixir.vim                        | 2 +-
 syntax/elm.vim                           | 2 +-
 syntax/elmfilt.vim                       | 2 +-
 syntax/embeddedpuppet.vim                | 2 +-
 syntax/ember-script.vim                  | 2 +-
 syntax/emblem.vim                        | 2 +-
 syntax/erlang.vim                        | 2 +-
 syntax/eruby.vim                         | 2 +-
 syntax/esmtprc.vim                       | 2 +-
 syntax/esqlc.vim                         | 2 +-
 syntax/esterel.vim                       | 2 +-
 syntax/eterm.vim                         | 2 +-
 syntax/exim.vim                          | 2 +-
 syntax/expect.vim                        | 2 +-
 syntax/exports.vim                       | 2 +-
 syntax/falcon.vim                        | 2 +-
 syntax/fan.vim                           | 2 +-
 syntax/fbs.vim                           | 2 +-
 syntax/fennel.vim                        | 2 +-
 syntax/ferm.vim                          | 2 +-
 syntax/fetchmail.vim                     | 2 +-
 syntax/fgl.vim                           | 2 +-
 syntax/fish.vim                          | 2 +-
 syntax/flow.vim                          | 2 +-
 syntax/focexec.vim                       | 2 +-
 syntax/forth.vim                         | 2 +-
 syntax/fortran.vim                       | 2 +-
 syntax/framescript.vim                   | 2 +-
 syntax/freebasic.vim                     | 2 +-
 syntax/fsharp.vim                        | 2 +-
 syntax/fstab.vim                         | 2 +-
 syntax/fvwm.vim                          | 2 +-
 syntax/gdb.vim                           | 2 +-
 syntax/gdmo.vim                          | 2 +-
 syntax/gdscript3.vim                     | 2 +-
 syntax/gedcom.vim                        | 2 +-
 syntax/git.vim                           | 2 +-
 syntax/gitcommit.vim                     | 2 +-
 syntax/gitconfig.vim                     | 2 +-
 syntax/gitignore.vim                     | 2 +-
 syntax/gitolite.vim                      | 2 +-
 syntax/gitrebase.vim                     | 2 +-
 syntax/gitsendemail.vim                  | 2 +-
 syntax/gkrellmrc.vim                     | 2 +-
 syntax/glsl.vim                          | 2 +-
 syntax/gmpl.vim                          | 2 +-
 syntax/gnash.vim                         | 2 +-
 syntax/gnuplot.vim                       | 2 +-
 syntax/go.vim                            | 2 +-
 syntax/godebugoutput.vim                 | 2 +-
 syntax/godebugstacktrace.vim             | 2 +-
 syntax/godebugvariables.vim              | 2 +-
 syntax/godefstack.vim                    | 2 +-
 syntax/gohtmltmpl.vim                    | 2 +-
 syntax/gomod.vim                         | 2 +-
 syntax/gotexttmpl.vim                    | 2 +-
 syntax/gp.vim                            | 2 +-
 syntax/gpg.vim                           | 2 +-
 syntax/grads.vim                         | 2 +-
 syntax/graphql.vim                       | 2 +-
 syntax/gretl.vim                         | 2 +-
 syntax/groovy.vim                        | 2 +-
 syntax/group.vim                         | 2 +-
 syntax/grub.vim                          | 2 +-
 syntax/gsl.vim                           | 2 +-
 syntax/gsp.vim                           | 2 +-
 syntax/gtkrc.vim                         | 2 +-
 syntax/haml.vim                          | 2 +-
 syntax/hamster.vim                       | 2 +-
 syntax/handlebars.vim                    | 2 +-
 syntax/haproxy.vim                       | 2 +-
 syntax/haskell.vim                       | 2 +-
 syntax/haste.vim                         | 2 +-
 syntax/hastepreproc.vim                  | 2 +-
 syntax/haxe.vim                          | 2 +-
 syntax/hb.vim                            | 2 +-
 syntax/hcl.vim                           | 2 +-
 syntax/helm.vim                          | 2 +-
 syntax/help.vim                          | 2 +-
 syntax/hercules.vim                      | 2 +-
 syntax/hex.vim                           | 2 +-
 syntax/hgcommit.vim                      | 2 +-
 syntax/hive.vim                          | 2 +-
 syntax/hog.vim                           | 2 +-
 syntax/hollywood.vim                     | 2 +-
 syntax/hostconf.vim                      | 2 +-
 syntax/hostsaccess.vim                   | 2 +-
 syntax/html.vim                          | 2 +-
 syntax/htmldjango.vim                    | 2 +-
 syntax/htmlm4.vim                        | 2 +-
 syntax/i3config.vim                      | 2 +-
 syntax/ibasic.vim                        | 2 +-
 syntax/icalendar.vim                     | 2 +-
 syntax/icemenu.vim                       | 2 +-
 syntax/icon.vim                          | 2 +-
 syntax/idris.vim                         | 2 +-
 syntax/idris2.vim                        | 2 +-
 syntax/indent.vim                        | 2 +-
 syntax/inform.vim                        | 2 +-
 syntax/initng.vim                        | 2 +-
 syntax/inittab.vim                       | 2 +-
 syntax/ion.vim                           | 2 +-
 syntax/ipfilter.vim                      | 2 +-
 syntax/iss.vim                           | 2 +-
 syntax/ist.vim                           | 2 +-
 syntax/j.vim                             | 2 +-
 syntax/jal.vim                           | 2 +-
 syntax/jam.vim                           | 2 +-
 syntax/java.vim                          | 2 +-
 syntax/javacc.vim                        | 2 +-
 syntax/javascript.vim                    | 2 +-
 syntax/jess.vim                          | 2 +-
 syntax/jgraph.vim                        | 2 +-
 syntax/jinja2.vim                        | 2 +-
 syntax/jovial.vim                        | 2 +-
 syntax/jproperties.vim                   | 2 +-
 syntax/jq.vim                            | 2 +-
 syntax/json.vim                          | 2 +-
 syntax/json5.vim                         | 2 +-
 syntax/jsonnet.vim                       | 2 +-
 syntax/jsp.vim                           | 2 +-
 syntax/jst.vim                           | 2 +-
 syntax/julia.vim                         | 2 +-
 syntax/juliadoc.vim                      | 2 +-
 syntax/kconfig.vim                       | 2 +-
 syntax/kivy.vim                          | 2 +-
 syntax/kix.vim                           | 2 +-
 syntax/kotlin.vim                        | 2 +-
 syntax/kscript.vim                       | 2 +-
 syntax/kwt.vim                           | 2 +-
 syntax/lace.vim                          | 2 +-
 syntax/latte.vim                         | 2 +-
 syntax/ld.vim                            | 2 +-
 syntax/ldif.vim                          | 2 +-
 syntax/ledger.vim                        | 2 +-
 syntax/less.vim                          | 2 +-
 syntax/lex.vim                           | 2 +-
 syntax/lftp.vim                          | 2 +-
 syntax/lhaskell.vim                      | 2 +-
 syntax/libao.vim                         | 2 +-
 syntax/lidris.vim                        | 2 +-
 syntax/lidris2.vim                       | 2 +-
 syntax/lifelines.vim                     | 2 +-
 syntax/lilo.vim                          | 2 +-
 syntax/lilypond-words.vim                | 2 +-
 syntax/lilypond.vim                      | 2 +-
 syntax/limits.vim                        | 2 +-
 syntax/liquid.vim                        | 2 +-
 syntax/lisp.vim                          | 2 +-
 syntax/litcoffee.vim                     | 2 +-
 syntax/lite.vim                          | 2 +-
 syntax/litestep.vim                      | 2 +-
 syntax/llvm.vim                          | 2 +-
 syntax/log.vim                           | 2 +-
 syntax/loginaccess.vim                   | 2 +-
 syntax/logindefs.vim                     | 2 +-
 syntax/logtalk.vim                       | 2 +-
 syntax/lotos.vim                         | 2 +-
 syntax/lout.vim                          | 2 +-
 syntax/lpc.vim                           | 2 +-
 syntax/lprolog.vim                       | 2 +-
 syntax/ls.vim                            | 2 +-
 syntax/lsl.vim                           | 2 +-
 syntax/lss.vim                           | 2 +-
 syntax/lua.vim                           | 2 +-
 syntax/lynx.vim                          | 2 +-
 syntax/m4.vim                            | 2 +-
 syntax/mail.vim                          | 2 +-
 syntax/mailaliases.vim                   | 2 +-
 syntax/mailcap.vim                       | 2 +-
 syntax/make.vim                          | 2 +-
 syntax/mako.vim                          | 2 +-
 syntax/mallard.vim                       | 2 +-
 syntax/manconf.vim                       | 2 +-
 syntax/maple.vim                         | 2 +-
 syntax/markdown.vim                      | 2 +-
 syntax/mason.vim                         | 2 +-
 syntax/master.vim                        | 2 +-
 syntax/mel.vim                           | 2 +-
 syntax/merlin.vim                        | 2 +-
 syntax/meson.vim                         | 2 +-
 syntax/messages.vim                      | 2 +-
 syntax/mf.vim                            | 2 +-
 syntax/mgl.vim                           | 2 +-
 syntax/mgp.vim                           | 2 +-
 syntax/mib.vim                           | 2 +-
 syntax/mix.vim                           | 2 +-
 syntax/mma.vim                           | 2 +-
 syntax/mmp.vim                           | 2 +-
 syntax/modconf.vim                       | 2 +-
 syntax/modula2.vim                       | 2 +-
 syntax/modula3.vim                       | 2 +-
 syntax/monk.vim                          | 2 +-
 syntax/moo.vim                           | 2 +-
 syntax/moon.vim                          | 2 +-
 syntax/mp.vim                            | 2 +-
 syntax/mplayerconf.vim                   | 2 +-
 syntax/mrxvtrc.vim                       | 2 +-
 syntax/msidl.vim                         | 2 +-
 syntax/msql.vim                          | 2 +-
 syntax/mupad.vim                         | 2 +-
 syntax/murphi.vim                        | 2 +-
 syntax/mush.vim                          | 2 +-
 syntax/mustache.vim                      | 2 +-
 syntax/muttrc.vim                        | 2 +-
 syntax/mysql.vim                         | 2 +-
 syntax/n1ql.vim                          | 2 +-
 syntax/named.vim                         | 2 +-
 syntax/nanorc.vim                        | 2 +-
 syntax/natural.vim                       | 2 +-
 syntax/ncf.vim                           | 2 +-
 syntax/neomuttrc.vim                     | 2 +-
 syntax/netrc.vim                         | 2 +-
 syntax/nginx.vim                         | 2 +-
 syntax/nim.vim                           | 2 +-
 syntax/ninja.vim                         | 2 +-
 syntax/nix.vim                           | 2 +-
 syntax/nqc.vim                           | 2 +-
 syntax/nroff.vim                         | 2 +-
 syntax/nsis.vim                          | 2 +-
 syntax/oasis.vim                         | 2 +-
 syntax/obj.vim                           | 2 +-
 syntax/ocaml.vim                         | 2 +-
 syntax/ocamlbuild_tags.vim               | 2 +-
 syntax/occam.vim                         | 2 +-
 syntax/ocpbuild.vim                      | 2 +-
 syntax/ocpbuildroot.vim                  | 2 +-
 syntax/octave.vim                        | 2 +-
 syntax/odin.vim                          | 2 +-
 syntax/omake.vim                         | 2 +-
 syntax/omnimark.vim                      | 2 +-
 syntax/opam.vim                          | 2 +-
 syntax/opencl.vim                        | 2 +-
 syntax/openroad.vim                      | 2 +-
 syntax/opl.vim                           | 2 +-
 syntax/ora.vim                           | 2 +-
 syntax/pamconf.vim                       | 2 +-
 syntax/pamenv.vim                        | 2 +-
 syntax/papp.vim                          | 2 +-
 syntax/pascal.vim                        | 2 +-
 syntax/passwd.vim                        | 2 +-
 syntax/pccts.vim                         | 2 +-
 syntax/pdf.vim                           | 2 +-
 syntax/perl.vim                          | 2 +-
 syntax/pf.vim                            | 2 +-
 syntax/pfmain.vim                        | 2 +-
 syntax/pgsql.vim                         | 2 +-
 syntax/php.vim                           | 2 +-
 syntax/pike.vim                          | 2 +-
 syntax/pilrc.vim                         | 2 +-
 syntax/pine.vim                          | 2 +-
 syntax/pinfo.vim                         | 2 +-
 syntax/plantuml.vim                      | 2 +-
 syntax/pli.vim                           | 2 +-
 syntax/plm.vim                           | 2 +-
 syntax/plp.vim                           | 2 +-
 syntax/plsql.vim                         | 2 +-
 syntax/po.vim                            | 2 +-
 syntax/pod.vim                           | 2 +-
 syntax/pony.vim                          | 2 +-
 syntax/postscr.vim                       | 2 +-
 syntax/pov.vim                           | 2 +-
 syntax/povini.vim                        | 2 +-
 syntax/ppd.vim                           | 2 +-
 syntax/ppwiz.vim                         | 2 +-
 syntax/privoxy.vim                       | 2 +-
 syntax/procmail.vim                      | 2 +-
 syntax/prolog.vim                        | 2 +-
 syntax/promela.vim                       | 2 +-
 syntax/proto.vim                         | 2 +-
 syntax/protocols.vim                     | 2 +-
 syntax/ps1.vim                           | 2 +-
 syntax/ps1xml.vim                        | 2 +-
 syntax/psf.vim                           | 2 +-
 syntax/pug.vim                           | 2 +-
 syntax/puppet.vim                        | 2 +-
 syntax/purescript.vim                    | 2 +-
 syntax/pyrex.vim                         | 2 +-
 syntax/python.vim                        | 2 +-
 syntax/qmake.vim                         | 2 +-
 syntax/qml.vim                           | 2 +-
 syntax/quake.vim                         | 2 +-
 syntax/racket.vim                        | 2 +-
 syntax/radiance.vim                      | 2 +-
 syntax/ragel.vim                         | 2 +-
 syntax/raku.vim                          | 2 +-
 syntax/raml.vim                          | 2 +-
 syntax/ratpoison.vim                     | 2 +-
 syntax/razor.vim                         | 2 +-
 syntax/rc.vim                            | 2 +-
 syntax/rcs.vim                           | 2 +-
 syntax/readline.vim                      | 2 +-
 syntax/reason.vim                        | 2 +-
 syntax/rego.vim                          | 2 +-
 syntax/remind.vim                        | 2 +-
 syntax/requirements.vim                  | 2 +-
 syntax/resolv.vim                        | 2 +-
 syntax/reva.vim                          | 2 +-
 syntax/rexx.vim                          | 2 +-
 syntax/rhelp.vim                         | 2 +-
 syntax/rib.vim                           | 2 +-
 syntax/rmd.vim                           | 2 +-
 syntax/rnc.vim                           | 2 +-
 syntax/rng.vim                           | 2 +-
 syntax/rnoweb-1.vim                      | 2 +-
 syntax/rnoweb-2.vim                      | 2 +-
 syntax/robots.vim                        | 2 +-
 syntax/rpcgen.vim                        | 2 +-
 syntax/rpl.vim                           | 2 +-
 syntax/rrst.vim                          | 2 +-
 syntax/rst.vim                           | 2 +-
 syntax/rtf.vim                           | 2 +-
 syntax/ruby.vim                          | 2 +-
 syntax/rust.vim                          | 2 +-
 syntax/samba.vim                         | 2 +-
 syntax/sas.vim                           | 2 +-
 syntax/sass.vim                          | 2 +-
 syntax/sather.vim                        | 2 +-
 syntax/sbt.vim                           | 2 +-
 syntax/scala.vim                         | 2 +-
 syntax/scheme.vim                        | 2 +-
 syntax/scilab.vim                        | 2 +-
 syntax/screen.vim                        | 2 +-
 syntax/scss.vim                          | 2 +-
 syntax/sd.vim                            | 2 +-
 syntax/sdc.vim                           | 2 +-
 syntax/sdl.vim                           | 2 +-
 syntax/sed.vim                           | 2 +-
 syntax/sensors.vim                       | 2 +-
 syntax/services.vim                      | 2 +-
 syntax/setserial.vim                     | 2 +-
 syntax/sexplib.vim                       | 2 +-
 syntax/sh.vim                            | 2 +-
 syntax/sieve.vim                         | 2 +-
 syntax/sil.vim                           | 2 +-
 syntax/simula.vim                        | 2 +-
 syntax/sinda.vim                         | 2 +-
 syntax/sisu.vim                          | 2 +-
 syntax/skill.vim                         | 2 +-
 syntax/slang.vim                         | 2 +-
 syntax/slice.vim                         | 2 +-
 syntax/slim.vim                          | 2 +-
 syntax/slime.vim                         | 2 +-
 syntax/slpconf.vim                       | 2 +-
 syntax/slpreg.vim                        | 2 +-
 syntax/slpspi.vim                        | 2 +-
 syntax/slrnrc.vim                        | 2 +-
 syntax/slrnsc.vim                        | 2 +-
 syntax/sm.vim                            | 2 +-
 syntax/smarty.vim                        | 2 +-
 syntax/smcl.vim                          | 2 +-
 syntax/smhl.vim                          | 2 +-
 syntax/smith.vim                         | 2 +-
 syntax/sml.vim                           | 2 +-
 syntax/smt2.vim                          | 2 +-
 syntax/snobol4.vim                       | 2 +-
 syntax/solidity.vim                      | 2 +-
 syntax/spec.vim                          | 2 +-
 syntax/spice.vim                         | 2 +-
 syntax/spup.vim                          | 2 +-
 syntax/spyce.vim                         | 2 +-
 syntax/sql.vim                           | 2 +-
 syntax/sqlj.vim                          | 2 +-
 syntax/sqloracle.vim                     | 2 +-
 syntax/sqr.vim                           | 2 +-
 syntax/squid.vim                         | 2 +-
 syntax/srec.vim                          | 2 +-
 syntax/sshconfig.vim                     | 2 +-
 syntax/sshdconfig.vim                    | 2 +-
 syntax/st.vim                            | 2 +-
 syntax/stata.vim                         | 2 +-
 syntax/stp.vim                           | 2 +-
 syntax/stylus.vim                        | 2 +-
 syntax/sudoers.vim                       | 2 +-
 syntax/svelte.vim                        | 2 +-
 syntax/svg.vim                           | 2 +-
 syntax/svn.vim                           | 2 +-
 syntax/swift.vim                         | 2 +-
 syntax/swiftgyb.vim                      | 2 +-
 syntax/sxhkdrc.vim                       | 2 +-
 syntax/sysctl.vim                        | 2 +-
 syntax/systemd.vim                       | 2 +-
 syntax/systemverilog.vim                 | 2 +-
 syntax/tablegen.vim                      | 2 +-
 syntax/tads.vim                          | 2 +-
 syntax/tags.vim                          | 2 +-
 syntax/tak.vim                           | 2 +-
 syntax/tap.vim                           | 2 +-
 syntax/taskdata.vim                      | 2 +-
 syntax/taskedit.vim                      | 2 +-
 syntax/tcl.vim                           | 2 +-
 syntax/template.vim                      | 2 +-
 syntax/teraterm.vim                      | 2 +-
 syntax/terminfo.vim                      | 2 +-
 syntax/terraform.vim                     | 2 +-
 syntax/tex.vim                           | 2 +-
 syntax/texinfo.vim                       | 2 +-
 syntax/texmf.vim                         | 2 +-
 syntax/textile.vim                       | 2 +-
 syntax/tf.vim                            | 2 +-
 syntax/thrift.vim                        | 2 +-
 syntax/tidy.vim                          | 2 +-
 syntax/tilde.vim                         | 2 +-
 syntax/tli.vim                           | 2 +-
 syntax/tmux.vim                          | 2 +-
 syntax/toml.vim                          | 2 +-
 syntax/tpp.vim                           | 2 +-
 syntax/tptp.vim                          | 2 +-
 syntax/trasys.vim                        | 2 +-
 syntax/treetop.vim                       | 2 +-
 syntax/trustees.vim                      | 2 +-
 syntax/tsalt.vim                         | 2 +-
 syntax/tsscl.vim                         | 2 +-
 syntax/tssgm.vim                         | 2 +-
 syntax/tssop.vim                         | 2 +-
 syntax/tt2.vim                           | 2 +-
 syntax/tt2html.vim                       | 2 +-
 syntax/tt2js.vim                         | 2 +-
 syntax/twig.vim                          | 2 +-
 syntax/typescript.vim                    | 2 +-
 syntax/typescriptreact.vim               | 2 +-
 syntax/uc.vim                            | 2 +-
 syntax/udevconf.vim                      | 2 +-
 syntax/udevperm.vim                      | 2 +-
 syntax/uil.vim                           | 2 +-
 syntax/unison.vim                        | 2 +-
 syntax/updatedb.vim                      | 2 +-
 syntax/upstart.vim                       | 2 +-
 syntax/upstreamdat.vim                   | 2 +-
 syntax/upstreaminstalllog.vim            | 2 +-
 syntax/upstreamlog.vim                   | 2 +-
 syntax/usserverlog.vim                   | 2 +-
 syntax/usw2kagtlog.vim                   | 2 +-
 syntax/vala.vim                          | 2 +-
 syntax/vb.vim                            | 2 +-
 syntax/vbnet.vim                         | 2 +-
 syntax/vcl.vim                           | 2 +-
 syntax/velocity.vim                      | 2 +-
 syntax/vera.vim                          | 2 +-
 syntax/verilog.vim                       | 2 +-
 syntax/verilogams.vim                    | 2 +-
 syntax/vgrindefs.vim                     | 2 +-
 syntax/vhdl.vim                          | 2 +-
 syntax/vimgo.vim                         | 2 +-
 syntax/viminfo.vim                       | 2 +-
 syntax/vlang.vim                         | 2 +-
 syntax/vmasm.vim                         | 2 +-
 syntax/voscm.vim                         | 2 +-
 syntax/vrml.vim                          | 2 +-
 syntax/vroom.vim                         | 2 +-
 syntax/vue.vim                           | 2 +-
 syntax/wast.vim                          | 2 +-
 syntax/webmacro.vim                      | 2 +-
 syntax/wget.vim                          | 2 +-
 syntax/winbatch.vim                      | 2 +-
 syntax/wml.vim                           | 2 +-
 syntax/wsh.vim                           | 2 +-
 syntax/wsml.vim                          | 2 +-
 syntax/wvdial.vim                        | 2 +-
 syntax/xdc.vim                           | 2 +-
 syntax/xdefaults.vim                     | 2 +-
 syntax/xf86conf.vim                      | 2 +-
 syntax/xhtml.vim                         | 2 +-
 syntax/xinetd.vim                        | 2 +-
 syntax/xmath.vim                         | 2 +-
 syntax/xml.vim                           | 2 +-
 syntax/xmodmap.vim                       | 2 +-
 syntax/xpm.vim                           | 2 +-
 syntax/xpm2.vim                          | 2 +-
 syntax/xquery.vim                        | 2 +-
 syntax/xs.vim                            | 2 +-
 syntax/xsd.vim                           | 2 +-
 syntax/xsl.vim                           | 2 +-
 syntax/xslt.vim                          | 2 +-
 syntax/yacc.vim                          | 2 +-
 syntax/yaml.vim                          | 2 +-
 syntax/yats.vim                          | 2 +-
 syntax/yats/css.vim                      | 2 +-
 syntax/yats/dom-document.vim             | 2 +-
 syntax/yats/dom-elem.vim                 | 2 +-
 syntax/yats/dom-event.vim                | 2 +-
 syntax/yats/dom-form.vim                 | 2 +-
 syntax/yats/dom-node.vim                 | 2 +-
 syntax/yats/dom-storage.vim              | 2 +-
 syntax/yats/ecma-402.vim                 | 2 +-
 syntax/yats/es6-array.vim                | 2 +-
 syntax/yats/es6-date.vim                 | 2 +-
 syntax/yats/es6-function.vim             | 2 +-
 syntax/yats/es6-json.vim                 | 2 +-
 syntax/yats/es6-map.vim                  | 2 +-
 syntax/yats/es6-math.vim                 | 2 +-
 syntax/yats/es6-number.vim               | 2 +-
 syntax/yats/es6-object.vim               | 2 +-
 syntax/yats/es6-promise.vim              | 2 +-
 syntax/yats/es6-proxy.vim                | 2 +-
 syntax/yats/es6-reflect.vim              | 2 +-
 syntax/yats/es6-regexp.vim               | 2 +-
 syntax/yats/es6-set.vim                  | 2 +-
 syntax/yats/es6-string.vim               | 2 +-
 syntax/yats/es6-symbol.vim               | 2 +-
 syntax/yats/event.vim                    | 2 +-
 syntax/yats/node.vim                     | 2 +-
 syntax/yats/test.vim                     | 2 +-
 syntax/yats/typescript.vim               | 2 +-
 syntax/yats/web-blob.vim                 | 2 +-
 syntax/yats/web-console.vim              | 2 +-
 syntax/yats/web-crypto.vim               | 2 +-
 syntax/yats/web-encoding.vim             | 2 +-
 syntax/yats/web-fetch.vim                | 2 +-
 syntax/yats/web-geo.vim                  | 2 +-
 syntax/yats/web-history.vim              | 2 +-
 syntax/yats/web-location.vim             | 2 +-
 syntax/yats/web-navigator.vim            | 2 +-
 syntax/yats/web-network.vim              | 2 +-
 syntax/yats/web-payment.vim              | 2 +-
 syntax/yats/web-service-worker.vim       | 2 +-
 syntax/yats/web-window.vim               | 2 +-
 syntax/yats/web-xhr.vim                  | 2 +-
 syntax/yats/web.vim                      | 2 +-
 syntax/z8a.vim                           | 2 +-
 syntax/zephir.vim                        | 2 +-
 syntax/zig.vim                           | 2 +-
 syntax/zimbu.vim                         | 2 +-
 syntax/zir.vim                           | 2 +-
 syntax/zsh.vim                           | 2 +-
 1284 files changed, 1284 insertions(+), 1284 deletions(-)

diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 80757d8e7..387e655bb 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haskell')
+if has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim
index f6a750f63..b01a8a08d 100644
--- a/after/ftplugin/coffee.vim
+++ b/after/ftplugin/coffee.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cjsx')
+if has_key(g:polyglot_is_disabled, 'cjsx')
   finish
 endif
 
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index 03446e8ba..75117f1b5 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haskell')
+if has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/after/ftplugin/html.vim b/after/ftplugin/html.vim
index ab2a8f2b0..6cbec0ada 100644
--- a/after/ftplugin/html.vim
+++ b/after/ftplugin/html.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html5')
+if has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/ftplugin/idris.vim b/after/ftplugin/idris.vim
index 1b973639c..3fa7a746f 100644
--- a/after/ftplugin/idris.vim
+++ b/after/ftplugin/idris.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'idris')
+if has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/after/ftplugin/idris2.vim b/after/ftplugin/idris2.vim
index 55a57ff25..2572f2af8 100644
--- a/after/ftplugin/idris2.vim
+++ b/after/ftplugin/idris2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'idris2')
+if has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-1.vim b/after/ftplugin/javascript-1.vim
index 4ffa2117f..58e2e1f6c 100644
--- a/after/ftplugin/javascript-1.vim
+++ b/after/ftplugin/javascript-1.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'javascript')
+if has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-2.vim b/after/ftplugin/javascript-2.vim
index 5a311439f..67a630555 100644
--- a/after/ftplugin/javascript-2.vim
+++ b/after/ftplugin/javascript-2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/javascriptreact.vim b/after/ftplugin/javascriptreact.vim
index a757cdd74..ceacc887e 100644
--- a/after/ftplugin/javascriptreact.vim
+++ b/after/ftplugin/javascriptreact.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
index 02451a80f..54ebd29f6 100644
--- a/after/ftplugin/jsx.vim
+++ b/after/ftplugin/jsx.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/llvm.vim b/after/ftplugin/llvm.vim
index 844021993..198358109 100644
--- a/after/ftplugin/llvm.vim
+++ b/after/ftplugin/llvm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'llvm')
+if has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim
index 64b1699bb..2e3f9c7d4 100644
--- a/after/ftplugin/puppet.vim
+++ b/after/ftplugin/puppet.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'puppet')
+if has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/after/ftplugin/tsx.vim b/after/ftplugin/tsx.vim
index 8c687fa62..3d4226d12 100644
--- a/after/ftplugin/tsx.vim
+++ b/after/ftplugin/tsx.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/typescriptreact.vim b/after/ftplugin/typescriptreact.vim
index 75f2e3bb0..3c3b2666b 100644
--- a/after/ftplugin/typescriptreact.vim
+++ b/after/ftplugin/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/html.vim b/after/indent/html.vim
index f33b27a18..ea76ee091 100644
--- a/after/indent/html.vim
+++ b/after/indent/html.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html5')
+if has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/indent/javascript-1.vim b/after/indent/javascript-1.vim
index 5a311439f..67a630555 100644
--- a/after/indent/javascript-1.vim
+++ b/after/indent/javascript-1.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/javascript-2.vim b/after/indent/javascript-2.vim
index 3177c0cbc..afedd9f41 100644
--- a/after/indent/javascript-2.vim
+++ b/after/indent/javascript-2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'graphql')
+if has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/indent/javascriptreact.vim b/after/indent/javascriptreact.vim
index a757cdd74..ceacc887e 100644
--- a/after/indent/javascriptreact.vim
+++ b/after/indent/javascriptreact.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/jsx.vim b/after/indent/jsx.vim
index 1ba02c466..afee5bf0c 100644
--- a/after/indent/jsx.vim
+++ b/after/indent/jsx.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/objc.vim b/after/indent/objc.vim
index 13d4d32d1..e9cc20e88 100644
--- a/after/indent/objc.vim
+++ b/after/indent/objc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'objc')
+if has_key(g:polyglot_is_disabled, 'objc')
   finish
 endif
 
diff --git a/after/indent/tsx.vim b/after/indent/tsx.vim
index f29ccbaf7..18254bfca 100644
--- a/after/indent/tsx.vim
+++ b/after/indent/tsx.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
index 1294bc59e..edf83bc8c 100644
--- a/after/indent/typescript.vim
+++ b/after/indent/typescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'graphql')
+if has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/indent/typescriptreact.vim b/after/indent/typescriptreact.vim
index 75f2e3bb0..3c3b2666b 100644
--- a/after/indent/typescriptreact.vim
+++ b/after/indent/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index 104976707..2c2762eb1 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cpp-modern')
+if has_key(g:polyglot_is_disabled, 'cpp-modern')
   finish
 endif
 
diff --git a/after/syntax/coffee.vim b/after/syntax/coffee.vim
index debd9aa90..a3e5d8fae 100644
--- a/after/syntax/coffee.vim
+++ b/after/syntax/coffee.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cjsx')
+if has_key(g:polyglot_is_disabled, 'cjsx')
   finish
 endif
 
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index 517404f0c..761a6c15c 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cpp-modern')
+if has_key(g:polyglot_is_disabled, 'cpp-modern')
   finish
 endif
 
diff --git a/after/syntax/haskell.vim b/after/syntax/haskell.vim
index 61d828d2c..618863691 100644
--- a/after/syntax/haskell.vim
+++ b/after/syntax/haskell.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dhall')
+if has_key(g:polyglot_is_disabled, 'dhall')
   finish
 endif
 
diff --git a/after/syntax/help.vim b/after/syntax/help.vim
index 0ee4a9caa..007c21f39 100644
--- a/after/syntax/help.vim
+++ b/after/syntax/help.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scala')
+if has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index 56ba064c5..9dec611ed 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html5')
+if has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/html/aria.vim b/after/syntax/html/aria.vim
index ed5a83832..b589cc5e7 100644
--- a/after/syntax/html/aria.vim
+++ b/after/syntax/html/aria.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html5')
+if has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/html/electron.vim b/after/syntax/html/electron.vim
index d7bfa90fc..35aa1a1e8 100644
--- a/after/syntax/html/electron.vim
+++ b/after/syntax/html/electron.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html5')
+if has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/html/rdfa.vim b/after/syntax/html/rdfa.vim
index 529c2fcd6..5554f12bc 100644
--- a/after/syntax/html/rdfa.vim
+++ b/after/syntax/html/rdfa.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html5')
+if has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/idris.vim b/after/syntax/idris.vim
index 18a31e8a5..51aa6422a 100644
--- a/after/syntax/idris.vim
+++ b/after/syntax/idris.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'idris')
+if has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/after/syntax/idris2.vim b/after/syntax/idris2.vim
index 6371b9371..6aaecf4d5 100644
--- a/after/syntax/idris2.vim
+++ b/after/syntax/idris2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'idris2')
+if has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim
index 5a311439f..67a630555 100644
--- a/after/syntax/javascript.vim
+++ b/after/syntax/javascript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index 6044d6ae9..b1a307144 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'graphql')
+if has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/javascript/html5.vim b/after/syntax/javascript/html5.vim
index 683202d14..b605aed52 100644
--- a/after/syntax/javascript/html5.vim
+++ b/after/syntax/javascript/html5.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html5')
+if has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/javascript/sql.vim b/after/syntax/javascript/sql.vim
index f4feb7586..52b94d705 100644
--- a/after/syntax/javascript/sql.vim
+++ b/after/syntax/javascript/sql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'javascript-sql')
+if has_key(g:polyglot_is_disabled, 'javascript-sql')
   finish
 endif
 
diff --git a/after/syntax/javascriptreact.vim b/after/syntax/javascriptreact.vim
index a757cdd74..ceacc887e 100644
--- a/after/syntax/javascriptreact.vim
+++ b/after/syntax/javascriptreact.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/javascriptreact/graphql.vim b/after/syntax/javascriptreact/graphql.vim
index 308c17d7a..6842f74cb 100644
--- a/after/syntax/javascriptreact/graphql.vim
+++ b/after/syntax/javascriptreact/graphql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'graphql')
+if has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/jsx.vim b/after/syntax/jsx.vim
index c8b8aa5df..8ca6c7673 100644
--- a/after/syntax/jsx.vim
+++ b/after/syntax/jsx.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/jsx_pretty.vim b/after/syntax/jsx_pretty.vim
index a6cb8a90c..1f1e36859 100644
--- a/after/syntax/jsx_pretty.vim
+++ b/after/syntax/jsx_pretty.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/llvm.vim b/after/syntax/llvm.vim
index e38d50414..024928b88 100644
--- a/after/syntax/llvm.vim
+++ b/after/syntax/llvm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'llvm')
+if has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/after/syntax/mdx.vim b/after/syntax/mdx.vim
index 26ebf1984..8d734bb2b 100644
--- a/after/syntax/mdx.vim
+++ b/after/syntax/mdx.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mdx')
+if has_key(g:polyglot_is_disabled, 'mdx')
   finish
 endif
 
diff --git a/after/syntax/mma.vim b/after/syntax/mma.vim
index 2509d210c..676113373 100644
--- a/after/syntax/mma.vim
+++ b/after/syntax/mma.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mathematica')
+if has_key(g:polyglot_is_disabled, 'mathematica')
   finish
 endif
 
diff --git a/after/syntax/objc.vim b/after/syntax/objc.vim
index 78e41fd1e..a9805eedb 100644
--- a/after/syntax/objc.vim
+++ b/after/syntax/objc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'objc')
+if has_key(g:polyglot_is_disabled, 'objc')
   finish
 endif
 
diff --git a/after/syntax/reason.vim b/after/syntax/reason.vim
index 0df633cbe..c30114ee7 100644
--- a/after/syntax/reason.vim
+++ b/after/syntax/reason.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'reason')
+if has_key(g:polyglot_is_disabled, 'reason')
   finish
 endif
 
diff --git a/after/syntax/reason/graphql.vim b/after/syntax/reason/graphql.vim
index 2a54c4027..f1d8b317e 100644
--- a/after/syntax/reason/graphql.vim
+++ b/after/syntax/reason/graphql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'graphql')
+if has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/rspec.vim b/after/syntax/rspec.vim
index 355fe5247..9a0961d71 100644
--- a/after/syntax/rspec.vim
+++ b/after/syntax/rspec.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rspec')
+if has_key(g:polyglot_is_disabled, 'rspec')
   finish
 endif
 
diff --git a/after/syntax/ruby.vim b/after/syntax/ruby.vim
index dea6003a3..3c9fccd2e 100644
--- a/after/syntax/ruby.vim
+++ b/after/syntax/ruby.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'yard')
+if has_key(g:polyglot_is_disabled, 'yard')
   finish
 endif
 
diff --git a/after/syntax/rust.vim b/after/syntax/rust.vim
index 638c6dd80..1cf3e3a2e 100644
--- a/after/syntax/rust.vim
+++ b/after/syntax/rust.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/after/syntax/tsx.vim b/after/syntax/tsx.vim
index f3b436356..458419d25 100644
--- a/after/syntax/tsx.vim
+++ b/after/syntax/tsx.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index cccdbc3e1..e30f06826 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'graphql')
+if has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/typescriptreact.vim b/after/syntax/typescriptreact.vim
index 75f2e3bb0..3c3b2666b 100644
--- a/after/syntax/typescriptreact.vim
+++ b/after/syntax/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/typescriptreact/graphql.vim b/after/syntax/typescriptreact/graphql.vim
index aa60a3aaa..0367e0daf 100644
--- a/after/syntax/typescriptreact/graphql.vim
+++ b/after/syntax/typescriptreact/graphql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'graphql')
+if has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/vue/graphql.vim b/after/syntax/vue/graphql.vim
index 308c17d7a..6842f74cb 100644
--- a/after/syntax/vue/graphql.vim
+++ b/after/syntax/vue/graphql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'graphql')
+if has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/zsh.vim b/after/syntax/zsh.vim
index fc63d3c57..fcdcac316 100644
--- a/after/syntax/zsh.vim
+++ b/after/syntax/zsh.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zinit')
+if has_key(g:polyglot_is_disabled, 'zinit')
   finish
 endif
 
diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index 250d001a2..def14bfdb 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'julia')
+if has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/autoload/RstFold.vim b/autoload/RstFold.vim
index 2907bc807..16a12b969 100644
--- a/autoload/RstFold.vim
+++ b/autoload/RstFold.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rst')
+if has_key(g:polyglot_is_disabled, 'rst')
   finish
 endif
 
diff --git a/autoload/ada.vim b/autoload/ada.vim
index 207b3d07e..71faa0a60 100644
--- a/autoload/ada.vim
+++ b/autoload/ada.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ada')
+if has_key(g:polyglot_is_disabled, 'ada')
   finish
 endif
 
diff --git a/autoload/cargo.vim b/autoload/cargo.vim
index 64caa2e23..08b01231f 100644
--- a/autoload/cargo.vim
+++ b/autoload/cargo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/cargo/quickfix.vim b/autoload/cargo/quickfix.vim
index 2cd41aa08..a8272a05b 100644
--- a/autoload/cargo/quickfix.vim
+++ b/autoload/cargo/quickfix.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index 9b724f384..36ea354e9 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'clojure')
+if has_key(g:polyglot_is_disabled, 'clojure')
   finish
 endif
 
diff --git a/autoload/coffee.vim b/autoload/coffee.vim
index b792182c8..bc038f0ea 100644
--- a/autoload/coffee.vim
+++ b/autoload/coffee.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'coffee-script')
+if has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/autoload/crystal/indent.vim b/autoload/crystal/indent.vim
index cb40350f3..b2fc9193f 100644
--- a/autoload/crystal/indent.vim
+++ b/autoload/crystal/indent.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/crystal_lang.vim b/autoload/crystal_lang.vim
index 911bb2416..60032c5f8 100644
--- a/autoload/crystal_lang.vim
+++ b/autoload/crystal_lang.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/csv.vim b/autoload/csv.vim
index 72402ce70..39e37367c 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'csv')
+if has_key(g:polyglot_is_disabled, 'csv')
   finish
 endif
 
diff --git a/autoload/dart.vim b/autoload/dart.vim
index 308f68f3c..b4cdce2a8 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dart')
+if has_key(g:polyglot_is_disabled, 'dart')
   finish
 endif
 
diff --git a/autoload/db/adapter/ecto.vim b/autoload/db/adapter/ecto.vim
index b2179ab13..251a3a6b1 100644
--- a/autoload/db/adapter/ecto.vim
+++ b/autoload/db/adapter/ecto.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elixir')
+if has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/autoload/ecrystal.vim b/autoload/ecrystal.vim
index c8679dec3..a7bc05968 100644
--- a/autoload/ecrystal.vim
+++ b/autoload/ecrystal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index d21cceb3f..f38947fd7 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elixir')
+if has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/autoload/elixir/util.vim b/autoload/elixir/util.vim
index 04d62b7df..4136799cb 100644
--- a/autoload/elixir/util.vim
+++ b/autoload/elixir/util.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elixir')
+if has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/autoload/fish.vim b/autoload/fish.vim
index e792f9a83..0ea2e4745 100644
--- a/autoload/fish.vim
+++ b/autoload/fish.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fish')
+if has_key(g:polyglot_is_disabled, 'fish')
   finish
 endif
 
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index e53bc68b8..958fc0c19 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fsharp')
+if has_key(g:polyglot_is_disabled, 'fsharp')
   finish
 endif
 
diff --git a/autoload/fzf_gitignore.vim b/autoload/fzf_gitignore.vim
index c3426aa4b..62e2fde2b 100644
--- a/autoload/fzf_gitignore.vim
+++ b/autoload/fzf_gitignore.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gitignore')
+if has_key(g:polyglot_is_disabled, 'gitignore')
   finish
 endif
 
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index 03b6c279d..e3e3dcffc 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/autoload/graphql.vim b/autoload/graphql.vim
index bfb879102..4e0652a2b 100644
--- a/autoload/graphql.vim
+++ b/autoload/graphql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'graphql')
+if has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/autoload/htmlcomplete.vim b/autoload/htmlcomplete.vim
index bc124ac6a..e4087b012 100644
--- a/autoload/htmlcomplete.vim
+++ b/autoload/htmlcomplete.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html5')
+if has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/autoload/jsonnet.vim b/autoload/jsonnet.vim
index b5303868f..3626edd2b 100644
--- a/autoload/jsonnet.vim
+++ b/autoload/jsonnet.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsonnet')
+if has_key(g:polyglot_is_disabled, 'jsonnet')
   finish
 endif
 
diff --git a/autoload/jsx_pretty/comment.vim b/autoload/jsx_pretty/comment.vim
index 3f31ded8b..39157d197 100644
--- a/autoload/jsx_pretty/comment.vim
+++ b/autoload/jsx_pretty/comment.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/autoload/jsx_pretty/indent.vim b/autoload/jsx_pretty/indent.vim
index d425dd383..ee4859ced 100644
--- a/autoload/jsx_pretty/indent.vim
+++ b/autoload/jsx_pretty/indent.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsx')
+if has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/autoload/julia.vim b/autoload/julia.vim
index fbec59d73..ed77fc39d 100644
--- a/autoload/julia.vim
+++ b/autoload/julia.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'julia')
+if has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/autoload/julia/doc.vim b/autoload/julia/doc.vim
index c683d5cda..6461bd44a 100644
--- a/autoload/julia/doc.vim
+++ b/autoload/julia/doc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'julia')
+if has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/autoload/julia_blocks.vim b/autoload/julia_blocks.vim
index 3ac07914f..a27ccfbeb 100644
--- a/autoload/julia_blocks.vim
+++ b/autoload/julia_blocks.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'julia')
+if has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/autoload/julia_latex_symbols.vim b/autoload/julia_latex_symbols.vim
index 425b8603b..bd53c1c3e 100644
--- a/autoload/julia_latex_symbols.vim
+++ b/autoload/julia_latex_symbols.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'julia')
+if has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/autoload/ledger.vim b/autoload/ledger.vim
index 452463316..76be457d0 100644
--- a/autoload/ledger.vim
+++ b/autoload/ledger.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ledger')
+if has_key(g:polyglot_is_disabled, 'ledger')
   finish
 endif
 
diff --git a/autoload/nim.vim b/autoload/nim.vim
index c913af993..820f62c7f 100644
--- a/autoload/nim.vim
+++ b/autoload/nim.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nim')
+if has_key(g:polyglot_is_disabled, 'nim')
   finish
 endif
 
diff --git a/autoload/pony.vim b/autoload/pony.vim
index d24bbd234..4a47a0379 100644
--- a/autoload/pony.vim
+++ b/autoload/pony.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pony')
+if has_key(g:polyglot_is_disabled, 'pony')
   finish
 endif
 
diff --git a/autoload/puppet/align.vim b/autoload/puppet/align.vim
index d9af9bd37..907f191a4 100644
--- a/autoload/puppet/align.vim
+++ b/autoload/puppet/align.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'puppet')
+if has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/autoload/puppet/ctags.vim b/autoload/puppet/ctags.vim
index 6e296b968..0d73ec1d6 100644
--- a/autoload/puppet/ctags.vim
+++ b/autoload/puppet/ctags.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'puppet')
+if has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/autoload/puppet/format.vim b/autoload/puppet/format.vim
index f08053635..8c766e7f8 100644
--- a/autoload/puppet/format.vim
+++ b/autoload/puppet/format.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'puppet')
+if has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/autoload/python/utils.vim b/autoload/python/utils.vim
index 7782add11..76ad78b22 100644
--- a/autoload/python/utils.vim
+++ b/autoload/python/utils.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'python-compiler')
+if has_key(g:polyglot_is_disabled, 'python-compiler')
   finish
 endif
 
diff --git a/autoload/requirements.vim b/autoload/requirements.vim
index e222ce2ff..6dace12b1 100644
--- a/autoload/requirements.vim
+++ b/autoload/requirements.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'requirements')
+if has_key(g:polyglot_is_disabled, 'requirements')
   finish
 endif
 
diff --git a/autoload/rubycomplete.vim b/autoload/rubycomplete.vim
index d25c23b62..f1f9810c2 100644
--- a/autoload/rubycomplete.vim
+++ b/autoload/rubycomplete.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ruby')
+if has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/autoload/rust.vim b/autoload/rust.vim
index 6c6fbe139..5b0cd64fe 100644
--- a/autoload/rust.vim
+++ b/autoload/rust.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/rust/debugging.vim b/autoload/rust/debugging.vim
index d200e9fc7..7985c87ca 100644
--- a/autoload/rust/debugging.vim
+++ b/autoload/rust/debugging.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/rust/delimitmate.vim b/autoload/rust/delimitmate.vim
index 25735f9c7..ecd7c28cb 100644
--- a/autoload/rust/delimitmate.vim
+++ b/autoload/rust/delimitmate.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/rust/tags.vim b/autoload/rust/tags.vim
index 1acbb5bb6..f4830e283 100644
--- a/autoload/rust/tags.vim
+++ b/autoload/rust/tags.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/rustfmt.vim b/autoload/rustfmt.vim
index 1d6f91ed4..5dc682a57 100644
--- a/autoload/rustfmt.vim
+++ b/autoload/rustfmt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/autoload/smt2.vim b/autoload/smt2.vim
index 85bd62184..b9e104a01 100644
--- a/autoload/smt2.vim
+++ b/autoload/smt2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'smt2')
+if has_key(g:polyglot_is_disabled, 'smt2')
   finish
 endif
 
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index e3a7908f9..647ee7222 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'terraform')
+if has_key(g:polyglot_is_disabled, 'terraform')
   finish
 endif
 
diff --git a/autoload/vital/_crystal.vim b/autoload/vital/_crystal.vim
index c93828a25..95bdc8404 100644
--- a/autoload/vital/_crystal.vim
+++ b/autoload/vital/_crystal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/ColorEcho.vim b/autoload/vital/_crystal/ColorEcho.vim
index 61e22f171..d0480c19b 100644
--- a/autoload/vital/_crystal/ColorEcho.vim
+++ b/autoload/vital/_crystal/ColorEcho.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/Data/List.vim b/autoload/vital/_crystal/Data/List.vim
index 0af74f788..436e41f0b 100644
--- a/autoload/vital/_crystal/Data/List.vim
+++ b/autoload/vital/_crystal/Data/List.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/Data/String.vim b/autoload/vital/_crystal/Data/String.vim
index 66d58ae09..ea3769f99 100644
--- a/autoload/vital/_crystal/Data/String.vim
+++ b/autoload/vital/_crystal/Data/String.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/Process.vim b/autoload/vital/_crystal/Process.vim
index 31b6b890f..8118a9f63 100644
--- a/autoload/vital/_crystal/Process.vim
+++ b/autoload/vital/_crystal/Process.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/Web/JSON.vim b/autoload/vital/_crystal/Web/JSON.vim
index bcf96f858..c72446aa0 100644
--- a/autoload/vital/_crystal/Web/JSON.vim
+++ b/autoload/vital/_crystal/Web/JSON.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/vital/crystal.vim b/autoload/vital/crystal.vim
index a73b19ba7..24b12ee97 100644
--- a/autoload/vital/crystal.vim
+++ b/autoload/vital/crystal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/autoload/xml/aria.vim b/autoload/xml/aria.vim
index f4d0d4d6a..edba38fb2 100644
--- a/autoload/xml/aria.vim
+++ b/autoload/xml/aria.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html5')
+if has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/autoload/xml/html5.vim b/autoload/xml/html5.vim
index c2a78b6e8..2618e2259 100644
--- a/autoload/xml/html5.vim
+++ b/autoload/xml/html5.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html5')
+if has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/autoload/xml/xsd.vim b/autoload/xml/xsd.vim
index 478003f95..a28990945 100644
--- a/autoload/xml/xsd.vim
+++ b/autoload/xml/xsd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xsd')
+if has_key(g:polyglot_is_disabled, 'xsd')
   finish
 endif
 
diff --git a/autoload/zig/config.vim b/autoload/zig/config.vim
index 76f2939ca..fd7f42235 100644
--- a/autoload/zig/config.vim
+++ b/autoload/zig/config.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zig')
+if has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index dd01a44b4..824122af9 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zig')
+if has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/autoload/zig/list.vim b/autoload/zig/list.vim
index 083e336bf..a5b41f136 100644
--- a/autoload/zig/list.vim
+++ b/autoload/zig/list.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zig')
+if has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/autoload/zig/util.vim b/autoload/zig/util.vim
index 3c7e8b617..b59b43ed4 100644
--- a/autoload/zig/util.vim
+++ b/autoload/zig/util.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zig')
+if has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/compiler/ant.vim b/compiler/ant.vim
index 1f927dbce..8d038e0b3 100644
--- a/compiler/ant.vim
+++ b/compiler/ant.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ant')
+if has_key(g:polyglot_is_disabled, 'ant')
   finish
 endif
 
diff --git a/compiler/bdf.vim b/compiler/bdf.vim
index 79fb26631..915c2d708 100644
--- a/compiler/bdf.vim
+++ b/compiler/bdf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bdf')
+if has_key(g:polyglot_is_disabled, 'bdf')
   finish
 endif
 
diff --git a/compiler/cake.vim b/compiler/cake.vim
index c053759a1..0f0d9c1e4 100644
--- a/compiler/cake.vim
+++ b/compiler/cake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'coffee-script')
+if has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/compiler/cargo.vim b/compiler/cargo.vim
index 4854e4d9e..8b6ee453a 100644
--- a/compiler/cargo.vim
+++ b/compiler/cargo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/compiler/coffee.vim b/compiler/coffee.vim
index e16c425d3..d73b850b4 100644
--- a/compiler/coffee.vim
+++ b/compiler/coffee.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'coffee-script')
+if has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/compiler/credo.vim b/compiler/credo.vim
index 767452c71..1cfe5cda5 100644
--- a/compiler/credo.vim
+++ b/compiler/credo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elixir')
+if has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/compiler/cryptol.vim b/compiler/cryptol.vim
index 7454ad5df..cb6b72f9b 100644
--- a/compiler/cryptol.vim
+++ b/compiler/cryptol.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cryptol')
+if has_key(g:polyglot_is_disabled, 'cryptol')
   finish
 endif
 
diff --git a/compiler/cs.vim b/compiler/cs.vim
index 195f1437a..0bbc12b42 100644
--- a/compiler/cs.vim
+++ b/compiler/cs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cs')
+if has_key(g:polyglot_is_disabled, 'cs')
   finish
 endif
 
diff --git a/compiler/cucumber.vim b/compiler/cucumber.vim
index b2aef45d7..831f0a4a1 100644
--- a/compiler/cucumber.vim
+++ b/compiler/cucumber.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cucumber')
+if has_key(g:polyglot_is_disabled, 'cucumber')
   finish
 endif
 
diff --git a/compiler/dot.vim b/compiler/dot.vim
index f2d659671..63e1d5528 100644
--- a/compiler/dot.vim
+++ b/compiler/dot.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dot')
+if has_key(g:polyglot_is_disabled, 'dot')
   finish
 endif
 
diff --git a/compiler/eruby.vim b/compiler/eruby.vim
index 426a8212b..c576858cf 100644
--- a/compiler/eruby.vim
+++ b/compiler/eruby.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ruby')
+if has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/compiler/exunit.vim b/compiler/exunit.vim
index 7f9bf656d..6921850ae 100644
--- a/compiler/exunit.vim
+++ b/compiler/exunit.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elixir')
+if has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/compiler/fish.vim b/compiler/fish.vim
index 8ab152a6e..e46699b69 100644
--- a/compiler/fish.vim
+++ b/compiler/fish.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fish')
+if has_key(g:polyglot_is_disabled, 'fish')
   finish
 endif
 
diff --git a/compiler/go.vim b/compiler/go.vim
index c01c9e525..01c7fe0ad 100644
--- a/compiler/go.vim
+++ b/compiler/go.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/compiler/gradle.vim b/compiler/gradle.vim
index 1f59118ed..3b40fb188 100644
--- a/compiler/gradle.vim
+++ b/compiler/gradle.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gradle')
+if has_key(g:polyglot_is_disabled, 'gradle')
   finish
 endif
 
diff --git a/compiler/gradlew.vim b/compiler/gradlew.vim
index 82fdbdd81..12a24d999 100644
--- a/compiler/gradlew.vim
+++ b/compiler/gradlew.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gradle')
+if has_key(g:polyglot_is_disabled, 'gradle')
   finish
 endif
 
diff --git a/compiler/haml.vim b/compiler/haml.vim
index b72ab353c..03ae77764 100644
--- a/compiler/haml.vim
+++ b/compiler/haml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haml')
+if has_key(g:polyglot_is_disabled, 'haml')
   finish
 endif
 
diff --git a/compiler/ledger.vim b/compiler/ledger.vim
index 49eb3750f..18731a004 100644
--- a/compiler/ledger.vim
+++ b/compiler/ledger.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ledger')
+if has_key(g:polyglot_is_disabled, 'ledger')
   finish
 endif
 
diff --git a/compiler/lilypond.vim b/compiler/lilypond.vim
index 6e7dd94f1..d70b60ff7 100644
--- a/compiler/lilypond.vim
+++ b/compiler/lilypond.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lilypond')
+if has_key(g:polyglot_is_disabled, 'lilypond')
   finish
 endif
 
diff --git a/compiler/ls.vim b/compiler/ls.vim
index b937052c7..b3cdb32f3 100644
--- a/compiler/ls.vim
+++ b/compiler/ls.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'livescript')
+if has_key(g:polyglot_is_disabled, 'livescript')
   finish
 endif
 
diff --git a/compiler/mix.vim b/compiler/mix.vim
index dfbf004b0..0563f8ee0 100644
--- a/compiler/mix.vim
+++ b/compiler/mix.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elixir')
+if has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/compiler/nim.vim b/compiler/nim.vim
index 510350703..edfa730e0 100644
--- a/compiler/nim.vim
+++ b/compiler/nim.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nim')
+if has_key(g:polyglot_is_disabled, 'nim')
   finish
 endif
 
diff --git a/compiler/nix-build.vim b/compiler/nix-build.vim
index aa8932c10..5049e4e4b 100644
--- a/compiler/nix-build.vim
+++ b/compiler/nix-build.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nix')
+if has_key(g:polyglot_is_disabled, 'nix')
   finish
 endif
 
diff --git a/compiler/ocaml.vim b/compiler/ocaml.vim
index 00cc30f44..d86500170 100644
--- a/compiler/ocaml.vim
+++ b/compiler/ocaml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/compiler/powershell.vim b/compiler/powershell.vim
index 436829557..edfa1ec92 100644
--- a/compiler/powershell.vim
+++ b/compiler/powershell.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'powershell')
+if has_key(g:polyglot_is_disabled, 'powershell')
   finish
 endif
 
diff --git a/compiler/python.vim b/compiler/python.vim
index 29e9acb81..e7caa4651 100644
--- a/compiler/python.vim
+++ b/compiler/python.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'python-compiler')
+if has_key(g:polyglot_is_disabled, 'python-compiler')
   finish
 endif
 
diff --git a/compiler/rake.vim b/compiler/rake.vim
index 4843c55d3..9557fc9a2 100644
--- a/compiler/rake.vim
+++ b/compiler/rake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ruby')
+if has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/compiler/rspec.vim b/compiler/rspec.vim
index 541e2f62f..2b16684af 100644
--- a/compiler/rspec.vim
+++ b/compiler/rspec.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ruby')
+if has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/compiler/ruby.vim b/compiler/ruby.vim
index 9ec9a2268..96a54615c 100644
--- a/compiler/ruby.vim
+++ b/compiler/ruby.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ruby')
+if has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/compiler/rubyunit.vim b/compiler/rubyunit.vim
index 11c8276ce..eb443f034 100644
--- a/compiler/rubyunit.vim
+++ b/compiler/rubyunit.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ruby')
+if has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/compiler/rustc.vim b/compiler/rustc.vim
index 80091673f..0a0935416 100644
--- a/compiler/rustc.vim
+++ b/compiler/rustc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/compiler/sass.vim b/compiler/sass.vim
index 852d3e098..7d1e9876a 100644
--- a/compiler/sass.vim
+++ b/compiler/sass.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sass')
+if has_key(g:polyglot_is_disabled, 'sass')
   finish
 endif
 
diff --git a/compiler/sbt.vim b/compiler/sbt.vim
index 24fc2d095..32cf3f269 100644
--- a/compiler/sbt.vim
+++ b/compiler/sbt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scala')
+if has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/compiler/swift.vim b/compiler/swift.vim
index c89bfe5a3..cd19a7e85 100644
--- a/compiler/swift.vim
+++ b/compiler/swift.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'swift')
+if has_key(g:polyglot_is_disabled, 'swift')
   finish
 endif
 
diff --git a/compiler/tcl.vim b/compiler/tcl.vim
index 3cdf82499..d562da464 100644
--- a/compiler/tcl.vim
+++ b/compiler/tcl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tcl')
+if has_key(g:polyglot_is_disabled, 'tcl')
   finish
 endif
 
diff --git a/compiler/tex.vim b/compiler/tex.vim
index 497b58772..bfe5b2a5f 100644
--- a/compiler/tex.vim
+++ b/compiler/tex.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tex')
+if has_key(g:polyglot_is_disabled, 'tex')
   finish
 endif
 
diff --git a/compiler/tidy.vim b/compiler/tidy.vim
index 0c635fb8f..5ebe6e372 100644
--- a/compiler/tidy.vim
+++ b/compiler/tidy.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tidy')
+if has_key(g:polyglot_is_disabled, 'tidy')
   finish
 endif
 
diff --git a/compiler/typescript.vim b/compiler/typescript.vim
index 4910a95e0..e5ec6dfb6 100644
--- a/compiler/typescript.vim
+++ b/compiler/typescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/extras/flow.vim b/extras/flow.vim
index e13bdeaa6..0de97c054 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'javascript')
+if has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index 7e6f2b559..f49a5e546 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'javascript')
+if has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/extras/ngdoc.vim b/extras/ngdoc.vim
index 46102a7d5..e5735b2ad 100644
--- a/extras/ngdoc.vim
+++ b/extras/ngdoc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'javascript')
+if has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/ftplugin/8th.vim b/ftplugin/8th.vim
index e5f2f0560..e3f8d209f 100644
--- a/ftplugin/8th.vim
+++ b/ftplugin/8th.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, '8th')
+if has_key(g:polyglot_is_disabled, '8th')
   finish
 endif
 
diff --git a/ftplugin/a2ps.vim b/ftplugin/a2ps.vim
index a247bfb10..3e540faad 100644
--- a/ftplugin/a2ps.vim
+++ b/ftplugin/a2ps.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'a2ps')
+if has_key(g:polyglot_is_disabled, 'a2ps')
   finish
 endif
 
diff --git a/ftplugin/aap.vim b/ftplugin/aap.vim
index 3e67cc0a6..e77d43b90 100644
--- a/ftplugin/aap.vim
+++ b/ftplugin/aap.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'aap')
+if has_key(g:polyglot_is_disabled, 'aap')
   finish
 endif
 
diff --git a/ftplugin/abap.vim b/ftplugin/abap.vim
index d80412934..2e7fa2839 100644
--- a/ftplugin/abap.vim
+++ b/ftplugin/abap.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'abap')
+if has_key(g:polyglot_is_disabled, 'abap')
   finish
 endif
 
diff --git a/ftplugin/abaqus.vim b/ftplugin/abaqus.vim
index b800d1864..d6d0e116f 100644
--- a/ftplugin/abaqus.vim
+++ b/ftplugin/abaqus.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'abaqus')
+if has_key(g:polyglot_is_disabled, 'abaqus')
   finish
 endif
 
diff --git a/ftplugin/ada.vim b/ftplugin/ada.vim
index 2025e9b65..23e36e31d 100644
--- a/ftplugin/ada.vim
+++ b/ftplugin/ada.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ada')
+if has_key(g:polyglot_is_disabled, 'ada')
   finish
 endif
 
diff --git a/ftplugin/alsaconf.vim b/ftplugin/alsaconf.vim
index 2bdbe06c2..cd8d60ef9 100644
--- a/ftplugin/alsaconf.vim
+++ b/ftplugin/alsaconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'alsaconf')
+if has_key(g:polyglot_is_disabled, 'alsaconf')
   finish
 endif
 
diff --git a/ftplugin/ansible.vim b/ftplugin/ansible.vim
index 44def5621..5b8a015b0 100644
--- a/ftplugin/ansible.vim
+++ b/ftplugin/ansible.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ansible')
+if has_key(g:polyglot_is_disabled, 'ansible')
   finish
 endif
 
diff --git a/ftplugin/ansible_hosts.vim b/ftplugin/ansible_hosts.vim
index b4f3b6658..adc3bbd8f 100644
--- a/ftplugin/ansible_hosts.vim
+++ b/ftplugin/ansible_hosts.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ansible')
+if has_key(g:polyglot_is_disabled, 'ansible')
   finish
 endif
 
diff --git a/ftplugin/ant.vim b/ftplugin/ant.vim
index e4414e002..01122fd75 100644
--- a/ftplugin/ant.vim
+++ b/ftplugin/ant.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ant')
+if has_key(g:polyglot_is_disabled, 'ant')
   finish
 endif
 
diff --git a/ftplugin/arch.vim b/ftplugin/arch.vim
index 288140d67..47e97c7d8 100644
--- a/ftplugin/arch.vim
+++ b/ftplugin/arch.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'arch')
+if has_key(g:polyglot_is_disabled, 'arch')
   finish
 endif
 
diff --git a/ftplugin/art.vim b/ftplugin/art.vim
index 7dd4a1cf0..bcf60050e 100644
--- a/ftplugin/art.vim
+++ b/ftplugin/art.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'art')
+if has_key(g:polyglot_is_disabled, 'art')
   finish
 endif
 
diff --git a/ftplugin/aspvbs.vim b/ftplugin/aspvbs.vim
index 86c3d3158..445693682 100644
--- a/ftplugin/aspvbs.vim
+++ b/ftplugin/aspvbs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'aspvbs')
+if has_key(g:polyglot_is_disabled, 'aspvbs')
   finish
 endif
 
diff --git a/ftplugin/automake.vim b/ftplugin/automake.vim
index d7ab44e98..071d52f4e 100644
--- a/ftplugin/automake.vim
+++ b/ftplugin/automake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'automake')
+if has_key(g:polyglot_is_disabled, 'automake')
   finish
 endif
 
diff --git a/ftplugin/awk.vim b/ftplugin/awk.vim
index 13d7acb67..a3b02e170 100644
--- a/ftplugin/awk.vim
+++ b/ftplugin/awk.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'awk')
+if has_key(g:polyglot_is_disabled, 'awk')
   finish
 endif
 
diff --git a/ftplugin/bdf.vim b/ftplugin/bdf.vim
index 7485eb7dd..d8834f413 100644
--- a/ftplugin/bdf.vim
+++ b/ftplugin/bdf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bdf')
+if has_key(g:polyglot_is_disabled, 'bdf')
   finish
 endif
 
diff --git a/ftplugin/blade.vim b/ftplugin/blade.vim
index 1f88c839e..db3c1c01c 100644
--- a/ftplugin/blade.vim
+++ b/ftplugin/blade.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'blade')
+if has_key(g:polyglot_is_disabled, 'blade')
   finish
 endif
 
diff --git a/ftplugin/bst.vim b/ftplugin/bst.vim
index 1c150d931..722d7896d 100644
--- a/ftplugin/bst.vim
+++ b/ftplugin/bst.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bst')
+if has_key(g:polyglot_is_disabled, 'bst')
   finish
 endif
 
diff --git a/ftplugin/bzl.vim b/ftplugin/bzl.vim
index 3d1d22efc..59501110f 100644
--- a/ftplugin/bzl.vim
+++ b/ftplugin/bzl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bzl')
+if has_key(g:polyglot_is_disabled, 'bzl')
   finish
 endif
 
diff --git a/ftplugin/caddyfile.vim b/ftplugin/caddyfile.vim
index 363fbc566..b56238cf7 100644
--- a/ftplugin/caddyfile.vim
+++ b/ftplugin/caddyfile.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'caddyfile')
+if has_key(g:polyglot_is_disabled, 'caddyfile')
   finish
 endif
 
diff --git a/ftplugin/calendar.vim b/ftplugin/calendar.vim
index 8952a9b72..7f73c6e03 100644
--- a/ftplugin/calendar.vim
+++ b/ftplugin/calendar.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'calendar')
+if has_key(g:polyglot_is_disabled, 'calendar')
   finish
 endif
 
diff --git a/ftplugin/cdrdaoconf.vim b/ftplugin/cdrdaoconf.vim
index ea14cfc42..cc3ad4aa3 100644
--- a/ftplugin/cdrdaoconf.vim
+++ b/ftplugin/cdrdaoconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cdrdaoconf')
+if has_key(g:polyglot_is_disabled, 'cdrdaoconf')
   finish
 endif
 
diff --git a/ftplugin/cfg.vim b/ftplugin/cfg.vim
index db6374816..42c1f95ac 100644
--- a/ftplugin/cfg.vim
+++ b/ftplugin/cfg.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cfg')
+if has_key(g:polyglot_is_disabled, 'cfg')
   finish
 endif
 
diff --git a/ftplugin/ch.vim b/ftplugin/ch.vim
index 8249bbc96..030c21ddc 100644
--- a/ftplugin/ch.vim
+++ b/ftplugin/ch.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ch')
+if has_key(g:polyglot_is_disabled, 'ch')
   finish
 endif
 
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 170fc30eb..7211f7f08 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'clojure')
+if has_key(g:polyglot_is_disabled, 'clojure')
   finish
 endif
 
diff --git a/ftplugin/cobol.vim b/ftplugin/cobol.vim
index 40b0a8e9c..a3db3c437 100644
--- a/ftplugin/cobol.vim
+++ b/ftplugin/cobol.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cobol')
+if has_key(g:polyglot_is_disabled, 'cobol')
   finish
 endif
 
diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim
index f973deb5d..701d47960 100644
--- a/ftplugin/coffee.vim
+++ b/ftplugin/coffee.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'coffee-script')
+if has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/ftplugin/conf.vim b/ftplugin/conf.vim
index 51fb01fce..dd150de96 100644
--- a/ftplugin/conf.vim
+++ b/ftplugin/conf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'conf')
+if has_key(g:polyglot_is_disabled, 'conf')
   finish
 endif
 
diff --git a/ftplugin/config.vim b/ftplugin/config.vim
index e2fd9605b..a414fef55 100644
--- a/ftplugin/config.vim
+++ b/ftplugin/config.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'config')
+if has_key(g:polyglot_is_disabled, 'config')
   finish
 endif
 
diff --git a/ftplugin/crm.vim b/ftplugin/crm.vim
index 85465223b..a407ed002 100644
--- a/ftplugin/crm.vim
+++ b/ftplugin/crm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crm')
+if has_key(g:polyglot_is_disabled, 'crm')
   finish
 endif
 
diff --git a/ftplugin/cryptol/folding.vim b/ftplugin/cryptol/folding.vim
index 865a1e594..7adca3ef7 100644
--- a/ftplugin/cryptol/folding.vim
+++ b/ftplugin/cryptol/folding.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cryptol')
+if has_key(g:polyglot_is_disabled, 'cryptol')
   finish
 endif
 
diff --git a/ftplugin/crystal.vim b/ftplugin/crystal.vim
index 76bbb6ad5..d94babebd 100644
--- a/ftplugin/crystal.vim
+++ b/ftplugin/crystal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/ftplugin/cs.vim b/ftplugin/cs.vim
index 7dc16fe34..f3a14da44 100644
--- a/ftplugin/cs.vim
+++ b/ftplugin/cs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cs')
+if has_key(g:polyglot_is_disabled, 'cs')
   finish
 endif
 
diff --git a/ftplugin/csc.vim b/ftplugin/csc.vim
index 40b65687d..ef3e9d23d 100644
--- a/ftplugin/csc.vim
+++ b/ftplugin/csc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'csc')
+if has_key(g:polyglot_is_disabled, 'csc')
   finish
 endif
 
diff --git a/ftplugin/css.vim b/ftplugin/css.vim
index b9446bfd6..e7ff73b6d 100644
--- a/ftplugin/css.vim
+++ b/ftplugin/css.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'css')
+if has_key(g:polyglot_is_disabled, 'css')
   finish
 endif
 
diff --git a/ftplugin/csv.vim b/ftplugin/csv.vim
index 40d3577b8..71b3de198 100644
--- a/ftplugin/csv.vim
+++ b/ftplugin/csv.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'csv')
+if has_key(g:polyglot_is_disabled, 'csv')
   finish
 endif
 
diff --git a/ftplugin/cucumber.vim b/ftplugin/cucumber.vim
index c53cb6312..f1153f5e2 100644
--- a/ftplugin/cucumber.vim
+++ b/ftplugin/cucumber.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cucumber')
+if has_key(g:polyglot_is_disabled, 'cucumber')
   finish
 endif
 
diff --git a/ftplugin/cvsrc.vim b/ftplugin/cvsrc.vim
index 6e888f10e..b5f5693e6 100644
--- a/ftplugin/cvsrc.vim
+++ b/ftplugin/cvsrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cvsrc')
+if has_key(g:polyglot_is_disabled, 'cvsrc')
   finish
 endif
 
diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim
index 5050378fb..d6609181e 100644
--- a/ftplugin/dart.vim
+++ b/ftplugin/dart.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dart')
+if has_key(g:polyglot_is_disabled, 'dart')
   finish
 endif
 
diff --git a/ftplugin/debchangelog.vim b/ftplugin/debchangelog.vim
index 746de50bd..27d521eb6 100644
--- a/ftplugin/debchangelog.vim
+++ b/ftplugin/debchangelog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'debchangelog')
+if has_key(g:polyglot_is_disabled, 'debchangelog')
   finish
 endif
 
diff --git a/ftplugin/debcontrol.vim b/ftplugin/debcontrol.vim
index c4307414e..841f2b7cd 100644
--- a/ftplugin/debcontrol.vim
+++ b/ftplugin/debcontrol.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'debcontrol')
+if has_key(g:polyglot_is_disabled, 'debcontrol')
   finish
 endif
 
diff --git a/ftplugin/denyhosts.vim b/ftplugin/denyhosts.vim
index bda92b121..04ab77604 100644
--- a/ftplugin/denyhosts.vim
+++ b/ftplugin/denyhosts.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'denyhosts')
+if has_key(g:polyglot_is_disabled, 'denyhosts')
   finish
 endif
 
diff --git a/ftplugin/dhall.vim b/ftplugin/dhall.vim
index 1b90832ce..6c183c358 100644
--- a/ftplugin/dhall.vim
+++ b/ftplugin/dhall.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dhall')
+if has_key(g:polyglot_is_disabled, 'dhall')
   finish
 endif
 
diff --git a/ftplugin/dictconf.vim b/ftplugin/dictconf.vim
index d56fa358c..706b4a48c 100644
--- a/ftplugin/dictconf.vim
+++ b/ftplugin/dictconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dictconf')
+if has_key(g:polyglot_is_disabled, 'dictconf')
   finish
 endif
 
diff --git a/ftplugin/dictdconf.vim b/ftplugin/dictdconf.vim
index b05d75204..224ad1046 100644
--- a/ftplugin/dictdconf.vim
+++ b/ftplugin/dictdconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dictdconf')
+if has_key(g:polyglot_is_disabled, 'dictdconf')
   finish
 endif
 
diff --git a/ftplugin/diff.vim b/ftplugin/diff.vim
index 4343638c8..66ec41794 100644
--- a/ftplugin/diff.vim
+++ b/ftplugin/diff.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'diff')
+if has_key(g:polyglot_is_disabled, 'diff')
   finish
 endif
 
diff --git a/ftplugin/dircolors.vim b/ftplugin/dircolors.vim
index 92df4c031..207d30ec3 100644
--- a/ftplugin/dircolors.vim
+++ b/ftplugin/dircolors.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dircolors')
+if has_key(g:polyglot_is_disabled, 'dircolors')
   finish
 endif
 
diff --git a/ftplugin/docker-compose.vim b/ftplugin/docker-compose.vim
index 32c91d532..7d5a1e48e 100644
--- a/ftplugin/docker-compose.vim
+++ b/ftplugin/docker-compose.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'docker-compose')
+if has_key(g:polyglot_is_disabled, 'docker-compose')
   finish
 endif
 
diff --git a/ftplugin/dockerfile.vim b/ftplugin/dockerfile.vim
index 79388fb08..f99dd9895 100644
--- a/ftplugin/dockerfile.vim
+++ b/ftplugin/dockerfile.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dockerfile')
+if has_key(g:polyglot_is_disabled, 'dockerfile')
   finish
 endif
 
diff --git a/ftplugin/dosbatch.vim b/ftplugin/dosbatch.vim
index 434f5772e..25d0676d5 100644
--- a/ftplugin/dosbatch.vim
+++ b/ftplugin/dosbatch.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dosbatch')
+if has_key(g:polyglot_is_disabled, 'dosbatch')
   finish
 endif
 
diff --git a/ftplugin/dosini.vim b/ftplugin/dosini.vim
index 1f9c82891..fbacecc05 100644
--- a/ftplugin/dosini.vim
+++ b/ftplugin/dosini.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dosini')
+if has_key(g:polyglot_is_disabled, 'dosini')
   finish
 endif
 
diff --git a/ftplugin/dtd.vim b/ftplugin/dtd.vim
index d8f2aa22b..1ceb1b773 100644
--- a/ftplugin/dtd.vim
+++ b/ftplugin/dtd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dtd')
+if has_key(g:polyglot_is_disabled, 'dtd')
   finish
 endif
 
diff --git a/ftplugin/dune.vim b/ftplugin/dune.vim
index 9bd424c88..970c98251 100644
--- a/ftplugin/dune.vim
+++ b/ftplugin/dune.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/ftplugin/ecrystal.vim b/ftplugin/ecrystal.vim
index 81d0fad78..a8c249c0d 100644
--- a/ftplugin/ecrystal.vim
+++ b/ftplugin/ecrystal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index 1b337f581..61a59a05b 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elixir')
+if has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/ftplugin/elinks.vim b/ftplugin/elinks.vim
index 3288cc53a..7a4c75a5f 100644
--- a/ftplugin/elinks.vim
+++ b/ftplugin/elinks.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elinks')
+if has_key(g:polyglot_is_disabled, 'elinks')
   finish
 endif
 
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index 04fd66a1b..2cae0e3e0 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elixir')
+if has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/ftplugin/embeddedpuppet.vim b/ftplugin/embeddedpuppet.vim
index e7da63d2c..4e6a08493 100644
--- a/ftplugin/embeddedpuppet.vim
+++ b/ftplugin/embeddedpuppet.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'puppet')
+if has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/ftplugin/ember-script.vim b/ftplugin/ember-script.vim
index 3180ea72d..d80653e1d 100644
--- a/ftplugin/ember-script.vim
+++ b/ftplugin/ember-script.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'emberscript')
+if has_key(g:polyglot_is_disabled, 'emberscript')
   finish
 endif
 
diff --git a/ftplugin/emblem.vim b/ftplugin/emblem.vim
index 9e102c0bd..d612566d2 100644
--- a/ftplugin/emblem.vim
+++ b/ftplugin/emblem.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'emblem')
+if has_key(g:polyglot_is_disabled, 'emblem')
   finish
 endif
 
diff --git a/ftplugin/eruby.vim b/ftplugin/eruby.vim
index af7415792..5a7b4ca51 100644
--- a/ftplugin/eruby.vim
+++ b/ftplugin/eruby.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ruby')
+if has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/ftplugin/eterm.vim b/ftplugin/eterm.vim
index d121fdf32..15c3b0e29 100644
--- a/ftplugin/eterm.vim
+++ b/ftplugin/eterm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'eterm')
+if has_key(g:polyglot_is_disabled, 'eterm')
   finish
 endif
 
diff --git a/ftplugin/falcon.vim b/ftplugin/falcon.vim
index 727fcfcb2..9911b507a 100644
--- a/ftplugin/falcon.vim
+++ b/ftplugin/falcon.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'falcon')
+if has_key(g:polyglot_is_disabled, 'falcon')
   finish
 endif
 
diff --git a/ftplugin/fennel.vim b/ftplugin/fennel.vim
index 1cbb2d33e..f840bb3b4 100644
--- a/ftplugin/fennel.vim
+++ b/ftplugin/fennel.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fennel')
+if has_key(g:polyglot_is_disabled, 'fennel')
   finish
 endif
 
diff --git a/ftplugin/fetchmail.vim b/ftplugin/fetchmail.vim
index 8b86ea1af..636099424 100644
--- a/ftplugin/fetchmail.vim
+++ b/ftplugin/fetchmail.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fetchmail')
+if has_key(g:polyglot_is_disabled, 'fetchmail')
   finish
 endif
 
diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
index 88f6a2756..d08222dbb 100644
--- a/ftplugin/fish.vim
+++ b/ftplugin/fish.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fish')
+if has_key(g:polyglot_is_disabled, 'fish')
   finish
 endif
 
diff --git a/ftplugin/fortran.vim b/ftplugin/fortran.vim
index a4ae9adeb..fdf77db55 100644
--- a/ftplugin/fortran.vim
+++ b/ftplugin/fortran.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fortran')
+if has_key(g:polyglot_is_disabled, 'fortran')
   finish
 endif
 
diff --git a/ftplugin/framescript.vim b/ftplugin/framescript.vim
index f3ae64810..5361536da 100644
--- a/ftplugin/framescript.vim
+++ b/ftplugin/framescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'framescript')
+if has_key(g:polyglot_is_disabled, 'framescript')
   finish
 endif
 
diff --git a/ftplugin/fvwm.vim b/ftplugin/fvwm.vim
index ed3fb40d1..b3f3e1357 100644
--- a/ftplugin/fvwm.vim
+++ b/ftplugin/fvwm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fvwm')
+if has_key(g:polyglot_is_disabled, 'fvwm')
   finish
 endif
 
diff --git a/ftplugin/gdb.vim b/ftplugin/gdb.vim
index 655fb6017..c08787faa 100644
--- a/ftplugin/gdb.vim
+++ b/ftplugin/gdb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gdb')
+if has_key(g:polyglot_is_disabled, 'gdb')
   finish
 endif
 
diff --git a/ftplugin/git.vim b/ftplugin/git.vim
index 2b907e52d..d4ffec78b 100644
--- a/ftplugin/git.vim
+++ b/ftplugin/git.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'git')
+if has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim
index 026f898eb..d6947f326 100644
--- a/ftplugin/gitcommit.vim
+++ b/ftplugin/gitcommit.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'git')
+if has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/ftplugin/gitconfig.vim b/ftplugin/gitconfig.vim
index 2d98aaf78..d6017ea54 100644
--- a/ftplugin/gitconfig.vim
+++ b/ftplugin/gitconfig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'git')
+if has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/ftplugin/gitignore.vim b/ftplugin/gitignore.vim
index bfb857023..c58811b0c 100644
--- a/ftplugin/gitignore.vim
+++ b/ftplugin/gitignore.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gitignore')
+if has_key(g:polyglot_is_disabled, 'gitignore')
   finish
 endif
 
diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim
index 524663c7c..29bedf43e 100644
--- a/ftplugin/gitrebase.vim
+++ b/ftplugin/gitrebase.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'git')
+if has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/ftplugin/gitsendemail.vim b/ftplugin/gitsendemail.vim
index 44be6a7d8..c30d36577 100644
--- a/ftplugin/gitsendemail.vim
+++ b/ftplugin/gitsendemail.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'git')
+if has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/ftplugin/gpg.vim b/ftplugin/gpg.vim
index f6e934912..f1213d7ea 100644
--- a/ftplugin/gpg.vim
+++ b/ftplugin/gpg.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gpg')
+if has_key(g:polyglot_is_disabled, 'gpg')
   finish
 endif
 
diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim
index 177df4798..9b66c5c78 100644
--- a/ftplugin/graphql.vim
+++ b/ftplugin/graphql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'graphql')
+if has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/ftplugin/groovy.vim b/ftplugin/groovy.vim
index d87b3d567..93b70aeed 100644
--- a/ftplugin/groovy.vim
+++ b/ftplugin/groovy.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'groovy')
+if has_key(g:polyglot_is_disabled, 'groovy')
   finish
 endif
 
diff --git a/ftplugin/group.vim b/ftplugin/group.vim
index 2a2758314..9a6d1e874 100644
--- a/ftplugin/group.vim
+++ b/ftplugin/group.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'group')
+if has_key(g:polyglot_is_disabled, 'group')
   finish
 endif
 
diff --git a/ftplugin/grub.vim b/ftplugin/grub.vim
index b354f0332..d7805a5be 100644
--- a/ftplugin/grub.vim
+++ b/ftplugin/grub.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'grub')
+if has_key(g:polyglot_is_disabled, 'grub')
   finish
 endif
 
diff --git a/ftplugin/haml.vim b/ftplugin/haml.vim
index e5f020499..b747fe684 100644
--- a/ftplugin/haml.vim
+++ b/ftplugin/haml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haml')
+if has_key(g:polyglot_is_disabled, 'haml')
   finish
 endif
 
diff --git a/ftplugin/hamster.vim b/ftplugin/hamster.vim
index bb8c36e78..3bfb9fd96 100644
--- a/ftplugin/hamster.vim
+++ b/ftplugin/hamster.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hamster')
+if has_key(g:polyglot_is_disabled, 'hamster')
   finish
 endif
 
diff --git a/ftplugin/handlebars.vim b/ftplugin/handlebars.vim
index bbe46ea45..d769f1e51 100644
--- a/ftplugin/handlebars.vim
+++ b/ftplugin/handlebars.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'handlebars')
+if has_key(g:polyglot_is_disabled, 'handlebars')
   finish
 endif
 
diff --git a/ftplugin/hcl.vim b/ftplugin/hcl.vim
index 8d0590445..7cd2a8a73 100644
--- a/ftplugin/hcl.vim
+++ b/ftplugin/hcl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hcl')
+if has_key(g:polyglot_is_disabled, 'hcl')
   finish
 endif
 
diff --git a/ftplugin/help.vim b/ftplugin/help.vim
index 18d1498e8..47e203fee 100644
--- a/ftplugin/help.vim
+++ b/ftplugin/help.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'help')
+if has_key(g:polyglot_is_disabled, 'help')
   finish
 endif
 
diff --git a/ftplugin/hgcommit.vim b/ftplugin/hgcommit.vim
index a297f0063..e4d132982 100644
--- a/ftplugin/hgcommit.vim
+++ b/ftplugin/hgcommit.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hgcommit')
+if has_key(g:polyglot_is_disabled, 'hgcommit')
   finish
 endif
 
diff --git a/ftplugin/hive.vim b/ftplugin/hive.vim
index 0e9cfd8e2..dd1b84450 100644
--- a/ftplugin/hive.vim
+++ b/ftplugin/hive.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hive')
+if has_key(g:polyglot_is_disabled, 'hive')
   finish
 endif
 
diff --git a/ftplugin/hog.vim b/ftplugin/hog.vim
index 62c42f7e7..b3844023c 100644
--- a/ftplugin/hog.vim
+++ b/ftplugin/hog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hog')
+if has_key(g:polyglot_is_disabled, 'hog')
   finish
 endif
 
diff --git a/ftplugin/hostconf.vim b/ftplugin/hostconf.vim
index 126940175..56c67899d 100644
--- a/ftplugin/hostconf.vim
+++ b/ftplugin/hostconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hostconf')
+if has_key(g:polyglot_is_disabled, 'hostconf')
   finish
 endif
 
diff --git a/ftplugin/hostsaccess.vim b/ftplugin/hostsaccess.vim
index 9c12ca31f..312b91455 100644
--- a/ftplugin/hostsaccess.vim
+++ b/ftplugin/hostsaccess.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hostsaccess')
+if has_key(g:polyglot_is_disabled, 'hostsaccess')
   finish
 endif
 
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index 414160793..5ec0bb22f 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html')
+if has_key(g:polyglot_is_disabled, 'html')
   finish
 endif
 
diff --git a/ftplugin/htmldjango.vim b/ftplugin/htmldjango.vim
index deaa50c4c..a8b23cd4d 100644
--- a/ftplugin/htmldjango.vim
+++ b/ftplugin/htmldjango.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'htmldjango')
+if has_key(g:polyglot_is_disabled, 'htmldjango')
   finish
 endif
 
diff --git a/ftplugin/i3config.vim b/ftplugin/i3config.vim
index dfdbbeb3a..80e63b014 100644
--- a/ftplugin/i3config.vim
+++ b/ftplugin/i3config.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'i3')
+if has_key(g:polyglot_is_disabled, 'i3')
   finish
 endif
 
diff --git a/ftplugin/idris.vim b/ftplugin/idris.vim
index 994ac63ed..05d7a1afb 100644
--- a/ftplugin/idris.vim
+++ b/ftplugin/idris.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'idris')
+if has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/ftplugin/idris2.vim b/ftplugin/idris2.vim
index 5596bbbd0..28ac7b5c3 100644
--- a/ftplugin/idris2.vim
+++ b/ftplugin/idris2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'idris2')
+if has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/ftplugin/indent.vim b/ftplugin/indent.vim
index 96cc9a102..0c0b43115 100644
--- a/ftplugin/indent.vim
+++ b/ftplugin/indent.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'indent')
+if has_key(g:polyglot_is_disabled, 'indent')
   finish
 endif
 
diff --git a/ftplugin/ion.vim b/ftplugin/ion.vim
index 7401d0b5a..8bf4a19a3 100644
--- a/ftplugin/ion.vim
+++ b/ftplugin/ion.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ion')
+if has_key(g:polyglot_is_disabled, 'ion')
   finish
 endif
 
diff --git a/ftplugin/j.vim b/ftplugin/j.vim
index 62b60ed34..78df3a37e 100644
--- a/ftplugin/j.vim
+++ b/ftplugin/j.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'j')
+if has_key(g:polyglot_is_disabled, 'j')
   finish
 endif
 
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
index ec8d4f5b6..c50017864 100644
--- a/ftplugin/java.vim
+++ b/ftplugin/java.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'java')
+if has_key(g:polyglot_is_disabled, 'java')
   finish
 endif
 
diff --git a/ftplugin/jproperties.vim b/ftplugin/jproperties.vim
index a0a2152df..6860366e9 100644
--- a/ftplugin/jproperties.vim
+++ b/ftplugin/jproperties.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jproperties')
+if has_key(g:polyglot_is_disabled, 'jproperties')
   finish
 endif
 
diff --git a/ftplugin/jq.vim b/ftplugin/jq.vim
index cfabd2cbd..30c3c99e0 100644
--- a/ftplugin/jq.vim
+++ b/ftplugin/jq.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jq')
+if has_key(g:polyglot_is_disabled, 'jq')
   finish
 endif
 
diff --git a/ftplugin/json.vim b/ftplugin/json.vim
index 22eaa5061..5c09f13d0 100644
--- a/ftplugin/json.vim
+++ b/ftplugin/json.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'json')
+if has_key(g:polyglot_is_disabled, 'json')
   finish
 endif
 
diff --git a/ftplugin/jsonnet.vim b/ftplugin/jsonnet.vim
index aff7d8808..781965e5c 100644
--- a/ftplugin/jsonnet.vim
+++ b/ftplugin/jsonnet.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsonnet')
+if has_key(g:polyglot_is_disabled, 'jsonnet')
   finish
 endif
 
diff --git a/ftplugin/jsp.vim b/ftplugin/jsp.vim
index 9de79fd29..6ee9329e8 100644
--- a/ftplugin/jsp.vim
+++ b/ftplugin/jsp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsp')
+if has_key(g:polyglot_is_disabled, 'jsp')
   finish
 endif
 
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index 2416e3881..e507dcab7 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'julia')
+if has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/ftplugin/juliadoc.vim b/ftplugin/juliadoc.vim
index b5fd1f1e4..0ae6deb4d 100644
--- a/ftplugin/juliadoc.vim
+++ b/ftplugin/juliadoc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'julia')
+if has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/ftplugin/kconfig.vim b/ftplugin/kconfig.vim
index c0ed75097..a9a5201f2 100644
--- a/ftplugin/kconfig.vim
+++ b/ftplugin/kconfig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'kconfig')
+if has_key(g:polyglot_is_disabled, 'kconfig')
   finish
 endif
 
diff --git a/ftplugin/kotlin.vim b/ftplugin/kotlin.vim
index a9aee55b2..b5345bfc4 100644
--- a/ftplugin/kotlin.vim
+++ b/ftplugin/kotlin.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'kotlin')
+if has_key(g:polyglot_is_disabled, 'kotlin')
   finish
 endif
 
diff --git a/ftplugin/kwt.vim b/ftplugin/kwt.vim
index 89c914eef..ec3690464 100644
--- a/ftplugin/kwt.vim
+++ b/ftplugin/kwt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'kwt')
+if has_key(g:polyglot_is_disabled, 'kwt')
   finish
 endif
 
diff --git a/ftplugin/ld.vim b/ftplugin/ld.vim
index 5de5b71a9..d9bc8d46c 100644
--- a/ftplugin/ld.vim
+++ b/ftplugin/ld.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ld')
+if has_key(g:polyglot_is_disabled, 'ld')
   finish
 endif
 
diff --git a/ftplugin/less.vim b/ftplugin/less.vim
index 4946b22cf..c5fc4c506 100644
--- a/ftplugin/less.vim
+++ b/ftplugin/less.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'less')
+if has_key(g:polyglot_is_disabled, 'less')
   finish
 endif
 
diff --git a/ftplugin/lftp.vim b/ftplugin/lftp.vim
index a5fa4dcd3..23e1fe59b 100644
--- a/ftplugin/lftp.vim
+++ b/ftplugin/lftp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lftp')
+if has_key(g:polyglot_is_disabled, 'lftp')
   finish
 endif
 
diff --git a/ftplugin/libao.vim b/ftplugin/libao.vim
index 49700d8ff..48073e7e7 100644
--- a/ftplugin/libao.vim
+++ b/ftplugin/libao.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'libao')
+if has_key(g:polyglot_is_disabled, 'libao')
   finish
 endif
 
diff --git a/ftplugin/lilypond.vim b/ftplugin/lilypond.vim
index 5963cdafc..3f4f9c786 100644
--- a/ftplugin/lilypond.vim
+++ b/ftplugin/lilypond.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lilypond')
+if has_key(g:polyglot_is_disabled, 'lilypond')
   finish
 endif
 
diff --git a/ftplugin/limits.vim b/ftplugin/limits.vim
index db9fd7570..316abdd02 100644
--- a/ftplugin/limits.vim
+++ b/ftplugin/limits.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'limits')
+if has_key(g:polyglot_is_disabled, 'limits')
   finish
 endif
 
diff --git a/ftplugin/liquid.vim b/ftplugin/liquid.vim
index 4eaa80942..4d181349e 100644
--- a/ftplugin/liquid.vim
+++ b/ftplugin/liquid.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'liquid')
+if has_key(g:polyglot_is_disabled, 'liquid')
   finish
 endif
 
diff --git a/ftplugin/lisp.vim b/ftplugin/lisp.vim
index 5425a34ca..838139b01 100644
--- a/ftplugin/lisp.vim
+++ b/ftplugin/lisp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lisp')
+if has_key(g:polyglot_is_disabled, 'lisp')
   finish
 endif
 
diff --git a/ftplugin/litcoffee.vim b/ftplugin/litcoffee.vim
index 622b368df..d9bd72dc1 100644
--- a/ftplugin/litcoffee.vim
+++ b/ftplugin/litcoffee.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'coffee-script')
+if has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/ftplugin/llvm.vim b/ftplugin/llvm.vim
index a21fe96dd..19cab5d2a 100644
--- a/ftplugin/llvm.vim
+++ b/ftplugin/llvm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'llvm')
+if has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/ftplugin/logcheck.vim b/ftplugin/logcheck.vim
index eb009fc2e..3ad3567c7 100644
--- a/ftplugin/logcheck.vim
+++ b/ftplugin/logcheck.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'logcheck')
+if has_key(g:polyglot_is_disabled, 'logcheck')
   finish
 endif
 
diff --git a/ftplugin/loginaccess.vim b/ftplugin/loginaccess.vim
index 028ebd5e9..e4cf1edde 100644
--- a/ftplugin/loginaccess.vim
+++ b/ftplugin/loginaccess.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'loginaccess')
+if has_key(g:polyglot_is_disabled, 'loginaccess')
   finish
 endif
 
diff --git a/ftplugin/logindefs.vim b/ftplugin/logindefs.vim
index 8c615834a..15bb751a9 100644
--- a/ftplugin/logindefs.vim
+++ b/ftplugin/logindefs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'logindefs')
+if has_key(g:polyglot_is_disabled, 'logindefs')
   finish
 endif
 
diff --git a/ftplugin/logtalk.vim b/ftplugin/logtalk.vim
index d672350f6..56e883d70 100644
--- a/ftplugin/logtalk.vim
+++ b/ftplugin/logtalk.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'logtalk')
+if has_key(g:polyglot_is_disabled, 'logtalk')
   finish
 endif
 
diff --git a/ftplugin/lprolog.vim b/ftplugin/lprolog.vim
index 1ed7120db..e1e7e3e63 100644
--- a/ftplugin/lprolog.vim
+++ b/ftplugin/lprolog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lprolog')
+if has_key(g:polyglot_is_disabled, 'lprolog')
   finish
 endif
 
diff --git a/ftplugin/ls.vim b/ftplugin/ls.vim
index 51fb7fb81..425bb6f60 100644
--- a/ftplugin/ls.vim
+++ b/ftplugin/ls.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'livescript')
+if has_key(g:polyglot_is_disabled, 'livescript')
   finish
 endif
 
diff --git a/ftplugin/m4.vim b/ftplugin/m4.vim
index 9cd3bfedf..538e08851 100644
--- a/ftplugin/m4.vim
+++ b/ftplugin/m4.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'm4')
+if has_key(g:polyglot_is_disabled, 'm4')
   finish
 endif
 
diff --git a/ftplugin/mail.vim b/ftplugin/mail.vim
index 132f3b77d..4c8c16005 100644
--- a/ftplugin/mail.vim
+++ b/ftplugin/mail.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mail')
+if has_key(g:polyglot_is_disabled, 'mail')
   finish
 endif
 
diff --git a/ftplugin/mailaliases.vim b/ftplugin/mailaliases.vim
index 9b04c535e..01d2b6535 100644
--- a/ftplugin/mailaliases.vim
+++ b/ftplugin/mailaliases.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mailaliases')
+if has_key(g:polyglot_is_disabled, 'mailaliases')
   finish
 endif
 
diff --git a/ftplugin/mailcap.vim b/ftplugin/mailcap.vim
index 591414fa5..641d9939d 100644
--- a/ftplugin/mailcap.vim
+++ b/ftplugin/mailcap.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mailcap')
+if has_key(g:polyglot_is_disabled, 'mailcap')
   finish
 endif
 
diff --git a/ftplugin/make.vim b/ftplugin/make.vim
index f52a8491d..95556e54e 100644
--- a/ftplugin/make.vim
+++ b/ftplugin/make.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'make')
+if has_key(g:polyglot_is_disabled, 'make')
   finish
 endif
 
diff --git a/ftplugin/mako.vim b/ftplugin/mako.vim
index f26d03ec7..6496d6599 100644
--- a/ftplugin/mako.vim
+++ b/ftplugin/mako.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mako')
+if has_key(g:polyglot_is_disabled, 'mako')
   finish
 endif
 
diff --git a/ftplugin/manconf.vim b/ftplugin/manconf.vim
index 5f3acd958..ff87f8bf5 100644
--- a/ftplugin/manconf.vim
+++ b/ftplugin/manconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'manconf')
+if has_key(g:polyglot_is_disabled, 'manconf')
   finish
 endif
 
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index a175f7ed7..a334d1d97 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'markdown')
+if has_key(g:polyglot_is_disabled, 'markdown')
   finish
 endif
 
diff --git a/ftplugin/meson.vim b/ftplugin/meson.vim
index 0a3971f49..6753a8a93 100644
--- a/ftplugin/meson.vim
+++ b/ftplugin/meson.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'meson')
+if has_key(g:polyglot_is_disabled, 'meson')
   finish
 endif
 
diff --git a/ftplugin/mf.vim b/ftplugin/mf.vim
index c66116700..cdb644c86 100644
--- a/ftplugin/mf.vim
+++ b/ftplugin/mf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mf')
+if has_key(g:polyglot_is_disabled, 'mf')
   finish
 endif
 
diff --git a/ftplugin/mma.vim b/ftplugin/mma.vim
index 7c50bbd23..e9c91dc0c 100644
--- a/ftplugin/mma.vim
+++ b/ftplugin/mma.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mathematica')
+if has_key(g:polyglot_is_disabled, 'mathematica')
   finish
 endif
 
diff --git a/ftplugin/modconf.vim b/ftplugin/modconf.vim
index e47b54e23..c8f8f5e23 100644
--- a/ftplugin/modconf.vim
+++ b/ftplugin/modconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'modconf')
+if has_key(g:polyglot_is_disabled, 'modconf')
   finish
 endif
 
diff --git a/ftplugin/moon.vim b/ftplugin/moon.vim
index edfeccb3f..ab70250a2 100644
--- a/ftplugin/moon.vim
+++ b/ftplugin/moon.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'moonscript')
+if has_key(g:polyglot_is_disabled, 'moonscript')
   finish
 endif
 
diff --git a/ftplugin/mp.vim b/ftplugin/mp.vim
index 1817ef3c2..ea33ddda4 100644
--- a/ftplugin/mp.vim
+++ b/ftplugin/mp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mp')
+if has_key(g:polyglot_is_disabled, 'mp')
   finish
 endif
 
diff --git a/ftplugin/mplayerconf.vim b/ftplugin/mplayerconf.vim
index 92b00892f..7e7b63b01 100644
--- a/ftplugin/mplayerconf.vim
+++ b/ftplugin/mplayerconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mplayerconf')
+if has_key(g:polyglot_is_disabled, 'mplayerconf')
   finish
 endif
 
diff --git a/ftplugin/mrxvtrc.vim b/ftplugin/mrxvtrc.vim
index 88c422eaf..a5af89f44 100644
--- a/ftplugin/mrxvtrc.vim
+++ b/ftplugin/mrxvtrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mrxvtrc')
+if has_key(g:polyglot_is_disabled, 'mrxvtrc')
   finish
 endif
 
diff --git a/ftplugin/mustache.vim b/ftplugin/mustache.vim
index a9bfced54..5bed7ac34 100644
--- a/ftplugin/mustache.vim
+++ b/ftplugin/mustache.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'handlebars')
+if has_key(g:polyglot_is_disabled, 'handlebars')
   finish
 endif
 
diff --git a/ftplugin/muttrc.vim b/ftplugin/muttrc.vim
index 1a21184b1..320c7463d 100644
--- a/ftplugin/muttrc.vim
+++ b/ftplugin/muttrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'muttrc')
+if has_key(g:polyglot_is_disabled, 'muttrc')
   finish
 endif
 
diff --git a/ftplugin/nanorc.vim b/ftplugin/nanorc.vim
index e7e37557f..0812ebf50 100644
--- a/ftplugin/nanorc.vim
+++ b/ftplugin/nanorc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nanorc')
+if has_key(g:polyglot_is_disabled, 'nanorc')
   finish
 endif
 
diff --git a/ftplugin/neomuttrc.vim b/ftplugin/neomuttrc.vim
index 2d2739a1d..5488c2552 100644
--- a/ftplugin/neomuttrc.vim
+++ b/ftplugin/neomuttrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'neomuttrc')
+if has_key(g:polyglot_is_disabled, 'neomuttrc')
   finish
 endif
 
diff --git a/ftplugin/netrc.vim b/ftplugin/netrc.vim
index d60f01740..db8587726 100644
--- a/ftplugin/netrc.vim
+++ b/ftplugin/netrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'netrc')
+if has_key(g:polyglot_is_disabled, 'netrc')
   finish
 endif
 
diff --git a/ftplugin/nginx.vim b/ftplugin/nginx.vim
index 464b898ac..39ff7a5de 100644
--- a/ftplugin/nginx.vim
+++ b/ftplugin/nginx.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nginx')
+if has_key(g:polyglot_is_disabled, 'nginx')
   finish
 endif
 
diff --git a/ftplugin/nix.vim b/ftplugin/nix.vim
index b8d6f5eca..457f4443a 100644
--- a/ftplugin/nix.vim
+++ b/ftplugin/nix.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nix')
+if has_key(g:polyglot_is_disabled, 'nix')
   finish
 endif
 
diff --git a/ftplugin/nroff.vim b/ftplugin/nroff.vim
index f7e29ce2d..5ddd07f7e 100644
--- a/ftplugin/nroff.vim
+++ b/ftplugin/nroff.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nroff')
+if has_key(g:polyglot_is_disabled, 'nroff')
   finish
 endif
 
diff --git a/ftplugin/nsis.vim b/ftplugin/nsis.vim
index 12254f924..833259f31 100644
--- a/ftplugin/nsis.vim
+++ b/ftplugin/nsis.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nsis')
+if has_key(g:polyglot_is_disabled, 'nsis')
   finish
 endif
 
diff --git a/ftplugin/oasis.vim b/ftplugin/oasis.vim
index 0066807e8..6dfe76adf 100644
--- a/ftplugin/oasis.vim
+++ b/ftplugin/oasis.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/ftplugin/objc.vim b/ftplugin/objc.vim
index 1ba3e6333..906ae2bf5 100644
--- a/ftplugin/objc.vim
+++ b/ftplugin/objc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'objc')
+if has_key(g:polyglot_is_disabled, 'objc')
   finish
 endif
 
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index b5859598e..183b53188 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/ftplugin/ocamlbuild_tags.vim b/ftplugin/ocamlbuild_tags.vim
index 0066807e8..6dfe76adf 100644
--- a/ftplugin/ocamlbuild_tags.vim
+++ b/ftplugin/ocamlbuild_tags.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/ftplugin/occam.vim b/ftplugin/occam.vim
index f8fb78ccd..3f5992b95 100644
--- a/ftplugin/occam.vim
+++ b/ftplugin/occam.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'occam')
+if has_key(g:polyglot_is_disabled, 'occam')
   finish
 endif
 
diff --git a/ftplugin/omake.vim b/ftplugin/omake.vim
index 10669285d..73cc17ae0 100644
--- a/ftplugin/omake.vim
+++ b/ftplugin/omake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/ftplugin/opencl.vim b/ftplugin/opencl.vim
index c15c06275..9beac9521 100644
--- a/ftplugin/opencl.vim
+++ b/ftplugin/opencl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'opencl')
+if has_key(g:polyglot_is_disabled, 'opencl')
   finish
 endif
 
diff --git a/ftplugin/pamconf.vim b/ftplugin/pamconf.vim
index f6867e466..1d3344c94 100644
--- a/ftplugin/pamconf.vim
+++ b/ftplugin/pamconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pamconf')
+if has_key(g:polyglot_is_disabled, 'pamconf')
   finish
 endif
 
diff --git a/ftplugin/pascal.vim b/ftplugin/pascal.vim
index 4546ed74d..ec8581d7b 100644
--- a/ftplugin/pascal.vim
+++ b/ftplugin/pascal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pascal')
+if has_key(g:polyglot_is_disabled, 'pascal')
   finish
 endif
 
diff --git a/ftplugin/passwd.vim b/ftplugin/passwd.vim
index a963340d6..a4bfaf923 100644
--- a/ftplugin/passwd.vim
+++ b/ftplugin/passwd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'passwd')
+if has_key(g:polyglot_is_disabled, 'passwd')
   finish
 endif
 
diff --git a/ftplugin/pdf.vim b/ftplugin/pdf.vim
index 882cdd2c3..fec98a685 100644
--- a/ftplugin/pdf.vim
+++ b/ftplugin/pdf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pdf')
+if has_key(g:polyglot_is_disabled, 'pdf')
   finish
 endif
 
diff --git a/ftplugin/perl.vim b/ftplugin/perl.vim
index 69657fefb..7c8ff3bc8 100644
--- a/ftplugin/perl.vim
+++ b/ftplugin/perl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'perl')
+if has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/ftplugin/pinfo.vim b/ftplugin/pinfo.vim
index aafc69385..a32382a19 100644
--- a/ftplugin/pinfo.vim
+++ b/ftplugin/pinfo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pinfo')
+if has_key(g:polyglot_is_disabled, 'pinfo')
   finish
 endif
 
diff --git a/ftplugin/plantuml.vim b/ftplugin/plantuml.vim
index 88ec433c8..8f0449e71 100644
--- a/ftplugin/plantuml.vim
+++ b/ftplugin/plantuml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'plantuml')
+if has_key(g:polyglot_is_disabled, 'plantuml')
   finish
 endif
 
diff --git a/ftplugin/pony.vim b/ftplugin/pony.vim
index 7a6cb9cf2..03f94cc38 100644
--- a/ftplugin/pony.vim
+++ b/ftplugin/pony.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pony')
+if has_key(g:polyglot_is_disabled, 'pony')
   finish
 endif
 
diff --git a/ftplugin/postscr.vim b/ftplugin/postscr.vim
index 84345a671..be2d347c0 100644
--- a/ftplugin/postscr.vim
+++ b/ftplugin/postscr.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'postscr')
+if has_key(g:polyglot_is_disabled, 'postscr')
   finish
 endif
 
diff --git a/ftplugin/procmail.vim b/ftplugin/procmail.vim
index 9f7337e9d..ee9ea710a 100644
--- a/ftplugin/procmail.vim
+++ b/ftplugin/procmail.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'procmail')
+if has_key(g:polyglot_is_disabled, 'procmail')
   finish
 endif
 
diff --git a/ftplugin/prolog.vim b/ftplugin/prolog.vim
index 46306162d..56d17127f 100644
--- a/ftplugin/prolog.vim
+++ b/ftplugin/prolog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'prolog')
+if has_key(g:polyglot_is_disabled, 'prolog')
   finish
 endif
 
diff --git a/ftplugin/protocols.vim b/ftplugin/protocols.vim
index 608a1767d..22cd52b32 100644
--- a/ftplugin/protocols.vim
+++ b/ftplugin/protocols.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'protocols')
+if has_key(g:polyglot_is_disabled, 'protocols')
   finish
 endif
 
diff --git a/ftplugin/ps1.vim b/ftplugin/ps1.vim
index 93e206e9f..b88077d1b 100644
--- a/ftplugin/ps1.vim
+++ b/ftplugin/ps1.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'powershell')
+if has_key(g:polyglot_is_disabled, 'powershell')
   finish
 endif
 
diff --git a/ftplugin/ps1xml.vim b/ftplugin/ps1xml.vim
index 4014865bb..4bd65c446 100644
--- a/ftplugin/ps1xml.vim
+++ b/ftplugin/ps1xml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'powershell')
+if has_key(g:polyglot_is_disabled, 'powershell')
   finish
 endif
 
diff --git a/ftplugin/pug.vim b/ftplugin/pug.vim
index b29b12ade..8613bf4ec 100644
--- a/ftplugin/pug.vim
+++ b/ftplugin/pug.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pug')
+if has_key(g:polyglot_is_disabled, 'pug')
   finish
 endif
 
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index c4fe70fa3..cd936ae4d 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'puppet')
+if has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/ftplugin/puppet_tagbar.vim b/ftplugin/puppet_tagbar.vim
index 5c5675464..afdbad6f0 100644
--- a/ftplugin/puppet_tagbar.vim
+++ b/ftplugin/puppet_tagbar.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'puppet')
+if has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim
index e21e6ddeb..1a43b3331 100644
--- a/ftplugin/purescript.vim
+++ b/ftplugin/purescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'purescript')
+if has_key(g:polyglot_is_disabled, 'purescript')
   finish
 endif
 
diff --git a/ftplugin/pyrex.vim b/ftplugin/pyrex.vim
index c3e81272b..f312251eb 100644
--- a/ftplugin/pyrex.vim
+++ b/ftplugin/pyrex.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pyrex')
+if has_key(g:polyglot_is_disabled, 'pyrex')
   finish
 endif
 
diff --git a/ftplugin/qml.vim b/ftplugin/qml.vim
index e725ba510..5184074aa 100644
--- a/ftplugin/qml.vim
+++ b/ftplugin/qml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'qml')
+if has_key(g:polyglot_is_disabled, 'qml')
   finish
 endif
 
diff --git a/ftplugin/quake.vim b/ftplugin/quake.vim
index 47f61ef17..621b71f7d 100644
--- a/ftplugin/quake.vim
+++ b/ftplugin/quake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'quake')
+if has_key(g:polyglot_is_disabled, 'quake')
   finish
 endif
 
diff --git a/ftplugin/racket.vim b/ftplugin/racket.vim
index 413dd6271..06899bd13 100644
--- a/ftplugin/racket.vim
+++ b/ftplugin/racket.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'racket')
+if has_key(g:polyglot_is_disabled, 'racket')
   finish
 endif
 
diff --git a/ftplugin/raku.vim b/ftplugin/raku.vim
index ec2bcccdf..4805a5c79 100644
--- a/ftplugin/raku.vim
+++ b/ftplugin/raku.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'raku')
+if has_key(g:polyglot_is_disabled, 'raku')
   finish
 endif
 
diff --git a/ftplugin/raml.vim b/ftplugin/raml.vim
index 4eb1e58ff..3006f04a7 100644
--- a/ftplugin/raml.vim
+++ b/ftplugin/raml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'raml')
+if has_key(g:polyglot_is_disabled, 'raml')
   finish
 endif
 
diff --git a/ftplugin/razor.vim b/ftplugin/razor.vim
index d5458d472..a7e62b6c4 100644
--- a/ftplugin/razor.vim
+++ b/ftplugin/razor.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'razor')
+if has_key(g:polyglot_is_disabled, 'razor')
   finish
 endif
 
diff --git a/ftplugin/readline.vim b/ftplugin/readline.vim
index 9a3030fb6..21d0eb016 100644
--- a/ftplugin/readline.vim
+++ b/ftplugin/readline.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'readline')
+if has_key(g:polyglot_is_disabled, 'readline')
   finish
 endif
 
diff --git a/ftplugin/reva.vim b/ftplugin/reva.vim
index 3163440c9..b172720dc 100644
--- a/ftplugin/reva.vim
+++ b/ftplugin/reva.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'reva')
+if has_key(g:polyglot_is_disabled, 'reva')
   finish
 endif
 
diff --git a/ftplugin/rmd.vim b/ftplugin/rmd.vim
index fbe784232..bba9116fc 100644
--- a/ftplugin/rmd.vim
+++ b/ftplugin/rmd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rmd')
+if has_key(g:polyglot_is_disabled, 'rmd')
   finish
 endif
 
diff --git a/ftplugin/rnc.vim b/ftplugin/rnc.vim
index efd596e8a..ba50c0d09 100644
--- a/ftplugin/rnc.vim
+++ b/ftplugin/rnc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rnc')
+if has_key(g:polyglot_is_disabled, 'rnc')
   finish
 endif
 
diff --git a/ftplugin/rnoweb.vim b/ftplugin/rnoweb.vim
index b049d7d94..f7532ac9e 100644
--- a/ftplugin/rnoweb.vim
+++ b/ftplugin/rnoweb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rnoweb')
+if has_key(g:polyglot_is_disabled, 'rnoweb')
   finish
 endif
 
diff --git a/ftplugin/rpl.vim b/ftplugin/rpl.vim
index 94af1a684..6cd1d5757 100644
--- a/ftplugin/rpl.vim
+++ b/ftplugin/rpl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rpl')
+if has_key(g:polyglot_is_disabled, 'rpl')
   finish
 endif
 
diff --git a/ftplugin/rrst.vim b/ftplugin/rrst.vim
index 1708b9758..987848437 100644
--- a/ftplugin/rrst.vim
+++ b/ftplugin/rrst.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rrst')
+if has_key(g:polyglot_is_disabled, 'rrst')
   finish
 endif
 
diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index 29c7da66c..ffb5e8ff4 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rst')
+if has_key(g:polyglot_is_disabled, 'rst')
   finish
 endif
 
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index cf1b8f4f3..6edeab385 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ruby')
+if has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim
index 02664bd91..c22560905 100644
--- a/ftplugin/rust.vim
+++ b/ftplugin/rust.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/ftplugin/rust/tagbar.vim b/ftplugin/rust/tagbar.vim
index 5de12f9ca..0a020ed71 100644
--- a/ftplugin/rust/tagbar.vim
+++ b/ftplugin/rust/tagbar.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/ftplugin/sass.vim b/ftplugin/sass.vim
index 7e20a9f32..166c651b6 100644
--- a/ftplugin/sass.vim
+++ b/ftplugin/sass.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sass')
+if has_key(g:polyglot_is_disabled, 'sass')
   finish
 endif
 
diff --git a/ftplugin/sbt.vim b/ftplugin/sbt.vim
index a6e8ac720..73df97ca1 100644
--- a/ftplugin/sbt.vim
+++ b/ftplugin/sbt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sbt')
+if has_key(g:polyglot_is_disabled, 'sbt')
   finish
 endif
 
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index 1edd9b47a..61d799de8 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scala')
+if has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/ftplugin/scala.xpt.vim b/ftplugin/scala.xpt.vim
index 6bb1f8bad..900aaaea5 100644
--- a/ftplugin/scala.xpt.vim
+++ b/ftplugin/scala.xpt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scala')
+if has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index 02eeb7ad7..9ec4164df 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scala')
+if has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/ftplugin/scheme.vim b/ftplugin/scheme.vim
index 279bd667a..8b7ebd86f 100644
--- a/ftplugin/scheme.vim
+++ b/ftplugin/scheme.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scheme')
+if has_key(g:polyglot_is_disabled, 'scheme')
   finish
 endif
 
diff --git a/ftplugin/screen.vim b/ftplugin/screen.vim
index cfe815fc0..7ce75fd94 100644
--- a/ftplugin/screen.vim
+++ b/ftplugin/screen.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'screen')
+if has_key(g:polyglot_is_disabled, 'screen')
   finish
 endif
 
diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim
index 3f9bf7bc6..a80314546 100644
--- a/ftplugin/scss.vim
+++ b/ftplugin/scss.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scss')
+if has_key(g:polyglot_is_disabled, 'scss')
   finish
 endif
 
diff --git a/ftplugin/sensors.vim b/ftplugin/sensors.vim
index 9ef23447e..50a54a109 100644
--- a/ftplugin/sensors.vim
+++ b/ftplugin/sensors.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sensors')
+if has_key(g:polyglot_is_disabled, 'sensors')
   finish
 endif
 
diff --git a/ftplugin/services.vim b/ftplugin/services.vim
index c23297cb4..3889c46ed 100644
--- a/ftplugin/services.vim
+++ b/ftplugin/services.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'services')
+if has_key(g:polyglot_is_disabled, 'services')
   finish
 endif
 
diff --git a/ftplugin/setserial.vim b/ftplugin/setserial.vim
index 308863aa4..d16513444 100644
--- a/ftplugin/setserial.vim
+++ b/ftplugin/setserial.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'setserial')
+if has_key(g:polyglot_is_disabled, 'setserial')
   finish
 endif
 
diff --git a/ftplugin/sexplib.vim b/ftplugin/sexplib.vim
index 3546c5f89..ebd322ad5 100644
--- a/ftplugin/sexplib.vim
+++ b/ftplugin/sexplib.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/ftplugin/sieve.vim b/ftplugin/sieve.vim
index 370a9e817..f4f4457c0 100644
--- a/ftplugin/sieve.vim
+++ b/ftplugin/sieve.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sieve')
+if has_key(g:polyglot_is_disabled, 'sieve')
   finish
 endif
 
diff --git a/ftplugin/slim.vim b/ftplugin/slim.vim
index 7b51ffd8f..0456fcb62 100644
--- a/ftplugin/slim.vim
+++ b/ftplugin/slim.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slim')
+if has_key(g:polyglot_is_disabled, 'slim')
   finish
 endif
 
diff --git a/ftplugin/slpconf.vim b/ftplugin/slpconf.vim
index b7ee39a54..d23a123cf 100644
--- a/ftplugin/slpconf.vim
+++ b/ftplugin/slpconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slpconf')
+if has_key(g:polyglot_is_disabled, 'slpconf')
   finish
 endif
 
diff --git a/ftplugin/slpreg.vim b/ftplugin/slpreg.vim
index bb25237b9..f43279d6e 100644
--- a/ftplugin/slpreg.vim
+++ b/ftplugin/slpreg.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slpreg')
+if has_key(g:polyglot_is_disabled, 'slpreg')
   finish
 endif
 
diff --git a/ftplugin/slpspi.vim b/ftplugin/slpspi.vim
index 1653681f0..eb87fb690 100644
--- a/ftplugin/slpspi.vim
+++ b/ftplugin/slpspi.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slpspi')
+if has_key(g:polyglot_is_disabled, 'slpspi')
   finish
 endif
 
diff --git a/ftplugin/smt2.vim b/ftplugin/smt2.vim
index 243ee2a9c..2ba33b9ea 100644
--- a/ftplugin/smt2.vim
+++ b/ftplugin/smt2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'smt2')
+if has_key(g:polyglot_is_disabled, 'smt2')
   finish
 endif
 
diff --git a/ftplugin/solidity.vim b/ftplugin/solidity.vim
index a9b4e671b..d5f2903dc 100644
--- a/ftplugin/solidity.vim
+++ b/ftplugin/solidity.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'solidity')
+if has_key(g:polyglot_is_disabled, 'solidity')
   finish
 endif
 
diff --git a/ftplugin/spec.vim b/ftplugin/spec.vim
index 8d7a14b59..15234b684 100644
--- a/ftplugin/spec.vim
+++ b/ftplugin/spec.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'spec')
+if has_key(g:polyglot_is_disabled, 'spec')
   finish
 endif
 
diff --git a/ftplugin/sql.vim b/ftplugin/sql.vim
index a187c6eed..22d926991 100644
--- a/ftplugin/sql.vim
+++ b/ftplugin/sql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sql')
+if has_key(g:polyglot_is_disabled, 'sql')
   finish
 endif
 
diff --git a/ftplugin/sshconfig.vim b/ftplugin/sshconfig.vim
index 8fc369641..6198240ad 100644
--- a/ftplugin/sshconfig.vim
+++ b/ftplugin/sshconfig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sshconfig')
+if has_key(g:polyglot_is_disabled, 'sshconfig')
   finish
 endif
 
diff --git a/ftplugin/stylus.vim b/ftplugin/stylus.vim
index 89a6272e2..9d859939f 100644
--- a/ftplugin/stylus.vim
+++ b/ftplugin/stylus.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'stylus')
+if has_key(g:polyglot_is_disabled, 'stylus')
   finish
 endif
 
diff --git a/ftplugin/sudoers.vim b/ftplugin/sudoers.vim
index 3ae23eb13..db3012c9b 100644
--- a/ftplugin/sudoers.vim
+++ b/ftplugin/sudoers.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sudoers')
+if has_key(g:polyglot_is_disabled, 'sudoers')
   finish
 endif
 
diff --git a/ftplugin/svelte.vim b/ftplugin/svelte.vim
index 28af186a0..977ee9054 100644
--- a/ftplugin/svelte.vim
+++ b/ftplugin/svelte.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'svelte')
+if has_key(g:polyglot_is_disabled, 'svelte')
   finish
 endif
 
diff --git a/ftplugin/swift.vim b/ftplugin/swift.vim
index bae53a345..e09ff8323 100644
--- a/ftplugin/swift.vim
+++ b/ftplugin/swift.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'swift')
+if has_key(g:polyglot_is_disabled, 'swift')
   finish
 endif
 
diff --git a/ftplugin/swiftgyb.vim b/ftplugin/swiftgyb.vim
index 75aee251b..3684574ed 100644
--- a/ftplugin/swiftgyb.vim
+++ b/ftplugin/swiftgyb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'swiftgyb')
+if has_key(g:polyglot_is_disabled, 'swiftgyb')
   finish
 endif
 
diff --git a/ftplugin/sysctl.vim b/ftplugin/sysctl.vim
index d57cd390a..b70f590ac 100644
--- a/ftplugin/sysctl.vim
+++ b/ftplugin/sysctl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sysctl')
+if has_key(g:polyglot_is_disabled, 'sysctl')
   finish
 endif
 
diff --git a/ftplugin/systemd.vim b/ftplugin/systemd.vim
index cf8e76db3..1479f6837 100644
--- a/ftplugin/systemd.vim
+++ b/ftplugin/systemd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'systemd')
+if has_key(g:polyglot_is_disabled, 'systemd')
   finish
 endif
 
diff --git a/ftplugin/systemverilog.vim b/ftplugin/systemverilog.vim
index 1a0823c71..f2df69e0c 100644
--- a/ftplugin/systemverilog.vim
+++ b/ftplugin/systemverilog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'systemverilog')
+if has_key(g:polyglot_is_disabled, 'systemverilog')
   finish
 endif
 
diff --git a/ftplugin/tablegen.vim b/ftplugin/tablegen.vim
index 1fdf05159..1796d2d5a 100644
--- a/ftplugin/tablegen.vim
+++ b/ftplugin/tablegen.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'llvm')
+if has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/ftplugin/tcl.vim b/ftplugin/tcl.vim
index d359b3f87..a70cfc271 100644
--- a/ftplugin/tcl.vim
+++ b/ftplugin/tcl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tcl')
+if has_key(g:polyglot_is_disabled, 'tcl')
   finish
 endif
 
diff --git a/ftplugin/terminfo.vim b/ftplugin/terminfo.vim
index 4bc23398d..3ea64a55d 100644
--- a/ftplugin/terminfo.vim
+++ b/ftplugin/terminfo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'terminfo')
+if has_key(g:polyglot_is_disabled, 'terminfo')
   finish
 endif
 
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index 191fd3f15..17a8b6d8a 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'terraform')
+if has_key(g:polyglot_is_disabled, 'terraform')
   finish
 endif
 
diff --git a/ftplugin/tex.vim b/ftplugin/tex.vim
index 17b3e2a76..0fcb47a88 100644
--- a/ftplugin/tex.vim
+++ b/ftplugin/tex.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tex')
+if has_key(g:polyglot_is_disabled, 'tex')
   finish
 endif
 
diff --git a/ftplugin/text.vim b/ftplugin/text.vim
index 1f14648da..7ec4d83f3 100644
--- a/ftplugin/text.vim
+++ b/ftplugin/text.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'text')
+if has_key(g:polyglot_is_disabled, 'text')
   finish
 endif
 
diff --git a/ftplugin/textile.vim b/ftplugin/textile.vim
index e636bd55f..47a200674 100644
--- a/ftplugin/textile.vim
+++ b/ftplugin/textile.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'textile')
+if has_key(g:polyglot_is_disabled, 'textile')
   finish
 endif
 
diff --git a/ftplugin/tmux.vim b/ftplugin/tmux.vim
index 34ad2f15e..a8c1669bc 100644
--- a/ftplugin/tmux.vim
+++ b/ftplugin/tmux.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tmux')
+if has_key(g:polyglot_is_disabled, 'tmux')
   finish
 endif
 
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
index b510817f8..b5003f475 100644
--- a/ftplugin/toml.vim
+++ b/ftplugin/toml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'toml')
+if has_key(g:polyglot_is_disabled, 'toml')
   finish
 endif
 
diff --git a/ftplugin/treetop.vim b/ftplugin/treetop.vim
index 44f4e5302..190f24b11 100644
--- a/ftplugin/treetop.vim
+++ b/ftplugin/treetop.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'treetop')
+if has_key(g:polyglot_is_disabled, 'treetop')
   finish
 endif
 
diff --git a/ftplugin/tt2html.vim b/ftplugin/tt2html.vim
index e6496e616..05613ce6c 100644
--- a/ftplugin/tt2html.vim
+++ b/ftplugin/tt2html.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'perl')
+if has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/ftplugin/twig.vim b/ftplugin/twig.vim
index 7635a4fbd..1380d1c32 100644
--- a/ftplugin/twig.vim
+++ b/ftplugin/twig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'twig')
+if has_key(g:polyglot_is_disabled, 'twig')
   finish
 endif
 
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index ff2b5baa0..b0df5f453 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/ftplugin/typescriptreact.vim b/ftplugin/typescriptreact.vim
index e5780918f..a1e596996 100644
--- a/ftplugin/typescriptreact.vim
+++ b/ftplugin/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/ftplugin/udevconf.vim b/ftplugin/udevconf.vim
index 72eef04aa..24b870c15 100644
--- a/ftplugin/udevconf.vim
+++ b/ftplugin/udevconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'udevconf')
+if has_key(g:polyglot_is_disabled, 'udevconf')
   finish
 endif
 
diff --git a/ftplugin/udevperm.vim b/ftplugin/udevperm.vim
index 56f956fb6..4775b3e33 100644
--- a/ftplugin/udevperm.vim
+++ b/ftplugin/udevperm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'udevperm')
+if has_key(g:polyglot_is_disabled, 'udevperm')
   finish
 endif
 
diff --git a/ftplugin/updatedb.vim b/ftplugin/updatedb.vim
index 5dbc78a76..4b15b1d72 100644
--- a/ftplugin/updatedb.vim
+++ b/ftplugin/updatedb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'updatedb')
+if has_key(g:polyglot_is_disabled, 'updatedb')
   finish
 endif
 
diff --git a/ftplugin/vala.vim b/ftplugin/vala.vim
index a76bb1ae5..ffbf427e0 100644
--- a/ftplugin/vala.vim
+++ b/ftplugin/vala.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vala')
+if has_key(g:polyglot_is_disabled, 'vala')
   finish
 endif
 
diff --git a/ftplugin/vb.vim b/ftplugin/vb.vim
index 4f5ae89c5..f2c41f6f0 100644
--- a/ftplugin/vb.vim
+++ b/ftplugin/vb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'visual-basic')
+if has_key(g:polyglot_is_disabled, 'visual-basic')
   finish
 endif
 
diff --git a/ftplugin/verilog.vim b/ftplugin/verilog.vim
index fe059573b..168992182 100644
--- a/ftplugin/verilog.vim
+++ b/ftplugin/verilog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'verilog')
+if has_key(g:polyglot_is_disabled, 'verilog')
   finish
 endif
 
diff --git a/ftplugin/vhdl.vim b/ftplugin/vhdl.vim
index 8861b614c..e351ea5c3 100644
--- a/ftplugin/vhdl.vim
+++ b/ftplugin/vhdl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vhdl')
+if has_key(g:polyglot_is_disabled, 'vhdl')
   finish
 endif
 
diff --git a/ftplugin/vlang.vim b/ftplugin/vlang.vim
index de4d7e03c..88e4003e3 100644
--- a/ftplugin/vlang.vim
+++ b/ftplugin/vlang.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'v')
+if has_key(g:polyglot_is_disabled, 'v')
   finish
 endif
 
diff --git a/ftplugin/vroom.vim b/ftplugin/vroom.vim
index 982b2631f..3ebc49ce4 100644
--- a/ftplugin/vroom.vim
+++ b/ftplugin/vroom.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vroom')
+if has_key(g:polyglot_is_disabled, 'vroom')
   finish
 endif
 
diff --git a/ftplugin/vue.vim b/ftplugin/vue.vim
index 44f1e258f..7babb0589 100644
--- a/ftplugin/vue.vim
+++ b/ftplugin/vue.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vue')
+if has_key(g:polyglot_is_disabled, 'vue')
   finish
 endif
 
diff --git a/ftplugin/wast.vim b/ftplugin/wast.vim
index 6e4aad479..ac9ec8e6c 100644
--- a/ftplugin/wast.vim
+++ b/ftplugin/wast.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'wast')
+if has_key(g:polyglot_is_disabled, 'wast')
   finish
 endif
 
diff --git a/ftplugin/xdefaults.vim b/ftplugin/xdefaults.vim
index fadb27020..73491e1e0 100644
--- a/ftplugin/xdefaults.vim
+++ b/ftplugin/xdefaults.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xdefaults')
+if has_key(g:polyglot_is_disabled, 'xdefaults')
   finish
 endif
 
diff --git a/ftplugin/xf86conf.vim b/ftplugin/xf86conf.vim
index 3b0fd9fb1..47870d192 100644
--- a/ftplugin/xf86conf.vim
+++ b/ftplugin/xf86conf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xf86conf')
+if has_key(g:polyglot_is_disabled, 'xf86conf')
   finish
 endif
 
diff --git a/ftplugin/xhtml.vim b/ftplugin/xhtml.vim
index db379aa6a..f7fae2f80 100644
--- a/ftplugin/xhtml.vim
+++ b/ftplugin/xhtml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xhtml')
+if has_key(g:polyglot_is_disabled, 'xhtml')
   finish
 endif
 
diff --git a/ftplugin/xinetd.vim b/ftplugin/xinetd.vim
index 618cf2d19..a28129ea6 100644
--- a/ftplugin/xinetd.vim
+++ b/ftplugin/xinetd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xinetd')
+if has_key(g:polyglot_is_disabled, 'xinetd')
   finish
 endif
 
diff --git a/ftplugin/xmodmap.vim b/ftplugin/xmodmap.vim
index 32a1aa278..05640272c 100644
--- a/ftplugin/xmodmap.vim
+++ b/ftplugin/xmodmap.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xmodmap')
+if has_key(g:polyglot_is_disabled, 'xmodmap')
   finish
 endif
 
diff --git a/ftplugin/xs.vim b/ftplugin/xs.vim
index b3ddbf61c..29ad519a5 100644
--- a/ftplugin/xs.vim
+++ b/ftplugin/xs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'perl')
+if has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/ftplugin/xsd.vim b/ftplugin/xsd.vim
index 236fc52fb..6199d82ba 100644
--- a/ftplugin/xsd.vim
+++ b/ftplugin/xsd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xsd')
+if has_key(g:polyglot_is_disabled, 'xsd')
   finish
 endif
 
diff --git a/ftplugin/xslt.vim b/ftplugin/xslt.vim
index 35ca3a1dd..ee5b40441 100644
--- a/ftplugin/xslt.vim
+++ b/ftplugin/xslt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xslt')
+if has_key(g:polyglot_is_disabled, 'xslt')
   finish
 endif
 
diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim
index 22d31afb0..b10e44333 100644
--- a/ftplugin/yaml.vim
+++ b/ftplugin/yaml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'yaml')
+if has_key(g:polyglot_is_disabled, 'yaml')
   finish
 endif
 
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index da9fafc64..f16f24a85 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zig')
+if has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/ftplugin/zimbu.vim b/ftplugin/zimbu.vim
index 3531f9cc3..bdcaacd11 100644
--- a/ftplugin/zimbu.vim
+++ b/ftplugin/zimbu.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zimbu')
+if has_key(g:polyglot_is_disabled, 'zimbu')
   finish
 endif
 
diff --git a/indent/Jenkinsfile.vim b/indent/Jenkinsfile.vim
index 0590e34bc..dc280b906 100644
--- a/indent/Jenkinsfile.vim
+++ b/indent/Jenkinsfile.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jenkins')
+if has_key(g:polyglot_is_disabled, 'jenkins')
   finish
 endif
 
diff --git a/indent/aap.vim b/indent/aap.vim
index 1694a400d..4ea024ab9 100644
--- a/indent/aap.vim
+++ b/indent/aap.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'aap')
+if has_key(g:polyglot_is_disabled, 'aap')
   finish
 endif
 
diff --git a/indent/ada.vim b/indent/ada.vim
index a07c3f02b..1e8f7f7e4 100644
--- a/indent/ada.vim
+++ b/indent/ada.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ada')
+if has_key(g:polyglot_is_disabled, 'ada')
   finish
 endif
 
diff --git a/indent/ansible.vim b/indent/ansible.vim
index 18d470174..4a8afea77 100644
--- a/indent/ansible.vim
+++ b/indent/ansible.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ansible')
+if has_key(g:polyglot_is_disabled, 'ansible')
   finish
 endif
 
diff --git a/indent/ant.vim b/indent/ant.vim
index 4ec29f398..5dbf0f7bf 100644
--- a/indent/ant.vim
+++ b/indent/ant.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ant')
+if has_key(g:polyglot_is_disabled, 'ant')
   finish
 endif
 
diff --git a/indent/applescript.vim b/indent/applescript.vim
index 6639b6c53..418b61d0c 100644
--- a/indent/applescript.vim
+++ b/indent/applescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'applescript')
+if has_key(g:polyglot_is_disabled, 'applescript')
   finish
 endif
 
diff --git a/indent/arduino.vim b/indent/arduino.vim
index 37d887cf5..660bf68be 100644
--- a/indent/arduino.vim
+++ b/indent/arduino.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'arduino')
+if has_key(g:polyglot_is_disabled, 'arduino')
   finish
 endif
 
diff --git a/indent/autohotkey.vim b/indent/autohotkey.vim
index f8d520756..a4011a5f4 100644
--- a/indent/autohotkey.vim
+++ b/indent/autohotkey.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'autohotkey')
+if has_key(g:polyglot_is_disabled, 'autohotkey')
   finish
 endif
 
diff --git a/indent/automake.vim b/indent/automake.vim
index 1b5d95677..65253ae76 100644
--- a/indent/automake.vim
+++ b/indent/automake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'automake')
+if has_key(g:polyglot_is_disabled, 'automake')
   finish
 endif
 
diff --git a/indent/awk.vim b/indent/awk.vim
index 37e5dfdcc..eb322da9a 100644
--- a/indent/awk.vim
+++ b/indent/awk.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'awk')
+if has_key(g:polyglot_is_disabled, 'awk')
   finish
 endif
 
diff --git a/indent/bib.vim b/indent/bib.vim
index 73433714c..f0746fe33 100644
--- a/indent/bib.vim
+++ b/indent/bib.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bib')
+if has_key(g:polyglot_is_disabled, 'bib')
   finish
 endif
 
diff --git a/indent/blade.vim b/indent/blade.vim
index 45292d192..69198b0fe 100644
--- a/indent/blade.vim
+++ b/indent/blade.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'blade')
+if has_key(g:polyglot_is_disabled, 'blade')
   finish
 endif
 
diff --git a/indent/bst.vim b/indent/bst.vim
index 96863e20b..31b620397 100644
--- a/indent/bst.vim
+++ b/indent/bst.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bst')
+if has_key(g:polyglot_is_disabled, 'bst')
   finish
 endif
 
diff --git a/indent/bzl.vim b/indent/bzl.vim
index 2c5faccf1..a1ea53cf4 100644
--- a/indent/bzl.vim
+++ b/indent/bzl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bzl')
+if has_key(g:polyglot_is_disabled, 'bzl')
   finish
 endif
 
diff --git a/indent/cabal.vim b/indent/cabal.vim
index 62a68b74a..526d9b4e1 100644
--- a/indent/cabal.vim
+++ b/indent/cabal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haskell')
+if has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/indent/caddyfile.vim b/indent/caddyfile.vim
index f12a16157..fd31408ad 100644
--- a/indent/caddyfile.vim
+++ b/indent/caddyfile.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'caddyfile')
+if has_key(g:polyglot_is_disabled, 'caddyfile')
   finish
 endif
 
diff --git a/indent/cdl.vim b/indent/cdl.vim
index 483cb1d43..3519c04a4 100644
--- a/indent/cdl.vim
+++ b/indent/cdl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cdl')
+if has_key(g:polyglot_is_disabled, 'cdl')
   finish
 endif
 
diff --git a/indent/ch.vim b/indent/ch.vim
index 34997e55d..cb0774133 100644
--- a/indent/ch.vim
+++ b/indent/ch.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ch')
+if has_key(g:polyglot_is_disabled, 'ch')
   finish
 endif
 
diff --git a/indent/chaiscript.vim b/indent/chaiscript.vim
index e0639e887..e01b3b162 100644
--- a/indent/chaiscript.vim
+++ b/indent/chaiscript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'chaiscript')
+if has_key(g:polyglot_is_disabled, 'chaiscript')
   finish
 endif
 
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 7e4de1ab7..9934ce0db 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'clojure')
+if has_key(g:polyglot_is_disabled, 'clojure')
   finish
 endif
 
diff --git a/indent/cmake.vim b/indent/cmake.vim
index a5c1af081..2449143fd 100644
--- a/indent/cmake.vim
+++ b/indent/cmake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cmake')
+if has_key(g:polyglot_is_disabled, 'cmake')
   finish
 endif
 
diff --git a/indent/cobol.vim b/indent/cobol.vim
index d0c9f7032..c4eba9513 100644
--- a/indent/cobol.vim
+++ b/indent/cobol.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cobol')
+if has_key(g:polyglot_is_disabled, 'cobol')
   finish
 endif
 
diff --git a/indent/coffee.vim b/indent/coffee.vim
index dbac1e6dd..620574b9c 100644
--- a/indent/coffee.vim
+++ b/indent/coffee.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'coffee-script')
+if has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/indent/config.vim b/indent/config.vim
index e43819286..7bdeac183 100644
--- a/indent/config.vim
+++ b/indent/config.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'config')
+if has_key(g:polyglot_is_disabled, 'config')
   finish
 endif
 
diff --git a/indent/crystal.vim b/indent/crystal.vim
index 4883caa84..4a0cdb00d 100644
--- a/indent/crystal.vim
+++ b/indent/crystal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/indent/cs.vim b/indent/cs.vim
index 7ed30637a..b69407ec7 100644
--- a/indent/cs.vim
+++ b/indent/cs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cs')
+if has_key(g:polyglot_is_disabled, 'cs')
   finish
 endif
 
diff --git a/indent/css.vim b/indent/css.vim
index 3346bde63..27366aecc 100644
--- a/indent/css.vim
+++ b/indent/css.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'css')
+if has_key(g:polyglot_is_disabled, 'css')
   finish
 endif
 
diff --git a/indent/cucumber.vim b/indent/cucumber.vim
index 7b0493faa..ad473be62 100644
--- a/indent/cucumber.vim
+++ b/indent/cucumber.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cucumber')
+if has_key(g:polyglot_is_disabled, 'cucumber')
   finish
 endif
 
diff --git a/indent/cuda.vim b/indent/cuda.vim
index 0c65b2b2b..c0b93fadb 100644
--- a/indent/cuda.vim
+++ b/indent/cuda.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cuda')
+if has_key(g:polyglot_is_disabled, 'cuda')
   finish
 endif
 
diff --git a/indent/cython.vim b/indent/cython.vim
index 951a0cb1e..c650165e7 100644
--- a/indent/cython.vim
+++ b/indent/cython.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'python-indent')
+if has_key(g:polyglot_is_disabled, 'python-indent')
   finish
 endif
 
diff --git a/indent/d.vim b/indent/d.vim
index 2383b6ac1..4a630961c 100644
--- a/indent/d.vim
+++ b/indent/d.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dlang')
+if has_key(g:polyglot_is_disabled, 'dlang')
   finish
 endif
 
diff --git a/indent/dart.vim b/indent/dart.vim
index 09e6e7893..882ac7636 100644
--- a/indent/dart.vim
+++ b/indent/dart.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dart')
+if has_key(g:polyglot_is_disabled, 'dart')
   finish
 endif
 
diff --git a/indent/dictconf.vim b/indent/dictconf.vim
index 444bba5e3..06f2abb29 100644
--- a/indent/dictconf.vim
+++ b/indent/dictconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dictconf')
+if has_key(g:polyglot_is_disabled, 'dictconf')
   finish
 endif
 
diff --git a/indent/dictdconf.vim b/indent/dictdconf.vim
index f634e2a3c..6aed3f503 100644
--- a/indent/dictdconf.vim
+++ b/indent/dictdconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dictdconf')
+if has_key(g:polyglot_is_disabled, 'dictdconf')
   finish
 endif
 
diff --git a/indent/dosbatch.vim b/indent/dosbatch.vim
index 931430c92..5c815bde1 100644
--- a/indent/dosbatch.vim
+++ b/indent/dosbatch.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dosbatch')
+if has_key(g:polyglot_is_disabled, 'dosbatch')
   finish
 endif
 
diff --git a/indent/dtd.vim b/indent/dtd.vim
index a478a2cbe..c8470bd93 100644
--- a/indent/dtd.vim
+++ b/indent/dtd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dtd')
+if has_key(g:polyglot_is_disabled, 'dtd')
   finish
 endif
 
diff --git a/indent/dune.vim b/indent/dune.vim
index 4dc3695a0..e39aa7a28 100644
--- a/indent/dune.vim
+++ b/indent/dune.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/indent/dylan.vim b/indent/dylan.vim
index 82a229158..d7a4fc4f8 100644
--- a/indent/dylan.vim
+++ b/indent/dylan.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dylan')
+if has_key(g:polyglot_is_disabled, 'dylan')
   finish
 endif
 
diff --git a/indent/ecrystal.vim b/indent/ecrystal.vim
index b4007611b..ba8469060 100644
--- a/indent/ecrystal.vim
+++ b/indent/ecrystal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/indent/eelixir.vim b/indent/eelixir.vim
index 1f6caea47..6485af7b0 100644
--- a/indent/eelixir.vim
+++ b/indent/eelixir.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elixir')
+if has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/indent/elixir.vim b/indent/elixir.vim
index 4533ed09e..df146aded 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elixir')
+if has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/indent/elm.vim b/indent/elm.vim
index 63910f712..65253b0bf 100644
--- a/indent/elm.vim
+++ b/indent/elm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elm')
+if has_key(g:polyglot_is_disabled, 'elm')
   finish
 endif
 
diff --git a/indent/ember-script.vim b/indent/ember-script.vim
index 21da5892b..207c2183a 100644
--- a/indent/ember-script.vim
+++ b/indent/ember-script.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'emberscript')
+if has_key(g:polyglot_is_disabled, 'emberscript')
   finish
 endif
 
diff --git a/indent/emblem.vim b/indent/emblem.vim
index c69c8961d..7c1db44b9 100644
--- a/indent/emblem.vim
+++ b/indent/emblem.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'emblem')
+if has_key(g:polyglot_is_disabled, 'emblem')
   finish
 endif
 
diff --git a/indent/erlang.vim b/indent/erlang.vim
index 5630d900c..907130ed2 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'erlang')
+if has_key(g:polyglot_is_disabled, 'erlang')
   finish
 endif
 
diff --git a/indent/eruby.vim b/indent/eruby.vim
index 9eaa428db..a762019a0 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ruby')
+if has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/indent/eterm.vim b/indent/eterm.vim
index 38de67e3c..abdf120f2 100644
--- a/indent/eterm.vim
+++ b/indent/eterm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'eterm')
+if has_key(g:polyglot_is_disabled, 'eterm')
   finish
 endif
 
diff --git a/indent/falcon.vim b/indent/falcon.vim
index 56598a39c..fbff060c3 100644
--- a/indent/falcon.vim
+++ b/indent/falcon.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'falcon')
+if has_key(g:polyglot_is_disabled, 'falcon')
   finish
 endif
 
diff --git a/indent/fennel.vim b/indent/fennel.vim
index 687e15ace..920ac6146 100644
--- a/indent/fennel.vim
+++ b/indent/fennel.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fennel')
+if has_key(g:polyglot_is_disabled, 'fennel')
   finish
 endif
 
diff --git a/indent/fish.vim b/indent/fish.vim
index 3a6f0352c..656109627 100644
--- a/indent/fish.vim
+++ b/indent/fish.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fish')
+if has_key(g:polyglot_is_disabled, 'fish')
   finish
 endif
 
diff --git a/indent/fortran.vim b/indent/fortran.vim
index db7cd52b0..4a7c71fdd 100644
--- a/indent/fortran.vim
+++ b/indent/fortran.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fortran')
+if has_key(g:polyglot_is_disabled, 'fortran')
   finish
 endif
 
diff --git a/indent/framescript.vim b/indent/framescript.vim
index 359518a15..9457dbe89 100644
--- a/indent/framescript.vim
+++ b/indent/framescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'framescript')
+if has_key(g:polyglot_is_disabled, 'framescript')
   finish
 endif
 
diff --git a/indent/fsharp.vim b/indent/fsharp.vim
index fc9e45ed1..ede28f333 100644
--- a/indent/fsharp.vim
+++ b/indent/fsharp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fsharp')
+if has_key(g:polyglot_is_disabled, 'fsharp')
   finish
 endif
 
diff --git a/indent/gdscript3.vim b/indent/gdscript3.vim
index b9ee7ca68..fcac563aa 100644
--- a/indent/gdscript3.vim
+++ b/indent/gdscript3.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gdscript')
+if has_key(g:polyglot_is_disabled, 'gdscript')
   finish
 endif
 
diff --git a/indent/gitconfig.vim b/indent/gitconfig.vim
index a53044b94..83ae83578 100644
--- a/indent/gitconfig.vim
+++ b/indent/gitconfig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'git')
+if has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/indent/gitolite.vim b/indent/gitolite.vim
index 892921802..0386107f0 100644
--- a/indent/gitolite.vim
+++ b/indent/gitolite.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gitolite')
+if has_key(g:polyglot_is_disabled, 'gitolite')
   finish
 endif
 
diff --git a/indent/glsl.vim b/indent/glsl.vim
index 3784e6593..889bb0fd4 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'glsl')
+if has_key(g:polyglot_is_disabled, 'glsl')
   finish
 endif
 
diff --git a/indent/go.vim b/indent/go.vim
index cdb1de21d..e175c8e7b 100644
--- a/indent/go.vim
+++ b/indent/go.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/indent/gohtmltmpl.vim b/indent/gohtmltmpl.vim
index 93543339b..c29f4e47a 100644
--- a/indent/gohtmltmpl.vim
+++ b/indent/gohtmltmpl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/indent/graphql.vim b/indent/graphql.vim
index b98f3760f..c64d446aa 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'graphql')
+if has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/indent/haml.vim b/indent/haml.vim
index 8fa3f46dd..ef0318d6d 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haml')
+if has_key(g:polyglot_is_disabled, 'haml')
   finish
 endif
 
diff --git a/indent/hamster.vim b/indent/hamster.vim
index 615e3ee21..b2f8af968 100644
--- a/indent/hamster.vim
+++ b/indent/hamster.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hamster')
+if has_key(g:polyglot_is_disabled, 'hamster')
   finish
 endif
 
diff --git a/indent/handlebars.vim b/indent/handlebars.vim
index bac5f5a22..7c2ea7b17 100644
--- a/indent/handlebars.vim
+++ b/indent/handlebars.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'handlebars')
+if has_key(g:polyglot_is_disabled, 'handlebars')
   finish
 endif
 
diff --git a/indent/haskell.vim b/indent/haskell.vim
index 4820b4da7..c652ad36a 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haskell')
+if has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/indent/hcl.vim b/indent/hcl.vim
index f9dea7866..855afcb95 100644
--- a/indent/hcl.vim
+++ b/indent/hcl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hcl')
+if has_key(g:polyglot_is_disabled, 'hcl')
   finish
 endif
 
diff --git a/indent/hog.vim b/indent/hog.vim
index 5e32c80a2..8f32e6b7b 100644
--- a/indent/hog.vim
+++ b/indent/hog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hog')
+if has_key(g:polyglot_is_disabled, 'hog')
   finish
 endif
 
diff --git a/indent/html.vim b/indent/html.vim
index 77cc3e94b..82cd7074f 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html')
+if has_key(g:polyglot_is_disabled, 'html')
   finish
 endif
 
diff --git a/indent/htmldjango.vim b/indent/htmldjango.vim
index 33feb7cc4..33be44c36 100644
--- a/indent/htmldjango.vim
+++ b/indent/htmldjango.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'htmldjango')
+if has_key(g:polyglot_is_disabled, 'htmldjango')
   finish
 endif
 
diff --git a/indent/idris.vim b/indent/idris.vim
index 964f20d7b..efdfd7ceb 100644
--- a/indent/idris.vim
+++ b/indent/idris.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'idris')
+if has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/indent/idris2.vim b/indent/idris2.vim
index 40ed0c4e7..f497f5b9f 100644
--- a/indent/idris2.vim
+++ b/indent/idris2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'idris2')
+if has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/indent/j.vim b/indent/j.vim
index 67fd7619f..939bb98df 100644
--- a/indent/j.vim
+++ b/indent/j.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'j')
+if has_key(g:polyglot_is_disabled, 'j')
   finish
 endif
 
diff --git a/indent/java.vim b/indent/java.vim
index dcf300812..389c47dda 100644
--- a/indent/java.vim
+++ b/indent/java.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'java')
+if has_key(g:polyglot_is_disabled, 'java')
   finish
 endif
 
diff --git a/indent/javascript.vim b/indent/javascript.vim
index b2204dfe5..28e776582 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'javascript')
+if has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/indent/json.vim b/indent/json.vim
index f2775b0bf..43116a607 100644
--- a/indent/json.vim
+++ b/indent/json.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'json')
+if has_key(g:polyglot_is_disabled, 'json')
   finish
 endif
 
diff --git a/indent/jsp.vim b/indent/jsp.vim
index e1b5b8dea..2a80514f2 100644
--- a/indent/jsp.vim
+++ b/indent/jsp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsp')
+if has_key(g:polyglot_is_disabled, 'jsp')
   finish
 endif
 
diff --git a/indent/jst.vim b/indent/jst.vim
index 018b4441b..7b37bc036 100644
--- a/indent/jst.vim
+++ b/indent/jst.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jst')
+if has_key(g:polyglot_is_disabled, 'jst')
   finish
 endif
 
diff --git a/indent/julia.vim b/indent/julia.vim
index 8b21464f9..f5b6dc40e 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'julia')
+if has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/indent/kotlin.vim b/indent/kotlin.vim
index ebedbe30f..121a56dff 100644
--- a/indent/kotlin.vim
+++ b/indent/kotlin.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'kotlin')
+if has_key(g:polyglot_is_disabled, 'kotlin')
   finish
 endif
 
diff --git a/indent/ld.vim b/indent/ld.vim
index 43c11a636..01745f1b1 100644
--- a/indent/ld.vim
+++ b/indent/ld.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ld')
+if has_key(g:polyglot_is_disabled, 'ld')
   finish
 endif
 
diff --git a/indent/ledger.vim b/indent/ledger.vim
index d1ab3682d..5f9e4e860 100644
--- a/indent/ledger.vim
+++ b/indent/ledger.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ledger')
+if has_key(g:polyglot_is_disabled, 'ledger')
   finish
 endif
 
diff --git a/indent/less.vim b/indent/less.vim
index 83fad12d6..0949e5f3b 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'less')
+if has_key(g:polyglot_is_disabled, 'less')
   finish
 endif
 
diff --git a/indent/lifelines.vim b/indent/lifelines.vim
index b3ab480d1..1cbc84183 100644
--- a/indent/lifelines.vim
+++ b/indent/lifelines.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lifelines')
+if has_key(g:polyglot_is_disabled, 'lifelines')
   finish
 endif
 
diff --git a/indent/lilypond.vim b/indent/lilypond.vim
index aec3f584e..a307779ea 100644
--- a/indent/lilypond.vim
+++ b/indent/lilypond.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lilypond')
+if has_key(g:polyglot_is_disabled, 'lilypond')
   finish
 endif
 
diff --git a/indent/liquid.vim b/indent/liquid.vim
index 3ed8f3f8b..d708001ac 100644
--- a/indent/liquid.vim
+++ b/indent/liquid.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'liquid')
+if has_key(g:polyglot_is_disabled, 'liquid')
   finish
 endif
 
diff --git a/indent/lisp.vim b/indent/lisp.vim
index 7b1d2523c..fc7d50906 100644
--- a/indent/lisp.vim
+++ b/indent/lisp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lisp')
+if has_key(g:polyglot_is_disabled, 'lisp')
   finish
 endif
 
diff --git a/indent/litcoffee.vim b/indent/litcoffee.vim
index c9fb53284..35c6b2956 100644
--- a/indent/litcoffee.vim
+++ b/indent/litcoffee.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'coffee-script')
+if has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/indent/llvm.vim b/indent/llvm.vim
index 4dac2ef1a..dd57c3939 100644
--- a/indent/llvm.vim
+++ b/indent/llvm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'llvm')
+if has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/indent/logtalk.vim b/indent/logtalk.vim
index 54ae3b6ef..c834bce77 100644
--- a/indent/logtalk.vim
+++ b/indent/logtalk.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'logtalk')
+if has_key(g:polyglot_is_disabled, 'logtalk')
   finish
 endif
 
diff --git a/indent/ls.vim b/indent/ls.vim
index 3b616659c..a65c4e443 100644
--- a/indent/ls.vim
+++ b/indent/ls.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'livescript')
+if has_key(g:polyglot_is_disabled, 'livescript')
   finish
 endif
 
diff --git a/indent/lua.vim b/indent/lua.vim
index a13892262..755135b9e 100644
--- a/indent/lua.vim
+++ b/indent/lua.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lua')
+if has_key(g:polyglot_is_disabled, 'lua')
   finish
 endif
 
diff --git a/indent/mail.vim b/indent/mail.vim
index ab2c15d1b..8369ac8ea 100644
--- a/indent/mail.vim
+++ b/indent/mail.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mail')
+if has_key(g:polyglot_is_disabled, 'mail')
   finish
 endif
 
diff --git a/indent/make.vim b/indent/make.vim
index 70e6cec62..313896cae 100644
--- a/indent/make.vim
+++ b/indent/make.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'make')
+if has_key(g:polyglot_is_disabled, 'make')
   finish
 endif
 
diff --git a/indent/mako.vim b/indent/mako.vim
index fe53c80ec..f48a4121b 100644
--- a/indent/mako.vim
+++ b/indent/mako.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mako')
+if has_key(g:polyglot_is_disabled, 'mako')
   finish
 endif
 
diff --git a/indent/markdown.vim b/indent/markdown.vim
index 2ec68fa5d..6d1673c91 100644
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'markdown')
+if has_key(g:polyglot_is_disabled, 'markdown')
   finish
 endif
 
diff --git a/indent/meson.vim b/indent/meson.vim
index 88157453b..4d0f34150 100644
--- a/indent/meson.vim
+++ b/indent/meson.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'meson')
+if has_key(g:polyglot_is_disabled, 'meson')
   finish
 endif
 
diff --git a/indent/mf.vim b/indent/mf.vim
index fe24bf75e..9bb9f3de4 100644
--- a/indent/mf.vim
+++ b/indent/mf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mf')
+if has_key(g:polyglot_is_disabled, 'mf')
   finish
 endif
 
diff --git a/indent/moon.vim b/indent/moon.vim
index a3a03dfcc..709459e13 100644
--- a/indent/moon.vim
+++ b/indent/moon.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'moonscript')
+if has_key(g:polyglot_is_disabled, 'moonscript')
   finish
 endif
 
diff --git a/indent/mp.vim b/indent/mp.vim
index c08806619..a5c7bb8d6 100644
--- a/indent/mp.vim
+++ b/indent/mp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mp')
+if has_key(g:polyglot_is_disabled, 'mp')
   finish
 endif
 
diff --git a/indent/mustache.vim b/indent/mustache.vim
index 5715ef4a9..242a21707 100644
--- a/indent/mustache.vim
+++ b/indent/mustache.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'handlebars')
+if has_key(g:polyglot_is_disabled, 'handlebars')
   finish
 endif
 
diff --git a/indent/nginx.vim b/indent/nginx.vim
index 6ddf90f3d..0e0948552 100644
--- a/indent/nginx.vim
+++ b/indent/nginx.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nginx')
+if has_key(g:polyglot_is_disabled, 'nginx')
   finish
 endif
 
diff --git a/indent/nim.vim b/indent/nim.vim
index fab42ed12..0292a7f92 100644
--- a/indent/nim.vim
+++ b/indent/nim.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nim')
+if has_key(g:polyglot_is_disabled, 'nim')
   finish
 endif
 
diff --git a/indent/nix.vim b/indent/nix.vim
index 6c869de5a..cf8a19608 100644
--- a/indent/nix.vim
+++ b/indent/nix.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nix')
+if has_key(g:polyglot_is_disabled, 'nix')
   finish
 endif
 
diff --git a/indent/nsis.vim b/indent/nsis.vim
index d2abb517e..886ee4b76 100644
--- a/indent/nsis.vim
+++ b/indent/nsis.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nsis')
+if has_key(g:polyglot_is_disabled, 'nsis')
   finish
 endif
 
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index 8947957e8..d67f3e363 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/indent/occam.vim b/indent/occam.vim
index 125cc09e2..cc94f2d65 100644
--- a/indent/occam.vim
+++ b/indent/occam.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'occam')
+if has_key(g:polyglot_is_disabled, 'occam')
   finish
 endif
 
diff --git a/indent/octave.vim b/indent/octave.vim
index a5c62751b..89614f20e 100644
--- a/indent/octave.vim
+++ b/indent/octave.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'octave')
+if has_key(g:polyglot_is_disabled, 'octave')
   finish
 endif
 
diff --git a/indent/odin.vim b/indent/odin.vim
index 3a5bd9cc3..f0a4cba0b 100644
--- a/indent/odin.vim
+++ b/indent/odin.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'odin')
+if has_key(g:polyglot_is_disabled, 'odin')
   finish
 endif
 
diff --git a/indent/omake.vim b/indent/omake.vim
index ad84209ef..5c1cc446b 100644
--- a/indent/omake.vim
+++ b/indent/omake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/indent/opencl.vim b/indent/opencl.vim
index 56f08bc4f..2fa56d7d5 100644
--- a/indent/opencl.vim
+++ b/indent/opencl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'opencl')
+if has_key(g:polyglot_is_disabled, 'opencl')
   finish
 endif
 
diff --git a/indent/pascal.vim b/indent/pascal.vim
index 8bdc2fdda..968171205 100644
--- a/indent/pascal.vim
+++ b/indent/pascal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pascal')
+if has_key(g:polyglot_is_disabled, 'pascal')
   finish
 endif
 
diff --git a/indent/perl.vim b/indent/perl.vim
index 0f30c8862..c6c879a82 100644
--- a/indent/perl.vim
+++ b/indent/perl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'perl')
+if has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/indent/pgsql.vim b/indent/pgsql.vim
index 9a481da2c..a0b42f2ce 100644
--- a/indent/pgsql.vim
+++ b/indent/pgsql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pgsql')
+if has_key(g:polyglot_is_disabled, 'pgsql')
   finish
 endif
 
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index 14044bbfb..318090d8b 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'plantuml')
+if has_key(g:polyglot_is_disabled, 'plantuml')
   finish
 endif
 
diff --git a/indent/pony.vim b/indent/pony.vim
index bbf418067..718bf6953 100644
--- a/indent/pony.vim
+++ b/indent/pony.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pony')
+if has_key(g:polyglot_is_disabled, 'pony')
   finish
 endif
 
diff --git a/indent/postscr.vim b/indent/postscr.vim
index 253b92022..e07006731 100644
--- a/indent/postscr.vim
+++ b/indent/postscr.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'postscr')
+if has_key(g:polyglot_is_disabled, 'postscr')
   finish
 endif
 
diff --git a/indent/pov.vim b/indent/pov.vim
index c30cdc226..cccc6858b 100644
--- a/indent/pov.vim
+++ b/indent/pov.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pov')
+if has_key(g:polyglot_is_disabled, 'pov')
   finish
 endif
 
diff --git a/indent/prolog.vim b/indent/prolog.vim
index ff7760e0b..6568797d2 100644
--- a/indent/prolog.vim
+++ b/indent/prolog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'prolog')
+if has_key(g:polyglot_is_disabled, 'prolog')
   finish
 endif
 
diff --git a/indent/proto.vim b/indent/proto.vim
index f63aa31c7..3ec88be72 100644
--- a/indent/proto.vim
+++ b/indent/proto.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'protobuf')
+if has_key(g:polyglot_is_disabled, 'protobuf')
   finish
 endif
 
diff --git a/indent/ps1.vim b/indent/ps1.vim
index 9dc742b64..edc5b3b06 100644
--- a/indent/ps1.vim
+++ b/indent/ps1.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'powershell')
+if has_key(g:polyglot_is_disabled, 'powershell')
   finish
 endif
 
diff --git a/indent/pug.vim b/indent/pug.vim
index 40bb8e831..b9b8e5a38 100644
--- a/indent/pug.vim
+++ b/indent/pug.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pug')
+if has_key(g:polyglot_is_disabled, 'pug')
   finish
 endif
 
diff --git a/indent/puppet.vim b/indent/puppet.vim
index 8ee706af0..461766488 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'puppet')
+if has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/indent/purescript.vim b/indent/purescript.vim
index f2867dd9a..e3028bc1e 100644
--- a/indent/purescript.vim
+++ b/indent/purescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'purescript')
+if has_key(g:polyglot_is_disabled, 'purescript')
   finish
 endif
 
diff --git a/indent/pyrex.vim b/indent/pyrex.vim
index 77c936fa1..a2bd93d0b 100644
--- a/indent/pyrex.vim
+++ b/indent/pyrex.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pyrex')
+if has_key(g:polyglot_is_disabled, 'pyrex')
   finish
 endif
 
diff --git a/indent/python.vim b/indent/python.vim
index 951a0cb1e..c650165e7 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'python-indent')
+if has_key(g:polyglot_is_disabled, 'python-indent')
   finish
 endif
 
diff --git a/indent/qml.vim b/indent/qml.vim
index 6859ec34f..19ccbf560 100644
--- a/indent/qml.vim
+++ b/indent/qml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'qml')
+if has_key(g:polyglot_is_disabled, 'qml')
   finish
 endif
 
diff --git a/indent/racket.vim b/indent/racket.vim
index cb9934ead..18d75452a 100644
--- a/indent/racket.vim
+++ b/indent/racket.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'racket')
+if has_key(g:polyglot_is_disabled, 'racket')
   finish
 endif
 
diff --git a/indent/raku.vim b/indent/raku.vim
index f664f6228..7dbbabf2d 100644
--- a/indent/raku.vim
+++ b/indent/raku.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'raku')
+if has_key(g:polyglot_is_disabled, 'raku')
   finish
 endif
 
diff --git a/indent/razor.vim b/indent/razor.vim
index 41efb5bdf..38d479b7d 100644
--- a/indent/razor.vim
+++ b/indent/razor.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'razor')
+if has_key(g:polyglot_is_disabled, 'razor')
   finish
 endif
 
diff --git a/indent/readline.vim b/indent/readline.vim
index d36d1a8f6..7b7ba832b 100644
--- a/indent/readline.vim
+++ b/indent/readline.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'readline')
+if has_key(g:polyglot_is_disabled, 'readline')
   finish
 endif
 
diff --git a/indent/reason.vim b/indent/reason.vim
index ea7d4ebc7..df6552351 100644
--- a/indent/reason.vim
+++ b/indent/reason.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'reason')
+if has_key(g:polyglot_is_disabled, 'reason')
   finish
 endif
 
diff --git a/indent/rmd.vim b/indent/rmd.vim
index afeddd383..108e862e5 100644
--- a/indent/rmd.vim
+++ b/indent/rmd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rmd')
+if has_key(g:polyglot_is_disabled, 'rmd')
   finish
 endif
 
diff --git a/indent/rnoweb.vim b/indent/rnoweb.vim
index fc6c227e9..f0ae543b3 100644
--- a/indent/rnoweb.vim
+++ b/indent/rnoweb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rnoweb')
+if has_key(g:polyglot_is_disabled, 'rnoweb')
   finish
 endif
 
diff --git a/indent/rpl.vim b/indent/rpl.vim
index 11e39f537..b6180e7c4 100644
--- a/indent/rpl.vim
+++ b/indent/rpl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rpl')
+if has_key(g:polyglot_is_disabled, 'rpl')
   finish
 endif
 
diff --git a/indent/rrst.vim b/indent/rrst.vim
index 9718b8602..906094778 100644
--- a/indent/rrst.vim
+++ b/indent/rrst.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rrst')
+if has_key(g:polyglot_is_disabled, 'rrst')
   finish
 endif
 
diff --git a/indent/rst.vim b/indent/rst.vim
index 94cb44dc1..469bf660c 100644
--- a/indent/rst.vim
+++ b/indent/rst.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rst')
+if has_key(g:polyglot_is_disabled, 'rst')
   finish
 endif
 
diff --git a/indent/ruby.vim b/indent/ruby.vim
index 614f359fb..fbddf4637 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ruby')
+if has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/indent/rust.vim b/indent/rust.vim
index 733bf7c24..fe2030d52 100644
--- a/indent/rust.vim
+++ b/indent/rust.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/indent/sas.vim b/indent/sas.vim
index 320afdf7b..b454fa70d 100644
--- a/indent/sas.vim
+++ b/indent/sas.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sas')
+if has_key(g:polyglot_is_disabled, 'sas')
   finish
 endif
 
diff --git a/indent/sass.vim b/indent/sass.vim
index 602ed1ef9..ddff02246 100644
--- a/indent/sass.vim
+++ b/indent/sass.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sass')
+if has_key(g:polyglot_is_disabled, 'sass')
   finish
 endif
 
diff --git a/indent/scala.vim b/indent/scala.vim
index 05a10bef7..4cffc8bca 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scala')
+if has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/indent/scheme.vim b/indent/scheme.vim
index 670324f00..02502a6fe 100644
--- a/indent/scheme.vim
+++ b/indent/scheme.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scheme')
+if has_key(g:polyglot_is_disabled, 'scheme')
   finish
 endif
 
diff --git a/indent/scss.vim b/indent/scss.vim
index 95c947d5a..195f6cf4d 100644
--- a/indent/scss.vim
+++ b/indent/scss.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scss')
+if has_key(g:polyglot_is_disabled, 'scss')
   finish
 endif
 
diff --git a/indent/sdl.vim b/indent/sdl.vim
index f253c8368..563a4e7bf 100644
--- a/indent/sdl.vim
+++ b/indent/sdl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sdl')
+if has_key(g:polyglot_is_disabled, 'sdl')
   finish
 endif
 
diff --git a/indent/slim.vim b/indent/slim.vim
index a33b20955..3ac105cf9 100644
--- a/indent/slim.vim
+++ b/indent/slim.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slim')
+if has_key(g:polyglot_is_disabled, 'slim')
   finish
 endif
 
diff --git a/indent/slime.vim b/indent/slime.vim
index db8e35558..6b3835dbe 100644
--- a/indent/slime.vim
+++ b/indent/slime.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slime')
+if has_key(g:polyglot_is_disabled, 'slime')
   finish
 endif
 
diff --git a/indent/sml.vim b/indent/sml.vim
index d70b6d0c5..daf6f6832 100644
--- a/indent/sml.vim
+++ b/indent/sml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sml')
+if has_key(g:polyglot_is_disabled, 'sml')
   finish
 endif
 
diff --git a/indent/solidity.vim b/indent/solidity.vim
index bbf7c63c6..6191199f7 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'solidity')
+if has_key(g:polyglot_is_disabled, 'solidity')
   finish
 endif
 
diff --git a/indent/sql.vim b/indent/sql.vim
index 9ce069106..2c96ac850 100644
--- a/indent/sql.vim
+++ b/indent/sql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sql')
+if has_key(g:polyglot_is_disabled, 'sql')
   finish
 endif
 
diff --git a/indent/sshconfig.vim b/indent/sshconfig.vim
index b68e02ba0..b17f24321 100644
--- a/indent/sshconfig.vim
+++ b/indent/sshconfig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sshconfig')
+if has_key(g:polyglot_is_disabled, 'sshconfig')
   finish
 endif
 
diff --git a/indent/stylus.vim b/indent/stylus.vim
index 070c10656..9f506e2f1 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'stylus')
+if has_key(g:polyglot_is_disabled, 'stylus')
   finish
 endif
 
diff --git a/indent/svelte.vim b/indent/svelte.vim
index dbd33877b..64383fcff 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'svelte')
+if has_key(g:polyglot_is_disabled, 'svelte')
   finish
 endif
 
diff --git a/indent/svg.vim b/indent/svg.vim
index af0cb1db9..804a38837 100644
--- a/indent/svg.vim
+++ b/indent/svg.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'svg-indent')
+if has_key(g:polyglot_is_disabled, 'svg-indent')
   finish
 endif
 
diff --git a/indent/swift.vim b/indent/swift.vim
index 5b5d88bdd..80b70531d 100644
--- a/indent/swift.vim
+++ b/indent/swift.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'swift')
+if has_key(g:polyglot_is_disabled, 'swift')
   finish
 endif
 
diff --git a/indent/systemverilog.vim b/indent/systemverilog.vim
index 9a1353ec6..554cff08a 100644
--- a/indent/systemverilog.vim
+++ b/indent/systemverilog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'systemverilog')
+if has_key(g:polyglot_is_disabled, 'systemverilog')
   finish
 endif
 
diff --git a/indent/tcl.vim b/indent/tcl.vim
index 01be424e3..7d4755463 100644
--- a/indent/tcl.vim
+++ b/indent/tcl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tcl')
+if has_key(g:polyglot_is_disabled, 'tcl')
   finish
 endif
 
diff --git a/indent/teraterm.vim b/indent/teraterm.vim
index 95e76144c..69381cadf 100644
--- a/indent/teraterm.vim
+++ b/indent/teraterm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'teraterm')
+if has_key(g:polyglot_is_disabled, 'teraterm')
   finish
 endif
 
diff --git a/indent/terraform.vim b/indent/terraform.vim
index e0c65b611..32222842a 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'terraform')
+if has_key(g:polyglot_is_disabled, 'terraform')
   finish
 endif
 
diff --git a/indent/tex.vim b/indent/tex.vim
index f304c092c..4cd17b842 100644
--- a/indent/tex.vim
+++ b/indent/tex.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tex')
+if has_key(g:polyglot_is_disabled, 'tex')
   finish
 endif
 
diff --git a/indent/tf.vim b/indent/tf.vim
index 8b202dc27..758e471eb 100644
--- a/indent/tf.vim
+++ b/indent/tf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tf')
+if has_key(g:polyglot_is_disabled, 'tf')
   finish
 endif
 
diff --git a/indent/tilde.vim b/indent/tilde.vim
index b14d3c378..5472e1da8 100644
--- a/indent/tilde.vim
+++ b/indent/tilde.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tilde')
+if has_key(g:polyglot_is_disabled, 'tilde')
   finish
 endif
 
diff --git a/indent/treetop.vim b/indent/treetop.vim
index 6d4314ab7..b18bd3985 100644
--- a/indent/treetop.vim
+++ b/indent/treetop.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'treetop')
+if has_key(g:polyglot_is_disabled, 'treetop')
   finish
 endif
 
diff --git a/indent/twig.vim b/indent/twig.vim
index 3101f00be..83f15fe3c 100644
--- a/indent/twig.vim
+++ b/indent/twig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'twig')
+if has_key(g:polyglot_is_disabled, 'twig')
   finish
 endif
 
diff --git a/indent/typescript.vim b/indent/typescript.vim
index cb36ad1b3..fc9a29e12 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/indent/typescriptreact.vim b/indent/typescriptreact.vim
index 6385bf07c..fe9a2c324 100644
--- a/indent/typescriptreact.vim
+++ b/indent/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/indent/vala.vim b/indent/vala.vim
index c68bf7eb7..60afaac60 100644
--- a/indent/vala.vim
+++ b/indent/vala.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vala')
+if has_key(g:polyglot_is_disabled, 'vala')
   finish
 endif
 
diff --git a/indent/vb.vim b/indent/vb.vim
index deb6ee866..db49efd5f 100644
--- a/indent/vb.vim
+++ b/indent/vb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'visual-basic')
+if has_key(g:polyglot_is_disabled, 'visual-basic')
   finish
 endif
 
diff --git a/indent/velocity.vim b/indent/velocity.vim
index 7bc9b3e5e..64aad906f 100644
--- a/indent/velocity.vim
+++ b/indent/velocity.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'velocity')
+if has_key(g:polyglot_is_disabled, 'velocity')
   finish
 endif
 
diff --git a/indent/verilog.vim b/indent/verilog.vim
index f14928274..b07a912fe 100644
--- a/indent/verilog.vim
+++ b/indent/verilog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'verilog')
+if has_key(g:polyglot_is_disabled, 'verilog')
   finish
 endif
 
diff --git a/indent/vhdl.vim b/indent/vhdl.vim
index 6da3aa60c..aa691d7d9 100644
--- a/indent/vhdl.vim
+++ b/indent/vhdl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vhdl')
+if has_key(g:polyglot_is_disabled, 'vhdl')
   finish
 endif
 
diff --git a/indent/vlang.vim b/indent/vlang.vim
index 632469b65..a12cff1bf 100644
--- a/indent/vlang.vim
+++ b/indent/vlang.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'v')
+if has_key(g:polyglot_is_disabled, 'v')
   finish
 endif
 
diff --git a/indent/vroom.vim b/indent/vroom.vim
index 6952b92c6..c2793053c 100644
--- a/indent/vroom.vim
+++ b/indent/vroom.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vroom')
+if has_key(g:polyglot_is_disabled, 'vroom')
   finish
 endif
 
diff --git a/indent/vue.vim b/indent/vue.vim
index 53be97da5..83391a488 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vue')
+if has_key(g:polyglot_is_disabled, 'vue')
   finish
 endif
 
diff --git a/indent/wast.vim b/indent/wast.vim
index 4483cb6c3..bbd0be56d 100644
--- a/indent/wast.vim
+++ b/indent/wast.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'wast')
+if has_key(g:polyglot_is_disabled, 'wast')
   finish
 endif
 
diff --git a/indent/xf86conf.vim b/indent/xf86conf.vim
index 1454c9e59..9b31cc8c3 100644
--- a/indent/xf86conf.vim
+++ b/indent/xf86conf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xf86conf')
+if has_key(g:polyglot_is_disabled, 'xf86conf')
   finish
 endif
 
diff --git a/indent/xhtml.vim b/indent/xhtml.vim
index f660238e1..67d0fdb83 100644
--- a/indent/xhtml.vim
+++ b/indent/xhtml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xhtml')
+if has_key(g:polyglot_is_disabled, 'xhtml')
   finish
 endif
 
diff --git a/indent/xinetd.vim b/indent/xinetd.vim
index 4ed0b2731..7463da52f 100644
--- a/indent/xinetd.vim
+++ b/indent/xinetd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xinetd')
+if has_key(g:polyglot_is_disabled, 'xinetd')
   finish
 endif
 
diff --git a/indent/xsd.vim b/indent/xsd.vim
index 20db18144..d30d56b27 100644
--- a/indent/xsd.vim
+++ b/indent/xsd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xsd')
+if has_key(g:polyglot_is_disabled, 'xsd')
   finish
 endif
 
diff --git a/indent/xslt.vim b/indent/xslt.vim
index fd3de3198..b443803f8 100644
--- a/indent/xslt.vim
+++ b/indent/xslt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xslt')
+if has_key(g:polyglot_is_disabled, 'xslt')
   finish
 endif
 
diff --git a/indent/yacc.vim b/indent/yacc.vim
index e14907a40..1c5cc5ae1 100644
--- a/indent/yacc.vim
+++ b/indent/yacc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'yacc')
+if has_key(g:polyglot_is_disabled, 'yacc')
   finish
 endif
 
diff --git a/indent/yaml.vim b/indent/yaml.vim
index c3a5d7cd1..b2622e9cc 100644
--- a/indent/yaml.vim
+++ b/indent/yaml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'yaml')
+if has_key(g:polyglot_is_disabled, 'yaml')
   finish
 endif
 
diff --git a/indent/zig.vim b/indent/zig.vim
index 73a65858e..c28c8b70e 100644
--- a/indent/zig.vim
+++ b/indent/zig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zig')
+if has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/indent/zimbu.vim b/indent/zimbu.vim
index 1ad43f892..c80a5f9d3 100644
--- a/indent/zimbu.vim
+++ b/indent/zimbu.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zimbu')
+if has_key(g:polyglot_is_disabled, 'zimbu')
   finish
 endif
 
diff --git a/scripts/build b/scripts/build
index f6910e729..3933a87ef 100755
--- a/scripts/build
+++ b/scripts/build
@@ -295,7 +295,7 @@ def copy_file(name, src, dest)
     open(dest, "w") do |output|
       if dest.match?(/\.vim$/)
         output << <<~EOF
-        if !has_key(g:polyglot_is_disabled, '#{name}')
+        if has_key(g:polyglot_is_disabled, '#{name}')
           finish
         endif
 
diff --git a/syntax/8th.vim b/syntax/8th.vim
index 9c6a1e0f0..517d3573a 100644
--- a/syntax/8th.vim
+++ b/syntax/8th.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, '8th')
+if has_key(g:polyglot_is_disabled, '8th')
   finish
 endif
 
diff --git a/syntax/Jenkinsfile.vim b/syntax/Jenkinsfile.vim
index a8ae78b8f..57869fc0f 100644
--- a/syntax/Jenkinsfile.vim
+++ b/syntax/Jenkinsfile.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jenkins')
+if has_key(g:polyglot_is_disabled, 'jenkins')
   finish
 endif
 
diff --git a/syntax/a2ps.vim b/syntax/a2ps.vim
index 7fcf9ee27..52fa0c491 100644
--- a/syntax/a2ps.vim
+++ b/syntax/a2ps.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'a2ps')
+if has_key(g:polyglot_is_disabled, 'a2ps')
   finish
 endif
 
diff --git a/syntax/a65.vim b/syntax/a65.vim
index fcfa35bb4..fc281d676 100644
--- a/syntax/a65.vim
+++ b/syntax/a65.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'a65')
+if has_key(g:polyglot_is_disabled, 'a65')
   finish
 endif
 
diff --git a/syntax/aap.vim b/syntax/aap.vim
index 4d1db9b3e..a3ea89571 100644
--- a/syntax/aap.vim
+++ b/syntax/aap.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'aap')
+if has_key(g:polyglot_is_disabled, 'aap')
   finish
 endif
 
diff --git a/syntax/abap.vim b/syntax/abap.vim
index 9d2e47757..3596e384d 100644
--- a/syntax/abap.vim
+++ b/syntax/abap.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'abap')
+if has_key(g:polyglot_is_disabled, 'abap')
   finish
 endif
 
diff --git a/syntax/abaqus.vim b/syntax/abaqus.vim
index 57860708d..5d468d2e7 100644
--- a/syntax/abaqus.vim
+++ b/syntax/abaqus.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'abaqus')
+if has_key(g:polyglot_is_disabled, 'abaqus')
   finish
 endif
 
diff --git a/syntax/abc.vim b/syntax/abc.vim
index c1e6fb041..5798534c9 100644
--- a/syntax/abc.vim
+++ b/syntax/abc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'abc')
+if has_key(g:polyglot_is_disabled, 'abc')
   finish
 endif
 
diff --git a/syntax/abel.vim b/syntax/abel.vim
index 0299f9920..c97156c76 100644
--- a/syntax/abel.vim
+++ b/syntax/abel.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'abel')
+if has_key(g:polyglot_is_disabled, 'abel')
   finish
 endif
 
diff --git a/syntax/acedb.vim b/syntax/acedb.vim
index cd1d6b59a..88544cef3 100644
--- a/syntax/acedb.vim
+++ b/syntax/acedb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'acedb')
+if has_key(g:polyglot_is_disabled, 'acedb')
   finish
 endif
 
diff --git a/syntax/ada.vim b/syntax/ada.vim
index f4ff3025a..b5e94a643 100644
--- a/syntax/ada.vim
+++ b/syntax/ada.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ada')
+if has_key(g:polyglot_is_disabled, 'ada')
   finish
 endif
 
diff --git a/syntax/ahdl.vim b/syntax/ahdl.vim
index 9436bd2a4..b1061f258 100644
--- a/syntax/ahdl.vim
+++ b/syntax/ahdl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ahdl')
+if has_key(g:polyglot_is_disabled, 'ahdl')
   finish
 endif
 
diff --git a/syntax/aidl.vim b/syntax/aidl.vim
index 3f8188aab..334033016 100644
--- a/syntax/aidl.vim
+++ b/syntax/aidl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'aidl')
+if has_key(g:polyglot_is_disabled, 'aidl')
   finish
 endif
 
diff --git a/syntax/alsaconf.vim b/syntax/alsaconf.vim
index 6e289c963..b5fcfdfd8 100644
--- a/syntax/alsaconf.vim
+++ b/syntax/alsaconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'alsaconf')
+if has_key(g:polyglot_is_disabled, 'alsaconf')
   finish
 endif
 
diff --git a/syntax/aml.vim b/syntax/aml.vim
index c7c713a87..5b381447c 100644
--- a/syntax/aml.vim
+++ b/syntax/aml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'aml')
+if has_key(g:polyglot_is_disabled, 'aml')
   finish
 endif
 
diff --git a/syntax/ampl.vim b/syntax/ampl.vim
index 15e7de977..69c3d2d0a 100644
--- a/syntax/ampl.vim
+++ b/syntax/ampl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ampl')
+if has_key(g:polyglot_is_disabled, 'ampl')
   finish
 endif
 
diff --git a/syntax/ansible.vim b/syntax/ansible.vim
index 2777a0da1..4b9e49d2e 100644
--- a/syntax/ansible.vim
+++ b/syntax/ansible.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ansible')
+if has_key(g:polyglot_is_disabled, 'ansible')
   finish
 endif
 
diff --git a/syntax/ansible_hosts.vim b/syntax/ansible_hosts.vim
index 7879f551d..a3af8f105 100644
--- a/syntax/ansible_hosts.vim
+++ b/syntax/ansible_hosts.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ansible')
+if has_key(g:polyglot_is_disabled, 'ansible')
   finish
 endif
 
diff --git a/syntax/ant.vim b/syntax/ant.vim
index ee389234d..d3ec38491 100644
--- a/syntax/ant.vim
+++ b/syntax/ant.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ant')
+if has_key(g:polyglot_is_disabled, 'ant')
   finish
 endif
 
diff --git a/syntax/apache.vim b/syntax/apache.vim
index 85145770a..3bba1bbbd 100644
--- a/syntax/apache.vim
+++ b/syntax/apache.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'apache')
+if has_key(g:polyglot_is_disabled, 'apache')
   finish
 endif
 
diff --git a/syntax/apachestyle.vim b/syntax/apachestyle.vim
index 8af07a1a7..e523ba778 100644
--- a/syntax/apachestyle.vim
+++ b/syntax/apachestyle.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'apachestyle')
+if has_key(g:polyglot_is_disabled, 'apachestyle')
   finish
 endif
 
diff --git a/syntax/apiblueprint.vim b/syntax/apiblueprint.vim
index 12be8c88f..ba83eb445 100644
--- a/syntax/apiblueprint.vim
+++ b/syntax/apiblueprint.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'apiblueprint')
+if has_key(g:polyglot_is_disabled, 'apiblueprint')
   finish
 endif
 
diff --git a/syntax/applescript.vim b/syntax/applescript.vim
index de31e2843..2e72959ef 100644
--- a/syntax/applescript.vim
+++ b/syntax/applescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'applescript')
+if has_key(g:polyglot_is_disabled, 'applescript')
   finish
 endif
 
diff --git a/syntax/aptconf.vim b/syntax/aptconf.vim
index bf9142a3e..046a543ef 100644
--- a/syntax/aptconf.vim
+++ b/syntax/aptconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'aptconf')
+if has_key(g:polyglot_is_disabled, 'aptconf')
   finish
 endif
 
diff --git a/syntax/arch.vim b/syntax/arch.vim
index 6b43e94c4..b0156e79b 100644
--- a/syntax/arch.vim
+++ b/syntax/arch.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'arch')
+if has_key(g:polyglot_is_disabled, 'arch')
   finish
 endif
 
diff --git a/syntax/arduino.vim b/syntax/arduino.vim
index fe233eefe..ceb5f1fcd 100644
--- a/syntax/arduino.vim
+++ b/syntax/arduino.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'arduino')
+if has_key(g:polyglot_is_disabled, 'arduino')
   finish
 endif
 
diff --git a/syntax/art.vim b/syntax/art.vim
index b9cd2a882..45e5e5c26 100644
--- a/syntax/art.vim
+++ b/syntax/art.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'art')
+if has_key(g:polyglot_is_disabled, 'art')
   finish
 endif
 
diff --git a/syntax/asciidoc.vim b/syntax/asciidoc.vim
index 9823a863d..ab3053054 100644
--- a/syntax/asciidoc.vim
+++ b/syntax/asciidoc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'asciidoc')
+if has_key(g:polyglot_is_disabled, 'asciidoc')
   finish
 endif
 
diff --git a/syntax/asl.vim b/syntax/asl.vim
index cdfd0f8b9..14a83a54b 100644
--- a/syntax/asl.vim
+++ b/syntax/asl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'acpiasl')
+if has_key(g:polyglot_is_disabled, 'acpiasl')
   finish
 endif
 
diff --git a/syntax/asn.vim b/syntax/asn.vim
index 4ae583e9a..f767df05f 100644
--- a/syntax/asn.vim
+++ b/syntax/asn.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'asn')
+if has_key(g:polyglot_is_disabled, 'asn')
   finish
 endif
 
diff --git a/syntax/aspperl.vim b/syntax/aspperl.vim
index e81b54daf..fa83b622e 100644
--- a/syntax/aspperl.vim
+++ b/syntax/aspperl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'aspperl')
+if has_key(g:polyglot_is_disabled, 'aspperl')
   finish
 endif
 
diff --git a/syntax/aspvbs.vim b/syntax/aspvbs.vim
index 84e20ae16..456f0881f 100644
--- a/syntax/aspvbs.vim
+++ b/syntax/aspvbs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'aspvbs')
+if has_key(g:polyglot_is_disabled, 'aspvbs')
   finish
 endif
 
diff --git a/syntax/asterisk.vim b/syntax/asterisk.vim
index ad982bd47..6f351d7ce 100644
--- a/syntax/asterisk.vim
+++ b/syntax/asterisk.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'asterisk')
+if has_key(g:polyglot_is_disabled, 'asterisk')
   finish
 endif
 
diff --git a/syntax/asteriskvm.vim b/syntax/asteriskvm.vim
index 442bb593d..a90b27b37 100644
--- a/syntax/asteriskvm.vim
+++ b/syntax/asteriskvm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'asteriskvm')
+if has_key(g:polyglot_is_disabled, 'asteriskvm')
   finish
 endif
 
diff --git a/syntax/atlas.vim b/syntax/atlas.vim
index a94be1608..4efcdce77 100644
--- a/syntax/atlas.vim
+++ b/syntax/atlas.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'atlas')
+if has_key(g:polyglot_is_disabled, 'atlas')
   finish
 endif
 
diff --git a/syntax/autodoc.vim b/syntax/autodoc.vim
index 4da968dab..fe9a71091 100644
--- a/syntax/autodoc.vim
+++ b/syntax/autodoc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'autodoc')
+if has_key(g:polyglot_is_disabled, 'autodoc')
   finish
 endif
 
diff --git a/syntax/autoit.vim b/syntax/autoit.vim
index c9c687a24..6474cdfb3 100644
--- a/syntax/autoit.vim
+++ b/syntax/autoit.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'autoit')
+if has_key(g:polyglot_is_disabled, 'autoit')
   finish
 endif
 
diff --git a/syntax/automake.vim b/syntax/automake.vim
index 1e61b27f5..7f2479344 100644
--- a/syntax/automake.vim
+++ b/syntax/automake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'automake')
+if has_key(g:polyglot_is_disabled, 'automake')
   finish
 endif
 
diff --git a/syntax/ave.vim b/syntax/ave.vim
index a0e5bb74e..f2f5ad706 100644
--- a/syntax/ave.vim
+++ b/syntax/ave.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ave')
+if has_key(g:polyglot_is_disabled, 'ave')
   finish
 endif
 
diff --git a/syntax/awk.vim b/syntax/awk.vim
index 19d8000f5..b8b7f3dfb 100644
--- a/syntax/awk.vim
+++ b/syntax/awk.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'awk')
+if has_key(g:polyglot_is_disabled, 'awk')
   finish
 endif
 
diff --git a/syntax/b.vim b/syntax/b.vim
index 2dde00cd9..ff3005958 100644
--- a/syntax/b.vim
+++ b/syntax/b.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'b')
+if has_key(g:polyglot_is_disabled, 'b')
   finish
 endif
 
diff --git a/syntax/basic.vim b/syntax/basic.vim
index 565bf678b..645c46ac2 100644
--- a/syntax/basic.vim
+++ b/syntax/basic.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'basic')
+if has_key(g:polyglot_is_disabled, 'basic')
   finish
 endif
 
diff --git a/syntax/basic/class.vim b/syntax/basic/class.vim
index b4e1d752d..cc5104e2e 100644
--- a/syntax/basic/class.vim
+++ b/syntax/basic/class.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/cluster.vim b/syntax/basic/cluster.vim
index 6561c9d6a..7fc81e140 100644
--- a/syntax/basic/cluster.vim
+++ b/syntax/basic/cluster.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/decorator.vim b/syntax/basic/decorator.vim
index cb1312853..51c02ff65 100644
--- a/syntax/basic/decorator.vim
+++ b/syntax/basic/decorator.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/doc.vim b/syntax/basic/doc.vim
index 4d5f8a273..3d623f360 100644
--- a/syntax/basic/doc.vim
+++ b/syntax/basic/doc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/function.vim b/syntax/basic/function.vim
index 14a2deeb4..e61d02759 100644
--- a/syntax/basic/function.vim
+++ b/syntax/basic/function.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/identifiers.vim b/syntax/basic/identifiers.vim
index 4fe4b565e..d46c999fc 100644
--- a/syntax/basic/identifiers.vim
+++ b/syntax/basic/identifiers.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/keyword.vim b/syntax/basic/keyword.vim
index 41c4f9d2e..b14bece11 100644
--- a/syntax/basic/keyword.vim
+++ b/syntax/basic/keyword.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/literal.vim b/syntax/basic/literal.vim
index 30411cb64..8cbcf8a10 100644
--- a/syntax/basic/literal.vim
+++ b/syntax/basic/literal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/members.vim b/syntax/basic/members.vim
index e1c4589a8..81d243613 100644
--- a/syntax/basic/members.vim
+++ b/syntax/basic/members.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/object.vim b/syntax/basic/object.vim
index ccc20304d..bcec8fc69 100644
--- a/syntax/basic/object.vim
+++ b/syntax/basic/object.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/patch.vim b/syntax/basic/patch.vim
index 475c050db..2156f8d87 100644
--- a/syntax/basic/patch.vim
+++ b/syntax/basic/patch.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/reserved.vim b/syntax/basic/reserved.vim
index a60af5908..7989f9e0e 100644
--- a/syntax/basic/reserved.vim
+++ b/syntax/basic/reserved.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/symbols.vim b/syntax/basic/symbols.vim
index 5c83116af..ce59de238 100644
--- a/syntax/basic/symbols.vim
+++ b/syntax/basic/symbols.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim
index c448f2c84..5dc0f2bf6 100644
--- a/syntax/basic/type.vim
+++ b/syntax/basic/type.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/bc.vim b/syntax/bc.vim
index 68b244783..ae88e3c06 100644
--- a/syntax/bc.vim
+++ b/syntax/bc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bc')
+if has_key(g:polyglot_is_disabled, 'bc')
   finish
 endif
 
diff --git a/syntax/bdf.vim b/syntax/bdf.vim
index 7deb6f152..f6bba3042 100644
--- a/syntax/bdf.vim
+++ b/syntax/bdf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bdf')
+if has_key(g:polyglot_is_disabled, 'bdf')
   finish
 endif
 
diff --git a/syntax/bib.vim b/syntax/bib.vim
index ccc994c64..daf3b6ecc 100644
--- a/syntax/bib.vim
+++ b/syntax/bib.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bib')
+if has_key(g:polyglot_is_disabled, 'bib')
   finish
 endif
 
diff --git a/syntax/bindzone.vim b/syntax/bindzone.vim
index dd157ce27..e0f7f63e9 100644
--- a/syntax/bindzone.vim
+++ b/syntax/bindzone.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bindzone')
+if has_key(g:polyglot_is_disabled, 'bindzone')
   finish
 endif
 
diff --git a/syntax/blade.vim b/syntax/blade.vim
index 76258fd8b..8203218dc 100644
--- a/syntax/blade.vim
+++ b/syntax/blade.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'blade')
+if has_key(g:polyglot_is_disabled, 'blade')
   finish
 endif
 
diff --git a/syntax/blank.vim b/syntax/blank.vim
index f32e3f3cf..8368357c2 100644
--- a/syntax/blank.vim
+++ b/syntax/blank.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'blank')
+if has_key(g:polyglot_is_disabled, 'blank')
   finish
 endif
 
diff --git a/syntax/brewfile.vim b/syntax/brewfile.vim
index ea5e0f9e1..227203279 100644
--- a/syntax/brewfile.vim
+++ b/syntax/brewfile.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'brewfile')
+if has_key(g:polyglot_is_disabled, 'brewfile')
   finish
 endif
 
diff --git a/syntax/bsdl.vim b/syntax/bsdl.vim
index 245708ca7..83fc478e2 100644
--- a/syntax/bsdl.vim
+++ b/syntax/bsdl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bsdl')
+if has_key(g:polyglot_is_disabled, 'bsdl')
   finish
 endif
 
diff --git a/syntax/bst.vim b/syntax/bst.vim
index 8fb3bd8be..dd6176e43 100644
--- a/syntax/bst.vim
+++ b/syntax/bst.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bst')
+if has_key(g:polyglot_is_disabled, 'bst')
   finish
 endif
 
diff --git a/syntax/bzl.vim b/syntax/bzl.vim
index fe309354a..65357b07a 100644
--- a/syntax/bzl.vim
+++ b/syntax/bzl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bzl')
+if has_key(g:polyglot_is_disabled, 'bzl')
   finish
 endif
 
diff --git a/syntax/bzr.vim b/syntax/bzr.vim
index ae7ac3575..26ad6c8e8 100644
--- a/syntax/bzr.vim
+++ b/syntax/bzr.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'bzr')
+if has_key(g:polyglot_is_disabled, 'bzr')
   finish
 endif
 
diff --git a/syntax/c.vim b/syntax/c.vim
index bedac0770..a1b52a65c 100644
--- a/syntax/c.vim
+++ b/syntax/c.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'c/c++')
+if has_key(g:polyglot_is_disabled, 'c/c++')
   finish
 endif
 
diff --git a/syntax/cabal-1.vim b/syntax/cabal-1.vim
index 0389eee7e..e7ca72f76 100644
--- a/syntax/cabal-1.vim
+++ b/syntax/cabal-1.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haskell')
+if has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/syntax/cabal-2.vim b/syntax/cabal-2.vim
index 1467ee311..72e6a6f74 100644
--- a/syntax/cabal-2.vim
+++ b/syntax/cabal-2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cabal')
+if has_key(g:polyglot_is_disabled, 'cabal')
   finish
 endif
 
diff --git a/syntax/caddyfile.vim b/syntax/caddyfile.vim
index ce62be88b..771a8614b 100644
--- a/syntax/caddyfile.vim
+++ b/syntax/caddyfile.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'caddyfile')
+if has_key(g:polyglot_is_disabled, 'caddyfile')
   finish
 endif
 
diff --git a/syntax/calendar.vim b/syntax/calendar.vim
index dd9984946..e4fe1ee50 100644
--- a/syntax/calendar.vim
+++ b/syntax/calendar.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'calendar')
+if has_key(g:polyglot_is_disabled, 'calendar')
   finish
 endif
 
diff --git a/syntax/carp.vim b/syntax/carp.vim
index 1d62f7caf..149a79223 100644
--- a/syntax/carp.vim
+++ b/syntax/carp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'carp')
+if has_key(g:polyglot_is_disabled, 'carp')
   finish
 endif
 
diff --git a/syntax/catalog.vim b/syntax/catalog.vim
index a6aa01d47..64ae4a956 100644
--- a/syntax/catalog.vim
+++ b/syntax/catalog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'catalog')
+if has_key(g:polyglot_is_disabled, 'catalog')
   finish
 endif
 
diff --git a/syntax/cdl.vim b/syntax/cdl.vim
index 4084adac7..7ecb9f7e8 100644
--- a/syntax/cdl.vim
+++ b/syntax/cdl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cdl')
+if has_key(g:polyglot_is_disabled, 'cdl')
   finish
 endif
 
diff --git a/syntax/cdrdaoconf.vim b/syntax/cdrdaoconf.vim
index 98fd01116..7401027e8 100644
--- a/syntax/cdrdaoconf.vim
+++ b/syntax/cdrdaoconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cdrdaoconf')
+if has_key(g:polyglot_is_disabled, 'cdrdaoconf')
   finish
 endif
 
diff --git a/syntax/cdrtoc.vim b/syntax/cdrtoc.vim
index f2d5b8cb0..3efc3d3f1 100644
--- a/syntax/cdrtoc.vim
+++ b/syntax/cdrtoc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cdrtoc')
+if has_key(g:polyglot_is_disabled, 'cdrtoc')
   finish
 endif
 
diff --git a/syntax/cf.vim b/syntax/cf.vim
index 45475d0e2..2e04a546d 100644
--- a/syntax/cf.vim
+++ b/syntax/cf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cf')
+if has_key(g:polyglot_is_disabled, 'cf')
   finish
 endif
 
diff --git a/syntax/cfg.vim b/syntax/cfg.vim
index 484b750cc..412b62ae9 100644
--- a/syntax/cfg.vim
+++ b/syntax/cfg.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cfg')
+if has_key(g:polyglot_is_disabled, 'cfg')
   finish
 endif
 
diff --git a/syntax/ch.vim b/syntax/ch.vim
index 4ac949cfc..f322b4712 100644
--- a/syntax/ch.vim
+++ b/syntax/ch.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ch')
+if has_key(g:polyglot_is_disabled, 'ch')
   finish
 endif
 
diff --git a/syntax/chaiscript.vim b/syntax/chaiscript.vim
index dfb536133..182ca63fa 100644
--- a/syntax/chaiscript.vim
+++ b/syntax/chaiscript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'chaiscript')
+if has_key(g:polyglot_is_disabled, 'chaiscript')
   finish
 endif
 
diff --git a/syntax/chaskell.vim b/syntax/chaskell.vim
index d819aa975..546e2ae27 100644
--- a/syntax/chaskell.vim
+++ b/syntax/chaskell.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'chaskell')
+if has_key(g:polyglot_is_disabled, 'chaskell')
   finish
 endif
 
diff --git a/syntax/chill.vim b/syntax/chill.vim
index 862ce04cf..6f530b287 100644
--- a/syntax/chill.vim
+++ b/syntax/chill.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'chill')
+if has_key(g:polyglot_is_disabled, 'chill')
   finish
 endif
 
diff --git a/syntax/chordpro.vim b/syntax/chordpro.vim
index 10b770489..65efbce42 100644
--- a/syntax/chordpro.vim
+++ b/syntax/chordpro.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'chordpro')
+if has_key(g:polyglot_is_disabled, 'chordpro')
   finish
 endif
 
diff --git a/syntax/cl.vim b/syntax/cl.vim
index 3e9bf6d27..c53c90abb 100644
--- a/syntax/cl.vim
+++ b/syntax/cl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cl')
+if has_key(g:polyglot_is_disabled, 'cl')
   finish
 endif
 
diff --git a/syntax/clean.vim b/syntax/clean.vim
index 1cfbca8d3..287edeb47 100644
--- a/syntax/clean.vim
+++ b/syntax/clean.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'clean')
+if has_key(g:polyglot_is_disabled, 'clean')
   finish
 endif
 
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index 56c576d85..d647b9eaf 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'clojure')
+if has_key(g:polyglot_is_disabled, 'clojure')
   finish
 endif
 
diff --git a/syntax/cmake.vim b/syntax/cmake.vim
index b6a9a7f5f..7da217506 100644
--- a/syntax/cmake.vim
+++ b/syntax/cmake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cmake')
+if has_key(g:polyglot_is_disabled, 'cmake')
   finish
 endif
 
diff --git a/syntax/cmod.vim b/syntax/cmod.vim
index e23f1609c..2af912719 100644
--- a/syntax/cmod.vim
+++ b/syntax/cmod.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cmod')
+if has_key(g:polyglot_is_disabled, 'cmod')
   finish
 endif
 
diff --git a/syntax/cmusrc.vim b/syntax/cmusrc.vim
index e9384d2b4..0ef355d69 100644
--- a/syntax/cmusrc.vim
+++ b/syntax/cmusrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cmusrc')
+if has_key(g:polyglot_is_disabled, 'cmusrc')
   finish
 endif
 
diff --git a/syntax/cobol.vim b/syntax/cobol.vim
index e1ab7a14d..d771969c2 100644
--- a/syntax/cobol.vim
+++ b/syntax/cobol.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cobol')
+if has_key(g:polyglot_is_disabled, 'cobol')
   finish
 endif
 
diff --git a/syntax/coco.vim b/syntax/coco.vim
index 6d92790e3..4f78d7af8 100644
--- a/syntax/coco.vim
+++ b/syntax/coco.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'coco')
+if has_key(g:polyglot_is_disabled, 'coco')
   finish
 endif
 
diff --git a/syntax/coffee.vim b/syntax/coffee.vim
index f6f54f72e..3b7c05b6f 100644
--- a/syntax/coffee.vim
+++ b/syntax/coffee.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'coffee-script')
+if has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/syntax/common.vim b/syntax/common.vim
index 87823ef5f..e1174b962 100644
--- a/syntax/common.vim
+++ b/syntax/common.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/conaryrecipe.vim b/syntax/conaryrecipe.vim
index 95a57d598..418019342 100644
--- a/syntax/conaryrecipe.vim
+++ b/syntax/conaryrecipe.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'conaryrecipe')
+if has_key(g:polyglot_is_disabled, 'conaryrecipe')
   finish
 endif
 
diff --git a/syntax/conf.vim b/syntax/conf.vim
index b6c8f48db..39ccfb68b 100644
--- a/syntax/conf.vim
+++ b/syntax/conf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'conf')
+if has_key(g:polyglot_is_disabled, 'conf')
   finish
 endif
 
diff --git a/syntax/config.vim b/syntax/config.vim
index b7f891e22..3ba8138ea 100644
--- a/syntax/config.vim
+++ b/syntax/config.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'config')
+if has_key(g:polyglot_is_disabled, 'config')
   finish
 endif
 
diff --git a/syntax/cpp.vim b/syntax/cpp.vim
index b5991bfc8..991975836 100644
--- a/syntax/cpp.vim
+++ b/syntax/cpp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'c/c++')
+if has_key(g:polyglot_is_disabled, 'c/c++')
   finish
 endif
 
diff --git a/syntax/cql.vim b/syntax/cql.vim
index 6f6a7d5d5..8ae5109de 100644
--- a/syntax/cql.vim
+++ b/syntax/cql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cql')
+if has_key(g:polyglot_is_disabled, 'cql')
   finish
 endif
 
diff --git a/syntax/crm.vim b/syntax/crm.vim
index 020ab4d0b..64ef72c80 100644
--- a/syntax/crm.vim
+++ b/syntax/crm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crm')
+if has_key(g:polyglot_is_disabled, 'crm')
   finish
 endif
 
diff --git a/syntax/crontab.vim b/syntax/crontab.vim
index eaf28b259..f4d434c4c 100644
--- a/syntax/crontab.vim
+++ b/syntax/crontab.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crontab')
+if has_key(g:polyglot_is_disabled, 'crontab')
   finish
 endif
 
diff --git a/syntax/cryptol.vim b/syntax/cryptol.vim
index 76c3524fc..e1cef5a2b 100644
--- a/syntax/cryptol.vim
+++ b/syntax/cryptol.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cryptol')
+if has_key(g:polyglot_is_disabled, 'cryptol')
   finish
 endif
 
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index 866497d61..491431034 100644
--- a/syntax/crystal.vim
+++ b/syntax/crystal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/syntax/cs.vim b/syntax/cs.vim
index 42646884a..362c80f41 100644
--- a/syntax/cs.vim
+++ b/syntax/cs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cs')
+if has_key(g:polyglot_is_disabled, 'cs')
   finish
 endif
 
diff --git a/syntax/csc.vim b/syntax/csc.vim
index 90e866d1a..bcd6b9ce3 100644
--- a/syntax/csc.vim
+++ b/syntax/csc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'csc')
+if has_key(g:polyglot_is_disabled, 'csc')
   finish
 endif
 
diff --git a/syntax/csdl.vim b/syntax/csdl.vim
index 35d5df4c2..2625a07a2 100644
--- a/syntax/csdl.vim
+++ b/syntax/csdl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'csdl')
+if has_key(g:polyglot_is_disabled, 'csdl')
   finish
 endif
 
diff --git a/syntax/csp.vim b/syntax/csp.vim
index 1ade70a88..f1b34ed56 100644
--- a/syntax/csp.vim
+++ b/syntax/csp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'csp')
+if has_key(g:polyglot_is_disabled, 'csp')
   finish
 endif
 
diff --git a/syntax/css.vim b/syntax/css.vim
index 57976baa5..2d47b251b 100644
--- a/syntax/css.vim
+++ b/syntax/css.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'css')
+if has_key(g:polyglot_is_disabled, 'css')
   finish
 endif
 
diff --git a/syntax/csv.vim b/syntax/csv.vim
index 6ae4b8026..630337e27 100644
--- a/syntax/csv.vim
+++ b/syntax/csv.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'csv')
+if has_key(g:polyglot_is_disabled, 'csv')
   finish
 endif
 
diff --git a/syntax/cterm.vim b/syntax/cterm.vim
index 4c63fa6e8..26379dd8d 100644
--- a/syntax/cterm.vim
+++ b/syntax/cterm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cterm')
+if has_key(g:polyglot_is_disabled, 'cterm')
   finish
 endif
 
diff --git a/syntax/cucumber.vim b/syntax/cucumber.vim
index 5c32b25d5..6c51dcc08 100644
--- a/syntax/cucumber.vim
+++ b/syntax/cucumber.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cucumber')
+if has_key(g:polyglot_is_disabled, 'cucumber')
   finish
 endif
 
diff --git a/syntax/cuda.vim b/syntax/cuda.vim
index d3a6bd403..1fc1fdefc 100644
--- a/syntax/cuda.vim
+++ b/syntax/cuda.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cuda')
+if has_key(g:polyglot_is_disabled, 'cuda')
   finish
 endif
 
diff --git a/syntax/cuesheet.vim b/syntax/cuesheet.vim
index 7588e1930..aa80b215d 100644
--- a/syntax/cuesheet.vim
+++ b/syntax/cuesheet.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cue')
+if has_key(g:polyglot_is_disabled, 'cue')
   finish
 endif
 
diff --git a/syntax/cupl.vim b/syntax/cupl.vim
index 11ed7e0f9..a713304e7 100644
--- a/syntax/cupl.vim
+++ b/syntax/cupl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cupl')
+if has_key(g:polyglot_is_disabled, 'cupl')
   finish
 endif
 
diff --git a/syntax/cuplsim.vim b/syntax/cuplsim.vim
index a66c1dc82..979267913 100644
--- a/syntax/cuplsim.vim
+++ b/syntax/cuplsim.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cuplsim')
+if has_key(g:polyglot_is_disabled, 'cuplsim')
   finish
 endif
 
diff --git a/syntax/cvs.vim b/syntax/cvs.vim
index 1b1b24293..c33545153 100644
--- a/syntax/cvs.vim
+++ b/syntax/cvs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cvs')
+if has_key(g:polyglot_is_disabled, 'cvs')
   finish
 endif
 
diff --git a/syntax/cvsrc.vim b/syntax/cvsrc.vim
index 40944a23f..c685912d4 100644
--- a/syntax/cvsrc.vim
+++ b/syntax/cvsrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cvsrc')
+if has_key(g:polyglot_is_disabled, 'cvsrc')
   finish
 endif
 
diff --git a/syntax/cynpp.vim b/syntax/cynpp.vim
index 12e96d604..bcf1d2ae7 100644
--- a/syntax/cynpp.vim
+++ b/syntax/cynpp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'cynpp')
+if has_key(g:polyglot_is_disabled, 'cynpp')
   finish
 endif
 
diff --git a/syntax/d.vim b/syntax/d.vim
index 469913803..0d8c096a6 100644
--- a/syntax/d.vim
+++ b/syntax/d.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dlang')
+if has_key(g:polyglot_is_disabled, 'dlang')
   finish
 endif
 
diff --git a/syntax/dart.vim b/syntax/dart.vim
index f337fd3de..5b503dad1 100644
--- a/syntax/dart.vim
+++ b/syntax/dart.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dart')
+if has_key(g:polyglot_is_disabled, 'dart')
   finish
 endif
 
diff --git a/syntax/datascript.vim b/syntax/datascript.vim
index 40668cdd9..2fb545f49 100644
--- a/syntax/datascript.vim
+++ b/syntax/datascript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'datascript')
+if has_key(g:polyglot_is_disabled, 'datascript')
   finish
 endif
 
diff --git a/syntax/dcd.vim b/syntax/dcd.vim
index 5399fee1e..e2c1f03b5 100644
--- a/syntax/dcd.vim
+++ b/syntax/dcd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dcd')
+if has_key(g:polyglot_is_disabled, 'dcd')
   finish
 endif
 
diff --git a/syntax/dcov.vim b/syntax/dcov.vim
index b7733fdd2..14b99882f 100644
--- a/syntax/dcov.vim
+++ b/syntax/dcov.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dlang')
+if has_key(g:polyglot_is_disabled, 'dlang')
   finish
 endif
 
diff --git a/syntax/dd.vim b/syntax/dd.vim
index 924cf79a9..a289b552e 100644
--- a/syntax/dd.vim
+++ b/syntax/dd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dlang')
+if has_key(g:polyglot_is_disabled, 'dlang')
   finish
 endif
 
diff --git a/syntax/ddoc.vim b/syntax/ddoc.vim
index 3e1da3679..b8e746806 100644
--- a/syntax/ddoc.vim
+++ b/syntax/ddoc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dlang')
+if has_key(g:polyglot_is_disabled, 'dlang')
   finish
 endif
 
diff --git a/syntax/debchangelog.vim b/syntax/debchangelog.vim
index dacbe619b..b4214ca93 100644
--- a/syntax/debchangelog.vim
+++ b/syntax/debchangelog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'debchangelog')
+if has_key(g:polyglot_is_disabled, 'debchangelog')
   finish
 endif
 
diff --git a/syntax/debcontrol.vim b/syntax/debcontrol.vim
index 3ad42c3bf..13d41a229 100644
--- a/syntax/debcontrol.vim
+++ b/syntax/debcontrol.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'debcontrol')
+if has_key(g:polyglot_is_disabled, 'debcontrol')
   finish
 endif
 
diff --git a/syntax/debcopyright.vim b/syntax/debcopyright.vim
index a09ecdc20..82c4f1fa3 100644
--- a/syntax/debcopyright.vim
+++ b/syntax/debcopyright.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'debcopyright')
+if has_key(g:polyglot_is_disabled, 'debcopyright')
   finish
 endif
 
diff --git a/syntax/debsources.vim b/syntax/debsources.vim
index 94ee69b59..eaaa4f6e0 100644
--- a/syntax/debsources.vim
+++ b/syntax/debsources.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'debsources')
+if has_key(g:polyglot_is_disabled, 'debsources')
   finish
 endif
 
diff --git a/syntax/def.vim b/syntax/def.vim
index 7cb4175d8..f4a4719b3 100644
--- a/syntax/def.vim
+++ b/syntax/def.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'def')
+if has_key(g:polyglot_is_disabled, 'def')
   finish
 endif
 
diff --git a/syntax/denyhosts.vim b/syntax/denyhosts.vim
index b79e6820e..e4958937e 100644
--- a/syntax/denyhosts.vim
+++ b/syntax/denyhosts.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'denyhosts')
+if has_key(g:polyglot_is_disabled, 'denyhosts')
   finish
 endif
 
diff --git a/syntax/desc.vim b/syntax/desc.vim
index 9ca33453b..1912b88ce 100644
--- a/syntax/desc.vim
+++ b/syntax/desc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'desc')
+if has_key(g:polyglot_is_disabled, 'desc')
   finish
 endif
 
diff --git a/syntax/desktop.vim b/syntax/desktop.vim
index 0b5626611..f676005d6 100644
--- a/syntax/desktop.vim
+++ b/syntax/desktop.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'desktop')
+if has_key(g:polyglot_is_disabled, 'desktop')
   finish
 endif
 
diff --git a/syntax/dhall.vim b/syntax/dhall.vim
index 12b9fa764..d3ad098a7 100644
--- a/syntax/dhall.vim
+++ b/syntax/dhall.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dhall')
+if has_key(g:polyglot_is_disabled, 'dhall')
   finish
 endif
 
diff --git a/syntax/dictconf.vim b/syntax/dictconf.vim
index 67db8bd6d..6d8e51ae5 100644
--- a/syntax/dictconf.vim
+++ b/syntax/dictconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dictconf')
+if has_key(g:polyglot_is_disabled, 'dictconf')
   finish
 endif
 
diff --git a/syntax/dictdconf.vim b/syntax/dictdconf.vim
index cfea1c5dc..e7e6ad81b 100644
--- a/syntax/dictdconf.vim
+++ b/syntax/dictdconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dictdconf')
+if has_key(g:polyglot_is_disabled, 'dictdconf')
   finish
 endif
 
diff --git a/syntax/diff.vim b/syntax/diff.vim
index 5d614ef81..a11a58aed 100644
--- a/syntax/diff.vim
+++ b/syntax/diff.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'diff')
+if has_key(g:polyglot_is_disabled, 'diff')
   finish
 endif
 
diff --git a/syntax/dircolors.vim b/syntax/dircolors.vim
index 2f2c1884a..004da62ce 100644
--- a/syntax/dircolors.vim
+++ b/syntax/dircolors.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dircolors')
+if has_key(g:polyglot_is_disabled, 'dircolors')
   finish
 endif
 
diff --git a/syntax/django.vim b/syntax/django.vim
index e5e0a922d..8e30c58b7 100644
--- a/syntax/django.vim
+++ b/syntax/django.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'htmldjango')
+if has_key(g:polyglot_is_disabled, 'htmldjango')
   finish
 endif
 
diff --git a/syntax/dnsmasq.vim b/syntax/dnsmasq.vim
index 4dcd92e1f..6661e7a0c 100644
--- a/syntax/dnsmasq.vim
+++ b/syntax/dnsmasq.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dnsmasq')
+if has_key(g:polyglot_is_disabled, 'dnsmasq')
   finish
 endif
 
diff --git a/syntax/docker-compose.vim b/syntax/docker-compose.vim
index 2c063a930..4f42848f9 100644
--- a/syntax/docker-compose.vim
+++ b/syntax/docker-compose.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'docker-compose')
+if has_key(g:polyglot_is_disabled, 'docker-compose')
   finish
 endif
 
diff --git a/syntax/dockerfile.vim b/syntax/dockerfile.vim
index 5360f0f1a..b96adbf1a 100644
--- a/syntax/dockerfile.vim
+++ b/syntax/dockerfile.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dockerfile')
+if has_key(g:polyglot_is_disabled, 'dockerfile')
   finish
 endif
 
diff --git a/syntax/dosbatch.vim b/syntax/dosbatch.vim
index 8f8e0221e..55ac95569 100644
--- a/syntax/dosbatch.vim
+++ b/syntax/dosbatch.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dosbatch')
+if has_key(g:polyglot_is_disabled, 'dosbatch')
   finish
 endif
 
diff --git a/syntax/dosini.vim b/syntax/dosini.vim
index 1af9399a4..434bf6c2e 100644
--- a/syntax/dosini.vim
+++ b/syntax/dosini.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dosini')
+if has_key(g:polyglot_is_disabled, 'dosini')
   finish
 endif
 
diff --git a/syntax/dot.vim b/syntax/dot.vim
index 95cfde679..2c7226c19 100644
--- a/syntax/dot.vim
+++ b/syntax/dot.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dot')
+if has_key(g:polyglot_is_disabled, 'dot')
   finish
 endif
 
diff --git a/syntax/dracula.vim b/syntax/dracula.vim
index b1fbc9ace..eec9bd454 100644
--- a/syntax/dracula.vim
+++ b/syntax/dracula.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dracula')
+if has_key(g:polyglot_is_disabled, 'dracula')
   finish
 endif
 
diff --git a/syntax/dsdl.vim b/syntax/dsdl.vim
index c6a9373a6..93a1f72e2 100644
--- a/syntax/dsdl.vim
+++ b/syntax/dsdl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dlang')
+if has_key(g:polyglot_is_disabled, 'dlang')
   finish
 endif
 
diff --git a/syntax/dsl.vim b/syntax/dsl.vim
index 0a10dd402..b0ba3ae65 100644
--- a/syntax/dsl.vim
+++ b/syntax/dsl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dsl')
+if has_key(g:polyglot_is_disabled, 'dsl')
   finish
 endif
 
diff --git a/syntax/dtd.vim b/syntax/dtd.vim
index b6f937648..17ca5125e 100644
--- a/syntax/dtd.vim
+++ b/syntax/dtd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dtd')
+if has_key(g:polyglot_is_disabled, 'dtd')
   finish
 endif
 
diff --git a/syntax/dts.vim b/syntax/dts.vim
index 6a6d3948f..278b8c287 100644
--- a/syntax/dts.vim
+++ b/syntax/dts.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dts')
+if has_key(g:polyglot_is_disabled, 'dts')
   finish
 endif
 
diff --git a/syntax/dune.vim b/syntax/dune.vim
index dbab17325..dc1cd2600 100644
--- a/syntax/dune.vim
+++ b/syntax/dune.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/dylan.vim b/syntax/dylan.vim
index cc22c8f09..8b61f3bfa 100644
--- a/syntax/dylan.vim
+++ b/syntax/dylan.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dylan')
+if has_key(g:polyglot_is_disabled, 'dylan')
   finish
 endif
 
diff --git a/syntax/dylanintr.vim b/syntax/dylanintr.vim
index 4c049266e..66c6ac58b 100644
--- a/syntax/dylanintr.vim
+++ b/syntax/dylanintr.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dylanintr')
+if has_key(g:polyglot_is_disabled, 'dylanintr')
   finish
 endif
 
diff --git a/syntax/dylanlid.vim b/syntax/dylanlid.vim
index b8bb2b269..f96fbe19d 100644
--- a/syntax/dylanlid.vim
+++ b/syntax/dylanlid.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'dylanlid')
+if has_key(g:polyglot_is_disabled, 'dylanlid')
   finish
 endif
 
diff --git a/syntax/ecd.vim b/syntax/ecd.vim
index 2d2feb806..0348673e8 100644
--- a/syntax/ecd.vim
+++ b/syntax/ecd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ecd')
+if has_key(g:polyglot_is_disabled, 'ecd')
   finish
 endif
 
diff --git a/syntax/ecrystal.vim b/syntax/ecrystal.vim
index e44fcba6f..4e69fd760 100644
--- a/syntax/ecrystal.vim
+++ b/syntax/ecrystal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'crystal')
+if has_key(g:polyglot_is_disabled, 'crystal')
   finish
 endif
 
diff --git a/syntax/edif.vim b/syntax/edif.vim
index 418429112..9b2150f3c 100644
--- a/syntax/edif.vim
+++ b/syntax/edif.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'edif')
+if has_key(g:polyglot_is_disabled, 'edif')
   finish
 endif
 
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index 70671ee69..ac4dec43b 100644
--- a/syntax/eelixir.vim
+++ b/syntax/eelixir.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elixir')
+if has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/syntax/elf.vim b/syntax/elf.vim
index 1e0d7dddb..44343c55b 100644
--- a/syntax/elf.vim
+++ b/syntax/elf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elf')
+if has_key(g:polyglot_is_disabled, 'elf')
   finish
 endif
 
diff --git a/syntax/elinks.vim b/syntax/elinks.vim
index e968866e0..39543edef 100644
--- a/syntax/elinks.vim
+++ b/syntax/elinks.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elinks')
+if has_key(g:polyglot_is_disabled, 'elinks')
   finish
 endif
 
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index d612da48c..a155116a5 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elixir')
+if has_key(g:polyglot_is_disabled, 'elixir')
   finish
 endif
 
diff --git a/syntax/elm.vim b/syntax/elm.vim
index b655ff174..37a3e433e 100644
--- a/syntax/elm.vim
+++ b/syntax/elm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elm')
+if has_key(g:polyglot_is_disabled, 'elm')
   finish
 endif
 
diff --git a/syntax/elmfilt.vim b/syntax/elmfilt.vim
index cb2b5fc4d..6198ac5dc 100644
--- a/syntax/elmfilt.vim
+++ b/syntax/elmfilt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'elmfilt')
+if has_key(g:polyglot_is_disabled, 'elmfilt')
   finish
 endif
 
diff --git a/syntax/embeddedpuppet.vim b/syntax/embeddedpuppet.vim
index a99d85537..3dd97d308 100644
--- a/syntax/embeddedpuppet.vim
+++ b/syntax/embeddedpuppet.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'puppet')
+if has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/syntax/ember-script.vim b/syntax/ember-script.vim
index ed84783e8..585fa8356 100644
--- a/syntax/ember-script.vim
+++ b/syntax/ember-script.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'emberscript')
+if has_key(g:polyglot_is_disabled, 'emberscript')
   finish
 endif
 
diff --git a/syntax/emblem.vim b/syntax/emblem.vim
index be352a391..fb11af97a 100644
--- a/syntax/emblem.vim
+++ b/syntax/emblem.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'emblem')
+if has_key(g:polyglot_is_disabled, 'emblem')
   finish
 endif
 
diff --git a/syntax/erlang.vim b/syntax/erlang.vim
index 9ba63a789..784808213 100644
--- a/syntax/erlang.vim
+++ b/syntax/erlang.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'erlang')
+if has_key(g:polyglot_is_disabled, 'erlang')
   finish
 endif
 
diff --git a/syntax/eruby.vim b/syntax/eruby.vim
index 9dbc9264a..76776a0ed 100644
--- a/syntax/eruby.vim
+++ b/syntax/eruby.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ruby')
+if has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/syntax/esmtprc.vim b/syntax/esmtprc.vim
index 687d981ae..5f6f65f4d 100644
--- a/syntax/esmtprc.vim
+++ b/syntax/esmtprc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'esmtprc')
+if has_key(g:polyglot_is_disabled, 'esmtprc')
   finish
 endif
 
diff --git a/syntax/esqlc.vim b/syntax/esqlc.vim
index 48f7a2e3e..9fd8465c3 100644
--- a/syntax/esqlc.vim
+++ b/syntax/esqlc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'esqlc')
+if has_key(g:polyglot_is_disabled, 'esqlc')
   finish
 endif
 
diff --git a/syntax/esterel.vim b/syntax/esterel.vim
index 84ccfb437..0f2e8be14 100644
--- a/syntax/esterel.vim
+++ b/syntax/esterel.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'esterel')
+if has_key(g:polyglot_is_disabled, 'esterel')
   finish
 endif
 
diff --git a/syntax/eterm.vim b/syntax/eterm.vim
index 1da49675d..160f6874c 100644
--- a/syntax/eterm.vim
+++ b/syntax/eterm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'eterm')
+if has_key(g:polyglot_is_disabled, 'eterm')
   finish
 endif
 
diff --git a/syntax/exim.vim b/syntax/exim.vim
index 75e18e789..ccdf857d1 100644
--- a/syntax/exim.vim
+++ b/syntax/exim.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'exim')
+if has_key(g:polyglot_is_disabled, 'exim')
   finish
 endif
 
diff --git a/syntax/expect.vim b/syntax/expect.vim
index 1c397fa26..95a38e259 100644
--- a/syntax/expect.vim
+++ b/syntax/expect.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'expect')
+if has_key(g:polyglot_is_disabled, 'expect')
   finish
 endif
 
diff --git a/syntax/exports.vim b/syntax/exports.vim
index 25731dc23..0a89ee80d 100644
--- a/syntax/exports.vim
+++ b/syntax/exports.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'exports')
+if has_key(g:polyglot_is_disabled, 'exports')
   finish
 endif
 
diff --git a/syntax/falcon.vim b/syntax/falcon.vim
index ac71567be..212c7740f 100644
--- a/syntax/falcon.vim
+++ b/syntax/falcon.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'falcon')
+if has_key(g:polyglot_is_disabled, 'falcon')
   finish
 endif
 
diff --git a/syntax/fan.vim b/syntax/fan.vim
index 3e833710d..845fa9ec1 100644
--- a/syntax/fan.vim
+++ b/syntax/fan.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fan')
+if has_key(g:polyglot_is_disabled, 'fan')
   finish
 endif
 
diff --git a/syntax/fbs.vim b/syntax/fbs.vim
index c83b3fb8f..69b7a43e7 100644
--- a/syntax/fbs.vim
+++ b/syntax/fbs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'flatbuffers')
+if has_key(g:polyglot_is_disabled, 'flatbuffers')
   finish
 endif
 
diff --git a/syntax/fennel.vim b/syntax/fennel.vim
index a622754e8..4a427f45e 100644
--- a/syntax/fennel.vim
+++ b/syntax/fennel.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fennel')
+if has_key(g:polyglot_is_disabled, 'fennel')
   finish
 endif
 
diff --git a/syntax/ferm.vim b/syntax/ferm.vim
index f80f84356..1e642ed71 100644
--- a/syntax/ferm.vim
+++ b/syntax/ferm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ferm')
+if has_key(g:polyglot_is_disabled, 'ferm')
   finish
 endif
 
diff --git a/syntax/fetchmail.vim b/syntax/fetchmail.vim
index e1e5f18a6..4c3bdff1c 100644
--- a/syntax/fetchmail.vim
+++ b/syntax/fetchmail.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fetchmail')
+if has_key(g:polyglot_is_disabled, 'fetchmail')
   finish
 endif
 
diff --git a/syntax/fgl.vim b/syntax/fgl.vim
index 33c04842c..61284d6ce 100644
--- a/syntax/fgl.vim
+++ b/syntax/fgl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fgl')
+if has_key(g:polyglot_is_disabled, 'fgl')
   finish
 endif
 
diff --git a/syntax/fish.vim b/syntax/fish.vim
index 83fcdb365..22813ccb9 100644
--- a/syntax/fish.vim
+++ b/syntax/fish.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fish')
+if has_key(g:polyglot_is_disabled, 'fish')
   finish
 endif
 
diff --git a/syntax/flow.vim b/syntax/flow.vim
index 8ede56062..120bc3e48 100644
--- a/syntax/flow.vim
+++ b/syntax/flow.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'javascript')
+if has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/syntax/focexec.vim b/syntax/focexec.vim
index a595e9245..cbe6bd06e 100644
--- a/syntax/focexec.vim
+++ b/syntax/focexec.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'focexec')
+if has_key(g:polyglot_is_disabled, 'focexec')
   finish
 endif
 
diff --git a/syntax/forth.vim b/syntax/forth.vim
index 9c14ed310..5f2a5e0ef 100644
--- a/syntax/forth.vim
+++ b/syntax/forth.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'forth')
+if has_key(g:polyglot_is_disabled, 'forth')
   finish
 endif
 
diff --git a/syntax/fortran.vim b/syntax/fortran.vim
index 33af90516..10f2a2dc0 100644
--- a/syntax/fortran.vim
+++ b/syntax/fortran.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fortran')
+if has_key(g:polyglot_is_disabled, 'fortran')
   finish
 endif
 
diff --git a/syntax/framescript.vim b/syntax/framescript.vim
index bcc41b804..95dd6b903 100644
--- a/syntax/framescript.vim
+++ b/syntax/framescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'framescript')
+if has_key(g:polyglot_is_disabled, 'framescript')
   finish
 endif
 
diff --git a/syntax/freebasic.vim b/syntax/freebasic.vim
index ce6350f92..feb1f9746 100644
--- a/syntax/freebasic.vim
+++ b/syntax/freebasic.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'freebasic')
+if has_key(g:polyglot_is_disabled, 'freebasic')
   finish
 endif
 
diff --git a/syntax/fsharp.vim b/syntax/fsharp.vim
index 17c78eeba..954e5a258 100644
--- a/syntax/fsharp.vim
+++ b/syntax/fsharp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fsharp')
+if has_key(g:polyglot_is_disabled, 'fsharp')
   finish
 endif
 
diff --git a/syntax/fstab.vim b/syntax/fstab.vim
index f4d7a8b61..70b47c755 100644
--- a/syntax/fstab.vim
+++ b/syntax/fstab.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fstab')
+if has_key(g:polyglot_is_disabled, 'fstab')
   finish
 endif
 
diff --git a/syntax/fvwm.vim b/syntax/fvwm.vim
index 7ff6e349e..393e64090 100644
--- a/syntax/fvwm.vim
+++ b/syntax/fvwm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'fvwm')
+if has_key(g:polyglot_is_disabled, 'fvwm')
   finish
 endif
 
diff --git a/syntax/gdb.vim b/syntax/gdb.vim
index b752b763f..58846d49e 100644
--- a/syntax/gdb.vim
+++ b/syntax/gdb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gdb')
+if has_key(g:polyglot_is_disabled, 'gdb')
   finish
 endif
 
diff --git a/syntax/gdmo.vim b/syntax/gdmo.vim
index 129ef5765..1fade76f4 100644
--- a/syntax/gdmo.vim
+++ b/syntax/gdmo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gdmo')
+if has_key(g:polyglot_is_disabled, 'gdmo')
   finish
 endif
 
diff --git a/syntax/gdscript3.vim b/syntax/gdscript3.vim
index c5a14154d..4edae3047 100644
--- a/syntax/gdscript3.vim
+++ b/syntax/gdscript3.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gdscript')
+if has_key(g:polyglot_is_disabled, 'gdscript')
   finish
 endif
 
diff --git a/syntax/gedcom.vim b/syntax/gedcom.vim
index 49a98aa3d..d2345adbd 100644
--- a/syntax/gedcom.vim
+++ b/syntax/gedcom.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gedcom')
+if has_key(g:polyglot_is_disabled, 'gedcom')
   finish
 endif
 
diff --git a/syntax/git.vim b/syntax/git.vim
index da953d5e2..94ca7d04a 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'git')
+if has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index 36fb3cda5..b0f9c3718 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'git')
+if has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/syntax/gitconfig.vim b/syntax/gitconfig.vim
index 402aa3dc3..f8781c9de 100644
--- a/syntax/gitconfig.vim
+++ b/syntax/gitconfig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'git')
+if has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/syntax/gitignore.vim b/syntax/gitignore.vim
index 16021dd2b..b93fe0e14 100644
--- a/syntax/gitignore.vim
+++ b/syntax/gitignore.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gitignore')
+if has_key(g:polyglot_is_disabled, 'gitignore')
   finish
 endif
 
diff --git a/syntax/gitolite.vim b/syntax/gitolite.vim
index 377d32b36..ac47f74f1 100644
--- a/syntax/gitolite.vim
+++ b/syntax/gitolite.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gitolite')
+if has_key(g:polyglot_is_disabled, 'gitolite')
   finish
 endif
 
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index 5a4ec9138..0d2249261 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/gitrebase.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'git')
+if has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/syntax/gitsendemail.vim b/syntax/gitsendemail.vim
index 36205c37b..5bd395869 100644
--- a/syntax/gitsendemail.vim
+++ b/syntax/gitsendemail.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'git')
+if has_key(g:polyglot_is_disabled, 'git')
   finish
 endif
 
diff --git a/syntax/gkrellmrc.vim b/syntax/gkrellmrc.vim
index da1483af3..b9a591f86 100644
--- a/syntax/gkrellmrc.vim
+++ b/syntax/gkrellmrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gkrellmrc')
+if has_key(g:polyglot_is_disabled, 'gkrellmrc')
   finish
 endif
 
diff --git a/syntax/glsl.vim b/syntax/glsl.vim
index e911f6042..0760f46ea 100644
--- a/syntax/glsl.vim
+++ b/syntax/glsl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'glsl')
+if has_key(g:polyglot_is_disabled, 'glsl')
   finish
 endif
 
diff --git a/syntax/gmpl.vim b/syntax/gmpl.vim
index afcfc9f69..9d8968ed3 100644
--- a/syntax/gmpl.vim
+++ b/syntax/gmpl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gmpl')
+if has_key(g:polyglot_is_disabled, 'gmpl')
   finish
 endif
 
diff --git a/syntax/gnash.vim b/syntax/gnash.vim
index 72d3dac72..d3de61d45 100644
--- a/syntax/gnash.vim
+++ b/syntax/gnash.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gnash')
+if has_key(g:polyglot_is_disabled, 'gnash')
   finish
 endif
 
diff --git a/syntax/gnuplot.vim b/syntax/gnuplot.vim
index 66f4e0ec3..f66c87d43 100644
--- a/syntax/gnuplot.vim
+++ b/syntax/gnuplot.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gnuplot')
+if has_key(g:polyglot_is_disabled, 'gnuplot')
   finish
 endif
 
diff --git a/syntax/go.vim b/syntax/go.vim
index 249dcee73..de92c5d6c 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/godebugoutput.vim b/syntax/godebugoutput.vim
index 973693ec4..02ea81fdd 100644
--- a/syntax/godebugoutput.vim
+++ b/syntax/godebugoutput.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/godebugstacktrace.vim b/syntax/godebugstacktrace.vim
index d0f8ef3fb..890b895f6 100644
--- a/syntax/godebugstacktrace.vim
+++ b/syntax/godebugstacktrace.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/godebugvariables.vim b/syntax/godebugvariables.vim
index 53ae8f6b5..9ab2fc3ca 100644
--- a/syntax/godebugvariables.vim
+++ b/syntax/godebugvariables.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/godefstack.vim b/syntax/godefstack.vim
index 7fd734051..bb277ac5e 100644
--- a/syntax/godefstack.vim
+++ b/syntax/godefstack.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/gohtmltmpl.vim b/syntax/gohtmltmpl.vim
index ae3b3e995..590d5b741 100644
--- a/syntax/gohtmltmpl.vim
+++ b/syntax/gohtmltmpl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/gomod.vim b/syntax/gomod.vim
index be365be3f..358e3b516 100644
--- a/syntax/gomod.vim
+++ b/syntax/gomod.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/gotexttmpl.vim b/syntax/gotexttmpl.vim
index 10867dc3c..72d72ac17 100644
--- a/syntax/gotexttmpl.vim
+++ b/syntax/gotexttmpl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/gp.vim b/syntax/gp.vim
index f870ed1f6..3dd08aef8 100644
--- a/syntax/gp.vim
+++ b/syntax/gp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gp')
+if has_key(g:polyglot_is_disabled, 'gp')
   finish
 endif
 
diff --git a/syntax/gpg.vim b/syntax/gpg.vim
index a9125e3d8..99743183a 100644
--- a/syntax/gpg.vim
+++ b/syntax/gpg.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gpg')
+if has_key(g:polyglot_is_disabled, 'gpg')
   finish
 endif
 
diff --git a/syntax/grads.vim b/syntax/grads.vim
index b0b406b0b..23caea217 100644
--- a/syntax/grads.vim
+++ b/syntax/grads.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'grads')
+if has_key(g:polyglot_is_disabled, 'grads')
   finish
 endif
 
diff --git a/syntax/graphql.vim b/syntax/graphql.vim
index c47a8036c..a41f82514 100644
--- a/syntax/graphql.vim
+++ b/syntax/graphql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'graphql')
+if has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/syntax/gretl.vim b/syntax/gretl.vim
index f7e098f07..26f28c653 100644
--- a/syntax/gretl.vim
+++ b/syntax/gretl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gretl')
+if has_key(g:polyglot_is_disabled, 'gretl')
   finish
 endif
 
diff --git a/syntax/groovy.vim b/syntax/groovy.vim
index e24d9fbb3..8f644431a 100644
--- a/syntax/groovy.vim
+++ b/syntax/groovy.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'groovy')
+if has_key(g:polyglot_is_disabled, 'groovy')
   finish
 endif
 
diff --git a/syntax/group.vim b/syntax/group.vim
index 144ec1266..f9c626831 100644
--- a/syntax/group.vim
+++ b/syntax/group.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'group')
+if has_key(g:polyglot_is_disabled, 'group')
   finish
 endif
 
diff --git a/syntax/grub.vim b/syntax/grub.vim
index ec70e514d..1af73eb02 100644
--- a/syntax/grub.vim
+++ b/syntax/grub.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'grub')
+if has_key(g:polyglot_is_disabled, 'grub')
   finish
 endif
 
diff --git a/syntax/gsl.vim b/syntax/gsl.vim
index a83fbbe83..b3bfb9bf0 100644
--- a/syntax/gsl.vim
+++ b/syntax/gsl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gdscript')
+if has_key(g:polyglot_is_disabled, 'gdscript')
   finish
 endif
 
diff --git a/syntax/gsp.vim b/syntax/gsp.vim
index a8ca520a0..fa9f8dfa5 100644
--- a/syntax/gsp.vim
+++ b/syntax/gsp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gsp')
+if has_key(g:polyglot_is_disabled, 'gsp')
   finish
 endif
 
diff --git a/syntax/gtkrc.vim b/syntax/gtkrc.vim
index 1ad0ef0a2..852203bd9 100644
--- a/syntax/gtkrc.vim
+++ b/syntax/gtkrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'gtkrc')
+if has_key(g:polyglot_is_disabled, 'gtkrc')
   finish
 endif
 
diff --git a/syntax/haml.vim b/syntax/haml.vim
index 8cac3c6bc..9585fdcff 100644
--- a/syntax/haml.vim
+++ b/syntax/haml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haml')
+if has_key(g:polyglot_is_disabled, 'haml')
   finish
 endif
 
diff --git a/syntax/hamster.vim b/syntax/hamster.vim
index 14ee8eb42..70cf2da03 100644
--- a/syntax/hamster.vim
+++ b/syntax/hamster.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hamster')
+if has_key(g:polyglot_is_disabled, 'hamster')
   finish
 endif
 
diff --git a/syntax/handlebars.vim b/syntax/handlebars.vim
index c56a9aa4f..f41927c75 100644
--- a/syntax/handlebars.vim
+++ b/syntax/handlebars.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'handlebars')
+if has_key(g:polyglot_is_disabled, 'handlebars')
   finish
 endif
 
diff --git a/syntax/haproxy.vim b/syntax/haproxy.vim
index 41cdc8606..81777b3cf 100644
--- a/syntax/haproxy.vim
+++ b/syntax/haproxy.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haproxy')
+if has_key(g:polyglot_is_disabled, 'haproxy')
   finish
 endif
 
diff --git a/syntax/haskell.vim b/syntax/haskell.vim
index 786eb3c6f..97b36074d 100644
--- a/syntax/haskell.vim
+++ b/syntax/haskell.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haskell')
+if has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/syntax/haste.vim b/syntax/haste.vim
index 0133f29a1..8f29eacb8 100644
--- a/syntax/haste.vim
+++ b/syntax/haste.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haste')
+if has_key(g:polyglot_is_disabled, 'haste')
   finish
 endif
 
diff --git a/syntax/hastepreproc.vim b/syntax/hastepreproc.vim
index 61631aaf8..31b44ee61 100644
--- a/syntax/hastepreproc.vim
+++ b/syntax/hastepreproc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hastepreproc')
+if has_key(g:polyglot_is_disabled, 'hastepreproc')
   finish
 endif
 
diff --git a/syntax/haxe.vim b/syntax/haxe.vim
index a78271a51..495ff6c72 100644
--- a/syntax/haxe.vim
+++ b/syntax/haxe.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'haxe')
+if has_key(g:polyglot_is_disabled, 'haxe')
   finish
 endif
 
diff --git a/syntax/hb.vim b/syntax/hb.vim
index 81bb1b043..987f85eca 100644
--- a/syntax/hb.vim
+++ b/syntax/hb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hb')
+if has_key(g:polyglot_is_disabled, 'hb')
   finish
 endif
 
diff --git a/syntax/hcl.vim b/syntax/hcl.vim
index 3dde1b54c..c0b004d5d 100644
--- a/syntax/hcl.vim
+++ b/syntax/hcl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hcl')
+if has_key(g:polyglot_is_disabled, 'hcl')
   finish
 endif
 
diff --git a/syntax/helm.vim b/syntax/helm.vim
index 4cafa0092..79e02dadb 100644
--- a/syntax/helm.vim
+++ b/syntax/helm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'helm')
+if has_key(g:polyglot_is_disabled, 'helm')
   finish
 endif
 
diff --git a/syntax/help.vim b/syntax/help.vim
index e5e618dc9..52e34dce4 100644
--- a/syntax/help.vim
+++ b/syntax/help.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'help')
+if has_key(g:polyglot_is_disabled, 'help')
   finish
 endif
 
diff --git a/syntax/hercules.vim b/syntax/hercules.vim
index 1588de8bc..671c8a0b1 100644
--- a/syntax/hercules.vim
+++ b/syntax/hercules.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hercules')
+if has_key(g:polyglot_is_disabled, 'hercules')
   finish
 endif
 
diff --git a/syntax/hex.vim b/syntax/hex.vim
index 36b3bbdd3..6808720b0 100644
--- a/syntax/hex.vim
+++ b/syntax/hex.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hex')
+if has_key(g:polyglot_is_disabled, 'hex')
   finish
 endif
 
diff --git a/syntax/hgcommit.vim b/syntax/hgcommit.vim
index f294b0865..eda6d63e6 100644
--- a/syntax/hgcommit.vim
+++ b/syntax/hgcommit.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hgcommit')
+if has_key(g:polyglot_is_disabled, 'hgcommit')
   finish
 endif
 
diff --git a/syntax/hive.vim b/syntax/hive.vim
index 85fd8cb88..e2358f367 100644
--- a/syntax/hive.vim
+++ b/syntax/hive.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hive')
+if has_key(g:polyglot_is_disabled, 'hive')
   finish
 endif
 
diff --git a/syntax/hog.vim b/syntax/hog.vim
index 4a44d6eb9..b967ad7fa 100644
--- a/syntax/hog.vim
+++ b/syntax/hog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hog')
+if has_key(g:polyglot_is_disabled, 'hog')
   finish
 endif
 
diff --git a/syntax/hollywood.vim b/syntax/hollywood.vim
index 291291f48..c44676e6e 100644
--- a/syntax/hollywood.vim
+++ b/syntax/hollywood.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hollywood')
+if has_key(g:polyglot_is_disabled, 'hollywood')
   finish
 endif
 
diff --git a/syntax/hostconf.vim b/syntax/hostconf.vim
index 01ed2fae1..56a6a69f5 100644
--- a/syntax/hostconf.vim
+++ b/syntax/hostconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hostconf')
+if has_key(g:polyglot_is_disabled, 'hostconf')
   finish
 endif
 
diff --git a/syntax/hostsaccess.vim b/syntax/hostsaccess.vim
index 91aa131a9..43f45e9ab 100644
--- a/syntax/hostsaccess.vim
+++ b/syntax/hostsaccess.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'hostsaccess')
+if has_key(g:polyglot_is_disabled, 'hostsaccess')
   finish
 endif
 
diff --git a/syntax/html.vim b/syntax/html.vim
index ed3b61f15..37c03c45c 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'html')
+if has_key(g:polyglot_is_disabled, 'html')
   finish
 endif
 
diff --git a/syntax/htmldjango.vim b/syntax/htmldjango.vim
index c29c081e0..d70607579 100644
--- a/syntax/htmldjango.vim
+++ b/syntax/htmldjango.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'htmldjango')
+if has_key(g:polyglot_is_disabled, 'htmldjango')
   finish
 endif
 
diff --git a/syntax/htmlm4.vim b/syntax/htmlm4.vim
index 415f74569..b2c8002a4 100644
--- a/syntax/htmlm4.vim
+++ b/syntax/htmlm4.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'htmlm4')
+if has_key(g:polyglot_is_disabled, 'htmlm4')
   finish
 endif
 
diff --git a/syntax/i3config.vim b/syntax/i3config.vim
index 3fee98609..f14cec52a 100644
--- a/syntax/i3config.vim
+++ b/syntax/i3config.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'i3')
+if has_key(g:polyglot_is_disabled, 'i3')
   finish
 endif
 
diff --git a/syntax/ibasic.vim b/syntax/ibasic.vim
index 4e8dc07c2..c7a36432c 100644
--- a/syntax/ibasic.vim
+++ b/syntax/ibasic.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ibasic')
+if has_key(g:polyglot_is_disabled, 'ibasic')
   finish
 endif
 
diff --git a/syntax/icalendar.vim b/syntax/icalendar.vim
index 3792a7131..30a701831 100644
--- a/syntax/icalendar.vim
+++ b/syntax/icalendar.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'icalendar')
+if has_key(g:polyglot_is_disabled, 'icalendar')
   finish
 endif
 
diff --git a/syntax/icemenu.vim b/syntax/icemenu.vim
index 8c61c8b77..0e93a656d 100644
--- a/syntax/icemenu.vim
+++ b/syntax/icemenu.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'icemenu')
+if has_key(g:polyglot_is_disabled, 'icemenu')
   finish
 endif
 
diff --git a/syntax/icon.vim b/syntax/icon.vim
index ff2c11daa..c19f5b52f 100644
--- a/syntax/icon.vim
+++ b/syntax/icon.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'icon')
+if has_key(g:polyglot_is_disabled, 'icon')
   finish
 endif
 
diff --git a/syntax/idris.vim b/syntax/idris.vim
index b0b04850c..b909adb5d 100644
--- a/syntax/idris.vim
+++ b/syntax/idris.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'idris')
+if has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/syntax/idris2.vim b/syntax/idris2.vim
index db1f6ea75..1c7d800c4 100644
--- a/syntax/idris2.vim
+++ b/syntax/idris2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'idris2')
+if has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/syntax/indent.vim b/syntax/indent.vim
index 7a4d5e91c..141eabf96 100644
--- a/syntax/indent.vim
+++ b/syntax/indent.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'indent')
+if has_key(g:polyglot_is_disabled, 'indent')
   finish
 endif
 
diff --git a/syntax/inform.vim b/syntax/inform.vim
index 2345e18bd..0ae47e484 100644
--- a/syntax/inform.vim
+++ b/syntax/inform.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'inform')
+if has_key(g:polyglot_is_disabled, 'inform')
   finish
 endif
 
diff --git a/syntax/initng.vim b/syntax/initng.vim
index 99541758e..34deba5d7 100644
--- a/syntax/initng.vim
+++ b/syntax/initng.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'initng')
+if has_key(g:polyglot_is_disabled, 'initng')
   finish
 endif
 
diff --git a/syntax/inittab.vim b/syntax/inittab.vim
index 72348a2f1..aef4453cd 100644
--- a/syntax/inittab.vim
+++ b/syntax/inittab.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'inittab')
+if has_key(g:polyglot_is_disabled, 'inittab')
   finish
 endif
 
diff --git a/syntax/ion.vim b/syntax/ion.vim
index 2b2706082..b5d70f091 100644
--- a/syntax/ion.vim
+++ b/syntax/ion.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ion')
+if has_key(g:polyglot_is_disabled, 'ion')
   finish
 endif
 
diff --git a/syntax/ipfilter.vim b/syntax/ipfilter.vim
index 7882eac6a..153a2f919 100644
--- a/syntax/ipfilter.vim
+++ b/syntax/ipfilter.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ipfilter')
+if has_key(g:polyglot_is_disabled, 'ipfilter')
   finish
 endif
 
diff --git a/syntax/iss.vim b/syntax/iss.vim
index d709bc2f1..72eaaab06 100644
--- a/syntax/iss.vim
+++ b/syntax/iss.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'iss')
+if has_key(g:polyglot_is_disabled, 'iss')
   finish
 endif
 
diff --git a/syntax/ist.vim b/syntax/ist.vim
index 433fcea70..6b17a3552 100644
--- a/syntax/ist.vim
+++ b/syntax/ist.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ist')
+if has_key(g:polyglot_is_disabled, 'ist')
   finish
 endif
 
diff --git a/syntax/j.vim b/syntax/j.vim
index 074555539..3021824c0 100644
--- a/syntax/j.vim
+++ b/syntax/j.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'j')
+if has_key(g:polyglot_is_disabled, 'j')
   finish
 endif
 
diff --git a/syntax/jal.vim b/syntax/jal.vim
index efb2d4364..2205161c4 100644
--- a/syntax/jal.vim
+++ b/syntax/jal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jal')
+if has_key(g:polyglot_is_disabled, 'jal')
   finish
 endif
 
diff --git a/syntax/jam.vim b/syntax/jam.vim
index 33532601c..218a2e193 100644
--- a/syntax/jam.vim
+++ b/syntax/jam.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jam')
+if has_key(g:polyglot_is_disabled, 'jam')
   finish
 endif
 
diff --git a/syntax/java.vim b/syntax/java.vim
index bef8f40e2..410d2c0ef 100644
--- a/syntax/java.vim
+++ b/syntax/java.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'java')
+if has_key(g:polyglot_is_disabled, 'java')
   finish
 endif
 
diff --git a/syntax/javacc.vim b/syntax/javacc.vim
index 83e344868..417a3fb70 100644
--- a/syntax/javacc.vim
+++ b/syntax/javacc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'javacc')
+if has_key(g:polyglot_is_disabled, 'javacc')
   finish
 endif
 
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 823eec2ec..f68fa0569 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'javascript')
+if has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/syntax/jess.vim b/syntax/jess.vim
index 8f14dff63..00d3938f4 100644
--- a/syntax/jess.vim
+++ b/syntax/jess.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jess')
+if has_key(g:polyglot_is_disabled, 'jess')
   finish
 endif
 
diff --git a/syntax/jgraph.vim b/syntax/jgraph.vim
index 32ec93520..68131379b 100644
--- a/syntax/jgraph.vim
+++ b/syntax/jgraph.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jgraph')
+if has_key(g:polyglot_is_disabled, 'jgraph')
   finish
 endif
 
diff --git a/syntax/jinja2.vim b/syntax/jinja2.vim
index f7ca3ad4a..fda258bcc 100644
--- a/syntax/jinja2.vim
+++ b/syntax/jinja2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ansible')
+if has_key(g:polyglot_is_disabled, 'ansible')
   finish
 endif
 
diff --git a/syntax/jovial.vim b/syntax/jovial.vim
index 745473011..9411e2506 100644
--- a/syntax/jovial.vim
+++ b/syntax/jovial.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jovial')
+if has_key(g:polyglot_is_disabled, 'jovial')
   finish
 endif
 
diff --git a/syntax/jproperties.vim b/syntax/jproperties.vim
index f4edfd93d..3a0448559 100644
--- a/syntax/jproperties.vim
+++ b/syntax/jproperties.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jproperties')
+if has_key(g:polyglot_is_disabled, 'jproperties')
   finish
 endif
 
diff --git a/syntax/jq.vim b/syntax/jq.vim
index 1597620cb..78c260b2b 100644
--- a/syntax/jq.vim
+++ b/syntax/jq.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jq')
+if has_key(g:polyglot_is_disabled, 'jq')
   finish
 endif
 
diff --git a/syntax/json.vim b/syntax/json.vim
index 5f988ca82..b41bd3072 100644
--- a/syntax/json.vim
+++ b/syntax/json.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'json')
+if has_key(g:polyglot_is_disabled, 'json')
   finish
 endif
 
diff --git a/syntax/json5.vim b/syntax/json5.vim
index a64982682..3ed1e37a8 100644
--- a/syntax/json5.vim
+++ b/syntax/json5.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'json5')
+if has_key(g:polyglot_is_disabled, 'json5')
   finish
 endif
 
diff --git a/syntax/jsonnet.vim b/syntax/jsonnet.vim
index 54dfa2d79..6f23fe2e3 100644
--- a/syntax/jsonnet.vim
+++ b/syntax/jsonnet.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsonnet')
+if has_key(g:polyglot_is_disabled, 'jsonnet')
   finish
 endif
 
diff --git a/syntax/jsp.vim b/syntax/jsp.vim
index 221b7a70d..7c2a9241b 100644
--- a/syntax/jsp.vim
+++ b/syntax/jsp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jsp')
+if has_key(g:polyglot_is_disabled, 'jsp')
   finish
 endif
 
diff --git a/syntax/jst.vim b/syntax/jst.vim
index 907b30316..4a601f9f4 100644
--- a/syntax/jst.vim
+++ b/syntax/jst.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'jst')
+if has_key(g:polyglot_is_disabled, 'jst')
   finish
 endif
 
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 1d0c805b5..3ce275c83 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'julia')
+if has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/syntax/juliadoc.vim b/syntax/juliadoc.vim
index 29c9e317a..051a934b1 100644
--- a/syntax/juliadoc.vim
+++ b/syntax/juliadoc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'julia')
+if has_key(g:polyglot_is_disabled, 'julia')
   finish
 endif
 
diff --git a/syntax/kconfig.vim b/syntax/kconfig.vim
index 933d32f82..156168ec8 100644
--- a/syntax/kconfig.vim
+++ b/syntax/kconfig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'kconfig')
+if has_key(g:polyglot_is_disabled, 'kconfig')
   finish
 endif
 
diff --git a/syntax/kivy.vim b/syntax/kivy.vim
index 808f6c84b..0b5f4a143 100644
--- a/syntax/kivy.vim
+++ b/syntax/kivy.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'kivy')
+if has_key(g:polyglot_is_disabled, 'kivy')
   finish
 endif
 
diff --git a/syntax/kix.vim b/syntax/kix.vim
index 50d135c99..0f39c838e 100644
--- a/syntax/kix.vim
+++ b/syntax/kix.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'kix')
+if has_key(g:polyglot_is_disabled, 'kix')
   finish
 endif
 
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index 51f3a4033..bc7c900f9 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'kotlin')
+if has_key(g:polyglot_is_disabled, 'kotlin')
   finish
 endif
 
diff --git a/syntax/kscript.vim b/syntax/kscript.vim
index 8228cc201..46b1a222e 100644
--- a/syntax/kscript.vim
+++ b/syntax/kscript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'kscript')
+if has_key(g:polyglot_is_disabled, 'kscript')
   finish
 endif
 
diff --git a/syntax/kwt.vim b/syntax/kwt.vim
index 116c2fa03..2f990d216 100644
--- a/syntax/kwt.vim
+++ b/syntax/kwt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'kwt')
+if has_key(g:polyglot_is_disabled, 'kwt')
   finish
 endif
 
diff --git a/syntax/lace.vim b/syntax/lace.vim
index e42693d0c..e09e9438e 100644
--- a/syntax/lace.vim
+++ b/syntax/lace.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lace')
+if has_key(g:polyglot_is_disabled, 'lace')
   finish
 endif
 
diff --git a/syntax/latte.vim b/syntax/latte.vim
index 55708431e..f1fb4d839 100644
--- a/syntax/latte.vim
+++ b/syntax/latte.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'latte')
+if has_key(g:polyglot_is_disabled, 'latte')
   finish
 endif
 
diff --git a/syntax/ld.vim b/syntax/ld.vim
index 37cb698e9..5043b7b2f 100644
--- a/syntax/ld.vim
+++ b/syntax/ld.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ld')
+if has_key(g:polyglot_is_disabled, 'ld')
   finish
 endif
 
diff --git a/syntax/ldif.vim b/syntax/ldif.vim
index 01ee2cd57..79c1480fa 100644
--- a/syntax/ldif.vim
+++ b/syntax/ldif.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ldif')
+if has_key(g:polyglot_is_disabled, 'ldif')
   finish
 endif
 
diff --git a/syntax/ledger.vim b/syntax/ledger.vim
index d3758d84a..dc42a01a8 100644
--- a/syntax/ledger.vim
+++ b/syntax/ledger.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ledger')
+if has_key(g:polyglot_is_disabled, 'ledger')
   finish
 endif
 
diff --git a/syntax/less.vim b/syntax/less.vim
index daa829498..478296124 100644
--- a/syntax/less.vim
+++ b/syntax/less.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'less')
+if has_key(g:polyglot_is_disabled, 'less')
   finish
 endif
 
diff --git a/syntax/lex.vim b/syntax/lex.vim
index ebeb6f126..7979f3aeb 100644
--- a/syntax/lex.vim
+++ b/syntax/lex.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lex')
+if has_key(g:polyglot_is_disabled, 'lex')
   finish
 endif
 
diff --git a/syntax/lftp.vim b/syntax/lftp.vim
index 29e35ada9..1dea9fcf0 100644
--- a/syntax/lftp.vim
+++ b/syntax/lftp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lftp')
+if has_key(g:polyglot_is_disabled, 'lftp')
   finish
 endif
 
diff --git a/syntax/lhaskell.vim b/syntax/lhaskell.vim
index 2db773e69..d7d56f12d 100644
--- a/syntax/lhaskell.vim
+++ b/syntax/lhaskell.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lhaskell')
+if has_key(g:polyglot_is_disabled, 'lhaskell')
   finish
 endif
 
diff --git a/syntax/libao.vim b/syntax/libao.vim
index d5dce92e9..3bdefe4b3 100644
--- a/syntax/libao.vim
+++ b/syntax/libao.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'libao')
+if has_key(g:polyglot_is_disabled, 'libao')
   finish
 endif
 
diff --git a/syntax/lidris.vim b/syntax/lidris.vim
index 8396c699b..df6c03c9b 100644
--- a/syntax/lidris.vim
+++ b/syntax/lidris.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'idris')
+if has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/syntax/lidris2.vim b/syntax/lidris2.vim
index ba83b3b21..3b37a490b 100644
--- a/syntax/lidris2.vim
+++ b/syntax/lidris2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'idris2')
+if has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/syntax/lifelines.vim b/syntax/lifelines.vim
index d6cc7b3dc..295c0060f 100644
--- a/syntax/lifelines.vim
+++ b/syntax/lifelines.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lifelines')
+if has_key(g:polyglot_is_disabled, 'lifelines')
   finish
 endif
 
diff --git a/syntax/lilo.vim b/syntax/lilo.vim
index c3fbe021e..88f14ff75 100644
--- a/syntax/lilo.vim
+++ b/syntax/lilo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lilo')
+if has_key(g:polyglot_is_disabled, 'lilo')
   finish
 endif
 
diff --git a/syntax/lilypond-words.vim b/syntax/lilypond-words.vim
index 5376893d8..8806554fd 100644
--- a/syntax/lilypond-words.vim
+++ b/syntax/lilypond-words.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lilypond')
+if has_key(g:polyglot_is_disabled, 'lilypond')
   finish
 endif
 
diff --git a/syntax/lilypond.vim b/syntax/lilypond.vim
index 8bc2d63b6..ada3a9acb 100644
--- a/syntax/lilypond.vim
+++ b/syntax/lilypond.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lilypond')
+if has_key(g:polyglot_is_disabled, 'lilypond')
   finish
 endif
 
diff --git a/syntax/limits.vim b/syntax/limits.vim
index 31bda9ee8..90a464c2b 100644
--- a/syntax/limits.vim
+++ b/syntax/limits.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'limits')
+if has_key(g:polyglot_is_disabled, 'limits')
   finish
 endif
 
diff --git a/syntax/liquid.vim b/syntax/liquid.vim
index 34d1971d9..97b10c2e6 100644
--- a/syntax/liquid.vim
+++ b/syntax/liquid.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'liquid')
+if has_key(g:polyglot_is_disabled, 'liquid')
   finish
 endif
 
diff --git a/syntax/lisp.vim b/syntax/lisp.vim
index 0ca370c97..ada26dc95 100644
--- a/syntax/lisp.vim
+++ b/syntax/lisp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lisp')
+if has_key(g:polyglot_is_disabled, 'lisp')
   finish
 endif
 
diff --git a/syntax/litcoffee.vim b/syntax/litcoffee.vim
index 3295ad71f..cf642b629 100644
--- a/syntax/litcoffee.vim
+++ b/syntax/litcoffee.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'coffee-script')
+if has_key(g:polyglot_is_disabled, 'coffee-script')
   finish
 endif
 
diff --git a/syntax/lite.vim b/syntax/lite.vim
index 0a6f3f3cf..9b57ecac4 100644
--- a/syntax/lite.vim
+++ b/syntax/lite.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lite')
+if has_key(g:polyglot_is_disabled, 'lite')
   finish
 endif
 
diff --git a/syntax/litestep.vim b/syntax/litestep.vim
index f456f4c2a..254124cbe 100644
--- a/syntax/litestep.vim
+++ b/syntax/litestep.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'litestep')
+if has_key(g:polyglot_is_disabled, 'litestep')
   finish
 endif
 
diff --git a/syntax/llvm.vim b/syntax/llvm.vim
index 9c111c6e2..73c1a5fe3 100644
--- a/syntax/llvm.vim
+++ b/syntax/llvm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'llvm')
+if has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/syntax/log.vim b/syntax/log.vim
index e045d715c..6e658fe0c 100644
--- a/syntax/log.vim
+++ b/syntax/log.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'log')
+if has_key(g:polyglot_is_disabled, 'log')
   finish
 endif
 
diff --git a/syntax/loginaccess.vim b/syntax/loginaccess.vim
index 4ec1ddeb0..fd7d36e70 100644
--- a/syntax/loginaccess.vim
+++ b/syntax/loginaccess.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'loginaccess')
+if has_key(g:polyglot_is_disabled, 'loginaccess')
   finish
 endif
 
diff --git a/syntax/logindefs.vim b/syntax/logindefs.vim
index a7809ed09..21659376c 100644
--- a/syntax/logindefs.vim
+++ b/syntax/logindefs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'logindefs')
+if has_key(g:polyglot_is_disabled, 'logindefs')
   finish
 endif
 
diff --git a/syntax/logtalk.vim b/syntax/logtalk.vim
index 1bca4267d..7716e33ed 100644
--- a/syntax/logtalk.vim
+++ b/syntax/logtalk.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'logtalk')
+if has_key(g:polyglot_is_disabled, 'logtalk')
   finish
 endif
 
diff --git a/syntax/lotos.vim b/syntax/lotos.vim
index e719cb4bf..7270727fb 100644
--- a/syntax/lotos.vim
+++ b/syntax/lotos.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lotos')
+if has_key(g:polyglot_is_disabled, 'lotos')
   finish
 endif
 
diff --git a/syntax/lout.vim b/syntax/lout.vim
index 6376bef91..a79270440 100644
--- a/syntax/lout.vim
+++ b/syntax/lout.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lout')
+if has_key(g:polyglot_is_disabled, 'lout')
   finish
 endif
 
diff --git a/syntax/lpc.vim b/syntax/lpc.vim
index 53dbffffc..5df61f967 100644
--- a/syntax/lpc.vim
+++ b/syntax/lpc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lpc')
+if has_key(g:polyglot_is_disabled, 'lpc')
   finish
 endif
 
diff --git a/syntax/lprolog.vim b/syntax/lprolog.vim
index 2c52f60e5..39368dc3a 100644
--- a/syntax/lprolog.vim
+++ b/syntax/lprolog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lprolog')
+if has_key(g:polyglot_is_disabled, 'lprolog')
   finish
 endif
 
diff --git a/syntax/ls.vim b/syntax/ls.vim
index 489efc718..e65a76032 100644
--- a/syntax/ls.vim
+++ b/syntax/ls.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'livescript')
+if has_key(g:polyglot_is_disabled, 'livescript')
   finish
 endif
 
diff --git a/syntax/lsl.vim b/syntax/lsl.vim
index d4f6e6f83..30ad91859 100644
--- a/syntax/lsl.vim
+++ b/syntax/lsl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lsl')
+if has_key(g:polyglot_is_disabled, 'lsl')
   finish
 endif
 
diff --git a/syntax/lss.vim b/syntax/lss.vim
index 8b5dab6ab..8c08f7041 100644
--- a/syntax/lss.vim
+++ b/syntax/lss.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lss')
+if has_key(g:polyglot_is_disabled, 'lss')
   finish
 endif
 
diff --git a/syntax/lua.vim b/syntax/lua.vim
index fb8412b95..ca58a8daa 100644
--- a/syntax/lua.vim
+++ b/syntax/lua.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lua')
+if has_key(g:polyglot_is_disabled, 'lua')
   finish
 endif
 
diff --git a/syntax/lynx.vim b/syntax/lynx.vim
index f6d3159e5..f23a06d82 100644
--- a/syntax/lynx.vim
+++ b/syntax/lynx.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'lynx')
+if has_key(g:polyglot_is_disabled, 'lynx')
   finish
 endif
 
diff --git a/syntax/m4.vim b/syntax/m4.vim
index c015eeb8b..f21564479 100644
--- a/syntax/m4.vim
+++ b/syntax/m4.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'm4')
+if has_key(g:polyglot_is_disabled, 'm4')
   finish
 endif
 
diff --git a/syntax/mail.vim b/syntax/mail.vim
index 08bd20980..f4cb01d6b 100644
--- a/syntax/mail.vim
+++ b/syntax/mail.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mail')
+if has_key(g:polyglot_is_disabled, 'mail')
   finish
 endif
 
diff --git a/syntax/mailaliases.vim b/syntax/mailaliases.vim
index b67f6771d..1638dfd85 100644
--- a/syntax/mailaliases.vim
+++ b/syntax/mailaliases.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mailaliases')
+if has_key(g:polyglot_is_disabled, 'mailaliases')
   finish
 endif
 
diff --git a/syntax/mailcap.vim b/syntax/mailcap.vim
index cb197f8c7..b917a9ed5 100644
--- a/syntax/mailcap.vim
+++ b/syntax/mailcap.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mailcap')
+if has_key(g:polyglot_is_disabled, 'mailcap')
   finish
 endif
 
diff --git a/syntax/make.vim b/syntax/make.vim
index b096cc525..0be719b63 100644
--- a/syntax/make.vim
+++ b/syntax/make.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'make')
+if has_key(g:polyglot_is_disabled, 'make')
   finish
 endif
 
diff --git a/syntax/mako.vim b/syntax/mako.vim
index a232f52a1..cb454b8a7 100644
--- a/syntax/mako.vim
+++ b/syntax/mako.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mako')
+if has_key(g:polyglot_is_disabled, 'mako')
   finish
 endif
 
diff --git a/syntax/mallard.vim b/syntax/mallard.vim
index b21148866..979dada41 100644
--- a/syntax/mallard.vim
+++ b/syntax/mallard.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mallard')
+if has_key(g:polyglot_is_disabled, 'mallard')
   finish
 endif
 
diff --git a/syntax/manconf.vim b/syntax/manconf.vim
index 4dbee625c..7c81525a7 100644
--- a/syntax/manconf.vim
+++ b/syntax/manconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'manconf')
+if has_key(g:polyglot_is_disabled, 'manconf')
   finish
 endif
 
diff --git a/syntax/maple.vim b/syntax/maple.vim
index 71508463a..cece98374 100644
--- a/syntax/maple.vim
+++ b/syntax/maple.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'maple')
+if has_key(g:polyglot_is_disabled, 'maple')
   finish
 endif
 
diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index 56e349e46..ef9b8c8dd 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'markdown')
+if has_key(g:polyglot_is_disabled, 'markdown')
   finish
 endif
 
diff --git a/syntax/mason.vim b/syntax/mason.vim
index afbe3389e..41a3ad4e9 100644
--- a/syntax/mason.vim
+++ b/syntax/mason.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'perl')
+if has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/master.vim b/syntax/master.vim
index db51765e4..4a06aac12 100644
--- a/syntax/master.vim
+++ b/syntax/master.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'master')
+if has_key(g:polyglot_is_disabled, 'master')
   finish
 endif
 
diff --git a/syntax/mel.vim b/syntax/mel.vim
index 02821a5d9..54ff4ab60 100644
--- a/syntax/mel.vim
+++ b/syntax/mel.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mel')
+if has_key(g:polyglot_is_disabled, 'mel')
   finish
 endif
 
diff --git a/syntax/merlin.vim b/syntax/merlin.vim
index 4c6b9cd24..e3fdbd09b 100644
--- a/syntax/merlin.vim
+++ b/syntax/merlin.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'reason')
+if has_key(g:polyglot_is_disabled, 'reason')
   finish
 endif
 
diff --git a/syntax/meson.vim b/syntax/meson.vim
index 0ad43cc13..cb9740cd9 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'meson')
+if has_key(g:polyglot_is_disabled, 'meson')
   finish
 endif
 
diff --git a/syntax/messages.vim b/syntax/messages.vim
index fc11c54da..7448f4e0b 100644
--- a/syntax/messages.vim
+++ b/syntax/messages.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'messages')
+if has_key(g:polyglot_is_disabled, 'messages')
   finish
 endif
 
diff --git a/syntax/mf.vim b/syntax/mf.vim
index 08115912e..1d589edd4 100644
--- a/syntax/mf.vim
+++ b/syntax/mf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mf')
+if has_key(g:polyglot_is_disabled, 'mf')
   finish
 endif
 
diff --git a/syntax/mgl.vim b/syntax/mgl.vim
index e8ee3fe61..631af5007 100644
--- a/syntax/mgl.vim
+++ b/syntax/mgl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mgl')
+if has_key(g:polyglot_is_disabled, 'mgl')
   finish
 endif
 
diff --git a/syntax/mgp.vim b/syntax/mgp.vim
index d9e5ced1b..00c77a1d6 100644
--- a/syntax/mgp.vim
+++ b/syntax/mgp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mgp')
+if has_key(g:polyglot_is_disabled, 'mgp')
   finish
 endif
 
diff --git a/syntax/mib.vim b/syntax/mib.vim
index ed0155fe4..8f67db382 100644
--- a/syntax/mib.vim
+++ b/syntax/mib.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mib')
+if has_key(g:polyglot_is_disabled, 'mib')
   finish
 endif
 
diff --git a/syntax/mix.vim b/syntax/mix.vim
index b28f9dbe8..b2a9f84ed 100644
--- a/syntax/mix.vim
+++ b/syntax/mix.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mix')
+if has_key(g:polyglot_is_disabled, 'mix')
   finish
 endif
 
diff --git a/syntax/mma.vim b/syntax/mma.vim
index 663ca18bd..7cfa8661a 100644
--- a/syntax/mma.vim
+++ b/syntax/mma.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mathematica')
+if has_key(g:polyglot_is_disabled, 'mathematica')
   finish
 endif
 
diff --git a/syntax/mmp.vim b/syntax/mmp.vim
index 1ea49fa58..7acec6636 100644
--- a/syntax/mmp.vim
+++ b/syntax/mmp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mmp')
+if has_key(g:polyglot_is_disabled, 'mmp')
   finish
 endif
 
diff --git a/syntax/modconf.vim b/syntax/modconf.vim
index fd9f0da87..147d96304 100644
--- a/syntax/modconf.vim
+++ b/syntax/modconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'modconf')
+if has_key(g:polyglot_is_disabled, 'modconf')
   finish
 endif
 
diff --git a/syntax/modula2.vim b/syntax/modula2.vim
index dd3111e75..d0fa5d83e 100644
--- a/syntax/modula2.vim
+++ b/syntax/modula2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'modula2')
+if has_key(g:polyglot_is_disabled, 'modula2')
   finish
 endif
 
diff --git a/syntax/modula3.vim b/syntax/modula3.vim
index 370252931..a1f22ebbb 100644
--- a/syntax/modula3.vim
+++ b/syntax/modula3.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'modula3')
+if has_key(g:polyglot_is_disabled, 'modula3')
   finish
 endif
 
diff --git a/syntax/monk.vim b/syntax/monk.vim
index 3c598dded..c17706432 100644
--- a/syntax/monk.vim
+++ b/syntax/monk.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'monk')
+if has_key(g:polyglot_is_disabled, 'monk')
   finish
 endif
 
diff --git a/syntax/moo.vim b/syntax/moo.vim
index c14d4fa5c..37be46baf 100644
--- a/syntax/moo.vim
+++ b/syntax/moo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'moo')
+if has_key(g:polyglot_is_disabled, 'moo')
   finish
 endif
 
diff --git a/syntax/moon.vim b/syntax/moon.vim
index 329a283a0..6771213ff 100644
--- a/syntax/moon.vim
+++ b/syntax/moon.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'moonscript')
+if has_key(g:polyglot_is_disabled, 'moonscript')
   finish
 endif
 
diff --git a/syntax/mp.vim b/syntax/mp.vim
index 4e915cc65..3f52854a6 100644
--- a/syntax/mp.vim
+++ b/syntax/mp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mp')
+if has_key(g:polyglot_is_disabled, 'mp')
   finish
 endif
 
diff --git a/syntax/mplayerconf.vim b/syntax/mplayerconf.vim
index d97b01557..3d979f618 100644
--- a/syntax/mplayerconf.vim
+++ b/syntax/mplayerconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mplayerconf')
+if has_key(g:polyglot_is_disabled, 'mplayerconf')
   finish
 endif
 
diff --git a/syntax/mrxvtrc.vim b/syntax/mrxvtrc.vim
index 592d5c771..cc77dc666 100644
--- a/syntax/mrxvtrc.vim
+++ b/syntax/mrxvtrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mrxvtrc')
+if has_key(g:polyglot_is_disabled, 'mrxvtrc')
   finish
 endif
 
diff --git a/syntax/msidl.vim b/syntax/msidl.vim
index a86f271f5..71708303b 100644
--- a/syntax/msidl.vim
+++ b/syntax/msidl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'msidl')
+if has_key(g:polyglot_is_disabled, 'msidl')
   finish
 endif
 
diff --git a/syntax/msql.vim b/syntax/msql.vim
index 43e19921a..3d1888378 100644
--- a/syntax/msql.vim
+++ b/syntax/msql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'msql')
+if has_key(g:polyglot_is_disabled, 'msql')
   finish
 endif
 
diff --git a/syntax/mupad.vim b/syntax/mupad.vim
index 07dc80aa4..8bd4a4f50 100644
--- a/syntax/mupad.vim
+++ b/syntax/mupad.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mupad')
+if has_key(g:polyglot_is_disabled, 'mupad')
   finish
 endif
 
diff --git a/syntax/murphi.vim b/syntax/murphi.vim
index 667877967..b97876c34 100644
--- a/syntax/murphi.vim
+++ b/syntax/murphi.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'murphi')
+if has_key(g:polyglot_is_disabled, 'murphi')
   finish
 endif
 
diff --git a/syntax/mush.vim b/syntax/mush.vim
index dce86542e..a5024e97a 100644
--- a/syntax/mush.vim
+++ b/syntax/mush.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mush')
+if has_key(g:polyglot_is_disabled, 'mush')
   finish
 endif
 
diff --git a/syntax/mustache.vim b/syntax/mustache.vim
index 3f0db4191..25ec16b61 100644
--- a/syntax/mustache.vim
+++ b/syntax/mustache.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'handlebars')
+if has_key(g:polyglot_is_disabled, 'handlebars')
   finish
 endif
 
diff --git a/syntax/muttrc.vim b/syntax/muttrc.vim
index 62991e530..a776a84e4 100644
--- a/syntax/muttrc.vim
+++ b/syntax/muttrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'muttrc')
+if has_key(g:polyglot_is_disabled, 'muttrc')
   finish
 endif
 
diff --git a/syntax/mysql.vim b/syntax/mysql.vim
index 8012997b3..3b2323eee 100644
--- a/syntax/mysql.vim
+++ b/syntax/mysql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'mysql')
+if has_key(g:polyglot_is_disabled, 'mysql')
   finish
 endif
 
diff --git a/syntax/n1ql.vim b/syntax/n1ql.vim
index a007475fa..eb018c249 100644
--- a/syntax/n1ql.vim
+++ b/syntax/n1ql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'n1ql')
+if has_key(g:polyglot_is_disabled, 'n1ql')
   finish
 endif
 
diff --git a/syntax/named.vim b/syntax/named.vim
index b8684bde1..efc82f00b 100644
--- a/syntax/named.vim
+++ b/syntax/named.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'named')
+if has_key(g:polyglot_is_disabled, 'named')
   finish
 endif
 
diff --git a/syntax/nanorc.vim b/syntax/nanorc.vim
index 57d8d2829..2c51ddb18 100644
--- a/syntax/nanorc.vim
+++ b/syntax/nanorc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nanorc')
+if has_key(g:polyglot_is_disabled, 'nanorc')
   finish
 endif
 
diff --git a/syntax/natural.vim b/syntax/natural.vim
index bb9093ff4..48a2caf97 100644
--- a/syntax/natural.vim
+++ b/syntax/natural.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'natural')
+if has_key(g:polyglot_is_disabled, 'natural')
   finish
 endif
 
diff --git a/syntax/ncf.vim b/syntax/ncf.vim
index 832545997..e9df3256a 100644
--- a/syntax/ncf.vim
+++ b/syntax/ncf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ncf')
+if has_key(g:polyglot_is_disabled, 'ncf')
   finish
 endif
 
diff --git a/syntax/neomuttrc.vim b/syntax/neomuttrc.vim
index a43fb35b5..60e0eb96d 100644
--- a/syntax/neomuttrc.vim
+++ b/syntax/neomuttrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'neomuttrc')
+if has_key(g:polyglot_is_disabled, 'neomuttrc')
   finish
 endif
 
diff --git a/syntax/netrc.vim b/syntax/netrc.vim
index 58e142589..1e9933c04 100644
--- a/syntax/netrc.vim
+++ b/syntax/netrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'netrc')
+if has_key(g:polyglot_is_disabled, 'netrc')
   finish
 endif
 
diff --git a/syntax/nginx.vim b/syntax/nginx.vim
index fc2ec5ca3..e1cfa7771 100644
--- a/syntax/nginx.vim
+++ b/syntax/nginx.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nginx')
+if has_key(g:polyglot_is_disabled, 'nginx')
   finish
 endif
 
diff --git a/syntax/nim.vim b/syntax/nim.vim
index 41b943cc5..138b1c90e 100644
--- a/syntax/nim.vim
+++ b/syntax/nim.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nim')
+if has_key(g:polyglot_is_disabled, 'nim')
   finish
 endif
 
diff --git a/syntax/ninja.vim b/syntax/ninja.vim
index 5a5717fd0..6825cadd3 100644
--- a/syntax/ninja.vim
+++ b/syntax/ninja.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ninja')
+if has_key(g:polyglot_is_disabled, 'ninja')
   finish
 endif
 
diff --git a/syntax/nix.vim b/syntax/nix.vim
index 66f88199f..7165bf52f 100644
--- a/syntax/nix.vim
+++ b/syntax/nix.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nix')
+if has_key(g:polyglot_is_disabled, 'nix')
   finish
 endif
 
diff --git a/syntax/nqc.vim b/syntax/nqc.vim
index c5fd12b32..5d310d9d5 100644
--- a/syntax/nqc.vim
+++ b/syntax/nqc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nqc')
+if has_key(g:polyglot_is_disabled, 'nqc')
   finish
 endif
 
diff --git a/syntax/nroff.vim b/syntax/nroff.vim
index 915d6a232..2681d4c9a 100644
--- a/syntax/nroff.vim
+++ b/syntax/nroff.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nroff')
+if has_key(g:polyglot_is_disabled, 'nroff')
   finish
 endif
 
diff --git a/syntax/nsis.vim b/syntax/nsis.vim
index b930ae3c3..959999cb4 100644
--- a/syntax/nsis.vim
+++ b/syntax/nsis.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'nsis')
+if has_key(g:polyglot_is_disabled, 'nsis')
   finish
 endif
 
diff --git a/syntax/oasis.vim b/syntax/oasis.vim
index 3008d4899..15af3903b 100644
--- a/syntax/oasis.vim
+++ b/syntax/oasis.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/obj.vim b/syntax/obj.vim
index 5a9d0a298..6ea9b23aa 100644
--- a/syntax/obj.vim
+++ b/syntax/obj.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'obj')
+if has_key(g:polyglot_is_disabled, 'obj')
   finish
 endif
 
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index bfe6e1e3f..1da0f7b05 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/ocamlbuild_tags.vim b/syntax/ocamlbuild_tags.vim
index d1f968c19..aea91307f 100644
--- a/syntax/ocamlbuild_tags.vim
+++ b/syntax/ocamlbuild_tags.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/occam.vim b/syntax/occam.vim
index f86a17c9e..98b762ebd 100644
--- a/syntax/occam.vim
+++ b/syntax/occam.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'occam')
+if has_key(g:polyglot_is_disabled, 'occam')
   finish
 endif
 
diff --git a/syntax/ocpbuild.vim b/syntax/ocpbuild.vim
index c6df2b2b0..7e5dad165 100644
--- a/syntax/ocpbuild.vim
+++ b/syntax/ocpbuild.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/ocpbuildroot.vim b/syntax/ocpbuildroot.vim
index 163790574..34740a3f1 100644
--- a/syntax/ocpbuildroot.vim
+++ b/syntax/ocpbuildroot.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/octave.vim b/syntax/octave.vim
index 889f45a69..f3c91642e 100644
--- a/syntax/octave.vim
+++ b/syntax/octave.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'octave')
+if has_key(g:polyglot_is_disabled, 'octave')
   finish
 endif
 
diff --git a/syntax/odin.vim b/syntax/odin.vim
index d401c2e63..e69605749 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'odin')
+if has_key(g:polyglot_is_disabled, 'odin')
   finish
 endif
 
diff --git a/syntax/omake.vim b/syntax/omake.vim
index c3225b0a7..54c3f4678 100644
--- a/syntax/omake.vim
+++ b/syntax/omake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/omnimark.vim b/syntax/omnimark.vim
index 73668e810..3e38b43b7 100644
--- a/syntax/omnimark.vim
+++ b/syntax/omnimark.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'omnimark')
+if has_key(g:polyglot_is_disabled, 'omnimark')
   finish
 endif
 
diff --git a/syntax/opam.vim b/syntax/opam.vim
index 0f9a448bd..c18ba312c 100644
--- a/syntax/opam.vim
+++ b/syntax/opam.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/opencl.vim b/syntax/opencl.vim
index 0aff1fc6a..ab77292f6 100644
--- a/syntax/opencl.vim
+++ b/syntax/opencl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'opencl')
+if has_key(g:polyglot_is_disabled, 'opencl')
   finish
 endif
 
diff --git a/syntax/openroad.vim b/syntax/openroad.vim
index 3fded9239..fcfe17e79 100644
--- a/syntax/openroad.vim
+++ b/syntax/openroad.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'openroad')
+if has_key(g:polyglot_is_disabled, 'openroad')
   finish
 endif
 
diff --git a/syntax/opl.vim b/syntax/opl.vim
index e177ff34d..3908574c8 100644
--- a/syntax/opl.vim
+++ b/syntax/opl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'opl')
+if has_key(g:polyglot_is_disabled, 'opl')
   finish
 endif
 
diff --git a/syntax/ora.vim b/syntax/ora.vim
index ff465a6d8..d91958be4 100644
--- a/syntax/ora.vim
+++ b/syntax/ora.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ora')
+if has_key(g:polyglot_is_disabled, 'ora')
   finish
 endif
 
diff --git a/syntax/pamconf.vim b/syntax/pamconf.vim
index de31e7814..7577a4f61 100644
--- a/syntax/pamconf.vim
+++ b/syntax/pamconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pamconf')
+if has_key(g:polyglot_is_disabled, 'pamconf')
   finish
 endif
 
diff --git a/syntax/pamenv.vim b/syntax/pamenv.vim
index c5af0cc10..a89c7fc47 100644
--- a/syntax/pamenv.vim
+++ b/syntax/pamenv.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pamenv')
+if has_key(g:polyglot_is_disabled, 'pamenv')
   finish
 endif
 
diff --git a/syntax/papp.vim b/syntax/papp.vim
index 4d12eb2c9..879eb04ee 100644
--- a/syntax/papp.vim
+++ b/syntax/papp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'papp')
+if has_key(g:polyglot_is_disabled, 'papp')
   finish
 endif
 
diff --git a/syntax/pascal.vim b/syntax/pascal.vim
index 783116d73..6fb0717e9 100644
--- a/syntax/pascal.vim
+++ b/syntax/pascal.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pascal')
+if has_key(g:polyglot_is_disabled, 'pascal')
   finish
 endif
 
diff --git a/syntax/passwd.vim b/syntax/passwd.vim
index ff0fbc906..d33ed4dbe 100644
--- a/syntax/passwd.vim
+++ b/syntax/passwd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'passwd')
+if has_key(g:polyglot_is_disabled, 'passwd')
   finish
 endif
 
diff --git a/syntax/pccts.vim b/syntax/pccts.vim
index 3cb252902..accfd78c2 100644
--- a/syntax/pccts.vim
+++ b/syntax/pccts.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pccts')
+if has_key(g:polyglot_is_disabled, 'pccts')
   finish
 endif
 
diff --git a/syntax/pdf.vim b/syntax/pdf.vim
index e300364f6..6d9d87715 100644
--- a/syntax/pdf.vim
+++ b/syntax/pdf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pdf')
+if has_key(g:polyglot_is_disabled, 'pdf')
   finish
 endif
 
diff --git a/syntax/perl.vim b/syntax/perl.vim
index ce136bf65..cee3a8b79 100644
--- a/syntax/perl.vim
+++ b/syntax/perl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'perl')
+if has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/pf.vim b/syntax/pf.vim
index 6a7335fd1..e3aab6b5b 100644
--- a/syntax/pf.vim
+++ b/syntax/pf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pf')
+if has_key(g:polyglot_is_disabled, 'pf')
   finish
 endif
 
diff --git a/syntax/pfmain.vim b/syntax/pfmain.vim
index 65ce3d9e1..62d6ba9dd 100644
--- a/syntax/pfmain.vim
+++ b/syntax/pfmain.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pfmain')
+if has_key(g:polyglot_is_disabled, 'pfmain')
   finish
 endif
 
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index dc2100bfd..9769ca4c9 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pgsql')
+if has_key(g:polyglot_is_disabled, 'pgsql')
   finish
 endif
 
diff --git a/syntax/php.vim b/syntax/php.vim
index f221f492c..8b38f778f 100644
--- a/syntax/php.vim
+++ b/syntax/php.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'php')
+if has_key(g:polyglot_is_disabled, 'php')
   finish
 endif
 
diff --git a/syntax/pike.vim b/syntax/pike.vim
index 9248cc9d7..abf0fc816 100644
--- a/syntax/pike.vim
+++ b/syntax/pike.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pike')
+if has_key(g:polyglot_is_disabled, 'pike')
   finish
 endif
 
diff --git a/syntax/pilrc.vim b/syntax/pilrc.vim
index 72c76ecc5..5485c6e8b 100644
--- a/syntax/pilrc.vim
+++ b/syntax/pilrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pilrc')
+if has_key(g:polyglot_is_disabled, 'pilrc')
   finish
 endif
 
diff --git a/syntax/pine.vim b/syntax/pine.vim
index 0cec064ee..5e2c111be 100644
--- a/syntax/pine.vim
+++ b/syntax/pine.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pine')
+if has_key(g:polyglot_is_disabled, 'pine')
   finish
 endif
 
diff --git a/syntax/pinfo.vim b/syntax/pinfo.vim
index d1602cb13..6edb08876 100644
--- a/syntax/pinfo.vim
+++ b/syntax/pinfo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pinfo')
+if has_key(g:polyglot_is_disabled, 'pinfo')
   finish
 endif
 
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index 320f35604..60ba9923b 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'plantuml')
+if has_key(g:polyglot_is_disabled, 'plantuml')
   finish
 endif
 
diff --git a/syntax/pli.vim b/syntax/pli.vim
index b57310166..95c23ca26 100644
--- a/syntax/pli.vim
+++ b/syntax/pli.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pli')
+if has_key(g:polyglot_is_disabled, 'pli')
   finish
 endif
 
diff --git a/syntax/plm.vim b/syntax/plm.vim
index cb3e761b7..301cb9388 100644
--- a/syntax/plm.vim
+++ b/syntax/plm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'plm')
+if has_key(g:polyglot_is_disabled, 'plm')
   finish
 endif
 
diff --git a/syntax/plp.vim b/syntax/plp.vim
index d2bda89e7..993a703c3 100644
--- a/syntax/plp.vim
+++ b/syntax/plp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'plp')
+if has_key(g:polyglot_is_disabled, 'plp')
   finish
 endif
 
diff --git a/syntax/plsql.vim b/syntax/plsql.vim
index 07b4a4db7..f13a6fe21 100644
--- a/syntax/plsql.vim
+++ b/syntax/plsql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'plsql')
+if has_key(g:polyglot_is_disabled, 'plsql')
   finish
 endif
 
diff --git a/syntax/po.vim b/syntax/po.vim
index f6cf63cba..3539d1b09 100644
--- a/syntax/po.vim
+++ b/syntax/po.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'po')
+if has_key(g:polyglot_is_disabled, 'po')
   finish
 endif
 
diff --git a/syntax/pod.vim b/syntax/pod.vim
index 7f7790542..09eef1336 100644
--- a/syntax/pod.vim
+++ b/syntax/pod.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'perl')
+if has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/pony.vim b/syntax/pony.vim
index 7374fb6f7..01968ed8f 100644
--- a/syntax/pony.vim
+++ b/syntax/pony.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pony')
+if has_key(g:polyglot_is_disabled, 'pony')
   finish
 endif
 
diff --git a/syntax/postscr.vim b/syntax/postscr.vim
index 0f4725ec5..c581fb262 100644
--- a/syntax/postscr.vim
+++ b/syntax/postscr.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'postscr')
+if has_key(g:polyglot_is_disabled, 'postscr')
   finish
 endif
 
diff --git a/syntax/pov.vim b/syntax/pov.vim
index 6ee9c7157..5cadffbfb 100644
--- a/syntax/pov.vim
+++ b/syntax/pov.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pov')
+if has_key(g:polyglot_is_disabled, 'pov')
   finish
 endif
 
diff --git a/syntax/povini.vim b/syntax/povini.vim
index 24cb9ed94..782c37be5 100644
--- a/syntax/povini.vim
+++ b/syntax/povini.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'povini')
+if has_key(g:polyglot_is_disabled, 'povini')
   finish
 endif
 
diff --git a/syntax/ppd.vim b/syntax/ppd.vim
index 71c579e20..b1f84cbbd 100644
--- a/syntax/ppd.vim
+++ b/syntax/ppd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ppd')
+if has_key(g:polyglot_is_disabled, 'ppd')
   finish
 endif
 
diff --git a/syntax/ppwiz.vim b/syntax/ppwiz.vim
index 1bce02ff5..8707ee7ea 100644
--- a/syntax/ppwiz.vim
+++ b/syntax/ppwiz.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ppwiz')
+if has_key(g:polyglot_is_disabled, 'ppwiz')
   finish
 endif
 
diff --git a/syntax/privoxy.vim b/syntax/privoxy.vim
index 82529f449..447281082 100644
--- a/syntax/privoxy.vim
+++ b/syntax/privoxy.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'privoxy')
+if has_key(g:polyglot_is_disabled, 'privoxy')
   finish
 endif
 
diff --git a/syntax/procmail.vim b/syntax/procmail.vim
index 7ca368e46..b483cca72 100644
--- a/syntax/procmail.vim
+++ b/syntax/procmail.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'procmail')
+if has_key(g:polyglot_is_disabled, 'procmail')
   finish
 endif
 
diff --git a/syntax/prolog.vim b/syntax/prolog.vim
index 9498e5f31..25ef2b94e 100644
--- a/syntax/prolog.vim
+++ b/syntax/prolog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'prolog')
+if has_key(g:polyglot_is_disabled, 'prolog')
   finish
 endif
 
diff --git a/syntax/promela.vim b/syntax/promela.vim
index fb7ef3e2b..6d66bbbe2 100644
--- a/syntax/promela.vim
+++ b/syntax/promela.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'promela')
+if has_key(g:polyglot_is_disabled, 'promela')
   finish
 endif
 
diff --git a/syntax/proto.vim b/syntax/proto.vim
index ac6bf5448..68c70eb70 100644
--- a/syntax/proto.vim
+++ b/syntax/proto.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'protobuf')
+if has_key(g:polyglot_is_disabled, 'protobuf')
   finish
 endif
 
diff --git a/syntax/protocols.vim b/syntax/protocols.vim
index 9abdacd4d..3bc2c0e8a 100644
--- a/syntax/protocols.vim
+++ b/syntax/protocols.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'protocols')
+if has_key(g:polyglot_is_disabled, 'protocols')
   finish
 endif
 
diff --git a/syntax/ps1.vim b/syntax/ps1.vim
index 97901fbc2..520be968e 100644
--- a/syntax/ps1.vim
+++ b/syntax/ps1.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'powershell')
+if has_key(g:polyglot_is_disabled, 'powershell')
   finish
 endif
 
diff --git a/syntax/ps1xml.vim b/syntax/ps1xml.vim
index a0b582364..dd8cf3657 100644
--- a/syntax/ps1xml.vim
+++ b/syntax/ps1xml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'powershell')
+if has_key(g:polyglot_is_disabled, 'powershell')
   finish
 endif
 
diff --git a/syntax/psf.vim b/syntax/psf.vim
index 6ae651d5f..64c8b0fb4 100644
--- a/syntax/psf.vim
+++ b/syntax/psf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'psf')
+if has_key(g:polyglot_is_disabled, 'psf')
   finish
 endif
 
diff --git a/syntax/pug.vim b/syntax/pug.vim
index 8f9788283..a0cc3baee 100644
--- a/syntax/pug.vim
+++ b/syntax/pug.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pug')
+if has_key(g:polyglot_is_disabled, 'pug')
   finish
 endif
 
diff --git a/syntax/puppet.vim b/syntax/puppet.vim
index e4ccbd4cd..881b2992c 100644
--- a/syntax/puppet.vim
+++ b/syntax/puppet.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'puppet')
+if has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/syntax/purescript.vim b/syntax/purescript.vim
index b98676dfc..b4e6f4389 100644
--- a/syntax/purescript.vim
+++ b/syntax/purescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'purescript')
+if has_key(g:polyglot_is_disabled, 'purescript')
   finish
 endif
 
diff --git a/syntax/pyrex.vim b/syntax/pyrex.vim
index b8ff3ee45..ce09728fd 100644
--- a/syntax/pyrex.vim
+++ b/syntax/pyrex.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'pyrex')
+if has_key(g:polyglot_is_disabled, 'pyrex')
   finish
 endif
 
diff --git a/syntax/python.vim b/syntax/python.vim
index 15c030a69..49c61c6ab 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'python')
+if has_key(g:polyglot_is_disabled, 'python')
   finish
 endif
 
diff --git a/syntax/qmake.vim b/syntax/qmake.vim
index e4736e67f..c791daa87 100644
--- a/syntax/qmake.vim
+++ b/syntax/qmake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'qmake')
+if has_key(g:polyglot_is_disabled, 'qmake')
   finish
 endif
 
diff --git a/syntax/qml.vim b/syntax/qml.vim
index 5c3c4c387..12db8ee41 100644
--- a/syntax/qml.vim
+++ b/syntax/qml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'qml')
+if has_key(g:polyglot_is_disabled, 'qml')
   finish
 endif
 
diff --git a/syntax/quake.vim b/syntax/quake.vim
index 68136c0e1..14954d0b5 100644
--- a/syntax/quake.vim
+++ b/syntax/quake.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'quake')
+if has_key(g:polyglot_is_disabled, 'quake')
   finish
 endif
 
diff --git a/syntax/racket.vim b/syntax/racket.vim
index 100e7d174..c4f0a4226 100644
--- a/syntax/racket.vim
+++ b/syntax/racket.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'racket')
+if has_key(g:polyglot_is_disabled, 'racket')
   finish
 endif
 
diff --git a/syntax/radiance.vim b/syntax/radiance.vim
index 8635aec02..19febfae2 100644
--- a/syntax/radiance.vim
+++ b/syntax/radiance.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'radiance')
+if has_key(g:polyglot_is_disabled, 'radiance')
   finish
 endif
 
diff --git a/syntax/ragel.vim b/syntax/ragel.vim
index 82694d0ee..9ad261aef 100644
--- a/syntax/ragel.vim
+++ b/syntax/ragel.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ragel')
+if has_key(g:polyglot_is_disabled, 'ragel')
   finish
 endif
 
diff --git a/syntax/raku.vim b/syntax/raku.vim
index 7a3ce951c..99e8b1ef5 100644
--- a/syntax/raku.vim
+++ b/syntax/raku.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'raku')
+if has_key(g:polyglot_is_disabled, 'raku')
   finish
 endif
 
diff --git a/syntax/raml.vim b/syntax/raml.vim
index b0c167899..5e3db72b8 100644
--- a/syntax/raml.vim
+++ b/syntax/raml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'raml')
+if has_key(g:polyglot_is_disabled, 'raml')
   finish
 endif
 
diff --git a/syntax/ratpoison.vim b/syntax/ratpoison.vim
index b6ea350ce..4348511ad 100644
--- a/syntax/ratpoison.vim
+++ b/syntax/ratpoison.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ratpoison')
+if has_key(g:polyglot_is_disabled, 'ratpoison')
   finish
 endif
 
diff --git a/syntax/razor.vim b/syntax/razor.vim
index 3d064960a..c80ef5bf7 100644
--- a/syntax/razor.vim
+++ b/syntax/razor.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'razor')
+if has_key(g:polyglot_is_disabled, 'razor')
   finish
 endif
 
diff --git a/syntax/rc.vim b/syntax/rc.vim
index d284143af..8acbb817d 100644
--- a/syntax/rc.vim
+++ b/syntax/rc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rc')
+if has_key(g:polyglot_is_disabled, 'rc')
   finish
 endif
 
diff --git a/syntax/rcs.vim b/syntax/rcs.vim
index 73f6769ce..55a36bd23 100644
--- a/syntax/rcs.vim
+++ b/syntax/rcs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rcs')
+if has_key(g:polyglot_is_disabled, 'rcs')
   finish
 endif
 
diff --git a/syntax/readline.vim b/syntax/readline.vim
index a9cfc59cc..7c0b9ebed 100644
--- a/syntax/readline.vim
+++ b/syntax/readline.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'readline')
+if has_key(g:polyglot_is_disabled, 'readline')
   finish
 endif
 
diff --git a/syntax/reason.vim b/syntax/reason.vim
index cfc43bd68..a5fb4eacb 100644
--- a/syntax/reason.vim
+++ b/syntax/reason.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'reason')
+if has_key(g:polyglot_is_disabled, 'reason')
   finish
 endif
 
diff --git a/syntax/rego.vim b/syntax/rego.vim
index 5c0cfd521..018962888 100644
--- a/syntax/rego.vim
+++ b/syntax/rego.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rego')
+if has_key(g:polyglot_is_disabled, 'rego')
   finish
 endif
 
diff --git a/syntax/remind.vim b/syntax/remind.vim
index 74dcd7919..cf0a09e9f 100644
--- a/syntax/remind.vim
+++ b/syntax/remind.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'remind')
+if has_key(g:polyglot_is_disabled, 'remind')
   finish
 endif
 
diff --git a/syntax/requirements.vim b/syntax/requirements.vim
index 296541d5f..c534727ed 100644
--- a/syntax/requirements.vim
+++ b/syntax/requirements.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'requirements')
+if has_key(g:polyglot_is_disabled, 'requirements')
   finish
 endif
 
diff --git a/syntax/resolv.vim b/syntax/resolv.vim
index 0e4925335..d19e1df39 100644
--- a/syntax/resolv.vim
+++ b/syntax/resolv.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'resolv')
+if has_key(g:polyglot_is_disabled, 'resolv')
   finish
 endif
 
diff --git a/syntax/reva.vim b/syntax/reva.vim
index 4af2b2f79..6b13b2134 100644
--- a/syntax/reva.vim
+++ b/syntax/reva.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'reva')
+if has_key(g:polyglot_is_disabled, 'reva')
   finish
 endif
 
diff --git a/syntax/rexx.vim b/syntax/rexx.vim
index 863526b29..88c21ef63 100644
--- a/syntax/rexx.vim
+++ b/syntax/rexx.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rexx')
+if has_key(g:polyglot_is_disabled, 'rexx')
   finish
 endif
 
diff --git a/syntax/rhelp.vim b/syntax/rhelp.vim
index c54ef18af..63f8f3861 100644
--- a/syntax/rhelp.vim
+++ b/syntax/rhelp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'r-lang')
+if has_key(g:polyglot_is_disabled, 'r-lang')
   finish
 endif
 
diff --git a/syntax/rib.vim b/syntax/rib.vim
index 5999744d3..4b8b3e182 100644
--- a/syntax/rib.vim
+++ b/syntax/rib.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rib')
+if has_key(g:polyglot_is_disabled, 'rib')
   finish
 endif
 
diff --git a/syntax/rmd.vim b/syntax/rmd.vim
index 08194ef85..43e79af27 100644
--- a/syntax/rmd.vim
+++ b/syntax/rmd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rmd')
+if has_key(g:polyglot_is_disabled, 'rmd')
   finish
 endif
 
diff --git a/syntax/rnc.vim b/syntax/rnc.vim
index 8a09091de..2f01f15ea 100644
--- a/syntax/rnc.vim
+++ b/syntax/rnc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rnc')
+if has_key(g:polyglot_is_disabled, 'rnc')
   finish
 endif
 
diff --git a/syntax/rng.vim b/syntax/rng.vim
index 8783ac453..ce663d74c 100644
--- a/syntax/rng.vim
+++ b/syntax/rng.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rng')
+if has_key(g:polyglot_is_disabled, 'rng')
   finish
 endif
 
diff --git a/syntax/rnoweb-1.vim b/syntax/rnoweb-1.vim
index 767a06a34..edda324f7 100644
--- a/syntax/rnoweb-1.vim
+++ b/syntax/rnoweb-1.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'r-lang')
+if has_key(g:polyglot_is_disabled, 'r-lang')
   finish
 endif
 
diff --git a/syntax/rnoweb-2.vim b/syntax/rnoweb-2.vim
index 9c28c37a0..49aa841a9 100644
--- a/syntax/rnoweb-2.vim
+++ b/syntax/rnoweb-2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rnoweb')
+if has_key(g:polyglot_is_disabled, 'rnoweb')
   finish
 endif
 
diff --git a/syntax/robots.vim b/syntax/robots.vim
index 2bd69f1ca..667423d78 100644
--- a/syntax/robots.vim
+++ b/syntax/robots.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'robots')
+if has_key(g:polyglot_is_disabled, 'robots')
   finish
 endif
 
diff --git a/syntax/rpcgen.vim b/syntax/rpcgen.vim
index 285d1e63c..1990f7a4e 100644
--- a/syntax/rpcgen.vim
+++ b/syntax/rpcgen.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rpcgen')
+if has_key(g:polyglot_is_disabled, 'rpcgen')
   finish
 endif
 
diff --git a/syntax/rpl.vim b/syntax/rpl.vim
index 62b469bd3..7a4d3fc8b 100644
--- a/syntax/rpl.vim
+++ b/syntax/rpl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rpl')
+if has_key(g:polyglot_is_disabled, 'rpl')
   finish
 endif
 
diff --git a/syntax/rrst.vim b/syntax/rrst.vim
index cd11bf585..426df72bd 100644
--- a/syntax/rrst.vim
+++ b/syntax/rrst.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rrst')
+if has_key(g:polyglot_is_disabled, 'rrst')
   finish
 endif
 
diff --git a/syntax/rst.vim b/syntax/rst.vim
index 73db95424..08517f729 100644
--- a/syntax/rst.vim
+++ b/syntax/rst.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rst')
+if has_key(g:polyglot_is_disabled, 'rst')
   finish
 endif
 
diff --git a/syntax/rtf.vim b/syntax/rtf.vim
index c188f2152..b3f01274c 100644
--- a/syntax/rtf.vim
+++ b/syntax/rtf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rtf')
+if has_key(g:polyglot_is_disabled, 'rtf')
   finish
 endif
 
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index d63cc7c53..54dc11ac5 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ruby')
+if has_key(g:polyglot_is_disabled, 'ruby')
   finish
 endif
 
diff --git a/syntax/rust.vim b/syntax/rust.vim
index d18fb3a05..a0d01d531 100644
--- a/syntax/rust.vim
+++ b/syntax/rust.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'rust')
+if has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/syntax/samba.vim b/syntax/samba.vim
index 06938b708..68fedc1c3 100644
--- a/syntax/samba.vim
+++ b/syntax/samba.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'samba')
+if has_key(g:polyglot_is_disabled, 'samba')
   finish
 endif
 
diff --git a/syntax/sas.vim b/syntax/sas.vim
index 66f03047d..505c11293 100644
--- a/syntax/sas.vim
+++ b/syntax/sas.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sas')
+if has_key(g:polyglot_is_disabled, 'sas')
   finish
 endif
 
diff --git a/syntax/sass.vim b/syntax/sass.vim
index 1711d6419..12b82eb17 100644
--- a/syntax/sass.vim
+++ b/syntax/sass.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sass')
+if has_key(g:polyglot_is_disabled, 'sass')
   finish
 endif
 
diff --git a/syntax/sather.vim b/syntax/sather.vim
index ada04313a..c9666be3f 100644
--- a/syntax/sather.vim
+++ b/syntax/sather.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sather')
+if has_key(g:polyglot_is_disabled, 'sather')
   finish
 endif
 
diff --git a/syntax/sbt.vim b/syntax/sbt.vim
index 61802fba2..f8dd9a0e0 100644
--- a/syntax/sbt.vim
+++ b/syntax/sbt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sbt')
+if has_key(g:polyglot_is_disabled, 'sbt')
   finish
 endif
 
diff --git a/syntax/scala.vim b/syntax/scala.vim
index ba22ecb19..5188cefa4 100644
--- a/syntax/scala.vim
+++ b/syntax/scala.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scala')
+if has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/syntax/scheme.vim b/syntax/scheme.vim
index 2fc96d71c..63ffe7a6a 100644
--- a/syntax/scheme.vim
+++ b/syntax/scheme.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scheme')
+if has_key(g:polyglot_is_disabled, 'scheme')
   finish
 endif
 
diff --git a/syntax/scilab.vim b/syntax/scilab.vim
index 128c84c9c..b82bf316e 100644
--- a/syntax/scilab.vim
+++ b/syntax/scilab.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scilab')
+if has_key(g:polyglot_is_disabled, 'scilab')
   finish
 endif
 
diff --git a/syntax/screen.vim b/syntax/screen.vim
index c4ecb1370..156ab486d 100644
--- a/syntax/screen.vim
+++ b/syntax/screen.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'screen')
+if has_key(g:polyglot_is_disabled, 'screen')
   finish
 endif
 
diff --git a/syntax/scss.vim b/syntax/scss.vim
index 3da765485..18f6ca26c 100644
--- a/syntax/scss.vim
+++ b/syntax/scss.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'scss')
+if has_key(g:polyglot_is_disabled, 'scss')
   finish
 endif
 
diff --git a/syntax/sd.vim b/syntax/sd.vim
index 275e88989..7d93112f8 100644
--- a/syntax/sd.vim
+++ b/syntax/sd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sd')
+if has_key(g:polyglot_is_disabled, 'sd')
   finish
 endif
 
diff --git a/syntax/sdc.vim b/syntax/sdc.vim
index f310957da..3d055fb5b 100644
--- a/syntax/sdc.vim
+++ b/syntax/sdc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sdc')
+if has_key(g:polyglot_is_disabled, 'sdc')
   finish
 endif
 
diff --git a/syntax/sdl.vim b/syntax/sdl.vim
index c1892ac77..5531cfe03 100644
--- a/syntax/sdl.vim
+++ b/syntax/sdl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sdl')
+if has_key(g:polyglot_is_disabled, 'sdl')
   finish
 endif
 
diff --git a/syntax/sed.vim b/syntax/sed.vim
index ad9cc1e3d..d5ccb5be6 100644
--- a/syntax/sed.vim
+++ b/syntax/sed.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sed')
+if has_key(g:polyglot_is_disabled, 'sed')
   finish
 endif
 
diff --git a/syntax/sensors.vim b/syntax/sensors.vim
index 37ffbd575..21a9d5c9f 100644
--- a/syntax/sensors.vim
+++ b/syntax/sensors.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sensors')
+if has_key(g:polyglot_is_disabled, 'sensors')
   finish
 endif
 
diff --git a/syntax/services.vim b/syntax/services.vim
index 3315a1b7b..70a935272 100644
--- a/syntax/services.vim
+++ b/syntax/services.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'services')
+if has_key(g:polyglot_is_disabled, 'services')
   finish
 endif
 
diff --git a/syntax/setserial.vim b/syntax/setserial.vim
index d1825b3f6..94b78fa0c 100644
--- a/syntax/setserial.vim
+++ b/syntax/setserial.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'setserial')
+if has_key(g:polyglot_is_disabled, 'setserial')
   finish
 endif
 
diff --git a/syntax/sexplib.vim b/syntax/sexplib.vim
index 1d6f27fa1..c0787af90 100644
--- a/syntax/sexplib.vim
+++ b/syntax/sexplib.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'ocaml')
+if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
diff --git a/syntax/sh.vim b/syntax/sh.vim
index 11d5f394f..8be86a841 100644
--- a/syntax/sh.vim
+++ b/syntax/sh.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sh')
+if has_key(g:polyglot_is_disabled, 'sh')
   finish
 endif
 
diff --git a/syntax/sieve.vim b/syntax/sieve.vim
index 29b4a0977..4924e30af 100644
--- a/syntax/sieve.vim
+++ b/syntax/sieve.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sieve')
+if has_key(g:polyglot_is_disabled, 'sieve')
   finish
 endif
 
diff --git a/syntax/sil.vim b/syntax/sil.vim
index c6c63d053..ad1907a93 100644
--- a/syntax/sil.vim
+++ b/syntax/sil.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sil')
+if has_key(g:polyglot_is_disabled, 'sil')
   finish
 endif
 
diff --git a/syntax/simula.vim b/syntax/simula.vim
index 803567e34..4ed4b65ca 100644
--- a/syntax/simula.vim
+++ b/syntax/simula.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'simula')
+if has_key(g:polyglot_is_disabled, 'simula')
   finish
 endif
 
diff --git a/syntax/sinda.vim b/syntax/sinda.vim
index 648c16662..48ea26e2d 100644
--- a/syntax/sinda.vim
+++ b/syntax/sinda.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sinda')
+if has_key(g:polyglot_is_disabled, 'sinda')
   finish
 endif
 
diff --git a/syntax/sisu.vim b/syntax/sisu.vim
index 723b298e4..e858ad58d 100644
--- a/syntax/sisu.vim
+++ b/syntax/sisu.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sisu')
+if has_key(g:polyglot_is_disabled, 'sisu')
   finish
 endif
 
diff --git a/syntax/skill.vim b/syntax/skill.vim
index 5c4c9df23..ae10e3c50 100644
--- a/syntax/skill.vim
+++ b/syntax/skill.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'skill')
+if has_key(g:polyglot_is_disabled, 'skill')
   finish
 endif
 
diff --git a/syntax/slang.vim b/syntax/slang.vim
index d65c8608d..54ed5f2cf 100644
--- a/syntax/slang.vim
+++ b/syntax/slang.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slang')
+if has_key(g:polyglot_is_disabled, 'slang')
   finish
 endif
 
diff --git a/syntax/slice.vim b/syntax/slice.vim
index 4142f3b8a..5588cd561 100644
--- a/syntax/slice.vim
+++ b/syntax/slice.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slice')
+if has_key(g:polyglot_is_disabled, 'slice')
   finish
 endif
 
diff --git a/syntax/slim.vim b/syntax/slim.vim
index d4ae63672..bf09698a3 100644
--- a/syntax/slim.vim
+++ b/syntax/slim.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slim')
+if has_key(g:polyglot_is_disabled, 'slim')
   finish
 endif
 
diff --git a/syntax/slime.vim b/syntax/slime.vim
index 652454db4..169b20c7b 100644
--- a/syntax/slime.vim
+++ b/syntax/slime.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slime')
+if has_key(g:polyglot_is_disabled, 'slime')
   finish
 endif
 
diff --git a/syntax/slpconf.vim b/syntax/slpconf.vim
index a617ddb36..9484c3330 100644
--- a/syntax/slpconf.vim
+++ b/syntax/slpconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slpconf')
+if has_key(g:polyglot_is_disabled, 'slpconf')
   finish
 endif
 
diff --git a/syntax/slpreg.vim b/syntax/slpreg.vim
index 7e2f28670..ffee9bf8d 100644
--- a/syntax/slpreg.vim
+++ b/syntax/slpreg.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slpreg')
+if has_key(g:polyglot_is_disabled, 'slpreg')
   finish
 endif
 
diff --git a/syntax/slpspi.vim b/syntax/slpspi.vim
index c58f6c919..f8cbde48e 100644
--- a/syntax/slpspi.vim
+++ b/syntax/slpspi.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slpspi')
+if has_key(g:polyglot_is_disabled, 'slpspi')
   finish
 endif
 
diff --git a/syntax/slrnrc.vim b/syntax/slrnrc.vim
index 9c455b9ae..37d91d719 100644
--- a/syntax/slrnrc.vim
+++ b/syntax/slrnrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slrnrc')
+if has_key(g:polyglot_is_disabled, 'slrnrc')
   finish
 endif
 
diff --git a/syntax/slrnsc.vim b/syntax/slrnsc.vim
index 444580d33..9fa8b57ef 100644
--- a/syntax/slrnsc.vim
+++ b/syntax/slrnsc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'slrnsc')
+if has_key(g:polyglot_is_disabled, 'slrnsc')
   finish
 endif
 
diff --git a/syntax/sm.vim b/syntax/sm.vim
index 1dd950be5..0180b59f6 100644
--- a/syntax/sm.vim
+++ b/syntax/sm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sm')
+if has_key(g:polyglot_is_disabled, 'sm')
   finish
 endif
 
diff --git a/syntax/smarty.vim b/syntax/smarty.vim
index eae2ade31..f90cab63e 100644
--- a/syntax/smarty.vim
+++ b/syntax/smarty.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'smarty')
+if has_key(g:polyglot_is_disabled, 'smarty')
   finish
 endif
 
diff --git a/syntax/smcl.vim b/syntax/smcl.vim
index afe342b6c..8f844578a 100644
--- a/syntax/smcl.vim
+++ b/syntax/smcl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'smcl')
+if has_key(g:polyglot_is_disabled, 'smcl')
   finish
 endif
 
diff --git a/syntax/smhl.vim b/syntax/smhl.vim
index a46db9087..060aa0e7e 100644
--- a/syntax/smhl.vim
+++ b/syntax/smhl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/smith.vim b/syntax/smith.vim
index 8b4449d44..6dd679e20 100644
--- a/syntax/smith.vim
+++ b/syntax/smith.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'smith')
+if has_key(g:polyglot_is_disabled, 'smith')
   finish
 endif
 
diff --git a/syntax/sml.vim b/syntax/sml.vim
index 3656b2d39..283f53392 100644
--- a/syntax/sml.vim
+++ b/syntax/sml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sml')
+if has_key(g:polyglot_is_disabled, 'sml')
   finish
 endif
 
diff --git a/syntax/smt2.vim b/syntax/smt2.vim
index 8ee8c2ac5..62479d3bb 100644
--- a/syntax/smt2.vim
+++ b/syntax/smt2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'smt2')
+if has_key(g:polyglot_is_disabled, 'smt2')
   finish
 endif
 
diff --git a/syntax/snobol4.vim b/syntax/snobol4.vim
index e5ce00ebd..cadcafb8d 100644
--- a/syntax/snobol4.vim
+++ b/syntax/snobol4.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'snobol4')
+if has_key(g:polyglot_is_disabled, 'snobol4')
   finish
 endif
 
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index a1bca69e3..3be7ed153 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'solidity')
+if has_key(g:polyglot_is_disabled, 'solidity')
   finish
 endif
 
diff --git a/syntax/spec.vim b/syntax/spec.vim
index c7ccc4d21..17b5a2b82 100644
--- a/syntax/spec.vim
+++ b/syntax/spec.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'spec')
+if has_key(g:polyglot_is_disabled, 'spec')
   finish
 endif
 
diff --git a/syntax/spice.vim b/syntax/spice.vim
index 44e5a3307..d530fbbda 100644
--- a/syntax/spice.vim
+++ b/syntax/spice.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'spice')
+if has_key(g:polyglot_is_disabled, 'spice')
   finish
 endif
 
diff --git a/syntax/spup.vim b/syntax/spup.vim
index 6112ac179..7b25c2bea 100644
--- a/syntax/spup.vim
+++ b/syntax/spup.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'spup')
+if has_key(g:polyglot_is_disabled, 'spup')
   finish
 endif
 
diff --git a/syntax/spyce.vim b/syntax/spyce.vim
index 297cac6d7..5a60aedbf 100644
--- a/syntax/spyce.vim
+++ b/syntax/spyce.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'spyce')
+if has_key(g:polyglot_is_disabled, 'spyce')
   finish
 endif
 
diff --git a/syntax/sql.vim b/syntax/sql.vim
index 15c09ff2c..a9eb45173 100644
--- a/syntax/sql.vim
+++ b/syntax/sql.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sql')
+if has_key(g:polyglot_is_disabled, 'sql')
   finish
 endif
 
diff --git a/syntax/sqlj.vim b/syntax/sqlj.vim
index e4010e2c5..f44a696f7 100644
--- a/syntax/sqlj.vim
+++ b/syntax/sqlj.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sqlj')
+if has_key(g:polyglot_is_disabled, 'sqlj')
   finish
 endif
 
diff --git a/syntax/sqloracle.vim b/syntax/sqloracle.vim
index 921f0236b..ee6276ca5 100644
--- a/syntax/sqloracle.vim
+++ b/syntax/sqloracle.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sql')
+if has_key(g:polyglot_is_disabled, 'sql')
   finish
 endif
 
diff --git a/syntax/sqr.vim b/syntax/sqr.vim
index cb2a901ad..a4f022a27 100644
--- a/syntax/sqr.vim
+++ b/syntax/sqr.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sqr')
+if has_key(g:polyglot_is_disabled, 'sqr')
   finish
 endif
 
diff --git a/syntax/squid.vim b/syntax/squid.vim
index 2e10ac7d6..e23d18843 100644
--- a/syntax/squid.vim
+++ b/syntax/squid.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'squid')
+if has_key(g:polyglot_is_disabled, 'squid')
   finish
 endif
 
diff --git a/syntax/srec.vim b/syntax/srec.vim
index 02c29436a..e8b808048 100644
--- a/syntax/srec.vim
+++ b/syntax/srec.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'srec')
+if has_key(g:polyglot_is_disabled, 'srec')
   finish
 endif
 
diff --git a/syntax/sshconfig.vim b/syntax/sshconfig.vim
index 7c9b16803..0a70e5016 100644
--- a/syntax/sshconfig.vim
+++ b/syntax/sshconfig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sshconfig')
+if has_key(g:polyglot_is_disabled, 'sshconfig')
   finish
 endif
 
diff --git a/syntax/sshdconfig.vim b/syntax/sshdconfig.vim
index b47ba9713..81cea2e7d 100644
--- a/syntax/sshdconfig.vim
+++ b/syntax/sshdconfig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sshdconfig')
+if has_key(g:polyglot_is_disabled, 'sshdconfig')
   finish
 endif
 
diff --git a/syntax/st.vim b/syntax/st.vim
index 1a08c203c..70c0d9cc1 100644
--- a/syntax/st.vim
+++ b/syntax/st.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'st')
+if has_key(g:polyglot_is_disabled, 'st')
   finish
 endif
 
diff --git a/syntax/stata.vim b/syntax/stata.vim
index 12faf80e0..260984493 100644
--- a/syntax/stata.vim
+++ b/syntax/stata.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'stata')
+if has_key(g:polyglot_is_disabled, 'stata')
   finish
 endif
 
diff --git a/syntax/stp.vim b/syntax/stp.vim
index 787590b5d..53236246f 100644
--- a/syntax/stp.vim
+++ b/syntax/stp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'stp')
+if has_key(g:polyglot_is_disabled, 'stp')
   finish
 endif
 
diff --git a/syntax/stylus.vim b/syntax/stylus.vim
index fdd4c3712..9b3008af1 100644
--- a/syntax/stylus.vim
+++ b/syntax/stylus.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'stylus')
+if has_key(g:polyglot_is_disabled, 'stylus')
   finish
 endif
 
diff --git a/syntax/sudoers.vim b/syntax/sudoers.vim
index d2ae719a5..3e4f823f0 100644
--- a/syntax/sudoers.vim
+++ b/syntax/sudoers.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sudoers')
+if has_key(g:polyglot_is_disabled, 'sudoers')
   finish
 endif
 
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index 848569439..3a5360f84 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'svelte')
+if has_key(g:polyglot_is_disabled, 'svelte')
   finish
 endif
 
diff --git a/syntax/svg.vim b/syntax/svg.vim
index 7746da37b..931b259fe 100644
--- a/syntax/svg.vim
+++ b/syntax/svg.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'svg')
+if has_key(g:polyglot_is_disabled, 'svg')
   finish
 endif
 
diff --git a/syntax/svn.vim b/syntax/svn.vim
index 3ff758eb4..4780a2ef1 100644
--- a/syntax/svn.vim
+++ b/syntax/svn.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'svn')
+if has_key(g:polyglot_is_disabled, 'svn')
   finish
 endif
 
diff --git a/syntax/swift.vim b/syntax/swift.vim
index 102eedb65..4290139d3 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'swift')
+if has_key(g:polyglot_is_disabled, 'swift')
   finish
 endif
 
diff --git a/syntax/swiftgyb.vim b/syntax/swiftgyb.vim
index d4d27da2f..6927a6697 100644
--- a/syntax/swiftgyb.vim
+++ b/syntax/swiftgyb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'swiftgyb')
+if has_key(g:polyglot_is_disabled, 'swiftgyb')
   finish
 endif
 
diff --git a/syntax/sxhkdrc.vim b/syntax/sxhkdrc.vim
index e4950e6c6..6b4e3faec 100644
--- a/syntax/sxhkdrc.vim
+++ b/syntax/sxhkdrc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sxhkd')
+if has_key(g:polyglot_is_disabled, 'sxhkd')
   finish
 endif
 
diff --git a/syntax/sysctl.vim b/syntax/sysctl.vim
index c67ca83ae..79ddba0ca 100644
--- a/syntax/sysctl.vim
+++ b/syntax/sysctl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sysctl')
+if has_key(g:polyglot_is_disabled, 'sysctl')
   finish
 endif
 
diff --git a/syntax/systemd.vim b/syntax/systemd.vim
index d26fdf1dd..8c7aed27a 100644
--- a/syntax/systemd.vim
+++ b/syntax/systemd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'systemd')
+if has_key(g:polyglot_is_disabled, 'systemd')
   finish
 endif
 
diff --git a/syntax/systemverilog.vim b/syntax/systemverilog.vim
index 5be897bd8..9c9a8249d 100644
--- a/syntax/systemverilog.vim
+++ b/syntax/systemverilog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'systemverilog')
+if has_key(g:polyglot_is_disabled, 'systemverilog')
   finish
 endif
 
diff --git a/syntax/tablegen.vim b/syntax/tablegen.vim
index 6701d9a27..6eee43789 100644
--- a/syntax/tablegen.vim
+++ b/syntax/tablegen.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'llvm')
+if has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/syntax/tads.vim b/syntax/tads.vim
index 5267823bf..8cd1ef44d 100644
--- a/syntax/tads.vim
+++ b/syntax/tads.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tads')
+if has_key(g:polyglot_is_disabled, 'tads')
   finish
 endif
 
diff --git a/syntax/tags.vim b/syntax/tags.vim
index 19ca19b41..4db68929f 100644
--- a/syntax/tags.vim
+++ b/syntax/tags.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tags')
+if has_key(g:polyglot_is_disabled, 'tags')
   finish
 endif
 
diff --git a/syntax/tak.vim b/syntax/tak.vim
index 435127426..5a58401dc 100644
--- a/syntax/tak.vim
+++ b/syntax/tak.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tak')
+if has_key(g:polyglot_is_disabled, 'tak')
   finish
 endif
 
diff --git a/syntax/tap.vim b/syntax/tap.vim
index 2ff30f830..a7ed6d829 100644
--- a/syntax/tap.vim
+++ b/syntax/tap.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'perl')
+if has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/taskdata.vim b/syntax/taskdata.vim
index 6ef63d445..0f1a4ef91 100644
--- a/syntax/taskdata.vim
+++ b/syntax/taskdata.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'taskdata')
+if has_key(g:polyglot_is_disabled, 'taskdata')
   finish
 endif
 
diff --git a/syntax/taskedit.vim b/syntax/taskedit.vim
index fcf1ad44c..25304b3f1 100644
--- a/syntax/taskedit.vim
+++ b/syntax/taskedit.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'taskedit')
+if has_key(g:polyglot_is_disabled, 'taskedit')
   finish
 endif
 
diff --git a/syntax/tcl.vim b/syntax/tcl.vim
index a7751ef85..73a9cf405 100644
--- a/syntax/tcl.vim
+++ b/syntax/tcl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tcl')
+if has_key(g:polyglot_is_disabled, 'tcl')
   finish
 endif
 
diff --git a/syntax/template.vim b/syntax/template.vim
index ae8ddeed6..f0146c3d7 100644
--- a/syntax/template.vim
+++ b/syntax/template.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'template')
+if has_key(g:polyglot_is_disabled, 'template')
   finish
 endif
 
diff --git a/syntax/teraterm.vim b/syntax/teraterm.vim
index ed458f8ec..12e055a83 100644
--- a/syntax/teraterm.vim
+++ b/syntax/teraterm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'teraterm')
+if has_key(g:polyglot_is_disabled, 'teraterm')
   finish
 endif
 
diff --git a/syntax/terminfo.vim b/syntax/terminfo.vim
index e9056affb..98256c80a 100644
--- a/syntax/terminfo.vim
+++ b/syntax/terminfo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'terminfo')
+if has_key(g:polyglot_is_disabled, 'terminfo')
   finish
 endif
 
diff --git a/syntax/terraform.vim b/syntax/terraform.vim
index 786a3bba9..7acb8512a 100644
--- a/syntax/terraform.vim
+++ b/syntax/terraform.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'terraform')
+if has_key(g:polyglot_is_disabled, 'terraform')
   finish
 endif
 
diff --git a/syntax/tex.vim b/syntax/tex.vim
index f65d554af..8a30dc309 100644
--- a/syntax/tex.vim
+++ b/syntax/tex.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tex')
+if has_key(g:polyglot_is_disabled, 'tex')
   finish
 endif
 
diff --git a/syntax/texinfo.vim b/syntax/texinfo.vim
index 16a878ada..b10a4eb7c 100644
--- a/syntax/texinfo.vim
+++ b/syntax/texinfo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'texinfo')
+if has_key(g:polyglot_is_disabled, 'texinfo')
   finish
 endif
 
diff --git a/syntax/texmf.vim b/syntax/texmf.vim
index 3ecd4a99e..7023714de 100644
--- a/syntax/texmf.vim
+++ b/syntax/texmf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'texmf')
+if has_key(g:polyglot_is_disabled, 'texmf')
   finish
 endif
 
diff --git a/syntax/textile.vim b/syntax/textile.vim
index 1bdce409a..8153f21ae 100644
--- a/syntax/textile.vim
+++ b/syntax/textile.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'textile')
+if has_key(g:polyglot_is_disabled, 'textile')
   finish
 endif
 
diff --git a/syntax/tf.vim b/syntax/tf.vim
index 1202c51ab..f033c4c61 100644
--- a/syntax/tf.vim
+++ b/syntax/tf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tf')
+if has_key(g:polyglot_is_disabled, 'tf')
   finish
 endif
 
diff --git a/syntax/thrift.vim b/syntax/thrift.vim
index 7a0dd5dc6..f3e8a20ec 100644
--- a/syntax/thrift.vim
+++ b/syntax/thrift.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'thrift')
+if has_key(g:polyglot_is_disabled, 'thrift')
   finish
 endif
 
diff --git a/syntax/tidy.vim b/syntax/tidy.vim
index f61d5aa03..437e5493b 100644
--- a/syntax/tidy.vim
+++ b/syntax/tidy.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tidy')
+if has_key(g:polyglot_is_disabled, 'tidy')
   finish
 endif
 
diff --git a/syntax/tilde.vim b/syntax/tilde.vim
index 2985ce1fc..3e70d9341 100644
--- a/syntax/tilde.vim
+++ b/syntax/tilde.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tilde')
+if has_key(g:polyglot_is_disabled, 'tilde')
   finish
 endif
 
diff --git a/syntax/tli.vim b/syntax/tli.vim
index 7360e1634..e8d6a65ec 100644
--- a/syntax/tli.vim
+++ b/syntax/tli.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tli')
+if has_key(g:polyglot_is_disabled, 'tli')
   finish
 endif
 
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index 4051be631..a0b904967 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tmux')
+if has_key(g:polyglot_is_disabled, 'tmux')
   finish
 endif
 
diff --git a/syntax/toml.vim b/syntax/toml.vim
index 1cf2abc90..cf2dfd688 100644
--- a/syntax/toml.vim
+++ b/syntax/toml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'toml')
+if has_key(g:polyglot_is_disabled, 'toml')
   finish
 endif
 
diff --git a/syntax/tpp.vim b/syntax/tpp.vim
index 43278ae1e..9916af809 100644
--- a/syntax/tpp.vim
+++ b/syntax/tpp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tpp')
+if has_key(g:polyglot_is_disabled, 'tpp')
   finish
 endif
 
diff --git a/syntax/tptp.vim b/syntax/tptp.vim
index 414789a6c..70224eeef 100644
--- a/syntax/tptp.vim
+++ b/syntax/tptp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tptp')
+if has_key(g:polyglot_is_disabled, 'tptp')
   finish
 endif
 
diff --git a/syntax/trasys.vim b/syntax/trasys.vim
index 5cc2b8e4d..959d13f22 100644
--- a/syntax/trasys.vim
+++ b/syntax/trasys.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'trasys')
+if has_key(g:polyglot_is_disabled, 'trasys')
   finish
 endif
 
diff --git a/syntax/treetop.vim b/syntax/treetop.vim
index 461cb2165..2728e07cc 100644
--- a/syntax/treetop.vim
+++ b/syntax/treetop.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'treetop')
+if has_key(g:polyglot_is_disabled, 'treetop')
   finish
 endif
 
diff --git a/syntax/trustees.vim b/syntax/trustees.vim
index 9ae435cd1..316cf7914 100644
--- a/syntax/trustees.vim
+++ b/syntax/trustees.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'trustees')
+if has_key(g:polyglot_is_disabled, 'trustees')
   finish
 endif
 
diff --git a/syntax/tsalt.vim b/syntax/tsalt.vim
index 83b878786..37bb81404 100644
--- a/syntax/tsalt.vim
+++ b/syntax/tsalt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tsalt')
+if has_key(g:polyglot_is_disabled, 'tsalt')
   finish
 endif
 
diff --git a/syntax/tsscl.vim b/syntax/tsscl.vim
index 0468a010b..d12ec6481 100644
--- a/syntax/tsscl.vim
+++ b/syntax/tsscl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tsscl')
+if has_key(g:polyglot_is_disabled, 'tsscl')
   finish
 endif
 
diff --git a/syntax/tssgm.vim b/syntax/tssgm.vim
index e7aa39285..f478b6c38 100644
--- a/syntax/tssgm.vim
+++ b/syntax/tssgm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tssgm')
+if has_key(g:polyglot_is_disabled, 'tssgm')
   finish
 endif
 
diff --git a/syntax/tssop.vim b/syntax/tssop.vim
index ed3a47502..1991abc6e 100644
--- a/syntax/tssop.vim
+++ b/syntax/tssop.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'tssop')
+if has_key(g:polyglot_is_disabled, 'tssop')
   finish
 endif
 
diff --git a/syntax/tt2.vim b/syntax/tt2.vim
index 30cf72b2f..0dbc4ffc4 100644
--- a/syntax/tt2.vim
+++ b/syntax/tt2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'perl')
+if has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/tt2html.vim b/syntax/tt2html.vim
index b95410526..1cbd5cae1 100644
--- a/syntax/tt2html.vim
+++ b/syntax/tt2html.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'perl')
+if has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/tt2js.vim b/syntax/tt2js.vim
index af01db8df..cf260af11 100644
--- a/syntax/tt2js.vim
+++ b/syntax/tt2js.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'perl')
+if has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/twig.vim b/syntax/twig.vim
index 76905e74b..4f93de08e 100644
--- a/syntax/twig.vim
+++ b/syntax/twig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'twig')
+if has_key(g:polyglot_is_disabled, 'twig')
   finish
 endif
 
diff --git a/syntax/typescript.vim b/syntax/typescript.vim
index 76f8b21fc..27a63d07a 100644
--- a/syntax/typescript.vim
+++ b/syntax/typescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/typescriptreact.vim b/syntax/typescriptreact.vim
index 96dd5e071..8cf19f544 100644
--- a/syntax/typescriptreact.vim
+++ b/syntax/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/uc.vim b/syntax/uc.vim
index 409e197ba..1f204af3f 100644
--- a/syntax/uc.vim
+++ b/syntax/uc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'uc')
+if has_key(g:polyglot_is_disabled, 'uc')
   finish
 endif
 
diff --git a/syntax/udevconf.vim b/syntax/udevconf.vim
index 80bb6643a..a1e8dd5a4 100644
--- a/syntax/udevconf.vim
+++ b/syntax/udevconf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'udevconf')
+if has_key(g:polyglot_is_disabled, 'udevconf')
   finish
 endif
 
diff --git a/syntax/udevperm.vim b/syntax/udevperm.vim
index 452def81b..b80463e3c 100644
--- a/syntax/udevperm.vim
+++ b/syntax/udevperm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'udevperm')
+if has_key(g:polyglot_is_disabled, 'udevperm')
   finish
 endif
 
diff --git a/syntax/uil.vim b/syntax/uil.vim
index 38ce3104d..248d8332b 100644
--- a/syntax/uil.vim
+++ b/syntax/uil.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'uil')
+if has_key(g:polyglot_is_disabled, 'uil')
   finish
 endif
 
diff --git a/syntax/unison.vim b/syntax/unison.vim
index d11cac2cb..5fea116d5 100644
--- a/syntax/unison.vim
+++ b/syntax/unison.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'unison')
+if has_key(g:polyglot_is_disabled, 'unison')
   finish
 endif
 
diff --git a/syntax/updatedb.vim b/syntax/updatedb.vim
index 1507acad7..c3d0626b5 100644
--- a/syntax/updatedb.vim
+++ b/syntax/updatedb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'updatedb')
+if has_key(g:polyglot_is_disabled, 'updatedb')
   finish
 endif
 
diff --git a/syntax/upstart.vim b/syntax/upstart.vim
index 29d716adf..8b53ff59b 100644
--- a/syntax/upstart.vim
+++ b/syntax/upstart.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'upstart')
+if has_key(g:polyglot_is_disabled, 'upstart')
   finish
 endif
 
diff --git a/syntax/upstreamdat.vim b/syntax/upstreamdat.vim
index 5d2ad7375..f4c55e4c7 100644
--- a/syntax/upstreamdat.vim
+++ b/syntax/upstreamdat.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'upstreamdat')
+if has_key(g:polyglot_is_disabled, 'upstreamdat')
   finish
 endif
 
diff --git a/syntax/upstreaminstalllog.vim b/syntax/upstreaminstalllog.vim
index 1b7d28882..64abc788e 100644
--- a/syntax/upstreaminstalllog.vim
+++ b/syntax/upstreaminstalllog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'upstreaminstalllog')
+if has_key(g:polyglot_is_disabled, 'upstreaminstalllog')
   finish
 endif
 
diff --git a/syntax/upstreamlog.vim b/syntax/upstreamlog.vim
index 99dcf4e6b..0f9431dd1 100644
--- a/syntax/upstreamlog.vim
+++ b/syntax/upstreamlog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'upstreamlog')
+if has_key(g:polyglot_is_disabled, 'upstreamlog')
   finish
 endif
 
diff --git a/syntax/usserverlog.vim b/syntax/usserverlog.vim
index c6fca68a7..891e91e08 100644
--- a/syntax/usserverlog.vim
+++ b/syntax/usserverlog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'usserverlog')
+if has_key(g:polyglot_is_disabled, 'usserverlog')
   finish
 endif
 
diff --git a/syntax/usw2kagtlog.vim b/syntax/usw2kagtlog.vim
index c83378367..8cb5370f4 100644
--- a/syntax/usw2kagtlog.vim
+++ b/syntax/usw2kagtlog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'usw2kagtlog')
+if has_key(g:polyglot_is_disabled, 'usw2kagtlog')
   finish
 endif
 
diff --git a/syntax/vala.vim b/syntax/vala.vim
index 71a0e677c..75b269743 100644
--- a/syntax/vala.vim
+++ b/syntax/vala.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vala')
+if has_key(g:polyglot_is_disabled, 'vala')
   finish
 endif
 
diff --git a/syntax/vb.vim b/syntax/vb.vim
index fef5186e2..b2c4b94ce 100644
--- a/syntax/vb.vim
+++ b/syntax/vb.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'visual-basic')
+if has_key(g:polyglot_is_disabled, 'visual-basic')
   finish
 endif
 
diff --git a/syntax/vbnet.vim b/syntax/vbnet.vim
index 4ed37c331..8acc93c35 100644
--- a/syntax/vbnet.vim
+++ b/syntax/vbnet.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vbnet')
+if has_key(g:polyglot_is_disabled, 'vbnet')
   finish
 endif
 
diff --git a/syntax/vcl.vim b/syntax/vcl.vim
index 6d0c358b4..dfe049310 100644
--- a/syntax/vcl.vim
+++ b/syntax/vcl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vcl')
+if has_key(g:polyglot_is_disabled, 'vcl')
   finish
 endif
 
diff --git a/syntax/velocity.vim b/syntax/velocity.vim
index 73250c12a..6a074de5c 100644
--- a/syntax/velocity.vim
+++ b/syntax/velocity.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'velocity')
+if has_key(g:polyglot_is_disabled, 'velocity')
   finish
 endif
 
diff --git a/syntax/vera.vim b/syntax/vera.vim
index 3d2ab2564..b8027bc81 100644
--- a/syntax/vera.vim
+++ b/syntax/vera.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vera')
+if has_key(g:polyglot_is_disabled, 'vera')
   finish
 endif
 
diff --git a/syntax/verilog.vim b/syntax/verilog.vim
index f91718315..fec47f6e3 100644
--- a/syntax/verilog.vim
+++ b/syntax/verilog.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'verilog')
+if has_key(g:polyglot_is_disabled, 'verilog')
   finish
 endif
 
diff --git a/syntax/verilogams.vim b/syntax/verilogams.vim
index cd5a4a7f7..aa81b4681 100644
--- a/syntax/verilogams.vim
+++ b/syntax/verilogams.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'verilogams')
+if has_key(g:polyglot_is_disabled, 'verilogams')
   finish
 endif
 
diff --git a/syntax/vgrindefs.vim b/syntax/vgrindefs.vim
index 6cd64e021..5c0a03e03 100644
--- a/syntax/vgrindefs.vim
+++ b/syntax/vgrindefs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vgrindefs')
+if has_key(g:polyglot_is_disabled, 'vgrindefs')
   finish
 endif
 
diff --git a/syntax/vhdl.vim b/syntax/vhdl.vim
index b38bb3b63..3b1e258ee 100644
--- a/syntax/vhdl.vim
+++ b/syntax/vhdl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vhdl')
+if has_key(g:polyglot_is_disabled, 'vhdl')
   finish
 endif
 
diff --git a/syntax/vimgo.vim b/syntax/vimgo.vim
index 6c54462a1..d67b10237 100644
--- a/syntax/vimgo.vim
+++ b/syntax/vimgo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'go')
+if has_key(g:polyglot_is_disabled, 'go')
   finish
 endif
 
diff --git a/syntax/viminfo.vim b/syntax/viminfo.vim
index 0df29fd48..1eada7ff8 100644
--- a/syntax/viminfo.vim
+++ b/syntax/viminfo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'viminfo')
+if has_key(g:polyglot_is_disabled, 'viminfo')
   finish
 endif
 
diff --git a/syntax/vlang.vim b/syntax/vlang.vim
index 4592a80cc..775784453 100644
--- a/syntax/vlang.vim
+++ b/syntax/vlang.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'v')
+if has_key(g:polyglot_is_disabled, 'v')
   finish
 endif
 
diff --git a/syntax/vmasm.vim b/syntax/vmasm.vim
index ee6bf5a8c..1e66acb85 100644
--- a/syntax/vmasm.vim
+++ b/syntax/vmasm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vmasm')
+if has_key(g:polyglot_is_disabled, 'vmasm')
   finish
 endif
 
diff --git a/syntax/voscm.vim b/syntax/voscm.vim
index 9cb010731..d640b6084 100644
--- a/syntax/voscm.vim
+++ b/syntax/voscm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'voscm')
+if has_key(g:polyglot_is_disabled, 'voscm')
   finish
 endif
 
diff --git a/syntax/vrml.vim b/syntax/vrml.vim
index a1c461d62..7c1b89071 100644
--- a/syntax/vrml.vim
+++ b/syntax/vrml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vrml')
+if has_key(g:polyglot_is_disabled, 'vrml')
   finish
 endif
 
diff --git a/syntax/vroom.vim b/syntax/vroom.vim
index 2036b6abb..7a3047ba0 100644
--- a/syntax/vroom.vim
+++ b/syntax/vroom.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vroom')
+if has_key(g:polyglot_is_disabled, 'vroom')
   finish
 endif
 
diff --git a/syntax/vue.vim b/syntax/vue.vim
index ad4d65178..1f3d5d67b 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'vue')
+if has_key(g:polyglot_is_disabled, 'vue')
   finish
 endif
 
diff --git a/syntax/wast.vim b/syntax/wast.vim
index 70e70b38f..4d200a94a 100644
--- a/syntax/wast.vim
+++ b/syntax/wast.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'wast')
+if has_key(g:polyglot_is_disabled, 'wast')
   finish
 endif
 
diff --git a/syntax/webmacro.vim b/syntax/webmacro.vim
index 4cda57bc6..df4fa69e7 100644
--- a/syntax/webmacro.vim
+++ b/syntax/webmacro.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'webmacro')
+if has_key(g:polyglot_is_disabled, 'webmacro')
   finish
 endif
 
diff --git a/syntax/wget.vim b/syntax/wget.vim
index 268f8a6b8..3179eb48a 100644
--- a/syntax/wget.vim
+++ b/syntax/wget.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'wget')
+if has_key(g:polyglot_is_disabled, 'wget')
   finish
 endif
 
diff --git a/syntax/winbatch.vim b/syntax/winbatch.vim
index ae8e99822..16052fd0e 100644
--- a/syntax/winbatch.vim
+++ b/syntax/winbatch.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'winbatch')
+if has_key(g:polyglot_is_disabled, 'winbatch')
   finish
 endif
 
diff --git a/syntax/wml.vim b/syntax/wml.vim
index a3a980a7b..ff61af84a 100644
--- a/syntax/wml.vim
+++ b/syntax/wml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'wml')
+if has_key(g:polyglot_is_disabled, 'wml')
   finish
 endif
 
diff --git a/syntax/wsh.vim b/syntax/wsh.vim
index eebdd822e..363407e6f 100644
--- a/syntax/wsh.vim
+++ b/syntax/wsh.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'wsh')
+if has_key(g:polyglot_is_disabled, 'wsh')
   finish
 endif
 
diff --git a/syntax/wsml.vim b/syntax/wsml.vim
index f34cc9107..669ea8fb3 100644
--- a/syntax/wsml.vim
+++ b/syntax/wsml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'wsml')
+if has_key(g:polyglot_is_disabled, 'wsml')
   finish
 endif
 
diff --git a/syntax/wvdial.vim b/syntax/wvdial.vim
index 7f0884faf..41884b2b6 100644
--- a/syntax/wvdial.vim
+++ b/syntax/wvdial.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'wvdial')
+if has_key(g:polyglot_is_disabled, 'wvdial')
   finish
 endif
 
diff --git a/syntax/xdc.vim b/syntax/xdc.vim
index d4b93cc97..382658ad7 100644
--- a/syntax/xdc.vim
+++ b/syntax/xdc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xdc')
+if has_key(g:polyglot_is_disabled, 'xdc')
   finish
 endif
 
diff --git a/syntax/xdefaults.vim b/syntax/xdefaults.vim
index 16bf2db38..492beb821 100644
--- a/syntax/xdefaults.vim
+++ b/syntax/xdefaults.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xdefaults')
+if has_key(g:polyglot_is_disabled, 'xdefaults')
   finish
 endif
 
diff --git a/syntax/xf86conf.vim b/syntax/xf86conf.vim
index ab629510e..e12bf47b6 100644
--- a/syntax/xf86conf.vim
+++ b/syntax/xf86conf.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xf86conf')
+if has_key(g:polyglot_is_disabled, 'xf86conf')
   finish
 endif
 
diff --git a/syntax/xhtml.vim b/syntax/xhtml.vim
index 3df25ee23..ae8be9b1a 100644
--- a/syntax/xhtml.vim
+++ b/syntax/xhtml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xhtml')
+if has_key(g:polyglot_is_disabled, 'xhtml')
   finish
 endif
 
diff --git a/syntax/xinetd.vim b/syntax/xinetd.vim
index a1b180ae9..b5e26cd77 100644
--- a/syntax/xinetd.vim
+++ b/syntax/xinetd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xinetd')
+if has_key(g:polyglot_is_disabled, 'xinetd')
   finish
 endif
 
diff --git a/syntax/xmath.vim b/syntax/xmath.vim
index f319d9bb1..19ff4d5bd 100644
--- a/syntax/xmath.vim
+++ b/syntax/xmath.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xmath')
+if has_key(g:polyglot_is_disabled, 'xmath')
   finish
 endif
 
diff --git a/syntax/xml.vim b/syntax/xml.vim
index 21e469fe4..de19c797c 100644
--- a/syntax/xml.vim
+++ b/syntax/xml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xml')
+if has_key(g:polyglot_is_disabled, 'xml')
   finish
 endif
 
diff --git a/syntax/xmodmap.vim b/syntax/xmodmap.vim
index 2d4ebf959..c9bf7f892 100644
--- a/syntax/xmodmap.vim
+++ b/syntax/xmodmap.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xmodmap')
+if has_key(g:polyglot_is_disabled, 'xmodmap')
   finish
 endif
 
diff --git a/syntax/xpm.vim b/syntax/xpm.vim
index 5b0ebb180..123b4e0e2 100644
--- a/syntax/xpm.vim
+++ b/syntax/xpm.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xpm')
+if has_key(g:polyglot_is_disabled, 'xpm')
   finish
 endif
 
diff --git a/syntax/xpm2.vim b/syntax/xpm2.vim
index 94dc8b90a..8ed589aec 100644
--- a/syntax/xpm2.vim
+++ b/syntax/xpm2.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xpm2')
+if has_key(g:polyglot_is_disabled, 'xpm2')
   finish
 endif
 
diff --git a/syntax/xquery.vim b/syntax/xquery.vim
index e7bfa52da..dbb668d39 100644
--- a/syntax/xquery.vim
+++ b/syntax/xquery.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xquery')
+if has_key(g:polyglot_is_disabled, 'xquery')
   finish
 endif
 
diff --git a/syntax/xs.vim b/syntax/xs.vim
index 4c7b63296..d3d33d296 100644
--- a/syntax/xs.vim
+++ b/syntax/xs.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'perl')
+if has_key(g:polyglot_is_disabled, 'perl')
   finish
 endif
 
diff --git a/syntax/xsd.vim b/syntax/xsd.vim
index 0bd9e64cd..e88c88173 100644
--- a/syntax/xsd.vim
+++ b/syntax/xsd.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xsd')
+if has_key(g:polyglot_is_disabled, 'xsd')
   finish
 endif
 
diff --git a/syntax/xsl.vim b/syntax/xsl.vim
index 112c041c0..7dc4ccaeb 100644
--- a/syntax/xsl.vim
+++ b/syntax/xsl.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xsl')
+if has_key(g:polyglot_is_disabled, 'xsl')
   finish
 endif
 
diff --git a/syntax/xslt.vim b/syntax/xslt.vim
index 9a884ca97..c451fdeac 100644
--- a/syntax/xslt.vim
+++ b/syntax/xslt.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'xslt')
+if has_key(g:polyglot_is_disabled, 'xslt')
   finish
 endif
 
diff --git a/syntax/yacc.vim b/syntax/yacc.vim
index 5bfd6611e..90b2c5972 100644
--- a/syntax/yacc.vim
+++ b/syntax/yacc.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'yacc')
+if has_key(g:polyglot_is_disabled, 'yacc')
   finish
 endif
 
diff --git a/syntax/yaml.vim b/syntax/yaml.vim
index fa243b60d..1c4a93fdd 100644
--- a/syntax/yaml.vim
+++ b/syntax/yaml.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'yaml')
+if has_key(g:polyglot_is_disabled, 'yaml')
   finish
 endif
 
diff --git a/syntax/yats.vim b/syntax/yats.vim
index 255f133a8..5b1a869eb 100644
--- a/syntax/yats.vim
+++ b/syntax/yats.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/css.vim b/syntax/yats/css.vim
index 2baf78d39..3af02cae6 100644
--- a/syntax/yats/css.vim
+++ b/syntax/yats/css.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/dom-document.vim b/syntax/yats/dom-document.vim
index d8582220f..1c6bba990 100644
--- a/syntax/yats/dom-document.vim
+++ b/syntax/yats/dom-document.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/dom-elem.vim b/syntax/yats/dom-elem.vim
index 916a49323..9de61f666 100644
--- a/syntax/yats/dom-elem.vim
+++ b/syntax/yats/dom-elem.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/dom-event.vim b/syntax/yats/dom-event.vim
index ce8d1f5a3..462c3063e 100644
--- a/syntax/yats/dom-event.vim
+++ b/syntax/yats/dom-event.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/dom-form.vim b/syntax/yats/dom-form.vim
index 4e6cc8490..d8aae416f 100644
--- a/syntax/yats/dom-form.vim
+++ b/syntax/yats/dom-form.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/dom-node.vim b/syntax/yats/dom-node.vim
index d6675be20..219531360 100644
--- a/syntax/yats/dom-node.vim
+++ b/syntax/yats/dom-node.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/dom-storage.vim b/syntax/yats/dom-storage.vim
index 8067089d8..f3909a9b0 100644
--- a/syntax/yats/dom-storage.vim
+++ b/syntax/yats/dom-storage.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/ecma-402.vim b/syntax/yats/ecma-402.vim
index b0321c83e..8624b5d87 100644
--- a/syntax/yats/ecma-402.vim
+++ b/syntax/yats/ecma-402.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-array.vim b/syntax/yats/es6-array.vim
index 6f300ac50..8c8f52550 100644
--- a/syntax/yats/es6-array.vim
+++ b/syntax/yats/es6-array.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-date.vim b/syntax/yats/es6-date.vim
index 2bfcc54c3..441f6204e 100644
--- a/syntax/yats/es6-date.vim
+++ b/syntax/yats/es6-date.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-function.vim b/syntax/yats/es6-function.vim
index cb991a931..cb9bffe7b 100644
--- a/syntax/yats/es6-function.vim
+++ b/syntax/yats/es6-function.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-json.vim b/syntax/yats/es6-json.vim
index 622b941ac..5e10a03a5 100644
--- a/syntax/yats/es6-json.vim
+++ b/syntax/yats/es6-json.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-map.vim b/syntax/yats/es6-map.vim
index dbbc651ca..c51f0510e 100644
--- a/syntax/yats/es6-map.vim
+++ b/syntax/yats/es6-map.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-math.vim b/syntax/yats/es6-math.vim
index 0e950556c..44a11dd15 100644
--- a/syntax/yats/es6-math.vim
+++ b/syntax/yats/es6-math.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-number.vim b/syntax/yats/es6-number.vim
index 810d58f2b..092871488 100644
--- a/syntax/yats/es6-number.vim
+++ b/syntax/yats/es6-number.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-object.vim b/syntax/yats/es6-object.vim
index 6a8e9354c..605d0a86e 100644
--- a/syntax/yats/es6-object.vim
+++ b/syntax/yats/es6-object.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-promise.vim b/syntax/yats/es6-promise.vim
index bcbbf91f3..89c6da6e8 100644
--- a/syntax/yats/es6-promise.vim
+++ b/syntax/yats/es6-promise.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-proxy.vim b/syntax/yats/es6-proxy.vim
index 55aaeb7b8..f74b0471d 100644
--- a/syntax/yats/es6-proxy.vim
+++ b/syntax/yats/es6-proxy.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-reflect.vim b/syntax/yats/es6-reflect.vim
index ff9455547..d83d2f442 100644
--- a/syntax/yats/es6-reflect.vim
+++ b/syntax/yats/es6-reflect.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-regexp.vim b/syntax/yats/es6-regexp.vim
index c55bc5323..233d98ff1 100644
--- a/syntax/yats/es6-regexp.vim
+++ b/syntax/yats/es6-regexp.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-set.vim b/syntax/yats/es6-set.vim
index d35e26346..657d7f8d4 100644
--- a/syntax/yats/es6-set.vim
+++ b/syntax/yats/es6-set.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-string.vim b/syntax/yats/es6-string.vim
index 0369bb1c3..7db646e07 100644
--- a/syntax/yats/es6-string.vim
+++ b/syntax/yats/es6-string.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/es6-symbol.vim b/syntax/yats/es6-symbol.vim
index 7af3b5d32..5f52425ac 100644
--- a/syntax/yats/es6-symbol.vim
+++ b/syntax/yats/es6-symbol.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/event.vim b/syntax/yats/event.vim
index da4689951..3f9cf8e44 100644
--- a/syntax/yats/event.vim
+++ b/syntax/yats/event.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/node.vim b/syntax/yats/node.vim
index 9cae877ae..d2e8a4f4d 100644
--- a/syntax/yats/node.vim
+++ b/syntax/yats/node.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/test.vim b/syntax/yats/test.vim
index 19b9fd67b..3a38ef3be 100644
--- a/syntax/yats/test.vim
+++ b/syntax/yats/test.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/typescript.vim b/syntax/yats/typescript.vim
index bc137218d..7865168ad 100644
--- a/syntax/yats/typescript.vim
+++ b/syntax/yats/typescript.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-blob.vim b/syntax/yats/web-blob.vim
index aa0b63317..034a58b24 100644
--- a/syntax/yats/web-blob.vim
+++ b/syntax/yats/web-blob.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-console.vim b/syntax/yats/web-console.vim
index b425430ef..4dc269df9 100644
--- a/syntax/yats/web-console.vim
+++ b/syntax/yats/web-console.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-crypto.vim b/syntax/yats/web-crypto.vim
index 8160a2af7..07b28a38f 100644
--- a/syntax/yats/web-crypto.vim
+++ b/syntax/yats/web-crypto.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-encoding.vim b/syntax/yats/web-encoding.vim
index 8daef399d..99100cafa 100644
--- a/syntax/yats/web-encoding.vim
+++ b/syntax/yats/web-encoding.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-fetch.vim b/syntax/yats/web-fetch.vim
index 79f4b2188..ef884a0c5 100644
--- a/syntax/yats/web-fetch.vim
+++ b/syntax/yats/web-fetch.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-geo.vim b/syntax/yats/web-geo.vim
index 3bb9ceb95..1e651787c 100644
--- a/syntax/yats/web-geo.vim
+++ b/syntax/yats/web-geo.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-history.vim b/syntax/yats/web-history.vim
index 6301a7c9d..d77ff1592 100644
--- a/syntax/yats/web-history.vim
+++ b/syntax/yats/web-history.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-location.vim b/syntax/yats/web-location.vim
index 6cbba7ba7..2837de25e 100644
--- a/syntax/yats/web-location.vim
+++ b/syntax/yats/web-location.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-navigator.vim b/syntax/yats/web-navigator.vim
index 1c839e2e0..82c4dccd5 100644
--- a/syntax/yats/web-navigator.vim
+++ b/syntax/yats/web-navigator.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-network.vim b/syntax/yats/web-network.vim
index 2814a2434..5f4b6658b 100644
--- a/syntax/yats/web-network.vim
+++ b/syntax/yats/web-network.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-payment.vim b/syntax/yats/web-payment.vim
index ce3741401..a88234df1 100644
--- a/syntax/yats/web-payment.vim
+++ b/syntax/yats/web-payment.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-service-worker.vim b/syntax/yats/web-service-worker.vim
index fc039900a..48a307f34 100644
--- a/syntax/yats/web-service-worker.vim
+++ b/syntax/yats/web-service-worker.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-window.vim b/syntax/yats/web-window.vim
index 7e7ff43ef..329f0ac95 100644
--- a/syntax/yats/web-window.vim
+++ b/syntax/yats/web-window.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web-xhr.vim b/syntax/yats/web-xhr.vim
index d6dd2590f..0864ee5ff 100644
--- a/syntax/yats/web-xhr.vim
+++ b/syntax/yats/web-xhr.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/yats/web.vim b/syntax/yats/web.vim
index f0b18686c..a41007f8a 100644
--- a/syntax/yats/web.vim
+++ b/syntax/yats/web.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'typescript')
+if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
diff --git a/syntax/z8a.vim b/syntax/z8a.vim
index fd9a4e641..c8e66f58f 100644
--- a/syntax/z8a.vim
+++ b/syntax/z8a.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'z8a')
+if has_key(g:polyglot_is_disabled, 'z8a')
   finish
 endif
 
diff --git a/syntax/zephir.vim b/syntax/zephir.vim
index 04aaa7d29..e27328792 100644
--- a/syntax/zephir.vim
+++ b/syntax/zephir.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zephir')
+if has_key(g:polyglot_is_disabled, 'zephir')
   finish
 endif
 
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 66ccb58d5..7eb59fabb 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zig')
+if has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/syntax/zimbu.vim b/syntax/zimbu.vim
index 23b2b7076..39a633cf5 100644
--- a/syntax/zimbu.vim
+++ b/syntax/zimbu.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zimbu')
+if has_key(g:polyglot_is_disabled, 'zimbu')
   finish
 endif
 
diff --git a/syntax/zir.vim b/syntax/zir.vim
index b1cfb5cab..50b2be0ec 100644
--- a/syntax/zir.vim
+++ b/syntax/zir.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'zig')
+if has_key(g:polyglot_is_disabled, 'zig')
   finish
 endif
 
diff --git a/syntax/zsh.vim b/syntax/zsh.vim
index 11d5f394f..8be86a841 100644
--- a/syntax/zsh.vim
+++ b/syntax/zsh.vim
@@ -1,4 +1,4 @@
-if !has_key(g:polyglot_is_disabled, 'sh')
+if has_key(g:polyglot_is_disabled, 'sh')
   finish
 endif
 

From 740a60811c4647eecf3e2f82a24dccc1abbd686a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 26 Oct 2020 08:45:34 +0100
Subject: [PATCH 193/299] Use nroff filetype for man pages, closes #611

---
 README.md                    | 2 +-
 autoload/polyglot/sleuth.vim | 3 +--
 ftdetect/polyglot.vim        | 5 +----
 packages.yaml                | 7 ++-----
 tests/filetypes.vim          | 2 +-
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index a0146ead1..89cfee95a 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->598<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->597<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index b5b30ab8d..a23a2ab51 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -315,7 +315,6 @@ let s:globs = {
   \ 'make': '*.mak,*.dsp,*.mk,*[mM]akefile',
   \ 'mako': '*.mako,*.mao',
   \ 'mallard': '*.page',
-  \ 'man': '*.1,*.1in,*.1m,*.1x,*.2,*.3,*.3in,*.3m,*.3p,*.3pm,*.3qt,*.3x,*.4,*.5,*.6,*.7,*.8,*.9,*.man,*.mdoc',
   \ 'manconf': 'man.config',
   \ 'map': '*.map',
   \ 'maple': '*.mv,*.mpl,*.mws',
@@ -361,7 +360,7 @@ let s:globs = {
   \ 'ninja': '*.ninja',
   \ 'nix': '*.nix',
   \ 'nqc': '*.nqc',
-  \ 'nroff': '*.tr,*.nr,*.roff,*.tmac,*.mom,tmac.*',
+  \ 'nroff': '*.1,*.1in,*.1m,*.1x,*.2,*.3,*.3in,*.3m,*.3p,*.3pm,*.3qt,*.3x,*.4,*.5,*.6,*.7,*.8,*.9,*.man,*.mdoc,*.tr,*.nr,*.roff,*.tmac,*.mom,tmac.*',
   \ 'nsis': '*.nsi,*.nsh',
   \ 'oasis': '_oasis',
   \ 'obj': '*.obj',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 19d459ca0..228395358 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -145,10 +145,6 @@ if !has_key(g:polyglot_is_disabled, 'xpm')
   au BufNewFile,BufRead *.xpm setf xpm
 endif
 
-if !has_key(g:polyglot_is_disabled, 'man')
-  au BufNewFile,BufRead *.1,*.1in,*.1m,*.1x,*.2,*.3,*.3in,*.3m,*.3p,*.3pm,*.3qt,*.3x,*.4,*.5,*.6,*.7,*.8,*.9,*.man,*.mdoc setf man
-endif
-
 if !has_key(g:polyglot_is_disabled, 'xf86conf')
   au BufNewFile,BufRead */xorg.conf.d/*.conf,xorg.conf,xorg.conf-4 setf xf86conf
   au BufNewFile,BufRead XF86Config-4* call s:StarSetf('xf86conf')
@@ -866,6 +862,7 @@ if !has_key(g:polyglot_is_disabled, 'nqc')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'nroff')
+  au BufNewFile,BufRead *.1,*.1in,*.1m,*.1x,*.2,*.3,*.3in,*.3m,*.3p,*.3pm,*.3qt,*.3x,*.4,*.5,*.6,*.7,*.8,*.9,*.man,*.mdoc setf nroff
   au BufNewFile,BufRead *.mom,*.nr,*.roff,*.tmac,*.tr setf nroff
   au BufNewFile,BufRead tmac.* call s:StarSetf('nroff')
 endif
diff --git a/packages.yaml b/packages.yaml
index dc24c858e..2e4cdb87f 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -3863,6 +3863,8 @@ name: nroff
 remote: vim/vim:runtime
 glob: "**/nroff.vim"
 filetypes:
+- name: nroff
+  linguist: Roff Manpage
 - name: nroff
   patterns:
   - pattern: "*.tr,*.nr,*.roff,*.tmac,*.mom"
@@ -5509,11 +5511,6 @@ filetypes:
   patterns:
   - pattern: "XF86Config-4*,XF86Config*,*/xorg.conf.d/*.conf,xorg.conf,xorg.conf-4"
 ---
-name: man
-filetypes:
-- name: man
-  linguist: Roff Manpage
----
 name: xpm
 remote: vim/vim:runtime
 glob: "**/xpm.vim"
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index e9a885366..c3bb99319 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -463,6 +463,7 @@ call TestFiletype('netrc')
 call TestFiletype('ninja')
 call TestFiletype('ncf')
 call TestFiletype('nroff')
+call TestFiletype('nroff')
 call TestFiletype('nqc')
 call TestFiletype('nsis')
 call TestFiletype('occam')
@@ -638,7 +639,6 @@ call TestFiletype('svn')
 call TestFiletype('text')
 call TestFiletype('pullrequest')
 call TestFiletype('xf86conf')
-call TestFiletype('man')
 call TestFiletype('xpm')
 call TestFiletype('xpm2')
 call TestFiletype('context')

From 683286b3d7e0db80e67458b4a0b4d71a88377b62 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 26 Oct 2020 16:25:24 +0100
Subject: [PATCH 194/299] Add all paths, fixes #612

---
 ftdetect/polyglot.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 228395358..5902b34f6 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -3522,7 +3522,7 @@ func! s:process_rtp(rtp)
   " Then vim-polyglot after path
   call add(result, s:base . '/after')
   " Then all other after paths
-  for path in rtp[i:-2]
+  for path in rtp[i:-1]
     call add(result, path)
   endfor
   " User's after directory is always last

From 05e21a9e252b283b2d71568ad3b671d7f28fe0bc Mon Sep 17 00:00:00 2001
From: Sinos <github@47.rs>
Date: Tue, 27 Oct 2020 19:02:41 +0800
Subject: [PATCH 195/299] Add support for PEG syntax (#615)

* feat: add pest syntax

* feat: add pest into packages

* feat: increase the package count
---
 README.md             |   3 +-
 ftdetect/polyglot.vim |   4 ++
 packages.yaml         |   7 +++
 syntax/pest.vim       | 131 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 144 insertions(+), 1 deletion(-)
 create mode 100644 syntax/pest.vim

diff --git a/README.md b/README.md
index 89cfee95a..29a545360 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->597<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->598<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -138,6 +138,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [odin](https://github.com/Tetralux/odin.vim) (Odin syntax highlighting for odin files)
 - [opencl](https://github.com/petRUShka/vim-opencl) (OpenCL syntax highlighting for cl and opencl files)
 - [perl](https://github.com/vim-perl/vim-perl) (Perl syntax highlighting for pl, al, cgi, fcgi, perl and 12 more files)
+- [pest](https://github.com/pest-parser/pest.vim) (PEG syntax for Rust Pest crate)
 - [pgsql](https://github.com/lifepillar/pgsql.vim) (PLpgSQL syntax highlighting for pgsql files)
 - [php](https://github.com/StanAngeloff/php.vim) (PHP syntax highlighting for php, aw, ctp, fcgi, inc and 7 more files)
 - [plantuml](https://github.com/aklt/plantuml-syntax) (PlantUML syntax highlighting for puml, iuml, plantuml, uml and pu files)
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 5902b34f6..a5dbf5ef3 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1998,6 +1998,10 @@ if !has_key(g:polyglot_is_disabled, 'requirements')
   au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} setf requirements
 endif
 
+if !has_key(g:polyglot_is_disabled, 'pest')
+  au BufNewFile,BufRead *.pest setf pest
+endif
+
 if !has_key(g:polyglot_is_disabled, 'python')
   au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript setf python
 endif
diff --git a/packages.yaml b/packages.yaml
index 2e4cdb87f..d7c23f94a 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1236,6 +1236,13 @@ filetypes:
 - name: blade
   linguist: Blade
 ---
+name: pest
+remote: pest-parser/pest.vim
+filetypes:
+- name: pest
+  extensions:
+  - pest
+---
 name: plantuml
 remote: aklt/plantuml-syntax
 filetypes:
diff --git a/syntax/pest.vim b/syntax/pest.vim
new file mode 100644
index 000000000..c151c6785
--- /dev/null
+++ b/syntax/pest.vim
@@ -0,0 +1,131 @@
+" Comments
+syntax keyword pestTodo contained TODO FIXME XXX NOTE
+syntax match pestComment "\/\/.*$" contains=celTodo
+
+" Rule names
+syntax match pestName "^[a-z_][a-z0-9_]*"
+
+" String types
+syntax region pestString start=/"/ skip=/\\\\\|\\"/ end=/"/ oneline contained
+syntax region pestStringIcase start=/\^"/ skip=/\\\\\|\\"/ end=/"/ oneline contained
+syntax region pestChar start=/'/ end=/'/ oneline contained
+
+" Operators, modifiers, keywords
+syntax match pestModifier "\v[_@$!]"
+syntax match pestOperator "\v[~|*+?&!]" contained
+syntax keyword pestKeyword PUSH POP POP_ALL PEEK PEEK_ALL DROP contained
+syntax keyword pestSpecial WHITESPACE COMMENT ANY SOI EOI ASCII_DIGIT ASCII_NONZERO_DIGIT ASCII_BIN_DIGIT ASCII_OCT_DIGIT ASCII_HEX_DIGIT
+      \ ASCII_ALPHA_LOWER ASCII_ALPHA_UPPER ASCII_ALPHA ASCII_ALPHANUMERIC ASCII NEWLINE
+syntax keyword pestGeneral contained
+    \ LETTER
+    \     CASED_LETTER
+    \         UPPERCASE_LETTER
+    \         LOWERCASE_LETTER
+    \     TITLECASE_LETTER
+    \     MODIFIER_LETTER
+    \     OTHER_LETTER
+    \ MARK
+    \     NONSPACING_MARK
+    \     SPACING_MARK
+    \     ENCLOSING_MARK
+    \ NUMBER
+    \     DECIMAL_NUMBER
+    \     LETTER_NUMBER
+    \     OTHER_NUMBER
+    \ PUNCTUATION
+    \     CONNECTOR_PUNCTUATION
+    \     DASH_PUNCTUATION
+    \     OPEN_PUNCTUATION
+    \     CLOSE_PUNCTUATION
+    \     INITIAL_PUNCTUATION
+    \     FINAL_PUNCTUATION
+    \     OTHER_PUNCTUATION
+    \ SYMBOL
+    \     MATH_SYMBOL
+    \     CURRENCY_SYMBOL
+    \     MODIFIER_SYMBOL
+    \     OTHER_SYMBOL
+    \ SEPARATOR
+    \     SPACE_SEPARATOR
+    \     LINE_SEPARATOR
+    \     PARAGRAPH_SEPARATOR
+    \ OTHER
+    \     CONTROL
+    \     FORMAT
+    \     SURROGATE
+    \     PRIVATE_USE
+    \     UNASSIGNED
+syntax keyword pestBinary contained
+    \ ALPHABETIC
+    \ BIDI_CONTROL
+    \ CASE_IGNORABLE
+    \ CASED
+    \ CHANGES_WHEN_CASEFOLDED
+    \ CHANGES_WHEN_CASEMAPPED
+    \ CHANGES_WHEN_LOWERCASED
+    \ CHANGES_WHEN_TITLECASED
+    \ CHANGES_WHEN_UPPERCASED
+    \ DASH
+    \ DEFAULT_IGNORABLE_CODE_POINT
+    \ DEPRECATED
+    \ DIACRITIC
+    \ EXTENDER
+    \ GRAPHEME_BASE
+    \ GRAPHEME_EXTEND
+    \ GRAPHEME_LINK
+    \ HEX_DIGIT
+    \ HYPHEN
+    \ IDS_BINARY_OPERATOR
+    \ IDS_TRINARY_OPERATOR
+    \ ID_CONTINUE
+    \ ID_START
+    \ IDEOGRAPHIC
+    \ JOIN_CONTROL
+    \ LOGICAL_ORDER_EXCEPTION
+    \ LOWERCASE
+    \ MATH
+    \ NONCHARACTER_CODE_POINT
+    \ OTHER_ALPHABETIC
+    \ OTHER_DEFAULT_IGNORABLE_CODE_POINT
+    \ OTHER_GRAPHEME_EXTEND
+    \ OTHER_ID_CONTINUE
+    \ OTHER_ID_START
+    \ OTHER_LOWERCASE
+    \ OTHER_MATH
+    \ OTHER_UPPERCASE
+    \ PATTERN_SYNTAX
+    \ PATTERN_WHITE_SPACE
+    \ PREPENDED_CONCATENATION_MARK
+    \ QUOTATION_MARK
+    \ RADICAL
+    \ REGIONAL_INDICATOR
+    \ SENTENCE_TERMINAL
+    \ SOFT_DOTTED
+    \ TERMINAL_PUNCTUATION
+    \ UNIFIED_IDEOGRAPH
+    \ UPPERCASE
+    \ VARIATION_SELECTOR
+    \ WHITE_SPACE
+    \ XID_CONTINUE
+    \ XID_START
+syntax keyword pestForbidden abstract alignof as become box break const continue crate do else enum extern false
+      \ final fn for if impl in let loop macro match mod move mut offsetof override priv proc pure pub ref return
+      \ Self self sizeof static struct super trait true type typeof unsafe unsized use virtual where while yield 
+
+" Rule blocks
+syntax region pestBlock start=/{/ end=/}/ fold transparent contains=pestString,pestStringIcase,pestChar,pestOperator,pestKeyword,pestSpecial,pestGeneral,pestBinary,pestForbidden,pestComment,pestBlock
+syntax region pestRule start=/^/ end=/ / fold transparent contains=pestName,pestForbidden,pestComment
+
+highlight default link pestTodo Todo
+highlight default link pestComment Comment
+highlight default link pestString String
+highlight default link pestStringIcase String
+highlight default link pestChar Character
+highlight default link pestName Identifier
+highlight default link pestModifier Operator
+highlight default link pestOperator Operator
+highlight default link pestKeyword Keyword
+highlight default link pestSpecial Type
+highlight default link pestGeneral Type
+highlight default link pestBinary Type
+highlight default link pestForbidden Error

From 0738ad654d4f2f89b77dcb4197011a293e4dfcf3 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 2 Nov 2020 18:19:06 +0100
Subject: [PATCH 196/299] Update

---
 autoload/go/config.vim  |   4 -
 autoload/yats.vim       |  20 +++
 extras/filetype.vim     |   9 +-
 ftplugin/make.vim       |   6 +-
 ftplugin/typescript.vim |  65 ++++++++
 indent/typescript.vim   |  80 +---------
 syntax/basic/object.vim |   2 +-
 syntax/cmake.vim        | 343 ++++++++++++++++++++++++++++++++++++++--
 syntax/kotlin.vim       |   2 +-
 syntax/moo.vim          |   4 +-
 10 files changed, 430 insertions(+), 105 deletions(-)
 create mode 100644 autoload/yats.vim

diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index e3e3dcffc..0c48a1f77 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -6,10 +6,6 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-function! go#config#AutodetectGopath() abort
-	return get(g:, 'go_autodetect_gopath', 0)
-endfunction
-
 function! go#config#ListTypeCommands() abort
   return get(g:, 'go_list_type_commands', {})
 endfunction
diff --git a/autoload/yats.vim b/autoload/yats.vim
new file mode 100644
index 000000000..8f5fe2d09
--- /dev/null
+++ b/autoload/yats.vim
@@ -0,0 +1,20 @@
+if has_key(g:polyglot_is_disabled, 'typescript')
+  finish
+endif
+
+" Regex of syntax group names that are strings or documentation.
+let s:syng_multiline = 'comment\c'
+
+" Regex of syntax group names that are line comment.
+let s:syng_linecom = 'linecomment\c'
+
+" Check if the character at lnum:col is inside a multi-line comment.
+function yats#IsInMultilineComment(lnum, col)
+  return !s:IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
+endfunction
+
+" Check if the character at lnum:col is a line comment.
+function yats#IsLineComment(lnum, col)
+  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_linecom
+endfunction
+
diff --git a/extras/filetype.vim b/extras/filetype.vim
index feb304488..f1893ee32 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Sep 30
+" Last Change:	2020 Oct 24
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -1506,9 +1506,10 @@ au BufNewFile,BufRead *.decl,*.dcl,*.dec
 au BufNewFile,BufRead catalog			setf catalog
 
 " Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc.
-" Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts
+" Gentoo ebuilds, Arch Linux PKGBUILDs and Alpine Linux APKBUILDs are actually
+" bash scripts.
 " NOTE: Patterns ending in a star are further down, these have lower priority.
-au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD call polyglot#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD,APKBUILD call polyglot#ft#SetFileTypeSH("bash")
 au BufNewFile,BufRead .kshrc,*.ksh call polyglot#ft#SetFileTypeSH("ksh")
 au BufNewFile,BufRead */etc/profile,.profile,*.sh,*.env call polyglot#ft#SetFileTypeSH(getline(1))
 
@@ -2161,7 +2162,7 @@ au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
 au BufNewFile,BufRead sgml.catalog*		call s:StarSetf('catalog')
 
 " Shell scripts ending in a star
-au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,,PKGBUILD* call polyglot#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,PKGBUILD*,APKBUILD* call polyglot#ft#SetFileTypeSH("bash")
 au BufNewFile,BufRead .kshrc* call polyglot#ft#SetFileTypeSH("ksh")
 au BufNewFile,BufRead .profile* call polyglot#ft#SetFileTypeSH(getline(1))
 
diff --git a/ftplugin/make.vim b/ftplugin/make.vim
index 95556e54e..ee4157f13 100644
--- a/ftplugin/make.vim
+++ b/ftplugin/make.vim
@@ -5,7 +5,7 @@ endif
 " Vim filetype plugin file
 " Language:	Make
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Apr 02
+" Last Change:	2020 Oct 16
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -13,10 +13,10 @@ if exists("b:did_ftplugin")
 endif
 let b:did_ftplugin = 1
 
-let b:undo_ftplugin = "setl et< sts< fo< com< cms< inc<"
+let b:undo_ftplugin = "setl et< sts< sw< fo< com< cms< inc<"
 
 " Make sure a hard tab is used, required for most make programs
-setlocal noexpandtab softtabstop=0
+setlocal noexpandtab softtabstop=0 shiftwidth=0
 
 " Set 'formatoptions' to break comment lines but not other lines,
 " and insert the comment leader when hitting <CR> or using "o".
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index b0df5f453..963d0fe4e 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -19,11 +19,76 @@ setlocal commentstring=//\ %s
 " " and insert the comment leader when hitting <CR> or using "o".
 setlocal formatoptions-=t formatoptions+=croql
 
+if !&l:formatexpr && !&l:formatprg
+    setlocal formatprg=Fixedgq(v:lnum,v:count)
+endif
+
 " setlocal foldmethod=syntax
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
+function! Fixedgq(lnum, count)
+    let l:tw = &tw ? &tw : 80
+
+    let l:count = a:count
+    let l:first_char = indent(a:lnum) + 1
+
+    if mode() == 'i' " gq was not pressed, but tw was set
+        return 1
+    endif
+
+    " This gq is only meant to do code with strings, not comments
+    if yats#IsLineComment(a:lnum, l:first_char) || yats#IsInMultilineComment(a:lnum, l:first_char)
+        return 1
+    endif
+
+    if len(getline(a:lnum)) < l:tw && l:count == 1 " No need for gq
+        return 1
+    endif
+
+    " Put all the lines on one line and do normal spliting after that
+    if l:count > 1
+        while l:count > 1
+            let l:count -= 1
+            normal! J
+        endwhile
+    endif
+
+    let l:winview = winsaveview()
+
+    call cursor(a:lnum, l:tw + 1)
+    let orig_breakpoint = searchpairpos(' ', '', '\.', 'bcW', '', a:lnum)
+    call cursor(a:lnum, l:tw + 1)
+    let breakpoint = searchpairpos(' ', '', '\.', 'bcW', s:skip_expr, a:lnum)
+
+    " No need for special treatment, normal gq handles edgecases better
+    if breakpoint[1] == orig_breakpoint[1]
+        call winrestview(l:winview)
+        return 1
+    endif
+
+    " Try breaking after string
+    if breakpoint[1] <= indent(a:lnum)
+        call cursor(a:lnum, l:tw + 1)
+        let breakpoint = searchpairpos('\.', '', ' ', 'cW', s:skip_expr, a:lnum)
+    endif
+
+
+    if breakpoint[1] != 0
+        call feedkeys("r\<CR>")
+    else
+        let l:count = l:count - 1
+    endif
+
+    " run gq on new lines
+    if l:count == 1
+        call feedkeys("gqq")
+    endif
+
+    return 0
+endfunction
+
 function! TsIncludeExpr(file)
   if (filereadable(a:file))
     return l:file
diff --git a/indent/typescript.vim b/indent/typescript.vim
index fc9a29e12..0bc143c3f 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -19,7 +19,6 @@ setlocal nosmartindent
 
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetTypescriptIndent()
-setlocal formatexpr=Fixedgq(v:lnum,v:count)
 setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e
 
 " Only define the function once.
@@ -41,12 +40,6 @@ let s:syng_strcom = 'string\|regex\|comment\c'
 " Regex of syntax group names that are strings.
 let s:syng_string = 'regex\c'
 
-" Regex of syntax group names that are strings or documentation.
-let s:syng_multiline = 'comment\c'
-
-" Regex of syntax group names that are line comment.
-let s:syng_linecom = 'linecomment\c'
-
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_strcom."'"
 
@@ -85,16 +78,6 @@ function s:IsInString(lnum, col)
   return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_string
 endfunction
 
-" Check if the character at lnum:col is inside a multi-line comment.
-function s:IsInMultilineComment(lnum, col)
-  return !s:IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
-endfunction
-
-" Check if the character at lnum:col is a line comment.
-function s:IsLineComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_linecom
-endfunction
-
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
 function s:PrevNonBlankNonString(lnum)
   let in_block = 0
@@ -356,7 +339,7 @@ function GetTypescriptIndent()
   endif
 
   " If we are in a multi-line comment, cindent does the right thing.
-  if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)
+  if yats#IsInMultilineComment(v:lnum, 1) && !yats#IsLineComment(v:lnum, 1)
     return cindent(v:lnum)
   endif
 
@@ -442,64 +425,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-function! Fixedgq(lnum, count)
-    let l:tw = &tw ? &tw : 80;
-
-    let l:count = a:count
-    let l:first_char = indent(a:lnum) + 1
-
-    if mode() == 'i' " gq was not pressed, but tw was set
-        return 1
-    endif
-
-    " This gq is only meant to do code with strings, not comments
-    if s:IsLineComment(a:lnum, l:first_char) || s:IsInMultilineComment(a:lnum, l:first_char)
-        return 1
-    endif
-
-    if len(getline(a:lnum)) < l:tw && l:count == 1 " No need for gq
-        return 1
-    endif
-
-    " Put all the lines on one line and do normal spliting after that
-    if l:count > 1
-        while l:count > 1
-            let l:count -= 1
-            normal! J
-        endwhile
-    endif
-
-    let l:winview = winsaveview()
-
-    call cursor(a:lnum, l:tw + 1)
-    let orig_breakpoint = searchpairpos(' ', '', '\.', 'bcW', '', a:lnum)
-    call cursor(a:lnum, l:tw + 1)
-    let breakpoint = searchpairpos(' ', '', '\.', 'bcW', s:skip_expr, a:lnum)
-
-    " No need for special treatment, normal gq handles edgecases better
-    if breakpoint[1] == orig_breakpoint[1]
-        call winrestview(l:winview)
-        return 1
-    endif
-
-    " Try breaking after string
-    if breakpoint[1] <= indent(a:lnum)
-        call cursor(a:lnum, l:tw + 1)
-        let breakpoint = searchpairpos('\.', '', ' ', 'cW', s:skip_expr, a:lnum)
-    endif
-
-
-    if breakpoint[1] != 0
-        call feedkeys("r\<CR>")
-    else
-        let l:count = l:count - 1
-    endif
-
-    " run gq on new lines
-    if l:count == 1
-        call feedkeys("gqq")
-    endif
-
-    return 0
-endfunction
diff --git a/syntax/basic/object.vim b/syntax/basic/object.vim
index bcec8fc69..c3102db0c 100644
--- a/syntax/basic/object.vim
+++ b/syntax/basic/object.vim
@@ -4,7 +4,7 @@ endif
 
 syntax region  typescriptObjectLiteral         matchgroup=typescriptBraces
   \ start=/{/ end=/}/
-  \ contains=@typescriptComments,typescriptObjectLabel,typescriptStringProperty,typescriptComputedPropertyName,typescriptObjectAsyncKeyword
+  \ contains=@typescriptComments,typescriptObjectLabel,typescriptStringProperty,typescriptComputedPropertyName,typescriptObjectAsyncKeyword,typescriptTernary
   \ fold contained
 
 syntax keyword typescriptObjectAsyncKeyword async contained
diff --git a/syntax/cmake.vim b/syntax/cmake.vim
index 7da217506..7df2f6604 100644
--- a/syntax/cmake.vim
+++ b/syntax/cmake.vim
@@ -4,14 +4,14 @@ endif
 
 " Vim syntax file
 " Program:      CMake - Cross-Platform Makefile Generator
-" Version:      cmake version 3.16.20191028-g0e4190b
+" Version:      cmake version 3.19.20201028-gdab947f
 " Language:     CMake
 " Author:       Andy Cedilnik <andy.cedilnik@kitware.com>,
 "               Nicholas Hutchinson <nshutchinson@gmail.com>,
 "               Patrick Boettcher <patrick.boettcher@posteo.de>
 " Maintainer:   Dimitri Merejkowsky <d.merej@gmail.com>
 " Former Maintainer: Karthik Krishnan <karthik.krishnan@kitware.com>
-" Last Change:  2019 oct. 29
+" Last Change:  2020 oct. 28
 "
 " Licence:      The CMake license applies to this file. See
 "               https://cmake.org/licensing
@@ -48,7 +48,9 @@ syn keyword cmakeProperty contained
             \ ADDITIONAL_CLEAN_FILES
             \ ADDITIONAL_MAKE_CLEAN_FILES
             \ ADVANCED
+            \ AIX_EXPORT_ALL_SYMBOLS
             \ ALIASED_TARGET
+            \ ALIAS_GLOBAL
             \ ALLOW_DUPLICATE_CUSTOM_TARGETS
             \ ANDROID_ANT_ADDITIONAL_OPTIONS
             \ ANDROID_API
@@ -105,6 +107,7 @@ syn keyword cmakeProperty contained
             \ CACHE_VARIABLES
             \ CLEAN_NO_CUSTOM
             \ CMAKE_CONFIGURE_DEPENDS
+            \ CMAKE_CUDA_KNOWN_FEATURES
             \ CMAKE_CXX_KNOWN_FEATURES
             \ CMAKE_C_KNOWN_FEATURES
             \ CMAKE_ROLE
@@ -127,9 +130,11 @@ syn keyword cmakeProperty contained
             \ CPACK_START_MENU_SHORTCUTS
             \ CPACK_WIX_ACL
             \ CROSSCOMPILING_EMULATOR
+            \ CUDA_ARCHITECTURES
             \ CUDA_EXTENSIONS
             \ CUDA_PTX_COMPILATION
             \ CUDA_RESOLVE_DEVICE_SYMBOLS
+            \ CUDA_RUNTIME_LIBRARY
             \ CUDA_SEPARABLE_COMPILATION
             \ CUDA_STANDARD
             \ CUDA_STANDARD_REQUIRED
@@ -146,9 +151,11 @@ syn keyword cmakeProperty contained
             \ DEPENDS
             \ DEPLOYMENT_ADDITIONAL_FILES
             \ DEPLOYMENT_REMOTE_DIRECTORY
+            \ DEPRECATION
             \ DISABLED
             \ DISABLED_FEATURES
             \ DISABLE_PRECOMPILE_HEADERS
+            \ DOTNET_TARGET_FRAMEWORK
             \ DOTNET_TARGET_FRAMEWORK_VERSION
             \ ECLIPSE_EXTRA_CPROJECT_CONTENTS
             \ ECLIPSE_EXTRA_NATURES
@@ -175,6 +182,7 @@ syn keyword cmakeProperty contained
             \ FRAMEWORK_VERSION
             \ Fortran_FORMAT
             \ Fortran_MODULE_DIRECTORY
+            \ Fortran_PREPROCESS
             \ GENERATED
             \ GENERATOR_FILE_NAME
             \ GENERATOR_IS_MULTI_CONFIG
@@ -225,9 +233,12 @@ syn keyword cmakeProperty contained
             \ INTERPROCEDURAL_OPTIMIZATION
             \ IN_TRY_COMPILE
             \ IOS_INSTALL_COMBINED
+            \ ISPC_HEADER_DIRECTORY
+            \ ISPC_INSTRUCTION_SETS
             \ JOB_POOLS
             \ JOB_POOL_COMPILE
             \ JOB_POOL_LINK
+            \ JOB_POOL_PRECOMPILE_HEADER
             \ KEEP_EXTENSION
             \ LABELS
             \ LANGUAGE
@@ -247,6 +258,8 @@ syn keyword cmakeProperty contained
             \ LINK_WHAT_YOU_USE
             \ LISTFILE_STACK
             \ LOCATION
+            \ MACHO_COMPATIBILITY_VERSION
+            \ MACHO_CURRENT_VERSION
             \ MACOSX_BUNDLE
             \ MACOSX_BUNDLE_INFO_PLIST
             \ MACOSX_FRAMEWORK_INFO_PLIST
@@ -260,14 +273,23 @@ syn keyword cmakeProperty contained
             \ NAME
             \ NO_SONAME
             \ NO_SYSTEM_FROM_IMPORTED
+            \ OBJCXX_EXTENSIONS
+            \ OBJCXX_STANDARD
+            \ OBJCXX_STANDARD_REQUIRED
+            \ OBJC_EXTENSIONS
+            \ OBJC_STANDARD
+            \ OBJC_STANDARD_REQUIRED
             \ OBJECT_DEPENDS
             \ OBJECT_OUTPUTS
+            \ OPTIMIZE_DEPENDENCIES
             \ OSX_ARCHITECTURES
             \ OUTPUT_NAME
             \ PACKAGES_FOUND
             \ PACKAGES_NOT_FOUND
             \ PARENT_DIRECTORY
             \ PASS_REGULAR_EXPRESSION
+            \ PCH_INSTANTIATE_TEMPLATES
+            \ PCH_WARN_INVALID
             \ PDB_NAME
             \ PDB_OUTPUT_DIRECTORY
             \ POSITION_INDEPENDENT_CODE
@@ -278,7 +300,6 @@ syn keyword cmakeProperty contained
             \ PREFIX
             \ PRE_INSTALL_SCRIPT
             \ PRIVATE_HEADER
-            \ PROCESSES
             \ PROCESSORS
             \ PROCESSOR_AFFINITY
             \ PROJECT_LABEL
@@ -286,6 +307,7 @@ syn keyword cmakeProperty contained
             \ REPORT_UNDEFINED_PROPERTIES
             \ REQUIRED_FILES
             \ RESOURCE
+            \ RESOURCE_GROUPS
             \ RESOURCE_LOCK
             \ RULE_LAUNCH_COMPILE
             \ RULE_LAUNCH_CUSTOM
@@ -330,6 +352,8 @@ syn keyword cmakeProperty contained
             \ UNITY_BUILD_BATCH_SIZE
             \ UNITY_BUILD_CODE_AFTER_INCLUDE
             \ UNITY_BUILD_CODE_BEFORE_INCLUDE
+            \ UNITY_BUILD_MODE
+            \ UNITY_GROUP
             \ USE_FOLDERS
             \ VALUE
             \ VARIABLES
@@ -360,6 +384,7 @@ syn keyword cmakeProperty contained
             \ VS_MOBILE_EXTENSIONS_VERSION
             \ VS_NO_SOLUTION_DEPLOY
             \ VS_PACKAGE_REFERENCES
+            \ VS_PLATFORM_TOOLSET
             \ VS_PROJECT_IMPORT
             \ VS_RESOURCE_GENERATOR
             \ VS_SCC_AUXPATH
@@ -367,6 +392,7 @@ syn keyword cmakeProperty contained
             \ VS_SCC_PROJECTNAME
             \ VS_SCC_PROVIDER
             \ VS_SDK_REFERENCES
+            \ VS_SETTINGS
             \ VS_SHADER_DISABLE_OPTIMIZATIONS
             \ VS_SHADER_ENABLE_DEBUG
             \ VS_SHADER_ENTRYPOINT
@@ -376,6 +402,7 @@ syn keyword cmakeProperty contained
             \ VS_SHADER_OUTPUT_HEADER_FILE
             \ VS_SHADER_TYPE
             \ VS_SHADER_VARIABLE_NAME
+            \ VS_SOLUTION_DEPLOY
             \ VS_STARTUP_PROJECT
             \ VS_TOOL_OVERRIDE
             \ VS_USER_PROPS
@@ -394,6 +421,7 @@ syn keyword cmakeProperty contained
             \ XCODE_FILE_ATTRIBUTES
             \ XCODE_GENERATE_SCHEME
             \ XCODE_LAST_KNOWN_FILE_TYPE
+            \ XCODE_LINK_BUILD_PHASE_MODE
             \ XCODE_PRODUCT_TYPE
             \ XCODE_SCHEME_ADDRESS_SANITIZER
             \ XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN
@@ -414,6 +442,7 @@ syn keyword cmakeProperty contained
             \ XCODE_SCHEME_THREAD_SANITIZER_STOP
             \ XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER
             \ XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP
+            \ XCODE_SCHEME_WORKING_DIRECTORY
             \ XCODE_SCHEME_ZOMBIE_OBJECTS
             \ XCTEST
 
@@ -424,6 +453,7 @@ syn keyword cmakeVariable contained
             \ BUILD_SHARED_LIBS
             \ CACHE
             \ CMAKE_ABSOLUTE_DESTINATION_FILES
+            \ CMAKE_AIX_EXPORT_ALL_SYMBOLS
             \ CMAKE_ANDROID_ANT_ADDITIONAL_OPTIONS
             \ CMAKE_ANDROID_API
             \ CMAKE_ANDROID_API_MIN
@@ -669,6 +699,7 @@ syn keyword cmakeVariable contained
             \ CMAKE_CACHE_MINOR_VERSION
             \ CMAKE_CACHE_PATCH_VERSION
             \ CMAKE_CFG_INTDIR
+            \ CMAKE_CLANG_VFS_OVERLAY
             \ CMAKE_CL_64
             \ CMAKE_CODEBLOCKS_COMPILER_ID
             \ CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES
@@ -684,6 +715,7 @@ syn keyword cmakeVariable contained
             \ CMAKE_CPACK_COMMAND
             \ CMAKE_CROSSCOMPILING
             \ CMAKE_CROSSCOMPILING_EMULATOR
+            \ CMAKE_CROSS_CONFIGS
             \ CMAKE_CSharp
             \ CMAKE_CSharp_ANDROID_TOOLCHAIN_MACHINE
             \ CMAKE_CSharp_ANDROID_TOOLCHAIN_PREFIX
@@ -746,11 +778,13 @@ syn keyword cmakeVariable contained
             \ CMAKE_CSharp_STANDARD_INCLUDE_DIRECTORIES
             \ CMAKE_CSharp_STANDARD_LIBRARIES
             \ CMAKE_CSharp_VISIBILITY_PRESET
+            \ CMAKE_CTEST_ARGUMENTS
             \ CMAKE_CTEST_COMMAND
             \ CMAKE_CUDA
             \ CMAKE_CUDA_ANDROID_TOOLCHAIN_MACHINE
             \ CMAKE_CUDA_ANDROID_TOOLCHAIN_PREFIX
             \ CMAKE_CUDA_ANDROID_TOOLCHAIN_SUFFIX
+            \ CMAKE_CUDA_ARCHITECTURES
             \ CMAKE_CUDA_ARCHIVE_APPEND
             \ CMAKE_CUDA_ARCHIVE_CREATE
             \ CMAKE_CUDA_ARCHIVE_FINISH
@@ -768,6 +802,7 @@ syn keyword cmakeVariable contained
             \ CMAKE_CUDA_COMPILER_TARGET
             \ CMAKE_CUDA_COMPILER_VERSION
             \ CMAKE_CUDA_COMPILER_VERSION_INTERNAL
+            \ CMAKE_CUDA_COMPILE_FEATURES
             \ CMAKE_CUDA_COMPILE_OBJECT
             \ CMAKE_CUDA_CPPCHECK
             \ CMAKE_CUDA_CPPLINT
@@ -805,6 +840,7 @@ syn keyword cmakeVariable contained
             \ CMAKE_CUDA_OUTPUT_EXTENSION
             \ CMAKE_CUDA_PLATFORM_ID
             \ CMAKE_CUDA_RESOLVE_DEVICE_SYMBOLS
+            \ CMAKE_CUDA_RUNTIME_LIBRARY
             \ CMAKE_CUDA_SEPARABLE_COMPILATION
             \ CMAKE_CUDA_SIMULATE_ID
             \ CMAKE_CUDA_SIMULATE_VERSION
@@ -817,6 +853,10 @@ syn keyword cmakeVariable contained
             \ CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES
             \ CMAKE_CUDA_VISIBILITY_PRESET
             \ CMAKE_CURRENT_BINARY_DIR
+            \ CMAKE_CURRENT_FUNCTION
+            \ CMAKE_CURRENT_FUNCTION_LIST_DIR
+            \ CMAKE_CURRENT_FUNCTION_LIST_FILE
+            \ CMAKE_CURRENT_FUNCTION_LIST_LINE
             \ CMAKE_CURRENT_LIST_DIR
             \ CMAKE_CURRENT_LIST_FILE
             \ CMAKE_CURRENT_LIST_LINE
@@ -954,10 +994,13 @@ syn keyword cmakeVariable contained
             \ CMAKE_C_VISIBILITY_PRESET
             \ CMAKE_DEBUG_POSTFIX
             \ CMAKE_DEBUG_TARGET_PROPERTIES
+            \ CMAKE_DEFAULT_BUILD_TYPE
+            \ CMAKE_DEFAULT_CONFIGS
             \ CMAKE_DEPENDS_IN_PROJECT_ONLY
             \ CMAKE_DIRECTORY_LABELS
             \ CMAKE_DISABLE_PRECOMPILE_HEADERS
             \ CMAKE_DL_LIBS
+            \ CMAKE_DOTNET_TARGET_FRAMEWORK
             \ CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION
             \ CMAKE_ECLIPSE_GENERATE_LINKED_RESOURCES
             \ CMAKE_ECLIPSE_GENERATE_SOURCE_PROJECT
@@ -978,6 +1021,7 @@ syn keyword cmakeVariable contained
             \ CMAKE_EXTRA_GENERATOR
             \ CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES
             \ CMAKE_FIND_APPBUNDLE
+            \ CMAKE_FIND_DEBUG_MODE
             \ CMAKE_FIND_FRAMEWORK
             \ CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX
             \ CMAKE_FIND_LIBRARY_PREFIXES
@@ -1002,6 +1046,7 @@ syn keyword cmakeVariable contained
             \ CMAKE_FIND_USE_PACKAGE_REGISTRY
             \ CMAKE_FIND_USE_PACKAGE_ROOT_PATH
             \ CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH
+            \ CMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY
             \ CMAKE_FOLDER
             \ CMAKE_FRAMEWORK
             \ CMAKE_FRAMEWORK_PATH
@@ -1065,6 +1110,7 @@ syn keyword cmakeVariable contained
             \ CMAKE_Fortran_MODULE_DIRECTORY
             \ CMAKE_Fortran_OUTPUT_EXTENSION
             \ CMAKE_Fortran_PLATFORM_ID
+            \ CMAKE_Fortran_PREPROCESS
             \ CMAKE_Fortran_SIMULATE_ID
             \ CMAKE_Fortran_SIMULATE_VERSION
             \ CMAKE_Fortran_SIZEOF_DATA_PTR
@@ -1111,9 +1157,12 @@ syn keyword cmakeVariable contained
             \ CMAKE_INTERNAL_PLATFORM_ABI
             \ CMAKE_INTERPROCEDURAL_OPTIMIZATION
             \ CMAKE_IOS_INSTALL_COMBINED
+            \ CMAKE_ISPC_HEADER_DIRECTORY
+            \ CMAKE_ISPC_INSTRUCTION_SETS
             \ CMAKE_JOB_POOLS
             \ CMAKE_JOB_POOL_COMPILE
             \ CMAKE_JOB_POOL_LINK
+            \ CMAKE_JOB_POOL_PRECOMPILE_HEADER
             \ CMAKE_Java
             \ CMAKE_Java_ANDROID_TOOLCHAIN_MACHINE
             \ CMAKE_Java_ANDROID_TOOLCHAIN_PREFIX
@@ -1215,12 +1264,21 @@ syn keyword cmakeVariable contained
             \ CMAKE_NOT_USING_CONFIG_FLAGS
             \ CMAKE_NO_BUILTIN_CHRPATH
             \ CMAKE_NO_SYSTEM_FROM_IMPORTED
+            \ CMAKE_OBJCXX_EXTENSIONS
+            \ CMAKE_OBJCXX_STANDARD
+            \ CMAKE_OBJCXX_STANDARD_REQUIRED
+            \ CMAKE_OBJC_EXTENSIONS
+            \ CMAKE_OBJC_STANDARD
+            \ CMAKE_OBJC_STANDARD_REQUIRED
             \ CMAKE_OBJECT_PATH_MAX
+            \ CMAKE_OPTIMIZE_DEPENDENCIES
             \ CMAKE_OSX_ARCHITECTURES
             \ CMAKE_OSX_DEPLOYMENT_TARGET
             \ CMAKE_OSX_SYSROOT
             \ CMAKE_PARENT_LIST_FILE
             \ CMAKE_PATCH_VERSION
+            \ CMAKE_PCH_INSTANTIATE_TEMPLATES
+            \ CMAKE_PCH_WARN_INVALID
             \ CMAKE_PDB_OUTPUT_DIRECTORY
             \ CMAKE_POSITION_INDEPENDENT_CODE
             \ CMAKE_PREFIX_PATH
@@ -1448,13 +1506,16 @@ syn keyword cmakeVariable contained
             \ CMAKE_VS_SDK_REFERENCE_DIRECTORIES
             \ CMAKE_VS_SDK_SOURCE_DIRECTORIES
             \ CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION
+            \ CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM
             \ CMAKE_VS_WINRT_BY_DEFAULT
             \ CMAKE_WARN_DEPRECATED
             \ CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION
             \ CMAKE_WIN32_EXECUTABLE
             \ CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS
+            \ CMAKE_XCODE_BUILD_SYSTEM
             \ CMAKE_XCODE_GENERATE_SCHEME
             \ CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY
+            \ CMAKE_XCODE_LINK_BUILD_PHASE_MODE
             \ CMAKE_XCODE_PLATFORM_TOOLSET
             \ CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER
             \ CMAKE_XCODE_SCHEME_ADDRESS_SANITIZER_USE_AFTER_RETURN
@@ -1472,6 +1533,7 @@ syn keyword cmakeVariable contained
             \ CMAKE_XCODE_SCHEME_THREAD_SANITIZER_STOP
             \ CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER
             \ CMAKE_XCODE_SCHEME_UNDEFINED_BEHAVIOUR_SANITIZER_STOP
+            \ CMAKE_XCODE_SCHEME_WORKING_DIRECTORY
             \ CMAKE_XCODE_SCHEME_ZOMBIE_OBJECTS
             \ CPACK_ABSOLUTE_DESTINATION_FILES
             \ CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY
@@ -1537,6 +1599,7 @@ syn keyword cmakeVariable contained
             \ CTEST_P4_COMMAND
             \ CTEST_P4_OPTIONS
             \ CTEST_P4_UPDATE_OPTIONS
+            \ CTEST_RESOURCE_SPEC_FILE
             \ CTEST_RUN_CURRENT_SCRIPT
             \ CTEST_SCP_COMMAND
             \ CTEST_SITE
@@ -1879,9 +1942,11 @@ syn keyword cmakeKWExternalProject contained
             \ BUILD_BYPRODUCTS
             \ BUILD_COMMAND
             \ BUILD_IN_SOURCE
+            \ CHECKOUT
             \ CMAKE_ARGS
             \ CMAKE_CACHE_ARGS
             \ CMAKE_CACHE_DEFAULT_ARGS
+            \ CMAKE_EP_GIT_REMOTE_UPDATE_STRATEGY
             \ CMAKE_TLS_CAINFO
             \ CMAKE_TLS_VERIFY
             \ COMMENT
@@ -1906,14 +1971,17 @@ syn keyword cmakeKWExternalProject contained
             \ EP_STEP_TARGETS
             \ EP_UPDATE_DISCONNECTED
             \ EXCLUDE_FROM_ALL
+            \ FALSE
             \ FORCE
             \ GHS
             \ GIT_CONFIG
             \ GIT_PROGRESS
             \ GIT_REMOTE_NAME
+            \ GIT_REMOTE_UPDATE_STRATEGY
             \ GIT_REPOSITORY
             \ GIT_SHALLOW
             \ GIT_SUBMODULES
+            \ GIT_SUBMODULES_RECURSE
             \ GIT_TAG
             \ HG_REPOSITORY
             \ HG_TAG
@@ -1921,6 +1989,7 @@ syn keyword cmakeKWExternalProject contained
             \ HTTP_PASSWORD
             \ HTTP_USERNAME
             \ IGNORED
+            \ INACTIVITY_TIMEOUT
             \ INDEPENDENT_STEP_TARGETS
             \ INSTALL_COMMAND
             \ INSTALL_DIR
@@ -1947,6 +2016,8 @@ syn keyword cmakeKWExternalProject contained
             \ PATCH_COMMAND
             \ PREFIX
             \ PROPERTY
+            \ REBASE
+            \ REBASE_CHECKOUT
             \ REQUIRED
             \ SOURCE_DIR
             \ SOURCE_SUBDIR
@@ -2015,7 +2086,10 @@ syn keyword cmakeKWadd_custom_command contained
             \ PRE_LINK
             \ SYMBOLIC
             \ TARGET_FILE
+            \ TARGET_LINKER_FILE
+            \ TARGET_PDB_FILE
             \ TARGET_PROPERTY
+            \ TARGET_SONAME_FILE
             \ USES_TERMINAL
             \ VERBATIM
             \ WORKING_DIRECTORY
@@ -2037,7 +2111,10 @@ syn keyword cmakeKWadd_custom_target contained
             \ PATH
             \ SOURCES
             \ TARGET_FILE
+            \ TARGET_LINKER_FILE
+            \ TARGET_PDB_FILE
             \ TARGET_PROPERTY
+            \ TARGET_SONAME_FILE
             \ USES_TERMINAL
             \ VERBATIM
             \ WORKING_DIRECTORY
@@ -2051,6 +2128,7 @@ syn keyword cmakeKWadd_dependencies contained
 
 syn keyword cmakeKWadd_executable contained
             \ ALIAS
+            \ ALIAS_GLOBAL
             \ CONFIG
             \ EXCLUDE_FROM_ALL
             \ GLOBAL
@@ -2066,6 +2144,7 @@ syn keyword cmakeKWadd_executable contained
 
 syn keyword cmakeKWadd_library contained
             \ ALIAS
+            \ ALIAS_GLOBAL
             \ ARCHIVE_OUTPUT_DIRECTORY
             \ CLI
             \ CONFIG
@@ -2076,11 +2155,15 @@ syn keyword cmakeKWadd_library contained
             \ HEADER_FILE_ONLY
             \ IMPORTED
             \ IMPORTED_
+            \ IMPORTED_IMPLIB
+            \ IMPORTED_IMPLIB_
             \ IMPORTED_LOCATION
             \ IMPORTED_LOCATION_
             \ IMPORTED_OBJECTS
             \ IMPORTED_OBJECTS_
+            \ INTERFACE
             \ INTERFACE_
+            \ INTERFACE_SOURCES
             \ LIBRARY_OUTPUT_DIRECTORY
             \ MODULE
             \ OBJECT
@@ -2090,17 +2173,23 @@ syn keyword cmakeKWadd_library contained
             \ POST_BUILD
             \ PRE_BUILD
             \ PRE_LINK
-            \ PUBLIC_HEADER
+            \ PRIVATE
+            \ PUBLIC
             \ RUNTIME_OUTPUT_DIRECTORY
             \ SHARED
+            \ SOURCES
             \ STATIC
             \ TARGET_OBJECTS
             \ UNKNOWN
 
 syn keyword cmakeKWadd_link_options contained
             \ CMAKE_
+            \ CUDA_RESOLVE_DEVICE_SYMBOLS
+            \ CUDA_SEPARABLE_COMPILATION
+            \ DEVICE_LINK
             \ GCC
             \ GNU
+            \ HOST_LINK
             \ LANG
             \ LINKER
             \ LINK_OPTIONS
@@ -2158,6 +2247,23 @@ syn keyword cmakeKWcmake_host_system_information contained
             \ TOTAL_PHYSICAL_MEMORY
             \ TOTAL_VIRTUAL_MEMORY
 
+syn keyword cmakeKWcmake_language contained
+            \ AND
+            \ CALL
+            \ CANCEL_CALL
+            \ CODE
+            \ DEFER
+            \ DIRECTORY
+            \ EVAL
+            \ FALSE
+            \ GET_CALL_IDS
+            \ ID
+            \ ID_VAR
+            \ OR
+            \ STATUS
+            \ TRUE
+            \ WRITE
+
 syn keyword cmakeKWcmake_minimum_required contained
             \ FATAL_ERROR
             \ VERSION
@@ -2187,6 +2293,72 @@ syn keyword cmakeKWcmake_parse_arguments contained
             \ _KEYWORDS_MISSING_VALUES
             \ _UNPARSED_ARGUMENTS
 
+syn keyword cmakeKWcmake_path contained
+            \ ABSOLUTE_PATH
+            \ AND
+            \ APPEND
+            \ BASE_DIRECTORY
+            \ CMAKE_PATH
+            \ COMPARE
+            \ CONCAT
+            \ CONVERT
+            \ ELSEIF
+            \ ENDIF
+            \ EXTENSION
+            \ EXTENSION_DEF
+            \ FALSE
+            \ FILENAME_DEF
+            \ GET
+            \ GET_EXTENSION
+            \ GET_FILENAME
+            \ GET_PARENT_PATH
+            \ GET_RELATIVE_PATH
+            \ GET_ROOT_DIRECTORY
+            \ GET_ROOT_NAME
+            \ GET_ROOT_PATH
+            \ GET_STEM
+            \ HASH
+            \ HAS_EXTENSION
+            \ HAS_FILENAME
+            \ HAS_PARENT_PATH
+            \ HAS_RELATIVE_PATH
+            \ HAS_ROOT_DIRECTORY
+            \ HAS_ROOT_NAME
+            \ HAS_ROOT_PATH
+            \ HAS_STEM
+            \ IF
+            \ IS_ABSOLUTE
+            \ IS_PREFIX
+            \ IS_RELATIVE
+            \ LAST_ONLY
+            \ MATCHES
+            \ NATIVE_PATH
+            \ NORMALIZE
+            \ NORMAL_PATH
+            \ NOT
+            \ NOT_EQUAL
+            \ OP
+            \ OS
+            \ OUTPUT_VARIABLE
+            \ PARENT_PATH
+            \ PROXIMATE_PATH
+            \ REAL_PATH
+            \ RELATIVE_PATH
+            \ REMOVE_EXTENSION
+            \ REMOVE_FILENAME
+            \ REPLACE_EXTENSION
+            \ REPLACE_FILENAME
+            \ RETURN
+            \ ROOT_DIRECTORY
+            \ ROOT_NAME
+            \ ROOT_PATH
+            \ STEM
+            \ STREQUAL
+            \ TO_CMAKE_PATH_LIST
+            \ TO_NATIVE_PATH_LIST
+            \ TRUE
+            \ XOR
+
 syn keyword cmakeKWcmake_policy contained
             \ CMAKE_POLICY_DEFAULT_CMP
             \ CMP
@@ -2204,10 +2376,13 @@ syn keyword cmakeKWconfigure_file contained
             \ CRLF
             \ DOS
             \ ESCAPE_QUOTES
+            \ FILE_PERMISSIONS
             \ FOO_ENABLE
             \ FOO_STRING
             \ LF
             \ NEWLINE_STYLE
+            \ NO_SOURCE_PERMISSIONS
+            \ USE_SOURCE_PERMISSIONS
             \ VAR
 
 syn keyword cmakeKWcreate_test_sourcelist contained
@@ -2300,6 +2475,7 @@ syn keyword cmakeKWctest_submit contained
             \ SUBMIT_URL
 
 syn keyword cmakeKWctest_test contained
+            \ AFTER_TIMEOUT
             \ APPEND
             \ BUILD
             \ CAPTURE_CMAKE_ERROR
@@ -2309,19 +2485,23 @@ syn keyword cmakeKWctest_test contained
             \ EXCLUDE_FIXTURE_CLEANUP
             \ EXCLUDE_FIXTURE_SETUP
             \ EXCLUDE_LABEL
-            \ HARDWARE_SPEC_FILE
             \ INCLUDE
             \ INCLUDE_LABEL
             \ OFF
             \ ON
             \ PARALLEL_LEVEL
             \ QUIET
+            \ REPEAT
+            \ RESOURCE_SPEC_FILE
             \ RETURN_VALUE
             \ SCHEDULE_RANDOM
             \ START
+            \ STOP_ON_FAILURE
             \ STOP_TIME
             \ STRIDE
             \ TEST_LOAD
+            \ UNTIL_FAIL
+            \ UNTIL_PASS
 
 syn keyword cmakeKWctest_update contained
             \ CAPTURE_CMAKE_ERROR
@@ -2358,6 +2538,7 @@ syn keyword cmakeKWdoxygen_add_docs contained
 syn keyword cmakeKWenable_language contained
             \ ASM
             \ CUDA
+            \ ISPC
             \ OBJC
             \ OBJCXX
             \ OPTIONAL
@@ -2372,15 +2553,20 @@ syn keyword cmakeKWexec_program contained
 
 syn keyword cmakeKWexecute_process contained
             \ ANSI
+            \ ANY
             \ AUTO
             \ COMMAND
             \ COMMAND_ECHO
+            \ COMMAND_ERROR_IS_FATAL
+            \ ECHO_ERROR_VARIABLE
+            \ ECHO_OUTPUT_VARIABLE
             \ ENCODING
             \ ERROR_FILE
             \ ERROR_QUIET
             \ ERROR_STRIP_TRAILING_WHITESPACE
             \ ERROR_VARIABLE
             \ INPUT_FILE
+            \ LAST
             \ NONE
             \ OEM
             \ OUTPUT_FILE
@@ -2422,47 +2608,63 @@ syn keyword cmakeKWexport_library_dependencies contained
 syn keyword cmakeKWfile contained
             \ ALGO
             \ APPEND
+            \ ARCHIVE_CREATE
+            \ ARCHIVE_EXTRACT
             \ ASCII
-            \ BUNDLE_EXECTUBLE
+            \ BASE_DIRECTORY
             \ BUNDLE_EXECUTABLE
+            \ CHMOD
+            \ CHMOD_RECURSE
             \ CMAKE_GET_RUNTIME_DEPENDENCIES_COMMAND
             \ CMAKE_GET_RUNTIME_DEPENDENCIES_PLATFORM
             \ CMAKE_GET_RUNTIME_DEPENDENCIES_TOOL
+            \ CMAKE_OBJDUMP
             \ CMAKE_TLS_CAINFO
             \ CMAKE_TLS_VERIFY
             \ CODE
+            \ COMPILE_FEATURES
+            \ COMPRESSION
+            \ COMPRESSION_LEVEL
             \ CONDITION
-            \ CONFIG
+            \ CONFIGURE
             \ CONFIGURE_DEPENDS
             \ CONFLICTING_DEPENDENCIES_PREFIX
-            \ CONFLICTING_DEPENDENICES_PREFIX
             \ CONTENT
+            \ CONVERT
             \ COPY
             \ COPY_ON_ERROR
             \ CREATE_LINK
+            \ CRLF
             \ DESTINATION
             \ DIRECTORIES
             \ DIRECTORY_PERMISSIONS
             \ DLL
+            \ DOS
             \ DOWNLOAD
             \ ENCODING
+            \ ESCAPE_QUOTES
             \ EXECUTABLES
             \ EXPECTED_HASH
             \ FILES_MATCHING
             \ FILE_PERMISSIONS
             \ FOLLOW_SYMLINKS
             \ FOLLOW_SYMLINK_CHAIN
+            \ FORMAT
             \ FUNCTION
             \ GENERATE
             \ GET_RUNTIME_DEPENDENCIES
             \ GLOB
             \ GLOB_RECURSE
+            \ GROUP_EXECUTE
+            \ GROUP_READ
+            \ GROUP_WRITE
             \ GUARD
             \ HASH
             \ HEX
             \ HTTPHEADER
             \ IGNORED
             \ INACTIVITY_TIMEOUT
+            \ INPUT
             \ INSTALL
             \ IS_ABSOLUTE
             \ LENGTH_MAXIMUM
@@ -2474,22 +2676,31 @@ syn keyword cmakeKWfile contained
             \ LIMIT_INPUT
             \ LIMIT_OUTPUT
             \ LIST_DIRECTORIES
+            \ LIST_ONLY
             \ LOCK
             \ LOG
             \ MAKE_DIRECTORY
             \ MODULES
+            \ MTIME
             \ MYLIBRARY
             \ NETRC
             \ NETRC_FILE
             \ NEWLINE_CONSUME
+            \ NEWLINE_STYLE
             \ NOT
             \ NO_HEX_CONVERSION
             \ NO_SOURCE_PERMISSIONS
             \ OFFSET
-            \ OLD
+            \ ONLY
             \ OPTIONAL
             \ OUTPUT
+            \ OWNER_EXECUTE
+            \ OWNER_READ
+            \ OWNER_WRITE
+            \ PATHS
             \ PATTERN
+            \ PATTERNS
+            \ PERMISSIONS
             \ POST_EXCLUDE_REGEXES
             \ POST_INCLUDE_REGEXES
             \ PRE_EXCLUDE_REGEXES
@@ -2497,6 +2708,7 @@ syn keyword cmakeKWfile contained
             \ PROCESS
             \ READ
             \ READ_SYMLINK
+            \ REAL_PATH
             \ REGEX
             \ RELATIVE_PATH
             \ RELEASE
@@ -2518,13 +2730,17 @@ syn keyword cmakeKWfile contained
             \ STATUS
             \ STRINGS
             \ SYMBOLIC
+            \ TARGET
+            \ TARGET_PROPERTY
             \ TIMESTAMP
             \ TLS_CAINFO
             \ TLS_VERIFY
             \ TOUCH
             \ TOUCH_NOCREATE
             \ TO_CMAKE_PATH
+            \ TO_CMAKE_PATH_LIST
             \ TO_NATIVE_PATH
+            \ TO_NATIVE_PATH_LIST
             \ UNRESOLVED_DEPENDENCIES_VAR
             \ UPLOAD
             \ URL
@@ -2532,7 +2748,12 @@ syn keyword cmakeKWfile contained
             \ USE_SOURCE_PERMISSIONS
             \ UTC
             \ UTF
+            \ VERBOSE
+            \ WORLD_EXECUTE
+            \ WORLD_READ
+            \ WORLD_WRITE
             \ WRITE
+            \ XZ
             \ _FILENAMES
 
 syn keyword cmakeKWfind_file contained
@@ -2553,6 +2774,7 @@ syn keyword cmakeKWfind_file contained
             \ ONLY_CMAKE_FIND_ROOT_PATH
             \ PATHS
             \ PATH_SUFFIXES
+            \ REQUIRED
             \ VAR
 
 syn keyword cmakeKWfind_library contained
@@ -2574,6 +2796,7 @@ syn keyword cmakeKWfind_library contained
             \ ONLY_CMAKE_FIND_ROOT_PATH
             \ PATHS
             \ PATH_SUFFIXES
+            \ REQUIRED
             \ VAR
 
 syn keyword cmakeKWfind_package contained
@@ -2587,9 +2810,12 @@ syn keyword cmakeKWfind_package contained
             \ DEC
             \ DVAR
             \ EXACT
+            \ EXCLUDE
             \ FALSE
+            \ FIND_PACKAGE_VERSION_FORMAT
             \ FRAMEWORK
             \ HINTS
+            \ INCLUDE
             \ MODULE
             \ NAMES
             \ NATURAL
@@ -2609,12 +2835,26 @@ syn keyword cmakeKWfind_package contained
             \ OPTIONAL_COMPONENTS
             \ PACKAGE_FIND_NAME
             \ PACKAGE_FIND_VERSION
+            \ PACKAGE_FIND_VERSION_COMPLETE
             \ PACKAGE_FIND_VERSION_COUNT
             \ PACKAGE_FIND_VERSION_MAJOR
+            \ PACKAGE_FIND_VERSION_MAX
+            \ PACKAGE_FIND_VERSION_MAX_COUNT
+            \ PACKAGE_FIND_VERSION_MAX_MAJOR
+            \ PACKAGE_FIND_VERSION_MAX_MINOR
+            \ PACKAGE_FIND_VERSION_MAX_PATCH
+            \ PACKAGE_FIND_VERSION_MAX_TWEAK
             \ PACKAGE_FIND_VERSION_MINOR
+            \ PACKAGE_FIND_VERSION_MIN_COUNT
+            \ PACKAGE_FIND_VERSION_MIN_MAJOR
+            \ PACKAGE_FIND_VERSION_MIN_MINOR
+            \ PACKAGE_FIND_VERSION_MIN_PATCH
+            \ PACKAGE_FIND_VERSION_MIN_TWEAK
             \ PACKAGE_FIND_VERSION_PATCH
+            \ PACKAGE_FIND_VERSION_RANGE
+            \ PACKAGE_FIND_VERSION_RANGE_MAX
+            \ PACKAGE_FIND_VERSION_RANGE_MIN
             \ PACKAGE_FIND_VERSION_TWEAK
-            \ PACKAGE_VERSION
             \ PACKAGE_VERSION_COMPATIBLE
             \ PACKAGE_VERSION_EXACT
             \ PACKAGE_VERSION_UNSUITABLE
@@ -2653,6 +2893,7 @@ syn keyword cmakeKWfind_path contained
             \ ONLY_CMAKE_FIND_ROOT_PATH
             \ PATHS
             \ PATH_SUFFIXES
+            \ REQUIRED
             \ VAR
 
 syn keyword cmakeKWfind_program contained
@@ -2673,22 +2914,26 @@ syn keyword cmakeKWfind_program contained
             \ ONLY_CMAKE_FIND_ROOT_PATH
             \ PATHS
             \ PATH_SUFFIXES
+            \ REQUIRED
             \ VAR
 
 syn keyword cmakeKWfltk_wrap_ui contained
             \ FLTK
 
 syn keyword cmakeKWforeach contained
+            \ APPEND
             \ IN
             \ ITEMS
             \ LISTS
             \ RANGE
             \ STATUS
+            \ ZIP_LISTS
 
 syn keyword cmakeKWfunction contained
             \ ARGC
             \ ARGN
             \ ARGV
+            \ CALL
             \ FOO
             \ PARENT_SCOPE
 
@@ -2716,6 +2961,7 @@ syn keyword cmakeKWget_filename_component contained
             \ PROGRAM
             \ PROGRAM_ARGS
             \ REALPATH
+            \ REAL_PATH
 
 syn keyword cmakeKWget_property contained
             \ BRIEF_DOCS
@@ -2728,13 +2974,15 @@ syn keyword cmakeKWget_property contained
             \ SET
             \ SOURCE
             \ TARGET
+            \ TARGET_DIRECTORY
             \ TEST
             \ VARIABLE
 
 syn keyword cmakeKWget_source_file_property contained
+            \ DIRECTORY
             \ INHERITED
             \ LOCATION
-            \ VAR
+            \ TARGET_DIRECTORY
 
 syn keyword cmakeKWget_target_property contained
             \ INHERITED
@@ -2950,6 +3198,7 @@ syn keyword cmakeKWlist contained
             \ INTERNAL
             \ JOIN
             \ LENGTH
+            \ NATURAL
             \ ORDER
             \ OUTPUT_VARIABLE
             \ PARENT_SCOPE
@@ -2985,6 +3234,7 @@ syn keyword cmakeKWmacro contained
             \ ARGC
             \ ARGN
             \ ARGV
+            \ CALL
             \ DEFINED
             \ FOO
             \ GREATER
@@ -3001,12 +3251,18 @@ syn keyword cmakeKWmath contained
             \ OUTPUT_FORMAT
 
 syn keyword cmakeKWmessage contained
+            \ APPEND
             \ AUTHOR_WARNING
+            \ CHECK_
+            \ CHECK_FAIL
+            \ CHECK_PASS
+            \ CHECK_START
             \ DEBUG
             \ DEPRECATION
             \ FATAL_ERROR
             \ GUI
             \ NOTICE
+            \ POP_BACK
             \ SEND_ERROR
             \ STATUS
             \ TRACE
@@ -3023,6 +3279,7 @@ syn keyword cmakeKWproject contained
             \ CUDA
             \ DESCRIPTION
             \ HOMEPAGE_URL
+            \ ISPC
             \ LANGUAGES
             \ NAME
             \ NONE
@@ -3051,9 +3308,14 @@ syn keyword cmakeKWremove contained
             \ VALUE
             \ VAR
 
+syn keyword cmakeKWreturn contained
+            \ DEFER
+
 syn keyword cmakeKWseparate_arguments contained
             \ MSDN
             \ NATIVE_COMMAND
+            \ PROGRAM
+            \ SEPARATE_ARGS
             \ UNIX_COMMAND
             \ WINDOWS_COMMAND
 
@@ -3082,12 +3344,15 @@ syn keyword cmakeKWset_property contained
             \ PROPERTY
             \ SOURCE
             \ TARGET
+            \ TARGET_DIRECTORY
             \ TEST
             \ WIX
 
 syn keyword cmakeKWset_source_files_properties contained
+            \ DIRECTORY
             \ PROPERTIES
             \ SOURCE
+            \ TARGET_DIRECTORY
 
 syn keyword cmakeKWset_target_properties contained
             \ PROPERTIES
@@ -3097,6 +3362,9 @@ syn keyword cmakeKWset_tests_properties contained
             \ PROPERTIES
             \ TEST
 
+syn keyword cmakeKWsite_name contained
+            \ HOSTNAME
+
 syn keyword cmakeKWsource_group contained
             \ FILES
             \ PREFIX
@@ -3106,20 +3374,27 @@ syn keyword cmakeKWsource_group contained
 syn keyword cmakeKWstring contained
             \ ALPHABET
             \ APPEND
+            \ ARRAY
             \ ASCII
+            \ BOOLEAN
             \ CMAKE_MATCH_
             \ COMPARE
             \ CONCAT
             \ CONFIGURE
             \ EQUAL
+            \ ERROR_VARIABLE
             \ ESCAPE_QUOTES
             \ FIND
             \ GENEX_STRIP
+            \ GET
             \ GREATER
             \ GREATER_EQUAL
             \ GUID
             \ HASH
+            \ HEX
             \ JOIN
+            \ JSON
+            \ JSONLENGTH
             \ LENGTH
             \ LESS
             \ LESS_EQUAL
@@ -3127,17 +3402,24 @@ syn keyword cmakeKWstring contained
             \ MATCH
             \ MATCHALL
             \ MATCHES
+            \ MEMBER
             \ NAMESPACE
             \ NOTEQUAL
+            \ NULL
+            \ NUMBER
+            \ OBJECT
+            \ OFF
             \ ONLY
             \ PREPEND
             \ RANDOM
             \ RANDOM_SEED
             \ REGEX
+            \ REMOVE
             \ REPEAT
             \ REPLACE
             \ REVERSE
             \ RFC
+            \ SET
             \ SHA
             \ SOURCE_DATE_EPOCH
             \ STRIP
@@ -3240,8 +3522,12 @@ syn keyword cmakeKWtarget_link_options contained
             \ ALIAS
             \ BEFORE
             \ CMAKE_
+            \ CUDA_RESOLVE_DEVICE_SYMBOLS
+            \ CUDA_SEPARABLE_COMPILATION
+            \ DEVICE_LINK
             \ GCC
             \ GNU
+            \ HOST_LINK
             \ IMPORTED
             \ INTERFACE
             \ INTERFACE_LINK_OPTIONS
@@ -3258,8 +3544,11 @@ syn keyword cmakeKWtarget_link_options contained
 
 syn keyword cmakeKWtarget_precompile_headers contained
             \ ALIAS
+            \ ANGLE
+            \ BUILD_INTERFACE
             \ COMPILE_LANGUAGE
             \ DISABLE_PRECOMPILE_HEADERS
+            \ EXPORT
             \ FI
             \ GCC
             \ IMPORTED
@@ -3309,6 +3598,12 @@ syn keyword cmakeKWtry_compile contained
             \ LINK_OPTIONS
             \ MULTI
             \ NOT
+            \ OBJCXX_EXTENSIONS
+            \ OBJCXX_STANDARD
+            \ OBJCXX_STANDARD_REQUIRED
+            \ OBJC_EXTENSIONS
+            \ OBJC_STANDARD
+            \ OBJC_STANDARD_REQUIRED
             \ OUTPUT_VARIABLE
             \ PRIVATE
             \ SOURCES
@@ -3354,7 +3649,14 @@ syn keyword cmakeKWvariable_requires contained
             \ TEST_VARIABLE
 
 syn keyword cmakeKWvariable_watch contained
+            \ APPEND
             \ COMMAND
+            \ DEFINED
+            \ MODIFIED_ACCESS
+            \ READ_ACCESS
+            \ REMOVED_ACCESS
+            \ UNKNOWN_MODIFIED_ACCESS
+            \ UNKNOWN_READ_ACCESS
 
 syn keyword cmakeKWwrite_file contained
             \ APPEND
@@ -3386,15 +3688,20 @@ syn keyword cmakeGeneratorExpressions contained
             \ CONFIGURATION
             \ CUDA_COMPILER_ID
             \ CUDA_COMPILER_VERSION
+            \ CUDA_RESOLVE_DEVICE_SYMBOLS
+            \ CUDA_SEPARABLE_COMPILATION
             \ CUSTOM_KEYS
             \ CXX_COMPILER_ID
             \ CXX_COMPILER_VERSION
+            \ CXX_CONFIG
             \ CXX_STANDARD
             \ C_COMPILER_ID
             \ C_COMPILER_VERSION
             \ C_STANDARD
             \ DEBUG_MODE
             \ DEBUG_POSTFIX
+            \ DEVICE_LINK
+            \ DLL
             \ EXCLUDE
             \ EXPORT
             \ FALSE
@@ -3403,20 +3710,27 @@ syn keyword cmakeGeneratorExpressions contained
             \ GENERATE
             \ GENEX_EVAL
             \ GNU
+            \ HOST_LINK
             \ IF
             \ IGNORE
             \ IMPORT_PREFIX
             \ IMPORT_SUFFIX
             \ INCLUDE_DIRECTORIES
             \ INSTALL_INTERFACE
+            \ INSTALL_NAME_DIR
             \ INSTALL_PREFIX
+            \ INTERFACE
             \ INTERFACE_LINK_LIBRARIES
             \ IN_LIST
+            \ ISPC_COMPILER_ID
+            \ ISPC_COMPILER_VERSION
             \ JOIN
             \ LANG
             \ LANG_COMPILER_ID
             \ LIBRARY_OUTPUT_NAME
             \ LIBRARY_OUTPUT_NAME_
+            \ LINK_LANGUAGE
+            \ LINK_LANG_AND_ID
             \ LINK_LIBRARIES
             \ LINK_ONLY
             \ LOWER_CASE
@@ -3446,6 +3760,7 @@ syn keyword cmakeGeneratorExpressions contained
             \ SDK
             \ SEMICOLON
             \ SHELL_PATH
+            \ STATIC
             \ STREQUAL
             \ TARGET_BUNDLE_CONTENT_DIR
             \ TARGET_BUNDLE_DIR
@@ -3500,8 +3815,10 @@ syn keyword cmakeCommand
             \ break
             \ build_command
             \ cmake_host_system_information
+            \ cmake_language
             \ cmake_minimum_required
             \ cmake_parse_arguments
+            \ cmake_path
             \ cmake_policy
             \ configure_file
             \ continue
@@ -3658,8 +3975,10 @@ hi def link cmakeKWadd_subdirectory ModeMsg
 hi def link cmakeKWadd_test ModeMsg
 hi def link cmakeKWbuild_command ModeMsg
 hi def link cmakeKWcmake_host_system_information ModeMsg
+hi def link cmakeKWcmake_language ModeMsg
 hi def link cmakeKWcmake_minimum_required ModeMsg
 hi def link cmakeKWcmake_parse_arguments ModeMsg
+hi def link cmakeKWcmake_path ModeMsg
 hi def link cmakeKWcmake_policy ModeMsg
 hi def link cmakeKWconfigure_file ModeMsg
 hi def link cmakeKWcreate_test_sourcelist ModeMsg
@@ -3719,6 +4038,7 @@ hi def link cmakeKWproject ModeMsg
 hi def link cmakeKWqt_wrap_cpp ModeMsg
 hi def link cmakeKWqt_wrap_ui ModeMsg
 hi def link cmakeKWremove ModeMsg
+hi def link cmakeKWreturn ModeMsg
 hi def link cmakeKWseparate_arguments ModeMsg
 hi def link cmakeKWset ModeMsg
 hi def link cmakeKWset_directory_properties ModeMsg
@@ -3726,6 +4046,7 @@ hi def link cmakeKWset_property ModeMsg
 hi def link cmakeKWset_source_files_properties ModeMsg
 hi def link cmakeKWset_target_properties ModeMsg
 hi def link cmakeKWset_tests_properties ModeMsg
+hi def link cmakeKWsite_name ModeMsg
 hi def link cmakeKWsource_group ModeMsg
 hi def link cmakeKWstring ModeMsg
 hi def link cmakeKWsubdirs ModeMsg
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index bc7c900f9..03c1f3514 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -73,7 +73,7 @@ syn match ktComment "/\*\*/"
 syn match ktSpecialCharError "\v\\." contained
 syn match ktSpecialChar "\v\\([tbnr'"$\\]|u\x{4})" contained
 syn region ktString start='"' skip='\\"' end='"' contains=ktSimpleInterpolation,ktComplexInterpolation,ktSpecialChar,ktSpecialCharError
-syn region ktString start='"""' end='""""*' contains=ktSimpleInterpolation,ktComplexInterpolation,ktSpecialChar,ktSpecialCharError
+syn region ktString start='"""' end='""""*' contains=ktSimpleInterpolation,ktComplexInterpolation
 syn match ktCharacter "\v'[^']*'" contains=ktSpecialChar,ktSpecialCharError
 syn match ktCharacter "\v'\\''" contains=ktSpecialChar
 syn match ktCharacter "\v'[^\\]'"
diff --git a/syntax/moo.vim b/syntax/moo.vim
index 37be46baf..5cffa07e9 100644
--- a/syntax/moo.vim
+++ b/syntax/moo.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:	MOO
 " Maintainer:	Timo Frenay <timo@frenay.net>
-" Last Change:	2001 Oct 06
+" Last Change:	2020 Oct 19
 " Note:		Requires Vim 6.0 or above
 
 " quit when a syntax file was already loaded
@@ -99,7 +99,7 @@ if exists("moo_unknown_builtin_functions")
   syn keyword mooKnownBuiltinFunction abs acos add_property add_verb asin atan binary_hash boot_player buffered_output_length callers caller_perms call_function ceil children chparent clear_property connected_players connected_seconds connection_name connection_option connection_options cos cosh create crypt ctime db_disk_size decode_binary delete_property delete_verb disassemble dump_database encode_binary equal eval exp floatstr floor flush_input force_input function_info idle_seconds index is_clear_property is_member is_player kill_task length listappend listdelete listen listeners listinsert listset log log10 match max max_object memory_usage min move notify object_bytes open_network_connection output_delimiters parent pass players properties property_info queued_tasks queue_info raise random read recycle renumber reset_max_object resume rindex rmatch seconds_left server_log server_version setadd setremove set_connection_option set_player_flag set_property_info set_task_perms set_verb_args set_verb_code set_verb_info shutdown sin sinh sqrt strcmp string_hash strsub substitute suspend tan tanh task_id task_stack ticks_left time tofloat toint toliteral tonum toobj tostr trunc typeof unlisten valid value_bytes value_hash verbs verb_args verb_code verb_info contained
 endif
 
-" Enclosed expressions
+" Enclosed expressions
 syn match mooUnenclosedError display ~[')\]|}]~
 syn match mooParenthesesError display ~[';\]|}]~ contained
 syn region mooParentheses start=~(~ end=~)~ transparent contains=@mooEnclosedContents,mooParenthesesError

From d96f11bcd81231af1540e164152bfba11002bee9 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 2 Nov 2020 18:21:43 +0100
Subject: [PATCH 197/299] Rename cpo_save variable to prevent conflicts, fixes
 #619

---
 ftdetect/polyglot.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index a5dbf5ef3..59878c52f 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -11,7 +11,7 @@ endif
 let did_load_polyglot = 1
 
 " Switch to compatible mode for the time being
-let s:cpo_save = &cpo
+let s:polyglot_cpo_save = &cpo
 set cpo&vim
 
 " It can happen vim filetype.vim loads first, then we need a reset
@@ -3555,5 +3555,5 @@ if !has_key(g:polyglot_is_disabled, 'sensible')
 endif
 
 " Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save
+let &cpo = s:polyglot_cpo_save
+unlet s:polyglot_cpo_save

From 32f5e907370d5b635df9372b202b39492dc5dfd8 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 2 Nov 2020 18:32:43 +0100
Subject: [PATCH 198/299] Do not use [0:-1] syntax, fixes #616

---
 ftdetect/polyglot.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 59878c52f..3b50d4d35 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -3506,7 +3506,7 @@ func! s:process_rtp(rtp)
   let result = [a:rtp[0]]
   " Then all other stuff (until vimruntime)
   let i = 0
-  for path in rtp[0:-1]
+  for path in rtp[0:len(rtp)-1]
     if path == s:runtime
       break
     endif
@@ -3516,7 +3516,7 @@ func! s:process_rtp(rtp)
   " Then vim-polyglot
   call add(result, s:base)
   " Then all other files, until after-files
-  for path in rtp[i:-1]
+  for path in rtp[i:len(rtp)-1]
     if match(path, '[/\\]after$') > -1
       break
     endif
@@ -3526,11 +3526,11 @@ func! s:process_rtp(rtp)
   " Then vim-polyglot after path
   call add(result, s:base . '/after')
   " Then all other after paths
-  for path in rtp[i:-1]
+  for path in rtp[i:len(rtp)-1]
     call add(result, path)
   endfor
   " User's after directory is always last
-  call add(result, a:rtp[-1])
+  call add(result, a:rtp[len(a:rtp)-1])
   return result
 endfunc
 

From ff35c02445813b253b9cb76ba7fe2fabac71a01c Mon Sep 17 00:00:00 2001
From: Cookies <1732074+cookie-s@users.noreply.github.com>
Date: Tue, 3 Nov 2020 02:48:59 +0900
Subject: [PATCH 199/299] Restore cpoptions before recursive ftdetect read,
 fixes #619 (#621)

---
 ftdetect/polyglot.vim | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 3b50d4d35..385edb0c8 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -120,6 +120,10 @@ endfunc
 
 augroup polyglot-observer | augroup END
 
+" Restore 'cpoptions'
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
 " Load user-defined filetype.vim and oter plugins ftdetect first
 " This is to use polyglot-defined ftdetect always as fallback to user settings
 augroup filetypedetect
@@ -130,6 +134,10 @@ augroup END
 
 augroup filetypedetect
 
+" Switch to compatible mode for the time being
+let s:cpo_save = &cpo
+set cpo&vim
+
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
 if !has_key(g:polyglot_is_disabled, 'context')

From cd768124020d3c565f1d400ea0537949351b26a2 Mon Sep 17 00:00:00 2001
From: Fabien RAJAONARISON <rajaonarisonfabien@yahoo.fr>
Date: Mon, 2 Nov 2020 19:46:24 +0100
Subject: [PATCH 200/299] fix undefined cpo_save (#623)

---
 ftdetect/polyglot.vim | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 385edb0c8..72d938e8b 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -120,9 +120,11 @@ endfunc
 
 augroup polyglot-observer | augroup END
 
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save
+if exists('s:cpo_save')
+  " Restore 'cpoptions'
+  let &cpo = s:cpo_save
+  unlet s:cpo_save
+endif
 
 " Load user-defined filetype.vim and oter plugins ftdetect first
 " This is to use polyglot-defined ftdetect always as fallback to user settings

From 4af1321588c7dcb718022226cb27ec325973c2f0 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 2 Nov 2020 18:48:34 +0100
Subject: [PATCH 201/299] Revert "Rename cpo_save variable to prevent
 conflicts, fixes #619"

This reverts commit d96f11bcd81231af1540e164152bfba11002bee9.
---
 ftdetect/polyglot.vim | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 72d938e8b..edfba1d72 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -11,7 +11,7 @@ endif
 let did_load_polyglot = 1
 
 " Switch to compatible mode for the time being
-let s:polyglot_cpo_save = &cpo
+let s:cpo_save = &cpo
 set cpo&vim
 
 " It can happen vim filetype.vim loads first, then we need a reset
@@ -3565,5 +3565,5 @@ if !has_key(g:polyglot_is_disabled, 'sensible')
 endif
 
 " Restore 'cpoptions'
-let &cpo = s:polyglot_cpo_save
-unlet s:polyglot_cpo_save
+let &cpo = s:cpo_save
+unlet s:cpo_save

From da18fe6851e95e146016f7abd2f799056e074cd9 Mon Sep 17 00:00:00 2001
From: Dawid Potocki <dawid@dawidpotocki.com>
Date: Tue, 17 Nov 2020 15:58:46 +0000
Subject: [PATCH 202/299] Fix neovim :Tutor filetype detection (#631)

---
 README.md                    | 2 +-
 autoload/polyglot/sleuth.vim | 1 +
 ftdetect/polyglot.vim        | 4 ++++
 packages.yaml                | 6 ++++++
 tests/filetypes.vim          | 2 ++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 29a545360..0aa5a16f1 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->598<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->599<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index a23a2ab51..ca4f0d5a1 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -560,6 +560,7 @@ let s:globs = {
   \ 'tssop': '*.tssop',
   \ 'tt2': '*.tt2',
   \ 'tt2html': '*.tt2',
+  \ 'tutor': '*.tutor',
   \ 'typescript': '*.ts',
   \ 'typescriptreact': '*.tsx',
   \ 'uc': '*.uc',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index edfba1d72..5fa6bde33 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1856,6 +1856,10 @@ if !has_key(g:polyglot_is_disabled, 'twig')
   au BufNewFile,BufRead *.xml.twig setf xml.twig
 endif
 
+if !has_key(g:polyglot_is_disabled, 'tutor')
+  au BufNewFile,BufRead *.tutor setf tutor
+endif
+
 if !has_key(g:polyglot_is_disabled, 'tptp')
   au BufNewFile,BufRead *.ax,*.p,*.tptp setf tptp
 endif
diff --git a/packages.yaml b/packages.yaml
index d7c23f94a..b6721e05c 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1672,6 +1672,12 @@ filetypes:
   - tptp
   - ax
 ---
+name: tutor
+filetypes:
+- name: tutor
+  extensions:
+  - tutor
+---
 name: twig
 remote: lumiliet/vim-twig
 filetypes:
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index c3bb99319..5a1838b5e 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -176,6 +176,7 @@ call TestFiletype('sql')
 call TestFiletype('cql')
 call TestFiletype('php')
 call TestFiletype('blade')
+call TestFiletype('pest')
 call TestFiletype('plantuml')
 call TestFiletype('pony')
 call TestFiletype('ps1')
@@ -224,6 +225,7 @@ call TestFiletype('thrift')
 call TestFiletype('tmux')
 call TestFiletype('toml')
 call TestFiletype('tptp')
+call TestFiletype('tutor')
 call TestFiletype('html.twig')
 call TestFiletype('xml.twig')
 call TestFiletype('typescript')

From c228e993ad6a8b79db5a5a77aecfdbd8e92ea31f Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 18 Nov 2020 20:33:42 +0100
Subject: [PATCH 203/299] Update

---
 README.md                           |    6 +-
 after/indent/javascript-2.vim       |    2 +-
 after/indent/php.vim                |   46 +
 after/indent/typescript.vim         |    2 +-
 after/syntax/javascript/graphql.vim |    4 +
 after/syntax/jsx_pretty.vim         |    2 +-
 after/syntax/php/graphql.vim        |   38 +
 autoload/fsharp.vim                 |    4 +-
 autoload/polyglot/sleuth.vim        |    5 +-
 autoload/terraform.vim              |    2 +-
 extras/filetype.vim                 |    3 +-
 ftdetect/polyglot.vim               |   12 +-
 ftplugin/awk.vim                    |    7 +-
 ftplugin/erlang.vim                 |   97 ++
 ftplugin/fennel.vim                 |    2 +
 ftplugin/pest.vim                   |    4 +
 ftplugin/terraform.vim              |   18 +-
 ftplugin/typescript.vim             |    2 +-
 indent/pgsql.vim                    |    1 +
 syntax/awk.vim                      |    7 +-
 syntax/basic/function.vim           |   16 +-
 syntax/dart.vim                     |    2 +-
 syntax/debchangelog.vim             |   10 +-
 syntax/debcontrol.vim               |   16 +-
 syntax/debsources.vim               |   10 +-
 syntax/meson.vim                    |   45 +-
 syntax/nix.vim                      |    3 +-
 syntax/pest.vim                     |    4 +
 syntax/pgsql.vim                    | 1334 ++++++++++++++-------------
 syntax/qml.vim                      | 1009 +++++++++++++++++++-
 syntax/raku.vim                     |   17 +-
 syntax/tmux.vim                     |   17 +-
 32 files changed, 1983 insertions(+), 764 deletions(-)
 create mode 100644 after/indent/php.vim
 create mode 100644 after/syntax/php/graphql.vim
 create mode 100644 ftplugin/erlang.vim
 create mode 100644 ftplugin/pest.vim

diff --git a/README.md b/README.md
index 0aa5a16f1..08a88bcec 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [dhall](https://github.com/vmchale/dhall-vim) (Dhall syntax highlighting for dhall files)
 - [dlang](https://github.com/JesseKPhillips/d.vim) (D syntax highlighting for d, di, lst, dd, ddoc and sdl files)
 - [docker-compose](https://github.com/ekalinin/Dockerfile.vim)
-- [elixir](https://github.com/elixir-lang/vim-elixir) (Elixir and HTML+EEX syntax highlighting for ex, exs, eex and leex files)
+- [elixir](https://github.com/elixir-lang/vim-elixir) (Elixir and HTML+EEX syntax highlighting for ex, exs, eex, html.leex and leex files)
 - [elm](https://github.com/andys8/vim-elm-syntax) (Elm syntax highlighting for elm files)
 - [emberscript](https://github.com/yalesov/vim-ember-script) (EmberScript syntax highlighting for em and emberscript files)
 - [emblem](https://github.com/yalesov/vim-emblem) (Syntax highlighting for emblem and em files)
@@ -138,7 +138,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [odin](https://github.com/Tetralux/odin.vim) (Odin syntax highlighting for odin files)
 - [opencl](https://github.com/petRUShka/vim-opencl) (OpenCL syntax highlighting for cl and opencl files)
 - [perl](https://github.com/vim-perl/vim-perl) (Perl syntax highlighting for pl, al, cgi, fcgi, perl and 12 more files)
-- [pest](https://github.com/pest-parser/pest.vim) (PEG syntax for Rust Pest crate)
+- [pest](https://github.com/pest-parser/pest.vim) (Syntax highlighting for pest files)
 - [pgsql](https://github.com/lifepillar/pgsql.vim) (PLpgSQL syntax highlighting for pgsql files)
 - [php](https://github.com/StanAngeloff/php.vim) (PHP syntax highlighting for php, aw, ctp, fcgi, inc and 7 more files)
 - [plantuml](https://github.com/aklt/plantuml-syntax) (PlantUML syntax highlighting for puml, iuml, plantuml, uml and pu files)
@@ -194,7 +194,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [velocity](https://github.com/lepture/vim-velocity) (Syntax highlighting for vm files)
 - [vue](https://github.com/posva/vim-vue) (Vue syntax highlighting for vue and wpy files)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (Syntax highlighting for xdc files)
-- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 93 more files)
+- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 94 more files)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax) (XSLT syntax highlighting for xslt and xsl files)
 - [yard](https://github.com/noprompt/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting for zep files)
diff --git a/after/indent/javascript-2.vim b/after/indent/javascript-2.vim
index afedd9f41..3a9fe3807 100644
--- a/after/indent/javascript-2.vim
+++ b/after/indent/javascript-2.vim
@@ -38,7 +38,7 @@ setlocal indentexpr=GetJavascriptGraphQLIndent()
 
 function GetJavascriptGraphQLIndent()
   let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val, 'name')")
-  if get(l:stack, 0) ==# 'graphqlTemplateString'
+  if get(l:stack, 0, '') ==# 'graphqlTemplateString'
     return GetGraphQLIndent()
   endif
 
diff --git a/after/indent/php.vim b/after/indent/php.vim
new file mode 100644
index 000000000..f64a7c6c7
--- /dev/null
+++ b/after/indent/php.vim
@@ -0,0 +1,46 @@
+if has_key(g:polyglot_is_disabled, 'graphql')
+  finish
+endif
+
+" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+"
+" Permission is hereby granted, free of charge, to any person obtaining a copy
+" of this software and associated documentation files (the "Software"), to
+" deal in the Software without restriction, including without limitation the
+" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+" sell copies of the Software, and to permit persons to whom the Software is
+" furnished to do so, subject to the following conditions:
+"
+" The above copyright notice and this permission notice shall be included in
+" all copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+" IN THE SOFTWARE.
+"
+" Language: GraphQL
+" Maintainer: Jon Parise <jon@indelible.org>
+
+if exists('*GetPHPGraphQLIndent') && !empty(&indentexpr)
+  finish
+endif
+
+runtime! indent/graphql.vim
+
+" Set the indentexpr with our own version that will call GetGraphQLIndent when
+" we're inside of a GraphQL string and otherwise defer to the base function.
+let b:indentexpr_base = &indentexpr
+setlocal indentexpr=GetPHPGraphQLIndent()
+
+function GetPHPGraphQLIndent()
+  let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val, 'name')")
+  if get(l:stack, 0, '') ==# 'phpRegion' && count(l:stack, 'graphqlFold') > 0
+    return GetGraphQLIndent()
+  endif
+
+  return eval(b:indentexpr_base)
+endfunction
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
index edf83bc8c..6d27bc700 100644
--- a/after/indent/typescript.vim
+++ b/after/indent/typescript.vim
@@ -38,7 +38,7 @@ setlocal indentexpr=GetTypescriptGraphQLIndent()
 
 function GetTypescriptGraphQLIndent()
   let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val, 'name')")
-  if get(l:stack, 0) ==# 'graphqlTemplateString'
+  if get(l:stack, 0, '') ==# 'graphqlTemplateString'
     return GetGraphQLIndent()
   endif
 
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index b1a307144..3d4423320 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -42,6 +42,8 @@ if graphql#has_syntax_group('jsTemplateExpression')
   exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlTemplateString'
   syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=jsTemplateExpression containedin=graphqlFold keepend
 
+  syntax region graphqlTemplateString matchgroup=jsTemplateString start=+`#\s\{,4\}gql\>\s*$+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,jsTemplateExpression,jsSpecial extend
+
   hi def link graphqlTemplateString jsTemplateString
   hi def link graphqlTaggedTemplate jsTaggedTemplate
   hi def link graphqlTemplateExpression jsTemplateExpression
@@ -54,6 +56,8 @@ elseif graphql#has_syntax_group('javaScriptStringT')
   exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlTemplateString'
   syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=@javaScriptEmbededExpr containedin=graphqlFold keepend
 
+  syntax region graphqlTemplateString matchgroup=javaScriptStringT start=+`#\s\{,4\}gql\>\s*$+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,javaScriptSpecial,javaScriptEmbed,@htmlPreproc extend
+
   hi def link graphqlTemplateString javaScriptStringT
   hi def link graphqlTaggedTemplate javaScriptEmbed
   hi def link graphqlTemplateExpression javaScriptEmbed
diff --git a/after/syntax/jsx_pretty.vim b/after/syntax/jsx_pretty.vim
index 1f1e36859..714cfb5b5 100644
--- a/after/syntax/jsx_pretty.vim
+++ b/after/syntax/jsx_pretty.vim
@@ -140,7 +140,7 @@ exe 'syntax match jsxTagName
 " and
 " <tag id='sample'>
 "         ~~~~~~~~
-syntax region jsxString start=+\z(["']\)+  skip=+\\\\\|\\\z1\|\\\n+  end=+\z1+ contained contains=@Spell
+syntax region jsxString start=+\z(["']\)+  skip=+\\\\\|\\\z1\|\\\n+  end=+\z1+ extend contained contains=@Spell
 
 let s:tags = get(g:, 'vim_jsx_pretty_template_tags', ['html', 'jsx'])
 let s:enable_tagged_jsx = !empty(s:tags)
diff --git a/after/syntax/php/graphql.vim b/after/syntax/php/graphql.vim
new file mode 100644
index 000000000..d26de0731
--- /dev/null
+++ b/after/syntax/php/graphql.vim
@@ -0,0 +1,38 @@
+if has_key(g:polyglot_is_disabled, 'graphql')
+  finish
+endif
+
+" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+"
+" Permission is hereby granted, free of charge, to any person obtaining a copy
+" of this software and associated documentation files (the "Software"), to
+" deal in the Software without restriction, including without limitation the
+" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+" sell copies of the Software, and to permit persons to whom the Software is
+" furnished to do so, subject to the following conditions:
+"
+" The above copyright notice and this permission notice shall be included in
+" all copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+" IN THE SOFTWARE.
+"
+" Language: GraphQL
+" Maintainer: Jon Parise <jon@indelible.org>
+
+if exists('b:current_syntax')
+  let s:current_syntax = b:current_syntax
+  unlet b:current_syntax
+endif
+syn include @GraphQLSyntax syntax/graphql.vim
+if exists('s:current_syntax')
+  let b:current_syntax = s:current_syntax
+endif
+
+syn region phpHereDoc matchgroup=Delimiter start="\(<<<\)\@<=\(\"\=\)\z(\(\I\i*\)\=\(gql\)\c\(\i*\)\)\2$" end="^\s*\z1\>" contained contains=@GraphQLSyntax,phpIdentifier,phpIdentifierSimply,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar,@Spell keepend extend
+syntax region phpNowDoc matchgroup=Delimiter start="\(<<<\)\@<='\z(\(\I\i*\)\=\(gql\)\c\(\i*\)\)'$" end="^\s*\z1\>" contained contains=@GraphQLSyntax,@Spell keepend extend
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index 958fc0c19..7ce4ab2f3 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -467,10 +467,10 @@ function! fsharp#sendFsi(text)
     if fsharp#openFsi(!g:fsharp#fsi_focus_on_send) > 0
         " Neovim
         if has('nvim')
-            call chansend(s:fsi_job, a:text . ";;". "\n")
+            call chansend(s:fsi_job, a:text . "\n" . ";;". "\n")
         " Vim 8
         else
-            call term_sendkeys(s:fsi_buffer, a:text . ";;" . "\<cr>")
+            call term_sendkeys(s:fsi_buffer, a:text . "\<cr>" . ";;" . "\<cr>")
             call term_wait(s:fsi_buffer)
         endif
     endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index ca4f0d5a1..c10280af8 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -144,7 +144,7 @@ let s:globs = {
   \ 'ecd': '*.ecd',
   \ 'ecrystal': '*.ecr',
   \ 'edif': '*.ed\(f\|if\|o\)',
-  \ 'eelixir': '*.eex,*.leex',
+  \ 'eelixir': '*.eex,*.html.leex,*.leex',
   \ 'elf': '*.am',
   \ 'elinks': 'elinks.conf',
   \ 'elixir': '*.ex,*.exs,mix.lock',
@@ -388,6 +388,7 @@ let s:globs = {
   \ 'pcmk': '*.pcmk',
   \ 'pdf': '*.pdf',
   \ 'perl': '*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc,.gitolite.rc',
+  \ 'pest': '*.pest',
   \ 'pf': 'pf.conf',
   \ 'pfmain': 'main.cf',
   \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,*.phtml,*.php9,.php,.php_cs,.php_cs.dist,Phakefile',
@@ -607,7 +608,7 @@ let s:globs = {
   \ 'xhtml': '*.xhtml,*.xht',
   \ 'xinetd': '',
   \ 'xmath': '*.msc,*.msf',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
   \ 'xml.twig': '*.xml.twig',
   \ 'xmodmap': '*Xmodmap,*xmodmap*',
   \ 'xpm': '*.xpm,*.pm',
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index 647ee7222..652c4b30f 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -20,7 +20,7 @@ function! terraform#fmt() abort
   let tmpfile = tempname()
   let shellredir_save = &shellredir
   let &shellredir = '>%s 2>'.tmpfile
-  silent execute '%!terraform fmt -no-color -'
+  silent execute '%!'.g:terraform_binary_path.' fmt -no-color -'
   let &shellredir = shellredir_save
 
   " If there was an error, undo any changes and show stderr.
diff --git a/extras/filetype.vim b/extras/filetype.vim
index f1893ee32..4dd33f17c 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1305,6 +1305,7 @@ au BufNewFile,BufRead *.pml			setf promela
 
 " Google protocol buffers
 au BufNewFile,BufRead *.proto			setf proto
+au BufNewFile,BufRead *.pbtxt			setf pbtxt
 
 " Protocols
 au BufNewFile,BufRead */etc/protocols		setf protocols
@@ -1721,7 +1722,7 @@ au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl	setf tex
 au BufNewFile,BufRead *.tex			call polyglot#ft#FTtex()
 
 " ConTeXt
-au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi   setf context
+au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi,*.mkxl,*.mklx   setf context
 
 " Texinfo
 au BufNewFile,BufRead *.texinfo,*.texi,*.txi	setf texinfo
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 5fa6bde33..9fb53aa6c 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2012,10 +2012,6 @@ if !has_key(g:polyglot_is_disabled, 'requirements')
   au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} setf requirements
 endif
 
-if !has_key(g:polyglot_is_disabled, 'pest')
-  au BufNewFile,BufRead *.pest setf pest
-endif
-
 if !has_key(g:polyglot_is_disabled, 'python')
   au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript setf python
 endif
@@ -2050,6 +2046,10 @@ if !has_key(g:polyglot_is_disabled, 'plantuml')
   au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml setf plantuml
 endif
 
+if !has_key(g:polyglot_is_disabled, 'pest')
+  au BufNewFile,BufRead *.pest setf pest
+endif
+
 if !has_key(g:polyglot_is_disabled, 'blade')
   au BufNewFile,BufRead *.blade,*.blade.php setf blade
 endif
@@ -2373,7 +2373,7 @@ endif
 
 if !has_key(g:polyglot_is_disabled, 'elixir')
   au BufNewFile,BufRead *.ex,*.exs,mix.lock setf elixir
-  au BufNewFile,BufRead *.eex,*.leex setf eelixir
+  au BufNewFile,BufRead *.eex,*.html.leex,*.leex setf eelixir
 endif
 
 if !has_key(g:polyglot_is_disabled, 'docker-compose')
@@ -2550,7 +2550,7 @@ if !has_key(g:polyglot_is_disabled, 'ant')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
 endif
 
 if !has_key(g:polyglot_is_disabled, 'csv')
diff --git a/ftplugin/awk.vim b/ftplugin/awk.vim
index a3b02e170..a534249ba 100644
--- a/ftplugin/awk.vim
+++ b/ftplugin/awk.vim
@@ -3,9 +3,10 @@ if has_key(g:polyglot_is_disabled, 'awk')
 endif
 
 " Vim filetype plugin
-" Language:	awk, nawk, gawk, mawk
-" Maintainer:	Antonio Colombo <azc100@gmail.com>
-" Last Change:	2020 Sep 28
+" Language:		awk, nawk, gawk, mawk
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Antonio Colombo <azc100@gmail.com>
+" Last Change:		2020 Sep 28
 
 " This plugin was prepared by Mark Sikora
 " This plugin was updated as proposed by Doug Kearns
diff --git a/ftplugin/erlang.vim b/ftplugin/erlang.vim
new file mode 100644
index 000000000..45eb68f69
--- /dev/null
+++ b/ftplugin/erlang.vim
@@ -0,0 +1,97 @@
+if has_key(g:polyglot_is_disabled, 'erlang')
+  finish
+endif
+
+" Vim ftplugin file
+" Language:     Erlang
+" Maintainer:   Csaba Hoch <csaba.hoch@gmail.com>
+" Author:       Oscar Hellström <oscar@oscarh.net>
+" Contributors: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
+"               Eduardo Lopez (http://github.com/tapichu)
+" License:      Vim license
+" Version:      2012/01/25
+
+if exists('b:did_ftplugin')
+	finish
+else
+	let b:did_ftplugin = 1
+endif
+
+if exists('s:did_function_definitions')
+	call s:SetErlangOptions()
+	finish
+else
+	let s:did_function_definitions = 1
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+if !exists('g:erlang_keywordprg')
+	let g:erlang_keywordprg = 'erl -man'
+endif
+
+if !exists('g:erlang_folding')
+	let g:erlang_folding = 0
+endif
+
+let s:erlang_fun_begin = '^\a\w*(.*$'
+let s:erlang_fun_end   = '^[^%]*\.\s*\(%.*\)\?$'
+
+function s:SetErlangOptions()
+	if g:erlang_folding
+		setlocal foldmethod=expr
+		setlocal foldexpr=GetErlangFold(v:lnum)
+		setlocal foldtext=ErlangFoldText()
+	endif
+
+	setlocal comments=:%%%,:%%,:%
+	setlocal commentstring=%%s
+
+	setlocal formatoptions+=ro
+	let &l:keywordprg = g:erlang_keywordprg
+
+        setlocal suffixesadd=.erl,.hrl
+
+        let &l:include = '^\s*-\%(include\|include_lib\)\s*("\zs\f*\ze")'
+        let &l:define  = '^\s*-\%(define\|record\|type\|opaque\)'
+endfunction
+
+function GetErlangFold(lnum)
+	let lnum = a:lnum
+	let line = getline(lnum)
+
+	if line =~ s:erlang_fun_end
+		return '<1'
+	endif
+
+	if line =~ s:erlang_fun_begin && foldlevel(lnum - 1) == 1
+		return '1'
+	endif
+
+	if line =~ s:erlang_fun_begin
+		return '>1'
+	endif
+
+	return '='
+endfunction
+
+function ErlangFoldText()
+	let line    = getline(v:foldstart)
+	let foldlen = v:foldend - v:foldstart + 1
+	let lines   = ' ' . foldlen . ' lines: ' . substitute(line, "[\ \t]*", '', '')
+	if foldlen < 10
+		let lines = ' ' . lines
+	endif
+	let retval = '+' . v:folddashes . lines
+
+	return retval
+endfunction
+
+call s:SetErlangOptions()
+
+let b:undo_ftplugin = "setlocal foldmethod< foldexpr< foldtext<"
+	\ . " comments< commentstring< formatoptions< suffixesadd< include< define<"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/ftplugin/fennel.vim b/ftplugin/fennel.vim
index f840bb3b4..ac905f271 100644
--- a/ftplugin/fennel.vim
+++ b/ftplugin/fennel.vim
@@ -21,6 +21,8 @@ setlocal iskeyword=!,$,%,#,*,+,-,.,/,:,<,=,>,?,_,a-z,A-Z,48-57,128-247,124,126,3
 " of user-defined def* definitions.
 setlocal define=\\v[(/]def(ault)@!\\S*
 
+setlocal suffixesadd=.fnl
+
 " Remove 't' from 'formatoptions' to avoid auto-wrapping code.
 setlocal formatoptions-=t
 
diff --git a/ftplugin/pest.vim b/ftplugin/pest.vim
new file mode 100644
index 000000000..09ad3583e
--- /dev/null
+++ b/ftplugin/pest.vim
@@ -0,0 +1,4 @@
+if has_key(g:polyglot_is_disabled, 'pest')
+  finish
+endif
+
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index 17a8b6d8a..0ef25d30c 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -19,10 +19,10 @@ silent! setlocal formatoptions+=j
 let b:undo_ftplugin = 'setlocal formatoptions<'
 
 if !has('patch-7.4.1142')
-    " Include hyphens as keyword characters so that a keyword appearing as
-    " part of a longer name doesn't get partially highlighted.
-    setlocal iskeyword+=-
-    let b:undo_ftplugin .= ' iskeyword<'
+  " Include hyphens as keyword characters so that a keyword appearing as
+  " part of a longer name doesn't get partially highlighted.
+  setlocal iskeyword+=-
+  let b:undo_ftplugin .= ' iskeyword<'
 endif
 
 if get(g:, 'terraform_fold_sections', 0)
@@ -42,14 +42,20 @@ endif
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
 
-if !executable('terraform')
+if !exists('g:terraform_binary_path')
+  let g:terraform_binary_path='terraform'
+endif
+
+if !executable(g:terraform_binary_path)
   finish
 endif
 
 let s:cpo_save = &cpoptions
 set cpoptions&vim
 
-command! -nargs=+ -complete=custom,terraform#commands -buffer Terraform execute '!terraform '.<q-args>. ' -no-color'
+command! -nargs=+ -complete=custom,terraform#commands -buffer Terraform
+  \ execute '!'.g:terraform_binary_path.' '.<q-args>.' -no-color'
+
 command! -nargs=0 -buffer TerraformFmt call terraform#fmt()
 let b:undo_ftplugin .= '|delcommand Terraform|delcommand TerraformFmt'
 
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index 963d0fe4e..ec06e34df 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -20,7 +20,7 @@ setlocal commentstring=//\ %s
 setlocal formatoptions-=t formatoptions+=croql
 
 if !&l:formatexpr && !&l:formatprg
-    setlocal formatprg=Fixedgq(v:lnum,v:count)
+    setlocal formatexpr=Fixedgq(v:lnum,v:count)
 endif
 
 " setlocal foldmethod=syntax
diff --git a/indent/pgsql.vim b/indent/pgsql.vim
index a0b42f2ce..e1823c013 100644
--- a/indent/pgsql.vim
+++ b/indent/pgsql.vim
@@ -6,6 +6,7 @@ endif
 " Language:    SQL
 " Author:  David Fishburn <dfishburn dot vim at gmail dot com>
 " Maintainer: Lifepillar <lifepillar at lifepillar dot me>
+" License:     Vim license (see `:help license`)
 
 " Notes:
 " Adapted from Vim's default indentation for SQL.
diff --git a/syntax/awk.vim b/syntax/awk.vim
index b8b7f3dfb..ea1d760f5 100644
--- a/syntax/awk.vim
+++ b/syntax/awk.vim
@@ -3,9 +3,10 @@ if has_key(g:polyglot_is_disabled, 'awk')
 endif
 
 " Vim syntax file
-" Language:	awk, nawk, gawk, mawk
-" Maintainer:	Antonio Colombo <azc100@gmail.com>
-" Last Change:	2020 Aug 18
+" Language:		awk, nawk, gawk, mawk
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Antonio Colombo <azc100@gmail.com>
+" Last Change:		2020 Aug 18
 
 " AWK  ref. is: Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger
 " The AWK Programming Language, Addison-Wesley, 1988
diff --git a/syntax/basic/function.vim b/syntax/basic/function.vim
index e61d02759..aed182a7c 100644
--- a/syntax/basic/function.vim
+++ b/syntax/basic/function.vim
@@ -22,27 +22,17 @@ syntax match   typescriptFuncName              contained /\K\k*/
   \ nextgroup=@typescriptCallSignature
   \ skipwhite
 
-" destructuring ({ a: ee }) =>
-syntax match   typescriptArrowFuncDef          contained /(\(\s*\({\_[^}]*}\|\k\+\)\(:\_[^)]\)\?,\?\)\+)\s*=>/
-  \ contains=typescriptArrowFuncArg,typescriptArrowFunc
-  \ nextgroup=@typescriptExpression,typescriptBlock
-  \ skipwhite skipempty
-
-" matches `(a) =>` or `([a]) =>` or
-" `(
-"  a) =>`
-syntax match   typescriptArrowFuncDef          contained /(\(\_s*[a-zA-Z\$_\[.]\_[^)]*\)*)\s*=>/
+syntax match   typescriptArrowFuncDef          contained /\K\k*\s*=>/
   \ contains=typescriptArrowFuncArg,typescriptArrowFunc
   \ nextgroup=@typescriptExpression,typescriptBlock
   \ skipwhite skipempty
 
-syntax match   typescriptArrowFuncDef          contained /\K\k*\s*=>/
+syntax match   typescriptArrowFuncDef          contained /(\%(\_[^()]\+\|(\_[^()]*)\)*)\_s*=>/
   \ contains=typescriptArrowFuncArg,typescriptArrowFunc
   \ nextgroup=@typescriptExpression,typescriptBlock
   \ skipwhite skipempty
 
-" TODO: optimize this pattern
-syntax region   typescriptArrowFuncDef          contained start=/(\_[^(^)]*):/ end=/=>/
+syntax region  typescriptArrowFuncDef          contained start=/(\%(\_[^()]\+\|(\_[^()]*)\)*):/ end=/=>/
   \ contains=typescriptArrowFuncArg,typescriptArrowFunc,typescriptTypeAnnotation
   \ nextgroup=@typescriptExpression,typescriptBlock
   \ skipwhite skipempty keepend
diff --git a/syntax/dart.vim b/syntax/dart.vim
index 5b503dad1..3400ae7ac 100644
--- a/syntax/dart.vim
+++ b/syntax/dart.vim
@@ -53,7 +53,7 @@ syntax match   dartLibrary       "^\(library\|part of\|part\)\>"
 syntax match   dartMetadata      "@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>"
 
 " Numbers
-syntax match   dartNumber        "\<\d\+\(\.\d\+\)\=\>"
+syntax match   dartNumber        "\<0[xX]\x\+\>\|\<\d\+\(\.\d\+\)\=\([eE][+-]\=\d\+\)\=\>"
 
 " User Types
 syntax match   dartUserType      "\<[_$]*\u[a-zA-Z0-9_$]*\>"
diff --git a/syntax/debchangelog.vim b/syntax/debchangelog.vim
index b4214ca93..4f89fbbbd 100644
--- a/syntax/debchangelog.vim
+++ b/syntax/debchangelog.vim
@@ -7,7 +7,7 @@ endif
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2020 Apr 27
+" Last Change: 2020 Oct 28
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -25,20 +25,20 @@ let s:cpo = &cpo
 set cpo-=C
 let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
-      \ 'wheezy', 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
+      \ 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
       \ 'sid', 'rc-buggy',
       \
-      \ 'trusty', 'xenial', 'bionic', 'eoan', 'focal', 'groovy', 'devel'
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'groovy', 'hippo', 'devel'
       \ ]
 let s:unsupported = [
       \ 'frozen', 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
-      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze',
+      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
       \
       \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
       \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
       \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
-      \ 'disco'
+      \ 'disco', 'eoan'
       \ ]
 let &cpo=s:cpo
 
diff --git a/syntax/debcontrol.vim b/syntax/debcontrol.vim
index 13d41a229..70f85d7e3 100644
--- a/syntax/debcontrol.vim
+++ b/syntax/debcontrol.vim
@@ -7,7 +7,7 @@ endif
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2018 Aug 11
+" Last Change: 2020 Oct 26
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcontrol.vim
 
 " Standard syntax initialization
@@ -51,22 +51,24 @@ exe 'syn keyword debcontrolArchitecture contained '. join(s:pairs)
 
 unlet s:kernels s:archs s:pairs
 
+" Keep in sync with https://metadata.ftp-master.org/sections.822
+" curl -q https://metadata.ftp-master.debian.org/sections.822 2>/dev/null| grep-dctrl -n --not -FSection -sSection  / -
 let s:sections = [
       \ 'admin', 'cli-mono', 'comm', 'database', 'debian-installer', 'debug'
       \, 'devel', 'doc', 'editors', 'education', 'electronics', 'embedded'
-      \, 'fonts', 'games', 'gnome', 'gnustep', 'gnu-r', 'golang', 'graphics'
+      \, 'fonts', 'games', 'gnome', 'gnu-r', 'gnustep', 'golang', 'graphics'
       \, 'hamradio', 'haskell', 'httpd', 'interpreters', 'introspection'
-      \, 'java\%(script\)\=', 'kde', 'kernel', 'libs', 'libdevel', 'lisp'
-      \, 'localization', 'mail', 'math', 'metapackages', 'misc', 'net'
-      \, 'news', 'ocaml', 'oldlibs', 'otherosfs', 'perl', 'php', 'python'
-      \, 'ruby', 'rust', 'science', 'shells', 'sound', 'text', 'tex'
+      \, 'java', 'javascript', 'kde', 'kernel', 'libdevel', 'libs', 'lisp'
+      \, 'localization', 'mail', 'math', 'metapackages', 'misc', 'net', 'news'
+      \, 'ocaml', 'oldlibs', 'otherosfs', 'perl', 'php', 'python', 'raku'
+      \, 'ruby', 'rust', 'science', 'shells', 'sound', 'tasks', 'tex', 'text'
       \, 'utils', 'vcs', 'video', 'web', 'x11', 'xfce', 'zope'
       \ ]
 
 syn keyword debcontrolMultiArch contained no foreign allowed same
 syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
 syn keyword debcontrolPriority contained extra important optional required standard
-exe 'syn match debcontrolSection contained "\%(\%(contrib\|non-free\|non-US/main\|non-US/contrib\|non-US/non-free\|restricted\|universe\|multiverse\)/\)\=\%('.join(s:sections, '\|').'\)"'
+exe 'syn match debcontrolSection contained "\%(\%(contrib\|non-free\|non-US/main\|non-US/contrib\|non-US/non-free\|restricted\|universe\|multiverse\)/\)\=\<\%('.join(s:sections, '\|').'\)\>"'
 syn keyword debcontrolPackageType contained udeb deb
 syn match debcontrolVariable contained "\${.\{-}}"
 syn keyword debcontrolDmUpload contained yes
diff --git a/syntax/debsources.vim b/syntax/debsources.vim
index eaaa4f6e0..4447b20c9 100644
--- a/syntax/debsources.vim
+++ b/syntax/debsources.vim
@@ -6,7 +6,7 @@ endif
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2020 Apr 27
+" Last Change: 2020 Oct 26
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -27,20 +27,20 @@ let s:cpo = &cpo
 set cpo-=C
 let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
-      \ 'wheezy', 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
+      \ 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
       \ 'sid', 'rc-buggy',
       \
-      \ 'trusty', 'xenial', 'bionic', 'eoan', 'focal', 'groovy', 'devel'
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'groovy', 'hippo', 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
-      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze',
+      \ 'woody', 'sarge', 'etch', 'lenny', 'squeeze', 'wheezy',
       \
       \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
       \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
       \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
-      \ 'disco'
+      \ 'disco', 'eoan'
       \ ]
 let &cpo=s:cpo
 
diff --git a/syntax/meson.vim b/syntax/meson.vim
index cb9740cd9..0dbbbaa64 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -21,11 +21,7 @@ endif
 "   let meson_space_error_highlight = 1
 "
 
-" For version 5.x: Clear all syntax items.
-" For version 6.x: Quit when a syntax file was already loaded.
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
@@ -136,31 +132,20 @@ if exists("meson_space_error_highlight")
   syn match   mesonSpaceError	display "\t\+ "
 endif
 
-if version >= 508 || !exists("did_meson_syn_inits")
-  if version <= 508
-    let did_meson_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  " The default highlight links.  Can be overridden later.
-  HiLink mesonStatement		Statement
-  HiLink mesonConditional	Conditional
-  HiLink mesonRepeat		Repeat
-  HiLink mesonOperator		Operator
-  HiLink mesonComment		Comment
-  HiLink mesonTodo		Todo
-  HiLink mesonString		String
-  HiLink mesonEscape		Special
-  HiLink mesonNumber		Number
-  HiLink mesonBuiltin		Function
-  HiLink mesonConstant		Number
-  if exists("meson_space_error_highlight")
-    HiLink mesonSpaceError	Error
-  endif
-
-  delcommand HiLink
+" The default highlight links.  Can be overridden later.
+hi def link mesonStatement	Statement
+hi def link mesonConditional	Conditional
+hi def link mesonRepeat	Repeat
+hi def link mesonOperator	Operator
+hi def link mesonComment	Comment
+hi def link mesonTodo		Todo
+hi def link mesonString	String
+hi def link mesonEscape	Special
+hi def link mesonNumber	Number
+hi def link mesonBuiltin	Function
+hi def link mesonConstant	Number
+if exists("meson_space_error_higlight")
+  hi def link mesonSpaceError	Error
 endif
 
 let b:current_syntax = "meson"
diff --git a/syntax/nix.vim b/syntax/nix.vim
index 7165bf52f..a8c382e62 100644
--- a/syntax/nix.vim
+++ b/syntax/nix.vim
@@ -151,7 +151,8 @@ syn keyword nixNamespacedBuiltin contained
       \ removeAttrs replaceStrings scopedImport seq sort split splitVersion
       \ storeDir storePath stringLength sub substring tail throw toFile toJSON
       \ toPath toString toXML trace tryEval typeOf unsafeDiscardOutputDependency
-      \ unsafeDiscardStringContext unsafeGetAttrPos valueSize fromTOML
+      \ unsafeDiscardStringContext unsafeGetAttrPos valueSize fromTOML bitAnd
+      \ bitOr bitXor
 
 syn match nixBuiltin "builtins\.[a-zA-Z']\+"he=s+9 contains=nixComment,nixNamespacedBuiltin
 
diff --git a/syntax/pest.vim b/syntax/pest.vim
index c151c6785..03f66979f 100644
--- a/syntax/pest.vim
+++ b/syntax/pest.vim
@@ -1,3 +1,7 @@
+if has_key(g:polyglot_is_disabled, 'pest')
+  finish
+endif
+
 " Comments
 syntax keyword pestTodo contained TODO FIXME XXX NOTE
 syntax match pestComment "\/\/.*$" contains=celTodo
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 9769ca4c9..91e48eb7e 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -5,11 +5,11 @@ endif
 " Vim syntax file
 " Language:     SQL (PostgreSQL dialect), PL/pgSQL, PL/…, PostGIS, …
 " Maintainer:   Lifepillar
-" Version:      2.2.2
-" License:      This file is placed in the public domain.
+" Version:      2.3.0
+" License:      Vim license (see `:help license`)
 
-" Based on PostgreSQL 12.4
-" Automatically generated on 2020-10-03 at 18:36:49
+" Based on PostgreSQL 13.0
+" Automatically generated on 2020-11-15 at 22:23:22
 
 if exists("b:current_syntax")
   finish
@@ -34,41 +34,40 @@ syn keyword sqlStatement contained rollback savepoint security select select set
 syn keyword sqlStatement contained truncate unlisten update vacuum values work
 syn match sqlStatement contained /\<create\%(\_s\+or\_s\+replace\)\=\>/
 " Types
-syn keyword sqlType contained aclitem addbandarg addr addr_gid_seq addrfeat addrfeat_gid_seq
-syn keyword sqlType contained agg_count agg_samealignment anyarray anyelement anyenum
-syn keyword sqlType contained anynonarray anyrange bg bg_gid_seq bit bool box box2d box2df box3d bpchar bytea
-syn keyword sqlType contained cardinal_number char character_data cid cidr circle citext county
-syn keyword sqlType contained county_gid_seq county_lookup countysub_lookup cousub
-syn keyword sqlType contained cousub_gid_seq cstring cube date daterange dblink_pkey_results
-syn keyword sqlType contained direction_lookup ean13 earth edges edges_gid_seq errcodes event_trigger faces
-syn keyword sqlType contained faces_gid_seq fdw_handler featnames featnames_gid_seq float4
-syn keyword sqlType contained float8 gbtreekey16 gbtreekey32 gbtreekey4 gbtreekey8 gbtreekey_var
-syn keyword sqlType contained geocode_settings geocode_settings_default geography
-syn keyword sqlType contained geography_columns geometry geometry_columns geometry_dump geomval
-syn keyword sqlType contained getfaceedges_returntype ghstore gidx gtrgm gtsvector hstore index_am_handler
-syn keyword sqlType contained inet int2 int2vector int4 int4range int8 int8range intbig_gkey
-syn keyword sqlType contained internal interval isbn isbn13 ismn ismn13 issn issn13 json jsonb jsonpath
-syn keyword sqlType contained language_handler layer line lo loader_lookuptables
-syn keyword sqlType contained loader_platform loader_variables lquery lseg ltree ltree_gist ltxtquery macaddr
-syn keyword sqlType contained macaddr8 money norm_addy numeric numrange oid oidvector opaque
-syn keyword sqlType contained pagc_gaz pagc_gaz_id_seq pagc_lex pagc_lex_id_seq pagc_rules
-syn keyword sqlType contained pagc_rules_id_seq path pg_all_foreign_keys pg_ddl_command
-syn keyword sqlType contained pg_dependencies pg_lsn pg_mcv_list pg_ndistinct pg_node_tree place
-syn keyword sqlType contained place_gid_seq place_lookup point polygon query_int rastbandarg raster
-syn keyword sqlType contained raster_columns raster_overviews reclassarg record refcursor regclass
-syn keyword sqlType contained regconfig regdictionary regnamespace regoper regoperator regproc
-syn keyword sqlType contained regprocedure regrole regtype secondary_unit_lookup seg
-syn keyword sqlType contained spatial_ref_sys spheroid sql_identifier state state_gid_seq state_lookup
-syn keyword sqlType contained stdaddr street_type_lookup summarystats tabblock tabblock_gid_seq
-syn keyword sqlType contained table_am_handler tablefunc_crosstab_2 tablefunc_crosstab_3
-syn keyword sqlType contained tablefunc_crosstab_4 tap_funky text tid time time_stamp timestamp
-syn keyword sqlType contained timestamptz timetz topoelement topoelementarray topogeometry
-syn keyword sqlType contained topology topology_id_seq tract tract_gid_seq tsm_handler tsquery tsrange
-syn keyword sqlType contained tstzrange tsvector txid_snapshot unionarg upc us_gaz
-syn keyword sqlType contained us_gaz_id_seq us_lex us_lex_id_seq us_rules us_rules_id_seq uuid valid_detail
-syn keyword sqlType contained validatetopology_returntype varbit varchar void xid xml yes_or_no
-syn keyword sqlType contained zcta5 zcta5_gid_seq zip_lookup zip_lookup_all zip_lookup_base
-syn keyword sqlType contained zip_state zip_state_loc
+syn keyword sqlType contained aclitem addr addr_gid_seq addrfeat addrfeat_gid_seq anyarray
+syn keyword sqlType contained anycompatible anycompatiblearray anycompatiblenonarray
+syn keyword sqlType contained anycompatiblerange anyelement anyenum anynonarray anyrange bg bg_gid_seq bit
+syn keyword sqlType contained bool box box2d box2df box3d bpchar bytea cardinal_number char
+syn keyword sqlType contained character_data cid cidr circle citext county county_gid_seq
+syn keyword sqlType contained county_lookup countysub_lookup cousub cousub_gid_seq cstring cube date
+syn keyword sqlType contained daterange dblink_pkey_results direction_lookup ean13 earth edges
+syn keyword sqlType contained edges_gid_seq errcodes event_trigger faces faces_gid_seq fdw_handler
+syn keyword sqlType contained featnames featnames_gid_seq float4 float8 gbtreekey16 gbtreekey32
+syn keyword sqlType contained gbtreekey4 gbtreekey8 gbtreekey_var geocode_settings
+syn keyword sqlType contained geocode_settings_default geography geography_columns geometry
+syn keyword sqlType contained geometry_columns geometry_dump getfaceedges_returntype ghstore gidx gtrgm
+syn keyword sqlType contained gtsvector hstore index_am_handler inet int2 int2vector int4 int4range
+syn keyword sqlType contained int8 int8range intbig_gkey internal interval isbn isbn13 ismn ismn13
+syn keyword sqlType contained issn issn13 json jsonb jsonpath language_handler layer line lo
+syn keyword sqlType contained loader_lookuptables loader_platform loader_variables lquery lseg
+syn keyword sqlType contained ltree ltree_gist ltxtquery macaddr macaddr8 money norm_addy numeric
+syn keyword sqlType contained numrange oid oidvector pagc_gaz pagc_gaz_id_seq pagc_lex
+syn keyword sqlType contained pagc_lex_id_seq pagc_rules pagc_rules_id_seq path pg_all_foreign_keys
+syn keyword sqlType contained pg_ddl_command pg_dependencies pg_lsn pg_mcv_list pg_ndistinct
+syn keyword sqlType contained pg_node_tree pg_snapshot place place_gid_seq place_lookup point polygon
+syn keyword sqlType contained query_int record refcursor regclass regcollation regconfig
+syn keyword sqlType contained regdictionary regnamespace regoper regoperator regproc regprocedure
+syn keyword sqlType contained regrole regtype secondary_unit_lookup seg spatial_ref_sys spheroid
+syn keyword sqlType contained sql_identifier state state_gid_seq state_lookup stdaddr
+syn keyword sqlType contained street_type_lookup tabblock tabblock_gid_seq table_am_handler
+syn keyword sqlType contained tablefunc_crosstab_2 tablefunc_crosstab_3 tablefunc_crosstab_4 tap_funky
+syn keyword sqlType contained text tid time time_stamp timestamp timestamptz timetz topoelement
+syn keyword sqlType contained topoelementarray topogeometry topology topology_id_seq tract
+syn keyword sqlType contained tract_gid_seq tsm_handler tsquery tsrange tstzrange tsvector
+syn keyword sqlType contained txid_snapshot upc us_gaz us_gaz_id_seq us_lex us_lex_id_seq us_rules
+syn keyword sqlType contained us_rules_id_seq uuid valid_detail validatetopology_returntype varbit
+syn keyword sqlType contained varchar void xid xid8 xml yes_or_no zcta5 zcta5_gid_seq zip_lookup
+syn keyword sqlType contained zip_lookup_all zip_lookup_base zip_state zip_state_loc
 syn match sqlType /\<pg_toast_\d\+\>/
 syn match sqlType /\<time\%[stamp]\s\+with\%[out]\>/
 syn match sqlKeyword /\<with\s\+grant\>/
@@ -93,44 +92,45 @@ syn keyword sqlKeyword contained current_user cursor cycle data database day dec
 syn keyword sqlKeyword contained deferrable deferred definer delimiter delimiters depends desc
 syn keyword sqlKeyword contained deserialfunc detach dictionary disable distinct document domain dow doy each
 syn keyword sqlKeyword contained else enable encoding encrypted enum epoch escape event except exclude
-syn keyword sqlKeyword contained excluding exclusive exists extension external extract false family
-syn keyword sqlKeyword contained filter finalfunc finalfunc_extra finalfunc_modify first float
-syn keyword sqlKeyword contained following for force foreign forward freeze from full function functions
-syn keyword sqlKeyword contained generated global granted greatest group grouping groups handler
-syn keyword sqlKeyword contained having header hold hour hypothetical identity if ilike immediate
-syn keyword sqlKeyword contained immutable implicit in include including increment index indexes inherit
-syn keyword sqlKeyword contained inherits initcond initially inline inner inout input insensitive
-syn keyword sqlKeyword contained instead intersect into invoker is isnull isodow isolation isoyear join key
-syn keyword sqlKeyword contained language large last lateral lc_collate lc_ctype leading leakproof
-syn keyword sqlKeyword contained least left level like limit local locale localtime localtimestamp
-syn keyword sqlKeyword contained location locked logged login mapping match materialized maxvalue
-syn keyword sqlKeyword contained method mfinalfunc mfinalfunc_extra mfinalfunc_modify microseconds
-syn keyword sqlKeyword contained millennium milliseconds minitcond minute minvalue minvfunc mode month
-syn keyword sqlKeyword contained msfunc msspace mstype name names national natural nchar new next no
-syn keyword sqlKeyword contained nobypassrls nocreatedb nocreaterole noinherit nologin none
-syn keyword sqlKeyword contained noreplication nosuperuser not nothing notnull nowait null nullif nulls
-syn keyword sqlKeyword contained object of off offset oids old on only operator option options or order
-syn keyword sqlKeyword contained ordinality others out outer over overlaps overlay overriding owned owner
-syn keyword sqlKeyword contained parallel parser partial partition passing password permissive
-syn keyword sqlKeyword contained placing plans policy position preceding preserve primary prior privileges
-syn keyword sqlKeyword contained procedural procedure procedures program provider public
-syn keyword sqlKeyword contained publication quarter quote range read read_write readonly recheck recursive
-syn keyword sqlKeyword contained ref references referencing relative rename repeatable replace
-syn keyword sqlKeyword contained replica replication restart restrict restricted restrictive returning
-syn keyword sqlKeyword contained returns right role rollup routine routines row rows rule safe schema
-syn keyword sqlKeyword contained schemas scroll search second sequence sequences serialfunc
-syn keyword sqlKeyword contained serializable server session session_user setof sets sfunc share shareable
-syn keyword sqlKeyword contained similar simple skip snapshot some sortop sql sspace stable standalone
-syn keyword sqlKeyword contained statement statistics stdin stdout storage stored strict strip stype
-syn keyword sqlKeyword contained subscription substring superuser support symmetric sysid system table
-syn keyword sqlKeyword contained tables tablesample tablespace temp template temporary then ties
-syn keyword sqlKeyword contained timezone timezone_hour timezone_minute to trailing transform treat
-syn keyword sqlKeyword contained trigger trim true trusted type types unbounded uncommitted
-syn keyword sqlKeyword contained unencrypted union unique unknown unlogged unsafe until usage user using valid
-syn keyword sqlKeyword contained validate validator value variadic verbose version view views volatile
-syn keyword sqlKeyword contained week when where whitespace window with within without wrapper write
-syn keyword sqlKeyword contained xmlattributes xmlconcat xmlelement xmlexists xmlforest
-syn keyword sqlKeyword contained xmlnamespaces xmlparse xmlpi xmlroot xmlserialize xmltable year yes
+syn keyword sqlKeyword contained excluding exclusive exists expression extension external extract
+syn keyword sqlKeyword contained false family filter finalfunc finalfunc_extra finalfunc_modify
+syn keyword sqlKeyword contained first float following for force foreign forward freeze from full function
+syn keyword sqlKeyword contained functions generated global granted greatest group grouping groups
+syn keyword sqlKeyword contained handler having header hold hour hypothetical identity if ilike
+syn keyword sqlKeyword contained immediate immutable implicit in include including increment index indexes
+syn keyword sqlKeyword contained inherit inherits initcond initially inline inner inout input
+syn keyword sqlKeyword contained insensitive instead intersect into invoker is isnull isodow isolation
+syn keyword sqlKeyword contained isoyear join key language large last lateral lc_collate lc_ctype leading
+syn keyword sqlKeyword contained leakproof least left level like limit local locale localtime
+syn keyword sqlKeyword contained localtimestamp location locked logged login mapping match materialized
+syn keyword sqlKeyword contained maxvalue method mfinalfunc mfinalfunc_extra mfinalfunc_modify
+syn keyword sqlKeyword contained microseconds millennium milliseconds minitcond minute minvalue
+syn keyword sqlKeyword contained minvfunc mode month msfunc msspace mstype name names national natural nchar
+syn keyword sqlKeyword contained new next nfc nfd nfkc nfkd no nobypassrls nocreatedb nocreaterole
+syn keyword sqlKeyword contained noinherit nologin none noreplication normalize normalized nosuperuser
+syn keyword sqlKeyword contained not nothing notnull nowait null nullif nulls object of off offset oids
+syn keyword sqlKeyword contained old on only operator option options or order ordinality others out
+syn keyword sqlKeyword contained outer over overlaps overlay overriding owned owner parallel parser
+syn keyword sqlKeyword contained partial partition passing password permissive placing plans policy
+syn keyword sqlKeyword contained position preceding preserve primary prior privileges procedural
+syn keyword sqlKeyword contained procedure procedures program provider public publication quarter quote
+syn keyword sqlKeyword contained range read read_write readonly recheck recursive ref references
+syn keyword sqlKeyword contained referencing relative rename repeatable replace replica replication
+syn keyword sqlKeyword contained restart restrict restricted restrictive returning returns right role
+syn keyword sqlKeyword contained rollup routine routines row rows rule safe schema schemas scroll search
+syn keyword sqlKeyword contained second sequence sequences serialfunc serializable server session
+syn keyword sqlKeyword contained session_user setof sets sfunc share shareable similar simple skip
+syn keyword sqlKeyword contained snapshot some sortop sql sspace stable standalone statement statistics
+syn keyword sqlKeyword contained stdin stdout storage stored strict strip stype subscription
+syn keyword sqlKeyword contained substring superuser support symmetric sysid system table tables
+syn keyword sqlKeyword contained tablesample tablespace temp template temporary then ties timezone
+syn keyword sqlKeyword contained timezone_hour timezone_minute to trailing transform treat trigger trim true
+syn keyword sqlKeyword contained trusted type types uescape unbounded uncommitted unencrypted union
+syn keyword sqlKeyword contained unique unknown unlogged unsafe until usage user using valid validate
+syn keyword sqlKeyword contained validator value variadic verbose version view views volatile week when
+syn keyword sqlKeyword contained where whitespace window with within without wrapper write
+syn keyword sqlKeyword contained xmlattributes xmlconcat xmlelement xmlexists xmlforest xmlnamespaces
+syn keyword sqlKeyword contained xmlparse xmlpi xmlroot xmlserialize xmltable year yes
 syn keyword sqlConstant contained information_schema pg_catalog
 " Built-in functions
 syn keyword sqlFunction contained RI_FKey_cascade_del RI_FKey_cascade_upd RI_FKey_check_ins
@@ -140,237 +140,245 @@ syn keyword sqlFunction contained RI_FKey_setdefault_upd RI_FKey_setnull_del RI_
 syn keyword sqlFunction contained abbrev abs aclcontains acldefault aclexplode aclinsert aclitemeq
 syn keyword sqlFunction contained aclitemin aclitemout aclremove acos acosd acosh age amvalidate any_in
 syn keyword sqlFunction contained any_out anyarray_in anyarray_out anyarray_recv anyarray_send
-syn keyword sqlFunction contained anyelement_in anyelement_out anyenum_in anyenum_out anynonarray_in
-syn keyword sqlFunction contained anynonarray_out anyrange_in anyrange_out anytextcat area
-syn keyword sqlFunction contained areajoinsel areasel array_agg array_agg_array_finalfn
-syn keyword sqlFunction contained array_agg_array_transfn array_agg_finalfn array_agg_transfn array_append
-syn keyword sqlFunction contained array_cat array_dims array_eq array_fill array_ge array_gt array_in
-syn keyword sqlFunction contained array_larger array_le array_length array_lower array_lt array_ndims
-syn keyword sqlFunction contained array_ne array_out array_position array_positions array_prepend
-syn keyword sqlFunction contained array_recv array_remove array_replace array_send array_smaller
-syn keyword sqlFunction contained array_to_json array_to_string array_to_tsvector array_typanalyze
-syn keyword sqlFunction contained array_unnest_support array_upper arraycontained arraycontains
-syn keyword sqlFunction contained arraycontjoinsel arraycontsel arrayoverlap ascii ascii_to_mic
-syn keyword sqlFunction contained ascii_to_utf8 asin asind asinh atan atan2 atan2d atand atanh avg
-syn keyword sqlFunction contained bernoulli big5_to_euc_tw big5_to_mic big5_to_utf8
-syn keyword sqlFunction contained binary_upgrade_create_empty_extension binary_upgrade_set_missing_value
-syn keyword sqlFunction contained binary_upgrade_set_next_array_pg_type_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_heap_pg_class_oid binary_upgrade_set_next_index_pg_class_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_pg_authid_oid
+syn keyword sqlFunction contained anycompatible_in anycompatible_out anycompatiblearray_in
+syn keyword sqlFunction contained anycompatiblearray_out anycompatiblearray_recv
+syn keyword sqlFunction contained anycompatiblearray_send anycompatiblenonarray_in anycompatiblenonarray_out
+syn keyword sqlFunction contained anycompatiblerange_in anycompatiblerange_out anyelement_in
+syn keyword sqlFunction contained anyelement_out anyenum_in anyenum_out anynonarray_in anynonarray_out
+syn keyword sqlFunction contained anyrange_in anyrange_out anytextcat area areajoinsel areasel array_agg
+syn keyword sqlFunction contained array_agg_array_finalfn array_agg_array_transfn
+syn keyword sqlFunction contained array_agg_finalfn array_agg_transfn array_append array_cat array_dims array_eq
+syn keyword sqlFunction contained array_fill array_ge array_gt array_in array_larger array_le
+syn keyword sqlFunction contained array_length array_lower array_lt array_ndims array_ne array_out
+syn keyword sqlFunction contained array_position array_positions array_prepend array_recv array_remove
+syn keyword sqlFunction contained array_replace array_send array_smaller array_to_json
+syn keyword sqlFunction contained array_to_string array_to_tsvector array_typanalyze array_unnest_support
+syn keyword sqlFunction contained array_upper arraycontained arraycontains arraycontjoinsel
+syn keyword sqlFunction contained arraycontsel arrayoverlap ascii asin asind asinh atan atan2 atan2d atand
+syn keyword sqlFunction contained atanh avg bernoulli big5_to_euc_tw big5_to_mic big5_to_utf8
+syn keyword sqlFunction contained binary_upgrade_create_empty_extension
+syn keyword sqlFunction contained binary_upgrade_set_missing_value binary_upgrade_set_next_array_pg_type_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_heap_pg_class_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_index_pg_class_oid binary_upgrade_set_next_pg_authid_oid
 syn keyword sqlFunction contained binary_upgrade_set_next_pg_enum_oid binary_upgrade_set_next_pg_type_oid
 syn keyword sqlFunction contained binary_upgrade_set_next_toast_pg_class_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_toast_pg_type_oid binary_upgrade_set_record_init_privs bit bit_and
-syn keyword sqlFunction contained bit_in bit_length bit_or bit_out bit_recv bit_send bitand bitcat bitcmp
-syn keyword sqlFunction contained biteq bitge bitgt bitle bitlt bitne bitnot bitor bitshiftleft
-syn keyword sqlFunction contained bitshiftright bittypmodin bittypmodout bitxor bool bool_accum
-syn keyword sqlFunction contained bool_accum_inv bool_alltrue bool_and bool_anytrue bool_or
+syn keyword sqlFunction contained binary_upgrade_set_next_toast_pg_type_oid binary_upgrade_set_record_init_privs
+syn keyword sqlFunction contained bit bit_and bit_in bit_length bit_or bit_out bit_recv bit_send bitand
+syn keyword sqlFunction contained bitcat bitcmp biteq bitge bitgt bitle bitlt bitne bitnot bitor
+syn keyword sqlFunction contained bitshiftleft bitshiftright bittypmodin bittypmodout bitxor bool
+syn keyword sqlFunction contained bool_accum bool_accum_inv bool_alltrue bool_and bool_anytrue bool_or
 syn keyword sqlFunction contained booland_statefunc booleq boolge boolgt boolin boolle boollt boolne
-syn keyword sqlFunction contained boolor_statefunc boolout boolrecv boolsend bound_box box box_above box_above_eq
-syn keyword sqlFunction contained box_add box_below box_below_eq box_center box_contain
-syn keyword sqlFunction contained box_contain_pt box_contained box_distance box_div box_eq box_ge box_gt box_in
-syn keyword sqlFunction contained box_intersect box_le box_left box_lt box_mul box_out box_overabove
-syn keyword sqlFunction contained box_overbelow box_overlap box_overleft box_overright box_recv
-syn keyword sqlFunction contained box_right box_same box_send box_sub bpchar bpchar_larger
-syn keyword sqlFunction contained bpchar_pattern_ge bpchar_pattern_gt bpchar_pattern_le bpchar_pattern_lt
-syn keyword sqlFunction contained bpchar_smaller bpchar_sortsupport bpcharcmp bpchareq bpcharge
-syn keyword sqlFunction contained bpchargt bpchariclike bpcharicnlike bpcharicregexeq
-syn keyword sqlFunction contained bpcharicregexne bpcharin bpcharle bpcharlike bpcharlt bpcharne bpcharnlike
-syn keyword sqlFunction contained bpcharout bpcharrecv bpcharregexeq bpcharregexne bpcharsend
-syn keyword sqlFunction contained bpchartypmodin bpchartypmodout brin_desummarize_range
-syn keyword sqlFunction contained brin_inclusion_add_value brin_inclusion_consistent brin_inclusion_opcinfo
-syn keyword sqlFunction contained brin_inclusion_union brin_minmax_add_value brin_minmax_consistent
-syn keyword sqlFunction contained brin_minmax_opcinfo brin_minmax_union
-syn keyword sqlFunction contained brin_summarize_new_values brin_summarize_range brinhandler broadcast btarraycmp
-syn keyword sqlFunction contained btboolcmp btbpchar_pattern_cmp btbpchar_pattern_sortsupport btcharcmp
-syn keyword sqlFunction contained btfloat48cmp btfloat4cmp btfloat4sortsupport btfloat84cmp
-syn keyword sqlFunction contained btfloat8cmp btfloat8sortsupport bthandler btint24cmp btint28cmp
-syn keyword sqlFunction contained btint2cmp btint2sortsupport btint42cmp btint48cmp btint4cmp
-syn keyword sqlFunction contained btint4sortsupport btint82cmp btint84cmp btint8cmp btint8sortsupport
-syn keyword sqlFunction contained btnamecmp btnamesortsupport btnametextcmp btoidcmp btoidsortsupport
-syn keyword sqlFunction contained btoidvectorcmp btrecordcmp btrecordimagecmp btrim
-syn keyword sqlFunction contained bttext_pattern_cmp bttext_pattern_sortsupport bttextcmp bttextnamecmp
-syn keyword sqlFunction contained bttextsortsupport bttidcmp bytea_sortsupport bytea_string_agg_finalfn
-syn keyword sqlFunction contained bytea_string_agg_transfn byteacat byteacmp byteaeq byteage
-syn keyword sqlFunction contained byteagt byteain byteale bytealike bytealt byteane byteanlike byteaout
-syn keyword sqlFunction contained bytearecv byteasend cardinality cash_cmp cash_div_cash
-syn keyword sqlFunction contained cash_div_flt4 cash_div_flt8 cash_div_int2 cash_div_int4 cash_div_int8
-syn keyword sqlFunction contained cash_eq cash_ge cash_gt cash_in cash_le cash_lt cash_mi cash_mul_flt4
-syn keyword sqlFunction contained cash_mul_flt8 cash_mul_int2 cash_mul_int4 cash_mul_int8 cash_ne
-syn keyword sqlFunction contained cash_out cash_pl cash_recv cash_send cash_words cashlarger
-syn keyword sqlFunction contained cashsmaller cbrt ceil ceiling center char char_length character_length
-syn keyword sqlFunction contained chareq charge chargt charin charle charlt charne charout charrecv
-syn keyword sqlFunction contained charsend chr cideq cidin cidout cidr cidr_in cidr_out cidr_recv cidr_send
-syn keyword sqlFunction contained cidrecv cidsend circle circle_above circle_add_pt circle_below
-syn keyword sqlFunction contained circle_center circle_contain circle_contain_pt circle_contained
-syn keyword sqlFunction contained circle_distance circle_div_pt circle_eq circle_ge circle_gt
-syn keyword sqlFunction contained circle_in circle_le circle_left circle_lt circle_mul_pt circle_ne
-syn keyword sqlFunction contained circle_out circle_overabove circle_overbelow circle_overlap
-syn keyword sqlFunction contained circle_overleft circle_overright circle_recv circle_right circle_same
-syn keyword sqlFunction contained circle_send circle_sub_pt clock_timestamp close_lb close_ls
-syn keyword sqlFunction contained close_lseg close_pb close_pl close_ps close_sb close_sl col_description
-syn keyword sqlFunction contained concat concat_ws contjoinsel contsel convert convert_from
-syn keyword sqlFunction contained convert_to corr cos cosd cosh cot cotd count covar_pop covar_samp cstring_in
-syn keyword sqlFunction contained cstring_out cstring_recv cstring_send cume_dist cume_dist_final
-syn keyword sqlFunction contained current_database current_query current_schema current_schemas
-syn keyword sqlFunction contained current_setting current_user currtid currtid2 currval
-syn keyword sqlFunction contained cursor_to_xml cursor_to_xmlschema database_to_xml
-syn keyword sqlFunction contained database_to_xml_and_xmlschema database_to_xmlschema date date_cmp date_cmp_timestamp
-syn keyword sqlFunction contained date_cmp_timestamptz date_eq date_eq_timestamp
-syn keyword sqlFunction contained date_eq_timestamptz date_ge date_ge_timestamp date_ge_timestamptz date_gt
-syn keyword sqlFunction contained date_gt_timestamp date_gt_timestamptz date_in date_larger date_le
-syn keyword sqlFunction contained date_le_timestamp date_le_timestamptz date_lt date_lt_timestamp
-syn keyword sqlFunction contained date_lt_timestamptz date_mi date_mi_interval date_mii date_ne
-syn keyword sqlFunction contained date_ne_timestamp date_ne_timestamptz date_out date_part
-syn keyword sqlFunction contained date_pl_interval date_pli date_recv date_send date_smaller date_sortsupport
-syn keyword sqlFunction contained date_trunc daterange daterange_canonical daterange_subdiff
-syn keyword sqlFunction contained datetime_pl datetimetz_pl dcbrt decode degrees dense_rank
-syn keyword sqlFunction contained dense_rank_final dexp diagonal diameter dispell_init dispell_lexize
-syn keyword sqlFunction contained dist_cpoint dist_cpoly dist_lb dist_pb dist_pc dist_pl dist_polyp dist_ppath
-syn keyword sqlFunction contained dist_ppoly dist_ps dist_sb dist_sl div dlog1 dlog10 domain_in
-syn keyword sqlFunction contained domain_recv dpow dround dsimple_init dsimple_lexize dsnowball_init
-syn keyword sqlFunction contained dsnowball_lexize dsqrt dsynonym_init dsynonym_lexize dtrunc
-syn keyword sqlFunction contained elem_contained_by_range encode enum_cmp enum_eq enum_first enum_ge
-syn keyword sqlFunction contained enum_gt enum_in enum_larger enum_last enum_le enum_lt enum_ne enum_out
-syn keyword sqlFunction contained enum_range enum_recv enum_send enum_smaller eqjoinsel eqsel
-syn keyword sqlFunction contained euc_cn_to_mic euc_cn_to_utf8 euc_jis_2004_to_shift_jis_2004
-syn keyword sqlFunction contained euc_jis_2004_to_utf8 euc_jp_to_mic euc_jp_to_sjis euc_jp_to_utf8
-syn keyword sqlFunction contained euc_kr_to_mic euc_kr_to_utf8 euc_tw_to_big5 euc_tw_to_mic
-syn keyword sqlFunction contained euc_tw_to_utf8 event_trigger_in event_trigger_out every exp factorial family
-syn keyword sqlFunction contained fdw_handler_in fdw_handler_out first_value float4 float48div
-syn keyword sqlFunction contained float48eq float48ge float48gt float48le float48lt float48mi
-syn keyword sqlFunction contained float48mul float48ne float48pl float4_accum float4abs float4div float4eq
-syn keyword sqlFunction contained float4ge float4gt float4in float4larger float4le float4lt float4mi
-syn keyword sqlFunction contained float4mul float4ne float4out float4pl float4recv float4send
-syn keyword sqlFunction contained float4smaller float4um float4up float8 float84div float84eq float84ge
-syn keyword sqlFunction contained float84gt float84le float84lt float84mi float84mul float84ne
-syn keyword sqlFunction contained float84pl float8_accum float8_avg float8_combine float8_corr
-syn keyword sqlFunction contained float8_covar_pop float8_covar_samp float8_regr_accum float8_regr_avgx
-syn keyword sqlFunction contained float8_regr_avgy float8_regr_combine float8_regr_intercept
-syn keyword sqlFunction contained float8_regr_r2 float8_regr_slope float8_regr_sxx float8_regr_sxy
-syn keyword sqlFunction contained float8_regr_syy float8_stddev_pop float8_stddev_samp
-syn keyword sqlFunction contained float8_var_pop float8_var_samp float8abs float8div float8eq float8ge
-syn keyword sqlFunction contained float8gt float8in float8larger float8le float8lt float8mi float8mul
-syn keyword sqlFunction contained float8ne float8out float8pl float8recv float8send float8smaller
-syn keyword sqlFunction contained float8um float8up floor flt4_mul_cash flt8_mul_cash fmgr_c_validator
-syn keyword sqlFunction contained fmgr_internal_validator fmgr_sql_validator format format_type
-syn keyword sqlFunction contained gb18030_to_utf8 gbk_to_utf8 generate_series
+syn keyword sqlFunction contained boolor_statefunc boolout boolrecv boolsend bound_box box box_above
+syn keyword sqlFunction contained box_above_eq box_add box_below box_below_eq box_center box_contain
+syn keyword sqlFunction contained box_contain_pt box_contained box_distance box_div box_eq box_ge
+syn keyword sqlFunction contained box_gt box_in box_intersect box_le box_left box_lt box_mul box_out
+syn keyword sqlFunction contained box_overabove box_overbelow box_overlap box_overleft
+syn keyword sqlFunction contained box_overright box_recv box_right box_same box_send box_sub bpchar
+syn keyword sqlFunction contained bpchar_larger bpchar_pattern_ge bpchar_pattern_gt bpchar_pattern_le
+syn keyword sqlFunction contained bpchar_pattern_lt bpchar_smaller bpchar_sortsupport bpcharcmp
+syn keyword sqlFunction contained bpchareq bpcharge bpchargt bpchariclike bpcharicnlike bpcharicregexeq
+syn keyword sqlFunction contained bpcharicregexne bpcharin bpcharle bpcharlike bpcharlt bpcharne
+syn keyword sqlFunction contained bpcharnlike bpcharout bpcharrecv bpcharregexeq bpcharregexne
+syn keyword sqlFunction contained bpcharsend bpchartypmodin bpchartypmodout brin_desummarize_range
+syn keyword sqlFunction contained brin_inclusion_add_value brin_inclusion_consistent
+syn keyword sqlFunction contained brin_inclusion_opcinfo brin_inclusion_union brin_minmax_add_value
+syn keyword sqlFunction contained brin_minmax_consistent brin_minmax_opcinfo brin_minmax_union
+syn keyword sqlFunction contained brin_summarize_new_values brin_summarize_range brinhandler broadcast
+syn keyword sqlFunction contained btarraycmp btboolcmp btbpchar_pattern_cmp
+syn keyword sqlFunction contained btbpchar_pattern_sortsupport btcharcmp btequalimage btfloat48cmp btfloat4cmp
+syn keyword sqlFunction contained btfloat4sortsupport btfloat84cmp btfloat8cmp btfloat8sortsupport bthandler
+syn keyword sqlFunction contained btint24cmp btint28cmp btint2cmp btint2sortsupport btint42cmp
+syn keyword sqlFunction contained btint48cmp btint4cmp btint4sortsupport btint82cmp btint84cmp
+syn keyword sqlFunction contained btint8cmp btint8sortsupport btnamecmp btnamesortsupport btnametextcmp
+syn keyword sqlFunction contained btoidcmp btoidsortsupport btoidvectorcmp btrecordcmp
+syn keyword sqlFunction contained btrecordimagecmp btrim bttext_pattern_cmp bttext_pattern_sortsupport
+syn keyword sqlFunction contained bttextcmp bttextnamecmp bttextsortsupport bttidcmp btvarstrequalimage
+syn keyword sqlFunction contained bytea_sortsupport bytea_string_agg_finalfn
+syn keyword sqlFunction contained bytea_string_agg_transfn byteacat byteacmp byteaeq byteage byteagt byteain byteale
+syn keyword sqlFunction contained bytealike bytealt byteane byteanlike byteaout bytearecv byteasend
+syn keyword sqlFunction contained cardinality cash_cmp cash_div_cash cash_div_flt4 cash_div_flt8
+syn keyword sqlFunction contained cash_div_int2 cash_div_int4 cash_div_int8 cash_eq cash_ge cash_gt
+syn keyword sqlFunction contained cash_in cash_le cash_lt cash_mi cash_mul_flt4 cash_mul_flt8
+syn keyword sqlFunction contained cash_mul_int2 cash_mul_int4 cash_mul_int8 cash_ne cash_out cash_pl
+syn keyword sqlFunction contained cash_recv cash_send cash_words cashlarger cashsmaller cbrt ceil ceiling
+syn keyword sqlFunction contained center char char_length character_length chareq charge chargt
+syn keyword sqlFunction contained charin charle charlt charne charout charrecv charsend chr cideq cidin
+syn keyword sqlFunction contained cidout cidr cidr_in cidr_out cidr_recv cidr_send cidrecv cidsend
+syn keyword sqlFunction contained circle circle_above circle_add_pt circle_below circle_center
+syn keyword sqlFunction contained circle_contain circle_contain_pt circle_contained circle_distance
+syn keyword sqlFunction contained circle_div_pt circle_eq circle_ge circle_gt circle_in circle_le
+syn keyword sqlFunction contained circle_left circle_lt circle_mul_pt circle_ne circle_out
+syn keyword sqlFunction contained circle_overabove circle_overbelow circle_overlap circle_overleft
+syn keyword sqlFunction contained circle_overright circle_recv circle_right circle_same circle_send
+syn keyword sqlFunction contained circle_sub_pt clock_timestamp close_lb close_ls close_lseg close_pb
+syn keyword sqlFunction contained close_pl close_ps close_sb close_sl col_description concat concat_ws
+syn keyword sqlFunction contained contjoinsel contsel convert convert_from convert_to corr cos cosd cosh
+syn keyword sqlFunction contained cot cotd count covar_pop covar_samp cstring_in cstring_out
+syn keyword sqlFunction contained cstring_recv cstring_send cume_dist cume_dist_final current_database
+syn keyword sqlFunction contained current_query current_schema current_schemas current_setting
+syn keyword sqlFunction contained current_user currtid currtid2 currval cursor_to_xml
+syn keyword sqlFunction contained cursor_to_xmlschema database_to_xml database_to_xml_and_xmlschema
+syn keyword sqlFunction contained database_to_xmlschema date date_cmp date_cmp_timestamp date_cmp_timestamptz
+syn keyword sqlFunction contained date_eq date_eq_timestamp date_eq_timestamptz date_ge
+syn keyword sqlFunction contained date_ge_timestamp date_ge_timestamptz date_gt date_gt_timestamp
+syn keyword sqlFunction contained date_gt_timestamptz date_in date_larger date_le date_le_timestamp
+syn keyword sqlFunction contained date_le_timestamptz date_lt date_lt_timestamp date_lt_timestamptz
+syn keyword sqlFunction contained date_mi date_mi_interval date_mii date_ne date_ne_timestamp
+syn keyword sqlFunction contained date_ne_timestamptz date_out date_part date_pl_interval date_pli
+syn keyword sqlFunction contained date_recv date_send date_smaller date_sortsupport date_trunc daterange
+syn keyword sqlFunction contained daterange_canonical daterange_subdiff datetime_pl
+syn keyword sqlFunction contained datetimetz_pl dcbrt decode degrees dense_rank dense_rank_final dexp diagonal
+syn keyword sqlFunction contained diameter dispell_init dispell_lexize dist_bl dist_bp dist_bs
+syn keyword sqlFunction contained dist_cpoint dist_cpoly dist_lb dist_lp dist_ls dist_pathp dist_pb
+syn keyword sqlFunction contained dist_pc dist_pl dist_polyc dist_polyp dist_ppath dist_ppoly dist_ps
+syn keyword sqlFunction contained dist_sb dist_sl dist_sp div dlog1 dlog10 domain_in domain_recv dpow
+syn keyword sqlFunction contained dround dsimple_init dsimple_lexize dsnowball_init dsnowball_lexize
+syn keyword sqlFunction contained dsqrt dsynonym_init dsynonym_lexize dtrunc
+syn keyword sqlFunction contained elem_contained_by_range encode enum_cmp enum_eq enum_first enum_ge enum_gt enum_in
+syn keyword sqlFunction contained enum_larger enum_last enum_le enum_lt enum_ne enum_out enum_range
+syn keyword sqlFunction contained enum_recv enum_send enum_smaller eqjoinsel eqsel euc_cn_to_mic
+syn keyword sqlFunction contained euc_cn_to_utf8 euc_jis_2004_to_shift_jis_2004 euc_jis_2004_to_utf8
+syn keyword sqlFunction contained euc_jp_to_mic euc_jp_to_sjis euc_jp_to_utf8 euc_kr_to_mic
+syn keyword sqlFunction contained euc_kr_to_utf8 euc_tw_to_big5 euc_tw_to_mic euc_tw_to_utf8
+syn keyword sqlFunction contained event_trigger_in event_trigger_out every exp factorial family fdw_handler_in
+syn keyword sqlFunction contained fdw_handler_out first_value float4 float48div float48eq
+syn keyword sqlFunction contained float48ge float48gt float48le float48lt float48mi float48mul float48ne
+syn keyword sqlFunction contained float48pl float4_accum float4abs float4div float4eq float4ge
+syn keyword sqlFunction contained float4gt float4in float4larger float4le float4lt float4mi float4mul
+syn keyword sqlFunction contained float4ne float4out float4pl float4recv float4send float4smaller
+syn keyword sqlFunction contained float4um float4up float8 float84div float84eq float84ge float84gt
+syn keyword sqlFunction contained float84le float84lt float84mi float84mul float84ne float84pl
+syn keyword sqlFunction contained float8_accum float8_avg float8_combine float8_corr float8_covar_pop
+syn keyword sqlFunction contained float8_covar_samp float8_regr_accum float8_regr_avgx
+syn keyword sqlFunction contained float8_regr_avgy float8_regr_combine float8_regr_intercept float8_regr_r2
+syn keyword sqlFunction contained float8_regr_slope float8_regr_sxx float8_regr_sxy float8_regr_syy
+syn keyword sqlFunction contained float8_stddev_pop float8_stddev_samp float8_var_pop
+syn keyword sqlFunction contained float8_var_samp float8abs float8div float8eq float8ge float8gt float8in
+syn keyword sqlFunction contained float8larger float8le float8lt float8mi float8mul float8ne float8out
+syn keyword sqlFunction contained float8pl float8recv float8send float8smaller float8um float8up
+syn keyword sqlFunction contained floor flt4_mul_cash flt8_mul_cash fmgr_c_validator
+syn keyword sqlFunction contained fmgr_internal_validator fmgr_sql_validator format format_type gb18030_to_utf8
+syn keyword sqlFunction contained gbk_to_utf8 gcd gen_random_uuid generate_series
 syn keyword sqlFunction contained generate_series_int4_support generate_series_int8_support generate_subscripts
 syn keyword sqlFunction contained get_bit get_byte get_current_ts_config getdatabaseencoding
-syn keyword sqlFunction contained getpgusername gin_clean_pending_list gin_cmp_prefix gin_cmp_tslexeme
-syn keyword sqlFunction contained gin_compare_jsonb gin_consistent_jsonb gin_consistent_jsonb_path
-syn keyword sqlFunction contained gin_extract_jsonb gin_extract_jsonb_path
+syn keyword sqlFunction contained getpgusername gin_clean_pending_list gin_cmp_prefix
+syn keyword sqlFunction contained gin_cmp_tslexeme gin_compare_jsonb gin_consistent_jsonb
+syn keyword sqlFunction contained gin_consistent_jsonb_path gin_extract_jsonb gin_extract_jsonb_path
 syn keyword sqlFunction contained gin_extract_jsonb_query gin_extract_jsonb_query_path gin_extract_tsquery
 syn keyword sqlFunction contained gin_extract_tsvector gin_triconsistent_jsonb
 syn keyword sqlFunction contained gin_triconsistent_jsonb_path gin_tsquery_consistent gin_tsquery_triconsistent
 syn keyword sqlFunction contained ginarrayconsistent ginarrayextract ginarraytriconsistent ginhandler
-syn keyword sqlFunction contained ginqueryarrayextract gist_box_consistent gist_box_penalty
-syn keyword sqlFunction contained gist_box_picksplit gist_box_same gist_box_union gist_circle_compress
-syn keyword sqlFunction contained gist_circle_consistent gist_circle_distance gist_point_compress
-syn keyword sqlFunction contained gist_point_consistent gist_point_distance gist_point_fetch
-syn keyword sqlFunction contained gist_poly_compress gist_poly_consistent gist_poly_distance
-syn keyword sqlFunction contained gisthandler gtsquery_compress gtsquery_consistent gtsquery_penalty
-syn keyword sqlFunction contained gtsquery_picksplit gtsquery_same gtsquery_union
-syn keyword sqlFunction contained gtsvector_compress gtsvector_consistent gtsvector_decompress gtsvector_penalty
-syn keyword sqlFunction contained gtsvector_picksplit gtsvector_same gtsvector_union gtsvectorin
-syn keyword sqlFunction contained gtsvectorout has_any_column_privilege has_column_privilege
-syn keyword sqlFunction contained has_database_privilege has_foreign_data_wrapper_privilege
-syn keyword sqlFunction contained has_function_privilege has_language_privilege has_schema_privilege
-syn keyword sqlFunction contained has_sequence_privilege has_server_privilege
-syn keyword sqlFunction contained has_table_privilege has_tablespace_privilege has_type_privilege hash_aclitem
-syn keyword sqlFunction contained hash_aclitem_extended hash_array hash_array_extended hash_numeric
-syn keyword sqlFunction contained hash_numeric_extended hash_range hash_range_extended hashbpchar
-syn keyword sqlFunction contained hashbpcharextended hashchar hashcharextended hashenum
-syn keyword sqlFunction contained hashenumextended hashfloat4 hashfloat4extended hashfloat8
-syn keyword sqlFunction contained hashfloat8extended hashhandler hashinet hashinetextended hashint2
-syn keyword sqlFunction contained hashint2extended hashint4 hashint4extended hashint8 hashint8extended
-syn keyword sqlFunction contained hashmacaddr hashmacaddr8 hashmacaddr8extended hashmacaddrextended
-syn keyword sqlFunction contained hashname hashnameextended hashoid hashoidextended hashoidvector
-syn keyword sqlFunction contained hashoidvectorextended hashtext hashtextextended hashtid
-syn keyword sqlFunction contained hashtidextended hashvarlena hashvarlenaextended heap_tableam_handler
-syn keyword sqlFunction contained height host hostmask iclikejoinsel iclikesel icnlikejoinsel icnlikesel
-syn keyword sqlFunction contained icregexeqjoinsel icregexeqsel icregexnejoinsel icregexnesel
-syn keyword sqlFunction contained in_range index_am_handler_in index_am_handler_out
-syn keyword sqlFunction contained inet_client_addr inet_client_port inet_gist_compress inet_gist_consistent
-syn keyword sqlFunction contained inet_gist_fetch inet_gist_penalty inet_gist_picksplit
-syn keyword sqlFunction contained inet_gist_same inet_gist_union inet_in inet_merge inet_out inet_recv
-syn keyword sqlFunction contained inet_same_family inet_send inet_server_addr inet_server_port
-syn keyword sqlFunction contained inet_spg_choose inet_spg_config inet_spg_inner_consistent
-syn keyword sqlFunction contained inet_spg_leaf_consistent inet_spg_picksplit inetand inetmi inetmi_int8 inetnot
-syn keyword sqlFunction contained inetor inetpl initcap int2 int24div int24eq int24ge int24gt int24le
-syn keyword sqlFunction contained int24lt int24mi int24mul int24ne int24pl int28div int28eq int28ge
-syn keyword sqlFunction contained int28gt int28le int28lt int28mi int28mul int28ne int28pl int2_accum
-syn keyword sqlFunction contained int2_accum_inv int2_avg_accum int2_avg_accum_inv int2_mul_cash
-syn keyword sqlFunction contained int2_sum int2abs int2and int2div int2eq int2ge int2gt int2in
-syn keyword sqlFunction contained int2int4_sum int2larger int2le int2lt int2mi int2mod int2mul int2ne
-syn keyword sqlFunction contained int2not int2or int2out int2pl int2recv int2send int2shl int2shr
-syn keyword sqlFunction contained int2smaller int2um int2up int2vectorin int2vectorout int2vectorrecv
-syn keyword sqlFunction contained int2vectorsend int2xor int4 int42div int42eq int42ge int42gt int42le
-syn keyword sqlFunction contained int42lt int42mi int42mul int42ne int42pl int48div int48eq int48ge
-syn keyword sqlFunction contained int48gt int48le int48lt int48mi int48mul int48ne int48pl int4_accum
-syn keyword sqlFunction contained int4_accum_inv int4_avg_accum int4_avg_accum_inv int4_avg_combine
-syn keyword sqlFunction contained int4_mul_cash int4_sum int4abs int4and int4div int4eq int4ge
-syn keyword sqlFunction contained int4gt int4in int4inc int4larger int4le int4lt int4mi int4mod int4mul
-syn keyword sqlFunction contained int4ne int4not int4or int4out int4pl int4range int4range_canonical
-syn keyword sqlFunction contained int4range_subdiff int4recv int4send int4shl int4shr int4smaller
-syn keyword sqlFunction contained int4um int4up int4xor int8 int82div int82eq int82ge int82gt int82le
-syn keyword sqlFunction contained int82lt int82mi int82mul int82ne int82pl int84div int84eq int84ge
-syn keyword sqlFunction contained int84gt int84le int84lt int84mi int84mul int84ne int84pl int8_accum
-syn keyword sqlFunction contained int8_accum_inv int8_avg int8_avg_accum int8_avg_accum_inv
-syn keyword sqlFunction contained int8_avg_combine int8_avg_deserialize int8_avg_serialize int8_mul_cash
-syn keyword sqlFunction contained int8_sum int8abs int8and int8dec int8dec_any int8div int8eq int8ge
-syn keyword sqlFunction contained int8gt int8in int8inc int8inc_any int8inc_float8_float8
-syn keyword sqlFunction contained int8larger int8le int8lt int8mi int8mod int8mul int8ne int8not int8or
-syn keyword sqlFunction contained int8out int8pl int8pl_inet int8range int8range_canonical
-syn keyword sqlFunction contained int8range_subdiff int8recv int8send int8shl int8shr int8smaller int8um int8up
-syn keyword sqlFunction contained int8xor integer_pl_date inter_lb inter_sb inter_sl internal_in
-syn keyword sqlFunction contained internal_out interval interval_accum interval_accum_inv
-syn keyword sqlFunction contained interval_avg interval_cmp interval_combine interval_div interval_eq
-syn keyword sqlFunction contained interval_ge interval_gt interval_hash interval_hash_extended
-syn keyword sqlFunction contained interval_in interval_larger interval_le interval_lt interval_mi
-syn keyword sqlFunction contained interval_mul interval_ne interval_out interval_pl interval_pl_date
-syn keyword sqlFunction contained interval_pl_time interval_pl_timestamp interval_pl_timestamptz
-syn keyword sqlFunction contained interval_pl_timetz interval_recv interval_send interval_smaller
-syn keyword sqlFunction contained interval_support interval_um intervaltypmodin intervaltypmodout
-syn keyword sqlFunction contained isclosed isempty isfinite ishorizontal iso8859_1_to_utf8
-syn keyword sqlFunction contained iso8859_to_utf8 iso_to_koi8r iso_to_mic iso_to_win1251 iso_to_win866
-syn keyword sqlFunction contained isopen isparallel isperp isvertical johab_to_utf8 json_agg
-syn keyword sqlFunction contained json_agg_finalfn json_agg_transfn json_array_element
-syn keyword sqlFunction contained json_array_element_text json_array_elements json_array_elements_text
-syn keyword sqlFunction contained json_array_length json_build_array json_build_object json_each
-syn keyword sqlFunction contained json_each_text json_extract_path json_extract_path_text json_in json_object
-syn keyword sqlFunction contained json_object_agg json_object_agg_finalfn
-syn keyword sqlFunction contained json_object_agg_transfn json_object_field json_object_field_text json_object_keys
-syn keyword sqlFunction contained json_out json_populate_record json_populate_recordset json_recv
-syn keyword sqlFunction contained json_send json_strip_nulls json_to_record json_to_recordset
-syn keyword sqlFunction contained json_to_tsvector json_typeof jsonb_agg jsonb_agg_finalfn
-syn keyword sqlFunction contained jsonb_agg_transfn jsonb_array_element jsonb_array_element_text
+syn keyword sqlFunction contained ginqueryarrayextract gist_box_consistent gist_box_distance
+syn keyword sqlFunction contained gist_box_penalty gist_box_picksplit gist_box_same gist_box_union
+syn keyword sqlFunction contained gist_circle_compress gist_circle_consistent
+syn keyword sqlFunction contained gist_circle_distance gist_point_compress gist_point_consistent
+syn keyword sqlFunction contained gist_point_distance gist_point_fetch gist_poly_compress gist_poly_consistent
+syn keyword sqlFunction contained gist_poly_distance gisthandler gtsquery_compress
+syn keyword sqlFunction contained gtsquery_consistent gtsquery_penalty gtsquery_picksplit gtsquery_same
+syn keyword sqlFunction contained gtsquery_union gtsvector_compress gtsvector_consistent
+syn keyword sqlFunction contained gtsvector_decompress gtsvector_options gtsvector_penalty gtsvector_picksplit
+syn keyword sqlFunction contained gtsvector_same gtsvector_union gtsvectorin gtsvectorout
+syn keyword sqlFunction contained has_any_column_privilege has_column_privilege has_database_privilege
+syn keyword sqlFunction contained has_foreign_data_wrapper_privilege has_function_privilege
+syn keyword sqlFunction contained has_language_privilege has_schema_privilege has_sequence_privilege
+syn keyword sqlFunction contained has_server_privilege has_table_privilege
+syn keyword sqlFunction contained has_tablespace_privilege has_type_privilege hash_aclitem hash_aclitem_extended
+syn keyword sqlFunction contained hash_array hash_array_extended hash_numeric hash_numeric_extended
+syn keyword sqlFunction contained hash_range hash_range_extended hashbpchar hashbpcharextended
+syn keyword sqlFunction contained hashchar hashcharextended hashenum hashenumextended hashfloat4
+syn keyword sqlFunction contained hashfloat4extended hashfloat8 hashfloat8extended hashhandler
+syn keyword sqlFunction contained hashinet hashinetextended hashint2 hashint2extended hashint4
+syn keyword sqlFunction contained hashint4extended hashint8 hashint8extended hashmacaddr hashmacaddr8
+syn keyword sqlFunction contained hashmacaddr8extended hashmacaddrextended hashname hashnameextended
+syn keyword sqlFunction contained hashoid hashoidextended hashoidvector hashoidvectorextended
+syn keyword sqlFunction contained hashtext hashtextextended hashtid hashtidextended hashvarlena
+syn keyword sqlFunction contained hashvarlenaextended heap_tableam_handler height host hostmask
+syn keyword sqlFunction contained iclikejoinsel iclikesel icnlikejoinsel icnlikesel icregexeqjoinsel
+syn keyword sqlFunction contained icregexeqsel icregexnejoinsel icregexnesel in_range
+syn keyword sqlFunction contained index_am_handler_in index_am_handler_out inet_client_addr inet_client_port
+syn keyword sqlFunction contained inet_gist_compress inet_gist_consistent inet_gist_fetch
+syn keyword sqlFunction contained inet_gist_penalty inet_gist_picksplit inet_gist_same inet_gist_union
+syn keyword sqlFunction contained inet_in inet_merge inet_out inet_recv inet_same_family inet_send
+syn keyword sqlFunction contained inet_server_addr inet_server_port inet_spg_choose inet_spg_config
+syn keyword sqlFunction contained inet_spg_inner_consistent inet_spg_leaf_consistent
+syn keyword sqlFunction contained inet_spg_picksplit inetand inetmi inetmi_int8 inetnot inetor inetpl initcap
+syn keyword sqlFunction contained int2 int24div int24eq int24ge int24gt int24le int24lt int24mi
+syn keyword sqlFunction contained int24mul int24ne int24pl int28div int28eq int28ge int28gt int28le int28lt
+syn keyword sqlFunction contained int28mi int28mul int28ne int28pl int2_accum int2_accum_inv
+syn keyword sqlFunction contained int2_avg_accum int2_avg_accum_inv int2_mul_cash int2_sum int2abs
+syn keyword sqlFunction contained int2and int2div int2eq int2ge int2gt int2in int2int4_sum int2larger
+syn keyword sqlFunction contained int2le int2lt int2mi int2mod int2mul int2ne int2not int2or int2out int2pl
+syn keyword sqlFunction contained int2recv int2send int2shl int2shr int2smaller int2um int2up
+syn keyword sqlFunction contained int2vectorin int2vectorout int2vectorrecv int2vectorsend int2xor int4
+syn keyword sqlFunction contained int42div int42eq int42ge int42gt int42le int42lt int42mi int42mul
+syn keyword sqlFunction contained int42ne int42pl int48div int48eq int48ge int48gt int48le int48lt
+syn keyword sqlFunction contained int48mi int48mul int48ne int48pl int4_accum int4_accum_inv
+syn keyword sqlFunction contained int4_avg_accum int4_avg_accum_inv int4_avg_combine int4_mul_cash int4_sum
+syn keyword sqlFunction contained int4abs int4and int4div int4eq int4ge int4gt int4in int4inc
+syn keyword sqlFunction contained int4larger int4le int4lt int4mi int4mod int4mul int4ne int4not int4or
+syn keyword sqlFunction contained int4out int4pl int4range int4range_canonical int4range_subdiff
+syn keyword sqlFunction contained int4recv int4send int4shl int4shr int4smaller int4um int4up int4xor int8
+syn keyword sqlFunction contained int82div int82eq int82ge int82gt int82le int82lt int82mi int82mul
+syn keyword sqlFunction contained int82ne int82pl int84div int84eq int84ge int84gt int84le int84lt
+syn keyword sqlFunction contained int84mi int84mul int84ne int84pl int8_accum int8_accum_inv int8_avg
+syn keyword sqlFunction contained int8_avg_accum int8_avg_accum_inv int8_avg_combine
+syn keyword sqlFunction contained int8_avg_deserialize int8_avg_serialize int8_mul_cash int8_sum int8abs
+syn keyword sqlFunction contained int8and int8dec int8dec_any int8div int8eq int8ge int8gt int8in int8inc
+syn keyword sqlFunction contained int8inc_any int8inc_float8_float8 int8larger int8le int8lt int8mi
+syn keyword sqlFunction contained int8mod int8mul int8ne int8not int8or int8out int8pl int8pl_inet
+syn keyword sqlFunction contained int8range int8range_canonical int8range_subdiff int8recv int8send
+syn keyword sqlFunction contained int8shl int8shr int8smaller int8um int8up int8xor integer_pl_date
+syn keyword sqlFunction contained inter_lb inter_sb inter_sl internal_in internal_out interval
+syn keyword sqlFunction contained interval_accum interval_accum_inv interval_avg interval_cmp
+syn keyword sqlFunction contained interval_combine interval_div interval_eq interval_ge interval_gt
+syn keyword sqlFunction contained interval_hash interval_hash_extended interval_in interval_larger
+syn keyword sqlFunction contained interval_le interval_lt interval_mi interval_mul interval_ne
+syn keyword sqlFunction contained interval_out interval_pl interval_pl_date interval_pl_time
+syn keyword sqlFunction contained interval_pl_timestamp interval_pl_timestamptz interval_pl_timetz
+syn keyword sqlFunction contained interval_recv interval_send interval_smaller interval_support
+syn keyword sqlFunction contained interval_um intervaltypmodin intervaltypmodout is_normalized isclosed
+syn keyword sqlFunction contained isempty isfinite ishorizontal iso8859_1_to_utf8 iso8859_to_utf8
+syn keyword sqlFunction contained iso_to_koi8r iso_to_mic iso_to_win1251 iso_to_win866 isopen
+syn keyword sqlFunction contained isparallel isperp isvertical johab_to_utf8 json_agg json_agg_finalfn
+syn keyword sqlFunction contained json_agg_transfn json_array_element json_array_element_text
+syn keyword sqlFunction contained json_array_elements json_array_elements_text json_array_length
+syn keyword sqlFunction contained json_build_array json_build_object json_each json_each_text
+syn keyword sqlFunction contained json_extract_path json_extract_path_text json_in json_object
+syn keyword sqlFunction contained json_object_agg json_object_agg_finalfn json_object_agg_transfn
+syn keyword sqlFunction contained json_object_field json_object_field_text json_object_keys json_out
+syn keyword sqlFunction contained json_populate_record json_populate_recordset json_recv json_send
+syn keyword sqlFunction contained json_strip_nulls json_to_record json_to_recordset
+syn keyword sqlFunction contained json_to_tsvector json_typeof jsonb_agg jsonb_agg_finalfn jsonb_agg_transfn
+syn keyword sqlFunction contained jsonb_array_element jsonb_array_element_text
 syn keyword sqlFunction contained jsonb_array_elements jsonb_array_elements_text jsonb_array_length
-syn keyword sqlFunction contained jsonb_build_array jsonb_build_object jsonb_cmp jsonb_concat
-syn keyword sqlFunction contained jsonb_contained jsonb_contains jsonb_delete jsonb_delete_path jsonb_each
-syn keyword sqlFunction contained jsonb_each_text jsonb_eq jsonb_exists jsonb_exists_all
-syn keyword sqlFunction contained jsonb_exists_any jsonb_extract_path jsonb_extract_path_text jsonb_ge
-syn keyword sqlFunction contained jsonb_gt jsonb_hash jsonb_hash_extended jsonb_in jsonb_insert
-syn keyword sqlFunction contained jsonb_le jsonb_lt jsonb_ne jsonb_object jsonb_object_agg
+syn keyword sqlFunction contained jsonb_build_array jsonb_build_object jsonb_cmp jsonb_concat jsonb_contained
+syn keyword sqlFunction contained jsonb_contains jsonb_delete jsonb_delete_path jsonb_each
+syn keyword sqlFunction contained jsonb_each_text jsonb_eq jsonb_exists jsonb_exists_all jsonb_exists_any
+syn keyword sqlFunction contained jsonb_extract_path jsonb_extract_path_text jsonb_ge jsonb_gt
+syn keyword sqlFunction contained jsonb_hash jsonb_hash_extended jsonb_in jsonb_insert jsonb_le
+syn keyword sqlFunction contained jsonb_lt jsonb_ne jsonb_object jsonb_object_agg
 syn keyword sqlFunction contained jsonb_object_agg_finalfn jsonb_object_agg_transfn jsonb_object_field
-syn keyword sqlFunction contained jsonb_object_field_text jsonb_object_keys jsonb_out
-syn keyword sqlFunction contained jsonb_path_exists jsonb_path_exists_opr jsonb_path_match
-syn keyword sqlFunction contained jsonb_path_match_opr jsonb_path_query jsonb_path_query_array
-syn keyword sqlFunction contained jsonb_path_query_first jsonb_populate_record jsonb_populate_recordset jsonb_pretty
-syn keyword sqlFunction contained jsonb_recv jsonb_send jsonb_set jsonb_strip_nulls
-syn keyword sqlFunction contained jsonb_to_record jsonb_to_recordset jsonb_to_tsvector jsonb_typeof
-syn keyword sqlFunction contained jsonpath_in jsonpath_out jsonpath_recv jsonpath_send justify_days
-syn keyword sqlFunction contained justify_hours justify_interval koi8r_to_iso koi8r_to_mic koi8r_to_utf8
+syn keyword sqlFunction contained jsonb_object_field_text jsonb_object_keys jsonb_out jsonb_path_exists
+syn keyword sqlFunction contained jsonb_path_exists_opr jsonb_path_exists_tz jsonb_path_match
+syn keyword sqlFunction contained jsonb_path_match_opr jsonb_path_match_tz jsonb_path_query
+syn keyword sqlFunction contained jsonb_path_query_array jsonb_path_query_array_tz jsonb_path_query_first
+syn keyword sqlFunction contained jsonb_path_query_first_tz jsonb_path_query_tz
+syn keyword sqlFunction contained jsonb_populate_record jsonb_populate_recordset jsonb_pretty jsonb_recv
+syn keyword sqlFunction contained jsonb_send jsonb_set jsonb_set_lax jsonb_strip_nulls jsonb_to_record
+syn keyword sqlFunction contained jsonb_to_recordset jsonb_to_tsvector jsonb_typeof jsonpath_in
+syn keyword sqlFunction contained jsonpath_out jsonpath_recv jsonpath_send justify_days justify_hours
+syn keyword sqlFunction contained justify_interval koi8r_to_iso koi8r_to_mic koi8r_to_utf8
 syn keyword sqlFunction contained koi8r_to_win1251 koi8r_to_win866 koi8u_to_utf8 lag
 syn keyword sqlFunction contained language_handler_in language_handler_out last_value lastval latin1_to_mic
-syn keyword sqlFunction contained latin2_to_mic latin2_to_win1250 latin3_to_mic latin4_to_mic lead
-syn keyword sqlFunction contained left length like like_escape likejoinsel likesel line line_distance
+syn keyword sqlFunction contained latin2_to_mic latin2_to_win1250 latin3_to_mic latin4_to_mic lcm lead left
+syn keyword sqlFunction contained length like like_escape likejoinsel likesel line line_distance
 syn keyword sqlFunction contained line_eq line_horizontal line_in line_interpt line_intersect
 syn keyword sqlFunction contained line_out line_parallel line_perp line_recv line_send line_vertical ln
-syn keyword sqlFunction contained lo_close lo_creat lo_create lo_export lo_from_bytea lo_get
-syn keyword sqlFunction contained lo_import lo_lseek lo_lseek64 lo_open lo_put lo_tell lo_tell64
-syn keyword sqlFunction contained lo_truncate lo_truncate64 lo_unlink log log10 loread lower lower_inc
-syn keyword sqlFunction contained lower_inf lowrite lpad lseg lseg_center lseg_distance lseg_eq lseg_ge
-syn keyword sqlFunction contained lseg_gt lseg_horizontal lseg_in lseg_interpt lseg_intersect lseg_le
+syn keyword sqlFunction contained lo_close lo_creat lo_create lo_export lo_from_bytea lo_get lo_import
+syn keyword sqlFunction contained lo_lseek lo_lseek64 lo_open lo_put lo_tell lo_tell64 lo_truncate
+syn keyword sqlFunction contained lo_truncate64 lo_unlink log log10 loread lower lower_inc lower_inf
+syn keyword sqlFunction contained lowrite lpad lseg lseg_center lseg_distance lseg_eq lseg_ge lseg_gt
+syn keyword sqlFunction contained lseg_horizontal lseg_in lseg_interpt lseg_intersect lseg_le
 syn keyword sqlFunction contained lseg_length lseg_lt lseg_ne lseg_out lseg_parallel lseg_perp
 syn keyword sqlFunction contained lseg_recv lseg_send lseg_vertical ltrim macaddr macaddr8 macaddr8_and
 syn keyword sqlFunction contained macaddr8_cmp macaddr8_eq macaddr8_ge macaddr8_gt macaddr8_in
@@ -379,282 +387,290 @@ syn keyword sqlFunction contained macaddr8_out macaddr8_recv macaddr8_send macad
 syn keyword sqlFunction contained macaddr_cmp macaddr_eq macaddr_ge macaddr_gt macaddr_in macaddr_le
 syn keyword sqlFunction contained macaddr_lt macaddr_ne macaddr_not macaddr_or macaddr_out
 syn keyword sqlFunction contained macaddr_recv macaddr_send macaddr_sortsupport make_date make_interval
-syn keyword sqlFunction contained make_time make_timestamp make_timestamptz makeaclitem masklen max
-syn keyword sqlFunction contained md5 mic_to_ascii mic_to_big5 mic_to_euc_cn mic_to_euc_jp
-syn keyword sqlFunction contained mic_to_euc_kr mic_to_euc_tw mic_to_iso mic_to_koi8r mic_to_latin1
-syn keyword sqlFunction contained mic_to_latin2 mic_to_latin3 mic_to_latin4 mic_to_sjis mic_to_win1250
-syn keyword sqlFunction contained mic_to_win1251 mic_to_win866 min mod mode mode_final money
-syn keyword sqlFunction contained mul_d_interval mxid_age name nameconcatoid nameeq nameeqtext namege
-syn keyword sqlFunction contained namegetext namegt namegttext nameiclike nameicnlike nameicregexeq
-syn keyword sqlFunction contained nameicregexne namein namele nameletext namelike namelt namelttext
-syn keyword sqlFunction contained namene namenetext namenlike nameout namerecv nameregexeq nameregexne
-syn keyword sqlFunction contained namesend neqjoinsel neqsel netmask network network_cmp network_eq
-syn keyword sqlFunction contained network_ge network_gt network_larger network_le network_lt
-syn keyword sqlFunction contained network_ne network_overlap network_smaller network_sub network_subeq
-syn keyword sqlFunction contained network_subset_support network_sup network_supeq networkjoinsel
-syn keyword sqlFunction contained networksel nextval nlikejoinsel nlikesel notlike now npoints
-syn keyword sqlFunction contained nth_value ntile num_nonnulls num_nulls numeric numeric_abs
-syn keyword sqlFunction contained numeric_accum numeric_accum_inv numeric_add numeric_avg numeric_avg_accum
-syn keyword sqlFunction contained numeric_avg_combine numeric_avg_deserialize
-syn keyword sqlFunction contained numeric_avg_serialize numeric_cmp numeric_combine numeric_deserialize numeric_div
-syn keyword sqlFunction contained numeric_div_trunc numeric_eq numeric_exp numeric_fac numeric_ge
-syn keyword sqlFunction contained numeric_gt numeric_in numeric_inc numeric_larger numeric_le
-syn keyword sqlFunction contained numeric_ln numeric_log numeric_lt numeric_mod numeric_mul numeric_ne
+syn keyword sqlFunction contained make_time make_timestamp make_timestamptz makeaclitem masklen
+syn keyword sqlFunction contained matchingjoinsel matchingsel max md5 mic_to_big5 mic_to_euc_cn
+syn keyword sqlFunction contained mic_to_euc_jp mic_to_euc_kr mic_to_euc_tw mic_to_iso mic_to_koi8r
+syn keyword sqlFunction contained mic_to_latin1 mic_to_latin2 mic_to_latin3 mic_to_latin4 mic_to_sjis
+syn keyword sqlFunction contained mic_to_win1250 mic_to_win1251 mic_to_win866 min min_scale mod mode
+syn keyword sqlFunction contained mode_final money mul_d_interval mxid_age name nameconcatoid nameeq
+syn keyword sqlFunction contained nameeqtext namege namegetext namegt namegttext nameiclike
+syn keyword sqlFunction contained nameicnlike nameicregexeq nameicregexne namein namele nameletext
+syn keyword sqlFunction contained namelike namelt namelttext namene namenetext namenlike nameout namerecv
+syn keyword sqlFunction contained nameregexeq nameregexne namesend neqjoinsel neqsel netmask network
+syn keyword sqlFunction contained network_cmp network_eq network_ge network_gt network_larger
+syn keyword sqlFunction contained network_le network_lt network_ne network_overlap network_smaller
+syn keyword sqlFunction contained network_sortsupport network_sub network_subeq
+syn keyword sqlFunction contained network_subset_support network_sup network_supeq networkjoinsel networksel nextval
+syn keyword sqlFunction contained nlikejoinsel nlikesel normalize notlike now npoints nth_value ntile
+syn keyword sqlFunction contained num_nonnulls num_nulls numeric numeric_abs numeric_accum
+syn keyword sqlFunction contained numeric_accum_inv numeric_add numeric_avg numeric_avg_accum
+syn keyword sqlFunction contained numeric_avg_combine numeric_avg_deserialize numeric_avg_serialize
+syn keyword sqlFunction contained numeric_cmp numeric_combine numeric_deserialize numeric_div
+syn keyword sqlFunction contained numeric_div_trunc numeric_eq numeric_exp numeric_fac numeric_ge numeric_gt
+syn keyword sqlFunction contained numeric_in numeric_inc numeric_larger numeric_le numeric_ln
+syn keyword sqlFunction contained numeric_log numeric_lt numeric_mod numeric_mul numeric_ne
 syn keyword sqlFunction contained numeric_out numeric_poly_avg numeric_poly_combine
 syn keyword sqlFunction contained numeric_poly_deserialize numeric_poly_serialize numeric_poly_stddev_pop
 syn keyword sqlFunction contained numeric_poly_stddev_samp numeric_poly_sum numeric_poly_var_pop
 syn keyword sqlFunction contained numeric_poly_var_samp numeric_power numeric_recv numeric_send
-syn keyword sqlFunction contained numeric_serialize numeric_smaller numeric_sortsupport
-syn keyword sqlFunction contained numeric_sqrt numeric_stddev_pop numeric_stddev_samp numeric_sub
-syn keyword sqlFunction contained numeric_sum numeric_support numeric_uminus numeric_uplus numeric_var_pop
-syn keyword sqlFunction contained numeric_var_samp numerictypmodin numerictypmodout numnode
-syn keyword sqlFunction contained numrange numrange_subdiff obj_description octet_length oid oideq oidge
-syn keyword sqlFunction contained oidgt oidin oidlarger oidle oidlt oidne oidout oidrecv oidsend
-syn keyword sqlFunction contained oidsmaller oidvectoreq oidvectorge oidvectorgt oidvectorin
-syn keyword sqlFunction contained oidvectorle oidvectorlt oidvectorne oidvectorout oidvectorrecv
-syn keyword sqlFunction contained oidvectorsend oidvectortypes on_pb on_pl on_ppath on_ps on_sb on_sl opaque_in
-syn keyword sqlFunction contained opaque_out ordered_set_transition ordered_set_transition_multi
-syn keyword sqlFunction contained overlaps overlay parse_ident path path_add path_add_pt
-syn keyword sqlFunction contained path_center path_contain_pt path_distance path_div_pt path_in path_inter
-syn keyword sqlFunction contained path_length path_mul_pt path_n_eq path_n_ge path_n_gt path_n_le
-syn keyword sqlFunction contained path_n_lt path_npoints path_out path_recv path_send path_sub_pt
-syn keyword sqlFunction contained pclose percent_rank percent_rank_final percentile_cont
-syn keyword sqlFunction contained percentile_cont_float8_final percentile_cont_float8_multi_final
-syn keyword sqlFunction contained percentile_cont_interval_final percentile_cont_interval_multi_final
-syn keyword sqlFunction contained percentile_disc percentile_disc_final
-syn keyword sqlFunction contained percentile_disc_multi_final pg_advisory_lock pg_advisory_lock_shared pg_advisory_unlock
-syn keyword sqlFunction contained pg_advisory_unlock_all pg_advisory_unlock_shared
-syn keyword sqlFunction contained pg_advisory_xact_lock pg_advisory_xact_lock_shared
-syn keyword sqlFunction contained pg_available_extension_versions pg_available_extensions pg_backend_pid
-syn keyword sqlFunction contained pg_backup_start_time pg_blocking_pids pg_cancel_backend pg_char_to_encoding
-syn keyword sqlFunction contained pg_client_encoding pg_collation_actual_version
-syn keyword sqlFunction contained pg_collation_for pg_collation_is_visible pg_column_is_updatable
-syn keyword sqlFunction contained pg_column_size pg_conf_load_time pg_config pg_control_checkpoint
-syn keyword sqlFunction contained pg_control_init pg_control_recovery pg_control_system
-syn keyword sqlFunction contained pg_conversion_is_visible pg_copy_logical_replication_slot
-syn keyword sqlFunction contained pg_copy_physical_replication_slot pg_create_logical_replication_slot
-syn keyword sqlFunction contained pg_create_physical_replication_slot pg_create_restore_point
-syn keyword sqlFunction contained pg_current_logfile pg_current_wal_flush_lsn pg_current_wal_insert_lsn
-syn keyword sqlFunction contained pg_current_wal_lsn pg_cursor pg_database_size pg_ddl_command_in
-syn keyword sqlFunction contained pg_ddl_command_out pg_ddl_command_recv pg_ddl_command_send
-syn keyword sqlFunction contained pg_dependencies_in pg_dependencies_out pg_dependencies_recv
-syn keyword sqlFunction contained pg_dependencies_send pg_describe_object pg_drop_replication_slot
-syn keyword sqlFunction contained pg_encoding_max_length pg_encoding_to_char
-syn keyword sqlFunction contained pg_event_trigger_ddl_commands pg_event_trigger_dropped_objects
-syn keyword sqlFunction contained pg_event_trigger_table_rewrite_oid pg_event_trigger_table_rewrite_reason
-syn keyword sqlFunction contained pg_export_snapshot pg_extension_config_dump pg_extension_update_paths
-syn keyword sqlFunction contained pg_file_rename pg_file_unlink pg_file_write pg_filenode_relation
+syn keyword sqlFunction contained numeric_serialize numeric_smaller numeric_sortsupport numeric_sqrt
+syn keyword sqlFunction contained numeric_stddev_pop numeric_stddev_samp numeric_sub numeric_sum
+syn keyword sqlFunction contained numeric_support numeric_uminus numeric_uplus numeric_var_pop
+syn keyword sqlFunction contained numeric_var_samp numerictypmodin numerictypmodout numnode numrange
+syn keyword sqlFunction contained numrange_subdiff obj_description octet_length oid oideq oidge oidgt oidin
+syn keyword sqlFunction contained oidlarger oidle oidlt oidne oidout oidrecv oidsend oidsmaller
+syn keyword sqlFunction contained oidvectoreq oidvectorge oidvectorgt oidvectorin oidvectorle
+syn keyword sqlFunction contained oidvectorlt oidvectorne oidvectorout oidvectorrecv oidvectorsend
+syn keyword sqlFunction contained oidvectortypes on_pb on_pl on_ppath on_ps on_sb on_sl
+syn keyword sqlFunction contained ordered_set_transition ordered_set_transition_multi overlaps overlay parse_ident
+syn keyword sqlFunction contained path path_add path_add_pt path_center path_contain_pt path_distance
+syn keyword sqlFunction contained path_div_pt path_in path_inter path_length path_mul_pt path_n_eq
+syn keyword sqlFunction contained path_n_ge path_n_gt path_n_le path_n_lt path_npoints path_out
+syn keyword sqlFunction contained path_recv path_send path_sub_pt pclose percent_rank
+syn keyword sqlFunction contained percent_rank_final percentile_cont percentile_cont_float8_final
+syn keyword sqlFunction contained percentile_cont_float8_multi_final percentile_cont_interval_final
+syn keyword sqlFunction contained percentile_cont_interval_multi_final percentile_disc
+syn keyword sqlFunction contained percentile_disc_final percentile_disc_multi_final pg_advisory_lock
+syn keyword sqlFunction contained pg_advisory_lock_shared pg_advisory_unlock pg_advisory_unlock_all
+syn keyword sqlFunction contained pg_advisory_unlock_shared pg_advisory_xact_lock
+syn keyword sqlFunction contained pg_advisory_xact_lock_shared pg_available_extension_versions
+syn keyword sqlFunction contained pg_available_extensions pg_backend_pid pg_backup_start_time pg_blocking_pids
+syn keyword sqlFunction contained pg_cancel_backend pg_char_to_encoding pg_client_encoding
+syn keyword sqlFunction contained pg_collation_actual_version pg_collation_for pg_collation_is_visible
+syn keyword sqlFunction contained pg_column_is_updatable pg_column_size pg_conf_load_time pg_config
+syn keyword sqlFunction contained pg_control_checkpoint pg_control_init pg_control_recovery
+syn keyword sqlFunction contained pg_control_system pg_conversion_is_visible
+syn keyword sqlFunction contained pg_copy_logical_replication_slot pg_copy_physical_replication_slot
+syn keyword sqlFunction contained pg_create_logical_replication_slot pg_create_physical_replication_slot
+syn keyword sqlFunction contained pg_create_restore_point pg_current_logfile pg_current_snapshot
+syn keyword sqlFunction contained pg_current_wal_flush_lsn pg_current_wal_insert_lsn
+syn keyword sqlFunction contained pg_current_wal_lsn pg_current_xact_id pg_current_xact_id_if_assigned pg_cursor
+syn keyword sqlFunction contained pg_database_size pg_ddl_command_in pg_ddl_command_out
+syn keyword sqlFunction contained pg_ddl_command_recv pg_ddl_command_send pg_dependencies_in
+syn keyword sqlFunction contained pg_dependencies_out pg_dependencies_recv pg_dependencies_send
+syn keyword sqlFunction contained pg_describe_object pg_drop_replication_slot pg_encoding_max_length
+syn keyword sqlFunction contained pg_encoding_to_char pg_event_trigger_ddl_commands
+syn keyword sqlFunction contained pg_event_trigger_dropped_objects pg_event_trigger_table_rewrite_oid
+syn keyword sqlFunction contained pg_event_trigger_table_rewrite_reason pg_export_snapshot
+syn keyword sqlFunction contained pg_extension_config_dump pg_extension_update_paths pg_file_rename
+syn keyword sqlFunction contained pg_file_sync pg_file_unlink pg_file_write pg_filenode_relation
 syn keyword sqlFunction contained pg_function_is_visible pg_get_constraintdef pg_get_expr
 syn keyword sqlFunction contained pg_get_function_arg_default pg_get_function_arguments
-syn keyword sqlFunction contained pg_get_function_identity_arguments pg_get_function_result
-syn keyword sqlFunction contained pg_get_functiondef pg_get_indexdef pg_get_keywords pg_get_multixact_members
-syn keyword sqlFunction contained pg_get_object_address pg_get_partition_constraintdef
-syn keyword sqlFunction contained pg_get_partkeydef pg_get_publication_tables pg_get_replica_identity_index
-syn keyword sqlFunction contained pg_get_replication_slots pg_get_ruledef
-syn keyword sqlFunction contained pg_get_serial_sequence pg_get_statisticsobjdef pg_get_triggerdef pg_get_userbyid
-syn keyword sqlFunction contained pg_get_viewdef pg_has_role pg_hba_file_rules pg_identify_object
-syn keyword sqlFunction contained pg_identify_object_as_address pg_import_system_collations
-syn keyword sqlFunction contained pg_index_column_has_property pg_index_has_property
-syn keyword sqlFunction contained pg_indexam_has_property pg_indexam_progress_phasename pg_indexes_size
-syn keyword sqlFunction contained pg_is_in_backup pg_is_in_recovery pg_is_other_temp_schema
-syn keyword sqlFunction contained pg_is_wal_replay_paused pg_isolation_test_session_is_blocked
-syn keyword sqlFunction contained pg_jit_available pg_last_committed_xact pg_last_wal_receive_lsn
-syn keyword sqlFunction contained pg_last_wal_replay_lsn pg_last_xact_replay_timestamp
-syn keyword sqlFunction contained pg_listening_channels pg_lock_status pg_logdir_ls pg_logical_emit_message
-syn keyword sqlFunction contained pg_logical_slot_get_binary_changes pg_logical_slot_get_changes
-syn keyword sqlFunction contained pg_logical_slot_peek_binary_changes pg_logical_slot_peek_changes
-syn keyword sqlFunction contained pg_ls_archive_statusdir pg_ls_dir pg_ls_logdir pg_ls_tmpdir
-syn keyword sqlFunction contained pg_ls_waldir pg_lsn_cmp pg_lsn_eq pg_lsn_ge pg_lsn_gt pg_lsn_hash
-syn keyword sqlFunction contained pg_lsn_hash_extended pg_lsn_in pg_lsn_le pg_lsn_lt pg_lsn_mi
-syn keyword sqlFunction contained pg_lsn_ne pg_lsn_out pg_lsn_recv pg_lsn_send pg_mcv_list_in
-syn keyword sqlFunction contained pg_mcv_list_items pg_mcv_list_out pg_mcv_list_recv pg_mcv_list_send
-syn keyword sqlFunction contained pg_my_temp_schema pg_ndistinct_in pg_ndistinct_out
-syn keyword sqlFunction contained pg_ndistinct_recv pg_ndistinct_send pg_nextoid pg_node_tree_in
-syn keyword sqlFunction contained pg_node_tree_out pg_node_tree_recv pg_node_tree_send
-syn keyword sqlFunction contained pg_notification_queue_usage pg_notify pg_opclass_is_visible pg_operator_is_visible
-syn keyword sqlFunction contained pg_opfamily_is_visible pg_options_to_table pg_partition_ancestors
-syn keyword sqlFunction contained pg_partition_root pg_partition_tree pg_postmaster_start_time
-syn keyword sqlFunction contained pg_prepared_statement pg_prepared_xact pg_promote
-syn keyword sqlFunction contained pg_read_binary_file pg_read_file pg_read_file_old pg_relation_filenode
-syn keyword sqlFunction contained pg_relation_filepath pg_relation_is_publishable
-syn keyword sqlFunction contained pg_relation_is_updatable pg_relation_size pg_reload_conf
-syn keyword sqlFunction contained pg_replication_origin_advance pg_replication_origin_create
-syn keyword sqlFunction contained pg_replication_origin_drop pg_replication_origin_oid pg_replication_origin_progress
-syn keyword sqlFunction contained pg_replication_origin_session_is_setup
-syn keyword sqlFunction contained pg_replication_origin_session_progress pg_replication_origin_session_reset
+syn keyword sqlFunction contained pg_get_function_identity_arguments pg_get_function_result pg_get_functiondef
+syn keyword sqlFunction contained pg_get_indexdef pg_get_keywords pg_get_multixact_members
+syn keyword sqlFunction contained pg_get_object_address pg_get_partition_constraintdef pg_get_partkeydef
+syn keyword sqlFunction contained pg_get_publication_tables pg_get_replica_identity_index
+syn keyword sqlFunction contained pg_get_replication_slots pg_get_ruledef pg_get_serial_sequence
+syn keyword sqlFunction contained pg_get_shmem_allocations pg_get_statisticsobjdef pg_get_triggerdef
+syn keyword sqlFunction contained pg_get_userbyid pg_get_viewdef pg_has_role pg_hba_file_rules
+syn keyword sqlFunction contained pg_identify_object pg_identify_object_as_address
+syn keyword sqlFunction contained pg_import_system_collations pg_index_column_has_property pg_index_has_property
+syn keyword sqlFunction contained pg_indexam_has_property pg_indexam_progress_phasename
+syn keyword sqlFunction contained pg_indexes_size pg_is_in_backup pg_is_in_recovery
+syn keyword sqlFunction contained pg_is_other_temp_schema pg_is_wal_replay_paused
+syn keyword sqlFunction contained pg_isolation_test_session_is_blocked pg_jit_available pg_last_committed_xact
+syn keyword sqlFunction contained pg_last_wal_receive_lsn pg_last_wal_replay_lsn pg_last_xact_replay_timestamp
+syn keyword sqlFunction contained pg_listening_channels pg_lock_status pg_logdir_ls
+syn keyword sqlFunction contained pg_logical_emit_message pg_logical_slot_get_binary_changes
+syn keyword sqlFunction contained pg_logical_slot_get_changes pg_logical_slot_peek_binary_changes
+syn keyword sqlFunction contained pg_logical_slot_peek_changes pg_ls_archive_statusdir pg_ls_dir pg_ls_logdir
+syn keyword sqlFunction contained pg_ls_tmpdir pg_ls_waldir pg_lsn_cmp pg_lsn_eq pg_lsn_ge
+syn keyword sqlFunction contained pg_lsn_gt pg_lsn_hash pg_lsn_hash_extended pg_lsn_in pg_lsn_larger
+syn keyword sqlFunction contained pg_lsn_le pg_lsn_lt pg_lsn_mi pg_lsn_ne pg_lsn_out pg_lsn_recv
+syn keyword sqlFunction contained pg_lsn_send pg_lsn_smaller pg_mcv_list_in pg_mcv_list_items
+syn keyword sqlFunction contained pg_mcv_list_out pg_mcv_list_recv pg_mcv_list_send pg_my_temp_schema
+syn keyword sqlFunction contained pg_ndistinct_in pg_ndistinct_out pg_ndistinct_recv
+syn keyword sqlFunction contained pg_ndistinct_send pg_nextoid pg_node_tree_in pg_node_tree_out
+syn keyword sqlFunction contained pg_node_tree_recv pg_node_tree_send pg_notification_queue_usage pg_notify
+syn keyword sqlFunction contained pg_opclass_is_visible pg_operator_is_visible
+syn keyword sqlFunction contained pg_opfamily_is_visible pg_options_to_table pg_partition_ancestors pg_partition_root
+syn keyword sqlFunction contained pg_partition_tree pg_postmaster_start_time
+syn keyword sqlFunction contained pg_prepared_statement pg_prepared_xact pg_promote pg_read_binary_file
+syn keyword sqlFunction contained pg_read_file pg_read_file_old pg_relation_filenode pg_relation_filepath
+syn keyword sqlFunction contained pg_relation_is_publishable pg_relation_is_updatable
+syn keyword sqlFunction contained pg_relation_size pg_reload_conf pg_replication_origin_advance
+syn keyword sqlFunction contained pg_replication_origin_create pg_replication_origin_drop
+syn keyword sqlFunction contained pg_replication_origin_oid pg_replication_origin_progress
+syn keyword sqlFunction contained pg_replication_origin_session_is_setup pg_replication_origin_session_progress
+syn keyword sqlFunction contained pg_replication_origin_session_reset
 syn keyword sqlFunction contained pg_replication_origin_session_setup pg_replication_origin_xact_reset
-syn keyword sqlFunction contained pg_replication_origin_xact_setup pg_replication_slot_advance
-syn keyword sqlFunction contained pg_rotate_logfile pg_rotate_logfile_old
-syn keyword sqlFunction contained pg_safe_snapshot_blocking_pids pg_sequence_last_value pg_sequence_parameters
-syn keyword sqlFunction contained pg_show_all_file_settings pg_show_all_settings
-syn keyword sqlFunction contained pg_show_replication_origin_status pg_size_bytes pg_size_pretty pg_sleep pg_sleep_for
-syn keyword sqlFunction contained pg_sleep_until pg_start_backup pg_stat_clear_snapshot
-syn keyword sqlFunction contained pg_stat_file pg_stat_get_activity pg_stat_get_analyze_count
-syn keyword sqlFunction contained pg_stat_get_archiver pg_stat_get_autoanalyze_count
-syn keyword sqlFunction contained pg_stat_get_autovacuum_count pg_stat_get_backend_activity
-syn keyword sqlFunction contained pg_stat_get_backend_activity_start pg_stat_get_backend_client_addr
-syn keyword sqlFunction contained pg_stat_get_backend_client_port pg_stat_get_backend_dbid
-syn keyword sqlFunction contained pg_stat_get_backend_idset pg_stat_get_backend_pid pg_stat_get_backend_start
-syn keyword sqlFunction contained pg_stat_get_backend_userid pg_stat_get_backend_wait_event
-syn keyword sqlFunction contained pg_stat_get_backend_wait_event_type pg_stat_get_backend_xact_start
-syn keyword sqlFunction contained pg_stat_get_bgwriter_buf_written_checkpoints
-syn keyword sqlFunction contained pg_stat_get_bgwriter_buf_written_clean pg_stat_get_bgwriter_maxwritten_clean
-syn keyword sqlFunction contained pg_stat_get_bgwriter_requested_checkpoints
-syn keyword sqlFunction contained pg_stat_get_bgwriter_stat_reset_time pg_stat_get_bgwriter_timed_checkpoints
-syn keyword sqlFunction contained pg_stat_get_blocks_fetched pg_stat_get_blocks_hit
-syn keyword sqlFunction contained pg_stat_get_buf_alloc pg_stat_get_buf_fsync_backend
-syn keyword sqlFunction contained pg_stat_get_buf_written_backend pg_stat_get_checkpoint_sync_time
-syn keyword sqlFunction contained pg_stat_get_checkpoint_write_time pg_stat_get_db_blk_read_time
-syn keyword sqlFunction contained pg_stat_get_db_blk_write_time pg_stat_get_db_blocks_fetched
-syn keyword sqlFunction contained pg_stat_get_db_blocks_hit pg_stat_get_db_checksum_failures
-syn keyword sqlFunction contained pg_stat_get_db_checksum_last_failure pg_stat_get_db_conflict_all
-syn keyword sqlFunction contained pg_stat_get_db_conflict_bufferpin pg_stat_get_db_conflict_lock
-syn keyword sqlFunction contained pg_stat_get_db_conflict_snapshot pg_stat_get_db_conflict_startup_deadlock
-syn keyword sqlFunction contained pg_stat_get_db_conflict_tablespace pg_stat_get_db_deadlocks
-syn keyword sqlFunction contained pg_stat_get_db_numbackends pg_stat_get_db_stat_reset_time
-syn keyword sqlFunction contained pg_stat_get_db_temp_bytes pg_stat_get_db_temp_files
-syn keyword sqlFunction contained pg_stat_get_db_tuples_deleted pg_stat_get_db_tuples_fetched
-syn keyword sqlFunction contained pg_stat_get_db_tuples_inserted pg_stat_get_db_tuples_returned
-syn keyword sqlFunction contained pg_stat_get_db_tuples_updated pg_stat_get_db_xact_commit
-syn keyword sqlFunction contained pg_stat_get_db_xact_rollback pg_stat_get_dead_tuples pg_stat_get_function_calls
-syn keyword sqlFunction contained pg_stat_get_function_self_time pg_stat_get_function_total_time
+syn keyword sqlFunction contained pg_replication_origin_xact_setup pg_replication_slot_advance pg_rotate_logfile
+syn keyword sqlFunction contained pg_rotate_logfile_old pg_safe_snapshot_blocking_pids
+syn keyword sqlFunction contained pg_sequence_last_value pg_sequence_parameters pg_show_all_file_settings
+syn keyword sqlFunction contained pg_show_all_settings pg_show_replication_origin_status
+syn keyword sqlFunction contained pg_size_bytes pg_size_pretty pg_sleep pg_sleep_for pg_sleep_until
+syn keyword sqlFunction contained pg_snapshot_in pg_snapshot_out pg_snapshot_recv pg_snapshot_send
+syn keyword sqlFunction contained pg_snapshot_xip pg_snapshot_xmax pg_snapshot_xmin
+syn keyword sqlFunction contained pg_start_backup pg_stat_clear_snapshot pg_stat_file pg_stat_get_activity
+syn keyword sqlFunction contained pg_stat_get_analyze_count pg_stat_get_archiver
+syn keyword sqlFunction contained pg_stat_get_autoanalyze_count pg_stat_get_autovacuum_count
+syn keyword sqlFunction contained pg_stat_get_backend_activity pg_stat_get_backend_activity_start
+syn keyword sqlFunction contained pg_stat_get_backend_client_addr pg_stat_get_backend_client_port
+syn keyword sqlFunction contained pg_stat_get_backend_dbid pg_stat_get_backend_idset pg_stat_get_backend_pid
+syn keyword sqlFunction contained pg_stat_get_backend_start pg_stat_get_backend_userid
+syn keyword sqlFunction contained pg_stat_get_backend_wait_event pg_stat_get_backend_wait_event_type
+syn keyword sqlFunction contained pg_stat_get_backend_xact_start
+syn keyword sqlFunction contained pg_stat_get_bgwriter_buf_written_checkpoints pg_stat_get_bgwriter_buf_written_clean
+syn keyword sqlFunction contained pg_stat_get_bgwriter_maxwritten_clean
+syn keyword sqlFunction contained pg_stat_get_bgwriter_requested_checkpoints pg_stat_get_bgwriter_stat_reset_time
+syn keyword sqlFunction contained pg_stat_get_bgwriter_timed_checkpoints pg_stat_get_blocks_fetched
+syn keyword sqlFunction contained pg_stat_get_blocks_hit pg_stat_get_buf_alloc
+syn keyword sqlFunction contained pg_stat_get_buf_fsync_backend pg_stat_get_buf_written_backend
+syn keyword sqlFunction contained pg_stat_get_checkpoint_sync_time pg_stat_get_checkpoint_write_time
+syn keyword sqlFunction contained pg_stat_get_db_blk_read_time pg_stat_get_db_blk_write_time
+syn keyword sqlFunction contained pg_stat_get_db_blocks_fetched pg_stat_get_db_blocks_hit
+syn keyword sqlFunction contained pg_stat_get_db_checksum_failures pg_stat_get_db_checksum_last_failure
+syn keyword sqlFunction contained pg_stat_get_db_conflict_all pg_stat_get_db_conflict_bufferpin
+syn keyword sqlFunction contained pg_stat_get_db_conflict_lock pg_stat_get_db_conflict_snapshot
+syn keyword sqlFunction contained pg_stat_get_db_conflict_startup_deadlock
+syn keyword sqlFunction contained pg_stat_get_db_conflict_tablespace pg_stat_get_db_deadlocks pg_stat_get_db_numbackends
+syn keyword sqlFunction contained pg_stat_get_db_stat_reset_time pg_stat_get_db_temp_bytes
+syn keyword sqlFunction contained pg_stat_get_db_temp_files pg_stat_get_db_tuples_deleted
+syn keyword sqlFunction contained pg_stat_get_db_tuples_fetched pg_stat_get_db_tuples_inserted
+syn keyword sqlFunction contained pg_stat_get_db_tuples_returned pg_stat_get_db_tuples_updated
+syn keyword sqlFunction contained pg_stat_get_db_xact_commit pg_stat_get_db_xact_rollback
+syn keyword sqlFunction contained pg_stat_get_dead_tuples pg_stat_get_function_calls pg_stat_get_function_self_time
+syn keyword sqlFunction contained pg_stat_get_function_total_time pg_stat_get_ins_since_vacuum
 syn keyword sqlFunction contained pg_stat_get_last_analyze_time
 syn keyword sqlFunction contained pg_stat_get_last_autoanalyze_time pg_stat_get_last_autovacuum_time
 syn keyword sqlFunction contained pg_stat_get_last_vacuum_time pg_stat_get_live_tuples pg_stat_get_mod_since_analyze
-syn keyword sqlFunction contained pg_stat_get_numscans pg_stat_get_progress_info
+syn keyword sqlFunction contained pg_stat_get_numscans pg_stat_get_progress_info pg_stat_get_slru
 syn keyword sqlFunction contained pg_stat_get_snapshot_timestamp pg_stat_get_subscription
-syn keyword sqlFunction contained pg_stat_get_tuples_deleted pg_stat_get_tuples_fetched pg_stat_get_tuples_hot_updated
-syn keyword sqlFunction contained pg_stat_get_tuples_inserted pg_stat_get_tuples_returned
-syn keyword sqlFunction contained pg_stat_get_tuples_updated pg_stat_get_vacuum_count
-syn keyword sqlFunction contained pg_stat_get_wal_receiver pg_stat_get_wal_senders
+syn keyword sqlFunction contained pg_stat_get_tuples_deleted pg_stat_get_tuples_fetched
+syn keyword sqlFunction contained pg_stat_get_tuples_hot_updated pg_stat_get_tuples_inserted
+syn keyword sqlFunction contained pg_stat_get_tuples_returned pg_stat_get_tuples_updated
+syn keyword sqlFunction contained pg_stat_get_vacuum_count pg_stat_get_wal_receiver pg_stat_get_wal_senders
 syn keyword sqlFunction contained pg_stat_get_xact_blocks_fetched pg_stat_get_xact_blocks_hit
 syn keyword sqlFunction contained pg_stat_get_xact_function_calls pg_stat_get_xact_function_self_time
 syn keyword sqlFunction contained pg_stat_get_xact_function_total_time pg_stat_get_xact_numscans
-syn keyword sqlFunction contained pg_stat_get_xact_tuples_deleted pg_stat_get_xact_tuples_fetched
-syn keyword sqlFunction contained pg_stat_get_xact_tuples_hot_updated pg_stat_get_xact_tuples_inserted
-syn keyword sqlFunction contained pg_stat_get_xact_tuples_returned pg_stat_get_xact_tuples_updated
-syn keyword sqlFunction contained pg_stat_reset pg_stat_reset_shared
-syn keyword sqlFunction contained pg_stat_reset_single_function_counters pg_stat_reset_single_table_counters
-syn keyword sqlFunction contained pg_statistics_obj_is_visible pg_stop_backup pg_switch_wal pg_table_is_visible
-syn keyword sqlFunction contained pg_table_size pg_tablespace_databases pg_tablespace_location
-syn keyword sqlFunction contained pg_tablespace_size pg_terminate_backend pg_timezone_abbrevs
-syn keyword sqlFunction contained pg_timezone_names pg_total_relation_size pg_trigger_depth
-syn keyword sqlFunction contained pg_try_advisory_lock pg_try_advisory_lock_shared
-syn keyword sqlFunction contained pg_try_advisory_xact_lock pg_try_advisory_xact_lock_shared
-syn keyword sqlFunction contained pg_ts_config_is_visible pg_ts_dict_is_visible pg_ts_parser_is_visible
-syn keyword sqlFunction contained pg_ts_template_is_visible pg_type_is_visible pg_typeof pg_wal_lsn_diff
+syn keyword sqlFunction contained pg_stat_get_xact_tuples_deleted
+syn keyword sqlFunction contained pg_stat_get_xact_tuples_fetched pg_stat_get_xact_tuples_hot_updated
+syn keyword sqlFunction contained pg_stat_get_xact_tuples_inserted pg_stat_get_xact_tuples_returned
+syn keyword sqlFunction contained pg_stat_get_xact_tuples_updated pg_stat_reset pg_stat_reset_shared
+syn keyword sqlFunction contained pg_stat_reset_single_function_counters
+syn keyword sqlFunction contained pg_stat_reset_single_table_counters pg_stat_reset_slru pg_statistics_obj_is_visible
+syn keyword sqlFunction contained pg_stop_backup pg_switch_wal pg_table_is_visible pg_table_size
+syn keyword sqlFunction contained pg_tablespace_databases pg_tablespace_location pg_tablespace_size
+syn keyword sqlFunction contained pg_terminate_backend pg_timezone_abbrevs pg_timezone_names
+syn keyword sqlFunction contained pg_total_relation_size pg_trigger_depth pg_try_advisory_lock
+syn keyword sqlFunction contained pg_try_advisory_lock_shared pg_try_advisory_xact_lock
+syn keyword sqlFunction contained pg_try_advisory_xact_lock_shared pg_ts_config_is_visible pg_ts_dict_is_visible
+syn keyword sqlFunction contained pg_ts_parser_is_visible pg_ts_template_is_visible
+syn keyword sqlFunction contained pg_type_is_visible pg_typeof pg_visible_in_snapshot pg_wal_lsn_diff
 syn keyword sqlFunction contained pg_wal_replay_pause pg_wal_replay_resume pg_walfile_name
-syn keyword sqlFunction contained pg_walfile_name_offset pg_xact_commit_timestamp phraseto_tsquery pi
-syn keyword sqlFunction contained plainto_tsquery plperl_call_handler plperl_inline_handler
-syn keyword sqlFunction contained plperl_validator plperlu_call_handler plperlu_inline_handler
-syn keyword sqlFunction contained plperlu_validator plpgsql_call_handler plpgsql_inline_handler
-syn keyword sqlFunction contained plpgsql_validator pltcl_call_handler pltclu_call_handler point
-syn keyword sqlFunction contained point_above point_add point_below point_distance point_div point_eq
-syn keyword sqlFunction contained point_horiz point_in point_left point_mul point_ne point_out point_recv
-syn keyword sqlFunction contained point_right point_send point_sub point_vert poly_above poly_below
-syn keyword sqlFunction contained poly_center poly_contain poly_contain_pt poly_contained
-syn keyword sqlFunction contained poly_distance poly_in poly_left poly_npoints poly_out poly_overabove
-syn keyword sqlFunction contained poly_overbelow poly_overlap poly_overleft poly_overright poly_recv
-syn keyword sqlFunction contained poly_right poly_same poly_send polygon popen position
-syn keyword sqlFunction contained positionjoinsel positionsel postgresql_fdw_validator pow power
-syn keyword sqlFunction contained prefixjoinsel prefixsel prsd_end prsd_headline prsd_lextype prsd_nexttoken
-syn keyword sqlFunction contained prsd_start pt_contained_circle pt_contained_poly query_to_xml
-syn keyword sqlFunction contained query_to_xml_and_xmlschema query_to_xmlschema querytree
-syn keyword sqlFunction contained quote_ident quote_literal quote_nullable radians radius random
-syn keyword sqlFunction contained range_adjacent range_after range_before range_cmp range_contained_by
-syn keyword sqlFunction contained range_contains range_contains_elem range_eq range_ge
-syn keyword sqlFunction contained range_gist_consistent range_gist_penalty range_gist_picksplit range_gist_same
-syn keyword sqlFunction contained range_gist_union range_gt range_in range_intersect range_le
-syn keyword sqlFunction contained range_lt range_merge range_minus range_ne range_out range_overlaps
-syn keyword sqlFunction contained range_overleft range_overright range_recv range_send
-syn keyword sqlFunction contained range_typanalyze range_union rangesel rank rank_final record_eq record_ge
-syn keyword sqlFunction contained record_gt record_image_eq record_image_ge record_image_gt
-syn keyword sqlFunction contained record_image_le record_image_lt record_image_ne record_in record_le
-syn keyword sqlFunction contained record_lt record_ne record_out record_recv record_send regclass
-syn keyword sqlFunction contained regclassin regclassout regclassrecv regclasssend regconfigin
-syn keyword sqlFunction contained regconfigout regconfigrecv regconfigsend regdictionaryin regdictionaryout
-syn keyword sqlFunction contained regdictionaryrecv regdictionarysend regexeqjoinsel regexeqsel
-syn keyword sqlFunction contained regexnejoinsel regexnesel regexp_match regexp_matches
-syn keyword sqlFunction contained regexp_replace regexp_split_to_array regexp_split_to_table
-syn keyword sqlFunction contained regnamespacein regnamespaceout regnamespacerecv regnamespacesend
-syn keyword sqlFunction contained regoperatorin regoperatorout regoperatorrecv regoperatorsend regoperin
-syn keyword sqlFunction contained regoperout regoperrecv regopersend regprocedurein regprocedureout
-syn keyword sqlFunction contained regprocedurerecv regproceduresend regprocin regprocout
-syn keyword sqlFunction contained regprocrecv regprocsend regr_avgx regr_avgy regr_count regr_intercept
-syn keyword sqlFunction contained regr_r2 regr_slope regr_sxx regr_sxy regr_syy regrolein regroleout
-syn keyword sqlFunction contained regrolerecv regrolesend regtypein regtypeout regtyperecv regtypesend
-syn keyword sqlFunction contained repeat replace reverse right round row_number row_security_active
-syn keyword sqlFunction contained row_to_json rpad rtrim satisfies_hash_partition scalargejoinsel
-syn keyword sqlFunction contained scalargesel scalargtjoinsel scalargtsel scalarlejoinsel
-syn keyword sqlFunction contained scalarlesel scalarltjoinsel scalarltsel scale schema_to_xml
-syn keyword sqlFunction contained schema_to_xml_and_xmlschema schema_to_xmlschema session_user set_bit
-syn keyword sqlFunction contained set_byte set_config set_masklen setseed setval setweight sha224 sha256
-syn keyword sqlFunction contained sha384 sha512 shell_in shell_out shift_jis_2004_to_euc_jis_2004
-syn keyword sqlFunction contained shift_jis_2004_to_utf8 shobj_description sign similar_escape sin
-syn keyword sqlFunction contained sind sinh sjis_to_euc_jp sjis_to_mic sjis_to_utf8 slope
-syn keyword sqlFunction contained spg_bbox_quad_config spg_box_quad_choose spg_box_quad_config
-syn keyword sqlFunction contained spg_box_quad_inner_consistent spg_box_quad_leaf_consistent
-syn keyword sqlFunction contained spg_box_quad_picksplit spg_kd_choose spg_kd_config spg_kd_inner_consistent
-syn keyword sqlFunction contained spg_kd_picksplit spg_poly_quad_compress spg_quad_choose
-syn keyword sqlFunction contained spg_quad_config spg_quad_inner_consistent spg_quad_leaf_consistent
-syn keyword sqlFunction contained spg_quad_picksplit spg_range_quad_choose spg_range_quad_config
-syn keyword sqlFunction contained spg_range_quad_inner_consistent
-syn keyword sqlFunction contained spg_range_quad_leaf_consistent spg_range_quad_picksplit spg_text_choose spg_text_config
-syn keyword sqlFunction contained spg_text_inner_consistent spg_text_leaf_consistent
-syn keyword sqlFunction contained spg_text_picksplit spghandler split_part sqrt starts_with statement_timestamp
-syn keyword sqlFunction contained stddev stddev_pop stddev_samp string_agg string_agg_finalfn
-syn keyword sqlFunction contained string_agg_transfn string_to_array strip strpos substr substring sum
-syn keyword sqlFunction contained suppress_redundant_updates_trigger system table_am_handler_in
-syn keyword sqlFunction contained table_am_handler_out table_to_xml table_to_xml_and_xmlschema
-syn keyword sqlFunction contained table_to_xmlschema tan tand tanh text text_ge text_gt text_larger
-syn keyword sqlFunction contained text_le text_lt text_pattern_ge text_pattern_gt text_pattern_le
-syn keyword sqlFunction contained text_pattern_lt text_smaller textanycat textcat texteq texteqname
-syn keyword sqlFunction contained textgename textgtname texticlike texticlike_support texticnlike
-syn keyword sqlFunction contained texticregexeq texticregexeq_support texticregexne textin textlen
-syn keyword sqlFunction contained textlename textlike textlike_support textltname textne textnename
-syn keyword sqlFunction contained textnlike textout textrecv textregexeq textregexeq_support
-syn keyword sqlFunction contained textregexne textsend thesaurus_init thesaurus_lexize tideq tidge tidgt
-syn keyword sqlFunction contained tidin tidlarger tidle tidlt tidne tidout tidrecv tidsend tidsmaller
-syn keyword sqlFunction contained time time_cmp time_eq time_ge time_gt time_hash
-syn keyword sqlFunction contained time_hash_extended time_in time_larger time_le time_lt time_mi_interval
-syn keyword sqlFunction contained time_mi_time time_ne time_out time_pl_interval time_recv time_send
-syn keyword sqlFunction contained time_smaller time_support timedate_pl timeofday timestamp timestamp_cmp
-syn keyword sqlFunction contained timestamp_cmp_date timestamp_cmp_timestamptz timestamp_eq
-syn keyword sqlFunction contained timestamp_eq_date timestamp_eq_timestamptz timestamp_ge
-syn keyword sqlFunction contained timestamp_ge_date timestamp_ge_timestamptz timestamp_gt timestamp_gt_date
-syn keyword sqlFunction contained timestamp_gt_timestamptz timestamp_hash
-syn keyword sqlFunction contained timestamp_hash_extended timestamp_in timestamp_larger timestamp_le timestamp_le_date
-syn keyword sqlFunction contained timestamp_le_timestamptz timestamp_lt timestamp_lt_date
-syn keyword sqlFunction contained timestamp_lt_timestamptz timestamp_mi timestamp_mi_interval
-syn keyword sqlFunction contained timestamp_ne timestamp_ne_date timestamp_ne_timestamptz timestamp_out
-syn keyword sqlFunction contained timestamp_pl_interval timestamp_recv timestamp_send
-syn keyword sqlFunction contained timestamp_smaller timestamp_sortsupport timestamp_support
-syn keyword sqlFunction contained timestamptypmodin timestamptypmodout timestamptz timestamptz_cmp
-syn keyword sqlFunction contained timestamptz_cmp_date timestamptz_cmp_timestamp timestamptz_eq
-syn keyword sqlFunction contained timestamptz_eq_date timestamptz_eq_timestamp timestamptz_ge
-syn keyword sqlFunction contained timestamptz_ge_date timestamptz_ge_timestamp timestamptz_gt
-syn keyword sqlFunction contained timestamptz_gt_date timestamptz_gt_timestamp timestamptz_in timestamptz_larger
-syn keyword sqlFunction contained timestamptz_le timestamptz_le_date timestamptz_le_timestamp
-syn keyword sqlFunction contained timestamptz_lt timestamptz_lt_date timestamptz_lt_timestamp
-syn keyword sqlFunction contained timestamptz_mi timestamptz_mi_interval timestamptz_ne
-syn keyword sqlFunction contained timestamptz_ne_date timestamptz_ne_timestamp timestamptz_out
-syn keyword sqlFunction contained timestamptz_pl_interval timestamptz_recv timestamptz_send
-syn keyword sqlFunction contained timestamptz_smaller timestamptztypmodin timestamptztypmodout timetypmodin
-syn keyword sqlFunction contained timetypmodout timetz timetz_cmp timetz_eq timetz_ge timetz_gt
-syn keyword sqlFunction contained timetz_hash timetz_hash_extended timetz_in timetz_larger timetz_le
-syn keyword sqlFunction contained timetz_lt timetz_mi_interval timetz_ne timetz_out timetz_pl_interval
-syn keyword sqlFunction contained timetz_recv timetz_send timetz_smaller timetzdate_pl
-syn keyword sqlFunction contained timetztypmodin timetztypmodout timezone to_ascii to_char to_date to_hex
-syn keyword sqlFunction contained to_json to_jsonb to_number to_regclass to_regnamespace to_regoper
-syn keyword sqlFunction contained to_regoperator to_regproc to_regprocedure to_regrole to_regtype
-syn keyword sqlFunction contained to_timestamp to_tsquery to_tsvector transaction_timestamp translate
-syn keyword sqlFunction contained trigger_in trigger_out trunc ts_debug ts_delete ts_filter
-syn keyword sqlFunction contained ts_headline ts_lexize ts_match_qv ts_match_tq ts_match_tt ts_match_vq
+syn keyword sqlFunction contained pg_walfile_name_offset pg_xact_commit_timestamp pg_xact_status
+syn keyword sqlFunction contained phraseto_tsquery pi plainto_tsquery plperl_call_handler
+syn keyword sqlFunction contained plperl_inline_handler plperl_validator plperlu_call_handler
+syn keyword sqlFunction contained plperlu_inline_handler plperlu_validator plpgsql_call_handler
+syn keyword sqlFunction contained plpgsql_inline_handler plpgsql_validator pltcl_call_handler pltclu_call_handler
+syn keyword sqlFunction contained point point_above point_add point_below point_distance point_div
+syn keyword sqlFunction contained point_eq point_horiz point_in point_left point_mul point_ne
+syn keyword sqlFunction contained point_out point_recv point_right point_send point_sub point_vert
+syn keyword sqlFunction contained poly_above poly_below poly_center poly_contain poly_contain_pt
+syn keyword sqlFunction contained poly_contained poly_distance poly_in poly_left poly_npoints poly_out
+syn keyword sqlFunction contained poly_overabove poly_overbelow poly_overlap poly_overleft
+syn keyword sqlFunction contained poly_overright poly_recv poly_right poly_same poly_send polygon popen
+syn keyword sqlFunction contained position positionjoinsel positionsel postgresql_fdw_validator pow power
+syn keyword sqlFunction contained prefixjoinsel prefixsel prsd_end prsd_headline prsd_lextype
+syn keyword sqlFunction contained prsd_nexttoken prsd_start pt_contained_circle pt_contained_poly
+syn keyword sqlFunction contained query_to_xml query_to_xml_and_xmlschema query_to_xmlschema
+syn keyword sqlFunction contained querytree quote_ident quote_literal quote_nullable radians radius
+syn keyword sqlFunction contained random range_adjacent range_after range_before range_cmp
+syn keyword sqlFunction contained range_contained_by range_contains range_contains_elem range_eq range_ge
+syn keyword sqlFunction contained range_gist_consistent range_gist_penalty range_gist_picksplit
+syn keyword sqlFunction contained range_gist_same range_gist_union range_gt range_in range_intersect
+syn keyword sqlFunction contained range_le range_lt range_merge range_minus range_ne range_out
+syn keyword sqlFunction contained range_overlaps range_overleft range_overright range_recv range_send
+syn keyword sqlFunction contained range_typanalyze range_union rangesel rank rank_final record_eq
+syn keyword sqlFunction contained record_ge record_gt record_image_eq record_image_ge
+syn keyword sqlFunction contained record_image_gt record_image_le record_image_lt record_image_ne record_in
+syn keyword sqlFunction contained record_le record_lt record_ne record_out record_recv record_send
+syn keyword sqlFunction contained regclass regclassin regclassout regclassrecv regclasssend
+syn keyword sqlFunction contained regcollationin regcollationout regcollationrecv regcollationsend
+syn keyword sqlFunction contained regconfigin regconfigout regconfigrecv regconfigsend regdictionaryin
+syn keyword sqlFunction contained regdictionaryout regdictionaryrecv regdictionarysend
+syn keyword sqlFunction contained regexeqjoinsel regexeqsel regexnejoinsel regexnesel regexp_match
+syn keyword sqlFunction contained regexp_matches regexp_replace regexp_split_to_array
+syn keyword sqlFunction contained regexp_split_to_table regnamespacein regnamespaceout regnamespacerecv
+syn keyword sqlFunction contained regnamespacesend regoperatorin regoperatorout regoperatorrecv
+syn keyword sqlFunction contained regoperatorsend regoperin regoperout regoperrecv regopersend regprocedurein
+syn keyword sqlFunction contained regprocedureout regprocedurerecv regproceduresend regprocin
+syn keyword sqlFunction contained regprocout regprocrecv regprocsend regr_avgx regr_avgy regr_count
+syn keyword sqlFunction contained regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy regrolein
+syn keyword sqlFunction contained regroleout regrolerecv regrolesend regtypein regtypeout
+syn keyword sqlFunction contained regtyperecv regtypesend repeat replace reverse right round row_number
+syn keyword sqlFunction contained row_security_active row_to_json rpad rtrim satisfies_hash_partition
+syn keyword sqlFunction contained scalargejoinsel scalargesel scalargtjoinsel scalargtsel
+syn keyword sqlFunction contained scalarlejoinsel scalarlesel scalarltjoinsel scalarltsel scale
+syn keyword sqlFunction contained schema_to_xml schema_to_xml_and_xmlschema schema_to_xmlschema
+syn keyword sqlFunction contained session_user set_bit set_byte set_config set_masklen setseed setval
+syn keyword sqlFunction contained setweight sha224 sha256 sha384 sha512 shell_in shell_out
+syn keyword sqlFunction contained shift_jis_2004_to_euc_jis_2004 shift_jis_2004_to_utf8 shobj_description sign
+syn keyword sqlFunction contained similar_escape similar_to_escape sin sind sinh sjis_to_euc_jp
+syn keyword sqlFunction contained sjis_to_mic sjis_to_utf8 slope spg_bbox_quad_config
+syn keyword sqlFunction contained spg_box_quad_choose spg_box_quad_config spg_box_quad_inner_consistent
+syn keyword sqlFunction contained spg_box_quad_leaf_consistent spg_box_quad_picksplit spg_kd_choose
+syn keyword sqlFunction contained spg_kd_config spg_kd_inner_consistent spg_kd_picksplit
+syn keyword sqlFunction contained spg_poly_quad_compress spg_quad_choose spg_quad_config
+syn keyword sqlFunction contained spg_quad_inner_consistent spg_quad_leaf_consistent spg_quad_picksplit
+syn keyword sqlFunction contained spg_range_quad_choose spg_range_quad_config
+syn keyword sqlFunction contained spg_range_quad_inner_consistent spg_range_quad_leaf_consistent spg_range_quad_picksplit
+syn keyword sqlFunction contained spg_text_choose spg_text_config spg_text_inner_consistent
+syn keyword sqlFunction contained spg_text_leaf_consistent spg_text_picksplit spghandler split_part
+syn keyword sqlFunction contained sqrt starts_with statement_timestamp stddev stddev_pop stddev_samp
+syn keyword sqlFunction contained string_agg string_agg_finalfn string_agg_transfn
+syn keyword sqlFunction contained string_to_array strip strpos substr substring sum
+syn keyword sqlFunction contained suppress_redundant_updates_trigger system table_am_handler_in table_am_handler_out
+syn keyword sqlFunction contained table_to_xml table_to_xml_and_xmlschema table_to_xmlschema tan tand tanh
+syn keyword sqlFunction contained text text_ge text_gt text_larger text_le text_lt text_pattern_ge
+syn keyword sqlFunction contained text_pattern_gt text_pattern_le text_pattern_lt text_smaller
+syn keyword sqlFunction contained textanycat textcat texteq texteqname textgename textgtname texticlike
+syn keyword sqlFunction contained texticlike_support texticnlike texticregexeq
+syn keyword sqlFunction contained texticregexeq_support texticregexne textin textlen textlename textlike
+syn keyword sqlFunction contained textlike_support textltname textne textnename textnlike textout textrecv
+syn keyword sqlFunction contained textregexeq textregexeq_support textregexne textsend thesaurus_init
+syn keyword sqlFunction contained thesaurus_lexize tideq tidge tidgt tidin tidlarger tidle tidlt
+syn keyword sqlFunction contained tidne tidout tidrecv tidsend tidsmaller time time_cmp time_eq time_ge
+syn keyword sqlFunction contained time_gt time_hash time_hash_extended time_in time_larger time_le
+syn keyword sqlFunction contained time_lt time_mi_interval time_mi_time time_ne time_out
+syn keyword sqlFunction contained time_pl_interval time_recv time_send time_smaller time_support timedate_pl
+syn keyword sqlFunction contained timeofday timestamp timestamp_cmp timestamp_cmp_date
+syn keyword sqlFunction contained timestamp_cmp_timestamptz timestamp_eq timestamp_eq_date
+syn keyword sqlFunction contained timestamp_eq_timestamptz timestamp_ge timestamp_ge_date
+syn keyword sqlFunction contained timestamp_ge_timestamptz timestamp_gt timestamp_gt_date timestamp_gt_timestamptz
+syn keyword sqlFunction contained timestamp_hash timestamp_hash_extended timestamp_in
+syn keyword sqlFunction contained timestamp_larger timestamp_le timestamp_le_date timestamp_le_timestamptz
+syn keyword sqlFunction contained timestamp_lt timestamp_lt_date timestamp_lt_timestamptz
+syn keyword sqlFunction contained timestamp_mi timestamp_mi_interval timestamp_ne timestamp_ne_date
+syn keyword sqlFunction contained timestamp_ne_timestamptz timestamp_out timestamp_pl_interval
+syn keyword sqlFunction contained timestamp_recv timestamp_send timestamp_smaller timestamp_sortsupport
+syn keyword sqlFunction contained timestamp_support timestamptypmodin timestamptypmodout
+syn keyword sqlFunction contained timestamptz timestamptz_cmp timestamptz_cmp_date
+syn keyword sqlFunction contained timestamptz_cmp_timestamp timestamptz_eq timestamptz_eq_date
+syn keyword sqlFunction contained timestamptz_eq_timestamp timestamptz_ge timestamptz_ge_date timestamptz_ge_timestamp
+syn keyword sqlFunction contained timestamptz_gt timestamptz_gt_date timestamptz_gt_timestamp
+syn keyword sqlFunction contained timestamptz_in timestamptz_larger timestamptz_le
+syn keyword sqlFunction contained timestamptz_le_date timestamptz_le_timestamp timestamptz_lt
+syn keyword sqlFunction contained timestamptz_lt_date timestamptz_lt_timestamp timestamptz_mi
+syn keyword sqlFunction contained timestamptz_mi_interval timestamptz_ne timestamptz_ne_date
+syn keyword sqlFunction contained timestamptz_ne_timestamp timestamptz_out timestamptz_pl_interval timestamptz_recv
+syn keyword sqlFunction contained timestamptz_send timestamptz_smaller timestamptztypmodin
+syn keyword sqlFunction contained timestamptztypmodout timetypmodin timetypmodout timetz timetz_cmp
+syn keyword sqlFunction contained timetz_eq timetz_ge timetz_gt timetz_hash timetz_hash_extended
+syn keyword sqlFunction contained timetz_in timetz_larger timetz_le timetz_lt timetz_mi_interval
+syn keyword sqlFunction contained timetz_ne timetz_out timetz_pl_interval timetz_recv timetz_send
+syn keyword sqlFunction contained timetz_smaller timetzdate_pl timetztypmodin timetztypmodout timezone
+syn keyword sqlFunction contained to_ascii to_char to_date to_hex to_json to_jsonb to_number
+syn keyword sqlFunction contained to_regclass to_regcollation to_regnamespace to_regoper to_regoperator
+syn keyword sqlFunction contained to_regproc to_regprocedure to_regrole to_regtype to_timestamp
+syn keyword sqlFunction contained to_tsquery to_tsvector transaction_timestamp translate trigger_in
+syn keyword sqlFunction contained trigger_out trim_scale trunc ts_debug ts_delete ts_filter ts_headline
+syn keyword sqlFunction contained ts_lexize ts_match_qv ts_match_tq ts_match_tt ts_match_vq
 syn keyword sqlFunction contained ts_parse ts_rank ts_rank_cd ts_rewrite ts_stat ts_token_type
 syn keyword sqlFunction contained ts_typanalyze tsm_handler_in tsm_handler_out tsmatchjoinsel tsmatchsel
 syn keyword sqlFunction contained tsq_mcontained tsq_mcontains tsquery_and tsquery_cmp tsquery_eq
-syn keyword sqlFunction contained tsquery_ge tsquery_gt tsquery_le tsquery_lt tsquery_ne
-syn keyword sqlFunction contained tsquery_not tsquery_or tsquery_phrase tsqueryin tsqueryout tsqueryrecv
+syn keyword sqlFunction contained tsquery_ge tsquery_gt tsquery_le tsquery_lt tsquery_ne tsquery_not
+syn keyword sqlFunction contained tsquery_or tsquery_phrase tsqueryin tsqueryout tsqueryrecv
 syn keyword sqlFunction contained tsquerysend tsrange tsrange_subdiff tstzrange tstzrange_subdiff
 syn keyword sqlFunction contained tsvector_cmp tsvector_concat tsvector_eq tsvector_ge tsvector_gt
 syn keyword sqlFunction contained tsvector_le tsvector_lt tsvector_ne tsvector_to_array
@@ -664,38 +680,38 @@ syn keyword sqlFunction contained txid_current_if_assigned txid_current_snapshot
 syn keyword sqlFunction contained txid_snapshot_recv txid_snapshot_send txid_snapshot_xip
 syn keyword sqlFunction contained txid_snapshot_xmax txid_snapshot_xmin txid_status
 syn keyword sqlFunction contained txid_visible_in_snapshot uhc_to_utf8 unique_key_recheck unknownin unknownout
-syn keyword sqlFunction contained unknownrecv unknownsend unnest upper upper_inc upper_inf utf8_to_ascii
-syn keyword sqlFunction contained utf8_to_big5 utf8_to_euc_cn utf8_to_euc_jis_2004
-syn keyword sqlFunction contained utf8_to_euc_jp utf8_to_euc_kr utf8_to_euc_tw utf8_to_gb18030 utf8_to_gbk
-syn keyword sqlFunction contained utf8_to_iso8859 utf8_to_iso8859_1 utf8_to_johab utf8_to_koi8r
-syn keyword sqlFunction contained utf8_to_koi8u utf8_to_shift_jis_2004 utf8_to_sjis utf8_to_uhc
-syn keyword sqlFunction contained utf8_to_win uuid_cmp uuid_eq uuid_ge uuid_gt uuid_hash
-syn keyword sqlFunction contained uuid_hash_extended uuid_in uuid_le uuid_lt uuid_ne uuid_out uuid_recv uuid_send
-syn keyword sqlFunction contained uuid_sortsupport var_pop var_samp varbit varbit_in varbit_out
-syn keyword sqlFunction contained varbit_recv varbit_send varbit_support varbitcmp varbiteq varbitge
-syn keyword sqlFunction contained varbitgt varbitle varbitlt varbitne varbittypmodin varbittypmodout
-syn keyword sqlFunction contained varchar varchar_support varcharin varcharout varcharrecv
-syn keyword sqlFunction contained varcharsend varchartypmodin varchartypmodout variance version void_in
-syn keyword sqlFunction contained void_out void_recv void_send websearch_to_tsquery width width_bucket
-syn keyword sqlFunction contained win1250_to_latin2 win1250_to_mic win1251_to_iso
-syn keyword sqlFunction contained win1251_to_koi8r win1251_to_mic win1251_to_win866 win866_to_iso
-syn keyword sqlFunction contained win866_to_koi8r win866_to_mic win866_to_win1251 win_to_utf8 xideq xideqint4
+syn keyword sqlFunction contained unknownrecv unknownsend unnest upper upper_inc upper_inf utf8_to_big5
+syn keyword sqlFunction contained utf8_to_euc_cn utf8_to_euc_jis_2004 utf8_to_euc_jp utf8_to_euc_kr
+syn keyword sqlFunction contained utf8_to_euc_tw utf8_to_gb18030 utf8_to_gbk utf8_to_iso8859
+syn keyword sqlFunction contained utf8_to_iso8859_1 utf8_to_johab utf8_to_koi8r utf8_to_koi8u
+syn keyword sqlFunction contained utf8_to_shift_jis_2004 utf8_to_sjis utf8_to_uhc utf8_to_win uuid_cmp
+syn keyword sqlFunction contained uuid_eq uuid_ge uuid_gt uuid_hash uuid_hash_extended uuid_in uuid_le
+syn keyword sqlFunction contained uuid_lt uuid_ne uuid_out uuid_recv uuid_send uuid_sortsupport
+syn keyword sqlFunction contained var_pop var_samp varbit varbit_in varbit_out varbit_recv varbit_send
+syn keyword sqlFunction contained varbit_support varbitcmp varbiteq varbitge varbitgt varbitle
+syn keyword sqlFunction contained varbitlt varbitne varbittypmodin varbittypmodout varchar
+syn keyword sqlFunction contained varchar_support varcharin varcharout varcharrecv varcharsend
+syn keyword sqlFunction contained varchartypmodin varchartypmodout variance version void_in void_out void_recv
+syn keyword sqlFunction contained void_send websearch_to_tsquery width width_bucket
+syn keyword sqlFunction contained win1250_to_latin2 win1250_to_mic win1251_to_iso win1251_to_koi8r win1251_to_mic
+syn keyword sqlFunction contained win1251_to_win866 win866_to_iso win866_to_koi8r win866_to_mic
+syn keyword sqlFunction contained win866_to_win1251 win_to_utf8 xid xid8cmp xid8eq xid8ge xid8gt
+syn keyword sqlFunction contained xid8in xid8le xid8lt xid8ne xid8out xid8recv xid8send xideq xideqint4
 syn keyword sqlFunction contained xidin xidneq xidneqint4 xidout xidrecv xidsend xml xml_in
 syn keyword sqlFunction contained xml_is_well_formed xml_is_well_formed_content
 syn keyword sqlFunction contained xml_is_well_formed_document xml_out xml_recv xml_send xmlagg xmlcomment xmlconcat2 xmlexists
 syn keyword sqlFunction contained xmlvalidate xpath xpath_exists
 " Extensions names
 syn keyword sqlConstant contained address_standardizer address_standardizer_data_us adminpack
-syn keyword sqlConstant contained amcheck autoinc bloom btree_gin btree_gist citext cube dblink
-syn keyword sqlConstant contained dict_int dict_xsyn earthdistance file_fdw fuzzystrmatch hstore
-syn keyword sqlConstant contained hstore_plperl hstore_plperlu insert_username intagg intarray isn
-syn keyword sqlConstant contained jsonb_plperl jsonb_plperlu lo ltree moddatetime pageinspect
-syn keyword sqlConstant contained pg_buffercache pg_freespacemap pg_prewarm pg_stat_statements pg_trgm
-syn keyword sqlConstant contained pg_visibility pgcrypto pgrouting pgrowlocks pgstattuple pgtap plperl
-syn keyword sqlConstant contained plperlu plpgsql pltcl pltclu postgis postgis_raster postgis_sfcgal
+syn keyword sqlConstant contained amcheck autoinc bloom bool_plperl bool_plperlu btree_gin
+syn keyword sqlConstant contained btree_gist citext cube dblink dict_int dict_xsyn earthdistance file_fdw
+syn keyword sqlConstant contained fuzzystrmatch hstore hstore_plperl hstore_plperlu insert_username
+syn keyword sqlConstant contained intagg intarray isn jsonb_plperl jsonb_plperlu lo ltree moddatetime
+syn keyword sqlConstant contained pageinspect pg_buffercache pg_freespacemap pg_prewarm
+syn keyword sqlConstant contained pg_stat_statements pg_trgm pg_visibility pgcrypto pgrowlocks pgstattuple
+syn keyword sqlConstant contained pgtap plperl plperlu plpgsql pltcl pltclu postgis postgis_sfcgal
 syn keyword sqlConstant contained postgis_tiger_geocoder postgis_topology postgres_fdw refint seg
-syn keyword sqlConstant contained sslinfo tablefunc tcn temporal_tables tsm_system_rows
-syn keyword sqlConstant contained tsm_system_time unaccent xml2
+syn keyword sqlConstant contained sslinfo tablefunc tcn tsm_system_rows tsm_system_time unaccent xml2
 " Legacy extensions names
 syn keyword sqlConstant contained chkpass hstore_plpython2u hstore_plpython3u hstore_plpythonu
 syn keyword sqlConstant contained jsonb_plpython3u ltree_plpython2u ltree_plpython3u
@@ -953,20 +969,22 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'btree_gin') == -1
   syn keyword sqlFunction contained gin_extract_value_timetz
   syn keyword sqlFunction contained gin_extract_value_uuid gin_extract_value_varbit gin_numeric_cmp
 endif " btree_gin
-" Extension: ltree (v1.1)
+" Extension: ltree (v1.2)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'ltree') == -1
   syn keyword sqlFunction contained index lca lquery_in lquery_out
-  syn keyword sqlFunction contained lt_q_regex lt_q_rregex ltq_regex
-  syn keyword sqlFunction contained ltq_rregex ltree2text ltree_addltree
-  syn keyword sqlFunction contained ltree_addtext ltree_cmp ltree_compress
-  syn keyword sqlFunction contained ltree_consistent ltree_decompress ltree_eq ltree_ge
-  syn keyword sqlFunction contained ltree_gist_in ltree_gist_out ltree_gt
+  syn keyword sqlFunction contained lquery_recv lquery_send lt_q_regex
+  syn keyword sqlFunction contained lt_q_rregex ltq_regex ltq_rregex ltree2text
+  syn keyword sqlFunction contained ltree_addltree ltree_addtext ltree_cmp
+  syn keyword sqlFunction contained ltree_compress ltree_consistent
+  syn keyword sqlFunction contained ltree_decompress ltree_eq ltree_ge ltree_gist_in
+  syn keyword sqlFunction contained ltree_gist_options ltree_gist_out ltree_gt
   syn keyword sqlFunction contained ltree_in ltree_isparent ltree_le
   syn keyword sqlFunction contained ltree_lt ltree_ne ltree_out ltree_penalty
-  syn keyword sqlFunction contained ltree_picksplit ltree_risparent ltree_same
-  syn keyword sqlFunction contained ltree_textadd ltree_union ltreeparentsel
-  syn keyword sqlFunction contained ltxtq_exec ltxtq_in ltxtq_out
-  syn keyword sqlFunction contained ltxtq_rexec nlevel subltree subpath
+  syn keyword sqlFunction contained ltree_picksplit ltree_recv ltree_risparent
+  syn keyword sqlFunction contained ltree_same ltree_send ltree_textadd
+  syn keyword sqlFunction contained ltree_union ltreeparentsel ltxtq_exec
+  syn keyword sqlFunction contained ltxtq_in ltxtq_out ltxtq_recv ltxtq_rexec
+  syn keyword sqlFunction contained ltxtq_send nlevel subltree subpath
   syn keyword sqlFunction contained text2ltree
   syn keyword sqlType contained lquery ltree ltree_gist ltxtquery
 endif " ltree
@@ -982,14 +1000,19 @@ endif " temporal_tables
 if index(get(g:, 'pgsql_disabled_extensions', []), 'jsonb_plperl') == -1
   syn keyword sqlFunction contained jsonb_to_plperl plperl_to_jsonb
 endif " jsonb_plperl
-" Extension: adminpack (v2.0)
+" Extension: adminpack (v2.1)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'adminpack') == -1
-  syn keyword sqlFunction contained pg_file_rename pg_file_unlink pg_file_write pg_logdir_ls
+  syn keyword sqlFunction contained pg_file_rename pg_file_sync pg_file_unlink pg_file_write
+  syn keyword sqlFunction contained pg_logdir_ls
 endif " adminpack
 " Extension: dict_xsyn (v1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'dict_xsyn') == -1
   syn keyword sqlFunction contained dxsyn_init dxsyn_lexize
 endif " dict_xsyn
+" Extension: bool_plperlu (v1.0)
+if index(get(g:, 'pgsql_disabled_extensions', []), 'bool_plperlu') == -1
+  syn keyword sqlFunction contained bool_to_plperlu plperlu_to_bool
+endif " bool_plperlu
 " Extension: address_standardizer (v3.0.2)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'address_standardizer') == -1
   syn keyword sqlFunction contained parse_address standardize_address
@@ -1005,25 +1028,26 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'xml2') == -1
   syn keyword sqlFunction contained xpath_bool xpath_list xpath_nodeset
   syn keyword sqlFunction contained xpath_number xpath_string xpath_table xslt_process
 endif " xml2
-" Extension: hstore (v1.6)
+" Extension: hstore (v1.7)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'hstore') == -1
   syn keyword sqlFunction contained akeys avals defined delete
   syn keyword sqlFunction contained each exist exists_all exists_any
   syn keyword sqlFunction contained fetchval ghstore_compress ghstore_consistent
-  syn keyword sqlFunction contained ghstore_decompress ghstore_in ghstore_out
-  syn keyword sqlFunction contained ghstore_penalty ghstore_picksplit
-  syn keyword sqlFunction contained ghstore_same ghstore_union gin_consistent_hstore
-  syn keyword sqlFunction contained gin_extract_hstore gin_extract_hstore_query
-  syn keyword sqlFunction contained hs_concat hs_contained hs_contains hstore
-  syn keyword sqlFunction contained hstore_cmp hstore_eq hstore_ge
-  syn keyword sqlFunction contained hstore_gt hstore_hash hstore_hash_extended
-  syn keyword sqlFunction contained hstore_in hstore_le hstore_lt hstore_ne
-  syn keyword sqlFunction contained hstore_out hstore_recv hstore_send
-  syn keyword sqlFunction contained hstore_to_array hstore_to_json hstore_to_json_loose
-  syn keyword sqlFunction contained hstore_to_jsonb hstore_to_jsonb_loose
-  syn keyword sqlFunction contained hstore_to_matrix hstore_version_diag isdefined
-  syn keyword sqlFunction contained isexists populate_record skeys slice
-  syn keyword sqlFunction contained slice_array svals tconvert
+  syn keyword sqlFunction contained ghstore_decompress ghstore_in ghstore_options
+  syn keyword sqlFunction contained ghstore_out ghstore_penalty
+  syn keyword sqlFunction contained ghstore_picksplit ghstore_same ghstore_union
+  syn keyword sqlFunction contained gin_consistent_hstore gin_extract_hstore
+  syn keyword sqlFunction contained gin_extract_hstore_query hs_concat hs_contained
+  syn keyword sqlFunction contained hs_contains hstore hstore_cmp hstore_eq
+  syn keyword sqlFunction contained hstore_ge hstore_gt hstore_hash
+  syn keyword sqlFunction contained hstore_hash_extended hstore_in hstore_le hstore_lt
+  syn keyword sqlFunction contained hstore_ne hstore_out hstore_recv
+  syn keyword sqlFunction contained hstore_send hstore_to_array hstore_to_json
+  syn keyword sqlFunction contained hstore_to_json_loose hstore_to_jsonb
+  syn keyword sqlFunction contained hstore_to_jsonb_loose hstore_to_matrix hstore_version_diag
+  syn keyword sqlFunction contained isdefined isexists populate_record
+  syn keyword sqlFunction contained skeys slice slice_array svals
+  syn keyword sqlFunction contained tconvert
   syn keyword sqlType contained ghstore hstore
 endif " hstore
 " Extension: pg_visibility (v1.2)
@@ -1284,7 +1308,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'dblink') == -1
   syn keyword sqlFunction contained dblink_open dblink_send_query
   syn keyword sqlType contained dblink_pkey_results
 endif " dblink
-" Extension: pg_stat_statements (v1.7)
+" Extension: pg_stat_statements (v1.8)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_stat_statements') == -1
   syn keyword sqlFunction contained pg_stat_statements pg_stat_statements_reset
   syn keyword sqlView contained pg_stat_statements
@@ -1390,37 +1414,38 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'plperlu') == -1
   syn keyword sqlFunction contained plperlu_call_handler plperlu_inline_handler
   syn keyword sqlFunction contained plperlu_validator
 endif " plperlu
-" Extension: intarray (v1.2)
+" Extension: intarray (v1.3)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'intarray') == -1
   syn keyword sqlFunction contained boolop bqarr_in bqarr_out
   syn keyword sqlFunction contained g_int_compress g_int_consistent g_int_decompress
-  syn keyword sqlFunction contained g_int_penalty g_int_picksplit g_int_same
-  syn keyword sqlFunction contained g_int_union g_intbig_compress
-  syn keyword sqlFunction contained g_intbig_consistent g_intbig_decompress g_intbig_penalty
+  syn keyword sqlFunction contained g_int_options g_int_penalty g_int_picksplit
+  syn keyword sqlFunction contained g_int_same g_int_union g_intbig_compress
+  syn keyword sqlFunction contained g_intbig_consistent g_intbig_decompress
+  syn keyword sqlFunction contained g_intbig_options g_intbig_penalty
   syn keyword sqlFunction contained g_intbig_picksplit g_intbig_same g_intbig_union
-  syn keyword sqlFunction contained ginint4_consistent ginint4_queryextract
-  syn keyword sqlFunction contained icount idx intarray_del_elem
-  syn keyword sqlFunction contained intarray_push_array intarray_push_elem intset
-  syn keyword sqlFunction contained intset_subtract intset_union_elem querytree
-  syn keyword sqlFunction contained rboolop sort sort_asc sort_desc
-  syn keyword sqlFunction contained subarray uniq
+  syn keyword sqlFunction contained ginint4_consistent ginint4_queryextract icount idx
+  syn keyword sqlFunction contained intarray_del_elem intarray_push_array
+  syn keyword sqlFunction contained intarray_push_elem intset intset_subtract
+  syn keyword sqlFunction contained intset_union_elem querytree rboolop sort
+  syn keyword sqlFunction contained sort_asc sort_desc subarray uniq
   syn keyword sqlType contained intbig_gkey query_int
 endif " intarray
-" Extension: pg_trgm (v1.4)
+" Extension: pg_trgm (v1.5)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_trgm') == -1
   syn keyword sqlFunction contained gin_extract_query_trgm gin_extract_value_trgm
   syn keyword sqlFunction contained gin_trgm_consistent gin_trgm_triconsistent
   syn keyword sqlFunction contained gtrgm_compress gtrgm_consistent
-  syn keyword sqlFunction contained gtrgm_decompress gtrgm_distance gtrgm_in gtrgm_out
-  syn keyword sqlFunction contained gtrgm_penalty gtrgm_picksplit gtrgm_same
-  syn keyword sqlFunction contained gtrgm_union set_limit show_limit
-  syn keyword sqlFunction contained show_trgm similarity similarity_dist
-  syn keyword sqlFunction contained similarity_op strict_word_similarity
+  syn keyword sqlFunction contained gtrgm_decompress gtrgm_distance gtrgm_in
+  syn keyword sqlFunction contained gtrgm_options gtrgm_out gtrgm_penalty gtrgm_picksplit
+  syn keyword sqlFunction contained gtrgm_same gtrgm_union set_limit
+  syn keyword sqlFunction contained show_limit show_trgm similarity
+  syn keyword sqlFunction contained similarity_dist similarity_op strict_word_similarity
   syn keyword sqlFunction contained strict_word_similarity_commutator_op
-  syn keyword sqlFunction contained strict_word_similarity_dist_commutator_op strict_word_similarity_dist_op
-  syn keyword sqlFunction contained strict_word_similarity_op word_similarity
-  syn keyword sqlFunction contained word_similarity_commutator_op word_similarity_dist_commutator_op
-  syn keyword sqlFunction contained word_similarity_dist_op word_similarity_op
+  syn keyword sqlFunction contained strict_word_similarity_dist_commutator_op
+  syn keyword sqlFunction contained strict_word_similarity_dist_op strict_word_similarity_op word_similarity
+  syn keyword sqlFunction contained word_similarity_commutator_op
+  syn keyword sqlFunction contained word_similarity_dist_commutator_op word_similarity_dist_op
+  syn keyword sqlFunction contained word_similarity_op
   syn keyword sqlType contained gtrgm
 endif " pg_trgm
 " Extension: dict_int (v1.0)
@@ -1506,7 +1531,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'btree_gist') == -1
   syn keyword sqlType contained gbtreekey16 gbtreekey32 gbtreekey4
   syn keyword sqlType contained gbtreekey8 gbtreekey_var
 endif " btree_gist
-" Extension: pageinspect (v1.7)
+" Extension: pageinspect (v1.8)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pageinspect') == -1
   syn keyword sqlFunction contained brin_metapage_info brin_page_items
   syn keyword sqlFunction contained brin_page_type brin_revmap_data bt_metap
@@ -1515,8 +1540,8 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'pageinspect') == -1
   syn keyword sqlFunction contained gin_metapage_info gin_page_opaque_info hash_bitmap_info
   syn keyword sqlFunction contained hash_metapage_info hash_page_items
   syn keyword sqlFunction contained hash_page_stats hash_page_type heap_page_item_attrs
-  syn keyword sqlFunction contained heap_page_items page_checksum page_header
-  syn keyword sqlFunction contained tuple_data_split
+  syn keyword sqlFunction contained heap_page_items heap_tuple_infomask_flags
+  syn keyword sqlFunction contained page_checksum page_header tuple_data_split
 endif " pageinspect
 " Extension: pltclu (v1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pltclu') == -1
@@ -1634,6 +1659,10 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'citext') == -1
   syn keyword sqlFunction contained texticregexne translate
   syn keyword sqlType contained citext
 endif " citext
+" Extension: bool_plperl (v1.0)
+if index(get(g:, 'pgsql_disabled_extensions', []), 'bool_plperl') == -1
+  syn keyword sqlFunction contained bool_to_plperl plperl_to_bool
+endif " bool_plperl
 " Extension: plpgsql (v1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'plpgsql') == -1
   syn keyword sqlFunction contained plpgsql_call_handler plpgsql_inline_handler
@@ -1717,37 +1746,38 @@ syn keyword sqlCatalog contained pg_file_settings pg_foreign_data_wrapper pg_for
 syn keyword sqlCatalog contained pg_foreign_table pg_group pg_hba_file_rules pg_index pg_indexes pg_inherits
 syn keyword sqlCatalog contained pg_init_privs pg_language pg_largeobject
 syn keyword sqlCatalog contained pg_largeobject_metadata pg_locks pg_matviews pg_namespace pg_opclass pg_operator
-syn keyword sqlCatalog contained pg_opfamily pg_partitioned_table pg_pltemplate pg_policies pg_policy
+syn keyword sqlCatalog contained pg_opfamily pg_partitioned_table pg_policies pg_policy
 syn keyword sqlCatalog contained pg_prepared_statements pg_prepared_xacts pg_proc pg_publication
-syn keyword sqlCatalog contained pg_publication_rel pg_publication_tables pg_range
-syn keyword sqlCatalog contained pg_replication_origin pg_replication_origin_status pg_replication_slots
-syn keyword sqlCatalog contained pg_rewrite pg_roles pg_rules pg_seclabel pg_seclabels pg_sequence
-syn keyword sqlCatalog contained pg_sequences pg_settings pg_shadow pg_shdepend pg_shdescription
-syn keyword sqlCatalog contained pg_shseclabel pg_stat_activity pg_stat_all_indexes
-syn keyword sqlCatalog contained pg_stat_all_tables pg_stat_archiver pg_stat_bgwriter pg_stat_database
-syn keyword sqlCatalog contained pg_stat_database_conflicts pg_stat_gssapi pg_stat_progress_cluster
+syn keyword sqlCatalog contained pg_publication_rel pg_publication_tables pg_range pg_replication_origin
+syn keyword sqlCatalog contained pg_replication_origin_status pg_replication_slots pg_rewrite
+syn keyword sqlCatalog contained pg_roles pg_rules pg_seclabel pg_seclabels pg_sequence pg_sequences
+syn keyword sqlCatalog contained pg_settings pg_shadow pg_shdepend pg_shdescription
+syn keyword sqlCatalog contained pg_shmem_allocations pg_shseclabel pg_stat_activity pg_stat_all_indexes
+syn keyword sqlCatalog contained pg_stat_all_tables pg_stat_archiver pg_stat_bgwriter
+syn keyword sqlCatalog contained pg_stat_database pg_stat_database_conflicts pg_stat_gssapi
+syn keyword sqlCatalog contained pg_stat_progress_analyze pg_stat_progress_basebackup pg_stat_progress_cluster
 syn keyword sqlCatalog contained pg_stat_progress_create_index pg_stat_progress_vacuum
-syn keyword sqlCatalog contained pg_stat_replication pg_stat_ssl pg_stat_subscription
+syn keyword sqlCatalog contained pg_stat_replication pg_stat_slru pg_stat_ssl pg_stat_subscription
 syn keyword sqlCatalog contained pg_stat_sys_indexes pg_stat_sys_tables pg_stat_user_functions
 syn keyword sqlCatalog contained pg_stat_user_indexes pg_stat_user_tables pg_stat_wal_receiver
-syn keyword sqlCatalog contained pg_stat_xact_all_tables pg_stat_xact_sys_tables pg_stat_xact_user_functions
-syn keyword sqlCatalog contained pg_stat_xact_user_tables pg_statio_all_indexes
+syn keyword sqlCatalog contained pg_stat_xact_all_tables pg_stat_xact_sys_tables
+syn keyword sqlCatalog contained pg_stat_xact_user_functions pg_stat_xact_user_tables pg_statio_all_indexes
 syn keyword sqlCatalog contained pg_statio_all_sequences pg_statio_all_tables pg_statio_sys_indexes
-syn keyword sqlCatalog contained pg_statio_sys_sequences pg_statio_sys_tables pg_statio_user_indexes
-syn keyword sqlCatalog contained pg_statio_user_sequences pg_statio_user_tables pg_statistic
-syn keyword sqlCatalog contained pg_statistic_ext pg_statistic_ext_data pg_stats pg_stats_ext
-syn keyword sqlCatalog contained pg_subscription pg_subscription_rel pg_tables pg_tablespace
-syn keyword sqlCatalog contained pg_timezone_abbrevs pg_timezone_names pg_transform pg_trigger pg_ts_config
-syn keyword sqlCatalog contained pg_ts_config_map pg_ts_dict pg_ts_parser pg_ts_template pg_type
-syn keyword sqlCatalog contained pg_user pg_user_mapping pg_user_mappings pg_views
+syn keyword sqlCatalog contained pg_statio_sys_sequences pg_statio_sys_tables
+syn keyword sqlCatalog contained pg_statio_user_indexes pg_statio_user_sequences pg_statio_user_tables
+syn keyword sqlCatalog contained pg_statistic pg_statistic_ext pg_statistic_ext_data pg_stats
+syn keyword sqlCatalog contained pg_stats_ext pg_subscription pg_subscription_rel pg_tables pg_tablespace
+syn keyword sqlCatalog contained pg_timezone_abbrevs pg_timezone_names pg_transform pg_trigger
+syn keyword sqlCatalog contained pg_ts_config pg_ts_config_map pg_ts_dict pg_ts_parser
+syn keyword sqlCatalog contained pg_ts_template pg_type pg_user pg_user_mapping pg_user_mappings pg_views
 syn keyword sqlCatalog contained referential_constraints role_column_grants role_routine_grants
-syn keyword sqlCatalog contained role_table_grants role_udt_grants role_usage_grants routine_privileges
-syn keyword sqlCatalog contained routines schemata sequences sql_features sql_implementation_info
-syn keyword sqlCatalog contained sql_languages sql_packages sql_parts sql_sizing sql_sizing_profiles
-syn keyword sqlCatalog contained table_constraints table_privileges tables transforms
-syn keyword sqlCatalog contained triggered_update_columns triggers udt_privileges usage_privileges
-syn keyword sqlCatalog contained user_defined_types user_mapping_options user_mappings
-syn keyword sqlCatalog contained view_column_usage view_routine_usage view_table_usage views
+syn keyword sqlCatalog contained role_table_grants role_udt_grants role_usage_grants
+syn keyword sqlCatalog contained routine_privileges routines schemata sequences sql_features
+syn keyword sqlCatalog contained sql_implementation_info sql_parts sql_sizing table_constraints table_privileges
+syn keyword sqlCatalog contained tables transforms triggered_update_columns triggers
+syn keyword sqlCatalog contained udt_privileges usage_privileges user_defined_types user_mapping_options
+syn keyword sqlCatalog contained user_mappings view_column_usage view_routine_usage
+syn keyword sqlCatalog contained view_table_usage views
 " Error codes (Appendix A, Table A-1)
 syn keyword sqlErrorCode contained active_sql_transaction admin_shutdown ambiguous_alias
 syn keyword sqlErrorCode contained ambiguous_column ambiguous_function ambiguous_parameter
diff --git a/syntax/qml.vim b/syntax/qml.vim
index 12db8ee41..4c367f1f5 100644
--- a/syntax/qml.vim
+++ b/syntax/qml.vim
@@ -2,7 +2,6 @@ if has_key(g:polyglot_is_disabled, 'qml')
   finish
 endif
 
-
 " Vim syntax file
 " Language:     QML
 " Maintainer:   Peter Hoeg <peter@hoeg.com>
@@ -56,17 +55,1019 @@ syn keyword qmlRepeat            while for do in
 syn keyword qmlBranch            break continue
 syn keyword qmlOperator          new delete instanceof typeof
 syn keyword qmlJsType            Array Boolean Date Function Number Object String RegExp
-syn keyword qmlType              action alias bool color date double enumeration font int list point real rect size string time url variant vector2d vector3d vector4d
+syn keyword qmlType              action alias bool color date double enumeration font int list point real rect size string time url variant vector2d vector3d vector4d coordinate geocircle geopath geopolygon georectangle geoshape matrix4x4 palette quaternion
 syn keyword qmlStatement         return with
 syn keyword qmlBoolean           true false
 syn keyword qmlNull              null undefined
-syn keyword qmlIdentifier        arguments this var let
+syn keyword qmlIdentifier        arguments this var let const
 syn keyword qmlLabel             case default
 syn keyword qmlException         try catch finally throw
 syn keyword qmlMessage           alert confirm prompt status
 syn keyword qmlGlobal            self
 syn keyword qmlDeclaration       property signal component readonly required
-syn keyword qmlReserved          abstract boolean byte char class const debugger enum export extends final float goto implements import interface long native package pragma private protected public short static super synchronized throws transient volatile
+syn keyword qmlReserved          abstract boolean byte char class debugger enum export extends final float goto implements import interface long native package pragma private protected public short static super synchronized throws transient volatile
+
+syn case match
+
+" List extracted in alphabatical order from: https://doc.qt.io/qt-5/qmltypes.html
+" Qt v5.15.1
+
+" Begin Literal Types {{{
+
+syntax keyword qmlObjectLiteralType Abstract3DSeries
+syntax keyword qmlObjectLiteralType AbstractActionInput
+syntax keyword qmlObjectLiteralType AbstractAnimation
+syntax keyword qmlObjectLiteralType AbstractAxis
+syntax keyword qmlObjectLiteralType AbstractAxis3D
+syntax keyword qmlObjectLiteralType AbstractAxisInput
+syntax keyword qmlObjectLiteralType AbstractBarSeries
+syntax keyword qmlObjectLiteralType AbstractButton
+syntax keyword qmlObjectLiteralType AbstractClipAnimator
+syntax keyword qmlObjectLiteralType AbstractClipBlendNode
+syntax keyword qmlObjectLiteralType AbstractDataProxy
+syntax keyword qmlObjectLiteralType AbstractGraph3D
+syntax keyword qmlObjectLiteralType AbstractInputHandler3D
+syntax keyword qmlObjectLiteralType AbstractPhysicalDevice
+syntax keyword qmlObjectLiteralType AbstractRayCaster
+syntax keyword qmlObjectLiteralType AbstractSeries
+syntax keyword qmlObjectLiteralType AbstractSkeleton
+syntax keyword qmlObjectLiteralType AbstractTexture
+syntax keyword qmlObjectLiteralType AbstractTextureImage
+syntax keyword qmlObjectLiteralType Accelerometer
+syntax keyword qmlObjectLiteralType AccelerometerReading
+syntax keyword qmlObjectLiteralType Accessible
+syntax keyword qmlObjectLiteralType Action
+syntax keyword qmlObjectLiteralType ActionGroup
+syntax keyword qmlObjectLiteralType ActionInput
+syntax keyword qmlObjectLiteralType AdditiveClipBlend
+syntax keyword qmlObjectLiteralType AdditiveColorGradient
+syntax keyword qmlObjectLiteralType Address
+syntax keyword qmlObjectLiteralType Affector
+syntax keyword qmlObjectLiteralType Age
+syntax keyword qmlObjectLiteralType AlphaCoverage
+syntax keyword qmlObjectLiteralType AlphaTest
+syntax keyword qmlObjectLiteralType Altimeter
+syntax keyword qmlObjectLiteralType AltimeterReading
+syntax keyword qmlObjectLiteralType AluminumAnodizedEmissiveMaterial
+syntax keyword qmlObjectLiteralType AluminumAnodizedMaterial
+syntax keyword qmlObjectLiteralType AluminumBrushedMaterial
+syntax keyword qmlObjectLiteralType AluminumEmissiveMaterial
+syntax keyword qmlObjectLiteralType AluminumMaterial
+syntax keyword qmlObjectLiteralType AmbientLightReading
+syntax keyword qmlObjectLiteralType AmbientLightSensor
+syntax keyword qmlObjectLiteralType AmbientTemperatureReading
+syntax keyword qmlObjectLiteralType AmbientTemperatureSensor
+syntax keyword qmlObjectLiteralType AnalogAxisInput
+syntax keyword qmlObjectLiteralType AnchorAnimation
+syntax keyword qmlObjectLiteralType AnchorChanges
+syntax keyword qmlObjectLiteralType AngleDirection
+syntax keyword qmlObjectLiteralType AnimatedImage
+syntax keyword qmlObjectLiteralType AnimatedSprite
+syntax keyword qmlObjectLiteralType Animation
+syntax keyword qmlObjectLiteralType AnimationController
+syntax keyword qmlObjectLiteralType AnimationGroup
+syntax keyword qmlObjectLiteralType Animator
+syntax keyword qmlObjectLiteralType ApplicationWindow
+syntax keyword qmlObjectLiteralType ApplicationWindowStyle
+syntax keyword qmlObjectLiteralType AreaLight
+syntax keyword qmlObjectLiteralType AreaSeries
+syntax keyword qmlObjectLiteralType Armature
+syntax keyword qmlObjectLiteralType AttenuationModelInverse
+syntax keyword qmlObjectLiteralType AttenuationModelLinear
+syntax keyword qmlObjectLiteralType Attractor
+syntax keyword qmlObjectLiteralType Attribute
+syntax keyword qmlObjectLiteralType Audio
+syntax keyword qmlObjectLiteralType AudioCategory
+syntax keyword qmlObjectLiteralType AudioEngine
+syntax keyword qmlObjectLiteralType AudioListener
+syntax keyword qmlObjectLiteralType AudioSample
+syntax keyword qmlObjectLiteralType AuthenticationDialogRequest
+syntax keyword qmlObjectLiteralType Axis
+syntax keyword qmlObjectLiteralType AxisAccumulator
+syntax keyword qmlObjectLiteralType AxisHelper
+syntax keyword qmlObjectLiteralType AxisSetting
+
+syntax keyword qmlObjectLiteralType BackspaceKey
+syntax keyword qmlObjectLiteralType Bar3DSeries
+syntax keyword qmlObjectLiteralType BarCategoryAxis
+syntax keyword qmlObjectLiteralType BarDataProxy
+syntax keyword qmlObjectLiteralType Bars3D
+syntax keyword qmlObjectLiteralType BarSeries
+syntax keyword qmlObjectLiteralType BarSet
+syntax keyword qmlObjectLiteralType BaseKey
+syntax keyword qmlObjectLiteralType BasicTableView
+syntax keyword qmlObjectLiteralType Behavior
+syntax keyword qmlObjectLiteralType Binding
+syntax keyword qmlObjectLiteralType Blend
+syntax keyword qmlObjectLiteralType BlendedClipAnimator
+syntax keyword qmlObjectLiteralType BlendEquation
+syntax keyword qmlObjectLiteralType BlendEquationArguments
+syntax keyword qmlObjectLiteralType Blending
+syntax keyword qmlObjectLiteralType BlitFramebuffer
+syntax keyword qmlObjectLiteralType BluetoothDiscoveryModel
+syntax keyword qmlObjectLiteralType BluetoothService
+syntax keyword qmlObjectLiteralType BluetoothSocket
+syntax keyword qmlObjectLiteralType Blur
+syntax keyword qmlObjectLiteralType bool
+syntax keyword qmlObjectLiteralType BorderImage
+syntax keyword qmlObjectLiteralType BorderImageMesh
+syntax keyword qmlObjectLiteralType BoundaryRule
+syntax keyword qmlObjectLiteralType Bounds
+syntax keyword qmlObjectLiteralType BoxPlotSeries
+syntax keyword qmlObjectLiteralType BoxSet
+syntax keyword qmlObjectLiteralType BrightnessContrast
+syntax keyword qmlObjectLiteralType BrushStrokes
+syntax keyword qmlObjectLiteralType Buffer
+syntax keyword qmlObjectLiteralType BufferBlit
+syntax keyword qmlObjectLiteralType BufferCapture
+syntax keyword qmlObjectLiteralType BufferInput
+syntax keyword qmlObjectLiteralType BusyIndicator
+syntax keyword qmlObjectLiteralType BusyIndicatorStyle
+syntax keyword qmlObjectLiteralType Button
+syntax keyword qmlObjectLiteralType ButtonAxisInput
+syntax keyword qmlObjectLiteralType ButtonGroup
+syntax keyword qmlObjectLiteralType ButtonStyle
+
+syntax keyword qmlObjectLiteralType Calendar
+syntax keyword qmlObjectLiteralType CalendarModel
+syntax keyword qmlObjectLiteralType CalendarStyle
+syntax keyword qmlObjectLiteralType Camera
+syntax keyword qmlObjectLiteralType Camera3D
+syntax keyword qmlObjectLiteralType CameraCapabilities
+syntax keyword qmlObjectLiteralType CameraCapture
+syntax keyword qmlObjectLiteralType CameraExposure
+syntax keyword qmlObjectLiteralType CameraFlash
+syntax keyword qmlObjectLiteralType CameraFocus
+syntax keyword qmlObjectLiteralType CameraImageProcessing
+syntax keyword qmlObjectLiteralType CameraLens
+syntax keyword qmlObjectLiteralType CameraRecorder
+syntax keyword qmlObjectLiteralType CameraSelector
+syntax keyword qmlObjectLiteralType CandlestickSeries
+syntax keyword qmlObjectLiteralType CandlestickSet
+syntax keyword qmlObjectLiteralType Canvas
+syntax keyword qmlObjectLiteralType CanvasGradient
+syntax keyword qmlObjectLiteralType CanvasImageData
+syntax keyword qmlObjectLiteralType CanvasPixelArray
+syntax keyword qmlObjectLiteralType Category
+syntax keyword qmlObjectLiteralType CategoryAxis
+syntax keyword qmlObjectLiteralType CategoryAxis3D
+syntax keyword qmlObjectLiteralType CategoryModel
+syntax keyword qmlObjectLiteralType CategoryRange
+syntax keyword qmlObjectLiteralType ChangeLanguageKey
+syntax keyword qmlObjectLiteralType ChartView
+syntax keyword qmlObjectLiteralType CheckBox
+syntax keyword qmlObjectLiteralType CheckBoxStyle
+syntax keyword qmlObjectLiteralType CheckDelegate
+syntax keyword qmlObjectLiteralType ChromaticAberration
+syntax keyword qmlObjectLiteralType CircularGauge
+syntax keyword qmlObjectLiteralType CircularGaugeStyle
+syntax keyword qmlObjectLiteralType ClearBuffers
+syntax keyword qmlObjectLiteralType ClipAnimator
+syntax keyword qmlObjectLiteralType ClipBlendValue
+syntax keyword qmlObjectLiteralType ClipPlane
+syntax keyword qmlObjectLiteralType CloseEvent
+syntax keyword qmlObjectLiteralType color
+syntax keyword qmlObjectLiteralType ColorAnimation
+syntax keyword qmlObjectLiteralType ColorDialog
+syntax keyword qmlObjectLiteralType ColorDialogRequest
+syntax keyword qmlObjectLiteralType ColorGradient
+syntax keyword qmlObjectLiteralType ColorGradientStop
+syntax keyword qmlObjectLiteralType Colorize
+syntax keyword qmlObjectLiteralType ColorMask
+syntax keyword qmlObjectLiteralType ColorMaster
+syntax keyword qmlObjectLiteralType ColorOverlay
+syntax keyword qmlObjectLiteralType Column
+syntax keyword qmlObjectLiteralType ColumnLayout
+syntax keyword qmlObjectLiteralType ComboBox
+syntax keyword qmlObjectLiteralType ComboBoxStyle
+syntax keyword qmlObjectLiteralType Command
+syntax keyword qmlObjectLiteralType Compass
+syntax keyword qmlObjectLiteralType CompassReading
+syntax keyword qmlObjectLiteralType Component
+syntax keyword qmlObjectLiteralType Component3D
+syntax keyword qmlObjectLiteralType ComputeCommand
+syntax keyword qmlObjectLiteralType ConeGeometry
+syntax keyword qmlObjectLiteralType ConeMesh
+syntax keyword qmlObjectLiteralType ConicalGradient
+syntax keyword qmlObjectLiteralType Connections
+syntax keyword qmlObjectLiteralType ContactDetail
+syntax keyword qmlObjectLiteralType ContactDetails
+syntax keyword qmlObjectLiteralType Container
+syntax keyword qmlObjectLiteralType Context2D
+syntax keyword qmlObjectLiteralType ContextMenuRequest
+syntax keyword qmlObjectLiteralType Control
+syntax keyword qmlObjectLiteralType coordinate
+syntax keyword qmlObjectLiteralType CoordinateAnimation
+syntax keyword qmlObjectLiteralType CopperMaterial
+syntax keyword qmlObjectLiteralType CuboidGeometry
+syntax keyword qmlObjectLiteralType CuboidMesh
+syntax keyword qmlObjectLiteralType CullFace
+syntax keyword qmlObjectLiteralType CullMode
+syntax keyword qmlObjectLiteralType CumulativeDirection
+syntax keyword qmlObjectLiteralType Custom3DItem
+syntax keyword qmlObjectLiteralType Custom3DLabel
+syntax keyword qmlObjectLiteralType Custom3DVolume
+syntax keyword qmlObjectLiteralType CustomCamera
+syntax keyword qmlObjectLiteralType CustomMaterial
+syntax keyword qmlObjectLiteralType CustomParticle
+syntax keyword qmlObjectLiteralType CylinderGeometry
+syntax keyword qmlObjectLiteralType CylinderMesh
+
+syntax keyword qmlObjectLiteralType Date
+syntax keyword qmlObjectLiteralType date
+syntax keyword qmlObjectLiteralType DateTimeAxis
+syntax keyword qmlObjectLiteralType DayOfWeekRow
+syntax keyword qmlObjectLiteralType DebugView
+syntax keyword qmlObjectLiteralType DefaultMaterial
+syntax keyword qmlObjectLiteralType DelayButton
+syntax keyword qmlObjectLiteralType DelayButtonStyle
+syntax keyword qmlObjectLiteralType DelegateChoice
+syntax keyword qmlObjectLiteralType DelegateChooser
+syntax keyword qmlObjectLiteralType DelegateModel
+syntax keyword qmlObjectLiteralType DelegateModelGroup
+syntax keyword qmlObjectLiteralType DepthInput
+syntax keyword qmlObjectLiteralType DepthOfFieldHQBlur
+syntax keyword qmlObjectLiteralType DepthRange
+syntax keyword qmlObjectLiteralType DepthTest
+syntax keyword qmlObjectLiteralType Desaturate
+syntax keyword qmlObjectLiteralType Dial
+syntax keyword qmlObjectLiteralType Dialog
+syntax keyword qmlObjectLiteralType DialogButtonBox
+syntax keyword qmlObjectLiteralType DialStyle
+syntax keyword qmlObjectLiteralType DiffuseMapMaterial
+syntax keyword qmlObjectLiteralType DiffuseSpecularMapMaterial
+syntax keyword qmlObjectLiteralType DiffuseSpecularMaterial
+syntax keyword qmlObjectLiteralType Direction
+syntax keyword qmlObjectLiteralType DirectionalBlur
+syntax keyword qmlObjectLiteralType DirectionalLight
+syntax keyword qmlObjectLiteralType DispatchCompute
+syntax keyword qmlObjectLiteralType Displace
+syntax keyword qmlObjectLiteralType DistanceReading
+syntax keyword qmlObjectLiteralType DistanceSensor
+syntax keyword qmlObjectLiteralType DistortionRipple
+syntax keyword qmlObjectLiteralType DistortionSphere
+syntax keyword qmlObjectLiteralType DistortionSpiral
+syntax keyword qmlObjectLiteralType Dithering
+syntax keyword qmlObjectLiteralType double
+syntax keyword qmlObjectLiteralType DoubleValidator
+syntax keyword qmlObjectLiteralType Drag
+syntax keyword qmlObjectLiteralType DragEvent
+syntax keyword qmlObjectLiteralType DragHandler
+syntax keyword qmlObjectLiteralType Drawer
+syntax keyword qmlObjectLiteralType DropArea
+syntax keyword qmlObjectLiteralType DropShadow
+syntax keyword qmlObjectLiteralType DwmFeatures
+syntax keyword qmlObjectLiteralType DynamicParameter
+
+syntax keyword qmlObjectLiteralType EdgeDetect
+syntax keyword qmlObjectLiteralType EditorialModel
+syntax keyword qmlObjectLiteralType Effect
+syntax keyword qmlObjectLiteralType EllipseShape
+syntax keyword qmlObjectLiteralType Emboss
+syntax keyword qmlObjectLiteralType Emitter
+syntax keyword qmlObjectLiteralType EnterKey
+syntax keyword qmlObjectLiteralType EnterKeyAction
+syntax keyword qmlObjectLiteralType Entity
+syntax keyword qmlObjectLiteralType EntityLoader
+syntax keyword qmlObjectLiteralType enumeration
+syntax keyword qmlObjectLiteralType EnvironmentLight
+syntax keyword qmlObjectLiteralType EventConnection
+syntax keyword qmlObjectLiteralType EventPoint
+syntax keyword qmlObjectLiteralType EventTouchPoint
+syntax keyword qmlObjectLiteralType ExclusiveGroup
+syntax keyword qmlObjectLiteralType ExtendedAttributes
+syntax keyword qmlObjectLiteralType ExtrudedTextGeometry
+syntax keyword qmlObjectLiteralType ExtrudedTextMesh
+
+syntax keyword qmlObjectLiteralType FastBlur
+syntax keyword qmlObjectLiteralType FileDialog
+syntax keyword qmlObjectLiteralType FileDialogRequest
+syntax keyword qmlObjectLiteralType FillerKey
+syntax keyword qmlObjectLiteralType FilterKey
+syntax keyword qmlObjectLiteralType FinalState
+syntax keyword qmlObjectLiteralType FindTextResult
+syntax keyword qmlObjectLiteralType FirstPersonCameraController
+syntax keyword qmlObjectLiteralType Flickable
+syntax keyword qmlObjectLiteralType Flip
+syntax keyword qmlObjectLiteralType Flipable
+syntax keyword qmlObjectLiteralType Flow
+syntax keyword qmlObjectLiteralType FocusScope
+syntax keyword qmlObjectLiteralType FolderDialog
+syntax keyword qmlObjectLiteralType FolderListModel
+syntax keyword qmlObjectLiteralType font
+syntax keyword qmlObjectLiteralType FontDialog
+syntax keyword qmlObjectLiteralType FontLoader
+syntax keyword qmlObjectLiteralType FontMetrics
+syntax keyword qmlObjectLiteralType FormValidationMessageRequest
+syntax keyword qmlObjectLiteralType ForwardRenderer
+syntax keyword qmlObjectLiteralType Frame
+syntax keyword qmlObjectLiteralType FrameAction
+syntax keyword qmlObjectLiteralType FrameGraphNode
+syntax keyword qmlObjectLiteralType Friction
+syntax keyword qmlObjectLiteralType FrontFace
+syntax keyword qmlObjectLiteralType FrostedGlassMaterial
+syntax keyword qmlObjectLiteralType FrostedGlassSinglePassMaterial
+syntax keyword qmlObjectLiteralType FrustumCamera
+syntax keyword qmlObjectLiteralType FrustumCulling
+syntax keyword qmlObjectLiteralType FullScreenRequest
+syntax keyword qmlObjectLiteralType Fxaa
+
+syntax keyword qmlObjectLiteralType Gamepad
+syntax keyword qmlObjectLiteralType GamepadManager
+syntax keyword qmlObjectLiteralType GammaAdjust
+syntax keyword qmlObjectLiteralType Gauge
+syntax keyword qmlObjectLiteralType GaugeStyle
+syntax keyword qmlObjectLiteralType GaussianBlur
+syntax keyword qmlObjectLiteralType geocircle
+syntax keyword qmlObjectLiteralType GeocodeModel
+syntax keyword qmlObjectLiteralType Geometry
+syntax keyword qmlObjectLiteralType GeometryRenderer
+syntax keyword qmlObjectLiteralType geopath
+syntax keyword qmlObjectLiteralType geopolygon
+syntax keyword qmlObjectLiteralType georectangle
+syntax keyword qmlObjectLiteralType geoshape
+syntax keyword qmlObjectLiteralType GestureEvent
+syntax keyword qmlObjectLiteralType GlassMaterial
+syntax keyword qmlObjectLiteralType GlassRefractiveMaterial
+syntax keyword qmlObjectLiteralType Glow
+syntax keyword qmlObjectLiteralType GoochMaterial
+syntax keyword qmlObjectLiteralType Gradient
+syntax keyword qmlObjectLiteralType GradientStop
+syntax keyword qmlObjectLiteralType GraphicsApiFilter
+syntax keyword qmlObjectLiteralType GraphicsInfo
+syntax keyword qmlObjectLiteralType Gravity
+syntax keyword qmlObjectLiteralType Grid
+syntax keyword qmlObjectLiteralType GridGeometry
+syntax keyword qmlObjectLiteralType GridLayout
+syntax keyword qmlObjectLiteralType GridMesh
+syntax keyword qmlObjectLiteralType GridView
+syntax keyword qmlObjectLiteralType GroupBox
+syntax keyword qmlObjectLiteralType GroupGoal
+syntax keyword qmlObjectLiteralType Gyroscope
+syntax keyword qmlObjectLiteralType GyroscopeReading
+
+syntax keyword qmlObjectLiteralType HandlerPoint
+syntax keyword qmlObjectLiteralType HandwritingInputPanel
+syntax keyword qmlObjectLiteralType HandwritingModeKey
+syntax keyword qmlObjectLiteralType HBarModelMapper
+syntax keyword qmlObjectLiteralType HBoxPlotModelMapper
+syntax keyword qmlObjectLiteralType HCandlestickModelMapper
+syntax keyword qmlObjectLiteralType HDRBloomTonemap
+syntax keyword qmlObjectLiteralType HeightMapSurfaceDataProxy
+syntax keyword qmlObjectLiteralType HideKeyboardKey
+syntax keyword qmlObjectLiteralType HistoryState
+syntax keyword qmlObjectLiteralType HolsterReading
+syntax keyword qmlObjectLiteralType HolsterSensor
+syntax keyword qmlObjectLiteralType HorizontalBarSeries
+syntax keyword qmlObjectLiteralType HorizontalHeaderView
+syntax keyword qmlObjectLiteralType HorizontalPercentBarSeries
+syntax keyword qmlObjectLiteralType HorizontalStackedBarSeries
+syntax keyword qmlObjectLiteralType Host
+syntax keyword qmlObjectLiteralType HoverHandler
+syntax keyword qmlObjectLiteralType HPieModelMapper
+syntax keyword qmlObjectLiteralType HueSaturation
+syntax keyword qmlObjectLiteralType HumidityReading
+syntax keyword qmlObjectLiteralType HumiditySensor
+syntax keyword qmlObjectLiteralType HXYModelMapper
+
+syntax keyword qmlObjectLiteralType Icon
+syntax keyword qmlObjectLiteralType IdleInhibitManagerV1
+syntax keyword qmlObjectLiteralType Image
+syntax keyword qmlObjectLiteralType ImageModel
+syntax keyword qmlObjectLiteralType ImageParticle
+syntax keyword qmlObjectLiteralType InnerShadow
+syntax keyword qmlObjectLiteralType InputChord
+syntax keyword qmlObjectLiteralType InputContext
+syntax keyword qmlObjectLiteralType InputEngine
+syntax keyword qmlObjectLiteralType InputHandler3D
+syntax keyword qmlObjectLiteralType InputMethod
+syntax keyword qmlObjectLiteralType InputModeKey
+syntax keyword qmlObjectLiteralType InputPanel
+syntax keyword qmlObjectLiteralType InputSequence
+syntax keyword qmlObjectLiteralType InputSettings
+syntax keyword qmlObjectLiteralType Instantiator
+syntax keyword qmlObjectLiteralType int
+syntax keyword qmlObjectLiteralType IntValidator
+syntax keyword qmlObjectLiteralType InvokedServices
+syntax keyword qmlObjectLiteralType IRProximityReading
+syntax keyword qmlObjectLiteralType IRProximitySensor
+syntax keyword qmlObjectLiteralType Item
+syntax keyword qmlObjectLiteralType ItemDelegate
+syntax keyword qmlObjectLiteralType ItemGrabResult
+syntax keyword qmlObjectLiteralType ItemModelBarDataProxy
+syntax keyword qmlObjectLiteralType ItemModelScatterDataProxy
+syntax keyword qmlObjectLiteralType ItemModelSurfaceDataProxy
+syntax keyword qmlObjectLiteralType ItemParticle
+syntax keyword qmlObjectLiteralType ItemSelectionModel
+syntax keyword qmlObjectLiteralType IviApplication
+syntax keyword qmlObjectLiteralType IviSurface
+
+syntax keyword qmlObjectLiteralType JavaScriptDialogRequest
+syntax keyword qmlObjectLiteralType Joint
+syntax keyword qmlObjectLiteralType JumpList
+syntax keyword qmlObjectLiteralType JumpListCategory
+syntax keyword qmlObjectLiteralType JumpListDestination
+syntax keyword qmlObjectLiteralType JumpListLink
+syntax keyword qmlObjectLiteralType JumpListSeparator
+
+syntax keyword qmlObjectLiteralType Key
+syntax keyword qmlObjectLiteralType KeyboardColumn
+syntax keyword qmlObjectLiteralType KeyboardDevice
+syntax keyword qmlObjectLiteralType KeyboardHandler
+syntax keyword qmlObjectLiteralType KeyboardLayout
+syntax keyword qmlObjectLiteralType KeyboardLayoutLoader
+syntax keyword qmlObjectLiteralType KeyboardRow
+syntax keyword qmlObjectLiteralType KeyboardStyle
+syntax keyword qmlObjectLiteralType KeyEvent
+syntax keyword qmlObjectLiteralType Keyframe
+syntax keyword qmlObjectLiteralType KeyframeAnimation
+syntax keyword qmlObjectLiteralType KeyframeGroup
+syntax keyword qmlObjectLiteralType KeyIcon
+syntax keyword qmlObjectLiteralType KeyNavigation
+syntax keyword qmlObjectLiteralType KeyPanel
+syntax keyword qmlObjectLiteralType Keys
+
+syntax keyword qmlObjectLiteralType Label
+syntax keyword qmlObjectLiteralType Layer
+syntax keyword qmlObjectLiteralType LayerFilter
+syntax keyword qmlObjectLiteralType Layout
+syntax keyword qmlObjectLiteralType LayoutMirroring
+syntax keyword qmlObjectLiteralType Legend
+syntax keyword qmlObjectLiteralType LerpClipBlend
+syntax keyword qmlObjectLiteralType LevelAdjust
+syntax keyword qmlObjectLiteralType LevelOfDetail
+syntax keyword qmlObjectLiteralType LevelOfDetailBoundingSphere
+syntax keyword qmlObjectLiteralType LevelOfDetailLoader
+syntax keyword qmlObjectLiteralType LevelOfDetailSwitch
+syntax keyword qmlObjectLiteralType LidReading
+syntax keyword qmlObjectLiteralType LidSensor
+syntax keyword qmlObjectLiteralType Light
+syntax keyword qmlObjectLiteralType Light3D
+syntax keyword qmlObjectLiteralType LightReading
+syntax keyword qmlObjectLiteralType LightSensor
+syntax keyword qmlObjectLiteralType LinearGradient
+syntax keyword qmlObjectLiteralType LineSeries
+syntax keyword qmlObjectLiteralType LineShape
+syntax keyword qmlObjectLiteralType LineWidth
+syntax keyword qmlObjectLiteralType list
+syntax keyword qmlObjectLiteralType ListElement
+syntax keyword qmlObjectLiteralType ListModel
+syntax keyword qmlObjectLiteralType ListView
+syntax keyword qmlObjectLiteralType Loader
+syntax keyword qmlObjectLiteralType Loader3D
+syntax keyword qmlObjectLiteralType Locale
+syntax keyword qmlObjectLiteralType Location
+syntax keyword qmlObjectLiteralType LoggingCategory
+syntax keyword qmlObjectLiteralType LogicalDevice
+syntax keyword qmlObjectLiteralType LogValueAxis
+syntax keyword qmlObjectLiteralType LogValueAxis3DFormatter
+syntax keyword qmlObjectLiteralType LottieAnimation
+
+syntax keyword qmlObjectLiteralType Magnetometer
+syntax keyword qmlObjectLiteralType MagnetometerReading
+syntax keyword qmlObjectLiteralType Map
+syntax keyword qmlObjectLiteralType MapCircle
+syntax keyword qmlObjectLiteralType MapCircleObject
+syntax keyword qmlObjectLiteralType MapCopyrightNotice
+syntax keyword qmlObjectLiteralType MapGestureArea
+syntax keyword qmlObjectLiteralType MapIconObject
+syntax keyword qmlObjectLiteralType MapItemGroup
+syntax keyword qmlObjectLiteralType MapItemView
+syntax keyword qmlObjectLiteralType MapObjectView
+syntax keyword qmlObjectLiteralType MapParameter
+syntax keyword qmlObjectLiteralType MapPinchEvent
+syntax keyword qmlObjectLiteralType MapPolygon
+syntax keyword qmlObjectLiteralType MapPolygonObject
+syntax keyword qmlObjectLiteralType MapPolyline
+syntax keyword qmlObjectLiteralType MapPolylineObject
+syntax keyword qmlObjectLiteralType MapQuickItem
+syntax keyword qmlObjectLiteralType MapRectangle
+syntax keyword qmlObjectLiteralType MapRoute
+syntax keyword qmlObjectLiteralType MapRouteObject
+syntax keyword qmlObjectLiteralType MapType
+syntax keyword qmlObjectLiteralType Margins
+syntax keyword qmlObjectLiteralType MaskedBlur
+syntax keyword qmlObjectLiteralType MaskShape
+syntax keyword qmlObjectLiteralType Material
+syntax keyword qmlObjectLiteralType Matrix4x4
+syntax keyword qmlObjectLiteralType matrix4x4
+syntax keyword qmlObjectLiteralType MediaPlayer
+syntax keyword qmlObjectLiteralType mediaplayer-qml-dynamic
+syntax keyword qmlObjectLiteralType MemoryBarrier
+syntax keyword qmlObjectLiteralType Menu
+syntax keyword qmlObjectLiteralType MenuBar
+syntax keyword qmlObjectLiteralType MenuBarItem
+syntax keyword qmlObjectLiteralType MenuBarStyle
+syntax keyword qmlObjectLiteralType MenuItem
+syntax keyword qmlObjectLiteralType MenuItemGroup
+syntax keyword qmlObjectLiteralType MenuSeparator
+syntax keyword qmlObjectLiteralType MenuStyle
+syntax keyword qmlObjectLiteralType Mesh
+syntax keyword qmlObjectLiteralType MessageDialog
+syntax keyword qmlObjectLiteralType MetalRoughMaterial
+syntax keyword qmlObjectLiteralType ModeKey
+syntax keyword qmlObjectLiteralType Model
+syntax keyword qmlObjectLiteralType MonthGrid
+syntax keyword qmlObjectLiteralType MorphingAnimation
+syntax keyword qmlObjectLiteralType MorphTarget
+syntax keyword qmlObjectLiteralType MotionBlur
+syntax keyword qmlObjectLiteralType MouseArea
+syntax keyword qmlObjectLiteralType MouseDevice
+syntax keyword qmlObjectLiteralType MouseEvent
+syntax keyword qmlObjectLiteralType MouseHandler
+syntax keyword qmlObjectLiteralType MultiPointHandler
+syntax keyword qmlObjectLiteralType MultiPointTouchArea
+syntax keyword qmlObjectLiteralType MultiSampleAntiAliasing
+
+syntax keyword qmlObjectLiteralType Navigator
+syntax keyword qmlObjectLiteralType NdefFilter
+syntax keyword qmlObjectLiteralType NdefMimeRecord
+syntax keyword qmlObjectLiteralType NdefRecord
+syntax keyword qmlObjectLiteralType NdefTextRecord
+syntax keyword qmlObjectLiteralType NdefUriRecord
+syntax keyword qmlObjectLiteralType NearField
+syntax keyword qmlObjectLiteralType Node
+syntax keyword qmlObjectLiteralType NodeInstantiator
+syntax keyword qmlObjectLiteralType NoDepthMask
+syntax keyword qmlObjectLiteralType NoDraw
+syntax keyword qmlObjectLiteralType NoPicking
+syntax keyword qmlObjectLiteralType NormalDiffuseMapAlphaMaterial
+syntax keyword qmlObjectLiteralType NormalDiffuseMapMaterial
+syntax keyword qmlObjectLiteralType NormalDiffuseSpecularMapMaterial
+syntax keyword qmlObjectLiteralType Number
+syntax keyword qmlObjectLiteralType NumberAnimation
+syntax keyword qmlObjectLiteralType NumberKey
+
+syntax keyword qmlObjectLiteralType Object3D
+syntax keyword qmlObjectLiteralType ObjectModel
+syntax keyword qmlObjectLiteralType ObjectPicker
+syntax keyword qmlObjectLiteralType OpacityAnimator
+syntax keyword qmlObjectLiteralType OpacityMask
+syntax keyword qmlObjectLiteralType OpenGLInfo
+syntax keyword qmlObjectLiteralType OrbitCameraController
+syntax keyword qmlObjectLiteralType OrientationReading
+syntax keyword qmlObjectLiteralType OrientationSensor
+syntax keyword qmlObjectLiteralType OrthographicCamera
+syntax keyword qmlObjectLiteralType Overlay
+
+syntax keyword qmlObjectLiteralType Package
+syntax keyword qmlObjectLiteralType Page
+syntax keyword qmlObjectLiteralType PageIndicator
+syntax keyword qmlObjectLiteralType palette
+syntax keyword qmlObjectLiteralType Pane
+syntax keyword qmlObjectLiteralType PaperArtisticMaterial
+syntax keyword qmlObjectLiteralType PaperOfficeMaterial
+syntax keyword qmlObjectLiteralType ParallelAnimation
+syntax keyword qmlObjectLiteralType Parameter
+syntax keyword qmlObjectLiteralType ParentAnimation
+syntax keyword qmlObjectLiteralType ParentChange
+syntax keyword qmlObjectLiteralType Particle
+syntax keyword qmlObjectLiteralType ParticleExtruder
+syntax keyword qmlObjectLiteralType ParticleGroup
+syntax keyword qmlObjectLiteralType ParticlePainter
+syntax keyword qmlObjectLiteralType ParticleSystem
+syntax keyword qmlObjectLiteralType Pass
+syntax keyword qmlObjectLiteralType Path
+syntax keyword qmlObjectLiteralType PathAngleArc
+syntax keyword qmlObjectLiteralType PathAnimation
+syntax keyword qmlObjectLiteralType PathArc
+syntax keyword qmlObjectLiteralType PathAttribute
+syntax keyword qmlObjectLiteralType PathCubic
+syntax keyword qmlObjectLiteralType PathCurve
+syntax keyword qmlObjectLiteralType PathElement
+syntax keyword qmlObjectLiteralType PathInterpolator
+syntax keyword qmlObjectLiteralType PathLine
+syntax keyword qmlObjectLiteralType PathMove
+syntax keyword qmlObjectLiteralType PathMultiline
+syntax keyword qmlObjectLiteralType PathPercent
+syntax keyword qmlObjectLiteralType PathPolyline
+syntax keyword qmlObjectLiteralType PathQuad
+syntax keyword qmlObjectLiteralType PathSvg
+syntax keyword qmlObjectLiteralType PathText
+syntax keyword qmlObjectLiteralType PathView
+syntax keyword qmlObjectLiteralType PauseAnimation
+syntax keyword qmlObjectLiteralType PdfDocument
+syntax keyword qmlObjectLiteralType PdfLinkModel
+syntax keyword qmlObjectLiteralType PdfNavigationStack
+syntax keyword qmlObjectLiteralType PdfSearchModel
+syntax keyword qmlObjectLiteralType PdfSelection
+syntax keyword qmlObjectLiteralType PercentBarSeries
+syntax keyword qmlObjectLiteralType PerspectiveCamera
+syntax keyword qmlObjectLiteralType PerVertexColorMaterial
+syntax keyword qmlObjectLiteralType PhongAlphaMaterial
+syntax keyword qmlObjectLiteralType PhongMaterial
+syntax keyword qmlObjectLiteralType PickEvent
+syntax keyword qmlObjectLiteralType PickingSettings
+syntax keyword qmlObjectLiteralType PickLineEvent
+syntax keyword qmlObjectLiteralType PickPointEvent
+syntax keyword qmlObjectLiteralType PickResult
+syntax keyword qmlObjectLiteralType PickTriangleEvent
+syntax keyword qmlObjectLiteralType Picture
+syntax keyword qmlObjectLiteralType PieMenu
+syntax keyword qmlObjectLiteralType PieMenuStyle
+syntax keyword qmlObjectLiteralType PieSeries
+syntax keyword qmlObjectLiteralType PieSlice
+syntax keyword qmlObjectLiteralType PinchArea
+syntax keyword qmlObjectLiteralType PinchEvent
+syntax keyword qmlObjectLiteralType PinchHandler
+syntax keyword qmlObjectLiteralType Place
+syntax keyword qmlObjectLiteralType PlaceAttribute
+syntax keyword qmlObjectLiteralType PlaceSearchModel
+syntax keyword qmlObjectLiteralType PlaceSearchSuggestionModel
+syntax keyword qmlObjectLiteralType PlaneGeometry
+syntax keyword qmlObjectLiteralType PlaneMesh
+syntax keyword qmlObjectLiteralType PlasticStructuredRedEmissiveMaterial
+syntax keyword qmlObjectLiteralType PlasticStructuredRedMaterial
+syntax keyword qmlObjectLiteralType Playlist
+syntax keyword qmlObjectLiteralType PlaylistItem
+syntax keyword qmlObjectLiteralType PlayVariation
+syntax keyword qmlObjectLiteralType Plugin
+syntax keyword qmlObjectLiteralType PluginParameter
+syntax keyword qmlObjectLiteralType point
+syntax keyword qmlObjectLiteralType PointDirection
+syntax keyword qmlObjectLiteralType PointerDevice
+syntax keyword qmlObjectLiteralType PointerDeviceHandler
+syntax keyword qmlObjectLiteralType PointerEvent
+syntax keyword qmlObjectLiteralType PointerHandler
+syntax keyword qmlObjectLiteralType PointerScrollEvent
+syntax keyword qmlObjectLiteralType PointHandler
+syntax keyword qmlObjectLiteralType PointLight
+syntax keyword qmlObjectLiteralType PointSize
+syntax keyword qmlObjectLiteralType PolarChartView
+syntax keyword qmlObjectLiteralType PolygonOffset
+syntax keyword qmlObjectLiteralType Popup
+syntax keyword qmlObjectLiteralType Position
+syntax keyword qmlObjectLiteralType Positioner
+syntax keyword qmlObjectLiteralType PositionSource
+syntax keyword qmlObjectLiteralType PressureReading
+syntax keyword qmlObjectLiteralType PressureSensor
+syntax keyword qmlObjectLiteralType PrincipledMaterial
+syntax keyword qmlObjectLiteralType Product
+syntax keyword qmlObjectLiteralType ProgressBar
+syntax keyword qmlObjectLiteralType ProgressBarStyle
+syntax keyword qmlObjectLiteralType PropertyAction
+syntax keyword qmlObjectLiteralType PropertyAnimation
+syntax keyword qmlObjectLiteralType PropertyChanges
+syntax keyword qmlObjectLiteralType ProximityFilter
+syntax keyword qmlObjectLiteralType ProximityReading
+syntax keyword qmlObjectLiteralType ProximitySensor
+
+syntax keyword qmlObjectLiteralType QAbstractState
+syntax keyword qmlObjectLiteralType QAbstractTransition
+syntax keyword qmlObjectLiteralType QmlSensors
+syntax keyword qmlObjectLiteralType QSignalTransition
+syntax keyword qmlObjectLiteralType Qt
+syntax keyword qmlObjectLiteralType QtMultimedia
+syntax keyword qmlObjectLiteralType QtObject
+syntax keyword qmlObjectLiteralType QtPositioning
+syntax keyword qmlObjectLiteralType QtRemoteObjects
+syntax keyword qmlObjectLiteralType quaternion
+syntax keyword qmlObjectLiteralType QuaternionAnimation
+syntax keyword qmlObjectLiteralType QuotaRequest
+
+syntax keyword qmlObjectLiteralType RadialBlur
+syntax keyword qmlObjectLiteralType RadialGradient
+syntax keyword qmlObjectLiteralType Radio
+syntax keyword qmlObjectLiteralType RadioButton
+syntax keyword qmlObjectLiteralType RadioButtonStyle
+syntax keyword qmlObjectLiteralType RadioData
+syntax keyword qmlObjectLiteralType RadioDelegate
+syntax keyword qmlObjectLiteralType RangeSlider
+syntax keyword qmlObjectLiteralType RasterMode
+syntax keyword qmlObjectLiteralType Ratings
+syntax keyword qmlObjectLiteralType RayCaster
+syntax keyword qmlObjectLiteralType real
+syntax keyword qmlObjectLiteralType rect
+syntax keyword qmlObjectLiteralType Rectangle
+syntax keyword qmlObjectLiteralType RectangleShape
+syntax keyword qmlObjectLiteralType RectangularGlow
+syntax keyword qmlObjectLiteralType RecursiveBlur
+syntax keyword qmlObjectLiteralType RegExpValidator
+syntax keyword qmlObjectLiteralType RegisterProtocolHandlerRequest
+syntax keyword qmlObjectLiteralType RegularExpressionValidator
+syntax keyword qmlObjectLiteralType RenderCapabilities
+syntax keyword qmlObjectLiteralType RenderCapture
+syntax keyword qmlObjectLiteralType RenderCaptureReply
+syntax keyword qmlObjectLiteralType RenderPass
+syntax keyword qmlObjectLiteralType RenderPassFilter
+syntax keyword qmlObjectLiteralType RenderSettings
+syntax keyword qmlObjectLiteralType RenderState
+syntax keyword qmlObjectLiteralType RenderStateSet
+syntax keyword qmlObjectLiteralType RenderStats
+syntax keyword qmlObjectLiteralType RenderSurfaceSelector
+syntax keyword qmlObjectLiteralType RenderTarget
+syntax keyword qmlObjectLiteralType RenderTargetOutput
+syntax keyword qmlObjectLiteralType RenderTargetSelector
+syntax keyword qmlObjectLiteralType Repeater
+syntax keyword qmlObjectLiteralType Repeater3D
+syntax keyword qmlObjectLiteralType ReviewModel
+syntax keyword qmlObjectLiteralType Rotation
+syntax keyword qmlObjectLiteralType RotationAnimation
+syntax keyword qmlObjectLiteralType RotationAnimator
+syntax keyword qmlObjectLiteralType RotationReading
+syntax keyword qmlObjectLiteralType RotationSensor
+syntax keyword qmlObjectLiteralType RoundButton
+syntax keyword qmlObjectLiteralType Route
+syntax keyword qmlObjectLiteralType RouteLeg
+syntax keyword qmlObjectLiteralType RouteManeuver
+syntax keyword qmlObjectLiteralType RouteModel
+syntax keyword qmlObjectLiteralType RouteQuery
+syntax keyword qmlObjectLiteralType RouteSegment
+syntax keyword qmlObjectLiteralType Row
+syntax keyword qmlObjectLiteralType RowLayout
+
+syntax keyword qmlObjectLiteralType Scale
+syntax keyword qmlObjectLiteralType ScaleAnimator
+syntax keyword qmlObjectLiteralType Scatter
+syntax keyword qmlObjectLiteralType Scatter3D
+syntax keyword qmlObjectLiteralType Scatter3DSeries
+syntax keyword qmlObjectLiteralType ScatterDataProxy
+syntax keyword qmlObjectLiteralType ScatterSeries
+syntax keyword qmlObjectLiteralType Scene2D
+syntax keyword qmlObjectLiteralType Scene3D
+syntax keyword qmlObjectLiteralType Scene3DView
+syntax keyword qmlObjectLiteralType SceneEnvironment
+syntax keyword qmlObjectLiteralType SceneLoader
+syntax keyword qmlObjectLiteralType ScissorTest
+syntax keyword qmlObjectLiteralType Screen
+syntax keyword qmlObjectLiteralType ScreenRayCaster
+syntax keyword qmlObjectLiteralType ScriptAction
+syntax keyword qmlObjectLiteralType ScrollBar
+syntax keyword qmlObjectLiteralType ScrollIndicator
+syntax keyword qmlObjectLiteralType ScrollView
+syntax keyword qmlObjectLiteralType ScrollViewStyle
+syntax keyword qmlObjectLiteralType SCurveTonemap
+syntax keyword qmlObjectLiteralType ScxmlStateMachine
+syntax keyword qmlObjectLiteralType SeamlessCubemap
+syntax keyword qmlObjectLiteralType SelectionListItem
+syntax keyword qmlObjectLiteralType SelectionListModel
+syntax keyword qmlObjectLiteralType Sensor
+syntax keyword qmlObjectLiteralType SensorGesture
+syntax keyword qmlObjectLiteralType SensorReading
+syntax keyword qmlObjectLiteralType SequentialAnimation
+syntax keyword qmlObjectLiteralType Settings
+syntax keyword qmlObjectLiteralType SettingsStore
+syntax keyword qmlObjectLiteralType SetUniformValue
+syntax keyword qmlObjectLiteralType Shader
+syntax keyword qmlObjectLiteralType ShaderEffect
+syntax keyword qmlObjectLiteralType ShaderEffectSource
+syntax keyword qmlObjectLiteralType ShaderImage
+syntax keyword qmlObjectLiteralType ShaderInfo
+syntax keyword qmlObjectLiteralType ShaderProgram
+syntax keyword qmlObjectLiteralType ShaderProgramBuilder
+syntax keyword qmlObjectLiteralType Shape
+syntax keyword qmlObjectLiteralType ShapeGradient
+syntax keyword qmlObjectLiteralType ShapePath
+syntax keyword qmlObjectLiteralType SharedGLTexture
+syntax keyword qmlObjectLiteralType ShellSurface
+syntax keyword qmlObjectLiteralType ShellSurfaceItem
+syntax keyword qmlObjectLiteralType ShiftHandler
+syntax keyword qmlObjectLiteralType ShiftKey
+syntax keyword qmlObjectLiteralType Shortcut
+syntax keyword qmlObjectLiteralType SignalSpy
+syntax keyword qmlObjectLiteralType SignalTransition
+syntax keyword qmlObjectLiteralType SinglePointHandler
+syntax keyword qmlObjectLiteralType size
+syntax keyword qmlObjectLiteralType Skeleton
+syntax keyword qmlObjectLiteralType SkeletonLoader
+syntax keyword qmlObjectLiteralType SkyboxEntity
+syntax keyword qmlObjectLiteralType Slider
+syntax keyword qmlObjectLiteralType SliderStyle
+syntax keyword qmlObjectLiteralType SmoothedAnimation
+syntax keyword qmlObjectLiteralType SortPolicy
+syntax keyword qmlObjectLiteralType Sound
+syntax keyword qmlObjectLiteralType SoundEffect
+syntax keyword qmlObjectLiteralType SoundInstance
+syntax keyword qmlObjectLiteralType SpaceKey
+syntax keyword qmlObjectLiteralType SphereGeometry
+syntax keyword qmlObjectLiteralType SphereMesh
+syntax keyword qmlObjectLiteralType SpinBox
+syntax keyword qmlObjectLiteralType SpinBoxStyle
+syntax keyword qmlObjectLiteralType SplineSeries
+syntax keyword qmlObjectLiteralType SplitHandle
+syntax keyword qmlObjectLiteralType SplitView
+syntax keyword qmlObjectLiteralType SpotLight
+syntax keyword qmlObjectLiteralType SpringAnimation
+syntax keyword qmlObjectLiteralType Sprite
+syntax keyword qmlObjectLiteralType SpriteGoal
+syntax keyword qmlObjectLiteralType SpriteSequence
+syntax keyword qmlObjectLiteralType Stack
+syntax keyword qmlObjectLiteralType StackedBarSeries
+syntax keyword qmlObjectLiteralType StackLayout
+syntax keyword qmlObjectLiteralType StackView
+syntax keyword qmlObjectLiteralType StackViewDelegate
+syntax keyword qmlObjectLiteralType StandardPaths
+syntax keyword qmlObjectLiteralType State
+syntax keyword qmlObjectLiteralType StateChangeScript
+syntax keyword qmlObjectLiteralType StateGroup
+syntax keyword qmlObjectLiteralType StateMachine
+syntax keyword qmlObjectLiteralType StateMachineLoader
+syntax keyword qmlObjectLiteralType StatusBar
+syntax keyword qmlObjectLiteralType StatusBarStyle
+syntax keyword qmlObjectLiteralType StatusIndicator
+syntax keyword qmlObjectLiteralType StatusIndicatorStyle
+syntax keyword qmlObjectLiteralType SteelMilledConcentricMaterial
+syntax keyword qmlObjectLiteralType StencilMask
+syntax keyword qmlObjectLiteralType StencilOperation
+syntax keyword qmlObjectLiteralType StencilOperationArguments
+syntax keyword qmlObjectLiteralType StencilTest
+syntax keyword qmlObjectLiteralType StencilTestArguments
+syntax keyword qmlObjectLiteralType Store
+syntax keyword qmlObjectLiteralType String
+syntax keyword qmlObjectLiteralType string
+syntax keyword qmlObjectLiteralType SubtreeEnabler
+syntax keyword qmlObjectLiteralType Supplier
+syntax keyword qmlObjectLiteralType Surface3D
+syntax keyword qmlObjectLiteralType Surface3DSeries
+syntax keyword qmlObjectLiteralType SurfaceDataProxy
+syntax keyword qmlObjectLiteralType SwipeDelegate
+syntax keyword qmlObjectLiteralType SwipeView
+syntax keyword qmlObjectLiteralType Switch
+syntax keyword qmlObjectLiteralType SwitchDelegate
+syntax keyword qmlObjectLiteralType SwitchStyle
+syntax keyword qmlObjectLiteralType SymbolModeKey
+syntax keyword qmlObjectLiteralType SystemPalette
+syntax keyword qmlObjectLiteralType SystemTrayIcon
+
+syntax keyword qmlObjectLiteralType Tab
+syntax keyword qmlObjectLiteralType TabBar
+syntax keyword qmlObjectLiteralType TabButton
+syntax keyword qmlObjectLiteralType TableModel
+syntax keyword qmlObjectLiteralType TableModelColumn
+syntax keyword qmlObjectLiteralType TableView
+syntax keyword qmlObjectLiteralType TableViewColumn
+syntax keyword qmlObjectLiteralType TableViewStyle
+syntax keyword qmlObjectLiteralType TabView
+syntax keyword qmlObjectLiteralType TabViewStyle
+syntax keyword qmlObjectLiteralType TapHandler
+syntax keyword qmlObjectLiteralType TapReading
+syntax keyword qmlObjectLiteralType TapSensor
+syntax keyword qmlObjectLiteralType TargetDirection
+syntax keyword qmlObjectLiteralType TaskbarButton
+syntax keyword qmlObjectLiteralType Technique
+syntax keyword qmlObjectLiteralType TechniqueFilter
+syntax keyword qmlObjectLiteralType TestCase
+syntax keyword qmlObjectLiteralType Text
+syntax keyword qmlObjectLiteralType Text2DEntity
+syntax keyword qmlObjectLiteralType TextArea
+syntax keyword qmlObjectLiteralType TextAreaStyle
+syntax keyword qmlObjectLiteralType TextEdit
+syntax keyword qmlObjectLiteralType TextField
+syntax keyword qmlObjectLiteralType TextFieldStyle
+syntax keyword qmlObjectLiteralType TextInput
+syntax keyword qmlObjectLiteralType TextMetrics
+syntax keyword qmlObjectLiteralType Texture
+syntax keyword qmlObjectLiteralType Texture1D
+syntax keyword qmlObjectLiteralType Texture1DArray
+syntax keyword qmlObjectLiteralType Texture2D
+syntax keyword qmlObjectLiteralType Texture2DArray
+syntax keyword qmlObjectLiteralType Texture2DMultisample
+syntax keyword qmlObjectLiteralType Texture2DMultisampleArray
+syntax keyword qmlObjectLiteralType Texture3D
+syntax keyword qmlObjectLiteralType TextureBuffer
+syntax keyword qmlObjectLiteralType TextureCubeMap
+syntax keyword qmlObjectLiteralType TextureCubeMapArray
+syntax keyword qmlObjectLiteralType TextureImage
+syntax keyword qmlObjectLiteralType TextureInput
+syntax keyword qmlObjectLiteralType TextureLoader
+syntax keyword qmlObjectLiteralType TextureRectangle
+syntax keyword qmlObjectLiteralType Theme3D
+syntax keyword qmlObjectLiteralType ThemeColor
+syntax keyword qmlObjectLiteralType ThresholdMask
+syntax keyword qmlObjectLiteralType ThumbnailToolBar
+syntax keyword qmlObjectLiteralType ThumbnailToolButton
+syntax keyword qmlObjectLiteralType TiltReading
+syntax keyword qmlObjectLiteralType TiltSensor
+syntax keyword qmlObjectLiteralType TiltShift
+syntax keyword qmlObjectLiteralType Timeline
+syntax keyword qmlObjectLiteralType TimelineAnimation
+syntax keyword qmlObjectLiteralType TimeoutTransition
+syntax keyword qmlObjectLiteralType Timer
+syntax keyword qmlObjectLiteralType ToggleButton
+syntax keyword qmlObjectLiteralType ToggleButtonStyle
+syntax keyword qmlObjectLiteralType ToolBar
+syntax keyword qmlObjectLiteralType ToolBarStyle
+syntax keyword qmlObjectLiteralType ToolButton
+syntax keyword qmlObjectLiteralType ToolSeparator
+syntax keyword qmlObjectLiteralType ToolTip
+syntax keyword qmlObjectLiteralType TooltipRequest
+syntax keyword qmlObjectLiteralType Torch
+syntax keyword qmlObjectLiteralType TorusGeometry
+syntax keyword qmlObjectLiteralType TorusMesh
+syntax keyword qmlObjectLiteralType TouchEventSequence
+syntax keyword qmlObjectLiteralType TouchInputHandler3D
+syntax keyword qmlObjectLiteralType TouchPoint
+syntax keyword qmlObjectLiteralType Trace
+syntax keyword qmlObjectLiteralType TraceCanvas
+syntax keyword qmlObjectLiteralType TraceInputArea
+syntax keyword qmlObjectLiteralType TraceInputKey
+syntax keyword qmlObjectLiteralType TraceInputKeyPanel
+syntax keyword qmlObjectLiteralType TrailEmitter
+syntax keyword qmlObjectLiteralType Transaction
+syntax keyword qmlObjectLiteralType Transform
+syntax keyword qmlObjectLiteralType Transition
+syntax keyword qmlObjectLiteralType Translate
+syntax keyword qmlObjectLiteralType TreeView
+syntax keyword qmlObjectLiteralType TreeViewStyle
+syntax keyword qmlObjectLiteralType Tumbler
+syntax keyword qmlObjectLiteralType TumblerColumn
+syntax keyword qmlObjectLiteralType TumblerStyle
+syntax keyword qmlObjectLiteralType Turbulence
+
+syntax keyword qmlObjectLiteralType UniformAnimator
+syntax keyword qmlObjectLiteralType url
+syntax keyword qmlObjectLiteralType User
+
+syntax keyword qmlObjectLiteralType ValueAxis
+syntax keyword qmlObjectLiteralType ValueAxis3D
+syntax keyword qmlObjectLiteralType ValueAxis3DFormatter
+syntax keyword qmlObjectLiteralType var
+syntax keyword qmlObjectLiteralType variant
+syntax keyword qmlObjectLiteralType VBarModelMapper
+syntax keyword qmlObjectLiteralType VBoxPlotModelMapper
+syntax keyword qmlObjectLiteralType VCandlestickModelMapper
+syntax keyword qmlObjectLiteralType vector2d
+syntax keyword qmlObjectLiteralType vector3d
+syntax keyword qmlObjectLiteralType Vector3dAnimation
+syntax keyword qmlObjectLiteralType vector4d
+syntax keyword qmlObjectLiteralType VertexBlendAnimation
+syntax keyword qmlObjectLiteralType VerticalHeaderView
+syntax keyword qmlObjectLiteralType Video
+syntax keyword qmlObjectLiteralType VideoOutput
+syntax keyword qmlObjectLiteralType View3D
+syntax keyword qmlObjectLiteralType Viewport
+syntax keyword qmlObjectLiteralType ViewTransition
+syntax keyword qmlObjectLiteralType Vignette
+syntax keyword qmlObjectLiteralType VirtualKeyboardSettings
+syntax keyword qmlObjectLiteralType VPieModelMapper
+syntax keyword qmlObjectLiteralType VXYModelMapper
+
+syntax keyword qmlObjectLiteralType Wander
+syntax keyword qmlObjectLiteralType WasdController
+syntax keyword qmlObjectLiteralType WavefrontMesh
+syntax keyword qmlObjectLiteralType WaylandClient
+syntax keyword qmlObjectLiteralType WaylandCompositor
+syntax keyword qmlObjectLiteralType WaylandHardwareLayer
+syntax keyword qmlObjectLiteralType WaylandOutput
+syntax keyword qmlObjectLiteralType WaylandQuickItem
+syntax keyword qmlObjectLiteralType WaylandSeat
+syntax keyword qmlObjectLiteralType WaylandSurface
+syntax keyword qmlObjectLiteralType WaylandView
+syntax keyword qmlObjectLiteralType Waypoint
+syntax keyword qmlObjectLiteralType WebChannel
+syntax keyword qmlObjectLiteralType WebEngine
+syntax keyword qmlObjectLiteralType WebEngineAction
+syntax keyword qmlObjectLiteralType WebEngineCertificateError
+syntax keyword qmlObjectLiteralType WebEngineClientCertificateOption
+syntax keyword qmlObjectLiteralType WebEngineClientCertificateSelection
+syntax keyword qmlObjectLiteralType WebEngineDownloadItem
+syntax keyword qmlObjectLiteralType WebEngineHistory
+syntax keyword qmlObjectLiteralType WebEngineHistoryListModel
+syntax keyword qmlObjectLiteralType WebEngineLoadRequest
+syntax keyword qmlObjectLiteralType WebEngineNavigationRequest
+syntax keyword qmlObjectLiteralType WebEngineNewViewRequest
+syntax keyword qmlObjectLiteralType WebEngineNotification
+syntax keyword qmlObjectLiteralType WebEngineProfile
+syntax keyword qmlObjectLiteralType WebEngineScript
+syntax keyword qmlObjectLiteralType WebEngineSettings
+syntax keyword qmlObjectLiteralType WebEngineView
+syntax keyword qmlObjectLiteralType WebSocket
+syntax keyword qmlObjectLiteralType WebSocketServer
+syntax keyword qmlObjectLiteralType WebView
+syntax keyword qmlObjectLiteralType WebViewLoadRequest
+syntax keyword qmlObjectLiteralType WeekNumberColumn
+syntax keyword qmlObjectLiteralType WheelEvent
+syntax keyword qmlObjectLiteralType WheelHandler
+syntax keyword qmlObjectLiteralType Window
+syntax keyword qmlObjectLiteralType WlScaler
+syntax keyword qmlObjectLiteralType WlShell
+syntax keyword qmlObjectLiteralType WlShellSurface
+syntax keyword qmlObjectLiteralType WorkerScript
+
+syntax keyword qmlObjectLiteralType XAnimator
+syntax keyword qmlObjectLiteralType XdgDecorationManagerV1
+syntax keyword qmlObjectLiteralType XdgOutputManagerV1
+syntax keyword qmlObjectLiteralType XdgPopup
+syntax keyword qmlObjectLiteralType XdgPopupV5
+syntax keyword qmlObjectLiteralType XdgPopupV6
+syntax keyword qmlObjectLiteralType XdgShell
+syntax keyword qmlObjectLiteralType XdgShellV5
+syntax keyword qmlObjectLiteralType XdgShellV6
+syntax keyword qmlObjectLiteralType XdgSurface
+syntax keyword qmlObjectLiteralType XdgSurfaceV5
+syntax keyword qmlObjectLiteralType XdgSurfaceV6
+syntax keyword qmlObjectLiteralType XdgToplevel
+syntax keyword qmlObjectLiteralType XdgToplevelV6
+syntax keyword qmlObjectLiteralType XmlListModel
+syntax keyword qmlObjectLiteralType XmlRole
+syntax keyword qmlObjectLiteralType XYPoint
+syntax keyword qmlObjectLiteralType XYSeries
+
+syntax keyword qmlObjectLiteralType YAnimator
+
+syntax keyword qmlObjectLiteralType ZoomBlur 
+
+" }}}
 
 if get(g:, 'qml_fold', 0)
   syn match   qmlFunction      "\<function\>"
diff --git a/syntax/raku.vim b/syntax/raku.vim
index 99e8b1ef5..3177f97e9 100644
--- a/syntax/raku.vim
+++ b/syntax/raku.vim
@@ -70,7 +70,7 @@ syn match rakuIdentifier display "\%([A-Za-z_\xC0-\xFF]\%([A-Za-z_\xC0-\xFF0-9]\
 
 let s:keywords = {
  \ "rakuInclude": [
- \   "use require unit",
+ \   "use require import unit",
  \ ],
  \ "rakuConditional": [
  \   "if else elsif unless with orwith without once",
@@ -80,16 +80,16 @@ let s:keywords = {
  \ ],
  \ "rakuRepeat": [
  \   "for loop repeat while until gather given",
- \   "supply react race hyper quietly",
+ \   "supply react race hyper lazy quietly",
  \ ],
  \ "rakuFlowControl": [
- \   "take do when next last redo return return-rw",
+ \   "take take-rw do when next last redo return return-rw",
  \   "start default exit make continue break goto leave",
- \   "proceed succeed whenever done",
+ \   "proceed succeed whenever emit done",
  \ ],
  \ "rakuClosureTrait": [
- \   "BEGIN CHECK INIT START FIRST ENTER LEAVE KEEP",
- \   "UNDO NEXT LAST PRE POST END CATCH CONTROL TEMP",
+ \   "BEGIN CHECK INIT FIRST ENTER LEAVE KEEP",
+ \   "UNDO NEXT LAST PRE POST END CATCH CONTROL",
  \   "DOC QUIT CLOSE COMPOSE",
  \ ],
  \ "rakuException": [
@@ -102,13 +102,14 @@ let s:keywords = {
  \ ],
  \ "rakuOperator": [
  \   "div xx x mod also leg cmp before after eq ne le lt not",
- \   "gt ge eqv ff fff and andthen or xor orelse extra lcm gcd o",
+ \   "gt ge eqv ff fff and andthen or xor orelse lcm gcd o",
  \   "unicmp notandthen minmax",
  \ ],
  \ "rakuType": [
  \   "int int1 int2 int4 int8 int16 int32 int64",
  \   "rat rat1 rat2 rat4 rat8 rat16 rat32 rat64",
  \   "buf buf1 buf2 buf4 buf8 buf16 buf32 buf64",
+ \   "blob blob1 blob2 blob4 blob8 blob16 blob32 blob64",
  \   "uint uint1 uint2 uint4 uint8 uint16 uint32 bit bool",
  \   "uint64 utf8 utf16 utf32 bag set mix complex",
  \   "num num32 num64 long longlong Pointer size_t str void",
@@ -461,7 +462,7 @@ syn match rakuQuoteQStart display "\%(:\|\%(sub\|role\)\s\)\@5<![Qq]\@=" nextgro
 syn match rakuQuoteQ      display "Q\%(qq\|ww\|[abcfhpsqvwx]\)\?[A-Za-z(]\@!" nextgroup=rakuPairsQ skipwhite skipempty contained
 syn match rakuQuoteQ_q    display "q[abcfhpsvwx]\?[A-Za-z(]\@!" nextgroup=rakuPairsQ_q skipwhite skipempty contained
 syn match rakuQuoteQ_qww  display "qww[A-Za-z(]\@!" nextgroup=rakuPairsQ_qww skipwhite skipempty contained
-syn match rakuQuoteQ_qq   display "qq[pwx]\?[A-Za-z(]\@!" nextgroup=rakuPairsQ_qq skipwhite skipempty contained
+syn match rakuQuoteQ_qq   display "qq\%([pwx]\|ww\)\?[A-Za-z(]\@!" nextgroup=rakuPairsQ_qq skipwhite skipempty contained
 syn match rakuQuoteQ_to   display "Qto[A-Za-z(]\@!" nextgroup=rakuStringQ_to skipwhite skipempty contained
 syn match rakuQuoteQ_qto  display "qto[A-Za-z(]\@!" nextgroup=rakuStringQ_qto skipwhite skipempty contained
 syn match rakuQuoteQ_qqto display "qqto[A-Za-z(]\@!" nextgroup=rakuStringQ_qqto skipwhite skipempty contained
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index a0b904967..46336f252 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -3,7 +3,7 @@ if has_key(g:polyglot_is_disabled, 'tmux')
 endif
 
 " Language: tmux(1) configuration file
-" Version: 3.1b (git-769ae106)
+" Version: 3.2-rc (git-e94bd5cc)
 " URL: https://github.com/ericpruitt/tmux.vim/
 " Maintainer: Eric Pruitt <eric.pruitt@gmail.com>
 " License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause)
@@ -59,13 +59,16 @@ hi def link tmuxTodo              Todo
 hi def link tmuxVariable          Identifier
 hi def link tmuxVariableExpansion Identifier
 
-" Make the foreground of colourXXX keywords match the color they represent.
+" Make the foreground of colourXXX keywords match the color they represent
+" when g:tmux_syntax_colors is unset or set to a non-zero value.
 " Darker colors have their background set to white.
-for s:i in range(0, 255)
-    let s:bg = (!s:i || s:i == 16 || (s:i > 231 && s:i < 235)) ? 15 : "none"
-    exec "syn match tmuxColour" . s:i . " /\\<colour" . s:i . "\\>/ display"
-\     " | highlight tmuxColour" . s:i . " ctermfg=" . s:i . " ctermbg=" . s:bg
-endfor
+if get(g:, "tmux_syntax_colors", 1)
+    for s:i in range(0, 255)
+        let s:bg = (!s:i || s:i == 16 || (s:i > 231 && s:i < 235)) ? 15 : "none"
+        exec "syn match tmuxColour" . s:i . " /\\<colour" . s:i . "\\>/ display"
+\         " | highlight tmuxColour" . s:i . " ctermfg=" . s:i . " ctermbg=" . s:bg
+    endfor
+endif
 
 syn keyword tmuxOptions
 \ backspace buffer-limit command-alias copy-command default-terminal editor

From ab0ff253f6ab3cd9d42b6be38d4d912bad5415f9 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 20 Nov 2020 13:00:38 +0100
Subject: [PATCH 204/299] Update plugins, closes #627

---
 ftplugin/sxhkdrc.vim | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 ftplugin/sxhkdrc.vim

diff --git a/ftplugin/sxhkdrc.vim b/ftplugin/sxhkdrc.vim
new file mode 100644
index 000000000..4814c5c1f
--- /dev/null
+++ b/ftplugin/sxhkdrc.vim
@@ -0,0 +1,5 @@
+if has_key(g:polyglot_is_disabled, 'sxhkd')
+  finish
+endif
+
+setlocal cms=#%s

From 73c518717741fb3ebb6822645d38f37ffae7c19b Mon Sep 17 00:00:00 2001
From: Carl-Philipp Jung <g4b@pjio.de>
Date: Fri, 27 Nov 2020 16:10:29 +0100
Subject: [PATCH 205/299] Removes `set incsearch` which was copied from
 vim-sensible (#640)

---
 ftdetect/polyglot.vim | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 9fb53aa6c..44b5871d1 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -3563,9 +3563,6 @@ if !has_key(g:polyglot_is_disabled, 'sensible')
 
   " Autoindent when starting new line, or using `o` or `O`.
   set autoindent
-
-  " Enable highlighted case-insensitive incremential search.
-  set incsearch
 endif
 
 " Restore 'cpoptions'

From 95d82fdb668b746ac100a8b7d2aca38038150707 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Dec 2020 19:44:40 +0100
Subject: [PATCH 206/299] Update

---
 after/syntax/c.vim                  |  16 +-
 after/syntax/cpp.vim                |  10 +-
 after/syntax/javascript/graphql.vim |   6 +-
 after/syntax/php/graphql.vim        |   4 +
 after/syntax/reason/graphql.vim     |   4 +
 after/syntax/typescript/graphql.vim |   4 +
 autoload/ledger.vim                 |  13 ++
 autoload/terraform.vim              |  19 +-
 autoload/yats.vim                   |   2 +-
 extras/filetype.vim                 |  28 ++-
 ftplugin/css.vim                    |   5 +-
 ftplugin/eelixir.vim                |   9 +-
 ftplugin/elixir.vim                 |   2 +-
 ftplugin/erlang.vim                 | 111 +++++------
 ftplugin/idris2.vim                 |   7 +-
 ftplugin/nroff.vim                  |  10 +-
 ftplugin/spec.vim                   |  36 ++--
 indent/crystal.vim                  |  10 +
 indent/html.vim                     |   4 +-
 indent/typescript.vim               |   2 +-
 indent/typescriptreact.vim          |  42 ++--
 syntax/aidl.vim                     |   4 +-
 syntax/basic/members.vim            |   2 +-
 syntax/cabal-2.vim                  |  25 ++-
 syntax/cs.vim                       |  39 ++--
 syntax/debchangelog.vim             |   6 +-
 syntax/debsources.vim               |   6 +-
 syntax/diff.vim                     |   6 +-
 syntax/eelixir.vim                  |   9 +-
 syntax/elixir.vim                   |   4 +-
 syntax/gosum.vim                    |  59 ++++++
 syntax/graphql.vim                  |   4 +-
 syntax/idris2.vim                   |   4 +-
 syntax/lex.vim                      |   2 +-
 syntax/pgsql.vim                    | 287 ++++++++++++++--------------
 syntax/ps1.vim                      |   4 +
 syntax/python.vim                   |  16 +-
 syntax/sil.vim                      |   1 +
 syntax/smt2.vim                     |  29 +--
 syntax/sshdconfig.vim               |  23 ++-
 40 files changed, 527 insertions(+), 347 deletions(-)
 create mode 100644 syntax/gosum.vim

diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index 2c2762eb1..a8f7f416e 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -6,13 +6,9 @@ endif
 " Vim syntax file
 " Language:        C Additions
 " Original Author: Mikhail Wolfson <mywolfson@gmail.com>
-"                  http://www.vim.org/scripts/script.php?script_id=3064
-" Maintainer:      bfrg <bfrg@users.noreply.github.com>
+" Maintainer:      bfrg <https://github.com/bfrg>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Oct 23, 2020
-"
-" Extended C syntax highlighting including highlighting of user-defined
-" functions.
+" Last Change:     Nov 23, 2020
 "
 " This syntax file is based on:
 " https://github.com/octol/vim-cpp-enhanced-highlight
@@ -63,8 +59,8 @@ hi def link cAnsiName Identifier
 " Highlight all standard C keywords as Statement
 " This is very similar to what other IDEs and editors do
 if get(g:, 'cpp_simple_highlight', 0)
-    hi link cStorageClass Statement
-    hi link cStructure    Statement
-    hi link cTypedef      Statement
-    hi link cLabel        Statement
+    hi! def link cStorageClass Statement
+    hi! def link cStructure    Statement
+    hi! def link cTypedef      Statement
+    hi! def link cLabel        Statement
 endif
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index 761a6c15c..d181f261d 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -8,7 +8,7 @@ endif
 " Original Author: Jon Haggblad <https://github.com/octol>
 " Maintainer:      bfrg <https://github.com/bfrg>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Oct 8, 2020
+" Last Change:     Nov 23, 2020
 "
 " This syntax file is based on:
 " https://github.com/octol/vim-cpp-enhanced-highlight
@@ -201,12 +201,12 @@ hi def link cppSTLvariable     Identifier
 
 " The keywords {inline, virtual, explicit, export, override, final} are
 " standard C++ keywords and NOT types!
-hi link cppModifier Statement
+hi! def link cppModifier Statement
 
 
 " Highlight all standard C++ keywords as Statement
 if get(g:, 'cpp_simple_highlight', 0)
-    hi link cppStructure    Statement
-    hi link cppExceptions   Statement
-    hi link cppStorageClass Statement
+    hi! def link cppStructure    Statement
+    hi! def link cppExceptions   Statement
+    hi! def link cppStorageClass Statement
 endif
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index 3d4423320..dafba802a 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -29,7 +29,11 @@ if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
   unlet b:current_syntax
 endif
+
+let b:graphql_nested_syntax = 1
 syn include @GraphQLSyntax syntax/graphql.vim
+unlet b:graphql_nested_syntax
+
 if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
@@ -48,7 +52,7 @@ if graphql#has_syntax_group('jsTemplateExpression')
   hi def link graphqlTaggedTemplate jsTaggedTemplate
   hi def link graphqlTemplateExpression jsTemplateExpression
 
-  syn cluster jsExpression add=graphqlTaggedTemplate
+  syn cluster jsExpression add=graphqlTemplateString,graphqlTaggedTemplate
   syn cluster graphqlTaggedTemplate add=graphqlTemplateString
 elseif graphql#has_syntax_group('javaScriptStringT')
   " runtime/syntax/javascript.vim
diff --git a/after/syntax/php/graphql.vim b/after/syntax/php/graphql.vim
index d26de0731..3c94bcb83 100644
--- a/after/syntax/php/graphql.vim
+++ b/after/syntax/php/graphql.vim
@@ -29,7 +29,11 @@ if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
   unlet b:current_syntax
 endif
+
+let b:graphql_nested_syntax = 1
 syn include @GraphQLSyntax syntax/graphql.vim
+unlet b:graphql_nested_syntax
+
 if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
diff --git a/after/syntax/reason/graphql.vim b/after/syntax/reason/graphql.vim
index f1d8b317e..0ef3b1d70 100644
--- a/after/syntax/reason/graphql.vim
+++ b/after/syntax/reason/graphql.vim
@@ -29,7 +29,11 @@ if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
   unlet b:current_syntax
 endif
+
+let b:graphql_nested_syntax = 1
 syn include @GraphQLSyntax syntax/graphql.vim
+unlet b:graphql_nested_syntax
+
 if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index e30f06826..df6bf36c3 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -29,7 +29,11 @@ if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
   unlet b:current_syntax
 endif
+
+let b:graphql_nested_syntax = 1
 syn include @GraphQLSyntax syntax/graphql.vim
+unlet b:graphql_nested_syntax
+
 if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
diff --git a/autoload/ledger.vim b/autoload/ledger.vim
index 76be457d0..265aa666e 100644
--- a/autoload/ledger.vim
+++ b/autoload/ledger.vim
@@ -444,6 +444,19 @@ function! ledger#align_commodity() abort
   endif
 endf
 
+" Align the commodity on the entire buffer
+function! ledger#align_commodity_buffer() abort
+  " Store the viewport position
+  let view = winsaveview()
+
+  " Call ledger#align_commodity for every line
+  %call ledger#align_commodity()
+
+  " Restore the viewport position
+  call winrestview(view)
+  unlet view
+endf
+
 " Align the amount under the cursor and append/prepend the default currency.
 function! ledger#align_amount_at_cursor() abort
   " Select and cut text:
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index 652c4b30f..594d74a0e 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -48,33 +48,28 @@ endfunction
 
 function! terraform#commands(ArgLead, CmdLine, CursorPos) abort
   let commands = [
+    \ 'init',
+    \ 'validate',
+    \ 'plan',
     \ 'apply',
-    \ 'console',
     \ 'destroy',
-    \ 'env',
+    \ 'console',
     \ 'fmt',
+    \ 'force-unlock',
     \ 'get',
     \ 'graph',
     \ 'import',
-    \ 'init',
     \ 'login',
     \ 'logout',
     \ 'output',
-    \ 'plan',
     \ 'providers',
     \ 'refresh',
     \ 'show',
+    \ 'state',
     \ 'taint',
     \ 'untaint',
-    \ 'validate',
     \ 'version',
-    \ 'workspace',
-    \ '0.12upgrade',
-    \ '0.13upgrade',
-    \ 'debug',
-    \ 'force-unlock',
-    \ 'push',
-    \ 'state'
+    \ 'workspace'
   \ ]
   return join(commands, "\n")
 endfunction
diff --git a/autoload/yats.vim b/autoload/yats.vim
index 8f5fe2d09..f96841aab 100644
--- a/autoload/yats.vim
+++ b/autoload/yats.vim
@@ -10,7 +10,7 @@ let s:syng_linecom = 'linecomment\c'
 
 " Check if the character at lnum:col is inside a multi-line comment.
 function yats#IsInMultilineComment(lnum, col)
-  return !s:IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
+  return !yats#IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
 endfunction
 
 " Check if the character at lnum:col is a line comment.
diff --git a/extras/filetype.vim b/extras/filetype.vim
index 4dd33f17c..e36750848 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Oct 24
+" Last Change:	2020 Dec 07
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -627,6 +627,9 @@ au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
 " Gedcom
 au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
 
+" Gift (Moodle)
+autocmd BufRead,BufNewFile *.gift 		setf gift
+
 " Git
 au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG	setf gitcommit
 au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig	setf gitconfig
@@ -696,12 +699,15 @@ au BufNewFile,BufRead .gtkrc,gtkrc		setf gtkrc
 au BufNewFile,BufRead *.haml			setf haml
 
 " Hamster Classic | Playground files
-au BufNewFile,BufRead *.hsc,*.hsm		setf hamster
+au BufNewFile,BufRead *.hsm	  		setf hamster
 
 " Haskell
-au BufNewFile,BufRead *.hs,*.hs-boot		setf haskell
+au BufNewFile,BufRead *.hs,*.hsc,*.hs-boot	setf haskell
 au BufNewFile,BufRead *.lhs			setf lhaskell
 au BufNewFile,BufRead *.chs			setf chaskell
+au BufNewFile,BufRead cabal.project		setf cabalproject
+au BufNewFile,BufRead $HOME/.cabal/config	setf cabalconfig
+au BufNewFile,BufRead cabal.config		setf cabalconfig
 
 " Haste
 au BufNewFile,BufRead *.ht			setf haste
@@ -1739,6 +1745,9 @@ au BufNewFile,BufRead *.tf,.tfrc,tfrc		setf tf
 " tmux configuration
 au BufNewFile,BufRead {.,}tmux*.conf		setf tmux
 
+" TOML
+au BufNewFile,BufRead *.toml			setf toml
+
 " TPP - Text Presentation Program
 au BufNewFile,BufReadPost *.tpp			setf tpp
 
@@ -1760,8 +1769,13 @@ au BufNewFile,BufReadPost *.tsscl		setf tsscl
 " TWIG files
 au BufNewFile,BufReadPost *.twig		setf twig
 
-" Typescript
-au BufNewFile,BufReadPost *.ts			setf typescript
+" Typescript or Qt translation file (which is XML)
+au BufNewFile,BufReadPost *.ts
+	\ if getline(1) =~ '<?xml' |
+	\   setf xml |
+	\ else |
+	\   setf typescript |
+	\ endif
 
 " TypeScript with React
 au BufNewFile,BufRead *.tsx			setf typescriptreact
@@ -2035,12 +2049,14 @@ au BufNewFile,BufRead bzr_log.*			setf bzr
 
 " Bazel build file
 if !has("fname_case")
-  au BufNewFile,BufRead *.BUILD,BUILD			setf bzl
+  au BufNewFile,BufRead *.BUILD,BUILD		setf bzl
 endif
 
 " BIND zone
 au BufNewFile,BufRead */named/db.*,*/bind/db.*	call s:StarSetf('bindzone')
 
+au BufNewFile,BufRead cabal.project.*		call s:StarSetf('cabalproject')
+
 " Calendar
 au BufNewFile,BufRead */.calendar/*,
 	\*/share/calendar/*/calendar.*,*/share/calendar/calendar.*
diff --git a/ftplugin/css.vim b/ftplugin/css.vim
index e7ff73b6d..5d4dca2a9 100644
--- a/ftplugin/css.vim
+++ b/ftplugin/css.vim
@@ -6,7 +6,7 @@ endif
 " Language:		CSS
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
-" Latest Revision:	2008-07-09
+" Last Change:		2020 Dec 21
 
 if exists("b:did_ftplugin")
   finish
@@ -16,11 +16,12 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-let b:undo_ftplugin = "setl com< cms< inc< fo< ofu<"
+let b:undo_ftplugin = "setl com< cms< inc< fo< ofu< isk<"
 
 setlocal comments=s1:/*,mb:*,ex:*/ commentstring&
 setlocal formatoptions-=t formatoptions+=croql
 setlocal omnifunc=csscomplete#CompleteCSS
+setlocal iskeyword+=-
 
 let &l:include = '^\s*@import\s\+\%(url(\)\='
 
diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index 61a59a05b..cda21c9b4 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -27,7 +27,10 @@ if !exists("b:eelixir_subtype")
     let b:eelixir_subtype = matchstr(&filetype,'^leex\.\zs\w\+')
   endif
   if b:eelixir_subtype == ''
-    let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.leex\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
+    let b:eelixir_subtype = matchstr(&filetype,'^sface\.\zs\w\+')
+  endif
+  if b:eelixir_subtype == ''
+    let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.sface\|\.leex\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
   endif
   if b:eelixir_subtype == 'ex'
     let b:eelixir_subtype = 'elixir'
@@ -97,6 +100,10 @@ if !exists('b:surround_35')
   " When using surround `#` (ASCII 35) would provide `<%# selection %>`
   let b:surround_35 = "<%# \r %>"
 endif
+if !exists('b:surround_123')
+  " When using surround `{` (ASCII 123) would provide `{{ selection }}`
+  let b:surround_123 = "{{ \r }}"
+endif
 if !exists('b:surround_5')
   " When using surround `<C-e>` (ASCII 5 `ENQ`) would provide `<% selection %>\n<% end %>`
   let b:surround_5 = "<% \r %>\n<% end %>"
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index 2cae0e3e0..9a273567e 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -32,7 +32,7 @@ let &l:path =
       \   &g:path
       \ ], ',')
 setlocal includeexpr=elixir#util#get_filename(v:fname)
-setlocal suffixesadd=.ex,.exs,.eex,.leex,.erl,.xrl,.yrl,.hrl
+setlocal suffixesadd=.ex,.exs,.eex,.leex,.sface,.erl,.xrl,.yrl,.hrl
 
 let &l:define = 'def\(macro\|guard\|delegate\)\=p\='
 
diff --git a/ftplugin/erlang.vim b/ftplugin/erlang.vim
index 45eb68f69..b9720484f 100644
--- a/ftplugin/erlang.vim
+++ b/ftplugin/erlang.vim
@@ -8,90 +8,79 @@ endif
 " Author:       Oscar Hellström <oscar@oscarh.net>
 " Contributors: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 "               Eduardo Lopez (http://github.com/tapichu)
+"               Arvid Bjurklint (http://github.com/slarwise)
 " License:      Vim license
 " Version:      2012/01/25
 
 if exists('b:did_ftplugin')
-	finish
-else
-	let b:did_ftplugin = 1
-endif
-
-if exists('s:did_function_definitions')
-	call s:SetErlangOptions()
-	finish
-else
-	let s:did_function_definitions = 1
+  finish
 endif
+let b:did_ftplugin = 1
 
 let s:cpo_save = &cpo
 set cpo&vim
 
-if !exists('g:erlang_keywordprg')
-	let g:erlang_keywordprg = 'erl -man'
-endif
+let &l:keywordprg = get(g:, 'erlang_keywordprg', 'erl -man')
 
-if !exists('g:erlang_folding')
-	let g:erlang_folding = 0
+if get(g:, 'erlang_folding', 0)
+  setlocal foldmethod=expr
+  setlocal foldexpr=GetErlangFold(v:lnum)
+  setlocal foldtext=ErlangFoldText()
 endif
 
-let s:erlang_fun_begin = '^\a\w*(.*$'
-let s:erlang_fun_end   = '^[^%]*\.\s*\(%.*\)\?$'
-
-function s:SetErlangOptions()
-	if g:erlang_folding
-		setlocal foldmethod=expr
-		setlocal foldexpr=GetErlangFold(v:lnum)
-		setlocal foldtext=ErlangFoldText()
-	endif
+setlocal comments=:%%%,:%%,:%
+setlocal commentstring=%%s
 
-	setlocal comments=:%%%,:%%,:%
-	setlocal commentstring=%%s
+setlocal formatoptions+=ro
 
-	setlocal formatoptions+=ro
-	let &l:keywordprg = g:erlang_keywordprg
+setlocal suffixesadd=.erl,.hrl
 
-        setlocal suffixesadd=.erl,.hrl
+let &l:include = '^\s*-\%(include\|include_lib\)\s*("\zs\f*\ze")'
+let &l:define  = '^\s*-\%(define\|record\|type\|opaque\)'
 
-        let &l:include = '^\s*-\%(include\|include_lib\)\s*("\zs\f*\ze")'
-        let &l:define  = '^\s*-\%(define\|record\|type\|opaque\)'
-endfunction
-
-function GetErlangFold(lnum)
-	let lnum = a:lnum
-	let line = getline(lnum)
-
-	if line =~ s:erlang_fun_end
-		return '<1'
-	endif
+let s:erlang_fun_begin = '^\a\w*(.*$'
+let s:erlang_fun_end   = '^[^%]*\.\s*\(%.*\)\?$'
 
-	if line =~ s:erlang_fun_begin && foldlevel(lnum - 1) == 1
-		return '1'
-	endif
+if !exists('*GetErlangFold')
+  function GetErlangFold(lnum)
+    let lnum = a:lnum
+    let line = getline(lnum)
 
-	if line =~ s:erlang_fun_begin
-		return '>1'
-	endif
+    if line =~ s:erlang_fun_end
+      return '<1'
+    endif
 
-	return '='
-endfunction
+    if line =~ s:erlang_fun_begin && foldlevel(lnum - 1) == 1
+      return '1'
+    endif
 
-function ErlangFoldText()
-	let line    = getline(v:foldstart)
-	let foldlen = v:foldend - v:foldstart + 1
-	let lines   = ' ' . foldlen . ' lines: ' . substitute(line, "[\ \t]*", '', '')
-	if foldlen < 10
-		let lines = ' ' . lines
-	endif
-	let retval = '+' . v:folddashes . lines
+    if line =~ s:erlang_fun_begin
+      return '>1'
+    endif
 
-	return retval
-endfunction
+    return '='
+  endfunction
+endif
 
-call s:SetErlangOptions()
+if !exists('*ErlangFoldText')
+  function ErlangFoldText()
+    let line    = getline(v:foldstart)
+    let foldlen = v:foldend - v:foldstart + 1
+    let lines   = ' ' . foldlen . ' lines: ' . substitute(line, "[\ \t]*", '', '')
+    if foldlen < 10
+      let lines = ' ' . lines
+    endif
+    let retval = '+' . v:folddashes . lines
+
+    return retval
+  endfunction
+endif
 
-let b:undo_ftplugin = "setlocal foldmethod< foldexpr< foldtext<"
-	\ . " comments< commentstring< formatoptions< suffixesadd< include< define<"
+let b:undo_ftplugin = "setlocal keywordprg< foldmethod< foldexpr< foldtext<"
+      \ . " comments< commentstring< formatoptions< suffixesadd< include<"
+      \ . " define<"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+
+" vim: sw=2 et
diff --git a/ftplugin/idris2.vim b/ftplugin/idris2.vim
index 28ac7b5c3..9a09fada5 100644
--- a/ftplugin/idris2.vim
+++ b/ftplugin/idris2.vim
@@ -37,8 +37,9 @@ endfunction
 
 function! s:IdrisCommand(...)
   let idriscmd = shellescape(join(a:000))
-"  echo("idris2 " . expand ('%:p') . " --client " . idriscmd)
-  return system("idris2 --find-ipkg " . shellescape(expand('%:p')) . " --client " . idriscmd)
+  " Vim does not support ANSI escape codes natively, so we need to disable
+  " automatic colouring
+  return system("idris2 --no-color --find-ipkg " . shellescape(expand('%:p')) . " --client " . idriscmd)
 endfunction
 
 function! IdrisDocFold(lineNum)
@@ -99,7 +100,7 @@ endfunction
 function! IdrisReload(q)
   w
   let file = expand('%:p')
-  let tc = system("idris2 --find-ipkg " . shellescape(file) . " --client ''")
+  let tc = system("idris2 --no-color --find-ipkg " . shellescape(file) . " --client ''")
   if (! (tc is ""))
     call IWrite(tc)
   else
diff --git a/ftplugin/nroff.vim b/ftplugin/nroff.vim
index 5ddd07f7e..ac3dce4d9 100644
--- a/ftplugin/nroff.vim
+++ b/ftplugin/nroff.vim
@@ -4,8 +4,10 @@ endif
 
 " Vim filetype plugin
 " Language:	roff(7)
-" Maintainer:	Chris Spiegel <cspiegel@gmail.com>
-" Last Change:	2019 Apr 24
+" Maintainer:	Aman Verma
+" Homepage:	https://github.com/a-vrma/vim-nroff-ftplugin
+" Previous Maintainer:	Chris Spiegel <cspiegel@gmail.com>
+" Last Change:	2020 Nov 21
 
 if exists("b:did_ftplugin")
   finish
@@ -13,3 +15,7 @@ endif
 let b:did_ftplugin = 1
 
 setlocal commentstring=.\\\"%s
+setlocal comments=:.\\\"
+setlocal sections+=Sh
+
+let b:undo_ftplugin = 'setlocal commentstring< comments< sections<'
diff --git a/ftplugin/spec.vim b/ftplugin/spec.vim
index 15234b684..fad900f9c 100644
--- a/ftplugin/spec.vim
+++ b/ftplugin/spec.vim
@@ -77,23 +77,23 @@ if !exists("*s:SpecChangelog")
 		let chgline = -1
 		while (line <= line("$"))
 			let linestr = getline(line)
-			if (name == "" && linestr =~? '^Name:')
+			if name == "" && linestr =~? '^Name:'
 				let nameline = line
 				let name = substitute(strpart(linestr,5), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
-			elseif (ver == "" && linestr =~? '^Version:')
+			elseif ver == "" && linestr =~? '^Version:'
 				let verline = line
 				let ver = substitute(strpart(linestr,8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
-			elseif (rel == "" && linestr =~? '^Release:')
+			elseif rel == "" && linestr =~? '^Release:'
 				let relline = line
 				let rel = substitute(strpart(linestr,8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
-			elseif (linestr =~? '^%changelog')
+			elseif linestr =~? '^%changelog'
 				let chgline = line
 				execute line
 				break
 			endif
 			let line = line+1
 		endwhile
-		if (nameline != -1 && verline != -1 && relline != -1)
+		if nameline != -1 && verline != -1 && relline != -1
 			let include_release_info = exists("g:spec_chglog_release_info")
 			let name = s:ParseRpmVars(name, nameline)
 			let ver = s:ParseRpmVars(ver, verline)
@@ -104,20 +104,20 @@ if !exists("*s:SpecChangelog")
 
 		call s:GetRelVer()
 
-		if (chgline == -1)
+		if chgline == -1
 			let option = confirm("Can't find %changelog. Create one? ","&End of file\n&Here\n&Cancel",3)
-			if (option == 1)
+			if option == 1
 				call append(line("$"),"")
 				call append(line("$"),"%changelog")
 				execute line("$")
 				let chgline = line(".")
-			elseif (option == 2)
+			elseif option == 2
 				call append(line("."),"%changelog")
 				normal j
-				chgline = line(".")
+				let chgline = line(".")
 			endif
 		endif
-		if (chgline != -1)
+		if chgline != -1
 			let tmptime = v:lc_time
 			language time C
 			let parsed_format = "* ".strftime(format)." - ".ver."-".rel
@@ -126,16 +126,16 @@ if !exists("*s:SpecChangelog")
 			let wrong_format = 0
 			let wrong_release = 0
 			let insert_line = 0
-			if (getline(chgline+1) != parsed_format)
+			if getline(chgline+1) != parsed_format
 				let wrong_format = 1
 			endif
-			if (include_release_info && getline(chgline+2) != release_info)
+			if include_release_info && getline(chgline+2) != release_info
 				let wrong_release = 1
 			endif
-			if (wrong_format || wrong_release)
-				if (include_release_info && !wrong_release && !exists("g:spec_chglog_never_increase_release"))
+			if wrong_format || wrong_release
+				if include_release_info && !wrong_release && !exists("g:spec_chglog_never_increase_release")
 					let option = confirm("Increase release? ","&Yes\n&No",1)
-					if (option == 1)
+					if option == 1
 						execute relline
 						normal 

 						let rel = substitute(strpart(getline(relline),8), '^[	 ]*\([^ 	]\+\)[		]*$','\1','')
@@ -175,13 +175,13 @@ if !exists("*s:ParseRpmVars")
 	let ret = ""
 	while (1)
 		let start = match(a:str, "\%{", end+1)
-		if (start == -1)
+		if start == -1
 			let ret = ret . strpart(a:str, end+1)
 			break
 		endif
 		let ret = ret . strpart(a:str, end+1, start-(end+1))
 		let end = match(a:str, "}", start)
-		if (end == -1)
+		if end == -1
 			let ret = ret . strpart(a:str, start)
 			break
 		endif
@@ -189,7 +189,7 @@ if !exists("*s:ParseRpmVars")
 		execute a:strline
 		let definestr = "^[ \t]*%\\(define\\|global\\)[ \t]\\+".varname."[ \t]\\+\\(.*\\)$"
 		let linenum = search(definestr, "bW")
-		if (linenum != 0)
+		if linenum != 0
 			let ret = ret .  substitute(getline(linenum), definestr, "\\2", "")
 		endif
 	endwhile
diff --git a/indent/crystal.vim b/indent/crystal.vim
index 4a0cdb00d..724f9611d 100644
--- a/indent/crystal.vim
+++ b/indent/crystal.vim
@@ -12,6 +12,16 @@ endif
 
 let b:did_indent = 1
 
+if !exists('g:crystal_indent_assignment_style')
+  " Possible values: 'variable', 'hanging'
+  let g:crystal_indent_assignment_style = 'hanging'
+endif
+
+if !exists('g:crystal_indent_block_style')
+  " Possible values: 'expression', 'do'
+  let g:crystal_indent_block_style = 'expression'
+endif
+
 setlocal nosmartindent
 
 " Now, set up our indentation expression and keys that trigger it.
diff --git a/indent/html.vim b/indent/html.vim
index 82cd7074f..25e306f32 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -5,7 +5,7 @@ endif
 " Vim indent script for HTML
 " Maintainer:	Bram Moolenaar
 " Original Author: Andy Wokula <anwoku@yahoo.de>
-" Last Change:	2020 Jul 06
+" Last Change:	2020 Dec 11
 " Version:	1.0 "{{{
 " Description:	HTML indent script with cached state for faster indenting on a
 "		range of lines.
@@ -819,7 +819,7 @@ func! s:Alien5()
   let idx = match(prevtext, '^\s*\zs<!--')
   if idx >= 0
     " just below comment start, add a shiftwidth
-    return idx + shiftwidth()
+    return indent(prevlnum) + shiftwidth()
   endif
 
   " Some files add 4 spaces just below a TODO line.  It's difficult to detect
diff --git a/indent/typescript.vim b/indent/typescript.vim
index 0bc143c3f..d372f9928 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -355,7 +355,7 @@ function GetTypescriptIndent()
   " If the line is empty and the previous nonblank line was a multi-line
   " comment, use that comment's indent. Deduct one char to account for the
   " space in ' */'.
-  if line =~ '^\s*$' && s:IsInMultilineComment(prevline, 1)
+  if line =~ '^\s*$' && yats#IsInMultilineComment(prevline, 1)
     return indent(prevline) - 1
   endif
 
diff --git a/indent/typescriptreact.vim b/indent/typescriptreact.vim
index fe9a2c324..9a6405234 100644
--- a/indent/typescriptreact.vim
+++ b/indent/typescriptreact.vim
@@ -2,7 +2,8 @@ if has_key(g:polyglot_is_disabled, 'typescript')
   finish
 endif
 
-exe 'runtime! indent/typescript.vim'
+runtime! indent/typescript.vim
+
 " Save the current JavaScript indentexpr.
 let b:tsx_ts_indentexpr = &indentexpr
 
@@ -11,7 +12,7 @@ if exists('b:did_indent')
   let s:did_indent=b:did_indent
   unlet b:did_indent
 endif
-exe 'runtime! indent/xml.vim'
+runtime! indent/xml.vim
 if exists('s:did_indent')
   let b:did_indent=s:did_indent
 endif
@@ -23,47 +24,52 @@ setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e
 " XML indentkeys
 setlocal indentkeys+=*<Return>,<>>,<<>,/
 
+" Only define the function once.
+if exists("*GetTsxIndent")
+  finish
+endif
+
 " Multiline end tag regex (line beginning with '>' or '/>')
 let s:endtag = '^\s*\/\?>\s*;\='
 let s:startexp = '[\{\(]\s*$'
 
 " Get all syntax types at the beginning of a given line.
-fu! SynSOL(lnum)
+fu! s:SynSOL(lnum)
   return map(synstack(a:lnum, 1), 'synIDattr(v:val, "name")')
 endfu
 
 " Get all syntax types at the end of a given line.
-fu! SynEOL(lnum)
+fu! s:SynEOL(lnum)
   let lnum = prevnonblank(a:lnum)
   let col = strlen(getline(lnum))
   return map(synstack(lnum, col), 'synIDattr(v:val, "name")')
 endfu
 
 " Check if a syntax attribute is XMLish.
-fu! SynAttrXMLish(synattr)
+fu! s:SynAttrXMLish(synattr)
   return a:synattr =~ "^xml" || a:synattr =~ "^tsx"
 endfu
 
 " Check if a synstack is XMLish (i.e., has an XMLish last attribute).
-fu! SynXMLish(syns)
-  return SynAttrXMLish(get(a:syns, -1))
+fu! s:SynXMLish(syns)
+  return s:SynAttrXMLish(get(a:syns, -1))
 endfu
 
 " Check if a synstack denotes the end of a TSX block.
-fu! SynTSXBlockEnd(syns)
+fu! s:SynTSXBlockEnd(syns)
   return get(a:syns, -1) =~ '\%(ts\|typescript\)Braces' &&
-       \ SynAttrXMLish(get(a:syns, -2))
+       \ s:SynAttrXMLish(get(a:syns, -2))
 endfu
 
 " Determine how many tsxRegions deep a synstack is.
-fu! SynTSXDepth(syns)
+fu! s:SynTSXDepth(syns)
   return len(filter(copy(a:syns), 'v:val ==# "tsxRegion"'))
 endfu
 
 " Check whether `cursyn' continues the same tsxRegion as `prevsyn'.
-fu! SynTSXContinues(cursyn, prevsyn)
-  let curdepth = SynTSXDepth(a:cursyn)
-  let prevdepth = SynTSXDepth(a:prevsyn)
+fu! s:SynTSXContinues(cursyn, prevsyn)
+  let curdepth = s:SynTSXDepth(a:cursyn)
+  let prevdepth = s:SynTSXDepth(a:prevsyn)
 
   " In most places, we expect the nesting depths to be the same between any
   " two consecutive positions within a tsxRegion (e.g., between a parent and
@@ -78,15 +84,15 @@ endfu
 
 " Cleverly mix JS and XML indentation.
 fu! GetTsxIndent()
-  let cursyn  = SynSOL(v:lnum)
-  let prevsyn = SynEOL(v:lnum - 1)
+  let cursyn  = s:SynSOL(v:lnum)
+  let prevsyn = s:SynEOL(v:lnum - 1)
 
   " Use XML indenting iff:
   "   - the syntax at the end of the previous line was either TSX or was the
   "     closing brace of a jsBlock whose parent syntax was TSX; and
   "   - the current line continues the same tsxRegion as the previous line.
-  if (SynXMLish(prevsyn) || SynTSXBlockEnd(prevsyn)) &&
-        \ SynTSXContinues(cursyn, prevsyn)
+  if (s:SynXMLish(prevsyn) || s:SynTSXBlockEnd(prevsyn)) &&
+        \ s:SynTSXContinues(cursyn, prevsyn)
     let ind = XmlIndentGet(v:lnum, 0)
     let l:line = getline(v:lnum)
     let l:pline = getline(v:lnum - 1)
@@ -112,4 +118,4 @@ fu! GetTsxIndent()
   endif
 
   return ind
-endfu
\ No newline at end of file
+endfu
diff --git a/syntax/aidl.vim b/syntax/aidl.vim
index 334033016..b271535b1 100644
--- a/syntax/aidl.vim
+++ b/syntax/aidl.vim
@@ -6,7 +6,7 @@ endif
 " Language:	aidl (Android Interface Definition Language)
 "		https://developer.android.com/guide/components/aidl
 " Maintainer:	Dominique Pelle <dominique.pelle@tomtom.com>
-" LastChange:	2020/07/25
+" LastChange:	2020/12/03
 
 " Quit when a syntax file was already loaded.
 if exists("b:current_syntax")
@@ -16,7 +16,7 @@ endif
 source <sfile>:p:h/java.vim
 
 syn keyword aidlParamDir in out inout
-syn keyword aidlKeyword oneway parcelable
+syn keyword aidlKeyword const oneway parcelable
 
 " Needed for the 'in', 'out', 'inout' keywords to be highlighted.
 syn cluster javaTop add=aidlParamDir
diff --git a/syntax/basic/members.vim b/syntax/basic/members.vim
index 81d243613..69d311ef4 100644
--- a/syntax/basic/members.vim
+++ b/syntax/basic/members.vim
@@ -45,6 +45,6 @@ syntax region  typescriptStringMember   contained
 
 syntax region  typescriptComputedMember   contained matchgroup=typescriptProperty
   \ start=/\[/rs=s+1 end=/]/
-  \ contains=@typescriptValue,typescriptMember,typescriptMappedIn
+  \ contains=@typescriptValue,typescriptMember,typescriptMappedIn,typescriptCastKeyword
   \ nextgroup=@memberNextGroup
   \ skipwhite skipempty
diff --git a/syntax/cabal-2.vim b/syntax/cabal-2.vim
index 72e6a6f74..1d7659883 100644
--- a/syntax/cabal-2.vim
+++ b/syntax/cabal-2.vim
@@ -8,7 +8,7 @@ endif
 " Maintainer:   Marcin Szamotulski <profunctor@pm.me>
 " Previous Maintainer:	Vincent Berthoux <twinside@gmail.com>
 " File Types:   .cabal
-" Last Change:  3 Oct 2020
+" Last Change:  21 Nov 2020
 " v1.5: Incorporated changes from
 "       https://github.com/sdiehl/haskell-vim-proto/blob/master/vim/syntax/cabal.vim
 "       Use `syn keyword` instead of `syn match`.
@@ -82,10 +82,13 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
 	\ default-extensions
 	\ author
         \ autogen-modules
+        \ asm-sources
+        \ asm-options
 	\ branch
 	\ bug-reports
 	\ build-depends
 	\ build-tools
+        \ build-tools-depends
 	\ build-type
 	\ buildable
 	\ c-sources
@@ -93,33 +96,46 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
 	\ category
 	\ cc-options
 	\ copyright
+        \ cmm-sources
+        \ cmm-options
 	\ cpp-options
+        \ cxx-sources
 	\ data-dir
 	\ data-files
 	\ default
+        \ default-extensions
 	\ description
 	\ executable
 	\ exposed-modules
 	\ exposed
 	\ extensions
-	\ extra-tmp-files
+        \ extra-bundled-libraries
 	\ extra-doc-files
+	\ extra-dynamic-library-flavours
+        \ extra-framework-dirs
+        \ extra-ghci-libraries
 	\ extra-lib-dirs
 	\ extra-libraries
+	\ extra-library-flavours
 	\ extra-source-files
-	\ exta-tmp-files
+	\ extra-tmp-files
 	\ for example
 	\ frameworks
 	\ ghc-options
 	\ ghc-prof-options
 	\ ghc-shared-options
+        \ ghcjs-options
+        \ ghcjs-prof-options
+        \ ghcjs-shared-options
 	\ homepage
+        \ hs-source-dir
 	\ hs-source-dirs
 	\ hugs-options
 	\ import
 	\ include-dirs
 	\ includes
 	\ install-includes
+        \ js-sources
 	\ ld-options
 	\ license
 	\ license-file
@@ -127,10 +143,13 @@ syn keyword cabalStatement contained containedin=cabalStatementRegion
 	\ main-is
 	\ maintainer
 	\ manual
+        \ mixins
 	\ module
 	\ name
 	\ nhc98-options
 	\ other-extensions
+        \ other-language
+        \ other-languages
 	\ other-modules
 	\ package-url
 	\ pkgconfig-depends
diff --git a/syntax/cs.vim b/syntax/cs.vim
index 362c80f41..7d758eb31 100644
--- a/syntax/cs.vim
+++ b/syntax/cs.vim
@@ -7,7 +7,7 @@ endif
 " Maintainer:          Nick Jensen <nickspoon@gmail.com>
 " Former Maintainers:  Anduin Withers <awithers@anduin.com>
 "                      Johannes Zellner <johannes@zellner.org>
-" Last Change:         2020-01-27
+" Last Change:         2020-11-23
 " Filenames:           *.cs
 " License:             Vim (see :h license)
 " Repository:          https://github.com/nickspoons/vim-cs
@@ -22,7 +22,6 @@ endif
 let s:save_cpo = &cpoptions
 set cpoptions&vim
 
-
 syn keyword	csType	bool byte char decimal double float int long object sbyte short string T uint ulong ushort var void dynamic
 syn keyword	csStorage	delegate enum interface namespace struct
 syn keyword	csRepeat	break continue do for foreach goto return while
@@ -31,7 +30,7 @@ syn keyword	csLabel	case default
 syn match	csOperatorError	display +::+
 syn match	csGlobal	display +global::+
 " user labels (see [1] 8.6 Statements)
-syn match	csLabel	display +^\s*\I\i*\s*:\([^:]\)\@=+
+syn match	csLabel	display +^\s*\I\i*\s*:\%([^:]\)\@=+
 syn keyword	csModifier	abstract const extern internal override private protected public readonly sealed static virtual volatile
 syn keyword	csConstant	false null true
 syn keyword	csException	try catch finally throw when
@@ -43,9 +42,10 @@ syn keyword	csUnsupportedStatement	add remove value
 syn keyword	csUnspecifiedKeyword	explicit implicit
 
 " Contextual Keywords
-syn match	csContextualStatement	/\<yield[[:space:]\n]\+\(return\|break\)/me=s+5
-syn match	csContextualStatement	/\<partial[[:space:]\n]\+\(class\|struct\|interface\)/me=s+7
-syn match	csContextualStatement	/\<\(get\|set\)\(;\|[[:space:]\n]*{\)/me=s+3
+syn match	csContextualStatement	/\<yield[[:space:]\n]\+\%(return\|break\)/me=s+5
+syn match	csContextualStatement	/\<partial[[:space:]\n]\+\%(class\|struct\|interface\)/me=s+7
+syn match	csContextualStatement	/\<\%(get\|set\)\%(;\|[[:space:]\n]*{\)/me=s+3
+syn match	csContextualStatement	/\<\%(get\|set\)\s*=>/me=s+3
 syn match	csContextualStatement	/\<where\>[^:]\+:/me=s+5
 
 " Operators
@@ -105,7 +105,7 @@ hi def link	xmlRegion Comment
 syn spell default
 
 " [1] 9.5 Pre-processing directives
-syn region	csPreCondit	start="^\s*#\s*\(define\|undef\|if\|elif\|else\|endif\|line\|error\|warning\)" skip="\\$" end="$" contains=csComment keepend
+syn region	csPreCondit	start="^\s*#\s*\%(define\|undef\|if\|elif\|else\|endif\|line\|error\|warning\|pragma\)\>" skip="\\$" end="$" contains=csComment keepend
 syn region	csRegion	matchgroup=csPreCondit start="^\s*#\s*region.*$" end="^\s*#\s*endregion" transparent fold contains=TOP
 syn region	csSummary	start="^\s*/// <summary" end="^\%\(\s*///\)\@!" transparent fold keepend
 
@@ -124,25 +124,27 @@ syn match	csSpecialError	"\\." contained
 syn match	csSpecialCharError	"[^']" contained
 " [1] 9.4.4.4 Character literals
 syn match	csSpecialChar	+\\["\\'0abfnrtvx]+ contained display
+syn match	csUnicodeNumber	+\\x\x\{2,4}+ contained contains=csUnicodeSpecifier display
 syn match	csUnicodeNumber	+\\u\x\{4}+ contained contains=csUnicodeSpecifier display
 syn match	csUnicodeNumber	+\\U\x\{8}+ contained contains=csUnicodeSpecifier display
 syn match	csUnicodeSpecifier	+\\[uU]+ contained display
 
 syn region	csString	matchgroup=csQuote start=+"+  end=+"+ end=+$+ extend contains=csSpecialChar,csSpecialError,csUnicodeNumber,@Spell
-syn match	csCharacter	"'[^']*'" contains=csSpecialChar,csSpecialCharError display
+syn match	csCharacter	"'[^']*'" contains=csSpecialChar,csSpecialCharError,csUnicodeNumber display
 syn match	csCharacter	"'\\''" contains=csSpecialChar display
 syn match	csCharacter	"'[^\\]'" display
 syn match	csNumber	"\<0[0-7]*[lL]\=\>" display
-syn match	csNumber	"\<0[xX]\x\+[lL]\=\>" display
-syn match	csNumber	"\<\d\+[lL]\=\>" display
-syn match	csNumber	"\<\d\+\.\d*\%\([eE][-+]\=\d\+\)\=[fFdD]\=" display
-syn match	csNumber	"\.\d\+\%\([eE][-+]\=\d\+\)\=[fFdD]\=" display
-syn match	csNumber	"\<\d\+[eE][-+]\=\d\+[fFdD]\=\>" display
-syn match	csNumber	"\<\d\+\%\([eE][-+]\=\d\+\)\=[fFdD]\>" display
+syn match	csNumber	"\<0[xX][[:xdigit:]_]\+[lL]\=\>" display
+syn match	csNumber	"\<0[bB][01_]\+[lL]\=\>" display
+syn match	csNumber	"\<[[:digit:]_]\+[lL]\=\>" display
+syn match	csNumber	"\<[[:digit:]_]\+\.[[:digit:]_]*\%\([eE][-+]\=[[:digit:]_]\+\)\=[fFdDmM]\=" display
+syn match	csNumber	"\.[[:digit:]_]\+\%\([eE][-+]\=[[:digit:]_]\+\)\=[fFdDmM]\=" display
+syn match	csNumber	"\<[[:digit:]_]\+[eE][-+]\=[[:digit:]_]\+[fFdDmM]\=\>" display
+syn match	csNumber	"\<[[:digit:]_]\+\%\([eE][-+]\=[[:digit:]_]\+\)\=[fFdDmM]\>" display
 
-syn region	csInterpolatedString	matchgroup=csQuote start=+\$"+ end=+"+ end=+$+ extend contains=csInterpolation,csEscapedInterpolation,csSpecialChar,csSpecialError,csUnicodeNumber,@Spell
+syn region	csInterpolatedString	matchgroup=csQuote start=+\$"+ end=+"+ extend contains=csInterpolation,csEscapedInterpolation,csSpecialChar,csSpecialError,csUnicodeNumber,@Spell
 
-syn region	csInterpolation	matchgroup=csInterpolationDelimiter start=+{+ end=+}+ keepend contained contains=@csAll,csBracketed,csInterpolationAlign,csInterpolationFormat
+syn region	csInterpolation	matchgroup=csInterpolationDelimiter start=+{+ end=+}+ keepend contained contains=@csAll,csBraced,csBracketed,csInterpolationAlign,csInterpolationFormat
 syn match	csEscapedInterpolation	"{{" transparent contains=NONE display
 syn match	csEscapedInterpolation	"}}" transparent contains=NONE display
 syn region	csInterpolationAlign	matchgroup=csInterpolationAlignDel start=+,+ end=+}+ end=+:+me=e-1 contained contains=csNumber,csConstant,csCharacter,csParens,csOpSymbols,csString,csBracketed display
@@ -156,9 +158,10 @@ syn match	csQuoteError	+@$"+he=s+2,me=s+2
 
 syn region	csInterVerbString	matchgroup=csQuote start=+\$@"+ end=+"+ skip=+""+ extend contains=csInterpolation,csEscapedInterpolation,csSpecialChar,csSpecialError,csUnicodeNumber,csVerbatimQuote,@Spell
 
-syn region	csBracketed	matchgroup=csParens start=+(+ end=+)+ contained transparent contains=@csAll,csBracketed
+syn region	csBracketed	matchgroup=csParens start=+(+ end=+)+ extend contained transparent contains=@csAll,csBraced,csBracketed
+syn region	csBraced	matchgroup=csParens start=+{+ end=+}+ extend contained transparent contains=@csAll,csBraced,csBracketed
 
-syn cluster	csAll	contains=csCharacter,csClassType,csComment,csContextualStatement,csEndColon,csInterpolatedString,csIsType,csLabel,csLogicSymbols,csNewType,csConstant,csNumber,csOpSymbols,csOperatorError,csParens,csPreCondit,csRegion,csString,csSummary,csType,csUnicodeNumber,csUnicodeSpecifier,csVerbatimString,csUserType,csUserIdentifier,csUserInterface,csUserMethod
+syn cluster	csAll	contains=csCharacter,csClassType,csComment,csContextualStatement,csEndColon,csIsType,csLabel,csLogicSymbols,csNewType,csConstant,csNumber,csOpSymbols,csOperatorError,csParens,csPreCondit,csRegion,csString,csSummary,csType,csUnicodeNumber,csUnicodeSpecifier,csInterpolatedString,csVerbatimString,csInterVerbString,csUserType,csUserIdentifier,csUserInterface,csUserMethod
 
 " The default highlighting.
 hi def link	csType	Type
diff --git a/syntax/debchangelog.vim b/syntax/debchangelog.vim
index 4f89fbbbd..11eaf3591 100644
--- a/syntax/debchangelog.vim
+++ b/syntax/debchangelog.vim
@@ -7,7 +7,7 @@ endif
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2020 Oct 28
+" Last Change: 2020 Nov 28
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -26,9 +26,9 @@ set cpo-=C
 let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
       \ 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
-      \ 'sid', 'rc-buggy',
+      \ 'trixie', 'sid', 'rc-buggy',
       \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'groovy', 'hippo', 'devel'
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'groovy', 'hirsute', 'devel'
       \ ]
 let s:unsupported = [
       \ 'frozen', 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
diff --git a/syntax/debsources.vim b/syntax/debsources.vim
index 4447b20c9..caeb50aec 100644
--- a/syntax/debsources.vim
+++ b/syntax/debsources.vim
@@ -6,7 +6,7 @@ endif
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2020 Oct 26
+" Last Change: 2020 Nov 28
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -28,9 +28,9 @@ set cpo-=C
 let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
       \ 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
-      \ 'sid', 'rc-buggy',
+      \ 'trixie', 'sid', 'rc-buggy',
       \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'groovy', 'hippo', 'devel'
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'groovy', 'hirsute', 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
diff --git a/syntax/diff.vim b/syntax/diff.vim
index a11a58aed..c3eefbb75 100644
--- a/syntax/diff.vim
+++ b/syntax/diff.vim
@@ -6,7 +6,7 @@ endif
 " Language:	Diff (context or unified)
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
 "               Translations by Jakson Alves de Aquino.
-" Last Change:	2016 Apr 02
+" Last Change:	2020 Dec 07
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -350,9 +350,11 @@ syn match diffLine	"^---$"
 syn match diffLine	"^\d\+\(,\d\+\)\=[cda]\d\+\>.*"
 
 syn match diffFile	"^diff\>.*"
-syn match diffFile	"^+++ .*"
 syn match diffFile	"^Index: .*"
 syn match diffFile	"^==== .*"
+" Old style diff uses *** for old and --- for new.
+" Unified diff uses --- for old and +++ for new; names are wrong but it works.
+syn match diffOldFile	"^+++ .*"
 syn match diffOldFile	"^\*\*\* .*"
 syn match diffNewFile	"^--- .*"
 
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index ac4dec43b..6682756ef 100644
--- a/syntax/eelixir.vim
+++ b/syntax/eelixir.vim
@@ -27,7 +27,10 @@ if !exists("b:eelixir_subtype")
     let b:eelixir_subtype = matchstr(&filetype,'^leex\.\zs\w\+')
   endif
   if b:eelixir_subtype == ''
-    let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.leex\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
+    let b:eelixir_subtype = matchstr(&filetype,'^sface\.\zs\w\+')
+  endif
+  if b:eelixir_subtype == ''
+    let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.sface\|\.leex\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
   endif
   if b:eelixir_subtype == 'ex'
     let b:eelixir_subtype = 'elixir'
@@ -52,16 +55,18 @@ endif
 
 syn include @elixirTop syntax/elixir.vim
 
-syn cluster eelixirRegions contains=eelixirBlock,eelixirExpression,eelixirComment
+syn cluster eelixirRegions contains=eelixirBlock,surfaceExpression,eelixirExpression,eelixirComment
 
 exe 'syn region  eelixirExpression matchgroup=eelixirDelimiter start="<%"  end="%\@<!%>" contains=@elixirTop  containedin=ALLBUT,@eelixirRegions keepend'
 exe 'syn region  eelixirExpression matchgroup=eelixirDelimiter start="<%=" end="%\@<!%>" contains=@elixirTop  containedin=ALLBUT,@eelixirRegions keepend'
+exe 'syn region  surfaceExpression matchgroup=surfaceDelimiter start="{{" end="}}" contains=@elixirTop  containedin=ALLBUT,@eelixirRegions keepend'
 exe 'syn region  eelixirQuote      matchgroup=eelixirDelimiter start="<%%" end="%\@<!%>" contains=@elixirTop  containedin=ALLBUT,@eelixirRegions keepend'
 exe 'syn region  eelixirComment    matchgroup=eelixirDelimiter start="<%#" end="%\@<!%>" contains=elixirTodo,@Spell containedin=ALLBUT,@eelixirRegions keepend'
 
 " Define the default highlighting.
 
 hi def link eelixirDelimiter PreProc
+hi def link surfaceDelimiter PreProc
 hi def link eelixirComment   Comment
 
 let b:current_syntax = 'eelixir'
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index a155116a5..02e71a421 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -115,7 +115,9 @@ syn region elixirSigil matchgroup=elixirSigilDelimiter start=+\~\a\z('''\)+ end=
 syntax include @HTML syntax/html.vim
 unlet b:current_syntax
 syntax region elixirLiveViewSigil matchgroup=elixirSigilDelimiter keepend start=+\~L\z("""\)+ end=+^\s*\z1+ skip=+\\"+ contains=@HTML fold
-
+syntax region elixirSurfaceSigil matchgroup=elixirSigilDelimiter keepend start=+\~H\z("""\)+ end=+^\s*\z1+ skip=+\\"+ contains=@HTML fold
+syntax region elixirPhoenixESigil matchgroup=elixirSigilDelimiter keepend start=+\~E\z("""\)+ end=+^\s*\z1+ skip=+\\"+ contains=@HTML fold
+syntax region elixirPhoenixeSigil matchgroup=elixirSigilDelimiter keepend start=+\~e\z("""\)+ end=+^\s*\z1+ skip=+\\"+ contains=@HTML fold
 
 " Documentation
 if exists('g:elixir_use_markdown_for_docs') && g:elixir_use_markdown_for_docs
diff --git a/syntax/gosum.vim b/syntax/gosum.vim
new file mode 100644
index 000000000..07130ca20
--- /dev/null
+++ b/syntax/gosum.vim
@@ -0,0 +1,59 @@
+if has_key(g:polyglot_is_disabled, 'go')
+  finish
+endif
+
+" gosum.vim: Vim syntax file for go.sum file
+"
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax case match
+
+" highlight versions:
+"  * vX.Y.Z-pre
+"  * vX.Y.Z
+"  * vX.0.0-yyyyymmddhhmmss-abcdefabcdef
+"  * vX.Y.Z-pre.0.yyyymmddhhmmss-abcdefabcdef
+"  * vX.Y.(Z+1)-0.yyyymmddhhss-abcdefabcdef
+"  see https://godoc.org/golang.org/x/tools/internal/semver for more
+"  information about how semantic versions are parsed and
+"  https://golang.org/cmd/go/ for how pseudo-versions and +incompatible
+"  are applied.
+
+
+" match vX.Y.Z and their prereleases
+syntax match gomodVersion "v\d\+\.\d\+\.\d\+\%(-\%([0-9A-Za-z-]\+\)\%(\.[0-9A-Za-z-]\+\)*\)\?\%(+\%([0-9A-Za-z-]\+\)\(\.[0-9A-Za-z-]\+\)*\)\?"
+"                          ^--- version ---^^------------ pre-release  ---------------------^^--------------- metadata ---------------------^
+"   	                     ^--------------------------------------- semantic version -------------------------------------------------------^
+
+" match pseudo versions
+" without a major version before the commit (e.g.  vX.0.0-yyyymmddhhmmss-abcdefabcdef)
+syntax match gomodVersion  "v\d\+\.0\.0-\d\{14\}-\x\+"
+" when most recent version before target is a pre-release
+syntax match gomodVersion  "v\d\+\.\d\+\.\d\+-\%([0-9A-Za-z-]\+\)\%(\.[0-9A-Za-z-]\+\)*\%(+\%([0-9A-Za-z-]\+\)\(\.[0-9A-Za-z-]\+\)*\)\?\.0\.\d\{14}-\x\+"
+"                          ^--- version ---^^--- ------ pre-release -----------------^^--------------- metadata ---------------------^
+"                     	   ^------------------------------------- semantic version --------------------------------------------------^
+" most recent version before the target is X.Y.Z
+syntax match gomodVersion "v\d\+\.\d\+\.\d\+\%(+\%([0-9A-Za-z-]\+\)\(\.[0-9A-Za-z-]\+\)*\)\?-0\.\d\{14}-\x\+"
+"                          ^--- version ---^^--------------- metadata ---------------------^
+
+" match incompatible vX.Y.Z and their prereleases
+syntax match gomodVersion "v[2-9]\{1}\d*\.\d\+\.\d\+\%(-\%([0-9A-Za-z-]\+\)\%(\.[0-9A-Za-z-]\+\)*\)\?\%(+\%([0-9A-Za-z-]\+\)\(\.[0-9A-Za-z-]\+\)*\)\?+incompatible"
+"                          ^------- version -------^^------------- pre-release ---------------------^^--------------- metadata ---------------------^
+"               	         ^------------------------------------------- semantic version -----------------------------------------------------------^
+
+" match incompatible pseudo versions
+" incompatible without a major version before the commit (e.g.  vX.0.0-yyyymmddhhmmss-abcdefabcdef)
+syntax match gomodVersion "v[2-9]\{1}\d*\.0\.0-\d\{14\}-\x\++incompatible"
+" when most recent version before target is a pre-release
+syntax match gomodVersion "v[2-9]\{1}\d*\.\d\+\.\d\+-\%([0-9A-Za-z-]\+\)\%(\.[0-9A-Za-z-]\+\)*\%(+\%([0-9A-Za-z-]\+\)\(\.[0-9A-Za-z-]\+\)*\)\?\.0\.\d\{14}-\x\++incompatible"
+"                          ^------- version -------^^---------- pre-release -----------------^^--------------- metadata ---------------------^
+"                     	   ^---------------------------------------- semantic version ------------------------------------------------------^
+" most recent version before the target is X.Y.Z
+syntax match gomodVersion "v[2-9]\{1}\d*\.\d\+\.\d\+\%(+\%([0-9A-Za-z-]\+\)\%(\.[0-9A-Za-z-]\+\)*\)\?-0\.\d\{14}-\x\++incompatible"
+"                          ^------- version -------^^---------------- metadata ---------------------^
+highlight default link gomodVersion Identifier
+
+let b:current_syntax = "gomod"
diff --git a/syntax/graphql.vim b/syntax/graphql.vim
index a41f82514..a5351b089 100644
--- a/syntax/graphql.vim
+++ b/syntax/graphql.vim
@@ -94,6 +94,8 @@ hi def link graphqlStructure        Structure
 hi def link graphqlType             Type
 hi def link graphqlVariable         Identifier
 
-syn sync minlines=500
+if !get(b:, 'graphql_nested_syntax')
+    syn sync minlines=500
+endif
 
 let b:current_syntax = 'graphql'
diff --git a/syntax/idris2.vim b/syntax/idris2.vim
index 1c7d800c4..65856380a 100644
--- a/syntax/idris2.vim
+++ b/syntax/idris2.vim
@@ -30,7 +30,6 @@ syn keyword idrisStatement do case of rewrite with
 syn keyword idrisLet let in
 syn keyword idrisForall forall
 syn keyword idrisDataOpt noHints uniqueSearch search external noNewtype containedin=idrisBrackets
-syn match idrisSyntax "\(pattern \+\|term \+\)\?syntax"
 syn keyword idrisConditional if then else
 syn match idrisNumber "\<[0-9]\+\>\|\<0[xX][0-9a-fA-F]\+\>\|\<0[oO][0-7]\+\>"
 syn match idrisFloat "\<[0-9]\+\.[0-9]\+\([eE][-+]\=[0-9]\+\)\=\>"
@@ -42,7 +41,7 @@ syn keyword idrisTodo TODO FIXME XXX HACK contained
 syn match idrisLineComment "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contains=idrisTodo,@Spell
 syn match idrisDocComment "|||\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contains=idrisTodo,@Spell
 syn match idrisMetaVar "?[a-z][A-Za-z0-9_']*"
-syn match idrisPragma "%\(hide\|logging\|auto_lazy\|unbound_implicits\|undotted_record_projections\|amibguity_depth\|pair\|rewrite\|integerLit\|stringLit\|charLit\|name\|start\|allow_overloads\|language\|default\|transform\|hint\|global_hint\|defaulthint\|inline\|extern\|macro\|spec\|foreign\|runElab\|tcinline\)"
+syn match idrisPragma "%\(hide\|logging\|auto_lazy\|unbound_implicits\|undotted_record_projections\|amibguity_depth\|pair\|rewrite\|integerLit\|stringLit\|charLit\|name\|start\|allow_overloads\|language\|default\|transform\|hint\|global_hint\|defaulthint\|inline\|extern\|macro\|spec\|foreign\|runElab\|tcinline\|defaulthint\|auto_implicit_depth\)"
 syn match idrisChar "'[^'\\]'\|'\\.'\|'\\u[0-9a-fA-F]\{4}'"
 syn match idrisBacktick "`[A-Za-z][A-Za-z0-9_']*`"
 syn region idrisString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell
@@ -63,7 +62,6 @@ highlight def link idrisAnnotation Statement
 highlight def link idrisWhere Structure
 highlight def link idrisLet Structure
 highlight def link idrisTotality Statement
-highlight def link idrisSyntax Statement
 highlight def link idrisVisibility Statement
 highlight def link idrisConditional Conditional
 highlight def link idrisPragma Statement
diff --git a/syntax/lex.vim b/syntax/lex.vim
index 7979f3aeb..144f0deb4 100644
--- a/syntax/lex.vim
+++ b/syntax/lex.vim
@@ -126,7 +126,7 @@ if has("folding")
  syn region lexPatComment	fold	start="//"	end="$"		skipnl	contained	contains=cTodo	skipwhite	nextgroup=lexPatComment,lexPat,@Spell
  syn region lexPatComment	fold	start="/\*"	end="\*/"	skipnl	contained	contains=cTodo	skipwhite	nextgroup=lexPatComment,lexPat,@Spell
 else
- syn region lexPatTagZoneStart		matchgroup=lexPatTag		start='{'	end='^}'	skipnl	skipwhitecontained	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatSep,lexPatInclude
+ syn region lexPatTagZoneStart		matchgroup=lexPatTag		start='{'	end='^}'	skipnl	skipwhite	contained	contains=lexPatTag,lexPatTagZone,lexPatComment,lexPat,lexPatSep,lexPatInclude
  syn region lexPatComment		start="//"	end="$"		skipnl	contained	contains=cTodo	skipwhite	nextgroup=lexPatComment,lexPat,@Spell
  syn region lexPatComment		start="/\*"	end="\*/"	skipnl	contained	contains=cTodo	skipwhite	nextgroup=lexPatComment,lexPat,@Spell
 endif
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 91e48eb7e..96913e669 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -8,8 +8,8 @@ endif
 " Version:      2.3.0
 " License:      Vim license (see `:help license`)
 
-" Based on PostgreSQL 13.0
-" Automatically generated on 2020-11-15 at 22:23:22
+" Based on PostgreSQL 13.1
+" Automatically generated on 2020-12-23 at 20:13:28
 
 if exists("b:current_syntax")
   finish
@@ -34,40 +34,42 @@ syn keyword sqlStatement contained rollback savepoint security select select set
 syn keyword sqlStatement contained truncate unlisten update vacuum values work
 syn match sqlStatement contained /\<create\%(\_s\+or\_s\+replace\)\=\>/
 " Types
-syn keyword sqlType contained aclitem addr addr_gid_seq addrfeat addrfeat_gid_seq anyarray
-syn keyword sqlType contained anycompatible anycompatiblearray anycompatiblenonarray
-syn keyword sqlType contained anycompatiblerange anyelement anyenum anynonarray anyrange bg bg_gid_seq bit
-syn keyword sqlType contained bool box box2d box2df box3d bpchar bytea cardinal_number char
-syn keyword sqlType contained character_data cid cidr circle citext county county_gid_seq
-syn keyword sqlType contained county_lookup countysub_lookup cousub cousub_gid_seq cstring cube date
-syn keyword sqlType contained daterange dblink_pkey_results direction_lookup ean13 earth edges
-syn keyword sqlType contained edges_gid_seq errcodes event_trigger faces faces_gid_seq fdw_handler
-syn keyword sqlType contained featnames featnames_gid_seq float4 float8 gbtreekey16 gbtreekey32
-syn keyword sqlType contained gbtreekey4 gbtreekey8 gbtreekey_var geocode_settings
-syn keyword sqlType contained geocode_settings_default geography geography_columns geometry
-syn keyword sqlType contained geometry_columns geometry_dump getfaceedges_returntype ghstore gidx gtrgm
-syn keyword sqlType contained gtsvector hstore index_am_handler inet int2 int2vector int4 int4range
-syn keyword sqlType contained int8 int8range intbig_gkey internal interval isbn isbn13 ismn ismn13
-syn keyword sqlType contained issn issn13 json jsonb jsonpath language_handler layer line lo
-syn keyword sqlType contained loader_lookuptables loader_platform loader_variables lquery lseg
-syn keyword sqlType contained ltree ltree_gist ltxtquery macaddr macaddr8 money norm_addy numeric
-syn keyword sqlType contained numrange oid oidvector pagc_gaz pagc_gaz_id_seq pagc_lex
-syn keyword sqlType contained pagc_lex_id_seq pagc_rules pagc_rules_id_seq path pg_all_foreign_keys
-syn keyword sqlType contained pg_ddl_command pg_dependencies pg_lsn pg_mcv_list pg_ndistinct
-syn keyword sqlType contained pg_node_tree pg_snapshot place place_gid_seq place_lookup point polygon
-syn keyword sqlType contained query_int record refcursor regclass regcollation regconfig
-syn keyword sqlType contained regdictionary regnamespace regoper regoperator regproc regprocedure
-syn keyword sqlType contained regrole regtype secondary_unit_lookup seg spatial_ref_sys spheroid
-syn keyword sqlType contained sql_identifier state state_gid_seq state_lookup stdaddr
-syn keyword sqlType contained street_type_lookup tabblock tabblock_gid_seq table_am_handler
-syn keyword sqlType contained tablefunc_crosstab_2 tablefunc_crosstab_3 tablefunc_crosstab_4 tap_funky
-syn keyword sqlType contained text tid time time_stamp timestamp timestamptz timetz topoelement
+syn keyword sqlType contained aclitem addbandarg addr addr_gid_seq addrfeat addrfeat_gid_seq
+syn keyword sqlType contained agg_count agg_samealignment anyarray anycompatible
+syn keyword sqlType contained anycompatiblearray anycompatiblenonarray anycompatiblerange anyelement
+syn keyword sqlType contained anyenum anynonarray anyrange bg bg_gid_seq bit bool box box2d box2df box3d
+syn keyword sqlType contained bpchar bytea cardinal_number char character_data cid cidr circle
+syn keyword sqlType contained citext county county_gid_seq county_lookup countysub_lookup cousub
+syn keyword sqlType contained cousub_gid_seq cstring cube date daterange dblink_pkey_results
+syn keyword sqlType contained direction_lookup ean13 earth edges edges_gid_seq errcodes
+syn keyword sqlType contained event_trigger faces faces_gid_seq fdw_handler featnames featnames_gid_seq
+syn keyword sqlType contained float4 float8 gbtreekey16 gbtreekey32 gbtreekey4 gbtreekey8
+syn keyword sqlType contained gbtreekey_var geocode_settings geocode_settings_default geography
+syn keyword sqlType contained geography_columns geometry geometry_columns geometry_dump geomval
+syn keyword sqlType contained getfaceedges_returntype ghstore gidx gtrgm gtsvector hstore
+syn keyword sqlType contained index_am_handler inet int2 int2vector int4 int4range int8 int8range
+syn keyword sqlType contained intbig_gkey internal interval isbn isbn13 ismn ismn13 issn issn13 json
+syn keyword sqlType contained jsonb jsonpath language_handler layer line lo loader_lookuptables
+syn keyword sqlType contained loader_platform loader_variables lquery lseg ltree ltree_gist
+syn keyword sqlType contained ltxtquery macaddr macaddr8 money norm_addy numeric numrange oid
+syn keyword sqlType contained oidvector pagc_gaz pagc_gaz_id_seq pagc_lex pagc_lex_id_seq pagc_rules
+syn keyword sqlType contained pagc_rules_id_seq path pg_all_foreign_keys pg_ddl_command
+syn keyword sqlType contained pg_dependencies pg_lsn pg_mcv_list pg_ndistinct pg_node_tree
+syn keyword sqlType contained pg_snapshot place place_gid_seq place_lookup point polygon query_int
+syn keyword sqlType contained rastbandarg raster raster_columns raster_overviews reclassarg record
+syn keyword sqlType contained refcursor regclass regcollation regconfig regdictionary
+syn keyword sqlType contained regnamespace regoper regoperator regproc regprocedure regrole regtype
+syn keyword sqlType contained secondary_unit_lookup seg spatial_ref_sys spheroid sql_identifier state
+syn keyword sqlType contained state_gid_seq state_lookup stdaddr street_type_lookup
+syn keyword sqlType contained summarystats tabblock tabblock_gid_seq table_am_handler
+syn keyword sqlType contained tablefunc_crosstab_2 tablefunc_crosstab_3 tablefunc_crosstab_4 tap_funky text
+syn keyword sqlType contained tid time time_stamp timestamp timestamptz timetz topoelement
 syn keyword sqlType contained topoelementarray topogeometry topology topology_id_seq tract
-syn keyword sqlType contained tract_gid_seq tsm_handler tsquery tsrange tstzrange tsvector
-syn keyword sqlType contained txid_snapshot upc us_gaz us_gaz_id_seq us_lex us_lex_id_seq us_rules
-syn keyword sqlType contained us_rules_id_seq uuid valid_detail validatetopology_returntype varbit
-syn keyword sqlType contained varchar void xid xid8 xml yes_or_no zcta5 zcta5_gid_seq zip_lookup
-syn keyword sqlType contained zip_lookup_all zip_lookup_base zip_state zip_state_loc
+syn keyword sqlType contained tract_gid_seq tsm_handler tsquery tsrange tstzrange tsvector txid_snapshot
+syn keyword sqlType contained unionarg upc us_gaz us_gaz_id_seq us_lex us_lex_id_seq us_rules
+syn keyword sqlType contained us_rules_id_seq uuid valid_detail validatetopology_returntype
+syn keyword sqlType contained varbit varchar void xid xid8 xml yes_or_no zcta5 zcta5_gid_seq
+syn keyword sqlType contained zip_lookup zip_lookup_all zip_lookup_base zip_state zip_state_loc
 syn match sqlType /\<pg_toast_\d\+\>/
 syn match sqlType /\<time\%[stamp]\s\+with\%[out]\>/
 syn match sqlKeyword /\<with\s\+grant\>/
@@ -708,10 +710,11 @@ syn keyword sqlConstant contained btree_gist citext cube dblink dict_int dict_xs
 syn keyword sqlConstant contained fuzzystrmatch hstore hstore_plperl hstore_plperlu insert_username
 syn keyword sqlConstant contained intagg intarray isn jsonb_plperl jsonb_plperlu lo ltree moddatetime
 syn keyword sqlConstant contained pageinspect pg_buffercache pg_freespacemap pg_prewarm
-syn keyword sqlConstant contained pg_stat_statements pg_trgm pg_visibility pgcrypto pgrowlocks pgstattuple
-syn keyword sqlConstant contained pgtap plperl plperlu plpgsql pltcl pltclu postgis postgis_sfcgal
-syn keyword sqlConstant contained postgis_tiger_geocoder postgis_topology postgres_fdw refint seg
-syn keyword sqlConstant contained sslinfo tablefunc tcn tsm_system_rows tsm_system_time unaccent xml2
+syn keyword sqlConstant contained pg_stat_statements pg_trgm pg_visibility pgcrypto pgrouting pgrowlocks
+syn keyword sqlConstant contained pgstattuple pgtap plperl plperlu plpgsql pltcl pltclu postgis
+syn keyword sqlConstant contained postgis_raster postgis_sfcgal postgis_tiger_geocoder postgis_topology
+syn keyword sqlConstant contained postgres_fdw refint seg sslinfo tablefunc tcn tsm_system_rows
+syn keyword sqlConstant contained tsm_system_time unaccent xml2
 " Legacy extensions names
 syn keyword sqlConstant contained chkpass hstore_plpython2u hstore_plpython3u hstore_plpythonu
 syn keyword sqlConstant contained jsonb_plpython3u ltree_plpython2u ltree_plpython3u
@@ -720,7 +723,7 @@ syn keyword sqlConstant contained ltree_plpythonu pldbgapi plpython2u plpython3u
 if index(get(g:, 'pgsql_disabled_extensions', []), 'refint') == -1
   syn keyword sqlFunction contained check_foreign_key check_primary_key
 endif " refint
-" Extension: postgis (v3.0.2)
+" Extension: postgis (v3.1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis') == -1
   syn keyword sqlFunction contained addauth addgeometrycolumn box
   syn keyword sqlFunction contained box2d box2d_in box2d_out box2df_in
@@ -802,114 +805,116 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis') == -1
   syn keyword sqlFunction contained postgis_extensions_upgrade postgis_full_version postgis_geos_noop
   syn keyword sqlFunction contained postgis_geos_version postgis_getbbox
   syn keyword sqlFunction contained postgis_hasbbox postgis_index_supportfn
-  syn keyword sqlFunction contained postgis_lib_build_date postgis_lib_version
-  syn keyword sqlFunction contained postgis_libjson_version postgis_liblwgeom_version
-  syn keyword sqlFunction contained postgis_libprotobuf_version postgis_libxml_version
-  syn keyword sqlFunction contained postgis_noop postgis_proj_version
-  syn keyword sqlFunction contained postgis_scripts_build_date postgis_scripts_installed
-  syn keyword sqlFunction contained postgis_scripts_released postgis_svn_version
-  syn keyword sqlFunction contained postgis_transform_geometry postgis_type_name postgis_typmod_dims
-  syn keyword sqlFunction contained postgis_typmod_srid postgis_typmod_type
-  syn keyword sqlFunction contained postgis_version postgis_wagyu_version
-  syn keyword sqlFunction contained spheroid_in spheroid_out st_3dclosestpoint
-  syn keyword sqlFunction contained st_3ddfullywithin st_3ddistance st_3ddwithin
-  syn keyword sqlFunction contained st_3dextent st_3dintersects st_3dlength
-  syn keyword sqlFunction contained st_3dlineinterpolatepoint st_3dlongestline
-  syn keyword sqlFunction contained st_3dmakebox st_3dmaxdistance st_3dperimeter
-  syn keyword sqlFunction contained st_3dshortestline st_addmeasure st_addpoint
-  syn keyword sqlFunction contained st_affine st_angle st_area st_area2d
-  syn keyword sqlFunction contained st_asbinary st_asencodedpolyline st_asewkb
-  syn keyword sqlFunction contained st_asewkt st_asgeobuf st_asgeojson
-  syn keyword sqlFunction contained st_asgml st_ashexewkb st_askml
-  syn keyword sqlFunction contained st_aslatlontext st_asmvt st_asmvtgeom st_assvg
-  syn keyword sqlFunction contained st_astext st_astwkb st_asx3d st_azimuth
-  syn keyword sqlFunction contained st_bdmpolyfromtext st_bdpolyfromtext
-  syn keyword sqlFunction contained st_boundary st_boundingdiagonal st_box2dfromgeohash
-  syn keyword sqlFunction contained st_buffer st_buildarea st_centroid
-  syn keyword sqlFunction contained st_chaikinsmoothing st_cleangeometry
-  syn keyword sqlFunction contained st_clipbybox2d st_closestpoint st_closestpointofapproach
-  syn keyword sqlFunction contained st_clusterdbscan st_clusterintersecting
-  syn keyword sqlFunction contained st_clusterkmeans st_clusterwithin st_collect
-  syn keyword sqlFunction contained st_collectionextract st_collectionhomogenize
-  syn keyword sqlFunction contained st_combinebbox st_concavehull st_contains
-  syn keyword sqlFunction contained st_containsproperly st_convexhull st_coorddim
-  syn keyword sqlFunction contained st_coveredby st_covers st_cpawithin
-  syn keyword sqlFunction contained st_crosses st_curvetoline st_delaunaytriangles
-  syn keyword sqlFunction contained st_dfullywithin st_difference
-  syn keyword sqlFunction contained st_dimension st_disjoint st_distance st_distancecpa
-  syn keyword sqlFunction contained st_distancesphere st_distancespheroid
-  syn keyword sqlFunction contained st_dump st_dumppoints st_dumprings
-  syn keyword sqlFunction contained st_dwithin st_endpoint st_envelope st_equals
-  syn keyword sqlFunction contained st_estimatedextent st_expand st_extent
-  syn keyword sqlFunction contained st_exteriorring st_filterbym st_findextent
-  syn keyword sqlFunction contained st_flipcoordinates st_force2d st_force3d
-  syn keyword sqlFunction contained st_force3dm st_force3dz st_force4d
-  syn keyword sqlFunction contained st_forcecollection st_forcecurve st_forcepolygonccw
-  syn keyword sqlFunction contained st_forcepolygoncw st_forcerhr
-  syn keyword sqlFunction contained st_forcesfs st_frechetdistance st_generatepoints
-  syn keyword sqlFunction contained st_geogfromtext st_geogfromwkb
-  syn keyword sqlFunction contained st_geographyfromtext st_geohash st_geomcollfromtext
-  syn keyword sqlFunction contained st_geomcollfromwkb st_geometricmedian
-  syn keyword sqlFunction contained st_geometryfromtext st_geometryn st_geometrytype
-  syn keyword sqlFunction contained st_geomfromewkb st_geomfromewkt st_geomfromgeohash
-  syn keyword sqlFunction contained st_geomfromgeojson st_geomfromgml
-  syn keyword sqlFunction contained st_geomfromkml st_geomfromtext st_geomfromtwkb
-  syn keyword sqlFunction contained st_geomfromwkb st_gmltosql st_hasarc
-  syn keyword sqlFunction contained st_hausdorffdistance st_interiorringn
+  syn keyword sqlFunction contained postgis_lib_build_date postgis_lib_revision
+  syn keyword sqlFunction contained postgis_lib_version postgis_libjson_version
+  syn keyword sqlFunction contained postgis_liblwgeom_version postgis_libprotobuf_version
+  syn keyword sqlFunction contained postgis_libxml_version postgis_noop postgis_proj_version
+  syn keyword sqlFunction contained postgis_scripts_build_date
+  syn keyword sqlFunction contained postgis_scripts_installed postgis_scripts_released
+  syn keyword sqlFunction contained postgis_svn_version postgis_transform_geometry
+  syn keyword sqlFunction contained postgis_type_name postgis_typmod_dims postgis_typmod_srid
+  syn keyword sqlFunction contained postgis_typmod_type postgis_version
+  syn keyword sqlFunction contained postgis_wagyu_version spheroid_in spheroid_out
+  syn keyword sqlFunction contained st_3dclosestpoint st_3ddfullywithin st_3ddistance
+  syn keyword sqlFunction contained st_3ddwithin st_3dextent st_3dintersects
+  syn keyword sqlFunction contained st_3dlength st_3dlineinterpolatepoint
+  syn keyword sqlFunction contained st_3dlongestline st_3dmakebox st_3dmaxdistance
+  syn keyword sqlFunction contained st_3dperimeter st_3dshortestline
+  syn keyword sqlFunction contained st_addmeasure st_addpoint st_affine st_angle
+  syn keyword sqlFunction contained st_area st_area2d st_asbinary
+  syn keyword sqlFunction contained st_asencodedpolyline st_asewkb st_asewkt st_asgeobuf
+  syn keyword sqlFunction contained st_asgeojson st_asgml st_ashexewkb
+  syn keyword sqlFunction contained st_askml st_aslatlontext st_asmvt
+  syn keyword sqlFunction contained st_asmvtgeom st_assvg st_astext st_astwkb
+  syn keyword sqlFunction contained st_asx3d st_azimuth st_bdmpolyfromtext
+  syn keyword sqlFunction contained st_bdpolyfromtext st_boundary st_boundingdiagonal
+  syn keyword sqlFunction contained st_box2dfromgeohash st_buffer
+  syn keyword sqlFunction contained st_buildarea st_centroid st_chaikinsmoothing
+  syn keyword sqlFunction contained st_cleangeometry st_clipbybox2d st_closestpoint
+  syn keyword sqlFunction contained st_closestpointofapproach st_clusterdbscan
+  syn keyword sqlFunction contained st_clusterintersecting st_clusterkmeans
+  syn keyword sqlFunction contained st_clusterwithin st_collect st_collectionextract
+  syn keyword sqlFunction contained st_collectionhomogenize st_combinebbox
+  syn keyword sqlFunction contained st_concavehull st_contains st_containsproperly
+  syn keyword sqlFunction contained st_convexhull st_coorddim st_coveredby
+  syn keyword sqlFunction contained st_covers st_cpawithin st_crosses st_curvetoline
+  syn keyword sqlFunction contained st_delaunaytriangles st_dfullywithin
+  syn keyword sqlFunction contained st_difference st_dimension st_disjoint
+  syn keyword sqlFunction contained st_distance st_distancecpa st_distancesphere
+  syn keyword sqlFunction contained st_distancespheroid st_dump st_dumppoints
+  syn keyword sqlFunction contained st_dumprings st_dwithin st_endpoint
+  syn keyword sqlFunction contained st_envelope st_equals st_estimatedextent
+  syn keyword sqlFunction contained st_expand st_extent st_exteriorring
+  syn keyword sqlFunction contained st_filterbym st_findextent st_flipcoordinates
+  syn keyword sqlFunction contained st_force2d st_force3d st_force3dm st_force3dz
+  syn keyword sqlFunction contained st_force4d st_forcecollection
+  syn keyword sqlFunction contained st_forcecurve st_forcepolygonccw st_forcepolygoncw
+  syn keyword sqlFunction contained st_forcerhr st_forcesfs st_frechetdistance
+  syn keyword sqlFunction contained st_generatepoints st_geogfromtext
+  syn keyword sqlFunction contained st_geogfromwkb st_geographyfromtext st_geohash
+  syn keyword sqlFunction contained st_geomcollfromtext st_geomcollfromwkb
+  syn keyword sqlFunction contained st_geometricmedian st_geometryfromtext st_geometryn
+  syn keyword sqlFunction contained st_geometrytype st_geomfromewkb st_geomfromewkt
+  syn keyword sqlFunction contained st_geomfromgeohash st_geomfromgeojson
+  syn keyword sqlFunction contained st_geomfromgml st_geomfromkml st_geomfromtext
+  syn keyword sqlFunction contained st_geomfromtwkb st_geomfromwkb st_gmltosql
+  syn keyword sqlFunction contained st_hasarc st_hausdorffdistance st_hexagon
+  syn keyword sqlFunction contained st_hexagongrid st_interiorringn
   syn keyword sqlFunction contained st_interpolatepoint st_intersection st_intersects
   syn keyword sqlFunction contained st_isclosed st_iscollection st_isempty
-  syn keyword sqlFunction contained st_ispolygonccw st_ispolygoncw st_isring st_issimple
-  syn keyword sqlFunction contained st_isvalid st_isvaliddetail
+  syn keyword sqlFunction contained st_ispolygonccw st_ispolygoncw st_isring
+  syn keyword sqlFunction contained st_issimple st_isvalid st_isvaliddetail
   syn keyword sqlFunction contained st_isvalidreason st_isvalidtrajectory st_length
-  syn keyword sqlFunction contained st_length2d st_length2dspheroid st_lengthspheroid
-  syn keyword sqlFunction contained st_linecrossingdirection
+  syn keyword sqlFunction contained st_length2d st_length2dspheroid
+  syn keyword sqlFunction contained st_lengthspheroid st_linecrossingdirection
   syn keyword sqlFunction contained st_linefromencodedpolyline st_linefrommultipoint st_linefromtext
   syn keyword sqlFunction contained st_linefromwkb st_lineinterpolatepoint
   syn keyword sqlFunction contained st_lineinterpolatepoints st_linelocatepoint
   syn keyword sqlFunction contained st_linemerge st_linestringfromwkb st_linesubstring
-  syn keyword sqlFunction contained st_linetocurve st_locatealong st_locatebetween
-  syn keyword sqlFunction contained st_locatebetweenelevations st_longestline
+  syn keyword sqlFunction contained st_linetocurve st_locatealong
+  syn keyword sqlFunction contained st_locatebetween st_locatebetweenelevations st_longestline
   syn keyword sqlFunction contained st_m st_makebox2d st_makeenvelope
   syn keyword sqlFunction contained st_makeline st_makepoint st_makepointm
   syn keyword sqlFunction contained st_makepolygon st_makevalid st_maxdistance
-  syn keyword sqlFunction contained st_memcollect st_memsize st_memunion
-  syn keyword sqlFunction contained st_minimumboundingcircle st_minimumboundingradius
-  syn keyword sqlFunction contained st_minimumclearance st_minimumclearanceline
-  syn keyword sqlFunction contained st_mlinefromtext st_mlinefromwkb st_mpointfromtext
-  syn keyword sqlFunction contained st_mpointfromwkb st_mpolyfromtext
-  syn keyword sqlFunction contained st_mpolyfromwkb st_multi st_multilinefromwkb
-  syn keyword sqlFunction contained st_multilinestringfromtext st_multipointfromtext
-  syn keyword sqlFunction contained st_multipointfromwkb st_multipolyfromwkb
-  syn keyword sqlFunction contained st_multipolygonfromtext st_ndims st_node st_normalize
-  syn keyword sqlFunction contained st_npoints st_nrings st_numgeometries
-  syn keyword sqlFunction contained st_numinteriorring st_numinteriorrings
-  syn keyword sqlFunction contained st_numpatches st_numpoints st_offsetcurve
-  syn keyword sqlFunction contained st_orderingequals st_orientedenvelope st_overlaps
-  syn keyword sqlFunction contained st_patchn st_perimeter st_perimeter2d
-  syn keyword sqlFunction contained st_point st_pointfromgeohash st_pointfromtext
-  syn keyword sqlFunction contained st_pointfromwkb st_pointinsidecircle
-  syn keyword sqlFunction contained st_pointn st_pointonsurface st_points
-  syn keyword sqlFunction contained st_polyfromtext st_polyfromwkb st_polygon
-  syn keyword sqlFunction contained st_polygonfromtext st_polygonfromwkb st_polygonize
-  syn keyword sqlFunction contained st_project st_quantizecoordinates st_relate
-  syn keyword sqlFunction contained st_relatematch st_removepoint
+  syn keyword sqlFunction contained st_maximuminscribedcircle st_memcollect
+  syn keyword sqlFunction contained st_memsize st_memunion st_minimumboundingcircle
+  syn keyword sqlFunction contained st_minimumboundingradius st_minimumclearance
+  syn keyword sqlFunction contained st_minimumclearanceline st_mlinefromtext
+  syn keyword sqlFunction contained st_mlinefromwkb st_mpointfromtext st_mpointfromwkb
+  syn keyword sqlFunction contained st_mpolyfromtext st_mpolyfromwkb st_multi
+  syn keyword sqlFunction contained st_multilinefromwkb st_multilinestringfromtext
+  syn keyword sqlFunction contained st_multipointfromtext st_multipointfromwkb
+  syn keyword sqlFunction contained st_multipolyfromwkb st_multipolygonfromtext
+  syn keyword sqlFunction contained st_ndims st_node st_normalize st_npoints
+  syn keyword sqlFunction contained st_nrings st_numgeometries st_numinteriorring
+  syn keyword sqlFunction contained st_numinteriorrings st_numpatches
+  syn keyword sqlFunction contained st_numpoints st_offsetcurve st_orderingequals
+  syn keyword sqlFunction contained st_orientedenvelope st_overlaps st_patchn
+  syn keyword sqlFunction contained st_perimeter st_perimeter2d st_point
+  syn keyword sqlFunction contained st_pointfromgeohash st_pointfromtext st_pointfromwkb
+  syn keyword sqlFunction contained st_pointinsidecircle st_pointn
+  syn keyword sqlFunction contained st_pointonsurface st_points st_polyfromtext
+  syn keyword sqlFunction contained st_polyfromwkb st_polygon st_polygonfromtext
+  syn keyword sqlFunction contained st_polygonfromwkb st_polygonize st_project
+  syn keyword sqlFunction contained st_quantizecoordinates st_reduceprecision
+  syn keyword sqlFunction contained st_relate st_relatematch st_removepoint
   syn keyword sqlFunction contained st_removerepeatedpoints st_reverse st_rotate
   syn keyword sqlFunction contained st_rotatex st_rotatey st_rotatez st_scale
-  syn keyword sqlFunction contained st_segmentize st_seteffectivearea st_setpoint
-  syn keyword sqlFunction contained st_setsrid st_sharedpaths
+  syn keyword sqlFunction contained st_segmentize st_seteffectivearea
+  syn keyword sqlFunction contained st_setpoint st_setsrid st_sharedpaths
   syn keyword sqlFunction contained st_shiftlongitude st_shortestline st_simplify
   syn keyword sqlFunction contained st_simplifypreservetopology st_simplifyvw st_snap
-  syn keyword sqlFunction contained st_snaptogrid st_split st_srid
-  syn keyword sqlFunction contained st_startpoint st_subdivide st_summary
-  syn keyword sqlFunction contained st_swapordinates st_symdifference st_symmetricdifference
-  syn keyword sqlFunction contained st_tileenvelope st_touches st_transform
-  syn keyword sqlFunction contained st_translate st_transscale st_unaryunion
-  syn keyword sqlFunction contained st_union st_voronoilines st_voronoipolygons
-  syn keyword sqlFunction contained st_within st_wkbtosql st_wkttosql
-  syn keyword sqlFunction contained st_wrapx st_x st_xmax st_xmin st_y
-  syn keyword sqlFunction contained st_ymax st_ymin st_z st_zmax
-  syn keyword sqlFunction contained st_zmflag st_zmin text unlockrows
-  syn keyword sqlFunction contained updategeometrysrid
+  syn keyword sqlFunction contained st_snaptogrid st_split st_square
+  syn keyword sqlFunction contained st_squaregrid st_srid st_startpoint
+  syn keyword sqlFunction contained st_subdivide st_summary st_swapordinates
+  syn keyword sqlFunction contained st_symdifference st_symmetricdifference st_tileenvelope
+  syn keyword sqlFunction contained st_touches st_transform st_translate
+  syn keyword sqlFunction contained st_transscale st_unaryunion st_union
+  syn keyword sqlFunction contained st_voronoilines st_voronoipolygons st_within
+  syn keyword sqlFunction contained st_wkbtosql st_wkttosql st_wrapx st_x
+  syn keyword sqlFunction contained st_xmax st_xmin st_y st_ymax
+  syn keyword sqlFunction contained st_ymin st_z st_zmax st_zmflag
+  syn keyword sqlFunction contained st_zmin text unlockrows updategeometrysrid
   syn keyword sqlTable contained spatial_ref_sys
   syn keyword sqlType contained box2d box2df box3d geography
   syn keyword sqlType contained geometry geometry_dump gidx spheroid
@@ -1013,7 +1018,7 @@ endif " dict_xsyn
 if index(get(g:, 'pgsql_disabled_extensions', []), 'bool_plperlu') == -1
   syn keyword sqlFunction contained bool_to_plperlu plperlu_to_bool
 endif " bool_plperlu
-" Extension: address_standardizer (v3.0.2)
+" Extension: address_standardizer (v3.1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'address_standardizer') == -1
   syn keyword sqlFunction contained parse_address standardize_address
   syn keyword sqlType contained stdaddr
@@ -1072,7 +1077,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'cube') == -1
   syn keyword sqlType contained cube
   syn keyword sqlFunction contained g_cube_compress g_cube_decompress
 endif " cube
-" Extension: postgis_tiger_geocoder (v3.0.2)
+" Extension: postgis_tiger_geocoder (v3.1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_tiger_geocoder') == -1
   syn keyword sqlFunction contained count_words create_census_base_tables
   syn keyword sqlFunction contained cull_null diff_zip
@@ -1176,11 +1181,11 @@ endif " pgstattuple
 if index(get(g:, 'pgsql_disabled_extensions', []), 'autoinc') == -1
   syn keyword sqlFunction contained autoinc
 endif " autoinc
-" Extension: address_standardizer_data_us (v3.0.2)
+" Extension: address_standardizer_data_us (v3.1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'address_standardizer_data_us') == -1
   syn keyword sqlTable contained us_gaz us_lex us_rules
 endif " address_standardizer_data_us
-" Extension: postgis_topology (v3.0.2)
+" Extension: postgis_topology (v3.1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_topology') == -1
   syn keyword sqlFunction contained addedge addface addnode
   syn keyword sqlFunction contained addtopogeometrycolumn addtosearchpath asgml
@@ -1213,7 +1218,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_topology') == -1
   syn keyword sqlType contained topoelementarray topogeometry
   syn keyword sqlType contained validatetopology_returntype
 endif " postgis_topology
-" Extension: postgis_raster (v3.0.2)
+" Extension: postgis_raster (v3.1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_raster') == -1
   syn keyword sqlFunction contained addoverviewconstraints addrasterconstraints
   syn keyword sqlFunction contained box3d bytea dropoverviewconstraints
@@ -1561,7 +1566,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'fuzzystrmatch') == -1
   syn keyword sqlFunction contained levenshtein levenshtein_less_equal
   syn keyword sqlFunction contained metaphone soundex text_soundex
 endif " fuzzystrmatch
-" Extension: pgrouting (v3.1.0)
+" Extension: pgrouting (v3.1.1)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pgrouting') == -1
   syn keyword sqlFunction contained pgr_alphashape pgr_analyzegraph
   syn keyword sqlFunction contained pgr_analyzeoneway pgr_articulationpoints pgr_astar
@@ -1605,7 +1610,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'pgcrypto') == -1
   syn keyword sqlFunction contained pgp_sym_decrypt_bytea pgp_sym_encrypt
   syn keyword sqlFunction contained pgp_sym_encrypt_bytea
 endif " pgcrypto
-" Extension: postgis_sfcgal (v3.0.2)
+" Extension: postgis_sfcgal (v3.1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_sfcgal') == -1
   syn keyword sqlFunction contained postgis_sfcgal_noop
   syn keyword sqlFunction contained postgis_sfcgal_scripts_installed postgis_sfcgal_version st_3darea
diff --git a/syntax/ps1.vim b/syntax/ps1.vim
index 520be968e..20cd36fcc 100644
--- a/syntax/ps1.vim
+++ b/syntax/ps1.vim
@@ -143,6 +143,9 @@ syn match ps1BuiltIn "$\%(args\|error\|foreach\|home\|input\)\>"
 syn match ps1BuiltIn "$\%(match\(es\)\?\|myinvocation\|host\|lastexitcode\)\>"
 syn match ps1BuiltIn "$\%(ofs\|shellid\|stacktrace\)\>"
 
+" Named Switch
+syn match ps1Label /\s-\w\+/
+
 " Folding blocks
 if !exists('g:ps1_nofold_blocks')
 	syn region ps1Block start=/{/ end=/}/ transparent fold
@@ -191,6 +194,7 @@ if version >= 508 || !exists("did_ps1_syn_inits")
 	HiLink ps1RepeatAndCmdlet Repeat
 	HiLink ps1Keyword Keyword
 	HiLink ps1KeywordAndCmdlet Keyword
+	HiLink ps1Label Label
 	delcommand HiLink
 endif
 
diff --git a/syntax/python.vim b/syntax/python.vim
index 49c61c6ab..6b5c39049 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -78,9 +78,10 @@ endif
 
 syn keyword pythonStatement     break continue del return pass yield global assert lambda with
 syn keyword pythonStatement     raise nextgroup=pythonExClass skipwhite
-syn keyword pythonStatement     def class nextgroup=pythonFunction skipwhite
+syn keyword pythonStatement     def nextgroup=pythonFunction skipwhite
+syn keyword pythonStatement     class nextgroup=pythonClass skipwhite
 if s:Enabled('g:python_highlight_class_vars')
-    syn keyword pythonClassVar    self cls
+    syn keyword pythonClassVar    self cls mcs
 endif
 syn keyword pythonRepeat        for while
 syn keyword pythonConditional   if elif else
@@ -104,10 +105,11 @@ else
     syn keyword pythonStatement   as nonlocal
     syn match   pythonStatement   '\v\.@<!<await>'
     syn match   pythonFunction    '\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*' display contained
+    syn match   pythonClass       '\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*' display contained
     syn match   pythonStatement   '\<async\s\+def\>' nextgroup=pythonFunction skipwhite
     syn match   pythonStatement   '\<async\s\+with\>'
     syn match   pythonStatement   '\<async\s\+for\>'
-    syn cluster pythonExpression contains=pythonStatement,pythonRepeat,pythonConditional,pythonOperator,pythonNumber,pythonHexNumber,pythonOctNumber,pythonBinNumber,pythonFloat,pythonString,pythonBytes,pythonBoolean,pythonNone,pythonSingleton,pythonBuiltinObj,pythonBuiltinFunc,pythonBuiltinType
+    syn cluster pythonExpression contains=pythonStatement,pythonRepeat,pythonConditional,pythonOperator,pythonNumber,pythonHexNumber,pythonOctNumber,pythonBinNumber,pythonFloat,pythonString,pythonFString,pythonRawString,pythonRawFString,pythonBytes,pythonBoolean,pythonNone,pythonSingleton,pythonBuiltinObj,pythonBuiltinFunc,pythonBuiltinType,pythonClassVar
 endif
 
 
@@ -116,7 +118,7 @@ endif
 "
 syn keyword pythonOperator      and in is not or
 if s:Enabled('g:python_highlight_operators')
-    syn match pythonOperator        '\V=\|-\|+\|*\|@\|/\|%\|&\||\|^\|~\|<\|>\|!='
+    syn match pythonOperator        '\V=\|-\|+\|*\|@\|/\|%\|&\||\|^\|~\|<\|>\|!=\|:='
 endif
 syn match pythonError           '[$?]\|\([-+@%&|^~]\)\1\{1,}\|\([=*/<>]\)\2\{2,}\|\([+@/%&|^~<>]\)\3\@![-+*@/%&|^~<>]\|\*\*[*@/%&|^<>]\|=[*@/%&|^<>]\|-[+*@/%&|^~<]\|[<!>]\+=\{2,}\|!\{2,}=\+' display
 
@@ -268,8 +270,8 @@ if s:Enabled('g:python_highlight_string_format')
         syn match pythonStrFormat '{\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)\=\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\[\%(\d\+\|[^!:\}]\+\)\]\)*\%(![rsa]\)\=\%(:\%({\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)}\|\%([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*,\=\%(\.\d\+\)\=[bcdeEfFgGnosxX%]\=\)\=\)\=}' contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString
     else
         syn match pythonStrFormat "{\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)\=\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\[\%(\d\+\|[^!:\}]\+\)\]\)*\%(![rsa]\)\=\%(:\%({\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)}\|\%([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*,\=\%(\.\d\+\)\=[bcdeEfFgGnosxX%]\=\)\=\)\=}" contained containedin=pythonString,pythonRawString
-        syn region pythonStrInterpRegion start="{"he=e+1,rs=e+1 end="\%(![rsa]\)\=\%(:\%({\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)}\|\%([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*,\=\%(\.\d\+\)\=[bcdeEfFgGnosxX%]\=\)\=\)\=}"hs=s-1,re=s-1 extend contained containedin=pythonFString,pythonRawFString contains=pythonStrInterpRegion,@pythonExpression
-        syn match pythonStrFormat "{{\|}}" contained containedin=pythonString,pythonRawString,pythonFString,pythonRawFString
+        syn region pythonStrInterpRegion matchgroup=pythonStrFormat start="{" end="\%(![rsa]\)\=\%(:\%({\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)}\|\%([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*,\=\%(\.\d\+\)\=[bcdeEfFgGnosxX%]\=\)\=\)\=}" extend contained containedin=pythonFString,pythonRawFString contains=pythonStrInterpRegion,@pythonExpression
+        syn match pythonStrFormat "{{\|}}" contained containedin=pythonFString,pythonRawFString
     endif
 endif
 
@@ -475,7 +477,6 @@ if v:version >= 508 || !exists('did_python_syn_inits')
         HiLink pythonBytesEscapeError   Error
         HiLink pythonFString            String
         HiLink pythonRawFString         String
-        HiLink pythonStrInterpRegion    Special
     endif
 
     HiLink pythonStrFormatting    Special
@@ -504,6 +505,7 @@ if v:version >= 508 || !exists('did_python_syn_inits')
     HiLink pythonBuiltinType      Structure
 
     HiLink pythonExClass          Structure
+    HiLink pythonClass            Structure
     HiLink pythonClassVar         Identifier
 
     delcommand HiLink
diff --git a/syntax/sil.vim b/syntax/sil.vim
index ad1907a93..70884ddc7 100644
--- a/syntax/sil.vim
+++ b/syntax/sil.vim
@@ -40,6 +40,7 @@ syn keyword silConventions
       \ c
       \ method
       \ objc_method
+      \ sil_differentiability_witness
       \ thick
       \ thin
       \ witness_method
diff --git a/syntax/smt2.vim b/syntax/smt2.vim
index 62479d3bb..adb88d28a 100644
--- a/syntax/smt2.vim
+++ b/syntax/smt2.vim
@@ -15,14 +15,13 @@ let b:current_syntax = "smt2"
 " Comments
 syntax match smt2Comment ";.*$"
 
-" Keywords
-syntax keyword smt2Keyword
+" Commands
+syntax keyword smt2Commands
       \ apply
-      \ as
-      \ assert
       \ assert
       \ assert-soft
       \ check-sat
+      \ check-sat-assuming
       \ check-sat-using
       \ declare-const
       \ declare-datatype
@@ -34,44 +33,46 @@ syntax keyword smt2Keyword
       \ declare-var
       \ define-const
       \ define-fun
+      \ define-fun-rec
+      \ define-funs-rec
       \ define-sort
       \ display
       \ echo
       \ elim-quantifiers
       \ eval
-      \ exists
       \ exit
-      \ forall
+      \ get-assertions
       \ get-assignment
       \ get-info
       \ get-model
       \ get-option
       \ get-proof
+      \ get-unsat-assumptions
       \ get-unsat-core
       \ get-user-tactics
       \ get-value
       \ help
-      \ let
-      \ match
       \ maximize
       \ minimize
       \ pop
       \ push
       \ query
       \ reset
+      \ reset-assertions
       \ rule
       \ set-info
       \ set-logic
       \ set-option
       \ simplify
-syntax match smt2Keyword "!"
+syntax match smt2Commands "!"
 
 " Operators
-syntax match smt2Operator "[=\|>\|<\|<=\|>=\|=>\|+\|\-\|*\|/]"
+syntax match smt2Operator "[=\|>\|<\|<=\|>=\|=>\|+\|\-\|*\|/\|!]"
 
 " Builtins
 syntax keyword smt2Builtin
       \ and
+      \ as
       \ bit0
       \ bit1
       \ bvadd
@@ -108,16 +109,20 @@ syntax keyword smt2Builtin
       \ const
       \ distinct
       \ div
+      \ exists
       \ extract
       \ false
-      \ get-assertions
+      \ forall
       \ if
       \ is_int
       \ ite
+      \ let
       \ map
+      \ match
       \ mod
       \ not
       \ or
+      \ par
       \ rem
       \ repeat
       \ root-obj
@@ -163,7 +168,7 @@ syntax match smt2Delimiter "[()]"
 syntax keyword smt2Error error
 
 highlight def link smt2Comment     Comment
-highlight def link smt2Keyword     Function
+highlight def link smt2Commands    Function
 highlight def link smt2Operator    Operator
 highlight def link smt2Builtin     Operator
 highlight def link smt2Identifier  Normal
diff --git a/syntax/sshdconfig.vim b/syntax/sshdconfig.vim
index 81cea2e7d..0ae86bab2 100644
--- a/syntax/sshdconfig.vim
+++ b/syntax/sshdconfig.vim
@@ -5,13 +5,14 @@ endif
 " Vim syntax file
 " Language:	OpenSSH server configuration file (sshd_config)
 " Author:	David Necas (Yeti)
-" Maintainer:	Dominik Fischer <d dot f dot fischer at web dot de>
+" Maintainer:	Jakub Jelen <jakuje at gmail dot com>
+" Previous Maintainer:	Dominik Fischer <d dot f dot fischer at web dot de>
 " Contributor:	Thilo Six
 " Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>	
 " Contributor:  Karsten Hopp <karsten@redhat.com>
 " Originally:	2009-07-09
-" Last Change:	2019-05-31
-" SSH Version:	7.9p1
+" Last Change:	2020-10-20
+" SSH Version:	8.4p1
 "
 
 " Setup
@@ -83,16 +84,24 @@ syn match   sshdconfigMAC "\<umac-128-etm@openssh\.com\>"
 
 syn keyword sshdconfigHostKeyAlgo ssh-ed25519
 syn match sshdconfigHostKeyAlgo "\<ssh-ed25519-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<sk-ssh-ed25519@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<sk-ssh-ed25519-cert-v01@openssh\.com\>"
 syn keyword sshdconfigHostKeyAlgo ssh-rsa
+syn keyword sshdconfigHostKeyAlgo rsa-sha2-256
+syn keyword sshdconfigHostKeyAlgo rsa-sha2-512
 syn keyword sshdconfigHostKeyAlgo ssh-dss
 syn keyword sshdconfigHostKeyAlgo ecdsa-sha2-nistp256
 syn keyword sshdconfigHostKeyAlgo ecdsa-sha2-nistp384
 syn keyword sshdconfigHostKeyAlgo ecdsa-sha2-nistp521
 syn match sshdconfigHostKeyAlgo "\<ssh-rsa-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<rsa-sha2-256-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<rsa-sha2-512-cert-v01@openssh\.com\>"
 syn match sshdconfigHostKeyAlgo "\<ssh-dss-cert-v01@openssh\.com\>"
 syn match sshdconfigHostKeyAlgo "\<ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"
 syn match sshdconfigHostKeyAlgo "\<ecdsa-sha2-nistp384-cert-v01@openssh\.com\>"
 syn match sshdconfigHostKeyAlgo "\<ecdsa-sha2-nistp521-cert-v01@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<sk-ecdsa-sha2-nistp256@openssh\.com\>"
+syn match sshdconfigHostKeyAlgo "\<sk-ecdsa-sha2-nistp256-cert-v01@openssh\.com\>"
 
 syn keyword sshdconfigRootLogin prohibit-password without-password forced-commands-only
 
@@ -112,12 +121,17 @@ syn keyword sshdconfigIPQoS	ef lowdelay throughput reliability
 
 syn keyword sshdconfigKexAlgo diffie-hellman-group1-sha1
 syn keyword sshdconfigKexAlgo diffie-hellman-group14-sha1
+syn keyword sshdconfigKexAlgo diffie-hellman-group14-sha256
+syn keyword sshdconfigKexAlgo diffie-hellman-group16-sha512
+syn keyword sshdconfigKexAlgo diffie-hellman-group18-sha512
 syn keyword sshdconfigKexAlgo diffie-hellman-group-exchange-sha1
 syn keyword sshdconfigKexAlgo diffie-hellman-group-exchange-sha256
 syn keyword sshdconfigKexAlgo ecdh-sha2-nistp256
 syn keyword sshdconfigKexAlgo ecdh-sha2-nistp384
 syn keyword sshdconfigKexAlgo ecdh-sha2-nistp521
+syn keyword sshdconfigKexAlgo curve25519-sha256
 syn match sshdconfigKexAlgo "\<curve25519-sha256@libssh\.org\>"
+syn match sshdconfigKexAlgo "\<sntrup4591761x25519-sha512@tinyssh\.org\>"
 
 syn keyword sshdconfigTunnel	point-to-point ethernet
 
@@ -191,6 +205,7 @@ syn keyword sshdconfigKeyword HostbasedUsesNameFromPacketOnly
 syn keyword sshdconfigKeyword IPQoS
 syn keyword sshdconfigKeyword IgnoreRhosts
 syn keyword sshdconfigKeyword IgnoreUserKnownHosts
+syn keyword sshdconfigKeyword Include
 syn keyword sshdconfigKeyword KbdInteractiveAuthentication
 syn keyword sshdconfigKeyword KerberosAuthentication
 syn keyword sshdconfigKeyword KerberosGetAFSToken
@@ -225,11 +240,13 @@ syn keyword sshdconfigKeyword PrintMotd
 syn keyword sshdconfigKeyword Protocol
 syn keyword sshdconfigKeyword PubkeyAcceptedKeyTypes
 syn keyword sshdconfigKeyword PubkeyAuthentication
+syn keyword sshdconfigKeyword PubkeyAuthOptions
 syn keyword sshdconfigKeyword RSAAuthentication
 syn keyword sshdconfigKeyword RekeyLimit
 syn keyword sshdconfigKeyword RevokedKeys
 syn keyword sshdconfigKeyword RDomain
 syn keyword sshdconfigKeyword RhostsRSAAuthentication
+syn keyword sshdconfigKeyword SecurityKeyProvider
 syn keyword sshdconfigKeyword ServerKeyBits
 syn keyword sshdconfigKeyword SetEnv
 syn keyword sshdconfigKeyword ShowPatchLevel

From cec808bc19656357c78d222e7ec279e39488a4f9 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Dec 2020 20:08:51 +0100
Subject: [PATCH 207/299] Use maxdepth instead of depth in makefile, closes
 #652

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 827ac66b1..dbf883174 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ test:
 	@ scripts/test
 
 dev:
-	@ find scripts autoload/polyglot ftdetect tests . -type f -depth 1 | DEV=1 entr bash -c 'make && make test'
+	@ find scripts autoload/polyglot ftdetect tests . -type f -maxdepth 1 | DEV=1 entr bash -c 'make && make test'

From 45f2f9497524486bfc3f7651c1fb2111737aa206 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Dec 2020 20:17:10 +0100
Subject: [PATCH 208/299] Add mint-language, closes #653

Co-authored-by: NICHTJ3 <nicholsontrent@gmail.com>
---
 README.md                    |   3 +-
 autoload/polyglot/sleuth.vim |   1 +
 ftdetect/polyglot.vim        |   4 ++
 packages.yaml                |   8 +++
 syntax/mint.vim              | 109 +++++++++++++++++++++++++++++++++++
 tests/filetypes.vim          |   1 +
 6 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 syntax/mint.vim

diff --git a/README.md b/README.md
index 08a88bcec..9238cd8dd 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->599<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->600<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -128,6 +128,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [mathematica](https://github.com/voldikss/vim-mma) (Mathematica syntax highlighting for mathematica, cdf, m, ma, mt and 6 more files)
 - [mdx](https://github.com/jxnblk/vim-mdx-js) (Syntax highlighting for mdx files)
 - [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim) (Meson syntax highlighting for wrap files)
+- [mint](https://github.com/IrenejMarc/vim-mint) (Syntax highlighting for mint files)
 - [moonscript](https://github.com/leafo/moonscript-vim) (MoonScript syntax highlighting for moon files)
 - [nginx](https://github.com/chr4/nginx.vim) (Nginx syntax highlighting for nginx, nginxconf and vhost files)
 - [nim](https://github.com/zah/nim.vim) (Nim syntax highlighting for nim, nim.cfg, nimble, nimrod and nims files)
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index c10280af8..155ae0b55 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -329,6 +329,7 @@ let s:globs = {
   \ 'mgl': '*.mgl',
   \ 'mgp': '*.mgp',
   \ 'mib': '*.mib,*.my',
+  \ 'mint': '*.mint',
   \ 'mix': '*.mix,*.mixal',
   \ 'mma': '*.mathematica,*.cdf,*.m,*.ma,*.mt,*.nb,*.nbp,*.wl,*.wlt,*.wls,*.mma',
   \ 'mmp': '*.mmp',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 44b5871d1..a8a5c3190 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -142,6 +142,10 @@ set cpo&vim
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(g:polyglot_is_disabled, 'mint')
+  au BufNewFile,BufRead *.mint setf mint
+endif
+
 if !has_key(g:polyglot_is_disabled, 'context')
   au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi setf context
 endif
diff --git a/packages.yaml b/packages.yaml
index b6721e05c..dc127f28d 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5546,3 +5546,11 @@ filetypes:
   patterns:
   - pattern: '*.mkii,*.mkiv,*.mkvi'
     description: ConTeXt
+---
+name: mint
+remote: IrenejMarc/vim-mint
+filetypes:
+- name: mint
+  patterns:
+  - pattern: '*.mint'
+    description: Mint (https://www.mint-lang.com/)
diff --git a/syntax/mint.vim b/syntax/mint.vim
new file mode 100644
index 000000000..2b71a6920
--- /dev/null
+++ b/syntax/mint.vim
@@ -0,0 +1,109 @@
+if has_key(g:polyglot_is_disabled, 'mint')
+  finish
+endif
+
+if exists('b:current_syntax')
+  let s:current_syntax = b:current_syntax
+  silent! unlet b:current_syntax
+endif
+
+syntax include @JSSyntax syntax/javascript.vim
+silent! unlet b:current_syntax
+syntax include @XMLSyntax syntax/xml.vim
+silent! unlet b:current_syntax
+syntax include @CSSSyntax syntax/css.vim
+silent! unlet b:current_syntax
+
+syntax case match
+if exists('s:current_syntax')
+  let b:current_syntax = s:current_syntax
+endif
+
+syntax keyword mintBlock
+      \ do sequence parallel if else case try catch
+
+syntax keyword mintCompoundType
+      \ Result Maybe Promise Array
+
+syntax keyword mintLiteralType
+      \ Number Bool String Object Time Html Void Never Tuple
+
+syntax keyword mintDeclarator
+      \ component module routes
+
+syntax keyword mintStructureDeclarator
+      \ enum record store provider const
+
+syntax keyword mintInitializer
+      \ fun let where next state property
+
+syntax keyword mintKeyword
+      \ decode encode return connect use
+
+syntax keyword mintOperator
+      \ "<{" "}>" "::" "=>" "|>" "<|"
+
+syntax keyword mintSpecifier
+      \ as break return using get exposing ok error just nothing void
+
+" String
+syntax region mintString matchgroup=mintStringDelimiter start=/"/ skip=/\\"/ end=/"/ oneline
+" String interpolation
+syntax region mintStringInterpolation matchgroup=mintInterpolationDelimiter start="#{" end="}" contained containedin=mintString contains=@mintAll
+
+" Numbers
+syntax match mintNumber "\v<\d+(\.\d+)?>"
+
+" Pascal-cased types
+syntax match mintDefinedType "\v<[A-Z][A-Za-z0-9]*(\.[A-Z][A-Za-z0-9]*)*>"
+
+
+syntax cluster mintAll contains=mintBlock,mintCompoundType,mintDeclarator,mintInitializer,mintKeyword,mintOperator,mintSpecifier,mintString
+
+syntax region mintEmbeddedHtmlRegion
+      \ start=+<\z([^ /!?<>"'=:]\+\)+
+      \ start=+<\z(\s\{0}\)>+
+      \ skip=+<!--\_.\{-}-->+
+      \ end=+</\z1\_s\{-}>+
+      \ end=+/>+
+      \ fold
+      \ contains=@Spell,@XMLSyntax,@mintAll
+      \ keepend
+
+syntax region mintEmbeddedJsRegion
+      \ matchgroup=mintJsInterpolationQuotes
+      \ start="`"
+      \ end="`"
+      \ skip="\\`"
+      \ keepend
+      \ contains=mintInterpolation,@jsExpression
+
+hi link mintJsInterpolationQuotes Delimiter
+
+syntax match mintBraces /[{}]/
+syntax keyword mintStyleKeyword style skipwhite nextgroup=mintStyleIdentifier
+syntax match mintStyleIdentifier /\<\k\k*/ contained skipwhite skipempty nextgroup=mintStyleBlock
+syntax region mintStyleBlock contained matchgroup=mintBraces start="{" end="}" contains=@mintAll,cssDefinition,cssTagName,cssAttributeSelector,cssClassName,cssIdentifier,cssAtRule,cssAttrRegion,css.*Prop,cssComment,cssValue.*,cssColor,cssURL,cssImportant,cssCustomProp,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssVendor,cssDefinition,cssHacks,cssNoise
+
+" Colour links
+hi link mintKeyword                Keyword
+hi link mintOperator               Operator
+
+hi link mintBlock                  Statement
+hi link mintDeclarator             PreProc
+hi link mintStructureDeclarator    Structure
+hi link mintInitializer            PreProc
+hi link mintSpecifier              Statement
+
+hi link mintString                 String
+hi link mintNumber                 Number
+
+hi link mintCompoundType           Type
+hi link mintLiteralType            Type
+hi link mintDefinedType            Type
+
+hi link mintStringDelimiter        Delimiter
+hi link mintInterpolationDelimiter Special
+
+hi link mintStyleKeyword           Type
+hi link mintStyleIdentifier        Statement
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 5a1838b5e..08d4cb938 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -644,6 +644,7 @@ call TestFiletype('xf86conf')
 call TestFiletype('xpm')
 call TestFiletype('xpm2')
 call TestFiletype('context')
+call TestFiletype('mint')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 

From c5625ffedd61a01de1399afef6fbcd31f5cda72f Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Dec 2020 20:33:47 +0100
Subject: [PATCH 209/299] Set shiftwidth to tabstop if greather, fixes #648

Also should fix situations like in #654
---
 ftdetect/polyglot.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index a8a5c3190..ac934d53b 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2678,6 +2678,10 @@ if !has_key(g:polyglot_is_disabled, 'autoindent')
     let &tabstop = 2
   endif
 
+  if &shiftwidth > &tabstop
+    let &shiftwidth = &tabstop
+  endif
+
   let s:default_shiftwidth = &shiftwidth
 
   func! s:get_shiftwidth(indents) abort

From 4b54ae9cd98b658a828e10241ffca1015316639e Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Dec 2020 20:42:08 +0100
Subject: [PATCH 210/299] Move setting default tabstop to sensible part

---
 ftdetect/polyglot.vim | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index ac934d53b..3132a339f 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2670,18 +2670,34 @@ au FileType * au! polyglot-observer
 augroup END
 
 
-if !has_key(g:polyglot_is_disabled, 'autoindent')
-  " Code below re-implements sleuth for vim-polyglot
-  let g:loaded_sleuth = 1
-
+if !has_key(g:polyglot_is_disabled, 'sensible')
+  " Use 2-spaces tab indentation by default
   if &tabstop == 8
     let &tabstop = 2
   endif
 
+  " Set shiftwidth to proper value as users often mix it with tabstop
   if &shiftwidth > &tabstop
     let &shiftwidth = &tabstop
   endif
 
+  " Use utf-8 encoding by default
+  set encoding=utf-8
+
+  " Reload unchanged files automatically.
+  set autoread
+
+  " Disable swap, it doesn't play well with autoread
+  set noswapfile
+
+  " Autoindent when starting new line, or using `o` or `O`.
+  set autoindent
+endif
+
+if !has_key(g:polyglot_is_disabled, 'autoindent')
+  " Code below re-implements sleuth for vim-polyglot
+  let g:loaded_sleuth = 1
+
   let s:default_shiftwidth = &shiftwidth
 
   func! s:get_shiftwidth(indents) abort
@@ -3559,20 +3575,6 @@ endfunc
 " We want vim-polyglot files to load only as fallback
 let &rtp = join(s:process_rtp(split(&rtp, ',')), ',')
 
-if !has_key(g:polyglot_is_disabled, 'sensible')
-  " Use utf-8 encoding by default
-  set encoding=utf-8
-
-  " Reload unchanged files automatically.
-  set autoread
-
-  " Disable swap, it doesn't play well with autoread
-  set noswapfile
-
-  " Autoindent when starting new line, or using `o` or `O`.
-  set autoindent
-endif
-
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
 unlet s:cpo_save

From 47dcae9131ac32cabf92f49093f044732a412450 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Dec 2020 20:45:36 +0100
Subject: [PATCH 211/299] Do not mention vim-sensible, as only tiny part of it
 is included

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 9238cd8dd..1a1e0881f 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,6 @@ A collection of language packs for Vim.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
-- Includes some defaults from [vim-sensible](https://github.com/tpope/vim-sensible), which are usually necessary for editing in any language (can be disabled)
 
 \*To be completely honest, optimized `ftdetect` script takes around `10ms` to load.
 

From 1150adc4db99fc4f88f0a5ebebe2f9033784209c Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 29 Dec 2020 23:40:05 +0100
Subject: [PATCH 212/299] Fix detecting conf filetype, closes #641

---
 Makefile                      |  2 +-
 autoload/polyglot/shebang.vim |  5 +++++
 ftdetect/polyglot.vim         |  7 +++----
 scripts/build                 | 11 ++++++-----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index dbf883174..8cd6d2aa1 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ test:
 	@ scripts/test
 
 dev:
-	@ find scripts autoload/polyglot ftdetect tests . -type f -maxdepth 1 | DEV=1 entr bash -c 'make && make test'
+	@ find scripts autoload/polyglot ftdetect tests . -type f -maxdepth 1 | DEV=1 entr bash -c 'make'
diff --git a/autoload/polyglot/shebang.vim b/autoload/polyglot/shebang.vim
index ef6bc0ed8..a8f103484 100644
--- a/autoload/polyglot/shebang.vim
+++ b/autoload/polyglot/shebang.vim
@@ -449,6 +449,11 @@ func! polyglot#shebang#VimDetect()
 
   endif
 
+	if line1 =~ '^# ' || getline(2) =~ '^# ' || getline(3) =~ '^# ' || getline(4) =~ '^# ' || getline(5) =~ '^# '
+    setf FALLBACK conf
+    return 1
+  endif
+
   return 1
 endfunc
 
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 3132a339f..4d6935fe9 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2659,13 +2659,13 @@ func! s:Observe(fn)
   augroup END
 endfunc
 
-au BufNewFile,BufRead,StdinReadPost * if expand("<afile>:e") == "" |
+au BufNewFile,BufRead,StdinReadPost,BufWritePost * if expand("<afile>:e") == "" |
   \ call polyglot#shebang#Detect() | endif
 
-au BufWinEnter * if &ft == "" && expand("<afile>:e") == ""  |
+au BufWinEnter * if &ft == "" && expand("<afile>:e") == "" |
   \ call s:Observe('shebang#Detect') | endif
 
-au FileType * au! polyglot-observer
+au BufWritePost * au! polyglot-observer
 
 augroup END
 
@@ -3528,7 +3528,6 @@ if exists("did_load_filetypes") && exists("g:polyglot_disabled")
   runtime! extras/filetype.vim
 endif
 
-
 let s:runtime = resolve($VIMRUNTIME)
 let s:base = resolve(expand('<sfile>:p:h:h'))
 
diff --git a/scripts/build b/scripts/build
index 3933a87ef..758b3affe 100755
--- a/scripts/build
+++ b/scripts/build
@@ -113,9 +113,9 @@ def sort_packages(packages)
   each_child = lambda { |n, &b|
     [
       implicit_dependencies[n] || [],
-      packages[n]["dependencies"] || [],
-      packages[n]["after"] || []
-    ].flatten.each(&b)
+      packages[n] ? packages[n]["dependencies"] || [] : [],
+      packages[n] ? packages[n]["after"] || [] : []
+    ].flatten.each { |e| b.call(e) if packages[e] }
   }
 
   TSort.tsort(each_node, each_child).map { |a| packages[a] }
@@ -248,11 +248,11 @@ def load_languages
 end
 
 def load_packages
-  YAML.load_stream(File.read('packages.yaml'))
+  YAML.load_stream(File.read('packages.yaml')) || []
 end
 
 def load_heuristics
-  YAML.load_stream(File.read('heuristics.yaml'))
+  YAML.load_stream(File.read('heuristics.yaml')) || []
 end
 
 def parse_remote(remote)
@@ -486,6 +486,7 @@ def extract(packages)
   )
 
   FileUtils.rm_rf(all_dirs)
+  Dir.mkdir('extras') unless File.exists?('extras')
 
   for dir in Dir.glob("*", base: "autoload")
     if dir != "polyglot"

From 2fcb15afa09c6c5b53a3f37404a28b57a3f43d83 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Dec 2020 00:05:20 +0100
Subject: [PATCH 213/299] Add terraform to list of packages, fixes #625

---
 README.md     | 1 +
 scripts/build | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1a1e0881f..363d1c7ae 100644
--- a/README.md
+++ b/README.md
@@ -179,6 +179,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [swift](https://github.com/keith/swift.vim) (Swift syntax highlighting for swift files)
 - [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (Syntax highlighting for sxhkdrc files)
 - [systemd](https://github.com/wgwoods/vim-systemd-syntax) (Syntax highlighting for automount, dnssd, link, mount, netdev and 9 more files)
+- [terraform](https://github.com/hashivim/vim-terraform) (Syntax highlighting for tf and tfvars files)
 - [textile](https://github.com/timcharper/textile.vim) (Textile syntax highlighting for textile files)
 - [thrift](https://github.com/solarnz/thrift.vim) (Thrift syntax highlighting for thrift files)
 - [tmux](https://github.com/ericpruitt/tmux.vim/tree/master/vim)
diff --git a/scripts/build b/scripts/build
index 758b3affe..496198f83 100755
--- a/scripts/build
+++ b/scripts/build
@@ -525,7 +525,7 @@ def extract(packages)
       end
     end
 
-    if repo.include?("vim/vim")
+    if repo == "vim/vim"
       next
     end
     if branch != "master" || path

From 44e79fc935004c2e67fc39a77266d0f06e29d920 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Dec 2020 00:48:12 +0100
Subject: [PATCH 214/299] Check changes for focus event, improves #638

---
 autoload/focau/cursor.vim | 55 +++++++++++++++++++++++++++++++++
 autoload/focau/events.vim | 64 +++++++++++++++++++++++++++++++++++++++
 autoload/focau/init.vim   | 33 ++++++++++++++++++++
 plugin/polyglot.vim       | 18 ++++++++++-
 4 files changed, 169 insertions(+), 1 deletion(-)
 create mode 100644 autoload/focau/cursor.vim
 create mode 100644 autoload/focau/events.vim
 create mode 100644 autoload/focau/init.vim

diff --git a/autoload/focau/cursor.vim b/autoload/focau/cursor.vim
new file mode 100644
index 000000000..d3da5c49a
--- /dev/null
+++ b/autoload/focau/cursor.vim
@@ -0,0 +1,55 @@
+function! focau#cursor#auto_shape()
+  if $TERM =~? '\v^%(dumb|linux)'
+    " echom "Shape escape codes: can't autodetect for $TERM=" . $TERM
+    return ['', '', '']
+  elseif $TERM =~? '^konsole' || exists('$ITERM_PROFILE')
+    return ["\e]50;CursorShape=0\x7", "\e]50;CursorShape=1\x7", "\e]50;CursorShape=2\x7"]
+  endif
+
+  "" DISABLED: to reduce startup time, and it will not work through ssh
+  " let uver = eval(substitute(system('urxvt -h 2>&1'),
+  "       \ '\v.*v(\d+)\.(\d+).*', '\1+\2.0/100', ''))
+  " return ["\e[2 q", (l:uver<9.21? "\e[4 q": "\e[6 q"), "\e[4 q"]
+  " let l:uver = substitute(split(system('urxvt -help 2>&1'), '\n')[0],
+  "       \ '.*v\([0-9.]\+\).*', '\1', '')
+  " return ["\e[2 q", (9.21 <= l:uver ? "\e[6 q" : "\e[4 q")]
+
+  " [1,2] -> [blinking,solid] block
+  " [3,4] -> [blinking,solid] underscore
+  " [5,6] -> [blinking,solid] vbar/I-beam (only in xterm > 282),
+  "     urxvt got I-beam only in v9.21 2014-12-31, build from recent git.
+
+  " if $TERM =~? '\v^%(xterm|rxvt|st|screen|tmux|nvim)'
+  " NOTE:(old xterm) ["\e[2 q", "\e[6 q", '']
+  return ["\e[2 q", "\e[6 q", "\e[4 q"]
+endfunction
+
+
+function! focau#cursor#auto_color(idx)
+  " SEE: http://stackoverflow.com/questions/11494029/how-do-i-change-the-color-of-current-cursor-position-indicator
+  if !g:focau.auto
+    let colors = g:focau.colors
+  elseif $TERM =~? '\v^%(xterm|st|screen|tmux|rxvt)'
+    "" ALT: ["\e]12;white\x9c", "\e]12;orange\x9c"]
+    " use default \003]12;gray\007 for gnome-terminal
+    let colors = [ "\e]12;". g:focau.colors[0] ."\x7",
+                 \ "\e]12;". g:focau.colors[1] ."\x7" ]
+  else
+    " echom "Err: can't detect esc codes for cursor colors in $TERM=".$TERM
+    let colors = ['', '']
+  endif
+  return l:colors[a:idx]
+endfunction
+
+
+function! focau#cursor#shape_preserve()
+  "" Preserve previous cursor state and restore upon exit
+  let s:old_SI=&t_SI | let s:old_EI=&t_EI | if exists('&t_SR')
+      \| let s:old_RS=&t_SR | endif
+  " BUG: has no effect on restoring color after exit.
+  "" There are sequence to change color, but not the one to restore to default
+  " SEE Maybe save/restore the screen -- works for cursor? -- seems NO.
+  au focau VimLeave * let &t_SI = s:old_SI | let &t_EI = s:old_EI
+      \| if exists('&t_SR') | let &t_SR = s:old_RS | endif
+endfunction
+
diff --git a/autoload/focau/events.vim b/autoload/focau/events.vim
new file mode 100644
index 000000000..acc9293f2
--- /dev/null
+++ b/autoload/focau/events.vim
@@ -0,0 +1,64 @@
+"" WARNING: For focus-events to work in tmux, you need to set this option
+" inside your tmux.conf:   set -g focus-events on
+" WARNING: must be outside this 'if' in s:focau_modes_enable, as it will not
+" work in tmux on_disable!
+
+if exists('$TMUX') || $TERM =~? 'screen\|tmux'  " FIXED for [tmux -> ssh | vim]
+  " Disable bkgd color erase and don't truncate highlighting
+  " So highlighted line does go all the way across screen
+  set t_ut=
+  function! s:wrap(s)
+    return "\ePtmux;". substitute(escape(a:s, ' '),
+          \ "\e\\|\<Esc>", "\e\e", 'g') ."\e\\"
+  endfunction
+else
+  function! s:wrap(s)
+    return escape(a:s, ' ')
+  endfunction
+endif
+
+
+function! focau#events#auto_choose()
+  " if $TERM =~? '\v^%(dumb|linux)'
+  " echom "Err: your terminal don't support focus events $TERM=" . $TERM
+  " echom "Err: Can't auto-derive termfocus codes for your $TERM=" . $TERM
+  " echom "Disabled. If you disagree, set escape codes by yourself:)"
+  if $TERM =~? '^rxvt'
+    return ["\e]777;focus;on\x7", "\e]777;focus;off\x7"]
+  endif
+  " if $TERM =~? '\v^%(xterm|st|screen|tmux)' || exists('$ITERM_PROFILE')
+  return ["\e[?1004h", "\e[?1004l"]
+endfunction
+
+
+" ALT:
+" augroup focau_focus
+"   autocmd!
+"   if a:state
+"     au VimEnter    * call s:focau_cso('on')
+"     au VimLeavePre * call s:focau_cso('off')
+"   endif
+" augroup END
+function! focau#events#enable(state)
+  let g:focau.active = a:state
+  if !g:focau.active | let &t_ti = '' | let &t_te = '' | return | endif
+  " CHECK: Is it necessary to be able toggle dynamically?
+  " exec 'silent !echo -ne "'. g:focau.focuses[1] .g:focau.screens[1] .'"'
+
+  "" FIX: add two color groups based on language, not permanent. See xkb.
+  let color = focau#cursor#auto_color(0)
+  let codes = ['t_EI', 't_SI', 't_SR']
+  " Install insert mode autohooks -- on enter/leave
+  for i in range(3)| if exists('&'.codes[i])
+    exe 'set '.codes[i].'='.s:wrap(g:focau.cursors[i] . l:color)
+  endif | endfor
+
+  let on_init = &t_EI . s:wrap(g:focau.focuses[0]) . g:focau.screens[0]
+  let on_exit = s:wrap(g:focau.focuses[1]) . g:focau.screens[1]
+
+  " Install focus autohooks -- on startup/shutdown
+  let &t_ti = on_init | let &t_te = on_exit
+
+  " CHECK: Is it necessary to be able toggle dynamically?
+  " exec 'silent !echo -ne "'.&t_EI.g:focau.focuses[0].g:focau.screens[0].'"'
+endfunction
diff --git a/autoload/focau/init.vim b/autoload/focau/init.vim
new file mode 100644
index 000000000..7c9320ec1
--- /dev/null
+++ b/autoload/focau/init.vim
@@ -0,0 +1,33 @@
+" WARNING: seems like we can't use <expr> maps, because we need side-effects
+" ALT: {s: <C-g>...<C-g>, o: <Esc>, i: <C-o>, c: <C-\>e}
+function! s:map_triggers(e)
+  for [a, i] in items({'FocusGained': 0, 'FocusLost': 1})
+    let key = keys(a:e)[i] | exe 'set '.key.'='.a:e[key]
+    exe "fun! s:F".i."()\nif g:focau.active|sil! doau ".a."|en|return''\nendf"
+    for [ms, prf] in items({'nv': '@=', 'o': ':call ', 'ic': '<C-r>='})
+      for m in split(ms, '\zs')
+        exe m.'noremap <silent> '.key.' '.prf.'<SID>F'.i.'()<CR>'
+  endfor | endfor | endfor
+endfunction
+
+
+function! focau#init#main()
+  augroup focau
+    autocmd!
+  augroup END
+
+  call focau#cursor#shape_preserve()
+
+  if g:focau.auto
+    let g:focau.focuses = focau#events#auto_choose()
+    let g:focau.cursors = focau#cursor#auto_shape()
+    "" FIX: must be dynamic and check curr lang before each mode/lang-switch
+    " call s:focau_lang_choose() "primary/secondary
+  endif
+
+  " Wrap choosen keys in event triggers
+  call s:map_triggers(g:focau.events)
+  " Start
+  call focau#events#enable(g:focau.active)
+  au focau VimEnter * if g:focau.active | sil! doau FocusGained | endif
+endfunction
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index bfd9c1a02..031dbe636 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -13,6 +13,22 @@ if exists('g:loaded_sensible')
   finish
 endif
 
+if !has('gui_running') && (!has('nvim') || $TERM =~? '^rxvt')
+  let g:focau = extend({
+    \ 'auto': 1,
+    \ 'active': 1,
+    \ 'events' : {'<F25>': "\e[I", '<F26>': "\e[O"},
+    \ 'focuses': ["\e[?1004h", "\e[?1004l"],
+    \ 'screens': ["\e[?1049h", "\e[?1049l"],
+    \ 'cursors': ['', '', ''],
+    \ 'colors' : ['white', 'cyan'],
+    \ 'widgets': [],
+    \ 'clipregs':['+"p', '"+'],
+    \}, get(g:, 'focau', {}))
+
+  call focau#init#main()
+endif
+
 " Code taken from https://github.com/tpope/vim-sensible
 " and (mostly comments) from https://github.com/sheerun/vimrc
 "
@@ -74,7 +90,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -
   if match(capture, 'checktime') == -1
     augroup polyglot-sensible
       au!
-      au CursorHold * silent! checktime
+      au CursorHold,FocusGained * silent! checktime
     augroup END
   endif
 

From 3f9ce1c6cf3b1e25657c254fadbebae0398e440c Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Dec 2020 01:00:14 +0100
Subject: [PATCH 215/299] Add link to actions

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 363d1c7ae..e88ed3dc7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![vim-polyglot](https://i.imgur.com/9RxQK6k.png)
 
-![build](https://github.com/sheerun/vim-polyglot/workflows/Vim%20Polyglot%20CI/badge.svg) [![Maintenance](https://img.shields.io/badge/maintained%20since-2013-yes)]()
+[![build](https://github.com/sheerun/vim-polyglot/workflows/Vim%20Polyglot%20CI/badge.svg)](https://github.com/sheerun/vim-polyglot/actions) [![Maintenance](https://img.shields.io/badge/maintained%20since-2013-yes)]()
 
 A collection of language packs for Vim.
 

From dc786b7641741eadadab10b507fcfd4c1ff1813a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Dec 2020 01:04:40 +0100
Subject: [PATCH 216/299] Try to fix tests

---
 tests/native.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/native.vim b/tests/native.vim
index ff7b3025b..46d5f6d5d 100644
--- a/tests/native.vim
+++ b/tests/native.vim
@@ -287,7 +287,7 @@ let s:filename_checks = {
     \ 'mailcap': ['.mailcap', 'mailcap'],
     \ 'make': ['file.mk', 'file.mak', 'file.dsp', 'makefile', 'Makefile', 'makefile-file', 'Makefile-file', 'some-makefile', 'some-Makefile'],
     \ 'mallard': ['file.page'],
-    \ 'man': ['file.man'],
+    \ 'nroff': ['file.man'],
     \ 'manconf': ['/etc/man.conf', 'man.config', 'any/etc/man.conf'],
     \ 'map': ['file.map'],
     \ 'maple': ['file.mv', 'file.mpl', 'file.mws'],

From 6783bd0df98094539c752e3281035e1b92d6af69 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Dec 2020 08:36:48 +0100
Subject: [PATCH 217/299] Revert "Check changes for focus event, improves #638"

It's because it additionally changes cursor to vertical bar.
I need to disable this behavior and make it compatible with
plugins that enable vertical cursor...

This reverts commit 44e79fc935004c2e67fc39a77266d0f06e29d920.
---
 autoload/focau/cursor.vim | 55 ---------------------------------
 autoload/focau/events.vim | 64 ---------------------------------------
 autoload/focau/init.vim   | 33 --------------------
 plugin/polyglot.vim       | 18 +----------
 4 files changed, 1 insertion(+), 169 deletions(-)
 delete mode 100644 autoload/focau/cursor.vim
 delete mode 100644 autoload/focau/events.vim
 delete mode 100644 autoload/focau/init.vim

diff --git a/autoload/focau/cursor.vim b/autoload/focau/cursor.vim
deleted file mode 100644
index d3da5c49a..000000000
--- a/autoload/focau/cursor.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-function! focau#cursor#auto_shape()
-  if $TERM =~? '\v^%(dumb|linux)'
-    " echom "Shape escape codes: can't autodetect for $TERM=" . $TERM
-    return ['', '', '']
-  elseif $TERM =~? '^konsole' || exists('$ITERM_PROFILE')
-    return ["\e]50;CursorShape=0\x7", "\e]50;CursorShape=1\x7", "\e]50;CursorShape=2\x7"]
-  endif
-
-  "" DISABLED: to reduce startup time, and it will not work through ssh
-  " let uver = eval(substitute(system('urxvt -h 2>&1'),
-  "       \ '\v.*v(\d+)\.(\d+).*', '\1+\2.0/100', ''))
-  " return ["\e[2 q", (l:uver<9.21? "\e[4 q": "\e[6 q"), "\e[4 q"]
-  " let l:uver = substitute(split(system('urxvt -help 2>&1'), '\n')[0],
-  "       \ '.*v\([0-9.]\+\).*', '\1', '')
-  " return ["\e[2 q", (9.21 <= l:uver ? "\e[6 q" : "\e[4 q")]
-
-  " [1,2] -> [blinking,solid] block
-  " [3,4] -> [blinking,solid] underscore
-  " [5,6] -> [blinking,solid] vbar/I-beam (only in xterm > 282),
-  "     urxvt got I-beam only in v9.21 2014-12-31, build from recent git.
-
-  " if $TERM =~? '\v^%(xterm|rxvt|st|screen|tmux|nvim)'
-  " NOTE:(old xterm) ["\e[2 q", "\e[6 q", '']
-  return ["\e[2 q", "\e[6 q", "\e[4 q"]
-endfunction
-
-
-function! focau#cursor#auto_color(idx)
-  " SEE: http://stackoverflow.com/questions/11494029/how-do-i-change-the-color-of-current-cursor-position-indicator
-  if !g:focau.auto
-    let colors = g:focau.colors
-  elseif $TERM =~? '\v^%(xterm|st|screen|tmux|rxvt)'
-    "" ALT: ["\e]12;white\x9c", "\e]12;orange\x9c"]
-    " use default \003]12;gray\007 for gnome-terminal
-    let colors = [ "\e]12;". g:focau.colors[0] ."\x7",
-                 \ "\e]12;". g:focau.colors[1] ."\x7" ]
-  else
-    " echom "Err: can't detect esc codes for cursor colors in $TERM=".$TERM
-    let colors = ['', '']
-  endif
-  return l:colors[a:idx]
-endfunction
-
-
-function! focau#cursor#shape_preserve()
-  "" Preserve previous cursor state and restore upon exit
-  let s:old_SI=&t_SI | let s:old_EI=&t_EI | if exists('&t_SR')
-      \| let s:old_RS=&t_SR | endif
-  " BUG: has no effect on restoring color after exit.
-  "" There are sequence to change color, but not the one to restore to default
-  " SEE Maybe save/restore the screen -- works for cursor? -- seems NO.
-  au focau VimLeave * let &t_SI = s:old_SI | let &t_EI = s:old_EI
-      \| if exists('&t_SR') | let &t_SR = s:old_RS | endif
-endfunction
-
diff --git a/autoload/focau/events.vim b/autoload/focau/events.vim
deleted file mode 100644
index acc9293f2..000000000
--- a/autoload/focau/events.vim
+++ /dev/null
@@ -1,64 +0,0 @@
-"" WARNING: For focus-events to work in tmux, you need to set this option
-" inside your tmux.conf:   set -g focus-events on
-" WARNING: must be outside this 'if' in s:focau_modes_enable, as it will not
-" work in tmux on_disable!
-
-if exists('$TMUX') || $TERM =~? 'screen\|tmux'  " FIXED for [tmux -> ssh | vim]
-  " Disable bkgd color erase and don't truncate highlighting
-  " So highlighted line does go all the way across screen
-  set t_ut=
-  function! s:wrap(s)
-    return "\ePtmux;". substitute(escape(a:s, ' '),
-          \ "\e\\|\<Esc>", "\e\e", 'g') ."\e\\"
-  endfunction
-else
-  function! s:wrap(s)
-    return escape(a:s, ' ')
-  endfunction
-endif
-
-
-function! focau#events#auto_choose()
-  " if $TERM =~? '\v^%(dumb|linux)'
-  " echom "Err: your terminal don't support focus events $TERM=" . $TERM
-  " echom "Err: Can't auto-derive termfocus codes for your $TERM=" . $TERM
-  " echom "Disabled. If you disagree, set escape codes by yourself:)"
-  if $TERM =~? '^rxvt'
-    return ["\e]777;focus;on\x7", "\e]777;focus;off\x7"]
-  endif
-  " if $TERM =~? '\v^%(xterm|st|screen|tmux)' || exists('$ITERM_PROFILE')
-  return ["\e[?1004h", "\e[?1004l"]
-endfunction
-
-
-" ALT:
-" augroup focau_focus
-"   autocmd!
-"   if a:state
-"     au VimEnter    * call s:focau_cso('on')
-"     au VimLeavePre * call s:focau_cso('off')
-"   endif
-" augroup END
-function! focau#events#enable(state)
-  let g:focau.active = a:state
-  if !g:focau.active | let &t_ti = '' | let &t_te = '' | return | endif
-  " CHECK: Is it necessary to be able toggle dynamically?
-  " exec 'silent !echo -ne "'. g:focau.focuses[1] .g:focau.screens[1] .'"'
-
-  "" FIX: add two color groups based on language, not permanent. See xkb.
-  let color = focau#cursor#auto_color(0)
-  let codes = ['t_EI', 't_SI', 't_SR']
-  " Install insert mode autohooks -- on enter/leave
-  for i in range(3)| if exists('&'.codes[i])
-    exe 'set '.codes[i].'='.s:wrap(g:focau.cursors[i] . l:color)
-  endif | endfor
-
-  let on_init = &t_EI . s:wrap(g:focau.focuses[0]) . g:focau.screens[0]
-  let on_exit = s:wrap(g:focau.focuses[1]) . g:focau.screens[1]
-
-  " Install focus autohooks -- on startup/shutdown
-  let &t_ti = on_init | let &t_te = on_exit
-
-  " CHECK: Is it necessary to be able toggle dynamically?
-  " exec 'silent !echo -ne "'.&t_EI.g:focau.focuses[0].g:focau.screens[0].'"'
-endfunction
diff --git a/autoload/focau/init.vim b/autoload/focau/init.vim
deleted file mode 100644
index 7c9320ec1..000000000
--- a/autoload/focau/init.vim
+++ /dev/null
@@ -1,33 +0,0 @@
-" WARNING: seems like we can't use <expr> maps, because we need side-effects
-" ALT: {s: <C-g>...<C-g>, o: <Esc>, i: <C-o>, c: <C-\>e}
-function! s:map_triggers(e)
-  for [a, i] in items({'FocusGained': 0, 'FocusLost': 1})
-    let key = keys(a:e)[i] | exe 'set '.key.'='.a:e[key]
-    exe "fun! s:F".i."()\nif g:focau.active|sil! doau ".a."|en|return''\nendf"
-    for [ms, prf] in items({'nv': '@=', 'o': ':call ', 'ic': '<C-r>='})
-      for m in split(ms, '\zs')
-        exe m.'noremap <silent> '.key.' '.prf.'<SID>F'.i.'()<CR>'
-  endfor | endfor | endfor
-endfunction
-
-
-function! focau#init#main()
-  augroup focau
-    autocmd!
-  augroup END
-
-  call focau#cursor#shape_preserve()
-
-  if g:focau.auto
-    let g:focau.focuses = focau#events#auto_choose()
-    let g:focau.cursors = focau#cursor#auto_shape()
-    "" FIX: must be dynamic and check curr lang before each mode/lang-switch
-    " call s:focau_lang_choose() "primary/secondary
-  endif
-
-  " Wrap choosen keys in event triggers
-  call s:map_triggers(g:focau.events)
-  " Start
-  call focau#events#enable(g:focau.active)
-  au focau VimEnter * if g:focau.active | sil! doau FocusGained | endif
-endfunction
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index 031dbe636..bfd9c1a02 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -13,22 +13,6 @@ if exists('g:loaded_sensible')
   finish
 endif
 
-if !has('gui_running') && (!has('nvim') || $TERM =~? '^rxvt')
-  let g:focau = extend({
-    \ 'auto': 1,
-    \ 'active': 1,
-    \ 'events' : {'<F25>': "\e[I", '<F26>': "\e[O"},
-    \ 'focuses': ["\e[?1004h", "\e[?1004l"],
-    \ 'screens': ["\e[?1049h", "\e[?1049l"],
-    \ 'cursors': ['', '', ''],
-    \ 'colors' : ['white', 'cyan'],
-    \ 'widgets': [],
-    \ 'clipregs':['+"p', '"+'],
-    \}, get(g:, 'focau', {}))
-
-  call focau#init#main()
-endif
-
 " Code taken from https://github.com/tpope/vim-sensible
 " and (mostly comments) from https://github.com/sheerun/vimrc
 "
@@ -90,7 +74,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -
   if match(capture, 'checktime') == -1
     augroup polyglot-sensible
       au!
-      au CursorHold,FocusGained * silent! checktime
+      au CursorHold * silent! checktime
     augroup END
   endif
 

From e5668602cc89f3298a1ab936b082e82519aa6a50 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Dec 2020 09:58:20 +0100
Subject: [PATCH 218/299] Enable again swapfiles, fixes #638

---
 ftdetect/polyglot.vim | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 4d6935fe9..29a4a2c71 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2687,8 +2687,25 @@ if !has_key(g:polyglot_is_disabled, 'sensible')
   " Reload unchanged files automatically.
   set autoread
 
-  " Disable swap, it doesn't play well with autoread
-  set noswapfile
+  " This is needed to avoid swapfile warning when auto-reloading
+  set shortmess+=A
+
+  " Avoids swapfiles in current directory
+  if &directory =~# '^\.,'
+    if !empty($HOME)
+      if has('win32')
+        let &directory = expand('$HOME/vimfiles') . '//,' . &directory
+      else
+        let &directory = expand('$HOME/.vim') . '//,' . &directory
+      endif
+    endif
+    if !empty($XDG_DATA_HOME)
+      let &directory = expand('$XDG_DATA_HOME') . '//,' . &directory
+    endif
+    if has('macunix')
+      let &directory = expand('$HOME/Library/Autosave Information') . '//,' . &directory
+    endif
+  endif
 
   " Autoindent when starting new line, or using `o` or `O`.
   set autoindent

From 8af4f8e6c04b163d39de4327fca7f69cce78c0ab Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Dec 2020 12:13:50 +0100
Subject: [PATCH 219/299] Add jsonc, closes #635

---
 README.md                    |  3 +-
 autoload/polyglot/sleuth.vim |  1 +
 ftdetect/polyglot.vim        |  4 +++
 indent/jsonc.vim             |  5 +++
 packages.yaml                |  8 +++++
 syntax/jsonc.vim             | 61 ++++++++++++++++++++++++++++++++++++
 tests/filetypes.vim          |  1 +
 7 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 indent/jsonc.vim
 create mode 100644 syntax/jsonc.vim

diff --git a/README.md b/README.md
index e88ed3dc7..c6f537b42 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->600<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->601<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -111,6 +111,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [jq](https://github.com/vito-c/jq.vim) (JSONiq syntax highlighting for jq files)
 - [json5](https://github.com/GutenYe/json5.vim) (JSON5 syntax highlighting for json5 files)
 - [json](https://github.com/elzr/vim-json) (JSON syntax highlighting for json, avsc, geojson, gltf, har and 13 more files)
+- [jsonc](https://github.com/neoclide/jsonc.vim) (Syntax highlighting for cjson and jsonc files)
 - [jsonnet](https://github.com/google/vim-jsonnet) (Jsonnet syntax highlighting for jsonnet and libsonnet files)
 - [jst](https://github.com/briancollins/vim-jst) (EJS syntax highlighting for ejs, ect and jst files)
 - [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (JSX syntax highlighting for jsx files)
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 155ae0b55..2fb3b8270 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -263,6 +263,7 @@ let s:globs = {
   \ 'jq': '*.jq,.jqrc,.jqrc*',
   \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.tern-config,.tern-project,.watchmanconfig,composer.lock,mcmod.info,Pipfile.lock',
   \ 'json5': '*.json5',
+  \ 'jsonc': '*.cjson,*.jsonc,coc-settings.json,.eslintrc.json,.babelrc,.jshintrc,.jslintrc,.mocharc.json,coffeelint.json,tsconfig.json,jsconfig.json',
   \ 'jsonnet': '*.jsonnet,*.libsonnet',
   \ 'jsp': '*.jsp',
   \ 'jst': '*.ejs,*.ect,*.jst',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 29a4a2c71..85c933e35 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -142,6 +142,10 @@ set cpo&vim
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(g:polyglot_is_disabled, 'jsonc')
+  au BufNewFile,BufRead *.cjson,*.jsonc,{.,}babelrc,{.,}eslintrc.json,{.,}jshintrc,{.,}jslintrc,{.,}mocharc.json,coc-settings.json,coffeelint.json,jsconfig.json,tsconfig.json setf jsonc
+endif
+
 if !has_key(g:polyglot_is_disabled, 'mint')
   au BufNewFile,BufRead *.mint setf mint
 endif
diff --git a/indent/jsonc.vim b/indent/jsonc.vim
new file mode 100644
index 000000000..baffdae84
--- /dev/null
+++ b/indent/jsonc.vim
@@ -0,0 +1,5 @@
+if has_key(g:polyglot_is_disabled, 'jsonc')
+  finish
+endif
+
+runtime! indent/json.vim
diff --git a/packages.yaml b/packages.yaml
index dc127f28d..a1bf7d401 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5554,3 +5554,11 @@ filetypes:
   patterns:
   - pattern: '*.mint'
     description: Mint (https://www.mint-lang.com/)
+---
+name: jsonc
+remote: neoclide/jsonc.vim
+filetypes:
+- name: jsonc
+  patterns:
+  - pattern: '*.cjson,coc-settings.json,*.jsonc,.eslintrc.json,.babelrc,.jshintrc,.jslintrc,.mocharc.json,coffeelint.json,tsconfig.json,jsconfig.json'
+    description: 'JSON with comments (https://komkom.github.io/)'
diff --git a/syntax/jsonc.vim b/syntax/jsonc.vim
new file mode 100644
index 000000000..49c14bcc6
--- /dev/null
+++ b/syntax/jsonc.vim
@@ -0,0 +1,61 @@
+if has_key(g:polyglot_is_disabled, 'jsonc')
+  finish
+endif
+
+" Syntax setup {{{1
+if exists('b:current_syntax') && b:current_syntax == 'jsonc'
+  finish
+endif
+
+" Syntax: Strings {{{1
+syn region  jsoncString    start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=jsoncEscape
+syn region  jsoncString    start=+'+  skip=+\\\\\|\\'+  end=+'+  contains=jsoncEscape
+
+" Syntax: JSON Keywords {{{1
+" Separated into a match and region because a region by itself is always greedy
+syn match  jsoncKeywordMatch /"\([^"]\|\\\"\)\+"[[:blank:]\r\n]*\:/ contains=jsonKeyword
+
+" Syntax: Escape sequences
+syn match   jsoncEscape    "\\["\\/bfnrt]" contained
+syn match   jsoncEscape    "\\u\x\{4}" contained
+
+" Syntax: Numbers {{{1
+syn match   jsoncNumber    "-\=\<\%(0\|[1-9]\d*\)\%(\.\d\+\)\=\%([eE][-+]\=\d\+\)\=\>"
+syn keyword jsoncNumber    Infinity -Infinity
+
+" Syntax: An integer part of 0 followed by other digits is not allowed.
+syn match   jsoncNumError  "-\=\<0\d\.\d*\>"
+
+" Syntax: Boolean {{{1
+syn keyword jsoncBoolean   true false
+
+" Syntax: Null {{{1
+syn keyword jsoncNull      null
+
+" Syntax: Braces {{{1
+syn match   jsoncBraces	   "[{}\[\]]"
+syn match   jsoncObjAssign /@\?\%(\I\|\$\)\%(\i\|\$\)*\s*\ze::\@!/
+
+" Syntax: Comment {{{1
+syn region  jsoncLineComment    start=+\/\/+ end=+$+ keepend
+syn region  jsoncLineComment    start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ keepend fold
+syn region  jsoncComment        start="/\*"  end="\*/" fold
+
+" Define the default highlighting. {{{1
+hi def link jsoncString             String
+hi def link jsoncObjAssign          Identifier
+hi def link jsoncEscape             Special
+hi def link jsoncNumber             Number
+hi def link jsoncBraces             Operator
+hi def link jsoncNull               Function
+hi def link jsoncBoolean            Boolean
+hi def link jsoncLineComment        Comment
+hi def link jsoncComment            Comment
+hi def link jsoncNumError           Error
+hi def link jsoncKeywordMatch       Label
+
+if !exists('b:current_syntax')
+  let b:current_syntax = 'jsonc'
+endif
+
+" vim: fdm=marker
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 08d4cb938..3b71ac76e 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -645,6 +645,7 @@ call TestFiletype('xpm')
 call TestFiletype('xpm2')
 call TestFiletype('context')
 call TestFiletype('mint')
+call TestFiletype('jsonc')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 

From 0626cc90a21dbd93806e431a4cff640d2d13c765 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 30 Dec 2020 12:16:03 +0100
Subject: [PATCH 220/299] Change fish provider, closes #626

---
 README.md         |   2 +-
 autoload/fish.vim | 128 +++++++++++++++++++++++++++++++++++-----------
 ftplugin/fish.vim |  31 ++++++++++-
 indent/fish.vim   |   1 +
 packages.yaml     |   2 +-
 syntax/fish.vim   |   5 +-
 6 files changed, 134 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index c6f537b42..783893f91 100644
--- a/README.md
+++ b/README.md
@@ -78,7 +78,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [erlang](https://github.com/vim-erlang/vim-erlang-runtime) (Erlang syntax highlighting for erl, app.src, es, escript, hrl, xrl, yrl, app and yaws files)
 - [fennel](https://github.com/bakpakin/fennel.vim) (Syntax highlighting for fnl files)
 - [ferm](https://github.com/vim-scripts/ferm.vim) (Syntax highlighting for ferm files)
-- [fish](https://github.com/georgewitteman/vim-fish) (fish syntax highlighting for fish files)
+- [fish](https://github.com/blankname/vim-fish) (fish syntax highlighting for fish files)
 - [flatbuffers](https://github.com/dcharbon/vim-flatbuffers) (Syntax highlighting for fbs files)
 - [fsharp](https://github.com/ionide/Ionide-vim) (F# syntax highlighting for fs, fsi and fsx files)
 - [gdscript](https://github.com/calviken/vim-gdscript3) (GDScript syntax highlighting for gd files)
diff --git a/autoload/fish.vim b/autoload/fish.vim
index 0ea2e4745..92d9f642d 100644
--- a/autoload/fish.vim
+++ b/autoload/fish.vim
@@ -2,44 +2,112 @@ if has_key(g:polyglot_is_disabled, 'fish')
   finish
 endif
 
+function! s:IsString(lnum, col)
+    " Returns "true" if syntax item at the given position is part of fishString.
+    let l:stack = map(synstack(a:lnum, a:col), 'synIDattr(v:val, "name")')
+    return len(filter(l:stack, 'v:val ==# "fishString"'))
+endfunction
+
+function! s:IsContinuedLine(lnum)
+    " Returns "true" if the given line is a continued line.
+    return getline(a:lnum - 1) =~ '\v\\$'
+endfunction
+
+function! s:FindPrevLnum(lnum)
+    " Starting on the given line, search backwards for a line that is not
+    " empty, not part of a string and not a continued line.
+    if a:lnum < 1 || a:lnum > line('$')
+        " First line or wrong value, follow prevnonblank() behaviour and
+        " return zero.
+        return 0
+    endif
+    let l:lnum = prevnonblank(a:lnum)
+    while l:lnum > 0 && ( s:IsContinuedLine(l:lnum) || s:IsString(l:lnum, 1) )
+        let l:lnum = prevnonblank(l:lnum - 1)
+    endwhile
+    return l:lnum
+endfunction
+
+function! s:IsSwitch(lnum)
+    " Returns "true" if the given line is part of a switch block.
+    let l:lnum = a:lnum
+    let l:line = getline(l:lnum)
+    let l:in_block = 0
+    let l:stop_pat = '\v^\s*%(if|else|while|for|begin)>'
+    let l:block_start_pat = '\v^\s*%(if|while|for|switch|begin)>'
+    while l:lnum > 0
+        let l:lnum = prevnonblank(l:lnum - 1)
+        let l:line = getline(l:lnum)
+        if l:line =~# '\v^\s*end>'
+            let l:in_block += 1
+        elseif l:in_block && l:line =~# l:block_start_pat
+            let l:in_block -= 1
+        elseif !l:in_block && l:line =~# l:stop_pat
+            return 0
+        elseif !l:in_block && l:line =~# '\v^\s*switch>'
+            return 1
+        endif
+    endwhile
+    return 0
+endfunction
+
 function! fish#Indent()
-    let l:prevlnum = prevnonblank(v:lnum - 1)
-    if l:prevlnum ==# 0
+    let l:line = getline(v:lnum)
+    if s:IsString(v:lnum, 1)
+        return indent(v:lnum)
+    endif
+    " shiftwidth can be misleading in recent versions, use shiftwidth() if
+    " it is available.
+    if exists('*shiftwidth')
+        let l:shiftwidth = shiftwidth()
+    else
+        let l:shiftwidth = &shiftwidth
+    endif
+    let l:prevlnum = s:FindPrevLnum(v:lnum - 1)
+    if l:prevlnum == 0
         return 0
     endif
+    let l:shift = 0
     let l:prevline = getline(l:prevlnum)
-    let l:line = getline(v:lnum)
-    let l:shiftwidth = shiftwidth()
     let l:previndent = indent(l:prevlnum)
-    let l:indent = l:previndent
-    if l:prevline =~# '\v^\s*%(begin|if|else|while|for|function|switch|case)>'
-        let l:indent += l:shiftwidth
-    endif
-    if l:line =~# '\v^\s*end>'
-        let l:indent -= l:shiftwidth
-        " If we're inside a case, dedent twice because it ends the switch.
-        if l:prevline =~# '\v^\s*case>'
-            " Previous line starts the case.
-            let l:indent -= l:shiftwidth
+    if s:IsContinuedLine(v:lnum)
+        " It is customary to increment indentation of continued lines by three
+        " or a custom value defined by the user if available.
+        let l:previndent = indent(v:lnum - 1)
+        if s:IsContinuedLine(v:lnum - 1)
+            return l:previndent
+        elseif exists('g:fish_indent_cont')
+            return l:previndent + g:fish_indent_cont
+        elseif exists('g:indent_cont')
+            return l:previndent + g:indent_cont
         else
-            " Scan back to a dedented line to find whether we're in a case.
-            let l:i = l:prevlnum
-            while l:i >= 1 && indent(l:i) >= l:previndent
-                let l:i = prevnonblank(l:i - 1)
-            endwhile
-            if indent(l:i) < l:previndent && getline(l:i) =~# '\v^\s*case>'
-                let l:indent -= l:shiftwidth
-            endif
+            return l:previndent + 3
         endif
-    elseif l:line =~# '\v^\s*else>'
-        let l:indent -= l:shiftwidth
-    elseif l:prevline !~# '\v^\s*switch>' && l:line =~# '\v^\s*case>'
-        let l:indent -= l:shiftwidth
     endif
-    if l:indent < 0
-        return 0
+    if l:prevline =~# '\v^\s*%(begin|if|else|while|for|function|case|switch)>'
+        " First line inside a block, increase by one.
+        let l:shift += 1
+    endif
+    if l:line =~# '\v^\s*%(end|case|else)>'
+        " "end", "case" or "else", decrease by one.
+        let l:shift -= 1
+    endif
+    if l:line =~# '\v^\s*<case>' && l:prevline =~# '\v<switch>'
+        " "case" following "switch", increase by one.
+        let l:shift += 1
+    endif
+    if l:line =~# '\v\s*end>' && s:IsSwitch(v:lnum)
+        " "end" ends switch block, decrease by one more so it matches
+        " the indentation of "switch".
+        let l:shift -= 1
+    endif
+    if l:prevline =~# '\v^\s*%(if|while|for|else|switch|end)>.*<begin>'
+        " "begin" after start of block, increase by one.
+        let l:shift += 1
     endif
-    return l:indent
+    let l:indent = l:previndent + l:shift * l:shiftwidth
+    " Only return zero or positive numbers.
+    return l:indent < 0 ? 0 : l:indent
 endfunction
 
 function! fish#Format()
@@ -49,6 +117,8 @@ function! fish#Format()
         let l:command = v:lnum.','.(v:lnum+v:count-1).'!fish_indent'
         echo l:command
         execute l:command
+        " Fix indentation and replace tabs with spaces if necessary.
+        normal! '[=']
     endif
 endfunction
 
diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
index d08222dbb..19fa5c38d 100644
--- a/ftplugin/fish.vim
+++ b/ftplugin/fish.vim
@@ -2,6 +2,14 @@ if has_key(g:polyglot_is_disabled, 'fish')
   finish
 endif
 
+if exists('b:did_ftplugin')
+    finish
+end
+let b:did_ftplugin = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
 setlocal comments=:#
 setlocal commentstring=#%s
 setlocal define=\\v^\\s*function>
@@ -9,6 +17,7 @@ setlocal foldexpr=fish#Fold()
 setlocal formatoptions+=ron1
 setlocal formatoptions-=t
 setlocal include=\\v^\\s*\\.>
+setlocal iskeyword=@,48-57,-,_,.
 setlocal suffixesadd^=.fish
 
 " Use the 'j' format option when available.
@@ -34,9 +43,27 @@ endif
 " argument to fish instead of man.
 execute 'setlocal keywordprg=fish\ '.fnameescape(expand('<sfile>:p:h:h').'/bin/man.fish')
 
-let b:match_words =
-            \ escape('<%(begin|function|if|switch|while|for)>:<end>', '<>%|)')
+let b:match_ignorecase = 0
+if has('patch-7.3.1037')
+    let s:if = '%(else\s\+)\@15<!if'
+else
+    let s:if = '%(else\s\+)\@<!if'
+endif
+
+let b:match_words = escape(
+            \'<%(begin|function|'.s:if.'|switch|while|for)>:<else\s\+if|case>:<else>:<end>'
+            \, '<>%|)')
 
 let b:endwise_addition = 'end'
 let b:endwise_words = 'begin,function,if,switch,while,for'
 let b:endwise_syngroups = 'fishKeyword,fishConditional,fishRepeat'
+
+let b:undo_ftplugin = "
+            \ setlocal comments< commentstring< define< foldexpr< formatoptions<
+            \|setlocal include< iskeyword< suffixesadd<
+            \|setlocal formatexpr< omnifunc< path< keywordprg<
+            \|unlet! b:match_words b:endwise_addition b:endwise_words b:endwise_syngroups
+            \"
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/indent/fish.vim b/indent/fish.vim
index 656109627..2fa1c1a7f 100644
--- a/indent/fish.vim
+++ b/indent/fish.vim
@@ -3,4 +3,5 @@ if has_key(g:polyglot_is_disabled, 'fish')
 endif
 
 setlocal indentexpr=fish#Indent()
+setlocal indentkeys=!^F,o,O
 setlocal indentkeys+==end,=else,=case
diff --git a/packages.yaml b/packages.yaml
index a1bf7d401..5efef051c 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -575,7 +575,7 @@ filetypes:
   - ferm.conf
 ---
 name: fish
-remote: georgewitteman/vim-fish
+remote: blankname/vim-fish
 filetypes:
 - name: fish
   linguist: fish
diff --git a/syntax/fish.vim b/syntax/fish.vim
index 22813ccb9..6ea51a827 100644
--- a/syntax/fish.vim
+++ b/syntax/fish.vim
@@ -7,6 +7,7 @@ if exists('b:current_syntax')
 endif
 
 syntax case match
+syntax iskeyword @,48-57,-,_,.,/
 
 syntax keyword fishKeyword begin function end
 syntax keyword fishConditional if else switch
@@ -16,8 +17,8 @@ syntax keyword fishLabel case
 syntax match fishComment /#.*/
 syntax match fishSpecial /\\$/
 syntax match fishIdentifier /\$[[:alnum:]_]\+/
-syntax region fishString start=/'/ skip=/\\'/ end=/'/
-syntax region fishString start=/"/ skip=/\\"/ end=/"/ contains=fishIdentifier
+syntax region fishString start=/'/ skip=/\v(\\{2})|(\\)'/ end=/'/
+syntax region fishString start=/"/ skip=/\v(\\{2})|(\\)"/ end=/"/ contains=fishIdentifier
 syntax match fishCharacter /\v\\[abefnrtv *?~%#(){}\[\]<>&;"']|\\[xX][0-9a-f]{1,2}|\\o[0-7]{1,2}|\\u[0-9a-f]{1,4}|\\U[0-9a-f]{1,8}|\\c[a-z]/
 syntax match fishStatement /\v;\s*\zs\k+>/
 syntax match fishCommandSub /\v\(\s*\zs\k+>/

From d6678a1b35f7cb873a6a62c371dcadfc03c8ae0d Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 1 Jan 2021 16:54:03 +0100
Subject: [PATCH 221/299] Allow to disable ftdetect scripts, closes #657

---
 README.md             | 9 +++++++++
 ftdetect/polyglot.vim | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/README.md b/README.md
index 783893f91..61fc940cc 100644
--- a/README.md
+++ b/README.md
@@ -247,6 +247,15 @@ Vim Polyglot includes vim-sensible plugin, which is usually necessary for editin
 let g:polyglot_disabled = ['sensible']
 ```
 
+## No ftdetect
+
+If you want to use vim-polyglot plugins, but not ftdetect autocommands, the you can disable it as so:
+
+
+```vim
+let g:polyglot_disabled = ['ftdetect']
+```
+
 ## Contributing
 
 Language packs are periodically updated using automated `scripts/build` script.
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 85c933e35..45087f65f 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -140,6 +140,8 @@ augroup filetypedetect
 let s:cpo_save = &cpo
 set cpo&vim
 
+if !has_key(g:polyglot_is_disabled, 'ftdetect')
+
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
 if !has_key(g:polyglot_is_disabled, 'jsonc')
@@ -2655,6 +2657,8 @@ endif
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 
+endif
+
 func! s:Observe(fn)
   let b:PolyglotObserve = function("polyglot#" . a:fn)
   augroup polyglot-observer

From 7219196dbae4242f8c9c3bb139cce72fe330ef03 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 1 Jan 2021 17:00:28 +0100
Subject: [PATCH 222/299] Improve disabling ftdetect

---
 ftdetect/polyglot.vim | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 45087f65f..113453aff 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -14,11 +14,6 @@ let did_load_polyglot = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-" It can happen vim filetype.vim loads first, then we need a reset
-if exists("did_load_filetypes")
-  au! filetypedetect
-endif
-
 let g:polyglot_is_disabled = {}
 let s:new_polyglot_disabled = []
 
@@ -48,9 +43,6 @@ endfun
 
 au VimEnter * call PolyglotVerify()
 
-" Prevent filetype.vim of vim from loading again
-let did_load_filetypes = 1
-
 " Be consistent across different systems
 set nofileignorecase
 
@@ -142,6 +134,15 @@ set cpo&vim
 
 if !has_key(g:polyglot_is_disabled, 'ftdetect')
 
+" It can happen vim filetype.vim loads first, then we need a reset
+if exists("did_load_filetypes")
+  au! filetypedetect
+endif
+
+" Prevent filetype.vim of vim from loading again
+let did_load_filetypes = 1
+
+
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
 if !has_key(g:polyglot_is_disabled, 'jsonc')
@@ -2657,8 +2658,6 @@ endif
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 
-endif
-
 func! s:Observe(fn)
   let b:PolyglotObserve = function("polyglot#" . a:fn)
   augroup polyglot-observer
@@ -2677,6 +2676,7 @@ au BufWritePost * au! polyglot-observer
 
 augroup END
 
+endif
 
 if !has_key(g:polyglot_is_disabled, 'sensible')
   " Use 2-spaces tab indentation by default

From 1f4236df3aaaec797e81572fd120a9d49d4035b9 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 1 Jan 2021 17:06:27 +0100
Subject: [PATCH 223/299] Detect filetype only if not set, fixes #656

---
 ftdetect/polyglot.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 113453aff..198e334ce 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2662,11 +2662,11 @@ func! s:Observe(fn)
   let b:PolyglotObserve = function("polyglot#" . a:fn)
   augroup polyglot-observer
     au!
-    au CursorHold,CursorHoldI,BufWritePost <buffer> call b:PolyglotObserve()
+    au CursorHold,CursorHoldI <buffer> call b:PolyglotObserve()
   augroup END
 endfunc
 
-au BufNewFile,BufRead,StdinReadPost,BufWritePost * if expand("<afile>:e") == "" |
+au BufNewFile,BufRead,StdinReadPost,BufWritePost * if (&ft == "" || &ft == "conf") && expand("<afile>:e") == "" |
   \ call polyglot#shebang#Detect() | endif
 
 au BufWinEnter * if &ft == "" && expand("<afile>:e") == "" |

From a81756029291d6e21295687515a3e58499c19b33 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 1 Jan 2021 17:09:30 +0100
Subject: [PATCH 224/299] Add support for gleam, closes #655

Co-authored-by: Jeff Kreeftmeijer <jeffkreeftmeijer@gmail.com>
---
 README.md                    |   3 +-
 after/syntax/cpp.vim         |   4 +-
 autoload/polyglot/sleuth.vim |   1 +
 compiler/gleam.vim           |  49 ++++
 extras/filetype.vim          |  13 +-
 ftdetect/polyglot.vim        |   4 +
 ftplugin/dune.vim            |  10 +
 ftplugin/gleam.vim           |  32 +++
 ftplugin/ocaml.vim           |   2 +-
 ftplugin/sexplib.vim         |   3 +-
 indent/dune.vim              |   3 +
 indent/ocaml.vim             |  14 +-
 packages.yaml                |   7 +
 syntax/basic/identifiers.vim |   4 +-
 syntax/basic/literal.vim     |   4 +-
 syntax/basic/object.vim      |   2 +-
 syntax/dune.vim              |  11 +
 syntax/gleam.vim             |  58 ++++
 syntax/ocaml.vim             |   2 +-
 syntax/opam.vim              |   7 +
 syntax/pgsql.vim             | 519 ++++++++++++++++++-----------------
 syntax/sexplib.vim           |   6 +-
 tests/filetypes.vim          |   1 +
 23 files changed, 477 insertions(+), 282 deletions(-)
 create mode 100644 compiler/gleam.vim
 create mode 100644 ftplugin/gleam.vim
 create mode 100644 syntax/gleam.vim

diff --git a/README.md b/README.md
index 61fc940cc..b914860f3 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->601<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->602<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -84,6 +84,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [gdscript](https://github.com/calviken/vim-gdscript3) (GDScript syntax highlighting for gd files)
 - [git](https://github.com/tpope/vim-git) (Git Config syntax highlighting for gitconfig files)
 - [gitignore](https://github.com/fszymanski/fzf-gitignore)
+- [gleam](https://github.com/gleam-lang/gleam.vim) (Syntax highlighting for gleam files)
 - [glsl](https://github.com/tikhomirov/vim-glsl) (GLSL syntax highlighting for glsl, fp, frag, frg, fs and 16 more files)
 - [gmpl](https://github.com/maelvalais/gmpl.vim) (Syntax highlighting for mod files)
 - [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting) (Gnuplot syntax highlighting for gp, gnu, gnuplot, p, plot, plt and gpi files)
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index d181f261d..1143e4396 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -103,7 +103,7 @@ endif
 
 " C++14 extensions {{{1
 if !exists('cpp_no_cpp14')
-    syntax keyword cppSTLnamespace literals chrono_literals string_literals
+    syntax keyword cppSTLnamespace literals chrono_literals string_literals complex_literals
 
     syntax keyword cppSTLfunction make_unique
 
@@ -117,7 +117,7 @@ endif
 
 " C++17 extensions {{{1
 if !exists('cpp_no_cpp17')
-    syntax keyword cppSTLnamespace filesystem execution
+    syntax keyword cppSTLnamespace filesystem execution string_view_literals
 
     syntax keyword cppSTLtype
             \ any is_execution_policy parallel_policy parallel_unsequenced_policy sequenced_policy directory_entry directory_iterator file_status file_time_type path recursive_directory_iterator space_info default_order default_searcher boyer_moore_searcher boyer_moore_horspool_searcher memory_resource monotonic_buffer_resource polymorphic_allocator pool_options synchronized_pool_resource unsynchronized_pool_resource scoped_lock optional shared_mutex basic_string_view string_view u16string_view u32string_view wstring_view bool_constant conjunction disjunction has_unique_object_representations invoke_result is_aggregate is_callable is_invocable is_invocable_r is_nothrow_invocable is_nothrow_invocable_r is_nothrow_swappable is_nothrow_swappable_with is_nowthrow_callable is_swappable is_swappable_with negation node_type insert_return_type in_place_tag monostate variant variant_size variant_alternative
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 2fb3b8270..a269fa82f 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -191,6 +191,7 @@ let s:globs = {
   \ 'gitrebase': 'git-rebase-todo',
   \ 'gitsendemail': '.gitsendemail.*',
   \ 'gkrellmrc': 'gkrellmrc,gkrellmrc_?',
+  \ 'gleam': '*.gleam',
   \ 'glsl': '*.glsl,*.fp,*.frag,*.frg,*.fs,*.fsh,*.fshader,*.geo,*.geom,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader,*.comp',
   \ 'gmpl': '*.mod',
   \ 'gnash': 'gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc',
diff --git a/compiler/gleam.vim b/compiler/gleam.vim
new file mode 100644
index 000000000..808a869ab
--- /dev/null
+++ b/compiler/gleam.vim
@@ -0,0 +1,49 @@
+if has_key(g:polyglot_is_disabled, 'gleam')
+  finish
+endif
+
+" Check we've not run already
+if exists('current_compiler')
+    finish
+endif
+
+let current_compiler = "gleam"
+
+" Defined CompilerSet command if it doesn't exist.
+" Needed for older vim versions.
+if exists(":CompilerSet") != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+" Tell vim to run 'gleam' when the user runs :make. So ':make build .' becomes
+" 'gleam build .'
+CompilerSet makeprg=gleam\ $*
+
+
+" With the compiler set, we set the errorformat which is a set of rules that
+" vim uses to parse the output of the current compiler program in order to
+" extract file, line, column & error message information so that it can
+" populate the quickfix list and the user can jump between the errors.
+"
+" This errorformat 'parser' will have to change if the output of the compiler
+" changes.
+"
+" Written with the help of: https://flukus.github.io/vim-errorformat-demystified.html
+"
+CompilerSet errorformat=%Eerror:\ %m                  " use 'error:' to indicate the start of a new error
+CompilerSet errorformat+=%C\ %#┌─%#\ %f:%l:%c\ %#-%#  " pull out the file, line & column (matches optional spaces & dashes at the end in case they come back.)
+CompilerSet errorformat+=%C                           " allow empty lines within an error
+CompilerSet errorformat+=%C%.%#│%.%#                  " ignore any line with a vertial formatting pipe in it
+CompilerSet errorformat+=%Z%m                         " assume any other line contributes to the error message
+
+
+" Example error message
+"
+" error: Unknown variable
+"    ┌─ /home/michael/root/projects/tutorials/gleam/try/code/src/main.gleam:19:18
+"    │
+" 19 │   Ok(tuple(name, spot))
+"    │                  ^^^^ did you mean `sport`?
+" 
+" The name `spot` is not in scope here.
+
diff --git a/extras/filetype.vim b/extras/filetype.vim
index e36750848..20fa887ed 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -499,6 +499,9 @@ au BufNewFile,BufRead *.com			call polyglot#ft#BindzoneCheck('dcl')
 " DOT
 au BufNewFile,BufRead *.dot,*.gv		setf dot
 
+" Dune
+au BufNewFile,BufRead jbuild,dune,dune-project,dune-workspace setf dune
+
 " Dylan - lid files
 au BufNewFile,BufRead *.lid			setf dylanlid
 
@@ -1125,8 +1128,8 @@ au BufNewFile,BufRead *.nse			setf lua
 " NSIS
 au BufNewFile,BufRead *.nsi,*.nsh		setf nsis
 
-" OCAML
-au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit	setf ocaml
+" OCaml
+au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo setf ocaml
 
 " Occam
 au BufNewFile,BufRead *.occ			setf occam
@@ -1134,6 +1137,9 @@ au BufNewFile,BufRead *.occ			setf occam
 " Omnimark
 au BufNewFile,BufRead *.xom,*.xin		setf omnimark
 
+" OPAM
+au BufNewFile,BufRead opam,*.opam,*.opam.template setf opam
+
 " OpenROAD
 au BufNewFile,BufRead *.or			setf openroad
 
@@ -1547,6 +1553,9 @@ au BufNewFile,BufRead *.scm,*.ss,*.rkt		setf scheme
 " Screen RC
 au BufNewFile,BufRead .screenrc,screenrc	setf screen
 
+" Sexplib
+au BufNewFile,BufRead *.sexp setf sexplib
+
 " Simula
 au BufNewFile,BufRead *.sim			setf simula
 
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 198e334ce..94e9b28b7 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -145,6 +145,10 @@ let did_load_filetypes = 1
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(g:polyglot_is_disabled, 'gleam')
+  au BufNewFile,BufRead *.gleam setf gleam
+endif
+
 if !has_key(g:polyglot_is_disabled, 'jsonc')
   au BufNewFile,BufRead *.cjson,*.jsonc,{.,}babelrc,{.,}eslintrc.json,{.,}jshintrc,{.,}jslintrc,{.,}mocharc.json,coc-settings.json,coffeelint.json,jsconfig.json,tsconfig.json setf jsonc
 endif
diff --git a/ftplugin/dune.vim b/ftplugin/dune.vim
index 970c98251..92c471f43 100644
--- a/ftplugin/dune.vim
+++ b/ftplugin/dune.vim
@@ -2,6 +2,14 @@ if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
+" Language:    Dune buildsystem
+" Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
+"              Anton Kochkov       <anton.kochkov@gmail.com>
+" URL:         https://github.com/ocaml/vim-ocaml
+" Last Change:
+"              2018 Nov 3 - Added commentstring (Markus Mottl)
+"              2017 Sep 6 - Initial version (Etienne Millon)
+
 if exists("b:did_ftplugin")
   finish
 endif
@@ -12,3 +20,5 @@ set lisp
 " Comment string
 setl commentstring=;\ %s
 setl comments=:;
+
+setl iskeyword+=#,?,.,/
diff --git a/ftplugin/gleam.vim b/ftplugin/gleam.vim
new file mode 100644
index 000000000..58f39f03d
--- /dev/null
+++ b/ftplugin/gleam.vim
@@ -0,0 +1,32 @@
+if has_key(g:polyglot_is_disabled, 'gleam')
+  finish
+endif
+
+
+if exists("b:did_ftplugin")
+    finish
+endif
+let b:did_ftplugin = 1
+
+compiler gleam
+
+setlocal commentstring=//%s
+setlocal formatoptions-=t formatoptions+=croqnl
+
+setlocal comments=s0:/*!,ex:*/,s1:/*,mb:*,ex:*/,:////,:///,://
+
+" j was only added in 7.3.541, so stop complaints about its nonexistence
+silent! setlocal formatoptions+=j
+
+" smartindent will be overridden by indentexpr if filetype indent is on, but
+" otherwise it's better than nothing.
+setlocal smartindent nocindent
+
+setlocal tabstop=2 shiftwidth=2 softtabstop=2 expandtab
+setlocal textwidth=79
+
+setlocal suffixesadd=.gleam
+
+augroup gleam.vim
+autocmd!
+augroup END
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index 183b53188..84be233ef 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -9,7 +9,7 @@ endif
 "              Pierre Vittet       <pierre-vittet@pvittet.com>
 "              Stefano Zacchiroli  <zack@bononia.it>
 "              Vincent Aravantinos <firstname.name@imag.fr>
-" URL:         http://www.ocaml.info/vim/ftplugin/ocaml.vim
+" URL:         https://github.com/ocaml/vim-ocaml
 " Last Change:
 "              2013 Oct 27 - Added commentstring (MM)
 "              2013 Jul 26 - load default compiler settings (MM)
diff --git a/ftplugin/sexplib.vim b/ftplugin/sexplib.vim
index ebd322ad5..7b36d6318 100644
--- a/ftplugin/sexplib.vim
+++ b/ftplugin/sexplib.vim
@@ -2,9 +2,10 @@ if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
+" Vim filetype plugin file
 " Language:    Sexplib
 " Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
-" URL:         http://www.ocaml.info/vim/ftplugin/sexplib.vim
+" URL:         https://github.com/ocaml/vim-ocaml
 " Last Change:
 "              2017 Apr 12 - First version (MM)
 
diff --git a/indent/dune.vim b/indent/dune.vim
index e39aa7a28..0a658da46 100644
--- a/indent/dune.vim
+++ b/indent/dune.vim
@@ -4,6 +4,9 @@ endif
 
 " Vim indent file
 " Language: dune
+" Maintainers:  Markus Mottl         <markus.mottl@gmail.com>
+" URL:          https://github.com/ocaml/vim-ocaml
+" Last Change:  2020 Dec 31
 
 if exists("b:did_indent")
  finish
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index d67f3e363..c902d8db4 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -7,8 +7,8 @@ endif
 " Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
 "               Mike Leary           <leary@nwlink.com>
 "               Markus Mottl         <markus.mottl@gmail.com>
-" URL:          http://www.ocaml.info/vim/indent/ocaml.vim
-" Last Change:  2013 Jun 29
+" URL:          https://github.com/ocaml/vim-ocaml
+" Last Change:  2017 Jun 13
 "               2005 Jun 25 - Fixed multiple bugs due to 'else\nreturn ind' working
 "               2005 May 09 - Added an option to not indent OCaml-indents specially (MM)
 "               2013 June   - commented textwidth (Marc Weber)
@@ -106,7 +106,7 @@ function! GetOCamlIndent()
 
  " Return double 'shiftwidth' after lines matching:
  if lline =~ '^\s*|.*->\s*$'
-   return ind + &sw + &sw
+   return ind + 2 * shiftwidth()
  endif
 
  let line = getline(v:lnum)
@@ -177,7 +177,7 @@ function! GetOCamlIndent()
  " Indent if current line begins with 'and':
  elseif line =~ '^\s*and\>'
    if lline !~ '^\s*\(and\|let\|type\)\>\|\<end\s*$'
-     return ind - &sw
+     return ind - shiftwidth()
    endif
 
  " Indent if current line begins with 'with':
@@ -204,14 +204,14 @@ function! GetOCamlIndent()
  " or 'method':
  elseif line =~ '^\s*\(constraint\|inherit\|initializer\|method\)\>'
    if lline !~ s:obj
-     return indent(search('\<\(object\|object\s*(.*)\)\s*$', 'bW')) + &sw
+     return indent(search('\<\(object\|object\s*(.*)\)\s*$', 'bW')) + shiftwidth()
    endif
 
  endif
 
  " Add a 'shiftwidth' after lines ending with:
  if lline =~ '\(:\|=\|->\|<-\|(\|\[\|{\|{<\|\[|\|\[<\|\<\(begin\|do\|else\|fun\|function\|functor\|if\|initializer\|object\|parser\|private\|sig\|struct\|then\|try\)\|\<object\s*(.*)\)\s*$'
-   let ind = ind + &sw
+   let ind = ind + shiftwidth()
 
  " Back to normal indent after lines ending with ';;':
  elseif lline =~ ';;\s*$' && lline !~ '^\s*;;'
@@ -268,7 +268,7 @@ function! GetOCamlIndent()
 
  " Subtract a 'shiftwidth' after lines matching 'match ... with parser':
  if lline =~ '\<match\>.*\<with\>\s*\<parser\s*$'
-   let ind = ind - &sw
+   let ind = ind - shiftwidth()
  endif
 
  return ind
diff --git a/packages.yaml b/packages.yaml
index 5efef051c..a4dc47171 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5562,3 +5562,10 @@ filetypes:
   patterns:
   - pattern: '*.cjson,coc-settings.json,*.jsonc,.eslintrc.json,.babelrc,.jshintrc,.jslintrc,.mocharc.json,coffeelint.json,tsconfig.json,jsconfig.json'
     description: 'JSON with comments (https://komkom.github.io/)'
+---
+name: gleam
+remote: gleam-lang/gleam.vim
+filetypes:
+  - name: gleam
+    extensions:
+    - gleam
diff --git a/syntax/basic/identifiers.vim b/syntax/basic/identifiers.vim
index d46c999fc..36b6d29cc 100644
--- a/syntax/basic/identifiers.vim
+++ b/syntax/basic/identifiers.vim
@@ -22,13 +22,13 @@ syntax match   typescriptProp contained /\K\k*!\?/
   \ nextgroup=@afterIdentifier
   \ skipwhite skipempty
 
-syntax region  typescriptIndexExpr      contained matchgroup=typescriptProperty start=/\[/rs=s+1 end=/]/he=e-1 contains=@typescriptValue nextgroup=@typescriptSymbols,typescriptDotNotation,typescriptFuncCallArg skipwhite skipempty
+syntax region  typescriptIndexExpr      contained matchgroup=typescriptProperty start=/\[/rs=s+1 end=/]/he=e-1 contains=@typescriptValue,typescriptCastKeyword nextgroup=@typescriptSymbols,typescriptDotNotation,typescriptFuncCallArg skipwhite skipempty
 
 syntax match   typescriptDotNotation           /\.\|?\.\|!\./ nextgroup=typescriptProp skipnl
 syntax match   typescriptDotStyleNotation      /\.style\./ nextgroup=typescriptDOMStyle transparent
 " syntax match   typescriptFuncCall              contained /[a-zA-Z]\k*\ze(/ nextgroup=typescriptFuncCallArg
 syntax region  typescriptParenExp              matchgroup=typescriptParens start=/(/ end=/)/ contains=@typescriptComments,@typescriptValue,typescriptCastKeyword nextgroup=@typescriptSymbols skipwhite skipempty
-syntax region  typescriptFuncCallArg           contained matchgroup=typescriptParens start=/(/ end=/)/ contains=@typescriptValue,@typescriptComments nextgroup=@typescriptSymbols,typescriptDotNotation skipwhite skipempty skipnl
+syntax region  typescriptFuncCallArg           contained matchgroup=typescriptParens start=/(/ end=/)/ contains=@typescriptValue,@typescriptComments,typescriptCastKeyword nextgroup=@typescriptSymbols,typescriptDotNotation skipwhite skipempty skipnl
 syntax region  typescriptEventFuncCallArg      contained matchgroup=typescriptParens start=/(/ end=/)/ contains=@typescriptEventExpression
 syntax region  typescriptEventString           contained start=/\z(["']\)/  skip=/\\\\\|\\\z1\|\\\n/  end=/\z1\|$/ contains=typescriptASCII,@events
 
diff --git a/syntax/basic/literal.vim b/syntax/basic/literal.vim
index 8cbcf8a10..f7d3cd603 100644
--- a/syntax/basic/literal.vim
+++ b/syntax/basic/literal.vim
@@ -9,7 +9,7 @@ syntax match   typescriptASCII                 contained /\\\d\d\d/
 
 syntax region  typescriptTemplateSubstitution matchgroup=typescriptTemplateSB
   \ start=/\${/ end=/}/
-  \ contains=@typescriptValue
+  \ contains=@typescriptValue,typescriptCastKeyword
   \ contained
 
 
@@ -33,7 +33,7 @@ syntax region  typescriptTemplate
 "Array
 syntax region  typescriptArray matchgroup=typescriptBraces
   \ start=/\[/ end=/]/
-  \ contains=@typescriptValue,@typescriptComments
+  \ contains=@typescriptValue,@typescriptComments,typescriptCastKeyword
   \ nextgroup=@typescriptSymbols,typescriptDotNotation
   \ skipwhite skipempty fold
 
diff --git a/syntax/basic/object.vim b/syntax/basic/object.vim
index c3102db0c..d9d49013f 100644
--- a/syntax/basic/object.vim
+++ b/syntax/basic/object.vim
@@ -4,7 +4,7 @@ endif
 
 syntax region  typescriptObjectLiteral         matchgroup=typescriptBraces
   \ start=/{/ end=/}/
-  \ contains=@typescriptComments,typescriptObjectLabel,typescriptStringProperty,typescriptComputedPropertyName,typescriptObjectAsyncKeyword,typescriptTernary
+  \ contains=@typescriptComments,typescriptObjectLabel,typescriptStringProperty,typescriptComputedPropertyName,typescriptObjectAsyncKeyword,typescriptTernary,typescriptCastKeyword
   \ fold contained
 
 syntax keyword typescriptObjectAsyncKeyword async contained
diff --git a/syntax/dune.vim b/syntax/dune.vim
index dc1cd2600..68695a220 100644
--- a/syntax/dune.vim
+++ b/syntax/dune.vim
@@ -2,6 +2,17 @@ if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
+" Vim syntax file
+" Language:    Dune buildsystem
+" Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
+"              Anton Kochkov       <anton.kochkov@gmail.com>
+" URL:         https://github.com/ocaml/vim-ocaml
+" Last Change:
+"              2019 Feb 27 - Add newer keywords to the syntax (Simon Cruanes)
+"              2018 May 8 - Check current_syntax (Kawahara Satoru)
+"              2018 Mar 29 - Extend jbuild syntax with more keywords (Petter A. Urkedal)
+"              2017 Sep 6 - Initial version (Etienne Millon)
+
 if exists("b:current_syntax")
     finish
 endif
diff --git a/syntax/gleam.vim b/syntax/gleam.vim
new file mode 100644
index 000000000..cc667893c
--- /dev/null
+++ b/syntax/gleam.vim
@@ -0,0 +1,58 @@
+if has_key(g:polyglot_is_disabled, 'gleam')
+  finish
+endif
+
+if version < 600
+	syntax clear
+elseif exists("b:current_syntax")
+	finish
+endif
+
+let b:current_syntax = "gleam"
+
+" Keywords
+syntax keyword gleamKeyword
+  \ module import pub external
+  \ type let as if else todo const
+  \ case assert tuple try opaque
+highlight link gleamKeyword Keyword
+
+" Function definition
+syntax keyword gleamDef fn nextgroup=gleamFunctionDef skipwhite skipempty
+highlight link gleamDef Keyword
+
+syntax match gleamFunctionDef "[a-z_-][0-9a-z_-]*" contained skipwhite skipnl
+highlight link gleamFunctionDef Function
+
+" Int
+syntax match gleamInt '\<[0-9][0-9_]*\>'
+highlight link gleamInt Number
+
+" Float
+syntax match gleamFloat '\<[0-9][0-9_]*\.[0-9_]*\>'
+highlight link gleamFloat Float
+
+" Operators
+syntax match gleamOperator "\([-!#$%`&\*\+./<=>@\\^|~:]\|\<\>\)"
+highlight link gleamOperator Operator
+
+" Type
+syntax match gleamType "\([a-z]\)\@<![A-Z]\w*"
+highlight link gleamType Identifier
+
+" Comments
+syntax region gleamCommentLine start="//" end="$" contains=gleamTodo
+highlight link gleamCommentLine Comment
+
+syntax keyword gleamTodo contained TODO FIXME XXX NB NOTE
+highlight def link gleamTodo Todo
+
+" String
+syntax region gleamString start=/"/ end=/"/ contains=gleamStringModifier
+syntax match gleamStringModifier '\\.' contained
+highlight link gleamString String
+highlight link gleamStringModifier Special
+
+" Attribute
+syntax match gleamAttribute "#[a-z][a-z_]*"
+highlight link gleamAttribute PreProc
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index 1da0f7b05..b858cf02c 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -8,7 +8,7 @@ endif
 " Maintainers:  Markus Mottl      <markus.mottl@gmail.com>
 "               Karl-Heinz Sylla  <Karl-Heinz.Sylla@gmd.de>
 "               Issac Trotts      <ijtrotts@ucdavis.edu>
-" URL:          http://www.ocaml.info/vim/syntax/ocaml.vim
+" URL:          https://github.com/ocaml/vim-ocaml
 " Last Change:
 "               2018 Nov 08 - Improved highlighting of operators (Maëlan)
 "               2018 Apr 22 - Improved support for PPX (Andrey Popp)
diff --git a/syntax/opam.vim b/syntax/opam.vim
index c18ba312c..5bcaaaf7c 100644
--- a/syntax/opam.vim
+++ b/syntax/opam.vim
@@ -2,6 +2,13 @@ if has_key(g:polyglot_is_disabled, 'ocaml')
   finish
 endif
 
+" Vim syntax file
+" Language:    OPAM - OCaml package manager
+" Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
+" URL:         https://github.com/ocaml/vim-ocaml
+" Last Change:
+"              2020 Dec 31 - Added header (Markus Mottl)
+
 if exists("b:current_syntax")
   finish
 endif
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 96913e669..f9bfca26d 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -5,11 +5,11 @@ endif
 " Vim syntax file
 " Language:     SQL (PostgreSQL dialect), PL/pgSQL, PL/…, PostGIS, …
 " Maintainer:   Lifepillar
-" Version:      2.3.0
+" Version:      2.3.1
 " License:      Vim license (see `:help license`)
 
 " Based on PostgreSQL 13.1
-" Automatically generated on 2020-12-23 at 20:13:28
+" Automatically generated on 2020-12-30 at 10:21:40
 
 if exists("b:current_syntax")
   finish
@@ -20,7 +20,7 @@ syn sync minlines=100
 syn iskeyword @,48-57,192-255,_
 
 syn match sqlIsKeyword  /\<\h\w*\>/   contains=sqlStatement,sqlKeyword,sqlCatalog,sqlConstant,sqlSpecial,sqlOption,sqlErrorCode,sqlType,sqlTable,sqlView
-syn match sqlIsFunction /\<\h\w*\ze(/ contains=sqlFunction,sqlKeyword
+syn match sqlIsFunction /\<\h\w*\ze(/ contains=sqlFunction,sqlKeyword,sqlType
 syn region sqlIsPsql    start=/^\s*\\/ end=/\n/ oneline contains=sqlPsqlCommand,sqlPsqlKeyword,sqlNumber,sqlString
 
 syn keyword sqlSpecial contained false null true
@@ -77,9 +77,9 @@ syn match sqlKeyword /\<on\s\+\%(tables\|sequences\|routines\)\>/
 syn match sqlType /\<text\>/
 syn match sqlKeyword /\<text\s\+search\>/
 " Additional types
-syn keyword sqlType contained array at bigint bigserial bit boolean char character cube decimal
-syn keyword sqlType contained double int integer interval numeric precision real serial serial2
-syn keyword sqlType contained serial4 serial8 smallint smallserial timestamp varchar varying xml zone
+syn keyword sqlType contained array at bigint bigserial bit boolean character cube decimal double
+syn keyword sqlType contained int integer interval numeric precision real serial serial2 serial4
+syn keyword sqlType contained serial8 smallint smallserial timestamp varying xml zone
 " Keywords
 syn keyword sqlKeyword contained absolute access action admin after aggregate all also always
 syn keyword sqlKeyword contained analyse and any as asc assertion assignment asymmetric attach attribute
@@ -203,129 +203,129 @@ syn keyword sqlFunction contained cash_div_int2 cash_div_int4 cash_div_int8 cash
 syn keyword sqlFunction contained cash_in cash_le cash_lt cash_mi cash_mul_flt4 cash_mul_flt8
 syn keyword sqlFunction contained cash_mul_int2 cash_mul_int4 cash_mul_int8 cash_ne cash_out cash_pl
 syn keyword sqlFunction contained cash_recv cash_send cash_words cashlarger cashsmaller cbrt ceil ceiling
-syn keyword sqlFunction contained center char char_length character_length chareq charge chargt
-syn keyword sqlFunction contained charin charle charlt charne charout charrecv charsend chr cideq cidin
-syn keyword sqlFunction contained cidout cidr cidr_in cidr_out cidr_recv cidr_send cidrecv cidsend
-syn keyword sqlFunction contained circle circle_above circle_add_pt circle_below circle_center
+syn keyword sqlFunction contained center char_length character_length chareq charge chargt charin
+syn keyword sqlFunction contained charle charlt charne charout charrecv charsend chr cideq cidin cidout
+syn keyword sqlFunction contained cidr cidr_in cidr_out cidr_recv cidr_send cidrecv cidsend circle
+syn keyword sqlFunction contained circle_above circle_add_pt circle_below circle_center
 syn keyword sqlFunction contained circle_contain circle_contain_pt circle_contained circle_distance
 syn keyword sqlFunction contained circle_div_pt circle_eq circle_ge circle_gt circle_in circle_le
-syn keyword sqlFunction contained circle_left circle_lt circle_mul_pt circle_ne circle_out
-syn keyword sqlFunction contained circle_overabove circle_overbelow circle_overlap circle_overleft
-syn keyword sqlFunction contained circle_overright circle_recv circle_right circle_same circle_send
-syn keyword sqlFunction contained circle_sub_pt clock_timestamp close_lb close_ls close_lseg close_pb
-syn keyword sqlFunction contained close_pl close_ps close_sb close_sl col_description concat concat_ws
-syn keyword sqlFunction contained contjoinsel contsel convert convert_from convert_to corr cos cosd cosh
-syn keyword sqlFunction contained cot cotd count covar_pop covar_samp cstring_in cstring_out
+syn keyword sqlFunction contained circle_left circle_lt circle_mul_pt circle_ne circle_out circle_overabove
+syn keyword sqlFunction contained circle_overbelow circle_overlap circle_overleft
+syn keyword sqlFunction contained circle_overright circle_recv circle_right circle_same circle_send circle_sub_pt
+syn keyword sqlFunction contained clock_timestamp close_lb close_ls close_lseg close_pb close_pl
+syn keyword sqlFunction contained close_ps close_sb close_sl col_description concat concat_ws
+syn keyword sqlFunction contained contjoinsel contsel convert convert_from convert_to corr cos cosd cosh cot
+syn keyword sqlFunction contained cotd count covar_pop covar_samp cstring_in cstring_out
 syn keyword sqlFunction contained cstring_recv cstring_send cume_dist cume_dist_final current_database
 syn keyword sqlFunction contained current_query current_schema current_schemas current_setting
-syn keyword sqlFunction contained current_user currtid currtid2 currval cursor_to_xml
-syn keyword sqlFunction contained cursor_to_xmlschema database_to_xml database_to_xml_and_xmlschema
+syn keyword sqlFunction contained current_user currtid currtid2 currval cursor_to_xml cursor_to_xmlschema
+syn keyword sqlFunction contained database_to_xml database_to_xml_and_xmlschema
 syn keyword sqlFunction contained database_to_xmlschema date date_cmp date_cmp_timestamp date_cmp_timestamptz
 syn keyword sqlFunction contained date_eq date_eq_timestamp date_eq_timestamptz date_ge
 syn keyword sqlFunction contained date_ge_timestamp date_ge_timestamptz date_gt date_gt_timestamp
 syn keyword sqlFunction contained date_gt_timestamptz date_in date_larger date_le date_le_timestamp
-syn keyword sqlFunction contained date_le_timestamptz date_lt date_lt_timestamp date_lt_timestamptz
-syn keyword sqlFunction contained date_mi date_mi_interval date_mii date_ne date_ne_timestamp
-syn keyword sqlFunction contained date_ne_timestamptz date_out date_part date_pl_interval date_pli
-syn keyword sqlFunction contained date_recv date_send date_smaller date_sortsupport date_trunc daterange
-syn keyword sqlFunction contained daterange_canonical daterange_subdiff datetime_pl
-syn keyword sqlFunction contained datetimetz_pl dcbrt decode degrees dense_rank dense_rank_final dexp diagonal
+syn keyword sqlFunction contained date_le_timestamptz date_lt date_lt_timestamp date_lt_timestamptz date_mi
+syn keyword sqlFunction contained date_mi_interval date_mii date_ne date_ne_timestamp
+syn keyword sqlFunction contained date_ne_timestamptz date_out date_part date_pl_interval date_pli date_recv
+syn keyword sqlFunction contained date_send date_smaller date_sortsupport date_trunc daterange
+syn keyword sqlFunction contained daterange_canonical daterange_subdiff datetime_pl datetimetz_pl
+syn keyword sqlFunction contained dcbrt decode degrees dense_rank dense_rank_final dexp diagonal
 syn keyword sqlFunction contained diameter dispell_init dispell_lexize dist_bl dist_bp dist_bs
-syn keyword sqlFunction contained dist_cpoint dist_cpoly dist_lb dist_lp dist_ls dist_pathp dist_pb
-syn keyword sqlFunction contained dist_pc dist_pl dist_polyc dist_polyp dist_ppath dist_ppoly dist_ps
-syn keyword sqlFunction contained dist_sb dist_sl dist_sp div dlog1 dlog10 domain_in domain_recv dpow
-syn keyword sqlFunction contained dround dsimple_init dsimple_lexize dsnowball_init dsnowball_lexize
-syn keyword sqlFunction contained dsqrt dsynonym_init dsynonym_lexize dtrunc
-syn keyword sqlFunction contained elem_contained_by_range encode enum_cmp enum_eq enum_first enum_ge enum_gt enum_in
-syn keyword sqlFunction contained enum_larger enum_last enum_le enum_lt enum_ne enum_out enum_range
-syn keyword sqlFunction contained enum_recv enum_send enum_smaller eqjoinsel eqsel euc_cn_to_mic
+syn keyword sqlFunction contained dist_cpoint dist_cpoly dist_lb dist_lp dist_ls dist_pathp dist_pb dist_pc
+syn keyword sqlFunction contained dist_pl dist_polyc dist_polyp dist_ppath dist_ppoly dist_ps dist_sb
+syn keyword sqlFunction contained dist_sl dist_sp div dlog1 dlog10 domain_in domain_recv dpow dround
+syn keyword sqlFunction contained dsimple_init dsimple_lexize dsnowball_init dsnowball_lexize dsqrt
+syn keyword sqlFunction contained dsynonym_init dsynonym_lexize dtrunc elem_contained_by_range
+syn keyword sqlFunction contained encode enum_cmp enum_eq enum_first enum_ge enum_gt enum_in
+syn keyword sqlFunction contained enum_larger enum_last enum_le enum_lt enum_ne enum_out enum_range enum_recv
+syn keyword sqlFunction contained enum_send enum_smaller eqjoinsel eqsel euc_cn_to_mic
 syn keyword sqlFunction contained euc_cn_to_utf8 euc_jis_2004_to_shift_jis_2004 euc_jis_2004_to_utf8
 syn keyword sqlFunction contained euc_jp_to_mic euc_jp_to_sjis euc_jp_to_utf8 euc_kr_to_mic
 syn keyword sqlFunction contained euc_kr_to_utf8 euc_tw_to_big5 euc_tw_to_mic euc_tw_to_utf8
 syn keyword sqlFunction contained event_trigger_in event_trigger_out every exp factorial family fdw_handler_in
-syn keyword sqlFunction contained fdw_handler_out first_value float4 float48div float48eq
-syn keyword sqlFunction contained float48ge float48gt float48le float48lt float48mi float48mul float48ne
-syn keyword sqlFunction contained float48pl float4_accum float4abs float4div float4eq float4ge
-syn keyword sqlFunction contained float4gt float4in float4larger float4le float4lt float4mi float4mul
-syn keyword sqlFunction contained float4ne float4out float4pl float4recv float4send float4smaller
-syn keyword sqlFunction contained float4um float4up float8 float84div float84eq float84ge float84gt
-syn keyword sqlFunction contained float84le float84lt float84mi float84mul float84ne float84pl
-syn keyword sqlFunction contained float8_accum float8_avg float8_combine float8_corr float8_covar_pop
-syn keyword sqlFunction contained float8_covar_samp float8_regr_accum float8_regr_avgx
-syn keyword sqlFunction contained float8_regr_avgy float8_regr_combine float8_regr_intercept float8_regr_r2
+syn keyword sqlFunction contained fdw_handler_out first_value float4 float48div float48eq float48ge
+syn keyword sqlFunction contained float48gt float48le float48lt float48mi float48mul float48ne
+syn keyword sqlFunction contained float48pl float4_accum float4abs float4div float4eq float4ge float4gt
+syn keyword sqlFunction contained float4in float4larger float4le float4lt float4mi float4mul float4ne
+syn keyword sqlFunction contained float4out float4pl float4recv float4send float4smaller float4um
+syn keyword sqlFunction contained float4up float8 float84div float84eq float84ge float84gt float84le
+syn keyword sqlFunction contained float84lt float84mi float84mul float84ne float84pl float8_accum
+syn keyword sqlFunction contained float8_avg float8_combine float8_corr float8_covar_pop
+syn keyword sqlFunction contained float8_covar_samp float8_regr_accum float8_regr_avgx float8_regr_avgy
+syn keyword sqlFunction contained float8_regr_combine float8_regr_intercept float8_regr_r2
 syn keyword sqlFunction contained float8_regr_slope float8_regr_sxx float8_regr_sxy float8_regr_syy
-syn keyword sqlFunction contained float8_stddev_pop float8_stddev_samp float8_var_pop
-syn keyword sqlFunction contained float8_var_samp float8abs float8div float8eq float8ge float8gt float8in
+syn keyword sqlFunction contained float8_stddev_pop float8_stddev_samp float8_var_pop float8_var_samp
+syn keyword sqlFunction contained float8abs float8div float8eq float8ge float8gt float8in
 syn keyword sqlFunction contained float8larger float8le float8lt float8mi float8mul float8ne float8out
-syn keyword sqlFunction contained float8pl float8recv float8send float8smaller float8um float8up
-syn keyword sqlFunction contained floor flt4_mul_cash flt8_mul_cash fmgr_c_validator
+syn keyword sqlFunction contained float8pl float8recv float8send float8smaller float8um float8up floor
+syn keyword sqlFunction contained flt4_mul_cash flt8_mul_cash fmgr_c_validator
 syn keyword sqlFunction contained fmgr_internal_validator fmgr_sql_validator format format_type gb18030_to_utf8
 syn keyword sqlFunction contained gbk_to_utf8 gcd gen_random_uuid generate_series
 syn keyword sqlFunction contained generate_series_int4_support generate_series_int8_support generate_subscripts
 syn keyword sqlFunction contained get_bit get_byte get_current_ts_config getdatabaseencoding
-syn keyword sqlFunction contained getpgusername gin_clean_pending_list gin_cmp_prefix
-syn keyword sqlFunction contained gin_cmp_tslexeme gin_compare_jsonb gin_consistent_jsonb
-syn keyword sqlFunction contained gin_consistent_jsonb_path gin_extract_jsonb gin_extract_jsonb_path
+syn keyword sqlFunction contained getpgusername gin_clean_pending_list gin_cmp_prefix gin_cmp_tslexeme
+syn keyword sqlFunction contained gin_compare_jsonb gin_consistent_jsonb gin_consistent_jsonb_path
+syn keyword sqlFunction contained gin_extract_jsonb gin_extract_jsonb_path
 syn keyword sqlFunction contained gin_extract_jsonb_query gin_extract_jsonb_query_path gin_extract_tsquery
 syn keyword sqlFunction contained gin_extract_tsvector gin_triconsistent_jsonb
 syn keyword sqlFunction contained gin_triconsistent_jsonb_path gin_tsquery_consistent gin_tsquery_triconsistent
 syn keyword sqlFunction contained ginarrayconsistent ginarrayextract ginarraytriconsistent ginhandler
 syn keyword sqlFunction contained ginqueryarrayextract gist_box_consistent gist_box_distance
 syn keyword sqlFunction contained gist_box_penalty gist_box_picksplit gist_box_same gist_box_union
-syn keyword sqlFunction contained gist_circle_compress gist_circle_consistent
-syn keyword sqlFunction contained gist_circle_distance gist_point_compress gist_point_consistent
-syn keyword sqlFunction contained gist_point_distance gist_point_fetch gist_poly_compress gist_poly_consistent
-syn keyword sqlFunction contained gist_poly_distance gisthandler gtsquery_compress
-syn keyword sqlFunction contained gtsquery_consistent gtsquery_penalty gtsquery_picksplit gtsquery_same
-syn keyword sqlFunction contained gtsquery_union gtsvector_compress gtsvector_consistent
-syn keyword sqlFunction contained gtsvector_decompress gtsvector_options gtsvector_penalty gtsvector_picksplit
+syn keyword sqlFunction contained gist_circle_compress gist_circle_consistent gist_circle_distance
+syn keyword sqlFunction contained gist_point_compress gist_point_consistent gist_point_distance
+syn keyword sqlFunction contained gist_point_fetch gist_poly_compress gist_poly_consistent
+syn keyword sqlFunction contained gist_poly_distance gisthandler gtsquery_compress gtsquery_consistent
+syn keyword sqlFunction contained gtsquery_penalty gtsquery_picksplit gtsquery_same
+syn keyword sqlFunction contained gtsquery_union gtsvector_compress gtsvector_consistent gtsvector_decompress
+syn keyword sqlFunction contained gtsvector_options gtsvector_penalty gtsvector_picksplit
 syn keyword sqlFunction contained gtsvector_same gtsvector_union gtsvectorin gtsvectorout
 syn keyword sqlFunction contained has_any_column_privilege has_column_privilege has_database_privilege
 syn keyword sqlFunction contained has_foreign_data_wrapper_privilege has_function_privilege
 syn keyword sqlFunction contained has_language_privilege has_schema_privilege has_sequence_privilege
-syn keyword sqlFunction contained has_server_privilege has_table_privilege
-syn keyword sqlFunction contained has_tablespace_privilege has_type_privilege hash_aclitem hash_aclitem_extended
+syn keyword sqlFunction contained has_server_privilege has_table_privilege has_tablespace_privilege
+syn keyword sqlFunction contained has_type_privilege hash_aclitem hash_aclitem_extended
 syn keyword sqlFunction contained hash_array hash_array_extended hash_numeric hash_numeric_extended
 syn keyword sqlFunction contained hash_range hash_range_extended hashbpchar hashbpcharextended
 syn keyword sqlFunction contained hashchar hashcharextended hashenum hashenumextended hashfloat4
-syn keyword sqlFunction contained hashfloat4extended hashfloat8 hashfloat8extended hashhandler
-syn keyword sqlFunction contained hashinet hashinetextended hashint2 hashint2extended hashint4
+syn keyword sqlFunction contained hashfloat4extended hashfloat8 hashfloat8extended hashhandler hashinet
+syn keyword sqlFunction contained hashinetextended hashint2 hashint2extended hashint4
 syn keyword sqlFunction contained hashint4extended hashint8 hashint8extended hashmacaddr hashmacaddr8
 syn keyword sqlFunction contained hashmacaddr8extended hashmacaddrextended hashname hashnameextended
-syn keyword sqlFunction contained hashoid hashoidextended hashoidvector hashoidvectorextended
-syn keyword sqlFunction contained hashtext hashtextextended hashtid hashtidextended hashvarlena
+syn keyword sqlFunction contained hashoid hashoidextended hashoidvector hashoidvectorextended hashtext
+syn keyword sqlFunction contained hashtextextended hashtid hashtidextended hashvarlena
 syn keyword sqlFunction contained hashvarlenaextended heap_tableam_handler height host hostmask
 syn keyword sqlFunction contained iclikejoinsel iclikesel icnlikejoinsel icnlikesel icregexeqjoinsel
-syn keyword sqlFunction contained icregexeqsel icregexnejoinsel icregexnesel in_range
-syn keyword sqlFunction contained index_am_handler_in index_am_handler_out inet_client_addr inet_client_port
+syn keyword sqlFunction contained icregexeqsel icregexnejoinsel icregexnesel in_range index_am_handler_in
+syn keyword sqlFunction contained index_am_handler_out inet_client_addr inet_client_port
 syn keyword sqlFunction contained inet_gist_compress inet_gist_consistent inet_gist_fetch
-syn keyword sqlFunction contained inet_gist_penalty inet_gist_picksplit inet_gist_same inet_gist_union
-syn keyword sqlFunction contained inet_in inet_merge inet_out inet_recv inet_same_family inet_send
+syn keyword sqlFunction contained inet_gist_penalty inet_gist_picksplit inet_gist_same inet_gist_union inet_in
+syn keyword sqlFunction contained inet_merge inet_out inet_recv inet_same_family inet_send
 syn keyword sqlFunction contained inet_server_addr inet_server_port inet_spg_choose inet_spg_config
 syn keyword sqlFunction contained inet_spg_inner_consistent inet_spg_leaf_consistent
-syn keyword sqlFunction contained inet_spg_picksplit inetand inetmi inetmi_int8 inetnot inetor inetpl initcap
-syn keyword sqlFunction contained int2 int24div int24eq int24ge int24gt int24le int24lt int24mi
-syn keyword sqlFunction contained int24mul int24ne int24pl int28div int28eq int28ge int28gt int28le int28lt
+syn keyword sqlFunction contained inet_spg_picksplit inetand inetmi inetmi_int8 inetnot inetor inetpl initcap int2
+syn keyword sqlFunction contained int24div int24eq int24ge int24gt int24le int24lt int24mi int24mul
+syn keyword sqlFunction contained int24ne int24pl int28div int28eq int28ge int28gt int28le int28lt
 syn keyword sqlFunction contained int28mi int28mul int28ne int28pl int2_accum int2_accum_inv
-syn keyword sqlFunction contained int2_avg_accum int2_avg_accum_inv int2_mul_cash int2_sum int2abs
-syn keyword sqlFunction contained int2and int2div int2eq int2ge int2gt int2in int2int4_sum int2larger
-syn keyword sqlFunction contained int2le int2lt int2mi int2mod int2mul int2ne int2not int2or int2out int2pl
+syn keyword sqlFunction contained int2_avg_accum int2_avg_accum_inv int2_mul_cash int2_sum int2abs int2and
+syn keyword sqlFunction contained int2div int2eq int2ge int2gt int2in int2int4_sum int2larger int2le
+syn keyword sqlFunction contained int2lt int2mi int2mod int2mul int2ne int2not int2or int2out int2pl
 syn keyword sqlFunction contained int2recv int2send int2shl int2shr int2smaller int2um int2up
 syn keyword sqlFunction contained int2vectorin int2vectorout int2vectorrecv int2vectorsend int2xor int4
 syn keyword sqlFunction contained int42div int42eq int42ge int42gt int42le int42lt int42mi int42mul
-syn keyword sqlFunction contained int42ne int42pl int48div int48eq int48ge int48gt int48le int48lt
-syn keyword sqlFunction contained int48mi int48mul int48ne int48pl int4_accum int4_accum_inv
-syn keyword sqlFunction contained int4_avg_accum int4_avg_accum_inv int4_avg_combine int4_mul_cash int4_sum
-syn keyword sqlFunction contained int4abs int4and int4div int4eq int4ge int4gt int4in int4inc
-syn keyword sqlFunction contained int4larger int4le int4lt int4mi int4mod int4mul int4ne int4not int4or
-syn keyword sqlFunction contained int4out int4pl int4range int4range_canonical int4range_subdiff
-syn keyword sqlFunction contained int4recv int4send int4shl int4shr int4smaller int4um int4up int4xor int8
+syn keyword sqlFunction contained int42ne int42pl int48div int48eq int48ge int48gt int48le int48lt int48mi
+syn keyword sqlFunction contained int48mul int48ne int48pl int4_accum int4_accum_inv int4_avg_accum
+syn keyword sqlFunction contained int4_avg_accum_inv int4_avg_combine int4_mul_cash int4_sum
+syn keyword sqlFunction contained int4abs int4and int4div int4eq int4ge int4gt int4in int4inc int4larger
+syn keyword sqlFunction contained int4le int4lt int4mi int4mod int4mul int4ne int4not int4or int4out
+syn keyword sqlFunction contained int4pl int4range int4range_canonical int4range_subdiff int4recv
+syn keyword sqlFunction contained int4send int4shl int4shr int4smaller int4um int4up int4xor int8
 syn keyword sqlFunction contained int82div int82eq int82ge int82gt int82le int82lt int82mi int82mul
-syn keyword sqlFunction contained int82ne int82pl int84div int84eq int84ge int84gt int84le int84lt
-syn keyword sqlFunction contained int84mi int84mul int84ne int84pl int8_accum int8_accum_inv int8_avg
+syn keyword sqlFunction contained int82ne int82pl int84div int84eq int84ge int84gt int84le int84lt int84mi
+syn keyword sqlFunction contained int84mul int84ne int84pl int8_accum int8_accum_inv int8_avg
 syn keyword sqlFunction contained int8_avg_accum int8_avg_accum_inv int8_avg_combine
-syn keyword sqlFunction contained int8_avg_deserialize int8_avg_serialize int8_mul_cash int8_sum int8abs
-syn keyword sqlFunction contained int8and int8dec int8dec_any int8div int8eq int8ge int8gt int8in int8inc
+syn keyword sqlFunction contained int8_avg_deserialize int8_avg_serialize int8_mul_cash int8_sum int8abs int8and
+syn keyword sqlFunction contained int8dec int8dec_any int8div int8eq int8ge int8gt int8in int8inc
 syn keyword sqlFunction contained int8inc_any int8inc_float8_float8 int8larger int8le int8lt int8mi
 syn keyword sqlFunction contained int8mod int8mul int8ne int8not int8or int8out int8pl int8pl_inet
 syn keyword sqlFunction contained int8range int8range_canonical int8range_subdiff int8recv int8send
@@ -337,11 +337,11 @@ syn keyword sqlFunction contained interval_hash interval_hash_extended interval_
 syn keyword sqlFunction contained interval_le interval_lt interval_mi interval_mul interval_ne
 syn keyword sqlFunction contained interval_out interval_pl interval_pl_date interval_pl_time
 syn keyword sqlFunction contained interval_pl_timestamp interval_pl_timestamptz interval_pl_timetz
-syn keyword sqlFunction contained interval_recv interval_send interval_smaller interval_support
-syn keyword sqlFunction contained interval_um intervaltypmodin intervaltypmodout is_normalized isclosed
-syn keyword sqlFunction contained isempty isfinite ishorizontal iso8859_1_to_utf8 iso8859_to_utf8
-syn keyword sqlFunction contained iso_to_koi8r iso_to_mic iso_to_win1251 iso_to_win866 isopen
-syn keyword sqlFunction contained isparallel isperp isvertical johab_to_utf8 json_agg json_agg_finalfn
+syn keyword sqlFunction contained interval_recv interval_send interval_smaller interval_support interval_um
+syn keyword sqlFunction contained intervaltypmodin intervaltypmodout is_normalized isclosed isempty
+syn keyword sqlFunction contained isfinite ishorizontal iso8859_1_to_utf8 iso8859_to_utf8
+syn keyword sqlFunction contained iso_to_koi8r iso_to_mic iso_to_win1251 iso_to_win866 isopen isparallel
+syn keyword sqlFunction contained isperp isvertical johab_to_utf8 json_agg json_agg_finalfn
 syn keyword sqlFunction contained json_agg_transfn json_array_element json_array_element_text
 syn keyword sqlFunction contained json_array_elements json_array_elements_text json_array_length
 syn keyword sqlFunction contained json_build_array json_build_object json_each json_each_text
@@ -349,70 +349,70 @@ syn keyword sqlFunction contained json_extract_path json_extract_path_text json_
 syn keyword sqlFunction contained json_object_agg json_object_agg_finalfn json_object_agg_transfn
 syn keyword sqlFunction contained json_object_field json_object_field_text json_object_keys json_out
 syn keyword sqlFunction contained json_populate_record json_populate_recordset json_recv json_send
-syn keyword sqlFunction contained json_strip_nulls json_to_record json_to_recordset
-syn keyword sqlFunction contained json_to_tsvector json_typeof jsonb_agg jsonb_agg_finalfn jsonb_agg_transfn
-syn keyword sqlFunction contained jsonb_array_element jsonb_array_element_text
-syn keyword sqlFunction contained jsonb_array_elements jsonb_array_elements_text jsonb_array_length
-syn keyword sqlFunction contained jsonb_build_array jsonb_build_object jsonb_cmp jsonb_concat jsonb_contained
+syn keyword sqlFunction contained json_strip_nulls json_to_record json_to_recordset json_to_tsvector
+syn keyword sqlFunction contained json_typeof jsonb_agg jsonb_agg_finalfn jsonb_agg_transfn
+syn keyword sqlFunction contained jsonb_array_element jsonb_array_element_text jsonb_array_elements
+syn keyword sqlFunction contained jsonb_array_elements_text jsonb_array_length jsonb_build_array
+syn keyword sqlFunction contained jsonb_build_object jsonb_cmp jsonb_concat jsonb_contained
 syn keyword sqlFunction contained jsonb_contains jsonb_delete jsonb_delete_path jsonb_each
 syn keyword sqlFunction contained jsonb_each_text jsonb_eq jsonb_exists jsonb_exists_all jsonb_exists_any
 syn keyword sqlFunction contained jsonb_extract_path jsonb_extract_path_text jsonb_ge jsonb_gt
-syn keyword sqlFunction contained jsonb_hash jsonb_hash_extended jsonb_in jsonb_insert jsonb_le
-syn keyword sqlFunction contained jsonb_lt jsonb_ne jsonb_object jsonb_object_agg
+syn keyword sqlFunction contained jsonb_hash jsonb_hash_extended jsonb_in jsonb_insert jsonb_le jsonb_lt
+syn keyword sqlFunction contained jsonb_ne jsonb_object jsonb_object_agg
 syn keyword sqlFunction contained jsonb_object_agg_finalfn jsonb_object_agg_transfn jsonb_object_field
 syn keyword sqlFunction contained jsonb_object_field_text jsonb_object_keys jsonb_out jsonb_path_exists
 syn keyword sqlFunction contained jsonb_path_exists_opr jsonb_path_exists_tz jsonb_path_match
 syn keyword sqlFunction contained jsonb_path_match_opr jsonb_path_match_tz jsonb_path_query
 syn keyword sqlFunction contained jsonb_path_query_array jsonb_path_query_array_tz jsonb_path_query_first
 syn keyword sqlFunction contained jsonb_path_query_first_tz jsonb_path_query_tz
-syn keyword sqlFunction contained jsonb_populate_record jsonb_populate_recordset jsonb_pretty jsonb_recv
-syn keyword sqlFunction contained jsonb_send jsonb_set jsonb_set_lax jsonb_strip_nulls jsonb_to_record
+syn keyword sqlFunction contained jsonb_populate_record jsonb_populate_recordset jsonb_pretty jsonb_recv jsonb_send
+syn keyword sqlFunction contained jsonb_set jsonb_set_lax jsonb_strip_nulls jsonb_to_record
 syn keyword sqlFunction contained jsonb_to_recordset jsonb_to_tsvector jsonb_typeof jsonpath_in
 syn keyword sqlFunction contained jsonpath_out jsonpath_recv jsonpath_send justify_days justify_hours
 syn keyword sqlFunction contained justify_interval koi8r_to_iso koi8r_to_mic koi8r_to_utf8
-syn keyword sqlFunction contained koi8r_to_win1251 koi8r_to_win866 koi8u_to_utf8 lag
-syn keyword sqlFunction contained language_handler_in language_handler_out last_value lastval latin1_to_mic
+syn keyword sqlFunction contained koi8r_to_win1251 koi8r_to_win866 koi8u_to_utf8 lag language_handler_in
+syn keyword sqlFunction contained language_handler_out last_value lastval latin1_to_mic
 syn keyword sqlFunction contained latin2_to_mic latin2_to_win1250 latin3_to_mic latin4_to_mic lcm lead left
-syn keyword sqlFunction contained length like like_escape likejoinsel likesel line line_distance
-syn keyword sqlFunction contained line_eq line_horizontal line_in line_interpt line_intersect
-syn keyword sqlFunction contained line_out line_parallel line_perp line_recv line_send line_vertical ln
+syn keyword sqlFunction contained length like like_escape likejoinsel likesel line line_distance line_eq
+syn keyword sqlFunction contained line_horizontal line_in line_interpt line_intersect line_out
+syn keyword sqlFunction contained line_parallel line_perp line_recv line_send line_vertical ln
 syn keyword sqlFunction contained lo_close lo_creat lo_create lo_export lo_from_bytea lo_get lo_import
 syn keyword sqlFunction contained lo_lseek lo_lseek64 lo_open lo_put lo_tell lo_tell64 lo_truncate
 syn keyword sqlFunction contained lo_truncate64 lo_unlink log log10 loread lower lower_inc lower_inf
 syn keyword sqlFunction contained lowrite lpad lseg lseg_center lseg_distance lseg_eq lseg_ge lseg_gt
 syn keyword sqlFunction contained lseg_horizontal lseg_in lseg_interpt lseg_intersect lseg_le
-syn keyword sqlFunction contained lseg_length lseg_lt lseg_ne lseg_out lseg_parallel lseg_perp
-syn keyword sqlFunction contained lseg_recv lseg_send lseg_vertical ltrim macaddr macaddr8 macaddr8_and
-syn keyword sqlFunction contained macaddr8_cmp macaddr8_eq macaddr8_ge macaddr8_gt macaddr8_in
-syn keyword sqlFunction contained macaddr8_le macaddr8_lt macaddr8_ne macaddr8_not macaddr8_or
-syn keyword sqlFunction contained macaddr8_out macaddr8_recv macaddr8_send macaddr8_set7bit macaddr_and
+syn keyword sqlFunction contained lseg_length lseg_lt lseg_ne lseg_out lseg_parallel lseg_perp lseg_recv
+syn keyword sqlFunction contained lseg_send lseg_vertical ltrim macaddr macaddr8 macaddr8_and
+syn keyword sqlFunction contained macaddr8_cmp macaddr8_eq macaddr8_ge macaddr8_gt macaddr8_in macaddr8_le
+syn keyword sqlFunction contained macaddr8_lt macaddr8_ne macaddr8_not macaddr8_or macaddr8_out
+syn keyword sqlFunction contained macaddr8_recv macaddr8_send macaddr8_set7bit macaddr_and
 syn keyword sqlFunction contained macaddr_cmp macaddr_eq macaddr_ge macaddr_gt macaddr_in macaddr_le
-syn keyword sqlFunction contained macaddr_lt macaddr_ne macaddr_not macaddr_or macaddr_out
-syn keyword sqlFunction contained macaddr_recv macaddr_send macaddr_sortsupport make_date make_interval
+syn keyword sqlFunction contained macaddr_lt macaddr_ne macaddr_not macaddr_or macaddr_out macaddr_recv
+syn keyword sqlFunction contained macaddr_send macaddr_sortsupport make_date make_interval
 syn keyword sqlFunction contained make_time make_timestamp make_timestamptz makeaclitem masklen
 syn keyword sqlFunction contained matchingjoinsel matchingsel max md5 mic_to_big5 mic_to_euc_cn
 syn keyword sqlFunction contained mic_to_euc_jp mic_to_euc_kr mic_to_euc_tw mic_to_iso mic_to_koi8r
 syn keyword sqlFunction contained mic_to_latin1 mic_to_latin2 mic_to_latin3 mic_to_latin4 mic_to_sjis
 syn keyword sqlFunction contained mic_to_win1250 mic_to_win1251 mic_to_win866 min min_scale mod mode
 syn keyword sqlFunction contained mode_final money mul_d_interval mxid_age name nameconcatoid nameeq
-syn keyword sqlFunction contained nameeqtext namege namegetext namegt namegttext nameiclike
-syn keyword sqlFunction contained nameicnlike nameicregexeq nameicregexne namein namele nameletext
-syn keyword sqlFunction contained namelike namelt namelttext namene namenetext namenlike nameout namerecv
+syn keyword sqlFunction contained nameeqtext namege namegetext namegt namegttext nameiclike nameicnlike
+syn keyword sqlFunction contained nameicregexeq nameicregexne namein namele nameletext namelike
+syn keyword sqlFunction contained namelt namelttext namene namenetext namenlike nameout namerecv
 syn keyword sqlFunction contained nameregexeq nameregexne namesend neqjoinsel neqsel netmask network
 syn keyword sqlFunction contained network_cmp network_eq network_ge network_gt network_larger
 syn keyword sqlFunction contained network_le network_lt network_ne network_overlap network_smaller
-syn keyword sqlFunction contained network_sortsupport network_sub network_subeq
-syn keyword sqlFunction contained network_subset_support network_sup network_supeq networkjoinsel networksel nextval
+syn keyword sqlFunction contained network_sortsupport network_sub network_subeq network_subset_support
+syn keyword sqlFunction contained network_sup network_supeq networkjoinsel networksel nextval
 syn keyword sqlFunction contained nlikejoinsel nlikesel normalize notlike now npoints nth_value ntile
 syn keyword sqlFunction contained num_nonnulls num_nulls numeric numeric_abs numeric_accum
 syn keyword sqlFunction contained numeric_accum_inv numeric_add numeric_avg numeric_avg_accum
-syn keyword sqlFunction contained numeric_avg_combine numeric_avg_deserialize numeric_avg_serialize
-syn keyword sqlFunction contained numeric_cmp numeric_combine numeric_deserialize numeric_div
+syn keyword sqlFunction contained numeric_avg_combine numeric_avg_deserialize numeric_avg_serialize numeric_cmp
+syn keyword sqlFunction contained numeric_combine numeric_deserialize numeric_div
 syn keyword sqlFunction contained numeric_div_trunc numeric_eq numeric_exp numeric_fac numeric_ge numeric_gt
 syn keyword sqlFunction contained numeric_in numeric_inc numeric_larger numeric_le numeric_ln
-syn keyword sqlFunction contained numeric_log numeric_lt numeric_mod numeric_mul numeric_ne
-syn keyword sqlFunction contained numeric_out numeric_poly_avg numeric_poly_combine
-syn keyword sqlFunction contained numeric_poly_deserialize numeric_poly_serialize numeric_poly_stddev_pop
+syn keyword sqlFunction contained numeric_log numeric_lt numeric_mod numeric_mul numeric_ne numeric_out
+syn keyword sqlFunction contained numeric_poly_avg numeric_poly_combine numeric_poly_deserialize
+syn keyword sqlFunction contained numeric_poly_serialize numeric_poly_stddev_pop
 syn keyword sqlFunction contained numeric_poly_stddev_samp numeric_poly_sum numeric_poly_var_pop
 syn keyword sqlFunction contained numeric_poly_var_samp numeric_power numeric_recv numeric_send
 syn keyword sqlFunction contained numeric_serialize numeric_smaller numeric_sortsupport numeric_sqrt
@@ -421,22 +421,22 @@ syn keyword sqlFunction contained numeric_support numeric_uminus numeric_uplus n
 syn keyword sqlFunction contained numeric_var_samp numerictypmodin numerictypmodout numnode numrange
 syn keyword sqlFunction contained numrange_subdiff obj_description octet_length oid oideq oidge oidgt oidin
 syn keyword sqlFunction contained oidlarger oidle oidlt oidne oidout oidrecv oidsend oidsmaller
-syn keyword sqlFunction contained oidvectoreq oidvectorge oidvectorgt oidvectorin oidvectorle
-syn keyword sqlFunction contained oidvectorlt oidvectorne oidvectorout oidvectorrecv oidvectorsend
-syn keyword sqlFunction contained oidvectortypes on_pb on_pl on_ppath on_ps on_sb on_sl
-syn keyword sqlFunction contained ordered_set_transition ordered_set_transition_multi overlaps overlay parse_ident
-syn keyword sqlFunction contained path path_add path_add_pt path_center path_contain_pt path_distance
+syn keyword sqlFunction contained oidvectoreq oidvectorge oidvectorgt oidvectorin oidvectorle oidvectorlt
+syn keyword sqlFunction contained oidvectorne oidvectorout oidvectorrecv oidvectorsend
+syn keyword sqlFunction contained oidvectortypes on_pb on_pl on_ppath on_ps on_sb on_sl ordered_set_transition
+syn keyword sqlFunction contained ordered_set_transition_multi overlaps overlay parse_ident path
+syn keyword sqlFunction contained path_add path_add_pt path_center path_contain_pt path_distance
 syn keyword sqlFunction contained path_div_pt path_in path_inter path_length path_mul_pt path_n_eq
 syn keyword sqlFunction contained path_n_ge path_n_gt path_n_le path_n_lt path_npoints path_out
-syn keyword sqlFunction contained path_recv path_send path_sub_pt pclose percent_rank
-syn keyword sqlFunction contained percent_rank_final percentile_cont percentile_cont_float8_final
+syn keyword sqlFunction contained path_recv path_send path_sub_pt pclose percent_rank percent_rank_final
+syn keyword sqlFunction contained percentile_cont percentile_cont_float8_final
 syn keyword sqlFunction contained percentile_cont_float8_multi_final percentile_cont_interval_final
 syn keyword sqlFunction contained percentile_cont_interval_multi_final percentile_disc
 syn keyword sqlFunction contained percentile_disc_final percentile_disc_multi_final pg_advisory_lock
 syn keyword sqlFunction contained pg_advisory_lock_shared pg_advisory_unlock pg_advisory_unlock_all
 syn keyword sqlFunction contained pg_advisory_unlock_shared pg_advisory_xact_lock
-syn keyword sqlFunction contained pg_advisory_xact_lock_shared pg_available_extension_versions
-syn keyword sqlFunction contained pg_available_extensions pg_backend_pid pg_backup_start_time pg_blocking_pids
+syn keyword sqlFunction contained pg_advisory_xact_lock_shared pg_available_extension_versions pg_available_extensions
+syn keyword sqlFunction contained pg_backend_pid pg_backup_start_time pg_blocking_pids
 syn keyword sqlFunction contained pg_cancel_backend pg_char_to_encoding pg_client_encoding
 syn keyword sqlFunction contained pg_collation_actual_version pg_collation_for pg_collation_is_visible
 syn keyword sqlFunction contained pg_column_is_updatable pg_column_size pg_conf_load_time pg_config
@@ -445,8 +445,8 @@ syn keyword sqlFunction contained pg_control_system pg_conversion_is_visible
 syn keyword sqlFunction contained pg_copy_logical_replication_slot pg_copy_physical_replication_slot
 syn keyword sqlFunction contained pg_create_logical_replication_slot pg_create_physical_replication_slot
 syn keyword sqlFunction contained pg_create_restore_point pg_current_logfile pg_current_snapshot
-syn keyword sqlFunction contained pg_current_wal_flush_lsn pg_current_wal_insert_lsn
-syn keyword sqlFunction contained pg_current_wal_lsn pg_current_xact_id pg_current_xact_id_if_assigned pg_cursor
+syn keyword sqlFunction contained pg_current_wal_flush_lsn pg_current_wal_insert_lsn pg_current_wal_lsn
+syn keyword sqlFunction contained pg_current_xact_id pg_current_xact_id_if_assigned pg_cursor
 syn keyword sqlFunction contained pg_database_size pg_ddl_command_in pg_ddl_command_out
 syn keyword sqlFunction contained pg_ddl_command_recv pg_ddl_command_send pg_dependencies_in
 syn keyword sqlFunction contained pg_dependencies_out pg_dependencies_recv pg_dependencies_send
@@ -454,8 +454,8 @@ syn keyword sqlFunction contained pg_describe_object pg_drop_replication_slot pg
 syn keyword sqlFunction contained pg_encoding_to_char pg_event_trigger_ddl_commands
 syn keyword sqlFunction contained pg_event_trigger_dropped_objects pg_event_trigger_table_rewrite_oid
 syn keyword sqlFunction contained pg_event_trigger_table_rewrite_reason pg_export_snapshot
-syn keyword sqlFunction contained pg_extension_config_dump pg_extension_update_paths pg_file_rename
-syn keyword sqlFunction contained pg_file_sync pg_file_unlink pg_file_write pg_filenode_relation
+syn keyword sqlFunction contained pg_extension_config_dump pg_extension_update_paths pg_file_rename pg_file_sync
+syn keyword sqlFunction contained pg_file_unlink pg_file_write pg_filenode_relation
 syn keyword sqlFunction contained pg_function_is_visible pg_get_constraintdef pg_get_expr
 syn keyword sqlFunction contained pg_get_function_arg_default pg_get_function_arguments
 syn keyword sqlFunction contained pg_get_function_identity_arguments pg_get_function_result pg_get_functiondef
@@ -468,27 +468,27 @@ syn keyword sqlFunction contained pg_get_userbyid pg_get_viewdef pg_has_role pg_
 syn keyword sqlFunction contained pg_identify_object pg_identify_object_as_address
 syn keyword sqlFunction contained pg_import_system_collations pg_index_column_has_property pg_index_has_property
 syn keyword sqlFunction contained pg_indexam_has_property pg_indexam_progress_phasename
-syn keyword sqlFunction contained pg_indexes_size pg_is_in_backup pg_is_in_recovery
-syn keyword sqlFunction contained pg_is_other_temp_schema pg_is_wal_replay_paused
-syn keyword sqlFunction contained pg_isolation_test_session_is_blocked pg_jit_available pg_last_committed_xact
+syn keyword sqlFunction contained pg_indexes_size pg_is_in_backup pg_is_in_recovery pg_is_other_temp_schema
+syn keyword sqlFunction contained pg_is_wal_replay_paused pg_isolation_test_session_is_blocked
+syn keyword sqlFunction contained pg_jit_available pg_last_committed_xact
 syn keyword sqlFunction contained pg_last_wal_receive_lsn pg_last_wal_replay_lsn pg_last_xact_replay_timestamp
 syn keyword sqlFunction contained pg_listening_channels pg_lock_status pg_logdir_ls
 syn keyword sqlFunction contained pg_logical_emit_message pg_logical_slot_get_binary_changes
 syn keyword sqlFunction contained pg_logical_slot_get_changes pg_logical_slot_peek_binary_changes
 syn keyword sqlFunction contained pg_logical_slot_peek_changes pg_ls_archive_statusdir pg_ls_dir pg_ls_logdir
-syn keyword sqlFunction contained pg_ls_tmpdir pg_ls_waldir pg_lsn_cmp pg_lsn_eq pg_lsn_ge
-syn keyword sqlFunction contained pg_lsn_gt pg_lsn_hash pg_lsn_hash_extended pg_lsn_in pg_lsn_larger
+syn keyword sqlFunction contained pg_ls_tmpdir pg_ls_waldir pg_lsn_cmp pg_lsn_eq pg_lsn_ge pg_lsn_gt
+syn keyword sqlFunction contained pg_lsn_hash pg_lsn_hash_extended pg_lsn_in pg_lsn_larger
 syn keyword sqlFunction contained pg_lsn_le pg_lsn_lt pg_lsn_mi pg_lsn_ne pg_lsn_out pg_lsn_recv
 syn keyword sqlFunction contained pg_lsn_send pg_lsn_smaller pg_mcv_list_in pg_mcv_list_items
 syn keyword sqlFunction contained pg_mcv_list_out pg_mcv_list_recv pg_mcv_list_send pg_my_temp_schema
-syn keyword sqlFunction contained pg_ndistinct_in pg_ndistinct_out pg_ndistinct_recv
-syn keyword sqlFunction contained pg_ndistinct_send pg_nextoid pg_node_tree_in pg_node_tree_out
-syn keyword sqlFunction contained pg_node_tree_recv pg_node_tree_send pg_notification_queue_usage pg_notify
-syn keyword sqlFunction contained pg_opclass_is_visible pg_operator_is_visible
-syn keyword sqlFunction contained pg_opfamily_is_visible pg_options_to_table pg_partition_ancestors pg_partition_root
-syn keyword sqlFunction contained pg_partition_tree pg_postmaster_start_time
-syn keyword sqlFunction contained pg_prepared_statement pg_prepared_xact pg_promote pg_read_binary_file
-syn keyword sqlFunction contained pg_read_file pg_read_file_old pg_relation_filenode pg_relation_filepath
+syn keyword sqlFunction contained pg_ndistinct_in pg_ndistinct_out pg_ndistinct_recv pg_ndistinct_send
+syn keyword sqlFunction contained pg_nextoid pg_node_tree_in pg_node_tree_out pg_node_tree_recv
+syn keyword sqlFunction contained pg_node_tree_send pg_notification_queue_usage pg_notify
+syn keyword sqlFunction contained pg_opclass_is_visible pg_operator_is_visible pg_opfamily_is_visible
+syn keyword sqlFunction contained pg_options_to_table pg_partition_ancestors pg_partition_root
+syn keyword sqlFunction contained pg_partition_tree pg_postmaster_start_time pg_prepared_statement
+syn keyword sqlFunction contained pg_prepared_xact pg_promote pg_read_binary_file pg_read_file
+syn keyword sqlFunction contained pg_read_file_old pg_relation_filenode pg_relation_filepath
 syn keyword sqlFunction contained pg_relation_is_publishable pg_relation_is_updatable
 syn keyword sqlFunction contained pg_relation_size pg_reload_conf pg_replication_origin_advance
 syn keyword sqlFunction contained pg_replication_origin_create pg_replication_origin_drop
@@ -502,8 +502,8 @@ syn keyword sqlFunction contained pg_sequence_last_value pg_sequence_parameters
 syn keyword sqlFunction contained pg_show_all_settings pg_show_replication_origin_status
 syn keyword sqlFunction contained pg_size_bytes pg_size_pretty pg_sleep pg_sleep_for pg_sleep_until
 syn keyword sqlFunction contained pg_snapshot_in pg_snapshot_out pg_snapshot_recv pg_snapshot_send
-syn keyword sqlFunction contained pg_snapshot_xip pg_snapshot_xmax pg_snapshot_xmin
-syn keyword sqlFunction contained pg_start_backup pg_stat_clear_snapshot pg_stat_file pg_stat_get_activity
+syn keyword sqlFunction contained pg_snapshot_xip pg_snapshot_xmax pg_snapshot_xmin pg_start_backup
+syn keyword sqlFunction contained pg_stat_clear_snapshot pg_stat_file pg_stat_get_activity
 syn keyword sqlFunction contained pg_stat_get_analyze_count pg_stat_get_archiver
 syn keyword sqlFunction contained pg_stat_get_autoanalyze_count pg_stat_get_autovacuum_count
 syn keyword sqlFunction contained pg_stat_get_backend_activity pg_stat_get_backend_activity_start
@@ -524,34 +524,34 @@ syn keyword sqlFunction contained pg_stat_get_db_blocks_fetched pg_stat_get_db_b
 syn keyword sqlFunction contained pg_stat_get_db_checksum_failures pg_stat_get_db_checksum_last_failure
 syn keyword sqlFunction contained pg_stat_get_db_conflict_all pg_stat_get_db_conflict_bufferpin
 syn keyword sqlFunction contained pg_stat_get_db_conflict_lock pg_stat_get_db_conflict_snapshot
-syn keyword sqlFunction contained pg_stat_get_db_conflict_startup_deadlock
-syn keyword sqlFunction contained pg_stat_get_db_conflict_tablespace pg_stat_get_db_deadlocks pg_stat_get_db_numbackends
+syn keyword sqlFunction contained pg_stat_get_db_conflict_startup_deadlock pg_stat_get_db_conflict_tablespace
+syn keyword sqlFunction contained pg_stat_get_db_deadlocks pg_stat_get_db_numbackends
 syn keyword sqlFunction contained pg_stat_get_db_stat_reset_time pg_stat_get_db_temp_bytes
 syn keyword sqlFunction contained pg_stat_get_db_temp_files pg_stat_get_db_tuples_deleted
 syn keyword sqlFunction contained pg_stat_get_db_tuples_fetched pg_stat_get_db_tuples_inserted
 syn keyword sqlFunction contained pg_stat_get_db_tuples_returned pg_stat_get_db_tuples_updated
-syn keyword sqlFunction contained pg_stat_get_db_xact_commit pg_stat_get_db_xact_rollback
-syn keyword sqlFunction contained pg_stat_get_dead_tuples pg_stat_get_function_calls pg_stat_get_function_self_time
+syn keyword sqlFunction contained pg_stat_get_db_xact_commit pg_stat_get_db_xact_rollback pg_stat_get_dead_tuples
+syn keyword sqlFunction contained pg_stat_get_function_calls pg_stat_get_function_self_time
 syn keyword sqlFunction contained pg_stat_get_function_total_time pg_stat_get_ins_since_vacuum
-syn keyword sqlFunction contained pg_stat_get_last_analyze_time
-syn keyword sqlFunction contained pg_stat_get_last_autoanalyze_time pg_stat_get_last_autovacuum_time
-syn keyword sqlFunction contained pg_stat_get_last_vacuum_time pg_stat_get_live_tuples pg_stat_get_mod_since_analyze
+syn keyword sqlFunction contained pg_stat_get_last_analyze_time pg_stat_get_last_autoanalyze_time
+syn keyword sqlFunction contained pg_stat_get_last_autovacuum_time pg_stat_get_last_vacuum_time
+syn keyword sqlFunction contained pg_stat_get_live_tuples pg_stat_get_mod_since_analyze
 syn keyword sqlFunction contained pg_stat_get_numscans pg_stat_get_progress_info pg_stat_get_slru
 syn keyword sqlFunction contained pg_stat_get_snapshot_timestamp pg_stat_get_subscription
 syn keyword sqlFunction contained pg_stat_get_tuples_deleted pg_stat_get_tuples_fetched
 syn keyword sqlFunction contained pg_stat_get_tuples_hot_updated pg_stat_get_tuples_inserted
-syn keyword sqlFunction contained pg_stat_get_tuples_returned pg_stat_get_tuples_updated
-syn keyword sqlFunction contained pg_stat_get_vacuum_count pg_stat_get_wal_receiver pg_stat_get_wal_senders
+syn keyword sqlFunction contained pg_stat_get_tuples_returned pg_stat_get_tuples_updated pg_stat_get_vacuum_count
+syn keyword sqlFunction contained pg_stat_get_wal_receiver pg_stat_get_wal_senders
 syn keyword sqlFunction contained pg_stat_get_xact_blocks_fetched pg_stat_get_xact_blocks_hit
 syn keyword sqlFunction contained pg_stat_get_xact_function_calls pg_stat_get_xact_function_self_time
 syn keyword sqlFunction contained pg_stat_get_xact_function_total_time pg_stat_get_xact_numscans
-syn keyword sqlFunction contained pg_stat_get_xact_tuples_deleted
-syn keyword sqlFunction contained pg_stat_get_xact_tuples_fetched pg_stat_get_xact_tuples_hot_updated
+syn keyword sqlFunction contained pg_stat_get_xact_tuples_deleted pg_stat_get_xact_tuples_fetched
+syn keyword sqlFunction contained pg_stat_get_xact_tuples_hot_updated
 syn keyword sqlFunction contained pg_stat_get_xact_tuples_inserted pg_stat_get_xact_tuples_returned
 syn keyword sqlFunction contained pg_stat_get_xact_tuples_updated pg_stat_reset pg_stat_reset_shared
-syn keyword sqlFunction contained pg_stat_reset_single_function_counters
-syn keyword sqlFunction contained pg_stat_reset_single_table_counters pg_stat_reset_slru pg_statistics_obj_is_visible
-syn keyword sqlFunction contained pg_stop_backup pg_switch_wal pg_table_is_visible pg_table_size
+syn keyword sqlFunction contained pg_stat_reset_single_function_counters pg_stat_reset_single_table_counters
+syn keyword sqlFunction contained pg_stat_reset_slru pg_statistics_obj_is_visible pg_stop_backup
+syn keyword sqlFunction contained pg_switch_wal pg_table_is_visible pg_table_size
 syn keyword sqlFunction contained pg_tablespace_databases pg_tablespace_location pg_tablespace_size
 syn keyword sqlFunction contained pg_terminate_backend pg_timezone_abbrevs pg_timezone_names
 syn keyword sqlFunction contained pg_total_relation_size pg_trigger_depth pg_try_advisory_lock
@@ -561,148 +561,148 @@ syn keyword sqlFunction contained pg_ts_parser_is_visible pg_ts_template_is_visi
 syn keyword sqlFunction contained pg_type_is_visible pg_typeof pg_visible_in_snapshot pg_wal_lsn_diff
 syn keyword sqlFunction contained pg_wal_replay_pause pg_wal_replay_resume pg_walfile_name
 syn keyword sqlFunction contained pg_walfile_name_offset pg_xact_commit_timestamp pg_xact_status
-syn keyword sqlFunction contained phraseto_tsquery pi plainto_tsquery plperl_call_handler
-syn keyword sqlFunction contained plperl_inline_handler plperl_validator plperlu_call_handler
-syn keyword sqlFunction contained plperlu_inline_handler plperlu_validator plpgsql_call_handler
-syn keyword sqlFunction contained plpgsql_inline_handler plpgsql_validator pltcl_call_handler pltclu_call_handler
-syn keyword sqlFunction contained point point_above point_add point_below point_distance point_div
-syn keyword sqlFunction contained point_eq point_horiz point_in point_left point_mul point_ne
-syn keyword sqlFunction contained point_out point_recv point_right point_send point_sub point_vert
-syn keyword sqlFunction contained poly_above poly_below poly_center poly_contain poly_contain_pt
+syn keyword sqlFunction contained phraseto_tsquery pi plainto_tsquery plperl_call_handler plperl_inline_handler
+syn keyword sqlFunction contained plperl_validator plperlu_call_handler plperlu_inline_handler
+syn keyword sqlFunction contained plperlu_validator plpgsql_call_handler plpgsql_inline_handler
+syn keyword sqlFunction contained plpgsql_validator pltcl_call_handler pltclu_call_handler point
+syn keyword sqlFunction contained point_above point_add point_below point_distance point_div
+syn keyword sqlFunction contained point_eq point_horiz point_in point_left point_mul point_ne point_out
+syn keyword sqlFunction contained point_recv point_right point_send point_sub point_vert poly_above
+syn keyword sqlFunction contained poly_below poly_center poly_contain poly_contain_pt
 syn keyword sqlFunction contained poly_contained poly_distance poly_in poly_left poly_npoints poly_out
-syn keyword sqlFunction contained poly_overabove poly_overbelow poly_overlap poly_overleft
-syn keyword sqlFunction contained poly_overright poly_recv poly_right poly_same poly_send polygon popen
-syn keyword sqlFunction contained position positionjoinsel positionsel postgresql_fdw_validator pow power
+syn keyword sqlFunction contained poly_overabove poly_overbelow poly_overlap poly_overleft poly_overright
+syn keyword sqlFunction contained poly_recv poly_right poly_same poly_send polygon popen position
+syn keyword sqlFunction contained positionjoinsel positionsel postgresql_fdw_validator pow power
 syn keyword sqlFunction contained prefixjoinsel prefixsel prsd_end prsd_headline prsd_lextype
 syn keyword sqlFunction contained prsd_nexttoken prsd_start pt_contained_circle pt_contained_poly
-syn keyword sqlFunction contained query_to_xml query_to_xml_and_xmlschema query_to_xmlschema
-syn keyword sqlFunction contained querytree quote_ident quote_literal quote_nullable radians radius
-syn keyword sqlFunction contained random range_adjacent range_after range_before range_cmp
+syn keyword sqlFunction contained query_to_xml query_to_xml_and_xmlschema query_to_xmlschema querytree
+syn keyword sqlFunction contained quote_ident quote_literal quote_nullable radians radius random
+syn keyword sqlFunction contained range_adjacent range_after range_before range_cmp
 syn keyword sqlFunction contained range_contained_by range_contains range_contains_elem range_eq range_ge
 syn keyword sqlFunction contained range_gist_consistent range_gist_penalty range_gist_picksplit
 syn keyword sqlFunction contained range_gist_same range_gist_union range_gt range_in range_intersect
 syn keyword sqlFunction contained range_le range_lt range_merge range_minus range_ne range_out
 syn keyword sqlFunction contained range_overlaps range_overleft range_overright range_recv range_send
 syn keyword sqlFunction contained range_typanalyze range_union rangesel rank rank_final record_eq
-syn keyword sqlFunction contained record_ge record_gt record_image_eq record_image_ge
-syn keyword sqlFunction contained record_image_gt record_image_le record_image_lt record_image_ne record_in
+syn keyword sqlFunction contained record_ge record_gt record_image_eq record_image_ge record_image_gt
+syn keyword sqlFunction contained record_image_le record_image_lt record_image_ne record_in
 syn keyword sqlFunction contained record_le record_lt record_ne record_out record_recv record_send
 syn keyword sqlFunction contained regclass regclassin regclassout regclassrecv regclasssend
-syn keyword sqlFunction contained regcollationin regcollationout regcollationrecv regcollationsend
-syn keyword sqlFunction contained regconfigin regconfigout regconfigrecv regconfigsend regdictionaryin
-syn keyword sqlFunction contained regdictionaryout regdictionaryrecv regdictionarysend
-syn keyword sqlFunction contained regexeqjoinsel regexeqsel regexnejoinsel regexnesel regexp_match
-syn keyword sqlFunction contained regexp_matches regexp_replace regexp_split_to_array
-syn keyword sqlFunction contained regexp_split_to_table regnamespacein regnamespaceout regnamespacerecv
-syn keyword sqlFunction contained regnamespacesend regoperatorin regoperatorout regoperatorrecv
-syn keyword sqlFunction contained regoperatorsend regoperin regoperout regoperrecv regopersend regprocedurein
-syn keyword sqlFunction contained regprocedureout regprocedurerecv regproceduresend regprocin
-syn keyword sqlFunction contained regprocout regprocrecv regprocsend regr_avgx regr_avgy regr_count
+syn keyword sqlFunction contained regcollationin regcollationout regcollationrecv regcollationsend regconfigin
+syn keyword sqlFunction contained regconfigout regconfigrecv regconfigsend regdictionaryin
+syn keyword sqlFunction contained regdictionaryout regdictionaryrecv regdictionarysend regexeqjoinsel
+syn keyword sqlFunction contained regexeqsel regexnejoinsel regexnesel regexp_match regexp_matches
+syn keyword sqlFunction contained regexp_replace regexp_split_to_array regexp_split_to_table
+syn keyword sqlFunction contained regnamespacein regnamespaceout regnamespacerecv regnamespacesend
+syn keyword sqlFunction contained regoperatorin regoperatorout regoperatorrecv regoperatorsend
+syn keyword sqlFunction contained regoperin regoperout regoperrecv regopersend regprocedurein
+syn keyword sqlFunction contained regprocedureout regprocedurerecv regproceduresend regprocin regprocout
+syn keyword sqlFunction contained regprocrecv regprocsend regr_avgx regr_avgy regr_count
 syn keyword sqlFunction contained regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy regrolein
-syn keyword sqlFunction contained regroleout regrolerecv regrolesend regtypein regtypeout
-syn keyword sqlFunction contained regtyperecv regtypesend repeat replace reverse right round row_number
+syn keyword sqlFunction contained regroleout regrolerecv regrolesend regtypein regtypeout regtyperecv
+syn keyword sqlFunction contained regtypesend repeat replace reverse right round row_number
 syn keyword sqlFunction contained row_security_active row_to_json rpad rtrim satisfies_hash_partition
 syn keyword sqlFunction contained scalargejoinsel scalargesel scalargtjoinsel scalargtsel
-syn keyword sqlFunction contained scalarlejoinsel scalarlesel scalarltjoinsel scalarltsel scale
-syn keyword sqlFunction contained schema_to_xml schema_to_xml_and_xmlschema schema_to_xmlschema
-syn keyword sqlFunction contained session_user set_bit set_byte set_config set_masklen setseed setval
-syn keyword sqlFunction contained setweight sha224 sha256 sha384 sha512 shell_in shell_out
+syn keyword sqlFunction contained scalarlejoinsel scalarlesel scalarltjoinsel scalarltsel scale schema_to_xml
+syn keyword sqlFunction contained schema_to_xml_and_xmlschema schema_to_xmlschema session_user
+syn keyword sqlFunction contained set_bit set_byte set_config set_masklen setseed setval setweight
+syn keyword sqlFunction contained sha224 sha256 sha384 sha512 shell_in shell_out
 syn keyword sqlFunction contained shift_jis_2004_to_euc_jis_2004 shift_jis_2004_to_utf8 shobj_description sign
 syn keyword sqlFunction contained similar_escape similar_to_escape sin sind sinh sjis_to_euc_jp
-syn keyword sqlFunction contained sjis_to_mic sjis_to_utf8 slope spg_bbox_quad_config
-syn keyword sqlFunction contained spg_box_quad_choose spg_box_quad_config spg_box_quad_inner_consistent
+syn keyword sqlFunction contained sjis_to_mic sjis_to_utf8 slope spg_bbox_quad_config spg_box_quad_choose
+syn keyword sqlFunction contained spg_box_quad_config spg_box_quad_inner_consistent
 syn keyword sqlFunction contained spg_box_quad_leaf_consistent spg_box_quad_picksplit spg_kd_choose
 syn keyword sqlFunction contained spg_kd_config spg_kd_inner_consistent spg_kd_picksplit
 syn keyword sqlFunction contained spg_poly_quad_compress spg_quad_choose spg_quad_config
 syn keyword sqlFunction contained spg_quad_inner_consistent spg_quad_leaf_consistent spg_quad_picksplit
-syn keyword sqlFunction contained spg_range_quad_choose spg_range_quad_config
-syn keyword sqlFunction contained spg_range_quad_inner_consistent spg_range_quad_leaf_consistent spg_range_quad_picksplit
+syn keyword sqlFunction contained spg_range_quad_choose spg_range_quad_config spg_range_quad_inner_consistent
+syn keyword sqlFunction contained spg_range_quad_leaf_consistent spg_range_quad_picksplit
 syn keyword sqlFunction contained spg_text_choose spg_text_config spg_text_inner_consistent
-syn keyword sqlFunction contained spg_text_leaf_consistent spg_text_picksplit spghandler split_part
-syn keyword sqlFunction contained sqrt starts_with statement_timestamp stddev stddev_pop stddev_samp
-syn keyword sqlFunction contained string_agg string_agg_finalfn string_agg_transfn
-syn keyword sqlFunction contained string_to_array strip strpos substr substring sum
-syn keyword sqlFunction contained suppress_redundant_updates_trigger system table_am_handler_in table_am_handler_out
-syn keyword sqlFunction contained table_to_xml table_to_xml_and_xmlschema table_to_xmlschema tan tand tanh
-syn keyword sqlFunction contained text text_ge text_gt text_larger text_le text_lt text_pattern_ge
+syn keyword sqlFunction contained spg_text_leaf_consistent spg_text_picksplit spghandler split_part sqrt
+syn keyword sqlFunction contained starts_with statement_timestamp stddev stddev_pop stddev_samp
+syn keyword sqlFunction contained string_agg string_agg_finalfn string_agg_transfn string_to_array
+syn keyword sqlFunction contained strip strpos substr substring sum
+syn keyword sqlFunction contained suppress_redundant_updates_trigger system table_am_handler_in table_am_handler_out table_to_xml
+syn keyword sqlFunction contained table_to_xml_and_xmlschema table_to_xmlschema tan tand tanh text
+syn keyword sqlFunction contained text_ge text_gt text_larger text_le text_lt text_pattern_ge
 syn keyword sqlFunction contained text_pattern_gt text_pattern_le text_pattern_lt text_smaller
 syn keyword sqlFunction contained textanycat textcat texteq texteqname textgename textgtname texticlike
-syn keyword sqlFunction contained texticlike_support texticnlike texticregexeq
-syn keyword sqlFunction contained texticregexeq_support texticregexne textin textlen textlename textlike
+syn keyword sqlFunction contained texticlike_support texticnlike texticregexeq texticregexeq_support
+syn keyword sqlFunction contained texticregexne textin textlen textlename textlike
 syn keyword sqlFunction contained textlike_support textltname textne textnename textnlike textout textrecv
 syn keyword sqlFunction contained textregexeq textregexeq_support textregexne textsend thesaurus_init
-syn keyword sqlFunction contained thesaurus_lexize tideq tidge tidgt tidin tidlarger tidle tidlt
-syn keyword sqlFunction contained tidne tidout tidrecv tidsend tidsmaller time time_cmp time_eq time_ge
+syn keyword sqlFunction contained thesaurus_lexize tideq tidge tidgt tidin tidlarger tidle tidlt tidne
+syn keyword sqlFunction contained tidout tidrecv tidsend tidsmaller time time_cmp time_eq time_ge
 syn keyword sqlFunction contained time_gt time_hash time_hash_extended time_in time_larger time_le
 syn keyword sqlFunction contained time_lt time_mi_interval time_mi_time time_ne time_out
 syn keyword sqlFunction contained time_pl_interval time_recv time_send time_smaller time_support timedate_pl
 syn keyword sqlFunction contained timeofday timestamp timestamp_cmp timestamp_cmp_date
 syn keyword sqlFunction contained timestamp_cmp_timestamptz timestamp_eq timestamp_eq_date
-syn keyword sqlFunction contained timestamp_eq_timestamptz timestamp_ge timestamp_ge_date
-syn keyword sqlFunction contained timestamp_ge_timestamptz timestamp_gt timestamp_gt_date timestamp_gt_timestamptz
-syn keyword sqlFunction contained timestamp_hash timestamp_hash_extended timestamp_in
-syn keyword sqlFunction contained timestamp_larger timestamp_le timestamp_le_date timestamp_le_timestamptz
-syn keyword sqlFunction contained timestamp_lt timestamp_lt_date timestamp_lt_timestamptz
-syn keyword sqlFunction contained timestamp_mi timestamp_mi_interval timestamp_ne timestamp_ne_date
+syn keyword sqlFunction contained timestamp_eq_timestamptz timestamp_ge timestamp_ge_date timestamp_ge_timestamptz
+syn keyword sqlFunction contained timestamp_gt timestamp_gt_date timestamp_gt_timestamptz
+syn keyword sqlFunction contained timestamp_hash timestamp_hash_extended timestamp_in timestamp_larger
+syn keyword sqlFunction contained timestamp_le timestamp_le_date timestamp_le_timestamptz
+syn keyword sqlFunction contained timestamp_lt timestamp_lt_date timestamp_lt_timestamptz timestamp_mi
+syn keyword sqlFunction contained timestamp_mi_interval timestamp_ne timestamp_ne_date
 syn keyword sqlFunction contained timestamp_ne_timestamptz timestamp_out timestamp_pl_interval
 syn keyword sqlFunction contained timestamp_recv timestamp_send timestamp_smaller timestamp_sortsupport
-syn keyword sqlFunction contained timestamp_support timestamptypmodin timestamptypmodout
-syn keyword sqlFunction contained timestamptz timestamptz_cmp timestamptz_cmp_date
-syn keyword sqlFunction contained timestamptz_cmp_timestamp timestamptz_eq timestamptz_eq_date
-syn keyword sqlFunction contained timestamptz_eq_timestamp timestamptz_ge timestamptz_ge_date timestamptz_ge_timestamp
+syn keyword sqlFunction contained timestamp_support timestamptypmodin timestamptypmodout timestamptz
+syn keyword sqlFunction contained timestamptz_cmp timestamptz_cmp_date timestamptz_cmp_timestamp
+syn keyword sqlFunction contained timestamptz_eq timestamptz_eq_date timestamptz_eq_timestamp
+syn keyword sqlFunction contained timestamptz_ge timestamptz_ge_date timestamptz_ge_timestamp
 syn keyword sqlFunction contained timestamptz_gt timestamptz_gt_date timestamptz_gt_timestamp
-syn keyword sqlFunction contained timestamptz_in timestamptz_larger timestamptz_le
-syn keyword sqlFunction contained timestamptz_le_date timestamptz_le_timestamp timestamptz_lt
-syn keyword sqlFunction contained timestamptz_lt_date timestamptz_lt_timestamp timestamptz_mi
-syn keyword sqlFunction contained timestamptz_mi_interval timestamptz_ne timestamptz_ne_date
-syn keyword sqlFunction contained timestamptz_ne_timestamp timestamptz_out timestamptz_pl_interval timestamptz_recv
+syn keyword sqlFunction contained timestamptz_in timestamptz_larger timestamptz_le timestamptz_le_date
+syn keyword sqlFunction contained timestamptz_le_timestamp timestamptz_lt timestamptz_lt_date
+syn keyword sqlFunction contained timestamptz_lt_timestamp timestamptz_mi timestamptz_mi_interval
+syn keyword sqlFunction contained timestamptz_ne timestamptz_ne_date timestamptz_ne_timestamp
+syn keyword sqlFunction contained timestamptz_out timestamptz_pl_interval timestamptz_recv
 syn keyword sqlFunction contained timestamptz_send timestamptz_smaller timestamptztypmodin
-syn keyword sqlFunction contained timestamptztypmodout timetypmodin timetypmodout timetz timetz_cmp
-syn keyword sqlFunction contained timetz_eq timetz_ge timetz_gt timetz_hash timetz_hash_extended
-syn keyword sqlFunction contained timetz_in timetz_larger timetz_le timetz_lt timetz_mi_interval
-syn keyword sqlFunction contained timetz_ne timetz_out timetz_pl_interval timetz_recv timetz_send
+syn keyword sqlFunction contained timestamptztypmodout timetypmodin timetypmodout timetz timetz_cmp timetz_eq
+syn keyword sqlFunction contained timetz_ge timetz_gt timetz_hash timetz_hash_extended timetz_in
+syn keyword sqlFunction contained timetz_larger timetz_le timetz_lt timetz_mi_interval timetz_ne
+syn keyword sqlFunction contained timetz_out timetz_pl_interval timetz_recv timetz_send
 syn keyword sqlFunction contained timetz_smaller timetzdate_pl timetztypmodin timetztypmodout timezone
-syn keyword sqlFunction contained to_ascii to_char to_date to_hex to_json to_jsonb to_number
-syn keyword sqlFunction contained to_regclass to_regcollation to_regnamespace to_regoper to_regoperator
-syn keyword sqlFunction contained to_regproc to_regprocedure to_regrole to_regtype to_timestamp
-syn keyword sqlFunction contained to_tsquery to_tsvector transaction_timestamp translate trigger_in
+syn keyword sqlFunction contained to_ascii to_char to_date to_hex to_json to_jsonb to_number to_regclass
+syn keyword sqlFunction contained to_regcollation to_regnamespace to_regoper to_regoperator
+syn keyword sqlFunction contained to_regproc to_regprocedure to_regrole to_regtype to_timestamp to_tsquery
+syn keyword sqlFunction contained to_tsvector transaction_timestamp translate trigger_in
 syn keyword sqlFunction contained trigger_out trim_scale trunc ts_debug ts_delete ts_filter ts_headline
-syn keyword sqlFunction contained ts_lexize ts_match_qv ts_match_tq ts_match_tt ts_match_vq
-syn keyword sqlFunction contained ts_parse ts_rank ts_rank_cd ts_rewrite ts_stat ts_token_type
-syn keyword sqlFunction contained ts_typanalyze tsm_handler_in tsm_handler_out tsmatchjoinsel tsmatchsel
+syn keyword sqlFunction contained ts_lexize ts_match_qv ts_match_tq ts_match_tt ts_match_vq ts_parse
+syn keyword sqlFunction contained ts_rank ts_rank_cd ts_rewrite ts_stat ts_token_type ts_typanalyze
+syn keyword sqlFunction contained tsm_handler_in tsm_handler_out tsmatchjoinsel tsmatchsel
 syn keyword sqlFunction contained tsq_mcontained tsq_mcontains tsquery_and tsquery_cmp tsquery_eq
 syn keyword sqlFunction contained tsquery_ge tsquery_gt tsquery_le tsquery_lt tsquery_ne tsquery_not
 syn keyword sqlFunction contained tsquery_or tsquery_phrase tsqueryin tsqueryout tsqueryrecv
 syn keyword sqlFunction contained tsquerysend tsrange tsrange_subdiff tstzrange tstzrange_subdiff
 syn keyword sqlFunction contained tsvector_cmp tsvector_concat tsvector_eq tsvector_ge tsvector_gt
 syn keyword sqlFunction contained tsvector_le tsvector_lt tsvector_ne tsvector_to_array
-syn keyword sqlFunction contained tsvector_update_trigger tsvector_update_trigger_column tsvectorin
-syn keyword sqlFunction contained tsvectorout tsvectorrecv tsvectorsend txid_current
-syn keyword sqlFunction contained txid_current_if_assigned txid_current_snapshot txid_snapshot_in txid_snapshot_out
+syn keyword sqlFunction contained tsvector_update_trigger tsvector_update_trigger_column tsvectorin tsvectorout
+syn keyword sqlFunction contained tsvectorrecv tsvectorsend txid_current txid_current_if_assigned
+syn keyword sqlFunction contained txid_current_snapshot txid_snapshot_in txid_snapshot_out
 syn keyword sqlFunction contained txid_snapshot_recv txid_snapshot_send txid_snapshot_xip
-syn keyword sqlFunction contained txid_snapshot_xmax txid_snapshot_xmin txid_status
-syn keyword sqlFunction contained txid_visible_in_snapshot uhc_to_utf8 unique_key_recheck unknownin unknownout
-syn keyword sqlFunction contained unknownrecv unknownsend unnest upper upper_inc upper_inf utf8_to_big5
+syn keyword sqlFunction contained txid_snapshot_xmax txid_snapshot_xmin txid_status txid_visible_in_snapshot
+syn keyword sqlFunction contained uhc_to_utf8 unique_key_recheck unknownin unknownout unknownrecv
+syn keyword sqlFunction contained unknownsend unnest upper upper_inc upper_inf utf8_to_big5
 syn keyword sqlFunction contained utf8_to_euc_cn utf8_to_euc_jis_2004 utf8_to_euc_jp utf8_to_euc_kr
 syn keyword sqlFunction contained utf8_to_euc_tw utf8_to_gb18030 utf8_to_gbk utf8_to_iso8859
 syn keyword sqlFunction contained utf8_to_iso8859_1 utf8_to_johab utf8_to_koi8r utf8_to_koi8u
-syn keyword sqlFunction contained utf8_to_shift_jis_2004 utf8_to_sjis utf8_to_uhc utf8_to_win uuid_cmp
-syn keyword sqlFunction contained uuid_eq uuid_ge uuid_gt uuid_hash uuid_hash_extended uuid_in uuid_le
-syn keyword sqlFunction contained uuid_lt uuid_ne uuid_out uuid_recv uuid_send uuid_sortsupport
-syn keyword sqlFunction contained var_pop var_samp varbit varbit_in varbit_out varbit_recv varbit_send
-syn keyword sqlFunction contained varbit_support varbitcmp varbiteq varbitge varbitgt varbitle
-syn keyword sqlFunction contained varbitlt varbitne varbittypmodin varbittypmodout varchar
-syn keyword sqlFunction contained varchar_support varcharin varcharout varcharrecv varcharsend
-syn keyword sqlFunction contained varchartypmodin varchartypmodout variance version void_in void_out void_recv
-syn keyword sqlFunction contained void_send websearch_to_tsquery width width_bucket
-syn keyword sqlFunction contained win1250_to_latin2 win1250_to_mic win1251_to_iso win1251_to_koi8r win1251_to_mic
+syn keyword sqlFunction contained utf8_to_shift_jis_2004 utf8_to_sjis utf8_to_uhc utf8_to_win uuid_cmp uuid_eq
+syn keyword sqlFunction contained uuid_ge uuid_gt uuid_hash uuid_hash_extended uuid_in uuid_le
+syn keyword sqlFunction contained uuid_lt uuid_ne uuid_out uuid_recv uuid_send uuid_sortsupport var_pop
+syn keyword sqlFunction contained var_samp varbit varbit_in varbit_out varbit_recv varbit_send
+syn keyword sqlFunction contained varbit_support varbitcmp varbiteq varbitge varbitgt varbitle varbitlt
+syn keyword sqlFunction contained varbitne varbittypmodin varbittypmodout varchar_support
+syn keyword sqlFunction contained varcharin varcharout varcharrecv varcharsend varchartypmodin
+syn keyword sqlFunction contained varchartypmodout variance version void_in void_out void_recv void_send
+syn keyword sqlFunction contained websearch_to_tsquery width width_bucket win1250_to_latin2
+syn keyword sqlFunction contained win1250_to_mic win1251_to_iso win1251_to_koi8r win1251_to_mic
 syn keyword sqlFunction contained win1251_to_win866 win866_to_iso win866_to_koi8r win866_to_mic
-syn keyword sqlFunction contained win866_to_win1251 win_to_utf8 xid xid8cmp xid8eq xid8ge xid8gt
-syn keyword sqlFunction contained xid8in xid8le xid8lt xid8ne xid8out xid8recv xid8send xideq xideqint4
-syn keyword sqlFunction contained xidin xidneq xidneqint4 xidout xidrecv xidsend xml xml_in
-syn keyword sqlFunction contained xml_is_well_formed xml_is_well_formed_content
-syn keyword sqlFunction contained xml_is_well_formed_document xml_out xml_recv xml_send xmlagg xmlcomment xmlconcat2 xmlexists
-syn keyword sqlFunction contained xmlvalidate xpath xpath_exists
+syn keyword sqlFunction contained win866_to_win1251 win_to_utf8 xid xid8cmp xid8eq xid8ge xid8gt xid8in xid8le
+syn keyword sqlFunction contained xid8lt xid8ne xid8out xid8recv xid8send xideq xideqint4 xidin xidneq
+syn keyword sqlFunction contained xidneqint4 xidout xidrecv xidsend xml xml_in xml_is_well_formed
+syn keyword sqlFunction contained xml_is_well_formed_content xml_is_well_formed_document xml_out
+syn keyword sqlFunction contained xml_recv xml_send xmlagg xmlcomment xmlconcat2 xmlexists xmlvalidate
+syn keyword sqlFunction contained xpath xpath_exists
 " Extensions names
 syn keyword sqlConstant contained address_standardizer address_standardizer_data_us adminpack
 syn keyword sqlConstant contained amcheck autoinc bloom bool_plperl bool_plperlu btree_gin
@@ -713,7 +713,7 @@ syn keyword sqlConstant contained pageinspect pg_buffercache pg_freespacemap pg_
 syn keyword sqlConstant contained pg_stat_statements pg_trgm pg_visibility pgcrypto pgrouting pgrowlocks
 syn keyword sqlConstant contained pgstattuple pgtap plperl plperlu plpgsql pltcl pltclu postgis
 syn keyword sqlConstant contained postgis_raster postgis_sfcgal postgis_tiger_geocoder postgis_topology
-syn keyword sqlConstant contained postgres_fdw refint seg sslinfo tablefunc tcn tsm_system_rows
+syn keyword sqlConstant contained postgres_fdw refint seg sslinfo tablefunc tcn temporal_tables tsm_system_rows
 syn keyword sqlConstant contained tsm_system_time unaccent xml2
 " Legacy extensions names
 syn keyword sqlConstant contained chkpass hstore_plpython2u hstore_plpython3u hstore_plpythonu
@@ -1973,6 +1973,7 @@ syn keyword sqlPsqlKeyword contained unicode_border_linestyle unicode_column_lin
 syn keyword sqlPsqlKeyword contained on off auto unaligned pager
 syn keyword sqlPsqlKeyword contained AUTOCOMMIT HISTCONTROL PROMPT VERBOSITY SHOW_CONTEXT VERSION
 syn keyword sqlPsqlKeyword contained DBNAME USER HOST PORT ENCODING HISTSIZE QUIET
+syn keyword sqlPsqlKeyword contained from program pstdin pstdout stdin stdout to where with
 
 " Todo
 syn keyword sqlTodo contained TODO FIXME XXX DEBUG NOTE
@@ -2010,7 +2011,7 @@ else
 endif
 
 " Folding
-syn region sqlFold start='^\s*\zs\c\(create\|update\|alter\|select\|insert\|do\)\>' end=';$' transparent fold contains=ALL
+syn region sqlFold start='^\s*\zs\c\(create\|update\|alter\|select\|insert\|do\)\>' end=';$' transparent fold contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo,plpgsql
 
 " PL/<any other language>
 fun! s:add_syntax(s)
diff --git a/syntax/sexplib.vim b/syntax/sexplib.vim
index c0787af90..14e02b6d6 100644
--- a/syntax/sexplib.vim
+++ b/syntax/sexplib.vim
@@ -6,10 +6,10 @@ endif
 " Language:     S-expressions as used in Sexplib
 " Filenames:    *.sexp
 " Maintainers:  Markus Mottl      <markus.mottl@gmail.com>
-" URL:          http://www.ocaml.info/vim/syntax/sexplib.vim
-" Last Change:  2017 Apr 11 - Improved matching of negative numbers (MM)
+" URL:          https://github.com/ocaml/vim-ocaml
+" Last Change:  2020 Dec 31 - Updated header for Vim contribution (MM)
+"               2017 Apr 11 - Improved matching of negative numbers (MM)
 "               2012 Jun 20 - Fixed a block comment highlighting bug (MM)
-"               2012 Apr 24 - Added support for new comment styles (MM)
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 3b71ac76e..8091a76de 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -646,6 +646,7 @@ call TestFiletype('xpm2')
 call TestFiletype('context')
 call TestFiletype('mint')
 call TestFiletype('jsonc')
+call TestFiletype('gleam')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 

From 37bc36ac42c00757cf06ea271f8206aec50632a2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 1 Jan 2021 17:14:37 +0100
Subject: [PATCH 225/299] Change stylus provider, closes #642

---
 README.md                 |    2 +-
 autoload/stylcomplete.vim |  578 ++++++++++++++++++
 ftplugin/stylus.vim       |   10 +-
 indent/stylus.vim         |   95 +--
 packages.yaml             |    2 +-
 syntax/stylus.vim         | 1206 ++++++++++++++++++++++++++-----------
 6 files changed, 1468 insertions(+), 425 deletions(-)
 create mode 100644 autoload/stylcomplete.vim

diff --git a/README.md b/README.md
index b914860f3..872c2225f 100644
--- a/README.md
+++ b/README.md
@@ -174,7 +174,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [slime](https://github.com/slime-lang/vim-slime-syntax) (Syntax highlighting for slime files)
 - [smt2](https://github.com/bohlender/vim-smt2) (SMT syntax highlighting for smt2 and smt files)
 - [solidity](https://github.com/tomlion/vim-solidity) (Solidity syntax highlighting for sol files)
-- [stylus](https://github.com/wavded/vim-stylus) (Stylus syntax highlighting for styl and stylus files)
+- [stylus](https://github.com/iloginow/vim-stylus) (Stylus syntax highlighting for styl and stylus files)
 - [svelte](https://github.com/evanleck/vim-svelte/tree/main) (Svelte syntax highlighting for svelte files)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
 - [svg](https://github.com/vim-scripts/svg.vim) (SVG syntax highlighting for svg files)
diff --git a/autoload/stylcomplete.vim b/autoload/stylcomplete.vim
new file mode 100644
index 000000000..7437d32b8
--- /dev/null
+++ b/autoload/stylcomplete.vim
@@ -0,0 +1,578 @@
+if has_key(g:polyglot_is_disabled, 'stylus')
+  finish
+endif
+
+" Vim completion script
+" Language: Stylus
+" Author: Ilia Loginov <i.loginow@outlook.com>
+" Created: 2018 Jan 28
+
+fun! stylcomplete#CompleteStyl(findstart, base)
+
+  if a:findstart
+    let line = getline('.')
+    let start = col('.') - 1
+    while start > 0 && line[start - 1] !~ '\(\s\|\[\|(\|{\|:\)'
+      let start -= 1
+    endwhile
+    let b:start = line[start]
+    let b:before = line[start - 1]
+    let b:line = line[0:col('.')]
+    let b:first_char = matchstrpos(b:line, '^\s*\S')[2]
+    let b:first_word_type = synIDattr(synID(line('.'), b:first_char, 1), 'name')
+    " Check if there is more than one word on the current line
+    let b:word_break = 0
+    if b:line =~ '^.*\S\(\s\|\[\|(\|{\|:\)\S.*'
+      let b:word_break = 1
+    endif
+    return start
+  endif
+
+  " Complete properties
+  if b:start =~ '\w' && b:word_break == 0
+    let res = []
+    for m in g:css_props
+      if m =~ '^' . a:base
+        call add(res, m)
+      endif
+    endfor
+    return res
+
+  " Complete pseudo classes and elements
+  elseif b:before == ':' && b:first_word_type =~ 'stylusSelector\w*'
+    let values = ["active", "any", "any-link", "blank", "checked", "cue", "cue-region", "disabled", "enabled", "default", "dir(", "disabled", "drop", "drop(", "empty", "enabled", "first", "first-child", "first-of-type", "fullscreen", "future", "focus", "focus-within", "has(", "hover", "indeterminate", "in-range", "invalid", "lang(", "last-child", "last-of-type", "left", "link", "matches(", "not(", "nth-child(", "nth-column(", "nth-last-child(", "nth-last-column(", "nth-last-of-type(", "nth-of-type(", "only-child", "only-of-type", "optional", "out-of-range", "past", "paused", "placeholder-shown", "playing", "read-only", "read-write", "required", "right", "root", "scope", "target", "user-invalid", "valid", "visited", "first-line", "first-letter", "before", "after", "selection", "backdrop"]
+
+    let res = []
+    for m in values
+      if m =~ '^' . a:base
+        call add(res, m)
+      endif
+    endfor
+    return res
+
+  " Complete !important and !optional
+  elseif b:start == '!' && b:word_break == 1 && b:first_word_type == 'stylusProperty'
+    let values = ["important", "optional"]
+
+    let res = []
+    for m in values
+      if m =~ '^' . a:base
+        call add(res, m)
+      endif
+    endfor
+    return res
+
+  " Complete values
+  elseif b:start =~ '\w' && b:word_break == 1 && b:first_word_type == 'stylusProperty'
+    let prop = matchstr(b:line, '\(^\s\+\)\@<=\<\(\w\|-\)\+\>')
+    let res = []
+
+    let wide_keywords = ["initial", "inherit", "unset"]
+    let color_values = ["transparent", "rgb(", "rgba(", "hsl(", "hsla(", "#"] + g:css_colors
+    let border_style_values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
+    let border_width_values = ["thin", "thick", "medium"]
+    let list_style_type_values = ["decimal", "decimal-leading-zero", "arabic-indic", "armenian", "upper-armenian", "lower-armenian", "bengali", "cambodian", "khmer", "cjk-decimal", "devanagari", "georgian", "gujarati", "gurmukhi", "hebrew", "kannada", "lao", "malayalam", "mongolian", "myanmar", "oriya", "persian", "lower-roman", "upper-roman", "tamil", "telugu", "thai", "tibetan", "lower-alpha", "lower-latin", "upper-alpha", "upper-latin", "cjk-earthly-branch", "cjk-heavenly-stem", "lower-greek", "hiragana", "hiragana-iroha", "katakana", "katakana-iroha", "disc", "circle", "square", "disclosure-open", "disclosure-closed"]
+    let timing_functions = ["cubic-bezier(", "steps(", "linear", "ease", "ease-in", "ease-in-out", "ease-out", "step-start", "step-end"]
+
+    if prop == 'all'
+
+      let values = []
+    elseif prop == 'additive-symbols'
+      let values = []
+    elseif prop == 'align-content'
+      let values = ["flex-start", "flex-end", "center", "space-between", "space-around", "stretch"]
+    elseif prop == 'align-items'
+      let values = ["flex-start", "flex-end", "center", "baseline", "stretch"]
+    elseif prop == 'align-self'
+      let values = ["auto", "flex-start", "flex-end", "center", "baseline", "stretch"]
+    elseif prop == 'animation'
+      let values = timing_functions + ["normal", "reverse", "alternate", "alternate-reverse"] + ["none", "forwards", "backwards", "both"] + ["running", "paused"]
+    elseif prop == 'animation-delay'
+      let values = []
+    elseif prop == 'animation-direction'
+      let values = ["normal", "reverse", "alternate", "alternate-reverse"]
+    elseif prop == 'animation-duration'
+      let values = []
+    elseif prop == 'animation-fill-mode'
+      let values = ["none", "forwards", "backwards", "both"]
+    elseif prop == 'animation-iteration-count'
+      let values = []
+    elseif prop == 'animation-name'
+      let values = []
+    elseif prop == 'animation-play-state'
+      let values = ["running", "paused"]
+    elseif prop == 'animation-timing-function'
+      let values = timing_functions
+    elseif prop == 'appearance'
+      let values = ["auto", "none"]
+    elseif prop == 'background-attachment'
+      let values = ["scroll", "fixed"]
+    elseif prop == 'background-color'
+      let values = color_values
+    elseif prop == 'background-image'
+      let values = ["url(", "none"]
+    elseif prop == 'background-position'
+      let vals = matchstr(b:line, '.*:\s*\zs.*')
+      if vals =~ '^\%([a-zA-Z]\+\)\?$'
+        let values = ["top", "center", "bottom"]
+      elseif vals =~ '^[a-zA-Z]\+\s\+\%([a-zA-Z]\+\)\?$'
+        let values = ["left", "center", "right"]
+      else
+        return []
+      endif
+    elseif prop == 'background-repeat'
+      let values = ["repeat", "repeat-x", "repeat-y", "no-repeat"]
+    elseif prop == 'background-size'
+      let values = ["auto", "contain", "cover"]
+    elseif prop == 'background'
+      let values = ["scroll", "fixed"] + color_values + ["url(", "none"] + ["top", "center", "bottom", "left", "right"] + ["repeat", "repeat-x", "repeat-y", "no-repeat"] + ["auto", "contain", "cover"]
+    elseif prop =~ '^border\%(-top\|-right\|-bottom\|-left\|-block-start\|-block-end\)\?$'
+      let vals = matchstr(b:line, '.*:\s*\zs.*')
+      if vals =~ '^\%([a-zA-Z0-9.]\+\)\?$'
+        let values = border_width_values
+      elseif vals =~ '^[a-zA-Z0-9.]\+\s\+\%([a-zA-Z]\+\)\?$'
+        let values = border_style_values
+      elseif vals =~ '^[a-zA-Z0-9.]\+\s\+[a-zA-Z]\+\s\+\%([a-zA-Z(]\+\)\?$'
+        let values = color_values
+      else
+        return []
+      endif
+    elseif prop =~ '^border-\%(top\|right\|bottom\|left\|block-start\|block-end\)-color'
+      let values = color_values
+    elseif prop =~ '^border-\%(top\|right\|bottom\|left\|block-start\|block-end\)-style'
+      let values = border_style_values
+    elseif prop =~ '^border-\%(top\|right\|bottom\|left\|block-start\|block-end\)-width'
+      let values = border_width_values
+    elseif prop == 'border-color'
+      let values = color_values
+    elseif prop == 'border-style'
+      let values = border_style_values
+    elseif prop == 'border-width'
+      let values = border_width_values
+    elseif prop == 'bottom'
+      let values = ["auto"]
+    elseif prop == 'box-decoration-break'
+      let values = ["slice", "clone"]
+    elseif prop == 'box-shadow'
+      let values = ["inset"]
+    elseif prop == 'box-sizing'
+      let values = ["border-box", "content-box"]
+    elseif prop =~ '^break-\%(before\|after\)'
+      let values = ["auto", "always", "avoid", "left", "right", "page", "column", "region", "recto", "verso", "avoid-page", "avoid-column", "avoid-region"]
+    elseif prop == 'break-inside'
+      let values = ["auto", "avoid", "avoid-page", "avoid-column", "avoid-region"]
+    elseif prop == 'caption-side'
+      let values = ["top", "bottom"]
+    elseif prop == 'clear'
+      let values = ["none", "left", "right", "both"]
+    elseif prop == 'clip'
+      let values = ["auto", "rect("]
+    elseif prop == 'clip-path'
+      let values = ["fill-box", "stroke-box", "view-box", "none"]
+    elseif prop == 'color'
+      let values = color_values
+    elseif prop == 'columns'
+      let values = []
+    elseif prop == 'column-count'
+      let values = ['auto']
+    elseif prop == 'column-fill'
+      let values = ['auto', 'balance']
+    elseif prop == 'column-rule-color'
+      let values = color_values
+    elseif prop == 'column-rule-style'
+      let values = border_style_values
+    elseif prop == 'column-rule-width'
+      let values = border_width_values
+    elseif prop == 'column-rule'
+      let vals = matchstr(b:line, '.*:\s*\zs.*')
+      if vals =~ '^\%([a-zA-Z0-9.]\+\)\?$'
+        let values = border_width_values
+      elseif vals =~ '^[a-zA-Z0-9.]\+\s\+\%([a-zA-Z]\+\)\?$'
+        let values = border_style_values
+      elseif vals =~ '^[a-zA-Z0-9.]\+\s\+[a-zA-Z]\+\s\+\%([a-zA-Z(]\+\)\?$'
+        let values = color_values
+      else
+        return []
+      endif
+    elseif prop == 'column-span'
+      let values = ["none", "all"]
+    elseif prop == 'column-width'
+      let values = ["auto"]
+    elseif prop == 'content'
+      let values = ["normal", "attr(", "open-quote", "close-quote", "no-open-quote", "no-close-quote"]
+    elseif prop =~ '^counter-\%(increment\|reset\)$'
+      let values = ["none"]
+    elseif prop =~ '^cue\%(-after\|-before\)\=$'
+      let values = ["url("]
+    elseif prop == 'cursor'
+      let values = ["url(", "auto", "crosshair", "default", "pointer", "move", "e-resize", "ne-resize", "nw-resize", "n-resize", "se-resize", "sw-resize", "s-resize", "w-resize", "text", "wait", "help", "progress"]
+    elseif prop == 'direction'
+      let values = ["ltr", "rtl"]
+    elseif prop == 'display'
+      let values = ["inline", "block", "list-item", "run-in", "inline-block", "table", "table-row-group", "table-header-group", "table-footer-group", "table-row", "table-column-group", "table-column", "table-cell", "table-caption", "none", "flex", "inline-flex", "grid", "inline-grid", "inline-table", "inline-list-item", "ruby", "ruby-base", "ruby-text", "ruby-base-container", "ruby-text-container", "contents"]
+    elseif prop == 'elevation'
+      let values = ["below", "level", "above", "higher", "lower"]
+    elseif prop == 'empty-cells'
+      let values = ["show", "hide"]
+    elseif prop == 'fallback'
+      let values = list_style_type_values
+    elseif prop == 'filter'
+      let values = ["blur(", "brightness(", "contrast(", "drop-shadow(", "grayscale(", "hue-rotate(", "invert(", "opacity(", "sepia(", "saturate("]
+    elseif prop == 'flex-basis'
+      let values = ["auto", "content"]
+    elseif prop == 'flex-direction'
+      let values = ["row", "row-reverse", "column", "column-reverse"]
+    elseif prop == 'flex-flow'
+      let values = ["row", "row-reverse", "column", "column-reverse", "nowrap", "wrap", "wrap-reverse"]
+    elseif prop == 'flex-grow'
+      let values = []
+    elseif prop == 'flex-shrink'
+      let values = []
+    elseif prop == 'flex-wrap'
+      let values = ["nowrap", "wrap", "wrap-reverse"]
+    elseif prop == 'flex'
+      let values = ["nowrap", "wrap", "wrap-reverse"] + ["row", "row-reverse", "column", "column-reverse", "nowrap", "wrap", "wrap-reverse"] + ["auto", "content"]
+    elseif prop == 'float'
+      let values = ["left", "right", "none"]
+    elseif prop == 'font-display'
+      let values = ["auto", "block", "swap", "fallback", "optional"]
+    elseif prop == 'font-family'
+      let values = ["sans-serif", "serif", "monospace", "cursive", "fantasy", "system-ui", "emoji", "math", "fangsong"]
+    elseif prop == 'font-feature-settings'
+      let values = ["normal", '"aalt"', '"abvf"', '"abvm"', '"abvs"', '"afrc"', '"akhn"', '"blwf"', '"blwm"', '"blws"', '"calt"', '"case"', '"ccmp"', '"cfar"', '"cjct"', '"clig"', '"cpct"', '"cpsp"', '"cswh"', '"curs"', '"cv', '"c2pc"', '"c2sc"', '"dist"', '"dlig"', '"dnom"', '"dtls"', '"expt"', '"falt"', '"fin2"', '"fin3"', '"fina"', '"flac"', '"frac"', '"fwid"', '"half"', '"haln"', '"halt"', '"hist"', '"hkna"', '"hlig"', '"hngl"', '"hojo"', '"hwid"', '"init"', '"isol"', '"ital"', '"jalt"', '"jp78"', '"jp83"', '"jp90"', '"jp04"', '"kern"', '"lfbd"', '"liga"', '"ljmo"', '"lnum"', '"locl"', '"ltra"', '"ltrm"', '"mark"', '"med2"', '"medi"', '"mgrk"', '"mkmk"', '"mset"', '"nalt"', '"nlck"', '"nukt"', '"numr"', '"onum"', '"opbd"', '"ordn"', '"ornm"', '"palt"', '"pcap"', '"pkna"', '"pnum"', '"pref"', '"pres"', '"pstf"', '"psts"', '"pwid"', '"qwid"', '"rand"', '"rclt"', '"rkrf"', '"rlig"', '"rphf"', '"rtbd"', '"rtla"', '"rtlm"', '"ruby"', '"salt"', '"sinf"', '"size"', '"smcp"', '"smpl"', '"ss01"', '"ss02"', '"ss03"', '"ss04"', '"ss05"', '"ss06"', '"ss07"', '"ss08"', '"ss09"', '"ss10"', '"ss11"', '"ss12"', '"ss13"', '"ss14"', '"ss15"', '"ss16"', '"ss17"', '"ss18"', '"ss19"', '"ss20"', '"ssty"', '"stch"', '"subs"', '"sups"', '"swsh"', '"titl"', '"tjmo"', '"tnam"', '"tnum"', '"trad"', '"twid"', '"unic"', '"valt"', '"vatu"', '"vert"', '"vhal"', '"vjmo"', '"vkna"', '"vkrn"', '"vpal"', '"vrt2"', '"zero"']
+    elseif prop == 'font-kerning'
+      let values = ["auto", "normal", "none"]
+    elseif prop == 'font-language-override'
+      let values = ["normal"]
+    elseif prop == 'font-size'
+      let values = ["xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large", "larger", "smaller"]
+    elseif prop == 'font-size-adjust'
+      let values = []
+    elseif prop == 'font-stretch'
+      let values = ["normal", "ultra-condensed", "extra-condensed", "condensed", "semi-condensed", "semi-expanded", "expanded", "extra-expanded", "ultra-expanded"]
+    elseif prop == 'font-style'
+      let values = ["normal", "italic", "oblique"]
+    elseif prop == 'font-synthesis'
+      let values = ["none", "weight", "style"]
+    elseif prop == 'font-variant-alternates'
+      let values = ["normal", "historical-forms", "stylistic(", "styleset(", "character-variant(", "swash(", "ornaments(", "annotation("]
+    elseif prop == 'font-variant-caps'
+      let values = ["normal", "small-caps", "all-small-caps", "petite-caps", "all-petite-caps", "unicase", "titling-caps"]
+    elseif prop == 'font-variant-asian'
+      let values = ["normal", "ruby", "jis78", "jis83", "jis90", "jis04", "simplified", "traditional"]
+    elseif prop == 'font-variant-ligatures'
+      let values = ["normal", "none", "common-ligatures", "no-common-ligatures", "discretionary-ligatures", "no-discretionary-ligatures", "historical-ligatures", "no-historical-ligatures", "contextual", "no-contextual"]
+    elseif prop == 'font-variant-numeric'
+      let values = ["normal", "ordinal", "slashed-zero", "lining-nums", "oldstyle-nums", "proportional-nums", "tabular-nums", "diagonal-fractions", "stacked-fractions"]
+    elseif prop == 'font-variant-position'
+      let values = ["normal", "sub", "super"]
+    elseif prop == 'font-variant'
+      let values = ["normal", "historical-forms", "stylistic(", "styleset(", "character-variant(", "swash(", "ornaments(", "annotation("] + ["small-caps", "all-small-caps", "petite-caps", "all-petite-caps", "unicase", "titling-caps"] + ["ruby", "jis78", "jis83", "jis90", "jis04", "simplified", "traditional"] + ["none", "common-ligatures", "no-common-ligatures", "discretionary-ligatures", "no-discretionary-ligatures", "historical-ligatures", "no-historical-ligatures", "contextual", "no-contextual"] + ["ordinal", "slashed-zero", "lining-nums", "oldstyle-nums", "proportional-nums", "tabular-nums", "diagonal-fractions", "stacked-fractions"] + ["sub", "super"]
+    elseif prop == 'font-weight'
+      let values = ["normal", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900"]
+    elseif prop == 'font'
+      let values = ["normal", "italic", "oblique", "small-caps", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900", "xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large", "larger", "smaller", "sans-serif", "serif", "monospace", "system-ui", "emoji", "math", "fangsong", "cursive", "fantasy", "caption", "icon", "menu", "message-box", "small-caption", "status-bar"]
+    elseif prop =~ '^\%(height\|width\)$'
+      let values = ["auto", "border-box", "content-box", "max-content", "min-content", "available", "fit-content"]
+    elseif prop =~ '^\%(left\|rigth\)$'
+      let values = ["auto"]
+    elseif prop == 'image-rendering'
+      let values = ["auto", "crisp-edges", "pixelated"]
+    elseif prop == 'image-orientation'
+      let values = ["from-image", "flip"]
+    elseif prop == 'ime-mode'
+      let values = ["auto", "normal", "active", "inactive", "disabled"]
+    elseif prop == 'inline-size'
+      let values = ["auto", "border-box", "content-box", "max-content", "min-content", "available", "fit-content"]
+    elseif prop == 'isolation'
+      let values = ["auto", "isolate"]
+    elseif prop == 'justify-content'
+      let values = ["flex-start", "flex-end", "center", "space-between", "space-around"]
+    elseif prop == 'letter-spacing'
+      let values = ["normal"]
+    elseif prop == 'line-break'
+      let values = ["auto", "loose", "normal", "strict"]
+    elseif prop == 'line-height'
+      let values = ["normal"]
+    elseif prop == 'list-style-image'
+      let values = ["url(", "none"]
+    elseif prop == 'list-style-position'
+      let values = ["inside", "outside"]
+    elseif prop == 'list-style-type'
+      let values = list_style_type_values
+    elseif prop == 'list-style'
+      let values = list_style_type_values + ["inside", "outside"] + ["url(", "none"]
+    elseif prop == 'margin'
+      let values = ["auto"]
+    elseif prop =~ '^margin-\%(right\|left\|top\|bottom\|block-start\|block-end\|inline-start\|inline-end\)$'
+      let values = ["auto"]
+    elseif prop == 'marks'
+      let values = ["crop", "cross", "none"]
+    elseif prop == 'mask'
+      let values = ["url("]
+    elseif prop == 'mask-type'
+      let values = ["luminance", "alpha"]
+    elseif prop == '\%(max\|min\)-\%(block\|inline\)-size'
+      let values = ["auto", "border-box", "content-box", "max-content", "min-content", "available", "fit-content"]
+    elseif prop == '\%(max\|min\)-\%(height\|width\)'
+      let values = ["auto", "border-box", "content-box", "max-content", "min-content", "available", "fit-content"]
+    elseif prop == '\%(max\|min\)-zoom'
+      let values = ["auto"]
+    elseif prop == 'mix-blend-mode'
+      let values = ["normal", "multiply", "screen", "overlay", "darken", "lighten", "color-dodge", "color-burn", "hard-light", "soft-light", "difference", "exclusion", "hue", "saturation", "color", "luminosity"]
+    elseif prop == 'object-fit'
+      let values = ['fill', 'contain', 'cover', 'scale-down']
+    elseif prop == 'opacity'
+      let values = []
+    elseif prop == 'orientation'
+      let values = ["auto", "portrait", "landscape"]
+    elseif prop == 'orphans'
+      let values = []
+    elseif prop == 'outline-offset'
+      let values = []
+    elseif prop == 'outline-color'
+      let values = color_values
+    elseif prop == 'outline-style'
+      let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
+    elseif prop == 'outline-width'
+      let values = ["thin", "thick", "medium"]
+    elseif prop == 'outline'
+      let vals = matchstr(b:line, '.*:\s*\zs.*')
+      if vals =~ '^\%([a-zA-Z0-9,()#]\+\)\?$'
+        let values = color_values
+      elseif vals =~ '^[a-zA-Z0-9,()#]\+\s\+\%([a-zA-Z]\+\)\?$'
+        let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
+      elseif vals =~ '^[a-zA-Z0-9,()#]\+\s\+[a-zA-Z]\+\s\+\%([a-zA-Z(]\+\)\?$'
+        let values = ["thin", "thick", "medium"]
+      else
+        return []
+      endif
+    elseif prop == 'overflow-wrap'
+      let values = ["normal", "break-word"]
+    elseif prop =~ '^overflow\%(-x\|-y\)\='
+      let values = ["visible", "hidden", "scroll", "auto"]
+    elseif prop == 'pad'
+      let values = []
+    elseif prop == 'padding'
+      let values = []
+    elseif prop =~ '^padding-\%(top\|right\|bottom\|left\|inline-start\|inline-end\|block-start\|block-end\)$'
+      let values = []
+    elseif prop =~ '^page-break-\%(after\|before\)$'
+      let values = ["auto", "always", "avoid", "left", "right", "recto", "verso"]
+    elseif prop == 'page-break-inside'
+      let values = ["auto", "avoid"]
+    elseif prop =~ '^pause\%(-after\|-before\)\=$'
+      let values = ["none", "x-weak", "weak", "medium", "strong", "x-strong"]
+    elseif prop == 'perspective'
+      let values = ["none"]
+    elseif prop == 'perspective-origin'
+      let values = ["top", "bottom", "left", "center", " right"]
+    elseif prop == 'pointer-events'
+      let values = ["auto", "none", "visiblePainted", "visibleFill", "visibleStroke", "visible", "painted", "fill", "stroke", "all"]
+    elseif prop == 'position'
+      let values = ["static", "relative", "absolute", "fixed", "sticky"]
+    elseif prop == 'prefix'
+      let values = []
+    elseif prop == 'quotes'
+      let values = ["none"]
+    elseif prop == 'range'
+      let values = ["auto", "infinite"]
+    elseif prop == 'resize'
+      let values = ["none", "both", "horizontal", "vertical"]
+    elseif prop =~ '^rest\%(-after\|-before\)\=$'
+      let values = ["none", "x-weak", "weak", "medium", "strong", "x-strong"]
+    elseif prop == 'ruby-align'
+      let values = ["start", "center", "space-between", "space-around"]
+    elseif prop == 'ruby-merge'
+      let values = ["separate", "collapse", "auto"]
+    elseif prop == 'ruby-position'
+      let values = ["over", "under", "inter-character"]
+    elseif prop == 'scroll-behavior'
+      let values = ["auto", "smooth"]
+    elseif prop == 'scroll-snap-coordinate'
+      let values = ["none"]
+    elseif prop == 'scroll-snap-destination'
+      return []
+    elseif prop == 'scroll-snap-points-\%(x\|y\)$'
+      let values = ["none", "repeat("]
+    elseif prop == 'scroll-snap-type\%(-x\|-y\)\=$'
+      let values = ["none", "mandatory", "proximity"]
+    elseif prop == 'shape-image-threshold'
+      let values = []
+    elseif prop == 'shape-margin'
+      let values = []
+    elseif prop == 'shape-outside'
+      let values = ["margin-box", "border-box", "padding-box", "content-box", 'inset(', 'circle(', 'ellipse(', 'polygon(', 'url(']
+    elseif prop == 'speak'
+      let values = ["auto", "none", "normal"]
+    elseif prop == 'speak-as'
+      let values = ["auto", "normal", "spell-out", "digits"]
+    elseif prop == 'src'
+      let values = ["url("]
+    elseif prop == 'suffix'
+      let values = []
+    elseif prop == 'symbols'
+      let values = []
+    elseif prop == 'system'
+      let vals = matchstr(b:line, '.*:\s*\zs.*')
+      if vals =~ '^extends'
+        let values = list_style_type_values
+      else
+        let values = ["cyclic", "numeric", "alphabetic", "symbolic", "additive", "fixed", "extends"]
+      endif
+    elseif prop == 'table-layout'
+      let values = ["auto", "fixed"]
+    elseif prop == 'tab-size'
+      let values = []
+    elseif prop == 'text-align'
+      let values = ["start", "end", "left", "right", "center", "justify", "match-parent"]
+    elseif prop == 'text-align-last'
+      let values = ["auto", "start", "end", "left", "right", "center", "justify"]
+    elseif prop == 'text-combine-upright'
+      let values = ["none", "all", "digits"]
+    elseif prop == 'text-decoration-line'
+      let values = ["none", "underline", "overline", "line-through", "blink"]
+    elseif prop == 'text-decoration-color'
+      let values = color_values
+    elseif prop == 'text-decoration-style'
+      let values = ["solid", "double", "dotted", "dashed", "wavy"]
+    elseif prop == 'text-decoration'
+      let values = ["none", "underline", "overline", "line-through", "blink"] + ["solid", "double", "dotted", "dashed", "wavy"] + color_values
+    elseif prop == 'text-emphasis-color'
+      let values = color_values
+    elseif prop == 'text-emphasis-position'
+      let values = ["over", "under", "left", "right"]
+    elseif prop == 'text-emphasis-style'
+      let values = ["none", "filled", "open", "dot", "circle", "double-circle", "triangle", "sesame"]
+    elseif prop == 'text-emphasis'
+      let values = color_values + ["over", "under", "left", "right"] + ["none", "filled", "open", "dot", "circle", "double-circle", "triangle", "sesame"]
+    elseif prop == 'text-indent'
+      let values = ["hanging", "each-line"]
+    elseif prop == 'text-orientation'
+      let values = ["mixed", "upright", "sideways", "sideways-right", "use-glyph-orientation"]
+    elseif prop == 'text-overflow'
+      let values = ["clip", "ellipsis", "fade", "fade("]
+    elseif prop == 'text-rendering'
+      let values = ["auto", "optimizeSpeed", "optimizeLegibility", "geometricPrecision"]
+    elseif prop == 'text-shadow'
+      let values = color_values
+    elseif prop == 'text-transform'
+      let values = ["capitalize", "uppercase", "lowercase", "full-width", "none"]
+    elseif prop == 'text-underline-position'
+      let values = ["auto", "under", "left", "right"]
+    elseif prop == 'touch-action'
+      let values = ["auto", "none", "pan-x", "pan-y", "manipulation", "pan-left", "pan-right", "pan-top", "pan-down"]
+    elseif prop == 'transform'
+      let values = ["matrix(", "translate(", "translateX(", "translateY(", "scale(", "scaleX(", "scaleY(", "rotate(", "skew(", "skewX(", "skewY(", "matrix3d(", "translate3d(", "translateZ(", "scale3d(", "scaleZ(", "rotate3d(", "rotateX(", "rotateY(", "rotateZ(", "perspective("]
+    elseif prop == 'transform-box'
+      let values = ["border-box", "fill-box", "view-box"]
+    elseif prop == 'transform-origin'
+      let values = ["left", "center", "right", "top", "bottom"]
+    elseif prop == 'transform-style'
+      let values = ["flat", "preserve-3d"]
+    elseif prop == 'top'
+      let values = ["auto"]
+    elseif prop == 'transition-property'
+      let values = ["all", "none"] + g:css_animatable_props
+    elseif prop == 'transition-duration'
+      let values = []
+    elseif prop == 'transition-delay'
+      let values = []
+    elseif prop == 'transition-timing-function'
+      let values = timing_functions
+    elseif prop == 'transition'
+      let values = ["all", "none"] + g:css_animatable_props + timing_functions
+    elseif prop == 'unicode-bidi'
+      let values = ["normal", "embed", "isolate", "bidi-override", "isolate-override", "plaintext"]
+    elseif prop == 'unicode-range'
+      let values = ["U+"]
+    elseif prop == 'user-select'
+      let values = ["auto", "text", "none", "contain", "all"]
+    elseif prop == 'user-zoom'
+      let values = ["zoom", "fixed"]
+    elseif prop == 'vertical-align'
+      let values = ["baseline", "sub", "super", "top", "text-top", "middle", "bottom", "text-bottom"]
+    elseif prop == 'visibility'
+      let values = ["visible", "hidden", "collapse"]
+    elseif prop == 'voice-volume'
+      let values = ["silent", "x-soft", "soft", "medium", "loud", "x-loud"]
+    elseif prop == 'voice-balance'
+      let values = ["left", "center", "right", "leftwards", "rightwards"]
+    elseif prop == 'voice-family'
+      let values = []
+    elseif prop == 'voice-rate'
+      let values = ["normal", "x-slow", "slow", "medium", "fast", "x-fast"]
+    elseif prop == 'voice-pitch'
+      let values = ["absolute", "x-low", "low", "medium", "high", "x-high"]
+    elseif prop == 'voice-range'
+      let values = ["absolute", "x-low", "low", "medium", "high", "x-high"]
+    elseif prop == 'voice-stress'
+      let values = ["normal", "strong", "moderate", "none", "reduced "]
+    elseif prop == 'voice-duration'
+      let values = ["auto"]
+    elseif prop == 'white-space'
+      let values = ["normal", "pre", "nowrap", "pre-wrap", "pre-line"]
+    elseif prop == 'widows'
+      let values = []
+    elseif prop == 'will-change'
+      let values = ["auto", "scroll-position", "contents"] + s:values
+    elseif prop == 'word-break'
+      let values = ["normal", "break-all", "keep-all"]
+    elseif prop == 'word-spacing'
+      let values = ["normal"]
+    elseif prop == 'word-wrap'
+      let values = ["normal", "break-word"]
+    elseif prop == 'writing-mode'
+      let values = ["horizontal-tb", "vertical-rl", "vertical-lr", "sideways-rl", "sideways-lr"]
+    elseif prop == 'z-index'
+      let values = ["auto"]
+    elseif prop == 'zoom'
+      let values = ["auto"]
+    else
+      let values = wide_keywords
+    endif
+
+    let values = values + wide_keywords
+
+    for m in values
+      if m =~ '^' . a:base
+        call add(res, m)
+      endif
+    endfor
+    return res
+
+  " Complete @-rules
+
+  elseif b:start =~ '\w' && b:word_break == 1 && b:first_word_type == 'stylusAtRuleMedia'
+
+    let values = ["min-width", "min-height", "max-width", "max-height"]
+
+    let res = []
+
+    for m in values
+      if m =~ '^' . a:base
+        call add(res, m . ': ')
+      endif
+    endfor
+
+    return res
+
+  elseif b:start == '@'
+
+    let values = ["@media", "@import", "@extend", "@block", "@charset", "@page", "@font-face", "@namespace", "@supports", "@keyframes", "@viewport", "@document", "@css"]
+
+    let res = []
+
+    for m in values
+      if m =~ '^' . a:base
+        call add(res, m .' ')
+      endif
+    endfor
+
+    return res
+
+  endif
+
+  return []
+
+endfun
diff --git a/ftplugin/stylus.vim b/ftplugin/stylus.vim
index 9d859939f..d0b49d369 100644
--- a/ftplugin/stylus.vim
+++ b/ftplugin/stylus.vim
@@ -4,8 +4,8 @@ endif
 
 " Vim filetype plugin
 " Language: Stylus
-" Maintainer: Marc Harter
-" Credits: Tim Pope
+" Maintainer: Ilia Loginov
+" Credits: Marc Harter, Tim Pope
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -47,14 +47,14 @@ if exists("loaded_matchit")
   let b:match_words = s:match_words
 endif
 
-setlocal comments= commentstring=//\ %s
-
 setlocal suffixesadd=.styl
 
 " Add '-' and '#' to the what makes up a keyword.
 " This means that 'e' and 'w' work properly now, for properties
 " and valid variable names.
-setl iskeyword+=#,-
+setlocal iskeyword+=#,-
+
+setlocal omnifunc=stylcomplete#CompleteStyl
 
 let b:undo_ftplugin = "setl cms< com< "
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
diff --git a/indent/stylus.vim b/indent/stylus.vim
index 9f506e2f1..eeb3fa0df 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -4,21 +4,21 @@ endif
 
 " Vim indent file
 " Language: Stylus
-" Maintainer: Marc Harter
-" Last Change: 2010 May 21
+" Maintainer: Ilia Loginov
+" Last Change: 2018 Jan 19
 " Based On: sass.vim from Tim Pope
-"
+
 if exists("b:did_indent")
   finish
 endif
-unlet! b:did_indent
 let b:did_indent = 1
 
 setlocal indentexpr=GetStylusIndent()
-setlocal indentkeys=o,O,*<Return>,},],0),!^F
+setlocal autoindent nolisp nosmartindent
+setlocal indentkeys=o,O,*<Return>,0),!^F
 setlocal formatoptions+=r
 
-if exists("*GetStylusIndent")  " only define once
+if exists('*GetStylusIndent')
   finish
 endif
 
@@ -43,45 +43,7 @@ function s:prevnonblanknoncomment(lnum)
   return lnum
 endfunction
 
-function s:count_braces(lnum, count_open)
-  let n_open = 0
-  let n_close = 0
-  let line = getline(a:lnum)
-  let pattern = '[{}]'
-  let i = match(line, pattern)
-  while i != -1
-    if synIDattr(synID(a:lnum, i + 1, 0), 'name') !~ 'css\%(Comment\|StringQ\{1,2}\)'
-      if line[i] == '{'
-        let n_open += 1
-      elseif line[i] == '}'
-        if n_open > 0
-          let n_open -= 1
-        else
-          let n_close += 1
-        endif
-      endif
-    endif
-    let i = match(line, pattern, i + 1)
-  endwhile
-  return a:count_open ? n_open : n_close
-endfunction
-
-" function CheckCSSIndent()
-"   let line = getline(v:lnum)
-"   if line =~ '^\s*\*'
-"     return cindent(v:lnum)
-"   endif
-" 
-"   let pnum = s:prevnonblanknoncomment(v:lnum - 1)
-"   if pnum == 0
-"     return 0
-"   endif
-" 
-"   return indent(pnum) + s:count_braces(pnum, 1) * &sw
-"         \ - s:count_braces(v:lnum, 0) * &sw
-" endfunction
-
-function! GetStylusIndent()
+function GetStylusIndent()
   let line = getline(v:lnum)
   if line =~ '^\s*\*'
     return cindent(v:lnum)
@@ -92,42 +54,41 @@ function! GetStylusIndent()
     return 0
   endif
 
-  let lnum     = prevnonblank(v:lnum-1)
+  let lnum = prevnonblank(v:lnum-1)
   if lnum == 0
     return 0
   endif
 
   let pline = getline(pnum)
 
-  if pline =~ '[}{]'
-    return indent(pnum) + s:count_braces(pnum, 1) * &sw - s:count_braces(v:lnum, 0) * &sw
-  endif
-
-  let line     = substitute(getline(lnum),'[\s()]\+$','','')  " get last line strip ending whitespace
-  let cline    = substitute(substitute(getline(v:lnum),'\s\+$','',''),'^\s\+','','')  " get current line, trimmed
-  let lastcol  = strlen(line)  " get last col in prev line
-  let line     = substitute(line,'^\s\+','','')  " then remove preceeding whitespace
-  let indent   = indent(lnum)  " get indent on prev line
-  let cindent  = indent(v:lnum)  " get indent on current line
-  let increase = indent + &sw  " increase indent by the shift width
+  " Get last line strip ending whitespace
+  let line = substitute(getline(lnum),'[\s()]\+$','','')
+  " Get current line, trimmed
+  let cline    = substitute(substitute(getline(v:lnum),'\s\+$','',''),'^\s\+','','')
+  " Get last col in prev line
+  let lastcol  = strlen(line)
+  " Then remove preceeding whitespace
+  let line     = substitute(line,'^\s\+','','')
+  " Get indent on prev line
+  let indent   = indent(lnum)
+  " Get indent on current line
+  let cindent  = indent(v:lnum)
+  " Increase indent by the shift width
+  let increase = indent + &sw
   if indent   == indent(lnum)
     let indent = cindent <= indent ? indent : increase
   endif
 
-  let group = synIDattr(synID(lnum,lastcol,1),'name')
+  let group = synIDattr(synID(lnum, cindent + 1, 1), 'name')
 
-  " for debugging only
-  echo group
-
-  " if group !~? 'css.*' && line =~? ')\s*$' " match user functions
-  "   return increase
-  if group =~? '\v^%(cssTagName|cssClassName|cssIdentifier|cssSelectorOp|cssSelectorOp2|cssBraces|cssAttributeSelector|cssPseudo|stylusId|stylusClass)$'
+  if group =~ 'stylusSelector\w*'
+    return increase
+  elseif group =~ 'stylusAtRule\(Viewport\|Page\|Supports\|Document\|Font\|Keyframes\)\w*'
     return increase
-  elseif (group == 'stylusUserFunction') && (indent(lnum) == '0') " mixin definition
+  " Mixin or function definition
+  elseif group =~ 'stylusFunction\w*' && indent(lnum) == 0
     return increase
   else
     return indent
   endif
 endfunction
-
-" vim:set sw=2;
diff --git a/packages.yaml b/packages.yaml
index a4dc47171..9f3074466 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1563,7 +1563,7 @@ filetypes:
   - sol
 ---
 name: stylus
-remote: wavded/vim-stylus
+remote: iloginow/vim-stylus
 filetypes:
 - name: stylus
   linguist: Stylus
diff --git a/syntax/stylus.vim b/syntax/stylus.vim
index 9b3008af1..d66a60379 100644
--- a/syntax/stylus.vim
+++ b/syntax/stylus.vim
@@ -3,378 +3,882 @@ if has_key(g:polyglot_is_disabled, 'stylus')
 endif
 
 " Vim syntax file
-" Language:	CSS3
-" Maintainer:	Hsiaoming Yang <lepture@me.com>
-" URL: http://lepture.me/work/css3/
-" Created:	Dec 14, 2011
-" Modified:	Sep 4, 2012
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
+" Language:	Stylus
+" Author:	Ilia Loginov <iloginow@outlook.com>
+" Created:	Jan 5, 2018
+
 if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
+  if exists("b:current_syntax")
     finish
   endif
-  let main_syntax = 'css'
+  let main_syntax = 'stylus'
 endif
 
-syn case ignore
-syn region cssString start='"' end='"' contained
-syn region cssString start="'" end="'" contained
-
-" HTML4 tags
-syn keyword cssTagName abbr acronym address applet area base a b
-syn keyword cssTagName basefont bdo big blockquote body button br
-syn keyword cssTagName caption cite code col colgroup dd del
-syn keyword cssTagName dfn dir div dl dt em fieldset form frame
-syn keyword cssTagName frameset h1 h2 h3 h4 h5 h6 head hr html img i
-syn keyword cssTagName iframe img input ins isindex kbd label legend li
-syn keyword cssTagName link map menu meta noframes noscript ol optgroup
-syn keyword cssTagName option p param pre q s samp script select
-syn keyword cssTagName span strike strong style sub sup tbody td
-syn keyword cssTagName textarea tfoot th thead title tr tt ul u var
-syn match cssTagName "\*"
-syn match cssTagName /\<table\>/
-syn match cssTagName /\<small\>/
-syn match cssTagName /\<center\>/
-" HTML5 tags
-syn keyword cssTagName article aside audio bb canvas command datagrid
-syn keyword cssTagName datalist details dialog embed figure footer figcaption
-syn keyword cssTagName header hgroup keygen mark meter nav output
-syn keyword cssTagName progress time rt rp section time video
-syn match cssTagName /\<ruby\>/
-" class select
-syn match cssSelector /\.[A-Za-z][A-Za-z0-9_-]\+/
-" id select
-syn match cssSelector /#[A-Za-z][A-Za-z0-9_-]\+/
-syn region cssSelector start='\[' end='\]' contains=cssString
-
-syn region cssDefineBlock start="{" end="}" transparent contains=TOP
-
-syn keyword cssCommonVal inherit initial auto both normal hidden none medium contained
-
-
-" Comment
-syn keyword cssTodo FIXME TODO contained
-syn region cssComment start="/\*" end="\*/" contains=cssTodo
-syn match cssImportant "!\s*important\>" contained
-
-syn match cssValueInteger "[-+]\=\d\+" contained
-syn match cssValueNumber "[-+]\=\d\+\(\.\d*\)\="
-syn match cssValueLength "[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|vh\|vw\|vm\|fr\|gr\)" contained
-syn match cssValueAngle "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\|turn\)" contained
-syn match cssValueTime "+\=\d\+\(\.\d*\)\=\(ms\|s\)" contained
-syn match cssValueFrequency "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)" contained
-
-
-" Properties http://www.w3.org/community/webed/wiki/CSS/Properties
-" background http://www.w3.org/TR/css3-background/
-syn match cssBackgroundProp /\(background-\(color\|image\|repeat\|attachment\|position\)\|background\)/ contained
-syn match cssBackgroundProp /background-\(origin\|\(repeat\|position\)-[xy]\|clip\|size\)/ contained
-syn match cssBackgroundProp /object-\(fit\|position\)/ contained
-" http://www.evotech.net/blog/2010/02/css3-properties-values-browser-support/
-syn keyword cssBackgroundVal tb lr rl snap cover contain widthLength heightLength contained
-syn match cssBackgroundVal /\(scale-down\|from-image\)/ contained
-syn match cssBackgroundVal /repeat-[xy]/ contained
-syn match cssBackgroundVal /no-repeat/ contained
-syn keyword cssBackgroundVal circle ellipse to at contained
-syn match cssBackgroundVal /\(closest\|farthest\)-\(side\|corner\)/ contained
-
-syn region cssFuncVal start="\(url\|calc\|min\|max\|counter\|cycle(\)" end=")" oneline contained contains=cssString,cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency
-syn region cssFuncVal start="\(linear\|radial\|repeating-linear\|repeating-radial\)-gradient(" end=")" oneline contained contains=cssString,cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency,cssVisualProp,cssColorVal
-
-syn match cssBorderProp /\(border-\(color\|style\|width\|radius\)\|border\)/ contained
-syn match cssBorderProp /border-\(image-\(source\|slice\|width\|outset\|repeat\)\|image\)/ contained
-syn match cssBorderProp /border-\(\(top\|right\|bottom\|left\)-\(color\|style\|width\)\|\(top\|right\|bottom\|left\)\)/ contained
-syn match cssBorderProp /border-\(top\|bottom\)-\(left\|right\)-radius/ contained
-syn keyword cssBorderVal dotted dashed solid double groove ridge inset outset contained
-syn match cssBorderVal /\<collapse\>/ contained
-syn match cssBorderVal /\<separate\>/ contained
-syn match cssBorderVal /\<fill\>/ contained
-
-" Font
-syn match cssFontProp /\(font-\(family\|style\|variant\|weight\|size-adjust\|size\|stretch\)\|font\)/ contained
-syn match cssFontVal /\(sans-serif\|small-caps\)/ contained
-syn match cssFontVal /\<x\{1,2\}-\(large\|small\)\>/ contained
-syn keyword cssFontVal cursive fantasy monospace italic oblique serif contained
-syn keyword cssFontVal bold bolder lighter larger smaller contained
-syn keyword cssFontVal icon narrower wider contained
-
-" Color
-syn match cssColorVal /transparent/ contained
-syn match cssColorVal "#[0-9A-Fa-f]\{3\}\>" contained
-syn match cssColorVal "#[0-9A-Fa-f]\{6\}\>" contained
-syn match cssFuncVal /rgb(\(\d\{1,3\}\s*,\s*\)\{2\}\d\{1,3\})/ contained contains=cssString,cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency
-syn match cssFuncVal /rgba(\(\d\{1,3\}\s*,\s*\)\{3\}\(1\|0\(\.\d\+\)\?\))/ contained contains=cssString,cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency
-syn match cssFuncVal /hsl(\d\{1,3\}\s*,\s*\(100\|\d\{1,2\}\(\.\d\+\)\?\)%\s*,\s*\(100\|\d\{1,2\}\(\.\d\+\)\?\)%)/ contained contains=cssString,cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency
-syn match cssFuncVal /hsla(\d\{1,3\}\s*,\s*\(\(100\|\d\{1,2\}\(\.\d\+\)\?\)%\s*,\s*\)\{2\}\(1\|0\(\.\d\+\)\?\))/ contained contains=cssString,cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency
-syn keyword cssColorVal aliceblue antiquewhite aqua aquamarine azure contained
-syn keyword cssColorVal beige bisque black blanchedalmond blue blueviolet brown burlywood contained
-syn keyword cssColorVal cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan contained
-syn match cssColorVal /dark\(blue\|cyan\|goldenrod\|gray\|green\|grey\|khaki\)/ contained
-syn match cssColorVal /dark\(magenta\|olivegreen\|orange\|orchid\|red\|salmon\|seagreen\)/ contained
-syn match cssColorVal /darkslate\(blue\|gray\|grey\)/ contained
-syn match cssColorVal /dark\(turquoise\|violet\)/ contained
-syn keyword cssColorVal deeppink deepskyblue dimgray dimgrey dodgerblue firebrick contained
-syn keyword cssColorVal floralwhite forestgreen fuchsia gainsboro ghostwhite gold contained
-syn keyword cssColorVal goldenrod gray green greenyellow grey honeydew hotpink contained
-syn keyword cssColorVal indianred indigo ivory khaki lavender lavenderblush lawngreen contained
-syn keyword cssColorVal lemonchiffon lime limegreen linen magenta maroon contained
-syn match cssColorVal /light\(blue\|coral\|cyan\|goldenrodyellow\|gray\|green\)/ contained
-syn match cssColorVal /light\(grey\|pink\|salmon\|seagreen\|skyblue\|yellow\)/ contained
-syn match cssColorVal /light\(slategray\|slategrey\|steelblue\)/ contained
-syn match cssColorVal /medium\(aquamarine\|blue\|orchid\|purple\|seagreen\)/ contained
-syn match cssColorVal /medium\(slateblue\|springgreen\|turquoise\|violetred\)/ contained
-syn keyword cssColorVal midnightblue mintcream mistyrose moccasin navajowhite contained
-syn keyword cssColorVal navy oldlace olive olivedrab orange orangered orchid contained
-syn match cssColorVal /pale\(goldenrod\|green\|turquoise\|violetred\)/ contained
-syn keyword cssColorVal papayawhip peachpuff peru pink plum powderblue purple contained
-syn keyword cssColorVal red rosybrown royalblue saddlebrown salmon sandybrown contained
-syn keyword cssColorVal seagreen seashell sienna silver skyblue slateblue contained
-syn keyword cssColorVal slategray slategrey snow springgreen steelblue tan contained
-syn keyword cssColorVal teal thistle tomato turquoise violet wheat contained
-syn keyword cssColorVal whitesmoke yellow yellowgreen contained
-syn match cssColorVal "\<white\>" contained
-syn keyword cssColorProp color opaticy contained
-syn match cssColorProp /color-profile/ contained
-
-" Box
-syn match cssBoxProp /\(\(margin\|padding\)-\(top\|right\|bottom\|left\)\|\(margin\|padding\)\)/ contained
-syn match cssBoxProp /\(min\|max\)-\(width\|height\)/ contained
-syn match cssBoxProp /box-\(align\|decoration-break\|direction\|flex-group\|flex\|lines\)/ contained
-syn match cssBoxProp /box-\(ordinal-group\|orient\|pack\|shadow\|sizing\)/ contained
-syn match cssBoxProp /\(outline-\(color\|offset\|style\|width\)\|outline\)/ contained
-syn keyword cssBoxProp width height contained
-
-" Text
-syn match cssTextProp /text-\(align-last\|align\|decoration\|emphasis\|height\|indent\|justify\|outline\|shadow\|transform\|wrap\|overflow\)\|text/ contained
-syn match cssTextProp /\(line-stacking-\(ruby\|shift\|strategy\)\|line-stacking\|line-height\)/ contained
-syn match cssTextProp /vertical-align/ contained
-syn match cssTextProp /letter-spacing/ contained
-syn match cssTextProp /user-select/ contained
-syn match cssTextProp /white-\(space-collapse\|space\)/ contained
-syn match cssTextProp /word-\(break\|spacing\|wrap\)/ contained
-syn match cssTextProp "\<word-wrap\>" contained
-syn match cssTextVal "\<break-word\>" contained
-syn match cssTextVal "\<break-all\>" contained
-syn match cssTextVal "\<line-through\>" contained
-syn match cssTextVal /text-\(top\|bottom\)/ contained
-syn keyword cssTextVal uppercase lowercase ellipsis middle contained
-
-" List
-syn match cssListProp /\(list-style-\(type\|image\|position\)\|list-style\)/ contained
-syn keyword cssListVal armenian circle disc georgian hebrew square contained
-syn match cssListVal /cjk-ideographic/ contained
-syn match cssListVal /\(decimal-leading-zero\|decimal\)/ contained
-syn match cssListVal /\(\(hiragana\|katakana\)-iroha\|\(hiragana\|katakana\)\)/ contained
-syn match cssListVal /\(lower\|upper\)-\(alpha\|latin\|roman\)/ contained
-syn match cssListVal /lower-greek/ contained
-
-" Visual formatting
-syn keyword cssVisualProp display position top right bottom left float clear clip contained
-syn keyword cssVisualProp zoom visibility cursor direction outline resize contained
-syn keyword cssVisualProp opacity contained
-syn match cssVisualProp /z-index/ contained
-syn match cssVisualProp /\(overflow-\(style\|[xy]\)\|overflow\)/ contained
-syn keyword cssVisualVal inline block compact contained
-syn match cssVisualVal '\<table\>' contained
-syn match cssVisualVal /\(inline-\(block\|table\)\|list-item\|run-in\)/ contained
-syn match cssVisualVal /table-\(row-group\|header-group\|footer-group\|row\|column-group\|column\|cell\|caption\)/ contained
-syn match cssVisualVal /\<ruby\>-\(base-group\|text-group\|base\|text\)/  contained
-syn keyword cssVisualVal static relative absolute fixed contained
-syn keyword cssVisualVal ltr rtl embed bidi-override pre nowrap contained
-syn keyword cssVisualVal crosshair help move pointer progress wait contained
-syn keyword cssVisualVal e-resize n-resize ne-resize nw-resize s-resize se-resize sw-resize w-resize contained
-
-" Table
-syn match cssTableProp /border-\(collapse\|spacing\)/ contained
-syn match cssTableProp /\(table-layout\|caption-side\|empty-cells\)/ contained
-
-" Generated content
-syn match cssCommonProp /counter-\(reset\|increment\)/ contained
-syn keyword cssCommonProp content quotes contained
-
-" Print
-syn match cssPrintProp /break-\(before\|after\|inside\)/
-syn match cssPrintProp /\(page-break-\(before\|after\|inside\)\|page-policy\)/
-syn keyword cssPrintProp orphans windows
-
-" special keywords
-syn match cssSpecialProp /-\(webkit\|moz\|ms\|o\)-/
-syn match cssRuleProp /@\(media\|font-face\|charset\|import\|page\|namespace\)/
-" http://www.w3.org/TR/selectors/
-syn match cssPseudo /:\(link\|visited\|active\|hover\|focus\|before\|after\)/
-syn match cssPseudo /:\(target\|lang\|enabled\|disabled\|checked\|indeterminate\)/
-syn match cssPseudo /:\(root\|\(first\|last\|only\)-\(child\|of-type\)\|empty\)/
-syn match cssPseudo /:\(nth-last-\|nth-\)\(child\|of-type\)(\<\S\+\>)/
-syn match cssPseudo /:not(\<\S*\>)/
-syn match cssPseudo /:first-\(line\|letter\)/
-syn match cssPseudo /::\(first-\(line\|letter\)\|before\|after\|selection\)/
-
-" CSS3 Advanced http://meiert.com/en/indices/css-properties/
-syn keyword cssAdvancedProp appearance azimuth binding bleed columns crop hyphens icon
-syn keyword cssAdvancedProp phonemes resize richness size volumne
-syn match cssAdvancedProp /\(animation-\(delay\|direction\|duration\|name\|iteration-count\|play-state\|timing-function\)\|animation\)/
-syn match cssAdvancedProp /alignment-\(adjust\|baseline\)/
-syn match cssAdvancedProp /\(backface-visibility\baseline-shift\)/
-syn match cssAdvancedProp /bookmark-\(label\|level\|state\|target\)/
-syn match cssAdvancedProp /column-\(count\|fill\|gap\|rule-\(color\|style\|width\)\|rule\|span\|width\)/
-syn match cssAdvancedProp /\(cue-\(after\|before\)\|cue\)/
-syn match cssAdvancedProp /dominant-baseline/
-syn match cssAdvancedProp /drop-initial-\(size\|value\|\(after\|before\)-\(adjust\|align\)\)/
-syn match cssAdvancedProp /\(fit-position\|fit\)/
-syn match cssAdvancedProp /\(float-offset\|hanging-punctuation\)/
-syn match cssAdvancedProp /grid-\(columns\|rows\)/
-syn match cssAdvancedProp /hyphenate-\(after\|before\|character\|lines\|resource\)/
-syn match cssAdvancedProp /image-\(orientation\|rendering\|resolution\)/
-syn match cssAdvancedProp /inline-box-align/
-syn match cssAdvancedProp /\(mark-\(after\|before\)\|mark\|marks\)/
-syn match cssAdvancedProp /marquee-\(direction\|loop\|play-count\|speed\|style\)/
-syn match cssAdvancedProp /move-to/
-syn match cssAdvancedProp /nav-\(down\|index\|left\|right\|up\)/
-syn match cssAdvancedProp /\(pause-\(after\|before\)\|pause\)/
-syn match cssAdvancedProp /\(perspective-origin\|perspective\)/
-syn match cssAdvancedProp /\(pitch-range\|pitch\)/
-syn match cssAdvancedProp /presentation-level/
-syn match cssAdvancedProp /punctuation-trim/
-syn match cssAdvancedProp /rendering-intent/
-syn match cssAdvancedProp /pointer-events/
-syn match cssAdvancedProp /\(rest-\(after\|before\)\|rest\)/
-syn match cssAdvancedProp /\(rotation-point\|rotation\)/
-syn match cssAdvancedProp /ruby-\(align\|overhang\|position\|span\)/
-syn match cssAdvancedProp /\(target-\(name\|new\|position\)\|target\)/
-syn match cssAdvancedProp /\(transform-\(origin\|style\)\|transform\)/
-syn match cssAdvancedProp /\(transition-\(delay\|duration\|property\|timing-function\)\|transition\)/
-syn match cssAdvancedProp /voice-\(balance\|duration\|family\|pitch-range\|pitch\|rate\|stress\|volume\)/
-
-syn match cssAdvancedVal /\(ease-\(in\|out\|in-out\)\|ease\)/ contained
-
-" CSS3 Advanced value
-"syn match cssAdvancedVal
-
-
-if main_syntax == "css"
-  syn sync minlines=10
-endif
+syntax case ignore
 
-" Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_css_syn_inits")
-  if version < 508
-    let did_css_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" First of all define indented and not indented lines
+syntax match stylusNewLine "^\S\@="
+      \ nextgroup=stylusComment,stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusVariable,stylusExplicitVariable,stylusInterpolationSelectors,stylusFunctionName,stylusConditional,stylusOperatorReturn,stylusAtRuleMedia,stylusAtRuleKeyframes,stylusAtRuleNamespace,stylusAtRuleSupports,stylusAtRuleDocument,stylusAtRulePage,stylusAtRuleViewport
 
-  HiLink cssString String
-  HiLink cssComment Comment
-  HiLink cssTagName Statement
-  HiLink cssSelector Function
-  HiLink cssBackgroundProp StorageClass
-  HiLink cssTableProp StorageClass
-  HiLink cssBorderProp StorageClass
-  HiLink cssFontProp StorageClass
-  HiLink cssColorProp StorageClass
-  HiLink cssBoxProp StorageClass
-  HiLink cssTextProp StorageClass
-  HiLink cssListProp StorageClass
-  HiLink cssVisualProp StorageClass
-  HiLink cssAdvancedProp StorageClass
-  HiLink cssCommonProp StorageClass
-  HiLink cssSpecialProp Special
-  HiLink cssImportant Special
-  HiLink cssRuleProp PreProc
-  HiLink cssPseudo PreProc
-
-  HiLink cssColorVal Constant
-  HiLink cssCommonVal Type
-  HiLink cssFontVal Type
-  HiLink cssListVal Type
-  HiLink cssTextVal Type
-  HiLink cssVisualVal Type
-  HiLink cssBorderVal Type
-  HiLink cssBackgroundVal Type
-  HiLink cssFuncVal Function
-  HiLink cssAdvancedVal Function
-
-  HiLink cssValueLength Number
-  HiLink cssValueInteger Number
-  HiLink cssValueNumber Number
-  HiLink cssValueAngle Number
-  HiLink cssValueTime Number
-  HiLink cssValueFrequency Number
-  delcommand HiLink
-endif
+syntax match stylusNewLineIndented "^\s\+"
+      \ nextgroup=stylusComment,stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusProperty,stylusVariable,stylusExplicitVariable,stylusInterpolation,stylusFunctionName,stylusUnitInt,stylusParenthesised,stylusOperatorReturn,stylusConditional,stylusAtRuleMedia,stylusAtRuleKeyframes,stylusAtRuleKeyframesOffset,stylusAtRuleNamespace,stylusAtRuleSupports,stylusAtRuleDocument,stylusAtRulePageMarginBoxTypes,stylusAtRuleViewport,stylusAtRuleExtends
 
-" let b:current_syntax = "css"
-"
-if main_syntax == 'css'
-  unlet main_syntax
-endif
+" ===============================================
+" ENCLOSURES
+" ===============================================
 
-" Vim syntax file
-" Language: Stylus
-" Maintainer: Marc Harter
-" Filenames: *.styl, *.stylus
-" Based On: Tim Pope (sass.vim)
+syntax match stylusEnclosure "\(\[\|\]\|{\|}\|(\|)\)"
+      \ contained
 
-syn case ignore
+highlight def link stylusEnclosure SpecialChar
 
-syn cluster stylusCssSelectors contains=cssTagName,cssSelector,cssPseudo
-syn cluster stylusCssValues contains=cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency,cssColorVal,cssCommonVal,cssFontVal,cssListVal,cssTextVal,cssVisualVal,cssBorderVal,cssBackgroundVal,cssFuncVal,cssAdvancedVal
-syn cluster stylusCssProperties contains=cssBackgroundProp,cssTableProp,cssBorderProp,cssFontProp,cssColorProp,cssBoxProp,cssTextProp,cssListProp,cssVisualProp,cssAdvancedProp,cssCommonProp,cssSpecialProp
+" ===============================================
+" VARIABLES
+" ===============================================
 
-syn match stylusVariable "$\?[[:alnum:]_-]\+"
-syn match stylusVariableAssignment "\%([[:alnum:]_-]\+\s*\)\@<==" nextgroup=stylusCssAttribute,stylusVariable skipwhite
+syntax match stylusVariable "\<\(\w\|-\|\$\)*\>"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusOperatorAssignment,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusSubscript,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorVarDefinition,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional,stylusHashDotGetter
+      \ skipwhite
 
-syn match stylusProperty "\%([{};]\s*\|^\)\@<=\%([[:alnum:]-]\|#{[^{}]*}\)\+:" contains=@stylusCssProperties,@stylusCssSelectors skipwhite nextgroup=stylusCssAttribute contained containedin=cssDefineBlock
-syn match stylusProperty "^\s*\zs\s\%(\%([[:alnum:]-]\|#{[^{}]*}\)\+[ :]\|:[[:alnum:]-]\+\)"hs=s+1 contains=@stylusCssProperties,@stylusCssSelectors skipwhite nextgroup=stylusCssAttribute
-syn match stylusProperty "^\s*\zs\s\%(:\=[[:alnum:]-]\+\s*=\)"hs=s+1 contains=@stylusCssProperties,@stylusCssSelectors skipwhite nextgroup=stylusCssAttribute
+syntax match stylusExplicitVariable "\$\(\w\|-\|\$\)*\>"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusOperatorAssignment,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusSubscript,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorVarDefinition,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional,stylusHashDotGetter,stylusOptional
+      \ skipwhite
 
-syn match stylusCssAttribute +\%("\%([^"]\|\\"\)*"\|'\%([^']\|\\'\)*'\|#{[^{}]*}\|[^{};]\)*+ contained contains=@stylusCssValues,cssImportant,stylusFunction,stylusVariable,stylusControl,stylusUserFunction,stylusInterpolation,cssString,stylusComment,cssComment
+syntax match stylusExplicitVariable "\<arguments\|block\>"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusSubscript,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorVarDefinition,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional,stylusHashDotGetter
+      \ skipwhite
 
-syn match stylusInterpolation %{[[:alnum:]_-]\+}%
+highlight def link stylusExplicitVariable Identifier
 
-syn match stylusFunction "\<\%(red\|green\|blue\|alpha\|dark\|light\)\>(\@=" contained
-syn match stylusFunction "\<\%(hue\|saturation\|lightness\|push\|unshift\|typeof\|unit\|match\)\>(\@=" contained
-syn match stylusFunction "\<\%(hsla\|hsl\|rgba\|rgb\|lighten\|darken\)\>(\@=" contained
-syn match stylusFunction "\<\%(abs\|ceil\|floor\|round\|min\|max\|even\|odd\|sum\|avg\|sin\|cos\|join\)\>(\@=" contained
-syn match stylusFunction "\<\%(desaturate\|saturate\|invert\|unquote\|quote\|s\)\>(\@=" contained
-syn match stylusFunction "\<\%(operate\|length\|warn\|error\|last\|p\|\)\>(\@=" contained
-syn match stylusFunction "\<\%(opposite-position\|image-size\|add-property\)\>(\@=" contained
+" ===============================================
+" OPERATORS
+" ===============================================
 
-syn keyword stylusVariable null true false arguments
-syn keyword stylusControl  if else unless for in return
+" Unary
+syntax match stylusOperatorUnary "\([-+\!\~]\+\|\<not\>\)"
+      \ contained
+      \ nextgroup=stylusVariable,stylusExplicitVariable,stylusUnitInt,stylusUnitFloat,stylusParenthesised,stylusPropertyLookup,stylusOperatorUnary,stylusBoolean,stylusFunctionName
+      \ skipwhite
 
-syn match stylusImport "@\%(import\|require\)" nextgroup=stylusImportList
-syn match stylusImportList "[^;]\+" contained contains=cssString.*,cssMediaType,cssURL
+highlight def link stylusOperatorUnary Operator
 
-syn match stylusAmpersand  "&"
-syn match stylusClass      "[[:alnum:]_-]\+" contained
-syn match stylusClassChar  "\.[[:alnum:]_-]\@=" nextgroup=stylusClass
-syn match stylusEscape     "^\s*\zs\\"
-syn match stylusId         "[[:alnum:]_-]\+" contained
-syn match stylusIdChar     "#[[:alnum:]_-]\@=" nextgroup=stylusId
+" Additive
+syntax match stylusOperatorAdditive "[-+]"
+      \ contained
+      \ nextgroup=stylusVariable,stylusExplicitVariable,stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusParenthesised,stylusPropertyLookup,stylusColor,stylusFunctionName
+      \ skipwhite
 
-syn region stylusComment    start="//" end="$" contains=cssTodo,@Spell fold
+highlight def link stylusOperatorAdditive Operator
 
-hi def link stylusComment               Comment
-hi def link stylusVariable              Identifier
-hi def link stylusControl               PreProc
-hi def link stylusFunction              Function
-hi def link stylusInterpolation         Delimiter
+" Multiplicative
+syntax match stylusOperatorMultiplicative "\([/\%]\|\*\{1,2}\)"
+      \ contained
+      \ nextgroup=stylusVariable,stylusExplicitVariable,stylusUnitInt,stylusUnitFloat,stylusParenthesised,stylusPropertyLookup,stylusFunctionName
+      \ skipwhite
+highlight def link stylusOperatorMultiplicative Operator
 
-hi def link stylusAmpersand             Character
-hi def link stylusClass                 Type
-hi def link stylusClassChar             Special
-hi def link stylusEscape                Special
-hi def link stylusId                    Identifier
-hi def link stylusIdChar                Special
+" Ternary
+syntax match stylusOperatorTernary "[:?]"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
+      \ skipwhite
 
-let b:current_syntax = "stylus"
+highlight def link stylusOperatorTernary Operator
+
+" Assignment
+syntax match stylusOperatorAssignment "[/\*+-:?]\=="
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName,stylusHash,stylusAtRuleBlock
+      \ skipwhite
+
+highlight def link stylusOperatorAssignment Operator
+
+" Relational
+syntax match stylusOperatorRelational "\(=\{2}\|\<is\>\(\s\<not\>\)\=\|\!=\|\<isnt\>\|>=\|<=\|>\|<\)"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusVariable,stylusExplicitVariable,stylusParenthesised,stylusPropertyLookup,stylusColor,stylusBoolean,stylusFunctionName
+      \ skipwhite
+
+highlight def link stylusOperatorRelational Operator
+
+" Logical
+syntax match stylusOperatorLogical "\(&&\|||\|\<and\>\|\<or\>\)"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
+      \ skipwhite
+
+highlight def link stylusOperatorLogical Operator
+
+" Existence
+syntax match stylusOperatorExistence "\<in\>"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
+      \ skipwhite
+
+highlight def link stylusOperatorExistence Operator
+
+" Instance
+syntax match stylusOperatorInstance "\<is a\>"
+      \ contained
+      \ skipwhite
+
+highlight def link stylusOperatorInstance Operator
+
+" Variable definition
+syntax match stylusOperatorVarDefinition "\<is defined\>"
+      \ contained
+      \ nextgroup=stylusOperatorLogical,stylusOperatorTernary,stylusFunctionName
+      \ skipwhite
+
+highlight def link stylusOperatorVarDefinition Operator
+
+" Return
+syntax match stylusOperatorReturn "\<return\>"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
+      \ skipwhite
+
+highlight def link stylusOperatorReturn Operator
+
+" Comma
+syntax match stylusComma /,\(\s\=\(\a\w\{-}:\|\('\|"\).\{-}\('\|"\):\)\)\@!/
+      \ containedin=ALLBUT,stylusString,stylusComment,stylusHash,stylusAtRuleMediaComma
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
+      \ skipwhite
+
+" Range
+syntax match stylusOperatorRange "\.\.\.\="
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusVariable,stylusExplicitVariable,stylusFunctionName
+
+highlight def link stylusOperatorRange Operator
+
+" ===============================================
+" CONDITIONALS
+" ===============================================
+
+syntax match stylusConditional "\<\(if\|else\|unless\|for\)\>"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName,stylusConditional
+      \ skipwhite
+
+highlight def link stylusConditional Conditional
+
+" ===============================================
+" SPRINTF
+" ===============================================
+
+syntax match stylusSprintfPlaceholder "%s"
+      \ contained
+
+highlight def link stylusSprintfPlaceholder Operator
+
+syntax match stylusSprintfDefinition "%"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
+      \ skipwhite
+
+highlight def link stylusSprintfDefinition Operator
+
+" ===============================================
+" SUBSCRIPT
+" ===============================================
+
+syntax region stylusSubscript matchgroup=stylusEnclosure start="\[" end="\]"
+      \ contained
+      \ contains=stylusExplicitVariable,stylusVariable,stylusUnitInt,stylusParenthesised,stylusPropertyLookup,stylusFunctionName
+      \ keepend
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional,stylusOperatorAssignment,stylusHashDotGetter
+      \ oneline
+      \ skipwhite
+
+" ===============================================
+" UNITS
+" ===============================================
+
+syntax match stylusUnitInt "[-+]\=\d\+%\="
+      \ contained
+      \ nextgroup=stylusOperatorRange,stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
+      \ skipwhite
+
+syntax match stylusUnitInt "\<PI\>"
+      \ contained
+      \ nextgroup=stylusOperatorRange,stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
+      \ skipwhite
+
+highlight def link stylusUnitInt Number
+
+syntax match stylusUnitFloat "[-+]\=\d\=\.\d\+%\="
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
+      \ skipwhite
+
+highlight def link stylusUnitFloat Number
+
+execute 'syntax match stylusUnitName "\(\<\|\d\@<=\)\(' . join(g:css_units, '\|') . '\)\>"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
+      \ skipwhite'
+
+highlight def link stylusUnitName Number
+
+" Resolve 'in' unit name and operator conflict
+syntax match stylusOperatorExistence "\s\@<=\<in\>"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
+      \ skipwhite
+
+" ===============================================
+" BOOLEAN
+" ===============================================
+
+syntax match stylusBoolean "\<\(true\|false\|null\)\>"
+      \ contained
+      \ nextgroup=stylusOperatorRelational,stylusOperatorAssignment,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusFunctionName,stylusConditional
+      \ skipwhite
+
+highlight def link stylusBoolean Boolean
+
+" ===============================================
+" SELECTORS
+" ===============================================
+
+" HTML or SVG elements
+execute 'syn match stylusSelectorElement "\<\(' . join(g:html_elements, '\|') . '\)\(\>\|#\@=\)"
+      \ contained
+      \ keepend
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
+      \ oneline
+      \ skipwhite'
+
+syn match stylusSelectorElement "\(^\|\s\)\@<=\*\($\|\s\)\@="
+      \ contained
+      \ keepend
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
+      \ oneline
+      \ skipwhite
+
+highlight def link stylusSelectorElement Statement
+
+" CSS Class
+syntax region stylusSelectorClass start="\." skip="\w-\@=" end="\(\w\|-+\)\(\W\|$\)\@="
+      \ contained
+      \ keepend
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional,stylusOptional
+      \ oneline
+      \ skipwhite
+
+syntax match stylusSelectorClass "\.{\@="
+      \ contained
+      \ nextgroup=stylusInterpolationSelectors
+
+highlight def link stylusSelectorClass Identifier
+
+" CSS Id
+syntax region stylusSelectorId start="#" skip="\w-\@=" end="\(\w\|-+\)\(\W\|$\)\@="
+      \ contained
+      \ keepend
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
+      \ oneline
+      \ skipwhite
+
+syntax match stylusSelectorId "#{\@="
+      \ contained
+      \ nextgroup=stylusInterpolationSelectors
+
+highlight def link stylusSelectorId Identifier
+
+" Attribute selectors
+syntax match stylusSelectorAttributeOperator "\(=\|\~=\||=\|\^=\|\$=\|\*=\)"
+      \ contained
+
+highlight def link stylusSelectorAttributeOperator Operator
+
+syntax region stylusSelectorAttribute matchgroup=stylusEnclosure start="\[" skip="{.\{-}}" end="\]"
+      \ contained
+      \ contains=stylusSelectorAttributeOperator,stylusInterpolation
+      \ keepend
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
+      \ oneline
+      \ skipwhite
+
+highlight def link stylusSelectorAttribute Type
+
+" Parent reference
+syntax match stylusSelectorReference "\(&\|\~/\|\(\.\./\)\+\|/\)"
+      \ contained
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
+      \ skipwhite
+
+highlight def link stylusSelectorReference Statement
+
+" Partial reference
+syntax region stylusSelectorPartialReference matchgroup=stylusSelectorReference start="\^\[\@=" skip="{.\{-}}" matchgroup=NONE end="\]"
+      \ contained
+      \ contains=stylusEnclosure,stylusUnitInt,stylusInterpolation
+      \ keepend
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
+      \ oneline
+      \ skipwhite
+
+syntax region stylusSelectorClass start="\(&\|\~/\|\(\.\./\)\+\|/\)" skip="\w[-()]\@=" end="\(\w\|(\|)\)\(\W\|$\)\@="
+      \ contained
+      \ contains=stylusSelectorReference
+      \ keepend
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
+      \ oneline
+      \ skipwhite
+
+" CSS pseudo classes and elements
+execute 'syntax match stylusSelectorPseudo ":\(' . join(g:css_pseudo, '\|') . '\)-\@!"
+      \ contained
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusSelectorPseudo,stylusOptional
+      \ skipwhite'
+
+syntax match stylusSelectorPseudo ":\(\(first\|last\|only\)-\(child\|of-type\)\)"
+      \ contained
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusSelectorPseudo,stylusOptional
+      \ skipwhite
+
+syntax match stylusSelectorPseudo ":not(.\{-})"
+      \ contained
+      \ contains=stylusSelectorElement,stylusEnclosure,stylusInterpolationSelectors
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusSelectorPseudo,stylusOptional
+      \ skipwhite
+
+syntax match stylusSelectorPseudo ":lang(.\{-})"
+      \ contained
+      \ contains=stylusEnclosure,stylusInterpolationSelectors
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusSelectorPseudo,stylusOptional
+      \ skipwhite
+
+syntax match stylusSelectorPseudo ":\(nth-last-\|nth-\)\(child\|of-type\)(.\{-})"
+      \ contained
+      \ contains=stylusUnitInt,stylusEnclosure,stylusInterpolationSelectors
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusSelectorPseudo,stylusOptional
+      \ skipwhite
+
+syntax match stylusSelectorPseudo /::\=\(first-\(line\|letter\)\|before\|after\|selection\|placeholder\)/
+      \ contained
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusSelectorPseudo,stylusOptional
+      \ skipwhite
+
+highlight def link stylusSelectorPseudo Define
+
+" CSS Selector operators
+syntax match stylusSelectorCombinator "[>\~+|,]"
+      \ contained
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusExplicitVariable
+      \ skipwhite
+
+highlight def link stylusSelectorCombinator Operator
+
+" ===============================================
+" PROPERTIES
+" ===============================================
+
+execute 'syntax match stylusProperty "\<\(' . join(g:css_single_props, '\|') . '\)\>-\@!:\="
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationProperties,stylusFunctionName
+      \ skipwhite'
+
+execute 'syntax match stylusProperty "\<\(' . join(g:css_multi_props, '\|') . '\)\>-\@!:\="
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationProperties,stylusFunctionName
+      \ skipwhite'
+
+execute 'syntax match stylusProperty "\<\(' . join(g:svg_props, '\|') . '\)\>-\@!:\="
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationProperties,stylusFunctionName
+      \ skipwhite'
+
+syntax match stylusProperty "\(-webkit-\|-moz-\|-o-\|-ms-\|-khtml-\)\(\w\|-\)*:\="
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationProperties,stylusFunctionName
+      \ skipwhite
+
+highlight def link stylusProperty Type
+
+" ===============================================
+" PROPERTY LOOKUP
+" ===============================================
+
+execute 'syntax match stylusPropertyLookup "@\(' . join(g:css_props, '\|') . '\)\>-\@!"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
+      \ skipwhite'
+
+execute 'syntax match stylusPropertyLookup "@\(' . join(g:svg_props, '\|') . '\)\>-\@!"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
+      \ skipwhite'
+
+syntax match stylusPropertyLookup "@\(-webkit-\|-moz-\|-o-\|-ms-\|-khtml-\)\(\w\|-\)*"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
+      \ skipwhite
+
+highlight def link stylusPropertyLookup Type
+
+" ===============================================
+" VALUES
+" ===============================================
+
+execute 'syntax match stylusValues "\<\(' . join(g:css_values, '\|') . '\)\>-\@!"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName
+      \ skipwhite'
+
+execute 'syntax match stylusValues "\<\(' . join(g:css_animatable_props, '\|') . '\)\>-\@!"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName
+      \ skipwhite'
+
+highlight def link stylusValues PreCondit
+
+" ===============================================
+" COLORS
+" ===============================================
+
+" Named
+execute 'syntax match stylusColor "\<\(' . join(g:css_colors, '\|') . '\)\>-\@!"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusOperatorAdditive,stylusImportant,stylusFunctionName,stylusConditional
+      \ skipwhite'
+
+syntax match stylusColor "\<transparent\>"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusOperatorAdditive,stylusImportant,stylusFunctionName,stylusConditional
+      \ skipwhite
+
+" Hexadecimal
+syntax match stylusColor "#\x\{3,6\}\>"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusOperatorAdditive,stylusImportant,stylusFunctionName,stylusConditional
+      \ skipwhite
+
+highlight stylusColor term=underline ctermfg=133 guifg=#b169b2
+
+" ===============================================
+" FONT
+" ===============================================
+
+" Highlight generic font families
+syntax match stylusFont "\<\(serif\|sans-serif\|monospace\)\>"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
+      \ skipwhite
+
+highlight def link stylusFont Directory
+
+" ===============================================
+" Explicitly point out that the word before assignment operator is a variable
+syntax match stylusVariable "\<\(\w\|-\)*\(\s\=[:?]\==[^=]\)\@="
+      \ contained
+      \ nextgroup=stylusOperatorAssignment
+      \ skipwhite
+" ===============================================
+
+" ===============================================
+" IMPORTANT
+" ===============================================
+
+syntax match stylusImportant "!important"
+      \ contained
+
+highlight def link stylusImportant Special
+
+" ===============================================
+" INTERPOLATION
+" ===============================================
+
+" Prepend is always a property
+syntax match stylusProperty "\(\w\|-\)\+{\@="
+      \ contained
+      \ nextgroup=stylusInterpolationProperties
+
+syntax region stylusInterpolation matchgroup=stylusEnclosure start="{" end="}"
+      \ contained
+      \ contains=stylusVariable,stylusExplicitVariable,stylusOperatorUnary,stylusUnitInt,stylusUnitFloat,stylusParenthesised,stylusConditional,stylusFunctionName
+      \ keepend
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationSelectorsTail,stylusInterpolationPropertiesTail,stylusFunctionName
+      \ oneline
+      \ skipwhite
+
+syntax region stylusInterpolationSelectors matchgroup=stylusEnclosure start="{" end="}"
+      \ contained
+      \ contains=stylusVariable,stylusExplicitVariable,stylusOperatorUnary,stylusUnitInt,stylusUnitFloat,stylusParenthesised,stylusConditional,stylusFunctionName
+      \ keepend
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectorsTail
+      \ oneline
+      \ skipwhite
+
+syntax region stylusInterpolationProperties matchgroup=stylusEnclosure start="{" end="}"
+      \ contained
+      \ contains=stylusVariable,stylusExplicitVariable,stylusOperatorUnary,stylusUnitInt,stylusUnitFloat,stylusParenthesised,stylusConditional,stylusFunctionName
+      \ keepend
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusProperty,stylusInterpolationPropertiesTail,stylusFunctionName
+      \ oneline
+      \ skipwhite
+
+syntax match stylusInterpolationPropertiesTail "}\@<=\(\w\|-\)\+"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusProperty,stylusInterpolationProperties,stylusFunctionName
+      \ skipwhite
+
+highlight def link stylusInterpolationPropertiesTail Type
+
+" Tail is a selector by default
+syntax match stylusInterpolationSelectorsTail "}\@<=\(\w\|-\)\+"
+      \ contained
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors
+      \ skipwhite
+
+highlight def link stylusInterpolationSelectorsTail Identifier
+
+" Tail is a property if followed by anything
+syntax match stylusInterpolationPropertiesTail "}\@<=\(\w\|-\)\+:\=\s\S\@="
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusProperty,stylusInterpolationProperties,stylusFunctionName
+      \ skipwhite
+
+" Tail is a selector if followed by .#[]$~^&
+syntax match stylusInterpolationSelectorsTail "}\@<=\(\w\|-\)\+:\=\s[\.#\[~^&+|,>]\@="
+      \ contained
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors
+      \ skipwhite
+
+" Tail is a property if followed by float number
+syntax match stylusInterpolationPropertiesTail "}\@<=\(\w\|-\)\+:\=\s\(\.\d\)\@="
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusProperty,stylusInterpolationProperties,stylusFunctionName
+      \ skipwhite
+
+" Tail is a property if followed by hex color
+syntax match stylusInterpolationPropertiesTail "}\@<=\(\w\|-\)\+:\=\s\(#\x\{3,6}\)\@="
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusProperty,stylusInterpolationProperties,stylusFunctionName
+      \ skipwhite
+
+execute 'syntax match stylusInterpolationSelectorsTail "}\@<=\(\w\|-\)\+:\=\s\(' . join(g:html_elements, '\|') . '\)\@="
+      \ contained
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors
+      \ skipwhite'
+
+" ===============================================
+" MIXINS & FUNCTIONS
+" ===============================================
+
+syntax match stylusFunctionBlock "+"
+      \ contained
+
+highlight def link stylusFunctionBlock Operator
+
+syntax match stylusFunctionRest "\w\@<=\.\.\."
+      \ contained
+
+highlight def link stylusFunctionRest Operator
+
+syntax match stylusFunctionName "\(\<\|+\)\(\w\|\$\)\(-\|\w\|\$\)\{-}(\@="
+      \ contained
+      \ contains=stylusFunctionBlock
+      \ nextgroup=stylusFunctionProps
+
+syntax match stylusFunctionName "@\{-}(\@="
+      \ contained
+      \ contains=stylusFunctionBlock
+      \ nextgroup=stylusFunctionProps
+
+highlight def link stylusFunctionName Function
+
+syntax region stylusFunctionProps matchgroup=stylusEnclosure start="\S\@<=(" end=")"
+      \ contained
+      \ contains=stylusOperatorUnary,stylusVariable,stylusExplicitVariable,stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusColor,stylusFunctionName,stylusFunctionRest,stylusValues
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusSubscript,stylusConditional,stylusOperatorRelational
+      \ skipwhite
+
+
+" ===============================================
+" PARENTHESISED EXPRESSIONS
+" ===============================================
+
+syntax region stylusParenthesised matchgroup=stylusEnclosure start="\W\@<=(" skip=/["'].\{-}["']/ end=")"
+      \ contained
+      \ contains=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
+      \ keepend
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
+      \ oneline
+      \ skipwhite
+
+" Resolve '%' unit name and operator conflict
+syntax match stylusUnitName ")\@<=%"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
+      \ skipwhite
+" ===============================================
+" STRINGS
+" ===============================================
+
+syntax region stylusString start=/\('\|"\)/ end=/\('\|"\)/
+      \ containedin=ALLBUT,stylusComment,stylusHash,stylusHashStringKey
+      \ contains=stylusSprintfPlaceholder
+      \ keepend
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorAdditive,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusSprintfDefinition,stylusImportant,stylusFunctionName,stylusConditional
+      \ oneline
+      \ skipwhite
+
+highlight def link stylusString String
+
+" ===============================================
+" HASHES
+" ===============================================
+
+syntax match stylusHashKey "\a\w\{-}:"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName,stylusHash,stylusString
+      \ skipwhite
+
+highlight def link stylusHashKey NonText
+
+syntax region stylusHashStringKey start=/\('\|"\)/ end=/\('\|"\):/
+      \ contained
+      \ keepend
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName,stylusHash,stylusString
+      \ oneline
+      \ skipwhite
+
+highlight def link stylusHashStringKey String
+
+syntax match stylusHashDotGetter "\S\@<=\."
+      \ contained
+      \ nextgroup=stylusHashIdent
+
+highlight def link stylusHashDotGetter Operator
+
+syntax match stylusHashComma ","
+      \ contained
+      \ nextgroup=stylusHashKey,stylusHashStringKey
+      \ skipwhite
+
+syntax match stylusHashIdent "\<\(\w\|-\|\$\)*\>"
+      \ contained
+      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusOperatorAssignment,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusSubscript,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorVarDefinition,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional,stylusHashDotGetter
+      \ skipwhite
+
+highlight def link stylusHashIdent NonText
+
+syntax region stylusHash matchgroup=stylusEnclosure start="{" end="}"
+      \ contained
+      \ contains=stylusHashKey,stylusHashStringKey,stylusHash,stylusHashComma
+      \ skipwhite
+
+" ===============================================
+" @ RULES
+" ===============================================
+
+syntax match stylusAtRuleImport "@\(import\|require\)\>"
+      \ containedin=ALLBUT,stylusString,stylusComment
+      \ nextgroup=stylusFunctionName,stylusVariable,stylusExplicitVariable
+      \ skipwhite
+
+highlight def link stylusAtRuleImport Macro
+
+syntax match stylusAtRuleMedia "@media\>"
+      \ contained
+      \ nextgroup=stylusAtRuleMediaType,stylusAtRuleMediaFeatureExpression
+      \ skipwhite
+
+highlight def link stylusAtRuleMedia Macro
+
+syntax match stylusAtRuleMediaType "\<\(all\|print\|screen\|speech\)\>"
+      \ contained
+      \ nextgroup=stylusAtRuleMediaType,stylusAtRuleMediaFeatureExpression,stylusAtRuleMediaLogical
+      \ skipwhite
+
+highlight def link stylusAtRuleMediaType Macro
+
+syntax match stylusAtRuleMediaLogical "\<\(and\|not\|only\)\>"
+      \ contained
+      \ nextgroup=stylusAtRuleMediaType,stylusAtRuleMediaFeatureExpression,stylusAtRuleMediaLogical
+      \ skipwhite
+
+highlight def link stylusAtRuleMediaLogical Operator
+
+syntax region stylusAtRuleMediaFeatureExpression matchgroup=stylusEnclosure start="(" end=")"
+      \ contained
+      \ contains=stylusAtRuleMediaFeature,stylusInterpolationProperties,stylusInterpolationPropertiesTail
+      \ nextgroup=stylusAtRuleMediaComma,stylusAtRuleMediaLogical
+      \ oneline
+      \ skipwhite
+
+execute 'syntax match stylusAtRuleMediaFeature "\(min-\|max-\)\=\(' . join(g:css_media_features, '\|') . '\)\>:"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationProperties,stylusFunctionName
+      \ skipwhite'
+
+syntax match stylusAtRuleMediaFeature "\(\w\|-\)\+{\@="
+      \ contained
+      \ nextgroup=stylusInterpolationProperties
+
+syntax match stylusAtRuleMediaFeature "}\@<=:"
+      \ contained
+      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationProperties,stylusFunctionName
+      \ skipwhite
+
+highlight def link stylusAtRuleMediaFeature Type
+
+syntax match stylusAtRuleMediaComma ","
+      \ contained
+      \ nextgroup=stylusAtRuleMediaFeatureExpression
+      \ skipwhite
+
+syntax match stylusAtRuleFont "@font-face\>"
+      \ containedin=ALLBUT,stylusString,stylusComment
+
+highlight def link stylusAtRuleFont Macro
 
-" vim:set sw=2:
+syntax match stylusAtRuleKeyframes "@\(-\(o\|webkit\|moz\)-\)\=keyframesi\>"
+      \ contained
+      \ nextgroup=stylusAtRuleKeyframesName,stylusInterpolationSelectors
+      \ skipwhite
+
+highlight def link stylusAtRuleKeyframes Macro
+
+syntax match stylusAtRuleKeyframesName "\<\(\w\|-\|\$\)*\>"
+      \ contained
+      \ nextgroup=stylusInterpolationSelectors
+      \ skipwhite
+
+highlight def link stylusAtRuleKeyframesName Identifier
+
+syntax match stylusAtRuleKeyframesOffset "\d\{1,3}%"
+      \ contained
+
+syntax match stylusAtRuleKeyframesOffset "\<\(from\|to\)\>"
+      \ contained
+
+highlight def link stylusAtRuleKeyframesOffset Macro
+
+syntax match stylusAtRuleNamespace "@namespace\>"
+      \ contained
+      \ nextgroup=stylusAtRuleNamespacePrefix,stylusAtRuleNamespaceUrl
+      \ skipwhite
+
+highlight def link stylusAtRuleNamespace Macro
+
+syntax match stylusAtRuleNamespacePrefix "\<\(\w\|-\|\$\)*\>"
+      \ contained
+      \ nextgroup=stylusAtRuleNamespaceUrl
+      \ skipwhite
+
+highlight def link stylusAtRuleNamespacePrefix Macro
+
+syntax match stylusAtRuleNamespaceUrl "\<url(\@="
+      \ contained
+      \ nextgroup=stylusAtRuleNamespaceUrlAdress
+
+highlight def link stylusAtRuleNamespaceUrl Function
+
+syntax region stylusAtRuleNamespaceUrlAdress matchgroup=stylusEnclosure start="(" end=")"
+      \ contained
+
+highlight def link stylusAtRuleNamespaceUrlAdress String
+
+syntax match stylusAtRuleSupports "@supports\>"
+      \ contained
+      \ nextgroup=stylusAtRuleSupportsLogic,stylusAtRuleSupportsDeclaration
+      \ skipwhite
+
+highlight def link stylusAtRuleSupports Macro
+
+syntax region stylusAtRuleSupportsDeclaration matchgroup=stylusEnclosure start="(" end=")"
+      \ contained
+      \ contains=stylusProperty,stylusAtRuleSupportsLogic,stylusAtRuleSupportsDeclaration
+      \ nextgroup=stylusAtRuleSupportsLogic,stylusAtRuleSupportsDeclaration
+      \ oneline
+      \ skipwhite
+
+syntax match stylusAtRuleSupportsLogic "\<\(and\|not\|or\)\>"
+      \ contained
+      \ nextgroup=stylusAtRuleSupportsLogic,stylusAtRuleSupportsDeclaration
+      \ skipwhite
+
+highlight def link stylusAtRuleSupportsLogic Operator
+
+syntax match stylusAtRuleDocument "@document\>"
+      \ contained
+      \ nextgroup=stylusAtRuleDocumentFunc
+      \ skipwhite
+
+highlight def link stylusAtRuleDocument Macro
+
+syntax match stylusAtRuleDocumentFunc "\<\(url\|url-prefix\|domain\|regexp\)(\@="
+      \ contained
+      \ nextgroup=stylusAtRuleNamespaceUrlAdress
+
+highlight def link stylusAtRuleDocumentFunc Function
+
+syntax match stylusAtRulePage "@page\>"
+      \ contained
+      \ nextgroup=stylusAtRulePagePseudo
+      \ skipwhite
+
+highlight def link stylusAtRulePage Macro
+
+syntax match stylusAtRulePagePseudo ":\(left\|right\|first\|blank\)\>"
+      \ contained
+
+highlight def link stylusAtRulePagePseudo Macro
+
+syntax match stylusAtRulePageMarginBoxTypes "@\(top-left-corner\|top-left\|top-center\|top-right\|top-right-corner\|bottom-left-corner\|bottom-left\|bottom-center\|bottom-right\|bottom-right-corner\|left-top\|left-middle\|left-bottom\|right-top\|right-middle\|right-bottom\)\>"
+      \ contained
+
+highlight def link stylusAtRulePageMarginBoxTypes Macro
+
+syntax match stylusAtRuleViewport "@viewport\>"
+      \ contained
+      \ skipwhite
+
+highlight def link stylusAtRuleViewport Macro
+
+syntax match stylusAtRuleBlock "@block\>"
+      \ contained
+
+highlight def link stylusAtRuleBlock Macro
+
+syntax match stylusAtRuleExtends "@extends\=\>"
+      \ contained
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusExplicitVariable
+      \ skipwhite
+
+highlight def link stylusAtRuleExtends Macro
+
+syntax match stylusOptional "!optional"
+      \ contained
+      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusExplicitVariable
+      \ skipwhite
+
+highlight def link stylusOptional Special
+" ===============================================
+" COMMENTS
+" ===============================================
+
+" Single-line
+syntax region stylusComment start="//" end="$"
+      \ containedin=ALLBUT,stylusString
+      \ keepend
+      \ oneline
+
+" Multi-line
+syntax region stylusComment start="/\*" end="\*/"
+      \ containedin=ALLBUT,stylusString
+      \ keepend
+
+highlight def link stylusComment Comment
+
+" ===============================================
+
+let b:current_syntax = "stylus"

From 2ab0b0a56a7bd1d39060f3def3c0843bb4d3a095 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 1 Jan 2021 17:18:25 +0100
Subject: [PATCH 226/299] Add cson extension to coffeescript, closes #639

Co-authored-by: Collin Styles <collin.styles@mycase.com>
---
 README.md                    | 2 +-
 autoload/polyglot/sleuth.vim | 2 +-
 ftdetect/polyglot.vim        | 2 +-
 packages.yaml                | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 872c2225f..fd9bf7d9f 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [cjsx](https://github.com/mtscout6/vim-cjsx)
 - [clojure](https://github.com/guns/vim-clojure-static) (Clojure syntax highlighting for clj, boot, cl2, cljc, cljs, cljs.hl, cljscm, cljx, hic and edn files)
 - [cmake](https://github.com/pboettch/vim-cmake-syntax) (CMake syntax highlighting for cmake and cmake.in files)
-- [coffee-script](https://github.com/kchmck/vim-coffee-script) (CoffeeScript and Literate CoffeeScript syntax highlighting for coffee, cake, cjsx, iced, coffeekup, litcoffee and coffee.md files)
+- [coffee-script](https://github.com/kchmck/vim-coffee-script) (CoffeeScript and Literate CoffeeScript syntax highlighting for coffee, cake, cjsx, iced, coffeekup, cson, litcoffee and coffee.md files)
 - [cpp-modern](https://github.com/bfrg/vim-cpp-modern)
 - [cql](https://github.com/elubow/cql-vim) (Syntax highlighting for cql files)
 - [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim) (Syntax highlighting for cry, cyl, lcry and lcyl files)
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index a269fa82f..8a5f57ba9 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -81,7 +81,7 @@ let s:globs = {
   \ 'cmusrc': '',
   \ 'cobol': '*.cbl,*.cob,*.lib',
   \ 'coco': '*.atg',
-  \ 'coffee': '*.coffee,*._coffee,*.cake,*.cjsx,*.iced,*.coffeekup,Cakefile',
+  \ 'coffee': '*.coffee,*._coffee,*.cake,*.cjsx,*.iced,*.coffeekup,*.cson,Cakefile',
   \ 'conaryrecipe': '*.recipe',
   \ 'conf': '*.conf,auto.master,config',
   \ 'config': 'configure.in,configure.ac,Pipfile',
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 94e9b28b7..9e4edbed3 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -2441,7 +2441,7 @@ if !has_key(g:polyglot_is_disabled, 'cryptol')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'coffee-script')
-  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.iced,Cakefile setf coffee
+  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.cson,*.iced,Cakefile setf coffee
   au BufNewFile,BufRead *.coffee.md,*.litcoffee setf litcoffee
 endif
 
diff --git a/packages.yaml b/packages.yaml
index 9f3074466..682fdf3b9 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -403,6 +403,7 @@ filetypes:
   extra_extensions:
   # 17 results: https://github.com/search?q=extension%3Acoffeekup+html&type=Code
   - coffeekup
+  - cson
   ignored_warnings:
   # Probably mistake
   - '*Cakefile'

From f3b646fd6f6070072d9b4ec958815b74a8a333f2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 1 Jan 2021 17:26:26 +0100
Subject: [PATCH 227/299] Move tex to after, closes #650

---
 {compiler => after/compiler}/tex.vim | 0
 {ftplugin => after/ftplugin}/tex.vim | 0
 {indent => after/indent}/tex.vim     | 0
 {syntax => after/syntax}/tex.vim     | 0
 packages.yaml                        | 1 +
 scripts/build                        | 6 +++++-
 6 files changed, 6 insertions(+), 1 deletion(-)
 rename {compiler => after/compiler}/tex.vim (100%)
 rename {ftplugin => after/ftplugin}/tex.vim (100%)
 rename {indent => after/indent}/tex.vim (100%)
 rename {syntax => after/syntax}/tex.vim (100%)

diff --git a/compiler/tex.vim b/after/compiler/tex.vim
similarity index 100%
rename from compiler/tex.vim
rename to after/compiler/tex.vim
diff --git a/ftplugin/tex.vim b/after/ftplugin/tex.vim
similarity index 100%
rename from ftplugin/tex.vim
rename to after/ftplugin/tex.vim
diff --git a/indent/tex.vim b/after/indent/tex.vim
similarity index 100%
rename from indent/tex.vim
rename to after/indent/tex.vim
diff --git a/syntax/tex.vim b/after/syntax/tex.vim
similarity index 100%
rename from syntax/tex.vim
rename to after/syntax/tex.vim
diff --git a/packages.yaml b/packages.yaml
index 682fdf3b9..5103de988 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -4966,6 +4966,7 @@ filetypes:
 name: tex
 remote: vim/vim:runtime
 glob: "**/tex.vim"
+extract_in_after: true
 filetypes:
 - name: tex
   patterns:
diff --git a/scripts/build b/scripts/build
index 496198f83..0ffa2039d 100755
--- a/scripts/build
+++ b/scripts/build
@@ -517,7 +517,11 @@ def extract(packages)
         globs.each do |glob|
           Dir.glob("#{subdir}/#{glob}", base: subtree).each do |p|
             next unless File.file?("#{subtree}#{p}")
-            copy_file(package["name"], "#{subtree}#{p}", p)
+            target = p
+            if package["extract_in_after"] == true
+              target = "after/#{target}"
+            end
+            copy_file(package["name"], "#{subtree}#{p}", target)
           end
         end
       elsif File.exist?(subpath)

From 05b8bbc938bdeac4a5ee2d3ae5cf7a7f05e822d3 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 1 Jan 2021 22:30:41 +0100
Subject: [PATCH 228/299] Fix loading for vim 8 packages, closes #613

---
 after/compiler/tex.vim                   |    2 +-
 after/ftplugin/cabal.vim                 |    2 +-
 after/ftplugin/coffee.vim                |    2 +-
 after/ftplugin/haskell.vim               |    2 +-
 after/ftplugin/html.vim                  |    2 +-
 after/ftplugin/idris.vim                 |    2 +-
 after/ftplugin/idris2.vim                |    2 +-
 after/ftplugin/javascript-1.vim          |    2 +-
 after/ftplugin/javascript-2.vim          |    2 +-
 after/ftplugin/javascriptreact.vim       |    2 +-
 after/ftplugin/jsx.vim                   |    2 +-
 after/ftplugin/llvm.vim                  |    2 +-
 after/ftplugin/puppet.vim                |    2 +-
 after/ftplugin/tex.vim                   |    2 +-
 after/ftplugin/tsx.vim                   |    2 +-
 after/ftplugin/typescriptreact.vim       |    2 +-
 after/indent/html.vim                    |    2 +-
 after/indent/javascript-1.vim            |    2 +-
 after/indent/javascript-2.vim            |    2 +-
 after/indent/javascriptreact.vim         |    2 +-
 after/indent/jsx.vim                     |    2 +-
 after/indent/objc.vim                    |    2 +-
 after/indent/php.vim                     |    2 +-
 after/indent/tex.vim                     |    2 +-
 after/indent/tsx.vim                     |    2 +-
 after/indent/typescript.vim              |    2 +-
 after/indent/typescriptreact.vim         |    2 +-
 after/syntax/c.vim                       |    2 +-
 after/syntax/coffee.vim                  |    2 +-
 after/syntax/cpp.vim                     |    2 +-
 after/syntax/haskell.vim                 |    2 +-
 after/syntax/help.vim                    |    2 +-
 after/syntax/html.vim                    |    2 +-
 after/syntax/html/aria.vim               |    2 +-
 after/syntax/html/electron.vim           |    2 +-
 after/syntax/html/rdfa.vim               |    2 +-
 after/syntax/idris.vim                   |    2 +-
 after/syntax/idris2.vim                  |    2 +-
 after/syntax/javascript.vim              |    2 +-
 after/syntax/javascript/graphql.vim      |    2 +-
 after/syntax/javascript/html5.vim        |    2 +-
 after/syntax/javascript/sql.vim          |    2 +-
 after/syntax/javascriptreact.vim         |    2 +-
 after/syntax/javascriptreact/graphql.vim |    2 +-
 after/syntax/jsx.vim                     |    2 +-
 after/syntax/jsx_pretty.vim              |    2 +-
 after/syntax/llvm.vim                    |    2 +-
 after/syntax/mdx.vim                     |    2 +-
 after/syntax/mma.vim                     |    2 +-
 after/syntax/objc.vim                    |    2 +-
 after/syntax/php/graphql.vim             |    2 +-
 after/syntax/reason.vim                  |    2 +-
 after/syntax/reason/graphql.vim          |    2 +-
 after/syntax/rspec.vim                   |    2 +-
 after/syntax/ruby.vim                    |    2 +-
 after/syntax/rust.vim                    |    2 +-
 after/syntax/tex.vim                     |    2 +-
 after/syntax/tsx.vim                     |    2 +-
 after/syntax/typescript/graphql.vim      |    2 +-
 after/syntax/typescriptreact.vim         |    2 +-
 after/syntax/typescriptreact/graphql.vim |    2 +-
 after/syntax/vue/graphql.vim             |    2 +-
 after/syntax/zsh.vim                     |    2 +-
 autoload/LaTeXtoUnicode.vim              |    2 +-
 autoload/RstFold.vim                     |    2 +-
 autoload/ada.vim                         |    2 +-
 autoload/cargo.vim                       |    2 +-
 autoload/cargo/quickfix.vim              |    2 +-
 autoload/clojurecomplete.vim             |    2 +-
 autoload/coffee.vim                      |    2 +-
 autoload/crystal/indent.vim              |    2 +-
 autoload/crystal_lang.vim                |    2 +-
 autoload/csv.vim                         |    2 +-
 autoload/dart.vim                        |    2 +-
 autoload/db/adapter/ecto.vim             |    2 +-
 autoload/ecrystal.vim                    |    2 +-
 autoload/elixir/indent.vim               |    2 +-
 autoload/elixir/util.vim                 |    2 +-
 autoload/fish.vim                        |    2 +-
 autoload/fsharp.vim                      |    2 +-
 autoload/fzf_gitignore.vim               |    2 +-
 autoload/go/config.vim                   |    2 +-
 autoload/graphql.vim                     |    2 +-
 autoload/htmlcomplete.vim                |    2 +-
 autoload/jsonnet.vim                     |    2 +-
 autoload/jsx_pretty/comment.vim          |    2 +-
 autoload/jsx_pretty/indent.vim           |    2 +-
 autoload/julia.vim                       |    2 +-
 autoload/julia/doc.vim                   |    2 +-
 autoload/julia_blocks.vim                |    2 +-
 autoload/julia_latex_symbols.vim         |    2 +-
 autoload/ledger.vim                      |    2 +-
 autoload/nim.vim                         |    2 +-
 autoload/polyglot/init.vim               | 3630 ++++++++++++++++++++++
 autoload/pony.vim                        |    2 +-
 autoload/puppet/align.vim                |    2 +-
 autoload/puppet/ctags.vim                |    2 +-
 autoload/puppet/format.vim               |    2 +-
 autoload/python/utils.vim                |    2 +-
 autoload/requirements.vim                |    2 +-
 autoload/rubycomplete.vim                |    2 +-
 autoload/rust.vim                        |    2 +-
 autoload/rust/debugging.vim              |    2 +-
 autoload/rust/delimitmate.vim            |    2 +-
 autoload/rust/tags.vim                   |    2 +-
 autoload/rustfmt.vim                     |    2 +-
 autoload/smt2.vim                        |    2 +-
 autoload/stylcomplete.vim                |    2 +-
 autoload/terraform.vim                   |    2 +-
 autoload/vital/_crystal.vim              |    2 +-
 autoload/vital/_crystal/ColorEcho.vim    |    2 +-
 autoload/vital/_crystal/Data/List.vim    |    2 +-
 autoload/vital/_crystal/Data/String.vim  |    2 +-
 autoload/vital/_crystal/Process.vim      |    2 +-
 autoload/vital/_crystal/Web/JSON.vim     |    2 +-
 autoload/vital/crystal.vim               |    2 +-
 autoload/xml/aria.vim                    |    2 +-
 autoload/xml/html5.vim                   |    2 +-
 autoload/xml/xsd.vim                     |    2 +-
 autoload/yats.vim                        |    2 +-
 autoload/zig/config.vim                  |    2 +-
 autoload/zig/fmt.vim                     |    2 +-
 autoload/zig/list.vim                    |    2 +-
 autoload/zig/util.vim                    |    2 +-
 compiler/ant.vim                         |    2 +-
 compiler/bdf.vim                         |    2 +-
 compiler/cake.vim                        |    2 +-
 compiler/cargo.vim                       |    2 +-
 compiler/coffee.vim                      |    2 +-
 compiler/credo.vim                       |    2 +-
 compiler/cryptol.vim                     |    2 +-
 compiler/cs.vim                          |    2 +-
 compiler/cucumber.vim                    |    2 +-
 compiler/dot.vim                         |    2 +-
 compiler/eruby.vim                       |    2 +-
 compiler/exunit.vim                      |    2 +-
 compiler/fish.vim                        |    2 +-
 compiler/gleam.vim                       |    2 +-
 compiler/go.vim                          |    2 +-
 compiler/gradle.vim                      |    2 +-
 compiler/gradlew.vim                     |    2 +-
 compiler/haml.vim                        |    2 +-
 compiler/ledger.vim                      |    2 +-
 compiler/lilypond.vim                    |    2 +-
 compiler/ls.vim                          |    2 +-
 compiler/mix.vim                         |    2 +-
 compiler/nim.vim                         |    2 +-
 compiler/nix-build.vim                   |    2 +-
 compiler/ocaml.vim                       |    2 +-
 compiler/powershell.vim                  |    2 +-
 compiler/python.vim                      |    2 +-
 compiler/rake.vim                        |    2 +-
 compiler/rspec.vim                       |    2 +-
 compiler/ruby.vim                        |    2 +-
 compiler/rubyunit.vim                    |    2 +-
 compiler/rustc.vim                       |    2 +-
 compiler/sass.vim                        |    2 +-
 compiler/sbt.vim                         |    2 +-
 compiler/swift.vim                       |    2 +-
 compiler/tcl.vim                         |    2 +-
 compiler/tidy.vim                        |    2 +-
 compiler/typescript.vim                  |    2 +-
 extras/flow.vim                          |    2 +-
 extras/jsdoc.vim                         |    2 +-
 extras/ngdoc.vim                         |    2 +-
 filetype.vim                             |    2 +-
 ftdetect/polyglot.vim                    | 3609 +--------------------
 ftplugin/8th.vim                         |    2 +-
 ftplugin/a2ps.vim                        |    2 +-
 ftplugin/aap.vim                         |    2 +-
 ftplugin/abap.vim                        |    2 +-
 ftplugin/abaqus.vim                      |    2 +-
 ftplugin/ada.vim                         |    2 +-
 ftplugin/alsaconf.vim                    |    2 +-
 ftplugin/ansible.vim                     |    2 +-
 ftplugin/ansible_hosts.vim               |    2 +-
 ftplugin/ant.vim                         |    2 +-
 ftplugin/arch.vim                        |    2 +-
 ftplugin/art.vim                         |    2 +-
 ftplugin/aspvbs.vim                      |    2 +-
 ftplugin/automake.vim                    |    2 +-
 ftplugin/awk.vim                         |    2 +-
 ftplugin/bdf.vim                         |    2 +-
 ftplugin/blade.vim                       |    2 +-
 ftplugin/bst.vim                         |    2 +-
 ftplugin/bzl.vim                         |    2 +-
 ftplugin/caddyfile.vim                   |    2 +-
 ftplugin/calendar.vim                    |    2 +-
 ftplugin/cdrdaoconf.vim                  |    2 +-
 ftplugin/cfg.vim                         |    2 +-
 ftplugin/ch.vim                          |    2 +-
 ftplugin/clojure.vim                     |    2 +-
 ftplugin/cobol.vim                       |    2 +-
 ftplugin/coffee.vim                      |    2 +-
 ftplugin/conf.vim                        |    2 +-
 ftplugin/config.vim                      |    2 +-
 ftplugin/crm.vim                         |    2 +-
 ftplugin/cryptol/folding.vim             |    2 +-
 ftplugin/crystal.vim                     |    2 +-
 ftplugin/cs.vim                          |    2 +-
 ftplugin/csc.vim                         |    2 +-
 ftplugin/css.vim                         |    2 +-
 ftplugin/csv.vim                         |    2 +-
 ftplugin/cucumber.vim                    |    2 +-
 ftplugin/cvsrc.vim                       |    2 +-
 ftplugin/dart.vim                        |    2 +-
 ftplugin/debchangelog.vim                |    2 +-
 ftplugin/debcontrol.vim                  |    2 +-
 ftplugin/denyhosts.vim                   |    2 +-
 ftplugin/dhall.vim                       |    2 +-
 ftplugin/dictconf.vim                    |    2 +-
 ftplugin/dictdconf.vim                   |    2 +-
 ftplugin/diff.vim                        |    2 +-
 ftplugin/dircolors.vim                   |    2 +-
 ftplugin/docker-compose.vim              |    2 +-
 ftplugin/dockerfile.vim                  |    2 +-
 ftplugin/dosbatch.vim                    |    2 +-
 ftplugin/dosini.vim                      |    2 +-
 ftplugin/dtd.vim                         |    2 +-
 ftplugin/dune.vim                        |    2 +-
 ftplugin/ecrystal.vim                    |    2 +-
 ftplugin/eelixir.vim                     |    2 +-
 ftplugin/elinks.vim                      |    2 +-
 ftplugin/elixir.vim                      |    2 +-
 ftplugin/embeddedpuppet.vim              |    2 +-
 ftplugin/ember-script.vim                |    2 +-
 ftplugin/emblem.vim                      |    2 +-
 ftplugin/erlang.vim                      |    2 +-
 ftplugin/eruby.vim                       |    2 +-
 ftplugin/eterm.vim                       |    2 +-
 ftplugin/falcon.vim                      |    2 +-
 ftplugin/fennel.vim                      |    2 +-
 ftplugin/fetchmail.vim                   |    2 +-
 ftplugin/fish.vim                        |    2 +-
 ftplugin/fortran.vim                     |    2 +-
 ftplugin/framescript.vim                 |    2 +-
 ftplugin/fvwm.vim                        |    2 +-
 ftplugin/gdb.vim                         |    2 +-
 ftplugin/git.vim                         |    2 +-
 ftplugin/gitcommit.vim                   |    2 +-
 ftplugin/gitconfig.vim                   |    2 +-
 ftplugin/gitignore.vim                   |    2 +-
 ftplugin/gitrebase.vim                   |    2 +-
 ftplugin/gitsendemail.vim                |    2 +-
 ftplugin/gleam.vim                       |    2 +-
 ftplugin/gpg.vim                         |    2 +-
 ftplugin/graphql.vim                     |    2 +-
 ftplugin/groovy.vim                      |    2 +-
 ftplugin/group.vim                       |    2 +-
 ftplugin/grub.vim                        |    2 +-
 ftplugin/haml.vim                        |    2 +-
 ftplugin/hamster.vim                     |    2 +-
 ftplugin/handlebars.vim                  |    2 +-
 ftplugin/hcl.vim                         |    2 +-
 ftplugin/help.vim                        |    2 +-
 ftplugin/hgcommit.vim                    |    2 +-
 ftplugin/hive.vim                        |    2 +-
 ftplugin/hog.vim                         |    2 +-
 ftplugin/hostconf.vim                    |    2 +-
 ftplugin/hostsaccess.vim                 |    2 +-
 ftplugin/html.vim                        |    2 +-
 ftplugin/htmldjango.vim                  |    2 +-
 ftplugin/i3config.vim                    |    2 +-
 ftplugin/idris.vim                       |    2 +-
 ftplugin/idris2.vim                      |    2 +-
 ftplugin/indent.vim                      |    2 +-
 ftplugin/ion.vim                         |    2 +-
 ftplugin/j.vim                           |    2 +-
 ftplugin/java.vim                        |    2 +-
 ftplugin/jproperties.vim                 |    2 +-
 ftplugin/jq.vim                          |    2 +-
 ftplugin/json.vim                        |    2 +-
 ftplugin/jsonnet.vim                     |    2 +-
 ftplugin/jsp.vim                         |    2 +-
 ftplugin/julia.vim                       |    2 +-
 ftplugin/juliadoc.vim                    |    2 +-
 ftplugin/kconfig.vim                     |    2 +-
 ftplugin/kotlin.vim                      |    2 +-
 ftplugin/kwt.vim                         |    2 +-
 ftplugin/ld.vim                          |    2 +-
 ftplugin/less.vim                        |    2 +-
 ftplugin/lftp.vim                        |    2 +-
 ftplugin/libao.vim                       |    2 +-
 ftplugin/lilypond.vim                    |    2 +-
 ftplugin/limits.vim                      |    2 +-
 ftplugin/liquid.vim                      |    2 +-
 ftplugin/lisp.vim                        |    2 +-
 ftplugin/litcoffee.vim                   |    2 +-
 ftplugin/llvm.vim                        |    2 +-
 ftplugin/logcheck.vim                    |    2 +-
 ftplugin/loginaccess.vim                 |    2 +-
 ftplugin/logindefs.vim                   |    2 +-
 ftplugin/logtalk.vim                     |    2 +-
 ftplugin/lprolog.vim                     |    2 +-
 ftplugin/ls.vim                          |    2 +-
 ftplugin/m4.vim                          |    2 +-
 ftplugin/mail.vim                        |    2 +-
 ftplugin/mailaliases.vim                 |    2 +-
 ftplugin/mailcap.vim                     |    2 +-
 ftplugin/make.vim                        |    2 +-
 ftplugin/mako.vim                        |    2 +-
 ftplugin/manconf.vim                     |    2 +-
 ftplugin/markdown.vim                    |    2 +-
 ftplugin/meson.vim                       |    2 +-
 ftplugin/mf.vim                          |    2 +-
 ftplugin/mma.vim                         |    2 +-
 ftplugin/modconf.vim                     |    2 +-
 ftplugin/moon.vim                        |    2 +-
 ftplugin/mp.vim                          |    2 +-
 ftplugin/mplayerconf.vim                 |    2 +-
 ftplugin/mrxvtrc.vim                     |    2 +-
 ftplugin/mustache.vim                    |    2 +-
 ftplugin/muttrc.vim                      |    2 +-
 ftplugin/nanorc.vim                      |    2 +-
 ftplugin/neomuttrc.vim                   |    2 +-
 ftplugin/netrc.vim                       |    2 +-
 ftplugin/nginx.vim                       |    2 +-
 ftplugin/nix.vim                         |    2 +-
 ftplugin/nroff.vim                       |    2 +-
 ftplugin/nsis.vim                        |    2 +-
 ftplugin/oasis.vim                       |    2 +-
 ftplugin/objc.vim                        |    2 +-
 ftplugin/ocaml.vim                       |    2 +-
 ftplugin/ocamlbuild_tags.vim             |    2 +-
 ftplugin/occam.vim                       |    2 +-
 ftplugin/omake.vim                       |    2 +-
 ftplugin/opencl.vim                      |    2 +-
 ftplugin/pamconf.vim                     |    2 +-
 ftplugin/pascal.vim                      |    2 +-
 ftplugin/passwd.vim                      |    2 +-
 ftplugin/pdf.vim                         |    2 +-
 ftplugin/perl.vim                        |    2 +-
 ftplugin/pest.vim                        |    2 +-
 ftplugin/pinfo.vim                       |    2 +-
 ftplugin/plantuml.vim                    |    2 +-
 ftplugin/pony.vim                        |    2 +-
 ftplugin/postscr.vim                     |    2 +-
 ftplugin/procmail.vim                    |    2 +-
 ftplugin/prolog.vim                      |    2 +-
 ftplugin/protocols.vim                   |    2 +-
 ftplugin/ps1.vim                         |    2 +-
 ftplugin/ps1xml.vim                      |    2 +-
 ftplugin/pug.vim                         |    2 +-
 ftplugin/puppet.vim                      |    2 +-
 ftplugin/puppet_tagbar.vim               |    2 +-
 ftplugin/purescript.vim                  |    2 +-
 ftplugin/pyrex.vim                       |    2 +-
 ftplugin/qml.vim                         |    2 +-
 ftplugin/quake.vim                       |    2 +-
 ftplugin/racket.vim                      |    2 +-
 ftplugin/raku.vim                        |    2 +-
 ftplugin/raml.vim                        |    2 +-
 ftplugin/razor.vim                       |    2 +-
 ftplugin/readline.vim                    |    2 +-
 ftplugin/reva.vim                        |    2 +-
 ftplugin/rmd.vim                         |    2 +-
 ftplugin/rnc.vim                         |    2 +-
 ftplugin/rnoweb.vim                      |    2 +-
 ftplugin/rpl.vim                         |    2 +-
 ftplugin/rrst.vim                        |    2 +-
 ftplugin/rst.vim                         |    2 +-
 ftplugin/ruby.vim                        |    2 +-
 ftplugin/rust.vim                        |    2 +-
 ftplugin/rust/tagbar.vim                 |    2 +-
 ftplugin/sass.vim                        |    2 +-
 ftplugin/sbt.vim                         |    2 +-
 ftplugin/scala.vim                       |    2 +-
 ftplugin/scala.xpt.vim                   |    2 +-
 ftplugin/scala/tagbar.vim                |    2 +-
 ftplugin/scheme.vim                      |    2 +-
 ftplugin/screen.vim                      |    2 +-
 ftplugin/scss.vim                        |    2 +-
 ftplugin/sensors.vim                     |    2 +-
 ftplugin/services.vim                    |    2 +-
 ftplugin/setserial.vim                   |    2 +-
 ftplugin/sexplib.vim                     |    2 +-
 ftplugin/sieve.vim                       |    2 +-
 ftplugin/slim.vim                        |    2 +-
 ftplugin/slpconf.vim                     |    2 +-
 ftplugin/slpreg.vim                      |    2 +-
 ftplugin/slpspi.vim                      |    2 +-
 ftplugin/smt2.vim                        |    2 +-
 ftplugin/solidity.vim                    |    2 +-
 ftplugin/spec.vim                        |    2 +-
 ftplugin/sql.vim                         |    2 +-
 ftplugin/sshconfig.vim                   |    2 +-
 ftplugin/stylus.vim                      |    2 +-
 ftplugin/sudoers.vim                     |    2 +-
 ftplugin/svelte.vim                      |    2 +-
 ftplugin/swift.vim                       |    2 +-
 ftplugin/swiftgyb.vim                    |    2 +-
 ftplugin/sxhkdrc.vim                     |    2 +-
 ftplugin/sysctl.vim                      |    2 +-
 ftplugin/systemd.vim                     |    2 +-
 ftplugin/systemverilog.vim               |    2 +-
 ftplugin/tablegen.vim                    |    2 +-
 ftplugin/tcl.vim                         |    2 +-
 ftplugin/terminfo.vim                    |    2 +-
 ftplugin/terraform.vim                   |    2 +-
 ftplugin/text.vim                        |    2 +-
 ftplugin/textile.vim                     |    2 +-
 ftplugin/tmux.vim                        |    2 +-
 ftplugin/toml.vim                        |    2 +-
 ftplugin/treetop.vim                     |    2 +-
 ftplugin/tt2html.vim                     |    2 +-
 ftplugin/twig.vim                        |    2 +-
 ftplugin/typescript.vim                  |    2 +-
 ftplugin/typescriptreact.vim             |    2 +-
 ftplugin/udevconf.vim                    |    2 +-
 ftplugin/udevperm.vim                    |    2 +-
 ftplugin/updatedb.vim                    |    2 +-
 ftplugin/vala.vim                        |    2 +-
 ftplugin/vb.vim                          |    2 +-
 ftplugin/verilog.vim                     |    2 +-
 ftplugin/vhdl.vim                        |    2 +-
 ftplugin/vlang.vim                       |    2 +-
 ftplugin/vroom.vim                       |    2 +-
 ftplugin/vue.vim                         |    2 +-
 ftplugin/wast.vim                        |    2 +-
 ftplugin/xdefaults.vim                   |    2 +-
 ftplugin/xf86conf.vim                    |    2 +-
 ftplugin/xhtml.vim                       |    2 +-
 ftplugin/xinetd.vim                      |    2 +-
 ftplugin/xmodmap.vim                     |    2 +-
 ftplugin/xs.vim                          |    2 +-
 ftplugin/xsd.vim                         |    2 +-
 ftplugin/xslt.vim                        |    2 +-
 ftplugin/yaml.vim                        |    2 +-
 ftplugin/zig.vim                         |    2 +-
 ftplugin/zimbu.vim                       |    2 +-
 indent/Jenkinsfile.vim                   |    2 +-
 indent/aap.vim                           |    2 +-
 indent/ada.vim                           |    2 +-
 indent/ansible.vim                       |    2 +-
 indent/ant.vim                           |    2 +-
 indent/applescript.vim                   |    2 +-
 indent/arduino.vim                       |    2 +-
 indent/autohotkey.vim                    |    2 +-
 indent/automake.vim                      |    2 +-
 indent/awk.vim                           |    2 +-
 indent/bib.vim                           |    2 +-
 indent/blade.vim                         |    2 +-
 indent/bst.vim                           |    2 +-
 indent/bzl.vim                           |    2 +-
 indent/cabal.vim                         |    2 +-
 indent/caddyfile.vim                     |    2 +-
 indent/cdl.vim                           |    2 +-
 indent/ch.vim                            |    2 +-
 indent/chaiscript.vim                    |    2 +-
 indent/clojure.vim                       |    2 +-
 indent/cmake.vim                         |    2 +-
 indent/cobol.vim                         |    2 +-
 indent/coffee.vim                        |    2 +-
 indent/config.vim                        |    2 +-
 indent/crystal.vim                       |    2 +-
 indent/cs.vim                            |    2 +-
 indent/css.vim                           |    2 +-
 indent/cucumber.vim                      |    2 +-
 indent/cuda.vim                          |    2 +-
 indent/cython.vim                        |    2 +-
 indent/d.vim                             |    2 +-
 indent/dart.vim                          |    2 +-
 indent/dictconf.vim                      |    2 +-
 indent/dictdconf.vim                     |    2 +-
 indent/dosbatch.vim                      |    2 +-
 indent/dtd.vim                           |    2 +-
 indent/dune.vim                          |    2 +-
 indent/dylan.vim                         |    2 +-
 indent/ecrystal.vim                      |    2 +-
 indent/eelixir.vim                       |    2 +-
 indent/elixir.vim                        |    2 +-
 indent/elm.vim                           |    2 +-
 indent/ember-script.vim                  |    2 +-
 indent/emblem.vim                        |    2 +-
 indent/erlang.vim                        |    2 +-
 indent/eruby.vim                         |    2 +-
 indent/eterm.vim                         |    2 +-
 indent/falcon.vim                        |    2 +-
 indent/fennel.vim                        |    2 +-
 indent/fish.vim                          |    2 +-
 indent/fortran.vim                       |    2 +-
 indent/framescript.vim                   |    2 +-
 indent/fsharp.vim                        |    2 +-
 indent/gdscript3.vim                     |    2 +-
 indent/gitconfig.vim                     |    2 +-
 indent/gitolite.vim                      |    2 +-
 indent/glsl.vim                          |    2 +-
 indent/go.vim                            |    2 +-
 indent/gohtmltmpl.vim                    |    2 +-
 indent/graphql.vim                       |    2 +-
 indent/haml.vim                          |    2 +-
 indent/hamster.vim                       |    2 +-
 indent/handlebars.vim                    |    2 +-
 indent/haskell.vim                       |    2 +-
 indent/hcl.vim                           |    2 +-
 indent/hog.vim                           |    2 +-
 indent/html.vim                          |    2 +-
 indent/htmldjango.vim                    |    2 +-
 indent/idris.vim                         |    2 +-
 indent/idris2.vim                        |    2 +-
 indent/j.vim                             |    2 +-
 indent/java.vim                          |    2 +-
 indent/javascript.vim                    |    2 +-
 indent/json.vim                          |    2 +-
 indent/jsonc.vim                         |    2 +-
 indent/jsp.vim                           |    2 +-
 indent/jst.vim                           |    2 +-
 indent/julia.vim                         |    2 +-
 indent/kotlin.vim                        |    2 +-
 indent/ld.vim                            |    2 +-
 indent/ledger.vim                        |    2 +-
 indent/less.vim                          |    2 +-
 indent/lifelines.vim                     |    2 +-
 indent/lilypond.vim                      |    2 +-
 indent/liquid.vim                        |    2 +-
 indent/lisp.vim                          |    2 +-
 indent/litcoffee.vim                     |    2 +-
 indent/llvm.vim                          |    2 +-
 indent/logtalk.vim                       |    2 +-
 indent/ls.vim                            |    2 +-
 indent/lua.vim                           |    2 +-
 indent/mail.vim                          |    2 +-
 indent/make.vim                          |    2 +-
 indent/mako.vim                          |    2 +-
 indent/markdown.vim                      |    2 +-
 indent/meson.vim                         |    2 +-
 indent/mf.vim                            |    2 +-
 indent/moon.vim                          |    2 +-
 indent/mp.vim                            |    2 +-
 indent/mustache.vim                      |    2 +-
 indent/nginx.vim                         |    2 +-
 indent/nim.vim                           |    2 +-
 indent/nix.vim                           |    2 +-
 indent/nsis.vim                          |    2 +-
 indent/ocaml.vim                         |    2 +-
 indent/occam.vim                         |    2 +-
 indent/octave.vim                        |    2 +-
 indent/odin.vim                          |    2 +-
 indent/omake.vim                         |    2 +-
 indent/opencl.vim                        |    2 +-
 indent/pascal.vim                        |    2 +-
 indent/perl.vim                          |    2 +-
 indent/pgsql.vim                         |    2 +-
 indent/plantuml.vim                      |    2 +-
 indent/pony.vim                          |    2 +-
 indent/postscr.vim                       |    2 +-
 indent/pov.vim                           |    2 +-
 indent/prolog.vim                        |    2 +-
 indent/proto.vim                         |    2 +-
 indent/ps1.vim                           |    2 +-
 indent/pug.vim                           |    2 +-
 indent/puppet.vim                        |    2 +-
 indent/purescript.vim                    |    2 +-
 indent/pyrex.vim                         |    2 +-
 indent/python.vim                        |    2 +-
 indent/qml.vim                           |    2 +-
 indent/racket.vim                        |    2 +-
 indent/raku.vim                          |    2 +-
 indent/razor.vim                         |    2 +-
 indent/readline.vim                      |    2 +-
 indent/reason.vim                        |    2 +-
 indent/rmd.vim                           |    2 +-
 indent/rnoweb.vim                        |    2 +-
 indent/rpl.vim                           |    2 +-
 indent/rrst.vim                          |    2 +-
 indent/rst.vim                           |    2 +-
 indent/ruby.vim                          |    2 +-
 indent/rust.vim                          |    2 +-
 indent/sas.vim                           |    2 +-
 indent/sass.vim                          |    2 +-
 indent/scala.vim                         |    2 +-
 indent/scheme.vim                        |    2 +-
 indent/scss.vim                          |    2 +-
 indent/sdl.vim                           |    2 +-
 indent/slim.vim                          |    2 +-
 indent/slime.vim                         |    2 +-
 indent/sml.vim                           |    2 +-
 indent/solidity.vim                      |    2 +-
 indent/sql.vim                           |    2 +-
 indent/sshconfig.vim                     |    2 +-
 indent/stylus.vim                        |    2 +-
 indent/svelte.vim                        |    2 +-
 indent/svg.vim                           |    2 +-
 indent/swift.vim                         |    2 +-
 indent/systemverilog.vim                 |    2 +-
 indent/tcl.vim                           |    2 +-
 indent/teraterm.vim                      |    2 +-
 indent/terraform.vim                     |    2 +-
 indent/tf.vim                            |    2 +-
 indent/tilde.vim                         |    2 +-
 indent/treetop.vim                       |    2 +-
 indent/twig.vim                          |    2 +-
 indent/typescript.vim                    |    2 +-
 indent/typescriptreact.vim               |    2 +-
 indent/vala.vim                          |    2 +-
 indent/vb.vim                            |    2 +-
 indent/velocity.vim                      |    2 +-
 indent/verilog.vim                       |    2 +-
 indent/vhdl.vim                          |    2 +-
 indent/vlang.vim                         |    2 +-
 indent/vroom.vim                         |    2 +-
 indent/vue.vim                           |    2 +-
 indent/wast.vim                          |    2 +-
 indent/xf86conf.vim                      |    2 +-
 indent/xhtml.vim                         |    2 +-
 indent/xinetd.vim                        |    2 +-
 indent/xsd.vim                           |    2 +-
 indent/xslt.vim                          |    2 +-
 indent/yacc.vim                          |    2 +-
 indent/yaml.vim                          |    2 +-
 indent/zig.vim                           |    2 +-
 indent/zimbu.vim                         |    2 +-
 plugin/polyglot.vim                      |    4 +-
 scripts/build                            |    9 +-
 syntax/8th.vim                           |    2 +-
 syntax/Jenkinsfile.vim                   |    2 +-
 syntax/a2ps.vim                          |    2 +-
 syntax/a65.vim                           |    2 +-
 syntax/aap.vim                           |    2 +-
 syntax/abap.vim                          |    2 +-
 syntax/abaqus.vim                        |    2 +-
 syntax/abc.vim                           |    2 +-
 syntax/abel.vim                          |    2 +-
 syntax/acedb.vim                         |    2 +-
 syntax/ada.vim                           |    2 +-
 syntax/ahdl.vim                          |    2 +-
 syntax/aidl.vim                          |    2 +-
 syntax/alsaconf.vim                      |    2 +-
 syntax/aml.vim                           |    2 +-
 syntax/ampl.vim                          |    2 +-
 syntax/ansible.vim                       |    2 +-
 syntax/ansible_hosts.vim                 |    2 +-
 syntax/ant.vim                           |    2 +-
 syntax/apache.vim                        |    2 +-
 syntax/apachestyle.vim                   |    2 +-
 syntax/apiblueprint.vim                  |    2 +-
 syntax/applescript.vim                   |    2 +-
 syntax/aptconf.vim                       |    2 +-
 syntax/arch.vim                          |    2 +-
 syntax/arduino.vim                       |    2 +-
 syntax/art.vim                           |    2 +-
 syntax/asciidoc.vim                      |    2 +-
 syntax/asl.vim                           |    2 +-
 syntax/asn.vim                           |    2 +-
 syntax/aspperl.vim                       |    2 +-
 syntax/aspvbs.vim                        |    2 +-
 syntax/asterisk.vim                      |    2 +-
 syntax/asteriskvm.vim                    |    2 +-
 syntax/atlas.vim                         |    2 +-
 syntax/autodoc.vim                       |    2 +-
 syntax/autoit.vim                        |    2 +-
 syntax/automake.vim                      |    2 +-
 syntax/ave.vim                           |    2 +-
 syntax/awk.vim                           |    2 +-
 syntax/b.vim                             |    2 +-
 syntax/basic.vim                         |    2 +-
 syntax/basic/class.vim                   |    2 +-
 syntax/basic/cluster.vim                 |    2 +-
 syntax/basic/decorator.vim               |    2 +-
 syntax/basic/doc.vim                     |    2 +-
 syntax/basic/function.vim                |    2 +-
 syntax/basic/identifiers.vim             |    2 +-
 syntax/basic/keyword.vim                 |    2 +-
 syntax/basic/literal.vim                 |    2 +-
 syntax/basic/members.vim                 |    2 +-
 syntax/basic/object.vim                  |    2 +-
 syntax/basic/patch.vim                   |    2 +-
 syntax/basic/reserved.vim                |    2 +-
 syntax/basic/symbols.vim                 |    2 +-
 syntax/basic/type.vim                    |    2 +-
 syntax/bc.vim                            |    2 +-
 syntax/bdf.vim                           |    2 +-
 syntax/bib.vim                           |    2 +-
 syntax/bindzone.vim                      |    2 +-
 syntax/blade.vim                         |    2 +-
 syntax/blank.vim                         |    2 +-
 syntax/brewfile.vim                      |    2 +-
 syntax/bsdl.vim                          |    2 +-
 syntax/bst.vim                           |    2 +-
 syntax/bzl.vim                           |    2 +-
 syntax/bzr.vim                           |    2 +-
 syntax/c.vim                             |    2 +-
 syntax/cabal-1.vim                       |    2 +-
 syntax/cabal-2.vim                       |    2 +-
 syntax/caddyfile.vim                     |    2 +-
 syntax/calendar.vim                      |    2 +-
 syntax/carp.vim                          |    2 +-
 syntax/catalog.vim                       |    2 +-
 syntax/cdl.vim                           |    2 +-
 syntax/cdrdaoconf.vim                    |    2 +-
 syntax/cdrtoc.vim                        |    2 +-
 syntax/cf.vim                            |    2 +-
 syntax/cfg.vim                           |    2 +-
 syntax/ch.vim                            |    2 +-
 syntax/chaiscript.vim                    |    2 +-
 syntax/chaskell.vim                      |    2 +-
 syntax/chill.vim                         |    2 +-
 syntax/chordpro.vim                      |    2 +-
 syntax/cl.vim                            |    2 +-
 syntax/clean.vim                         |    2 +-
 syntax/clojure.vim                       |    2 +-
 syntax/cmake.vim                         |    2 +-
 syntax/cmod.vim                          |    2 +-
 syntax/cmusrc.vim                        |    2 +-
 syntax/cobol.vim                         |    2 +-
 syntax/coco.vim                          |    2 +-
 syntax/coffee.vim                        |    2 +-
 syntax/common.vim                        |    2 +-
 syntax/conaryrecipe.vim                  |    2 +-
 syntax/conf.vim                          |    2 +-
 syntax/config.vim                        |    2 +-
 syntax/cpp.vim                           |    2 +-
 syntax/cql.vim                           |    2 +-
 syntax/crm.vim                           |    2 +-
 syntax/crontab.vim                       |    2 +-
 syntax/cryptol.vim                       |    2 +-
 syntax/crystal.vim                       |    2 +-
 syntax/cs.vim                            |    2 +-
 syntax/csc.vim                           |    2 +-
 syntax/csdl.vim                          |    2 +-
 syntax/csp.vim                           |    2 +-
 syntax/css.vim                           |    2 +-
 syntax/csv.vim                           |    2 +-
 syntax/cterm.vim                         |    2 +-
 syntax/cucumber.vim                      |    2 +-
 syntax/cuda.vim                          |    2 +-
 syntax/cuesheet.vim                      |    2 +-
 syntax/cupl.vim                          |    2 +-
 syntax/cuplsim.vim                       |    2 +-
 syntax/cvs.vim                           |    2 +-
 syntax/cvsrc.vim                         |    2 +-
 syntax/cynpp.vim                         |    2 +-
 syntax/d.vim                             |    2 +-
 syntax/dart.vim                          |    2 +-
 syntax/datascript.vim                    |    2 +-
 syntax/dcd.vim                           |    2 +-
 syntax/dcov.vim                          |    2 +-
 syntax/dd.vim                            |    2 +-
 syntax/ddoc.vim                          |    2 +-
 syntax/debchangelog.vim                  |    2 +-
 syntax/debcontrol.vim                    |    2 +-
 syntax/debcopyright.vim                  |    2 +-
 syntax/debsources.vim                    |    2 +-
 syntax/def.vim                           |    2 +-
 syntax/denyhosts.vim                     |    2 +-
 syntax/desc.vim                          |    2 +-
 syntax/desktop.vim                       |    2 +-
 syntax/dhall.vim                         |    2 +-
 syntax/dictconf.vim                      |    2 +-
 syntax/dictdconf.vim                     |    2 +-
 syntax/diff.vim                          |    2 +-
 syntax/dircolors.vim                     |    2 +-
 syntax/django.vim                        |    2 +-
 syntax/dnsmasq.vim                       |    2 +-
 syntax/docker-compose.vim                |    2 +-
 syntax/dockerfile.vim                    |    2 +-
 syntax/dosbatch.vim                      |    2 +-
 syntax/dosini.vim                        |    2 +-
 syntax/dot.vim                           |    2 +-
 syntax/dracula.vim                       |    2 +-
 syntax/dsdl.vim                          |    2 +-
 syntax/dsl.vim                           |    2 +-
 syntax/dtd.vim                           |    2 +-
 syntax/dts.vim                           |    2 +-
 syntax/dune.vim                          |    2 +-
 syntax/dylan.vim                         |    2 +-
 syntax/dylanintr.vim                     |    2 +-
 syntax/dylanlid.vim                      |    2 +-
 syntax/ecd.vim                           |    2 +-
 syntax/ecrystal.vim                      |    2 +-
 syntax/edif.vim                          |    2 +-
 syntax/eelixir.vim                       |    2 +-
 syntax/elf.vim                           |    2 +-
 syntax/elinks.vim                        |    2 +-
 syntax/elixir.vim                        |    2 +-
 syntax/elm.vim                           |    2 +-
 syntax/elmfilt.vim                       |    2 +-
 syntax/embeddedpuppet.vim                |    2 +-
 syntax/ember-script.vim                  |    2 +-
 syntax/emblem.vim                        |    2 +-
 syntax/erlang.vim                        |    2 +-
 syntax/eruby.vim                         |    2 +-
 syntax/esmtprc.vim                       |    2 +-
 syntax/esqlc.vim                         |    2 +-
 syntax/esterel.vim                       |    2 +-
 syntax/eterm.vim                         |    2 +-
 syntax/exim.vim                          |    2 +-
 syntax/expect.vim                        |    2 +-
 syntax/exports.vim                       |    2 +-
 syntax/falcon.vim                        |    2 +-
 syntax/fan.vim                           |    2 +-
 syntax/fbs.vim                           |    2 +-
 syntax/fennel.vim                        |    2 +-
 syntax/ferm.vim                          |    2 +-
 syntax/fetchmail.vim                     |    2 +-
 syntax/fgl.vim                           |    2 +-
 syntax/fish.vim                          |    2 +-
 syntax/flow.vim                          |    2 +-
 syntax/focexec.vim                       |    2 +-
 syntax/forth.vim                         |    2 +-
 syntax/fortran.vim                       |    2 +-
 syntax/framescript.vim                   |    2 +-
 syntax/freebasic.vim                     |    2 +-
 syntax/fsharp.vim                        |    2 +-
 syntax/fstab.vim                         |    2 +-
 syntax/fvwm.vim                          |    2 +-
 syntax/gdb.vim                           |    2 +-
 syntax/gdmo.vim                          |    2 +-
 syntax/gdscript3.vim                     |    2 +-
 syntax/gedcom.vim                        |    2 +-
 syntax/git.vim                           |    2 +-
 syntax/gitcommit.vim                     |    2 +-
 syntax/gitconfig.vim                     |    2 +-
 syntax/gitignore.vim                     |    2 +-
 syntax/gitolite.vim                      |    2 +-
 syntax/gitrebase.vim                     |    2 +-
 syntax/gitsendemail.vim                  |    2 +-
 syntax/gkrellmrc.vim                     |    2 +-
 syntax/gleam.vim                         |    2 +-
 syntax/glsl.vim                          |    2 +-
 syntax/gmpl.vim                          |    2 +-
 syntax/gnash.vim                         |    2 +-
 syntax/gnuplot.vim                       |    2 +-
 syntax/go.vim                            |    2 +-
 syntax/godebugoutput.vim                 |    2 +-
 syntax/godebugstacktrace.vim             |    2 +-
 syntax/godebugvariables.vim              |    2 +-
 syntax/godefstack.vim                    |    2 +-
 syntax/gohtmltmpl.vim                    |    2 +-
 syntax/gomod.vim                         |    2 +-
 syntax/gosum.vim                         |    2 +-
 syntax/gotexttmpl.vim                    |    2 +-
 syntax/gp.vim                            |    2 +-
 syntax/gpg.vim                           |    2 +-
 syntax/grads.vim                         |    2 +-
 syntax/graphql.vim                       |    2 +-
 syntax/gretl.vim                         |    2 +-
 syntax/groovy.vim                        |    2 +-
 syntax/group.vim                         |    2 +-
 syntax/grub.vim                          |    2 +-
 syntax/gsl.vim                           |    2 +-
 syntax/gsp.vim                           |    2 +-
 syntax/gtkrc.vim                         |    2 +-
 syntax/haml.vim                          |    2 +-
 syntax/hamster.vim                       |    2 +-
 syntax/handlebars.vim                    |    2 +-
 syntax/haproxy.vim                       |    2 +-
 syntax/haskell.vim                       |    2 +-
 syntax/haste.vim                         |    2 +-
 syntax/hastepreproc.vim                  |    2 +-
 syntax/haxe.vim                          |    2 +-
 syntax/hb.vim                            |    2 +-
 syntax/hcl.vim                           |    2 +-
 syntax/helm.vim                          |    2 +-
 syntax/help.vim                          |    2 +-
 syntax/hercules.vim                      |    2 +-
 syntax/hex.vim                           |    2 +-
 syntax/hgcommit.vim                      |    2 +-
 syntax/hive.vim                          |    2 +-
 syntax/hog.vim                           |    2 +-
 syntax/hollywood.vim                     |    2 +-
 syntax/hostconf.vim                      |    2 +-
 syntax/hostsaccess.vim                   |    2 +-
 syntax/html.vim                          |    2 +-
 syntax/htmldjango.vim                    |    2 +-
 syntax/htmlm4.vim                        |    2 +-
 syntax/i3config.vim                      |    2 +-
 syntax/ibasic.vim                        |    2 +-
 syntax/icalendar.vim                     |    2 +-
 syntax/icemenu.vim                       |    2 +-
 syntax/icon.vim                          |    2 +-
 syntax/idris.vim                         |    2 +-
 syntax/idris2.vim                        |    2 +-
 syntax/indent.vim                        |    2 +-
 syntax/inform.vim                        |    2 +-
 syntax/initng.vim                        |    2 +-
 syntax/inittab.vim                       |    2 +-
 syntax/ion.vim                           |    2 +-
 syntax/ipfilter.vim                      |    2 +-
 syntax/iss.vim                           |    2 +-
 syntax/ist.vim                           |    2 +-
 syntax/j.vim                             |    2 +-
 syntax/jal.vim                           |    2 +-
 syntax/jam.vim                           |    2 +-
 syntax/java.vim                          |    2 +-
 syntax/javacc.vim                        |    2 +-
 syntax/javascript.vim                    |    2 +-
 syntax/jess.vim                          |    2 +-
 syntax/jgraph.vim                        |    2 +-
 syntax/jinja2.vim                        |    2 +-
 syntax/jovial.vim                        |    2 +-
 syntax/jproperties.vim                   |    2 +-
 syntax/jq.vim                            |    2 +-
 syntax/json.vim                          |    2 +-
 syntax/json5.vim                         |    2 +-
 syntax/jsonc.vim                         |    2 +-
 syntax/jsonnet.vim                       |    2 +-
 syntax/jsp.vim                           |    2 +-
 syntax/jst.vim                           |    2 +-
 syntax/julia.vim                         |    2 +-
 syntax/juliadoc.vim                      |    2 +-
 syntax/kconfig.vim                       |    2 +-
 syntax/kivy.vim                          |    2 +-
 syntax/kix.vim                           |    2 +-
 syntax/kotlin.vim                        |    2 +-
 syntax/kscript.vim                       |    2 +-
 syntax/kwt.vim                           |    2 +-
 syntax/lace.vim                          |    2 +-
 syntax/latte.vim                         |    2 +-
 syntax/ld.vim                            |    2 +-
 syntax/ldif.vim                          |    2 +-
 syntax/ledger.vim                        |    2 +-
 syntax/less.vim                          |    2 +-
 syntax/lex.vim                           |    2 +-
 syntax/lftp.vim                          |    2 +-
 syntax/lhaskell.vim                      |    2 +-
 syntax/libao.vim                         |    2 +-
 syntax/lidris.vim                        |    2 +-
 syntax/lidris2.vim                       |    2 +-
 syntax/lifelines.vim                     |    2 +-
 syntax/lilo.vim                          |    2 +-
 syntax/lilypond-words.vim                |    2 +-
 syntax/lilypond.vim                      |    2 +-
 syntax/limits.vim                        |    2 +-
 syntax/liquid.vim                        |    2 +-
 syntax/lisp.vim                          |    2 +-
 syntax/litcoffee.vim                     |    2 +-
 syntax/lite.vim                          |    2 +-
 syntax/litestep.vim                      |    2 +-
 syntax/llvm.vim                          |    2 +-
 syntax/log.vim                           |    2 +-
 syntax/loginaccess.vim                   |    2 +-
 syntax/logindefs.vim                     |    2 +-
 syntax/logtalk.vim                       |    2 +-
 syntax/lotos.vim                         |    2 +-
 syntax/lout.vim                          |    2 +-
 syntax/lpc.vim                           |    2 +-
 syntax/lprolog.vim                       |    2 +-
 syntax/ls.vim                            |    2 +-
 syntax/lsl.vim                           |    2 +-
 syntax/lss.vim                           |    2 +-
 syntax/lua.vim                           |    2 +-
 syntax/lynx.vim                          |    2 +-
 syntax/m4.vim                            |    2 +-
 syntax/mail.vim                          |    2 +-
 syntax/mailaliases.vim                   |    2 +-
 syntax/mailcap.vim                       |    2 +-
 syntax/make.vim                          |    2 +-
 syntax/mako.vim                          |    2 +-
 syntax/mallard.vim                       |    2 +-
 syntax/manconf.vim                       |    2 +-
 syntax/maple.vim                         |    2 +-
 syntax/markdown.vim                      |    2 +-
 syntax/mason.vim                         |    2 +-
 syntax/master.vim                        |    2 +-
 syntax/mel.vim                           |    2 +-
 syntax/merlin.vim                        |    2 +-
 syntax/meson.vim                         |    2 +-
 syntax/messages.vim                      |    2 +-
 syntax/mf.vim                            |    2 +-
 syntax/mgl.vim                           |    2 +-
 syntax/mgp.vim                           |    2 +-
 syntax/mib.vim                           |    2 +-
 syntax/mint.vim                          |    2 +-
 syntax/mix.vim                           |    2 +-
 syntax/mma.vim                           |    2 +-
 syntax/mmp.vim                           |    2 +-
 syntax/modconf.vim                       |    2 +-
 syntax/modula2.vim                       |    2 +-
 syntax/modula3.vim                       |    2 +-
 syntax/monk.vim                          |    2 +-
 syntax/moo.vim                           |    2 +-
 syntax/moon.vim                          |    2 +-
 syntax/mp.vim                            |    2 +-
 syntax/mplayerconf.vim                   |    2 +-
 syntax/mrxvtrc.vim                       |    2 +-
 syntax/msidl.vim                         |    2 +-
 syntax/msql.vim                          |    2 +-
 syntax/mupad.vim                         |    2 +-
 syntax/murphi.vim                        |    2 +-
 syntax/mush.vim                          |    2 +-
 syntax/mustache.vim                      |    2 +-
 syntax/muttrc.vim                        |    2 +-
 syntax/mysql.vim                         |    2 +-
 syntax/n1ql.vim                          |    2 +-
 syntax/named.vim                         |    2 +-
 syntax/nanorc.vim                        |    2 +-
 syntax/natural.vim                       |    2 +-
 syntax/ncf.vim                           |    2 +-
 syntax/neomuttrc.vim                     |    2 +-
 syntax/netrc.vim                         |    2 +-
 syntax/nginx.vim                         |    2 +-
 syntax/nim.vim                           |    2 +-
 syntax/ninja.vim                         |    2 +-
 syntax/nix.vim                           |    2 +-
 syntax/nqc.vim                           |    2 +-
 syntax/nroff.vim                         |    2 +-
 syntax/nsis.vim                          |    2 +-
 syntax/oasis.vim                         |    2 +-
 syntax/obj.vim                           |    2 +-
 syntax/ocaml.vim                         |    2 +-
 syntax/ocamlbuild_tags.vim               |    2 +-
 syntax/occam.vim                         |    2 +-
 syntax/ocpbuild.vim                      |    2 +-
 syntax/ocpbuildroot.vim                  |    2 +-
 syntax/octave.vim                        |    2 +-
 syntax/odin.vim                          |    2 +-
 syntax/omake.vim                         |    2 +-
 syntax/omnimark.vim                      |    2 +-
 syntax/opam.vim                          |    2 +-
 syntax/opencl.vim                        |    2 +-
 syntax/openroad.vim                      |    2 +-
 syntax/opl.vim                           |    2 +-
 syntax/ora.vim                           |    2 +-
 syntax/pamconf.vim                       |    2 +-
 syntax/pamenv.vim                        |    2 +-
 syntax/papp.vim                          |    2 +-
 syntax/pascal.vim                        |    2 +-
 syntax/passwd.vim                        |    2 +-
 syntax/pccts.vim                         |    2 +-
 syntax/pdf.vim                           |    2 +-
 syntax/perl.vim                          |    2 +-
 syntax/pest.vim                          |    2 +-
 syntax/pf.vim                            |    2 +-
 syntax/pfmain.vim                        |    2 +-
 syntax/pgsql.vim                         |    2 +-
 syntax/php.vim                           |    2 +-
 syntax/pike.vim                          |    2 +-
 syntax/pilrc.vim                         |    2 +-
 syntax/pine.vim                          |    2 +-
 syntax/pinfo.vim                         |    2 +-
 syntax/plantuml.vim                      |    2 +-
 syntax/pli.vim                           |    2 +-
 syntax/plm.vim                           |    2 +-
 syntax/plp.vim                           |    2 +-
 syntax/plsql.vim                         |    2 +-
 syntax/po.vim                            |    2 +-
 syntax/pod.vim                           |    2 +-
 syntax/pony.vim                          |    2 +-
 syntax/postscr.vim                       |    2 +-
 syntax/pov.vim                           |    2 +-
 syntax/povini.vim                        |    2 +-
 syntax/ppd.vim                           |    2 +-
 syntax/ppwiz.vim                         |    2 +-
 syntax/privoxy.vim                       |    2 +-
 syntax/procmail.vim                      |    2 +-
 syntax/prolog.vim                        |    2 +-
 syntax/promela.vim                       |    2 +-
 syntax/proto.vim                         |    2 +-
 syntax/protocols.vim                     |    2 +-
 syntax/ps1.vim                           |    2 +-
 syntax/ps1xml.vim                        |    2 +-
 syntax/psf.vim                           |    2 +-
 syntax/pug.vim                           |    2 +-
 syntax/puppet.vim                        |    2 +-
 syntax/purescript.vim                    |    2 +-
 syntax/pyrex.vim                         |    2 +-
 syntax/python.vim                        |    2 +-
 syntax/qmake.vim                         |    2 +-
 syntax/qml.vim                           |    2 +-
 syntax/quake.vim                         |    2 +-
 syntax/racket.vim                        |    2 +-
 syntax/radiance.vim                      |    2 +-
 syntax/ragel.vim                         |    2 +-
 syntax/raku.vim                          |    2 +-
 syntax/raml.vim                          |    2 +-
 syntax/ratpoison.vim                     |    2 +-
 syntax/razor.vim                         |    2 +-
 syntax/rc.vim                            |    2 +-
 syntax/rcs.vim                           |    2 +-
 syntax/readline.vim                      |    2 +-
 syntax/reason.vim                        |    2 +-
 syntax/rego.vim                          |    2 +-
 syntax/remind.vim                        |    2 +-
 syntax/requirements.vim                  |    2 +-
 syntax/resolv.vim                        |    2 +-
 syntax/reva.vim                          |    2 +-
 syntax/rexx.vim                          |    2 +-
 syntax/rhelp.vim                         |    2 +-
 syntax/rib.vim                           |    2 +-
 syntax/rmd.vim                           |    2 +-
 syntax/rnc.vim                           |    2 +-
 syntax/rng.vim                           |    2 +-
 syntax/rnoweb-1.vim                      |    2 +-
 syntax/rnoweb-2.vim                      |    2 +-
 syntax/robots.vim                        |    2 +-
 syntax/rpcgen.vim                        |    2 +-
 syntax/rpl.vim                           |    2 +-
 syntax/rrst.vim                          |    2 +-
 syntax/rst.vim                           |    2 +-
 syntax/rtf.vim                           |    2 +-
 syntax/ruby.vim                          |    2 +-
 syntax/rust.vim                          |    2 +-
 syntax/samba.vim                         |    2 +-
 syntax/sas.vim                           |    2 +-
 syntax/sass.vim                          |    2 +-
 syntax/sather.vim                        |    2 +-
 syntax/sbt.vim                           |    2 +-
 syntax/scala.vim                         |    2 +-
 syntax/scheme.vim                        |    2 +-
 syntax/scilab.vim                        |    2 +-
 syntax/screen.vim                        |    2 +-
 syntax/scss.vim                          |    2 +-
 syntax/sd.vim                            |    2 +-
 syntax/sdc.vim                           |    2 +-
 syntax/sdl.vim                           |    2 +-
 syntax/sed.vim                           |    2 +-
 syntax/sensors.vim                       |    2 +-
 syntax/services.vim                      |    2 +-
 syntax/setserial.vim                     |    2 +-
 syntax/sexplib.vim                       |    2 +-
 syntax/sh.vim                            |    2 +-
 syntax/sieve.vim                         |    2 +-
 syntax/sil.vim                           |    2 +-
 syntax/simula.vim                        |    2 +-
 syntax/sinda.vim                         |    2 +-
 syntax/sisu.vim                          |    2 +-
 syntax/skill.vim                         |    2 +-
 syntax/slang.vim                         |    2 +-
 syntax/slice.vim                         |    2 +-
 syntax/slim.vim                          |    2 +-
 syntax/slime.vim                         |    2 +-
 syntax/slpconf.vim                       |    2 +-
 syntax/slpreg.vim                        |    2 +-
 syntax/slpspi.vim                        |    2 +-
 syntax/slrnrc.vim                        |    2 +-
 syntax/slrnsc.vim                        |    2 +-
 syntax/sm.vim                            |    2 +-
 syntax/smarty.vim                        |    2 +-
 syntax/smcl.vim                          |    2 +-
 syntax/smhl.vim                          |    2 +-
 syntax/smith.vim                         |    2 +-
 syntax/sml.vim                           |    2 +-
 syntax/smt2.vim                          |    2 +-
 syntax/snobol4.vim                       |    2 +-
 syntax/solidity.vim                      |    2 +-
 syntax/spec.vim                          |    2 +-
 syntax/spice.vim                         |    2 +-
 syntax/spup.vim                          |    2 +-
 syntax/spyce.vim                         |    2 +-
 syntax/sql.vim                           |    2 +-
 syntax/sqlj.vim                          |    2 +-
 syntax/sqloracle.vim                     |    2 +-
 syntax/sqr.vim                           |    2 +-
 syntax/squid.vim                         |    2 +-
 syntax/srec.vim                          |    2 +-
 syntax/sshconfig.vim                     |    2 +-
 syntax/sshdconfig.vim                    |    2 +-
 syntax/st.vim                            |    2 +-
 syntax/stata.vim                         |    2 +-
 syntax/stp.vim                           |    2 +-
 syntax/stylus.vim                        |    2 +-
 syntax/sudoers.vim                       |    2 +-
 syntax/svelte.vim                        |    2 +-
 syntax/svg.vim                           |    2 +-
 syntax/svn.vim                           |    2 +-
 syntax/swift.vim                         |    2 +-
 syntax/swiftgyb.vim                      |    2 +-
 syntax/sxhkdrc.vim                       |    2 +-
 syntax/sysctl.vim                        |    2 +-
 syntax/systemd.vim                       |    2 +-
 syntax/systemverilog.vim                 |    2 +-
 syntax/tablegen.vim                      |    2 +-
 syntax/tads.vim                          |    2 +-
 syntax/tags.vim                          |    2 +-
 syntax/tak.vim                           |    2 +-
 syntax/tap.vim                           |    2 +-
 syntax/taskdata.vim                      |    2 +-
 syntax/taskedit.vim                      |    2 +-
 syntax/tcl.vim                           |    2 +-
 syntax/template.vim                      |    2 +-
 syntax/teraterm.vim                      |    2 +-
 syntax/terminfo.vim                      |    2 +-
 syntax/terraform.vim                     |    2 +-
 syntax/texinfo.vim                       |    2 +-
 syntax/texmf.vim                         |    2 +-
 syntax/textile.vim                       |    2 +-
 syntax/tf.vim                            |    2 +-
 syntax/thrift.vim                        |    2 +-
 syntax/tidy.vim                          |    2 +-
 syntax/tilde.vim                         |    2 +-
 syntax/tli.vim                           |    2 +-
 syntax/tmux.vim                          |    2 +-
 syntax/toml.vim                          |    2 +-
 syntax/tpp.vim                           |    2 +-
 syntax/tptp.vim                          |    2 +-
 syntax/trasys.vim                        |    2 +-
 syntax/treetop.vim                       |    2 +-
 syntax/trustees.vim                      |    2 +-
 syntax/tsalt.vim                         |    2 +-
 syntax/tsscl.vim                         |    2 +-
 syntax/tssgm.vim                         |    2 +-
 syntax/tssop.vim                         |    2 +-
 syntax/tt2.vim                           |    2 +-
 syntax/tt2html.vim                       |    2 +-
 syntax/tt2js.vim                         |    2 +-
 syntax/twig.vim                          |    2 +-
 syntax/typescript.vim                    |    2 +-
 syntax/typescriptreact.vim               |    2 +-
 syntax/uc.vim                            |    2 +-
 syntax/udevconf.vim                      |    2 +-
 syntax/udevperm.vim                      |    2 +-
 syntax/uil.vim                           |    2 +-
 syntax/unison.vim                        |    2 +-
 syntax/updatedb.vim                      |    2 +-
 syntax/upstart.vim                       |    2 +-
 syntax/upstreamdat.vim                   |    2 +-
 syntax/upstreaminstalllog.vim            |    2 +-
 syntax/upstreamlog.vim                   |    2 +-
 syntax/usserverlog.vim                   |    2 +-
 syntax/usw2kagtlog.vim                   |    2 +-
 syntax/vala.vim                          |    2 +-
 syntax/vb.vim                            |    2 +-
 syntax/vbnet.vim                         |    2 +-
 syntax/vcl.vim                           |    2 +-
 syntax/velocity.vim                      |    2 +-
 syntax/vera.vim                          |    2 +-
 syntax/verilog.vim                       |    2 +-
 syntax/verilogams.vim                    |    2 +-
 syntax/vgrindefs.vim                     |    2 +-
 syntax/vhdl.vim                          |    2 +-
 syntax/vimgo.vim                         |    2 +-
 syntax/viminfo.vim                       |    2 +-
 syntax/vlang.vim                         |    2 +-
 syntax/vmasm.vim                         |    2 +-
 syntax/voscm.vim                         |    2 +-
 syntax/vrml.vim                          |    2 +-
 syntax/vroom.vim                         |    2 +-
 syntax/vue.vim                           |    2 +-
 syntax/wast.vim                          |    2 +-
 syntax/webmacro.vim                      |    2 +-
 syntax/wget.vim                          |    2 +-
 syntax/winbatch.vim                      |    2 +-
 syntax/wml.vim                           |    2 +-
 syntax/wsh.vim                           |    2 +-
 syntax/wsml.vim                          |    2 +-
 syntax/wvdial.vim                        |    2 +-
 syntax/xdc.vim                           |    2 +-
 syntax/xdefaults.vim                     |    2 +-
 syntax/xf86conf.vim                      |    2 +-
 syntax/xhtml.vim                         |    2 +-
 syntax/xinetd.vim                        |    2 +-
 syntax/xmath.vim                         |    2 +-
 syntax/xml.vim                           |    2 +-
 syntax/xmodmap.vim                       |    2 +-
 syntax/xpm.vim                           |    2 +-
 syntax/xpm2.vim                          |    2 +-
 syntax/xquery.vim                        |    2 +-
 syntax/xs.vim                            |    2 +-
 syntax/xsd.vim                           |    2 +-
 syntax/xsl.vim                           |    2 +-
 syntax/xslt.vim                          |    2 +-
 syntax/yacc.vim                          |    2 +-
 syntax/yaml.vim                          |    2 +-
 syntax/yats.vim                          |    2 +-
 syntax/yats/css.vim                      |    2 +-
 syntax/yats/dom-document.vim             |    2 +-
 syntax/yats/dom-elem.vim                 |    2 +-
 syntax/yats/dom-event.vim                |    2 +-
 syntax/yats/dom-form.vim                 |    2 +-
 syntax/yats/dom-node.vim                 |    2 +-
 syntax/yats/dom-storage.vim              |    2 +-
 syntax/yats/ecma-402.vim                 |    2 +-
 syntax/yats/es6-array.vim                |    2 +-
 syntax/yats/es6-date.vim                 |    2 +-
 syntax/yats/es6-function.vim             |    2 +-
 syntax/yats/es6-json.vim                 |    2 +-
 syntax/yats/es6-map.vim                  |    2 +-
 syntax/yats/es6-math.vim                 |    2 +-
 syntax/yats/es6-number.vim               |    2 +-
 syntax/yats/es6-object.vim               |    2 +-
 syntax/yats/es6-promise.vim              |    2 +-
 syntax/yats/es6-proxy.vim                |    2 +-
 syntax/yats/es6-reflect.vim              |    2 +-
 syntax/yats/es6-regexp.vim               |    2 +-
 syntax/yats/es6-set.vim                  |    2 +-
 syntax/yats/es6-string.vim               |    2 +-
 syntax/yats/es6-symbol.vim               |    2 +-
 syntax/yats/event.vim                    |    2 +-
 syntax/yats/node.vim                     |    2 +-
 syntax/yats/test.vim                     |    2 +-
 syntax/yats/typescript.vim               |    2 +-
 syntax/yats/web-blob.vim                 |    2 +-
 syntax/yats/web-console.vim              |    2 +-
 syntax/yats/web-crypto.vim               |    2 +-
 syntax/yats/web-encoding.vim             |    2 +-
 syntax/yats/web-fetch.vim                |    2 +-
 syntax/yats/web-geo.vim                  |    2 +-
 syntax/yats/web-history.vim              |    2 +-
 syntax/yats/web-location.vim             |    2 +-
 syntax/yats/web-navigator.vim            |    2 +-
 syntax/yats/web-network.vim              |    2 +-
 syntax/yats/web-payment.vim              |    2 +-
 syntax/yats/web-service-worker.vim       |    2 +-
 syntax/yats/web-window.vim               |    2 +-
 syntax/yats/web-xhr.vim                  |    2 +-
 syntax/yats/web.vim                      |    2 +-
 syntax/z8a.vim                           |    2 +-
 syntax/zephir.vim                        |    2 +-
 syntax/zig.vim                           |    2 +-
 syntax/zimbu.vim                         |    2 +-
 syntax/zir.vim                           |    2 +-
 syntax/zsh.vim                           |    2 +-
 1303 files changed, 4939 insertions(+), 4911 deletions(-)
 create mode 100644 autoload/polyglot/init.vim

diff --git a/after/compiler/tex.vim b/after/compiler/tex.vim
index bfe5b2a5f..d6038c2b3 100644
--- a/after/compiler/tex.vim
+++ b/after/compiler/tex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tex', 'after/compiler/tex.vim')
   finish
 endif
 
diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 387e655bb..c81fedb68 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haskell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haskell', 'after/ftplugin/cabal.vim')
   finish
 endif
 
diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim
index b01a8a08d..528fbeaa6 100644
--- a/after/ftplugin/coffee.vim
+++ b/after/ftplugin/coffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cjsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cjsx', 'after/ftplugin/coffee.vim')
   finish
 endif
 
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index 75117f1b5..21cf26901 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haskell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haskell', 'after/ftplugin/haskell.vim')
   finish
 endif
 
diff --git a/after/ftplugin/html.vim b/after/ftplugin/html.vim
index 6cbec0ada..5a6b963ec 100644
--- a/after/ftplugin/html.vim
+++ b/after/ftplugin/html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/ftplugin/html.vim')
   finish
 endif
 
diff --git a/after/ftplugin/idris.vim b/after/ftplugin/idris.vim
index 3fa7a746f..f10e518c2 100644
--- a/after/ftplugin/idris.vim
+++ b/after/ftplugin/idris.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris', 'after/ftplugin/idris.vim')
   finish
 endif
 
diff --git a/after/ftplugin/idris2.vim b/after/ftplugin/idris2.vim
index 2572f2af8..466101e7d 100644
--- a/after/ftplugin/idris2.vim
+++ b/after/ftplugin/idris2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris2', 'after/ftplugin/idris2.vim')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-1.vim b/after/ftplugin/javascript-1.vim
index 58e2e1f6c..5d6f0d0c9 100644
--- a/after/ftplugin/javascript-1.vim
+++ b/after/ftplugin/javascript-1.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'javascript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'javascript', 'after/ftplugin/javascript.vim')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-2.vim b/after/ftplugin/javascript-2.vim
index 67a630555..9abbda2f1 100644
--- a/after/ftplugin/javascript-2.vim
+++ b/after/ftplugin/javascript-2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/javascript-2.vim')
   finish
 endif
 
diff --git a/after/ftplugin/javascriptreact.vim b/after/ftplugin/javascriptreact.vim
index ceacc887e..494e6d6ed 100644
--- a/after/ftplugin/javascriptreact.vim
+++ b/after/ftplugin/javascriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/javascriptreact.vim')
   finish
 endif
 
diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
index 54ebd29f6..e1af589fb 100644
--- a/after/ftplugin/jsx.vim
+++ b/after/ftplugin/jsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/jsx.vim')
   finish
 endif
 
diff --git a/after/ftplugin/llvm.vim b/after/ftplugin/llvm.vim
index 198358109..bb1ee63ec 100644
--- a/after/ftplugin/llvm.vim
+++ b/after/ftplugin/llvm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'llvm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'after/ftplugin/llvm.vim')
   finish
 endif
 
diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim
index 2e3f9c7d4..e530bff4b 100644
--- a/after/ftplugin/puppet.vim
+++ b/after/ftplugin/puppet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'puppet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'after/ftplugin/puppet.vim')
   finish
 endif
 
diff --git a/after/ftplugin/tex.vim b/after/ftplugin/tex.vim
index 0fcb47a88..e28983213 100644
--- a/after/ftplugin/tex.vim
+++ b/after/ftplugin/tex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tex', 'after/ftplugin/tex.vim')
   finish
 endif
 
diff --git a/after/ftplugin/tsx.vim b/after/ftplugin/tsx.vim
index 3d4226d12..d8d93c8ab 100644
--- a/after/ftplugin/tsx.vim
+++ b/after/ftplugin/tsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/tsx.vim')
   finish
 endif
 
diff --git a/after/ftplugin/typescriptreact.vim b/after/ftplugin/typescriptreact.vim
index 3c3b2666b..ec114d964 100644
--- a/after/ftplugin/typescriptreact.vim
+++ b/after/ftplugin/typescriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/typescriptreact.vim')
   finish
 endif
 
diff --git a/after/indent/html.vim b/after/indent/html.vim
index ea76ee091..67728aaca 100644
--- a/after/indent/html.vim
+++ b/after/indent/html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/indent/html.vim')
   finish
 endif
 
diff --git a/after/indent/javascript-1.vim b/after/indent/javascript-1.vim
index 67a630555..ca9e143ff 100644
--- a/after/indent/javascript-1.vim
+++ b/after/indent/javascript-1.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/javascript.vim')
   finish
 endif
 
diff --git a/after/indent/javascript-2.vim b/after/indent/javascript-2.vim
index 3a9fe3807..ad32e2848 100644
--- a/after/indent/javascript-2.vim
+++ b/after/indent/javascript-2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/indent/javascript-2.vim')
   finish
 endif
 
diff --git a/after/indent/javascriptreact.vim b/after/indent/javascriptreact.vim
index ceacc887e..994c195b9 100644
--- a/after/indent/javascriptreact.vim
+++ b/after/indent/javascriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/javascriptreact.vim')
   finish
 endif
 
diff --git a/after/indent/jsx.vim b/after/indent/jsx.vim
index afee5bf0c..24c4a096e 100644
--- a/after/indent/jsx.vim
+++ b/after/indent/jsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/jsx.vim')
   finish
 endif
 
diff --git a/after/indent/objc.vim b/after/indent/objc.vim
index e9cc20e88..c84f43b34 100644
--- a/after/indent/objc.vim
+++ b/after/indent/objc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'objc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'objc', 'after/indent/objc.vim')
   finish
 endif
 
diff --git a/after/indent/php.vim b/after/indent/php.vim
index f64a7c6c7..65534a8c2 100644
--- a/after/indent/php.vim
+++ b/after/indent/php.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/indent/php.vim')
   finish
 endif
 
diff --git a/after/indent/tex.vim b/after/indent/tex.vim
index 4cd17b842..cbb4f01b3 100644
--- a/after/indent/tex.vim
+++ b/after/indent/tex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tex', 'after/indent/tex.vim')
   finish
 endif
 
diff --git a/after/indent/tsx.vim b/after/indent/tsx.vim
index 18254bfca..4ff59991e 100644
--- a/after/indent/tsx.vim
+++ b/after/indent/tsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/tsx.vim')
   finish
 endif
 
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
index 6d27bc700..ba107504f 100644
--- a/after/indent/typescript.vim
+++ b/after/indent/typescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/indent/typescript.vim')
   finish
 endif
 
diff --git a/after/indent/typescriptreact.vim b/after/indent/typescriptreact.vim
index 3c3b2666b..4a530b9dd 100644
--- a/after/indent/typescriptreact.vim
+++ b/after/indent/typescriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/typescriptreact.vim')
   finish
 endif
 
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index a8f7f416e..a5daa792a 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cpp-modern')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cpp-modern', 'after/syntax/c.vim')
   finish
 endif
 
diff --git a/after/syntax/coffee.vim b/after/syntax/coffee.vim
index a3e5d8fae..df65b1d91 100644
--- a/after/syntax/coffee.vim
+++ b/after/syntax/coffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cjsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cjsx', 'after/syntax/coffee.vim')
   finish
 endif
 
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index 1143e4396..27e6abdbe 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cpp-modern')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cpp-modern', 'after/syntax/cpp.vim')
   finish
 endif
 
diff --git a/after/syntax/haskell.vim b/after/syntax/haskell.vim
index 618863691..9820e792c 100644
--- a/after/syntax/haskell.vim
+++ b/after/syntax/haskell.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dhall')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dhall', 'after/syntax/haskell.vim')
   finish
 endif
 
diff --git a/after/syntax/help.vim b/after/syntax/help.vim
index 007c21f39..b19c8d0dc 100644
--- a/after/syntax/help.vim
+++ b/after/syntax/help.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scala')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scala', 'after/syntax/help.vim')
   finish
 endif
 
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index 9dec611ed..44d8f793d 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/html.vim')
   finish
 endif
 
diff --git a/after/syntax/html/aria.vim b/after/syntax/html/aria.vim
index b589cc5e7..6444f63f8 100644
--- a/after/syntax/html/aria.vim
+++ b/after/syntax/html/aria.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/html/aria.vim')
   finish
 endif
 
diff --git a/after/syntax/html/electron.vim b/after/syntax/html/electron.vim
index 35aa1a1e8..7ad41cfcd 100644
--- a/after/syntax/html/electron.vim
+++ b/after/syntax/html/electron.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/html/electron.vim')
   finish
 endif
 
diff --git a/after/syntax/html/rdfa.vim b/after/syntax/html/rdfa.vim
index 5554f12bc..6138f6372 100644
--- a/after/syntax/html/rdfa.vim
+++ b/after/syntax/html/rdfa.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/html/rdfa.vim')
   finish
 endif
 
diff --git a/after/syntax/idris.vim b/after/syntax/idris.vim
index 51aa6422a..66fc91d1f 100644
--- a/after/syntax/idris.vim
+++ b/after/syntax/idris.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris', 'after/syntax/idris.vim')
   finish
 endif
 
diff --git a/after/syntax/idris2.vim b/after/syntax/idris2.vim
index 6aaecf4d5..fedcd8c1c 100644
--- a/after/syntax/idris2.vim
+++ b/after/syntax/idris2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris2', 'after/syntax/idris2.vim')
   finish
 endif
 
diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim
index 67a630555..469a906e9 100644
--- a/after/syntax/javascript.vim
+++ b/after/syntax/javascript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/syntax/javascript.vim')
   finish
 endif
 
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index dafba802a..d13ae9fb6 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/javascript/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/javascript/html5.vim b/after/syntax/javascript/html5.vim
index b605aed52..117b4fed3 100644
--- a/after/syntax/javascript/html5.vim
+++ b/after/syntax/javascript/html5.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/javascript/html5.vim')
   finish
 endif
 
diff --git a/after/syntax/javascript/sql.vim b/after/syntax/javascript/sql.vim
index 52b94d705..6ee300264 100644
--- a/after/syntax/javascript/sql.vim
+++ b/after/syntax/javascript/sql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'javascript-sql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'javascript-sql', 'after/syntax/javascript/sql.vim')
   finish
 endif
 
diff --git a/after/syntax/javascriptreact.vim b/after/syntax/javascriptreact.vim
index ceacc887e..a5c772256 100644
--- a/after/syntax/javascriptreact.vim
+++ b/after/syntax/javascriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/syntax/javascriptreact.vim')
   finish
 endif
 
diff --git a/after/syntax/javascriptreact/graphql.vim b/after/syntax/javascriptreact/graphql.vim
index 6842f74cb..2e1291a89 100644
--- a/after/syntax/javascriptreact/graphql.vim
+++ b/after/syntax/javascriptreact/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/javascriptreact/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/jsx.vim b/after/syntax/jsx.vim
index 8ca6c7673..c5a1917c2 100644
--- a/after/syntax/jsx.vim
+++ b/after/syntax/jsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/syntax/jsx.vim')
   finish
 endif
 
diff --git a/after/syntax/jsx_pretty.vim b/after/syntax/jsx_pretty.vim
index 714cfb5b5..115924c49 100644
--- a/after/syntax/jsx_pretty.vim
+++ b/after/syntax/jsx_pretty.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/syntax/jsx_pretty.vim')
   finish
 endif
 
diff --git a/after/syntax/llvm.vim b/after/syntax/llvm.vim
index 024928b88..2154a6353 100644
--- a/after/syntax/llvm.vim
+++ b/after/syntax/llvm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'llvm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'after/syntax/llvm.vim')
   finish
 endif
 
diff --git a/after/syntax/mdx.vim b/after/syntax/mdx.vim
index 8d734bb2b..387229248 100644
--- a/after/syntax/mdx.vim
+++ b/after/syntax/mdx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mdx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mdx', 'after/syntax/mdx.vim')
   finish
 endif
 
diff --git a/after/syntax/mma.vim b/after/syntax/mma.vim
index 676113373..bd8a0213b 100644
--- a/after/syntax/mma.vim
+++ b/after/syntax/mma.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mathematica')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mathematica', 'after/syntax/mma.vim')
   finish
 endif
 
diff --git a/after/syntax/objc.vim b/after/syntax/objc.vim
index a9805eedb..d0b48090e 100644
--- a/after/syntax/objc.vim
+++ b/after/syntax/objc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'objc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'objc', 'after/syntax/objc.vim')
   finish
 endif
 
diff --git a/after/syntax/php/graphql.vim b/after/syntax/php/graphql.vim
index 3c94bcb83..00c9811b4 100644
--- a/after/syntax/php/graphql.vim
+++ b/after/syntax/php/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/php/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/reason.vim b/after/syntax/reason.vim
index c30114ee7..b64d866da 100644
--- a/after/syntax/reason.vim
+++ b/after/syntax/reason.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'reason')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'reason', 'after/syntax/reason.vim')
   finish
 endif
 
diff --git a/after/syntax/reason/graphql.vim b/after/syntax/reason/graphql.vim
index 0ef3b1d70..74a88a5d4 100644
--- a/after/syntax/reason/graphql.vim
+++ b/after/syntax/reason/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/reason/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/rspec.vim b/after/syntax/rspec.vim
index 9a0961d71..d83bbaccf 100644
--- a/after/syntax/rspec.vim
+++ b/after/syntax/rspec.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rspec')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rspec', 'after/syntax/rspec.vim')
   finish
 endif
 
diff --git a/after/syntax/ruby.vim b/after/syntax/ruby.vim
index 3c9fccd2e..082115e12 100644
--- a/after/syntax/ruby.vim
+++ b/after/syntax/ruby.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'yard')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'yard', 'after/syntax/ruby.vim')
   finish
 endif
 
diff --git a/after/syntax/rust.vim b/after/syntax/rust.vim
index 1cf3e3a2e..319c14b9e 100644
--- a/after/syntax/rust.vim
+++ b/after/syntax/rust.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'after/syntax/rust.vim')
   finish
 endif
 
diff --git a/after/syntax/tex.vim b/after/syntax/tex.vim
index 8a30dc309..e99af17f8 100644
--- a/after/syntax/tex.vim
+++ b/after/syntax/tex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tex', 'after/syntax/tex.vim')
   finish
 endif
 
diff --git a/after/syntax/tsx.vim b/after/syntax/tsx.vim
index 458419d25..933bff827 100644
--- a/after/syntax/tsx.vim
+++ b/after/syntax/tsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/syntax/tsx.vim')
   finish
 endif
 
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index df6bf36c3..6db06513a 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/typescript/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/typescriptreact.vim b/after/syntax/typescriptreact.vim
index 3c3b2666b..72f824925 100644
--- a/after/syntax/typescriptreact.vim
+++ b/after/syntax/typescriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/syntax/typescriptreact.vim')
   finish
 endif
 
diff --git a/after/syntax/typescriptreact/graphql.vim b/after/syntax/typescriptreact/graphql.vim
index 0367e0daf..518c6b68b 100644
--- a/after/syntax/typescriptreact/graphql.vim
+++ b/after/syntax/typescriptreact/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/typescriptreact/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/vue/graphql.vim b/after/syntax/vue/graphql.vim
index 6842f74cb..935154d88 100644
--- a/after/syntax/vue/graphql.vim
+++ b/after/syntax/vue/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/vue/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/zsh.vim b/after/syntax/zsh.vim
index fcdcac316..cf4f92462 100644
--- a/after/syntax/zsh.vim
+++ b/after/syntax/zsh.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zinit')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zinit', 'after/syntax/zsh.vim')
   finish
 endif
 
diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index def14bfdb..798273183 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'julia')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'julia', 'autoload/LaTeXtoUnicode.vim')
   finish
 endif
 
diff --git a/autoload/RstFold.vim b/autoload/RstFold.vim
index 16a12b969..c18b8232b 100644
--- a/autoload/RstFold.vim
+++ b/autoload/RstFold.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rst')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rst', 'autoload/RstFold.vim')
   finish
 endif
 
diff --git a/autoload/ada.vim b/autoload/ada.vim
index 71faa0a60..792fc03f2 100644
--- a/autoload/ada.vim
+++ b/autoload/ada.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ada')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ada', 'autoload/ada.vim')
   finish
 endif
 
diff --git a/autoload/cargo.vim b/autoload/cargo.vim
index 08b01231f..001d35ce4 100644
--- a/autoload/cargo.vim
+++ b/autoload/cargo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'autoload/cargo.vim')
   finish
 endif
 
diff --git a/autoload/cargo/quickfix.vim b/autoload/cargo/quickfix.vim
index a8272a05b..ddd08e26c 100644
--- a/autoload/cargo/quickfix.vim
+++ b/autoload/cargo/quickfix.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'autoload/cargo/quickfix.vim')
   finish
 endif
 
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index 36ea354e9..6d6a61b1f 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'clojure')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'clojure', 'autoload/clojurecomplete.vim')
   finish
 endif
 
diff --git a/autoload/coffee.vim b/autoload/coffee.vim
index bc038f0ea..78427a18b 100644
--- a/autoload/coffee.vim
+++ b/autoload/coffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'coffee-script')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'coffee-script', 'autoload/coffee.vim')
   finish
 endif
 
diff --git a/autoload/crystal/indent.vim b/autoload/crystal/indent.vim
index b2fc9193f..3e8b07e5c 100644
--- a/autoload/crystal/indent.vim
+++ b/autoload/crystal/indent.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'autoload/crystal/indent.vim')
   finish
 endif
 
diff --git a/autoload/crystal_lang.vim b/autoload/crystal_lang.vim
index 60032c5f8..15afbeda2 100644
--- a/autoload/crystal_lang.vim
+++ b/autoload/crystal_lang.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'autoload/crystal_lang.vim')
   finish
 endif
 
diff --git a/autoload/csv.vim b/autoload/csv.vim
index 39e37367c..e47ee41d4 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'csv')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'csv', 'autoload/csv.vim')
   finish
 endif
 
diff --git a/autoload/dart.vim b/autoload/dart.vim
index b4cdce2a8..959b67cac 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dart')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dart', 'autoload/dart.vim')
   finish
 endif
 
diff --git a/autoload/db/adapter/ecto.vim b/autoload/db/adapter/ecto.vim
index 251a3a6b1..a17652546 100644
--- a/autoload/db/adapter/ecto.vim
+++ b/autoload/db/adapter/ecto.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'autoload/db/adapter/ecto.vim')
   finish
 endif
 
diff --git a/autoload/ecrystal.vim b/autoload/ecrystal.vim
index a7bc05968..1ea21a3e3 100644
--- a/autoload/ecrystal.vim
+++ b/autoload/ecrystal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'autoload/ecrystal.vim')
   finish
 endif
 
diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index f38947fd7..412d2cf55 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'autoload/elixir/indent.vim')
   finish
 endif
 
diff --git a/autoload/elixir/util.vim b/autoload/elixir/util.vim
index 4136799cb..1cee91992 100644
--- a/autoload/elixir/util.vim
+++ b/autoload/elixir/util.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'autoload/elixir/util.vim')
   finish
 endif
 
diff --git a/autoload/fish.vim b/autoload/fish.vim
index 92d9f642d..d495f7db1 100644
--- a/autoload/fish.vim
+++ b/autoload/fish.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fish')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fish', 'autoload/fish.vim')
   finish
 endif
 
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index 7ce4ab2f3..a37a92e7f 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fsharp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fsharp', 'autoload/fsharp.vim')
   finish
 endif
 
diff --git a/autoload/fzf_gitignore.vim b/autoload/fzf_gitignore.vim
index 62e2fde2b..40272db77 100644
--- a/autoload/fzf_gitignore.vim
+++ b/autoload/fzf_gitignore.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gitignore')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gitignore', 'autoload/fzf_gitignore.vim')
   finish
 endif
 
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index 0c48a1f77..b087b2c4f 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'autoload/go/config.vim')
   finish
 endif
 
diff --git a/autoload/graphql.vim b/autoload/graphql.vim
index 4e0652a2b..6dc441c6b 100644
--- a/autoload/graphql.vim
+++ b/autoload/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'autoload/graphql.vim')
   finish
 endif
 
diff --git a/autoload/htmlcomplete.vim b/autoload/htmlcomplete.vim
index e4087b012..a378493ef 100644
--- a/autoload/htmlcomplete.vim
+++ b/autoload/htmlcomplete.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'autoload/htmlcomplete.vim')
   finish
 endif
 
diff --git a/autoload/jsonnet.vim b/autoload/jsonnet.vim
index 3626edd2b..6a71cbb64 100644
--- a/autoload/jsonnet.vim
+++ b/autoload/jsonnet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsonnet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsonnet', 'autoload/jsonnet.vim')
   finish
 endif
 
diff --git a/autoload/jsx_pretty/comment.vim b/autoload/jsx_pretty/comment.vim
index 39157d197..f9ae5b18c 100644
--- a/autoload/jsx_pretty/comment.vim
+++ b/autoload/jsx_pretty/comment.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'autoload/jsx_pretty/comment.vim')
   finish
 endif
 
diff --git a/autoload/jsx_pretty/indent.vim b/autoload/jsx_pretty/indent.vim
index ee4859ced..f45316b21 100644
--- a/autoload/jsx_pretty/indent.vim
+++ b/autoload/jsx_pretty/indent.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'autoload/jsx_pretty/indent.vim')
   finish
 endif
 
diff --git a/autoload/julia.vim b/autoload/julia.vim
index ed77fc39d..6ffe5fd59 100644
--- a/autoload/julia.vim
+++ b/autoload/julia.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'julia')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'julia', 'autoload/julia.vim')
   finish
 endif
 
diff --git a/autoload/julia/doc.vim b/autoload/julia/doc.vim
index 6461bd44a..dfac90a0b 100644
--- a/autoload/julia/doc.vim
+++ b/autoload/julia/doc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'julia')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'julia', 'autoload/julia/doc.vim')
   finish
 endif
 
diff --git a/autoload/julia_blocks.vim b/autoload/julia_blocks.vim
index a27ccfbeb..6a0c05c97 100644
--- a/autoload/julia_blocks.vim
+++ b/autoload/julia_blocks.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'julia')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'julia', 'autoload/julia_blocks.vim')
   finish
 endif
 
diff --git a/autoload/julia_latex_symbols.vim b/autoload/julia_latex_symbols.vim
index bd53c1c3e..5fb5821af 100644
--- a/autoload/julia_latex_symbols.vim
+++ b/autoload/julia_latex_symbols.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'julia')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'julia', 'autoload/julia_latex_symbols.vim')
   finish
 endif
 
diff --git a/autoload/ledger.vim b/autoload/ledger.vim
index 265aa666e..1006430c8 100644
--- a/autoload/ledger.vim
+++ b/autoload/ledger.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ledger')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ledger', 'autoload/ledger.vim')
   finish
 endif
 
diff --git a/autoload/nim.vim b/autoload/nim.vim
index 820f62c7f..c0faf6e13 100644
--- a/autoload/nim.vim
+++ b/autoload/nim.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nim', 'autoload/nim.vim')
   finish
 endif
 
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
new file mode 100644
index 000000000..9d01b3468
--- /dev/null
+++ b/autoload/polyglot/init.vim
@@ -0,0 +1,3630 @@
+" Vim support file to detect file types
+"
+" Maintainer:	Adam Stankiewicz <sheerun@sher.pl>
+" URL: https://github.com/sheerun/vim-polyglot
+
+" Listen very carefully, I will say this only once
+if exists("did_load_polyglot")
+  finish
+endif
+
+" Switch to compatible mode for the time being
+let s:cpo_save = &cpo
+set cpo&vim
+
+let did_load_polyglot = 1
+
+let g:polyglot_initialized = 0
+
+func! polyglot#init#init()
+  " A no-op as sourcing this file is enough
+endfunc
+
+func! polyglot#init#is_disabled(caller, name, path)
+  if g:polyglot_initialized
+    return has_key(g:polyglot_is_disabled, a:name)
+  endif
+  if a:path[0:7] == "autoload"
+    let g:polyglot_initialized = 1
+
+    for p in globpath(&rtp, a:path, 0, 1)
+      if p != a:caller
+        exe "source " . p
+        return 1
+      endif
+    endfor
+  endif
+endfunc
+
+let g:polyglot_is_disabled = {}
+let s:new_polyglot_disabled = []
+
+if exists('g:polyglot_disabled')
+  for pkg in g:polyglot_disabled
+    let base = split(pkg, '\.')
+    if len(base) > 0
+      let g:polyglot_is_disabled[pkg] = 1
+      call add(s:new_polyglot_disabled, base[0])
+    endif
+  endfor
+else
+  let g:polyglot_disabled_not_set = 1
+endif
+
+func! PolyglotVerify()
+  if exists("g:polyglot_disabled_not_set")
+    if exists("g:polyglot_disabled")
+      echohl WarningMsg
+      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
+      echohl None
+    endif
+
+    unlet g:polyglot_disabled_not_set
+  endif
+endfun
+
+au VimEnter * call PolyglotVerify()
+
+" Be consistent across different systems
+set nofileignorecase
+
+function! s:SetDefault(name, value)
+  if !exists(a:name)
+    let {a:name} = a:value
+  endif
+endfunction
+
+call s:SetDefault('g:markdown_enable_spell_checking', 0)
+call s:SetDefault('g:markdown_enable_input_abbreviations', 0)
+call s:SetDefault('g:markdown_enable_mappings', 0)
+
+" Enable jsx syntax by default
+call s:SetDefault('g:jsx_ext_required', 0)
+
+" Needed for sql highlighting
+call s:SetDefault('g:javascript_sql_dialect', 'sql')
+
+" Make csv loading faster
+call s:SetDefault('g:csv_start', 1)
+call s:SetDefault('g:csv_end', 2)
+call s:SetDefault('g:csv_default_delim', ',')
+
+" Disable json concealing by default
+call s:SetDefault('g:vim_json_syntax_conceal', 0)
+
+call s:SetDefault('g:filetype_euphoria', 'elixir')
+
+if !exists('g:python_highlight_all')
+  call s:SetDefault('g:python_highlight_builtins', 1)
+  call s:SetDefault('g:python_highlight_builtin_objs', 1)
+  call s:SetDefault('g:python_highlight_builtin_types', 1)
+  call s:SetDefault('g:python_highlight_builtin_funcs', 1)
+  call s:SetDefault('g:python_highlight_builtin_funcs_kwarg', 1)
+  call s:SetDefault('g:python_highlight_exceptions', 1)
+  call s:SetDefault('g:python_highlight_string_formatting', 1)
+  call s:SetDefault('g:python_highlight_string_format', 1)
+  call s:SetDefault('g:python_highlight_string_templates', 1)
+  call s:SetDefault('g:python_highlight_indent_errors', 1)
+  call s:SetDefault('g:python_highlight_space_errors', 1)
+  call s:SetDefault('g:python_highlight_doctests', 1)
+  call s:SetDefault('g:python_highlight_func_calls', 1)
+  call s:SetDefault('g:python_highlight_class_vars', 1)
+  call s:SetDefault('g:python_highlight_operators', 1)
+  call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
+  call s:SetDefault('g:python_slow_sync', 1)
+endif
+
+" We need it because scripts.vim in vim uses "set ft=" which cannot be
+" overridden with setf (and we can't use set ft= so our scripts.vim work)
+func! s:Setf(ft)
+  if &filetype !~# '\<'.a:ft.'\>'
+    let &filetype = a:ft
+  endif
+endfunc
+
+" Function used for patterns that end in a star: don't set the filetype if the
+" file name matches ft_ignore_pat.
+" When using this, the entry should probably be further down below with the
+" other StarSetf() calls.
+func! s:StarSetf(ft)
+  if expand("<amatch>") !~ g:ft_ignore_pat
+    exe 'setf ' . a:ft
+  endif
+endfunc
+
+augroup polyglot-observer | augroup END
+
+if exists('s:cpo_save')
+  " Restore 'cpoptions'
+  let &cpo = s:cpo_save
+  unlet s:cpo_save
+endif
+
+" Load user-defined filetype.vim and oter plugins ftdetect first
+" This is to use polyglot-defined ftdetect always as fallback to user settings
+augroup filetypedetect
+  runtime! filetype.vim
+  runtime! ftdetect/*.vim
+augroup END
+
+
+augroup filetypedetect
+
+" Switch to compatible mode for the time being
+let s:cpo_save = &cpo
+set cpo&vim
+
+if !has_key(g:polyglot_is_disabled, 'ftdetect')
+
+" It can happen vim filetype.vim loads first, then we need a reset
+if exists("did_load_filetypes")
+  au! filetypedetect
+endif
+
+" Prevent filetype.vim of vim from loading again
+let did_load_filetypes = 1
+
+
+" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
+
+if !has_key(g:polyglot_is_disabled, 'gleam')
+  au BufNewFile,BufRead *.gleam setf gleam
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jsonc')
+  au BufNewFile,BufRead *.cjson,*.jsonc,{.,}babelrc,{.,}eslintrc.json,{.,}jshintrc,{.,}jslintrc,{.,}mocharc.json,coc-settings.json,coffeelint.json,jsconfig.json,tsconfig.json setf jsonc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mint')
+  au BufNewFile,BufRead *.mint setf mint
+endif
+
+if !has_key(g:polyglot_is_disabled, 'context')
+  au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi setf context
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xpm2')
+  au BufNewFile,BufRead *.xpm2 setf xpm2
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xpm')
+  au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au BufNewFile,BufRead *.xpm setf xpm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xf86conf')
+  au BufNewFile,BufRead */xorg.conf.d/*.conf,xorg.conf,xorg.conf-4 setf xf86conf
+  au BufNewFile,BufRead XF86Config-4* call s:StarSetf('xf86conf')
+  au BufNewFile,BufRead XF86Config* call s:StarSetf('xf86conf')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pullrequest')
+  au BufNewFile,BufRead PULLREQ_EDITMSG setf pullrequest
+endif
+
+if !has_key(g:polyglot_is_disabled, 'text')
+  au BufNewFile,BufRead *.text,README setf text
+endif
+
+if !has_key(g:polyglot_is_disabled, 'svn')
+  au BufNewFile,BufRead svn-commit*.tmp setf svn
+endif
+
+if !has_key(g:polyglot_is_disabled, 'logcheck')
+  au BufNewFile,BufRead */etc/logcheck/*.d*/* call s:StarSetf('logcheck')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'fvwm')
+  au BufNewFile,BufRead */.fvwm/* call s:StarSetf('fvwm')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'crontab')
+  au BufNewFile,BufRead crontab setf crontab
+  au BufNewFile,BufRead crontab.* call s:StarSetf('crontab')
+  au BufNewFile,BufRead */etc/cron.d/* call s:StarSetf('crontab')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'bzr')
+  au BufNewFile,BufRead bzr_log.* call s:StarSetf('bzr')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'asteriskvm')
+  au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'asterisk')
+  au BufNewFile,BufRead *asterisk/*.conf* call s:StarSetf('asterisk')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'apachestyle')
+  au BufNewFile,BufRead proftpd.conf* call s:StarSetf('apachestyle')
+  au BufNewFile,BufRead */etc/proftpd/conf.*/* call s:StarSetf('apachestyle')
+  au BufNewFile,BufRead */etc/proftpd/*.conf* call s:StarSetf('apachestyle')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'z8a')
+  au BufNewFile,BufRead *.z8a setf z8a
+endif
+
+if !has_key(g:polyglot_is_disabled, 'zimbutempl')
+  au BufNewFile,BufRead *.zut setf zimbutempl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'zimbu')
+  au BufNewFile,BufRead *.zu setf zimbu
+endif
+
+if !has_key(g:polyglot_is_disabled, 'yacc')
+  au BufNewFile,BufRead *.y++,*.yxx,*.yy setf yacc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xslt')
+  au BufNewFile,BufRead *.xsl,*.xslt setf xslt
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xsd')
+  au BufNewFile,BufRead *.xsd setf xsd
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xquery')
+  au BufNewFile,BufRead *.xq,*.xql,*.xqm,*.xquery,*.xqy setf xquery
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xmodmap')
+  au BufNewFile,BufRead *Xmodmap setf xmodmap
+  au BufNewFile,BufRead *xmodmap* call s:StarSetf('xmodmap')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xmath')
+  au BufNewFile,BufRead *.msc,*.msf setf xmath
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xdefaults')
+  au BufNewFile,BufRead *.ad,{.,}Xdefaults,{.,}Xpdefaults,{.,}Xresources,xdm-config setf xdefaults
+  au BufNewFile,BufRead Xresources* call s:StarSetf('xdefaults')
+  au BufNewFile,BufRead */app-defaults/* call s:StarSetf('xdefaults')
+  au BufNewFile,BufRead */Xresources/* call s:StarSetf('xdefaults')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xinetd')
+  au BufNewFile,BufRead */etc/xinetd.conf setf xinetd
+  au BufNewFile,BufRead */etc/xinetd.d/* call s:StarSetf('xinetd')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xhtml')
+  au BufNewFile,BufRead *.xht,*.xhtml setf xhtml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'wsh')
+  au BufNewFile,BufRead *.ws[fc] setf wsh
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cvs')
+  au BufNewFile,BufRead cvs\d\+ setf cvs
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cvsrc')
+  au BufNewFile,BufRead {.,}cvsrc setf cvsrc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'wvdial')
+  au BufNewFile,BufRead {.,}wvdialrc,wvdial.conf setf wvdial
+endif
+
+if !has_key(g:polyglot_is_disabled, 'wsml')
+  au BufNewFile,BufRead *.wsml setf wsml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'winbatch')
+  au BufNewFile,BufRead *.wbt setf winbatch
+endif
+
+if !has_key(g:polyglot_is_disabled, 'wml')
+  au BufNewFile,BufRead *.wml setf wml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'wget')
+  au BufNewFile,BufRead {.,}wgetrc,wgetrc setf wget
+endif
+
+if !has_key(g:polyglot_is_disabled, 'webmacro')
+  au BufNewFile,BufRead *.wm setf webmacro
+endif
+
+if !has_key(g:polyglot_is_disabled, 'wast')
+  au BufNewFile,BufRead *.wast,*.wat setf wast
+endif
+
+if !has_key(g:polyglot_is_disabled, 'vroom')
+  au BufNewFile,BufRead *.vroom setf vroom
+endif
+
+if !has_key(g:polyglot_is_disabled, 'vrml')
+  au BufNewFile,BufRead *.wrl setf vrml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'vgrindefs')
+  au BufNewFile,BufRead vgrindefs setf vgrindefs
+endif
+
+if !has_key(g:polyglot_is_disabled, 'viminfo')
+  au BufNewFile,BufRead {.,}viminfo,_viminfo setf viminfo
+endif
+
+if !has_key(g:polyglot_is_disabled, 'vim')
+  au BufNewFile,BufRead *.vba,*.vim,{.,}exrc,_exrc setf vim
+  au BufNewFile,BufRead *vimrc* call s:StarSetf('vim')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'vhdl')
+  au BufNewFile,BufRead *.hdl,*.vbe,*.vhd,*.vhdl,*.vho,*.vst setf vhdl
+  au BufNewFile,BufRead *.vhdl_[0-9]* call s:StarSetf('vhdl')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'systemverilog')
+  au BufNewFile,BufRead *.sv,*.svh setf systemverilog
+endif
+
+if !has_key(g:polyglot_is_disabled, 'verilogams')
+  au BufNewFile,BufRead *.va,*.vams setf verilogams
+endif
+
+if !has_key(g:polyglot_is_disabled, 'verilog')
+  au BufNewFile,BufRead *.v setf verilog
+endif
+
+if !has_key(g:polyglot_is_disabled, 'vera')
+  au BufNewFile,BufRead *.vr,*.vrh,*.vri setf vera
+endif
+
+if !has_key(g:polyglot_is_disabled, 'upstart')
+  au BufNewFile,BufRead */.config/upstart/*.conf,*/.config/upstart/*.override,*/.init/*.conf,*/.init/*.override,*/etc/init/*.conf,*/etc/init/*.override,*/usr/share/upstart/*.conf,*/usr/share/upstart/*.override setf upstart
+endif
+
+if !has_key(g:polyglot_is_disabled, 'updatedb')
+  au BufNewFile,BufRead */etc/updatedb.conf setf updatedb
+endif
+
+if !has_key(g:polyglot_is_disabled, 'uc')
+  au BufNewFile,BufRead *.uc setf uc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'udevperm')
+  au BufNewFile,BufRead */etc/udev/permissions.d/*.permissions setf udevperm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'udevconf')
+  au BufNewFile,BufRead */etc/udev/udev.conf setf udevconf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'uil')
+  au BufNewFile,BufRead *.uil,*.uit setf uil
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tsscl')
+  au BufNewFile,BufRead *.tsscl setf tsscl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tssop')
+  au BufNewFile,BufRead *.tssop setf tssop
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tssgm')
+  au BufNewFile,BufRead *.tssgm setf tssgm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'trustees')
+  au BufNewFile,BufRead trustees.conf setf trustees
+endif
+
+if !has_key(g:polyglot_is_disabled, 'treetop')
+  au BufNewFile,BufRead *.treetop setf treetop
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tpp')
+  au BufNewFile,BufRead *.tpp setf tpp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tidy')
+  au BufNewFile,BufRead {.,}tidyrc,tidy.conf,tidyrc setf tidy
+endif
+
+if !has_key(g:polyglot_is_disabled, 'texmf')
+  au BufNewFile,BufRead texmf.cnf setf texmf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'texinfo')
+  au BufNewFile,BufRead *.texi,*.texinfo,*.txi setf texinfo
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tex')
+  au BufNewFile,BufRead *.bbl,*.dtx,*.latex,*.ltx,*.sty setf tex
+endif
+
+if !has_key(g:polyglot_is_disabled, 'terminfo')
+  au BufNewFile,BufRead *.ti setf terminfo
+endif
+
+if !has_key(g:polyglot_is_disabled, 'teraterm')
+  au BufNewFile,BufRead *.ttl setf teraterm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tsalt')
+  au BufNewFile,BufRead *.slt setf tsalt
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tli')
+  au BufNewFile,BufRead *.tli setf tli
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tcl')
+  au BufNewFile,BufRead *.itcl,*.itk,*.jacl,*.tcl,*.tk setf tcl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'taskedit')
+  au BufNewFile,BufRead *.task setf taskedit
+endif
+
+if !has_key(g:polyglot_is_disabled, 'taskdata')
+  au BufNewFile,BufRead {pending,completed,undo}.data setf taskdata
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tak')
+  au BufNewFile,BufRead *.tak setf tak
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tags')
+  au BufNewFile,BufRead tags setf tags
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sudoers')
+  au BufNewFile,BufRead */etc/sudoers,sudoers.tmp setf sudoers
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sdc')
+  au BufNewFile,BufRead *.sdc setf sdc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sysctl')
+  au BufNewFile,BufRead */etc/sysctl.conf,*/etc/sysctl.d/*.conf setf sysctl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sil')
+  au BufNewFile,BufRead *.sil setf sil
+endif
+
+if !has_key(g:polyglot_is_disabled, 'swiftgyb')
+  au BufNewFile,BufRead *.swift.gyb setf swiftgyb
+endif
+
+if !has_key(g:polyglot_is_disabled, 'voscm')
+  au BufNewFile,BufRead *.cm setf voscm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sml')
+  au BufNewFile,BufRead *.sml setf sml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'stp')
+  au BufNewFile,BufRead *.stp setf stp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'smcl')
+  au BufNewFile,BufRead *.hlp,*.ihlp,*.smcl setf smcl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'stata')
+  au BufNewFile,BufRead *.ado,*.do,*.imata,*.mata setf stata
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sshdconfig')
+  au BufNewFile,BufRead */etc/ssh/sshd_config.d/*.conf,sshd_config setf sshdconfig
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sshconfig')
+  au BufNewFile,BufRead */.ssh/config,*/etc/ssh/ssh_config.d/*.conf,ssh_config setf sshconfig
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sqr')
+  au BufNewFile,BufRead *.sqi,*.sqr setf sqr
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sqlj')
+  au BufNewFile,BufRead *.sqlj setf sqlj
+endif
+
+if !has_key(g:polyglot_is_disabled, 'squid')
+  au BufNewFile,BufRead squid.conf setf squid
+endif
+
+if !has_key(g:polyglot_is_disabled, 'spice')
+  au BufNewFile,BufRead *.sp,*.spice setf spice
+endif
+
+if !has_key(g:polyglot_is_disabled, 'slice')
+  au BufNewFile,BufRead *.ice setf slice
+endif
+
+if !has_key(g:polyglot_is_disabled, 'spup')
+  au BufNewFile,BufRead *.spd,*.spdata,*.speedup setf spup
+endif
+
+if !has_key(g:polyglot_is_disabled, 'hog')
+  au BufNewFile,BufRead *.hog,snort.conf,vision.conf setf hog
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mib')
+  au BufNewFile,BufRead *.mib,*.my setf mib
+endif
+
+if !has_key(g:polyglot_is_disabled, 'snobol4')
+  au BufNewFile,BufRead *.sno,*.spt setf snobol4
+endif
+
+if !has_key(g:polyglot_is_disabled, 'smith')
+  au BufNewFile,BufRead *.smith,*.smt setf smith
+endif
+
+if !has_key(g:polyglot_is_disabled, 'st')
+  au BufNewFile,BufRead *.st setf st
+endif
+
+if !has_key(g:polyglot_is_disabled, 'slrnsc')
+  au BufNewFile,BufRead *.score setf slrnsc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'slrnrc')
+  au BufNewFile,BufRead {.,}slrnrc setf slrnrc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'skill')
+  au BufNewFile,BufRead *.cdf,*.il,*.ils setf skill
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sisu')
+  au BufNewFile,BufRead *.-sst,*.-sst.meta,*._sst,*._sst.meta,*.ssi,*.ssm,*.sst,*.sst.meta setf sisu
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sinda')
+  au BufNewFile,BufRead *.s85,*.sin setf sinda
+endif
+
+if !has_key(g:polyglot_is_disabled, 'simula')
+  au BufNewFile,BufRead *.sim setf simula
+endif
+
+if !has_key(g:polyglot_is_disabled, 'screen')
+  au BufNewFile,BufRead {.,}screenrc,screenrc setf screen
+endif
+
+if !has_key(g:polyglot_is_disabled, 'scheme')
+  au BufNewFile,BufRead *.rkt,*.scm,*.ss setf scheme
+endif
+
+if !has_key(g:polyglot_is_disabled, 'catalog')
+  au BufNewFile,BufRead catalog setf catalog
+  au BufNewFile,BufRead sgml.catalog* call s:StarSetf('catalog')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'setserial')
+  au BufNewFile,BufRead */etc/serial.conf setf setserial
+endif
+
+if !has_key(g:polyglot_is_disabled, 'slpspi')
+  au BufNewFile,BufRead */etc/slp.spi setf slpspi
+endif
+
+if !has_key(g:polyglot_is_disabled, 'spyce')
+  au BufNewFile,BufRead *.spi,*.spy setf spyce
+endif
+
+if !has_key(g:polyglot_is_disabled, 'slpreg')
+  au BufNewFile,BufRead */etc/slp.reg setf slpreg
+endif
+
+if !has_key(g:polyglot_is_disabled, 'slpconf')
+  au BufNewFile,BufRead */etc/slp.conf setf slpconf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'services')
+  au BufNewFile,BufRead */etc/services setf services
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sm')
+  au BufNewFile,BufRead sendmail.cf setf sm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sieve')
+  au BufNewFile,BufRead *.sieve,*.siv setf sieve
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sdl')
+  au BufNewFile,BufRead *.pr,*.sdl setf sdl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sd')
+  au BufNewFile,BufRead *.sd setf sd
+endif
+
+if !has_key(g:polyglot_is_disabled, 'scilab')
+  au BufNewFile,BufRead *.sce,*.sci setf scilab
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sbt')
+  au BufNewFile,BufRead *.sbt setf sbt
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sather')
+  au BufNewFile,BufRead *.sa setf sather
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sass')
+  au BufNewFile,BufRead *.sass setf sass
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sas')
+  au BufNewFile,BufRead *.sas setf sas
+endif
+
+if !has_key(g:polyglot_is_disabled, 'samba')
+  au BufNewFile,BufRead smb.conf setf samba
+endif
+
+if !has_key(g:polyglot_is_disabled, 'slang')
+  au BufNewFile,BufRead *.sl setf slang
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rtf')
+  au BufNewFile,BufRead *.rtf setf rtf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rpcgen')
+  au BufNewFile,BufRead *.x setf rpcgen
+endif
+
+if !has_key(g:polyglot_is_disabled, 'robots')
+  au BufNewFile,BufRead robots.txt setf robots
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rpl')
+  au BufNewFile,BufRead *.rpl setf rpl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rng')
+  au BufNewFile,BufRead *.rng setf rng
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rnc')
+  au BufNewFile,BufRead *.rnc setf rnc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'resolv')
+  au BufNewFile,BufRead resolv.conf setf resolv
+endif
+
+if !has_key(g:polyglot_is_disabled, 'remind')
+  au BufNewFile,BufRead *.rem,*.remind,{.,}reminders setf remind
+  au BufNewFile,BufRead .reminders* call s:StarSetf('remind')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rrst')
+  au BufNewFile,BufRead *.rrst,*.srst setf rrst
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rmd')
+  au BufNewFile,BufRead *.rmd,*.smd setf rmd
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rnoweb')
+  au BufNewFile,BufRead *.rnw,*.snw setf rnoweb
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rexx')
+  au BufNewFile,BufRead *.jrexx,*.orx,*.rex,*.rexx,*.rexxj,*.rxj,*.rxo,*.testGroup,*.testUnit setf rexx
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rego')
+  au BufNewFile,BufRead *.rego setf rego
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rib')
+  au BufNewFile,BufRead *.rib setf rib
+endif
+
+if !has_key(g:polyglot_is_disabled, 'readline')
+  au BufNewFile,BufRead {.,}inputrc,inputrc setf readline
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rcs')
+  au BufNewFile,BufRead *\,v setf rcs
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ratpoison')
+  au BufNewFile,BufRead {.,}ratpoisonrc,ratpoisonrc setf ratpoison
+endif
+
+if !has_key(g:polyglot_is_disabled, 'radiance')
+  au BufNewFile,BufRead *.mat,*.rad setf radiance
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pyrex')
+  au BufNewFile,BufRead *.pxd,*.pyx setf pyrex
+endif
+
+if !has_key(g:polyglot_is_disabled, 'protocols')
+  au BufNewFile,BufRead */etc/protocols setf protocols
+endif
+
+if !has_key(g:polyglot_is_disabled, 'promela')
+  au BufNewFile,BufRead *.pml setf promela
+endif
+
+if !has_key(g:polyglot_is_disabled, 'psf')
+  au BufNewFile,BufRead *.psf setf psf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'procmail')
+  au BufNewFile,BufRead {.,}procmail,{.,}procmailrc setf procmail
+endif
+
+if !has_key(g:polyglot_is_disabled, 'privoxy')
+  au BufNewFile,BufRead *.action setf privoxy
+endif
+
+if !has_key(g:polyglot_is_disabled, 'proc')
+  au BufNewFile,BufRead *.pc setf proc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'obj')
+  au BufNewFile,BufRead *.obj setf obj
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ppwiz')
+  au BufNewFile,BufRead *.ih,*.it setf ppwiz
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pccts')
+  au BufNewFile,BufRead *.g setf pccts
+endif
+
+if !has_key(g:polyglot_is_disabled, 'povini')
+  au BufNewFile,BufRead {.,}povrayrc setf povini
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pov')
+  au BufNewFile,BufRead *.pov setf pov
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ppd')
+  au BufNewFile,BufRead *.ppd setf ppd
+endif
+
+if !has_key(g:polyglot_is_disabled, 'postscr')
+  au BufNewFile,BufRead *.afm,*.ai,*.eps,*.epsf,*.epsi,*.pfa,*.ps setf postscr
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pfmain')
+  au BufNewFile,BufRead main.cf setf pfmain
+endif
+
+if !has_key(g:polyglot_is_disabled, 'po')
+  au BufNewFile,BufRead *.po,*.pot setf po
+endif
+
+if !has_key(g:polyglot_is_disabled, 'plp')
+  au BufNewFile,BufRead *.plp setf plp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'plsql')
+  au BufNewFile,BufRead *.pls,*.plsql setf plsql
+endif
+
+if !has_key(g:polyglot_is_disabled, 'plm')
+  au BufNewFile,BufRead *.p36,*.pac,*.plm setf plm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pli')
+  au BufNewFile,BufRead *.pl1,*.pli setf pli
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pine')
+  au BufNewFile,BufRead {.,}pinerc,{.,}pinercex,pinerc,pinercex setf pine
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pilrc')
+  au BufNewFile,BufRead *.rcp setf pilrc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pinfo')
+  au BufNewFile,BufRead */.pinforc,*/etc/pinforc setf pinfo
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cmod')
+  au BufNewFile,BufRead *.cmod setf cmod
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pike')
+  au BufNewFile,BufRead *.pike,*.pmod setf pike
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pcmk')
+  au BufNewFile,BufRead *.pcmk setf pcmk
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pdf')
+  au BufNewFile,BufRead *.pdf setf pdf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pascal')
+  au BufNewFile,BufRead *.dpr,*.lpr,*.pas,*.pp setf pascal
+endif
+
+if !has_key(g:polyglot_is_disabled, 'passwd')
+  au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
+endif
+
+if !has_key(g:polyglot_is_disabled, 'papp')
+  au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pamenv')
+  au BufNewFile,BufRead {.,}pam_environment,pam_env.conf setf pamenv
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pamconf')
+  au BufNewFile,BufRead */etc/pam.conf setf pamconf
+  au BufNewFile,BufRead */etc/pam.d/* call s:StarSetf('pamconf')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pf')
+  au BufNewFile,BufRead pf.conf setf pf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ora')
+  au BufNewFile,BufRead *.ora setf ora
+endif
+
+if !has_key(g:polyglot_is_disabled, 'opl')
+  au BufNewFile,BufRead *.[Oo][Pp][Ll] setf opl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'openroad')
+  au BufNewFile,BufRead *.or setf openroad
+endif
+
+if !has_key(g:polyglot_is_disabled, 'omnimark')
+  au BufNewFile,BufRead *.xin,*.xom setf omnimark
+endif
+
+if !has_key(g:polyglot_is_disabled, 'occam')
+  au BufNewFile,BufRead *.occ setf occam
+endif
+
+if !has_key(g:polyglot_is_disabled, 'nsis')
+  au BufNewFile,BufRead *.nsh,*.nsi setf nsis
+endif
+
+if !has_key(g:polyglot_is_disabled, 'nqc')
+  au BufNewFile,BufRead *.nqc setf nqc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'nroff')
+  au BufNewFile,BufRead *.1,*.1in,*.1m,*.1x,*.2,*.3,*.3in,*.3m,*.3p,*.3pm,*.3qt,*.3x,*.4,*.5,*.6,*.7,*.8,*.9,*.man,*.mdoc setf nroff
+  au BufNewFile,BufRead *.mom,*.nr,*.roff,*.tmac,*.tr setf nroff
+  au BufNewFile,BufRead tmac.* call s:StarSetf('nroff')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ncf')
+  au BufNewFile,BufRead *.ncf setf ncf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ninja')
+  au BufNewFile,BufRead *.ninja setf ninja
+endif
+
+if !has_key(g:polyglot_is_disabled, 'netrc')
+  au BufNewFile,BufRead {.,}netrc setf netrc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'neomuttrc')
+  au BufNewFile,BufRead Neomuttrc setf neomuttrc
+  au BufNewFile,BufRead neomuttrc* call s:StarSetf('neomuttrc')
+  au BufNewFile,BufRead Neomuttrc* call s:StarSetf('neomuttrc')
+  au BufNewFile,BufRead .neomuttrc* call s:StarSetf('neomuttrc')
+  au BufNewFile,BufRead */.neomutt/neomuttrc* call s:StarSetf('neomuttrc')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'natural')
+  au BufNewFile,BufRead *.NS[ACGLMNPS] setf natural
+endif
+
+if !has_key(g:polyglot_is_disabled, 'nanorc')
+  au BufNewFile,BufRead *.nanorc,*/etc/nanorc setf nanorc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'n1ql')
+  au BufNewFile,BufRead *.n1ql,*.nql setf n1ql
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mush')
+  au BufNewFile,BufRead *.mush setf mush
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mupad')
+  au BufNewFile,BufRead *.mu setf mupad
+endif
+
+if !has_key(g:polyglot_is_disabled, 'muttrc')
+  au BufNewFile,BufRead Mutt{ng,}rc setf muttrc
+  au BufNewFile,BufRead mutt{ng,}rc* call s:StarSetf('muttrc')
+  au BufNewFile,BufRead Mutt{ng,}rc* call s:StarSetf('muttrc')
+  au BufNewFile,BufRead .mutt{ng,}rc* call s:StarSetf('muttrc')
+  au BufNewFile,BufRead */etc/Muttrc.d/* call s:StarSetf('muttrc')
+  au BufNewFile,BufRead */.mutt{ng,}/mutt{ng,}rc* call s:StarSetf('muttrc')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'msql')
+  au BufNewFile,BufRead *.msql setf msql
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mrxvtrc')
+  au BufNewFile,BufRead {.,}mrxvtrc,mrxvtrc setf mrxvtrc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'srec')
+  au BufNewFile,BufRead *.mot,*.s19,*.s28,*.s37,*.srec setf srec
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mplayerconf')
+  au BufNewFile,BufRead */.mplayer/config,mplayer.conf setf mplayerconf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'modconf')
+  au BufNewFile,BufRead */etc/conf.modules,*/etc/modules,*/etc/modules.conf setf modconf
+  au BufNewFile,BufRead */etc/modprobe.* call s:StarSetf('modconf')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'moo')
+  au BufNewFile,BufRead *.moo setf moo
+endif
+
+if !has_key(g:polyglot_is_disabled, 'monk')
+  au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc setf monk
+endif
+
+if !has_key(g:polyglot_is_disabled, 'modula3')
+  au BufNewFile,BufRead *.[mi][3g] setf modula3
+endif
+
+if !has_key(g:polyglot_is_disabled, 'modula2')
+  au BufNewFile,BufRead *.DEF,*.MOD,*.m2,*.mi setf modula2
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mmp')
+  au BufNewFile,BufRead *.mmp setf mmp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mix')
+  au BufNewFile,BufRead *.mix,*.mixal setf mix
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mgl')
+  au BufNewFile,BufRead *.mgl setf mgl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mp')
+  au BufNewFile,BufRead *.mp setf mp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mf')
+  au BufNewFile,BufRead *.mf setf mf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'messages')
+  au BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.[0-9]*,-[0-9]*} setf messages
+endif
+
+if !has_key(g:polyglot_is_disabled, 'hgcommit')
+  au BufNewFile,BufRead hg-editor-*.txt setf hgcommit
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mel')
+  au BufNewFile,BufRead *.mel setf mel
+endif
+
+if !has_key(g:polyglot_is_disabled, 'map')
+  au BufNewFile,BufRead *.map setf map
+endif
+
+if !has_key(g:polyglot_is_disabled, 'maple')
+  au BufNewFile,BufRead *.mpl,*.mv,*.mws setf maple
+endif
+
+if !has_key(g:polyglot_is_disabled, 'manconf')
+  au BufNewFile,BufRead */etc/man.conf,man.config setf manconf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mallard')
+  au BufNewFile,BufRead *.page setf mallard
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ist')
+  au BufNewFile,BufRead *.ist,*.mst setf ist
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mailcap')
+  au BufNewFile,BufRead {.,}mailcap,mailcap setf mailcap
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mailaliases')
+  au BufNewFile,BufRead */etc/aliases,*/etc/mail/aliases setf mailaliases
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mail')
+  au BufNewFile,BufRead *.eml,{.,}article,{.,}article.\d\+,{.,}followup,{.,}letter,{.,}letter.\d\+,/tmp/SLRN[0-9A-Z.]\+,ae\d\+.txt,mutt[[:alnum:]_-]\\\{6\},mutt{ng,}-*-\w\+,neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},pico.\d\+,snd.\d\+,{neo,}mutt[[:alnum:]._-]\\\{6\} setf mail
+  au BufNewFile,BufRead reportbug-* call s:StarSetf('mail')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mgp')
+  au BufNewFile,BufRead *.mgp setf mgp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lss')
+  au BufNewFile,BufRead *.lss setf lss
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lsl')
+  au BufNewFile,BufRead *.lsl setf lsl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lout')
+  au BufNewFile,BufRead *.lou,*.lout setf lout
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lotos')
+  au BufNewFile,BufRead *.lot,*.lotos setf lotos
+endif
+
+if !has_key(g:polyglot_is_disabled, 'logtalk')
+  au BufNewFile,BufRead *.lgt setf logtalk
+endif
+
+if !has_key(g:polyglot_is_disabled, 'logindefs')
+  au BufNewFile,BufRead */etc/login.defs setf logindefs
+endif
+
+if !has_key(g:polyglot_is_disabled, 'loginaccess')
+  au BufNewFile,BufRead */etc/login.access setf loginaccess
+endif
+
+if !has_key(g:polyglot_is_disabled, 'litestep')
+  au BufNewFile,BufRead */LiteStep/*/*.rc setf litestep
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lite')
+  au BufNewFile,BufRead *.lite,*.lt setf lite
+endif
+
+if !has_key(g:polyglot_is_disabled, 'liquid')
+  au BufNewFile,BufRead *.liquid setf liquid
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lisp')
+  au BufNewFile,BufRead *.cl,*.el,*.lisp,*.lsp,{.,}emacs,{.,}sawfishrc,{.,}sbclrc,sbclrc setf lisp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lilo')
+  au BufNewFile,BufRead lilo.conf setf lilo
+  au BufNewFile,BufRead lilo.conf* call s:StarSetf('lilo')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lifelines')
+  au BufNewFile,BufRead *.ll setf lifelines
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lftp')
+  au BufNewFile,BufRead *lftp/rc,{.,}lftprc,lftp.conf setf lftp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sensors')
+  au BufNewFile,BufRead */etc/sensors.conf,*/etc/sensors3.conf setf sensors
+endif
+
+if !has_key(g:polyglot_is_disabled, 'libao')
+  au BufNewFile,BufRead */.libao,*/etc/libao.conf setf libao
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lex')
+  au BufNewFile,BufRead *.l,*.l++,*.lex,*.lxx setf lex
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ld')
+  au BufNewFile,BufRead *.ld setf ld
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ldif')
+  au BufNewFile,BufRead *.ldif setf ldif
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lprolog')
+  au BufNewFile,BufRead *.sig setf lprolog
+endif
+
+if !has_key(g:polyglot_is_disabled, 'limits')
+  au BufNewFile,BufRead */etc/*limits.conf,*/etc/*limits.d/*.conf,*/etc/limits setf limits
+endif
+
+if !has_key(g:polyglot_is_disabled, 'latte')
+  au BufNewFile,BufRead *.latte,*.lte setf latte
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lace')
+  au BufNewFile,BufRead *.ACE,*.ace setf lace
+endif
+
+if !has_key(g:polyglot_is_disabled, 'kconfig')
+  au BufNewFile,BufRead Kconfig,Kconfig.debug setf kconfig
+  au BufNewFile,BufRead Kconfig.* call s:StarSetf('kconfig')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'kscript')
+  au BufNewFile,BufRead *.ks setf kscript
+endif
+
+if !has_key(g:polyglot_is_disabled, 'kivy')
+  au BufNewFile,BufRead *.kv setf kivy
+endif
+
+if !has_key(g:polyglot_is_disabled, 'kwt')
+  au BufNewFile,BufRead *.k setf kwt
+endif
+
+if !has_key(g:polyglot_is_disabled, 'kix')
+  au BufNewFile,BufRead *.kix setf kix
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jovial')
+  au BufNewFile,BufRead *.j73,*.jov,*.jovial setf jovial
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jgraph')
+  au BufNewFile,BufRead *.jgr setf jgraph
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jess')
+  au BufNewFile,BufRead *.clp setf jess
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jproperties')
+  au BufNewFile,BufRead *.properties,*.properties_??,*.properties_??_?? setf jproperties
+  au BufNewFile,BufRead *.properties_??_??_* call s:StarSetf('jproperties')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jsp')
+  au BufNewFile,BufRead *.jsp setf jsp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'javacc')
+  au BufNewFile,BufRead *.jj,*.jjt setf javacc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'java')
+  au BufNewFile,BufRead *.jav,*.java setf java
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jam')
+  au BufNewFile,BufRead *.jpl,*.jpr setf jam
+  au BufNewFile,BufRead Prl*.* call s:StarSetf('jam')
+  au BufNewFile,BufRead JAM*.* call s:StarSetf('jam')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jal')
+  au BufNewFile,BufRead *.JAL,*.jal setf jal
+endif
+
+if !has_key(g:polyglot_is_disabled, 'j')
+  au BufNewFile,BufRead *.ijs setf j
+endif
+
+if !has_key(g:polyglot_is_disabled, 'iss')
+  au BufNewFile,BufRead *.iss setf iss
+endif
+
+if !has_key(g:polyglot_is_disabled, 'inittab')
+  au BufNewFile,BufRead inittab setf inittab
+endif
+
+if !has_key(g:polyglot_is_disabled, 'fgl')
+  au BufNewFile,BufRead *.4gh,*.4gl,*.m4gl setf fgl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ipfilter')
+  au BufNewFile,BufRead ipf.conf,ipf.rules,ipf6.conf setf ipfilter
+endif
+
+if !has_key(g:polyglot_is_disabled, 'usw2kagtlog')
+  au BufNewFile,BufRead *.usw2kagt.log\c,usw2kagt.*.log\c,usw2kagt.log\c setf usw2kagtlog
+endif
+
+if !has_key(g:polyglot_is_disabled, 'usserverlog')
+  au BufNewFile,BufRead *.usserver.log\c,usserver.*.log\c,usserver.log\c setf usserverlog
+endif
+
+if !has_key(g:polyglot_is_disabled, 'upstreaminstalllog')
+  au BufNewFile,BufRead *.upstreaminstall.log\c,upstreaminstall.*.log\c,upstreaminstall.log\c setf upstreaminstalllog
+endif
+
+if !has_key(g:polyglot_is_disabled, 'upstreamlog')
+  au BufNewFile,BufRead *.upstream.log\c,UPSTREAM-*.log\c,fdrupstream.log,upstream.*.log\c,upstream.log\c setf upstreamlog
+endif
+
+if !has_key(g:polyglot_is_disabled, 'upstreamdat')
+  au BufNewFile,BufRead *.upstream.dat\c,upstream.*.dat\c,upstream.dat\c setf upstreamdat
+endif
+
+if !has_key(g:polyglot_is_disabled, 'initng')
+  au BufNewFile,BufRead *.ii,*/etc/initng/*/*.i setf initng
+endif
+
+if !has_key(g:polyglot_is_disabled, 'inform')
+  au BufNewFile,BufRead *.INF,*.inf setf inform
+endif
+
+if !has_key(g:polyglot_is_disabled, 'indent')
+  au BufNewFile,BufRead {.,}indent.pro,indentrc setf indent
+endif
+
+if !has_key(g:polyglot_is_disabled, 'icemenu')
+  au BufNewFile,BufRead */.icewm/menu setf icemenu
+endif
+
+if !has_key(g:polyglot_is_disabled, 'msidl')
+  au BufNewFile,BufRead *.mof,*.odl setf msidl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'icon')
+  au BufNewFile,BufRead *.icn setf icon
+endif
+
+if !has_key(g:polyglot_is_disabled, 'httest')
+  au BufNewFile,BufRead *.htb,*.htt setf httest
+endif
+
+if !has_key(g:polyglot_is_disabled, 'hb')
+  au BufNewFile,BufRead *.hb setf hb
+endif
+
+if !has_key(g:polyglot_is_disabled, 'hostsaccess')
+  au BufNewFile,BufRead */etc/hosts.allow,*/etc/hosts.deny setf hostsaccess
+endif
+
+if !has_key(g:polyglot_is_disabled, 'hostconf')
+  au BufNewFile,BufRead */etc/host.conf setf hostconf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'template')
+  au BufNewFile,BufRead *.tmpl setf template
+endif
+
+if !has_key(g:polyglot_is_disabled, 'htmlm4')
+  au BufNewFile,BufRead *.html.m4 setf htmlm4
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tilde')
+  au BufNewFile,BufRead *.t.html setf tilde
+endif
+
+if !has_key(g:polyglot_is_disabled, 'html')
+  au BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
+  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
+endif
+
+if !has_key(g:polyglot_is_disabled, 'hollywood')
+  au BufNewFile,BufRead *.hws setf hollywood
+endif
+
+if !has_key(g:polyglot_is_disabled, 'hex')
+  au BufNewFile,BufRead *.h32,*.hex setf hex
+endif
+
+if !has_key(g:polyglot_is_disabled, 'hercules')
+  au BufNewFile,BufRead *.errsum,*.ev,*.sum,*.vc setf hercules
+endif
+
+if !has_key(g:polyglot_is_disabled, 'hastepreproc')
+  au BufNewFile,BufRead *.htpp setf hastepreproc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'haste')
+  au BufNewFile,BufRead *.ht setf haste
+endif
+
+if !has_key(g:polyglot_is_disabled, 'chaskell')
+  au BufNewFile,BufRead *.chs setf chaskell
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lhaskell')
+  au BufNewFile,BufRead *.lhs setf lhaskell
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gtkrc')
+  au BufNewFile,BufRead {.,}gtkrc,gtkrc setf gtkrc
+  au BufNewFile,BufRead gtkrc* call s:StarSetf('gtkrc')
+  au BufNewFile,BufRead .gtkrc* call s:StarSetf('gtkrc')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'group')
+  au BufNewFile,BufRead */etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/etc/gshadow-,*/etc/gshadow.edit,*/var/backups/group.bak,*/var/backups/gshadow.bak setf group
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gsp')
+  au BufNewFile,BufRead *.gsp setf gsp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gretl')
+  au BufNewFile,BufRead *.gretl setf gretl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'grads')
+  au BufNewFile,BufRead *.gs setf grads
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gitolite')
+  au BufNewFile,BufRead gitolite.conf setf gitolite
+  au BufNewFile,BufRead */gitolite-admin/conf/* call s:StarSetf('gitolite')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gnash')
+  au BufNewFile,BufRead {.,}gnashpluginrc,{.,}gnashrc,gnashpluginrc,gnashrc setf gnash
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gpg')
+  au BufNewFile,BufRead */.gnupg/gpg.conf,*/.gnupg/options,*/usr/*/gnupg/options.skel setf gpg
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gp')
+  au BufNewFile,BufRead *.gp,{.,}gprc setf gp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gkrellmrc')
+  au BufNewFile,BufRead gkrellmrc,gkrellmrc_? setf gkrellmrc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gedcom')
+  au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
+  au BufNewFile,BufRead */tmp/lltmp* call s:StarSetf('gedcom')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gdmo')
+  au BufNewFile,BufRead *.gdmo,*.mo setf gdmo
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gdb')
+  au BufNewFile,BufRead {.,}gdbinit setf gdb
+endif
+
+if !has_key(g:polyglot_is_disabled, 'fstab')
+  au BufNewFile,BufRead fstab,mtab setf fstab
+endif
+
+if !has_key(g:polyglot_is_disabled, 'framescript')
+  au BufNewFile,BufRead *.fsl setf framescript
+endif
+
+if !has_key(g:polyglot_is_disabled, 'fortran')
+  au BufNewFile,BufRead *.f,*.f03,*.f08,*.f77,*.f90,*.f95,*.for,*.fortran,*.fpp,*.ftn setf fortran
+endif
+
+if !has_key(g:polyglot_is_disabled, 'reva')
+  au BufNewFile,BufRead *.frt setf reva
+endif
+
+if !has_key(g:polyglot_is_disabled, 'focexec')
+  au BufNewFile,BufRead *.fex,*.focexec setf focexec
+endif
+
+if !has_key(g:polyglot_is_disabled, 'fetchmail')
+  au BufNewFile,BufRead {.,}fetchmailrc setf fetchmail
+endif
+
+if !has_key(g:polyglot_is_disabled, 'factor')
+  au BufNewFile,BufRead *.factor setf factor
+endif
+
+if !has_key(g:polyglot_is_disabled, 'fan')
+  au BufNewFile,BufRead *.fan,*.fwt setf fan
+endif
+
+if !has_key(g:polyglot_is_disabled, 'falcon')
+  au BufNewFile,BufRead *.fal setf falcon
+endif
+
+if !has_key(g:polyglot_is_disabled, 'exports')
+  au BufNewFile,BufRead exports setf exports
+endif
+
+if !has_key(g:polyglot_is_disabled, 'expect')
+  au BufNewFile,BufRead *.exp setf expect
+endif
+
+if !has_key(g:polyglot_is_disabled, 'exim')
+  au BufNewFile,BufRead exim.conf setf exim
+endif
+
+if !has_key(g:polyglot_is_disabled, 'csc')
+  au BufNewFile,BufRead *.csc setf csc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'esterel')
+  au BufNewFile,BufRead *.strl setf esterel
+endif
+
+if !has_key(g:polyglot_is_disabled, 'esqlc')
+  au BufNewFile,BufRead *.EC,*.ec setf esqlc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'esmtprc')
+  au BufNewFile,BufRead *esmtprc setf esmtprc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'elmfilt')
+  au BufNewFile,BufRead filter-rules setf elmfilt
+endif
+
+if !has_key(g:polyglot_is_disabled, 'elinks')
+  au BufNewFile,BufRead elinks.conf setf elinks
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ecd')
+  au BufNewFile,BufRead *.ecd setf ecd
+endif
+
+if !has_key(g:polyglot_is_disabled, 'edif')
+  au BufNewFile,BufRead *.ed\(f\|if\|o\) setf edif
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dts')
+  au BufNewFile,BufRead *.dts,*.dtsi setf dts
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dtd')
+  au BufNewFile,BufRead *.dtd setf dtd
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dsl')
+  au BufNewFile,BufRead *.dsl setf dsl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'datascript')
+  au BufNewFile,BufRead *.ds setf datascript
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dracula')
+  au BufNewFile,BufRead *.drac,*.drc,*lpe,*lvs setf dracula
+  au BufNewFile,BufRead drac.* call s:StarSetf('dracula')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'def')
+  au BufNewFile,BufRead *.def setf def
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dylan')
+  au BufNewFile,BufRead *.dylan setf dylan
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dylanintr')
+  au BufNewFile,BufRead *.intr setf dylanintr
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dylanlid')
+  au BufNewFile,BufRead *.lid setf dylanlid
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dot')
+  au BufNewFile,BufRead *.dot,*.gv setf dot
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dircolors')
+  au BufNewFile,BufRead */etc/DIR_COLORS,{.,}dir_colors,{.,}dircolors setf dircolors
+endif
+
+if !has_key(g:polyglot_is_disabled, 'diff')
+  au BufNewFile,BufRead *.diff,*.rej setf diff
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dictdconf')
+  au BufNewFile,BufRead dictd.conf setf dictdconf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dictconf')
+  au BufNewFile,BufRead {.,}dictrc,dict.conf setf dictconf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'desktop')
+  au BufNewFile,BufRead *.desktop,*.directory setf desktop
+endif
+
+if !has_key(g:polyglot_is_disabled, 'desc')
+  au BufNewFile,BufRead *.desc setf desc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dnsmasq')
+  au BufNewFile,BufRead */etc/dnsmasq.conf setf dnsmasq
+  au BufNewFile,BufRead */etc/dnsmasq.d/* call s:StarSetf('dnsmasq')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'denyhosts')
+  au BufNewFile,BufRead denyhosts.conf setf denyhosts
+endif
+
+if !has_key(g:polyglot_is_disabled, 'debsources')
+  au BufNewFile,BufRead */etc/apt/sources.list,*/etc/apt/sources.list.d/*.list setf debsources
+endif
+
+if !has_key(g:polyglot_is_disabled, 'debcopyright')
+  au BufNewFile,BufRead */debian/copyright setf debcopyright
+endif
+
+if !has_key(g:polyglot_is_disabled, 'debcontrol')
+  au BufNewFile,BufRead */debian/control setf debcontrol
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cuplsim')
+  au BufNewFile,BufRead *.si setf cuplsim
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cupl')
+  au BufNewFile,BufRead *.pld setf cupl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'csp')
+  au BufNewFile,BufRead *.csp,*.fdr setf csp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'quake')
+  au BufNewFile,BufRead *baseq[2-3]/*.cfg,*id1/*.cfg,*quake[1-3]/*.cfg setf quake
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lynx')
+  au BufNewFile,BufRead lynx.cfg setf lynx
+endif
+
+if !has_key(g:polyglot_is_disabled, 'eterm')
+  au BufNewFile,BufRead *Eterm/*.cfg setf eterm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dcd')
+  au BufNewFile,BufRead *.dcd setf dcd
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dockerfile')
+  au BufNewFile,BufRead *.Dockerfile,*.dock,Containerfile,Dockerfile,dockerfile setf dockerfile
+  au BufNewFile,BufRead Dockerfile* call s:StarSetf('dockerfile')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cuda')
+  au BufNewFile,BufRead *.cu,*.cuh setf cuda
+endif
+
+if !has_key(g:polyglot_is_disabled, 'config')
+  au BufNewFile,BufRead Pipfile,configure.ac,configure.in setf config
+  au BufNewFile,BufRead /etc/hostname.* call s:StarSetf('config')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cf')
+  au BufNewFile,BufRead *.cfc,*.cfi,*.cfm setf cf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'coco')
+  au BufNewFile,BufRead *.atg setf coco
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cobol')
+  au BufNewFile,BufRead *.cbl,*.cob,*.lib setf cobol
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cmusrc')
+  au BufNewFile,BufRead */.cmus/{autosave,rc,command-history,*.theme},*/cmus/{rc,*.theme} setf cmusrc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cl')
+  au BufNewFile,BufRead *.eni setf cl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'clean')
+  au BufNewFile,BufRead *.dcl,*.icl setf clean
+endif
+
+if !has_key(g:polyglot_is_disabled, 'chordpro')
+  au BufNewFile,BufRead *.cho,*.chopro,*.chordpro,*.crd,*.crdpro setf chordpro
+endif
+
+if !has_key(g:polyglot_is_disabled, 'chill')
+  au BufNewFile,BufRead *..ch setf chill
+endif
+
+if !has_key(g:polyglot_is_disabled, 'debchangelog')
+  au BufNewFile,BufRead */debian/changelog,NEWS.Debian,NEWS.dch,changelog.Debian,changelog.dch setf debchangelog
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cterm')
+  au BufNewFile,BufRead *.con setf cterm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'css')
+  au BufNewFile,BufRead *.css setf css
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ch')
+  au BufNewFile,BufRead *.chf setf ch
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cynpp')
+  au BufNewFile,BufRead *.cyn setf cynpp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'crm')
+  au BufNewFile,BufRead *.crm setf crm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'conaryrecipe')
+  au BufNewFile,BufRead *.recipe setf conaryrecipe
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cdl')
+  au BufNewFile,BufRead *.cdl setf cdl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'chaiscript')
+  au BufNewFile,BufRead *.chai setf chaiscript
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cfengine')
+  au BufNewFile,BufRead cfengine.conf setf cfengine
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cdrdaoconf')
+  au BufNewFile,BufRead */etc/cdrdao.conf,*/etc/default/cdrdao,*/etc/defaults/cdrdao,{.,}cdrdao setf cdrdaoconf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cdrtoc')
+  au BufNewFile,BufRead *.toc setf cdrtoc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cabal')
+  au BufNewFile,BufRead *.cabal setf cabal
+endif
+
+if !has_key(g:polyglot_is_disabled, 'csdl')
+  au BufNewFile,BufRead *.csdl setf csdl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cs')
+  au BufNewFile,BufRead *.cs setf cs
+endif
+
+if !has_key(g:polyglot_is_disabled, 'calendar')
+  au BufNewFile,BufRead calendar setf calendar
+  au BufNewFile,BufRead */share/calendar/calendar.* call s:StarSetf('calendar')
+  au BufNewFile,BufRead */share/calendar/*/calendar.* call s:StarSetf('calendar')
+  au BufNewFile,BufRead */.calendar/* call s:StarSetf('calendar')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lpc')
+  au BufNewFile,BufRead *.lpc,*.ulpc setf lpc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'bsdl')
+  au BufNewFile,BufRead *.bsdl,*bsd setf bsdl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'blank')
+  au BufNewFile,BufRead *.bl setf blank
+endif
+
+if !has_key(g:polyglot_is_disabled, 'bindzone')
+  au BufNewFile,BufRead named.root setf bindzone
+  au BufNewFile,BufRead */named/db.* call s:StarSetf('bindzone')
+  au BufNewFile,BufRead */bind/db.* call s:StarSetf('bindzone')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'named')
+  au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key setf named
+endif
+
+if !has_key(g:polyglot_is_disabled, 'bst')
+  au BufNewFile,BufRead *.bst setf bst
+endif
+
+if !has_key(g:polyglot_is_disabled, 'bib')
+  au BufNewFile,BufRead *.bib setf bib
+endif
+
+if !has_key(g:polyglot_is_disabled, 'bdf')
+  au BufNewFile,BufRead *.bdf setf bdf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'bc')
+  au BufNewFile,BufRead *.bc setf bc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dosbatch')
+  au BufNewFile,BufRead *.bat,*.sys setf dosbatch
+endif
+
+if !has_key(g:polyglot_is_disabled, 'hamster')
+  au BufNewFile,BufRead *.hsc,*.hsm setf hamster
+endif
+
+if !has_key(g:polyglot_is_disabled, 'freebasic')
+  au BufNewFile,BufRead *.bi,*.fb setf freebasic
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ibasic')
+  au BufNewFile,BufRead *.iba,*.ibi setf ibasic
+endif
+
+if !has_key(g:polyglot_is_disabled, 'b')
+  au BufNewFile,BufRead *.imp,*.mch,*.ref setf b
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sql')
+  au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw setf sql
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gitignore')
+  au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore setf gitignore
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tads')
+  au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+endif
+
+if !has_key(g:polyglot_is_disabled, 'prolog')
+  au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap setf prolog
+endif
+
+if !has_key(g:polyglot_is_disabled, 'bzl')
+  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE setf bzl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'odin')
+  au BufNewFile,BufRead *.odin setf odin
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dosini')
+  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec setf dosini
+  au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
+  au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'spec')
+  au BufNewFile,BufRead *.spec setf spec
+endif
+
+if !has_key(g:polyglot_is_disabled, 'visual-basic')
+  au BufNewFile,BufRead,BufWritePost *.bas call polyglot#detect#Bas()
+  au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs setf vb
+endif
+
+if !has_key(g:polyglot_is_disabled, 'basic')
+  au BufNewFile,BufRead *.basic setf basic
+endif
+
+if !has_key(g:polyglot_is_disabled, 'trasys')
+  au BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
+endif
+
+if !has_key(g:polyglot_is_disabled, 'zig')
+  au BufNewFile,BufRead *.zir setf zir
+  au BufNewFile,BufRead *.zig,*.zir setf zig
+endif
+
+if !has_key(g:polyglot_is_disabled, 'zephir')
+  au BufNewFile,BufRead *.zep setf zephir
+endif
+
+if !has_key(g:polyglot_is_disabled, 'help')
+  au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt setf help
+endif
+
+if !has_key(g:polyglot_is_disabled, 'helm')
+  au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml setf helm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'smarty')
+  au BufNewFile,BufRead *.tpl setf smarty
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ansible')
+  au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml setf yaml.ansible
+  au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
+  au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xsl')
+  au BufNewFile,BufRead *.xsl,*.xslt setf xsl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xdc')
+  au BufNewFile,BufRead *.xdc setf xdc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'vue')
+  au BufNewFile,BufRead *.vue,*.wpy setf vue
+endif
+
+if !has_key(g:polyglot_is_disabled, 'vmasm')
+  au BufNewFile,BufRead *.mar setf vmasm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'velocity')
+  au BufNewFile,BufRead *.vm setf velocity
+endif
+
+if !has_key(g:polyglot_is_disabled, 'vcl')
+  au BufNewFile,BufRead *.vcl setf vcl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'vbnet')
+  au BufNewFile,BufRead *.vb,*.vbhtml setf vbnet
+endif
+
+if !has_key(g:polyglot_is_disabled, 'vala')
+  au BufNewFile,BufRead *.vala,*.valadoc,*.vapi setf vala
+endif
+
+if !has_key(g:polyglot_is_disabled, 'v')
+  au BufNewFile,BufRead *.v,*.vsh,*.vv setf vlang
+endif
+
+if !has_key(g:polyglot_is_disabled, 'unison')
+  au BufNewFile,BufRead *.u,*.uu setf unison
+endif
+
+if !has_key(g:polyglot_is_disabled, 'typescript')
+  au BufNewFile,BufRead *.ts setf typescript
+  au BufNewFile,BufRead *.tsx setf typescriptreact
+endif
+
+if !has_key(g:polyglot_is_disabled, 'twig')
+  au BufNewFile,BufRead *.twig setf html.twig
+  au BufNewFile,BufRead *.xml.twig setf xml.twig
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tutor')
+  au BufNewFile,BufRead *.tutor setf tutor
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tptp')
+  au BufNewFile,BufRead *.ax,*.p,*.tptp setf tptp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'toml')
+  au BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock setf toml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tmux')
+  au BufNewFile,BufRead {.,}tmux*.conf setf tmux
+endif
+
+if !has_key(g:polyglot_is_disabled, 'thrift')
+  au BufNewFile,BufRead *.thrift setf thrift
+endif
+
+if !has_key(g:polyglot_is_disabled, 'textile')
+  au BufNewFile,BufRead *.textile setf textile
+endif
+
+if !has_key(g:polyglot_is_disabled, 'terraform')
+  au BufNewFile,BufRead *.tf,*.tfvars setf terraform
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tf')
+  au BufNewFile,BufRead *.tf,{.,}tfrc,tfrc setf tf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'systemd')
+  au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf setf systemd
+  au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sxhkd')
+  au BufNewFile,BufRead *.sxhkdrc,sxhkdrc setf sxhkdrc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'swift')
+  au BufNewFile,BufRead *.swift setf swift
+endif
+
+if !has_key(g:polyglot_is_disabled, 'svg')
+  au BufNewFile,BufRead *.svg setf svg
+endif
+
+if !has_key(g:polyglot_is_disabled, 'svelte')
+  au BufNewFile,BufRead *.svelte setf svelte
+endif
+
+if !has_key(g:polyglot_is_disabled, 'stylus')
+  au BufNewFile,BufRead *.styl,*.stylus setf stylus
+endif
+
+if !has_key(g:polyglot_is_disabled, 'solidity')
+  au BufNewFile,BufRead *.sol setf solidity
+endif
+
+if !has_key(g:polyglot_is_disabled, 'smt2')
+  au BufNewFile,BufRead *.smt,*.smt2 setf smt2
+endif
+
+if !has_key(g:polyglot_is_disabled, 'slime')
+  au BufNewFile,BufRead *.slime setf slime
+endif
+
+if !has_key(g:polyglot_is_disabled, 'slim')
+  au BufNewFile,BufRead *.slim setf slim
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sh')
+  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile setf sh
+  au BufNewFile,BufRead *.zsh,*/etc/zprofile,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
+  au BufNewFile,BufRead .zsh* call s:StarSetf('zsh')
+  au BufNewFile,BufRead .zlog* call s:StarSetf('zsh')
+  au BufNewFile,BufRead .zcompdump* call s:StarSetf('zsh')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'scss')
+  au BufNewFile,BufRead *.scss setf scss
+endif
+
+if !has_key(g:polyglot_is_disabled, 'scala')
+  au BufNewFile,BufRead *.kojo,*.sc,*.scala setf scala
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rust')
+  au BufNewFile,BufRead *.rs,*.rs.in setf rust
+endif
+
+if !has_key(g:polyglot_is_disabled, 'brewfile')
+  au BufNewFile,BufRead Brewfile setf brewfile
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rspec')
+  au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ruby')
+  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Routefile,Snapfile,Thorfile,Vagrantfile,[Rr]antfile,buildfile,vagrantfile setf ruby
+  au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
+  au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml setf eruby
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rst')
+  au BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt setf rst
+endif
+
+if !has_key(g:polyglot_is_disabled, 'reason')
+  au BufNewFile,BufRead,BufWritePost *.re call polyglot#detect#Re()
+  au BufNewFile,BufRead *.rei setf reason
+endif
+
+if !has_key(g:polyglot_is_disabled, 'razor')
+  au BufNewFile,BufRead *.cshtml,*.razor setf razor
+endif
+
+if !has_key(g:polyglot_is_disabled, 'raml')
+  au BufNewFile,BufRead *.raml setf raml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'raku')
+  au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+  au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 setf raku
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ragel')
+  au BufNewFile,BufRead *.rl setf ragel
+endif
+
+if !has_key(g:polyglot_is_disabled, 'racket')
+  au BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl setf racket
+endif
+
+if !has_key(g:polyglot_is_disabled, 'r-lang')
+  au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist setf r
+  au BufNewFile,BufRead *.rd setf rhelp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'qml')
+  au BufNewFile,BufRead *.qbs,*.qml setf qml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'qmake')
+  au BufNewFile,BufRead *.pri,*.pro setf qmake
+endif
+
+if !has_key(g:polyglot_is_disabled, 'requirements')
+  au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} setf requirements
+endif
+
+if !has_key(g:polyglot_is_disabled, 'python')
+  au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript setf python
+endif
+
+if !has_key(g:polyglot_is_disabled, 'purescript')
+  au BufNewFile,BufRead *.purs setf purescript
+endif
+
+if !has_key(g:polyglot_is_disabled, 'puppet')
+  au BufNewFile,BufRead *.pp,Modulefile setf puppet
+  au BufNewFile,BufRead *.epp setf embeddedpuppet
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pug')
+  au BufNewFile,BufRead *.jade,*.pug setf pug
+endif
+
+if !has_key(g:polyglot_is_disabled, 'protobuf')
+  au BufNewFile,BufRead *.proto setf proto
+endif
+
+if !has_key(g:polyglot_is_disabled, 'powershell')
+  au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc setf ps1
+  au BufNewFile,BufRead *.ps1xml setf ps1xml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pony')
+  au BufNewFile,BufRead *.pony setf pony
+endif
+
+if !has_key(g:polyglot_is_disabled, 'plantuml')
+  au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml setf plantuml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pest')
+  au BufNewFile,BufRead *.pest setf pest
+endif
+
+if !has_key(g:polyglot_is_disabled, 'blade')
+  au BufNewFile,BufRead *.blade,*.blade.php setf blade
+endif
+
+if !has_key(g:polyglot_is_disabled, 'php')
+  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.php9,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile setf php
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cql')
+  au BufNewFile,BufRead *.cql setf cql
+endif
+
+if !has_key(g:polyglot_is_disabled, 'pgsql')
+  au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
+endif
+
+if !has_key(g:polyglot_is_disabled, 'perl')
+  au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+  au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc setf perl
+  au BufNewFile,BufRead *.pod setf pod
+  au BufNewFile,BufRead *.comp,*.mason,*.mhtml setf mason
+  au BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
+  au BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
+  au BufNewFile,BufRead *.xs setf xs
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rc')
+  au BufNewFile,BufRead *.rc,*.rch setf rc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'opencl')
+  au BufNewFile,BufRead *.cl,*.opencl setf opencl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'octave')
+  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+  au BufNewFile,BufRead *.oct setf octave
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ocaml')
+  au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit setf ocaml
+  au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in setf omake
+  au BufNewFile,BufRead *.opam,*.opam.template,opam setf opam
+  au BufNewFile,BufRead _oasis setf oasis
+  au BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild setf dune
+  au BufNewFile,BufRead _tags setf ocamlbuild_tags
+  au BufNewFile,BufRead *.ocp setf ocpbuild
+  au BufNewFile,BufRead *.root setf ocpbuildroot
+  au BufNewFile,BufRead *.sexp setf sexplib
+endif
+
+if !has_key(g:polyglot_is_disabled, 'objc')
+  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+  au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
+endif
+
+if !has_key(g:polyglot_is_disabled, 'nix')
+  au BufNewFile,BufRead *.nix setf nix
+endif
+
+if !has_key(g:polyglot_is_disabled, 'nim')
+  au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg setf nim
+endif
+
+if !has_key(g:polyglot_is_disabled, 'nginx')
+  au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf setf nginx
+  au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
+  au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'murphi')
+  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+endif
+
+if !has_key(g:polyglot_is_disabled, 'moonscript')
+  au BufNewFile,BufRead *.moon setf moon
+endif
+
+if !has_key(g:polyglot_is_disabled, 'meson')
+  au BufNewFile,BufRead meson.build,meson_options.txt setf meson
+  au BufNewFile,BufRead *.wrap setf dosini
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mdx')
+  au BufNewFile,BufRead *.mdx setf markdown.mdx
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mathematica')
+  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+  au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt setf mma
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mako')
+  au BufNewFile,BufRead *.mako,*.mao setf mako
+  au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+  au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
+endif
+
+if !has_key(g:polyglot_is_disabled, 'm4')
+  au BufNewFile,BufRead *.at,*.m4 setf m4
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lua')
+  au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc setf lua
+endif
+
+if !has_key(g:polyglot_is_disabled, 'log')
+  au BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log setf log
+endif
+
+if !has_key(g:polyglot_is_disabled, 'llvm')
+  au BufNewFile,BufRead *.ll setf llvm
+  au BufNewFile,BufRead *.td setf tablegen
+endif
+
+if !has_key(g:polyglot_is_disabled, 'livescript')
+  au BufNewFile,BufRead *._ls,*.ls,Slakefile setf livescript
+endif
+
+if !has_key(g:polyglot_is_disabled, 'lilypond')
+  au BufNewFile,BufRead *.ily,*.ly setf lilypond
+endif
+
+if !has_key(g:polyglot_is_disabled, 'less')
+  au BufNewFile,BufRead *.less setf less
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ledger')
+  au BufNewFile,BufRead *.journal,*.ldg,*.ledger setf ledger
+endif
+
+if !has_key(g:polyglot_is_disabled, 'kotlin')
+  au BufNewFile,BufRead *.kt,*.ktm,*.kts setf kotlin
+endif
+
+if !has_key(g:polyglot_is_disabled, 'julia')
+  au BufNewFile,BufRead *.jl setf julia
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jst')
+  au BufNewFile,BufRead *.ect,*.ejs,*.jst setf jst
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jsonnet')
+  au BufNewFile,BufRead *.jsonnet,*.libsonnet setf jsonnet
+endif
+
+if !has_key(g:polyglot_is_disabled, 'json')
+  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
+endif
+
+if !has_key(g:polyglot_is_disabled, 'json5')
+  au BufNewFile,BufRead *.json5 setf json5
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jq')
+  au BufNewFile,BufRead *.jq,{.,}jqrc setf jq
+  au BufNewFile,BufRead .jqrc* call s:StarSetf('jq')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'htmldjango')
+  au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk setf htmldjango
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jenkins')
+  au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile setf Jenkinsfile
+  au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ion')
+  au BufNewFile,BufRead *.ion,~/.config/ion/initrc setf ion
+endif
+
+if !has_key(g:polyglot_is_disabled, 'idris2')
+  au BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
+  au BufNewFile,BufRead *.ipkg,idris-response setf idris2
+  au BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
+endif
+
+if !has_key(g:polyglot_is_disabled, 'idris')
+  au BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
+  au BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
+  au BufNewFile,BufRead idris-response setf idris
+endif
+
+if !has_key(g:polyglot_is_disabled, 'icalendar')
+  au BufNewFile,BufRead *.ics setf icalendar
+endif
+
+if !has_key(g:polyglot_is_disabled, 'i3')
+  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config setf i3config
+endif
+
+if !has_key(g:polyglot_is_disabled, 'hive')
+  au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
+endif
+
+if !has_key(g:polyglot_is_disabled, 'hcl')
+  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile setf hcl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'haxe')
+  au BufNewFile,BufRead *.hx,*.hxsl setf haxe
+endif
+
+if !has_key(g:polyglot_is_disabled, 'haskell')
+  au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig setf haskell
+endif
+
+if !has_key(g:polyglot_is_disabled, 'haproxy')
+  au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
+  au BufNewFile,BufRead haproxy*.cfg* call s:StarSetf('haproxy')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'handlebars')
+  au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache setf html.mustache
+  au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs setf html.handlebars
+endif
+
+if !has_key(g:polyglot_is_disabled, 'haml')
+  au BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc setf haml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'grub')
+  au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf setf grub
+endif
+
+if !has_key(g:polyglot_is_disabled, 'groovy')
+  au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile setf groovy
+endif
+
+if !has_key(g:polyglot_is_disabled, 'graphql')
+  au BufNewFile,BufRead *.gql,*.graphql,*.graphqls setf graphql
+endif
+
+if !has_key(g:polyglot_is_disabled, 'jsx')
+  au BufNewFile,BufRead *.jsx setf javascriptreact
+endif
+
+if !has_key(g:polyglot_is_disabled, 'javascript')
+  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
+  au BufNewFile,BufRead *.flow setf flow
+endif
+
+if !has_key(g:polyglot_is_disabled, 'go')
+  au BufNewFile,BufRead *.go setf go
+  au BufNewFile,BufRead go.mod setf gomod
+  au BufNewFile,BufRead *.tmpl setf gohtmltmpl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gnuplot')
+  au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt setf gnuplot
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gmpl')
+  au BufNewFile,BufRead *.mod setf gmpl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'glsl')
+  au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
+  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'git')
+  au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules setf gitconfig
+  au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
+  au BufNewFile,BufRead git-rebase-todo setf gitrebase
+  au BufNewFile,BufRead .gitsendemail.* call s:StarSetf('gitsendemail')
+  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
+endif
+
+if !has_key(g:polyglot_is_disabled, 'gdscript')
+  au BufNewFile,BufRead *.gd setf gdscript3
+endif
+
+if !has_key(g:polyglot_is_disabled, 'fsharp')
+  au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
+  au BufNewFile,BufRead *.fsi,*.fsx setf fsharp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'forth')
+  au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
+  au BufNewFile,BufRead *.ft,*.fth setf forth
+endif
+
+if !has_key(g:polyglot_is_disabled, 'flatbuffers')
+  au BufNewFile,BufRead *.fbs setf fbs
+endif
+
+if !has_key(g:polyglot_is_disabled, 'fish')
+  au BufNewFile,BufRead *.fish setf fish
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ferm')
+  au BufNewFile,BufRead *.ferm,ferm.conf setf ferm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'fennel')
+  au BufNewFile,BufRead *.fnl setf fennel
+endif
+
+if !has_key(g:polyglot_is_disabled, 'erlang')
+  au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock setf erlang
+endif
+
+if !has_key(g:polyglot_is_disabled, 'emblem')
+  au BufNewFile,BufRead *.em,*.emblem setf emblem
+endif
+
+if !has_key(g:polyglot_is_disabled, 'emberscript')
+  au BufNewFile,BufRead *.em,*.emberscript setf ember-script
+endif
+
+if !has_key(g:polyglot_is_disabled, 'elm')
+  au BufNewFile,BufRead *.elm setf elm
+endif
+
+if !has_key(g:polyglot_is_disabled, 'elixir')
+  au BufNewFile,BufRead *.ex,*.exs,mix.lock setf elixir
+  au BufNewFile,BufRead *.eex,*.html.leex,*.leex setf eelixir
+endif
+
+if !has_key(g:polyglot_is_disabled, 'docker-compose')
+  au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml setf yaml.docker-compose
+endif
+
+if !has_key(g:polyglot_is_disabled, 'yaml')
+  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock setf yaml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'mysql')
+  au BufNewFile,BufRead *.mysql setf mysql
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sed')
+  au BufNewFile,BufRead *.sed setf sed
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dlang')
+  au BufNewFile,BufRead *.d,*.di setf d
+  au BufNewFile,BufRead *.lst setf dcov
+  au BufNewFile,BufRead *.dd setf dd
+  au BufNewFile,BufRead *.ddoc setf ddoc
+  au BufNewFile,BufRead *.sdl setf dsdl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dhall')
+  au BufNewFile,BufRead *.dhall setf dhall
+endif
+
+if !has_key(g:polyglot_is_disabled, 'dart')
+  au BufNewFile,BufRead *.dart,*.drt setf dart
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cue')
+  au BufNewFile,BufRead *.cue setf cuesheet
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cucumber')
+  au BufNewFile,BufRead *.feature,*.story setf cucumber
+endif
+
+if !has_key(g:polyglot_is_disabled, 'crystal')
+  au BufNewFile,BufRead *.cr,Projectfile setf crystal
+  au BufNewFile,BufRead *.ecr setf ecrystal
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cryptol')
+  au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl setf cryptol
+endif
+
+if !has_key(g:polyglot_is_disabled, 'coffee-script')
+  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.cson,*.iced,Cakefile setf coffee
+  au BufNewFile,BufRead *.coffee.md,*.litcoffee setf litcoffee
+endif
+
+if !has_key(g:polyglot_is_disabled, 'markdown')
+  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr setf markdown
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cmake')
+  au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt setf cmake
+endif
+
+if !has_key(g:polyglot_is_disabled, 'clojure')
+  au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config setf clojure
+endif
+
+if !has_key(g:polyglot_is_disabled, 'carp')
+  au BufNewFile,BufRead *.carp setf carp
+endif
+
+if !has_key(g:polyglot_is_disabled, 'caddyfile')
+  au BufNewFile,BufRead Caddyfile setf caddyfile
+endif
+
+if !has_key(g:polyglot_is_disabled, 'awk')
+  au BufNewFile,BufRead *.awk,*.gawk setf awk
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ave')
+  au BufNewFile,BufRead *.ave setf ave
+endif
+
+if !has_key(g:polyglot_is_disabled, 'autoit')
+  au BufNewFile,BufRead *.au3 setf autoit
+endif
+
+if !has_key(g:polyglot_is_disabled, 'atlas')
+  au BufNewFile,BufRead *.as,*.atl setf atlas
+endif
+
+if !has_key(g:polyglot_is_disabled, 'aspperl')
+  au BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
+endif
+
+if !has_key(g:polyglot_is_disabled, 'aspvbs')
+  au BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
+  au BufNewFile,BufRead,BufWritePost *.asa call polyglot#detect#Asa()
+endif
+
+if !has_key(g:polyglot_is_disabled, 'asn')
+  au BufNewFile,BufRead *.asn,*.asn1 setf asn
+endif
+
+if !has_key(g:polyglot_is_disabled, 'automake')
+  au BufNewFile,BufRead GNUmakefile.am,[mM]akefile.am setf automake
+endif
+
+if !has_key(g:polyglot_is_disabled, 'elf')
+  au BufNewFile,BufRead *.am setf elf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'make')
+  au BufNewFile,BufRead *.dsp,*.mak,*.mk,*[mM]akefile setf make
+endif
+
+if !has_key(g:polyglot_is_disabled, 'autohotkey')
+  au BufNewFile,BufRead *.ahk,*.ahkl setf autohotkey
+endif
+
+if !has_key(g:polyglot_is_disabled, 'asciidoc')
+  au BufNewFile,BufRead *.adoc,*.asc,*.asciidoc setf asciidoc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'art')
+  au BufNewFile,BufRead *.art setf art
+endif
+
+if !has_key(g:polyglot_is_disabled, 'arduino')
+  au BufNewFile,BufRead *.ino,*.pde setf arduino
+endif
+
+if !has_key(g:polyglot_is_disabled, 'c/c++')
+  au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
+  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp setf cpp
+  au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
+  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
+endif
+
+if !has_key(g:polyglot_is_disabled, 'arch')
+  au BufNewFile,BufRead {.,}arch-inventory,=tagging-method setf arch
+endif
+
+if !has_key(g:polyglot_is_disabled, 'aptconf')
+  au BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf setf aptconf
+  au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'applescript')
+  au BufNewFile,BufRead *.applescript,*.scpt setf applescript
+endif
+
+if !has_key(g:polyglot_is_disabled, 'apiblueprint')
+  au BufNewFile,BufRead *.apib setf apiblueprint
+endif
+
+if !has_key(g:polyglot_is_disabled, 'apache')
+  au BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess setf apache
+  au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead apache.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead access.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/sites-*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/mods-*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/conf.*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/*.conf* call s:StarSetf('apache')
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ant')
+  au BufNewFile,BufRead build.xml setf ant
+endif
+
+if !has_key(g:polyglot_is_disabled, 'xml')
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'csv')
+  au BufNewFile,BufRead *.csv,*.tab,*.tsv setf csv
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ampl')
+  " AMPL
+  au BufNewFile,BufRead *.run setf ampl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'aml')
+  au BufNewFile,BufRead *.aml setf aml
+endif
+
+if !has_key(g:polyglot_is_disabled, 'alsaconf')
+  au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc setf alsaconf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'conf')
+  au BufNewFile,BufRead *.conf,*/etc/hosts,auto.master,config setf conf
+endif
+
+if !has_key(g:polyglot_is_disabled, 'master')
+  au BufNewFile,BufRead *.mas,*.master setf master
+endif
+
+if !has_key(g:polyglot_is_disabled, 'aidl')
+  " AIDL
+  au BufNewFile,BufRead *.aidl setf aidl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ahdl')
+  " AHDL
+  au BufNewFile,BufRead *.tdf setf ahdl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'ada')
+  " Ada (83, 9X, 95)
+  au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr setf ada
+endif
+
+if !has_key(g:polyglot_is_disabled, 'acpiasl')
+  au BufNewFile,BufRead *.asl,*.dsl setf asl
+endif
+
+if !has_key(g:polyglot_is_disabled, 'acedb')
+  " AceDB
+  au BufNewFile,BufRead *.wrm setf acedb
+endif
+
+if !has_key(g:polyglot_is_disabled, 'abel')
+  " ABEL
+  au BufNewFile,BufRead *.abl setf abel
+endif
+
+if !has_key(g:polyglot_is_disabled, 'abc')
+  " ABC music notation
+  au BufNewFile,BufRead *.abc setf abc
+endif
+
+if !has_key(g:polyglot_is_disabled, 'abaqus')
+  au BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
+endif
+
+if !has_key(g:polyglot_is_disabled, 'abap')
+  " ABAB/4
+  au BufNewFile,BufRead *.abap setf abap
+endif
+
+if !has_key(g:polyglot_is_disabled, 'aap')
+  " A-A-P recipe
+  au BufNewFile,BufRead *.aap setf aap
+endif
+
+if !has_key(g:polyglot_is_disabled, 'a65')
+  " XA65 MOS6510 cross assembler
+  au BufNewFile,BufRead *.a65 setf a65
+endif
+
+if !has_key(g:polyglot_is_disabled, 'a2ps')
+  au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc setf a2ps
+endif
+
+if !has_key(g:polyglot_is_disabled, 'cfg')
+  au BufNewFile,BufRead *.cfg,*.hgrc,*hgrc setf cfg
+endif
+
+if !has_key(g:polyglot_is_disabled, '8th')
+  " 8th (Firth-derivative)
+  au BufNewFile,BufRead *.8th setf 8th
+endif
+
+
+" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
+
+func! s:Observe(fn)
+  let b:PolyglotObserve = function("polyglot#" . a:fn)
+  augroup polyglot-observer
+    au!
+    au CursorHold,CursorHoldI <buffer> call b:PolyglotObserve()
+  augroup END
+endfunc
+
+au BufNewFile,BufRead,StdinReadPost,BufWritePost * if (&ft == "" || &ft == "conf") && expand("<afile>:e") == "" |
+  \ call polyglot#shebang#Detect() | endif
+
+au BufWinEnter * if &ft == "" && expand("<afile>:e") == "" |
+  \ call s:Observe('shebang#Detect') | endif
+
+au BufWritePost * au! polyglot-observer
+
+augroup END
+
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sensible')
+  " Use 2-spaces tab indentation by default
+  if &tabstop == 8
+    let &tabstop = 2
+  endif
+
+  " Set shiftwidth to proper value as users often mix it with tabstop
+  if &shiftwidth > &tabstop
+    let &shiftwidth = &tabstop
+  endif
+
+  " Use utf-8 encoding by default
+  set encoding=utf-8
+
+  " Reload unchanged files automatically.
+  set autoread
+
+  " This is needed to avoid swapfile warning when auto-reloading
+  set shortmess+=A
+
+  " Avoids swapfiles in current directory
+  if &directory =~# '^\.,'
+    if !empty($HOME)
+      if has('win32')
+        let &directory = expand('$HOME/vimfiles') . '//,' . &directory
+      else
+        let &directory = expand('$HOME/.vim') . '//,' . &directory
+      endif
+    endif
+    if !empty($XDG_DATA_HOME)
+      let &directory = expand('$XDG_DATA_HOME') . '//,' . &directory
+    endif
+    if has('macunix')
+      let &directory = expand('$HOME/Library/Autosave Information') . '//,' . &directory
+    endif
+  endif
+
+  " Autoindent when starting new line, or using `o` or `O`.
+  set autoindent
+endif
+
+if !has_key(g:polyglot_is_disabled, 'autoindent')
+  " Code below re-implements sleuth for vim-polyglot
+  let g:loaded_sleuth = 1
+
+  let s:default_shiftwidth = &shiftwidth
+
+  func! s:get_shiftwidth(indents) abort
+    let shiftwidth = 0
+    let max_count = 0
+    let final_counts = {}
+    for [indent, indent_count] in items(a:indents)
+      let indent_count = indent_count * 1.5
+      for [indent2, indent2_count] in items(a:indents)
+        if indent2 > indent && indent2 % indent == 0
+          let indent_count = indent_count + indent2_count
+        endif
+      endfor
+      let final_counts[indent] = indent_count
+    endfor
+    for [indent, final_count] in items(final_counts)
+      if final_count > max_count
+        let shiftwidth = indent
+        let max_count = final_count
+      endif
+    endfor
+    return shiftwidth
+  endfunc
+
+  func! s:guess(lines) abort
+    let options = {}
+    let ccomment = 0
+    let podcomment = 0
+    let triplequote = 0
+    let backtick = 0
+    let xmlcomment = 0
+    let heredoc = ''
+    let minindent = 10
+    let spaces_minus_tabs = 0
+    let lineno = 0
+    let stack = [0]
+    let indents = { '2': 0, '3': 0, '4': 0, '6': 0, '8': 0 }
+
+    for line in a:lines
+      let lineno += 1
+
+      if line =~# '^\s*$'
+        continue
+      endif
+
+      if line =~# '^\s*/\*'
+        let ccomment = 1
+      endif
+      if ccomment
+        if line =~# '\*/'
+          let ccomment = 0
+        endif
+        continue
+      endif
+
+      if line =~# '^=\w'
+        let podcomment = 1
+      endif
+      if podcomment
+        if line =~# '^=\%(end\|cut\)\>'
+          let podcomment = 0
+        endif
+        continue
+      endif
+
+      if triplequote
+        if line =~# '^[^"]*"""[^"]*$'
+          let triplequote = 0
+        endif
+        continue
+      elseif line =~# '^[^"]*"""[^"]*$'
+        let triplequote = 1
+      endif
+
+      if backtick
+        if line =~# '^[^`]*`[^`]*$'
+          let backtick = 0
+        endif
+        continue
+      elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
+        let backtick = 1
+      endif
+
+      if line =~# '^\s*<\!--'
+        let xmlcomment = 1
+      endif
+      if xmlcomment
+        if line =~# '-->'
+          let xmlcomment = 0
+        endif
+        continue
+      endif
+
+      " This is correct order because both "<<EOF" and "EOF" matches end
+      if heredoc != ''
+        if line =~# heredoc
+          let heredoc = ''
+        endif
+        continue
+      endif
+      let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
+      if len(herematch) > 0
+        let heredoc = herematch[1] . '$'
+      endif
+
+      if line[0] == "\t"
+        let spaces_minus_tabs -= 1
+      else
+        if line[0] == " "
+          let spaces_minus_tabs += 1
+        endif
+        let indent = len(matchstr(line, '^ *'))
+        while stack[-1] > indent
+          call remove(stack, -1)
+        endwhile
+
+        let indent_inc = indent - stack[-1]
+
+        if indent_inc == 0 && len(stack) > 1
+          let indent_inc = indent - stack[-2]
+        endif
+
+        if has_key(indents, indent_inc)
+          let indents[indent_inc] += 1
+          let prev_indent = indent
+        endif
+
+        if stack[-1] != indent
+          call add(stack, indent)
+        endif
+      endif
+    endfor
+
+    if spaces_minus_tabs < 0
+      setlocal noexpandtab
+      let &l:shiftwidth=&tabstop
+      return 1
+    endif
+
+    let shiftwidth = s:get_shiftwidth(indents)
+
+    if shiftwidth > 0
+      setlocal expandtab
+      let &l:shiftwidth=shiftwidth
+      try
+        " Sunchronize tabstop with shiftwidth
+        let &l:softtabstop = -1
+      catch /^Vim\%((\a\+)\)\=:E487/
+        " -1 was not supported before Vim 7.4
+        let &l:softtabstop = a:num_spaces
+      endtry
+      return 1
+    endif
+
+    return 0
+  endfunc
+
+  func! s:detect_indent() abort
+    if &buftype ==# 'help'
+      return
+    endif
+
+    " Do not autodetect indent if language or user sets it
+    if &l:shiftwidth != s:default_shiftwidth
+      return
+    endif
+
+    let b:sleuth_culprit = expand("<afile>:p")
+    if s:guess(getline(1, 128))
+      return
+    endif
+    if s:guess(getline(1, 1024))
+      return
+    endif
+    let pattern = polyglot#sleuth#GlobForFiletype(&filetype)
+    if len(pattern) == 0
+      return
+    endif
+    let pattern = '{' . pattern . ',.git,.svn,.hg}'
+    let dir = expand('%:p:h')
+    let level = 3
+    while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
+      " Ignore files from homedir and root 
+      if dir == expand('~') || dir == '/'
+        unlet b:sleuth_culprit
+        return
+      endif
+      for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
+        let b:sleuth_culprit = neighbor
+        " Do not consider directories above .git, .svn or .hg
+        if fnamemodify(neighbor, ":h:t")[0] == "."
+          let level = 0
+          continue
+        endif
+        if neighbor !=# expand('%:p') && filereadable(neighbor)
+          if s:guess(readfile(neighbor, '', 32))
+            return
+          endif
+        endif
+      endfor
+
+      let dir = fnamemodify(dir, ':h')
+      let level -= 1
+    endwhile
+
+    let b:sleuth_culprit = "default"
+  endfunc
+
+  set smarttab
+
+  func! SleuthIndicator() abort
+    let sw = &shiftwidth ? &shiftwidth : &tabstop
+    if &expandtab
+      return 'sw='.sw
+    elseif &tabstop == sw
+      return 'ts='.&tabstop
+    else
+      return 'sw='.sw.',ts='.&tabstop
+    endif
+  endfunc
+
+  augroup polyglot-sleuth
+    au!
+    au BufEnter * call s:detect_indent()
+    au User Flags call Hoist('buffer', 5, 'SleuthIndicator')
+  augroup END
+
+  command! -bar -bang Sleuth call s:detect_indent()
+endif
+
+augroup filetypedetect
+
+" Ignored extensions
+if exists("*fnameescape")
+au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.dpkg-dist,?\+.dpkg-old,?\+.dpkg-new,?\+.dpkg-bak,?\+.rpmsave,?\+.rpmnew,?\+.pacsave,?\+.pacnew
+	\ exe "doau filetypedetect BufRead " . fnameescape(expand("<afile>:r"))
+au BufNewFile,BufRead *~
+	\ let s:name = expand("<afile>") |
+	\ let s:short = substitute(s:name, '\~$', '', '') |
+	\ if s:name != s:short && s:short != "" |
+	\   exe "doau filetypedetect BufRead " . fnameescape(s:short) |
+	\ endif |
+	\ unlet! s:name s:short
+au BufNewFile,BufRead ?\+.in
+	\ if expand("<afile>:t") != "configure.in" |
+	\   exe "doau filetypedetect BufRead " . fnameescape(expand("<afile>:r")) |
+	\ endif
+elseif &verbose > 0
+  echomsg "Warning: some filetypes will not be recognized because this version of Vim does not have fnameescape()"
+endif
+
+" Pattern used to match file names which should not be inspected.
+" Currently finds compressed files.
+if !exists("g:ft_ignore_pat")
+  let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|zip\|tgz\)$'
+endif
+
+" *.cmd is close to a Batch file, but on OS/2 Rexx files also use *.cmd.
+au BufNewFile,BufRead *.cmd
+	\ if getline(1) =~ '^/\*' | setf rexx | else | setf dosbatch | endif
+
+" Batch file for 4DOS
+au BufNewFile,BufRead *.btm			call polyglot#ft#FTbtm()
+
+" BIND zone
+au BufNewFile,BufRead *.db			call polyglot#ft#BindzoneCheck('')
+
+" C or lpc
+au BufNewFile,BufRead *.c			call polyglot#ft#FTlpc()
+
+" Cynlib
+" .cc and .cpp files can be C++ or Cynlib.
+au BufNewFile,BufRead *.cpp if exists("cynlib_syntax_for_cpp")|setf cynlib|else|setf cpp|endif
+
+au BufNewFile,BufRead *.h			call polyglot#ft#FTheader()
+
+au BufNewFile,BufRead [cC]hange[lL]og
+	\  if getline(1) =~ '; urgency='
+	\|   setf debchangelog
+	\| else
+	\|   setf changelog
+	\| endif
+
+au BufNewFile,BufRead NEWS
+	\  if getline(1) =~ '; urgency='
+	\|   setf debchangelog
+	\| endif
+
+" Changes for WEB and CWEB or CHILL
+au BufNewFile,BufRead *.ch			call polyglot#ft#FTchange()
+
+" Clever or dtd
+au BufNewFile,BufRead *.ent			call polyglot#ft#FTent()
+
+" Clipper (or FoxPro; could also be eviews)
+au BufNewFile,BufRead *.prg
+	\ if exists("g:filetype_prg") |
+	\   exe "setf " . g:filetype_prg |
+	\ else |
+	\   setf clipper |
+	\ endif
+
+au BufNewFile,BufRead *.cpy
+	\ if getline(1) =~ '^##' |
+	\   setf python |
+	\ else |
+	\   setf cobol |
+	\ endif
+
+" Euphoria 3 or 4
+au BufNewFile,BufRead *.eu,*.ew,*.ex,*.exu,*.exw  call polyglot#ft#EuphoriaCheck()
+if has("fname_case")
+   au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW  call polyglot#ft#EuphoriaCheck()
+endif
+
+au BufNewFile,BufRead control
+	\  if getline(1) =~ '^Source:'
+	\|   setf debcontrol
+	\| endif
+
+au BufNewFile,BufRead copyright
+	\  if getline(1) =~ '^Format:'
+	\|   setf debcopyright
+	\| endif
+
+" the D language or dtrace
+au BufNewFile,BufRead *.d			call polyglot#ft#DtraceCheck()
+
+au BufNewFile,BufRead *.patch
+	\ if getline(1) =~ '^From [0-9a-f]\{40\} Mon Sep 17 00:00:00 2001$' |
+	\   setf gitsendemail |
+	\ else |
+	\   setf diff |
+	\ endif
+
+" Diva (with Skill) or InstallShield
+au BufNewFile,BufRead *.rul
+	\ if getline(1).getline(2).getline(3).getline(4).getline(5).getline(6) =~? 'InstallShield' |
+	\   setf ishd |
+	\ else |
+	\   setf diva |
+	\ endif
+
+" DCL (Digital Command Language - vms) or DNS zone file
+au BufNewFile,BufRead *.com			call polyglot#ft#BindzoneCheck('dcl')
+
+au BufNewFile,BufRead *.edn
+	\ if getline(1) =~ '^\s*(\s*edif\>' |
+	\   setf edif |
+	\ else |
+	\   setf clojure |
+	\ endif
+
+" Eiffel or Specman or Euphoria
+au BufNewFile,BufRead *.e,*.E			call polyglot#ft#FTe()
+
+if !empty($XDG_CONFIG_HOME)
+  au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config		setf gitconfig
+endif
+
+au BufNewFile,BufRead .msg.[0-9]*
+      \ if getline(1) =~ '^From.*# This line is ignored.$' |
+      \   setf gitsendemail |
+      \ endif
+au BufNewFile,BufRead *.git/*
+      \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
+      \   setf git |
+      \ endif
+
+if !empty($GNUPGHOME)
+  au BufNewFile,BufRead $GNUPGHOME/options	setf gpg
+  au BufNewFile,BufRead $GNUPGHOME/gpg.conf	setf gpg
+endif
+
+" HTML (.shtml and .stm for server side)
+au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm  call polyglot#ft#FThtml()
+
+" IDL (Interface Description Language)
+au BufNewFile,BufRead *.idl			call polyglot#ft#FTidl()
+
+au BufNewFile,BufRead indent.pro		call polyglot#ft#ProtoCheck('indent')
+
+" IDL (Interactive Data Language)
+au BufNewFile,BufRead *.pro			call polyglot#ft#ProtoCheck('idlang')
+
+" M4
+au BufNewFile,BufRead *.m4
+	\ if expand("<afile>") !~? 'html.m4$\|fvwm2rc' | setf m4 | endif
+
+" Mathematica, Matlab, Murphi or Objective C
+au BufNewFile,BufRead *.m			call polyglot#ft#FTm()
+
+" MMIX or VMS makefile
+au BufNewFile,BufRead *.mms			call polyglot#ft#FTmms()
+
+" Modsim III (or LambdaProlog)
+au BufNewFile,BufRead *.mod
+	\ if getline(1) =~ '\<module\>' |
+	\   setf lprolog |
+	\ else |
+	\   setf modsim3 |
+	\ endif
+
+" Mutt setup files (must be before catch *.rc)
+au BufNewFile,BufRead */etc/Muttrc.d/*		call s:StarSetf('muttrc')
+
+" Nroff/Troff (*.ms and *.t are checked below)
+au BufNewFile,BufRead *.me
+	\ if expand("<afile>") != "read.me" && expand("<afile>") != "click.me" |
+	\   setf nroff |
+	\ endif
+au BufNewFile,BufRead *.[1-9]			call polyglot#ft#FTnroff()
+
+" Nroff or Objective C++
+au BufNewFile,BufRead *.mm			call polyglot#ft#FTmm()
+
+" Pacman hooks
+au BufNewFile,BufRead *.hook
+	\ if getline(1) == '[Trigger]' |
+	\   setf dosini |
+	\ endif
+
+" Perl
+au BufNewFile,BufRead *.pl			call polyglot#ft#FTpl()
+
+" Perl, XPM or XPM2
+au BufNewFile,BufRead *.pm
+	\ if getline(1) =~ "XPM2" |
+	\   setf xpm2 |
+	\ elseif getline(1) =~ "XPM" |
+	\   setf xpm |
+	\ else |
+	\   setf perl |
+	\ endif
+
+" Povray, PHP or assembly
+au BufNewFile,BufRead *.inc			call polyglot#ft#FTinc()
+
+" Printcap and Termcap
+au BufNewFile,BufRead *printcap
+	\ let b:ptcap_type = "print" | setf ptcap
+au BufNewFile,BufRead *termcap
+	\ let b:ptcap_type = "term" | setf ptcap
+
+" Progress or CWEB
+au BufNewFile,BufRead *.w			call polyglot#ft#FTprogress_cweb()
+
+" Progress or assembly
+au BufNewFile,BufRead *.i			call polyglot#ft#FTprogress_asm()
+
+" Progress or Pascal
+au BufNewFile,BufRead *.p			call polyglot#ft#FTprogress_pascal()
+
+" Software Distributor Product Specification File (POSIX 1387.2-1995)
+au BufNewFile,BufRead INDEX,INFO
+	\ if getline(1) =~ '^\s*\(distribution\|installed_software\|root\|bundle\|product\)\s*$' |
+	\   setf psf |
+	\ endif
+
+" Registry for MS-Windows
+au BufNewFile,BufRead *.reg
+	\ if getline(1) =~? '^REGEDIT[0-9]*\s*$\|^Windows Registry Editor Version \d*\.\d*\s*$' | setf registry | endif
+
+" Rexx, Rebol or R
+au BufNewFile,BufRead *.r,*.R				call polyglot#ft#FTr()
+
+" Sendmail .mc files are actually m4.  Could also be MS Message text file.
+au BufNewFile,BufRead *.mc			call polyglot#ft#McSetf()
+
+" SGML
+au BufNewFile,BufRead *.sgm,*.sgml
+	\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'linuxdoc' |
+	\   setf sgmllnx |
+	\ elseif getline(1) =~ '<!DOCTYPE.*DocBook' || getline(2) =~ '<!DOCTYPE.*DocBook' |
+	\   let b:docbk_type = "sgml" |
+	\   let b:docbk_ver = 4 |
+	\   setf docbk |
+	\ else |
+	\   setf sgml |
+	\ endif
+
+" SGMLDECL
+au BufNewFile,BufRead *.decl,*.dcl,*.dec
+	\ if getline(1).getline(2).getline(3) =~? '^<!SGML' |
+	\    setf sgmldecl |
+	\ endif
+
+" Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc.
+" Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts
+" NOTE: Patterns ending in a star are further down, these have lower priority.
+au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD call polyglot#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .kshrc,*.ksh call polyglot#ft#SetFileTypeSH("ksh")
+au BufNewFile,BufRead */etc/profile,.profile,*.sh,*.env call polyglot#ft#SetFileTypeSH(getline(1))
+
+
+" Shell script (Arch Linux) or PHP file (Drupal)
+au BufNewFile,BufRead *.install
+	\ if getline(1) =~ '<?php' |
+	\   setf php |
+	\ else |
+	\   call polyglot#ft#SetFileTypeSH("bash") |
+	\ endif
+
+" tcsh scripts (patterns ending in a star further below)
+au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login	call polyglot#ft#SetFileTypeShell("tcsh")
+
+" csh scripts, but might also be tcsh scripts (on some systems csh is tcsh)
+" (patterns ending in a start further below)
+au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias  call polyglot#ft#CSH()
+
+au BufNewFile,BufRead *.cls
+	\ if getline(1) =~ '^%' |
+	\  setf tex |
+	\ elseif getline(1)[0] == '#' && getline(1) =~ 'rexx' |
+	\  setf rexx |
+	\ else |
+	\  setf st |
+	\ endif
+
+" SMIL or XML
+au BufNewFile,BufRead *.smil
+	\ if getline(1) =~ '<?\s*xml.*?>' |
+	\   setf xml |
+	\ else |
+	\   setf smil |
+	\ endif
+
+" SMIL or SNMP MIB file
+au BufNewFile,BufRead *.smi
+	\ if getline(1) =~ '\<smil\>' |
+	\   setf smil |
+	\ else |
+	\   setf mib |
+	\ endif
+
+au BufNewFile,BufRead *.rules			call polyglot#ft#FTRules()
+
+" SQL
+au BufNewFile,BufRead *.sql			call polyglot#ft#SQL()
+
+" Also *.class, but not when it's a Java bytecode file
+au BufNewFile,BufRead *.class
+	\ if getline(1) !~ "^\xca\xfe\xba\xbe" | setf stata | endif
+
+au BufNewFile,BufRead *.tex			call polyglot#ft#FTtex()
+
+" Virata Config Script File or Drupal module
+au BufRead,BufNewFile *.hw,*.module,*.pkg
+	\ if getline(1) =~ '<?php' |
+	\   setf php |
+	\ else |
+	\   setf virata |
+	\ endif
+
+" Visual Basic (also uses *.bas) or FORM
+au BufNewFile,BufRead *.frm			call polyglot#ft#FTVB("form")
+
+" WEB (*.web is also used for Winbatch: Guess, based on expecting "%" comment
+" lines in a WEB file).
+au BufNewFile,BufRead *.web
+	\ if getline(1)[0].getline(2)[0].getline(3)[0].getline(4)[0].getline(5)[0] =~ "%" |
+	\   setf web |
+	\ else |
+	\   setf winbatch |
+	\ endif
+
+" X Pixmap (dynamically sets colors, use BufEnter to make it work better)
+au BufEnter *.xpm
+	\ if getline(1) =~ "XPM2" |
+	\   setf xpm2 |
+	\ else |
+	\   setf xpm |
+	\ endif
+
+" XFree86 config
+au BufNewFile,BufRead XF86Config
+	\ if getline(1) =~ '\<XConfigurator\>' |
+	\   let b:xf86conf_xfree86_version = 3 |
+	\ endif |
+	\ setf xf86conf
+au BufNewFile,BufRead */xorg.conf.d/*.conf
+	\ let b:xf86conf_xfree86_version = 4 |
+	\ setf xf86conf
+
+" Xorg config
+au BufNewFile,BufRead xorg.conf,xorg.conf-4	let b:xf86conf_xfree86_version = 4 | setf xf86conf
+
+au BufNewFile,BufRead *.ms
+	\ if !polyglot#ft#FTnroff() | setf xmath | endif
+
+" XML  specific variants: docbk and xbl
+au BufNewFile,BufRead *.xml			call polyglot#ft#FTxml()
+
+" Yacc or racc
+au BufNewFile,BufRead *.y			call polyglot#ft#FTy()
+
+" Zope
+"   dtml (zope dynamic template markup language), pt (zope page template),
+"   cpt (zope form controller page template)
+au BufNewFile,BufRead *.dtml,*.pt,*.cpt		call polyglot#ft#FThtml()
+"   zsql (zope sql method)
+au BufNewFile,BufRead *.zsql			call polyglot#ft#SQL()
+
+augroup END
+
+
+" Source the user-specified filetype file, for backwards compatibility with
+" Vim 5.x.
+if exists("myfiletypefile") && filereadable(expand(myfiletypefile))
+  execute "source " . myfiletypefile
+endif
+
+
+" Check for "*" after loading myfiletypefile, so that scripts.vim is only used
+" when there are no matching file name extensions.
+" Don't do this for compressed files.
+augroup filetypedetect
+au BufNewFile,BufRead *
+	\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
+	\ | runtime! scripts.vim | endif
+au StdinReadPost * if !did_filetype() | runtime! scripts.vim | endif
+
+
+" Extra checks for when no filetype has been detected now.  Mostly used for
+" patterns that end in "*".  E.g., "zsh*" matches "zsh.vim", but that's a Vim
+" script file.
+" Most of these should call s:StarSetf() to avoid names ending in .gz and the
+" like are used.
+
+" More Apache style config files
+au BufNewFile,BufRead */etc/proftpd/*.conf*,*/etc/proftpd/conf.*/*	call s:StarSetf('apachestyle')
+au BufNewFile,BufRead proftpd.conf*					call s:StarSetf('apachestyle')
+
+" More Apache config files
+au BufNewFile,BufRead access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*	call s:StarSetf('apache')
+au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.d/*.conf*		call s:StarSetf('apache')
+
+" Asterisk config file
+au BufNewFile,BufRead *asterisk/*.conf*		call s:StarSetf('asterisk')
+au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
+
+" BIND zone
+au BufNewFile,BufRead */named/db.*,*/bind/db.*	call s:StarSetf('bindzone')
+
+" Calendar
+au BufNewFile,BufRead */.calendar/*,
+	\*/share/calendar/*/calendar.*,*/share/calendar/calendar.*
+	\					call s:StarSetf('calendar')
+
+" Changelog
+au BufNewFile,BufRead [cC]hange[lL]og*
+	\ if getline(1) =~ '; urgency='
+	\|  call s:StarSetf('debchangelog')
+	\|else
+	\|  call s:StarSetf('changelog')
+	\|endif
+
+" Crontab
+au BufNewFile,BufRead crontab,crontab.*,*/etc/cron.d/*		call s:StarSetf('crontab')
+
+" dnsmasq(8) configuration
+au BufNewFile,BufRead */etc/dnsmasq.d/*		call s:StarSetf('dnsmasq')
+
+" Dracula
+au BufNewFile,BufRead drac.*			call s:StarSetf('dracula')
+
+" Fvwm
+au BufNewFile,BufRead */.fvwm/*			call s:StarSetf('fvwm')
+au BufNewFile,BufRead *fvwmrc*,*fvwm95*.hook
+	\ let b:fvwm_version = 1 | call s:StarSetf('fvwm')
+au BufNewFile,BufRead *fvwm2rc*
+	\ if expand("<afile>:e") == "m4"
+	\|  call s:StarSetf('fvwm2m4')
+	\|else
+	\|  let b:fvwm_version = 2 | call s:StarSetf('fvwm')
+	\|endif
+
+" Gedcom
+au BufNewFile,BufRead */tmp/lltmp*		call s:StarSetf('gedcom')
+
+" Git
+au BufNewFile,BufRead */.gitconfig.d/*,/etc/gitconfig.d/*	call s:StarSetf('gitconfig')
+
+" Gitolite
+au BufNewFile,BufRead */gitolite-admin/conf/*	call s:StarSetf('gitolite')
+
+" GTK RC
+au BufNewFile,BufRead .gtkrc*,gtkrc*		call s:StarSetf('gtkrc')
+
+" Jam
+au BufNewFile,BufRead Prl*.*,JAM*.*		call s:StarSetf('jam')
+
+" Jargon
+au! BufNewFile,BufRead *jarg*
+	\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'THIS IS THE JARGON FILE'
+	\|  call s:StarSetf('jargon')
+	\|endif
+
+" Java Properties resource file (note: doesn't catch font.properties.pl)
+au BufNewFile,BufRead *.properties_??_??_*	call s:StarSetf('jproperties')
+
+" Kconfig
+au BufNewFile,BufRead Kconfig.*			call s:StarSetf('kconfig')
+
+" Lilo: Linux loader
+au BufNewFile,BufRead lilo.conf*		call s:StarSetf('lilo')
+
+" Logcheck
+au BufNewFile,BufRead */etc/logcheck/*.d*/*	call s:StarSetf('logcheck')
+
+" Makefile
+au BufNewFile,BufRead [mM]akefile*		call s:StarSetf('make')
+
+" Ruby Makefile
+au BufNewFile,BufRead [rR]akefile*		call s:StarSetf('ruby')
+
+" Mail (also matches muttrc.vim, so this is below the other checks)
+au BufNewFile,BufRead {neo,}mutt[[:alnum:]._-]\\\{6\}	setf mail
+
+au BufNewFile,BufRead reportbug-*		call s:StarSetf('mail')
+
+" Modconf
+au BufNewFile,BufRead */etc/modutils/*
+	\ if executable(expand("<afile>")) != 1
+	\|  call s:StarSetf('modconf')
+	\|endif
+au BufNewFile,BufRead */etc/modprobe.*		call s:StarSetf('modconf')
+
+" Mutt setup file
+au BufNewFile,BufRead .mutt{ng,}rc*,*/.mutt{ng,}/mutt{ng,}rc*	call s:StarSetf('muttrc')
+au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc*		call s:StarSetf('muttrc')
+
+" Neomutt setup file
+au BufNewFile,BufRead .neomuttrc*,*/.neomutt/neomuttrc*	call s:StarSetf('neomuttrc')
+au BufNewFile,BufRead neomuttrc*,Neomuttrc*		call s:StarSetf('neomuttrc')
+
+" Nroff macros
+au BufNewFile,BufRead tmac.*			call s:StarSetf('nroff')
+
+" OpenBSD hostname.if
+au BufNewFile,BufRead /etc/hostname.*		call s:StarSetf('config')
+
+" Pam conf
+au BufNewFile,BufRead */etc/pam.d/*		call s:StarSetf('pamconf')
+
+" Printcap and Termcap
+au BufNewFile,BufRead *printcap*
+	\ if !did_filetype()
+	\|  let b:ptcap_type = "print" | call s:StarSetf('ptcap')
+	\|endif
+au BufNewFile,BufRead *termcap*
+	\ if !did_filetype()
+	\|  let b:ptcap_type = "term" | call s:StarSetf('ptcap')
+	\|endif
+
+" ReDIF
+" Only used when the .rdf file was not detected to be XML.
+au BufRead,BufNewFile *.rdf			call polyglot#ft#Redif()
+
+" Remind
+au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
+
+" SGML catalog file
+au BufNewFile,BufRead sgml.catalog*		call s:StarSetf('catalog')
+
+" Shell scripts ending in a star
+au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,,PKGBUILD* call polyglot#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .kshrc* call polyglot#ft#SetFileTypeSH("ksh")
+au BufNewFile,BufRead .profile* call polyglot#ft#SetFileTypeSH(getline(1))
+
+" tcsh scripts ending in a star
+au BufNewFile,BufRead .tcshrc*	call polyglot#ft#SetFileTypeShell("tcsh")
+
+" csh scripts ending in a star
+au BufNewFile,BufRead .login*,.cshrc*  call polyglot#ft#CSH()
+
+" VHDL
+au BufNewFile,BufRead *.vhdl_[0-9]*		call s:StarSetf('vhdl')
+
+" Vim script
+au BufNewFile,BufRead *vimrc*			call s:StarSetf('vim')
+
+" Subversion commit file
+au BufNewFile,BufRead svn-commit*.tmp		setf svn
+
+" X resources file
+au BufNewFile,BufRead Xresources*,*/app-defaults/*,*/Xresources/* call s:StarSetf('xdefaults')
+
+" XFree86 config
+au BufNewFile,BufRead XF86Config-4*
+	\ let b:xf86conf_xfree86_version = 4 | call s:StarSetf('xf86conf')
+au BufNewFile,BufRead XF86Config*
+	\ if getline(1) =~ '\<XConfigurator\>'
+	\|  let b:xf86conf_xfree86_version = 3
+	\|endif
+	\|call s:StarSetf('xf86conf')
+
+" X11 xmodmap
+au BufNewFile,BufRead *xmodmap*			call s:StarSetf('xmodmap')
+
+" Xinetd conf
+au BufNewFile,BufRead */etc/xinetd.d/*		call s:StarSetf('xinetd')
+
+" yum conf (close enough to dosini)
+au BufNewFile,BufRead */etc/yum.repos.d/*	call s:StarSetf('dosini')
+
+" Z-Shell script ending in a star
+au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump*  call s:StarSetf('zsh')
+au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
+
+
+" Help files match *.txt but should have a last line that is a modeline.
+au BufNewFile,BufRead *.txt
+	\  if getline('$') !~ 'vim:.*ft=help'
+	\|   setf text
+	\| endif
+
+
+" NOTE: The above command could have ended the filetypedetect autocmd group
+" and started another one. Let's make sure it has ended to get to a consistent
+" state.
+augroup END
+
+" Use the filetype detect plugins.  They may overrule any of the previously
+" detected filetypes. No need to load if everything is enabled
+if exists("did_load_filetypes") && exists("g:polyglot_disabled")
+  unlet did_load_filetypes
+  runtime! extras/filetype.vim
+endif
+
+let s:runtime = resolve($VIMRUNTIME)
+let s:base = resolve(expand('<sfile>:p:h:h:h'))
+
+func! s:process_rtp(rtp)
+  " Remove vim-polyglot from paths and make everything absolute
+  let rtp = []
+  for path in a:rtp[1:-2]
+    let abspath = resolve(path)
+    if stridx(abspath, s:base) != 0
+      call add(rtp, abspath)
+    endif
+  endfor
+  let result = [a:rtp[0]]
+  " Then all other stuff (until vimruntime)
+  let i = 0
+  for path in rtp[0:len(rtp)-1]
+    if path == s:runtime
+      break
+    endif
+    call add(result, path)
+    let i = i + 1
+  endfor
+  " Then vim-polyglot
+  call add(result, s:base)
+  " Then all other files, until after-files
+  for path in rtp[i:len(rtp)-1]
+    if match(path, '[/\\]after$') > -1
+      break
+    endif
+    call add(result, path)
+    let i = i + 1
+  endfor
+  " Then vim-polyglot after path
+  call add(result, s:base . '/after')
+  " Then all other after paths
+  for path in rtp[i:len(rtp)-1]
+    call add(result, path)
+  endfor
+  " User's after directory is always last
+  call add(result, a:rtp[len(a:rtp)-1])
+  return result
+endfunc
+
+" We want vim-polyglot files to load only as fallback
+let &rtp = join(s:process_rtp(split(&rtp, ',')), ',')
+
+" Restore 'cpoptions'
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/autoload/pony.vim b/autoload/pony.vim
index 4a47a0379..eac219380 100644
--- a/autoload/pony.vim
+++ b/autoload/pony.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pony')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pony', 'autoload/pony.vim')
   finish
 endif
 
diff --git a/autoload/puppet/align.vim b/autoload/puppet/align.vim
index 907f191a4..56270f097 100644
--- a/autoload/puppet/align.vim
+++ b/autoload/puppet/align.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'puppet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'autoload/puppet/align.vim')
   finish
 endif
 
diff --git a/autoload/puppet/ctags.vim b/autoload/puppet/ctags.vim
index 0d73ec1d6..e5c7321e2 100644
--- a/autoload/puppet/ctags.vim
+++ b/autoload/puppet/ctags.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'puppet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'autoload/puppet/ctags.vim')
   finish
 endif
 
diff --git a/autoload/puppet/format.vim b/autoload/puppet/format.vim
index 8c766e7f8..b5ad655dc 100644
--- a/autoload/puppet/format.vim
+++ b/autoload/puppet/format.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'puppet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'autoload/puppet/format.vim')
   finish
 endif
 
diff --git a/autoload/python/utils.vim b/autoload/python/utils.vim
index 76ad78b22..c72f8fdaf 100644
--- a/autoload/python/utils.vim
+++ b/autoload/python/utils.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'python-compiler')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'python-compiler', 'autoload/python/utils.vim')
   finish
 endif
 
diff --git a/autoload/requirements.vim b/autoload/requirements.vim
index 6dace12b1..717b6210e 100644
--- a/autoload/requirements.vim
+++ b/autoload/requirements.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'requirements')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'requirements', 'autoload/requirements.vim')
   finish
 endif
 
diff --git a/autoload/rubycomplete.vim b/autoload/rubycomplete.vim
index f1f9810c2..9c3f9ffd4 100644
--- a/autoload/rubycomplete.vim
+++ b/autoload/rubycomplete.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'autoload/rubycomplete.vim')
   finish
 endif
 
diff --git a/autoload/rust.vim b/autoload/rust.vim
index 5b0cd64fe..e883ad789 100644
--- a/autoload/rust.vim
+++ b/autoload/rust.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'autoload/rust.vim')
   finish
 endif
 
diff --git a/autoload/rust/debugging.vim b/autoload/rust/debugging.vim
index 7985c87ca..9cae48342 100644
--- a/autoload/rust/debugging.vim
+++ b/autoload/rust/debugging.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'autoload/rust/debugging.vim')
   finish
 endif
 
diff --git a/autoload/rust/delimitmate.vim b/autoload/rust/delimitmate.vim
index ecd7c28cb..40f3c1d10 100644
--- a/autoload/rust/delimitmate.vim
+++ b/autoload/rust/delimitmate.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'autoload/rust/delimitmate.vim')
   finish
 endif
 
diff --git a/autoload/rust/tags.vim b/autoload/rust/tags.vim
index f4830e283..45d999082 100644
--- a/autoload/rust/tags.vim
+++ b/autoload/rust/tags.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'autoload/rust/tags.vim')
   finish
 endif
 
diff --git a/autoload/rustfmt.vim b/autoload/rustfmt.vim
index 5dc682a57..23e7206ad 100644
--- a/autoload/rustfmt.vim
+++ b/autoload/rustfmt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'autoload/rustfmt.vim')
   finish
 endif
 
diff --git a/autoload/smt2.vim b/autoload/smt2.vim
index b9e104a01..1aee26357 100644
--- a/autoload/smt2.vim
+++ b/autoload/smt2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'smt2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'smt2', 'autoload/smt2.vim')
   finish
 endif
 
diff --git a/autoload/stylcomplete.vim b/autoload/stylcomplete.vim
index 7437d32b8..654d405aa 100644
--- a/autoload/stylcomplete.vim
+++ b/autoload/stylcomplete.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'stylus')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'stylus', 'autoload/stylcomplete.vim')
   finish
 endif
 
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index 594d74a0e..a1d2a06a1 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'terraform')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'terraform', 'autoload/terraform.vim')
   finish
 endif
 
diff --git a/autoload/vital/_crystal.vim b/autoload/vital/_crystal.vim
index 95bdc8404..8cb1d7035 100644
--- a/autoload/vital/_crystal.vim
+++ b/autoload/vital/_crystal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'autoload/vital/_crystal.vim')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/ColorEcho.vim b/autoload/vital/_crystal/ColorEcho.vim
index d0480c19b..a9b566dd2 100644
--- a/autoload/vital/_crystal/ColorEcho.vim
+++ b/autoload/vital/_crystal/ColorEcho.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'autoload/vital/_crystal/ColorEcho.vim')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/Data/List.vim b/autoload/vital/_crystal/Data/List.vim
index 436e41f0b..b61878a01 100644
--- a/autoload/vital/_crystal/Data/List.vim
+++ b/autoload/vital/_crystal/Data/List.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'autoload/vital/_crystal/Data/List.vim')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/Data/String.vim b/autoload/vital/_crystal/Data/String.vim
index ea3769f99..430718ab5 100644
--- a/autoload/vital/_crystal/Data/String.vim
+++ b/autoload/vital/_crystal/Data/String.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'autoload/vital/_crystal/Data/String.vim')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/Process.vim b/autoload/vital/_crystal/Process.vim
index 8118a9f63..1a1ba3cd6 100644
--- a/autoload/vital/_crystal/Process.vim
+++ b/autoload/vital/_crystal/Process.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'autoload/vital/_crystal/Process.vim')
   finish
 endif
 
diff --git a/autoload/vital/_crystal/Web/JSON.vim b/autoload/vital/_crystal/Web/JSON.vim
index c72446aa0..4e2df8f7d 100644
--- a/autoload/vital/_crystal/Web/JSON.vim
+++ b/autoload/vital/_crystal/Web/JSON.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'autoload/vital/_crystal/Web/JSON.vim')
   finish
 endif
 
diff --git a/autoload/vital/crystal.vim b/autoload/vital/crystal.vim
index 24b12ee97..50f7ce750 100644
--- a/autoload/vital/crystal.vim
+++ b/autoload/vital/crystal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'autoload/vital/crystal.vim')
   finish
 endif
 
diff --git a/autoload/xml/aria.vim b/autoload/xml/aria.vim
index edba38fb2..d2f8abe84 100644
--- a/autoload/xml/aria.vim
+++ b/autoload/xml/aria.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'autoload/xml/aria.vim')
   finish
 endif
 
diff --git a/autoload/xml/html5.vim b/autoload/xml/html5.vim
index 2618e2259..0df1bd0ac 100644
--- a/autoload/xml/html5.vim
+++ b/autoload/xml/html5.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'autoload/xml/html5.vim')
   finish
 endif
 
diff --git a/autoload/xml/xsd.vim b/autoload/xml/xsd.vim
index a28990945..fdabdc5ab 100644
--- a/autoload/xml/xsd.vim
+++ b/autoload/xml/xsd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xsd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xsd', 'autoload/xml/xsd.vim')
   finish
 endif
 
diff --git a/autoload/yats.vim b/autoload/yats.vim
index f96841aab..e810937eb 100644
--- a/autoload/yats.vim
+++ b/autoload/yats.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'autoload/yats.vim')
   finish
 endif
 
diff --git a/autoload/zig/config.vim b/autoload/zig/config.vim
index fd7f42235..a96595aa2 100644
--- a/autoload/zig/config.vim
+++ b/autoload/zig/config.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'autoload/zig/config.vim')
   finish
 endif
 
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index 824122af9..2562be39a 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'autoload/zig/fmt.vim')
   finish
 endif
 
diff --git a/autoload/zig/list.vim b/autoload/zig/list.vim
index a5b41f136..832ba1074 100644
--- a/autoload/zig/list.vim
+++ b/autoload/zig/list.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'autoload/zig/list.vim')
   finish
 endif
 
diff --git a/autoload/zig/util.vim b/autoload/zig/util.vim
index b59b43ed4..c886fb621 100644
--- a/autoload/zig/util.vim
+++ b/autoload/zig/util.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'autoload/zig/util.vim')
   finish
 endif
 
diff --git a/compiler/ant.vim b/compiler/ant.vim
index 8d038e0b3..c46491f80 100644
--- a/compiler/ant.vim
+++ b/compiler/ant.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ant')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ant', 'compiler/ant.vim')
   finish
 endif
 
diff --git a/compiler/bdf.vim b/compiler/bdf.vim
index 915c2d708..997d685ba 100644
--- a/compiler/bdf.vim
+++ b/compiler/bdf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bdf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bdf', 'compiler/bdf.vim')
   finish
 endif
 
diff --git a/compiler/cake.vim b/compiler/cake.vim
index 0f0d9c1e4..a761282c4 100644
--- a/compiler/cake.vim
+++ b/compiler/cake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'coffee-script')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'coffee-script', 'compiler/cake.vim')
   finish
 endif
 
diff --git a/compiler/cargo.vim b/compiler/cargo.vim
index 8b6ee453a..d56612f2c 100644
--- a/compiler/cargo.vim
+++ b/compiler/cargo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'compiler/cargo.vim')
   finish
 endif
 
diff --git a/compiler/coffee.vim b/compiler/coffee.vim
index d73b850b4..28aff34e6 100644
--- a/compiler/coffee.vim
+++ b/compiler/coffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'coffee-script')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'coffee-script', 'compiler/coffee.vim')
   finish
 endif
 
diff --git a/compiler/credo.vim b/compiler/credo.vim
index 1cfe5cda5..ca7bfc228 100644
--- a/compiler/credo.vim
+++ b/compiler/credo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'compiler/credo.vim')
   finish
 endif
 
diff --git a/compiler/cryptol.vim b/compiler/cryptol.vim
index cb6b72f9b..2855c0da2 100644
--- a/compiler/cryptol.vim
+++ b/compiler/cryptol.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cryptol')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cryptol', 'compiler/cryptol.vim')
   finish
 endif
 
diff --git a/compiler/cs.vim b/compiler/cs.vim
index 0bbc12b42..5b34a4376 100644
--- a/compiler/cs.vim
+++ b/compiler/cs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cs')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cs', 'compiler/cs.vim')
   finish
 endif
 
diff --git a/compiler/cucumber.vim b/compiler/cucumber.vim
index 831f0a4a1..e43f553af 100644
--- a/compiler/cucumber.vim
+++ b/compiler/cucumber.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cucumber')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cucumber', 'compiler/cucumber.vim')
   finish
 endif
 
diff --git a/compiler/dot.vim b/compiler/dot.vim
index 63e1d5528..3773f89af 100644
--- a/compiler/dot.vim
+++ b/compiler/dot.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dot')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dot', 'compiler/dot.vim')
   finish
 endif
 
diff --git a/compiler/eruby.vim b/compiler/eruby.vim
index c576858cf..bd5a16d01 100644
--- a/compiler/eruby.vim
+++ b/compiler/eruby.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'compiler/eruby.vim')
   finish
 endif
 
diff --git a/compiler/exunit.vim b/compiler/exunit.vim
index 6921850ae..6381308f7 100644
--- a/compiler/exunit.vim
+++ b/compiler/exunit.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'compiler/exunit.vim')
   finish
 endif
 
diff --git a/compiler/fish.vim b/compiler/fish.vim
index e46699b69..7684db47f 100644
--- a/compiler/fish.vim
+++ b/compiler/fish.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fish')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fish', 'compiler/fish.vim')
   finish
 endif
 
diff --git a/compiler/gleam.vim b/compiler/gleam.vim
index 808a869ab..6a63fa196 100644
--- a/compiler/gleam.vim
+++ b/compiler/gleam.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gleam')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gleam', 'compiler/gleam.vim')
   finish
 endif
 
diff --git a/compiler/go.vim b/compiler/go.vim
index 01c7fe0ad..3333caeef 100644
--- a/compiler/go.vim
+++ b/compiler/go.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'compiler/go.vim')
   finish
 endif
 
diff --git a/compiler/gradle.vim b/compiler/gradle.vim
index 3b40fb188..6a52af1b9 100644
--- a/compiler/gradle.vim
+++ b/compiler/gradle.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gradle')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gradle', 'compiler/gradle.vim')
   finish
 endif
 
diff --git a/compiler/gradlew.vim b/compiler/gradlew.vim
index 12a24d999..22048a924 100644
--- a/compiler/gradlew.vim
+++ b/compiler/gradlew.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gradle')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gradle', 'compiler/gradlew.vim')
   finish
 endif
 
diff --git a/compiler/haml.vim b/compiler/haml.vim
index 03ae77764..83fd29708 100644
--- a/compiler/haml.vim
+++ b/compiler/haml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haml', 'compiler/haml.vim')
   finish
 endif
 
diff --git a/compiler/ledger.vim b/compiler/ledger.vim
index 18731a004..92348ba3a 100644
--- a/compiler/ledger.vim
+++ b/compiler/ledger.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ledger')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ledger', 'compiler/ledger.vim')
   finish
 endif
 
diff --git a/compiler/lilypond.vim b/compiler/lilypond.vim
index d70b60ff7..60a1c52b9 100644
--- a/compiler/lilypond.vim
+++ b/compiler/lilypond.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lilypond')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'compiler/lilypond.vim')
   finish
 endif
 
diff --git a/compiler/ls.vim b/compiler/ls.vim
index b3cdb32f3..f23539aab 100644
--- a/compiler/ls.vim
+++ b/compiler/ls.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'livescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'livescript', 'compiler/ls.vim')
   finish
 endif
 
diff --git a/compiler/mix.vim b/compiler/mix.vim
index 0563f8ee0..cb7902eee 100644
--- a/compiler/mix.vim
+++ b/compiler/mix.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'compiler/mix.vim')
   finish
 endif
 
diff --git a/compiler/nim.vim b/compiler/nim.vim
index edfa730e0..f88e7d882 100644
--- a/compiler/nim.vim
+++ b/compiler/nim.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nim', 'compiler/nim.vim')
   finish
 endif
 
diff --git a/compiler/nix-build.vim b/compiler/nix-build.vim
index 5049e4e4b..7c39a4a07 100644
--- a/compiler/nix-build.vim
+++ b/compiler/nix-build.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nix')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nix', 'compiler/nix-build.vim')
   finish
 endif
 
diff --git a/compiler/ocaml.vim b/compiler/ocaml.vim
index d86500170..3ad947410 100644
--- a/compiler/ocaml.vim
+++ b/compiler/ocaml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'compiler/ocaml.vim')
   finish
 endif
 
diff --git a/compiler/powershell.vim b/compiler/powershell.vim
index edfa1ec92..0ba5776c4 100644
--- a/compiler/powershell.vim
+++ b/compiler/powershell.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'powershell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'powershell', 'compiler/powershell.vim')
   finish
 endif
 
diff --git a/compiler/python.vim b/compiler/python.vim
index e7caa4651..b71b6a880 100644
--- a/compiler/python.vim
+++ b/compiler/python.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'python-compiler')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'python-compiler', 'compiler/python.vim')
   finish
 endif
 
diff --git a/compiler/rake.vim b/compiler/rake.vim
index 9557fc9a2..84e312e89 100644
--- a/compiler/rake.vim
+++ b/compiler/rake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'compiler/rake.vim')
   finish
 endif
 
diff --git a/compiler/rspec.vim b/compiler/rspec.vim
index 2b16684af..19f41ade7 100644
--- a/compiler/rspec.vim
+++ b/compiler/rspec.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'compiler/rspec.vim')
   finish
 endif
 
diff --git a/compiler/ruby.vim b/compiler/ruby.vim
index 96a54615c..c0299d7e1 100644
--- a/compiler/ruby.vim
+++ b/compiler/ruby.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'compiler/ruby.vim')
   finish
 endif
 
diff --git a/compiler/rubyunit.vim b/compiler/rubyunit.vim
index eb443f034..f10496123 100644
--- a/compiler/rubyunit.vim
+++ b/compiler/rubyunit.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'compiler/rubyunit.vim')
   finish
 endif
 
diff --git a/compiler/rustc.vim b/compiler/rustc.vim
index 0a0935416..8c950bf0c 100644
--- a/compiler/rustc.vim
+++ b/compiler/rustc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'compiler/rustc.vim')
   finish
 endif
 
diff --git a/compiler/sass.vim b/compiler/sass.vim
index 7d1e9876a..b4bbcc3b8 100644
--- a/compiler/sass.vim
+++ b/compiler/sass.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sass')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sass', 'compiler/sass.vim')
   finish
 endif
 
diff --git a/compiler/sbt.vim b/compiler/sbt.vim
index 32cf3f269..a7ab9da7d 100644
--- a/compiler/sbt.vim
+++ b/compiler/sbt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scala')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scala', 'compiler/sbt.vim')
   finish
 endif
 
diff --git a/compiler/swift.vim b/compiler/swift.vim
index cd19a7e85..f832c9de9 100644
--- a/compiler/swift.vim
+++ b/compiler/swift.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'swift')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'swift', 'compiler/swift.vim')
   finish
 endif
 
diff --git a/compiler/tcl.vim b/compiler/tcl.vim
index d562da464..c48d197a7 100644
--- a/compiler/tcl.vim
+++ b/compiler/tcl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tcl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tcl', 'compiler/tcl.vim')
   finish
 endif
 
diff --git a/compiler/tidy.vim b/compiler/tidy.vim
index 5ebe6e372..fec701da0 100644
--- a/compiler/tidy.vim
+++ b/compiler/tidy.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tidy')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tidy', 'compiler/tidy.vim')
   finish
 endif
 
diff --git a/compiler/typescript.vim b/compiler/typescript.vim
index e5ec6dfb6..43380d270 100644
--- a/compiler/typescript.vim
+++ b/compiler/typescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'compiler/typescript.vim')
   finish
 endif
 
diff --git a/extras/flow.vim b/extras/flow.vim
index 0de97c054..d4a1f36d2 100644
--- a/extras/flow.vim
+++ b/extras/flow.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'javascript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'javascript', 'extras/flow.vim')
   finish
 endif
 
diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index f49a5e546..369027c40 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'javascript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'javascript', 'extras/jsdoc.vim')
   finish
 endif
 
diff --git a/extras/ngdoc.vim b/extras/ngdoc.vim
index e5735b2ad..76baafc37 100644
--- a/extras/ngdoc.vim
+++ b/extras/ngdoc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'javascript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'javascript', 'extras/ngdoc.vim')
   finish
 endif
 
diff --git a/filetype.vim b/filetype.vim
index 988d79ee2..cd75d58a6 100644
--- a/filetype.vim
+++ b/filetype.vim
@@ -1 +1 @@
-runtime! ftdetect/polyglot.vim
+call polyglot#init#init()
diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index 9e4edbed3..cd75d58a6 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -1,3608 +1 @@
-" Vim support file to detect file types
-"
-" Maintainer:	Adam Stankiewicz <sheerun@sher.pl>
-" URL: https://github.com/sheerun/vim-polyglot
-
-" Listen very carefully, I will say this only once
-if exists("did_load_polyglot")
-  finish
-endif
-
-let did_load_polyglot = 1
-
-" Switch to compatible mode for the time being
-let s:cpo_save = &cpo
-set cpo&vim
-
-let g:polyglot_is_disabled = {}
-let s:new_polyglot_disabled = []
-
-if exists('g:polyglot_disabled')
-  for pkg in g:polyglot_disabled
-    let base = split(pkg, '\.')
-    if len(base) > 0
-      let g:polyglot_is_disabled[pkg] = 1
-      call add(s:new_polyglot_disabled, base[0])
-    endif
-  endfor
-else
-  let g:polyglot_disabled_not_set = 1
-endif
-
-func! PolyglotVerify()
-  if exists("g:polyglot_disabled_not_set")
-    if exists("g:polyglot_disabled")
-      echohl WarningMsg
-      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
-      echohl None
-    endif
-
-    unlet g:polyglot_disabled_not_set
-  endif
-endfun
-
-au VimEnter * call PolyglotVerify()
-
-" Be consistent across different systems
-set nofileignorecase
-
-function! s:SetDefault(name, value)
-  if !exists(a:name)
-    let {a:name} = a:value
-  endif
-endfunction
-
-call s:SetDefault('g:markdown_enable_spell_checking', 0)
-call s:SetDefault('g:markdown_enable_input_abbreviations', 0)
-call s:SetDefault('g:markdown_enable_mappings', 0)
-
-" Enable jsx syntax by default
-call s:SetDefault('g:jsx_ext_required', 0)
-
-" Needed for sql highlighting
-call s:SetDefault('g:javascript_sql_dialect', 'sql')
-
-" Make csv loading faster
-call s:SetDefault('g:csv_start', 1)
-call s:SetDefault('g:csv_end', 2)
-call s:SetDefault('g:csv_default_delim', ',')
-
-" Disable json concealing by default
-call s:SetDefault('g:vim_json_syntax_conceal', 0)
-
-call s:SetDefault('g:filetype_euphoria', 'elixir')
-
-if !exists('g:python_highlight_all')
-  call s:SetDefault('g:python_highlight_builtins', 1)
-  call s:SetDefault('g:python_highlight_builtin_objs', 1)
-  call s:SetDefault('g:python_highlight_builtin_types', 1)
-  call s:SetDefault('g:python_highlight_builtin_funcs', 1)
-  call s:SetDefault('g:python_highlight_builtin_funcs_kwarg', 1)
-  call s:SetDefault('g:python_highlight_exceptions', 1)
-  call s:SetDefault('g:python_highlight_string_formatting', 1)
-  call s:SetDefault('g:python_highlight_string_format', 1)
-  call s:SetDefault('g:python_highlight_string_templates', 1)
-  call s:SetDefault('g:python_highlight_indent_errors', 1)
-  call s:SetDefault('g:python_highlight_space_errors', 1)
-  call s:SetDefault('g:python_highlight_doctests', 1)
-  call s:SetDefault('g:python_highlight_func_calls', 1)
-  call s:SetDefault('g:python_highlight_class_vars', 1)
-  call s:SetDefault('g:python_highlight_operators', 1)
-  call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
-  call s:SetDefault('g:python_slow_sync', 1)
-endif
-
-" We need it because scripts.vim in vim uses "set ft=" which cannot be
-" overridden with setf (and we can't use set ft= so our scripts.vim work)
-func! s:Setf(ft)
-  if &filetype !~# '\<'.a:ft.'\>'
-    let &filetype = a:ft
-  endif
-endfunc
-
-" Function used for patterns that end in a star: don't set the filetype if the
-" file name matches ft_ignore_pat.
-" When using this, the entry should probably be further down below with the
-" other StarSetf() calls.
-func! s:StarSetf(ft)
-  if expand("<amatch>") !~ g:ft_ignore_pat
-    exe 'setf ' . a:ft
-  endif
-endfunc
-
-augroup polyglot-observer | augroup END
-
-if exists('s:cpo_save')
-  " Restore 'cpoptions'
-  let &cpo = s:cpo_save
-  unlet s:cpo_save
-endif
-
-" Load user-defined filetype.vim and oter plugins ftdetect first
-" This is to use polyglot-defined ftdetect always as fallback to user settings
-augroup filetypedetect
-  runtime! filetype.vim
-  runtime! ftdetect/*.vim
-augroup END
-
-
-augroup filetypedetect
-
-" Switch to compatible mode for the time being
-let s:cpo_save = &cpo
-set cpo&vim
-
-if !has_key(g:polyglot_is_disabled, 'ftdetect')
-
-" It can happen vim filetype.vim loads first, then we need a reset
-if exists("did_load_filetypes")
-  au! filetypedetect
-endif
-
-" Prevent filetype.vim of vim from loading again
-let did_load_filetypes = 1
-
-
-" DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
-
-if !has_key(g:polyglot_is_disabled, 'gleam')
-  au BufNewFile,BufRead *.gleam setf gleam
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jsonc')
-  au BufNewFile,BufRead *.cjson,*.jsonc,{.,}babelrc,{.,}eslintrc.json,{.,}jshintrc,{.,}jslintrc,{.,}mocharc.json,coc-settings.json,coffeelint.json,jsconfig.json,tsconfig.json setf jsonc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mint')
-  au BufNewFile,BufRead *.mint setf mint
-endif
-
-if !has_key(g:polyglot_is_disabled, 'context')
-  au BufNewFile,BufRead *.mkii,*.mkiv,*.mkvi setf context
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xpm2')
-  au BufNewFile,BufRead *.xpm2 setf xpm2
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xpm')
-  au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
-  au BufNewFile,BufRead *.xpm setf xpm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xf86conf')
-  au BufNewFile,BufRead */xorg.conf.d/*.conf,xorg.conf,xorg.conf-4 setf xf86conf
-  au BufNewFile,BufRead XF86Config-4* call s:StarSetf('xf86conf')
-  au BufNewFile,BufRead XF86Config* call s:StarSetf('xf86conf')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pullrequest')
-  au BufNewFile,BufRead PULLREQ_EDITMSG setf pullrequest
-endif
-
-if !has_key(g:polyglot_is_disabled, 'text')
-  au BufNewFile,BufRead *.text,README setf text
-endif
-
-if !has_key(g:polyglot_is_disabled, 'svn')
-  au BufNewFile,BufRead svn-commit*.tmp setf svn
-endif
-
-if !has_key(g:polyglot_is_disabled, 'logcheck')
-  au BufNewFile,BufRead */etc/logcheck/*.d*/* call s:StarSetf('logcheck')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'fvwm')
-  au BufNewFile,BufRead */.fvwm/* call s:StarSetf('fvwm')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'crontab')
-  au BufNewFile,BufRead crontab setf crontab
-  au BufNewFile,BufRead crontab.* call s:StarSetf('crontab')
-  au BufNewFile,BufRead */etc/cron.d/* call s:StarSetf('crontab')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'bzr')
-  au BufNewFile,BufRead bzr_log.* call s:StarSetf('bzr')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'asteriskvm')
-  au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'asterisk')
-  au BufNewFile,BufRead *asterisk/*.conf* call s:StarSetf('asterisk')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'apachestyle')
-  au BufNewFile,BufRead proftpd.conf* call s:StarSetf('apachestyle')
-  au BufNewFile,BufRead */etc/proftpd/conf.*/* call s:StarSetf('apachestyle')
-  au BufNewFile,BufRead */etc/proftpd/*.conf* call s:StarSetf('apachestyle')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'z8a')
-  au BufNewFile,BufRead *.z8a setf z8a
-endif
-
-if !has_key(g:polyglot_is_disabled, 'zimbutempl')
-  au BufNewFile,BufRead *.zut setf zimbutempl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'zimbu')
-  au BufNewFile,BufRead *.zu setf zimbu
-endif
-
-if !has_key(g:polyglot_is_disabled, 'yacc')
-  au BufNewFile,BufRead *.y++,*.yxx,*.yy setf yacc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xslt')
-  au BufNewFile,BufRead *.xsl,*.xslt setf xslt
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xsd')
-  au BufNewFile,BufRead *.xsd setf xsd
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xquery')
-  au BufNewFile,BufRead *.xq,*.xql,*.xqm,*.xquery,*.xqy setf xquery
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xmodmap')
-  au BufNewFile,BufRead *Xmodmap setf xmodmap
-  au BufNewFile,BufRead *xmodmap* call s:StarSetf('xmodmap')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xmath')
-  au BufNewFile,BufRead *.msc,*.msf setf xmath
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xdefaults')
-  au BufNewFile,BufRead *.ad,{.,}Xdefaults,{.,}Xpdefaults,{.,}Xresources,xdm-config setf xdefaults
-  au BufNewFile,BufRead Xresources* call s:StarSetf('xdefaults')
-  au BufNewFile,BufRead */app-defaults/* call s:StarSetf('xdefaults')
-  au BufNewFile,BufRead */Xresources/* call s:StarSetf('xdefaults')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xinetd')
-  au BufNewFile,BufRead */etc/xinetd.conf setf xinetd
-  au BufNewFile,BufRead */etc/xinetd.d/* call s:StarSetf('xinetd')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xhtml')
-  au BufNewFile,BufRead *.xht,*.xhtml setf xhtml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'wsh')
-  au BufNewFile,BufRead *.ws[fc] setf wsh
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cvs')
-  au BufNewFile,BufRead cvs\d\+ setf cvs
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cvsrc')
-  au BufNewFile,BufRead {.,}cvsrc setf cvsrc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'wvdial')
-  au BufNewFile,BufRead {.,}wvdialrc,wvdial.conf setf wvdial
-endif
-
-if !has_key(g:polyglot_is_disabled, 'wsml')
-  au BufNewFile,BufRead *.wsml setf wsml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'winbatch')
-  au BufNewFile,BufRead *.wbt setf winbatch
-endif
-
-if !has_key(g:polyglot_is_disabled, 'wml')
-  au BufNewFile,BufRead *.wml setf wml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'wget')
-  au BufNewFile,BufRead {.,}wgetrc,wgetrc setf wget
-endif
-
-if !has_key(g:polyglot_is_disabled, 'webmacro')
-  au BufNewFile,BufRead *.wm setf webmacro
-endif
-
-if !has_key(g:polyglot_is_disabled, 'wast')
-  au BufNewFile,BufRead *.wast,*.wat setf wast
-endif
-
-if !has_key(g:polyglot_is_disabled, 'vroom')
-  au BufNewFile,BufRead *.vroom setf vroom
-endif
-
-if !has_key(g:polyglot_is_disabled, 'vrml')
-  au BufNewFile,BufRead *.wrl setf vrml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'vgrindefs')
-  au BufNewFile,BufRead vgrindefs setf vgrindefs
-endif
-
-if !has_key(g:polyglot_is_disabled, 'viminfo')
-  au BufNewFile,BufRead {.,}viminfo,_viminfo setf viminfo
-endif
-
-if !has_key(g:polyglot_is_disabled, 'vim')
-  au BufNewFile,BufRead *.vba,*.vim,{.,}exrc,_exrc setf vim
-  au BufNewFile,BufRead *vimrc* call s:StarSetf('vim')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'vhdl')
-  au BufNewFile,BufRead *.hdl,*.vbe,*.vhd,*.vhdl,*.vho,*.vst setf vhdl
-  au BufNewFile,BufRead *.vhdl_[0-9]* call s:StarSetf('vhdl')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'systemverilog')
-  au BufNewFile,BufRead *.sv,*.svh setf systemverilog
-endif
-
-if !has_key(g:polyglot_is_disabled, 'verilogams')
-  au BufNewFile,BufRead *.va,*.vams setf verilogams
-endif
-
-if !has_key(g:polyglot_is_disabled, 'verilog')
-  au BufNewFile,BufRead *.v setf verilog
-endif
-
-if !has_key(g:polyglot_is_disabled, 'vera')
-  au BufNewFile,BufRead *.vr,*.vrh,*.vri setf vera
-endif
-
-if !has_key(g:polyglot_is_disabled, 'upstart')
-  au BufNewFile,BufRead */.config/upstart/*.conf,*/.config/upstart/*.override,*/.init/*.conf,*/.init/*.override,*/etc/init/*.conf,*/etc/init/*.override,*/usr/share/upstart/*.conf,*/usr/share/upstart/*.override setf upstart
-endif
-
-if !has_key(g:polyglot_is_disabled, 'updatedb')
-  au BufNewFile,BufRead */etc/updatedb.conf setf updatedb
-endif
-
-if !has_key(g:polyglot_is_disabled, 'uc')
-  au BufNewFile,BufRead *.uc setf uc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'udevperm')
-  au BufNewFile,BufRead */etc/udev/permissions.d/*.permissions setf udevperm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'udevconf')
-  au BufNewFile,BufRead */etc/udev/udev.conf setf udevconf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'uil')
-  au BufNewFile,BufRead *.uil,*.uit setf uil
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tsscl')
-  au BufNewFile,BufRead *.tsscl setf tsscl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tssop')
-  au BufNewFile,BufRead *.tssop setf tssop
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tssgm')
-  au BufNewFile,BufRead *.tssgm setf tssgm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'trustees')
-  au BufNewFile,BufRead trustees.conf setf trustees
-endif
-
-if !has_key(g:polyglot_is_disabled, 'treetop')
-  au BufNewFile,BufRead *.treetop setf treetop
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tpp')
-  au BufNewFile,BufRead *.tpp setf tpp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tidy')
-  au BufNewFile,BufRead {.,}tidyrc,tidy.conf,tidyrc setf tidy
-endif
-
-if !has_key(g:polyglot_is_disabled, 'texmf')
-  au BufNewFile,BufRead texmf.cnf setf texmf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'texinfo')
-  au BufNewFile,BufRead *.texi,*.texinfo,*.txi setf texinfo
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tex')
-  au BufNewFile,BufRead *.bbl,*.dtx,*.latex,*.ltx,*.sty setf tex
-endif
-
-if !has_key(g:polyglot_is_disabled, 'terminfo')
-  au BufNewFile,BufRead *.ti setf terminfo
-endif
-
-if !has_key(g:polyglot_is_disabled, 'teraterm')
-  au BufNewFile,BufRead *.ttl setf teraterm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tsalt')
-  au BufNewFile,BufRead *.slt setf tsalt
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tli')
-  au BufNewFile,BufRead *.tli setf tli
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tcl')
-  au BufNewFile,BufRead *.itcl,*.itk,*.jacl,*.tcl,*.tk setf tcl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'taskedit')
-  au BufNewFile,BufRead *.task setf taskedit
-endif
-
-if !has_key(g:polyglot_is_disabled, 'taskdata')
-  au BufNewFile,BufRead {pending,completed,undo}.data setf taskdata
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tak')
-  au BufNewFile,BufRead *.tak setf tak
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tags')
-  au BufNewFile,BufRead tags setf tags
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sudoers')
-  au BufNewFile,BufRead */etc/sudoers,sudoers.tmp setf sudoers
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sdc')
-  au BufNewFile,BufRead *.sdc setf sdc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sysctl')
-  au BufNewFile,BufRead */etc/sysctl.conf,*/etc/sysctl.d/*.conf setf sysctl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sil')
-  au BufNewFile,BufRead *.sil setf sil
-endif
-
-if !has_key(g:polyglot_is_disabled, 'swiftgyb')
-  au BufNewFile,BufRead *.swift.gyb setf swiftgyb
-endif
-
-if !has_key(g:polyglot_is_disabled, 'voscm')
-  au BufNewFile,BufRead *.cm setf voscm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sml')
-  au BufNewFile,BufRead *.sml setf sml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'stp')
-  au BufNewFile,BufRead *.stp setf stp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'smcl')
-  au BufNewFile,BufRead *.hlp,*.ihlp,*.smcl setf smcl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'stata')
-  au BufNewFile,BufRead *.ado,*.do,*.imata,*.mata setf stata
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sshdconfig')
-  au BufNewFile,BufRead */etc/ssh/sshd_config.d/*.conf,sshd_config setf sshdconfig
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sshconfig')
-  au BufNewFile,BufRead */.ssh/config,*/etc/ssh/ssh_config.d/*.conf,ssh_config setf sshconfig
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sqr')
-  au BufNewFile,BufRead *.sqi,*.sqr setf sqr
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sqlj')
-  au BufNewFile,BufRead *.sqlj setf sqlj
-endif
-
-if !has_key(g:polyglot_is_disabled, 'squid')
-  au BufNewFile,BufRead squid.conf setf squid
-endif
-
-if !has_key(g:polyglot_is_disabled, 'spice')
-  au BufNewFile,BufRead *.sp,*.spice setf spice
-endif
-
-if !has_key(g:polyglot_is_disabled, 'slice')
-  au BufNewFile,BufRead *.ice setf slice
-endif
-
-if !has_key(g:polyglot_is_disabled, 'spup')
-  au BufNewFile,BufRead *.spd,*.spdata,*.speedup setf spup
-endif
-
-if !has_key(g:polyglot_is_disabled, 'hog')
-  au BufNewFile,BufRead *.hog,snort.conf,vision.conf setf hog
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mib')
-  au BufNewFile,BufRead *.mib,*.my setf mib
-endif
-
-if !has_key(g:polyglot_is_disabled, 'snobol4')
-  au BufNewFile,BufRead *.sno,*.spt setf snobol4
-endif
-
-if !has_key(g:polyglot_is_disabled, 'smith')
-  au BufNewFile,BufRead *.smith,*.smt setf smith
-endif
-
-if !has_key(g:polyglot_is_disabled, 'st')
-  au BufNewFile,BufRead *.st setf st
-endif
-
-if !has_key(g:polyglot_is_disabled, 'slrnsc')
-  au BufNewFile,BufRead *.score setf slrnsc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'slrnrc')
-  au BufNewFile,BufRead {.,}slrnrc setf slrnrc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'skill')
-  au BufNewFile,BufRead *.cdf,*.il,*.ils setf skill
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sisu')
-  au BufNewFile,BufRead *.-sst,*.-sst.meta,*._sst,*._sst.meta,*.ssi,*.ssm,*.sst,*.sst.meta setf sisu
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sinda')
-  au BufNewFile,BufRead *.s85,*.sin setf sinda
-endif
-
-if !has_key(g:polyglot_is_disabled, 'simula')
-  au BufNewFile,BufRead *.sim setf simula
-endif
-
-if !has_key(g:polyglot_is_disabled, 'screen')
-  au BufNewFile,BufRead {.,}screenrc,screenrc setf screen
-endif
-
-if !has_key(g:polyglot_is_disabled, 'scheme')
-  au BufNewFile,BufRead *.rkt,*.scm,*.ss setf scheme
-endif
-
-if !has_key(g:polyglot_is_disabled, 'catalog')
-  au BufNewFile,BufRead catalog setf catalog
-  au BufNewFile,BufRead sgml.catalog* call s:StarSetf('catalog')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'setserial')
-  au BufNewFile,BufRead */etc/serial.conf setf setserial
-endif
-
-if !has_key(g:polyglot_is_disabled, 'slpspi')
-  au BufNewFile,BufRead */etc/slp.spi setf slpspi
-endif
-
-if !has_key(g:polyglot_is_disabled, 'spyce')
-  au BufNewFile,BufRead *.spi,*.spy setf spyce
-endif
-
-if !has_key(g:polyglot_is_disabled, 'slpreg')
-  au BufNewFile,BufRead */etc/slp.reg setf slpreg
-endif
-
-if !has_key(g:polyglot_is_disabled, 'slpconf')
-  au BufNewFile,BufRead */etc/slp.conf setf slpconf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'services')
-  au BufNewFile,BufRead */etc/services setf services
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sm')
-  au BufNewFile,BufRead sendmail.cf setf sm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sieve')
-  au BufNewFile,BufRead *.sieve,*.siv setf sieve
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sdl')
-  au BufNewFile,BufRead *.pr,*.sdl setf sdl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sd')
-  au BufNewFile,BufRead *.sd setf sd
-endif
-
-if !has_key(g:polyglot_is_disabled, 'scilab')
-  au BufNewFile,BufRead *.sce,*.sci setf scilab
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sbt')
-  au BufNewFile,BufRead *.sbt setf sbt
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sather')
-  au BufNewFile,BufRead *.sa setf sather
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sass')
-  au BufNewFile,BufRead *.sass setf sass
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sas')
-  au BufNewFile,BufRead *.sas setf sas
-endif
-
-if !has_key(g:polyglot_is_disabled, 'samba')
-  au BufNewFile,BufRead smb.conf setf samba
-endif
-
-if !has_key(g:polyglot_is_disabled, 'slang')
-  au BufNewFile,BufRead *.sl setf slang
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rtf')
-  au BufNewFile,BufRead *.rtf setf rtf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rpcgen')
-  au BufNewFile,BufRead *.x setf rpcgen
-endif
-
-if !has_key(g:polyglot_is_disabled, 'robots')
-  au BufNewFile,BufRead robots.txt setf robots
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rpl')
-  au BufNewFile,BufRead *.rpl setf rpl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rng')
-  au BufNewFile,BufRead *.rng setf rng
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rnc')
-  au BufNewFile,BufRead *.rnc setf rnc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'resolv')
-  au BufNewFile,BufRead resolv.conf setf resolv
-endif
-
-if !has_key(g:polyglot_is_disabled, 'remind')
-  au BufNewFile,BufRead *.rem,*.remind,{.,}reminders setf remind
-  au BufNewFile,BufRead .reminders* call s:StarSetf('remind')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rrst')
-  au BufNewFile,BufRead *.rrst,*.srst setf rrst
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rmd')
-  au BufNewFile,BufRead *.rmd,*.smd setf rmd
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rnoweb')
-  au BufNewFile,BufRead *.rnw,*.snw setf rnoweb
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rexx')
-  au BufNewFile,BufRead *.jrexx,*.orx,*.rex,*.rexx,*.rexxj,*.rxj,*.rxo,*.testGroup,*.testUnit setf rexx
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rego')
-  au BufNewFile,BufRead *.rego setf rego
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rib')
-  au BufNewFile,BufRead *.rib setf rib
-endif
-
-if !has_key(g:polyglot_is_disabled, 'readline')
-  au BufNewFile,BufRead {.,}inputrc,inputrc setf readline
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rcs')
-  au BufNewFile,BufRead *\,v setf rcs
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ratpoison')
-  au BufNewFile,BufRead {.,}ratpoisonrc,ratpoisonrc setf ratpoison
-endif
-
-if !has_key(g:polyglot_is_disabled, 'radiance')
-  au BufNewFile,BufRead *.mat,*.rad setf radiance
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pyrex')
-  au BufNewFile,BufRead *.pxd,*.pyx setf pyrex
-endif
-
-if !has_key(g:polyglot_is_disabled, 'protocols')
-  au BufNewFile,BufRead */etc/protocols setf protocols
-endif
-
-if !has_key(g:polyglot_is_disabled, 'promela')
-  au BufNewFile,BufRead *.pml setf promela
-endif
-
-if !has_key(g:polyglot_is_disabled, 'psf')
-  au BufNewFile,BufRead *.psf setf psf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'procmail')
-  au BufNewFile,BufRead {.,}procmail,{.,}procmailrc setf procmail
-endif
-
-if !has_key(g:polyglot_is_disabled, 'privoxy')
-  au BufNewFile,BufRead *.action setf privoxy
-endif
-
-if !has_key(g:polyglot_is_disabled, 'proc')
-  au BufNewFile,BufRead *.pc setf proc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'obj')
-  au BufNewFile,BufRead *.obj setf obj
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ppwiz')
-  au BufNewFile,BufRead *.ih,*.it setf ppwiz
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pccts')
-  au BufNewFile,BufRead *.g setf pccts
-endif
-
-if !has_key(g:polyglot_is_disabled, 'povini')
-  au BufNewFile,BufRead {.,}povrayrc setf povini
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pov')
-  au BufNewFile,BufRead *.pov setf pov
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ppd')
-  au BufNewFile,BufRead *.ppd setf ppd
-endif
-
-if !has_key(g:polyglot_is_disabled, 'postscr')
-  au BufNewFile,BufRead *.afm,*.ai,*.eps,*.epsf,*.epsi,*.pfa,*.ps setf postscr
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pfmain')
-  au BufNewFile,BufRead main.cf setf pfmain
-endif
-
-if !has_key(g:polyglot_is_disabled, 'po')
-  au BufNewFile,BufRead *.po,*.pot setf po
-endif
-
-if !has_key(g:polyglot_is_disabled, 'plp')
-  au BufNewFile,BufRead *.plp setf plp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'plsql')
-  au BufNewFile,BufRead *.pls,*.plsql setf plsql
-endif
-
-if !has_key(g:polyglot_is_disabled, 'plm')
-  au BufNewFile,BufRead *.p36,*.pac,*.plm setf plm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pli')
-  au BufNewFile,BufRead *.pl1,*.pli setf pli
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pine')
-  au BufNewFile,BufRead {.,}pinerc,{.,}pinercex,pinerc,pinercex setf pine
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pilrc')
-  au BufNewFile,BufRead *.rcp setf pilrc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pinfo')
-  au BufNewFile,BufRead */.pinforc,*/etc/pinforc setf pinfo
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cmod')
-  au BufNewFile,BufRead *.cmod setf cmod
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pike')
-  au BufNewFile,BufRead *.pike,*.pmod setf pike
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pcmk')
-  au BufNewFile,BufRead *.pcmk setf pcmk
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pdf')
-  au BufNewFile,BufRead *.pdf setf pdf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pascal')
-  au BufNewFile,BufRead *.dpr,*.lpr,*.pas,*.pp setf pascal
-endif
-
-if !has_key(g:polyglot_is_disabled, 'passwd')
-  au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
-endif
-
-if !has_key(g:polyglot_is_disabled, 'papp')
-  au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pamenv')
-  au BufNewFile,BufRead {.,}pam_environment,pam_env.conf setf pamenv
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pamconf')
-  au BufNewFile,BufRead */etc/pam.conf setf pamconf
-  au BufNewFile,BufRead */etc/pam.d/* call s:StarSetf('pamconf')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pf')
-  au BufNewFile,BufRead pf.conf setf pf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ora')
-  au BufNewFile,BufRead *.ora setf ora
-endif
-
-if !has_key(g:polyglot_is_disabled, 'opl')
-  au BufNewFile,BufRead *.[Oo][Pp][Ll] setf opl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'openroad')
-  au BufNewFile,BufRead *.or setf openroad
-endif
-
-if !has_key(g:polyglot_is_disabled, 'omnimark')
-  au BufNewFile,BufRead *.xin,*.xom setf omnimark
-endif
-
-if !has_key(g:polyglot_is_disabled, 'occam')
-  au BufNewFile,BufRead *.occ setf occam
-endif
-
-if !has_key(g:polyglot_is_disabled, 'nsis')
-  au BufNewFile,BufRead *.nsh,*.nsi setf nsis
-endif
-
-if !has_key(g:polyglot_is_disabled, 'nqc')
-  au BufNewFile,BufRead *.nqc setf nqc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'nroff')
-  au BufNewFile,BufRead *.1,*.1in,*.1m,*.1x,*.2,*.3,*.3in,*.3m,*.3p,*.3pm,*.3qt,*.3x,*.4,*.5,*.6,*.7,*.8,*.9,*.man,*.mdoc setf nroff
-  au BufNewFile,BufRead *.mom,*.nr,*.roff,*.tmac,*.tr setf nroff
-  au BufNewFile,BufRead tmac.* call s:StarSetf('nroff')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ncf')
-  au BufNewFile,BufRead *.ncf setf ncf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ninja')
-  au BufNewFile,BufRead *.ninja setf ninja
-endif
-
-if !has_key(g:polyglot_is_disabled, 'netrc')
-  au BufNewFile,BufRead {.,}netrc setf netrc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'neomuttrc')
-  au BufNewFile,BufRead Neomuttrc setf neomuttrc
-  au BufNewFile,BufRead neomuttrc* call s:StarSetf('neomuttrc')
-  au BufNewFile,BufRead Neomuttrc* call s:StarSetf('neomuttrc')
-  au BufNewFile,BufRead .neomuttrc* call s:StarSetf('neomuttrc')
-  au BufNewFile,BufRead */.neomutt/neomuttrc* call s:StarSetf('neomuttrc')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'natural')
-  au BufNewFile,BufRead *.NS[ACGLMNPS] setf natural
-endif
-
-if !has_key(g:polyglot_is_disabled, 'nanorc')
-  au BufNewFile,BufRead *.nanorc,*/etc/nanorc setf nanorc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'n1ql')
-  au BufNewFile,BufRead *.n1ql,*.nql setf n1ql
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mush')
-  au BufNewFile,BufRead *.mush setf mush
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mupad')
-  au BufNewFile,BufRead *.mu setf mupad
-endif
-
-if !has_key(g:polyglot_is_disabled, 'muttrc')
-  au BufNewFile,BufRead Mutt{ng,}rc setf muttrc
-  au BufNewFile,BufRead mutt{ng,}rc* call s:StarSetf('muttrc')
-  au BufNewFile,BufRead Mutt{ng,}rc* call s:StarSetf('muttrc')
-  au BufNewFile,BufRead .mutt{ng,}rc* call s:StarSetf('muttrc')
-  au BufNewFile,BufRead */etc/Muttrc.d/* call s:StarSetf('muttrc')
-  au BufNewFile,BufRead */.mutt{ng,}/mutt{ng,}rc* call s:StarSetf('muttrc')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'msql')
-  au BufNewFile,BufRead *.msql setf msql
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mrxvtrc')
-  au BufNewFile,BufRead {.,}mrxvtrc,mrxvtrc setf mrxvtrc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'srec')
-  au BufNewFile,BufRead *.mot,*.s19,*.s28,*.s37,*.srec setf srec
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mplayerconf')
-  au BufNewFile,BufRead */.mplayer/config,mplayer.conf setf mplayerconf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'modconf')
-  au BufNewFile,BufRead */etc/conf.modules,*/etc/modules,*/etc/modules.conf setf modconf
-  au BufNewFile,BufRead */etc/modprobe.* call s:StarSetf('modconf')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'moo')
-  au BufNewFile,BufRead *.moo setf moo
-endif
-
-if !has_key(g:polyglot_is_disabled, 'monk')
-  au BufNewFile,BufRead *.isc,*.monk,*.ssc,*.tsc setf monk
-endif
-
-if !has_key(g:polyglot_is_disabled, 'modula3')
-  au BufNewFile,BufRead *.[mi][3g] setf modula3
-endif
-
-if !has_key(g:polyglot_is_disabled, 'modula2')
-  au BufNewFile,BufRead *.DEF,*.MOD,*.m2,*.mi setf modula2
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mmp')
-  au BufNewFile,BufRead *.mmp setf mmp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mix')
-  au BufNewFile,BufRead *.mix,*.mixal setf mix
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mgl')
-  au BufNewFile,BufRead *.mgl setf mgl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mp')
-  au BufNewFile,BufRead *.mp setf mp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mf')
-  au BufNewFile,BufRead *.mf setf mf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'messages')
-  au BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.[0-9]*,-[0-9]*} setf messages
-endif
-
-if !has_key(g:polyglot_is_disabled, 'hgcommit')
-  au BufNewFile,BufRead hg-editor-*.txt setf hgcommit
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mel')
-  au BufNewFile,BufRead *.mel setf mel
-endif
-
-if !has_key(g:polyglot_is_disabled, 'map')
-  au BufNewFile,BufRead *.map setf map
-endif
-
-if !has_key(g:polyglot_is_disabled, 'maple')
-  au BufNewFile,BufRead *.mpl,*.mv,*.mws setf maple
-endif
-
-if !has_key(g:polyglot_is_disabled, 'manconf')
-  au BufNewFile,BufRead */etc/man.conf,man.config setf manconf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mallard')
-  au BufNewFile,BufRead *.page setf mallard
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ist')
-  au BufNewFile,BufRead *.ist,*.mst setf ist
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mailcap')
-  au BufNewFile,BufRead {.,}mailcap,mailcap setf mailcap
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mailaliases')
-  au BufNewFile,BufRead */etc/aliases,*/etc/mail/aliases setf mailaliases
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mail')
-  au BufNewFile,BufRead *.eml,{.,}article,{.,}article.\d\+,{.,}followup,{.,}letter,{.,}letter.\d\+,/tmp/SLRN[0-9A-Z.]\+,ae\d\+.txt,mutt[[:alnum:]_-]\\\{6\},mutt{ng,}-*-\w\+,neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},pico.\d\+,snd.\d\+,{neo,}mutt[[:alnum:]._-]\\\{6\} setf mail
-  au BufNewFile,BufRead reportbug-* call s:StarSetf('mail')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mgp')
-  au BufNewFile,BufRead *.mgp setf mgp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lss')
-  au BufNewFile,BufRead *.lss setf lss
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lsl')
-  au BufNewFile,BufRead *.lsl setf lsl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lout')
-  au BufNewFile,BufRead *.lou,*.lout setf lout
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lotos')
-  au BufNewFile,BufRead *.lot,*.lotos setf lotos
-endif
-
-if !has_key(g:polyglot_is_disabled, 'logtalk')
-  au BufNewFile,BufRead *.lgt setf logtalk
-endif
-
-if !has_key(g:polyglot_is_disabled, 'logindefs')
-  au BufNewFile,BufRead */etc/login.defs setf logindefs
-endif
-
-if !has_key(g:polyglot_is_disabled, 'loginaccess')
-  au BufNewFile,BufRead */etc/login.access setf loginaccess
-endif
-
-if !has_key(g:polyglot_is_disabled, 'litestep')
-  au BufNewFile,BufRead */LiteStep/*/*.rc setf litestep
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lite')
-  au BufNewFile,BufRead *.lite,*.lt setf lite
-endif
-
-if !has_key(g:polyglot_is_disabled, 'liquid')
-  au BufNewFile,BufRead *.liquid setf liquid
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lisp')
-  au BufNewFile,BufRead *.cl,*.el,*.lisp,*.lsp,{.,}emacs,{.,}sawfishrc,{.,}sbclrc,sbclrc setf lisp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lilo')
-  au BufNewFile,BufRead lilo.conf setf lilo
-  au BufNewFile,BufRead lilo.conf* call s:StarSetf('lilo')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lifelines')
-  au BufNewFile,BufRead *.ll setf lifelines
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lftp')
-  au BufNewFile,BufRead *lftp/rc,{.,}lftprc,lftp.conf setf lftp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sensors')
-  au BufNewFile,BufRead */etc/sensors.conf,*/etc/sensors3.conf setf sensors
-endif
-
-if !has_key(g:polyglot_is_disabled, 'libao')
-  au BufNewFile,BufRead */.libao,*/etc/libao.conf setf libao
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lex')
-  au BufNewFile,BufRead *.l,*.l++,*.lex,*.lxx setf lex
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ld')
-  au BufNewFile,BufRead *.ld setf ld
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ldif')
-  au BufNewFile,BufRead *.ldif setf ldif
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lprolog')
-  au BufNewFile,BufRead *.sig setf lprolog
-endif
-
-if !has_key(g:polyglot_is_disabled, 'limits')
-  au BufNewFile,BufRead */etc/*limits.conf,*/etc/*limits.d/*.conf,*/etc/limits setf limits
-endif
-
-if !has_key(g:polyglot_is_disabled, 'latte')
-  au BufNewFile,BufRead *.latte,*.lte setf latte
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lace')
-  au BufNewFile,BufRead *.ACE,*.ace setf lace
-endif
-
-if !has_key(g:polyglot_is_disabled, 'kconfig')
-  au BufNewFile,BufRead Kconfig,Kconfig.debug setf kconfig
-  au BufNewFile,BufRead Kconfig.* call s:StarSetf('kconfig')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'kscript')
-  au BufNewFile,BufRead *.ks setf kscript
-endif
-
-if !has_key(g:polyglot_is_disabled, 'kivy')
-  au BufNewFile,BufRead *.kv setf kivy
-endif
-
-if !has_key(g:polyglot_is_disabled, 'kwt')
-  au BufNewFile,BufRead *.k setf kwt
-endif
-
-if !has_key(g:polyglot_is_disabled, 'kix')
-  au BufNewFile,BufRead *.kix setf kix
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jovial')
-  au BufNewFile,BufRead *.j73,*.jov,*.jovial setf jovial
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jgraph')
-  au BufNewFile,BufRead *.jgr setf jgraph
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jess')
-  au BufNewFile,BufRead *.clp setf jess
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jproperties')
-  au BufNewFile,BufRead *.properties,*.properties_??,*.properties_??_?? setf jproperties
-  au BufNewFile,BufRead *.properties_??_??_* call s:StarSetf('jproperties')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jsp')
-  au BufNewFile,BufRead *.jsp setf jsp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'javacc')
-  au BufNewFile,BufRead *.jj,*.jjt setf javacc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'java')
-  au BufNewFile,BufRead *.jav,*.java setf java
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jam')
-  au BufNewFile,BufRead *.jpl,*.jpr setf jam
-  au BufNewFile,BufRead Prl*.* call s:StarSetf('jam')
-  au BufNewFile,BufRead JAM*.* call s:StarSetf('jam')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jal')
-  au BufNewFile,BufRead *.JAL,*.jal setf jal
-endif
-
-if !has_key(g:polyglot_is_disabled, 'j')
-  au BufNewFile,BufRead *.ijs setf j
-endif
-
-if !has_key(g:polyglot_is_disabled, 'iss')
-  au BufNewFile,BufRead *.iss setf iss
-endif
-
-if !has_key(g:polyglot_is_disabled, 'inittab')
-  au BufNewFile,BufRead inittab setf inittab
-endif
-
-if !has_key(g:polyglot_is_disabled, 'fgl')
-  au BufNewFile,BufRead *.4gh,*.4gl,*.m4gl setf fgl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ipfilter')
-  au BufNewFile,BufRead ipf.conf,ipf.rules,ipf6.conf setf ipfilter
-endif
-
-if !has_key(g:polyglot_is_disabled, 'usw2kagtlog')
-  au BufNewFile,BufRead *.usw2kagt.log\c,usw2kagt.*.log\c,usw2kagt.log\c setf usw2kagtlog
-endif
-
-if !has_key(g:polyglot_is_disabled, 'usserverlog')
-  au BufNewFile,BufRead *.usserver.log\c,usserver.*.log\c,usserver.log\c setf usserverlog
-endif
-
-if !has_key(g:polyglot_is_disabled, 'upstreaminstalllog')
-  au BufNewFile,BufRead *.upstreaminstall.log\c,upstreaminstall.*.log\c,upstreaminstall.log\c setf upstreaminstalllog
-endif
-
-if !has_key(g:polyglot_is_disabled, 'upstreamlog')
-  au BufNewFile,BufRead *.upstream.log\c,UPSTREAM-*.log\c,fdrupstream.log,upstream.*.log\c,upstream.log\c setf upstreamlog
-endif
-
-if !has_key(g:polyglot_is_disabled, 'upstreamdat')
-  au BufNewFile,BufRead *.upstream.dat\c,upstream.*.dat\c,upstream.dat\c setf upstreamdat
-endif
-
-if !has_key(g:polyglot_is_disabled, 'initng')
-  au BufNewFile,BufRead *.ii,*/etc/initng/*/*.i setf initng
-endif
-
-if !has_key(g:polyglot_is_disabled, 'inform')
-  au BufNewFile,BufRead *.INF,*.inf setf inform
-endif
-
-if !has_key(g:polyglot_is_disabled, 'indent')
-  au BufNewFile,BufRead {.,}indent.pro,indentrc setf indent
-endif
-
-if !has_key(g:polyglot_is_disabled, 'icemenu')
-  au BufNewFile,BufRead */.icewm/menu setf icemenu
-endif
-
-if !has_key(g:polyglot_is_disabled, 'msidl')
-  au BufNewFile,BufRead *.mof,*.odl setf msidl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'icon')
-  au BufNewFile,BufRead *.icn setf icon
-endif
-
-if !has_key(g:polyglot_is_disabled, 'httest')
-  au BufNewFile,BufRead *.htb,*.htt setf httest
-endif
-
-if !has_key(g:polyglot_is_disabled, 'hb')
-  au BufNewFile,BufRead *.hb setf hb
-endif
-
-if !has_key(g:polyglot_is_disabled, 'hostsaccess')
-  au BufNewFile,BufRead */etc/hosts.allow,*/etc/hosts.deny setf hostsaccess
-endif
-
-if !has_key(g:polyglot_is_disabled, 'hostconf')
-  au BufNewFile,BufRead */etc/host.conf setf hostconf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'template')
-  au BufNewFile,BufRead *.tmpl setf template
-endif
-
-if !has_key(g:polyglot_is_disabled, 'htmlm4')
-  au BufNewFile,BufRead *.html.m4 setf htmlm4
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tilde')
-  au BufNewFile,BufRead *.t.html setf tilde
-endif
-
-if !has_key(g:polyglot_is_disabled, 'html')
-  au BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
-  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
-endif
-
-if !has_key(g:polyglot_is_disabled, 'hollywood')
-  au BufNewFile,BufRead *.hws setf hollywood
-endif
-
-if !has_key(g:polyglot_is_disabled, 'hex')
-  au BufNewFile,BufRead *.h32,*.hex setf hex
-endif
-
-if !has_key(g:polyglot_is_disabled, 'hercules')
-  au BufNewFile,BufRead *.errsum,*.ev,*.sum,*.vc setf hercules
-endif
-
-if !has_key(g:polyglot_is_disabled, 'hastepreproc')
-  au BufNewFile,BufRead *.htpp setf hastepreproc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'haste')
-  au BufNewFile,BufRead *.ht setf haste
-endif
-
-if !has_key(g:polyglot_is_disabled, 'chaskell')
-  au BufNewFile,BufRead *.chs setf chaskell
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lhaskell')
-  au BufNewFile,BufRead *.lhs setf lhaskell
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gtkrc')
-  au BufNewFile,BufRead {.,}gtkrc,gtkrc setf gtkrc
-  au BufNewFile,BufRead gtkrc* call s:StarSetf('gtkrc')
-  au BufNewFile,BufRead .gtkrc* call s:StarSetf('gtkrc')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'group')
-  au BufNewFile,BufRead */etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/etc/gshadow-,*/etc/gshadow.edit,*/var/backups/group.bak,*/var/backups/gshadow.bak setf group
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gsp')
-  au BufNewFile,BufRead *.gsp setf gsp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gretl')
-  au BufNewFile,BufRead *.gretl setf gretl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'grads')
-  au BufNewFile,BufRead *.gs setf grads
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gitolite')
-  au BufNewFile,BufRead gitolite.conf setf gitolite
-  au BufNewFile,BufRead */gitolite-admin/conf/* call s:StarSetf('gitolite')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gnash')
-  au BufNewFile,BufRead {.,}gnashpluginrc,{.,}gnashrc,gnashpluginrc,gnashrc setf gnash
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gpg')
-  au BufNewFile,BufRead */.gnupg/gpg.conf,*/.gnupg/options,*/usr/*/gnupg/options.skel setf gpg
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gp')
-  au BufNewFile,BufRead *.gp,{.,}gprc setf gp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gkrellmrc')
-  au BufNewFile,BufRead gkrellmrc,gkrellmrc_? setf gkrellmrc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gedcom')
-  au BufNewFile,BufRead *.ged,lltxxxxx.txt setf gedcom
-  au BufNewFile,BufRead */tmp/lltmp* call s:StarSetf('gedcom')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gdmo')
-  au BufNewFile,BufRead *.gdmo,*.mo setf gdmo
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gdb')
-  au BufNewFile,BufRead {.,}gdbinit setf gdb
-endif
-
-if !has_key(g:polyglot_is_disabled, 'fstab')
-  au BufNewFile,BufRead fstab,mtab setf fstab
-endif
-
-if !has_key(g:polyglot_is_disabled, 'framescript')
-  au BufNewFile,BufRead *.fsl setf framescript
-endif
-
-if !has_key(g:polyglot_is_disabled, 'fortran')
-  au BufNewFile,BufRead *.f,*.f03,*.f08,*.f77,*.f90,*.f95,*.for,*.fortran,*.fpp,*.ftn setf fortran
-endif
-
-if !has_key(g:polyglot_is_disabled, 'reva')
-  au BufNewFile,BufRead *.frt setf reva
-endif
-
-if !has_key(g:polyglot_is_disabled, 'focexec')
-  au BufNewFile,BufRead *.fex,*.focexec setf focexec
-endif
-
-if !has_key(g:polyglot_is_disabled, 'fetchmail')
-  au BufNewFile,BufRead {.,}fetchmailrc setf fetchmail
-endif
-
-if !has_key(g:polyglot_is_disabled, 'factor')
-  au BufNewFile,BufRead *.factor setf factor
-endif
-
-if !has_key(g:polyglot_is_disabled, 'fan')
-  au BufNewFile,BufRead *.fan,*.fwt setf fan
-endif
-
-if !has_key(g:polyglot_is_disabled, 'falcon')
-  au BufNewFile,BufRead *.fal setf falcon
-endif
-
-if !has_key(g:polyglot_is_disabled, 'exports')
-  au BufNewFile,BufRead exports setf exports
-endif
-
-if !has_key(g:polyglot_is_disabled, 'expect')
-  au BufNewFile,BufRead *.exp setf expect
-endif
-
-if !has_key(g:polyglot_is_disabled, 'exim')
-  au BufNewFile,BufRead exim.conf setf exim
-endif
-
-if !has_key(g:polyglot_is_disabled, 'csc')
-  au BufNewFile,BufRead *.csc setf csc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'esterel')
-  au BufNewFile,BufRead *.strl setf esterel
-endif
-
-if !has_key(g:polyglot_is_disabled, 'esqlc')
-  au BufNewFile,BufRead *.EC,*.ec setf esqlc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'esmtprc')
-  au BufNewFile,BufRead *esmtprc setf esmtprc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'elmfilt')
-  au BufNewFile,BufRead filter-rules setf elmfilt
-endif
-
-if !has_key(g:polyglot_is_disabled, 'elinks')
-  au BufNewFile,BufRead elinks.conf setf elinks
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ecd')
-  au BufNewFile,BufRead *.ecd setf ecd
-endif
-
-if !has_key(g:polyglot_is_disabled, 'edif')
-  au BufNewFile,BufRead *.ed\(f\|if\|o\) setf edif
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dts')
-  au BufNewFile,BufRead *.dts,*.dtsi setf dts
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dtd')
-  au BufNewFile,BufRead *.dtd setf dtd
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dsl')
-  au BufNewFile,BufRead *.dsl setf dsl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'datascript')
-  au BufNewFile,BufRead *.ds setf datascript
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dracula')
-  au BufNewFile,BufRead *.drac,*.drc,*lpe,*lvs setf dracula
-  au BufNewFile,BufRead drac.* call s:StarSetf('dracula')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'def')
-  au BufNewFile,BufRead *.def setf def
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dylan')
-  au BufNewFile,BufRead *.dylan setf dylan
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dylanintr')
-  au BufNewFile,BufRead *.intr setf dylanintr
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dylanlid')
-  au BufNewFile,BufRead *.lid setf dylanlid
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dot')
-  au BufNewFile,BufRead *.dot,*.gv setf dot
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dircolors')
-  au BufNewFile,BufRead */etc/DIR_COLORS,{.,}dir_colors,{.,}dircolors setf dircolors
-endif
-
-if !has_key(g:polyglot_is_disabled, 'diff')
-  au BufNewFile,BufRead *.diff,*.rej setf diff
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dictdconf')
-  au BufNewFile,BufRead dictd.conf setf dictdconf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dictconf')
-  au BufNewFile,BufRead {.,}dictrc,dict.conf setf dictconf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'desktop')
-  au BufNewFile,BufRead *.desktop,*.directory setf desktop
-endif
-
-if !has_key(g:polyglot_is_disabled, 'desc')
-  au BufNewFile,BufRead *.desc setf desc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dnsmasq')
-  au BufNewFile,BufRead */etc/dnsmasq.conf setf dnsmasq
-  au BufNewFile,BufRead */etc/dnsmasq.d/* call s:StarSetf('dnsmasq')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'denyhosts')
-  au BufNewFile,BufRead denyhosts.conf setf denyhosts
-endif
-
-if !has_key(g:polyglot_is_disabled, 'debsources')
-  au BufNewFile,BufRead */etc/apt/sources.list,*/etc/apt/sources.list.d/*.list setf debsources
-endif
-
-if !has_key(g:polyglot_is_disabled, 'debcopyright')
-  au BufNewFile,BufRead */debian/copyright setf debcopyright
-endif
-
-if !has_key(g:polyglot_is_disabled, 'debcontrol')
-  au BufNewFile,BufRead */debian/control setf debcontrol
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cuplsim')
-  au BufNewFile,BufRead *.si setf cuplsim
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cupl')
-  au BufNewFile,BufRead *.pld setf cupl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'csp')
-  au BufNewFile,BufRead *.csp,*.fdr setf csp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'quake')
-  au BufNewFile,BufRead *baseq[2-3]/*.cfg,*id1/*.cfg,*quake[1-3]/*.cfg setf quake
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lynx')
-  au BufNewFile,BufRead lynx.cfg setf lynx
-endif
-
-if !has_key(g:polyglot_is_disabled, 'eterm')
-  au BufNewFile,BufRead *Eterm/*.cfg setf eterm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dcd')
-  au BufNewFile,BufRead *.dcd setf dcd
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dockerfile')
-  au BufNewFile,BufRead *.Dockerfile,*.dock,Containerfile,Dockerfile,dockerfile setf dockerfile
-  au BufNewFile,BufRead Dockerfile* call s:StarSetf('dockerfile')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cuda')
-  au BufNewFile,BufRead *.cu,*.cuh setf cuda
-endif
-
-if !has_key(g:polyglot_is_disabled, 'config')
-  au BufNewFile,BufRead Pipfile,configure.ac,configure.in setf config
-  au BufNewFile,BufRead /etc/hostname.* call s:StarSetf('config')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cf')
-  au BufNewFile,BufRead *.cfc,*.cfi,*.cfm setf cf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'coco')
-  au BufNewFile,BufRead *.atg setf coco
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cobol')
-  au BufNewFile,BufRead *.cbl,*.cob,*.lib setf cobol
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cmusrc')
-  au BufNewFile,BufRead */.cmus/{autosave,rc,command-history,*.theme},*/cmus/{rc,*.theme} setf cmusrc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cl')
-  au BufNewFile,BufRead *.eni setf cl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'clean')
-  au BufNewFile,BufRead *.dcl,*.icl setf clean
-endif
-
-if !has_key(g:polyglot_is_disabled, 'chordpro')
-  au BufNewFile,BufRead *.cho,*.chopro,*.chordpro,*.crd,*.crdpro setf chordpro
-endif
-
-if !has_key(g:polyglot_is_disabled, 'chill')
-  au BufNewFile,BufRead *..ch setf chill
-endif
-
-if !has_key(g:polyglot_is_disabled, 'debchangelog')
-  au BufNewFile,BufRead */debian/changelog,NEWS.Debian,NEWS.dch,changelog.Debian,changelog.dch setf debchangelog
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cterm')
-  au BufNewFile,BufRead *.con setf cterm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'css')
-  au BufNewFile,BufRead *.css setf css
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ch')
-  au BufNewFile,BufRead *.chf setf ch
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cynpp')
-  au BufNewFile,BufRead *.cyn setf cynpp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'crm')
-  au BufNewFile,BufRead *.crm setf crm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'conaryrecipe')
-  au BufNewFile,BufRead *.recipe setf conaryrecipe
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cdl')
-  au BufNewFile,BufRead *.cdl setf cdl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'chaiscript')
-  au BufNewFile,BufRead *.chai setf chaiscript
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cfengine')
-  au BufNewFile,BufRead cfengine.conf setf cfengine
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cdrdaoconf')
-  au BufNewFile,BufRead */etc/cdrdao.conf,*/etc/default/cdrdao,*/etc/defaults/cdrdao,{.,}cdrdao setf cdrdaoconf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cdrtoc')
-  au BufNewFile,BufRead *.toc setf cdrtoc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cabal')
-  au BufNewFile,BufRead *.cabal setf cabal
-endif
-
-if !has_key(g:polyglot_is_disabled, 'csdl')
-  au BufNewFile,BufRead *.csdl setf csdl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cs')
-  au BufNewFile,BufRead *.cs setf cs
-endif
-
-if !has_key(g:polyglot_is_disabled, 'calendar')
-  au BufNewFile,BufRead calendar setf calendar
-  au BufNewFile,BufRead */share/calendar/calendar.* call s:StarSetf('calendar')
-  au BufNewFile,BufRead */share/calendar/*/calendar.* call s:StarSetf('calendar')
-  au BufNewFile,BufRead */.calendar/* call s:StarSetf('calendar')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lpc')
-  au BufNewFile,BufRead *.lpc,*.ulpc setf lpc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'bsdl')
-  au BufNewFile,BufRead *.bsdl,*bsd setf bsdl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'blank')
-  au BufNewFile,BufRead *.bl setf blank
-endif
-
-if !has_key(g:polyglot_is_disabled, 'bindzone')
-  au BufNewFile,BufRead named.root setf bindzone
-  au BufNewFile,BufRead */named/db.* call s:StarSetf('bindzone')
-  au BufNewFile,BufRead */bind/db.* call s:StarSetf('bindzone')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'named')
-  au BufNewFile,BufRead named*.conf,rndc*.conf,rndc*.key setf named
-endif
-
-if !has_key(g:polyglot_is_disabled, 'bst')
-  au BufNewFile,BufRead *.bst setf bst
-endif
-
-if !has_key(g:polyglot_is_disabled, 'bib')
-  au BufNewFile,BufRead *.bib setf bib
-endif
-
-if !has_key(g:polyglot_is_disabled, 'bdf')
-  au BufNewFile,BufRead *.bdf setf bdf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'bc')
-  au BufNewFile,BufRead *.bc setf bc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dosbatch')
-  au BufNewFile,BufRead *.bat,*.sys setf dosbatch
-endif
-
-if !has_key(g:polyglot_is_disabled, 'hamster')
-  au BufNewFile,BufRead *.hsc,*.hsm setf hamster
-endif
-
-if !has_key(g:polyglot_is_disabled, 'freebasic')
-  au BufNewFile,BufRead *.bi,*.fb setf freebasic
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ibasic')
-  au BufNewFile,BufRead *.iba,*.ibi setf ibasic
-endif
-
-if !has_key(g:polyglot_is_disabled, 'b')
-  au BufNewFile,BufRead *.imp,*.mch,*.ref setf b
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sql')
-  au BufNewFile,BufRead *.bdy,*.ddl,*.fnc,*.pck,*.pkb,*.pks,*.plb,*.pls,*.plsql,*.prc,*.spc,*.sql,*.tpb,*.tps,*.trg,*.tyb,*.tyc,*.typ,*.vw setf sql
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gitignore')
-  au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore setf gitignore
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tads')
-  au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
-endif
-
-if !has_key(g:polyglot_is_disabled, 'prolog')
-  au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
-  au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap setf prolog
-endif
-
-if !has_key(g:polyglot_is_disabled, 'bzl')
-  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE setf bzl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'odin')
-  au BufNewFile,BufRead *.odin setf odin
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dosini')
-  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec setf dosini
-  au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
-  au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'spec')
-  au BufNewFile,BufRead *.spec setf spec
-endif
-
-if !has_key(g:polyglot_is_disabled, 'visual-basic')
-  au BufNewFile,BufRead,BufWritePost *.bas call polyglot#detect#Bas()
-  au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs setf vb
-endif
-
-if !has_key(g:polyglot_is_disabled, 'basic')
-  au BufNewFile,BufRead *.basic setf basic
-endif
-
-if !has_key(g:polyglot_is_disabled, 'trasys')
-  au BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
-endif
-
-if !has_key(g:polyglot_is_disabled, 'zig')
-  au BufNewFile,BufRead *.zir setf zir
-  au BufNewFile,BufRead *.zig,*.zir setf zig
-endif
-
-if !has_key(g:polyglot_is_disabled, 'zephir')
-  au BufNewFile,BufRead *.zep setf zephir
-endif
-
-if !has_key(g:polyglot_is_disabled, 'help')
-  au BufNewFile,BufRead $VIMRUNTIME/doc/*.txt setf help
-endif
-
-if !has_key(g:polyglot_is_disabled, 'helm')
-  au BufNewFile,BufRead */templates/*.tpl,*/templates/*.yaml setf helm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'smarty')
-  au BufNewFile,BufRead *.tpl setf smarty
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ansible')
-  au BufNewFile,BufRead handlers.*.y{a,}ml,local.y{a,}ml,main.y{a,}ml,playbook.y{a,}ml,requirements.y{a,}ml,roles.*.y{a,}ml,site.y{a,}ml,tasks.*.y{a,}ml setf yaml.ansible
-  au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
-  au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xsl')
-  au BufNewFile,BufRead *.xsl,*.xslt setf xsl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xdc')
-  au BufNewFile,BufRead *.xdc setf xdc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'vue')
-  au BufNewFile,BufRead *.vue,*.wpy setf vue
-endif
-
-if !has_key(g:polyglot_is_disabled, 'vmasm')
-  au BufNewFile,BufRead *.mar setf vmasm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'velocity')
-  au BufNewFile,BufRead *.vm setf velocity
-endif
-
-if !has_key(g:polyglot_is_disabled, 'vcl')
-  au BufNewFile,BufRead *.vcl setf vcl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'vbnet')
-  au BufNewFile,BufRead *.vb,*.vbhtml setf vbnet
-endif
-
-if !has_key(g:polyglot_is_disabled, 'vala')
-  au BufNewFile,BufRead *.vala,*.valadoc,*.vapi setf vala
-endif
-
-if !has_key(g:polyglot_is_disabled, 'v')
-  au BufNewFile,BufRead *.v,*.vsh,*.vv setf vlang
-endif
-
-if !has_key(g:polyglot_is_disabled, 'unison')
-  au BufNewFile,BufRead *.u,*.uu setf unison
-endif
-
-if !has_key(g:polyglot_is_disabled, 'typescript')
-  au BufNewFile,BufRead *.ts setf typescript
-  au BufNewFile,BufRead *.tsx setf typescriptreact
-endif
-
-if !has_key(g:polyglot_is_disabled, 'twig')
-  au BufNewFile,BufRead *.twig setf html.twig
-  au BufNewFile,BufRead *.xml.twig setf xml.twig
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tutor')
-  au BufNewFile,BufRead *.tutor setf tutor
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tptp')
-  au BufNewFile,BufRead *.ax,*.p,*.tptp setf tptp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'toml')
-  au BufNewFile,BufRead *.toml,*/.cargo/config,*/.cargo/credentials,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock setf toml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tmux')
-  au BufNewFile,BufRead {.,}tmux*.conf setf tmux
-endif
-
-if !has_key(g:polyglot_is_disabled, 'thrift')
-  au BufNewFile,BufRead *.thrift setf thrift
-endif
-
-if !has_key(g:polyglot_is_disabled, 'textile')
-  au BufNewFile,BufRead *.textile setf textile
-endif
-
-if !has_key(g:polyglot_is_disabled, 'terraform')
-  au BufNewFile,BufRead *.tf,*.tfvars setf terraform
-endif
-
-if !has_key(g:polyglot_is_disabled, 'tf')
-  au BufNewFile,BufRead *.tf,{.,}tfrc,tfrc setf tf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'systemd')
-  au BufNewFile,BufRead *.automount,*.dnssd,*.link,*.mount,*.netdev,*.network,*.nspawn,*.path,*.service,*.slice,*.socket,*.swap,*.target,*.timer,*/systemd/*.conf setf systemd
-  au BufNewFile,BufRead *.#* call s:StarSetf('systemd')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sxhkd')
-  au BufNewFile,BufRead *.sxhkdrc,sxhkdrc setf sxhkdrc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'swift')
-  au BufNewFile,BufRead *.swift setf swift
-endif
-
-if !has_key(g:polyglot_is_disabled, 'svg')
-  au BufNewFile,BufRead *.svg setf svg
-endif
-
-if !has_key(g:polyglot_is_disabled, 'svelte')
-  au BufNewFile,BufRead *.svelte setf svelte
-endif
-
-if !has_key(g:polyglot_is_disabled, 'stylus')
-  au BufNewFile,BufRead *.styl,*.stylus setf stylus
-endif
-
-if !has_key(g:polyglot_is_disabled, 'solidity')
-  au BufNewFile,BufRead *.sol setf solidity
-endif
-
-if !has_key(g:polyglot_is_disabled, 'smt2')
-  au BufNewFile,BufRead *.smt,*.smt2 setf smt2
-endif
-
-if !has_key(g:polyglot_is_disabled, 'slime')
-  au BufNewFile,BufRead *.slime setf slime
-endif
-
-if !has_key(g:polyglot_is_disabled, 'slim')
-  au BufNewFile,BufRead *.slim setf slim
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sh')
-  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile setf sh
-  au BufNewFile,BufRead *.zsh,*/etc/zprofile,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
-  au BufNewFile,BufRead .zsh* call s:StarSetf('zsh')
-  au BufNewFile,BufRead .zlog* call s:StarSetf('zsh')
-  au BufNewFile,BufRead .zcompdump* call s:StarSetf('zsh')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'scss')
-  au BufNewFile,BufRead *.scss setf scss
-endif
-
-if !has_key(g:polyglot_is_disabled, 'scala')
-  au BufNewFile,BufRead *.kojo,*.sc,*.scala setf scala
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rust')
-  au BufNewFile,BufRead *.rs,*.rs.in setf rust
-endif
-
-if !has_key(g:polyglot_is_disabled, 'brewfile')
-  au BufNewFile,BufRead Brewfile setf brewfile
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rspec')
-  au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ruby')
-  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Routefile,Snapfile,Thorfile,Vagrantfile,[Rr]antfile,buildfile,vagrantfile setf ruby
-  au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
-  au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml setf eruby
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rst')
-  au BufNewFile,BufRead *.rest,*.rest.txt,*.rst,*.rst.txt setf rst
-endif
-
-if !has_key(g:polyglot_is_disabled, 'reason')
-  au BufNewFile,BufRead,BufWritePost *.re call polyglot#detect#Re()
-  au BufNewFile,BufRead *.rei setf reason
-endif
-
-if !has_key(g:polyglot_is_disabled, 'razor')
-  au BufNewFile,BufRead *.cshtml,*.razor setf razor
-endif
-
-if !has_key(g:polyglot_is_disabled, 'raml')
-  au BufNewFile,BufRead *.raml setf raml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'raku')
-  au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
-  au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
-  au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
-  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 setf raku
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ragel')
-  au BufNewFile,BufRead *.rl setf ragel
-endif
-
-if !has_key(g:polyglot_is_disabled, 'racket')
-  au BufNewFile,BufRead *.rkt,*.rktd,*.rktl,*.scrbl setf racket
-endif
-
-if !has_key(g:polyglot_is_disabled, 'r-lang')
-  au BufNewFile,BufRead *.S,*.r,*.rsx,*.s,{.,}Rprofile,expr-dist setf r
-  au BufNewFile,BufRead *.rd setf rhelp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'qml')
-  au BufNewFile,BufRead *.qbs,*.qml setf qml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'qmake')
-  au BufNewFile,BufRead *.pri,*.pro setf qmake
-endif
-
-if !has_key(g:polyglot_is_disabled, 'requirements')
-  au BufNewFile,BufRead *.pip,*require.{txt,in},*requirements.{txt,in},constraints.{txt,in} setf requirements
-endif
-
-if !has_key(g:polyglot_is_disabled, 'python')
-  au BufNewFile,BufRead *.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.ptl,*.py,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,{.,}gclient,{.,}pythonrc,{.,}pythonstartup,DEPS,SConscript,SConstruct,Snakefile,wscript setf python
-endif
-
-if !has_key(g:polyglot_is_disabled, 'purescript')
-  au BufNewFile,BufRead *.purs setf purescript
-endif
-
-if !has_key(g:polyglot_is_disabled, 'puppet')
-  au BufNewFile,BufRead *.pp,Modulefile setf puppet
-  au BufNewFile,BufRead *.epp setf embeddedpuppet
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pug')
-  au BufNewFile,BufRead *.jade,*.pug setf pug
-endif
-
-if !has_key(g:polyglot_is_disabled, 'protobuf')
-  au BufNewFile,BufRead *.proto setf proto
-endif
-
-if !has_key(g:polyglot_is_disabled, 'powershell')
-  au BufNewFile,BufRead *.ps1,*.psd1,*.psm1,*.pssc setf ps1
-  au BufNewFile,BufRead *.ps1xml setf ps1xml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pony')
-  au BufNewFile,BufRead *.pony setf pony
-endif
-
-if !has_key(g:polyglot_is_disabled, 'plantuml')
-  au BufNewFile,BufRead *.iuml,*.plantuml,*.pu,*.puml,*.uml setf plantuml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pest')
-  au BufNewFile,BufRead *.pest setf pest
-endif
-
-if !has_key(g:polyglot_is_disabled, 'blade')
-  au BufNewFile,BufRead *.blade,*.blade.php setf blade
-endif
-
-if !has_key(g:polyglot_is_disabled, 'php')
-  au BufNewFile,BufRead *.aw,*.ctp,*.fcgi,*.inc,*.php,*.php3,*.php4,*.php5,*.php9,*.phps,*.phpt,*.phtml,{.,}php,{.,}php_cs,{.,}php_cs.dist,Phakefile setf php
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cql')
-  au BufNewFile,BufRead *.cql setf cql
-endif
-
-if !has_key(g:polyglot_is_disabled, 'pgsql')
-  au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
-endif
-
-if !has_key(g:polyglot_is_disabled, 'perl')
-  au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
-  au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
-  au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
-  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc setf perl
-  au BufNewFile,BufRead *.pod setf pod
-  au BufNewFile,BufRead *.comp,*.mason,*.mhtml setf mason
-  au BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
-  au BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
-  au BufNewFile,BufRead *.xs setf xs
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rc')
-  au BufNewFile,BufRead *.rc,*.rch setf rc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'opencl')
-  au BufNewFile,BufRead *.cl,*.opencl setf opencl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'octave')
-  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
-  au BufNewFile,BufRead *.oct setf octave
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ocaml')
-  au BufNewFile,BufRead *.eliom,*.eliomi,*.ml,*.ml.cppo,*.ml4,*.mli,*.mli.cppo,*.mlip,*.mll,*.mlp,*.mlt,*.mly,{.,}ocamlinit setf ocaml
-  au BufNewFile,BufRead *.om,OMakefile,OMakeroot,OMakeroot.in setf omake
-  au BufNewFile,BufRead *.opam,*.opam.template,opam setf opam
-  au BufNewFile,BufRead _oasis setf oasis
-  au BufNewFile,BufRead dune,dune-project,dune-workspace,jbuild setf dune
-  au BufNewFile,BufRead _tags setf ocamlbuild_tags
-  au BufNewFile,BufRead *.ocp setf ocpbuild
-  au BufNewFile,BufRead *.root setf ocpbuildroot
-  au BufNewFile,BufRead *.sexp setf sexplib
-endif
-
-if !has_key(g:polyglot_is_disabled, 'objc')
-  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
-  au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
-endif
-
-if !has_key(g:polyglot_is_disabled, 'nix')
-  au BufNewFile,BufRead *.nix setf nix
-endif
-
-if !has_key(g:polyglot_is_disabled, 'nim')
-  au BufNewFile,BufRead *.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg setf nim
-endif
-
-if !has_key(g:polyglot_is_disabled, 'nginx')
-  au BufNewFile,BufRead *.nginx,*.nginxconf,*.vhost,*/nginx/*.conf,*nginx.conf,nginx*.conf,nginx.conf setf nginx
-  au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
-  au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'murphi')
-  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
-endif
-
-if !has_key(g:polyglot_is_disabled, 'moonscript')
-  au BufNewFile,BufRead *.moon setf moon
-endif
-
-if !has_key(g:polyglot_is_disabled, 'meson')
-  au BufNewFile,BufRead meson.build,meson_options.txt setf meson
-  au BufNewFile,BufRead *.wrap setf dosini
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mdx')
-  au BufNewFile,BufRead *.mdx setf markdown.mdx
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mathematica')
-  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
-  au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt setf mma
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mako')
-  au BufNewFile,BufRead *.mako,*.mao setf mako
-  au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-endif
-
-if !has_key(g:polyglot_is_disabled, 'm4')
-  au BufNewFile,BufRead *.at,*.m4 setf m4
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lua')
-  au BufNewFile,BufRead *.fcgi,*.lua,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,{.,}luacheckrc setf lua
-endif
-
-if !has_key(g:polyglot_is_disabled, 'log')
-  au BufNewFile,BufRead *.LOG,*.log,*_LOG,*_log setf log
-endif
-
-if !has_key(g:polyglot_is_disabled, 'llvm')
-  au BufNewFile,BufRead *.ll setf llvm
-  au BufNewFile,BufRead *.td setf tablegen
-endif
-
-if !has_key(g:polyglot_is_disabled, 'livescript')
-  au BufNewFile,BufRead *._ls,*.ls,Slakefile setf livescript
-endif
-
-if !has_key(g:polyglot_is_disabled, 'lilypond')
-  au BufNewFile,BufRead *.ily,*.ly setf lilypond
-endif
-
-if !has_key(g:polyglot_is_disabled, 'less')
-  au BufNewFile,BufRead *.less setf less
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ledger')
-  au BufNewFile,BufRead *.journal,*.ldg,*.ledger setf ledger
-endif
-
-if !has_key(g:polyglot_is_disabled, 'kotlin')
-  au BufNewFile,BufRead *.kt,*.ktm,*.kts setf kotlin
-endif
-
-if !has_key(g:polyglot_is_disabled, 'julia')
-  au BufNewFile,BufRead *.jl setf julia
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jst')
-  au BufNewFile,BufRead *.ect,*.ejs,*.jst setf jst
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jsonnet')
-  au BufNewFile,BufRead *.jsonnet,*.libsonnet setf jsonnet
-endif
-
-if !has_key(g:polyglot_is_disabled, 'json')
-  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
-endif
-
-if !has_key(g:polyglot_is_disabled, 'json5')
-  au BufNewFile,BufRead *.json5 setf json5
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jq')
-  au BufNewFile,BufRead *.jq,{.,}jqrc setf jq
-  au BufNewFile,BufRead .jqrc* call s:StarSetf('jq')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'htmldjango')
-  au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk setf htmldjango
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jenkins')
-  au BufNewFile,BufRead *.Jenkinsfile,*.jenkinsfile,Jenkinsfile setf Jenkinsfile
-  au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ion')
-  au BufNewFile,BufRead *.ion,~/.config/ion/initrc setf ion
-endif
-
-if !has_key(g:polyglot_is_disabled, 'idris2')
-  au BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
-  au BufNewFile,BufRead *.ipkg,idris-response setf idris2
-  au BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
-endif
-
-if !has_key(g:polyglot_is_disabled, 'idris')
-  au BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
-  au BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
-  au BufNewFile,BufRead idris-response setf idris
-endif
-
-if !has_key(g:polyglot_is_disabled, 'icalendar')
-  au BufNewFile,BufRead *.ics setf icalendar
-endif
-
-if !has_key(g:polyglot_is_disabled, 'i3')
-  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config setf i3config
-endif
-
-if !has_key(g:polyglot_is_disabled, 'hive')
-  au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
-endif
-
-if !has_key(g:polyglot_is_disabled, 'hcl')
-  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile setf hcl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'haxe')
-  au BufNewFile,BufRead *.hx,*.hxsl setf haxe
-endif
-
-if !has_key(g:polyglot_is_disabled, 'haskell')
-  au BufNewFile,BufRead *.bpk,*.hs,*.hs-boot,*.hsc,*.hsig setf haskell
-endif
-
-if !has_key(g:polyglot_is_disabled, 'haproxy')
-  au BufNewFile,BufRead haproxy*.conf* call s:StarSetf('haproxy')
-  au BufNewFile,BufRead haproxy*.cfg* call s:StarSetf('haproxy')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'handlebars')
-  au BufNewFile,BufRead *.hjs,*.hogan,*.hulk,*.mustache setf html.mustache
-  au BufNewFile,BufRead *.handlebars,*.hb,*.hbs,*.hdbs setf html.handlebars
-endif
-
-if !has_key(g:polyglot_is_disabled, 'haml')
-  au BufNewFile,BufRead *.haml,*.haml.deface,*.hamlbars,*.hamlc setf haml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'grub')
-  au BufNewFile,BufRead */boot/grub/grub.conf,*/boot/grub/menu.lst,*/etc/grub.conf setf grub
-endif
-
-if !has_key(g:polyglot_is_disabled, 'groovy')
-  au BufNewFile,BufRead *.gradle,*.groovy,*.grt,*.gtpl,*.gvy,Jenkinsfile setf groovy
-endif
-
-if !has_key(g:polyglot_is_disabled, 'graphql')
-  au BufNewFile,BufRead *.gql,*.graphql,*.graphqls setf graphql
-endif
-
-if !has_key(g:polyglot_is_disabled, 'jsx')
-  au BufNewFile,BufRead *.jsx setf javascriptreact
-endif
-
-if !has_key(g:polyglot_is_disabled, 'javascript')
-  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
-  au BufNewFile,BufRead *.flow setf flow
-endif
-
-if !has_key(g:polyglot_is_disabled, 'go')
-  au BufNewFile,BufRead *.go setf go
-  au BufNewFile,BufRead go.mod setf gomod
-  au BufNewFile,BufRead *.tmpl setf gohtmltmpl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gnuplot')
-  au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt setf gnuplot
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gmpl')
-  au BufNewFile,BufRead *.mod setf gmpl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'glsl')
-  au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
-  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'git')
-  au BufNewFile,BufRead *.gitconfig,*.git/config,*.git/modules/*/config,*/.config/git/config,*/git/config,{.,}gitconfig,{.,}gitmodules setf gitconfig
-  au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
-  au BufNewFile,BufRead git-rebase-todo setf gitrebase
-  au BufNewFile,BufRead .gitsendemail.* call s:StarSetf('gitsendemail')
-  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
-endif
-
-if !has_key(g:polyglot_is_disabled, 'gdscript')
-  au BufNewFile,BufRead *.gd setf gdscript3
-endif
-
-if !has_key(g:polyglot_is_disabled, 'fsharp')
-  au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
-  au BufNewFile,BufRead *.fsi,*.fsx setf fsharp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'forth')
-  au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
-  au BufNewFile,BufRead *.ft,*.fth setf forth
-endif
-
-if !has_key(g:polyglot_is_disabled, 'flatbuffers')
-  au BufNewFile,BufRead *.fbs setf fbs
-endif
-
-if !has_key(g:polyglot_is_disabled, 'fish')
-  au BufNewFile,BufRead *.fish setf fish
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ferm')
-  au BufNewFile,BufRead *.ferm,ferm.conf setf ferm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'fennel')
-  au BufNewFile,BufRead *.fnl setf fennel
-endif
-
-if !has_key(g:polyglot_is_disabled, 'erlang')
-  au BufNewFile,BufRead *.app,*.app.src,*.erl,*.es,*.escript,*.hrl,*.xrl,*.yaws,*.yrl,Emakefile,rebar.config,rebar.config.lock,rebar.lock setf erlang
-endif
-
-if !has_key(g:polyglot_is_disabled, 'emblem')
-  au BufNewFile,BufRead *.em,*.emblem setf emblem
-endif
-
-if !has_key(g:polyglot_is_disabled, 'emberscript')
-  au BufNewFile,BufRead *.em,*.emberscript setf ember-script
-endif
-
-if !has_key(g:polyglot_is_disabled, 'elm')
-  au BufNewFile,BufRead *.elm setf elm
-endif
-
-if !has_key(g:polyglot_is_disabled, 'elixir')
-  au BufNewFile,BufRead *.ex,*.exs,mix.lock setf elixir
-  au BufNewFile,BufRead *.eex,*.html.leex,*.leex setf eelixir
-endif
-
-if !has_key(g:polyglot_is_disabled, 'docker-compose')
-  au BufNewFile,BufRead docker-compose*.yaml,docker-compose*.yml setf yaml.docker-compose
-endif
-
-if !has_key(g:polyglot_is_disabled, 'yaml')
-  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock setf yaml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'mysql')
-  au BufNewFile,BufRead *.mysql setf mysql
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sed')
-  au BufNewFile,BufRead *.sed setf sed
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dlang')
-  au BufNewFile,BufRead *.d,*.di setf d
-  au BufNewFile,BufRead *.lst setf dcov
-  au BufNewFile,BufRead *.dd setf dd
-  au BufNewFile,BufRead *.ddoc setf ddoc
-  au BufNewFile,BufRead *.sdl setf dsdl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dhall')
-  au BufNewFile,BufRead *.dhall setf dhall
-endif
-
-if !has_key(g:polyglot_is_disabled, 'dart')
-  au BufNewFile,BufRead *.dart,*.drt setf dart
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cue')
-  au BufNewFile,BufRead *.cue setf cuesheet
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cucumber')
-  au BufNewFile,BufRead *.feature,*.story setf cucumber
-endif
-
-if !has_key(g:polyglot_is_disabled, 'crystal')
-  au BufNewFile,BufRead *.cr,Projectfile setf crystal
-  au BufNewFile,BufRead *.ecr setf ecrystal
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cryptol')
-  au BufNewFile,BufRead *.cry,*.cyl,*.lcry,*.lcyl setf cryptol
-endif
-
-if !has_key(g:polyglot_is_disabled, 'coffee-script')
-  au BufNewFile,BufRead *._coffee,*.cake,*.cjsx,*.coffee,*.coffeekup,*.cson,*.iced,Cakefile setf coffee
-  au BufNewFile,BufRead *.coffee.md,*.litcoffee setf litcoffee
-endif
-
-if !has_key(g:polyglot_is_disabled, 'markdown')
-  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr setf markdown
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cmake')
-  au BufNewFile,BufRead *.cmake,*.cmake.in,CMakeLists.txt setf cmake
-endif
-
-if !has_key(g:polyglot_is_disabled, 'clojure')
-  au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config setf clojure
-endif
-
-if !has_key(g:polyglot_is_disabled, 'carp')
-  au BufNewFile,BufRead *.carp setf carp
-endif
-
-if !has_key(g:polyglot_is_disabled, 'caddyfile')
-  au BufNewFile,BufRead Caddyfile setf caddyfile
-endif
-
-if !has_key(g:polyglot_is_disabled, 'awk')
-  au BufNewFile,BufRead *.awk,*.gawk setf awk
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ave')
-  au BufNewFile,BufRead *.ave setf ave
-endif
-
-if !has_key(g:polyglot_is_disabled, 'autoit')
-  au BufNewFile,BufRead *.au3 setf autoit
-endif
-
-if !has_key(g:polyglot_is_disabled, 'atlas')
-  au BufNewFile,BufRead *.as,*.atl setf atlas
-endif
-
-if !has_key(g:polyglot_is_disabled, 'aspperl')
-  au BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
-endif
-
-if !has_key(g:polyglot_is_disabled, 'aspvbs')
-  au BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
-  au BufNewFile,BufRead,BufWritePost *.asa call polyglot#detect#Asa()
-endif
-
-if !has_key(g:polyglot_is_disabled, 'asn')
-  au BufNewFile,BufRead *.asn,*.asn1 setf asn
-endif
-
-if !has_key(g:polyglot_is_disabled, 'automake')
-  au BufNewFile,BufRead GNUmakefile.am,[mM]akefile.am setf automake
-endif
-
-if !has_key(g:polyglot_is_disabled, 'elf')
-  au BufNewFile,BufRead *.am setf elf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'make')
-  au BufNewFile,BufRead *.dsp,*.mak,*.mk,*[mM]akefile setf make
-endif
-
-if !has_key(g:polyglot_is_disabled, 'autohotkey')
-  au BufNewFile,BufRead *.ahk,*.ahkl setf autohotkey
-endif
-
-if !has_key(g:polyglot_is_disabled, 'asciidoc')
-  au BufNewFile,BufRead *.adoc,*.asc,*.asciidoc setf asciidoc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'art')
-  au BufNewFile,BufRead *.art setf art
-endif
-
-if !has_key(g:polyglot_is_disabled, 'arduino')
-  au BufNewFile,BufRead *.ino,*.pde setf arduino
-endif
-
-if !has_key(g:polyglot_is_disabled, 'c/c++')
-  au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
-  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp setf cpp
-  au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
-  au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
-endif
-
-if !has_key(g:polyglot_is_disabled, 'arch')
-  au BufNewFile,BufRead {.,}arch-inventory,=tagging-method setf arch
-endif
-
-if !has_key(g:polyglot_is_disabled, 'aptconf')
-  au BufNewFile,BufRead */.aptitude/config,*/etc/apt/apt.conf.d/*.conf,apt.conf setf aptconf
-  au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'applescript')
-  au BufNewFile,BufRead *.applescript,*.scpt setf applescript
-endif
-
-if !has_key(g:polyglot_is_disabled, 'apiblueprint')
-  au BufNewFile,BufRead *.apib setf apiblueprint
-endif
-
-if !has_key(g:polyglot_is_disabled, 'apache')
-  au BufNewFile,BufRead */etc/apache2/sites-*/*.com,*/etc/httpd/*.conf,{.,}htaccess setf apache
-  au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead apache.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead access.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/sites-*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/mods-*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/conf.*/* call s:StarSetf('apache')
-  au BufNewFile,BufRead */etc/apache2/*.conf* call s:StarSetf('apache')
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ant')
-  au BufNewFile,BufRead build.xml setf ant
-endif
-
-if !has_key(g:polyglot_is_disabled, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'csv')
-  au BufNewFile,BufRead *.csv,*.tab,*.tsv setf csv
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ampl')
-  " AMPL
-  au BufNewFile,BufRead *.run setf ampl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'aml')
-  au BufNewFile,BufRead *.aml setf aml
-endif
-
-if !has_key(g:polyglot_is_disabled, 'alsaconf')
-  au BufNewFile,BufRead */etc/asound.conf,*/usr/share/alsa/alsa.conf,{.,}asoundrc setf alsaconf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'conf')
-  au BufNewFile,BufRead *.conf,*/etc/hosts,auto.master,config setf conf
-endif
-
-if !has_key(g:polyglot_is_disabled, 'master')
-  au BufNewFile,BufRead *.mas,*.master setf master
-endif
-
-if !has_key(g:polyglot_is_disabled, 'aidl')
-  " AIDL
-  au BufNewFile,BufRead *.aidl setf aidl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ahdl')
-  " AHDL
-  au BufNewFile,BufRead *.tdf setf ahdl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'ada')
-  " Ada (83, 9X, 95)
-  au BufNewFile,BufRead *.ada,*.ada_m,*.adb,*.adc,*.ads,*.gpr setf ada
-endif
-
-if !has_key(g:polyglot_is_disabled, 'acpiasl')
-  au BufNewFile,BufRead *.asl,*.dsl setf asl
-endif
-
-if !has_key(g:polyglot_is_disabled, 'acedb')
-  " AceDB
-  au BufNewFile,BufRead *.wrm setf acedb
-endif
-
-if !has_key(g:polyglot_is_disabled, 'abel')
-  " ABEL
-  au BufNewFile,BufRead *.abl setf abel
-endif
-
-if !has_key(g:polyglot_is_disabled, 'abc')
-  " ABC music notation
-  au BufNewFile,BufRead *.abc setf abc
-endif
-
-if !has_key(g:polyglot_is_disabled, 'abaqus')
-  au BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
-endif
-
-if !has_key(g:polyglot_is_disabled, 'abap')
-  " ABAB/4
-  au BufNewFile,BufRead *.abap setf abap
-endif
-
-if !has_key(g:polyglot_is_disabled, 'aap')
-  " A-A-P recipe
-  au BufNewFile,BufRead *.aap setf aap
-endif
-
-if !has_key(g:polyglot_is_disabled, 'a65')
-  " XA65 MOS6510 cross assembler
-  au BufNewFile,BufRead *.a65 setf a65
-endif
-
-if !has_key(g:polyglot_is_disabled, 'a2ps')
-  au BufNewFile,BufRead */etc/a2ps.cfg,*/etc/a2ps/*.cfg,{.,}a2psrc,a2psrc setf a2ps
-endif
-
-if !has_key(g:polyglot_is_disabled, 'cfg')
-  au BufNewFile,BufRead *.cfg,*.hgrc,*hgrc setf cfg
-endif
-
-if !has_key(g:polyglot_is_disabled, '8th')
-  " 8th (Firth-derivative)
-  au BufNewFile,BufRead *.8th setf 8th
-endif
-
-
-" DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
-
-func! s:Observe(fn)
-  let b:PolyglotObserve = function("polyglot#" . a:fn)
-  augroup polyglot-observer
-    au!
-    au CursorHold,CursorHoldI <buffer> call b:PolyglotObserve()
-  augroup END
-endfunc
-
-au BufNewFile,BufRead,StdinReadPost,BufWritePost * if (&ft == "" || &ft == "conf") && expand("<afile>:e") == "" |
-  \ call polyglot#shebang#Detect() | endif
-
-au BufWinEnter * if &ft == "" && expand("<afile>:e") == "" |
-  \ call s:Observe('shebang#Detect') | endif
-
-au BufWritePost * au! polyglot-observer
-
-augroup END
-
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sensible')
-  " Use 2-spaces tab indentation by default
-  if &tabstop == 8
-    let &tabstop = 2
-  endif
-
-  " Set shiftwidth to proper value as users often mix it with tabstop
-  if &shiftwidth > &tabstop
-    let &shiftwidth = &tabstop
-  endif
-
-  " Use utf-8 encoding by default
-  set encoding=utf-8
-
-  " Reload unchanged files automatically.
-  set autoread
-
-  " This is needed to avoid swapfile warning when auto-reloading
-  set shortmess+=A
-
-  " Avoids swapfiles in current directory
-  if &directory =~# '^\.,'
-    if !empty($HOME)
-      if has('win32')
-        let &directory = expand('$HOME/vimfiles') . '//,' . &directory
-      else
-        let &directory = expand('$HOME/.vim') . '//,' . &directory
-      endif
-    endif
-    if !empty($XDG_DATA_HOME)
-      let &directory = expand('$XDG_DATA_HOME') . '//,' . &directory
-    endif
-    if has('macunix')
-      let &directory = expand('$HOME/Library/Autosave Information') . '//,' . &directory
-    endif
-  endif
-
-  " Autoindent when starting new line, or using `o` or `O`.
-  set autoindent
-endif
-
-if !has_key(g:polyglot_is_disabled, 'autoindent')
-  " Code below re-implements sleuth for vim-polyglot
-  let g:loaded_sleuth = 1
-
-  let s:default_shiftwidth = &shiftwidth
-
-  func! s:get_shiftwidth(indents) abort
-    let shiftwidth = 0
-    let max_count = 0
-    let final_counts = {}
-    for [indent, indent_count] in items(a:indents)
-      let indent_count = indent_count * 1.5
-      for [indent2, indent2_count] in items(a:indents)
-        if indent2 > indent && indent2 % indent == 0
-          let indent_count = indent_count + indent2_count
-        endif
-      endfor
-      let final_counts[indent] = indent_count
-    endfor
-    for [indent, final_count] in items(final_counts)
-      if final_count > max_count
-        let shiftwidth = indent
-        let max_count = final_count
-      endif
-    endfor
-    return shiftwidth
-  endfunc
-
-  func! s:guess(lines) abort
-    let options = {}
-    let ccomment = 0
-    let podcomment = 0
-    let triplequote = 0
-    let backtick = 0
-    let xmlcomment = 0
-    let heredoc = ''
-    let minindent = 10
-    let spaces_minus_tabs = 0
-    let lineno = 0
-    let stack = [0]
-    let indents = { '2': 0, '3': 0, '4': 0, '6': 0, '8': 0 }
-
-    for line in a:lines
-      let lineno += 1
-
-      if line =~# '^\s*$'
-        continue
-      endif
-
-      if line =~# '^\s*/\*'
-        let ccomment = 1
-      endif
-      if ccomment
-        if line =~# '\*/'
-          let ccomment = 0
-        endif
-        continue
-      endif
-
-      if line =~# '^=\w'
-        let podcomment = 1
-      endif
-      if podcomment
-        if line =~# '^=\%(end\|cut\)\>'
-          let podcomment = 0
-        endif
-        continue
-      endif
-
-      if triplequote
-        if line =~# '^[^"]*"""[^"]*$'
-          let triplequote = 0
-        endif
-        continue
-      elseif line =~# '^[^"]*"""[^"]*$'
-        let triplequote = 1
-      endif
-
-      if backtick
-        if line =~# '^[^`]*`[^`]*$'
-          let backtick = 0
-        endif
-        continue
-      elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
-        let backtick = 1
-      endif
-
-      if line =~# '^\s*<\!--'
-        let xmlcomment = 1
-      endif
-      if xmlcomment
-        if line =~# '-->'
-          let xmlcomment = 0
-        endif
-        continue
-      endif
-
-      " This is correct order because both "<<EOF" and "EOF" matches end
-      if heredoc != ''
-        if line =~# heredoc
-          let heredoc = ''
-        endif
-        continue
-      endif
-      let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
-      if len(herematch) > 0
-        let heredoc = herematch[1] . '$'
-      endif
-
-      if line[0] == "\t"
-        let spaces_minus_tabs -= 1
-      else
-        if line[0] == " "
-          let spaces_minus_tabs += 1
-        endif
-        let indent = len(matchstr(line, '^ *'))
-        while stack[-1] > indent
-          call remove(stack, -1)
-        endwhile
-
-        let indent_inc = indent - stack[-1]
-
-        if indent_inc == 0 && len(stack) > 1
-          let indent_inc = indent - stack[-2]
-        endif
-
-        if has_key(indents, indent_inc)
-          let indents[indent_inc] += 1
-          let prev_indent = indent
-        endif
-
-        if stack[-1] != indent
-          call add(stack, indent)
-        endif
-      endif
-    endfor
-
-    if spaces_minus_tabs < 0
-      setlocal noexpandtab
-      let &l:shiftwidth=&tabstop
-      return 1
-    endif
-
-    let shiftwidth = s:get_shiftwidth(indents)
-
-    if shiftwidth > 0
-      setlocal expandtab
-      let &l:shiftwidth=shiftwidth
-      try
-        " Sunchronize tabstop with shiftwidth
-        let &l:softtabstop = -1
-      catch /^Vim\%((\a\+)\)\=:E487/
-        " -1 was not supported before Vim 7.4
-        let &l:softtabstop = a:num_spaces
-      endtry
-      return 1
-    endif
-
-    return 0
-  endfunc
-
-  func! s:detect_indent() abort
-    if &buftype ==# 'help'
-      return
-    endif
-
-    " Do not autodetect indent if language or user sets it
-    if &l:shiftwidth != s:default_shiftwidth
-      return
-    endif
-
-    let b:sleuth_culprit = expand("<afile>:p")
-    if s:guess(getline(1, 128))
-      return
-    endif
-    if s:guess(getline(1, 1024))
-      return
-    endif
-    let pattern = polyglot#sleuth#GlobForFiletype(&filetype)
-    if len(pattern) == 0
-      return
-    endif
-    let pattern = '{' . pattern . ',.git,.svn,.hg}'
-    let dir = expand('%:p:h')
-    let level = 3
-    while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
-      " Ignore files from homedir and root 
-      if dir == expand('~') || dir == '/'
-        unlet b:sleuth_culprit
-        return
-      endif
-      for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
-        let b:sleuth_culprit = neighbor
-        " Do not consider directories above .git, .svn or .hg
-        if fnamemodify(neighbor, ":h:t")[0] == "."
-          let level = 0
-          continue
-        endif
-        if neighbor !=# expand('%:p') && filereadable(neighbor)
-          if s:guess(readfile(neighbor, '', 32))
-            return
-          endif
-        endif
-      endfor
-
-      let dir = fnamemodify(dir, ':h')
-      let level -= 1
-    endwhile
-
-    let b:sleuth_culprit = "default"
-  endfunc
-
-  set smarttab
-
-  func! SleuthIndicator() abort
-    let sw = &shiftwidth ? &shiftwidth : &tabstop
-    if &expandtab
-      return 'sw='.sw
-    elseif &tabstop == sw
-      return 'ts='.&tabstop
-    else
-      return 'sw='.sw.',ts='.&tabstop
-    endif
-  endfunc
-
-  augroup polyglot-sleuth
-    au!
-    au BufEnter * call s:detect_indent()
-    au User Flags call Hoist('buffer', 5, 'SleuthIndicator')
-  augroup END
-
-  command! -bar -bang Sleuth call s:detect_indent()
-endif
-
-augroup filetypedetect
-
-" Ignored extensions
-if exists("*fnameescape")
-au BufNewFile,BufRead ?\+.orig,?\+.bak,?\+.old,?\+.new,?\+.dpkg-dist,?\+.dpkg-old,?\+.dpkg-new,?\+.dpkg-bak,?\+.rpmsave,?\+.rpmnew,?\+.pacsave,?\+.pacnew
-	\ exe "doau filetypedetect BufRead " . fnameescape(expand("<afile>:r"))
-au BufNewFile,BufRead *~
-	\ let s:name = expand("<afile>") |
-	\ let s:short = substitute(s:name, '\~$', '', '') |
-	\ if s:name != s:short && s:short != "" |
-	\   exe "doau filetypedetect BufRead " . fnameescape(s:short) |
-	\ endif |
-	\ unlet! s:name s:short
-au BufNewFile,BufRead ?\+.in
-	\ if expand("<afile>:t") != "configure.in" |
-	\   exe "doau filetypedetect BufRead " . fnameescape(expand("<afile>:r")) |
-	\ endif
-elseif &verbose > 0
-  echomsg "Warning: some filetypes will not be recognized because this version of Vim does not have fnameescape()"
-endif
-
-" Pattern used to match file names which should not be inspected.
-" Currently finds compressed files.
-if !exists("g:ft_ignore_pat")
-  let g:ft_ignore_pat = '\.\(Z\|gz\|bz2\|zip\|tgz\)$'
-endif
-
-" *.cmd is close to a Batch file, but on OS/2 Rexx files also use *.cmd.
-au BufNewFile,BufRead *.cmd
-	\ if getline(1) =~ '^/\*' | setf rexx | else | setf dosbatch | endif
-
-" Batch file for 4DOS
-au BufNewFile,BufRead *.btm			call polyglot#ft#FTbtm()
-
-" BIND zone
-au BufNewFile,BufRead *.db			call polyglot#ft#BindzoneCheck('')
-
-" C or lpc
-au BufNewFile,BufRead *.c			call polyglot#ft#FTlpc()
-
-" Cynlib
-" .cc and .cpp files can be C++ or Cynlib.
-au BufNewFile,BufRead *.cpp if exists("cynlib_syntax_for_cpp")|setf cynlib|else|setf cpp|endif
-
-au BufNewFile,BufRead *.h			call polyglot#ft#FTheader()
-
-au BufNewFile,BufRead [cC]hange[lL]og
-	\  if getline(1) =~ '; urgency='
-	\|   setf debchangelog
-	\| else
-	\|   setf changelog
-	\| endif
-
-au BufNewFile,BufRead NEWS
-	\  if getline(1) =~ '; urgency='
-	\|   setf debchangelog
-	\| endif
-
-" Changes for WEB and CWEB or CHILL
-au BufNewFile,BufRead *.ch			call polyglot#ft#FTchange()
-
-" Clever or dtd
-au BufNewFile,BufRead *.ent			call polyglot#ft#FTent()
-
-" Clipper (or FoxPro; could also be eviews)
-au BufNewFile,BufRead *.prg
-	\ if exists("g:filetype_prg") |
-	\   exe "setf " . g:filetype_prg |
-	\ else |
-	\   setf clipper |
-	\ endif
-
-au BufNewFile,BufRead *.cpy
-	\ if getline(1) =~ '^##' |
-	\   setf python |
-	\ else |
-	\   setf cobol |
-	\ endif
-
-" Euphoria 3 or 4
-au BufNewFile,BufRead *.eu,*.ew,*.ex,*.exu,*.exw  call polyglot#ft#EuphoriaCheck()
-if has("fname_case")
-   au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW  call polyglot#ft#EuphoriaCheck()
-endif
-
-au BufNewFile,BufRead control
-	\  if getline(1) =~ '^Source:'
-	\|   setf debcontrol
-	\| endif
-
-au BufNewFile,BufRead copyright
-	\  if getline(1) =~ '^Format:'
-	\|   setf debcopyright
-	\| endif
-
-" the D language or dtrace
-au BufNewFile,BufRead *.d			call polyglot#ft#DtraceCheck()
-
-au BufNewFile,BufRead *.patch
-	\ if getline(1) =~ '^From [0-9a-f]\{40\} Mon Sep 17 00:00:00 2001$' |
-	\   setf gitsendemail |
-	\ else |
-	\   setf diff |
-	\ endif
-
-" Diva (with Skill) or InstallShield
-au BufNewFile,BufRead *.rul
-	\ if getline(1).getline(2).getline(3).getline(4).getline(5).getline(6) =~? 'InstallShield' |
-	\   setf ishd |
-	\ else |
-	\   setf diva |
-	\ endif
-
-" DCL (Digital Command Language - vms) or DNS zone file
-au BufNewFile,BufRead *.com			call polyglot#ft#BindzoneCheck('dcl')
-
-au BufNewFile,BufRead *.edn
-	\ if getline(1) =~ '^\s*(\s*edif\>' |
-	\   setf edif |
-	\ else |
-	\   setf clojure |
-	\ endif
-
-" Eiffel or Specman or Euphoria
-au BufNewFile,BufRead *.e,*.E			call polyglot#ft#FTe()
-
-if !empty($XDG_CONFIG_HOME)
-  au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config		setf gitconfig
-endif
-
-au BufNewFile,BufRead .msg.[0-9]*
-      \ if getline(1) =~ '^From.*# This line is ignored.$' |
-      \   setf gitsendemail |
-      \ endif
-au BufNewFile,BufRead *.git/*
-      \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
-      \   setf git |
-      \ endif
-
-if !empty($GNUPGHOME)
-  au BufNewFile,BufRead $GNUPGHOME/options	setf gpg
-  au BufNewFile,BufRead $GNUPGHOME/gpg.conf	setf gpg
-endif
-
-" HTML (.shtml and .stm for server side)
-au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm  call polyglot#ft#FThtml()
-
-" IDL (Interface Description Language)
-au BufNewFile,BufRead *.idl			call polyglot#ft#FTidl()
-
-au BufNewFile,BufRead indent.pro		call polyglot#ft#ProtoCheck('indent')
-
-" IDL (Interactive Data Language)
-au BufNewFile,BufRead *.pro			call polyglot#ft#ProtoCheck('idlang')
-
-" M4
-au BufNewFile,BufRead *.m4
-	\ if expand("<afile>") !~? 'html.m4$\|fvwm2rc' | setf m4 | endif
-
-" Mathematica, Matlab, Murphi or Objective C
-au BufNewFile,BufRead *.m			call polyglot#ft#FTm()
-
-" MMIX or VMS makefile
-au BufNewFile,BufRead *.mms			call polyglot#ft#FTmms()
-
-" Modsim III (or LambdaProlog)
-au BufNewFile,BufRead *.mod
-	\ if getline(1) =~ '\<module\>' |
-	\   setf lprolog |
-	\ else |
-	\   setf modsim3 |
-	\ endif
-
-" Mutt setup files (must be before catch *.rc)
-au BufNewFile,BufRead */etc/Muttrc.d/*		call s:StarSetf('muttrc')
-
-" Nroff/Troff (*.ms and *.t are checked below)
-au BufNewFile,BufRead *.me
-	\ if expand("<afile>") != "read.me" && expand("<afile>") != "click.me" |
-	\   setf nroff |
-	\ endif
-au BufNewFile,BufRead *.[1-9]			call polyglot#ft#FTnroff()
-
-" Nroff or Objective C++
-au BufNewFile,BufRead *.mm			call polyglot#ft#FTmm()
-
-" Pacman hooks
-au BufNewFile,BufRead *.hook
-	\ if getline(1) == '[Trigger]' |
-	\   setf dosini |
-	\ endif
-
-" Perl
-au BufNewFile,BufRead *.pl			call polyglot#ft#FTpl()
-
-" Perl, XPM or XPM2
-au BufNewFile,BufRead *.pm
-	\ if getline(1) =~ "XPM2" |
-	\   setf xpm2 |
-	\ elseif getline(1) =~ "XPM" |
-	\   setf xpm |
-	\ else |
-	\   setf perl |
-	\ endif
-
-" Povray, PHP or assembly
-au BufNewFile,BufRead *.inc			call polyglot#ft#FTinc()
-
-" Printcap and Termcap
-au BufNewFile,BufRead *printcap
-	\ let b:ptcap_type = "print" | setf ptcap
-au BufNewFile,BufRead *termcap
-	\ let b:ptcap_type = "term" | setf ptcap
-
-" Progress or CWEB
-au BufNewFile,BufRead *.w			call polyglot#ft#FTprogress_cweb()
-
-" Progress or assembly
-au BufNewFile,BufRead *.i			call polyglot#ft#FTprogress_asm()
-
-" Progress or Pascal
-au BufNewFile,BufRead *.p			call polyglot#ft#FTprogress_pascal()
-
-" Software Distributor Product Specification File (POSIX 1387.2-1995)
-au BufNewFile,BufRead INDEX,INFO
-	\ if getline(1) =~ '^\s*\(distribution\|installed_software\|root\|bundle\|product\)\s*$' |
-	\   setf psf |
-	\ endif
-
-" Registry for MS-Windows
-au BufNewFile,BufRead *.reg
-	\ if getline(1) =~? '^REGEDIT[0-9]*\s*$\|^Windows Registry Editor Version \d*\.\d*\s*$' | setf registry | endif
-
-" Rexx, Rebol or R
-au BufNewFile,BufRead *.r,*.R				call polyglot#ft#FTr()
-
-" Sendmail .mc files are actually m4.  Could also be MS Message text file.
-au BufNewFile,BufRead *.mc			call polyglot#ft#McSetf()
-
-" SGML
-au BufNewFile,BufRead *.sgm,*.sgml
-	\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'linuxdoc' |
-	\   setf sgmllnx |
-	\ elseif getline(1) =~ '<!DOCTYPE.*DocBook' || getline(2) =~ '<!DOCTYPE.*DocBook' |
-	\   let b:docbk_type = "sgml" |
-	\   let b:docbk_ver = 4 |
-	\   setf docbk |
-	\ else |
-	\   setf sgml |
-	\ endif
-
-" SGMLDECL
-au BufNewFile,BufRead *.decl,*.dcl,*.dec
-	\ if getline(1).getline(2).getline(3) =~? '^<!SGML' |
-	\    setf sgmldecl |
-	\ endif
-
-" Shell scripts (sh, ksh, bash, bash2, csh); Allow .profile_foo etc.
-" Gentoo ebuilds and Arch Linux PKGBUILDs are actually bash scripts
-" NOTE: Patterns ending in a star are further down, these have lower priority.
-au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD call polyglot#ft#SetFileTypeSH("bash")
-au BufNewFile,BufRead .kshrc,*.ksh call polyglot#ft#SetFileTypeSH("ksh")
-au BufNewFile,BufRead */etc/profile,.profile,*.sh,*.env call polyglot#ft#SetFileTypeSH(getline(1))
-
-
-" Shell script (Arch Linux) or PHP file (Drupal)
-au BufNewFile,BufRead *.install
-	\ if getline(1) =~ '<?php' |
-	\   setf php |
-	\ else |
-	\   call polyglot#ft#SetFileTypeSH("bash") |
-	\ endif
-
-" tcsh scripts (patterns ending in a star further below)
-au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login	call polyglot#ft#SetFileTypeShell("tcsh")
-
-" csh scripts, but might also be tcsh scripts (on some systems csh is tcsh)
-" (patterns ending in a start further below)
-au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias  call polyglot#ft#CSH()
-
-au BufNewFile,BufRead *.cls
-	\ if getline(1) =~ '^%' |
-	\  setf tex |
-	\ elseif getline(1)[0] == '#' && getline(1) =~ 'rexx' |
-	\  setf rexx |
-	\ else |
-	\  setf st |
-	\ endif
-
-" SMIL or XML
-au BufNewFile,BufRead *.smil
-	\ if getline(1) =~ '<?\s*xml.*?>' |
-	\   setf xml |
-	\ else |
-	\   setf smil |
-	\ endif
-
-" SMIL or SNMP MIB file
-au BufNewFile,BufRead *.smi
-	\ if getline(1) =~ '\<smil\>' |
-	\   setf smil |
-	\ else |
-	\   setf mib |
-	\ endif
-
-au BufNewFile,BufRead *.rules			call polyglot#ft#FTRules()
-
-" SQL
-au BufNewFile,BufRead *.sql			call polyglot#ft#SQL()
-
-" Also *.class, but not when it's a Java bytecode file
-au BufNewFile,BufRead *.class
-	\ if getline(1) !~ "^\xca\xfe\xba\xbe" | setf stata | endif
-
-au BufNewFile,BufRead *.tex			call polyglot#ft#FTtex()
-
-" Virata Config Script File or Drupal module
-au BufRead,BufNewFile *.hw,*.module,*.pkg
-	\ if getline(1) =~ '<?php' |
-	\   setf php |
-	\ else |
-	\   setf virata |
-	\ endif
-
-" Visual Basic (also uses *.bas) or FORM
-au BufNewFile,BufRead *.frm			call polyglot#ft#FTVB("form")
-
-" WEB (*.web is also used for Winbatch: Guess, based on expecting "%" comment
-" lines in a WEB file).
-au BufNewFile,BufRead *.web
-	\ if getline(1)[0].getline(2)[0].getline(3)[0].getline(4)[0].getline(5)[0] =~ "%" |
-	\   setf web |
-	\ else |
-	\   setf winbatch |
-	\ endif
-
-" X Pixmap (dynamically sets colors, use BufEnter to make it work better)
-au BufEnter *.xpm
-	\ if getline(1) =~ "XPM2" |
-	\   setf xpm2 |
-	\ else |
-	\   setf xpm |
-	\ endif
-
-" XFree86 config
-au BufNewFile,BufRead XF86Config
-	\ if getline(1) =~ '\<XConfigurator\>' |
-	\   let b:xf86conf_xfree86_version = 3 |
-	\ endif |
-	\ setf xf86conf
-au BufNewFile,BufRead */xorg.conf.d/*.conf
-	\ let b:xf86conf_xfree86_version = 4 |
-	\ setf xf86conf
-
-" Xorg config
-au BufNewFile,BufRead xorg.conf,xorg.conf-4	let b:xf86conf_xfree86_version = 4 | setf xf86conf
-
-au BufNewFile,BufRead *.ms
-	\ if !polyglot#ft#FTnroff() | setf xmath | endif
-
-" XML  specific variants: docbk and xbl
-au BufNewFile,BufRead *.xml			call polyglot#ft#FTxml()
-
-" Yacc or racc
-au BufNewFile,BufRead *.y			call polyglot#ft#FTy()
-
-" Zope
-"   dtml (zope dynamic template markup language), pt (zope page template),
-"   cpt (zope form controller page template)
-au BufNewFile,BufRead *.dtml,*.pt,*.cpt		call polyglot#ft#FThtml()
-"   zsql (zope sql method)
-au BufNewFile,BufRead *.zsql			call polyglot#ft#SQL()
-
-augroup END
-
-
-" Source the user-specified filetype file, for backwards compatibility with
-" Vim 5.x.
-if exists("myfiletypefile") && filereadable(expand(myfiletypefile))
-  execute "source " . myfiletypefile
-endif
-
-
-" Check for "*" after loading myfiletypefile, so that scripts.vim is only used
-" when there are no matching file name extensions.
-" Don't do this for compressed files.
-augroup filetypedetect
-au BufNewFile,BufRead *
-	\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
-	\ | runtime! scripts.vim | endif
-au StdinReadPost * if !did_filetype() | runtime! scripts.vim | endif
-
-
-" Extra checks for when no filetype has been detected now.  Mostly used for
-" patterns that end in "*".  E.g., "zsh*" matches "zsh.vim", but that's a Vim
-" script file.
-" Most of these should call s:StarSetf() to avoid names ending in .gz and the
-" like are used.
-
-" More Apache style config files
-au BufNewFile,BufRead */etc/proftpd/*.conf*,*/etc/proftpd/conf.*/*	call s:StarSetf('apachestyle')
-au BufNewFile,BufRead proftpd.conf*					call s:StarSetf('apachestyle')
-
-" More Apache config files
-au BufNewFile,BufRead access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*	call s:StarSetf('apache')
-au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.d/*.conf*		call s:StarSetf('apache')
-
-" Asterisk config file
-au BufNewFile,BufRead *asterisk/*.conf*		call s:StarSetf('asterisk')
-au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
-
-" BIND zone
-au BufNewFile,BufRead */named/db.*,*/bind/db.*	call s:StarSetf('bindzone')
-
-" Calendar
-au BufNewFile,BufRead */.calendar/*,
-	\*/share/calendar/*/calendar.*,*/share/calendar/calendar.*
-	\					call s:StarSetf('calendar')
-
-" Changelog
-au BufNewFile,BufRead [cC]hange[lL]og*
-	\ if getline(1) =~ '; urgency='
-	\|  call s:StarSetf('debchangelog')
-	\|else
-	\|  call s:StarSetf('changelog')
-	\|endif
-
-" Crontab
-au BufNewFile,BufRead crontab,crontab.*,*/etc/cron.d/*		call s:StarSetf('crontab')
-
-" dnsmasq(8) configuration
-au BufNewFile,BufRead */etc/dnsmasq.d/*		call s:StarSetf('dnsmasq')
-
-" Dracula
-au BufNewFile,BufRead drac.*			call s:StarSetf('dracula')
-
-" Fvwm
-au BufNewFile,BufRead */.fvwm/*			call s:StarSetf('fvwm')
-au BufNewFile,BufRead *fvwmrc*,*fvwm95*.hook
-	\ let b:fvwm_version = 1 | call s:StarSetf('fvwm')
-au BufNewFile,BufRead *fvwm2rc*
-	\ if expand("<afile>:e") == "m4"
-	\|  call s:StarSetf('fvwm2m4')
-	\|else
-	\|  let b:fvwm_version = 2 | call s:StarSetf('fvwm')
-	\|endif
-
-" Gedcom
-au BufNewFile,BufRead */tmp/lltmp*		call s:StarSetf('gedcom')
-
-" Git
-au BufNewFile,BufRead */.gitconfig.d/*,/etc/gitconfig.d/*	call s:StarSetf('gitconfig')
-
-" Gitolite
-au BufNewFile,BufRead */gitolite-admin/conf/*	call s:StarSetf('gitolite')
-
-" GTK RC
-au BufNewFile,BufRead .gtkrc*,gtkrc*		call s:StarSetf('gtkrc')
-
-" Jam
-au BufNewFile,BufRead Prl*.*,JAM*.*		call s:StarSetf('jam')
-
-" Jargon
-au! BufNewFile,BufRead *jarg*
-	\ if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'THIS IS THE JARGON FILE'
-	\|  call s:StarSetf('jargon')
-	\|endif
-
-" Java Properties resource file (note: doesn't catch font.properties.pl)
-au BufNewFile,BufRead *.properties_??_??_*	call s:StarSetf('jproperties')
-
-" Kconfig
-au BufNewFile,BufRead Kconfig.*			call s:StarSetf('kconfig')
-
-" Lilo: Linux loader
-au BufNewFile,BufRead lilo.conf*		call s:StarSetf('lilo')
-
-" Logcheck
-au BufNewFile,BufRead */etc/logcheck/*.d*/*	call s:StarSetf('logcheck')
-
-" Makefile
-au BufNewFile,BufRead [mM]akefile*		call s:StarSetf('make')
-
-" Ruby Makefile
-au BufNewFile,BufRead [rR]akefile*		call s:StarSetf('ruby')
-
-" Mail (also matches muttrc.vim, so this is below the other checks)
-au BufNewFile,BufRead {neo,}mutt[[:alnum:]._-]\\\{6\}	setf mail
-
-au BufNewFile,BufRead reportbug-*		call s:StarSetf('mail')
-
-" Modconf
-au BufNewFile,BufRead */etc/modutils/*
-	\ if executable(expand("<afile>")) != 1
-	\|  call s:StarSetf('modconf')
-	\|endif
-au BufNewFile,BufRead */etc/modprobe.*		call s:StarSetf('modconf')
-
-" Mutt setup file
-au BufNewFile,BufRead .mutt{ng,}rc*,*/.mutt{ng,}/mutt{ng,}rc*	call s:StarSetf('muttrc')
-au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc*		call s:StarSetf('muttrc')
-
-" Neomutt setup file
-au BufNewFile,BufRead .neomuttrc*,*/.neomutt/neomuttrc*	call s:StarSetf('neomuttrc')
-au BufNewFile,BufRead neomuttrc*,Neomuttrc*		call s:StarSetf('neomuttrc')
-
-" Nroff macros
-au BufNewFile,BufRead tmac.*			call s:StarSetf('nroff')
-
-" OpenBSD hostname.if
-au BufNewFile,BufRead /etc/hostname.*		call s:StarSetf('config')
-
-" Pam conf
-au BufNewFile,BufRead */etc/pam.d/*		call s:StarSetf('pamconf')
-
-" Printcap and Termcap
-au BufNewFile,BufRead *printcap*
-	\ if !did_filetype()
-	\|  let b:ptcap_type = "print" | call s:StarSetf('ptcap')
-	\|endif
-au BufNewFile,BufRead *termcap*
-	\ if !did_filetype()
-	\|  let b:ptcap_type = "term" | call s:StarSetf('ptcap')
-	\|endif
-
-" ReDIF
-" Only used when the .rdf file was not detected to be XML.
-au BufRead,BufNewFile *.rdf			call polyglot#ft#Redif()
-
-" Remind
-au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
-
-" SGML catalog file
-au BufNewFile,BufRead sgml.catalog*		call s:StarSetf('catalog')
-
-" Shell scripts ending in a star
-au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,,PKGBUILD* call polyglot#ft#SetFileTypeSH("bash")
-au BufNewFile,BufRead .kshrc* call polyglot#ft#SetFileTypeSH("ksh")
-au BufNewFile,BufRead .profile* call polyglot#ft#SetFileTypeSH(getline(1))
-
-" tcsh scripts ending in a star
-au BufNewFile,BufRead .tcshrc*	call polyglot#ft#SetFileTypeShell("tcsh")
-
-" csh scripts ending in a star
-au BufNewFile,BufRead .login*,.cshrc*  call polyglot#ft#CSH()
-
-" VHDL
-au BufNewFile,BufRead *.vhdl_[0-9]*		call s:StarSetf('vhdl')
-
-" Vim script
-au BufNewFile,BufRead *vimrc*			call s:StarSetf('vim')
-
-" Subversion commit file
-au BufNewFile,BufRead svn-commit*.tmp		setf svn
-
-" X resources file
-au BufNewFile,BufRead Xresources*,*/app-defaults/*,*/Xresources/* call s:StarSetf('xdefaults')
-
-" XFree86 config
-au BufNewFile,BufRead XF86Config-4*
-	\ let b:xf86conf_xfree86_version = 4 | call s:StarSetf('xf86conf')
-au BufNewFile,BufRead XF86Config*
-	\ if getline(1) =~ '\<XConfigurator\>'
-	\|  let b:xf86conf_xfree86_version = 3
-	\|endif
-	\|call s:StarSetf('xf86conf')
-
-" X11 xmodmap
-au BufNewFile,BufRead *xmodmap*			call s:StarSetf('xmodmap')
-
-" Xinetd conf
-au BufNewFile,BufRead */etc/xinetd.d/*		call s:StarSetf('xinetd')
-
-" yum conf (close enough to dosini)
-au BufNewFile,BufRead */etc/yum.repos.d/*	call s:StarSetf('dosini')
-
-" Z-Shell script ending in a star
-au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump*  call s:StarSetf('zsh')
-au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
-
-
-" Help files match *.txt but should have a last line that is a modeline.
-au BufNewFile,BufRead *.txt
-	\  if getline('$') !~ 'vim:.*ft=help'
-	\|   setf text
-	\| endif
-
-
-" NOTE: The above command could have ended the filetypedetect autocmd group
-" and started another one. Let's make sure it has ended to get to a consistent
-" state.
-augroup END
-
-" Use the filetype detect plugins.  They may overrule any of the previously
-" detected filetypes. No need to load if everything is enabled
-if exists("did_load_filetypes") && exists("g:polyglot_disabled")
-  unlet did_load_filetypes
-  runtime! extras/filetype.vim
-endif
-
-let s:runtime = resolve($VIMRUNTIME)
-let s:base = resolve(expand('<sfile>:p:h:h'))
-
-func! s:process_rtp(rtp)
-  " Remove vim-polyglot from paths and make everything absolute
-  let rtp = []
-  for path in a:rtp[1:-2]
-    let abspath = resolve(path)
-    if stridx(abspath, s:base) != 0
-      call add(rtp, abspath)
-    endif
-  endfor
-  let result = [a:rtp[0]]
-  " Then all other stuff (until vimruntime)
-  let i = 0
-  for path in rtp[0:len(rtp)-1]
-    if path == s:runtime
-      break
-    endif
-    call add(result, path)
-    let i = i + 1
-  endfor
-  " Then vim-polyglot
-  call add(result, s:base)
-  " Then all other files, until after-files
-  for path in rtp[i:len(rtp)-1]
-    if match(path, '[/\\]after$') > -1
-      break
-    endif
-    call add(result, path)
-    let i = i + 1
-  endfor
-  " Then vim-polyglot after path
-  call add(result, s:base . '/after')
-  " Then all other after paths
-  for path in rtp[i:len(rtp)-1]
-    call add(result, path)
-  endfor
-  " User's after directory is always last
-  call add(result, a:rtp[len(a:rtp)-1])
-  return result
-endfunc
-
-" We want vim-polyglot files to load only as fallback
-let &rtp = join(s:process_rtp(split(&rtp, ',')), ',')
-
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save
+call polyglot#init#init()
diff --git a/ftplugin/8th.vim b/ftplugin/8th.vim
index e3f8d209f..e9a63dc18 100644
--- a/ftplugin/8th.vim
+++ b/ftplugin/8th.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, '8th')
+if polyglot#init#is_disabled(expand('<sfile>:p'), '8th', 'ftplugin/8th.vim')
   finish
 endif
 
diff --git a/ftplugin/a2ps.vim b/ftplugin/a2ps.vim
index 3e540faad..34d453687 100644
--- a/ftplugin/a2ps.vim
+++ b/ftplugin/a2ps.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'a2ps')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'a2ps', 'ftplugin/a2ps.vim')
   finish
 endif
 
diff --git a/ftplugin/aap.vim b/ftplugin/aap.vim
index e77d43b90..3a8f1cbbd 100644
--- a/ftplugin/aap.vim
+++ b/ftplugin/aap.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'aap')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'aap', 'ftplugin/aap.vim')
   finish
 endif
 
diff --git a/ftplugin/abap.vim b/ftplugin/abap.vim
index 2e7fa2839..3b4bbc678 100644
--- a/ftplugin/abap.vim
+++ b/ftplugin/abap.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'abap')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'abap', 'ftplugin/abap.vim')
   finish
 endif
 
diff --git a/ftplugin/abaqus.vim b/ftplugin/abaqus.vim
index d6d0e116f..e9dfc577b 100644
--- a/ftplugin/abaqus.vim
+++ b/ftplugin/abaqus.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'abaqus')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'abaqus', 'ftplugin/abaqus.vim')
   finish
 endif
 
diff --git a/ftplugin/ada.vim b/ftplugin/ada.vim
index 23e36e31d..d7b34be04 100644
--- a/ftplugin/ada.vim
+++ b/ftplugin/ada.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ada')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ada', 'ftplugin/ada.vim')
   finish
 endif
 
diff --git a/ftplugin/alsaconf.vim b/ftplugin/alsaconf.vim
index cd8d60ef9..b58b7a466 100644
--- a/ftplugin/alsaconf.vim
+++ b/ftplugin/alsaconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'alsaconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'alsaconf', 'ftplugin/alsaconf.vim')
   finish
 endif
 
diff --git a/ftplugin/ansible.vim b/ftplugin/ansible.vim
index 5b8a015b0..cd61e64cd 100644
--- a/ftplugin/ansible.vim
+++ b/ftplugin/ansible.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ansible')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ansible', 'ftplugin/ansible.vim')
   finish
 endif
 
diff --git a/ftplugin/ansible_hosts.vim b/ftplugin/ansible_hosts.vim
index adc3bbd8f..e8618f13a 100644
--- a/ftplugin/ansible_hosts.vim
+++ b/ftplugin/ansible_hosts.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ansible')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ansible', 'ftplugin/ansible_hosts.vim')
   finish
 endif
 
diff --git a/ftplugin/ant.vim b/ftplugin/ant.vim
index 01122fd75..9705d61f0 100644
--- a/ftplugin/ant.vim
+++ b/ftplugin/ant.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ant')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ant', 'ftplugin/ant.vim')
   finish
 endif
 
diff --git a/ftplugin/arch.vim b/ftplugin/arch.vim
index 47e97c7d8..654d1293f 100644
--- a/ftplugin/arch.vim
+++ b/ftplugin/arch.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'arch')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'arch', 'ftplugin/arch.vim')
   finish
 endif
 
diff --git a/ftplugin/art.vim b/ftplugin/art.vim
index bcf60050e..0bfa63be9 100644
--- a/ftplugin/art.vim
+++ b/ftplugin/art.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'art')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'art', 'ftplugin/art.vim')
   finish
 endif
 
diff --git a/ftplugin/aspvbs.vim b/ftplugin/aspvbs.vim
index 445693682..5f60f7478 100644
--- a/ftplugin/aspvbs.vim
+++ b/ftplugin/aspvbs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'aspvbs')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'aspvbs', 'ftplugin/aspvbs.vim')
   finish
 endif
 
diff --git a/ftplugin/automake.vim b/ftplugin/automake.vim
index 071d52f4e..520ec01ef 100644
--- a/ftplugin/automake.vim
+++ b/ftplugin/automake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'automake')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'automake', 'ftplugin/automake.vim')
   finish
 endif
 
diff --git a/ftplugin/awk.vim b/ftplugin/awk.vim
index a534249ba..4b225e350 100644
--- a/ftplugin/awk.vim
+++ b/ftplugin/awk.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'awk')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'awk', 'ftplugin/awk.vim')
   finish
 endif
 
diff --git a/ftplugin/bdf.vim b/ftplugin/bdf.vim
index d8834f413..a2e4bcb45 100644
--- a/ftplugin/bdf.vim
+++ b/ftplugin/bdf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bdf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bdf', 'ftplugin/bdf.vim')
   finish
 endif
 
diff --git a/ftplugin/blade.vim b/ftplugin/blade.vim
index db3c1c01c..861260ccb 100644
--- a/ftplugin/blade.vim
+++ b/ftplugin/blade.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'blade')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'blade', 'ftplugin/blade.vim')
   finish
 endif
 
diff --git a/ftplugin/bst.vim b/ftplugin/bst.vim
index 722d7896d..10a4b27d0 100644
--- a/ftplugin/bst.vim
+++ b/ftplugin/bst.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bst')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bst', 'ftplugin/bst.vim')
   finish
 endif
 
diff --git a/ftplugin/bzl.vim b/ftplugin/bzl.vim
index 59501110f..b1ece99bb 100644
--- a/ftplugin/bzl.vim
+++ b/ftplugin/bzl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bzl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bzl', 'ftplugin/bzl.vim')
   finish
 endif
 
diff --git a/ftplugin/caddyfile.vim b/ftplugin/caddyfile.vim
index b56238cf7..b3e48a088 100644
--- a/ftplugin/caddyfile.vim
+++ b/ftplugin/caddyfile.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'caddyfile')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'caddyfile', 'ftplugin/caddyfile.vim')
   finish
 endif
 
diff --git a/ftplugin/calendar.vim b/ftplugin/calendar.vim
index 7f73c6e03..13bb56073 100644
--- a/ftplugin/calendar.vim
+++ b/ftplugin/calendar.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'calendar')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'calendar', 'ftplugin/calendar.vim')
   finish
 endif
 
diff --git a/ftplugin/cdrdaoconf.vim b/ftplugin/cdrdaoconf.vim
index cc3ad4aa3..9cf73ec29 100644
--- a/ftplugin/cdrdaoconf.vim
+++ b/ftplugin/cdrdaoconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cdrdaoconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cdrdaoconf', 'ftplugin/cdrdaoconf.vim')
   finish
 endif
 
diff --git a/ftplugin/cfg.vim b/ftplugin/cfg.vim
index 42c1f95ac..f6f039e83 100644
--- a/ftplugin/cfg.vim
+++ b/ftplugin/cfg.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cfg')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cfg', 'ftplugin/cfg.vim')
   finish
 endif
 
diff --git a/ftplugin/ch.vim b/ftplugin/ch.vim
index 030c21ddc..2855416bc 100644
--- a/ftplugin/ch.vim
+++ b/ftplugin/ch.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ch')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ch', 'ftplugin/ch.vim')
   finish
 endif
 
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 7211f7f08..279d4283e 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'clojure')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'clojure', 'ftplugin/clojure.vim')
   finish
 endif
 
diff --git a/ftplugin/cobol.vim b/ftplugin/cobol.vim
index a3db3c437..bea6152f7 100644
--- a/ftplugin/cobol.vim
+++ b/ftplugin/cobol.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cobol')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cobol', 'ftplugin/cobol.vim')
   finish
 endif
 
diff --git a/ftplugin/coffee.vim b/ftplugin/coffee.vim
index 701d47960..84378a75e 100644
--- a/ftplugin/coffee.vim
+++ b/ftplugin/coffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'coffee-script')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'coffee-script', 'ftplugin/coffee.vim')
   finish
 endif
 
diff --git a/ftplugin/conf.vim b/ftplugin/conf.vim
index dd150de96..210123cec 100644
--- a/ftplugin/conf.vim
+++ b/ftplugin/conf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'conf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'conf', 'ftplugin/conf.vim')
   finish
 endif
 
diff --git a/ftplugin/config.vim b/ftplugin/config.vim
index a414fef55..a302b7ca1 100644
--- a/ftplugin/config.vim
+++ b/ftplugin/config.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'config')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'config', 'ftplugin/config.vim')
   finish
 endif
 
diff --git a/ftplugin/crm.vim b/ftplugin/crm.vim
index a407ed002..973eb1b02 100644
--- a/ftplugin/crm.vim
+++ b/ftplugin/crm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crm', 'ftplugin/crm.vim')
   finish
 endif
 
diff --git a/ftplugin/cryptol/folding.vim b/ftplugin/cryptol/folding.vim
index 7adca3ef7..eb2786a18 100644
--- a/ftplugin/cryptol/folding.vim
+++ b/ftplugin/cryptol/folding.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cryptol')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cryptol', 'ftplugin/cryptol/folding.vim')
   finish
 endif
 
diff --git a/ftplugin/crystal.vim b/ftplugin/crystal.vim
index d94babebd..3d0887b68 100644
--- a/ftplugin/crystal.vim
+++ b/ftplugin/crystal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'ftplugin/crystal.vim')
   finish
 endif
 
diff --git a/ftplugin/cs.vim b/ftplugin/cs.vim
index f3a14da44..e22ea5e74 100644
--- a/ftplugin/cs.vim
+++ b/ftplugin/cs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cs')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cs', 'ftplugin/cs.vim')
   finish
 endif
 
diff --git a/ftplugin/csc.vim b/ftplugin/csc.vim
index ef3e9d23d..bdf6a477f 100644
--- a/ftplugin/csc.vim
+++ b/ftplugin/csc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'csc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'csc', 'ftplugin/csc.vim')
   finish
 endif
 
diff --git a/ftplugin/css.vim b/ftplugin/css.vim
index 5d4dca2a9..f75c461b7 100644
--- a/ftplugin/css.vim
+++ b/ftplugin/css.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'css')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'css', 'ftplugin/css.vim')
   finish
 endif
 
diff --git a/ftplugin/csv.vim b/ftplugin/csv.vim
index 71b3de198..2d8eb3134 100644
--- a/ftplugin/csv.vim
+++ b/ftplugin/csv.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'csv')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'csv', 'ftplugin/csv.vim')
   finish
 endif
 
diff --git a/ftplugin/cucumber.vim b/ftplugin/cucumber.vim
index f1153f5e2..08bb62de1 100644
--- a/ftplugin/cucumber.vim
+++ b/ftplugin/cucumber.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cucumber')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cucumber', 'ftplugin/cucumber.vim')
   finish
 endif
 
diff --git a/ftplugin/cvsrc.vim b/ftplugin/cvsrc.vim
index b5f5693e6..3a65d1c08 100644
--- a/ftplugin/cvsrc.vim
+++ b/ftplugin/cvsrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cvsrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cvsrc', 'ftplugin/cvsrc.vim')
   finish
 endif
 
diff --git a/ftplugin/dart.vim b/ftplugin/dart.vim
index d6609181e..d219781a9 100644
--- a/ftplugin/dart.vim
+++ b/ftplugin/dart.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dart')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dart', 'ftplugin/dart.vim')
   finish
 endif
 
diff --git a/ftplugin/debchangelog.vim b/ftplugin/debchangelog.vim
index 27d521eb6..b32f33693 100644
--- a/ftplugin/debchangelog.vim
+++ b/ftplugin/debchangelog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'debchangelog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'debchangelog', 'ftplugin/debchangelog.vim')
   finish
 endif
 
diff --git a/ftplugin/debcontrol.vim b/ftplugin/debcontrol.vim
index 841f2b7cd..ce6059f7b 100644
--- a/ftplugin/debcontrol.vim
+++ b/ftplugin/debcontrol.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'debcontrol')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'debcontrol', 'ftplugin/debcontrol.vim')
   finish
 endif
 
diff --git a/ftplugin/denyhosts.vim b/ftplugin/denyhosts.vim
index 04ab77604..349bdb214 100644
--- a/ftplugin/denyhosts.vim
+++ b/ftplugin/denyhosts.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'denyhosts')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'denyhosts', 'ftplugin/denyhosts.vim')
   finish
 endif
 
diff --git a/ftplugin/dhall.vim b/ftplugin/dhall.vim
index 6c183c358..a484585ba 100644
--- a/ftplugin/dhall.vim
+++ b/ftplugin/dhall.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dhall')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dhall', 'ftplugin/dhall.vim')
   finish
 endif
 
diff --git a/ftplugin/dictconf.vim b/ftplugin/dictconf.vim
index 706b4a48c..e2d1a7853 100644
--- a/ftplugin/dictconf.vim
+++ b/ftplugin/dictconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dictconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dictconf', 'ftplugin/dictconf.vim')
   finish
 endif
 
diff --git a/ftplugin/dictdconf.vim b/ftplugin/dictdconf.vim
index 224ad1046..a4e84f122 100644
--- a/ftplugin/dictdconf.vim
+++ b/ftplugin/dictdconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dictdconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dictdconf', 'ftplugin/dictdconf.vim')
   finish
 endif
 
diff --git a/ftplugin/diff.vim b/ftplugin/diff.vim
index 66ec41794..c7d8cefce 100644
--- a/ftplugin/diff.vim
+++ b/ftplugin/diff.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'diff')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'diff', 'ftplugin/diff.vim')
   finish
 endif
 
diff --git a/ftplugin/dircolors.vim b/ftplugin/dircolors.vim
index 207d30ec3..9d57e19b0 100644
--- a/ftplugin/dircolors.vim
+++ b/ftplugin/dircolors.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dircolors')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dircolors', 'ftplugin/dircolors.vim')
   finish
 endif
 
diff --git a/ftplugin/docker-compose.vim b/ftplugin/docker-compose.vim
index 7d5a1e48e..40f8a43fd 100644
--- a/ftplugin/docker-compose.vim
+++ b/ftplugin/docker-compose.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'docker-compose')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'docker-compose', 'ftplugin/docker-compose.vim')
   finish
 endif
 
diff --git a/ftplugin/dockerfile.vim b/ftplugin/dockerfile.vim
index f99dd9895..5b8052be6 100644
--- a/ftplugin/dockerfile.vim
+++ b/ftplugin/dockerfile.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dockerfile')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dockerfile', 'ftplugin/dockerfile.vim')
   finish
 endif
 
diff --git a/ftplugin/dosbatch.vim b/ftplugin/dosbatch.vim
index 25d0676d5..bf59baf71 100644
--- a/ftplugin/dosbatch.vim
+++ b/ftplugin/dosbatch.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dosbatch')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dosbatch', 'ftplugin/dosbatch.vim')
   finish
 endif
 
diff --git a/ftplugin/dosini.vim b/ftplugin/dosini.vim
index fbacecc05..fc739a015 100644
--- a/ftplugin/dosini.vim
+++ b/ftplugin/dosini.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dosini')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dosini', 'ftplugin/dosini.vim')
   finish
 endif
 
diff --git a/ftplugin/dtd.vim b/ftplugin/dtd.vim
index 1ceb1b773..783d73b01 100644
--- a/ftplugin/dtd.vim
+++ b/ftplugin/dtd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dtd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dtd', 'ftplugin/dtd.vim')
   finish
 endif
 
diff --git a/ftplugin/dune.vim b/ftplugin/dune.vim
index 92c471f43..9d86d0a53 100644
--- a/ftplugin/dune.vim
+++ b/ftplugin/dune.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'ftplugin/dune.vim')
   finish
 endif
 
diff --git a/ftplugin/ecrystal.vim b/ftplugin/ecrystal.vim
index a8c249c0d..e5e069493 100644
--- a/ftplugin/ecrystal.vim
+++ b/ftplugin/ecrystal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'ftplugin/ecrystal.vim')
   finish
 endif
 
diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index cda21c9b4..6e1d13fdd 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'ftplugin/eelixir.vim')
   finish
 endif
 
diff --git a/ftplugin/elinks.vim b/ftplugin/elinks.vim
index 7a4c75a5f..6d04cfd43 100644
--- a/ftplugin/elinks.vim
+++ b/ftplugin/elinks.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elinks')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elinks', 'ftplugin/elinks.vim')
   finish
 endif
 
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index 9a273567e..4ab896db3 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'ftplugin/elixir.vim')
   finish
 endif
 
diff --git a/ftplugin/embeddedpuppet.vim b/ftplugin/embeddedpuppet.vim
index 4e6a08493..7a2621fb0 100644
--- a/ftplugin/embeddedpuppet.vim
+++ b/ftplugin/embeddedpuppet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'puppet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'ftplugin/embeddedpuppet.vim')
   finish
 endif
 
diff --git a/ftplugin/ember-script.vim b/ftplugin/ember-script.vim
index d80653e1d..620156119 100644
--- a/ftplugin/ember-script.vim
+++ b/ftplugin/ember-script.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'emberscript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'emberscript', 'ftplugin/ember-script.vim')
   finish
 endif
 
diff --git a/ftplugin/emblem.vim b/ftplugin/emblem.vim
index d612566d2..54cb46968 100644
--- a/ftplugin/emblem.vim
+++ b/ftplugin/emblem.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'emblem')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'emblem', 'ftplugin/emblem.vim')
   finish
 endif
 
diff --git a/ftplugin/erlang.vim b/ftplugin/erlang.vim
index b9720484f..f23ba8755 100644
--- a/ftplugin/erlang.vim
+++ b/ftplugin/erlang.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'erlang')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'erlang', 'ftplugin/erlang.vim')
   finish
 endif
 
diff --git a/ftplugin/eruby.vim b/ftplugin/eruby.vim
index 5a7b4ca51..7ea19deab 100644
--- a/ftplugin/eruby.vim
+++ b/ftplugin/eruby.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'ftplugin/eruby.vim')
   finish
 endif
 
diff --git a/ftplugin/eterm.vim b/ftplugin/eterm.vim
index 15c3b0e29..313b24780 100644
--- a/ftplugin/eterm.vim
+++ b/ftplugin/eterm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'eterm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'eterm', 'ftplugin/eterm.vim')
   finish
 endif
 
diff --git a/ftplugin/falcon.vim b/ftplugin/falcon.vim
index 9911b507a..5f09b804e 100644
--- a/ftplugin/falcon.vim
+++ b/ftplugin/falcon.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'falcon')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'falcon', 'ftplugin/falcon.vim')
   finish
 endif
 
diff --git a/ftplugin/fennel.vim b/ftplugin/fennel.vim
index ac905f271..92b6edea3 100644
--- a/ftplugin/fennel.vim
+++ b/ftplugin/fennel.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fennel')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fennel', 'ftplugin/fennel.vim')
   finish
 endif
 
diff --git a/ftplugin/fetchmail.vim b/ftplugin/fetchmail.vim
index 636099424..ce8a3cbd0 100644
--- a/ftplugin/fetchmail.vim
+++ b/ftplugin/fetchmail.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fetchmail')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fetchmail', 'ftplugin/fetchmail.vim')
   finish
 endif
 
diff --git a/ftplugin/fish.vim b/ftplugin/fish.vim
index 19fa5c38d..52f75591a 100644
--- a/ftplugin/fish.vim
+++ b/ftplugin/fish.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fish')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fish', 'ftplugin/fish.vim')
   finish
 endif
 
diff --git a/ftplugin/fortran.vim b/ftplugin/fortran.vim
index fdf77db55..3c2ebc874 100644
--- a/ftplugin/fortran.vim
+++ b/ftplugin/fortran.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fortran')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fortran', 'ftplugin/fortran.vim')
   finish
 endif
 
diff --git a/ftplugin/framescript.vim b/ftplugin/framescript.vim
index 5361536da..9ec58b5ff 100644
--- a/ftplugin/framescript.vim
+++ b/ftplugin/framescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'framescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'framescript', 'ftplugin/framescript.vim')
   finish
 endif
 
diff --git a/ftplugin/fvwm.vim b/ftplugin/fvwm.vim
index b3f3e1357..488fa5001 100644
--- a/ftplugin/fvwm.vim
+++ b/ftplugin/fvwm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fvwm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fvwm', 'ftplugin/fvwm.vim')
   finish
 endif
 
diff --git a/ftplugin/gdb.vim b/ftplugin/gdb.vim
index c08787faa..3d3ed1037 100644
--- a/ftplugin/gdb.vim
+++ b/ftplugin/gdb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gdb')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gdb', 'ftplugin/gdb.vim')
   finish
 endif
 
diff --git a/ftplugin/git.vim b/ftplugin/git.vim
index d4ffec78b..072859ed9 100644
--- a/ftplugin/git.vim
+++ b/ftplugin/git.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'git')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'git', 'ftplugin/git.vim')
   finish
 endif
 
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim
index d6947f326..caa96db8b 100644
--- a/ftplugin/gitcommit.vim
+++ b/ftplugin/gitcommit.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'git')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'git', 'ftplugin/gitcommit.vim')
   finish
 endif
 
diff --git a/ftplugin/gitconfig.vim b/ftplugin/gitconfig.vim
index d6017ea54..d8d762406 100644
--- a/ftplugin/gitconfig.vim
+++ b/ftplugin/gitconfig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'git')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'git', 'ftplugin/gitconfig.vim')
   finish
 endif
 
diff --git a/ftplugin/gitignore.vim b/ftplugin/gitignore.vim
index c58811b0c..c2236b758 100644
--- a/ftplugin/gitignore.vim
+++ b/ftplugin/gitignore.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gitignore')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gitignore', 'ftplugin/gitignore.vim')
   finish
 endif
 
diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim
index 29bedf43e..7163f9169 100644
--- a/ftplugin/gitrebase.vim
+++ b/ftplugin/gitrebase.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'git')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'git', 'ftplugin/gitrebase.vim')
   finish
 endif
 
diff --git a/ftplugin/gitsendemail.vim b/ftplugin/gitsendemail.vim
index c30d36577..b6098bd5a 100644
--- a/ftplugin/gitsendemail.vim
+++ b/ftplugin/gitsendemail.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'git')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'git', 'ftplugin/gitsendemail.vim')
   finish
 endif
 
diff --git a/ftplugin/gleam.vim b/ftplugin/gleam.vim
index 58f39f03d..00ad4d1f8 100644
--- a/ftplugin/gleam.vim
+++ b/ftplugin/gleam.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gleam')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gleam', 'ftplugin/gleam.vim')
   finish
 endif
 
diff --git a/ftplugin/gpg.vim b/ftplugin/gpg.vim
index f1213d7ea..12114584d 100644
--- a/ftplugin/gpg.vim
+++ b/ftplugin/gpg.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gpg')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gpg', 'ftplugin/gpg.vim')
   finish
 endif
 
diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim
index 9b66c5c78..f06155529 100644
--- a/ftplugin/graphql.vim
+++ b/ftplugin/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'ftplugin/graphql.vim')
   finish
 endif
 
diff --git a/ftplugin/groovy.vim b/ftplugin/groovy.vim
index 93b70aeed..5c7c0eeff 100644
--- a/ftplugin/groovy.vim
+++ b/ftplugin/groovy.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'groovy')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'groovy', 'ftplugin/groovy.vim')
   finish
 endif
 
diff --git a/ftplugin/group.vim b/ftplugin/group.vim
index 9a6d1e874..52adcb7a6 100644
--- a/ftplugin/group.vim
+++ b/ftplugin/group.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'group')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'group', 'ftplugin/group.vim')
   finish
 endif
 
diff --git a/ftplugin/grub.vim b/ftplugin/grub.vim
index d7805a5be..9fedac24b 100644
--- a/ftplugin/grub.vim
+++ b/ftplugin/grub.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'grub')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'grub', 'ftplugin/grub.vim')
   finish
 endif
 
diff --git a/ftplugin/haml.vim b/ftplugin/haml.vim
index b747fe684..ec6f249d7 100644
--- a/ftplugin/haml.vim
+++ b/ftplugin/haml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haml', 'ftplugin/haml.vim')
   finish
 endif
 
diff --git a/ftplugin/hamster.vim b/ftplugin/hamster.vim
index 3bfb9fd96..c72a86571 100644
--- a/ftplugin/hamster.vim
+++ b/ftplugin/hamster.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hamster')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hamster', 'ftplugin/hamster.vim')
   finish
 endif
 
diff --git a/ftplugin/handlebars.vim b/ftplugin/handlebars.vim
index d769f1e51..c548f28fa 100644
--- a/ftplugin/handlebars.vim
+++ b/ftplugin/handlebars.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'handlebars')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'handlebars', 'ftplugin/handlebars.vim')
   finish
 endif
 
diff --git a/ftplugin/hcl.vim b/ftplugin/hcl.vim
index 7cd2a8a73..58dc67e42 100644
--- a/ftplugin/hcl.vim
+++ b/ftplugin/hcl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hcl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hcl', 'ftplugin/hcl.vim')
   finish
 endif
 
diff --git a/ftplugin/help.vim b/ftplugin/help.vim
index 47e203fee..7096523ac 100644
--- a/ftplugin/help.vim
+++ b/ftplugin/help.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'help')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'help', 'ftplugin/help.vim')
   finish
 endif
 
diff --git a/ftplugin/hgcommit.vim b/ftplugin/hgcommit.vim
index e4d132982..efb5c605b 100644
--- a/ftplugin/hgcommit.vim
+++ b/ftplugin/hgcommit.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hgcommit')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hgcommit', 'ftplugin/hgcommit.vim')
   finish
 endif
 
diff --git a/ftplugin/hive.vim b/ftplugin/hive.vim
index dd1b84450..fdd95d016 100644
--- a/ftplugin/hive.vim
+++ b/ftplugin/hive.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hive')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hive', 'ftplugin/hive.vim')
   finish
 endif
 
diff --git a/ftplugin/hog.vim b/ftplugin/hog.vim
index b3844023c..046f7a3a9 100644
--- a/ftplugin/hog.vim
+++ b/ftplugin/hog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hog', 'ftplugin/hog.vim')
   finish
 endif
 
diff --git a/ftplugin/hostconf.vim b/ftplugin/hostconf.vim
index 56c67899d..a2625b1fd 100644
--- a/ftplugin/hostconf.vim
+++ b/ftplugin/hostconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hostconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hostconf', 'ftplugin/hostconf.vim')
   finish
 endif
 
diff --git a/ftplugin/hostsaccess.vim b/ftplugin/hostsaccess.vim
index 312b91455..c731c8aeb 100644
--- a/ftplugin/hostsaccess.vim
+++ b/ftplugin/hostsaccess.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hostsaccess')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hostsaccess', 'ftplugin/hostsaccess.vim')
   finish
 endif
 
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index 5ec0bb22f..7664383b6 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html', 'ftplugin/html.vim')
   finish
 endif
 
diff --git a/ftplugin/htmldjango.vim b/ftplugin/htmldjango.vim
index a8b23cd4d..41d992d8c 100644
--- a/ftplugin/htmldjango.vim
+++ b/ftplugin/htmldjango.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'htmldjango')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'htmldjango', 'ftplugin/htmldjango.vim')
   finish
 endif
 
diff --git a/ftplugin/i3config.vim b/ftplugin/i3config.vim
index 80e63b014..6fb69a185 100644
--- a/ftplugin/i3config.vim
+++ b/ftplugin/i3config.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'i3')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'i3', 'ftplugin/i3config.vim')
   finish
 endif
 
diff --git a/ftplugin/idris.vim b/ftplugin/idris.vim
index 05d7a1afb..eb023f481 100644
--- a/ftplugin/idris.vim
+++ b/ftplugin/idris.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris', 'ftplugin/idris.vim')
   finish
 endif
 
diff --git a/ftplugin/idris2.vim b/ftplugin/idris2.vim
index 9a09fada5..d3fa7bc9a 100644
--- a/ftplugin/idris2.vim
+++ b/ftplugin/idris2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris2', 'ftplugin/idris2.vim')
   finish
 endif
 
diff --git a/ftplugin/indent.vim b/ftplugin/indent.vim
index 0c0b43115..89a779c4e 100644
--- a/ftplugin/indent.vim
+++ b/ftplugin/indent.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'indent')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'indent', 'ftplugin/indent.vim')
   finish
 endif
 
diff --git a/ftplugin/ion.vim b/ftplugin/ion.vim
index 8bf4a19a3..6f2c1ce2d 100644
--- a/ftplugin/ion.vim
+++ b/ftplugin/ion.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ion')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ion', 'ftplugin/ion.vim')
   finish
 endif
 
diff --git a/ftplugin/j.vim b/ftplugin/j.vim
index 78df3a37e..1fd011612 100644
--- a/ftplugin/j.vim
+++ b/ftplugin/j.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'j')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'j', 'ftplugin/j.vim')
   finish
 endif
 
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
index c50017864..c94ff1fa0 100644
--- a/ftplugin/java.vim
+++ b/ftplugin/java.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'java')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'java', 'ftplugin/java.vim')
   finish
 endif
 
diff --git a/ftplugin/jproperties.vim b/ftplugin/jproperties.vim
index 6860366e9..9d3076ab5 100644
--- a/ftplugin/jproperties.vim
+++ b/ftplugin/jproperties.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jproperties')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jproperties', 'ftplugin/jproperties.vim')
   finish
 endif
 
diff --git a/ftplugin/jq.vim b/ftplugin/jq.vim
index 30c3c99e0..f2c14aff1 100644
--- a/ftplugin/jq.vim
+++ b/ftplugin/jq.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jq')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jq', 'ftplugin/jq.vim')
   finish
 endif
 
diff --git a/ftplugin/json.vim b/ftplugin/json.vim
index 5c09f13d0..ed4bd8bac 100644
--- a/ftplugin/json.vim
+++ b/ftplugin/json.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'json')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'json', 'ftplugin/json.vim')
   finish
 endif
 
diff --git a/ftplugin/jsonnet.vim b/ftplugin/jsonnet.vim
index 781965e5c..500787a08 100644
--- a/ftplugin/jsonnet.vim
+++ b/ftplugin/jsonnet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsonnet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsonnet', 'ftplugin/jsonnet.vim')
   finish
 endif
 
diff --git a/ftplugin/jsp.vim b/ftplugin/jsp.vim
index 6ee9329e8..353cecfdc 100644
--- a/ftplugin/jsp.vim
+++ b/ftplugin/jsp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsp', 'ftplugin/jsp.vim')
   finish
 endif
 
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index e507dcab7..618e16d8d 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'julia')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'julia', 'ftplugin/julia.vim')
   finish
 endif
 
diff --git a/ftplugin/juliadoc.vim b/ftplugin/juliadoc.vim
index 0ae6deb4d..5b80149cc 100644
--- a/ftplugin/juliadoc.vim
+++ b/ftplugin/juliadoc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'julia')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'julia', 'ftplugin/juliadoc.vim')
   finish
 endif
 
diff --git a/ftplugin/kconfig.vim b/ftplugin/kconfig.vim
index a9a5201f2..836a7b88f 100644
--- a/ftplugin/kconfig.vim
+++ b/ftplugin/kconfig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'kconfig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'kconfig', 'ftplugin/kconfig.vim')
   finish
 endif
 
diff --git a/ftplugin/kotlin.vim b/ftplugin/kotlin.vim
index b5345bfc4..e06ce0435 100644
--- a/ftplugin/kotlin.vim
+++ b/ftplugin/kotlin.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'kotlin')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'kotlin', 'ftplugin/kotlin.vim')
   finish
 endif
 
diff --git a/ftplugin/kwt.vim b/ftplugin/kwt.vim
index ec3690464..f173ce33f 100644
--- a/ftplugin/kwt.vim
+++ b/ftplugin/kwt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'kwt')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'kwt', 'ftplugin/kwt.vim')
   finish
 endif
 
diff --git a/ftplugin/ld.vim b/ftplugin/ld.vim
index d9bc8d46c..41c72680a 100644
--- a/ftplugin/ld.vim
+++ b/ftplugin/ld.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ld')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ld', 'ftplugin/ld.vim')
   finish
 endif
 
diff --git a/ftplugin/less.vim b/ftplugin/less.vim
index c5fc4c506..ca6ce7db4 100644
--- a/ftplugin/less.vim
+++ b/ftplugin/less.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'less')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'less', 'ftplugin/less.vim')
   finish
 endif
 
diff --git a/ftplugin/lftp.vim b/ftplugin/lftp.vim
index 23e1fe59b..00ab99d27 100644
--- a/ftplugin/lftp.vim
+++ b/ftplugin/lftp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lftp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lftp', 'ftplugin/lftp.vim')
   finish
 endif
 
diff --git a/ftplugin/libao.vim b/ftplugin/libao.vim
index 48073e7e7..0be39f2ea 100644
--- a/ftplugin/libao.vim
+++ b/ftplugin/libao.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'libao')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'libao', 'ftplugin/libao.vim')
   finish
 endif
 
diff --git a/ftplugin/lilypond.vim b/ftplugin/lilypond.vim
index 3f4f9c786..ed2d1cdb5 100644
--- a/ftplugin/lilypond.vim
+++ b/ftplugin/lilypond.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lilypond')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'ftplugin/lilypond.vim')
   finish
 endif
 
diff --git a/ftplugin/limits.vim b/ftplugin/limits.vim
index 316abdd02..f5c80eb6f 100644
--- a/ftplugin/limits.vim
+++ b/ftplugin/limits.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'limits')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'limits', 'ftplugin/limits.vim')
   finish
 endif
 
diff --git a/ftplugin/liquid.vim b/ftplugin/liquid.vim
index 4d181349e..2b7f92fc6 100644
--- a/ftplugin/liquid.vim
+++ b/ftplugin/liquid.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'liquid')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'liquid', 'ftplugin/liquid.vim')
   finish
 endif
 
diff --git a/ftplugin/lisp.vim b/ftplugin/lisp.vim
index 838139b01..365a26b8e 100644
--- a/ftplugin/lisp.vim
+++ b/ftplugin/lisp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lisp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lisp', 'ftplugin/lisp.vim')
   finish
 endif
 
diff --git a/ftplugin/litcoffee.vim b/ftplugin/litcoffee.vim
index d9bd72dc1..08eddc185 100644
--- a/ftplugin/litcoffee.vim
+++ b/ftplugin/litcoffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'coffee-script')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'coffee-script', 'ftplugin/litcoffee.vim')
   finish
 endif
 
diff --git a/ftplugin/llvm.vim b/ftplugin/llvm.vim
index 19cab5d2a..1b20c7cc1 100644
--- a/ftplugin/llvm.vim
+++ b/ftplugin/llvm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'llvm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'ftplugin/llvm.vim')
   finish
 endif
 
diff --git a/ftplugin/logcheck.vim b/ftplugin/logcheck.vim
index 3ad3567c7..eb4af4cc1 100644
--- a/ftplugin/logcheck.vim
+++ b/ftplugin/logcheck.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'logcheck')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'logcheck', 'ftplugin/logcheck.vim')
   finish
 endif
 
diff --git a/ftplugin/loginaccess.vim b/ftplugin/loginaccess.vim
index e4cf1edde..c7150d490 100644
--- a/ftplugin/loginaccess.vim
+++ b/ftplugin/loginaccess.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'loginaccess')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'loginaccess', 'ftplugin/loginaccess.vim')
   finish
 endif
 
diff --git a/ftplugin/logindefs.vim b/ftplugin/logindefs.vim
index 15bb751a9..d2e0b4eb0 100644
--- a/ftplugin/logindefs.vim
+++ b/ftplugin/logindefs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'logindefs')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'logindefs', 'ftplugin/logindefs.vim')
   finish
 endif
 
diff --git a/ftplugin/logtalk.vim b/ftplugin/logtalk.vim
index 56e883d70..6d4f129a5 100644
--- a/ftplugin/logtalk.vim
+++ b/ftplugin/logtalk.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'logtalk')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'logtalk', 'ftplugin/logtalk.vim')
   finish
 endif
 
diff --git a/ftplugin/lprolog.vim b/ftplugin/lprolog.vim
index e1e7e3e63..d8804ceff 100644
--- a/ftplugin/lprolog.vim
+++ b/ftplugin/lprolog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lprolog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lprolog', 'ftplugin/lprolog.vim')
   finish
 endif
 
diff --git a/ftplugin/ls.vim b/ftplugin/ls.vim
index 425bb6f60..9808b9196 100644
--- a/ftplugin/ls.vim
+++ b/ftplugin/ls.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'livescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'livescript', 'ftplugin/ls.vim')
   finish
 endif
 
diff --git a/ftplugin/m4.vim b/ftplugin/m4.vim
index 538e08851..1efcacf3b 100644
--- a/ftplugin/m4.vim
+++ b/ftplugin/m4.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'm4')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'm4', 'ftplugin/m4.vim')
   finish
 endif
 
diff --git a/ftplugin/mail.vim b/ftplugin/mail.vim
index 4c8c16005..6e4e9a4fe 100644
--- a/ftplugin/mail.vim
+++ b/ftplugin/mail.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mail')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mail', 'ftplugin/mail.vim')
   finish
 endif
 
diff --git a/ftplugin/mailaliases.vim b/ftplugin/mailaliases.vim
index 01d2b6535..4db6e3c19 100644
--- a/ftplugin/mailaliases.vim
+++ b/ftplugin/mailaliases.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mailaliases')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mailaliases', 'ftplugin/mailaliases.vim')
   finish
 endif
 
diff --git a/ftplugin/mailcap.vim b/ftplugin/mailcap.vim
index 641d9939d..1c4356302 100644
--- a/ftplugin/mailcap.vim
+++ b/ftplugin/mailcap.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mailcap')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mailcap', 'ftplugin/mailcap.vim')
   finish
 endif
 
diff --git a/ftplugin/make.vim b/ftplugin/make.vim
index ee4157f13..42b457002 100644
--- a/ftplugin/make.vim
+++ b/ftplugin/make.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'make')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'make', 'ftplugin/make.vim')
   finish
 endif
 
diff --git a/ftplugin/mako.vim b/ftplugin/mako.vim
index 6496d6599..4ff58f34c 100644
--- a/ftplugin/mako.vim
+++ b/ftplugin/mako.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mako')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mako', 'ftplugin/mako.vim')
   finish
 endif
 
diff --git a/ftplugin/manconf.vim b/ftplugin/manconf.vim
index ff87f8bf5..daca7be1c 100644
--- a/ftplugin/manconf.vim
+++ b/ftplugin/manconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'manconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'manconf', 'ftplugin/manconf.vim')
   finish
 endif
 
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index a334d1d97..cb5edc8d4 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'markdown')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'markdown', 'ftplugin/markdown.vim')
   finish
 endif
 
diff --git a/ftplugin/meson.vim b/ftplugin/meson.vim
index 6753a8a93..6074dbd3f 100644
--- a/ftplugin/meson.vim
+++ b/ftplugin/meson.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'meson')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'meson', 'ftplugin/meson.vim')
   finish
 endif
 
diff --git a/ftplugin/mf.vim b/ftplugin/mf.vim
index cdb644c86..267049686 100644
--- a/ftplugin/mf.vim
+++ b/ftplugin/mf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mf', 'ftplugin/mf.vim')
   finish
 endif
 
diff --git a/ftplugin/mma.vim b/ftplugin/mma.vim
index e9c91dc0c..dffaa2114 100644
--- a/ftplugin/mma.vim
+++ b/ftplugin/mma.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mathematica')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mathematica', 'ftplugin/mma.vim')
   finish
 endif
 
diff --git a/ftplugin/modconf.vim b/ftplugin/modconf.vim
index c8f8f5e23..cca93104f 100644
--- a/ftplugin/modconf.vim
+++ b/ftplugin/modconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'modconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'modconf', 'ftplugin/modconf.vim')
   finish
 endif
 
diff --git a/ftplugin/moon.vim b/ftplugin/moon.vim
index ab70250a2..86e63c44e 100644
--- a/ftplugin/moon.vim
+++ b/ftplugin/moon.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'moonscript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'moonscript', 'ftplugin/moon.vim')
   finish
 endif
 
diff --git a/ftplugin/mp.vim b/ftplugin/mp.vim
index ea33ddda4..a379d6e09 100644
--- a/ftplugin/mp.vim
+++ b/ftplugin/mp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mp', 'ftplugin/mp.vim')
   finish
 endif
 
diff --git a/ftplugin/mplayerconf.vim b/ftplugin/mplayerconf.vim
index 7e7b63b01..22bd2874e 100644
--- a/ftplugin/mplayerconf.vim
+++ b/ftplugin/mplayerconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mplayerconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mplayerconf', 'ftplugin/mplayerconf.vim')
   finish
 endif
 
diff --git a/ftplugin/mrxvtrc.vim b/ftplugin/mrxvtrc.vim
index a5af89f44..71c9c17d2 100644
--- a/ftplugin/mrxvtrc.vim
+++ b/ftplugin/mrxvtrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mrxvtrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mrxvtrc', 'ftplugin/mrxvtrc.vim')
   finish
 endif
 
diff --git a/ftplugin/mustache.vim b/ftplugin/mustache.vim
index 5bed7ac34..92b978911 100644
--- a/ftplugin/mustache.vim
+++ b/ftplugin/mustache.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'handlebars')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'handlebars', 'ftplugin/mustache.vim')
   finish
 endif
 
diff --git a/ftplugin/muttrc.vim b/ftplugin/muttrc.vim
index 320c7463d..82c783cef 100644
--- a/ftplugin/muttrc.vim
+++ b/ftplugin/muttrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'muttrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'muttrc', 'ftplugin/muttrc.vim')
   finish
 endif
 
diff --git a/ftplugin/nanorc.vim b/ftplugin/nanorc.vim
index 0812ebf50..2ee97369b 100644
--- a/ftplugin/nanorc.vim
+++ b/ftplugin/nanorc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nanorc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nanorc', 'ftplugin/nanorc.vim')
   finish
 endif
 
diff --git a/ftplugin/neomuttrc.vim b/ftplugin/neomuttrc.vim
index 5488c2552..a5a19ac25 100644
--- a/ftplugin/neomuttrc.vim
+++ b/ftplugin/neomuttrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'neomuttrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'neomuttrc', 'ftplugin/neomuttrc.vim')
   finish
 endif
 
diff --git a/ftplugin/netrc.vim b/ftplugin/netrc.vim
index db8587726..55cee7847 100644
--- a/ftplugin/netrc.vim
+++ b/ftplugin/netrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'netrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'netrc', 'ftplugin/netrc.vim')
   finish
 endif
 
diff --git a/ftplugin/nginx.vim b/ftplugin/nginx.vim
index 39ff7a5de..454422428 100644
--- a/ftplugin/nginx.vim
+++ b/ftplugin/nginx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nginx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nginx', 'ftplugin/nginx.vim')
   finish
 endif
 
diff --git a/ftplugin/nix.vim b/ftplugin/nix.vim
index 457f4443a..75bbd1a4d 100644
--- a/ftplugin/nix.vim
+++ b/ftplugin/nix.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nix')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nix', 'ftplugin/nix.vim')
   finish
 endif
 
diff --git a/ftplugin/nroff.vim b/ftplugin/nroff.vim
index ac3dce4d9..967b358fc 100644
--- a/ftplugin/nroff.vim
+++ b/ftplugin/nroff.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nroff')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nroff', 'ftplugin/nroff.vim')
   finish
 endif
 
diff --git a/ftplugin/nsis.vim b/ftplugin/nsis.vim
index 833259f31..ab54e5d3a 100644
--- a/ftplugin/nsis.vim
+++ b/ftplugin/nsis.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nsis')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nsis', 'ftplugin/nsis.vim')
   finish
 endif
 
diff --git a/ftplugin/oasis.vim b/ftplugin/oasis.vim
index 6dfe76adf..ad7dd1a56 100644
--- a/ftplugin/oasis.vim
+++ b/ftplugin/oasis.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'ftplugin/oasis.vim')
   finish
 endif
 
diff --git a/ftplugin/objc.vim b/ftplugin/objc.vim
index 906ae2bf5..4e47eeddc 100644
--- a/ftplugin/objc.vim
+++ b/ftplugin/objc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'objc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'objc', 'ftplugin/objc.vim')
   finish
 endif
 
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index 84be233ef..6babcef80 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'ftplugin/ocaml.vim')
   finish
 endif
 
diff --git a/ftplugin/ocamlbuild_tags.vim b/ftplugin/ocamlbuild_tags.vim
index 6dfe76adf..5e83406d3 100644
--- a/ftplugin/ocamlbuild_tags.vim
+++ b/ftplugin/ocamlbuild_tags.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'ftplugin/ocamlbuild_tags.vim')
   finish
 endif
 
diff --git a/ftplugin/occam.vim b/ftplugin/occam.vim
index 3f5992b95..ea4973d0f 100644
--- a/ftplugin/occam.vim
+++ b/ftplugin/occam.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'occam')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'occam', 'ftplugin/occam.vim')
   finish
 endif
 
diff --git a/ftplugin/omake.vim b/ftplugin/omake.vim
index 73cc17ae0..59e111019 100644
--- a/ftplugin/omake.vim
+++ b/ftplugin/omake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'ftplugin/omake.vim')
   finish
 endif
 
diff --git a/ftplugin/opencl.vim b/ftplugin/opencl.vim
index 9beac9521..03bca6b9f 100644
--- a/ftplugin/opencl.vim
+++ b/ftplugin/opencl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'opencl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'opencl', 'ftplugin/opencl.vim')
   finish
 endif
 
diff --git a/ftplugin/pamconf.vim b/ftplugin/pamconf.vim
index 1d3344c94..fcaa87d44 100644
--- a/ftplugin/pamconf.vim
+++ b/ftplugin/pamconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pamconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pamconf', 'ftplugin/pamconf.vim')
   finish
 endif
 
diff --git a/ftplugin/pascal.vim b/ftplugin/pascal.vim
index ec8581d7b..db3da051d 100644
--- a/ftplugin/pascal.vim
+++ b/ftplugin/pascal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pascal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pascal', 'ftplugin/pascal.vim')
   finish
 endif
 
diff --git a/ftplugin/passwd.vim b/ftplugin/passwd.vim
index a4bfaf923..d36ba53a1 100644
--- a/ftplugin/passwd.vim
+++ b/ftplugin/passwd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'passwd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'passwd', 'ftplugin/passwd.vim')
   finish
 endif
 
diff --git a/ftplugin/pdf.vim b/ftplugin/pdf.vim
index fec98a685..c36cc19b4 100644
--- a/ftplugin/pdf.vim
+++ b/ftplugin/pdf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pdf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pdf', 'ftplugin/pdf.vim')
   finish
 endif
 
diff --git a/ftplugin/perl.vim b/ftplugin/perl.vim
index 7c8ff3bc8..a0e54a052 100644
--- a/ftplugin/perl.vim
+++ b/ftplugin/perl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'perl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'perl', 'ftplugin/perl.vim')
   finish
 endif
 
diff --git a/ftplugin/pest.vim b/ftplugin/pest.vim
index 09ad3583e..b3a1c3744 100644
--- a/ftplugin/pest.vim
+++ b/ftplugin/pest.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pest')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pest', 'ftplugin/pest.vim')
   finish
 endif
 
diff --git a/ftplugin/pinfo.vim b/ftplugin/pinfo.vim
index a32382a19..d81b88c92 100644
--- a/ftplugin/pinfo.vim
+++ b/ftplugin/pinfo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pinfo')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pinfo', 'ftplugin/pinfo.vim')
   finish
 endif
 
diff --git a/ftplugin/plantuml.vim b/ftplugin/plantuml.vim
index 8f0449e71..9f525dc38 100644
--- a/ftplugin/plantuml.vim
+++ b/ftplugin/plantuml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'plantuml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'plantuml', 'ftplugin/plantuml.vim')
   finish
 endif
 
diff --git a/ftplugin/pony.vim b/ftplugin/pony.vim
index 03f94cc38..901109f08 100644
--- a/ftplugin/pony.vim
+++ b/ftplugin/pony.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pony')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pony', 'ftplugin/pony.vim')
   finish
 endif
 
diff --git a/ftplugin/postscr.vim b/ftplugin/postscr.vim
index be2d347c0..614898fc1 100644
--- a/ftplugin/postscr.vim
+++ b/ftplugin/postscr.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'postscr')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'postscr', 'ftplugin/postscr.vim')
   finish
 endif
 
diff --git a/ftplugin/procmail.vim b/ftplugin/procmail.vim
index ee9ea710a..b1e25b78d 100644
--- a/ftplugin/procmail.vim
+++ b/ftplugin/procmail.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'procmail')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'procmail', 'ftplugin/procmail.vim')
   finish
 endif
 
diff --git a/ftplugin/prolog.vim b/ftplugin/prolog.vim
index 56d17127f..785cf7fff 100644
--- a/ftplugin/prolog.vim
+++ b/ftplugin/prolog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'prolog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'prolog', 'ftplugin/prolog.vim')
   finish
 endif
 
diff --git a/ftplugin/protocols.vim b/ftplugin/protocols.vim
index 22cd52b32..ac62f6936 100644
--- a/ftplugin/protocols.vim
+++ b/ftplugin/protocols.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'protocols')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'protocols', 'ftplugin/protocols.vim')
   finish
 endif
 
diff --git a/ftplugin/ps1.vim b/ftplugin/ps1.vim
index b88077d1b..e7c1a8533 100644
--- a/ftplugin/ps1.vim
+++ b/ftplugin/ps1.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'powershell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'powershell', 'ftplugin/ps1.vim')
   finish
 endif
 
diff --git a/ftplugin/ps1xml.vim b/ftplugin/ps1xml.vim
index 4bd65c446..50ac37339 100644
--- a/ftplugin/ps1xml.vim
+++ b/ftplugin/ps1xml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'powershell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'powershell', 'ftplugin/ps1xml.vim')
   finish
 endif
 
diff --git a/ftplugin/pug.vim b/ftplugin/pug.vim
index 8613bf4ec..74d91afd2 100644
--- a/ftplugin/pug.vim
+++ b/ftplugin/pug.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pug')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pug', 'ftplugin/pug.vim')
   finish
 endif
 
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index cd936ae4d..0d4612383 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'puppet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'ftplugin/puppet.vim')
   finish
 endif
 
diff --git a/ftplugin/puppet_tagbar.vim b/ftplugin/puppet_tagbar.vim
index afdbad6f0..4e87669ee 100644
--- a/ftplugin/puppet_tagbar.vim
+++ b/ftplugin/puppet_tagbar.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'puppet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'ftplugin/puppet_tagbar.vim')
   finish
 endif
 
diff --git a/ftplugin/purescript.vim b/ftplugin/purescript.vim
index 1a43b3331..6097b02ab 100644
--- a/ftplugin/purescript.vim
+++ b/ftplugin/purescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'purescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'purescript', 'ftplugin/purescript.vim')
   finish
 endif
 
diff --git a/ftplugin/pyrex.vim b/ftplugin/pyrex.vim
index f312251eb..9ea0af520 100644
--- a/ftplugin/pyrex.vim
+++ b/ftplugin/pyrex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pyrex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pyrex', 'ftplugin/pyrex.vim')
   finish
 endif
 
diff --git a/ftplugin/qml.vim b/ftplugin/qml.vim
index 5184074aa..fed105a3f 100644
--- a/ftplugin/qml.vim
+++ b/ftplugin/qml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'qml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'qml', 'ftplugin/qml.vim')
   finish
 endif
 
diff --git a/ftplugin/quake.vim b/ftplugin/quake.vim
index 621b71f7d..78f8eec83 100644
--- a/ftplugin/quake.vim
+++ b/ftplugin/quake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'quake')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'quake', 'ftplugin/quake.vim')
   finish
 endif
 
diff --git a/ftplugin/racket.vim b/ftplugin/racket.vim
index 06899bd13..8dd74d7f6 100644
--- a/ftplugin/racket.vim
+++ b/ftplugin/racket.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'racket')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'racket', 'ftplugin/racket.vim')
   finish
 endif
 
diff --git a/ftplugin/raku.vim b/ftplugin/raku.vim
index 4805a5c79..423dd7867 100644
--- a/ftplugin/raku.vim
+++ b/ftplugin/raku.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'raku')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'raku', 'ftplugin/raku.vim')
   finish
 endif
 
diff --git a/ftplugin/raml.vim b/ftplugin/raml.vim
index 3006f04a7..53e1ecbc7 100644
--- a/ftplugin/raml.vim
+++ b/ftplugin/raml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'raml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'raml', 'ftplugin/raml.vim')
   finish
 endif
 
diff --git a/ftplugin/razor.vim b/ftplugin/razor.vim
index a7e62b6c4..e1afeec33 100644
--- a/ftplugin/razor.vim
+++ b/ftplugin/razor.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'razor')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'razor', 'ftplugin/razor.vim')
   finish
 endif
 
diff --git a/ftplugin/readline.vim b/ftplugin/readline.vim
index 21d0eb016..67e9f2881 100644
--- a/ftplugin/readline.vim
+++ b/ftplugin/readline.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'readline')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'readline', 'ftplugin/readline.vim')
   finish
 endif
 
diff --git a/ftplugin/reva.vim b/ftplugin/reva.vim
index b172720dc..845348423 100644
--- a/ftplugin/reva.vim
+++ b/ftplugin/reva.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'reva')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'reva', 'ftplugin/reva.vim')
   finish
 endif
 
diff --git a/ftplugin/rmd.vim b/ftplugin/rmd.vim
index bba9116fc..c2fe0c2ba 100644
--- a/ftplugin/rmd.vim
+++ b/ftplugin/rmd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rmd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rmd', 'ftplugin/rmd.vim')
   finish
 endif
 
diff --git a/ftplugin/rnc.vim b/ftplugin/rnc.vim
index ba50c0d09..aacdfc1fa 100644
--- a/ftplugin/rnc.vim
+++ b/ftplugin/rnc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rnc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rnc', 'ftplugin/rnc.vim')
   finish
 endif
 
diff --git a/ftplugin/rnoweb.vim b/ftplugin/rnoweb.vim
index f7532ac9e..13b68ef70 100644
--- a/ftplugin/rnoweb.vim
+++ b/ftplugin/rnoweb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rnoweb')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rnoweb', 'ftplugin/rnoweb.vim')
   finish
 endif
 
diff --git a/ftplugin/rpl.vim b/ftplugin/rpl.vim
index 6cd1d5757..3d2d98d39 100644
--- a/ftplugin/rpl.vim
+++ b/ftplugin/rpl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rpl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rpl', 'ftplugin/rpl.vim')
   finish
 endif
 
diff --git a/ftplugin/rrst.vim b/ftplugin/rrst.vim
index 987848437..68661a65b 100644
--- a/ftplugin/rrst.vim
+++ b/ftplugin/rrst.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rrst')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rrst', 'ftplugin/rrst.vim')
   finish
 endif
 
diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index ffb5e8ff4..7c4a82a62 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rst')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rst', 'ftplugin/rst.vim')
   finish
 endif
 
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index 6edeab385..1c6f828fd 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'ftplugin/ruby.vim')
   finish
 endif
 
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim
index c22560905..a131a1d10 100644
--- a/ftplugin/rust.vim
+++ b/ftplugin/rust.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'ftplugin/rust.vim')
   finish
 endif
 
diff --git a/ftplugin/rust/tagbar.vim b/ftplugin/rust/tagbar.vim
index 0a020ed71..32a0564c8 100644
--- a/ftplugin/rust/tagbar.vim
+++ b/ftplugin/rust/tagbar.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'ftplugin/rust/tagbar.vim')
   finish
 endif
 
diff --git a/ftplugin/sass.vim b/ftplugin/sass.vim
index 166c651b6..be0ef93c5 100644
--- a/ftplugin/sass.vim
+++ b/ftplugin/sass.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sass')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sass', 'ftplugin/sass.vim')
   finish
 endif
 
diff --git a/ftplugin/sbt.vim b/ftplugin/sbt.vim
index 73df97ca1..95b015200 100644
--- a/ftplugin/sbt.vim
+++ b/ftplugin/sbt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sbt')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sbt', 'ftplugin/sbt.vim')
   finish
 endif
 
diff --git a/ftplugin/scala.vim b/ftplugin/scala.vim
index 61d799de8..4b6338497 100644
--- a/ftplugin/scala.vim
+++ b/ftplugin/scala.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scala')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scala', 'ftplugin/scala.vim')
   finish
 endif
 
diff --git a/ftplugin/scala.xpt.vim b/ftplugin/scala.xpt.vim
index 900aaaea5..db0d08fee 100644
--- a/ftplugin/scala.xpt.vim
+++ b/ftplugin/scala.xpt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scala')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scala', 'ftplugin/scala.xpt.vim')
   finish
 endif
 
diff --git a/ftplugin/scala/tagbar.vim b/ftplugin/scala/tagbar.vim
index 9ec4164df..d50c77837 100644
--- a/ftplugin/scala/tagbar.vim
+++ b/ftplugin/scala/tagbar.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scala')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scala', 'ftplugin/scala/tagbar.vim')
   finish
 endif
 
diff --git a/ftplugin/scheme.vim b/ftplugin/scheme.vim
index 8b7ebd86f..a5506d3ad 100644
--- a/ftplugin/scheme.vim
+++ b/ftplugin/scheme.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scheme')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scheme', 'ftplugin/scheme.vim')
   finish
 endif
 
diff --git a/ftplugin/screen.vim b/ftplugin/screen.vim
index 7ce75fd94..51ff65cc2 100644
--- a/ftplugin/screen.vim
+++ b/ftplugin/screen.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'screen')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'screen', 'ftplugin/screen.vim')
   finish
 endif
 
diff --git a/ftplugin/scss.vim b/ftplugin/scss.vim
index a80314546..14e024fe1 100644
--- a/ftplugin/scss.vim
+++ b/ftplugin/scss.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scss')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scss', 'ftplugin/scss.vim')
   finish
 endif
 
diff --git a/ftplugin/sensors.vim b/ftplugin/sensors.vim
index 50a54a109..778b9a3d5 100644
--- a/ftplugin/sensors.vim
+++ b/ftplugin/sensors.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sensors')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sensors', 'ftplugin/sensors.vim')
   finish
 endif
 
diff --git a/ftplugin/services.vim b/ftplugin/services.vim
index 3889c46ed..ea86defb1 100644
--- a/ftplugin/services.vim
+++ b/ftplugin/services.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'services')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'services', 'ftplugin/services.vim')
   finish
 endif
 
diff --git a/ftplugin/setserial.vim b/ftplugin/setserial.vim
index d16513444..b1ccf9913 100644
--- a/ftplugin/setserial.vim
+++ b/ftplugin/setserial.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'setserial')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'setserial', 'ftplugin/setserial.vim')
   finish
 endif
 
diff --git a/ftplugin/sexplib.vim b/ftplugin/sexplib.vim
index 7b36d6318..d98f2d15f 100644
--- a/ftplugin/sexplib.vim
+++ b/ftplugin/sexplib.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'ftplugin/sexplib.vim')
   finish
 endif
 
diff --git a/ftplugin/sieve.vim b/ftplugin/sieve.vim
index f4f4457c0..11de97011 100644
--- a/ftplugin/sieve.vim
+++ b/ftplugin/sieve.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sieve')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sieve', 'ftplugin/sieve.vim')
   finish
 endif
 
diff --git a/ftplugin/slim.vim b/ftplugin/slim.vim
index 0456fcb62..022397e55 100644
--- a/ftplugin/slim.vim
+++ b/ftplugin/slim.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slim', 'ftplugin/slim.vim')
   finish
 endif
 
diff --git a/ftplugin/slpconf.vim b/ftplugin/slpconf.vim
index d23a123cf..c8b47e9c8 100644
--- a/ftplugin/slpconf.vim
+++ b/ftplugin/slpconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slpconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slpconf', 'ftplugin/slpconf.vim')
   finish
 endif
 
diff --git a/ftplugin/slpreg.vim b/ftplugin/slpreg.vim
index f43279d6e..7c986b6a0 100644
--- a/ftplugin/slpreg.vim
+++ b/ftplugin/slpreg.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slpreg')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slpreg', 'ftplugin/slpreg.vim')
   finish
 endif
 
diff --git a/ftplugin/slpspi.vim b/ftplugin/slpspi.vim
index eb87fb690..e7d801979 100644
--- a/ftplugin/slpspi.vim
+++ b/ftplugin/slpspi.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slpspi')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slpspi', 'ftplugin/slpspi.vim')
   finish
 endif
 
diff --git a/ftplugin/smt2.vim b/ftplugin/smt2.vim
index 2ba33b9ea..d6cfa5ecb 100644
--- a/ftplugin/smt2.vim
+++ b/ftplugin/smt2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'smt2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'smt2', 'ftplugin/smt2.vim')
   finish
 endif
 
diff --git a/ftplugin/solidity.vim b/ftplugin/solidity.vim
index d5f2903dc..f081a7dd3 100644
--- a/ftplugin/solidity.vim
+++ b/ftplugin/solidity.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'solidity')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'solidity', 'ftplugin/solidity.vim')
   finish
 endif
 
diff --git a/ftplugin/spec.vim b/ftplugin/spec.vim
index fad900f9c..a86610cf7 100644
--- a/ftplugin/spec.vim
+++ b/ftplugin/spec.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'spec')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'spec', 'ftplugin/spec.vim')
   finish
 endif
 
diff --git a/ftplugin/sql.vim b/ftplugin/sql.vim
index 22d926991..578d4ab0d 100644
--- a/ftplugin/sql.vim
+++ b/ftplugin/sql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sql', 'ftplugin/sql.vim')
   finish
 endif
 
diff --git a/ftplugin/sshconfig.vim b/ftplugin/sshconfig.vim
index 6198240ad..6e0ede219 100644
--- a/ftplugin/sshconfig.vim
+++ b/ftplugin/sshconfig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sshconfig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sshconfig', 'ftplugin/sshconfig.vim')
   finish
 endif
 
diff --git a/ftplugin/stylus.vim b/ftplugin/stylus.vim
index d0b49d369..e24bea017 100644
--- a/ftplugin/stylus.vim
+++ b/ftplugin/stylus.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'stylus')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'stylus', 'ftplugin/stylus.vim')
   finish
 endif
 
diff --git a/ftplugin/sudoers.vim b/ftplugin/sudoers.vim
index db3012c9b..45aa07630 100644
--- a/ftplugin/sudoers.vim
+++ b/ftplugin/sudoers.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sudoers')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sudoers', 'ftplugin/sudoers.vim')
   finish
 endif
 
diff --git a/ftplugin/svelte.vim b/ftplugin/svelte.vim
index 977ee9054..cf32ef5bd 100644
--- a/ftplugin/svelte.vim
+++ b/ftplugin/svelte.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'svelte')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'svelte', 'ftplugin/svelte.vim')
   finish
 endif
 
diff --git a/ftplugin/swift.vim b/ftplugin/swift.vim
index e09ff8323..f670b7c44 100644
--- a/ftplugin/swift.vim
+++ b/ftplugin/swift.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'swift')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'swift', 'ftplugin/swift.vim')
   finish
 endif
 
diff --git a/ftplugin/swiftgyb.vim b/ftplugin/swiftgyb.vim
index 3684574ed..46a87ecb2 100644
--- a/ftplugin/swiftgyb.vim
+++ b/ftplugin/swiftgyb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'swiftgyb')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'swiftgyb', 'ftplugin/swiftgyb.vim')
   finish
 endif
 
diff --git a/ftplugin/sxhkdrc.vim b/ftplugin/sxhkdrc.vim
index 4814c5c1f..b58baa1fd 100644
--- a/ftplugin/sxhkdrc.vim
+++ b/ftplugin/sxhkdrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sxhkd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sxhkd', 'ftplugin/sxhkdrc.vim')
   finish
 endif
 
diff --git a/ftplugin/sysctl.vim b/ftplugin/sysctl.vim
index b70f590ac..bcddd17e1 100644
--- a/ftplugin/sysctl.vim
+++ b/ftplugin/sysctl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sysctl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sysctl', 'ftplugin/sysctl.vim')
   finish
 endif
 
diff --git a/ftplugin/systemd.vim b/ftplugin/systemd.vim
index 1479f6837..f6500b149 100644
--- a/ftplugin/systemd.vim
+++ b/ftplugin/systemd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'systemd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'systemd', 'ftplugin/systemd.vim')
   finish
 endif
 
diff --git a/ftplugin/systemverilog.vim b/ftplugin/systemverilog.vim
index f2df69e0c..c0959e485 100644
--- a/ftplugin/systemverilog.vim
+++ b/ftplugin/systemverilog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'systemverilog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'systemverilog', 'ftplugin/systemverilog.vim')
   finish
 endif
 
diff --git a/ftplugin/tablegen.vim b/ftplugin/tablegen.vim
index 1796d2d5a..e34901783 100644
--- a/ftplugin/tablegen.vim
+++ b/ftplugin/tablegen.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'llvm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'ftplugin/tablegen.vim')
   finish
 endif
 
diff --git a/ftplugin/tcl.vim b/ftplugin/tcl.vim
index a70cfc271..c57c56234 100644
--- a/ftplugin/tcl.vim
+++ b/ftplugin/tcl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tcl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tcl', 'ftplugin/tcl.vim')
   finish
 endif
 
diff --git a/ftplugin/terminfo.vim b/ftplugin/terminfo.vim
index 3ea64a55d..9f928eaea 100644
--- a/ftplugin/terminfo.vim
+++ b/ftplugin/terminfo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'terminfo')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'terminfo', 'ftplugin/terminfo.vim')
   finish
 endif
 
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index 0ef25d30c..36b42dbc7 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'terraform')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'terraform', 'ftplugin/terraform.vim')
   finish
 endif
 
diff --git a/ftplugin/text.vim b/ftplugin/text.vim
index 7ec4d83f3..1c7a2edb0 100644
--- a/ftplugin/text.vim
+++ b/ftplugin/text.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'text')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'text', 'ftplugin/text.vim')
   finish
 endif
 
diff --git a/ftplugin/textile.vim b/ftplugin/textile.vim
index 47a200674..7e5cb3871 100644
--- a/ftplugin/textile.vim
+++ b/ftplugin/textile.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'textile')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'textile', 'ftplugin/textile.vim')
   finish
 endif
 
diff --git a/ftplugin/tmux.vim b/ftplugin/tmux.vim
index a8c1669bc..ff0e39a0c 100644
--- a/ftplugin/tmux.vim
+++ b/ftplugin/tmux.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tmux')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tmux', 'ftplugin/tmux.vim')
   finish
 endif
 
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
index b5003f475..8d45ea771 100644
--- a/ftplugin/toml.vim
+++ b/ftplugin/toml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'toml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'toml', 'ftplugin/toml.vim')
   finish
 endif
 
diff --git a/ftplugin/treetop.vim b/ftplugin/treetop.vim
index 190f24b11..ca80c62ef 100644
--- a/ftplugin/treetop.vim
+++ b/ftplugin/treetop.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'treetop')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'treetop', 'ftplugin/treetop.vim')
   finish
 endif
 
diff --git a/ftplugin/tt2html.vim b/ftplugin/tt2html.vim
index 05613ce6c..013fcf9f3 100644
--- a/ftplugin/tt2html.vim
+++ b/ftplugin/tt2html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'perl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'perl', 'ftplugin/tt2html.vim')
   finish
 endif
 
diff --git a/ftplugin/twig.vim b/ftplugin/twig.vim
index 1380d1c32..621a592ca 100644
--- a/ftplugin/twig.vim
+++ b/ftplugin/twig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'twig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'twig', 'ftplugin/twig.vim')
   finish
 endif
 
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index ec06e34df..fe0c7b8db 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'ftplugin/typescript.vim')
   finish
 endif
 
diff --git a/ftplugin/typescriptreact.vim b/ftplugin/typescriptreact.vim
index a1e596996..c13fc9960 100644
--- a/ftplugin/typescriptreact.vim
+++ b/ftplugin/typescriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'ftplugin/typescriptreact.vim')
   finish
 endif
 
diff --git a/ftplugin/udevconf.vim b/ftplugin/udevconf.vim
index 24b870c15..580165941 100644
--- a/ftplugin/udevconf.vim
+++ b/ftplugin/udevconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'udevconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'udevconf', 'ftplugin/udevconf.vim')
   finish
 endif
 
diff --git a/ftplugin/udevperm.vim b/ftplugin/udevperm.vim
index 4775b3e33..0b2944d63 100644
--- a/ftplugin/udevperm.vim
+++ b/ftplugin/udevperm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'udevperm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'udevperm', 'ftplugin/udevperm.vim')
   finish
 endif
 
diff --git a/ftplugin/updatedb.vim b/ftplugin/updatedb.vim
index 4b15b1d72..159651f93 100644
--- a/ftplugin/updatedb.vim
+++ b/ftplugin/updatedb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'updatedb')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'updatedb', 'ftplugin/updatedb.vim')
   finish
 endif
 
diff --git a/ftplugin/vala.vim b/ftplugin/vala.vim
index ffbf427e0..7e8fcc097 100644
--- a/ftplugin/vala.vim
+++ b/ftplugin/vala.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vala')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vala', 'ftplugin/vala.vim')
   finish
 endif
 
diff --git a/ftplugin/vb.vim b/ftplugin/vb.vim
index f2c41f6f0..0b5763f2c 100644
--- a/ftplugin/vb.vim
+++ b/ftplugin/vb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'visual-basic')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'visual-basic', 'ftplugin/vb.vim')
   finish
 endif
 
diff --git a/ftplugin/verilog.vim b/ftplugin/verilog.vim
index 168992182..5c62644db 100644
--- a/ftplugin/verilog.vim
+++ b/ftplugin/verilog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'verilog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'verilog', 'ftplugin/verilog.vim')
   finish
 endif
 
diff --git a/ftplugin/vhdl.vim b/ftplugin/vhdl.vim
index e351ea5c3..cad03b5a9 100644
--- a/ftplugin/vhdl.vim
+++ b/ftplugin/vhdl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vhdl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vhdl', 'ftplugin/vhdl.vim')
   finish
 endif
 
diff --git a/ftplugin/vlang.vim b/ftplugin/vlang.vim
index 88e4003e3..cda16cba8 100644
--- a/ftplugin/vlang.vim
+++ b/ftplugin/vlang.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'v')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'v', 'ftplugin/vlang.vim')
   finish
 endif
 
diff --git a/ftplugin/vroom.vim b/ftplugin/vroom.vim
index 3ebc49ce4..9f99a4e62 100644
--- a/ftplugin/vroom.vim
+++ b/ftplugin/vroom.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vroom')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vroom', 'ftplugin/vroom.vim')
   finish
 endif
 
diff --git a/ftplugin/vue.vim b/ftplugin/vue.vim
index 7babb0589..965666386 100644
--- a/ftplugin/vue.vim
+++ b/ftplugin/vue.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vue')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vue', 'ftplugin/vue.vim')
   finish
 endif
 
diff --git a/ftplugin/wast.vim b/ftplugin/wast.vim
index ac9ec8e6c..4888e801a 100644
--- a/ftplugin/wast.vim
+++ b/ftplugin/wast.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'wast')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'wast', 'ftplugin/wast.vim')
   finish
 endif
 
diff --git a/ftplugin/xdefaults.vim b/ftplugin/xdefaults.vim
index 73491e1e0..ec5444349 100644
--- a/ftplugin/xdefaults.vim
+++ b/ftplugin/xdefaults.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xdefaults')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xdefaults', 'ftplugin/xdefaults.vim')
   finish
 endif
 
diff --git a/ftplugin/xf86conf.vim b/ftplugin/xf86conf.vim
index 47870d192..0f689392b 100644
--- a/ftplugin/xf86conf.vim
+++ b/ftplugin/xf86conf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xf86conf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xf86conf', 'ftplugin/xf86conf.vim')
   finish
 endif
 
diff --git a/ftplugin/xhtml.vim b/ftplugin/xhtml.vim
index f7fae2f80..1e54f3481 100644
--- a/ftplugin/xhtml.vim
+++ b/ftplugin/xhtml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xhtml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xhtml', 'ftplugin/xhtml.vim')
   finish
 endif
 
diff --git a/ftplugin/xinetd.vim b/ftplugin/xinetd.vim
index a28129ea6..afbdeacf0 100644
--- a/ftplugin/xinetd.vim
+++ b/ftplugin/xinetd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xinetd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xinetd', 'ftplugin/xinetd.vim')
   finish
 endif
 
diff --git a/ftplugin/xmodmap.vim b/ftplugin/xmodmap.vim
index 05640272c..e4186764c 100644
--- a/ftplugin/xmodmap.vim
+++ b/ftplugin/xmodmap.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xmodmap')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xmodmap', 'ftplugin/xmodmap.vim')
   finish
 endif
 
diff --git a/ftplugin/xs.vim b/ftplugin/xs.vim
index 29ad519a5..c93409d48 100644
--- a/ftplugin/xs.vim
+++ b/ftplugin/xs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'perl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'perl', 'ftplugin/xs.vim')
   finish
 endif
 
diff --git a/ftplugin/xsd.vim b/ftplugin/xsd.vim
index 6199d82ba..0b551124d 100644
--- a/ftplugin/xsd.vim
+++ b/ftplugin/xsd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xsd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xsd', 'ftplugin/xsd.vim')
   finish
 endif
 
diff --git a/ftplugin/xslt.vim b/ftplugin/xslt.vim
index ee5b40441..176c5108f 100644
--- a/ftplugin/xslt.vim
+++ b/ftplugin/xslt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xslt')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xslt', 'ftplugin/xslt.vim')
   finish
 endif
 
diff --git a/ftplugin/yaml.vim b/ftplugin/yaml.vim
index b10e44333..71c7308d8 100644
--- a/ftplugin/yaml.vim
+++ b/ftplugin/yaml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'yaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'yaml', 'ftplugin/yaml.vim')
   finish
 endif
 
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index f16f24a85..3b88372ce 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'ftplugin/zig.vim')
   finish
 endif
 
diff --git a/ftplugin/zimbu.vim b/ftplugin/zimbu.vim
index bdcaacd11..a16fe8c02 100644
--- a/ftplugin/zimbu.vim
+++ b/ftplugin/zimbu.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zimbu')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zimbu', 'ftplugin/zimbu.vim')
   finish
 endif
 
diff --git a/indent/Jenkinsfile.vim b/indent/Jenkinsfile.vim
index dc280b906..e0f5407dd 100644
--- a/indent/Jenkinsfile.vim
+++ b/indent/Jenkinsfile.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jenkins')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jenkins', 'indent/Jenkinsfile.vim')
   finish
 endif
 
diff --git a/indent/aap.vim b/indent/aap.vim
index 4ea024ab9..d149f9988 100644
--- a/indent/aap.vim
+++ b/indent/aap.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'aap')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'aap', 'indent/aap.vim')
   finish
 endif
 
diff --git a/indent/ada.vim b/indent/ada.vim
index 1e8f7f7e4..1127ca119 100644
--- a/indent/ada.vim
+++ b/indent/ada.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ada')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ada', 'indent/ada.vim')
   finish
 endif
 
diff --git a/indent/ansible.vim b/indent/ansible.vim
index 4a8afea77..65a51a64c 100644
--- a/indent/ansible.vim
+++ b/indent/ansible.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ansible')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ansible', 'indent/ansible.vim')
   finish
 endif
 
diff --git a/indent/ant.vim b/indent/ant.vim
index 5dbf0f7bf..51de9c9ea 100644
--- a/indent/ant.vim
+++ b/indent/ant.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ant')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ant', 'indent/ant.vim')
   finish
 endif
 
diff --git a/indent/applescript.vim b/indent/applescript.vim
index 418b61d0c..d25342b90 100644
--- a/indent/applescript.vim
+++ b/indent/applescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'applescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'applescript', 'indent/applescript.vim')
   finish
 endif
 
diff --git a/indent/arduino.vim b/indent/arduino.vim
index 660bf68be..87fa1653f 100644
--- a/indent/arduino.vim
+++ b/indent/arduino.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'arduino')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'arduino', 'indent/arduino.vim')
   finish
 endif
 
diff --git a/indent/autohotkey.vim b/indent/autohotkey.vim
index a4011a5f4..cd97cd65b 100644
--- a/indent/autohotkey.vim
+++ b/indent/autohotkey.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'autohotkey')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'autohotkey', 'indent/autohotkey.vim')
   finish
 endif
 
diff --git a/indent/automake.vim b/indent/automake.vim
index 65253ae76..afb67e9d0 100644
--- a/indent/automake.vim
+++ b/indent/automake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'automake')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'automake', 'indent/automake.vim')
   finish
 endif
 
diff --git a/indent/awk.vim b/indent/awk.vim
index eb322da9a..3b5984075 100644
--- a/indent/awk.vim
+++ b/indent/awk.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'awk')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'awk', 'indent/awk.vim')
   finish
 endif
 
diff --git a/indent/bib.vim b/indent/bib.vim
index f0746fe33..5c61348af 100644
--- a/indent/bib.vim
+++ b/indent/bib.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bib')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bib', 'indent/bib.vim')
   finish
 endif
 
diff --git a/indent/blade.vim b/indent/blade.vim
index 69198b0fe..c44d83f84 100644
--- a/indent/blade.vim
+++ b/indent/blade.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'blade')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'blade', 'indent/blade.vim')
   finish
 endif
 
diff --git a/indent/bst.vim b/indent/bst.vim
index 31b620397..5a60bdc01 100644
--- a/indent/bst.vim
+++ b/indent/bst.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bst')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bst', 'indent/bst.vim')
   finish
 endif
 
diff --git a/indent/bzl.vim b/indent/bzl.vim
index a1ea53cf4..8780cc545 100644
--- a/indent/bzl.vim
+++ b/indent/bzl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bzl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bzl', 'indent/bzl.vim')
   finish
 endif
 
diff --git a/indent/cabal.vim b/indent/cabal.vim
index 526d9b4e1..28afe40cb 100644
--- a/indent/cabal.vim
+++ b/indent/cabal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haskell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haskell', 'indent/cabal.vim')
   finish
 endif
 
diff --git a/indent/caddyfile.vim b/indent/caddyfile.vim
index fd31408ad..ded21ebdb 100644
--- a/indent/caddyfile.vim
+++ b/indent/caddyfile.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'caddyfile')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'caddyfile', 'indent/caddyfile.vim')
   finish
 endif
 
diff --git a/indent/cdl.vim b/indent/cdl.vim
index 3519c04a4..9c261276f 100644
--- a/indent/cdl.vim
+++ b/indent/cdl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cdl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cdl', 'indent/cdl.vim')
   finish
 endif
 
diff --git a/indent/ch.vim b/indent/ch.vim
index cb0774133..d3b0c17cc 100644
--- a/indent/ch.vim
+++ b/indent/ch.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ch')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ch', 'indent/ch.vim')
   finish
 endif
 
diff --git a/indent/chaiscript.vim b/indent/chaiscript.vim
index e01b3b162..a09b8ad93 100644
--- a/indent/chaiscript.vim
+++ b/indent/chaiscript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'chaiscript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'chaiscript', 'indent/chaiscript.vim')
   finish
 endif
 
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 9934ce0db..0ff1ea7e3 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'clojure')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'clojure', 'indent/clojure.vim')
   finish
 endif
 
diff --git a/indent/cmake.vim b/indent/cmake.vim
index 2449143fd..b15bbb0b8 100644
--- a/indent/cmake.vim
+++ b/indent/cmake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cmake')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cmake', 'indent/cmake.vim')
   finish
 endif
 
diff --git a/indent/cobol.vim b/indent/cobol.vim
index c4eba9513..7a0b7f074 100644
--- a/indent/cobol.vim
+++ b/indent/cobol.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cobol')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cobol', 'indent/cobol.vim')
   finish
 endif
 
diff --git a/indent/coffee.vim b/indent/coffee.vim
index 620574b9c..94e967492 100644
--- a/indent/coffee.vim
+++ b/indent/coffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'coffee-script')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'coffee-script', 'indent/coffee.vim')
   finish
 endif
 
diff --git a/indent/config.vim b/indent/config.vim
index 7bdeac183..986b8c4dc 100644
--- a/indent/config.vim
+++ b/indent/config.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'config')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'config', 'indent/config.vim')
   finish
 endif
 
diff --git a/indent/crystal.vim b/indent/crystal.vim
index 724f9611d..b0fe30453 100644
--- a/indent/crystal.vim
+++ b/indent/crystal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'indent/crystal.vim')
   finish
 endif
 
diff --git a/indent/cs.vim b/indent/cs.vim
index b69407ec7..88dcd6039 100644
--- a/indent/cs.vim
+++ b/indent/cs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cs')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cs', 'indent/cs.vim')
   finish
 endif
 
diff --git a/indent/css.vim b/indent/css.vim
index 27366aecc..b383d4487 100644
--- a/indent/css.vim
+++ b/indent/css.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'css')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'css', 'indent/css.vim')
   finish
 endif
 
diff --git a/indent/cucumber.vim b/indent/cucumber.vim
index ad473be62..cf85c5751 100644
--- a/indent/cucumber.vim
+++ b/indent/cucumber.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cucumber')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cucumber', 'indent/cucumber.vim')
   finish
 endif
 
diff --git a/indent/cuda.vim b/indent/cuda.vim
index c0b93fadb..ea384d8e7 100644
--- a/indent/cuda.vim
+++ b/indent/cuda.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cuda')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cuda', 'indent/cuda.vim')
   finish
 endif
 
diff --git a/indent/cython.vim b/indent/cython.vim
index c650165e7..3aaae8650 100644
--- a/indent/cython.vim
+++ b/indent/cython.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'python-indent')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'python-indent', 'indent/cython.vim')
   finish
 endif
 
diff --git a/indent/d.vim b/indent/d.vim
index 4a630961c..ca1994c5f 100644
--- a/indent/d.vim
+++ b/indent/d.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dlang')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dlang', 'indent/d.vim')
   finish
 endif
 
diff --git a/indent/dart.vim b/indent/dart.vim
index 882ac7636..4f08a36f0 100644
--- a/indent/dart.vim
+++ b/indent/dart.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dart')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dart', 'indent/dart.vim')
   finish
 endif
 
diff --git a/indent/dictconf.vim b/indent/dictconf.vim
index 06f2abb29..fa022ad44 100644
--- a/indent/dictconf.vim
+++ b/indent/dictconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dictconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dictconf', 'indent/dictconf.vim')
   finish
 endif
 
diff --git a/indent/dictdconf.vim b/indent/dictdconf.vim
index 6aed3f503..8b12b18ad 100644
--- a/indent/dictdconf.vim
+++ b/indent/dictdconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dictdconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dictdconf', 'indent/dictdconf.vim')
   finish
 endif
 
diff --git a/indent/dosbatch.vim b/indent/dosbatch.vim
index 5c815bde1..a98c38868 100644
--- a/indent/dosbatch.vim
+++ b/indent/dosbatch.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dosbatch')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dosbatch', 'indent/dosbatch.vim')
   finish
 endif
 
diff --git a/indent/dtd.vim b/indent/dtd.vim
index c8470bd93..7faa9483f 100644
--- a/indent/dtd.vim
+++ b/indent/dtd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dtd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dtd', 'indent/dtd.vim')
   finish
 endif
 
diff --git a/indent/dune.vim b/indent/dune.vim
index 0a658da46..5dbe9d30a 100644
--- a/indent/dune.vim
+++ b/indent/dune.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'indent/dune.vim')
   finish
 endif
 
diff --git a/indent/dylan.vim b/indent/dylan.vim
index d7a4fc4f8..4e83a51da 100644
--- a/indent/dylan.vim
+++ b/indent/dylan.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dylan')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dylan', 'indent/dylan.vim')
   finish
 endif
 
diff --git a/indent/ecrystal.vim b/indent/ecrystal.vim
index ba8469060..dcb7a9710 100644
--- a/indent/ecrystal.vim
+++ b/indent/ecrystal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'indent/ecrystal.vim')
   finish
 endif
 
diff --git a/indent/eelixir.vim b/indent/eelixir.vim
index 6485af7b0..368d05f6f 100644
--- a/indent/eelixir.vim
+++ b/indent/eelixir.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'indent/eelixir.vim')
   finish
 endif
 
diff --git a/indent/elixir.vim b/indent/elixir.vim
index df146aded..4ff1257aa 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'indent/elixir.vim')
   finish
 endif
 
diff --git a/indent/elm.vim b/indent/elm.vim
index 65253b0bf..ffdcdacd7 100644
--- a/indent/elm.vim
+++ b/indent/elm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elm', 'indent/elm.vim')
   finish
 endif
 
diff --git a/indent/ember-script.vim b/indent/ember-script.vim
index 207c2183a..fd184bd0d 100644
--- a/indent/ember-script.vim
+++ b/indent/ember-script.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'emberscript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'emberscript', 'indent/ember-script.vim')
   finish
 endif
 
diff --git a/indent/emblem.vim b/indent/emblem.vim
index 7c1db44b9..393ffd2bd 100644
--- a/indent/emblem.vim
+++ b/indent/emblem.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'emblem')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'emblem', 'indent/emblem.vim')
   finish
 endif
 
diff --git a/indent/erlang.vim b/indent/erlang.vim
index 907130ed2..1636cc577 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'erlang')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'erlang', 'indent/erlang.vim')
   finish
 endif
 
diff --git a/indent/eruby.vim b/indent/eruby.vim
index a762019a0..74cd1d2f0 100644
--- a/indent/eruby.vim
+++ b/indent/eruby.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'indent/eruby.vim')
   finish
 endif
 
diff --git a/indent/eterm.vim b/indent/eterm.vim
index abdf120f2..88502cf47 100644
--- a/indent/eterm.vim
+++ b/indent/eterm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'eterm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'eterm', 'indent/eterm.vim')
   finish
 endif
 
diff --git a/indent/falcon.vim b/indent/falcon.vim
index fbff060c3..eb1b6f18d 100644
--- a/indent/falcon.vim
+++ b/indent/falcon.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'falcon')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'falcon', 'indent/falcon.vim')
   finish
 endif
 
diff --git a/indent/fennel.vim b/indent/fennel.vim
index 920ac6146..70d29f319 100644
--- a/indent/fennel.vim
+++ b/indent/fennel.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fennel')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fennel', 'indent/fennel.vim')
   finish
 endif
 
diff --git a/indent/fish.vim b/indent/fish.vim
index 2fa1c1a7f..b91f99453 100644
--- a/indent/fish.vim
+++ b/indent/fish.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fish')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fish', 'indent/fish.vim')
   finish
 endif
 
diff --git a/indent/fortran.vim b/indent/fortran.vim
index 4a7c71fdd..0f08a9961 100644
--- a/indent/fortran.vim
+++ b/indent/fortran.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fortran')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fortran', 'indent/fortran.vim')
   finish
 endif
 
diff --git a/indent/framescript.vim b/indent/framescript.vim
index 9457dbe89..883f4a4d6 100644
--- a/indent/framescript.vim
+++ b/indent/framescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'framescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'framescript', 'indent/framescript.vim')
   finish
 endif
 
diff --git a/indent/fsharp.vim b/indent/fsharp.vim
index ede28f333..c9d6ad497 100644
--- a/indent/fsharp.vim
+++ b/indent/fsharp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fsharp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fsharp', 'indent/fsharp.vim')
   finish
 endif
 
diff --git a/indent/gdscript3.vim b/indent/gdscript3.vim
index fcac563aa..8d69ed1b7 100644
--- a/indent/gdscript3.vim
+++ b/indent/gdscript3.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gdscript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gdscript', 'indent/gdscript3.vim')
   finish
 endif
 
diff --git a/indent/gitconfig.vim b/indent/gitconfig.vim
index 83ae83578..fbbbde92e 100644
--- a/indent/gitconfig.vim
+++ b/indent/gitconfig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'git')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'git', 'indent/gitconfig.vim')
   finish
 endif
 
diff --git a/indent/gitolite.vim b/indent/gitolite.vim
index 0386107f0..a9816e978 100644
--- a/indent/gitolite.vim
+++ b/indent/gitolite.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gitolite')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gitolite', 'indent/gitolite.vim')
   finish
 endif
 
diff --git a/indent/glsl.vim b/indent/glsl.vim
index 889bb0fd4..b16fec474 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'glsl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'glsl', 'indent/glsl.vim')
   finish
 endif
 
diff --git a/indent/go.vim b/indent/go.vim
index e175c8e7b..b1894d48a 100644
--- a/indent/go.vim
+++ b/indent/go.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'indent/go.vim')
   finish
 endif
 
diff --git a/indent/gohtmltmpl.vim b/indent/gohtmltmpl.vim
index c29f4e47a..59e1eb841 100644
--- a/indent/gohtmltmpl.vim
+++ b/indent/gohtmltmpl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'indent/gohtmltmpl.vim')
   finish
 endif
 
diff --git a/indent/graphql.vim b/indent/graphql.vim
index c64d446aa..97c563090 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'indent/graphql.vim')
   finish
 endif
 
diff --git a/indent/haml.vim b/indent/haml.vim
index ef0318d6d..f0efff186 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haml', 'indent/haml.vim')
   finish
 endif
 
diff --git a/indent/hamster.vim b/indent/hamster.vim
index b2f8af968..86f86bf8d 100644
--- a/indent/hamster.vim
+++ b/indent/hamster.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hamster')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hamster', 'indent/hamster.vim')
   finish
 endif
 
diff --git a/indent/handlebars.vim b/indent/handlebars.vim
index 7c2ea7b17..41dad4cce 100644
--- a/indent/handlebars.vim
+++ b/indent/handlebars.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'handlebars')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'handlebars', 'indent/handlebars.vim')
   finish
 endif
 
diff --git a/indent/haskell.vim b/indent/haskell.vim
index c652ad36a..cefa08457 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haskell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haskell', 'indent/haskell.vim')
   finish
 endif
 
diff --git a/indent/hcl.vim b/indent/hcl.vim
index 855afcb95..346e8585d 100644
--- a/indent/hcl.vim
+++ b/indent/hcl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hcl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hcl', 'indent/hcl.vim')
   finish
 endif
 
diff --git a/indent/hog.vim b/indent/hog.vim
index 8f32e6b7b..a712f525c 100644
--- a/indent/hog.vim
+++ b/indent/hog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hog', 'indent/hog.vim')
   finish
 endif
 
diff --git a/indent/html.vim b/indent/html.vim
index 25e306f32..07c6aa6f6 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html', 'indent/html.vim')
   finish
 endif
 
diff --git a/indent/htmldjango.vim b/indent/htmldjango.vim
index 33be44c36..abe66f876 100644
--- a/indent/htmldjango.vim
+++ b/indent/htmldjango.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'htmldjango')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'htmldjango', 'indent/htmldjango.vim')
   finish
 endif
 
diff --git a/indent/idris.vim b/indent/idris.vim
index efdfd7ceb..c4e41c214 100644
--- a/indent/idris.vim
+++ b/indent/idris.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris', 'indent/idris.vim')
   finish
 endif
 
diff --git a/indent/idris2.vim b/indent/idris2.vim
index f497f5b9f..e99d09d85 100644
--- a/indent/idris2.vim
+++ b/indent/idris2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris2', 'indent/idris2.vim')
   finish
 endif
 
diff --git a/indent/j.vim b/indent/j.vim
index 939bb98df..fd00886b4 100644
--- a/indent/j.vim
+++ b/indent/j.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'j')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'j', 'indent/j.vim')
   finish
 endif
 
diff --git a/indent/java.vim b/indent/java.vim
index 389c47dda..19f377b23 100644
--- a/indent/java.vim
+++ b/indent/java.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'java')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'java', 'indent/java.vim')
   finish
 endif
 
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 28e776582..0a3b3bc2d 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'javascript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'javascript', 'indent/javascript.vim')
   finish
 endif
 
diff --git a/indent/json.vim b/indent/json.vim
index 43116a607..26c321003 100644
--- a/indent/json.vim
+++ b/indent/json.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'json')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'json', 'indent/json.vim')
   finish
 endif
 
diff --git a/indent/jsonc.vim b/indent/jsonc.vim
index baffdae84..2aed4652a 100644
--- a/indent/jsonc.vim
+++ b/indent/jsonc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsonc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsonc', 'indent/jsonc.vim')
   finish
 endif
 
diff --git a/indent/jsp.vim b/indent/jsp.vim
index 2a80514f2..b0da23faf 100644
--- a/indent/jsp.vim
+++ b/indent/jsp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsp', 'indent/jsp.vim')
   finish
 endif
 
diff --git a/indent/jst.vim b/indent/jst.vim
index 7b37bc036..89e8004bc 100644
--- a/indent/jst.vim
+++ b/indent/jst.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jst')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jst', 'indent/jst.vim')
   finish
 endif
 
diff --git a/indent/julia.vim b/indent/julia.vim
index f5b6dc40e..c2a55922b 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'julia')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'julia', 'indent/julia.vim')
   finish
 endif
 
diff --git a/indent/kotlin.vim b/indent/kotlin.vim
index 121a56dff..8fdb2f850 100644
--- a/indent/kotlin.vim
+++ b/indent/kotlin.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'kotlin')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'kotlin', 'indent/kotlin.vim')
   finish
 endif
 
diff --git a/indent/ld.vim b/indent/ld.vim
index 01745f1b1..339c15425 100644
--- a/indent/ld.vim
+++ b/indent/ld.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ld')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ld', 'indent/ld.vim')
   finish
 endif
 
diff --git a/indent/ledger.vim b/indent/ledger.vim
index 5f9e4e860..74c0eaed9 100644
--- a/indent/ledger.vim
+++ b/indent/ledger.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ledger')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ledger', 'indent/ledger.vim')
   finish
 endif
 
diff --git a/indent/less.vim b/indent/less.vim
index 0949e5f3b..a3c8682a5 100644
--- a/indent/less.vim
+++ b/indent/less.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'less')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'less', 'indent/less.vim')
   finish
 endif
 
diff --git a/indent/lifelines.vim b/indent/lifelines.vim
index 1cbc84183..960a01b3c 100644
--- a/indent/lifelines.vim
+++ b/indent/lifelines.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lifelines')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lifelines', 'indent/lifelines.vim')
   finish
 endif
 
diff --git a/indent/lilypond.vim b/indent/lilypond.vim
index a307779ea..3d3edb053 100644
--- a/indent/lilypond.vim
+++ b/indent/lilypond.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lilypond')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'indent/lilypond.vim')
   finish
 endif
 
diff --git a/indent/liquid.vim b/indent/liquid.vim
index d708001ac..c02140e2b 100644
--- a/indent/liquid.vim
+++ b/indent/liquid.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'liquid')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'liquid', 'indent/liquid.vim')
   finish
 endif
 
diff --git a/indent/lisp.vim b/indent/lisp.vim
index fc7d50906..c6439725d 100644
--- a/indent/lisp.vim
+++ b/indent/lisp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lisp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lisp', 'indent/lisp.vim')
   finish
 endif
 
diff --git a/indent/litcoffee.vim b/indent/litcoffee.vim
index 35c6b2956..fe378b9bc 100644
--- a/indent/litcoffee.vim
+++ b/indent/litcoffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'coffee-script')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'coffee-script', 'indent/litcoffee.vim')
   finish
 endif
 
diff --git a/indent/llvm.vim b/indent/llvm.vim
index dd57c3939..bd5ce3051 100644
--- a/indent/llvm.vim
+++ b/indent/llvm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'llvm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'indent/llvm.vim')
   finish
 endif
 
diff --git a/indent/logtalk.vim b/indent/logtalk.vim
index c834bce77..8684d1e19 100644
--- a/indent/logtalk.vim
+++ b/indent/logtalk.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'logtalk')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'logtalk', 'indent/logtalk.vim')
   finish
 endif
 
diff --git a/indent/ls.vim b/indent/ls.vim
index a65c4e443..8bba7d774 100644
--- a/indent/ls.vim
+++ b/indent/ls.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'livescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'livescript', 'indent/ls.vim')
   finish
 endif
 
diff --git a/indent/lua.vim b/indent/lua.vim
index 755135b9e..7391ea2b5 100644
--- a/indent/lua.vim
+++ b/indent/lua.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lua')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lua', 'indent/lua.vim')
   finish
 endif
 
diff --git a/indent/mail.vim b/indent/mail.vim
index 8369ac8ea..633a2da5d 100644
--- a/indent/mail.vim
+++ b/indent/mail.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mail')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mail', 'indent/mail.vim')
   finish
 endif
 
diff --git a/indent/make.vim b/indent/make.vim
index 313896cae..2fef5846c 100644
--- a/indent/make.vim
+++ b/indent/make.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'make')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'make', 'indent/make.vim')
   finish
 endif
 
diff --git a/indent/mako.vim b/indent/mako.vim
index f48a4121b..fdc9735f7 100644
--- a/indent/mako.vim
+++ b/indent/mako.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mako')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mako', 'indent/mako.vim')
   finish
 endif
 
diff --git a/indent/markdown.vim b/indent/markdown.vim
index 6d1673c91..dd8888f45 100644
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'markdown')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'markdown', 'indent/markdown.vim')
   finish
 endif
 
diff --git a/indent/meson.vim b/indent/meson.vim
index 4d0f34150..5480770f8 100644
--- a/indent/meson.vim
+++ b/indent/meson.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'meson')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'meson', 'indent/meson.vim')
   finish
 endif
 
diff --git a/indent/mf.vim b/indent/mf.vim
index 9bb9f3de4..47a21542f 100644
--- a/indent/mf.vim
+++ b/indent/mf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mf', 'indent/mf.vim')
   finish
 endif
 
diff --git a/indent/moon.vim b/indent/moon.vim
index 709459e13..11f898959 100644
--- a/indent/moon.vim
+++ b/indent/moon.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'moonscript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'moonscript', 'indent/moon.vim')
   finish
 endif
 
diff --git a/indent/mp.vim b/indent/mp.vim
index a5c7bb8d6..b616b29c5 100644
--- a/indent/mp.vim
+++ b/indent/mp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mp', 'indent/mp.vim')
   finish
 endif
 
diff --git a/indent/mustache.vim b/indent/mustache.vim
index 242a21707..bdf4d04d3 100644
--- a/indent/mustache.vim
+++ b/indent/mustache.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'handlebars')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'handlebars', 'indent/mustache.vim')
   finish
 endif
 
diff --git a/indent/nginx.vim b/indent/nginx.vim
index 0e0948552..e9335e7af 100644
--- a/indent/nginx.vim
+++ b/indent/nginx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nginx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nginx', 'indent/nginx.vim')
   finish
 endif
 
diff --git a/indent/nim.vim b/indent/nim.vim
index 0292a7f92..0c2b4f6ef 100644
--- a/indent/nim.vim
+++ b/indent/nim.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nim', 'indent/nim.vim')
   finish
 endif
 
diff --git a/indent/nix.vim b/indent/nix.vim
index cf8a19608..08ff3f0e6 100644
--- a/indent/nix.vim
+++ b/indent/nix.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nix')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nix', 'indent/nix.vim')
   finish
 endif
 
diff --git a/indent/nsis.vim b/indent/nsis.vim
index 886ee4b76..d6e65634f 100644
--- a/indent/nsis.vim
+++ b/indent/nsis.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nsis')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nsis', 'indent/nsis.vim')
   finish
 endif
 
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index c902d8db4..82e5825e0 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'indent/ocaml.vim')
   finish
 endif
 
diff --git a/indent/occam.vim b/indent/occam.vim
index cc94f2d65..c9949c3f0 100644
--- a/indent/occam.vim
+++ b/indent/occam.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'occam')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'occam', 'indent/occam.vim')
   finish
 endif
 
diff --git a/indent/octave.vim b/indent/octave.vim
index 89614f20e..0e34be555 100644
--- a/indent/octave.vim
+++ b/indent/octave.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'octave')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'octave', 'indent/octave.vim')
   finish
 endif
 
diff --git a/indent/odin.vim b/indent/odin.vim
index f0a4cba0b..279d39efb 100644
--- a/indent/odin.vim
+++ b/indent/odin.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'odin')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'odin', 'indent/odin.vim')
   finish
 endif
 
diff --git a/indent/omake.vim b/indent/omake.vim
index 5c1cc446b..7fd4bb2b8 100644
--- a/indent/omake.vim
+++ b/indent/omake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'indent/omake.vim')
   finish
 endif
 
diff --git a/indent/opencl.vim b/indent/opencl.vim
index 2fa56d7d5..65ed1fa6a 100644
--- a/indent/opencl.vim
+++ b/indent/opencl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'opencl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'opencl', 'indent/opencl.vim')
   finish
 endif
 
diff --git a/indent/pascal.vim b/indent/pascal.vim
index 968171205..9e1c3e960 100644
--- a/indent/pascal.vim
+++ b/indent/pascal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pascal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pascal', 'indent/pascal.vim')
   finish
 endif
 
diff --git a/indent/perl.vim b/indent/perl.vim
index c6c879a82..26c129e03 100644
--- a/indent/perl.vim
+++ b/indent/perl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'perl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'perl', 'indent/perl.vim')
   finish
 endif
 
diff --git a/indent/pgsql.vim b/indent/pgsql.vim
index e1823c013..8c65c6680 100644
--- a/indent/pgsql.vim
+++ b/indent/pgsql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pgsql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pgsql', 'indent/pgsql.vim')
   finish
 endif
 
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index 318090d8b..71af587cf 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'plantuml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'plantuml', 'indent/plantuml.vim')
   finish
 endif
 
diff --git a/indent/pony.vim b/indent/pony.vim
index 718bf6953..21035eb9b 100644
--- a/indent/pony.vim
+++ b/indent/pony.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pony')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pony', 'indent/pony.vim')
   finish
 endif
 
diff --git a/indent/postscr.vim b/indent/postscr.vim
index e07006731..e3ba79425 100644
--- a/indent/postscr.vim
+++ b/indent/postscr.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'postscr')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'postscr', 'indent/postscr.vim')
   finish
 endif
 
diff --git a/indent/pov.vim b/indent/pov.vim
index cccc6858b..ae2d15e8f 100644
--- a/indent/pov.vim
+++ b/indent/pov.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pov')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pov', 'indent/pov.vim')
   finish
 endif
 
diff --git a/indent/prolog.vim b/indent/prolog.vim
index 6568797d2..d23510a73 100644
--- a/indent/prolog.vim
+++ b/indent/prolog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'prolog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'prolog', 'indent/prolog.vim')
   finish
 endif
 
diff --git a/indent/proto.vim b/indent/proto.vim
index 3ec88be72..10567d83a 100644
--- a/indent/proto.vim
+++ b/indent/proto.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'protobuf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'protobuf', 'indent/proto.vim')
   finish
 endif
 
diff --git a/indent/ps1.vim b/indent/ps1.vim
index edc5b3b06..668ecbe3f 100644
--- a/indent/ps1.vim
+++ b/indent/ps1.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'powershell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'powershell', 'indent/ps1.vim')
   finish
 endif
 
diff --git a/indent/pug.vim b/indent/pug.vim
index b9b8e5a38..07c451403 100644
--- a/indent/pug.vim
+++ b/indent/pug.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pug')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pug', 'indent/pug.vim')
   finish
 endif
 
diff --git a/indent/puppet.vim b/indent/puppet.vim
index 461766488..cabde8433 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'puppet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'indent/puppet.vim')
   finish
 endif
 
diff --git a/indent/purescript.vim b/indent/purescript.vim
index e3028bc1e..048c1e807 100644
--- a/indent/purescript.vim
+++ b/indent/purescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'purescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'purescript', 'indent/purescript.vim')
   finish
 endif
 
diff --git a/indent/pyrex.vim b/indent/pyrex.vim
index a2bd93d0b..412088e3a 100644
--- a/indent/pyrex.vim
+++ b/indent/pyrex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pyrex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pyrex', 'indent/pyrex.vim')
   finish
 endif
 
diff --git a/indent/python.vim b/indent/python.vim
index c650165e7..aa7f39a76 100644
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'python-indent')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'python-indent', 'indent/python.vim')
   finish
 endif
 
diff --git a/indent/qml.vim b/indent/qml.vim
index 19ccbf560..b91fe848b 100644
--- a/indent/qml.vim
+++ b/indent/qml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'qml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'qml', 'indent/qml.vim')
   finish
 endif
 
diff --git a/indent/racket.vim b/indent/racket.vim
index 18d75452a..141171b63 100644
--- a/indent/racket.vim
+++ b/indent/racket.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'racket')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'racket', 'indent/racket.vim')
   finish
 endif
 
diff --git a/indent/raku.vim b/indent/raku.vim
index 7dbbabf2d..be46bac6d 100644
--- a/indent/raku.vim
+++ b/indent/raku.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'raku')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'raku', 'indent/raku.vim')
   finish
 endif
 
diff --git a/indent/razor.vim b/indent/razor.vim
index 38d479b7d..89062a3bc 100644
--- a/indent/razor.vim
+++ b/indent/razor.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'razor')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'razor', 'indent/razor.vim')
   finish
 endif
 
diff --git a/indent/readline.vim b/indent/readline.vim
index 7b7ba832b..100878fa4 100644
--- a/indent/readline.vim
+++ b/indent/readline.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'readline')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'readline', 'indent/readline.vim')
   finish
 endif
 
diff --git a/indent/reason.vim b/indent/reason.vim
index df6552351..3515fb8b6 100644
--- a/indent/reason.vim
+++ b/indent/reason.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'reason')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'reason', 'indent/reason.vim')
   finish
 endif
 
diff --git a/indent/rmd.vim b/indent/rmd.vim
index 108e862e5..77e3e51d5 100644
--- a/indent/rmd.vim
+++ b/indent/rmd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rmd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rmd', 'indent/rmd.vim')
   finish
 endif
 
diff --git a/indent/rnoweb.vim b/indent/rnoweb.vim
index f0ae543b3..6be0c3b30 100644
--- a/indent/rnoweb.vim
+++ b/indent/rnoweb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rnoweb')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rnoweb', 'indent/rnoweb.vim')
   finish
 endif
 
diff --git a/indent/rpl.vim b/indent/rpl.vim
index b6180e7c4..b9d27f83d 100644
--- a/indent/rpl.vim
+++ b/indent/rpl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rpl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rpl', 'indent/rpl.vim')
   finish
 endif
 
diff --git a/indent/rrst.vim b/indent/rrst.vim
index 906094778..c8e377ce0 100644
--- a/indent/rrst.vim
+++ b/indent/rrst.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rrst')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rrst', 'indent/rrst.vim')
   finish
 endif
 
diff --git a/indent/rst.vim b/indent/rst.vim
index 469bf660c..fb64e2bcb 100644
--- a/indent/rst.vim
+++ b/indent/rst.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rst')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rst', 'indent/rst.vim')
   finish
 endif
 
diff --git a/indent/ruby.vim b/indent/ruby.vim
index fbddf4637..d061edfbb 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'indent/ruby.vim')
   finish
 endif
 
diff --git a/indent/rust.vim b/indent/rust.vim
index fe2030d52..8be1cc034 100644
--- a/indent/rust.vim
+++ b/indent/rust.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'indent/rust.vim')
   finish
 endif
 
diff --git a/indent/sas.vim b/indent/sas.vim
index b454fa70d..ddd8b76d9 100644
--- a/indent/sas.vim
+++ b/indent/sas.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sas')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sas', 'indent/sas.vim')
   finish
 endif
 
diff --git a/indent/sass.vim b/indent/sass.vim
index ddff02246..1f3a9d94f 100644
--- a/indent/sass.vim
+++ b/indent/sass.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sass')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sass', 'indent/sass.vim')
   finish
 endif
 
diff --git a/indent/scala.vim b/indent/scala.vim
index 4cffc8bca..4ff04daaf 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scala')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scala', 'indent/scala.vim')
   finish
 endif
 
diff --git a/indent/scheme.vim b/indent/scheme.vim
index 02502a6fe..f7b16c494 100644
--- a/indent/scheme.vim
+++ b/indent/scheme.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scheme')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scheme', 'indent/scheme.vim')
   finish
 endif
 
diff --git a/indent/scss.vim b/indent/scss.vim
index 195f6cf4d..4accb81ca 100644
--- a/indent/scss.vim
+++ b/indent/scss.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scss')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scss', 'indent/scss.vim')
   finish
 endif
 
diff --git a/indent/sdl.vim b/indent/sdl.vim
index 563a4e7bf..19c9d2645 100644
--- a/indent/sdl.vim
+++ b/indent/sdl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sdl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sdl', 'indent/sdl.vim')
   finish
 endif
 
diff --git a/indent/slim.vim b/indent/slim.vim
index 3ac105cf9..e52bf536d 100644
--- a/indent/slim.vim
+++ b/indent/slim.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slim', 'indent/slim.vim')
   finish
 endif
 
diff --git a/indent/slime.vim b/indent/slime.vim
index 6b3835dbe..090527485 100644
--- a/indent/slime.vim
+++ b/indent/slime.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slime')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slime', 'indent/slime.vim')
   finish
 endif
 
diff --git a/indent/sml.vim b/indent/sml.vim
index daf6f6832..f99529c97 100644
--- a/indent/sml.vim
+++ b/indent/sml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sml', 'indent/sml.vim')
   finish
 endif
 
diff --git a/indent/solidity.vim b/indent/solidity.vim
index 6191199f7..7744f7a7d 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'solidity')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'solidity', 'indent/solidity.vim')
   finish
 endif
 
diff --git a/indent/sql.vim b/indent/sql.vim
index 2c96ac850..689e6c00b 100644
--- a/indent/sql.vim
+++ b/indent/sql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sql', 'indent/sql.vim')
   finish
 endif
 
diff --git a/indent/sshconfig.vim b/indent/sshconfig.vim
index b17f24321..94bdf7655 100644
--- a/indent/sshconfig.vim
+++ b/indent/sshconfig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sshconfig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sshconfig', 'indent/sshconfig.vim')
   finish
 endif
 
diff --git a/indent/stylus.vim b/indent/stylus.vim
index eeb3fa0df..1254ebc34 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'stylus')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'stylus', 'indent/stylus.vim')
   finish
 endif
 
diff --git a/indent/svelte.vim b/indent/svelte.vim
index 64383fcff..fa01f563b 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'svelte')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'svelte', 'indent/svelte.vim')
   finish
 endif
 
diff --git a/indent/svg.vim b/indent/svg.vim
index 804a38837..0b61e7d9c 100644
--- a/indent/svg.vim
+++ b/indent/svg.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'svg-indent')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'svg-indent', 'indent/svg.vim')
   finish
 endif
 
diff --git a/indent/swift.vim b/indent/swift.vim
index 80b70531d..00b2344ae 100644
--- a/indent/swift.vim
+++ b/indent/swift.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'swift')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'swift', 'indent/swift.vim')
   finish
 endif
 
diff --git a/indent/systemverilog.vim b/indent/systemverilog.vim
index 554cff08a..0f8321b54 100644
--- a/indent/systemverilog.vim
+++ b/indent/systemverilog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'systemverilog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'systemverilog', 'indent/systemverilog.vim')
   finish
 endif
 
diff --git a/indent/tcl.vim b/indent/tcl.vim
index 7d4755463..47fdb84f6 100644
--- a/indent/tcl.vim
+++ b/indent/tcl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tcl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tcl', 'indent/tcl.vim')
   finish
 endif
 
diff --git a/indent/teraterm.vim b/indent/teraterm.vim
index 69381cadf..c1239038f 100644
--- a/indent/teraterm.vim
+++ b/indent/teraterm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'teraterm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'teraterm', 'indent/teraterm.vim')
   finish
 endif
 
diff --git a/indent/terraform.vim b/indent/terraform.vim
index 32222842a..32c194ef3 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'terraform')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'terraform', 'indent/terraform.vim')
   finish
 endif
 
diff --git a/indent/tf.vim b/indent/tf.vim
index 758e471eb..16d103a7d 100644
--- a/indent/tf.vim
+++ b/indent/tf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tf', 'indent/tf.vim')
   finish
 endif
 
diff --git a/indent/tilde.vim b/indent/tilde.vim
index 5472e1da8..13b53822e 100644
--- a/indent/tilde.vim
+++ b/indent/tilde.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tilde')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tilde', 'indent/tilde.vim')
   finish
 endif
 
diff --git a/indent/treetop.vim b/indent/treetop.vim
index b18bd3985..269be1b57 100644
--- a/indent/treetop.vim
+++ b/indent/treetop.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'treetop')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'treetop', 'indent/treetop.vim')
   finish
 endif
 
diff --git a/indent/twig.vim b/indent/twig.vim
index 83f15fe3c..0a3fc15e7 100644
--- a/indent/twig.vim
+++ b/indent/twig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'twig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'twig', 'indent/twig.vim')
   finish
 endif
 
diff --git a/indent/typescript.vim b/indent/typescript.vim
index d372f9928..9697e3043 100644
--- a/indent/typescript.vim
+++ b/indent/typescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'indent/typescript.vim')
   finish
 endif
 
diff --git a/indent/typescriptreact.vim b/indent/typescriptreact.vim
index 9a6405234..8564f6127 100644
--- a/indent/typescriptreact.vim
+++ b/indent/typescriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'indent/typescriptreact.vim')
   finish
 endif
 
diff --git a/indent/vala.vim b/indent/vala.vim
index 60afaac60..218cabe31 100644
--- a/indent/vala.vim
+++ b/indent/vala.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vala')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vala', 'indent/vala.vim')
   finish
 endif
 
diff --git a/indent/vb.vim b/indent/vb.vim
index db49efd5f..9ef7ef1c6 100644
--- a/indent/vb.vim
+++ b/indent/vb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'visual-basic')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'visual-basic', 'indent/vb.vim')
   finish
 endif
 
diff --git a/indent/velocity.vim b/indent/velocity.vim
index 64aad906f..27262acba 100644
--- a/indent/velocity.vim
+++ b/indent/velocity.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'velocity')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'velocity', 'indent/velocity.vim')
   finish
 endif
 
diff --git a/indent/verilog.vim b/indent/verilog.vim
index b07a912fe..77065208c 100644
--- a/indent/verilog.vim
+++ b/indent/verilog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'verilog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'verilog', 'indent/verilog.vim')
   finish
 endif
 
diff --git a/indent/vhdl.vim b/indent/vhdl.vim
index aa691d7d9..fb0f8770b 100644
--- a/indent/vhdl.vim
+++ b/indent/vhdl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vhdl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vhdl', 'indent/vhdl.vim')
   finish
 endif
 
diff --git a/indent/vlang.vim b/indent/vlang.vim
index a12cff1bf..f301c2083 100644
--- a/indent/vlang.vim
+++ b/indent/vlang.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'v')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'v', 'indent/vlang.vim')
   finish
 endif
 
diff --git a/indent/vroom.vim b/indent/vroom.vim
index c2793053c..a70fae027 100644
--- a/indent/vroom.vim
+++ b/indent/vroom.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vroom')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vroom', 'indent/vroom.vim')
   finish
 endif
 
diff --git a/indent/vue.vim b/indent/vue.vim
index 83391a488..bff66ec8a 100644
--- a/indent/vue.vim
+++ b/indent/vue.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vue')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vue', 'indent/vue.vim')
   finish
 endif
 
diff --git a/indent/wast.vim b/indent/wast.vim
index bbd0be56d..f11c13ec5 100644
--- a/indent/wast.vim
+++ b/indent/wast.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'wast')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'wast', 'indent/wast.vim')
   finish
 endif
 
diff --git a/indent/xf86conf.vim b/indent/xf86conf.vim
index 9b31cc8c3..eb511d2e9 100644
--- a/indent/xf86conf.vim
+++ b/indent/xf86conf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xf86conf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xf86conf', 'indent/xf86conf.vim')
   finish
 endif
 
diff --git a/indent/xhtml.vim b/indent/xhtml.vim
index 67d0fdb83..23da26d6b 100644
--- a/indent/xhtml.vim
+++ b/indent/xhtml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xhtml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xhtml', 'indent/xhtml.vim')
   finish
 endif
 
diff --git a/indent/xinetd.vim b/indent/xinetd.vim
index 7463da52f..2f8d1480f 100644
--- a/indent/xinetd.vim
+++ b/indent/xinetd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xinetd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xinetd', 'indent/xinetd.vim')
   finish
 endif
 
diff --git a/indent/xsd.vim b/indent/xsd.vim
index d30d56b27..3f2c2d86c 100644
--- a/indent/xsd.vim
+++ b/indent/xsd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xsd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xsd', 'indent/xsd.vim')
   finish
 endif
 
diff --git a/indent/xslt.vim b/indent/xslt.vim
index b443803f8..d58bb299c 100644
--- a/indent/xslt.vim
+++ b/indent/xslt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xslt')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xslt', 'indent/xslt.vim')
   finish
 endif
 
diff --git a/indent/yacc.vim b/indent/yacc.vim
index 1c5cc5ae1..2814d172b 100644
--- a/indent/yacc.vim
+++ b/indent/yacc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'yacc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'yacc', 'indent/yacc.vim')
   finish
 endif
 
diff --git a/indent/yaml.vim b/indent/yaml.vim
index b2622e9cc..f19e76844 100644
--- a/indent/yaml.vim
+++ b/indent/yaml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'yaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'yaml', 'indent/yaml.vim')
   finish
 endif
 
diff --git a/indent/zig.vim b/indent/zig.vim
index c28c8b70e..f4e2cda73 100644
--- a/indent/zig.vim
+++ b/indent/zig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'indent/zig.vim')
   finish
 endif
 
diff --git a/indent/zimbu.vim b/indent/zimbu.vim
index c80a5f9d3..51416adc2 100644
--- a/indent/zimbu.vim
+++ b/indent/zimbu.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zimbu')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zimbu', 'indent/zimbu.vim')
   finish
 endif
 
diff --git a/plugin/polyglot.vim b/plugin/polyglot.vim
index bfd9c1a02..500609731 100644
--- a/plugin/polyglot.vim
+++ b/plugin/polyglot.vim
@@ -1,3 +1,5 @@
+call polyglot#init#init()
+
 " Turn on filetype plugins (:help filetype-plugin).
 if has('autocmd') && !(exists("did_load_filetypes") && exists("did_indent_on"))
   filetype plugin indent on
@@ -17,7 +19,7 @@ endif
 " and (mostly comments) from https://github.com/sheerun/vimrc
 "
 " Only settings that matter for proper editing are left
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'sensible') == -1
+if !has_key(g:polyglot_is_disabled, 'sensible')
   " Allow backspace in insert mode.
   if &backspace == ""
     set backspace=indent,eol,start
diff --git a/scripts/build b/scripts/build
index 0ffa2039d..23bfb33c5 100755
--- a/scripts/build
+++ b/scripts/build
@@ -7,6 +7,9 @@ require 'fileutils'
 require 'set'
 require 'json'
 require 'tsort'
+require 'pathname'
+
+BASE_DIR = Pathname.new(File.expand_path('../..', __FILE__))
 
 Dir.chdir(File.dirname(__dir__))
 
@@ -48,7 +51,7 @@ def verify(packages, heuristics)
   extensions = packages.flat_map { |e| e["filetypes"] || [] }
     .flat_map { |e| e["extensions"].map { |e| "*." + e } }
   native_filetypes = detect_filetypes_str(
-    File.read('ftdetect/polyglot.vim').match(/" DO NOT EDIT CODE ABOVE.*/m)[0]
+    File.read('autoload/polyglot/init.vim').match(/" DO NOT EDIT CODE ABOVE.*/m)[0]
   ).flat_map { |e| expand_all(e) }
 
   for e in (native_filetypes & extensions)
@@ -295,7 +298,7 @@ def copy_file(name, src, dest)
     open(dest, "w") do |output|
       if dest.match?(/\.vim$/)
         output << <<~EOF
-        if has_key(g:polyglot_is_disabled, '#{name}')
+        if polyglot#init#is_disabled(expand('<sfile>:p'), '#{name}', '#{dest}')
           finish
         endif
 
@@ -688,7 +691,7 @@ def generate_ftdetect(packages, heuristics)
 
   show_warnings(all_filetypes, expected_filetypes)
 
-  inject_code('ftdetect/polyglot.vim', output)
+  inject_code('autoload/polyglot/init.vim', output)
 
   output = []
 
diff --git a/syntax/8th.vim b/syntax/8th.vim
index 517d3573a..f297dc540 100644
--- a/syntax/8th.vim
+++ b/syntax/8th.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, '8th')
+if polyglot#init#is_disabled(expand('<sfile>:p'), '8th', 'syntax/8th.vim')
   finish
 endif
 
diff --git a/syntax/Jenkinsfile.vim b/syntax/Jenkinsfile.vim
index 57869fc0f..99b8707ec 100644
--- a/syntax/Jenkinsfile.vim
+++ b/syntax/Jenkinsfile.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jenkins')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jenkins', 'syntax/Jenkinsfile.vim')
   finish
 endif
 
diff --git a/syntax/a2ps.vim b/syntax/a2ps.vim
index 52fa0c491..d9f845f57 100644
--- a/syntax/a2ps.vim
+++ b/syntax/a2ps.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'a2ps')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'a2ps', 'syntax/a2ps.vim')
   finish
 endif
 
diff --git a/syntax/a65.vim b/syntax/a65.vim
index fc281d676..c40729b35 100644
--- a/syntax/a65.vim
+++ b/syntax/a65.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'a65')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'a65', 'syntax/a65.vim')
   finish
 endif
 
diff --git a/syntax/aap.vim b/syntax/aap.vim
index a3ea89571..47ce8c1e5 100644
--- a/syntax/aap.vim
+++ b/syntax/aap.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'aap')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'aap', 'syntax/aap.vim')
   finish
 endif
 
diff --git a/syntax/abap.vim b/syntax/abap.vim
index 3596e384d..ed10cce98 100644
--- a/syntax/abap.vim
+++ b/syntax/abap.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'abap')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'abap', 'syntax/abap.vim')
   finish
 endif
 
diff --git a/syntax/abaqus.vim b/syntax/abaqus.vim
index 5d468d2e7..d7bc19076 100644
--- a/syntax/abaqus.vim
+++ b/syntax/abaqus.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'abaqus')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'abaqus', 'syntax/abaqus.vim')
   finish
 endif
 
diff --git a/syntax/abc.vim b/syntax/abc.vim
index 5798534c9..d81c9f482 100644
--- a/syntax/abc.vim
+++ b/syntax/abc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'abc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'abc', 'syntax/abc.vim')
   finish
 endif
 
diff --git a/syntax/abel.vim b/syntax/abel.vim
index c97156c76..26ee20c74 100644
--- a/syntax/abel.vim
+++ b/syntax/abel.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'abel')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'abel', 'syntax/abel.vim')
   finish
 endif
 
diff --git a/syntax/acedb.vim b/syntax/acedb.vim
index 88544cef3..705cff1c0 100644
--- a/syntax/acedb.vim
+++ b/syntax/acedb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'acedb')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'acedb', 'syntax/acedb.vim')
   finish
 endif
 
diff --git a/syntax/ada.vim b/syntax/ada.vim
index b5e94a643..87a3ad7be 100644
--- a/syntax/ada.vim
+++ b/syntax/ada.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ada')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ada', 'syntax/ada.vim')
   finish
 endif
 
diff --git a/syntax/ahdl.vim b/syntax/ahdl.vim
index b1061f258..feaeb0fe9 100644
--- a/syntax/ahdl.vim
+++ b/syntax/ahdl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ahdl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ahdl', 'syntax/ahdl.vim')
   finish
 endif
 
diff --git a/syntax/aidl.vim b/syntax/aidl.vim
index b271535b1..524a8938e 100644
--- a/syntax/aidl.vim
+++ b/syntax/aidl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'aidl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'aidl', 'syntax/aidl.vim')
   finish
 endif
 
diff --git a/syntax/alsaconf.vim b/syntax/alsaconf.vim
index b5fcfdfd8..e3673a222 100644
--- a/syntax/alsaconf.vim
+++ b/syntax/alsaconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'alsaconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'alsaconf', 'syntax/alsaconf.vim')
   finish
 endif
 
diff --git a/syntax/aml.vim b/syntax/aml.vim
index 5b381447c..34a9f3d5a 100644
--- a/syntax/aml.vim
+++ b/syntax/aml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'aml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'aml', 'syntax/aml.vim')
   finish
 endif
 
diff --git a/syntax/ampl.vim b/syntax/ampl.vim
index 69c3d2d0a..59f33cb11 100644
--- a/syntax/ampl.vim
+++ b/syntax/ampl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ampl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ampl', 'syntax/ampl.vim')
   finish
 endif
 
diff --git a/syntax/ansible.vim b/syntax/ansible.vim
index 4b9e49d2e..70f59021a 100644
--- a/syntax/ansible.vim
+++ b/syntax/ansible.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ansible')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ansible', 'syntax/ansible.vim')
   finish
 endif
 
diff --git a/syntax/ansible_hosts.vim b/syntax/ansible_hosts.vim
index a3af8f105..dcf1de8ed 100644
--- a/syntax/ansible_hosts.vim
+++ b/syntax/ansible_hosts.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ansible')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ansible', 'syntax/ansible_hosts.vim')
   finish
 endif
 
diff --git a/syntax/ant.vim b/syntax/ant.vim
index d3ec38491..c1729e0ef 100644
--- a/syntax/ant.vim
+++ b/syntax/ant.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ant')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ant', 'syntax/ant.vim')
   finish
 endif
 
diff --git a/syntax/apache.vim b/syntax/apache.vim
index 3bba1bbbd..3dc07a7fc 100644
--- a/syntax/apache.vim
+++ b/syntax/apache.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'apache')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'apache', 'syntax/apache.vim')
   finish
 endif
 
diff --git a/syntax/apachestyle.vim b/syntax/apachestyle.vim
index e523ba778..5d3fe2102 100644
--- a/syntax/apachestyle.vim
+++ b/syntax/apachestyle.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'apachestyle')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'apachestyle', 'syntax/apachestyle.vim')
   finish
 endif
 
diff --git a/syntax/apiblueprint.vim b/syntax/apiblueprint.vim
index ba83eb445..08f29b446 100644
--- a/syntax/apiblueprint.vim
+++ b/syntax/apiblueprint.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'apiblueprint')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'apiblueprint', 'syntax/apiblueprint.vim')
   finish
 endif
 
diff --git a/syntax/applescript.vim b/syntax/applescript.vim
index 2e72959ef..d261caea3 100644
--- a/syntax/applescript.vim
+++ b/syntax/applescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'applescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'applescript', 'syntax/applescript.vim')
   finish
 endif
 
diff --git a/syntax/aptconf.vim b/syntax/aptconf.vim
index 046a543ef..309b8faa1 100644
--- a/syntax/aptconf.vim
+++ b/syntax/aptconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'aptconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'aptconf', 'syntax/aptconf.vim')
   finish
 endif
 
diff --git a/syntax/arch.vim b/syntax/arch.vim
index b0156e79b..c0ef61879 100644
--- a/syntax/arch.vim
+++ b/syntax/arch.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'arch')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'arch', 'syntax/arch.vim')
   finish
 endif
 
diff --git a/syntax/arduino.vim b/syntax/arduino.vim
index ceb5f1fcd..5c04d6c60 100644
--- a/syntax/arduino.vim
+++ b/syntax/arduino.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'arduino')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'arduino', 'syntax/arduino.vim')
   finish
 endif
 
diff --git a/syntax/art.vim b/syntax/art.vim
index 45e5e5c26..501222173 100644
--- a/syntax/art.vim
+++ b/syntax/art.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'art')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'art', 'syntax/art.vim')
   finish
 endif
 
diff --git a/syntax/asciidoc.vim b/syntax/asciidoc.vim
index ab3053054..05338d444 100644
--- a/syntax/asciidoc.vim
+++ b/syntax/asciidoc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'asciidoc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'asciidoc', 'syntax/asciidoc.vim')
   finish
 endif
 
diff --git a/syntax/asl.vim b/syntax/asl.vim
index 14a83a54b..d9eea367c 100644
--- a/syntax/asl.vim
+++ b/syntax/asl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'acpiasl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'acpiasl', 'syntax/asl.vim')
   finish
 endif
 
diff --git a/syntax/asn.vim b/syntax/asn.vim
index f767df05f..eab1ac4ab 100644
--- a/syntax/asn.vim
+++ b/syntax/asn.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'asn')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'asn', 'syntax/asn.vim')
   finish
 endif
 
diff --git a/syntax/aspperl.vim b/syntax/aspperl.vim
index fa83b622e..1858e256c 100644
--- a/syntax/aspperl.vim
+++ b/syntax/aspperl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'aspperl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'aspperl', 'syntax/aspperl.vim')
   finish
 endif
 
diff --git a/syntax/aspvbs.vim b/syntax/aspvbs.vim
index 456f0881f..8af436261 100644
--- a/syntax/aspvbs.vim
+++ b/syntax/aspvbs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'aspvbs')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'aspvbs', 'syntax/aspvbs.vim')
   finish
 endif
 
diff --git a/syntax/asterisk.vim b/syntax/asterisk.vim
index 6f351d7ce..14eebdfe5 100644
--- a/syntax/asterisk.vim
+++ b/syntax/asterisk.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'asterisk')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'asterisk', 'syntax/asterisk.vim')
   finish
 endif
 
diff --git a/syntax/asteriskvm.vim b/syntax/asteriskvm.vim
index a90b27b37..0551b0cad 100644
--- a/syntax/asteriskvm.vim
+++ b/syntax/asteriskvm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'asteriskvm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'asteriskvm', 'syntax/asteriskvm.vim')
   finish
 endif
 
diff --git a/syntax/atlas.vim b/syntax/atlas.vim
index 4efcdce77..4e8ecfa7f 100644
--- a/syntax/atlas.vim
+++ b/syntax/atlas.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'atlas')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'atlas', 'syntax/atlas.vim')
   finish
 endif
 
diff --git a/syntax/autodoc.vim b/syntax/autodoc.vim
index fe9a71091..4c8c915f7 100644
--- a/syntax/autodoc.vim
+++ b/syntax/autodoc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'autodoc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'autodoc', 'syntax/autodoc.vim')
   finish
 endif
 
diff --git a/syntax/autoit.vim b/syntax/autoit.vim
index 6474cdfb3..705aff02a 100644
--- a/syntax/autoit.vim
+++ b/syntax/autoit.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'autoit')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'autoit', 'syntax/autoit.vim')
   finish
 endif
 
diff --git a/syntax/automake.vim b/syntax/automake.vim
index 7f2479344..6f7f299a1 100644
--- a/syntax/automake.vim
+++ b/syntax/automake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'automake')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'automake', 'syntax/automake.vim')
   finish
 endif
 
diff --git a/syntax/ave.vim b/syntax/ave.vim
index f2f5ad706..3ba6d753d 100644
--- a/syntax/ave.vim
+++ b/syntax/ave.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ave')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ave', 'syntax/ave.vim')
   finish
 endif
 
diff --git a/syntax/awk.vim b/syntax/awk.vim
index ea1d760f5..9dc05279c 100644
--- a/syntax/awk.vim
+++ b/syntax/awk.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'awk')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'awk', 'syntax/awk.vim')
   finish
 endif
 
diff --git a/syntax/b.vim b/syntax/b.vim
index ff3005958..d55b80697 100644
--- a/syntax/b.vim
+++ b/syntax/b.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'b')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'b', 'syntax/b.vim')
   finish
 endif
 
diff --git a/syntax/basic.vim b/syntax/basic.vim
index 645c46ac2..1b98eb8d1 100644
--- a/syntax/basic.vim
+++ b/syntax/basic.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'basic')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'basic', 'syntax/basic.vim')
   finish
 endif
 
diff --git a/syntax/basic/class.vim b/syntax/basic/class.vim
index cc5104e2e..d4343db08 100644
--- a/syntax/basic/class.vim
+++ b/syntax/basic/class.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/class.vim')
   finish
 endif
 
diff --git a/syntax/basic/cluster.vim b/syntax/basic/cluster.vim
index 7fc81e140..cbe0424b1 100644
--- a/syntax/basic/cluster.vim
+++ b/syntax/basic/cluster.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/cluster.vim')
   finish
 endif
 
diff --git a/syntax/basic/decorator.vim b/syntax/basic/decorator.vim
index 51c02ff65..02d93218c 100644
--- a/syntax/basic/decorator.vim
+++ b/syntax/basic/decorator.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/decorator.vim')
   finish
 endif
 
diff --git a/syntax/basic/doc.vim b/syntax/basic/doc.vim
index 3d623f360..996e7e3df 100644
--- a/syntax/basic/doc.vim
+++ b/syntax/basic/doc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/doc.vim')
   finish
 endif
 
diff --git a/syntax/basic/function.vim b/syntax/basic/function.vim
index aed182a7c..88dc901f2 100644
--- a/syntax/basic/function.vim
+++ b/syntax/basic/function.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/function.vim')
   finish
 endif
 
diff --git a/syntax/basic/identifiers.vim b/syntax/basic/identifiers.vim
index 36b6d29cc..f85b2d15f 100644
--- a/syntax/basic/identifiers.vim
+++ b/syntax/basic/identifiers.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/identifiers.vim')
   finish
 endif
 
diff --git a/syntax/basic/keyword.vim b/syntax/basic/keyword.vim
index b14bece11..6bd1668ad 100644
--- a/syntax/basic/keyword.vim
+++ b/syntax/basic/keyword.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/keyword.vim')
   finish
 endif
 
diff --git a/syntax/basic/literal.vim b/syntax/basic/literal.vim
index f7d3cd603..81bbef96e 100644
--- a/syntax/basic/literal.vim
+++ b/syntax/basic/literal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/literal.vim')
   finish
 endif
 
diff --git a/syntax/basic/members.vim b/syntax/basic/members.vim
index 69d311ef4..46b8350b9 100644
--- a/syntax/basic/members.vim
+++ b/syntax/basic/members.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/members.vim')
   finish
 endif
 
diff --git a/syntax/basic/object.vim b/syntax/basic/object.vim
index d9d49013f..3c614e1a4 100644
--- a/syntax/basic/object.vim
+++ b/syntax/basic/object.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/object.vim')
   finish
 endif
 
diff --git a/syntax/basic/patch.vim b/syntax/basic/patch.vim
index 2156f8d87..d32500875 100644
--- a/syntax/basic/patch.vim
+++ b/syntax/basic/patch.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/patch.vim')
   finish
 endif
 
diff --git a/syntax/basic/reserved.vim b/syntax/basic/reserved.vim
index 7989f9e0e..c75851f29 100644
--- a/syntax/basic/reserved.vim
+++ b/syntax/basic/reserved.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/reserved.vim')
   finish
 endif
 
diff --git a/syntax/basic/symbols.vim b/syntax/basic/symbols.vim
index ce59de238..c88c9210b 100644
--- a/syntax/basic/symbols.vim
+++ b/syntax/basic/symbols.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/symbols.vim')
   finish
 endif
 
diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim
index 5dc0f2bf6..770d3e0d0 100644
--- a/syntax/basic/type.vim
+++ b/syntax/basic/type.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/type.vim')
   finish
 endif
 
diff --git a/syntax/bc.vim b/syntax/bc.vim
index ae88e3c06..fa4fa96a6 100644
--- a/syntax/bc.vim
+++ b/syntax/bc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bc', 'syntax/bc.vim')
   finish
 endif
 
diff --git a/syntax/bdf.vim b/syntax/bdf.vim
index f6bba3042..f1ff85b10 100644
--- a/syntax/bdf.vim
+++ b/syntax/bdf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bdf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bdf', 'syntax/bdf.vim')
   finish
 endif
 
diff --git a/syntax/bib.vim b/syntax/bib.vim
index daf3b6ecc..69995d6e5 100644
--- a/syntax/bib.vim
+++ b/syntax/bib.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bib')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bib', 'syntax/bib.vim')
   finish
 endif
 
diff --git a/syntax/bindzone.vim b/syntax/bindzone.vim
index e0f7f63e9..cc9d0d843 100644
--- a/syntax/bindzone.vim
+++ b/syntax/bindzone.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bindzone')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bindzone', 'syntax/bindzone.vim')
   finish
 endif
 
diff --git a/syntax/blade.vim b/syntax/blade.vim
index 8203218dc..d52dc2f36 100644
--- a/syntax/blade.vim
+++ b/syntax/blade.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'blade')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'blade', 'syntax/blade.vim')
   finish
 endif
 
diff --git a/syntax/blank.vim b/syntax/blank.vim
index 8368357c2..de8ccfe13 100644
--- a/syntax/blank.vim
+++ b/syntax/blank.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'blank')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'blank', 'syntax/blank.vim')
   finish
 endif
 
diff --git a/syntax/brewfile.vim b/syntax/brewfile.vim
index 227203279..ad0fbf8dc 100644
--- a/syntax/brewfile.vim
+++ b/syntax/brewfile.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'brewfile')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'brewfile', 'syntax/brewfile.vim')
   finish
 endif
 
diff --git a/syntax/bsdl.vim b/syntax/bsdl.vim
index 83fc478e2..fd0a8a596 100644
--- a/syntax/bsdl.vim
+++ b/syntax/bsdl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bsdl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bsdl', 'syntax/bsdl.vim')
   finish
 endif
 
diff --git a/syntax/bst.vim b/syntax/bst.vim
index dd6176e43..4fa88f8e7 100644
--- a/syntax/bst.vim
+++ b/syntax/bst.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bst')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bst', 'syntax/bst.vim')
   finish
 endif
 
diff --git a/syntax/bzl.vim b/syntax/bzl.vim
index 65357b07a..1af768a29 100644
--- a/syntax/bzl.vim
+++ b/syntax/bzl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bzl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bzl', 'syntax/bzl.vim')
   finish
 endif
 
diff --git a/syntax/bzr.vim b/syntax/bzr.vim
index 26ad6c8e8..15762ce16 100644
--- a/syntax/bzr.vim
+++ b/syntax/bzr.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'bzr')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bzr', 'syntax/bzr.vim')
   finish
 endif
 
diff --git a/syntax/c.vim b/syntax/c.vim
index a1b52a65c..cb52a22fb 100644
--- a/syntax/c.vim
+++ b/syntax/c.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'c/c++')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'c/c++', 'syntax/c.vim')
   finish
 endif
 
diff --git a/syntax/cabal-1.vim b/syntax/cabal-1.vim
index e7ca72f76..c473800a9 100644
--- a/syntax/cabal-1.vim
+++ b/syntax/cabal-1.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haskell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haskell', 'syntax/cabal.vim')
   finish
 endif
 
diff --git a/syntax/cabal-2.vim b/syntax/cabal-2.vim
index 1d7659883..f71cb4a53 100644
--- a/syntax/cabal-2.vim
+++ b/syntax/cabal-2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cabal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cabal', 'syntax/cabal-2.vim')
   finish
 endif
 
diff --git a/syntax/caddyfile.vim b/syntax/caddyfile.vim
index 771a8614b..ab0c24d1d 100644
--- a/syntax/caddyfile.vim
+++ b/syntax/caddyfile.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'caddyfile')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'caddyfile', 'syntax/caddyfile.vim')
   finish
 endif
 
diff --git a/syntax/calendar.vim b/syntax/calendar.vim
index e4fe1ee50..7f581c22c 100644
--- a/syntax/calendar.vim
+++ b/syntax/calendar.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'calendar')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'calendar', 'syntax/calendar.vim')
   finish
 endif
 
diff --git a/syntax/carp.vim b/syntax/carp.vim
index 149a79223..a3f11c66f 100644
--- a/syntax/carp.vim
+++ b/syntax/carp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'carp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'carp', 'syntax/carp.vim')
   finish
 endif
 
diff --git a/syntax/catalog.vim b/syntax/catalog.vim
index 64ae4a956..c9b54a71e 100644
--- a/syntax/catalog.vim
+++ b/syntax/catalog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'catalog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'catalog', 'syntax/catalog.vim')
   finish
 endif
 
diff --git a/syntax/cdl.vim b/syntax/cdl.vim
index 7ecb9f7e8..10b5cc610 100644
--- a/syntax/cdl.vim
+++ b/syntax/cdl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cdl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cdl', 'syntax/cdl.vim')
   finish
 endif
 
diff --git a/syntax/cdrdaoconf.vim b/syntax/cdrdaoconf.vim
index 7401027e8..a083fe2b7 100644
--- a/syntax/cdrdaoconf.vim
+++ b/syntax/cdrdaoconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cdrdaoconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cdrdaoconf', 'syntax/cdrdaoconf.vim')
   finish
 endif
 
diff --git a/syntax/cdrtoc.vim b/syntax/cdrtoc.vim
index 3efc3d3f1..8fa0aee92 100644
--- a/syntax/cdrtoc.vim
+++ b/syntax/cdrtoc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cdrtoc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cdrtoc', 'syntax/cdrtoc.vim')
   finish
 endif
 
diff --git a/syntax/cf.vim b/syntax/cf.vim
index 2e04a546d..92c2ca15f 100644
--- a/syntax/cf.vim
+++ b/syntax/cf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cf', 'syntax/cf.vim')
   finish
 endif
 
diff --git a/syntax/cfg.vim b/syntax/cfg.vim
index 412b62ae9..ad81bb05d 100644
--- a/syntax/cfg.vim
+++ b/syntax/cfg.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cfg')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cfg', 'syntax/cfg.vim')
   finish
 endif
 
diff --git a/syntax/ch.vim b/syntax/ch.vim
index f322b4712..79eeaac86 100644
--- a/syntax/ch.vim
+++ b/syntax/ch.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ch')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ch', 'syntax/ch.vim')
   finish
 endif
 
diff --git a/syntax/chaiscript.vim b/syntax/chaiscript.vim
index 182ca63fa..8b2e1152a 100644
--- a/syntax/chaiscript.vim
+++ b/syntax/chaiscript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'chaiscript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'chaiscript', 'syntax/chaiscript.vim')
   finish
 endif
 
diff --git a/syntax/chaskell.vim b/syntax/chaskell.vim
index 546e2ae27..754a415c5 100644
--- a/syntax/chaskell.vim
+++ b/syntax/chaskell.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'chaskell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'chaskell', 'syntax/chaskell.vim')
   finish
 endif
 
diff --git a/syntax/chill.vim b/syntax/chill.vim
index 6f530b287..2adc0137a 100644
--- a/syntax/chill.vim
+++ b/syntax/chill.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'chill')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'chill', 'syntax/chill.vim')
   finish
 endif
 
diff --git a/syntax/chordpro.vim b/syntax/chordpro.vim
index 65efbce42..ff8a9302a 100644
--- a/syntax/chordpro.vim
+++ b/syntax/chordpro.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'chordpro')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'chordpro', 'syntax/chordpro.vim')
   finish
 endif
 
diff --git a/syntax/cl.vim b/syntax/cl.vim
index c53c90abb..796abec7a 100644
--- a/syntax/cl.vim
+++ b/syntax/cl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cl', 'syntax/cl.vim')
   finish
 endif
 
diff --git a/syntax/clean.vim b/syntax/clean.vim
index 287edeb47..e65901605 100644
--- a/syntax/clean.vim
+++ b/syntax/clean.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'clean')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'clean', 'syntax/clean.vim')
   finish
 endif
 
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index d647b9eaf..46b43ea2c 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'clojure')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'clojure', 'syntax/clojure.vim')
   finish
 endif
 
diff --git a/syntax/cmake.vim b/syntax/cmake.vim
index 7df2f6604..28a7aed14 100644
--- a/syntax/cmake.vim
+++ b/syntax/cmake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cmake')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cmake', 'syntax/cmake.vim')
   finish
 endif
 
diff --git a/syntax/cmod.vim b/syntax/cmod.vim
index 2af912719..3e8073428 100644
--- a/syntax/cmod.vim
+++ b/syntax/cmod.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cmod')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cmod', 'syntax/cmod.vim')
   finish
 endif
 
diff --git a/syntax/cmusrc.vim b/syntax/cmusrc.vim
index 0ef355d69..2b611bcf5 100644
--- a/syntax/cmusrc.vim
+++ b/syntax/cmusrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cmusrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cmusrc', 'syntax/cmusrc.vim')
   finish
 endif
 
diff --git a/syntax/cobol.vim b/syntax/cobol.vim
index d771969c2..10d4f9606 100644
--- a/syntax/cobol.vim
+++ b/syntax/cobol.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cobol')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cobol', 'syntax/cobol.vim')
   finish
 endif
 
diff --git a/syntax/coco.vim b/syntax/coco.vim
index 4f78d7af8..d983c7c28 100644
--- a/syntax/coco.vim
+++ b/syntax/coco.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'coco')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'coco', 'syntax/coco.vim')
   finish
 endif
 
diff --git a/syntax/coffee.vim b/syntax/coffee.vim
index 3b7c05b6f..76f28b766 100644
--- a/syntax/coffee.vim
+++ b/syntax/coffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'coffee-script')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'coffee-script', 'syntax/coffee.vim')
   finish
 endif
 
diff --git a/syntax/common.vim b/syntax/common.vim
index e1174b962..62f7a374c 100644
--- a/syntax/common.vim
+++ b/syntax/common.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/common.vim')
   finish
 endif
 
diff --git a/syntax/conaryrecipe.vim b/syntax/conaryrecipe.vim
index 418019342..9d702af50 100644
--- a/syntax/conaryrecipe.vim
+++ b/syntax/conaryrecipe.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'conaryrecipe')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'conaryrecipe', 'syntax/conaryrecipe.vim')
   finish
 endif
 
diff --git a/syntax/conf.vim b/syntax/conf.vim
index 39ccfb68b..0479cc532 100644
--- a/syntax/conf.vim
+++ b/syntax/conf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'conf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'conf', 'syntax/conf.vim')
   finish
 endif
 
diff --git a/syntax/config.vim b/syntax/config.vim
index 3ba8138ea..711006e2e 100644
--- a/syntax/config.vim
+++ b/syntax/config.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'config')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'config', 'syntax/config.vim')
   finish
 endif
 
diff --git a/syntax/cpp.vim b/syntax/cpp.vim
index 991975836..0fd0acc2e 100644
--- a/syntax/cpp.vim
+++ b/syntax/cpp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'c/c++')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'c/c++', 'syntax/cpp.vim')
   finish
 endif
 
diff --git a/syntax/cql.vim b/syntax/cql.vim
index 8ae5109de..8e5002e94 100644
--- a/syntax/cql.vim
+++ b/syntax/cql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cql', 'syntax/cql.vim')
   finish
 endif
 
diff --git a/syntax/crm.vim b/syntax/crm.vim
index 64ef72c80..105a6591e 100644
--- a/syntax/crm.vim
+++ b/syntax/crm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crm', 'syntax/crm.vim')
   finish
 endif
 
diff --git a/syntax/crontab.vim b/syntax/crontab.vim
index f4d434c4c..9bb0db175 100644
--- a/syntax/crontab.vim
+++ b/syntax/crontab.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crontab')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crontab', 'syntax/crontab.vim')
   finish
 endif
 
diff --git a/syntax/cryptol.vim b/syntax/cryptol.vim
index e1cef5a2b..8cb7804d0 100644
--- a/syntax/cryptol.vim
+++ b/syntax/cryptol.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cryptol')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cryptol', 'syntax/cryptol.vim')
   finish
 endif
 
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index 491431034..7dfdf5078 100644
--- a/syntax/crystal.vim
+++ b/syntax/crystal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'syntax/crystal.vim')
   finish
 endif
 
diff --git a/syntax/cs.vim b/syntax/cs.vim
index 7d758eb31..ca7995613 100644
--- a/syntax/cs.vim
+++ b/syntax/cs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cs')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cs', 'syntax/cs.vim')
   finish
 endif
 
diff --git a/syntax/csc.vim b/syntax/csc.vim
index bcd6b9ce3..1d775e064 100644
--- a/syntax/csc.vim
+++ b/syntax/csc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'csc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'csc', 'syntax/csc.vim')
   finish
 endif
 
diff --git a/syntax/csdl.vim b/syntax/csdl.vim
index 2625a07a2..289e0e448 100644
--- a/syntax/csdl.vim
+++ b/syntax/csdl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'csdl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'csdl', 'syntax/csdl.vim')
   finish
 endif
 
diff --git a/syntax/csp.vim b/syntax/csp.vim
index f1b34ed56..888dbf955 100644
--- a/syntax/csp.vim
+++ b/syntax/csp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'csp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'csp', 'syntax/csp.vim')
   finish
 endif
 
diff --git a/syntax/css.vim b/syntax/css.vim
index 2d47b251b..ba7f45953 100644
--- a/syntax/css.vim
+++ b/syntax/css.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'css')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'css', 'syntax/css.vim')
   finish
 endif
 
diff --git a/syntax/csv.vim b/syntax/csv.vim
index 630337e27..5cc16dfa3 100644
--- a/syntax/csv.vim
+++ b/syntax/csv.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'csv')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'csv', 'syntax/csv.vim')
   finish
 endif
 
diff --git a/syntax/cterm.vim b/syntax/cterm.vim
index 26379dd8d..9bb9b3daa 100644
--- a/syntax/cterm.vim
+++ b/syntax/cterm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cterm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cterm', 'syntax/cterm.vim')
   finish
 endif
 
diff --git a/syntax/cucumber.vim b/syntax/cucumber.vim
index 6c51dcc08..20edd2d99 100644
--- a/syntax/cucumber.vim
+++ b/syntax/cucumber.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cucumber')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cucumber', 'syntax/cucumber.vim')
   finish
 endif
 
diff --git a/syntax/cuda.vim b/syntax/cuda.vim
index 1fc1fdefc..bbac1c4a3 100644
--- a/syntax/cuda.vim
+++ b/syntax/cuda.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cuda')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cuda', 'syntax/cuda.vim')
   finish
 endif
 
diff --git a/syntax/cuesheet.vim b/syntax/cuesheet.vim
index aa80b215d..b0e87e41f 100644
--- a/syntax/cuesheet.vim
+++ b/syntax/cuesheet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cue')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cue', 'syntax/cuesheet.vim')
   finish
 endif
 
diff --git a/syntax/cupl.vim b/syntax/cupl.vim
index a713304e7..8ad97a814 100644
--- a/syntax/cupl.vim
+++ b/syntax/cupl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cupl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cupl', 'syntax/cupl.vim')
   finish
 endif
 
diff --git a/syntax/cuplsim.vim b/syntax/cuplsim.vim
index 979267913..189b3e348 100644
--- a/syntax/cuplsim.vim
+++ b/syntax/cuplsim.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cuplsim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cuplsim', 'syntax/cuplsim.vim')
   finish
 endif
 
diff --git a/syntax/cvs.vim b/syntax/cvs.vim
index c33545153..219341bc8 100644
--- a/syntax/cvs.vim
+++ b/syntax/cvs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cvs')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cvs', 'syntax/cvs.vim')
   finish
 endif
 
diff --git a/syntax/cvsrc.vim b/syntax/cvsrc.vim
index c685912d4..80fcd5874 100644
--- a/syntax/cvsrc.vim
+++ b/syntax/cvsrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cvsrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cvsrc', 'syntax/cvsrc.vim')
   finish
 endif
 
diff --git a/syntax/cynpp.vim b/syntax/cynpp.vim
index bcf1d2ae7..1de37e7c7 100644
--- a/syntax/cynpp.vim
+++ b/syntax/cynpp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cynpp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cynpp', 'syntax/cynpp.vim')
   finish
 endif
 
diff --git a/syntax/d.vim b/syntax/d.vim
index 0d8c096a6..108dbd22c 100644
--- a/syntax/d.vim
+++ b/syntax/d.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dlang')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dlang', 'syntax/d.vim')
   finish
 endif
 
diff --git a/syntax/dart.vim b/syntax/dart.vim
index 3400ae7ac..b91d7a688 100644
--- a/syntax/dart.vim
+++ b/syntax/dart.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dart')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dart', 'syntax/dart.vim')
   finish
 endif
 
diff --git a/syntax/datascript.vim b/syntax/datascript.vim
index 2fb545f49..32c02a450 100644
--- a/syntax/datascript.vim
+++ b/syntax/datascript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'datascript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'datascript', 'syntax/datascript.vim')
   finish
 endif
 
diff --git a/syntax/dcd.vim b/syntax/dcd.vim
index e2c1f03b5..a37cd8d11 100644
--- a/syntax/dcd.vim
+++ b/syntax/dcd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dcd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dcd', 'syntax/dcd.vim')
   finish
 endif
 
diff --git a/syntax/dcov.vim b/syntax/dcov.vim
index 14b99882f..0a646a63f 100644
--- a/syntax/dcov.vim
+++ b/syntax/dcov.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dlang')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dlang', 'syntax/dcov.vim')
   finish
 endif
 
diff --git a/syntax/dd.vim b/syntax/dd.vim
index a289b552e..e24cd372b 100644
--- a/syntax/dd.vim
+++ b/syntax/dd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dlang')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dlang', 'syntax/dd.vim')
   finish
 endif
 
diff --git a/syntax/ddoc.vim b/syntax/ddoc.vim
index b8e746806..52a9a382d 100644
--- a/syntax/ddoc.vim
+++ b/syntax/ddoc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dlang')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dlang', 'syntax/ddoc.vim')
   finish
 endif
 
diff --git a/syntax/debchangelog.vim b/syntax/debchangelog.vim
index 11eaf3591..174d86d73 100644
--- a/syntax/debchangelog.vim
+++ b/syntax/debchangelog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'debchangelog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'debchangelog', 'syntax/debchangelog.vim')
   finish
 endif
 
diff --git a/syntax/debcontrol.vim b/syntax/debcontrol.vim
index 70f85d7e3..67f98588a 100644
--- a/syntax/debcontrol.vim
+++ b/syntax/debcontrol.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'debcontrol')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'debcontrol', 'syntax/debcontrol.vim')
   finish
 endif
 
diff --git a/syntax/debcopyright.vim b/syntax/debcopyright.vim
index 82c4f1fa3..0cb60cfbc 100644
--- a/syntax/debcopyright.vim
+++ b/syntax/debcopyright.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'debcopyright')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'debcopyright', 'syntax/debcopyright.vim')
   finish
 endif
 
diff --git a/syntax/debsources.vim b/syntax/debsources.vim
index caeb50aec..6ea0bcb15 100644
--- a/syntax/debsources.vim
+++ b/syntax/debsources.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'debsources')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'debsources', 'syntax/debsources.vim')
   finish
 endif
 
diff --git a/syntax/def.vim b/syntax/def.vim
index f4a4719b3..409957869 100644
--- a/syntax/def.vim
+++ b/syntax/def.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'def')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'def', 'syntax/def.vim')
   finish
 endif
 
diff --git a/syntax/denyhosts.vim b/syntax/denyhosts.vim
index e4958937e..2a4aa7212 100644
--- a/syntax/denyhosts.vim
+++ b/syntax/denyhosts.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'denyhosts')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'denyhosts', 'syntax/denyhosts.vim')
   finish
 endif
 
diff --git a/syntax/desc.vim b/syntax/desc.vim
index 1912b88ce..8002fc914 100644
--- a/syntax/desc.vim
+++ b/syntax/desc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'desc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'desc', 'syntax/desc.vim')
   finish
 endif
 
diff --git a/syntax/desktop.vim b/syntax/desktop.vim
index f676005d6..94964e3d4 100644
--- a/syntax/desktop.vim
+++ b/syntax/desktop.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'desktop')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'desktop', 'syntax/desktop.vim')
   finish
 endif
 
diff --git a/syntax/dhall.vim b/syntax/dhall.vim
index d3ad098a7..5cea85b8f 100644
--- a/syntax/dhall.vim
+++ b/syntax/dhall.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dhall')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dhall', 'syntax/dhall.vim')
   finish
 endif
 
diff --git a/syntax/dictconf.vim b/syntax/dictconf.vim
index 6d8e51ae5..0cbf2f6fd 100644
--- a/syntax/dictconf.vim
+++ b/syntax/dictconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dictconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dictconf', 'syntax/dictconf.vim')
   finish
 endif
 
diff --git a/syntax/dictdconf.vim b/syntax/dictdconf.vim
index e7e6ad81b..67f6bbd9b 100644
--- a/syntax/dictdconf.vim
+++ b/syntax/dictdconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dictdconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dictdconf', 'syntax/dictdconf.vim')
   finish
 endif
 
diff --git a/syntax/diff.vim b/syntax/diff.vim
index c3eefbb75..6e1306dc0 100644
--- a/syntax/diff.vim
+++ b/syntax/diff.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'diff')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'diff', 'syntax/diff.vim')
   finish
 endif
 
diff --git a/syntax/dircolors.vim b/syntax/dircolors.vim
index 004da62ce..9a0e1cda8 100644
--- a/syntax/dircolors.vim
+++ b/syntax/dircolors.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dircolors')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dircolors', 'syntax/dircolors.vim')
   finish
 endif
 
diff --git a/syntax/django.vim b/syntax/django.vim
index 8e30c58b7..82e500704 100644
--- a/syntax/django.vim
+++ b/syntax/django.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'htmldjango')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'htmldjango', 'syntax/django.vim')
   finish
 endif
 
diff --git a/syntax/dnsmasq.vim b/syntax/dnsmasq.vim
index 6661e7a0c..39cbabf6a 100644
--- a/syntax/dnsmasq.vim
+++ b/syntax/dnsmasq.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dnsmasq')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dnsmasq', 'syntax/dnsmasq.vim')
   finish
 endif
 
diff --git a/syntax/docker-compose.vim b/syntax/docker-compose.vim
index 4f42848f9..a44ded516 100644
--- a/syntax/docker-compose.vim
+++ b/syntax/docker-compose.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'docker-compose')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'docker-compose', 'syntax/docker-compose.vim')
   finish
 endif
 
diff --git a/syntax/dockerfile.vim b/syntax/dockerfile.vim
index b96adbf1a..6f09d4fd7 100644
--- a/syntax/dockerfile.vim
+++ b/syntax/dockerfile.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dockerfile')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dockerfile', 'syntax/dockerfile.vim')
   finish
 endif
 
diff --git a/syntax/dosbatch.vim b/syntax/dosbatch.vim
index 55ac95569..ce7bfed70 100644
--- a/syntax/dosbatch.vim
+++ b/syntax/dosbatch.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dosbatch')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dosbatch', 'syntax/dosbatch.vim')
   finish
 endif
 
diff --git a/syntax/dosini.vim b/syntax/dosini.vim
index 434bf6c2e..361fbe569 100644
--- a/syntax/dosini.vim
+++ b/syntax/dosini.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dosini')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dosini', 'syntax/dosini.vim')
   finish
 endif
 
diff --git a/syntax/dot.vim b/syntax/dot.vim
index 2c7226c19..1bb1032b3 100644
--- a/syntax/dot.vim
+++ b/syntax/dot.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dot')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dot', 'syntax/dot.vim')
   finish
 endif
 
diff --git a/syntax/dracula.vim b/syntax/dracula.vim
index eec9bd454..66d6b6552 100644
--- a/syntax/dracula.vim
+++ b/syntax/dracula.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dracula')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dracula', 'syntax/dracula.vim')
   finish
 endif
 
diff --git a/syntax/dsdl.vim b/syntax/dsdl.vim
index 93a1f72e2..cec8fba95 100644
--- a/syntax/dsdl.vim
+++ b/syntax/dsdl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dlang')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dlang', 'syntax/dsdl.vim')
   finish
 endif
 
diff --git a/syntax/dsl.vim b/syntax/dsl.vim
index b0ba3ae65..1464533fc 100644
--- a/syntax/dsl.vim
+++ b/syntax/dsl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dsl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dsl', 'syntax/dsl.vim')
   finish
 endif
 
diff --git a/syntax/dtd.vim b/syntax/dtd.vim
index 17ca5125e..061b5f10b 100644
--- a/syntax/dtd.vim
+++ b/syntax/dtd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dtd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dtd', 'syntax/dtd.vim')
   finish
 endif
 
diff --git a/syntax/dts.vim b/syntax/dts.vim
index 278b8c287..26b1456f9 100644
--- a/syntax/dts.vim
+++ b/syntax/dts.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dts')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dts', 'syntax/dts.vim')
   finish
 endif
 
diff --git a/syntax/dune.vim b/syntax/dune.vim
index 68695a220..c42ce81ea 100644
--- a/syntax/dune.vim
+++ b/syntax/dune.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'syntax/dune.vim')
   finish
 endif
 
diff --git a/syntax/dylan.vim b/syntax/dylan.vim
index 8b61f3bfa..998117ee7 100644
--- a/syntax/dylan.vim
+++ b/syntax/dylan.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dylan')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dylan', 'syntax/dylan.vim')
   finish
 endif
 
diff --git a/syntax/dylanintr.vim b/syntax/dylanintr.vim
index 66c6ac58b..8bc64b33b 100644
--- a/syntax/dylanintr.vim
+++ b/syntax/dylanintr.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dylanintr')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dylanintr', 'syntax/dylanintr.vim')
   finish
 endif
 
diff --git a/syntax/dylanlid.vim b/syntax/dylanlid.vim
index f96fbe19d..e3424b768 100644
--- a/syntax/dylanlid.vim
+++ b/syntax/dylanlid.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dylanlid')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dylanlid', 'syntax/dylanlid.vim')
   finish
 endif
 
diff --git a/syntax/ecd.vim b/syntax/ecd.vim
index 0348673e8..db973d18d 100644
--- a/syntax/ecd.vim
+++ b/syntax/ecd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ecd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ecd', 'syntax/ecd.vim')
   finish
 endif
 
diff --git a/syntax/ecrystal.vim b/syntax/ecrystal.vim
index 4e69fd760..264fd78f9 100644
--- a/syntax/ecrystal.vim
+++ b/syntax/ecrystal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'crystal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'crystal', 'syntax/ecrystal.vim')
   finish
 endif
 
diff --git a/syntax/edif.vim b/syntax/edif.vim
index 9b2150f3c..4c7b95859 100644
--- a/syntax/edif.vim
+++ b/syntax/edif.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'edif')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'edif', 'syntax/edif.vim')
   finish
 endif
 
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index 6682756ef..e30a51c99 100644
--- a/syntax/eelixir.vim
+++ b/syntax/eelixir.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'syntax/eelixir.vim')
   finish
 endif
 
diff --git a/syntax/elf.vim b/syntax/elf.vim
index 44343c55b..7898851ad 100644
--- a/syntax/elf.vim
+++ b/syntax/elf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elf', 'syntax/elf.vim')
   finish
 endif
 
diff --git a/syntax/elinks.vim b/syntax/elinks.vim
index 39543edef..3642338d4 100644
--- a/syntax/elinks.vim
+++ b/syntax/elinks.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elinks')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elinks', 'syntax/elinks.vim')
   finish
 endif
 
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index 02e71a421..871a41574 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elixir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elixir', 'syntax/elixir.vim')
   finish
 endif
 
diff --git a/syntax/elm.vim b/syntax/elm.vim
index 37a3e433e..31b9d057d 100644
--- a/syntax/elm.vim
+++ b/syntax/elm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elm', 'syntax/elm.vim')
   finish
 endif
 
diff --git a/syntax/elmfilt.vim b/syntax/elmfilt.vim
index 6198ac5dc..b9a380f86 100644
--- a/syntax/elmfilt.vim
+++ b/syntax/elmfilt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'elmfilt')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'elmfilt', 'syntax/elmfilt.vim')
   finish
 endif
 
diff --git a/syntax/embeddedpuppet.vim b/syntax/embeddedpuppet.vim
index 3dd97d308..dad9e1fba 100644
--- a/syntax/embeddedpuppet.vim
+++ b/syntax/embeddedpuppet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'puppet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'syntax/embeddedpuppet.vim')
   finish
 endif
 
diff --git a/syntax/ember-script.vim b/syntax/ember-script.vim
index 585fa8356..e56fb9dec 100644
--- a/syntax/ember-script.vim
+++ b/syntax/ember-script.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'emberscript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'emberscript', 'syntax/ember-script.vim')
   finish
 endif
 
diff --git a/syntax/emblem.vim b/syntax/emblem.vim
index fb11af97a..f6a2dafb1 100644
--- a/syntax/emblem.vim
+++ b/syntax/emblem.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'emblem')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'emblem', 'syntax/emblem.vim')
   finish
 endif
 
diff --git a/syntax/erlang.vim b/syntax/erlang.vim
index 784808213..473c0606a 100644
--- a/syntax/erlang.vim
+++ b/syntax/erlang.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'erlang')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'erlang', 'syntax/erlang.vim')
   finish
 endif
 
diff --git a/syntax/eruby.vim b/syntax/eruby.vim
index 76776a0ed..d695d60fe 100644
--- a/syntax/eruby.vim
+++ b/syntax/eruby.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'syntax/eruby.vim')
   finish
 endif
 
diff --git a/syntax/esmtprc.vim b/syntax/esmtprc.vim
index 5f6f65f4d..243bec9c1 100644
--- a/syntax/esmtprc.vim
+++ b/syntax/esmtprc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'esmtprc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'esmtprc', 'syntax/esmtprc.vim')
   finish
 endif
 
diff --git a/syntax/esqlc.vim b/syntax/esqlc.vim
index 9fd8465c3..f16a11d44 100644
--- a/syntax/esqlc.vim
+++ b/syntax/esqlc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'esqlc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'esqlc', 'syntax/esqlc.vim')
   finish
 endif
 
diff --git a/syntax/esterel.vim b/syntax/esterel.vim
index 0f2e8be14..da76335ba 100644
--- a/syntax/esterel.vim
+++ b/syntax/esterel.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'esterel')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'esterel', 'syntax/esterel.vim')
   finish
 endif
 
diff --git a/syntax/eterm.vim b/syntax/eterm.vim
index 160f6874c..426a45ecd 100644
--- a/syntax/eterm.vim
+++ b/syntax/eterm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'eterm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'eterm', 'syntax/eterm.vim')
   finish
 endif
 
diff --git a/syntax/exim.vim b/syntax/exim.vim
index ccdf857d1..ab58e1a1c 100644
--- a/syntax/exim.vim
+++ b/syntax/exim.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'exim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'exim', 'syntax/exim.vim')
   finish
 endif
 
diff --git a/syntax/expect.vim b/syntax/expect.vim
index 95a38e259..495ab6bc7 100644
--- a/syntax/expect.vim
+++ b/syntax/expect.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'expect')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'expect', 'syntax/expect.vim')
   finish
 endif
 
diff --git a/syntax/exports.vim b/syntax/exports.vim
index 0a89ee80d..c2c13a3fb 100644
--- a/syntax/exports.vim
+++ b/syntax/exports.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'exports')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'exports', 'syntax/exports.vim')
   finish
 endif
 
diff --git a/syntax/falcon.vim b/syntax/falcon.vim
index 212c7740f..697a51a58 100644
--- a/syntax/falcon.vim
+++ b/syntax/falcon.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'falcon')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'falcon', 'syntax/falcon.vim')
   finish
 endif
 
diff --git a/syntax/fan.vim b/syntax/fan.vim
index 845fa9ec1..5608716cf 100644
--- a/syntax/fan.vim
+++ b/syntax/fan.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fan')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fan', 'syntax/fan.vim')
   finish
 endif
 
diff --git a/syntax/fbs.vim b/syntax/fbs.vim
index 69b7a43e7..384f19e46 100644
--- a/syntax/fbs.vim
+++ b/syntax/fbs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'flatbuffers')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'flatbuffers', 'syntax/fbs.vim')
   finish
 endif
 
diff --git a/syntax/fennel.vim b/syntax/fennel.vim
index 4a427f45e..e9cbe746e 100644
--- a/syntax/fennel.vim
+++ b/syntax/fennel.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fennel')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fennel', 'syntax/fennel.vim')
   finish
 endif
 
diff --git a/syntax/ferm.vim b/syntax/ferm.vim
index 1e642ed71..d6cec2691 100644
--- a/syntax/ferm.vim
+++ b/syntax/ferm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ferm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ferm', 'syntax/ferm.vim')
   finish
 endif
 
diff --git a/syntax/fetchmail.vim b/syntax/fetchmail.vim
index 4c3bdff1c..741ef4694 100644
--- a/syntax/fetchmail.vim
+++ b/syntax/fetchmail.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fetchmail')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fetchmail', 'syntax/fetchmail.vim')
   finish
 endif
 
diff --git a/syntax/fgl.vim b/syntax/fgl.vim
index 61284d6ce..cc5fd5205 100644
--- a/syntax/fgl.vim
+++ b/syntax/fgl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fgl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fgl', 'syntax/fgl.vim')
   finish
 endif
 
diff --git a/syntax/fish.vim b/syntax/fish.vim
index 6ea51a827..21bcbb943 100644
--- a/syntax/fish.vim
+++ b/syntax/fish.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fish')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fish', 'syntax/fish.vim')
   finish
 endif
 
diff --git a/syntax/flow.vim b/syntax/flow.vim
index 120bc3e48..ed17b9d53 100644
--- a/syntax/flow.vim
+++ b/syntax/flow.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'javascript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'javascript', 'syntax/flow.vim')
   finish
 endif
 
diff --git a/syntax/focexec.vim b/syntax/focexec.vim
index cbe6bd06e..c2ae774aa 100644
--- a/syntax/focexec.vim
+++ b/syntax/focexec.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'focexec')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'focexec', 'syntax/focexec.vim')
   finish
 endif
 
diff --git a/syntax/forth.vim b/syntax/forth.vim
index 5f2a5e0ef..4090be42a 100644
--- a/syntax/forth.vim
+++ b/syntax/forth.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'forth')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'forth', 'syntax/forth.vim')
   finish
 endif
 
diff --git a/syntax/fortran.vim b/syntax/fortran.vim
index 10f2a2dc0..6085268bb 100644
--- a/syntax/fortran.vim
+++ b/syntax/fortran.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fortran')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fortran', 'syntax/fortran.vim')
   finish
 endif
 
diff --git a/syntax/framescript.vim b/syntax/framescript.vim
index 95dd6b903..17bff3881 100644
--- a/syntax/framescript.vim
+++ b/syntax/framescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'framescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'framescript', 'syntax/framescript.vim')
   finish
 endif
 
diff --git a/syntax/freebasic.vim b/syntax/freebasic.vim
index feb1f9746..6cb26f262 100644
--- a/syntax/freebasic.vim
+++ b/syntax/freebasic.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'freebasic')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'freebasic', 'syntax/freebasic.vim')
   finish
 endif
 
diff --git a/syntax/fsharp.vim b/syntax/fsharp.vim
index 954e5a258..4dcca3c19 100644
--- a/syntax/fsharp.vim
+++ b/syntax/fsharp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fsharp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fsharp', 'syntax/fsharp.vim')
   finish
 endif
 
diff --git a/syntax/fstab.vim b/syntax/fstab.vim
index 70b47c755..d87a2ee42 100644
--- a/syntax/fstab.vim
+++ b/syntax/fstab.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fstab')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fstab', 'syntax/fstab.vim')
   finish
 endif
 
diff --git a/syntax/fvwm.vim b/syntax/fvwm.vim
index 393e64090..9367d2e89 100644
--- a/syntax/fvwm.vim
+++ b/syntax/fvwm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'fvwm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fvwm', 'syntax/fvwm.vim')
   finish
 endif
 
diff --git a/syntax/gdb.vim b/syntax/gdb.vim
index 58846d49e..587274fd7 100644
--- a/syntax/gdb.vim
+++ b/syntax/gdb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gdb')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gdb', 'syntax/gdb.vim')
   finish
 endif
 
diff --git a/syntax/gdmo.vim b/syntax/gdmo.vim
index 1fade76f4..634111421 100644
--- a/syntax/gdmo.vim
+++ b/syntax/gdmo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gdmo')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gdmo', 'syntax/gdmo.vim')
   finish
 endif
 
diff --git a/syntax/gdscript3.vim b/syntax/gdscript3.vim
index 4edae3047..cabfdfbd1 100644
--- a/syntax/gdscript3.vim
+++ b/syntax/gdscript3.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gdscript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gdscript', 'syntax/gdscript3.vim')
   finish
 endif
 
diff --git a/syntax/gedcom.vim b/syntax/gedcom.vim
index d2345adbd..151f31d78 100644
--- a/syntax/gedcom.vim
+++ b/syntax/gedcom.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gedcom')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gedcom', 'syntax/gedcom.vim')
   finish
 endif
 
diff --git a/syntax/git.vim b/syntax/git.vim
index 94ca7d04a..695566f01 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'git')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'git', 'syntax/git.vim')
   finish
 endif
 
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index b0f9c3718..1469bcbc2 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'git')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'git', 'syntax/gitcommit.vim')
   finish
 endif
 
diff --git a/syntax/gitconfig.vim b/syntax/gitconfig.vim
index f8781c9de..411af5915 100644
--- a/syntax/gitconfig.vim
+++ b/syntax/gitconfig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'git')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'git', 'syntax/gitconfig.vim')
   finish
 endif
 
diff --git a/syntax/gitignore.vim b/syntax/gitignore.vim
index b93fe0e14..b9d837ffb 100644
--- a/syntax/gitignore.vim
+++ b/syntax/gitignore.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gitignore')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gitignore', 'syntax/gitignore.vim')
   finish
 endif
 
diff --git a/syntax/gitolite.vim b/syntax/gitolite.vim
index ac47f74f1..05abcdef4 100644
--- a/syntax/gitolite.vim
+++ b/syntax/gitolite.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gitolite')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gitolite', 'syntax/gitolite.vim')
   finish
 endif
 
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index 0d2249261..da5f01e86 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/gitrebase.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'git')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'git', 'syntax/gitrebase.vim')
   finish
 endif
 
diff --git a/syntax/gitsendemail.vim b/syntax/gitsendemail.vim
index 5bd395869..1f44e7ead 100644
--- a/syntax/gitsendemail.vim
+++ b/syntax/gitsendemail.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'git')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'git', 'syntax/gitsendemail.vim')
   finish
 endif
 
diff --git a/syntax/gkrellmrc.vim b/syntax/gkrellmrc.vim
index b9a591f86..f26254e56 100644
--- a/syntax/gkrellmrc.vim
+++ b/syntax/gkrellmrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gkrellmrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gkrellmrc', 'syntax/gkrellmrc.vim')
   finish
 endif
 
diff --git a/syntax/gleam.vim b/syntax/gleam.vim
index cc667893c..c10877f0e 100644
--- a/syntax/gleam.vim
+++ b/syntax/gleam.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gleam')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gleam', 'syntax/gleam.vim')
   finish
 endif
 
diff --git a/syntax/glsl.vim b/syntax/glsl.vim
index 0760f46ea..eee593f1f 100644
--- a/syntax/glsl.vim
+++ b/syntax/glsl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'glsl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'glsl', 'syntax/glsl.vim')
   finish
 endif
 
diff --git a/syntax/gmpl.vim b/syntax/gmpl.vim
index 9d8968ed3..65289ac37 100644
--- a/syntax/gmpl.vim
+++ b/syntax/gmpl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gmpl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gmpl', 'syntax/gmpl.vim')
   finish
 endif
 
diff --git a/syntax/gnash.vim b/syntax/gnash.vim
index d3de61d45..f585d0fe8 100644
--- a/syntax/gnash.vim
+++ b/syntax/gnash.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gnash')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gnash', 'syntax/gnash.vim')
   finish
 endif
 
diff --git a/syntax/gnuplot.vim b/syntax/gnuplot.vim
index f66c87d43..a9cd02acb 100644
--- a/syntax/gnuplot.vim
+++ b/syntax/gnuplot.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gnuplot')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gnuplot', 'syntax/gnuplot.vim')
   finish
 endif
 
diff --git a/syntax/go.vim b/syntax/go.vim
index de92c5d6c..4630f0ebc 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'syntax/go.vim')
   finish
 endif
 
diff --git a/syntax/godebugoutput.vim b/syntax/godebugoutput.vim
index 02ea81fdd..badc512d2 100644
--- a/syntax/godebugoutput.vim
+++ b/syntax/godebugoutput.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'syntax/godebugoutput.vim')
   finish
 endif
 
diff --git a/syntax/godebugstacktrace.vim b/syntax/godebugstacktrace.vim
index 890b895f6..d2ffb4cee 100644
--- a/syntax/godebugstacktrace.vim
+++ b/syntax/godebugstacktrace.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'syntax/godebugstacktrace.vim')
   finish
 endif
 
diff --git a/syntax/godebugvariables.vim b/syntax/godebugvariables.vim
index 9ab2fc3ca..341ad0a05 100644
--- a/syntax/godebugvariables.vim
+++ b/syntax/godebugvariables.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'syntax/godebugvariables.vim')
   finish
 endif
 
diff --git a/syntax/godefstack.vim b/syntax/godefstack.vim
index bb277ac5e..aa52464fd 100644
--- a/syntax/godefstack.vim
+++ b/syntax/godefstack.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'syntax/godefstack.vim')
   finish
 endif
 
diff --git a/syntax/gohtmltmpl.vim b/syntax/gohtmltmpl.vim
index 590d5b741..271ba5acf 100644
--- a/syntax/gohtmltmpl.vim
+++ b/syntax/gohtmltmpl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'syntax/gohtmltmpl.vim')
   finish
 endif
 
diff --git a/syntax/gomod.vim b/syntax/gomod.vim
index 358e3b516..0de3d9d97 100644
--- a/syntax/gomod.vim
+++ b/syntax/gomod.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'syntax/gomod.vim')
   finish
 endif
 
diff --git a/syntax/gosum.vim b/syntax/gosum.vim
index 07130ca20..559734302 100644
--- a/syntax/gosum.vim
+++ b/syntax/gosum.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'syntax/gosum.vim')
   finish
 endif
 
diff --git a/syntax/gotexttmpl.vim b/syntax/gotexttmpl.vim
index 72d72ac17..cd29987a3 100644
--- a/syntax/gotexttmpl.vim
+++ b/syntax/gotexttmpl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'syntax/gotexttmpl.vim')
   finish
 endif
 
diff --git a/syntax/gp.vim b/syntax/gp.vim
index 3dd08aef8..3e95009a4 100644
--- a/syntax/gp.vim
+++ b/syntax/gp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gp', 'syntax/gp.vim')
   finish
 endif
 
diff --git a/syntax/gpg.vim b/syntax/gpg.vim
index 99743183a..677687442 100644
--- a/syntax/gpg.vim
+++ b/syntax/gpg.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gpg')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gpg', 'syntax/gpg.vim')
   finish
 endif
 
diff --git a/syntax/grads.vim b/syntax/grads.vim
index 23caea217..542283df5 100644
--- a/syntax/grads.vim
+++ b/syntax/grads.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'grads')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'grads', 'syntax/grads.vim')
   finish
 endif
 
diff --git a/syntax/graphql.vim b/syntax/graphql.vim
index a5351b089..b2266cef7 100644
--- a/syntax/graphql.vim
+++ b/syntax/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'syntax/graphql.vim')
   finish
 endif
 
diff --git a/syntax/gretl.vim b/syntax/gretl.vim
index 26f28c653..5cd3b5776 100644
--- a/syntax/gretl.vim
+++ b/syntax/gretl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gretl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gretl', 'syntax/gretl.vim')
   finish
 endif
 
diff --git a/syntax/groovy.vim b/syntax/groovy.vim
index 8f644431a..fdadca901 100644
--- a/syntax/groovy.vim
+++ b/syntax/groovy.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'groovy')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'groovy', 'syntax/groovy.vim')
   finish
 endif
 
diff --git a/syntax/group.vim b/syntax/group.vim
index f9c626831..b689f77b0 100644
--- a/syntax/group.vim
+++ b/syntax/group.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'group')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'group', 'syntax/group.vim')
   finish
 endif
 
diff --git a/syntax/grub.vim b/syntax/grub.vim
index 1af73eb02..56c5537d5 100644
--- a/syntax/grub.vim
+++ b/syntax/grub.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'grub')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'grub', 'syntax/grub.vim')
   finish
 endif
 
diff --git a/syntax/gsl.vim b/syntax/gsl.vim
index b3bfb9bf0..1c8407be9 100644
--- a/syntax/gsl.vim
+++ b/syntax/gsl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gdscript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gdscript', 'syntax/gsl.vim')
   finish
 endif
 
diff --git a/syntax/gsp.vim b/syntax/gsp.vim
index fa9f8dfa5..a390e7680 100644
--- a/syntax/gsp.vim
+++ b/syntax/gsp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gsp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gsp', 'syntax/gsp.vim')
   finish
 endif
 
diff --git a/syntax/gtkrc.vim b/syntax/gtkrc.vim
index 852203bd9..42d0c5f69 100644
--- a/syntax/gtkrc.vim
+++ b/syntax/gtkrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'gtkrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'gtkrc', 'syntax/gtkrc.vim')
   finish
 endif
 
diff --git a/syntax/haml.vim b/syntax/haml.vim
index 9585fdcff..0861ed33c 100644
--- a/syntax/haml.vim
+++ b/syntax/haml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haml', 'syntax/haml.vim')
   finish
 endif
 
diff --git a/syntax/hamster.vim b/syntax/hamster.vim
index 70cf2da03..dda5dd484 100644
--- a/syntax/hamster.vim
+++ b/syntax/hamster.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hamster')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hamster', 'syntax/hamster.vim')
   finish
 endif
 
diff --git a/syntax/handlebars.vim b/syntax/handlebars.vim
index f41927c75..1486da2b7 100644
--- a/syntax/handlebars.vim
+++ b/syntax/handlebars.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'handlebars')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'handlebars', 'syntax/handlebars.vim')
   finish
 endif
 
diff --git a/syntax/haproxy.vim b/syntax/haproxy.vim
index 81777b3cf..41a3803cc 100644
--- a/syntax/haproxy.vim
+++ b/syntax/haproxy.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haproxy')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haproxy', 'syntax/haproxy.vim')
   finish
 endif
 
diff --git a/syntax/haskell.vim b/syntax/haskell.vim
index 97b36074d..52c331901 100644
--- a/syntax/haskell.vim
+++ b/syntax/haskell.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haskell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haskell', 'syntax/haskell.vim')
   finish
 endif
 
diff --git a/syntax/haste.vim b/syntax/haste.vim
index 8f29eacb8..893fab687 100644
--- a/syntax/haste.vim
+++ b/syntax/haste.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haste')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haste', 'syntax/haste.vim')
   finish
 endif
 
diff --git a/syntax/hastepreproc.vim b/syntax/hastepreproc.vim
index 31b44ee61..835960aeb 100644
--- a/syntax/hastepreproc.vim
+++ b/syntax/hastepreproc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hastepreproc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hastepreproc', 'syntax/hastepreproc.vim')
   finish
 endif
 
diff --git a/syntax/haxe.vim b/syntax/haxe.vim
index 495ff6c72..0afda805e 100644
--- a/syntax/haxe.vim
+++ b/syntax/haxe.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haxe')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haxe', 'syntax/haxe.vim')
   finish
 endif
 
diff --git a/syntax/hb.vim b/syntax/hb.vim
index 987f85eca..25000a33a 100644
--- a/syntax/hb.vim
+++ b/syntax/hb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hb')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hb', 'syntax/hb.vim')
   finish
 endif
 
diff --git a/syntax/hcl.vim b/syntax/hcl.vim
index c0b004d5d..d11c031b5 100644
--- a/syntax/hcl.vim
+++ b/syntax/hcl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hcl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hcl', 'syntax/hcl.vim')
   finish
 endif
 
diff --git a/syntax/helm.vim b/syntax/helm.vim
index 79e02dadb..85d82edcf 100644
--- a/syntax/helm.vim
+++ b/syntax/helm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'helm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'helm', 'syntax/helm.vim')
   finish
 endif
 
diff --git a/syntax/help.vim b/syntax/help.vim
index 52e34dce4..1bb74a15a 100644
--- a/syntax/help.vim
+++ b/syntax/help.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'help')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'help', 'syntax/help.vim')
   finish
 endif
 
diff --git a/syntax/hercules.vim b/syntax/hercules.vim
index 671c8a0b1..33657e32e 100644
--- a/syntax/hercules.vim
+++ b/syntax/hercules.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hercules')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hercules', 'syntax/hercules.vim')
   finish
 endif
 
diff --git a/syntax/hex.vim b/syntax/hex.vim
index 6808720b0..7a6cfc3af 100644
--- a/syntax/hex.vim
+++ b/syntax/hex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hex', 'syntax/hex.vim')
   finish
 endif
 
diff --git a/syntax/hgcommit.vim b/syntax/hgcommit.vim
index eda6d63e6..af82c6cbb 100644
--- a/syntax/hgcommit.vim
+++ b/syntax/hgcommit.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hgcommit')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hgcommit', 'syntax/hgcommit.vim')
   finish
 endif
 
diff --git a/syntax/hive.vim b/syntax/hive.vim
index e2358f367..8561795e1 100644
--- a/syntax/hive.vim
+++ b/syntax/hive.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hive')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hive', 'syntax/hive.vim')
   finish
 endif
 
diff --git a/syntax/hog.vim b/syntax/hog.vim
index b967ad7fa..47af8f194 100644
--- a/syntax/hog.vim
+++ b/syntax/hog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hog', 'syntax/hog.vim')
   finish
 endif
 
diff --git a/syntax/hollywood.vim b/syntax/hollywood.vim
index c44676e6e..e801d11ac 100644
--- a/syntax/hollywood.vim
+++ b/syntax/hollywood.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hollywood')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hollywood', 'syntax/hollywood.vim')
   finish
 endif
 
diff --git a/syntax/hostconf.vim b/syntax/hostconf.vim
index 56a6a69f5..e96b39170 100644
--- a/syntax/hostconf.vim
+++ b/syntax/hostconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hostconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hostconf', 'syntax/hostconf.vim')
   finish
 endif
 
diff --git a/syntax/hostsaccess.vim b/syntax/hostsaccess.vim
index 43f45e9ab..3a2182e06 100644
--- a/syntax/hostsaccess.vim
+++ b/syntax/hostsaccess.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'hostsaccess')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hostsaccess', 'syntax/hostsaccess.vim')
   finish
 endif
 
diff --git a/syntax/html.vim b/syntax/html.vim
index 37c03c45c..c823d362b 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html', 'syntax/html.vim')
   finish
 endif
 
diff --git a/syntax/htmldjango.vim b/syntax/htmldjango.vim
index d70607579..f4b4f6767 100644
--- a/syntax/htmldjango.vim
+++ b/syntax/htmldjango.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'htmldjango')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'htmldjango', 'syntax/htmldjango.vim')
   finish
 endif
 
diff --git a/syntax/htmlm4.vim b/syntax/htmlm4.vim
index b2c8002a4..be53419a9 100644
--- a/syntax/htmlm4.vim
+++ b/syntax/htmlm4.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'htmlm4')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'htmlm4', 'syntax/htmlm4.vim')
   finish
 endif
 
diff --git a/syntax/i3config.vim b/syntax/i3config.vim
index f14cec52a..8228f9310 100644
--- a/syntax/i3config.vim
+++ b/syntax/i3config.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'i3')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'i3', 'syntax/i3config.vim')
   finish
 endif
 
diff --git a/syntax/ibasic.vim b/syntax/ibasic.vim
index c7a36432c..793a1de2d 100644
--- a/syntax/ibasic.vim
+++ b/syntax/ibasic.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ibasic')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ibasic', 'syntax/ibasic.vim')
   finish
 endif
 
diff --git a/syntax/icalendar.vim b/syntax/icalendar.vim
index 30a701831..09aca8985 100644
--- a/syntax/icalendar.vim
+++ b/syntax/icalendar.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'icalendar')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'icalendar', 'syntax/icalendar.vim')
   finish
 endif
 
diff --git a/syntax/icemenu.vim b/syntax/icemenu.vim
index 0e93a656d..cdc7a28bb 100644
--- a/syntax/icemenu.vim
+++ b/syntax/icemenu.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'icemenu')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'icemenu', 'syntax/icemenu.vim')
   finish
 endif
 
diff --git a/syntax/icon.vim b/syntax/icon.vim
index c19f5b52f..ba420eaa8 100644
--- a/syntax/icon.vim
+++ b/syntax/icon.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'icon')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'icon', 'syntax/icon.vim')
   finish
 endif
 
diff --git a/syntax/idris.vim b/syntax/idris.vim
index b909adb5d..7a59c8e59 100644
--- a/syntax/idris.vim
+++ b/syntax/idris.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris', 'syntax/idris.vim')
   finish
 endif
 
diff --git a/syntax/idris2.vim b/syntax/idris2.vim
index 65856380a..8a135c731 100644
--- a/syntax/idris2.vim
+++ b/syntax/idris2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris2', 'syntax/idris2.vim')
   finish
 endif
 
diff --git a/syntax/indent.vim b/syntax/indent.vim
index 141eabf96..14785ca62 100644
--- a/syntax/indent.vim
+++ b/syntax/indent.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'indent')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'indent', 'syntax/indent.vim')
   finish
 endif
 
diff --git a/syntax/inform.vim b/syntax/inform.vim
index 0ae47e484..847e7dacc 100644
--- a/syntax/inform.vim
+++ b/syntax/inform.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'inform')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'inform', 'syntax/inform.vim')
   finish
 endif
 
diff --git a/syntax/initng.vim b/syntax/initng.vim
index 34deba5d7..ecab2243c 100644
--- a/syntax/initng.vim
+++ b/syntax/initng.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'initng')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'initng', 'syntax/initng.vim')
   finish
 endif
 
diff --git a/syntax/inittab.vim b/syntax/inittab.vim
index aef4453cd..31e02a467 100644
--- a/syntax/inittab.vim
+++ b/syntax/inittab.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'inittab')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'inittab', 'syntax/inittab.vim')
   finish
 endif
 
diff --git a/syntax/ion.vim b/syntax/ion.vim
index b5d70f091..58db5b1e2 100644
--- a/syntax/ion.vim
+++ b/syntax/ion.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ion')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ion', 'syntax/ion.vim')
   finish
 endif
 
diff --git a/syntax/ipfilter.vim b/syntax/ipfilter.vim
index 153a2f919..09062ebcd 100644
--- a/syntax/ipfilter.vim
+++ b/syntax/ipfilter.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ipfilter')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ipfilter', 'syntax/ipfilter.vim')
   finish
 endif
 
diff --git a/syntax/iss.vim b/syntax/iss.vim
index 72eaaab06..5c82ae345 100644
--- a/syntax/iss.vim
+++ b/syntax/iss.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'iss')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'iss', 'syntax/iss.vim')
   finish
 endif
 
diff --git a/syntax/ist.vim b/syntax/ist.vim
index 6b17a3552..1938dedf1 100644
--- a/syntax/ist.vim
+++ b/syntax/ist.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ist')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ist', 'syntax/ist.vim')
   finish
 endif
 
diff --git a/syntax/j.vim b/syntax/j.vim
index 3021824c0..0b8ed98c0 100644
--- a/syntax/j.vim
+++ b/syntax/j.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'j')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'j', 'syntax/j.vim')
   finish
 endif
 
diff --git a/syntax/jal.vim b/syntax/jal.vim
index 2205161c4..6e7da6ed8 100644
--- a/syntax/jal.vim
+++ b/syntax/jal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jal', 'syntax/jal.vim')
   finish
 endif
 
diff --git a/syntax/jam.vim b/syntax/jam.vim
index 218a2e193..abdbf3f1d 100644
--- a/syntax/jam.vim
+++ b/syntax/jam.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jam')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jam', 'syntax/jam.vim')
   finish
 endif
 
diff --git a/syntax/java.vim b/syntax/java.vim
index 410d2c0ef..c445e00e7 100644
--- a/syntax/java.vim
+++ b/syntax/java.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'java')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'java', 'syntax/java.vim')
   finish
 endif
 
diff --git a/syntax/javacc.vim b/syntax/javacc.vim
index 417a3fb70..e49200352 100644
--- a/syntax/javacc.vim
+++ b/syntax/javacc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'javacc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'javacc', 'syntax/javacc.vim')
   finish
 endif
 
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index f68fa0569..dbd1c4edd 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'javascript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'javascript', 'syntax/javascript.vim')
   finish
 endif
 
diff --git a/syntax/jess.vim b/syntax/jess.vim
index 00d3938f4..c812bff13 100644
--- a/syntax/jess.vim
+++ b/syntax/jess.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jess')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jess', 'syntax/jess.vim')
   finish
 endif
 
diff --git a/syntax/jgraph.vim b/syntax/jgraph.vim
index 68131379b..4b8a06bcd 100644
--- a/syntax/jgraph.vim
+++ b/syntax/jgraph.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jgraph')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jgraph', 'syntax/jgraph.vim')
   finish
 endif
 
diff --git a/syntax/jinja2.vim b/syntax/jinja2.vim
index fda258bcc..fe081f259 100644
--- a/syntax/jinja2.vim
+++ b/syntax/jinja2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ansible')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ansible', 'syntax/jinja2.vim')
   finish
 endif
 
diff --git a/syntax/jovial.vim b/syntax/jovial.vim
index 9411e2506..7e77f1235 100644
--- a/syntax/jovial.vim
+++ b/syntax/jovial.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jovial')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jovial', 'syntax/jovial.vim')
   finish
 endif
 
diff --git a/syntax/jproperties.vim b/syntax/jproperties.vim
index 3a0448559..7b334c8c5 100644
--- a/syntax/jproperties.vim
+++ b/syntax/jproperties.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jproperties')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jproperties', 'syntax/jproperties.vim')
   finish
 endif
 
diff --git a/syntax/jq.vim b/syntax/jq.vim
index 78c260b2b..8bf8bb60e 100644
--- a/syntax/jq.vim
+++ b/syntax/jq.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jq')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jq', 'syntax/jq.vim')
   finish
 endif
 
diff --git a/syntax/json.vim b/syntax/json.vim
index b41bd3072..fb0104167 100644
--- a/syntax/json.vim
+++ b/syntax/json.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'json')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'json', 'syntax/json.vim')
   finish
 endif
 
diff --git a/syntax/json5.vim b/syntax/json5.vim
index 3ed1e37a8..2432e5561 100644
--- a/syntax/json5.vim
+++ b/syntax/json5.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'json5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'json5', 'syntax/json5.vim')
   finish
 endif
 
diff --git a/syntax/jsonc.vim b/syntax/jsonc.vim
index 49c14bcc6..059cd3324 100644
--- a/syntax/jsonc.vim
+++ b/syntax/jsonc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsonc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsonc', 'syntax/jsonc.vim')
   finish
 endif
 
diff --git a/syntax/jsonnet.vim b/syntax/jsonnet.vim
index 6f23fe2e3..62476cfb8 100644
--- a/syntax/jsonnet.vim
+++ b/syntax/jsonnet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsonnet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsonnet', 'syntax/jsonnet.vim')
   finish
 endif
 
diff --git a/syntax/jsp.vim b/syntax/jsp.vim
index 7c2a9241b..46d872f87 100644
--- a/syntax/jsp.vim
+++ b/syntax/jsp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsp', 'syntax/jsp.vim')
   finish
 endif
 
diff --git a/syntax/jst.vim b/syntax/jst.vim
index 4a601f9f4..9979327a2 100644
--- a/syntax/jst.vim
+++ b/syntax/jst.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jst')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jst', 'syntax/jst.vim')
   finish
 endif
 
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 3ce275c83..056df9c41 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'julia')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'julia', 'syntax/julia.vim')
   finish
 endif
 
diff --git a/syntax/juliadoc.vim b/syntax/juliadoc.vim
index 051a934b1..c4dbfdbdc 100644
--- a/syntax/juliadoc.vim
+++ b/syntax/juliadoc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'julia')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'julia', 'syntax/juliadoc.vim')
   finish
 endif
 
diff --git a/syntax/kconfig.vim b/syntax/kconfig.vim
index 156168ec8..be84d64dd 100644
--- a/syntax/kconfig.vim
+++ b/syntax/kconfig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'kconfig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'kconfig', 'syntax/kconfig.vim')
   finish
 endif
 
diff --git a/syntax/kivy.vim b/syntax/kivy.vim
index 0b5f4a143..2ebfbad00 100644
--- a/syntax/kivy.vim
+++ b/syntax/kivy.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'kivy')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'kivy', 'syntax/kivy.vim')
   finish
 endif
 
diff --git a/syntax/kix.vim b/syntax/kix.vim
index 0f39c838e..4bdf400c1 100644
--- a/syntax/kix.vim
+++ b/syntax/kix.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'kix')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'kix', 'syntax/kix.vim')
   finish
 endif
 
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index 03c1f3514..92362eb5a 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'kotlin')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'kotlin', 'syntax/kotlin.vim')
   finish
 endif
 
diff --git a/syntax/kscript.vim b/syntax/kscript.vim
index 46b1a222e..d270f972c 100644
--- a/syntax/kscript.vim
+++ b/syntax/kscript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'kscript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'kscript', 'syntax/kscript.vim')
   finish
 endif
 
diff --git a/syntax/kwt.vim b/syntax/kwt.vim
index 2f990d216..22abf68dc 100644
--- a/syntax/kwt.vim
+++ b/syntax/kwt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'kwt')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'kwt', 'syntax/kwt.vim')
   finish
 endif
 
diff --git a/syntax/lace.vim b/syntax/lace.vim
index e09e9438e..ce04cf4dc 100644
--- a/syntax/lace.vim
+++ b/syntax/lace.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lace')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lace', 'syntax/lace.vim')
   finish
 endif
 
diff --git a/syntax/latte.vim b/syntax/latte.vim
index f1fb4d839..82ae72d66 100644
--- a/syntax/latte.vim
+++ b/syntax/latte.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'latte')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'latte', 'syntax/latte.vim')
   finish
 endif
 
diff --git a/syntax/ld.vim b/syntax/ld.vim
index 5043b7b2f..bcfd2b3a1 100644
--- a/syntax/ld.vim
+++ b/syntax/ld.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ld')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ld', 'syntax/ld.vim')
   finish
 endif
 
diff --git a/syntax/ldif.vim b/syntax/ldif.vim
index 79c1480fa..c854a22af 100644
--- a/syntax/ldif.vim
+++ b/syntax/ldif.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ldif')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ldif', 'syntax/ldif.vim')
   finish
 endif
 
diff --git a/syntax/ledger.vim b/syntax/ledger.vim
index dc42a01a8..3f76282f6 100644
--- a/syntax/ledger.vim
+++ b/syntax/ledger.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ledger')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ledger', 'syntax/ledger.vim')
   finish
 endif
 
diff --git a/syntax/less.vim b/syntax/less.vim
index 478296124..f2af1eae7 100644
--- a/syntax/less.vim
+++ b/syntax/less.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'less')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'less', 'syntax/less.vim')
   finish
 endif
 
diff --git a/syntax/lex.vim b/syntax/lex.vim
index 144f0deb4..d077c209d 100644
--- a/syntax/lex.vim
+++ b/syntax/lex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lex', 'syntax/lex.vim')
   finish
 endif
 
diff --git a/syntax/lftp.vim b/syntax/lftp.vim
index 1dea9fcf0..1fc69b4c4 100644
--- a/syntax/lftp.vim
+++ b/syntax/lftp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lftp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lftp', 'syntax/lftp.vim')
   finish
 endif
 
diff --git a/syntax/lhaskell.vim b/syntax/lhaskell.vim
index d7d56f12d..9dd6e6f56 100644
--- a/syntax/lhaskell.vim
+++ b/syntax/lhaskell.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lhaskell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lhaskell', 'syntax/lhaskell.vim')
   finish
 endif
 
diff --git a/syntax/libao.vim b/syntax/libao.vim
index 3bdefe4b3..3bb820bc0 100644
--- a/syntax/libao.vim
+++ b/syntax/libao.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'libao')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'libao', 'syntax/libao.vim')
   finish
 endif
 
diff --git a/syntax/lidris.vim b/syntax/lidris.vim
index df6c03c9b..369cbe8b5 100644
--- a/syntax/lidris.vim
+++ b/syntax/lidris.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris', 'syntax/lidris.vim')
   finish
 endif
 
diff --git a/syntax/lidris2.vim b/syntax/lidris2.vim
index 3b37a490b..c884c4350 100644
--- a/syntax/lidris2.vim
+++ b/syntax/lidris2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris2', 'syntax/lidris2.vim')
   finish
 endif
 
diff --git a/syntax/lifelines.vim b/syntax/lifelines.vim
index 295c0060f..1b9383fb0 100644
--- a/syntax/lifelines.vim
+++ b/syntax/lifelines.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lifelines')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lifelines', 'syntax/lifelines.vim')
   finish
 endif
 
diff --git a/syntax/lilo.vim b/syntax/lilo.vim
index 88f14ff75..78493e27f 100644
--- a/syntax/lilo.vim
+++ b/syntax/lilo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lilo')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilo', 'syntax/lilo.vim')
   finish
 endif
 
diff --git a/syntax/lilypond-words.vim b/syntax/lilypond-words.vim
index 8806554fd..5d3c5a901 100644
--- a/syntax/lilypond-words.vim
+++ b/syntax/lilypond-words.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lilypond')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'syntax/lilypond-words.vim')
   finish
 endif
 
diff --git a/syntax/lilypond.vim b/syntax/lilypond.vim
index ada3a9acb..c8ea6d465 100644
--- a/syntax/lilypond.vim
+++ b/syntax/lilypond.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lilypond')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'syntax/lilypond.vim')
   finish
 endif
 
diff --git a/syntax/limits.vim b/syntax/limits.vim
index 90a464c2b..ff14b956a 100644
--- a/syntax/limits.vim
+++ b/syntax/limits.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'limits')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'limits', 'syntax/limits.vim')
   finish
 endif
 
diff --git a/syntax/liquid.vim b/syntax/liquid.vim
index 97b10c2e6..2a062b1ff 100644
--- a/syntax/liquid.vim
+++ b/syntax/liquid.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'liquid')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'liquid', 'syntax/liquid.vim')
   finish
 endif
 
diff --git a/syntax/lisp.vim b/syntax/lisp.vim
index ada26dc95..d8dd9ca8b 100644
--- a/syntax/lisp.vim
+++ b/syntax/lisp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lisp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lisp', 'syntax/lisp.vim')
   finish
 endif
 
diff --git a/syntax/litcoffee.vim b/syntax/litcoffee.vim
index cf642b629..608587caa 100644
--- a/syntax/litcoffee.vim
+++ b/syntax/litcoffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'coffee-script')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'coffee-script', 'syntax/litcoffee.vim')
   finish
 endif
 
diff --git a/syntax/lite.vim b/syntax/lite.vim
index 9b57ecac4..7917299e8 100644
--- a/syntax/lite.vim
+++ b/syntax/lite.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lite')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lite', 'syntax/lite.vim')
   finish
 endif
 
diff --git a/syntax/litestep.vim b/syntax/litestep.vim
index 254124cbe..a6334a915 100644
--- a/syntax/litestep.vim
+++ b/syntax/litestep.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'litestep')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'litestep', 'syntax/litestep.vim')
   finish
 endif
 
diff --git a/syntax/llvm.vim b/syntax/llvm.vim
index 73c1a5fe3..57bb3d6ff 100644
--- a/syntax/llvm.vim
+++ b/syntax/llvm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'llvm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'syntax/llvm.vim')
   finish
 endif
 
diff --git a/syntax/log.vim b/syntax/log.vim
index 6e658fe0c..5d843f83c 100644
--- a/syntax/log.vim
+++ b/syntax/log.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'log')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'log', 'syntax/log.vim')
   finish
 endif
 
diff --git a/syntax/loginaccess.vim b/syntax/loginaccess.vim
index fd7d36e70..dbd056a8a 100644
--- a/syntax/loginaccess.vim
+++ b/syntax/loginaccess.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'loginaccess')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'loginaccess', 'syntax/loginaccess.vim')
   finish
 endif
 
diff --git a/syntax/logindefs.vim b/syntax/logindefs.vim
index 21659376c..47286f1f4 100644
--- a/syntax/logindefs.vim
+++ b/syntax/logindefs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'logindefs')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'logindefs', 'syntax/logindefs.vim')
   finish
 endif
 
diff --git a/syntax/logtalk.vim b/syntax/logtalk.vim
index 7716e33ed..ad35a2ae2 100644
--- a/syntax/logtalk.vim
+++ b/syntax/logtalk.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'logtalk')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'logtalk', 'syntax/logtalk.vim')
   finish
 endif
 
diff --git a/syntax/lotos.vim b/syntax/lotos.vim
index 7270727fb..8c08f2dbf 100644
--- a/syntax/lotos.vim
+++ b/syntax/lotos.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lotos')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lotos', 'syntax/lotos.vim')
   finish
 endif
 
diff --git a/syntax/lout.vim b/syntax/lout.vim
index a79270440..64399e5bc 100644
--- a/syntax/lout.vim
+++ b/syntax/lout.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lout')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lout', 'syntax/lout.vim')
   finish
 endif
 
diff --git a/syntax/lpc.vim b/syntax/lpc.vim
index 5df61f967..f2a501c87 100644
--- a/syntax/lpc.vim
+++ b/syntax/lpc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lpc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lpc', 'syntax/lpc.vim')
   finish
 endif
 
diff --git a/syntax/lprolog.vim b/syntax/lprolog.vim
index 39368dc3a..aab3ba489 100644
--- a/syntax/lprolog.vim
+++ b/syntax/lprolog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lprolog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lprolog', 'syntax/lprolog.vim')
   finish
 endif
 
diff --git a/syntax/ls.vim b/syntax/ls.vim
index e65a76032..19ad49a1a 100644
--- a/syntax/ls.vim
+++ b/syntax/ls.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'livescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'livescript', 'syntax/ls.vim')
   finish
 endif
 
diff --git a/syntax/lsl.vim b/syntax/lsl.vim
index 30ad91859..3a579f0bc 100644
--- a/syntax/lsl.vim
+++ b/syntax/lsl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lsl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lsl', 'syntax/lsl.vim')
   finish
 endif
 
diff --git a/syntax/lss.vim b/syntax/lss.vim
index 8c08f7041..a57a7a60a 100644
--- a/syntax/lss.vim
+++ b/syntax/lss.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lss')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lss', 'syntax/lss.vim')
   finish
 endif
 
diff --git a/syntax/lua.vim b/syntax/lua.vim
index ca58a8daa..2546f656d 100644
--- a/syntax/lua.vim
+++ b/syntax/lua.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lua')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lua', 'syntax/lua.vim')
   finish
 endif
 
diff --git a/syntax/lynx.vim b/syntax/lynx.vim
index f23a06d82..ad33387fb 100644
--- a/syntax/lynx.vim
+++ b/syntax/lynx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'lynx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lynx', 'syntax/lynx.vim')
   finish
 endif
 
diff --git a/syntax/m4.vim b/syntax/m4.vim
index f21564479..6bfd3c791 100644
--- a/syntax/m4.vim
+++ b/syntax/m4.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'm4')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'm4', 'syntax/m4.vim')
   finish
 endif
 
diff --git a/syntax/mail.vim b/syntax/mail.vim
index f4cb01d6b..270e7e10a 100644
--- a/syntax/mail.vim
+++ b/syntax/mail.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mail')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mail', 'syntax/mail.vim')
   finish
 endif
 
diff --git a/syntax/mailaliases.vim b/syntax/mailaliases.vim
index 1638dfd85..f450f1663 100644
--- a/syntax/mailaliases.vim
+++ b/syntax/mailaliases.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mailaliases')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mailaliases', 'syntax/mailaliases.vim')
   finish
 endif
 
diff --git a/syntax/mailcap.vim b/syntax/mailcap.vim
index b917a9ed5..6570b4367 100644
--- a/syntax/mailcap.vim
+++ b/syntax/mailcap.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mailcap')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mailcap', 'syntax/mailcap.vim')
   finish
 endif
 
diff --git a/syntax/make.vim b/syntax/make.vim
index 0be719b63..1c5262af6 100644
--- a/syntax/make.vim
+++ b/syntax/make.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'make')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'make', 'syntax/make.vim')
   finish
 endif
 
diff --git a/syntax/mako.vim b/syntax/mako.vim
index cb454b8a7..6754cfc90 100644
--- a/syntax/mako.vim
+++ b/syntax/mako.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mako')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mako', 'syntax/mako.vim')
   finish
 endif
 
diff --git a/syntax/mallard.vim b/syntax/mallard.vim
index 979dada41..6ddf2fb88 100644
--- a/syntax/mallard.vim
+++ b/syntax/mallard.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mallard')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mallard', 'syntax/mallard.vim')
   finish
 endif
 
diff --git a/syntax/manconf.vim b/syntax/manconf.vim
index 7c81525a7..d5e7ab1ea 100644
--- a/syntax/manconf.vim
+++ b/syntax/manconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'manconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'manconf', 'syntax/manconf.vim')
   finish
 endif
 
diff --git a/syntax/maple.vim b/syntax/maple.vim
index cece98374..891df3017 100644
--- a/syntax/maple.vim
+++ b/syntax/maple.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'maple')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'maple', 'syntax/maple.vim')
   finish
 endif
 
diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index ef9b8c8dd..eeda03dae 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'markdown')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'markdown', 'syntax/markdown.vim')
   finish
 endif
 
diff --git a/syntax/mason.vim b/syntax/mason.vim
index 41a3ad4e9..e32630bc5 100644
--- a/syntax/mason.vim
+++ b/syntax/mason.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'perl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'perl', 'syntax/mason.vim')
   finish
 endif
 
diff --git a/syntax/master.vim b/syntax/master.vim
index 4a06aac12..f9b28b965 100644
--- a/syntax/master.vim
+++ b/syntax/master.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'master')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'master', 'syntax/master.vim')
   finish
 endif
 
diff --git a/syntax/mel.vim b/syntax/mel.vim
index 54ff4ab60..8d386b53e 100644
--- a/syntax/mel.vim
+++ b/syntax/mel.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mel')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mel', 'syntax/mel.vim')
   finish
 endif
 
diff --git a/syntax/merlin.vim b/syntax/merlin.vim
index e3fdbd09b..8768cf102 100644
--- a/syntax/merlin.vim
+++ b/syntax/merlin.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'reason')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'reason', 'syntax/merlin.vim')
   finish
 endif
 
diff --git a/syntax/meson.vim b/syntax/meson.vim
index 0dbbbaa64..28eab3eab 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'meson')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'meson', 'syntax/meson.vim')
   finish
 endif
 
diff --git a/syntax/messages.vim b/syntax/messages.vim
index 7448f4e0b..a66dbe638 100644
--- a/syntax/messages.vim
+++ b/syntax/messages.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'messages')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'messages', 'syntax/messages.vim')
   finish
 endif
 
diff --git a/syntax/mf.vim b/syntax/mf.vim
index 1d589edd4..bb2eefc06 100644
--- a/syntax/mf.vim
+++ b/syntax/mf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mf', 'syntax/mf.vim')
   finish
 endif
 
diff --git a/syntax/mgl.vim b/syntax/mgl.vim
index 631af5007..89c87a358 100644
--- a/syntax/mgl.vim
+++ b/syntax/mgl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mgl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mgl', 'syntax/mgl.vim')
   finish
 endif
 
diff --git a/syntax/mgp.vim b/syntax/mgp.vim
index 00c77a1d6..6aa74060f 100644
--- a/syntax/mgp.vim
+++ b/syntax/mgp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mgp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mgp', 'syntax/mgp.vim')
   finish
 endif
 
diff --git a/syntax/mib.vim b/syntax/mib.vim
index 8f67db382..57eaea8e7 100644
--- a/syntax/mib.vim
+++ b/syntax/mib.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mib')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mib', 'syntax/mib.vim')
   finish
 endif
 
diff --git a/syntax/mint.vim b/syntax/mint.vim
index 2b71a6920..efb16be07 100644
--- a/syntax/mint.vim
+++ b/syntax/mint.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mint')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mint', 'syntax/mint.vim')
   finish
 endif
 
diff --git a/syntax/mix.vim b/syntax/mix.vim
index b2a9f84ed..b19dea287 100644
--- a/syntax/mix.vim
+++ b/syntax/mix.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mix')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mix', 'syntax/mix.vim')
   finish
 endif
 
diff --git a/syntax/mma.vim b/syntax/mma.vim
index 7cfa8661a..7ff6aa2fe 100644
--- a/syntax/mma.vim
+++ b/syntax/mma.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mathematica')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mathematica', 'syntax/mma.vim')
   finish
 endif
 
diff --git a/syntax/mmp.vim b/syntax/mmp.vim
index 7acec6636..321136348 100644
--- a/syntax/mmp.vim
+++ b/syntax/mmp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mmp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mmp', 'syntax/mmp.vim')
   finish
 endif
 
diff --git a/syntax/modconf.vim b/syntax/modconf.vim
index 147d96304..5433e44d9 100644
--- a/syntax/modconf.vim
+++ b/syntax/modconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'modconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'modconf', 'syntax/modconf.vim')
   finish
 endif
 
diff --git a/syntax/modula2.vim b/syntax/modula2.vim
index d0fa5d83e..0bdce065b 100644
--- a/syntax/modula2.vim
+++ b/syntax/modula2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'modula2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'modula2', 'syntax/modula2.vim')
   finish
 endif
 
diff --git a/syntax/modula3.vim b/syntax/modula3.vim
index a1f22ebbb..7ebb966eb 100644
--- a/syntax/modula3.vim
+++ b/syntax/modula3.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'modula3')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'modula3', 'syntax/modula3.vim')
   finish
 endif
 
diff --git a/syntax/monk.vim b/syntax/monk.vim
index c17706432..1538a7fab 100644
--- a/syntax/monk.vim
+++ b/syntax/monk.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'monk')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'monk', 'syntax/monk.vim')
   finish
 endif
 
diff --git a/syntax/moo.vim b/syntax/moo.vim
index 5cffa07e9..8037605de 100644
--- a/syntax/moo.vim
+++ b/syntax/moo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'moo')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'moo', 'syntax/moo.vim')
   finish
 endif
 
diff --git a/syntax/moon.vim b/syntax/moon.vim
index 6771213ff..7d1f63c5d 100644
--- a/syntax/moon.vim
+++ b/syntax/moon.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'moonscript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'moonscript', 'syntax/moon.vim')
   finish
 endif
 
diff --git a/syntax/mp.vim b/syntax/mp.vim
index 3f52854a6..39b632b37 100644
--- a/syntax/mp.vim
+++ b/syntax/mp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mp', 'syntax/mp.vim')
   finish
 endif
 
diff --git a/syntax/mplayerconf.vim b/syntax/mplayerconf.vim
index 3d979f618..b09bf0182 100644
--- a/syntax/mplayerconf.vim
+++ b/syntax/mplayerconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mplayerconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mplayerconf', 'syntax/mplayerconf.vim')
   finish
 endif
 
diff --git a/syntax/mrxvtrc.vim b/syntax/mrxvtrc.vim
index cc77dc666..0cc9806c1 100644
--- a/syntax/mrxvtrc.vim
+++ b/syntax/mrxvtrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mrxvtrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mrxvtrc', 'syntax/mrxvtrc.vim')
   finish
 endif
 
diff --git a/syntax/msidl.vim b/syntax/msidl.vim
index 71708303b..2bf497f89 100644
--- a/syntax/msidl.vim
+++ b/syntax/msidl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'msidl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'msidl', 'syntax/msidl.vim')
   finish
 endif
 
diff --git a/syntax/msql.vim b/syntax/msql.vim
index 3d1888378..5a9298e6c 100644
--- a/syntax/msql.vim
+++ b/syntax/msql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'msql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'msql', 'syntax/msql.vim')
   finish
 endif
 
diff --git a/syntax/mupad.vim b/syntax/mupad.vim
index 8bd4a4f50..0b3be7a76 100644
--- a/syntax/mupad.vim
+++ b/syntax/mupad.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mupad')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mupad', 'syntax/mupad.vim')
   finish
 endif
 
diff --git a/syntax/murphi.vim b/syntax/murphi.vim
index b97876c34..305101c03 100644
--- a/syntax/murphi.vim
+++ b/syntax/murphi.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'murphi')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'murphi', 'syntax/murphi.vim')
   finish
 endif
 
diff --git a/syntax/mush.vim b/syntax/mush.vim
index a5024e97a..eae363697 100644
--- a/syntax/mush.vim
+++ b/syntax/mush.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mush')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mush', 'syntax/mush.vim')
   finish
 endif
 
diff --git a/syntax/mustache.vim b/syntax/mustache.vim
index 25ec16b61..1b477c7f1 100644
--- a/syntax/mustache.vim
+++ b/syntax/mustache.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'handlebars')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'handlebars', 'syntax/mustache.vim')
   finish
 endif
 
diff --git a/syntax/muttrc.vim b/syntax/muttrc.vim
index a776a84e4..e4cbac442 100644
--- a/syntax/muttrc.vim
+++ b/syntax/muttrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'muttrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'muttrc', 'syntax/muttrc.vim')
   finish
 endif
 
diff --git a/syntax/mysql.vim b/syntax/mysql.vim
index 3b2323eee..5541c9605 100644
--- a/syntax/mysql.vim
+++ b/syntax/mysql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mysql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mysql', 'syntax/mysql.vim')
   finish
 endif
 
diff --git a/syntax/n1ql.vim b/syntax/n1ql.vim
index eb018c249..8e3f8d100 100644
--- a/syntax/n1ql.vim
+++ b/syntax/n1ql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'n1ql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'n1ql', 'syntax/n1ql.vim')
   finish
 endif
 
diff --git a/syntax/named.vim b/syntax/named.vim
index efc82f00b..6d032d55e 100644
--- a/syntax/named.vim
+++ b/syntax/named.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'named')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'named', 'syntax/named.vim')
   finish
 endif
 
diff --git a/syntax/nanorc.vim b/syntax/nanorc.vim
index 2c51ddb18..e79fb15e1 100644
--- a/syntax/nanorc.vim
+++ b/syntax/nanorc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nanorc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nanorc', 'syntax/nanorc.vim')
   finish
 endif
 
diff --git a/syntax/natural.vim b/syntax/natural.vim
index 48a2caf97..6739e5306 100644
--- a/syntax/natural.vim
+++ b/syntax/natural.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'natural')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'natural', 'syntax/natural.vim')
   finish
 endif
 
diff --git a/syntax/ncf.vim b/syntax/ncf.vim
index e9df3256a..10f833f67 100644
--- a/syntax/ncf.vim
+++ b/syntax/ncf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ncf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ncf', 'syntax/ncf.vim')
   finish
 endif
 
diff --git a/syntax/neomuttrc.vim b/syntax/neomuttrc.vim
index 60e0eb96d..e1d386c48 100644
--- a/syntax/neomuttrc.vim
+++ b/syntax/neomuttrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'neomuttrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'neomuttrc', 'syntax/neomuttrc.vim')
   finish
 endif
 
diff --git a/syntax/netrc.vim b/syntax/netrc.vim
index 1e9933c04..24069e22a 100644
--- a/syntax/netrc.vim
+++ b/syntax/netrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'netrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'netrc', 'syntax/netrc.vim')
   finish
 endif
 
diff --git a/syntax/nginx.vim b/syntax/nginx.vim
index e1cfa7771..9c657fe36 100644
--- a/syntax/nginx.vim
+++ b/syntax/nginx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nginx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nginx', 'syntax/nginx.vim')
   finish
 endif
 
diff --git a/syntax/nim.vim b/syntax/nim.vim
index 138b1c90e..c3aa7b3f2 100644
--- a/syntax/nim.vim
+++ b/syntax/nim.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nim', 'syntax/nim.vim')
   finish
 endif
 
diff --git a/syntax/ninja.vim b/syntax/ninja.vim
index 6825cadd3..51f2dfea8 100644
--- a/syntax/ninja.vim
+++ b/syntax/ninja.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ninja')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ninja', 'syntax/ninja.vim')
   finish
 endif
 
diff --git a/syntax/nix.vim b/syntax/nix.vim
index a8c382e62..87c83feda 100644
--- a/syntax/nix.vim
+++ b/syntax/nix.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nix')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nix', 'syntax/nix.vim')
   finish
 endif
 
diff --git a/syntax/nqc.vim b/syntax/nqc.vim
index 5d310d9d5..648bbfd69 100644
--- a/syntax/nqc.vim
+++ b/syntax/nqc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nqc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nqc', 'syntax/nqc.vim')
   finish
 endif
 
diff --git a/syntax/nroff.vim b/syntax/nroff.vim
index 2681d4c9a..c848ecf90 100644
--- a/syntax/nroff.vim
+++ b/syntax/nroff.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nroff')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nroff', 'syntax/nroff.vim')
   finish
 endif
 
diff --git a/syntax/nsis.vim b/syntax/nsis.vim
index 959999cb4..76a338f61 100644
--- a/syntax/nsis.vim
+++ b/syntax/nsis.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'nsis')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nsis', 'syntax/nsis.vim')
   finish
 endif
 
diff --git a/syntax/oasis.vim b/syntax/oasis.vim
index 15af3903b..b935ed6d2 100644
--- a/syntax/oasis.vim
+++ b/syntax/oasis.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'syntax/oasis.vim')
   finish
 endif
 
diff --git a/syntax/obj.vim b/syntax/obj.vim
index 6ea9b23aa..0b9089ade 100644
--- a/syntax/obj.vim
+++ b/syntax/obj.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'obj')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'obj', 'syntax/obj.vim')
   finish
 endif
 
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index b858cf02c..032c133df 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'syntax/ocaml.vim')
   finish
 endif
 
diff --git a/syntax/ocamlbuild_tags.vim b/syntax/ocamlbuild_tags.vim
index aea91307f..43ce2aeb9 100644
--- a/syntax/ocamlbuild_tags.vim
+++ b/syntax/ocamlbuild_tags.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'syntax/ocamlbuild_tags.vim')
   finish
 endif
 
diff --git a/syntax/occam.vim b/syntax/occam.vim
index 98b762ebd..5b867cfa9 100644
--- a/syntax/occam.vim
+++ b/syntax/occam.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'occam')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'occam', 'syntax/occam.vim')
   finish
 endif
 
diff --git a/syntax/ocpbuild.vim b/syntax/ocpbuild.vim
index 7e5dad165..ffecb511c 100644
--- a/syntax/ocpbuild.vim
+++ b/syntax/ocpbuild.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'syntax/ocpbuild.vim')
   finish
 endif
 
diff --git a/syntax/ocpbuildroot.vim b/syntax/ocpbuildroot.vim
index 34740a3f1..9f7dde3ed 100644
--- a/syntax/ocpbuildroot.vim
+++ b/syntax/ocpbuildroot.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'syntax/ocpbuildroot.vim')
   finish
 endif
 
diff --git a/syntax/octave.vim b/syntax/octave.vim
index f3c91642e..3f1fa5613 100644
--- a/syntax/octave.vim
+++ b/syntax/octave.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'octave')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'octave', 'syntax/octave.vim')
   finish
 endif
 
diff --git a/syntax/odin.vim b/syntax/odin.vim
index e69605749..6597aeda7 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'odin')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'odin', 'syntax/odin.vim')
   finish
 endif
 
diff --git a/syntax/omake.vim b/syntax/omake.vim
index 54c3f4678..f37db782a 100644
--- a/syntax/omake.vim
+++ b/syntax/omake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'syntax/omake.vim')
   finish
 endif
 
diff --git a/syntax/omnimark.vim b/syntax/omnimark.vim
index 3e38b43b7..85a860b9d 100644
--- a/syntax/omnimark.vim
+++ b/syntax/omnimark.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'omnimark')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'omnimark', 'syntax/omnimark.vim')
   finish
 endif
 
diff --git a/syntax/opam.vim b/syntax/opam.vim
index 5bcaaaf7c..21ffb0ffd 100644
--- a/syntax/opam.vim
+++ b/syntax/opam.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'syntax/opam.vim')
   finish
 endif
 
diff --git a/syntax/opencl.vim b/syntax/opencl.vim
index ab77292f6..b14367009 100644
--- a/syntax/opencl.vim
+++ b/syntax/opencl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'opencl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'opencl', 'syntax/opencl.vim')
   finish
 endif
 
diff --git a/syntax/openroad.vim b/syntax/openroad.vim
index fcfe17e79..c7a13ce36 100644
--- a/syntax/openroad.vim
+++ b/syntax/openroad.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'openroad')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'openroad', 'syntax/openroad.vim')
   finish
 endif
 
diff --git a/syntax/opl.vim b/syntax/opl.vim
index 3908574c8..516c1c919 100644
--- a/syntax/opl.vim
+++ b/syntax/opl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'opl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'opl', 'syntax/opl.vim')
   finish
 endif
 
diff --git a/syntax/ora.vim b/syntax/ora.vim
index d91958be4..ffadce7ce 100644
--- a/syntax/ora.vim
+++ b/syntax/ora.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ora')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ora', 'syntax/ora.vim')
   finish
 endif
 
diff --git a/syntax/pamconf.vim b/syntax/pamconf.vim
index 7577a4f61..5710b5160 100644
--- a/syntax/pamconf.vim
+++ b/syntax/pamconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pamconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pamconf', 'syntax/pamconf.vim')
   finish
 endif
 
diff --git a/syntax/pamenv.vim b/syntax/pamenv.vim
index a89c7fc47..343198251 100644
--- a/syntax/pamenv.vim
+++ b/syntax/pamenv.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pamenv')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pamenv', 'syntax/pamenv.vim')
   finish
 endif
 
diff --git a/syntax/papp.vim b/syntax/papp.vim
index 879eb04ee..c6186a585 100644
--- a/syntax/papp.vim
+++ b/syntax/papp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'papp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'papp', 'syntax/papp.vim')
   finish
 endif
 
diff --git a/syntax/pascal.vim b/syntax/pascal.vim
index 6fb0717e9..cd401cc14 100644
--- a/syntax/pascal.vim
+++ b/syntax/pascal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pascal')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pascal', 'syntax/pascal.vim')
   finish
 endif
 
diff --git a/syntax/passwd.vim b/syntax/passwd.vim
index d33ed4dbe..5955a2a98 100644
--- a/syntax/passwd.vim
+++ b/syntax/passwd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'passwd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'passwd', 'syntax/passwd.vim')
   finish
 endif
 
diff --git a/syntax/pccts.vim b/syntax/pccts.vim
index accfd78c2..09120dd8f 100644
--- a/syntax/pccts.vim
+++ b/syntax/pccts.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pccts')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pccts', 'syntax/pccts.vim')
   finish
 endif
 
diff --git a/syntax/pdf.vim b/syntax/pdf.vim
index 6d9d87715..881785468 100644
--- a/syntax/pdf.vim
+++ b/syntax/pdf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pdf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pdf', 'syntax/pdf.vim')
   finish
 endif
 
diff --git a/syntax/perl.vim b/syntax/perl.vim
index cee3a8b79..42339a7ac 100644
--- a/syntax/perl.vim
+++ b/syntax/perl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'perl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'perl', 'syntax/perl.vim')
   finish
 endif
 
diff --git a/syntax/pest.vim b/syntax/pest.vim
index 03f66979f..eb9e7e33a 100644
--- a/syntax/pest.vim
+++ b/syntax/pest.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pest')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pest', 'syntax/pest.vim')
   finish
 endif
 
diff --git a/syntax/pf.vim b/syntax/pf.vim
index e3aab6b5b..faedcdc4a 100644
--- a/syntax/pf.vim
+++ b/syntax/pf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pf', 'syntax/pf.vim')
   finish
 endif
 
diff --git a/syntax/pfmain.vim b/syntax/pfmain.vim
index 62d6ba9dd..d257a2e56 100644
--- a/syntax/pfmain.vim
+++ b/syntax/pfmain.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pfmain')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pfmain', 'syntax/pfmain.vim')
   finish
 endif
 
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index f9bfca26d..81acfd2ba 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pgsql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pgsql', 'syntax/pgsql.vim')
   finish
 endif
 
diff --git a/syntax/php.vim b/syntax/php.vim
index 8b38f778f..270d6c1a7 100644
--- a/syntax/php.vim
+++ b/syntax/php.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'php')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'php', 'syntax/php.vim')
   finish
 endif
 
diff --git a/syntax/pike.vim b/syntax/pike.vim
index abf0fc816..0749b9fe9 100644
--- a/syntax/pike.vim
+++ b/syntax/pike.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pike')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pike', 'syntax/pike.vim')
   finish
 endif
 
diff --git a/syntax/pilrc.vim b/syntax/pilrc.vim
index 5485c6e8b..485a238f5 100644
--- a/syntax/pilrc.vim
+++ b/syntax/pilrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pilrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pilrc', 'syntax/pilrc.vim')
   finish
 endif
 
diff --git a/syntax/pine.vim b/syntax/pine.vim
index 5e2c111be..15239ffed 100644
--- a/syntax/pine.vim
+++ b/syntax/pine.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pine')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pine', 'syntax/pine.vim')
   finish
 endif
 
diff --git a/syntax/pinfo.vim b/syntax/pinfo.vim
index 6edb08876..ab4efb45a 100644
--- a/syntax/pinfo.vim
+++ b/syntax/pinfo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pinfo')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pinfo', 'syntax/pinfo.vim')
   finish
 endif
 
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index 60ba9923b..c562bb82c 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'plantuml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'plantuml', 'syntax/plantuml.vim')
   finish
 endif
 
diff --git a/syntax/pli.vim b/syntax/pli.vim
index 95c23ca26..f981cf150 100644
--- a/syntax/pli.vim
+++ b/syntax/pli.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pli')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pli', 'syntax/pli.vim')
   finish
 endif
 
diff --git a/syntax/plm.vim b/syntax/plm.vim
index 301cb9388..508f967ce 100644
--- a/syntax/plm.vim
+++ b/syntax/plm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'plm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'plm', 'syntax/plm.vim')
   finish
 endif
 
diff --git a/syntax/plp.vim b/syntax/plp.vim
index 993a703c3..793883136 100644
--- a/syntax/plp.vim
+++ b/syntax/plp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'plp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'plp', 'syntax/plp.vim')
   finish
 endif
 
diff --git a/syntax/plsql.vim b/syntax/plsql.vim
index f13a6fe21..0276f3d9f 100644
--- a/syntax/plsql.vim
+++ b/syntax/plsql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'plsql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'plsql', 'syntax/plsql.vim')
   finish
 endif
 
diff --git a/syntax/po.vim b/syntax/po.vim
index 3539d1b09..5872d8ad9 100644
--- a/syntax/po.vim
+++ b/syntax/po.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'po')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'po', 'syntax/po.vim')
   finish
 endif
 
diff --git a/syntax/pod.vim b/syntax/pod.vim
index 09eef1336..9370ece03 100644
--- a/syntax/pod.vim
+++ b/syntax/pod.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'perl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'perl', 'syntax/pod.vim')
   finish
 endif
 
diff --git a/syntax/pony.vim b/syntax/pony.vim
index 01968ed8f..da4f9e3f3 100644
--- a/syntax/pony.vim
+++ b/syntax/pony.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pony')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pony', 'syntax/pony.vim')
   finish
 endif
 
diff --git a/syntax/postscr.vim b/syntax/postscr.vim
index c581fb262..2a2b5a8fa 100644
--- a/syntax/postscr.vim
+++ b/syntax/postscr.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'postscr')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'postscr', 'syntax/postscr.vim')
   finish
 endif
 
diff --git a/syntax/pov.vim b/syntax/pov.vim
index 5cadffbfb..96249fcc4 100644
--- a/syntax/pov.vim
+++ b/syntax/pov.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pov')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pov', 'syntax/pov.vim')
   finish
 endif
 
diff --git a/syntax/povini.vim b/syntax/povini.vim
index 782c37be5..58cae3f1c 100644
--- a/syntax/povini.vim
+++ b/syntax/povini.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'povini')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'povini', 'syntax/povini.vim')
   finish
 endif
 
diff --git a/syntax/ppd.vim b/syntax/ppd.vim
index b1f84cbbd..ecf451045 100644
--- a/syntax/ppd.vim
+++ b/syntax/ppd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ppd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ppd', 'syntax/ppd.vim')
   finish
 endif
 
diff --git a/syntax/ppwiz.vim b/syntax/ppwiz.vim
index 8707ee7ea..685ccc761 100644
--- a/syntax/ppwiz.vim
+++ b/syntax/ppwiz.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ppwiz')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ppwiz', 'syntax/ppwiz.vim')
   finish
 endif
 
diff --git a/syntax/privoxy.vim b/syntax/privoxy.vim
index 447281082..2870c3cd5 100644
--- a/syntax/privoxy.vim
+++ b/syntax/privoxy.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'privoxy')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'privoxy', 'syntax/privoxy.vim')
   finish
 endif
 
diff --git a/syntax/procmail.vim b/syntax/procmail.vim
index b483cca72..65efd795e 100644
--- a/syntax/procmail.vim
+++ b/syntax/procmail.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'procmail')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'procmail', 'syntax/procmail.vim')
   finish
 endif
 
diff --git a/syntax/prolog.vim b/syntax/prolog.vim
index 25ef2b94e..c7c9dab4f 100644
--- a/syntax/prolog.vim
+++ b/syntax/prolog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'prolog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'prolog', 'syntax/prolog.vim')
   finish
 endif
 
diff --git a/syntax/promela.vim b/syntax/promela.vim
index 6d66bbbe2..84c1c721e 100644
--- a/syntax/promela.vim
+++ b/syntax/promela.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'promela')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'promela', 'syntax/promela.vim')
   finish
 endif
 
diff --git a/syntax/proto.vim b/syntax/proto.vim
index 68c70eb70..80ce7e5e7 100644
--- a/syntax/proto.vim
+++ b/syntax/proto.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'protobuf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'protobuf', 'syntax/proto.vim')
   finish
 endif
 
diff --git a/syntax/protocols.vim b/syntax/protocols.vim
index 3bc2c0e8a..e1c1eadbe 100644
--- a/syntax/protocols.vim
+++ b/syntax/protocols.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'protocols')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'protocols', 'syntax/protocols.vim')
   finish
 endif
 
diff --git a/syntax/ps1.vim b/syntax/ps1.vim
index 20cd36fcc..2d5d1f32c 100644
--- a/syntax/ps1.vim
+++ b/syntax/ps1.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'powershell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'powershell', 'syntax/ps1.vim')
   finish
 endif
 
diff --git a/syntax/ps1xml.vim b/syntax/ps1xml.vim
index dd8cf3657..fe9438881 100644
--- a/syntax/ps1xml.vim
+++ b/syntax/ps1xml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'powershell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'powershell', 'syntax/ps1xml.vim')
   finish
 endif
 
diff --git a/syntax/psf.vim b/syntax/psf.vim
index 64c8b0fb4..4136db3bd 100644
--- a/syntax/psf.vim
+++ b/syntax/psf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'psf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'psf', 'syntax/psf.vim')
   finish
 endif
 
diff --git a/syntax/pug.vim b/syntax/pug.vim
index a0cc3baee..eeec5f585 100644
--- a/syntax/pug.vim
+++ b/syntax/pug.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pug')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pug', 'syntax/pug.vim')
   finish
 endif
 
diff --git a/syntax/puppet.vim b/syntax/puppet.vim
index 881b2992c..2b9b09c9f 100644
--- a/syntax/puppet.vim
+++ b/syntax/puppet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'puppet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'syntax/puppet.vim')
   finish
 endif
 
diff --git a/syntax/purescript.vim b/syntax/purescript.vim
index b4e6f4389..e315d5814 100644
--- a/syntax/purescript.vim
+++ b/syntax/purescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'purescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'purescript', 'syntax/purescript.vim')
   finish
 endif
 
diff --git a/syntax/pyrex.vim b/syntax/pyrex.vim
index ce09728fd..08f3e471c 100644
--- a/syntax/pyrex.vim
+++ b/syntax/pyrex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'pyrex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'pyrex', 'syntax/pyrex.vim')
   finish
 endif
 
diff --git a/syntax/python.vim b/syntax/python.vim
index 6b5c39049..a9e7801da 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'python')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'python', 'syntax/python.vim')
   finish
 endif
 
diff --git a/syntax/qmake.vim b/syntax/qmake.vim
index c791daa87..730a74ffb 100644
--- a/syntax/qmake.vim
+++ b/syntax/qmake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'qmake')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'qmake', 'syntax/qmake.vim')
   finish
 endif
 
diff --git a/syntax/qml.vim b/syntax/qml.vim
index 4c367f1f5..73540c7cd 100644
--- a/syntax/qml.vim
+++ b/syntax/qml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'qml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'qml', 'syntax/qml.vim')
   finish
 endif
 
diff --git a/syntax/quake.vim b/syntax/quake.vim
index 14954d0b5..0b271cb70 100644
--- a/syntax/quake.vim
+++ b/syntax/quake.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'quake')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'quake', 'syntax/quake.vim')
   finish
 endif
 
diff --git a/syntax/racket.vim b/syntax/racket.vim
index c4f0a4226..fecccabbb 100644
--- a/syntax/racket.vim
+++ b/syntax/racket.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'racket')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'racket', 'syntax/racket.vim')
   finish
 endif
 
diff --git a/syntax/radiance.vim b/syntax/radiance.vim
index 19febfae2..65b1dd016 100644
--- a/syntax/radiance.vim
+++ b/syntax/radiance.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'radiance')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'radiance', 'syntax/radiance.vim')
   finish
 endif
 
diff --git a/syntax/ragel.vim b/syntax/ragel.vim
index 9ad261aef..9d838bc1d 100644
--- a/syntax/ragel.vim
+++ b/syntax/ragel.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ragel')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ragel', 'syntax/ragel.vim')
   finish
 endif
 
diff --git a/syntax/raku.vim b/syntax/raku.vim
index 3177f97e9..18784e9df 100644
--- a/syntax/raku.vim
+++ b/syntax/raku.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'raku')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'raku', 'syntax/raku.vim')
   finish
 endif
 
diff --git a/syntax/raml.vim b/syntax/raml.vim
index 5e3db72b8..e2b246ddd 100644
--- a/syntax/raml.vim
+++ b/syntax/raml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'raml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'raml', 'syntax/raml.vim')
   finish
 endif
 
diff --git a/syntax/ratpoison.vim b/syntax/ratpoison.vim
index 4348511ad..1a452d4aa 100644
--- a/syntax/ratpoison.vim
+++ b/syntax/ratpoison.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ratpoison')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ratpoison', 'syntax/ratpoison.vim')
   finish
 endif
 
diff --git a/syntax/razor.vim b/syntax/razor.vim
index c80ef5bf7..5c9819fe1 100644
--- a/syntax/razor.vim
+++ b/syntax/razor.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'razor')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'razor', 'syntax/razor.vim')
   finish
 endif
 
diff --git a/syntax/rc.vim b/syntax/rc.vim
index 8acbb817d..7d85d60ae 100644
--- a/syntax/rc.vim
+++ b/syntax/rc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rc', 'syntax/rc.vim')
   finish
 endif
 
diff --git a/syntax/rcs.vim b/syntax/rcs.vim
index 55a36bd23..8b1fde982 100644
--- a/syntax/rcs.vim
+++ b/syntax/rcs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rcs')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rcs', 'syntax/rcs.vim')
   finish
 endif
 
diff --git a/syntax/readline.vim b/syntax/readline.vim
index 7c0b9ebed..b3f8075e9 100644
--- a/syntax/readline.vim
+++ b/syntax/readline.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'readline')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'readline', 'syntax/readline.vim')
   finish
 endif
 
diff --git a/syntax/reason.vim b/syntax/reason.vim
index a5fb4eacb..ed43224fd 100644
--- a/syntax/reason.vim
+++ b/syntax/reason.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'reason')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'reason', 'syntax/reason.vim')
   finish
 endif
 
diff --git a/syntax/rego.vim b/syntax/rego.vim
index 018962888..dcf4becec 100644
--- a/syntax/rego.vim
+++ b/syntax/rego.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rego')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rego', 'syntax/rego.vim')
   finish
 endif
 
diff --git a/syntax/remind.vim b/syntax/remind.vim
index cf0a09e9f..1fa217766 100644
--- a/syntax/remind.vim
+++ b/syntax/remind.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'remind')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'remind', 'syntax/remind.vim')
   finish
 endif
 
diff --git a/syntax/requirements.vim b/syntax/requirements.vim
index c534727ed..48331f481 100644
--- a/syntax/requirements.vim
+++ b/syntax/requirements.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'requirements')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'requirements', 'syntax/requirements.vim')
   finish
 endif
 
diff --git a/syntax/resolv.vim b/syntax/resolv.vim
index d19e1df39..9121a6c40 100644
--- a/syntax/resolv.vim
+++ b/syntax/resolv.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'resolv')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'resolv', 'syntax/resolv.vim')
   finish
 endif
 
diff --git a/syntax/reva.vim b/syntax/reva.vim
index 6b13b2134..d97d9a43b 100644
--- a/syntax/reva.vim
+++ b/syntax/reva.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'reva')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'reva', 'syntax/reva.vim')
   finish
 endif
 
diff --git a/syntax/rexx.vim b/syntax/rexx.vim
index 88c21ef63..e0cea65bf 100644
--- a/syntax/rexx.vim
+++ b/syntax/rexx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rexx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rexx', 'syntax/rexx.vim')
   finish
 endif
 
diff --git a/syntax/rhelp.vim b/syntax/rhelp.vim
index 63f8f3861..5142d1bb8 100644
--- a/syntax/rhelp.vim
+++ b/syntax/rhelp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'r-lang')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'r-lang', 'syntax/rhelp.vim')
   finish
 endif
 
diff --git a/syntax/rib.vim b/syntax/rib.vim
index 4b8b3e182..96aa33ce1 100644
--- a/syntax/rib.vim
+++ b/syntax/rib.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rib')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rib', 'syntax/rib.vim')
   finish
 endif
 
diff --git a/syntax/rmd.vim b/syntax/rmd.vim
index 43e79af27..93e5a7f56 100644
--- a/syntax/rmd.vim
+++ b/syntax/rmd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rmd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rmd', 'syntax/rmd.vim')
   finish
 endif
 
diff --git a/syntax/rnc.vim b/syntax/rnc.vim
index 2f01f15ea..8ebc24889 100644
--- a/syntax/rnc.vim
+++ b/syntax/rnc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rnc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rnc', 'syntax/rnc.vim')
   finish
 endif
 
diff --git a/syntax/rng.vim b/syntax/rng.vim
index ce663d74c..b46f4449c 100644
--- a/syntax/rng.vim
+++ b/syntax/rng.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rng')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rng', 'syntax/rng.vim')
   finish
 endif
 
diff --git a/syntax/rnoweb-1.vim b/syntax/rnoweb-1.vim
index edda324f7..71ead83dd 100644
--- a/syntax/rnoweb-1.vim
+++ b/syntax/rnoweb-1.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'r-lang')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'r-lang', 'syntax/rnoweb.vim')
   finish
 endif
 
diff --git a/syntax/rnoweb-2.vim b/syntax/rnoweb-2.vim
index 49aa841a9..5e82bbaee 100644
--- a/syntax/rnoweb-2.vim
+++ b/syntax/rnoweb-2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rnoweb')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rnoweb', 'syntax/rnoweb-2.vim')
   finish
 endif
 
diff --git a/syntax/robots.vim b/syntax/robots.vim
index 667423d78..3b20260e0 100644
--- a/syntax/robots.vim
+++ b/syntax/robots.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'robots')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'robots', 'syntax/robots.vim')
   finish
 endif
 
diff --git a/syntax/rpcgen.vim b/syntax/rpcgen.vim
index 1990f7a4e..3714ec7fd 100644
--- a/syntax/rpcgen.vim
+++ b/syntax/rpcgen.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rpcgen')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rpcgen', 'syntax/rpcgen.vim')
   finish
 endif
 
diff --git a/syntax/rpl.vim b/syntax/rpl.vim
index 7a4d3fc8b..eed217007 100644
--- a/syntax/rpl.vim
+++ b/syntax/rpl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rpl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rpl', 'syntax/rpl.vim')
   finish
 endif
 
diff --git a/syntax/rrst.vim b/syntax/rrst.vim
index 426df72bd..99da4cfdb 100644
--- a/syntax/rrst.vim
+++ b/syntax/rrst.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rrst')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rrst', 'syntax/rrst.vim')
   finish
 endif
 
diff --git a/syntax/rst.vim b/syntax/rst.vim
index 08517f729..22b6ac594 100644
--- a/syntax/rst.vim
+++ b/syntax/rst.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rst')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rst', 'syntax/rst.vim')
   finish
 endif
 
diff --git a/syntax/rtf.vim b/syntax/rtf.vim
index b3f01274c..a860a5f0c 100644
--- a/syntax/rtf.vim
+++ b/syntax/rtf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rtf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rtf', 'syntax/rtf.vim')
   finish
 endif
 
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index 54dc11ac5..4b962fa10 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ruby')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ruby', 'syntax/ruby.vim')
   finish
 endif
 
diff --git a/syntax/rust.vim b/syntax/rust.vim
index a0d01d531..05cd8f099 100644
--- a/syntax/rust.vim
+++ b/syntax/rust.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'syntax/rust.vim')
   finish
 endif
 
diff --git a/syntax/samba.vim b/syntax/samba.vim
index 68fedc1c3..a0f233813 100644
--- a/syntax/samba.vim
+++ b/syntax/samba.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'samba')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'samba', 'syntax/samba.vim')
   finish
 endif
 
diff --git a/syntax/sas.vim b/syntax/sas.vim
index 505c11293..b4969b0db 100644
--- a/syntax/sas.vim
+++ b/syntax/sas.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sas')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sas', 'syntax/sas.vim')
   finish
 endif
 
diff --git a/syntax/sass.vim b/syntax/sass.vim
index 12b82eb17..c07a3e922 100644
--- a/syntax/sass.vim
+++ b/syntax/sass.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sass')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sass', 'syntax/sass.vim')
   finish
 endif
 
diff --git a/syntax/sather.vim b/syntax/sather.vim
index c9666be3f..c5f374551 100644
--- a/syntax/sather.vim
+++ b/syntax/sather.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sather')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sather', 'syntax/sather.vim')
   finish
 endif
 
diff --git a/syntax/sbt.vim b/syntax/sbt.vim
index f8dd9a0e0..105888270 100644
--- a/syntax/sbt.vim
+++ b/syntax/sbt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sbt')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sbt', 'syntax/sbt.vim')
   finish
 endif
 
diff --git a/syntax/scala.vim b/syntax/scala.vim
index 5188cefa4..6f802f3c4 100644
--- a/syntax/scala.vim
+++ b/syntax/scala.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scala')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scala', 'syntax/scala.vim')
   finish
 endif
 
diff --git a/syntax/scheme.vim b/syntax/scheme.vim
index 63ffe7a6a..8e991aa98 100644
--- a/syntax/scheme.vim
+++ b/syntax/scheme.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scheme')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scheme', 'syntax/scheme.vim')
   finish
 endif
 
diff --git a/syntax/scilab.vim b/syntax/scilab.vim
index b82bf316e..366b390d4 100644
--- a/syntax/scilab.vim
+++ b/syntax/scilab.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scilab')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scilab', 'syntax/scilab.vim')
   finish
 endif
 
diff --git a/syntax/screen.vim b/syntax/screen.vim
index 156ab486d..3f0abc527 100644
--- a/syntax/screen.vim
+++ b/syntax/screen.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'screen')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'screen', 'syntax/screen.vim')
   finish
 endif
 
diff --git a/syntax/scss.vim b/syntax/scss.vim
index 18f6ca26c..6b638bf74 100644
--- a/syntax/scss.vim
+++ b/syntax/scss.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scss')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scss', 'syntax/scss.vim')
   finish
 endif
 
diff --git a/syntax/sd.vim b/syntax/sd.vim
index 7d93112f8..3e87c2d2e 100644
--- a/syntax/sd.vim
+++ b/syntax/sd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sd', 'syntax/sd.vim')
   finish
 endif
 
diff --git a/syntax/sdc.vim b/syntax/sdc.vim
index 3d055fb5b..fbac4b761 100644
--- a/syntax/sdc.vim
+++ b/syntax/sdc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sdc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sdc', 'syntax/sdc.vim')
   finish
 endif
 
diff --git a/syntax/sdl.vim b/syntax/sdl.vim
index 5531cfe03..172dffd0f 100644
--- a/syntax/sdl.vim
+++ b/syntax/sdl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sdl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sdl', 'syntax/sdl.vim')
   finish
 endif
 
diff --git a/syntax/sed.vim b/syntax/sed.vim
index d5ccb5be6..875c3f890 100644
--- a/syntax/sed.vim
+++ b/syntax/sed.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sed')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sed', 'syntax/sed.vim')
   finish
 endif
 
diff --git a/syntax/sensors.vim b/syntax/sensors.vim
index 21a9d5c9f..fd9d0f2fe 100644
--- a/syntax/sensors.vim
+++ b/syntax/sensors.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sensors')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sensors', 'syntax/sensors.vim')
   finish
 endif
 
diff --git a/syntax/services.vim b/syntax/services.vim
index 70a935272..98bb60d6a 100644
--- a/syntax/services.vim
+++ b/syntax/services.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'services')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'services', 'syntax/services.vim')
   finish
 endif
 
diff --git a/syntax/setserial.vim b/syntax/setserial.vim
index 94b78fa0c..86eaffc9a 100644
--- a/syntax/setserial.vim
+++ b/syntax/setserial.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'setserial')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'setserial', 'syntax/setserial.vim')
   finish
 endif
 
diff --git a/syntax/sexplib.vim b/syntax/sexplib.vim
index 14e02b6d6..cc706736a 100644
--- a/syntax/sexplib.vim
+++ b/syntax/sexplib.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'ocaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'syntax/sexplib.vim')
   finish
 endif
 
diff --git a/syntax/sh.vim b/syntax/sh.vim
index 8be86a841..7292ec5d9 100644
--- a/syntax/sh.vim
+++ b/syntax/sh.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sh')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sh', 'syntax/sh.vim')
   finish
 endif
 
diff --git a/syntax/sieve.vim b/syntax/sieve.vim
index 4924e30af..baacb27a3 100644
--- a/syntax/sieve.vim
+++ b/syntax/sieve.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sieve')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sieve', 'syntax/sieve.vim')
   finish
 endif
 
diff --git a/syntax/sil.vim b/syntax/sil.vim
index 70884ddc7..e0f874fe0 100644
--- a/syntax/sil.vim
+++ b/syntax/sil.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sil')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sil', 'syntax/sil.vim')
   finish
 endif
 
diff --git a/syntax/simula.vim b/syntax/simula.vim
index 4ed4b65ca..065e33a44 100644
--- a/syntax/simula.vim
+++ b/syntax/simula.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'simula')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'simula', 'syntax/simula.vim')
   finish
 endif
 
diff --git a/syntax/sinda.vim b/syntax/sinda.vim
index 48ea26e2d..4f9c99477 100644
--- a/syntax/sinda.vim
+++ b/syntax/sinda.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sinda')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sinda', 'syntax/sinda.vim')
   finish
 endif
 
diff --git a/syntax/sisu.vim b/syntax/sisu.vim
index e858ad58d..b372cb098 100644
--- a/syntax/sisu.vim
+++ b/syntax/sisu.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sisu')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sisu', 'syntax/sisu.vim')
   finish
 endif
 
diff --git a/syntax/skill.vim b/syntax/skill.vim
index ae10e3c50..c8fe9e214 100644
--- a/syntax/skill.vim
+++ b/syntax/skill.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'skill')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'skill', 'syntax/skill.vim')
   finish
 endif
 
diff --git a/syntax/slang.vim b/syntax/slang.vim
index 54ed5f2cf..eef4985f9 100644
--- a/syntax/slang.vim
+++ b/syntax/slang.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slang')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slang', 'syntax/slang.vim')
   finish
 endif
 
diff --git a/syntax/slice.vim b/syntax/slice.vim
index 5588cd561..c6fbc4c83 100644
--- a/syntax/slice.vim
+++ b/syntax/slice.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slice')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slice', 'syntax/slice.vim')
   finish
 endif
 
diff --git a/syntax/slim.vim b/syntax/slim.vim
index bf09698a3..99f510044 100644
--- a/syntax/slim.vim
+++ b/syntax/slim.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slim', 'syntax/slim.vim')
   finish
 endif
 
diff --git a/syntax/slime.vim b/syntax/slime.vim
index 169b20c7b..f8d77b582 100644
--- a/syntax/slime.vim
+++ b/syntax/slime.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slime')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slime', 'syntax/slime.vim')
   finish
 endif
 
diff --git a/syntax/slpconf.vim b/syntax/slpconf.vim
index 9484c3330..e7777ba95 100644
--- a/syntax/slpconf.vim
+++ b/syntax/slpconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slpconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slpconf', 'syntax/slpconf.vim')
   finish
 endif
 
diff --git a/syntax/slpreg.vim b/syntax/slpreg.vim
index ffee9bf8d..efbb1f657 100644
--- a/syntax/slpreg.vim
+++ b/syntax/slpreg.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slpreg')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slpreg', 'syntax/slpreg.vim')
   finish
 endif
 
diff --git a/syntax/slpspi.vim b/syntax/slpspi.vim
index f8cbde48e..32412bdff 100644
--- a/syntax/slpspi.vim
+++ b/syntax/slpspi.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slpspi')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slpspi', 'syntax/slpspi.vim')
   finish
 endif
 
diff --git a/syntax/slrnrc.vim b/syntax/slrnrc.vim
index 37d91d719..0fa143881 100644
--- a/syntax/slrnrc.vim
+++ b/syntax/slrnrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slrnrc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slrnrc', 'syntax/slrnrc.vim')
   finish
 endif
 
diff --git a/syntax/slrnsc.vim b/syntax/slrnsc.vim
index 9fa8b57ef..2b1ca816e 100644
--- a/syntax/slrnsc.vim
+++ b/syntax/slrnsc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'slrnsc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'slrnsc', 'syntax/slrnsc.vim')
   finish
 endif
 
diff --git a/syntax/sm.vim b/syntax/sm.vim
index 0180b59f6..b2b3b58ba 100644
--- a/syntax/sm.vim
+++ b/syntax/sm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sm', 'syntax/sm.vim')
   finish
 endif
 
diff --git a/syntax/smarty.vim b/syntax/smarty.vim
index f90cab63e..90584cff1 100644
--- a/syntax/smarty.vim
+++ b/syntax/smarty.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'smarty')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'smarty', 'syntax/smarty.vim')
   finish
 endif
 
diff --git a/syntax/smcl.vim b/syntax/smcl.vim
index 8f844578a..851e99063 100644
--- a/syntax/smcl.vim
+++ b/syntax/smcl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'smcl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'smcl', 'syntax/smcl.vim')
   finish
 endif
 
diff --git a/syntax/smhl.vim b/syntax/smhl.vim
index 060aa0e7e..b990d21e9 100644
--- a/syntax/smhl.vim
+++ b/syntax/smhl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/smhl.vim')
   finish
 endif
 
diff --git a/syntax/smith.vim b/syntax/smith.vim
index 6dd679e20..c2eef0222 100644
--- a/syntax/smith.vim
+++ b/syntax/smith.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'smith')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'smith', 'syntax/smith.vim')
   finish
 endif
 
diff --git a/syntax/sml.vim b/syntax/sml.vim
index 283f53392..10bca3ba0 100644
--- a/syntax/sml.vim
+++ b/syntax/sml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sml', 'syntax/sml.vim')
   finish
 endif
 
diff --git a/syntax/smt2.vim b/syntax/smt2.vim
index adb88d28a..eb89e375c 100644
--- a/syntax/smt2.vim
+++ b/syntax/smt2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'smt2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'smt2', 'syntax/smt2.vim')
   finish
 endif
 
diff --git a/syntax/snobol4.vim b/syntax/snobol4.vim
index cadcafb8d..a74af9de1 100644
--- a/syntax/snobol4.vim
+++ b/syntax/snobol4.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'snobol4')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'snobol4', 'syntax/snobol4.vim')
   finish
 endif
 
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index 3be7ed153..49ef7a313 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'solidity')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'solidity', 'syntax/solidity.vim')
   finish
 endif
 
diff --git a/syntax/spec.vim b/syntax/spec.vim
index 17b5a2b82..5d7b1efca 100644
--- a/syntax/spec.vim
+++ b/syntax/spec.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'spec')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'spec', 'syntax/spec.vim')
   finish
 endif
 
diff --git a/syntax/spice.vim b/syntax/spice.vim
index d530fbbda..4107cc5db 100644
--- a/syntax/spice.vim
+++ b/syntax/spice.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'spice')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'spice', 'syntax/spice.vim')
   finish
 endif
 
diff --git a/syntax/spup.vim b/syntax/spup.vim
index 7b25c2bea..943e0e555 100644
--- a/syntax/spup.vim
+++ b/syntax/spup.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'spup')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'spup', 'syntax/spup.vim')
   finish
 endif
 
diff --git a/syntax/spyce.vim b/syntax/spyce.vim
index 5a60aedbf..2aa8bce54 100644
--- a/syntax/spyce.vim
+++ b/syntax/spyce.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'spyce')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'spyce', 'syntax/spyce.vim')
   finish
 endif
 
diff --git a/syntax/sql.vim b/syntax/sql.vim
index a9eb45173..dcc61a935 100644
--- a/syntax/sql.vim
+++ b/syntax/sql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sql', 'syntax/sql.vim')
   finish
 endif
 
diff --git a/syntax/sqlj.vim b/syntax/sqlj.vim
index f44a696f7..8b19efed9 100644
--- a/syntax/sqlj.vim
+++ b/syntax/sqlj.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sqlj')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sqlj', 'syntax/sqlj.vim')
   finish
 endif
 
diff --git a/syntax/sqloracle.vim b/syntax/sqloracle.vim
index ee6276ca5..a3f32d122 100644
--- a/syntax/sqloracle.vim
+++ b/syntax/sqloracle.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sql', 'syntax/sqloracle.vim')
   finish
 endif
 
diff --git a/syntax/sqr.vim b/syntax/sqr.vim
index a4f022a27..c837a7977 100644
--- a/syntax/sqr.vim
+++ b/syntax/sqr.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sqr')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sqr', 'syntax/sqr.vim')
   finish
 endif
 
diff --git a/syntax/squid.vim b/syntax/squid.vim
index e23d18843..0928d1639 100644
--- a/syntax/squid.vim
+++ b/syntax/squid.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'squid')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'squid', 'syntax/squid.vim')
   finish
 endif
 
diff --git a/syntax/srec.vim b/syntax/srec.vim
index e8b808048..6ca99e359 100644
--- a/syntax/srec.vim
+++ b/syntax/srec.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'srec')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'srec', 'syntax/srec.vim')
   finish
 endif
 
diff --git a/syntax/sshconfig.vim b/syntax/sshconfig.vim
index 0a70e5016..2c7bc896c 100644
--- a/syntax/sshconfig.vim
+++ b/syntax/sshconfig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sshconfig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sshconfig', 'syntax/sshconfig.vim')
   finish
 endif
 
diff --git a/syntax/sshdconfig.vim b/syntax/sshdconfig.vim
index 0ae86bab2..ffd50daef 100644
--- a/syntax/sshdconfig.vim
+++ b/syntax/sshdconfig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sshdconfig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sshdconfig', 'syntax/sshdconfig.vim')
   finish
 endif
 
diff --git a/syntax/st.vim b/syntax/st.vim
index 70c0d9cc1..5ad026bfd 100644
--- a/syntax/st.vim
+++ b/syntax/st.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'st')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'st', 'syntax/st.vim')
   finish
 endif
 
diff --git a/syntax/stata.vim b/syntax/stata.vim
index 260984493..4b87ad723 100644
--- a/syntax/stata.vim
+++ b/syntax/stata.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'stata')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'stata', 'syntax/stata.vim')
   finish
 endif
 
diff --git a/syntax/stp.vim b/syntax/stp.vim
index 53236246f..36da7bb59 100644
--- a/syntax/stp.vim
+++ b/syntax/stp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'stp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'stp', 'syntax/stp.vim')
   finish
 endif
 
diff --git a/syntax/stylus.vim b/syntax/stylus.vim
index d66a60379..9ddb4b82e 100644
--- a/syntax/stylus.vim
+++ b/syntax/stylus.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'stylus')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'stylus', 'syntax/stylus.vim')
   finish
 endif
 
diff --git a/syntax/sudoers.vim b/syntax/sudoers.vim
index 3e4f823f0..1d65f0117 100644
--- a/syntax/sudoers.vim
+++ b/syntax/sudoers.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sudoers')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sudoers', 'syntax/sudoers.vim')
   finish
 endif
 
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index 3a5360f84..ce454db06 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'svelte')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'svelte', 'syntax/svelte.vim')
   finish
 endif
 
diff --git a/syntax/svg.vim b/syntax/svg.vim
index 931b259fe..e47242598 100644
--- a/syntax/svg.vim
+++ b/syntax/svg.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'svg')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'svg', 'syntax/svg.vim')
   finish
 endif
 
diff --git a/syntax/svn.vim b/syntax/svn.vim
index 4780a2ef1..cab1922fa 100644
--- a/syntax/svn.vim
+++ b/syntax/svn.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'svn')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'svn', 'syntax/svn.vim')
   finish
 endif
 
diff --git a/syntax/swift.vim b/syntax/swift.vim
index 4290139d3..122c9ec8a 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'swift')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'swift', 'syntax/swift.vim')
   finish
 endif
 
diff --git a/syntax/swiftgyb.vim b/syntax/swiftgyb.vim
index 6927a6697..c9ea345ba 100644
--- a/syntax/swiftgyb.vim
+++ b/syntax/swiftgyb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'swiftgyb')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'swiftgyb', 'syntax/swiftgyb.vim')
   finish
 endif
 
diff --git a/syntax/sxhkdrc.vim b/syntax/sxhkdrc.vim
index 6b4e3faec..b72b86001 100644
--- a/syntax/sxhkdrc.vim
+++ b/syntax/sxhkdrc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sxhkd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sxhkd', 'syntax/sxhkdrc.vim')
   finish
 endif
 
diff --git a/syntax/sysctl.vim b/syntax/sysctl.vim
index 79ddba0ca..74692c75c 100644
--- a/syntax/sysctl.vim
+++ b/syntax/sysctl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sysctl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sysctl', 'syntax/sysctl.vim')
   finish
 endif
 
diff --git a/syntax/systemd.vim b/syntax/systemd.vim
index 8c7aed27a..ab9c4cac5 100644
--- a/syntax/systemd.vim
+++ b/syntax/systemd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'systemd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'systemd', 'syntax/systemd.vim')
   finish
 endif
 
diff --git a/syntax/systemverilog.vim b/syntax/systemverilog.vim
index 9c9a8249d..83715406b 100644
--- a/syntax/systemverilog.vim
+++ b/syntax/systemverilog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'systemverilog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'systemverilog', 'syntax/systemverilog.vim')
   finish
 endif
 
diff --git a/syntax/tablegen.vim b/syntax/tablegen.vim
index 6eee43789..43d9cc62c 100644
--- a/syntax/tablegen.vim
+++ b/syntax/tablegen.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'llvm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'syntax/tablegen.vim')
   finish
 endif
 
diff --git a/syntax/tads.vim b/syntax/tads.vim
index 8cd1ef44d..9baf66583 100644
--- a/syntax/tads.vim
+++ b/syntax/tads.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tads')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tads', 'syntax/tads.vim')
   finish
 endif
 
diff --git a/syntax/tags.vim b/syntax/tags.vim
index 4db68929f..b32424bf8 100644
--- a/syntax/tags.vim
+++ b/syntax/tags.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tags')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tags', 'syntax/tags.vim')
   finish
 endif
 
diff --git a/syntax/tak.vim b/syntax/tak.vim
index 5a58401dc..1bd4612c3 100644
--- a/syntax/tak.vim
+++ b/syntax/tak.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tak')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tak', 'syntax/tak.vim')
   finish
 endif
 
diff --git a/syntax/tap.vim b/syntax/tap.vim
index a7ed6d829..974bd27a3 100644
--- a/syntax/tap.vim
+++ b/syntax/tap.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'perl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'perl', 'syntax/tap.vim')
   finish
 endif
 
diff --git a/syntax/taskdata.vim b/syntax/taskdata.vim
index 0f1a4ef91..f2a03a75c 100644
--- a/syntax/taskdata.vim
+++ b/syntax/taskdata.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'taskdata')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'taskdata', 'syntax/taskdata.vim')
   finish
 endif
 
diff --git a/syntax/taskedit.vim b/syntax/taskedit.vim
index 25304b3f1..f8e2d5015 100644
--- a/syntax/taskedit.vim
+++ b/syntax/taskedit.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'taskedit')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'taskedit', 'syntax/taskedit.vim')
   finish
 endif
 
diff --git a/syntax/tcl.vim b/syntax/tcl.vim
index 73a9cf405..73d1e6072 100644
--- a/syntax/tcl.vim
+++ b/syntax/tcl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tcl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tcl', 'syntax/tcl.vim')
   finish
 endif
 
diff --git a/syntax/template.vim b/syntax/template.vim
index f0146c3d7..fd49d5b01 100644
--- a/syntax/template.vim
+++ b/syntax/template.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'template')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'template', 'syntax/template.vim')
   finish
 endif
 
diff --git a/syntax/teraterm.vim b/syntax/teraterm.vim
index 12e055a83..5ba95d31d 100644
--- a/syntax/teraterm.vim
+++ b/syntax/teraterm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'teraterm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'teraterm', 'syntax/teraterm.vim')
   finish
 endif
 
diff --git a/syntax/terminfo.vim b/syntax/terminfo.vim
index 98256c80a..9fc3ae686 100644
--- a/syntax/terminfo.vim
+++ b/syntax/terminfo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'terminfo')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'terminfo', 'syntax/terminfo.vim')
   finish
 endif
 
diff --git a/syntax/terraform.vim b/syntax/terraform.vim
index 7acb8512a..35beb58fc 100644
--- a/syntax/terraform.vim
+++ b/syntax/terraform.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'terraform')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'terraform', 'syntax/terraform.vim')
   finish
 endif
 
diff --git a/syntax/texinfo.vim b/syntax/texinfo.vim
index b10a4eb7c..fa5659ad0 100644
--- a/syntax/texinfo.vim
+++ b/syntax/texinfo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'texinfo')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'texinfo', 'syntax/texinfo.vim')
   finish
 endif
 
diff --git a/syntax/texmf.vim b/syntax/texmf.vim
index 7023714de..2ecde7bdc 100644
--- a/syntax/texmf.vim
+++ b/syntax/texmf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'texmf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'texmf', 'syntax/texmf.vim')
   finish
 endif
 
diff --git a/syntax/textile.vim b/syntax/textile.vim
index 8153f21ae..dfd82f93e 100644
--- a/syntax/textile.vim
+++ b/syntax/textile.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'textile')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'textile', 'syntax/textile.vim')
   finish
 endif
 
diff --git a/syntax/tf.vim b/syntax/tf.vim
index f033c4c61..91c0622a9 100644
--- a/syntax/tf.vim
+++ b/syntax/tf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tf', 'syntax/tf.vim')
   finish
 endif
 
diff --git a/syntax/thrift.vim b/syntax/thrift.vim
index f3e8a20ec..ebc44a47b 100644
--- a/syntax/thrift.vim
+++ b/syntax/thrift.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'thrift')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'thrift', 'syntax/thrift.vim')
   finish
 endif
 
diff --git a/syntax/tidy.vim b/syntax/tidy.vim
index 437e5493b..94f1a63a2 100644
--- a/syntax/tidy.vim
+++ b/syntax/tidy.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tidy')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tidy', 'syntax/tidy.vim')
   finish
 endif
 
diff --git a/syntax/tilde.vim b/syntax/tilde.vim
index 3e70d9341..c5a19268b 100644
--- a/syntax/tilde.vim
+++ b/syntax/tilde.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tilde')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tilde', 'syntax/tilde.vim')
   finish
 endif
 
diff --git a/syntax/tli.vim b/syntax/tli.vim
index e8d6a65ec..5b790a945 100644
--- a/syntax/tli.vim
+++ b/syntax/tli.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tli')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tli', 'syntax/tli.vim')
   finish
 endif
 
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index 46336f252..4bdd3e9d3 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tmux')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tmux', 'syntax/tmux.vim')
   finish
 endif
 
diff --git a/syntax/toml.vim b/syntax/toml.vim
index cf2dfd688..9540d2c58 100644
--- a/syntax/toml.vim
+++ b/syntax/toml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'toml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'toml', 'syntax/toml.vim')
   finish
 endif
 
diff --git a/syntax/tpp.vim b/syntax/tpp.vim
index 9916af809..f9503e212 100644
--- a/syntax/tpp.vim
+++ b/syntax/tpp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tpp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tpp', 'syntax/tpp.vim')
   finish
 endif
 
diff --git a/syntax/tptp.vim b/syntax/tptp.vim
index 70224eeef..c0a010fa5 100644
--- a/syntax/tptp.vim
+++ b/syntax/tptp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tptp')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tptp', 'syntax/tptp.vim')
   finish
 endif
 
diff --git a/syntax/trasys.vim b/syntax/trasys.vim
index 959d13f22..d3fd57704 100644
--- a/syntax/trasys.vim
+++ b/syntax/trasys.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'trasys')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'trasys', 'syntax/trasys.vim')
   finish
 endif
 
diff --git a/syntax/treetop.vim b/syntax/treetop.vim
index 2728e07cc..a2f7df79a 100644
--- a/syntax/treetop.vim
+++ b/syntax/treetop.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'treetop')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'treetop', 'syntax/treetop.vim')
   finish
 endif
 
diff --git a/syntax/trustees.vim b/syntax/trustees.vim
index 316cf7914..aec627e22 100644
--- a/syntax/trustees.vim
+++ b/syntax/trustees.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'trustees')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'trustees', 'syntax/trustees.vim')
   finish
 endif
 
diff --git a/syntax/tsalt.vim b/syntax/tsalt.vim
index 37bb81404..65bec6f0b 100644
--- a/syntax/tsalt.vim
+++ b/syntax/tsalt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tsalt')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tsalt', 'syntax/tsalt.vim')
   finish
 endif
 
diff --git a/syntax/tsscl.vim b/syntax/tsscl.vim
index d12ec6481..cbcb6d530 100644
--- a/syntax/tsscl.vim
+++ b/syntax/tsscl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tsscl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tsscl', 'syntax/tsscl.vim')
   finish
 endif
 
diff --git a/syntax/tssgm.vim b/syntax/tssgm.vim
index f478b6c38..f1ca5f739 100644
--- a/syntax/tssgm.vim
+++ b/syntax/tssgm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tssgm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tssgm', 'syntax/tssgm.vim')
   finish
 endif
 
diff --git a/syntax/tssop.vim b/syntax/tssop.vim
index 1991abc6e..786ce9982 100644
--- a/syntax/tssop.vim
+++ b/syntax/tssop.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tssop')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tssop', 'syntax/tssop.vim')
   finish
 endif
 
diff --git a/syntax/tt2.vim b/syntax/tt2.vim
index 0dbc4ffc4..4bce48c4c 100644
--- a/syntax/tt2.vim
+++ b/syntax/tt2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'perl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'perl', 'syntax/tt2.vim')
   finish
 endif
 
diff --git a/syntax/tt2html.vim b/syntax/tt2html.vim
index 1cbd5cae1..987b4aee2 100644
--- a/syntax/tt2html.vim
+++ b/syntax/tt2html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'perl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'perl', 'syntax/tt2html.vim')
   finish
 endif
 
diff --git a/syntax/tt2js.vim b/syntax/tt2js.vim
index cf260af11..2222be144 100644
--- a/syntax/tt2js.vim
+++ b/syntax/tt2js.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'perl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'perl', 'syntax/tt2js.vim')
   finish
 endif
 
diff --git a/syntax/twig.vim b/syntax/twig.vim
index 4f93de08e..43c7d43e5 100644
--- a/syntax/twig.vim
+++ b/syntax/twig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'twig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'twig', 'syntax/twig.vim')
   finish
 endif
 
diff --git a/syntax/typescript.vim b/syntax/typescript.vim
index 27a63d07a..284abf00e 100644
--- a/syntax/typescript.vim
+++ b/syntax/typescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/typescript.vim')
   finish
 endif
 
diff --git a/syntax/typescriptreact.vim b/syntax/typescriptreact.vim
index 8cf19f544..123b4cafa 100644
--- a/syntax/typescriptreact.vim
+++ b/syntax/typescriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/typescriptreact.vim')
   finish
 endif
 
diff --git a/syntax/uc.vim b/syntax/uc.vim
index 1f204af3f..b7982fcc2 100644
--- a/syntax/uc.vim
+++ b/syntax/uc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'uc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'uc', 'syntax/uc.vim')
   finish
 endif
 
diff --git a/syntax/udevconf.vim b/syntax/udevconf.vim
index a1e8dd5a4..105e38b7d 100644
--- a/syntax/udevconf.vim
+++ b/syntax/udevconf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'udevconf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'udevconf', 'syntax/udevconf.vim')
   finish
 endif
 
diff --git a/syntax/udevperm.vim b/syntax/udevperm.vim
index b80463e3c..abdc122f3 100644
--- a/syntax/udevperm.vim
+++ b/syntax/udevperm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'udevperm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'udevperm', 'syntax/udevperm.vim')
   finish
 endif
 
diff --git a/syntax/uil.vim b/syntax/uil.vim
index 248d8332b..99d277bbf 100644
--- a/syntax/uil.vim
+++ b/syntax/uil.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'uil')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'uil', 'syntax/uil.vim')
   finish
 endif
 
diff --git a/syntax/unison.vim b/syntax/unison.vim
index 5fea116d5..0fe4030eb 100644
--- a/syntax/unison.vim
+++ b/syntax/unison.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'unison')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'unison', 'syntax/unison.vim')
   finish
 endif
 
diff --git a/syntax/updatedb.vim b/syntax/updatedb.vim
index c3d0626b5..de8e7d742 100644
--- a/syntax/updatedb.vim
+++ b/syntax/updatedb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'updatedb')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'updatedb', 'syntax/updatedb.vim')
   finish
 endif
 
diff --git a/syntax/upstart.vim b/syntax/upstart.vim
index 8b53ff59b..e2be61d12 100644
--- a/syntax/upstart.vim
+++ b/syntax/upstart.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'upstart')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'upstart', 'syntax/upstart.vim')
   finish
 endif
 
diff --git a/syntax/upstreamdat.vim b/syntax/upstreamdat.vim
index f4c55e4c7..29dc0206e 100644
--- a/syntax/upstreamdat.vim
+++ b/syntax/upstreamdat.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'upstreamdat')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'upstreamdat', 'syntax/upstreamdat.vim')
   finish
 endif
 
diff --git a/syntax/upstreaminstalllog.vim b/syntax/upstreaminstalllog.vim
index 64abc788e..11d52846c 100644
--- a/syntax/upstreaminstalllog.vim
+++ b/syntax/upstreaminstalllog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'upstreaminstalllog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'upstreaminstalllog', 'syntax/upstreaminstalllog.vim')
   finish
 endif
 
diff --git a/syntax/upstreamlog.vim b/syntax/upstreamlog.vim
index 0f9431dd1..f4c2dc829 100644
--- a/syntax/upstreamlog.vim
+++ b/syntax/upstreamlog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'upstreamlog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'upstreamlog', 'syntax/upstreamlog.vim')
   finish
 endif
 
diff --git a/syntax/usserverlog.vim b/syntax/usserverlog.vim
index 891e91e08..a36219cff 100644
--- a/syntax/usserverlog.vim
+++ b/syntax/usserverlog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'usserverlog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'usserverlog', 'syntax/usserverlog.vim')
   finish
 endif
 
diff --git a/syntax/usw2kagtlog.vim b/syntax/usw2kagtlog.vim
index 8cb5370f4..e50d2f8a5 100644
--- a/syntax/usw2kagtlog.vim
+++ b/syntax/usw2kagtlog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'usw2kagtlog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'usw2kagtlog', 'syntax/usw2kagtlog.vim')
   finish
 endif
 
diff --git a/syntax/vala.vim b/syntax/vala.vim
index 75b269743..9e7d2cfe2 100644
--- a/syntax/vala.vim
+++ b/syntax/vala.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vala')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vala', 'syntax/vala.vim')
   finish
 endif
 
diff --git a/syntax/vb.vim b/syntax/vb.vim
index b2c4b94ce..0641dc1e0 100644
--- a/syntax/vb.vim
+++ b/syntax/vb.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'visual-basic')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'visual-basic', 'syntax/vb.vim')
   finish
 endif
 
diff --git a/syntax/vbnet.vim b/syntax/vbnet.vim
index 8acc93c35..80bdd3932 100644
--- a/syntax/vbnet.vim
+++ b/syntax/vbnet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vbnet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vbnet', 'syntax/vbnet.vim')
   finish
 endif
 
diff --git a/syntax/vcl.vim b/syntax/vcl.vim
index dfe049310..19d80de8a 100644
--- a/syntax/vcl.vim
+++ b/syntax/vcl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vcl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vcl', 'syntax/vcl.vim')
   finish
 endif
 
diff --git a/syntax/velocity.vim b/syntax/velocity.vim
index 6a074de5c..b96aea506 100644
--- a/syntax/velocity.vim
+++ b/syntax/velocity.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'velocity')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'velocity', 'syntax/velocity.vim')
   finish
 endif
 
diff --git a/syntax/vera.vim b/syntax/vera.vim
index b8027bc81..09a6b846f 100644
--- a/syntax/vera.vim
+++ b/syntax/vera.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vera')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vera', 'syntax/vera.vim')
   finish
 endif
 
diff --git a/syntax/verilog.vim b/syntax/verilog.vim
index fec47f6e3..15b55c216 100644
--- a/syntax/verilog.vim
+++ b/syntax/verilog.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'verilog')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'verilog', 'syntax/verilog.vim')
   finish
 endif
 
diff --git a/syntax/verilogams.vim b/syntax/verilogams.vim
index aa81b4681..fde280207 100644
--- a/syntax/verilogams.vim
+++ b/syntax/verilogams.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'verilogams')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'verilogams', 'syntax/verilogams.vim')
   finish
 endif
 
diff --git a/syntax/vgrindefs.vim b/syntax/vgrindefs.vim
index 5c0a03e03..4ecf946bf 100644
--- a/syntax/vgrindefs.vim
+++ b/syntax/vgrindefs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vgrindefs')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vgrindefs', 'syntax/vgrindefs.vim')
   finish
 endif
 
diff --git a/syntax/vhdl.vim b/syntax/vhdl.vim
index 3b1e258ee..32c4d8d72 100644
--- a/syntax/vhdl.vim
+++ b/syntax/vhdl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vhdl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vhdl', 'syntax/vhdl.vim')
   finish
 endif
 
diff --git a/syntax/vimgo.vim b/syntax/vimgo.vim
index d67b10237..66b9f1825 100644
--- a/syntax/vimgo.vim
+++ b/syntax/vimgo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'go')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'syntax/vimgo.vim')
   finish
 endif
 
diff --git a/syntax/viminfo.vim b/syntax/viminfo.vim
index 1eada7ff8..b5b91f0fd 100644
--- a/syntax/viminfo.vim
+++ b/syntax/viminfo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'viminfo')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'viminfo', 'syntax/viminfo.vim')
   finish
 endif
 
diff --git a/syntax/vlang.vim b/syntax/vlang.vim
index 775784453..2304ba523 100644
--- a/syntax/vlang.vim
+++ b/syntax/vlang.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'v')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'v', 'syntax/vlang.vim')
   finish
 endif
 
diff --git a/syntax/vmasm.vim b/syntax/vmasm.vim
index 1e66acb85..e59630a0a 100644
--- a/syntax/vmasm.vim
+++ b/syntax/vmasm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vmasm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vmasm', 'syntax/vmasm.vim')
   finish
 endif
 
diff --git a/syntax/voscm.vim b/syntax/voscm.vim
index d640b6084..cdc99628b 100644
--- a/syntax/voscm.vim
+++ b/syntax/voscm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'voscm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'voscm', 'syntax/voscm.vim')
   finish
 endif
 
diff --git a/syntax/vrml.vim b/syntax/vrml.vim
index 7c1b89071..720c6f612 100644
--- a/syntax/vrml.vim
+++ b/syntax/vrml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vrml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vrml', 'syntax/vrml.vim')
   finish
 endif
 
diff --git a/syntax/vroom.vim b/syntax/vroom.vim
index 7a3047ba0..b7e26e20d 100644
--- a/syntax/vroom.vim
+++ b/syntax/vroom.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vroom')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vroom', 'syntax/vroom.vim')
   finish
 endif
 
diff --git a/syntax/vue.vim b/syntax/vue.vim
index 1f3d5d67b..0dbb2de9d 100644
--- a/syntax/vue.vim
+++ b/syntax/vue.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'vue')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'vue', 'syntax/vue.vim')
   finish
 endif
 
diff --git a/syntax/wast.vim b/syntax/wast.vim
index 4d200a94a..db81895a8 100644
--- a/syntax/wast.vim
+++ b/syntax/wast.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'wast')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'wast', 'syntax/wast.vim')
   finish
 endif
 
diff --git a/syntax/webmacro.vim b/syntax/webmacro.vim
index df4fa69e7..f6f8f2b3e 100644
--- a/syntax/webmacro.vim
+++ b/syntax/webmacro.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'webmacro')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'webmacro', 'syntax/webmacro.vim')
   finish
 endif
 
diff --git a/syntax/wget.vim b/syntax/wget.vim
index 3179eb48a..a52d7d852 100644
--- a/syntax/wget.vim
+++ b/syntax/wget.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'wget')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'wget', 'syntax/wget.vim')
   finish
 endif
 
diff --git a/syntax/winbatch.vim b/syntax/winbatch.vim
index 16052fd0e..d6d68cc39 100644
--- a/syntax/winbatch.vim
+++ b/syntax/winbatch.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'winbatch')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'winbatch', 'syntax/winbatch.vim')
   finish
 endif
 
diff --git a/syntax/wml.vim b/syntax/wml.vim
index ff61af84a..7de17842d 100644
--- a/syntax/wml.vim
+++ b/syntax/wml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'wml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'wml', 'syntax/wml.vim')
   finish
 endif
 
diff --git a/syntax/wsh.vim b/syntax/wsh.vim
index 363407e6f..9dadb3c53 100644
--- a/syntax/wsh.vim
+++ b/syntax/wsh.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'wsh')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'wsh', 'syntax/wsh.vim')
   finish
 endif
 
diff --git a/syntax/wsml.vim b/syntax/wsml.vim
index 669ea8fb3..ee9b17099 100644
--- a/syntax/wsml.vim
+++ b/syntax/wsml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'wsml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'wsml', 'syntax/wsml.vim')
   finish
 endif
 
diff --git a/syntax/wvdial.vim b/syntax/wvdial.vim
index 41884b2b6..939114b40 100644
--- a/syntax/wvdial.vim
+++ b/syntax/wvdial.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'wvdial')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'wvdial', 'syntax/wvdial.vim')
   finish
 endif
 
diff --git a/syntax/xdc.vim b/syntax/xdc.vim
index 382658ad7..c951d3e73 100644
--- a/syntax/xdc.vim
+++ b/syntax/xdc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xdc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xdc', 'syntax/xdc.vim')
   finish
 endif
 
diff --git a/syntax/xdefaults.vim b/syntax/xdefaults.vim
index 492beb821..41d234940 100644
--- a/syntax/xdefaults.vim
+++ b/syntax/xdefaults.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xdefaults')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xdefaults', 'syntax/xdefaults.vim')
   finish
 endif
 
diff --git a/syntax/xf86conf.vim b/syntax/xf86conf.vim
index e12bf47b6..ef2bee2b8 100644
--- a/syntax/xf86conf.vim
+++ b/syntax/xf86conf.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xf86conf')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xf86conf', 'syntax/xf86conf.vim')
   finish
 endif
 
diff --git a/syntax/xhtml.vim b/syntax/xhtml.vim
index ae8be9b1a..fff29b4d8 100644
--- a/syntax/xhtml.vim
+++ b/syntax/xhtml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xhtml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xhtml', 'syntax/xhtml.vim')
   finish
 endif
 
diff --git a/syntax/xinetd.vim b/syntax/xinetd.vim
index b5e26cd77..ac724fd29 100644
--- a/syntax/xinetd.vim
+++ b/syntax/xinetd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xinetd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xinetd', 'syntax/xinetd.vim')
   finish
 endif
 
diff --git a/syntax/xmath.vim b/syntax/xmath.vim
index 19ff4d5bd..60834dd0c 100644
--- a/syntax/xmath.vim
+++ b/syntax/xmath.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xmath')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xmath', 'syntax/xmath.vim')
   finish
 endif
 
diff --git a/syntax/xml.vim b/syntax/xml.vim
index de19c797c..9232403a2 100644
--- a/syntax/xml.vim
+++ b/syntax/xml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xml', 'syntax/xml.vim')
   finish
 endif
 
diff --git a/syntax/xmodmap.vim b/syntax/xmodmap.vim
index c9bf7f892..7d35aedb6 100644
--- a/syntax/xmodmap.vim
+++ b/syntax/xmodmap.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xmodmap')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xmodmap', 'syntax/xmodmap.vim')
   finish
 endif
 
diff --git a/syntax/xpm.vim b/syntax/xpm.vim
index 123b4e0e2..dfc326b05 100644
--- a/syntax/xpm.vim
+++ b/syntax/xpm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xpm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xpm', 'syntax/xpm.vim')
   finish
 endif
 
diff --git a/syntax/xpm2.vim b/syntax/xpm2.vim
index 8ed589aec..cd97b0bef 100644
--- a/syntax/xpm2.vim
+++ b/syntax/xpm2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xpm2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xpm2', 'syntax/xpm2.vim')
   finish
 endif
 
diff --git a/syntax/xquery.vim b/syntax/xquery.vim
index dbb668d39..152ceb1cd 100644
--- a/syntax/xquery.vim
+++ b/syntax/xquery.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xquery')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xquery', 'syntax/xquery.vim')
   finish
 endif
 
diff --git a/syntax/xs.vim b/syntax/xs.vim
index d3d33d296..a678cdb83 100644
--- a/syntax/xs.vim
+++ b/syntax/xs.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'perl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'perl', 'syntax/xs.vim')
   finish
 endif
 
diff --git a/syntax/xsd.vim b/syntax/xsd.vim
index e88c88173..2da9e06ac 100644
--- a/syntax/xsd.vim
+++ b/syntax/xsd.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xsd')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xsd', 'syntax/xsd.vim')
   finish
 endif
 
diff --git a/syntax/xsl.vim b/syntax/xsl.vim
index 7dc4ccaeb..568626bec 100644
--- a/syntax/xsl.vim
+++ b/syntax/xsl.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xsl')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xsl', 'syntax/xsl.vim')
   finish
 endif
 
diff --git a/syntax/xslt.vim b/syntax/xslt.vim
index c451fdeac..b2a8fe54a 100644
--- a/syntax/xslt.vim
+++ b/syntax/xslt.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'xslt')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'xslt', 'syntax/xslt.vim')
   finish
 endif
 
diff --git a/syntax/yacc.vim b/syntax/yacc.vim
index 90b2c5972..4228e65cc 100644
--- a/syntax/yacc.vim
+++ b/syntax/yacc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'yacc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'yacc', 'syntax/yacc.vim')
   finish
 endif
 
diff --git a/syntax/yaml.vim b/syntax/yaml.vim
index 1c4a93fdd..c0476c0bf 100644
--- a/syntax/yaml.vim
+++ b/syntax/yaml.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'yaml')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'yaml', 'syntax/yaml.vim')
   finish
 endif
 
diff --git a/syntax/yats.vim b/syntax/yats.vim
index 5b1a869eb..9ab89e523 100644
--- a/syntax/yats.vim
+++ b/syntax/yats.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats.vim')
   finish
 endif
 
diff --git a/syntax/yats/css.vim b/syntax/yats/css.vim
index 3af02cae6..1c38cabef 100644
--- a/syntax/yats/css.vim
+++ b/syntax/yats/css.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/css.vim')
   finish
 endif
 
diff --git a/syntax/yats/dom-document.vim b/syntax/yats/dom-document.vim
index 1c6bba990..9e801ba5b 100644
--- a/syntax/yats/dom-document.vim
+++ b/syntax/yats/dom-document.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/dom-document.vim')
   finish
 endif
 
diff --git a/syntax/yats/dom-elem.vim b/syntax/yats/dom-elem.vim
index 9de61f666..1ef784620 100644
--- a/syntax/yats/dom-elem.vim
+++ b/syntax/yats/dom-elem.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/dom-elem.vim')
   finish
 endif
 
diff --git a/syntax/yats/dom-event.vim b/syntax/yats/dom-event.vim
index 462c3063e..121fd78fc 100644
--- a/syntax/yats/dom-event.vim
+++ b/syntax/yats/dom-event.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/dom-event.vim')
   finish
 endif
 
diff --git a/syntax/yats/dom-form.vim b/syntax/yats/dom-form.vim
index d8aae416f..9a774c654 100644
--- a/syntax/yats/dom-form.vim
+++ b/syntax/yats/dom-form.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/dom-form.vim')
   finish
 endif
 
diff --git a/syntax/yats/dom-node.vim b/syntax/yats/dom-node.vim
index 219531360..7c603cfbd 100644
--- a/syntax/yats/dom-node.vim
+++ b/syntax/yats/dom-node.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/dom-node.vim')
   finish
 endif
 
diff --git a/syntax/yats/dom-storage.vim b/syntax/yats/dom-storage.vim
index f3909a9b0..1343cf35b 100644
--- a/syntax/yats/dom-storage.vim
+++ b/syntax/yats/dom-storage.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/dom-storage.vim')
   finish
 endif
 
diff --git a/syntax/yats/ecma-402.vim b/syntax/yats/ecma-402.vim
index 8624b5d87..cf03891b6 100644
--- a/syntax/yats/ecma-402.vim
+++ b/syntax/yats/ecma-402.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/ecma-402.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-array.vim b/syntax/yats/es6-array.vim
index 8c8f52550..23009b434 100644
--- a/syntax/yats/es6-array.vim
+++ b/syntax/yats/es6-array.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-array.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-date.vim b/syntax/yats/es6-date.vim
index 441f6204e..db97bcd2e 100644
--- a/syntax/yats/es6-date.vim
+++ b/syntax/yats/es6-date.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-date.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-function.vim b/syntax/yats/es6-function.vim
index cb9bffe7b..7466a0328 100644
--- a/syntax/yats/es6-function.vim
+++ b/syntax/yats/es6-function.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-function.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-json.vim b/syntax/yats/es6-json.vim
index 5e10a03a5..0969cf95b 100644
--- a/syntax/yats/es6-json.vim
+++ b/syntax/yats/es6-json.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-json.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-map.vim b/syntax/yats/es6-map.vim
index c51f0510e..8ed7c0e5e 100644
--- a/syntax/yats/es6-map.vim
+++ b/syntax/yats/es6-map.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-map.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-math.vim b/syntax/yats/es6-math.vim
index 44a11dd15..f3b0180be 100644
--- a/syntax/yats/es6-math.vim
+++ b/syntax/yats/es6-math.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-math.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-number.vim b/syntax/yats/es6-number.vim
index 092871488..5434e7bc0 100644
--- a/syntax/yats/es6-number.vim
+++ b/syntax/yats/es6-number.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-number.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-object.vim b/syntax/yats/es6-object.vim
index 605d0a86e..40dc58065 100644
--- a/syntax/yats/es6-object.vim
+++ b/syntax/yats/es6-object.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-object.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-promise.vim b/syntax/yats/es6-promise.vim
index 89c6da6e8..3c9d0ffc0 100644
--- a/syntax/yats/es6-promise.vim
+++ b/syntax/yats/es6-promise.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-promise.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-proxy.vim b/syntax/yats/es6-proxy.vim
index f74b0471d..da059ce1d 100644
--- a/syntax/yats/es6-proxy.vim
+++ b/syntax/yats/es6-proxy.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-proxy.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-reflect.vim b/syntax/yats/es6-reflect.vim
index d83d2f442..60c04d5c3 100644
--- a/syntax/yats/es6-reflect.vim
+++ b/syntax/yats/es6-reflect.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-reflect.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-regexp.vim b/syntax/yats/es6-regexp.vim
index 233d98ff1..34e0a2070 100644
--- a/syntax/yats/es6-regexp.vim
+++ b/syntax/yats/es6-regexp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-regexp.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-set.vim b/syntax/yats/es6-set.vim
index 657d7f8d4..4585a370e 100644
--- a/syntax/yats/es6-set.vim
+++ b/syntax/yats/es6-set.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-set.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-string.vim b/syntax/yats/es6-string.vim
index 7db646e07..c99541212 100644
--- a/syntax/yats/es6-string.vim
+++ b/syntax/yats/es6-string.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-string.vim')
   finish
 endif
 
diff --git a/syntax/yats/es6-symbol.vim b/syntax/yats/es6-symbol.vim
index 5f52425ac..f90fd7b2f 100644
--- a/syntax/yats/es6-symbol.vim
+++ b/syntax/yats/es6-symbol.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/es6-symbol.vim')
   finish
 endif
 
diff --git a/syntax/yats/event.vim b/syntax/yats/event.vim
index 3f9cf8e44..c2e8d3261 100644
--- a/syntax/yats/event.vim
+++ b/syntax/yats/event.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/event.vim')
   finish
 endif
 
diff --git a/syntax/yats/node.vim b/syntax/yats/node.vim
index d2e8a4f4d..169333981 100644
--- a/syntax/yats/node.vim
+++ b/syntax/yats/node.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/node.vim')
   finish
 endif
 
diff --git a/syntax/yats/test.vim b/syntax/yats/test.vim
index 3a38ef3be..1085939b0 100644
--- a/syntax/yats/test.vim
+++ b/syntax/yats/test.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/test.vim')
   finish
 endif
 
diff --git a/syntax/yats/typescript.vim b/syntax/yats/typescript.vim
index 7865168ad..411f877d1 100644
--- a/syntax/yats/typescript.vim
+++ b/syntax/yats/typescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/typescript.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-blob.vim b/syntax/yats/web-blob.vim
index 034a58b24..baf754b59 100644
--- a/syntax/yats/web-blob.vim
+++ b/syntax/yats/web-blob.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-blob.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-console.vim b/syntax/yats/web-console.vim
index 4dc269df9..f6b7aef56 100644
--- a/syntax/yats/web-console.vim
+++ b/syntax/yats/web-console.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-console.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-crypto.vim b/syntax/yats/web-crypto.vim
index 07b28a38f..4582cc289 100644
--- a/syntax/yats/web-crypto.vim
+++ b/syntax/yats/web-crypto.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-crypto.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-encoding.vim b/syntax/yats/web-encoding.vim
index 99100cafa..2fa66a7ff 100644
--- a/syntax/yats/web-encoding.vim
+++ b/syntax/yats/web-encoding.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-encoding.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-fetch.vim b/syntax/yats/web-fetch.vim
index ef884a0c5..f0615e0bb 100644
--- a/syntax/yats/web-fetch.vim
+++ b/syntax/yats/web-fetch.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-fetch.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-geo.vim b/syntax/yats/web-geo.vim
index 1e651787c..fd660e6d5 100644
--- a/syntax/yats/web-geo.vim
+++ b/syntax/yats/web-geo.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-geo.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-history.vim b/syntax/yats/web-history.vim
index d77ff1592..54c98550f 100644
--- a/syntax/yats/web-history.vim
+++ b/syntax/yats/web-history.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-history.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-location.vim b/syntax/yats/web-location.vim
index 2837de25e..3aa895197 100644
--- a/syntax/yats/web-location.vim
+++ b/syntax/yats/web-location.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-location.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-navigator.vim b/syntax/yats/web-navigator.vim
index 82c4dccd5..53323ed58 100644
--- a/syntax/yats/web-navigator.vim
+++ b/syntax/yats/web-navigator.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-navigator.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-network.vim b/syntax/yats/web-network.vim
index 5f4b6658b..0d2e5c45a 100644
--- a/syntax/yats/web-network.vim
+++ b/syntax/yats/web-network.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-network.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-payment.vim b/syntax/yats/web-payment.vim
index a88234df1..8a0d71948 100644
--- a/syntax/yats/web-payment.vim
+++ b/syntax/yats/web-payment.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-payment.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-service-worker.vim b/syntax/yats/web-service-worker.vim
index 48a307f34..df20a16ee 100644
--- a/syntax/yats/web-service-worker.vim
+++ b/syntax/yats/web-service-worker.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-service-worker.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-window.vim b/syntax/yats/web-window.vim
index 329f0ac95..f078bd4d3 100644
--- a/syntax/yats/web-window.vim
+++ b/syntax/yats/web-window.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-window.vim')
   finish
 endif
 
diff --git a/syntax/yats/web-xhr.vim b/syntax/yats/web-xhr.vim
index 0864ee5ff..40699b6ee 100644
--- a/syntax/yats/web-xhr.vim
+++ b/syntax/yats/web-xhr.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web-xhr.vim')
   finish
 endif
 
diff --git a/syntax/yats/web.vim b/syntax/yats/web.vim
index a41007f8a..295643afa 100644
--- a/syntax/yats/web.vim
+++ b/syntax/yats/web.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'typescript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/yats/web.vim')
   finish
 endif
 
diff --git a/syntax/z8a.vim b/syntax/z8a.vim
index c8e66f58f..ce676bb15 100644
--- a/syntax/z8a.vim
+++ b/syntax/z8a.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'z8a')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'z8a', 'syntax/z8a.vim')
   finish
 endif
 
diff --git a/syntax/zephir.vim b/syntax/zephir.vim
index e27328792..9f5ebf991 100644
--- a/syntax/zephir.vim
+++ b/syntax/zephir.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zephir')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zephir', 'syntax/zephir.vim')
   finish
 endif
 
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 7eb59fabb..9b4854eda 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'syntax/zig.vim')
   finish
 endif
 
diff --git a/syntax/zimbu.vim b/syntax/zimbu.vim
index 39a633cf5..6f2d69e42 100644
--- a/syntax/zimbu.vim
+++ b/syntax/zimbu.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zimbu')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zimbu', 'syntax/zimbu.vim')
   finish
 endif
 
diff --git a/syntax/zir.vim b/syntax/zir.vim
index 50b2be0ec..1ff6bc972 100644
--- a/syntax/zir.vim
+++ b/syntax/zir.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zig')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'syntax/zir.vim')
   finish
 endif
 
diff --git a/syntax/zsh.vim b/syntax/zsh.vim
index 8be86a841..ebdc6cc37 100644
--- a/syntax/zsh.vim
+++ b/syntax/zsh.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'sh')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sh', 'syntax/zsh.vim')
   finish
 endif
 

From 09f31c433a136450b9faa33b08fc3281bdea5acc Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 3 Jan 2021 14:09:55 +0100
Subject: [PATCH 229/299] Revert stylus provider

---
 README.md                  |    2 +-
 autoload/polyglot/init.vim |   23 +-
 autoload/stylcomplete.vim  |  578 -----------------
 compiler/ocaml.vim         |    2 +-
 extras/filetype.vim        |    2 +-
 ftplugin/fstab.vim         |   23 +
 ftplugin/stylus.vim        |   10 +-
 indent/dune.vim            |    2 +-
 indent/stylus.vim          |   95 ++-
 packages.yaml              |    2 +-
 syntax/basic/function.vim  |   14 +-
 syntax/diff.vim            |   17 +-
 syntax/fstab.vim           |    4 +-
 syntax/odin.vim            |    4 +-
 syntax/sml.vim             |   91 +--
 syntax/stylus.vim          | 1206 +++++++++++-------------------------
 16 files changed, 533 insertions(+), 1542 deletions(-)
 delete mode 100644 autoload/stylcomplete.vim
 create mode 100644 ftplugin/fstab.vim

diff --git a/README.md b/README.md
index fd9bf7d9f..afaecd1bb 100644
--- a/README.md
+++ b/README.md
@@ -174,7 +174,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [slime](https://github.com/slime-lang/vim-slime-syntax) (Syntax highlighting for slime files)
 - [smt2](https://github.com/bohlender/vim-smt2) (SMT syntax highlighting for smt2 and smt files)
 - [solidity](https://github.com/tomlion/vim-solidity) (Solidity syntax highlighting for sol files)
-- [stylus](https://github.com/iloginow/vim-stylus) (Stylus syntax highlighting for styl and stylus files)
+- [stylus](https://github.com/wavded/vim-stylus) (Stylus syntax highlighting for styl and stylus files)
 - [svelte](https://github.com/evanleck/vim-svelte/tree/main) (Svelte syntax highlighting for svelte files)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
 - [svg](https://github.com/vim-scripts/svg.vim) (SVG syntax highlighting for svg files)
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 9d01b3468..8af31ec2d 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -21,19 +21,20 @@ func! polyglot#init#init()
 endfunc
 
 func! polyglot#init#is_disabled(caller, name, path)
-  if g:polyglot_initialized
-    return has_key(g:polyglot_is_disabled, a:name)
+  if !g:polyglot_initialized
+    if a:path[0:7] == "autoload"
+      let g:polyglot_initialized = 1
+
+      for p in globpath(&rtp, a:path, 0, 1)
+        if p != a:caller
+          exe "source " . p
+          return 1
+        endif
+      endfor
+    endif
   endif
-  if a:path[0:7] == "autoload"
-    let g:polyglot_initialized = 1
 
-    for p in globpath(&rtp, a:path, 0, 1)
-      if p != a:caller
-        exe "source " . p
-        return 1
-      endif
-    endfor
-  endif
+  return has_key(g:polyglot_is_disabled, a:name)
 endfunc
 
 let g:polyglot_is_disabled = {}
diff --git a/autoload/stylcomplete.vim b/autoload/stylcomplete.vim
deleted file mode 100644
index 654d405aa..000000000
--- a/autoload/stylcomplete.vim
+++ /dev/null
@@ -1,578 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'stylus', 'autoload/stylcomplete.vim')
-  finish
-endif
-
-" Vim completion script
-" Language: Stylus
-" Author: Ilia Loginov <i.loginow@outlook.com>
-" Created: 2018 Jan 28
-
-fun! stylcomplete#CompleteStyl(findstart, base)
-
-  if a:findstart
-    let line = getline('.')
-    let start = col('.') - 1
-    while start > 0 && line[start - 1] !~ '\(\s\|\[\|(\|{\|:\)'
-      let start -= 1
-    endwhile
-    let b:start = line[start]
-    let b:before = line[start - 1]
-    let b:line = line[0:col('.')]
-    let b:first_char = matchstrpos(b:line, '^\s*\S')[2]
-    let b:first_word_type = synIDattr(synID(line('.'), b:first_char, 1), 'name')
-    " Check if there is more than one word on the current line
-    let b:word_break = 0
-    if b:line =~ '^.*\S\(\s\|\[\|(\|{\|:\)\S.*'
-      let b:word_break = 1
-    endif
-    return start
-  endif
-
-  " Complete properties
-  if b:start =~ '\w' && b:word_break == 0
-    let res = []
-    for m in g:css_props
-      if m =~ '^' . a:base
-        call add(res, m)
-      endif
-    endfor
-    return res
-
-  " Complete pseudo classes and elements
-  elseif b:before == ':' && b:first_word_type =~ 'stylusSelector\w*'
-    let values = ["active", "any", "any-link", "blank", "checked", "cue", "cue-region", "disabled", "enabled", "default", "dir(", "disabled", "drop", "drop(", "empty", "enabled", "first", "first-child", "first-of-type", "fullscreen", "future", "focus", "focus-within", "has(", "hover", "indeterminate", "in-range", "invalid", "lang(", "last-child", "last-of-type", "left", "link", "matches(", "not(", "nth-child(", "nth-column(", "nth-last-child(", "nth-last-column(", "nth-last-of-type(", "nth-of-type(", "only-child", "only-of-type", "optional", "out-of-range", "past", "paused", "placeholder-shown", "playing", "read-only", "read-write", "required", "right", "root", "scope", "target", "user-invalid", "valid", "visited", "first-line", "first-letter", "before", "after", "selection", "backdrop"]
-
-    let res = []
-    for m in values
-      if m =~ '^' . a:base
-        call add(res, m)
-      endif
-    endfor
-    return res
-
-  " Complete !important and !optional
-  elseif b:start == '!' && b:word_break == 1 && b:first_word_type == 'stylusProperty'
-    let values = ["important", "optional"]
-
-    let res = []
-    for m in values
-      if m =~ '^' . a:base
-        call add(res, m)
-      endif
-    endfor
-    return res
-
-  " Complete values
-  elseif b:start =~ '\w' && b:word_break == 1 && b:first_word_type == 'stylusProperty'
-    let prop = matchstr(b:line, '\(^\s\+\)\@<=\<\(\w\|-\)\+\>')
-    let res = []
-
-    let wide_keywords = ["initial", "inherit", "unset"]
-    let color_values = ["transparent", "rgb(", "rgba(", "hsl(", "hsla(", "#"] + g:css_colors
-    let border_style_values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
-    let border_width_values = ["thin", "thick", "medium"]
-    let list_style_type_values = ["decimal", "decimal-leading-zero", "arabic-indic", "armenian", "upper-armenian", "lower-armenian", "bengali", "cambodian", "khmer", "cjk-decimal", "devanagari", "georgian", "gujarati", "gurmukhi", "hebrew", "kannada", "lao", "malayalam", "mongolian", "myanmar", "oriya", "persian", "lower-roman", "upper-roman", "tamil", "telugu", "thai", "tibetan", "lower-alpha", "lower-latin", "upper-alpha", "upper-latin", "cjk-earthly-branch", "cjk-heavenly-stem", "lower-greek", "hiragana", "hiragana-iroha", "katakana", "katakana-iroha", "disc", "circle", "square", "disclosure-open", "disclosure-closed"]
-    let timing_functions = ["cubic-bezier(", "steps(", "linear", "ease", "ease-in", "ease-in-out", "ease-out", "step-start", "step-end"]
-
-    if prop == 'all'
-
-      let values = []
-    elseif prop == 'additive-symbols'
-      let values = []
-    elseif prop == 'align-content'
-      let values = ["flex-start", "flex-end", "center", "space-between", "space-around", "stretch"]
-    elseif prop == 'align-items'
-      let values = ["flex-start", "flex-end", "center", "baseline", "stretch"]
-    elseif prop == 'align-self'
-      let values = ["auto", "flex-start", "flex-end", "center", "baseline", "stretch"]
-    elseif prop == 'animation'
-      let values = timing_functions + ["normal", "reverse", "alternate", "alternate-reverse"] + ["none", "forwards", "backwards", "both"] + ["running", "paused"]
-    elseif prop == 'animation-delay'
-      let values = []
-    elseif prop == 'animation-direction'
-      let values = ["normal", "reverse", "alternate", "alternate-reverse"]
-    elseif prop == 'animation-duration'
-      let values = []
-    elseif prop == 'animation-fill-mode'
-      let values = ["none", "forwards", "backwards", "both"]
-    elseif prop == 'animation-iteration-count'
-      let values = []
-    elseif prop == 'animation-name'
-      let values = []
-    elseif prop == 'animation-play-state'
-      let values = ["running", "paused"]
-    elseif prop == 'animation-timing-function'
-      let values = timing_functions
-    elseif prop == 'appearance'
-      let values = ["auto", "none"]
-    elseif prop == 'background-attachment'
-      let values = ["scroll", "fixed"]
-    elseif prop == 'background-color'
-      let values = color_values
-    elseif prop == 'background-image'
-      let values = ["url(", "none"]
-    elseif prop == 'background-position'
-      let vals = matchstr(b:line, '.*:\s*\zs.*')
-      if vals =~ '^\%([a-zA-Z]\+\)\?$'
-        let values = ["top", "center", "bottom"]
-      elseif vals =~ '^[a-zA-Z]\+\s\+\%([a-zA-Z]\+\)\?$'
-        let values = ["left", "center", "right"]
-      else
-        return []
-      endif
-    elseif prop == 'background-repeat'
-      let values = ["repeat", "repeat-x", "repeat-y", "no-repeat"]
-    elseif prop == 'background-size'
-      let values = ["auto", "contain", "cover"]
-    elseif prop == 'background'
-      let values = ["scroll", "fixed"] + color_values + ["url(", "none"] + ["top", "center", "bottom", "left", "right"] + ["repeat", "repeat-x", "repeat-y", "no-repeat"] + ["auto", "contain", "cover"]
-    elseif prop =~ '^border\%(-top\|-right\|-bottom\|-left\|-block-start\|-block-end\)\?$'
-      let vals = matchstr(b:line, '.*:\s*\zs.*')
-      if vals =~ '^\%([a-zA-Z0-9.]\+\)\?$'
-        let values = border_width_values
-      elseif vals =~ '^[a-zA-Z0-9.]\+\s\+\%([a-zA-Z]\+\)\?$'
-        let values = border_style_values
-      elseif vals =~ '^[a-zA-Z0-9.]\+\s\+[a-zA-Z]\+\s\+\%([a-zA-Z(]\+\)\?$'
-        let values = color_values
-      else
-        return []
-      endif
-    elseif prop =~ '^border-\%(top\|right\|bottom\|left\|block-start\|block-end\)-color'
-      let values = color_values
-    elseif prop =~ '^border-\%(top\|right\|bottom\|left\|block-start\|block-end\)-style'
-      let values = border_style_values
-    elseif prop =~ '^border-\%(top\|right\|bottom\|left\|block-start\|block-end\)-width'
-      let values = border_width_values
-    elseif prop == 'border-color'
-      let values = color_values
-    elseif prop == 'border-style'
-      let values = border_style_values
-    elseif prop == 'border-width'
-      let values = border_width_values
-    elseif prop == 'bottom'
-      let values = ["auto"]
-    elseif prop == 'box-decoration-break'
-      let values = ["slice", "clone"]
-    elseif prop == 'box-shadow'
-      let values = ["inset"]
-    elseif prop == 'box-sizing'
-      let values = ["border-box", "content-box"]
-    elseif prop =~ '^break-\%(before\|after\)'
-      let values = ["auto", "always", "avoid", "left", "right", "page", "column", "region", "recto", "verso", "avoid-page", "avoid-column", "avoid-region"]
-    elseif prop == 'break-inside'
-      let values = ["auto", "avoid", "avoid-page", "avoid-column", "avoid-region"]
-    elseif prop == 'caption-side'
-      let values = ["top", "bottom"]
-    elseif prop == 'clear'
-      let values = ["none", "left", "right", "both"]
-    elseif prop == 'clip'
-      let values = ["auto", "rect("]
-    elseif prop == 'clip-path'
-      let values = ["fill-box", "stroke-box", "view-box", "none"]
-    elseif prop == 'color'
-      let values = color_values
-    elseif prop == 'columns'
-      let values = []
-    elseif prop == 'column-count'
-      let values = ['auto']
-    elseif prop == 'column-fill'
-      let values = ['auto', 'balance']
-    elseif prop == 'column-rule-color'
-      let values = color_values
-    elseif prop == 'column-rule-style'
-      let values = border_style_values
-    elseif prop == 'column-rule-width'
-      let values = border_width_values
-    elseif prop == 'column-rule'
-      let vals = matchstr(b:line, '.*:\s*\zs.*')
-      if vals =~ '^\%([a-zA-Z0-9.]\+\)\?$'
-        let values = border_width_values
-      elseif vals =~ '^[a-zA-Z0-9.]\+\s\+\%([a-zA-Z]\+\)\?$'
-        let values = border_style_values
-      elseif vals =~ '^[a-zA-Z0-9.]\+\s\+[a-zA-Z]\+\s\+\%([a-zA-Z(]\+\)\?$'
-        let values = color_values
-      else
-        return []
-      endif
-    elseif prop == 'column-span'
-      let values = ["none", "all"]
-    elseif prop == 'column-width'
-      let values = ["auto"]
-    elseif prop == 'content'
-      let values = ["normal", "attr(", "open-quote", "close-quote", "no-open-quote", "no-close-quote"]
-    elseif prop =~ '^counter-\%(increment\|reset\)$'
-      let values = ["none"]
-    elseif prop =~ '^cue\%(-after\|-before\)\=$'
-      let values = ["url("]
-    elseif prop == 'cursor'
-      let values = ["url(", "auto", "crosshair", "default", "pointer", "move", "e-resize", "ne-resize", "nw-resize", "n-resize", "se-resize", "sw-resize", "s-resize", "w-resize", "text", "wait", "help", "progress"]
-    elseif prop == 'direction'
-      let values = ["ltr", "rtl"]
-    elseif prop == 'display'
-      let values = ["inline", "block", "list-item", "run-in", "inline-block", "table", "table-row-group", "table-header-group", "table-footer-group", "table-row", "table-column-group", "table-column", "table-cell", "table-caption", "none", "flex", "inline-flex", "grid", "inline-grid", "inline-table", "inline-list-item", "ruby", "ruby-base", "ruby-text", "ruby-base-container", "ruby-text-container", "contents"]
-    elseif prop == 'elevation'
-      let values = ["below", "level", "above", "higher", "lower"]
-    elseif prop == 'empty-cells'
-      let values = ["show", "hide"]
-    elseif prop == 'fallback'
-      let values = list_style_type_values
-    elseif prop == 'filter'
-      let values = ["blur(", "brightness(", "contrast(", "drop-shadow(", "grayscale(", "hue-rotate(", "invert(", "opacity(", "sepia(", "saturate("]
-    elseif prop == 'flex-basis'
-      let values = ["auto", "content"]
-    elseif prop == 'flex-direction'
-      let values = ["row", "row-reverse", "column", "column-reverse"]
-    elseif prop == 'flex-flow'
-      let values = ["row", "row-reverse", "column", "column-reverse", "nowrap", "wrap", "wrap-reverse"]
-    elseif prop == 'flex-grow'
-      let values = []
-    elseif prop == 'flex-shrink'
-      let values = []
-    elseif prop == 'flex-wrap'
-      let values = ["nowrap", "wrap", "wrap-reverse"]
-    elseif prop == 'flex'
-      let values = ["nowrap", "wrap", "wrap-reverse"] + ["row", "row-reverse", "column", "column-reverse", "nowrap", "wrap", "wrap-reverse"] + ["auto", "content"]
-    elseif prop == 'float'
-      let values = ["left", "right", "none"]
-    elseif prop == 'font-display'
-      let values = ["auto", "block", "swap", "fallback", "optional"]
-    elseif prop == 'font-family'
-      let values = ["sans-serif", "serif", "monospace", "cursive", "fantasy", "system-ui", "emoji", "math", "fangsong"]
-    elseif prop == 'font-feature-settings'
-      let values = ["normal", '"aalt"', '"abvf"', '"abvm"', '"abvs"', '"afrc"', '"akhn"', '"blwf"', '"blwm"', '"blws"', '"calt"', '"case"', '"ccmp"', '"cfar"', '"cjct"', '"clig"', '"cpct"', '"cpsp"', '"cswh"', '"curs"', '"cv', '"c2pc"', '"c2sc"', '"dist"', '"dlig"', '"dnom"', '"dtls"', '"expt"', '"falt"', '"fin2"', '"fin3"', '"fina"', '"flac"', '"frac"', '"fwid"', '"half"', '"haln"', '"halt"', '"hist"', '"hkna"', '"hlig"', '"hngl"', '"hojo"', '"hwid"', '"init"', '"isol"', '"ital"', '"jalt"', '"jp78"', '"jp83"', '"jp90"', '"jp04"', '"kern"', '"lfbd"', '"liga"', '"ljmo"', '"lnum"', '"locl"', '"ltra"', '"ltrm"', '"mark"', '"med2"', '"medi"', '"mgrk"', '"mkmk"', '"mset"', '"nalt"', '"nlck"', '"nukt"', '"numr"', '"onum"', '"opbd"', '"ordn"', '"ornm"', '"palt"', '"pcap"', '"pkna"', '"pnum"', '"pref"', '"pres"', '"pstf"', '"psts"', '"pwid"', '"qwid"', '"rand"', '"rclt"', '"rkrf"', '"rlig"', '"rphf"', '"rtbd"', '"rtla"', '"rtlm"', '"ruby"', '"salt"', '"sinf"', '"size"', '"smcp"', '"smpl"', '"ss01"', '"ss02"', '"ss03"', '"ss04"', '"ss05"', '"ss06"', '"ss07"', '"ss08"', '"ss09"', '"ss10"', '"ss11"', '"ss12"', '"ss13"', '"ss14"', '"ss15"', '"ss16"', '"ss17"', '"ss18"', '"ss19"', '"ss20"', '"ssty"', '"stch"', '"subs"', '"sups"', '"swsh"', '"titl"', '"tjmo"', '"tnam"', '"tnum"', '"trad"', '"twid"', '"unic"', '"valt"', '"vatu"', '"vert"', '"vhal"', '"vjmo"', '"vkna"', '"vkrn"', '"vpal"', '"vrt2"', '"zero"']
-    elseif prop == 'font-kerning'
-      let values = ["auto", "normal", "none"]
-    elseif prop == 'font-language-override'
-      let values = ["normal"]
-    elseif prop == 'font-size'
-      let values = ["xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large", "larger", "smaller"]
-    elseif prop == 'font-size-adjust'
-      let values = []
-    elseif prop == 'font-stretch'
-      let values = ["normal", "ultra-condensed", "extra-condensed", "condensed", "semi-condensed", "semi-expanded", "expanded", "extra-expanded", "ultra-expanded"]
-    elseif prop == 'font-style'
-      let values = ["normal", "italic", "oblique"]
-    elseif prop == 'font-synthesis'
-      let values = ["none", "weight", "style"]
-    elseif prop == 'font-variant-alternates'
-      let values = ["normal", "historical-forms", "stylistic(", "styleset(", "character-variant(", "swash(", "ornaments(", "annotation("]
-    elseif prop == 'font-variant-caps'
-      let values = ["normal", "small-caps", "all-small-caps", "petite-caps", "all-petite-caps", "unicase", "titling-caps"]
-    elseif prop == 'font-variant-asian'
-      let values = ["normal", "ruby", "jis78", "jis83", "jis90", "jis04", "simplified", "traditional"]
-    elseif prop == 'font-variant-ligatures'
-      let values = ["normal", "none", "common-ligatures", "no-common-ligatures", "discretionary-ligatures", "no-discretionary-ligatures", "historical-ligatures", "no-historical-ligatures", "contextual", "no-contextual"]
-    elseif prop == 'font-variant-numeric'
-      let values = ["normal", "ordinal", "slashed-zero", "lining-nums", "oldstyle-nums", "proportional-nums", "tabular-nums", "diagonal-fractions", "stacked-fractions"]
-    elseif prop == 'font-variant-position'
-      let values = ["normal", "sub", "super"]
-    elseif prop == 'font-variant'
-      let values = ["normal", "historical-forms", "stylistic(", "styleset(", "character-variant(", "swash(", "ornaments(", "annotation("] + ["small-caps", "all-small-caps", "petite-caps", "all-petite-caps", "unicase", "titling-caps"] + ["ruby", "jis78", "jis83", "jis90", "jis04", "simplified", "traditional"] + ["none", "common-ligatures", "no-common-ligatures", "discretionary-ligatures", "no-discretionary-ligatures", "historical-ligatures", "no-historical-ligatures", "contextual", "no-contextual"] + ["ordinal", "slashed-zero", "lining-nums", "oldstyle-nums", "proportional-nums", "tabular-nums", "diagonal-fractions", "stacked-fractions"] + ["sub", "super"]
-    elseif prop == 'font-weight'
-      let values = ["normal", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900"]
-    elseif prop == 'font'
-      let values = ["normal", "italic", "oblique", "small-caps", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600", "700", "800", "900", "xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large", "larger", "smaller", "sans-serif", "serif", "monospace", "system-ui", "emoji", "math", "fangsong", "cursive", "fantasy", "caption", "icon", "menu", "message-box", "small-caption", "status-bar"]
-    elseif prop =~ '^\%(height\|width\)$'
-      let values = ["auto", "border-box", "content-box", "max-content", "min-content", "available", "fit-content"]
-    elseif prop =~ '^\%(left\|rigth\)$'
-      let values = ["auto"]
-    elseif prop == 'image-rendering'
-      let values = ["auto", "crisp-edges", "pixelated"]
-    elseif prop == 'image-orientation'
-      let values = ["from-image", "flip"]
-    elseif prop == 'ime-mode'
-      let values = ["auto", "normal", "active", "inactive", "disabled"]
-    elseif prop == 'inline-size'
-      let values = ["auto", "border-box", "content-box", "max-content", "min-content", "available", "fit-content"]
-    elseif prop == 'isolation'
-      let values = ["auto", "isolate"]
-    elseif prop == 'justify-content'
-      let values = ["flex-start", "flex-end", "center", "space-between", "space-around"]
-    elseif prop == 'letter-spacing'
-      let values = ["normal"]
-    elseif prop == 'line-break'
-      let values = ["auto", "loose", "normal", "strict"]
-    elseif prop == 'line-height'
-      let values = ["normal"]
-    elseif prop == 'list-style-image'
-      let values = ["url(", "none"]
-    elseif prop == 'list-style-position'
-      let values = ["inside", "outside"]
-    elseif prop == 'list-style-type'
-      let values = list_style_type_values
-    elseif prop == 'list-style'
-      let values = list_style_type_values + ["inside", "outside"] + ["url(", "none"]
-    elseif prop == 'margin'
-      let values = ["auto"]
-    elseif prop =~ '^margin-\%(right\|left\|top\|bottom\|block-start\|block-end\|inline-start\|inline-end\)$'
-      let values = ["auto"]
-    elseif prop == 'marks'
-      let values = ["crop", "cross", "none"]
-    elseif prop == 'mask'
-      let values = ["url("]
-    elseif prop == 'mask-type'
-      let values = ["luminance", "alpha"]
-    elseif prop == '\%(max\|min\)-\%(block\|inline\)-size'
-      let values = ["auto", "border-box", "content-box", "max-content", "min-content", "available", "fit-content"]
-    elseif prop == '\%(max\|min\)-\%(height\|width\)'
-      let values = ["auto", "border-box", "content-box", "max-content", "min-content", "available", "fit-content"]
-    elseif prop == '\%(max\|min\)-zoom'
-      let values = ["auto"]
-    elseif prop == 'mix-blend-mode'
-      let values = ["normal", "multiply", "screen", "overlay", "darken", "lighten", "color-dodge", "color-burn", "hard-light", "soft-light", "difference", "exclusion", "hue", "saturation", "color", "luminosity"]
-    elseif prop == 'object-fit'
-      let values = ['fill', 'contain', 'cover', 'scale-down']
-    elseif prop == 'opacity'
-      let values = []
-    elseif prop == 'orientation'
-      let values = ["auto", "portrait", "landscape"]
-    elseif prop == 'orphans'
-      let values = []
-    elseif prop == 'outline-offset'
-      let values = []
-    elseif prop == 'outline-color'
-      let values = color_values
-    elseif prop == 'outline-style'
-      let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
-    elseif prop == 'outline-width'
-      let values = ["thin", "thick", "medium"]
-    elseif prop == 'outline'
-      let vals = matchstr(b:line, '.*:\s*\zs.*')
-      if vals =~ '^\%([a-zA-Z0-9,()#]\+\)\?$'
-        let values = color_values
-      elseif vals =~ '^[a-zA-Z0-9,()#]\+\s\+\%([a-zA-Z]\+\)\?$'
-        let values = ["none", "hidden", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"]
-      elseif vals =~ '^[a-zA-Z0-9,()#]\+\s\+[a-zA-Z]\+\s\+\%([a-zA-Z(]\+\)\?$'
-        let values = ["thin", "thick", "medium"]
-      else
-        return []
-      endif
-    elseif prop == 'overflow-wrap'
-      let values = ["normal", "break-word"]
-    elseif prop =~ '^overflow\%(-x\|-y\)\='
-      let values = ["visible", "hidden", "scroll", "auto"]
-    elseif prop == 'pad'
-      let values = []
-    elseif prop == 'padding'
-      let values = []
-    elseif prop =~ '^padding-\%(top\|right\|bottom\|left\|inline-start\|inline-end\|block-start\|block-end\)$'
-      let values = []
-    elseif prop =~ '^page-break-\%(after\|before\)$'
-      let values = ["auto", "always", "avoid", "left", "right", "recto", "verso"]
-    elseif prop == 'page-break-inside'
-      let values = ["auto", "avoid"]
-    elseif prop =~ '^pause\%(-after\|-before\)\=$'
-      let values = ["none", "x-weak", "weak", "medium", "strong", "x-strong"]
-    elseif prop == 'perspective'
-      let values = ["none"]
-    elseif prop == 'perspective-origin'
-      let values = ["top", "bottom", "left", "center", " right"]
-    elseif prop == 'pointer-events'
-      let values = ["auto", "none", "visiblePainted", "visibleFill", "visibleStroke", "visible", "painted", "fill", "stroke", "all"]
-    elseif prop == 'position'
-      let values = ["static", "relative", "absolute", "fixed", "sticky"]
-    elseif prop == 'prefix'
-      let values = []
-    elseif prop == 'quotes'
-      let values = ["none"]
-    elseif prop == 'range'
-      let values = ["auto", "infinite"]
-    elseif prop == 'resize'
-      let values = ["none", "both", "horizontal", "vertical"]
-    elseif prop =~ '^rest\%(-after\|-before\)\=$'
-      let values = ["none", "x-weak", "weak", "medium", "strong", "x-strong"]
-    elseif prop == 'ruby-align'
-      let values = ["start", "center", "space-between", "space-around"]
-    elseif prop == 'ruby-merge'
-      let values = ["separate", "collapse", "auto"]
-    elseif prop == 'ruby-position'
-      let values = ["over", "under", "inter-character"]
-    elseif prop == 'scroll-behavior'
-      let values = ["auto", "smooth"]
-    elseif prop == 'scroll-snap-coordinate'
-      let values = ["none"]
-    elseif prop == 'scroll-snap-destination'
-      return []
-    elseif prop == 'scroll-snap-points-\%(x\|y\)$'
-      let values = ["none", "repeat("]
-    elseif prop == 'scroll-snap-type\%(-x\|-y\)\=$'
-      let values = ["none", "mandatory", "proximity"]
-    elseif prop == 'shape-image-threshold'
-      let values = []
-    elseif prop == 'shape-margin'
-      let values = []
-    elseif prop == 'shape-outside'
-      let values = ["margin-box", "border-box", "padding-box", "content-box", 'inset(', 'circle(', 'ellipse(', 'polygon(', 'url(']
-    elseif prop == 'speak'
-      let values = ["auto", "none", "normal"]
-    elseif prop == 'speak-as'
-      let values = ["auto", "normal", "spell-out", "digits"]
-    elseif prop == 'src'
-      let values = ["url("]
-    elseif prop == 'suffix'
-      let values = []
-    elseif prop == 'symbols'
-      let values = []
-    elseif prop == 'system'
-      let vals = matchstr(b:line, '.*:\s*\zs.*')
-      if vals =~ '^extends'
-        let values = list_style_type_values
-      else
-        let values = ["cyclic", "numeric", "alphabetic", "symbolic", "additive", "fixed", "extends"]
-      endif
-    elseif prop == 'table-layout'
-      let values = ["auto", "fixed"]
-    elseif prop == 'tab-size'
-      let values = []
-    elseif prop == 'text-align'
-      let values = ["start", "end", "left", "right", "center", "justify", "match-parent"]
-    elseif prop == 'text-align-last'
-      let values = ["auto", "start", "end", "left", "right", "center", "justify"]
-    elseif prop == 'text-combine-upright'
-      let values = ["none", "all", "digits"]
-    elseif prop == 'text-decoration-line'
-      let values = ["none", "underline", "overline", "line-through", "blink"]
-    elseif prop == 'text-decoration-color'
-      let values = color_values
-    elseif prop == 'text-decoration-style'
-      let values = ["solid", "double", "dotted", "dashed", "wavy"]
-    elseif prop == 'text-decoration'
-      let values = ["none", "underline", "overline", "line-through", "blink"] + ["solid", "double", "dotted", "dashed", "wavy"] + color_values
-    elseif prop == 'text-emphasis-color'
-      let values = color_values
-    elseif prop == 'text-emphasis-position'
-      let values = ["over", "under", "left", "right"]
-    elseif prop == 'text-emphasis-style'
-      let values = ["none", "filled", "open", "dot", "circle", "double-circle", "triangle", "sesame"]
-    elseif prop == 'text-emphasis'
-      let values = color_values + ["over", "under", "left", "right"] + ["none", "filled", "open", "dot", "circle", "double-circle", "triangle", "sesame"]
-    elseif prop == 'text-indent'
-      let values = ["hanging", "each-line"]
-    elseif prop == 'text-orientation'
-      let values = ["mixed", "upright", "sideways", "sideways-right", "use-glyph-orientation"]
-    elseif prop == 'text-overflow'
-      let values = ["clip", "ellipsis", "fade", "fade("]
-    elseif prop == 'text-rendering'
-      let values = ["auto", "optimizeSpeed", "optimizeLegibility", "geometricPrecision"]
-    elseif prop == 'text-shadow'
-      let values = color_values
-    elseif prop == 'text-transform'
-      let values = ["capitalize", "uppercase", "lowercase", "full-width", "none"]
-    elseif prop == 'text-underline-position'
-      let values = ["auto", "under", "left", "right"]
-    elseif prop == 'touch-action'
-      let values = ["auto", "none", "pan-x", "pan-y", "manipulation", "pan-left", "pan-right", "pan-top", "pan-down"]
-    elseif prop == 'transform'
-      let values = ["matrix(", "translate(", "translateX(", "translateY(", "scale(", "scaleX(", "scaleY(", "rotate(", "skew(", "skewX(", "skewY(", "matrix3d(", "translate3d(", "translateZ(", "scale3d(", "scaleZ(", "rotate3d(", "rotateX(", "rotateY(", "rotateZ(", "perspective("]
-    elseif prop == 'transform-box'
-      let values = ["border-box", "fill-box", "view-box"]
-    elseif prop == 'transform-origin'
-      let values = ["left", "center", "right", "top", "bottom"]
-    elseif prop == 'transform-style'
-      let values = ["flat", "preserve-3d"]
-    elseif prop == 'top'
-      let values = ["auto"]
-    elseif prop == 'transition-property'
-      let values = ["all", "none"] + g:css_animatable_props
-    elseif prop == 'transition-duration'
-      let values = []
-    elseif prop == 'transition-delay'
-      let values = []
-    elseif prop == 'transition-timing-function'
-      let values = timing_functions
-    elseif prop == 'transition'
-      let values = ["all", "none"] + g:css_animatable_props + timing_functions
-    elseif prop == 'unicode-bidi'
-      let values = ["normal", "embed", "isolate", "bidi-override", "isolate-override", "plaintext"]
-    elseif prop == 'unicode-range'
-      let values = ["U+"]
-    elseif prop == 'user-select'
-      let values = ["auto", "text", "none", "contain", "all"]
-    elseif prop == 'user-zoom'
-      let values = ["zoom", "fixed"]
-    elseif prop == 'vertical-align'
-      let values = ["baseline", "sub", "super", "top", "text-top", "middle", "bottom", "text-bottom"]
-    elseif prop == 'visibility'
-      let values = ["visible", "hidden", "collapse"]
-    elseif prop == 'voice-volume'
-      let values = ["silent", "x-soft", "soft", "medium", "loud", "x-loud"]
-    elseif prop == 'voice-balance'
-      let values = ["left", "center", "right", "leftwards", "rightwards"]
-    elseif prop == 'voice-family'
-      let values = []
-    elseif prop == 'voice-rate'
-      let values = ["normal", "x-slow", "slow", "medium", "fast", "x-fast"]
-    elseif prop == 'voice-pitch'
-      let values = ["absolute", "x-low", "low", "medium", "high", "x-high"]
-    elseif prop == 'voice-range'
-      let values = ["absolute", "x-low", "low", "medium", "high", "x-high"]
-    elseif prop == 'voice-stress'
-      let values = ["normal", "strong", "moderate", "none", "reduced "]
-    elseif prop == 'voice-duration'
-      let values = ["auto"]
-    elseif prop == 'white-space'
-      let values = ["normal", "pre", "nowrap", "pre-wrap", "pre-line"]
-    elseif prop == 'widows'
-      let values = []
-    elseif prop == 'will-change'
-      let values = ["auto", "scroll-position", "contents"] + s:values
-    elseif prop == 'word-break'
-      let values = ["normal", "break-all", "keep-all"]
-    elseif prop == 'word-spacing'
-      let values = ["normal"]
-    elseif prop == 'word-wrap'
-      let values = ["normal", "break-word"]
-    elseif prop == 'writing-mode'
-      let values = ["horizontal-tb", "vertical-rl", "vertical-lr", "sideways-rl", "sideways-lr"]
-    elseif prop == 'z-index'
-      let values = ["auto"]
-    elseif prop == 'zoom'
-      let values = ["auto"]
-    else
-      let values = wide_keywords
-    endif
-
-    let values = values + wide_keywords
-
-    for m in values
-      if m =~ '^' . a:base
-        call add(res, m)
-      endif
-    endfor
-    return res
-
-  " Complete @-rules
-
-  elseif b:start =~ '\w' && b:word_break == 1 && b:first_word_type == 'stylusAtRuleMedia'
-
-    let values = ["min-width", "min-height", "max-width", "max-height"]
-
-    let res = []
-
-    for m in values
-      if m =~ '^' . a:base
-        call add(res, m . ': ')
-      endif
-    endfor
-
-    return res
-
-  elseif b:start == '@'
-
-    let values = ["@media", "@import", "@extend", "@block", "@charset", "@page", "@font-face", "@namespace", "@supports", "@keyframes", "@viewport", "@document", "@css"]
-
-    let res = []
-
-    for m in values
-      if m =~ '^' . a:base
-        call add(res, m .' ')
-      endif
-    endfor
-
-    return res
-
-  endif
-
-  return []
-
-endfun
diff --git a/compiler/ocaml.vim b/compiler/ocaml.vim
index 3ad947410..cc45414aa 100644
--- a/compiler/ocaml.vim
+++ b/compiler/ocaml.vim
@@ -5,7 +5,7 @@ endif
 " Vim Compiler File
 " Compiler:    ocaml
 " Maintainer:  Markus Mottl <markus.mottl@gmail.com>
-" URL:         http://www.ocaml.info/vim/compiler/ocaml.vim
+" URL:         https://github.com/ocaml/vim-ocaml
 " Last Change:
 "              2020 Mar 28 - Improved error format (Thomas Leonard)
 "              2017 Nov 26 - Improved error format (Markus Mottl)
diff --git a/extras/filetype.vim b/extras/filetype.vim
index 20fa887ed..703ff96e6 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Dec 07
+" Last Change:	2020 Dec 24
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
diff --git a/ftplugin/fstab.vim b/ftplugin/fstab.vim
new file mode 100644
index 000000000..5f0972cae
--- /dev/null
+++ b/ftplugin/fstab.vim
@@ -0,0 +1,23 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'fstab', 'ftplugin/fstab.vim')
+  finish
+endif
+
+" Vim ftplugin file
+" Language: fstab file
+" Maintainer: Radu Dineiu <radu.dineiu@gmail.com>
+" URL: https://raw.github.com/rid9/vim-fstab/master/ftplugin/fstab.vim
+" Last Change: 2020 Dec 29
+" Version: 1.0
+"
+" Credits:
+"   Subhaditya Nath <sn03.general@gmail.com>
+
+if exists("b:did_ftplugin")
+	finish
+endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=#%s
+let b:undo_ftplugin = "setlocal commentstring<"
+
+" vim: ts=8 ft=vim
\ No newline at end of file
diff --git a/ftplugin/stylus.vim b/ftplugin/stylus.vim
index e24bea017..ce334497d 100644
--- a/ftplugin/stylus.vim
+++ b/ftplugin/stylus.vim
@@ -4,8 +4,8 @@ endif
 
 " Vim filetype plugin
 " Language: Stylus
-" Maintainer: Ilia Loginov
-" Credits: Marc Harter, Tim Pope
+" Maintainer: Marc Harter
+" Credits: Tim Pope
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -47,14 +47,14 @@ if exists("loaded_matchit")
   let b:match_words = s:match_words
 endif
 
+setlocal comments= commentstring=//\ %s
+
 setlocal suffixesadd=.styl
 
 " Add '-' and '#' to the what makes up a keyword.
 " This means that 'e' and 'w' work properly now, for properties
 " and valid variable names.
-setlocal iskeyword+=#,-
-
-setlocal omnifunc=stylcomplete#CompleteStyl
+setl iskeyword+=#,-
 
 let b:undo_ftplugin = "setl cms< com< "
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
diff --git a/indent/dune.vim b/indent/dune.vim
index 5dbe9d30a..009f7eba2 100644
--- a/indent/dune.vim
+++ b/indent/dune.vim
@@ -14,4 +14,4 @@ endif
 let b:did_indent = 1
 
 " dune format-dune-file uses 1 space to indent
-set softtabstop=1 shiftwidth=1 expandtab
+setlocal softtabstop=1 shiftwidth=1 expandtab
diff --git a/indent/stylus.vim b/indent/stylus.vim
index 1254ebc34..88aa44828 100644
--- a/indent/stylus.vim
+++ b/indent/stylus.vim
@@ -4,21 +4,21 @@ endif
 
 " Vim indent file
 " Language: Stylus
-" Maintainer: Ilia Loginov
-" Last Change: 2018 Jan 19
+" Maintainer: Marc Harter
+" Last Change: 2010 May 21
 " Based On: sass.vim from Tim Pope
-
+"
 if exists("b:did_indent")
   finish
 endif
+unlet! b:did_indent
 let b:did_indent = 1
 
 setlocal indentexpr=GetStylusIndent()
-setlocal autoindent nolisp nosmartindent
-setlocal indentkeys=o,O,*<Return>,0),!^F
+setlocal indentkeys=o,O,*<Return>,},],0),!^F
 setlocal formatoptions+=r
 
-if exists('*GetStylusIndent')
+if exists("*GetStylusIndent")  " only define once
   finish
 endif
 
@@ -43,7 +43,45 @@ function s:prevnonblanknoncomment(lnum)
   return lnum
 endfunction
 
-function GetStylusIndent()
+function s:count_braces(lnum, count_open)
+  let n_open = 0
+  let n_close = 0
+  let line = getline(a:lnum)
+  let pattern = '[{}]'
+  let i = match(line, pattern)
+  while i != -1
+    if synIDattr(synID(a:lnum, i + 1, 0), 'name') !~ 'css\%(Comment\|StringQ\{1,2}\)'
+      if line[i] == '{'
+        let n_open += 1
+      elseif line[i] == '}'
+        if n_open > 0
+          let n_open -= 1
+        else
+          let n_close += 1
+        endif
+      endif
+    endif
+    let i = match(line, pattern, i + 1)
+  endwhile
+  return a:count_open ? n_open : n_close
+endfunction
+
+" function CheckCSSIndent()
+"   let line = getline(v:lnum)
+"   if line =~ '^\s*\*'
+"     return cindent(v:lnum)
+"   endif
+" 
+"   let pnum = s:prevnonblanknoncomment(v:lnum - 1)
+"   if pnum == 0
+"     return 0
+"   endif
+" 
+"   return indent(pnum) + s:count_braces(pnum, 1) * &sw
+"         \ - s:count_braces(v:lnum, 0) * &sw
+" endfunction
+
+function! GetStylusIndent()
   let line = getline(v:lnum)
   if line =~ '^\s*\*'
     return cindent(v:lnum)
@@ -54,41 +92,42 @@ function GetStylusIndent()
     return 0
   endif
 
-  let lnum = prevnonblank(v:lnum-1)
+  let lnum     = prevnonblank(v:lnum-1)
   if lnum == 0
     return 0
   endif
 
   let pline = getline(pnum)
 
-  " Get last line strip ending whitespace
-  let line = substitute(getline(lnum),'[\s()]\+$','','')
-  " Get current line, trimmed
-  let cline    = substitute(substitute(getline(v:lnum),'\s\+$','',''),'^\s\+','','')
-  " Get last col in prev line
-  let lastcol  = strlen(line)
-  " Then remove preceeding whitespace
-  let line     = substitute(line,'^\s\+','','')
-  " Get indent on prev line
-  let indent   = indent(lnum)
-  " Get indent on current line
-  let cindent  = indent(v:lnum)
-  " Increase indent by the shift width
-  let increase = indent + &sw
+  if pline =~ '[}{]'
+    return indent(pnum) + s:count_braces(pnum, 1) * &sw - s:count_braces(v:lnum, 0) * &sw
+  endif
+
+  let line     = substitute(getline(lnum),'[\s()]\+$','','')  " get last line strip ending whitespace
+  let cline    = substitute(substitute(getline(v:lnum),'\s\+$','',''),'^\s\+','','')  " get current line, trimmed
+  let lastcol  = strlen(line)  " get last col in prev line
+  let line     = substitute(line,'^\s\+','','')  " then remove preceeding whitespace
+  let indent   = indent(lnum)  " get indent on prev line
+  let cindent  = indent(v:lnum)  " get indent on current line
+  let increase = indent + &sw  " increase indent by the shift width
   if indent   == indent(lnum)
     let indent = cindent <= indent ? indent : increase
   endif
 
-  let group = synIDattr(synID(lnum, cindent + 1, 1), 'name')
+  let group = synIDattr(synID(lnum,lastcol,1),'name')
 
-  if group =~ 'stylusSelector\w*'
-    return increase
-  elseif group =~ 'stylusAtRule\(Viewport\|Page\|Supports\|Document\|Font\|Keyframes\)\w*'
+  " for debugging only
+  echo group
+
+  " if group !~? 'css.*' && line =~? ')\s*$' " match user functions
+  "   return increase
+  if group =~? '\v^%(cssTagName|cssClassName|cssIdentifier|cssSelectorOp|cssSelectorOp2|cssBraces|cssAttributeSelector|cssPseudo|stylusId|stylusClass)$'
     return increase
-  " Mixin or function definition
-  elseif group =~ 'stylusFunction\w*' && indent(lnum) == 0
+  elseif (group == 'stylusUserFunction') && (indent(lnum) == '0') " mixin definition
     return increase
   else
     return indent
   endif
 endfunction
+
+" vim:set sw=2;
diff --git a/packages.yaml b/packages.yaml
index 5103de988..3b6a7623c 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1564,7 +1564,7 @@ filetypes:
   - sol
 ---
 name: stylus
-remote: iloginow/vim-stylus
+remote: wavded/vim-stylus
 filetypes:
 - name: stylus
   linguist: Stylus
diff --git a/syntax/basic/function.vim b/syntax/basic/function.vim
index 88dc901f2..6e804e245 100644
--- a/syntax/basic/function.vim
+++ b/syntax/basic/function.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'typescript', 'syntax/basic/fu
 endif
 
 syntax keyword typescriptAsyncFuncKeyword      async
-  \ nextgroup=typescriptFuncKeyword,typescriptArrowFuncDef
+  \ nextgroup=typescriptFuncKeyword,typescriptArrowFuncDef,typescriptArrowFuncTypeParameter
   \ skipwhite
 
 syntax keyword typescriptAsyncFuncKeyword      await
@@ -28,18 +28,22 @@ syntax match   typescriptArrowFuncDef          contained /\K\k*\s*=>/
   \ skipwhite skipempty
 
 syntax match   typescriptArrowFuncDef          contained /(\%(\_[^()]\+\|(\_[^()]*)\)*)\_s*=>/
-  \ contains=typescriptArrowFuncArg,typescriptArrowFunc
+  \ contains=typescriptArrowFuncArg,typescriptArrowFunc,@typescriptCallSignature
   \ nextgroup=@typescriptExpression,typescriptBlock
   \ skipwhite skipempty
 
-syntax region  typescriptArrowFuncDef          contained start=/(\%(\_[^()]\+\|(\_[^()]*)\)*):/ end=/=>/
-  \ contains=typescriptArrowFuncArg,typescriptArrowFunc,typescriptTypeAnnotation
+syntax region  typescriptArrowFuncDef          contained start=/(\%(\_[^()]\+\|(\_[^()]*)\)*):/ matchgroup=typescriptArrowFunc end=/=>/
+  \ contains=typescriptArrowFuncArg,typescriptTypeAnnotation,@typescriptCallSignature
   \ nextgroup=@typescriptExpression,typescriptBlock
   \ skipwhite skipempty keepend
 
+syntax region  typescriptArrowFuncTypeParameter start=/</ end=/>/
+  \ contains=@typescriptTypeParameterCluster
+  \ nextgroup=typescriptArrowFuncDef
+  \ contained skipwhite skipnl
+
 syntax match   typescriptArrowFunc             /=>/
 syntax match   typescriptArrowFuncArg          contained /\K\k*/
-syntax region  typescriptArrowFuncArg          contained start=/<\|(/ end=/\ze=>/ contains=@typescriptCallSignature
 
 syntax region typescriptReturnAnnotation contained start=/:/ end=/{/me=e-1 contains=@typescriptType nextgroup=typescriptBlock
 
diff --git a/syntax/diff.vim b/syntax/diff.vim
index 6e1306dc0..e897a9179 100644
--- a/syntax/diff.vim
+++ b/syntax/diff.vim
@@ -6,7 +6,7 @@ endif
 " Language:	Diff (context or unified)
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
 "               Translations by Jakson Alves de Aquino.
-" Last Change:	2020 Dec 07
+" Last Change:	2020 Dec 30
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -352,11 +352,16 @@ syn match diffLine	"^\d\+\(,\d\+\)\=[cda]\d\+\>.*"
 syn match diffFile	"^diff\>.*"
 syn match diffFile	"^Index: .*"
 syn match diffFile	"^==== .*"
-" Old style diff uses *** for old and --- for new.
-" Unified diff uses --- for old and +++ for new; names are wrong but it works.
-syn match diffOldFile	"^+++ .*"
-syn match diffOldFile	"^\*\*\* .*"
-syn match diffNewFile	"^--- .*"
+
+if search('^@@ -\S\+ +\S\+ @@', 'nw', '', 100)
+  " unified
+  syn match diffOldFile	"^--- .*"
+  syn match diffNewFile	"^+++ .*"
+else
+  " context / old style
+  syn match diffOldFile	"^\*\*\* .*"
+  syn match diffNewFile	"^--- .*"
+endif
 
 " Used by git
 syn match diffIndexLine	"^index \x\x\x\x.*"
diff --git a/syntax/fstab.vim b/syntax/fstab.vim
index d87a2ee42..7e234ee80 100644
--- a/syntax/fstab.vim
+++ b/syntax/fstab.vim
@@ -5,8 +5,8 @@ endif
 " Vim syntax file
 " Language: fstab file
 " Maintainer: Radu Dineiu <radu.dineiu@gmail.com>
-" URL: https://raw.github.com/rid9/vim-fstab/master/fstab.vim
-" Last Change: 2020 Aug 06
+" URL: https://raw.github.com/rid9/vim-fstab/master/syntax/fstab.vim
+" Last Change: 2020 Dec 30
 " Version: 1.4
 "
 " Credits:
diff --git a/syntax/odin.vim b/syntax/odin.vim
index 6597aeda7..bafd95752 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -64,8 +64,7 @@ syntax keyword odinDefer defer
 syntax region odinChar start=/\v'/ skip=/\v\\./ end=/\v'/
 syntax region odinString start=/\v"/ skip=/\v\\./ end=/\v"/
 
-syntax match odinFunction "\v<\w*>(\s*::\s*)@="
-syntax match odinDynamicFunction "\v<\w*(\s*:\=\s*\(.*\))@="
+syntax match odinFunction "\v<\w*>(\s*::\s*proc)@="
 
 syntax match odinTagNote "@\<\w\+\>" display
 
@@ -145,7 +144,6 @@ highlight link odinBitField Structure
 highlight link odinBitSet Structure
 
 highlight link odinFunction Function
-highlight link odinDynamicFunction Function
 
 highlight link odinMacro Macro
 highlight link odinIf Conditional
diff --git a/syntax/sml.vim b/syntax/sml.vim
index 10bca3ba0..26347128f 100644
--- a/syntax/sml.vim
+++ b/syntax/sml.vim
@@ -7,13 +7,16 @@ endif
 " Filenames:    *.sml *.sig
 " Maintainers:  Markus Mottl            <markus.mottl@gmail.com>
 "               Fabrizio Zeno Cornelli  <zeno@filibusta.crema.unimi.it>
-" URL:          http://www.ocaml.info/vim/syntax/sml.vim
-" Last Change:  2006 Oct 23 - Fixed character highlighting bug (MM)
-"               2002 Jun 02 - Fixed small typo  (MM)
-"               2001 Nov 20 - Fixed small highlighting bug with modules (MM)
+" Last Change:  2019 Oct 01 - Only spell check strings & comments (Chuan Wei Foo)
+"               2015 Aug 31 - Fixed opening of modules (Ramana Kumar)
+"               2006 Oct 23 - Fixed character highlighting bug (MM)
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
+
+" Disable spell checking of syntax.
+syn spell notoplevel
+
   finish
 endif
 
@@ -56,7 +59,7 @@ syn region   smlEncl transparent matchgroup=smlKeyword start="#\[" matchgroup=sm
 
 
 " Comments
-syn region   smlComment start="(\*" end="\*)" contains=smlComment,smlTodo
+syn region   smlComment start="(\*" end="\*)" contains=smlComment,smlTodo,@Spell
 syn keyword  smlTodo contained TODO FIXME XXX
 
 
@@ -86,7 +89,7 @@ syn region   smlSig matchgroup=smlModule start="\<sig\>" matchgroup=smlModule en
 syn region   smlModSpec matchgroup=smlKeyword start="\<structure\>" matchgroup=smlModule end="\<\u\(\w\|'\)*\>" contained contains=@smlAllErrs,smlComment skipwhite skipempty nextgroup=smlModTRWith,smlMPRestr
 
 " "open"
-syn region   smlNone matchgroup=smlKeyword start="\<open\>" matchgroup=smlModule end="\<\u\(\w\|'\)*\(\.\u\(\w\|'\)*\)*\>" contains=@smlAllErrs,smlComment
+syn region   smlNone matchgroup=smlKeyword start="\<open\>" matchgroup=smlModule end="\<\w\(\w\|'\)*\(\.\w\(\w\|'\)*\)*\>" contains=@smlAllErrs,smlComment
 
 " "structure" - somewhat complicated stuff ;-)
 syn region   smlModule matchgroup=smlKeyword start="\<\(structure\|functor\)\>" matchgroup=smlModule end="\<\u\(\w\|'\)*\>" contains=@smlAllErrs,smlComment skipwhite skipempty nextgroup=smlPreDef
@@ -140,7 +143,7 @@ syn match    smlModPath      "\u\(\w\|'\)*\."he=e-1
 
 syn match    smlCharacter    +#"\\""\|#"."\|#"\\\d\d\d"+
 syn match    smlCharErr      +#"\\\d\d"\|#"\\\d"+
-syn region   smlString       start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn region   smlString       start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell
 
 syn match    smlFunDef       "=>"
 syn match    smlRefAssign    ":="
@@ -153,9 +156,9 @@ syn match    smlKeyChar      ";"
 syn match    smlKeyChar      "\*"
 syn match    smlKeyChar      "="
 
-syn match    smlNumber	      "\<-\=\d\+\>"
-syn match    smlNumber	      "\<-\=0[x|X]\x\+\>"
-syn match    smlReal	      "\<-\=\d\+\.\d*\([eE][-+]\=\d\+\)\=[fl]\=\>"
+syn match    smlNumber        "\<-\=\d\+\>"
+syn match    smlNumber        "\<-\=0[x|X]\x\+\>"
+syn match    smlReal          "\<-\=\d\+\.\d*\([eE][-+]\=\d\+\)\=[fl]\=\>"
 
 " Synchronization
 syn sync minlines=20
@@ -171,49 +174,49 @@ syn sync match smlSigSync     groupthere smlSig     "\<end\>"
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
-hi def link smlBraceErr	 Error
-hi def link smlBrackErr	 Error
-hi def link smlParenErr	 Error
+hi def link smlBraceErr     Error
+hi def link smlBrackErr     Error
+hi def link smlParenErr     Error
 
-hi def link smlCommentErr	 Error
+hi def link smlCommentErr   Error
 
-hi def link smlEndErr	 Error
-hi def link smlThenErr	 Error
+hi def link smlEndErr       Error
+hi def link smlThenErr      Error
 
-hi def link smlCharErr	 Error
+hi def link smlCharErr      Error
 
-hi def link smlComment	 Comment
+hi def link smlComment      Comment
 
-hi def link smlModPath	 Include
-hi def link smlModule	 Include
-hi def link smlModParam1	 Include
-hi def link smlModType	 Include
-hi def link smlMPRestr3	 Include
-hi def link smlFullMod	 Include
+hi def link smlModPath      Include
+hi def link smlModule       Include
+hi def link smlModParam1    Include
+hi def link smlModType      Include
+hi def link smlMPRestr3     Include
+hi def link smlFullMod      Include
 hi def link smlModTypeRestr Include
-hi def link smlWith	 Include
-hi def link smlMTDef	 Include
+hi def link smlWith         Include
+hi def link smlMTDef        Include
 
 hi def link smlConstructor  Constant
 
-hi def link smlModPreRHS	 Keyword
-hi def link smlMPRestr2	 Keyword
-hi def link smlKeyword	 Keyword
-hi def link smlFunDef	 Keyword
-hi def link smlRefAssign	 Keyword
-hi def link smlKeyChar	 Keyword
-hi def link smlAnyVar	 Keyword
-hi def link smlTopStop	 Keyword
-hi def link smlOperator	 Keyword
-
-hi def link smlBoolean	 Boolean
-hi def link smlCharacter	 Character
-hi def link smlNumber	 Number
-hi def link smlReal	 Float
-hi def link smlString	 String
-hi def link smlType	 Type
-hi def link smlTodo	 Todo
-hi def link smlEncl	 Keyword
+hi def link smlModPreRHS    Keyword
+hi def link smlMPRestr2     Keyword
+hi def link smlKeyword      Keyword
+hi def link smlFunDef       Keyword
+hi def link smlRefAssign    Keyword
+hi def link smlKeyChar      Keyword
+hi def link smlAnyVar       Keyword
+hi def link smlTopStop      Keyword
+hi def link smlOperator     Keyword
+
+hi def link smlBoolean      Boolean
+hi def link smlCharacter    Character
+hi def link smlNumber       Number
+hi def link smlReal         Float
+hi def link smlString       String
+hi def link smlType         Type
+hi def link smlTodo         Todo
+hi def link smlEncl         Keyword
 
 
 let b:current_syntax = "sml"
diff --git a/syntax/stylus.vim b/syntax/stylus.vim
index 9ddb4b82e..bcf479c41 100644
--- a/syntax/stylus.vim
+++ b/syntax/stylus.vim
@@ -3,882 +3,378 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'stylus', 'syntax/stylus.vim')
 endif
 
 " Vim syntax file
-" Language:	Stylus
-" Author:	Ilia Loginov <iloginow@outlook.com>
-" Created:	Jan 5, 2018
-
+" Language:	CSS3
+" Maintainer:	Hsiaoming Yang <lepture@me.com>
+" URL: http://lepture.me/work/css3/
+" Created:	Dec 14, 2011
+" Modified:	Sep 4, 2012
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
 if !exists("main_syntax")
-  if exists("b:current_syntax")
+  if version < 600
+    syntax clear
+  elseif exists("b:current_syntax")
     finish
   endif
-  let main_syntax = 'stylus'
+  let main_syntax = 'css'
 endif
 
-syntax case ignore
-
-" First of all define indented and not indented lines
-syntax match stylusNewLine "^\S\@="
-      \ nextgroup=stylusComment,stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusVariable,stylusExplicitVariable,stylusInterpolationSelectors,stylusFunctionName,stylusConditional,stylusOperatorReturn,stylusAtRuleMedia,stylusAtRuleKeyframes,stylusAtRuleNamespace,stylusAtRuleSupports,stylusAtRuleDocument,stylusAtRulePage,stylusAtRuleViewport
-
-syntax match stylusNewLineIndented "^\s\+"
-      \ nextgroup=stylusComment,stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusProperty,stylusVariable,stylusExplicitVariable,stylusInterpolation,stylusFunctionName,stylusUnitInt,stylusParenthesised,stylusOperatorReturn,stylusConditional,stylusAtRuleMedia,stylusAtRuleKeyframes,stylusAtRuleKeyframesOffset,stylusAtRuleNamespace,stylusAtRuleSupports,stylusAtRuleDocument,stylusAtRulePageMarginBoxTypes,stylusAtRuleViewport,stylusAtRuleExtends
-
-" ===============================================
-" ENCLOSURES
-" ===============================================
-
-syntax match stylusEnclosure "\(\[\|\]\|{\|}\|(\|)\)"
-      \ contained
-
-highlight def link stylusEnclosure SpecialChar
-
-" ===============================================
-" VARIABLES
-" ===============================================
-
-syntax match stylusVariable "\<\(\w\|-\|\$\)*\>"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusOperatorAssignment,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusSubscript,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorVarDefinition,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional,stylusHashDotGetter
-      \ skipwhite
-
-syntax match stylusExplicitVariable "\$\(\w\|-\|\$\)*\>"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusOperatorAssignment,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusSubscript,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorVarDefinition,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional,stylusHashDotGetter,stylusOptional
-      \ skipwhite
-
-syntax match stylusExplicitVariable "\<arguments\|block\>"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusSubscript,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorVarDefinition,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional,stylusHashDotGetter
-      \ skipwhite
-
-highlight def link stylusExplicitVariable Identifier
-
-" ===============================================
-" OPERATORS
-" ===============================================
-
-" Unary
-syntax match stylusOperatorUnary "\([-+\!\~]\+\|\<not\>\)"
-      \ contained
-      \ nextgroup=stylusVariable,stylusExplicitVariable,stylusUnitInt,stylusUnitFloat,stylusParenthesised,stylusPropertyLookup,stylusOperatorUnary,stylusBoolean,stylusFunctionName
-      \ skipwhite
-
-highlight def link stylusOperatorUnary Operator
-
-" Additive
-syntax match stylusOperatorAdditive "[-+]"
-      \ contained
-      \ nextgroup=stylusVariable,stylusExplicitVariable,stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusParenthesised,stylusPropertyLookup,stylusColor,stylusFunctionName
-      \ skipwhite
-
-highlight def link stylusOperatorAdditive Operator
-
-" Multiplicative
-syntax match stylusOperatorMultiplicative "\([/\%]\|\*\{1,2}\)"
-      \ contained
-      \ nextgroup=stylusVariable,stylusExplicitVariable,stylusUnitInt,stylusUnitFloat,stylusParenthesised,stylusPropertyLookup,stylusFunctionName
-      \ skipwhite
-highlight def link stylusOperatorMultiplicative Operator
-
-" Ternary
-syntax match stylusOperatorTernary "[:?]"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
-      \ skipwhite
-
-highlight def link stylusOperatorTernary Operator
-
-" Assignment
-syntax match stylusOperatorAssignment "[/\*+-:?]\=="
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName,stylusHash,stylusAtRuleBlock
-      \ skipwhite
-
-highlight def link stylusOperatorAssignment Operator
-
-" Relational
-syntax match stylusOperatorRelational "\(=\{2}\|\<is\>\(\s\<not\>\)\=\|\!=\|\<isnt\>\|>=\|<=\|>\|<\)"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusVariable,stylusExplicitVariable,stylusParenthesised,stylusPropertyLookup,stylusColor,stylusBoolean,stylusFunctionName
-      \ skipwhite
-
-highlight def link stylusOperatorRelational Operator
-
-" Logical
-syntax match stylusOperatorLogical "\(&&\|||\|\<and\>\|\<or\>\)"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
-      \ skipwhite
-
-highlight def link stylusOperatorLogical Operator
-
-" Existence
-syntax match stylusOperatorExistence "\<in\>"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
-      \ skipwhite
-
-highlight def link stylusOperatorExistence Operator
-
-" Instance
-syntax match stylusOperatorInstance "\<is a\>"
-      \ contained
-      \ skipwhite
-
-highlight def link stylusOperatorInstance Operator
-
-" Variable definition
-syntax match stylusOperatorVarDefinition "\<is defined\>"
-      \ contained
-      \ nextgroup=stylusOperatorLogical,stylusOperatorTernary,stylusFunctionName
-      \ skipwhite
-
-highlight def link stylusOperatorVarDefinition Operator
-
-" Return
-syntax match stylusOperatorReturn "\<return\>"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
-      \ skipwhite
-
-highlight def link stylusOperatorReturn Operator
-
-" Comma
-syntax match stylusComma /,\(\s\=\(\a\w\{-}:\|\('\|"\).\{-}\('\|"\):\)\)\@!/
-      \ containedin=ALLBUT,stylusString,stylusComment,stylusHash,stylusAtRuleMediaComma
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
-      \ skipwhite
-
-" Range
-syntax match stylusOperatorRange "\.\.\.\="
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusVariable,stylusExplicitVariable,stylusFunctionName
-
-highlight def link stylusOperatorRange Operator
-
-" ===============================================
-" CONDITIONALS
-" ===============================================
-
-syntax match stylusConditional "\<\(if\|else\|unless\|for\)\>"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName,stylusConditional
-      \ skipwhite
-
-highlight def link stylusConditional Conditional
-
-" ===============================================
-" SPRINTF
-" ===============================================
-
-syntax match stylusSprintfPlaceholder "%s"
-      \ contained
-
-highlight def link stylusSprintfPlaceholder Operator
-
-syntax match stylusSprintfDefinition "%"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
-      \ skipwhite
-
-highlight def link stylusSprintfDefinition Operator
-
-" ===============================================
-" SUBSCRIPT
-" ===============================================
-
-syntax region stylusSubscript matchgroup=stylusEnclosure start="\[" end="\]"
-      \ contained
-      \ contains=stylusExplicitVariable,stylusVariable,stylusUnitInt,stylusParenthesised,stylusPropertyLookup,stylusFunctionName
-      \ keepend
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional,stylusOperatorAssignment,stylusHashDotGetter
-      \ oneline
-      \ skipwhite
-
-" ===============================================
-" UNITS
-" ===============================================
-
-syntax match stylusUnitInt "[-+]\=\d\+%\="
-      \ contained
-      \ nextgroup=stylusOperatorRange,stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
-      \ skipwhite
-
-syntax match stylusUnitInt "\<PI\>"
-      \ contained
-      \ nextgroup=stylusOperatorRange,stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
-      \ skipwhite
-
-highlight def link stylusUnitInt Number
-
-syntax match stylusUnitFloat "[-+]\=\d\=\.\d\+%\="
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
-      \ skipwhite
-
-highlight def link stylusUnitFloat Number
-
-execute 'syntax match stylusUnitName "\(\<\|\d\@<=\)\(' . join(g:css_units, '\|') . '\)\>"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
-      \ skipwhite'
-
-highlight def link stylusUnitName Number
-
-" Resolve 'in' unit name and operator conflict
-syntax match stylusOperatorExistence "\s\@<=\<in\>"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName
-      \ skipwhite
-
-" ===============================================
-" BOOLEAN
-" ===============================================
-
-syntax match stylusBoolean "\<\(true\|false\|null\)\>"
-      \ contained
-      \ nextgroup=stylusOperatorRelational,stylusOperatorAssignment,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusFunctionName,stylusConditional
-      \ skipwhite
-
-highlight def link stylusBoolean Boolean
-
-" ===============================================
-" SELECTORS
-" ===============================================
-
-" HTML or SVG elements
-execute 'syn match stylusSelectorElement "\<\(' . join(g:html_elements, '\|') . '\)\(\>\|#\@=\)"
-      \ contained
-      \ keepend
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
-      \ oneline
-      \ skipwhite'
-
-syn match stylusSelectorElement "\(^\|\s\)\@<=\*\($\|\s\)\@="
-      \ contained
-      \ keepend
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
-      \ oneline
-      \ skipwhite
-
-highlight def link stylusSelectorElement Statement
-
-" CSS Class
-syntax region stylusSelectorClass start="\." skip="\w-\@=" end="\(\w\|-+\)\(\W\|$\)\@="
-      \ contained
-      \ keepend
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional,stylusOptional
-      \ oneline
-      \ skipwhite
-
-syntax match stylusSelectorClass "\.{\@="
-      \ contained
-      \ nextgroup=stylusInterpolationSelectors
-
-highlight def link stylusSelectorClass Identifier
-
-" CSS Id
-syntax region stylusSelectorId start="#" skip="\w-\@=" end="\(\w\|-+\)\(\W\|$\)\@="
-      \ contained
-      \ keepend
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
-      \ oneline
-      \ skipwhite
-
-syntax match stylusSelectorId "#{\@="
-      \ contained
-      \ nextgroup=stylusInterpolationSelectors
-
-highlight def link stylusSelectorId Identifier
-
-" Attribute selectors
-syntax match stylusSelectorAttributeOperator "\(=\|\~=\||=\|\^=\|\$=\|\*=\)"
-      \ contained
-
-highlight def link stylusSelectorAttributeOperator Operator
-
-syntax region stylusSelectorAttribute matchgroup=stylusEnclosure start="\[" skip="{.\{-}}" end="\]"
-      \ contained
-      \ contains=stylusSelectorAttributeOperator,stylusInterpolation
-      \ keepend
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
-      \ oneline
-      \ skipwhite
-
-highlight def link stylusSelectorAttribute Type
-
-" Parent reference
-syntax match stylusSelectorReference "\(&\|\~/\|\(\.\./\)\+\|/\)"
-      \ contained
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
-      \ skipwhite
-
-highlight def link stylusSelectorReference Statement
-
-" Partial reference
-syntax region stylusSelectorPartialReference matchgroup=stylusSelectorReference start="\^\[\@=" skip="{.\{-}}" matchgroup=NONE end="\]"
-      \ contained
-      \ contains=stylusEnclosure,stylusUnitInt,stylusInterpolation
-      \ keepend
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
-      \ oneline
-      \ skipwhite
-
-syntax region stylusSelectorClass start="\(&\|\~/\|\(\.\./\)\+\|/\)" skip="\w[-()]\@=" end="\(\w\|(\|)\)\(\W\|$\)\@="
-      \ contained
-      \ contains=stylusSelectorReference
-      \ keepend
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusOptional
-      \ oneline
-      \ skipwhite
-
-" CSS pseudo classes and elements
-execute 'syntax match stylusSelectorPseudo ":\(' . join(g:css_pseudo, '\|') . '\)-\@!"
-      \ contained
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusSelectorPseudo,stylusOptional
-      \ skipwhite'
-
-syntax match stylusSelectorPseudo ":\(\(first\|last\|only\)-\(child\|of-type\)\)"
-      \ contained
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusSelectorPseudo,stylusOptional
-      \ skipwhite
-
-syntax match stylusSelectorPseudo ":not(.\{-})"
-      \ contained
-      \ contains=stylusSelectorElement,stylusEnclosure,stylusInterpolationSelectors
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusSelectorPseudo,stylusOptional
-      \ skipwhite
-
-syntax match stylusSelectorPseudo ":lang(.\{-})"
-      \ contained
-      \ contains=stylusEnclosure,stylusInterpolationSelectors
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusSelectorPseudo,stylusOptional
-      \ skipwhite
-
-syntax match stylusSelectorPseudo ":\(nth-last-\|nth-\)\(child\|of-type\)(.\{-})"
-      \ contained
-      \ contains=stylusUnitInt,stylusEnclosure,stylusInterpolationSelectors
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusSelectorPseudo,stylusOptional
-      \ skipwhite
-
-syntax match stylusSelectorPseudo /::\=\(first-\(line\|letter\)\|before\|after\|selection\|placeholder\)/
-      \ contained
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusSelectorPseudo,stylusOptional
-      \ skipwhite
-
-highlight def link stylusSelectorPseudo Define
-
-" CSS Selector operators
-syntax match stylusSelectorCombinator "[>\~+|,]"
-      \ contained
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusExplicitVariable
-      \ skipwhite
-
-highlight def link stylusSelectorCombinator Operator
-
-" ===============================================
-" PROPERTIES
-" ===============================================
-
-execute 'syntax match stylusProperty "\<\(' . join(g:css_single_props, '\|') . '\)\>-\@!:\="
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationProperties,stylusFunctionName
-      \ skipwhite'
-
-execute 'syntax match stylusProperty "\<\(' . join(g:css_multi_props, '\|') . '\)\>-\@!:\="
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationProperties,stylusFunctionName
-      \ skipwhite'
-
-execute 'syntax match stylusProperty "\<\(' . join(g:svg_props, '\|') . '\)\>-\@!:\="
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationProperties,stylusFunctionName
-      \ skipwhite'
-
-syntax match stylusProperty "\(-webkit-\|-moz-\|-o-\|-ms-\|-khtml-\)\(\w\|-\)*:\="
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationProperties,stylusFunctionName
-      \ skipwhite
-
-highlight def link stylusProperty Type
-
-" ===============================================
-" PROPERTY LOOKUP
-" ===============================================
-
-execute 'syntax match stylusPropertyLookup "@\(' . join(g:css_props, '\|') . '\)\>-\@!"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
-      \ skipwhite'
-
-execute 'syntax match stylusPropertyLookup "@\(' . join(g:svg_props, '\|') . '\)\>-\@!"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
-      \ skipwhite'
-
-syntax match stylusPropertyLookup "@\(-webkit-\|-moz-\|-o-\|-ms-\|-khtml-\)\(\w\|-\)*"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
-      \ skipwhite
-
-highlight def link stylusPropertyLookup Type
-
-" ===============================================
-" VALUES
-" ===============================================
-
-execute 'syntax match stylusValues "\<\(' . join(g:css_values, '\|') . '\)\>-\@!"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName
-      \ skipwhite'
-
-execute 'syntax match stylusValues "\<\(' . join(g:css_animatable_props, '\|') . '\)\>-\@!"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName
-      \ skipwhite'
-
-highlight def link stylusValues PreCondit
-
-" ===============================================
-" COLORS
-" ===============================================
-
-" Named
-execute 'syntax match stylusColor "\<\(' . join(g:css_colors, '\|') . '\)\>-\@!"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusOperatorAdditive,stylusImportant,stylusFunctionName,stylusConditional
-      \ skipwhite'
-
-syntax match stylusColor "\<transparent\>"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusOperatorAdditive,stylusImportant,stylusFunctionName,stylusConditional
-      \ skipwhite
-
-" Hexadecimal
-syntax match stylusColor "#\x\{3,6\}\>"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusOperatorAdditive,stylusImportant,stylusFunctionName,stylusConditional
-      \ skipwhite
-
-highlight stylusColor term=underline ctermfg=133 guifg=#b169b2
-
-" ===============================================
-" FONT
-" ===============================================
-
-" Highlight generic font families
-syntax match stylusFont "\<\(serif\|sans-serif\|monospace\)\>"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
-      \ skipwhite
-
-highlight def link stylusFont Directory
-
-" ===============================================
-" Explicitly point out that the word before assignment operator is a variable
-syntax match stylusVariable "\<\(\w\|-\)*\(\s\=[:?]\==[^=]\)\@="
-      \ contained
-      \ nextgroup=stylusOperatorAssignment
-      \ skipwhite
-" ===============================================
-
-" ===============================================
-" IMPORTANT
-" ===============================================
-
-syntax match stylusImportant "!important"
-      \ contained
-
-highlight def link stylusImportant Special
-
-" ===============================================
-" INTERPOLATION
-" ===============================================
-
-" Prepend is always a property
-syntax match stylusProperty "\(\w\|-\)\+{\@="
-      \ contained
-      \ nextgroup=stylusInterpolationProperties
-
-syntax region stylusInterpolation matchgroup=stylusEnclosure start="{" end="}"
-      \ contained
-      \ contains=stylusVariable,stylusExplicitVariable,stylusOperatorUnary,stylusUnitInt,stylusUnitFloat,stylusParenthesised,stylusConditional,stylusFunctionName
-      \ keepend
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationSelectorsTail,stylusInterpolationPropertiesTail,stylusFunctionName
-      \ oneline
-      \ skipwhite
-
-syntax region stylusInterpolationSelectors matchgroup=stylusEnclosure start="{" end="}"
-      \ contained
-      \ contains=stylusVariable,stylusExplicitVariable,stylusOperatorUnary,stylusUnitInt,stylusUnitFloat,stylusParenthesised,stylusConditional,stylusFunctionName
-      \ keepend
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectorsTail
-      \ oneline
-      \ skipwhite
-
-syntax region stylusInterpolationProperties matchgroup=stylusEnclosure start="{" end="}"
-      \ contained
-      \ contains=stylusVariable,stylusExplicitVariable,stylusOperatorUnary,stylusUnitInt,stylusUnitFloat,stylusParenthesised,stylusConditional,stylusFunctionName
-      \ keepend
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusProperty,stylusInterpolationPropertiesTail,stylusFunctionName
-      \ oneline
-      \ skipwhite
-
-syntax match stylusInterpolationPropertiesTail "}\@<=\(\w\|-\)\+"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusProperty,stylusInterpolationProperties,stylusFunctionName
-      \ skipwhite
-
-highlight def link stylusInterpolationPropertiesTail Type
-
-" Tail is a selector by default
-syntax match stylusInterpolationSelectorsTail "}\@<=\(\w\|-\)\+"
-      \ contained
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors
-      \ skipwhite
-
-highlight def link stylusInterpolationSelectorsTail Identifier
-
-" Tail is a property if followed by anything
-syntax match stylusInterpolationPropertiesTail "}\@<=\(\w\|-\)\+:\=\s\S\@="
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusProperty,stylusInterpolationProperties,stylusFunctionName
-      \ skipwhite
-
-" Tail is a selector if followed by .#[]$~^&
-syntax match stylusInterpolationSelectorsTail "}\@<=\(\w\|-\)\+:\=\s[\.#\[~^&+|,>]\@="
-      \ contained
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors
-      \ skipwhite
-
-" Tail is a property if followed by float number
-syntax match stylusInterpolationPropertiesTail "}\@<=\(\w\|-\)\+:\=\s\(\.\d\)\@="
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusProperty,stylusInterpolationProperties,stylusFunctionName
-      \ skipwhite
-
-" Tail is a property if followed by hex color
-syntax match stylusInterpolationPropertiesTail "}\@<=\(\w\|-\)\+:\=\s\(#\x\{3,6}\)\@="
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusProperty,stylusInterpolationProperties,stylusFunctionName
-      \ skipwhite
-
-execute 'syntax match stylusInterpolationSelectorsTail "}\@<=\(\w\|-\)\+:\=\s\(' . join(g:html_elements, '\|') . '\)\@="
-      \ contained
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors
-      \ skipwhite'
-
-" ===============================================
-" MIXINS & FUNCTIONS
-" ===============================================
-
-syntax match stylusFunctionBlock "+"
-      \ contained
-
-highlight def link stylusFunctionBlock Operator
-
-syntax match stylusFunctionRest "\w\@<=\.\.\."
-      \ contained
-
-highlight def link stylusFunctionRest Operator
-
-syntax match stylusFunctionName "\(\<\|+\)\(\w\|\$\)\(-\|\w\|\$\)\{-}(\@="
-      \ contained
-      \ contains=stylusFunctionBlock
-      \ nextgroup=stylusFunctionProps
-
-syntax match stylusFunctionName "@\{-}(\@="
-      \ contained
-      \ contains=stylusFunctionBlock
-      \ nextgroup=stylusFunctionProps
-
-highlight def link stylusFunctionName Function
-
-syntax region stylusFunctionProps matchgroup=stylusEnclosure start="\S\@<=(" end=")"
-      \ contained
-      \ contains=stylusOperatorUnary,stylusVariable,stylusExplicitVariable,stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusColor,stylusFunctionName,stylusFunctionRest,stylusValues
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusSubscript,stylusConditional,stylusOperatorRelational
-      \ skipwhite
-
-
-" ===============================================
-" PARENTHESISED EXPRESSIONS
-" ===============================================
-
-syntax region stylusParenthesised matchgroup=stylusEnclosure start="\W\@<=(" skip=/["'].\{-}["']/ end=")"
-      \ contained
-      \ contains=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
-      \ keepend
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusUnitName,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
-      \ oneline
-      \ skipwhite
-
-" Resolve '%' unit name and operator conflict
-syntax match stylusUnitName ")\@<=%"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional
-      \ skipwhite
-" ===============================================
-" STRINGS
-" ===============================================
-
-syntax region stylusString start=/\('\|"\)/ end=/\('\|"\)/
-      \ containedin=ALLBUT,stylusComment,stylusHash,stylusHashStringKey
-      \ contains=stylusSprintfPlaceholder
-      \ keepend
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusOperatorAdditive,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorTernary,stylusSprintfDefinition,stylusImportant,stylusFunctionName,stylusConditional
-      \ oneline
-      \ skipwhite
-
-highlight def link stylusString String
-
-" ===============================================
-" HASHES
-" ===============================================
-
-syntax match stylusHashKey "\a\w\{-}:"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName,stylusHash,stylusString
-      \ skipwhite
-
-highlight def link stylusHashKey NonText
-
-syntax region stylusHashStringKey start=/\('\|"\)/ end=/\('\|"\):/
-      \ contained
-      \ keepend
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusBoolean,stylusFunctionName,stylusHash,stylusString
-      \ oneline
-      \ skipwhite
-
-highlight def link stylusHashStringKey String
-
-syntax match stylusHashDotGetter "\S\@<=\."
-      \ contained
-      \ nextgroup=stylusHashIdent
-
-highlight def link stylusHashDotGetter Operator
-
-syntax match stylusHashComma ","
-      \ contained
-      \ nextgroup=stylusHashKey,stylusHashStringKey
-      \ skipwhite
-
-syntax match stylusHashIdent "\<\(\w\|-\|\$\)*\>"
-      \ contained
-      \ nextgroup=stylusColor,stylusUnitInt,stylusUnitFloat,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusOperatorAssignment,stylusPropertyLookup,stylusParenthesised,stylusOperatorAdditive,stylusOperatorMultiplicative,stylusSubscript,stylusOperatorRelational,stylusOperatorLogical,stylusOperatorExistence,stylusOperatorInstance,stylusOperatorVarDefinition,stylusOperatorTernary,stylusImportant,stylusFunctionName,stylusConditional,stylusHashDotGetter
-      \ skipwhite
-
-highlight def link stylusHashIdent NonText
-
-syntax region stylusHash matchgroup=stylusEnclosure start="{" end="}"
-      \ contained
-      \ contains=stylusHashKey,stylusHashStringKey,stylusHash,stylusHashComma
-      \ skipwhite
-
-" ===============================================
-" @ RULES
-" ===============================================
-
-syntax match stylusAtRuleImport "@\(import\|require\)\>"
-      \ containedin=ALLBUT,stylusString,stylusComment
-      \ nextgroup=stylusFunctionName,stylusVariable,stylusExplicitVariable
-      \ skipwhite
-
-highlight def link stylusAtRuleImport Macro
-
-syntax match stylusAtRuleMedia "@media\>"
-      \ contained
-      \ nextgroup=stylusAtRuleMediaType,stylusAtRuleMediaFeatureExpression
-      \ skipwhite
-
-highlight def link stylusAtRuleMedia Macro
-
-syntax match stylusAtRuleMediaType "\<\(all\|print\|screen\|speech\)\>"
-      \ contained
-      \ nextgroup=stylusAtRuleMediaType,stylusAtRuleMediaFeatureExpression,stylusAtRuleMediaLogical
-      \ skipwhite
-
-highlight def link stylusAtRuleMediaType Macro
-
-syntax match stylusAtRuleMediaLogical "\<\(and\|not\|only\)\>"
-      \ contained
-      \ nextgroup=stylusAtRuleMediaType,stylusAtRuleMediaFeatureExpression,stylusAtRuleMediaLogical
-      \ skipwhite
-
-highlight def link stylusAtRuleMediaLogical Operator
-
-syntax region stylusAtRuleMediaFeatureExpression matchgroup=stylusEnclosure start="(" end=")"
-      \ contained
-      \ contains=stylusAtRuleMediaFeature,stylusInterpolationProperties,stylusInterpolationPropertiesTail
-      \ nextgroup=stylusAtRuleMediaComma,stylusAtRuleMediaLogical
-      \ oneline
-      \ skipwhite
-
-execute 'syntax match stylusAtRuleMediaFeature "\(min-\|max-\)\=\(' . join(g:css_media_features, '\|') . '\)\>:"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationProperties,stylusFunctionName
-      \ skipwhite'
-
-syntax match stylusAtRuleMediaFeature "\(\w\|-\)\+{\@="
-      \ contained
-      \ nextgroup=stylusInterpolationProperties
-
-syntax match stylusAtRuleMediaFeature "}\@<=:"
-      \ contained
-      \ nextgroup=stylusUnitInt,stylusUnitFloat,stylusColor,stylusValues,stylusFont,stylusVariable,stylusExplicitVariable,stylusPropertyLookup,stylusParenthesised,stylusOperatorUnary,stylusInterpolationProperties,stylusFunctionName
-      \ skipwhite
-
-highlight def link stylusAtRuleMediaFeature Type
-
-syntax match stylusAtRuleMediaComma ","
-      \ contained
-      \ nextgroup=stylusAtRuleMediaFeatureExpression
-      \ skipwhite
-
-syntax match stylusAtRuleFont "@font-face\>"
-      \ containedin=ALLBUT,stylusString,stylusComment
-
-highlight def link stylusAtRuleFont Macro
-
-syntax match stylusAtRuleKeyframes "@\(-\(o\|webkit\|moz\)-\)\=keyframesi\>"
-      \ contained
-      \ nextgroup=stylusAtRuleKeyframesName,stylusInterpolationSelectors
-      \ skipwhite
-
-highlight def link stylusAtRuleKeyframes Macro
-
-syntax match stylusAtRuleKeyframesName "\<\(\w\|-\|\$\)*\>"
-      \ contained
-      \ nextgroup=stylusInterpolationSelectors
-      \ skipwhite
-
-highlight def link stylusAtRuleKeyframesName Identifier
-
-syntax match stylusAtRuleKeyframesOffset "\d\{1,3}%"
-      \ contained
-
-syntax match stylusAtRuleKeyframesOffset "\<\(from\|to\)\>"
-      \ contained
-
-highlight def link stylusAtRuleKeyframesOffset Macro
-
-syntax match stylusAtRuleNamespace "@namespace\>"
-      \ contained
-      \ nextgroup=stylusAtRuleNamespacePrefix,stylusAtRuleNamespaceUrl
-      \ skipwhite
-
-highlight def link stylusAtRuleNamespace Macro
-
-syntax match stylusAtRuleNamespacePrefix "\<\(\w\|-\|\$\)*\>"
-      \ contained
-      \ nextgroup=stylusAtRuleNamespaceUrl
-      \ skipwhite
-
-highlight def link stylusAtRuleNamespacePrefix Macro
-
-syntax match stylusAtRuleNamespaceUrl "\<url(\@="
-      \ contained
-      \ nextgroup=stylusAtRuleNamespaceUrlAdress
-
-highlight def link stylusAtRuleNamespaceUrl Function
-
-syntax region stylusAtRuleNamespaceUrlAdress matchgroup=stylusEnclosure start="(" end=")"
-      \ contained
-
-highlight def link stylusAtRuleNamespaceUrlAdress String
-
-syntax match stylusAtRuleSupports "@supports\>"
-      \ contained
-      \ nextgroup=stylusAtRuleSupportsLogic,stylusAtRuleSupportsDeclaration
-      \ skipwhite
-
-highlight def link stylusAtRuleSupports Macro
-
-syntax region stylusAtRuleSupportsDeclaration matchgroup=stylusEnclosure start="(" end=")"
-      \ contained
-      \ contains=stylusProperty,stylusAtRuleSupportsLogic,stylusAtRuleSupportsDeclaration
-      \ nextgroup=stylusAtRuleSupportsLogic,stylusAtRuleSupportsDeclaration
-      \ oneline
-      \ skipwhite
-
-syntax match stylusAtRuleSupportsLogic "\<\(and\|not\|or\)\>"
-      \ contained
-      \ nextgroup=stylusAtRuleSupportsLogic,stylusAtRuleSupportsDeclaration
-      \ skipwhite
-
-highlight def link stylusAtRuleSupportsLogic Operator
-
-syntax match stylusAtRuleDocument "@document\>"
-      \ contained
-      \ nextgroup=stylusAtRuleDocumentFunc
-      \ skipwhite
-
-highlight def link stylusAtRuleDocument Macro
-
-syntax match stylusAtRuleDocumentFunc "\<\(url\|url-prefix\|domain\|regexp\)(\@="
-      \ contained
-      \ nextgroup=stylusAtRuleNamespaceUrlAdress
-
-highlight def link stylusAtRuleDocumentFunc Function
-
-syntax match stylusAtRulePage "@page\>"
-      \ contained
-      \ nextgroup=stylusAtRulePagePseudo
-      \ skipwhite
+syn case ignore
+syn region cssString start='"' end='"' contained
+syn region cssString start="'" end="'" contained
+
+" HTML4 tags
+syn keyword cssTagName abbr acronym address applet area base a b
+syn keyword cssTagName basefont bdo big blockquote body button br
+syn keyword cssTagName caption cite code col colgroup dd del
+syn keyword cssTagName dfn dir div dl dt em fieldset form frame
+syn keyword cssTagName frameset h1 h2 h3 h4 h5 h6 head hr html img i
+syn keyword cssTagName iframe img input ins isindex kbd label legend li
+syn keyword cssTagName link map menu meta noframes noscript ol optgroup
+syn keyword cssTagName option p param pre q s samp script select
+syn keyword cssTagName span strike strong style sub sup tbody td
+syn keyword cssTagName textarea tfoot th thead title tr tt ul u var
+syn match cssTagName "\*"
+syn match cssTagName /\<table\>/
+syn match cssTagName /\<small\>/
+syn match cssTagName /\<center\>/
+" HTML5 tags
+syn keyword cssTagName article aside audio bb canvas command datagrid
+syn keyword cssTagName datalist details dialog embed figure footer figcaption
+syn keyword cssTagName header hgroup keygen mark meter nav output
+syn keyword cssTagName progress time rt rp section time video
+syn match cssTagName /\<ruby\>/
+" class select
+syn match cssSelector /\.[A-Za-z][A-Za-z0-9_-]\+/
+" id select
+syn match cssSelector /#[A-Za-z][A-Za-z0-9_-]\+/
+syn region cssSelector start='\[' end='\]' contains=cssString
+
+syn region cssDefineBlock start="{" end="}" transparent contains=TOP
+
+syn keyword cssCommonVal inherit initial auto both normal hidden none medium contained
+
+
+" Comment
+syn keyword cssTodo FIXME TODO contained
+syn region cssComment start="/\*" end="\*/" contains=cssTodo
+syn match cssImportant "!\s*important\>" contained
+
+syn match cssValueInteger "[-+]\=\d\+" contained
+syn match cssValueNumber "[-+]\=\d\+\(\.\d*\)\="
+syn match cssValueLength "[-+]\=\d\+\(\.\d*\)\=\(%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|rem\|vh\|vw\|vm\|fr\|gr\)" contained
+syn match cssValueAngle "[-+]\=\d\+\(\.\d*\)\=\(deg\|grad\|rad\|turn\)" contained
+syn match cssValueTime "+\=\d\+\(\.\d*\)\=\(ms\|s\)" contained
+syn match cssValueFrequency "+\=\d\+\(\.\d*\)\=\(Hz\|kHz\)" contained
+
+
+" Properties http://www.w3.org/community/webed/wiki/CSS/Properties
+" background http://www.w3.org/TR/css3-background/
+syn match cssBackgroundProp /\(background-\(color\|image\|repeat\|attachment\|position\)\|background\)/ contained
+syn match cssBackgroundProp /background-\(origin\|\(repeat\|position\)-[xy]\|clip\|size\)/ contained
+syn match cssBackgroundProp /object-\(fit\|position\)/ contained
+" http://www.evotech.net/blog/2010/02/css3-properties-values-browser-support/
+syn keyword cssBackgroundVal tb lr rl snap cover contain widthLength heightLength contained
+syn match cssBackgroundVal /\(scale-down\|from-image\)/ contained
+syn match cssBackgroundVal /repeat-[xy]/ contained
+syn match cssBackgroundVal /no-repeat/ contained
+syn keyword cssBackgroundVal circle ellipse to at contained
+syn match cssBackgroundVal /\(closest\|farthest\)-\(side\|corner\)/ contained
+
+syn region cssFuncVal start="\(url\|calc\|min\|max\|counter\|cycle(\)" end=")" oneline contained contains=cssString,cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency
+syn region cssFuncVal start="\(linear\|radial\|repeating-linear\|repeating-radial\)-gradient(" end=")" oneline contained contains=cssString,cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency,cssVisualProp,cssColorVal
+
+syn match cssBorderProp /\(border-\(color\|style\|width\|radius\)\|border\)/ contained
+syn match cssBorderProp /border-\(image-\(source\|slice\|width\|outset\|repeat\)\|image\)/ contained
+syn match cssBorderProp /border-\(\(top\|right\|bottom\|left\)-\(color\|style\|width\)\|\(top\|right\|bottom\|left\)\)/ contained
+syn match cssBorderProp /border-\(top\|bottom\)-\(left\|right\)-radius/ contained
+syn keyword cssBorderVal dotted dashed solid double groove ridge inset outset contained
+syn match cssBorderVal /\<collapse\>/ contained
+syn match cssBorderVal /\<separate\>/ contained
+syn match cssBorderVal /\<fill\>/ contained
+
+" Font
+syn match cssFontProp /\(font-\(family\|style\|variant\|weight\|size-adjust\|size\|stretch\)\|font\)/ contained
+syn match cssFontVal /\(sans-serif\|small-caps\)/ contained
+syn match cssFontVal /\<x\{1,2\}-\(large\|small\)\>/ contained
+syn keyword cssFontVal cursive fantasy monospace italic oblique serif contained
+syn keyword cssFontVal bold bolder lighter larger smaller contained
+syn keyword cssFontVal icon narrower wider contained
+
+" Color
+syn match cssColorVal /transparent/ contained
+syn match cssColorVal "#[0-9A-Fa-f]\{3\}\>" contained
+syn match cssColorVal "#[0-9A-Fa-f]\{6\}\>" contained
+syn match cssFuncVal /rgb(\(\d\{1,3\}\s*,\s*\)\{2\}\d\{1,3\})/ contained contains=cssString,cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency
+syn match cssFuncVal /rgba(\(\d\{1,3\}\s*,\s*\)\{3\}\(1\|0\(\.\d\+\)\?\))/ contained contains=cssString,cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency
+syn match cssFuncVal /hsl(\d\{1,3\}\s*,\s*\(100\|\d\{1,2\}\(\.\d\+\)\?\)%\s*,\s*\(100\|\d\{1,2\}\(\.\d\+\)\?\)%)/ contained contains=cssString,cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency
+syn match cssFuncVal /hsla(\d\{1,3\}\s*,\s*\(\(100\|\d\{1,2\}\(\.\d\+\)\?\)%\s*,\s*\)\{2\}\(1\|0\(\.\d\+\)\?\))/ contained contains=cssString,cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency
+syn keyword cssColorVal aliceblue antiquewhite aqua aquamarine azure contained
+syn keyword cssColorVal beige bisque black blanchedalmond blue blueviolet brown burlywood contained
+syn keyword cssColorVal cadetblue chartreuse chocolate coral cornflowerblue cornsilk crimson cyan contained
+syn match cssColorVal /dark\(blue\|cyan\|goldenrod\|gray\|green\|grey\|khaki\)/ contained
+syn match cssColorVal /dark\(magenta\|olivegreen\|orange\|orchid\|red\|salmon\|seagreen\)/ contained
+syn match cssColorVal /darkslate\(blue\|gray\|grey\)/ contained
+syn match cssColorVal /dark\(turquoise\|violet\)/ contained
+syn keyword cssColorVal deeppink deepskyblue dimgray dimgrey dodgerblue firebrick contained
+syn keyword cssColorVal floralwhite forestgreen fuchsia gainsboro ghostwhite gold contained
+syn keyword cssColorVal goldenrod gray green greenyellow grey honeydew hotpink contained
+syn keyword cssColorVal indianred indigo ivory khaki lavender lavenderblush lawngreen contained
+syn keyword cssColorVal lemonchiffon lime limegreen linen magenta maroon contained
+syn match cssColorVal /light\(blue\|coral\|cyan\|goldenrodyellow\|gray\|green\)/ contained
+syn match cssColorVal /light\(grey\|pink\|salmon\|seagreen\|skyblue\|yellow\)/ contained
+syn match cssColorVal /light\(slategray\|slategrey\|steelblue\)/ contained
+syn match cssColorVal /medium\(aquamarine\|blue\|orchid\|purple\|seagreen\)/ contained
+syn match cssColorVal /medium\(slateblue\|springgreen\|turquoise\|violetred\)/ contained
+syn keyword cssColorVal midnightblue mintcream mistyrose moccasin navajowhite contained
+syn keyword cssColorVal navy oldlace olive olivedrab orange orangered orchid contained
+syn match cssColorVal /pale\(goldenrod\|green\|turquoise\|violetred\)/ contained
+syn keyword cssColorVal papayawhip peachpuff peru pink plum powderblue purple contained
+syn keyword cssColorVal red rosybrown royalblue saddlebrown salmon sandybrown contained
+syn keyword cssColorVal seagreen seashell sienna silver skyblue slateblue contained
+syn keyword cssColorVal slategray slategrey snow springgreen steelblue tan contained
+syn keyword cssColorVal teal thistle tomato turquoise violet wheat contained
+syn keyword cssColorVal whitesmoke yellow yellowgreen contained
+syn match cssColorVal "\<white\>" contained
+syn keyword cssColorProp color opaticy contained
+syn match cssColorProp /color-profile/ contained
+
+" Box
+syn match cssBoxProp /\(\(margin\|padding\)-\(top\|right\|bottom\|left\)\|\(margin\|padding\)\)/ contained
+syn match cssBoxProp /\(min\|max\)-\(width\|height\)/ contained
+syn match cssBoxProp /box-\(align\|decoration-break\|direction\|flex-group\|flex\|lines\)/ contained
+syn match cssBoxProp /box-\(ordinal-group\|orient\|pack\|shadow\|sizing\)/ contained
+syn match cssBoxProp /\(outline-\(color\|offset\|style\|width\)\|outline\)/ contained
+syn keyword cssBoxProp width height contained
+
+" Text
+syn match cssTextProp /text-\(align-last\|align\|decoration\|emphasis\|height\|indent\|justify\|outline\|shadow\|transform\|wrap\|overflow\)\|text/ contained
+syn match cssTextProp /\(line-stacking-\(ruby\|shift\|strategy\)\|line-stacking\|line-height\)/ contained
+syn match cssTextProp /vertical-align/ contained
+syn match cssTextProp /letter-spacing/ contained
+syn match cssTextProp /user-select/ contained
+syn match cssTextProp /white-\(space-collapse\|space\)/ contained
+syn match cssTextProp /word-\(break\|spacing\|wrap\)/ contained
+syn match cssTextProp "\<word-wrap\>" contained
+syn match cssTextVal "\<break-word\>" contained
+syn match cssTextVal "\<break-all\>" contained
+syn match cssTextVal "\<line-through\>" contained
+syn match cssTextVal /text-\(top\|bottom\)/ contained
+syn keyword cssTextVal uppercase lowercase ellipsis middle contained
+
+" List
+syn match cssListProp /\(list-style-\(type\|image\|position\)\|list-style\)/ contained
+syn keyword cssListVal armenian circle disc georgian hebrew square contained
+syn match cssListVal /cjk-ideographic/ contained
+syn match cssListVal /\(decimal-leading-zero\|decimal\)/ contained
+syn match cssListVal /\(\(hiragana\|katakana\)-iroha\|\(hiragana\|katakana\)\)/ contained
+syn match cssListVal /\(lower\|upper\)-\(alpha\|latin\|roman\)/ contained
+syn match cssListVal /lower-greek/ contained
+
+" Visual formatting
+syn keyword cssVisualProp display position top right bottom left float clear clip contained
+syn keyword cssVisualProp zoom visibility cursor direction outline resize contained
+syn keyword cssVisualProp opacity contained
+syn match cssVisualProp /z-index/ contained
+syn match cssVisualProp /\(overflow-\(style\|[xy]\)\|overflow\)/ contained
+syn keyword cssVisualVal inline block compact contained
+syn match cssVisualVal '\<table\>' contained
+syn match cssVisualVal /\(inline-\(block\|table\)\|list-item\|run-in\)/ contained
+syn match cssVisualVal /table-\(row-group\|header-group\|footer-group\|row\|column-group\|column\|cell\|caption\)/ contained
+syn match cssVisualVal /\<ruby\>-\(base-group\|text-group\|base\|text\)/  contained
+syn keyword cssVisualVal static relative absolute fixed contained
+syn keyword cssVisualVal ltr rtl embed bidi-override pre nowrap contained
+syn keyword cssVisualVal crosshair help move pointer progress wait contained
+syn keyword cssVisualVal e-resize n-resize ne-resize nw-resize s-resize se-resize sw-resize w-resize contained
+
+" Table
+syn match cssTableProp /border-\(collapse\|spacing\)/ contained
+syn match cssTableProp /\(table-layout\|caption-side\|empty-cells\)/ contained
+
+" Generated content
+syn match cssCommonProp /counter-\(reset\|increment\)/ contained
+syn keyword cssCommonProp content quotes contained
+
+" Print
+syn match cssPrintProp /break-\(before\|after\|inside\)/
+syn match cssPrintProp /\(page-break-\(before\|after\|inside\)\|page-policy\)/
+syn keyword cssPrintProp orphans windows
+
+" special keywords
+syn match cssSpecialProp /-\(webkit\|moz\|ms\|o\)-/
+syn match cssRuleProp /@\(media\|font-face\|charset\|import\|page\|namespace\)/
+" http://www.w3.org/TR/selectors/
+syn match cssPseudo /:\(link\|visited\|active\|hover\|focus\|before\|after\)/
+syn match cssPseudo /:\(target\|lang\|enabled\|disabled\|checked\|indeterminate\)/
+syn match cssPseudo /:\(root\|\(first\|last\|only\)-\(child\|of-type\)\|empty\)/
+syn match cssPseudo /:\(nth-last-\|nth-\)\(child\|of-type\)(\<\S\+\>)/
+syn match cssPseudo /:not(\<\S*\>)/
+syn match cssPseudo /:first-\(line\|letter\)/
+syn match cssPseudo /::\(first-\(line\|letter\)\|before\|after\|selection\)/
+
+" CSS3 Advanced http://meiert.com/en/indices/css-properties/
+syn keyword cssAdvancedProp appearance azimuth binding bleed columns crop hyphens icon
+syn keyword cssAdvancedProp phonemes resize richness size volumne
+syn match cssAdvancedProp /\(animation-\(delay\|direction\|duration\|name\|iteration-count\|play-state\|timing-function\)\|animation\)/
+syn match cssAdvancedProp /alignment-\(adjust\|baseline\)/
+syn match cssAdvancedProp /\(backface-visibility\baseline-shift\)/
+syn match cssAdvancedProp /bookmark-\(label\|level\|state\|target\)/
+syn match cssAdvancedProp /column-\(count\|fill\|gap\|rule-\(color\|style\|width\)\|rule\|span\|width\)/
+syn match cssAdvancedProp /\(cue-\(after\|before\)\|cue\)/
+syn match cssAdvancedProp /dominant-baseline/
+syn match cssAdvancedProp /drop-initial-\(size\|value\|\(after\|before\)-\(adjust\|align\)\)/
+syn match cssAdvancedProp /\(fit-position\|fit\)/
+syn match cssAdvancedProp /\(float-offset\|hanging-punctuation\)/
+syn match cssAdvancedProp /grid-\(columns\|rows\)/
+syn match cssAdvancedProp /hyphenate-\(after\|before\|character\|lines\|resource\)/
+syn match cssAdvancedProp /image-\(orientation\|rendering\|resolution\)/
+syn match cssAdvancedProp /inline-box-align/
+syn match cssAdvancedProp /\(mark-\(after\|before\)\|mark\|marks\)/
+syn match cssAdvancedProp /marquee-\(direction\|loop\|play-count\|speed\|style\)/
+syn match cssAdvancedProp /move-to/
+syn match cssAdvancedProp /nav-\(down\|index\|left\|right\|up\)/
+syn match cssAdvancedProp /\(pause-\(after\|before\)\|pause\)/
+syn match cssAdvancedProp /\(perspective-origin\|perspective\)/
+syn match cssAdvancedProp /\(pitch-range\|pitch\)/
+syn match cssAdvancedProp /presentation-level/
+syn match cssAdvancedProp /punctuation-trim/
+syn match cssAdvancedProp /rendering-intent/
+syn match cssAdvancedProp /pointer-events/
+syn match cssAdvancedProp /\(rest-\(after\|before\)\|rest\)/
+syn match cssAdvancedProp /\(rotation-point\|rotation\)/
+syn match cssAdvancedProp /ruby-\(align\|overhang\|position\|span\)/
+syn match cssAdvancedProp /\(target-\(name\|new\|position\)\|target\)/
+syn match cssAdvancedProp /\(transform-\(origin\|style\)\|transform\)/
+syn match cssAdvancedProp /\(transition-\(delay\|duration\|property\|timing-function\)\|transition\)/
+syn match cssAdvancedProp /voice-\(balance\|duration\|family\|pitch-range\|pitch\|rate\|stress\|volume\)/
+
+syn match cssAdvancedVal /\(ease-\(in\|out\|in-out\)\|ease\)/ contained
+
+" CSS3 Advanced value
+"syn match cssAdvancedVal
+
+
+if main_syntax == "css"
+  syn sync minlines=10
+endif
 
-highlight def link stylusAtRulePage Macro
+" Define the default highlighting.
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_css_syn_inits")
+  if version < 508
+    let did_css_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
 
-syntax match stylusAtRulePagePseudo ":\(left\|right\|first\|blank\)\>"
-      \ contained
+  HiLink cssString String
+  HiLink cssComment Comment
+  HiLink cssTagName Statement
+  HiLink cssSelector Function
+  HiLink cssBackgroundProp StorageClass
+  HiLink cssTableProp StorageClass
+  HiLink cssBorderProp StorageClass
+  HiLink cssFontProp StorageClass
+  HiLink cssColorProp StorageClass
+  HiLink cssBoxProp StorageClass
+  HiLink cssTextProp StorageClass
+  HiLink cssListProp StorageClass
+  HiLink cssVisualProp StorageClass
+  HiLink cssAdvancedProp StorageClass
+  HiLink cssCommonProp StorageClass
+  HiLink cssSpecialProp Special
+  HiLink cssImportant Special
+  HiLink cssRuleProp PreProc
+  HiLink cssPseudo PreProc
+
+  HiLink cssColorVal Constant
+  HiLink cssCommonVal Type
+  HiLink cssFontVal Type
+  HiLink cssListVal Type
+  HiLink cssTextVal Type
+  HiLink cssVisualVal Type
+  HiLink cssBorderVal Type
+  HiLink cssBackgroundVal Type
+  HiLink cssFuncVal Function
+  HiLink cssAdvancedVal Function
+
+  HiLink cssValueLength Number
+  HiLink cssValueInteger Number
+  HiLink cssValueNumber Number
+  HiLink cssValueAngle Number
+  HiLink cssValueTime Number
+  HiLink cssValueFrequency Number
+  delcommand HiLink
+endif
 
-highlight def link stylusAtRulePagePseudo Macro
+" let b:current_syntax = "css"
+"
+if main_syntax == 'css'
+  unlet main_syntax
+endif
 
-syntax match stylusAtRulePageMarginBoxTypes "@\(top-left-corner\|top-left\|top-center\|top-right\|top-right-corner\|bottom-left-corner\|bottom-left\|bottom-center\|bottom-right\|bottom-right-corner\|left-top\|left-middle\|left-bottom\|right-top\|right-middle\|right-bottom\)\>"
-      \ contained
+" Vim syntax file
+" Language: Stylus
+" Maintainer: Marc Harter
+" Filenames: *.styl, *.stylus
+" Based On: Tim Pope (sass.vim)
 
-highlight def link stylusAtRulePageMarginBoxTypes Macro
+syn case ignore
 
-syntax match stylusAtRuleViewport "@viewport\>"
-      \ contained
-      \ skipwhite
+syn cluster stylusCssSelectors contains=cssTagName,cssSelector,cssPseudo
+syn cluster stylusCssValues contains=cssValueLength,cssValueInteger,cssValueNumber,cssValueAngle,cssValueTime,cssValueFrequency,cssColorVal,cssCommonVal,cssFontVal,cssListVal,cssTextVal,cssVisualVal,cssBorderVal,cssBackgroundVal,cssFuncVal,cssAdvancedVal
+syn cluster stylusCssProperties contains=cssBackgroundProp,cssTableProp,cssBorderProp,cssFontProp,cssColorProp,cssBoxProp,cssTextProp,cssListProp,cssVisualProp,cssAdvancedProp,cssCommonProp,cssSpecialProp
 
-highlight def link stylusAtRuleViewport Macro
+syn match stylusVariable "$\?[[:alnum:]_-]\+"
+syn match stylusVariableAssignment "\%([[:alnum:]_-]\+\s*\)\@<==" nextgroup=stylusCssAttribute,stylusVariable skipwhite
 
-syntax match stylusAtRuleBlock "@block\>"
-      \ contained
+syn match stylusProperty "\%([{};]\s*\|^\)\@<=\%([[:alnum:]-]\|#{[^{}]*}\)\+:" contains=@stylusCssProperties,@stylusCssSelectors skipwhite nextgroup=stylusCssAttribute contained containedin=cssDefineBlock
+syn match stylusProperty "^\s*\zs\s\%(\%([[:alnum:]-]\|#{[^{}]*}\)\+[ :]\|:[[:alnum:]-]\+\)"hs=s+1 contains=@stylusCssProperties,@stylusCssSelectors skipwhite nextgroup=stylusCssAttribute
+syn match stylusProperty "^\s*\zs\s\%(:\=[[:alnum:]-]\+\s*=\)"hs=s+1 contains=@stylusCssProperties,@stylusCssSelectors skipwhite nextgroup=stylusCssAttribute
 
-highlight def link stylusAtRuleBlock Macro
+syn match stylusCssAttribute +\%("\%([^"]\|\\"\)*"\|'\%([^']\|\\'\)*'\|#{[^{}]*}\|[^{};]\)*+ contained contains=@stylusCssValues,cssImportant,stylusFunction,stylusVariable,stylusControl,stylusUserFunction,stylusInterpolation,cssString,stylusComment,cssComment
 
-syntax match stylusAtRuleExtends "@extends\=\>"
-      \ contained
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusExplicitVariable
-      \ skipwhite
+syn match stylusInterpolation %{[[:alnum:]_-]\+}%
 
-highlight def link stylusAtRuleExtends Macro
+syn match stylusFunction "\<\%(red\|green\|blue\|alpha\|dark\|light\)\>(\@=" contained
+syn match stylusFunction "\<\%(hue\|saturation\|lightness\|push\|unshift\|typeof\|unit\|match\)\>(\@=" contained
+syn match stylusFunction "\<\%(hsla\|hsl\|rgba\|rgb\|lighten\|darken\)\>(\@=" contained
+syn match stylusFunction "\<\%(abs\|ceil\|floor\|round\|min\|max\|even\|odd\|sum\|avg\|sin\|cos\|join\)\>(\@=" contained
+syn match stylusFunction "\<\%(desaturate\|saturate\|invert\|unquote\|quote\|s\)\>(\@=" contained
+syn match stylusFunction "\<\%(operate\|length\|warn\|error\|last\|p\|\)\>(\@=" contained
+syn match stylusFunction "\<\%(opposite-position\|image-size\|add-property\)\>(\@=" contained
 
-syntax match stylusOptional "!optional"
-      \ contained
-      \ nextgroup=stylusSelectorClass,stylusSelectorId,stylusSelectorCombinator,stylusSelectorElement,stylusSelectorAttribute,stylusSelectorPseudo,stylusSelectorReference,stylusSelectorPartialReference,stylusInterpolationSelectors,stylusExplicitVariable
-      \ skipwhite
+syn keyword stylusVariable null true false arguments
+syn keyword stylusControl  if else unless for in return
 
-highlight def link stylusOptional Special
-" ===============================================
-" COMMENTS
-" ===============================================
+syn match stylusImport "@\%(import\|require\)" nextgroup=stylusImportList
+syn match stylusImportList "[^;]\+" contained contains=cssString.*,cssMediaType,cssURL
 
-" Single-line
-syntax region stylusComment start="//" end="$"
-      \ containedin=ALLBUT,stylusString
-      \ keepend
-      \ oneline
+syn match stylusAmpersand  "&"
+syn match stylusClass      "[[:alnum:]_-]\+" contained
+syn match stylusClassChar  "\.[[:alnum:]_-]\@=" nextgroup=stylusClass
+syn match stylusEscape     "^\s*\zs\\"
+syn match stylusId         "[[:alnum:]_-]\+" contained
+syn match stylusIdChar     "#[[:alnum:]_-]\@=" nextgroup=stylusId
 
-" Multi-line
-syntax region stylusComment start="/\*" end="\*/"
-      \ containedin=ALLBUT,stylusString
-      \ keepend
+syn region stylusComment    start="//" end="$" contains=cssTodo,@Spell fold
 
-highlight def link stylusComment Comment
+hi def link stylusComment               Comment
+hi def link stylusVariable              Identifier
+hi def link stylusControl               PreProc
+hi def link stylusFunction              Function
+hi def link stylusInterpolation         Delimiter
 
-" ===============================================
+hi def link stylusAmpersand             Character
+hi def link stylusClass                 Type
+hi def link stylusClassChar             Special
+hi def link stylusEscape                Special
+hi def link stylusId                    Identifier
+hi def link stylusIdChar                Special
 
 let b:current_syntax = "stylus"
+
+" vim:set sw=2:

From 7bde552a463999897320a1899a6ca4f8806041ea Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 3 Jan 2021 14:14:59 +0100
Subject: [PATCH 230/299] Add hjson, closes #659

Co-authored-by: SebastienElet <sebastien@elet.fr>
---
 README.md                    |  3 +-
 autoload/polyglot/init.vim   |  4 ++
 autoload/polyglot/sleuth.vim |  1 +
 packages.yaml                |  8 +++
 syntax/hjson.vim             | 95 ++++++++++++++++++++++++++++++++++++
 tests/filetypes.vim          |  1 +
 6 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 syntax/hjson.vim

diff --git a/README.md b/README.md
index afaecd1bb..e2e1ee744 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->602<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->603<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -100,6 +100,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [helm](https://github.com/towolf/vim-helm)
 - [help](https://github.com/neovim/neovim/tree/master/runtime)
 - [hive](https://github.com/zebradil/hive.vim) (HiveQL syntax highlighting for q, hql and ql files)
+- [hjson](https://github.com/hjson/vim-hjson) (Syntax highlighting for hjson files)
 - [html5](https://github.com/sheerun/html5.vim)
 - [i3](https://github.com/mboughaba/i3config.vim) (Syntax highlighting for i3.config and i3config files)
 - [icalendar](https://github.com/chutzpah/icalendar.vim) (Syntax highlighting for ics files)
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 8af31ec2d..19134f9e8 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -168,6 +168,10 @@ let did_load_filetypes = 1
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(g:polyglot_is_disabled, 'hjson')
+  au BufNewFile,BufRead *.hjson setf hjson
+endif
+
 if !has_key(g:polyglot_is_disabled, 'gleam')
   au BufNewFile,BufRead *.gleam setf gleam
 endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 8a5f57ba9..725e1887e 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -224,6 +224,7 @@ let s:globs = {
   \ 'hex': '*.hex,*.h32',
   \ 'hgcommit': 'hg-editor-*.txt',
   \ 'hive': '*.q,*.hql,*.ql',
+  \ 'hjson': '*.hjson',
   \ 'hog': '*.hog,snort.conf,vision.conf',
   \ 'hollywood': '*.hws',
   \ 'hostconf': '',
diff --git a/packages.yaml b/packages.yaml
index 3b6a7623c..cb469f02c 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5571,3 +5571,11 @@ filetypes:
   - name: gleam
     extensions:
     - gleam
+---
+name: hjson
+remote: hjson/vim-hjson
+filetypes:
+- name: hjson
+  patterns:
+  - pattern: '*.hjson'
+    description: Hjson (https://hjson.github.io)
diff --git a/syntax/hjson.vim b/syntax/hjson.vim
new file mode 100644
index 000000000..5b82b9fe6
--- /dev/null
+++ b/syntax/hjson.vim
@@ -0,0 +1,95 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'hjson', 'syntax/hjson.vim')
+  finish
+endif
+
+" Vim syntax file
+" Language: Hjson
+" Maintainer: Christian Zangl
+" Version: 1.0
+" Acknowledgement: Based off of vim/runtime/syntax/json.vim
+
+if !exists("main_syntax")
+  " quit when a syntax file was already loaded
+  if exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax = 'hjson'
+endif
+
+" quoteless Strings (has least priority)
+syn match   hjsonStringUQ      /[^ \t].*$/
+
+syn match   hjsonNoise         /\%(:\|,\)/
+
+" Syntax: Comments
+syn match   hjsonLineComment   "\/\/.*"
+syn match   hjsonLineComment2  "#.*"
+syn region  hjsonComment       start="/\*" end="\*/"
+
+" Syntax: Strings
+" Separated into a match and region because a region by itself is always greedy
+syn match   hjsonStringMatch /"\([^"]\|\\\"\)\+"\ze[[:blank:]\r\n,}\]#\/]/ contains=hjsonString
+syn region  hjsonString oneline matchgroup=hjsonQuote start=/"/  skip=/\\\\\|\\"/  end=/"/ contains=hjsonEscape contained
+syn match   hjsonStringMatchSQ /'\([^']\|\\\'\)\+'\ze[[:blank:]\r\n,}\]#\/]/ contains=hjsonStringSQ
+syn region  hjsonStringSQ oneline matchgroup=hjsonQuote start=/'/  skip=/\\\\\|\\'/  end=/'/ contains=hjsonEscape contained
+" multiline:
+syn match   hjsonStringMatchML /'''\([\r\n]\|.\)\{-}'''/ contains=hjsonStringML
+syn region  hjsonStringML matchgroup=hjsonQuote start=/'''/ end=/'''/ contained
+
+" Syntax: Numbers
+syn match   hjsonNumber    "-\=\<\%(0\|[1-9]\d*\)\%(\.\d\+\)\=\%([eE][-+]\=\d\+\)\=\>\ze[[:blank:]\r\n,}\]]"
+
+" Syntax: Boolean
+syn match   hjsonBoolean   /\(true\|false\)\ze\_s*[\]}#\/,\r\n]/
+
+" Syntax: Null
+syn match   hjsonNull      /null\ze\_s*[\]}#\/,\r\n]/
+
+" Syntax: JSON Object Keywords
+" Separated into a match and region because a region by itself is always greedy
+syn match   hjsonKeywordMatchQ /"\([^"]\|\\\"\)\+"[[:blank:]\r\n]*\:/ contains=hjsonKeywordQ
+syn region  hjsonKeywordQ matchgroup=hjsonQuote start=/"/  end=/"\ze[[:blank:]\r\n]*\:/ contained
+syn match   hjsonKeywordMatchSQ /'\([^']\|\\\'\)\+'[[:blank:]\r\n]*\:/ contains=hjsonKeywordSQ
+syn region  hjsonKeywordSQ matchgroup=hjsonQuote start=/'/  end=/'\ze[[:blank:]\r\n]*\:/ contained
+" without quotes
+syn match   hjsonKeywordMatch /[^][",:{}[:blank:]]\+\:/ contains=hjsonKeyword
+syn region  hjsonKeyword matchgroup=hjsonQuote start=//  end=/\ze\:/ contained
+
+" Syntax: Escape sequences
+syn match   hjsonEscape    "\\["'\\/bfnrt]" contained
+syn match   hjsonEscape    "\\u\x\{4}" contained
+
+" Syntax: Array/Object Braces
+syn region  hjsonFold matchgroup=hjsonBraces start="{" end=/}\(\_s\+\ze\("\|{\)\)\@!/ transparent fold
+syn region  hjsonFold matchgroup=hjsonBraces start="\[" end=/]\(\_s\+\ze"\)\@!/ transparent fold
+
+" Define the default highlighting.
+hi def link hjsonComment         Comment
+hi def link hjsonLineComment     hjsonComment
+hi def link hjsonLineComment2    hjsonComment
+hi def link hjsonString          String
+hi def link hjsonStringSQ        hjsonString
+hi def link hjsonStringML        hjsonString
+hi def link hjsonStringUQ        hjsonString
+hi def link hjsonEscape          Character "Special
+hi def link hjsonNumber          Number
+hi def link hjsonBraces          Delimiter
+hi def link hjsonNull            Function
+hi def link hjsonBoolean         Boolean
+hi def link hjsonKeyword         Label
+hi def link hjsonKeywordQ        hjsonKeyword
+hi def link hjsonKeywordSQ       hjsonKeyword
+hi def link hjsonQuote           Character "Quote
+hi def link hjsonNoise           Noise
+
+let b:current_syntax = "hjson"
+if main_syntax == 'hjson'
+  unlet main_syntax
+endif
+
+" MIT License
+" Copyright (c) 2013, Jeroen Ruigrok van der Werven, Eli Parra, Christian Zangl
+"Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the Software), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+"The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+"THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 8091a76de..a8d1cb7d6 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -647,6 +647,7 @@ call TestFiletype('context')
 call TestFiletype('mint')
 call TestFiletype('jsonc')
 call TestFiletype('gleam')
+call TestFiletype('hjson')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 

From 22040ce638ed610cfdbba03376ad9864a2a5d321 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 14 Jan 2021 20:59:40 +0100
Subject: [PATCH 231/299] Update

---
 README.md                       |   4 +-
 after/ftplugin/jsx.vim          |   2 +-
 after/syntax/puppet.vim         |  28 +++++++
 after/syntax/ruby.vim           | 115 ++--------------------------
 after/syntax/yardoc_support.vim | 128 ++++++++++++++++++++++++++++++++
 autoload/go/config.vim          |   7 +-
 autoload/polyglot/ft.vim        |  23 +++++-
 autoload/polyglot/init.vim      |   2 +-
 autoload/polyglot/sleuth.vim    |   2 +-
 compiler/lilypond.vim           |  23 ------
 ctags/puppet.ctags              |   3 +-
 extras/filetype.vim             |   4 +-
 ftplugin/erlang.vim             |   5 +-
 ftplugin/fstab.vim              |   4 +-
 ftplugin/lilypond.vim           |  61 ---------------
 indent/lilypond.vim             |  64 ----------------
 indent/systemverilog.vim        |   2 +-
 packages.yaml                   |   4 +-
 syntax/abap.vim                 |   4 +-
 syntax/crystal.vim              |  64 +++++++---------
 syntax/julia.vim                |   4 +-
 syntax/lilypond-words.vim       |   7 --
 syntax/lilypond.vim             |  91 -----------------------
 syntax/ocaml.vim                |   6 ++
 syntax/odin.vim                 |  14 +++-
 syntax/pgsql.vim                |  16 ++--
 syntax/prolog.vim               |  10 +--
 syntax/typescriptreact.vim      |   4 +-
 28 files changed, 272 insertions(+), 429 deletions(-)
 create mode 100644 after/syntax/puppet.vim
 create mode 100644 after/syntax/yardoc_support.vim
 delete mode 100644 compiler/lilypond.vim
 delete mode 100644 ftplugin/lilypond.vim
 delete mode 100644 indent/lilypond.vim
 delete mode 100644 syntax/lilypond-words.vim
 delete mode 100644 syntax/lilypond.vim

diff --git a/README.md b/README.md
index e2e1ee744..be4ceb04e 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [idris](https://github.com/idris-hackers/idris-vim) (Idris syntax highlighting for idr and lidr files)
 - [ion](https://github.com/vmchale/ion-vim) (Syntax highlighting for ion files)
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
-- [javascript](https://github.com/pangloss/vim-javascript) (JavaScript syntax highlighting for js, bones, cjs, es, es6 and 17 more files)
+- [javascript](https://github.com/pangloss/vim-javascript) (JavaScript syntax highlighting for js, bones, cjs, es, es6 and 18 more files)
 - [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax) (Syntax highlighting for jenkinsfile and Jenkinsfile files)
 - [jq](https://github.com/vito-c/jq.vim) (JSONiq syntax highlighting for jq files)
 - [json5](https://github.com/GutenYe/json5.vim) (JSON5 syntax highlighting for json5 files)
@@ -116,7 +116,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [jsonc](https://github.com/neoclide/jsonc.vim) (Syntax highlighting for cjson and jsonc files)
 - [jsonnet](https://github.com/google/vim-jsonnet) (Jsonnet syntax highlighting for jsonnet and libsonnet files)
 - [jst](https://github.com/briancollins/vim-jst) (EJS syntax highlighting for ejs, ect and jst files)
-- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (JSX syntax highlighting for jsx files)
+- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (Syntax highlighting for jsx files)
 - [julia](https://github.com/JuliaEditorSupport/julia-vim) (Julia syntax highlighting for jl files)
 - [kotlin](https://github.com/udalov/kotlin-vim) (Kotlin syntax highlighting for kt, ktm and kts files)
 - [ledger](https://github.com/ledger/vim-ledger) (Syntax highlighting for ldg, ledger and journal files)
diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
index e1af589fb..d3bd2a8dd 100644
--- a/after/ftplugin/jsx.vim
+++ b/after/ftplugin/jsx.vim
@@ -15,7 +15,7 @@ endif
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
   let b:match_words = '(:),\[:\],{:},<:>,' .
-        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
+        \ '<\@<=\([A-z0-9.]\+\):\(</\)\@<=\1'
 endif
 
 " For andymass/vim-matchup plugin
diff --git a/after/syntax/puppet.vim b/after/syntax/puppet.vim
new file mode 100644
index 000000000..e39f48d0c
--- /dev/null
+++ b/after/syntax/puppet.vim
@@ -0,0 +1,28 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'yard', 'after/syntax/puppet.vim')
+  finish
+endif
+
+" Puppet syntax extensions for highlighting YARD documentation.
+"
+" Author: Gabriel Filion <gabster@lelutin.ca>
+" URI: https://github.com/noprompt/vim-yardoc
+" Version: 0.0.1
+"
+" This file reuses the main yardoc syntax definitions and glues them together
+" with puppet syntax groups from vim-puppet
+
+runtime! after/syntax/yardoc_support.vim
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Yard glue to puppet
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+syn match  puppetComment "\s*#.*$" contains=puppetTodo,@Spell,yardComment
+syn region puppetComment start="/\*" end="\*/" contains=puppetTodo,@Spell,yardComment extend fold keepend
+syn cluster puppetNotTop add=@yardTags,@yardDirectives,@yardTypes,@yardLists,@yardHashes
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Tacking on Yard to puppet syntax classes
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+hi def link yardComment puppetComment
+hi def link yardGenericTag puppetKeyword
+hi def link yardGenericDirective puppetKeyword
diff --git a/after/syntax/ruby.vim b/after/syntax/ruby.vim
index 082115e12..85de287ef 100644
--- a/after/syntax/ruby.vim
+++ b/after/syntax/ruby.vim
@@ -7,125 +7,22 @@ endif
 " Author: Joel Holdbrooks <https://github.com/noprompt>
 " URI: https://github.com/noprompt/vim-yardoc
 " Version: 0.0.1
+"
+" This file reuses the main yardoc syntax definitions and glues them together
+" with Vim's builtin ruby syntax groups
 
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Tags
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-syn match yardGenericTag "@\h\+" contained
-syn match yardAbstract "@abstract" contained
-syn match yardApi "@api" contained
-syn match yardAttr "@attr" contained
-syn match yardAttrReader "@attr_reader" contained
-syn match yardAttrWriter "@attr_writer" contained
-syn match yardAuthor "@author" contained
-syn match yardDeprecated "@deprecated" contained
-syn match yardExample "@example" contained
-syn match yardNote "@note" contained
-syn match yardOption "@option" contained
-syn match yardOverload "@overload" contained
-syn match yardParam "@param" contained
-syn match yardParamName /@param \h\+/hs=s+7 contained contains=yardParam
-syn match yardPrivate "@private" contained
-syn match yardRaise "@raise" contained
-syn match yardReturn "@return" contained
-syn match yardSee "@see" contained
-syn match yardSince "@since" contained
-syn match yardTodo "@todo" contained
-syn match yardVersion "@version" contained
-syn match yardYield "@yield" contained
-syn match yardYieldParam "@yieldparam" contained
-syn match yardYieldReturn "@yieldreturn" contained
-syn cluster yardTags contains=yardGenericTag,yardAbstract,yardApi,yardAttr,yardAttrReader,yardAttrWriter,yardAuthor,yardDeprecated,yardExample,yardNote,yardOption,yardOverload,yardParam,yardParamName,yardPrivate,yardRaise,yardReturn,yardSee,yardSince,yardTodo,yardVersion,yardYield,yardYieldParam,yardYieldReturn
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Directives
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-syn match yardGenericDirective "@!\h\+" contained
-syn match yardAttribute "@!attribute" contained
-syn match yardEndGroup "@!endgroup" contained
-syn match yardGroup "@!group" contained
-syn match yardMacro "@!macro" contained
-syn match yardMethod "@!method" contained
-syn match yardParse "@!parse" contained
-syn match yardScope "@!scope" contained
-syn match yardVisibility "@!visibility" contained
-
-syn cluster yardDirectives contains=yardGenericDirective,yardAttribute,yardEndGroup,yardGroup,yardMacro,yardMethod,yardParse,yardScope,yardVisibility
-
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Types, Lists, and Hashes
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-syn match yardDuckType "#\h\+" contained
-syn match yardType "[A-Z]\h\+" contained
-syn match yardLiteral "\(true\|false\|nil\|self\|void\)" contained
-syn match yardComma "," nextgroup=@yardTypes contained
-syn match yardArrow "=>" nextgroup=@yardTypes contained
-
-syn region yardParametricType start="[A-Z]\+\h\+<" end=">" contains=yardType,yardOrderDependentList,yardComma skipwhite contained
-syn region yardOrderDependentList start="(" end=")" contains=@yardTypes,yardComma skipwhite contained
-syn region yardTypeList start="\[" end="]" contains=@yardTypes,yardOrderDependentList,@yardHashes skipwhite contained
-syn region yardHashAngle start="Hash<" end=">" contains=yardDuckType,yardType,yardLiteral,yardArrow,yardComma skipwhite contained
-syn region yardHashCurly start="Hash{" end="}" contains=@yardTypes,yardArrow,yardComma skipwhite contained
-
-syn cluster yardTypes contains=yardDuckType,yardType,yardLiteral,yardParametricType
-syn cluster yardHashes contains=yardArrow,yardHashAngle,yardHashCurly
-syn cluster yardLists contains=yardComma,yardTypeList,yardOrderDependentList
+runtime! after/syntax/yardoc_support.vim
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Yard
+" Yard glue to ruby
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-syn match yardComment "#\s*@!\{,1}\h\+.*" contains=@yardTags,@yardDirectives,yardTypeList
 syn match rubyComment "#.*" contains=rubySharpBang,rubySpaceError,rubyTodo,@Spell,yardComment
 syn region rubyMultilineComment start="\%(\%(^\s*#.*\n\)\@<!\%(^\s*#.*\n\)\)\%(\(^\s*#.*\n\)\{1,}\)\@=" end="\%(^\s*#.*\n\)\@<=\%(^\s*#.*\n\)\%(^\s*#\)\@!" contains=rubyComment transparent fold keepend
 syn cluster rubyNotTop add=@yardTags,@yardDirectives,@yardTypes,@yardLists,@yardHashes
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Links
+" Tacking on Yard to ruby syntax classes
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 hi def link yardComment rubyComment
-" Tags
 hi def link yardGenericTag rubyKeyword
-hi def link yardAbstract yardGenericTag
-hi def link yardApi yardGenericTag
-hi def link yardAttr yardGenericTag
-hi def link yardAttrReader yardGenericTag
-hi def link yardAttrWriter yardGenericTag
-hi def link yardAuthor yardGenericTag
-hi def link yardDeprecated yardGenericTag
-hi def link yardExample yardGenericTag
-hi def link yardNote yardGenericTag
-hi def link yardOption yardGenericTag
-hi def link yardOverload yardGenericTag
-hi def link yardParam yardGenericTag
-hi def link yardPrivate yardGenericTag
-hi def link yardRaise yardGenericTag
-hi def link yardReturn yardGenericTag
-hi def link yardSee yardGenericTag
-hi def link yardSince yardGenericTag
-hi def link yardTodo yardGenericTag
-hi def link yardVersion yardGenericTag
-hi def link yardYield yardGenericTag
-hi def link yardYieldParam yardGenericTag
-hi def link yardYieldReturn yardGenericTag
-" Directives
 hi def link yardGenericDirective rubyKeyword
-hi def link yardAttribute yardGenericDirective
-hi def link yardEndGroup yardGenericDirective
-hi def link yardGroup yardGenericDirective
-hi def link yardMacro yardGenericDirective
-hi def link yardMethod yardGenericDirective
-hi def link yardParse yardGenericDirective
-hi def link yardScope yardGenericDirective
-hi def link yardVisibility yardGenericDirective
-" Types
-hi def link yardComma yardComment
-hi def link yardType yardComment
-hi def link yardDuckType yardComment
-hi def link yardLiteral yardComment
-" Lists
-hi def link yardTypeList yardComment
-hi def link yardParametricType yardComment
-" Hashes
-hi def link yardArrow yardComment
-hi def link yardHashAngle yardComment
-hi def link yardHashCurly yardComment
diff --git a/after/syntax/yardoc_support.vim b/after/syntax/yardoc_support.vim
new file mode 100644
index 000000000..757ead240
--- /dev/null
+++ b/after/syntax/yardoc_support.vim
@@ -0,0 +1,128 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'yard', 'after/syntax/yardoc_support.vim')
+  finish
+endif
+
+" Generic syntax extensions for highlighting YARD documentation.
+"
+" Author: Joel Holdbrooks <https://github.com/noprompt>
+" URI: https://github.com/noprompt/vim-yardoc
+" Version: 0.0.1
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Tags
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+syn match yardGenericTag "@\h\+" contained
+syn match yardAbstract "@abstract" contained
+syn match yardApi "@api" contained
+syn match yardAttr "@attr" contained
+syn match yardAttrReader "@attr_reader" contained
+syn match yardAttrWriter "@attr_writer" contained
+syn match yardAuthor "@author" contained
+syn match yardDeprecated "@deprecated" contained
+syn match yardExample "@example" contained
+syn match yardNote "@note" contained
+syn match yardOption "@option" contained
+syn match yardOverload "@overload" contained
+syn match yardParam "@param" contained
+syn match yardParamName /@param \h\+/hs=s+7 contained contains=yardParam
+syn match yardPrivate "@private" contained
+syn match yardRaise "@raise" contained
+syn match yardReturn "@return" contained
+syn match yardSee "@see" contained
+syn match yardSince "@since" contained
+syn match yardTodo "@todo" contained
+syn match yardVersion "@version" contained
+syn match yardYield "@yield" contained
+syn match yardYieldParam "@yieldparam" contained
+syn match yardYieldReturn "@yieldreturn" contained
+syn cluster yardTags contains=yardGenericTag,yardAbstract,yardApi,yardAttr,yardAttrReader,yardAttrWriter,yardAuthor,yardDeprecated,yardExample,yardNote,yardOption,yardOverload,yardParam,yardParamName,yardPrivate,yardRaise,yardReturn,yardSee,yardSince,yardTodo,yardVersion,yardYield,yardYieldParam,yardYieldReturn
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Directives
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+syn match yardGenericDirective "@!\h\+" contained
+syn match yardAttribute "@!attribute" contained
+syn match yardEndGroup "@!endgroup" contained
+syn match yardGroup "@!group" contained
+syn match yardMacro "@!macro" contained
+syn match yardMethod "@!method" contained
+syn match yardParse "@!parse" contained
+syn match yardScope "@!scope" contained
+syn match yardVisibility "@!visibility" contained
+
+syn cluster yardDirectives contains=yardGenericDirective,yardAttribute,yardEndGroup,yardGroup,yardMacro,yardMethod,yardParse,yardScope,yardVisibility
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Types, Lists, and Hashes
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+syn match yardDuckType "#\h\+" contained
+syn match yardType "[A-Z]\h\+" contained
+syn match yardLiteral "\(true\|false\|nil\|self\|void\)" contained
+syn match yardComma "," nextgroup=@yardTypes contained
+syn match yardArrow "=>" nextgroup=@yardTypes contained
+
+syn region yardParametricType start="[A-Z]\+\h\+<" end=">" contains=yardType,yardOrderDependentList,yardComma skipwhite contained
+syn region yardOrderDependentList start="(" end=")" contains=@yardTypes,yardComma skipwhite contained
+syn region yardTypeList start="\[" end="]" contains=@yardTypes,yardOrderDependentList,@yardHashes skipwhite contained
+syn region yardHashAngle start="Hash<" end=">" contains=yardDuckType,yardType,yardLiteral,yardArrow,yardComma skipwhite contained
+syn region yardHashCurly start="Hash{" end="}" contains=@yardTypes,yardArrow,yardComma skipwhite contained
+
+syn cluster yardTypes contains=yardDuckType,yardType,yardLiteral,yardParametricType
+syn cluster yardHashes contains=yardArrow,yardHashAngle,yardHashCurly
+syn cluster yardLists contains=yardComma,yardTypeList,yardOrderDependentList
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Yard
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+syn match yardComment "#\s*@!\{,1}\h\+.*" contains=@yardTags,@yardDirectives,yardTypeList
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Links
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" @note The links to language syntax classes is done in each language syntax
+"   script.
+"
+" Tags
+hi def link yardAbstract yardGenericTag
+hi def link yardApi yardGenericTag
+hi def link yardAttr yardGenericTag
+hi def link yardAttrReader yardGenericTag
+hi def link yardAttrWriter yardGenericTag
+hi def link yardAuthor yardGenericTag
+hi def link yardDeprecated yardGenericTag
+hi def link yardExample yardGenericTag
+hi def link yardNote yardGenericTag
+hi def link yardOption yardGenericTag
+hi def link yardOverload yardGenericTag
+hi def link yardParam yardGenericTag
+hi def link yardPrivate yardGenericTag
+hi def link yardRaise yardGenericTag
+hi def link yardReturn yardGenericTag
+hi def link yardSee yardGenericTag
+hi def link yardSince yardGenericTag
+hi def link yardTodo yardGenericTag
+hi def link yardVersion yardGenericTag
+hi def link yardYield yardGenericTag
+hi def link yardYieldParam yardGenericTag
+hi def link yardYieldReturn yardGenericTag
+" Directives
+hi def link yardAttribute yardGenericDirective
+hi def link yardEndGroup yardGenericDirective
+hi def link yardGroup yardGenericDirective
+hi def link yardMacro yardGenericDirective
+hi def link yardMethod yardGenericDirective
+hi def link yardParse yardGenericDirective
+hi def link yardScope yardGenericDirective
+hi def link yardVisibility yardGenericDirective
+" Types
+hi def link yardComma yardComment
+hi def link yardType yardComment
+hi def link yardDuckType yardComment
+hi def link yardLiteral yardComment
+" Lists
+hi def link yardTypeList yardComment
+hi def link yardParametricType yardComment
+" Hashes
+hi def link yardArrow yardComment
+hi def link yardHashAngle yardComment
+hi def link yardHashCurly yardComment
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index b087b2c4f..ca89b16fb 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -263,13 +263,14 @@ function! go#config#SetTemplateAutocreate(value) abort
   let g:go_template_autocreate = a:value
 endfunction
 
+let s:default_metalinter = 'staticcheck'
 function! go#config#MetalinterCommand() abort
-  return get(g:, 'go_metalinter_command', 'golangci-lint')
+  return get(g:, 'go_metalinter_command', s:default_metalinter)
 endfunction
 
 function! go#config#MetalinterAutosaveEnabled() abort
   let l:default = []
-  if get(g:, 'go_metalinter_command', 'golangci-lint') == 'golangci-lint'
+  if get(g:, 'go_metalinter_command', s:default_metalinter) == 'golangci-lint'
     let l:default = ['govet', 'golint']
   endif
 
@@ -278,7 +279,7 @@ endfunction
 
 function! go#config#MetalinterEnabled() abort
   let l:default = []
-  if get(g:, 'go_metalinter_command', 'golangci-lint') == 'golangci-lint'
+  if get(g:, 'go_metalinter_command', s:default_metalinter) == 'golangci-lint'
     let l:default = ['vet', 'golint', 'errcheck']
   endif
 
diff --git a/autoload/polyglot/ft.vim b/autoload/polyglot/ft.vim
index 35812c377..f872bf9c2 100644
--- a/autoload/polyglot/ft.vim
+++ b/autoload/polyglot/ft.vim
@@ -362,6 +362,10 @@ func polyglot#ft#FTinc()
       setf aspvbs
     elseif lines =~ "<?"
       setf php
+    " Pascal supports // comments but they're vary rarely used for file
+    " headers so assume POV-Ray
+    elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? s:ft_pascal_keywords
+      setf pascal
     else
       call polyglot#ft#FTasmsyntax()
       if exists("b:asmsyntax")
@@ -408,6 +412,9 @@ func polyglot#ft#FTprogress_asm()
   setf progress
 endfunc
 
+let s:ft_pascal_comments = '^\s*\%({\|(\*\|//\)'
+let s:ft_pascal_keywords = '^\s*\%(program\|unit\|library\|uses\|begin\|procedure\|function\|const\|type\|var\)\>'
+
 func polyglot#ft#FTprogress_pascal()
   if exists("g:filetype_p")
     exe "setf " . g:filetype_p
@@ -419,8 +426,7 @@ func polyglot#ft#FTprogress_pascal()
   let lnum = 1
   while lnum <= 10 && lnum < line('$')
     let line = getline(lnum)
-    if line =~ '^\s*\(program\|unit\|procedure\|function\|const\|type\|var\)\>'
-	\ || line =~ '^\s*{' || line =~ '^\s*(\*'
+    if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
       setf pascal
       return
     elseif line !~ '^\s*$' || line =~ '^/\*'
@@ -433,6 +439,19 @@ func polyglot#ft#FTprogress_pascal()
   setf progress
 endfunc
 
+func polyglot#ft#FTpp()
+  if exists("g:filetype_pp")
+    exe "setf " . g:filetype_pp
+  else
+    let line = getline(nextnonblank(1))
+    if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
+      setf pascal
+    else
+      setf puppet
+    endif
+  endif
+endfunc
+
 func polyglot#ft#FTr()
   let max = line("$") > 50 ? 50 : line("$")
 
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 19134f9e8..bd91a37f7 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -2336,7 +2336,7 @@ if !has_key(g:polyglot_is_disabled, 'jsx')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'javascript')
-  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
+  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
   au BufNewFile,BufRead *.flow setf flow
 endif
 
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 725e1887e..f3df470af 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -256,7 +256,7 @@ let s:globs = {
   \ 'jam': '*.jpl,*.jpr,Prl*.*,JAM*.*',
   \ 'java': '*.java,*.jav',
   \ 'javacc': '*.jj,*.jjt',
-  \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,*.javascript,Jakefile',
+  \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,*.javascript,Jakefile',
   \ 'javascriptreact': '*.jsx',
   \ 'jess': '*.clp',
   \ 'jgraph': '*.jgr',
diff --git a/compiler/lilypond.vim b/compiler/lilypond.vim
deleted file mode 100644
index 60a1c52b9..000000000
--- a/compiler/lilypond.vim
+++ /dev/null
@@ -1,23 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'compiler/lilypond.vim')
-  finish
-endif
-
-" LilyPond compiler file
-" Language:     LilyPond
-" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
-" Last Change:  2004 Mar 01
-"
-" Installed As:	vim/compiler/lilypond.vim
-"
-" Only load this indent file when no other was loaded.
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "lilypond"
-
-" default make
-setlocal makeprg=lilypond\ $*
-" errorformat for lily (with columns) and gcc
-" (how to see multiple-line error messages?)
-setlocal errorformat=%f:%l:%c:\ %m,%f:%l:\ %m,In\ file\ included\ from\ %f:%l:,\^I\^Ifrom\ %f:%l%m
-"
diff --git a/ctags/puppet.ctags b/ctags/puppet.ctags
index ba9ca1809..237169973 100644
--- a/ctags/puppet.ctags
+++ b/ctags/puppet.ctags
@@ -1,10 +1,11 @@
 --langdef=puppet
 --langmap=puppet:.pp
+--regex-puppet=/^[[:space:]]*class[[:space:]]*([a-z][a-zA-Z0-9_:\-]+)/::\1/c,class/
 --regex-puppet=/^[[:space:]]*class[[:space:]]*([a-z][a-zA-Z0-9_:\-]+)/\1/c,class/
 --regex-puppet=/^[[:space:]]*site[[:space:]]*([a-zA-Z0-9_\-]+)/\1/s,site/
 --regex-puppet=/^[[:space:]]*node[[:space:]]*[\'|\"]*([a-zA-Z0-9_\.\-]+)[\'|\"]*/\1/n,node/
 --regex-puppet=/^[[:space:]]*define[[:space:]]*([a-z][a-zA-Z0-9_:\-]+)/\1/d,definition/
---regex-puppet=/^[[:space:]]*(include|require)[[:space:]]*([a-zA-Z0-9_:]+)/\1 \2/i,include/
+--regex-puppet=/^[[:space:]]*(include|require)[[:space:]]*:{0,2}([a-zA-Z0-9_:]+)/\1 ::\2/i,include/
 --regex-puppet=/^[[:space:]]*([\$][a-zA-Z0-9_:]+)[[:space:]]*=/\1/v,variable/
 --regex-puppet=/^[[:space:]]*[~|\-]?>?[[:space:]]*([a-z][a-zA-Z0-9_:]+)[[:space:]]*\{ *(.*):/\1[\2]/r,resource/
 --regex-puppet=/([A-Z][a-zA-Z0-9_:]+)[[:space:]]*\{/\1/f,default/
diff --git a/extras/filetype.vim b/extras/filetype.vim
index 703ff96e6..9e0be36d8 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1174,7 +1174,9 @@ au BufNewFile,BufRead *.papp,*.pxml,*.pxsl	setf papp
 au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
 
 " Pascal (also *.p)
-au BufNewFile,BufRead *.pas,*.pp		setf pascal
+au BufNewFile,BufRead *.pas			setf pascal
+
+au BufNewFile,BufRead *.pp			call polyglot#ft#FTpp()
 
 " Delphi or Lazarus program file
 au BufNewFile,BufRead *.dpr,*.lpr		setf pascal
diff --git a/ftplugin/erlang.vim b/ftplugin/erlang.vim
index f23ba8755..798f1dede 100644
--- a/ftplugin/erlang.vim
+++ b/ftplugin/erlang.vim
@@ -3,14 +3,15 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'erlang', 'ftplugin/erlang.vim
 endif
 
 " Vim ftplugin file
-" Language:     Erlang
+" Language:     Erlang (http://www.erlang.org)
 " Maintainer:   Csaba Hoch <csaba.hoch@gmail.com>
 " Author:       Oscar Hellström <oscar@oscarh.net>
 " Contributors: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 "               Eduardo Lopez (http://github.com/tapichu)
 "               Arvid Bjurklint (http://github.com/slarwise)
+" Last Update:  2021-Jan-08
 " License:      Vim license
-" Version:      2012/01/25
+" URL:          https://github.com/vim-erlang/vim-erlang-runtime
 
 if exists('b:did_ftplugin')
   finish
diff --git a/ftplugin/fstab.vim b/ftplugin/fstab.vim
index 5f0972cae..437c1247a 100644
--- a/ftplugin/fstab.vim
+++ b/ftplugin/fstab.vim
@@ -6,7 +6,7 @@ endif
 " Language: fstab file
 " Maintainer: Radu Dineiu <radu.dineiu@gmail.com>
 " URL: https://raw.github.com/rid9/vim-fstab/master/ftplugin/fstab.vim
-" Last Change: 2020 Dec 29
+" Last Change: 2021 Jan 02
 " Version: 1.0
 "
 " Credits:
@@ -20,4 +20,4 @@ let b:did_ftplugin = 1
 setlocal commentstring=#%s
 let b:undo_ftplugin = "setlocal commentstring<"
 
-" vim: ts=8 ft=vim
\ No newline at end of file
+" vim: ts=8 ft=vim
diff --git a/ftplugin/lilypond.vim b/ftplugin/lilypond.vim
deleted file mode 100644
index ed2d1cdb5..000000000
--- a/ftplugin/lilypond.vim
+++ /dev/null
@@ -1,61 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'ftplugin/lilypond.vim')
-  finish
-endif
-
-" LilyPond filetype plugin
-" Language:     LilyPond (ft=ly)
-" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
-" Last Change:  2010 Jul 26
-"
-" Installed As:	vim/ftplugin/lilypond.vim
-" Uses Generated File:	vim/syntax/lilypond-words.vim
-"
-" Only do this when not done yet for this buffer
-if exists("b:did_ftplugin")
-  finish
-endif
-
-" Don't load another plugin for this buffer
-let b:did_ftplugin = 1
-
-setlocal autoindent
-setlocal shiftwidth=2
-"
-" some handy key mappings
-"
-" <F4>  save & make and play midi with timidity
-map <buffer> <F4> :w<Return>:se makeprg=lilypond\ \"%<\"<Return>:make<Return>:!timidity "%<.midi"<Return>
-"
-" <F5>  save & make
-map <buffer> <F5> :w<Return>:se makeprg=lilypond\ \"%<\"<Return>:make<Return>
-"
-" <F6>  view ps with ghostview
-map <buffer> <F6> :!gv --watch "%<.ps" &<Return>
-"
-" <F7>  prev error
-map <buffer> <F7> :cp<Return>
-"
-" <F8>  next error
-map <buffer> <F8> :cn<Return>
-"
-" <F9>  make
-map <buffer> <F9> :w<Return>:se makeprg=make\ -k<Return>:make<Return>
-"
-" <F10> menu
-source $VIMRUNTIME/menu.vim
-setlocal wildmenu
-setlocal cpo-=<
-setlocal wcm=<C-Z>
-map <buffer> <F10> :emenu <C-Z>
-"
-" <F12> comment region
-map <buffer> <F12> :g!/%.*/normal 0i%<Return>
-"
-" <S-F12> remove comments in region
-map <buffer> <S-F12> :g/%.*/normal 0x<Return>
-"
-" Completions in Insert/Replace-mode with <Ctrl-N>
-setlocal dictionary-=$VIM/syntax/lilypond-words dictionary+=$VIM/syntax/lilypond-words
-setlocal complete-=k complete+=k
-"
-setlocal showmatch
diff --git a/indent/lilypond.vim b/indent/lilypond.vim
deleted file mode 100644
index 3d3edb053..000000000
--- a/indent/lilypond.vim
+++ /dev/null
@@ -1,64 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'indent/lilypond.vim')
-  finish
-endif
-
-" LilyPond indent file
-" Language:     LilyPond
-" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
-" Last Change:  2010 Jul 26
-"
-" Installed As:	vim/indent/lilypond.vim
-"
-" Only load this indent file when no other was loaded.
-if exists("b:did_indent")
-  finish
-endif
-let b:did_indent = 1
-
-setlocal indentexpr=GetLilyPondIndent()
-setlocal indentkeys=o,O,},>>,!^F
-
-" Only define the function once.
-if exists("*GetLilyPondIndent")
-  finish
-endif
-
-function GetLilyPondIndent()
-  if v:lnum == 1
-    return 0
-  endif
-
-  "Find a non-blank line above the current line.
-  let lnum = prevnonblank(v:lnum - 1)
-  "Check if a block was started: '{' or '<<' is the last non-blank character of the previous line.
-  if getline(lnum) =~ '^.*\({\|<<\)\s*$'
-    let ind = indent(lnum) + &sw
-  else
-    let ind = indent(lnum)
-  endif
-
-  "Check if a block was ended: '}' or '>>' is the first non-blank character of the current line.
-  if getline(v:lnum) =~ '^\s*\(}\|>>\)'
-    let ind = ind - &sw
-  endif
-
-  " Check if the first character from the previous line is within
-  " a `lilyScheme' region, and if so, use lisp-style indentation
-  " for the current line.
-  "
-  " TODO:
-  "   - Only works in version 7.1.215 or later, though it should
-  "     silently fail in older versions.
-  "   - We should support `lilyScheme' regions that begin in the
-  "     middle of the line, too.
-  for id in synstack(lnum, 1)
-    if synIDattr(id, "name") == "lilyScheme"
-      let ind = lispindent(v:lnum)
-    endif
-  endfor
-
-  return ind
-endfunction
-"
-"
-"
diff --git a/indent/systemverilog.vim b/indent/systemverilog.vim
index 0f8321b54..ed1d97a5b 100644
--- a/indent/systemverilog.vim
+++ b/indent/systemverilog.vim
@@ -231,4 +231,4 @@ endfunction
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim:sw=2
\ No newline at end of file
+" vim:sw=2
diff --git a/packages.yaml b/packages.yaml
index cb469f02c..a102eebca 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -942,7 +942,9 @@ remote: MaxMEllon/vim-jsx-pretty
 dependencies: javascript
 filetypes:
 - name: javascriptreact
-  linguist: JSX
+  patterns:
+  - pattern: '*.jsx'
+    description: Syntax Extension to JavaScript
 ---
 name: julia
 remote: JuliaEditorSupport/julia-vim
diff --git a/syntax/abap.vim b/syntax/abap.vim
index ed10cce98..534e06ef2 100644
--- a/syntax/abap.vim
+++ b/syntax/abap.vim
@@ -5,7 +5,7 @@ endif
 " Vim ABAP syntax file
 "    Language: SAP - ABAP/R4
 "  Maintainer: Marius Piedallu van Wyk <lailoken@gmail.com>
-" Last Change: 2018 Dec 12
+" Last Change: 2021 Jan 02
 "     Comment: Thanks to EPI-USE Labs for all your assistance. :)
 
 " Quit when a syntax file was already loaded
@@ -197,4 +197,4 @@ hi def link abapHex            Number
 
 let b:current_syntax = "abap"
 
-" vim: ts=8 sw=2
\ No newline at end of file
+" vim: ts=8 sw=2
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index 7dfdf5078..a776e59bf 100644
--- a/syntax/crystal.vim
+++ b/syntax/crystal.vim
@@ -93,10 +93,6 @@ syn match crystalStringEscape "\\\\\|\\[abefnrstv]\|\\\o\{1,3}\|\\x\x\{1,2}"
 syn match crystalStringEscape "\%(\\M-\\C-\|\\C-\\M-\|\\M-\\c\|\\c\\M-\|\\c\|\\C-\|\\M-\)\%(\\\o\{1,3}\|\\x\x\{1,2}\|\\\=\S\)" contained display
 
 syn region crystalInterpolation      matchgroup=crystalInterpolationDelim start="#{" end="}" contained contains=TOP
-syn match  crystalInterpolation      "#\%(\$\|@@\=\)\w\+" display contained contains=crystalInterpolationDelim,crystalInstanceVariable,crystalClassVariable,crystalGlobalVariable,crystalPredefinedVariable
-syn match  crystalInterpolationDelim "#\ze\%(\$\|@@\=\)\w\+" display contained
-syn match  crystalInterpolation      "#\$\%(-\w\|\W\)" display contained contains=crystalInterpolationDelim,crystalPredefinedVariable,crystalInvalidVariable
-syn match  crystalInterpolationDelim "#\ze\$\%(-\w\|\W\)" display contained
 syn region crystalNoInterpolation    start="\\#{" end="}" contained
 syn match  crystalNoInterpolation    "\\#{" display contained
 syn match  crystalNoInterpolation    "\\#\%(\$\|@@\=\)\w\+" display contained
@@ -156,7 +152,6 @@ syn match  crystalAnnotationName   "\%(\%([.@$]\@1<!\.\)\@1<!\<\|::\)\_s*\zs\u\w
 syn match  crystalConstant         "\%(\%([.@$]\@1<!\.\)\@1<!\<\|::\)\_s*\zs\u\w*\%(\>\|::\)\@="
 syn match  crystalClassVariable    "@@\%(\h\|%\|[^\x00-\x7F]\)\%(\w\|%\|[^\x00-\x7F]\)*" display
 syn match  crystalInstanceVariable "@\%(\h\|%\|[^\x00-\x7F]\)\%(\w\|%\|[^\x00-\x7F]\)*" display
-syn match  crystalGlobalVariable   "$\%(\%(\h\|%\|[^\x00-\x7F]\)\%(\w\|%\|[^\x00-\x7F]\)*\|-.\)"
 syn match  crystalFreshVariable    "\%(\h\|[^\x00-\x7F]\)\@1<!%\%(\h\|[^\x00-\x7F]\)\%(\w\|%\|[^\x00-\x7F]\)*" display
 syn match  crystalSymbol           "[]})\"':]\@1<!:\%(\^\|\~\|<<\|<=>\|<=\|<\|===\|[=!]=\|[=!]\~\|!\|>>\|>=\|>\||\|-@\|-\|/\|\[][=?]\|\[]\|\*\*\|\*\|&\|%\|+@\|+\|`\)"
 syn match  crystalSymbol           "[]})\"':]\@1<!:\$\%(-.\|[`~<=>_,;:!?/.'"@$*\&+0]\)"
@@ -172,17 +167,11 @@ SynFold ':' syn region crystalSymbol start="[]})\"':]\@1<!:\"" end="\"" skip="\\
 syn match  crystalBlockParameter     "\%(\h\|%\|[^\x00-\x7F]\)\%(\w\|%\|[^\x00-\x7F]\)*" contained
 syn region crystalBlockParameterList start="\%(\%(\<do\>\|{\)\s*\)\@<=|" end="|" oneline display contains=crystalBlockParameter
 
-syn match crystalInvalidVariable    "$[^ %A-Za-z_-]"
-syn match crystalPredefinedVariable #$[!$&"'*+,./0:;<=>?@\`~]#
-syn match crystalPredefinedVariable "$\d\+" display
-syn match crystalPredefinedVariable "$_\>" display
-syn match crystalPredefinedVariable "$-[0FIKadilpvw]\>" display
-syn match crystalPredefinedVariable "$\%(deferr\|defout\|stderr\|stdin\|stdout\)\>" display
-syn match crystalPredefinedVariable "$\%(DEBUG\|FILENAME\|KCODE\|LOADED_FEATURES\|LOAD_PATH\|PROGRAM_NAME\|SAFE\|VERBOSE\)\>" display
-syn match crystalPredefinedConstant "\%(\%(\.\@1<!\.\)\@2<!\|::\)\_s*\zs\%(MatchingData\|ARGF\|ARGV\|ENV\)\>\%(\s*(\)\@!"
-syn match crystalPredefinedConstant "\%(\%(\.\@1<!\.\)\@2<!\|::\)\_s*\zs\%(DATA\|FALSE\|NIL\)\>\%(\s*(\)\@!"
-syn match crystalPredefinedConstant "\%(\%(\.\@1<!\.\)\@2<!\|::\)\_s*\zs\%(STDERR\|STDIN\|STDOUT\|TOPLEVEL_BINDING\|TRUE\)\>\%(\s*(\)\@!"
-syn match crystalPredefinedConstant "\%(\%(\.\@1<!\.\)\@2<!\|::\)\_s*\zs\%(crystal_\%(VERSION\|RELEASE_DATE\|PLATFORM\|PATCHLEVEL\|REVISION\|DESCRIPTION\|COPYRIGHT\|ENGINE\)\)\>\%(\s*(\)\@!"
+" In Crystal, almost all special variables were removed and global variables
+" are not supported https://github.com/crystal-lang/crystal/commit/e872c716d0e936557b34c614efc5a4c24d845f79
+" NOTE: Only $~ and $? are supported since they are actually not global.
+syn match crystalPredefinedVariable "$[~?]"
+syn match crystalPredefinedConstant "\%(\%(\.\@1<!\.\)\@2<!\|::\)\_s*\zs\%(ARGF\|ARGV\|ENV\|STDERR\|STDIN\|STDOUT\)\>\%(\s*(\)\@!"
 
 " Normal Regular Expression
 SynFold '/' syn region crystalRegexp matchgroup=crystalRegexpDelimiter start="\%(\%(^\|\<\%(and\|or\|while\|until\|unless\|if\|elsif\|ifdef\|when\|in\|not\|then\|else\)\|[;\~=!|&(,[<>?:*+-]\)\s*\)\@<=/" end="/[imx]*" skip="\\\\\|\\/" contains=@crystalRegexpSpecial
@@ -250,9 +239,9 @@ SynFold '<<' syn region crystalString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\
 SynFold '<<' syn region crystalString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<-`\z([^`]*\)`\ze\%(.*<<-\=['`"]\=\h\)\@!+hs=s+3 matchgroup=crystalStringDelimiter end=+^\s*\zs\z1$+ contains=crystalHeredocStart,@crystalStringSpecial keepend
 
 " Module, Class, Method, and Alias Declarations
-syn match crystalAliasDeclaration      "[^[:space:];#.()]\+" contained contains=crystalSymbol,crystalGlobalVariable,crystalPredefinedVariable nextgroup=crystalAliasDeclaration2 skipwhite
-syn match crystalAliasDeclaration2     "[^[:space:];#.()]\+" contained contains=crystalSymbol,crystalGlobalVariable,crystalPredefinedVariable
-syn match crystalMethodDeclaration     "[^[:space:];#(]\+"   contained contains=crystalConstant,crystalFunction,crystalBoolean,crystalPseudoVariable,crystalInstanceVariable,crystalClassVariable,crystalGlobalVariable
+syn match crystalAliasDeclaration      "[^[:space:];#.()]\+" contained contains=crystalSymbol,crystalPredefinedVariable nextgroup=crystalAliasDeclaration2 skipwhite
+syn match crystalAliasDeclaration2     "[^[:space:];#.()]\+" contained contains=crystalSymbol,crystalPredefinedVariable
+syn match crystalMethodDeclaration     "[^[:space:];#(]\+"   contained contains=crystalConstant,crystalFunction,crystalBoolean,crystalPseudoVariable,crystalInstanceVariable,crystalClassVariable
 syn match crystalFunctionDeclaration   "[^[:space:];#(=]\+"  contained contains=crystalFunction
 syn match crystalTypeDeclaration       "[^[:space:];#=]\+"   contained contains=crystalTypeName
 syn match crystalClassDeclaration      "[^[:space:];#<]\+"   contained contains=crystalClassName,crystalOperator
@@ -283,7 +272,6 @@ if !exists('b:crystal_no_expensive') && !exists('g:crystal_no_expensive')
   syn match crystalDefine     "\<alias\>"      nextgroup=crystalAliasDeclaration skipwhite skipnl
   syn match crystalDefine     "\<def\>"        nextgroup=crystalMethodDeclaration skipwhite skipnl
   syn match crystalDefine     "\<fun\>"        nextgroup=crystalFunctionDeclaration skipwhite skipnl
-  syn match crystalDefine     "\<undef\>"      nextgroup=crystalFunction skipwhite skipnl
   syn match crystalDefine     "\<\%(type\|alias\)\>\%(\s*\h\w*\s*=\)\@=" nextgroup=crystalTypeDeclaration skipwhite skipnl
   syn match crystalClass      "\<class\>"      nextgroup=crystalClassDeclaration skipwhite skipnl
   syn match crystalModule     "\<module\>"     nextgroup=crystalModuleDeclaration skipwhite skipnl
@@ -293,13 +281,17 @@ if !exists('b:crystal_no_expensive') && !exists('g:crystal_no_expensive')
   syn match crystalEnum       "\<enum\>"       nextgroup=crystalEnumDeclaration skipwhite skipnl
   syn match crystalAnnotation "\<annotation\>" nextgroup=crystalAnnotationDeclaration skipwhite skipnl
 
-  SynFold 'def'        syn region crystalMethodBlock start="\<\%(def\|macro\)\>" matchgroup=crystalDefine     end="\%(\<\%(def\|macro\)\_s\+\)\@<!\<end\>"  contains=TOP
-  SynFold 'class'      syn region crystalBlock       start="\<class\>"           matchgroup=crystalClass      end="\<end\>"                                 contains=TOP
-  SynFold 'module'     syn region crystalBlock       start="\<module\>"          matchgroup=crystalModule     end="\<end\>"                                 contains=TOP
-  SynFold 'struct'     syn region crystalBlock       start="\<struct\>"          matchgroup=crystalStruct     end="\<end\>"                                 contains=TOP
-  SynFold 'lib'        syn region crystalBlock       start="\<lib\>"             matchgroup=crystalLib        end="\<end\>"                                 contains=TOP
-  SynFold 'enum'       syn region crystalBlock       start="\<enum\>"            matchgroup=crystalEnum       end="\<end\>"                                 contains=TOP
-  SynFold 'annotation' syn region crystalBlock       start="\<annotation\>"      matchgroup=crystalAnnotation end="\<end\>"                                 contains=TOP
+  SynFold 'def'        syn region crystalMethodBlock start="\<def\>"        matchgroup=crystalDefine     end="\%(\<def\_s\+\)\@<!\<end\>"   contains=TOP,crystalForallKeyword
+  SynFold 'macro'      syn region crystalMethodBlock start="\<macro\>"      matchgroup=crystalDefine     end="\%(\<macro\_s\+\)\@<!\<end\>" contains=TOP
+  SynFold 'class'      syn region crystalBlock       start="\<class\>"      matchgroup=crystalClass      end="\<end\>"                      contains=TOP
+  SynFold 'module'     syn region crystalBlock       start="\<module\>"     matchgroup=crystalModule     end="\<end\>"                      contains=TOP
+  SynFold 'struct'     syn region crystalBlock       start="\<struct\>"     matchgroup=crystalStruct     end="\<end\>"                      contains=TOP
+  SynFold 'lib'        syn region crystalBlock       start="\<lib\>"        matchgroup=crystalLib        end="\<end\>"                      contains=TOP
+  SynFold 'enum'       syn region crystalBlock       start="\<enum\>"       matchgroup=crystalEnum       end="\<end\>"                      contains=TOP
+  SynFold 'annotation' syn region crystalBlock       start="\<annotation\>" matchgroup=crystalAnnotation end="\<end\>"                      contains=TOP
+
+  " keywords in method declaration
+  syn match crystalForallKeyword "\<forall\>[?!]\@!" contained containedin=crystalMethodBlock
 
   " modifiers
   syn match crystalConditionalModifier "\<\%(if\|unless\|ifdef\)\>" display
@@ -341,8 +333,9 @@ else
   syn match crystalControl "\<macro\>[?!]\@!"      nextgroup=crystalMacroDeclaration skipwhite skipnl
   syn match crystalControl "\<enum\>[?!]\@!"       nextgroup=crystalEnumDeclaration skipwhite skipnl
   syn match crystalControl "\<annotation\>[?!]\@!" nextgroup=crystalAnnotationDeclaration skipwhite skipnl
-  syn match crystalControl "\<\%(case\|begin\|do\|if\|ifdef\|unless\|while\|until\|else\|elsif\|ensure\|then\|when\|in\|end\)\>[?!]\@!"
-  syn match crystalKeyword "\<\%(alias\|undef\)\>[?!]\@!"
+  syn match crystalControl "\<\%(case\|begin\|do\|if\|ifdef\|unless\|while\|select\|until\|else\|elsif\|ensure\|then\|when\|in\|end\)\>[?!]\@!"
+  syn match crystalKeyword "\<alias\>[?!]\@!"
+  syn match crystalForallKeyword "\<forall\>[?!]\@!"
 endif
 
 " Link attribute
@@ -353,13 +346,13 @@ if !exists('g:crystal_no_special_methods')
   syn keyword crystalAccess    protected private
   " attr is a common variable name
   syn keyword crystalAttribute abstract
-  syn match   crystalAttribute "\<\%(class_\)\=\%(getter\|setter\|property\)[!?]\=\s" display
+  syn match   crystalAttribute "\<\%(\%(class_\)\=\%(getter\|setter\|property\)[!?]\=\|def_\%(clone\|equals\|equals_and_hash\|hash\)\|delegate\|forward_missing_to\)\s" display
   syn match   crystalControl   "\<\%(abort\|at_exit\|exit\|fork\|loop\)\>[?!]\@!" display
   syn keyword crystalException raise
   " false positive with 'include?'
   syn match   crystalInclude   "\<include\>[?!]\@!" display
   syn keyword crystalInclude   extend require
-  syn keyword crystalKeyword   caller typeof pointerof sizeof instance_sizeof
+  syn keyword crystalKeyword   caller typeof pointerof sizeof instance_sizeof offsetof
   syn match   crystalRecord    "\<record\%(\s\+\u\w*\)\@=" display
 endif
 
@@ -404,16 +397,16 @@ SynFold '#' syn region crystalMultilineComment start="\%(\%(^\s*#.*\n\)\@<!\%(^\
 syn match crystalKeywordAsMethod "\%(\%(\.\@1<!\.\)\|::\)\_s*\%(alias\|begin\|break\|case\|class\|def\|defined\|do\|else\|select\)\>" transparent contains=NONE
 syn match crystalKeywordAsMethod "\%(\%(\.\@1<!\.\)\|::\)\_s*\%(elsif\|end\|ensure\|false\|for\|if\|ifdef\|in\|module\|next\|nil\)\>" transparent contains=NONE
 syn match crystalKeywordAsMethod "\%(\%(\.\@1<!\.\)\|::\)\_s*\%(rescue\|return\|self\|super\|previous_def\|then\|true\)\>" transparent contains=NONE
-syn match crystalKeywordAsMethod "\%(\%(\.\@1<!\.\)\|::\)\_s*\%(undef\|unless\|until\|when\|in\|while\|yield\|with\|__FILE__\|__LINE__\)\>" transparent contains=NONE
+syn match crystalKeywordAsMethod "\%(\%(\.\@1<!\.\)\|::\)\_s*\%(unless\|until\|when\|in\|while\|yield\|with\|__FILE__\|__LINE__\)\>" transparent contains=NONE
 
 syn match crystalKeywordAsMethod "\<\%(alias\|begin\|case\|class\|def\|do\|end\)[?!]" transparent contains=NONE
-syn match crystalKeywordAsMethod "\<\%(if\|ifdef\|module\|undef\|unless\|until\|while\)[?!]" transparent contains=NONE
+syn match crystalKeywordAsMethod "\<\%(if\|ifdef\|module\|unless\|until\|while\)[?!]" transparent contains=NONE
 
 syn match crystalKeywordAsMethod "\%(\%(\.\@1<!\.\)\|::\)\_s*\%(abort\|at_exit\|caller\|exit\)\>" transparent contains=NONE
 syn match crystalKeywordAsMethod "\%(\%(\.\@1<!\.\)\|::\)\_s*\%(extend\|fork\|include\|asm\)\>" transparent contains=NONE
 syn match crystalKeywordAsMethod "\%(\%(\.\@1<!\.\)\|::\)\_s*\%(loop\|private\|protected\)\>" transparent contains=NONE
 syn match crystalKeywordAsMethod "\%(\%(\.\@1<!\.\)\|::\)\_s*\%(require\|raise\)\>" transparent contains=NONE
-syn match crystalKeywordAsMethod "\%(\%(\.\@1<!\.\)\|::\)\_s*\%(typeof\|pointerof\|sizeof\|instance_sizeof\|\)\>" transparent contains=NONE
+syn match crystalKeywordAsMethod "\%(\%(\.\@1<!\.\)\|::\)\_s*\%(typeof\|pointerof\|sizeof\|instance_sizeof\|offsetof\|\)\>" transparent contains=NONE
 
 hi def link crystalClass               crystalDefine
 hi def link crystalModule              crystalDefine
@@ -450,7 +443,6 @@ hi def link crystalStructName           crystalConstant
 hi def link crystalLibName              crystalConstant
 hi def link crystalEnumName             crystalConstant
 hi def link crystalAnnotationName       crystalConstant
-hi def link crystalGlobalVariable       crystalIdentifier
 hi def link crystalBlockParameter       crystalIdentifier
 hi def link crystalInstanceVariable     crystalIdentifier
 hi def link crystalFreshVariable        crystalIdentifier
@@ -486,9 +478,9 @@ hi def link crystalRegexp               crystalString
 hi def link crystalMacro                PreProc
 hi def link crystalMacroDelim           crystalMacro
 hi def link crystalMacroKeyword         crystalKeyword
+hi def link crystalForallKeyword        crystalDefine
 hi def link crystalLinkAttrDelim        crystalMacroDelim
 hi def link crystalError                Error
-hi def link crystalInvalidVariable      crystalError
 hi def link crystalSpaceError           crystalError
 hi def link crystalInvalidInteger       crystalError
 
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 056df9c41..42ed6acb6 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -143,7 +143,7 @@ exec 'syntax region  juliaConditionalEBlock	matchgroup=juliaConditional transpar
 exec 'syntax region  juliaWhileBlock		matchgroup=juliaRepeat start="'.s:nodot.'\<while\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaForBlock		matchgroup=juliaRepeat start="'.s:nodot.'\<for\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaOuter fold'
 exec 'syntax region  juliaBeginBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<begin\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
-exec 'syntax region  juliaFunctionBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<function\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
+exec 'syntax region  juliaFunctionBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<function\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaMacroBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<macro\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaQuoteBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<quote\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaStructBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
@@ -344,7 +344,7 @@ exec 'syntax region   juliaQuotedParBlockS	matchgroup=juliaQParDelim contained s
 " force precedence over Symbols
 syntax match   juliaOperator		display "::"
 
-syntax region  juliaCommentL		matchgroup=juliaCommentDelim excludenl start="#\ze\%([^=]\|$\)" end="$" contains=juliaTodo,juliaCommentM,@juliaSpellcheckComments
+syntax region  juliaCommentL		matchgroup=juliaCommentDelim excludenl start="#\ze\%([^=]\|$\)" end="$" contains=juliaTodo,@juliaSpellcheckComments
 syntax region  juliaCommentM		matchgroup=juliaCommentDelim fold start="#=\ze\%([^#]\|$\)" end="=#" contains=juliaTodo,juliaCommentM,@juliaSpellcheckComments
 syntax keyword juliaTodo		contained TODO FIXME XXX
 
diff --git a/syntax/lilypond-words.vim b/syntax/lilypond-words.vim
deleted file mode 100644
index 5d3c5a901..000000000
--- a/syntax/lilypond-words.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'syntax/lilypond-words.vim')
-  finish
-endif
-
-syn match lilyKeyword "[-_^]\?\\\(xNotesOn\|xNotesOff\|xNote\|wordwrap-string-internal\|wordwrap-string\|wordwrap-lines\|wordwrap-internal\|wordwrap-field\|wordwrap\|withMusicProperty\|with-url\|with-link\|with-dimensions\|with-color\|with\|whiteout\|whiteTriangleMarkup\|walkerHeadsMinor\|walkerHeads\|vspace\|void\|voiceTwoStyle\|voiceTwo\|voiceThreeStyle\|voiceThree\|voiceOneStyle\|voiceOne\|voiceNeutralStyle\|voiceFourStyle\|voiceFour\|vocalName\|virgula\|virga\|verylongfermata\|versus\|version\|verbatim-file\|vcenter\|varcoda\|upright\|upprall\|upmordent\|upbow\|up\|unset\|unit\|unfoldRepeats\|undo\|underline\|unaCorda\|unHideNotes\|typewriter\|type\|tweak\|turn\|tupletUp\|tupletSpan\|tupletNeutral\|tupletDown\|tuplet\|trill\|triangle\|treCorde\|transposition\|transposedCueDuring\|transpose\|transparent\|translate-scaled\|translate\|topLevelAlignment\|tocTitleMarkup\|tocItemWithDotsMarkup\|tocItemMarkup\|tocItem\|tiny\|timing\|times\|timeSignatureSettings\|timeSignatureFraction\|time\|tied-lyric\|tieWaitForNote\|tieUp\|tieSolid\|tieNeutral\|tieHalfSolid\|tieHalfDashed\|tieDown\|tieDotted\|tieDashed\|tieDashPattern\|thumb\|textSpannerUp\|textSpannerNeutral\|textSpannerDown\|textLengthOn\|textLengthOff\|text\|tenuto\|temporary\|tempoWholesPerMinute\|tempo\|teeny\|tag\|table-of-contents\|tablatureFormat\|tabStaffLineLayoutFunction\|tabFullNotation\|systemStartDelimiter\|sustainOn\|sustainOff\|super\|subdivideBeams\|sub\|styledNoteHeads\|strut\|stropha\|strokeFingerOrientations\|stringTunings\|stringOneTopmost\|stringNumberOrientations\|stopped\|stopTrillSpan\|stopTextSpan\|stopStaff\|stopSlashedGraceMusic\|stopMeasureCount\|stopGroup\|stopGraceSlur\|stopGraceMusic\|stopAppoggiaturaMusic\|stopAcciaccaturaMusic\|stop\|stencil\|stemUp\|stemNeutral\|stemDown\|startTrillSpan\|startTextSpan\|startStaff\|startSlashedGraceMusic\|startRepeatType\|startMeasureCount\|startGroup\|startGraceSlur\|startGraceMusic\|startAppoggiaturaMusic\|startAcciaccaturaMusic\|start\|staccato\|staccatissimo\|squashedPosition\|spp\|spacingTweaks\|sp\|southernHarmonyHeadsMinor\|southernHarmonyHeads\|sostenutoOn\|sostenutoOff\|soloText\|soloIIText\|snappizzicato\|smaller\|smallCaps\|small\|slurUp\|slurSolid\|slurNeutral\|slurHalfSolid\|slurHalfDashed\|slurDown\|slurDotted\|slurDashed\|slurDashPattern\|slashedGrace\|slashed-digit\|slashChordSeparator\|skipTypesetting\|skip\|single\|simultaneous\|simple\|signumcongruentiae\|showStaffSwitch\|showSplitTiedTabNotes\|shortfermata\|shortVocalName\|shortInstrumentName\|shiftOnnn\|shiftOnn\|shiftOn\|shiftOff\|shiftDurations\|sharp\|shape\|sfz\|sfp\|sff\|sf\|settingsFrom\|setDefaultDurationToQuarter\|set\|sesquisharp\|sesquiflat\|sequential\|semisharp\|semiflat\|semicirculus\|semiGermanChords\|segno\|searchForVoice\|scriptDefinitions\|score\|scaleDurations\|scale\|sans\|sacredHarpHeadsMinor\|sacredHarpHeads\|rtoe\|rounded-box\|rotate\|roman\|rightHandFinger\|right-column\|right-brace\|right-align\|right\|rheel\|rfz\|revertTimeSignatureSettings\|revert\|reverseturn\|retrograde\|restrainOpenStrings\|rest-by-number\|rest\|responsum\|resetRelativeOctave\|replace\|repeatTie\|repeatCountVisibility\|repeat\|removeWithTag\|remove\|relative\|rehearsalMark\|raise\|quotedEventTypes\|quotedCueEventTypes\|quoteDuring\|quilisma\|put-adjacent\|pushToTag\|pt\|property-recursive\|printPartCombineTexts\|printKeyCancellation\|predefinedFretboardsOn\|predefinedFretboardsOff\|predefinedDiagramTable\|prallup\|prallprall\|prallmordent\|pralldown\|prall\|ppppp\|pppp\|ppp\|pp\|powerChords\|powerChordSymbol\|powerChordExceptions\|postscript\|portato\|pointAndClickTypes\|pointAndClickOn\|pointAndClickOff\|pitchedTrill\|phrygian\|phrasingSlurUp\|phrasingSlurSolid\|phrasingSlurNeutral\|phrasingSlurHalfSolid\|phrasingSlurHalfDashed\|phrasingSlurDown\|phrasingSlurDotted\|phrasingSlurDashed\|phrasingSlurDashPattern\|pes\|pedalUnaCordaStyle\|pedalUnaCordaStrings\|pedalSustainStyle\|pedalSustainStrings\|pedalSostenutoStyle\|pedalSostenutoStrings\|pattern\|path\|partialJazzMusic\|partialJazzExceptions\|partial\|partcombineUp\|partcombineUnisonoOnce\|partcombineUnisono\|partcombineSoloIOnce\|partcombineSoloIIOnce\|partcombineSoloII\|partcombineSoloI\|partcombineForce\|partcombineDown\|partcombineChordsOnce\|partcombineChords\|partcombineAutomaticOnce\|partcombineAutomatic\|partcombineApartOnce\|partcombineApart\|partcombine\|partCombineTextsOnNote\|partCombineListener\|parenthesize\|parallelMusic\|paper\|palmMuteOn\|palmMuteOff\|palmMute\|pageTurn\|pageBreak\|page-ref\|page-link\|pad-x\|pad-to-box\|pad-markup\|pad-around\|p\|overrideTimeSignatureSettings\|overrideProperty\|override-lines\|override\|oval\|ottava\|oriscus\|open\|oneVoice\|once\|on-the-fly\|omit\|offset\|octaveCheck\|numericTimeSignature\|number\|null\|notemode\|noteToFretFunction\|note-by-number\|note\|normalsize\|normal-text\|normal-size-super\|normal-size-sub\|noPageTurn\|noPageBreak\|noChordSymbol\|noBreak\|noBeam\|newSpacingSection\|new\|neumeDemoLayout\|natural\|name\|musicglyph\|musicMap\|mp\|mordent\|modalTranspose\|modalInversion\|mm\|mixolydian\|minorChordModifier\|minor\|midiInstrument\|midiChannelMapping\|midi\|middleCPosition\|middleCClefPosition\|mf\|metronomeMarkFormatter\|mergeDifferentlyHeadedOn\|mergeDifferentlyHeadedOff\|mergeDifferentlyDottedOn\|mergeDifferentlyDottedOff\|melismaEnd\|melismaBusyProperties\|melisma\|medium\|maxima\|markuplist\|markup\|markletter\|markalphabet\|markLengthOn\|markLengthOff\|markFormatter\|mark\|marcato\|map-markup-commands\|makeClusters\|majorSevenSymbol\|major\|maininput\|magnify\|lyricsto\|lyrics\|lyricmode\|lyricMelismaAlignment\|lydian\|ltoe\|lower\|lookup\|longfermata\|longa\|locrian\|localKeySignature\|lineprall\|linea\|line\|ligature\|lheel\|left-column\|left-brace\|left-align\|left\|layout\|larger\|large\|languageSaveAndChange\|languageRestore\|language\|laissezVibrer\|label\|killCues\|kievanOn\|kievanOff\|keyAlterationOrder\|key\|keepWithTag\|keepAliveInterfaces\|justify-string\|justify-field\|justify\|justified-lines\|italic\|italianChords\|ionian\|inversion\|interscoreline\|instrumentTransposition\|instrumentSwitch\|instrumentName\|instrumentEqualizer\|indent\|include\|inclinatum\|inStaffSegno\|in\|improvisationOn\|improvisationOff\|implicitTimeSignatureVisibility\|ij\|iij\|ignoreFiguredBassRest\|ignoreBarChecks\|ignatzekExceptions\|ignatzekExceptionMusic\|ictus\|huge\|hspace\|highStringOne\|hideStaffSwitch\|hideSplitTiedTabNotes\|hideNotes\|hide\|header\|hcenter-in\|hbracket\|harp-pedal\|harmonicsOn\|harmonicsOff\|harmonicNote\|harmonicByRatio\|harmonicByFret\|harmonicAccidentals\|harmonic\|handleNegativeFrets\|halign\|halfopen\|grobdescriptions\|graceSettings\|grace\|glissando\|germanChords\|general-align\|fz\|funkHeadsMinor\|funkHeads\|fullJazzExceptions\|fromproperty\|fret-diagram-verbose\|fret-diagram-terse\|fret-diagram\|frenchChords\|fraction\|fp\|footnote\|fontsize\|fontSize\|fontCaps\|flexa\|flat\|flageolet\|firstClef\|fingeringOrientations\|finger\|finalis\|filled-box\|fill-with-pattern\|fill-line\|figures\|figuremode\|figuredBassFormatter\|fffff\|ffff\|fff\|ff\|fermataMarkup\|fermata\|featherDurations\|f\|eyeglasses\|extraNatural\|explicitKeySignatureVisibility\|explicitCueClefVisibility\|explicitClefVisibility\|expandFullBarRests\|eventChords\|espressivo\|epsfile\|episemInitium\|episemFinis\|endincipit\|enddim\|enddecresc\|enddecr\|endcresc\|endcr\|endSpanners\|endRepeatType\|ellipse\|easyHeadsOn\|easyHeadsOff\|dynamicUp\|dynamicNeutral\|dynamicDown\|dynamicAbsoluteVolumeFunction\|dynamic\|drums\|drummode\|drumStyleTable\|drumPitchTable\|draw-line\|draw-hline\|draw-dotted-line\|draw-dashed-line\|draw-circle\|downprall\|downmordent\|downbow\|down\|doublesharp\|doubleflat\|doubleRepeatType\|dotsUp\|dotsNeutral\|dotsDown\|dorian\|divisioMinima\|divisioMaxima\|divisioMaior\|displayScheme\|displayMusic\|displayLilyMusic\|dir-column\|dimTextDim\|dimTextDecresc\|dimTextDecr\|dimHairpin\|dim\|description\|descendens\|deprecatedenddim\|deprecatedendcresc\|deprecateddim\|deprecatedcresc\|denies\|deminutum\|defineBarLine\|defaultchild\|defaultTimeSignature\|defaultNoteHeads\|defaultBarType\|default\|decrescendoSpanner\|decresc\|decr\|deadNotesOn\|deadNotesOff\|deadNote\|dashUnderscore\|dashPlus\|dashLarger\|dashHat\|dashDot\|dashDash\|dashBang\|cueDuringWithClef\|cueDuring\|cueClefUnset\|cueClefTranspositionFormatter\|cueClef\|crossStaff\|crescendoSpanner\|crescTextCresc\|crescHairpin\|cresc\|createSpacing\|cr\|context\|consists\|concat\|compressFullBarRests\|compoundMeter\|command-name\|combine\|column-lines\|column\|coda\|cm\|clefTranspositionFormatter\|clefTransposition\|clefPosition\|clefGlyph\|clef\|circulus\|circle\|chords\|chordmodifiers\|chordmode\|chordRootNamer\|chordPrefixSpacer\|chordNoteNamer\|chordNameSeparator\|chordNameLowercaseMinor\|chordNameFunction\|chordNameExceptionsPartial\|chordNameExceptionsFull\|chordNameExceptions\|char\|change\|center-column\|center-align\|center\|cavum\|caps\|caesura\|cadenzaOn\|cadenzaOff\|breve\|breathe\|breakDynamicSpan\|break\|bracket\|box\|bookpart\|bookOutputSuffix\|bookOutputName\|book\|bold\|blackTriangleMarkup\|bigger\|bendAfter\|beamHalfMeasure\|beam\|bassStaffProperties\|bassFigureStaffAlignmentUp\|bassFigureStaffAlignmentNeutral\|bassFigureStaffAlignmentDown\|bassFigureExtendersOn\|bassFigureExtendersOff\|barNumberVisibility\|barNumberFormatter\|barNumberCheck\|barCheckSynchronize\|barAlways\|bar\|balloonText\|balloonLengthOn\|balloonLengthOff\|balloonGrobText\|backslashed-digit\|automaticBars\|autochange\|autoCautionaries\|autoBeaming\|autoBeamOn\|autoBeamOff\|autoBeamCheck\|autoAccidentals\|auto-footnote\|augmentum\|auctum\|assertBeamSlope\|assertBeamQuant\|ascendens\|arrow-head\|arpeggioParenthesisDashed\|arpeggioParenthesis\|arpeggioNormal\|arpeggioBracket\|arpeggioArrowUp\|arpeggioArrowDown\|arpeggio\|appoggiatura\|applyOutput\|applyMusic\|applyContext\|appendToTag\|alternative\|alterBroken\|allowVoltaHook\|allowPageTurn\|alias\|aikenHeadsMinor\|aikenHeads\|afterGraceFraction\|afterGrace\|aeolian\|addlyrics\|additionalPitchPrefix\|addQuote\|addInstrumentDefinition\|accidentalStyle\|acciaccatura\|accepts\|accentus\|accent\|absolute\|abs-fontsize\|aDueText\|RemoveEmptyTabStaffContext\|RemoveEmptyStaffContext\|RemoveEmptyRhythmicStaffContext\|RemoveEmptyDrumStaffContext\|IJ\|IIJ\|C\|B\|AncientRemoveEmptyStaffContext\|A\|n\)\(\A\|\n\)"me=e-1
-syn match lilyReservedWord "\(\A\|\n\)\(warnings\|staff\|spacing\|signature\|shift\|routine\|notes\|handler\|corrected\|beams\|arpeggios\|Volta_engraver\|Voice\|Vertical_align_engraver\|Vaticana_ligature_engraver\|VaticanaVoice\|VaticanaStaff\|Tweak_engraver\|Tuplet_engraver\|Trill_spanner_engraver\|Timing_translator\|Time_signature_performer\|Time_signature_engraver\|Tie_performer\|Tie_engraver\|Text_spanner_engraver\|Text_engraver\|Tempo_performer\|Tab_tie_follow_engraver\|Tab_staff_symbol_engraver\|Tab_note_heads_engraver\|TabVoice\|TabStaff\|System_start_delimiter_engraver\|Stem_engraver\|Stanza_number_engraver\|Stanza_number_align_engraver\|Staff_symbol_engraver\|Staff_performer\|Staff_collecting_engraver\|StaffGroup\|Staff\|Spanner_break_forbid_engraver\|Span_bar_stub_engraver\|Span_bar_engraver\|Span_arpeggio_engraver\|Spacing_engraver\|Slur_performer\|Slur_engraver\|Slash_repeat_engraver\|Separating_line_group_engraver\|Script_row_engraver\|Script_engraver\|Script_column_engraver\|Score\|Rhythmic_column_engraver\|RhythmicStaff\|Rest_engraver\|Rest_collision_engraver\|Repeat_tie_engraver\|Repeat_acknowledge_engraver\|Pure_from_neighbor_engraver\|Pitched_trill_engraver\|Pitch_squash_engraver\|Piano_pedal_performer\|Piano_pedal_engraver\|Piano_pedal_align_engraver\|PianoStaff\|Phrasing_slur_engraver\|PetrucciVoice\|PetrucciStaff\|Percent_repeat_engraver\|Part_combine_engraver\|Parenthesis_engraver\|Paper_column_engraver\|Output_property_engraver\|Ottava_spanner_engraver\|NullVoice\|Note_spacing_engraver\|Note_performer\|Note_name_engraver\|Note_heads_engraver\|Note_head_line_engraver\|NoteNames\|New_fingering_engraver\|Multi_measure_rest_engraver\|Midi_control_function_performer\|Metronome_mark_engraver\|Mensural_ligature_engraver\|MensuralVoice\|MensuralStaff\|Mark_engraver\|Lyrics\|Lyric_performer\|Lyric_engraver\|Ligature_bracket_engraver\|Ledger_line_engraver\|Laissez_vibrer_engraver\|Kievan_ligature_engraver\|KievanVoice\|KievanStaff\|Key_performer\|Key_engraver\|Keep_alive_together_engraver\|Instrument_switch_engraver\|Instrument_name_engraver\|Hyphen_engraver\|Grob_pq_engraver\|GregorianTranscriptionVoice\|GregorianTranscriptionStaff\|GrandStaff\|Grace_spacing_engraver\|Grace_engraver\|Grace_beam_engraver\|Grace_auto_beam_engraver\|Global\|Glissando_engraver\|Fretboard_engraver\|FretBoards\|Forbid_line_break_engraver\|Footnote_engraver\|Font_size_engraver\|Fingering_engraver\|Fingering_column_engraver\|Figured_bass_position_engraver\|Figured_bass_engraver\|FiguredBass\|Extender_engraver\|Episema_engraver\|Dynamics\|Dynamic_performer\|Dynamic_engraver\|Dynamic_align_engraver\|Drum_notes_engraver\|Drum_note_performer\|DrumVoice\|DrumStaff\|Double_percent_repeat_engraver\|Dots_engraver\|Dot_column_engraver\|Devnull\|Default_bar_line_engraver\|Custos_engraver\|Cue_clef_engraver\|CueVoice\|Control_track_performer\|Concurrent_hairpin_engraver\|Collision_engraver\|Cluster_spanner_engraver\|Clef_engraver\|Chord_tremolo_engraver\|Chord_name_engraver\|ChordNames\|ChordNameVoice\|ChoirStaff\|Breathing_sign_engraver\|Break_align_engraver\|Bend_engraver\|Beam_performer\|Beam_engraver\|Beam_collision_engraver\|Bar_number_engraver\|Bar_engraver\|Axis_group_engraver\|Auto_beam_engraver\|Arpeggio_engraver\|Accidental_engraver\|Score\)\(\A\|\n\)"ms=s+1,me=e-1
-syn match lilyNote "\<\(\(\(solx\|soltcs\|soltcb\|solstqt\|solss\|solsqt\|solsd\|solsb\|sols\|solkk\|solk\|soldsd\|soldd\|sold\|solcs\|solcb\|solbtqt\|solbsb\|solbqt\|solbb\|solb\|sol\|six\|sitcs\|sitcb\|sistqt\|siss\|sisqt\|sisd\|sisb\|sis\|sikk\|sik\|sidsd\|sidd\|sid\|sics\|sicb\|sibtqt\|sibsb\|sibqt\|sibb\|sib\|si\|rex\|retcs\|retcb\|restqt\|ress\|resqt\|resd\|resb\|res\|rekk\|rek\|redsd\|redd\|red\|recs\|recb\|rebtqt\|rebsb\|rebqt\|rebb\|reb\|re\|mix\|mitcs\|mitcb\|mistqt\|miss\|misqt\|misd\|misb\|mis\|mikk\|mik\|midsd\|midd\|mid\|mics\|micb\|mibtqt\|mibsb\|mibqt\|mibb\|mib\|mi\|lax\|latcs\|latcb\|lastqt\|lass\|lasqt\|lasd\|lasb\|las\|lakk\|lak\|ladsd\|ladd\|lad\|lacs\|lacb\|labtqt\|labsb\|labqt\|labb\|lab\|la\|hississ\|hiss\|hisis\|hisih\|his\|hih\|hessess\|heses\|heseh\|h\|gx\|gtqs\|gtqf\|gss\|gsharpsharp\|gsharp\|gs\|gqs\|gqf\|gississ\|giss\|gisis\|gisih\|gis\|gih\|gflatflat\|gflat\|gff\|gf\|gessess\|gess\|geses\|geseh\|ges\|geh\|g\|fx\|ftqs\|ftqf\|fss\|fsharpsharp\|fsharp\|fs\|fqs\|fqf\|fississ\|fiss\|fisis\|fisih\|fis\|fih\|fflatflat\|fflat\|fff\|ff\|fessess\|fess\|feses\|feseh\|fes\|feh\|fax\|fatcs\|fatcb\|fastqt\|fass\|fasqt\|fasd\|fasb\|fas\|fakk\|fak\|fadsd\|fadd\|fad\|facs\|facb\|fabtqt\|fabsb\|fabqt\|fabb\|fab\|fa\|f\|ex\|etqs\|etqf\|essess\|ess\|esharpsharp\|esharp\|eses\|eseh\|es\|eqs\|eqf\|eississ\|eiss\|eisis\|eisih\|eis\|eih\|eflatflat\|eflat\|eff\|ef\|eessess\|eess\|eeses\|eeseh\|ees\|eeh\|e\|dx\|dtqs\|dtqf\|dss\|dsharpsharp\|dsharp\|ds\|dqs\|dqf\|dox\|dotcs\|dotcb\|dostqt\|doss\|dosqt\|dosd\|dosb\|dos\|dokk\|dok\|dodsd\|dodd\|dod\|docs\|docb\|dobtqt\|dobsb\|dobqt\|dobb\|dob\|do\|dississ\|diss\|disis\|disih\|dis\|dih\|dflatflat\|dflat\|dff\|df\|dessess\|dess\|deses\|deseh\|des\|deh\|d\|cx\|ctqs\|ctqf\|css\|csharpsharp\|csharp\|cs\|cqs\|cqf\|cississ\|ciss\|cisis\|cisih\|cis\|cih\|cflatflat\|cflat\|cff\|cf\|cessess\|cess\|ceses\|ceseh\|ces\|ceh\|c\|bx\|btqs\|btqf\|bss\|bsharpsharp\|bsharp\|bs\|bqs\|bqf\|bisis\|bisih\|bis\|bih\|bflatflat\|bflat\|bff\|bf\|bess\|beses\|beseh\|bes\|beh\|bb\|b\|ax\|atqs\|atqf\|assess\|ass\|asharpsharp\|asharp\|ases\|aseh\|asas\|asah\|as\|aqs\|aqf\|aississ\|aiss\|aisis\|aisih\|ais\|aih\|aflatflat\|aflat\|aff\|af\|aessess\|aess\|aeses\|aeseh\|aes\|aeh\|a\|a\)\([,']\)\{,4}\([?!]\)\?\)\|s\|r\|R\|q\)\(\(128\|64\|32\|16\|8\|4\|2\|1\|\\breve\|\\longa\|\\maxima\)[.]\{,8}\)\?\(\A\|\n\)"me=e-1
diff --git a/syntax/lilypond.vim b/syntax/lilypond.vim
deleted file mode 100644
index c8ea6d465..000000000
--- a/syntax/lilypond.vim
+++ /dev/null
@@ -1,91 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'syntax/lilypond.vim')
-  finish
-endif
-
-" LilyPond syntax file
-" Language:	LilyPond
-" Maintainer:	Heikki Junes <hjunes@cc.hut.fi>
-" Last Change:	2010 Jul 26
-"
-" Installed As:	vim/syntax/lilypond.vim
-" Uses Generated File:	vim/syntax/lilypond-words.vim
-"
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-" Read the LilyPond syntax match groups: 
-"   lilyKeyword, lilyReservedWord, lilyNote
-if version < 600
-  so <sfile>:p:h/lilypond-words.vim
-else
-  runtime! syntax/lilypond-words.vim
-  if exists("b:current_syntax")
-    unlet b:current_syntax
-  endif
-endif
-
-" Match also parethesis of angle type
-setlocal mps+=<:>
-
-" Case matters
-syn case match
-
-syn cluster lilyMatchGroup	contains=lilyMatcher,lilyString,lilyComment,lilyStatement,lilyNumber,lilySlur,lilySpecial,lilyNote,lilyKeyword,lilyArticulation,lilyReservedWord,lilyScheme
-
-syn region lilyMatcher	matchgroup=Delimiter start="{" skip="\\\\\|\\[<>]"	end="}"	contains=@lilyMatchGroup fold
-syn region lilyMatcher	matchgroup=Delimiter start="\["		end="]"	contains=@lilyMatchGroup fold
-syn region lilyMatcher	matchgroup=Delimiter start="<" skip="\\\\\|\\[{<>}]" end=">"	contains=@lilyMatchGroup fold
-
-syn region lilyString	start=/"/ end=/"/ skip=/\\"/
-syn region lilyComment	start="%{" skip="%$" end="%}"
-syn region lilyComment	start="%\([^{]\|$\)" end="$"
-
-syn match lilyNumber	"[-_^.]\?\d\+[.]\?"
-syn match lilySlur	"[(~)]"
-syn match lilySlur	"\\[()]"
-syn match lilySpecial	"\\[<!>\\]"
-" avoid highlighting the extra character in situations like
-" c--\mf c^^\mf c__\mf
-syn match lilyArticulation	"[-_^][-_^+|>.]"
-
-" Include Scheme syntax highlighting, where appropriate
-syn include @embeddedScheme syntax/scheme.vim
-unlet b:current_syntax
-syn region lilyScheme matchgroup=Delimiter start="#['`]\?(" matchgroup=Delimiter end=")" contains=@embeddedScheme
-
-" Rest of syntax highlighting rules start here
-"
-" " Define the default highlighting.
-" " For version 5.7 and earlier: only when not done already
-" " For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lily_syn_inits")
-  if version < 508
-    let did_lily_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink Delimiter	Identifier
-  
-  HiLink lilyString	String
-  HiLink lilyComment	Comment
- 
-  HiLink lilyNote	Identifier
-  HiLink lilyArticulation	PreProc
-  HiLink lilyKeyword	Keyword
-  HiLink lilyReservedWord	Type
-
-  HiLink lilyNumber	Constant
-  HiLink lilySpecial	Special
-  HiLink lilySlur	ModeMsg
-
-  delcommand HiLink
-endif
-
-let b:current_syntax = "lilypond"
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index 032c133df..c3508ce8c 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -27,6 +27,9 @@ if exists("b:current_syntax") && b:current_syntax == "ocaml"
   finish
 endif
 
+let s:keepcpo = &cpo
+set cpo&vim
+
 " ' can be used in OCaml identifiers
 setlocal iskeyword+='
 
@@ -388,4 +391,7 @@ hi def link ocamlPpxEncl       ocamlEncl
 
 let b:current_syntax = "ocaml"
 
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
 " vim: ts=8
diff --git a/syntax/odin.vim b/syntax/odin.vim
index bafd95752..10374351b 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -8,6 +8,7 @@ endif
 
 syntax keyword odinUsing using
 syntax keyword odinTransmute transmute
+syntax keyword odinCast cast
 syntax keyword odinDistinct distinct
 syntax keyword odinOpaque opaque
 
@@ -68,7 +69,6 @@ syntax match odinFunction "\v<\w*>(\s*::\s*proc)@="
 
 syntax match odinTagNote "@\<\w\+\>" display
 
-syntax match odinClass "\v<[A-Z]\w+>" display
 syntax match odinConstant "\v<[A-Z0-9,_]+>" display
 syntax match odinRange "\.\." display
 syntax match odinHalfRange "\.\.\<" display
@@ -79,7 +79,11 @@ syntax match odinReturnOp "->" display
 
 syntax match odinInteger "\-\?\<\d\+\>" display
 syntax match odinFloat "\-\?\<[0-9][0-9_]*\%(\.[0-9][0-9_]*\)\%([eE][+-]\=[0-9_]\+\)\=" display
-syntax match odinHex "\-\?\<0x[0-9A-Fa-f]\+\>" display
+syntax match odinHex "\<0[xX][0-9A-Fa-f]\+\>" display
+syntax match odinDoz "\<0[zZ][0-9a-bA-B]\+\>" display
+syntax match odinOct "\<0[oO][0-7]\+\>" display
+syntax match odinBin "\<0[bB][01]\+\>" display
+
 syntax match odinAddressOf "&" display
 syntax match odinDeref "\^" display
 
@@ -93,6 +97,7 @@ syntax region odinBlockComment start=/\v\/\*/ end=/\v\*\// contains=odinBlockCom
 
 highlight link odinUsing Keyword
 highlight link odinTransmute Keyword
+highlight link odinCast Keyword
 highlight link odinDistinct Keyword
 highlight link odinOpaque Keyword
 highlight link odinReturn Keyword
@@ -162,8 +167,6 @@ highlight link odinFixMe Todo
 highlight link odinNoCheckin Todo
 highlight link odinHack Todo
 
-highlight link odinClass Type
-
 highlight link odinTemplate Constant
 
 highlight link odinTagNote Identifier
@@ -174,5 +177,8 @@ highlight link odinNull Type
 highlight link odinInteger Number
 highlight link odinFloat Float
 highlight link odinHex Number
+highlight link odinOct Number
+highlight link odinBin Number
+highlight link odinDoz Number
 
 let b:current_syntax = "odin"
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 81acfd2ba..70c3d38c5 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -9,7 +9,7 @@ endif
 " License:      Vim license (see `:help license`)
 
 " Based on PostgreSQL 13.1
-" Automatically generated on 2020-12-30 at 10:21:40
+" Automatically generated on 2021-01-13 at 20:54:21
 
 if exists("b:current_syntax")
   finish
@@ -2010,20 +2010,26 @@ else
     \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlString,sqlTodo
 endif
 
-" Folding
-syn region sqlFold start='^\s*\zs\c\(create\|update\|alter\|select\|insert\|do\)\>' end=';$' transparent fold contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo,plpgsql
+let s:plgroups = 'plpgsql'
 
 " PL/<any other language>
 fun! s:add_syntax(s)
-  execute 'syn include @PL' . a:s . ' syntax/' . a:s . '.vim'
+  execute 'syn include @PL' .. a:s .. ' syntax/' .. a:s .. '.vim'
   unlet b:current_syntax
-  execute 'syn region pgsqlpl' . a:s . ' matchgroup=sqlString start=+\$' . a:s . '\$+ end=+\$' . a:s . '\$+ keepend contains=@PL' . a:s
+  execute 'syn region pgsqlpl' .. a:s .. ' matchgroup=sqlString start=+\$' .. a:s .. '\$+ end=+\$' .. a:s .. '\$+ keepend contains=@PL' .. a:s
+  let s:plgroups .= ',pgsqlpl' .. a:s
 endf
 
 for pl in get(b:, 'pgsql_pl', get(g:, 'pgsql_pl', []))
   call s:add_syntax(pl)
 endfor
 
+" Folding
+execute "syn region sqlFold start='^\s*\zs\c\(create\|update\|alter\|select\|insert\|do\)\>' end=';$' transparent fold "
+      \ .. "contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo," .. s:plgroups
+
+unlet s:plgroups
+
 " Default highlighting
 hi def link sqlCatalog        Constant
 hi def link sqlComment        Comment
diff --git a/syntax/prolog.vim b/syntax/prolog.vim
index c7c9dab4f..028b0000b 100644
--- a/syntax/prolog.vim
+++ b/syntax/prolog.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:    PROLOG
 " Maintainer:  Anton Kochkov <anton.kochkov@gmail.com>
-" Last Change: 2019 Aug 29
+" Last Change: 2021 Jan 05
 
 " There are two sets of highlighting in here:
 " If the "prolog_highlighting_clean" variable exists, it is rather sparse.
@@ -25,16 +25,16 @@ syn case match
 " Very simple highlighting for comments, clause heads and
 " character codes.  It respects prolog strings and atoms.
 
-syn region   prologCComment start=+/\*+ end=+\*/+
-syn match    prologComment  +%.*+
+syn region   prologCComment start=+/\*+ end=+\*/+ contains=@Spell
+syn match    prologComment  +%.*+ contains=@Spell
 
 if !exists("prolog_highlighting_no_keyword")
   syn keyword  prologKeyword  module meta_predicate multifile dynamic
 endif
 syn match    prologCharCode +0'\\\=.+
-syn region   prologString   start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn region   prologString   start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell
 syn region   prologAtom     start=+'+ skip=+\\\\\|\\'+ end=+'+
-syn region   prologClause   matchgroup=prologClauseHead start=+^\s*[a-z]\w*+ matchgroup=Normal end=+\.\s\|\.$+ contains=ALLBUT,prologClause
+syn region   prologClause   matchgroup=prologClauseHead start=+^\s*[a-z]\w*+ matchgroup=Normal end=+\.\s\|\.$+ contains=ALLBUT,prologClause contains=@NoSpell
 
 if !exists("prolog_highlighting_clean")
 
diff --git a/syntax/typescriptreact.vim b/syntax/typescriptreact.vim
index 123b4cafa..02fe927e8 100644
--- a/syntax/typescriptreact.vim
+++ b/syntax/typescriptreact.vim
@@ -111,13 +111,13 @@ syntax match tsxEqual +=+ display contained
 
 " <tag id="sample">
 "         s~~~~~~e
-syntax region tsxString contained start=+"+ end=+"+ contains=tsxEntity,@Spell display
+syntax region tsxString contained start=+["']+ end=+["']+ contains=tsxEntity,@Spell display
 
 " <tag key={this.props.key}>
 "          s~~~~~~~~~~~~~~e
 syntax region tsxEscJs
     \ contained
-    \ contains=@typescriptValue,@tsxComment
+    \ contains=@typescriptValue,@tsxComment,typescriptObjectSpread
     \ matchgroup=typescriptBraces
     \ start=+{+
     \ end=+}+

From 4c10562d2cc9b084518284c49a158558da5180a7 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 14 Jan 2021 21:11:27 +0100
Subject: [PATCH 232/299] Prevent overriding filetype set, fixes #663

---
 autoload/polyglot/init.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index bd91a37f7..837515ee8 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -2693,7 +2693,7 @@ func! s:Observe(fn)
   let b:PolyglotObserve = function("polyglot#" . a:fn)
   augroup polyglot-observer
     au!
-    au CursorHold,CursorHoldI <buffer> call b:PolyglotObserve()
+    au CursorHold,CursorHoldI <buffer> if (&ft == "" || &ft == "conf") | call b:PolyglotObserve() | endif
   augroup END
 endfunc
 

From cc63193ce82c1e7b9ee2ad7d0ddd14e8394211ef Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 1 Mar 2021 13:44:50 +0100
Subject: [PATCH 233/299] Update

---
 README.md                                    |   4 +-
 after/syntax/cpp.vim                         |   2 +-
 autoload/go/config.vim                       |   4 +
 autoload/polyglot/init.vim                   |   6 +-
 autoload/polyglot/sleuth.vim                 |  12 +-
 autoload/zig/config.vim                      |  43 --
 autoload/zig/fmt.vim                         | 177 +++------
 autoload/zig/list.vim                        | 162 --------
 autoload/zig/util.vim                        | 394 -------------------
 compiler/puppet-lint.vim                     |  27 ++
 compiler/sml.vim                             |  32 ++
 compiler/tidy.vim                            |  17 +-
 compiler/zig.vim                             |  32 ++
 compiler/zig_build.vim                       |  32 ++
 compiler/zig_build_exe.vim                   |  30 ++
 compiler/zig_test.vim                        |  30 ++
 extras/filetype.vim                          |  45 ++-
 ftplugin/ada.vim                             |  69 ++--
 ftplugin/basic.vim                           |  31 ++
 ftplugin/bzl.vim                             |   4 +-
 ftplugin/{embeddedpuppet.vim => epuppet.vim} |   2 +-
 ftplugin/framescript.vim                     |   6 +-
 ftplugin/freebasic.vim                       |  17 +
 ftplugin/hamster.vim                         |   7 +-
 ftplugin/lisp.vim                            |   4 +-
 ftplugin/octave.vim                          |   5 +
 ftplugin/rust.vim                            |   2 +-
 ftplugin/sxhkdrc.vim                         |  10 +
 ftplugin/tidy.vim                            |  36 ++
 ftplugin/vlang.vim                           |  31 ++
 ftplugin/zig.vim                             |   8 +-
 indent/fortran.vim                           |   6 +-
 indent/haskell.vim                           |  28 +-
 indent/html.vim                              |   8 +-
 indent/julia.vim                             |  12 +-
 indent/puppet.vim                            |   9 +-
 indent/ruby.vim                              |   3 +-
 syntax/Jenkinsfile.vim                       |   1 +
 syntax/basic.vim                             |  62 +--
 syntax/basic/literal.vim                     |   6 +-
 syntax/basic/type.vim                        |   3 +-
 syntax/c.vim                                 |  28 +-
 syntax/cabal-1.vim                           |   2 +-
 syntax/carp.vim                              |  10 +-
 syntax/cpp.vim                               |  17 +-
 syntax/crystal.vim                           |   6 +-
 syntax/{embeddedpuppet.vim => epuppet.vim}   |   4 +-
 syntax/groovy.vim                            |   7 +-
 syntax/haskell.vim                           |  19 +-
 syntax/html.vim                              |  25 +-
 syntax/julia.vim                             |  10 +-
 syntax/kotlin.vim                            |  28 +-
 syntax/lhaskell.vim                          |  23 +-
 syntax/messages.vim                          |   3 +-
 syntax/nginx.vim                             |   1 -
 syntax/ocaml.vim                             |  18 +-
 syntax/pgsql.vim                             |  38 +-
 syntax/puppet.vim                            |   6 +-
 syntax/rst.vim                               |   7 +-
 syntax/smt2.vim                              |  26 +-
 syntax/tidy.vim                              | 195 +++++++--
 syntax/zig.vim                               | 370 ++++++++++++-----
 62 files changed, 1178 insertions(+), 1084 deletions(-)
 delete mode 100644 autoload/zig/config.vim
 delete mode 100644 autoload/zig/list.vim
 delete mode 100644 autoload/zig/util.vim
 create mode 100644 compiler/puppet-lint.vim
 create mode 100644 compiler/sml.vim
 create mode 100644 compiler/zig.vim
 create mode 100644 compiler/zig_build.vim
 create mode 100644 compiler/zig_build_exe.vim
 create mode 100644 compiler/zig_test.vim
 create mode 100644 ftplugin/basic.vim
 rename ftplugin/{embeddedpuppet.vim => epuppet.vim} (98%)
 create mode 100644 ftplugin/freebasic.vim
 create mode 100644 ftplugin/octave.vim
 create mode 100644 ftplugin/tidy.vim
 rename syntax/{embeddedpuppet.vim => epuppet.vim} (94%)

diff --git a/README.md b/README.md
index be4ceb04e..c2fbd8f0c 100644
--- a/README.md
+++ b/README.md
@@ -126,7 +126,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [log](https://github.com/MTDL9/vim-log-highlighting) (Syntax highlighting for log and LOG files)
 - [lua](https://github.com/tbastos/vim-lua) (Lua syntax highlighting for lua, fcgi, nse, p8, rbxs, rockspec and wlua files)
 - [mako](https://github.com/sophacles/vim-bundle-mako) (Mako syntax highlighting for mako and mao files)
-- [markdown](https://github.com/plasticboy/vim-markdown) (Markdown syntax highlighting for md, markdown, mdown, mdwn, mkd, mkdn, mkdown, ronn and workbook files)
+- [markdown](https://github.com/plasticboy/vim-markdown) (Markdown syntax highlighting for md, markdown, mdown, mdwn, mkd, mkdn, mkdown, ronn, scd and workbook files)
 - [mathematica](https://github.com/voldikss/vim-mma) (Mathematica syntax highlighting for mathematica, cdf, m, ma, mt and 6 more files)
 - [mdx](https://github.com/jxnblk/vim-mdx-js) (Syntax highlighting for mdx files)
 - [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim) (Meson syntax highlighting for wrap files)
@@ -198,7 +198,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [velocity](https://github.com/lepture/vim-velocity) (Syntax highlighting for vm files)
 - [vue](https://github.com/posva/vim-vue) (Vue syntax highlighting for vue and wpy files)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (Syntax highlighting for xdc files)
-- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 94 more files)
+- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 95 more files)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax) (XSLT syntax highlighting for xslt and xsl files)
 - [yard](https://github.com/noprompt/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting for zep files)
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index 27e6abdbe..c8d98dbbd 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -120,7 +120,7 @@ if !exists('cpp_no_cpp17')
     syntax keyword cppSTLnamespace filesystem execution string_view_literals
 
     syntax keyword cppSTLtype
-            \ any is_execution_policy parallel_policy parallel_unsequenced_policy sequenced_policy directory_entry directory_iterator file_status file_time_type path recursive_directory_iterator space_info default_order default_searcher boyer_moore_searcher boyer_moore_horspool_searcher memory_resource monotonic_buffer_resource polymorphic_allocator pool_options synchronized_pool_resource unsynchronized_pool_resource scoped_lock optional shared_mutex basic_string_view string_view u16string_view u32string_view wstring_view bool_constant conjunction disjunction has_unique_object_representations invoke_result is_aggregate is_callable is_invocable is_invocable_r is_nothrow_invocable is_nothrow_invocable_r is_nothrow_swappable is_nothrow_swappable_with is_nowthrow_callable is_swappable is_swappable_with negation node_type insert_return_type in_place_tag monostate variant variant_size variant_alternative
+            \ any byte is_execution_policy parallel_policy parallel_unsequenced_policy sequenced_policy directory_entry directory_iterator file_status file_time_type path recursive_directory_iterator space_info default_order default_searcher boyer_moore_searcher boyer_moore_horspool_searcher memory_resource monotonic_buffer_resource polymorphic_allocator pool_options synchronized_pool_resource unsynchronized_pool_resource scoped_lock optional shared_mutex basic_string_view string_view u16string_view u32string_view wstring_view bool_constant conjunction disjunction has_unique_object_representations invoke_result is_aggregate is_callable is_invocable is_invocable_r is_nothrow_invocable is_nothrow_invocable_r is_nothrow_swappable is_nothrow_swappable_with is_nowthrow_callable is_swappable is_swappable_with negation node_type insert_return_type in_place_tag monostate variant variant_size variant_alternative
 
     syntax keyword cppSTLtypedef
             \ invoke_result_t default_order_t nullopt_t void_t in_place_t in_place_type_t in_place_index_t variant_alternative_t
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index ca89b16fb..cafba5f44 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -215,6 +215,10 @@ function! go#config#DebugWindows() abort
 
 endfunction
 
+function! go#config#DebugPreserveLayout() abort
+  return get(g:, 'go_debug_preserve_layout', 0)
+endfunction
+
 function! go#config#DebugAddress() abort
   return get(g:, 'go_debug_address', '127.0.0.1:8181')
 endfunction
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 837515ee8..d76343f0d 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -2257,7 +2257,7 @@ if !has_key(g:polyglot_is_disabled, 'jq')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'htmldjango')
-  au BufNewFile,BufRead *.j2,*.jinja,*.jinja2,*.njk setf htmldjango
+  au BufNewFile,BufRead *.j2,*.jinja,*.jinja2 setf htmldjango
 endif
 
 if !has_key(g:polyglot_is_disabled, 'jenkins')
@@ -2473,7 +2473,7 @@ if !has_key(g:polyglot_is_disabled, 'coffee-script')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'markdown')
-  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr setf markdown
+  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.scd,*.workbook,contents.lr setf markdown
 endif
 
 if !has_key(g:polyglot_is_disabled, 'cmake')
@@ -2592,7 +2592,7 @@ if !has_key(g:polyglot_is_disabled, 'ant')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rs,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
 endif
 
 if !has_key(g:polyglot_is_disabled, 'csv')
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index f3df470af..5a7dd3121 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -233,7 +233,7 @@ let s:globs = {
   \ 'html.handlebars': '*.handlebars,*.hbs,*.hdbs,*.hb',
   \ 'html.mustache': '*.mustache,*.hogan,*.hulk,*.hjs',
   \ 'html.twig': '*.twig',
-  \ 'htmldjango': '*.jinja,*.j2,*.jinja2,*.njk',
+  \ 'htmldjango': '*.jinja,*.j2,*.jinja2',
   \ 'htmlm4': '*.html.m4',
   \ 'httest': '*.htt,*.htb',
   \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config,.i3.config,.i3config',
@@ -263,7 +263,7 @@ let s:globs = {
   \ 'jovial': '*.jov,*.j73,*.jovial',
   \ 'jproperties': '*.properties,*.properties_??,*.properties_??_??,*.properties_??_??_*',
   \ 'jq': '*.jq,.jqrc,.jqrc*',
-  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.tern-config,.tern-project,.watchmanconfig,composer.lock,mcmod.info,Pipfile.lock',
+  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.tern-config,.tern-project,.watchmanconfig,Pipfile.lock,composer.lock,mcmod.info',
   \ 'json5': '*.json5',
   \ 'jsonc': '*.cjson,*.jsonc,coc-settings.json,.eslintrc.json,.babelrc,.jshintrc,.jslintrc,.mocharc.json,coffeelint.json,tsconfig.json,jsconfig.json',
   \ 'jsonnet': '*.jsonnet,*.libsonnet',
@@ -321,7 +321,7 @@ let s:globs = {
   \ 'manconf': 'man.config',
   \ 'map': '*.map',
   \ 'maple': '*.mv,*.mpl,*.mws',
-  \ 'markdown': '*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr',
+  \ 'markdown': '*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.scd,*.workbook,contents.lr',
   \ 'markdown.mdx': '*.mdx',
   \ 'mason': '*.mason,*.mhtml,*.comp',
   \ 'master': '*.mas,*.master',
@@ -436,7 +436,7 @@ let s:globs = {
   \ 'racket': '*.rkt,*.rktd,*.rktl,*.scrbl',
   \ 'radiance': '*.rad,*.mat',
   \ 'ragel': '*.rl',
-  \ 'raku': '*.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl,*.pl6,*.pm,*.pm6,*.t,*.rakudoc,*.rakutest,*.raku,*.rakumod,*.pod6,*.t6',
+  \ 'raku': '*.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl,*.pl6,*.pm,*.pm6,*.raku,*.rakumod,*.t,*.rakudoc,*.rakutest,*.pod6,*.t6',
   \ 'raml': '*.raml',
   \ 'ratpoison': '.ratpoisonrc,ratpoisonrc',
   \ 'razor': '*.cshtml,*.razor',
@@ -553,7 +553,7 @@ let s:globs = {
   \ 'tilde': '*.t.html',
   \ 'tli': '*.tli',
   \ 'tmux': '.tmux*.conf',
-  \ 'toml': '*.toml,Cargo.lock,Gopkg.lock,poetry.lock,Pipfile',
+  \ 'toml': '*.toml,Cargo.lock,Gopkg.lock,Pipfile,poetry.lock',
   \ 'tpp': '*.tpp',
   \ 'tptp': '*.p,*.tptp,*.ax',
   \ 'trasys': '*.inp',
@@ -612,7 +612,7 @@ let s:globs = {
   \ 'xhtml': '*.xhtml,*.xht',
   \ 'xinetd': '',
   \ 'xmath': '*.msc,*.msf',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rs,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
   \ 'xml.twig': '*.xml.twig',
   \ 'xmodmap': '*Xmodmap,*xmodmap*',
   \ 'xpm': '*.xpm,*.pm',
diff --git a/autoload/zig/config.vim b/autoload/zig/config.vim
deleted file mode 100644
index a96595aa2..000000000
--- a/autoload/zig/config.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'autoload/zig/config.vim')
-  finish
-endif
-
-function! zig#config#ListTypeCommands() abort
-  return get(g:, 'zig_list_type_commands', {})
-endfunction
-
-function! zig#config#ListType() abort
-  return get(g:, 'zig_list_type', '')
-endfunction
-
-function! zig#config#ListAutoclose() abort
-  return get(g:, 'zig_list_autoclose', 1)
-endfunction
-
-function! zig#config#ListHeight() abort
-  return get(g:, "zig_list_height", 0)
-endfunction
-
-function! zig#config#FmtAutosave() abort
-  return get(g:, "zig_fmt_autosave", 0)
-endfunction
-
-function! zig#config#SetFmtAutosave(value) abort
-  let g:zig_fmt_autosave = a:value
-endfunction
-
-function! zig#config#FmtCommand() abort
-  return get(g:, "zig_fmt_command", ['zig', 'fmt', '--color', 'off'])
-endfunction
-
-function! zig#config#FmtFailSilently() abort
-  return get(g:, "zig_fmt_fail_silently", 0)
-endfunction
-
-function! zig#config#FmtExperimental() abort
-  return get(g:, "zig_fmt_experimental", 0)
-endfunction
-
-function! zig#config#Debug() abort
-  return get(g:, 'zig_debug', [])
-endfunction
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index 2562be39a..7b31febd2 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -7,127 +7,70 @@ endif
 " Copyright 2011 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
-"
-function! zig#fmt#Format() abort
-  if zig#config#FmtExperimental()
-    " Using winsaveview to save/restore cursor state has the problem of
-    " closing folds on save:
-    "   https://github.com/fatih/vim-go/issues/502
-    " One fix is to use mkview instead. Unfortunately, this sometimes causes
-    " other bad side effects:
-    "   https://github.com/fatih/vim-go/issues/728
-    " and still closes all folds if foldlevel>0:
-    "   https://github.com/fatih/vim-go/issues/732
-    let l:curw = {}
-    try
-      mkview!
-    catch
-      let l:curw = winsaveview()
-    endtry
-
-    " save our undo file to be restored after we are done. This is needed to
-    " prevent an additional undo jump due to BufWritePre auto command and also
-    " restore 'redo' history because it's getting being destroyed every
-    " BufWritePre
-    let tmpundofile = tempname()
-    exe 'wundo! ' . tmpundofile
-  else
-    " Save cursor position and many other things.
-    let l:curw = winsaveview()
-  endif
 
+function! zig#fmt#Format() abort
   " Save cursor position and many other things.
-  let l:curw = winsaveview()
+  let view = winsaveview()
 
-  let bin_name = zig#config#FmtCommand()
-
-  " Get current position in file
-  let current_col = col('.')
-  let orig_line_count = line('$')
-
-  " Save current buffer first, else fmt will run on the original file and we
-  " will lose our changes.
-  silent! execute 'write' expand('%')
-
-  let [l:out, l:err] = zig#fmt#run(bin_name, expand('%'))
-
-  if l:err == 0
-    call zig#fmt#update_file(expand('%'))
-  elseif !zig#config#FmtFailSilently()
-    let errors = s:parse_errors(expand('%'), out)
-    call s:show_errors(errors)
-  endif
+  let current_buf = bufnr('')
 
-  let diff_offset = line('$') - orig_line_count
+  let bin_path = get(g:, 'zig_bin_path', 'zig')
+  let stderr_file = tempname()
+  let cmdline = printf('%s fmt --stdin 2> %s', bin_path, stderr_file)
 
-  if zig#config#FmtExperimental()
-    " restore our undo history
-    silent! exe 'rundo ' . tmpundofile
-    call delete(tmpundofile)
-
-    " Restore our cursor/windows positions, folds, etc.
-    if empty(l:curw)
-      silent! loadview
-    else
-      call winrestview(l:curw)
-    endif
+  " The formatted code is output on stdout, the errors go on stderr.
+  if exists('*systemlist')
+    silent let out = systemlist(cmdline, current_buf)
   else
-    " Restore our cursor/windows positions.
-    call winrestview(l:curw)
+    silent let out = split(system(cmdline, current_buf))
+  endif
+  let err = v:shell_error
+
+  if err == 0
+    " remove undo point caused via BufWritePre.
+    try | silent undojoin | catch | endtry
+
+    " Replace the file content with the formatted version.
+    call deletebufline(current_buf, len(out), line('$'))
+    call setline(1, out)
+
+    " No errors detected, close the loclist.
+    call setloclist(0, [], 'r')
+    lclose
+  elseif get(g:, 'zig_fmt_parse_errors', 1)
+    let errors = s:parse_errors(expand('%'), readfile(stderr_file))
+
+    call setloclist(0, [], 'r', {
+        \ 'title': 'Errors',
+        \ 'items': errors,
+        \ })
+
+    let max_win_height = get(g:, 'zig_fmt_max_window_height', 5)
+    " Prevent the loclist from becoming too long.
+    let win_height = min([max_win_height, len(errors)])
+    " Open the loclist, but only if there's at least one error to show.
+    execute 'lwindow ' . win_height
   endif
 
-  " be smart and jump to the line the new statement was added/removed
-  call cursor(line('.') + diff_offset, current_col)
-
-  " Syntax highlighting breaks less often.
-  syntax sync fromstart
-endfunction
-
-" update_file updates the target file with the given formatted source
-function! zig#fmt#update_file(target)
-  " remove undo point caused via BufWritePre
-  try | silent undojoin | catch | endtry
-
-  " reload buffer to reflect latest changes
-  silent edit!
+  call delete(stderr_file)
 
-  let l:listtype = zig#list#Type("ZigFmt")
+  call winrestview(view)
 
-  " the title information was introduced with 7.4-2200
-  " https://github.com/vim/vim/commit/d823fa910cca43fec3c31c030ee908a14c272640
-  if has('patch-7.4.2200')
-    " clean up previous list
-    if l:listtype == "quickfix"
-      let l:list_title = getqflist({'title': 1})
-    else
-      let l:list_title = getloclist(0, {'title': 1})
-    endif
-  else
-    " can't check the title, so assume that the list was for go fmt.
-    let l:list_title = {'title': 'Format'}
+  if err != 0
+    echohl Error | echomsg "zig fmt returned error" | echohl None
+    return
   endif
 
-  if has_key(l:list_title, "title") && l:list_title['title'] == "Format"
-    call zig#list#Clean(l:listtype)
-  endif
-endfunction
-
-" run runs the gofmt/goimport command for the given source file and returns
-" the output of the executed command. Target is the real file to be formatted.
-function! zig#fmt#run(bin_name, target)
-  let l:cmd = []
-  call extend(cmd, a:bin_name)
-  call extend(cmd, [a:target])
-  return zig#util#Exec(l:cmd)
+  " Run the syntax highlighter on the updated content and recompute the folds if
+  " needed.
+  syntax sync fromstart
 endfunction
 
 " parse_errors parses the given errors and returns a list of parsed errors
-function! s:parse_errors(filename, content) abort
-  let splitted = split(a:content, '\n')
-
+function! s:parse_errors(filename, lines) abort
   " list of errors to be put into location list
   let errors = []
-  for line in splitted
+  for line in a:lines
     let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\)\s*\(.*\)')
     if !empty(tokens)
       call add(errors,{
@@ -141,30 +84,4 @@ function! s:parse_errors(filename, content) abort
 
   return errors
 endfunction
-
-" show_errors opens a location list and shows the given errors. If the given
-" errors is empty, it closes the the location list
-function! s:show_errors(errors) abort
-  let l:listtype = zig#list#Type("ZigFmt")
-  if !empty(a:errors)
-    call zig#list#Populate(l:listtype, a:errors, 'Format')
-    echohl Error | echomsg "zig fmt returned error" | echohl None
-  endif
-
-  " this closes the window if there are no errors or it opens
-  " it if there is any
-  call zig#list#Window(l:listtype, len(a:errors))
-endfunction
-
-function! zig#fmt#ToggleFmtAutoSave() abort
-  if zig#config#FmtAutosave()
-    call zig#config#SetFmtAutosave(0)
-    call zig#util#EchoProgress("auto fmt disabled")
-    return
-  end
-
-  call zig#config#SetFmtAutosave(1)
-  call zig#util#EchoProgress("auto fmt enabled")
-endfunction
-
 " vim: sw=2 ts=2 et
diff --git a/autoload/zig/list.vim b/autoload/zig/list.vim
deleted file mode 100644
index 832ba1074..000000000
--- a/autoload/zig/list.vim
+++ /dev/null
@@ -1,162 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'autoload/zig/list.vim')
-  finish
-endif
-
-" Adapted from fatih/vim-go: autoload/go/list.vim
-"
-" Copyright 2011 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-"
-
-" Window opens the list with the given height up to 10 lines maximum.
-" Otherwise g:zig_loclist_height is used.
-"
-" If no or zero height is given it closes the window by default.
-" To prevent this, set g:zig_list_autoclose = 0
-function! zig#list#Window(listtype, ...) abort
-  " we don't use lwindow to close the location list as we need also the
-  " ability to resize the window. So, we are going to use lopen and lclose
-  " for a better user experience. If the number of errors in a current
-  " location list increases/decreases, cwindow will not resize when a new
-  " updated height is passed. lopen in the other hand resizes the screen.
-  if !a:0 || a:1 == 0
-    call zig#list#Close(a:listtype)
-    return
-  endif
-
-  let height = zig#config#ListHeight()
-  if height == 0
-    " prevent creating a large location height for a large set of numbers
-    if a:1 > 10
-      let height = 10
-    else
-      let height = a:1
-    endif
-  endif
-
-  if a:listtype == "locationlist"
-    exe 'lopen ' . height
-  else
-    exe 'copen ' . height
-  endif
-endfunction
-
-
-" Get returns the current items from the list
-function! zig#list#Get(listtype) abort
-  if a:listtype == "locationlist"
-    return getloclist(0)
-  else
-    return getqflist()
-  endif
-endfunction
-
-" Populate populate the list with the given items
-function! zig#list#Populate(listtype, items, title) abort
-  if a:listtype == "locationlist"
-    call setloclist(0, a:items, 'r')
-
-    " The last argument ({what}) is introduced with 7.4.2200:
-    " https://github.com/vim/vim/commit/d823fa910cca43fec3c31c030ee908a14c272640
-    if has("patch-7.4.2200") | call setloclist(0, [], 'a', {'title': a:title}) | endif
-  else
-    call setqflist(a:items, 'r')
-    if has("patch-7.4.2200") | call setqflist([], 'a', {'title': a:title}) | endif
-  endif
-endfunction
-
-" Parse parses the given items based on the specified errorformat and
-" populates the list.
-function! zig#list#ParseFormat(listtype, errformat, items, title) abort
-  " backup users errorformat, will be restored once we are finished
-  let old_errorformat = &errorformat
-
-  " parse and populate the location list
-  let &errorformat = a:errformat
-  try
-    call zig#list#Parse(a:listtype, a:items, a:title)
-  finally
-    "restore back
-    let &errorformat = old_errorformat
-  endtry
-endfunction
-
-" Parse parses the given items based on the global errorformat and
-" populates the list.
-function! zig#list#Parse(listtype, items, title) abort
-  if a:listtype == "locationlist"
-    lgetexpr a:items
-    if has("patch-7.4.2200") | call setloclist(0, [], 'a', {'title': a:title}) | endif
-  else
-    cgetexpr a:items
-    if has("patch-7.4.2200") | call setqflist([], 'a', {'title': a:title}) | endif
-  endif
-endfunction
-
-" JumpToFirst jumps to the first item in the location list
-function! zig#list#JumpToFirst(listtype) abort
-  if a:listtype == "locationlist"
-    ll 1
-  else
-    cc 1
-  endif
-endfunction
-
-" Clean cleans and closes the location list
-function! zig#list#Clean(listtype) abort
-  if a:listtype == "locationlist"
-    lex []
-  else
-    cex []
-  endif
-
-  call zig#list#Close(a:listtype)
-endfunction
-
-" Close closes the location list
-function! zig#list#Close(listtype) abort
-  let autoclose_window = zig#config#ListAutoclose()
-  if !autoclose_window
-    return
-  endif
-
-  if a:listtype == "locationlist"
-    lclose
-  else
-    cclose
-  endif
-endfunction
-
-function! s:listtype(listtype) abort
-  let listtype = zig#config#ListType()
-  if empty(listtype)
-    return a:listtype
-  endif
-
-  return listtype
-endfunction
-
-" s:default_list_type_commands is the defaults that will be used for each of
-" the supported commands (see documentation for g:zig_list_type_commands). When
-" defining a default, quickfix should be used if the command operates on
-" multiple files, while locationlist should be used if the command operates on a
-" single file or buffer. Keys that begin with an underscore are not supported
-" in g:zig_list_type_commands.
-let s:default_list_type_commands = {
-      \ "ZigFmt":                "locationlist",
-  \ }
-
-function! zig#list#Type(for) abort
-  let l:listtype = s:listtype(get(s:default_list_type_commands, a:for))
-  if l:listtype == "0"
-    call zig#util#EchoError(printf(
-          \ "unknown list type command value found ('%s'). Please open a bug report in the zig.vim repo.",
-          \ a:for))
-    let l:listtype = "quickfix"
-  endif
-
-  return get(zig#config#ListTypeCommands(), a:for, l:listtype)
-endfunction
-
-" vim: sw=2 ts=2 et
diff --git a/autoload/zig/util.vim b/autoload/zig/util.vim
deleted file mode 100644
index c886fb621..000000000
--- a/autoload/zig/util.vim
+++ /dev/null
@@ -1,394 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'autoload/zig/util.vim')
-  finish
-endif
-
-" Adapted from vim-go: autoload/go/util.vim
-"
-" Copyright 2011 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-"
-
-" PathSep returns the appropriate OS specific path separator.
-function! zig#util#PathSep() abort
-  if zig#util#IsWin()
-    return '\'
-  endif
-  return '/'
-endfunction
-
-" PathListSep returns the appropriate OS specific path list separator.
-function! zig#util#PathListSep() abort
-  if zig#util#IsWin()
-    return ";"
-  endif
-  return ":"
-endfunction
-
-" LineEnding returns the correct line ending, based on the current fileformat
-function! zig#util#LineEnding() abort
-  if &fileformat == 'dos'
-    return "\r\n"
-  elseif &fileformat == 'mac'
-    return "\r"
-  endif
-
-  return "\n"
-endfunction
-
-" Join joins any number of path elements into a single path, adding a
-" Separator if necessary and returns the result
-function! zig#util#Join(...) abort
-  return join(a:000, zig#util#PathSep())
-endfunction
-
-" IsWin returns 1 if current OS is Windows or 0 otherwise
-function! zig#util#IsWin() abort
-  let win = ['win16', 'win32', 'win64', 'win95']
-  for w in win
-    if (has(w))
-      return 1
-    endif
-  endfor
-
-  return 0
-endfunction
-
-" IsMac returns 1 if current OS is macOS or 0 otherwise.
-function! zig#util#IsMac() abort
-  return has('mac') ||
-        \ has('macunix') ||
-        \ has('gui_macvim') ||
-        \ zig#util#Exec(['uname'])[0] =~? '^darwin'
-endfunction
-
- " Checks if using:
- " 1) Windows system,
- " 2) And has cygpath executable,
- " 3) And uses *sh* as 'shell'
-function! zig#util#IsUsingCygwinShell()
-  return zig#util#IsWin() && executable('cygpath') && &shell =~ '.*sh.*'
-endfunction
-
-" Check if Vim jobs API is supported.
-"
-" The (optional) first paramter can be added to indicate the 'cwd' or 'env'
-" parameters will be used, which wasn't added until a later version.
-function! zig#util#has_job(...) abort
-  " cwd and env parameters to job_start was added in this version.
-  if a:0 > 0 && a:1 is 1
-    return has('job') && has("patch-8.0.0902")
-  endif
-
-  " job was introduced in 7.4.xxx however there are multiple bug fixes and one
-  " of the latest is 8.0.0087 which is required for a stable async API.
-  return has('job') && has("patch-8.0.0087")
-endfunction
-
-let s:env_cache = {}
-
-" env returns the go environment variable for the given key. Where key can be
-" GOARCH, GOOS, GOROOT, etc... It caches the result and returns the cached
-" version.
-function! zig#util#env(key) abort
-  let l:key = tolower(a:key)
-  if has_key(s:env_cache, l:key)
-    return s:env_cache[l:key]
-  endif
-
-  if executable('go')
-    let l:var = call('zig#util#'.l:key, [])
-    if zig#util#ShellError() != 0
-      call zig#util#EchoError(printf("'go env %s' failed", toupper(l:key)))
-      return ''
-    endif
-  else
-    let l:var = eval("$".toupper(a:key))
-  endif
-
-  let s:env_cache[l:key] = l:var
-  return l:var
-endfunction
-
-" Run a shell command.
-"
-" It will temporary set the shell to /bin/sh for Unix-like systems if possible,
-" so that we always use a standard POSIX-compatible Bourne shell (and not e.g.
-" csh, fish, etc.) See #988 and #1276.
-function! s:system(cmd, ...) abort
-  " Preserve original shell and shellredir values
-  let l:shell = &shell
-  let l:shellredir = &shellredir
-
-  if !zig#util#IsWin() && executable('/bin/sh')
-      set shell=/bin/sh shellredir=>%s\ 2>&1
-  endif
-
-  try
-    return call('system', [a:cmd] + a:000)
-  finally
-    " Restore original values
-    let &shell = l:shell
-    let &shellredir = l:shellredir
-  endtry
-endfunction
-
-" System runs a shell command "str". Every arguments after "str" is passed to
-" stdin.
-function! zig#util#System(str, ...) abort
-  return call('s:system', [a:str] + a:000)
-endfunction
-
-" Exec runs a shell command "cmd", which must be a list, one argument per item.
-" Every list entry will be automatically shell-escaped
-" Every other argument is passed to stdin.
-function! zig#util#Exec(cmd, ...) abort
-  if len(a:cmd) == 0
-    call zig#util#EchoError("zig#util#Exec() called with empty a:cmd")
-    return ['', 1]
-  endif
-
-  let l:bin = a:cmd[0]
-
-  if !executable(l:bin)
-    call zig#util#EchoError(printf("could not find binary '%s'", a:cmd[0]))
-    return ['', 1]
-  endif
-
-  return call('s:exec', [a:cmd] + a:000)
-endfunction
-
-function! s:exec(cmd, ...) abort
-  let l:bin = a:cmd[0]
-  let l:cmd = zig#util#Shelljoin([l:bin] + a:cmd[1:])
-  if zig#util#HasDebug('shell-commands')
-    call zig#util#EchoInfo('shell command: ' . l:cmd)
-  endif
-
-  let l:out = call('s:system', [l:cmd] + a:000)
-  return [l:out, zig#util#ShellError()]
-endfunction
-
-function! zig#util#ShellError() abort
-  return v:shell_error
-endfunction
-
-" StripPath strips the path's last character if it's a path separator.
-" example: '/foo/bar/'  -> '/foo/bar'
-function! zig#util#StripPathSep(path) abort
-  let last_char = strlen(a:path) - 1
-  if a:path[last_char] == zig#util#PathSep()
-    return strpart(a:path, 0, last_char)
-  endif
-
-  return a:path
-endfunction
-
-" StripTrailingSlash strips the trailing slash from the given path list.
-" example: ['/foo/bar/']  -> ['/foo/bar']
-function! zig#util#StripTrailingSlash(paths) abort
-  return map(copy(a:paths), 'zig#util#StripPathSep(v:val)')
-endfunction
-
-" Shelljoin returns a shell-safe string representation of arglist. The
-" {special} argument of shellescape() may optionally be passed.
-function! zig#util#Shelljoin(arglist, ...) abort
-  try
-    let ssl_save = &shellslash
-    set noshellslash
-    if a:0
-      return join(map(copy(a:arglist), 'shellescape(v:val, ' . a:1 . ')'), ' ')
-    endif
-
-    return join(map(copy(a:arglist), 'shellescape(v:val)'), ' ')
-  finally
-    let &shellslash = ssl_save
-  endtry
-endfunction
-
-fu! zig#util#Shellescape(arg)
-  try
-    let ssl_save = &shellslash
-    set noshellslash
-    return shellescape(a:arg)
-  finally
-    let &shellslash = ssl_save
-  endtry
-endf
-
-" Shelllist returns a shell-safe representation of the items in the given
-" arglist. The {special} argument of shellescape() may optionally be passed.
-function! zig#util#Shelllist(arglist, ...) abort
-  try
-    let ssl_save = &shellslash
-    set noshellslash
-    if a:0
-      return map(copy(a:arglist), 'shellescape(v:val, ' . a:1 . ')')
-    endif
-    return map(copy(a:arglist), 'shellescape(v:val)')
-  finally
-    let &shellslash = ssl_save
-  endtry
-endfunction
-
-" Returns the byte offset for line and column
-function! zig#util#Offset(line, col) abort
-  if &encoding != 'utf-8'
-    let sep = zig#util#LineEnding()
-    let buf = a:line == 1 ? '' : (join(getline(1, a:line-1), sep) . sep)
-    let buf .= a:col == 1 ? '' : getline('.')[:a:col-2]
-    return len(iconv(buf, &encoding, 'utf-8'))
-  endif
-  return line2byte(a:line) + (a:col-2)
-endfunction
-"
-" Returns the byte offset for the cursor
-function! zig#util#OffsetCursor() abort
-  return zig#util#Offset(line('.'), col('.'))
-endfunction
-
-" Windo is like the built-in :windo, only it returns to the window the command
-" was issued from
-function! zig#util#Windo(command) abort
-  let s:currentWindow = winnr()
-  try
-    execute "windo " . a:command
-  finally
-    execute s:currentWindow. "wincmd w"
-    unlet s:currentWindow
-  endtry
-endfunction
-
-" snippetcase converts the given word to given preferred snippet setting type
-" case.
-function! zig#util#snippetcase(word) abort
-  let l:snippet_case = zig#config#AddtagsTransform()
-  if l:snippet_case == "snakecase"
-    return zig#util#snakecase(a:word)
-  elseif l:snippet_case == "camelcase"
-    return zig#util#camelcase(a:word)
-  else
-    return a:word " do nothing
-  endif
-endfunction
-
-" snakecase converts a string to snake case. i.e: FooBar -> foo_bar
-" Copied from tpope/vim-abolish
-function! zig#util#snakecase(word) abort
-  let word = substitute(a:word, '::', '/', 'g')
-  let word = substitute(word, '\(\u\+\)\(\u\l\)', '\1_\2', 'g')
-  let word = substitute(word, '\(\l\|\d\)\(\u\)', '\1_\2', 'g')
-  let word = substitute(word, '[.-]', '_', 'g')
-  let word = tolower(word)
-  return word
-endfunction
-
-" camelcase converts a string to camel case. e.g. FooBar or foo_bar will become
-" fooBar.
-" Copied from tpope/vim-abolish.
-function! zig#util#camelcase(word) abort
-  let word = substitute(a:word, '-', '_', 'g')
-  if word !~# '_' && word =~# '\l'
-    return substitute(word, '^.', '\l&', '')
-  else
-    return substitute(word, '\C\(_\)\=\(.\)', '\=submatch(1)==""?tolower(submatch(2)) : toupper(submatch(2))','g')
-  endif
-endfunction
-
-" pascalcase converts a string to 'PascalCase'. e.g. fooBar or foo_bar will
-" become FooBar.
-function! zig#util#pascalcase(word) abort
-  let word = zig#util#camelcase(a:word)
-  return toupper(word[0]) . word[1:]
-endfunction
-
-" Echo a message to the screen and highlight it with the group in a:hi.
-"
-" The message can be a list or string; every line with be :echomsg'd separately.
-function! s:echo(msg, hi)
-  let l:msg = []
-  if type(a:msg) != type([])
-    let l:msg = split(a:msg, "\n")
-  else
-    let l:msg = a:msg
-  endif
-
-  " Tabs display as ^I or <09>, so manually expand them.
-  let l:msg = map(l:msg, 'substitute(v:val, "\t", "        ", "")')
-
-  exe 'echohl ' . a:hi
-  for line in l:msg
-    echom "zig.vim: " . line
-  endfor
-  echohl None
-endfunction
-
-function! zig#util#EchoSuccess(msg)
-  call s:echo(a:msg, 'Function')
-endfunction
-function! zig#util#EchoError(msg)
-  call s:echo(a:msg, 'ErrorMsg')
-endfunction
-function! zig#util#EchoWarning(msg)
-  call s:echo(a:msg, 'WarningMsg')
-endfunction
-function! zig#util#EchoProgress(msg)
-  redraw
-  call s:echo(a:msg, 'Identifier')
-endfunction
-function! zig#util#EchoInfo(msg)
-  call s:echo(a:msg, 'Debug')
-endfunction
-
-" Get all lines in the buffer as a a list.
-function! zig#util#GetLines()
-  let buf = getline(1, '$')
-  if &encoding != 'utf-8'
-    let buf = map(buf, 'iconv(v:val, &encoding, "utf-8")')
-  endif
-  if &l:fileformat == 'dos'
-    " XXX: line2byte() depend on 'fileformat' option.
-    " so if fileformat is 'dos', 'buf' must include '\r'.
-    let buf = map(buf, 'v:val."\r"')
-  endif
-  return buf
-endfunction
-
-" Make a named temporary directory which starts with "prefix".
-"
-" Unfortunately Vim's tempname() is not portable enough across various systems;
-" see: https://github.com/mattn/vim-go/pull/3#discussion_r138084911
-function! zig#util#tempdir(prefix) abort
-  " See :help tempfile
-  if zig#util#IsWin()
-    let l:dirs = [$TMP, $TEMP, 'c:\tmp', 'c:\temp']
-  else
-    let l:dirs = [$TMPDIR, '/tmp', './', $HOME]
-  endif
-
-  let l:dir = ''
-  for l:d in dirs
-    if !empty(l:d) && filewritable(l:d) == 2
-      let l:dir = l:d
-      break
-    endif
-  endfor
-
-  if l:dir == ''
-    call zig#util#EchoError('Unable to find directory to store temporary directory in')
-    return
-  endif
-
-  " Not great randomness, but "good enough" for our purpose here.
-  let l:rnd = sha256(printf('%s%s', localtime(), fnamemodify(bufname(''), ":p")))
-  let l:tmp = printf("%s/%s%s", l:dir, a:prefix, l:rnd)
-  call mkdir(l:tmp, 'p', 0700)
-  return l:tmp
-endfunction
-
-" Report if the user enabled a debug flag in g:zig_debug.
-function! zig#util#HasDebug(flag)
-  return index(zig#config#Debug(), a:flag) >= 0
-endfunction
-
-" vim: sw=2 ts=2 et
diff --git a/compiler/puppet-lint.vim b/compiler/puppet-lint.vim
new file mode 100644
index 000000000..c65eeb198
--- /dev/null
+++ b/compiler/puppet-lint.vim
@@ -0,0 +1,27 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'compiler/puppet-lint.vim')
+  finish
+endif
+
+" Vim compiler file
+" Compiler:	puppet-lint
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "puppet-lint"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+CompilerSet makeprg=puppet-lint\ --with-filename
+CompilerSet errorformat=%f\ -\ %tRROR:\ %m\ on\ line\ %l,
+		       \%f\ -\ %tARNING:\ %m\ on\ line\ %l,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/compiler/sml.vim b/compiler/sml.vim
new file mode 100644
index 000000000..e9b65a8e9
--- /dev/null
+++ b/compiler/sml.vim
@@ -0,0 +1,32 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sml', 'compiler/sml.vim')
+  finish
+endif
+
+" Vim compiler file
+" Compiler:	SML/NJ Compiler
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Feb 10
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "sml"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+CompilerSet makeprg=sml
+CompilerSet errorformat=%f:%l.%c-%\\d%\\+.%\\d%\\+\ %trror:\ %m,
+		       \%f:%l.%c\ %trror:\ %m,
+		       \%trror:\ %m
+		       \%f:%l.%c-%\\d%\\+.%\\d%\\+\ %tarning:\ %m,
+		       \%f:%l.%c\ %tarning:\ %m,
+		       \%tarning:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/compiler/tidy.vim b/compiler/tidy.vim
index fec701da0..6e3624551 100644
--- a/compiler/tidy.vim
+++ b/compiler/tidy.vim
@@ -5,7 +5,7 @@ endif
 " Vim compiler file
 " Compiler:	HTML Tidy
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2016 Apr 21
+" Last Change:	2020 Sep 4
 
 if exists("current_compiler")
   finish
@@ -16,8 +16,15 @@ if exists(":CompilerSet") != 2		" older Vim always used :setlocal
   command -nargs=* CompilerSet setlocal <args>
 endif
 
-CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes\ %:S
+let s:cpo_save = &cpo
+set cpo&vim
 
-" foo.html:8:1: Warning: inserting missing 'foobar' element
-" foo.html:9:2: Error: <foobar> is not recognized!
-CompilerSet errorformat=%f:%l:%c:\ %trror:%m,%f:%l:%c:\ %tarning:%m,%-G%.%#
+CompilerSet makeprg=tidy\ -quiet\ -errors\ --gnu-emacs\ yes
+CompilerSet errorformat=%f:%l:%c:\ %trror:\ %m,
+		       \%f:%l:%c:\ %tarning:\ %m,
+		       \%f:%l:%c:\ %tnfo:\ %m,
+		       \%f:%l:%c:\ %m,
+		       \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/compiler/zig.vim b/compiler/zig.vim
new file mode 100644
index 000000000..caa195639
--- /dev/null
+++ b/compiler/zig.vim
@@ -0,0 +1,32 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'compiler/zig.vim')
+  finish
+endif
+
+" Vim compiler file
+" Compiler: Zig Compiler
+" For bugs, patches and license go to https://github.com/ziglang/zig.vim
+
+if exists("current_compiler")
+    finish
+endif
+let current_compiler = "zig"
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+if exists(":CompilerSet") != 2
+    command -nargs=* CompilerSet setlocal <args>
+endif
+
+" a subcommand must be provided for the this compiler (test, build-exe, etc)
+if has('patch-7.4.191')
+    CompilerSet makeprg=zig\ \$*\ \%:S
+else
+    CompilerSet makeprg=zig\ \$*\ \"%\"
+endif
+
+" TODO: improve errorformat as needed.
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" vim: tabstop=8 shiftwidth=4 softtabstop=4 expandtab
diff --git a/compiler/zig_build.vim b/compiler/zig_build.vim
new file mode 100644
index 000000000..654728093
--- /dev/null
+++ b/compiler/zig_build.vim
@@ -0,0 +1,32 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'compiler/zig_build.vim')
+  finish
+endif
+
+" Vim compiler file
+" Compiler: Zig Compiler (zig build)
+
+if exists('current_compiler')
+  finish
+endif
+runtime compiler/zig.vim
+let current_compiler = 'zig_build'
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+if exists(':CompilerSet') != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+if exists('g:zig_build_makeprg_params')
+	execute 'CompilerSet makeprg=zig\ build\ '.escape(g:zig_build_makeprg_params, ' \|"').'\ $*'
+else
+	CompilerSet makeprg=zig\ build\ $*
+endif
+
+" TODO: anything to add to errorformat for zig build specifically?
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" vim: tabstop=8 shiftwidth=4 softtabstop=4 expandtab
diff --git a/compiler/zig_build_exe.vim b/compiler/zig_build_exe.vim
new file mode 100644
index 000000000..fb46d2088
--- /dev/null
+++ b/compiler/zig_build_exe.vim
@@ -0,0 +1,30 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'compiler/zig_build_exe.vim')
+  finish
+endif
+
+" Vim compiler file
+" Compiler: Zig Compiler (zig build-exe)
+
+if exists('current_compiler')
+  finish
+endif
+runtime compiler/zig.vim
+let current_compiler = 'zig_build_exe'
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+if exists(':CompilerSet') != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+if has('patch-7.4.191')
+  CompilerSet makeprg=zig\ build-exe\ \%:S\ \$* 
+else
+  CompilerSet makeprg=zig\ build-exe\ \"%\"\ \$* 
+endif
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" vim: tabstop=8 shiftwidth=4 softtabstop=4 expandtab
diff --git a/compiler/zig_test.vim b/compiler/zig_test.vim
new file mode 100644
index 000000000..2000e946f
--- /dev/null
+++ b/compiler/zig_test.vim
@@ -0,0 +1,30 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zig', 'compiler/zig_test.vim')
+  finish
+endif
+
+" Vim compiler file
+" Compiler: Zig Compiler (zig test)
+
+if exists('current_compiler')
+  finish
+endif
+runtime compiler/zig.vim
+let current_compiler = 'zig_test'
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+if exists(':CompilerSet') != 2
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+if has('patch-7.4.191')
+  CompilerSet makeprg=zig\ test\ \%:S\ \$* 
+else
+  CompilerSet makeprg=zig\ test\ \"%\"\ \$* 
+endif
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" vim: tabstop=8 shiftwidth=4 softtabstop=4 expandtab
diff --git a/extras/filetype.vim b/extras/filetype.vim
index 9e0be36d8..e39718434 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Dec 24
+" Last Change:	2021 Jan 21
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -216,6 +216,9 @@ au BufNewFile,BufRead *.bc			setf bc
 " BDF font
 au BufNewFile,BufRead *.bdf			setf bdf
 
+" Beancount
+au BufNewFile,BufRead *.beancount		setf beancount
+
 " BibTeX bibliography database file
 au BufNewFile,BufRead *.bib			setf bib
 
@@ -589,6 +592,9 @@ au BufNewFile,BufRead *.fan,*.fwt		setf fan
 " Factor
 au BufNewFile,BufRead *.factor			setf factor
 
+" Fennel
+autocmd BufRead,BufNewFile *.fnl 		setf fennel
+
 " Fetchmail RC file
 au BufNewFile,BufRead .fetchmailrc		setf fetchmail
 
@@ -1173,9 +1179,10 @@ au BufNewFile,BufRead *.papp,*.pxml,*.pxsl	setf papp
 " Password file
 au BufNewFile,BufRead */etc/passwd,*/etc/passwd-,*/etc/passwd.edit,*/etc/shadow,*/etc/shadow-,*/etc/shadow.edit,*/var/backups/passwd.bak,*/var/backups/shadow.bak setf passwd
 
-" Pascal (also *.p)
+" Pascal (also *.p, *.pp, *.inc)
 au BufNewFile,BufRead *.pas			setf pascal
 
+" Pascal or Puppet manifest
 au BufNewFile,BufRead *.pp			call polyglot#ft#FTpp()
 
 " Delphi or Lazarus program file
@@ -1266,7 +1273,7 @@ au BufNewFile,BufRead *.pov			setf pov
 " Povray configuration
 au BufNewFile,BufRead .povrayrc			setf povini
 
-" Povray, PHP or assembly
+" Povray, Pascal, PHP or assembly
 au BufNewFile,BufRead *.inc			call polyglot#ft#FTinc()
 
 " Printcap and Termcap
@@ -1275,13 +1282,19 @@ au BufNewFile,BufRead *printcap
 au BufNewFile,BufRead *termcap
 	\ let b:ptcap_type = "term" | setf ptcap
 
-" PCCTS / ANTRL
-"au BufNewFile,BufRead *.g			setf antrl
+" PCCTS / ANTLR
+"au BufNewFile,BufRead *.g			setf antlr
 au BufNewFile,BufRead *.g			setf pccts
 
 " PPWizard
 au BufNewFile,BufRead *.it,*.ih			setf ppwiz
 
+" Puppet
+au BufNewFile,BufRead Puppetfile		setf ruby
+
+" Embedded Puppet
+au BufNewFile,BufRead *.epp			setf epuppet
+
 " Obj 3D file format
 " TODO: is there a way to avoid MS-Windows Object files?
 au BufNewFile,BufRead *.obj			setf obj
@@ -1424,8 +1437,8 @@ au BufNewFile,BufRead *.rb,*.rbw		setf ruby
 " RubyGems
 au BufNewFile,BufRead *.gemspec			setf ruby
 
-" Rust
-au BufNewFile,BufRead *.rs			setf rust
+" RBS (Ruby Signature)
+au BufNewFile,BufRead *.rbs			setf rbs
 
 " Rackup
 au BufNewFile,BufRead *.ru			setf ruby
@@ -1439,6 +1452,9 @@ au BufNewFile,BufRead *.builder,*.rxml,*.rjs	setf ruby
 " Rantfile and Rakefile is like Ruby
 au BufNewFile,BufRead [rR]antfile,*.rant,[rR]akefile,*.rake	setf ruby
 
+" Rust
+au BufNewFile,BufRead *.rs			setf rust
+
 " S-lang (or shader language, or SmallLisp)
 au BufNewFile,BufRead *.sl			setf slang
 
@@ -1475,6 +1491,9 @@ au BufNewFile,BufRead *.sdl,*.pr		setf sdl
 " sed
 au BufNewFile,BufRead *.sed			setf sed
 
+" svelte
+au BufNewFile,BufRead *.svelte			setf svelte
+
 " Sieve (RFC 3028, 5228)
 au BufNewFile,BufRead *.siv,*.sieve		setf sieve
 
@@ -1618,6 +1637,9 @@ au BufNewFile,BufRead *.mib,*.my		setf mib
 au BufNewFile,BufRead *.hog,snort.conf,vision.conf	setf hog
 au BufNewFile,BufRead *.rules			call polyglot#ft#FTRules()
 
+" SPARQL queries
+au BufNewFile,BufRead *.rq,*.sparql		setf sparql
+
 " Spec (Linux RPM)
 au BufNewFile,BufRead *.spec			setf spec
 
@@ -1728,8 +1750,13 @@ au BufNewFile,BufRead *.tli			setf tli
 " Telix Salt
 au BufNewFile,BufRead *.slt			setf tsalt
 
-" Tera Term Language
-au BufRead,BufNewFile *.ttl			setf teraterm
+" Tera Term Language or Turtle
+au BufRead,BufNewFile *.ttl
+	\ if getline(1) =~ '^@\?\(prefix\|base\)' |
+	\   setf turtle |
+	\ else |
+	\   setf teraterm |
+	\ endif
 
 " Terminfo
 au BufNewFile,BufRead *.ti			setf terminfo
diff --git a/ftplugin/ada.vim b/ftplugin/ada.vim
index d7b34be04..bddd43b69 100644
--- a/ftplugin/ada.vim
+++ b/ftplugin/ada.vim
@@ -163,40 +163,41 @@ if exists("g:ada_abbrev")
 endif
 
 " Section: Commands, Mapping, Menus {{{1
-"
-call ada#Map_Popup (
-   \ 'Tag.List',
-   \  'l',
-   \ 'call ada#List_Tag ()')
-call ada#Map_Popup (
-   \'Tag.Jump',
-   \'j',
-   \'call ada#Jump_Tag ()')
-call ada#Map_Menu (
-   \'Tag.Create File',
-   \':AdaTagFile',
-   \'call ada#Create_Tags (''file'')')
-call ada#Map_Menu (
-   \'Tag.Create Dir',
-   \':AdaTagDir',
-   \'call ada#Create_Tags (''dir'')')
-
-call ada#Map_Menu (
-   \'Highlight.Toggle Space Errors',
-   \ ':AdaSpaces',
-   \'call ada#Switch_Syntax_Option (''space_errors'')')
-call ada#Map_Menu (
-   \'Highlight.Toggle Lines Errors',
-   \ ':AdaLines',
-   \'call ada#Switch_Syntax_Option (''line_errors'')')
-call ada#Map_Menu (
-   \'Highlight.Toggle Rainbow Color',
-   \ ':AdaRainbow',
-   \'call ada#Switch_Syntax_Option (''rainbow_color'')')
-call ada#Map_Menu (
-   \'Highlight.Toggle Standard Types',
-   \ ':AdaTypes',
-   \'call ada#Switch_Syntax_Option (''standard_types'')')
+if !exists(':AdaTagFile')
+  call ada#Map_Popup (
+     \ 'Tag.List',
+     \  'l',
+     \ 'call ada#List_Tag ()')
+  call ada#Map_Popup (
+     \'Tag.Jump',
+     \'j',
+     \'call ada#Jump_Tag ()')
+  call ada#Map_Menu (
+     \'Tag.Create File',
+     \':AdaTagFile',
+     \'call ada#Create_Tags (''file'')')
+  call ada#Map_Menu (
+     \'Tag.Create Dir',
+     \':AdaTagDir',
+     \'call ada#Create_Tags (''dir'')')
+
+  call ada#Map_Menu (
+     \'Highlight.Toggle Space Errors',
+     \ ':AdaSpaces',
+     \'call ada#Switch_Syntax_Option (''space_errors'')')
+  call ada#Map_Menu (
+     \'Highlight.Toggle Lines Errors',
+     \ ':AdaLines',
+     \'call ada#Switch_Syntax_Option (''line_errors'')')
+  call ada#Map_Menu (
+     \'Highlight.Toggle Rainbow Color',
+     \ ':AdaRainbow',
+     \'call ada#Switch_Syntax_Option (''rainbow_color'')')
+  call ada#Map_Menu (
+     \'Highlight.Toggle Standard Types',
+     \ ':AdaTypes',
+     \'call ada#Switch_Syntax_Option (''standard_types'')')
+endif
 
 " 1}}}
 " Reset cpoptions
diff --git a/ftplugin/basic.vim b/ftplugin/basic.vim
new file mode 100644
index 000000000..016253f67
--- /dev/null
+++ b/ftplugin/basic.vim
@@ -0,0 +1,31 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'basic', 'ftplugin/basic.vim')
+  finish
+endif
+
+" Vim filetype plugin file
+" Language:	BASIC
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2015 Jan 10
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=:REM,:'
+setlocal commentstring='\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "BASIC Source Files (*.bas)\t*.bas\n" .
+		     \ "All Files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setl fo< com< cms< sua<" .
+		    \ " | unlet! b:browsefilter"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/ftplugin/bzl.vim b/ftplugin/bzl.vim
index b1ece99bb..c6add72a4 100644
--- a/ftplugin/bzl.vim
+++ b/ftplugin/bzl.vim
@@ -5,7 +5,7 @@ endif
 " Vim filetype plugin file
 " Language:	Bazel (http://bazel.io)
 " Maintainer:	David Barnett (https://github.com/google/vim-ft-bzl)
-" Last Change:	2015 Aug 11
+" Last Change:	2021 Jan 19
 
 ""
 " @section Introduction, intro
@@ -55,6 +55,8 @@ if get(g:, 'ft_bzl_fold', 0)
 endif
 
 if exists('*BzlFoldText')
+  let &cpo = s:save_cpo
+  unlet s:save_cpo
   finish
 endif
 
diff --git a/ftplugin/embeddedpuppet.vim b/ftplugin/epuppet.vim
similarity index 98%
rename from ftplugin/embeddedpuppet.vim
rename to ftplugin/epuppet.vim
index 7a2621fb0..482d2af14 100644
--- a/ftplugin/embeddedpuppet.vim
+++ b/ftplugin/epuppet.vim
@@ -1,4 +1,4 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'ftplugin/embeddedpuppet.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'ftplugin/epuppet.vim')
   finish
 endif
 
diff --git a/ftplugin/framescript.vim b/ftplugin/framescript.vim
index 9ec58b5ff..ba858408c 100644
--- a/ftplugin/framescript.vim
+++ b/ftplugin/framescript.vim
@@ -7,14 +7,14 @@ endif
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2008-07-19
 
-let s:cpo_save = &cpo
-set cpo&vim
-
 if exists("b:did_ftplugin")
   finish
 endif
 let b:did_ftplugin = 1
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 let b:undo_ftplugin = "setl com< cms< fo< inc< | unlet! b:matchwords"
 
 setlocal comments=s1:/*,mb:*,ex:*/,:// commentstring=/*\ %s\ */
diff --git a/ftplugin/freebasic.vim b/ftplugin/freebasic.vim
new file mode 100644
index 000000000..d2212481c
--- /dev/null
+++ b/ftplugin/freebasic.vim
@@ -0,0 +1,17 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'freebasic', 'ftplugin/freebasic.vim')
+  finish
+endif
+
+" Vim filetype plugin file
+" Language:	FreeBasic
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2015 Jan 10
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+runtime! ftplugin/basic.vim
+
+" vim: ts=8
diff --git a/ftplugin/hamster.vim b/ftplugin/hamster.vim
index c72a86571..2eca00f89 100644
--- a/ftplugin/hamster.vim
+++ b/ftplugin/hamster.vim
@@ -6,7 +6,7 @@ endif
 " Language:    Hamster Script
 " Version:     2.0.6.0
 " Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
-" Last Change: 2017 Mar 18
+" Last Change: 2021 Jan 19
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -61,6 +61,9 @@ if exists("loaded_matchit")
 endif
 
 setlocal ignorecase
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
-setlocal cpo+=M		" makes \%( match \)
+
+" Disabled, 'cpo' is a global option.
+" setlocal cpo+=M		" makes \%( match \)
diff --git a/ftplugin/lisp.vim b/ftplugin/lisp.vim
index 365a26b8e..cc86c720d 100644
--- a/ftplugin/lisp.vim
+++ b/ftplugin/lisp.vim
@@ -18,13 +18,11 @@ endif
 " Don't load another plugin for this buffer
 let b:did_ftplugin = 1
 
-setl comments=:;
+setl comments=:;;;;,:;;;,:;;,:;,sr:#\|,mb:\|,ex:\|#
 setl define=^\\s*(def\\k*
 setl formatoptions-=t
 setl iskeyword+=+,-,*,/,%,<,=,>,:,$,?,!,@-@,94
 setl lisp
 setl commentstring=;%s
 
-setl comments^=:;;;,:;;,sr:#\|,mb:\|,ex:\|#
-
 let b:undo_ftplugin = "setlocal comments< define< formatoptions< iskeyword< lisp< commentstring<"
diff --git a/ftplugin/octave.vim b/ftplugin/octave.vim
new file mode 100644
index 000000000..c94081506
--- /dev/null
+++ b/ftplugin/octave.vim
@@ -0,0 +1,5 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'octave', 'ftplugin/octave.vim')
+  finish
+endif
+
+setlocal commentstring=%\ %s
diff --git a/ftplugin/rust.vim b/ftplugin/rust.vim
index a131a1d10..c13edfbc1 100644
--- a/ftplugin/rust.vim
+++ b/ftplugin/rust.vim
@@ -51,7 +51,7 @@ setlocal smartindent nocindent
 
 if get(g:, 'rust_recommended_style', 1)
     let b:rust_set_style = 1
-    setlocal tabstop=8 shiftwidth=4 softtabstop=4 expandtab
+    setlocal shiftwidth=4 softtabstop=4 expandtab
     setlocal textwidth=99
 endif
 
diff --git a/ftplugin/sxhkdrc.vim b/ftplugin/sxhkdrc.vim
index b58baa1fd..8b5be981c 100644
--- a/ftplugin/sxhkdrc.vim
+++ b/ftplugin/sxhkdrc.vim
@@ -2,4 +2,14 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'sxhkd', 'ftplugin/sxhkdrc.vim
   finish
 endif
 
+if exists("b:did_ftplugin")
+	finish
+endif
+
 setlocal cms=#%s
+
+if exists('b:undo_ftplugin')
+	let b:undo_ftplugin .= "|setlocal commentstring<"
+else
+	let b:undo_ftplugin = "setlocal commentstring<"
+endif
diff --git a/ftplugin/tidy.vim b/ftplugin/tidy.vim
new file mode 100644
index 000000000..8f368fa90
--- /dev/null
+++ b/ftplugin/tidy.vim
@@ -0,0 +1,36 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tidy', 'ftplugin/tidy.vim')
+  finish
+endif
+
+" Vim filetype plugin file
+" Language:	HMTL Tidy Configuration
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2020 Sep 4
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=:#,://
+setlocal commentstring=#\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "HTML Tidy Files (tidyrc, .tidyrc, tidy.conf)\ttidyrc;.tidyrc;tidy.conf\n" .
+		     \ "HTML Files (*.html, *.htm)\t*.html;*.htm\n" .
+		     \ "XHTML Files (*.xhtml, *.xhtm)\t*.xhtml;*.xhtm\n" .
+		     \ "XML Files (*.xml)\t*.xml\n" .
+		     \ "All Files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setl fo< com< cms<" .
+		    \ " | unlet! b:browsefilter"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8
diff --git a/ftplugin/vlang.vim b/ftplugin/vlang.vim
index cda16cba8..fbc0a711c 100644
--- a/ftplugin/vlang.vim
+++ b/ftplugin/vlang.vim
@@ -2,5 +2,36 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'v', 'ftplugin/vlang.vim')
   finish
 endif
 
+if exists("b:did_ftplugin")
+	finish
+endif
+
 setlocal commentstring=//\ %s
 setlocal makeprg=v\ %
+
+if exists('b:undo_ftplugin')
+	let b:undo_ftplugin .= "|setlocal commentstring< makeprg<"
+else
+	let b:undo_ftplugin = "setlocal commentstring< makeprg<"
+endif
+
+function! _VFormatFile()
+	if exists('g:v_autofmt_bufwritepre') && g:v_autofmt_bufwritepre || exists('b:v_autofmt_bufwritepre') && b:v_autofmt_bufwritepre
+		let substitution = system("v fmt -", join(getline(1, line('$')), "\n"))
+		if v:shell_error != 0
+			echoerr "While formatting the buffer via vfmt, the following error occurred:"
+			echoerr printf("ERROR(%d): %s", v:shell_error, substitution)
+		else
+			let [_, lnum, colnum, _] = getpos('.')
+			%delete
+			call append(0, split(substitution, "\n"))
+			call cursor(lnum, colnum)
+		endif
+	endif
+endfunction
+
+if has('autocmd')
+	augroup v_fmt
+		autocmd BufWritePre *.v call _VFormatFile()
+	augroup END
+endif
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index 3b88372ce..cb2f3e845 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -12,6 +12,11 @@ let b:did_ftplugin = 1
 let s:cpo_orig = &cpo
 set cpo&vim
 
+compiler zig_build
+
+" Match Zig builtin fns
+setlocal iskeyword+=@-@
+
 " Recomended code style, no tabs and 4-space indentation
 setlocal expandtab
 setlocal tabstop=8
@@ -21,7 +26,6 @@ setlocal shiftwidth=4
 setlocal formatoptions-=t formatoptions+=croql
 
 setlocal suffixesadd=.zig,.zir
-setlocal makeprg=zig\ build
 
 if has('comments')
     setlocal comments=:///,://!,://,:\\\\
@@ -44,7 +48,7 @@ if exists("*json_decode") && executable('zig')
 endif
 
 let b:undo_ftplugin =
-    \ 'setl et< ts< sts< sw< fo< sua< mp< com< cms< inex< inc< pa<'
+    \ 'setl isk< et< ts< sts< sw< fo< sua< mp< com< cms< inex< inc< pa<'
 
 let &cpo = s:cpo_orig
 unlet s:cpo_orig
diff --git a/indent/fortran.vim b/indent/fortran.vim
index 0f08a9961..9a3573acc 100644
--- a/indent/fortran.vim
+++ b/indent/fortran.vim
@@ -78,11 +78,15 @@ endif
 if (b:fortran_fixed_source == 1)
   setlocal indentexpr=FortranGetFixedIndent()
   if exists("*FortranGetFixedIndent")
+    let &cpoptions = s:cposet
+    unlet s:cposet
     finish
   endif
 else
   setlocal indentexpr=FortranGetFreeIndent()
   if exists("*FortranGetFreeIndent")
+    let &cpoptions = s:cposet
+    unlet s:cposet
     finish
   endif
 endif
@@ -217,7 +221,7 @@ function FortranGetFixedIndent()
   return ind
 endfunction
 
-let &cpoptions=s:cposet
+let &cpoptions = s:cposet
 unlet s:cposet
 
 " vim:sw=2 tw=130
diff --git a/indent/haskell.vim b/indent/haskell.vim
index cefa08457..fa906630f 100644
--- a/indent/haskell.vim
+++ b/indent/haskell.vim
@@ -193,13 +193,13 @@ function! GetHaskellIndent()
 
   " operator at end of previous line
   if l:prevline =~ '[!#$%&*+./<>?@\\^|~-]\s*$'
-    return indent(v:lnum - 1) + &shiftwidth
+    return indent(v:lnum - 1) + shiftwidth()
   endif
 
   " let foo =
   " >>>>>>bar
   if l:prevline =~ '\C\<let\>\s\+[^=]\+=\s*$'
-    return match(l:prevline, '\C\<let\>') + g:haskell_indent_let + &shiftwidth
+    return match(l:prevline, '\C\<let\>') + g:haskell_indent_let + shiftwidth()
   endif
 
   " let x = 1 in
@@ -247,7 +247,7 @@ function! GetHaskellIndent()
   " >>foo
   "
   if l:prevline =~ '\C\<where\>\s*$'
-    return indent(v:lnum - 1) + get(g:, 'haskell_indent_after_bare_where', &shiftwidth)
+    return indent(v:lnum - 1) + get(g:, 'haskell_indent_after_bare_where', shiftwidth())
   endif
 
   " do
@@ -256,7 +256,7 @@ function! GetHaskellIndent()
   " foo =
   " >>bar
   if l:prevline =~ '\C\(\<do\>\|=\)\s*$'
-    return indent(v:lnum - 1) + &shiftwidth
+    return indent(v:lnum - 1) + shiftwidth()
   endif
 
   " do foo
@@ -272,7 +272,7 @@ function! GetHaskellIndent()
   " >>bar -> quux
   if l:prevline =~ '\C\<case\>.\+\<of\>\s*$'
     if get(g:,'haskell_indent_case_alternative', 0)
-      return indent(v:lnum - 1) + &shiftwidth
+      return indent(v:lnum - 1) + shiftwidth()
     else
       return match(l:prevline, '\C\<case\>') + g:haskell_indent_case
     endif
@@ -305,7 +305,7 @@ function! GetHaskellIndent()
   " newtype Foo = Foo
   " >>deriving
   if l:prevline =~ '\C^\s*\<\(newtype\|data\)\>[^{]\+' && l:line =~ '\C^\s*\<deriving\>'
-    return indent(v:lnum - 1) + &shiftwidth
+    return indent(v:lnum - 1) + shiftwidth()
   endif
 
   " foo :: Int
@@ -318,7 +318,7 @@ function! GetHaskellIndent()
     if l:line =~ '^\s*[-=]>'
       return match(l:prevline, '::\s')
     elseif match(l:prevline, '^\s\+::') > -1
-      return match(l:prevline, '::\s') - &shiftwidth
+      return match(l:prevline, '::\s') - shiftwidth()
     endif
   endif
 
@@ -398,13 +398,13 @@ function! GetHaskellIndent()
   ">>>>>=> Int
   if l:prevline =~ '^\s*)' && l:line =~ '^\s*=>'
     let l:s = match(l:prevline, ')')
-    return l:s - (&shiftwidth + 1)
+    return l:s - (shiftwidth() + 1)
   endif
 
   " module Foo
   " >>( bar
   if l:prevline =~ '\C^\<module\>'
-    return &shiftwidth
+    return shiftwidth()
   endif
 
   " foo
@@ -412,7 +412,7 @@ function! GetHaskellIndent()
   if l:line =~ '^\s*{'
     let l:s = indent(v:lnum - 1)
     if l:s >= 0
-      return l:s + &shiftwidth
+      return l:s + shiftwidth()
     endif
   endif
 
@@ -428,7 +428,7 @@ function! GetHaskellIndent()
       return match(l:prevline, 'in') - g:haskell_indent_in
     endif
 
-    return indent(v:lnum - 1) + get(g:, 'haskell_indent_before_where', &shiftwidth)
+    return indent(v:lnum - 1) + get(g:, 'haskell_indent_before_where', shiftwidth())
   endif
 
   " let x = 1
@@ -462,13 +462,13 @@ function! GetHaskellIndent()
   " >>=
   if l:line =~ '^\s*='
     if l:prevline =~ '\C^\<data\>\s\+[^=]\+\s*$'
-      return match(l:prevline, '\C\<data\>') + &shiftwidth
+      return match(l:prevline, '\C\<data\>') + shiftwidth()
     else
       let l:s = s:indentGuard(match(l:line, '='), l:prevline)
       if l:s > 0
         return l:s
       else
-        return &shiftwidth
+        return shiftwidth()
       endif
     endif
   endif
@@ -493,7 +493,7 @@ function! GetHaskellIndent()
   " foo
   " >>:: Int
   if l:line =~ '^\s*::\s'
-    return indent(v:lnum - 1) + &shiftwidth
+    return indent(v:lnum - 1) + shiftwidth()
   endif
 
   " indent closing brace, paren or bracket
diff --git a/indent/html.vim b/indent/html.vim
index 07c6aa6f6..96b32b62f 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -5,7 +5,7 @@ endif
 " Vim indent script for HTML
 " Maintainer:	Bram Moolenaar
 " Original Author: Andy Wokula <anwoku@yahoo.de>
-" Last Change:	2020 Dec 11
+" Last Change:	2021 Jan 26
 " Version:	1.0 "{{{
 " Description:	HTML indent script with cached state for faster indenting on a
 "		range of lines.
@@ -945,11 +945,11 @@ func! s:InsideTag(foundHtmlString)
       let idx = match(text, '<' . s:tagname . '\s\+\zs\w')
     endif
     if idx == -1
-      " after just "<tag" indent one level more
+      " after just "<tag" indent two levels more
       let idx = match(text, '<' . s:tagname . '$')
       if idx >= 0
-	call cursor(lnum, idx)
-	return virtcol('.') + shiftwidth()
+	call cursor(lnum, idx + 1)
+	return virtcol('.') - 1 + shiftwidth() * 2
       endif
     endif
     if idx > 0
diff --git a/indent/julia.vim b/indent/julia.vim
index c2a55922b..c4c172450 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -261,7 +261,7 @@ function GetJuliaNestingBrackets(lnum, c)
   if len(brackets_stack) > 0
     let first_open_bracket = brackets_stack[0][1]
     let last_open_bracket = brackets_stack[-1][1]
-    if brackets_stack[-1][0] == 'par' && IsFunctionArgPar(a:lnum, last_open_bracket)
+    if brackets_stack[-1][0] == 'par' && IsFunctionArgPar(a:lnum, last_open_bracket+1)
       let infuncargs = 1
     endif
   endif
@@ -295,8 +295,8 @@ function IsFunctionArgPar(lnum, c)
   if a:c == 0
     return 0
   endif
-  let stack = map(synstack(a:lnum, a:c-1), 'synIDattr(v:val, "name")')
-  return stack[-1] == 'juliaFunctionBlock'
+  let stack = map(synstack(a:lnum, a:c), 'synIDattr(v:val, "name")')
+  return len(stack) >= 3 && stack[-3] == 'juliaFunctionDefP'
 endfunction
 
 function JumpToMatch(lnum, last_closed_bracket)
@@ -394,13 +394,14 @@ function GetJuliaIndent()
       let ind = indent(lnum)
     endif
 
-    " Does the current line starts with a closing bracket? Then depending on
+    " Does the current line start with a closing bracket? Then depending on
     " the situation we align it with the opening one, or we let the rest of
     " the code figure it out (the case in which we're closing a function
     " argument list is special-cased)
     if JuliaMatch(v:lnum, getline(v:lnum), '[])}]', indent(v:lnum)) == indent(v:lnum) && ind > 0
       if !align_brackets && !align_funcargs
-        let ind = -1
+        call JumpToMatch(v:lnum, indent(v:lnum))
+        return indent(line("."))
       elseif (align_brackets && getline(v:lnum)[indent(v:lnum)] != ')') || align_funcargs
         return ind - 1
       else " must be a ')' and align_brackets==1 and align_funcargs==0
@@ -447,7 +448,6 @@ function GetJuliaIndent()
       " if the opening line has a colon followed by non-comments, use it as
       " reference point
       let cind = JuliaMatch(lnum, prevline, ':', indent(lnum), lim)
-      " echo "cind=".string(cind) | sleep 1
       if cind >= 0
         let nonwhiteind = JuliaMatch(lnum, prevline, '\S', cind+1)
         if nonwhiteind >= 0
diff --git a/indent/puppet.vim b/indent/puppet.vim
index cabde8433..1067e9e06 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -105,11 +105,16 @@ function! GetPuppetIndent(...)
         let ind = indent(s:PrevNonMultilineString(pnum - 1))
     endif
 
-    if pline =~ '\({\|\[\|(\|:\)\s*\(#.*\)\?$'
+    let l:bracketAtEndOfLinePattern = '\({\|\[\|(\|:\)\s*\(#.*\)\?$'
+    if pline =~ l:bracketAtEndOfLinePattern
+    let l:i = match(pline, l:bracketAtEndOfLinePattern)
+    let l:syntaxType = synIDattr(synID(pnum, l:i + 1, 0), 'name')
+    if l:syntaxType !~# '\(Comment\|String\)$'
         let ind += &sw
+    endif
     elseif pline =~ ';$' && pline !~ '[^:]\+:.*[=+]>.*'
         let ind -= &sw
-    elseif pline =~ '^\s*include\s\+.*,$' && pline !~ '[=+]>'
+    elseif pline =~# '^\s*include\s\+.*,$' && pline !~ '[=+]>'
         let ind += &sw
     endif
 
diff --git a/indent/ruby.vim b/indent/ruby.vim
index d061edfbb..afa72995a 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -646,8 +646,7 @@ function! s:PreviousNotMSL(msl_info) abort
       " TODO (2016-10-07) Wrong/unused? How could it be "1"?
       return indent(info.plnum) - 1
       " If previous line is a continuation return its indent.
-      " TODO: the || s:IsInString() thing worries me a bit.
-    elseif s:Match(info.plnum, s:non_bracket_continuation_regex) || s:IsInString(info.plnum, strlen(line))
+    elseif s:Match(info.plnum, s:non_bracket_continuation_regex)
       return indent(info.plnum)
     endif
   endif
diff --git a/syntax/Jenkinsfile.vim b/syntax/Jenkinsfile.vim
index 99b8707ec..5959fd701 100644
--- a/syntax/Jenkinsfile.vim
+++ b/syntax/Jenkinsfile.vim
@@ -11,6 +11,7 @@ syn keyword jenkinsfileDirective environment options parameters triggers stage t
 
 syn keyword jenkinsfileOption contained buildDiscarder disableConcurrentBuilds overrideIndexTriggers skipDefaultCheckout nextgroup=jenkinsfileOptionParams
 syn keyword jenkinsfileOption contained skipStagesAfterUnstable checkoutToSubdirectory timeout retry timestamps nextgroup=jenkinsfileOptionParams
+syn keyword jenkinsfileOption contained disableResume newContainerPerStage preserveStashes quietPeriod parallelsAlwaysFailFast nextgroup=jenkinsfileOptionParams
 syn region  jenkinsfileOptionParams contained start='(' end=')' transparent contains=@groovyTop
 syn match   jenkinsfileOptionO /[a-zA-Z]\+([^)]*)/ contains=jenkinsfileOption,jenkinsfileOptionParams transparent containedin=groovyParenT1
 
diff --git a/syntax/basic.vim b/syntax/basic.vim
index 1b98eb8d1..3502fa14c 100644
--- a/syntax/basic.vim
+++ b/syntax/basic.vim
@@ -3,16 +3,18 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'basic', 'syntax/basic.vim')
 endif
 
 " Vim syntax file
-" Language:	BASIC
-" Maintainer:	Allan Kelly <allan@fruitloaf.co.uk>
-" Last Change:  2011 Dec 25 by Thilo Six
+" Language:		BASIC
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Allan Kelly <allan@fruitloaf.co.uk>
+" Contributors:		Thilo Six
+" Last Change:		2015 Jan 10
 
 " First version based on Micro$soft QBASIC circa 1989, as documented in
 " 'Learn BASIC Now' by Halvorson&Rygmyr. Microsoft Press 1989.
 " This syntax file not a complete implementation yet.  Send suggestions to the
 " maintainer.
 
-" quit when a syntax file was already loaded
+" Prelude {{{1
 if exists("b:current_syntax")
   finish
 endif
@@ -20,7 +22,7 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" A bunch of useful BASIC keywords
+" Keywords {{{1
 syn keyword basicStatement	BEEP beep Beep BLOAD bload Bload BSAVE bsave Bsave
 syn keyword basicStatement	CALL call Call ABSOLUTE absolute Absolute
 syn keyword basicStatement	CHAIN chain Chain CHDIR chdir Chdir
@@ -120,32 +122,39 @@ syn keyword basicFunction	RIGHT$ right$ Right$ RTRIM$ rtrim$ Rtrim$
 syn keyword basicFunction	SPACE$ space$ Space$ STR$ str$ Str$
 syn keyword basicFunction	STRING$ string$ String$ TIME$ time$ Time$
 syn keyword basicFunction	UCASE$ ucase$ Ucase$ VARPTR$ varptr$ Varptr$
-syn keyword basicTodo contained	TODO
 
-"integer number, or floating point number without a dot.
+" Numbers {{{1
+" Integer number, or floating point number without a dot.
 syn match  basicNumber		"\<\d\+\>"
-"floating point number, with dot
+" Floating point number, with dot
 syn match  basicNumber		"\<\d\+\.\d*\>"
-"floating point number, starting with a dot
+" Floating point number, starting with a dot
 syn match  basicNumber		"\.\d\+\>"
 
-" String and Character contstants
-syn match   basicSpecial contained "\\\d\d\d\|\\."
-syn region  basicString		  start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=basicSpecial
+" String and Character constants {{{1
+syn match   basicSpecial	"\\\d\d\d\|\\." contained
+syn region  basicString		start=+"+  skip=+\\\\\|\\"+  end=+"+	contains=basicSpecial
 
-syn region  basicComment	start="REM" end="$" contains=basicTodo
-syn region  basicComment	start="^[ \t]*'" end="$" contains=basicTodo
+" Line numbers {{{1
 syn region  basicLineNumber	start="^\d" end="\s"
-syn match   basicTypeSpecifier  "[a-zA-Z0-9][\$%&!#]"ms=s+1
+
+" Data-type suffixes {{{1
+syn match   basicTypeSpecifier	"[a-zA-Z0-9][$%&!#]"ms=s+1
 " Used with OPEN statement
 syn match   basicFilenumber  "#\d\+"
-"syn sync ccomment basicComment
+
+" Mathematical operators {{{1
 " syn match   basicMathsOperator "[<>+\*^/\\=-]"
-syn match   basicMathsOperator   "-\|=\|[:<>+\*^/\\]\|AND\|OR"
+syn match   basicMathsOperator	 "-\|=\|[:<>+\*^/\\]\|AND\|OR"
 
-" Define the default highlighting.
-" Only when an item doesn't have highlighting yet
+" Comments {{{1
+syn keyword basicTodo		TODO FIXME XXX NOTE contained
+syn region  basicComment	start="^\s*\zsREM\>" start="\%(:\s*\)\@<=REM\>" end="$" contains=basicTodo
+syn region  basicComment	start="'"					end="$" contains=basicTodo
 
+"syn sync ccomment basicComment
+
+" Default Highlighting {{{1
 hi def link basicLabel		Label
 hi def link basicConditional	Conditional
 hi def link basicRepeat		Repeat
@@ -154,17 +163,18 @@ hi def link basicNumber		Number
 hi def link basicError		Error
 hi def link basicStatement	Statement
 hi def link basicString		String
-hi def link basicComment		Comment
-hi def link basicSpecial		Special
+hi def link basicComment	Comment
+hi def link basicSpecial	Special
 hi def link basicTodo		Todo
-hi def link basicFunction		Identifier
-hi def link basicTypeSpecifier Type
-hi def link basicFilenumber basicTypeSpecifier
+hi def link basicFunction	Identifier
+hi def link basicTypeSpecifier	Type
+hi def link basicFilenumber	basicTypeSpecifier
 "hi basicMathsOperator term=bold cterm=bold gui=bold
 
-
+" Postscript {{{1
 let b:current_syntax = "basic"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" vim: ts=8
+
+" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/syntax/basic/literal.vim b/syntax/basic/literal.vim
index 81bbef96e..de71af926 100644
--- a/syntax/basic/literal.vim
+++ b/syntax/basic/literal.vim
@@ -13,9 +13,11 @@ syntax region  typescriptTemplateSubstitution matchgroup=typescriptTemplateSB
   \ contained
 
 
-syntax region  typescriptString 
+syntax region  typescriptString
   \ start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1+ end=+$+
   \ contains=typescriptSpecial,@Spell
+  \ nextgroup=@typescriptSymbols
+  \ skipwhite skipempty
   \ extend
 
 syntax match   typescriptSpecial            contained "\v\\%(x\x\x|u%(\x{4}|\{\x{1,6}})|c\u|.)"
@@ -42,4 +44,4 @@ syntax match typescriptNumber /\<0[bB][01][01_]*\>/        nextgroup=@typescript
 syntax match typescriptNumber /\<0[oO][0-7][0-7_]*\>/       nextgroup=@typescriptSymbols skipwhite skipempty
 syntax match typescriptNumber /\<0[xX][0-9a-fA-F][0-9a-fA-F_]*\>/ nextgroup=@typescriptSymbols skipwhite skipempty
 syntax match typescriptNumber /\<\%(\d[0-9_]*\%(\.\d[0-9_]*\)\=\|\.\d[0-9_]*\)\%([eE][+-]\=\d[0-9_]*\)\=\>/
-  \ nextgroup=typescriptSymbols skipwhite skipempty
+  \ nextgroup=@typescriptSymbols skipwhite skipempty
diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim
index 770d3e0d0..590dda1a6 100644
--- a/syntax/basic/type.vim
+++ b/syntax/basic/type.vim
@@ -132,7 +132,7 @@ syntax region typescriptGenericFunc matchgroup=typescriptTypeBrackets
   \ contained skipwhite skipnl
 
 syntax region typescriptFuncType matchgroup=typescriptParens
-  \ start=/(/ end=/)\s*=>/me=e-2
+  \ start=/(\(\k\+:\|)\)\@=/ end=/)\s*=>/me=e-2
   \ contains=@typescriptParameterList
   \ nextgroup=typescriptFuncTypeArrow
   \ contained skipwhite skipnl oneline
@@ -142,7 +142,6 @@ syntax match typescriptFuncTypeArrow /=>/
   \ containedin=typescriptFuncType
   \ contained skipwhite skipnl
 
-
 syntax keyword typescriptConstructorType new
   \ nextgroup=@typescriptFunctionType
   \ contained skipwhite skipnl
diff --git a/syntax/c.vim b/syntax/c.vim
index cb52a22fb..a11a95a21 100644
--- a/syntax/c.vim
+++ b/syntax/c.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2019 Nov 29
+" Last Change:	2021 Jan 11
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -17,6 +17,9 @@ set cpo&vim
 
 let s:ft = matchstr(&ft, '^\([^.]\)\+')
 
+" check if this was included from cpp.vim
+let s:in_cpp_family = exists("b:filetype_in_cpp_family")
+
 " Optional embedded Autodoc parsing
 " To enable it add: let g:c_autodoc = 1
 " to your .vimrc
@@ -59,7 +62,7 @@ if !exists("c_no_cformat")
 endif
 
 " cCppString: same as cString, but ends at end of line
-if s:ft ==# "cpp" && !exists("cpp_no_cpp11") && !exists("c_no_cformat")
+if s:in_cpp_family && !exists("cpp_no_cpp11") && !exists("c_no_cformat")
   " ISO C++11
   syn region	cString		start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,cFormat,@Spell extend
   syn region 	cCppString	start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial,cFormat,@Spell
@@ -91,7 +94,7 @@ syn match	cSpecialCharacter display "L\='\\\o\{1,3}'"
 syn match	cSpecialCharacter display "'\\x\x\{1,2}'"
 syn match	cSpecialCharacter display "L'\\x\x\+'"
 
-if (s:ft ==# "c" && !exists("c_no_c11")) || (s:ft ==# "cpp" && !exists("cpp_no_cpp11"))
+if (s:ft ==# "c" && !exists("c_no_c11")) || (s:in_cpp_family && !exists("cpp_no_cpp11"))
   " ISO C11 or ISO C++ 11
   if exists("c_no_cformat")
     syn region	cString		start=+\%(U\|u8\=\)"+ skip=+\\\\\|\\"+ end=+"+ contains=cSpecial,@Spell extend
@@ -134,7 +137,7 @@ endif
 " But avoid matching <::.
 syn cluster	cParenGroup	contains=cParenError,cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserLabel,cBitField,cOctalZero,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom
 if exists("c_no_curly_error")
-  if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
+  if s:in_cpp_family && !exists("cpp_no_cpp11")
     syn region	cParen		transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,@cStringGroup,@Spell
     " cCppParen: same as cParen but ends at end-of-line; used in cDefine
     syn region	cCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
@@ -148,7 +151,7 @@ if exists("c_no_curly_error")
     syn match	cErrInParen	display contained "^[{}]\|^<%\|^%>"
   endif
 elseif exists("c_no_bracket_error")
-  if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
+  if s:in_cpp_family && !exists("cpp_no_cpp11")
     syn region	cParen		transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,@cStringGroup,@Spell
     " cCppParen: same as cParen but ends at end-of-line; used in cDefine
     syn region	cCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cParen,cString,@Spell
@@ -162,7 +165,7 @@ elseif exists("c_no_bracket_error")
     syn match	cErrInParen	display contained "[{}]\|<%\|%>"
   endif
 else
-  if s:ft ==# 'cpp' && !exists("cpp_no_cpp11")
+  if s:in_cpp_family && !exists("cpp_no_cpp11")
     syn region	cParen		transparent start='(' end=')' contains=ALLBUT,@cParenGroup,cCppParen,cErrInBracket,cCppBracket,@cStringGroup,@Spell
     " cCppParen: same as cParen but ends at end-of-line; used in cDefine
     syn region	cCppParen	transparent start='(' skip='\\$' excludenl end=')' end='$' contained contains=ALLBUT,@cParenGroup,cErrInBracket,cParen,cBracket,cString,@Spell
@@ -276,12 +279,13 @@ if exists("c_gnu")
   syn keyword	cType		__label__ __complex__ __volatile__
 endif
 
-syn keyword	cStructure	struct union enum typedef
+syn keyword	cTypedef	typedef
+syn keyword	cStructure	struct union enum
 syn keyword	cStorageClass	static register auto volatile extern const
 if exists("c_gnu")
   syn keyword	cStorageClass	inline __attribute__
 endif
-if !exists("c_no_c99") && s:ft !=# 'cpp'
+if !exists("c_no_c99") && !s:in_cpp_family
   syn keyword	cStorageClass	inline restrict
 endif
 if !exists("c_no_c11")
@@ -315,8 +319,7 @@ if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu")
   if exists("c_gnu")
     syn keyword cConstant __GNUC__ __FUNCTION__ __PRETTY_FUNCTION__ __func__
   endif
-  syn keyword cConstant __LINE__ __FILE__ __DATE__ __TIME__ __STDC__
-  syn keyword cConstant __STDC_VERSION__
+  syn keyword cConstant __LINE__ __FILE__ __DATE__ __TIME__ __STDC__ __STDC_VERSION__ __STDC_HOSTED__
   syn keyword cConstant CHAR_BIT MB_LEN_MAX MB_CUR_MAX
   syn keyword cConstant UCHAR_MAX UINT_MAX ULONG_MAX USHRT_MAX
   syn keyword cConstant CHAR_MIN INT_MIN LONG_MIN SHRT_MIN
@@ -350,6 +353,8 @@ if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu")
   syn keyword cConstant SIGSTOP SIGTERM SIGTRAP SIGTSTP SIGTTIN SIGTTOU SIGUSR1 SIGUSR2
   syn keyword cConstant _IOFBF _IOLBF _IONBF BUFSIZ EOF WEOF FOPEN_MAX FILENAME_MAX L_tmpnam
   syn keyword cConstant SEEK_CUR SEEK_END SEEK_SET TMP_MAX stderr stdin stdout EXIT_FAILURE EXIT_SUCCESS RAND_MAX
+  " used in assert.h
+  syn keyword cConstant NDEBUG
   " POSIX 2001
   syn keyword cConstant SIGBUS SIGPOLL SIGPROF SIGSYS SIGURG SIGVTALRM SIGXCPU SIGXFSZ
   " non-POSIX signals
@@ -422,7 +427,7 @@ endif
 syn cluster	cLabelGroup	contains=cUserLabel
 syn match	cUserCont	display "^\s*\zs\I\i*\s*:$" contains=@cLabelGroup
 syn match	cUserCont	display ";\s*\zs\I\i*\s*:$" contains=@cLabelGroup
-if s:ft ==# 'cpp'
+if s:in_cpp_family
   syn match	cUserCont	display "^\s*\zs\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
   syn match	cUserCont	display ";\s*\zs\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
 else
@@ -479,6 +484,7 @@ hi def link cSpecialError	cError
 hi def link cCurlyError		cError
 hi def link cOperator		Operator
 hi def link cStructure		Structure
+hi def link cTypedef		Structure
 hi def link cStorageClass	StorageClass
 hi def link cInclude		Include
 hi def link cPreProc		PreProc
diff --git a/syntax/cabal-1.vim b/syntax/cabal-1.vim
index c473800a9..e7a892a36 100644
--- a/syntax/cabal-1.vim
+++ b/syntax/cabal-1.vim
@@ -25,7 +25,7 @@ syn match cabalDocBulletPoint "^\s\+\*"
 syn match cabalDocHeadline "^\s\+=.*$"
 syn match cabalDocCode "^\s\+>.*$"
 syn match cabalDocNewline "^\s\+\.\s*$"
-syn match cabalSection "^\c\(executable\|library\|flag\|source-repository\|test-suite\|benchmark\)"
+syn match cabalSection "^\c\(executable\|library\|flag\|source-repository\|test-suite\|benchmark\|common\)"
 syn match cabalEntry "^\s*[A-Za-z][a-zA-Z\-]*:" contains=cabalIdentifier,cabalColon
 
 syn region cabalDescription start="^\s*[dD]escription:" end="^\<" keepend
diff --git a/syntax/carp.vim b/syntax/carp.vim
index a3f11c66f..849c3247b 100644
--- a/syntax/carp.vim
+++ b/syntax/carp.vim
@@ -33,6 +33,7 @@ syn keyword carpSyntax str* println* break doc sig hidden private
 syn keyword carpSyntax while-do const-assert save-docs defproject
 syn keyword carpSyntax relative-include not-on-windows load-and-use
 syn keyword carpSyntax deftest
+syn keyword carpSyntax quasiquote unquote unquote-splicing
 syn match carpSyntax "\vc(a|d){1,4}r"
 
 syn keyword carpFunc λ
@@ -55,7 +56,7 @@ syn keyword carpFunc string-join free sleep-seconds sleep-micros substitute
 syn keyword carpFunc neg to-float match matches? find global-match match-str
 syn keyword carpFunc from-float tan asin atan cosh sinh tanh exp frexp ldexp
 syn keyword carpFunc log log10 modf pow ceil clamp approx refstr foreach
-syn keyword carpFunc => ==> repeat nth replicate range raw aset aset!
+syn keyword carpFunc -> --> => ==> repeat nth replicate range raw aset aset!
 syn keyword carpFunc push-back pop-back sort index-of element-count
 syn keyword carpFunc apply unsafe-from from just? nothing? ptr from-ptr 
 syn keyword carpFunc map and-then unwrap-or-zero or-else unwrap-or-else
@@ -126,6 +127,13 @@ syn match carpComment /;.*$/ contains=@Spell
 syn region carpQuoted matchgroup=Delimiter start="#['`]"rs=s+2 end=![ \t()\[\]";]!re=e-1,me=e-1 contains=@carpQuotedStuff,@carpQuotedOrNormal
 syn region carpQuoted matchgroup=Delimiter start="#['`]("rs=s+3 matchgroup=Delimiter end=")"re=e-1 contains=@carpQuotedStuff,@carpQuotedOrNormal
 
+syn region carpUnquote matchgroup=Delimiter start="%"rs=s+1 end=![ \t\[\]()";]!re=e-1,me=e-1 contained contains=@carpNormal
+syn region carpUnquote matchgroup=Delimiter start="%@"rs=s+2 end=![ \t\[\]()";]!re=e-1,me=e-1 contained contains=@carpNormal
+syn region carpUnquote matchgroup=Delimiter start="%@("rs=s+2 end=")"re=e-1 contained contains=@carpNormal
+syn region carpUnquote matchgroup=Delimiter start="%("rs=s+2 end=")"re=e-1 contained contains=@carpNormal
+
+syn cluster carpQuotedStuff add=carpUnquote
+
 syn cluster carpNormal  add=carpQuoted,carpComment
 syn cluster carpQuotedOrNormal  add=carpComment
 
diff --git a/syntax/cpp.vim b/syntax/cpp.vim
index 0fd0acc2e..a31f34164 100644
--- a/syntax/cpp.vim
+++ b/syntax/cpp.vim
@@ -6,13 +6,16 @@ endif
 " Language:	C++
 " Current Maintainer:	vim-jp (https://github.com/vim-jp/vim-cpp)
 " Previous Maintainer:	Ken Shan <ccshan@post.harvard.edu>
-" Last Change:	2017 Jun 05
+" Last Change:	2021 Jan 12
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 
+" inform C syntax that the file was included from cpp.vim
+let b:filetype_in_cpp_family = 1
+
 " Read the C syntax to start with
 runtime! syntax/c.vim
 unlet b:current_syntax
@@ -59,12 +62,6 @@ if !exists("cpp_no_cpp14")
   syn case match
 endif
 
-" C++ 17 extensions
-if !exists("cpp_no_cpp17")
-  syn match cppCast		"\<reinterpret_pointer_cast\s*<"me=e-1
-  syn match cppCast		"\<reinterpret_pointer_cast\s*$"
-endif
-
 " C++ 20 extensions
 if !exists("cpp_no_cpp20")
   syn keyword cppStatement	co_await co_return co_yield requires
@@ -74,6 +71,12 @@ if !exists("cpp_no_cpp20")
   syn keyword cppModule		import module export
 endif
 
+" C++ 17 extensions
+if !exists("cpp_no_cpp17")
+  syn match cppCast		"\<reinterpret_pointer_cast\s*<"me=e-1
+  syn match cppCast		"\<reinterpret_pointer_cast\s*$"
+endif
+
 " The minimum and maximum operators in GNU C++
 syn match cppMinMax "[<>]?"
 
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index a776e59bf..ea862acd9 100644
--- a/syntax/crystal.vim
+++ b/syntax/crystal.vim
@@ -95,8 +95,6 @@ syn match crystalStringEscape "\%(\\M-\\C-\|\\C-\\M-\|\\M-\\c\|\\c\\M-\|\\c\|\\C
 syn region crystalInterpolation      matchgroup=crystalInterpolationDelim start="#{" end="}" contained contains=TOP
 syn region crystalNoInterpolation    start="\\#{" end="}" contained
 syn match  crystalNoInterpolation    "\\#{" display contained
-syn match  crystalNoInterpolation    "\\#\%(\$\|@@\=\)\w\+" display contained
-syn match  crystalNoInterpolation    "\\#\$\W" display contained
 
 syn match crystalDelimEscape "\\[(<{\[)>}\]]" transparent display contained contains=NONE
 
@@ -261,10 +259,10 @@ syn cluster crystalDeclaration contains=crystalAliasDeclaration,crystalAliasDecl
 " Note: the following keywords have already been defined:
 " begin case class def do end for if module unless until while
 syn match crystalControl        "\<\%(break\|next\|rescue\|return\)\>[?!]\@!"
-syn match crystalKeyword        "\<\%(super\|previous_def\|yield\|of\|with\|uninitialized\|union\)\>[?!]\@!"
+syn match crystalKeyword        "\<\%(super\|previous_def\|yield\|of\|with\|uninitialized\|union\|out\)\>[?!]\@!"
 syn match crystalBoolean        "\<\%(true\|false\)\>[?!]\@!"
 syn match crystalPseudoVariable "\<\%(nil\|__DIR__\|__FILE__\|__LINE__\|__END_LINE__\)\>[?!]\@!" " TODO: reorganise
-syn match crystalPseudoVariable "\<self\>"
+syn match crystalPseudoVariable "\<self\>[?!]\@!"
 
 " Expensive Mode - match 'end' with the appropriate opening keyword for syntax
 " based folding and special highlighting of module/class/method definitions
diff --git a/syntax/embeddedpuppet.vim b/syntax/epuppet.vim
similarity index 94%
rename from syntax/embeddedpuppet.vim
rename to syntax/epuppet.vim
index dad9e1fba..61c70d21d 100644
--- a/syntax/embeddedpuppet.vim
+++ b/syntax/epuppet.vim
@@ -1,4 +1,4 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'syntax/embeddedpuppet.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'syntax/epuppet.vim')
   finish
 endif
 
@@ -29,5 +29,5 @@ syn region  ePuppetComment    matchgroup=ePuppetDelimiter start="<%-\=#"    end=
 hi def link ePuppetDelimiter              PreProc
 hi def link ePuppetComment                Comment
 
-let b:current_syntax = "embeddedpuppet"
+let b:current_syntax = "epuppet"
 
diff --git a/syntax/groovy.vim b/syntax/groovy.vim
index fdadca901..87fc89df7 100644
--- a/syntax/groovy.vim
+++ b/syntax/groovy.vim
@@ -6,9 +6,9 @@ endif
 " Language:	Groovy
 " Original Author:	Alessio Pace <billy.corgan AT tiscali.it>
 " Maintainer:	Tobias Rapp <yahuxo+vim AT mailbox.org>
-" Version: 	0.1.17
+" Version: 	0.1.18
 " URL:	  http://www.vim.org/scripts/script.php?script_id=945
-" Last Change:	2020 May 26
+" Last Change:	2021 Feb 03
 
 " THE ORIGINAL AUTHOR'S NOTES:
 "
@@ -257,7 +257,8 @@ if exists("groovy_regex_strings")
 endif
 " syn region groovyELExpr start=+${+ end=+}+ keepend contained
 syn match groovyELExpr /\${.\{-}}/ contained
-syn match groovyELExpr /\$[a-zA-Z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE_][a-zA-Z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE0-9_.]*/ contained
+" Fix: force use of the NFA regexp engine (2), see GitHub issue #7280
+syn match groovyELExpr /\%#=2\$[a-zA-Z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE_][a-zA-Z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE0-9_.]*/ contained
 hi def link groovyELExpr Identifier
 
 " TODO: better matching. I am waiting to understand how it really works in groovy
diff --git a/syntax/haskell.vim b/syntax/haskell.vim
index 52c331901..efe303237 100644
--- a/syntax/haskell.vim
+++ b/syntax/haskell.vim
@@ -40,7 +40,12 @@ syn match haskellTypeSig
   \ haskellParens
 syn keyword haskellWhere where
 syn keyword haskellLet let
-syn match HaskellDerive "\<deriving\>\(\s\+\<\(anyclass\|instance\|newtype\|stock\)\>\)\?"
+syn keyword haskellDeriveKeyword deriving anyclass instance newtype stock via contained
+syn match haskellDerive "deriving\(\s\+instance\)\?\(\s\+anyclass\|\s\+newtype\|\s\+stock\|\s\+.\{-}\_s\+via\)\?"
+  \ contains=
+  \ haskellDeriveKeyword,
+  \ haskellParens,
+  \ haskellType
 syn keyword haskellDeclKeyword module class instance newtype in
 syn match haskellDecl "\<\(type\|data\)\>\s\+\(\<family\>\)\?"
 syn keyword haskellDefault default
@@ -67,8 +72,8 @@ if get(g:, 'haskell_enable_static_pointers', 0)
   syn keyword haskellStatic static
 endif
 syn keyword haskellConditional if then else
-syn match haskellNumber "\<[0-9]\+\>\|\<0[xX][0-9a-fA-F]\+\>\|\<0[oO][0-7]\+\>\|\<0[bB][10]\+\>"
-syn match haskellFloat "\<[0-9]\+\.[0-9]\+\([eE][-+]\=[0-9]\+\)\=\>"
+syn match haskellNumber "\<[0-9]\+\>\|\<[0-9_]\+\>\|\<0[xX][0-9a-fA-F_]\+\>\|\<0[oO][0-7_]\+\>\|\<0[bB][10_]\+\>"
+syn match haskellFloat "\<[0-9]\+\.[0-9_]\+\([eE][-+]\=[0-9_]\+\)\=\>"
 syn match haskellSeparator  "[,;]"
 syn region haskellParens matchgroup=haskellDelimiter start="(" end=")" contains=TOP,haskellTypeSig,@Spell
 syn region haskellBrackets matchgroup=haskellDelimiter start="\[" end="]" contains=TOP,haskellTypeSig,@Spell
@@ -94,7 +99,7 @@ syn match haskellLineComment "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$"
 syn match haskellBacktick "`[A-Za-z_][A-Za-z0-9_\.']*#\?`"
 syn region haskellString start=+"+ skip=+\\\\\|\\"+ end=+"+
   \ contains=@Spell
-syn match haskellIdentifier "[_a-z][a-zA-z0-9_']*" contained
+syn match haskellIdentifier "[_a-z][a-zA-Z0-9_']*" contained
 syn match haskellChar "\<'[^'\\]'\|'\\.'\|'\\u[0-9a-fA-F]\{4}'\>"
 syn match haskellType "\<[A-Z][a-zA-Z0-9_']*\>"
 syn region haskellBlockComment start="{-" end="-}"
@@ -110,7 +115,7 @@ syn keyword haskellTodo TODO FIXME contained
 syn match haskellShebang "\%^#!.*$"
 if !get(g:, 'haskell_disable_TH', 0)
     syn match haskellQuasiQuoted "." containedin=haskellQuasiQuote contained
-    syn region haskellQuasiQuote matchgroup=haskellTH start="\[[_a-zA-Z][a-zA-z0-9._']*|" end="|\]"
+    syn region haskellQuasiQuote matchgroup=haskellTH start="\[[_a-zA-Z][a-zA-Z0-9._']*|" end="|\]"
     syn region haskellTHBlock matchgroup=haskellTH start="\[\(d\|t\|p\)\?|" end="|]" contains=TOP
     syn region haskellTHDoubleBlock matchgroup=haskellTH start="\[||" end="||]" contains=TOP
 endif
@@ -165,13 +170,13 @@ highlight def link haskellType Type
 highlight def link haskellImportKeywords Include
 if get(g:, 'haskell_classic_highlighting', 0)
   highlight def link haskellDeclKeyword Keyword
-  highlight def link HaskellDerive Keyword
+  highlight def link haskellDeriveKeyword Keyword
   highlight def link haskellDecl Keyword
   highlight def link haskellWhere Keyword
   highlight def link haskellLet Keyword
 else
   highlight def link haskellDeclKeyword Structure
-  highlight def link HaskellDerive Structure
+  highlight def link haskellDeriveKeyword Structure
   highlight def link haskellDecl Structure
   highlight def link haskellWhere Structure
   highlight def link haskellLet Structure
diff --git a/syntax/html.vim b/syntax/html.vim
index c823d362b..2113f12a6 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -4,11 +4,11 @@ endif
 
 " Vim syntax file
 " Language:             HTML
-" Maintainer:           Jorge Maldonado Ventura <jorgesumle@freakspot.net>
+" Previous Maintainer:  Jorge Maldonado Ventura <jorgesumle@freakspot.net>
 " Previous Maintainer:  Claudio Fleiner <claudio@fleiner.com>
 " Repository:           https://notabug.org/jorgesumle/vim-html-syntax
-" Last Change:          2020 Mar 17
-" Included patch from Florian Breisch to add the summary element
+" Last Change:          2021 Feb 25
+"			Included patch #7900 to fix comments
 "
 
 " Please check :help html.vim for some comments and a description of the options
@@ -145,9 +145,21 @@ syn match htmlSpecialChar "&#\=[0-9A-Za-z]\{1,8};"
 if exists("html_wrong_comments")
   syn region htmlComment                start=+<!--+    end=+--\s*>+ contains=@Spell
 else
-  syn region htmlComment                start=+<!+      end=+>+   contains=htmlCommentPart,htmlCommentError,@Spell
-  syn match  htmlCommentError contained "[^><!]"
-  syn region htmlCommentPart  contained start=+--+      end=+--\s*+  contains=@htmlPreProc,@Spell
+  " The HTML 5.2 syntax 8.2.4.41-42: bogus comment is parser error; browser skips until next &gt;
+  " Note: must stand first to get lesser :syn-priority
+  syn region htmlComment                start=+<!+      end=+>+     contains=htmlCommentError
+  " Normal comment opening <!-- ...>
+  syn region htmlComment                start=+<!--+    end=+>+     contains=htmlCommentPart,@Spell
+  " Idem 8.2.4.43-44: <!--> and <!---> are parser errors; browser treats as comments
+  syn match htmlComment "<!---\?>" contains=htmlCommentError
+  " Idem 8.2.4.51: any number of consecutive dashes within comment is okay; --> closes comment
+  " Idem 8.2.4.52: closing comment by dash-dash-bang (--!>) is error ignored by parser(!); closes comment
+  syn region htmlCommentPart  contained start=+--+      end=+--!\?>+me=e-1  contains=htmlCommentNested,@htmlPreProc,@Spell
+  " Idem 8.2.4.49: opening nested comment <!-- is parser error, ignored by browser, except <!--> is all right
+  syn match htmlCommentNested contained "<!--[^>]"me=e-1
+  syn match htmlCommentNested contained "<!--->"me=e-3
+  syn match htmlCommentNested contained "<!---\?!>"me=e-4
+  syn match htmlCommentError contained "[^><!]"
 endif
 syn region htmlComment                  start=+<!DOCTYPE+ keepend end=+>+
 
@@ -321,6 +333,7 @@ hi def link htmlStatement          Statement
 hi def link htmlComment            Comment
 hi def link htmlCommentPart        Comment
 hi def link htmlValue              String
+hi def link htmlCommentNested      htmlCommentError
 hi def link htmlCommentError       htmlError
 hi def link htmlTagError           htmlError
 hi def link htmlEvent              javaScript
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 42ed6acb6..5d9a7ae1d 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -143,7 +143,7 @@ exec 'syntax region  juliaConditionalEBlock	matchgroup=juliaConditional transpar
 exec 'syntax region  juliaWhileBlock		matchgroup=juliaRepeat start="'.s:nodot.'\<while\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaForBlock		matchgroup=juliaRepeat start="'.s:nodot.'\<for\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaOuter fold'
 exec 'syntax region  juliaBeginBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<begin\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
-exec 'syntax region  juliaFunctionBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<function\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
+exec 'syntax region  juliaFunctionBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<function\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaFunctionDef,juliaFunctionDefP fold'
 exec 'syntax region  juliaMacroBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<macro\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaQuoteBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<quote\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaStructBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
@@ -201,6 +201,10 @@ syntax match   juliaConstIO		display "\<\%(std\%(out\|in\|err\)\|devnull\)\>"
 syntax match   juliaConstC		display "\<\%(C_NULL\)\>"
 syntax match   juliaConstGeneric	display "\<\%(nothing\|Main\|undef\|missing\)\>"
 
+exec 'syntax match   juliaFunctionDef	contained transparent "\%(\<function\s\+\)\@'.s:d(20).'<=' . s:idregex . '\%(\.' . s:idregex . '\)*\ze\s\+\%(end\>\|$\)" contains=juliaFunctionName'
+exec 'syntax region  juliaFunctionDefP	contained transparent start="\%(\<function\s\+\)\@'.s:d(20).'<=' . s:idregex . '\%(\.' . s:idregex . '\)*\s*(" end=")\@'.s:d(1).'<=" contains=juliaFunctionName,juliaParBlock'
+exec 'syntax match   juliaFunctionName	contained "\%(\<function\s\+\)\@'.s:d(20).'<=' . s:idregex . '\%(\.' . s:idregex . '\)*"'
+
 syntax match   juliaPossibleMacro	transparent "@" contains=juliaMacroCall,juliaMacroCallP,juliaPrintfMacro
 
 exec 'syntax match   juliaMacro		contained "@' . s:idregex . '\%(\.' . s:idregex . '\)*"'
@@ -369,7 +373,8 @@ hi def link juliaComma			juliaNone
 
 hi def link juliaColon			juliaOperator
 
-hi def link juliaMacroName     		juliaMacro
+hi def link juliaFunctionName		juliaFunction
+hi def link juliaMacroName		juliaMacro
 
 
 hi def link juliaKeyword		Keyword
@@ -423,6 +428,7 @@ hi def link juliaComprehensionIf	Keyword
 
 hi def link juliaDollarVar		Identifier
 
+hi def link juliaFunction		Function
 hi def link juliaMacro			Macro
 hi def link juliaSymbol			Identifier
 hi def link juliaSymbolS		Identifier
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index 92362eb5a..762c3068b 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language: Kotlin
 " Maintainer: Alexander Udalov
-" Latest Revision: 13 July 2020
+" Latest Revision: 17 February 2021
 
 if exists('b:current_syntax')
     finish
@@ -33,21 +33,21 @@ syn keyword ktType ExperimentalTime ExperimentalTypeInference ExperimentalUnsign
 syn keyword ktType FileWalkDirection Float FloatArray FloatIterator Function Function0 Function1 Function10 Function11 Function12 Function13 Function14 Function15 Function16
 syn keyword ktType Function17 Function18 Function19 Function2 Function20 Function21 Function22 Function3 Function4 Function5 Function6 Function7 Function8 Function9 FunctionN
 syn keyword ktType Getter Grouping HashMap HashSet IllegalArgumentException IllegalStateException IndexOutOfBoundsException IndexedValue Int IntArray IntIterator IntProgression
-syn keyword ktType IntRange InvocationKind Iterable Iterator JsExport JsName JvmDefault JvmDefaultWithoutCompatibility JvmField JvmMultifileClass JvmName JvmOverloads JvmStatic
-syn keyword ktType JvmSuppressWildcards JvmSynthetic JvmWildcard KAnnotatedElement KCallable KClass KClassifier KDeclarationContainer KFunction KMutableProperty KMutableProperty0
-syn keyword ktType KMutableProperty1 KMutableProperty2 KParameter KProperty KProperty0 KProperty1 KProperty2 KType KTypeParameter KTypeProjection KVariance KVisibility Key Kind
-syn keyword ktType KotlinNullPointerException KotlinReflectionNotSupportedError KotlinVersion Lazy LazyThreadSafetyMode Level LinkedHashMap LinkedHashSet List ListIterator Long
-syn keyword ktType LongArray LongIterator LongProgression LongRange Map MatchGroup MatchGroupCollection MatchNamedGroupCollection MatchResult Metadata Monotonic MustBeDocumented
-syn keyword ktType MutableCollection MutableEntry MutableIterable MutableIterator MutableList MutableListIterator MutableMap MutableSet NoSuchElementException NoSuchFileException
-syn keyword ktType NoWhenBranchMatchedException NotImplementedError Nothing NullPointerException Number NumberFormatException ObservableProperty OnErrorAction OptIn
-syn keyword ktType OptionalExpectation OverloadResolutionByLambdaReturnType Pair ParameterName PropertyDelegateProvider PublishedApi PurelyImplements Random RandomAccess
+syn keyword ktType IntRange InvocationKind Iterable Iterator JsExport JsName JvmDefault JvmDefaultWithoutCompatibility JvmField JvmInline JvmMultifileClass JvmName JvmOverloads
+syn keyword ktType JvmRecord JvmStatic JvmSuppressWildcards JvmSynthetic JvmWildcard KAnnotatedElement KCallable KClass KClassifier KDeclarationContainer KFunction KMutableProperty
+syn keyword ktType KMutableProperty0 KMutableProperty1 KMutableProperty2 KParameter KProperty KProperty0 KProperty1 KProperty2 KType KTypeParameter KTypeProjection KVariance
+syn keyword ktType KVisibility Key Kind KotlinNullPointerException KotlinReflectionNotSupportedError KotlinVersion Lazy LazyThreadSafetyMode Level LinkedHashMap LinkedHashSet List
+syn keyword ktType ListIterator Long LongArray LongIterator LongProgression LongRange Map MatchGroup MatchGroupCollection MatchNamedGroupCollection MatchResult Metadata Monotonic
+syn keyword ktType MustBeDocumented MutableCollection MutableEntry MutableIterable MutableIterator MutableList MutableListIterator MutableMap MutableSet NoSuchElementException
+syn keyword ktType NoSuchFileException NoWhenBranchMatchedException NotImplementedError Nothing NullPointerException Number NumberFormatException ObservableProperty OnErrorAction
+syn keyword ktType OptIn OptionalExpectation OverloadResolutionByLambdaReturnType Pair ParameterName PropertyDelegateProvider PublishedApi PurelyImplements Random RandomAccess
 syn keyword ktType ReadOnlyProperty ReadWriteProperty Regex RegexOption Repeatable ReplaceWith RequiresOptIn RestrictsSuspension Result Retention Returns ReturnsNotNull
 syn keyword ktType RuntimeException Sequence SequenceScope Set Setter SharedImmutable Short ShortArray ShortIterator SimpleEffect SinceKotlin Strictfp String StringBuilder Suppress
 syn keyword ktType Synchronized Target TestTimeSource ThreadLocal Throwable Throws TimeMark TimeSource TimedValue Transient Triple TypeCastException Typography UByte UByteArray
 syn keyword ktType UByteIterator UInt UIntArray UIntIterator UIntProgression UIntRange ULong ULongArray ULongIterator ULongProgression ULongRange UShort UShortArray UShortIterator
 syn keyword ktType UninitializedPropertyAccessException Unit UnsafeVariance UnsupportedOperationException UseExperimental Volatile
 
-syn keyword ktModifier annotation companion enum inner internal private protected public abstract final open override sealed vararg dynamic expect actual
+syn keyword ktModifier annotation companion enum inner abstract final open override sealed vararg dynamic expect actual
 syn keyword ktStructure class object interface typealias fun val var constructor init
 
 syn keyword ktReservedKeyword typeof
@@ -55,7 +55,13 @@ syn keyword ktReservedKeyword typeof
 syn keyword ktBoolean true false
 syn keyword ktConstant null
 
-syn keyword ktModifier data tailrec lateinit reified external inline noinline crossinline const operator infix suspend
+syn keyword ktModifier reified external inline noinline crossinline
+
+syn match ktModifier "\v<(data|value)>\ze\@=.*<class>"
+syn match ktModifier "\v<(tailrec|operator|infix|suspend)>\ze\@=.*<fun>"
+syn match ktModifier "\v<(const)>\ze\@=.*<val>"
+syn match ktModifier "\v<(lateinit)>\ze\@=.*<var>"
+syn match ktModifier "\v<(internal|private|protected|public)>\ze\@=.*<(class|fun|val|var|typealias)>"
 
 syn match ktOperator "\v\?:|::|\<\=? | \>\=?|[!=]\=\=?|<as>\??|[-!%&*+/|]"
 
diff --git a/syntax/lhaskell.vim b/syntax/lhaskell.vim
index 9dd6e6f56..b963be0fe 100644
--- a/syntax/lhaskell.vim
+++ b/syntax/lhaskell.vim
@@ -4,12 +4,12 @@ endif
 
 " Vim syntax file
 " Language:		Haskell with literate comments, Bird style,
-"			TeX style and plain text surrounding
+"			Markdown style, TeX style and plain text surrounding
 "			\begin{code} \end{code} blocks
 " Maintainer:		Haskell Cafe mailinglist <haskell-cafe@haskell.org>
 " Original Author:	Arthur van Leeuwen <arthurvl@cs.uu.nl>
-" Last Change:		2010 Apr 11
-" Version:		1.04
+" Last Change:		2020 Feb 25
+" Version:		1.05
 "
 " Thanks to Ian Lynagh for thoughtful comments on initial versions and
 " for the inspiration for writing this in the first place.
@@ -48,8 +48,8 @@ endif
 " First off, see if we can inherit a user preference for lhs_markup
 if !exists("b:lhs_markup")
     if exists("lhs_markup")
-	if lhs_markup =~ '\<\%(tex\|none\)\>'
-	    let b:lhs_markup = matchstr(lhs_markup,'\<\%(tex\|none\)\>')
+	if lhs_markup =~ '\<\%(tex\|md\|none\)\>'
+	    let b:lhs_markup = matchstr(lhs_markup,'\<\%(tex\|md\|none\)\>')
 	else
 	    echohl WarningMsg | echo "Unknown value of lhs_markup" | echohl None
 	    let b:lhs_markup = "unknown"
@@ -58,7 +58,7 @@ if !exists("b:lhs_markup")
 	let b:lhs_markup = "unknown"
     endif
 else
-    if b:lhs_markup !~ '\<\%(tex\|none\)\>'
+    if b:lhs_markup !~ '\<\%(tex\|md\|none\)\>'
 	let b:lhs_markup = "unknown"
     endif
 endif
@@ -78,6 +78,8 @@ call cursor(1,1)
 if b:lhs_markup == "unknown"
     if search('\\documentclass\|\\begin{\(code}\)\@!\|\\\(sub\)*section\|\\chapter|\\part','W') != 0
 	let b:lhs_markup = "tex"
+    elseif search('```haskell','W') != 0
+        let b:lhs_markup = "md"
     else
 	let b:lhs_markup = "plain"
     endif
@@ -90,6 +92,10 @@ if b:lhs_markup == "tex"
     " Tex.vim removes "_" from 'iskeyword', but we need it for Haskell.
     setlocal isk+=_
     syntax cluster lhsTeXContainer contains=tex.*Zone,texAbstract
+elseif b:lhs_markup == "md"
+    runtime! syntax/markdown.vim
+    unlet b:current_syntax
+    syntax cluster lhsTeXContainer contains=markdown.*
 else
     syntax cluster lhsTeXContainer contains=.*
 endif
@@ -100,9 +106,12 @@ syntax include @haskellTop syntax/haskell.vim
 
 syntax region lhsHaskellBirdTrack start="^>" end="\%(^[^>]\)\@=" contains=@haskellTop,lhsBirdTrack containedin=@lhsTeXContainer
 syntax region lhsHaskellBeginEndBlock start="^\\begin{code}\s*$" matchgroup=NONE end="\%(^\\end{code}.*$\)\@=" contains=@haskellTop,beginCodeBegin containedin=@lhsTeXContainer
+syntax region lhsHaskellMDBlock start="^```haskell$" matchgroup=NONE end="^```$" keepend contains=@haskellTop,lhsMarkdownCode containedin=@lhsTeXContainer
 
 syntax match lhsBirdTrack "^>" contained
 
+syntax match lhsMarkdownCode "^\(```haskell\|^```\)$" contained
+
 syntax match beginCodeBegin "^\\begin" nextgroup=beginCodeCode contained
 syntax region beginCodeCode  matchgroup=texDelimiter start="{" end="}"
 
@@ -111,6 +120,8 @@ syntax region beginCodeCode  matchgroup=texDelimiter start="{" end="}"
 
 hi def link lhsBirdTrack Comment
 
+hi def link lhsMarkdownCode Comment
+
 hi def link beginCodeBegin	      texCmdName
 hi def link beginCodeCode	      texSection
 
diff --git a/syntax/messages.vim b/syntax/messages.vim
index a66dbe638..3219b67d4 100644
--- a/syntax/messages.vim
+++ b/syntax/messages.vim
@@ -8,6 +8,7 @@ endif
 " Latest Revision:  2008-06-29
 " Changes:          2008-06-29 support for RFC3339 tuimestamps James Vega
 " 		    2016 Jan 19: messagesDate changed by Bram
+" 		    2021 Jan 27: messagesHourRFC3339 changed from #946
 
 if exists("b:current_syntax")
   finish
@@ -30,7 +31,7 @@ syn match   messagesDateRFC3339 contained display '\d\{4}-\d\d-\d\d'
 syn match   messagesRFC3339T    contained display '\cT'
                                 \ nextgroup=messagesHourRFC3339
 
-syn match   messagesHourRFC3339 contained display '\c\d\d:\d\d:\d\d\(\.\d\+\)\=\([+-]\d\d:\d\d\|Z\)'
+syn match   messagesHourRFC3339 contained display '\c\d\d:\d\d:\d\d\(\.\d\+\)\=\([+-]\d\d:\d\d\|Z\)\s*'
                                 \ nextgroup=messagesHost
 
 syn match   messagesHost        contained display '\S*\s*'
diff --git a/syntax/nginx.vim b/syntax/nginx.vim
index 9c657fe36..7c889ffee 100644
--- a/syntax/nginx.vim
+++ b/syntax/nginx.vim
@@ -2280,7 +2280,6 @@ hi link ngxComment Comment
 hi link ngxVariable Identifier
 hi link ngxVariableBlock Identifier
 hi link ngxVariableString PreProc
-hi link ngxBlock Normal
 hi link ngxString String
 hi link ngxIPaddr Delimiter
 hi link ngxBoolean Boolean
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index c3508ce8c..14939535b 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -88,10 +88,10 @@ syn cluster  ocamlContained contains=ocamlTodo,ocamlPreDef,ocamlModParam,ocamlMo
 
 
 " Enclosing delimiters
-syn region   ocamlEncl transparent matchgroup=ocamlKeyword start="(" matchgroup=ocamlKeyword end=")" contains=ALLBUT,@ocamlContained,ocamlParenErr
-syn region   ocamlEncl transparent matchgroup=ocamlKeyword start="{" matchgroup=ocamlKeyword end="}"  contains=ALLBUT,@ocamlContained,ocamlBraceErr
-syn region   ocamlEncl transparent matchgroup=ocamlKeyword start="\[" matchgroup=ocamlKeyword end="\]" contains=ALLBUT,@ocamlContained,ocamlBrackErr
-syn region   ocamlEncl transparent matchgroup=ocamlKeyword start="\[|" matchgroup=ocamlKeyword end="|\]" contains=ALLBUT,@ocamlContained,ocamlArrErr
+syn region   ocamlEncl transparent matchgroup=ocamlKeywordDelimiter start="(" matchgroup=ocamlKeywordDelimiter end=")" contains=ALLBUT,@ocamlContained,ocamlParenErr
+syn region   ocamlEncl transparent matchgroup=ocamlKeywordDelimiter start="{" matchgroup=ocamlKeywordDelimiter end="}"  contains=ALLBUT,@ocamlContained,ocamlBraceErr
+syn region   ocamlEncl transparent matchgroup=ocamlKeywordDelimiter start="\[" matchgroup=ocamlKeywordDelimiter end="\]" contains=ALLBUT,@ocamlContained,ocamlBrackErr
+syn region   ocamlEncl transparent matchgroup=ocamlKeywordDelimiter start="\[|" matchgroup=ocamlKeywordDelimiter end="|\]" contains=ALLBUT,@ocamlContained,ocamlArrErr
 
 
 " Comments
@@ -196,10 +196,10 @@ syn keyword  ocamlType     array bool char exn float format format4
 syn keyword  ocamlType     int int32 int64 lazy_t list nativeint option
 syn keyword  ocamlType     bytes string unit
 
-syn match    ocamlConstructor  "(\s*)"
-syn match    ocamlConstructor  "\[\s*\]"
-syn match    ocamlConstructor  "\[|\s*>|]"
-syn match    ocamlConstructor  "\[<\s*>\]"
+syn match    ocamlConstructorDelimiter  "(\s*)"
+syn match    ocamlConstructorDelimiter  "\[\s*\]"
+syn match    ocamlConstructorDelimiter  "\[|\s*>|]"
+syn match    ocamlConstructorDelimiter  "\[<\s*>\]"
 syn match    ocamlConstructor  "\u\(\w\|'\)*\>"
 
 " Polymorphic variants
@@ -343,11 +343,13 @@ hi def link ocamlStructEncl	   ocamlModule
 hi def link ocamlScript	   Include
 
 hi def link ocamlConstructor  Constant
+hi def link ocamlConstructorDelimiter  ocamlConstructor
 
 hi def link ocamlVal          Keyword
 hi def link ocamlModPreRHS    Keyword
 hi def link ocamlMPRestr2	   Keyword
 hi def link ocamlKeyword	   Keyword
+hi def link ocamlKeywordDelimiter	   ocamlKeyword
 hi def link ocamlMethod	   Include
 hi def link ocamlArrow	   Keyword
 hi def link ocamlKeyChar	   Keyword
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 70c3d38c5..43218edb6 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -9,7 +9,7 @@ endif
 " License:      Vim license (see `:help license`)
 
 " Based on PostgreSQL 13.1
-" Automatically generated on 2021-01-13 at 20:54:21
+" Automatically generated on 2021-02-07 at 10:45:10
 
 if exists("b:current_syntax")
   finish
@@ -17,7 +17,11 @@ endif
 
 syn case ignore
 syn sync minlines=100
-syn iskeyword @,48-57,192-255,_
+if has('patch-7.4.1142')
+  syn iskeyword @,48-57,192-255,_
+else
+  setlocal iskeyword=@,48-57,192-255,_
+endif
 
 syn match sqlIsKeyword  /\<\h\w*\>/   contains=sqlStatement,sqlKeyword,sqlCatalog,sqlConstant,sqlSpecial,sqlOption,sqlErrorCode,sqlType,sqlTable,sqlView
 syn match sqlIsFunction /\<\h\w*\ze(/ contains=sqlFunction,sqlKeyword,sqlType
@@ -723,7 +727,7 @@ syn keyword sqlConstant contained ltree_plpythonu pldbgapi plpython2u plpython3u
 if index(get(g:, 'pgsql_disabled_extensions', []), 'refint') == -1
   syn keyword sqlFunction contained check_foreign_key check_primary_key
 endif " refint
-" Extension: postgis (v3.1.0)
+" Extension: postgis (v3.1.1)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis') == -1
   syn keyword sqlFunction contained addauth addgeometrycolumn box
   syn keyword sqlFunction contained box2d box2d_in box2d_out box2df_in
@@ -1018,7 +1022,7 @@ endif " dict_xsyn
 if index(get(g:, 'pgsql_disabled_extensions', []), 'bool_plperlu') == -1
   syn keyword sqlFunction contained bool_to_plperlu plperlu_to_bool
 endif " bool_plperlu
-" Extension: address_standardizer (v3.1.0)
+" Extension: address_standardizer (v3.1.1)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'address_standardizer') == -1
   syn keyword sqlFunction contained parse_address standardize_address
   syn keyword sqlType contained stdaddr
@@ -1077,7 +1081,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'cube') == -1
   syn keyword sqlType contained cube
   syn keyword sqlFunction contained g_cube_compress g_cube_decompress
 endif " cube
-" Extension: postgis_tiger_geocoder (v3.1.0)
+" Extension: postgis_tiger_geocoder (v3.1.1)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_tiger_geocoder') == -1
   syn keyword sqlFunction contained count_words create_census_base_tables
   syn keyword sqlFunction contained cull_null diff_zip
@@ -1181,11 +1185,11 @@ endif " pgstattuple
 if index(get(g:, 'pgsql_disabled_extensions', []), 'autoinc') == -1
   syn keyword sqlFunction contained autoinc
 endif " autoinc
-" Extension: address_standardizer_data_us (v3.1.0)
+" Extension: address_standardizer_data_us (v3.1.1)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'address_standardizer_data_us') == -1
   syn keyword sqlTable contained us_gaz us_lex us_rules
 endif " address_standardizer_data_us
-" Extension: postgis_topology (v3.1.0)
+" Extension: postgis_topology (v3.1.1)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_topology') == -1
   syn keyword sqlFunction contained addedge addface addnode
   syn keyword sqlFunction contained addtopogeometrycolumn addtosearchpath asgml
@@ -1218,7 +1222,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_topology') == -1
   syn keyword sqlType contained topoelementarray topogeometry
   syn keyword sqlType contained validatetopology_returntype
 endif " postgis_topology
-" Extension: postgis_raster (v3.1.0)
+" Extension: postgis_raster (v3.1.1)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_raster') == -1
   syn keyword sqlFunction contained addoverviewconstraints addrasterconstraints
   syn keyword sqlFunction contained box3d bytea dropoverviewconstraints
@@ -1566,7 +1570,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'fuzzystrmatch') == -1
   syn keyword sqlFunction contained levenshtein levenshtein_less_equal
   syn keyword sqlFunction contained metaphone soundex text_soundex
 endif " fuzzystrmatch
-" Extension: pgrouting (v3.1.1)
+" Extension: pgrouting (v3.1.3)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pgrouting') == -1
   syn keyword sqlFunction contained pgr_alphashape pgr_analyzegraph
   syn keyword sqlFunction contained pgr_analyzeoneway pgr_articulationpoints pgr_astar
@@ -1610,7 +1614,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'pgcrypto') == -1
   syn keyword sqlFunction contained pgp_sym_decrypt_bytea pgp_sym_encrypt
   syn keyword sqlFunction contained pgp_sym_encrypt_bytea
 endif " pgcrypto
-" Extension: postgis_sfcgal (v3.1.0)
+" Extension: postgis_sfcgal (v3.1.1)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_sfcgal') == -1
   syn keyword sqlFunction contained postgis_sfcgal_noop
   syn keyword sqlFunction contained postgis_sfcgal_scripts_installed postgis_sfcgal_version st_3darea
@@ -2025,8 +2029,17 @@ for pl in get(b:, 'pgsql_pl', get(g:, 'pgsql_pl', []))
 endfor
 
 " Folding
-execute "syn region sqlFold start='^\s*\zs\c\(create\|update\|alter\|select\|insert\|do\)\>' end=';$' transparent fold "
-      \ .. "contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo," .. s:plgroups
+if get(g:, 'pgsql_fold_functions_only', 0)
+
+    execute 'syn region sqlFold start=/^\s*\zs\c\%(create\s\+[a-z ]*\%(function\|procedure\)\|do\)\>/ end=/;$/ transparent fold '
+        \ .. "contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo," .. s:plgroups
+
+else
+
+    execute 'syn region sqlFold start=/^\s*\zs\c\(create\|update\|alter\|select\|insert\|do\)\>/ end=/;$/ transparent fold '
+        \ .. "contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo," .. s:plgroups
+
+endif
 
 unlet s:plgroups
 
@@ -2058,4 +2071,3 @@ hi def link sqlCreateOperatorKeyword sqlKeyword
 hi def link sqlCreateTextSearchKeyword sqlKeyword
 
 let b:current_syntax = "sql"
-
diff --git a/syntax/puppet.vim b/syntax/puppet.vim
index 2b9b09c9f..b246f7534 100644
--- a/syntax/puppet.vim
+++ b/syntax/puppet.vim
@@ -32,9 +32,9 @@ syn match  puppetOperator "+=\|-=\|==\|!=\|=\~\|!\~\|>=\|<=\|<-\|<\~\|=>\|+>\|->
 " three character operators
 syn match  puppetOperator "<<|\||>>"
 
-syn region puppetBracketOperator matchgroup=puppetDelimiter start="\[\s*" end="\s*]" contains=ALLBUT,@puppetNotTop
-syn region puppetBraceOperator matchgroup=puppetDelimiter start="{\s*" end="\s*}" contains=ALLBUT,@puppetNotTop
-syn region puppetParenOperator matchgroup=puppetDelimiter start="(\s*" end="\s*)" contains=ALLBUT,@puppetNotTop
+syn region puppetBracketOperator matchgroup=puppetDelimiter start="\[\s*" end="\s*]" fold contains=ALLBUT,@puppetNotTop
+syn region puppetBraceOperator matchgroup=puppetDelimiter start="{\s*" end="\s*}" fold contains=ALLBUT,@puppetNotTop
+syn region puppetParenOperator matchgroup=puppetDelimiter start="(\s*" end="\s*)" fold contains=ALLBUT,@puppetNotTop
 
 " Expression Substitution and Backslash Notation {{{1
 syn match puppetStringEscape "\\\\\|\\[abefnrstv]\|\\\o\{1,3}\|\\x\x\{1,2}" contained display
diff --git a/syntax/rst.vim b/syntax/rst.vim
index 22b6ac594..f20eafebb 100644
--- a/syntax/rst.vim
+++ b/syntax/rst.vim
@@ -21,8 +21,9 @@ syn case ignore
 syn match   rstTransition  /^[=`:.'"~^_*+#-]\{4,}\s*$/
 
 syn cluster rstCruft                contains=rstEmphasis,rstStrongEmphasis,
-      \ rstInterpretedText,rstInlineLiteral,rstSubstitutionReference,
-      \ rstInlineInternalTargets,rstFootnoteReference,rstHyperlinkReference
+      \ rstInterpretedTextOrHyperlinkReference,rstInlineLiteral,
+      \ rstSubstitutionReference, rstInlineInternalTargets,rstFootnoteReference,
+      \ rstHyperlinkReference
 
 syn region  rstLiteralBlock         matchgroup=rstDelimiter
       \ start='\(^\z(\s*\).*\)\@<=::\n\s*\n' skip='^\s*$' end='^\(\z1\s\+\)\@!'
@@ -88,7 +89,7 @@ syn region rstHyperlinkTarget matchgroup=rstDirective
 execute 'syn region rstExDirective contained matchgroup=rstDirective' .
       \ ' start=+' . s:ReferenceName . '::\_s+' .
       \ ' skip=+^$+' .
-      \ ' end=+^\s\@!+ contains=@rstCruft,rstLiteralBlock'
+      \ ' end=+^\s\@!+ contains=@rstCruft,rstLiteralBlock,rstExplicitMarkup'
 
 execute 'syn match rstSubstitutionDefinition contained' .
       \ ' /|.*|\_s\+/ nextgroup=@rstDirectives'
diff --git a/syntax/smt2.vim b/syntax/smt2.vim
index eb89e375c..29cb4625d 100644
--- a/syntax/smt2.vim
+++ b/syntax/smt2.vim
@@ -13,7 +13,7 @@ endif
 let b:current_syntax = "smt2"
 
 " Comments
-syntax match smt2Comment ";.*$"
+syntax match smt2Comment "\m\C;.*$"
 
 " Commands
 syntax keyword smt2Commands
@@ -64,10 +64,10 @@ syntax keyword smt2Commands
       \ set-logic
       \ set-option
       \ simplify
-syntax match smt2Commands "!"
+syntax match smt2Commands "\m\C!"
 
 " Operators
-syntax match smt2Operator "[=\|>\|<\|<=\|>=\|=>\|+\|\-\|*\|/\|!]"
+syntax match smt2Operator "\m\C[=\|>\|<\|<=\|>=\|=>\|+\|\-\|*\|/\|!]"
 
 " Builtins
 syntax keyword smt2Builtin
@@ -140,29 +140,29 @@ syntax keyword smt2Builtin
       \ unsat
       \ xor
       \ zero_extend
-syntax match smt2Builtin "[\^\~]"
+syntax match smt2Builtin "\m\C[\^\~]"
 
 " Identifier
-syntax match smt2Identifier "\<[a-z_][a-zA-Z0-9_\-\.']*\>"
+syntax match smt2Identifier "\m\C\<[a-z_][a-zA-Z0-9_\-\.']*\>"
 
 " Types
-syntax match smt2Type "\<[A-Z][a-zA-Z0-9_\-\.']*\>"
+syntax match smt2Type "\m\C\<[A-Z][a-zA-Z0-9_\-\.']*\>"
 
 " Strings
 syntax region smt2String start=+"+ skip=+\\\\\|\\"+ end=+"+
-syntax match smt2Option "\<:[a-zA-Z0-9_\-\.']*\>"
+syntax match smt2Option "\m\C\<:[a-zA-Z0-9_\-\.']*\>"
 
 " Constructors
-syntax match smt2Constructor "\<\$[a-zA-Z0-9_\-\.']*\>"
+syntax match smt2Constructor "\m\C\<\$[a-zA-Z0-9_\-\.']*\>"
 
 " Number
-syntax match smt2Int "\<[0-9]\+\>"
-syntax match smt2Hex "\<[0#][xX][0-9a-fA-F]\+\>"
-syntax match smt2Binary "\<#b[01]\+\>"
-syntax match smt2Float "\<[0-9]\+\.[0-9]\+\([eE][\-+]\=[0-9]\+\)\=\>"
+syntax match smt2Int "\m\C\<[0-9]\+\>"
+syntax match smt2Hex "\m\C\<[0#][xX][0-9a-fA-F]\+\>"
+syntax match smt2Binary "\m\C\<#b[01]\+\>"
+syntax match smt2Float "\m\C\<[0-9]\+\.[0-9]\+\([eE][\-+]\=[0-9]\+\)\=\>"
 
 " Delimiter
-syntax match smt2Delimiter "[()]"
+syntax match smt2Delimiter "\m\C[()]"
 
 " Error
 syntax keyword smt2Error error
diff --git a/syntax/tidy.vim b/syntax/tidy.vim
index 94f1a63a2..55ff91b46 100644
--- a/syntax/tidy.vim
+++ b/syntax/tidy.vim
@@ -3,10 +3,11 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'tidy', 'syntax/tidy.vim')
 endif
 
 " Vim syntax file
-" Language:	HMTL Tidy configuration file (/etc/tidyrc ~/.tidyrc)
+" Language:	HMTL Tidy Configuration
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2016 Apr 24
+" Last Change:	2020 Sep 4
 
+" Preamble {{{1
 if exists("b:current_syntax")
   finish
 endif
@@ -16,10 +17,15 @@ set cpo&vim
 
 syn iskeyword @,48-57,-,_
 
+" Values {{{1
+syn match tidyWordSeparator	contained ",\|\s" nextgroup=tidyWord   skipwhite skipnl
+syn match tidyMuteIDSeparator	contained ",\|\s" nextgroup=tidyMuteID skipwhite skipnl
+
 syn case ignore
 syn keyword	tidyBoolean	contained t[rue] f[alse] y[es] n[o] 1 0
 syn keyword	tidyAutoBoolean	contained t[rue] f[alse] y[es] n[o] 1 0 auto
 syn case match
+syn keyword	tidyCustomTags	contained no blocklevel empty inline pre
 syn keyword	tidyDoctype	contained html5 omit auto strict loose transitional user
 syn keyword	tidyEncoding	contained raw ascii latin0 latin1 utf8 iso2022 mac win1252 ibm858 utf16le utf16be utf16 big5 shiftjis
 syn keyword	tidyNewline	contained LF CRLF CR
@@ -28,36 +34,148 @@ syn keyword	tidyRepeat	contained keep-first keep-last
 syn keyword	tidySorter	contained alpha none
 syn region	tidyString	contained start=+"+ skip=+\\\\\|\\"+ end=+"+ oneline
 syn region	tidyString	contained start=+'+ skip=+\\\\\|\\'+ end=+'+ oneline
-syn match	tidyTags	contained "\<\w\+\(\s*,\s*\w\+\)*\>"
-
-syn keyword tidyBooleanOption add-xml-decl add-xml-pi add-xml-space
-	\ anchor-as-name ascii-chars assume-xml-procins bare break-before-br
-	\ clean coerce-endtags decorate-inferred-ul drop-empty-paras
-	\ drop-empty-elements drop-font-tags drop-proprietary-attributes
-	\ enclose-block-text enclose-text escape-cdata escape-scripts
-	\ fix-backslash fix-bad-comments fix-uri force-output gdoc gnu-emacs
-	\ hide-comments hide-endtags indent-attributes indent-cdata
-	\ indent-with-tabs input-xml join-classes join-styles keep-time
-	\ language literal-attributes logical-emphasis lower-literals markup
-	\ merge-emphasis ncr numeric-entities omit-optional-tags output-html
-	\ output-xhtml output-xml preserve-entities punctuation-wrap quiet
-	\ quote-ampersand quote-marks quote-nbsp raw replace-color show-info
-	\ show-warnings skip-nested split strict-tags-attributes tidy-mark
-	\ uppercase-attributes uppercase-tags word-2000 wrap-asp
-	\ wrap-attributes wrap-jste wrap-php wrap-script-literals
-	\ wrap-sections write-back
+" Tag and attribute lists
+syn match	tidyWord	contained "\<\k\+\>:\@!" nextgroup=tidyWordSeparator skipwhite skipnl
+
+" Mute Message IDs {{{2
+syn keyword tidyMuteID ADDED_MISSING_CHARSET ANCHOR_DUPLICATED
+	\ ANCHOR_NOT_UNIQUE APOS_UNDEFINED APPLET_MISSING_ALT AREA_MISSING_ALT
+	\ ASCII_REQUIRES_DESCRIPTION ASSOCIATE_LABELS_EXPLICITLY
+	\ ASSOCIATE_LABELS_EXPLICITLY_FOR ASSOCIATE_LABELS_EXPLICITLY_ID
+	\ ATTRIBUTE_IS_NOT_ALLOWED ATTRIBUTE_VALUE_REPLACED
+	\ ATTR_VALUE_NOT_LCASE AUDIO_MISSING_TEXT_AIFF AUDIO_MISSING_TEXT_AU
+	\ AUDIO_MISSING_TEXT_RA AUDIO_MISSING_TEXT_RM AUDIO_MISSING_TEXT_SND
+	\ AUDIO_MISSING_TEXT_WAV BACKSLASH_IN_URI BAD_ATTRIBUTE_VALUE
+	\ BAD_ATTRIBUTE_VALUE_REPLACED BAD_CDATA_CONTENT BAD_SUMMARY_HTML5
+	\ BAD_SURROGATE_LEAD BAD_SURROGATE_PAIR BAD_SURROGATE_TAIL
+	\ CANT_BE_NESTED COERCE_TO_ENDTAG COLOR_CONTRAST_ACTIVE_LINK
+	\ COLOR_CONTRAST_LINK COLOR_CONTRAST_TEXT COLOR_CONTRAST_VISITED_LINK
+	\ CONTENT_AFTER_BODY CUSTOM_TAG_DETECTED DATA_TABLE_MISSING_HEADERS
+	\ DATA_TABLE_MISSING_HEADERS_COLUMN DATA_TABLE_MISSING_HEADERS_ROW
+	\ DATA_TABLE_REQUIRE_MARKUP_COLUMN_HEADERS
+	\ DATA_TABLE_REQUIRE_MARKUP_ROW_HEADERS DISCARDING_UNEXPECTED
+	\ DOCTYPE_AFTER_TAGS DOCTYPE_MISSING DUPLICATE_FRAMESET
+	\ ELEMENT_NOT_EMPTY ELEMENT_VERS_MISMATCH_ERROR
+	\ ELEMENT_VERS_MISMATCH_WARN ENCODING_MISMATCH
+	\ ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_APPLET
+	\ ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_EMBED
+	\ ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_OBJECT
+	\ ENSURE_PROGRAMMATIC_OBJECTS_ACCESSIBLE_SCRIPT ESCAPED_ILLEGAL_URI
+	\ FILE_CANT_OPEN FILE_CANT_OPEN_CFG FILE_NOT_FILE FIXED_BACKSLASH
+	\ FOUND_STYLE_IN_BODY FRAME_MISSING_LONGDESC FRAME_MISSING_NOFRAMES
+	\ FRAME_MISSING_TITLE FRAME_SRC_INVALID FRAME_TITLE_INVALID_NULL
+	\ FRAME_TITLE_INVALID_SPACES HEADERS_IMPROPERLY_NESTED
+	\ HEADER_USED_FORMAT_TEXT ID_NAME_MISMATCH ILLEGAL_NESTING
+	\ ILLEGAL_URI_CODEPOINT ILLEGAL_URI_REFERENCE
+	\ IMAGE_MAP_SERVER_SIDE_REQUIRES_CONVERSION
+	\ IMG_ALT_SUSPICIOUS_FILENAME IMG_ALT_SUSPICIOUS_FILE_SIZE
+	\ IMG_ALT_SUSPICIOUS_PLACEHOLDER IMG_ALT_SUSPICIOUS_TOO_LONG
+	\ IMG_BUTTON_MISSING_ALT IMG_MAP_CLIENT_MISSING_TEXT_LINKS
+	\ IMG_MAP_SERVER_REQUIRES_TEXT_LINKS IMG_MISSING_ALT IMG_MISSING_DLINK
+	\ IMG_MISSING_LONGDESC IMG_MISSING_LONGDESC_DLINK
+	\ INFORMATION_NOT_CONVEYED_APPLET INFORMATION_NOT_CONVEYED_IMAGE
+	\ INFORMATION_NOT_CONVEYED_INPUT INFORMATION_NOT_CONVEYED_OBJECT
+	\ INFORMATION_NOT_CONVEYED_SCRIPT INSERTING_AUTO_ATTRIBUTE
+	\ INSERTING_TAG INVALID_ATTRIBUTE INVALID_NCR INVALID_SGML_CHARS
+	\ INVALID_UTF16 INVALID_UTF8 INVALID_XML_ID JOINING_ATTRIBUTE
+	\ LANGUAGE_INVALID LANGUAGE_NOT_IDENTIFIED
+	\ LAYOUT_TABLES_LINEARIZE_PROPERLY LAYOUT_TABLE_INVALID_MARKUP
+	\ LINK_TEXT_MISSING LINK_TEXT_NOT_MEANINGFUL
+	\ LINK_TEXT_NOT_MEANINGFUL_CLICK_HERE LINK_TEXT_TOO_LONG
+	\ LIST_USAGE_INVALID_LI LIST_USAGE_INVALID_OL LIST_USAGE_INVALID_UL
+	\ MALFORMED_COMMENT MALFORMED_COMMENT_DROPPING MALFORMED_COMMENT_EOS
+	\ MALFORMED_COMMENT_WARN MALFORMED_DOCTYPE METADATA_MISSING
+	\ METADATA_MISSING_REDIRECT_AUTOREFRESH MISMATCHED_ATTRIBUTE_ERROR
+	\ MISMATCHED_ATTRIBUTE_WARN MISSING_ATTRIBUTE MISSING_ATTR_VALUE
+	\ MISSING_DOCTYPE MISSING_ENDTAG_BEFORE MISSING_ENDTAG_FOR
+	\ MISSING_ENDTAG_OPTIONAL MISSING_IMAGEMAP MISSING_QUOTEMARK
+	\ MISSING_QUOTEMARK_OPEN MISSING_SEMICOLON MISSING_SEMICOLON_NCR
+	\ MISSING_STARTTAG MISSING_TITLE_ELEMENT MOVED_STYLE_TO_HEAD
+	\ MULTIMEDIA_REQUIRES_TEXT NESTED_EMPHASIS NESTED_QUOTATION
+	\ NEWLINE_IN_URI NEW_WINDOWS_REQUIRE_WARNING_BLANK
+	\ NEW_WINDOWS_REQUIRE_WARNING_NEW NOFRAMES_CONTENT
+	\ NOFRAMES_INVALID_CONTENT NOFRAMES_INVALID_LINK
+	\ NOFRAMES_INVALID_NO_VALUE NON_MATCHING_ENDTAG OBJECT_MISSING_ALT
+	\ OBSOLETE_ELEMENT OPTION_REMOVED OPTION_REMOVED_APPLIED
+	\ OPTION_REMOVED_UNAPPLIED POTENTIAL_HEADER_BOLD
+	\ POTENTIAL_HEADER_ITALICS POTENTIAL_HEADER_UNDERLINE
+	\ PREVIOUS_LOCATION PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_APPLET
+	\ PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_EMBED
+	\ PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_OBJECT
+	\ PROGRAMMATIC_OBJECTS_REQUIRE_TESTING_SCRIPT PROPRIETARY_ATTRIBUTE
+	\ PROPRIETARY_ATTR_VALUE PROPRIETARY_ELEMENT REMOVED_HTML5
+	\ REMOVE_AUTO_REDIRECT REMOVE_AUTO_REFRESH REMOVE_BLINK_MARQUEE
+	\ REMOVE_FLICKER_ANIMATED_GIF REMOVE_FLICKER_APPLET
+	\ REMOVE_FLICKER_EMBED REMOVE_FLICKER_OBJECT REMOVE_FLICKER_SCRIPT
+	\ REPEATED_ATTRIBUTE REPLACE_DEPRECATED_HTML_APPLET
+	\ REPLACE_DEPRECATED_HTML_BASEFONT REPLACE_DEPRECATED_HTML_CENTER
+	\ REPLACE_DEPRECATED_HTML_DIR REPLACE_DEPRECATED_HTML_FONT
+	\ REPLACE_DEPRECATED_HTML_ISINDEX REPLACE_DEPRECATED_HTML_MENU
+	\ REPLACE_DEPRECATED_HTML_S REPLACE_DEPRECATED_HTML_STRIKE
+	\ REPLACE_DEPRECATED_HTML_U REPLACING_ELEMENT REPLACING_UNEX_ELEMENT
+	\ SCRIPT_MISSING_NOSCRIPT SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_CLICK
+	\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_DOWN
+	\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_MOVE
+	\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OUT
+	\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_OVER
+	\ SCRIPT_NOT_KEYBOARD_ACCESSIBLE_ON_MOUSE_UP SKIPOVER_ASCII_ART
+	\ SPACE_PRECEDING_XMLDECL STRING_ARGUMENT_BAD STRING_CONTENT_LOOKS
+	\ STRING_DOCTYPE_GIVEN STRING_MISSING_MALFORMED STRING_MUTING_TYPE
+	\ STRING_NO_SYSID STRING_UNKNOWN_OPTION
+	\ STYLESHEETS_REQUIRE_TESTING_LINK
+	\ STYLESHEETS_REQUIRE_TESTING_STYLE_ATTR
+	\ STYLESHEETS_REQUIRE_TESTING_STYLE_ELEMENT
+	\ STYLE_SHEET_CONTROL_PRESENTATION SUSPECTED_MISSING_QUOTE
+	\ TABLE_MAY_REQUIRE_HEADER_ABBR TABLE_MAY_REQUIRE_HEADER_ABBR_NULL
+	\ TABLE_MAY_REQUIRE_HEADER_ABBR_SPACES TABLE_MISSING_CAPTION
+	\ TABLE_MISSING_SUMMARY TABLE_SUMMARY_INVALID_NULL
+	\ TABLE_SUMMARY_INVALID_PLACEHOLDER TABLE_SUMMARY_INVALID_SPACES
+	\ TAG_NOT_ALLOWED_IN TEXT_EQUIVALENTS_REQUIRE_UPDATING_APPLET
+	\ TEXT_EQUIVALENTS_REQUIRE_UPDATING_OBJECT
+	\ TEXT_EQUIVALENTS_REQUIRE_UPDATING_SCRIPT TOO_MANY_ELEMENTS
+	\ TOO_MANY_ELEMENTS_IN TRIM_EMPTY_ELEMENT UNESCAPED_AMPERSAND
+	\ UNEXPECTED_ENDTAG UNEXPECTED_ENDTAG_ERR UNEXPECTED_ENDTAG_IN
+	\ UNEXPECTED_END_OF_FILE UNEXPECTED_END_OF_FILE_ATTR
+	\ UNEXPECTED_EQUALSIGN UNEXPECTED_GT UNEXPECTED_QUOTEMARK
+	\ UNKNOWN_ELEMENT UNKNOWN_ELEMENT_LOOKS_CUSTOM UNKNOWN_ENTITY
+	\ USING_BR_INPLACE_OF VENDOR_SPECIFIC_CHARS WHITE_IN_URI
+	\ XML_DECLARATION_DETECTED XML_ID_SYNTAX
+	\ contained nextgroup=tidyMuteIDSeparator skipwhite skipnl
+
+" Options {{{1
+syn keyword tidyCustomTagsOption custom-tags contained nextgroup=tidyCustomTagsDelimiter
+syn match tidyCustomTagsDelimiter ":" nextgroup=tidyCustomTags contained skipwhite
+
+syn keyword tidyBooleanOption add-meta-charset add-xml-decl
+	\ add-xml-pi add-xml-space anchor-as-name ascii-chars
+	\ assume-xml-procins bare break-before-br clean coerce-endtags
+	\ decorate-inferred-ul drop-empty-paras drop-empty-elements
+	\ drop-font-tags drop-proprietary-attributes enclose-block-text
+	\ enclose-text escape-cdata escape-scripts fix-backslash
+	\ fix-style-tags fix-uri force-output gdoc gnu-emacs hide-comments
+	\ hide-endtags indent-attributes indent-cdata indent-with-tabs
+	\ input-xml join-classes join-styles keep-tabs keep-time language
+	\ literal-attributes logical-emphasis lower-literals markup
+	\ merge-emphasis mute-id ncr numeric-entities omit-optional-tags
+	\ output-html output-xhtml output-xml preserve-entities
+	\ punctuation-wrap quiet quote-ampersand quote-marks quote-nbsp raw
+	\ replace-color show-filename show-info show-meta-change show-warnings
+	\ skip-nested split strict-tags-attributes tidy-mark
+	\ uppercase-attributes uppercase-tags warn-proprietary-attributes
+	\ word-2000 wrap-asp wrap-attributes wrap-jste wrap-php
+	\ wrap-script-literals wrap-sections write-back
 	\ contained nextgroup=tidyBooleanDelimiter
 
 syn match tidyBooleanDelimiter ":" nextgroup=tidyBoolean contained skipwhite
 
-syn keyword tidyAutoBooleanOption indent merge-divs merge-spans output-bom show-body-only vertical-space contained nextgroup=tidyAutoBooleanDelimiter
+syn keyword tidyAutoBooleanOption fix-bad-comments indent merge-divs merge-spans output-bom show-body-only vertical-space contained nextgroup=tidyAutoBooleanDelimiter
 syn match tidyAutoBooleanDelimiter ":" nextgroup=tidyAutoBoolean contained skipwhite
 
 syn keyword tidyCSSSelectorOption css-prefix contained nextgroup=tidyCSSSelectorDelimiter
 syn match tidyCSSSelectorDelimiter ":" nextgroup=tidyCSSSelector contained skipwhite
 
 syn keyword tidyDoctypeOption doctype contained nextgroup=tidyDoctypeDelimiter
-syn match tidyDoctypeDelimiter ":" nextgroup=tidyDoctype contained skipwhite
+syn match tidyDoctypeDelimiter ":" nextgroup=tidyDoctype,tidyString contained skipwhite
 
 syn keyword tidyEncodingOption char-encoding input-encoding output-encoding contained nextgroup=tidyEncodingDelimiter
 syn match tidyEncodingDelimiter ":" nextgroup=tidyEncoding contained skipwhite
@@ -71,8 +189,11 @@ syn match tidyNameDelimiter ":" nextgroup=tidyName contained skipwhite
 syn keyword tidyNewlineOption newline contained nextgroup=tidyNewlineDelimiter
 syn match tidyNewlineDelimiter ":" nextgroup=tidyNewline contained skipwhite
 
+syn keyword tidyAttributesOption priority-attributes contained nextgroup=tidyAttributesDelimiter
+syn match tidyAttributesDelimiter ":" nextgroup=tidyWord contained skipwhite
+
 syn keyword tidyTagsOption new-blocklevel-tags new-empty-tags new-inline-tags new-pre-tags contained nextgroup=tidyTagsDelimiter
-syn match tidyTagsDelimiter ":" nextgroup=tidyTags contained skipwhite
+syn match tidyTagsDelimiter ":" nextgroup=tidyWord contained skipwhite
 
 syn keyword tidyRepeatOption repeated-attributes contained nextgroup=tidyRepeatDelimiter
 syn match tidyRepeatDelimiter ":" nextgroup=tidyRepeat contained skipwhite
@@ -83,57 +204,77 @@ syn match tidySorterDelimiter ":" nextgroup=tidySorter contained skipwhite
 syn keyword tidyStringOption alt-text error-file gnu-emacs-file output-file contained nextgroup=tidyStringDelimiter
 syn match tidyStringDelimiter ":" nextgroup=tidyString contained skipwhite
 
+syn keyword tidyMuteOption mute contained nextgroup=tidyMuteDelimiter
+syn match tidyMuteDelimiter ":" nextgroup=tidyMuteID contained skipwhite
+
 syn cluster tidyOptions contains=tidy.*Option
 
+" Option line anchor {{{1
 syn match tidyStart "^" nextgroup=@tidyOptions
+" Long standing bug - option lines (except the first) with leading whitespace
+" are silently ignored.
+syn match tidyErrorStart '^\s\+\ze\S'
 
+" Comments {{{1
 syn match	tidyComment	"^\s*//.*$" contains=tidyTodo
 syn match	tidyComment	"^\s*#.*$"  contains=tidyTodo
 syn keyword	tidyTodo	TODO NOTE FIXME XXX contained
 
+" Default highlighting {{{1
+hi def link tidyAttributesOption	Identifier
 hi def link tidyAutoBooleanOption	Identifier
 hi def link tidyBooleanOption		Identifier
 hi def link tidyCSSSelectorOption	Identifier
+hi def link tidyCustomTagsOption	Identifier
 hi def link tidyDoctypeOption		Identifier
 hi def link tidyEncodingOption		Identifier
 hi def link tidyIntegerOption		Identifier
+hi def link tidyMuteOption		Identifier
 hi def link tidyNameOption		Identifier
 hi def link tidyNewlineOption		Identifier
-hi def link tidyTagsOption		Identifier
 hi def link tidyRepeatOption		Identifier
 hi def link tidySorterOption		Identifier
 hi def link tidyStringOption		Identifier
+hi def link tidyTagsOption		Identifier
 
+hi def link tidyAttributesDelimiter	Special
 hi def link tidyAutoBooleanDelimiter	Special
 hi def link tidyBooleanDelimiter	Special
 hi def link tidyCSSSelectorDelimiter	Special
+hi def link tidyCustomTagsDelimiter	Special
 hi def link tidyDoctypeDelimiter	Special
 hi def link tidyEncodingDelimiter	Special
 hi def link tidyIntegerDelimiter	Special
+hi def link tidyMuteDelimiter		Special
 hi def link tidyNameDelimiter		Special
 hi def link tidyNewlineDelimiter	Special
-hi def link tidyTagsDelimiter		Special
 hi def link tidyRepeatDelimiter		Special
 hi def link tidySorterDelimiter		Special
 hi def link tidyStringDelimiter		Special
+hi def link tidyTagsDelimiter		Special
 
 hi def link tidyAutoBoolean		Boolean
 hi def link tidyBoolean			Boolean
+hi def link tidyCustomTags		Constant
 hi def link tidyDoctype			Constant
 hi def link tidyEncoding		Constant
+hi def link tidyMuteID			Constant
 hi def link tidyNewline			Constant
-hi def link tidyTags			Constant
 hi def link tidyNumber			Number
 hi def link tidyRepeat			Constant
 hi def link tidySorter			Constant
 hi def link tidyString			String
+hi def link tidyWord			Constant
 
 hi def link tidyComment			Comment
 hi def link tidyTodo			Todo
 
+hi def link tidyErrorStart		Error
+
+" Postscript {{{1
 let b:current_syntax = "tidy"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8
+" vim: ts=8 fdm=marker
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 9b4854eda..998d750a2 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -10,99 +10,283 @@ endif
 if exists("b:current_syntax")
   finish
 endif
-let b:current_syntax = "zig"
 
-syn keyword zigStorage const var extern packed export pub noalias inline noinline comptime callconv volatile allowzero align linksection threadlocal anytype
-syn keyword zigStructure struct enum union error opaque
-syn keyword zigStatement break return continue asm defer errdefer unreachable try catch async nosuspend await suspend resume
-syn keyword zigConditional if else switch and or orelse
-syn keyword zigRepeat while for
-
-syn keyword zigConstant null undefined
-syn keyword zigKeyword fn usingnamespace test
-syn keyword zigType bool f16 f32 f64 f128 void noreturn type anyerror anyframe
-syn keyword zigType i0 u0 isize  usize comptime_int comptime_float
-syn keyword zigType c_short c_ushort c_int c_uint c_long c_ulong c_longlong c_ulonglong c_longdouble c_void
-
-syn keyword zigBoolean true false
-
-syn match zigType "\v<[iu][1-9]\d*>"
-
-syn match zigOperator display "\V\[-+/*=^&?|!><%~]"
-syn match zigArrowCharacter display "\V->"
-
-syn match zigBuiltinFn "\v\@(addWithOverflow|as|atomicLoad|atomicStore|bitCast|breakpoint)>"
-syn match zigBuiltinFn "\v\@(alignCast|alignOf|cDefine|cImport|cInclude)>"
-syn match zigBuiltinFn "\v\@(cUndef|canImplicitCast|clz|cmpxchgWeak|cmpxchgStrong|compileError)>"
-syn match zigBuiltinFn "\v\@(compileLog|ctz|popCount|divExact|divFloor|divTrunc)>"
-syn match zigBuiltinFn "\v\@(embedFile|export|tagName|TagType|errorName|call)>"
-syn match zigBuiltinFn "\v\@(errorReturnTrace|fence|fieldParentPtr|field|unionInit)>"
-syn match zigBuiltinFn "\v\@(frameAddress|import|newStackCall|asyncCall|intToPtr)>"
-syn match zigBuiltinFn "\v\@(memcpy|memset|mod|mulWithOverflow|splat|src)>"
-syn match zigBuiltinFn "\v\@(bitOffsetOf|byteOffsetOf|OpaqueType|panic|ptrCast)>"
-syn match zigBuiltinFn "\v\@(ptrToInt|rem|returnAddress|setCold|Type|shuffle|reduce)>"
-syn match zigBuiltinFn "\v\@(setRuntimeSafety|setEvalBranchQuota|setFloatMode)>"
-syn match zigBuiltinFn "\v\@(setGlobalLinkage|setGlobalSection|shlExact|This|hasDecl|hasField)>"
-syn match zigBuiltinFn "\v\@(shlWithOverflow|shrExact|sizeOf|bitSizeOf|sqrt|byteSwap|subWithOverflow|intCast|floatCast|intToFloat|floatToInt|boolToInt|errSetCast)>"
-syn match zigBuiltinFn "\v\@(truncate|typeInfo|typeName|TypeOf|atomicRmw|bytesToSlice|sliceToBytes)>"
-syn match zigBuiltinFn "\v\@(intToError|errorToInt|intToEnum|enumToInt|setAlignStack|frame|Frame|frameSize|bitReverse|Vector)>"
-syn match zigBuiltinFn "\v\@(sin|cos|exp|exp2|log|log2|log10|fabs|floor|ceil|trunc|round)>"
+let s:cpo_save = &cpo
+set cpo&vim
+
+let s:zig_syntax_keywords = {
+    \   'zigBoolean': ["true"
+    \ ,                "false"]
+    \ , 'zigNull': ["null"]
+    \ , 'zigType': ["bool"
+    \ ,             "f16"
+    \ ,             "f32"
+    \ ,             "f64"
+    \ ,             "f128"
+    \ ,             "void"
+    \ ,             "type"
+    \ ,             "anytype"
+    \ ,             "anyerror"
+    \ ,             "anyframe"
+    \ ,             "volatile"
+    \ ,             "linksection"
+    \ ,             "noreturn"
+    \ ,             "allowzero"
+    \ ,             "i0"
+    \ ,             "u0"
+    \ ,             "isize"
+    \ ,             "usize"
+    \ ,             "comptime_int"
+    \ ,             "comptime_float"
+    \ ,             "c_short"
+    \ ,             "c_ushort"
+    \ ,             "c_int"
+    \ ,             "c_uint"
+    \ ,             "c_long"
+    \ ,             "c_ulong"
+    \ ,             "c_longlong"
+    \ ,             "c_ulonglong"
+    \ ,             "c_longdouble"
+    \ ,             "c_void"]
+    \ , 'zigConstant': ["undefined"
+    \ ,                 "unreachable"]
+    \ , 'zigConditional': ["if"
+    \ ,                    "else"
+    \ ,                    "switch"]
+    \ , 'zigRepeat': ["while"
+    \ ,               "for"]
+    \ , 'zigComparatorWord': ["and"
+    \ ,                       "or"
+    \ ,                       "orelse"]
+    \ , 'zigStructure': ["struct"
+    \ ,                  "enum"
+    \ ,                  "union"
+    \ ,                  "error"
+    \ ,                  "packed"
+    \ ,                  "opaque"]
+    \ , 'zigException': ["error"]
+    \ , 'zigVarDecl': ["var"
+    \ ,                "const"
+    \ ,                "comptime"
+    \ ,                "threadlocal"]
+    \ , 'zigDummyVariable': ["_"]
+    \ , 'zigKeyword': ["fn"
+    \ ,                "try"
+    \ ,                "test"
+    \ ,                "pub"
+    \ ,                "usingnamespace"]
+    \ , 'zigExecution': ["return"
+    \ ,                  "break"
+    \ ,                  "continue"]
+    \ , 'zigMacro': ["defer"
+    \ ,              "errdefer"
+    \ ,              "async"
+    \ ,              "nosuspend"
+    \ ,              "await"
+    \ ,              "suspend"
+    \ ,              "resume"
+    \ ,              "export"
+    \ ,              "extern"]
+    \ , 'zigPreProc': ["catch"
+    \ ,                "inline"
+    \ ,                "noinline"
+    \ ,                "asm"
+    \ ,                "callconv"
+    \ ,                "noalias"]
+    \ , 'zigBuiltinFn': ["align"
+    \ ,                  "@add"
+    \ ,                  "@WithOverflow"
+    \ ,                  "@as"
+    \ ,                  "@atomicLoad"
+    \ ,                  "@atomicStore"
+    \ ,                  "@bitCast"
+    \ ,                  "@breakpoint"
+    \ ,                  "@alignCast"
+    \ ,                  "@alignOf"
+    \ ,                  "@cDefine"
+    \ ,                  "@cImport"
+    \ ,                  "@cInclude"
+    \ ,                  "@cUndef"
+    \ ,                  "@canImplicitCast"
+    \ ,                  "@clz"
+    \ ,                  "@cmpxchgWeak"
+    \ ,                  "@cmpxchgStrong"
+    \ ,                  "@compileError"
+    \ ,                  "@compileLog"
+    \ ,                  "@ctz"
+    \ ,                  "@popCount"
+    \ ,                  "@divExact"
+    \ ,                  "@divFloor"
+    \ ,                  "@divTrunc"
+    \ ,                  "@embedFile"
+    \ ,                  "@export"
+    \ ,                  "@tagName"
+    \ ,                  "@TagType"
+    \ ,                  "@errorName"
+    \ ,                  "@call"
+    \ ,                  "@errorReturnTrace"
+    \ ,                  "@fence"
+    \ ,                  "@fieldParentPtr"
+    \ ,                  "@field"
+    \ ,                  "@unionInit"
+    \ ,                  "@frameAddress"
+    \ ,                  "@import"
+    \ ,                  "@newStackCall"
+    \ ,                  "@asyncCall"
+    \ ,                  "@intToPtr"
+    \ ,                  "@memcpy"
+    \ ,                  "@memset"
+    \ ,                  "@mod"
+    \ ,                  "@mulWithOverflow"
+    \ ,                  "@splat"
+    \ ,                  "@src"
+    \ ,                  "@bitOffsetOf"
+    \ ,                  "@byteOffsetOf"
+    \ ,                  "@OpaqueType"
+    \ ,                  "@panic"
+    \ ,                  "@ptrCast"
+    \ ,                  "@ptrToInt"
+    \ ,                  "@rem"
+    \ ,                  "@returnAddress"
+    \ ,                  "@setCold"
+    \ ,                  "@Type"
+    \ ,                  "@shuffle"
+    \ ,                  "@reduce"
+    \ ,                  "@setRuntimeSafety"
+    \ ,                  "@setEvalBranchQuota"
+    \ ,                  "@setFloatMode"
+    \ ,                  "@setGlobalLinkage"
+    \ ,                  "@setGlobalSection"
+    \ ,                  "@shlExact"
+    \ ,                  "@This"
+    \ ,                  "@hasDecl"
+    \ ,                  "@hasField"
+    \ ,                  "@shlWithOverflow"
+    \ ,                  "@shrExact"
+    \ ,                  "@sizeOf"
+    \ ,                  "@bitSizeOf"
+    \ ,                  "@sqrt"
+    \ ,                  "@byteSwap"
+    \ ,                  "@subWithOverflow"
+    \ ,                  "@intCast"
+    \ ,                  "@floatCast"
+    \ ,                  "@intToFloat"
+    \ ,                  "@floatToInt"
+    \ ,                  "@boolToInt"
+    \ ,                  "@errSetCast"
+    \ ,                  "@truncate"
+    \ ,                  "@typeInfo"
+    \ ,                  "@typeName"
+    \ ,                  "@TypeOf"
+    \ ,                  "@atomicRmw"
+    \ ,                  "@bytesToSlice"
+    \ ,                  "@sliceToBytes"
+    \ ,                  "@intToError"
+    \ ,                  "@errorToInt"
+    \ ,                  "@intToEnum"
+    \ ,                  "@enumToInt"
+    \ ,                  "@setAlignStack"
+    \ ,                  "@frame"
+    \ ,                  "@Frame"
+    \ ,                  "@frameSize"
+    \ ,                  "@bitReverse"
+    \ ,                  "@Vector"
+    \ ,                  "@sin"
+    \ ,                  "@cos"
+    \ ,                  "@exp"
+    \ ,                  "@exp2"
+    \ ,                  "@log"
+    \ ,                  "@log2"
+    \ ,                  "@log10"
+    \ ,                  "@fabs"
+    \ ,                  "@floor"
+    \ ,                  "@ceil"
+    \ ,                  "@trunc"
+    \ ,                  "@round"]
+    \ }
+
+function! s:syntax_keyword(dict)
+  for key in keys(a:dict)
+    execute 'syntax keyword' key join(a:dict[key], ' ')
+  endfor
+endfunction
+
+call s:syntax_keyword(s:zig_syntax_keywords)
+
+syntax match zigType "\v<[iu][1-9]\d*>"
+syntax match zigOperator display "\V\[-+/*=^&?|!><%~]"
+syntax match zigArrowCharacter display "\V->"
 
 "                                     12_34  (. but not ..)? (12_34)?     (exponent  12_34)?
-syn match zigDecNumber display   "\v<\d%(_?\d)*%(\.\.@!)?%(\d%(_?\d)*)?%([eE][+-]?\d%(_?\d)*)?"
-syn match zigHexNumber display "\v<0x\x%(_?\x)*%(\.\.@!)?%(\x%(_?\x)*)?%([pP][+-]?\d%(_?\d)*)?"
-syn match zigOctNumber display "\v<0o\o%(_?\o)*"
-syn match zigBinNumber display "\v<0b[01]%(_?[01])*"
-
-syn match zigCharacterInvalid display contained /b\?'\zs[\n\r\t']\ze'/
-syn match zigCharacterInvalidUnicode display contained /b'\zs[^[:cntrl:][:graph:][:alnum:][:space:]]\ze'/
-syn match zigCharacter /b'\([^\\]\|\\\(.\|x\x\{2}\)\)'/ contains=zigEscape,zigEscapeError,zigCharacterInvalid,zigCharacterInvalidUnicode
-syn match zigCharacter /'\([^\\]\|\\\(.\|x\x\{2}\|u\x\{4}\|U\x\{6}\)\)'/ contains=zigEscape,zigEscapeUnicode,zigEscapeError,zigCharacterInvalid
-
-syn region zigBlock start="{" end="}" transparent fold
-
-syn region zigCommentLine start="//" end="$" contains=zigTodo,@Spell
-syn region zigCommentLineDoc start="//[/!]/\@!" end="$" contains=zigTodo,@Spell
-
-" TODO: match only the first '\\' within the zigMultilineString as zigMultilineStringPrefix
-syn match zigMultilineStringPrefix display contained /c\?\\\\/
-syn region zigMultilineString start="c\?\\\\" end="$" contains=zigMultilineStringPrefix
-
-syn keyword zigTodo contained TODO
-
-syn match     zigEscapeError   display contained /\\./
-syn match     zigEscape        display contained /\\\([nrt\\'"]\|x\x\{2}\)/
-syn match     zigEscapeUnicode display contained /\\\(u\x\{4}\|U\x\{6}\)/
-syn region    zigString      start=+c\?"+ skip=+\\\\\|\\"+ end=+"+ oneline contains=zigEscape,zigEscapeUnicode,zigEscapeError,@Spell
-
-hi def link zigDecNumber zigNumber
-hi def link zigHexNumber zigNumber
-hi def link zigOctNumber zigNumber
-hi def link zigBinNumber zigNumber
-
-hi def link zigBuiltinFn Function
-hi def link zigKeyword Keyword
-hi def link zigType Type
-hi def link zigCommentLine Comment
-hi def link zigCommentLineDoc SpecialComment
-hi def link zigTodo Todo
-hi def link zigString String
-hi def link zigMultilineString String
-hi def link zigMultilineStringContent String
-hi def link zigMultilineStringPrefix Comment
-hi def link zigCharacterInvalid Error
-hi def link zigCharacterInvalidUnicode zigCharacterInvalid
-hi def link zigCharacter Character
-hi def link zigEscape Special
-hi def link zigEscapeUnicode zigEscape
-hi def link zigEscapeError Error
-hi def link zigBoolean Boolean
-hi def link zigConstant Constant
-hi def link zigNumber Number
-hi def link zigArrowCharacter zigOperator
-hi def link zigOperator Operator
-hi def link zigStorage StorageClass
-hi def link zigStructure Structure
-hi def link zigStatement Statement
-hi def link zigConditional Conditional
-hi def link zigRepeat Repeat
+syntax match zigDecNumber display   "\v<\d%(_?\d)*%(\.\.@!)?%(\d%(_?\d)*)?%([eE][+-]?\d%(_?\d)*)?"
+syntax match zigHexNumber display "\v<0x\x%(_?\x)*%(\.\.@!)?%(\x%(_?\x)*)?%([pP][+-]?\d%(_?\d)*)?"
+syntax match zigOctNumber display "\v<0o\o%(_?\o)*"
+syntax match zigBinNumber display "\v<0b[01]%(_?[01])*"
+
+syntax match zigCharacterInvalid display contained /b\?'\zs[\n\r\t']\ze'/
+syntax match zigCharacterInvalidUnicode display contained /b'\zs[^[:cntrl:][:graph:][:alnum:][:space:]]\ze'/
+syntax match zigCharacter /b'\([^\\]\|\\\(.\|x\x\{2}\)\)'/ contains=zigEscape,zigEscapeError,zigCharacterInvalid,zigCharacterInvalidUnicode
+syntax match zigCharacter /'\([^\\]\|\\\(.\|x\x\{2}\|u\x\{4}\|U\x\{6}\)\)'/ contains=zigEscape,zigEscapeUnicode,zigEscapeError,zigCharacterInvalid
+
+syntax region zigBlock start="{" end="}" transparent fold
+
+syntax region zigCommentLine start="//" end="$" contains=zigTodo,@Spell
+syntax region zigCommentLineDoc start="//[/!]/\@!" end="$" contains=zigTodo,@Spell
+
+syntax match zigMultilineStringPrefix /c\?\\\\/ contained containedin=zigMultilineString
+syntax region zigMultilineString matchgroup=zigMultilineStringDelimiter start="c\?\\\\" end="$" contains=zigMultilineStringPrefix display
+
+syntax keyword zigTodo contained TODO
+
+syntax region zigString matchgroup=zigStringDelimiter start=+c\?"+ skip=+\\\\\|\\"+ end=+"+ oneline contains=zigEscape,zigEscapeUnicode,zigEscapeError,@Spell
+syntax match zigEscapeError   display contained /\\./
+syntax match zigEscape        display contained /\\\([nrt\\'"]\|x\x\{2}\)/
+syntax match zigEscapeUnicode display contained /\\\(u\x\{4}\|U\x\{6}\)/
+
+highlight default link zigDecNumber zigNumber
+highlight default link zigHexNumber zigNumber
+highlight default link zigOctNumber zigNumber
+highlight default link zigBinNumber zigNumber
+
+highlight default link zigBuiltinFn Statement
+highlight default link zigKeyword Keyword
+highlight default link zigType Type
+highlight default link zigCommentLine Comment
+highlight default link zigCommentLineDoc Comment
+highlight default link zigDummyVariable Comment
+highlight default link zigTodo Todo
+highlight default link zigString String
+highlight default link zigStringDelimiter Delimiter
+highlight default link zigMultilineString String
+highlight default link zigMultilineStringContent String
+highlight default link zigMultilineStringPrefix String
+highlight default link zigMultilineStringDelimiter Ignore
+highlight default link zigCharacterInvalid Error
+highlight default link zigCharacterInvalidUnicode zigCharacterInvalid
+highlight default link zigCharacter Character
+highlight default link zigEscape Special
+highlight default link zigEscapeUnicode zigEscape
+highlight default link zigEscapeError Error
+highlight default link zigBoolean Boolean
+highlight default link zigNull Boolean
+highlight default link zigConstant Constant
+highlight default link zigNumber Number
+highlight default link zigArrowCharacter zigOperator
+highlight default link zigOperator Operator
+highlight default link zigStructure Structure
+highlight default link zigExecution Special
+highlight default link zigMacro Macro
+highlight default link zigConditional Conditional
+highlight default link zigComparatorWord Operator
+highlight default link zigRepeat Repeat
+highlight default link zigSpecial Special
+highlight default link zigVarDecl Function
+highlight default link zigPreProc PreProc
+highlight default link zigException Exception
+
+delfunction s:syntax_keyword
+
+let b:current_syntax = "zig"
+
+let &cpo = s:cpo_save
+unlet! s:cpo_save

From eda351ca897ca0270ed8b01798af3679914683a1 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 10 Mar 2021 17:22:05 +0100
Subject: [PATCH 234/299] Update

---
 after/ftplugin/llvm.vim     |  14 +++--
 autoload/LaTeXtoUnicode.vim | 108 ++++++++++++++++++++-----------
 autoload/julia/doc.vim      |   2 +-
 autoload/ledger.vim         |  75 ++++++++++++++++++++--
 autoload/zig/fmt.vim        |   6 +-
 compiler/ledger.vim         |   4 +-
 ftplugin/dune.vim           |   2 +-
 ftplugin/julia.vim          |   2 +-
 ftplugin/kotlin.vim         |   2 +-
 ftplugin/mlir.vim           |  16 +++++
 ftplugin/sexplib.vim        |   2 +-
 indent/julia.vim            |  22 +++----
 indent/mlir.vim             |  79 +++++++++++++++++++++++
 indent/svelte.vim           |  25 ++++++--
 syntax/gomod.vim            |  18 +++++-
 syntax/javascript.vim       |   2 +-
 syntax/julia.vim            |  79 +++++++++++++++--------
 syntax/kotlin.vim           |   4 +-
 syntax/llvm.vim             |   3 +-
 syntax/mlir.vim             | 122 ++++++++++++++++++++++++++++++++++++
 syntax/svelte.vim           |   4 +-
 21 files changed, 490 insertions(+), 101 deletions(-)
 create mode 100644 ftplugin/mlir.vim
 create mode 100644 indent/mlir.vim
 create mode 100644 syntax/mlir.vim

diff --git a/after/ftplugin/llvm.vim b/after/ftplugin/llvm.vim
index bb1ee63ec..79fbac357 100644
--- a/after/ftplugin/llvm.vim
+++ b/after/ftplugin/llvm.vim
@@ -329,7 +329,7 @@ function! s:extract_identifier(word) abort
             return ''
         endif
 
-        if a:word[1] == '"'
+        if a:word[1] ==# '"'
             let idx = stridx(a:word, '"', 2)
             if idx == -1
                 return ''
@@ -343,7 +343,7 @@ function! s:extract_identifier(word) abort
     endif
 
     if prefix ==# '#'
-        return matchstr(a:word, '^#\d\+')
+        return matchstr(a:word, '^#\d\+\>')
     endif
 
     return ''
@@ -478,8 +478,14 @@ function! s:run_lli(...) abort
     let tmpfile = tempname()
     call writefile(getline(1, '$'), tmpfile)
     let Cleanup = {ch -> filereadable(tmpfile) ? delete(tmpfile) : 0}
-    let bufnr = term_start([g:llvm_ext_lli_executable, tmpfile], {'close_cb': Cleanup, 'exit_cb': Cleanup})
-    echo 'Run lli in termnal buffer(' . bufnr . ')'
+    try
+        let bufnr = term_start([g:llvm_ext_lli_executable, tmpfile], {'close_cb': Cleanup, 'exit_cb': Cleanup})
+        echo 'Run lli in termnal buffer(' . bufnr . ')'
+    catch
+        if filereadable(tmpfile)
+            delete(tmpfile)
+        endif
+    endtry
 endfunction
 
 if !exists(':LLI')
diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index 798273183..fed230320 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -42,10 +42,6 @@ function! s:L2U_Setup()
   let b:l2u_found_completion = 0
   " Is the cursor just after a single backslash
   let b:l2u_singlebslash = 0
-  " Backup value of the completeopt settings
-  " (since we temporarily add the 'longest' setting while
-  "  attempting LaTeX-to-Unicode)
-  let b:l2u_backup_commpleteopt = &completeopt
   " Are we in the middle of a L2U tab completion?
   let b:l2u_tab_completing = 0
   " Are we calling the tab fallback?
@@ -68,7 +64,7 @@ function! s:L2U_SetupGlobal()
   call s:L2U_deprecated_options()
 
   if v:version < 704
-      let g:latex_to_unicode_tab = 0
+      let g:latex_to_unicode_tab = "off"
       let g:latex_to_unicode_auto = 0
   endif
 
@@ -161,6 +157,14 @@ function! s:L2U_deprecated_options()
       exec "let g:" . new . " = g:" . old
     endif
   endfor
+
+  if has_key(g:, "latex_to_unicode_tab")
+    if g:latex_to_unicode_tab is# 1
+      let g:latex_to_unicode_tab = "on"
+    elseif g:latex_to_unicode_tab is# 0
+      let g:latex_to_unicode_tab = "off"
+    endif
+  endif
 endfunction
 
 function! s:L2U_file_type_regex(ft)
@@ -239,22 +243,23 @@ function! s:L2U_longest_common_prefix(partmatches)
   return common
 endfunction
 
-" Omnicompletion function. Besides the usual two-stage omnifunc behaviour,
+" Completion function. Besides the usual two-stage completefunc behaviour,
 " it has the following peculiar features:
 "  *) keeps track of the previous completion attempt
 "  *) sets some info to be used by the fallback function
 "  *) either returns a list of completions if a partial match is found, or a
 "     Unicode char if an exact match is found
 "  *) forces its way out of completion mode through a hack in some cases
-function! LaTeXtoUnicode#omnifunc(findstart, base)
+function! LaTeXtoUnicode#completefunc(findstart, base)
   if a:findstart
     " first stage
-    " avoid infinite loop if the fallback happens to call omnicompletion
+    " avoid infinite loop if the fallback happens to call completion
     if b:l2u_in_fallback
       let b:l2u_in_fallback = 0
       return -3
     endif
-    let b:l2u_in_fallback = 0
+    call s:L2U_SetCompleteopt()
+    call s:L2U_InsertCompleteDoneAutocommand()
     " set info for the callback
     let b:l2u_found_completion = 1
     " analyse current line
@@ -385,27 +390,20 @@ function! LaTeXtoUnicode#Tab()
   " reset the in_fallback info
   let b:l2u_in_fallback = 0
   let b:l2u_tab_completing = 1
-  " temporary change to completeopt to use the `longest` setting, which is
-  " probably the only one which makes sense given that the goal of the
-  " completion is to substitute the final string
-  let b:l2u_backup_commpleteopt = &completeopt
-  set completeopt+=longest
-  set completeopt-=noinsert
-  " invoke omnicompletion; failure to perform LaTeX-to-Unicode completion is
+  " invoke completion; failure to perform LaTeX-to-Unicode completion is
   " handled by the CompleteDone autocommand.
-  call feedkeys("\<C-X>\<C-O>", 'n')
+  call feedkeys("\<C-X>\<C-U>", 'n')
   return ""
 endfunction
 
 " This function is called at every CompleteDone event, and is meant to handle
 " the failures of LaTeX-to-Unicode completion by calling a fallback
 function! LaTeXtoUnicode#FallbackCallback()
+  call s:L2U_RemoveCompleteDoneAutocommand()
+  call s:L2U_RestoreCompleteopt()
   if !b:l2u_tab_completing
     " completion was not initiated by L2U, nothing to do
     return
-  else
-    " completion was initiated by L2U, restore completeopt
-    let &completeopt = b:l2u_backup_commpleteopt
   endif
   " at this point L2U tab completion is over
   let b:l2u_tab_completing = 0
@@ -467,9 +465,56 @@ function! LaTeXtoUnicode#CmdTab(trigger)
   return ''
 endfunction
 
+function! s:L2U_SetCompleteopt()
+  " temporary change completeopt to use settings which make sense
+  " for L2U
+  let backup_new = 0
+  if !exists('b:l2u_backup_completeopt')
+    let b:l2u_backup_completeopt = &completeopt
+    let backup_new = 1
+  endif
+  noautocmd set completeopt+=longest
+  noautocmd set completeopt-=noinsert
+  noautocmd set completeopt-=noselect
+  noautocmd set completeopt-=menuone
+  if backup_new
+    let b:l2u_modified_completeopt = &completeopt
+  endif
+endfunction
+
+function! s:L2U_RestoreCompleteopt()
+  " restore completeopt, but only if nothing else has
+  " messed with it in the meanwhile
+  if exists('b:l2u_backup_completeopt')
+    if exists('b:l2u_modified_completeopt')
+      if &completeopt ==# b:l2u_modified_completeopt
+        noautocmd let &completeopt = b:l2u_backup_completeopt
+      endif
+      unlet b:l2u_modified_completeopt
+    endif
+    unlet b:l2u_backup_completeopt
+  endif
+endfunction
+
+function! s:L2U_InsertCompleteDoneAutocommand()
+  augroup L2UTab
+    autocmd! * <buffer>
+    " Every time a L2U completion finishes, the fallback may be invoked
+    autocmd CompleteDone <buffer> call LaTeXtoUnicode#FallbackCallback()
+  augroup END
+endfunction
+
+function! s:L2U_RemoveCompleteDoneAutocommand()
+  augroup L2UTab
+    autocmd! * <buffer>
+  augroup END
+endfunction
+
 " Setup the L2U tab mapping
 function! s:L2U_SetTab(wait_insert_enter)
-  if !b:l2u_cmdtab_set && get(g:, "latex_to_unicode_tab", 1) && b:l2u_enabled
+  let opt_do_cmdtab = index(["on", "command", "cmd"], get(g:, "latex_to_unicode_tab", "on")) != -1
+  let opt_do_instab = index(["on", "insert", "ins"], get(g:, "latex_to_unicode_tab", "on")) != -1
+  if !b:l2u_cmdtab_set && opt_do_cmdtab && b:l2u_enabled
     let b:l2u_cmdtab_keys = get(g:, "latex_to_unicode_cmd_mapping", ['<Tab>','<S-Tab>'])
     if type(b:l2u_cmdtab_keys) != type([]) " avoid using v:t_list for backward compatibility
       let b:l2u_cmdtab_keys = [b:l2u_cmdtab_keys]
@@ -487,26 +532,20 @@ function! s:L2U_SetTab(wait_insert_enter)
   if a:wait_insert_enter && !get(g:, "did_insert_enter", 0)
     return
   endif
-  if !get(g:, "latex_to_unicode_tab", 1) || !b:l2u_enabled
+  if !opt_do_instab || !b:l2u_enabled
     return
   endif
 
-  " Backup the previous omnifunc (the check is probably not really needed)
-  if get(b:, "prev_omnifunc", "") != "LaTeXtoUnicode#omnifunc"
-    let b:prev_omnifunc = &omnifunc
+  " Backup the previous completefunc (the check is probably not really needed)
+  if get(b:, "prev_completefunc", "") != "LaTeXtoUnicode#completefunc"
+    let b:prev_completefunc = &completefunc
   endif
-  setlocal omnifunc=LaTeXtoUnicode#omnifunc
+  setlocal completefunc=LaTeXtoUnicode#completefunc
 
   call s:L2U_SetFallbackMapping('<Tab>', s:l2u_fallback_trigger)
   imap <buffer> <Tab> <Plug>L2UTab
   inoremap <buffer><expr> <Plug>L2UTab LaTeXtoUnicode#Tab()
 
-  augroup L2UTab
-    autocmd! * <buffer>
-    " Every time a completion finishes, the fallback may be invoked
-    autocmd CompleteDone <buffer> call LaTeXtoUnicode#FallbackCallback()
-  augroup END
-
   let b:l2u_tab_set = 1
 endfunction
 
@@ -521,16 +560,13 @@ function! s:L2U_UnsetTab()
   if !b:l2u_tab_set
     return
   endif
-  exec "setlocal omnifunc=" . get(b:, "prev_omnifunc", "")
+  exec "setlocal completefunc=" . get(b:, "prev_completefunc", "")
   iunmap <buffer> <Tab>
   if empty(maparg("<Tab>", "i"))
     call s:L2U_SetFallbackMapping(s:l2u_fallback_trigger, '<Tab>')
   endif
   iunmap <buffer> <Plug>L2UTab
   exe 'iunmap <buffer> ' . s:l2u_fallback_trigger
-  augroup L2UTab
-    autocmd! * <buffer>
-  augroup END
   let b:l2u_tab_set = 0
 endfunction
 
diff --git a/autoload/julia/doc.vim b/autoload/julia/doc.vim
index dfac90a0b..fe311222e 100644
--- a/autoload/julia/doc.vim
+++ b/autoload/julia/doc.vim
@@ -97,7 +97,7 @@ function! s:write_to_preview_window(content, ftype, buffername)
   else
     " We couldn't make it to the preview window, so as a fallback we dump the
     " contents in the status area.
-    execute printf("echo '%s'", join(a:content, "\n"))
+    echo join(a:content, "\n")
   endif
 endfunction
 
diff --git a/autoload/ledger.vim b/autoload/ledger.vim
index 1006430c8..90c888029 100644
--- a/autoload/ledger.vim
+++ b/autoload/ledger.vim
@@ -79,6 +79,69 @@ function! ledger#transaction_date_set(lnum, type, ...) abort
   call setline(trans['head'], trans.format_head())
 endf
 
+function! ledger#transaction_post_state_get(lnum) abort
+  " safe view / position
+  let view = winsaveview()
+  call cursor(a:lnum, 0)
+
+  let line = getline('.')
+  if line[0] !~# '[ \t]'
+    " not a post
+    let state = ''
+  else
+    let m = matchlist(line, '^[ \t]\+\([*?!]\)')
+    if len(m) > 1
+      let state = m[1]
+    else
+      let state = ' '
+    endif
+  endif
+
+  call winrestview(view)
+  return state
+endf
+
+function! ledger#transaction_post_state_toggle(lnum, ...) abort
+  if a:0 == 1
+    let chars = a:1
+  else
+    let chars = ' *'
+  endif
+
+  let old = ledger#transaction_post_state_get(a:lnum)
+  if old ==# ''
+    " not a post, probably at the first line of transaction
+    call ledger#transaction_state_toggle(a:lnum, chars)
+    return
+  endif
+  let i = stridx(chars, old) + 1
+  let new = chars[i >= len(chars) ? 0 : i]
+
+  call ledger#transaction_post_state_set(a:lnum, new)
+endf
+
+function! ledger#transaction_post_state_set(lnum, char) abort
+  let state = ledger#transaction_post_state_get(a:lnum)
+  if state ==# ''
+    " not a post, probably at the first line of transaction
+    call ledger#transaction_state_set(a:lnum, a:char)
+    return
+  elseif state == a:char || (state ==# ' ' && a:char ==# '')
+    return
+  endif
+
+  let line = getline('.')
+  if a:char =~# '^\s*$'
+    let newline = substitute(line, '\V' . state . '\m[ \t]', '', '')
+  elseif state ==# ' '
+    let m = matchlist(line, '^\([ \t]\+\)\(.*\)')
+    let newline = m[1] . a:char . ' ' . m[2]
+  else
+    let newline = substitute(line, '\V' . state, a:char, '')
+  endif
+  call setline(a:lnum, newline)
+endf
+
 " == get transactions ==
 
 function! ledger#transaction_from_lnum(lnum) abort
@@ -178,8 +241,10 @@ function! s:transaction.from_lnum(lnum) abort dict "{{{2
 endf "}}}
 
 function! s:transaction.set_state(char) abort dict "{{{2
-  if has_key(self, 'state') && a:char =~# '^\s*$'
-    call remove(self, 'state')
+  if a:char =~# '^\s*$'
+    if has_key(self, 'state')
+      call remove(self, 'state')
+    endif
   else
     let self['state'] = a:char
   endif
@@ -426,7 +491,9 @@ function! ledger#align_commodity() abort
     " Remove everything after the account name (including spaces):
     call setline('.', substitute(l:line, '\m^\s\+[^[:space:]].\{-}\zs\(\t\|  \).*$', '', ''))
     let pos = -1
-    if g:ledger_decimal_sep !=# ''
+    if g:ledger_align_commodity == 1
+      let pos = 0
+    elseif g:ledger_decimal_sep !=# ''
       " Find the position of the first decimal separator:
       let pos = s:decimalpos(rhs)
     endif
@@ -435,7 +502,7 @@ function! ledger#align_commodity() abort
       let pos = matchend(rhs, '\m\d[^[:space:]]*')
     endif
     " Go to the column that allows us to align the decimal separator at g:ledger_align_at:
-    if pos > 0
+    if pos >= 0
       call s:goto_col(g:ledger_align_at - pos - 1, 2)
     else
       call s:goto_col(g:ledger_align_at - strdisplaywidth(rhs) - 2, 2)
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index 7b31febd2..3474f34ac 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -31,7 +31,11 @@ function! zig#fmt#Format() abort
     try | silent undojoin | catch | endtry
 
     " Replace the file content with the formatted version.
-    call deletebufline(current_buf, len(out), line('$'))
+    if exists('*deletebufline')
+      call deletebufline(current_buf, len(out), line('$'))
+    else
+      silent execute ':' . len(out) . ',' . line('$') . ' delete _'
+    endif
     call setline(1, out)
 
     " No errors detected, close the loclist.
diff --git a/compiler/ledger.vim b/compiler/ledger.vim
index 92348ba3a..3fca64421 100644
--- a/compiler/ledger.vim
+++ b/compiler/ledger.vim
@@ -30,7 +30,7 @@ if !g:ledger_is_hledger
 	CompilerSet errorformat+=%tarning:\ \"%f\"\\,\ line\ %l:\ %m
 	" Skip all other lines:
 	CompilerSet errorformat+=%-G%.%#
-	exe 'CompilerSet makeprg='.substitute(g:ledger_bin, ' ', '\\ ', 'g').'\ -f\ ' . shellescape(expand(g:ledger_main)) . '\ '.substitute(g:ledger_extra_options, ' ', '\\ ', 'g').'\ source\ ' . shellescape(expand(g:ledger_main))
+	exe 'CompilerSet makeprg='.substitute(g:ledger_bin, ' ', '\\ ', 'g').'\ -f\ ' . expand('g:ledger_main::S') . '\ '.substitute(g:ledger_extra_options, ' ', '\\ ', 'g').'\ source\ ' . expand('g:ledger_main::S')
 else
-	exe 'CompilerSet makeprg=('.substitute(g:ledger_bin, ' ', '\\ ', 'g').'\ -f\ ' . shellescape(expand(g:ledger_main)) . '\ print\ '.substitute(g:ledger_extra_options, ' ', '\\ ', 'g').'\ >\ /dev/null)'
+	exe 'CompilerSet makeprg=('.substitute(g:ledger_bin, ' ', '\\ ', 'g').'\ -f\ ' . expand('g:ledger_main::S') . '\ print\ '.substitute(g:ledger_extra_options, ' ', '\\ ', 'g') . '\ >\ /dev/null)'
 endif
diff --git a/ftplugin/dune.vim b/ftplugin/dune.vim
index 9d86d0a53..4f78d7c6b 100644
--- a/ftplugin/dune.vim
+++ b/ftplugin/dune.vim
@@ -19,6 +19,6 @@ set lisp
 
 " Comment string
 setl commentstring=;\ %s
-setl comments=:;
+setl comments=n:;
 
 setl iskeyword+=#,?,.,/
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index 618e16d8d..08aa2f8e3 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -26,7 +26,7 @@ setlocal fo-=t fo+=croql
 let b:julia_vim_loaded = 1
 
 let b:undo_ftplugin = "setlocal include< suffixesadd< comments< commentstring<"
-      \ . " define< fo< shiftwidth< expandtab< indentexpr< indentkeys< cinoptions< omnifunc<"
+      \ . " define< fo< shiftwidth< expandtab< indentexpr< indentkeys< cinoptions< completefunc<"
       \ . " | unlet! b:commentary_format"
       \ . " | unlet! b:smartcomment_force_linemode"
       \ . " | unlet! b:julia_vim_loaded"
diff --git a/ftplugin/kotlin.vim b/ftplugin/kotlin.vim
index e06ce0435..ca0b35fc4 100644
--- a/ftplugin/kotlin.vim
+++ b/ftplugin/kotlin.vim
@@ -5,5 +5,5 @@ endif
 if exists('b:did_ftplugin') | finish | endif
 let b:did_ftplugin = 1
 
-setlocal comments=://
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
 setlocal commentstring=//\ %s
diff --git a/ftplugin/mlir.vim b/ftplugin/mlir.vim
new file mode 100644
index 000000000..baedaee43
--- /dev/null
+++ b/ftplugin/mlir.vim
@@ -0,0 +1,16 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'ftplugin/mlir.vim')
+  finish
+endif
+
+" Vim filetype plugin file
+" Language: MLIR Assembly
+" Maintainer: The MLIR team
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal softtabstop=2 shiftwidth=2
+setlocal expandtab
+setlocal comments+=://
diff --git a/ftplugin/sexplib.vim b/ftplugin/sexplib.vim
index d98f2d15f..976e38971 100644
--- a/ftplugin/sexplib.vim
+++ b/ftplugin/sexplib.vim
@@ -16,4 +16,4 @@ let b:did_ftplugin=1
 
 " Comment string
 setl commentstring=;\ %s
-setl comments=:;
+setl comments=n:;
diff --git a/indent/julia.vim b/indent/julia.vim
index c4c172450..b40823c02 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -53,8 +53,8 @@ function GetJuliaNestingStruct(lnum, ...)
   let blocks_stack = []
   let num_closed_blocks = 0
   while 1
-    let fb = JuliaMatch(a:lnum, line, '@\@<!\<\%(if\|else\%(if\)\?\|while\|for\|try\|catch\|finally\|\%(staged\)\?function\|macro\|begin\|mutable\s\+struct\|\%(mutable\s\+\)\@<!struct\|\%(abstract\|primitive\)\s\+type\|let\|\%(bare\)\?module\|quote\|do\)\>', s, e)
-    let fe = JuliaMatch(a:lnum, line, '@\@<!\<end\>', s, e)
+    let fb = JuliaMatch(a:lnum, line, '[@.]\@<!\<\%(if\|else\%(if\)\?\|while\|for\|try\|catch\|finally\|\%(staged\)\?function\|macro\|begin\|mutable\s\+struct\|\%(mutable\s\+\)\@<!struct\|\%(abstract\|primitive\)\s\+type\|let\|\%(bare\)\?module\|quote\|do\)\>', s, e)
+    let fe = JuliaMatch(a:lnum, line, '[@.]\@<!\<end\>', s, e)
 
     if fb < 0 && fe < 0
       " No blocks found
@@ -66,13 +66,13 @@ function GetJuliaNestingStruct(lnum, ...)
       " Note: some keywords (elseif,else,catch,finally) are both
       "       closing blocks and opening new ones
 
-      let i = JuliaMatch(a:lnum, line, '@\@<!\<if\>', s)
+      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<if\>', s)
       if i >= 0 && i == fb
         let s = i+1
         call add(blocks_stack, 'if')
         continue
       endif
-      let i = JuliaMatch(a:lnum, line, '@\@<!\<elseif\>', s)
+      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<elseif\>', s)
       if i >= 0 && i == fb
         let s = i+1
         if len(blocks_stack) > 0 && blocks_stack[-1] == 'if'
@@ -83,7 +83,7 @@ function GetJuliaNestingStruct(lnum, ...)
         endif
         continue
       endif
-      let i = JuliaMatch(a:lnum, line, '@\@<!\<else\>', s)
+      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<else\>', s)
       if i >= 0 && i == fb
         let s = i+1
         if len(blocks_stack) > 0 && blocks_stack[-1] =~# '\<\%(else\)\=if\>'
@@ -95,13 +95,13 @@ function GetJuliaNestingStruct(lnum, ...)
         continue
       endif
 
-      let i = JuliaMatch(a:lnum, line, '@\@<!\<try\>', s)
+      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<try\>', s)
       if i >= 0 && i == fb
         let s = i+1
         call add(blocks_stack, 'try')
         continue
       endif
-      let i = JuliaMatch(a:lnum, line, '@\@<!\<catch\>', s)
+      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<catch\>', s)
       if i >= 0 && i == fb
         let s = i+1
         if len(blocks_stack) > 0 && blocks_stack[-1] == 'try'
@@ -112,7 +112,7 @@ function GetJuliaNestingStruct(lnum, ...)
         endif
         continue
       endif
-      let i = JuliaMatch(a:lnum, line, '@\@<!\<finally\>', s)
+      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<finally\>', s)
       if i >= 0 && i == fb
         let s = i+1
         if len(blocks_stack) > 0 && (blocks_stack[-1] == 'try' || blocks_stack[-1] == 'catch')
@@ -124,7 +124,7 @@ function GetJuliaNestingStruct(lnum, ...)
         continue
       endif
 
-      let i = JuliaMatch(a:lnum, line, '@\@<!\<\%(bare\)\?module\>', s)
+      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<\%(bare\)\?module\>', s)
       if i >= 0 && i == fb
         let s = i+1
         if i == 0
@@ -135,7 +135,7 @@ function GetJuliaNestingStruct(lnum, ...)
         continue
       endif
 
-      let i = JuliaMatch(a:lnum, line, '@\@<!\<\%(while\|for\|\%(staged\)\?function\|macro\|begin\|\%(mutable\s\+\)\?struct\|\%(abstract\|primitive\)\s\+type\|immutable\|let\|quote\|do\)\>', s)
+      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<\%(while\|for\|\%(staged\)\?function\|macro\|begin\|\%(mutable\s\+\)\?struct\|\%(abstract\|primitive\)\s\+type\|immutable\|let\|quote\|do\)\>', s)
       if i >= 0 && i == fb
         if match(line, '\C\<\%(mutable\|abstract\|primitive\)', i) != -1
           let s = i+11
@@ -278,7 +278,7 @@ endfunction
 
 function IsInDocString(lnum)
   let stack = map(synstack(a:lnum, 1), 'synIDattr(v:val, "name")')
-  call filter(stack, 'v:val =~# "\\<juliaDocString\\(Delim\\)\\?\\>"')
+  call filter(stack, 'v:val =~# "\\<juliaDocString\\(Delim\\|M\\)\\?\\>"')
   return len(stack) > 0
 endfunction
 
diff --git a/indent/mlir.vim b/indent/mlir.vim
new file mode 100644
index 000000000..a74c35063
--- /dev/null
+++ b/indent/mlir.vim
@@ -0,0 +1,79 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'indent/mlir.vim')
+  finish
+endif
+
+" Vim indent file
+" Language:   mlir
+" Maintainer: The MLIR team
+" Adapted from the LLVM vim indent file
+" What this indent plugin currently does:
+"  - If no other rule matches copy indent from previous non-empty,
+"    non-commented line.
+"  - On '}' align the same as the line containing the matching '{'.
+"  - If previous line starts with a block label, increase indentation.
+"  - If the current line is a block label and ends with ':' indent at the same
+"    level as the enclosing '{'/'}' block.
+" Stuff that would be nice to add:
+"  - Continue comments on next line.
+"  - If there is an opening+unclosed parenthesis on previous line indent to
+"    that.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal shiftwidth=2 expandtab
+
+setlocal indentkeys=0{,0},<:>,!^F,o,O,e
+setlocal indentexpr=GetMLIRIndent()
+
+if exists("*GetMLIRIndent")
+  finish
+endif
+
+function! FindOpenBrace(lnum)
+  call cursor(a:lnum, 1)
+  return searchpair('{', '', '}', 'bW')
+endfun
+
+function! GetMLIRIndent()
+  " On '}' align the same as the line containing the matching '{'
+  let thisline = getline(v:lnum)
+  if thisline =~ '^\s*}'
+    call cursor(v:lnum, 1)
+    silent normal %
+    let opening_lnum = line('.')
+    if opening_lnum != v:lnum
+      return indent(opening_lnum)
+    endif
+  endif
+
+  " Indent labels the same as the current opening block
+  if thisline =~ '\^\h\+.*:\s*$'
+    let blockbegin = FindOpenBrace(v:lnum)
+    if blockbegin > 0
+      return indent(blockbegin)
+    endif
+  endif
+
+  " Find a non-blank not-completely commented line above the current line.
+  let prev_lnum = prevnonblank(v:lnum - 1)
+  while prev_lnum > 0 && synIDattr(synID(prev_lnum, 1 + indent(prev_lnum), 0), "name") == "mlirComment"
+    let prev_lnum = prevnonblank(prev_lnum-1)
+  endwhile
+  " Hit the start of the file, use zero indent.
+  if prev_lnum == 0
+    return 0
+  endif
+
+  let ind = indent(prev_lnum)
+  let prevline = getline(prev_lnum)
+
+  " Add a 'shiftwidth' after lines that start a function, block/labels, or a
+  " region.
+  if prevline =~ '{\s*$' || prevline =~ '\^\h\+.*:\s*$'
+    let ind = ind + &shiftwidth
+  endif
+
+  return ind
+endfunction
diff --git a/indent/svelte.vim b/indent/svelte.vim
index fa01f563b..cb01c4247 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -12,12 +12,6 @@ if exists("b:did_indent")
   finish
 endif
 
-runtime! indent/html.vim
-unlet! b:did_indent
-
-let s:html_indent = &l:indentexpr
-let b:did_indent = 1
-
 if !exists('g:svelte_indent_script')
   let g:svelte_indent_script = 1
 endif
@@ -26,6 +20,25 @@ if !exists('g:svelte_indent_style')
   let g:svelte_indent_style = 1
 endif
 
+" Try to mirror Svelte's indent settings so the HTML indenting scripts match.
+if g:svelte_indent_script
+  let b:html_indent_script1 = "inc"
+else
+  let b:html_indent_script1 = "zero"
+endif
+
+if g:svelte_indent_style
+  let b:html_indent_style1 = "inc"
+else
+  let b:html_indent_style1 = "zero"
+endif
+
+runtime! indent/html.vim
+unlet! b:did_indent
+
+let s:html_indent = &l:indentexpr
+let b:did_indent = 1
+
 setlocal indentexpr=GetSvelteIndent()
 setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],!^F,;,=:else,=:then,=:catch,=/if,=/each,=/await
 
diff --git a/syntax/gomod.vim b/syntax/gomod.vim
index 0de3d9d97..4f120ffd3 100644
--- a/syntax/gomod.vim
+++ b/syntax/gomod.vim
@@ -11,17 +11,22 @@ endif
 
 syntax case match
 
+" Reference documentation:
+" https://golang.org/ref/mod#go-mod-file-grammar
+
 " match keywords
 syntax keyword gomodModule  module
 syntax keyword gomodGo      go      contained
 syntax keyword gomodRequire require
 syntax keyword gomodExclude exclude
 syntax keyword gomodReplace replace
+syntax keyword gomodRetract retract
 
 " require, exclude, replace, and go can be also grouped into block
 syntax region gomodRequire start='require (' end=')' transparent contains=gomodRequire,gomodVersion
 syntax region gomodExclude start='exclude (' end=')' transparent contains=gomodExclude,gomodVersion
 syntax region gomodReplace start='replace (' end=')' transparent contains=gomodReplace,gomodVersion
+syntax region gomodRetract start='retract (' end=')' transparent contains=gomodVersionRange,gomodVersion
 syntax match  gomodGo            '^go .*$'           transparent contains=gomodGo,gomodGoVersion
 
 " set highlights
@@ -30,6 +35,7 @@ highlight default link gomodGo      Keyword
 highlight default link gomodRequire Keyword
 highlight default link gomodExclude Keyword
 highlight default link gomodReplace Keyword
+highlight default link gomodRetract Keyword
 
 " comments are always in form of // ...
 syntax region gomodComment  start="//" end="$" contains=@Spell
@@ -47,7 +53,6 @@ highlight default link gomodReplaceOperator Operator
 syntax match gomodGoVersion "1\.\d\+" contained
 highlight default link gomodGoVersion Identifier
 
-
 " highlight versions:
 "  * vX.Y.Z-pre
 "  * vX.Y.Z
@@ -93,4 +98,15 @@ syntax match gomodVersion "v[2-9]\{1}\d*\.\d\+\.\d\+\%(+\%([0-9A-Za-z-]\+\)\%(\.
 "                          ^------- version -------^^---------------- metadata ---------------------^
 highlight default link gomodVersion Identifier
 
+" match go version ranges in retract directive
+" https://golang.org/ref/mod#go-mod-file-retract
+syntax region gomodVersionRange start="\[" end="\]" transparent matchgroup=gomodVersionRangeBracket contains=gomodVersion,gomodVersionRangeSeparator
+highlight default link gomodVersionRange Operator
+syntax match gomodVersionRangeBracket "\[" contained
+syntax match gomodVersionRangeBracket "\]" contained
+highlight default link gomodVersionRangeBracket Operator
+syntax match gomodVersionRangeSeparator "," contained
+highlight default link gomodVersionRangeSeparator Operator
+
+
 let b:current_syntax = "gomod"
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index dbd1c4edd..615862dc3 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -108,7 +108,7 @@ syntax keyword jsDo                     do              skipwhite skipempty next
 syntax region  jsSwitchCase   contained matchgroup=jsLabel start=/\<\%(case\|default\)\>/ end=/:\@=/ contains=@jsExpression,jsLabel skipwhite skipempty nextgroup=jsSwitchColon keepend
 syntax keyword jsTry                    try             skipwhite skipempty nextgroup=jsTryCatchBlock
 syntax keyword jsFinally      contained finally         skipwhite skipempty nextgroup=jsFinallyBlock
-syntax keyword jsCatch        contained catch           skipwhite skipempty nextgroup=jsParenCatch
+syntax keyword jsCatch        contained catch           skipwhite skipempty nextgroup=jsParenCatch,jsTryCatchBlock
 syntax keyword jsException              throw
 syntax keyword jsAsyncKeyword           async await
 syntax match   jsSwitchColon   contained /::\@!/        skipwhite skipempty nextgroup=jsSwitchBlock
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 5d9a7ae1d..1a08f62d3 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -36,11 +36,11 @@ let s:julia_highlight_operators = get(g:, "julia_highlight_operators", 1)
 " characters which cannot be used in identifiers. This list is very incomplete:
 " 1) it only cares about charactes below 256
 " 2) it doesn't distinguish between what's allowed as the 1st char vs in the
-"    rest of an identifier (e.g. digits, `!` and `?`)
+"    rest of an identifier (e.g. digits and `!`)
 " Despite these shortcomings, it seems to do a decent job.
 " note: \U5B and \U5D are '[' and ']'
 let s:nonid_chars = "\U01-\U07" . "\U0E-\U1F" .
-      \             "\"#$'(,.:;=@`\\U5B{" .
+      \             "?\"#$'(,.:;=@`\\U5B{" .
       \             "\U80-\UA1" . "\UA7\UA8\UAB\UAD\UAF\UB4" . "\UB6-\UB8" . "\UBB\UBF"
 
 let s:nonidS_chars = "[:space:])\\U5D}" . s:nonid_chars
@@ -64,7 +64,7 @@ let s:binop_chars = "=+\\U2D*/\\%÷^&|⊻<>≤≥≡≠≢∈∉⋅×∪∩⊆
 let s:binop_chars_extra = "\\U214B\\U2190-\\U2194\\U219A\\U219B\\U21A0\\U21A3\\U21A6\\U21AE\\U21CE\\U21CF\\U21D2\\U21D4\\U21F4-\\U21FF\\U2208-\\U220D\\U2213\\U2214\\U2217-\\U2219\\U221D\\U2224-\\U222A\\U2237\\U2238\\U223A\\U223B\\U223D\\U223E\\U2240-\\U228B\\U228D-\\U229C\\U229E-\\U22A3\\U22A9\\U22AC\\U22AE\\U22B0-\\U22B7\\U22BB-\\U22BD\\U22C4-\\U22C7\\U22C9-\\U22D3\\U22D5-\\U22ED\\U22F2-\\U22FF\\U25B7\\U27C8\\U27C9\\U27D1\\U27D2\\U27D5-\\U27D7\\U27F0\\U27F1\\U27F5-\\U27F7\\U27F7\\U27F9-\\U27FF\\U2900-\\U2918\\U291D-\\U2920\\U2944-\\U2970\\U29B7\\U29B8\\U29BC\\U29BE-\\U29C1\\U29E1\\U29E3-\\U29E5\\U29F4\\U29F6\\U29F7\\U29FA\\U29FB\\U2A07\\U2A08\\U2A1D\\U2A22-\\U2A2E\\U2A30-\\U2A3D\\U2A40-\\U2A45\\U2A4A-\\U2A58\\U2A5A-\\U2A63\\U2A66\\U2A67\\U2A6A-\\U2AD9\\U2ADB\\U2AF7-\\U2AFA\\U2B30-\\U2B44\\U2B47-\\U2B4C\\UFFE9-\\UFFEC"
 
 " a Julia identifier, sort of
-let s:idregex = '\%([^' . s:nonidS_chars . '0-9!?' . s:uniop_chars . s:binop_chars . '][^' . s:nonidS_chars . s:uniop_chars . s:binop_chars . s:binop_chars_extra . ']*\)'
+let s:idregex = '\%([^' . s:nonidS_chars . '0-9!' . s:uniop_chars . s:binop_chars . '][^' . s:nonidS_chars . s:uniop_chars . s:binop_chars . s:binop_chars_extra . ']*\)'
 
 let s:operators = '\%(' . '\.\%([-+*/^÷%|&!]\|//\|\\\|<<\|>>>\?\)\?=' .
       \           '\|'  . '[:$<>]=\|||\|&&\||>\|<|\|<:\|>:\|::\|<<\|>>>\?\|//\|[-=]>\|\.\{3\}' .
@@ -74,11 +74,11 @@ let s:operators = '\%(' . '\.\%([-+*/^÷%|&!]\|//\|\\\|<<\|>>>\?\)\?=' .
 
 syn case match
 
-syntax cluster juliaExpressions		contains=@juliaParItems,@juliaStringItems,@juliaKeywordItems,@juliaBlocksItems,@juliaTypesItems,@juliaConstItems,@juliaMacroItems,@juliaSymbolItems,@juliaOperatorItems,@juliaNumberItems,@juliaCommentItems,@juliaErrorItems
+syntax cluster juliaExpressions		contains=@juliaParItems,@juliaStringItems,@juliaKeywordItems,@juliaBlocksItems,@juliaTypesItems,@juliaConstItems,@juliaMacroItems,@juliaSymbolItems,@juliaOperatorItems,@juliaNumberItems,@juliaCommentItems,@juliaErrorItems,@juliaSyntaxRegions
 syntax cluster juliaExprsPrintf		contains=@juliaExpressions,@juliaPrintfItems
 
 syntax cluster juliaParItems		contains=juliaParBlock,juliaSqBraIdxBlock,juliaSqBraBlock,juliaCurBraBlock,juliaQuotedParBlock,juliaQuotedQMarkPar
-syntax cluster juliaKeywordItems	contains=juliaKeyword,juliaImportLine,juliaInfixKeyword,juliaRepKeyword
+syntax cluster juliaKeywordItems	contains=juliaKeyword,juliaWhereKeyword,juliaImportLine,juliaInfixKeyword,juliaRepKeyword
 syntax cluster juliaBlocksItems		contains=juliaConditionalBlock,juliaWhileBlock,juliaForBlock,juliaBeginBlock,juliaFunctionBlock,juliaMacroBlock,juliaQuoteBlock,juliaTypeBlock,juliaImmutableBlock,juliaExceptionBlock,juliaLetBlock,juliaDoBlock,juliaModuleBlock,juliaStructBlock,juliaMutableStructBlock,juliaAbstractBlock,juliaPrimitiveBlock
 syntax cluster juliaTypesItems		contains=juliaBaseTypeBasic,juliaBaseTypeNum,juliaBaseTypeC,juliaBaseTypeError,juliaBaseTypeIter,juliaBaseTypeString,juliaBaseTypeArray,juliaBaseTypeDict,juliaBaseTypeSet,juliaBaseTypeIO,juliaBaseTypeProcess,juliaBaseTypeRange,juliaBaseTypeRegex,juliaBaseTypeFact,juliaBaseTypeFact,juliaBaseTypeSort,juliaBaseTypeRound,juliaBaseTypeSpecial,juliaBaseTypeRandom,juliaBaseTypeDisplay,juliaBaseTypeTime,juliaBaseTypeOther
 
@@ -93,6 +93,8 @@ syntax cluster juliaOperatorItems	contains=juliaOperator,juliaRangeOperator,juli
 syntax cluster juliaCommentItems	contains=juliaCommentL,juliaCommentM
 syntax cluster juliaErrorItems		contains=juliaErrorPar,juliaErrorEnd,juliaErrorElse,juliaErrorCatch,juliaErrorFinally
 
+syntax cluster juliaSyntaxRegions	contains=juliaParamTypeR,juliaFunctionCallR,juliaTypeOperatorR,juliaWhereR
+
 syntax cluster juliaSpellcheckStrings		contains=@spell
 syntax cluster juliaSpellcheckDocStrings	contains=@spell
 syntax cluster juliaSpellcheckComments		contains=@spell
@@ -126,9 +128,21 @@ syntax region  juliaParBlock		matchgroup=juliaParDelim start="(" end=")" contain
 syntax region  juliaParBlockInRange	matchgroup=juliaParDelim contained start="(" end=")" contains=@juliaExpressions,juliaParBlockInRange,juliaRangeKeyword,juliaComprehensionFor
 syntax region  juliaSqBraIdxBlock	matchgroup=juliaParDelim start="\[" end="\]" contains=@juliaExpressions,juliaParBlockInRange,juliaRangeKeyword,juliaComprehensionFor,juliaSymbolS,juliaQuotedParBlockS,juliaQuotedQMarkParS
 exec 'syntax region  juliaSqBraBlock	matchgroup=juliaParDelim start="\%(^\|\s\|' . s:operators . '\)\@'.s:d(3).'<=\[" end="\]" contains=@juliaExpressions,juliaComprehensionFor,juliaSymbolS,juliaQuotedParBlockS,juliaQuotedQMarkParS'
-syntax region  juliaCurBraBlock		matchgroup=juliaParDelim start="{" end="}" contains=@juliaExpressions
+syntax region  juliaCurBraBlock		matchgroup=juliaParDelim start="{" end="}" contains=juliaType,@juliaExpressions
+
+exec 'syntax match   juliaType		contained "' . s:idregex . '\%(\.' . s:idregex . '\)*"'
+
+exec 'syntax region  juliaFunctionCallR	transparent start="' . s:idregex . '\%(\.' . s:idregex . '\)*\s*(" end=")\@'.s:d(1).'<=" contains=juliaFunctionCall,juliaParBlock'
+exec 'syntax match   juliaFunctionCall	contained "\%(' . s:idregex . '\.\)*\zs' . s:idregex . '"'
+
+" note: we would in principle add a "s:nodot" before function/macro/struct/... but it shouldn't come up in valid code
+exec 'syntax match   juliaFunctionDef	contained transparent "\%(\<\%(function\|macro\)\s\+\)\@'.s:d(20).'<=' . s:idregex . '\%(\.' . s:idregex . '\)*\ze\s\+\%(end\>\|$\)" contains=juliaFunctionName'
+exec 'syntax region  juliaFunctionDefP	contained transparent start="\%(\<\%(function\|macro\)\s\+\)\@'.s:d(20).'<=' . s:idregex . '\%(\.' . s:idregex . '\)*\s*(" end=")\@'.s:d(1).'<=" contains=juliaFunctionName,juliaParBlock'
+exec 'syntax match   juliaFunctionName	contained "\%(\<\%(function\|macro\)\s\+\)\@'.s:d(20).'<=\%(' . s:idregex . '\.\)*\zs' . s:idregex . '"'
+
+exec 'syntax match   juliaStructR	contained transparent "\%(\<\%(\%(mutable\s\+\)\?struct\|\%(abstract\|primitive\)\s\+type\)\s\+\)\@'.s:d(20).'<=\%(' . s:idregex . '\.\)*' . s:idregex . '\>\(\s*(\)\@!" contains=juliaType'
 
-exec 'syntax match   juliaKeyword		display "'.s:nodot.'\<\%(return\|local\|global\|const\|where\)\>"'
+exec 'syntax match   juliaKeyword		display "'.s:nodot.'\<\%(return\|local\|global\|const\)\>"'
 syntax match   juliaInfixKeyword	display "\%(=\s*\)\@<!\<\%(in\|isa\)\>\S\@!\%(\s*=\)\@!"
 
 " The import/export/using keywords introduce a sort of special parsing
@@ -144,26 +158,25 @@ exec 'syntax region  juliaWhileBlock		matchgroup=juliaRepeat start="'.s:nodot.'\
 exec 'syntax region  juliaForBlock		matchgroup=juliaRepeat start="'.s:nodot.'\<for\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaOuter fold'
 exec 'syntax region  juliaBeginBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<begin\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaFunctionBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<function\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaFunctionDef,juliaFunctionDefP fold'
-exec 'syntax region  juliaMacroBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<macro\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
+exec 'syntax region  juliaMacroBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<macro\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaFunctionDef,juliaFunctionDefP fold'
 exec 'syntax region  juliaQuoteBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<quote\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
-exec 'syntax region  juliaStructBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
-exec 'syntax region  juliaMutableStructBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<mutable\s\+struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
+exec 'syntax region  juliaStructBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaStructR fold'
+exec 'syntax region  juliaMutableStructBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<mutable\s\+struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaStructR fold'
 exec 'syntax region  juliaLetBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<let\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaDoBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<do\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaModuleBlock		matchgroup=juliaBlKeyword start="\%(\%(\.\s*\)\@'.s:d(6).'<!\|\%(@\s*\.\s*\)\@'.s:d(6).'<=\)\<\%(bare\)\?module\>" end="\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaExceptionBlock	matchgroup=juliaException start="'.s:nodot.'\<try\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaCatchBlock,juliaFinallyBlock fold'
 exec 'syntax region  juliaCatchBlock		matchgroup=juliaException transparent contained start="'.s:nodot.'\<catch\>" end="'.s:nodot.'\<end\>"me=s-1 contains=@juliaExpressions,juliaFinallyBlock'
-exec 'syntax region  juliaFinallyBlock	matchgroup=juliaException transparent contained start="'.s:nodot.'\<finally\>" end="'.s:nodot.'\<end\>"me=s-1 contains=@juliaExpressions'
-" AbstractBlock needs to come after to take precedence
-exec 'syntax region  juliaAbstractBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<abstract\s\+type\>" end="'.s:nodot.'\<end\>" fold contains=@juliaExpressions'
-exec 'syntax region  juliaPrimitiveBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<primitive\s\+type\>" end="'.s:nodot.'\<end\>" fold contains=@juliaExpressions'
+exec 'syntax region  juliaFinallyBlock		matchgroup=juliaException transparent contained start="'.s:nodot.'\<finally\>" end="'.s:nodot.'\<end\>"me=s-1 contains=@juliaExpressions'
+exec 'syntax region  juliaAbstractBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<abstract\s\+type\>" end="'.s:nodot.'\<end\>" fold contains=@juliaExpressions,juliaStructR'
+exec 'syntax region  juliaPrimitiveBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<primitive\s\+type\>" end="'.s:nodot.'\<end\>" fold contains=@juliaExpressions,juliaStructR'
 
 exec 'syntax region  juliaComprehensionFor	matchgroup=juliaComprehensionFor transparent contained start="\%([^[:space:],;:({[]\_s*\)\@'.s:d(80).'<=\<for\>" end="\ze[]);]" contains=@juliaExpressions,juliaComprehensionIf,juliaComprehensionFor'
 exec 'syntax match   juliaComprehensionIf	contained "'.s:nodot.'\<if\>"'
 
 exec 'syntax match   juliaOuter		contained "\<outer\ze\s\+' . s:idregex . '\>"'
 
-syntax match   juliaRangeKeyword	display contained "\<\%(begin\|end\)\>"
+syntax match   juliaRangeKeyword	contained "\<\%(begin\|end\)\>"
 
 syntax match   juliaBaseTypeBasic	display "\<\%(\%(N\|Named\)\?Tuple\|Symbol\|Function\|Union\%(All\)\?\|Type\%(Name\|Var\)\?\|Any\|ANY\|Vararg\|Ptr\|Exception\|Module\|Expr\|DataType\|\%(LineNumber\|Quote\)Node\|\%(Weak\|Global\)\?Ref\|Method\|Pair\|Val\|Nothing\|Some\|Missing\)\>"
 syntax match   juliaBaseTypeNum		display "\<\%(U\?Int\%(8\|16\|32\|64\|128\)\?\|Float\%(16\|32\|64\)\|Complex\|Bool\|Char\|Number\|Signed\|Unsigned\|Integer\|AbstractFloat\|Real\|Rational\|\%(Abstract\)\?Irrational\|Enum\|BigInt\|BigFloat\|MathConst\|ComplexF\%(16\|32\|64\)\)\>"
@@ -201,11 +214,9 @@ syntax match   juliaConstIO		display "\<\%(std\%(out\|in\|err\)\|devnull\)\>"
 syntax match   juliaConstC		display "\<\%(C_NULL\)\>"
 syntax match   juliaConstGeneric	display "\<\%(nothing\|Main\|undef\|missing\)\>"
 
-exec 'syntax match   juliaFunctionDef	contained transparent "\%(\<function\s\+\)\@'.s:d(20).'<=' . s:idregex . '\%(\.' . s:idregex . '\)*\ze\s\+\%(end\>\|$\)" contains=juliaFunctionName'
-exec 'syntax region  juliaFunctionDefP	contained transparent start="\%(\<function\s\+\)\@'.s:d(20).'<=' . s:idregex . '\%(\.' . s:idregex . '\)*\s*(" end=")\@'.s:d(1).'<=" contains=juliaFunctionName,juliaParBlock'
-exec 'syntax match   juliaFunctionName	contained "\%(\<function\s\+\)\@'.s:d(20).'<=' . s:idregex . '\%(\.' . s:idregex . '\)*"'
+exec 'syntax region  juliaParamTypeR	transparent start="' . s:idregex . '\%(\.' . s:idregex . '\)*\s*{" end="}\@'.s:d(1).'<=" contains=juliaType,@juliaExpressions'
 
-syntax match   juliaPossibleMacro	transparent "@" contains=juliaMacroCall,juliaMacroCallP,juliaPrintfMacro
+syntax match   juliaPossibleMacro	transparent "@" contains=juliaMacroCall,juliaMacroCallP,juliaPrintfMacro,juliaDocMacro
 
 exec 'syntax match   juliaMacro		contained "@' . s:idregex . '\%(\.' . s:idregex . '\)*"'
 syntax match   juliaMacro		contained "@[!.~$%^*/\\|<>+-]\ze[^0-9]"
@@ -253,11 +264,11 @@ exec 'syntax match   juliaNumber	contained "' . s:int_regex . '" contains=juliaC
 exec 'syntax match   juliaFloat		contained "' . s:float_regex . '" contains=juliaComplexUnit'
 syntax match   juliaComplexUnit		display	contained "\<im\>"
 
-exec 'syntax match   juliaOperator	"' . s:operators . '"'
 syntax match   juliaRangeOperator	display ":"
+exec 'syntax match   juliaOperator	"' . s:operators . '"'
 exec 'syntax region  juliaTernaryRegion	matchgroup=juliaTernaryOperator start="\s\zs?\ze\s" skip="\%(:\(:\|[^:[:space:]'."'".'"({[]\+\s*\ze:\)\|\%(?\s*\)\@'.s:d(6).'<=:(\)" end=":" contains=@juliaExpressions,juliaErrorSemicol'
 
-let s:interp_dollar = '\([' . s:nonidS_chars . s:uniop_chars . s:binop_chars . '!?]\|^\)\@'.s:d(1).'<=\$'
+let s:interp_dollar = '\([' . s:nonidS_chars . s:uniop_chars . s:binop_chars . '!]\|^\)\@'.s:d(1).'<=\$'
 
 exec 'syntax match   juliaDollarVar	display contained "' . s:interp_dollar . s:idregex . '"'
 exec 'syntax region  juliaDollarPar	matchgroup=juliaDollarVar contained start="' .s:interp_dollar . '(" end=")" contains=@juliaExpressions'
@@ -269,7 +280,7 @@ syntax match   juliaChar		display "'\\x\x\{2\}'" contains=juliaHexEscapeChar
 syntax match   juliaChar		display "'\\u\x\{1,4\}'" contains=juliaUniCharSmall
 syntax match   juliaChar		display "'\\U\x\{1,8\}'" contains=juliaUniCharLarge
 
-exec 'syntax match   juliaCTransOperator	"[[:space:]}' . s:nonid_chars . s:uniop_chars . s:binop_chars . '!?]\@'.s:d(1).'<!\.\?' . "'" . '"'
+exec 'syntax match   juliaCTransOperator	"[[:space:]}' . s:nonid_chars . s:uniop_chars . s:binop_chars . '!]\@'.s:d(1).'<!\.\?' . "'" . 'ᵀ\?"'
 
 " TODO: some of these might be specialized; the rest could be just left to the
 "       generic juliaStringPrefixed fallback
@@ -293,6 +304,9 @@ syntax region  juliaPrintfMacro		contained transparent start="@s\?printf\s\+" en
 syntax region  juliaPrintfParBlock	contained matchgroup=juliaParDelim start="(" end=")" contains=@juliaExprsPrintf
 syntax region  juliaPrintfString	contained matchgroup=juliaStringDelim start=+"+ skip=+\%(\\\\\)*\\"+ end=+"+ contains=@juliaSpecialChars,@juliaPrintfChars
 
+exec 'syntax region  juliaDocMacro	contained transparent start=+@doc\s\+\%(' . s:idregex . '\%(\.' . s:idregex . '\)*\)\?\z("\%(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\(\z1\)\@'.s:d(3).'<=+ contains=juliaMacro,juliaDocStringM'
+syntax region  juliaDocStringM		contained fold matchgroup=juliaDocStringDelim fold start=+\z\("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaStringVars,@juliaSpecialChars,@juliaSpellcheckDocStrings
+
 syntax region  juliaShellString		matchgroup=juliaStringDelim start=+`+ skip=+\%(\\\\\)*\\`+ end=+`+ contains=@juliaStringVars,juliaSpecialChar
 
 syntax cluster juliaStringVars		contains=juliaStringVarsPar,juliaStringVarsSqBra,juliaStringVarsCurBra,juliaStringVarsPla
@@ -326,7 +340,7 @@ syntax match   juliaPrintfFmt		display contained "\\%%"hs=s+1
 syntax match   juliaPossibleSymbol	transparent ":\ze[^:]" contains=juliaSymbol,juliaQuotedParBlock,juliaQuotedQMarkPar,juliaColon
 
 let s:quotable = '\%(' . s:idregex . '\|?\|' . s:operators . '\|' . s:float_regex . '\|' . s:int_regex . '\)'
-let s:quoting_colon = '\%(\%(^\s*\|\s\{6,\}\|[' . s:nonid_chars . s:uniop_chars . s:binop_chars . '?]\s*\)\@'.s:d(6).'<=\|\%(\<\%(return\|if\|else\%(if\)\?\|while\|try\|begin\)\s\+\)\@'.s:d(9).'<=\)\zs:'
+let s:quoting_colon = '\%(\%(^\s*\|\s\{6,\}\|[' . s:nonid_chars . s:uniop_chars . s:binop_chars . ']\s*\)\@'.s:d(6).'<=\|\%(\<\%(return\|if\|else\%(if\)\?\|while\|try\|begin\)\s\+\)\@'.s:d(9).'<=\)\zs:'
 let s:quoting_colonS = '\s\@'.s:d(1).'<=:'
 
 " note: juliaSymbolS only works within whitespace-sensitive contexts,
@@ -336,7 +350,7 @@ let s:quoting_colonS = '\s\@'.s:d(1).'<=:'
 " (Note that such `a :b` expressions only allows at most 5 spaces between
 " the identifier and the colon anyway.)
 
-exec 'syntax match   juliaSymbol	contained "' .s:quoting_colon . s:quotable . '"'
+exec 'syntax match   juliaSymbol	contained "' . s:quoting_colon . s:quotable . '"'
 exec 'syntax match   juliaSymbolS	contained "' . s:quoting_colonS . s:quotable . '"'
 
 " same as above for quoted expressions such as :(expr)
@@ -346,7 +360,14 @@ exec 'syntax region   juliaQuotedParBlockS	matchgroup=juliaQParDelim contained s
 
 
 " force precedence over Symbols
-syntax match   juliaOperator		display "::"
+exec 'syntax match   juliaTypeOperatorR	transparent "[<>:]:\s*\%(' . s:idregex . '\.\)*' . s:idregex . '" contains=juliaTypeOperator,juliaType,@juliaExpressions'
+exec 'syntax match   juliaTypeOperatorR	transparent "' . s:idregex . '\%(\.' . s:idregex . '\)*\s*[<>]:\s*\%(\%(' . s:idregex . '\.\)*' . s:idregex . '\)\?" contains=juliaTypeOperator,juliaType,@juliaExpressions'
+exec 'syntax match   juliaTypeOperatorR	transparent "\<isa\s\+\%(' . s:idregex . '\.\)*' . s:idregex . '" contains=juliaIsaKeyword,juliaType,@juliaExpressions'
+syntax match   juliaTypeOperator	contained "[:<>]:"
+syntax match   juliaIsaKeyword		contained "\<isa\>"
+
+syntax match   juliaWhereKeyword       	"\<where\>"
+exec 'syntax match   juliaWhereR	transparent "\<where\s\+' . s:idregex . '" contains=juliaWhereKeyword,juliaType,juliaTypeOperatorR'
 
 syntax region  juliaCommentL		matchgroup=juliaCommentDelim excludenl start="#\ze\%([^=]\|$\)" end="$" contains=juliaTodo,@juliaSpellcheckComments
 syntax region  juliaCommentM		matchgroup=juliaCommentDelim fold start="#=\ze\%([^#]\|$\)" end="=#" contains=juliaTodo,juliaCommentM,@juliaSpellcheckComments
@@ -370,15 +391,19 @@ exec 'syntax match   juliaMacroName		"@' . s:idregex . '\%(\.' . s:idregex . '\)
 hi def link juliaParDelim		juliaNone
 hi def link juliaSemicolon		juliaNone
 hi def link juliaComma			juliaNone
+hi def link juliaFunctionCall		juliaNone
 
 hi def link juliaColon			juliaOperator
 
 hi def link juliaFunctionName		juliaFunction
+hi def link juliaFunctionName1		juliaFunction
 hi def link juliaMacroName		juliaMacro
 
 
 hi def link juliaKeyword		Keyword
+hi def link juliaWhereKeyword		Keyword
 hi def link juliaInfixKeyword		Keyword
+hi def link juliaIsaKeyword		Keyword
 hi def link juliaAsKeyword		Keyword
 hi def link juliaRepKeyword		Keyword
 hi def link juliaBlKeyword		Keyword
@@ -408,6 +433,8 @@ hi def link juliaBaseTypeDisplay	Type
 hi def link juliaBaseTypeTime		Type
 hi def link juliaBaseTypeOther		Type
 
+hi def link juliaType			Type
+
 " NOTE: deprecated constants are not highlighted as such. For once,
 " one can still legitimately use them by importing Base.MathConstants.
 " Plus, one-letter variables like `e` and `γ` can be used with other
@@ -458,6 +485,7 @@ hi def link juliaint128String		juliaString
 hi def link juliaPrintfString		juliaString
 hi def link juliaShellString		juliaString
 hi def link juliaDocString		juliaString
+hi def link juliaDocStringM		juliaDocString
 hi def link juliaStringDelim		juliaString
 hi def link juliaDocStringDelim		juliaDocString
 hi def link juliaStringVarsPla		Identifier
@@ -484,6 +512,7 @@ hi def link juliaOperator		juliaOperatorHL
 hi def link juliaRangeOperator		juliaOperatorHL
 hi def link juliaCTransOperator		juliaOperatorHL
 hi def link juliaTernaryOperator	juliaOperatorHL
+hi def link juliaTypeOperator		juliaOperatorHL
 
 hi def link juliaCommentL		Comment
 hi def link juliaCommentM		Comment
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index 762c3068b..c3ad6884e 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -78,8 +78,8 @@ syn match ktComment "/\*\*/"
 
 syn match ktSpecialCharError "\v\\." contained
 syn match ktSpecialChar "\v\\([tbnr'"$\\]|u\x{4})" contained
-syn region ktString start='"' skip='\\"' end='"' contains=ktSimpleInterpolation,ktComplexInterpolation,ktSpecialChar,ktSpecialCharError
-syn region ktString start='"""' end='""""*' contains=ktSimpleInterpolation,ktComplexInterpolation
+syn region ktString start='"' skip='\\"' end='"' contains=ktSimpleInterpolation,ktComplexInterpolation,ktSpecialChar,ktSpecialCharError,@Spell
+syn region ktString start='"""' end='""""*' contains=ktSimpleInterpolation,ktComplexInterpolation,@Spell
 syn match ktCharacter "\v'[^']*'" contains=ktSpecialChar,ktSpecialCharError
 syn match ktCharacter "\v'\\''" contains=ktSpecialChar
 syn match ktCharacter "\v'[^\\]'"
diff --git a/syntax/llvm.vim b/syntax/llvm.vim
index 57bb3d6ff..cc5f50bb0 100644
--- a/syntax/llvm.vim
+++ b/syntax/llvm.vim
@@ -18,7 +18,7 @@ syn case match
 " Types.
 " Types also include struct, array, vector, etc. but these don't
 " benefit as much from having dedicated highlighting rules.
-syn keyword llvmType void half float double x86_fp80 fp128 ppc_fp128
+syn keyword llvmType void half bfloat float double x86_fp80 fp128 ppc_fp128
 syn keyword llvmType label metadata x86_mmx
 syn keyword llvmType type label opaque token
 syn match   llvmType /\<i\d\+\>/
@@ -207,6 +207,7 @@ syn match   llvmConstant /\<DIFlag[A-Za-z]\+\>/
 syn match  llvmSpecialComment /;\s*PR\d*\s*$/
 syn match  llvmSpecialComment /;\s*REQUIRES:.*$/
 syn match  llvmSpecialComment /;\s*RUN:.*$/
+syn match  llvmSpecialComment /;\s*ALLOW_RETRIES:.*$/
 syn match  llvmSpecialComment /;\s*CHECK:.*$/
 syn match  llvmSpecialComment "\v;\s*CHECK-(NEXT|NOT|DAG|SAME|LABEL):.*$"
 syn match  llvmSpecialComment /;\s*XFAIL:.*$/
diff --git a/syntax/mlir.vim b/syntax/mlir.vim
new file mode 100644
index 000000000..9bfd7f35a
--- /dev/null
+++ b/syntax/mlir.vim
@@ -0,0 +1,122 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'syntax/mlir.vim')
+  finish
+endif
+
+" Vim syntax file
+" Language:   mlir
+" Maintainer: The MLIR team, http://github.com/tensorflow/mlir/
+" Version:      $Revision$
+" Some parts adapted from the LLVM vim syntax file.
+
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+" Types.
+syn keyword mlirType index f16 f32 f64
+" Integer type.
+syn match mlirType /\<i\d\+\>/
+
+" Elemental types inside memref, tensor, or vector types.
+syn match mlirType /x\s*\zs\(f16\|f32\|f64\|i\d\+\)/
+
+" Shaped types.
+syn match mlirType /\<memref\ze\s*<.*>/
+syn match mlirType /\<tensor\ze\s*<.*>/
+syn match mlirType /\<vector\ze\s*<.*>/
+
+" vector types inside memref or tensor.
+syn match mlirType /x\s*\zsvector/
+
+" Operations.
+" Core ops (not exhaustive yet).
+" TODO: the list is not exhaustive.
+syn keyword mlirOps alloc alloca addf addi call call_indirect cmpf cmpi constant
+syn keyword mlirOps dealloc divf dma_start dma_wait dim extract_element
+syn keyword mlirOps getTensor index_cast load memref_cast memref_shape_cast
+syn keyword mlirOps mulf muli negf prefetch sitofp splat store select subf subi
+syn keyword mlirOps subview tensor_cast view
+
+" Affine ops.
+syn match mlirOps /\<affine\.apply\>/
+syn match mlirOps /\<affine\.dma_start\>/
+syn match mlirOps /\<affine\.dma_wait\>/
+syn match mlirOps /\<affine\.for\>/
+syn match mlirOps /\<affine\.if\>/
+syn match mlirOps /\<affine\.load\>/
+syn match mlirOps /\<affine\.prefetch\>/
+syn match mlirOps /\<affine\.store\>/
+syn match mlirOps /\<loop\.for\>/
+syn match mlirOps /\<loop\.if\>/
+
+" TODO: dialect name prefixed ops (llvm or std).
+
+" Keywords.
+syn keyword mlirKeyword
+      \ affine_map
+      \ affine_set
+      \ dense
+      \ else
+      \ func
+      \ module
+      \ return
+      \ step
+      \ to
+
+" Misc syntax.
+
+syn match   mlirNumber /-\?\<\d\+\>/
+" Match numbers even in shaped types.
+syn match   mlirNumber /-\?\<\d\+\ze\s*x/
+syn match   mlirNumber /x\s*\zs-\?\d\+\ze\s*x/
+
+syn match   mlirFloat  /-\?\<\d\+\.\d*\(e[+-]\d\+\)\?\>/
+syn match   mlirFloat  /\<0x\x\+\>/
+syn keyword mlirBoolean true false
+syn match   mlirComment /\/\/.*$/
+syn region  mlirString start=/"/ skip=/\\"/ end=/"/
+syn match   mlirLabel /[-a-zA-Z$._][-a-zA-Z$._0-9]*:/
+syn match   mlirIdentifier /[%@][a-zA-Z$._-][a-zA-Z0-9$._-]*/
+syn match   mlirIdentifier /[%@!]\d\+\>/
+syn match mlirMapSetOutline "#.*$"
+
+" Syntax-highlight lit test commands and bug numbers.
+syn match  mlirSpecialComment /\/\/\s*RUN:.*$/
+syn match  mlirSpecialComment /\/\/\s*CHECK:.*$/
+syn match  mlirSpecialComment "\v\/\/\s*CHECK-(NEXT|NOT|DAG|SAME|LABEL):.*$"
+syn match  mlirSpecialComment /\/\/\s*expected-error.*$/
+syn match  mlirSpecialComment /\/\/\s*expected-remark.*$/
+syn match  mlirSpecialComment /;\s*XFAIL:.*$/
+syn match  mlirSpecialComment /\/\/\s*PR\d*\s*$/
+syn match  mlirSpecialComment /\/\/\s*REQUIRES:.*$/
+
+if version >= 508 || !exists("did_c_syn_inits")
+  if version < 508
+    let did_c_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink mlirType Type
+  HiLink mlirOps Statement
+  HiLink mlirMapSetOutline PreProc
+  HiLink mlirNumber Number
+  HiLink mlirComment Comment
+  HiLink mlirString String
+  HiLink mlirLabel Label
+  HiLink mlirKeyword Keyword
+  HiLink mlirBoolean Boolean
+  HiLink mlirFloat Float
+  HiLink mlirConstant Constant
+  HiLink mlirSpecialComment SpecialComment
+  HiLink mlirIdentifier Identifier
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "mlir"
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index ce454db06..d872826c4 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -35,8 +35,6 @@ syntax keyword svelteKeyword slot contained containedin=htmlTag
 "   https://github.com/mxw/vim-jsx/blob/master/after/syntax/jsx.vim
 syntax region svelteExpression start="{" end="" contains=jsBlock,javascriptBlock containedin=htmlString,htmlTag,htmlArg,htmlValue,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,htmlHead,htmlTitle,htmlBoldItalicUnderline,htmlUnderlineBold,htmlUnderlineItalicBold,htmlUnderlineBoldItalic,htmlItalicUnderline,htmlItalicBold,htmlItalicBoldUnderline,htmlItalicUnderlineBold,htmlLink,htmlLeadingSpace,htmlBold,htmlBoldUnderline,htmlBoldItalic,htmlBoldUnderlineItalic,htmlUnderline,htmlUnderlineItalic,htmlItalic,htmlStrike,javaScript
 
-syntax region svelteSurroundingTag contained start=+<\(script\|style\|template\)+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
-
 " Block conditionals.
 syntax match svelteConditional "#if" contained containedin=jsBlock,javascriptBlock
 syntax match svelteConditional "/if" contained containedin=jsBlock,javascriptBlock
@@ -117,6 +115,8 @@ for s:language in s:languages
   endif
 endfor
 
+syntax region svelteSurroundingTag contained start=+<\(script\|style\|template\)+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
+
 " Cybernetically enhanced web apps.
 let b:current_syntax = "svelte"
 

From 3c5fca7621a1f5e53911195ebb6e7c777fad8031 Mon Sep 17 00:00:00 2001
From: Sezi <marek.sezemsky@gmail.com>
Date: Wed, 14 Apr 2021 11:56:21 +0200
Subject: [PATCH 235/299] Eeplace array slice with while loops for Vim 7.4
 (#677)

Workaround for:

   E117: Unknown function: i:len
   E15: Invalid expression: rtp[i:len(rtp)-1]
---
 autoload/polyglot/init.vim | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index d76343f0d..1784f4e1a 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -3609,19 +3609,22 @@ func! s:process_rtp(rtp)
   " Then vim-polyglot
   call add(result, s:base)
   " Then all other files, until after-files
-  for path in rtp[i:len(rtp)-1]
+  while i < len(rtp)
+    let path = rtp[i]
     if match(path, '[/\\]after$') > -1
       break
     endif
     call add(result, path)
     let i = i + 1
-  endfor
+  endwhile
   " Then vim-polyglot after path
   call add(result, s:base . '/after')
   " Then all other after paths
-  for path in rtp[i:len(rtp)-1]
+  while i < len(rtp)
+    let path = rtp[i]
     call add(result, path)
-  endfor
+    let i = i + 1
+  endwhile
   " User's after directory is always last
   call add(result, a:rtp[len(a:rtp)-1])
   return result

From 9e45c07a8d2eb77a1d276f762a448f42a33a47c6 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Apr 2021 11:59:14 +0200
Subject: [PATCH 236/299] Update

---
 README.md                           |   4 +-
 after/ftplugin/requirements.vim     |  40 ++++++
 after/indent/javascript-2.vim       |   2 +-
 after/indent/php.vim                |   2 +-
 after/indent/typescript.vim         |   2 +-
 after/syntax/javascript/graphql.vim |   2 +-
 after/syntax/php/graphql.vim        |   2 +-
 after/syntax/reason/graphql.vim     |   5 +-
 after/syntax/typescript/graphql.vim |   2 +-
 autoload/LaTeXtoUnicode.vim         | 190 ++++++++++++++++++++--------
 autoload/csv.vim                    |  17 ++-
 autoload/fsharp.vim                 |   1 +
 autoload/go/config.vim              |   8 +-
 autoload/graphql.vim                |   2 +-
 autoload/polyglot/init.vim          |   6 +-
 autoload/polyglot/sleuth.vim        |   6 +-
 autoload/requirements.vim           |   2 +-
 autoload/zig/fmt.vim                |  16 +--
 extras/filetype.vim                 |  24 +++-
 ftplugin/fortran.vim                |  15 ++-
 ftplugin/graphql.vim                |   2 +-
 ftplugin/lisp.vim                   |   2 +-
 ftplugin/racket.vim                 |   2 +-
 ftplugin/raku.vim                   |  48 +++----
 ftplugin/zig.vim                    |   4 +-
 indent/cdl.vim                      |  12 +-
 indent/graphql.vim                  |   2 +-
 indent/julia.vim                    |   4 +-
 packages.yaml                       |   2 +-
 syntax/dot.vim                      | 126 ++++++++++--------
 syntax/elixir.vim                   |  11 +-
 syntax/fortran.vim                  |  19 ++-
 syntax/git.vim                      |  25 ++--
 syntax/gitrebase.vim                |   4 +-
 syntax/gotexttmpl.vim               |   4 +-
 syntax/graphql.vim                  |   2 +-
 syntax/html.vim                     |  69 ++++------
 syntax/javascript.vim               |   2 +-
 syntax/julia.vim                    |  15 +--
 syntax/kotlin.vim                   |   4 +-
 syntax/meson.vim                    |   1 +
 syntax/nroff.vim                    |  38 +++---
 syntax/plantuml.vim                 |   4 +-
 syntax/requirements.vim             |   2 +-
 syntax/sshconfig.vim                |  12 +-
 syntax/sshdconfig.vim               |   9 +-
 syntax/sudoers.vim                  |   7 +-
 47 files changed, 473 insertions(+), 307 deletions(-)
 create mode 100644 after/ftplugin/requirements.vim

diff --git a/README.md b/README.md
index c2fbd8f0c..8e5d4616c 100644
--- a/README.md
+++ b/README.md
@@ -166,7 +166,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [requirements](https://github.com/raimon49/requirements.txt.vim) (Syntax highlighting for pip files)
 - [rspec](https://github.com/keith/rspec.vim)
 - [rst](https://github.com/marshallward/vim-restructuredtext) (reStructuredText syntax highlighting for rst, rest, rest.txt and rst.txt files)
-- [ruby](https://github.com/vim-ruby/vim-ruby) (Ruby and HTML+ERB syntax highlighting for rb, builder, eye, fcgi, gemspec and 25 more files)
+- [ruby](https://github.com/vim-ruby/vim-ruby) (Ruby and HTML+ERB syntax highlighting for rb, builder, eye, fcgi, gemspec and 26 more files)
 - [rust](https://github.com/rust-lang/rust.vim) (Rust syntax highlighting for rs and rs.in files)
 - [scala](https://github.com/derekwyatt/vim-scala) (Scala syntax highlighting for scala, kojo and sc files)
 - [scss](https://github.com/cakebaker/scss-syntax.vim) (SCSS syntax highlighting for scss files)
@@ -198,7 +198,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [velocity](https://github.com/lepture/vim-velocity) (Syntax highlighting for vm files)
 - [vue](https://github.com/posva/vim-vue) (Vue syntax highlighting for vue and wpy files)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (Syntax highlighting for xdc files)
-- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 95 more files)
+- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 96 more files)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax) (XSLT syntax highlighting for xslt and xsl files)
 - [yard](https://github.com/noprompt/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting for zep files)
diff --git a/after/ftplugin/requirements.vim b/after/ftplugin/requirements.vim
new file mode 100644
index 000000000..6c3e1d244
--- /dev/null
+++ b/after/ftplugin/requirements.vim
@@ -0,0 +1,40 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'requirements', 'after/ftplugin/requirements.vim')
+  finish
+endif
+
+" the Requirements File Format syntax support for Vim
+" Version: 1.6.0
+" Author:  raimon <raimon49@hotmail.com>
+" License: MIT LICENSE
+" The MIT License (MIT)
+"
+" Copyright (c) 2015 raimon
+"
+" Permission is hereby granted, free of charge, to any person obtaining a copy
+" of this software and associated documentation files (the "Software"), to deal
+" in the Software without restriction, including without limitation the rights
+" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+" copies of the Software, and to permit persons to whom the Software is
+" furnished to do so, subject to the following conditions:
+"
+" The above copyright notice and this permission notice shall be included in all
+" copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+" SOFTWARE.
+if executable('pip-compile')
+    let s:filename = expand("%:p")
+    if fnamemodify(s:filename, ":t") ==# 'requirements.in'
+        " this is the default filename for pip-compile
+        setlocal makeprg=pip-compile
+    elseif fnamemodify(s:filename, ":e") ==# 'in'
+        \ && Requirements_matched_filename(s:filename)
+        setlocal makeprg=pip-compile\ %
+    endif
+endif
+" vim: et sw=4 ts=4 sts=4:
diff --git a/after/indent/javascript-2.vim b/after/indent/javascript-2.vim
index ad32e2848..6037664a2 100644
--- a/after/indent/javascript-2.vim
+++ b/after/indent/javascript-2.vim
@@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/indent/javas
   finish
 endif
 
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+" Copyright (c) 2016-2021 Jon Parise <jon@indelible.org>
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
 " of this software and associated documentation files (the "Software"), to
diff --git a/after/indent/php.vim b/after/indent/php.vim
index 65534a8c2..7ed602f8d 100644
--- a/after/indent/php.vim
+++ b/after/indent/php.vim
@@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/indent/php.v
   finish
 endif
 
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+" Copyright (c) 2016-2021 Jon Parise <jon@indelible.org>
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
 " of this software and associated documentation files (the "Software"), to
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
index ba107504f..08c1e9915 100644
--- a/after/indent/typescript.vim
+++ b/after/indent/typescript.vim
@@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/indent/types
   finish
 endif
 
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+" Copyright (c) 2016-2021 Jon Parise <jon@indelible.org>
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
 " of this software and associated documentation files (the "Software"), to
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index d13ae9fb6..f76f0fab8 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/javas
   finish
 endif
 
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+" Copyright (c) 2016-2021 Jon Parise <jon@indelible.org>
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
 " of this software and associated documentation files (the "Software"), to
diff --git a/after/syntax/php/graphql.vim b/after/syntax/php/graphql.vim
index 00c9811b4..958a3753d 100644
--- a/after/syntax/php/graphql.vim
+++ b/after/syntax/php/graphql.vim
@@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/php/g
   finish
 endif
 
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+" Copyright (c) 2016-2021 Jon Parise <jon@indelible.org>
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
 " of this software and associated documentation files (the "Software"), to
diff --git a/after/syntax/reason/graphql.vim b/after/syntax/reason/graphql.vim
index 74a88a5d4..af28b8e4e 100644
--- a/after/syntax/reason/graphql.vim
+++ b/after/syntax/reason/graphql.vim
@@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/reaso
   finish
 endif
 
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+" Copyright (c) 2016-2021 Jon Parise <jon@indelible.org>
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
 " of this software and associated documentation files (the "Software"), to
@@ -38,4 +38,5 @@ if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
 
-syntax region graphqlExtensionPoint matchgroup=Noise start=+\[%graphql\_s*{|+lc=10 end=+|}\_s*]+he=s+1 contains=@GraphQLSyntax keepend
+syntax region graphqlExtensionPoint start=+\[%graphql+ end=+\]+ contains=graphqlExtensionPointS
+syntax region graphqlExtensionPointS matchgroup=String start=+{|+ end=+|}+ contains=@GraphQLSyntax contained
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index 6db06513a..950550062 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/types
   finish
 endif
 
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+" Copyright (c) 2016-2021 Jon Parise <jon@indelible.org>
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
 " of this software and associated documentation files (the "Software"), to
diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index fed230320..2be1a4927 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -12,28 +12,14 @@ function! s:L2U_Setup()
 
   " Keep track of whether LaTeX-to-Unicode is activated
   " (used when filetype changes)
-  if !has_key(b:, "l2u_enabled")
-    let b:l2u_enabled = 0
-  endif
-  if !has_key(b:, "l2u_autodetect_enable")
-    let b:l2u_autodetect_enable = 1
-  endif
+  let b:l2u_enabled = get(b:, "l2u_enabled", 0)
+  let b:l2u_autodetect_enable = get(b:, "l2u_autodetect_enable", 1)
 
-  " Did we install the L2U tab mappings?
-  if !has_key(b:, "l2u_tab_set")
-    let b:l2u_tab_set = 0
-  endif
-  if !has_key(b:, "l2u_cmdtab_set")
-    let b:l2u_cmdtab_set = 0
-  endif
-  if !has_key(b:, "l2u_keymap_set")
-    let b:l2u_keymap_set = 0
-  endif
-
-  " Did we activate the L2U as-you-type substitutions?
-  if !has_key(b:, "l2u_autosub_set")
-    let b:l2u_autosub_set = 0
-  endif
+  " Did we install the L2U tab/as-you-type/keymap... mappings?
+  let b:l2u_tab_set = get(b:, "l2u_tab_set", 0)
+  let b:l2u_cmdtab_set = get(b:, "l2u_cmdtab_set", 0)
+  let b:l2u_autosub_set = get(b:, "l2u_autosub_set", 0)
+  let b:l2u_keymap_set = get(b:, "l2u_keymap_set", 0)
 
   " Following are some flags used to pass information between the function which
   " attempts the LaTeX-to-Unicode completion and the fallback function
@@ -77,17 +63,19 @@ function! s:L2U_SetupGlobal()
     let g:latex_to_unicode_suggestions = 0
   endif
 
-  " A hack to forcibly get out of completion mode: feed
-  " this string with feedkeys()
-  if has("win32") || has("win64")
-    let s:l2u_esc_sequence = "\u0006"
-  else
-    let s:l2u_esc_sequence = "\u0091\b"
-  end
+  " Forcibly get out of completion mode: feed
+  " this string with feedkeys(s:l2u_esc_sequence, 'n')
+  let s:l2u_esc_sequence = " \b"
 
   " Trigger for the previous mapping of <Tab>
   let s:l2u_fallback_trigger = "\u0091L2UFallbackTab"
 
+  " Trigger for the previous mapping of <CR>
+  let s:l2u_fallback_trigger_cr = "\u0091L2UFallbackCR"
+
+  " Trigger for autosub completion cleanup autocommand
+  let s:l2u_autosub_cleanup_trigger = "\u0091L2UAutosubCleanup"
+
 endfunction
 
 " Each time the filetype changes, we may need to enable or
@@ -203,7 +191,7 @@ function! s:L2U_ismatch()
   if col0 == -1
     return 0
   endif
-  let base = l[col0 : col1-1]
+  let base = l[col0:col1-2]
   return has_key(g:l2u_symbols_dict, base)
 endfunction
 
@@ -258,8 +246,14 @@ function! LaTeXtoUnicode#completefunc(findstart, base)
       let b:l2u_in_fallback = 0
       return -3
     endif
+    " make sure that the options are still set
+    " (it may happen that <C-X><C-U> itself triggers the fallback before
+    " restarting, thus reseetting them; this happens when the prompt is
+    " waiting for ^U^N^P during a partial completion)
     call s:L2U_SetCompleteopt()
+    " setup the cleanup/fallback operations when we're done
     call s:L2U_InsertCompleteDoneAutocommand()
+    call s:L2U_InsertInsertLeaveAutocommand()
     " set info for the callback
     let b:l2u_found_completion = 1
     " analyse current line
@@ -345,48 +339,83 @@ function! LaTeXtoUnicode#PutLiteral(k)
   return ''
 endfunction
 
+function! LaTeXtoUnicode#PutLiteralCR()
+  call feedkeys('
', 'ni')
+  return ''
+endfunction
+
 " Function which saves the current insert-mode mapping of a key sequence `s`
 " and associates it with another key sequence `k` (e.g. stores the current
-" <Tab> mapping into the Fallback trigger)
+" <Tab> mapping into the Fallback trigger).
+" It returns the previous maparg dictionary, so that the previous mapping can
+" be reinstated if needed.
 function! s:L2U_SetFallbackMapping(s, k)
   let mmdict = maparg(a:s, 'i', 0, 1)
   if empty(mmdict)
     exe 'inoremap <buffer> ' . a:k . ' ' . a:s
-    return
+    return mmdict
   endif
   let rhs = mmdict["rhs"]
   if rhs =~# '^<Plug>L2U'
-    return
+    return mmdict
   endif
   let pre = '<buffer>'
-  if mmdict["silent"]
-    let pre = pre . '<silent>'
-  endif
-  if mmdict["expr"]
-    let pre = pre . '<expr>'
-  endif
+  let pre = pre . (mmdict["silent"] ? '<silent>' : '')
+  let pre = pre . (mmdict["expr"] ? '<expr>' : '')
   if mmdict["noremap"]
     let cmd = 'inoremap '
   else
     let cmd = 'imap '
     " This is a nasty hack used to prevent infinite recursion. It's not a
-    " general solution.
+    " general solution. Also, it doesn't work with <CR> since that stops
+    " parsing of the <C-R>=... expression, so we need to special-case it.
+    " Also, if the original mapping was intended to be recursive, this
+    " will break it.
     if mmdict["expr"]
-      let rhs = substitute(rhs, '\c' . a:s, "\<C-R>=LaTeXtoUnicode#PutLiteral('" . a:s . "')\<CR>", 'g')
+      if a:s != "<CR>"
+        let rhs = substitute(rhs, '\c' . a:s, "\<C-R>=LaTeXtoUnicode#PutLiteral('" . a:s . "')\<CR>", 'g')
+      else
+        let rhs = substitute(rhs, '\c' . a:s, "\<C-R>=LaTeXtoUnicode#PutLiteralCR()\<CR>", 'g')
+      endif
+      " Make the mapping silent even if it wasn't originally
+      if !mmdict["silent"]
+        let pre = pre . '<silent>'
+      endif
     endif
   endif
   exe cmd . pre . ' ' . a:k . ' ' . rhs
+  return mmdict
+endfunction
+
+" Reinstate a mapping from the maparg dict returned by SetFallbackMapping
+" (only if buffer-local, since otherwise it should still be available)
+function! s:L2U_ReinstateMapping(mmdict)
+  if empty(a:mmdict) || !a:mmdict["buffer"]
+    return ''
+  endif
+  let lhs = a:mmdict["lhs"]
+  let rhs = a:mmdict["rhs"]
+  if rhs =~# '^<Plug>L2U'
+    return ''
+  endif
+  let pre = '<buffer>'
+  let pre = pre . (a:mmdict["silent"] ? '<silent>' : '')
+  let pre = pre . (a:mmdict["expr"] ? '<expr>' : '')
+  let cmd = a:mmdict["noremap"] ? 'inoremap ' : 'imap '
+  exe cmd . pre . ' ' . lhs . ' ' . rhs
 endfunction
 
 " This is the function which is mapped to <Tab>
 function! LaTeXtoUnicode#Tab()
   " the <Tab> is passed through to the fallback mapping if the completion
   " menu is present, and it hasn't been raised by the L2U tab, and there
-  " isn't an exact match before the cursor when suggestions are disabled
-  if pumvisible() && !b:l2u_tab_completing && (get(g:, "latex_to_unicode_suggestions", 1) || !s:L2U_ismatch())
+  " isn't an exact match before the cursor
+  if pumvisible() && !b:l2u_tab_completing && !s:L2U_ismatch()
     call feedkeys(s:l2u_fallback_trigger)
     return ''
   endif
+  " ensure that we start completion with some reasonable options
+  call s:L2U_SetCompleteopt()
   " reset the in_fallback info
   let b:l2u_in_fallback = 0
   let b:l2u_tab_completing = 1
@@ -497,7 +526,7 @@ function! s:L2U_RestoreCompleteopt()
 endfunction
 
 function! s:L2U_InsertCompleteDoneAutocommand()
-  augroup L2UTab
+  augroup L2UCompleteDone
     autocmd! * <buffer>
     " Every time a L2U completion finishes, the fallback may be invoked
     autocmd CompleteDone <buffer> call LaTeXtoUnicode#FallbackCallback()
@@ -505,8 +534,22 @@ function! s:L2U_InsertCompleteDoneAutocommand()
 endfunction
 
 function! s:L2U_RemoveCompleteDoneAutocommand()
-  augroup L2UTab
+  augroup L2UCompleteDone
+    autocmd! * <buffer>
+  augroup END
+endfunction
+
+function s:L2U_InsertLeaveClenup()
+    call s:L2U_ResetLastCompletionInfo()
+    augroup L2UInsertLeave
+      autocmd! * <buffer>
+    augroup END
+endfunction
+
+function! s:L2U_InsertInsertLeaveAutocommand()
+  augroup L2UInsertLeave
     autocmd! * <buffer>
+    autocmd InsertLeave <buffer> call s:L2U_InsertLeaveClenup()
   augroup END
 endfunction
 
@@ -537,12 +580,12 @@ function! s:L2U_SetTab(wait_insert_enter)
   endif
 
   " Backup the previous completefunc (the check is probably not really needed)
-  if get(b:, "prev_completefunc", "") != "LaTeXtoUnicode#completefunc"
-    let b:prev_completefunc = &completefunc
+  if get(b:, "l2u_prev_completefunc", "") != "LaTeXtoUnicode#completefunc"
+    let b:l2u_prev_completefunc = &completefunc
   endif
   setlocal completefunc=LaTeXtoUnicode#completefunc
 
-  call s:L2U_SetFallbackMapping('<Tab>', s:l2u_fallback_trigger)
+  let b:l2u_prev_map_tab = s:L2U_SetFallbackMapping('<Tab>', s:l2u_fallback_trigger)
   imap <buffer> <Tab> <Plug>L2UTab
   inoremap <buffer><expr> <Plug>L2UTab LaTeXtoUnicode#Tab()
 
@@ -560,10 +603,10 @@ function! s:L2U_UnsetTab()
   if !b:l2u_tab_set
     return
   endif
-  exec "setlocal completefunc=" . get(b:, "prev_completefunc", "")
+  exec "setlocal completefunc=" . get(b:, "l2u_prev_completefunc", "")
   iunmap <buffer> <Tab>
   if empty(maparg("<Tab>", "i"))
-    call s:L2U_SetFallbackMapping(s:l2u_fallback_trigger, '<Tab>')
+    call s:L2U_ReinstateMapping(b:l2u_prev_map_tab)
   endif
   iunmap <buffer> <Plug>L2UTab
   exe 'iunmap <buffer> ' . s:l2u_fallback_trigger
@@ -572,13 +615,25 @@ endfunction
 
 " Function which looks for viable LaTeX-to-Unicode supstitutions as you type
 function! LaTeXtoUnicode#AutoSub(...)
+  " avoid recursive calls
+  if get(b:, "l2u_in_autosub", 0)
+    return ''
+  endif
   let vc = a:0 == 0 ? v:char : a:1
+  " for some reason function keys seem to be passed as characters 149 (F1-F12)
+  " or 186 (F13-F37, these are entered with shift/ctrl). In such cases, we
+  " can't really do any better than giving up.
+  if char2nr(vc) == 149 || char2nr(vc) == 186
+    return ''
+  endif
+  let b:l2u_in_autosub = 1
   let col1 = col('.')
   let lnum = line('.')
   if col1 == 1
     if a:0 > 1
-      call feedkeys(a:2, 'n')
+      call feedkeys(a:2, 't')
     endif
+    let b:l2u_in_autosub = 0
     return ''
   endif
   let bs = (vc != "\n")
@@ -586,21 +641,42 @@ function! LaTeXtoUnicode#AutoSub(...)
   let col0 = match(l, '\\\%([_^]\?[A-Za-z]\+\%' . col1 . 'c\%([^A-Za-z]\|$\)\|[_^]\%([0-9()=+-]\)\%' . col1 .'c\%(.\|$\)\)')
   if col0 == -1
     if a:0 > 1
-      call feedkeys(a:2, 'n')
+      call feedkeys(a:2, 't')
     endif
+    let b:l2u_in_autosub = 0
     return ''
   endif
-  let base = l[col0 : -1-bs]
+  let base = l[col0 : col1-1-bs]
   let unicode = get(g:l2u_symbols_dict, base, '')
   if empty(unicode)
     if a:0 > 1
-      call feedkeys(a:2, 'n')
+      call feedkeys(a:2, 't')
     endif
+    let b:l2u_in_autosub = 0
     return ''
   endif
+
+  " create a temporary mapping to reset b:l2u_in_autosub when done
+  " (when invoked, it removes itself)
+  exec 'imap <buffer> ' . s:l2u_autosub_cleanup_trigger . ' <Plug>L2UAutosubReset'
+  inoremap <buffer><expr> <Plug>L2UAutosubReset <SID>L2U_AutosubReset()
+
+  " perform the substitution, wrapping it in undo breakpoints so that
+  " we can revert it as a whole
   call feedkeys("\<C-G>u", 'n')
   call feedkeys(repeat("\b", len(base) + bs) . unicode . vc . s:l2u_esc_sequence, 'nt')
   call feedkeys("\<C-G>u", 'n')
+  " enqueue the reset mechanism
+  call feedkeys(s:l2u_autosub_cleanup_trigger)
+  return ''
+endfunction
+
+function! s:L2U_AutosubReset()
+  " no longer doing substitution
+  let b:l2u_in_autosub = 0
+  " remove the mapping that triggered this function
+  exec 'iunmap <buffer> ' . s:l2u_autosub_cleanup_trigger
+  iunmap <buffer> <Plug>L2UAutosubReset
   return ''
 endfunction
 
@@ -619,8 +695,10 @@ function! s:L2U_SetAutoSub(wait_insert_enter)
   " Viable substitutions are searched at every character insertion via the
   " autocmd InsertCharPre. The <Enter> key does not seem to be catched in
   " this way though, so we use a mapping for that case.
+
+  let b:l2u_prev_map_cr = s:L2U_SetFallbackMapping('<CR>', s:l2u_fallback_trigger_cr)
   imap <buffer> <CR> <Plug>L2UAutoSub
-  inoremap <buffer><expr> <Plug>L2UAutoSub LaTeXtoUnicode#AutoSub("\n", "\<CR>")
+  exec 'inoremap <buffer><expr> <Plug>L2UAutoSub LaTeXtoUnicode#AutoSub("\n", "' . s:l2u_fallback_trigger_cr . '")'
 
   augroup L2UAutoSub
     autocmd! * <buffer>
@@ -637,7 +715,11 @@ function! s:L2U_UnsetAutoSub()
   endif
 
   iunmap <buffer> <CR>
+  if empty(maparg("<CR>", "i"))
+    call s:L2U_ReinstateMapping(b:l2u_prev_map_cr)
+  endif
   iunmap <buffer> <Plug>L2UAutoSub
+  exe 'iunmap <buffer> ' . s:l2u_fallback_trigger_cr
   augroup L2UAutoSub
     autocmd! * <buffer>
   augroup END
diff --git a/autoload/csv.vim b/autoload/csv.vim
index e47ee41d4..d268cd125 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -1989,7 +1989,6 @@ fu! csv#AnalyzeColumn(...) "{{{3
     endif
 
     let  title="Nr\tCount\t % \tValue"
-    endif
     echohl Title
     echo printf("%s", title)
     echohl Normal
@@ -2311,7 +2310,7 @@ fu! csv#CommandDefinitions() "{{{3
     call csv#LocalCmd("NewDelimiter", ':call csv#NewDelimiter(<q-args>, 1, line(''$''))',
         \ '-nargs=1')
     call csv#LocalCmd("Duplicates", ':call csv#CheckDuplicates(<q-args>)',
-        \ '-nargs=1 -complete=custom,csv#CompleteColumnNr')
+        \ '-nargs=? -complete=custom,csv#CompleteColumnNr')
     call csv#LocalCmd('Transpose', ':call csv#Transpose(<line1>, <line2>)',
         \ '-range=%')
     call csv#LocalCmd('CSVTabularize', ':call csv#Tabularize(<bang>0,<line1>,<line2>)',
@@ -2499,12 +2498,16 @@ fu! csv#CompleteColumnNr(A,L,P) "{{{3
     return join(range(1,csv#MaxColumns()), "\n")
 endfu
 fu! csv#CheckDuplicates(list) "{{{3
-    let string = a:list
-    if string =~ '\d\s\?-\s\?\d'
-        let string = substitute(string, '\(\d\+\)\s\?-\s\?\(\d\+\)',
-            \ '\=join(range(submatch(1),submatch(2)), ",")', '')
+    if empty(a:list)
+        let list=[csv#WColumn()]
+    else
+        let string = a:list
+        if string =~ '\d\s\?-\s\?\d'
+            let string = substitute(string, '\(\d\+\)\s\?-\s\?\(\d\+\)',
+                \ '\=join(range(submatch(1),submatch(2)), ",")', '')
+        endif
+        let list=split(string, ',')
     endif
-    let list=split(string, ',')
     call csv#DuplicateRows(list)
 endfu
 fu! csv#Transpose(line1, line2) "{{{3
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index a37a92e7f..89287042d 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -336,6 +336,7 @@ function! s:download(branch)
         \ )
     if v:shell_error == 0
         call system('unzip -o -d ' . s:script_root_dir . "/fsac " . zip)
+        call system('find ' . s:script_root_dir . '/fsac' . ' -type f -exec chmod 777 \{\} \;')
         echom "[FSAC] Updated FsAutoComplete to version " . a:branch . "" 
     else
         echom "[FSAC] Failed to update FsAutoComplete"
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index cafba5f44..d20ead8bb 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -315,7 +315,7 @@ function! go#config#FmtAutosave() abort
 endfunction
 
 function! go#config#ImportsAutosave() abort
-  return get(g:, 'go_imports_autosave', 0)
+  return get(g:, 'go_imports_autosave', 1)
 endfunction
 
 function! go#config#SetFmtAutosave(value) abort
@@ -359,11 +359,11 @@ function! go#config#DeclsMode() abort
 endfunction
 
 function! go#config#FmtCommand() abort
-  return get(g:, "go_fmt_command", "gofmt")
+  return get(g:, "go_fmt_command", go#config#GoplsEnabled() ? 'gopls' : 'gofmt')
 endfunction
 
 function! go#config#ImportsMode() abort
-  return get(g:, "go_imports_mode", "goimports")
+  return get(g:, "go_imports_mode", go#config#GoplsEnabled() ? 'gopls' : 'goimports')
 endfunction
 
 function! go#config#FmtOptions() abort
@@ -388,7 +388,7 @@ function! go#config#RenameCommand() abort
 endfunction
 
 function! go#config#GorenameBin() abort
-  return get(g:, "go_gorename_bin", "gopls")
+  return get(g:, "go_gorename_bin", 'gopls')
 endfunction
 
 function! go#config#GorenamePrefill() abort
diff --git a/autoload/graphql.vim b/autoload/graphql.vim
index 6dc441c6b..135d184a7 100644
--- a/autoload/graphql.vim
+++ b/autoload/graphql.vim
@@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'autoload/graphql.v
   finish
 endif
 
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+" Copyright (c) 2016-2021 Jon Parise <jon@indelible.org>
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
 " of this software and associated documentation files (the "Software"), to
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 1784f4e1a..d21993983 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -1321,7 +1321,7 @@ endif
 
 if !has_key(g:polyglot_is_disabled, 'html')
   au BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
-  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml setf html
+  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.xht,*.xhtml setf html
 endif
 
 if !has_key(g:polyglot_is_disabled, 'hollywood')
@@ -2000,7 +2000,7 @@ if !has_key(g:polyglot_is_disabled, 'rspec')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'ruby')
-  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Routefile,Snapfile,Thorfile,Vagrantfile,[Rr]antfile,buildfile,vagrantfile setf ruby
+  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.prawn,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Routefile,Snapfile,Thorfile,Vagrantfile,[Rr]antfile,buildfile,vagrantfile setf ruby
   au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
   au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml setf eruby
 endif
@@ -2592,7 +2592,7 @@ if !has_key(g:polyglot_is_disabled, 'ant')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rs,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rs,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
 endif
 
 if !has_key(g:polyglot_is_disabled, 'csv')
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 5a7dd3121..afb23ae43 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -229,7 +229,7 @@ let s:globs = {
   \ 'hollywood': '*.hws',
   \ 'hostconf': '',
   \ 'hostsaccess': '',
-  \ 'html': '*.html,*.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml',
+  \ 'html': '*.html,*.htm,*.html.hl,*.inc,*.xht,*.xhtml',
   \ 'html.handlebars': '*.handlebars,*.hbs,*.hdbs,*.hb',
   \ 'html.mustache': '*.mustache,*.hogan,*.hulk,*.hjs',
   \ 'html.twig': '*.twig',
@@ -462,7 +462,7 @@ let s:globs = {
   \ 'rrst': '*.rrst,*.srst',
   \ 'rst': '*.rst,*.rest,*.rest.txt,*.rst.txt',
   \ 'rtf': '*.rtf',
-  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,[Rr]antfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb',
+  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.prawn,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,[Rr]antfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb',
   \ 'rust': '*.rs,*.rs.in',
   \ 'samba': 'smb.conf',
   \ 'sas': '*.sas',
@@ -612,7 +612,7 @@ let s:globs = {
   \ 'xhtml': '*.xhtml,*.xht',
   \ 'xinetd': '',
   \ 'xmath': '*.msc,*.msf',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rs,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rs,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
   \ 'xml.twig': '*.xml.twig',
   \ 'xmodmap': '*Xmodmap,*xmodmap*',
   \ 'xpm': '*.xpm,*.pm',
diff --git a/autoload/requirements.vim b/autoload/requirements.vim
index 717b6210e..3d7837945 100644
--- a/autoload/requirements.vim
+++ b/autoload/requirements.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'requirements', 'autoload/requ
 endif
 
 " the Requirements File Format syntax support for Vim
-" Version: 1.5.3
+" Version: 1.6.0
 " Author:  raimon <raimon49@hotmail.com>
 " License: MIT LICENSE
 " The MIT License (MIT)
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index 3474f34ac..7d7872f98 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -12,11 +12,13 @@ function! zig#fmt#Format() abort
   " Save cursor position and many other things.
   let view = winsaveview()
 
-  let current_buf = bufnr('')
+  if !executable('zig')
+    echohl Error | echomsg "no zig binary found in PATH" | echohl None
+    return
+  endif
 
-  let bin_path = get(g:, 'zig_bin_path', 'zig')
-  let stderr_file = tempname()
-  let cmdline = printf('%s fmt --stdin 2> %s', bin_path, stderr_file)
+  let cmdline = 'zig fmt --stdin'
+  let current_buf = bufnr('')
 
   " The formatted code is output on stdout, the errors go on stderr.
   if exists('*systemlist')
@@ -42,7 +44,7 @@ function! zig#fmt#Format() abort
     call setloclist(0, [], 'r')
     lclose
   elseif get(g:, 'zig_fmt_parse_errors', 1)
-    let errors = s:parse_errors(expand('%'), readfile(stderr_file))
+    let errors = s:parse_errors(expand('%'), out)
 
     call setloclist(0, [], 'r', {
         \ 'title': 'Errors',
@@ -53,11 +55,9 @@ function! zig#fmt#Format() abort
     " Prevent the loclist from becoming too long.
     let win_height = min([max_win_height, len(errors)])
     " Open the loclist, but only if there's at least one error to show.
-    execute 'lwindow ' . win_height
+    execute 'silent! lwindow ' . win_height
   endif
 
-  call delete(stderr_file)
-
   call winrestview(view)
 
   if err != 0
diff --git a/extras/filetype.vim b/extras/filetype.vim
index e39718434..830e0949f 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Jan 21
+" Last Change:	2021 Apr 05
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -168,6 +168,9 @@ au BufNewFile,BufRead *.mar			setf vmasm
 " Atlas
 au BufNewFile,BufRead *.atl,*.as		setf atlas
 
+" Atom is based on XML
+au BufNewFile,BufRead *.atom			setf xml
+
 " Autoit v3
 au BufNewFile,BufRead *.au3			setf autoit
 
@@ -1276,6 +1279,11 @@ au BufNewFile,BufRead .povrayrc			setf povini
 " Povray, Pascal, PHP or assembly
 au BufNewFile,BufRead *.inc			call polyglot#ft#FTinc()
 
+" PowerShell
+au BufNewFile,BufRead	*.ps1,*.psd1,*.psm1,*.pssc	setf ps1
+au BufNewFile,BufRead	*.ps1xml			setf ps1xml
+au BufNewFile,BufRead	*.cdxml,*.psc1			setf xml
+
 " Printcap and Termcap
 au BufNewFile,BufRead *printcap
 	\ let b:ptcap_type = "print" | setf ptcap
@@ -1334,6 +1342,9 @@ au BufNewFile,BufRead *.pml			setf promela
 au BufNewFile,BufRead *.proto			setf proto
 au BufNewFile,BufRead *.pbtxt			setf pbtxt
 
+" Poke
+au BufNewFile,BufRead *.pk      		setf poke
+
 " Protocols
 au BufNewFile,BufRead */etc/protocols		setf protocols
 
@@ -1391,6 +1402,9 @@ else
   au BufNewFile,BufRead *.rmd,*.smd			setf rmd
 endif
 
+" RSS looks like XML
+au BufNewFile,BufRead *.rss				setf xml
+
 " R reStructuredText file
 if has("fname_case")
   au BufNewFile,BufRead *.Rrst,*.rrst,*.Srst,*.srst	setf rrst
@@ -1543,11 +1557,10 @@ au BufNewFile,BufRead catalog			setf catalog
 " Gentoo ebuilds, Arch Linux PKGBUILDs and Alpine Linux APKBUILDs are actually
 " bash scripts.
 " NOTE: Patterns ending in a star are further down, these have lower priority.
-au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.bash,*/{,.}bash[_-]completion{,.d,.sh}{,/*},*.ebuild,*.eclass,PKGBUILD,APKBUILD call polyglot#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .bashrc,bashrc,bash.bashrc,.bash[_-]profile,.bash[_-]logout,.bash[_-]aliases,bash-fc[-.],*.ebuild,*.bash,*.eclass,PKGBUILD,APKBUILD call polyglot#ft#SetFileTypeSH("bash")
 au BufNewFile,BufRead .kshrc,*.ksh call polyglot#ft#SetFileTypeSH("ksh")
 au BufNewFile,BufRead */etc/profile,.profile,*.sh,*.env call polyglot#ft#SetFileTypeSH(getline(1))
 
-
 " Shell script (Arch Linux) or PHP file (Drupal)
 au BufNewFile,BufRead *.install
 	\ if getline(1) =~ '<?php' |
@@ -2216,8 +2229,11 @@ au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
 " SGML catalog file
 au BufNewFile,BufRead sgml.catalog*		call s:StarSetf('catalog')
 
+" avoid doc files being recognized a shell files
+au BufNewFile,BufRead */doc/{,.}bash[_-]completion{,.d,.sh}{,/*} setf text
+
 " Shell scripts ending in a star
-au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,PKGBUILD*,APKBUILD* call polyglot#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,PKGBUILD*,APKBUILD*,*/{,.}bash[_-]completion{,.d,.sh}{,/*} call polyglot#ft#SetFileTypeSH("bash")
 au BufNewFile,BufRead .kshrc* call polyglot#ft#SetFileTypeSH("ksh")
 au BufNewFile,BufRead .profile* call polyglot#ft#SetFileTypeSH(getline(1))
 
diff --git a/ftplugin/fortran.vim b/ftplugin/fortran.vim
index 3c2ebc874..bfca757e7 100644
--- a/ftplugin/fortran.vim
+++ b/ftplugin/fortran.vim
@@ -4,14 +4,14 @@ endif
 
 " Vim settings file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, 77, 66)
-" Version:	(v52) 2020 October 07
+" Version:	(v53) 2021 April 06
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-plugin from Vim
 " Credits:
 "  Version 0.1 was created in September 2000 by Ajit Thakkar.
 "  Since then, useful suggestions and contributions have been made, in order, by:
 "  Stefano Zacchiroli, Hendrik Merx, Ben Fritz, David Barnett, Eisuke Kawashima,
-"  and Doug Kearns.
+"  Doug Kearns, and Fritz Reese.
 
 " Only do these settings when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -70,12 +70,19 @@ endif
 " Set comments and textwidth according to source type
 if (b:fortran_fixed_source == 1)
   setlocal comments=:!,:*,:C
-  " Fixed format requires a textwidth of 72 for code
-  setlocal tw=72
+  " Fixed format requires a textwidth of 72 for code,
+  " but some vendor extensions allow longer lines
+  if exists("fortran_extended_line_length")
+    setlocal tw=132
+  elseif exists("fortran_cardimage_line_length")
+    setlocal tw=80
+  else
+    setlocal tw=72
   " If you need to add "&" on continued lines so that the code is
   " compatible with both free and fixed format, then you should do so
   " in column 73 and uncomment the next line
   " setlocal tw=73
+  endif
 else
   setlocal comments=:!
   " Free format allows a textwidth of 132
diff --git a/ftplugin/graphql.vim b/ftplugin/graphql.vim
index f06155529..1f9e1df92 100644
--- a/ftplugin/graphql.vim
+++ b/ftplugin/graphql.vim
@@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'ftplugin/graphql.v
   finish
 endif
 
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+" Copyright (c) 2016-2021 Jon Parise <jon@indelible.org>
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
 " of this software and associated documentation files (the "Software"), to
diff --git a/ftplugin/lisp.vim b/ftplugin/lisp.vim
index cc86c720d..e6bd3cb99 100644
--- a/ftplugin/lisp.vim
+++ b/ftplugin/lisp.vim
@@ -8,7 +8,7 @@ endif
 " URL:		 http://sites.google.com/site/khorser/opensource/vim
 " Original author:    Dorai Sitaram <ds26@gte.com>
 " Original URL:		 http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html
-" Last Change:   Oct 23, 2013
+" Last Change:   Mar 10, 2021
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/ftplugin/racket.vim b/ftplugin/racket.vim
index 8dd74d7f6..f7f57a385 100644
--- a/ftplugin/racket.vim
+++ b/ftplugin/racket.vim
@@ -34,7 +34,7 @@ setl lispwords+=match-letrec,match-define,match-define-values
 setl lisp
 
 " Enable auto begin new comment line when continuing from an old comment line
-setl comments+=:;
+setl comments=:;;;;,:;;;,:;;,:;
 setl formatoptions+=r
 
 setl makeprg=raco\ make\ --\ %
diff --git a/ftplugin/raku.vim b/ftplugin/raku.vim
index 423dd7867..ea2536b58 100644
--- a/ftplugin/raku.vim
+++ b/ftplugin/raku.vim
@@ -31,7 +31,7 @@ setlocal commentstring=#%s
 "---------------------------------------------
 setlocal include=\\<\\(use\\\|require\\)\\>
 setlocal includeexpr=substitute(v:fname,'::','/','g')
-setlocal suffixesadd=.pm6,.pm,.raku,.rakutest,.t6
+setlocal suffixesadd=.rakumod,.rakudoc,.pm6,.pm
 setlocal define=[^A-Za-z_]
 
 " The following line changes a global variable but is necessary to make
@@ -42,39 +42,23 @@ setlocal define=[^A-Za-z_]
 set isfname+=:
 setlocal iskeyword=@,48-57,_,192-255,-
 
-" Set this once, globally.
-if !exists("perlpath")
-    if executable("perl6")
-        try
-            if &shellxquote != '"'
-                let perlpath = system('perl6 -e  "@*INC.join(q/,/).say"')
-            else
-                let perlpath = system("perl6 -e  '@*INC.join(q/,/).say'")
-            endif
-            let perlpath = substitute(perlpath,',.$',',,','')
-        catch /E145:/
-            let perlpath = ".,,"
-        endtry
-    else
-        " If we can't call perl to get its path, just default to using the
-        " current directory and the directory of the current file.
-        let perlpath = ".,,"
-    endif
-endif
+" Raku exposes its CompUnits through $*REPO, but mapping module names to
+" compunit paths is nontrivial. Probably it's more convenient to rely on
+" people using zef, which has a handy store of sources for modules it has
+" installed.
+func s:compareReverseFtime(a, b)
+    let atime = getftime(a:a)
+    let btime = getftime(a:b)
+    return atime > btime ? -1 : atime == btime ? 0 : 1
+endfunc
 
-" Append perlpath to the existing path value, if it is set.  Since we don't
-" use += to do it because of the commas in perlpath, we have to handle the
-" global / local settings, too.
-if &l:path == ""
-    if &g:path == ""
-        let &l:path=perlpath
-    else
-        let &l:path=&g:path.",".perlpath
-    endif
-else
-    let &l:path=&l:path.",".perlpath
+let &l:path = "lib,."
+if exists('$RAKULIB')
+    let &l:path = &l:path . "," . $RAKULIB
 endif
-"---------------------------------------------
+let &l:path = &l:path . "," . join(
+            \ sort(glob("~/.zef/store/*/*/lib", 0, 1), "s:compareReverseFtime"),
+            \ ',')
 
 " Convert ascii-based ops into their single-character unicode equivalent
 if get(g:, 'raku_unicode_abbrevs', 0)
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index cb2f3e845..ee5ce79e7 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -47,8 +47,10 @@ if exists("*json_decode") && executable('zig')
     unlet! s:env
 endif
 
+let &l:formatprg = 'zig fmt --stdin'
+
 let b:undo_ftplugin =
-    \ 'setl isk< et< ts< sts< sw< fo< sua< mp< com< cms< inex< inc< pa<'
+    \ 'setl isk< et< ts< sts< sw< fo< sua< mp< com< cms< inex< inc< pa< fp<'
 
 let &cpo = s:cpo_orig
 unlet s:cpo_orig
diff --git a/indent/cdl.vim b/indent/cdl.vim
index 9c261276f..4c679e838 100644
--- a/indent/cdl.vim
+++ b/indent/cdl.vim
@@ -66,10 +66,14 @@ fun! CdlGetIndent(lnum)
   " PREVIOUS LINE
   let ind = indent(lnum)
   let line = getline(lnum)
-  let f = -1 " wether a '=' is a conditional or a asignment, -1 means we don't know yet
-  " one 'closing' element at the beginning of the line has already reduced the
-  "   indent, but 'else', 'elseif' & 'then' increment it for the next line
-  " '=' at the beginning has already de right indent (increased for asignments)
+
+  " Whether a '=' is a conditional or an assignment. -1 means we don't know
+  " yet.
+  " One 'closing' element at the beginning of the line has already reduced the
+  " indent, but 'else', 'elseif' & 'then' increment it for the next line.
+  " '=' at the beginning already has the right indent (increased for
+  " asignments).
+  let f = -1
   let inicio = matchend(line, '^\c\s*\(else\a*\|then\|endif\|/[*/]\|[);={]\)')
   if inicio > 0
     let c = line[inicio-1]
diff --git a/indent/graphql.vim b/indent/graphql.vim
index 97c563090..f6b6fccac 100644
--- a/indent/graphql.vim
+++ b/indent/graphql.vim
@@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'indent/graphql.vim
   finish
 endif
 
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+" Copyright (c) 2016-2021 Jon Parise <jon@indelible.org>
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
 " of this software and associated documentation files (the "Software"), to
diff --git a/indent/julia.vim b/indent/julia.vim
index b40823c02..fe53789cd 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -295,8 +295,8 @@ function IsFunctionArgPar(lnum, c)
   if a:c == 0
     return 0
   endif
-  let stack = map(synstack(a:lnum, a:c), 'synIDattr(v:val, "name")')
-  return len(stack) >= 3 && stack[-3] == 'juliaFunctionDefP'
+  let stack = map(synstack(a:lnum, a:c-1), 'synIDattr(v:val, "name")')
+  return len(stack) >= 2 && stack[-2] ==# 'juliaFunctionDef'
 endfunction
 
 function JumpToMatch(lnum, last_closed_bracket)
diff --git a/packages.yaml b/packages.yaml
index a102eebca..7021f3e19 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -887,7 +887,7 @@ globs:
 - '**/htmldjango.vim'
 filetypes:
 - name: htmldjango
-  linguist: HTML+Django
+  linguist: Jinja 
   ignore_warnings:
   # handled by mustache plugin
   - mustache
diff --git a/syntax/dot.vim b/syntax/dot.vim
index 1bb1032b3..f48f60f40 100644
--- a/syntax/dot.vim
+++ b/syntax/dot.vim
@@ -2,19 +2,25 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'dot', 'syntax/dot.vim')
   finish
 endif
 
-" Vim syntax file
 " Language:     Dot
 " Filenames:    *.dot
 " Maintainer:   Markus Mottl  <markus.mottl@gmail.com>
 " URL:          http://www.ocaml.info/vim/syntax/dot.vim
-" Last Change:  2011 May 17 - improved identifier matching + two new keywords
+" Last Change:  2021 Mar 24 - better attr + escape string matching, new keywords (Farbod Salamat-Zadeh)
+"               2011 May 17 - improved identifier matching + two new keywords
 "               2001 May 04 - initial version
 
-" quit when a syntax file was already loaded
-if exists("b:current_syntax")
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
   finish
 endif
 
+let s:keepcpo = &cpo
+set cpo&vim
+
 " Errors
 syn match    dotParErr     ")"
 syn match    dotBrackErr   "]"
@@ -33,39 +39,43 @@ syn keyword  dotTodo contained TODO FIXME XXX
 " Strings
 syn region   dotString    start=+"+ skip=+\\\\\|\\"+ end=+"+
 
-" General keywords
-syn keyword  dotKeyword  digraph node edge subgraph
-
-" Graph attributes
-syn keyword  dotType center layers margin mclimit name nodesep nslimit
-syn keyword  dotType ordering page pagedir rank rankdir ranksep ratio
-syn keyword  dotType rotate size
-
-" Node attributes
-syn keyword  dotType distortion fillcolor fontcolor fontname fontsize
-syn keyword  dotType height layer orientation peripheries regular
-syn keyword  dotType shape shapefile sides skew width
+" Escape strings
+syn match    dotEscString /\v\\(N|G|E|T|H|L)/ containedin=dotString
+syn match    dotEscString /\v\\(n|l|r)/       containedin=dotString
 
-" Edge attributes
-syn keyword  dotType arrowhead arrowsize arrowtail constraint decorateP
-syn keyword  dotType dir headclip headlabel headport labelangle labeldistance
-syn keyword  dotType labelfontcolor labelfontname labelfontsize
-syn keyword  dotType minlen port_label_distance samehead sametail
-syn keyword  dotType tailclip taillabel tailport weight
-
-" Shared attributes (graphs, nodes, edges)
-syn keyword  dotType color
-
-" Shared attributes (graphs and edges)
-syn keyword  dotType bgcolor label URL
-
-" Shared attributes (nodes and edges)
-syn keyword  dotType fontcolor fontname fontsize layer style
+" General keywords
+syn keyword  dotKeyword graph digraph subgraph node edge strict
+
+" Node, edge and graph attributes
+syn keyword  dotType _background area arrowhead arrowsize arrowtail bb bgcolor
+      \ center charset class clusterrank color colorscheme comment compound
+      \ concentrate constraint Damping decorate defaultdist dim dimen dir
+      \ diredgeconstraints distortion dpi edgehref edgetarget edgetooltip
+      \ edgeURL epsilon esep fillcolor fixedsize fontcolor fontname fontnames
+      \ fontpath fontsize forcelabels gradientangle group head_lp headclip
+      \ headhref headlabel headport headtarget headtooltip headURL height href
+      \ id image imagepath imagepos imagescale inputscale K label label_scheme
+      \ labelangle labeldistance labelfloat labelfontcolor labelfontname
+      \ labelfontsize labelhref labeljust labelloc labeltarget labeltooltip
+      \ labelURL landscape layer layerlistsep layers layerselect layersep 
+      \ layout len levels levelsgap lhead lheight lp ltail lwidth margin
+      \ maxiter mclimit mindist minlen mode model mosek newrank nodesep 
+      \ nojustify normalize notranslate nslimit nslimit1 ordering orientation
+      \ outputorder overlap overlap_scaling overlap_shrink pack packmode pad
+      \ page pagedir pencolor penwidth peripheries pin pos quadtree quantum
+      \ rank rankdir ranksep ratio rects regular remincross repulsiveforce
+      \ resolution root rotate rotation samehead sametail samplepoints scale
+      \ searchsize sep shape shapefile showboxes sides size skew smoothing
+      \ sortv splines start style stylesheet tail_lp tailclip tailhref 
+      \ taillabel tailport tailtarget tailtooltip tailURL target tooltip
+      \ truecolor URL vertices viewport voro_margin weight width xdotversion 
+      \ xlabel xlp z
 
 " Special chars
 syn match    dotKeyChar  "="
 syn match    dotKeyChar  ";"
 syn match    dotKeyChar  "->"
+syn match    dotKeyChar  "--"
 
 " Identifier
 syn match    dotIdentifier /\<\w\+\(:\w\+\)\?\>/
@@ -75,27 +85,41 @@ syn sync minlines=50
 syn sync maxlines=500
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-
-hi def link dotParErr	 Error
-hi def link dotBraceErr	 Error
-hi def link dotBrackErr	 Error
-
-hi def link dotComment	 Comment
-hi def link dotTodo	 Todo
-
-hi def link dotParEncl	 Keyword
-hi def link dotBrackEncl	 Keyword
-hi def link dotBraceEncl	 Keyword
-
-hi def link dotKeyword	 Keyword
-hi def link dotType	 Type
-hi def link dotKeyChar	 Keyword
-
-hi def link dotString	 String
-hi def link dotIdentifier	 Identifier
-
+" For version 5.7 and earlier: only when not done already
+" For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_dot_syntax_inits")
+  if version < 508
+    let did_dot_syntax_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink dotParErr	 Error
+  HiLink dotBraceErr	 Error
+  HiLink dotBrackErr	 Error
+
+  HiLink dotComment	 Comment
+  HiLink dotTodo	 Todo
+
+  HiLink dotParEncl	 Keyword
+  HiLink dotBrackEncl	 Keyword
+  HiLink dotBraceEncl	 Keyword
+
+  HiLink dotKeyword	 Keyword
+  HiLink dotType	 Type
+  HiLink dotKeyChar	 Keyword
+
+  HiLink dotString	 String
+  HiLink dotEscString	 Keyword
+  HiLink dotIdentifier	 Identifier
+
+  delcommand HiLink
+endif
 
 let b:current_syntax = "dot"
 
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
 " vim: ts=8
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index 871a41574..2c9dd2e5c 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -12,7 +12,7 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-syn cluster elixirNotTop contains=@elixirRegexSpecial,@elixirStringContained,@elixirDeclaration,elixirTodo,elixirArguments,elixirBlockDefinition,elixirUnusedVariable,elixirStructDelimiter
+syn cluster elixirNotTop contains=@elixirRegexSpecial,@elixirStringContained,@elixirDeclaration,elixirTodo,elixirArguments,elixirBlockDefinition,elixirUnusedVariable,elixirStructDelimiter,elixirListDelimiter
 syn cluster elixirRegexSpecial contains=elixirRegexEscape,elixirRegexCharClass,elixirRegexQuantifier,elixirRegexEscapePunctuation
 syn cluster elixirStringContained contains=elixirInterpolation,elixirRegexEscape,elixirRegexCharClass
 syn cluster elixirDeclaration contains=elixirFunctionDeclaration,elixirPrivateFunctionDeclaration,elixirModuleDeclaration,elixirProtocolDeclaration,elixirImplDeclaration,elixirRecordDeclaration,elixirPrivateRecordDeclaration,elixirMacroDeclaration,elixirPrivateMacroDeclaration,elixirDelegateDeclaration,elixirOverridableDeclaration,elixirExceptionDeclaration,elixirCallbackDeclaration,elixirStructDeclaration
@@ -70,12 +70,15 @@ syn match elixirRegexCharClass         "\[:\(alnum\|alpha\|ascii\|blank\|cntrl\|
 
 syn region elixirRegex matchgroup=elixirRegexDelimiter start="%r/" end="/[uiomxfr]*" skip="\\\\" contains=@elixirRegexSpecial
 
-syn region elixirTuple matchgroup=elixirTupleDelimiter start="\(\w\|#\)\@<!{" end="}" contains=ALLBUT,@elixirNotTop
+syn region elixirTuple matchgroup=elixirTupleDelimiter start="\(\w\|#\)\@<!{" end="}" contains=ALLBUT,@elixirNotTop fold
+
+syn match elixirListDelimiter '\[' contained containedin=elixirList
+syn region elixirList matchgroup=elixirListDelimiter start='\[' end='\]' contains=ALLBUT,@elixirNotTop fold
 
 syn match elixirStructDelimiter '{' contained containedin=elixirStruct
-syn region elixirStruct matchgroup=elixirStructDelimiter start="%\(\w\+{\)\@=" end="}" contains=ALLBUT,@elixirNotTop
+syn region elixirStruct matchgroup=elixirStructDelimiter start="%\(\w\+{\)\@=" end="}" contains=ALLBUT,@elixirNotTop fold
 
-syn region elixirMap matchgroup=elixirMapDelimiter start="%{" end="}" contains=ALLBUT,@elixirNotTop
+syn region elixirMap matchgroup=elixirMapDelimiter start="%{" end="}" contains=ALLBUT,@elixirNotTop fold
 
 syn region elixirString  matchgroup=elixirStringDelimiter start=+\z('\)+   end=+\z1+ skip=+\\\\\|\\\z1+  contains=@Spell,@elixirStringContained
 syn region elixirString  matchgroup=elixirStringDelimiter start=+\z("\)+   end=+\z1+ skip=+\\\\\|\\\z1+  contains=@Spell,@elixirStringContained
diff --git a/syntax/fortran.vim b/syntax/fortran.vim
index 6085268bb..209969467 100644
--- a/syntax/fortran.vim
+++ b/syntax/fortran.vim
@@ -4,7 +4,7 @@ endif
 
 " Vim syntax file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
-" Version:	(v103) 2020 October 07
+" Version:	(v104) 2021 April 06
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-syntax from Vim
 " Credits:
@@ -12,10 +12,10 @@ endif
 "  older Fortran 77 syntax file by Mario Eusebio and Preben Guldberg.
 "  Since then, useful suggestions and contributions have been made, in order, by:
 "  Andrej Panjkov, Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile,
-"  Walter Dieudonné, Alexander Wagner, Roman Bertle, Charles Rendleman,
+"  Walter Dieudonne, Alexander Wagner, Roman Bertle, Charles Rendleman,
 "  Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, Jan Hermann,
-"  Stefano Zaghi, Vishnu V. Krishnan, Judicaël Grasset, Takuma Yoshida,
-"  Eisuke Kawashima, and André Chalella.`
+"  Stefano Zaghi, Vishnu V. Krishnan, Judicael Grasset, Takuma Yoshida,
+"  Eisuke Kawashima, Andre Chalella, and Fritz Reese.
 
 if exists("b:current_syntax")
   finish
@@ -364,8 +364,15 @@ syn cluster fortranCommentGroup contains=fortranTodo
 
 if (b:fortran_fixed_source == 1)
   if !exists("fortran_have_tabs")
-    "Flag items beyond column 72
-    syn match fortranSerialNumber	excludenl "^.\{73,}$"lc=72
+    " Fixed format requires a textwidth of 72 for code,
+    " but some vendor extensions allow longer lines
+    if exists("fortran_extended_line_length")
+      syn match fortranSerialNumber	excludenl "^.\{133,}$"lc=132
+    elseif exists("fortran_cardimage_line_length")
+      syn match fortranSerialNumber	excludenl "^.\{81,}$"lc=80
+    else
+      syn match fortranSerialNumber	excludenl "^.\{73,}$"lc=72
+    endif
     "Flag left margin errors
     syn match fortranLabelError	"^.\{-,4}[^0-9 ]" contains=fortranTab
     syn match fortranLabelError	"^.\{4}\d\S"
diff --git a/syntax/git.vim b/syntax/git.vim
index 695566f01..d3d9485e1 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -16,12 +16,12 @@ syn sync minlines=50
 
 syn include @gitDiff syntax/diff.vim
 
-syn region gitHead start=/\%^/ end=/^$/
-syn region gitHead start=/\%(^commit\%( \x\{40\}\)\{1,\}\%(\s*(.*)\)\=$\)\@=/ end=/^$/
+syn region gitHead start=/\%^/ end=/^$/ contains=@NoSpell
+syn region gitHead start=/\%(^commit\%( \x\{40\}\)\{1,\}\%(\s*(.*)\)\=$\)\@=/ end=/^$/ contains=@NoSpell
 
 " For git reflog and git show ...^{tree}, avoid sync issues
-syn match gitHead /^\d\{6\} \%(\w\{4} \)\=\x\{40\}\%( [0-3]\)\=\t.*/
-syn match gitHead /^\x\{40\} \x\{40}\t.*/
+syn match gitHead /^\d\{6\} \%(\w\{4} \)\=\x\{40\}\%( [0-3]\)\=\t.*/ contains=@NoSpell
+syn match gitHead /^\x\{40\} \x\{40}\t.*/ contains=@NoSpell
 
 syn region gitDiff start=/^\%(diff --git \)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff fold
 syn region gitDiff start=/^\%(@@ -\)\@=/ end=/^\%(diff --\%(git\|cc\|combined\) \|$\)\@=/ contains=@gitDiff
@@ -33,11 +33,12 @@ syn match gitDiffAdded "{+[^}]*+}" contained containedin=gitDiff
 syn match gitDiffRemoved "^ \+-.*" contained containedin=gitDiffMerge
 syn match gitDiffRemoved "\[-[^]]*-\]" contained containedin=gitDiff
 
-syn match  gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite
-syn match  gitKeyword /^\%(tag\>\|ref:\)/ contained containedin=gitHead nextgroup=gitReference skipwhite
-syn match  gitKeyword /^Merge:/  contained containedin=gitHead nextgroup=gitHashAbbrev skipwhite
+syn match  gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\|summary\|boundary\|filename\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite contains=@NoSpell
+syn match  gitKeyword /^previous\>/ contained containedin=gitHead nextgroup=gitHash skipwhite contains=@NoSpell
+syn match  gitKeyword /^\%(tag\>\|ref:\)/ contained containedin=gitHead nextgroup=gitReference skipwhite contains=@NoSpell
+syn match  gitKeyword /^Merge:/  contained containedin=gitHead nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
 syn match  gitMode    /^\d\{6\}\>/ contained containedin=gitHead nextgroup=gitType,gitHash skipwhite
-syn match  gitIdentityKeyword /^\%(author\|committer\|tagger\)\>/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
+syn match  gitIdentityKeyword /^\%(author\|committer\|tagger\)\%(-mail\|-time\|-tz\)\=\>/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
 syn match  gitIdentityHeader /^\%(Author\|Commit\|Tagger\):/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
 syn match  gitDateHeader /^\%(AuthorDate\|CommitDate\|Date\):/ contained containedin=gitHead nextgroup=gitDate skipwhite
 
@@ -51,10 +52,10 @@ syn match  gitDate      /\<\d\+ \l\+ ago\>/                    contained
 syn match  gitType      /\<\%(tag\|commit\|tree\|blob\)\>/     contained nextgroup=gitHash skipwhite
 syn match  gitStage     /\<\d\t\@=/                            contained
 syn match  gitReference /\S\+\S\@!/                            contained
-syn match  gitHash      /\<\x\{40\}\>/                         contained nextgroup=gitIdentity,gitStage,gitHash skipwhite
-syn match  gitHash      /^\<\x\{40\}\>/ containedin=gitHead contained nextgroup=gitHash skipwhite
-syn match  gitHashAbbrev /\<\x\{4,40\}\>/           contained nextgroup=gitHashAbbrev skipwhite
-syn match  gitHashAbbrev /\<\x\{4,39\}\.\.\./he=e-3 contained nextgroup=gitHashAbbrev skipwhite
+syn match  gitHash      /\<\x\{40\}\>/                         contained nextgroup=gitIdentity,gitStage,gitHash skipwhite contains=@NoSpell
+syn match  gitHash      /^\<\x\{40\}\>/ containedin=gitHead contained nextgroup=gitHash skipwhite contains=@NoSpell
+syn match  gitHashAbbrev /\<\x\{4,40\}\>/           contained nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
+syn match  gitHashAbbrev /\<\x\{4,39\}\.\.\./he=e-3 contained nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
 
 syn match  gitIdentity /\S.\{-\} <[^>]*>/ contained nextgroup=gitDate skipwhite
 syn region gitEmail matchgroup=gitEmailDelimiter start=/</ end=/>/ keepend oneline contained containedin=gitIdentity
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index da5f01e86..64a97acb8 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/gitrebase.vim
@@ -14,8 +14,8 @@ endif
 
 syn case match
 
-syn match   gitrebaseHash   "\v<\x{7,}>"                               contained
-syn match   gitrebaseCommit "\v<\x{7,}>"    nextgroup=gitrebaseSummary skipwhite
+syn match   gitrebaseHash   "\v<\x{7,}>"                               contained contains=@NoSpell
+syn match   gitrebaseCommit "\v<\x{7,}>"    nextgroup=gitrebaseSummary skipwhite contains=@NoSpell
 syn match   gitrebasePick   "\v^p%(ick)=>"   nextgroup=gitrebaseCommit skipwhite
 syn match   gitrebaseReword "\v^r%(eword)=>" nextgroup=gitrebaseCommit skipwhite
 syn match   gitrebaseEdit   "\v^e%(dit)=>"   nextgroup=gitrebaseCommit skipwhite
diff --git a/syntax/gotexttmpl.vim b/syntax/gotexttmpl.vim
index cd29987a3..806f71b18 100644
--- a/syntax/gotexttmpl.vim
+++ b/syntax/gotexttmpl.vim
@@ -70,16 +70,14 @@ syn cluster     gotplLiteral     contains=goString,goRawString,goCharacter,@goIn
 syn keyword     gotplControl     contained   if else end range with template
 syn keyword     gotplFunctions   contained   and html index js len not or print printf println urlquery eq ne lt le gt ge
 syn match       gotplVariable    contained   /\$[a-zA-Z0-9_]*\>/
-syn match       goTplIdentifier  contained   /\.[^\s}]+\>/
+syn match       goTplIdentifier  contained   /\.[^[:blank:]}]\+\>/
 
 hi def link     gotplControl        Keyword
 hi def link     gotplFunctions      Function
 hi def link     goTplVariable       Special
 
 syn region gotplAction start="{{" end="}}" contains=@gotplLiteral,gotplControl,gotplFunctions,gotplVariable,goTplIdentifier display
-syn region gotplAction start="\[\[" end="\]\]" contains=@gotplLiteral,gotplControl,gotplFunctions,gotplVariable display
 syn region goTplComment start="{{\(- \)\?/\*" end="\*/\( -\)\?}}" display
-syn region goTplComment start="\[\[\(- \)\?/\*" end="\*/\( -\)\?\]\]" display
 
 hi def link gotplAction PreProc
 hi def link goTplComment Comment
diff --git a/syntax/graphql.vim b/syntax/graphql.vim
index b2266cef7..fc2b79226 100644
--- a/syntax/graphql.vim
+++ b/syntax/graphql.vim
@@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'syntax/graphql.vim
   finish
 endif
 
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
+" Copyright (c) 2016-2021 Jon Parise <jon@indelible.org>
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
 " of this software and associated documentation files (the "Software"), to
diff --git a/syntax/html.vim b/syntax/html.vim
index 2113f12a6..2db2fe2dc 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -7,8 +7,9 @@ endif
 " Previous Maintainer:  Jorge Maldonado Ventura <jorgesumle@freakspot.net>
 " Previous Maintainer:  Claudio Fleiner <claudio@fleiner.com>
 " Repository:           https://notabug.org/jorgesumle/vim-html-syntax
-" Last Change:          2021 Feb 25
+" Last Change:          2021 Mar 02
 "			Included patch #7900 to fix comments
+"			Included patch #7916 to fix a few more things
 "
 
 " Please check :help html.vim for some comments and a description of the options
@@ -83,26 +84,16 @@ syn keyword htmlArg contained usemap ismap valign value vlink vspace width wrap
 syn match   htmlArg contained "\<\(http-equiv\|href\|title\)="me=e-1
 
 " aria attributes
-syn match htmlArg contained "\<\(aria-activedescendant\|aria-atomic\)\>"
-syn match htmlArg contained "\<\(aria-autocomplete\|aria-busy\|aria-checked\)\>"
-syn match htmlArg contained "\<\(aria-colcount\|aria-colindex\|aria-colspan\)\>"
-syn match htmlArg contained "\<\(aria-controls\|aria-current\)\>"
-syn match htmlArg contained "\<\(aria-describedby\|aria-details\)\>"
-syn match htmlArg contained "\<\(aria-disabled\|aria-dropeffect\)\>"
-syn match htmlArg contained "\<\(aria-errormessage\|aria-expanded\)\>"
-syn match htmlArg contained "\<\(aria-flowto\|aria-grabbed\|aria-haspopup\)\>"
-syn match htmlArg contained "\<\(aria-hidden\|aria-invalid\)\>"
-syn match htmlArg contained "\<\(aria-keyshortcuts\|aria-label\)\>"
-syn match htmlArg contained "\<\(aria-labelledby\|aria-level\|aria-live\)\>"
-syn match htmlArg contained "\<\(aria-modal\|aria-multiline\)\>"
-syn match htmlArg contained "\<\(aria-multiselectable\|aria-orientation\)\>"
-syn match htmlArg contained "\<\(aria-owns\|aria-placeholder\|aria-posinset\)\>"
-syn match htmlArg contained "\<\(aria-pressed\|aria-readonly\|aria-relevant\)\>"
-syn match htmlArg contained "\<\(aria-required\|aria-roledescription\)\>"
-syn match htmlArg contained "\<\(aria-rowcount\|aria-rowindex\|aria-rowspan\)\>"
-syn match htmlArg contained "\<\(aria-selected\|aria-setsize\|aria-sort\)\>"
-syn match htmlArg contained "\<\(aria-valuemax\|aria-valuemin\)\>"
-syn match htmlArg contained "\<\(aria-valuenow\|aria-valuetext\)\>"
+exe 'syn match htmlArg contained "\<aria-\%(' . join([
+    \ 'activedescendant', 'atomic', 'autocomplete', 'busy', 'checked', 'colcount',
+    \ 'colindex', 'colspan', 'controls', 'current', 'describedby', 'details',
+    \ 'disabled', 'dropeffect', 'errormessage', 'expanded', 'flowto', 'grabbed',
+    \ 'haspopup', 'hidden', 'invalid', 'keyshortcuts', 'label', 'labelledby', 'level',
+    \ 'live', 'modal', 'multiline', 'multiselectable', 'orientation', 'owns',
+    \ 'placeholder', 'posinset', 'pressed', 'readonly', 'relevant', 'required',
+    \ 'roledescription', 'rowcount', 'rowindex', 'rowspan', 'selected', 'setsize',
+    \ 'sort', 'valuemax', 'valuemin', 'valuenow', 'valuetext'
+    \ ], '\|') . '\)\>"'
 syn keyword htmlArg contained role
 
 " Netscape extensions
@@ -143,25 +134,19 @@ syn match htmlSpecialChar "&#\=[0-9A-Za-z]\{1,8};"
 
 " Comments (the real ones or the old netscape ones)
 if exists("html_wrong_comments")
-  syn region htmlComment                start=+<!--+    end=+--\s*>+ contains=@Spell
+  syn region htmlComment        start=+<!--+    end=+--\s*>+    contains=@Spell
 else
-  " The HTML 5.2 syntax 8.2.4.41-42: bogus comment is parser error; browser skips until next &gt;
-  " Note: must stand first to get lesser :syn-priority
-  syn region htmlComment                start=+<!+      end=+>+     contains=htmlCommentError
-  " Normal comment opening <!-- ...>
-  syn region htmlComment                start=+<!--+    end=+>+     contains=htmlCommentPart,@Spell
-  " Idem 8.2.4.43-44: <!--> and <!---> are parser errors; browser treats as comments
-  syn match htmlComment "<!---\?>" contains=htmlCommentError
-  " Idem 8.2.4.51: any number of consecutive dashes within comment is okay; --> closes comment
-  " Idem 8.2.4.52: closing comment by dash-dash-bang (--!>) is error ignored by parser(!); closes comment
-  syn region htmlCommentPart  contained start=+--+      end=+--!\?>+me=e-1  contains=htmlCommentNested,@htmlPreProc,@Spell
-  " Idem 8.2.4.49: opening nested comment <!-- is parser error, ignored by browser, except <!--> is all right
-  syn match htmlCommentNested contained "<!--[^>]"me=e-1
-  syn match htmlCommentNested contained "<!--->"me=e-3
-  syn match htmlCommentNested contained "<!---\?!>"me=e-4
-  syn match htmlCommentError contained "[^><!]"
+  " The HTML 5.2 syntax 8.2.4.41: bogus comment is parser error; browser skips until next &gt
+  syn region htmlComment        start=+<!+      end=+>+         contains=htmlCommentError keepend
+  " Idem 8.2.4.42,51: Comment starts with <!-- and ends with -->
+  " Idem 8.2.4.43,44: Except <!--> and <!---> are parser errors
+  " Idem 8.2.4.52: dash-dash-bang (--!>) is error ignored by parser, also closes comment
+  syn region htmlComment matchgroup=htmlComment start=+<!--\%(-\?>\)\@!+        end=+--!\?>+    contains=htmlCommentNested,@htmlPreProc,@Spell keepend
+  " Idem 8.2.4.49: nested comment is parser error, except <!--> is all right
+  syn match htmlCommentNested contained "<!-->\@!"
+  syn match htmlCommentError  contained "[^><!]"
 endif
-syn region htmlComment                  start=+<!DOCTYPE+ keepend end=+>+
+syn region htmlComment  start=+<!DOCTYPE+       end=+>+ keepend
 
 " server-parsed commands
 syn region htmlPreProc start=+<!--#+ end=+-->+ contains=htmlPreStmt,htmlPreError,htmlPreAttr
@@ -282,7 +267,7 @@ hi def link htmlEndTag                  Identifier
 hi def link htmlArg                     Type
 hi def link htmlTagName                 htmlStatement
 hi def link htmlSpecialTagName          Exception
-hi def link htmlValue                     String
+hi def link htmlValue                   String
 hi def link htmlSpecialChar             Special
 
 if !exists("html_no_rendering")
@@ -326,14 +311,10 @@ hi def link htmlPreProc            PreProc
 hi def link htmlPreAttr            String
 hi def link htmlPreProcAttrName    PreProc
 hi def link htmlPreProcAttrError   Error
-hi def link htmlSpecial            Special
-hi def link htmlSpecialChar        Special
 hi def link htmlString             String
 hi def link htmlStatement          Statement
 hi def link htmlComment            Comment
-hi def link htmlCommentPart        Comment
-hi def link htmlValue              String
-hi def link htmlCommentNested      htmlCommentError
+hi def link htmlCommentNested      htmlError
 hi def link htmlCommentError       htmlError
 hi def link htmlTagError           htmlError
 hi def link htmlEvent              javaScript
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 615862dc3..415430245 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -58,7 +58,7 @@ syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=
 syntax region  jsString           start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1+ end=+$+  contains=jsSpecial extend
 syntax region  jsTemplateString   start=+`+  skip=+\\`+  end=+`+     contains=jsTemplateExpression,jsSpecial extend
 syntax match   jsTaggedTemplate   /\<\K\k*\ze`/ nextgroup=jsTemplateString
-syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\x\+\)\>/
+syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\%(\x\|_\)\+\)\>/
 syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\c\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%(e[+-]\=\d\+\)\=\>/
 
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 1a08f62d3..2849439b3 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -68,7 +68,7 @@ let s:idregex = '\%([^' . s:nonidS_chars . '0-9!' . s:uniop_chars . s:binop_char
 
 let s:operators = '\%(' . '\.\%([-+*/^÷%|&!]\|//\|\\\|<<\|>>>\?\)\?=' .
       \           '\|'  . '[:$<>]=\|||\|&&\||>\|<|\|<:\|>:\|::\|<<\|>>>\?\|//\|[-=]>\|\.\{3\}' .
-      \           '\|'  . '[' . s:uniop_chars . '!$]' .
+      \           '\|'  . '\.\?[' . s:uniop_chars . '!]' .
       \           '\|'  . '\.\?[' . s:binop_chars . s:binop_chars_extra . ']' .
       \           '\)'
 
@@ -132,12 +132,11 @@ syntax region  juliaCurBraBlock		matchgroup=juliaParDelim start="{" end="}" cont
 
 exec 'syntax match   juliaType		contained "' . s:idregex . '\%(\.' . s:idregex . '\)*"'
 
-exec 'syntax region  juliaFunctionCallR	transparent start="' . s:idregex . '\%(\.' . s:idregex . '\)*\s*(" end=")\@'.s:d(1).'<=" contains=juliaFunctionCall,juliaParBlock'
+exec 'syntax region  juliaFunctionCallR	transparent start="' . s:idregex . '\%(\.' . s:idregex . '\)*\.\?(" end=")\@'.s:d(1).'<=" contains=juliaFunctionCall,juliaParBlock'
 exec 'syntax match   juliaFunctionCall	contained "\%(' . s:idregex . '\.\)*\zs' . s:idregex . '"'
 
 " note: we would in principle add a "s:nodot" before function/macro/struct/... but it shouldn't come up in valid code
-exec 'syntax match   juliaFunctionDef	contained transparent "\%(\<\%(function\|macro\)\s\+\)\@'.s:d(20).'<=' . s:idregex . '\%(\.' . s:idregex . '\)*\ze\s\+\%(end\>\|$\)" contains=juliaFunctionName'
-exec 'syntax region  juliaFunctionDefP	contained transparent start="\%(\<\%(function\|macro\)\s\+\)\@'.s:d(20).'<=' . s:idregex . '\%(\.' . s:idregex . '\)*\s*(" end=")\@'.s:d(1).'<=" contains=juliaFunctionName,juliaParBlock'
+exec 'syntax match   juliaFunctionDef	contained transparent "\%(\<\%(function\|macro\)\)\@'.s:d(8).'<=\s\+\zs' . s:idregex . '\%(\.' . s:idregex . '\)*\ze\s*\%((\|\send\>\|$\)" contains=juliaFunctionName'
 exec 'syntax match   juliaFunctionName	contained "\%(\<\%(function\|macro\)\s\+\)\@'.s:d(20).'<=\%(' . s:idregex . '\.\)*\zs' . s:idregex . '"'
 
 exec 'syntax match   juliaStructR	contained transparent "\%(\<\%(\%(mutable\s\+\)\?struct\|\%(abstract\|primitive\)\s\+type\)\s\+\)\@'.s:d(20).'<=\%(' . s:idregex . '\.\)*' . s:idregex . '\>\(\s*(\)\@!" contains=juliaType'
@@ -157,8 +156,8 @@ exec 'syntax region  juliaConditionalEBlock	matchgroup=juliaConditional transpar
 exec 'syntax region  juliaWhileBlock		matchgroup=juliaRepeat start="'.s:nodot.'\<while\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaForBlock		matchgroup=juliaRepeat start="'.s:nodot.'\<for\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaOuter fold'
 exec 'syntax region  juliaBeginBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<begin\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
-exec 'syntax region  juliaFunctionBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<function\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaFunctionDef,juliaFunctionDefP fold'
-exec 'syntax region  juliaMacroBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<macro\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaFunctionDef,juliaFunctionDefP fold'
+exec 'syntax region  juliaFunctionBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<function\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaFunctionDef fold'
+exec 'syntax region  juliaMacroBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<macro\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaFunctionDef fold'
 exec 'syntax region  juliaQuoteBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<quote\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
 exec 'syntax region  juliaStructBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaStructR fold'
 exec 'syntax region  juliaMutableStructBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<mutable\s\+struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaStructR fold'
@@ -214,7 +213,7 @@ syntax match   juliaConstIO		display "\<\%(std\%(out\|in\|err\)\|devnull\)\>"
 syntax match   juliaConstC		display "\<\%(C_NULL\)\>"
 syntax match   juliaConstGeneric	display "\<\%(nothing\|Main\|undef\|missing\)\>"
 
-exec 'syntax region  juliaParamTypeR	transparent start="' . s:idregex . '\%(\.' . s:idregex . '\)*\s*{" end="}\@'.s:d(1).'<=" contains=juliaType,@juliaExpressions'
+exec 'syntax region  juliaParamTypeR	transparent start="' . s:idregex . '{" end="}\@'.s:d(1).'<=" contains=juliaType,@juliaExpressions'
 
 syntax match   juliaPossibleMacro	transparent "@" contains=juliaMacroCall,juliaMacroCallP,juliaPrintfMacro,juliaDocMacro
 
@@ -383,7 +382,7 @@ syntax cluster juliaContinuationItems	contains=juliaContinuationComma,juliaConti
 exec 'syntax region  juliaContinuationComma	matchgroup=juliaComma contained start=",\ze'.s:eol.'" end="\n\+\ze." contains=@juliaCommentItems'
 exec 'syntax region  juliaContinuationColon	matchgroup=juliaColon contained start=":\ze'.s:eol.'" end="\n\+\ze." contains=@juliaCommentItems'
 exec 'syntax region  juliaContinuationNone	matchgroup=NONE contained start="\%(\<\%(import\|using\|export\)\>\|^\)\@'.s:d(6).'<=\ze'.s:eol.'" end="\n\+\ze." contains=@juliaCommentItems,juliaAsKeyword'
-exec 'syntax match   juliaMacroName		"@' . s:idregex . '\%(\.' . s:idregex . '\)*"'
+exec 'syntax match   juliaMacroName		contained "@' . s:idregex . '\%(\.' . s:idregex . '\)*"'
 
 " the following are disabled by default, but
 " can be enabled by entering e.g.
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index c3ad6884e..9da75fa99 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language: Kotlin
 " Maintainer: Alexander Udalov
-" Latest Revision: 17 February 2021
+" Latest Revision: 11 April 2021
 
 if exists('b:current_syntax')
     finish
@@ -61,7 +61,7 @@ syn match ktModifier "\v<(data|value)>\ze\@=.*<class>"
 syn match ktModifier "\v<(tailrec|operator|infix|suspend)>\ze\@=.*<fun>"
 syn match ktModifier "\v<(const)>\ze\@=.*<val>"
 syn match ktModifier "\v<(lateinit)>\ze\@=.*<var>"
-syn match ktModifier "\v<(internal|private|protected|public)>\ze\@=.*<(class|fun|val|var|typealias)>"
+syn match ktModifier "\v<(internal|private|protected|public)>\ze\@=.*<(class|object|fun|val|var|typealias|constructor)>"
 
 syn match ktOperator "\v\?:|::|\<\=? | \>\=?|[!=]\=\=?|<as>\??|[-!%&*+/|]"
 
diff --git a/syntax/meson.vim b/syntax/meson.vim
index 28eab3eab..6efb3c28e 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -123,6 +123,7 @@ syn keyword mesonBuiltin
   \ test
   \ vcs_tag
   \ warning
+  \ range
 
 if exists("meson_space_error_highlight")
   " trailing whitespace
diff --git a/syntax/nroff.vim b/syntax/nroff.vim
index c848ecf90..b085a5dbb 100644
--- a/syntax/nroff.vim
+++ b/syntax/nroff.vim
@@ -4,17 +4,10 @@ endif
 
 " VIM syntax file
 " Language:	nroff/groff
-" Maintainer:	Pedro Alejandro López-Valencia <palopezv@gmail.com>
-" URL:		http://vorbote.wordpress.com/
-" Last Change:	2012 Feb 2
-"
-" {{{1 Acknowledgements
-"
-" ACKNOWLEDGEMENTS:
-"
-" My thanks to Jérôme Plût <Jerome.Plut@ens.fr>, who was the
-" creator and maintainer of this syntax file for several years.
-" May I be as good at it as he has been.
+" Maintainer:	John Marshall <jmarshall@hey.com>
+" Previous Maintainer:	Pedro Alejandro López-Valencia <palopezv@gmail.com>
+" Previous Maintainer:	Jérôme Plût <Jerome.Plut@ens.fr>
+" Last Change:	2021 Mar 28
 "
 " {{{1 Todo
 "
@@ -35,6 +28,13 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
+if exists("nroff_is_groff")
+	let b:nroff_is_groff = 1
+endif
+
+syn spell toplevel
+syn case match
+
 "
 " {{{1 plugin settings...
 "
@@ -52,7 +52,7 @@ endif
 "
 setlocal paragraphs+=XP
 "
-" {{{2 Activate navigation to preporcessor sections.
+" {{{2 Activate navigation to preprocessor sections.
 "
 if exists("b:preprocs_as_sections")
 	setlocal sections=EQTSPS[\ G1GS
@@ -173,9 +173,9 @@ endif
 " <jp />
 
 syn region nroffEquation start=/^\.\s*EQ\>/ end=/^\.\s*EN\>/
-syn region nroffTable start=/^\.\s*TS\>/ end=/^\.\s*TE\>/
+syn region nroffTable start=/^\.\s*TS\>/ end=/^\.\s*TE\>/ contains=@Spell
 syn region nroffPicture start=/^\.\s*PS\>/ end=/^\.\s*PE\>/
-syn region nroffRefer start=/^\.\s*\[\>/ end=/^\.\s*\]\>/
+syn region nroffRefer start=/^\.\s*\[\>/ end=/^\.\s*\]\>/ contains=@Spell
 syn region nroffGrap start=/^\.\s*G1\>/ end=/^\.\s*G2\>/
 syn region nroffGremlin start=/^\.\s*GS\>/ end=/^\.\s*GE|GF\>/
 
@@ -183,11 +183,11 @@ syn region nroffGremlin start=/^\.\s*GS\>/ end=/^\.\s*GE|GF\>/
 " ------------------------------------------------------------
 
 syn region nroffIgnore start=/^[.']\s*ig/ end=/^['.]\s*\./
-syn match nroffComment /\(^[.']\s*\)\=\\".*/ contains=nroffTodo
-syn match nroffComment /^'''.*/  contains=nroffTodo
+syn match nroffComment /\(^[.']\s*\)\=\\".*/ contains=nroffTodo,@Spell
+syn match nroffComment /^'''.*/  contains=nroffTodo,@Spell
 
 if exists("b:nroff_is_groff")
-	syn match nroffComment "\\#.*$" contains=nroffTodo
+	syn match nroffComment "\\#.*$" contains=nroffTodo,@Spell
 endif
 
 syn keyword nroffTodo TODO XXX FIXME contained
@@ -202,7 +202,7 @@ syn keyword nroffTodo TODO XXX FIXME contained
 "
 
 hi def link nroffEscChar nroffSpecialChar
-hi def link nroffEscCharAr nroffSpecialChar
+hi def link nroffEscCharArg nroffSpecialChar
 hi def link nroffSpecialChar SpecialChar
 hi def link nroffSpace Delimiter
 
@@ -215,7 +215,7 @@ hi def link nroffEscPar nroffEscape
 hi def link nroffEscRegPar nroffEscape
 hi def link nroffEscArg nroffEscape
 hi def link nroffSize nroffEscape
-hi def link nroffEscape Preproc
+hi def link nroffEscape PreProc
 
 hi def link nroffIgnore Comment
 hi def link nroffComment Comment
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index c562bb82c..9b235afbe 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -99,7 +99,7 @@ syntax match plantumlNoteMultiLineStart /\%(^\s*[rh]\?\%(note\|legend\)\)\@<=\s\
 " Class
 syntax region plantumlClass
       \ start=/\%(\%(class\|interface\|object\)\s[^{]\+\)\@<=\zs{/
-      \ end=/^\s*}/ 
+      \ end=/^\s*}/
       \ contains=plantumlClassArrows,
       \          plantumlClassKeyword,
       \          @plantumlClassOp,
@@ -128,7 +128,7 @@ syntax match plantumlTag /<\/\?[bi]>/
 syntax region plantumlTag start=/<\/\?\%(back\|color\|del\|font\|img\|s\|size\|strike\|u\|w\)/ end=/>/
 
 " Labels with a colon
-syntax match plantumlColonLine /\S\@<=\s*\zs:.\+$/ contains=plantumlSpecialString
+syntax match plantumlColonLine /\S\@<=\s*\zs : .\+$/ contains=plantumlSpecialString
 
 " Stereotypes
 syntax match plantumlStereotype /<<[^-.]\+>>/ contains=plantumlSpecialString
diff --git a/syntax/requirements.vim b/syntax/requirements.vim
index 48331f481..3835c07f8 100644
--- a/syntax/requirements.vim
+++ b/syntax/requirements.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'requirements', 'syntax/requir
 endif
 
 " the Requirements File Format syntax support for Vim
-" Version: 1.5.3
+" Version: 1.6.0
 " Author:  raimon <raimon49@hotmail.com>
 " License: MIT LICENSE
 " The MIT License (MIT)
diff --git a/syntax/sshconfig.vim b/syntax/sshconfig.vim
index 2c7bc896c..1761e432f 100644
--- a/syntax/sshconfig.vim
+++ b/syntax/sshconfig.vim
@@ -5,14 +5,15 @@ endif
 " Vim syntax file
 " Language:	OpenSSH client configuration file (ssh_config)
 " Author:	David Necas (Yeti)
-" Maintainer:	Dominik Fischer <d dot f dot fischer at web dot de>
+" Maintainer:	Jakub Jelen <jakuje at gmail dot com>
+" Previous Maintainer:	Dominik Fischer <d dot f dot fischer at web dot de>
 " Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>
 " Contributor:  Karsten Hopp <karsten@redhat.com>
 " Contributor:  Dean, Adam Kenneth <adam.ken.dean@hpe.com>
-" Last Change:	2020 Feb 12
+" Last Change:	2021 Mar 29
 "		Added RemoteCommand from pull request #4809
 "		Included additional keywords from Martin.
-" SSH Version:	7.4p1
+" SSH Version:	8.5p1
 "
 
 " Setup
@@ -178,6 +179,7 @@ syn keyword sshconfigKeyword HostKeyAlgorithms
 syn keyword sshconfigKeyword HostKeyAlias
 syn keyword sshconfigKeyword HostName
 syn keyword sshconfigKeyword HostbasedAuthentication
+syn keyword sshconfigKeyword HostbasedAcceptedAlgorithms
 syn keyword sshconfigKeyword HostbasedKeyTypes
 syn keyword sshconfigKeyword IPQoS
 syn keyword sshconfigKeyword IdentitiesOnly
@@ -189,9 +191,11 @@ syn keyword sshconfigKeyword IPQoS
 syn keyword sshconfigKeyword KbdInteractiveAuthentication
 syn keyword sshconfigKeyword KbdInteractiveDevices
 syn keyword sshconfigKeyword KexAlgorithms
+syn keyword sshconfigKeyword KnownHostsCommand
 syn keyword sshconfigKeyword LocalCommand
 syn keyword sshconfigKeyword LocalForward
 syn keyword sshconfigKeyword LogLevel
+syn keyword sshconfigKeyword LogVerbose
 syn keyword sshconfigKeyword MACs
 syn keyword sshconfigKeyword Match
 syn keyword sshconfigKeyword NoHostAuthenticationForLocalhost
@@ -199,11 +203,13 @@ syn keyword sshconfigKeyword NumberOfPasswordPrompts
 syn keyword sshconfigKeyword PKCS11Provider
 syn keyword sshconfigKeyword PasswordAuthentication
 syn keyword sshconfigKeyword PermitLocalCommand
+syn keyword sshconfigKeyword PermitRemoteOpen
 syn keyword sshconfigKeyword Port
 syn keyword sshconfigKeyword PreferredAuthentications
 syn keyword sshconfigKeyword ProxyCommand
 syn keyword sshconfigKeyword ProxyJump
 syn keyword sshconfigKeyword ProxyUseFDPass
+syn keyword sshconfigKeyword PubkeyAcceptedAlgorithms
 syn keyword sshconfigKeyword PubkeyAcceptedKeyTypes
 syn keyword sshconfigKeyword PubkeyAuthentication
 syn keyword sshconfigKeyword RekeyLimit
diff --git a/syntax/sshdconfig.vim b/syntax/sshdconfig.vim
index ffd50daef..9c9f4af01 100644
--- a/syntax/sshdconfig.vim
+++ b/syntax/sshdconfig.vim
@@ -11,8 +11,8 @@ endif
 " Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>	
 " Contributor:  Karsten Hopp <karsten@redhat.com>
 " Originally:	2009-07-09
-" Last Change:	2020-10-20
-" SSH Version:	8.4p1
+" Last Change:	2021-03-29
+" SSH Version:	8.5p1
 "
 
 " Setup
@@ -199,6 +199,7 @@ syn keyword sshdconfigKeyword HostCertificate
 syn keyword sshdconfigKeyword HostKey
 syn keyword sshdconfigKeyword HostKeyAgent
 syn keyword sshdconfigKeyword HostKeyAlgorithms
+syn keyword sshdconfigKeyword HostbasedAcceptedAlgorithms
 syn keyword sshdconfigKeyword HostbasedAcceptedKeyTypes
 syn keyword sshdconfigKeyword HostbasedAuthentication
 syn keyword sshdconfigKeyword HostbasedUsesNameFromPacketOnly
@@ -217,6 +218,7 @@ syn keyword sshdconfigKeyword KexAlgorithms
 syn keyword sshdconfigKeyword KeyRegenerationInterval
 syn keyword sshdconfigKeyword ListenAddress
 syn keyword sshdconfigKeyword LogLevel
+syn keyword sshdconfigKeyword LogVerbose
 syn keyword sshdconfigKeyword LoginGraceTime
 syn keyword sshdconfigKeyword MACs
 syn keyword sshdconfigKeyword Match
@@ -224,6 +226,8 @@ syn keyword sshdconfigKeyword MaxAuthTries
 syn keyword sshdconfigKeyword MaxSessions
 syn keyword sshdconfigKeyword MaxStartups
 syn keyword sshdconfigKeyword PasswordAuthentication
+syn keyword sshdconfigKeyword PerSourceMaxStartups
+syn keyword sshdconfigKeyword PerSourceNetBlockSize
 syn keyword sshdconfigKeyword PermitBlacklistedKeys
 syn keyword sshdconfigKeyword PermitEmptyPasswords
 syn keyword sshdconfigKeyword PermitListen
@@ -238,6 +242,7 @@ syn keyword sshdconfigKeyword Port
 syn keyword sshdconfigKeyword PrintLastLog
 syn keyword sshdconfigKeyword PrintMotd
 syn keyword sshdconfigKeyword Protocol
+syn keyword sshdconfigKeyword PubkeyAcceptedAlgorithms
 syn keyword sshdconfigKeyword PubkeyAcceptedKeyTypes
 syn keyword sshdconfigKeyword PubkeyAuthentication
 syn keyword sshdconfigKeyword PubkeyAuthOptions
diff --git a/syntax/sudoers.vim b/syntax/sudoers.vim
index 1d65f0117..759976c28 100644
--- a/syntax/sudoers.vim
+++ b/syntax/sudoers.vim
@@ -4,8 +4,9 @@ endif
 
 " Vim syntax file
 " Language:             sudoers(5) configuration files
+" Maintainer:           Eisuke Kawashima ( e.kawaschima+vim AT gmail.com )
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2018-08-18
+" Latest Revision:      2021 Mar 15
 " Recent Changes:	Support for #include and #includedir.
 " 			Added many new options (Samuel D. Leslie)
 
@@ -30,7 +31,7 @@ syn cluster sudoersCmndSpecList       contains=sudoersUserRunasBegin,sudoersPASS
 syn keyword sudoersTodo               contained TODO FIXME XXX NOTE
 
 syn region  sudoersComment            display oneline start='#' end='$' contains=sudoersTodo
-syn region  sudoersInclude            display oneline start='#\(include\|includedir\)' end='$'
+syn region  sudoersInclude            display oneline start='[#@]\%(include\|includedir\)\>' end='$'
 
 syn keyword sudoersAlias              User_Alias Runas_Alias nextgroup=sudoersUserAlias skipwhite skipnl
 syn keyword sudoersAlias              Host_Alias nextgroup=sudoersHostAlias skipwhite skipnl
@@ -205,7 +206,7 @@ syn keyword sudoersBooleanParameter contained skipwhite skipnl
                                   \ shell_noargs
                                   \ stay_setuid
                                   \ sudoedit_checkdir
-                                  \ sudoedit_fellow
+                                  \ sudoedit_follow
                                   \ syslog_pid
                                   \ targetpw
                                   \ tty_tickets

From 8c28a9cfca2ed13ed7e69f6d427fc89afdb2358e Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Apr 2021 12:03:33 +0200
Subject: [PATCH 237/299] Update solitidy provider, closes #687

---
 README.md           |   2 +-
 packages.yaml       |   2 +-
 syntax/solidity.vim | 456 ++++++++++++++++++++++++++++++--------------
 3 files changed, 317 insertions(+), 143 deletions(-)

diff --git a/README.md b/README.md
index 8e5d4616c..5ac40b44c 100644
--- a/README.md
+++ b/README.md
@@ -174,7 +174,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [slim](https://github.com/slim-template/vim-slim) (Slim syntax highlighting for slim files)
 - [slime](https://github.com/slime-lang/vim-slime-syntax) (Syntax highlighting for slime files)
 - [smt2](https://github.com/bohlender/vim-smt2) (SMT syntax highlighting for smt2 and smt files)
-- [solidity](https://github.com/tomlion/vim-solidity) (Solidity syntax highlighting for sol files)
+- [solidity](https://github.com/TovarishFin/vim-solidity) (Solidity syntax highlighting for sol files)
 - [stylus](https://github.com/wavded/vim-stylus) (Stylus syntax highlighting for styl and stylus files)
 - [svelte](https://github.com/evanleck/vim-svelte/tree/main) (Svelte syntax highlighting for svelte files)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
diff --git a/packages.yaml b/packages.yaml
index 7021f3e19..ac0dce428 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1558,7 +1558,7 @@ filetypes:
   linguist: SMT
 ---
 name: solidity
-remote: tomlion/vim-solidity
+remote: TovarishFin/vim-solidity
 filetypes:
 - name: solidity
   linguist: Solidity
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index 49ef7a313..6ca7479b6 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -4,149 +4,323 @@ endif
 
 " Vim syntax file
 " Language:     Solidity
-" Maintainer:   Tomlion (qycpublic@gmail.com)
-" URL:          https://github.com/tomlion/vim-solidity
+" Maintainer:   TovarishFin (tovarishFin@gmail.com)
+" URL:          https://github.com/TovarishFin/vim-solidity
 
 if exists("b:current_syntax")
   finish
 endif
 
-" basic
-" contract, library and event are defined at bottom of file
-syn keyword solKeyword           abstract anonymous as assembly break case catch constant continue default
-syn keyword solKeyword           delete do else emit enum external final for function if import in indexed inline
-syn keyword solKeyword           interface internal is let match memory modifier new of payable pragma private public pure
-syn keyword solKeyword           relocatable require return returns static storage struct throw try type typeof using
-syn keyword solKeyword           var view while
-syn keyword solConstant          true false wei szabo finney ether seconds minutes hours days weeks years now
-syn keyword solConstant          block msg now tx sha3 keccak256 sha256 ripemd160 ecerecover addmod mulmod this super selfdestruct
-syn keyword solBuiltinType       mapping address bool
-syn keyword solBuiltinType       int int8 int16 int24 int32 int40 int48 int56 int64 int72 int80 int88 int96 int104 int112 int120 int128 int136 int144 int152 int160 int168 int178 int184 int192 int200 int208 int216 int224 int232 int240 int248 int256
-syn keyword solBuiltinType       uint uint8 uint16 uint24 uint32 uint40 uint48 uint56 uint64 uint72 uint80 uint88 uint96 uint104 uint112 uint120 uint128 uint136 uint144 uint152 uint160 uint168 uint178 uint184 uint192 uint200 uint208 uint216 uint224 uint232 uint240 uint248 uint256
-syn keyword solBuiltinType       fixed
-syn keyword solBuiltinType       fixed0x8 fixed0x16 fixed0x24 fixed0x32 fixed0x40 fixed0x48 fixed0x56 fixed0x64 fixed0x72 fixed0x80 fixed0x88 fixed0x96 fixed0x104 fixed0x112 fixed0x120 fixed0x128 fixed0x136 fixed0x144 fixed0x152 fixed0x160 fixed0x168 fixed0x178 fixed0x184 fixed0x192 fixed0x200 fixed0x208 fixed0x216 fixed0x224 fixed0x232 fixed0x240 fixed0x248 fixed0x256
-syn keyword solBuiltinType       fixed8x8 fixed8x16 fixed8x24 fixed8x32 fixed8x40 fixed8x48 fixed8x56 fixed8x64 fixed8x72 fixed8x80 fixed8x88 fixed8x96 fixed8x104 fixed8x112 fixed8x120 fixed8x128 fixed8x136 fixed8x144 fixed8x152 fixed8x160 fixed8x168 fixed8x178 fixed8x184 fixed8x192 fixed8x200 fixed8x208 fixed8x216 fixed8x224 fixed8x232 fixed8x240 fixed8x248
-syn keyword solBuiltinType       fixed16x8 fixed16x16 fixed16x24 fixed16x32 fixed16x40 fixed16x48 fixed16x56 fixed16x64 fixed16x72 fixed16x80 fixed16x88 fixed16x96 fixed16x104 fixed16x112 fixed16x120 fixed16x128 fixed16x136 fixed16x144 fixed16x152 fixed16x160 fixed16x168 fixed16x178 fixed16x184 fixed16x192 fixed16x200 fixed16x208 fixed16x216 fixed16x224 fixed16x232 fixed16x240
-syn keyword solBuiltinType       fixed24x8 fixed24x16 fixed24x24 fixed24x32 fixed24x40 fixed24x48 fixed24x56 fixed24x64 fixed24x72 fixed24x80 fixed24x88 fixed24x96 fixed24x104 fixed24x112 fixed24x120 fixed24x128 fixed24x136 fixed24x144 fixed24x152 fixed24x160 fixed24x168 fixed24x178 fixed24x184 fixed24x192 fixed24x200 fixed24x208 fixed24x216 fixed24x224 fixed24x232
-syn keyword solBuiltinType       fixed32x8 fixed32x16 fixed32x24 fixed32x32 fixed32x40 fixed32x48 fixed32x56 fixed32x64 fixed32x72 fixed32x80 fixed32x88 fixed32x96 fixed32x104 fixed32x112 fixed32x120 fixed32x128 fixed32x136 fixed32x144 fixed32x152 fixed32x160 fixed32x168 fixed32x178 fixed32x184 fixed32x192 fixed32x200 fixed32x208 fixed32x216 fixed32x224
-syn keyword solBuiltinType       fixed40x8 fixed40x16 fixed40x24 fixed40x32 fixed40x40 fixed40x48 fixed40x56 fixed40x64 fixed40x72 fixed40x80 fixed40x88 fixed40x96 fixed40x104 fixed40x112 fixed40x120 fixed40x128 fixed40x136 fixed40x144 fixed40x152 fixed40x160 fixed40x168 fixed40x178 fixed40x184 fixed40x192 fixed40x200 fixed40x208 fixed40x216
-syn keyword solBuiltinType       fixed48x8 fixed48x16 fixed48x24 fixed48x32 fixed48x40 fixed48x48 fixed48x56 fixed48x64 fixed48x72 fixed48x80 fixed48x88 fixed48x96 fixed48x104 fixed48x112 fixed48x120 fixed48x128 fixed48x136 fixed48x144 fixed48x152 fixed48x160 fixed48x168 fixed48x178 fixed48x184 fixed48x192 fixed48x200 fixed48x208
-syn keyword solBuiltinType       fixed56x8 fixed56x16 fixed56x24 fixed56x32 fixed56x40 fixed56x48 fixed56x56 fixed56x64 fixed56x72 fixed56x80 fixed56x88 fixed56x96 fixed56x104 fixed56x112 fixed56x120 fixed56x128 fixed56x136 fixed56x144 fixed56x152 fixed56x160 fixed56x168 fixed56x178 fixed56x184 fixed56x192 fixed56x200
-syn keyword solBuiltinType       fixed64x8 fixed64x16 fixed64x24 fixed64x32 fixed64x40 fixed64x48 fixed64x56 fixed64x64 fixed64x72 fixed64x80 fixed64x88 fixed64x96 fixed64x104 fixed64x112 fixed64x120 fixed64x128 fixed64x136 fixed64x144 fixed64x152 fixed64x160 fixed64x168 fixed64x178 fixed64x184 fixed64x192
-syn keyword solBuiltinType       fixed72x8 fixed72x16 fixed72x24 fixed72x32 fixed72x40 fixed72x48 fixed72x56 fixed72x64 fixed72x72 fixed72x80 fixed72x88 fixed72x96 fixed72x104 fixed72x112 fixed72x120 fixed72x128 fixed72x136 fixed72x144 fixed72x152 fixed72x160 fixed72x168 fixed72x178 fixed72x184
-syn keyword solBuiltinType       fixed80x8 fixed80x16 fixed80x24 fixed80x32 fixed80x40 fixed80x48 fixed80x56 fixed80x64 fixed80x72 fixed80x80 fixed80x88 fixed80x96 fixed80x104 fixed80x112 fixed80x120 fixed80x128 fixed80x136 fixed80x144 fixed80x152 fixed80x160 fixed80x168 fixed80x178
-syn keyword solBuiltinType       fixed88x8 fixed88x16 fixed88x24 fixed88x32 fixed88x40 fixed88x48 fixed88x56 fixed88x64 fixed88x72 fixed88x80 fixed88x88 fixed88x96 fixed88x104 fixed88x112 fixed88x120 fixed88x128 fixed88x136 fixed88x144 fixed88x152 fixed88x160 fixed88x168
-syn keyword solBuiltinType       fixed96x8 fixed96x16 fixed96x24 fixed96x32 fixed96x40 fixed96x48 fixed96x56 fixed96x64 fixed96x72 fixed96x80 fixed96x88 fixed96x96 fixed96x104 fixed96x112 fixed96x120 fixed96x128 fixed96x136 fixed96x144 fixed96x152 fixed96x160
-syn keyword solBuiltinType       fixed104x8 fixed104x16 fixed104x24 fixed104x32 fixed104x40 fixed104x48 fixed104x56 fixed104x64 fixed104x72 fixed104x80 fixed104x88 fixed104x96 fixed104x104 fixed104x112 fixed104x120 fixed104x128 fixed104x136 fixed104x144 fixed104x152
-syn keyword solBuiltinType       fixed112x8 fixed112x16 fixed112x24 fixed112x32 fixed112x40 fixed112x48 fixed112x56 fixed112x64 fixed112x72 fixed112x80 fixed112x88 fixed112x96 fixed112x104 fixed112x112 fixed112x120 fixed112x128 fixed112x136 fixed112x144
-syn keyword solBuiltinType       fixed120x8 fixed120x16 fixed120x24 fixed120x32 fixed120x40 fixed120x48 fixed120x56 fixed120x64 fixed120x72 fixed120x80 fixed120x88 fixed120x96 fixed120x104 fixed120x112 fixed120x120 fixed120x128 fixed120x136
-syn keyword solBuiltinType       fixed128x8 fixed128x16 fixed128x24 fixed128x32 fixed128x40 fixed128x48 fixed128x56 fixed128x64 fixed128x72 fixed128x80 fixed128x88 fixed128x96 fixed128x104 fixed128x112 fixed128x120 fixed128x128
-syn keyword solBuiltinType       fixed136x8 fixed136x16 fixed136x24 fixed136x32 fixed136x40 fixed136x48 fixed136x56 fixed136x64 fixed136x72 fixed136x80 fixed136x88 fixed136x96 fixed136x104 fixed136x112 fixed136x120
-syn keyword solBuiltinType       fixed144x8 fixed144x16 fixed144x24 fixed144x32 fixed144x40 fixed144x48 fixed144x56 fixed144x64 fixed144x72 fixed144x80 fixed144x88 fixed144x96 fixed144x104 fixed144x112
-syn keyword solBuiltinType       fixed152x8 fixed152x16 fixed152x24 fixed152x32 fixed152x40 fixed152x48 fixed152x56 fixed152x64 fixed152x72 fixed152x80 fixed152x88 fixed152x96 fixed152x104
-syn keyword solBuiltinType       fixed160x8 fixed160x16 fixed160x24 fixed160x32 fixed160x40 fixed160x48 fixed160x56 fixed160x64 fixed160x72 fixed160x80 fixed160x88 fixed160x96
-syn keyword solBuiltinType       fixed168x8 fixed168x16 fixed168x24 fixed168x32 fixed168x40 fixed168x48 fixed168x56 fixed168x64 fixed168x72 fixed168x80 fixed168x88
-syn keyword solBuiltinType       fixed176x8 fixed176x16 fixed176x24 fixed176x32 fixed176x40 fixed176x48 fixed176x56 fixed176x64 fixed176x72 fixed176x80
-syn keyword solBuiltinType       fixed184x8 fixed184x16 fixed184x24 fixed184x32 fixed184x40 fixed184x48 fixed184x56 fixed184x64 fixed184x72
-syn keyword solBuiltinType       fixed192x8 fixed192x16 fixed192x24 fixed192x32 fixed192x40 fixed192x48 fixed192x56 fixed192x64
-syn keyword solBuiltinType       fixed200x8 fixed200x16 fixed200x24 fixed200x32 fixed200x40 fixed200x48 fixed200x56
-syn keyword solBuiltinType       fixed208x8 fixed208x16 fixed208x24 fixed208x32 fixed208x40 fixed208x48
-syn keyword solBuiltinType       fixed216x8 fixed216x16 fixed216x24 fixed216x32 fixed216x40
-syn keyword solBuiltinType       fixed224x8 fixed224x16 fixed224x24 fixed224x32
-syn keyword solBuiltinType       fixed232x8 fixed232x16 fixed232x24
-syn keyword solBuiltinType       fixed240x8 fixed240x16
-syn keyword solBuiltinType       fixed248x8
-syn keyword solBuiltinType       ufixed
-syn keyword solBuiltinType       ufixed0x8 ufixed0x16 ufixed0x24 ufixed0x32 ufixed0x40 ufixed0x48 ufixed0x56 ufixed0x64 ufixed0x72 ufixed0x80 ufixed0x88 ufixed0x96 ufixed0x104 ufixed0x112 ufixed0x120 ufixed0x128 ufixed0x136 ufixed0x144 ufixed0x152 ufixed0x160 ufixed0x168 ufixed0x178 ufixed0x184 ufixed0x192 ufixed0x200 ufixed0x208 ufixed0x216 ufixed0x224 ufixed0x232 ufixed0x240 ufixed0x248 ufixed0x256
-syn keyword solBuiltinType       ufixed8x8 ufixed8x16 ufixed8x24 ufixed8x32 ufixed8x40 ufixed8x48 ufixed8x56 ufixed8x64 ufixed8x72 ufixed8x80 ufixed8x88 ufixed8x96 ufixed8x104 ufixed8x112 ufixed8x120 ufixed8x128 ufixed8x136 ufixed8x144 ufixed8x152 ufixed8x160 ufixed8x168 ufixed8x178 ufixed8x184 ufixed8x192 ufixed8x200 ufixed8x208 ufixed8x216 ufixed8x224 ufixed8x232 ufixed8x240 ufixed8x248
-syn keyword solBuiltinType       ufixed16x8 ufixed16x16 ufixed16x24 ufixed16x32 ufixed16x40 ufixed16x48 ufixed16x56 ufixed16x64 ufixed16x72 ufixed16x80 ufixed16x88 ufixed16x96 ufixed16x104 ufixed16x112 ufixed16x120 ufixed16x128 ufixed16x136 ufixed16x144 ufixed16x152 ufixed16x160 ufixed16x168 ufixed16x178 ufixed16x184 ufixed16x192 ufixed16x200 ufixed16x208 ufixed16x216 ufixed16x224 ufixed16x232 ufixed16x240
-syn keyword solBuiltinType       ufixed24x8 ufixed24x16 ufixed24x24 ufixed24x32 ufixed24x40 ufixed24x48 ufixed24x56 ufixed24x64 ufixed24x72 ufixed24x80 ufixed24x88 ufixed24x96 ufixed24x104 ufixed24x112 ufixed24x120 ufixed24x128 ufixed24x136 ufixed24x144 ufixed24x152 ufixed24x160 ufixed24x168 ufixed24x178 ufixed24x184 ufixed24x192 ufixed24x200 ufixed24x208 ufixed24x216 ufixed24x224 ufixed24x232
-syn keyword solBuiltinType       ufixed32x8 ufixed32x16 ufixed32x24 ufixed32x32 ufixed32x40 ufixed32x48 ufixed32x56 ufixed32x64 ufixed32x72 ufixed32x80 ufixed32x88 ufixed32x96 ufixed32x104 ufixed32x112 ufixed32x120 ufixed32x128 ufixed32x136 ufixed32x144 ufixed32x152 ufixed32x160 ufixed32x168 ufixed32x178 ufixed32x184 ufixed32x192 ufixed32x200 ufixed32x208 ufixed32x216 ufixed32x224
-syn keyword solBuiltinType       ufixed40x8 ufixed40x16 ufixed40x24 ufixed40x32 ufixed40x40 ufixed40x48 ufixed40x56 ufixed40x64 ufixed40x72 ufixed40x80 ufixed40x88 ufixed40x96 ufixed40x104 ufixed40x112 ufixed40x120 ufixed40x128 ufixed40x136 ufixed40x144 ufixed40x152 ufixed40x160 ufixed40x168 ufixed40x178 ufixed40x184 ufixed40x192 ufixed40x200 ufixed40x208 ufixed40x216
-syn keyword solBuiltinType       ufixed48x8 ufixed48x16 ufixed48x24 ufixed48x32 ufixed48x40 ufixed48x48 ufixed48x56 ufixed48x64 ufixed48x72 ufixed48x80 ufixed48x88 ufixed48x96 ufixed48x104 ufixed48x112 ufixed48x120 ufixed48x128 ufixed48x136 ufixed48x144 ufixed48x152 ufixed48x160 ufixed48x168 ufixed48x178 ufixed48x184 ufixed48x192 ufixed48x200 ufixed48x208
-syn keyword solBuiltinType       ufixed56x8 ufixed56x16 ufixed56x24 ufixed56x32 ufixed56x40 ufixed56x48 ufixed56x56 ufixed56x64 ufixed56x72 ufixed56x80 ufixed56x88 ufixed56x96 ufixed56x104 ufixed56x112 ufixed56x120 ufixed56x128 ufixed56x136 ufixed56x144 ufixed56x152 ufixed56x160 ufixed56x168 ufixed56x178 ufixed56x184 ufixed56x192 ufixed56x200
-syn keyword solBuiltinType       ufixed64x8 ufixed64x16 ufixed64x24 ufixed64x32 ufixed64x40 ufixed64x48 ufixed64x56 ufixed64x64 ufixed64x72 ufixed64x80 ufixed64x88 ufixed64x96 ufixed64x104 ufixed64x112 ufixed64x120 ufixed64x128 ufixed64x136 ufixed64x144 ufixed64x152 ufixed64x160 ufixed64x168 ufixed64x178 ufixed64x184 ufixed64x192
-syn keyword solBuiltinType       ufixed72x8 ufixed72x16 ufixed72x24 ufixed72x32 ufixed72x40 ufixed72x48 ufixed72x56 ufixed72x64 ufixed72x72 ufixed72x80 ufixed72x88 ufixed72x96 ufixed72x104 ufixed72x112 ufixed72x120 ufixed72x128 ufixed72x136 ufixed72x144 ufixed72x152 ufixed72x160 ufixed72x168 ufixed72x178 ufixed72x184
-syn keyword solBuiltinType       ufixed80x8 ufixed80x16 ufixed80x24 ufixed80x32 ufixed80x40 ufixed80x48 ufixed80x56 ufixed80x64 ufixed80x72 ufixed80x80 ufixed80x88 ufixed80x96 ufixed80x104 ufixed80x112 ufixed80x120 ufixed80x128 ufixed80x136 ufixed80x144 ufixed80x152 ufixed80x160 ufixed80x168 ufixed80x178
-syn keyword solBuiltinType       ufixed88x8 ufixed88x16 ufixed88x24 ufixed88x32 ufixed88x40 ufixed88x48 ufixed88x56 ufixed88x64 ufixed88x72 ufixed88x80 ufixed88x88 ufixed88x96 ufixed88x104 ufixed88x112 ufixed88x120 ufixed88x128 ufixed88x136 ufixed88x144 ufixed88x152 ufixed88x160 ufixed88x168
-syn keyword solBuiltinType       ufixed96x8 ufixed96x16 ufixed96x24 ufixed96x32 ufixed96x40 ufixed96x48 ufixed96x56 ufixed96x64 ufixed96x72 ufixed96x80 ufixed96x88 ufixed96x96 ufixed96x104 ufixed96x112 ufixed96x120 ufixed96x128 ufixed96x136 ufixed96x144 ufixed96x152 ufixed96x160
-syn keyword solBuiltinType       ufixed104x8 ufixed104x16 ufixed104x24 ufixed104x32 ufixed104x40 ufixed104x48 ufixed104x56 ufixed104x64 ufixed104x72 ufixed104x80 ufixed104x88 ufixed104x96 ufixed104x104 ufixed104x112 ufixed104x120 ufixed104x128 ufixed104x136 ufixed104x144 ufixed104x152
-syn keyword solBuiltinType       ufixed112x8 ufixed112x16 ufixed112x24 ufixed112x32 ufixed112x40 ufixed112x48 ufixed112x56 ufixed112x64 ufixed112x72 ufixed112x80 ufixed112x88 ufixed112x96 ufixed112x104 ufixed112x112 ufixed112x120 ufixed112x128 ufixed112x136 ufixed112x144
-syn keyword solBuiltinType       ufixed120x8 ufixed120x16 ufixed120x24 ufixed120x32 ufixed120x40 ufixed120x48 ufixed120x56 ufixed120x64 ufixed120x72 ufixed120x80 ufixed120x88 ufixed120x96 ufixed120x104 ufixed120x112 ufixed120x120 ufixed120x128 ufixed120x136
-syn keyword solBuiltinType       ufixed128x8 ufixed128x16 ufixed128x24 ufixed128x32 ufixed128x40 ufixed128x48 ufixed128x56 ufixed128x64 ufixed128x72 ufixed128x80 ufixed128x88 ufixed128x96 ufixed128x104 ufixed128x112 ufixed128x120 ufixed128x128
-syn keyword solBuiltinType       ufixed136x8 ufixed136x16 ufixed136x24 ufixed136x32 ufixed136x40 ufixed136x48 ufixed136x56 ufixed136x64 ufixed136x72 ufixed136x80 ufixed136x88 ufixed136x96 ufixed136x104 ufixed136x112 ufixed136x120
-syn keyword solBuiltinType       ufixed144x8 ufixed144x16 ufixed144x24 ufixed144x32 ufixed144x40 ufixed144x48 ufixed144x56 ufixed144x64 ufixed144x72 ufixed144x80 ufixed144x88 ufixed144x96 ufixed144x104 ufixed144x112
-syn keyword solBuiltinType       ufixed152x8 ufixed152x16 ufixed152x24 ufixed152x32 ufixed152x40 ufixed152x48 ufixed152x56 ufixed152x64 ufixed152x72 ufixed152x80 ufixed152x88 ufixed152x96 ufixed152x104
-syn keyword solBuiltinType       ufixed160x8 ufixed160x16 ufixed160x24 ufixed160x32 ufixed160x40 ufixed160x48 ufixed160x56 ufixed160x64 ufixed160x72 ufixed160x80 ufixed160x88 ufixed160x96
-syn keyword solBuiltinType       ufixed168x8 ufixed168x16 ufixed168x24 ufixed168x32 ufixed168x40 ufixed168x48 ufixed168x56 ufixed168x64 ufixed168x72 ufixed168x80 ufixed168x88
-syn keyword solBuiltinType       ufixed176x8 ufixed176x16 ufixed176x24 ufixed176x32 ufixed176x40 ufixed176x48 ufixed176x56 ufixed176x64 ufixed176x72 ufixed176x80
-syn keyword solBuiltinType       ufixed184x8 ufixed184x16 ufixed184x24 ufixed184x32 ufixed184x40 ufixed184x48 ufixed184x56 ufixed184x64 ufixed184x72
-syn keyword solBuiltinType       ufixed192x8 ufixed192x16 ufixed192x24 ufixed192x32 ufixed192x40 ufixed192x48 ufixed192x56 ufixed192x64
-syn keyword solBuiltinType       ufixed200x8 ufixed200x16 ufixed200x24 ufixed200x32 ufixed200x40 ufixed200x48 ufixed200x56
-syn keyword solBuiltinType       ufixed208x8 ufixed208x16 ufixed208x24 ufixed208x32 ufixed208x40 ufixed208x48
-syn keyword solBuiltinType       ufixed216x8 ufixed216x16 ufixed216x24 ufixed216x32 ufixed216x40
-syn keyword solBuiltinType       ufixed224x8 ufixed224x16 ufixed224x24 ufixed224x32
-syn keyword solBuiltinType       ufixed232x8 ufixed232x16 ufixed232x24
-syn keyword solBuiltinType       ufixed240x8 ufixed240x16
-syn keyword solBuiltinType       ufixed248x8
-syn keyword solBuiltinType       string string1 string2 string3 string4 string5 string6 string7 string8 string9 string10 string11 string12 string13 string14 string15 string16 string17 string18 string19 string20 string21 string22 string23 string24 string25 string26 string27 string28 string29 string30 string31 string32
-syn keyword solBuiltinType       byte bytes bytes1 bytes2 bytes3 bytes4 bytes5 bytes6 bytes7 bytes8 bytes9 bytes10 bytes11 bytes12 bytes13 bytes14 bytes15 bytes16 bytes17 bytes18 bytes19 bytes20 bytes21 bytes22 bytes23 bytes24 bytes25 bytes26 bytes27 bytes28 bytes29 bytes30 bytes31 bytes32
-
-hi def link solKeyword           Keyword
-hi def link solConstant          Constant
-hi def link solBuiltinType       Type
-
-syn match   solOperator          /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
-syn match   solNumber            /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
-syn match   solFloat             /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syn region  solString            start=+"+  skip=+\\\\\|\\$"+  end=+"+
-syn region  solString            start=+'+  skip=+\\\\\|\\$'+  end=+'+
-
-hi def link solOperator          Operator
-hi def link solNumber            Number
-hi def link solFloat             Float
-hi def link solString            String
-
-" Function
-syn match   solFunction          /\<function\>/ nextgroup=solFuncName,solFuncArgs skipwhite
-syn match   solFuncName          contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=solFuncArgs skipwhite
-syn region  solFuncArgs          contained matchgroup=solFuncParens start='(' end=')' contains=solFuncArgCommas,solBuiltinType nextgroup=solModifierName,solFuncReturns keepend skipwhite skipempty
-syn match   solModifierName      contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=solModifierArgs,solModifierName skipwhite
-syn region  solModifierArgs      contained matchgroup=solFuncParens start='(' end=')' contains=solFuncArgCommas nextgroup=solModifierName,solFuncReturns skipwhite
-syn region  solFuncReturns       contained matchgroup=solFuncParens start='(' end=')' contains=solFuncArgCommas,solBuiltinType
-syn match   solFuncArgCommas     contained ','
-
-hi def link solFunction          Type
-hi def link solFuncName          Function
-hi def link solModifierName      Function
-
-" Contract
-syn match   solContract          /\<\%(contract\|library\|interface\)\>/ nextgroup=solContractName skipwhite
-syn match   solContractName      contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=solContractParent skipwhite
-syn region  solContractParent    contained start='is' end='{' contains=solContractName,solContractNoise,solContractCommas skipwhite skipempty
-syn match   solContractNoise     contained 'is' containedin=solContractParent
-syn match   solContractCommas    contained ','
-
-hi def link solContract          Type
-hi def link solContractName      Function
-
-" Event
-syn match   solEvent             /\<event\>/ nextgroup=solEventName,solEventArgs skipwhite
-syn match   solEventName         contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=solEventArgs skipwhite
-syn region  solEventArgs         contained matchgroup=solFuncParens start='(' end=')' contains=solEventArgCommas,solBuiltinType,solEventArgSpecial skipwhite skipempty
-syn match   solEventArgCommas    contained ','
-syn match   solEventArgSpecial   contained 'indexed'
-
-hi def link solEvent             Type
-hi def link solEventName         Function
-hi def link solEventArgSpecial   Label
-
-" Comment
-syn keyword solCommentTodo       TODO FIXME XXX TBD contained
-syn region  solLineComment       start=+\/\/+ end=+$+ contains=solCommentTodo,@Spell
-syn region  solLineComment       start=+^\s*\/\/+ skip=+\n\s*\/\/+ end=+$+ contains=solCommentTodo,@Spell fold
-syn region  solComment           start="/\*"  end="\*/" contains=solCommentTodo,@Spell fold
-
-hi def link solCommentTodo       Comment
-hi def link solLineComment       Comment
-hi def link solComment           Comment
+syn sync minlines=50
+
+" Common Groups
+syn match     solComma            ','
+syn keyword   solStorageType      contained skipempty skipwhite nextgroup=solStorageType,solStorageConst,solStorageImmutable
+      \ public private internal
+syn keyword   solStorageConst     contained skipempty skipwhite nextgroup=solStorageType
+      \ constant
+syn keyword   solStorageImmutable     contained skipempty skipwhite nextgroup=solStorageType
+      \ immutable
+syn keyword   solFuncStorageType  contained
+      \ storage calldata memory
+syn keyword   solPayableType  contained
+      \ payable
+
+hi def link   solStorageType      Keyword
+hi def link   solFuncStorageType  Keyword
+hi def link   solStorageConst     Keyword
+hi def link   solStorageImmutable Keyword
+hi def link   solPayableType      Keyword
+
+" Common Groups Highlighting
+hi def link   solParens           Normal
+hi def link   solComma            Normal
+
+" Complex Types
+syn keyword   solMapping          skipempty skipwhite nextgroup=solMappingParens
+      \ mapping
+syn region    solMappingParens    start='(' end=')' contained contains=solValueType,solMapping nextgroup=solStorageType skipempty skipwhite
+syn keyword   solEnum             nextgroup=solEnumBody skipwhite skipempty
+      \ enum
+syn region    solEnumBody         start='(' end=')' contained contains=solComma,solValueType
+syn keyword   solStruct           nextgroup=solStructBody skipempty skipwhite
+      \ struct
+syn region    solStructBody       start='{' end='}' contained contains=solComma,solValueType,solStruct,solEnum,solMapping
+syn match     solCustomType       skipempty skipwhite nextgroup=solStorageType,solStorageConst,solStorageImmutable
+      \ '\v[a-zA-Z_][a-zA-Z0-9_]*\s*'
+
+hi def link   solMapping          Define
+hi def link   solEnum             Define
+hi def link   solStruct           Define
+
+" Numbers
+syntax match  solNumber           '\v0x\x+>'
+syntax match  solNumber           '\v\c<%(\d+%(e[+-]=\d+)=|0b[01]+|0o\o+|0x\x+)>'
+syntax match  solNumber           '\v\c<%(\d+.\d+|\d+.|.\d+)%(e[+-]=\d+)=>'
+
+" Strings
+syntax region solString           start=/\v"/ skip=/\v\\./ end=/\v"/
+syntax region solString           start="\v'" skip="\v\\." end="\v'"
+
+hi def link   solNumber           Number
+hi def link   solString           String
+
+" Operators
+syn match     solOperator         '\v\!'
+syn match     solOperator         '\v\|'
+syn match     solOperator         '\v\&'
+syn match     solOperator         '\v\%'
+syn match     solOperator         '\v\~'
+syn match     solOperator         '\v\^'
+syn match     solOperator         '\v\*'
+syn match     solOperator         '\v/'
+syn match     solOperator         '\v\+'
+syn match     solOperator         '\v-'
+syn match     solOperator         '\v\?'
+syn match     solOperator         '\v\:'
+syn match     solOperator         '\v\;'
+syn match     solOperator         '\v\>'
+syn match     solOperator         '\v\<'
+syn match     solOperator         '\v\>\='
+syn match     solOperator         '\v\<\='
+syn match     solOperator         '\v\='
+syn match     solOperator         '\v\*\='
+syn match     solOperator         '\v/\='
+syn match     solOperator         '\v\+\='
+syn match     solOperator         '\v-\='
+
+hi def link   solOperator         Operator
+
+" Functions
+syn keyword   solConstructor      nextgroup=solFuncParam skipwhite skipempty
+      \ constructor
+syn keyword   solFunction         nextgroup=solFuncName,solFuncParam skipwhite skipempty
+      \ function
+syn keyword   solFallback         nextgroup=solFuncParam skipwhite skipempty
+      \ fallback
+syn keyword   solReceive          nextgroup=solFuncParam skipwhite skipempty
+      \ receive
+syn match     solFuncName         contained nextgroup=solFuncParam skipwhite skipempty
+      \ '\v<[a-zA-Z_][0-9a-zA-Z_]*'
+syn region    solFuncParam
+      \ contained
+      \ contains=solComma,solValueType,solFuncStorageType
+      \ nextgroup=solFuncModCustom,solFuncModifier,solFuncReturn,solFuncBody
+      \ skipempty
+      \ skipwhite
+      \ start='('
+      \ end=')'
+
+syn keyword   solFuncModifier     contained nextgroup=solFuncModifier,solFuncModCustom,solFuncReturn,solFuncBody skipwhite skipempty
+      \ external internal payable public pure view private constant override virtual
+syn match     solFuncModCustom    contained nextgroup=solFuncModifier,solFuncModCustom,solFuncReturn,solFuncBody,solFuncModParens  skipempty skipwhite
+      \ '\v<[a-zA-Z_][0-9a-zA-Z_]*'
+syn region    solFuncModParens    contained contains=solString,solFuncCall,solConstant,solNumber,solTypeCast,solComma nextgroup=solFuncReturn,solFuncModifier,solFuncModCustom,solFuncBody skipempty skipwhite transparent
+      \ start='('
+      \ end=')'
+syn keyword   solFuncReturn       contained nextgroup=solFuncRetParens skipwhite skipempty returns
+syn region    solFuncRetParens    contains=solValueType,solFuncStorageType nextgroup=solFuncBody skipempty skipwhite
+      \ start='(' 
+      \ end=')' 
+syn region    solFuncBody         contained contains=solDestructure,solComment,solAssemblyBlock,solEmitEvent,solTypeCast,solMethod,solValueType,solConstant,solKeyword,solRepeat,solLabel,solException,solStructure,solFuncStorageType,solOperator,solNumber,solString,solFuncCall,solIf,solElse,solLoop skipempty skipwhite
+      \ start='{' 
+      \ end='}' 
+syn match     solFuncCall         contained skipempty skipwhite nextgroup=solCallOptions,solFuncCallParens
+      \ '\v%(%(<if>|<uint>|<int>|<ufixed>|<bytes>|<address>|<string>|<bool>)\s*)@<!<[a-zA-Z_][0-9a-zA-Z_]*\s*%((\{(\n|.|\s)*\})?\s*(\((\n|.|\s)*\)))@='
+syn region    solFuncCallParens   contained transparent contains=solString,solFuncCall,solConstant,solNumber,solMethod,solTypeCast,solComma,solOperator
+      \ start='('
+      \ end=')'
+
+hi def link   solFunction         Define
+hi def link   solConstructor      Define
+hi def link   solFallback         Function
+hi def link   solReceive          Function
+hi def link   solFuncName         Function
+hi def link   solFuncModifier     Keyword
+hi def link   solFuncModCustom    Keyword
+hi def link   solFuncCall         Function
+hi def link   solFuncReturn       special
+
+syn region    solCallOptions      start=/{/ end=/}/ contained contains=solString,solFuncCall,solConstant,solNumber,solMethod,solTypeCast,solComma,solOperator,solCallOptionKey transparent nextgroup=solFuncCallParens
+syn keyword   solCallOptionKey    gas value
+
+hi def link   solCallOptionKey    Define
+
+" Modifiers
+syn keyword   solModifier         modifier nextgroup=solModifiername skipwhite
+syn match     solModifierName     /\<[a-zA-Z_][0-9a-zA-Z_]*/ contained nextgroup=solModifierParam skipwhite
+syn region    solModifierParam    start='(' end=')' contained contains=solComma,solValueType,solFuncStorageType nextgroup=solModifierBody skipwhite skipempty
+syn region    solModifierBody     start='{' end='}' contained contains=solDestructure,solComment,solAssemblyBlock,solEmitEvent,solTypeCast,solMethod,solValueType,solConstant,solKeyword,solRepeat,solLabel,solException,solStructure,solFuncStorageType,solOperator,solNumber,solString,solFuncCall,solIf,solElse,solLoop,solModifierInsert skipempty skipwhite transparent
+syn match     solModifierInsert   /\<_\>/ containedin=solModifierBody
+
+hi def link   solModifier         Define
+hi def link   solModifierName     Function
+hi def link   solModifierInsert   Function
+
+" Contracts, Libraries, Interfaces
+syn match     solAbstract         /\<abstract\>/ nextgroup=SolContract skipwhite
+syn match     solContract         /\<\%(contract\|library\|interface\)\>/ nextgroup=solContractName skipwhite
+syn match     solContractName     /\<[a-zA-Z_][0-9a-zA-Z_]*/ contained nextgroup=solContractParent skipwhite
+syn region    solContractParent   start=/\<is\>/ end='{' contained contains=solContractName,solComma,solInheritor
+syn match     solInheritor        /\<is\>/ contained
+syn region    solLibUsing         start=/\<using\>/ end=/\<for\>/ contains=solLibName
+syn match     solLibName          /[a-zA-Z_][0-9a-zA-Z_]*\s*\zefor/ contained
+
+hi def link   solAbstract         Special
+hi def link   solContract         Define
+hi def link   solContractName     Function
+hi def link   solInheritor        Keyword
+hi def link   solLibUsing         Special
+hi def link   solLibName          Type
+
+" Events
+syn match     solEvent            /\<event\>/ nextgroup=solEventName,solEventParams skipwhite
+syn match     solEventName        /\<[a-zA-Z_][0-9a-zA-Z_]*/ nextgroup=solEventParam contained skipwhite
+syn region    solEventParam       start='(' end=')' contains=solComma,solValueType,solEventParamMod,other contained skipwhite skipempty
+syn match     solEventParamMod    /\(\<indexed\>\|\<anonymous\>\)/ contained
+syn keyword   solEmitEvent        emit
+
+hi def link   solEvent            Define
+hi def link   solEventName        Function
+hi def link   solEventParamMod    Keyword
+hi def link   solEmitEvent        Special
+
+" Constants
+syn keyword   solConstant         true false wei szabo finney ether seconds minutes hours days weeks years now super
+syn keyword   solConstant         block msg now tx this abi
+
+hi def link   solConstant         Constant
+
+" TODO: add syntax for 'override' and 'abstract' 'try' 'immutable'
+" Reserved keywords https://solidity.readthedocs.io/en/v0.5.7/miscellaneous.html#reserved-keywords
+syn keyword   solReserved         after alias apply auto case catch copyof default
+syn keyword   solReserved         define final implements in inline let macro match
+syn keyword   solReserved         mutable null of partial promise reference relocatable
+syn keyword   solReserved         sealed sizeof static supports switch typedef typeof unchecked
+
+hi def link   solReserved         Error
+
+" Pragma
+syn keyword   solPragma           pragma
+syn match     solPragmaVersion    /\(pragma\s*\)\@<=\<solidity\>/
+syn match     solPragmaExp        /\(pragma\s*\)\@<=\<experimental\s*\(ABIEncoderV2\|SMTChecker\)\>/
+syn match     solPragmaABICoder   /\(pragma\s*\)\@<=\<abicoder\s*\(v1\|v2\)\>/
+
+hi def link   solPragma           PreProc
+hi def link   solPragmaVersion    PreProc
+hi def link   solPragmaExp        PreProc
+hi def link   solPragmaABICoder   PreProc
+
+" Assembly
+syn keyword   solAssemblyName     assembly  contained
+syn region    solAssemblyBlock    start=/\<assembly\s*{/ end=/}/ contained contains=solAssemblyName,solAssemblyLet,solAssemblyOperator,solAssemblyConst,solAssemblyMethod,solComment,solNumber,solString,solOperator,solAssemblyCond,solAssmNestedBlock
+syn match     solAssemblyOperator /\(:=\)/ contained
+syn keyword   solAssemblyLet      let contained
+syn keyword   solAssemblyMethod   stop add sub mul div sdiv mod smod exp not lt gt slt sgt eq iszero contained
+syn keyword   solAssemblyMethod   and or xor byte shl shr sar addmod mulmod signextend keccak256 jump contained
+syn keyword   solAssemblyMethod   jumpi pop mload mstore mstore8 sload sstore calldataload calldatacopy contained
+syn keyword   solAssemblyMethod   codecopy extcodesize extcodecopy returndatacopy extcodehash create create2 contained
+syn keyword   solAssemblyMethod   call callcode delegatecall staticcall return revert selfdestruct contained
+syn keyword   solAssemblyMethod   log0 log1 log2 log3 log4 blockhash contained
+syn match     solAssemblyMethod   /\<\(swap\|dup\)\d\>/ contained
+syn keyword   solAssemblyConst    pc msize gas address caller callvalue calldatasize codesize contained
+syn keyword   solAssemblyConst    returndatasize origin gasprice coinbase timestamp number difficulty gaslimit contained
+syn keyword   solAssemblyCond     if else contained
+syn region    solAssmNestedBlock  start=/\(assembly\s*\)\@<!{/ end=/}/ contained skipwhite skipempty transparent
+
+hi def link   solAssemblyBlock    PreProc
+hi def link   solAssemblyName     Special
+hi def link   solAssemblyOperator Operator
+hi def link   solAssemblyLet      Keyword
+hi def link   solAssemblyMethod   Special
+hi def link   solAssemblyConst    Constant
+hi def link   solAssemblyCond     Conditional
+
+" Builtin Methods
+syn keyword   solMethod           delete new var return import
+syn region    solMethodParens     start='(' end=')' contains=solString,solConstant,solNumber,solFuncCall,solTypeCast,solMethod,solComma,solOperator contained transparent
+syn keyword   solMethod           nextgroup=solMethodParens skipwhite skipempty
+      \ blockhash require revert assert keccak256 sha256
+      \ ripemd160 ecrecover addmod mullmod selfdestruct
+
+hi def link   solMethod           Special
+
+" Miscellaneous
+syn keyword   solRepeat           do
+syn keyword   solLabel            break continue
+syn keyword   solException        throw
+
+hi def link   solRepeat           Repeat
+hi def link   solLabel            Label
+hi def link   solException        Exception
+
+" Simple Types
+syn match     solValueType        /\<uint\d*\>/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<int\d*\>/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<fixed\d*\>/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<ufixed\d*\>/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<bytes\d*\>/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<address\>/ nextgroup=solPayableType,solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<string\>/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<bool\>/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+
+syn match     solValueType        /\<uint\d*\s*\[\]/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<int\d*\s*\[\]/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<fixed\d*\s*\[\]/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<ufixed\d*\s*\[\]/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<bytes\d*\s*\[\]/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<address\s*\(payable\)*\s*\[\]/ contains=solPayableType nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /\<string\s*\[\]/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+syn match     solValueType        /bool\s*\[\]/ nextgroup=solStorageType,solStorageConst,solStorageImmutable skipwhite skipempty
+
+syn match     solTypeCast         /\<uint\d*\ze\s*(/ nextgroup=solTypeCastParens skipwhite skipempty
+syn match     solTypeCast         /\<int\d*\ze\s*(/ nextgroup=solTypeCastParens skipwhite skipempty
+syn match     solTypeCast         /\<ufixed\d*\ze\s*(/ nextgroup=solTypeCastParens skipwhite skipempty
+syn match     solTypeCast         /\<bytes\d*\ze\s*(/ nextgroup=solTypeCastParens skipwhite skipempty
+syn match     solTypeCast         /\<address\ze\s*(/ nextgroup=solTypeCastParens skipwhite skipempty
+syn match     solTypeCast         /\<string\ze\s*(/ nextgroup=solTypeCastParens skipwhite skipempty
+syn match     solTypeCast         /\<bool\ze\s*(/ nextgroup=solTypeCastParens skipwhite skipempty
+syn region    solTypeCastParens   start=/(/ end=/)/ contained contains=solMethod,solFuncCall,solString,solConstant,solNumber,solTypeCast,solComma transparent
+
+hi def link   solValueType        Type
+hi def link   solTypeCast         Type
+
+" Conditionals
+syn match     solIf               /\<if\>/ contained skipwhite skipempty nextgroup=solIfParens
+syn match     solElse             /\<else\>/ contained skipwhite skipempty nextgroup=solIf,solIfBlock
+syn region    solIfParens         start=/(/ end=/)/ contained nextgroup=solIfBlock skipwhite skipempty transparent
+syn region    solIfBlock          start=/{/ end=/}/ contained nextgroup=solElse skipwhite skipempty transparent
+
+hi def link   solIf               Keyword
+hi def link   solElse             Keyword
+
+" Loops
+syn match     solLoop             /\(\<for\>\|\<while\>\)/ contained skipwhite skipempty nextgroup=solLoopParens
+syn region    solLoopParens       start=/(/ end=/)/ contained nextgroup=solLoopBlock skipwhite skipempty transparent
+syn region    solLoopBlock        start=/{/ end=/}/ contained skipwhite skipempty transparent
+
+hi def link   solLoop             Keyword
+
+
+" Comments
+syn keyword   solTodo             TODO FIXME XXX TBD contained
+syn region    solComment          start=/\/\// end=/$/ contains=solTodo
+syn region    solComment          start=/\/\*/ end=/\*\// contains=solTodo
+
+hi def link   solTodo             Todo
+hi def link   solComment          Comment
+
+" Natspec
+syn match     solNatspecTag       /@dev\>/ contained
+syn match     solNatspecTag       /@title\>/ contained
+syn match     solNatspecTag       /@author\>/ contained
+syn match     solNatspecTag       /@notice\>/ contained
+syn match     solNatspecTag       /@param\>/ contained
+syn match     solNatspecTag       /@return\>/ contained
+syn match     solNatspecParam     /\(@param\s*\)\@<=\<[a-zA-Z_][0-9a-zA-Z_]*/
+syn region    solNatspecBlock     start=/\/\/\// end=/$/ contains=solTodo,solNatspecTag,solNatspecParam
+syn region    solNatspecBlock     start=/\/\*\{2}/ end=/\*\// contains=solTodo,solNatspecTag,solNatspecParam
+
+hi def link   solNatspecTag       SpecialComment
+hi def link   solNatspecBlock     Comment
+hi def link   solNatspecParam     Define

From 7d0a1706ecf95f20275f2b55340e18e37fa512bd Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Apr 2021 12:04:39 +0200
Subject: [PATCH 238/299] Switch clojure provider, closes #685

---
 README.md                    |  2 +-
 autoload/clojurecomplete.vim | 17 +++----
 ftplugin/clojure.vim         | 33 ++++---------
 indent/clojure.vim           | 51 +++++++++++++++-----
 packages.yaml                |  2 +-
 syntax/clojure.vim           | 92 +++++++++++++++++-------------------
 6 files changed, 103 insertions(+), 94 deletions(-)

diff --git a/README.md b/README.md
index 5ac40b44c..71a866314 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [caddyfile](https://github.com/isobit/vim-caddyfile)
 - [carp](https://github.com/hellerve/carp-vim) (Syntax highlighting for carp files)
 - [cjsx](https://github.com/mtscout6/vim-cjsx)
-- [clojure](https://github.com/guns/vim-clojure-static) (Clojure syntax highlighting for clj, boot, cl2, cljc, cljs, cljs.hl, cljscm, cljx, hic and edn files)
+- [clojure](https://github.com/clojure-vim/clojure.vim) (Clojure syntax highlighting for clj, boot, cl2, cljc, cljs, cljs.hl, cljscm, cljx, hic and edn files)
 - [cmake](https://github.com/pboettch/vim-cmake-syntax) (CMake syntax highlighting for cmake and cmake.in files)
 - [coffee-script](https://github.com/kchmck/vim-coffee-script) (CoffeeScript and Literate CoffeeScript syntax highlighting for coffee, cake, cjsx, iced, coffeekup, cson, litcoffee and coffee.md files)
 - [cpp-modern](https://github.com/bfrg/vim-cpp-modern)
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index 6d6a61b1f..d8f69a22f 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -3,16 +3,17 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'clojure', 'autoload/clojureco
 endif
 
 " Vim completion script
-" Language:     Clojure
-" Maintainer:   Sung Pae <self@sungpae.com>
-" URL:          https://github.com/guns/vim-clojure-static
-" License:      Same as Vim
-" Last Change:  %%RELEASE_DATE%%
+" Language:           Clojure
+" Maintainer:         Alex Vear <av@axvr.io>
+" Former Maintainers: Sung Pae <self@sungpae.com>
+" URL:                https://github.com/clojure-vim/clojure.vim
+" License:            Vim (see :h license)
+" Last Change:        %%RELEASE_DATE%%
 
 " -*- COMPLETION WORDS -*-
-" Generated from https://github.com/guns/vim-clojure-static/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-" Clojure version 1.8.0
-let s:words = ["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-readably*","*read-eval*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Throwable->map","accessor","aclone","add-classpath","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc!","assoc","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","booleans","bound-fn","bound-fn*","bound?","butlast","byte","byte-array","bytes","case","cast","cat","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj!","conj","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj!","disj","dissoc!","dissoc","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-data","ex-info","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","identical?","identity","if","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","init-proxy","instance?","int","int-array","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","neg?","new","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop!","pop","pop-thread-bindings","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","quot","quote","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-watch","repeat","repeatedly","replace","replicate","require","reset!","reset-meta!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seque","sequence","sequential?","set!","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","use","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
+" Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
+" Clojure version 1.10.2
+let s:words = ["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Inst","PrintWriter-on","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","any?","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc!","assoc","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case","case-fallthrough-err-impl","cast","cat","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj!","conj","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj!","disj","dissoc!","dissoc","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","if","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","new","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop!","pop","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","quote","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set!","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
 
 " Simple word completion for special forms and public vars in clojure.core
 function! clojurecomplete#Complete(findstart, base)
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 279d4283e..8919fd007 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -3,13 +3,13 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'clojure', 'ftplugin/clojure.v
 endif
 
 " Vim filetype plugin file
-" Language:     Clojure
-" Author:       Meikel Brandmeyer <mb@kotka.de>
-"
-" Maintainer:   Sung Pae <self@sungpae.com>
-" URL:          https://github.com/guns/vim-clojure-static
-" License:      Same as Vim
-" Last Change:  %%RELEASE_DATE%%
+" Language:           Clojure
+" Maintainer:         Alex Vear <av@axvr.io>
+" Former Maintainers: Sung Pae <self@sungpae.com>
+"                     Meikel Brandmeyer <mb@kotka.de>
+" URL:                https://github.com/clojure-vim/clojure.vim
+" License:            Vim (see :h license)
+" Last Change:        %%RELEASE_DATE%%
 
 if exists("b:did_ftplugin")
 	finish
@@ -21,7 +21,7 @@ set cpo&vim
 
 let b:undo_ftplugin = 'setlocal iskeyword< define< formatoptions< comments< commentstring< lispwords<'
 
-setlocal iskeyword+=?,-,*,!,+,/,=,<,>,.,:,$
+setlocal iskeyword+=?,-,*,!,+,/,=,<,>,.,:,$,%,&,\|
 
 " There will be false positives, but this is better than missing the whole set
 " of user-defined def* definitions.
@@ -47,7 +47,7 @@ setlocal commentstring=;\ %s
 " specially and hence are not indented specially.
 "
 " -*- LISPWORDS -*-
-" Generated from https://github.com/guns/vim-clojure-static/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
+" Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
 setlocal lispwords=as->,binding,bound-fn,case,catch,cond->,cond->>,condp,def,definline,definterface,defmacro,defmethod,defmulti,defn,defn-,defonce,defprotocol,defrecord,defstruct,deftest,deftest-,deftype,doseq,dotimes,doto,extend,extend-protocol,extend-type,fn,for,if,if-let,if-not,if-some,let,letfn,locking,loop,ns,proxy,reify,set-test,testing,when,when-first,when-let,when-not,when-some,while,with-bindings,with-in-str,with-local-vars,with-open,with-precision,with-redefs,with-redefs-fn,with-test
 
 " Provide insert mode completions for special forms and clojure.core. As
@@ -61,21 +61,6 @@ for s:setting in ['omnifunc', 'completefunc']
 	endif
 endfor
 
-" Take all directories of the CLOJURE_SOURCE_DIRS environment variable
-" and add them to the path option.
-"
-" This is a legacy option for VimClojure users.
-if exists('$CLOJURE_SOURCE_DIRS')
-	for s:dir in split($CLOJURE_SOURCE_DIRS, (has("win32") || has("win64")) ? ';' : ':')
-		let s:dir = fnameescape(s:dir)
-		" Whitespace escaping for Windows
-		let s:dir = substitute(s:dir, '\', '\\\\', 'g')
-		let s:dir = substitute(s:dir, '\ ', '\\ ', 'g')
-		execute "setlocal path+=" . s:dir . "/**"
-	endfor
-	let b:undo_ftplugin .= ' | setlocal path<'
-endif
-
 " Skip brackets in ignored syntax regions when using the % command
 if exists('loaded_matchit')
 	let b:match_words = &matchpairs
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 0ff1ea7e3..ac4544bb9 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -3,14 +3,13 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'clojure', 'indent/clojure.vim
 endif
 
 " Vim indent file
-" Language:     Clojure
-" Author:       Meikel Brandmeyer <mb@kotka.de>
-" URL:          http://kotka.de/projects/clojure/vimclojure.html
-"
-" Maintainer:   Sung Pae <self@sungpae.com>
-" URL:          https://github.com/guns/vim-clojure-static
-" License:      Same as Vim
-" Last Change:  %%RELEASE_DATE%%
+" Language:           Clojure
+" Maintainer:         Alex Vear <av@axvr.io>
+" Former Maintainers: Sung Pae <self@sungpae.com>
+"                     Meikel Brandmeyer <mb@kotka.de>
+" URL:                https://github.com/clojure-vim/clojure.vim
+" License:            Vim (see :h license)
+" Last Change:        %%RELEASE_DATE%%
 
 if exists("b:did_indent")
 	finish
@@ -29,7 +28,7 @@ setlocal indentkeys=!,o,O
 if exists("*searchpairpos")
 
 	if !exists('g:clojure_maxlines')
-		let g:clojure_maxlines = 100
+		let g:clojure_maxlines = 300
 	endif
 
 	if !exists('g:clojure_fuzzy_indent')
@@ -61,7 +60,8 @@ if exists("*searchpairpos")
 	endfunction
 
 	function! s:ignored_region()
-		return s:syn_id_name() =~? '\vstring|regex|comment|character'
+		let name = s:syn_id_name()
+		return (name =~? '\vstring|regex|comment|character') && (name !~# '^clojureCommentReaderMacro\(Form\)\?$')
 	endfunction
 
 	function! s:current_char()
@@ -174,7 +174,35 @@ if exists("*searchpairpos")
 
 		call search('\S', 'W')
 		let w = s:strip_namespace_and_macro_chars(s:current_word())
+
 		if g:clojure_special_indent_words =~# '\V\<' . w . '\>'
+
+			" `letfn` is a special-special-case.
+			if w ==# 'letfn'
+				" Earlier code left the cursor at:
+				"     (letfn [...] ...)
+				"      ^
+
+				" Search and get coordinates of first `[`
+				"     (letfn [...] ...)
+				"            ^
+				call search('\[', 'W')
+				let pos = getcurpos()
+				let letfn_bracket = [pos[1], pos[2]]
+
+				" Move cursor to start of the form this function was
+				" initially called on.  Grab the coordinates of the
+				" closest outer `[`.
+				call cursor(a:position)
+				let outer_bracket = s:match_pairs('\[', '\]', 0)
+
+				" If the located square brackets are not the same,
+				" don't use special-case formatting.
+				if outer_bracket != letfn_bracket
+					return 0
+				endif
+			endif
+
 			return 1
 		endif
 
@@ -192,9 +220,10 @@ if exists("*searchpairpos")
 	endfunction
 
 	" Check if form is a reader conditional, that is, it is prefixed by #?
-	" or @#?
+	" or #?@
 	function! s:is_reader_conditional_special_case(position)
 		return getline(a:position[0])[a:position[1] - 3 : a:position[1] - 2] == "#?"
+			\|| getline(a:position[0])[a:position[1] - 4 : a:position[1] - 2] == "#?@"
 	endfunction
 
 	" Returns 1 for opening brackets, -1 for _anything else_.
diff --git a/packages.yaml b/packages.yaml
index ac0dce428..334d559ad 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -376,7 +376,7 @@ filetypes:
   - carp
 ---
 name: clojure
-remote: guns/vim-clojure-static
+remote: clojure-vim/clojure.vim
 filetypes:
 - name: clojure
   linguist: Clojure
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index 46b43ea2c..03d9a2750 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -2,18 +2,16 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'clojure', 'syntax/clojure.vim
   finish
 endif
 
-" Vim syntax file
-" Language:     Clojure
-" Authors:      Toralf Wittner <toralf.wittner@gmail.com>
-"               modified by Meikel Brandmeyer <mb@kotka.de>
-" URL:          http://kotka.de/projects/clojure/vimclojure.html
-"
-" Contributors: Joel Holdbrooks <cjholdbrooks@gmail.com> (Regexp support, bug fixes)
-"
-" Maintainer:   Sung Pae <self@sungpae.com>
-" URL:          https://github.com/guns/vim-clojure-static
-" License:      Same as Vim
-" Last Change:  %%RELEASE_DATE%%
+" Vim indent file
+" Language:           Clojure
+" Maintainer:         Alex Vear <av@axvr.io>
+" Former Maintainers: Sung Pae <self@sungpae.com>
+"                     Meikel Brandmeyer <mb@kotka.de>
+"                     Toralf Wittner <toralf.wittner@gmail.com>
+" Contributors:       Joel Holdbrooks <cjholdbrooks@gmail.com> (Regexp support, bug fixes)
+" URL:                https://github.com/clojure-vim/clojure.vim
+" License:            Vim (see :h license)
+" Last Change:        %%RELEASE_DATE%%
 
 if exists("b:current_syntax")
 	finish
@@ -27,19 +25,19 @@ if has("folding") && exists("g:clojure_fold") && g:clojure_fold > 0
 endif
 
 " -*- KEYWORDS -*-
-" Generated from https://github.com/guns/vim-clojure-static/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-" Clojure version 1.8.0
+" Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
+" Clojure version 1.10.2
 let s:clojure_syntax_keywords = {
     \   'clojureBoolean': ["false","true"]
     \ , 'clojureCond': ["case","clojure.core/case","clojure.core/cond","clojure.core/cond->","clojure.core/cond->>","clojure.core/condp","clojure.core/if-let","clojure.core/if-not","clojure.core/if-some","clojure.core/when","clojure.core/when-first","clojure.core/when-let","clojure.core/when-not","clojure.core/when-some","cond","cond->","cond->>","condp","if-let","if-not","if-some","when","when-first","when-let","when-not","when-some"]
     \ , 'clojureConstant': ["nil"]
     \ , 'clojureDefine': ["clojure.core/definline","clojure.core/definterface","clojure.core/defmacro","clojure.core/defmethod","clojure.core/defmulti","clojure.core/defn","clojure.core/defn-","clojure.core/defonce","clojure.core/defprotocol","clojure.core/defrecord","clojure.core/defstruct","clojure.core/deftype","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype"]
     \ , 'clojureException': ["catch","finally","throw","try"]
-    \ , 'clojureFunc': ["*","*'","+","+'","-","-'","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods","/","<","<=","=","==",">",">=","Throwable->map","accessor","aclone","add-classpath","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","ancestors","apply","array-map","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","booleans","bound-fn*","bound?","butlast","byte","byte-array","bytes","cast","cat","char","char-array","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","clojure.core/*","clojure.core/*'","clojure.core/+","clojure.core/+'","clojure.core/-","clojure.core/-'","clojure.core/->ArrayChunk","clojure.core/->Eduction","clojure.core/->Vec","clojure.core/->VecNode","clojure.core/->VecSeq","clojure.core/-cache-protocol-fn","clojure.core/-reset-methods","clojure.core//","clojure.core/<","clojure.core/<=","clojure.core/=","clojure.core/==","clojure.core/>","clojure.core/>=","clojure.core/Throwable->map","clojure.core/accessor","clojure.core/aclone","clojure.core/add-classpath","clojure.core/add-watch","clojure.core/agent","clojure.core/agent-error","clojure.core/agent-errors","clojure.core/aget","clojure.core/alength","clojure.core/alias","clojure.core/all-ns","clojure.core/alter","clojure.core/alter-meta!","clojure.core/alter-var-root","clojure.core/ancestors","clojure.core/apply","clojure.core/array-map","clojure.core/aset","clojure.core/aset-boolean","clojure.core/aset-byte","clojure.core/aset-char","clojure.core/aset-double","clojure.core/aset-float","clojure.core/aset-int","clojure.core/aset-long","clojure.core/aset-short","clojure.core/assoc","clojure.core/assoc!","clojure.core/assoc-in","clojure.core/associative?","clojure.core/atom","clojure.core/await","clojure.core/await-for","clojure.core/await1","clojure.core/bases","clojure.core/bean","clojure.core/bigdec","clojure.core/bigint","clojure.core/biginteger","clojure.core/bit-and","clojure.core/bit-and-not","clojure.core/bit-clear","clojure.core/bit-flip","clojure.core/bit-not","clojure.core/bit-or","clojure.core/bit-set","clojure.core/bit-shift-left","clojure.core/bit-shift-right","clojure.core/bit-test","clojure.core/bit-xor","clojure.core/boolean","clojure.core/boolean-array","clojure.core/booleans","clojure.core/bound-fn*","clojure.core/bound?","clojure.core/butlast","clojure.core/byte","clojure.core/byte-array","clojure.core/bytes","clojure.core/cast","clojure.core/cat","clojure.core/char","clojure.core/char-array","clojure.core/char?","clojure.core/chars","clojure.core/chunk","clojure.core/chunk-append","clojure.core/chunk-buffer","clojure.core/chunk-cons","clojure.core/chunk-first","clojure.core/chunk-next","clojure.core/chunk-rest","clojure.core/chunked-seq?","clojure.core/class","clojure.core/class?","clojure.core/clear-agent-errors","clojure.core/clojure-version","clojure.core/coll?","clojure.core/commute","clojure.core/comp","clojure.core/comparator","clojure.core/compare","clojure.core/compare-and-set!","clojure.core/compile","clojure.core/complement","clojure.core/completing","clojure.core/concat","clojure.core/conj","clojure.core/conj!","clojure.core/cons","clojure.core/constantly","clojure.core/construct-proxy","clojure.core/contains?","clojure.core/count","clojure.core/counted?","clojure.core/create-ns","clojure.core/create-struct","clojure.core/cycle","clojure.core/dec","clojure.core/dec'","clojure.core/decimal?","clojure.core/dedupe","clojure.core/delay?","clojure.core/deliver","clojure.core/denominator","clojure.core/deref","clojure.core/derive","clojure.core/descendants","clojure.core/destructure","clojure.core/disj","clojure.core/disj!","clojure.core/dissoc","clojure.core/dissoc!","clojure.core/distinct","clojure.core/distinct?","clojure.core/doall","clojure.core/dorun","clojure.core/double","clojure.core/double-array","clojure.core/doubles","clojure.core/drop","clojure.core/drop-last","clojure.core/drop-while","clojure.core/eduction","clojure.core/empty","clojure.core/empty?","clojure.core/ensure","clojure.core/ensure-reduced","clojure.core/enumeration-seq","clojure.core/error-handler","clojure.core/error-mode","clojure.core/eval","clojure.core/even?","clojure.core/every-pred","clojure.core/every?","clojure.core/ex-data","clojure.core/ex-info","clojure.core/extend","clojure.core/extenders","clojure.core/extends?","clojure.core/false?","clojure.core/ffirst","clojure.core/file-seq","clojure.core/filter","clojure.core/filterv","clojure.core/find","clojure.core/find-keyword","clojure.core/find-ns","clojure.core/find-protocol-impl","clojure.core/find-protocol-method","clojure.core/find-var","clojure.core/first","clojure.core/flatten","clojure.core/float","clojure.core/float-array","clojure.core/float?","clojure.core/floats","clojure.core/flush","clojure.core/fn?","clojure.core/fnext","clojure.core/fnil","clojure.core/force","clojure.core/format","clojure.core/frequencies","clojure.core/future-call","clojure.core/future-cancel","clojure.core/future-cancelled?","clojure.core/future-done?","clojure.core/future?","clojure.core/gensym","clojure.core/get","clojure.core/get-in","clojure.core/get-method","clojure.core/get-proxy-class","clojure.core/get-thread-bindings","clojure.core/get-validator","clojure.core/group-by","clojure.core/hash","clojure.core/hash-combine","clojure.core/hash-map","clojure.core/hash-ordered-coll","clojure.core/hash-set","clojure.core/hash-unordered-coll","clojure.core/identical?","clojure.core/identity","clojure.core/ifn?","clojure.core/in-ns","clojure.core/inc","clojure.core/inc'","clojure.core/init-proxy","clojure.core/instance?","clojure.core/int","clojure.core/int-array","clojure.core/integer?","clojure.core/interleave","clojure.core/intern","clojure.core/interpose","clojure.core/into","clojure.core/into-array","clojure.core/ints","clojure.core/isa?","clojure.core/iterate","clojure.core/iterator-seq","clojure.core/juxt","clojure.core/keep","clojure.core/keep-indexed","clojure.core/key","clojure.core/keys","clojure.core/keyword","clojure.core/keyword?","clojure.core/last","clojure.core/line-seq","clojure.core/list","clojure.core/list*","clojure.core/list?","clojure.core/load","clojure.core/load-file","clojure.core/load-reader","clojure.core/load-string","clojure.core/loaded-libs","clojure.core/long","clojure.core/long-array","clojure.core/longs","clojure.core/macroexpand","clojure.core/macroexpand-1","clojure.core/make-array","clojure.core/make-hierarchy","clojure.core/map","clojure.core/map-entry?","clojure.core/map-indexed","clojure.core/map?","clojure.core/mapcat","clojure.core/mapv","clojure.core/max","clojure.core/max-key","clojure.core/memoize","clojure.core/merge","clojure.core/merge-with","clojure.core/meta","clojure.core/method-sig","clojure.core/methods","clojure.core/min","clojure.core/min-key","clojure.core/mix-collection-hash","clojure.core/mod","clojure.core/munge","clojure.core/name","clojure.core/namespace","clojure.core/namespace-munge","clojure.core/neg?","clojure.core/newline","clojure.core/next","clojure.core/nfirst","clojure.core/nil?","clojure.core/nnext","clojure.core/not","clojure.core/not-any?","clojure.core/not-empty","clojure.core/not-every?","clojure.core/not=","clojure.core/ns-aliases","clojure.core/ns-imports","clojure.core/ns-interns","clojure.core/ns-map","clojure.core/ns-name","clojure.core/ns-publics","clojure.core/ns-refers","clojure.core/ns-resolve","clojure.core/ns-unalias","clojure.core/ns-unmap","clojure.core/nth","clojure.core/nthnext","clojure.core/nthrest","clojure.core/num","clojure.core/number?","clojure.core/numerator","clojure.core/object-array","clojure.core/odd?","clojure.core/parents","clojure.core/partial","clojure.core/partition","clojure.core/partition-all","clojure.core/partition-by","clojure.core/pcalls","clojure.core/peek","clojure.core/persistent!","clojure.core/pmap","clojure.core/pop","clojure.core/pop!","clojure.core/pop-thread-bindings","clojure.core/pos?","clojure.core/pr","clojure.core/pr-str","clojure.core/prefer-method","clojure.core/prefers","clojure.core/print","clojure.core/print-ctor","clojure.core/print-dup","clojure.core/print-method","clojure.core/print-simple","clojure.core/print-str","clojure.core/printf","clojure.core/println","clojure.core/println-str","clojure.core/prn","clojure.core/prn-str","clojure.core/promise","clojure.core/proxy-call-with-super","clojure.core/proxy-mappings","clojure.core/proxy-name","clojure.core/push-thread-bindings","clojure.core/quot","clojure.core/rand","clojure.core/rand-int","clojure.core/rand-nth","clojure.core/random-sample","clojure.core/range","clojure.core/ratio?","clojure.core/rational?","clojure.core/rationalize","clojure.core/re-find","clojure.core/re-groups","clojure.core/re-matcher","clojure.core/re-matches","clojure.core/re-pattern","clojure.core/re-seq","clojure.core/read","clojure.core/read-line","clojure.core/read-string","clojure.core/reader-conditional","clojure.core/reader-conditional?","clojure.core/realized?","clojure.core/record?","clojure.core/reduce","clojure.core/reduce-kv","clojure.core/reduced","clojure.core/reduced?","clojure.core/reductions","clojure.core/ref","clojure.core/ref-history-count","clojure.core/ref-max-history","clojure.core/ref-min-history","clojure.core/ref-set","clojure.core/refer","clojure.core/release-pending-sends","clojure.core/rem","clojure.core/remove","clojure.core/remove-all-methods","clojure.core/remove-method","clojure.core/remove-ns","clojure.core/remove-watch","clojure.core/repeat","clojure.core/repeatedly","clojure.core/replace","clojure.core/replicate","clojure.core/require","clojure.core/reset!","clojure.core/reset-meta!","clojure.core/resolve","clojure.core/rest","clojure.core/restart-agent","clojure.core/resultset-seq","clojure.core/reverse","clojure.core/reversible?","clojure.core/rseq","clojure.core/rsubseq","clojure.core/run!","clojure.core/satisfies?","clojure.core/second","clojure.core/select-keys","clojure.core/send","clojure.core/send-off","clojure.core/send-via","clojure.core/seq","clojure.core/seq?","clojure.core/seque","clojure.core/sequence","clojure.core/sequential?","clojure.core/set","clojure.core/set-agent-send-executor!","clojure.core/set-agent-send-off-executor!","clojure.core/set-error-handler!","clojure.core/set-error-mode!","clojure.core/set-validator!","clojure.core/set?","clojure.core/short","clojure.core/short-array","clojure.core/shorts","clojure.core/shuffle","clojure.core/shutdown-agents","clojure.core/slurp","clojure.core/some","clojure.core/some-fn","clojure.core/some?","clojure.core/sort","clojure.core/sort-by","clojure.core/sorted-map","clojure.core/sorted-map-by","clojure.core/sorted-set","clojure.core/sorted-set-by","clojure.core/sorted?","clojure.core/special-symbol?","clojure.core/spit","clojure.core/split-at","clojure.core/split-with","clojure.core/str","clojure.core/string?","clojure.core/struct","clojure.core/struct-map","clojure.core/subs","clojure.core/subseq","clojure.core/subvec","clojure.core/supers","clojure.core/swap!","clojure.core/symbol","clojure.core/symbol?","clojure.core/tagged-literal","clojure.core/tagged-literal?","clojure.core/take","clojure.core/take-last","clojure.core/take-nth","clojure.core/take-while","clojure.core/test","clojure.core/the-ns","clojure.core/thread-bound?","clojure.core/to-array","clojure.core/to-array-2d","clojure.core/trampoline","clojure.core/transduce","clojure.core/transient","clojure.core/tree-seq","clojure.core/true?","clojure.core/type","clojure.core/unchecked-add","clojure.core/unchecked-add-int","clojure.core/unchecked-byte","clojure.core/unchecked-char","clojure.core/unchecked-dec","clojure.core/unchecked-dec-int","clojure.core/unchecked-divide-int","clojure.core/unchecked-double","clojure.core/unchecked-float","clojure.core/unchecked-inc","clojure.core/unchecked-inc-int","clojure.core/unchecked-int","clojure.core/unchecked-long","clojure.core/unchecked-multiply","clojure.core/unchecked-multiply-int","clojure.core/unchecked-negate","clojure.core/unchecked-negate-int","clojure.core/unchecked-remainder-int","clojure.core/unchecked-short","clojure.core/unchecked-subtract","clojure.core/unchecked-subtract-int","clojure.core/underive","clojure.core/unreduced","clojure.core/unsigned-bit-shift-right","clojure.core/update","clojure.core/update-in","clojure.core/update-proxy","clojure.core/use","clojure.core/val","clojure.core/vals","clojure.core/var-get","clojure.core/var-set","clojure.core/var?","clojure.core/vary-meta","clojure.core/vec","clojure.core/vector","clojure.core/vector-of","clojure.core/vector?","clojure.core/volatile!","clojure.core/volatile?","clojure.core/vreset!","clojure.core/with-bindings*","clojure.core/with-meta","clojure.core/with-redefs-fn","clojure.core/xml-seq","clojure.core/zero?","clojure.core/zipmap","coll?","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","dedupe","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","doall","dorun","double","double-array","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-data","ex-info","extend","extenders","extends?","false?","ffirst","file-seq","filter","filterv","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn?","fnext","fnil","force","format","frequencies","future-call","future-cancel","future-cancelled?","future-done?","future?","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","identical?","identity","ifn?","in-ns","inc","inc'","init-proxy","instance?","int","int-array","integer?","interleave","intern","interpose","into","into-array","ints","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","long","long-array","longs","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","munge","name","namespace","namespace-munge","neg?","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos?","pr","pr-str","prefer-method","prefers","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy-call-with-super","proxy-mappings","proxy-name","push-thread-bindings","quot","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-watch","repeat","repeatedly","replace","replicate","require","reset!","reset-meta!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seque","sequence","sequential?","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","slurp","some","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","symbol","symbol?","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","test","the-ns","thread-bound?","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","use","val","vals","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","with-bindings*","with-meta","with-redefs-fn","xml-seq","zero?","zipmap"]
+    \ , 'clojureFunc': ["*","*'","+","+'","-","-'","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods","/","<","<=","=","==",">",">=","PrintWriter-on","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","ancestors","any?","apply","array-map","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case-fallthrough-err-impl","cast","cat","char","char-array","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","clojure.core/*","clojure.core/*'","clojure.core/+","clojure.core/+'","clojure.core/-","clojure.core/-'","clojure.core/->ArrayChunk","clojure.core/->Eduction","clojure.core/->Vec","clojure.core/->VecNode","clojure.core/->VecSeq","clojure.core/-cache-protocol-fn","clojure.core/-reset-methods","clojure.core//","clojure.core/<","clojure.core/<=","clojure.core/=","clojure.core/==","clojure.core/>","clojure.core/>=","clojure.core/PrintWriter-on","clojure.core/StackTraceElement->vec","clojure.core/Throwable->map","clojure.core/accessor","clojure.core/aclone","clojure.core/add-classpath","clojure.core/add-tap","clojure.core/add-watch","clojure.core/agent","clojure.core/agent-error","clojure.core/agent-errors","clojure.core/aget","clojure.core/alength","clojure.core/alias","clojure.core/all-ns","clojure.core/alter","clojure.core/alter-meta!","clojure.core/alter-var-root","clojure.core/ancestors","clojure.core/any?","clojure.core/apply","clojure.core/array-map","clojure.core/aset","clojure.core/aset-boolean","clojure.core/aset-byte","clojure.core/aset-char","clojure.core/aset-double","clojure.core/aset-float","clojure.core/aset-int","clojure.core/aset-long","clojure.core/aset-short","clojure.core/assoc","clojure.core/assoc!","clojure.core/assoc-in","clojure.core/associative?","clojure.core/atom","clojure.core/await","clojure.core/await-for","clojure.core/await1","clojure.core/bases","clojure.core/bean","clojure.core/bigdec","clojure.core/bigint","clojure.core/biginteger","clojure.core/bit-and","clojure.core/bit-and-not","clojure.core/bit-clear","clojure.core/bit-flip","clojure.core/bit-not","clojure.core/bit-or","clojure.core/bit-set","clojure.core/bit-shift-left","clojure.core/bit-shift-right","clojure.core/bit-test","clojure.core/bit-xor","clojure.core/boolean","clojure.core/boolean-array","clojure.core/boolean?","clojure.core/booleans","clojure.core/bound-fn*","clojure.core/bound?","clojure.core/bounded-count","clojure.core/butlast","clojure.core/byte","clojure.core/byte-array","clojure.core/bytes","clojure.core/bytes?","clojure.core/case-fallthrough-err-impl","clojure.core/cast","clojure.core/cat","clojure.core/char","clojure.core/char-array","clojure.core/char?","clojure.core/chars","clojure.core/chunk","clojure.core/chunk-append","clojure.core/chunk-buffer","clojure.core/chunk-cons","clojure.core/chunk-first","clojure.core/chunk-next","clojure.core/chunk-rest","clojure.core/chunked-seq?","clojure.core/class","clojure.core/class?","clojure.core/clear-agent-errors","clojure.core/clojure-version","clojure.core/coll?","clojure.core/commute","clojure.core/comp","clojure.core/comparator","clojure.core/compare","clojure.core/compare-and-set!","clojure.core/compile","clojure.core/complement","clojure.core/completing","clojure.core/concat","clojure.core/conj","clojure.core/conj!","clojure.core/cons","clojure.core/constantly","clojure.core/construct-proxy","clojure.core/contains?","clojure.core/count","clojure.core/counted?","clojure.core/create-ns","clojure.core/create-struct","clojure.core/cycle","clojure.core/dec","clojure.core/dec'","clojure.core/decimal?","clojure.core/dedupe","clojure.core/delay?","clojure.core/deliver","clojure.core/denominator","clojure.core/deref","clojure.core/derive","clojure.core/descendants","clojure.core/destructure","clojure.core/disj","clojure.core/disj!","clojure.core/dissoc","clojure.core/dissoc!","clojure.core/distinct","clojure.core/distinct?","clojure.core/doall","clojure.core/dorun","clojure.core/double","clojure.core/double-array","clojure.core/double?","clojure.core/doubles","clojure.core/drop","clojure.core/drop-last","clojure.core/drop-while","clojure.core/eduction","clojure.core/empty","clojure.core/empty?","clojure.core/ensure","clojure.core/ensure-reduced","clojure.core/enumeration-seq","clojure.core/error-handler","clojure.core/error-mode","clojure.core/eval","clojure.core/even?","clojure.core/every-pred","clojure.core/every?","clojure.core/ex-cause","clojure.core/ex-data","clojure.core/ex-info","clojure.core/ex-message","clojure.core/extend","clojure.core/extenders","clojure.core/extends?","clojure.core/false?","clojure.core/ffirst","clojure.core/file-seq","clojure.core/filter","clojure.core/filterv","clojure.core/find","clojure.core/find-keyword","clojure.core/find-ns","clojure.core/find-protocol-impl","clojure.core/find-protocol-method","clojure.core/find-var","clojure.core/first","clojure.core/flatten","clojure.core/float","clojure.core/float-array","clojure.core/float?","clojure.core/floats","clojure.core/flush","clojure.core/fn?","clojure.core/fnext","clojure.core/fnil","clojure.core/force","clojure.core/format","clojure.core/frequencies","clojure.core/future-call","clojure.core/future-cancel","clojure.core/future-cancelled?","clojure.core/future-done?","clojure.core/future?","clojure.core/gensym","clojure.core/get","clojure.core/get-in","clojure.core/get-method","clojure.core/get-proxy-class","clojure.core/get-thread-bindings","clojure.core/get-validator","clojure.core/group-by","clojure.core/halt-when","clojure.core/hash","clojure.core/hash-combine","clojure.core/hash-map","clojure.core/hash-ordered-coll","clojure.core/hash-set","clojure.core/hash-unordered-coll","clojure.core/ident?","clojure.core/identical?","clojure.core/identity","clojure.core/ifn?","clojure.core/in-ns","clojure.core/inc","clojure.core/inc'","clojure.core/indexed?","clojure.core/init-proxy","clojure.core/inst-ms","clojure.core/inst-ms*","clojure.core/inst?","clojure.core/instance?","clojure.core/int","clojure.core/int-array","clojure.core/int?","clojure.core/integer?","clojure.core/interleave","clojure.core/intern","clojure.core/interpose","clojure.core/into","clojure.core/into-array","clojure.core/ints","clojure.core/isa?","clojure.core/iterate","clojure.core/iterator-seq","clojure.core/juxt","clojure.core/keep","clojure.core/keep-indexed","clojure.core/key","clojure.core/keys","clojure.core/keyword","clojure.core/keyword?","clojure.core/last","clojure.core/line-seq","clojure.core/list","clojure.core/list*","clojure.core/list?","clojure.core/load","clojure.core/load-file","clojure.core/load-reader","clojure.core/load-string","clojure.core/loaded-libs","clojure.core/long","clojure.core/long-array","clojure.core/longs","clojure.core/macroexpand","clojure.core/macroexpand-1","clojure.core/make-array","clojure.core/make-hierarchy","clojure.core/map","clojure.core/map-entry?","clojure.core/map-indexed","clojure.core/map?","clojure.core/mapcat","clojure.core/mapv","clojure.core/max","clojure.core/max-key","clojure.core/memoize","clojure.core/merge","clojure.core/merge-with","clojure.core/meta","clojure.core/method-sig","clojure.core/methods","clojure.core/min","clojure.core/min-key","clojure.core/mix-collection-hash","clojure.core/mod","clojure.core/munge","clojure.core/name","clojure.core/namespace","clojure.core/namespace-munge","clojure.core/nat-int?","clojure.core/neg-int?","clojure.core/neg?","clojure.core/newline","clojure.core/next","clojure.core/nfirst","clojure.core/nil?","clojure.core/nnext","clojure.core/not","clojure.core/not-any?","clojure.core/not-empty","clojure.core/not-every?","clojure.core/not=","clojure.core/ns-aliases","clojure.core/ns-imports","clojure.core/ns-interns","clojure.core/ns-map","clojure.core/ns-name","clojure.core/ns-publics","clojure.core/ns-refers","clojure.core/ns-resolve","clojure.core/ns-unalias","clojure.core/ns-unmap","clojure.core/nth","clojure.core/nthnext","clojure.core/nthrest","clojure.core/num","clojure.core/number?","clojure.core/numerator","clojure.core/object-array","clojure.core/odd?","clojure.core/parents","clojure.core/partial","clojure.core/partition","clojure.core/partition-all","clojure.core/partition-by","clojure.core/pcalls","clojure.core/peek","clojure.core/persistent!","clojure.core/pmap","clojure.core/pop","clojure.core/pop!","clojure.core/pop-thread-bindings","clojure.core/pos-int?","clojure.core/pos?","clojure.core/pr","clojure.core/pr-str","clojure.core/prefer-method","clojure.core/prefers","clojure.core/print","clojure.core/print-ctor","clojure.core/print-dup","clojure.core/print-method","clojure.core/print-simple","clojure.core/print-str","clojure.core/printf","clojure.core/println","clojure.core/println-str","clojure.core/prn","clojure.core/prn-str","clojure.core/promise","clojure.core/proxy-call-with-super","clojure.core/proxy-mappings","clojure.core/proxy-name","clojure.core/push-thread-bindings","clojure.core/qualified-ident?","clojure.core/qualified-keyword?","clojure.core/qualified-symbol?","clojure.core/quot","clojure.core/rand","clojure.core/rand-int","clojure.core/rand-nth","clojure.core/random-sample","clojure.core/range","clojure.core/ratio?","clojure.core/rational?","clojure.core/rationalize","clojure.core/re-find","clojure.core/re-groups","clojure.core/re-matcher","clojure.core/re-matches","clojure.core/re-pattern","clojure.core/re-seq","clojure.core/read","clojure.core/read+string","clojure.core/read-line","clojure.core/read-string","clojure.core/reader-conditional","clojure.core/reader-conditional?","clojure.core/realized?","clojure.core/record?","clojure.core/reduce","clojure.core/reduce-kv","clojure.core/reduced","clojure.core/reduced?","clojure.core/reductions","clojure.core/ref","clojure.core/ref-history-count","clojure.core/ref-max-history","clojure.core/ref-min-history","clojure.core/ref-set","clojure.core/refer","clojure.core/release-pending-sends","clojure.core/rem","clojure.core/remove","clojure.core/remove-all-methods","clojure.core/remove-method","clojure.core/remove-ns","clojure.core/remove-tap","clojure.core/remove-watch","clojure.core/repeat","clojure.core/repeatedly","clojure.core/replace","clojure.core/replicate","clojure.core/require","clojure.core/requiring-resolve","clojure.core/reset!","clojure.core/reset-meta!","clojure.core/reset-vals!","clojure.core/resolve","clojure.core/rest","clojure.core/restart-agent","clojure.core/resultset-seq","clojure.core/reverse","clojure.core/reversible?","clojure.core/rseq","clojure.core/rsubseq","clojure.core/run!","clojure.core/satisfies?","clojure.core/second","clojure.core/select-keys","clojure.core/send","clojure.core/send-off","clojure.core/send-via","clojure.core/seq","clojure.core/seq?","clojure.core/seqable?","clojure.core/seque","clojure.core/sequence","clojure.core/sequential?","clojure.core/set","clojure.core/set-agent-send-executor!","clojure.core/set-agent-send-off-executor!","clojure.core/set-error-handler!","clojure.core/set-error-mode!","clojure.core/set-validator!","clojure.core/set?","clojure.core/short","clojure.core/short-array","clojure.core/shorts","clojure.core/shuffle","clojure.core/shutdown-agents","clojure.core/simple-ident?","clojure.core/simple-keyword?","clojure.core/simple-symbol?","clojure.core/slurp","clojure.core/some","clojure.core/some-fn","clojure.core/some?","clojure.core/sort","clojure.core/sort-by","clojure.core/sorted-map","clojure.core/sorted-map-by","clojure.core/sorted-set","clojure.core/sorted-set-by","clojure.core/sorted?","clojure.core/special-symbol?","clojure.core/spit","clojure.core/split-at","clojure.core/split-with","clojure.core/str","clojure.core/string?","clojure.core/struct","clojure.core/struct-map","clojure.core/subs","clojure.core/subseq","clojure.core/subvec","clojure.core/supers","clojure.core/swap!","clojure.core/swap-vals!","clojure.core/symbol","clojure.core/symbol?","clojure.core/tagged-literal","clojure.core/tagged-literal?","clojure.core/take","clojure.core/take-last","clojure.core/take-nth","clojure.core/take-while","clojure.core/tap>","clojure.core/test","clojure.core/the-ns","clojure.core/thread-bound?","clojure.core/to-array","clojure.core/to-array-2d","clojure.core/trampoline","clojure.core/transduce","clojure.core/transient","clojure.core/tree-seq","clojure.core/true?","clojure.core/type","clojure.core/unchecked-add","clojure.core/unchecked-add-int","clojure.core/unchecked-byte","clojure.core/unchecked-char","clojure.core/unchecked-dec","clojure.core/unchecked-dec-int","clojure.core/unchecked-divide-int","clojure.core/unchecked-double","clojure.core/unchecked-float","clojure.core/unchecked-inc","clojure.core/unchecked-inc-int","clojure.core/unchecked-int","clojure.core/unchecked-long","clojure.core/unchecked-multiply","clojure.core/unchecked-multiply-int","clojure.core/unchecked-negate","clojure.core/unchecked-negate-int","clojure.core/unchecked-remainder-int","clojure.core/unchecked-short","clojure.core/unchecked-subtract","clojure.core/unchecked-subtract-int","clojure.core/underive","clojure.core/unreduced","clojure.core/unsigned-bit-shift-right","clojure.core/update","clojure.core/update-in","clojure.core/update-proxy","clojure.core/uri?","clojure.core/use","clojure.core/uuid?","clojure.core/val","clojure.core/vals","clojure.core/var-get","clojure.core/var-set","clojure.core/var?","clojure.core/vary-meta","clojure.core/vec","clojure.core/vector","clojure.core/vector-of","clojure.core/vector?","clojure.core/volatile!","clojure.core/volatile?","clojure.core/vreset!","clojure.core/with-bindings*","clojure.core/with-meta","clojure.core/with-redefs-fn","clojure.core/xml-seq","clojure.core/zero?","clojure.core/zipmap","coll?","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","dedupe","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","doall","dorun","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extenders","extends?","false?","ffirst","file-seq","filter","filterv","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn?","fnext","fnil","force","format","frequencies","future-call","future-cancel","future-cancelled?","future-done?","future?","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","ifn?","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","long","long-array","longs","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy-call-with-super","proxy-mappings","proxy-name","push-thread-bindings","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","with-bindings*","with-meta","with-redefs-fn","xml-seq","zero?","zipmap"]
     \ , 'clojureMacro': ["->","->>","..","amap","and","areduce","as->","assert","binding","bound-fn","clojure.core/->","clojure.core/->>","clojure.core/..","clojure.core/amap","clojure.core/and","clojure.core/areduce","clojure.core/as->","clojure.core/assert","clojure.core/binding","clojure.core/bound-fn","clojure.core/comment","clojure.core/declare","clojure.core/delay","clojure.core/dosync","clojure.core/doto","clojure.core/extend-protocol","clojure.core/extend-type","clojure.core/for","clojure.core/future","clojure.core/gen-class","clojure.core/gen-interface","clojure.core/import","clojure.core/io!","clojure.core/lazy-cat","clojure.core/lazy-seq","clojure.core/letfn","clojure.core/locking","clojure.core/memfn","clojure.core/ns","clojure.core/or","clojure.core/proxy","clojure.core/proxy-super","clojure.core/pvalues","clojure.core/refer-clojure","clojure.core/reify","clojure.core/some->","clojure.core/some->>","clojure.core/sync","clojure.core/time","clojure.core/vswap!","clojure.core/with-bindings","clojure.core/with-in-str","clojure.core/with-loading-context","clojure.core/with-local-vars","clojure.core/with-open","clojure.core/with-out-str","clojure.core/with-precision","clojure.core/with-redefs","comment","declare","delay","dosync","doto","extend-protocol","extend-type","for","future","gen-class","gen-interface","import","io!","lazy-cat","lazy-seq","letfn","locking","memfn","ns","or","proxy","proxy-super","pvalues","refer-clojure","reify","some->","some->>","sync","time","vswap!","with-bindings","with-in-str","with-loading-context","with-local-vars","with-open","with-out-str","with-precision","with-redefs"]
     \ , 'clojureRepeat': ["clojure.core/doseq","clojure.core/dotimes","clojure.core/while","doseq","dotimes","while"]
     \ , 'clojureSpecial': [".","clojure.core/fn","clojure.core/let","clojure.core/loop","def","do","fn","if","let","loop","monitor-enter","monitor-exit","new","quote","recur","set!","var"]
-    \ , 'clojureVariable': ["*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-readably*","*read-eval*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","EMPTY-NODE","char-escape-string","char-name-string","clojure.core/*1","clojure.core/*2","clojure.core/*3","clojure.core/*agent*","clojure.core/*allow-unresolved-vars*","clojure.core/*assert*","clojure.core/*clojure-version*","clojure.core/*command-line-args*","clojure.core/*compile-files*","clojure.core/*compile-path*","clojure.core/*compiler-options*","clojure.core/*data-readers*","clojure.core/*default-data-reader-fn*","clojure.core/*e","clojure.core/*err*","clojure.core/*file*","clojure.core/*flush-on-newline*","clojure.core/*fn-loader*","clojure.core/*in*","clojure.core/*math-context*","clojure.core/*ns*","clojure.core/*out*","clojure.core/*print-dup*","clojure.core/*print-length*","clojure.core/*print-level*","clojure.core/*print-meta*","clojure.core/*print-readably*","clojure.core/*read-eval*","clojure.core/*source-path*","clojure.core/*suppress-read*","clojure.core/*unchecked-math*","clojure.core/*use-context-classloader*","clojure.core/*verbose-defrecords*","clojure.core/*warn-on-reflection*","clojure.core/EMPTY-NODE","clojure.core/char-escape-string","clojure.core/char-name-string","clojure.core/default-data-readers","clojure.core/primitives-classnames","clojure.core/unquote","clojure.core/unquote-splicing","default-data-readers","primitives-classnames","unquote","unquote-splicing"]
+    \ , 'clojureVariable': ["*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","EMPTY-NODE","Inst","char-escape-string","char-name-string","clojure.core/*1","clojure.core/*2","clojure.core/*3","clojure.core/*agent*","clojure.core/*allow-unresolved-vars*","clojure.core/*assert*","clojure.core/*clojure-version*","clojure.core/*command-line-args*","clojure.core/*compile-files*","clojure.core/*compile-path*","clojure.core/*compiler-options*","clojure.core/*data-readers*","clojure.core/*default-data-reader-fn*","clojure.core/*e","clojure.core/*err*","clojure.core/*file*","clojure.core/*flush-on-newline*","clojure.core/*fn-loader*","clojure.core/*in*","clojure.core/*math-context*","clojure.core/*ns*","clojure.core/*out*","clojure.core/*print-dup*","clojure.core/*print-length*","clojure.core/*print-level*","clojure.core/*print-meta*","clojure.core/*print-namespace-maps*","clojure.core/*print-readably*","clojure.core/*read-eval*","clojure.core/*reader-resolver*","clojure.core/*source-path*","clojure.core/*suppress-read*","clojure.core/*unchecked-math*","clojure.core/*use-context-classloader*","clojure.core/*verbose-defrecords*","clojure.core/*warn-on-reflection*","clojure.core/EMPTY-NODE","clojure.core/Inst","clojure.core/char-escape-string","clojure.core/char-name-string","clojure.core/default-data-readers","clojure.core/primitives-classnames","clojure.core/unquote","clojure.core/unquote-splicing","default-data-readers","primitives-classnames","unquote","unquote-splicing"]
     \ }
 
 function! s:syntax_keyword(dict)
@@ -74,40 +72,23 @@ delfunction s:syntax_keyword
 "   * Must not end in a : or /
 "   * Must not have two adjacent colons except at the beginning
 "   * Must not contain any reader metacharacters except for ' and #
-syntax match clojureKeyword "\v<:{1,2}%([^ \n\r\t()\[\]{}";@^`~\\%/]+/)*[^ \n\r\t()\[\]{}";@^`~\\%/]+:@<!>"
+syntax match clojureKeyword "\v<:{1,2}%([^ \n\r\t()\[\]{}";@^`~\\%/]+/)*[^ \n\r\t()\[\]{}";@^`~\\%/]+:@1<!>"
 
 syntax match clojureStringEscape "\v\\%([\\btnfr"]|u\x{4}|[0-3]\o{2}|\o{1,2})" contained
 
 syntax region clojureString matchgroup=clojureStringDelimiter start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=clojureStringEscape,@Spell
 
-syntax match clojureCharacter "\\."
-syntax match clojureCharacter "\\o\%([0-3]\o\{2\}\|\o\{1,2\}\)"
-syntax match clojureCharacter "\\u\x\{4\}"
-syntax match clojureCharacter "\\space"
-syntax match clojureCharacter "\\tab"
-syntax match clojureCharacter "\\newline"
-syntax match clojureCharacter "\\return"
-syntax match clojureCharacter "\\backspace"
-syntax match clojureCharacter "\\formfeed"
+syntax match clojureCharacter "\v\\%(o%([0-3]\o{2}|\o{1,2})|u\x{4}|newline|tab|space|return|backspace|formfeed|.)"
 
-syntax match clojureSymbol "\v%([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+%(:?%([a-zA-Z0-9!#$%&*_+=|'<.>/?-]|[^\x00-\x7F]))*[#:]@<!"
+syntax match clojureSymbol "\v%([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+%(:?%([a-zA-Z0-9!#$%&*_+=|'<.>/?-]|[^\x00-\x7F]))*[#:]@1<!"
 
-let s:radix_chars = "0123456789abcdefghijklmnopqrstuvwxyz"
-for s:radix in range(2, 36)
-	execute 'syntax match clojureNumber "\v\c<[-+]?' . s:radix . 'r[' . strpart(s:radix_chars, 0, s:radix) . ']+>"'
-endfor
-unlet! s:radix_chars s:radix
-
-syntax match clojureNumber "\v<[-+]?%(0\o*|0x\x+|[1-9]\d*)N?>"
-syntax match clojureNumber "\v<[-+]?%(0|[1-9]\d*|%(0|[1-9]\d*)\.\d*)%(M|[eE][-+]?\d+)?>"
-syntax match clojureNumber "\v<[-+]?%(0|[1-9]\d*)/%(0|[1-9]\d*)>"
+" NB. Correct matching of radix literals was removed for better performance.
+syntax match clojureNumber "\v<[-+]?%(%([2-9]|[12]\d|3[0-6])[rR][[:alnum:]]+|%(0\o*|0x\x+|[1-9]\d*)N?|%(0|[1-9]\d*|%(0|[1-9]\d*)\.\d*)%(M|[eE][-+]?\d+)?|%(0|[1-9]\d*)/%(0|[1-9]\d*))>"
 
 syntax match clojureVarArg "&"
 
-syntax match clojureQuote "'"
-syntax match clojureQuote "`"
-syntax match clojureUnquote "\~"
-syntax match clojureUnquote "\~@"
+syntax match clojureQuote "\v['`]"
+syntax match clojureUnquote "\v\~\@?"
 syntax match clojureMeta "\^"
 syntax match clojureDeref "@"
 syntax match clojureDispatch "\v#[\^'=<_]?"
@@ -120,16 +101,16 @@ syntax region clojureRegexpQuoted start=/\\Q/ms=e+1 skip=/\\\\\|\\"/ end=/\\E/me
 syntax region clojureRegexpQuote  start=/\\Q/       skip=/\\\\\|\\"/ end=/\\E/       end=/"/me=s-1 contains=clojureRegexpQuoted keepend contained
 
 " -*- CHARACTER PROPERTY CLASSES -*-
-" Generated from https://github.com/guns/vim-clojure-static/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-" Java version 1.8.0_92
+" Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
+" Java version 15.0.2
 syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Cntrl|A%(l%(pha|num)|SCII)|Space|Graph|Upper|P%(rint|unct)|Blank|XDigit|Digit|Lower)\}" contained display
 syntax match clojureRegexpJavaCharClass "\v\\[pP]\{java%(Whitespace|JavaIdentifier%(Part|Start)|SpaceChar|Mirrored|TitleCase|I%(SOControl|de%(ographic|ntifierIgnorable))|D%(efined|igit)|U%(pperCase|nicodeIdentifier%(Part|Start))|L%(etter%(OrDigit)?|owerCase)|Alphabetic)\}" contained display
 syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\cIs%(l%(owercase|etter)|hex%(digit|_digit)|w%(hite%(_space|space)|ord)|noncharacter%(_code_point|codepoint)|p%(rint|unctuation)|ideographic|graph|a%(l%(num|phabetic)|ssigned)|uppercase|join%(control|_control)|titlecase|blank|digit|control)\}" contained display
 syntax match clojureRegexpUnicodeCharClass "\v\\[pP][NSCMZPL]" contained display
 syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{%(N[dlo]?|P[dcifeos]?|C[ncfos]?|M[nce]?|Z[lsp]?|S[mcko]?|L[muCDlto]?)\}" contained display
 syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{%(Is|gc\=|general_category\=)?%(N[dlo]?|P[dcifeos]?|C[ncfos]?|M[nce]?|Z[lsp]?|S[mcko]?|L[muCDlto]?)\}" contained display
-syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(Is|sc\=|script\=)%(l%(epc%(ha)?|y%([dc]i%(an)?)|a%(t%(n|in)|na|oo?)|i%(n%(b|ear_b)|mbu?|su))|p%(rti|lrd|h%(oenician|li|ag%(s_pa)?|nx))|vaii?|d%(srt|e%(seret|va%(nagari)?))|g%(lag%(olitic)?|eor%(gian)?|oth%(ic)?|re%(k|ek)|u%(j%(arati|r)|r%(u|mukhi)))|u%(gar%(itic)?|nknown)|a%(r%(ab%(ic)?|m%([ni]|enian))|v%(st|estan))|e%(thi%(opic)?|gyp%(tian_hieroglyphs)?)|z%(inh|yyy|zzz)|r%(un%(ic|r)|ejang|jng)|s%(inh%(ala)?|h%(rd|a%(vian|rada|w))|a%(ur%(ashtra)?|m%(r|aritan)|rb)|y%(r%(c|iac)|lo%(ti_nagri)?)|und%(anese)?|ora%(_sompeng)?)|i%(n%(scriptional_pa%(rthian|hlavi)|herited)|mperial_aramaic|tal)|b%(eng%(ali)?|a%(t%(ak|k)|li%(nese)?|mum?)|ra%(i%(lle)?|h%(mi)?)|opo%(mofo)?|u%(gi%(nese)?|h%(d|id)))|o%(g%(am|ham)|r%(iya|kh|ya)|sma%(nya)?|l%(d_%(south_arabian|persian|italic|turkic)|ck|_chiki))|k%(h%(m%(r|er)|ar%(oshthi)?)|nda|a%(li|n%(a|nada)|takana|yah_li|ithi)|thi)|m%(a%(nd%(aic)?|layalam)|lym|y%(anmar|mr)|tei|e%(r%(c|o%(itic_%(hieroglyphs|cursive))?)|etei_mayek)|ong%(olian)?|iao)|yi%(ii)?|x%(peo|sux)|n%(ew_tai_lue|koo?)|h%(ira%(gana)?|an%([io]|unoo|g%(ul)?)?|ebr%(ew)?)|c%(y%(priot|r%(l|illic))|a%(km|n%(adian_aboriginal|s)|ri%(an)?)|prt|h%(er%(okee)?|a%(m|kma))|uneiform|o%(pt%(ic)?|mmon))|t%(elu%(gu)?|i%(finagh|b%(t|etan))|ha%(i|a%(na)?)|a%(i_%(le|tham|viet)|g%(alog|b%(anwa)?)|vt|kri?|l[ue]|m%(il|l))|fng|glg)|java%(nese)?)\}" contained display
-syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(In|blk\=|block\=)%(javanese|h%(a%(lfwidth%( and fullwidth forms|andfullwidthforms|_and_fullwidth_forms)|n%(unoo|gul%(compatibilityjamo|syllables|jamo%(extended\-[ab])?|_%(syllables|jamo%(_extended_[ab])?|compatibility_jamo)| %(syllables|compatibility jamo|jamo%( extended\-[ab])?))))|i%(ragana|gh%( %(private use surrogates|surrogates)|_%(private_use_surrogates|surrogates)|surrogates|privateusesurrogates))|ebrew)|i%(pa%([ _]extensions|extensions)|deographic%( description characters|_description_characters|descriptioncharacters)|nscriptional%(%([ _]pa%(rthian|hlavi))|pa%(rthian|hlavi))|mperial%(aramaic|[_ ]aramaic))|l%(e%(tterlike%([_ ]symbols|symbols)|pcha)|ow%([_ ]surrogates|surrogates)|i%(mbu|near%(_b_%(ideograms|syllabary)|b%(ideograms|syllabary)| b %(ideograms|syllabary))|su)|a%(tin%(extended%(additional|\-[dacb])| extended%( additional|\-[dacb])|\-1%(supplement| supplement)|_%(extended_%([dcb]|a%(dditional)?)|1_supplement))|o)|y[cd]ian)|b%(u%(ginese|hid)|ra%(hmi|ille%(patterns|[_ ]patterns))|o%(x%([ _]drawing|drawing)|pomofo%([ _]extended|extended)?)|lock%([ _]elements|elements)|yzantine%( musical symbols|musicalsymbols|_musical_symbols)|engali|a%(linese|mum%(supplement|[ _]supplement)?|tak|sic%([ _]latin|latin)))|e%(gyptian%([ _]hieroglyphs|hieroglyphs)|moticons|nclosed%( %(cjk letters and months|ideographic supplement|alphanumeric%( supplement|s))|cjklettersandmonths|_%(ideographic_supplement|alphanumeric%(_supplement|s)|cjk_letters_and_months)|alphanumerics%(upplement)?|ideographicsupplement)|thiopic%(supplement|_%(supplement|extended%(_a)?)| %(supplement|extended%(\-a)?)|extended%(\-a)?)?)|k%(h%(aroshthi|mer%([_ ]symbols|symbols)?)|a%(takana%(_phonetic_extensions|phoneticextensions| phonetic extensions)?|n%(gxi%([_ ]radicals|radicals)|a%(supplement|[ _]supplement)|bun|nada)|ithi|yah%([ _]li|li)))|m%(i%(ao|scellaneous%(technical|symbols%(and%(pictographs|arrows))?|mathematicalsymbols\-[ab]| %(technical|mathematical symbols\-[ab]|symbols%( and %(pictographs|arrows))?)|_%(technical|symbols%(_and_%(pictographs|arrows))?|mathematical_symbols_[ab])))|usical%([_ ]symbols|symbols)|e%(etei%(mayek%(extensions)?|_mayek%(_extensions)?| mayek%( extensions)?)|roitic%(hieroglyphs|%([_ ]%(hieroglyphs|cursive))|cursive))|a%(ndaic|hjong%([ _]tiles|tiles)|layalam|thematical%(alphanumericsymbols| %(alphanumeric symbols|operators)|_%(alphanumeric_symbols|operators)|operators))|yanmar%(extended\-a|_extended_a| extended\-a)?|o%(difier%(_tone_letters| tone letters|toneletters)|ngolian))|r%(u%(nic|mi%(numeralsymbols| numeral symbols|_numeral_symbols))|ejang)|n%(umber%(forms|[ _]forms)|ko|ew%(_tai_lue|tailue| tai lue))|c%(o%(ntrol%(pictures|[ _]pictures)|m%(bining%(diacriticalmarks%(supplement|forsymbols)?|halfmarks| %(diacritical marks%( %(supplement|for symbols))?|half marks|marks for symbols)|marksforsymbols|_%(marks_for_symbols|half_marks|diacritical_marks%(_supplement)?))|mon%(_indic_number_forms|indicnumberforms| indic number forms))|ptic|unting%( rod numerals|_rod_numerals|rodnumerals))|y%(rillic%(extended\-[ab]|_%(extended_[ab]|supplementary)|supplement%(ary)?| %(extended\-[ab]|supplement%(ary)?))?|priot%(syllabary|[ _]syllabary))|u%(rrency%([_ ]symbols|symbols)|neiform%(_numbers_and_punctuation|numbersandpunctuation| numbers and punctuation)?)|h%(a%(m|kma)|erokee)|arian|jk%(s%(ymbolsandpunctuation|trokes)|compatibility%(forms|ideographs%(supplement)?)?|radicalssupplement| %(compatibility%( %(ideographs%( supplement)?|forms))?|radicals supplement|unified ideographs%( extension [dacb])?|s%(ymbols and punctuation|trokes))|_%(s%(trokes|ymbols_and_punctuation)|radicals_supplement|compatibility%(_%(forms|ideographs%(_supplement)?))?|unified_ideographs%(_extension_[dacb])?)|unifiedideographs%(extension[dacb])?))|d%(e%(seret|vanagari%([ _]extended|extended)?)|ingbats|omino%([ _]tiles|tiles))|yi%(syllables|%([_ ]%(syllables|radicals))|radicals|jing%(hexagramsymbols| hexagram symbols|_hexagram_symbols))|s%(mall%( form variants|formvariants|_form_variants)|p%(acing%(_modifier_letters| modifier letters|modifierletters)|ecials)|ora%(sompeng|[ _]sompeng)|ha%(vian|rada)|a%(maritan|urashtra)|inhala|y%(riac|loti%([_ ]nagri|nagri))|u%(ndanese%(supplement|[ _]supplement)?|p%(erscripts%(_and_subscripts|andsubscripts| and subscripts)|plementa%(ry%(_private_use_area_[ab]|privateusearea\-[ab]| private use area\-[ab])|l%(_%(arrows_[ab]|mathematical_operators|punctuation)| %(mathematical operators|punctuation|arrows\-[ab])|mathematicaloperators|punctuation|arrows\-[ab])))|rrogates_area))|p%(h%(o%(enician|netic%( extensions%( supplement)?|extensions%(supplement)?|_extensions%(_supplement)?))|a%(istos%([ _]disc|disc)|gs[_\-]pa))|laying%(cards|[_ ]cards)|rivate%(usearea| use area|_use_area))|o%(smanya|l%([ _]chiki|d%( %(south arabian|persian|italic|turkic)|southarabian|_%(south_arabian|persian|italic|turkic)|persian|italic|turkic)|chiki)|riya|ptical%( character recognition|_character_recognition|characterrecognition)|gham)|g%(u%(jarati|rmukhi)|othic|lagolitic|e%(o%(rgian%(supplement|[ _]supplement)?|metric%(shapes|[ _]shapes))|neral%([_ ]punctuation|punctuation))|reek%( %(and coptic|extended)|andcoptic|_extended|extended)?)|t%(i%(betan|finagh)|elugu|ransport%( and map symbols|_and_map_symbols|andmapsymbols)|a%(mil|kri|i%(xuanjingsymbols|_%(le|xuan_jing_symbols|tham|viet)|le| %(xuan jing symbols|le|tham|viet)|tham|viet)|g%(alog|s|banwa))|ha%(i|ana))|a%(l%(chemical%([_ ]symbols|symbols)|phabetic%( presentation forms|_presentation_forms|presentationforms))|r%(menian|abic%(extended\-a|mathematicalalphabeticsymbols|supplement|_%(presentation_forms_[ab]|supplement|extended_a|mathematical_alphabetic_symbols)| %(extended\-a|mathematical alphabetic symbols|supplement|presentation forms\-[ab])|presentationforms\-[ab])?|rows)|ncient%(_%(greek_%(musical_notation|numbers)|symbols)|greek%(numbers|musicalnotation)| %(greek %(numbers|musical notation)|symbols)|symbols)|egean%(numbers|[ _]numbers)|vestan)|u%(garitic|nified%(canadianaboriginalsyllabics%(extended)?|_canadian_aboriginal_syllabics%(_extended)?| canadian aboriginal syllabics%( extended)?))|v%(a%(i|riation%( selectors%( supplement)?|selectors%(supplement)?|_selectors%(_supplement)?))|e%(rtical%(forms|[ _]forms)|dic%([ _]extensions|extensions))))\}" contained display
+syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(Is|sc\=|script\=)%(k%(its|h%(oj%(ki)?|m%(r|er)|itan_small_script|udawadi|ar%(oshthi)?)|a%(li|n%(a|nada)|takana%(_or_hiragana)?|yah_li|ithi)|nda|thi)|r%(ohg|un%(ic|r)|ejang|jng)|l%(epc%(ha)?|i%(mbu?|n%([ab]|ear_[ab])|su)|y%([dc]i%(an)?)|a%(t%(n|in)|na|oo?))|t%(elu%(gu)?|ha%(i|a%(na)?)|i%(finagh|rh%(uta)?|b%(t|etan))|fng|glg|a%(i_%(le|tham|viet)|g%(alog|b%(anwa)?)|vt|kri?|ng%(ut)?|l[ue]|m%(il|l)))|vaii?|y%(i%(ii)?|ezi%(di)?)|e%(thi%(opic)?|l%(ym%(aic)?|ba%(san)?)|gyp%(tian_hieroglyphs)?)|u%(gar%(itic)?|nknown)|h%(ung|ira%(gana)?|rkt|mn[gp]|a%(n%(i%(fi_rohingya)?|unoo|o|g%(ul)?)?|tr%(an)?)|luw|ebr%(ew)?)|g%(r%(e%(k|ek)|an%(tha)?)|lag%(olitic)?|eor%(gian)?|o%(n[mg]|th%(ic)?)|u%(j%(arati|r)|r%(u|mukhi)|njala_gondi))|m%(lym|a%(n%(d%(aic)?|i%(chaean)?)|saram_gondi|h%(ajani|j)|ka%(sar)?|rc%(hen)?|layalam)|o%(di|ng%(olian)?)|e%(r%(c|o%(itic_%(hieroglyphs|cursive))?)|etei_mayek|nd%(e_kikakui)?|d%(f|efaidrin))|roo?|y%(anmar|mr)|tei|iao|ult%(ani)?)|d%(upl%(oyan)?|srt|i%(ak|ves_akuru)|ogra?|e%(seret|va%(nagari)?))|z%(an%(abazar_square|b)|inh|yyy|zzz)|n%(yiakeng_puachue_hmong|bat|koo?|ew%(_tai_lue|a)|ushu|shu|a%(bataean|rb|nd%(inagari)?))|s%(h%(rd|a%(vian|rada|w))|o%(yo%(mbo)?|g%(d%(ian)?|o)|ra%(_sompeng)?)|i%(n%(d|h%(ala)?)|dd%(ham)?|gnwriting)|a%(ur%(ashtra)?|m%(r|aritan)|rb)|y%(r%(c|iac)|lo%(ti_nagri)?)|und%(anese)?|gnw)|w%(cho|a%(ncho|ra%(ng_citi)?))|c%(y%(priot|r%(l|illic))|h%(er%(okee)?|a%(m|kma)|rs|orasmian)|a%(km|ucasian_albanian|n%(adian_aboriginal|s)|ri%(an)?)|prt|uneiform|o%(pt%(ic)?|mmon))|i%(n%(scriptional_pa%(rthian|hlavi)|herited)|mperial_aramaic|tal)|p%(h%(l[ip]|oenician|ag%(s_pa)?|nx)|a%(lm%(yrene)?|u%(_cin_hau|c)|hawh_hmong)|rti|salter_pahlavi|lrd|erm)|x%(peo|sux)|b%(eng%(ali)?|ra%(i%(lle)?|h%(mi)?)|opo%(mofo)?|u%(gi%(nese)?|h%(d|id))|h%(ks|aiksuki)|a%(ss%(a_vah)?|t%(ak|k)|li%(nese)?|mum?))|java%(nese)?|o%(g%(am|ham)|s%(age|ge|ma%(nya)?)|l%(d_%(hungarian|north_arabian|so%(gdian|uth_arabian)|per%(mic|sian)|italic|turkic)|ck|_chiki)|r%(iya|kh|ya))|a%(r%(ab%(ic)?|m%([ni]|enian))|dl%(m|am)|natolian_hieroglyphs|hom|v%(st|estan)|ghb))\}" contained display
+syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\c%(In|blk\=|block\=)%(zanabazar%([ _]square|square)|javanese|h%(a%(lfwidth%( and fullwidth forms|andfullwidthforms|_and_fullwidth_forms)|tran|n%(unoo|gul%(compatibilityjamo|syllables|jamo%(extended\-[ab])?|_%(syllables|jamo%(_extended_[ab])?|compatibility_jamo)| %(syllables|compatibility jamo|jamo%( extended\-[ab])?))|ifi%([_ ]rohingya|rohingya)))|i%(ragana|gh%( %(private use surrogates|surrogates)|_%(private_use_surrogates|surrogates)|surrogates|privateusesurrogates))|ebrew)|i%(pa%([ _]extensions|extensions)|n%(scriptional%(%([ _]pa%(rthian|hlavi))|pa%(rthian|hlavi))|dic%(siyaqnumbers|_siyaq_numbers| siyaq numbers))|deographic%(symbolsandpunctuation|_%(description_characters|symbols_and_punctuation)| %(description characters|symbols and punctuation)|descriptioncharacters)|mperial%(aramaic|[_ ]aramaic))|c%(o%(ntrol%(pictures|[ _]pictures)|ptic%(epactnumbers|_epact_numbers| epact numbers)?|m%(mon%(_indic_number_forms|indicnumberforms| indic number forms)|bining%(halfmarks|_%(diacritical_marks%(_%(supplement|for_symbols|extended))?|marks_for_symbols|half_marks)| %(half marks|diacritical marks%( %(supplement|for symbols|extended))?|marks for symbols)|diacriticalmarks%(supplement|forsymbols|extended)?|marksforsymbols))|unting%( rod numerals|_rod_numerals|rodnumerals))|a%(rian|ucasian%([ _]albanian|albanian))|jk%(unifiedideographs%(extension[dgacfbe])?|s%(ymbolsandpunctuation|trokes)|_%(s%(trokes|ymbols_and_punctuation)|radicals_supplement|unified_ideographs%(_extension_[dgacfbe])?|compatibility%(_%(forms|ideographs%(_supplement)?))?)|compatibility%(forms|ideographs%(supplement)?)?|radicalssupplement| %(compatibility%( %(ideographs%( supplement)?|forms))?|unified ideographs%( extension [dgacfbe])?|radicals supplement|s%(ymbols and punctuation|trokes)))|y%(rillic%(supplement%(ary)?| %(supplement%(ary)?|extended\-[acb])|extended\-[acb]|_%(extended_[acb]|supplement%(ary)?))?|priot%(syllabary|[ _]syllabary))|u%(rrency%([_ ]symbols|symbols)|neiform%(_numbers_and_punctuation|numbersandpunctuation| numbers and punctuation)?)|h%(e%(ss%([_ ]symbols|symbols)|rokee%(supplement|[ _]supplement)?)|a%(m|kma)|orasmian))|g%(othic|u%(njala%(gondi|[_ ]gondi)|jarati|rmukhi)|lagolitic%(supplement|[ _]supplement)?|e%(o%(rgian%(supplement|%([_ ]%(supplement|extended))|extended)?|metric%( shapes%( extended)?|shapes%(extended)?|_shapes%(_extended)?))|neral%([_ ]punctuation|punctuation))|r%(eek%( %(and coptic|extended)|andcoptic|_%(and_coptic|extended)|extended)?|antha))|s%(h%(orthand%( format controls|_format_controls|formatcontrols)|a%(vian|rada))|u%(ndanese%(supplement|[ _]supplement)?|p%(erscripts%(_and_subscripts|andsubscripts| and subscripts)|plementa%(ry%(_private_use_area_[ab]|privateusearea\-[ab]| private use area\-[ab])|l%( %(mathematical operators|symbols and pictographs|punctuation|arrows\-[acb])|symbolsandpictographs|mathematicaloperators|punctuation|arrows\-[acb]|_%(arrows_[acb]|symbols_and_pictographs|mathematical_operators|punctuation))))|tton%(signwriting|[_ ]signwriting))|i%(nhala%( archaic numbers|archaicnumbers|_archaic_numbers)?|ddham)|y%(loti%([_ ]nagri|nagri)|mbols%( %(for legacy computing|and pictographs extended\-a)|forlegacycomputing|andpictographsextended\-a|_%(and_pictographs_extended_a|for_legacy_computing))|riac%(supplement|[ _]supplement)?)|p%(acing%(_modifier_letters| modifier letters|modifierletters)|ecials)|a%(maritan|urashtra)|o%(yombo|gdian|ra%(sompeng|[ _]sompeng))|mall%(kanaextension| %(kana extension|form variants)|_%(kana_extension|form_variants)|formvariants))|y%(i%(syllables|%([_ ]%(syllables|radicals))|radicals|jing%(hexagramsymbols| hexagram symbols|_hexagram_symbols))|ezidi)|p%(h%(o%(enician|netic%( extensions%( supplement)?|extensions%(supplement)?|_extensions%(_supplement)?))|a%(istos%([ _]disc|disc)|gs[_\-]pa))|laying%(cards|[_ ]cards)|rivate%(usearea| use area|_use_area)|a%(hawh%(hmong|[_ ]hmong)|u%(_cin_hau|cinhau| cin hau)|lmyrene)|salter%(pahlavi|[ _]pahlavi))|e%(l%(basan|ymaic)|arly%(_dynastic_cuneiform|dynasticcuneiform| dynastic cuneiform)|moticons|gyptian%(hieroglyph%(formatcontrols|s)| hieroglyph%( format controls|s)|_hieroglyph%(_format_controls|s))|nclosed%( %(cjk letters and months|ideographic supplement|alphanumeric%( supplement|s))|cjklettersandmonths|_%(ideographic_supplement|alphanumeric%(_supplement|s)|cjk_letters_and_months)|alphanumerics%(upplement)?|ideographicsupplement)|thiopic%(supplement|_%(supplement|extended%(_a)?)| %(supplement|extended%(\-a)?)|extended%(\-a)?)?)|r%(u%(nic|mi%(numeralsymbols| numeral symbols|_numeral_symbols))|ejang)|d%(o%(gra|mino%([ _]tiles|tiles))|e%(seret|vanagari%([ _]extended|extended)?)|uployan|i%(ngbats|ves%([_ ]akuru|akuru)))|m%(e%(defaidrin|nde%([ _]kikakui|kikakui)|etei%(mayek%(extensions)?|_mayek%(_extensions)?| mayek%( extensions)?)|roitic%(hieroglyphs|%([_ ]%(hieroglyphs|cursive))|cursive))|o%(ngolian%(supplement|[ _]supplement)?|di%(fier%(_tone_letters| tone letters|toneletters))?)|ro|u%(ltani|sical%([_ ]symbols|symbols))|i%(ao|scellaneous%(technical|symbols%(and%(pictographs|arrows))?|mathematicalsymbols\-[ab]| %(technical|mathematical symbols\-[ab]|symbols%( and %(pictographs|arrows))?)|_%(technical|symbols%(_and_%(pictographs|arrows))?|mathematical_symbols_[ab])))|yanmar%( extended\-[ab]|extended\-[ab]|_extended_[ab])?|a%(h%(ajani|jong%([ _]tiles|tiles))|rchen|n%(daic|ichaean)|yan%([_ ]numerals|numerals)|saram%(gondi|[_ ]gondi)|layalam|thematical%(alphanumericsymbols| %(alphanumeric symbols|operators)|_%(alphanumeric_symbols|operators)|operators)|kasar))|o%(s%(age|manya)|ttoman%(siyaqnumbers|_siyaq_numbers| siyaq numbers)|r%(namental%([ _]dingbats|dingbats)|iya)|ptical%( character recognition|_character_recognition|characterrecognition)|gham|l%([ _]chiki|d%(hungarian| %(hungarian|so%(uth arabian|gdian)|per%(mic|sian)|north arabian|italic|turkic)|per%(mic|sian)|so%(utharabian|gdian)|italic|turkic|_%(hungarian|north_arabian|so%(gdian|uth_arabian)|per%(mic|sian)|italic|turkic)|northarabian)|chiki))|n%(ew%(_tai_lue|a|tailue| tai lue)|ko|yiakeng%( puachue hmong|puachuehmong|_puachue_hmong)|a%(bataean|ndinagari)|u%(shu|mber%(forms|[ _]forms)))|b%(u%(ginese|hid)|a%(s%(sa%([ _]vah|vah)|ic%([ _]latin|latin))|linese|mum%(supplement|[ _]supplement)?|tak)|ra%(hmi|ille%(patterns|[_ ]patterns))|o%(x%([ _]drawing|drawing)|pomofo%([ _]extended|extended)?)|lock%([ _]elements|elements)|haiksuki|yzantine%( musical symbols|musicalsymbols|_musical_symbols)|engali)|l%(i%(mbu|near%(a| %(a|b %(ideograms|syllabary))|b%(ideograms|syllabary)|_%(a|b_%(ideograms|syllabary)))|su%(supplement|[ _]supplement)?)|a%(tin%(extended%(\-[dacbe]|additional)|_%(extended_%([dcbe]|a%(dditional)?)|1_supplement)|\-1%(supplement| supplement)| extended%(\-[dacbe]| additional))|o)|e%(tterlike%([_ ]symbols|symbols)|pcha)|ow%([_ ]surrogates|surrogates)|y[cd]ian)|k%(h%(aroshthi|ojki|mer%([_ ]symbols|symbols)?|udawadi|itan%( small script|smallscript|_small_script))|a%(takana%(_phonetic_extensions|phoneticextensions| phonetic extensions)?|n%(gxi%([_ ]radicals|radicals)|a%(extended\-a|supplement| %(extended\-a|supplement)|_%(supplement|extended_a))|bun|nada)|ithi|yah%([ _]li|li)))|wa%(ncho|rang%(citi|[ _]citi))|t%(elugu|ransport%( and map symbols|_and_map_symbols|andmapsymbols)|i%(rhuta|betan|finagh)|a%(mil%(supplement|[ _]supplement)?|kri|ngut%(supplement|%([ _]%(supplement|components))|components)?|i%(xuanjingsymbols|_%(le|xuan_jing_symbols|tham|viet)|le| %(xuan jing symbols|le|tham|viet)|tham|viet)|g%(alog|s|banwa))|ha%(i|ana))|a%(l%(chemical%([_ ]symbols|symbols)|phabetic%( presentation forms|_presentation_forms|presentationforms))|n%(cient%(_%(greek_%(musical_notation|numbers)|symbols)|greek%(numbers|musicalnotation)| %(greek %(numbers|musical notation)|symbols)|symbols)|atolian%([ _]hieroglyphs|hieroglyphs))|dlam|r%(menian|abic%(extended\-a|mathematicalalphabeticsymbols|supplement|_%(presentation_forms_[ab]|supplement|extended_a|mathematical_alphabetic_symbols)| %(extended\-a|mathematical alphabetic symbols|supplement|presentation forms\-[ab])|presentationforms\-[ab])?|rows)|egean%(numbers|[ _]numbers)|vestan|hom)|u%(garitic|nified%(canadianaboriginalsyllabics%(extended)?|_canadian_aboriginal_syllabics%(_extended)?| canadian aboriginal syllabics%( extended)?))|v%(a%(i|riation%( selectors%( supplement)?|selectors%(supplement)?|_selectors%(_supplement)?))|e%(rtical%(forms|[ _]forms)|dic%([ _]extensions|extensions))))\}" contained display
 
 syntax match   clojureRegexpPredefinedCharClass "\v%(\\[dDsSwW]|\.)" contained display
 syntax cluster clojureRegexpCharPropertyClasses contains=clojureRegexpPosixCharClass,clojureRegexpJavaCharClass,clojureRegexpUnicodeCharClass
@@ -140,26 +121,37 @@ syntax match   clojureRegexpBoundary            "[$^]" contained display
 syntax match   clojureRegexpQuantifier          "[?*+][?+]\=" contained display
 syntax match   clojureRegexpQuantifier          "\v\{\d+%(,|,\d+)?}\??" contained display
 syntax match   clojureRegexpOr                  "|" contained display
-syntax match   clojureRegexpBackRef             "\v\\%([1-9]\d*|k\<[a-zA-z]+\>)" contained display
+syntax match   clojureRegexpBackRef             "\v\\%([1-9]\d*|k\<[[:alpha:]]+\>)" contained display
 
 " Mode modifiers, mode-modified spans, lookaround, regular and atomic
 " grouping, and named-capturing.
 syntax match clojureRegexpMod "\v\(@<=\?:" contained display
 syntax match clojureRegexpMod "\v\(@<=\?[xdsmiuU]*-?[xdsmiuU]+:?" contained display
 syntax match clojureRegexpMod "\v\(@<=\?%(\<?[=!]|\>)" contained display
-syntax match clojureRegexpMod "\v\(@<=\?\<[a-zA-Z]+\>" contained display
+syntax match clojureRegexpMod "\v\(@<=\?\<[[:alpha:]]+\>" contained display
 
 syntax region clojureRegexpGroup start="(" skip=/\\\\\|\\)/ end=")" matchgroup=clojureRegexpGroup contained contains=clojureRegexpMod,clojureRegexpQuantifier,clojureRegexpBoundary,clojureRegexpEscape,@clojureRegexpCharClasses
 syntax region clojureRegexp start=/\#"/ skip=/\\\\\|\\"/ end=/"/ contains=@clojureRegexpCharClasses,clojureRegexpEscape,clojureRegexpQuote,clojureRegexpBoundary,clojureRegexpQuantifier,clojureRegexpOr,clojureRegexpBackRef,clojureRegexpGroup keepend
 
-syntax keyword clojureCommentTodo contained FIXME XXX TODO FIXME: XXX: TODO:
+syntax keyword clojureCommentTodo contained FIXME XXX TODO BUG NOTE HACK FIXME: XXX: TODO: BUG: NOTE: HACK:
 
 syntax match clojureComment ";.*$" contains=clojureCommentTodo,@Spell
 syntax match clojureComment "#!.*$"
 
+" Comment forms highlight comment forms as comment.  Based on: <https://git.sr.ht/~evhan/vim-scheme/>
+syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*/   end=/[, \t\n()\[\]{}";]/me=e-1
+syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*"/  skip=/\\[\\"]/ end=/"/
+syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*(/  end=/)/  contains=clojureComentReaderMacroForm
+syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*\[/ end=/\]/ contains=clojureComentReaderMacroForm
+syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*{/  end=/}/  contains=clojureComentReaderMacroForm
+
+syntax region clojureComentReaderMacroForm start="("  end=")"  contained contains=clojureComentReaderMacroForm
+syntax region clojureComentReaderMacroForm start="{"  end="}"  contained contains=clojureComentReaderMacroForm
+syntax region clojureComentReaderMacroForm start="\[" end="\]" contained contains=clojureComentReaderMacroForm
+
 " -*- TOP CLUSTER -*-
-" Generated from https://github.com/guns/vim-clojure-static/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-syntax cluster clojureTop contains=@Spell,clojureAnonArg,clojureBoolean,clojureCharacter,clojureComment,clojureCond,clojureConstant,clojureDefine,clojureDeref,clojureDispatch,clojureError,clojureException,clojureFunc,clojureKeyword,clojureMacro,clojureMap,clojureMeta,clojureNumber,clojureQuote,clojureRegexp,clojureRepeat,clojureSexp,clojureSpecial,clojureString,clojureSymbol,clojureUnquote,clojureVarArg,clojureVariable,clojureVector
+" Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
+syntax cluster clojureTop contains=@Spell,clojureAnonArg,clojureBoolean,clojureCharacter,clojureComment,clojureCond,clojureConstant,clojureDefine,clojureDeref,clojureDispatch,clojureError,clojureException,clojureFunc,clojureKeyword,clojureMacro,clojureMap,clojureMeta,clojureNumber,clojureQuote,clojureRegexp,clojureRepeat,clojureSexp,clojureSpecial,clojureString,clojureSymbol,clojureUnquote,clojureVarArg,clojureVariable,clojureVector,clojureComentReaderMacro
 
 syntax region clojureSexp   matchgroup=clojureParen start="("  end=")" contains=@clojureTop fold
 syntax region clojureVector matchgroup=clojureParen start="\[" end="]" contains=@clojureTop fold
@@ -214,6 +206,8 @@ highlight default link clojureDispatch                  SpecialChar
 
 highlight default link clojureComment                   Comment
 highlight default link clojureCommentTodo               Todo
+highlight default link clojureComentReaderMacro         clojureComment
+highlight default link clojureComentReaderMacroForm     clojureComentReaderMacro
 
 highlight default link clojureError                     Error
 

From 67327ef831d41e36155cad58b1599f0226a98d51 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Apr 2021 12:06:14 +0200
Subject: [PATCH 239/299] Remove .rs extension from xml, closes #682

---
 README.md                    | 2 +-
 autoload/polyglot/init.vim   | 2 +-
 autoload/polyglot/sleuth.vim | 2 +-
 packages.yaml                | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 71a866314..9df90b400 100644
--- a/README.md
+++ b/README.md
@@ -198,7 +198,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [velocity](https://github.com/lepture/vim-velocity) (Syntax highlighting for vm files)
 - [vue](https://github.com/posva/vim-vue) (Vue syntax highlighting for vue and wpy files)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (Syntax highlighting for xdc files)
-- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 96 more files)
+- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 95 more files)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax) (XSLT syntax highlighting for xslt and xsl files)
 - [yard](https://github.com/noprompt/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting for zep files)
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index d21993983..1999e54e3 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -2592,7 +2592,7 @@ if !has_key(g:polyglot_is_disabled, 'ant')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rs,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
 endif
 
 if !has_key(g:polyglot_is_disabled, 'csv')
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index afb23ae43..5abd31482 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -612,7 +612,7 @@ let s:globs = {
   \ 'xhtml': '*.xhtml,*.xht',
   \ 'xinetd': '',
   \ 'xmath': '*.msc,*.msf',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rs,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
   \ 'xml.twig': '*.xml.twig',
   \ 'xmodmap': '*Xmodmap,*xmodmap*',
   \ 'xpm': '*.xpm,*.pm',
diff --git a/packages.yaml b/packages.yaml
index 334d559ad..d244ef498 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1786,6 +1786,7 @@ filetypes:
   - '*/etc/xdg/menus/*.menu'
   - '*fglrxrc'
   ignored_extensions:
+  - rs
   - ts
   - tsx
   # handled by powershell plugin

From 5de7022bcb4c7a155952dbeb666f912db3bde2af Mon Sep 17 00:00:00 2001
From: Christian Zangl <laktak@cdak.net>
Date: Wed, 14 Apr 2021 12:09:11 +0200
Subject: [PATCH 240/299] Add reindent to readme #662 (#675)

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index 9df90b400..86ac7b588 100644
--- a/README.md
+++ b/README.md
@@ -240,6 +240,17 @@ Vim Polyglot tries to automatically detect indentation settings (just like vim-s
 let g:polyglot_disabled = ['autoindent']
 ```
 
+## Reindent
+
+If you want to disable reindening of the current line in insert mode (see vim 'indentkeys') you can turn it off with:
+
+```vim
+autocmd BufEnter * set indentexpr=
+```
+
+This will not affect smart autoindenting when starting a new line.
+
+
 ## Default settings
 
 Vim Polyglot includes vim-sensible plugin, which is usually necessary for editing any language. This can be disabled with:

From 067e07e137d26ca6bc3f8496fe7bd569500d7fa4 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Apr 2021 12:11:13 +0200
Subject: [PATCH 241/299] Change svelte provider, fixes #700

---
 README.md                |   2 +-
 autoload/svelte.vim      |  71 ++++++++
 ftplugin/svelte.vim      |  50 ++----
 ftplugin/svelte/fold.vim | 131 ++++++++++++++
 indent/svelte.vim        | 373 +++++++++++++++++++++++++++------------
 packages.yaml            |   2 +-
 syntax/svelte-html.vim   | 127 +++++++++++++
 syntax/svelte.vim        | 341 +++++++++++++++++++++++++----------
 8 files changed, 850 insertions(+), 247 deletions(-)
 create mode 100644 autoload/svelte.vim
 create mode 100644 ftplugin/svelte/fold.vim
 create mode 100644 syntax/svelte-html.vim

diff --git a/README.md b/README.md
index 86ac7b588..40674dd32 100644
--- a/README.md
+++ b/README.md
@@ -176,7 +176,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [smt2](https://github.com/bohlender/vim-smt2) (SMT syntax highlighting for smt2 and smt files)
 - [solidity](https://github.com/TovarishFin/vim-solidity) (Solidity syntax highlighting for sol files)
 - [stylus](https://github.com/wavded/vim-stylus) (Stylus syntax highlighting for styl and stylus files)
-- [svelte](https://github.com/evanleck/vim-svelte/tree/main) (Svelte syntax highlighting for svelte files)
+- [svelte](https://github.com/leafOfTree/vim-svelte-plugin) (Svelte syntax highlighting for svelte files)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
 - [svg](https://github.com/vim-scripts/svg.vim) (SVG syntax highlighting for svg files)
 - [swift](https://github.com/keith/swift.vim) (Swift syntax highlighting for swift files)
diff --git a/autoload/svelte.vim b/autoload/svelte.vim
new file mode 100644
index 000000000..60d31469b
--- /dev/null
+++ b/autoload/svelte.vim
@@ -0,0 +1,71 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'svelte', 'autoload/svelte.vim')
+  finish
+endif
+
+let s:name = 'vim-svelte-plugin'
+let s:debug = exists("g:vim_svelte_plugin_debug")
+      \ && g:vim_svelte_plugin_debug == 1
+
+function! svelte#GetConfig(name, default)
+  let name = 'g:vim_svelte_plugin_'.a:name
+  return exists(name) ? eval(name) : a:default
+endfunction
+
+" Since svelte#Log and svelte#GetConfig are always called 
+" in syntax and indent files,
+" this file will be sourced when opening the first svelte file
+if exists('##CursorMoved') && exists('*OnChangeSvelteSubtype')
+  augroup vim_svelte_plugin
+    autocmd!
+    autocmd CursorMoved,CursorMovedI,WinEnter *.svelte
+          \ call s:CheckSubtype()
+  augroup END
+
+  let s:subtype = ''
+  function! s:CheckSubtype()
+    let subtype = GetSvelteSubtype()
+
+    if s:subtype != subtype
+      call OnChangeSvelteSubtype(subtype)
+      let s:subtype = subtype
+    endif
+  endfunction
+endif
+
+function! s:SynsEOL(lnum)
+  let lnum = prevnonblank(a:lnum)
+  let cnum = strlen(getline(lnum))
+  return map(synstack(lnum, cnum), 'synIDattr(v:val, "name")')
+endfunction
+
+function! GetSvelteSubtype()
+  let lnum = line('.')
+  let cursyns = s:SynsEOL(lnum)
+  let syn = !empty(cursyns) ? get(cursyns, 0, '') : ''
+
+  let subtype = matchstr(syn, '\w\+\zeSvelte')
+  if subtype =~ 'css\w\+'
+    " For cssScss, cssLess, ...
+    let subtype = subtype[3:]
+  endif
+  let subtype = tolower(subtype)
+  return subtype
+endfunction
+
+function! GetSvelteTag(...)
+  let lnum = a:0 > 0 ? a:1 : line('.')
+  let cursyns = s:SynsEOL(lnum)
+  let syn = get(cursyns, 0, '')
+
+  if syn =~ 'SvelteTemplate'
+    let tag = 'template'
+  elseif syn =~ 'SvelteScript'
+    let tag = 'script'
+  elseif syn =~ 'SvelteStyle'
+    let tag = 'style'
+  else
+    let tag = ''
+  endif
+
+  return tag
+endfunction
diff --git a/ftplugin/svelte.vim b/ftplugin/svelte.vim
index cf32ef5bd..051e085d4 100644
--- a/ftplugin/svelte.vim
+++ b/ftplugin/svelte.vim
@@ -2,46 +2,24 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'svelte', 'ftplugin/svelte.vim
   finish
 endif
 
-" Vim filetype plugin
-" Language:   Svelte 3 (HTML/JavaScript)
-" Author:     Evan Lecklider <evan@lecklider.com>
-" Maintainer: Evan Lecklide <evan@lecklider.com>
-" URL:        https://github.com/evanleck/vim-svelte
-if (exists('b:did_ftplugin'))
-  finish
-endif
+if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
 
-" Matchit support
-if exists('loaded_matchit') && !exists('b:match_words')
-  let b:match_ignorecase = 0
+if !has('nvim')
+  setlocal matchpairs+=<:>
+endif
 
-  " In order:
-  "
-  " 1. Svelte control flow keywords.
-  " 2. Parens.
-  " 3-5. HTML tags pulled from Vim itself.
-  "
-  " https://github.com/vim/vim/blob/5259275347667a90fb88d8ea74331f88ad68edfc/runtime/ftplugin/html.vim#L29-L35
-  let b:match_words =
-        \ '#\%(if\|await\|each\)\>:\:\%(else\|catch\|then\)\>:\/\%(if\|await\|each\)\>,' .
-        \ '{:},' .
+if exists("loaded_matchit")
+  let b:match_ignorecase = 1
+  let b:match_words = '<:>,' .
         \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' .
         \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' .
-        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
+        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>,' .
+        \ '{#\(if\|each\)[^}]*}:{\:else[^}]*}:{\/\(if\|each\)},' .
+        \ '{#await[^}]*}:{\:then[^}]*}:{\/await},'
 endif
 
-" ALE fixing and linting.
-if exists('g:loaded_ale')
-  if !exists('b:ale_fixers')
-    let b:ale_fixers = ['eslint', 'prettier', 'prettier_standard']
-  endif
-
-  if !exists('b:ale_linter_aliases')
-    let b:ale_linter_aliases = ['css', 'javascript']
-  endif
-
-  if !exists('b:ale_linters')
-    let b:ale_linters = ['stylelint', 'eslint']
-  endif
-endif
+" Indent correctly with template string for vim-javascript/builtin
+" indentexpr
+let b:syng_str = '^\%(.*template\)\@!.*string\|special'
+let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
diff --git a/ftplugin/svelte/fold.vim b/ftplugin/svelte/fold.vim
new file mode 100644
index 000000000..2732660a6
--- /dev/null
+++ b/ftplugin/svelte/fold.vim
@@ -0,0 +1,131 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'svelte', 'ftplugin/svelte/fold.vim')
+  finish
+endif
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Config {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let s:use_foldexpr = exists("g:vim_svelte_plugin_use_foldexpr") 
+      \ && g:vim_svelte_plugin_use_foldexpr == 1
+"}}}
+
+if !s:use_foldexpr | finish | endif
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Settings {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+setlocal foldmethod=expr
+setlocal foldexpr=GetSvelteFold(v:lnum)
+"}}}
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Variables {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let s:empty_line = '\v^\s*$'
+let s:block_end = '\v^\s*}|]|\)'
+let s:svelte_tag_start = '\v^\<\w+' 
+let s:svelte_tag_end = '\v^\<\/\w+' 
+let s:svelte_internal_blocks = '\v:(else|then|catch)'
+"}}}
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Functions {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"  see :h fold-expr
+"  value			    meaning
+"  0			        the line is not in a fold
+"  1, 2, ..		    the line is in a fold with this level
+"  -1			        the fold level is undefined, use the fold level of a
+"			            line before or after this line, whichever is the
+"			            lowest.
+"  "="			      use fold level from the previous line
+"  "a1", "a2", ..	add one, two, .. to the fold level of the previous
+"			            line, use the result for the current line
+"  "s1", "s2", ..	subtract one, two, .. from the fold level of the
+"                 previous line, use the result for the next line
+"  ">1", ">2", ..	a fold with this level starts at this line
+"  "<1", "<2", ..	a fold with this level ends at this line
+function! GetSvelteFold(lnum)
+  let this_line = getline(a:lnum)
+  let next_line = getline(a:lnum + 1)
+
+  " Handle empty lines
+  if this_line =~ s:empty_line
+    return -1
+  endif
+
+  " Handle start/end tags
+  if this_line =~ s:svelte_tag_start
+    return '>1'
+  endif
+  if this_line =~ s:svelte_tag_end
+    " If return '<1', fold will get incorrect with prev line
+    return 1
+  endif
+
+  " Fold by indent
+  if a:lnum > 1
+    let prev_indent = s:IndentLevel(a:lnum - 1)
+  else
+    let prev_indent = 0
+  endif
+  let this_indent = s:IndentLevel(a:lnum)
+  let next_indent = s:IndentLevel(s:NextNonBlankLine(a:lnum))
+
+  " Fold separately on blocks
+  if this_line =~ s:svelte_internal_blocks
+    return '>'.next_indent
+  endif
+
+  if GetSvelteTag(a:lnum) == 'script'
+    " Handle closing '}'
+    if this_line =~ '\v^\s*},?\s*$'
+      return '<'.prev_indent
+    endif
+
+    " --this
+    " ----next
+    if this_indent < next_indent
+      return '>'.next_indent
+    endif
+
+    " ----this
+    " --next
+    if this_indent >= next_indent 
+      return this_indent
+    endif
+  else
+    " Template or style
+    return this_indent
+  endif
+endfunction
+
+function! s:IndentLevel(lnum)
+  " Add 1 to indentLevel, so start/end tags can fold properly
+  return indent(a:lnum) / &shiftwidth + 1
+endfunction
+
+function! s:NextNonBlankLine(lnum)
+  let next_line = a:lnum + 1
+  let last_line = line('$')
+
+  while next_line <= last_line
+    if getline(next_line) =~ '\v\S'
+      return next_line
+    endif
+
+    let next_line += 1
+  endwhile
+
+  return 0
+endfunction
+"}}}
+" vim: fdm=marker
diff --git a/indent/svelte.vim b/indent/svelte.vim
index cb01c4247..047d14791 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -2,160 +2,301 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'svelte', 'indent/svelte.vim')
   finish
 endif
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim indent file
-" Language:   Svelte 3 (HTML/JavaScript)
-" Author:     Evan Lecklider <evan@lecklider.com>
-" Maintainer: Evan Lecklide <evan@lecklider.com>
-" URL:        https://github.com/evanleck/vim-svelte
-
+"
+" Language: Svelte
+" Maintainer: leafOfTree <leafvocation@gmail.com>
+"
+" CREDITS: Inspired by mxw/vim-jsx.
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 if exists("b:did_indent")
   finish
 endif
 
-if !exists('g:svelte_indent_script')
-  let g:svelte_indent_script = 1
-endif
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Variables {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let s:name = 'vim-svelte-plugin'
+" Let <template> handled by HTML
+let s:svelte_tag_start = '\v^\<(script|style)' 
+let s:svelte_tag_end = '\v^\<\/(script|style)'
+let s:template_tag = '\v^\s*\<\/?template'
+" https://developer.mozilla.org/en-US/docs/Glossary/Empty_element
+let s:empty_tagname = '(area|base|br|col|embed|hr|input|img|keygen|link|meta|param|source|track|wbr)'
+let s:empty_tag = '\v\C\<'.s:empty_tagname.'[^/]*\>' 
+let s:empty_tag_start = '\v\<'.s:empty_tagname.'[^\>]*$' 
+let s:empty_tag_end = '\v^\s*[^\<\>\/]*\>\s*' 
+let s:tag_end = '\v^\s*\/?\>\s*'
+let s:oneline_block = '^\s*{#.*{/.*}\s*$'
+"}}}
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Config {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let s:use_pug = svelte#GetConfig('use_pug', 0)
+let s:use_sass = svelte#GetConfig('use_sass', 0)
+let s:use_coffee = svelte#GetConfig('use_coffee', 0)
+let s:use_typescript = svelte#GetConfig('use_typescript', 0)
+let s:has_init_indent = svelte#GetConfig('has_init_indent', 1)
+let s:debug = svelte#GetConfig('debug', 0)
+"}}}
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Load indent method {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Save shiftwidth
+let s:sw = &sw
+
+" Use lib/indent/ files for compatibility
+unlet! b:did_indent
+runtime lib/indent/xml.vim
 
-if !exists('g:svelte_indent_style')
-  let g:svelte_indent_style = 1
-endif
+unlet! b:did_indent
+runtime lib/indent/css.vim
 
-" Try to mirror Svelte's indent settings so the HTML indenting scripts match.
-if g:svelte_indent_script
-  let b:html_indent_script1 = "inc"
-else
-  let b:html_indent_script1 = "zero"
+" Use normal indent files
+unlet! b:did_indent
+runtime! indent/javascript.vim
+let b:javascript_indentexpr = &indentexpr
+
+if s:use_pug
+  unlet! b:did_indent
+  let s:save_formatoptions = &formatoptions
+  runtime! indent/pug.vim
+  let &formatoptions = s:save_formatoptions
 endif
 
-if g:svelte_indent_style
-  let b:html_indent_style1 = "inc"
-else
-  let b:html_indent_style1 = "zero"
+if s:use_sass
+  unlet! b:did_indent
+  runtime! indent/sass.vim
 endif
 
-runtime! indent/html.vim
-unlet! b:did_indent
+if s:use_coffee
+  unlet! b:did_indent
+  runtime! indent/coffee.vim
+endif
 
-let s:html_indent = &l:indentexpr
-let b:did_indent = 1
+if s:use_typescript
+  unlet! b:did_indent
+  runtime! indent/typescript.vim
+endif
 
+" Recover shiftwidth
+let &sw = s:sw
+"}}}
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Settings {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" JavaScript indentkeys
+setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e,:,=:else
+" XML indentkeys
+setlocal indentkeys+=*<Return>,<>>,<<>,/
 setlocal indentexpr=GetSvelteIndent()
-setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],!^F,;,=:else,=:then,=:catch,=/if,=/each,=/await
-
-" Only define the function once.
-if exists('*GetSvelteIndent')
-  finish
-endif
+"}}}
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Functions {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 function! GetSvelteIndent()
-  let current_line_number = v:lnum
-
-  if current_line_number == 0
-    return 0
-  endif
-
-  let current_line = getline(current_line_number)
+  let prevlnum = prevnonblank(v:lnum-1)
+  let prevline = getline(prevlnum)
+  let prevsyns = s:SynsSOL(prevlnum)
+
+  let curline = getline(v:lnum)
+  let cursyns = s:SynsSOL(v:lnum)
+  let cursyn = get(cursyns, 0, '')
+
+  if s:SynHTML(cursyn)
+    call s:Log('syntax: html')
+    let ind = XmlIndentGet(v:lnum, 0)
+    if prevline =~? s:empty_tag
+      call s:Log('previous line is empty tag')
+      let ind = ind - &sw
+    endif
 
-  " Opening script and style tags should be all the way outdented.
-  if current_line =~ '^\s*</\?\(script\|style\)'
-    return 0
-  endif
+    if s:IsBlockStart(prevsyns) && prevline !~ s:oneline_block
+      call s:Log('increase block indent')
+      let ind = ind + &sw
+    endif
 
-  let previous_line_number = prevnonblank(current_line_number - 1)
-  let previous_line = getline(previous_line_number)
-  let previous_line_indent = indent(previous_line_number)
+    if s:IsBlockEnd(cursyns, curline)
+      call s:Log('decrease block indent')
+      let ind = ind - &sw
+    endif
 
-  " The inside of scripts an styles should be indented unless disabled.
-  if previous_line =~ '^\s*<script'
-    if g:svelte_indent_script
-      return previous_line_indent + shiftwidth()
+    " Align '/>' and '>' with '<' for multiline tags.
+    if curline =~? s:tag_end 
+      let ind = ind - &sw
+    endif
+    " Then correct the indentation of any element following '/>' or '>'.
+    if prevline =~? s:tag_end
+      let ind = ind + &sw
+
+      "Decrease indent if prevlines are a multiline empty tag
+      let [start, end] = s:PrevMultilineEmptyTag(v:lnum)
+      if end == prevlnum
+        call s:Log('previous line is a multiline empty tag')
+        let ind = indent(v:lnum - 1)
+      endif
+    endif
+  elseif s:SynPug(cursyn)
+    call s:Log('syntax: pug')
+    let ind = GetPugIndent()
+  elseif s:SynCoffee(cursyn)
+    call s:Log('syntax: coffee')
+    let ind = GetCoffeeIndent(v:lnum)
+  elseif s:SynTypeScript(cursyn)
+    call s:Log('syntax: typescript')
+    let ind = GetTypescriptIndent()
+  elseif s:SynSASS(cursyn)
+    call s:Log('syntax: sass')
+    let ind = GetSassIndent()
+  elseif s:SynStyle(cursyn)
+    call s:Log('syntax: style')
+    let ind = GetCSSIndent()
+  else
+    call s:Log('syntax: javascript')
+    if len(b:javascript_indentexpr)
+      let ind = eval(b:javascript_indentexpr)
     else
-      return previous_line_indent
+      let ind = cindent(v:lnum)
     endif
   endif
 
-  if previous_line =~ '^\s*<style'
-    if g:svelte_indent_style
-      return previous_line_indent + shiftwidth()
-    else
-      return previous_line_indent
+  if curline =~? s:svelte_tag_start || curline =~? s:svelte_tag_end 
+        \|| prevline =~? s:svelte_tag_end
+        \|| (curline =~ s:template_tag && s:SynPug(cursyn))
+    call s:Log('current line is svelte tag or previous line is svelte tag end')
+    call s:Log('... or current line is pug template tag')
+    let ind = 0
+  elseif s:has_init_indent
+    if s:SynSvelteScriptOrStyle(cursyn) && ind < 1
+      call s:Log('add initial indent')
+      let ind = &sw
     endif
+  elseif prevline =~? s:svelte_tag_start
+    call s:Log('previous line is svelte tag start')
+    let ind = 0
   endif
 
-  execute "let indent = " . s:html_indent
+  call s:Log('indent: '.ind)
+  return ind
+endfunction
 
-  " For some reason, the HTML CSS indentation keeps indenting the next line over
-  " and over after each style declaration.
-  if searchpair('<style>', '', '</style>', 'bW') && previous_line =~ ';$' && current_line !~ '}'
-    return previous_line_indent
-  endif
+function! s:IsBlockStart(prevsyns)
+  let prevsyn_second = get(a:prevsyns, 1, '')
+  " Some HTML tags add an extra syntax layer
+  let prevsyn_third = get(a:prevsyns, 2, '')
+  return s:SynBlockBody(prevsyn_second)
+        \ || s:SynBlockStart(prevsyn_second)
+        \ || s:SynBlockBody(prevsyn_third)
+        \ || s:SynBlockStart(prevsyn_third)
+endfunction
 
-  " "/await" or ":catch" or ":then"
-  if current_line =~ '^\s*{\s*\/await' || current_line =~ '^\s*{\s*:\(catch\|then\)'
-    let await_start = searchpair('{\s*#await\>', '', '{\s*\/await\>', 'bW')
+function! s:IsBlockEnd(cursyns, curline)
+  let cursyn_second = get(a:cursyns, 1, '')
+  " Some HTML tags add an extra syntax layer
+  let cursyn_third = get(a:cursyns, 2, '')
+  return a:curline !~ '^\s*$'
+        \ && (s:SynBlockBody(cursyn_second)
+        \ || s:SynBlockEnd(cursyn_second)
+        \ || s:SynBlockBody(cursyn_third)
+        \ || s:SynBlockEnd(cursyn_third))
+endfunction
 
-    if await_start
-      return indent(await_start)
-    endif
-  endif
+function! s:SynsEOL(lnum)
+  let lnum = prevnonblank(a:lnum)
+  let col = strlen(getline(lnum))
+  return map(synstack(lnum, col), 'synIDattr(v:val, "name")')
+endfunction
 
-  " "/each"
-  if current_line =~ '^\s*{\s*\/each'
-    let each_start = searchpair('{\s*#each\>', '', '{\s*\/each\>', 'bW')
+function! s:SynsSOL(lnum)
+  let lnum = prevnonblank(a:lnum)
+  let col = match(getline(lnum), '\S') + 1
+  return map(synstack(lnum, col), 'synIDattr(v:val, "name")')
+endfunction
 
-    if each_start
-      return indent(each_start)
-    endif
-  endif
+function! s:SynHTML(syn)
+  return a:syn ==? 'htmlSvelteTemplate'
+endfunction
 
-  " "/if"
-  if current_line =~ '^\s*{\s*\/if'
-    let if_start = searchpair('{\s*#if\>', '', '{\s*\/if\>', 'bW')
+function! s:SynBlockBody(syn)
+  return a:syn ==? 'svelteBlockBody'
+endfunction
 
-    if if_start
-      return indent(if_start)
-    endif
-  endif
+function! s:SynBlockStart(syn)
+  return a:syn ==? 'svelteBlockStart'
+endfunction
 
-  " ":else" is tricky because it can match an opening "#each" _or_ an opening
-  " "#if", so we try to be smart and look for the closest of the two.
-  if current_line =~ '^\s*{\s*:else'
-    let if_start = searchpair('{\s*#if\>', '', '{\s*\/if\>', 'bW')
+function! s:SynBlockEnd(syn)
+  return a:syn ==? 'svelteBlockEnd'
+endfunction
 
-    " If it's an "else if" then we know to look for an "#if"
-    if current_line =~ '^\s*{\s*:else if' && if_start
-      return indent(if_start)
-    else
-      " The greater line number will be closer to the cursor position because
-      " we're searching backward.
-      return indent(max([if_start, searchpair('{\s*#each\>', '', '{\s*\/each\>', 'bW')]))
-    endif
-  endif
+function! s:SynPug(syn)
+  return a:syn ==? 'pugSvelteTemplate'
+endfunction
 
-  " "#if" or "#each"
-  if previous_line =~ '^\s*{\s*#\(if\|each\|await\)'
-    return previous_line_indent + shiftwidth()
-  endif
+function! s:SynCoffee(syn)
+  return a:syn ==? 'coffeeSvelteScript'
+endfunction
 
-  " ":else" or ":then"
-  if previous_line =~ '^\s*{\s*:\(else\|catch\|then\)'
-    return previous_line_indent + shiftwidth()
-  endif
+function! s:SynTypeScript(syn)
+  return a:syn ==? 'typescriptSvelteScript'
+endfunction
+
+function! s:SynSASS(syn)
+  return a:syn ==? 'cssSassSvelteStyle'
+endfunction
+
+function! s:SynStyle(syn)
+  return a:syn =~? 'SvelteStyle'
+endfunction
+
+function! s:SynSvelteScriptOrStyle(syn)
+  return a:syn =~? '\v(SvelteStyle)|(SvelteScript)'
+endfunction
 
-  " Custom element juggling for abnormal self-closing tags (<Widget />),
-  " capitalized component tags (<Widget></Widget>), and custom svelte tags
-  " (<svelte:head></svelte:head>).
-  if synID(previous_line_number, match(previous_line, '\S') + 1, 0) == hlID('htmlTag')
-        \ && synID(current_line_number, match(current_line, '\S') + 1, 0) != hlID('htmlEndTag')
-    let indents_match = indent == previous_line_indent
-    let previous_closes = previous_line =~ '/>$'
-
-    if indents_match && !previous_closes && previous_line =~ '<\(\u\|\l\+:\l\+\)'
-      return previous_line_indent + shiftwidth()
-    elseif !indents_match && previous_closes
-      return previous_line_indent
+function! s:PrevMultilineEmptyTag(lnum)
+  let lnum = a:lnum - 1
+  let lnums = [0, 0]
+  while lnum > 0
+    let line = getline(lnum)
+    if line =~? s:empty_tag_end
+      let lnums[1] = lnum
     endif
-  endif
 
-  return indent
+    if line =~? s:tag_start
+      if line =~? s:empty_tag_start
+        let lnums[0] = lnum
+        return lnums
+      else
+        return [0, 0]
+      endif
+    endif
+
+    let lnum = lnum - 1
+  endwhile
 endfunction
+
+function! s:Log(msg)
+  if s:debug
+    echom '['.s:name.']['.v:lnum.'] '.a:msg
+  endif
+endfunction
+"}}}
+
+let b:did_indent = 1
+" vim: fdm=marker
diff --git a/packages.yaml b/packages.yaml
index d244ef498..62fda5397 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1574,7 +1574,7 @@ filetypes:
   - stylus
 ---
 name: svelte
-remote: evanleck/vim-svelte@main
+remote: leafOfTree/vim-svelte-plugin
 filetypes:
 - name: svelte
   linguist: Svelte
diff --git a/syntax/svelte-html.vim b/syntax/svelte-html.vim
new file mode 100644
index 000000000..c0b243b13
--- /dev/null
+++ b/syntax/svelte-html.vim
@@ -0,0 +1,127 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'svelte', 'syntax/svelte-html.vim')
+  finish
+endif
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Config {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let s:highlight_svelte_attr = svelte#GetConfig('highlight_svelte_attr', 0)
+")}}}
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Syntax highlight {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+syntax match svelteComponentName containedin=htmlTagN '\v\C<[a-zA-Z0-9]+(\.[A-Z][a-zA-Z0-9]+)*>'
+
+syntax match svelteComponentName containedin=htmlTagN '\v\C<[a-z0-9]+(-[a-z0-9]+)+>'
+
+syntax match svelteComponentName containedin=htmlTagN '\vsvelte:\w*'
+
+" Syntax for vim-svelte-theme
+syntax match htmlAttr '\v(\S|\<)@<![^\/\<\>[:blank:]]+' containedin=htmlTag
+      \ contains=htmlString,svelteValue,htmlArg
+syntax match htmlAttrEqual '\v\=' containedin=htmlAttr
+
+syntax match svelteAttr 
+      \ '\v(\S)@<!(on|bind|use|in|out|transition|animate|class):[^\=\>[:blank:]]+(\=\"[^"]*\"|\=\{[^}]*\})?'
+      \ containedin=htmlTag 
+      \ contains=svelteKey,svelteValue
+
+syntax match svelteKey contained '\v(on|bind|use|in|out|transition|animate|class):[^\=\>[:blank:]]+'
+syntax match svelteValue contained '\v\{[^}]*\}'
+
+syntax region svelteExpression 
+      \ containedin=htmlH.*,htmlItalic
+      \ matchgroup=svelteBrace
+      \ transparent
+      \ start="{"
+      \ end="}\(}\)\@!"
+
+syntax region svelteExpression 
+      \ containedin=htmlSvelteTemplate,svelteValue,htmlString,htmlValue,htmlArg,htmlTag
+      \ contains=@simpleJavascriptExpression,svelteAtTags
+      \ matchgroup=svelteBrace
+      \ transparent
+      \ start="{"
+      \ end="}\(}\)\@!"
+
+syntax region svelteExpression 
+      \ containedin=htmlTag
+      \ contains=@simpleJavascriptExpression,svelteAtTags,svelteShortProp
+      \ matchgroup=svelteBrace
+      \ transparent
+      \ start="{"
+      \ end="}\(}\)\@!"
+
+syntax match svelteAtTags '\v\@(html|debug)'
+syntax match svelteShortProp '\v<\w+>'
+
+syntax region svelteBlockBody
+      \ containedin=htmlSvelteTemplate,htmlLink
+      \ contains=@simpleJavascriptExpression,svelteBlockKeyword
+      \ matchgroup=svelteBrace
+      \ start="{:"
+      \ end="}"
+
+syntax region svelteBlockStart
+      \ containedin=htmlSvelteTemplate,htmlLink
+      \ contains=@simpleJavascriptExpression,svelteBlockKeyword
+      \ matchgroup=svelteBrace
+      \ start="{#"
+      \ end="}"
+
+syntax region svelteBlockEnd
+      \ containedin=htmlSvelteTemplate,htmlLink
+      \ contains=@simpleJavascriptExpression,svelteBlockKeyword
+      \ matchgroup=svelteBrace
+      \ start="{\/"
+      \ end="}"
+
+syntax keyword svelteBlockKeyword if else each await then catch as
+
+syntax cluster simpleJavascriptExpression 
+      \ contains=javaScriptStringS,javaScriptStringD,javaScriptTemplateString,javascriptNumber,javaScriptOperator
+
+" Redefine JavaScript syntax
+syntax region javaScriptStringS	
+      \ start=+'+ skip=+\\\\\|\\'+ end=+'\|$+	contained
+syntax region javaScriptStringD	
+      \ start=+"+ skip=+\\\\\|\\"+ end=+"\|$+	contained
+syntax region javaScriptTemplateString
+      \ start=+`+ skip=+\\`+ end=+`+ contained
+      \ contains=javaScriptTemplateExpression
+syntax region javaScriptTemplateExpression
+      \ matchgroup=Type
+      \ start=+${+ end=+}+ keepend contained
+
+syntax match javaScriptNumber '\v<-?\d+L?>|0[xX][0-9a-fA-F]+>' contained
+syntax match javaScriptOperator '[-!|&+<>=%*~^]' contained
+syntax match javaScriptOperator '\v(*)@<!/(/|*)@!' contained
+syntax keyword javaScriptOperator delete instanceof typeof void new in of contained
+
+highlight default link svelteAttr htmlTag
+if s:highlight_svelte_attr
+  highlight default link svelteKey Type
+  highlight default link svelteValue None
+else
+  highlight default link svelteKey htmlArg
+  highlight default link svelteValue String
+endif
+
+highlight default link svelteBrace Type
+highlight default link svelteBlockKeyword Statement
+highlight default link svelteComponentName htmlTagName
+highlight default link javaScriptTemplateString String
+highlight default link javaScriptStringS String
+highlight default link javaScriptStringD String
+highlight default link javaScriptNumber	Constant
+highlight default link javaScriptOperator	Operator
+highlight default link svelteAttr	htmlTag
+highlight default link svelteAttrEqual htmlTag
+highlight default link svelteShortProp htmlValue
+"}}}
+" vim: fdm=marker
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index d872826c4..f67c8cafa 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -2,123 +2,278 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'svelte', 'syntax/svelte.vim')
   finish
 endif
 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim syntax file
-" Language:   Svelte 3 (HTML/JavaScript)
-" Author:     Evan Lecklider <evan@lecklider.com>
-" Maintainer: Evan Lecklide <evan@lecklider.com>
-" Depends:    pangloss/vim-javascript
-" URL:        https://github.com/evanleck/vim-svelte
 "
-" Like vim-jsx, this depends on the pangloss/vim-javascript syntax package (and
-" is tested against it exclusively). If you're using vim-polyglot, then you're
-" all set.
-
-if exists("b:current_syntax")
+" Language: Svelte
+" Maintainer: leaf <leafvocation@gmail.com>
+"
+" CREDITS: Inspired by mxw/vim-jsx.
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if exists("b:current_syntax") && b:current_syntax == 'svelte'
   finish
 endif
 
-" Read HTML to begin with.
-runtime! syntax/html.vim
-unlet! b:current_syntax
+" For advanced users, this variable can be used to avoid overload
+let b:current_loading_main_syntax = 'svelte'
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Config {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+let s:load_full_syntax = svelte#GetConfig('load_full_syntax', 0)
+let s:use_pug = svelte#GetConfig('use_pug', 0)
+let s:use_less = svelte#GetConfig('use_less', 0)
+let s:use_sass = svelte#GetConfig('use_sass', 0)
+let s:use_coffee = svelte#GetConfig('use_coffee', 0)
+let s:use_typescript = svelte#GetConfig('use_typescript', 0)
+"}}}
 
-" Expand HTML tag names to include mixed case, periods, and colons.
-syntax match htmlTagName contained "\<[a-zA-Z:\.]*\>"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Functions {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+function! s:LoadSyntax(group, type)
+  if s:load_full_syntax
+    call s:LoadFullSyntax(a:group, a:type)
+  else
+    call s:LoadDefaultSyntax(a:group, a:type)
+  endif
+endfunction
 
-" Special attributes that include some kind of binding e.g. "on:click",
-" "bind:something", etc.
-syntax match svelteKeyword "\<[a-z]\+:[a-zA-Z|]\+=" contained containedin=htmlTag
+function! s:LoadDefaultSyntax(group, type)
+  unlet! b:current_syntax
+  let syntaxPaths = ['$VIMRUNTIME', '$VIM/vimfiles', '$HOME/.vim']
+  for path in syntaxPaths
+    let file = expand(path).'/syntax/'.a:type.'.vim'
+    if filereadable(file)
+      execute 'syntax include '.a:group.' '.file
+    endif
+  endfor
+endfunction
 
-" The "slot" attribute has special meaning.
-syntax keyword svelteKeyword slot contained containedin=htmlTag
+function! s:LoadFullSyntax(group, type)
+  call s:SetCurrentSyntax(a:type)
+  exec 'syntax include '.a:group.' syntax/'.a:type.'.vim'
+endfunction
 
-" According to vim-jsx, you can let jsBlock take care of ending the region.
-"   https://github.com/mxw/vim-jsx/blob/master/after/syntax/jsx.vim
-syntax region svelteExpression start="{" end="" contains=jsBlock,javascriptBlock containedin=htmlString,htmlTag,htmlArg,htmlValue,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,htmlHead,htmlTitle,htmlBoldItalicUnderline,htmlUnderlineBold,htmlUnderlineItalicBold,htmlUnderlineBoldItalic,htmlItalicUnderline,htmlItalicBold,htmlItalicBoldUnderline,htmlItalicUnderlineBold,htmlLink,htmlLeadingSpace,htmlBold,htmlBoldUnderline,htmlBoldItalic,htmlBoldUnderlineItalic,htmlUnderline,htmlUnderlineItalic,htmlItalic,htmlStrike,javaScript
+" Settings to avoid syntax overload
+function! s:SetCurrentSyntax(type)
+  if a:type == 'coffee'
+    syntax cluster coffeeJS contains=@htmlJavaScript
 
-" Block conditionals.
-syntax match svelteConditional "#if" contained containedin=jsBlock,javascriptBlock
-syntax match svelteConditional "/if" contained containedin=jsBlock,javascriptBlock
-syntax match svelteConditional ":else if" contained containedin=jsBlock,javascriptBlock
-syntax match svelteConditional ":else" contained containedin=jsBlock,javascriptBlock
+    " Avoid overload of `javascript.vim`
+    let b:current_syntax = 'svelte'
+  else
+    unlet! b:current_syntax
+  endif
+endfunction
+"}}}
 
-" Block keywords.
-syntax match svelteKeyword "#await" contained containedin=jsBlock,javascriptBlock
-syntax match svelteKeyword "/await" contained containedin=jsBlock,javascriptBlock
-syntax match svelteKeyword ":catch" contained containedin=jsBlock,javascriptBlock
-syntax match svelteKeyword ":then" contained containedin=jsBlock,javascriptBlock
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Load main syntax {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Load syntax/html.vim to syntax group, which loads full JavaScript and CSS
+" syntax. It defines group htmlJavaScript and htmlCss.
+call s:LoadSyntax('@HTMLSyntax', 'html')
 
-" Inline keywords.
-syntax match svelteKeyword "@html" contained containedin=jsBlock,javascriptBlock
-syntax match svelteKeyword "@debug" contained containedin=jsBlock,javascriptBlock
+" Load svelte-html syntax
+syntax include syntax/svelte-html.vim
 
-" Repeat functions.
-syntax match svelteRepeat "#each" contained containedin=jsBlock,javascriptBlock
-syntax match svelteRepeat "/each" contained containedin=jsBlock,javascriptBlock
+" Avoid overload
+if !hlexists('cssTagName')
+  call s:LoadSyntax('@htmlCss', 'css')
+endif
 
-highlight def link svelteConditional Conditional
-highlight def link svelteKeyword Keyword
-highlight def link svelteRepeat Repeat
+" Avoid overload
+if !hlexists('javaScriptComment')
+  call s:LoadSyntax('@htmlJavaScript', 'javascript')
+endif
+"}}}
 
-" Preprocessed languages that aren't supported out of the box by Svelte require
-" additional syntax files to be pulled in and can slow Vim down a bit. For that
-" reason, preprocessed languages must be enabled manually. Note that some may
-" require additional plugins that contain the actual syntax definitions.
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 "
-" Heavily cribbed from https://github.com/posva/vim-vue and largely completed by
-" @davidroeca (thank you!).
-
-" A syntax should be registered if there's a valid syntax definition known to
-" Vim and it is enabled for the Svelte plugin.
-function! s:enabled(language)
-  " Check whether a syntax file for {language} exists
-  let s:syntax_name = get(a:language, 'as', a:language.name)
-  if empty(globpath(&runtimepath, 'syntax/' . s:syntax_name . '.vim'))
-    return 0
-  endif
+" Load pre-processors syntax {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" If pug is enabled, load vim-pug syntax
+if s:use_pug
+  call s:LoadFullSyntax('@PugSyntax', 'pug')
+endif
+
+" If less is enabled, load less syntax 
+if s:use_less
+  call s:LoadSyntax('@LessSyntax', 'less')
+  runtime! after/syntax/less.vim
+endif
 
-  " If g:svelte_preprocessors is set, check for it there, otherwise return 0.
-  if exists('g:svelte_preprocessors') && type(g:svelte_preprocessors) == v:t_list
-    return index(g:svelte_preprocessors, a:language.name) != -1
+" If sass is enabled, load sass syntax 
+if s:use_sass
+  call s:LoadSyntax('@SassSyntax', 'sass')
+  runtime! after/syntax/sass.vim
+endif
+
+" If CoffeeScript is enabled, load the syntax. Keep name consistent with
+" vim-coffee-script/after/html.vim
+if s:use_coffee
+  call s:LoadFullSyntax('@htmlCoffeeScript', 'coffee')
+endif
+
+" If TypeScript is enabled, load the syntax.
+if s:use_typescript
+  call s:LoadFullSyntax('@TypeScript', 'typescript')
+endif
+"}}}
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Syntax highlight {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" All start with html/javascript/css for emmet-vim in-file type detection
+" Normal tag template
+syntax region htmlSvelteTemplate fold
+      \ start=+<[-:a-zA-Z0-9]\+[^>]*>$+ 
+      \ end=+^</[-:a-zA-Z0-9]\+>+ 
+      \ keepend contains=@HTMLSyntax
+" Start tag across multiple lines or Empty tag across multiple lines
+syntax region htmlSvelteTemplate fold
+      \ start=+<[-:a-zA-Z0-9]\+[^>]*$+ 
+      \ end=+^\(<\/[-:a-zA-Z0-9]\+>\)\|^\([^<]*\/>\)+ 
+      \ keepend contains=@HTMLSyntax
+" Tag in one line
+syntax match htmlSvelteTemplate fold
+      \ +<[-:a-zA-Z0-9]\+[^>]*>.*</[-:a-zA-Z0-9]\+>+ 
+      \ contains=@HTMLSyntax
+" Empty tag in one line
+syntax match htmlSvelteTemplate fold
+      \ +<[-:a-zA-Z0-9]\+[^>]*/>+ 
+      \ contains=@HTMLSyntax
+" @html,@debug tag in one line
+syntax match htmlSvelteTemplate fold
+      \ +{@\(html\|debug\)[^}]*}+ 
+      \ contains=@HTMLSyntax
+" Control blocks like {#if ...}, {#each ...}
+syntax region htmlSvelteTemplate fold
+      \ start=+{#[-a-zA-Z0-9]\+[^}]*}+ 
+      \ end=+^{/[-a-zA-Z0-9]\+}+ 
+      \ keepend contains=@HTMLSyntax
+
+syntax region javascriptSvelteScript fold
+      \ start=+<script[^>]*>+ 
+      \ end=+</script>+ 
+      \ keepend 
+      \ contains=@htmlJavaScript,jsImport,jsExport,svelteTag,svelteKeyword
+
+syntax region cssSvelteStyle fold
+      \ start=+<style[^>]*>+ 
+      \ end=+</style>+ 
+      \ keepend contains=@htmlCss,svelteTag
+
+" Preprocessors syntax
+syntax region pugSvelteTemplate fold
+      \ start=+<template[^>]*lang="pug"[^>]*>+
+      \ end=+</template>+
+      \ keepend contains=@PugSyntax,svelteTag
+
+syntax region coffeeSvelteScript fold 
+      \ start=+<script[^>]*lang="coffee"[^>]*>+
+      \ end=+</script>+
+      \ keepend contains=@htmlCoffeeScript,jsImport,jsExport,svelteTag
+
+syntax region typescriptSvelteScript fold
+      \ start=+<script[^>]*lang="\(ts\|typescript\)"[^>]*>+
+      \ end=+</script>+
+      \ keepend contains=@TypeScript,svelteTag
+
+syntax region cssLessSvelteStyle fold
+      \ start=+<style[^>]*lang="less"[^>]*>+ 
+      \ end=+</style>+ 
+      \ keepend contains=@LessSyntax,svelteTag
+syntax region cssSassSvelteStyle fold
+      \ start=+<style[^>]*lang="sass"[^>]*>+ 
+      \ end=+</style>+ 
+      \ keepend contains=@SassSyntax,svelteTag
+syntax region cssScssSvelteStyle fold
+      \ start=+<style[^>]*lang="scss"[^>]*>+ 
+      \ end=+</style>+ 
+      \ keepend contains=@SassSyntax,svelteTag
+
+syntax region svelteTag 
+      \ start=+^<[^/]+ end=+>+  skip=+></+
+      \ contained contains=htmlTagN,htmlString,htmlArg fold
+syntax region svelteTag 
+      \ start=+^</+ end=+>+ 
+      \ contained contains=htmlTagN,htmlString,htmlArg
+syntax keyword svelteKeyword $ contained
+
+highlight default link svelteTag htmlTag
+highlight default link svelteKeyword Keyword
+highlight default link cssUnitDecorators2 Number
+highlight default link cssKeyFrameProp2 Constant
+"}}}
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+"
+" Syntax patch {{{
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Patch 7.4.1142
+if has("patch-7.4-1142")
+  if has("win32")
+    syn iskeyword @,48-57,_,128-167,224-235,$
   else
-    return 0
+    syn iskeyword @,48-57,_,192-255,$
   endif
-endfunction
+endif
 
-" Default tag definitions.
-let s:languages = [
-      \ { 'name': 'less', 'tag': 'style' },
-      \ { 'name': 'scss', 'tag': 'style' },
-      \ { 'name': 'sass', 'tag': 'style' },
-      \ { 'name': 'stylus', 'tag': 'style' },
-      \ { 'name': 'typescript', 'tag': 'script' },
-      \ ]
-
-" Add global tag definitions to our defaults.
-if exists('g:svelte_preprocessor_tags') && type(g:svelte_preprocessor_tags) == v:t_list
-  let s:languages += g:svelte_preprocessor_tags
+" Style
+" Redefine (less|sass)Definition to highlight <style> correctly and 
+" enable emmet-vim css type.
+if s:use_less
+  silent! syntax clear lessDefinition
+  syntax region cssLessDefinition matchgroup=cssBraces 
+        \ contains=@LessSyntax,cssLessDefinition
+        \ contained containedin=cssLessSvelteStyle
+        \ start="{" end="}" 
+endif
+if s:use_sass
+  silent! syntax clear sassDefinition
+  syntax region cssSassDefinition matchgroup=cssBraces 
+        \ contains=@SassSyntax,cssSassDefinition
+        \ contained containedin=cssScssSvelteStyle,cssSassSvelteStyle
+        \ start="{" end="}" 
 endif
 
-for s:language in s:languages
-  let s:attr = '\(lang\|type\)=\("\|''\)[^\2]*' . s:language.name . '[^\2]*\2'
-  let s:start = '<' . s:language.tag . '\>\_[^>]*' . s:attr . '\_[^>]*>'
+" Avoid css syntax interference
+silent! syntax clear cssUnitDecorators
+" Have to use a different name
+syntax match cssUnitDecorators2 
+      \ /\(#\|-\|+\|%\|mm\|cm\|in\|pt\|pc\|em\|ex\|px\|ch\|rem\|vh\|vw\|vmin\|vmax\|dpi\|dppx\|dpcm\|Hz\|kHz\|s\|ms\|deg\|grad\|rad\)\ze\(;\|$\)/
+      \ contained
+      \ containedin=cssAttrRegion,sassCssAttribute,lessCssAttribute
 
-  if s:enabled(s:language)
-    execute 'syntax include @' . s:language.name . ' syntax/' . get(s:language, 'as', s:language.name) . '.vim'
-    unlet! b:current_syntax
+silent! syntax clear cssKeyFrameProp
+syn match cssKeyFrameProp2 /\d*%\|from\|to/ 
+      \ contained nextgroup=cssDefinition
+      \ containedin=cssAttrRegion,sassCssAttribute,lessCssAttribute
 
-    execute 'syntax region svelte_' . s:language.name
-          \ 'keepend'
-          \ 'start=/' . s:start . '/'
-          \ 'end="</' . s:language.tag . '>"me=s-1'
-          \ 'contains=@' . s:language.name . ',svelteSurroundingTag'
-          \ 'fold'
-  endif
-endfor
+" HTML
+" Clear htmlHead that may cause highlighting out of bounds
+silent! syntax clear htmlHead
 
-syntax region svelteSurroundingTag contained start=+<\(script\|style\|template\)+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
+" JavaScript
+" Number with minus
+syntax match javaScriptNumber '\v<-?\d+L?>|0[xX][0-9a-fA-F]+>' 
+      \ containedin=@javascriptSvelteScript display
 
-" Cybernetically enhanced web apps.
-let b:current_syntax = "svelte"
+" html5 data-*
+syntax match htmlArg '\v<data(-[.a-z0-9]+)+>' containedin=@HTMLSyntax
+"}}}
 
-" Sync from start because of the wacky nesting.
-syntax sync fromstart
+let b:current_syntax = 'svelte'
+" vim: fdm=marker

From 0f9acbe2fcc6c87336494406e3d3c81c40e9de52 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Apr 2021 12:12:38 +0200
Subject: [PATCH 242/299] Remove mm from xml extensions, fixes #699

---
 README.md                    | 2 +-
 autoload/polyglot/init.vim   | 2 +-
 autoload/polyglot/sleuth.vim | 2 +-
 packages.yaml                | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 40674dd32..973453a00 100644
--- a/README.md
+++ b/README.md
@@ -198,7 +198,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [velocity](https://github.com/lepture/vim-velocity) (Syntax highlighting for vm files)
 - [vue](https://github.com/posva/vim-vue) (Vue syntax highlighting for vue and wpy files)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (Syntax highlighting for xdc files)
-- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 95 more files)
+- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 94 more files)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax) (XSLT syntax highlighting for xslt and xsl files)
 - [yard](https://github.com/noprompt/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting for zep files)
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 1999e54e3..2ffe93ca7 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -2592,7 +2592,7 @@ if !has_key(g:polyglot_is_disabled, 'ant')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
 endif
 
 if !has_key(g:polyglot_is_disabled, 'csv')
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 5abd31482..a84ae67a3 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -612,7 +612,7 @@ let s:globs = {
   \ 'xhtml': '*.xhtml,*.xht',
   \ 'xinetd': '',
   \ 'xmath': '*.msc,*.msf',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
   \ 'xml.twig': '*.xml.twig',
   \ 'xmodmap': '*Xmodmap,*xmodmap*',
   \ 'xpm': '*.xpm,*.pm',
diff --git a/packages.yaml b/packages.yaml
index 62fda5397..71e25f2f2 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1791,6 +1791,7 @@ filetypes:
   - tsx
   # handled by powershell plugin
   - ps1xml
+  - mm
 ---
 name: xsl
 remote: vim-scripts/XSLT-syntax

From 48eb0fb1a890077cc85f1916fc2c8bb611a0f8d5 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Apr 2021 12:14:37 +0200
Subject: [PATCH 243/299] Update

---
 README.md                    |   3 +-
 autoload/polyglot/init.vim   |   4 ++
 autoload/polyglot/sleuth.vim |   1 +
 ftplugin/sway.vim            |   5 ++
 packages.yaml                |   8 +++
 syntax/sway.vim              | 133 +++++++++++++++++++++++++++++++++++
 tests/filetypes.vim          |   1 +
 7 files changed, 154 insertions(+), 1 deletion(-)
 create mode 100644 ftplugin/sway.vim
 create mode 100644 syntax/sway.vim

diff --git a/README.md b/README.md
index 973453a00..9498f373a 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->603<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->604<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -179,6 +179,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [svelte](https://github.com/leafOfTree/vim-svelte-plugin) (Svelte syntax highlighting for svelte files)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
 - [svg](https://github.com/vim-scripts/svg.vim) (SVG syntax highlighting for svg files)
+- [sway](https://github.com/aouelete/sway-vim-syntax)
 - [swift](https://github.com/keith/swift.vim) (Swift syntax highlighting for swift files)
 - [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (Syntax highlighting for sxhkdrc files)
 - [systemd](https://github.com/wgwoods/vim-systemd-syntax) (Syntax highlighting for automount, dnssd, link, mount, netdev and 9 more files)
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 2ffe93ca7..3b7e80723 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -168,6 +168,10 @@ let did_load_filetypes = 1
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(g:polyglot_is_disabled, 'sway')
+  au BufNewFile,BufRead *sway/config setf sway
+endif
+
 if !has_key(g:polyglot_is_disabled, 'hjson')
   au BufNewFile,BufRead *.hjson setf hjson
 endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index a84ae67a3..50b3321b3 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -525,6 +525,7 @@ let s:globs = {
   \ 'svelte': '*.svelte',
   \ 'svg': '*.svg',
   \ 'svn': 'svn-commit*.tmp',
+  \ 'sway': '',
   \ 'swift': '*.swift',
   \ 'swiftgyb': '*.swift.gyb',
   \ 'sxhkdrc': '*.sxhkdrc,sxhkdrc',
diff --git a/ftplugin/sway.vim b/ftplugin/sway.vim
new file mode 100644
index 000000000..3b7df6b85
--- /dev/null
+++ b/ftplugin/sway.vim
@@ -0,0 +1,5 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sway', 'ftplugin/sway.vim')
+  finish
+endif
+
+setlocal commentstring=#\ %s
diff --git a/packages.yaml b/packages.yaml
index 71e25f2f2..70c322157 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5583,3 +5583,11 @@ filetypes:
   patterns:
   - pattern: '*.hjson'
     description: Hjson (https://hjson.github.io)
+---
+name: sway
+remote: aouelete/sway-vim-syntax
+filetypes:
+- name: sway
+  patterns:
+  - pattern: '*sway/config'
+    description: Sway Configuration
diff --git a/syntax/sway.vim b/syntax/sway.vim
new file mode 100644
index 000000000..5ca755c1c
--- /dev/null
+++ b/syntax/sway.vim
@@ -0,0 +1,133 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sway', 'syntax/sway.vim')
+  finish
+endif
+
+" Vim syntax file
+" Language: sway-wm config file
+" Maintainer: Aaron Ouellette
+" Latest Revision: 11 June 2016
+
+if exists("b:current_syntax")
+  finish
+endif
+
+" Symbols
+syn match   swayOperators "+\|→"
+syn match   swayChainDelimiter ";"
+
+syn match   swayVar "\$\w\+"
+
+" Key modifiers
+syn keyword swayKeyModifier Shift Control Ctrl Mod1 Mod2 Mod3 Mod4 Mod5 Mode_switch
+
+" Strings
+syn region  swaySimpleString keepend start='[^ \t]' end='$\|;' contained contains=swayChainDelimiter,swayVar
+syn match   swayQuotedString '"[^"]\+"' contained
+syn cluster swayString contains=swaySimpleString,swayQuotedString
+
+" Config commands
+syn keyword swayConfigCommand bind bindcode bindsym assign new_window popup_during_fullscreen font floating_modifier default_orientation workspace_layout for_window focus_follows_mouse bar position colors output input workspace_buttons workspace_auto_back_and_forth binding_mode_indicator debuglog floating_minimum_size floating_maximum_size force_focus_wrapping force_display_urgency_hint hidden_state modifier new_float socket_path mouse_warping strip_workspace_numbers focus_on_window_activation no_focus include gaps
+syn match   swayIpcSocket "ipc[-_]socket" nextgroup=@swayString skipwhite
+
+" Command keywords
+syn keyword swayCommand exit reload restart kill fullscreen global layout border focus move open split append_layout mark unmark resize grow shrink show nop rename title_format sticky
+syn keyword swayParam 1pixel default stacked tabbed normal none tiling stacking floating enable disable up down horizontal vertical auto up down left right parent child px or ppt leave_fullscreen toggle mode_toggle scratchpad width height top bottom client hide primary yes all active window container to absolute center on off x ms h v smart ignore pixel splith splitv output true
+syn match   swayDashedParam '--\(release\|border\|whole-window\|toggle\)' skipwhite
+syn keyword swayWsSpecialParam next prev next_on_output prev_on_output back_and_forth current number
+syn keyword swayBordersSpecialParam none vertical horizontal both
+syn keyword swayModeParam dock hide invisible skipwhite
+
+" these are not keywords but we add them for consistency
+syn keyword swayPseudoParam no false inactive
+
+" Exec commands
+syn region  swayExecCommand keepend start='[^ \t]' end='$\|;' contained contains=swayChainDelimiter,swayVar,swayNoStartupId
+syn match   swayQuotedExecCommand '"[^"]\+"' contained
+syn keyword swayExecKeyword exec exec_always swaybar_command nextgroup=swayQuotedExecCommand,swayExecCommand skipwhite
+
+" Status command
+syn match   swayStatusCommand ".*$" contained
+syn keyword swayStatusCommandKeyword status_command nextgroup=swayStatusCommand skipwhite
+
+" Font statement
+syn keyword swayFontStatement font nextgroup=@swayString skipwhite
+
+" Separator symbol
+syn keyword swaySeparatorSymbol separator_symbol nextgroup=@swayString skipwhite
+
+" Set statement
+syn match   swaySetVar "\$\w\+" contained nextgroup=@swayString skipwhite
+syn keyword swaySetKeyword set nextgroup=swaySetVar skipwhite
+
+" Workspaces
+syn keyword swayWsKeyword workspace nextgroup=swayWsSpecialParam,@swayString skipwhite
+
+" Hide edge borders
+syn keyword swayBordersConfigCommand hide_edge_borders nextgroup=swayBordersSpecialParam skipwhite
+
+" Mode
+syn keyword swayModeKeyword mode nextgroup=swayModeParam,@swayString skipwhite
+
+" Comments
+syn keyword swayTodo contained TODO FIXME XXX NOTE
+syn match   swayComment "^\s*#.*$" contains=swayTodo
+
+" Error (at end of line)
+syn match swayError ".*$" contained
+
+" Hex color code
+syn match swayColorLast "#[0-9a-fA-F]\{6\}" contained nextgroup=swayError skipwhite
+syn match swayColor2nd "#[0-9a-fA-F]\{6\}" contained nextgroup=swayColorLast skipwhite
+syn match swayColor1st "#[0-9a-fA-F]\{6\}" contained nextgroup=swayColor2nd skipwhite
+
+syn match swayColorDef1 "client\.background\|statusline\|background\|separator\|statusline" nextgroup=swayColorLast skipwhite
+syn match swayColorDef3 "client\.\(focused_inactive\|focused\|unfocused\|urgent\)\|inactive_workspace\|urgent_workspace\|focused_workspace\|active_workspace" nextgroup=swayColor1st skipwhite
+
+highlight link swayChainDelimiter       Operator
+highlight link swayOperators            Operator
+
+highlight link swayExecCommand          Special
+highlight link swayQuotedExecCommand    Special
+highlight link swayStatusCommand        Special
+
+highlight link swayParam                Constant
+highlight link swayPseudoParam          Constant
+highlight link swayDashedParam          Constant
+highlight link swayNoStartupId          Constant
+highlight link swayColor1st             Constant
+highlight link swayColor2nd             Constant
+highlight link swayColorLast            Constant
+highlight link swayWsSpecialParam       Constant
+highlight link swayBordersSpecialParam  Constant
+highlight link swayModeParam            Constant
+
+highlight link swayVar                  Identifier
+highlight link swaySetVar               Identifier
+
+highlight link swayKeyModifier          Function
+
+highlight link swaySimpleString         String
+highlight link swayQuotedString         String
+highlight link swayWsName               String
+highlight link swayQuotedWsName         String
+highlight link swaySetValue             String
+highlight link swayFont                 String
+
+highlight link swayExecKeyword          Keyword
+highlight link swayCommand              Keyword
+highlight link swayWsKeyword            Keyword
+
+highlight link swayColorDef1            Define
+highlight link swayColorDef3            Define
+highlight link swayConfigCommand        Define
+highlight link swayIpcSocket            Define
+highlight link swaySetKeyword           Define
+highlight link swayModeKeyword          Define
+highlight link swayFontStatement        Define
+highlight link swaySeparatorSymbol      Define
+highlight link swayStatusCommandKeyword Define
+highlight link swayBordersConfigCommand Define
+
+highlight link swayTodo                 Todo
+highlight link swayComment              Comment
+highlight link swayError                Error
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index a8d1cb7d6..fbcc3cf96 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -648,6 +648,7 @@ call TestFiletype('mint')
 call TestFiletype('jsonc')
 call TestFiletype('gleam')
 call TestFiletype('hjson')
+call TestFiletype('sway')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 

From 730dcb02caab60a6ae5d8b4bdc16d290041061ec Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 14 Apr 2021 12:24:46 +0200
Subject: [PATCH 244/299] Do not touch nofileignorecase setting, fixes #694

---
 autoload/polyglot/init.vim | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 3b7e80723..0cb4f4010 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -66,9 +66,6 @@ endfun
 
 au VimEnter * call PolyglotVerify()
 
-" Be consistent across different systems
-set nofileignorecase
-
 function! s:SetDefault(name, value)
   if !exists(a:name)
     let {a:name} = a:value

From af0eaee01737d26314c9c3618153e99d1eb3e2f1 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 1 Jun 2021 18:17:40 +0200
Subject: [PATCH 245/299] Update

---
 autoload/LaTeXtoUnicode.vim  |  54 ++++-----
 autoload/csv.vim             |  12 +-
 autoload/polyglot/init.vim   |   2 +-
 autoload/polyglot/sleuth.vim |   2 +-
 autoload/terraform.vim       |   3 +-
 extras/filetype.vim          |  33 ++++--
 ftplugin/elixir.vim          |   9 +-
 ftplugin/git.vim             |   2 +-
 ftplugin/julia.vim           |   2 +-
 ftplugin/meson.vim           |   1 +
 ftplugin/modula2.vim         |  43 ++++++++
 ftplugin/modula3.vim         |  42 +++++++
 ftplugin/pascal.vim          |  52 +++++++--
 ftplugin/rmd.vim             |   4 +-
 ftplugin/rnoweb.vim          |   4 +-
 ftplugin/rrst.vim            |   4 +-
 ftplugin/systemverilog.vim   |  35 +++++-
 ftplugin/vlang.vim           |   2 +-
 indent/julia.vim             |  34 +++---
 indent/make.vim              |   4 +-
 indent/meson.vim             |   3 +-
 indent/rmd.vim               |  32 ++++--
 indent/rst.vim               |   2 +-
 syntax/ansible.vim           |  43 +++++---
 syntax/basic/function.vim    |   4 +-
 syntax/basic/keyword.vim     |  22 ++--
 syntax/clojure.vim           |   2 +-
 syntax/conf.vim              |   6 +-
 syntax/cpp.vim               |  40 ++++---
 syntax/csv.vim               |  17 +--
 syntax/dts.vim               |  54 ++++++++-
 syntax/git.vim               |   3 +-
 syntax/gitcommit.vim         |   6 +-
 syntax/gitrebase.vim         |   3 +
 syntax/go.vim                |   4 +-
 syntax/help.vim              |   5 +-
 syntax/hollywood.vim         |  13 +--
 syntax/javascript.vim        |   4 +-
 syntax/julia.vim             | 208 +++++++++++++++++++----------------
 syntax/kotlin.vim            |   8 +-
 syntax/llvm.vim              |   3 +
 syntax/meson.vim             |   1 +
 syntax/mlir.vim              |  25 +++--
 syntax/modula3.vim           | 113 ++++++++++++-------
 syntax/nix.vim               |   2 +-
 syntax/pascal.vim            | 104 +++++++++++-------
 syntax/pgsql.vim             |  19 ++--
 syntax/ratpoison.vim         |  22 ++--
 syntax/rmd.vim               |  44 ++++++--
 syntax/rnoweb-2.vim          |   4 +-
 syntax/solidity.vim          |  14 +--
 syntax/swift.vim             |   8 +-
 syntax/terraform.vim         |   8 +-
 syntax/tmux.vim              |  51 ++++-----
 syntax/vlang.vim             |   2 +-
 syntax/zig.vim               |   2 +-
 56 files changed, 814 insertions(+), 431 deletions(-)
 create mode 100644 ftplugin/modula2.vim
 create mode 100644 ftplugin/modula3.vim

diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index 2be1a4927..86420ccac 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -73,9 +73,6 @@ function! s:L2U_SetupGlobal()
   " Trigger for the previous mapping of <CR>
   let s:l2u_fallback_trigger_cr = "\u0091L2UFallbackCR"
 
-  " Trigger for autosub completion cleanup autocommand
-  let s:l2u_autosub_cleanup_trigger = "\u0091L2UAutosubCleanup"
-
 endfunction
 
 " Each time the filetype changes, we may need to enable or
@@ -371,16 +368,14 @@ function! s:L2U_SetFallbackMapping(s, k)
     " parsing of the <C-R>=... expression, so we need to special-case it.
     " Also, if the original mapping was intended to be recursive, this
     " will break it.
-    if mmdict["expr"]
-      if a:s != "<CR>"
-        let rhs = substitute(rhs, '\c' . a:s, "\<C-R>=LaTeXtoUnicode#PutLiteral('" . a:s . "')\<CR>", 'g')
-      else
-        let rhs = substitute(rhs, '\c' . a:s, "\<C-R>=LaTeXtoUnicode#PutLiteralCR()\<CR>", 'g')
-      endif
-      " Make the mapping silent even if it wasn't originally
-      if !mmdict["silent"]
-        let pre = pre . '<silent>'
-      endif
+    if a:s != "<CR>"
+      let rhs = substitute(rhs, '\c' . a:s, "\<C-R>=LaTeXtoUnicode#PutLiteral('" . a:s . "')\<CR>", 'g')
+    else
+      let rhs = substitute(rhs, '\c' . a:s, "\<C-R>=LaTeXtoUnicode#PutLiteralCR()\<CR>", 'g')
+    endif
+    " Make the mapping silent even if it wasn't originally
+    if !mmdict["silent"]
+      let pre = pre . '<silent>'
     endif
   endif
   exe cmd . pre . ' ' . a:k . ' ' . rhs
@@ -631,7 +626,7 @@ function! LaTeXtoUnicode#AutoSub(...)
   let lnum = line('.')
   if col1 == 1
     if a:0 > 1
-      call feedkeys(a:2, 't')
+      call feedkeys(a:2, 'mi')
     endif
     let b:l2u_in_autosub = 0
     return ''
@@ -641,7 +636,7 @@ function! LaTeXtoUnicode#AutoSub(...)
   let col0 = match(l, '\\\%([_^]\?[A-Za-z]\+\%' . col1 . 'c\%([^A-Za-z]\|$\)\|[_^]\%([0-9()=+-]\)\%' . col1 .'c\%(.\|$\)\)')
   if col0 == -1
     if a:0 > 1
-      call feedkeys(a:2, 't')
+      call feedkeys(a:2, 'mi')
     endif
     let b:l2u_in_autosub = 0
     return ''
@@ -650,33 +645,22 @@ function! LaTeXtoUnicode#AutoSub(...)
   let unicode = get(g:l2u_symbols_dict, base, '')
   if empty(unicode)
     if a:0 > 1
-      call feedkeys(a:2, 't')
+      call feedkeys(a:2, 'mi')
     endif
     let b:l2u_in_autosub = 0
     return ''
   endif
 
-  " create a temporary mapping to reset b:l2u_in_autosub when done
-  " (when invoked, it removes itself)
-  exec 'imap <buffer> ' . s:l2u_autosub_cleanup_trigger . ' <Plug>L2UAutosubReset'
-  inoremap <buffer><expr> <Plug>L2UAutosubReset <SID>L2U_AutosubReset()
-
   " perform the substitution, wrapping it in undo breakpoints so that
   " we can revert it as a whole
-  call feedkeys("\<C-G>u", 'n')
-  call feedkeys(repeat("\b", len(base) + bs) . unicode . vc . s:l2u_esc_sequence, 'nt')
-  call feedkeys("\<C-G>u", 'n')
-  " enqueue the reset mechanism
-  call feedkeys(s:l2u_autosub_cleanup_trigger)
-  return ''
-endfunction
-
-function! s:L2U_AutosubReset()
-  " no longer doing substitution
-  let b:l2u_in_autosub = 0
-  " remove the mapping that triggered this function
-  exec 'iunmap <buffer> ' . s:l2u_autosub_cleanup_trigger
-  iunmap <buffer> <Plug>L2UAutosubReset
+  " at the end, reset the l2u_in_autosub variable without leaving insert mode
+  " the 'i' mode is the only one that works correctly when executing macros
+  " the 'n' mode is to avoid user-defined mappings of \b, <C-G> and <C-\><C-O>
+  call feedkeys("\<C-G>u" .
+             \  repeat("\b", len(base) + bs) . unicode . vc . s:l2u_esc_sequence .
+             \  "\<C-G>u" .
+             \  "\<C-\>\<C-O>:let b:l2u_in_autosub = 0\<CR>",
+             \  'ni')
   return ''
 endfunction
 
diff --git a/autoload/csv.vim b/autoload/csv.vim
index d268cd125..98feee757 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -1195,7 +1195,7 @@ endfun
 fu! csv#Sort(bang, line1, line2, colnr) range "{{{3
     " :Sort command
     let wsv  = winsaveview()
-    let flag = matchstr(a:colnr, '[nixo]')
+    let flag = matchstr(a:colnr, '[nixof]')
     call csv#CheckHeaderLine()
     let line1 = a:line1
     let line2 = a:line2
@@ -2199,7 +2199,15 @@ fu! csv#CSVMappings() "{{{3
         call csv#Map('nnoremap', 'W', ':<C-U>call csv#MoveCol(1, line("."))<CR>')
         call csv#Map('nnoremap', '<C-Right>', ':<C-U>call csv#MoveCol(1, line("."))<CR>')
         call csv#Map('nnoremap', 'L', ':<C-U>call csv#MoveCol(1, line("."))<CR>')
-        call csv#Map('nnoremap', 'E', ':<C-U>call csv#MoveCol(-1, line("."))<CR>')
+        try
+            if g:csv_bind_B == 1
+                call csv#Map('nnoremap', 'B', ':<C-U>call csv#MoveCol(-1, line("."))<CR>')
+            else
+                call csv#Map('nnoremap', 'E', ':<C-U>call csv#MoveCol(-1, line("."))<CR>')
+            endif
+        catch
+            call csv#Map('nnoremap', 'E', ':<C-U>call csv#MoveCol(-1, line("."))<CR>')
+        endtry
         call csv#Map('nnoremap', '<C-Left>', ':<C-U>call csv#MoveCol(-1, line("."))<CR>')
         call csv#Map('nnoremap', 'H', ':<C-U>call csv#MoveCol(-1, line("."), 1)<CR>')
         call csv#Map('nnoremap', 'K', ':<C-U>call csv#MoveCol(0, line(".")-v:count1)<CR>')
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 0cb4f4010..62421e06b 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -2245,7 +2245,7 @@ if !has_key(g:polyglot_is_disabled, 'jsonnet')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'json')
-  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
+  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}imgbotconfig,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
 endif
 
 if !has_key(g:polyglot_is_disabled, 'json5')
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 50b3321b3..830a2318b 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -263,7 +263,7 @@ let s:globs = {
   \ 'jovial': '*.jov,*.j73,*.jovial',
   \ 'jproperties': '*.properties,*.properties_??,*.properties_??_??,*.properties_??_??_*',
   \ 'jq': '*.jq,.jqrc,.jqrc*',
-  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.tern-config,.tern-project,.watchmanconfig,Pipfile.lock,composer.lock,mcmod.info',
+  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.imgbotconfig,.tern-config,.tern-project,.watchmanconfig,Pipfile.lock,composer.lock,mcmod.info',
   \ 'json5': '*.json5',
   \ 'jsonc': '*.cjson,*.jsonc,coc-settings.json,.eslintrc.json,.babelrc,.jshintrc,.jslintrc,.mocharc.json,coffeelint.json,tsconfig.json,jsconfig.json',
   \ 'jsonnet': '*.jsonnet,*.libsonnet',
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index a1d2a06a1..324b978d7 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -40,7 +40,7 @@ function! terraform#align() abort
   if exists(':Tabularize') && getline('.') =~# '^.*=' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p)
     let column = strlen(substitute(getline('.')[0:col('.')],'[^=]','','g'))
     let position = strlen(matchstr(getline('.')[0:col('.')],'.*=\s*\zs.*'))
-    Tabularize/=/l1
+    Tabularize/=.*/l1
     normal! 0
     call search(repeat('[^=]*=',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
   endif
@@ -67,6 +67,7 @@ function! terraform#commands(ArgLead, CmdLine, CursorPos) abort
     \ 'show',
     \ 'state',
     \ 'taint',
+    \ 'test',
     \ 'untaint',
     \ 'version',
     \ 'workspace'
diff --git a/extras/filetype.vim b/extras/filetype.vim
index 830e0949f..26c15db39 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Apr 05
+" Last Change:	2021 Apr 17
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -417,6 +417,10 @@ endif
 " Lynx config files
 au BufNewFile,BufRead lynx.cfg			setf lynx
 
+" Modula-3 configuration language (must be before *.cfg and *makefile)
+au BufNewFile,BufRead *.quake,cm3.cfg		setf m3quake
+au BufNewFile,BufRead m3makefile,m3overrides	setf m3build
+
 " Quake
 au BufNewFile,BufRead *baseq[2-3]/*.cfg,*id1/*.cfg	setf quake
 au BufNewFile,BufRead *quake[1-3]/*.cfg			setf quake
@@ -596,7 +600,7 @@ au BufNewFile,BufRead *.fan,*.fwt		setf fan
 au BufNewFile,BufRead *.factor			setf factor
 
 " Fennel
-autocmd BufRead,BufNewFile *.fnl 		setf fennel
+autocmd BufRead,BufNewFile *.fnl		setf fennel
 
 " Fetchmail RC file
 au BufNewFile,BufRead .fetchmailrc		setf fetchmail
@@ -640,7 +644,7 @@ au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
 au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
 
 " Gift (Moodle)
-autocmd BufRead,BufNewFile *.gift 		setf gift
+autocmd BufRead,BufNewFile *.gift		setf gift
 
 " Git
 au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG	setf gitcommit
@@ -711,10 +715,10 @@ au BufNewFile,BufRead .gtkrc,gtkrc		setf gtkrc
 au BufNewFile,BufRead *.haml			setf haml
 
 " Hamster Classic | Playground files
-au BufNewFile,BufRead *.hsm	  		setf hamster
+au BufNewFile,BufRead *.hsm			setf hamster
 
 " Haskell
-au BufNewFile,BufRead *.hs,*.hsc,*.hs-boot	setf haskell
+au BufNewFile,BufRead *.hs,*.hsc,*.hs-boot,*.hsig setf haskell
 au BufNewFile,BufRead *.lhs			setf lhaskell
 au BufNewFile,BufRead *.chs			setf chaskell
 au BufNewFile,BufRead cabal.project		setf cabalproject
@@ -1015,6 +1019,7 @@ au BufNewFile,BufRead *.hgrc,*hgrc		setf cfg
 
 " Meson Build system config
 au BufNewFile,BufRead meson.build,meson_options.txt setf meson
+au BufNewFile,BufRead *.wrap			setf dosini
 
 " Messages (logs mostly)
 au BufNewFile,BufRead */log/{auth,cron,daemon,debug,kern,lpr,mail,messages,news/news,syslog,user}{,.log,.err,.info,.warn,.crit,.notice}{,.[0-9]*,-[0-9]*} setf messages
@@ -1045,10 +1050,10 @@ au BufNewFile,BufRead *.mod
 	\   setf modsim3 |
 	\ endif
 
-" Modula 2  (.md removed in favor of Markdown)
+" Modula-2  (.md removed in favor of Markdown)
 au BufNewFile,BufRead *.m2,*.DEF,*.MOD,*.mi	setf modula2
 
-" Modula 3 (.m3, .i3, .mg, .ig)
+" Modula-3 (.m3, .i3, .mg, .ig)
 au BufNewFile,BufRead *.[mi][3g]		setf modula3
 
 " Monk
@@ -1191,6 +1196,9 @@ au BufNewFile,BufRead *.pp			call polyglot#ft#FTpp()
 " Delphi or Lazarus program file
 au BufNewFile,BufRead *.dpr,*.lpr		setf pascal
 
+" Free Pascal makefile definition file
+au BufNewFile,BufRead *.fpc			setf fpcmake
+
 " PDF
 au BufNewFile,BufRead *.pdf			setf pdf
 
@@ -1204,8 +1212,6 @@ else
   au BufNewFile,BufRead *.pl			call polyglot#ft#FTpl()
 endif
 au BufNewFile,BufRead *.plx,*.al,*.psgi		setf perl
-au BufNewFile,BufRead *.p6,*.pm6,*.pl6		setf perl6
-au BufNewFile,BufRead *.raku,*.rakumod		setf perl6
 
 " Perl, XPM or XPM2
 au BufNewFile,BufRead *.pm
@@ -1219,7 +1225,6 @@ au BufNewFile,BufRead *.pm
 
 " Perl POD
 au BufNewFile,BufRead *.pod			setf pod
-au BufNewFile,BufRead *.pod6			setf pod6
 
 " Php, php3, php4, etc.
 " Also Phtml (was used for PHP 2 in the past)
@@ -1338,12 +1343,15 @@ au BufNewFile,BufRead *.pdb			setf prolog
 " Promela
 au BufNewFile,BufRead *.pml			setf promela
 
+" Property Specification Language (PSL)
+au BufNewFile,BufRead *.psl			setf psl
+
 " Google protocol buffers
 au BufNewFile,BufRead *.proto			setf proto
 au BufNewFile,BufRead *.pbtxt			setf pbtxt
 
 " Poke
-au BufNewFile,BufRead *.pk      		setf poke
+au BufNewFile,BufRead *.pk			setf poke
 
 " Protocols
 au BufNewFile,BufRead */etc/protocols		setf protocols
@@ -1359,6 +1367,9 @@ au BufNewFile,BufRead *.ptl,*.pyi,SConstruct		   setf python
 " Radiance
 au BufNewFile,BufRead *.rad,*.mat		setf radiance
 
+" Raku (formelly Perl6)
+au BufNewFile,BufRead *.pm6,*.p6,*.t6,*.pod6,*.raku,*.rakumod,*.rakudoc,*.rakutest  setf raku
+
 " Ratpoison config/command files
 au BufNewFile,BufRead .ratpoisonrc,ratpoisonrc	setf ratpoison
 
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index 4ab896db3..cd25464a0 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -25,10 +25,11 @@ setlocal commentstring=#\ %s
 
 let &l:path =
       \ join([
-      \   'lib',
-      \   'src',
-      \   'deps/**/lib',
-      \   'deps/**/src',
+      \   'lib/**',
+      \   'src/**',
+      \   'test/**',
+      \   'deps/**/lib/**',
+      \   'deps/**/src/**',
       \   &g:path
       \ ], ',')
 setlocal includeexpr=elixir#util#get_filename(v:fname)
diff --git a/ftplugin/git.vim b/ftplugin/git.vim
index 072859ed9..9a5ac16c4 100644
--- a/ftplugin/git.vim
+++ b/ftplugin/git.vim
@@ -37,7 +37,7 @@ if exists('*shellescape') && exists('b:git_dir') && b:git_dir != ''
 else
   setlocal keywordprg=git\ show
 endif
-if has('gui_running')
+if has('gui_running') && &guioptions !~# '!'
   let &l:keywordprg = substitute(&l:keywordprg,'^git\>','git --no-pager','')
 endif
 
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index 08aa2f8e3..785ffa2a2 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -83,7 +83,7 @@ if exists("loaded_matchit")
   " the 'begin' and 'end' keywords when they are used as a range rather than as
   " the delimiter of a block
   let b:match_skip = 'synIDattr(synID(line("."),col("."),1),"name") =~ '
-        \ . '"\\<julia\\%(Comprehension\\%(For\\|If\\)\\|RangeKeyword\\|SymbolS\\?\\|Comment[LM]\\|\\%([bsvr]\\|ip\\|MIME\\|big\\|raw\\|test\\|html\\|int128\\|Printf\\|Shell\\|Doc\\)\\?String\\|StringPrefixed\\|RegEx\\)\\>"'
+        \ . '"\\<julia\\%(Comprehension\\%(For\\|If\\)\\|RangeKeyword\\|Comment\\%([LM]\\|Delim\\)\\|\\%([bs]\\|Shell\\|Printf\\|Doc\\)\\?String\\|StringPrefixed\\|DocStringM\\(Raw\\)\\?\\|RegEx\\|SymbolS\\?\\|Macro\\|Dotted\\)\\>"'
 
   let b:undo_ftplugin = b:undo_ftplugin
         \ . " | unlet! b:match_words b:match_skip b:match_ignorecase"
diff --git a/ftplugin/meson.vim b/ftplugin/meson.vim
index 6074dbd3f..79ff47c6a 100644
--- a/ftplugin/meson.vim
+++ b/ftplugin/meson.vim
@@ -5,6 +5,7 @@ endif
 " Vim filetype plugin file
 " Language:	meson
 " License:	VIM License
+" Maintainer:   Liam Beguin <liambeguin@gmail.com>
 " Original Author:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 " Last Change:		2018 Nov 27
 
diff --git a/ftplugin/modula2.vim b/ftplugin/modula2.vim
new file mode 100644
index 000000000..a61d0bd13
--- /dev/null
+++ b/ftplugin/modula2.vim
@@ -0,0 +1,43 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'modula2', 'ftplugin/modula2.vim')
+  finish
+endif
+
+" Vim filetype plugin file
+" Language:	Modula-2
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2021 Apr 08
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=s0:(*,mb:\ ,ex:*)
+setlocal commentstring=(*%s*)
+setlocal formatoptions-=t formatoptions+=croql
+
+if exists("loaded_matchit") && !exists("b:match_words")
+  " The second branch of the middle pattern is intended to match CASE labels
+  let b:match_words = '\<REPEAT\>:\<UNTIL\>,' ..
+		    \ '\<\%(BEGIN\|CASE\|FOR\|IF\|LOOP\|WHILE\|WITH\)\>' ..
+		    \	':' ..
+		    \	'\<\%(ELSIF\|ELSE\)\>\|\%(^\s*\)\@<=\w\+\%(\s*\,\s*\w\+\)\=\s*\:=\@!' ..
+		    \	':' ..
+		    \ '\<END\>'
+endif
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Modula-2 Source Files (*.def *.mod)\t*.def;*.mod\n" ..
+		     \ "All Files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setl com< cms< fo< " ..
+		    \ "| unlet! b:browsefilter b:match_words"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/ftplugin/modula3.vim b/ftplugin/modula3.vim
new file mode 100644
index 000000000..1e9fc10e9
--- /dev/null
+++ b/ftplugin/modula3.vim
@@ -0,0 +1,42 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'modula3', 'ftplugin/modula3.vim')
+  finish
+endif
+
+" Vim filetype plugin file
+" Language:	Modula-3
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2021 Apr 08
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=s0:(*,mb:\ ,ex:*)
+setlocal commentstring=(*%s*)
+setlocal formatoptions-=t formatoptions+=croql
+
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_words = '\<REPEAT\>:\<UNTIL\>,' ..
+		    \ '\<\%(BEGIN\|CASE\|FOR\|IF\|LOCK\|LOOP\|TRY\|TYPECASE\|WHILE\|WITH\)\>' ..
+		    \	':' ..
+		    \	'\<\%(ELSIF\|ELSE\|EXCEPT\|FINALLY\)\>\|\%(^\s*\)\@<=\S.*=>' ..
+		    \	':' ..
+		    \ '\<END\>'
+endif
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Modula-3 Source Files (*.m3)\t*.m3\n" ..
+		     \ "All Files (*.*)\t*.*\n"
+endif
+
+let b:undo_ftplugin = "setl com< cms< fo< " ..
+		    \ "| unlet! b:browsefilter b:match_words"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/ftplugin/pascal.vim b/ftplugin/pascal.vim
index db3da051d..5b0640e72 100644
--- a/ftplugin/pascal.vim
+++ b/ftplugin/pascal.vim
@@ -3,22 +3,52 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'pascal', 'ftplugin/pascal.vim
 endif
 
 " Vim filetype plugin file
-" Language:	pascal
-" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
-" Last Changed: 11 Apr 2011
-" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+" Language:		Pascal
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Change:		2021 Apr 23
 
 if exists("b:did_ftplugin") | finish | endif
 let b:did_ftplugin = 1
 
+let s:cpo_save = &cpo
+set cpo&vim
+
+set comments=s:(*,m:\ ,e:*),s:{,m:\ ,e:}
+set commentstring={%s}
+
+if exists("pascal_delphi")
+  set comments+=:///
+endif
+
+if !exists("pascal_traditional")
+  set commentstring=//\ %s
+  set comments+=://
+endif
+
+setlocal formatoptions-=t formatoptions+=croql
+
 if exists("loaded_matchit")
-    let b:match_ignorecase = 1 " (pascal is case-insensitive)
+  let b:match_ignorecase = 1 " (Pascal is case-insensitive)
+
+  let b:match_words  = '\<\%(asm\|begin\|case\|\%(\%(=\|packed\)\s*\)\@<=\%(class\|object\)\|\%(=\s*\)\@<=interface\|record\|try\)\>'
+  let b:match_words .= ':\%(^\s*\)\@<=\%(except\|finally\|else\|otherwise\)\>'
+  let b:match_words .= ':\<end\>\.\@!'
+
+  let b:match_words .= ',\<repeat\>:\<until\>'
+  " let b:match_words .= ',\<if\>:\<else\>' " FIXME - else clashing with middle else. It seems like a debatable use anyway.
+  let b:match_words .= ',\<unit\>:\<\%(\%(^\s*\)\@<=interface\|implementation\|initialization\|finalization\)\>:\<end\.'
+endif
 
-    let b:match_words = '\<\%(begin\|case\|record\|object\|try\)\>'
-    let b:match_words .= ':\<^\s*\%(except\|finally\)\>:\<end\>'
-    let b:match_words .= ',\<repeat\>:\<until\>'
-    let b:match_words .= ',\<if\>:\<else\>'
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Pascal Source Files (*.pas *.pp *.inc)\t*.pas;*.pp;*.inc\n" .
+		     \ "All Files (*.*)\t*.*\n"
 endif
 
-" Undo the stuff we changed.
-let b:undo_ftplugin = "unlet! b:match_words"
+let b:undo_ftplugin = "setl fo< cms< com< " ..
+		    \ "| unlet! b:browsefilter b:match_words b:match_ignorecase"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/ftplugin/rmd.vim b/ftplugin/rmd.vim
index c2fe0c2ba..c890ce5fd 100644
--- a/ftplugin/rmd.vim
+++ b/ftplugin/rmd.vim
@@ -6,7 +6,7 @@ endif
 " Language: R Markdown file
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Sun Jul 22, 2018  06:51PM
+" Last Change:	Sat Aug 15, 2020  12:03PM
 " Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann)
 
 " Only do this when not yet done for this buffer
@@ -50,7 +50,7 @@ runtime ftplugin/pandoc.vim
 " Don't load another plugin for this buffer
 let b:did_ftplugin = 1
 
-if has("gui_win32") && !exists("b:browsefilter")
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
         \ "All Files (*.*)\t*.*\n"
 endif
diff --git a/ftplugin/rnoweb.vim b/ftplugin/rnoweb.vim
index 13b68ef70..ab6389f9e 100644
--- a/ftplugin/rnoweb.vim
+++ b/ftplugin/rnoweb.vim
@@ -6,7 +6,7 @@ endif
 " Language: Rnoweb
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Tue Apr 07, 2015  04:37PM
+" Last Change:	Sat Aug 15, 2020  12:02PM
 
 " Only do this when not yet done for this buffer
 if exists("b:did_ftplugin")
@@ -28,7 +28,7 @@ setlocal iskeyword=@,48-57,_,.
 setlocal suffixesadd=.bib,.tex
 setlocal comments=b:%,b:#,b:##,b:###,b:#'
 
-if has("gui_win32") && !exists("b:browsefilter")
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
         \ "All Files (*.*)\t*.*\n"
 endif
diff --git a/ftplugin/rrst.vim b/ftplugin/rrst.vim
index 68661a65b..25ca0dc72 100644
--- a/ftplugin/rrst.vim
+++ b/ftplugin/rrst.vim
@@ -6,7 +6,7 @@ endif
 " Language: reStructuredText documentation format with R code
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Wed Nov 01, 2017  10:47PM
+" Last Change:	Sat Aug 15, 2020  12:02PM
 " Original work by Alex Zvoleff
 
 " Only do this when not yet done for this buffer
@@ -41,7 +41,7 @@ if !exists("g:rrst_dynamic_comments") || (exists("g:rrst_dynamic_comments") && g
   setlocal formatexpr=FormatRrst()
 endif
 
-if has("gui_win32") && !exists("b:browsefilter")
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:browsefilter = "R Source Files (*.R *.Rnw *.Rd *.Rmd *.Rrst)\t*.R;*.Rnw;*.Rd;*.Rmd;*.Rrst\n" .
         \ "All Files (*.*)\t*.*\n"
 endif
diff --git a/ftplugin/systemverilog.vim b/ftplugin/systemverilog.vim
index c0959e485..53bd1351b 100644
--- a/ftplugin/systemverilog.vim
+++ b/ftplugin/systemverilog.vim
@@ -5,7 +5,7 @@ endif
 " Vim filetype plugin file
 " Language:    SystemVerilog
 " Maintainer:  kocha <kocha.lsifrontend@gmail.com>
-" Last Change: 12-Aug-2013. 
+" Last Change: 07-May-2021
 
 if exists("b:did_ftplugin")
   finish
@@ -13,3 +13,36 @@ endif
 
 " Behaves just like Verilog
 runtime! ftplugin/verilog.vim
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Add SystemVerilog keywords for matchit plugin.
+if exists("loaded_matchit")
+  let b:match_words =
+    \ '\<begin\>:\<end\>,' .
+    \ '\<case\>\|\<casex\>\|\<casez\>:\<endcase\>,' .
+    \ '\<module\>:\<endmodule\>,' .
+    \ '\<if\>:`\@<!\<else\>,' .
+    \ '\<function\>:\<endfunction\>,' .
+    \ '`ifn\?def\>:`elsif\>:`else\>:`endif\>,' .
+    \ '\<task\>:\<endtask\>,' .
+    \ '\<specify\>:\<endspecify\>,' .
+    \ '\<config\>:\<endconfig\>,' .
+    \ '\<generate\>:\<endgenerate\>,' .
+    \ '\<fork\>:\<join\>\|\<join_any\>\|\<join_none\>,' .
+    \ '\<primitive\>:\<endprimitive\>,' .
+    \ '\<table\>:\<endtable\>,' .
+    \ '\<checker\>:\<endchecker\>,' .
+    \ '\<class\>:\<endclass\>,' .
+    \ '\<clocking\>:\<endclocking\>,' .
+    \ '\<gruop\>:\<endgruop\>,' .
+    \ '\<interface\>:\<endinterface\>,' .
+    \ '\<package\>:\<endpackage\>,' .
+    \ '\<program\>:\<endprogram\>,' .
+    \ '\<property\>:\<endproperty\>,' .
+    \ '\<sequence\>:\<endsequence\>'
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/ftplugin/vlang.vim b/ftplugin/vlang.vim
index fbc0a711c..2ae86f997 100644
--- a/ftplugin/vlang.vim
+++ b/ftplugin/vlang.vim
@@ -24,7 +24,7 @@ function! _VFormatFile()
 		else
 			let [_, lnum, colnum, _] = getpos('.')
 			%delete
-			call append(0, split(substitution, "\n"))
+			call setline(1, split(substitution, "\n"))
 			call cursor(lnum, colnum)
 		endif
 	endif
diff --git a/indent/julia.vim b/indent/julia.vim
index fe53789cd..d118f3f47 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -23,11 +23,14 @@ if exists("*GetJuliaIndent")
   finish
 endif
 
-let s:skipPatterns = '\<julia\%(Comprehension\%(For\|If\)\|RangeKeyword\|Comment\%([LM]\|Delim\)\|\%([bsv]\|ip\|big\|MIME\|Shell\|Printf\|Doc\)\=String\|RegEx\|SymbolS\?\)\>'
+let s:skipPatternsBasic = '\<julia\%(Comment\%([LM]\|Delim\)\)\>'
+let s:skipPatterns = '\<julia\%(Comprehension\%(For\|If\)\|RangeKeyword\|Comment\%([LM]\|Delim\)\|\%([bs]\|Shell\|Printf\|Doc\)\?String\|StringPrefixed\|DocStringM\(Raw\)\?\|RegEx\|SymbolS\?\|Macro\|Dotted\)\>'
 
 function JuliaMatch(lnum, str, regex, st, ...)
   let s = a:st
   let e = a:0 > 0 ? a:1 : -1
+  let basic_skip = a:0 > 1 ? a:2 : 'all'
+  let skip = basic_skip ==# 'basic' ? s:skipPatternsBasic : s:skipPatterns
   while 1
     let f = match(a:str, '\C' . a:regex, s)
     if e >= 0 && f >= e
@@ -35,7 +38,8 @@ function JuliaMatch(lnum, str, regex, st, ...)
     endif
     if f >= 0
       let attr = synIDattr(synID(a:lnum,f+1,1),"name")
-      if attr =~# s:skipPatterns
+      let attrT = synIDattr(synID(a:lnum,f+1,0),"name")
+      if attr =~# skip || attrT =~# skip
         let s = f+1
         continue
       endif
@@ -53,8 +57,8 @@ function GetJuliaNestingStruct(lnum, ...)
   let blocks_stack = []
   let num_closed_blocks = 0
   while 1
-    let fb = JuliaMatch(a:lnum, line, '[@.]\@<!\<\%(if\|else\%(if\)\?\|while\|for\|try\|catch\|finally\|\%(staged\)\?function\|macro\|begin\|mutable\s\+struct\|\%(mutable\s\+\)\@<!struct\|\%(abstract\|primitive\)\s\+type\|let\|\%(bare\)\?module\|quote\|do\)\>', s, e)
-    let fe = JuliaMatch(a:lnum, line, '[@.]\@<!\<end\>', s, e)
+    let fb = JuliaMatch(a:lnum, line, '\<\%(if\|else\%(if\)\?\|while\|for\|try\|catch\|finally\|\%(staged\)\?function\|macro\|begin\|mutable\s\+struct\|\%(mutable\s\+\)\@<!struct\|\%(abstract\|primitive\)\s\+type\|let\|\%(bare\)\?module\|quote\|do\)\>', s, e)
+    let fe = JuliaMatch(a:lnum, line, '\<end\>', s, e)
 
     if fb < 0 && fe < 0
       " No blocks found
@@ -66,13 +70,13 @@ function GetJuliaNestingStruct(lnum, ...)
       " Note: some keywords (elseif,else,catch,finally) are both
       "       closing blocks and opening new ones
 
-      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<if\>', s)
+      let i = JuliaMatch(a:lnum, line, '\<if\>', s)
       if i >= 0 && i == fb
         let s = i+1
         call add(blocks_stack, 'if')
         continue
       endif
-      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<elseif\>', s)
+      let i = JuliaMatch(a:lnum, line, '\<elseif\>', s)
       if i >= 0 && i == fb
         let s = i+1
         if len(blocks_stack) > 0 && blocks_stack[-1] == 'if'
@@ -83,7 +87,7 @@ function GetJuliaNestingStruct(lnum, ...)
         endif
         continue
       endif
-      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<else\>', s)
+      let i = JuliaMatch(a:lnum, line, '\<else\>', s)
       if i >= 0 && i == fb
         let s = i+1
         if len(blocks_stack) > 0 && blocks_stack[-1] =~# '\<\%(else\)\=if\>'
@@ -95,13 +99,13 @@ function GetJuliaNestingStruct(lnum, ...)
         continue
       endif
 
-      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<try\>', s)
+      let i = JuliaMatch(a:lnum, line, '\<try\>', s)
       if i >= 0 && i == fb
         let s = i+1
         call add(blocks_stack, 'try')
         continue
       endif
-      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<catch\>', s)
+      let i = JuliaMatch(a:lnum, line, '\<catch\>', s)
       if i >= 0 && i == fb
         let s = i+1
         if len(blocks_stack) > 0 && blocks_stack[-1] == 'try'
@@ -112,7 +116,7 @@ function GetJuliaNestingStruct(lnum, ...)
         endif
         continue
       endif
-      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<finally\>', s)
+      let i = JuliaMatch(a:lnum, line, '\<finally\>', s)
       if i >= 0 && i == fb
         let s = i+1
         if len(blocks_stack) > 0 && (blocks_stack[-1] == 'try' || blocks_stack[-1] == 'catch')
@@ -124,7 +128,7 @@ function GetJuliaNestingStruct(lnum, ...)
         continue
       endif
 
-      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<\%(bare\)\?module\>', s)
+      let i = JuliaMatch(a:lnum, line, '\<\%(bare\)\?module\>', s)
       if i >= 0 && i == fb
         let s = i+1
         if i == 0
@@ -135,7 +139,7 @@ function GetJuliaNestingStruct(lnum, ...)
         continue
       endif
 
-      let i = JuliaMatch(a:lnum, line, '[@.]\@<!\<\%(while\|for\|\%(staged\)\?function\|macro\|begin\|\%(mutable\s\+\)\?struct\|\%(abstract\|primitive\)\s\+type\|immutable\|let\|quote\|do\)\>', s)
+      let i = JuliaMatch(a:lnum, line, '\<\%(while\|for\|function\|macro\|begin\|\%(mutable\s\+\)\?struct\|\%(abstract\|primitive\)\s\+type\|let\|quote\|do\)\>', s)
       if i >= 0 && i == fb
         if match(line, '\C\<\%(mutable\|abstract\|primitive\)', i) != -1
           let s = i+11
@@ -278,7 +282,7 @@ endfunction
 
 function IsInDocString(lnum)
   let stack = map(synstack(a:lnum, 1), 'synIDattr(v:val, "name")')
-  call filter(stack, 'v:val =~# "\\<juliaDocString\\(Delim\\|M\\)\\?\\>"')
+  call filter(stack, 'v:val =~# "\\<juliaDocString\\(Delim\\|M\\\(Raw\\)\\?\\)\\?\\>"')
   return len(stack) > 0
 endfunction
 
@@ -449,7 +453,7 @@ function GetJuliaIndent()
       " reference point
       let cind = JuliaMatch(lnum, prevline, ':', indent(lnum), lim)
       if cind >= 0
-        let nonwhiteind = JuliaMatch(lnum, prevline, '\S', cind+1)
+        let nonwhiteind = JuliaMatch(lnum, prevline, '\S', cind+1, -1, 'basic')
         if nonwhiteind >= 0
           " return match(prevline, '\S', cind+1) " a bit overkill...
           return cind + 2
@@ -460,7 +464,7 @@ function GetJuliaIndent()
         let iind = JuliaMatch(lnum, prevline, '\<import\|using\|export\>', indent(lnum), lim)
         if iind >= 0
           " assuming whitespace after using... so no `using(XYZ)` please!
-          let nonwhiteind = JuliaMatch(lnum, prevline, '\S', iind+6)
+          let nonwhiteind = JuliaMatch(lnum, prevline, '\S', iind+6, -1, 'basic')
           if nonwhiteind >= 0
             return match(prevline, '\S', iind+6)
           endif
diff --git a/indent/make.vim b/indent/make.vim
index 2fef5846c..59e698abf 100644
--- a/indent/make.vim
+++ b/indent/make.vim
@@ -24,8 +24,8 @@ let s:comment_rx = '^\s*#'
 let s:rule_rx = '^[^ \t#:][^#:]*:\{1,2}\%([^=:]\|$\)'
 let s:continued_rule_rx = '^[^#:]*:\{1,2}\%([^=:]\|$\)'
 let s:continuation_rx = '\\$'
-let s:assignment_rx = '^\s*\h\w*\s*[+?]\==\s*\zs.*\\$'
-let s:folded_assignment_rx = '^\s*\h\w*\s*[+?]\=='
+let s:assignment_rx = '^\s*\h\w*\s*[+:?]\==\s*\zs.*\\$'
+let s:folded_assignment_rx = '^\s*\h\w*\s*[+:?]\=='
 " TODO: This needs to be a lot more restrictive in what it matches.
 let s:just_inserted_rule_rx = '^\s*[^#:]\+:\{1,2}$'
 let s:conditional_directive_rx = '^ *\%(ifn\=\%(eq\|def\)\|else\)\>'
diff --git a/indent/meson.vim b/indent/meson.vim
index 5480770f8..65d039e92 100644
--- a/indent/meson.vim
+++ b/indent/meson.vim
@@ -6,6 +6,7 @@ endif
 " Language:		Meson
 " License:		VIM License
 " Maintainer:		Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
+"	        	Liam Beguin <liambeguin@gmail.com>
 " Original Authors:	David Bustos <bustos@caltech.edu>
 "			Bram Moolenaar <Bram@vim.org>
 " Last Change:		2015 Feb 23
@@ -28,7 +29,7 @@ if exists("*GetMesonIndent")
   finish
 endif
 let s:keepcpo= &cpo
-setlocal cpo&vim
+set cpo&vim
 
 " Come here when loading the script the first time.
 
diff --git a/indent/rmd.vim b/indent/rmd.vim
index 77e3e51d5..9f3dff7dc 100644
--- a/indent/rmd.vim
+++ b/indent/rmd.vim
@@ -6,7 +6,7 @@ endif
 " Language:	Rmd
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage:     https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Sun Aug 19, 2018  09:14PM
+" Last Change:	Sun Mar 28, 2021  08:05PM
 
 
 " Only load this indent file when no other was loaded.
@@ -17,7 +17,7 @@ runtime indent/r.vim
 let s:RIndent = function(substitute(&indentexpr, "()", "", ""))
 let b:did_indent = 1
 
-setlocal indentkeys=0{,0},:,!^F,o,O,e
+setlocal indentkeys=0{,0},<:>,!^F,o,O,e
 setlocal indentexpr=GetRmdIndent()
 
 if exists("*GetRmdIndent")
@@ -27,6 +27,21 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
+" Simple Python indentation algorithm
+function s:GetPyIndent()
+  let plnum = prevnonblank(v:lnum - 1)
+  let pline = getline(plnum)
+  let cline = getline(v:lnum)
+  if pline =~ '^s```\s*{\s*python '
+    return 0
+  elseif pline =~ ':$'
+    return indent(plnum) + &shiftwidth
+  elseif cline =~ 'else:$'
+    return indent(plnum) - &shiftwidth
+  endif
+  return indent(plnum)
+endfunction
+
 function s:GetMdIndent()
   let pline = getline(v:lnum - 1)
   let cline = getline(v:lnum)
@@ -41,13 +56,14 @@ function s:GetMdIndent()
 endfunction
 
 function s:GetYamlIndent()
-  let pline = getline(v:lnum - 1)
+  let plnum = prevnonblank(v:lnum - 1)
+  let pline = getline(plnum)
   if pline =~ ':\s*$'
-    return indent(v:lnum) + shiftwidth()
+    return indent(plnum) + shiftwidth()
   elseif pline =~ '^\s*- '
     return indent(v:lnum) + 2
   endif
-  return indent(prevnonblank(v:lnum - 1))
+  return indent(plnum)
 endfunction
 
 function GetRmdIndent()
@@ -56,9 +72,11 @@ function GetRmdIndent()
   endif
   if search('^[ \t]*```{r', "bncW") > search('^[ \t]*```$', "bncW")
     return s:RIndent()
-  elseif v:lnum > 1 && search('^---$', "bnW") == 1 &&
-        \ (search('^---$', "nW") > v:lnum || search('^...$', "nW") > v:lnum)
+  elseif v:lnum > 1 && (search('^---$', "bnW") == 1 &&
+        \ (search('^---$', "nW") > v:lnum || search('^\.\.\.$', "nW") > v:lnum))
     return s:GetYamlIndent()
+  elseif search('^[ \t]*```{python', "bncW") > search('^[ \t]*```$', "bncW")
+    return s:GetPyIndent()
   else
     return s:GetMdIndent()
   endif
diff --git a/indent/rst.vim b/indent/rst.vim
index fb64e2bcb..f27c5ecb1 100644
--- a/indent/rst.vim
+++ b/indent/rst.vim
@@ -44,7 +44,7 @@ function GetRSTIndent()
   let psnum = s:get_paragraph_start()
   if psnum != 0
       if getline(psnum) =~ s:note_pattern
-          let ind = 3
+          let ind = max([3, ind])
       endif
   endif
 
diff --git a/syntax/ansible.vim b/syntax/ansible.vim
index 70f59021a..8a10ec59f 100644
--- a/syntax/ansible.vim
+++ b/syntax/ansible.vim
@@ -87,29 +87,44 @@ execute 'syn keyword ansible_debug_keywords debug containedin='.s:yamlKey.' cont
 highlight default link ansible_debug_keywords Debug
 
 if exists("g:ansible_extra_keywords_highlight")
-  execute 'syn keyword ansible_extra_special_keywords register always_run changed_when failed_when no_log args vars delegate_to ignore_errors containedin='.s:yamlKey.' contained'
-  highlight link ansible_extra_special_keywords Statement
+  execute 'syn keyword ansible_extra_special_keywords
+              \ become become_exe become_flags become_method become_user become_pass prompt_l10n
+              \ debugger always_run check_mode diff no_log args tags force_handlers
+              \ vars vars_files vars_prompt delegate_facts delegate_to
+              \ any_errors_fatal ignore_errors ignore_unreachable max_fail_percentage
+              \ connection hosts port remote_user module_defaults
+              \ environment fact_path gather_facts gather_subset gather_timeout
+              \ async poll throttle timeout order run_once serial strategy
+              \ containedin='.s:yamlKey.' contained'
+  if exists("g:ansible_extra_keywords_highlight_group")
+    execute 'highlight link ansible_extra_special_keywords '.g:ansible_extra_keywords_highlight_group
+  else
+    highlight link ansible_extra_special_keywords Structure
+  endif
 endif
 
-execute 'syn keyword ansible_normal_keywords include include_tasks import_tasks until retries delay when only_if become become_user block rescue always notify containedin='.s:yamlKey.' contained'
+execute 'syn keyword ansible_normal_keywords
+            \ include include_role include_tasks include_vars import_role import_playbook import_tasks
+            \ when changed_when failed_when block rescue always notify listen register
+            \ action local_action post_tasks pre_tasks tasks handlers roles collections
+            \ containedin='.s:yamlKey.' contained'
 if exists("g:ansible_normal_keywords_highlight")
   execute 'highlight link ansible_normal_keywords '.g:ansible_normal_keywords_highlight
 else
   highlight default link ansible_normal_keywords Statement
 endif
 
-execute 'syn match ansible_with_keywords "\vwith_.+" containedin='.s:yamlKey.' contained'
-if exists("g:ansible_with_keywords_highlight")
-  execute 'highlight link ansible_with_keywords '.g:ansible_with_keywords_highlight
-else
-  highlight default link ansible_with_keywords Statement
-endif
-
-execute 'syn keyword ansible_with_keywords loop containedin='.s:yamlKey.' contained'
-if exists("g:ansible_with_keywords_highlight")
-  execute 'highlight link ansible_with_keywords '.g:ansible_with_keywords_highlight
+execute 'syn keyword ansible_loop_keywords
+            \ loop loop_control until retries delay
+            \ containedin='.s:yamlKey.' contained'
+execute 'syn match ansible_loop_keywords "\vwith_.+" containedin='.s:yamlKey.' contained'
+if exists("g:ansible_loop_keywords_highlight")
+  execute 'highlight link ansible_loop_keywords '.g:ansible_loop_keywords_highlight
+" backward compatibility: ansible_with_keywords_highlight replaced by ansible_loop_keywords_highlight
+elseif exists("g:ansible_with_keywords_highlight")
+  execute 'highlight link ansible_loop_keywords '.g:ansible_with_keywords_highlight
 else
-  highlight default link ansible_with_keywords Statement
+  highlight default link ansible_loop_keywords Statement
 endif
 
 let b:current_syntax = "ansible"
diff --git a/syntax/basic/function.vim b/syntax/basic/function.vim
index 6e804e245..f8d9722d1 100644
--- a/syntax/basic/function.vim
+++ b/syntax/basic/function.vim
@@ -10,9 +10,7 @@ syntax keyword typescriptAsyncFuncKeyword      await
   \ nextgroup=@typescriptValue
   \ skipwhite
 
-syntax keyword typescriptFuncKeyword           function
-  \ nextgroup=typescriptAsyncFunc,typescriptFuncName,@typescriptCallSignature
-  \ skipwhite skipempty
+exec 'syntax keyword typescriptFuncKeyword '.(exists('g:typescript_conceal_function') ? 'conceal cchar='.g:typescript_conceal_function : '').' function nextgroup=typescriptAsyncFunc,typescriptFuncName,@typescriptCallSignature skipwhite skipempty'
 
 syntax match   typescriptAsyncFunc             contained /*/
   \ nextgroup=typescriptFuncName,@typescriptCallSignature
diff --git a/syntax/basic/keyword.vim b/syntax/basic/keyword.vim
index 6bd1668ad..611a3f917 100644
--- a/syntax/basic/keyword.vim
+++ b/syntax/basic/keyword.vim
@@ -16,19 +16,11 @@ syntax match typescriptExportType              /\<type\s*{\@=/
   \ contained skipwhite skipempty skipnl
 syntax keyword typescriptModule                namespace module
 
-"this
-
-"JavaScript Prototype
-syntax keyword typescriptPrototype             prototype
-  \ nextgroup=@afterIdentifier
 
 syntax keyword typescriptCastKeyword           as
   \ nextgroup=@typescriptType
   \ skipwhite
 
-"Program Keywords
-syntax keyword typescriptIdentifier            arguments this super
-  \ nextgroup=@afterIdentifier
 
 syntax keyword typescriptVariable              let var
   \ nextgroup=@typescriptVariableDeclarations
@@ -50,7 +42,6 @@ syntax keyword typescriptOperator              delete new typeof void
 
 syntax keyword typescriptForOperator           contained in of
 syntax keyword typescriptBoolean               true false nextgroup=@typescriptSymbols skipwhite skipempty
-syntax keyword typescriptNull                  null undefined nextgroup=@typescriptSymbols skipwhite skipempty
 syntax keyword typescriptMessage               alert confirm prompt status
   \ nextgroup=typescriptDotNotation,typescriptFuncCallArg
 syntax keyword typescriptGlobal                self top parent
@@ -68,7 +59,6 @@ syntax keyword typescriptCase                  case nextgroup=@typescriptPrimiti
 syntax keyword typescriptDefault               default containedin=typescriptBlock nextgroup=@typescriptValue,typescriptClassKeyword,typescriptInterfaceKeyword skipwhite oneline
 syntax keyword typescriptStatementKeyword      with
 syntax keyword typescriptStatementKeyword      yield skipwhite nextgroup=@typescriptValue containedin=typescriptBlock
-syntax keyword typescriptStatementKeyword      return skipwhite contained nextgroup=@typescriptValue containedin=typescriptBlock
 
 syntax keyword typescriptTry                   try
 syntax keyword typescriptExceptions            catch throw finally
@@ -98,3 +88,15 @@ syntax cluster typescriptAmbients contains=
   \ typescriptAbstract,
   \ typescriptEnumKeyword,typescriptEnum,
   \ typescriptModule
+
+syntax keyword typescriptIdentifier            arguments  nextgroup=@afterIdentifier
+
+"Program Keywords
+exec 'syntax keyword typescriptNull null '.(exists('g:typescript_conceal_null') ? 'conceal cchar='.g:typescript_conceal_null : '').' nextgroup=@typescriptSymbols skipwhite skipempty'
+exec 'syntax keyword typescriptNull undefined '.(exists('g:typescript_conceal_undefined') ? 'conceal cchar='.g:typescript_conceal_undefined : '').' nextgroup=@typescriptSymbols skipwhite skipempty'
+"this
+exec 'syntax keyword typescriptIdentifier this '.(exists('g:typescript_conceal_this') ? 'conceal cchar='.g:typescript_conceal_this : '').' nextgroup=@afterIdentifier'
+exec 'syntax keyword typescriptIdentifier super '.(exists('g:typescript_conceal_super') ? 'conceal cchar='.g:typescript_conceal_super : '').' nextgroup=@afterIdentifier'
+"JavaScript Prototype
+exec 'syntax keyword typescriptPrototype prototype '.(exists('g:typescript_conceal_prototype') ? 'conceal cchar='.g:typescript_conceal_prototype : '').' nextgroup=@afterIdentifier'
+exec 'syntax keyword typescriptStatementKeyword return '.(exists('g:typescript_conceal_return') ? 'conceal cchar='.g:typescript_conceal_return : '').' skipwhite contained nextgroup=@typescriptValue containedin=typescriptBlock'
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index 03d9a2750..244d08bea 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -72,7 +72,7 @@ delfunction s:syntax_keyword
 "   * Must not end in a : or /
 "   * Must not have two adjacent colons except at the beginning
 "   * Must not contain any reader metacharacters except for ' and #
-syntax match clojureKeyword "\v<:{1,2}%([^ \n\r\t()\[\]{}";@^`~\\%/]+/)*[^ \n\r\t()\[\]{}";@^`~\\%/]+:@1<!>"
+syntax match clojureKeyword "\v<:{1,2}([^ \n\r\t()\[\]{}";@^`~\\/]+/)*[^ \n\r\t()\[\]{}";@^`~\\/]+:@1<!>"
 
 syntax match clojureStringEscape "\v\\%([\\btnfr"]|u\x{4}|[0-3]\o{2}|\o{1,2})" contained
 
diff --git a/syntax/conf.vim b/syntax/conf.vim
index 0479cc532..92a9002b7 100644
--- a/syntax/conf.vim
+++ b/syntax/conf.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:	generic configure file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Jun 20
+" Last Change:	2021 May 01
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -14,8 +14,8 @@ endif
 
 syn keyword	confTodo	contained TODO FIXME XXX
 " Avoid matching "text#text", used in /etc/disktab and /etc/gettytab
-syn match	confComment	"^#.*" contains=confTodo
-syn match	confComment	"\s#.*"ms=s+1 contains=confTodo
+syn match	confComment	"^#.*" contains=confTodo,@Spell
+syn match	confComment	"\s#.*"ms=s+1 contains=confTodo,@Spell
 syn region	confString	start=+"+ skip=+\\\\\|\\"+ end=+"+ oneline
 syn region	confString	start=+'+ skip=+\\\\\|\\'+ end=+'+ oneline
 
diff --git a/syntax/cpp.vim b/syntax/cpp.vim
index a31f34164..95a56d360 100644
--- a/syntax/cpp.vim
+++ b/syntax/cpp.vim
@@ -6,7 +6,7 @@ endif
 " Language:	C++
 " Current Maintainer:	vim-jp (https://github.com/vim-jp/vim-cpp)
 " Previous Maintainer:	Ken Shan <ccshan@post.harvard.edu>
-" Last Change:	2021 Jan 12
+" Last Change:	2021 May 04
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -48,22 +48,40 @@ if !exists("cpp_no_cpp11")
   syn keyword cppConstant	ATOMIC_WCHAR_T_LOCK_FREE ATOMIC_SHORT_LOCK_FREE
   syn keyword cppConstant	ATOMIC_INT_LOCK_FREE ATOMIC_LONG_LOCK_FREE
   syn keyword cppConstant	ATOMIC_LLONG_LOCK_FREE ATOMIC_POINTER_LOCK_FREE
-  syn region cppRawString	matchgroup=cppRawStringDelimiter start=+\%(u8\|[uLU]\)\=R"\z([[:alnum:]_{}[\]#<>%:;.?*\+\-/\^&|~!=,"']\{,16}\)(+ end=+)\z1"+ contains=@Spell
+  syn region cppRawString	matchgroup=cppRawStringDelimiter start=+\%(u8\|[uLU]\)\=R"\z([[:alnum:]_{}[\]#<>%:;.?*\+\-/\^&|~!=,"']\{,16}\)(+ end=+)\z1"\(sv\|s\|_[_a-zA-Z][_a-zA-Z0-9]*\)\=+ contains=@Spell
   syn match cppCast		"\<\(const\|static\|dynamic\)_pointer_cast\s*<"me=e-1
   syn match cppCast		"\<\(const\|static\|dynamic\)_pointer_cast\s*$"
 endif
 
 " C++ 14 extensions
 if !exists("cpp_no_cpp14")
-  syn case ignore
-  syn match cppNumber		display "\<0b[01]\('\=[01]\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
-  syn match cppNumber		display "\<[1-9]\('\=\d\+\)*\(u\=l\{0,2}\|ll\=u\)\>" contains=cFloat
-  syn match cppNumber		display "\<0x\x\('\=\x\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
-  syn case match
+  syn match cppNumbers		display transparent "\<\d\|\.\d" contains=cppNumber,cppFloat
+  syn match cppNumber		display contained "\<0\([Uu]\=\([Ll]\|LL\|ll\)\|\([Ll]\|LL\|ll\)\=[Uu]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
+  syn match cppNumber		display contained "\<[1-9]\('\=\d\+\)*\([Uu]\=\([Ll]\|LL\|ll\)\|\([Ll]\|LL\|ll\)\=[Uu]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
+  syn match cppNumber		display contained "\<0\o\+\([Uu]\=\([Ll]\|LL\|ll\)\|\([Ll]\|LL\|ll\)\=[Uu]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
+  syn match cppNumber		display contained "\<0b[01]\('\=[01]\+\)*\([Uu]\=\([Ll]\|LL\|ll\)\|\([Ll]\|LL\|ll\)\=[Uu]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
+  syn match cppNumber		display contained "\<0x\x\('\=\x\+\)*\([Uu]\=\([Ll]\|LL\|ll\)\|\([Ll]\|LL\|ll\)\=[Uu]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
+  syn match cppFloat		display contained "\<\d\+\.\d*\(e[-+]\=\d\+\)\=\([FfLl]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
+  syn match cppFloat		display contained "\<\.\d\+\(e[-+]\=\d\+\)\=\([FfLl]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
+  syn match cppFloat		display contained "\<\d\+e[-+]\=\d\+\([FfLl]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
+  syn region cppString		start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"\(sv\|s\|_\i*\)\=+ end='$' contains=cSpecial,cFormat,@Spell
+endif
+
+" C++ 17 extensions
+if !exists("cpp_no_cpp17")
+  syn match cppCast		"\<reinterpret_pointer_cast\s*<"me=e-1
+  syn match cppCast		"\<reinterpret_pointer_cast\s*$"
+  syn match cppFloat		display contained "\<0x\x*\.\x\+p[-+]\=\d\+\([FfLl]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
+  syn match cppFloat		display contained "\<0x\x\+\.\=p[-+]\=\d\+\([FfLl]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
 endif
 
 " C++ 20 extensions
 if !exists("cpp_no_cpp20")
+  syn match cppNumber		display contained "\<0\(y\|d\)\>"
+  syn match cppNumber		display contained "\<[1-9]\('\=\d\+\)*\(y\|d\)\>"
+  syn match cppNumber		display contained "\<0\o\+\(y\|d\)\>"
+  syn match cppNumber		display contained "\<0b[01]\('\=[01]\+\)*\(y\|d\)\>"
+  syn match cppNumber		display contained "\<0x\x\('\=\x\+\)*\(y\|d\)\>"
   syn keyword cppStatement	co_await co_return co_yield requires
   syn keyword cppStorageClass	consteval constinit
   syn keyword cppStructure	concept
@@ -71,12 +89,6 @@ if !exists("cpp_no_cpp20")
   syn keyword cppModule		import module export
 endif
 
-" C++ 17 extensions
-if !exists("cpp_no_cpp17")
-  syn match cppCast		"\<reinterpret_pointer_cast\s*<"me=e-1
-  syn match cppCast		"\<reinterpret_pointer_cast\s*$"
-endif
-
 " The minimum and maximum operators in GNU C++
 syn match cppMinMax "[<>]?"
 
@@ -94,7 +106,9 @@ hi def link cppBoolean		Boolean
 hi def link cppConstant		Constant
 hi def link cppRawStringDelimiter	Delimiter
 hi def link cppRawString		String
+hi def link cppString		String
 hi def link cppNumber		Number
+hi def link cppFloat		Number
 hi def link cppModule		Include
 
 let b:current_syntax = "cpp"
diff --git a/syntax/csv.vim b/syntax/csv.vim
index 5cc16dfa3..ed045c7f9 100644
--- a/syntax/csv.vim
+++ b/syntax/csv.vim
@@ -24,7 +24,7 @@ fu! <sid>Warning(msg) "{{{3
     echohl Normal
 endfu
 
-fu! <sid>Esc(val, char) "{{{3 
+fu! <sid>Esc(val, char) "{{{3
     if empty(a:val)
         return a:val
     endif
@@ -36,7 +36,7 @@ fu! <sid>CheckSaneSearchPattern() "{{{3
     let s:col_def = '\%([^' . s:del_def . ']*' . s:del_def . '\|$\)'
     let s:col_def_end = '\%([^' . s:del_def . ']*' . s:del_def . '\)'
 
-    " First: 
+    " First:
     " Check for filetype plugin. This syntax script relies on the filetype
     " plugin, else, it won't work properly.
     redir => s:a |sil filetype | redir end
@@ -68,10 +68,10 @@ fu! <sid>CheckSaneSearchPattern() "{{{3
     let s:col  = get(b:, 'col', s:col_def)
     let s:col_end  = get(b:, 'col_end', s:col_def_end)
     let s:del  = get(b:, 'delimiter', s:del_def)
-    let s:cmts = b:csv_cmt[0]
-    let s:cmte = len(b:csv_cmt) == 2 ? b:csv_cmt[1] : ''
+    let s:cmts = get(get(b:, 'csv_cmt', ['']), 0)
+    let s:cmte = len(get(b:, 'csv_cmt', [])) == 2 ? b:csv_cmt[1] : ''
     " Make the file start at the first actual CSV record (issue #71)
-    if !exists("b:csv_headerline")
+    if !exists("b:csv_headerline") && !empty(s:cmts)
         let cmts    = <sid>Esc(s:cmts, '')
         let pattern = '\%^\(\%('.cmts.'.*\n\)\|\%(\s*\n\)\)\+'
         let start = search(pattern, 'nWe', 10)
@@ -87,6 +87,7 @@ fu! <sid>CheckSaneSearchPattern() "{{{3
     if line('$') > 1 && (!exists("b:col") || empty(b:col))
         " check for invalid pattern, ftplugin hasn't been loaded yet
         call <sid>Warning("Invalid column pattern, using default pattern " . s:col_def)
+        call <sid>Warning("Or ftplugin hasn't been sourced before the syntax script")
     endif
 endfu
 
@@ -94,7 +95,7 @@ endfu
 fu! <sid>DoHighlight() "{{{3
     if has("conceal") && !exists("g:csv_no_conceal") &&
         \ !exists("b:csv_fixed_width_cols")
-        exe "syn match CSVDelimiter /" . s:col_end . 
+        exe "syn match CSVDelimiter /" . s:col_end .
             \ '/ms=e,me=e contained conceal cchar=' .
             \ (&enc == "utf-8" ? "│" : '|')
         hi def link CSVDelimiter Conceal
@@ -121,7 +122,7 @@ fu! <sid>DoHighlight() "{{{3
     else
         for i in range(len(b:csv_fixed_width_cols))
             let pat = '/\%' . b:csv_fixed_width_cols[i] . 'v.*' .
-                \ ((i == len(b:csv_fixed_width_cols)-1) ? '/' : 
+                \ ((i == len(b:csv_fixed_width_cols)-1) ? '/' :
                 \ '\%' . b:csv_fixed_width_cols[i+1] . 'v/')
 
             let group  = "CSVColumn" . (i%2 ? "Odd"  : "Even" )
@@ -157,7 +158,7 @@ fu! <sid>DoSyntaxDefinitions() "{{{3
     endif
 endfun
 
-" Main: {{{2 
+" Main: {{{2
 " Make sure, we are using a sane, valid pattern for syntax
 " highlighting
 call <sid>CheckSaneSearchPattern()
diff --git a/syntax/dts.vim b/syntax/dts.vim
index 26b1456f9..5ed38aa22 100644
--- a/syntax/dts.vim
+++ b/syntax/dts.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:	dts/dtsi (device tree files)
 " Maintainer:	Daniel Mack <vim@zonque.org>
-" Last Change:	2013 Oct 20
+" Last Change:	2021 May 15
 
 if exists("b:current_syntax")
   finish
@@ -13,7 +13,7 @@ endif
 
 syntax region dtsComment        start="/\*"  end="\*/"
 syntax match  dtsReference      "&[[:alpha:][:digit:]_]\+"
-syntax region dtsBinaryProperty start="\[" end="\]" 
+syntax region dtsBinaryProperty start="\[" end="\]"
 syntax match  dtsStringProperty "\".*\""
 syntax match  dtsKeyword        "/.\{-1,\}/"
 syntax match  dtsLabel          "^[[:space:]]*[[:alpha:][:digit:]_]\+:"
@@ -22,6 +22,38 @@ syntax region dtsCellProperty   start="<" end=">" contains=dtsReference,dtsBinar
 syntax region dtsCommentInner   start="/\*"  end="\*/"
 syntax match  dtsCommentLine    "//.*$"
 
+" Accept %: for # (C99)
+syn region	cPreCondit	start="^\s*\zs\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" keepend contains=cComment,cCommentL,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError
+syn match	cPreConditMatch	display "^\s*\zs\(%:\|#\)\s*\(else\|endif\)\>"
+if !exists("c_no_if0")
+  syn cluster	cCppOutInGroup	contains=cCppInIf,cCppInElse,cCppInElse2,cCppOutIf,cCppOutIf2,cCppOutElse,cCppInSkip,cCppOutSkip
+  syn region	cCppOutWrapper	start="^\s*\zs\(%:\|#\)\s*if\s\+0\+\s*\($\|//\|/\*\|&\)" end=".\@=\|$" contains=cCppOutIf,cCppOutElse,@NoSpell fold
+  syn region	cCppOutIf	contained start="0\+" matchgroup=cCppOutWrapper end="^\s*\(%:\|#\)\s*endif\>" contains=cCppOutIf2,cCppOutElse
+  if !exists("c_no_if0_fold")
+    syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell fold
+  else
+    syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell
+  endif
+  syn region	cCppOutElse	contained matchgroup=cCppOutWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=TOP,cPreCondit
+  syn region	cCppInWrapper	start="^\s*\zs\(%:\|#\)\s*if\s\+0*[1-9]\d*\s*\($\|//\|/\*\||\)" end=".\@=\|$" contains=cCppInIf,cCppInElse fold
+  syn region	cCppInIf	contained matchgroup=cCppInWrapper start="\d\+" end="^\s*\(%:\|#\)\s*endif\>" contains=TOP,cPreCondit
+  if !exists("c_no_if0_fold")
+    syn region	cCppInElse	contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2 fold
+  else
+    syn region	cCppInElse	contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2
+  endif
+  syn region	cCppInElse2	contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)\([^/]\|/[^/*]\)*" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell
+  syn region	cCppOutSkip	contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppOutSkip
+  syn region	cCppInSkip	contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(if\s\+\(\d\+\s*\($\|//\|/\*\||\|&\)\)\@!\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" containedin=cCppOutElse,cCppInIf,cCppInSkip contains=TOP,cPreProc
+endif
+syn region	cIncluded	display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match	cIncluded	display contained "<[^>]*>"
+syn match	cInclude	display "^\s*\zs\(%:\|#\)\s*include\>\s*["<]" contains=cIncluded
+"syn match cLineSkip	"\\$"
+syn cluster	cPreProcGroup	contains=cPreCondit,cIncluded,cInclude,cDefine,cErrInParen,cErrInBracket,cUserLabel,cSpecial,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cString,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cParen,cBracket,cMulti,cBadBlock
+syn region	cDefine		start="^\s*\zs\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
+syn region	cPreProc	start="^\s*\zs\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
+
 hi def link dtsCellProperty     Number
 hi def link dtsBinaryProperty   Number
 hi def link dtsStringProperty   String
@@ -30,5 +62,21 @@ hi def link dtsLabel            Label
 hi def link dtsNode             Structure
 hi def link dtsReference        Macro
 hi def link dtsComment          Comment
-hi def link dtsCommentInner     Comment 
+hi def link dtsCommentInner     Comment
 hi def link dtsCommentLine      Comment
+
+hi def link cInclude		Include
+hi def link cPreProc		PreProc
+hi def link cDefine		Macro
+hi def link cIncluded		cString
+hi def link cString		String
+
+hi def link cCppInWrapper	cCppOutWrapper
+hi def link cCppOutWrapper	cPreCondit
+hi def link cPreConditMatch	cPreCondit
+hi def link cPreCondit		PreCondit
+hi def link cCppOutSkip		cCppOutIf2
+
+hi def link cCppInElse2		cCppOutIf2
+hi def link cCppOutIf2		cCppOut
+hi def link cCppOut		Comment
diff --git a/syntax/git.vim b/syntax/git.vim
index d3d9485e1..5688874a5 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -33,8 +33,7 @@ syn match gitDiffAdded "{+[^}]*+}" contained containedin=gitDiff
 syn match gitDiffRemoved "^ \+-.*" contained containedin=gitDiffMerge
 syn match gitDiffRemoved "\[-[^]]*-\]" contained containedin=gitDiff
 
-syn match  gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\|summary\|boundary\|filename\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite contains=@NoSpell
-syn match  gitKeyword /^previous\>/ contained containedin=gitHead nextgroup=gitHash skipwhite contains=@NoSpell
+syn match  gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\|summary\|boundary\|filename\|previous\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite contains=@NoSpell
 syn match  gitKeyword /^\%(tag\>\|ref:\)/ contained containedin=gitHead nextgroup=gitReference skipwhite contains=@NoSpell
 syn match  gitKeyword /^Merge:/  contained containedin=gitHead nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
 syn match  gitMode    /^\d\{6\}\>/ contained containedin=gitHead nextgroup=gitType,gitHash skipwhite
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index 1469bcbc2..8e8476502 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -26,7 +26,10 @@ syn match   gitcommitSummary	"^.*\%<51v." contained containedin=gitcommitFirstLi
 syn match   gitcommitOverflow	".*" contained contains=@Spell
 syn match   gitcommitBlank	"^[^#].*" contained contains=@Spell
 
-if get(g:, "gitcommit_cleanup") is# "scissors"
+syn match   gitcommitTrailers	"\n\@<=\n\%([[:alnum:]-]\+\s*:.*\|(cherry picked from commit .*\)\%(\n\s.*\|\n[[:alnum:]-]\+\s*:.*\|\n(cherry picked from commit .*\)*\%(\n\n*#\|\n*\%$\)\@="
+syn match   gitcommitTrailerToken "^[[:alnum:]-]\+\s*:" contained containedin=gitcommitTrailers
+
+if get(b:, "gitcommit_cleanup", get(g:, "gitcommit_cleanup", "")) is# "scissors"
   syn match gitcommitFirstLine	"\%^.*" nextgroup=gitcommitBlank skipnl
   syn region gitcommitComment start=/^# -\+ >8 -\+$/ end=/\%$/ contains=gitcommitDiff
 else
@@ -67,6 +70,7 @@ syn match   gitcommitWarning		"^[^#].*: needs merge$" nextgroup=gitcommitWarning
 syn match   gitcommitWarning		"^\%(no changes added to commit\|nothing \%(added \)\=to commit\)\>.*\%$"
 
 hi def link gitcommitSummary		Keyword
+hi def link gitcommitTrailerToken	Label
 hi def link gitcommitComment		Comment
 hi def link gitcommitUntracked		gitcommitComment
 hi def link gitcommitDiscarded		gitcommitComment
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index 64a97acb8..762c2f447 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/gitrebase.vim
@@ -30,6 +30,8 @@ syn match   gitrebaseLabel  "\v^l(abel)=>"   nextgroup=gitrebaseName skipwhite
 syn match   gitrebaseReset  "\v^(t|reset)=>" nextgroup=gitrebaseName skipwhite
 syn match   gitrebaseSummary ".*"               contains=gitrebaseHash contained
 syn match   gitrebaseCommand ".*"                                      contained
+syn match   gitrebaseEmpty   " \zs# empty$"        containedin=gitrebaseSummary contained
+syn match   gitrebaseComment "# "                  containedin=gitrebaseEmpty   contained
 syn match   gitrebaseComment "^\s*#.*"             contains=gitrebaseHash
 syn match   gitrebaseSquashError "\v%^%(s%(quash)=>|f%(ixup)=>)" nextgroup=gitrebaseCommit skipwhite
 syn match   gitrebaseMergeOption "\v-[Cc]>"  nextgroup=gitrebaseMergeCommit skipwhite contained
@@ -52,6 +54,7 @@ hi def link gitrebaseMerge          Exception
 hi def link gitrebaseLabel          Label
 hi def link gitrebaseReset          Keyword
 hi def link gitrebaseSummary        String
+hi def link gitrebaseEmpty          Error
 hi def link gitrebaseComment        Comment
 hi def link gitrebaseSquashError    Error
 hi def link gitrebaseMergeCommit    gitrebaseCommit
diff --git a/syntax/go.vim b/syntax/go.vim
index 4630f0ebc..ecb941273 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -169,11 +169,11 @@ syn match       goSingleDecl        /\%(import\|var\|const\) [^(]\@=/ contains=g
 syn match       goDecimalInt        "\<-\=\(0\|[1-9]_\?\(\d\|\d\+_\?\d\+\)*\)\%([Ee][-+]\=\d\+\)\=\>"
 syn match       goDecimalError      "\<-\=\(_\(\d\+_*\)\+\|\([1-9]\d*_*\)\+__\(\d\+_*\)\+\|\([1-9]\d*_*\)\+_\+\)\%([Ee][-+]\=\d\+\)\=\>"
 syn match       goHexadecimalInt    "\<-\=0[xX]_\?\(\x\+_\?\)\+\>"
-syn match       goHexadecimalError  "\<-\=0[xX]_\?\(\x\+_\?\)*\(\([^ \t0-9A-Fa-f_]\|__\)\S*\|_\)\>"
+syn match       goHexadecimalError  "\<-\=0[xX]_\?\(\x\+_\?\)*\(\([^ \t0-9A-Fa-f_)]\|__\)\S*\|_\)\>"
 syn match       goOctalInt          "\<-\=0[oO]\?_\?\(\o\+_\?\)\+\>"
 syn match       goOctalError        "\<-\=0[0-7oO_]*\(\([^ \t0-7oOxX_/)\]\}\:]\|[oO]\{2,\}\|__\)\S*\|_\|[oOxX]\)\>"
 syn match       goBinaryInt         "\<-\=0[bB]_\?\([01]\+_\?\)\+\>"
-syn match       goBinaryError       "\<-\=0[bB]_\?[01_]*\([^ \t01_]\S*\|__\S*\|_\)\>"
+syn match       goBinaryError       "\<-\=0[bB]_\?[01_]*\([^ \t01_)]\S*\|__\S*\|_\)\>"
 
 hi def link     goDecimalInt        Integer
 hi def link     goDecimalError      Error
diff --git a/syntax/help.vim b/syntax/help.vim
index 1bb74a15a..9f7fc1011 100644
--- a/syntax/help.vim
+++ b/syntax/help.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:	Vim help file
 " Maintainer:	Bram Moolenaar (Bram@vim.org)
-" Last Change:	2019 May 12
+" Last Change:	2020 Jul 28
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -15,7 +15,7 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-syn match helpHeadline		"^[-A-Z .][-A-Z0-9 .()_]*[ \t]\+\*"me=e-1
+syn match helpHeadline		"^[-A-Z .][-A-Z0-9 .()_]*\ze\(\s\+\*\|$\)"
 syn match helpSectionDelim	"^===.*===$"
 syn match helpSectionDelim	"^---.*--$"
 if has("conceal")
@@ -89,6 +89,7 @@ syn match helpSpecial		"\[group]"
 syn match helpNormal		"\[\(readonly\|fifo\|socket\|converted\|crypted\)]"
 
 syn match helpSpecial		"CTRL-."
+syn match helpSpecial		"CTRL-SHIFT-."
 syn match helpSpecial		"CTRL-Break"
 syn match helpSpecial		"CTRL-PageUp"
 syn match helpSpecial		"CTRL-PageDown"
diff --git a/syntax/hollywood.vim b/syntax/hollywood.vim
index e801d11ac..fb5fd9560 100644
--- a/syntax/hollywood.vim
+++ b/syntax/hollywood.vim
@@ -3,10 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'hollywood', 'syntax/hollywood
 endif
 
 " Vim syntax file
-" Language:     Hollywood 8.0	
+" Language:     Hollywood 9.0	
 " Maintainer:	Tom Crecelius <holly@net-eclipse.net>
 " First Author:	Tom Crecelius <holly@net-eclipse.net>
-" Last Change:	2018 May 18
+" Last Change:	2021 April 13
 " Highlighting Issues: 
 " Depending on your colour schema, Strings or Comments might be highlighted in
 " a way, you don't like. If so, try one of the following settings after
@@ -34,7 +34,7 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 if !exists("hw_version")
-  let hw_version = 8
+  let hw_version = 9
   let hw_subversion = 0
 elseif !exists("hw_subversion")
   let hw_subversion = 0
@@ -113,12 +113,11 @@ syn match hwOperator "\%(&\|\*\|+\|-\|\.\||\|//\|/\|:\|<\|=\|>\|<>\|<=\|=>\|\^\|
 syn keyword hwConstant Nil
 syn keyword hwConstant True False
 " predefined preprocessing commands
-syn match hwPreProcessor "@\<\%(BGPIC\|BRUSH\|ANIM\|SPRITE\|SAMPLE\|MUSIC\|FILE\|FONT\|VIDEO\|VERSION\|APPTITLE\|APPAUTHOR\|APPCOPYRIGHT\|APPDESCRIPTION\|APPVERSION\|APPICON\|BACKFILL\|SCREEN\|DISPLAY\|INCLUDE\|OPTIONS\|REQUIRE\|MENU\|APPIDENTIFIER\|WARNING\|ERROR\|IF\|ELSEIF\|ELSE\|ENDIF\)\>"ms=s+1
+syn match hwPreProcessor "@\<\%(ANIM\|APPAUTHOR\|APPCOPYRIGHT\|APPDESCRIPTION\|APPICON\|APPIDENTIFIER\|APPTITLE\|APPVERSION\|BACKFILL\|BGPIC\|BRUSH\|CATALOG\|DIRECTORY\|DISPLAY\|ELSE\|ELSEIF\|ENDIF\|ERROR\|FILE\|FONT\|ICON\|IF\|INCLUDE\|LINKER\|MENU\|MUSIC\|OPTIONS\|PALETTE\|REQUIRE\|SAMPLE\|SCREEN\|SPRITE\|VERSION\|VIDEO\|WARNING\)\>"ms=s+1
 " predefined constants
-syn match hwConstant "#\<\%(ERR_PORTNOTAVAIL\|SEEK_END\|ERR_CREATESHORTCUT\|PURPLE\|ERR_ALLOCCHANNEL\|PRGTYPE_SCRIPT\|ERR_NORETVAL\|ERR_DDRECVIDEO\|ERR_FINDPATH\|LANGUAGE_RUNDI\|ERR_STRINGCST\|COUNTRY_COLOMBIA\|LANGUAGE_KOREAN\|ERR_USERABORT\|ERR_WENDWOWHILE\|FONT\|FILEATTR_WRITE_OTH\|ERR_MODIFYABGPIC\|COUNTRY_DRCONGO\|LANGUAGE_KIRGHIZ\|LANGUAGE_ROMANSH\|FILEATTR_EXECUTE_GRP\|ERR_READVIDEOPIXELS\|SCROLLTOP\|ERR_ANIMDISK\|COUNTRY_IVORYCOAST\|LANGUAGE_GUJARATI\|SHORT\|COUNTRY_SOUTHAFRICA\|VIDEO\|ERR_BLKWOENDBLK\|ERR_WRONGHEX\|SPRITE_VS_BRUSH\|LANGUAGE_HIRIMOTU\|ZOOMSOUTHEAST\|COUNTRY_SLOVAKIA\|COUNTRY_GIBRALTAR\|ERR_INVALIDDATE\|RTS_ON\|PIXELZOOM1\|ATTRFRAMEDELAY\|AQUA\|ATTRFONTSCALABLE\|FILEATTR_NORMAL\|COUNTRY_ALBANIA\|COUNTRY_JAMAICA\|FONTWEIGHT_MEDIUM\|ERR_MALFORMPAT1\|COUNTRY_FRENCHGUIANA\|ERR_MAXPARAMS\|ERR_FORWONEXT\|COUNTRY_CONGO\|COUNTRY_GAMBIA\|UPNDOWN\|COUNTRY_ANDORRA\|BRUSH\|ERR_SELECTALPHACHANNEL\|MODLCOMMAND\|CLIENT\|COUNTRY_TRINIDADANDTOBAGO\|DIRECTORY\|LANGUAGE_ESPERANTO\|ATTRRAWHEIGHT\|COUNTRY_DENMARK\|FILETYPE_SOUND\|CLIPBOARD_TEXT\|LANGUAGE_FULAH\|ATTRPOSITION\|PLUGINCAPS_CONVERT\|ERR_APPLETVERSION\|COUNTRY_VANUATU\|COUNTDIRECTORIES\|ATTRNOHIDE\|VSTRIPES64\|AMIGAICON_SETPOSITION\|PUSHBOTTOM\|ERR_BACKFILL\|COUNTRY_MOROCCO\|ERR_FILEFORMAT\|COUNTRY_CHILE\|ATTRHOSTSCALEY\|ERR_AHI\|HW_VERSION\|ERR_ALRDYDECLRD\|ATTRRAWWIDTH\|ERR_PIXELFORMAT\|IMGFMT_PLUGIN\|LANGUAGE_HEBREW\|ERR_SETMENU\|ERR_NOLAYERS\|CRUSHTOP\|ERR_MAXLINES\|ATTRHASMASK\|LEFT\|ERR_SELECTANIM\|WALLPAPERLEFT\|TEXTOBJECT\|ERR_AFILEPROP\|LANGUAGE_CZECH\|LANGUAGE_XHOSA\|ERR_PIPE\|LANGUAGE_MANX\|ERR_EXECUTE\|ERR_ENDDOUBLEBUFFER\|ATTRGROUP\|ERR_NAMETOOLONG\|ATTRBORDERRIGHT\|COUNTRY_BOSNIAANDHERZEGOVINA\|ATTRMARGINRIGHT\|RTS_OFF\|LANGUAGE_MARSHALLESE\|LANGUAGE_AZERBAIJANI\|LANGUAGE_TAHITIAN\|JOINMITER\|ATTRNOCLOSE\|REQICON_WARNING\|ERR_NOTPROTRACKER\|LANGUAGE_LAO\|ERR_EMPTYPATH\|ERR_NOCALLBACK\|COUNTRY_UGANDA\|ERR_READFUNC\|IMGFMT_UNKNOWN\|ADF_ANIM\|ERR_LAYERSWITCH\|ERR_RECVCLOSED\|ERR_CTRLSTRUCT\|ERR_TABLEOVERFLOW\|SCROLLBOTTOM\|VSTRIPES\|ERR_VAREXPECTED\|ERR_NOTIGER\|BEEPSYSTEM\|ERR_LOWFREQ\|COUNTFILES\|COUNTRY_MONACO\|BLUE\|ERR_VFONT\|STRUDEL\|REQ_GALLERY\|ERR_NOCOORDCST\|MENU\|HSTRIPES64\|COUNTRY_COCOSISLANDS\|LANGUAGE_SOUTHNDEBELE\|COUNTRY_FALKLANDISLANDS\|COUNTRY_UAE\|LANGUAGE_KANNADA\|ERR_VIDRECMULTI\|FILETYPE_VIDEO\|LANGUAGE_ESTONIAN\|COUNTRY_CAYMANISLANDS\|ERR_BADINTEGER\|MONO16\|COUNTRY_CAMEROON\|COUNTRY_GUAM\|ERR_DISPLAYDESKTOP\|ERR_SETENV\|ERR_INTERNAL\|MASKVISIBLE\|ERR_OPENFONT\|LANGUAGE_WELSH\|ATTRRAWXPOS\|LANGUAGE_THAI\|ATTRHOSTMONITORS\|LANGUAGE_GALICIAN\|COUNTRY_GUATEMALA\|ATTRYPOS\|COUNTRY_UZBEKISTAN\|ERR_ELSEIFAFTERELSE\|MODRCONTROL\|BAUD_4800\|JOYDOWNRIGHT\|COUNTRY_LUXEMBOURG\|COUNTRY_MOZAMBIQUE\|ERR_PAKFORMAT\|LANGUAGE_TAJIK\|LANGUAGE_PANJABI\|ERR_MISSINGFIELD\|PLUGINCAPS_LIBRARY\|ERR_FUNCARGS\|LANGUAGE_MALAY\|COUNTRY_PORTUGAL\|COUNTRY_JAPAN\|ERR_ICONPARMS\|COUNTRY_NEWCALEDONIA\|REMOVELAYER\|MOVEWINDOW\|ATTRFONTASCENDER\|PLUGINCAPS_DIRADAPTER\|ERR_VARLENGTH\|ATTRSIZEABLE\|ERR_SENDUNKNOWN\|MENUITEM_RADIO\|COUNTRY_BELIZE\|ERR_LABELDOUBLE\|QUADRECT\|VBLINDS8\|ERR_UNKNOWNCMD\|SCROLLEAST\|ONBUTTONCLICKALL\|RECTNORTHEAST\|FONTWEIGHT_EXTRABOLD\|COUNTRY_SAINTKITTSANDNEVIS\|ERR_CLOSEDDISPLAY\|PLUGINCAPS_SAVEANIM\|ERR_WINDOW\|LANGUAGE_ZHUANG\|CAPROUND\|ERR_OUTOFRANGE\|REQ_CAMERA\|ERR_WARPOS\|COUNTRY_ELSALVADOR\|ERR_GROUPNAMEUSED\|COUNTRY_GUYANA\|ERR_ALREADYASYNC\|COUNTRY_PALESTINE\|DISPMODE_FAKEFULLSCREEN\|ERR_SYNTAXLEVELS\|ERR_BADPLATFORM\|ERR_VERSION\|ATTRVISIBLE\|HSTRETCHCENTER\|COUNTRY_REUNION\|COUNTRY_INDIA\|STRETCHLEFT\|ERR_ZERODIVISION\|LANGUAGE_NORTHERNSAMI\|SIMPLEBUTTON\|ERR_FINDMENU\|ERR_EMPTYOBJ\|LANGUAGE_BIHARI\|LANGUAGE_LIMBURGAN\|LANGUAGE_BOSNIAN\|ERR_SYSTOOOLD\|ERR_WRITEJPEG\|STOP_1\|COPYFILE_OVERWRITE\|ERR_REVDWORD\|PLUGINCAPS_ANIM\|ERR_ASSERTFAILED\|ERR_BRACEOPEN\|ERR_NEEDMORPHOS2\|BLACK\|LANGUAGE_SWEDISH\|ERR_DBLENCODING\|COPYFILE_STATUS\|ERR_WRONGOPCST\|ERR_BADIP\|ERR_UNKNOWNSEQ\|LANGUAGE_LUXEMBOURGISH\|ERR_WITHWOENDWITH\|ERR_LABINIF\|LANGUAGE_TATAR\|ERR_VIDEOLAYERDRV\|ERR_LEGACYPTMOD\|ERR_SAVEPNG\|NOTRANSPARENCY\|ATTRMASKMODE\|LANGUAGE_VENDA\|ERR_NEWHWPLUGIN\|LANGUAGE_LATIN\|LANGUAGE_EWE\|MENUITEM_TOGGLE\|ERR_BRACKETOPEN\|JOYUP\|COUNTRY_SENEGAL\|LANGUAGE_CHURCHSLAVIC\|ERR_ZLIBIO\|RECTBACKNORTHWEST\|MOVELIST\|ERR_TEXTARG\|ONBUTTONOVER\|VIDDRV_HOLLYWOOD\|IMGFMT_JPEG\|REQ_MULTISELECT\|COUNTRY_NIGERIA\|LANGUAGE_GUARANI\|LANGUAGE_POLISH\|ERR_ICONSTANDARD\|REQ_HIDEICONS\|LANGUAGE_CORSICAN\|DISPMODE_MODEREQUESTER\|ERR_NOABSPATH\|LANGUAGE_GERMAN\|ERR_RANDOMIZE\|ERR_ARGS\|PLUGINCAPS_AUDIOADAPTER\|IMAGETYPE_VECTOR\|LANGUAGE_GREEK\|COUNTRY_HOLYSEE\|COUNTRY_NORTHKOREA\|LANGUAGE_MALAYALAM\|COUNTRY_BOTSWANA\|LANGUAGE_CREE\|ATTRNUMENTRIES\|REQICON_ERROR\|IMGFMT_GIF\|FTPBINARY\|WORD\|VIDDRV_OS\|ATTRDURATION\|LANGUAGE_AKAN\|ERR_FTPERROR\|PLUGINCAPS_VIDEO\|ERR_EXAMINE\|HSTRIPES8\|COUNTRY_OMAN\|CIRCLE\|ERR_BRUSHLINK\|ERR_STREAMASSAMPLE\|ERR_DISPLAYSIZE\|ERR_WRONGFLOAT\|PLUGINCAPS_FILEADAPTER\|ERR_UNSUPPORTEDFEAT\|DISPLAY\|ERR_MUSPAUSED\|INTEGER\|COUNTRY_BOLIVIA\|ERR_RECVTIMEOUT\|ATTRMONITOR\|LANGUAGE_INUKTITUT\|ATTRPAUSED\|LANGUAGE_LITHUANIAN\|DATEYEAR\|JOYUPRIGHT\|ERR_LAYERSOFF\|ERR_EMPTYSCRIPT\|LIGHTUSERDATA\|ERR_FINDTIMER\|ALPHACHANNEL\|LANGUAGE_WALLOON\|ERR_ADFWRONGDISP\|ERR_HTTPERROR\|ERR_REWINDDIR\|ERR_LOCKEDOBJ\|COUNTRY_NEPAL\|HSTRIPES2\|RECTSOUTH\|ERR_UNKPROTOCOL\|COUNTRY_CANADA\|COUNTRY_VENEZUELA\|COUNTRY_MALDIVES\|ERR_SQBRACKETCLOSE\|ERR_HTTPTE\|VSTRIPES2\|COUNTRY_NORWAY\|ERR_FIRSTPREPROC\|SNAPDESKTOP\|LANGUAGE_FINNISH\|COUNTRY_TURKEY\|LANGUAGE_VIETNAMESE\|VBLINDS64\|ERR_FONTFORMAT\|ERR_PIXELRANGE\|LANGUAGE_AVESTAN\|ERR_SYSIMAGE\|BIGSINE\|CLIPBOARD_EMPTY\|ERR_WRONGCLIPREG\|AMIGAICON_NONE\|FONTWEIGHT_EXTRABLACK\|LANGUAGE_IDO\|ATTRFORMAT\|ERR_FUNCJMP\|PARITY_NONE\|ATTRHOSTDEPTH\|ERR_RENDERCALLBACK\|ERR_FINDPORT\|LANGUAGE_NEPALI\|COUNTRY_AMERICANSAMOA\|ERR_MISSINGSEPARTR\|MODRALT\|COUNTRY_BESISLANDS\|LANGUAGE_AVARIC\|ERR_VIDNOTPAUSED\|TOPOUT\|ERR_VALUEEXPECTED\|ERR_WRONGUSAGE\|TURNDOWNLEFT\|ERR_ICONDIMS\|LANGUAGE_HAUSA\|ERR_TRANSBGMOBILE\|SEEK_CURRENT\|ERR_MONITORRANGE\|COUNTRY_FAROEISLANDS\|SHAPE\|COUNTRY_SOLOMONISLANDS\|NAVY\|ERR_PREPROCSYM\|COUNTRY_GEORGIA\|LANGUAGE_OSSETIAN\|ERR_THREAD\|DATA_5\|ERR_INISYNTAX\|ERR_MUSFMTSUPPORT\|LANGUAGE_YIDDISH\|ATTRLAYERS\|SMOOTHOUT\|LANGUAGE_KONGO\|COUNTRY_KYRGYZSTAN\|ATTRDOUBLEBUFFER\|TOP\|ERR_SYSBUTTON\|ERR_DATATYPESAVE\|COUNTRY_LIBYA\|ERR_FUNCWOENDFUNC\|ANIMSTREAM\|ATTRUSERDATA\|LANGUAGE_NORTHNDEBELE\|UDPCLIENT\|ERR_MUSNOTPLYNG\|FILEATTR_READ_OTH\|ERR_EVNTEXPCTED\|ERR_BADDIMENSIONS\|ATTROUTPUTDEVICE\|LANGUAGE_BULGARIAN\|LANGUAGE_SPANISH\|DISPMODE_FULLSCREENSCALE\|LANGUAGE_INTERLINGUE\|FASTSPEED\|ERR_NODISPMODES\|LANGUAGE_CHAMORRO\|ATTRACTIVE\|COUNTRY_TOGO\|INACTIVEWINDOW\|ERR_CREATEEVENT\|COUNTRY_SAUDIARABIA\|FILEATTR_EXECUTE_OTH\|IPAUTO\|SHDWNORTHEAST\|MEMORY\|ERR_XF86VIDMODEEXT\|ARC\|TIMER\|COUNTRY_ICELAND\|FUCHSIA\|NETWORKUDP\|ERR_FINDCLIPREGION\|NETWORKSERVER\|NETWORKCONNECTION\|ATTRFONTNAME\|UDPOBJECT\|ERR_UNTERMINTDSTR\|LANGUAGE_NORWEGIANNYNORSK\|RECTBACKCENTER\|COUNTRY_BANGLADESH\|UPLOADFILE_RESPONSE\|COUNTRY_ITALY\|MASKINVISIBLE\|UPLOADFILE_STATUS\|ERR_FOREVERWOREPEAT\|STRETCHBOTTOM\|STRETCHRIGHT\|MOVEFILE_COPY\|FTPASCII\|RECEIVELINE\|RECEIVEBYTES\|ERR_DRAWPATH\|ATTRFONTAA\|VSTRANGEPUSH\|ERR_BADBASE64\|ERR_NOCLIPREG\|SCROLLNORTHWEST\|RECEIVEALL\|ERR_PLUGINARCH\|DTR_OFF\|HEXNUMERICAL\|FLOW_XON_XOFF\|ERR_LAYERSUPPORT2\|FLOW_HARDWARE\|LANGUAGE_GAELIC\|FLOW_OFF\|COUNTRY_ANTARCTICA\|ERR_REQAUTH\|STOP_2\|SERIF\|ERR_FINDANIM\|PARITY_ODD\|DATA_8\|VSTRIPES32\|COUNTRY_FRANCE\|DATA_6\|BAUD_460800\|HKEY_CURRENT_USER\|COUNTRY_BELARUS\|BAUD_115200\|BAUD_57600\|BAUD_38400\|BAUD_19200\|VSTRIPES4\|COUNTRY_ALANDISLANDS\|LANGUAGE_UKRAINIAN\|ERR_ICONSIZE\|BAUD_9600\|COUNTRY_SYRIA\|COUNTRY_NICARAGUA\|COUNTRY_PERU\|ERR_SIGNAL\|BAUD_2400\|JOYDOWN\|BAUD_300\|FILLRULEEVENODD\|ERR_COMMODITY\|ERR_UNKNOWN\|LANGUAGE_CORNISH\|FONTWEIGHT_LIGHT\|ERR_BAD8SVX\|ONBUTTONOVERALL\|CROSSFADE\|CAPSQUARE\|CAPBUTT\|ERR_STRORNUM\|LANGUAGE_SINDHI\|BEEPQUESTION\|JOINBEVEL\|ERR_PLUGINDOUBLET\|JOINROUND\|LANGUAGE_WESTERNFRISIAN\|ERR_PROTMETATABLE\|LANGUAGE_TURKISH\|BOTTOM\|ZOOMNORTH\|ERR_DATATYPEALPHA\|ERR_FINDUDPOBJECT\|SUN\|TURNDOWNRIGHT\|UDPSERVER\|MODRCOMMAND\|LANGUAGE_SWATI\|COUNTRY_MALAWI\|KEEPASPRAT\|DEFAULTICON\|LANGUAGE_TONGA\|ERR_NUMCALLBACK\|STRING\|ATTRPITCH\|ERR_ELSEWOIF\|COUNTRY_SAMOA\|LANGUAGE_PASHTO\|CARDTOP\|DENSITY_NONE\|ITALIC\|PLUGINCAPS_DISPLAYADAPTER\|FILEATTR_READ_USR\|LANGUAGE_UIGHUR\|ERR_EMPTYTABLE\|COUNTRY_CAPEVERDE\|ERR_FGRABVIDSTATE\|ERR_LOCK2\|LANGUAGE_ICELANDIC\|LIME\|ATTRCURSUBSONG\|CENTER\|ERR_VECGFXPLUGIN\|THREAD\|SLIDERIGHT\|NORMALSPEED\|SELMODE_LAYERS\|SLIDELEFT\|HLOWFLIPCOIN\|HFLIPCOIN\|VLOWFLIPCOIN\|ERR_INVCAPIDX\|VFLIPCOIN\|ASYNCDRAW\|ERR_INCOMPATBRUSH\|RECTBACKWEST\|FILEATTR_WRITE_USR\|ATTRONSCREEN\|CRUSHRIGHT\|LANGUAGE_BRETON\|ERR_REPEATWOUNTIL\|ERR_NOLOOP\|ATTRDISPLAY\|ERR_FILENOTFOUND\|ATTRDENSITY\|ERR_GETMONITORINFO\|ERR_POINTERFORMAT\|ZOOMIN\|PIXELZOOM2\|HSTRANGEPUSH\|FILEATTR_SYSTEM\|ERR_COLORSPACE\|LANGUAGE_ZULU\|ATTRHOSTWIDTH\|LANGUAGE_SANGO\|ERR_SOCKET\|STAR\|ERR_FINDBUTTON\|CLOCKWIPE\|FILLCOLOR\|USELAYERPOSITION\|LANGUAGE_BELARUSIAN\|COUNTRY_MICRONESIA\|COPYFILE_UNPROTECT\|DISSOLVE\|UNDERLINED\|WATER4\|COUNTRY_BURKINAFASO\|LANGUAGE_LINGALA\|WATER3\|MASK\|ATTRNOMODESWITCH\|ERR_SETFILEATTR\|LANGUAGE_KASHMIRI\|FILEATTR_HIDDEN\|DELETEFILE_UNPROTECT\|COUNTRY_CUBA\|HKEY_USERS\|ATTRKEYBOARD\|COUNTBOTH\|ROLLLEFT\|HSTRIPES\|CRUSHBOTTOM\|RECTBACKSOUTHWEST\|LANGUAGE_TSONGA\|RECTBACKSOUTH\|ERR_DIFFDEPTH\|RECTBACKSOUTHEAST\|RECTBACKEAST\|ERR_TRIALLIMIT\|ERR_FINDMOVE\|ERR_SCREEN\|ERR_FINDPLUGIN\|LANGUAGE_ITALIAN\|ERR_MULTIBGPIC\|ERR_BADLAYERTYPE\|JUSTIFIED\|ERR_ADDAPPWIN\|LANGUAGE_NAURU\|ERR_UNKNOWNFILTER\|RECTBACKNORTHEAST\|JOYDOWNLEFT\|RECTBACKNORTH\|WALLPAPERTOP\|ROLLTOP\|ERR_NOFALLTHROUGH\|BRUSH_VS_BOX\|USERDATA\|RANDOMPARAMETER\|IMAGETYPE_RASTER\|NATIVE\|DIAGONAL\|COUNTRY_SUDAN\|PUZZLE\|ERR_ENDIFWOIF\|ERR_MEM\|ERR_OPENSERIAL\|PUSHRIGHT\|NEXTFRAME\|DOSTYPE_FILE\|PUSHLEFT\|ERR_SORTFUNC\|ENCODING_ISO8859_1\|VOPENGATE\|ERR_XFIXES\|HCLOSEGATE\|ZOOMSOUTHWEST\|HOPENGATE\|VFLOWRIGHT\|ERR_BADBYTECODE\|VFLOWLEFT\|HFLOWBOTTOM\|HFLOWTOP\|ERR_DLOPEN\|ZOOMNORTHWEST\|ZOOMWEST\|ERR_NODOUBLEBUFFER\|ZOOMSOUTH\|ZOOMEAST\|ZOOMNORTHEAST\|COUNTRY_UK\|ZOOMCENTER\|ERR_FINDMEMBLK\|ERR_BGPICBUTTON\|VSTRETCHCENTER\|ERR_FREEABGPIC\|STRETCHTOP\|SCROLLNORTHEAST\|ATTRFUNCTION\|ERR_TABLEINDEX\|ERR_MULDISMOBILE\|COUNTRY_INDONESIA\|SCROLLSOUTHEAST\|NOCOLOR\|ERR_SELECTBGPIC2\|JOYUPLEFT\|MASKAND\|CLIPBOARD_SOUND\|SCROLLSOUTH\|SCROLLNORTH\|ERR_NOMENU\|ERR_NOANMLAYER\|SCROLLWEST\|ERR_CHANNELRANGE\|ERR_STRTABLEARG\|SCROLLRIGHT\|SCROLLLEFT\|RECTNORTHWEST\|ERR_BEGINREFRESH\|COUNTRY_SPAIN\|RECTSOUTHWEST\|COUNTRY_PHILIPPINES\|RECTSOUTHEAST\|ERR_LOADSOUND\|RECTEAST\|RECTNORTH\|LANGUAGE_ARABIC\|COUNTRY_JORDAN\|RECTCENTER\|ERR_TRANSBRUSH\|BLEND\|ERR_PLUGINVER\|RANDOMEFFECT\|FILLRULEWINDING\|ANMFMT_GIF\|VLINES\|ERR_LABINFOR\|DISPMODE_SYSTEMSCALE\|VLINES2\|ERR_NOARGBVISUAL\|COUNTRY_YEMEN\|HSTRIPES32\|ERR_SAVESAMPLE\|ERR_CHRCSTEMPTY\|LANGUAGE_CATALAN\|ERR_SEEK\|SANS\|LANGUAGE_JAVANESE\|ATTRLAYERID\|ERR_BRACECLOSE\|ERR_CONSOLEARG\|ATTRXPOS\|PLUGINCAPS_REQUESTERADAPTER\|REVEALRIGHT\|ERR_FINDFONT2\|REVEALLEFT\|LANGUAGE_DUTCH\|ERR_CHRCSTLEN\|HCLOSECURTAIN\|ERR_SELECTBGPIC\|ERR_MAGICKEY\|SELMODE_COMBO\|HOPENCURTAIN\|ERR_ZLIBSTREAM\|CARDBOTTOM\|VBLINDS16\|HBLINDS128\|HBLINDS64\|DURATION_SHORT\|COUNTRY_GREECE\|COUNTRY_MARSHALLISLANDS\|LANGUAGE_KAZAKH\|ERR_BADCONSTANT\|MODLCONTROL\|HBLINDS16\|COUNTRY_NAURU\|HBLINDS8\|SILVER\|DATA_7\|DAMPED\|ATTRORIENTATION\|COUNTRY_UNKNOWN\|COUNTRY_CZECHREPUBLIC\|LANGUAGE_INDONESIAN\|LANGUAGE_NAVAJO\|ERR_NOBLOCKBREAK\|ERR_8OR16BITONLY\|BOLD\|VSTRIPES8\|ERR_FUNCEXPECTED\|COUNTRY_AZERBAIJAN\|COUNTRY_KAZAKHSTAN\|ERR_FINDFONT\|QUARTERS\|WATER1\|HSTRIPES4\|COUNTRY_BRUNEI\|VOPENCURTAIN\|MONO8\|ERR_ICONENTRY\|PLUGINCAPS_VECTOR\|ATTRFIXED\|ALPHABETICAL\|VANILLACOPY\|MASKOR\|MASKXOR\|ERR_STAT\|SMPFMT_WAVE\|HSPLIT\|LANGUAGE_ABKHAZIAN\|COUNTRY_GABON\|ERR_ADDSYSEVENT\|ERR_INTEXPECTED\|COUNTRY_ECUADOR\|STEREO16\|ERR_UPDATEICON\|ERR_LABELDECLA\|MENUITEM_DISABLED\|ERR_FILEEXIST\|LANGUAGE_DIVEHI\|ATTRHOSTTASKBAR\|ERR_FINDOBJECTDATA\|ERR_BADENCODING\|ERR_GTK\|DENSITY_MEDIUM\|DENSITY_LOW\|VSPLIT\|ORIENTATION_LANDSCAPEREV\|TEAL\|ERR_COMMENTSTRUCT\|ORIENTATION_LANDSCAPE\|ERR_FT2\|ORIENTATION_PORTRAITREV\|DATELOCALNATIVE\|ERR_MAXLOCALS\|POLYGON\|BRUSHPART\|COUNTRY_CHINA\|ORIENTATION_NONE\|ERR_FIELDINIT\|CLIPREGION\|ERR_DELETEFILE\|LANGUAGE_SLOVENIAN\|SCALEMODE_LAYER\|MILLISECONDS\|COUNTRY_MALI\|SCALEMODE_AUTO\|LAYERBUTTON\|ERR_LOADICON\|COUNTRY_AUSTRIA\|ERR_NOFUNCTION\|COUNTRY_MALTA\|HLINES\|ERR_NUMSTRCMP\|ERR_SQBRACKETOPEN\|ERR_MODIFYABG\|LANGUAGE_GEORGIAN\|DISPMODE_ASK\|ERR_READRANGE\|ERR_UNTILWOREPEAT\|DISPMODE_WINDOWED\|FONTWEIGHT_REGULAR\|LANGUAGE_QUECHUA\|DISPSTATE_MINIMIZED\|DISPSTATE_CLOSED\|DISPSTATE_OPEN\|ERR_FREECURPOINTER\|DEINTERLACE_DOUBLE\|DEINTERLACE_DEFAULT\|ENCODING_AMIGA\|ENCODING_UTF8\|ENCODING_RAW\|FONTSLANT_OBLIQUE\|ERR_STRTOOSHORT\|ANMFMT_MJPEG\|ERR_CLIPWRITE\|FONTSLANT_ROMAN\|PERMREQ_READEXTERNAL\|TURNDOWNBOTTOM\|FONTWEIGHT_HEAVY\|ATTRPLAYING\|FONTWEIGHT_ULTRABOLD\|LANGUAGE_RUSSIAN\|FONTWEIGHT_BOLD\|FONTWEIGHT_DEMIBOLD\|REQICON_QUESTION\|COUNTRY_TANZANIA\|COUNTRY_SAINTBARTHELEMY\|DISPMODE_FULLSCREEN\|FONTWEIGHT_NORMAL\|ERR_GUIGFX\|ERR_LOADFRAME\|HIDELAYER\|COUNTRY_SAOTOMEANDPRINCIPE\|FONTWEIGHT_ULTRALIGHT\|ERR_GRABSCREEN\|SPIRAL\|FONTWEIGHT_THIN\|FONTENGINE_INBUILT\|COUNTRY_TIMOR\|ATTRDRIVER\|MONOSPACE\|ERR_SYNTAXERROR\|PRGTYPE_APPLET\|COUNTRY_URUGUAY\|PARITY_EVEN\|COUNTRY_ERITREA\|MODE_READ\|LANGUAGE_CENTRALKHMER\|ERR_SHORTIF\|BITMAP_DEFAULT\|ERR_ESCREPLACE\|ERR_FINDMUSIC\|ERR_MEMCODE\|ATTRMENU\|ERR_DISPMINIMIZED\|JOYNODIR\|ATTRMODE\|ERR_FINDDISPLAY\|ERR_BADWAVE\|LANGUAGE_PERSIAN\|SHDWSOUTHWEST\|ERR_ADDTASK\|ERR_NAMEUSED\|ERR_CLIPREAD\|LANGUAGE_TSWANA\|ATTRBORDERBOTTOM\|SPRITE\|ERR_DOUBLEMENU\|ERR_TOKENEXPECTED\|EDGE\|FILLTEXTURE\|IO_BUFFERED\|ERR_JAVAMETHOD\|GRAY\|NUMERICAL\|ERR_VFONTTYPE\|COUNTRY_LIECHTENSTEIN\|COUNTRY_GHANA\|ERR_LAYERSON\|LANGUAGE_BASQUE\|SERIAL\|ALL\|ERR_SELECTMASK\|COUNTRY_CYPRUS\|LANGUAGE_MAORI\|ERR_DBTRANSWIN\|ATTRID\|ERR_NUMBEREXPECTED\|ANTIALIAS\|SCROLLSOUTHWEST\|ERR_PLUGINSUPPORT\|ERR_WRONGID\|COUNTRY_SRILANKA\|ERR_SENDTIMEOUT\|ERR_EQUALEXPECTED\|ERR_SERIALIO\|COUNTRY_LESOTHO\|ERR_CREATEDOCKY\|ERR_INITSERIAL\|COUNTRY_SLOVENIA\|COUNTRY_AFGHANISTAN\|ERR_FUNCDECLA\|HW_REVISION\|ERR_MALFORMPAT2\|ERR_RENDERER\|COUNTRY_KUWAIT\|ERR_SURFACE\|ERR_FINDARRAY\|ERR_MULTIDISPLAYS\|ERR_TEXTSYNTAX\|ERR_ICONVECTOR\|ERR_BRACKETCLOSE\|SELMODE_NORMAL\|SCALEMODE_NONE\|LANGUAGE_KINYARWANDA\|ERR_CORETEXT\|COUNTRY_MONTENEGRO\|ERR_VIDEOINIT\|LANGUAGE_LUBAKATANGA\|ERR_TRIALINCLUDE\|ERR_READFILE\|ERR_TRIALSAVEVID\|ERR_ATSUI\|ERR_TRIALCOMPILE\|ERR_RADIOTOGGLEMENU\|LANGUAGE_MALAGASY\|COUNTRY_ALGERIA\|ERR_TABEXPECTED3\|LANGUAGE_TIBETAN\|ERR_ELSETWICE\|ERR_FINDSELECTOR\|ERR_FRAMEGRABBER\|ERR_COREFOUNDATION\|COUNTRY_HONDURAS\|ERR_FINDICON\|FILEATTR_READONLY\|ERR_INVALIDUTF8ARG\|ERR_DIFFENCODING\|COUNTRY_BARBADOS\|ERR_INVALIDUTF8\|ERR_INVREPLACE\|ERR_COMPLEXPATTERN\|ERR_AMIGAGUIDE\|LANGUAGE_AFRIKAANS\|ERR_LINKPLUGIN\|ERR_STACK\|MASKVANILLACOPY\|MODE_READWRITE\|ERR_FILESIZE\|ERR_MUSPLAYING\|ERR_VIDNOTPLAYING\|COUNTRY_DJIBOUTI\|ERR_ALLOCMASK\|ERR_ALLOCALPHA\|ERR_KEYFILE\|ERR_VISUALINFO\|ERR_FINDCLIENT\|ERR_SENDDATA\|LANGUAGE_NDONGA\|COUNTRY_DOMINICANREPUBLIC\|ERR_UNEXPECTEDSYM\|ERR_FULLSCREEN\|ERR_SCREENMODE\|ATTRBORDERLEFT\|COUNTRY_SWEDEN\|ERR_TFIMAGE\|ERR_LOCKBMAP\|ERR_FINDMONITOR\|COUNTRY_ROMANIA\|ATTRCURSORX\|ERR_NOCONTEXTMENU\|ERR_ACCELERATOR\|ERR_VECTORBRUSH\|FILEATTR_ARCHIVE\|ERR_ENDWITHWOWITH\|ERR_CONTEXTMENU\|SHDWNORTH\|SHDWNORTHWEST\|ERR_EMPTYMENUTREE\|ERR_FINDMENUITEM\|COUNTRY_RUSSIA\|ERR_DEFFONT\|ERR_CREATEMENU\|ANIM\|COUNTRY_ETHIOPIA\|ERR_MENUCOMPLEXITY\|MODLALT\|ERR_WRONGCMDRECVIDEO\|ERR_REGISTRYWRITE\|HIDEBRUSH\|ERR_SENDMESSAGE\|COUNTRY_LIBERIA\|ERR_FINDAPPLICATION\|ERR_NEEDAPPLICATION\|ERR_COORDSRANGE\|JOYRIGHT\|ERR_UNKNOWNATTR\|ERR_APPLICATION\|COUNTRY_FIJI\|ERR_SEEKFILE\|ERR_TABLEDECLA\|ERR_FINDDIR\|AMIGAICON_DRAWER\|COUNTRY_COMOROS\|ERR_MODIFYSPRITE\|STEREO8\|ERR_DDMOBILE\|ERR_HWBMCLOSEDISP\|ERR_HWDBFREEDISP\|BOTTOMOUT\|ERR_FINDBGPIC\|ERR_RETWOGOSUB\|ERR_BITMAP\|ERR_REQUIREPLUGIN\|ERR_DISPLAYADAPTERSUPPORT\|ERR_SOCKNAME\|RED\|ERR_SCRPIXFMT\|PI\|ERR_FINDSPRITE\|LANGUAGE_OJIBWA\|ERR_REQUIREFIELD\|COUNTRY_TAJIKISTAN\|ERR_WRITEONLY\|ERR_VIDLAYERFUNC\|ERR_VIDSTOPPED\|ERR_VIDEOLAYER\|ERR_CMDASVAR\|ERR_REGCLASS\|AMIGAICON_TOOL\|RECTWEST\|ERR_FINDACTIVITY\|ERR_JAVA\|ERR_UDEXPECTED\|LANGUAGE_CHICHEWA\|ERR_NOMIMEVIEWER\|ACTIVEWINDOW\|FILEATTR_SCRIPT\|ERR_GETSHORTCUT\|IMGFMT_PNG\|LAYER_VS_BOX\|LANGUAGE_MALTESE\|ATTRXSERVER\|ERR_CREATEICON\|LANGUAGE_DANISH\|ERR_SATFREEDISP\|ERR_PERCENTFORMATSTR\|COUNTRY_BELGIUM\|ERR_VIDPLAYING\|ERR_VIDPAUSED\|SECONDS\|ERR_SAVERALPHA\|ATTRMAXWIDTH\|ERR_HWBRUSHFUNC\|COUNTRY_ARGENTINA\|LANGUAGE_TIGRINYA\|SLOWSPEED\|LANGUAGE_NORWEGIAN\|ERR_HWBRUSH\|COUNTRY_BENIN\|DENSITY_HIGH\|ERR_PLUGINSYMBOL\|BARS\|ERR_UNKNOWNSMPOUT\|ERR_SAVEANIM\|ERR_FINDPOINTER\|ERR_UNKNOWNANMOUT\|LANGUAGE_FRENCH\|ERR_SAVEIMAGE\|ATTRSCALEMODE\|ERR_UNKNOWNIMGOUT\|CONICAL\|ERR_NOFMBHANDLER\|ERR_NOMUSICCB\|FILETYPE_ANIM\|LANGUAGE_SOMALI\|ATTRFONTSIZE\|COUNTRY_PARAGUAY\|COUNTRY_TURKMENISTAN\|ERR_SEEKFORMAT\|ERR_DBVIDEOLAYER\|LANGUAGE_IRISH\|COUNTRY_MAYOTTE\|ERR_BADCALLBACKRET\|YELLOW\|ERR_MODIFYPSMP\|DELETEFILE_STATUS\|ERR_DSOUNDNOTIPOS\|ERR_READONLY\|ERR_MOBILE\|ERR_MONITORFULLSCREEN\|ERR_WRONGDTYPE\|COUNTRY_CHAD\|LINEAR\|ONKEYDOWNALL\|ERR_INVNEXTKEY\|WHITE\|ATTRSIZE\|ATTRMAXHEIGHT\|ERR_FINDSERIAL\|LITTLEENDIAN\|ERR_NOCOLON\|ERR_LOADPLUGIN\|ERR_VIDEOTRANS\|COUNTRY_TUNISIA\|ERR_WRITE\|COUNTRY_PALAU\|ERR_SELECTBG\|ERR_VIDEOFRAME\|LANGUAGE_BURMESE\|SWISS\|COUNTRY_GREENLAND\|ERR_VIDATTACHED\|PLOT\|ERR_SOCKOPT\|ERR_QUICKTIME\|LANGUAGE_ARMENIAN\|REQICON_INFORMATION\|ERR_OLDAPPLET\|ERR_LOADVIDEO\|ERR_MOVEFILE\|ERR_ENDBLKWOBLK\|ERR_NOTENOUGHPIXELS\|ATTRSCALEHEIGHT\|LANGUAGE_SAMOAN\|VCLOSECURTAIN\|COUNTRY_IRELAND\|ERR_OPENAUDIO\|ERR_NOFILTERNAME\|ATTRMAXIMIZED\|ADF_FX\|COUNTRY_SAINTVINCENT\|RECEIVEDATA_PACKET\|COUNTRY_ARUBA\|ERR_UNSETENV\|ERR_ALSAPCM\|ERR_XCURSOR\|LANGUAGE_ALBANIAN\|HLINES2\|LANGUAGE_KURDISH\|ERR_CREATEGC\|ERR_TOOSMALL2\|COUNTRY_TUVALU\|BIGENDIAN\|LANGUAGE_GREENLANDIC\|ERR_UPLOADFORBIDDEN\|ERR_DINPUT\|TICKS\|ERR_NOCOMPRESS\|ERR_BADURL\|ERR_NOLOOPCONT\|ERR_HOSTNAME\|ERR_PEERNAME\|DOUBLE\|ERR_FINDSERVER\|ERR_OPENSOCKET\|ATTRHOSTSCALE\|ERR_XDISPLAY\|ERR_TFVBRUSH\|ERR_TOOMANYARGS\|DATELOCAL\|ERR_DEMO\|ERR_NOJOYATPORT\|COUNTRY_USA\|ERR_RENDERADLAYER\|ERR_OPENLIB\|COUNTRY_EGYPT\|DTR_ON\|FADE\|COUNTRY_MARTINIQUE\|HKEY_CLASSES_ROOT\|ERR_NOACCESS\|ERR_TFVBGPICBRUSH\|ERR_CLOSEFILE\|ERR_BGPICTYPE\|LANGUAGE_AFAR\|ERR_DEMO2\|VCLOSEGATE\|ERR_LINKFONT\|ERR_FTPAUTH\|ERR_WRONGSPRITESIZE\|ERR_SPRITELINK\|ERR_ADFFREEDISP\|ERR_MONITORDIR\|ERR_REGISTRYREAD\|ERR_REMADLAYER\|ERR_FINDINTERVAL\|ATTRSTATE\|ERR_FINDLAYER\|FONTSLANT_ITALIC\|ERR_SCALEBGPIC\|SHDWSOUTHEAST\|ERR_CLIPOPEN\|ERR_BRUSHTYPE\|ERR_CLIPFORMAT\|ERR_LOADPICTURE2\|ERR_OPENSOUND2\|ATTRZPOS\|ERR_OPENANIM2\|ERR_NEEDOS41\|LANGUAGE_JAPANESE\|ERR_TABEXPECTED\|ATTRTEXT\|ERR_FINDBRUSH\|COUNTRY_BRAZIL\|COUNTRY_SINGAPORE\|LANGUAGE_SANSKRIT\|ERR_ADDAPPICON\|LOWERCURVE\|ERR_FREEADISPLAY\|ERR_ARRAYDECLA\|ERR_SMODEALPHA\|ERR_FINDANIMSTREAM\|ATTRSCALEWIDTH\|ERR_MODIFYAANIM\|CLIPBOARD_UNKNOWN\|ERR_FONTPATH\|COUNTRY_BAHAMAS\|ERR_NEGCOORDS\|ERR_JOYSTICK\|ERR_CASECST\|LANGUAGE_TAGALOG\|LANGUAGE_KANURI\|COUNTRY_PITCAIRN\|NONE\|ERR_WRONGVSTRATEGY\|ERR_APPLET\|ERR_VIDEOSTRATEGY\|ERR_READTABLE\|COUNTRY_SWAZILAND\|BEEPWARNING\|BOUNCE\|LANGUAGE_SLOVAK\|LANGUAGE_SERBIAN\|ERR_FINDASYNCDRAW\|ERR_SPRITEONSCREEN2\|ERR_NOHWFUNC\|ERR_POINTERIMG\|ERR_MUSNOTPLYNG2\|ERR_NODISLAYERS\|ERR_NUMCONCAT\|COUNTRY_PUERTORICO\|ERR_DDAUTOSCALE\|ERR_DIRECTSHOW\|ATTRALPHAINTENSITY\|FILLNONE\|SHDWSOUTH\|ERR_ZLIBVERSION\|IMGFMT_BMP\|LANGUAGE_BENGALI\|COUNTRY_HAITI\|COUNTRY_GRENADA\|VBLINDS128\|ERR_TABCALLBACK\|FILETYPE_IMAGE\|BOOLEAN\|ERR_TEXTCONVERT\|ERR_MSGPORT\|ERR_LOADPICTURE\|VSTRIPES16\|ERR_SEMAPHORE\|ERR_MASKNALPHA\|ERR_TIMER\|PRINT\|ERR_HEXPOINT\|ERR_NODIRPATTERN\|ONBUTTONRIGHTCLICKALL\|ERR_NOTXTLAYER\|ERR_STRCALLBACK\|ERR_CONCAT\|ERR_COMPLEXWHILE\|REQ_NORMAL\|ERR_NOCHANNEL\|FONTWEIGHT_EXTRALIGHT\|COUNTRY_FRENCHPOLYNESIA\|FILEATTR_PURE\|ERR_SETFILEDATE\|HSTRIPES16\|COUNTRY_SEYCHELLES\|ERR_DEMO3\|COUNTRY_HONGKONG\|FASTMEMORY\|ERR_KEYNOTFOUND\|FONTWEIGHT_BOOK\|ERR_DATATYPESAVE2\|ERR_ZLIBDATA\|TEXTOUT\|ATTRCOUNT\|SHDWWEST\|ERR_RENAME\|ERR_CMPUNSUPPORTED\|COUNTRY_MAURITIUS\|ERR_DSOUNDPLAY\|ERR_UNIMPLCMD\|AMIGAICON_DISK\|ERR_NOREXX\|COUNTRY_LAOS\|LANGUAGE_ENGLISH\|ERR_ANTIALIAS\|ERR_MENUATTACHED\|COUNTRY_MAURITANIA\|LANGUAGE_TAMIL\|ERR_UNKTEXTFMT\|ERR_NOTADIR\|ERR_REQUIRETAGFMT\|COUNTRY_CROATIA\|ERR_CACHEERROR\|ERR_TASKSETUP\|LANGUAGE_YORUBA\|ERR_CSTDOUBLEDEF\|NATIVEENDIAN\|ATTRNUMFRAMES\|ATTRSTANDARD\|LANGUAGE_SICHUANYI\|LANGUAGE_WOLOF\|LANGUAGE_SHONA\|ONKEYDOWN\|VOID\|COUNTRY_NIUE\|ERR_UNKNOWNMUSFMT\|ATTRSPRITES\|ERR_MIXMUSMOD\|ERR_SEEKRANGE\|COUNTRY_NEWZEALAND\|LANGUAGE_PALI\|FILLGRADIENT\|ERR_NOKEYWORDS\|ERR_UNKNOWNTAG\|COUNTRY_MYANMAR\|STDPTR_BUSY\|RIGHTOUT\|COUNTRY_JERSEY\|MOVEFILE_UNPROTECT\|IPUNKNOWN\|ERR_FUNCREMOVED\|MENUITEM_SELECTED\|COUNTRY_NORFOLKISLAND\|ERR_OPENANIM\|CHIPMEMORY\|COUNTRY_MADAGASCAR\|ERR_NUMTABLEARG\|ATTRCLIPREGION\|LANGUAGE_SUNDANESE\|ERR_TOOMANYCAPTURES\|ERR_NOALPHA\|ERR_BADSIGNATURE\|ERR_BADUPVALUES\|FILEATTR_DELETE_USR\|COUNTRY_LATVIA\|REQ_SAVEMODE\|ERR_VMMISMATCH\|ERR_NUMEXPECTED\|ERR_UNEXPECTEDEOF\|ERR_UNKNOWNCOND\|ERR_STRINGEXPECTED\|DURATION_LONG\|LANGUAGE_GANDA\|PRGTYPE_PROGRAM\|COUNTRY_CENTRALAFRICANREPUBLIC\|CLIPBOARD_IMAGE\|ERR_LOCK\|ERR_INVINSERT\|ERR_LAYERSUPPORT\|LANGUAGE_ASSAMESE\|COUNTRY_ANTIGUAANDBARBUDA\|FLOAT\|COUNTRY_RWANDA\|FILEATTR_READ_GRP\|LANGUAGE_TELUGU\|COUNTRY_GUINEABISSAU\|JOYLEFT\|SHDWEAST\|BGPIC\|ERR_VARSYNTAX\|ATTRNUMSUBSONGS\|PLUGINCAPS_TIMERADAPTER\|ERR_UNMPARENTHESES\|ERR_ERRORCALLED\|ERR_PERCENTFORMAT\|COUNTRY_GERMANY\|LANGUAGE_BISLAMA\|UNDO\|ERR_FINDFILE\|LANGUAGE_URDU\|PLUGINCAPS_REQUIRE\|SINE\|ERR_FINDTEXTOBJECT\|LANGUAGE_AMHARIC\|REVEALTOP\|COUNTRY_SAINTLUCIA\|ERR_DIRLOCK\|MODE_WRITE\|LANGUAGE_TURKMEN\|ERR_VIDRECTRANS\|LINE\|COUNTRY_NAMIBIA\|FILETYPEFLAGS_SAVE\|LANGUAGE_SARDINIAN\|ERR_NOMASKBRUSH\|ERR_MUSNOTPAUSED\|IPV4\|ERR_UNKNUMFMT\|ERR_DOUBLEDECLA\|ERR_INVPATCAP\|LANGUAGE_HUNGARIAN\|COUNTRY_MONTSERRAT\|LANGUAGE_FAROESE\|LANGUAGE_DZONGKHA\|ERR_LOOPRANGE\|ATTRHASALPHA\|ERR_ENDSWCHWOSWCH\|POINTER\|COUNTRY_BOUVETISLAND\|BYTE\|FILE\|ATTRRAWYPOS\|FONTWEIGHT_ULTRABLACK\|ERR_EXETYPE\|ERR_UNBALANCEDPAT\|COUNTRY_NIGER\|EOF\|ERR_LABMAINBLK\|RIGHT\|LANGUAGE_KUANYAMA\|KEEPPOSITION\|ERR_BRUSHSIZE\|LANGUAGE_KIKUYU\|CLOSEWINDOW\|ERR_CREATEPORT\|ZOOMOUT\|ERR_MODIFYABR\|IMGFMT_TIFF\|ERR_MISSINGPARAMTR\|NORMAL\|STDPTR_CUSTOM\|ERR_MEMRANGE\|LEFTOUT\|LANGUAGE_CHECHEN\|COUNTRY_BERMUDA\|MOVEFILE_DELETE\|SPRITE_VS_BOX\|LANGUAGE_BASHKIR\|ERR_SPRITEONSCREEN\|ERR_SETADAPTER\|LANGUAGE_INUPIAQ\|ALPHANUMERICAL\|COUNTRY_MACEDONIA\|COUNTRY_KENYA\|COUNTRY_PAKISTAN\|BGPICPART\|IO_UNBUFFERED\|FILETYPEFLAGS_ALPHA\|COUNTRY_ZAMBIA\|ERR_STREXPECTED\|ATTRTITLE\|UPPERCURVE\|ERR_MEMCST\|ERR_SELECTBRUSH\|ERR_NOTRANSPARENCY\|COUNTRY_SWITZERLAND\|ERR_INTERNAL1\|LANGUAGE_SINHALA\|ERR_UNKNOWNSEC\|ATTRCANSEEK\|COUNTRY_ISRAEL\|COUNTRY_SANMARINO\|VECTORPATH\|ERR_PLUGINTYPE\|ERR_CONFIG2\|ERR_SWCHWOENDSWCH\|DOUBLEBUFFER\|ERR_TABLEORNIL\|DOSTYPE_DIRECTORY\|MAROON\|ATTRBORDERTOP\|SAMPLE\|ATTRBGPIC\|PLUGINCAPS_SAVESAMPLE\|ERR_SCREENSIZE\|AMIGAICON_PROJECT\|SNAPDISPLAY\|COUNTRY_GUINEA\|SHADOW\|ERR_MAXUPVALS\|ORIENTATION_PORTRAIT\|COUNTRY_CAMBODIA\|ERR_TABEXPECTED2\|ERR_NOCHAR\|ERR_DSOUNDNOTIFY\|ERR_UNFINISHEDCAPTURE\|ATTRBITRATE\|ERR_NOCOMMA\|ERR_IFWOENDIF\|STDPTR_SYSTEM\|LANGUAGE_IGBO\|HKEY_CURRENT_CONFIG\|LANGUAGE_INTERLINGUA\|AMIGAICON_SHOW\|IPV6\|ERR_CONFIG\|ERR_COMPLEXEXPR\|ERR_FINDSAMPLE\|MODLSHIFT\|ERR_ENDFUNCWOFUNC\|PLUGINCAPS_IMAGE\|UDPNONE\|LANGUAGE_OROMO\|ERR_NEEDCOMPOSITE\|ATTRBORDERLESS\|ERR_SETFILECOMMENT\|LANGUAGE_MARATHI\|ERR_LFSYNTAX\|COUNTRY_BULGARIA\|ERR_FINDTIMEOUT\|ERR_RECVUNKNOWN\|ERR_RENDER\|ERR_CREATEDIR\|WATER2\|SLIDETOP\|ERR_PALSCREEN\|CRUSHLEFT\|COUNTRY_UKRAINE\|RADIAL\|ERR_WRONGOP\|COUNTRY_CURACAO\|ERR_NOCONSTANTS\|COUNTRY_IRAN\|FONTWEIGHT_BLACK\|REVEALBOTTOM\|ERR_PLAYERCOMP\|COUNTRY_PANAMA\|COUNTRY_ARMENIA\|INSERTBRUSH\|LANGUAGE_KOMI\|DATEDAY\|TABLE\|ATTRHARDWARE\|ONBUTTONRIGHTCLICK\|AMIGAICON_HIDE\|ERR_OPENSOUND\|SIZEWINDOW\|ATTRHOSTSCALEX\|FONTENGINE_NATIVE\|COUNTRY_IRAQ\|COUNTRY_ISLEOFMAN\|NUMBER\|HOLLYWOOD\|COUNTRY_SERBIA\|AMIGAICON_SETTITLE\|ERR_NEXTWOFOR\|FUNCTION\|ERR_GETDISKOBJ\|MODRSHIFT\|ERR_WRITEFILE\|LANGUAGE_ARAGONESE\|FILEATTR_WRITE_GRP\|LANGUAGE_UNKNOWN\|ERR_KICKSTART\|ERR_KEYWORD\|PLUGINCAPS_SAVEIMAGE\|FREESPACE\|COUNTRY_BHUTAN\|ERR_AUDIOCONVERTER\|TIMEOUT\|PERMREQ_WRITEEXTERNAL\|ERR_FINDCST\|ATTRTYPE\|ATTRHOSTTITLEBARHEIGHT\|ERR_TEXTURE\|OLIVE\|ERR_SATELLITE\|USEDSPACE\|LANGUAGE_HAITIAN\|COUNTRY_SOUTHSUDAN\|ERR_LABINWHILE\|COUNTRY_BAHRAIN\|ERR_WHILEWOWEND\|LANGUAGE_CROATIAN\|LANGUAGE_TWI\|ERR_NOAPPLET\|COUNTRY_QATAR\|ONBUTTONCLICK\|PUSHTOP\|ERR_READ\|BOX\|ADF_MOVEOBJECT\|COUNTRY_COSTARICA\|COUNTRY_POLAND\|ERR_NONE\|INTERVAL\|SLIDEBOTTOM\|HBLINDS32\|LANGUAGE_CHUVASH\|VBLINDS32\|BEEPINFORMATION\|COUNTRY_NETHERLANDS\|BEEPERROR\|FILETYPEFLAGS_FPS\|ATTRADAPTER\|COUNTRY_TONGA\|LANGUAGE_HINDI\|ERR_UNKNOWNMIMETYPE\|ERR_ANIMFRAME\|ERR_NOSPRITES\|IMGFMT_NATIVE\|LAYER\|MUSIC\|COUNTRY_LITHUANIA\|PLUGINCAPS_SOUND\|ELLIPSE\|COUNTRY_VIETNAM\|LANGUAGE_NORWEGIANBOKMAL\|ERR_IMAGEERROR\|REQICON_NONE\|FONTWEIGHT_SEMIBOLD\|SNAPWINDOW\|ATTRLOADER\|ATTRCURFRAME\|LANGUAGE_PORTUGUESE\|NEXTFRAME2\|COUNTRY_SURINAME\|ATTRXDPI\|LANGUAGE_CHINESE\|DATEMONTH\|ATTRMARGINLEFT\|COUNTRY_SOMALIA\|ERR_CONITEMS\|LANGUAGE_FIJIAN\|COUNTRY_SIERRALEONE\|LANGUAGE_OCCITAN\|LANGUAGE_SOUTHERNSOTHO\|COUNTRY_DOMINICA\|LANGUAGE_HERERO\|LANGUAGE_SWAHILI\|COUNTRY_PAPUANEWGUINEA\|COUNTRY_COOKISLANDS\|ATTRFONTDESCENDER\|COUNTRY_HUNGARY\|ERR_MODIFYSPRITE2\|DEFAULTSPEED\|TRUETYPE_DEFAULT\|LANGUAGE_AYMARA\|COUNTRY_MONGOLIA\|ATTRCURSORY\|COUNTRY_MOLDOVA\|COUNTRY_MEXICO\|ERR_PUBSCREEN\|ERR_LAYERRANGE\|ATTRLAYERSON\|DOWNLOADFILE_STATUS\|NIL\|COUNTRY_MALAYSIA\|LONG\|COUNTRY_MACAO\|LANGUAGE_LATVIAN\|COUNTRY_LEBANON\|SERVER\|COUNTRY_SOUTHKOREA\|COUNTRY_KIRIBATI\|COUNTRY_ESTONIA\|COUNTRY_ANGUILLA\|COUNTRY_TAIWAN\|ERR_TAGEXPECTED\|ATTRHEIGHT\|ERR_TFVBRUSHBGPIC\|ATTRYDPI\|COUNTRY_EQUATORIALGUINEA\|DATETIME\|LANGUAGE_BAMBARA\|EVENTHANDLER\|ATTRPOINTER\|FILETYPEFLAGS_QUALITY\|ERR_FINDVIDEO\|TURNDOWNTOP\|COUNTRY_CHRISTMASISLAND\|COUNTRY_BURUNDI\|COUNTRY_FINLAND\|ERR_MISSINGBRACKET\|LANGUAGE_ORIYA\|LANGUAGE_MONGOLIAN\|COUNTRY_THAILAND\|HKEY_LOCAL_MACHINE\|ATTRTRANSPARENTCOLOR\|COUNTRY_AUSTRALIA\|LANGUAGE_UZBEK\|ERR_SMPRANGE\|ATTRHOSTHEIGHT\|LANGUAGE_ROMANIAN\|LANGUAGE_MACEDONIAN\|COUNTRY_ANGOLA\|SEEK_BEGINNING\|IMGFMT_ILBM\|COUNTRY_GUADELOUPE\|DATEUTC\|ERR_REXXERR\|ATTRWIDTH\|FILEATTR_EXECUTE_USR\|COUNTRY_SAINTHELENA\|ICON\|ERR_LABINFUNC\|ATTRPUBSCREEN\|COUNTRY_GUERNSEY\|ERR_FINDLAYERDATA\|GREEN\|ERR_MISSINGOPBRACK\|HW_AMIGA\|HW_MACOS\|HW_LINUX\|HW_WINDOWS\|HW_ANDROID\|HW_IOS\|HW_LITTLE_ENDIAN\|HW_64BIT\|HW_AMIGAOS4\|HW_MORPHOS\|HW_AROS\|HW_WARPOS\|HW_AMIGAOS3\)\>"
-
+syn match hwConstant "#\<\%(ACTIVEWINDOW\|ADF_ANIM\|ADF_FX\|ADF_MOVEOBJECT\|ALL\|ALPHABETICAL\|ALPHACHANNEL\|ALPHANUMERICAL\|AMIGAICON_DEVICE\|AMIGAICON_DISK\|AMIGAICON_DRAWER\|AMIGAICON_GARBAGE\|AMIGAICON_HIDE\|AMIGAICON_KICKSTART\|AMIGAICON_NONE\|AMIGAICON_PROJECT\|AMIGAICON_SETPOSITION\|AMIGAICON_SETTITLE\|AMIGAICON_SHOW\|AMIGAICON_TOOL\|ANIM\|ANIMSTREAM\|ANIMTYPE_RASTER\|ANIMTYPE_VECTOR\|ANMFMT_GIF\|ANMFMT_IFF\|ANMFMT_MJPEG\|ANTIALIAS\|AQUA\|ARC\|ASYNCDRAW\|ASYNCOBJ\|ATTRACTIVE\|ATTRADAPTER\|ATTRALPHAINTENSITY\|ATTRBGPIC\|ATTRBITRATE\|ATTRBORDERBOTTOM\|ATTRBORDERLEFT\|ATTRBORDERLESS\|ATTRBORDERPEN\|ATTRBORDERRIGHT\|ATTRBORDERTOP\|ATTRBULLETPEN\|ATTRCANSEEK\|ATTRCLIPREGION\|ATTRCOUNT\|ATTRCURFRAME\|ATTRCURSORX\|ATTRCURSORY\|ATTRCURSUBSONG\|ATTRCYCLE\|ATTRDENSITY\|ATTRDEPTH\|ATTRDISPLAY\|ATTRDITHERMODE\|ATTRDOUBLEBUFFER\|ATTRDRIVER\|ATTRDURATION\|ATTRELAPSE\|ATTRENCODING\|ATTRFIXED\|ATTRFONTAA\|ATTRFONTASCENDER\|ATTRFONTCHARMAP\|ATTRFONTDEPTH\|ATTRFONTDESCENDER\|ATTRFONTENGINE\|ATTRFONTNAME\|ATTRFONTPALETTE\|ATTRFONTSCALABLE\|ATTRFONTSIZE\|ATTRFONTTRANSPARENTPEN\|ATTRFONTTYPE\|ATTRFORMAT\|ATTRFRAMEDELAY\|ATTRFUNCTION\|ATTRGROUP\|ATTRHARDWARE\|ATTRHASALPHA\|ATTRHASMASK\|ATTRHEIGHT\|ATTRHOSTDEPTH\|ATTRHOSTHEIGHT\|ATTRHOSTMONITORS\|ATTRHOSTSCALE\|ATTRHOSTSCALEX\|ATTRHOSTSCALEY\|ATTRHOSTTASKBAR\|ATTRHOSTTITLEBARHEIGHT\|ATTRHOSTWIDTH\|ATTRID\|ATTRIMMERSIVEMODE\|ATTRINTERPOLATE\|ATTRKEYBOARD\|ATTRLAYERID\|ATTRLAYERS\|ATTRLAYERSON\|ATTRLOADER\|ATTRMARGINLEFT\|ATTRMARGINRIGHT\|ATTRMASKMODE\|ATTRMAXHEIGHT\|ATTRMAXIMIZED\|ATTRMAXWIDTH\|ATTRMENU\|ATTRMODE\|ATTRMONITOR\|ATTRNOCLOSE\|ATTRNOHIDE\|ATTRNOMODESWITCH\|ATTRNUMENTRIES\|ATTRNUMFRAMES\|ATTRNUMSUBSONGS\|ATTRONSCREEN\|ATTRORIENTATION\|ATTROUTPUTDEVICE\|ATTRPALETTE\|ATTRPALETTEMODE\|ATTRPAUSED\|ATTRPEN\|ATTRPITCH\|ATTRPLAYING\|ATTRPOINTER\|ATTRPOSITION\|ATTRPUBSCREEN\|ATTRRAWHEIGHT\|ATTRRAWWIDTH\|ATTRRAWXPOS\|ATTRRAWYPOS\|ATTRSCALEHEIGHT\|ATTRSCALEMODE\|ATTRSCALESWITCH\|ATTRSCALEWIDTH\|ATTRSHADOWPEN\|ATTRSIZE\|ATTRSIZEABLE\|ATTRSPRITES\|ATTRSTANDARD\|ATTRSTATE\|ATTRSYSTEMBARS\|ATTRTEXT\|ATTRTITLE\|ATTRTRANSPARENTCOLOR\|ATTRTRANSPARENTPEN\|ATTRTYPE\|ATTRUSERDATA\|ATTRVISIBLE\|ATTRWIDTH\|ATTRXDPI\|ATTRXPOS\|ATTRXSERVER\|ATTRYDPI\|ATTRYPOS\|ATTRZPOS\|BARS\|BAUD_115200\|BAUD_1200\|BAUD_19200\|BAUD_2400\|BAUD_300\|BAUD_38400\|BAUD_460800\|BAUD_4800\|BAUD_57600\|BAUD_600\|BAUD_9600\|BEEPERROR\|BEEPINFORMATION\|BEEPQUESTION\|BEEPSYSTEM\|BEEPWARNING\|BGPIC\|BGPICPART\|BIGENDIAN\|BIGSINE\|BITMAP_DEFAULT\|BLACK\|BLEND\|BLUE\|BOLD\|BOOLEAN\|BORDER\|BOTTOM\|BOTTOMOUT\|BOUNCE\|BOX\|BRUSH\|BRUSH_VS_BOX\|BRUSHPART\|BULLET_ARROW\|BULLET_BOX\|BULLET_CHECKMARK\|BULLET_CIRCLE\|BULLET_CROSS\|BULLET_DASH\|BULLET_DIAMOND\|BULLET_LALPHA\|BULLET_LALPHADOUBLE\|BULLET_LALPHASINGLE\|BULLET_LROMAN\|BULLET_LROMANDOUBLE\|BULLET_LROMANSINGLE\|BULLET_NONE\|BULLET_NUMERIC\|BULLET_NUMERICDOUBLE\|BULLET_NUMERICSINGLE\|BULLET_UALPHA\|BULLET_UALPHADOUBLE\|BULLET_UALPHASINGLE\|BULLET_UROMAN\|BULLET_UROMANDOUBLE\|BULLET_UROMANSINGLE\|BYTE\|CAPBUTT\|CAPROUND\|CAPSQUARE\|CARDBOTTOM\|CARDTOP\|CENTER\|CHARMAP_ADOBECUSTOM\|CHARMAP_ADOBEEXPERT\|CHARMAP_ADOBELATIN1\|CHARMAP_ADOBESTANDARD\|CHARMAP_APPLEROMAN\|CHARMAP_BIG5\|CHARMAP_DEFAULT\|CHARMAP_JOHAB\|CHARMAP_MSSYMBOL\|CHARMAP_OLDLATIN2\|CHARMAP_SJIS\|CHARMAP_UNICODE\|CHARMAP_WANSUNG\|CHIPMEMORY\|CIRCLE\|CLIENT\|CLIPBOARD_EMPTY\|CLIPBOARD_IMAGE\|CLIPBOARD_SOUND\|CLIPBOARD_TEXT\|CLIPBOARD_UNKNOWN\|CLIPREGION\|CLOCKWIPE\|CLOSEWINDOW\|CONICAL\|COPYFILE_FAILED\|COPYFILE_OVERWRITE\|COPYFILE_STATUS\|COPYFILE_UNPROTECT\|COUNTBOTH\|COUNTDIRECTORIES\|COUNTFILES\|COUNTRY_AFGHANISTAN\|COUNTRY_ALANDISLANDS\|COUNTRY_ALBANIA\|COUNTRY_ALGERIA\|COUNTRY_AMERICANSAMOA\|COUNTRY_ANDORRA\|COUNTRY_ANGOLA\|COUNTRY_ANGUILLA\|COUNTRY_ANTARCTICA\|COUNTRY_ANTIGUAANDBARBUDA\|COUNTRY_ARGENTINA\|COUNTRY_ARMENIA\|COUNTRY_ARUBA\|COUNTRY_AUSTRALIA\|COUNTRY_AUSTRIA\|COUNTRY_AZERBAIJAN\|COUNTRY_BAHAMAS\|COUNTRY_BAHRAIN\|COUNTRY_BANGLADESH\|COUNTRY_BARBADOS\|COUNTRY_BELARUS\|COUNTRY_BELGIUM\|COUNTRY_BELIZE\|COUNTRY_BENIN\|COUNTRY_BERMUDA\|COUNTRY_BESISLANDS\|COUNTRY_BHUTAN\|COUNTRY_BOLIVIA\|COUNTRY_BOSNIAANDHERZEGOVINA\|COUNTRY_BOTSWANA\|COUNTRY_BOUVETISLAND\|COUNTRY_BRAZIL\|COUNTRY_BRUNEI\|COUNTRY_BULGARIA\|COUNTRY_BURKINAFASO\|COUNTRY_BURUNDI\|COUNTRY_CAMBODIA\|COUNTRY_CAMEROON\|COUNTRY_CANADA\|COUNTRY_CAPEVERDE\|COUNTRY_CAYMANISLANDS\|COUNTRY_CENTRALAFRICANREPUBLIC\|COUNTRY_CHAD\|COUNTRY_CHILE\|COUNTRY_CHINA\|COUNTRY_CHRISTMASISLAND\|COUNTRY_COCOSISLANDS\|COUNTRY_COLOMBIA\|COUNTRY_COMOROS\|COUNTRY_CONGO\|COUNTRY_COOKISLANDS\|COUNTRY_COSTARICA\|COUNTRY_CROATIA\|COUNTRY_CUBA\|COUNTRY_CURACAO\|COUNTRY_CYPRUS\|COUNTRY_CZECHREPUBLIC\|COUNTRY_DENMARK\|COUNTRY_DJIBOUTI\|COUNTRY_DOMINICA\|COUNTRY_DOMINICANREPUBLIC\|COUNTRY_DRCONGO\|COUNTRY_ECUADOR\|COUNTRY_EGYPT\|COUNTRY_ELSALVADOR\|COUNTRY_EQUATORIALGUINEA\|COUNTRY_ERITREA\|COUNTRY_ESTONIA\|COUNTRY_ETHIOPIA\|COUNTRY_FALKLANDISLANDS\|COUNTRY_FAROEISLANDS\|COUNTRY_FIJI\|COUNTRY_FINLAND\|COUNTRY_FRANCE\|COUNTRY_FRENCHGUIANA\|COUNTRY_FRENCHPOLYNESIA\|COUNTRY_GABON\|COUNTRY_GAMBIA\|COUNTRY_GEORGIA\|COUNTRY_GERMANY\|COUNTRY_GHANA\|COUNTRY_GIBRALTAR\|COUNTRY_GREECE\|COUNTRY_GREENLAND\|COUNTRY_GRENADA\|COUNTRY_GUADELOUPE\|COUNTRY_GUAM\|COUNTRY_GUATEMALA\|COUNTRY_GUERNSEY\|COUNTRY_GUINEA\|COUNTRY_GUINEABISSAU\|COUNTRY_GUYANA\|COUNTRY_HAITI\|COUNTRY_HOLYSEE\|COUNTRY_HONDURAS\|COUNTRY_HONGKONG\|COUNTRY_HUNGARY\|COUNTRY_ICELAND\|COUNTRY_INDIA\|COUNTRY_INDONESIA\|COUNTRY_IRAN\|COUNTRY_IRAQ\|COUNTRY_IRELAND\|COUNTRY_ISLEOFMAN\|COUNTRY_ISRAEL\|COUNTRY_ITALY\|COUNTRY_IVORYCOAST\|COUNTRY_JAMAICA\|COUNTRY_JAPAN\|COUNTRY_JERSEY\|COUNTRY_JORDAN\|COUNTRY_KAZAKHSTAN\|COUNTRY_KENYA\|COUNTRY_KIRIBATI\|COUNTRY_KUWAIT\|COUNTRY_KYRGYZSTAN\|COUNTRY_LAOS\|COUNTRY_LATVIA\|COUNTRY_LEBANON\|COUNTRY_LESOTHO\|COUNTRY_LIBERIA\|COUNTRY_LIBYA\|COUNTRY_LIECHTENSTEIN\|COUNTRY_LITHUANIA\|COUNTRY_LUXEMBOURG\|COUNTRY_MACAO\|COUNTRY_MACEDONIA\|COUNTRY_MADAGASCAR\|COUNTRY_MALAWI\|COUNTRY_MALAYSIA\|COUNTRY_MALDIVES\|COUNTRY_MALI\|COUNTRY_MALTA\|COUNTRY_MARSHALLISLANDS\|COUNTRY_MARTINIQUE\|COUNTRY_MAURITANIA\|COUNTRY_MAURITIUS\|COUNTRY_MAYOTTE\|COUNTRY_MEXICO\|COUNTRY_MICRONESIA\|COUNTRY_MOLDOVA\|COUNTRY_MONACO\|COUNTRY_MONGOLIA\|COUNTRY_MONTENEGRO\|COUNTRY_MONTSERRAT\|COUNTRY_MOROCCO\|COUNTRY_MOZAMBIQUE\|COUNTRY_MYANMAR\|COUNTRY_NAMIBIA\|COUNTRY_NAURU\|COUNTRY_NEPAL\|COUNTRY_NETHERLANDS\|COUNTRY_NEWCALEDONIA\|COUNTRY_NEWZEALAND\|COUNTRY_NICARAGUA\|COUNTRY_NIGER\|COUNTRY_NIGERIA\|COUNTRY_NIUE\|COUNTRY_NORFOLKISLAND\|COUNTRY_NORTHKOREA\|COUNTRY_NORWAY\|COUNTRY_OMAN\|COUNTRY_PAKISTAN\|COUNTRY_PALAU\|COUNTRY_PALESTINE\|COUNTRY_PANAMA\|COUNTRY_PAPUANEWGUINEA\|COUNTRY_PARAGUAY\|COUNTRY_PERU\|COUNTRY_PHILIPPINES\|COUNTRY_PITCAIRN\|COUNTRY_POLAND\|COUNTRY_PORTUGAL\|COUNTRY_PUERTORICO\|COUNTRY_QATAR\|COUNTRY_REUNION\|COUNTRY_ROMANIA\|COUNTRY_RUSSIA\|COUNTRY_RWANDA\|COUNTRY_SAINTBARTHELEMY\|COUNTRY_SAINTHELENA\|COUNTRY_SAINTKITTSANDNEVIS\|COUNTRY_SAINTLUCIA\|COUNTRY_SAINTVINCENT\|COUNTRY_SAMOA\|COUNTRY_SANMARINO\|COUNTRY_SAOTOMEANDPRINCIPE\|COUNTRY_SAUDIARABIA\|COUNTRY_SENEGAL\|COUNTRY_SERBIA\|COUNTRY_SEYCHELLES\|COUNTRY_SIERRALEONE\|COUNTRY_SINGAPORE\|COUNTRY_SLOVAKIA\|COUNTRY_SLOVENIA\|COUNTRY_SOLOMONISLANDS\|COUNTRY_SOMALIA\|COUNTRY_SOUTHAFRICA\|COUNTRY_SOUTHKOREA\|COUNTRY_SOUTHSUDAN\|COUNTRY_SPAIN\|COUNTRY_SRILANKA\|COUNTRY_SUDAN\|COUNTRY_SURINAME\|COUNTRY_SWAZILAND\|COUNTRY_SWEDEN\|COUNTRY_SWITZERLAND\|COUNTRY_SYRIA\|COUNTRY_TAIWAN\|COUNTRY_TAJIKISTAN\|COUNTRY_TANZANIA\|COUNTRY_THAILAND\|COUNTRY_TIMOR\|COUNTRY_TOGO\|COUNTRY_TONGA\|COUNTRY_TRINIDADANDTOBAGO\|COUNTRY_TUNISIA\|COUNTRY_TURKEY\|COUNTRY_TURKMENISTAN\|COUNTRY_TUVALU\|COUNTRY_UAE\|COUNTRY_UGANDA\|COUNTRY_UK\|COUNTRY_UKRAINE\|COUNTRY_UNKNOWN\|COUNTRY_URUGUAY\|COUNTRY_USA\|COUNTRY_UZBEKISTAN\|COUNTRY_VANUATU\|COUNTRY_VENEZUELA\|COUNTRY_VIETNAM\|COUNTRY_YEMEN\|COUNTRY_ZAMBIA\|COUNTSEPARATE\|CR_DEAD\|CR_RUNNING\|CR_SUSPENDED\|CROSSFADE\|CRUSHBOTTOM\|CRUSHLEFT\|CRUSHRIGHT\|CRUSHTOP\|DAMPED\|DATA_5\|DATA_6\|DATA_7\|DATA_8\|DATEDAY\|DATELOCAL\|DATELOCALNATIVE\|DATEMONTH\|DATETIME\|DATEUTC\|DATEYEAR\|DEFAULTICON\|DEFAULTSPEED\|DEINTERLACE_DEFAULT\|DEINTERLACE_DOUBLE\|DELETEFILE_FAILED\|DELETEFILE_STATUS\|DELETEFILE_UNPROTECT\|DENSITY_HIGH\|DENSITY_LOW\|DENSITY_MEDIUM\|DENSITY_NONE\|DIAGONAL\|DIRECTORY\|DIRMONITOR_ADD\|DIRMONITOR_CHANGE\|DIRMONITOR_REMOVE\|DISPLAY\|DISPMODE_ASK\|DISPMODE_FAKEFULLSCREEN\|DISPMODE_FULLSCREEN\|DISPMODE_FULLSCREENSCALE\|DISPMODE_MODEREQUESTER\|DISPMODE_MODESWITCH\|DISPMODE_SYSTEMSCALE\|DISPMODE_WINDOWED\|DISPSTATE_CLOSED\|DISPSTATE_MINIMIZED\|DISPSTATE_OPEN\|DISSOLVE\|DITHERMODE_FLOYDSTEINBERG\|DITHERMODE_NONE\|DOSTYPE_DIRECTORY\|DOSTYPE_FILE\|DOUBLE\|DOUBLEBUFFER\|DOWNLOADFILE_STATUS\|DTR_OFF\|DTR_ON\|DURATION_LONG\|DURATION_SHORT\|EDGE\|ELLIPSE\|ENCODING_AMIGA\|ENCODING_ISO8859_1\|ENCODING_RAW\|ENCODING_UTF8\|EOF\|ERR_8OR16BITONLY\|ERR_ACCELERATOR\|ERR_ADDAPPICON\|ERR_ADDAPPWIN\|ERR_ADDSYSEVENT\|ERR_ADDTASK\|ERR_ADFFREEDISP\|ERR_ADFWRONGDISP\|ERR_AFILEPROP\|ERR_AHI\|ERR_ALLOCALPHA\|ERR_ALLOCCHANNEL\|ERR_ALLOCCHUNKY\|ERR_ALLOCMASK\|ERR_ALRDYDECLRD\|ERR_ALREADYASYNC\|ERR_ALSAPCM\|ERR_AMIGAGUIDE\|ERR_ANIMDISK\|ERR_ANIMFRAME\|ERR_ANTIALIAS\|ERR_APPLET\|ERR_APPLETVERSION\|ERR_APPLICATION\|ERR_ARGS\|ERR_ARRAYDECLA\|ERR_ASSERTFAILED\|ERR_ATSUI\|ERR_AUDIOCONVERTER\|ERR_BACKFILL\|ERR_BAD8SVX\|ERR_BADBASE64\|ERR_BADBYTECODE\|ERR_BADCALLBACKRET\|ERR_BADCONSTANT\|ERR_BADDIMENSIONS\|ERR_BADENCODING\|ERR_BADINTEGER\|ERR_BADIP\|ERR_BADLAYERTYPE\|ERR_BADPLATFORM\|ERR_BADSIGNATURE\|ERR_BADUPVALUES\|ERR_BADURL\|ERR_BADWAVE\|ERR_BADYIELD\|ERR_BEGINREFRESH\|ERR_BGPICBUTTON\|ERR_BGPICPALETTE\|ERR_BGPICTYPE\|ERR_BITMAP\|ERR_BLKWOENDBLK\|ERR_BRACECLOSE\|ERR_BRACEOPEN\|ERR_BRACKETCLOSE\|ERR_BRACKETOPEN\|ERR_BRUSHLINK\|ERR_BRUSHSIZE\|ERR_BRUSHTYPE\|ERR_CACHEERROR\|ERR_CASECST\|ERR_CHANGEDIR\|ERR_CHANNELRANGE\|ERR_CHRCSTEMPTY\|ERR_CHRCSTLEN\|ERR_CLIPFORMAT\|ERR_CLIPOPEN\|ERR_CLIPREAD\|ERR_CLIPWRITE\|ERR_CLOSEDDISPLAY\|ERR_CLOSEFILE\|ERR_CMDASVAR\|ERR_CMPUNSUPPORTED\|ERR_COLORSPACE\|ERR_COMMENTSTRUCT\|ERR_COMMODITY\|ERR_COMPLEXEXPR\|ERR_COMPLEXPATTERN\|ERR_COMPLEXWHILE\|ERR_CONCAT\|ERR_CONFIG\|ERR_CONFIG2\|ERR_CONITEMS\|ERR_CONSOLEARG\|ERR_CONTEXTMENU\|ERR_COORDSRANGE\|ERR_COREFOUNDATION\|ERR_CORETEXT\|ERR_CREATEDIR\|ERR_CREATEDOCKY\|ERR_CREATEEVENT\|ERR_CREATEGC\|ERR_CREATEICON\|ERR_CREATEMENU\|ERR_CREATEPORT\|ERR_CREATESHORTCUT\|ERR_CSTDOUBLEDEF\|ERR_CTRLSTRUCT\|ERR_CYIELD\|ERR_DATATYPEALPHA\|ERR_DATATYPESAVE\|ERR_DATATYPESAVE2\|ERR_DBLENCODING\|ERR_DBPALETTE\|ERR_DBTRANSWIN\|ERR_DBVIDEOLAYER\|ERR_DDAUTOSCALE\|ERR_DDMOBILE\|ERR_DDRECVIDEO\|ERR_DEADRESUME\|ERR_DEFFONT\|ERR_DELETEFILE\|ERR_DEMO\|ERR_DEMO2\|ERR_DEMO3\|ERR_DEPTHMISMATCH\|ERR_DEPTHRANGE\|ERR_DESERIALIZE\|ERR_DIFFDEPTH\|ERR_DIFFENCODING\|ERR_DINPUT\|ERR_DIRECTSHOW\|ERR_DIRLOCK\|ERR_DISPLAYADAPTERSUPPORT\|ERR_DISPLAYDESKTOP\|ERR_DISPLAYDESKTOPPAL\|ERR_DISPLAYSIZE\|ERR_DISPMINIMIZED\|ERR_DLOPEN\|ERR_DOUBLEDECLA\|ERR_DOUBLEMENU\|ERR_DRAWPATH\|ERR_DSOUNDNOTIFY\|ERR_DSOUNDNOTIPOS\|ERR_DSOUNDPLAY\|ERR_ELSEIFAFTERELSE\|ERR_ELSETWICE\|ERR_ELSEWOIF\|ERR_EMPTYMENUTREE\|ERR_EMPTYOBJ\|ERR_EMPTYPATH\|ERR_EMPTYSCRIPT\|ERR_EMPTYTABLE\|ERR_ENDBLKWOBLK\|ERR_ENDDOUBLEBUFFER\|ERR_ENDFUNCWOFUNC\|ERR_ENDIFWOIF\|ERR_ENDSWCHWOSWCH\|ERR_ENDWITHWOWITH\|ERR_EQUALEXPECTED\|ERR_ERRORCALLED\|ERR_ESCREPLACE\|ERR_EVNTEXPCTED\|ERR_EXAMINE\|ERR_EXECUTE\|ERR_EXETYPE\|ERR_FGRABVIDSTATE\|ERR_FIELDINIT\|ERR_FILEEXIST\|ERR_FILEFORMAT\|ERR_FILENOTFOUND\|ERR_FILESIZE\|ERR_FINDACTIVITY\|ERR_FINDANIM\|ERR_FINDANIMSTREAM\|ERR_FINDAPPLICATION\|ERR_FINDARRAY\|ERR_FINDASYNCDRAW\|ERR_FINDASYNCOBJ\|ERR_FINDBGPIC\|ERR_FINDBRUSH\|ERR_FINDBUTTON\|ERR_FINDCLIENT\|ERR_FINDCLIPREGION\|ERR_FINDCST\|ERR_FINDDIR\|ERR_FINDDISPLAY\|ERR_FINDFILE\|ERR_FINDFONT\|ERR_FINDFONT2\|ERR_FINDICON\|ERR_FINDINTERVAL\|ERR_FINDLAYER\|ERR_FINDLAYERDATA\|ERR_FINDMEMBLK\|ERR_FINDMENU\|ERR_FINDMENUITEM\|ERR_FINDMONITOR\|ERR_FINDMOVE\|ERR_FINDMUSIC\|ERR_FINDOBJECTDATA\|ERR_FINDPALETTE\|ERR_FINDPATH\|ERR_FINDPLUGIN\|ERR_FINDPOINTER\|ERR_FINDPORT\|ERR_FINDSAMPLE\|ERR_FINDSELECTOR\|ERR_FINDSERIAL\|ERR_FINDSERVER\|ERR_FINDSPRITE\|ERR_FINDTEXTOBJECT\|ERR_FINDTIMEOUT\|ERR_FINDTIMER\|ERR_FINDUDPOBJECT\|ERR_FINDVIDEO\|ERR_FIRSTPREPROC\|ERR_FONTFORMAT\|ERR_FONTPATH\|ERR_FONTPATH2\|ERR_FORBIDMODAL\|ERR_FOREVERWOREPEAT\|ERR_FORWONEXT\|ERR_FRAMEGRABBER\|ERR_FREEABGPIC\|ERR_FREEADISPLAY\|ERR_FREECURPOINTER\|ERR_FT2\|ERR_FTPAUTH\|ERR_FTPERROR\|ERR_FULLSCREEN\|ERR_FUNCARGS\|ERR_FUNCDECLA\|ERR_FUNCEXPECTED\|ERR_FUNCJMP\|ERR_FUNCREMOVED\|ERR_FUNCTABLEARG\|ERR_FUNCWOENDFUNC\|ERR_GETDISKOBJ\|ERR_GETIFADDRS\|ERR_GETMONITORINFO\|ERR_GETSHORTCUT\|ERR_GRABSCREEN\|ERR_GROUPNAMEUSED\|ERR_GTK\|ERR_GUIGFX\|ERR_HEXPOINT\|ERR_HOSTNAME\|ERR_HTTPERROR\|ERR_HTTPTE\|ERR_HWBMCLOSEDISP\|ERR_HWBRUSH\|ERR_HWBRUSHFUNC\|ERR_HWDBFREEDISP\|ERR_ICONDIMS\|ERR_ICONENTRY\|ERR_ICONPARMS\|ERR_ICONSIZE\|ERR_ICONSTANDARD\|ERR_ICONVECTOR\|ERR_IFWOENDIF\|ERR_IMAGEERROR\|ERR_INCOMPATBRUSH\|ERR_INISYNTAX\|ERR_INITSERIAL\|ERR_INTERNAL\|ERR_INTERNAL1\|ERR_INTEXPECTED\|ERR_INVALIDDATE\|ERR_INVALIDUTF8\|ERR_INVALIDUTF8ARG\|ERR_INVCAPIDX\|ERR_INVINSERT\|ERR_INVNEXTKEY\|ERR_INVPATCAP\|ERR_INVREPLACE\|ERR_JAVA\|ERR_JAVAMETHOD\|ERR_JOYSTICK\|ERR_KEYFILE\|ERR_KEYNOTFOUND\|ERR_KEYWORD\|ERR_KICKSTART\|ERR_LABELDECLA\|ERR_LABELDOUBLE\|ERR_LABINFOR\|ERR_LABINFUNC\|ERR_LABINIF\|ERR_LABINWHILE\|ERR_LABMAINBLK\|ERR_LAYERRANGE\|ERR_LAYERSOFF\|ERR_LAYERSON\|ERR_LAYERSUPPORT\|ERR_LAYERSUPPORT2\|ERR_LAYERSWITCH\|ERR_LEGACYPTMOD\|ERR_LFSYNTAX\|ERR_LINKFONT\|ERR_LINKPLUGIN\|ERR_LOADFRAME\|ERR_LOADICON\|ERR_LOADPICTURE\|ERR_LOADPICTURE2\|ERR_LOADPLUGIN\|ERR_LOADSOUND\|ERR_LOADVIDEO\|ERR_LOCK\|ERR_LOCK2\|ERR_LOCKBMAP\|ERR_LOCKEDOBJ\|ERR_LOOPRANGE\|ERR_LOWFREQ\|ERR_MAGICKEY\|ERR_MALFORMPAT1\|ERR_MALFORMPAT2\|ERR_MASKNALPHA\|ERR_MAXLINES\|ERR_MAXLOCALS\|ERR_MAXPARAMS\|ERR_MAXUPVALS\|ERR_MEDIAFOUNDATION\|ERR_MEM\|ERR_MEMCODE\|ERR_MEMCST\|ERR_MEMRANGE\|ERR_MENUATTACHED\|ERR_MENUCOMPLEXITY\|ERR_MISSINGBRACKET\|ERR_MISSINGFIELD\|ERR_MISSINGOPBRACK\|ERR_MISSINGPARAMTR\|ERR_MISSINGSEPARTR\|ERR_MIXMUSMOD\|ERR_MOBILE\|ERR_MODIFYAANIM\|ERR_MODIFYABG\|ERR_MODIFYABGPIC\|ERR_MODIFYABR\|ERR_MODIFYPSMP\|ERR_MODIFYSPRITE\|ERR_MODIFYSPRITE2\|ERR_MONITORDIR\|ERR_MONITORFULLSCREEN\|ERR_MONITORRANGE\|ERR_MOVEFILE\|ERR_MSGPORT\|ERR_MULDISMOBILE\|ERR_MULTIBGPIC\|ERR_MULTIDISPLAYS\|ERR_MUSFMTSUPPORT\|ERR_MUSNOTPAUSED\|ERR_MUSNOTPLYNG\|ERR_MUSNOTPLYNG2\|ERR_MUSPAUSED\|ERR_MUSPLAYING\|ERR_NAMETOOLONG\|ERR_NAMEUSED\|ERR_NEEDAPPLICATION\|ERR_NEEDCOMPOSITE\|ERR_NEEDMORPHOS2\|ERR_NEEDOS41\|ERR_NEEDPALETTEIMAGE\|ERR_NEGCOORDS\|ERR_NEWHWPLUGIN\|ERR_NEXTWOFOR\|ERR_NOABSPATH\|ERR_NOACCESS\|ERR_NOALPHA\|ERR_NOANMLAYER\|ERR_NOAPPLET\|ERR_NOARGBVISUAL\|ERR_NOBLOCKBREAK\|ERR_NOCALLBACK\|ERR_NOCHANNEL\|ERR_NOCHAR\|ERR_NOCLIPREG\|ERR_NOCOLON\|ERR_NOCOMMA\|ERR_NOCOMPRESS\|ERR_NOCONSTANTS\|ERR_NOCONTEXTMENU\|ERR_NOCOORDCST\|ERR_NODIRPATTERN\|ERR_NODISLAYERS\|ERR_NODISPMODES\|ERR_NODOUBLEBUFFER\|ERR_NOFALLTHROUGH\|ERR_NOFILTERNAME\|ERR_NOFMBHANDLER\|ERR_NOFUNCTION\|ERR_NOHWFUNC\|ERR_NOJOYATPORT\|ERR_NOKEYWORDS\|ERR_NOLAYERS\|ERR_NOLOOP\|ERR_NOLOOPCONT\|ERR_NOMASKBRUSH\|ERR_NOMENU\|ERR_NOMIMEVIEWER\|ERR_NOMUSICCB\|ERR_NONE\|ERR_NONSUSPENDEDRESUME\|ERR_NOPALETTE\|ERR_NOPALETTEIMAGE\|ERR_NOPALETTEMODE\|ERR_NORETVAL\|ERR_NOREXX\|ERR_NOSPRITES\|ERR_NOTADIR\|ERR_NOTENOUGHPIXELS\|ERR_NOTIGER\|ERR_NOTPROTRACKER\|ERR_NOTRANSPARENCY\|ERR_NOTXTLAYER\|ERR_NUMBEREXPECTED\|ERR_NUMCALLBACK\|ERR_NUMCONCAT\|ERR_NUMEXPECTED\|ERR_NUMSTRCMP\|ERR_NUMTABLEARG\|ERR_OLDAPPLET\|ERR_OPENANIM\|ERR_OPENANIM2\|ERR_OPENAUDIO\|ERR_OPENFONT\|ERR_OPENLIB\|ERR_OPENSERIAL\|ERR_OPENSOCKET\|ERR_OPENSOUND\|ERR_OPENSOUND2\|ERR_OUTOFRANGE\|ERR_PAKFORMAT\|ERR_PALETTEFILL\|ERR_PALETTEMODE\|ERR_PALSCREEN\|ERR_PEERNAME\|ERR_PENRANGE\|ERR_PERCENTFORMAT\|ERR_PERCENTFORMATSTR\|ERR_PIPE\|ERR_PIXELFORMAT\|ERR_PIXELRANGE\|ERR_PLAYERCOMP\|ERR_PLAYVIDEO\|ERR_PLUGINARCH\|ERR_PLUGINDOUBLET\|ERR_PLUGINSUPPORT\|ERR_PLUGINSYMBOL\|ERR_PLUGINTYPE\|ERR_PLUGINVER\|ERR_POINTERFORMAT\|ERR_POINTERIMG\|ERR_PORTNOTAVAIL\|ERR_PREPROCSYM\|ERR_PROTMETATABLE\|ERR_PUBSCREEN\|ERR_QUICKTIME\|ERR_RADIOTOGGLEMENU\|ERR_RANDOMIZE\|ERR_READ\|ERR_READFILE\|ERR_READFUNC\|ERR_READONLY\|ERR_READRANGE\|ERR_READTABLE\|ERR_READVIDEOPIXELS\|ERR_RECVCLOSED\|ERR_RECVTIMEOUT\|ERR_RECVUNKNOWN\|ERR_REGCLASS\|ERR_REGISTRYREAD\|ERR_REGISTRYWRITE\|ERR_REMADLAYER\|ERR_RENAME\|ERR_RENDER\|ERR_RENDERADLAYER\|ERR_RENDERCALLBACK\|ERR_RENDERER\|ERR_REPEATWOUNTIL\|ERR_REQAUTH\|ERR_REQUIREFIELD\|ERR_REQUIREPLUGIN\|ERR_REQUIRETAGFMT\|ERR_RETWOGOSUB\|ERR_REVDWORD\|ERR_REWINDDIR\|ERR_REXXERR\|ERR_SATELLITE\|ERR_SATFREEDISP\|ERR_SAVEANIM\|ERR_SAVEICON\|ERR_SAVEIMAGE\|ERR_SAVEPNG\|ERR_SAVERALPHA\|ERR_SAVESAMPLE\|ERR_SCALEBGPIC\|ERR_SCREEN\|ERR_SCREENMODE\|ERR_SCREENSIZE\|ERR_SCRPIXFMT\|ERR_SEEK\|ERR_SEEKFILE\|ERR_SEEKFORMAT\|ERR_SEEKRANGE\|ERR_SELECTALPHACHANNEL\|ERR_SELECTANIM\|ERR_SELECTBG\|ERR_SELECTBGPIC\|ERR_SELECTBGPIC2\|ERR_SELECTBRUSH\|ERR_SELECTMASK\|ERR_SEMAPHORE\|ERR_SENDDATA\|ERR_SENDMESSAGE\|ERR_SENDTIMEOUT\|ERR_SENDUNKNOWN\|ERR_SERIALIO\|ERR_SERIALIZE\|ERR_SERIALIZETYPE\|ERR_SETADAPTER\|ERR_SETENV\|ERR_SETFILEATTR\|ERR_SETFILECOMMENT\|ERR_SETFILEDATE\|ERR_SETMENU\|ERR_SHORTIF\|ERR_SIGNAL\|ERR_SMODEALPHA\|ERR_SMPRANGE\|ERR_SOCKET\|ERR_SOCKNAME\|ERR_SOCKOPT\|ERR_SORTFUNC\|ERR_SPRITELINK\|ERR_SPRITEONSCREEN\|ERR_SPRITEONSCREEN2\|ERR_SQBRACKETCLOSE\|ERR_SQBRACKETOPEN\|ERR_STACK\|ERR_STAT\|ERR_STRCALLBACK\|ERR_STREAMASSAMPLE\|ERR_STREXPECTED\|ERR_STRINGCST\|ERR_STRINGEXPECTED\|ERR_STRORNUM\|ERR_STRTABLEARG\|ERR_STRTOOSHORT\|ERR_SURFACE\|ERR_SWCHWOENDSWCH\|ERR_SYNTAXERROR\|ERR_SYNTAXLEVELS\|ERR_SYSBUTTON\|ERR_SYSIMAGE\|ERR_SYSTOOOLD\|ERR_TABCALLBACK\|ERR_TABEXPECTED\|ERR_TABEXPECTED2\|ERR_TABEXPECTED3\|ERR_TABLEDECLA\|ERR_TABLEINDEX\|ERR_TABLEORNIL\|ERR_TABLEOVERFLOW\|ERR_TAGEXPECTED\|ERR_TASKSETUP\|ERR_TEXTARG\|ERR_TEXTCONVERT\|ERR_TEXTCONVERT2\|ERR_TEXTSYNTAX\|ERR_TEXTURE\|ERR_TFIMAGE\|ERR_TFVANIM\|ERR_TFVBGPICBRUSH\|ERR_TFVBRUSH\|ERR_TFVBRUSHBGPIC\|ERR_THREAD\|ERR_THREADEXPECTED\|ERR_TIMER\|ERR_TOKENEXPECTED\|ERR_TOOMANYARGS\|ERR_TOOMANYCAPTURES\|ERR_TOOSMALL2\|ERR_TRANSBGMOBILE\|ERR_TRANSBRUSH\|ERR_TRAYICON\|ERR_TRIALCOMPILE\|ERR_TRIALINCLUDE\|ERR_TRIALLIMIT\|ERR_TRIALSAVEVID\|ERR_UDEXPECTED\|ERR_UNBALANCEDPAT\|ERR_UNEXPECTEDEOF\|ERR_UNEXPECTEDSYM\|ERR_UNFINISHEDCAPTURE\|ERR_UNIMPLCMD\|ERR_UNKNOWN\|ERR_UNKNOWNANMOUT\|ERR_UNKNOWNATTR\|ERR_UNKNOWNCMD\|ERR_UNKNOWNCOND\|ERR_UNKNOWNFILTER\|ERR_UNKNOWNICNOUT\|ERR_UNKNOWNIMGOUT\|ERR_UNKNOWNMIMETYPE\|ERR_UNKNOWNMUSFMT\|ERR_UNKNOWNPALETTE\|ERR_UNKNOWNSEC\|ERR_UNKNOWNSEQ\|ERR_UNKNOWNSMPOUT\|ERR_UNKNOWNTAG\|ERR_UNKNUMFMT\|ERR_UNKPROTOCOL\|ERR_UNKTEXTFMT\|ERR_UNMPARENTHESES\|ERR_UNSETENV\|ERR_UNSUPPORTEDFEAT\|ERR_UNTERMINTDSTR\|ERR_UNTILWOREPEAT\|ERR_UPDATEICON\|ERR_UPLOADFORBIDDEN\|ERR_USERABORT\|ERR_VALUEEXPECTED\|ERR_VAREXPECTED\|ERR_VARLENGTH\|ERR_VARSYNTAX\|ERR_VECGFXPLUGIN\|ERR_VECTORANIM\|ERR_VECTORBRUSH\|ERR_VERSION\|ERR_VFONT\|ERR_VFONTTYPE\|ERR_VIDATTACHED\|ERR_VIDEOFRAME\|ERR_VIDEOINIT\|ERR_VIDEOLAYER\|ERR_VIDEOLAYERDRV\|ERR_VIDEOSTRATEGY\|ERR_VIDEOTRANS\|ERR_VIDLAYERFUNC\|ERR_VIDNOTPAUSED\|ERR_VIDNOTPLAYING\|ERR_VIDPAUSED\|ERR_VIDPLAYING\|ERR_VIDRECMULTI\|ERR_VIDRECTRANS\|ERR_VIDSTOPPED\|ERR_VISUALINFO\|ERR_VMMISMATCH\|ERR_WARPOS\|ERR_WENDWOWHILE\|ERR_WHILEWOWEND\|ERR_WINDOW\|ERR_WITHWOENDWITH\|ERR_WRITE\|ERR_WRITEFILE\|ERR_WRITEJPEG\|ERR_WRITEONLY\|ERR_WRONGCLIPREG\|ERR_WRONGCMDRECVIDEO\|ERR_WRONGDTYPE\|ERR_WRONGFLOAT\|ERR_WRONGHEX\|ERR_WRONGID\|ERR_WRONGOP\|ERR_WRONGOPCST\|ERR_WRONGSPRITESIZE\|ERR_WRONGUSAGE\|ERR_WRONGVSTRATEGY\|ERR_XCURSOR\|ERR_XDISPLAY\|ERR_XF86VIDMODEEXT\|ERR_XFIXES\|ERR_YIELD\|ERR_ZERODIVISION\|ERR_ZLIBDATA\|ERR_ZLIBIO\|ERR_ZLIBSTREAM\|ERR_ZLIBVERSION\|EVENTHANDLER\|FADE\|FASTMEMORY\|FASTSPEED\|FILE\|FILEATTR_ARCHIVE\|FILEATTR_DELETE_USR\|FILEATTR_EXECUTE_GRP\|FILEATTR_EXECUTE_OTH\|FILEATTR_EXECUTE_USR\|FILEATTR_HIDDEN\|FILEATTR_NORMAL\|FILEATTR_PURE\|FILEATTR_READ_GRP\|FILEATTR_READ_OTH\|FILEATTR_READ_USR\|FILEATTR_READONLY\|FILEATTR_SCRIPT\|FILEATTR_SYSTEM\|FILEATTR_WRITE_GRP\|FILEATTR_WRITE_OTH\|FILEATTR_WRITE_USR\|FILETYPE_ANIM\|FILETYPE_ICON\|FILETYPE_IMAGE\|FILETYPE_SOUND\|FILETYPE_VIDEO\|FILETYPEFLAGS_ALPHA\|FILETYPEFLAGS_FPS\|FILETYPEFLAGS_QUALITY\|FILETYPEFLAGS_SAVE\|FILLCOLOR\|FILLGRADIENT\|FILLNONE\|FILLRULEEVENODD\|FILLRULEWINDING\|FILLTEXTURE\|FLOAT\|FLOW_HARDWARE\|FLOW_OFF\|FLOW_XON_XOFF\|FONT\|FONTENGINE_INBUILT\|FONTENGINE_NATIVE\|FONTSLANT_ITALIC\|FONTSLANT_OBLIQUE\|FONTSLANT_ROMAN\|FONTTYPE_BITMAP\|FONTTYPE_COLOR\|FONTTYPE_VECTOR\|FONTWEIGHT_BLACK\|FONTWEIGHT_BOLD\|FONTWEIGHT_BOOK\|FONTWEIGHT_DEMIBOLD\|FONTWEIGHT_EXTRABLACK\|FONTWEIGHT_EXTRABOLD\|FONTWEIGHT_EXTRALIGHT\|FONTWEIGHT_HEAVY\|FONTWEIGHT_LIGHT\|FONTWEIGHT_MEDIUM\|FONTWEIGHT_NORMAL\|FONTWEIGHT_REGULAR\|FONTWEIGHT_SEMIBOLD\|FONTWEIGHT_THIN\|FONTWEIGHT_ULTRABLACK\|FONTWEIGHT_ULTRABOLD\|FONTWEIGHT_ULTRALIGHT\|FRAMEMODE_FULL\|FRAMEMODE_SINGLE\|FREESPACE\|FTPASCII\|FTPBINARY\|FUCHSIA\|FUNCTION\|GRAY\|GREEN\|HBLINDS128\|HBLINDS16\|HBLINDS32\|HBLINDS64\|HBLINDS8\|HCLOSECURTAIN\|HCLOSEGATE\|HEXNUMERICAL\|HFLIPCOIN\|HFLOWBOTTOM\|HFLOWTOP\|HIDEBRUSH\|HIDELAYER\|HKEY_CLASSES_ROOT\|HKEY_CURRENT_CONFIG\|HKEY_CURRENT_USER\|HKEY_LOCAL_MACHINE\|HKEY_USERS\|HLINES\|HLINES2\|HLOWFLIPCOIN\|HOLLYWOOD\|HOPENCURTAIN\|HOPENGATE\|HSPLIT\|HSTRANGEPUSH\|HSTRETCHCENTER\|HSTRIPES\|HSTRIPES16\|HSTRIPES2\|HSTRIPES32\|HSTRIPES4\|HSTRIPES64\|HSTRIPES8\|HW_64BIT\|HW_AMIGA\|HW_AMIGAOS3\|HW_AMIGAOS4\|HW_ANDROID\|HW_AROS\|HW_IOS\|HW_LINUX\|HW_LITTLE_ENDIAN\|HW_MACOS\|HW_MORPHOS\|HW_REVISION\|HW_VERSION\|HW_WARPOS\|HW_WINDOWS\|ICNFMT_HOLLYWOOD\|ICON\|IMAGETYPE_RASTER\|IMAGETYPE_VECTOR\|IMGFMT_BMP\|IMGFMT_GIF\|IMGFMT_ILBM\|IMGFMT_JPEG\|IMGFMT_NATIVE\|IMGFMT_PLUGIN\|IMGFMT_PNG\|IMGFMT_TIFF\|IMGFMT_UNKNOWN\|IMMERSIVE_LEANBACK\|IMMERSIVE_NONE\|IMMERSIVE_NORMAL\|IMMERSIVE_STICKY\|INACTIVEWINDOW\|INF\|INSERTBRUSH\|INTEGER\|INTERVAL\|IO_BUFFERED\|IO_FAKE64\|IO_LITTLEENDIAN\|IO_SIGNED\|IO_UNBUFFERED\|IO_UNSIGNED\|IPAUTO\|IPUNKNOWN\|IPV4\|IPV6\|ITALIC\|JOINBEVEL\|JOINMITER\|JOINROUND\|JOYDOWN\|JOYDOWNLEFT\|JOYDOWNRIGHT\|JOYLEFT\|JOYNODIR\|JOYRIGHT\|JOYUP\|JOYUPLEFT\|JOYUPRIGHT\|JUSTIFIED\|KEEPASPRAT\|KEEPPOSITION\|LANGUAGE_ABKHAZIAN\|LANGUAGE_AFAR\|LANGUAGE_AFRIKAANS\|LANGUAGE_AKAN\|LANGUAGE_ALBANIAN\|LANGUAGE_AMHARIC\|LANGUAGE_ARABIC\|LANGUAGE_ARAGONESE\|LANGUAGE_ARMENIAN\|LANGUAGE_ASSAMESE\|LANGUAGE_AVARIC\|LANGUAGE_AVESTAN\|LANGUAGE_AYMARA\|LANGUAGE_AZERBAIJANI\|LANGUAGE_BAMBARA\|LANGUAGE_BASHKIR\|LANGUAGE_BASQUE\|LANGUAGE_BELARUSIAN\|LANGUAGE_BENGALI\|LANGUAGE_BIHARI\|LANGUAGE_BISLAMA\|LANGUAGE_BOSNIAN\|LANGUAGE_BRETON\|LANGUAGE_BULGARIAN\|LANGUAGE_BURMESE\|LANGUAGE_CATALAN\|LANGUAGE_CENTRALKHMER\|LANGUAGE_CHAMORRO\|LANGUAGE_CHECHEN\|LANGUAGE_CHICHEWA\|LANGUAGE_CHINESE\|LANGUAGE_CHURCHSLAVIC\|LANGUAGE_CHUVASH\|LANGUAGE_CORNISH\|LANGUAGE_CORSICAN\|LANGUAGE_CREE\|LANGUAGE_CROATIAN\|LANGUAGE_CZECH\|LANGUAGE_DANISH\|LANGUAGE_DIVEHI\|LANGUAGE_DUTCH\|LANGUAGE_DZONGKHA\|LANGUAGE_ENGLISH\|LANGUAGE_ESPERANTO\|LANGUAGE_ESTONIAN\|LANGUAGE_EWE\|LANGUAGE_FAROESE\|LANGUAGE_FIJIAN\|LANGUAGE_FINNISH\|LANGUAGE_FRENCH\|LANGUAGE_FULAH\|LANGUAGE_GAELIC\|LANGUAGE_GALICIAN\|LANGUAGE_GANDA\|LANGUAGE_GEORGIAN\|LANGUAGE_GERMAN\|LANGUAGE_GREEK\|LANGUAGE_GREENLANDIC\|LANGUAGE_GUARANI\|LANGUAGE_GUJARATI\|LANGUAGE_HAITIAN\|LANGUAGE_HAUSA\|LANGUAGE_HEBREW\|LANGUAGE_HERERO\|LANGUAGE_HINDI\|LANGUAGE_HIRIMOTU\|LANGUAGE_HUNGARIAN\|LANGUAGE_ICELANDIC\|LANGUAGE_IDO\|LANGUAGE_IGBO\|LANGUAGE_INDONESIAN\|LANGUAGE_INTERLINGUA\|LANGUAGE_INTERLINGUE\|LANGUAGE_INUKTITUT\|LANGUAGE_INUPIAQ\|LANGUAGE_IRISH\|LANGUAGE_ITALIAN\|LANGUAGE_JAPANESE\|LANGUAGE_JAVANESE\|LANGUAGE_KANNADA\|LANGUAGE_KANURI\|LANGUAGE_KASHMIRI\|LANGUAGE_KAZAKH\|LANGUAGE_KIKUYU\|LANGUAGE_KINYARWANDA\|LANGUAGE_KIRGHIZ\|LANGUAGE_KOMI\|LANGUAGE_KONGO\|LANGUAGE_KOREAN\|LANGUAGE_KUANYAMA\|LANGUAGE_KURDISH\|LANGUAGE_LAO\|LANGUAGE_LATIN\|LANGUAGE_LATVIAN\|LANGUAGE_LIMBURGAN\|LANGUAGE_LINGALA\|LANGUAGE_LITHUANIAN\|LANGUAGE_LUBAKATANGA\|LANGUAGE_LUXEMBOURGISH\|LANGUAGE_MACEDONIAN\|LANGUAGE_MALAGASY\|LANGUAGE_MALAY\|LANGUAGE_MALAYALAM\|LANGUAGE_MALTESE\|LANGUAGE_MANX\|LANGUAGE_MAORI\|LANGUAGE_MARATHI\|LANGUAGE_MARSHALLESE\|LANGUAGE_MONGOLIAN\|LANGUAGE_NAURU\|LANGUAGE_NAVAJO\|LANGUAGE_NDONGA\|LANGUAGE_NEPALI\|LANGUAGE_NORTHERNSAMI\|LANGUAGE_NORTHNDEBELE\|LANGUAGE_NORWEGIAN\|LANGUAGE_NORWEGIANBOKMAL\|LANGUAGE_NORWEGIANNYNORSK\|LANGUAGE_OCCITAN\|LANGUAGE_OJIBWA\|LANGUAGE_ORIYA\|LANGUAGE_OROMO\|LANGUAGE_OSSETIAN\|LANGUAGE_PALI\|LANGUAGE_PANJABI\|LANGUAGE_PASHTO\|LANGUAGE_PERSIAN\|LANGUAGE_POLISH\|LANGUAGE_PORTUGUESE\|LANGUAGE_QUECHUA\|LANGUAGE_ROMANIAN\|LANGUAGE_ROMANSH\|LANGUAGE_RUNDI\|LANGUAGE_RUSSIAN\|LANGUAGE_SAMOAN\|LANGUAGE_SANGO\|LANGUAGE_SANSKRIT\|LANGUAGE_SARDINIAN\|LANGUAGE_SERBIAN\|LANGUAGE_SHONA\|LANGUAGE_SICHUANYI\|LANGUAGE_SINDHI\|LANGUAGE_SINHALA\|LANGUAGE_SLOVAK\|LANGUAGE_SLOVENIAN\|LANGUAGE_SOMALI\|LANGUAGE_SOUTHERNSOTHO\|LANGUAGE_SOUTHNDEBELE\|LANGUAGE_SPANISH\|LANGUAGE_SUNDANESE\|LANGUAGE_SWAHILI\|LANGUAGE_SWATI\|LANGUAGE_SWEDISH\|LANGUAGE_TAGALOG\|LANGUAGE_TAHITIAN\|LANGUAGE_TAJIK\|LANGUAGE_TAMIL\|LANGUAGE_TATAR\|LANGUAGE_TELUGU\|LANGUAGE_THAI\|LANGUAGE_TIBETAN\|LANGUAGE_TIGRINYA\|LANGUAGE_TONGA\|LANGUAGE_TSONGA\|LANGUAGE_TSWANA\|LANGUAGE_TURKISH\|LANGUAGE_TURKMEN\|LANGUAGE_TWI\|LANGUAGE_UIGHUR\|LANGUAGE_UKRAINIAN\|LANGUAGE_UNKNOWN\|LANGUAGE_URDU\|LANGUAGE_UZBEK\|LANGUAGE_VENDA\|LANGUAGE_VIETNAMESE\|LANGUAGE_WALLOON\|LANGUAGE_WELSH\|LANGUAGE_WESTERNFRISIAN\|LANGUAGE_WOLOF\|LANGUAGE_XHOSA\|LANGUAGE_YIDDISH\|LANGUAGE_YORUBA\|LANGUAGE_ZHUANG\|LANGUAGE_ZULU\|LAYER\|LAYER_VS_BOX\|LAYERBUTTON\|LEFT\|LEFTOUT\|LIGHTUSERDATA\|LIME\|LINE\|LINEAR\|LITTLEENDIAN\|LONG\|LOWERCURVE\|MAROON\|MASK\|MASKAND\|MASKINVISIBLE\|MASKOR\|MASKVANILLACOPY\|MASKVISIBLE\|MASKXOR\|MEMORY\|MENU\|MENUITEM_DISABLED\|MENUITEM_RADIO\|MENUITEM_SELECTED\|MENUITEM_TOGGLE\|MILLISECONDS\|MODE_READ\|MODE_READWRITE\|MODE_WRITE\|MODLALT\|MODLCOMMAND\|MODLCONTROL\|MODLSHIFT\|MODRALT\|MODRCOMMAND\|MODRCONTROL\|MODRSHIFT\|MONO16\|MONO8\|MONOSPACE\|MOVEFILE_COPY\|MOVEFILE_COPYFAILED\|MOVEFILE_DELETE\|MOVEFILE_DELETEFAILED\|MOVEFILE_UNPROTECT\|MOVELIST\|MOVEWINDOW\|MUSIC\|NAN\|NATIVE\|NATIVEENDIAN\|NAVY\|NETWORKCONNECTION\|NETWORKSERVER\|NETWORKUDP\|NEXTFRAME\|NEXTFRAME2\|NIL\|NOCOLOR\|NONE\|NOPEN\|NORMAL\|NORMALSPEED\|NOTRANSPARENCY\|NUMBER\|NUMERICAL\|OLIVE\|ONBUTTONCLICK\|ONBUTTONCLICKALL\|ONBUTTONOVER\|ONBUTTONOVERALL\|ONBUTTONRIGHTCLICK\|ONBUTTONRIGHTCLICKALL\|ONKEYDOWN\|ONKEYDOWNALL\|ORIENTATION_LANDSCAPE\|ORIENTATION_LANDSCAPEREV\|ORIENTATION_NONE\|ORIENTATION_PORTRAIT\|ORIENTATION_PORTRAITREV\|PALETTE\|PALETTE_AGA\|PALETTE_CGA\|PALETTE_DEFAULT\|PALETTE_EGA\|PALETTE_GRAY128\|PALETTE_GRAY16\|PALETTE_GRAY256\|PALETTE_GRAY32\|PALETTE_GRAY4\|PALETTE_GRAY64\|PALETTE_GRAY8\|PALETTE_MACINTOSH\|PALETTE_MONOCHROME\|PALETTE_OCS\|PALETTE_WINDOWS\|PALETTE_WORKBENCH\|PALETTEMODE_PEN\|PALETTEMODE_REMAP\|PARITY_EVEN\|PARITY_NONE\|PARITY_ODD\|PERMREQ_READEXTERNAL\|PERMREQ_WRITEEXTERNAL\|PI\|PIXELZOOM1\|PIXELZOOM2\|PLOT\|PLUGINCAPS_ANIM\|PLUGINCAPS_AUDIOADAPTER\|PLUGINCAPS_CONVERT\|PLUGINCAPS_DIRADAPTER\|PLUGINCAPS_DISPLAYADAPTER\|PLUGINCAPS_EXTENSION\|PLUGINCAPS_FILEADAPTER\|PLUGINCAPS_ICON\|PLUGINCAPS_IMAGE\|PLUGINCAPS_IPCADAPTER\|PLUGINCAPS_LIBRARY\|PLUGINCAPS_NETWORKADAPTER\|PLUGINCAPS_REQUESTERADAPTER\|PLUGINCAPS_REQUIRE\|PLUGINCAPS_SAVEANIM\|PLUGINCAPS_SAVEICON\|PLUGINCAPS_SAVEIMAGE\|PLUGINCAPS_SAVESAMPLE\|PLUGINCAPS_SERIALIZE\|PLUGINCAPS_SOUND\|PLUGINCAPS_TIMERADAPTER\|PLUGINCAPS_VECTOR\|PLUGINCAPS_VIDEO\|POINTER\|POLYGON\|PRGTYPE_APPLET\|PRGTYPE_PROGRAM\|PRGTYPE_SCRIPT\|PRINT\|PURPLE\|PUSHBOTTOM\|PUSHLEFT\|PUSHRIGHT\|PUSHTOP\|PUZZLE\|QUADRECT\|QUARTERS\|RADIAL\|RANDOMEFFECT\|RANDOMPARAMETER\|RECEIVEALL\|RECEIVEBYTES\|RECEIVEDATA_PACKET\|RECEIVELINE\|RECTBACKCENTER\|RECTBACKEAST\|RECTBACKNORTH\|RECTBACKNORTHEAST\|RECTBACKNORTHWEST\|RECTBACKSOUTH\|RECTBACKSOUTHEAST\|RECTBACKSOUTHWEST\|RECTBACKWEST\|RECTCENTER\|RECTEAST\|RECTNORTH\|RECTNORTHEAST\|RECTNORTHWEST\|RECTSOUTH\|RECTSOUTHEAST\|RECTSOUTHWEST\|RECTWEST\|RED\|REMOVELAYER\|REQ_CAMERA\|REQ_GALLERY\|REQ_HIDEICONS\|REQ_MULTISELECT\|REQ_NORMAL\|REQ_SAVEMODE\|REQICON_ERROR\|REQICON_INFORMATION\|REQICON_NONE\|REQICON_QUESTION\|REQICON_WARNING\|REVEALBOTTOM\|REVEALLEFT\|REVEALRIGHT\|REVEALTOP\|RIGHT\|RIGHTOUT\|ROLLLEFT\|ROLLTOP\|RTS_OFF\|RTS_ON\|SAMPLE\|SANS\|SCALEMODE_AUTO\|SCALEMODE_LAYER\|SCALEMODE_NONE\|SCROLLBOTTOM\|SCROLLEAST\|SCROLLLEFT\|SCROLLNORTH\|SCROLLNORTHEAST\|SCROLLNORTHWEST\|SCROLLRIGHT\|SCROLLSOUTH\|SCROLLSOUTHEAST\|SCROLLSOUTHWEST\|SCROLLTOP\|SCROLLWEST\|SECONDS\|SEEK_BEGINNING\|SEEK_CURRENT\|SEEK_END\|SELMODE_COMBO\|SELMODE_LAYERS\|SELMODE_NORMAL\|SERIAL\|SERIF\|SERVER\|SHADOW\|SHAPE\|SHDWEAST\|SHDWNORTH\|SHDWNORTHEAST\|SHDWNORTHWEST\|SHDWSOUTH\|SHDWSOUTHEAST\|SHDWSOUTHWEST\|SHDWWEST\|SHORT\|SILVER\|SIMPLEBUTTON\|SINE\|SIZEWINDOW\|SLIDEBOTTOM\|SLIDELEFT\|SLIDERIGHT\|SLIDETOP\|SLOWSPEED\|SMOOTHOUT\|SMPFMT_WAVE\|SNAPDESKTOP\|SNAPDISPLAY\|SNAPWINDOW\|SPIRAL\|SPRITE\|SPRITE_VS_BOX\|SPRITE_VS_BRUSH\|STAR\|STDERR\|STDIN\|STDOUT\|STDPTR_BUSY\|STDPTR_CUSTOM\|STDPTR_SYSTEM\|STEREO16\|STEREO8\|STOP_1\|STOP_2\|STRETCHBOTTOM\|STRETCHLEFT\|STRETCHRIGHT\|STRETCHTOP\|STRING\|STRUDEL\|SUN\|SWISS\|TABLE\|TEAL\|TEXTOBJECT\|TEXTOUT\|THREAD\|TICKS\|TIMEOUT\|TIMER\|TOP\|TOPOUT\|TRUETYPE_DEFAULT\|TURNDOWNBOTTOM\|TURNDOWNLEFT\|TURNDOWNRIGHT\|TURNDOWNTOP\|UDPCLIENT\|UDPNONE\|UDPOBJECT\|UDPSERVER\|UNDERLINED\|UNDO\|UPLOADFILE_RESPONSE\|UPLOADFILE_STATUS\|UPNDOWN\|UPPERCURVE\|USEDSPACE\|USELAYERPOSITION\|USERDATA\|VANILLACOPY\|VBLINDS128\|VBLINDS16\|VBLINDS32\|VBLINDS64\|VBLINDS8\|VCLOSECURTAIN\|VCLOSEGATE\|VECTORPATH\|VFLIPCOIN\|VFLOWLEFT\|VFLOWRIGHT\|VIDDRV_HOLLYWOOD\|VIDDRV_OS\|VIDEO\|VIEWMODE_DATE\|VIEWMODE_ICONS\|VIEWMODE_NAME\|VIEWMODE_NONE\|VIEWMODE_SIZE\|VIEWMODE_TYPE\|VLINES\|VLINES2\|VLOWFLIPCOIN\|VOID\|VOPENCURTAIN\|VOPENGATE\|VSPLIT\|VSTRANGEPUSH\|VSTRETCHCENTER\|VSTRIPES\|VSTRIPES16\|VSTRIPES2\|VSTRIPES32\|VSTRIPES4\|VSTRIPES64\|VSTRIPES8\|WALLPAPERLEFT\|WALLPAPERTOP\|WATER1\|WATER2\|WATER3\|WATER4\|WHITE\|WORD\|YELLOW\|ZOOMCENTER\|ZOOMEAST\|ZOOMIN\|ZOOMNORTH\|ZOOMNORTHEAST\|ZOOMNORTHWEST\|ZOOMOUT\|ZOOMSOUTH\|ZOOMSOUTHEAST\|ZOOMSOUTHWEST\|ZOOMWEST\)\>"
 " Hollywood Functions
-syn keyword hwFunction LowerStr UpperStr Val StrStr UnrightStr UnleftStr Chr MidStr RightStr LeftStr FindStr AddStr HexStr Asc StrLen ReplaceStr BinStr SplitStr PadNum StrToArray TrimStr ToString ToNumber UnmidStr CountStr InsertStr RepeatStr MD5Str CRC32Str FormatStr PatternFindStr PatternReplaceStr Eval PatternFindStrDirect PatternFindStrShort ArrayToStr Base64Str ToUserData ByteOffset CharOffset CharWidth ValidateStr ConvertStr ReverseStr ByteLen IsAlNum IsAlpha IsCntrl IsDigit IsGraph IsLower IsPrint IsPunct IsSpace IsUpper IsXDigit CompareStr ByteAsc ByteChr StartsWith EndsWith StripStr EmptyStr ByteVal ByteStrStr Abs Sin Cos Tan ASin ACos ATan ATan2 Ceil Floor Mod FrExp LdExp Sqrt Min Max Log Ld Ln Exp Deg Pow Rad Rnd RndF Add Sub Div Mul Round Int Frac Shr Shl Rt Wrap Limit BitSet BitTest BitClear BitXor BitComplement Sgn Sar Ror Rol Cast Hypot EndianSwap RndStrong Red Green Blue RGB ARGB MovePointer HidePointer SetPointer ShowPointer GetAttribute GetPen VWait SetFPSLimit GetFPSLimit IsPicture GetRealColor SaveSnapshot MixRGB CreateClipRegion SetClipRegion FreeClipRegion CreatePointer FreePointer AsyncDrawFrame CancelAsyncDraw FinishAsyncDraw DumpVideoTime GetRandomColor SetDrawTagsDefault BeginRefresh EndRefresh Intersection Box Plot Ellipse Line Circle Polygon SetFillStyle ReadPixel Cls Arc SetFormStyle SetLineWidth GetFillStyle GetFormStyle GetLineWidth MoveBrush MoveAnim MoveTextObject MoveLayer MoveSprite OpenFile Eof ReadChr ReadLine ReadString Seek WriteChr WriteLine WriteString Exists FileSize PathPart FilePart MakeDirectory GetVolumeInfo DeleteFile Execute Run ChangeDirectory GetVolumeName CloseFile ReadDirectory FullPath CopyFile Rename IsDirectory CRC32 WriteShort WriteInt WriteFloat ReadShort ReadInt ReadFloat FilePos MatchPattern FlushFile SetIOMode GetFileAttributes SetFileAttributes GetTempFileName FileLength CompressFile DecompressFile OpenDirectory CloseDirectory NextDirectoryEntry WriteFunction ReadFunction DefineVirtualFile ReadTable WriteTable GetCurrentDirectory ApplyPatch DefineVirtualFileFromString UndefineVirtualStringFile FileToString StringToFile GetEnv SetEnv UnsetEnv MD5 FileLines FileAttributes GetAsset ReadByte WriteByte ReadBytes WriteBytes DirectoryItems MoveFile UseCarriageReturn HaveVolume GetDirectoryEntry RewindDirectory CountDirectoryEntries MonitorDirectory WaitLeftMouse WaitRightMouse WaitKeyDown IsKeyDown WhileRightMouseDown WhileMouseDown WhileKeyDown IsLeftMouse IsRightMouse BreakWhileMouseOn SetEventTimeout GetEventCode LeftMouseQuit EscapeQuit CtrlCQuit EnableEvent DisableEvent RemoveButton RemoveKeyDown ModifyButton ModifyKeyDown WhileMouseOn CreateButton CreateKeyDown FreeEventCache ClearEvents CheckEvent WaitEvent MouseX MouseY MakeButton DeleteButton DisableButton EnableButton InstallEventHandler SetInterval SetTimeout ClearInterval ClearTimeout ChangeInterval DumpButtons WaitMidMouse IsMidMouse ResetKeyStates JoyDir JoyFire CountJoysticks BreakEventHandler CheckEvents CreatePort SendMessage ShowKeyboard HideKeyboard Wait OpenCatalog CloseCatalog GetCatalogString GetDate GetTime GetWeekday GetDateNum GetTimer PauseTimer ResumeTimer StartTimer StopTimer SystemRequest GetMemoryInfo End GetErrorName Sort DebugStr DebugVal DebugPrint ExitOnError GetLastError DebugOutput GetType IIf InsertItem RemoveItem ListItems StringRequest Unpack SetMetaTable GetMetaTable RawEqual RawGet RawSet GCInfo CollectGarbage Error WaitTimer FileRequest PathRequest IPairs Pairs NextItem GetVersion GetCommandLine GetProgramInfo ResetTimer GetConstant SetClipboard GetClipboard PeekClipboard ClearClipboard CompareDates OpenURL CopyTable FontRequest ListRequest ColorRequest GetSystemLanguage GetSystemCountry DebugPrompt GetFileArgument Assert ForEach ForEachI Concat GetObjectType GetObjectData SetObjectData ClearObjectData CopyObjectData HaveObjectData GetObjects RaiseOnError HaveObject GetPlugins IsNil HaveItem DisablePlugin EnablePlugin LoadPlugin HavePlugin GetSystemInfo LegacyControl DisableLineHook EnableLineHook IncreasePointer DecreasePointer GetApplicationInfo DebugPrintNR TableItems IsTableEmpty LoadPrefs SavePrefs DeletePrefs IsUnicode GetTimestamp GetCountryInfo GetLanguageInfo GetTimeZone TimestampToDate DateToTimestamp ParseDate MakeDate DateToUTC UTCToDate ValidateDate Pack ConsolePrint ConsolePrintNR ConsolePrompt Beep ShowNotification GetIconProperties SetIconProperties SetWBIcon OpenAmigaGuide CloseAmigaGuide ShowRinghioMessage GetApplicationList SendApplicationMessage ChangeApplicationIcon ReadRegistryKey WriteRegistryKey CreateShortcut SetTrayIcon GetShortcutPath ShowToast PerformSelector OpenResourceMonitor CloseResourceMonitor ImageRequest PermissionRequest Vibrate CallJavaMethod Undo EnableLayers DisableLayers SwapLayers InsertLayer ShowLayer HideLayer RemoveLayer SetLayerTransparency SetLayerLight SetLayerTint AddMove ClearMove DoMove FreeLayers NextFrame SetLayerName Collision DumpLayers ScaleLayer RotateLayer SetLayerStyle GetLayerStyle TransformLayer SetLayerAnchor LayerExists SetLayerZPos TranslateLayer SelectLayer CreateLayer ModifyLayerFrames GetLayerAtPos SetLayerShadow SetLayerFilter SetLayerBorder LayerToFront LayerToBack PlayLayer StopLayer PauseLayer ResumeLayer SeekLayer SetLayerVolume RemoveLayers SetFont SetFontColor TextHeight TextWidth ResetTabs AddTab Locate SetMargins SetFontStyle Print NPrint TextOut CreateTextObject DisplayTextObject FreeTextObject InKeyStr TextExtent ScaleTextObject CopyTextObject RotateTextObject OpenFont CloseFont UseFont GetAvailableFonts FreeGlyphCache SetDefaultEncoding AddFontPath GetKerningPair GetDefaultEncoding GetFontColor GetFontStyle PlayAnim FreeAnim ScaleAnim PlayAnimDisk LoadAnimFrame LoadAnim IsAnim CreateAnim CopyAnim GetAnimFrame DisplayAnimFrame ModifyAnimFrames SelectAnim SaveAnim BeginAnimStream WriteAnimFrame FinishAnimStream SetAnimFrameDelay ChangeDisplaySize SetTitle MoveDisplay HideDisplay ShowDisplay SetDisplayAttributes CreateDisplay FreeDisplay OpenDisplay CloseDisplay SelectDisplay ActivateDisplay ChangeDisplayMode GetDisplayModes GetMonitors CreateMenu FreeMenu SelectMenuItem DeselectMenuItem IsMenuItemSelected DisableMenuItem EnableMenuItem IsMenuItemDisabled GetPubScreens ShowScreen HideScreen SetScreenTitle GetFrontScreen SetSubtitle FreeSample LoadSample IsSound GetPatternPosition GetSongPosition PlaySubsong WaitPatternPosition WaitSongPosition WaitSampleEnd IsSamplePlaying SetVolume SetPitch SetPanning StopSample PlaySample SetMasterVolume IsSample CreateSample OpenMusic CloseMusic PlayMusic StopMusic PauseMusic ResumeMusic SeekMusic SetMusicVolume IsMusic IsMusicPlaying PlayModule StopModule PauseModule ResumeModule LoadModule FreeModule IsModule SaveSample GetSampleData CreateMusic FillMusicBuffer MixSample CopySample InsertSample FlushMusicBuffer IsChannelPlaying HaveFreeChannel StopChannel GetChannels SetChannelVolume OpenAudio CloseAudio ForceSound CreateBrush DisplayBrush DisplayBrushPart ScaleBrush FreeBrush TintBrush ReplaceColors InvertBrush FlipBrush MixBrush BrushToGray RotateBrush GetBrushLink SelectBrush CopyBrush SetBrushTransparency LoadBrush SelectMask SetMaskMode SaveBrush SelectAlphaChannel SetAlphaIntensity DeleteAlphaChannel CropBrush InvertMask InvertAlphaChannel FloodFill DeleteMask BeginDoubleBuffer EndDoubleBuffer Flip ConvertToBrush GrabDesktop TransformBrush TrimBrush RasterizeBrush BlurBrush EmbossBrush EdgeBrush SharpenBrush SolarizeBrush GammaBrush ContrastBrush ModulateBrush SepiaToneBrush CharcoalBrush SwirlBrush PixelateBrush BrushToMonochrome ChangeBrushTransparency CreateShadowBrush CreateBorderBrush WaterRippleBrush OilPaintBrush BrushToRGBArray RGBArrayToBrush PerspectiveDistortBrush ArcDistortBrush PolarDistortBrush BarrelDistortBrush CreateGradientBrush CreateTexturedBrush ReadBrushPixel WriteBrushPixel QuantizeBrush ReduceAlphaChannel IsBrushEmpty DisplayBGPic DisplayBGPicPart ScaleBGPic CreateGradientBGPic CreateRainbowBGPic CreateTexturedBGPic BrushToBGPic BGPicToBrush CreateBGPic FreeBGPic LoadBGPic SelectBGPic EndSelect CopyBGPic DisplayBrushFX DisplayTextObjectFX DisplayTransitionFX DisplayBGPicPartFX UndoFX ShowLayerFX HideLayerFX RemoveLayerFX GetRandomFX ClearScreen CreateSprite DisplaySprite RemoveSprite FreeSprite LoadSprite ScaleSprite CopySprite FlipSprite RemoveSprites SetSpriteZPos AllocMem FreeMem Poke Peek FillMem CopyMem ReadMem WriteMem DumpMem MemToTable TableToMem GetMemPointer GetMemString AllocMemFromPointer AllocMemFromVirtualFile MoveTo LineTo CurveTo RelMoveTo RelLineTo RelCurveTo DrawPath StartPath StartSubPath ClosePath AddArcToPath AddCircleToPath AddEllipseToPath AddBoxToPath SetLineJoin SetLineCap SetDash SetFillRule FreePath ClearPath IsPathEmpty GetCurrentPoint GetPathExtents CopyPath AppendPath AddTextToPath TranslatePath NormalizePath ForcePathUse SetVectorEngine PathItems PathToBrush GetFillRule GetLineJoin GetLineCap GetDash SetMiterLimit GetMiterLimit CreateIcon FreeIcon LoadIcon SaveIcon AddIconImage RemoveIconImage SetStandardIconImage OpenSerialPort CloseSerialPort ReadSerialData WriteSerialData FlushSerialPort SetBaudRate SetStopBits SetDataBits SetParity SetFlowControl SetDTR SetRTS GetBaudRate GetStopBits GetDataBits GetParity GetFlowControl GetDTR GetRTS PollSerialQueue ClearSerialQueue OpenConnection CloseConnection CreateServer CloseServer SendData ReceiveData GetConnectionIP GetConnectionPort GetHostName ToIP ToHostName DownloadFile UploadFile SetNetworkTimeout GetLocalIP GetLocalPort CreateUDPObject CloseUDPObject SendUDPData ReceiveUDPData IsOnline GetMACAddress GetConnectionProtocol GetLocalProtocol SetNetworkProtocol ResolveHostName OpenVideo CloseVideo PlayVideo StopVideo PauseVideo ResumeVideo SeekVideo IsVideo SetVideoSize SetVideoPosition SetVideoVolume GetVideoFrame IsVideoPlaying ForceVideoMode ForceVideoDriver DumpVideo DisplayVideoFrame SendRexxCommand RunRexxScript CreateRexxPort
+syn keyword hwFunction ACos ARGB ASin ATan ATan2 Abs ActivateDisplay Add AddArcToPath AddBoxToPath AddCircleToPath AddEllipseToPath AddFontPath AddIconImage AddMove AddStr AddTab AddTextToPath AllocMem AllocMemFromPointer AllocMemFromVirtualFile AppendPath ApplyPatch Arc ArcDistortBrush ArrayToStr Asc Assert AsyncDrawFrame BGPicToBrush BarrelDistortBrush Base64Str Beep BeginAnimStream BeginDoubleBuffer BeginRefresh BinStr BitClear BitComplement BitSet BitTest BitXor Blue BlurBrush Box BreakEventHandler BreakWhileMouseOn BrushToBGPic BrushToGray BrushToMonochrome BrushToPenArray BrushToRGBArray ByteAsc ByteChr ByteLen ByteOffset ByteStrStr ByteVal CRC32 CRC32Str CallJavaMethod CancelAsyncDraw CancelAsyncOperation CanonizePath Cast Ceil ChangeApplicationIcon ChangeBrushTransparency ChangeDirectory ChangeDisplayMode ChangeDisplaySize ChangeInterval CharOffset CharWidth CharcoalBrush CheckEvent CheckEvents Chr Circle ClearClipboard ClearEvents ClearInterval ClearMove ClearObjectData ClearPath ClearScreen ClearSerialQueue ClearTimeout CloseAmigaGuide CloseAnim CloseAudio CloseCatalog CloseConnection CloseDirectory CloseDisplay CloseFile CloseFont CloseMusic ClosePath CloseResourceMonitor CloseSerialPort CloseServer CloseUDPObject CloseVideo Cls CollectGarbage Collision ColorRequest CompareDates CompareStr CompressFile Concat ConsolePrint ConsolePrintNR ConsolePrompt ContinueAsyncOperation ContrastBrush ContrastPalette ConvertStr ConvertToBrush CopyAnim CopyBGPic CopyBrush CopyFile CopyMem CopyObjectData CopyPalette CopyPath CopyPens CopySample CopySprite CopyTable CopyTextObject Cos CountDirectoryEntries CountJoysticks CountStr CreateAnim CreateBGPic CreateBorderBrush CreateBrush CreateButton CreateClipRegion CreateCoroutine CreateDisplay CreateGradientBGPic CreateGradientBrush CreateIcon CreateKeyDown CreateLayer CreateList CreateMenu CreateMusic CreatePalette CreatePointer CreatePort CreateRainbowBGPic CreateRexxPort CreateSample CreateServer CreateShadowBrush CreateShortcut CreateSprite CreateTextObject CreateTexturedBGPic CreateTexturedBrush CreateUDPObject CropBrush CtrlCQuit CurveTo CyclePalette DateToTimestamp DateToUTC DebugOutput DebugPrint DebugPrintNR DebugPrompt DebugStr DebugVal DecompressFile DecreasePointer DefineVirtualFile DefineVirtualFileFromString Deg DeleteAlphaChannel DeleteButton DeleteFile DeleteMask DeletePrefs DeselectMenuItem DeserializeTable DirectoryItems DisableButton DisableEvent DisableLayers DisableLineHook DisableMenuItem DisablePlugin DisableVWait DisplayAnimFrame DisplayBGPic DisplayBGPicPart DisplayBGPicPartFX DisplayBrush DisplayBrushFX DisplayBrushPart DisplaySprite DisplayTextObject DisplayTextObjectFX DisplayTransitionFX DisplayVideoFrame Div DoMove DownloadFile DrawPath DumpButtons DumpLayers DumpMem DumpVideo DumpVideoTime EdgeBrush Ellipse EmbossBrush EmptyStr EnableButton EnableEvent EnableLayers EnableLineHook EnableMenuItem EnablePlugin EnableVWait End EndDoubleBuffer EndRefresh EndSelect EndianSwap EndsWith Eof Error EscapeQuit Eval Execute Exists ExitOnError Exp ExtractPalette FileAttributes FileLength FileLines FilePart FilePos FileRequest FileSize FileToString FillMem FillMusicBuffer FindStr FinishAnimStream FinishAsyncDraw Flip FlipBrush FlipSprite FloodFill Floor FlushFile FlushMusicBuffer FlushSerialPort FontRequest ForEach ForEachI ForcePathUse ForceSound ForceVideoDriver ForceVideoMode FormatStr FrExp Frac FreeAnim FreeBGPic FreeBrush FreeClipRegion FreeDisplay FreeEventCache FreeGlyphCache FreeIcon FreeLayers FreeMem FreeMenu FreeModule FreePalette FreePath FreePointer FreeSample FreeSprite FreeTextObject FullPath GCInfo GammaBrush GammaPalette GetAnimFrame GetApplicationInfo GetApplicationList GetAsset GetAttribute GetAvailableFonts GetBaudRate GetBestPen GetBrushLink GetBrushPen GetBulletColor GetCatalogString GetChannels GetCharMaps GetClipboard GetCommandLine GetConnectionIP GetConnectionPort GetConnectionProtocol GetConstant GetCoroutineStatus GetCountryInfo GetCurrentDirectory GetCurrentPoint GetDTR GetDash GetDataBits GetDate GetDateNum GetDefaultEncoding GetDirectoryEntry GetDisplayModes GetEnv GetErrorName GetEventCode GetFPSLimit GetFileArgument GetFileAttributes GetFillRule GetFillStyle GetFlowControl GetFontColor GetFontStyle GetFormStyle GetFrontScreen GetHostName GetIconProperties GetItem GetKerningPair GetLanguageInfo GetLastError GetLayerAtPos GetLayerPen GetLayerStyle GetLineCap GetLineJoin GetLineWidth GetLocalIP GetLocalInterfaces GetLocalPort GetLocalProtocol GetMACAddress GetMemPointer GetMemString GetMemoryInfo GetMetaTable GetMiterLimit GetMonitors GetObjectData GetObjectType GetObjects GetPalettePen GetParity GetPathExtents GetPatternPosition GetPen GetPlugins GetProgramDirectory GetProgramInfo GetPubScreens GetRTS GetRandomColor GetRandomFX GetRealColor GetSampleData GetShortcutPath GetSongPosition GetStartDirectory GetStopBits GetSystemCountry GetSystemInfo GetSystemLanguage GetTempFileName GetTime GetTimeZone GetTimer GetTimestamp GetType GetVersion GetVideoFrame GetVolumeInfo GetVolumeName GetWeekday GrabDesktop Green HaveFreeChannel HaveItem HaveObject HaveObjectData HavePlugin HaveVolume HexStr HideDisplay HideKeyboard HideLayer HideLayerFX HidePointer HideScreen Hypot IIf IPairs IgnoreCase ImageRequest InKeyStr IncreasePointer InsertItem InsertLayer InsertSample InsertStr InstallEventHandler Int Intersection InvertAlphaChannel InvertBrush InvertMask InvertPalette IsAbsolutePath IsAlNum IsAlpha IsAnim IsBrushEmpty IsChannelPlaying IsCntrl IsDigit IsDirectory IsFinite IsGraph IsInf IsKeyDown IsLeftMouse IsLower IsMenuItemDisabled IsMenuItemSelected IsMidMouse IsModule IsMusic IsMusicPlaying IsNan IsNil IsOnline IsPathEmpty IsPicture IsPrint IsPunct IsRightMouse IsSample IsSamplePlaying IsSound IsSpace IsTableEmpty IsUnicode IsUpper IsVideo IsVideoPlaying IsXDigit JoyDir JoyFire LayerExists LayerToBack LayerToFront Ld LdExp LeftMouseQuit LeftStr LegacyControl Limit Line LineTo ListItems ListRequest Ln LoadAnim LoadAnimFrame LoadBGPic LoadBrush LoadIcon LoadModule LoadPalette LoadPlugin LoadPrefs LoadSample LoadSprite Locate Log LowerStr MD5 MD5Str MakeButton MakeDate MakeDirectory MakeHostPath MatchPattern Max MemToTable MidStr Min MixBrush MixRGB MixSample Mod ModifyAnimFrames ModifyButton ModifyKeyDown ModifyLayerFrames ModulateBrush ModulatePalette MonitorDirectory MouseX MouseY MoveAnim MoveBrush MoveDisplay MoveFile MoveLayer MovePointer MoveSprite MoveTextObject MoveTo Mul NPrint NextDirectoryEntry NextFrame NextItem NormalizePath OilPaintBrush OpenAmigaGuide OpenAnim OpenAudio OpenCatalog OpenConnection OpenDirectory OpenDisplay OpenFile OpenFont OpenMusic OpenResourceMonitor OpenSerialPort OpenURL OpenVideo Pack PadNum Pairs PaletteToGray ParseDate PathItems PathPart PathRequest PathToBrush PatternFindStr PatternFindStrDirect PatternFindStrShort PatternReplaceStr PauseLayer PauseModule PauseMusic PauseTimer PauseVideo Peek PeekClipboard PenArrayToBrush PerformSelector PermissionRequest PerspectiveDistortBrush Pi PixelateBrush PlayAnim PlayAnimDisk PlayLayer PlayModule PlayMusic PlaySample PlaySubsong PlayVideo Plot Poke PolarDistortBrush PollSerialQueue Polygon Pow Print QuantizeBrush RGB RGBArrayToBrush Rad RaiseOnError RasterizeBrush RawDiv RawEqual RawGet RawSet ReadBrushPixel ReadByte ReadBytes ReadChr ReadDirectory ReadFloat ReadFunction ReadInt ReadLine ReadMem ReadPen ReadPixel ReadRegistryKey ReadSerialData ReadShort ReadString ReadTable ReceiveData ReceiveUDPData Red ReduceAlphaChannel RefreshDisplay RelCurveTo RelLineTo RelMoveTo RemapBrush RemoveBrushPalette RemoveButton RemoveIconImage RemoveItem RemoveKeyDown RemoveLayer RemoveLayerFX RemoveLayers RemoveSprite RemoveSprites Rename RepeatStr ReplaceColors ReplaceStr ResetKeyStates ResetTabs ResetTimer ResolveHostName ResumeCoroutine ResumeLayer ResumeModule ResumeMusic ResumeTimer ResumeVideo ReverseFindStr ReverseStr RewindDirectory RightStr Rnd RndF RndStrong Rol Ror RotateBrush RotateLayer RotateTextObject Round Rt Run RunCallback RunRexxScript Sar SaveAnim SaveBrush SaveIcon SavePalette SavePrefs SaveSample SaveSnapshot ScaleAnim ScaleBGPic ScaleBrush ScaleLayer ScaleSprite ScaleTextObject Seek SeekLayer SeekMusic SeekVideo SelectAlphaChannel SelectAnim SelectBGPic SelectBrush SelectDisplay SelectLayer SelectMask SelectMenuItem SelectPalette SendApplicationMessage SendData SendMessage SendRexxCommand SendUDPData SepiaToneBrush SerializeTable SetAlphaIntensity SetAnimFrameDelay SetBaudRate SetBorderPen SetBrushDepth SetBrushPalette SetBrushPen SetBrushTransparency SetBrushTransparentPen SetBulletColor SetBulletPen SetChannelVolume SetClipRegion SetClipboard SetCycleTable SetDTR SetDash SetDataBits SetDefaultEncoding SetDepth SetDisplayAttributes SetDitherMode SetDrawPen SetDrawTagsDefault SetEnv SetEventTimeout SetFPSLimit SetFileAttributes SetFileEncoding SetFillRule SetFillStyle SetFlowControl SetFont SetFontColor SetFontStyle SetFormStyle SetGradientPalette SetIOMode SetIconProperties SetInterval SetLayerAnchor SetLayerBorder SetLayerDepth SetLayerFilter SetLayerLight SetLayerName SetLayerPalette SetLayerPen SetLayerShadow SetLayerStyle SetLayerTint SetLayerTransparency SetLayerTransparentPen SetLayerVolume SetLayerZPos SetLineCap SetLineJoin SetLineWidth SetListItems SetMargins SetMaskMode SetMasterVolume SetMetaTable SetMiterLimit SetMusicVolume SetNetworkProtocol SetNetworkTimeout SetObjectData SetPalette SetPaletteDepth SetPaletteMode SetPalettePen SetPaletteTransparentPen SetPanning SetParity SetPen SetPitch SetPointer SetRTS SetScreenTitle SetShadowPen SetSpriteZPos SetStandardIconImage SetStandardPalette SetStopBits SetSubtitle SetTimeout SetTimerElapse SetTitle SetTransparentPen SetTransparentThreshold SetTrayIcon SetVectorEngine SetVideoPosition SetVideoSize SetVideoVolume SetVolume SetWBIcon Sgn SharpenBrush Shl ShowDisplay ShowKeyboard ShowLayer ShowLayerFX ShowNotification ShowPointer ShowRinghioMessage ShowScreen ShowToast Shr Sin SolarizeBrush SolarizePalette Sort SplitStr Sqrt StartPath StartSubPath StartTimer StartsWith StopChannel StopLayer StopModule StopMusic StopSample StopTimer StopVideo StrLen StrStr StrToArray StringRequest StringToFile StripStr Sub SwapLayers SwirlBrush SystemRequest TableItems TableToMem Tan TextExtent TextHeight TextOut TextWidth TimerElapsed TimestampToDate TintBrush TintPalette ToHostName ToIP ToNumber ToString ToUserData TransformBrush TransformLayer TranslateLayer TranslatePath TrimBrush TrimStr UTCToDate UndefineVirtualStringFile Undo UndoFX UnleftStr UnmidStr Unpack UnrightStr UnsetEnv UploadFile UpperStr UseCarriageReturn UseFont VWait Val ValidateDate ValidateStr Vibrate Wait WaitEvent WaitKeyDown WaitLeftMouse WaitMidMouse WaitPatternPosition WaitRightMouse WaitSampleEnd WaitSongPosition WaitTimer WaterRippleBrush WhileKeyDown WhileMouseDown WhileMouseOn WhileRightMouseDown Wrap WriteAnimFrame WriteBrushPixel WriteByte WriteBytes WriteChr WriteFloat WriteFunction WriteInt WriteLine WriteMem WritePen WriteRegistryKey WriteSerialData WriteShort WriteString WriteTable YieldCoroutine 
 
 " user-defined constants
 syn match hwUserConstant "#\<\u\+\>"
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index 415430245..a30956ebd 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -58,7 +58,7 @@ syntax match   jsModuleComma        contained /,/ skipwhite skipempty nextgroup=
 syntax region  jsString           start=+\z(["']\)+  skip=+\\\%(\z1\|$\)+  end=+\z1+ end=+$+  contains=jsSpecial extend
 syntax region  jsTemplateString   start=+`+  skip=+\\`+  end=+`+     contains=jsTemplateExpression,jsSpecial extend
 syntax match   jsTaggedTemplate   /\<\K\k*\ze`/ nextgroup=jsTemplateString
-syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\%(\x\|_\)\+\)\>/
+syntax match   jsNumber           /\c\<\%(\d\+\%(e[+-]\=\d\+\)\=\|0b[01]\+\|0o\o\+\|0x\%(\x\|_\)\+\)n\=\>/
 syntax keyword jsNumber           Infinity
 syntax match   jsFloat            /\c\<\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%(e[+-]\=\d\+\)\=\>/
 
@@ -114,7 +114,7 @@ syntax keyword jsAsyncKeyword           async await
 syntax match   jsSwitchColon   contained /::\@!/        skipwhite skipempty nextgroup=jsSwitchBlock
 
 " Keywords
-syntax keyword jsGlobalObjects     ArrayBuffer Array BigInt64Array BigUint64Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Boolean Buffer Collator DataView Date DateTimeFormat Function Intl Iterator JSON Map Set WeakMap WeakSet Math Number NumberFormat Object ParallelArray Promise Proxy Reflect RegExp String Symbol Uint8ClampedArray WebAssembly console document fetch window
+syntax keyword jsGlobalObjects     ArrayBuffer Array BigInt BigInt64Array BigUint64Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray Boolean Buffer Collator DataView Date DateTimeFormat Function Intl Iterator JSON Map Set WeakMap WeakRef WeakSet Math Number NumberFormat Object ParallelArray Promise Proxy Reflect RegExp String Symbol Uint8ClampedArray WebAssembly console document fetch window
 syntax keyword jsGlobalNodeObjects  module exports global process __dirname __filename
 syntax match   jsGlobalNodeObjects  /\<require\>/ containedin=jsFuncCall
 syntax keyword jsExceptions         Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 2849439b3..a04f246dc 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -33,49 +33,57 @@ let s:julia_spellcheck_comments = get(g:, "julia_spellcheck_comments", 1)
 
 let s:julia_highlight_operators = get(g:, "julia_highlight_operators", 1)
 
-" characters which cannot be used in identifiers. This list is very incomplete:
-" 1) it only cares about charactes below 256
-" 2) it doesn't distinguish between what's allowed as the 1st char vs in the
-"    rest of an identifier (e.g. digits and `!`)
-" Despite these shortcomings, it seems to do a decent job.
-" note: \U5B and \U5D are '[' and ']'
-let s:nonid_chars = "\U01-\U07" . "\U0E-\U1F" .
-      \             "?\"#$'(,.:;=@`\\U5B{" .
-      \             "\U80-\UA1" . "\UA7\UA8\UAB\UAD\UAF\UB4" . "\UB6-\UB8" . "\UBB\UBF"
-
-let s:nonidS_chars = "[:space:])\\U5D}" . s:nonid_chars
-
-" the following excludes '!' since it can be used as an identifier,
-" and '$' since it can be used in interpolations
-" note that \U2D is '-'
-let s:uniop_chars = "+\\U2D~¬√∛∜⋆"
-
-let s:binop_chars = "=+\\U2D*/\\%÷^&|⊻<>≤≥≡≠≢∈∉⋅×∪∩⊆⊈⊂⊄⊊←→∋∌⊕⊖⊞⊟∘∧⊗⊘↑↓∨⊠±⟂⋆"
-
-" the following is a list of all remainig valid operator chars,
-" but it's more efficient when expressed with ranges (see below)
-" let s:binop_chars_extra = "↔↚↛↠↣↦↮⇎⇏⇒⇔⇴⇶⇷⇸⇹⇺⇻⇼⇽⇾⇿⟵⟶⟷⟷⟹⟺⟻⟼⟽⟾⟿⤀⤁⤂⤃⤄⤅⤆⤇⤌⤍⤎⤏⤐⤑⤔⤕⤖⤗⤘⤝⤞⤟⤠⥄⥅⥆⥇⥈⥊⥋⥎⥐⥒⥓⥖⥗⥚⥛⥞⥟⥢⥤⥦⥧⥨⥩⥪⥫⥬⥭⥰⧴⬱⬰⬲⬳⬴⬵⬶⬷⬸⬹⬺⬻⬼⬽⬾⬿⭀⭁⭂⭃⭄⭇⭈⭉⭊⭋⭌￩￫" .
-"       \                   "∝∊∍∥∦∷∺∻∽∾≁≃≄≅≆≇≈≉≊≋≌≍≎≐≑≒≓≔≕≖≗≘≙≚≛≜≝≞≟≣≦≧≨≩≪≫≬≭≮≯≰≱≲≳≴≵≶≷≸≹≺≻≼≽≾≿⊀⊁⊃⊅⊇⊉⊋⊏⊐⊑⊒⊜⊩⊬⊮⊰⊱⊲⊳⊴⊵⊶⊷⋍⋐⋑⋕⋖⋗⋘⋙⋚⋛⋜⋝⋞⋟⋠⋡⋢⋣⋤⋥⋦⋧⋨⋩⋪⋫⋬⋭⋲⋳⋴⋵⋶⋷⋸⋹⋺⋻⋼⋽⋾⋿⟈⟉⟒⦷⧀⧁⧡⧣⧤⧥⩦⩧⩪⩫⩬⩭⩮⩯⩰⩱⩲⩳⩴⩵⩶⩷⩸⩹⩺⩻⩼⩽⩾⩿⪀⪁⪂⪃⪄⪅⪆⪇⪈⪉⪊⪋⪌⪍⪎⪏⪐⪑⪒⪓⪔⪕⪖⪗⪘⪙⪚⪛⪜⪝⪞⪟⪠⪡⪢⪣⪤⪥⪦⪧⪨⪩⪪⪫⪬⪭⪮⪯⪰⪱⪲⪳⪴⪵⪶⪷⪸⪹⪺⪻⪼⪽⪾⪿⫀⫁⫂⫃⫄⫅⫆⫇⫈⫉⫊⫋⫌⫍⫎⫏⫐⫑⫒⫓⫔⫕⫖⫗⫘⫙⫷⫸⫹⫺⊢⊣" .
-"       \                   "⊔∓∔∸≂≏⊎⊽⋎⋓⧺⧻⨈⨢⨣⨤⨥⨦⨧⨨⨩⨪⨫⨬⨭⨮⨹⨺⩁⩂⩅⩊⩌⩏⩐⩒⩔⩖⩗⩛⩝⩡⩢⩣" .
-"       \                   "⊙⊚⊛⊡⊓∗∙∤⅋≀⊼⋄⋇⋉⋊⋋⋌⋏⋒⟑⦸⦼⦾⦿⧶⧷⨇⨰⨱⨲⨳⨴⨵⨶⨷⨸⨻⨼⨽⩀⩃⩄⩋⩍⩎⩑⩓⩕⩘⩚⩜⩞⩟⩠⫛⊍▷⨝⟕⟖⟗" .
-"       \                   "⇵⟰⟱⤈⤉⤊⤋⤒⤓⥉⥌⥍⥏⥑⥔⥕⥘⥙⥜⥝⥠⥡⥣⥥⥮⥯￪￬"
-
-" same as above, but with character ranges, for performance
-let s:binop_chars_extra = "\\U214B\\U2190-\\U2194\\U219A\\U219B\\U21A0\\U21A3\\U21A6\\U21AE\\U21CE\\U21CF\\U21D2\\U21D4\\U21F4-\\U21FF\\U2208-\\U220D\\U2213\\U2214\\U2217-\\U2219\\U221D\\U2224-\\U222A\\U2237\\U2238\\U223A\\U223B\\U223D\\U223E\\U2240-\\U228B\\U228D-\\U229C\\U229E-\\U22A3\\U22A9\\U22AC\\U22AE\\U22B0-\\U22B7\\U22BB-\\U22BD\\U22C4-\\U22C7\\U22C9-\\U22D3\\U22D5-\\U22ED\\U22F2-\\U22FF\\U25B7\\U27C8\\U27C9\\U27D1\\U27D2\\U27D5-\\U27D7\\U27F0\\U27F1\\U27F5-\\U27F7\\U27F7\\U27F9-\\U27FF\\U2900-\\U2918\\U291D-\\U2920\\U2944-\\U2970\\U29B7\\U29B8\\U29BC\\U29BE-\\U29C1\\U29E1\\U29E3-\\U29E5\\U29F4\\U29F6\\U29F7\\U29FA\\U29FB\\U2A07\\U2A08\\U2A1D\\U2A22-\\U2A2E\\U2A30-\\U2A3D\\U2A40-\\U2A45\\U2A4A-\\U2A58\\U2A5A-\\U2A63\\U2A66\\U2A67\\U2A6A-\\U2AD9\\U2ADB\\U2AF7-\\U2AFA\\U2B30-\\U2B44\\U2B47-\\U2B4C\\UFFE9-\\UFFEC"
-
-" a Julia identifier, sort of
-let s:idregex = '\%([^' . s:nonidS_chars . '0-9!' . s:uniop_chars . s:binop_chars . '][^' . s:nonidS_chars . s:uniop_chars . s:binop_chars . s:binop_chars_extra . ']*\)'
-
-let s:operators = '\%(' . '\.\%([-+*/^÷%|&!]\|//\|\\\|<<\|>>>\?\)\?=' .
-      \           '\|'  . '[:$<>]=\|||\|&&\||>\|<|\|<:\|>:\|::\|<<\|>>>\?\|//\|[-=]>\|\.\{3\}' .
-      \           '\|'  . '\.\?[' . s:uniop_chars . '!]' .
-      \           '\|'  . '\.\?[' . s:binop_chars . s:binop_chars_extra . ']' .
+" List of characters, up to \UFF, which cannot be used in identifiers.
+" (It includes operator characters; we don't consider them identifiers.)
+" This is used mostly in lookbehinds with `\@<=`, e.g. when we need to check
+" that that we're not in the middle of an identifier.
+" It doesn't include a few characters (spaces and all closing parentheses)
+" because those may or may not be valid in the lookbehind on a case-by-case
+" basis.
+let s:nonid_chars = '\U00-\U08' . '\U0A-\U1F' .
+      \             '\U21-\U28' . '\U2A-\U2F' . '\U3A-\U40' . '\U5B-\U5E' . '\U60' . '\U7B\U7C' .
+      \             '\U7E-\UA1' . '\UA7\UA8' . '\UAB-\UAD' . '\UAF\UB1\UB4' . '\UB6-\UB8' . '\UBB\UBF' . '\UD7\UF7'
+
+" The complete list
+let s:nonidS_chars = '[:space:])\U5D}' . s:nonid_chars
+
+
+" List of all valid operator chars up to \UFF (NOTE: they must all be included
+" in s:nonidS_chars, so that if we include that, then this is redundant)
+" It does not include '!' since it can be used in an identifier.
+" The list contains the following characters: '%&*+-/<=>\\^|~¬±×÷'
+let s:op_chars = '\U25\U26\U2A\U2B\U2D\U2F\U3C-\U3E\U5C\U5E\U7C\U7E\UAC\UB1\UD7\UF7'
+
+" List of all valid operator chars above \UFF
+" Written with ranges for performance reasons
+" The list contains the following characters: '…⁝⅋←↑→↓↔↚↛↜↝↞↠↢↣↤↦↩↪↫↬↮↶↷↺↻↼↽⇀⇁⇄⇆⇇⇉⇋⇌⇍⇎⇏⇐⇒⇔⇚⇛⇜⇝⇠⇢⇴⇵⇶⇷⇸⇹⇺⇻⇼⇽⇾⇿∈∉∊∋∌∍∓∔∗∘∙√∛∜∝∤∥∦∧∨∩∪∷∸∺∻∽∾≀≁≂≃≄≅≆≇≈≉≊≋≌≍≎≏≐≑≒≓≔≕≖≗≘≙≚≛≜≝≞≟≠≡≢≣≤≥≦≧≨≩≪≫≬≭≮≯≰≱≲≳≴≵≶≷≸≹≺≻≼≽≾≿⊀⊁⊂⊃⊄⊅⊆⊇⊈⊉⊊⊋⊍⊎⊏⊐⊑⊒⊓⊔⊕⊖⊗⊘⊙⊚⊛⊜⊞⊟⊠⊡⊢⊣⊩⊬⊮⊰⊱⊲⊳⊴⊵⊶⊷⊻⊼⊽⋄⋅⋆⋇⋉⋊⋋⋌⋍⋎⋏⋐⋑⋒⋓⋕⋖⋗⋘⋙⋚⋛⋜⋝⋞⋟⋠⋡⋢⋣⋤⋥⋦⋧⋨⋩⋪⋫⋬⋭⋮⋯⋰⋱⋲⋳⋴⋵⋶⋷⋸⋹⋺⋻⋼⋽⋾⋿⌿▷⟂⟈⟉⟑⟒⟕⟖⟗⟰⟱⟵⟶⟷⟹⟺⟻⟼⟽⟾⟿⤀⤁⤂⤃⤄⤅⤆⤇⤈⤉⤊⤋⤌⤍⤎⤏⤐⤑⤒⤓⤔⤕⤖⤗⤘⤝⤞⤟⤠⥄⥅⥆⥇⥈⥉⥊⥋⥌⥍⥎⥏⥐⥑⥒⥓⥔⥕⥖⥗⥘⥙⥚⥛⥜⥝⥞⥟⥠⥡⥢⥣⥤⥥⥦⥧⥨⥩⥪⥫⥬⥭⥮⥯⥰⦷⦸⦼⦾⦿⧀⧁⧡⧣⧤⧥⧴⧶⧷⧺⧻⨇⨈⨝⨟⨢⨣⨤⨥⨦⨧⨨⨩⨪⨫⨬⨭⨮⨰⨱⨲⨳⨴⨵⨶⨷⨸⨹⨺⨻⨼⨽⩀⩁⩂⩃⩄⩅⩊⩋⩌⩍⩎⩏⩐⩑⩒⩓⩔⩕⩖⩗⩘⩚⩛⩜⩝⩞⩟⩠⩡⩢⩣⩦⩧⩪⩫⩬⩭⩮⩯⩰⩱⩲⩳⩴⩵⩶⩷⩸⩹⩺⩻⩼⩽⩾⩿⪀⪁⪂⪃⪄⪅⪆⪇⪈⪉⪊⪋⪌⪍⪎⪏⪐⪑⪒⪓⪔⪕⪖⪗⪘⪙⪚⪛⪜⪝⪞⪟⪠⪡⪢⪣⪤⪥⪦⪧⪨⪩⪪⪫⪬⪭⪮⪯⪰⪱⪲⪳⪴⪵⪶⪷⪸⪹⪺⪻⪼⪽⪾⪿⫀⫁⫂⫃⫄⫅⫆⫇⫈⫉⫊⫋⫌⫍⫎⫏⫐⫑⫒⫓⫔⫕⫖⫗⫘⫙⫛⫷⫸⫹⫺⬰⬱⬲⬳⬴⬵⬶⬷⬸⬹⬺⬻⬼⬽⬾⬿⭀⭁⭂⭃⭄⭇⭈⭉⭊⭋⭌￩￪￫￬'
+let s:op_chars_wc = '\U2026\U205D\U214B\U2190-\U2194\U219A-\U219E\U21A0\U21A2-\U21A4\U21A6\U21A9-\U21AC\U21AE\U21B6\U21B7\U21BA-\U21BD\U21C0\U21C1\U21C4\U21C6\U21C7\U21C9\U21CB-\U21D0\U21D2\U21D4\U21DA-\U21DD\U21E0\U21E2\U21F4-\U21FF\U2208-\U220D\U2213\U2214\U2217-\U221D\U2224-\U222A\U2237\U2238\U223A\U223B\U223D\U223E\U2240-\U228B\U228D-\U229C\U229E-\U22A3\U22A9\U22AC\U22AE\U22B0-\U22B7\U22BB-\U22BD\U22C4-\U22C7\U22C9-\U22D3\U22D5-\U22FF\U233F\U25B7\U27C2\U27C8\U27C9\U27D1\U27D2\U27D5-\U27D7\U27F0\U27F1\U27F5-\U27F7\U27F9-\U27FF\U2900-\U2918\U291D-\U2920\U2944-\U2970\U29B7\U29B8\U29BC\U29BE-\U29C1\U29E1\U29E3-\U29E5\U29F4\U29F6\U29F7\U29FA\U29FB\U2A07\U2A08\U2A1D\U2A1F\U2A22-\U2A2E\U2A30-\U2A3D\U2A40-\U2A45\U2A4A-\U2A58\U2A5A-\U2A63\U2A66\U2A67\U2A6A-\U2AD9\U2ADB\U2AF7-\U2AFA\U2B30-\U2B44\U2B47-\U2B4C\UFFE9-\UFFEC'
+
+" Full operators regex
+let s:operators = '\%(' . '\.\%([-+*/^÷%|&⊻]\|//\|\\\|>>\|>>>\?\)\?=' .
+      \           '\|'  . '[:<>]=\|||\|&&\||>\|<|\|[<>:]:\|<<\|>>>\?\|//\|[-=]>\|\.\.\.\?' .
+      \           '\|'  . '\.\?[!' . s:op_chars . s:op_chars_wc . ']' .
       \           '\)'
 
+
+" Characters that can be used to start an identifier. Above \UBF we don't
+" bother checking. (If a UTF8 operator is used, it will take precedence anyway.)
+let s:id_charsH = '\%([A-Za-z_\UA2-\UA6\UA9\UAA\UAE\UB0\UB5\UBA]\|[^\U00-\UBF]\)'
+" Characters that can appear in an identifier, starting in 2nd position. Above
+" \UBF we check for operators since we need to stop the identifier if one
+" appears. We don't check for invalid characters though.
+let s:id_charsW = '\%([0-9A-Za-z_!\UA2-\UA6\UA9\UAA\UAE-\UB0\UB2-\UB5\UB8-\UBA\UBC-\UBE]\|[^\U00-\UBF]\@=[^' . s:op_chars_wc . ']\)'
+
+" A valid julia identifier, more or less
+let s:idregex = '\%(' . s:id_charsH . s:id_charsW . '*\)'
+
+
+
 syn case match
 
 syntax cluster juliaExpressions		contains=@juliaParItems,@juliaStringItems,@juliaKeywordItems,@juliaBlocksItems,@juliaTypesItems,@juliaConstItems,@juliaMacroItems,@juliaSymbolItems,@juliaOperatorItems,@juliaNumberItems,@juliaCommentItems,@juliaErrorItems,@juliaSyntaxRegions
 syntax cluster juliaExprsPrintf		contains=@juliaExpressions,@juliaPrintfItems
+syntax cluster juliaExprsNodot		contains=@juliaParItems,@juliaStringItems,@juliaMacroItems,@juliaSymbolItems,@juliaOperatorItems,@juliaCommentItems,juliaIdSymbol
 
 syntax cluster juliaParItems		contains=juliaParBlock,juliaSqBraIdxBlock,juliaSqBraBlock,juliaCurBraBlock,juliaQuotedParBlock,juliaQuotedQMarkPar
 syntax cluster juliaKeywordItems	contains=juliaKeyword,juliaWhereKeyword,juliaImportLine,juliaInfixKeyword,juliaRepKeyword
@@ -87,13 +95,13 @@ syntax cluster juliaConstItems  	contains=juliaConstNum,juliaConstBool,juliaCons
 syntax cluster juliaMacroItems		contains=juliaPossibleMacro,juliaDollarVar,juliaDollarPar,juliaDollarSqBra
 syntax cluster juliaSymbolItems		contains=juliaPossibleSymbol
 syntax cluster juliaNumberItems		contains=juliaNumbers
-syntax cluster juliaStringItems		contains=juliaChar,juliaString,juliaStringPrefixed,juliabString,juliasString,juliavString,juliaipString,juliabigString,juliaMIMEString,juliarawString,juliatextString,juliahtmlString,juliaint128String,juliaShellString,juliaDocString,juliaRegEx
+syntax cluster juliaStringItems		contains=juliaChar,juliaString,juliabString,juliasString,juliaShellString,juliaDocString,juliaRegEx
 syntax cluster juliaPrintfItems		contains=juliaPrintfParBlock,juliaPrintfString
 syntax cluster juliaOperatorItems	contains=juliaOperator,juliaRangeOperator,juliaCTransOperator,juliaTernaryRegion,juliaColon,juliaSemicolon,juliaComma
 syntax cluster juliaCommentItems	contains=juliaCommentL,juliaCommentM
 syntax cluster juliaErrorItems		contains=juliaErrorPar,juliaErrorEnd,juliaErrorElse,juliaErrorCatch,juliaErrorFinally
 
-syntax cluster juliaSyntaxRegions	contains=juliaParamTypeR,juliaFunctionCallR,juliaTypeOperatorR,juliaWhereR
+syntax cluster juliaSyntaxRegions	contains=juliaIdSymbol,juliaTypeOperatorR2,juliaTypeOperatorR3,juliaWhereR,juliaDotted
 
 syntax cluster juliaSpellcheckStrings		contains=@spell
 syntax cluster juliaSpellcheckDocStrings	contains=@spell
@@ -113,65 +121,72 @@ syntax match   juliaSemicolon		display ";"
 syntax match   juliaComma		display ","
 syntax match   juliaColon		display ":"
 
-" This is really ugly. It would be better to mask most keywords when a dot is
-" found, introducing some kind of dot-environment
-let s:nodot = '\%(\.\)\@'.s:d(1).'<!'
+" A dot can introduce a sort of 'environment' such that words after it are not
+" recognized as keywords. This has low precedence so that it can be overridden
+" by operators
+syntax match   juliaDotted		transparent "\.\s*[^.]" contains=@juliaExprsNodot
+syntax match   juliaDottedT		contained transparent "\.\s*[^.]" contains=@juliaExprsNodot,juliaType
 
 syntax match   juliaErrorPar		display "[])}]"
-exec 'syntax match   juliaErrorEnd	display "'.s:nodot.'\<end\>"'
-exec 'syntax match   juliaErrorElse	display "'.s:nodot.'\<\%(else\|elseif\)\>"'
-exec 'syntax match   juliaErrorCatch	display "'.s:nodot.'\<catch\>"'
-exec 'syntax match   juliaErrorFinally	display "'.s:nodot.'\<finally\>"'
+syntax match   juliaErrorEnd		display "\<end\>"
+syntax match   juliaErrorElse		display "\<\%(else\|elseif\)\>"
+syntax match   juliaErrorCatch		display "\<catch\>"
+syntax match   juliaErrorFinally	display "\<finally\>"
 syntax match   juliaErrorSemicol	display contained ";"
 
 syntax region  juliaParBlock		matchgroup=juliaParDelim start="(" end=")" contains=@juliaExpressions,juliaComprehensionFor
 syntax region  juliaParBlockInRange	matchgroup=juliaParDelim contained start="(" end=")" contains=@juliaExpressions,juliaParBlockInRange,juliaRangeKeyword,juliaComprehensionFor
 syntax region  juliaSqBraIdxBlock	matchgroup=juliaParDelim start="\[" end="\]" contains=@juliaExpressions,juliaParBlockInRange,juliaRangeKeyword,juliaComprehensionFor,juliaSymbolS,juliaQuotedParBlockS,juliaQuotedQMarkParS
 exec 'syntax region  juliaSqBraBlock	matchgroup=juliaParDelim start="\%(^\|\s\|' . s:operators . '\)\@'.s:d(3).'<=\[" end="\]" contains=@juliaExpressions,juliaComprehensionFor,juliaSymbolS,juliaQuotedParBlockS,juliaQuotedQMarkParS'
-syntax region  juliaCurBraBlock		matchgroup=juliaParDelim start="{" end="}" contains=juliaType,@juliaExpressions
+syntax region  juliaCurBraBlock		matchgroup=juliaParDelim start="{" end="}" contains=juliaType,juliaDottedT,@juliaExpressions
+
+exec 'syntax match   juliaType		contained "\%(' . s:idregex . '\.\)*\zs' . s:idregex . '"'
 
-exec 'syntax match   juliaType		contained "' . s:idregex . '\%(\.' . s:idregex . '\)*"'
+" This is a generic identifier followed by some symbol, either a type
+" operator (<: or >:), or an open parenthesis, or an open curly bracket.
+" It's used to recognize one of the contained regions looking for identifiers
+" only once. Once recognized, those regions no longer need to use the
+" expensive s:idregex.
+exec 'syntax match   juliaIdSymbol	transparent "' . s:idregex . '\%(\s*[<>]:\|\.\?(\|{\|\"\)\@=" contains=juliaFunctionCall,juliaParamType,juliaStringPrefixed,juliaTypeOperatorR1'
 
-exec 'syntax region  juliaFunctionCallR	transparent start="' . s:idregex . '\%(\.' . s:idregex . '\)*\.\?(" end=")\@'.s:d(1).'<=" contains=juliaFunctionCall,juliaParBlock'
-exec 'syntax match   juliaFunctionCall	contained "\%(' . s:idregex . '\.\)*\zs' . s:idregex . '"'
+syntax match  juliaFunctionCall		contained "[^{([:space:]<>\"]\+(\@=" nextgroup=juliaParBlock
 
-" note: we would in principle add a "s:nodot" before function/macro/struct/... but it shouldn't come up in valid code
 exec 'syntax match   juliaFunctionDef	contained transparent "\%(\<\%(function\|macro\)\)\@'.s:d(8).'<=\s\+\zs' . s:idregex . '\%(\.' . s:idregex . '\)*\ze\s*\%((\|\send\>\|$\)" contains=juliaFunctionName'
 exec 'syntax match   juliaFunctionName	contained "\%(\<\%(function\|macro\)\s\+\)\@'.s:d(20).'<=\%(' . s:idregex . '\.\)*\zs' . s:idregex . '"'
 
 exec 'syntax match   juliaStructR	contained transparent "\%(\<\%(\%(mutable\s\+\)\?struct\|\%(abstract\|primitive\)\s\+type\)\s\+\)\@'.s:d(20).'<=\%(' . s:idregex . '\.\)*' . s:idregex . '\>\(\s*(\)\@!" contains=juliaType'
 
-exec 'syntax match   juliaKeyword		display "'.s:nodot.'\<\%(return\|local\|global\|const\)\>"'
+syntax match   juliaKeyword		display "\<\%(return\|local\|global\|const\)\>"
 syntax match   juliaInfixKeyword	display "\%(=\s*\)\@<!\<\%(in\|isa\)\>\S\@!\%(\s*=\)\@!"
 
 " The import/export/using keywords introduce a sort of special parsing
 " environment with its own rules
-exec 'syntax region  juliaImportLine		matchgroup=juliaKeyword excludenl start="'.s:nodot.'\<\%(import\|using\|export\)\>" skip="\%(\%(\<\%(import\|using\|export\)\>\)\|^\)\@'.s:d(6).'<=$" end="$" end="\%([])}]\)\@=" contains=@juliaExpressions,juliaAsKeyword,@juliaContinuationItems,juliaMacroName'
+exec 'syntax region  juliaImportLine		matchgroup=juliaKeyword excludenl start="\<\%(import\|using\|export\)\>" skip="\%(\%(\<\%(import\|using\|export\)\>\)\|^\)\@'.s:d(6).'<=$" end="$" end="\%([])}]\)\@=" contains=@juliaExpressions,juliaAsKeyword,@juliaContinuationItems,juliaMacroName'
 syntax match   juliaAsKeyword		display contained "\<as\>"
 
-exec 'syntax match   juliaRepKeyword		display "'.s:nodot.'\<\%(break\|continue\)\>"'
-exec 'syntax region  juliaConditionalBlock	matchgroup=juliaConditional start="'.s:nodot.'\<if\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaConditionalEIBlock,juliaConditionalEBlock fold'
-exec 'syntax region  juliaConditionalEIBlock	matchgroup=juliaConditional transparent contained start="'.s:nodot.'\<elseif\>" end="'.s:nodot.'\<\%(end\|else\|elseif\)\>"me=s-1 contains=@juliaExpressions,juliaConditionalEIBlock,juliaConditionalEBlock'
-exec 'syntax region  juliaConditionalEBlock	matchgroup=juliaConditional transparent contained start="'.s:nodot.'\<else\>" end="'.s:nodot.'\<end\>"me=s-1 contains=@juliaExpressions'
-exec 'syntax region  juliaWhileBlock		matchgroup=juliaRepeat start="'.s:nodot.'\<while\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
-exec 'syntax region  juliaForBlock		matchgroup=juliaRepeat start="'.s:nodot.'\<for\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaOuter fold'
-exec 'syntax region  juliaBeginBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<begin\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
-exec 'syntax region  juliaFunctionBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<function\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaFunctionDef fold'
-exec 'syntax region  juliaMacroBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<macro\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaFunctionDef fold'
-exec 'syntax region  juliaQuoteBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<quote\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
-exec 'syntax region  juliaStructBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaStructR fold'
-exec 'syntax region  juliaMutableStructBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<mutable\s\+struct\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaStructR fold'
-exec 'syntax region  juliaLetBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<let\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
-exec 'syntax region  juliaDoBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<do\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions fold'
-exec 'syntax region  juliaModuleBlock		matchgroup=juliaBlKeyword start="\%(\%(\.\s*\)\@'.s:d(6).'<!\|\%(@\s*\.\s*\)\@'.s:d(6).'<=\)\<\%(bare\)\?module\>" end="\<end\>" contains=@juliaExpressions fold'
-exec 'syntax region  juliaExceptionBlock	matchgroup=juliaException start="'.s:nodot.'\<try\>" end="'.s:nodot.'\<end\>" contains=@juliaExpressions,juliaCatchBlock,juliaFinallyBlock fold'
-exec 'syntax region  juliaCatchBlock		matchgroup=juliaException transparent contained start="'.s:nodot.'\<catch\>" end="'.s:nodot.'\<end\>"me=s-1 contains=@juliaExpressions,juliaFinallyBlock'
-exec 'syntax region  juliaFinallyBlock		matchgroup=juliaException transparent contained start="'.s:nodot.'\<finally\>" end="'.s:nodot.'\<end\>"me=s-1 contains=@juliaExpressions'
-exec 'syntax region  juliaAbstractBlock		matchgroup=juliaBlKeyword start="'.s:nodot.'\<abstract\s\+type\>" end="'.s:nodot.'\<end\>" fold contains=@juliaExpressions,juliaStructR'
-exec 'syntax region  juliaPrimitiveBlock	matchgroup=juliaBlKeyword start="'.s:nodot.'\<primitive\s\+type\>" end="'.s:nodot.'\<end\>" fold contains=@juliaExpressions,juliaStructR'
+syntax match   juliaRepKeyword		display "\<\%(break\|continue\)\>"
+syntax region  juliaConditionalBlock	matchgroup=juliaConditional start="\<if\>" end="\<end\>" contains=@juliaExpressions,juliaConditionalEIBlock,juliaConditionalEBlock fold
+syntax region  juliaConditionalEIBlock	matchgroup=juliaConditional transparent contained start="\<elseif\>" end="\<\%(end\|else\|elseif\)\>"me=s-1 contains=@juliaExpressions,juliaConditionalEIBlock,juliaConditionalEBlock
+syntax region  juliaConditionalEBlock	matchgroup=juliaConditional transparent contained start="\<else\>" end="\<end\>"me=s-1 contains=@juliaExpressions
+syntax region  juliaWhileBlock		matchgroup=juliaRepeat start="\<while\>" end="\<end\>" contains=@juliaExpressions fold
+syntax region  juliaForBlock		matchgroup=juliaRepeat start="\<for\>" end="\<end\>" contains=@juliaExpressions,juliaOuter fold
+syntax region  juliaBeginBlock		matchgroup=juliaBlKeyword start="\<begin\>" end="\<end\>" contains=@juliaExpressions fold
+syntax region  juliaFunctionBlock	matchgroup=juliaBlKeyword start="\<function\>" end="\<end\>" contains=@juliaExpressions,juliaFunctionDef fold
+syntax region  juliaMacroBlock		matchgroup=juliaBlKeyword start="\<macro\>" end="\<end\>" contains=@juliaExpressions,juliaFunctionDef fold
+syntax region  juliaQuoteBlock		matchgroup=juliaBlKeyword start="\<quote\>" end="\<end\>" contains=@juliaExpressions fold
+syntax region  juliaStructBlock		matchgroup=juliaBlKeyword start="\<struct\>" end="\<end\>" contains=@juliaExpressions,juliaStructR fold
+syntax region  juliaMutableStructBlock	matchgroup=juliaBlKeyword start="\<mutable\s\+struct\>" end="\<end\>" contains=@juliaExpressions,juliaStructR fold
+syntax region  juliaLetBlock		matchgroup=juliaBlKeyword start="\<let\>" end="\<end\>" contains=@juliaExpressions fold
+syntax region  juliaDoBlock		matchgroup=juliaBlKeyword start="\<do\>" end="\<end\>" contains=@juliaExpressions fold
+syntax region  juliaModuleBlock		matchgroup=juliaBlKeyword start="\<\%(bare\)\?module\>" end="\<end\>" contains=@juliaExpressions fold
+syntax region  juliaExceptionBlock	matchgroup=juliaException start="\<try\>" end="\<end\>" contains=@juliaExpressions,juliaCatchBlock,juliaFinallyBlock fold
+syntax region  juliaCatchBlock		matchgroup=juliaException transparent contained start="\<catch\>" end="\<end\>"me=s-1 contains=@juliaExpressions,juliaFinallyBlock
+syntax region  juliaFinallyBlock	matchgroup=juliaException transparent contained start="\<finally\>" end="\<end\>"me=s-1 contains=@juliaExpressions
+syntax region  juliaAbstractBlock	matchgroup=juliaBlKeyword start="\<abstract\s\+type\>" end="\<end\>" fold contains=@juliaExpressions,juliaStructR
+syntax region  juliaPrimitiveBlock	matchgroup=juliaBlKeyword start="\<primitive\s\+type\>" end="\<end\>" fold contains=@juliaExpressions,juliaStructR
 
 exec 'syntax region  juliaComprehensionFor	matchgroup=juliaComprehensionFor transparent contained start="\%([^[:space:],;:({[]\_s*\)\@'.s:d(80).'<=\<for\>" end="\ze[]);]" contains=@juliaExpressions,juliaComprehensionIf,juliaComprehensionFor'
-exec 'syntax match   juliaComprehensionIf	contained "'.s:nodot.'\<if\>"'
+syntax match   juliaComprehensionIf	contained "\<if\>"
 
 exec 'syntax match   juliaOuter		contained "\<outer\ze\s\+' . s:idregex . '\>"'
 
@@ -206,16 +221,16 @@ syntax match   juliaConstNum		display "\%(\<\%(\%(NaN\|Inf\)\%(16\|32\|64\)\?\|p
 " (This also tries to detect preceding number constants; it does so in a crude
 " way.)
 syntax match   juliaPossibleEuler	"ℯ" contains=juliaEuler
-exec 'syntax match   juliaEuler		contained "\%(\%(^\|[' . s:nonidS_chars . ']\|' . s:operators . '\)\%([.0-9eEf_]*\d\)\?\)\@'.s:d(80).'<=ℯ\ze\%($\|[' . s:nonidS_chars . ']\|' . s:operators . '\)"'
+exec 'syntax match   juliaEuler		contained "\%(\%(^\|[' . s:nonidS_chars . s:op_chars_wc . ']\)\%(.\?[0-9][.0-9eEf_]*\d\)\?\)\@'.s:d(80).'<=ℯ\ze[' . s:nonidS_chars . s:op_chars_wc . ']"'
 syntax match   juliaConstBool		display "\<\%(true\|false\)\>"
 syntax match   juliaConstEnv		display "\<\%(ARGS\|ENV\|ENDIAN_BOM\|LOAD_PATH\|VERSION\|PROGRAM_FILE\|DEPOT_PATH\)\>"
 syntax match   juliaConstIO		display "\<\%(std\%(out\|in\|err\)\|devnull\)\>"
 syntax match   juliaConstC		display "\<\%(C_NULL\)\>"
 syntax match   juliaConstGeneric	display "\<\%(nothing\|Main\|undef\|missing\)\>"
 
-exec 'syntax region  juliaParamTypeR	transparent start="' . s:idregex . '{" end="}\@'.s:d(1).'<=" contains=juliaType,@juliaExpressions'
+syntax match   juliaParamType		contained "[^{([:space:]<>\"]\+\ze{" nextgroup=juliaCurBraBlock
 
-syntax match   juliaPossibleMacro	transparent "@" contains=juliaMacroCall,juliaMacroCallP,juliaPrintfMacro,juliaDocMacro
+syntax match   juliaPossibleMacro	transparent "@" contains=juliaMacroCall,juliaMacroCallP,juliaPrintfMacro,juliaDocMacro,juliaDocMacroPre
 
 exec 'syntax match   juliaMacro		contained "@' . s:idregex . '\%(\.' . s:idregex . '\)*"'
 syntax match   juliaMacro		contained "@[!.~$%^*/\\|<>+-]\ze[^0-9]"
@@ -224,7 +239,7 @@ exec 'syntax region  juliaMacroCall	contained transparent start="\(@.\)\@=\1\%([
 exec 'syntax region  juliaMacroCallP	contained transparent start="@' . s:idregex . '\%(\.' . s:idregex . '\)*(" end=")\@'.s:d(1).'<=" contains=juliaMacro,juliaParBlock'
 exec 'syntax region  juliaMacroCallP	contained transparent start="@.(" end=")\@'.s:d(1).'<=" contains=juliaMacro,juliaParBlock'
 
-syntax match   juliaNumbers		transparent "\<\d\|\.\d\|\<im\>" contains=juliaNumber,juliaFloat,juliaComplexUnit
+exec 'syntax match   juliaNumbers	transparent "\%(^\|[' . s:nonidS_chars . s:op_chars_wc . ']\)\@'.s:d(1).'<=\d\|\.\d\|im\>" contains=juliaNumber,juliaFloat,juliaComplexUnit'
 
 "integer regexes
 let s:dec_regex = '\d\%(_\?\d\)*\%(\>\|im\>\|\ze\D\)'
@@ -265,9 +280,10 @@ syntax match   juliaComplexUnit		display	contained "\<im\>"
 
 syntax match   juliaRangeOperator	display ":"
 exec 'syntax match   juliaOperator	"' . s:operators . '"'
+
 exec 'syntax region  juliaTernaryRegion	matchgroup=juliaTernaryOperator start="\s\zs?\ze\s" skip="\%(:\(:\|[^:[:space:]'."'".'"({[]\+\s*\ze:\)\|\%(?\s*\)\@'.s:d(6).'<=:(\)" end=":" contains=@juliaExpressions,juliaErrorSemicol'
 
-let s:interp_dollar = '\([' . s:nonidS_chars . s:uniop_chars . s:binop_chars . '!]\|^\)\@'.s:d(1).'<=\$'
+let s:interp_dollar = '\([' . s:nonidS_chars . s:op_chars_wc . '!]\|^\)\@'.s:d(1).'<=\$'
 
 exec 'syntax match   juliaDollarVar	display contained "' . s:interp_dollar . s:idregex . '"'
 exec 'syntax region  juliaDollarPar	matchgroup=juliaDollarVar contained start="' .s:interp_dollar . '(" end=")" contains=@juliaExpressions'
@@ -279,22 +295,14 @@ syntax match   juliaChar		display "'\\x\x\{2\}'" contains=juliaHexEscapeChar
 syntax match   juliaChar		display "'\\u\x\{1,4\}'" contains=juliaUniCharSmall
 syntax match   juliaChar		display "'\\U\x\{1,8\}'" contains=juliaUniCharLarge
 
-exec 'syntax match   juliaCTransOperator	"[[:space:]}' . s:nonid_chars . s:uniop_chars . s:binop_chars . '!]\@'.s:d(1).'<!\.\?' . "'" . 'ᵀ\?"'
+exec 'syntax match   juliaCTransOperator	"[[:space:]}' . s:nonid_chars . s:op_chars_wc . '!]\@'.s:d(1).'<!\.\?' . "'" . 'ᵀ\?"'
 
 " TODO: some of these might be specialized; the rest could be just left to the
 "       generic juliaStringPrefixed fallback
 syntax region  juliaString		matchgroup=juliaStringDelim start=+\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaStringVars,@juliaSpecialChars,@juliaSpellcheckStrings
-exec 'syntax region  juliaStringPrefixed	matchgroup=juliaStringDelim start=+\<' . s:idregex . '\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialCharsRaw'
+syntax region  juliaStringPrefixed	contained matchgroup=juliaStringDelim start=+[^{([:space:]<>"]\+\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialCharsRaw
 syntax region  juliabString		matchgroup=juliaStringDelim start=+\<b\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialChars
 syntax region  juliasString		matchgroup=juliaStringDelim start=+\<s\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialChars
-syntax region  juliavString		matchgroup=juliaStringDelim start=+\<v\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialCharsRaw
-syntax region  juliaipString		matchgroup=juliaStringDelim start=+\<ip\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialCharsRaw
-syntax region  juliabigString		matchgroup=juliaStringDelim start=+\<big\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialCharsRaw
-syntax region  juliaMIMEString		matchgroup=juliaStringDelim start=+\<MIME\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialChars
-syntax region  juliarawString		matchgroup=juliaStringDelim start=+\<raw\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialCharsRaw
-syntax region  juliatextString		matchgroup=juliaStringDelim start=+\<text\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialCharsRaw
-syntax region  juliahtmlString		matchgroup=juliaStringDelim start=+\<html\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialCharsRaw
-syntax region  juliaint128String	matchgroup=juliaStringDelim start=+\<u\?int128\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpecialCharsRaw
 
 syntax region  juliaDocString		matchgroup=juliaDocStringDelim fold start=+^"""+ skip=+\%(\\\\\)*\\"+ end=+"""+ contains=@juliaStringVars,@juliaSpecialChars,@juliaSpellcheckDocStrings
 
@@ -303,7 +311,9 @@ syntax region  juliaPrintfMacro		contained transparent start="@s\?printf\s\+" en
 syntax region  juliaPrintfParBlock	contained matchgroup=juliaParDelim start="(" end=")" contains=@juliaExprsPrintf
 syntax region  juliaPrintfString	contained matchgroup=juliaStringDelim start=+"+ skip=+\%(\\\\\)*\\"+ end=+"+ contains=@juliaSpecialChars,@juliaPrintfChars
 
-exec 'syntax region  juliaDocMacro	contained transparent start=+@doc\s\+\%(' . s:idregex . '\%(\.' . s:idregex . '\)*\)\?\z("\%(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\(\z1\)\@'.s:d(3).'<=+ contains=juliaMacro,juliaDocStringM'
+exec 'syntax region  juliaDocMacroPre	contained transparent start=+@doc\s\+\%(' . s:idregex . '\%(\.' . s:idregex . '\)*\)\z("\%(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\(\z1\)\@'.s:d(3).'<=+ contains=juliaMacro,juliaDocStringMRaw'
+exec 'syntax region  juliaDocMacro	contained transparent start=+@doc\s\+\z("\%(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\(\z1\)\@'.s:d(3).'<=+ contains=juliaMacro,juliaDocStringM'
+syntax region  juliaDocStringMRaw	contained fold matchgroup=juliaDocStringDelim fold start=+\z\("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaSpellcheckDocStrings
 syntax region  juliaDocStringM		contained fold matchgroup=juliaDocStringDelim fold start=+\z\("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1+ contains=@juliaStringVars,@juliaSpecialChars,@juliaSpellcheckDocStrings
 
 syntax region  juliaShellString		matchgroup=juliaStringDelim start=+`+ skip=+\%(\\\\\)*\\`+ end=+`+ contains=@juliaStringVars,juliaSpecialChar
@@ -338,8 +348,8 @@ syntax match   juliaPrintfFmt		display contained "\\%%"hs=s+1
 " (for performance reasons)
 syntax match   juliaPossibleSymbol	transparent ":\ze[^:]" contains=juliaSymbol,juliaQuotedParBlock,juliaQuotedQMarkPar,juliaColon
 
-let s:quotable = '\%(' . s:idregex . '\|?\|' . s:operators . '\|' . s:float_regex . '\|' . s:int_regex . '\)'
-let s:quoting_colon = '\%(\%(^\s*\|\s\{6,\}\|[' . s:nonid_chars . s:uniop_chars . s:binop_chars . ']\s*\)\@'.s:d(6).'<=\|\%(\<\%(return\|if\|else\%(if\)\?\|while\|try\|begin\)\s\+\)\@'.s:d(9).'<=\)\zs:'
+let s:quotable = '\%(' . s:idregex . '\|' . s:operators . '\|[?.]\|' . s:float_regex . '\|' . s:int_regex . '\)'
+let s:quoting_colon = '\%(\%(^\s*\|\s\{6,\}\|[' . s:nonid_chars . s:op_chars_wc . ']\s*\)\@'.s:d(6).'<=\|\%(\<\%(return\|if\|else\%(if\)\?\|while\|try\|begin\)\s\+\)\@'.s:d(9).'<=\)\zs:'
 let s:quoting_colonS = '\s\@'.s:d(1).'<=:'
 
 " note: juliaSymbolS only works within whitespace-sensitive contexts,
@@ -358,15 +368,16 @@ exec 'syntax match    juliaQuotedQMarkPar	"' . s:quoting_colon . '(\s*?\s*)" con
 exec 'syntax region   juliaQuotedParBlockS	matchgroup=juliaQParDelim contained start="' . s:quoting_colonS . '(" end=")" contains=@juliaExpressions'
 
 
+syntax match   juliaTypeOperatorR1	contained "[^{([:space:]<>\"]\+\%(\s*[<>]:\)\@="
+
 " force precedence over Symbols
-exec 'syntax match   juliaTypeOperatorR	transparent "[<>:]:\s*\%(' . s:idregex . '\.\)*' . s:idregex . '" contains=juliaTypeOperator,juliaType,@juliaExpressions'
-exec 'syntax match   juliaTypeOperatorR	transparent "' . s:idregex . '\%(\.' . s:idregex . '\)*\s*[<>]:\s*\%(\%(' . s:idregex . '\.\)*' . s:idregex . '\)\?" contains=juliaTypeOperator,juliaType,@juliaExpressions'
-exec 'syntax match   juliaTypeOperatorR	transparent "\<isa\s\+\%(' . s:idregex . '\.\)*' . s:idregex . '" contains=juliaIsaKeyword,juliaType,@juliaExpressions'
-syntax match   juliaTypeOperator	contained "[:<>]:"
+syntax match   juliaTypeOperator	contained "[<>:]:"
+exec 'syntax match   juliaTypeOperatorR2	transparent "[<>:]:\s*\%(' . s:idregex . '\.\)*' . s:idregex . '" contains=juliaTypeOperator,juliaType,juliaDottedT,@juliaExpressions nextgroup=juliaTypeOperator'
 syntax match   juliaIsaKeyword		contained "\<isa\>"
+exec 'syntax match   juliaTypeOperatorR3	transparent "\<isa\s\+\%(' . s:idregex . '\.\)*' . s:idregex . '" contains=juliaIsaKeyword,juliaType,juliaDottedT,@juliaExpressions nextgroup=juliaIsaKeyword'
 
 syntax match   juliaWhereKeyword       	"\<where\>"
-exec 'syntax match   juliaWhereR	transparent "\<where\s\+' . s:idregex . '" contains=juliaWhereKeyword,juliaType,juliaTypeOperatorR'
+exec 'syntax match   juliaWhereR	transparent "\<where\s\+' . s:idregex . '" contains=juliaWhereKeyword,juliaType,juliaDottedT,juliaIdSymbol'
 
 syntax region  juliaCommentL		matchgroup=juliaCommentDelim excludenl start="#\ze\%([^=]\|$\)" end="$" contains=juliaTodo,@juliaSpellcheckComments
 syntax region  juliaCommentM		matchgroup=juliaCommentDelim fold start="#=\ze\%([^#]\|$\)" end="=#" contains=juliaTodo,juliaCommentM,@juliaSpellcheckComments
@@ -433,6 +444,8 @@ hi def link juliaBaseTypeTime		Type
 hi def link juliaBaseTypeOther		Type
 
 hi def link juliaType			Type
+hi def link juliaParamType		Type
+hi def link juliaTypeOperatorR1		Type
 
 " NOTE: deprecated constants are not highlighted as such. For once,
 " one can still legitimately use them by importing Base.MathConstants.
@@ -485,6 +498,7 @@ hi def link juliaPrintfString		juliaString
 hi def link juliaShellString		juliaString
 hi def link juliaDocString		juliaString
 hi def link juliaDocStringM		juliaDocString
+hi def link juliaDocStringMRaw		juliaDocString
 hi def link juliaStringDelim		juliaString
 hi def link juliaDocStringDelim		juliaDocString
 hi def link juliaStringVarsPla		Identifier
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index 9da75fa99..ca7fbef55 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language: Kotlin
 " Maintainer: Alexander Udalov
-" Latest Revision: 11 April 2021
+" Latest Revision: 20 April 2021
 
 if exists('b:current_syntax')
     finish
@@ -47,7 +47,7 @@ syn keyword ktType Synchronized Target TestTimeSource ThreadLocal Throwable Thro
 syn keyword ktType UByteIterator UInt UIntArray UIntIterator UIntProgression UIntRange ULong ULongArray ULongIterator ULongProgression ULongRange UShort UShortArray UShortIterator
 syn keyword ktType UninitializedPropertyAccessException Unit UnsafeVariance UnsupportedOperationException UseExperimental Volatile
 
-syn keyword ktModifier annotation companion enum inner abstract final open override sealed vararg dynamic expect actual
+syn keyword ktModifier annotation companion enum inner abstract final open override sealed vararg dynamic expect actual suspend
 syn keyword ktStructure class object interface typealias fun val var constructor init
 
 syn keyword ktReservedKeyword typeof
@@ -58,10 +58,10 @@ syn keyword ktConstant null
 syn keyword ktModifier reified external inline noinline crossinline
 
 syn match ktModifier "\v<(data|value)>\ze\@=.*<class>"
-syn match ktModifier "\v<(tailrec|operator|infix|suspend)>\ze\@=.*<fun>"
+syn match ktModifier "\v<(tailrec|operator|infix)>\ze\@=.*<fun>"
 syn match ktModifier "\v<(const)>\ze\@=.*<val>"
 syn match ktModifier "\v<(lateinit)>\ze\@=.*<var>"
-syn match ktModifier "\v<(internal|private|protected|public)>\ze\@=.*<(class|object|fun|val|var|typealias|constructor)>"
+syn match ktModifier "\v<(internal|private|protected|public)>\ze\@=.*<(class|object|interface|typealias|fun|val|var|constructor|get|set)>"
 
 syn match ktOperator "\v\?:|::|\<\=? | \>\=?|[!=]\=\=?|<as>\??|[-!%&*+/|]"
 
diff --git a/syntax/llvm.vim b/syntax/llvm.vim
index cc5f50bb0..ee58753f3 100644
--- a/syntax/llvm.vim
+++ b/syntax/llvm.vim
@@ -59,6 +59,7 @@ syn keyword llvmKeyword
       \ available_externally
       \ blockaddress
       \ builtin
+      \ byref
       \ byval
       \ c
       \ catch
@@ -110,6 +111,7 @@ syn keyword llvmKeyword
       \ module
       \ monotonic
       \ msp430_intrcc
+      \ mustprogress
       \ musttail
       \ naked
       \ nest
@@ -123,6 +125,7 @@ syn keyword llvmKeyword
       \ norecurse
       \ noredzone
       \ noreturn
+      \ noundef
       \ nounwind
       \ optnone
       \ optsize
diff --git a/syntax/meson.vim b/syntax/meson.vim
index 6efb3c28e..1a6cda37e 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -6,6 +6,7 @@ endif
 " Language:	Meson
 " License:	VIM License
 " Maintainer:	Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
+"		Liam Beguin <liambeguin@gmail.com>
 " Last Change:	2016 Dec 7
 " Credits:	Zvezdan Petkovic <zpetkovic@acm.org>
 "		Neil Schemenauer <nas@meson.ca>
diff --git a/syntax/mlir.vim b/syntax/mlir.vim
index 9bfd7f35a..6539cbdc9 100644
--- a/syntax/mlir.vim
+++ b/syntax/mlir.vim
@@ -17,12 +17,17 @@ endif
 syn case match
 
 " Types.
+"
 syn keyword mlirType index f16 f32 f64
-" Integer type.
+" Signless integer types.
 syn match mlirType /\<i\d\+\>/
+" Unsigned integer types.
+syn match mlirType /\<ui\d\+\>/
+" Signed integer types.
+syn match mlirType /\<si\d\+\>/
 
 " Elemental types inside memref, tensor, or vector types.
-syn match mlirType /x\s*\zs\(f16\|f32\|f64\|i\d\+\)/
+syn match mlirType /x\s*\zs\(f16\|f32\|f64\|i\d\+\|ui\d\+\|si\d\+\)/
 
 " Shaped types.
 syn match mlirType /\<memref\ze\s*<.*>/
@@ -33,13 +38,14 @@ syn match mlirType /\<vector\ze\s*<.*>/
 syn match mlirType /x\s*\zsvector/
 
 " Operations.
-" Core ops (not exhaustive yet).
-" TODO: the list is not exhaustive.
-syn keyword mlirOps alloc alloca addf addi call call_indirect cmpf cmpi constant
-syn keyword mlirOps dealloc divf dma_start dma_wait dim extract_element
-syn keyword mlirOps getTensor index_cast load memref_cast memref_shape_cast
-syn keyword mlirOps mulf muli negf prefetch sitofp splat store select subf subi
-syn keyword mlirOps subview tensor_cast view
+" Standard dialect ops.
+" TODO: this list is not exhaustive.
+syn keyword mlirOps alloc alloca addf addi and call call_indirect cmpf cmpi
+syn keyword mlirOps constant dealloc divf dma_start dma_wait dim exp
+syn keyword mlirOps getTensor index_cast load log memref_cast
+syn keyword mlirOps memref_shape_cast mulf muli negf powf prefetch rsqrt sitofp
+syn keyword mlirOps splat store select sqrt subf subi subview tanh
+syn keyword mlirOps view
 
 " Affine ops.
 syn match mlirOps /\<affine\.apply\>/
@@ -48,6 +54,7 @@ syn match mlirOps /\<affine\.dma_wait\>/
 syn match mlirOps /\<affine\.for\>/
 syn match mlirOps /\<affine\.if\>/
 syn match mlirOps /\<affine\.load\>/
+syn match mlirOps /\<affine\.parallel\>/
 syn match mlirOps /\<affine\.prefetch\>/
 syn match mlirOps /\<affine\.store\>/
 syn match mlirOps /\<loop\.for\>/
diff --git a/syntax/modula3.vim b/syntax/modula3.vim
index 7ebb966eb..20ce0f4e9 100644
--- a/syntax/modula3.vim
+++ b/syntax/modula3.vim
@@ -3,61 +3,98 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'modula3', 'syntax/modula3.vim
 endif
 
 " Vim syntax file
-" Language:	Modula-3
-" Maintainer:	Timo Pedersen <dat97tpe@ludat.lth.se>
-" Last Change:	2001 May 10
+" Language:		Modula-3
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Timo Pedersen <dat97tpe@ludat.lth.se>
+" Last Change:		2021 Apr 08
 
-" Basic things only...
-" Based on the modula 2 syntax file
-
-" quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 
-" Modula-3 is case-sensitive
-" syn case ignore
-
 " Modula-3 keywords
-syn keyword modula3Keyword ABS ADDRES ADR ADRSIZE AND ANY
-syn keyword modula3Keyword ARRAY AS BITS BITSIZE BOOLEAN BRANDED BY BYTESIZE
-syn keyword modula3Keyword CARDINAL CASE CEILING CHAR CONST DEC DEFINITION
-syn keyword modula3Keyword DISPOSE DIV
-syn keyword modula3Keyword EVAL EXIT EXCEPT EXCEPTION
-syn keyword modula3Keyword EXIT EXPORTS EXTENDED FALSE FINALLY FIRST FLOAT
-syn keyword modula3Keyword FLOOR FROM GENERIC IMPORT
-syn keyword modula3Keyword IN INC INTEGER ISTYPE LAST LOCK
-syn keyword modula3Keyword LONGREAL LOOPHOLE MAX METHOD MIN MOD MUTEX
-syn keyword modula3Keyword NARROW NEW NIL NOT NULL NUMBER OF OR ORD RAISE
-syn keyword modula3Keyword RAISES READONLY REAL RECORD REF REFANY
-syn keyword modula3Keyword RETURN ROOT
-syn keyword modula3Keyword ROUND SET SUBARRAY TEXT TRUE TRUNC TRY TYPE
-syn keyword modula3Keyword TYPECASE TYPECODE UNSAFE UNTRACED VAL VALUE VAR WITH
+syn keyword modula3Keyword ANY ARRAY AS BITS BRANDED BY CASE CONST DEFINITION
+syn keyword modula3Keyword EVAL EXIT EXCEPT EXCEPTION EXIT EXPORTS FINALLY
+syn keyword modula3Keyword FROM GENERIC IMPORT LOCK METHOD OF RAISE RAISES
+syn keyword modula3Keyword READONLY RECORD REF RETURN SET TRY TYPE TYPECASE
+syn keyword modula3Keyword UNSAFE VALUE VAR WITH
+
+syn match modula3keyword "\<UNTRACED\>"
 
 " Special keywords, block delimiters etc
 syn keyword modula3Block PROCEDURE FUNCTION MODULE INTERFACE REPEAT THEN
 syn keyword modula3Block BEGIN END OBJECT METHODS OVERRIDES RECORD REVEAL
 syn keyword modula3Block WHILE UNTIL DO TO IF FOR ELSIF ELSE LOOP
 
-" Comments
-syn region modula3Comment start="(\*" end="\*)"
+" Reserved identifiers
+syn keyword modula3Identifier ABS ADR ADRSIZE BITSIZE BYTESIZE CEILING DEC
+syn keyword modula3Identifier DISPOSE FIRST FLOAT FLOOR INC ISTYPE LAST
+syn keyword modula3Identifier LOOPHOLE MAX MIN NARROW NEW NUMBER ORD ROUND
+syn keyword modula3Identifier SUBARRAY TRUNC TYPECODE VAL
+
+" Predefined types
+syn keyword modula3Type ADDRESS BOOLEAN CARDINAL CHAR EXTENDED INTEGER
+syn keyword modula3Type LONGCARD LONGINT LONGREAL MUTEX NULL REAL REFANY TEXT
+syn keyword modula3Type WIDECHAR
+
+syn match modula3Type "\<\%(UNTRACED\s\+\)\=ROOT\>"
+
+" Operators
+syn keyword modulaOperator DIV MOD IN AND OR NOT
+
+if exists("modula3_operators")
+  syn match modula3Operator "\^"
+  syn match modula3Operator "+\|-\|\*\|/\|&"
+  " TODO: need to exclude = in procedure definitions
+  syn match modula3Operator "<=\|<\|>=\|>\|:\@<!=\|#"
+endif
+
+" Booleans
+syn keyword modula3Boolean TRUE FALSE
+
+" Nil
+syn keyword modula3Nil NIL
+
+" Integers
+syn match modula3Integer "\<\d\+L\=\>"
+syn match modula3Integer "\<\d\d\=_\x\+L\=\>"
+
+" Reals
+syn match modula3Real	 "\c\<\d\+\.\d\+\%([EDX][+-]\=\d\+\)\=\>"
+
+" String escape sequences
+syn match modula3Escape "\\['"ntrf]" contained display
+syn match modula3Escape "\\\o\{3}"   contained display
+syn match modula3Escape "\\\\"	     contained display
+
+" Characters
+syn match modula3Character "'\%([^']\|\\.\|\\\o\{3}\)'" contains=modula3Escape
 
 " Strings
-syn region modula3String start=+"+ end=+"+
-syn region modula3String start=+'+ end=+'+
+syn region modula3String start=+"+ end=+"+ contains=modula3Escape
 
-" Define the default highlighting.
-" Only when an item doesn't have highlighting yet
+" Pragmas
+syn region modula3Pragma start="<\*" end="\*>"
 
-" The default methods for highlighting.  Can be overridden later
-hi def link modula3Keyword	Statement
-hi def link modula3Block		PreProc
-hi def link modula3Comment	Comment
-hi def link modula3String		String
+" Comments
+syn region modula3Comment start="(\*" end="\*)" contains=modula3Comment,@Spell
 
+" Default highlighting
+hi def link modula3Block	Statement
+hi def link modula3Boolean	Boolean
+hi def link modula3Character	Character
+hi def link modula3Comment	Comment
+hi def link modula3Escape	Special
+hi def link modula3Identifier	Keyword
+hi def link modula3Integer	Number
+hi def link modula3Keyword	Statement
+hi def link modula3Nil		Constant
+hi def link modula3Operator	Operator
+hi def link modula3Pragma	PreProc
+hi def link modula3Real		Float
+hi def link modula3String	String
+hi def link modula3Type		Type
 
 let b:current_syntax = "modula3"
 
-"I prefer to use this...
-"set ai
-"vim: ts=8
+" vim: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/syntax/nix.vim b/syntax/nix.vim
index 87c83feda..c3185bad7 100644
--- a/syntax/nix.vim
+++ b/syntax/nix.vim
@@ -124,7 +124,7 @@ syn region nixWithExpr matchgroup=nixWithExprKeyword start="\<with\>" matchgroup
 
 syn region nixAssertExpr matchgroup=nixAssertKeyword start="\<assert\>" matchgroup=NONE end=";" contains=@nixExpr
 
-syn cluster nixExpr contains=nixBoolean,nixNull,nixOperator,nixParen,nixInteger,nixRecKeyword,nixConditional,nixBuiltin,nixSimpleBuiltin,nixComment,nixFunctionCall,nixFunctionArgument,nixSimpleFunctionArgument,nixPath,nixHomePath,nixSearchPathRef,nixURI,nixAttributeSet,nixList,nixSimpleString,nixString,nixLetExpr,nixIfExpr,nixWithExpr,nixAssertExpr,nixInterpolation
+syn cluster nixExpr contains=nixBoolean,nixNull,nixOperator,nixParen,nixInteger,nixRecKeyword,nixConditional,nixBuiltin,nixSimpleBuiltin,nixComment,nixFunctionCall,nixFunctionArgument,nixArgOperator,nixSimpleFunctionArgument,nixPath,nixHomePath,nixSearchPathRef,nixURI,nixAttributeSet,nixList,nixSimpleString,nixString,nixLetExpr,nixIfExpr,nixWithExpr,nixAssertExpr,nixInterpolation
 
 " These definitions override @nixExpr and have to come afterwards:
 
diff --git a/syntax/pascal.vim b/syntax/pascal.vim
index cd401cc14..3080352e9 100644
--- a/syntax/pascal.vim
+++ b/syntax/pascal.vim
@@ -3,18 +3,18 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'pascal', 'syntax/pascal.vim')
 endif
 
 " Vim syntax file
-" Language:	Pascal
-" Version: 2.8
-" Last Change:	2004/10/17 17:47:30
-" Maintainer:  Xavier Crégut <xavier.cregut@enseeiht.fr>
-" Previous Maintainer:	Mario Eusebio <bio@dq.fct.unl.pt>
+" Language:		Pascal
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainers:	Xavier Crégut <xavier.cregut@enseeiht.fr>
+"			Mario Eusebio <bio@dq.fct.unl.pt>
+" Last Change:		2021 Apr 23
 
 " Contributors: Tim Chase <tchase@csc.com>,
-"	Stas Grabois <stsi@vtrails.com>,
-"	Mazen NEIFER <mazen.neifer.2001@supaero.fr>,
-"	Klaus Hast <Klaus.Hast@arcor.net>,
-"	Austin Ziegler <austin@halostatue.ca>,
-"	Markus Koenig <markus@stber-koenig.de>
+"		Stas Grabois <stsi@vtrails.com>,
+"		Mazen NEIFER <mazen.neifer.2001@supaero.fr>,
+"		Klaus Hast <Klaus.Hast@arcor.net>,
+"		Austin Ziegler <austin@halostatue.ca>,
+"		Markus Koenig <markus@stber-koenig.de>
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -29,10 +29,10 @@ syn keyword pascalBoolean	true false
 syn keyword pascalConditional	if else then
 syn keyword pascalConstant	nil maxint
 syn keyword pascalLabel		case goto label
-syn keyword pascalOperator	and div downto in mod not of or packed with
+syn keyword pascalOperator	and div downto in mod not of or packed
 syn keyword pascalRepeat	do for do repeat while to until
 syn keyword pascalStatement	procedure function
-syn keyword pascalStatement	program begin end const var type
+syn keyword pascalStatement	program begin end const var type with
 syn keyword pascalStruct	record
 syn keyword pascalType		array boolean char integer file pointer real set
 syn keyword pascalType		string text variant
@@ -44,12 +44,12 @@ syn keyword pascalTodo contained	TODO FIXME XXX DEBUG NOTE
     " 20010723az: When wanted, highlight the trailing whitespace -- this is
     " based on c_space_errors; to enable, use "pascal_space_errors".
 if exists("pascal_space_errors")
-    if !exists("pascal_no_trail_space_error")
-        syn match pascalSpaceError "\s\+$"
-    endif
-    if !exists("pascal_no_tab_space_error")
-        syn match pascalSpaceError " \+\t"me=e-1
-    endif
+  if !exists("pascal_no_trail_space_error")
+    syn match pascalSpaceError "\s\+$"
+  endif
+  if !exists("pascal_no_tab_space_error")
+    syn match pascalSpaceError " \+\t"me=e-1
+  endif
 endif
 
 
@@ -102,9 +102,24 @@ if exists("pascal_symbol_operator")
 endif
 
 syn match  pascalNumber		"-\=\<\d\+\>"
+if !exists("pascal_traditional")
+  syn match  pascalHexNumber	"\$\x\+\>"
+endif
+if exists("pascal_fpc")
+  syn match	pascalOctNumber "&\o\+\>"
+  syn match	pascalBinNumber	"%[01]\+\>"
+endif
+if exists("pascal_gpc")
+  syn match  pascalExtendedNumber	"\%([2-9]\|[12]\d\|3[0-6]\)#[[:alnum:]]\+\>"
+endif
+
 syn match  pascalFloat		"-\=\<\d\+\.\d\+\>"
 syn match  pascalFloat		"-\=\<\d\+\.\d\+[eE]-\=\d\+\>"
-syn match  pascalHexNumber	"\$[0-9a-fA-F]\+\>"
+
+if !exists("pascal_traditional")
+  " allow leading zeros
+  syn match pascalControlCharacter	"#\%([01]\=\d\=\d\|2[0-4]\d\|25[0-5]\)\>"
+endif
 
 if exists("pascal_no_tabs")
   syn match pascalShowTab "\t"
@@ -146,7 +161,7 @@ if !exists("pascal_traditional")
   syn keyword pascalStatement	interface unit uses
   syn keyword pascalModifier	absolute assembler external far forward inline
   syn keyword pascalModifier	interrupt near virtual 
-  syn keyword pascalAcces	private public 
+  syn keyword pascalAccess	private public strict
   syn keyword pascalStruct	object 
   syn keyword pascalOperator	shl shr xor
 
@@ -161,6 +176,7 @@ if !exists("pascal_traditional")
   syn keyword pascalType	Single Double Extended Comp
   syn keyword pascalType	PChar
 
+  syn keyword pascalPredefined	self
 
   if !exists ("pascal_fpc")
     syn keyword pascalPredefined	Result
@@ -170,11 +186,11 @@ if !exists("pascal_traditional")
     syn region pascalComment        start="//" end="$" contains=pascalTodo,pascalSpaceError
     syn keyword pascalStatement	fail otherwise operator
     syn keyword pascalDirective	popstack
-    syn keyword pascalPredefined self
     syn keyword pascalType	ShortString AnsiString WideString
   endif
 
   if exists("pascal_gpc")
+    syn region pascalComment        start="//" end="$" contains=pascalTodo,pascalSpaceError
     syn keyword pascalType	SmallInt
     syn keyword pascalType	AnsiChar
     syn keyword pascalType	PAnsiChar
@@ -182,6 +198,8 @@ if !exists("pascal_traditional")
 
   if exists("pascal_delphi")
     syn region pascalComment	start="//"  end="$" contains=pascalTodo,pascalSpaceError
+    syn region pascalDocumentation	start="///" end="$" contains=pascalTodo,pascalSpaceError
+    syn region pascalDocumentation	start="{!"  end="}" contains=pascalTodo,pascalSpaceError
     syn keyword pascalType	SmallInt Int64
     syn keyword pascalType	Real48 Currency
     syn keyword pascalType	AnsiChar WideChar
@@ -196,11 +214,11 @@ if !exists("pascal_traditional")
     syn keyword pascalStatement	initialization finalization uses exports
     syn keyword pascalStatement	property out resourcestring threadvar
     syn keyword pascalModifier	contains
-    syn keyword pascalModifier	overridden reintroduce abstract
+    syn keyword pascalModifier	overridden reintroduce abstract sealed
     syn keyword pascalModifier	override export dynamic name message
     syn keyword pascalModifier	dispid index stored default nodefault readonly
     syn keyword pascalModifier	writeonly implements overload requires resident
-    syn keyword pascalAcces	protected published automated
+    syn keyword pascalAccess	protected published automated
     syn keyword pascalDirective	register pascal cvar cdecl stdcall safecall
     syn keyword pascalOperator	as is
   endif
@@ -323,37 +341,43 @@ endif
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
-hi def link pascalAcces		pascalStatement
+hi def link pascalAccess		pascalStatement
 hi def link pascalBoolean		Boolean
 hi def link pascalComment		Comment
-hi def link pascalConditional	Conditional
+hi def link pascalDocumentation		Comment
+hi def link pascalConditional		Conditional
 hi def link pascalConstant		Constant
-hi def link pascalDelimiter	Identifier
-hi def link pascalDirective	pascalStatement
-hi def link pascalException	Exception
-hi def link pascalFloat		Float
+hi def link pascalControlCharacter	Character
+hi def link pascalDelimiter		Identifier
+hi def link pascalDirective		pascalStatement
+hi def link pascalException		Exception
+hi def link pascalFloat			Float
 hi def link pascalFunction		Function
-hi def link pascalLabel		Label
+hi def link pascalLabel			Label
 hi def link pascalMatrixDelimiter	Identifier
 hi def link pascalModifier		Type
 hi def link pascalNumber		Number
+hi def link pascalExtendedNumber	Number
+hi def link pascalBinNumber		pascalNumber
+hi def link pascalHexNumber		pascalNumber
+hi def link pascalOctNumber		pascalNumber
 hi def link pascalOperator		Operator
-hi def link pascalPredefined	pascalStatement
+hi def link pascalPredefined		pascalStatement
 hi def link pascalPreProc		PreProc
 hi def link pascalRepeat		Repeat
-hi def link pascalSpaceError	Error
-hi def link pascalStatement	Statement
+hi def link pascalSpaceError		Error
+hi def link pascalStatement		Statement
 hi def link pascalString		String
-hi def link pascalStringEscape	Special
+hi def link pascalStringEscape		Special
 hi def link pascalStringEscapeGPC	Special
-hi def link pascalStringError	Error
+hi def link pascalStringError		Error
 hi def link pascalStruct		pascalStatement
 hi def link pascalSymbolOperator	pascalOperator
-hi def link pascalTodo		Todo
-hi def link pascalType		Type
-hi def link pascalUnclassified	pascalStatement
+hi def link pascalTodo			Todo
+hi def link pascalType			Type
+hi def link pascalUnclassified		pascalStatement
 "  hi def link pascalAsm		Assembler
-hi def link pascalError		Error
+hi def link pascalError			Error
 hi def link pascalAsmKey		pascalStatement
 hi def link pascalShowTab		Error
 
@@ -361,4 +385,4 @@ hi def link pascalShowTab		Error
 
 let b:current_syntax = "pascal"
 
-" vim: ts=8 sw=2
+" vim: nowrap sw=2 sts=2 ts=8 noet:
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 43218edb6..48bccdc67 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -8,8 +8,8 @@ endif
 " Version:      2.3.1
 " License:      Vim license (see `:help license`)
 
-" Based on PostgreSQL 13.1
-" Automatically generated on 2021-02-07 at 10:45:10
+" Based on PostgreSQL 13.2
+" Automatically generated on 2021-04-22 at 08:36:13
 
 if exists("b:current_syntax")
   finish
@@ -717,8 +717,8 @@ syn keyword sqlConstant contained pageinspect pg_buffercache pg_freespacemap pg_
 syn keyword sqlConstant contained pg_stat_statements pg_trgm pg_visibility pgcrypto pgrouting pgrowlocks
 syn keyword sqlConstant contained pgstattuple pgtap plperl plperlu plpgsql pltcl pltclu postgis
 syn keyword sqlConstant contained postgis_raster postgis_sfcgal postgis_tiger_geocoder postgis_topology
-syn keyword sqlConstant contained postgres_fdw refint seg sslinfo tablefunc tcn temporal_tables tsm_system_rows
-syn keyword sqlConstant contained tsm_system_time unaccent xml2
+syn keyword sqlConstant contained postgres_fdw refint seg sslinfo tablefunc tcn temporal_tables
+syn keyword sqlConstant contained tsm_system_rows tsm_system_time unaccent xml2
 " Legacy extensions names
 syn keyword sqlConstant contained chkpass hstore_plpython2u hstore_plpython3u hstore_plpythonu
 syn keyword sqlConstant contained jsonb_plpython3u ltree_plpython2u ltree_plpython3u
@@ -2018,10 +2018,10 @@ let s:plgroups = 'plpgsql'
 
 " PL/<any other language>
 fun! s:add_syntax(s)
-  execute 'syn include @PL' .. a:s .. ' syntax/' .. a:s .. '.vim'
+  execute 'syn include @PL' . a:s . ' syntax/' . a:s . '.vim'
   unlet b:current_syntax
-  execute 'syn region pgsqlpl' .. a:s .. ' matchgroup=sqlString start=+\$' .. a:s .. '\$+ end=+\$' .. a:s .. '\$+ keepend contains=@PL' .. a:s
-  let s:plgroups .= ',pgsqlpl' .. a:s
+  execute 'syn region pgsqlpl' . a:s . ' matchgroup=sqlString start=+\$' . a:s . '\$+ end=+\$' . a:s . '\$+ keepend contains=@PL' .. a:s
+  let s:plgroups .= ',pgsqlpl' . a:s
 endf
 
 for pl in get(b:, 'pgsql_pl', get(g:, 'pgsql_pl', []))
@@ -2032,12 +2032,12 @@ endfor
 if get(g:, 'pgsql_fold_functions_only', 0)
 
     execute 'syn region sqlFold start=/^\s*\zs\c\%(create\s\+[a-z ]*\%(function\|procedure\)\|do\)\>/ end=/;$/ transparent fold '
-        \ .. "contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo," .. s:plgroups
+        \ . "contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo," . s:plgroups
 
 else
 
     execute 'syn region sqlFold start=/^\s*\zs\c\(create\|update\|alter\|select\|insert\|do\)\>/ end=/;$/ transparent fold '
-        \ .. "contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo," .. s:plgroups
+        \ . "contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlIdentifier,sqlNumber,sqlOperator,sqlSpecial,sqlString,sqlTodo," . s:plgroups
 
 endif
 
@@ -2071,3 +2071,4 @@ hi def link sqlCreateOperatorKeyword sqlKeyword
 hi def link sqlCreateTextSearchKeyword sqlKeyword
 
 let b:current_syntax = "sql"
+
diff --git a/syntax/ratpoison.vim b/syntax/ratpoison.vim
index 1a452d4aa..467233660 100644
--- a/syntax/ratpoison.vim
+++ b/syntax/ratpoison.vim
@@ -6,10 +6,9 @@ endif
 " Language:	Ratpoison configuration/commands file ( /etc/ratpoisonrc ~/.ratpoisonrc )
 " Maintainer:	Magnus Woldrich <m@japh.se>
 " URL:		http://github.com/trapd00r/vim-syntax-ratpoison
-" Last Change:	2011 Apr 11
+" Last Change:	2021-04-12 13:46:04
 " Previous Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
 
-" quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
@@ -42,7 +41,7 @@ syn keyword ratpoisonCommandArg select set setenv sfdump shrink			contained
 syn keyword ratpoisonCommandArg source sselect startup_message time title	contained
 syn keyword ratpoisonCommandArg tmpwm unalias undefinekey undo unmanage		contained
 syn keyword ratpoisonCommandArg unsetenv verbexec version vsplit warp		contained
-syn keyword ratpoisonCommandArg windows						contained
+syn keyword ratpoisonCommandArg windows framefmt infofmt			contained
 
 syn match   ratpoisonGravityArg "\<\(n\|north\)\>"	contained
 syn match   ratpoisonGravityArg "\<\(nw\|northwest\)\>"	contained
@@ -96,19 +95,27 @@ syn keyword ratpoisonSetArg	barpadding	contained nextgroup=ratpoisonNumberArg
 syn keyword ratpoisonSetArg	bgcolor
 syn keyword ratpoisonSetArg	border		contained nextgroup=ratpoisonNumberArg
 syn keyword ratpoisonSetArg	fgcolor
+syn keyword ratpoisonSetArg	framefmt	contained nextgroup=ratpoisonWinFmtArg
 syn keyword ratpoisonSetArg	fwcolor
+syn keyword ratpoisonSetArg	framemsgwait	contained nextgroup=ratpoisonNumberArg
+syn keyword ratpoisonSetArg	gravity 	contained nextgroup=ratpoisonGravityArg
 syn keyword ratpoisonSetArg	bwcolor
+syn keyword ratpoisonSetArg	gravity	contained nextgroup=ratpoisonGravityArg
 syn keyword ratpoisonSetArg	historysize
 syn keyword ratpoisonSetArg	historycompaction
 syn keyword ratpoisonSetArg	historyexpansion
+syn keyword ratpoisonSetArg	infofmt         contained nextgroup=ratpoisonWinFmtArg
 syn keyword ratpoisonSetArg	topkmap
 syn keyword ratpoisonSetArg	barinpadding
 syn keyword ratpoisonSetArg	font
 syn keyword ratpoisonSetArg	framesels
+syn keyword ratpoisonSetArg	maxundos
 syn keyword ratpoisonSetArg	inputwidth	contained nextgroup=ratpoisonNumberArg
 syn keyword ratpoisonSetArg	maxsizegravity	contained nextgroup=ratpoisonGravityArg
+syn keyword ratpoisonSetArg	msgwait	        contained nextgroup=ratpoisonNumberArg
 syn keyword ratpoisonSetArg	padding		contained nextgroup=ratpoisonNumberArg
 syn keyword ratpoisonSetArg	resizeunit	contained nextgroup=ratpoisonNumberArg
+syn keyword ratpoisonSetArg	startup_message
 syn keyword ratpoisonSetArg	transgravity	contained nextgroup=ratpoisonGravityArg
 syn keyword ratpoisonSetArg	waitcursor	contained nextgroup=ratpoisonNumberArg
 syn keyword ratpoisonSetArg	winfmt		contained nextgroup=ratpoisonWinFmtArg
@@ -117,6 +124,8 @@ syn keyword ratpoisonSetArg	winliststyle	contained nextgroup=ratpoisonWinListArg
 syn keyword ratpoisonSetArg	winname		contained nextgroup=ratpoisonWinNameArg
 
 syn match   ratpoisonWinFmtArg  "%[nstacil]"			contained nextgroup=ratpoisonWinFmtArg skipwhite
+syn match   ratpoisonFrameFmtArg  "%[nstacil]"			contained nextgroup=ratpoisonWinFmtArg skipwhite
+syn match   ratpoisonInfoFmtArg  "%[nstacil]"			contained nextgroup=ratpoisonWinFmtArg skipwhite
 
 syn match   ratpoisonWinListArg "\<\(row\|column\)\>"		contained
 
@@ -130,6 +139,7 @@ syn match   ratpoisonDefCommand		"^\s*defbgcolor\s*"
 syn match   ratpoisonDefCommand		"^\s*defborder\s*"		nextgroup=ratpoisonNumberArg
 syn match   ratpoisonDefCommand		"^\s*deffgcolor\s*"
 syn match   ratpoisonDefCommand		"^\s*deffont\s*"
+syn match   ratpoisonDefCommand		"^\s*defframefmt\s*"		nextgroup=ratpoisonWinFmtArg
 syn match   ratpoisonDefCommand		"^\s*defframesels\s*"
 syn match   ratpoisonDefCommand		"^\s*definputwidth\s*"		nextgroup=ratpoisonNumberArg
 syn match   ratpoisonDefCommand		"^\s*defmaxsizegravity\s*"	nextgroup=ratpoisonGravityArg
@@ -247,14 +257,13 @@ syn match   ratpoisonVoidCommand	"^\s*\zsversion\ze\s*$"
 syn match   ratpoisonVoidCommand	"^\s*\zsvsplit\ze\s*$"
 syn match   ratpoisonVoidCommand	"^\s*\zswindows\ze\s*$"
 
-" Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-
 hi def link ratpoisonBooleanArg	Boolean
 hi def link ratpoisonCommandArg	Keyword
 hi def link ratpoisonComment	Comment
 hi def link ratpoisonDefCommand	Identifier
+hi def link ratpoisonFrameFmtArg	Special
 hi def link ratpoisonGravityArg	Constant
+hi def link ratpoisonInfoFmtArg    Special
 hi def link ratpoisonKeySeqArg	Special
 hi def link ratpoisonNumberArg	Number
 hi def link ratpoisonSetArg	Keyword
@@ -265,7 +274,6 @@ hi def link ratpoisonWinFmtArg	Special
 hi def link ratpoisonWinNameArg	Constant
 hi def link ratpoisonWinListArg	Constant
 
-
 let b:current_syntax = "ratpoison"
 
 " vim: ts=8
diff --git a/syntax/rmd.vim b/syntax/rmd.vim
index 93e5a7f56..de809c373 100644
--- a/syntax/rmd.vim
+++ b/syntax/rmd.vim
@@ -5,7 +5,7 @@ endif
 " markdown Text with R statements
 " Language: markdown with R code chunks
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change: Thu Apr 18, 2019  09:17PM
+" Last Change: Wed Apr 21, 2021  09:55AM
 "
 "   For highlighting pandoc extensions to markdown like citations and TeX and
 "   many other advanced features like folding of markdown sections, it is
@@ -17,27 +17,45 @@ if exists("b:current_syntax")
   finish
 endif
 
-" Configuration if not using pandoc syntax:
-" Add syntax highlighting of YAML header
-let g:rmd_syn_hl_yaml = get(g:, 'rmd_syn_hl_yaml', 1)
-" Add syntax highlighting of citation keys
-let g:rmd_syn_hl_citations = get(g:, 'rmd_syn_hl_citations', 1)
-" Highlight the header of the chunk of R code
-let g:rmd_syn_hl_chunk = get(g:, 'g:rmd_syn_hl_chunk', 0)
+" Highlight the header of the chunks as R code
+let g:rmd_syn_hl_chunk = get(g:, 'rmd_syn_hl_chunk', 0)
 
 " Pandoc-syntax has more features, but it is slower.
 " https://github.com/vim-pandoc/vim-pandoc-syntax
 let g:pandoc#syntax#codeblocks#embeds#langs = get(g:, 'pandoc#syntax#codeblocks#embeds#langs', ['r'])
 runtime syntax/pandoc.vim
 if exists("b:current_syntax")
-  " Fix recognition of R code
-  syn region pandocDelimitedCodeBlock_r start=/^```{r\>.*}$/ end=/^```$/ contained containedin=pandocDelimitedCodeBlock contains=@R
+  " Recognize inline R code
   syn region rmdrInline matchgroup=rmdInlineDelim start="`r "  end="`" contains=@R containedin=pandocLaTeXRegion,yamlFlowString keepend
   hi def link rmdInlineDelim Delimiter
+
+  " Fix recognition of language chunks (code adapted from pandoc, 2021-03-28)
+  " Knitr requires braces in the block's header
+  for s:lng in g:pandoc#syntax#codeblocks#embeds#langs
+    let s:nm = matchstr(s:lng, '^[^=]*')
+    exe 'syn clear pandocDelimitedCodeBlock_'.s:nm
+    exe 'syn clear pandocDelimitedCodeBlockinBlockQuote_'.s:nm
+    if g:rmd_syn_hl_chunk
+      exe 'syn region rmd'.s:nm.'ChunkDelim matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>" matchgroup=rmdCodeDelim end="}$" keepend containedin=rmd'.s:nm.'Chunk contains=@R'
+      exe 'syn region rmd'.s:nm.'Chunk start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=rmd'.s:nm.'ChunkDelim,@'.toupper(s:nm)
+    else
+      exe 'syn region rmd'.s:nm.'Chunk matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=@'.toupper(s:nm)
+    endif
+  endfor
+  unlet s:lng
+  unlet s:nm
+  hi def link rmdInlineDelim Delimiter
+  hi def link rmdCodeDelim Delimiter
   let b:current_syntax = "rmd"
   finish
 endif
 
+" Configuration if not using pandoc syntax:
+" Add syntax highlighting of YAML header
+let g:rmd_syn_hl_yaml = get(g:, 'rmd_syn_hl_yaml', 1)
+" Add syntax highlighting of citation keys
+let g:rmd_syn_hl_citations = get(g:, 'rmd_syn_hl_citations', 1)
+
 let s:cpo_save = &cpo
 set cpo&vim
 
@@ -67,15 +85,17 @@ for s:type in g:rmd_fenced_languages
   unlet! b:current_syntax
   exe 'syn include @Rmd'.s:nm.' syntax/'.s:ft.'.vim'
   if g:rmd_syn_hl_chunk
-    exe 'syn region rmd'.s:nm.'ChunkDelim matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>" matchgroup=rmdCodeDelim end="}$" keepend containedin=rmd'.s:nm.'Chunk contains=@Rmd'.s:nm
+    exe 'syn region rmd'.s:nm.'ChunkDelim matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>" matchgroup=rmdCodeDelim end="}$" keepend containedin=rmd'.s:nm.'Chunk contains=@Rmdr'
     exe 'syn region rmd'.s:nm.'Chunk start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=rmd'.s:nm.'ChunkDelim,@Rmd'.s:nm
   else
     exe 'syn region rmd'.s:nm.'Chunk matchgroup=rmdCodeDelim start="^\s*```\s*{\s*'.s:nm.'\>.*$" matchgroup=rmdCodeDelim end="^\s*```\ze\s*$" keepend contains=@Rmd'.s:nm
   endif
-  exe 'syn region rmd'.s:nm.'Inline matchgroup=rmdInlineDelim start="`'.s:nm.' "  end="`" contains=@Rmd'.s:nm.' keepend'
 endfor
 unlet! s:type
 
+" Recognize inline R code
+syn region rmdrInline matchgroup=rmdInlineDelim start="`r "  end="`" contains=@Rmdr keepend
+
 hi def link rmdInlineDelim Delimiter
 hi def link rmdCodeDelim Delimiter
 
diff --git a/syntax/rnoweb-2.vim b/syntax/rnoweb-2.vim
index 5e82bbaee..4e1cfb9cf 100644
--- a/syntax/rnoweb-2.vim
+++ b/syntax/rnoweb-2.vim
@@ -37,8 +37,8 @@ syn cluster texParaGroup add=@rnoweb
 
 " Highlighting of R code using an existing r.vim syntax file if available {{{1
 syn include @rnowebR syntax/r.vim
-syn region rnowebChunk matchgroup=rnowebDelimiter start="^<<.*>>=" matchgroup=rnowebDelimiter end="^@" contains=@rnowebR,rnowebChunkReference,rnowebChunk fold keepend
-syn match rnowebChunkReference "^<<.*>>$" contained
+syn region rnowebChunk matchgroup=rnowebDelimiter start="^\s*<<.*>>=" matchgroup=rnowebDelimiter end="^@" contains=@rnowebR,rnowebChunkReference,rnowebChunk fold keepend
+syn match rnowebChunkReference "^\s*<<.*>>$" contained
 syn region rnowebSexpr matchgroup=Delimiter start="\\Sexpr{" matchgroup=Delimiter end="}" contains=@rnowebR contained
 
 " Sweave options command {{{1
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index 6ca7479b6..55e007bd7 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -59,8 +59,8 @@ syntax match  solNumber           '\v\c<%(\d+%(e[+-]=\d+)=|0b[01]+|0o\o+|0x\x+)>
 syntax match  solNumber           '\v\c<%(\d+.\d+|\d+.|.\d+)%(e[+-]=\d+)=>'
 
 " Strings
-syntax region solString           start=/\v"/ skip=/\v\\./ end=/\v"/
-syntax region solString           start="\v'" skip="\v\\." end="\v'"
+syntax region solString           start=/\v"/ skip=/\v\\./ end=/\v"/ contains=@Spell
+syntax region solString           start="\v'" skip="\v\\." end="\v'" contains=@Spell
 
 hi def link   solNumber           Number
 hi def link   solString           String
@@ -127,7 +127,7 @@ syn region    solFuncBody         contained contains=solDestructure,solComment,s
       \ end='}' 
 syn match     solFuncCall         contained skipempty skipwhite nextgroup=solCallOptions,solFuncCallParens
       \ '\v%(%(<if>|<uint>|<int>|<ufixed>|<bytes>|<address>|<string>|<bool>)\s*)@<!<[a-zA-Z_][0-9a-zA-Z_]*\s*%((\{(\n|.|\s)*\})?\s*(\((\n|.|\s)*\)))@='
-syn region    solFuncCallParens   contained transparent contains=solString,solFuncCall,solConstant,solNumber,solMethod,solTypeCast,solComma,solOperator
+syn region    solFuncCallParens   contained transparent contains=solComment,solString,solFuncCall,solConstant,solNumber,solMethod,solTypeCast,solComma,solOperator
       \ start='('
       \ end=')'
 
@@ -304,8 +304,8 @@ hi def link   solLoop             Keyword
 
 " Comments
 syn keyword   solTodo             TODO FIXME XXX TBD contained
-syn region    solComment          start=/\/\// end=/$/ contains=solTodo
-syn region    solComment          start=/\/\*/ end=/\*\// contains=solTodo
+syn region    solComment          start=/\/\// end=/$/ contains=solTodo,@Spell
+syn region    solComment          start=/\/\*/ end=/\*\// contains=solTodo,@Spell
 
 hi def link   solTodo             Todo
 hi def link   solComment          Comment
@@ -318,8 +318,8 @@ syn match     solNatspecTag       /@notice\>/ contained
 syn match     solNatspecTag       /@param\>/ contained
 syn match     solNatspecTag       /@return\>/ contained
 syn match     solNatspecParam     /\(@param\s*\)\@<=\<[a-zA-Z_][0-9a-zA-Z_]*/
-syn region    solNatspecBlock     start=/\/\/\// end=/$/ contains=solTodo,solNatspecTag,solNatspecParam
-syn region    solNatspecBlock     start=/\/\*\{2}/ end=/\*\// contains=solTodo,solNatspecTag,solNatspecParam
+syn region    solNatspecBlock     start=/\/\/\// end=/$/ contains=solTodo,solNatspecTag,solNatspecParam,@Spell
+syn region    solNatspecBlock     start=/\/\*\{2}/ end=/\*\// contains=solTodo,solNatspecTag,solNatspecParam,@Spell
 
 hi def link   solNatspecTag       SpecialComment
 hi def link   solNatspecBlock     Comment
diff --git a/syntax/swift.vim b/syntax/swift.vim
index 122c9ec8a..25c629422 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -106,9 +106,12 @@ syntax keyword swiftAvailabilityArg renamed unavailable introduced deprecated ob
 
 " Keywords {{{
 syntax keyword swiftKeywords
+      \ actor
       \ associatedtype
       \ associativity
+      \ async
       \ atexit
+      \ await
       \ break
       \ case
       \ catch
@@ -188,7 +191,6 @@ syntax region swiftEscapedReservedWord start="`" end="`" oneline
 
 syntax keyword swiftAttributes
       \ @_exported
-      \ @_functionBuilder
       \ @_implementationOnly
       \ @_silgen_name
       \ @assignment
@@ -204,6 +206,8 @@ syntax keyword swiftAttributes
       \ @IBInspectable
       \ @IBOutlet
       \ @inlinable
+      \ @main
+      \ @MainActor
       \ @noescape
       \ @nonobjc
       \ @noreturn
@@ -212,6 +216,8 @@ syntax keyword swiftAttributes
       \ @NSManaged
       \ @objc
       \ @propertyWrapper
+      \ @resultBuilder
+      \ @Sendable
       \ @testable
       \ @UIApplicationMain
       \ @usableFromInline
diff --git a/syntax/terraform.vim b/syntax/terraform.vim
index 35beb58fc..c99dbe47c 100644
--- a/syntax/terraform.vim
+++ b/syntax/terraform.vim
@@ -9,8 +9,8 @@ if exists('b:current_syntax')
   finish
 endif
 
-let s:cpo_save = &cpo
-set cpo&vim
+let s:cpo_save = &cpoptions
+set cpoptions&vim
 
 " Identifiers are made up of alphanumeric characters, underscores, and
 " hyphens.
@@ -39,7 +39,7 @@ syn match terraBraces        "[\[\]]"
 
 """ skip \" and \\ in strings.
 syn region terraValueString   start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=terraStringInterp
-syn region terraStringInterp  matchgroup=terraBraces start=/\${/ end=/}/ contained contains=ALL
+syn region terraStringInterp  matchgroup=terraBraces start=/\(^\|[^$]\)\$\zs{/ end=/}/ contained contains=ALL
 syn region terraHereDocText   start=/<<-\?\z([a-z0-9A-Z]\+\)/ end=/^\s*\z1/ contains=terraStringInterp
 
 "" Functions.
@@ -71,5 +71,5 @@ hi def link terraValueNull         Constant
 
 let b:current_syntax = 'terraform'
 
-let &cpo = s:cpo_save
+let &cpoptions = s:cpo_save
 unlet s:cpo_save
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index 4bdd3e9d3..e04ee988f 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'tmux', 'syntax/tmux.vim')
 endif
 
 " Language: tmux(1) configuration file
-" Version: 3.2-rc (git-e94bd5cc)
+" Version: to_merge (git-c03b5746)
 " URL: https://github.com/ericpruitt/tmux.vim/
 " Maintainer: Eric Pruitt <eric.pruitt@gmail.com>
 " License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause)
@@ -77,22 +77,22 @@ syn keyword tmuxOptions
 \ detach-on-destroy display-panes-active-colour display-panes-colour
 \ display-panes-time display-time exit-unattached extended-keys focus-events
 \ history-file history-limit key-table lock-after-time lock-command
-\ message-command-style message-limit aggressive-resize allow-rename
-\ alternate-screen automatic-rename automatic-rename-format
+\ message-command-style message-limit message-style aggressive-resize
+\ allow-rename alternate-screen automatic-rename automatic-rename-format
 \ clock-mode-colour clock-mode-style copy-mode-current-match-style
 \ copy-mode-mark-style copy-mode-match-style main-pane-height
-\ main-pane-width message-style mode-keys mode-style monitor-activity
-\ monitor-bell monitor-silence mouse other-pane-height other-pane-width
+\ main-pane-width mode-keys mode-style monitor-activity monitor-bell
+\ monitor-silence mouse other-pane-height other-pane-width
 \ pane-active-border-style pane-base-index pane-border-format
 \ pane-border-lines pane-border-status pane-border-style prefix prefix2
-\ remain-on-exit renumber-windows repeat-time set-clipboard set-titles
-\ set-titles-string silence-action status status-bg status-fg status-format
-\ status-interval status-justify status-keys status-left status-left-length
-\ status-left-style status-position status-right status-right-length
-\ status-right-style status-style synchronize-panes terminal-features
-\ terminal-overrides update-environment user-keys visual-activity
-\ visual-bell visual-silence window-active-style window-size
-\ window-status-activity-style window-status-bell-style
+\ prompt-history-limit remain-on-exit renumber-windows repeat-time
+\ set-clipboard set-titles set-titles-string silence-action status status-bg
+\ status-fg status-format status-interval status-justify status-keys
+\ status-left status-left-length status-left-style status-position
+\ status-right status-right-length status-right-style status-style
+\ synchronize-panes terminal-features terminal-overrides update-environment
+\ user-keys visual-activity visual-bell visual-silence window-active-style
+\ window-size window-status-activity-style window-status-bell-style
 \ window-status-current-format window-status-current-style
 \ window-status-format window-status-last-style window-status-separator
 \ window-status-style window-style word-separators wrap-search
@@ -108,18 +108,19 @@ syn keyword tmuxCommands
 \ list-panes list-sessions list-windows load-buffer loadb lock lock-client
 \ lock-server lock-session lockc last-pane lastp locks ls last last-window
 \ lsb delete-buffer deleteb lsc lscm lsk lsp lsw menu move-pane move-window
-\ movep movew new new-session new-window neww next next-layout next-window
-\ nextl paste-buffer pasteb pipe-pane pipep popup prev previous-layout
-\ previous-window prevl refresh refresh-client rename rename-session
-\ rename-window renamew resize-pane resize-window resizep resizew
-\ respawn-pane respawn-window respawnp respawnw rotate-window rotatew run
-\ run-shell save-buffer saveb select-layout select-pane select-window
-\ selectl selectp selectw send send-keys send-prefix set set-buffer
-\ set-environment set-hook set-option set-window-option setb setenv setw
-\ show show-buffer show-environment show-hooks show-messages show-options
-\ show-window-options showb showenv showmsgs showw source source-file
-\ split-window splitw start start-server suspend-client suspendc swap-pane
-\ swap-window swapp swapw switch-client switchc unbind unbind-key
+\ clear-prompt-history clearphist movep movew new new-session new-window
+\ neww next next-layout next-window nextl paste-buffer pasteb pipe-pane
+\ pipep popup prev previous-layout previous-window prevl refresh
+\ refresh-client rename rename-session rename-window renamew resize-pane
+\ resize-window resizep resizew respawn-pane respawn-window respawnp
+\ respawnw rotate-window rotatew run run-shell save-buffer saveb
+\ select-layout select-pane select-window selectl selectp selectw send
+\ send-keys send-prefix set set-buffer set-environment set-hook set-option
+\ set-window-option setb setenv setw show show-buffer show-environment
+\ show-hooks show-messages show-options show-prompt-history
+\ show-window-options showb showenv showmsgs showphist showw source
+\ source-file split-window splitw start start-server suspend-client suspendc
+\ swap-pane swap-window swapp swapw switch-client switchc unbind unbind-key
 \ unlink-window unlinkw wait wait-for
 
 let &cpo = s:original_cpo
diff --git a/syntax/vlang.vim b/syntax/vlang.vim
index 2304ba523..daba962d1 100644
--- a/syntax/vlang.vim
+++ b/syntax/vlang.vim
@@ -78,7 +78,7 @@ hi def link     vShebang            Include
 syn keyword     vStatement          defer go goto return break continue
 hi def link     vStatement          Statement
 
-syn keyword     vConditional        if else match or
+syn keyword     vConditional        if else match or select
 hi def link     vConditional        Conditional
 
 syn keyword     vRepeat             for in
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 998d750a2..057a0ed32 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -277,7 +277,7 @@ highlight default link zigStructure Structure
 highlight default link zigExecution Special
 highlight default link zigMacro Macro
 highlight default link zigConditional Conditional
-highlight default link zigComparatorWord Operator
+highlight default link zigComparatorWord Keyword
 highlight default link zigRepeat Repeat
 highlight default link zigSpecial Special
 highlight default link zigVarDecl Function

From b99ce6173fd8f17af57a9f60bd998a9d648ca238 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 2 Jun 2021 02:32:03 +0200
Subject: [PATCH 246/299] Fix tests

---
 tests/extensions.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/extensions.vim b/tests/extensions.vim
index 6b4b7fe85..eeafd4960 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -211,7 +211,6 @@ call TestExtension("cpp", "foobar.inl", "")
 call TestExtension("htmldjango", "foobar.j2", "")
 call TestExtension("htmldjango", "foobar.jinja", "")
 call TestExtension("htmldjango", "foobar.jinja2", "")
-call TestExtension("htmldjango", "foobar.njk", "")
 
 " vim-polyglot only
 call TestExtension("blade", "test.blade.php", "")

From c312d30231f136d2fbb32a2cfea554af5066e6b0 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 4 Jun 2021 10:07:53 +0200
Subject: [PATCH 247/299] Fix detection of racket filetype, closes #720

---
 autoload/polyglot/init.vim   | 2 +-
 autoload/polyglot/sleuth.vim | 2 +-
 packages.yaml                | 2 +-
 tests/extensions.vim         | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 62421e06b..afd2ea9d2 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -604,7 +604,7 @@ if !has_key(g:polyglot_is_disabled, 'screen')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'scheme')
-  au BufNewFile,BufRead *.rkt,*.scm,*.ss setf scheme
+  au BufNewFile,BufRead *.scm,*.ss setf scheme
 endif
 
 if !has_key(g:polyglot_is_disabled, 'catalog')
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 830a2318b..4e5538eac 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -470,7 +470,7 @@ let s:globs = {
   \ 'sather': '*.sa',
   \ 'sbt': '*.sbt',
   \ 'scala': '*.scala,*.kojo,*.sc',
-  \ 'scheme': '*.scm,*.ss,*.rkt',
+  \ 'scheme': '*.scm,*.ss',
   \ 'scilab': '*.sci,*.sce',
   \ 'screen': '.screenrc,screenrc',
   \ 'scss': '*.scss',
diff --git a/packages.yaml b/packages.yaml
index 70c322157..02b03cdc7 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -4585,7 +4585,7 @@ glob: "**/scheme.vim"
 filetypes:
 - name: scheme
   patterns:
-  - pattern: "*.scm,*.ss,*.rkt"
+  - pattern: "*.scm,*.ss"
     description: Scheme
 ---
 name: screen
diff --git a/tests/extensions.vim b/tests/extensions.vim
index eeafd4960..ccfbca449 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -391,4 +391,6 @@ call TestExtension("conf", "auto.master", "")
 " https://github.com/sheerun/vim-polyglot/issues/579
 call TestExtension("dart", "reminders.dart", "")
 
+call TestExtension("racket", "empty.rkt", "")
+
 filetype off

From 27756b129b7a1f9763a0062aafa8fd35b0181b19 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 4 Jun 2021 10:10:52 +0200
Subject: [PATCH 248/299] Update

---
 packages.yaml    | 2 +-
 syntax/vlang.vim | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages.yaml b/packages.yaml
index 02b03cdc7..8d0668fbd 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1945,7 +1945,7 @@ filetypes:
   - t
 ---
 name: gitignore
-remote: fszymanski/fzf-gitignore
+remote: SirJson/fzf-gitignore 
 filetypes:
 - name: gitignore
   filenames:
diff --git a/syntax/vlang.vim b/syntax/vlang.vim
index daba962d1..4584ebdf4 100644
--- a/syntax/vlang.vim
+++ b/syntax/vlang.vim
@@ -92,6 +92,7 @@ hi def link     vCodeGen            Identifier
 
 " Predefined types
 syn keyword     vType               chan map bool string error voidptr
+syn match       vOptionalType       "\%(\<?\)\@<=\(chan\|map\|bool\|string\|error\|voidptr\)"
 syn keyword     vSignedInts         int i8 i16 i64 rune intptr
 syn keyword     vUnsignedInts       byte u16 u32 u64 byteptr
 syn keyword     vFloats             f32 f64 floatptr
@@ -99,6 +100,7 @@ syn keyword     vFloats             f32 f64 floatptr
 " syn keyword    	vComplexes          complex64 complex128
 
 hi def link     vType               Type
+hi def link     vOptionalType       Type
 hi def link     vSignedInts         Type
 hi def link     vUnsignedInts       Type
 hi def link     vFloats             Type

From ff8c1d76741f148d5f6efb9a57119dcf11afaec6 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 09:50:19 +0200
Subject: [PATCH 249/299] Update

---
 README.md                   |   2 +-
 autoload/smt2.vim           |  34 ----
 autoload/smt2/formatter.vim | 142 ++++++++++++++
 autoload/smt2/parser.vim    | 227 +++++++++++++++++++++
 autoload/smt2/scanner.vim   | 381 ++++++++++++++++++++++++++++++++++++
 autoload/smt2/solver.vim    |  56 ++++++
 extras/filetype.vim         |   2 +-
 ftplugin/dhall.vim          |   2 +-
 ftplugin/julia.vim          |   8 +-
 ftplugin/smt2.vim           |  30 +--
 10 files changed, 821 insertions(+), 63 deletions(-)
 delete mode 100644 autoload/smt2.vim
 create mode 100644 autoload/smt2/formatter.vim
 create mode 100644 autoload/smt2/parser.vim
 create mode 100644 autoload/smt2/scanner.vim
 create mode 100644 autoload/smt2/solver.vim

diff --git a/README.md b/README.md
index 9498f373a..65494ec09 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [fsharp](https://github.com/ionide/Ionide-vim) (F# syntax highlighting for fs, fsi and fsx files)
 - [gdscript](https://github.com/calviken/vim-gdscript3) (GDScript syntax highlighting for gd files)
 - [git](https://github.com/tpope/vim-git) (Git Config syntax highlighting for gitconfig files)
-- [gitignore](https://github.com/fszymanski/fzf-gitignore)
+- [gitignore](https://github.com/SirJson/fzf-gitignore)
 - [gleam](https://github.com/gleam-lang/gleam.vim) (Syntax highlighting for gleam files)
 - [glsl](https://github.com/tikhomirov/vim-glsl) (GLSL syntax highlighting for glsl, fp, frag, frg, fs and 16 more files)
 - [gmpl](https://github.com/maelvalais/gmpl.vim) (Syntax highlighting for mod files)
diff --git a/autoload/smt2.vim b/autoload/smt2.vim
deleted file mode 100644
index 1aee26357..000000000
--- a/autoload/smt2.vim
+++ /dev/null
@@ -1,34 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'smt2', 'autoload/smt2.vim')
-  finish
-endif
-
-" Invokes the solver on current file
-function! smt2#RunSolver()
-    silent !clear
-    execute "!" . g:smt2_solver_command . " " . bufname("%")
-endfunction
-
-" Puts the solver's output in new split (replaces old split)
-function! smt2#RunSolverAndShowResult()
-    let output = system(g:smt2_solver_command . " " . bufname("%") . " 2>&1")
-
-    " Create split (or reuse existent)
-    if exists("s:outputbufnr") && bufwinnr(s:outputbufnr) > 0
-        execute bufwinnr(s:outputbufnr) . 'wincmd w'
-    else
-        silent! vnew
-        let s:outputbufnr=bufnr('%')
-    endif
-
-    " Clear & (re-)fill contents
-    silent! normal! ggdG
-    setlocal filetype=smt2 buftype=nofile nobuflisted noswapfile
-    call append(0, split(output, '\v\n'))
-    normal! gg
-endfunction
-
-" Requests the solver's version
-function! smt2#PrintSolverVersion()
-    silent !clear
-    execute "!" . g:smt2_solver_command . " " . g:smt2_solver_version_switch
-endfunction
diff --git a/autoload/smt2/formatter.vim b/autoload/smt2/formatter.vim
new file mode 100644
index 000000000..6a461b4c1
--- /dev/null
+++ b/autoload/smt2/formatter.vim
@@ -0,0 +1,142 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'smt2', 'autoload/smt2/formatter.vim')
+  finish
+endif
+
+" Formatting requires a rather recent Vim version
+if !((v:version > 802) || (v:version == 802 && has("patch2725")))
+    const s:errmsg_oldvim = "Vim >= 8.2.2725 required for auto-formatting"
+
+    "Dummies
+    function! smt2#formatter#FormatCurrentParagraph()
+        echoerr s:errmsg_oldvim
+    endfunction
+    function! smt2#formatter#FormatAllParagraphs()
+        echoerr s:errmsg_oldvim
+    endfunction
+
+    finish
+endif
+vim9script
+
+# ------------------------------------------------------------------------------
+# Config
+# ------------------------------------------------------------------------------
+# Length of "short" S-expressions
+if !exists("g:smt2_formatter_short_length")
+    g:smt2_formatter_short_length = 80
+endif
+
+# String to use for indentation
+if !exists("g:smt2_formatter_indent_str")
+    g:smt2_formatter_indent_str = '  '
+endif
+
+# ------------------------------------------------------------------------------
+# Formatter
+# ------------------------------------------------------------------------------
+def FitsOneLine(ast: dict<any>): bool
+    # A paragraph with several entries should not be formatted in one line
+    if ast.kind ==# 'Paragraph' && len(ast.value) != 1
+        return false
+    endif
+    return ast.pos_to - ast.pos_from < g:smt2_formatter_short_length && !ast.contains_comment
+enddef
+
+def FormatOneLine(ast: dict<any>): string
+    if ast.kind ==# 'Atom'
+        return ast.value.lexeme
+    elseif ast.kind ==# 'SExpr'
+        var formatted = []
+        for expr in ast.value
+            call formatted->add(expr->FormatOneLine())
+        endfor
+        return '(' .. formatted->join(' ') .. ')'
+    elseif ast.kind ==# 'Paragraph'
+        return ast.value[0]->FormatOneLine()
+    endif
+    throw 'Cannot format AST node: ' .. string(ast)
+    return '' # Unreachable
+enddef
+
+def Format(ast: dict<any>, indent = 0): string
+    const indent_str = repeat(g:smt2_formatter_indent_str, indent)
+
+    if ast.kind ==# 'Atom'
+        return indent_str .. ast.value.lexeme
+    elseif ast.kind ==# 'SExpr'
+        # Short expression -- avoid line breaks
+        if ast->FitsOneLine()
+            return indent_str .. ast->FormatOneLine()
+        endif
+
+        # Long expression -- break lines and indent subexpressions.
+        # Don't break before first subexpression if it's an atom
+        # Note: ast.value->empty() == false; otherwise it would fit in one line
+        var formatted = []
+        if (ast.value[0].kind ==# 'Atom')
+            call formatted->add(ast.value[0]->Format(0))
+        else
+            call formatted->add("\n" .. ast.value[0]->Format(indent + 1))
+        endif
+        for child in ast.value[1 :]
+            call formatted->add(child->Format(indent + 1))
+        endfor
+        return indent_str .. "(" .. formatted->join("\n") .. ")"
+    elseif ast.kind ==# 'Paragraph'
+        var formatted = []
+        for child in ast.value
+            call formatted->add(child->Format())
+        endfor
+        return formatted->join("\n")
+    endif
+    throw 'Cannot format AST node: ' .. string(ast)
+    return '' # Unreachable
+enddef
+
+# ------------------------------------------------------------------------------
+# Public functions
+# ------------------------------------------------------------------------------
+def smt2#formatter#FormatCurrentParagraph()
+    const cursor = getpos('.')
+    const ast = smt2#parser#ParseCurrentParagraph()
+
+    # Identify on which end of the buffer we are (to fix newlines later)
+    silent! normal! {
+    const is_first_paragraph = line('.') == 1
+    silent! normal! }
+    const is_last_paragraph = line('.') == line('$')
+
+    # Replace paragraph by formatted lines
+    const lines = split(Format(ast), '\n')
+    silent! normal! {d}
+    if is_last_paragraph && !is_first_paragraph
+        call append('.', [''] + lines)
+    else
+        call append('.', lines + [''])
+    endif
+
+    # Remove potentially introduced first empty line
+    if is_first_paragraph | silent! :1delete | endif
+
+    # Restore cursor position
+    call setpos('.', cursor)
+enddef
+
+def smt2#formatter#FormatAllParagraphs()
+    const cursor = getpos('.')
+    const asts = smt2#parser#ParseAllParagraphs()
+
+    # Clear buffer & insert formatted paragraphs
+    silent! :1,$delete
+    for ast in asts
+        const lines = split(Format(ast), '\n') + ['']
+        call append('$', lines)
+    endfor
+
+    # Remove first & trailing empty lines
+    silent! :1delete
+    silent! :$delete
+
+    # Restore cursor position
+    call setpos('.', cursor)
+enddef
diff --git a/autoload/smt2/parser.vim b/autoload/smt2/parser.vim
new file mode 100644
index 000000000..ef4068e5f
--- /dev/null
+++ b/autoload/smt2/parser.vim
@@ -0,0 +1,227 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'smt2', 'autoload/smt2/parser.vim')
+  finish
+endif
+
+vim9script
+const debug = false
+set maxfuncdepth=100000000 # SMT files tend to be highly nested
+
+# TODO: Retry iterative parsing now that we have a scanner and simpler grammar
+# TODO: Refer to token kind by name, e.g. token_comment instead of 8
+# TODO: Change Ast.kind type from string to enum/number?
+
+# ------------------------------------------------------------------------------
+# AST nodes -- essentially named token wrappers
+#
+# Note: pos_from, pos_to and contains_comment were only introduced to allow for
+#       a fast FitsOneLine(ast) function in the formatter.
+#       Here, pos_from and pos_to refer to indices of characters -- not tokens
+# ------------------------------------------------------------------------------
+def Ast(kind: string, value: any, pos_from: number, pos_to: number, contains_comment: bool): dict<any>
+    return {kind: kind, value: value, pos_from: pos_from, pos_to: pos_to, contains_comment: contains_comment}
+enddef
+
+def ParagraphAst(exprs: list<dict<any>>, pos_from: number, pos_to: number): dict<any>
+    var contains_comment = false
+    for expr in exprs
+        if expr.contains_comment
+            contains_comment = true
+            break
+        endif
+    endfor
+    return Ast('Paragraph', exprs, pos_from, pos_to, contains_comment)
+enddef
+
+def SExprAst(exprs: list<dict<any>>, pos_from: number, pos_to: number): dict<any>
+    var contains_comment = false
+    for expr in exprs
+        if expr.contains_comment
+            contains_comment = true
+            break
+        endif
+    endfor
+    return Ast('SExpr', exprs, pos_from, pos_to, contains_comment)
+enddef
+
+def AtomAst(token: dict<any>): dict<any>
+    return Ast('Atom', token, token.pos, token.pos + len(token.lexeme), token.kind == 8)
+enddef
+
+def PrintAst(ast: dict<any>, indent = 0)
+    echo repeat(' ', indent * 2) .. '[' .. ast.kind .. '] '
+
+    if ast.kind ==# 'Atom'
+        echon ast.value.lexeme
+    elseif ast.kind ==# 'SExpr'
+        for v in ast.value
+            call PrintAst(v, indent + 1)
+        endfor
+    elseif ast.kind ==# 'Paragraph'
+        for v in ast.value
+            call PrintAst(v, indent + 1)
+        endfor
+    endif
+enddef
+
+# ------------------------------------------------------------------------------
+# Grammar
+# ------------------------------------------------------------------------------
+# Paragraph ::= Expr+
+# Expr      ::= SExpr | Atom
+# SExpr     ::= '(' Expr* ')'
+
+# ------------------------------------------------------------------------------
+# LParen
+# ------------------------------------------------------------------------------
+def AtStartOfLParen(scanner: dict<any>): bool
+    return scanner.cur_token.kind == 0 # token_lparen
+enddef
+
+def ParseLParen(scanner: dict<any>) # consumes token; no return
+    if debug
+        scanner->smt2#scanner#Enforce(scanner->AtStartOfLParen(),
+            "ParseLParen called but not at start of LParen",
+            scanner.cur_token.pos)
+    endif
+
+    scanner->smt2#scanner#NextToken()
+enddef
+
+# ------------------------------------------------------------------------------
+# RParen
+# ------------------------------------------------------------------------------
+def AtStartOfRParen(scanner: dict<any>): bool
+    return scanner.cur_token.kind == 1 # token_rparen
+enddef
+
+def ParseRParen(scanner: dict<any>) # consumes token; no return
+    if debug
+        scanner->smt2#scanner#Enforce(scanner->AtStartOfRParen(),
+            "ParseRParen called but not at start of RParen",
+            scanner.cur_token.pos)
+    endif
+
+    scanner->smt2#scanner#NextToken()
+enddef
+
+# ------------------------------------------------------------------------------
+# Atom
+# ------------------------------------------------------------------------------
+def AtStartOfAtom(scanner: dict<any>): bool
+    return 2 <= scanner.cur_token.kind && scanner.cur_token.kind <= 8
+enddef
+
+def ParseAtom(scanner: dict<any>): dict<any>
+    if debug
+        scanner->smt2#scanner#Enforce(scanner->AtStartOfAtom(),
+            "ParseAtom called but not at start of Atom",
+            scanner.cur_token.pos)
+    endif
+
+    const ast = AtomAst(scanner.cur_token)
+    scanner->smt2#scanner#NextToken()
+    return ast
+enddef
+
+# ------------------------------------------------------------------------------
+# Expr
+# ------------------------------------------------------------------------------
+def AtStartOfExpr(scanner: dict<any>): bool
+    return scanner->AtStartOfSExpr() || scanner->AtStartOfAtom()
+enddef
+def ParseExpr(scanner: dict<any>): dict<any>
+    if debug
+        scanner->smt2#scanner#Enforce(scanner->AtStartOfExpr(),
+            "ParseExpr called but not at start of Expr",
+            scanner.cur_token.pos)
+    endif
+
+    if scanner->AtStartOfSExpr()
+        return scanner->ParseSExpr()
+    endif
+    return scanner->ParseAtom()
+enddef
+
+# ------------------------------------------------------------------------------
+# SExpr
+# ------------------------------------------------------------------------------
+const AtStartOfSExpr = funcref(AtStartOfLParen)
+def ParseSExpr(scanner: dict<any>): dict<any>
+    const pos_from = scanner.cur_token.pos
+
+    if debug
+        scanner->smt2#scanner#Enforce(scanner->AtStartOfSExpr(),
+            "ParseSExpr called but not at start of SExpr",
+            pos_from)
+    endif
+    scanner->ParseLParen()
+
+    # Expr*
+    var exprs: list<any>
+    while scanner->AtStartOfExpr()
+        exprs->add(scanner->ParseExpr())
+    endwhile
+
+    scanner->smt2#scanner#Enforce(scanner->AtStartOfRParen(),
+        printf("Expected RParen but got %s", scanner.cur_token.kind->smt2#scanner#TokenKind2Str()),
+        scanner.cur_token.pos)
+    scanner->ParseRParen()
+
+    const pos_to = scanner.cur_token.pos
+    return SExprAst(exprs, pos_from, pos_to)
+enddef
+
+# ------------------------------------------------------------------------------
+# Paragraph
+# ------------------------------------------------------------------------------
+def ParseParagraph(scanner: dict<any>): dict<any>
+    const pos_from = scanner.cur_token.pos
+
+    # Expr+
+    scanner->smt2#scanner#Enforce(scanner->AtStartOfExpr(),
+        printf("Expected Expr but got %s", scanner.cur_token.kind->smt2#scanner#TokenKind2Str()),
+        pos_from)
+
+    var exprs = [scanner->ParseExpr()]
+    while scanner->AtStartOfExpr() && !scanner.at_new_paragraph
+        exprs->add(scanner->ParseExpr())
+    endwhile
+
+    const pos_to = scanner.cur_token.pos
+    return ParagraphAst(exprs, pos_from, pos_to)
+enddef
+
+# ------------------------------------------------------------------------------
+# Public functions
+# ------------------------------------------------------------------------------
+def smt2#parser#ParseCurrentParagraph(): dict<any>
+    # source = [start of current paragraph, EOF]
+    # Note: This is needed since `silent! normal! {y}` may not yank full paragraphs
+    #       in the context of multiline expressions
+    const cursor = getpos('.')
+    silent! normal! {
+    const line_offset = line('.')
+    const source = join(getline('.', '$'), "\n")
+    call setpos('.', cursor)
+
+    var scanner = smt2#scanner#Scanner(source, line_offset)
+    const ast = scanner->ParseParagraph()
+
+    if debug | ast->PrintAst() | endif
+    return ast
+enddef
+
+def smt2#parser#ParseAllParagraphs(): list<dict<any>>
+    # source = current buffer
+    const source = join(getline(1, '$'), "\n")
+
+    var scanner = smt2#scanner#Scanner(source)
+    var asts = []
+    while scanner.cur_token.kind != 9 # token_eof
+        const ast = scanner->ParseParagraph()
+        asts->add(ast)
+
+        if debug | ast->PrintAst() | endif
+    endwhile
+    return asts
+enddef
diff --git a/autoload/smt2/scanner.vim b/autoload/smt2/scanner.vim
new file mode 100644
index 000000000..464dbe249
--- /dev/null
+++ b/autoload/smt2/scanner.vim
@@ -0,0 +1,381 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'smt2', 'autoload/smt2/scanner.vim')
+  finish
+endif
+
+vim9script
+const debug = false
+
+# ------------------------------------------------------------------------------
+# Ref: http://smtlib.cs.uiowa.edu/papers/smt-lib-reference-v2.6-r2021-05-12.pdf
+# ------------------------------------------------------------------------------
+
+# ------------------------------------------------------------------------------
+# Token
+# ------------------------------------------------------------------------------
+const token_lparen = 0
+const token_rparen = 1
+const token_numeral = 2
+const token_decimal = 3
+const token_bv = 4
+const token_string = 5
+const token_symbol = 6
+const token_keyword = 7
+const token_comment = 8
+const token_eof = 9
+
+def Token(kind: number, pos: number, lexeme: string): dict<any>
+    return {kind: kind, pos: pos, lexeme: lexeme}
+enddef
+
+def smt2#scanner#TokenKind2Str(kind: number): string
+    if kind == token_lparen
+        return "LParen"
+    elseif kind == token_rparen
+        return "RParen"
+    elseif kind == token_numeral
+        return "Numeral"
+    elseif kind == token_decimal
+        return "Decimal"
+    elseif kind == token_bv
+        return "Bv"
+    elseif kind == token_string
+        return "String"
+    elseif kind == token_symbol
+        return "Symbol"
+    elseif kind == token_keyword
+        return "Keyword"
+    elseif kind == token_comment
+        return "Comment"
+    elseif kind == token_eof
+        return "EOF"
+    else
+        echoerr "Unexpected token kind: " .. kind
+        return ''
+    endif
+enddef
+
+def PrettyPrint(scanner: dict<any>, token: dict<any>)
+    const coord = scanner->Pos2Coord(token.pos)
+    echo printf("%4d:%-3d (%5d) %8s %s", coord.line, coord.col, token.pos, token.kind->smt2#scanner#TokenKind2Str(), token.lexeme)
+enddef
+
+# ------------------------------------------------------------------------------
+# Scanner
+#
+# Note: The public interface is limited to the
+#       - field cur_token
+#       - method NextToken
+#       - field at_new_paragraph (needed to distinguish paragraphs in parser)
+#
+#       The other fields should only be used internally / in this file
+# ------------------------------------------------------------------------------
+# TODO: Enforce restriction to ASCII? We should if we use the lookup table below
+# TODO: Do not take a string but a character stream (or just buffer and pos)?
+
+def smt2#scanner#Scanner(source: string, line_offset = 1): dict<any>
+    var scanner = {
+        chars: source->trim(" \t\n\r", 2)->split('\zs'),
+        line_offset: line_offset, # start line of source string in buffer
+        pos: 0,                   # pos in source string -- not column in line
+        at_new_paragraph: false}
+
+    if scanner.chars->empty()
+        scanner.at_eof = true
+        scanner.cur_char = ''
+    else
+        scanner.at_eof = false
+        scanner.cur_char = scanner.chars[0]
+    endif
+    scanner.cur_char_nr = scanner.cur_char->char2nr()
+    scanner.chars_len = len(scanner.chars)
+    scanner.cur_token = {}
+    scanner->smt2#scanner#NextToken()
+    return scanner
+enddef
+
+def smt2#scanner#NextToken(scanner: dict<any>)
+    if scanner.at_eof
+        scanner.cur_token = Token(token_eof, scanner.pos, '')
+    else
+        scanner->SkipWhitespace() # Cannot end up at eof since end is trimmed
+
+        const nr = scanner.cur_char_nr
+        if nr == 40 # '('
+            scanner.cur_token = Token(token_lparen, scanner.pos, '(')
+            scanner->NextPos()
+        elseif nr == 41 # ')'
+            scanner.cur_token = Token(token_rparen, scanner.pos, ')')
+            scanner->NextPos()
+        elseif nr->IsStartOfSimpleSymbol()
+            scanner.cur_token = scanner->ReadSimpleSymbol()
+        elseif nr == 124 # '|'
+            scanner.cur_token = scanner->ReadQuotedSymbol()
+        elseif nr == 58 # ':'
+            scanner.cur_token = scanner->ReadKeyword()
+        elseif nr->IsDigit()
+            scanner.cur_token = scanner->ReadNumber()
+        elseif nr == 35 # '#'
+            scanner.cur_token = scanner->ReadBv()
+        elseif nr == 34 # '"'
+            scanner.cur_token = scanner->ReadString()
+        elseif nr == 59 # ';'
+            scanner.cur_token = scanner->ReadComment()
+        else
+            scanner->smt2#scanner#Enforce(false, printf("Unexpected character '%s'", scanner.cur_char), scanner.pos)
+        endif
+    endif
+
+    if debug
+        if scanner.at_new_paragraph | echo "\n" | endif
+        scanner->PrettyPrint(scanner.cur_token)
+    endif
+enddef
+
+def NextPos(scanner: dict<any>)
+    if debug | scanner->smt2#scanner#Enforce(!scanner.at_eof, "Already at EOF", scanner.pos) | endif
+
+    scanner.pos += 1
+    scanner.at_eof = scanner.pos == scanner.chars_len
+    scanner.cur_char = scanner.at_eof ? '' : scanner.chars[scanner.pos]
+    scanner.cur_char_nr = scanner.cur_char->char2nr()
+enddef
+
+def smt2#scanner#Enforce(scanner: dict<any>, expr: bool, msg: string, pos: number)
+    if !expr
+        const coord = scanner->Pos2Coord(pos)
+        throw printf("Syntax error (at %d:%d): %s ", coord.line, coord.col, msg)
+    endif
+enddef
+
+# This is slow and intended for use in error messages & debugging only
+def Pos2Coord(scanner: dict<any>, pos: number): dict<number>
+    const line = scanner.chars[: pos]->count("\n") + scanner.line_offset
+
+    var cur_pos = pos - 1
+    while cur_pos >= 0 && scanner.chars[cur_pos] != "\n"
+        cur_pos -= 1
+    endwhile
+
+    return {line: line, col: pos - cur_pos}
+enddef
+
+# ------------------------------------------------------------------------------
+# <white_space_char> ::= 9 (tab), 10 (lf), 13 (cr), 32 (space)
+#
+# Note: The source string has all lines joined by "\n" so "\r" can be ignored
+# ------------------------------------------------------------------------------
+def SkipWhitespace(scanner: dict<any>)
+    var newlines = 0
+    while !scanner.at_eof
+        const nr = scanner.cur_char_nr
+        if nr == 32 || nr == 9
+            scanner->NextPos()
+        elseif nr == 10
+            newlines += 1
+            scanner->NextPos()
+        else
+            break
+        endif
+    endwhile
+    scanner.at_new_paragraph = newlines > 1
+enddef
+
+# ------------------------------------------------------------------------------
+# A comment is any character sequence not contained within a string literal or a
+# quoted symbol that begins with ; and ends with the first subsequent
+# line-breaking character, i.e. 10 (lf) or 13 (cr)
+#
+# Note: The source string has all lines joined by "\n" so "\r" can be ignored
+# ------------------------------------------------------------------------------
+def ReadComment(scanner: dict<any>): dict<any>
+    if debug | scanner->smt2#scanner#Enforce(scanner.cur_char == ';', "Not the start of a comment", scanner.pos) | endif
+
+    const start_pos = scanner.pos
+    scanner->NextPos()
+    while !scanner.at_eof && scanner.cur_char_nr != 10
+        scanner->NextPos()
+    endwhile
+    return Token(token_comment, start_pos, scanner.chars[start_pos : scanner.pos - 1]->join(''))
+enddef
+
+# ------------------------------------------------------------------------------
+# <numeral> ::= 0
+#             | a non-empty sequence of digits not starting with 0
+#
+# <decimal> ::= <numeral>.0*<numeral>
+# ------------------------------------------------------------------------------
+def IsDigit(char_nr: number): bool
+    # '0'->char2nr() == 48 && '9'->char2nr() == 57
+    return 48 <= char_nr && char_nr <= 57
+enddef
+
+def ReadNumber(scanner: dict<any>): dict<any>
+    if debug | scanner->smt2#scanner#Enforce(scanner.cur_char_nr->IsDigit(), "Not the start of a number", scanner.pos) | endif
+
+    const starts_with_zero = scanner.cur_char == '0'
+    const start_pos = scanner.pos
+    scanner->NextPos()
+    # Note: We aren't strict about numbers not starting with 0 when not debugging
+    if debug | scanner->smt2#scanner#Enforce(!starts_with_zero || scanner.cur_char != '0', "Numeral may not start with 0", scanner.pos) | endif
+
+    var is_decimal = false
+    while !scanner.at_eof
+        const nr = scanner.cur_char_nr
+        if 48 <= nr && nr <= 57 # inlined IsDigit
+            scanner->NextPos()
+        elseif scanner.cur_char == '.'
+            if is_decimal
+                break
+            else
+                is_decimal = true
+                scanner->NextPos()
+            endif
+        else
+            break
+        endif
+    endwhile
+    const kind = is_decimal ? token_decimal : token_numeral
+    return Token(kind, start_pos, scanner.chars[start_pos : scanner.pos - 1]->join(''))
+enddef
+
+# ------------------------------------------------------------------------------
+# <hexadecimal> ::= #x followed by a non-empty sequence of digits and letters
+#                   from A to F, capitalized or not
+#
+# <binary> ::= #b followed by a non-empty sequence of 0 and 1 characters
+# ------------------------------------------------------------------------------
+
+# Build lookup table for char->match('\m\C^[0-9a-fA-F]')
+def InitIsAlphaNumericCharNr(): list<bool>
+    var lookup_table = []
+    var char_nr = 0
+    while char_nr < 255
+        lookup_table->add(char_nr->nr2char()->match('\m\C^[0-9a-fA-F]') != -1)
+        char_nr += 1
+    endwhile
+    return lookup_table
+enddef
+const is_alphanumeric_char_nr = InitIsAlphaNumericCharNr()
+
+def ReadBv(scanner: dict<any>): dict<any>
+    if debug | scanner->smt2#scanner#Enforce(scanner.cur_char == '#', "Not the start of a bit vector literal", scanner.pos) | endif
+
+    const start_pos = scanner.pos
+    scanner->NextPos()
+    if scanner.cur_char == 'x'
+        scanner->NextPos()
+        scanner->smt2#scanner#Enforce(!scanner.at_eof && is_alphanumeric_char_nr[scanner.cur_char_nr],
+            "hexadecimal literal may not be empty",
+            scanner.pos)
+        while !scanner.at_eof && is_alphanumeric_char_nr[scanner.cur_char_nr]
+            scanner->NextPos()
+        endwhile
+    elseif scanner.cur_char == 'b'
+        scanner->NextPos()
+        # '0'->char2nr() == 48 && '1'->char2nr() == 49
+        scanner->smt2#scanner#Enforce(!scanner.at_eof && scanner.cur_char_num == 48 || scanner.cur_char_num == 49,
+            "binary literal may not be empty",
+            scanner.pos)
+        while !scanner.at_eof && scanner.cur_char_num == 48 || scanner.cur_char_num == 49
+            scanner->NextPos()
+        endwhile
+    else
+        scanner->smt2#scanner#Enforce(false, "invalid bit vector literal -- expected 'x' or 'b'", scanner.pos)
+    endif
+    return Token(token_bv, start_pos, scanner.chars[start_pos : scanner.pos - 1]->join(''))
+enddef
+
+# ------------------------------------------------------------------------------
+# <string> ::= sequence of whitespace and printable characters in double
+#              quotes with escape sequence ""
+# ------------------------------------------------------------------------------
+# TODO: Allow only printable characters, i.e. ranges [32, 126], [128-255]?
+def ReadString(scanner: dict<any>): dict<any>
+    if debug | scanner->smt2#scanner#Enforce(scanner.cur_char == '"', "Not the start of a string", scanner.pos) | endif
+
+    const start_pos = scanner.pos
+    scanner->NextPos()
+    while true
+        scanner->smt2#scanner#Enforce(!scanner.at_eof, "unexpected end of string", scanner.pos)
+
+        if scanner.cur_char == '"'
+            scanner->NextPos()
+            if scanner.cur_char != '"'
+                break
+            endif
+        endif
+        scanner->NextPos()
+    endwhile
+    return Token(token_string, start_pos, scanner.chars[start_pos : scanner.pos - 1]->join(''))
+enddef
+
+# ------------------------------------------------------------------------------
+# <simple symbol> ::= a non-empty sequence of letters, digits and the characters
+#                     + - / * = % ? ! . $ _ ~ & ^ < > @ that does not start with
+#                     a digit
+# ------------------------------------------------------------------------------
+
+# Build lookup table for char->match('\m\C^[a-zA-Z0-9+-/*=%?!.$_~&^<>@]')
+def InitIsSimpleSymbolCharNr(): list<bool>
+    var lookup_table = []
+    var char_nr = 0
+    while char_nr < 255
+        lookup_table->add(char_nr->nr2char()->match('\m\C^[a-zA-Z0-9+-/*=%?!.$_~&^<>@]') != -1)
+        char_nr += 1
+    endwhile
+    return lookup_table
+enddef
+const is_simple_symbol_char_nr = InitIsSimpleSymbolCharNr()
+
+def IsStartOfSimpleSymbol(char_nr: number): bool
+    # '0'->char2nr() == 48 && '9'->char2nr() == 57
+    return is_simple_symbol_char_nr[char_nr] && !(48 <= char_nr && char_nr <= 57)
+enddef
+
+def ReadSimpleSymbol(scanner: dict<any>): dict<any>
+    if debug | scanner->smt2#scanner#Enforce(scanner.cur_char_nr->IsStartOfSimpleSymbol(), "Not the start of a simple symbol", scanner.pos) | endif
+
+    const start_pos = scanner.pos
+    scanner->NextPos()
+    while !scanner.at_eof && is_simple_symbol_char_nr[scanner.cur_char_nr]
+        scanner->NextPos()
+    endwhile
+    return Token(token_symbol, start_pos, scanner.chars[start_pos : scanner.pos - 1]->join(''))
+enddef
+
+# ------------------------------------------------------------------------------
+# <symbol> ::= <simple symbol>
+#            | a sequence of whitespace and printable characters that starts
+#              and ends with '|' and does not otherwise include '|' or '\'
+# ------------------------------------------------------------------------------
+# TODO: Allow only printable characters, i.e. ranges [32, 126], [128-255]?
+def ReadQuotedSymbol(scanner: dict<any>): dict<any>
+    if debug | scanner->smt2#scanner#Enforce(scanner.cur_char == '|', "Not the start of a quoted symbol", scanner.pos) | endif
+
+    const start_pos = scanner.pos
+    scanner->NextPos()
+    while true
+        scanner->smt2#scanner#Enforce(!scanner.at_eof, "unexpected end of quoted symbol", scanner.pos)
+        scanner->smt2#scanner#Enforce(scanner.cur_char != '\\', "quoted symbol may not contain '\'", scanner.pos)
+        if scanner.cur_char == '|'
+            break
+        endif
+        scanner->NextPos()
+    endwhile
+    scanner->NextPos()
+    return Token(token_symbol, start_pos, scanner.chars[start_pos : scanner.pos - 1]->join(''))
+enddef
+
+# ------------------------------------------------------------------------------
+# <keyword> ::= :<simple symbol>
+# ------------------------------------------------------------------------------
+def ReadKeyword(scanner: dict<any>): dict<any>
+    if debug | scanner->smt2#scanner#Enforce(scanner.cur_char == ':', "Not the start of a keyword", scanner.pos) | endif
+
+    const start_pos = scanner.pos
+    scanner->NextPos()
+    while !scanner.at_eof && is_simple_symbol_char_nr[scanner.cur_char_nr]
+        scanner->NextPos()
+    endwhile
+    return Token(token_keyword, start_pos, scanner.chars[start_pos : scanner.pos - 1]->join(''))
+enddef
diff --git a/autoload/smt2/solver.vim b/autoload/smt2/solver.vim
new file mode 100644
index 000000000..39e7d4775
--- /dev/null
+++ b/autoload/smt2/solver.vim
@@ -0,0 +1,56 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'smt2', 'autoload/smt2/solver.vim')
+  finish
+endif
+
+" ------------------------------------------------------------------------------
+" Config
+" ------------------------------------------------------------------------------
+" If no command for invoking a solver is specified in ~/.vimrc, test if either
+" 'z3' or 'boolector' is accessible through $PATH (in that order)
+if !exists("g:smt2_solver_command")
+    if executable("z3")
+        let g:smt2_solver_command = "z3"
+    elseif executable("boolector")
+        let g:smt2_solver_command = "boolector"
+    endif
+endif
+
+" If no command line switch for printing the solver's version is specified in
+" ~/.vimrc, use '--version'
+if !exists("g:smt2_solver_version_switch")
+    let g:smt2_solver_version_switch = "--version"
+endif
+
+" ------------------------------------------------------------------------------
+" Public functions
+" ------------------------------------------------------------------------------
+" Invokes the solver on current file
+function! smt2#solver#Run()
+    silent !clear
+    execute "!" . g:smt2_solver_command . " " . bufname("%")
+endfunction
+
+" Puts the solver's output in new split (replaces old split)
+function! smt2#solver#RunAndShowResult()
+    let output = system(g:smt2_solver_command . " " . bufname("%") . " 2>&1")
+
+    " Create split (or reuse existent)
+    if exists("s:outputbufnr") && bufwinnr(s:outputbufnr) > 0
+        execute bufwinnr(s:outputbufnr) . 'wincmd w'
+    else
+        silent! vnew
+        let s:outputbufnr=bufnr('%')
+    endif
+
+    " Clear & (re-)fill contents
+    silent! normal! ggdG
+    setlocal filetype=smt2 buftype=nofile nobuflisted noswapfile
+    call append(0, split(output, '\v\n'))
+    normal! gg
+endfunction
+
+" Requests the solver's version
+function! smt2#solver#PrintVersion()
+    silent !clear
+    execute "!" . g:smt2_solver_command . " " . g:smt2_solver_version_switch
+endfunction
diff --git a/extras/filetype.vim b/extras/filetype.vim
index 26c15db39..e6ab472f5 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1496,7 +1496,7 @@ au BufNewFile,BufRead *.sass			setf sass
 au BufNewFile,BufRead *.sa			setf sather
 
 " Scala
-au BufNewFile,BufRead *.scala			setf scala
+au BufNewFile,BufRead *.scala,*.sc		setf scala
 
 " SBT - Scala Build Tool
 au BufNewFile,BufRead *.sbt			setf sbt
diff --git a/ftplugin/dhall.vim b/ftplugin/dhall.vim
index a484585ba..9a662090c 100644
--- a/ftplugin/dhall.vim
+++ b/ftplugin/dhall.vim
@@ -33,7 +33,7 @@ endif
 function! DhallFormat()
     let cursor = getpos('.')
     exec 'normal! gg'
-    exec 'silent !dhall format --inplace ' . expand('%')
+    exec 'silent !dhall format ' . expand('%')
     exec 'e'
     call setpos('.', cursor)
 endfunction
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index 785ffa2a2..391265985 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -39,7 +39,7 @@ if exists("loaded_matchit")
   " for nested-structures-skipping to work properly
   " note: 'mutable struct' and 'struct' are defined separately because
   " using \? puts the cursor on 'struct' instead of 'mutable' for some reason
-  let b:julia_begin_keywords = '\%(\%(\.\s*\)\@<!\|\%(@\s*.\s*\)\@<=\)\<\%(function\|macro\|begin\|mutable\s\+struct\|\%(mutable\s\+\)\@<!struct\|\%(abstract\|primitive\)\s\+type\|let\|do\|\%(bare\)\?module\|quote\|if\|for\|while\|try\)\>'
+  let b:julia_begin_keywords = '\%(\.\s*\|@\)\@<!\<\%(function\|macro\|begin\|mutable\s\+struct\|\%(mutable\s\+\)\@<!struct\|\%(abstract\|primitive\)\s\+type\|let\|do\|\%(bare\)\?module\|quote\|if\|for\|while\|try\)\>'
   " note: the following regex not only recognizes macros, but also local/global keywords.
   " the purpose is recognizing things like `@inline myfunction()`
   " or `global myfunction(...)` etc, for matchit and block movement functionality
@@ -67,7 +67,7 @@ if exists("loaded_matchit")
     call cursor(l, c)
     if attr == 'juliaConditional'
       return b:julia_begin_keywordsm . ':\<\%(elseif\|else\)\>:' . b:julia_end_keywords
-    elseif attr =~ '\<\%(juliaRepeat\|juliaRepKeyword\)\>'
+    elseif attr =~# '\<\%(juliaRepeat\|juliaRepKeyword\)\>'
       return b:julia_begin_keywordsm . ':\<\%(break\|continue\)\>:' . b:julia_end_keywords
     elseif attr == 'juliaBlKeyword'
       return b:julia_begin_keywordsm . ':' . b:julia_end_keywords
@@ -82,8 +82,8 @@ if exists("loaded_matchit")
   " we need to skip everything within comments, strings and
   " the 'begin' and 'end' keywords when they are used as a range rather than as
   " the delimiter of a block
-  let b:match_skip = 'synIDattr(synID(line("."),col("."),1),"name") =~ '
-        \ . '"\\<julia\\%(Comprehension\\%(For\\|If\\)\\|RangeKeyword\\|Comment\\%([LM]\\|Delim\\)\\|\\%([bs]\\|Shell\\|Printf\\|Doc\\)\\?String\\|StringPrefixed\\|DocStringM\\(Raw\\)\\?\\|RegEx\\|SymbolS\\?\\|Macro\\|Dotted\\)\\>"'
+  let b:match_skip = 'synIDattr(synID(line("."),col("."),0),"name") =~# '
+        \ . '"\\<julia\\%(Comprehension\\%(For\\|If\\)\\|RangeKeyword\\|Comment\\%([LM]\\|Delim\\)\\|\\%([bs]\\|Shell\\|Printf\\|Doc\\)\\?String\\|StringPrefixed\\|DocStringM\\(Raw\\)\\?\\|RegEx\\|SymbolS\\?\\|Dotted\\)\\>"'
 
   let b:undo_ftplugin = b:undo_ftplugin
         \ . " | unlet! b:match_words b:match_skip b:match_ignorecase"
diff --git a/ftplugin/smt2.vim b/ftplugin/smt2.vim
index d6cfa5ecb..b8e8c46ca 100644
--- a/ftplugin/smt2.vim
+++ b/ftplugin/smt2.vim
@@ -3,27 +3,13 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'smt2', 'ftplugin/smt2.vim')
 endif
 
 setlocal iskeyword+=-,:,#,',$
+setlocal commentstring=;%s
 
-" If no command for invoking a solver is specified in ~/.vimrc, test if either
-" 'z3' or 'boolector' is accessible through $PATH (in that order)
-if !exists("g:smt2_solver_command")
-    if executable("z3")
-        let g:smt2_solver_command = "z3"
-    elseif executable("boolector")
-        let g:smt2_solver_command = "boolector"
-    endif
-endif
-
-" If no command line switch for printing the solver's version is specified in
-" ~/.vimrc, use '--version'
-if !exists("g:smt2_solver_version_switch")
-    let g:smt2_solver_version_switch = "--version"
-endif
-
-" Mappings
-nnoremap <silent> <buffer> <localleader>r :call smt2#RunSolver()<cr>
-nnoremap <silent> <buffer> <localleader>R :call smt2#RunSolverAndShowResult()<cr>
-nnoremap <silent> <buffer> <localleader>v :call smt2#PrintSolverVersion()<cr>
+" Mappings for solver functionality
+nnoremap <silent> <buffer> <localleader>r :call smt2#solver#Run()<cr>
+nnoremap <silent> <buffer> <localleader>R :call smt2#solver#RunAndShowResult()<cr>
+nnoremap <silent> <buffer> <localleader>v :call smt2#solver#PrintVersion()<cr>
 
-" Comment String
-setlocal commentstring=;%s
+" Mappings for formatting functionality
+nnoremap <silent> <buffer> <localleader>f :call smt2#formatter#FormatCurrentParagraph()<cr>
+nnoremap <silent> <buffer> <localleader>F :call smt2#formatter#FormatAllParagraphs()<cr>

From af4d6aa3cf5eab6cf555cbb067f8316cca7975bf Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 11:49:01 +0200
Subject: [PATCH 250/299] Use more modern haxe package, closes #340

---
 README.md                    |   2 +-
 autoload/polyglot/init.vim   |   4 +
 autoload/polyglot/sleuth.vim |   2 +
 indent/haxe.vim              |  19 +
 packages.yaml                |  11 +-
 syntax/haxe.vim              | 665 +++++++++++++----------------------
 syntax/haxe_extended.vim     | 131 +++++++
 syntax/hss.vim               | 115 ++++++
 syntax/hxml.vim              |  90 +++++
 tests/filetypes.vim          |   2 +
 10 files changed, 627 insertions(+), 414 deletions(-)
 create mode 100644 indent/haxe.vim
 create mode 100644 syntax/haxe_extended.vim
 create mode 100644 syntax/hss.vim
 create mode 100644 syntax/hxml.vim

diff --git a/README.md b/README.md
index 65494ec09..8816bbe26 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [handlebars](https://github.com/mustache/vim-mustache-handlebars) (Mustache and Handlebars syntax highlighting for mustache, hogan, hulk, hjs, handlebars, hbs, hdbs and hb files)
 - [haproxy](https://github.com/CH-DanReif/haproxy.vim) (HAProxy syntax highlighting)
 - [haskell](https://github.com/neovimhaskell/haskell-vim) (Haskell syntax highlighting for hs, hs-boot, hsc, bpk and hsig files)
-- [haxe](https://github.com/yaymukund/vim-haxe) (Haxe syntax highlighting for hx and hxsl files)
+- [haxe](https://github.com/jdonaldson/vaxe) (Haxe and HXML syntax highlighting for hx, hxsl, hxml and hss files)
 - [hcl](https://github.com/b4b4r07/vim-hcl) (HCL syntax highlighting for hcl, nomad and workflow files)
 - [helm](https://github.com/towolf/vim-helm)
 - [help](https://github.com/neovim/neovim/tree/master/runtime)
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index afd2ea9d2..6c2e9b870 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -112,6 +112,8 @@ if !exists('g:python_highlight_all')
   call s:SetDefault('g:python_slow_sync', 1)
 endif
 
+" Some variables are needed for haxe loading
+
 " We need it because scripts.vim in vim uses "set ft=" which cannot be
 " overridden with setf (and we can't use set ft= so our scripts.vim work)
 func! s:Setf(ft)
@@ -2300,6 +2302,8 @@ endif
 
 if !has_key(g:polyglot_is_disabled, 'haxe')
   au BufNewFile,BufRead *.hx,*.hxsl setf haxe
+  au BufNewFile,BufRead *.hxml setf hxml
+  au BufNewFile,BufRead *.hss setf hss
 endif
 
 if !has_key(g:polyglot_is_disabled, 'haskell')
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 4e5538eac..66c78e1c2 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -229,6 +229,7 @@ let s:globs = {
   \ 'hollywood': '*.hws',
   \ 'hostconf': '',
   \ 'hostsaccess': '',
+  \ 'hss': '*.hss',
   \ 'html': '*.html,*.htm,*.html.hl,*.inc,*.xht,*.xhtml',
   \ 'html.handlebars': '*.handlebars,*.hbs,*.hdbs,*.hb',
   \ 'html.mustache': '*.mustache,*.hogan,*.hulk,*.hjs',
@@ -236,6 +237,7 @@ let s:globs = {
   \ 'htmldjango': '*.jinja,*.j2,*.jinja2',
   \ 'htmlm4': '*.html.m4',
   \ 'httest': '*.htt,*.htb',
+  \ 'hxml': '*.hxml',
   \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config,.i3.config,.i3config',
   \ 'ibasic': '*.iba,*.ibi',
   \ 'icalendar': '*.ics',
diff --git a/indent/haxe.vim b/indent/haxe.vim
new file mode 100644
index 000000000..a8d3a5ff7
--- /dev/null
+++ b/indent/haxe.vim
@@ -0,0 +1,19 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haxe', 'indent/haxe.vim')
+  finish
+endif
+
+" Language:     Haxe
+" Maintainer:   None!  Wanna improve this?
+" Last Change:  2007 Jan 22
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+   finish
+endif
+let b:did_indent = 1
+
+" C indenting is not too bad.
+setlocal cindent
+setlocal cinoptions+=j1,J1
+setlocal indentkeys=0{,0},0),0],!^F,o,O,e
+let b:undo_indent = "setl cin<"
diff --git a/packages.yaml b/packages.yaml
index 8d0668fbd..90c1333cb 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -773,10 +773,19 @@ filetypes:
   - hsig
 ---
 name: haxe
-remote: yaymukund/vim-haxe
+remote: jdonaldson/vaxe
 filetypes:
 - name: haxe
   linguist: Haxe
+- name: hxml
+  linguist: HXML
+- name: hss
+  extensions:
+    - hss
+ignored_dirs:
+  - ftplugin
+  - autoload
+  - compiler
 ---
 name: hcl
 remote: b4b4r07/vim-hcl
diff --git a/syntax/haxe.vim b/syntax/haxe.vim
index 0afda805e..f18604b47 100644
--- a/syntax/haxe.vim
+++ b/syntax/haxe.vim
@@ -3,429 +3,270 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'haxe', 'syntax/haxe.vim')
 endif
 
 " Vim syntax file
-" Language:     haxe
-" Derived from:
-"   http://tech.motion-twin.com/zip/haxe.vim
-"   and http://www.cactusflower.org/haxe.vim
-" Please check :help haxe.vim for comments on some of the options available.
+" Language: Haxe
+" Maintainer: Luca Deltodesco <luca@deltaluca.me.uk>
+" Last Change: 2013 August 26
 
-set errorformat=%f\:%l\:\ characters\ %c-%*[^\ ]\ %m,%f\:%l\:\ %m
-
-" Quit when a syntax file was already loaded
-if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
+if exists("b:current_syntax")
     finish
-  endif
-  let main_syntax='haxe'
 endif
 
+" provide fallback HiLink command
 if version < 508
   command! -nargs=+ HaxeHiLink hi link <args>
 else
   command! -nargs=+ HaxeHiLink hi def link <args>
 endif
 
-" some characters that cannot be in a haxe program (outside a string)
-syn match     haxeError        "[\\@`]"
-syn match     haxeError        "<<<\|=>\|<>\|||=\|&&=\|\*\/"
-
-" use separate name so that it can be deleted in haxecc.vim
-syn match     haxeError2       "#\|=<"
-HaxeHiLink    haxeError2       haxeError
-
-syn keyword   haxeExternal     import extern using
-syn keyword   haxeDefine       package
-syn keyword   haxeConditional  if else switch
-syn keyword   haxeRepeat       while for do in
-syn keyword   haxeBoolean      true false
-syn keyword   haxeConstant     null
-syn keyword   haxeTypedef      this super
-syn keyword   haxeOperator     new cast 
-syn keyword   haxeCoreType     Void Bool Int Float Dynamic
-syn keyword   haxeStatement    return
-
-syn keyword   haxeTypedef1     typedef
-syn keyword   haxeStructure    var enum
-syn keyword   haxeScopeDecl    private public
-syn keyword   haxeScopeDecl2   static override final dynamic
-syn keyword   haxeFunctionDef  function
-
-syn keyword   haxeExceptions   throw try catch finally untyped
-syn keyword   haxeAssert       assert
-syn keyword   haxeMethodDecl   synchronized throws
-syn keyword   haxeClassDecl    extends implements interface
-syn match     haxeDelimiter    "[;:=\.]"
-syn match     haxeOperator     "\(\.\.\.\|\*\|+\|-\|<<\|>>\|\/\|!\|||\|&&\|%\)"
-syn match     haxeComparison   "\(==\|<=\|>=\|<\|>\|!=\)"
-syn match     haxeOptionalVars contained "?[a-zA-Z_]\+"
-
-syn match     haxeFunctionRef  "[_$a-zA-Z][_$a-zA-Z0-9_]*("me=e-1
-
-" We use a match here to differentiate the keyword class from MyClass.class 
-syn match     haxeTypedef      "\.\s*\<class\>"ms=s+1
-syn match     haxeClassDecl    "^class\>"
-syn match     haxeClassDecl    "[^.]\s*\<class\>"ms=s+1
-syn keyword   haxeBranch       break continue nextgroup=haxeUserLabelRef skipwhite
-syn match     haxeUserLabelRef "\k\+" contained
-syn match     haxeClassDef     "\(^\s*class\s*\)\@<=[_$a-zA-Z][_$a-zA-Z0-9_]*" contains=haxeTypedef,haxeClassDecl
-
-syn match     haxeLangClass    "\<System\>"
-syn keyword   haxeLangClass    Array ArrayAccess Class Date DateTools EReg Enum
-syn keyword   haxeLangClass    Hash IntHash IntIter Iterable Iterator Lambda
-syn keyword   haxeLangClass    List Math Null Reflect Std String StringBug
-syn keyword   haxeLangClass    StringTools Type UInt ValueType Xml XmlType
-
-syn keyword   haxeFlashTop     flash
-syn keyword   haxeFlashInner   accessibility deskdop display errors events
-syn keyword   haxeFlashInner   external filters geom media net printing sampler
-syn keyword   haxeFlashInner   system text ui utils xml display engine
-syn keyword   haxeFlashFinal   BitmapData ExternalInterface BevelFilter
-syn keyword   haxeFlashFinal   BitmapFilter BlurFilter ColorMatrixFilter ConvolutionFilter
-syn keyword   haxeFlashFinal   DisplacementMapFilter DropShadowFilter GlowFilter GradientBevelFilter
-syn keyword   haxeFlashFinal   GradientGlowFilter ColorTransform Matrix Point Rectangle Transform
-syn keyword   haxeFlashFinal   FileReference FileReferenceList Capabilities IME Security StyleSheet
-syn keyword   haxeFlashFinal   TextRenderer Accessibility Boot Button Camera Color ContextMenu
-syn keyword   haxeFlashFinal   ContextMenuItem ExtendedKey Key Lib LoadVars
-syn keyword   haxeFlashFinal   LocalConnection Microphone Mouse MovieClip
-syn keyword   haxeFlashFinal   MovieClipLoader NetConnection NetStream PrintJob
-syn keyword   haxeFlashFinal   Selection SelectionListener SharedObject Sound
-syn keyword   haxeFlashFinal   Stage System TextField TextFormat TextSnapshot
-syn keyword   haxeFlashFinal   Video XMLRequest XMLSocket
-syn keyword   haxeFlash9Final  Accessibility AccessibilityImplementation
-syn keyword   haxeFlash9Final  AccessibilityProperties Clipboard
-syn keyword   haxeFlash9Final  ClipboardFormats ClipboardTransferMode AVM1Movie
-syn keyword   haxeFlash9Final  ActionScriptVersion Bitmap BitmapData
-syn keyword   haxeFlash9Final  BitmapDataChannel BlendMode CapsStyle
-syn keyword   haxeFlash9Final  DisplayObject DisplayObjectContainer FrameLabel
-syn keyword   haxeFlash9Final  GradientType Graphics GraphicsBitmapFill
-syn keyword   haxeFlash9Final  GraphicsEndFill GraphicsGradientFill GraphicsPath
-syn keyword   haxeFlash9Final  GraphicsPathCommand GraphicsPathWinding
-syn keyword   haxeFlash9Final  GraphicsShaderFill GraphicsSolidFill
-syn keyword   haxeFlash9Final  GraphicsStroke GraphicsTrianglePath
-syn keyword   haxeFlash9Final  IBitmapDrawable IGraphicsData IGraphicsFill
-syn keyword   haxeFlash9Final  IGraphicsPath IGraphicsStroke InteractiveObject
-syn keyword   haxeFlash9Final  InterpolationMethod JointStyle
-syn keyword   haxeFlash9Final  LineScaleMode Loader LoaderInfo MorphShape
-syn keyword   haxeFlash9Final  MovieClip PixelSnapping SWFVersion
-syn keyword   haxeFlash9Final  Scene Shader ShaderData ShaderInput ShaderJob ShaderParameter
-syn keyword   haxeFlash9Final  ShaderParameterType ShaderPrecision Shape
-syn keyword   haxeFlash9Final  SimpleButton SpreadMethod Sprite
-syn keyword   haxeFlash9Final  Stage StageAlign StageDisplayState StageQuality
-syn keyword   haxeFlash9Final  StageScaleMode TriangleCulling
-syn keyword   haxeFlash9Final  EOFError Error IOError Illegal OperationError
-syn keyword   haxeFlash9Final  InvalidSWFError MemoryError ScriptTimeoutError
-syn keyword   haxeFlash9Final  StackOverflowError ActivityEventAsyncErrorEvent
-syn keyword   haxeFlash9Final  ContextMenuEvent DataEvent ErrorEvent Event
-syn keyword   haxeFlash9Final  EventDispatcher EventPhase FocusEvent
-syn keyword   haxeFlash9Final  FullScreenEvent HTTPStatusEvent IEventDispatcher IMEEvent
-syn keyword   haxeFlash9Final  IOErrorEvent KeyboardEvent MouseEvent
-syn keyword   haxeFlash9Final  NetFilterEvent NetStatusEvent ProgressEvent
-syn keyword   haxeFlash9Final  SampleDataEvent SecurityErrorEvent ShaderEvent StatusEvent
-syn keyword   haxeFlash9Final  SyncEvent TextEvent TimerEvent WeakFunctionClosure WeakMethodClosure
-syn keyword   haxeFlash9Final  ExternalInterface BevelFilter BitmapFilter
-syn keyword   haxeFlash9Final  BitmapFilterQuality BitmapFilterType
-syn keyword   haxeFlash9Final  BlurFilter ColorMatrixFilter ConvolutionFilter DisplacementMapFilter
-syn keyword   haxeFlash9Final  DisplacementMapFilterMode DropShadowFilter
-syn keyword   haxeFlash9Final  GlowFilter GradientBevelFilter
-syn keyword   haxeFlash9Final  GradientGlowFilter ShaderFilter ColorTransform
-syn keyword   haxeFlash9Final  Matrix Matrix3D Orientation3D
-syn keyword   haxeFlash9Final  PerspectiveProjection Point Rectangle Transform
-syn keyword   haxeFlash9Final  Utils3D Vector3D Camera ID3Info
-syn keyword   haxeFlash9Final  Microphone Sound SoundChannel SoundCodec SoundLoaderContext SoundMixer
-syn keyword   haxeFlash9Final  SoundTransform Video DynamicPropertyOutput FileFilter FileReference
-syn keyword   haxeFlash9Final  FileReferenceList IDynamicPropertyOutput
-syn keyword   haxeFlash9Final  IDynamicPropertyWriter LocalConnection
-syn keyword   haxeFlash9Final  NetConnection NetStream NetStreamInfo NetSTreamPlayOptions
-syn keyword   haxeFlash9Final  NetSTreamPlayTransitions ObjectEncoding Responder SharedObject
-syn keyword   haxeFlash9Final  SharedObjectFlushStatus Socket URLLoader URLLoaderDataFormat URLRequest
-syn keyword   haxeFlash9Final  URLRequestHeader URLRequestMethod URLStream
-syn keyword   haxeFlash9Final  URLVariables XMLSocket PrintJob
-syn keyword   haxeFlash9Final  PrintJobOptions PrintJobOrientation Api
-syn keyword   haxeFlash9Final  DeleteObjectSample NewObjectSample
-syn keyword   haxeFlash9Final  Sample StackFrame ApplicationDomain Capabilities FSCommand IME
-syn keyword   haxeFlash9Final  IMEConversionMode JPEGLoaderContext
-syn keyword   haxeFlash9Final  LoaderContext Security SecurityDomain
-syn keyword   haxeFlash9Final  SecurityPanel System
-syn keyword   haxeFlash9Final  BreakOpportunity CFFHinting ContentElement
-syn keyword   haxeFlash9Final  DigitCase DigitWidth EastAsianJustifier ElementFormat FontDescription
-syn keyword   haxeFlash9Final  FontLookup FontMetrics FontPosture FontWeight
-syn keyword   haxeFlash9Final  GraphicElement GroupElement
-syn keyword   haxeFlash9Final  JustificationStyle Kerning LIgatureLevel
-syn keyword   haxeFlash9Final  LineJustification RenderingMode
-syn keyword   haxeFlash9Final  SpaceJustifier TabAlignment TabStop TextBaseline TextBlock TextElement
-syn keyword   haxeFlash9Final  TextJustifier TextLine TextLineCreationResult TextLineMirrorRegion
-syn keyword   haxeFlash9Final  TextLineValidity TextRotation TypographicCase
-syn keyword   haxeFlash9Final  AntiAliasType CSMSettings Font
-syn keyword   haxeFlash9Final  FontStyle FontType GridFitType StaticText StyleSheet TextColorType
-syn keyword   haxeFlash9Final  TextDisplayMode TextExtent TextField
-syn keyword   haxeFlash9Final  TextFieldAutoSize TextFieldType TextFormat
-syn keyword   haxeFlash9Final  TextFormatAlign TextFormatDisplay TextLineMetrics TextRenderer TextRun
-syn keyword   haxeFlash9Final  TextSnapshot Trace ContextMenu ContextMenuBuiltInItems
-syn keyword   haxeFlash9Final  ContextMenuClipboardItems ContextMenuItem KeyLocation Keyboard Mouse
-syn keyword   haxeFlash9Final  MouseCursor ByteArray Dictionary Endian
-syn keyword   haxeFlash9Final  IDataInput IDataOutput IExternalizable
-syn keyword   haxeFlash9Final  Namespace ObjectInput ObjectOutput Proxy QName SetIntervalTimer Timer
-syn keyword   haxeFlash9Final  TypedDictionary XML XMLDocument XMLList XMLNode
-syn keyword   haxeFlash9Final  XMLNodeType XMLParser XMLTag
-syn keyword   haxeFlash9Final  Boot Lib Memory Vector
-
-HaxeHiLink    haxeLangObject   haxeConstant
-syn cluster   haxeTop          add=haxeLangObject,haxeLangClass
-syn cluster   haxeClasses      add=haxeLangClass,haxeFlashClass
-
-if filereadable(expand("<sfile>:p:h")."/haxeid.vim")
-  source <sfile>:p:h/haxeid.vim
-endif
-
-if !exists("haxe_no_trail_space_error")
-  syn match   haxeSpaceError   "\s\+$"
-endif
-if !exists("haxe_no_tab_space_error")
-  syn match   haxeSpaceError   " \+\t"me=e-1
-endif
-
-syn region    haxeLabelRegion  transparent matchgroup=haxeLabel start="\<case\>"
-                               \ matchgroup=NONE end=":"
-                               \ contains=haxeNumber,haxeChr,haxeNumber2
-syn match     haxeUserLabel    "\({\s*\|^\s*\|,\s*\)\@<=[_$a-zA-Z][_$a-zA-Z0-9_]*:\s"he=e-1 contains=haxeDelimiter
-                               \ contains=haxeLabel
-syn keyword   haxeLabel        default never
-
-" Everything - used in parenthases checking or something
-syn cluster   haxeTop          add=haxeExternal,haxeError,haxeError,haxeBranch,
-                               \ haxeLabelRegion,haxeLabel,haxeConditional,
-                               \ haxeRepeat,haxeBoolean,haxeConstant,
-                               \ haxeTypedef,haxeOperator,haxeType,haxeCoreType,
-                               \ haxeStatement,haxeStorageClass,haxeAssert,
-                               \ haxeExceptions,haxeMethodDecl,haxeClassDecl,
-                               \ haxeClassDecl,haxeClassDecl,haxeScopeDecl,
-                               \ haxeError,haxeError2,haxeUserLabel,
-                               \ haxeLangObject,haxeFlashTop,haxeFlashInner,
-                               \ haxeFlashFinal,haxeFlash9Final,haxeFunctionRef,
-                               \ haxeComparison,haxeOptionalVars
-
-" Comments
-syn keyword   haxeTodo         contained TODO FIXME XXX
-if exists("haxe_comment_strings")
-  syn region  haxeCmString     contained start=+"+ end=+"+ end=+$+
-                               \ end=+\*/+me=s-1,he=s-1
-                               \ contains=haxeSpecial,haxeCmStar,haxeSpecChr,@Spell
-  syn region  haxeCm2String    contained start=+"+ end=+$\|"+
-                               \ contains=haxeSpecial,haxeSpecChr,@Spell
-  syn match   haxeCmCharacter  contained "'\\[^']\{1,6\}'" contains=haxeSpecChr
-  syn match   haxeCmCharacter  contained "'\\''" contains=haxeSpecChr
-  syn match   haxeCmCharacter  contained "'[^\\]'"
-  syn cluster haxeCmSpecial    add=haxeCmString,haxeCmCharacter,haxeNumber,haxeNumber2
-  syn cluster haxeCmSpecial2   add=haxeCm2String,haxeCmCharacter,haxeNumber,haxeNumber2
-endif
-syn region    haxeCm           start="/\*" end="\*/"
-                               \ contains=@haxeCmSpecial,haxeTodo,@Spell
-syn match     haxeCmStar       contained "^\s*\*[^/]"me=e-1
-syn match     haxeCmStar       contained "^\s*\*$"
-syn match     haxeLineCm       "//.*" contains=@haxeCmSpecial2,haxeTodo,@Spell
-HaxeHiLink    haxeCmString     haxeDocTags
-HaxeHiLink    haxeCm2String    haxeString
-HaxeHiLink    haxeCmCharacter  haxeChr
-syn cluster   haxeTop          add=haxeCm,haxeLineCm
-if exists("haxe_haxedoc") || main_syntax == 'jsp'
-  syntax case ignore
-  " syntax coloring for haxedoc comments (HTML)
-  " syntax include @haxeHtml <sfile>:p:h/html.vim
-  " unlet b:current_syntax
-  syn region  haxeDocCm        start="/\*\*" end="\*/" keepend
-                               \ contains=haxeCmTitle,@haxeHtml,haxeDocTags,haxeTodo,@Spell,haxeProposedTags
-  syn region  haxeCmTitle      contained matchgroup=haxeDocCm start="/\*\*"
-                               \ matchgroup=haxeCmTitle keepend end="\.$"
-                               \ end="\.[ \t\r<]"me=e-1
-                               \ end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1
-                               \ contains=@haxeHtml,haxeCmStar,haxeTodo,@Spell,haxeDocTags,haxeProposedTags
-  syn region  haxeDocTags      contained start="{@\(link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" 
-                               \ end="}"
-  syn match   haxeDocTags      contained "@\(see\|param\|exception\|throws\|since\)\s\+\S\+"
-                               \ contains=haxeDocParam
-  syn match   haxeDocParam     contained "\s\S\+"
-  syn match   haxeDocTags      contained "@\(version\|author\|return\|deprecated\|serial\|serialField\|serialData\)\>"
-  syn match   haxeProposedTags contained "@\(category\|example\|tutorial\|index\|exclude\|todo\|internal\|obsolete\)\>"
-  syntax case match
-endif
-syn match     haxeCm           "/\*\*/"  " Edge case
-
-
-" Strings and constants
-syn match     haxeSpecError    contained "\\."
-"syn match     haxeSpecChrError contained "[^']"
-syn match     haxeSpecChr      contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\)"
-syn match     haxeEregEscape   contained "\(\\\\\|\\/\)"
-syn region    haxeEreg         start=+\~\/+ end=+\/[gims]*+ contains=haxeEregEscape
-
-syn region    haxeString       start=+"+ end=+"+ contains=haxeSpecChr,haxeSpecError,@Spell
-syn region    haxeSingleString start=+'+ end=+'+ 
-syn match     haxeChr          "'[^']*'" contains=haxeSpecChr,haxeSpecChrError
-syn match     haxeChr          "'\\''" contains=haxeSpecChr
-syn match     haxeChr          "'[^\\]'"
-syn match     haxeNumber       "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>" contains=haxeSpecNum
-"syn match     haxeNumber       "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
-syn match     haxeNumber2      "\(\<\d\+\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\=" contains=haxeSpecNum
-syn match     haxeNumber2      "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>" contains=haxeSpecNum
-syn match     haxeNumber2      "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>" contains=haxeSpecNum
-syn match     haxeSpecNum      contained "\(0[xX]\|[\.+-]\)"
-
-syn region    haxeCondIf       start="#if \+!\?" end="\(\W\|$\)" skip="([A-Za-z0-9_ |&!]\+)"
-syn region    haxeCondElseIf   start="#elseif \+!\?" end="\(\W\|$\)" skip="([A-Za-z0-9_ |&!]\+)"
-syn match     haxeCondElse     "#else\s*$"
-syn match     haxeCondEnd      "#end"
-syn match     haxeCondError    "#else .*$"
-
-" unicode characters
-syn match     haxeSpecial      "\\u\d\{4\}"
-
-syn match     haxeType         ":[a-zA-Z_\.]\+"
-                               \ contains=haxeDelimiter,haxeCoreType,haxeFlashTop,haxeFlashInner,haxeFlashFinal,haxeFlash9Final
-
-syn cluster   haxeTop          add=haxeString,haxeChr,haxeNumber,haxeNumber2
-syn cluster   haxeTop          add=haxeSpecial,haxeStringError,haxeDelimiter,haxeType
-
-syn keyword   haxeTraceFun     trace contained
-syn region    haxeTrace        start=+\(^\s*\)\@<=trace(+ end=+);+ contains=haxeTraceFun
-
-if exists("haxe_highlight_functions")
- if haxe_highlight_functions == "indent"
-  syn match   haxeFuncDef      "^\(\t\| \{4\}\)[_$a-zA-Z][_$a-zA-Z0-9_. \[\]]*([^-+*/()]*)"
-                               \ contains=haxeType,haxeStorageClass,@haxeClasses
-  syn region  haxeFuncDef      start=+^\(\t\| \{4\}\)[$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+
-                               \ end=+)+ contains=haxeType,haxeStorageClass,@haxeClasses
-  syn match   haxeFuncDef      "^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*)"
-                               \ contains=haxeType,haxeStorageClass,@haxeClasses
-  syn region  haxeFuncDef      start=+^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+
-                               \ end=+)+
-                               \ contains=haxeType,haxeStorageClass,@haxeClasses
- else
-  " This line catches method declarations at any indentation>0, but it assumes
-  " two things:
-  "   1. class names are always capitalized (ie: Button)
-  "   2. method names are never capitalized (except constructors, of course)
-  syn region  haxeFuncDef      start=+\s\+\(\(void\|boolean\|char\|byte\|short\|int\|long\|float\|double\|\([A-Za-z_][A-Za-z0-9_$]*\.\)*[A-Z][A-Za-z0-9_$]*\)\(\[\]\)*\s\+[a-z][A-Za-z0-9_$]*\|[A-Z][A-Za-z0-9_$]*\)\s*(+
-                               \ end=+)+
-                               \ contains=haxeType,haxeStorageClass,haxeCm,haxeLineCm,@haxeClasses
- endif
- syn match    haxeBraces       "[{}]"
- syn cluster  haxeTop          add=haxeFuncDef,haxeBraces
-endif
-
-if exists("haxe_mark_braces_in_parens_as_errors")
-  syn match   haxeInParen      contained "[{}]"
-  HaxeHiLink  haxeInParen      haxeError
-  syn cluster haxeTop          add=haxeInParen
-endif
-
-" catch errors caused by wrong parenthesis
-syn region    haxeParenT       transparent matchgroup=haxeParen start="("
-                               \ end=")" contains=@haxeTop,haxeParenT1
-syn region    haxeParenT1      transparent matchgroup=haxeParen1 start="("
-                               \ end=")" contains=@haxeTop,haxeParenT2 contained
-syn region    haxeParenT2      transparent matchgroup=haxeParen2 start="("
-                               \ end=")" contains=@haxeTop,haxeParenT  contained
-syn match     haxeParenError   ")"
-HaxeHiLink    haxeParenError   haxeError
-
-
-if !exists("haxe_minlines")
-  let haxe_minlines = 5000
-endif
-exec "syn sync ccomment haxeCm minlines=" . haxe_minlines
-syn sync linebreaks=30
-
-" The default highlighting.
-if version >= 508 || !exists("did_haxe_syn_inits")
-  if version < 508
-    let did_haxe_syn_inits = 1
-  endif
-
-  HaxeHiLink  haxeFunctionDef  Identifier
-  HaxeHiLink  haxeFuncDef      Identifier
-  HaxeHiLink  haxeFunctionRef  Function
-  HaxeHiLink  haxeBraces       Function
-  HaxeHiLink  haxeBranch       Conditional
-  HaxeHiLink  haxeUserLabelRef haxeUserLabel
-  HaxeHiLink  haxeLabel        Label
-  HaxeHiLink  haxeUserLabel    Label
-  HaxeHiLink  haxeConditional  Conditional
-  HaxeHiLink  haxeRepeat       Repeat
-  HaxeHiLink  haxeExceptions   Exception
-  HaxeHiLink  haxeAssert       Statement
-
-  HaxeHiLink  haxeClassDef     Underlined
-  HaxeHiLink  haxeStructure    Structure
-  HaxeHiLink  haxeMethodDecl   haxeStorageClass
-  HaxeHiLink  haxeClassDecl    Structure
-  HaxeHiLink  haxeScopeDecl    StorageClass
-  HaxeHiLink  haxeScopeDecl2   Tag
-  HaxeHiLink  haxeBoolean      Boolean
-  HaxeHiLink  haxeSpecial      Special
-  HaxeHiLink  haxeSpecError    Error
-  HaxeHiLink  haxeSpecChrError Error
-  HaxeHiLink  haxeString       String
-  HaxeHiLink  haxeSingleString Character
-
-  HaxeHiLink  haxeEreg         Number
-  HaxeHiLink  haxeEregEscape   Debug
-  HaxeHiLink  haxeChr          Character
-  HaxeHiLink  haxeSpecChr      SpecialChar
-  HaxeHiLink  haxeNumber       Number
-  HaxeHiLink  haxeNumber2      Float
-  HaxeHiLink  haxeSpecNum      Boolean
-  HaxeHiLink  haxeError        Error
-  HaxeHiLink  haxeStringError  Debug
-  HaxeHiLink  haxeStatement    Statement
-  HaxeHiLink  haxeOperator     Operator
-  HaxeHiLink  haxeComparison   Repeat
-  HaxeHiLink  haxeTraceFun     SpecialComment
-  HaxeHiLink  haxeTrace        Comment
-  HaxeHiLink  haxeDelimiter    Delimiter
-
-  HaxeHiLink  haxeCm           Comment
-  HaxeHiLink  haxeDocCm        Comment
-  HaxeHiLink  haxeLineCm       Comment
-  HaxeHiLink  haxeConstant     Constant
-  HaxeHiLink  haxeTypedef      Typedef
-  HaxeHiLink  haxeTypedef1     Typedef
-  HaxeHiLink  haxeTodo         Todo
-  HaxeHiLink  haxeLangClass    Special
-  HaxeHiLink  haxeFlashClass   Keyword
-  HaxeHiLink  haxeFunction     Function
-  HaxeHiLink  haxeCmTitle      Special
-  HaxeHiLink  haxeDocTags      SpecialComment
-  HaxeHiLink  haxeProposedTags SpecialComment
-  HaxeHiLink  haxeCmStar       Comment
-
-  HaxeHiLink  haxeDocParam     Function
-  HaxeHiLink  haxeCoreType     Keyword
-  HaxeHiLink  haxeType         Type
-  HaxeHiLink  haxeExternal     Include
-  HaxeHiLink  haxeDefine       Define
-  HaxeHiLink  htmlComment      Special
-  HaxeHiLink  htmlCommentPart  Special
-  HaxeHiLink  haxeSpaceError   Error
-  HaxeHiLink  haxeCondIf       PreCondit
-  HaxeHiLink  haxeCondElseIf   PreCondit
-  HaxeHiLink  haxeCondElse     PreProc
-  HaxeHiLink  haxeCondEnd      PreProc
+" characters that cannot be in a haxe program (outside a string)
+syn match haxeError "[\\`]"
+
+" keywords
+" --------
+syn keyword haxeTypedef typedef extends implements
+syn keyword haxeTypeDecl class enum abstract interface import using package from to
+syn keyword haxeStorageClass static inline public private macro dynamic extern override final
+
+syn match   haxeTypedef		"\.\s*\<class\>"ms=s+1
+syn match   haxeTypeDecl       "^class\>"
+syn match   haxeTypeDecl       "[^.]\s*\<class\>"ms=s+1
+
+syn keyword haxeException try catch throw
+syn keyword haxeRepeat for do while in
+syn keyword haxeLabel case
+syn keyword haxeConditional switch
+syn match haxeConditional "\<\#\@<!\(if\|else\)\>"
+syn keyword haxeConstant null never super this default get set
+syn keyword haxeFunction function __dollar__new new
+syn match haxeFunction "\<__[^_]\+__\>"
+syn keyword haxeKeyword untyped cast continue break return trace var
+syn match haxeKeyword "\$type"
+
+syn match haxeError "\<#\@<!elseif\>"
+
+" type identifiers
+" ----------------
+syn match haxeType "\<[A-Z][a-zA-Z_0-9]*\>"
+
+" operators
+" ---------
+" Did a lot of work here to ensure a lot of invalid operators are highlighted as errors.
+
+" put ,; in seperate highlight group to .: to avoid mistakes.
+syn match haxeOperator "[:?]"
+syn match haxeOperator2 "[;,]"
+
+" match . and ... as operators, and .. and more than 4 . as errors
+syn match haxeOperator "\.\@<!\(\.\|\.\.\.\)\.\@!"
+syn match haxeError "\.\@<!\.\.\.\@!"
+syn match haxeError "\.\{4,\}"
+
+" match <,>,<<,>>,>>> as operators
+syn match haxeOperator ">\@<!\(>\|>>\|>>>\)>\@!"
+syn match haxeOperator "<\@<!\(<\|<<\)<\@!"
+
+" match &| in 1 or 2 as operator, and more than 2 as error
+" match &&= and ||= as errors
+syn match haxeOperator "&\@<!&&\?&\@!"
+syn match haxeOperator "|\@<!||\?|\@!"
+syn match haxeError "&\{3,\}\||\{3,}\|&&=\|||="
+
+" match = in 1 or 2 as operator, and more than 2 as error
+" match !== as an error
+syn match haxeOperator "=\@<!==\?=\@!"
+syn match haxeError "=\{3,\}\|!=="
+
+" match (+-*/%&!<>)=? as operators
+" have to match &!<> seperate to avoid highlighting things like &&= &&& <<< as okay
+syn match haxeOperator "[+\-*/%^!]=\?=\@!"
+syn match haxeOperator "<\@<!<=\?[=<]\@!"
+syn match haxeOperator ">\@<![>]=\?[=>]\@!"
+syn match haxeOperator "&\@<!&=\?[=&]\@!"
+syn match haxeOperator "|\@<!|=\?[=|]\@!"
+
+" string literals
+" ---------------
+" Did a lot of work to ensure that string interpolations are handled nicely
+syn match haxeErrorCharacter contained "\\\(x.\{0,2}\|u.\{0,4\}\|[^"'\\/nrt]\)"
+syn match haxeSpecialCharacter contained "\\\(x[a-fA-F0-9]\{2\}\|[0-7]\{3\}\|["'\\/nrt]\)"
+syn match haxeIntSpecialChar contained "\$\@<!\(\$\$\)\+\(\(\$\$\)\+\)\@!"
+syn match haxeInterpolatedIdent contained "\((\$\$)\+\)\@<!\$[a-zA-Z_][a-zA-Z_0-9]*"
+syn region haxeInterpolated contained start=+\(\$\(\$\$\)\+\)\@<!${+ end=+}+ contains=@Spell
+syn region haxeDString start=+"+ end=+"+ contains=haxeSpecialCharacter,haxeErrorCharacter,@Spell
+syn region haxeSString start=+'+ end=+'+ contains=haxeSpecialCharacter,haxeErrorCharacter,haxeIntSpecialChar,haxeInterpolatedIdent,haxeInterpolated,@Spell
+
+" int/float/bool literal
+" ----------------------
+syn match haxeInt "\<\([0-9]\+\|0x[0-9a-fA-F]\+\)\>"
+syn match haxeFloat "\<\([\-+]\?[0-9]*\.\?[0-9]\+([eE][\-+]\?[0-9]\+)\?\)\>"
+syn keyword haxeBool true false
+
+" comments
+" --------
+syn keyword haxeTODO contained TODO FIXME XXX
+syn match haxeComment "//.*" contains=haxeTODO,@Spell
+syn region haxeComment2 start=+/\*+ end=+\*/+ contains=haxeTODO,@Spell
+
+" preprocessing
+" -------------
+syn match haxePre "\(#if\|#elseif\|#else\|#end\)"
+syn match haxePreError "#error"
+
+" regex
+" -----
+syn region haxeRegex start=+\~\/+ end=+\/+ contains=haxeRegexEscape,haxeRegexError,@Spell
+
+syn match haxeRegexError contained "\\[^0-9bdnrstwxBDSW(){}\[\]\\$^*\-+|./?]"
+syn match haxeRegexEscape contained "\\[0-9bdnrstwxBDSW(){}\[\]\\$^*\-+|./?]"
+
+" meta
+" ----
+syn match haxeMeta "@:\?[a-zA-Z_][a-zA-Z_0-9]*\>"
+
+syn match haxeCompilerMeta "@:\(
+    \abstract
+    \\|access
+    \\|allow
+    \\|annotation
+    \\|arrayAccess
+    \\|autoBuild
+    \\|bind
+    \\|bitmap
+    \\|build
+    \\|buildXml
+    \\|callable
+    \\|classCode
+    \\|commutative
+    \\|compilerGenerated
+    \\|coreApi
+    \\|coreType
+    \\|cppFileCode
+    \\|cppNamespaceCode
+    \\|dce
+    \\|debug
+    \\|decl
+    \\|defParam
+    \\|delegate
+    \\|depend
+    \\|deprecated
+    \\|event
+    \\|enum
+    \\|expose
+    \\|extern
+    \\|fakeEnum
+    \\|file
+    \\|final
+    \\|font
+    \\|forward
+    \\|from
+    \\|functionCode
+    \\|functionTailCode
+    \\|generic
+    \\|genericBuild
+    \\|getter
+    \\|hack
+    \\|headerClassCode
+    \\|headerCode
+    \\|headerNamespaceCode
+    \\|hxGen
+    \\|ifFeature
+    \\|include
+    \\|initPackage
+    \\|internal
+    \\|isVar
+    \\|jsRequire
+    \\|keep
+    \\|keepInit
+    \\|keepSub
+    \\|luaRequire
+    \\|macro
+    \\|meta
+    \\|multiType
+    \\|multiReturn
+    \\|native
+    \\|nativeGen
+    \\|noCompletion
+    \\|noDebug
+    \\|noDoc
+    \\|noImportGlobal
+    \\|noPackageRestrict
+    \\|noStack
+    \\|noUsing
+    \\|notNull
+    \\|ns
+    \\|op
+    \\|optional
+    \\|overload
+    \\|privateAccess
+    \\|property
+    \\|protected
+    \\|public
+    \\|publicFields
+    \\|readOnly
+    \\|remove
+    \\|require
+    \\|rtti
+    \\|runtime
+    \\|runtimeValue
+    \\|selfCall
+    \\|setter
+    \\|sound
+    \\|struct
+    \\|suppressWarnings
+    \\|throws
+    \\|to
+    \\|transient
+    \\|unbound
+    \\|unifyMinDynamic
+    \\|unreflective
+    \\|unsafe
+    \\|usage
+    \\|volatile
+    \\)\>"
+
+
+syn sync ccomment haxeComment2 minlines=10
+
+HaxeHiLink haxeMeta Macro
+HaxeHiLink haxeCompilerMeta Identifier
+HaxeHiLink haxeRegex String
+HaxeHiLink haxeDString String
+HaxeHiLink haxeSString Character
+HaxeHiLink haxeSpecialCharacter SpecialChar
+HaxeHiLink haxeIntSpecialChar SpecialChar
+HaxeHiLink haxeRegexEscape SpecialChar
+HaxeHiLink haxeErrorCharacter Error
+HaxeHiLink haxeRegexError Error
+HaxeHiLink haxeInterpolatedIdent Normal
+HaxeHiLink haxeInterpolated Normal
+HaxeHiLink haxeError Error
+HaxeHiLink haxeOperator Operator
+HaxeHiLink haxeOperator2 Identifier
+HaxeHiLink haxeSpecial SpecialChar
+HaxeHiLink haxeInt Number
+HaxeHiLink haxeFloat Float
+HaxeHiLink haxeBool Boolean
+HaxeHiLink haxeComment Comment
+HaxeHiLink haxeComment2 Comment
+HaxeHiLink haxeTODO Todo
+HaxeHiLink haxePre PreCondit
+HaxeHiLink haxePreError PreProc
+HaxeHiLink haxeType Type
+HaxeHiLink haxeTypedef Typedef
+HaxeHiLink haxeTypeDecl Keyword " Structure just gives me same colour as Type and looks bad.
+HaxeHiLink haxeStorageClass StorageClass
+HaxeHiLink haxeException Exception
+HaxeHiLink haxeRepeat Repeat
+HaxeHiLink haxeLabel Label
+HaxeHiLink haxeConditional Conditional
+HaxeHiLink haxeConstant Constant
+HaxeHiLink haxeFunction Function
+HaxeHiLink haxeKeyword Keyword
 
-  HaxeHiLink  haxeCondError    Error
+delcommand HaxeHiLink
 
-  HaxeHiLink  haxeFlashTop     PreProc
-  HaxeHiLink  haxeFlashInner   Macro
-  HaxeHiLink  haxeFlashFinal   Define
-  HaxeHiLink  haxeFlash9Final  Define
+let b:current_syntax = "haxe"
+let b:spell_options = "contained"
 
-  HaxeHiLink  haxeOptionalVars Identifier
-endif
 
-delcommand HaxeHiLink
-let b:current_syntax = "haxe"
-if main_syntax == 'haxe'
-  unlet main_syntax
-endif
-let b:spell_options="contained"
+" vim: ts=8
diff --git a/syntax/haxe_extended.vim b/syntax/haxe_extended.vim
new file mode 100644
index 000000000..6fac9a8d9
--- /dev/null
+++ b/syntax/haxe_extended.vim
@@ -0,0 +1,131 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haxe', 'syntax/haxe_extended.vim')
+  finish
+endif
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Haxedoc
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if exists("haxe_haxedoc") || (exists("main_syntax") && main_syntax == 'jsp')
+  syntax case ignore
+  " syntax coloring for haxedoc comments (HTML)
+  " syntax include @haxeHtml <sfile>:p:h/html.vim
+  " unlet b:current_syntax
+  syn region  haxeDocComment    start="/\*\*"  end="\*/" keepend contains=haxeCommentTitle,@haxeHtml,haxeDocTags,haxeTodo,@Spell
+  syn region  haxeCommentTitle  contained matchgroup=haxeDocComment start="/\*\*"   matchgroup=haxeCommentTitle keepend end="\.$" end="\.[ \t\r<&]"me=e-1 end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1 contains=@haxeHtml,haxeCommentStar,haxeTodo,@Spell,haxeDocTags
+
+  syn region haxeDocTags  contained start="{@\(link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}"
+  syn match  haxeDocTags  contained "@\(see\|param\|exception\|throws\|since\)\s\+\S\+" contains=haxeDocParam
+  syn match  haxeDocParam contained "\s\S\+"
+  syn match  haxeDocTags  contained "@\(version\|author\|return\|deprecated\|serial\|serialField\|serialData\)\>"
+  syntax case match
+  HaxeHiLink haxeDocComment		Comment
+  HaxeHiLink haxeDocTags		Special
+  HaxeHiLink haxeDocParam		Function
+endif
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Haxe comment strings 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if exists("haxe_comment_strings")
+  syn region  haxeCommentString    contained start=+"+ end=+"+ end=+$+ end=+\*/+me=s-1,he=s-1 contains=haxeSpecial,haxeCommentStar,haxeSpecialChar,@Spell
+  syn region  haxeComment2String   contained start=+"+  end=+$\|"+  contains=haxeSpecial,haxeSpecialChar,@Spell
+  syn match   haxeCommentCharacter contained "'\\[^']\{1,6\}'" contains=haxeSpecialChar
+  syn match   haxeCommentCharacter contained "'\\''" contains=haxeSpecialChar
+  syn match   haxeCommentCharacter contained "'[^\\]'"
+  syn cluster haxeCommentSpecial add=haxeCommentString,haxeCommentCharacter,haxeNumber
+  syn cluster haxeCommentSpecial2 add=haxeComment2String,haxeCommentCharacter,haxeNumber
+  HaxeHiLink haxeCommentString haxeString
+  HaxeHiLink haxeComment2String haxeString
+endif
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Haxe concealed text 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if exists('g:haxe_conceal') && has("conceal")
+  syn match Ignore 'urn' transparent conceal containedin=haxeStatement
+  syn match Ignore 'ction' transparent conceal containedin=haxeStorageClass,haxeStatement
+  syn match Ignore 'ati' transparent conceal containedin=haxeStorageClass
+  syn match Ignore 'nline\|tati\|ubli' transparent conceal containedin=haxeScopeDecl
+endif
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Haxe space errors 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if exists("haxe_space_errors")
+  if !exists("haxe_no_trail_space_error")
+    syn match   haxeSpaceError  "\s\+$"
+  endif
+  if !exists("haxe_no_tab_space_error")
+    syn match   haxeSpaceError  " \+\t"me=e-1
+  endif
+  HaxeHiLink haxeSpaceError		Error
+endif
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Haxe minline comments 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if !exists("haxe_minlines")
+  let haxe_minlines = 10
+  exec "syn sync ccomment haxeComment minlines=" . haxe_minlines
+endif
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Mark braces in parens as errors 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if exists("haxe_mark_braces_in_parens_as_errors")
+  syn match haxeInParen		 contained "[{}]"
+  HaxeHiLink haxeInParen	haxeError
+  syn cluster haxeTop add=haxeInParen
+endif
+
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Highlight Functions 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if exists("haxe_highlight_functions")
+  if haxe_highlight_functions == "indent"
+    syn match  haxeFuncDef "^\(\t\| \{8\}\)[_$a-zA-Z][_$a-zA-Z0-9_. \[\]]*([^-+*/()]*)" contains=haxeScopeDecl,haxeType,haxeStorageClass,@haxeClasses
+    syn region haxeFuncDef start=+^\(\t\| \{8\}\)[$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+ end=+)+ contains=haxeScopeDecl,haxeType,haxeStorageClass,@haxeClasses
+    syn match  haxeFuncDef "^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*)" contains=haxeScopeDecl,haxeType,haxeStorageClass,@haxeClasses
+    syn region haxeFuncDef start=+^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+ end=+)+ contains=haxeScopeDecl,haxeType,haxeStorageClass,@haxeClasses
+  else
+    " This line catches method declarations at any indentation>0, but it assumes
+    " two things:
+    "   1. class names are always capitalized (ie: Button)
+    "   2. method names are never capitalized (except constructors, of course)
+    syn region haxeFuncDef start=+^\s\+\(\(public\|protected\|private\|static\|abstract\|override\|final\|native\|synchronized\)\s\+\)*\(\(void\|boolean\|char\|byte\|short\|int\|long\|float\|double\|\([A-Za-z_][A-Za-z0-9_$]*\.\)*[A-Z][A-Za-z0-9_$]*\)\(\[\]\)*\s\+[a-z][A-Za-z0-9_$]*\|[A-Z][A-Za-z0-9_$]*\)\s*(+ end=+)+ contains=haxeScopeDecl,haxeType,haxeStorageClass,haxeComment,haxeLineComment,@haxeClasses
+  endif
+  syn match  haxeBraces  "[{}]"
+  syn cluster haxeTop add=haxeFuncDef,haxeBraces
+endif
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Add special handling for haxecc.vim 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" use separate name so that it can be deleted in haxecc.vim
+syn match   haxeError2 "#\|=<"
+HaxeHiLink haxeError2 haxeError
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Catch extra paren errors 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" catch errors caused by wrong parenthesis
+syn region  haxeParenT  transparent matchgroup=haxeParen  start="("  end=")" contains=@haxeTop,haxeParenT1,haxeString,haxeSingleString
+syn region  haxeParenT1 transparent matchgroup=haxeParen1 start="(" end=")" contains=@haxeTop,haxeParenT2 contained
+syn region  haxeParenT2 transparent matchgroup=haxeParen2 start="(" end=")" contains=@haxeTop,haxeParenT  contained
+syn match   haxeParenError       ")"
+HaxeHiLink haxeParenError       haxeError
+
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" load a spearte haxeid.vim file 
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+if filereadable(expand("<sfile>:p:h")."/haxeid.vim")
+  source <sfile>:p:h/haxeid.vim
+endif
diff --git a/syntax/hss.vim b/syntax/hss.vim
new file mode 100644
index 000000000..1d04f48f4
--- /dev/null
+++ b/syntax/hss.vim
@@ -0,0 +1,115 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haxe', 'syntax/hss.vim')
+  finish
+endif
+
+" Vim syntax file
+" Language: hss (Haxe css)
+" Author: Justin Donaldson (jdonaldson@gmail.com) 
+" Based heavily on work by Daniel Hofstetter (daniel.hofstetter@42dh.com)
+
+if !exists("main_syntax")
+  if version < 600
+    syntax clear
+  elseif exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax = 'hss'
+endif
+
+runtime! syntax/css.vim
+runtime! syntax/css/*.vim
+
+syn case ignore
+
+syn region hssDefinition transparent matchgroup=cssBraces start='{' end='}' contains=css.*Attr,css.*Prop,cssComment,cssValue.*,cssColor,cssUrl,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,hssDefinition,hssComment,hssIdChar,hssClassChar,hssAmpersand,hssVariable,hssInclude,hssExtend,hssDebug,hssWarn,@hssControl,hssInterpolation,hssNestedSelector,hssReturn
+
+syn region hssInterpolation start="#{" end="}" contains=hssVariable
+
+syn match hssVariable "$[[:alnum:]_-]\+" nextgroup=hssVariableAssignment
+syn match hssVariableAssignment ":" contained nextgroup=hssVariableValue
+syn match hssVariableValue ".*;"me=e-1 contained contains=hssVariable,hssOperator,hssDefault "me=e-1 means that the last char of the pattern is not highlighted
+" syn match hssMixin "^@mixin" nextgroup=hssMixinName
+syn match hssMixinName " [[:alnum:]_-]\+" contained nextgroup=hssDefinition
+syn match hssFunction "^@function" nextgroup=hssFunctionName
+syn match hssFunctionName " [[:alnum:]_-]\+" contained nextgroup=hssDefinition
+" syn match hssReturn "@return" contained
+" syn match hssInclude "@include" nextgroup=hssMixinName
+" syn match hssExtend "@extend .*[;}]"me=e-1 contains=cssTagName,hssIdChar,hssClassChar
+syn keyword hssTodo TODO FIXME NOTE OPTIMIZE XXX contained containedIn=hssComment,cssComment
+
+syn match hssColor "#[0-9A-Fa-f]\{3\}\>" contained
+syn match hssColor "#[0-9A-Fa-f]\{6\}\>" contained
+
+syn match hssIdChar "#[[:alnum:]_-]\@=" nextgroup=hssId contains=hssColor
+syn match hssId "[[:alnum:]_-]\+" contained
+syn match hssClassChar "\.[[:alnum:]_-]\@=" nextgroup=hssClass
+syn match hssClass "[[:alnum:]_-]\+" contained
+syn match hssAmpersand "&" nextgroup=cssPseudoClass
+
+syn match hssOperator "+" contained
+syn match hssOperator "-" contained
+syn match hssOperator "/" contained
+syn match hssOperator "*" contained
+
+syn match hssNestedSelector "[^/]* {"me=e-1 contained contains=cssTagName,cssAttributeSelector,hssIdChar,hssClassChar,hssAmpersand,hssVariable,hssMixin,hssFunction,@hssControl,hssInterpolation,hssNestedProperty
+syn match hssNestedProperty "[[:alnum:]]\+:"me=e-1 contained
+
+" syn match hssDebug "@debug"
+" syn match hssWarn "@warn"
+syn match hssDefault "!default" contained
+
+" syn match hssIf "@if"
+" syn match hssElse "@else"
+" syn match hssElseIf "@else if"
+" syn match hssWhile "@while"
+" syn match hssFor "@for" nextgroup=hssVariable
+" syn match hssFrom " from "
+" syn match hssTo " to "
+" syn match hssThrough " through "
+" syn match hssEach "@each" nextgroup=hssVariable
+" syn match hssIn " in "
+" syn cluster hssControl contains=hssIf,hssElse,hssElseIf,hssWhile,hssFor,hssFrom,hssTo,hssThrough,hssEach,hssIn
+
+syn match hssComment "//.*$" contains=@Spell
+syn region hssImportStr start="\"" end="\""
+syn region hssImport start="@import" end=";" contains=hssImportStr,hssComment,cssComment,cssUnicodeEscape,cssMediaType
+
+hi def link hssVariable  Identifier
+hi def link hssVariableValue Constant
+hi def link hssMixin     PreProc
+hi def link hssMixinName Function
+hi def link hssFunction  PreProc
+hi def link hssFunctionName Function
+hi def link hssReturn    Statement
+hi def link hssInclude   PreProc
+hi def link hssExtend    PreProc
+hi def link hssComment   Comment
+hi def link hssColor     Constant
+hi def link hssIdChar    Special
+hi def link hssClassChar Special
+hi def link hssId        Identifier
+hi def link hssClass     Identifier
+hi def link hssAmpersand Character
+hi def link hssNestedProperty Type
+hi def link hssDebug     Debug
+hi def link hssWarn      Debug
+hi def link hssDefault   Special
+hi def link hssIf        Conditional
+hi def link hssElse      Conditional
+hi def link hssElseIf    Conditional
+hi def link hssWhile     Repeat
+hi def link hssFor       Repeat
+hi def link hssFrom      Repeat
+hi def link hssTo        Repeat
+hi def link hssThrough   Repeat
+hi def link hssEach      Repeat
+hi def link hssIn        Repeat
+hi def link hssInterpolation Delimiter
+hi def link hssImport    Include
+hi def link hssImportStr Include
+hi def link hssTodo      Todo
+
+let b:current_syntax = "hss"
+if main_syntax == 'hss'
+  unlet main_syntax
+endif
diff --git a/syntax/hxml.vim b/syntax/hxml.vim
new file mode 100644
index 000000000..f2416aade
--- /dev/null
+++ b/syntax/hxml.vim
@@ -0,0 +1,90 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haxe', 'syntax/hxml.vim')
+  finish
+endif
+
+" Vim syntax file
+" Author    : Justin Donaldson (jdonaldson@gmail.com)
+"  Based extensively on a version by Ganesh Gunasegaran(me at itsgg.com)
+" Language  : hxml
+
+if !exists("main_syntax")
+  if version < 600
+    syntax clear
+  elseif exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax='hxml'
+endif
+
+" Simple TODO/comment handling
+syntax keyword hxmlTodo contained TODO FIXME XXX NOTE
+syntax match hxmlComment "#.*$" contains=hxmlTodo
+
+" basic flags
+syntax match hxmlType "-v"
+syntax match hxmlType "-x"
+syntax match hxmlType "-D"
+
+"target/config flags
+syntax match hxmlType "--\?as3"
+syntax match hxmlType "--\?cmd"
+syntax match hxmlType "--\?cp"
+syntax match hxmlType "--\?cpp"
+syntax match hxmlType "--\?cppia"
+syntax match hxmlType "--\?java"
+syntax match hxmlType "--\?cs"
+syntax match hxmlType "--\?debug"
+syntax match hxmlType "--\?help"
+syntax match hxmlType "--\?js"
+syntax match hxmlType "--\?lib"
+syntax match hxmlType "--\?lua"
+syntax match hxmlType "--\?main"
+syntax match hxmlType "--\?neko"
+syntax match hxmlType "--\?php"
+syntax match hxmlType "--\?python"
+syntax match hxmlType "--\?prompt"
+syntax match hxmlType "--\?resource"
+syntax match hxmlType "--\?swf"
+syntax match hxmlType "--\?swf-header"
+syntax match hxmlType "--\?swf-lib"
+syntax match hxmlType "--\?swf-version"
+syntax match hxmlType "--\?swf9"
+syntax match hxmlType "--\?xml"
+
+" haxe 3.0 flags
+syntax match hxmlType "--/?dce"
+syntax match hxmlType "--/?swf-lib-extern"
+syntax match hxmlType "--/?version"
+syntax match hxmlType "--/?help-metas"
+syntax match hxmlType "--/?help-defines"
+
+" advanced flags
+syntax match hxmlStatement "--connect"
+syntax match hxmlStatement "--cwd"
+syntax match hxmlStatement "--dead-code-elimination"
+syntax match hxmlStatement "--display"
+syntax match hxmlStatement "--flash-strict"
+syntax match hxmlStatement "--flash-use-stage"
+syntax match hxmlStatement "--gen-hx-classes"
+syntax match hxmlStatement "--help"
+syntax match hxmlStatement "--interp"
+syntax match hxmlStatement "--js-modern"
+syntax match hxmlStatement "--macro"
+syntax match hxmlStatement "--next"
+syntax match hxmlStatement "--no-inline"
+syntax match hxmlStatement "--no-opt"
+syntax match hxmlStatement "--no-output"
+syntax match hxmlStatement "--no-traces"
+syntax match hxmlStatement "--php-front"
+syntax match hxmlStatement "--php-lib"
+syntax match hxmlStatement "--php-prefix"
+syntax match hxmlStatement "--remap"
+syntax match hxmlStatement "--times"
+syntax match hxmlStatement "--wait"
+
+
+" Highlight them
+highlight link hxmlType Type
+highlight link hxmlStatement Statement
+highlight link hxmlComment Comment
+highlight link hxmlTodo Todo
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index fbcc3cf96..895ece5e0 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -117,6 +117,8 @@ call TestFiletype('html.handlebars')
 call TestFiletype('haproxy')
 call TestFiletype('haskell')
 call TestFiletype('haxe')
+call TestFiletype('hxml')
+call TestFiletype('hss')
 call TestFiletype('hcl')
 call TestFiletype('hive')
 call TestFiletype('i3config')

From f678aad2100068b1310ada35e3eeedddceea59e2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 12:01:20 +0200
Subject: [PATCH 251/299] Fix livescript filetype, closes #666

---
 autoload/polyglot/init.vim   | 2 +-
 autoload/polyglot/sleuth.vim | 2 +-
 packages.yaml                | 2 +-
 tests/filetypes.vim          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 6c2e9b870..e463f3ac8 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -2215,7 +2215,7 @@ if !has_key(g:polyglot_is_disabled, 'llvm')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'livescript')
-  au BufNewFile,BufRead *._ls,*.ls,Slakefile setf livescript
+  au BufNewFile,BufRead *._ls,*.ls,Slakefile setf ls
 endif
 
 if !has_key(g:polyglot_is_disabled, 'lilypond')
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 66c78e1c2..e134370d2 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -298,7 +298,6 @@ let s:globs = {
   \ 'litcoffee': '*.litcoffee,*.coffee.md',
   \ 'lite': '*.lite,*.lt',
   \ 'litestep': '',
-  \ 'livescript': '*.ls,*._ls,Slakefile',
   \ 'llvm': '*.ll',
   \ 'log': '*.log,*.LOG,*_log,*_LOG',
   \ 'logcheck': '',
@@ -309,6 +308,7 @@ let s:globs = {
   \ 'lout': '*.lou,*.lout',
   \ 'lpc': '*.lpc,*.ulpc',
   \ 'lprolog': '*.sig',
+  \ 'ls': '*.ls,*._ls,Slakefile',
   \ 'lsl': '*.lsl',
   \ 'lss': '*.lss',
   \ 'lua': '*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,.luacheckrc',
diff --git a/packages.yaml b/packages.yaml
index 90c1333cb..442582614 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -994,7 +994,7 @@ filetypes:
 name: livescript
 remote: gkz/vim-ls
 filetypes:
-- name: livescript
+- name: ls
   linguist: LiveScript
 ---
 name: llvm
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 895ece5e0..df83137c9 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -139,7 +139,7 @@ call TestFiletype('kotlin')
 call TestFiletype('ledger')
 call TestFiletype('less')
 call TestFiletype('lilypond')
-call TestFiletype('livescript')
+call TestFiletype('ls')
 call TestFiletype('llvm')
 call TestFiletype('tablegen')
 call TestFiletype('log')

From 643a6d0a132c5207772f9e38bb8ceb8207bd2316 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 12:30:30 +0200
Subject: [PATCH 252/299] De-duplicate runtime  heuristic autocommands

---
 autoload/polyglot/init.vim | 66 +++++++++++++++++++-------------------
 scripts/build              |  2 +-
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index e463f3ac8..f41c44b07 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -196,7 +196,7 @@ if !has_key(g:polyglot_is_disabled, 'xpm2')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'xpm')
-  au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
   au BufNewFile,BufRead *.xpm setf xpm
 endif
 
@@ -1323,7 +1323,7 @@ if !has_key(g:polyglot_is_disabled, 'tilde')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'html')
-  au BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
+  au! BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
   au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.xht,*.xhtml setf html
 endif
 
@@ -1785,11 +1785,11 @@ if !has_key(g:polyglot_is_disabled, 'gitignore')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'tads')
-  au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
 endif
 
 if !has_key(g:polyglot_is_disabled, 'prolog')
-  au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
+  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap setf prolog
 endif
 
@@ -1812,7 +1812,7 @@ if !has_key(g:polyglot_is_disabled, 'spec')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'visual-basic')
-  au BufNewFile,BufRead,BufWritePost *.bas call polyglot#detect#Bas()
+  au! BufNewFile,BufRead,BufWritePost *.bas call polyglot#detect#Bas()
   au BufNewFile,BufRead *.cls,*.ctl,*.dsm,*.frm,*.frx,*.sba,*.vba,*.vbs setf vb
 endif
 
@@ -1821,7 +1821,7 @@ if !has_key(g:polyglot_is_disabled, 'basic')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'trasys')
-  au BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
+  au! BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
 endif
 
 if !has_key(g:polyglot_is_disabled, 'zig')
@@ -2013,7 +2013,7 @@ if !has_key(g:polyglot_is_disabled, 'rst')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'reason')
-  au BufNewFile,BufRead,BufWritePost *.re call polyglot#detect#Re()
+  au! BufNewFile,BufRead,BufWritePost *.re call polyglot#detect#Re()
   au BufNewFile,BufRead *.rei setf reason
 endif
 
@@ -2026,9 +2026,9 @@ if !has_key(g:polyglot_is_disabled, 'raml')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'raku')
-  au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
-  au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
-  au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
+  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 setf raku
 endif
 
@@ -2112,14 +2112,14 @@ if !has_key(g:polyglot_is_disabled, 'pgsql')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'perl')
-  au BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
-  au BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
-  au BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
+  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc setf perl
   au BufNewFile,BufRead *.pod setf pod
   au BufNewFile,BufRead *.comp,*.mason,*.mhtml setf mason
-  au BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
-  au BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
+  au! BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
+  au! BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
   au BufNewFile,BufRead *.xs setf xs
 endif
 
@@ -2132,7 +2132,7 @@ if !has_key(g:polyglot_is_disabled, 'opencl')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'octave')
-  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+  au! BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
   au BufNewFile,BufRead *.oct setf octave
 endif
 
@@ -2149,8 +2149,8 @@ if !has_key(g:polyglot_is_disabled, 'ocaml')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'objc')
-  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
-  au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
+  au! BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+  au! BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
 endif
 
 if !has_key(g:polyglot_is_disabled, 'nix')
@@ -2168,7 +2168,7 @@ if !has_key(g:polyglot_is_disabled, 'nginx')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'murphi')
-  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+  au! BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
 endif
 
 if !has_key(g:polyglot_is_disabled, 'moonscript')
@@ -2185,7 +2185,7 @@ if !has_key(g:polyglot_is_disabled, 'mdx')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'mathematica')
-  au BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
+  au! BufNewFile,BufRead,BufWritePost *.m call polyglot#detect#M()
   au BufNewFile,BufRead *.cdf,*.ma,*.mathematica,*.mma,*.mt,*.nb,*.nbp,*.wl,*.wls,*.wlt setf mma
 endif
 
@@ -2273,14 +2273,14 @@ if !has_key(g:polyglot_is_disabled, 'ion')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'idris2')
-  au BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
+  au! BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
   au BufNewFile,BufRead *.ipkg,idris-response setf idris2
-  au BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
+  au! BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
 endif
 
 if !has_key(g:polyglot_is_disabled, 'idris')
-  au BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
-  au BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
+  au! BufNewFile,BufRead,BufWritePost *.lidr call polyglot#detect#Lidr()
+  au! BufNewFile,BufRead,BufWritePost *.idr call polyglot#detect#Idr()
   au BufNewFile,BufRead idris-response setf idris
 endif
 
@@ -2360,7 +2360,7 @@ if !has_key(g:polyglot_is_disabled, 'gmpl')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'glsl')
-  au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
+  au! BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
 endif
 
@@ -2377,12 +2377,12 @@ if !has_key(g:polyglot_is_disabled, 'gdscript')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'fsharp')
-  au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
+  au! BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.fsi,*.fsx setf fsharp
 endif
 
 if !has_key(g:polyglot_is_disabled, 'forth')
-  au BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
+  au! BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.ft,*.fth setf forth
 endif
 
@@ -2514,12 +2514,12 @@ if !has_key(g:polyglot_is_disabled, 'atlas')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'aspperl')
-  au BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
+  au! BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
 endif
 
 if !has_key(g:polyglot_is_disabled, 'aspvbs')
-  au BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
-  au BufNewFile,BufRead,BufWritePost *.asa call polyglot#detect#Asa()
+  au! BufNewFile,BufRead,BufWritePost *.asp call polyglot#detect#Asp()
+  au! BufNewFile,BufRead,BufWritePost *.asa call polyglot#detect#Asa()
 endif
 
 if !has_key(g:polyglot_is_disabled, 'asn')
@@ -2555,9 +2555,9 @@ if !has_key(g:polyglot_is_disabled, 'arduino')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'c/c++')
-  au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
+  au! BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
   au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp setf cpp
-  au BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
+  au! BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
   au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
 endif
 
@@ -2660,7 +2660,7 @@ if !has_key(g:polyglot_is_disabled, 'abc')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'abaqus')
-  au BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
+  au! BufNewFile,BufRead,BufWritePost *.inp call polyglot#detect#Inp()
 endif
 
 if !has_key(g:polyglot_is_disabled, 'abap')
diff --git a/scripts/build b/scripts/build
index 23bfb33c5..7d278a8a5 100755
--- a/scripts/build
+++ b/scripts/build
@@ -671,7 +671,7 @@ def generate_ftdetect(packages, heuristics)
 
       for heuristic in filetype_heuristics.uniq
         extensions = heuristic["extensions"].map { |e| "*.#{e}" }
-        autocommands << "au BufNewFile,BufRead,BufWritePost #{extensions.join(",")} call polyglot#detect##{camelize(heuristic["extensions"].first)}()"
+        autocommands << "au! BufNewFile,BufRead,BufWritePost #{extensions.join(",")} call polyglot#detect##{camelize(heuristic["extensions"].first)}()"
       end
 
       if autocommands.size > 0 && filetype["description"]

From b0416720e7fd4434d5b444e411d1ef904ebc6d28 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 12:55:43 +0200
Subject: [PATCH 253/299] Enable jsdoc highlighting by default, fixes #667

---
 autoload/polyglot/init.vim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index f41c44b07..1601eafbb 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -82,6 +82,9 @@ call s:SetDefault('g:jsx_ext_required', 0)
 " Needed for sql highlighting
 call s:SetDefault('g:javascript_sql_dialect', 'sql')
 
+" Enable jsdoc highlighting by default
+call s:SetDefault('g:javascript_plugin_jsdoc', 1)
+
 " Make csv loading faster
 call s:SetDefault('g:csv_start', 1)
 call s:SetDefault('g:csv_end', 2)

From e3ad29ce799fd94e7e3e5617443761c1e24b37de Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 13:59:47 +0200
Subject: [PATCH 254/299] Document which default settings are changes, closes
 #672

---
 README.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8816bbe26..66a66c8a6 100644
--- a/README.md
+++ b/README.md
@@ -254,13 +254,30 @@ This will not affect smart autoindenting when starting a new line.
 
 ## Default settings
 
-Vim Polyglot includes vim-sensible plugin, which is usually necessary for editing any language. This can be disabled with:
+Vim Polyglot sets defaults of some settings that are relevant for good language support. You can disable them by:
 
 
 ```vim
 let g:polyglot_disabled = ['sensible']
 ```
 
+These defaults include:
+- Use utf-8 encoding by default
+- Automatically reload file if changed somewhere else
+- Disable existing swapfile warnings, instead just create multiple swapfiles
+- Don't create swapfiles in current directory, instead in data directory
+- Whitespace characters when using `:set list`
+- Delete comment character when joining commented lines
+- Search upwards for tags file(s) instead only locally
+- Fix issues with fish shell
+- Increase history size to 1000 items
+- Allow for up to 50 opened tabs on Vim start.
+- Reduce updatetime from 4000 to 300 to avoid issues with coc.nvim
+- Always save upper case variables to viminfo file
+- Don't save options in sessions and views
+- Allow color schemes to do bright colors without forcing bold
+- Load vim's built-in matchit plugin
+
 ## No ftdetect
 
 If you want to use vim-polyglot plugins, but not ftdetect autocommands, the you can disable it as so:

From f05dea8dd765b0ce5b6c6ea92b049a5ae7547180 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 14:23:57 +0200
Subject: [PATCH 255/299] Disable languages also from heuristics, fixes #673

---
 autoload/polyglot/detect.vim | 22 +++++++++++++++++-----
 heuristics.yaml              | 15 +++++++++++----
 scripts/build                | 14 +++-----------
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/autoload/polyglot/detect.vim b/autoload/polyglot/detect.vim
index b1b5d6d78..cac826cf1 100644
--- a/autoload/polyglot/detect.vim
+++ b/autoload/polyglot/detect.vim
@@ -53,16 +53,16 @@ func! polyglot#detect#H(...)
   for lnum in range(1, min([line("$"), 200]))
     let line = getline(lnum)
     if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
-      if exists("g:c_syntax_for_h")
+      if exists('g:c_syntax_for_h')
         set ft=objc | return
       endif
       set ft=objcpp | return
     endif
   endfor
-  if exists("g:c_syntax_for_h")
+  if exists('g:c_syntax_for_h')
     set ft=c | return
   endif
-  if exists("g:ch_syntax_for_h")
+  if exists('g:ch_syntax_for_h')
     set ft=ch | return
   endif
   set ft=cpp | return
@@ -82,7 +82,14 @@ func! polyglot#detect#M(...)
       set ft=objc | return
     endif
     if line =~# '^\s*%'
-      set ft=octave | return
+      if !has_key(g:polyglot_is_disabled, 'octave')
+        set ft=octave | return
+      endif
+    endif
+    if line =~# '^\s*%'
+      if has_key(g:polyglot_is_disabled, 'octave')
+        set ft=matlab | return
+      endif
     endif
     if line =~# '^\s*(\*'
       set ft=mma | return
@@ -97,7 +104,12 @@ func! polyglot#detect#M(...)
   if exists("g:filetype_m")
     let &ft = g:filetype_m | return
   endif
-  set ft=octave | return
+  if !has_key(g:polyglot_is_disabled, 'octave')
+    set ft=octave | return
+  endif
+  if has_key(g:polyglot_is_disabled, 'octave')
+    set ft=matlab | return
+  endif
 endfunc
 
 func! polyglot#detect#Fs(...)
diff --git a/heuristics.yaml b/heuristics.yaml
index 23f63bb44..fd7fbe945 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -28,12 +28,12 @@ rules:
 - lines: 200
   pattern: '^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])'
   rules:
-  - if_exists: "g:c_syntax_for_h"
+  - if: "exists('g:c_syntax_for_h')"
     filetype: objc
   - filetype: objcpp
-- if_exists: "g:c_syntax_for_h"
+- if: "exists('g:c_syntax_for_h')"
   filetype: c
-- if_exists: "g:ch_syntax_for_h"
+- if: "exists('g:ch_syntax_for_h')"
   filetype: ch
 - filetype: cpp
 ---
@@ -46,16 +46,23 @@ rules:
   - pattern: '^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])'
     filetype: objc
   - pattern: '^\s*%'
+    if: "!has_key(g:polyglot_is_disabled, 'octave')"
     filetype: octave
+  - pattern: '^\s*%'
+    if: "has_key(g:polyglot_is_disabled, 'octave')"
+    filetype: matlab
   - pattern: '^\s*\(\*'
     filetype: mma
   - pattern: '^\s*((type|var)\b|--)'
     ignore_case: true
     filetype: murphi
-- if_set: "saw_comment"
+- if: "saw_comment"
   filetype: objc
 - override: true
 - filetype: octave
+  if: "!has_key(g:polyglot_is_disabled, 'octave')"
+- filetype: matlab
+  if: "has_key(g:polyglot_is_disabled, 'octave')"
 ---
 extensions: [fs]
 rules:
diff --git a/scripts/build b/scripts/build
index 7d278a8a5..77d71cdd8 100755
--- a/scripts/build
+++ b/scripts/build
@@ -427,18 +427,10 @@ def rule_to_code(rule)
     end.join("\n")
   end
 
-  if rule.has_key?("if_set")
+  if rule.has_key?("if")
     return <<~EOS
-      if #{rule["negative"] ? "!" : ""}#{rule["if_set"]}
-      #{indent(rule_to_code(except(rule, "if_set", "negative")), 2)}
-      endif
-    EOS
-  end
-
-  if rule.has_key?("if_exists")
-    return <<~EOS
-      if #{rule["negative"] ? "!" : ""}exists("#{rule["if_exists"]}")
-      #{indent(rule_to_code(except(rule, "if_exists", "negative")), 2)}
+      if #{rule["if"]}
+      #{indent(rule_to_code(except(rule, "if")), 2)}
       endif
     EOS
   end

From 4dd1f8f2be6a9d10d13a594e1d81af8de1d0270a Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 16:19:15 +0200
Subject: [PATCH 256/299] Fix loading of rust autoload functions, fixes #686

---
 autoload/polyglot/init.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 1601eafbb..511841e56 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -28,7 +28,6 @@ func! polyglot#init#is_disabled(caller, name, path)
       for p in globpath(&rtp, a:path, 0, 1)
         if p != a:caller
           exe "source " . p
-          return 1
         endif
       endfor
     endif

From 1a096f0901264629947afb89436019895e5e7ef5 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 16:54:25 +0200
Subject: [PATCH 257/299] Fix script indentation inside html, closes #693

---
 README.md                                     |    4 +-
 after/ftplugin/html.vim                       |   13 -
 after/indent/html.vim                         | 1064 -----------------
 after/syntax/html.vim                         |  186 +--
 autoload/polyglot/init.vim                    |    5 -
 autoload/polyglot/sleuth.vim                  |    1 -
 ftplugin/html.vim                             |   56 +-
 indent/html.vim                               |   78 +-
 packages.yaml                                 |   10 +-
 syntax/html.vim                               |  512 +++-----
 {after/syntax => syntax}/html/aria.vim        |    2 +-
 {after/syntax => syntax}/html/electron.vim    |    2 +-
 {after/syntax => syntax}/html/rdfa.vim        |    2 +-
 {after/syntax => syntax}/javascript/html5.vim |    2 +-
 tests/filetypes.vim                           |    1 -
 15 files changed, 230 insertions(+), 1708 deletions(-)
 delete mode 100644 after/ftplugin/html.vim
 delete mode 100644 after/indent/html.vim
 rename {after/syntax => syntax}/html/aria.vim (97%)
 rename {after/syntax => syntax}/html/electron.vim (86%)
 rename {after/syntax => syntax}/html/rdfa.vim (82%)
 rename {after/syntax => syntax}/javascript/html5.vim (96%)

diff --git a/README.md b/README.md
index 66a66c8a6..bafa3abfe 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->604<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->603<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -101,7 +101,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [help](https://github.com/neovim/neovim/tree/master/runtime)
 - [hive](https://github.com/zebradil/hive.vim) (HiveQL syntax highlighting for q, hql and ql files)
 - [hjson](https://github.com/hjson/vim-hjson) (Syntax highlighting for hjson files)
-- [html5](https://github.com/sheerun/html5.vim)
+- [html5](https://github.com/othree/html5.vim)
 - [i3](https://github.com/mboughaba/i3config.vim) (Syntax highlighting for i3.config and i3config files)
 - [icalendar](https://github.com/chutzpah/icalendar.vim) (Syntax highlighting for ics files)
 - [idris2](https://github.com/edwinb/idris2-vim) (Syntax highlighting for idr, ipkg and lidr files)
diff --git a/after/ftplugin/html.vim b/after/ftplugin/html.vim
deleted file mode 100644
index 5a6b963ec..000000000
--- a/after/ftplugin/html.vim
+++ /dev/null
@@ -1,13 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/ftplugin/html.vim')
-  finish
-endif
-
-" Maintainer:  	othree <othree@gmail.com>
-" URL:		      http://github.com/othree/html5.vim
-" Last Change:  2014-05-02
-" License:      MIT
-" Changes:      Add - to keyword
-
-" setlocal iskeyword+=-
-
-setlocal commentstring=<!--%s-->
diff --git a/after/indent/html.vim b/after/indent/html.vim
deleted file mode 100644
index 67728aaca..000000000
--- a/after/indent/html.vim
+++ /dev/null
@@ -1,1064 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/indent/html.vim')
-  finish
-endif
-
-" Vim indent script for HTML
-" Header: "{{{
-" Maintainer:	Bram Moolenaar
-" Original Author: Andy Wokula <anwoku@yahoo.de>
-" Last Change:	2017 Jun 13
-" Version:	1.0
-" Description:	HTML indent script with cached state for faster indenting on a
-"		range of lines.
-"		Supports template systems through hooks.
-"		Supports Closure stylesheets.
-"
-" Credits:
-"	indent/html.vim (2006 Jun 05) from J. Zellner
-"	indent/css.vim (2006 Dec 20) from N. Weibull
-"
-" History:
-" 2014 June	(v1.0) overhaul (Bram)
-" 2012 Oct 21	(v0.9) added support for shiftwidth()
-" 2011 Sep 09	(v0.8) added HTML5 tags (thx to J. Zuckerman)
-" 2008 Apr 28	(v0.6) revised customization
-" 2008 Mar 09	(v0.5) fixed 'indk' issue (thx to C.J. Robinson)
-"}}}
-
-" Init Folklore, check user settings (2nd time ++)
-if exists("b:did_indent") "{{{
-  finish
-endif
-
-" Load the Javascript indent script first, it defines GetJavascriptIndent().
-" Undo the rest.
-" Load base python indent.
-if !exists('*GetJavascriptIndent')
-  runtime! indent/javascript.vim
-endif
-let b:did_indent = 1
-
-setlocal indentexpr=HtmlIndent()
-setlocal indentkeys=o,O,<Return>,<>>,{,},!^F
-
-" Needed for % to work when finding start/end of a tag.
-setlocal matchpairs+=<:>
-
-let b:undo_indent = "setlocal inde< indk<"
-
-" b:hi_indent keeps state to speed up indenting consecutive lines.
-let b:hi_indent = {"lnum": -1}
-
-"""""" Code below this is loaded only once. """""
-if exists("*HtmlIndent") && !exists('g:force_reload_html')
-  call HtmlIndent_CheckUserSettings()
-  finish
-endif
-
-" Allow for line continuation below.
-let s:cpo_save = &cpo
-set cpo-=C
-"}}}
-
-" Check and process settings from b:html_indent and g:html_indent... variables.
-" Prefer using buffer-local settings over global settings, so that there can
-" be defaults for all HTML files and exceptions for specific types of HTML
-" files.
-func! HtmlIndent_CheckUserSettings()
-  "{{{
-  let inctags = ''
-  if exists("b:html_indent_inctags")
-    let inctags = b:html_indent_inctags
-  elseif exists("g:html_indent_inctags")
-    let inctags = g:html_indent_inctags
-  endif
-  let b:hi_tags = {}
-  if len(inctags) > 0
-    call s:AddITags(b:hi_tags, split(inctags, ","))
-  endif
-
-  let autotags = ''
-  if exists("b:html_indent_autotags")
-    let autotags = b:html_indent_autotags
-  elseif exists("g:html_indent_autotags")
-    let autotags = g:html_indent_autotags
-  endif
-  let b:hi_removed_tags = {}
-  if len(autotags) > 0
-    call s:RemoveITags(b:hi_removed_tags, split(autotags, ","))
-  endif
-
-  " Syntax names indicating being inside a string of an attribute value.
-  let string_names = []
-  if exists("b:html_indent_string_names")
-    let string_names = b:html_indent_string_names
-  elseif exists("g:html_indent_string_names")
-    let string_names = g:html_indent_string_names
-  endif
-  let b:hi_insideStringNames = ['htmlString']
-  if len(string_names) > 0
-    for s in string_names
-      call add(b:hi_insideStringNames, s)
-    endfor
-  endif
-
-  " Syntax names indicating being inside a tag.
-  let tag_names = []
-  if exists("b:html_indent_tag_names")
-    let tag_names = b:html_indent_tag_names
-  elseif exists("g:html_indent_tag_names")
-    let tag_names = g:html_indent_tag_names
-  endif
-  let b:hi_insideTagNames = ['htmlTag', 'htmlScriptTag']
-  if len(tag_names) > 0
-    for s in tag_names
-      call add(b:hi_insideTagNames, s)
-    endfor
-  endif
-
-  let indone = {"zero": 0
-              \,"auto": "indent(prevnonblank(v:lnum-1))"
-              \,"inc": "b:hi_indent.blocktagind + shiftwidth()"}
-
-  let script1 = ''
-  if exists("b:html_indent_script1")
-    let script1 = b:html_indent_script1
-  elseif exists("g:html_indent_script1")
-    let script1 = g:html_indent_script1
-  endif
-  if len(script1) > 0
-    let b:hi_js1indent = get(indone, script1, indone.zero)
-  else
-    let b:hi_js1indent = 0
-  endif
-
-  let style1 = ''
-  if exists("b:html_indent_style1")
-    let style1 = b:html_indent_style1
-  elseif exists("g:html_indent_style1")
-    let style1 = g:html_indent_style1
-  endif
-  if len(style1) > 0
-    let b:hi_css1indent = get(indone, style1, indone.zero)
-  else
-    let b:hi_css1indent = 0
-  endif
-
-  if !exists('b:html_indent_line_limit')
-    if exists('g:html_indent_line_limit')
-      let b:html_indent_line_limit = g:html_indent_line_limit
-    else
-      let b:html_indent_line_limit = 200
-    endif
-  endif
-endfunc "}}}
-
-" Init Script Vars
-"{{{
-let b:hi_lasttick = 0
-let b:hi_newstate = {}
-let s:countonly = 0
- "}}}
-
-" Fill the s:indent_tags dict with known tags.
-" The key is "tagname" or "/tagname".  {{{
-" The value is:
-" 1   opening tag
-" 2   "pre"
-" 3   "script"
-" 4   "style"
-" 5   comment start
-" 6   conditional comment start
-" -1  closing tag
-" -2  "/pre"
-" -3  "/script"
-" -4  "/style"
-" -5  comment end
-" -6  conditional comment end
-let s:indent_tags = {}
-let s:endtags = [0,0,0,0,0,0,0]   " long enough for the highest index
-"}}}
-
-" Add a list of tag names for a pair of <tag> </tag> to "tags".
-func! s:AddITags(tags, taglist)
-  "{{{
-  for itag in a:taglist
-    let a:tags[itag] = 1
-    let a:tags['/' . itag] = -1
-  endfor
-endfunc "}}}
-
-" Take a list of tag name pairs that are not to be used as tag pairs.
-func! s:RemoveITags(tags, taglist)
-  "{{{
-  for itag in a:taglist
-    let a:tags[itag] = 1
-    let a:tags['/' . itag] = 1
-  endfor
-endfunc "}}}
-
-" Add a block tag, that is a tag with a different kind of indenting.
-func! s:AddBlockTag(tag, id, ...)
-  "{{{
-  if !(a:id >= 2 && a:id < len(s:endtags))
-    echoerr 'AddBlockTag ' . a:id
-    return
-  endif
-  let s:indent_tags[a:tag] = a:id
-  if a:0 == 0
-    let s:indent_tags['/' . a:tag] = -a:id
-    let s:endtags[a:id] = "</" . a:tag . ">"
-  else
-    let s:indent_tags[a:1] = -a:id
-    let s:endtags[a:id] = a:1
-  endif
-endfunc "}}}
-
-" Add known tag pairs.
-" Self-closing tags and tags that are sometimes {{{
-" self-closing (e.g., <p>) are not here (when encountering </p> we can find
-" the matching <p>, but not the other way around).
-" Old HTML tags:
-call s:AddITags(s:indent_tags, [
-    \ 'a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big',
-    \ 'blockquote', 'body', 'button', 'caption', 'center', 'cite', 'code',
-    \ 'colgroup', 'del', 'dfn', 'dir', 'div', 'dl', 'em', 'fieldset', 'font',
-    \ 'form', 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'html',
-    \ 'i', 'iframe', 'ins', 'kbd', 'label', 'legend', 'li',
-    \ 'map', 'menu', 'noframes', 'noscript', 'object', 'ol',
-    \ 'optgroup', 'p', 'q', 's', 'samp', 'select', 'small', 'span', 'strong', 'sub',
-    \ 'sup', 'table', 'textarea', 'title', 'tt', 'u', 'ul', 'var', 'th', 'td',
-    \ 'tr', 'tbody', 'tfoot', 'thead'])
-
-" New HTML5 elements:
-call s:AddITags(s:indent_tags, [
-    \ 'area', 'article', 'aside', 'audio', 'bdi', 'canvas',
-    \ 'command', 'data', 'datalist', 'details', 'dislog', 'embed', 'figcaption',
-    \ 'figure', 'footer', 'header', 'keygen', 'main', 'mark', 'meter', 'nav', 'output',
-    \ 'picture', 'progress', 'rp', 'rt', 'ruby', 'section', 'source', 'summary', 'svg', 
-    \ 'time', 'track', 'video', 'wbr'])
-
-" Tags added for web components:
-call s:AddITags(s:indent_tags, [
-    \ 'content', 'shadow', 'template'])
-"}}}
-
-" Add Block Tags: these contain alien content
-"{{{
-call s:AddBlockTag('pre', 2)
-call s:AddBlockTag('script', 3)
-call s:AddBlockTag('style', 4)
-call s:AddBlockTag('<!--', 5, '-->')
-call s:AddBlockTag('<!--[', 6, '![endif]-->')
-"}}}
-
-" Return non-zero when "tagname" is an opening tag, not being a block tag, for
-" which there should be a closing tag.  Can be used by scripts that include
-" HTML indenting.
-func! HtmlIndent_IsOpenTag(tagname)
-  "{{{
-  if get(s:indent_tags, a:tagname) == 1
-    return 1
-  endif
-  return get(b:hi_tags, a:tagname) == 1
-endfunc "}}}
-
-" Get the value for "tagname", taking care of buffer-local tags.
-func! s:get_tag(tagname)
-  "{{{
-  let i = get(s:indent_tags, a:tagname)
-  if (i == 1 || i == -1) && get(b:hi_removed_tags, a:tagname) != 0
-    return 0
-  endif
-  if i == 0
-    let i = get(b:hi_tags, a:tagname)
-  endif
-  return i
-endfunc "}}}
-
-" Count the number of start and end tags in "text".
-func! s:CountITags(text)
-  "{{{
-  " Store the result in s:curind and s:nextrel.
-  let s:curind = 0  " relative indent steps for current line [unit &sw]:
-  let s:nextrel = 0  " relative indent steps for next line [unit &sw]:
-  let s:block = 0		" assume starting outside of a block
-  let s:countonly = 1	" don't change state
-  call substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
-  let s:countonly = 0
-endfunc "}}}
-
-" Count the number of start and end tags in text.
-func! s:CountTagsAndState(text)
-  "{{{
-  " Store the result in s:curind and s:nextrel.  Update b:hi_newstate.block.
-  let s:curind = 0  " relative indent steps for current line [unit &sw]:
-  let s:nextrel = 0  " relative indent steps for next line [unit &sw]:
-
-  let s:block = b:hi_newstate.block
-  let tmp = substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
-  if s:block == 3
-    let b:hi_newstate.scripttype = s:GetScriptType(matchstr(tmp, '\C.*<SCRIPT\>\zs[^>]*'))
-  endif
-  let b:hi_newstate.block = s:block
-endfunc "}}}
-
-" Used by s:CountITags() and s:CountTagsAndState().
-func! s:CheckTag(itag)
-  "{{{
-  " Returns an empty string or "SCRIPT".
-  " a:itag can be "tag" or "/tag" or "<!--" or "-->"
-  if (s:CheckCustomTag(a:itag))
-    return ""
-  endif
-  let ind = s:get_tag(a:itag)
-  if ind == -1
-    " closing tag
-    if s:block != 0
-      " ignore itag within a block
-      return ""
-    endif
-    if s:nextrel == 0
-      let s:curind -= 1
-    else
-      let s:nextrel -= 1
-    endif
-  elseif ind == 1
-    " opening tag
-    if s:block != 0
-      return ""
-    endif
-    let s:nextrel += 1
-  elseif ind != 0
-    " block-tag (opening or closing)
-    return s:CheckBlockTag(a:itag, ind)
-  " else ind==0 (other tag found): keep indent
-  endif
-  return ""
-endfunc "}}}
-
-" Used by s:CheckTag(). Returns an empty string or "SCRIPT".
-func! s:CheckBlockTag(blocktag, ind)
-  "{{{
-  if a:ind > 0
-    " a block starts here
-    if s:block != 0
-      " already in a block (nesting) - ignore
-      " especially ignore comments after other blocktags
-      return ""
-    endif
-    let s:block = a:ind		" block type
-    if s:countonly
-      return ""
-    endif
-    let b:hi_newstate.blocklnr = v:lnum
-    " save allover indent for the endtag
-    let b:hi_newstate.blocktagind = b:hi_indent.baseindent + (s:nextrel + s:curind) * shiftwidth()
-    if a:ind == 3
-      return "SCRIPT"    " all except this must be lowercase
-      " line is to be checked again for the type attribute
-    endif
-  else
-    let s:block = 0
-    " we get here if starting and closing a block-tag on the same line
-  endif
-  return ""
-endfunc "}}}
-
-" Used by s:CheckTag().
-func! s:CheckCustomTag(ctag)
-  "{{{
-  " Returns 1 if ctag is the tag for a custom element, 0 otherwise.
-  " a:ctag can be "tag" or "/tag" or "<!--" or "-->"
-  let pattern = '\%\(\w\+-\)\+\w\+'
-  if match(a:ctag, pattern) == -1
-    return 0
-  endif
-  if matchstr(a:ctag, '\/\ze.\+') == "/"
-    " closing tag
-    if s:block != 0
-      " ignore ctag within a block
-      return 1
-    endif
-    if s:nextrel == 0
-      let s:curind -= 1
-    else
-      let s:nextrel -= 1
-    endif
-  else
-    " opening tag
-    if s:block != 0
-      return 1
-    endif
-    let s:nextrel += 1
-  endif
-  return 1
-endfunc "}}}
-
-" Return the <script> type: either "javascript" or ""
-func! s:GetScriptType(str)
-  "{{{
-  if a:str == "" || a:str =~ "java"
-    return "javascript"
-  else
-    return ""
-  endif
-endfunc "}}}
-
-" Look back in the file, starting at a:lnum - 1, to compute a state for the
-" start of line a:lnum.  Return the new state.
-func! s:FreshState(lnum)
-  "{{{
-  " A state is to know ALL relevant details about the
-  " lines 1..a:lnum-1, initial calculating (here!) can be slow, but updating is
-  " fast (incremental).
-  " TODO: this should be split up in detecting the block type and computing the
-  " indent for the block type, so that when we do not know the indent we do
-  " not need to clear the whole state and re-detect the block type again.
-  " State:
-  "	lnum		last indented line == prevnonblank(a:lnum - 1)
-  "	block = 0	a:lnum located within special tag: 0:none, 2:<pre>,
-  "			3:<script>, 4:<style>, 5:<!--, 6:<!--[
-  "	baseindent	use this indent for line a:lnum as a start - kind of
-  "			autoindent (if block==0)
-  "	scripttype = ''	type attribute of a script tag (if block==3)
-  "	blocktagind	indent for current opening (get) and closing (set)
-  "			blocktag (if block!=0)
-  "	blocklnr	lnum of starting blocktag (if block!=0)
-  "	inattr		line {lnum} starts with attributes of a tag
-  let state = {}
-  let state.lnum = prevnonblank(a:lnum - 1)
-  let state.scripttype = ""
-  let state.blocktagind = -1
-  let state.block = 0
-  let state.baseindent = 0
-  let state.blocklnr = 0
-  let state.inattr = 0
-
-  if state.lnum == 0
-    return state
-  endif
-
-  " Heuristic:
-  " remember startline state.lnum
-  " look back for <pre, </pre, <script, </script, <style, </style tags
-  " remember stopline
-  " if opening tag found,
-  "	assume a:lnum within block
-  " else
-  "	look back in result range (stopline, startline) for comment
-  "	    \ delimiters (<!--, -->)
-  "	if comment opener found,
-  "	    assume a:lnum within comment
-  "	else
-  "	    assume usual html for a:lnum
-  "	    if a:lnum-1 has a closing comment
-  "		look back to get indent of comment opener
-  " FI
-
-  " look back for a blocktag
-  let stopline2 = v:lnum + 1
-  if has_key(b:hi_indent, 'block') && b:hi_indent.block > 5
-    let [stopline2, stopcol2] = searchpos('<!--', 'bnW')
-  endif
-  let [stopline, stopcol] = searchpos('\c<\zs\/\=\%(pre\>\|script\>\|style\>\)', "bnW")
-  if stopline > 0 && stopline < stopline2
-    " ugly ... why isn't there searchstr()
-    let tagline = tolower(getline(stopline))
-    let blocktag = matchstr(tagline, '\/\=\%(pre\>\|script\>\|style\>\)', stopcol - 1)
-    if blocktag[0] != "/"
-      " opening tag found, assume a:lnum within block
-      let state.block = s:indent_tags[blocktag]
-      if state.block == 3
-        let state.scripttype = s:GetScriptType(matchstr(tagline, '\>[^>]*', stopcol))
-      endif
-      let state.blocklnr = stopline
-      " check preceding tags in the line:
-      call s:CountITags(tagline[: stopcol-2])
-      let state.blocktagind = indent(stopline) + (s:curind + s:nextrel) * shiftwidth()
-      return state
-    elseif stopline == state.lnum
-      " handle special case: previous line (= state.lnum) contains a
-      " closing blocktag which is preceded by line-noise;
-      " blocktag == "/..."
-      let swendtag = match(tagline, '^\s*</') >= 0
-      if !swendtag
-        let [bline, bcol] = searchpos('<'.blocktag[1:].'\>', "bnW")
-        call s:CountITags(tolower(getline(bline)[: bcol-2]))
-        let state.baseindent = indent(bline) + (s:curind + s:nextrel) * shiftwidth()
-        return state
-      endif
-    endif
-  endif
-  if stopline > stopline2
-    let stopline = stopline2
-    let stopcol = stopcol2
-  endif
-
-  " else look back for comment
-  let [comlnum, comcol, found] = searchpos('\(<!--\[\)\|\(<!--\)\|-->', 'bpnW', stopline)
-  if found == 2 || found == 3
-    " comment opener found, assume a:lnum within comment
-    let state.block = (found == 3 ? 5 : 6)
-    let state.blocklnr = comlnum
-    " check preceding tags in the line:
-    call s:CountITags(tolower(getline(comlnum)[: comcol-2]))
-    if found == 2
-      let state.baseindent = b:hi_indent.baseindent
-    endif
-    let state.blocktagind = indent(comlnum) + (s:curind + s:nextrel) * shiftwidth()
-    return state
-  endif
-
-  " else within usual HTML
-  let text = tolower(getline(state.lnum))
-
-  " Check a:lnum-1 for closing comment (we need indent from the opening line).
-  " Not when other tags follow (might be --> inside a string).
-  let comcol = stridx(text, '-->')
-  if comcol >= 0 && match(text, '[<>]', comcol) <= 0
-    call cursor(state.lnum, comcol + 1)
-    let [comlnum, comcol] = searchpos('<!--', 'bW')
-    if comlnum == state.lnum
-      let text = text[: comcol-2]
-    else
-      let text = tolower(getline(comlnum)[: comcol-2])
-    endif
-    call s:CountITags(text)
-    let state.baseindent = indent(comlnum) + (s:curind + s:nextrel) * shiftwidth()
-    " TODO check tags that follow "-->"
-    return state
-  endif
-
-  " Check if the previous line starts with end tag.
-  let swendtag = match(text, '^\s*</') >= 0
-
-  " If previous line ended in a closing tag, line up with the opening tag.
-  if !swendtag && text =~ '</\w\+\s*>\s*$'
-    call cursor(state.lnum, 99999)
-    normal! F<
-    let start_lnum = HtmlIndent_FindStartTag()
-    if start_lnum > 0
-      let state.baseindent = indent(start_lnum)
-      if col('.') > 2
-        " check for tags before the matching opening tag.
-        let text = getline(start_lnum)
-        let swendtag = match(text, '^\s*</') >= 0
-        call s:CountITags(text[: col('.') - 2])
-        let state.baseindent += s:nextrel * shiftwidth()
-        if !swendtag
-          let state.baseindent += s:curind * shiftwidth()
-        endif
-      endif
-      return state
-    endif
-  endif
-
-  " Else: no comments. Skip backwards to find the tag we're inside.
-  let [state.lnum, found] = HtmlIndent_FindTagStart(state.lnum)
-  " Check if that line starts with end tag.
-  let text = getline(state.lnum)
-  let swendtag = match(text, '^\s*</') >= 0
-  call s:CountITags(tolower(text))
-  let state.baseindent = indent(state.lnum) + s:nextrel * shiftwidth()
-  if !swendtag
-    let state.baseindent += s:curind * shiftwidth()
-  endif
-  return state
-endfunc "}}}
-
-" Indent inside a <pre> block: Keep indent as-is.
-func! s:Alien2()
-  "{{{
-  return -1
-endfunc "}}}
-
-" Return the indent inside a <script> block for javascript.
-func! s:Alien3()
-  "{{{
-  let lnum = prevnonblank(v:lnum - 1)
-  while lnum > 1 && getline(lnum) =~ '^\s*/[/*]'
-    " Skip over comments to avoid that cindent() aligns with the <script> tag
-    let lnum = prevnonblank(lnum - 1)
-  endwhile
-  if lnum == b:hi_indent.blocklnr
-    " indent for the first line after <script>
-    return eval(b:hi_js1indent)
-  endif
-  if b:hi_indent.scripttype == "javascript"
-    return GetJavascriptIndent()
-  else
-    return -1
-  endif
-endfunc "}}}
-
-" Return the indent inside a <style> block.
-func! s:Alien4()
-  "{{{
-  if prevnonblank(v:lnum-1) == b:hi_indent.blocklnr
-    " indent for first content line
-    return eval(b:hi_css1indent)
-  endif
-  return s:CSSIndent()
-endfunc "}}}
-
-" Indending inside a <style> block.  Returns the indent.
-func! s:CSSIndent()
-  "{{{
-  " This handles standard CSS and also Closure stylesheets where special lines
-  " start with @.
-  " When the line starts with '*' or the previous line starts with "/*"
-  " and does not end in "*/", use C indenting to format the comment.
-  " Adopted $VIMRUNTIME/indent/css.vim
-  let curtext = getline(v:lnum)
-  if curtext =~ '^\s*[*]'
-        \ || (v:lnum > 1 && getline(v:lnum - 1) =~ '\s*/\*'
-        \     && getline(v:lnum - 1) !~ '\*/\s*$')
-    return cindent(v:lnum)
-  endif
-
-  let min_lnum = b:hi_indent.blocklnr
-  let prev_lnum = s:CssPrevNonComment(v:lnum - 1, min_lnum)
-  let [prev_lnum, found] = HtmlIndent_FindTagStart(prev_lnum)
-  if prev_lnum <= min_lnum
-    " Just below the <style> tag, indent for first content line after comments.
-    return eval(b:hi_css1indent)
-  endif
-
-  " If the current line starts with "}" align with it's match.
-  if curtext =~ '^\s*}'
-    call cursor(v:lnum, 1)
-    try
-      normal! %
-      " Found the matching "{", align with it after skipping unfinished lines.
-      let align_lnum = s:CssFirstUnfinished(line('.'), min_lnum)
-      return indent(align_lnum)
-    catch
-      " can't find it, try something else, but it's most likely going to be
-      " wrong
-    endtry
-  endif
-
-  " add indent after {
-  let brace_counts = HtmlIndent_CountBraces(prev_lnum)
-  let extra = brace_counts.c_open * shiftwidth()
-
-  let prev_text = getline(prev_lnum)
-  let below_end_brace = prev_text =~ '}\s*$'
-
-  " Search back to align with the first line that's unfinished.
-  let align_lnum = s:CssFirstUnfinished(prev_lnum, min_lnum)
-
-  " Handle continuation lines if aligning with previous line and not after a
-  " "}".
-  if extra == 0 && align_lnum == prev_lnum && !below_end_brace
-    let prev_hasfield = prev_text =~ '^\s*[a-zA-Z0-9-]\+:'
-    let prev_special = prev_text =~ '^\s*\(/\*\|@\)'
-    if curtext =~ '^\s*\(/\*\|@\)'
-      " if the current line is not a comment or starts with @ (used by template
-      " systems) reduce indent if previous line is a continuation line
-      if !prev_hasfield && !prev_special
-        let extra = -shiftwidth()
-      endif
-    else
-      let cur_hasfield = curtext =~ '^\s*[a-zA-Z0-9-]\+:'
-      let prev_unfinished = s:CssUnfinished(prev_text)
-      if !cur_hasfield && (prev_hasfield || prev_unfinished)
-        " Continuation line has extra indent if the previous line was not a
-        " continuation line.
-        let extra = shiftwidth()
-        " Align with @if
-        if prev_text =~ '^\s*@if '
-          let extra = 4
-        endif
-      elseif cur_hasfield && !prev_hasfield && !prev_special
-        " less indent below a continuation line
-        let extra = -shiftwidth()
-      endif
-    endif
-  endif
-
-  if below_end_brace
-    " find matching {, if that line starts with @ it's not the start of a rule
-    " but something else from a template system
-    call cursor(prev_lnum, 1)
-    call search('}\s*$')
-    try
-      normal! %
-      " Found the matching "{", align with it.
-      let align_lnum = s:CssFirstUnfinished(line('.'), min_lnum)
-      let special = getline(align_lnum) =~ '^\s*@'
-    catch
-      let special = 0
-    endtry
-    if special
-      " do not reduce indent below @{ ... }
-      if extra < 0
-        let extra += shiftwidth()
-      endif
-    else
-      let extra -= (brace_counts.c_close - (prev_text =~ '^\s*}')) * shiftwidth()
-    endif
-  endif
-
-  " if no extra indent yet...
-  if extra == 0
-    if brace_counts.p_open > brace_counts.p_close
-      " previous line has more ( than ): add a shiftwidth
-      let extra = shiftwidth()
-    elseif brace_counts.p_open < brace_counts.p_close
-      " previous line has more ) than (: subtract a shiftwidth
-      let extra = -shiftwidth()
-    endif
-  endif
-
-  return indent(align_lnum) + extra
-endfunc "}}}
-
-" Inside <style>: Whether a line is unfinished.
-func! s:CssUnfinished(text)
-  "{{{
-  return a:text =~ '\s\(||\|&&\|:\)\s*$'
-endfunc "}}}
-
-" Search back for the first unfinished line above "lnum".
-func! s:CssFirstUnfinished(lnum, min_lnum)
-  "{{{
-  let align_lnum = a:lnum
-  while align_lnum > a:min_lnum && s:CssUnfinished(getline(align_lnum - 1))
-    let align_lnum -= 1
-  endwhile
-  return align_lnum
-endfunc "}}}
-
-" Find the non-empty line at or before "lnum" that is not a comment.
-func! s:CssPrevNonComment(lnum, stopline)
-  "{{{
-  " caller starts from a line a:lnum + 1 that is not a comment
-  let lnum = prevnonblank(a:lnum)
-  while 1
-    let ccol = match(getline(lnum), '\*/')
-    if ccol < 0
-      " No comment end thus it's something else.
-      return lnum
-    endif
-    call cursor(lnum, ccol + 1)
-    " Search back for the /* that starts the comment
-    let lnum = search('/\*', 'bW', a:stopline)
-    if indent(".") == virtcol(".") - 1
-      " The  found /* is at the start of the line. Now go back to the line
-      " above it and again check if it is a comment.
-      let lnum = prevnonblank(lnum - 1)
-    else
-      " /* is after something else, thus it's not a comment line.
-      return lnum
-    endif
-  endwhile
-endfunc "}}}
-
-" Check the number of {} and () in line "lnum". Return a dict with the counts.
-func! HtmlIndent_CountBraces(lnum)
-  "{{{
-  let brs = substitute(getline(a:lnum), '[''"].\{-}[''"]\|/\*.\{-}\*/\|/\*.*$\|[^{}()]', '', 'g')
-  let c_open = 0
-  let c_close = 0
-  let p_open = 0
-  let p_close = 0
-  for brace in split(brs, '\zs')
-    if brace == "{"
-      let c_open += 1
-    elseif brace == "}"
-      if c_open > 0
-        let c_open -= 1
-      else
-        let c_close += 1
-      endif
-    elseif brace == '('
-      let p_open += 1
-    elseif brace == ')'
-      if p_open > 0
-        let p_open -= 1
-      else
-        let p_close += 1
-      endif
-    endif
-  endfor
-  return {'c_open': c_open,
-        \ 'c_close': c_close,
-        \ 'p_open': p_open,
-        \ 'p_close': p_close}
-endfunc "}}}
-
-" Return the indent for a comment: <!-- -->
-func! s:Alien5()
-  "{{{
-  let curtext = getline(v:lnum)
-  if curtext =~ '^\s*\zs-->'
-    " current line starts with end of comment, line up with comment start.
-    call cursor(v:lnum, 0)
-    let lnum = search('<!--', 'b')
-    if lnum > 0
-      " TODO: what if <!-- is not at the start of the line?
-      return indent(lnum)
-    endif
-
-    " Strange, can't find it.
-    return -1
-  endif
-
-  let prevlnum = prevnonblank(v:lnum - 1)
-  let prevtext = getline(prevlnum)
-  let idx = match(prevtext, '^\s*\zs<!--')
-  if idx >= 0
-    " just below comment start, add a shiftwidth
-    return idx + shiftwidth()
-  endif
-
-  " Some files add 4 spaces just below a TODO line.  It's difficult to detect
-  " the end of the TODO, so let's not do that.
-
-  " Align with the previous non-blank line.
-  return indent(prevlnum)
-endfunc "}}}
-
-" Return the indent for conditional comment: <!--[ ![endif]-->
-func! s:Alien6()
-  "{{{
-  let curtext = getline(v:lnum)
-  if curtext =~ '\s*\zs<!\[endif\]-->'
-    " current line starts with end of comment, line up with comment start.
-    let lnum = search('<!--', 'bn')
-    if lnum > 0
-      return indent(lnum)
-    endif
-  endif
-  return b:hi_indent.baseindent + shiftwidth()
-endfunc "}}}
-
-" When the "lnum" line ends in ">" find the line containing the matching "<".
-func! HtmlIndent_FindTagStart(lnum)
-  "{{{
-  " Avoids using the indent of a continuation line.
-  " Moves the cursor.
-  " Return two values:
-  " - the matching line number or "lnum".
-  " - a flag indicating whether we found the end of a tag.
-  " This method is global so that HTML-like indenters can use it.
-  " To avoid matching " > " or " < " inside a string require that the opening
-  " "<" is followed by a word character
-  let idx = match(getline(a:lnum), '\S>\s*$')
-  if idx > 0
-    call cursor(a:lnum, idx)
-    let lnum = searchpair('<\w', '' , '>', 'bW', '', max([a:lnum - b:html_indent_line_limit, 0]))
-    if lnum > 0
-      return [lnum, 1]
-    endif
-  endif
-  return [a:lnum, 0]
-endfunc "}}}
-
-" Find the unclosed start tag from the current cursor position.
-func! HtmlIndent_FindStartTag()
-  "{{{
-  " The cursor must be on or before a closing tag.
-  " If found, positions the cursor at the match and returns the line number.
-  " Otherwise returns 0.
-  let tagname = matchstr(getline('.')[col('.') - 1:], '</\zs\w\+\(-\w\+\)*\ze')
-  let start_lnum = searchpair('<' . tagname . '\>', '', '</' . tagname . '\>', 'bW')
-  if start_lnum > 0
-    return start_lnum
-  endif
-  return 0
-endfunc "}}}
-
-" Moves the cursor from a "<" to the matching ">".
-func! HtmlIndent_FindTagEnd()
-  "{{{
-  " Call this with the cursor on the "<" of a start tag.
-  " This will move the cursor to the ">" of the matching end tag or, when it's
-  " a self-closing tag, to the matching ">".
-  " Limited to look up to b:html_indent_line_limit lines away.
-  let text = getline('.')
-  let tagname = matchstr(text, '\w\+\(-\w\+\)*\|!--', col('.'))
-  if tagname == '!--'
-    call search('--\zs>')
-  elseif s:get_tag('/' . tagname) != 0
-    " tag with a closing tag, find matching "</tag>"
-    call searchpair('<' . tagname, '', '</' . tagname . '\zs>', 'W', '', line('.') + b:html_indent_line_limit)
-  else
-    " self-closing tag, find the ">"
-    call search('\S\zs>')
-  endif
-endfunc "}}}
-
-" Indenting inside a start tag. Return the correct indent or -1 if unknown.
-func! s:InsideTag(foundHtmlString)
-  "{{{
-  if a:foundHtmlString
-    " Inside an attribute string.
-    " Align with the previous line or use an external function.
-    let lnum = v:lnum - 1
-    if lnum > 1
-      if exists('b:html_indent_tag_string_func')
-        return b:html_indent_tag_string_func(lnum)
-      endif
-      return indent(lnum)
-    endif
-  endif
-
-  " Should be another attribute: " attr="val".  Align with the previous
-  " attribute start.
-  let lnum = v:lnum
-  while lnum > 1
-    let lnum -= 1
-    let text = getline(lnum)
-    " Find a match with one of these, align with "attr":
-    "       attr=
-    "  <tag attr=
-    "  text<tag attr=
-    "  <tag>text</tag>text<tag attr=
-    " For long lines search for the first match, finding the last match
-    " gets very slow.
-    if len(text) < 300
-      let idx = match(text, '.*\s\zs[_a-zA-Z0-9-]\+="')
-    else
-      let idx = match(text, '\s\zs[_a-zA-Z0-9-]\+="')
-    endif
-    if idx == -1
-      let idx = match(text, '<\w\+\(-\w\+\)*\s\zs\w')
-    endif
-    if idx == -1
-      let idx = match(text, '<\w\+\(-\w\+\)*')
-      if idx >= 0
-        let idx = idx + shiftwidth()
-      endif
-    endif
-    if idx > 0
-      " Found the attribute.  TODO: assumes spaces, no Tabs.
-      return idx
-    endif
-  endwhile
-  return -1
-endfunc "}}}
-
-" THE MAIN INDENT FUNCTION. Return the amount of indent for v:lnum.
-func! HtmlIndent()
-  "{{{
-  if prevnonblank(v:lnum - 1) < 1
-    " First non-blank line has no indent.
-    return 0
-  endif
-
-  let curtext = tolower(getline(v:lnum))
-  let indentunit = shiftwidth()
-
-  let b:hi_newstate = {}
-  let b:hi_newstate.lnum = v:lnum
-
-  " When syntax HL is enabled, detect we are inside a tag.  Indenting inside
-  " a tag works very differently. Do not do this when the line starts with
-  " "<", it gets the "htmlTag" ID but we are not inside a tag then.
-  if curtext !~ '^\s*<'
-    normal! ^
-    let stack = synstack(v:lnum, col('.'))  " assumes there are no tabs
-    let foundHtmlString = 0
-    for synid in reverse(stack)
-      let name = synIDattr(synid, "name")
-      if index(b:hi_insideStringNames, name) >= 0
-        let foundHtmlString = 1
-      elseif index(b:hi_insideTagNames, name) >= 0
-        " Yes, we are inside a tag.
-        let indent = s:InsideTag(foundHtmlString)
-        if indent >= 0
-          " Do not keep the state. TODO: could keep the block type.
-          let b:hi_indent.lnum = 0
-          return indent
-        endif
-      endif
-    endfor
-  endif
-
-  " does the line start with a closing tag?
-  let swendtag = match(curtext, '^\s*</') >= 0
-
-  if prevnonblank(v:lnum - 1) == b:hi_indent.lnum && b:hi_lasttick == b:changedtick - 1
-    " use state (continue from previous line)
-  else
-    " start over (know nothing)
-    let b:hi_indent = s:FreshState(v:lnum)
-  endif
-
-  if b:hi_indent.block >= 2
-    " within block
-    let endtag = s:endtags[b:hi_indent.block]
-    let blockend = stridx(curtext, endtag)
-    if blockend >= 0
-      " block ends here
-      let b:hi_newstate.block = 0
-      " calc indent for REST OF LINE (may start more blocks):
-      call s:CountTagsAndState(strpart(curtext, blockend + strlen(endtag)))
-      if swendtag && b:hi_indent.block != 5
-        let indent = b:hi_indent.blocktagind + s:curind * indentunit
-        let b:hi_newstate.baseindent = indent + s:nextrel * indentunit
-      else
-        let indent = s:Alien{b:hi_indent.block}()
-        let b:hi_newstate.baseindent = b:hi_indent.blocktagind + s:nextrel * indentunit
-      endif
-    else
-      " block continues
-      " indent this line with alien method
-      let indent = s:Alien{b:hi_indent.block}()
-    endif
-  else
-    " not within a block - within usual html
-    let b:hi_newstate.block = b:hi_indent.block
-    if swendtag
-      " The current line starts with an end tag, align with its start tag.
-      call cursor(v:lnum, 1)
-      let start_lnum = HtmlIndent_FindStartTag()
-      if start_lnum > 0
-        " check for the line starting with something inside a tag:
-        " <sometag               <- align here
-        "    attr=val><open>     not here
-        let text = getline(start_lnum)
-        let angle = matchstr(text, '[<>]')
-        if angle == '>'
-          call cursor(start_lnum, 1)
-          normal! f>%
-          let start_lnum = line('.')
-          let text = getline(start_lnum)
-        endif
-
-        let indent = indent(start_lnum)
-        if col('.') > 2
-          let swendtag = match(text, '^\s*</') >= 0
-          call s:CountITags(text[: col('.') - 2])
-          let indent += s:nextrel * shiftwidth()
-          if !swendtag
-            let indent += s:curind * shiftwidth()
-          endif
-        endif
-      else
-        " not sure what to do
-        let indent = b:hi_indent.baseindent
-      endif
-      let b:hi_newstate.baseindent = indent
-    else
-      call s:CountTagsAndState(curtext)
-      let indent = b:hi_indent.baseindent
-      let b:hi_newstate.baseindent = indent + (s:curind + s:nextrel) * indentunit
-    endif
-  endif
-
-  let b:hi_lasttick = b:changedtick
-  call extend(b:hi_indent, b:hi_newstate, "force")
-  return indent
-endfunc "}}}
-
-" Check user settings when loading this script the first time.
-call HtmlIndent_CheckUserSettings()
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: fdm=marker ts=8 sw=2 tw=78
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index 44d8f793d..4ed8dfc81 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -4,195 +4,11 @@ endif
 
 " Vim syntax file
 " Language:     HTML (version 5.1)
-"               SVG (SVG 1.1 Second Edition)
-"               MathML (MathML 3.0 Second Edition)
-" Last Change:  2017 Mar 07
+" Last Change:  2017 Feb 15
 " License:      Public domain
 "               (but let me know if you like :) )
 "
-" Note: This file just add new tags from HTML 5
-"       and don't replace default html.vim syntax file
-"
 " Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
-" Changes:      update to Draft 2016 Jan 13
-"               add microdata Attributes
-" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
-" URL:          http://rm.blog.br/vim/syntax/html.vim
-" Modified:     htdebeer <H.T.de.Beer@gmail.com>
-" Changes:      add common SVG elements and attributes for inline SVG
-
-" Patch 7.4.1142
-if has("patch-7.4-1142")
-  if has("win32")
-    syn iskeyword @,48-57,_,128-167,224-235,-
-  else
-    syn iskeyword @,48-57,_,192-255,-
-  endif
-endif
-
-" HTML 5 tags
-syn keyword htmlTagName contained article aside audio canvas command
-syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
-syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
-syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
-syn keyword htmlTagName contained template content shadow slot
-syn keyword htmlTagName contained wbr bdi
-syn keyword htmlTagName contained picture
-
-" SVG tags
-" http://www.w3.org/TR/SVG/
-" as found in http://www.w3.org/TR/SVG/eltindex.html
-syn keyword htmlTagName contained svg 
-syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
-syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
-syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
-syn keyword htmlTagName contained clipPath color-profile cursor 
-syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
-syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
-syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
-syn keyword htmlTagName contained glyph glyphRef hkern 
-syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
-syn keyword htmlTagName contained missing-glyph mpath 
-syn keyword htmlTagName contained text textPath tref tspan vkern
-syn keyword htmlTagName contained metadata title
-
-" MathML tags
-" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
-syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
-syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
-syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
-syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
-syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
-syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
-syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
-syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
-syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
-syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
-syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
-syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
-syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
-syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
-syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
-syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
-syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
-syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
-syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
-syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
-
-" Custom Element
-syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
-syn match htmlTagName contained "[.0-9_a-z]\@<=-[-.0-9_a-z]*\>"
-
-" HTML 5 arguments
-" Core Attributes
-syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
-syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
-" Event-handler Attributes
-syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
-syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
-syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
-syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
-syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
-syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
-syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
-syn keyword htmlArg contained onvolumechange onwaiting
-" XML Attributes
-syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
-" new features
-" <body>
-syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
-syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
-" <video>, <audio>, <source>, <track>
-syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
-" <form>, <input>, <button>
-syn keyword htmlArg contained form autocomplete autofocus list min max step
-syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
-syn keyword htmlArg contained required placeholder pattern
-" <command>, <details>, <time>
-syn keyword htmlArg contained label icon open datetime-local pubdate
-" <script>
-syn keyword htmlArg contained async
-" <content>
-syn keyword htmlArg contained select
-" <iframe>
-syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest allowpresentation
-" <picture>
-syn keyword htmlArg contained srcset sizes
-" <a>
-syn keyword htmlArg contained download media
-" <script>, <style>
-syn keyword htmlArg contained nonce
-" <area>, <a>, <img>, <iframe>, <link>
-syn keyword htmlArg contained referrerpolicy
-" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
-syn keyword htmlArg contained integrity crossorigin
-" <link>
-syn keyword htmlArg contained prefetch 
-" syn keyword htmlArg contained preload
-" <img>
-syn keyword htmlArg contained decoding
-" https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
-syn keyword htmlArg contained onselectstart onselectionchange
-" https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/loading
-syn keyword htmlArg contained loading
-
-" Custom Data Attributes
-" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
-syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
-
-" Vendor Extension Attributes
-" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
-syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
-
-" Microdata
-" http://dev.w3.org/html5/md/
-syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
-
-" SVG
-" http://www.w3.org/TR/SVG/
-" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
-syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
-syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
-syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
-syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
-syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
-syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
-syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
-syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
-syn keyword htmlArg contained id ideographic in in2 intercept 
-syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
-syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
-syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
-syn keyword htmlArg contained numOctaves 
-syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
-syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
-syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
-syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
-syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
-syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
-syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
-syn keyword htmlArg contained width widths 
-syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
-syn keyword htmlArg contained y y1 y2 yChannelSelector 
-syn keyword htmlArg contained z zoomAndPan 
-syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
-
-" MathML attributes
-" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
-syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
-syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
-syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
-syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
-syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
-syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
-syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
-syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
-syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
-syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
-syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
-syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
-syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
-syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
 
 " Comment
 " https://github.com/w3c/html/issues/694
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 511841e56..2c76d8546 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -1324,11 +1324,6 @@ if !has_key(g:polyglot_is_disabled, 'tilde')
   au BufNewFile,BufRead *.t.html setf tilde
 endif
 
-if !has_key(g:polyglot_is_disabled, 'html')
-  au! BufNewFile,BufRead,BufWritePost *.html call polyglot#detect#Html()
-  au BufNewFile,BufRead *.htm,*.html.hl,*.inc,*.xht,*.xhtml setf html
-endif
-
 if !has_key(g:polyglot_is_disabled, 'hollywood')
   au BufNewFile,BufRead *.hws setf hollywood
 endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index e134370d2..1912384cc 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -230,7 +230,6 @@ let s:globs = {
   \ 'hostconf': '',
   \ 'hostsaccess': '',
   \ 'hss': '*.hss',
-  \ 'html': '*.html,*.htm,*.html.hl,*.inc,*.xht,*.xhtml',
   \ 'html.handlebars': '*.handlebars,*.hbs,*.hdbs,*.hb',
   \ 'html.mustache': '*.mustache,*.hogan,*.hulk,*.hjs',
   \ 'html.twig': '*.twig',
diff --git a/ftplugin/html.vim b/ftplugin/html.vim
index 7664383b6..6c260baa9 100644
--- a/ftplugin/html.vim
+++ b/ftplugin/html.vim
@@ -1,55 +1,13 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'html', 'ftplugin/html.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'ftplugin/html.vim')
   finish
 endif
 
-" Vim filetype plugin file
-" Language:	html
-" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
-" Last Changed: 20 Jan 2009
-" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+" Maintainer:  	othree <othree@gmail.com>
+" URL:		      http://github.com/othree/html5.vim
+" Last Change:  2014-05-02
+" License:      MIT
+" Changes:      Add - to keyword
 
-if exists("b:did_ftplugin") | finish | endif
-let b:did_ftplugin = 1
+" setlocal iskeyword+=-
 
-" Make sure the continuation lines below do not cause problems in
-" compatibility mode.
-let s:save_cpo = &cpo
-set cpo-=C
-
-setlocal matchpairs+=<:>
 setlocal commentstring=<!--%s-->
-setlocal comments=s:<!--,m:\ \ \ \ ,e:-->
-
-if exists("g:ft_html_autocomment") && (g:ft_html_autocomment == 1)
-    setlocal formatoptions-=t formatoptions+=croql
-endif
-
-if exists('&omnifunc')
-  setlocal omnifunc=htmlcomplete#CompleteTags
-  call htmlcomplete#DetectOmniFlavor()
-endif
-
-" HTML:  thanks to Johannes Zellner and Benji Fisher.
-if exists("loaded_matchit")
-    let b:match_ignorecase = 1
-    let b:match_words = '<:>,' .
-    \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' .
-    \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' .
-    \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
-endif
-
-" Change the :browse e filter to primarily show HTML-related files.
-if has("gui_win32")
-    let  b:browsefilter="HTML Files (*.html,*.htm)\t*.htm;*.html\n" .
-		\	"JavaScript Files (*.js)\t*.js\n" .
-		\	"Cascading StyleSheets (*.css)\t*.css\n" .
-		\	"All Files (*.*)\t*.*\n"
-endif
-
-" Undo the stuff we changed.
-let b:undo_ftplugin = "setlocal commentstring< matchpairs< omnifunc< comments< formatoptions<" .
-    \	" | unlet! b:match_ignorecase b:match_skip b:match_words b:browsefilter"
-
-" Restore the saved compatibility options.
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/indent/html.vim b/indent/html.vim
index 96b32b62f..176e69c5e 100644
--- a/indent/html.vim
+++ b/indent/html.vim
@@ -1,12 +1,13 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'html', 'indent/html.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'indent/html.vim')
   finish
 endif
 
 " Vim indent script for HTML
+" Header: "{{{
 " Maintainer:	Bram Moolenaar
 " Original Author: Andy Wokula <anwoku@yahoo.de>
-" Last Change:	2021 Jan 26
-" Version:	1.0 "{{{
+" Last Change:	2017 Jun 13
+" Version:	1.0
 " Description:	HTML indent script with cached state for faster indenting on a
 "		range of lines.
 "		Supports template systems through hooks.
@@ -59,9 +60,6 @@ let s:cpo_save = &cpo
 set cpo-=C
 "}}}
 
-" Pattern to match the name of a tag, including custom elements.
-let s:tagname = '\w\+\(-\w\+\)*'
-
 " Check and process settings from b:html_indent and g:html_indent... variables.
 " Prefer using buffer-local settings over global settings, so that there can
 " be defaults for all HTML files and exceptions for specific types of HTML
@@ -220,27 +218,25 @@ endfunc "}}}
 " Self-closing tags and tags that are sometimes {{{
 " self-closing (e.g., <p>) are not here (when encountering </p> we can find
 " the matching <p>, but not the other way around).
-" Known self-closing tags: " 'p', 'img', 'source', 'area', 'keygen', 'track',
-" 'wbr'.
 " Old HTML tags:
 call s:AddITags(s:indent_tags, [
     \ 'a', 'abbr', 'acronym', 'address', 'b', 'bdo', 'big',
     \ 'blockquote', 'body', 'button', 'caption', 'center', 'cite', 'code',
-    \ 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt', 'em', 'fieldset', 'font',
+    \ 'colgroup', 'del', 'dfn', 'dir', 'div', 'dl', 'em', 'fieldset', 'font',
     \ 'form', 'frameset', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'html',
     \ 'i', 'iframe', 'ins', 'kbd', 'label', 'legend', 'li',
     \ 'map', 'menu', 'noframes', 'noscript', 'object', 'ol',
-    \ 'optgroup', 'q', 's', 'samp', 'select', 'small', 'span', 'strong', 'sub',
+    \ 'optgroup', 'p', 'q', 's', 'samp', 'select', 'small', 'span', 'strong', 'sub',
     \ 'sup', 'table', 'textarea', 'title', 'tt', 'u', 'ul', 'var', 'th', 'td',
     \ 'tr', 'tbody', 'tfoot', 'thead'])
 
 " New HTML5 elements:
 call s:AddITags(s:indent_tags, [
-    \ 'article', 'aside', 'audio', 'bdi', 'canvas', 'command', 'data',
-    \ 'datalist', 'details', 'dialog', 'embed', 'figcaption', 'figure',
-    \ 'footer', 'header', 'hgroup', 'main', 'mark', 'meter', 'nav', 'output',
-    \ 'picture', 'progress', 'rp', 'rt', 'ruby', 'section', 'summary',
-    \ 'svg', 'time', 'video'])
+    \ 'area', 'article', 'aside', 'audio', 'bdi', 'canvas',
+    \ 'command', 'data', 'datalist', 'details', 'dislog', 'embed', 'figcaption',
+    \ 'figure', 'footer', 'header', 'keygen', 'main', 'mark', 'meter', 'nav', 'output',
+    \ 'picture', 'progress', 'rp', 'rt', 'ruby', 'section', 'source', 'summary', 'svg', 
+    \ 'time', 'track', 'video', 'wbr'])
 
 " Tags added for web components:
 call s:AddITags(s:indent_tags, [
@@ -288,7 +284,7 @@ func! s:CountITags(text)
   let s:nextrel = 0  " relative indent steps for next line [unit &sw]:
   let s:block = 0		" assume starting outside of a block
   let s:countonly = 1	" don't change state
-  call substitute(a:text, '<\zs/\=' . s:tagname . '\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
+  call substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
   let s:countonly = 0
 endfunc "}}}
 
@@ -300,7 +296,7 @@ func! s:CountTagsAndState(text)
   let s:nextrel = 0  " relative indent steps for next line [unit &sw]:
 
   let s:block = b:hi_newstate.block
-  let tmp = substitute(a:text, '<\zs/\=' . s:tagname . '\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
+  let tmp = substitute(a:text, '<\zs/\=\w\+\(-\w\+\)*\>\|<!--\[\|\[endif\]-->\|<!--\|-->', '\=s:CheckTag(submatch(0))', 'g')
   if s:block == 3
     let b:hi_newstate.scripttype = s:GetScriptType(matchstr(tmp, '\C.*<SCRIPT\>\zs[^>]*'))
   endif
@@ -538,7 +534,7 @@ func! s:FreshState(lnum)
   let swendtag = match(text, '^\s*</') >= 0
 
   " If previous line ended in a closing tag, line up with the opening tag.
-  if !swendtag && text =~ '</' . s:tagname . '\s*>\s*$'
+  if !swendtag && text =~ '</\w\+\s*>\s*$'
     call cursor(state.lnum, 99999)
     normal! F<
     let start_lnum = HtmlIndent_FindStartTag()
@@ -590,7 +586,7 @@ func! s:Alien3()
     return eval(b:hi_js1indent)
   endif
   if b:hi_indent.scripttype == "javascript"
-    return eval(b:hi_js1indent) + GetJavascriptIndent()
+    return GetJavascriptIndent()
   else
     return -1
   endif
@@ -629,7 +625,7 @@ func! s:CSSIndent()
     return eval(b:hi_css1indent)
   endif
 
-  " If the current line starts with "}" align with its match.
+  " If the current line starts with "}" align with it's match.
   if curtext =~ '^\s*}'
     call cursor(v:lnum, 1)
     try
@@ -667,7 +663,7 @@ func! s:CSSIndent()
     else
       let cur_hasfield = curtext =~ '^\s*[a-zA-Z0-9-]\+:'
       let prev_unfinished = s:CssUnfinished(prev_text)
-      if prev_unfinished
+      if !cur_hasfield && (prev_hasfield || prev_unfinished)
         " Continuation line has extra indent if the previous line was not a
         " continuation line.
         let extra = shiftwidth()
@@ -720,13 +716,9 @@ func! s:CSSIndent()
 endfunc "}}}
 
 " Inside <style>: Whether a line is unfinished.
-" 	tag:
-" 	tag: blah
-" 	tag: blah &&
-" 	tag: blah ||
 func! s:CssUnfinished(text)
   "{{{
-  return a:text =~ '\(||\|&&\|:\|\k\)\s*$'
+  return a:text =~ '\s\(||\|&&\|:\)\s*$'
 endfunc "}}}
 
 " Search back for the first unfinished line above "lnum".
@@ -819,7 +811,7 @@ func! s:Alien5()
   let idx = match(prevtext, '^\s*\zs<!--')
   if idx >= 0
     " just below comment start, add a shiftwidth
-    return indent(prevlnum) + shiftwidth()
+    return idx + shiftwidth()
   endif
 
   " Some files add 4 spaces just below a TODO line.  It's difficult to detect
@@ -853,12 +845,11 @@ func! HtmlIndent_FindTagStart(lnum)
   " - a flag indicating whether we found the end of a tag.
   " This method is global so that HTML-like indenters can use it.
   " To avoid matching " > " or " < " inside a string require that the opening
-  " "<" is followed by a word character and the closing ">" comes after a
-  " non-white character.
+  " "<" is followed by a word character
   let idx = match(getline(a:lnum), '\S>\s*$')
   if idx > 0
     call cursor(a:lnum, idx)
-    let lnum = searchpair('<\w', '' , '\S>', 'bW', '', max([a:lnum - b:html_indent_line_limit, 0]))
+    let lnum = searchpair('<\w', '' , '>', 'bW', '', max([a:lnum - b:html_indent_line_limit, 0]))
     if lnum > 0
       return [lnum, 1]
     endif
@@ -872,7 +863,7 @@ func! HtmlIndent_FindStartTag()
   " The cursor must be on or before a closing tag.
   " If found, positions the cursor at the match and returns the line number.
   " Otherwise returns 0.
-  let tagname = matchstr(getline('.')[col('.') - 1:], '</\zs' . s:tagname . '\ze')
+  let tagname = matchstr(getline('.')[col('.') - 1:], '</\zs\w\+\(-\w\+\)*\ze')
   let start_lnum = searchpair('<' . tagname . '\>', '', '</' . tagname . '\>', 'bW')
   if start_lnum > 0
     return start_lnum
@@ -888,7 +879,7 @@ func! HtmlIndent_FindTagEnd()
   " a self-closing tag, to the matching ">".
   " Limited to look up to b:html_indent_line_limit lines away.
   let text = getline('.')
-  let tagname = matchstr(text, s:tagname . '\|!--', col('.'))
+  let tagname = matchstr(text, '\w\+\(-\w\+\)*\|!--', col('.'))
   if tagname == '!--'
     call search('--\zs>')
   elseif s:get_tag('/' . tagname) != 0
@@ -905,19 +896,12 @@ func! s:InsideTag(foundHtmlString)
   "{{{
   if a:foundHtmlString
     " Inside an attribute string.
-    " Align with the opening quote or use an external function.
+    " Align with the previous line or use an external function.
     let lnum = v:lnum - 1
     if lnum > 1
       if exists('b:html_indent_tag_string_func')
         return b:html_indent_tag_string_func(lnum)
       endif
-      " If there is a double quote in the previous line, indent with the
-      " character after it.
-      if getline(lnum) =~ '"'
-	call cursor(lnum, 0)
-	normal f"
-	return virtcol('.')
-      endif
       return indent(lnum)
     endif
   endif
@@ -941,21 +925,17 @@ func! s:InsideTag(foundHtmlString)
       let idx = match(text, '\s\zs[_a-zA-Z0-9-]\+="')
     endif
     if idx == -1
-      " try <tag attr
-      let idx = match(text, '<' . s:tagname . '\s\+\zs\w')
+      let idx = match(text, '<\w\+\(-\w\+\)*\s\zs\w')
     endif
     if idx == -1
-      " after just "<tag" indent two levels more
-      let idx = match(text, '<' . s:tagname . '$')
+      let idx = match(text, '<\w\+\(-\w\+\)*')
       if idx >= 0
-	call cursor(lnum, idx + 1)
-	return virtcol('.') - 1 + shiftwidth() * 2
+        let idx = idx + shiftwidth()
       endif
     endif
     if idx > 0
-      " Found the attribute to align with.
-      call cursor(lnum, idx)
-      return virtcol('.')
+      " Found the attribute.  TODO: assumes spaces, no Tabs.
+      return idx
     endif
   endwhile
   return -1
diff --git a/packages.yaml b/packages.yaml
index 442582614..25ee0e6f1 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5518,16 +5518,8 @@ glob: "**/autodoc.vim"
 # Needed by c, cmod, and pike
 filetypes: []
 ---
-name: html
-remote: vim/vim:runtime
-glob: "**/html.vim"
-filetypes:
-- name: html
-  linguist: HTML
----
-# TODO: change after https://github.com/othree/html5.vim/pull/106 is merged
 name: html5
-remote: sheerun/html5.vim
+remote: othree/html5.vim
 dependencies: html
 filetypes: []
 ---
diff --git a/syntax/html.vim b/syntax/html.vim
index 2db2fe2dc..46ed2b53a 100644
--- a/syntax/html.vim
+++ b/syntax/html.vim
@@ -1,336 +1,196 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'html', 'syntax/html.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'syntax/html.vim')
   finish
 endif
 
 " Vim syntax file
-" Language:             HTML
-" Previous Maintainer:  Jorge Maldonado Ventura <jorgesumle@freakspot.net>
-" Previous Maintainer:  Claudio Fleiner <claudio@fleiner.com>
-" Repository:           https://notabug.org/jorgesumle/vim-html-syntax
-" Last Change:          2021 Mar 02
-"			Included patch #7900 to fix comments
-"			Included patch #7916 to fix a few more things
+" Language:     HTML (version 5.1)
+"               SVG (SVG 1.1 Second Edition)
+"               MathML (MathML 3.0 Second Edition)
+" Last Change:  2017 Mar 07
+" License:      Public domain
+"               (but let me know if you like :) )
 "
-
-" Please check :help html.vim for some comments and a description of the options
-
-" quit when a syntax file was already loaded
-if !exists("main_syntax")
-  if exists("b:current_syntax")
-    finish
-  endif
-  let main_syntax = 'html'
-endif
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-syntax spell toplevel
-
-syn case ignore
-
-" mark illegal characters
-syn match htmlError "[<>&]"
-
-
-" tags
-syn region  htmlString   contained start=+"+ end=+"+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc
-syn region  htmlString   contained start=+'+ end=+'+ contains=htmlSpecialChar,javaScriptExpression,@htmlPreproc
-syn match   htmlValue    contained "=[\t ]*[^'" \t>][^ \t>]*"hs=s+1   contains=javaScriptExpression,@htmlPreproc
-syn region  htmlEndTag             start=+</+      end=+>+ contains=htmlTagN,htmlTagError
-syn region  htmlTag                start=+<[^/]+   end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster
-syn match   htmlTagN     contained +<\s*[-a-zA-Z0-9]\++hs=s+1 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
-syn match   htmlTagN     contained +</\s*[-a-zA-Z0-9]\++hs=s+2 contains=htmlTagName,htmlSpecialTagName,@htmlTagNameCluster
-syn match   htmlTagError contained "[^>]<"ms=s+1
-
-
-" tag names
-syn keyword htmlTagName contained address applet area a base basefont
-syn keyword htmlTagName contained big blockquote br caption center
-syn keyword htmlTagName contained cite code dd dfn dir div dl dt font
-syn keyword htmlTagName contained form hr html img
-syn keyword htmlTagName contained input isindex kbd li link map menu
-syn keyword htmlTagName contained meta ol option param pre p samp span
-syn keyword htmlTagName contained select small sub sup
-syn keyword htmlTagName contained table td textarea th tr tt ul var xmp
-syn match htmlTagName contained "\<\(b\|i\|u\|h[1-6]\|em\|strong\|head\|body\|title\)\>"
-
-" new html 4.0 tags
-syn keyword htmlTagName contained abbr acronym bdo button col label
-syn keyword htmlTagName contained colgroup fieldset iframe ins legend
-syn keyword htmlTagName contained object optgroup q s tbody tfoot thead
-
-" new html 5 tags
-syn keyword htmlTagName contained article aside audio bdi canvas data
-syn keyword htmlTagName contained datalist details dialog embed figcaption
-syn keyword htmlTagName contained figure footer header hgroup keygen main
-syn keyword htmlTagName contained mark menuitem meter nav output picture
-syn keyword htmlTagName contained progress rb rp rt rtc ruby section
-syn keyword htmlTagName contained slot source summary template time track
-syn keyword htmlTagName contained video wbr
-
-" legal arg names
-syn keyword htmlArg contained action
-syn keyword htmlArg contained align alink alt archive background bgcolor
-syn keyword htmlArg contained border bordercolor cellpadding
-syn keyword htmlArg contained cellspacing checked class clear code codebase color
-syn keyword htmlArg contained cols colspan content coords enctype face
-syn keyword htmlArg contained gutter height hspace id
-syn keyword htmlArg contained link lowsrc marginheight
-syn keyword htmlArg contained marginwidth maxlength method name prompt
-syn keyword htmlArg contained rel rev rows rowspan scrolling selected shape
-syn keyword htmlArg contained size src start target text type url
-syn keyword htmlArg contained usemap ismap valign value vlink vspace width wrap
-syn match   htmlArg contained "\<\(http-equiv\|href\|title\)="me=e-1
-
-" aria attributes
-exe 'syn match htmlArg contained "\<aria-\%(' . join([
-    \ 'activedescendant', 'atomic', 'autocomplete', 'busy', 'checked', 'colcount',
-    \ 'colindex', 'colspan', 'controls', 'current', 'describedby', 'details',
-    \ 'disabled', 'dropeffect', 'errormessage', 'expanded', 'flowto', 'grabbed',
-    \ 'haspopup', 'hidden', 'invalid', 'keyshortcuts', 'label', 'labelledby', 'level',
-    \ 'live', 'modal', 'multiline', 'multiselectable', 'orientation', 'owns',
-    \ 'placeholder', 'posinset', 'pressed', 'readonly', 'relevant', 'required',
-    \ 'roledescription', 'rowcount', 'rowindex', 'rowspan', 'selected', 'setsize',
-    \ 'sort', 'valuemax', 'valuemin', 'valuenow', 'valuetext'
-    \ ], '\|') . '\)\>"'
-syn keyword htmlArg contained role
-
-" Netscape extensions
-syn keyword htmlTagName contained frame noframes frameset nobr blink
-syn keyword htmlTagName contained layer ilayer nolayer spacer
-syn keyword htmlArg     contained frameborder noresize pagex pagey above below
-syn keyword htmlArg     contained left top visibility clip id noshade
-syn match   htmlArg     contained "\<z-index\>"
-
-" Microsoft extensions
-syn keyword htmlTagName contained marquee
-
-" html 4.0 arg names
-syn match   htmlArg contained "\<\(accept-charset\|label\)\>"
-syn keyword htmlArg contained abbr accept accesskey axis char charoff charset
-syn keyword htmlArg contained cite classid codetype compact data datetime
-syn keyword htmlArg contained declare defer dir disabled for frame
-syn keyword htmlArg contained headers hreflang lang language longdesc
-syn keyword htmlArg contained multiple nohref nowrap object profile readonly
-syn keyword htmlArg contained rules scheme scope span standby style
-syn keyword htmlArg contained summary tabindex valuetype version
-
-" html 5 arg names
-syn keyword htmlArg contained allowfullscreen async autocomplete autofocus
-syn keyword htmlArg contained autoplay challenge contenteditable contextmenu
-syn keyword htmlArg contained controls crossorigin default dirname download
-syn keyword htmlArg contained draggable dropzone form formaction formenctype
-syn keyword htmlArg contained formmethod formnovalidate formtarget hidden
-syn keyword htmlArg contained high icon inputmode keytype kind list loop low
-syn keyword htmlArg contained max min minlength muted nonce novalidate open
-syn keyword htmlArg contained optimum pattern placeholder poster preload
-syn keyword htmlArg contained radiogroup required reversed sandbox spellcheck
-syn keyword htmlArg contained sizes srcset srcdoc srclang step title translate
-syn keyword htmlArg contained typemustmatch
-
-" special characters
-syn match htmlSpecialChar "&#\=[0-9A-Za-z]\{1,8};"
-
-" Comments (the real ones or the old netscape ones)
-if exists("html_wrong_comments")
-  syn region htmlComment        start=+<!--+    end=+--\s*>+    contains=@Spell
-else
-  " The HTML 5.2 syntax 8.2.4.41: bogus comment is parser error; browser skips until next &gt
-  syn region htmlComment        start=+<!+      end=+>+         contains=htmlCommentError keepend
-  " Idem 8.2.4.42,51: Comment starts with <!-- and ends with -->
-  " Idem 8.2.4.43,44: Except <!--> and <!---> are parser errors
-  " Idem 8.2.4.52: dash-dash-bang (--!>) is error ignored by parser, also closes comment
-  syn region htmlComment matchgroup=htmlComment start=+<!--\%(-\?>\)\@!+        end=+--!\?>+    contains=htmlCommentNested,@htmlPreProc,@Spell keepend
-  " Idem 8.2.4.49: nested comment is parser error, except <!--> is all right
-  syn match htmlCommentNested contained "<!-->\@!"
-  syn match htmlCommentError  contained "[^><!]"
-endif
-syn region htmlComment  start=+<!DOCTYPE+       end=+>+ keepend
-
-" server-parsed commands
-syn region htmlPreProc start=+<!--#+ end=+-->+ contains=htmlPreStmt,htmlPreError,htmlPreAttr
-syn match htmlPreStmt contained "<!--#\(config\|echo\|exec\|fsize\|flastmod\|include\|printenv\|set\|if\|elif\|else\|endif\|geoguide\)\>"
-syn match htmlPreError contained "<!--#\S*"ms=s+4
-syn match htmlPreAttr contained "\w\+=[^"]\S\+" contains=htmlPreProcAttrError,htmlPreProcAttrName
-syn region htmlPreAttr contained start=+\w\+="+ skip=+\\\\\|\\"+ end=+"+ contains=htmlPreProcAttrName keepend
-syn match htmlPreProcAttrError contained "\w\+="he=e-1
-syn match htmlPreProcAttrName contained "\(expr\|errmsg\|sizefmt\|timefmt\|var\|cgi\|cmd\|file\|virtual\|value\)="he=e-1
-
-if !exists("html_no_rendering")
-  " rendering
-  syn cluster htmlTop contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLink,javaScript,@htmlPreproc
-
-  syn region htmlStrike start="<del\>" end="</del\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlStrike start="<strike\>" end="</strike\_s*>"me=s-1 contains=@htmlTop
-
-  syn region htmlBold start="<b\>" end="</b\_s*>"me=s-1 contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic
-  syn region htmlBold start="<strong\>" end="</strong\_s*>"me=s-1 contains=@htmlTop,htmlBoldUnderline,htmlBoldItalic
-  syn region htmlBoldUnderline contained start="<u\>" end="</u\_s*>"me=s-1 contains=@htmlTop,htmlBoldUnderlineItalic
-  syn region htmlBoldItalic contained start="<i\>" end="</i\_s*>"me=s-1 contains=@htmlTop,htmlBoldItalicUnderline
-  syn region htmlBoldItalic contained start="<em\>" end="</em\_s*>"me=s-1 contains=@htmlTop,htmlBoldItalicUnderline
-  syn region htmlBoldUnderlineItalic contained start="<i\>" end="</i\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlBoldUnderlineItalic contained start="<em\>" end="</em\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlBoldItalicUnderline contained start="<u\>" end="</u\_s*>"me=s-1 contains=@htmlTop,htmlBoldUnderlineItalic
-
-  syn region htmlUnderline start="<u\>" end="</u\_s*>"me=s-1 contains=@htmlTop,htmlUnderlineBold,htmlUnderlineItalic
-  syn region htmlUnderlineBold contained start="<b\>" end="</b\_s*>"me=s-1 contains=@htmlTop,htmlUnderlineBoldItalic
-  syn region htmlUnderlineBold contained start="<strong\>" end="</strong\_s*>"me=s-1 contains=@htmlTop,htmlUnderlineBoldItalic
-  syn region htmlUnderlineItalic contained start="<i\>" end="</i\_s*>"me=s-1 contains=@htmlTop,htmlUnderlineItalicBold
-  syn region htmlUnderlineItalic contained start="<em\>" end="</em\_s*>"me=s-1 contains=@htmlTop,htmlUnderlineItalicBold
-  syn region htmlUnderlineItalicBold contained start="<b\>" end="</b\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlUnderlineItalicBold contained start="<strong\>" end="</strong\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlUnderlineBoldItalic contained start="<i\>" end="</i\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlUnderlineBoldItalic contained start="<em\>" end="</em\_s*>"me=s-1 contains=@htmlTop
-
-  syn region htmlItalic start="<i\>" end="</i\_s*>"me=s-1 contains=@htmlTop,htmlItalicBold,htmlItalicUnderline
-  syn region htmlItalic start="<em\>" end="</em\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlItalicBold contained start="<b\>" end="</b\_s*>"me=s-1 contains=@htmlTop,htmlItalicBoldUnderline
-  syn region htmlItalicBold contained start="<strong\>" end="</strong\_s*>"me=s-1 contains=@htmlTop,htmlItalicBoldUnderline
-  syn region htmlItalicBoldUnderline contained start="<u\>" end="</u\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlItalicUnderline contained start="<u\>" end="</u\_s*>"me=s-1 contains=@htmlTop,htmlItalicUnderlineBold
-  syn region htmlItalicUnderlineBold contained start="<b\>" end="</b\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlItalicUnderlineBold contained start="<strong\>" end="</strong\_s*>"me=s-1 contains=@htmlTop
-
-  syn match htmlLeadingSpace "^\s\+" contained
-  syn region htmlLink start="<a\>\_[^>]*\<href\>" end="</a\_s*>"me=s-1 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLeadingSpace,javaScript,@htmlPreproc
-  syn region htmlH1 start="<h1\>" end="</h1\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlH2 start="<h2\>" end="</h2\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlH3 start="<h3\>" end="</h3\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlH4 start="<h4\>" end="</h4\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlH5 start="<h5\>" end="</h5\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlH6 start="<h6\>" end="</h6\_s*>"me=s-1 contains=@htmlTop
-  syn region htmlHead start="<head\>" end="</head\_s*>"me=s-1 end="<body\>"me=s-1 end="<h[1-6]\>"me=s-1 contains=htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,htmlLink,htmlTitle,javaScript,cssStyle,@htmlPreproc
-  syn region htmlTitle start="<title\>" end="</title\_s*>"me=s-1 contains=htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,javaScript,@htmlPreproc
-endif
-
-syn keyword htmlTagName         contained noscript
-syn keyword htmlSpecialTagName  contained script style
-if main_syntax != 'java' || exists("java_javascript")
-  " JAVA SCRIPT
-  syn include @htmlJavaScript syntax/javascript.vim
-  unlet b:current_syntax
-  syn region  javaScript start=+<script\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
-  syn region  htmlScriptTag     contained start=+<script+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
-  hi def link htmlScriptTag htmlTag
-
-  " html events (i.e. arguments that include javascript commands)
-  if exists("html_extended_events")
-    syn region htmlEvent        contained start=+\<on\a\+\s*=[\t ]*'+ end=+'+ contains=htmlEventSQ
-    syn region htmlEvent        contained start=+\<on\a\+\s*=[\t ]*"+ end=+"+ contains=htmlEventDQ
+" Note: This file just add new tags from HTML 5
+"       and don't replace default html.vim syntax file
+"
+" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
+" Changes:      update to Draft 2016 Jan 13
+"               add microdata Attributes
+" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
+" URL:          http://rm.blog.br/vim/syntax/html.vim
+" Modified:     htdebeer <H.T.de.Beer@gmail.com>
+" Changes:      add common SVG elements and attributes for inline SVG
+
+" Patch 7.4.1142
+if has("patch-7.4-1142")
+  if has("win32")
+    syn iskeyword @,48-57,_,128-167,224-235,-
   else
-    syn region htmlEvent        contained start=+\<on\a\+\s*=[\t ]*'+ end=+'+ keepend contains=htmlEventSQ
-    syn region htmlEvent        contained start=+\<on\a\+\s*=[\t ]*"+ end=+"+ keepend contains=htmlEventDQ
+    syn iskeyword @,48-57,_,192-255,-
   endif
-  syn region htmlEventSQ        contained start=+'+ms=s+1 end=+'+me=s-1 contains=@htmlJavaScript
-  syn region htmlEventDQ        contained start=+"+ms=s+1 end=+"+me=s-1 contains=@htmlJavaScript
-  hi def link htmlEventSQ htmlEvent
-  hi def link htmlEventDQ htmlEvent
-
-  " a javascript expression is used as an arg value
-  syn region  javaScriptExpression contained start=+&{+ keepend end=+};+ contains=@htmlJavaScript,@htmlPreproc
 endif
 
-if main_syntax != 'java' || exists("java_vb")
-  " VB SCRIPT
-  syn include @htmlVbScript syntax/vb.vim
-  unlet b:current_syntax
-  syn region  javaScript start=+<script \_[^>]*language *=\_[^>]*vbscript\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlVbScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
-endif
-
-syn cluster htmlJavaScript      add=@htmlPreproc
-
-if main_syntax != 'java' || exists("java_css")
-  " embedded style sheets
-  syn keyword htmlArg           contained media
-  syn include @htmlCss syntax/css.vim
-  unlet b:current_syntax
-  syn region cssStyle start=+<style+ keepend end=+</style>+ contains=@htmlCss,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc
-  syn match htmlCssStyleComment contained "\(<!--\|-->\)"
-  syn region htmlCssDefinition matchgroup=htmlArg start='style="' keepend matchgroup=htmlString end='"' contains=css.*Attr,css.*Prop,cssComment,cssLength,cssColor,cssURL,cssImportant,cssError,cssString,@htmlPreproc
-  hi def link htmlStyleArg htmlString
-endif
-
-if main_syntax == "html"
-  " synchronizing (does not always work if a comment includes legal
-  " html tags, but doing it right would mean to always start
-  " at the first line, which is too slow)
-  syn sync match htmlHighlight groupthere NONE "<[/a-zA-Z]"
-  syn sync match htmlHighlight groupthere javaScript "<script"
-  syn sync match htmlHighlightSkip "^.*['\"].*$"
-  syn sync minlines=10
-endif
-
-" The default highlighting.
-hi def link htmlTag                     Function
-hi def link htmlEndTag                  Identifier
-hi def link htmlArg                     Type
-hi def link htmlTagName                 htmlStatement
-hi def link htmlSpecialTagName          Exception
-hi def link htmlValue                   String
-hi def link htmlSpecialChar             Special
-
-if !exists("html_no_rendering")
-  hi def link htmlH1                      Title
-  hi def link htmlH2                      htmlH1
-  hi def link htmlH3                      htmlH2
-  hi def link htmlH4                      htmlH3
-  hi def link htmlH5                      htmlH4
-  hi def link htmlH6                      htmlH5
-  hi def link htmlHead                    PreProc
-  hi def link htmlTitle                   Title
-  hi def link htmlBoldItalicUnderline     htmlBoldUnderlineItalic
-  hi def link htmlUnderlineBold           htmlBoldUnderline
-  hi def link htmlUnderlineItalicBold     htmlBoldUnderlineItalic
-  hi def link htmlUnderlineBoldItalic     htmlBoldUnderlineItalic
-  hi def link htmlItalicUnderline         htmlUnderlineItalic
-  hi def link htmlItalicBold              htmlBoldItalic
-  hi def link htmlItalicBoldUnderline     htmlBoldUnderlineItalic
-  hi def link htmlItalicUnderlineBold     htmlBoldUnderlineItalic
-  hi def link htmlLink                    Underlined
-  hi def link htmlLeadingSpace            None
-  if !exists("html_my_rendering")
-    hi def htmlBold                term=bold cterm=bold gui=bold
-    hi def htmlBoldUnderline       term=bold,underline cterm=bold,underline gui=bold,underline
-    hi def htmlBoldItalic          term=bold,italic cterm=bold,italic gui=bold,italic
-    hi def htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,italic,underline gui=bold,italic,underline
-    hi def htmlUnderline           term=underline cterm=underline gui=underline
-    hi def htmlUnderlineItalic     term=italic,underline cterm=italic,underline gui=italic,underline
-    hi def htmlItalic              term=italic cterm=italic gui=italic
-    if v:version > 800 || v:version == 800 && has("patch1038")
-        hi def htmlStrike              term=strikethrough cterm=strikethrough gui=strikethrough
-    else
-        hi def htmlStrike              term=underline cterm=underline gui=underline
-    endif
-  endif
-endif
-
-hi def link htmlPreStmt            PreProc
-hi def link htmlPreError           Error
-hi def link htmlPreProc            PreProc
-hi def link htmlPreAttr            String
-hi def link htmlPreProcAttrName    PreProc
-hi def link htmlPreProcAttrError   Error
-hi def link htmlString             String
-hi def link htmlStatement          Statement
-hi def link htmlComment            Comment
-hi def link htmlCommentNested      htmlError
-hi def link htmlCommentError       htmlError
-hi def link htmlTagError           htmlError
-hi def link htmlEvent              javaScript
-hi def link htmlError              Error
-
-hi def link javaScript             Special
-hi def link javaScriptExpression   javaScript
-hi def link htmlCssStyleComment    Comment
-hi def link htmlCssDefinition      Special
-
-let b:current_syntax = "html"
-
-if main_syntax == 'html'
-  unlet main_syntax
-endif
+" HTML 5 tags
+syn keyword htmlTagName contained article aside audio canvas command
+syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
+syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
+syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
+syn keyword htmlTagName contained template content shadow slot
+syn keyword htmlTagName contained wbr bdi
+syn keyword htmlTagName contained picture
+
+" SVG tags
+" http://www.w3.org/TR/SVG/
+" as found in http://www.w3.org/TR/SVG/eltindex.html
+syn keyword htmlTagName contained svg 
+syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
+syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
+syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
+syn keyword htmlTagName contained clipPath color-profile cursor 
+syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
+syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
+syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
+syn keyword htmlTagName contained glyph glyphRef hkern 
+syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
+syn keyword htmlTagName contained missing-glyph mpath 
+syn keyword htmlTagName contained text textPath tref tspan vkern
+syn keyword htmlTagName contained metadata title
+
+" MathML tags
+" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
+syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
+syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
+syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
+syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
+syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
+syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
+syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
+syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
+syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
+syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
+syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
+syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
+syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
+syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
+syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
+syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
+syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
+syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
+syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
+syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
+
+" Custom Element
+syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
+syn match htmlTagName contained "[.0-9_a-z]\@<=-[-.0-9_a-z]*\>"
+
+" HTML 5 arguments
+" Core Attributes
+syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
+syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
+" Event-handler Attributes
+syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
+syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
+syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
+syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
+syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
+syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
+syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
+syn keyword htmlArg contained onvolumechange onwaiting
+" XML Attributes
+syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
+" new features
+" <body>
+syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
+syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
+" <video>, <audio>, <source>, <track>
+syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
+" <form>, <input>, <button>
+syn keyword htmlArg contained form autocomplete autofocus list min max step
+syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
+syn keyword htmlArg contained required placeholder pattern
+" <command>, <details>, <time>
+syn keyword htmlArg contained label icon open datetime-local pubdate
+" <script>
+syn keyword htmlArg contained async
+" <content>
+syn keyword htmlArg contained select
+" <iframe>
+syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest allowpresentation
+" <picture>
+syn keyword htmlArg contained srcset sizes
+" <a>
+syn keyword htmlArg contained download media
+" <script>, <style>
+syn keyword htmlArg contained nonce
+" <area>, <a>, <img>, <iframe>, <link>
+syn keyword htmlArg contained referrerpolicy
+" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
+syn keyword htmlArg contained integrity crossorigin
+" <link>
+syn keyword htmlArg contained prefetch 
+" syn keyword htmlArg contained preload
+" <img>
+syn keyword htmlArg contained decoding
+" https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
+syn keyword htmlArg contained onselectstart onselectionchange
+" https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/loading
+syn keyword htmlArg contained loading
+
+" Custom Data Attributes
+" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
+syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Vendor Extension Attributes
+" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
+syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Microdata
+" http://dev.w3.org/html5/md/
+syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
+
+" SVG
+" http://www.w3.org/TR/SVG/
+" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
+syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
+syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
+syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
+syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
+syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
+syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
+syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
+syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
+syn keyword htmlArg contained id ideographic in in2 intercept 
+syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
+syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
+syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
+syn keyword htmlArg contained numOctaves 
+syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
+syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
+syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
+syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
+syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
+syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
+syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
+syn keyword htmlArg contained width widths 
+syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
+syn keyword htmlArg contained y y1 y2 yChannelSelector 
+syn keyword htmlArg contained z zoomAndPan 
+syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
+
+" MathML attributes
+" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
+syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
+syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
+syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
+syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
+syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
+syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
+syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
+syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
+syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
+syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
+syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
+syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
+syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
+syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
 
-let &cpo = s:cpo_save
-unlet s:cpo_save
-" vim: ts=8
diff --git a/after/syntax/html/aria.vim b/syntax/html/aria.vim
similarity index 97%
rename from after/syntax/html/aria.vim
rename to syntax/html/aria.vim
index 6444f63f8..68793b23e 100644
--- a/after/syntax/html/aria.vim
+++ b/syntax/html/aria.vim
@@ -1,4 +1,4 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/html/aria.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'syntax/html/aria.vim')
   finish
 endif
 
diff --git a/after/syntax/html/electron.vim b/syntax/html/electron.vim
similarity index 86%
rename from after/syntax/html/electron.vim
rename to syntax/html/electron.vim
index 7ad41cfcd..6e4deebff 100644
--- a/after/syntax/html/electron.vim
+++ b/syntax/html/electron.vim
@@ -1,4 +1,4 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/html/electron.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'syntax/html/electron.vim')
   finish
 endif
 
diff --git a/after/syntax/html/rdfa.vim b/syntax/html/rdfa.vim
similarity index 82%
rename from after/syntax/html/rdfa.vim
rename to syntax/html/rdfa.vim
index 6138f6372..2367cbb03 100644
--- a/after/syntax/html/rdfa.vim
+++ b/syntax/html/rdfa.vim
@@ -1,4 +1,4 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/html/rdfa.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'syntax/html/rdfa.vim')
   finish
 endif
 
diff --git a/after/syntax/javascript/html5.vim b/syntax/javascript/html5.vim
similarity index 96%
rename from after/syntax/javascript/html5.vim
rename to syntax/javascript/html5.vim
index 117b4fed3..e28daf563 100644
--- a/after/syntax/javascript/html5.vim
+++ b/syntax/javascript/html5.vim
@@ -1,4 +1,4 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/javascript/html5.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'syntax/javascript/html5.vim')
   finish
 endif
 
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index df83137c9..39b280e6a 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -369,7 +369,6 @@ call TestFiletype('hastepreproc')
 call TestFiletype('hercules')
 call TestFiletype('hex')
 call TestFiletype('hollywood')
-call TestFiletype('html')
 call TestFiletype('tilde')
 call TestFiletype('htmlm4')
 call TestFiletype('template')

From 7c474e5c9218d870dabba00745220dff5aa671b2 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 17:00:24 +0200
Subject: [PATCH 258/299] Add OpenSCAD support, closes #702

---
 README.md                    |  3 +-
 autoload/polyglot/init.vim   |  4 ++
 autoload/polyglot/sleuth.vim |  1 +
 ftplugin/openscad.vim        | 18 +++++++
 packages.yaml                |  8 ++++
 syntax/openscad.vim          | 93 ++++++++++++++++++++++++++++++++++++
 tests/filetypes.vim          |  1 +
 7 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 ftplugin/openscad.vim
 create mode 100644 syntax/openscad.vim

diff --git a/README.md b/README.md
index bafa3abfe..04a6fcdbe 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->603<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->604<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -140,6 +140,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [octave](https://github.com/McSinyx/vim-octave) (Syntax highlighting for oct and m files)
 - [odin](https://github.com/Tetralux/odin.vim) (Odin syntax highlighting for odin files)
 - [opencl](https://github.com/petRUShka/vim-opencl) (OpenCL syntax highlighting for cl and opencl files)
+- [openscad](https://github.com/sirtaj/vim-openscad) (Syntax highlighting for scad files)
 - [perl](https://github.com/vim-perl/vim-perl) (Perl syntax highlighting for pl, al, cgi, fcgi, perl and 12 more files)
 - [pest](https://github.com/pest-parser/pest.vim) (Syntax highlighting for pest files)
 - [pgsql](https://github.com/lifepillar/pgsql.vim) (PLpgSQL syntax highlighting for pgsql files)
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 2c76d8546..ac3bf8e88 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -169,6 +169,10 @@ let did_load_filetypes = 1
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(g:polyglot_is_disabled, 'openscad')
+  au BufNewFile,BufRead *.scad setf openscad
+endif
+
 if !has_key(g:polyglot_is_disabled, 'sway')
   au BufNewFile,BufRead *sway/config setf sway
 endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 1912384cc..c8f092979 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -382,6 +382,7 @@ let s:globs = {
   \ 'opam': '*.opam,*.opam.template,opam',
   \ 'opencl': '*.cl,*.opencl',
   \ 'openroad': '*.or',
+  \ 'openscad': '*.scad',
   \ 'opl': '*.[Oo][Pp][Ll]',
   \ 'ora': '*.ora',
   \ 'pamconf': '',
diff --git a/ftplugin/openscad.vim b/ftplugin/openscad.vim
new file mode 100644
index 000000000..3daa1687c
--- /dev/null
+++ b/ftplugin/openscad.vim
@@ -0,0 +1,18 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'openscad', 'ftplugin/openscad.vim')
+  finish
+endif
+
+" Blatantly stolen from vim74\ftplugin\c.vim
+
+" Set 'formatoptions' to break comment lines but not other lines,
+" and insert the comment leader when hitting <CR> or using "o".
+setlocal fo-=t fo+=croql
+
+" Set 'comments' to format dashed lists in comments.
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
+
+" Win32 can filter files in the browse dialog
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+    let b:browsefilter = "OpenSCAD Source Files (*.scad)\t*.scad\n" .
+	  \ "All Files (*.*)\t*.*\n"
+endif
diff --git a/packages.yaml b/packages.yaml
index 25ee0e6f1..b6c65e9e3 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5592,3 +5592,11 @@ filetypes:
   patterns:
   - pattern: '*sway/config'
     description: Sway Configuration
+---
+name: openscad
+remote: sirtaj/vim-openscad
+filetypes:
+- name: openscad
+  patterns:
+  - pattern: '*.scad'
+    description: OpenSCAD 3D modeling language
diff --git a/syntax/openscad.vim b/syntax/openscad.vim
new file mode 100644
index 000000000..40156d58e
--- /dev/null
+++ b/syntax/openscad.vim
@@ -0,0 +1,93 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'openscad', 'syntax/openscad.vim')
+  finish
+endif
+
+" Vim syntax file
+" Language:     OpenSCAD
+" Maintainer:   Sirtaj Singh Kang <sirtaj-vim@sirtaj.net>
+" Last Changed: 2013 March 05
+
+if version < 600
+    syntax clear
+elseif exists("b:current_syntax")
+    finish
+endif
+
+
+"syn keyword openscadFunctionDef function
+syn keyword openscadFunctionDef function nextgroup=openscadFunction skipwhite skipempty
+syn match openscadFunction /\<\h\w*\>/ contained display
+
+"syn keyword openscadModuleDef module
+syn keyword openscadModuleDef module nextgroup=openscadModule skipwhite skipempty
+syn match openscadModule /\<\h\w*\>/ contained display
+
+syn keyword openscadStatement echo assign let assert
+syn keyword openscadConditional if else
+syn keyword openscadRepeat for intersection_for
+syn keyword openscadInclude include use
+syn keyword openscadCsgKeyword union difference intersection render intersection_for
+syn keyword openscadTransform scale rotate translate mirror multmatrix color minkowski hull projection linear_extrude rotate_extrude offset
+syn keyword openscadPrimitiveSolid cube sphere cylinder polyhedron surface
+syn keyword openscadPrimitive2D square circle polygon import_dxf text
+syn keyword openscadPrimitiveImport import child children
+
+syn match openscadSpecialVariable "\$[a-zA-Z]\+\>" display
+syn match openscadModifier "^\s*[\*\!\#\%]" display
+
+syn match openscadNumbers "\<\d\|\.\d" contains=openscadNumber display transparent
+syn match openscadNumber "\d\+" display contained 
+syn match openscadNumber "\.\d\+" display contained 
+
+syn region openscadString start=/"/ skip=/\\"/ end=/"/
+
+syn keyword openscadBoolean true false
+
+syn keyword openscadCommentTodo TODO FIXME XXX contained display
+syn match openscadInlineComment ://.*$: contains=openscadCommentTodo
+syn region openscadBlockComment start=:/\*: end=:\*/: fold contains=openscadCommentTodo
+
+syn region openscadBlock start="{" end="}" transparent fold
+syn region openscadVector start="\[" end="\]" transparent fold
+
+syn keyword openscadBuiltin abs acos asin atan atan2 ceil cos exp floor ln log
+syn keyword openscadBuiltin lookup max min pow rands round sign sin sqrt tan
+syn keyword openscadBuiltin str len search version version_num concat chr
+syn keyword openscadBuiltin dxf_cross dxf_dim
+
+hi def link openscadFunctionDef			Structure
+hi def link openscadFunction			Function
+hi def link openscadModuleDef			Structure
+hi def link openscadModule			    Function
+hi def link openscadBlockComment		Comment
+hi def link openscadBoolean			    Boolean
+hi def link openscadBuiltin			    Function
+hi def link openscadConditional			Conditional
+hi def link openscadCsgKeyword			Structure
+hi def link openscadInclude			    Include
+hi def link openscadInlineComment	    Comment
+hi def link openscadModifier			Special
+hi def link openscadStatement			Statement
+hi def link openscadNumbers			    Number
+hi def link openscadNumber			    Number
+hi def link openscadPrimitiveSolid		Keyword
+hi def link openscadPrimitive2D 		Keyword
+hi def link openscadPrimitiveImport 	Keyword
+hi def link openscadRepeat			    Repeat
+hi def link openscadSpecialVariable		Special
+hi def link openscadString			    String
+hi def link openscadTransform			Statement
+hi def link openscadCommentTodo			Todo
+
+" Blatantly stolen from vim74\syntax\c.vim
+"when wanted, highlight trailing white space
+if exists("openscad_space_errors")
+  if !exists("openscad_no_trail_space_error")
+    syn match	openscadSpaceError	display excludenl "\s\+$"
+  endif
+  if !exists("openscad_no_tab_space_error")
+    syn match	openscadSpaceError	display " \+\t"me=e-1
+  endif
+endif
+
+let b:current_syntax = "openscad"
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 39b280e6a..29b457f2a 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -650,6 +650,7 @@ call TestFiletype('jsonc')
 call TestFiletype('gleam')
 call TestFiletype('hjson')
 call TestFiletype('sway')
+call TestFiletype('openscad')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 

From 6e0702bd6672f3882b0ce2ea9d254a8d109eb807 Mon Sep 17 00:00:00 2001
From: Jeremy Cantrell <jmcantrell@gmail.com>
Date: Wed, 9 Jun 2021 13:58:16 -0500
Subject: [PATCH 259/299] Add nftables filetype (#715)

Co-authored-by: Adam Stankiewicz <sheerun@sher.pl>
---
 README.md            |  1 +
 packages.yaml        | 10 ++++++++++
 tests/extensions.vim |  5 +++++
 3 files changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 04a6fcdbe..37d879941 100644
--- a/README.md
+++ b/README.md
@@ -132,6 +132,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim) (Meson syntax highlighting for wrap files)
 - [mint](https://github.com/IrenejMarc/vim-mint) (Syntax highlighting for mint files)
 - [moonscript](https://github.com/leafo/moonscript-vim) (MoonScript syntax highlighting for moon files)
+- [nftables](https://github.com/nfnty/vim-nftables) (Syntax highlighting for nftables config files)
 - [nginx](https://github.com/chr4/nginx.vim) (Nginx syntax highlighting for nginx, nginxconf and vhost files)
 - [nim](https://github.com/zah/nim.vim) (Nim syntax highlighting for nim, nim.cfg, nimble, nimrod and nims files)
 - [nix](https://github.com/LnL7/vim-nix) (Nix syntax highlighting for nix files)
diff --git a/packages.yaml b/packages.yaml
index b6c65e9e3..5912e7ab5 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5593,6 +5593,16 @@ filetypes:
   - pattern: '*sway/config'
     description: Sway Configuration
 ---
+name: nftables
+remote: nfnty/vim-nftables
+filetypes:
+- name: nftables
+  extensions:
+  - nft
+  patterns:
+  - pattern: '*/nftables.conf'
+    description: nftables configuration
+---
 name: openscad
 remote: sirtaj/vim-openscad
 filetypes:
diff --git a/tests/extensions.vim b/tests/extensions.vim
index ccfbca449..214bfd8a4 100644
--- a/tests/extensions.vim
+++ b/tests/extensions.vim
@@ -391,6 +391,11 @@ call TestExtension("conf", "auto.master", "")
 " https://github.com/sheerun/vim-polyglot/issues/579
 call TestExtension("dart", "reminders.dart", "")
 
+" nftables
+call TestExtension("nftables", "foo.nft", "")
+call TestExtension("nftables", "nftables.conf", "")
+call TestExtension("nftables", "foo", "#!/usr/bin/env nft")
+
 call TestExtension("racket", "empty.rkt", "")
 
 filetype off

From dec65bafcafe295aeb5744f8a34ff5a1fd2cb1ef Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 20:58:38 +0200
Subject: [PATCH 260/299] Update

---
 README.md                    | 4 ++--
 autoload/polyglot/init.vim   | 4 ++++
 autoload/polyglot/sleuth.vim | 1 +
 tests/filetypes.vim          | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 37d879941..9a4ce5589 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->604<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->605<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -132,7 +132,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim) (Meson syntax highlighting for wrap files)
 - [mint](https://github.com/IrenejMarc/vim-mint) (Syntax highlighting for mint files)
 - [moonscript](https://github.com/leafo/moonscript-vim) (MoonScript syntax highlighting for moon files)
-- [nftables](https://github.com/nfnty/vim-nftables) (Syntax highlighting for nftables config files)
+- [nftables](https://github.com/nfnty/vim-nftables) (Syntax highlighting for nft files)
 - [nginx](https://github.com/chr4/nginx.vim) (Nginx syntax highlighting for nginx, nginxconf and vhost files)
 - [nim](https://github.com/zah/nim.vim) (Nim syntax highlighting for nim, nim.cfg, nimble, nimrod and nims files)
 - [nix](https://github.com/LnL7/vim-nix) (Nix syntax highlighting for nix files)
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index ac3bf8e88..d294ea4a7 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -173,6 +173,10 @@ if !has_key(g:polyglot_is_disabled, 'openscad')
   au BufNewFile,BufRead *.scad setf openscad
 endif
 
+if !has_key(g:polyglot_is_disabled, 'nftables')
+  au BufNewFile,BufRead *.nft,*/nftables.conf setf nftables
+endif
+
 if !has_key(g:polyglot_is_disabled, 'sway')
   au BufNewFile,BufRead *sway/config setf sway
 endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index c8f092979..bcd0e5e8e 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -360,6 +360,7 @@ let s:globs = {
   \ 'ncf': '*.ncf',
   \ 'neomuttrc': 'Neomuttrc,.neomuttrc*,neomuttrc*,Neomuttrc*',
   \ 'netrc': '.netrc',
+  \ 'nftables': '*.nft',
   \ 'nginx': '*.nginx,*.nginxconf,*.vhost,nginx.conf,nginx*.conf,*nginx.conf',
   \ 'nim': '*.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg',
   \ 'ninja': '*.ninja',
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 29b457f2a..ba1c1dec3 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -650,6 +650,7 @@ call TestFiletype('jsonc')
 call TestFiletype('gleam')
 call TestFiletype('hjson')
 call TestFiletype('sway')
+call TestFiletype('nftables')
 call TestFiletype('openscad')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE

From 26095dda91c169bf5e7f657d4ff52da1baab3e4c Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 21:00:49 +0200
Subject: [PATCH 261/299] Update

---
 ftplugin/nftables.vim | 28 ++++++++++++++++++++++++++++
 indent/nftables.vim   | 21 +++++++++++++++++++++
 syntax/nftables.vim   | 41 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 ftplugin/nftables.vim
 create mode 100644 indent/nftables.vim
 create mode 100644 syntax/nftables.vim

diff --git a/ftplugin/nftables.vim b/ftplugin/nftables.vim
new file mode 100644
index 000000000..c9294881a
--- /dev/null
+++ b/ftplugin/nftables.vim
@@ -0,0 +1,28 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nftables', 'ftplugin/nftables.vim')
+  finish
+endif
+
+if exists('b:did_ftplugin')
+    finish
+endif
+let b:did_ftplugin = 1
+
+let s:save_cpo = &cpoptions
+set cpoptions&vim
+
+setlocal smartindent nocindent
+setlocal commentstring=#%s
+setlocal formatoptions-=t formatoptions+=croqnlj
+
+setlocal comments=b:#
+
+setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab
+setlocal textwidth=99
+
+let b:undo_ftplugin = '
+    \ setlocal formatoptions< comments< commentstring<
+    \|setlocal tabstop< shiftwidth< softtabstop< expandtab< textwidth<
+    \'
+
+let &cpoptions = s:save_cpo
+unlet s:save_cpo
diff --git a/indent/nftables.vim b/indent/nftables.vim
new file mode 100644
index 000000000..1a3e58765
--- /dev/null
+++ b/indent/nftables.vim
@@ -0,0 +1,21 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nftables', 'indent/nftables.vim')
+  finish
+endif
+
+" Only load this indent file when no other was loaded.
+if exists('b:did_indent')
+  finish
+endif
+let b:did_indent = 1
+
+setlocal cindent
+setlocal cinoptions=L0,(0,Ws,J1,j1,+N
+setlocal cinkeys=0{,0},!^F,o,O,0[,0]
+" Don't think cinwords will actually do anything at all... never mind
+setlocal cinwords=table,chain
+
+" Some preliminary settings
+setlocal nolisp         " Make sure lisp indenting doesn't supersede us
+setlocal autoindent     " indentexpr isn't much help otherwise
+" Also do indentkeys, otherwise # gets shoved to column 0 :-/
+setlocal indentkeys=0{,0},!^F,o,O,0[,0]
diff --git a/syntax/nftables.vim b/syntax/nftables.vim
new file mode 100644
index 000000000..c73e5c318
--- /dev/null
+++ b/syntax/nftables.vim
@@ -0,0 +1,41 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'nftables', 'syntax/nftables.vim')
+  finish
+endif
+
+if exists('b:current_syntax')
+    finish
+endif
+
+syn match nftablesSet /{.*}/ contains=nftablesSetEntry
+syn match nftablesSetEntry /[a-zA-Z0-9]\+/ contained
+hi def link nftablesSet Keyword
+hi def link nftablesSetEntry Operator
+
+syn match nftablesNumber "\<[0-9A-Fa-f./:]\+\>" contains=nftablesMask,nftablesDelimiter
+syn match nftablesHex "\<0x[0-9A-Fa-f]\+\>"
+syn match nftablesDelimiter "[./:]" contained
+syn match nftablesMask "/[0-9.]\+" contained contains=nftablesDelimiter
+hi def link nftablesNumber Number
+hi def link nftablesHex Number
+hi def link nftablesDelimiter Operator
+hi def link nftablesMask Operator
+
+syn region Comment start=/#/ end=/$/
+syn region String start=/"/ end=/"/
+syn keyword Function flush
+syn keyword Function table chain map
+syn keyword Statement type hook
+syn keyword Type ip ip6 inet arp bridge
+syn keyword Type filter nat route
+syn keyword Type ether vlan arp ip icmp igmp ip6 icmpv6 tcp udp udplite sctp dccp ah esp comp icmpx
+syn keyword Type ct
+syn keyword Type length protocol priority mark iif iifname iiftype oif oifname oiftype skuid skgid rtclassid
+syn keyword Constant prerouting input forward output postrouting
+
+syn keyword Special snat dnat masquerade redirect
+syn keyword Special accept drop reject queue
+syn keyword Keyword continue return jump goto
+syn keyword Keyword counter log limit
+syn keyword Keyword define
+
+let b:current_syntax = 'nftables'

From 85a1c3d2d89eb372adba2551c0f83a1eb9f05098 Mon Sep 17 00:00:00 2001
From: Noah <noah.bogart@hey.com>
Date: Wed, 9 Jun 2021 15:06:05 -0400
Subject: [PATCH 262/299] Add justfile support (#713)

Co-authored-by: Adam Stankiewicz <sheerun@sher.pl>
---
 README.md     |  1 +
 packages.yaml | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9a4ce5589..32718e4d6 100644
--- a/README.md
+++ b/README.md
@@ -118,6 +118,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [jst](https://github.com/briancollins/vim-jst) (EJS syntax highlighting for ejs, ect and jst files)
 - [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (Syntax highlighting for jsx files)
 - [julia](https://github.com/JuliaEditorSupport/julia-vim) (Julia syntax highlighting for jl files)
+- [just](https://github.com/NoahTheDuke/vim-just) (Syntax highlighting for justfile and *.just files)
 - [kotlin](https://github.com/udalov/kotlin-vim) (Kotlin syntax highlighting for kt, ktm and kts files)
 - [ledger](https://github.com/ledger/vim-ledger) (Syntax highlighting for ldg, ledger and journal files)
 - [lilypond](https://github.com/anowlcalledjosh/vim-lilypond) (LilyPond syntax highlighting for ly and ily files)
diff --git a/packages.yaml b/packages.yaml
index 5912e7ab5..91bed4410 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5593,6 +5593,14 @@ filetypes:
   - pattern: '*sway/config'
     description: Sway Configuration
 ---
+name: just
+remote: NoahTheDuke/vim-just
+filetypes:
+- name: just
+  patterns:
+  - pattern: 'justfile,*.just'
+    description: 'Just a task runner (https://github.com/casey/just)'
+---
 name: nftables
 remote: nfnty/vim-nftables
 filetypes:
@@ -5609,4 +5617,4 @@ filetypes:
 - name: openscad
   patterns:
   - pattern: '*.scad'
-    description: OpenSCAD 3D modeling language
+    description: OpenSCAD 3D modeling language
\ No newline at end of file

From 839447bbf542925b1085a33d076cc525138aad7c Mon Sep 17 00:00:00 2001
From: rYR79435 <60985157+rYR79435@users.noreply.github.com>
Date: Wed, 9 Jun 2021 21:10:58 +0200
Subject: [PATCH 263/299] Replace i3 and sway with a single repo, fixes #709
 (#716)

Co-authored-by: Adam Stankiewicz <sheerun@sher.pl>
---
 README.md     |  3 +--
 packages.yaml | 21 ++++-----------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 32718e4d6..c5a81542a 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [hive](https://github.com/zebradil/hive.vim) (HiveQL syntax highlighting for q, hql and ql files)
 - [hjson](https://github.com/hjson/vim-hjson) (Syntax highlighting for hjson files)
 - [html5](https://github.com/othree/html5.vim)
-- [i3](https://github.com/mboughaba/i3config.vim) (Syntax highlighting for i3.config and i3config files)
+- [i3/sway](https://github.com/jamespeapen/swayconfig.vim/tree/i3sway) (Syntax highlighting for i3.config, i3config, sway.config and swayconfig files)
 - [icalendar](https://github.com/chutzpah/icalendar.vim) (Syntax highlighting for ics files)
 - [idris2](https://github.com/edwinb/idris2-vim) (Syntax highlighting for idr, ipkg and lidr files)
 - [idris](https://github.com/idris-hackers/idris-vim) (Idris syntax highlighting for idr and lidr files)
@@ -182,7 +182,6 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [svelte](https://github.com/leafOfTree/vim-svelte-plugin) (Svelte syntax highlighting for svelte files)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
 - [svg](https://github.com/vim-scripts/svg.vim) (SVG syntax highlighting for svg files)
-- [sway](https://github.com/aouelete/sway-vim-syntax)
 - [swift](https://github.com/keith/swift.vim) (Swift syntax highlighting for swift files)
 - [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (Syntax highlighting for sxhkdrc files)
 - [systemd](https://github.com/wgwoods/vim-systemd-syntax) (Syntax highlighting for automount, dnssd, link, mount, netdev and 9 more files)
diff --git a/packages.yaml b/packages.yaml
index 91bed4410..cd65118b6 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -807,19 +807,6 @@ filetypes:
   extra_extensions:
   - ql
 ---
-name: i3
-remote: mboughaba/i3config.vim
-filetypes:
-- name: i3config
-  filenames:
-  - i3.config
-  - i3config
-  - .i3.config
-  - .i3config
-  extensions:
-  - i3.config
-  - i3config
----
 name: icalendar
 remote: chutzpah/icalendar.vim
 filetypes:
@@ -5586,12 +5573,12 @@ filetypes:
     description: Hjson (https://hjson.github.io)
 ---
 name: sway
-remote: aouelete/sway-vim-syntax
+remote: jamespeapen/swayconfig.vim/tree/i3sway
 filetypes:
-- name: sway
+- name: i3config
   patterns:
-  - pattern: '*sway/config'
-    description: Sway Configuration
+  - pattern: 'i3.config,*.i3config,*.i3.config,*sway/config,*.swayconfig,*.sway.config,sway.config'
+    description: Sway/i3 Configuration
 ---
 name: just
 remote: NoahTheDuke/vim-just

From c4e50b4e9da54836b0fcd443229c7213de789e21 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 21:11:58 +0200
Subject: [PATCH 264/299] Update

---
 README.md                    |   4 +-
 after/ftplugin/just.vim      |  11 ++
 autoload/polyglot/init.vim   |  10 +-
 autoload/polyglot/sleuth.vim |   4 +-
 ftplugin/i3config.vim        |   5 -
 ftplugin/sway.vim            |   5 -
 syntax/i3config.vim          | 263 -----------------------------------
 syntax/just.vim              | 128 +++++++++++++++++
 syntax/sway.vim              | 133 ------------------
 tests/filetypes.vim          |   4 +-
 10 files changed, 150 insertions(+), 417 deletions(-)
 create mode 100644 after/ftplugin/just.vim
 delete mode 100644 ftplugin/i3config.vim
 delete mode 100644 ftplugin/sway.vim
 delete mode 100644 syntax/i3config.vim
 create mode 100644 syntax/just.vim
 delete mode 100644 syntax/sway.vim

diff --git a/README.md b/README.md
index c5a81542a..ebdd5c914 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,6 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [hive](https://github.com/zebradil/hive.vim) (HiveQL syntax highlighting for q, hql and ql files)
 - [hjson](https://github.com/hjson/vim-hjson) (Syntax highlighting for hjson files)
 - [html5](https://github.com/othree/html5.vim)
-- [i3/sway](https://github.com/jamespeapen/swayconfig.vim/tree/i3sway) (Syntax highlighting for i3.config, i3config, sway.config and swayconfig files)
 - [icalendar](https://github.com/chutzpah/icalendar.vim) (Syntax highlighting for ics files)
 - [idris2](https://github.com/edwinb/idris2-vim) (Syntax highlighting for idr, ipkg and lidr files)
 - [idris](https://github.com/idris-hackers/idris-vim) (Idris syntax highlighting for idr and lidr files)
@@ -118,7 +117,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [jst](https://github.com/briancollins/vim-jst) (EJS syntax highlighting for ejs, ect and jst files)
 - [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (Syntax highlighting for jsx files)
 - [julia](https://github.com/JuliaEditorSupport/julia-vim) (Julia syntax highlighting for jl files)
-- [just](https://github.com/NoahTheDuke/vim-just) (Syntax highlighting for justfile and *.just files)
+- [just](https://github.com/NoahTheDuke/vim-just) (Syntax highlighting for just files)
 - [kotlin](https://github.com/udalov/kotlin-vim) (Kotlin syntax highlighting for kt, ktm and kts files)
 - [ledger](https://github.com/ledger/vim-ledger) (Syntax highlighting for ldg, ledger and journal files)
 - [lilypond](https://github.com/anowlcalledjosh/vim-lilypond) (LilyPond syntax highlighting for ly and ily files)
@@ -182,6 +181,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [svelte](https://github.com/leafOfTree/vim-svelte-plugin) (Svelte syntax highlighting for svelte files)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
 - [svg](https://github.com/vim-scripts/svg.vim) (SVG syntax highlighting for svg files)
+- [sway](https://github.com/jamespeapen/swayconfig.vim/tree/i3sway) (Syntax highlighting for i3config, i3.config, swayconfig and sway.config files)
 - [swift](https://github.com/keith/swift.vim) (Swift syntax highlighting for swift files)
 - [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (Syntax highlighting for sxhkdrc files)
 - [systemd](https://github.com/wgwoods/vim-systemd-syntax) (Syntax highlighting for automount, dnssd, link, mount, netdev and 9 more files)
diff --git a/after/ftplugin/just.vim b/after/ftplugin/just.vim
new file mode 100644
index 000000000..7b7fdcd3e
--- /dev/null
+++ b/after/ftplugin/just.vim
@@ -0,0 +1,11 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'just', 'after/ftplugin/just.vim')
+  finish
+endif
+
+" Vim ftplugin file
+" Language:	Justfile
+" Maintainer:	Noah Bogart <noah.bogart@hey.com>
+" URL:		https://github.com/NoahTheDuke/vim-just.git
+" Last Change:	2021 May 19
+
+setlocal iskeyword+=-
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index d294ea4a7..536b7dce7 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -177,8 +177,12 @@ if !has_key(g:polyglot_is_disabled, 'nftables')
   au BufNewFile,BufRead *.nft,*/nftables.conf setf nftables
 endif
 
+if !has_key(g:polyglot_is_disabled, 'just')
+  au BufNewFile,BufRead *.just,justfile setf just
+endif
+
 if !has_key(g:polyglot_is_disabled, 'sway')
-  au BufNewFile,BufRead *sway/config setf sway
+  au BufNewFile,BufRead *.i3.config,*.i3config,*.sway.config,*.swayconfig,*sway/config,i3.config,sway.config setf i3config
 endif
 
 if !has_key(g:polyglot_is_disabled, 'hjson')
@@ -2293,10 +2297,6 @@ if !has_key(g:polyglot_is_disabled, 'icalendar')
   au BufNewFile,BufRead *.ics setf icalendar
 endif
 
-if !has_key(g:polyglot_is_disabled, 'i3')
-  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config setf i3config
-endif
-
 if !has_key(g:polyglot_is_disabled, 'hive')
   au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
 endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index bcd0e5e8e..648939598 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -237,7 +237,7 @@ let s:globs = {
   \ 'htmlm4': '*.html.m4',
   \ 'httest': '*.htt,*.htb',
   \ 'hxml': '*.hxml',
-  \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config,.i3.config,.i3config',
+  \ 'i3config': '*.i3config,*.i3.config,*.swayconfig,*.sway.config,i3.config,sway.config',
   \ 'ibasic': '*.iba,*.ibi',
   \ 'icalendar': '*.ics',
   \ 'icemenu': '',
@@ -271,6 +271,7 @@ let s:globs = {
   \ 'jsp': '*.jsp',
   \ 'jst': '*.ejs,*.ect,*.jst',
   \ 'julia': '*.jl',
+  \ 'just': '*.just,justfile',
   \ 'kconfig': 'Kconfig,Kconfig.debug,Kconfig.*',
   \ 'kivy': '*.kv',
   \ 'kix': '*.kix',
@@ -528,7 +529,6 @@ let s:globs = {
   \ 'svelte': '*.svelte',
   \ 'svg': '*.svg',
   \ 'svn': 'svn-commit*.tmp',
-  \ 'sway': '',
   \ 'swift': '*.swift',
   \ 'swiftgyb': '*.swift.gyb',
   \ 'sxhkdrc': '*.sxhkdrc,sxhkdrc',
diff --git a/ftplugin/i3config.vim b/ftplugin/i3config.vim
deleted file mode 100644
index 6fb69a185..000000000
--- a/ftplugin/i3config.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'i3', 'ftplugin/i3config.vim')
-  finish
-endif
-
-setlocal commentstring=#\ %s
diff --git a/ftplugin/sway.vim b/ftplugin/sway.vim
deleted file mode 100644
index 3b7df6b85..000000000
--- a/ftplugin/sway.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'sway', 'ftplugin/sway.vim')
-  finish
-endif
-
-setlocal commentstring=#\ %s
diff --git a/syntax/i3config.vim b/syntax/i3config.vim
deleted file mode 100644
index 8228f9310..000000000
--- a/syntax/i3config.vim
+++ /dev/null
@@ -1,263 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'i3', 'syntax/i3config.vim')
-  finish
-endif
-
-" Vim syntax file
-" Language: i3 config file
-" Maintainer: Mohamed Boughaba <mohamed dot bgb at gmail dot com>
-" Version: 0.4
-" Last Change: 2019-03-23 21:54
-
-" References:
-" http://i3wm.org/docs/userguide.html#configuring
-" http://vimdoc.sourceforge.net/htmldoc/syntax.html
-"
-"
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syn clear
-elsei exists("b:current_syntax")
-  fini
-en
-
-scriptencoding utf-8
-
-" Error
-syn match i3ConfigError /.*/
-
-" Todo
-syn keyword i3ConfigTodo TODO FIXME XXX contained
-
-" Comment
-" Comments are started with a # and can only be used at the beginning of a line
-syn match i3ConfigComment /^\s*#.*$/ contains=i3ConfigTodo
-
-" Font
-" A FreeType font description is composed by:
-" a font family, a style, a weight, a variant, a stretch and a size.
-syn match i3ConfigFontSeparator /,/ contained
-syn match i3ConfigFontSeparator /:/ contained
-syn keyword i3ConfigFontKeyword font contained
-syn match i3ConfigFontNamespace /\w\+:/ contained contains=i3ConfigFontSeparator
-syn match i3ConfigFontContent /-\?\w\+\(-\+\|\s\+\|,\)/ contained contains=i3ConfigFontNamespace,i3ConfigFontSeparator,i3ConfigFontKeyword
-syn match i3ConfigFontSize /\s\=\d\+\(px\)\?\s\?$/ contained
-syn match i3ConfigFont /^\s*font\s\+.*$/ contains=i3ConfigFontContent,i3ConfigFontSeparator,i3ConfigFontSize,i3ConfigFontNamespace
-syn match i3ConfigFont /^\s*font\s\+.*\(\\\_.*\)\?$/ contains=i3ConfigFontContent,i3ConfigFontSeparator,i3ConfigFontSize,i3ConfigFontNamespace
-syn match i3ConfigFont /^\s*font\s\+.*\(\\\_.*\)\?[^\\]\+$/ contains=i3ConfigFontContent,i3ConfigFontSeparator,i3ConfigFontSize,i3ConfigFontNamespace
-syn match i3ConfigFont /^\s*font\s\+\(\(.*\\\_.*\)\|\(.*[^\\]\+$\)\)/ contains=i3ConfigFontContent,i3ConfigFontSeparator,i3ConfigFontSize,i3ConfigFontNamespace
-
-" variables
-syn match i3ConfigString /\(['"]\)\(.\{-}\)\1/ contained
-syn match i3ConfigColor /#\w\{6}/ contained
-syn match i3ConfigVariableModifier /+/ contained
-syn match i3ConfigVariableAndModifier /+\w\+/ contained contains=i3ConfigVariableModifier
-syn match i3ConfigVariable /\$\w\+\(\(-\w\+\)\+\)\?\(\s\|+\)\?/ contains=i3ConfigVariableModifier,i3ConfigVariableAndModifier
-syn keyword i3ConfigInitializeKeyword set contained
-syn match i3ConfigInitialize /^\s*set\s\+.*$/ contains=i3ConfigVariable,i3ConfigInitializeKeyword,i3ConfigColor,i3ConfigString
-
-" Gaps
-syn keyword i3ConfigGapStyleKeyword inner outer horizontal vertical top right bottom left current all set plus minus toggle up down contained
-syn match i3ConfigGapStyle /^\s*\(gaps\)\s\+\(inner\|outer\|horizontal\|vertical\|left\|top\|right\|bottom\)\(\s\+\(current\|all\)\)\?\(\s\+\(set\|plus\|minus\|toggle\)\)\?\(\s\+\(-\?\d\+\|\$.*\)\)$/ contains=i3ConfigGapStyleKeyword,i3ConfigNumber,i3ConfigVariable
-syn keyword i3ConfigSmartGapKeyword on inverse_outer contained
-syn match i3ConfigSmartGap /^\s*smart_gaps\s\+\(on\|inverse_outer\)\s\?$/ contains=i3ConfigSmartGapKeyword
-syn keyword i3ConfigSmartBorderKeyword on no_gaps contained
-syn match i3ConfigSmartBorder /^\s*smart_borders\s\+\(on\|no_gaps\)\s\?$/ contains=i3ConfigSmartBorderKeyword
-
-" Keyboard bindings
-syn keyword i3ConfigAction toggle fullscreen restart key import kill shrink grow contained
-syn keyword i3ConfigAction focus move grow height width split layout resize restore reload mute unmute exit mode workspace container to contained
-syn match i3ConfigModifier /\w\++\w\+\(\(+\w\+\)\+\)\?/ contained contains=i3ConfigVariableModifier
-syn match i3ConfigNumber /\s\d\+/ contained
-syn match i3ConfigUnit /\sp\(pt\|x\)/ contained
-syn match i3ConfigUnitOr /\sor/ contained
-syn keyword i3ConfigBindKeyword bindsym bindcode exec gaps border contained
-syn match i3ConfigBindArgument /--\w\+\(\(-\w\+\)\+\)\?\s/ contained
-syn match i3ConfigBind /^\s*\(bindsym\|bindcode\)\s\+.*$/ contains=i3ConfigVariable,i3ConfigBindKeyword,i3ConfigVariableAndModifier,i3ConfigNumber,i3ConfigUnit,i3ConfigUnitOr,i3ConfigBindArgument,i3ConfigModifier,i3ConfigAction,i3ConfigString,i3ConfigGapStyleKeyword,i3ConfigBorderStyleKeyword
-
-" Floating
-syn keyword i3ConfigSizeSpecial x contained
-syn match i3ConfigNegativeSize /-/ contained
-syn match i3ConfigSize /-\?\d\+\s\?x\s\?-\?\d\+/ contained contains=i3ConfigSizeSpecial,i3ConfigNumber,i3ConfigNegativeSize
-syn match i3ConfigFloating /^\s*floating_modifier\s\+\$\w\+\d\?/ contains=i3ConfigVariable
-syn match i3ConfigFloating /^\s*floating_\(maximum\|minimum\)_size\s\+-\?\d\+\s\?x\s\?-\?\d\+/ contains=i3ConfigSize
-
-" Orientation
-syn keyword i3ConfigOrientationKeyword vertical horizontal auto contained
-syn match i3ConfigOrientation /^\s*default_orientation\s\+\(vertical\|horizontal\|auto\)\s\?$/ contains=i3ConfigOrientationKeyword
-
-" Layout
-syn keyword i3ConfigLayoutKeyword default stacking tabbed contained
-syn match i3ConfigLayout /^\s*workspace_layout\s\+\(default\|stacking\|tabbed\)\s\?$/ contains=i3ConfigLayoutKeyword
-
-" Border style
-syn keyword i3ConfigBorderStyleKeyword none normal pixel contained
-syn match i3ConfigBorderStyle /^\s*\(new_window\|new_float\|default_border\|default_floating_border\)\s\+\(none\|\(normal\|pixel\)\(\s\+\d\+\)\?\(\s\+\$\w\+\(\(-\w\+\)\+\)\?\(\s\|+\)\?\)\?\)\s\?$/ contains=i3ConfigBorderStyleKeyword,i3ConfigNumber,i3ConfigVariable
-
-" Hide borders and edges
-syn keyword i3ConfigEdgeKeyword none vertical horizontal both smart smart_no_gaps contained
-syn match i3ConfigEdge /^\s*hide_edge_borders\s\+\(none\|vertical\|horizontal\|both\|smart\|smart_no_gaps\)\s\?$/ contains=i3ConfigEdgeKeyword
-
-" Arbitrary commands for specific windows (for_window)
-syn keyword i3ConfigCommandKeyword for_window contained
-syn region i3ConfigWindowStringSpecial start=+"+  skip=+\\"+  end=+"+ contained contains=i3ConfigString
-syn region i3ConfigWindowCommandSpecial start="\[" end="\]" contained contains=i3ConfigWindowStringSpacial,i3ConfigString
-syn match i3ConfigArbitraryCommand /^\s*for_window\s\+.*$/ contains=i3ConfigWindowCommandSpecial,i3ConfigCommandKeyword,i3ConfigBorderStyleKeyword,i3ConfigLayoutKeyword,i3ConfigOrientationKeyword,Size,i3ConfigNumber
-
-" Disable focus open opening
-syn keyword i3ConfigNoFocusKeyword no_focus contained
-syn match i3ConfigDisableFocus /^\s*no_focus\s\+.*$/ contains=i3ConfigWindowCommandSpecial,i3ConfigNoFocusKeyword
-
-" Move client to specific workspace automatically
-syn keyword i3ConfigAssignKeyword assign contained
-syn match i3ConfigAssignSpecial /→/ contained
-syn match i3ConfigAssign /^\s*assign\s\+.*$/ contains=i3ConfigAssignKeyword,i3ConfigWindowCommandSpecial,i3ConfigAssignSpecial
-
-" X resources
-syn keyword i3ConfigResourceKeyword set_from_resource contained
-syn match i3ConfigResource /^\s*set_from_resource\s\+.*$/ contains=i3ConfigResourceKeyword,i3ConfigWindowCommandSpecial,i3ConfigColor,i3ConfigVariable
-
-" Auto start applications
-syn keyword i3ConfigExecKeyword exec exec_always contained
-syn match i3ConfigNoStartupId /--no-startup-id/ contained " We are not using i3ConfigBindArgument as only no-startup-id is supported here
-syn match i3ConfigExec /^\s*exec\(_always\)\?\s\+.*$/ contains=i3ConfigExecKeyword,i3ConfigNoStartupId,i3ConfigString
-
-" Automatically putting workspaces on specific screens
-syn keyword i3ConfigWorkspaceKeyword workspace contained
-syn keyword i3ConfigOutput output contained
-syn match i3ConfigWorkspace /^\s*workspace\s\+.*$/ contains=i3ConfigWorkspaceKeyword,i3ConfigNumber,i3ConfigString,i3ConfigOutput
-
-" Changing colors
-syn keyword i3ConfigClientColorKeyword client focused focused_inactive unfocused urgent placeholder background contained
-syn match i3ConfigClientColor /^\s*client.\w\+\s\+.*$/ contains=i3ConfigClientColorKeyword,i3ConfigColor,i3ConfigVariable
-
-syn keyword i3ConfigTitleAlignKeyword left center right contained
-syn match i3ConfigTitleAlign /^\s*title_align\s\+.*$/ contains=i3ConfigTitleAlignKeyword
-
-" Interprocess communication
-syn match i3ConfigInterprocessKeyword /ipc-socket/ contained
-syn match i3ConfigInterprocess /^\s*ipc-socket\s\+.*$/ contains=i3ConfigInterprocessKeyword
-
-" Mouse warping
-syn keyword i3ConfigMouseWarpingKeyword mouse_warping contained
-syn keyword i3ConfigMouseWarpingType output none contained
-syn match i3ConfigMouseWarping /^\s*mouse_warping\s\+\(output\|none\)\s\?$/ contains=i3ConfigMouseWarpingKeyword,i3ConfigMouseWarpingType
-
-" Focus follows mouse
-syn keyword i3ConfigFocusFollowsMouseKeyword focus_follows_mouse contained
-syn keyword i3ConfigFocusFollowsMouseType yes no contained
-syn match i3ConfigFocusFollowsMouse /^\s*focus_follows_mouse\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusFollowsMouseKeyword,i3ConfigFocusFollowsMouseType
-
-" Popups during fullscreen mode
-syn keyword i3ConfigPopupOnFullscreenKeyword popup_during_fullscreen contained
-syn keyword i3ConfigPopuponFullscreenType smart ignore leave_fullscreen contained
-syn match i3ConfigPopupOnFullscreen /^\s*popup_during_fullscreen\s\+\w\+\s\?$/ contains=i3ConfigPopupOnFullscreenKeyword,i3ConfigPopupOnFullscreenType
-
-" Focus wrapping
-syn keyword i3ConfigFocusWrappingKeyword force_focus_wrapping focus_wrapping contained
-syn keyword i3ConfigFocusWrappingType yes no contained
-syn match i3ConfigFocusWrapping /^\s*\(force_\)\?focus_wrapping\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigFocusWrappingKeyword
-
-" Forcing Xinerama
-syn keyword i3ConfigForceXineramaKeyword force_xinerama contained
-syn match i3ConfigForceXinerama /^\s*force_xinerama\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigForceXineramaKeyword
-
-" Automatic back-and-forth when switching to the current workspace
-syn keyword i3ConfigAutomaticSwitchKeyword workspace_auto_back_and_forth contained
-syn match i3ConfigAutomaticSwitch /^\s*workspace_auto_back_and_forth\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigAutomaticSwitchKeyword
-
-" Delay urgency hint
-syn keyword i3ConfigTimeUnit ms contained
-syn keyword i3ConfigDelayUrgencyKeyword force_display_urgency_hint contained
-syn match i3ConfigDelayUrgency /^\s*force_display_urgency_hint\s\+\d\+\s\+ms\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigDelayUrgencyKeyword,i3ConfigNumber,i3ConfigTimeUnit
-
-" Focus on window activation
-syn keyword i3ConfigFocusOnActivationKeyword focus_on_window_activation contained
-syn keyword i3ConfigFocusOnActivationType smart urgent focus none contained
-syn match i3ConfigFocusOnActivation /^\s*focus_on_window_activation\s\+\(smart\|urgent\|focus\|none\)\s\?$/  contains=i3ConfigFocusOnActivationKeyword,i3ConfigFocusOnActivationType
-
-" Automatic back-and-forth when switching to the current workspace
-syn keyword i3ConfigDrawingMarksKeyword show_marks contained
-syn match i3ConfigDrawingMarks /^\s*show_marks\s\+\(yes\|no\)\s\?$/ contains=i3ConfigFocusWrappingType,i3ConfigDrawingMarksKeyword
-
-" Group mode/bar
-syn keyword i3ConfigBlockKeyword mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained
-syn region i3ConfigBlock start=+.*s\?{$+ end=+^}$+ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend
-
-" Line continuation
-syn region i3ConfigLineCont start=/^.*\\$/ end=/^.*$/ contains=i3ConfigBlockKeyword,i3ConfigString,i3ConfigBind,i3ConfigComment,i3ConfigFont,i3ConfigFocusWrappingType,i3ConfigColor,i3ConfigVariable transparent keepend extend
-
-" Define the highlighting.
-hi! def link i3ConfigError                           Error
-hi! def link i3ConfigTodo                            Todo
-hi! def link i3ConfigComment                         Comment
-hi! def link i3ConfigFontContent                     Type
-hi! def link i3ConfigFocusOnActivationType           Type
-hi! def link i3ConfigPopupOnFullscreenType           Type
-hi! def link i3ConfigOrientationKeyword              Type
-hi! def link i3ConfigMouseWarpingType                Type
-hi! def link i3ConfigFocusFollowsMouseType           Type
-hi! def link i3ConfigGapStyleKeyword                 Type
-hi! def link i3ConfigTitleAlignKeyword               Type
-hi! def link i3ConfigSmartGapKeyword                 Type
-hi! def link i3ConfigSmartBorderKeyword              Type
-hi! def link i3ConfigLayoutKeyword                   Type
-hi! def link i3ConfigBorderStyleKeyword              Type
-hi! def link i3ConfigEdgeKeyword                     Type
-hi! def link i3ConfigAction                          Type
-hi! def link i3ConfigCommand                         Type
-hi! def link i3ConfigOutput                          Type
-hi! def link i3ConfigWindowCommandSpecial            Type
-hi! def link i3ConfigFocusWrappingType               Type
-hi! def link i3ConfigUnitOr                          Type
-hi! def link i3ConfigFontSize                        Constant
-hi! def link i3ConfigColor                           Constant
-hi! def link i3ConfigNumber                          Constant
-hi! def link i3ConfigUnit                            Constant
-hi! def link i3ConfigVariableAndModifier             Constant
-hi! def link i3ConfigTimeUnit                        Constant
-hi! def link i3ConfigModifier                        Constant
-hi! def link i3ConfigString                          Constant
-hi! def link i3ConfigNegativeSize                    Constant
-hi! def link i3ConfigFontSeparator                   Special
-hi! def link i3ConfigVariableModifier                Special
-hi! def link i3ConfigSizeSpecial                     Special
-hi! def link i3ConfigWindowSpecial                   Special
-hi! def link i3ConfigAssignSpecial                   Special
-hi! def link i3ConfigFontNamespace                   PreProc
-hi! def link i3ConfigBindArgument                    PreProc
-hi! def link i3ConfigNoStartupId                     PreProc
-hi! def link i3ConfigFontKeyword                     Identifier
-hi! def link i3ConfigBindKeyword                     Identifier
-hi! def link i3ConfigOrientation                     Identifier
-hi! def link i3ConfigGapStyle                        Identifier
-hi! def link i3ConfigTitleAlign                      Identifier
-hi! def link i3ConfigSmartGap                        Identifier
-hi! def link i3ConfigSmartBorder                     Identifier
-hi! def link i3ConfigLayout                          Identifier
-hi! def link i3ConfigBorderStyle                     Identifier
-hi! def link i3ConfigEdge                            Identifier
-hi! def link i3ConfigFloating                        Identifier
-hi! def link i3ConfigCommandKeyword                  Identifier
-hi! def link i3ConfigNoFocusKeyword                  Identifier
-hi! def link i3ConfigInitializeKeyword               Identifier
-hi! def link i3ConfigAssignKeyword                   Identifier
-hi! def link i3ConfigResourceKeyword                 Identifier
-hi! def link i3ConfigExecKeyword                     Identifier
-hi! def link i3ConfigWorkspaceKeyword                Identifier
-hi! def link i3ConfigClientColorKeyword              Identifier
-hi! def link i3ConfigInterprocessKeyword             Identifier
-hi! def link i3ConfigMouseWarpingKeyword             Identifier
-hi! def link i3ConfigFocusFollowsMouseKeyword        Identifier
-hi! def link i3ConfigPopupOnFullscreenKeyword        Identifier
-hi! def link i3ConfigFocusWrappingKeyword            Identifier
-hi! def link i3ConfigForceXineramaKeyword            Identifier
-hi! def link i3ConfigAutomaticSwitchKeyword          Identifier
-hi! def link i3ConfigDelayUrgencyKeyword             Identifier
-hi! def link i3ConfigFocusOnActivationKeyword        Identifier
-hi! def link i3ConfigDrawingMarksKeyword             Identifier
-hi! def link i3ConfigBlockKeyword                    Identifier
-hi! def link i3ConfigVariable                        Statement
-hi! def link i3ConfigArbitraryCommand                Type
-
-let b:current_syntax = "i3config"
diff --git a/syntax/just.vim b/syntax/just.vim
new file mode 100644
index 000000000..4d6d538e4
--- /dev/null
+++ b/syntax/just.vim
@@ -0,0 +1,128 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'just', 'syntax/just.vim')
+  finish
+endif
+
+" Vim syntax file
+" Language:	Justfile
+" Maintainer:	Noah Bogart <noah.bogart@hey.com>
+" URL:		https://github.com/NoahTheDuke/vim-just.git
+" Last Change:	2021 May 19
+
+if exists('b:current_syntax')
+  finish
+endif
+
+let b:current_syntax = 'just'
+syntax sync minlines=20 maxlines=200
+
+syntax match justNoise ","
+
+syntax match justComment "\v#.*$" contains=@Spell
+syntax match justName "[a-zA-Z_][a-zA-Z0-9_-]*" contained
+syntax match justFunction "[a-zA-Z_][a-zA-Z0-9_-]*" contained
+
+syntax region justBacktick start=/`/ skip=/\./ end=/`/ contains=justInterpolation
+syntax region justRawString start=/'/ skip=/\./ end=/'/ contains=justInterpolation
+syntax region justString start=/"/ skip=/\./ end=/"/ contains=justInterpolation
+syntax cluster justAllStrings contains=justBacktick,justRawString,justString
+
+syntax match justAssignmentOperator ":=" contained
+
+syntax match justParameterOperator "=" contained
+syntax match justVariadicOperator "*\|+\|\$" contained
+syntax match justParameter "\v\s\zs%(\*|\+|\$)?[a-zA-Z_][a-zA-Z0-9_-]*\ze\=?" contained contains=justVariadicOperator,justParameterOperator
+
+syntax match justNextLine "\\\n\s*"
+syntax match justRecipeAt "^@" contained
+syntax match justRecipeColon "\v:" contained
+
+syntax region justRecipe
+      \ matchgroup=justRecipeBody start="\v^\@?[a-zA-Z_]((:\=)@!.)*\ze:%(\s|\n)"
+      \ matchgroup=justRecipeDeps end="\v:\zs.*\n"
+      \ contains=justFunction,justRecipeColon
+
+syntax match justRecipeBody "\v^\@?[a-zA-Z_]((:\=)@!.)*\ze:%(\s|\n)"
+      \ contains=justRecipeAt,justRecipeColon,justParameter,justParameterOperator,justVariadicOperator,@justAllStrings,justComment
+
+syntax match justRecipeDeps "\v:[^\=]?.*\n"
+      \ contains=justComment,justFunction,justRecipeColon
+
+syntax match justBoolean "\v(true|false)" contained
+syntax match justKeywords "\v%(export|set)" contained
+
+syntax match justAssignment "\v^[a-zA-Z_][a-zA-Z0-9_-]*\s+:\=" transparent contains=justAssignmentOperator
+
+syntax match justSetKeywords "\v%(dotenv-load|export|positional-arguments|shell)" contained
+syntax match justSetDefinition "\v^set\s+%(dotenv-load|export|positional-arguments)%(\s+:\=\s+%(true|false))?$"
+      \ contains=justSetKeywords,justKeywords,justAssignmentOperator,justBoolean
+      \ transparent
+
+syntax match justSetBraces "\v[\[\]]" contained
+syntax region justSetDefinition
+      \ start="\v^set\s+shell\s+:\=\s+\["
+      \ end="]"
+      \ contains=justSetKeywords,justKeywords,justAssignmentOperator,@justAllStrings,justNoise,justSetBraces
+      \ transparent skipwhite oneline
+
+syntax region justAlias
+      \ matchgroup=justAlias start="\v^alias\ze\s+[a-zA-Z_][a-zA-Z0-9_-]*\s+:\="
+      \ end="$"
+      \ contains=justKeywords,justFunction,justAssignmentOperator
+      \ oneline skipwhite
+
+syntax region justExport
+      \ matchgroup=justExport start="\v^export\ze\s+[a-zA-Z_][a-zA-Z0-9_-]*%(\s+:\=)?"
+      \ end="$"
+      \ contains=justKeywords,justAssignmentOperator
+      \ transparent oneline skipwhite
+
+syntax keyword justConditional if else
+syntax region justConditionalBraces start="\v[^{]\{[^{]" end="}" contained oneline contains=ALLBUT,justConditionalBraces,justBodyText
+
+syntax match justBodyText "[^[:space:]#]\+" contained
+syntax match justLineLeadingSymbol "\v^\s+\zs%(\@|-)" contained
+syntax match justLineContinuation "\\$" contained
+
+syntax region justBody transparent matchgroup=justLineLeadingSymbol start="\v^\s+\zs[@-]"hs=e-1 matchgroup=justBodyText start="\v^\s+\zs[^[:space:]@#-]"hs=e-1 end="\n" skipwhite oneline contains=justInterpolation,justBodyText,justLineLeadingSymbol,justLineContinuation,justComment
+
+syntax region justInterpolation start="{{" end="}}" contained contains=ALLBUT,justInterpolation,justFunction,justBodyText
+
+syntax match justBuiltInFunctionParens "[()]" contained
+syntax match justBuiltInFunctions "\v%(arch|os|os_family|invocation_directory|justfile|justfile_directory|just_executable)\ze\(\)" contains=justBuiltInFunctions
+syntax region justBuiltInFunctions transparent matchgroup=justBuiltInFunctions start="\v%(env_var_or_default|env_var)\ze\(" end=")" oneline contains=@justAllStrings,justBuiltInFunctionParens,justNoise
+
+syntax match justBuiltInFunctionsError "\v%(arch|os|os_family|invocation_directory|justfile|justfile_directory|just_executable)\(.+\)"
+
+syntax match justOperator "\v%(\=\=|!\=|\+)"
+
+highlight default link justAlias                 Keyword
+highlight default link justAssignmentOperator    Operator
+highlight default link justBacktick              String
+highlight default link justBodyText              Constant
+highlight default link justBoolean               Boolean
+highlight default link justBuiltInFunctions      Function
+highlight default link justBuiltInFunctionsError Error
+highlight default link justBuiltInFunctionParens Delimiter
+highlight default link justComment               Comment
+highlight default link justConditional           Conditional
+highlight default link justConditionalBraces     Delimiter
+highlight default link justExport                Keyword
+highlight default link justFunction              Function
+highlight default link justInterpolation         Delimiter
+highlight default link justKeywords              Keyword
+highlight default link justLineContinuation      Special
+highlight default link justLineLeadingSymbol     Special
+highlight default link justName                  Identifier
+highlight default link justNextLine              Special
+highlight default link justOperator              Operator
+highlight default link justParameter             Identifier
+highlight default link justParameterOperator     Operator
+highlight default link justRawString             String
+highlight default link justRecipe                Function
+highlight default link justRecipeAt              Special
+highlight default link justRecipeBody            Function
+highlight default link justRecipeColon           Operator
+highlight default link justSetDefinition         Keyword
+highlight default link justSetKeywords           Keyword
+highlight default link justString                String
+highlight default link justVariadicOperator      Operator
diff --git a/syntax/sway.vim b/syntax/sway.vim
deleted file mode 100644
index 5ca755c1c..000000000
--- a/syntax/sway.vim
+++ /dev/null
@@ -1,133 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'sway', 'syntax/sway.vim')
-  finish
-endif
-
-" Vim syntax file
-" Language: sway-wm config file
-" Maintainer: Aaron Ouellette
-" Latest Revision: 11 June 2016
-
-if exists("b:current_syntax")
-  finish
-endif
-
-" Symbols
-syn match   swayOperators "+\|→"
-syn match   swayChainDelimiter ";"
-
-syn match   swayVar "\$\w\+"
-
-" Key modifiers
-syn keyword swayKeyModifier Shift Control Ctrl Mod1 Mod2 Mod3 Mod4 Mod5 Mode_switch
-
-" Strings
-syn region  swaySimpleString keepend start='[^ \t]' end='$\|;' contained contains=swayChainDelimiter,swayVar
-syn match   swayQuotedString '"[^"]\+"' contained
-syn cluster swayString contains=swaySimpleString,swayQuotedString
-
-" Config commands
-syn keyword swayConfigCommand bind bindcode bindsym assign new_window popup_during_fullscreen font floating_modifier default_orientation workspace_layout for_window focus_follows_mouse bar position colors output input workspace_buttons workspace_auto_back_and_forth binding_mode_indicator debuglog floating_minimum_size floating_maximum_size force_focus_wrapping force_display_urgency_hint hidden_state modifier new_float socket_path mouse_warping strip_workspace_numbers focus_on_window_activation no_focus include gaps
-syn match   swayIpcSocket "ipc[-_]socket" nextgroup=@swayString skipwhite
-
-" Command keywords
-syn keyword swayCommand exit reload restart kill fullscreen global layout border focus move open split append_layout mark unmark resize grow shrink show nop rename title_format sticky
-syn keyword swayParam 1pixel default stacked tabbed normal none tiling stacking floating enable disable up down horizontal vertical auto up down left right parent child px or ppt leave_fullscreen toggle mode_toggle scratchpad width height top bottom client hide primary yes all active window container to absolute center on off x ms h v smart ignore pixel splith splitv output true
-syn match   swayDashedParam '--\(release\|border\|whole-window\|toggle\)' skipwhite
-syn keyword swayWsSpecialParam next prev next_on_output prev_on_output back_and_forth current number
-syn keyword swayBordersSpecialParam none vertical horizontal both
-syn keyword swayModeParam dock hide invisible skipwhite
-
-" these are not keywords but we add them for consistency
-syn keyword swayPseudoParam no false inactive
-
-" Exec commands
-syn region  swayExecCommand keepend start='[^ \t]' end='$\|;' contained contains=swayChainDelimiter,swayVar,swayNoStartupId
-syn match   swayQuotedExecCommand '"[^"]\+"' contained
-syn keyword swayExecKeyword exec exec_always swaybar_command nextgroup=swayQuotedExecCommand,swayExecCommand skipwhite
-
-" Status command
-syn match   swayStatusCommand ".*$" contained
-syn keyword swayStatusCommandKeyword status_command nextgroup=swayStatusCommand skipwhite
-
-" Font statement
-syn keyword swayFontStatement font nextgroup=@swayString skipwhite
-
-" Separator symbol
-syn keyword swaySeparatorSymbol separator_symbol nextgroup=@swayString skipwhite
-
-" Set statement
-syn match   swaySetVar "\$\w\+" contained nextgroup=@swayString skipwhite
-syn keyword swaySetKeyword set nextgroup=swaySetVar skipwhite
-
-" Workspaces
-syn keyword swayWsKeyword workspace nextgroup=swayWsSpecialParam,@swayString skipwhite
-
-" Hide edge borders
-syn keyword swayBordersConfigCommand hide_edge_borders nextgroup=swayBordersSpecialParam skipwhite
-
-" Mode
-syn keyword swayModeKeyword mode nextgroup=swayModeParam,@swayString skipwhite
-
-" Comments
-syn keyword swayTodo contained TODO FIXME XXX NOTE
-syn match   swayComment "^\s*#.*$" contains=swayTodo
-
-" Error (at end of line)
-syn match swayError ".*$" contained
-
-" Hex color code
-syn match swayColorLast "#[0-9a-fA-F]\{6\}" contained nextgroup=swayError skipwhite
-syn match swayColor2nd "#[0-9a-fA-F]\{6\}" contained nextgroup=swayColorLast skipwhite
-syn match swayColor1st "#[0-9a-fA-F]\{6\}" contained nextgroup=swayColor2nd skipwhite
-
-syn match swayColorDef1 "client\.background\|statusline\|background\|separator\|statusline" nextgroup=swayColorLast skipwhite
-syn match swayColorDef3 "client\.\(focused_inactive\|focused\|unfocused\|urgent\)\|inactive_workspace\|urgent_workspace\|focused_workspace\|active_workspace" nextgroup=swayColor1st skipwhite
-
-highlight link swayChainDelimiter       Operator
-highlight link swayOperators            Operator
-
-highlight link swayExecCommand          Special
-highlight link swayQuotedExecCommand    Special
-highlight link swayStatusCommand        Special
-
-highlight link swayParam                Constant
-highlight link swayPseudoParam          Constant
-highlight link swayDashedParam          Constant
-highlight link swayNoStartupId          Constant
-highlight link swayColor1st             Constant
-highlight link swayColor2nd             Constant
-highlight link swayColorLast            Constant
-highlight link swayWsSpecialParam       Constant
-highlight link swayBordersSpecialParam  Constant
-highlight link swayModeParam            Constant
-
-highlight link swayVar                  Identifier
-highlight link swaySetVar               Identifier
-
-highlight link swayKeyModifier          Function
-
-highlight link swaySimpleString         String
-highlight link swayQuotedString         String
-highlight link swayWsName               String
-highlight link swayQuotedWsName         String
-highlight link swaySetValue             String
-highlight link swayFont                 String
-
-highlight link swayExecKeyword          Keyword
-highlight link swayCommand              Keyword
-highlight link swayWsKeyword            Keyword
-
-highlight link swayColorDef1            Define
-highlight link swayColorDef3            Define
-highlight link swayConfigCommand        Define
-highlight link swayIpcSocket            Define
-highlight link swaySetKeyword           Define
-highlight link swayModeKeyword          Define
-highlight link swayFontStatement        Define
-highlight link swaySeparatorSymbol      Define
-highlight link swayStatusCommandKeyword Define
-highlight link swayBordersConfigCommand Define
-
-highlight link swayTodo                 Todo
-highlight link swayComment              Comment
-highlight link swayError                Error
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index ba1c1dec3..69f9269bb 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -121,7 +121,6 @@ call TestFiletype('hxml')
 call TestFiletype('hss')
 call TestFiletype('hcl')
 call TestFiletype('hive')
-call TestFiletype('i3config')
 call TestFiletype('icalendar')
 call TestFiletype('idris')
 call TestFiletype('idris2')
@@ -649,7 +648,8 @@ call TestFiletype('mint')
 call TestFiletype('jsonc')
 call TestFiletype('gleam')
 call TestFiletype('hjson')
-call TestFiletype('sway')
+call TestFiletype('i3config')
+call TestFiletype('just')
 call TestFiletype('nftables')
 call TestFiletype('openscad')
 

From 3e71cdad56bdd2b1af812f63f6eca856ac6c1984 Mon Sep 17 00:00:00 2001
From: Keito <audioactivist@gmail.com>
Date: Wed, 9 Jun 2021 20:13:18 +0100
Subject: [PATCH 265/299] Fixed typo in README.md (#719)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ebdd5c914..1f182c335 100644
--- a/README.md
+++ b/README.md
@@ -245,7 +245,7 @@ let g:polyglot_disabled = ['autoindent']
 
 ## Reindent
 
-If you want to disable reindening of the current line in insert mode (see vim 'indentkeys') you can turn it off with:
+If you want to disable reindenting of the current line in insert mode (see vim 'indentkeys') you can turn it off with:
 
 ```vim
 autocmd BufEnter * set indentexpr=

From c6f9e5b2117380b67de5bb4502bf4053378ac3c9 Mon Sep 17 00:00:00 2001
From: Marcos Ferreira <mracos@users.noreply.github.com>
Date: Wed, 9 Jun 2021 16:21:38 -0300
Subject: [PATCH 266/299] Add mermaid (#721)

Co-authored-by: Adam Stankiewicz <sheerun@sher.pl>
---
 README.md                    |  3 ++-
 autoload/polyglot/init.vim   | 12 ++++++++++++
 autoload/polyglot/sleuth.vim |  3 ++-
 packages.yaml                | 10 +++++++++-
 tests/filetypes.vim          |  4 ++++
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 1f182c335..0330742eb 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->605<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->607<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -129,6 +129,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [markdown](https://github.com/plasticboy/vim-markdown) (Markdown syntax highlighting for md, markdown, mdown, mdwn, mkd, mkdn, mkdown, ronn, scd and workbook files)
 - [mathematica](https://github.com/voldikss/vim-mma) (Mathematica syntax highlighting for mathematica, cdf, m, ma, mt and 6 more files)
 - [mdx](https://github.com/jxnblk/vim-mdx-js) (Syntax highlighting for mdx files)
+- [mermaid](https://github.com/mracos/mermaid.vim) (Syntax highlighting for mermaid, mm and mmd files)
 - [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim) (Meson syntax highlighting for wrap files)
 - [mint](https://github.com/IrenejMarc/vim-mint) (Syntax highlighting for mint files)
 - [moonscript](https://github.com/leafo/moonscript-vim) (MoonScript syntax highlighting for moon files)
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 536b7dce7..07d186975 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -169,6 +169,10 @@ let did_load_filetypes = 1
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(g:polyglot_is_disabled, 'mermaid')
+  au BufNewFile,BufRead *.mermaid,*.mm,*.mmd setf mermaid
+endif
+
 if !has_key(g:polyglot_is_disabled, 'openscad')
   au BufNewFile,BufRead *.scad setf openscad
 endif
@@ -2297,6 +2301,14 @@ if !has_key(g:polyglot_is_disabled, 'icalendar')
   au BufNewFile,BufRead *.ics setf icalendar
 endif
 
+if !has_key(g:polyglot_is_disabled, 'i3')
+  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config setf i3config
+endif
+
+if !has_key(g:polyglot_is_disabled, 'sway')
+  au BufNewFile,BufRead *.i3.config,*.i3config,*.sway.config,*.swayconfig,*sway/config,i3.config,sway.config setf i3config
+endif
+
 if !has_key(g:polyglot_is_disabled, 'hive')
   au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
 endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 648939598..ce1d135c4 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -236,8 +236,8 @@ let s:globs = {
   \ 'htmldjango': '*.jinja,*.j2,*.jinja2',
   \ 'htmlm4': '*.html.m4',
   \ 'httest': '*.htt,*.htb',
+  \ 'i3config': '*.i3config,*.i3.config,*.swayconfig,*.sway.config,i3.config,sway.config,i3config,.i3.config,.i3config',
   \ 'hxml': '*.hxml',
-  \ 'i3config': '*.i3config,*.i3.config,*.swayconfig,*.sway.config,i3.config,sway.config',
   \ 'ibasic': '*.iba,*.ibi',
   \ 'icalendar': '*.ics',
   \ 'icemenu': '',
@@ -328,6 +328,7 @@ let s:globs = {
   \ 'mason': '*.mason,*.mhtml,*.comp',
   \ 'master': '*.mas,*.master',
   \ 'mel': '*.mel',
+  \ 'mermaid': '*.mermaid,*.mm,*.mmd',
   \ 'meson': 'meson.build,meson_options.txt',
   \ 'messages': '',
   \ 'mf': '*.mf',
diff --git a/packages.yaml b/packages.yaml
index cd65118b6..e272a2e2a 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5604,4 +5604,12 @@ filetypes:
 - name: openscad
   patterns:
   - pattern: '*.scad'
-    description: OpenSCAD 3D modeling language
\ No newline at end of file
+    description: OpenSCAD 3D modeling language
+---
+name: mermaid
+remote: mracos/mermaid.vim
+filetypes:
+- name: mermaid
+  patterns:
+  - pattern: '*.mermaid,*.mm,*.mmd'
+    description: Mermaid (https://mermaid-js.github.io/)
\ No newline at end of file
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 69f9269bb..e4a4ef835 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -121,6 +121,7 @@ call TestFiletype('hxml')
 call TestFiletype('hss')
 call TestFiletype('hcl')
 call TestFiletype('hive')
+call TestFiletype('i3config')
 call TestFiletype('icalendar')
 call TestFiletype('idris')
 call TestFiletype('idris2')
@@ -648,6 +649,9 @@ call TestFiletype('mint')
 call TestFiletype('jsonc')
 call TestFiletype('gleam')
 call TestFiletype('hjson')
+call TestFiletype('just')
+call TestFiletype('nftables')
+call TestFiletype('mermaid')
 call TestFiletype('i3config')
 call TestFiletype('just')
 call TestFiletype('nftables')

From 4f997c5c82d49ce3e2791eb0679e992751bf39a7 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 21:22:48 +0200
Subject: [PATCH 267/299] Update

---
 README.md                    | 2 +-
 autoload/polyglot/init.vim   | 8 --------
 autoload/polyglot/sleuth.vim | 2 +-
 tests/filetypes.vim          | 5 +----
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 0330742eb..a483201c4 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->607<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->606<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 07d186975..781c9e57a 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -2301,14 +2301,6 @@ if !has_key(g:polyglot_is_disabled, 'icalendar')
   au BufNewFile,BufRead *.ics setf icalendar
 endif
 
-if !has_key(g:polyglot_is_disabled, 'i3')
-  au BufNewFile,BufRead *.i3.config,*.i3config,{.,}i3.config,{.,}i3config,i3.config,i3config setf i3config
-endif
-
-if !has_key(g:polyglot_is_disabled, 'sway')
-  au BufNewFile,BufRead *.i3.config,*.i3config,*.sway.config,*.swayconfig,*sway/config,i3.config,sway.config setf i3config
-endif
-
 if !has_key(g:polyglot_is_disabled, 'hive')
   au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
 endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index ce1d135c4..095be9107 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -236,8 +236,8 @@ let s:globs = {
   \ 'htmldjango': '*.jinja,*.j2,*.jinja2',
   \ 'htmlm4': '*.html.m4',
   \ 'httest': '*.htt,*.htb',
-  \ 'i3config': '*.i3config,*.i3.config,*.swayconfig,*.sway.config,i3.config,sway.config,i3config,.i3.config,.i3config',
   \ 'hxml': '*.hxml',
+  \ 'i3config': '*.i3config,*.i3.config,*.swayconfig,*.sway.config,i3.config,sway.config',
   \ 'ibasic': '*.iba,*.ibi',
   \ 'icalendar': '*.ics',
   \ 'icemenu': '',
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index e4a4ef835..091151fbd 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -121,7 +121,6 @@ call TestFiletype('hxml')
 call TestFiletype('hss')
 call TestFiletype('hcl')
 call TestFiletype('hive')
-call TestFiletype('i3config')
 call TestFiletype('icalendar')
 call TestFiletype('idris')
 call TestFiletype('idris2')
@@ -649,13 +648,11 @@ call TestFiletype('mint')
 call TestFiletype('jsonc')
 call TestFiletype('gleam')
 call TestFiletype('hjson')
-call TestFiletype('just')
-call TestFiletype('nftables')
-call TestFiletype('mermaid')
 call TestFiletype('i3config')
 call TestFiletype('just')
 call TestFiletype('nftables')
 call TestFiletype('openscad')
+call TestFiletype('mermaid')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 

From 4899585281beab51e5dff1d9ae4d3159244a8275 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 9 Jun 2021 21:37:56 +0200
Subject: [PATCH 268/299] Add org mode, close #706

---
 README.md                    |   3 +-
 autoload/org.vim             |  30 ++++++++
 autoload/polyglot/init.vim   |   4 +
 autoload/polyglot/sleuth.vim |   1 +
 ftplugin/org.vim             |  28 +++++++
 ftplugin/outline.vim         |  23 ++++++
 packages.yaml                |  10 ++-
 syntax/org.vim               | 145 +++++++++++++++++++++++++++++++++++
 syntax/outline.vim           |  43 +++++++++++
 tests/filetypes.vim          |   1 +
 10 files changed, 286 insertions(+), 2 deletions(-)
 create mode 100644 autoload/org.vim
 create mode 100644 ftplugin/org.vim
 create mode 100644 ftplugin/outline.vim
 create mode 100644 syntax/org.vim
 create mode 100644 syntax/outline.vim

diff --git a/README.md b/README.md
index a483201c4..8ac2f5ca4 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->606<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->607<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -143,6 +143,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [odin](https://github.com/Tetralux/odin.vim) (Odin syntax highlighting for odin files)
 - [opencl](https://github.com/petRUShka/vim-opencl) (OpenCL syntax highlighting for cl and opencl files)
 - [openscad](https://github.com/sirtaj/vim-openscad) (Syntax highlighting for scad files)
+- [org](https://github.com/axvr/org.vim) (Syntax highlighting for org files)
 - [perl](https://github.com/vim-perl/vim-perl) (Perl syntax highlighting for pl, al, cgi, fcgi, perl and 12 more files)
 - [pest](https://github.com/pest-parser/pest.vim) (Syntax highlighting for pest files)
 - [pgsql](https://github.com/lifepillar/pgsql.vim) (PLpgSQL syntax highlighting for pgsql files)
diff --git a/autoload/org.vim b/autoload/org.vim
new file mode 100644
index 000000000..de8282c23
--- /dev/null
+++ b/autoload/org.vim
@@ -0,0 +1,30 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'org', 'autoload/org.vim')
+  finish
+endif
+
+" Helper functions for org.vim
+"
+" Maintainer:   Alex Vear <av@axvr.io>
+" License:      Vim (see `:help license`)
+" Location:     autoload/org.vim
+" Website:      https://github.com/axvr/org.vim
+" Last Change:  2020-01-04
+
+" Fallback chain for options. Buffer local --> Global --> default.
+function org#option(name, default) abort
+    return get(b:, a:name, get(g:, a:name, a:default))
+endfunction
+
+" Emacs-like fold text.
+function org#fold_text() abort
+    return getline(v:foldstart) . '...'
+endfunction
+
+" Check fold depth of a line.
+function org#fold_expr()
+    let l:depth = match(getline(v:lnum), '\(^\*\+\)\@<=\( .*$\)\@=')
+    if l:depth > 0 && synIDattr(synID(v:lnum, 1, 1), 'name') =~# '\m^o\(rg\|utline\)Heading'
+        return ">" . l:depth
+    endif
+    return "="
+endfunction
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 781c9e57a..7aa949395 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -169,6 +169,10 @@ let did_load_filetypes = 1
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(g:polyglot_is_disabled, 'org')
+  au BufNewFile,BufRead *.org setf org
+endif
+
 if !has_key(g:polyglot_is_disabled, 'mermaid')
   au BufNewFile,BufRead *.mermaid,*.mm,*.mmd setf mermaid
 endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 095be9107..0785dfbf0 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -388,6 +388,7 @@ let s:globs = {
   \ 'openscad': '*.scad',
   \ 'opl': '*.[Oo][Pp][Ll]',
   \ 'ora': '*.ora',
+  \ 'org': '*.org',
   \ 'pamconf': '',
   \ 'pamenv': 'pam_env.conf,.pam_environment',
   \ 'papp': '*.papp,*.pxml,*.pxsl',
diff --git a/ftplugin/org.vim b/ftplugin/org.vim
new file mode 100644
index 000000000..127110883
--- /dev/null
+++ b/ftplugin/org.vim
@@ -0,0 +1,28 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'org', 'ftplugin/org.vim')
+  finish
+endif
+
+" Vim filetype plugin for GNU Emacs' Org mode
+"
+" Maintainer:   Alex Vear <av@axvr.io>
+" License:      Vim (see `:help license`)
+" Location:     ftplugin/org.vim
+" Website:      https://github.com/axvr/org.vim
+" Last Change:  2020-01-04
+"
+" Reference Specification: Org mode manual
+"   GNU Info: `$ info Org`
+"   Web: <https://orgmode.org/manual/index.html>
+
+setlocal commentstring=#%s
+setlocal comments=fb:*,fb:-,fb:+,b:#,b:\:
+setlocal formatoptions+=ncqlt
+let &l:formatlistpat = '^\s*\(\d\+[.)]\|[+-]\)\s\+'
+
+setlocal foldexpr=org#fold_expr()
+setlocal foldmethod=expr
+
+if org#option('org_clean_folds', 0)
+    setlocal foldtext=org#fold_text()
+    setlocal fillchars-=fold:-
+endif
diff --git a/ftplugin/outline.vim b/ftplugin/outline.vim
new file mode 100644
index 000000000..4f0bbd65f
--- /dev/null
+++ b/ftplugin/outline.vim
@@ -0,0 +1,23 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'org', 'ftplugin/outline.vim')
+  finish
+endif
+
+" Vim filetype plugin for GNU Emacs' Outline mode
+"
+" Maintainer:   Alex Vear <av@axvr.io>
+" License:      Vim (see `:help license`)
+" Location:     ftplugin/outline.vim
+" Website:      https://github.com/axvr/org.vim
+" Last Change:  2020-01-04
+"
+" Reference Specification: GNU Emacs Manual, section 'Outline Mode'
+"   GNU Info: `$ info Emacs Outline Mode`
+"   Web: <https://www.gnu.org/software/emacs/manual/html_node/emacs/Outline-Mode.html>
+
+setlocal foldexpr=org#fold_expr()
+setlocal foldmethod=expr
+
+if org#option('org_clean_folds', 0)
+    setlocal foldtext=org#fold_text()
+    setlocal fillchars-=fold:-
+endif
diff --git a/packages.yaml b/packages.yaml
index e272a2e2a..f76f522c7 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5612,4 +5612,12 @@ filetypes:
 - name: mermaid
   patterns:
   - pattern: '*.mermaid,*.mm,*.mmd'
-    description: Mermaid (https://mermaid-js.github.io/)
\ No newline at end of file
+    description: Mermaid (https://mermaid-js.github.io/)
+---
+name: org
+remote: axvr/org.vim
+filetypes:
+- name: org
+  patterns:
+  - pattern: '*.org'
+    description: GNU Emacs' Org mode
diff --git a/syntax/org.vim b/syntax/org.vim
new file mode 100644
index 000000000..de879a6f8
--- /dev/null
+++ b/syntax/org.vim
@@ -0,0 +1,145 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'org', 'syntax/org.vim')
+  finish
+endif
+
+" Vim syntax file for GNU Emacs' Org mode
+"
+" Maintainer:   Alex Vear <av@axvr.io>
+" License:      Vim (see `:help license`)
+" Location:     syntax/org.vim
+" Website:      https://github.com/axvr/org.vim
+" Last Change:  2020-01-05
+"
+" Reference Specification: Org mode manual
+"   GNU Info: `$ info Org`
+"   Web: <https://orgmode.org/manual/index.html>
+
+if exists('b:current_syntax') && b:current_syntax !=# 'outline'
+    finish
+endif
+
+" Enable spell check for non syntax highlighted text
+syntax spell toplevel
+
+
+" Bold, underine, italic, etc.
+syntax region orgItalic        matchgroup=orgItalicDelimiter        start="\(^\|[- '"({\]]\)\@<=\/\ze[^ ]" end="^\@!\/\([^\k\/]\|$\)\@=" keepend contains=@Spell
+syntax region orgBold          matchgroup=orgBoldDelimiter          start="\(^\|[- '"({\]]\)\@<=\*\ze[^ ]" end="^\@!\*\([^\k\*]\|$\)\@=" keepend contains=@Spell
+syntax region orgUnderline     matchgroup=orgUnderlineDelimiter     start="\(^\|[- '"({\]]\)\@<=_\ze[^ ]"  end="^\@!_\([^\k_]\|$\)\@="   keepend contains=@Spell
+syntax region orgStrikethrough matchgroup=orgStrikethroughDelimiter start="\(^\|[ '"({\]]\)\@<=+\ze[^ ]"   end="^\@!+\([^\k+]\|$\)\@="   keepend contains=@Spell
+
+if org#option('org_use_italics', 1)
+    highlight def orgItalic term=italic cterm=italic gui=italic
+else
+    highlight def orgItalic term=none cterm=none gui=none
+endif
+
+highlight def orgBold term=bold cterm=bold gui=bold
+highlight def orgUnderline term=underline cterm=underline gui=underline
+highlight def orgStrikethrough term=strikethrough cterm=strikethrough gui=strikethrough
+highlight def link orgBoldDelimiter orgBold
+highlight def link orgUnderlineDelimiter orgUnderline
+highlight def link orgStrikethroughDelimiter orgStrikethrough
+
+
+" Options
+syntax match  orgOption /^\s*#+\w\+.*$/ keepend
+syntax region orgTitle matchgroup=orgOption start="\c^\s*#+TITLE:\s*" end="$" keepend oneline
+highlight def link orgBlockDelimiter SpecialComment
+highlight def link orgOption SpecialComment
+highlight def link orgTitle Title
+
+
+" Code and vervatim text
+syntax region orgCode     matchgroup=orgCodeDelimiter     start="\(^\|[- '"({\]]\)\@<=\~\ze[^ ]" end="^\@!\~\([^\k\~]\|$\)\@=" keepend
+syntax region orgVerbatim matchgroup=orgVerbatimDelimiter start="\(^\|[- '"({\]]\)\@<==\ze[^ ]"  end="^\@!=\([^\k=]\|$\)\@="   keepend
+syntax match  orgVerbatim /^\s*: .*$/ keepend
+syntax region orgVerbatim matchgroup=orgBlockDelimiter start="\c^\s*#+BEGIN_.*"      end="\c^\s*#+END_.*"      keepend
+syntax region orgCode     matchgroup=orgBlockDelimiter start="\c^\s*#+BEGIN_SRC"     end="\c^\s*#+END_SRC"     keepend
+syntax region orgCode     matchgroup=orgBlockDelimiter start="\c^\s*#+BEGIN_EXAMPLE" end="\c^\s*#+END_EXAMPLE" keepend
+
+highlight def link orgVerbatim Identifier
+highlight def link orgVerbatimDelimiter orgVerbatim
+highlight def link orgCode Statement
+highlight def link orgCodeDelimiter orgCode
+
+
+" Comments
+syntax match  orgComment /^\s*#\s\+.*$/ keepend
+syntax region orgComment matchgroup=orgBlockDelimiter start="\c^\s*#+BEGIN_COMMENT" end="\c^\s*#+END_COMMENT" keepend
+highlight def link orgComment Comment
+
+
+" Headings
+syntax match orgHeading1 /^\s*\*\{1}\s\+.*$/ keepend contains=@Spell,orgTag,orgTodo,orgMath
+syntax match orgHeading2 /^\s*\*\{2}\s\+.*$/ keepend contains=@Spell,orgTag,orgTodo,orgMath
+syntax match orgHeading3 /^\s*\*\{3}\s\+.*$/ keepend contains=@Spell,orgTag,orgTodo,orgMath
+syntax match orgHeading4 /^\s*\*\{4}\s\+.*$/ keepend contains=@Spell,orgTag,orgTodo,orgMath
+syntax match orgHeading5 /^\s*\*\{5}\s\+.*$/ keepend contains=@Spell,orgTag,orgTodo,orgMath
+syntax match orgHeading6 /^\s*\*\{6,}\s\+.*$/ keepend contains=@Spell,orgTag,orgTodo,orgMath
+
+syntax cluster orgHeadingGroup contains=orgHeading1,orgHeading2,orgHeading3,orgHeading4,orgHeading5,orgHeading6
+
+syntax match orgTag /:\w\{-}:/ contained contains=orgTag
+exec 'syntax keyword orgTodo contained ' . join(org#option('org_state_keywords', ['TODO', 'NEXT', 'DONE']), ' ')
+
+highlight def link orgHeading1 Title
+highlight def link orgHeading2 orgHeading1
+highlight def link orgHeading3 orgHeading2
+highlight def link orgHeading4 orgHeading3
+highlight def link orgHeading5 orgHeading4
+highlight def link orgHeading6 orgHeading5
+highlight def link orgTodo Todo
+highlight def link orgTag Type
+
+
+" Lists
+syntax match orgUnorderedListMarker "^\s*[-+]\s\+" keepend contains=@Spell
+syntax match orgOrderedListMarker "^\s*\d\+[.)]\s\+" keepend contains=@Spell
+if org#option('org_list_alphabetical_bullets', 0)
+    syntax match orgOrderedListMarker "^\s*\a[.)]\s\+" keepend contains=@Spell
+endif
+highlight def link orgUnorderedListMarker Statement
+highlight def link orgOrderedListMarker orgUnorderedListMarker
+
+
+" Timestamps
+syntax match orgTimestampActive /<\d\{4}-\d\{2}-\d\{2}.\{-}>/ keepend
+syntax match orgTimestampInactive /\[\d\{4}-\d\{2}-\d\{2}.\{-}\]/ keepend
+highlight def link orgTimestampActive Operator
+highlight def link orgTimestampInactive Comment
+
+
+" Hyperlinks
+syntax match orgHyperlink /\[\{2}\([^][]\{-1,}\]\[\)\?[^][]\{-1,}\]\{2}/ containedin=ALL contains=orgHyperLeft,orgHyperRight,orgHyperURL
+syntax match orgHyperLeft /\[\{2}/ contained conceal
+syntax match orgHyperRight /\]\{2}/ contained conceal
+syntax match orgHyperURL /[^][]\{-1,}\]\[/ contains=orgHyperCentre contained conceal
+syntax match orgHyperCentre /\]\[/ contained conceal
+
+syntax cluster orgHyperlinkBracketsGroup contains=orgHyperLeft,orgHyperRight,orgHyperCentre
+syntax cluster orgHyperlinkGroup contains=orgHyperlink,orgHyperURL,orgHyperlinkBracketsGroup
+
+highlight def link orgHyperlink Underlined
+highlight def link orgHyperURL String
+highlight def link orgHyperCentre Comment
+highlight def link orgHyperLeft Comment
+highlight def link orgHyperRight Comment
+
+
+" TeX
+"   Ref: https://orgmode.org/manual/LaTeX-fragments.html
+if org#option('org_highlight_tex', 1)
+    syntax include @LATEX syntax/tex.vim
+    syntax region orgMath start="\\begin\[.*\]{.*}"  end="\\end{.*}"         keepend contains=@LATEX
+    syntax region orgMath start="\\begin{.*}"        end="\\end{.*}"         keepend contains=@LATEX
+    syntax region orgMath start="\\\["               end="\\\]"              keepend contains=@LATEX
+    syntax region orgMath start="\\("                end="\\)"               keepend contains=@LATEX
+    syntax region orgMath start="\S\@<=\$\|\$\S\@="  end="\S\@<=\$\|\$\S\@=" keepend oneline contains=@LATEX
+    syntax region orgMath start=/\$\$/               end=/\$\$/              keepend contains=@LATEX
+    syntax match  orgMath /\\\$/ conceal cchar=$
+    highlight def link orgMath String
+endif
+
+
+let b:current_syntax = 'org'
diff --git a/syntax/outline.vim b/syntax/outline.vim
new file mode 100644
index 000000000..749bc8405
--- /dev/null
+++ b/syntax/outline.vim
@@ -0,0 +1,43 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'org', 'syntax/outline.vim')
+  finish
+endif
+
+" Vim syntax file for GNU Emacs' Outline mode
+"
+" Maintainer:   Alex Vear <av@axvr.io>
+" License:      Vim (see `:help license`)
+" Location:     syntax/outline.vim
+" Website:      https://github.com/axvr/org.vim
+" Last Change:  2019-09-28
+"
+" Reference Specification: GNU Emacs Manual, section 'Outline Mode'
+"   GNU Info: `$ info Emacs Outline Mode`
+"   Web: <https://www.gnu.org/software/emacs/manual/html_node/emacs/Outline-Mode.html>
+
+if exists('b:current_syntax')
+    finish
+endif
+
+" Enable spell check for non syntax highlighted text
+syntax spell toplevel
+
+
+" Headings
+syntax match outlineHeading1 /^\s*\*\{1}\s\+.*$/ keepend contains=@Spell
+syntax match outlineHeading2 /^\s*\*\{2}\s\+.*$/ keepend contains=@Spell
+syntax match outlineHeading3 /^\s*\*\{3}\s\+.*$/ keepend contains=@Spell
+syntax match outlineHeading4 /^\s*\*\{4}\s\+.*$/ keepend contains=@Spell
+syntax match outlineHeading5 /^\s*\*\{5}\s\+.*$/ keepend contains=@Spell
+syntax match outlineHeading6 /^\s*\*\{6,}\s\+.*$/ keepend contains=@Spell
+
+syntax cluster outlineHeadingGroup contains=outlineHeading1,outlineHeading2,outlineHeading3,outlineHeading4,outlineHeading5,outlineHeading6
+
+hi def link outlineHeading1 Title
+hi def link outlineHeading2 outlineHeading1
+hi def link outlineHeading3 outlineHeading2
+hi def link outlineHeading4 outlineHeading3
+hi def link outlineHeading5 outlineHeading4
+hi def link outlineHeading6 outlineHeading5
+
+
+let b:current_syntax = 'outline'
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 091151fbd..055824241 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -653,6 +653,7 @@ call TestFiletype('just')
 call TestFiletype('nftables')
 call TestFiletype('openscad')
 call TestFiletype('mermaid')
+call TestFiletype('org')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 

From 4f5388350be1052f610b830c8fce8fbc17370ec6 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 27 Jun 2021 10:07:29 +0200
Subject: [PATCH 269/299] Update

---
 autoload/clojurecomplete.vim |  2 +-
 autoload/elixir/indent.vim   |  6 +++---
 autoload/go/config.vim       | 10 +++++++---
 autoload/org.vim             |  2 +-
 autoload/polyglot/ft.vim     | 11 +++++++++++
 autoload/polyglot/sleuth.vim |  2 +-
 autoload/zig/fmt.vim         | 13 ++++++++++++-
 extras/filetype.vim          | 19 ++++++++++++++++---
 ftplugin/clojure.vim         |  2 +-
 ftplugin/org.vim             |  4 ++--
 ftplugin/outline.vim         |  2 +-
 ftplugin/zig.vim             |  4 +---
 indent/clojure.vim           |  2 +-
 indent/zig.vim               |  4 ++--
 syntax/clojure.vim           |  2 +-
 syntax/elixir.vim            |  6 ++++--
 syntax/julia.vim             |  4 ++--
 syntax/org.vim               |  4 ++--
 syntax/outline.vim           |  4 ++--
 syntax/ruby.vim              |  8 ++++----
 syntax/zig.vim               |  9 ++-------
 21 files changed, 77 insertions(+), 43 deletions(-)

diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index d8f69a22f..ea2de4287 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -4,7 +4,7 @@ endif
 
 " Vim completion script
 " Language:           Clojure
-" Maintainer:         Alex Vear <av@axvr.io>
+" Maintainer:         Alex Vear <alex@vear.uk>
 " Former Maintainers: Sung Pae <self@sungpae.com>
 " URL:                https://github.com/clojure-vim/clojure.vim
 " License:            Vim (see :h license)
diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index 412d2cf55..c9adcd0a1 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -108,7 +108,7 @@ endfunction
 " Returns 0 or 1 based on whether or not the given line number and column
 " number pair is a string or comment
 function! s:is_string_or_comment(line, col)
-  return s:syntax_name(a:line, a:col) =~ '\%(String\|Comment\)'
+  return s:syntax_name(a:line, a:col) =~ '\%(String\|Comment\|CharList\)'
 endfunction
 
 function! s:syntax_name(line, col)
@@ -149,7 +149,7 @@ function! s:find_last_pos(lnum, text, match)
       let peek_match = match(peek, a:match)
       if peek_match == ss_match + 1
         let syng = synIDattr(synID(a:lnum, c + ss_match, 1), 'name')
-        if syng !~ '\%(String\|Comment\)'
+        if syng !~ '\%(String\|Comment\|CharList\)'
           return c + ss_match
         end
       end
@@ -169,7 +169,7 @@ function! elixir#indent#handle_top_of_file(context)
 endfunction
 
 function! elixir#indent#handle_starts_with_string_continuation(context)
-  if s:syntax_name(a:context.lnum, a:context.first_nb_char_idx) =~ '\(String\|Comment\)$'
+  if s:syntax_name(a:context.lnum, a:context.first_nb_char_idx) =~ '\(String\|Comment\|CharList\)$'
     return -2
   else
     return -1
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index d20ead8bb..f7389cdce 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -275,7 +275,7 @@ endfunction
 function! go#config#MetalinterAutosaveEnabled() abort
   let l:default = []
   if get(g:, 'go_metalinter_command', s:default_metalinter) == 'golangci-lint'
-    let l:default = ['govet', 'golint']
+    let l:default = ['govet', 'revive']
   endif
 
   return get(g:, 'go_metalinter_autosave_enabled', l:default)
@@ -284,14 +284,14 @@ endfunction
 function! go#config#MetalinterEnabled() abort
   let l:default = []
   if get(g:, 'go_metalinter_command', s:default_metalinter) == 'golangci-lint'
-    let l:default = ['vet', 'golint', 'errcheck']
+    let l:default = ['vet', 'revive', 'errcheck']
   endif
 
   return get(g:, 'go_metalinter_enabled', l:default)
 endfunction
 
 function! go#config#GolintBin() abort
-  return get(g:, "go_golint_bin", "golint")
+  return get(g:, "go_golint_bin", "revive")
 endfunction
 
 function! go#config#ErrcheckBin() abort
@@ -615,6 +615,10 @@ function! go#config#DebugMappings() abort
   return extend(l:user, l:default, 'keep')
 endfunction
 
+function! go#config#DocBalloon() abort
+  return get(g:, 'go_doc_balloon', 0)
+endfunction
+
 " Set the default value. A value of "1" is a shortcut for this, for
 " compatibility reasons.
 if exists("g:go_gorename_prefill") && g:go_gorename_prefill == 1
diff --git a/autoload/org.vim b/autoload/org.vim
index de8282c23..6e4918f04 100644
--- a/autoload/org.vim
+++ b/autoload/org.vim
@@ -4,7 +4,7 @@ endif
 
 " Helper functions for org.vim
 "
-" Maintainer:   Alex Vear <av@axvr.io>
+" Maintainer:   Alex Vear <alex@vear.uk>
 " License:      Vim (see `:help license`)
 " Location:     autoload/org.vim
 " Website:      https://github.com/axvr/org.vim
diff --git a/autoload/polyglot/ft.vim b/autoload/polyglot/ft.vim
index f872bf9c2..2e4c1f690 100644
--- a/autoload/polyglot/ft.vim
+++ b/autoload/polyglot/ft.vim
@@ -172,6 +172,17 @@ func polyglot#ft#FTent()
   setf dtd
 endfunc
 
+func polyglot#ft#ExCheck()
+  let lines = getline(1, min([line("$"), 100]))
+  if exists('g:filetype_euphoria')
+    exe 'setf ' . g:filetype_euphoria
+  elseif match(lines, '^--\|^ifdef\>\|^include\>') > -1
+    setf euphoria3
+  else
+    setf elixir
+  endif
+endfunc
+
 func polyglot#ft#EuphoriaCheck()
   if exists('g:filetype_euphoria')
     exe 'setf ' . g:filetype_euphoria
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 0785dfbf0..d308561c2 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -257,7 +257,7 @@ let s:globs = {
   \ 'jam': '*.jpl,*.jpr,Prl*.*,JAM*.*',
   \ 'java': '*.java,*.jav',
   \ 'javacc': '*.jj,*.jjt',
-  \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,*.javascript,Jakefile',
+  \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
   \ 'javascriptreact': '*.jsx',
   \ 'jess': '*.clp',
   \ 'jgraph': '*.jgr',
diff --git a/autoload/zig/fmt.vim b/autoload/zig/fmt.vim
index 7d7872f98..e2e3059ab 100644
--- a/autoload/zig/fmt.vim
+++ b/autoload/zig/fmt.vim
@@ -17,7 +17,7 @@ function! zig#fmt#Format() abort
     return
   endif
 
-  let cmdline = 'zig fmt --stdin'
+  let cmdline = 'zig fmt --stdin --ast-check'
   let current_buf = bufnr('')
 
   " The formatted code is output on stdout, the errors go on stderr.
@@ -26,8 +26,19 @@ function! zig#fmt#Format() abort
   else
     silent let out = split(system(cmdline, current_buf))
   endif
+  if len(out) == 1
+    if out[0] == "error: unrecognized parameter: '--ast-check'"
+      let cmdline = 'zig fmt --stdin'
+      if exists('*systemlist')
+        silent let out = systemlist(cmdline, current_buf)
+      else
+        silent let out = split(system(cmdline, current_buf))
+      endif
+    endif
+  endif
   let err = v:shell_error
 
+
   if err == 0
     " remove undo point caused via BufWritePre.
     try | silent undojoin | catch | endtry
diff --git a/extras/filetype.vim b/extras/filetype.vim
index e6ab472f5..4bee61e22 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Apr 17
+" Last Change:	2021 Jun 13
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -393,7 +393,7 @@ au BufNewFile,BufRead *.cfm,*.cfi,*.cfc		setf cf
 " Configure scripts
 au BufNewFile,BufRead configure.in,configure.ac setf config
 
-" CUDA  Cumpute Unified Device Architecture
+" CUDA Compute Unified Device Architecture
 au BufNewFile,BufRead *.cu,*.cuh		setf cuda
 
 " Dockerfile; Podman uses the same syntax with name Containerfile
@@ -408,8 +408,15 @@ au BufNewFile,BufRead *enlightenment/*.cfg	setf c
 " Eterm
 au BufNewFile,BufRead *Eterm/*.cfg		setf eterm
 
+" Elixir or Euphoria
+au BufNewFile,BufRead *.ex call polyglot#ft#ExCheck()
+
+" Elixir
+au BufRead,BufNewFile mix.lock,*.exs setf elixir
+au BufRead,BufNewFile *.eex,*.leex setf eelixir
+
 " Euphoria 3 or 4
-au BufNewFile,BufRead *.eu,*.ew,*.ex,*.exu,*.exw  call polyglot#ft#EuphoriaCheck()
+au BufNewFile,BufRead *.eu,*.ew,*.exu,*.exw  call polyglot#ft#EuphoriaCheck()
 if has("fname_case")
    au BufNewFile,BufRead *.EU,*.EW,*.EX,*.EXU,*.EXW  call polyglot#ft#EuphoriaCheck()
 endif
@@ -855,6 +862,12 @@ au BufNewFile,BufRead *.jov,*.j73,*.jovial	setf jovial
 " JSON
 au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest	setf json
 
+" JSON Patch (RFC 6902)
+au BufNewFile,BufRead *.json-patch			setf json
+
+" Jupyter Notebook is also json
+au BufNewFile,BufRead *.ipynb				setf json
+
 " Kixtart
 au BufNewFile,BufRead *.kix			setf kix
 
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 8919fd007..2c2882e3e 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -4,7 +4,7 @@ endif
 
 " Vim filetype plugin file
 " Language:           Clojure
-" Maintainer:         Alex Vear <av@axvr.io>
+" Maintainer:         Alex Vear <alex@vear.uk>
 " Former Maintainers: Sung Pae <self@sungpae.com>
 "                     Meikel Brandmeyer <mb@kotka.de>
 " URL:                https://github.com/clojure-vim/clojure.vim
diff --git a/ftplugin/org.vim b/ftplugin/org.vim
index 127110883..b88fbc955 100644
--- a/ftplugin/org.vim
+++ b/ftplugin/org.vim
@@ -4,11 +4,11 @@ endif
 
 " Vim filetype plugin for GNU Emacs' Org mode
 "
-" Maintainer:   Alex Vear <av@axvr.io>
+" Maintainer:   Alex Vear <alex@vear.uk>
 " License:      Vim (see `:help license`)
 " Location:     ftplugin/org.vim
 " Website:      https://github.com/axvr/org.vim
-" Last Change:  2020-01-04
+" Last Change:  2020-02-15
 "
 " Reference Specification: Org mode manual
 "   GNU Info: `$ info Org`
diff --git a/ftplugin/outline.vim b/ftplugin/outline.vim
index 4f0bbd65f..996ba4c04 100644
--- a/ftplugin/outline.vim
+++ b/ftplugin/outline.vim
@@ -4,7 +4,7 @@ endif
 
 " Vim filetype plugin for GNU Emacs' Outline mode
 "
-" Maintainer:   Alex Vear <av@axvr.io>
+" Maintainer:   Alex Vear <alex@vear.uk>
 " License:      Vim (see `:help license`)
 " Location:     ftplugin/outline.vim
 " Website:      https://github.com/axvr/org.vim
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index ee5ce79e7..cb2f3e845 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -47,10 +47,8 @@ if exists("*json_decode") && executable('zig')
     unlet! s:env
 endif
 
-let &l:formatprg = 'zig fmt --stdin'
-
 let b:undo_ftplugin =
-    \ 'setl isk< et< ts< sts< sw< fo< sua< mp< com< cms< inex< inc< pa< fp<'
+    \ 'setl isk< et< ts< sts< sw< fo< sua< mp< com< cms< inex< inc< pa<'
 
 let &cpo = s:cpo_orig
 unlet s:cpo_orig
diff --git a/indent/clojure.vim b/indent/clojure.vim
index ac4544bb9..7f79c9a23 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -4,7 +4,7 @@ endif
 
 " Vim indent file
 " Language:           Clojure
-" Maintainer:         Alex Vear <av@axvr.io>
+" Maintainer:         Alex Vear <alex@vear.uk>
 " Former Maintainers: Sung Pae <self@sungpae.com>
 "                     Meikel Brandmeyer <mb@kotka.de>
 " URL:                https://github.com/clojure-vim/clojure.vim
diff --git a/indent/zig.vim b/indent/zig.vim
index f4e2cda73..fc9f5d6d2 100644
--- a/indent/zig.vim
+++ b/indent/zig.vim
@@ -49,10 +49,10 @@ function! GetZigIndent(lnum)
     let prevLineNum = prevnonblank(a:lnum-1)
     let prevLine = getline(prevLineNum)
 
-    " for lines that look line
+    " for lines that look like
     "   },
     "   };
-    " try treat them the same as a }
+    " try treating them the same as a }
     if prevLine =~ '\v^\s*},$'
         if currentLine =~ '\v^\s*};$' || currentLine =~ '\v^\s*}$'
             return indent(prevLineNum) - 4
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index 244d08bea..cdf8346d0 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -4,7 +4,7 @@ endif
 
 " Vim indent file
 " Language:           Clojure
-" Maintainer:         Alex Vear <av@axvr.io>
+" Maintainer:         Alex Vear <alex@vear.uk>
 " Former Maintainers: Sung Pae <self@sungpae.com>
 "                     Meikel Brandmeyer <mb@kotka.de>
 "                     Toralf Wittner <toralf.wittner@gmail.com>
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index 2c9dd2e5c..5928805b9 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -80,7 +80,7 @@ syn region elixirStruct matchgroup=elixirStructDelimiter start="%\(\w\+{\)\@=" e
 
 syn region elixirMap matchgroup=elixirMapDelimiter start="%{" end="}" contains=ALLBUT,@elixirNotTop fold
 
-syn region elixirString  matchgroup=elixirStringDelimiter start=+\z('\)+   end=+\z1+ skip=+\\\\\|\\\z1+  contains=@Spell,@elixirStringContained
+syn region elixirCharList  matchgroup=elixirCharListDelimiter start=+\z('\)+   end=+\z1+ skip=+\\\\\|\\\z1+  contains=@Spell,@elixirStringContained
 syn region elixirString  matchgroup=elixirStringDelimiter start=+\z("\)+   end=+\z1+ skip=+\\\\\|\\\z1+  contains=@Spell,@elixirStringContained
 syn region elixirString  matchgroup=elixirStringDelimiter start=+\z('''\)+ end=+^\s*\z1+ contains=@Spell,@elixirStringContained
 syn region elixirString  matchgroup=elixirStringDelimiter start=+\z("""\)+ end=+^\s*\z1+ contains=@Spell,@elixirStringContained
@@ -92,7 +92,7 @@ syn match elixirString             "\(\w\)\@<!?\%(\\\(x\d{1,2}\|\h{1,2}\h\@!\>\|
 syn region elixirBlock              matchgroup=elixirBlockDefinition start="\<do\>:\@!" end="\<end\>" contains=ALLBUT,@elixirNotTop fold
 syn region elixirAnonymousFunction  matchgroup=elixirBlockDefinition start="\<fn\>"     end="\<end\>" contains=ALLBUT,@elixirNotTop fold
 
-syn region elixirArguments start="(" end=")" contained contains=elixirOperator,elixirAtom,elixirPseudoVariable,elixirAlias,elixirBoolean,elixirVariable,elixirUnusedVariable,elixirNumber,elixirDocString,elixirAtomInterpolated,elixirRegex,elixirString,elixirStringDelimiter,elixirRegexDelimiter,elixirInterpolationDelimiter,elixirSigil,elixirAnonymousFunction,elixirComment
+syn region elixirArguments start="(" end=")" contained contains=elixirOperator,elixirAtom,elixirPseudoVariable,elixirAlias,elixirBoolean,elixirVariable,elixirUnusedVariable,elixirNumber,elixirDocString,elixirAtomInterpolated,elixirRegex,elixirString,elixirStringDelimiter,elixirRegexDelimiter,elixirInterpolationDelimiter,elixirSigil,elixirAnonymousFunction,elixirComment,elixirCharList,elixirCharListDelimiter
 
 syn match elixirDelimEscape "\\[(<{\[)>}\]/\"'|]" transparent display contained contains=NONE
 
@@ -234,10 +234,12 @@ hi def link elixirRegexCharClass             elixirSpecial
 hi def link elixirRegexQuantifier            elixirSpecial
 hi def link elixirSpecial                    Special
 hi def link elixirString                     String
+hi def link elixirCharList                   String
 hi def link elixirSigil                      String
 hi def link elixirDocStringDelimiter         elixirStringDelimiter
 hi def link elixirDocSigilDelimiter          elixirSigilDelimiter
 hi def link elixirStringDelimiter            Delimiter
+hi def link elixirCharListDelimiter          Delimiter
 hi def link elixirRegexDelimiter             Delimiter
 hi def link elixirInterpolationDelimiter     Delimiter
 hi def link elixirSigilDelimiter             Delimiter
diff --git a/syntax/julia.vim b/syntax/julia.vim
index a04f246dc..53dea0770 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -124,8 +124,8 @@ syntax match   juliaColon		display ":"
 " A dot can introduce a sort of 'environment' such that words after it are not
 " recognized as keywords. This has low precedence so that it can be overridden
 " by operators
-syntax match   juliaDotted		transparent "\.\s*[^.]" contains=@juliaExprsNodot
-syntax match   juliaDottedT		contained transparent "\.\s*[^.]" contains=@juliaExprsNodot,juliaType
+syntax match   juliaDotted		transparent "\.\s*[^])}.]" contains=@juliaExprsNodot
+syntax match   juliaDottedT		contained transparent "\.\s*[^])}.]" contains=@juliaExprsNodot,juliaType
 
 syntax match   juliaErrorPar		display "[])}]"
 syntax match   juliaErrorEnd		display "\<end\>"
diff --git a/syntax/org.vim b/syntax/org.vim
index de879a6f8..8bcb2fa44 100644
--- a/syntax/org.vim
+++ b/syntax/org.vim
@@ -4,11 +4,11 @@ endif
 
 " Vim syntax file for GNU Emacs' Org mode
 "
-" Maintainer:   Alex Vear <av@axvr.io>
+" Maintainer:   Alex Vear <alex@vear.uk>
 " License:      Vim (see `:help license`)
 " Location:     syntax/org.vim
 " Website:      https://github.com/axvr/org.vim
-" Last Change:  2020-01-05
+" Last Change:  2021-03-11
 "
 " Reference Specification: Org mode manual
 "   GNU Info: `$ info Org`
diff --git a/syntax/outline.vim b/syntax/outline.vim
index 749bc8405..13a4d7ea5 100644
--- a/syntax/outline.vim
+++ b/syntax/outline.vim
@@ -4,11 +4,11 @@ endif
 
 " Vim syntax file for GNU Emacs' Outline mode
 "
-" Maintainer:   Alex Vear <av@axvr.io>
+" Maintainer:   Alex Vear <alex@vear.uk>
 " License:      Vim (see `:help license`)
 " Location:     syntax/outline.vim
 " Website:      https://github.com/axvr/org.vim
-" Last Change:  2019-09-28
+" Last Change:  2020-08-24
 "
 " Reference Specification: GNU Emacs Manual, section 'Outline Mode'
 "   GNU Info: `$ info Emacs Outline Mode`
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index 4b962fa10..ce28d3800 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -137,10 +137,10 @@ syn match rubyCurlyBraceEscape	  "\\[{}]"  contained display
 syn match rubyAngleBracketEscape  "\\[<>]"  contained display
 syn match rubySquareBracketEscape "\\[[\]]" contained display
 
-syn region rubyNestedParentheses    start="("  skip="\\\\\|\\)"  matchgroup=rubyString end=")"	transparent contained
-syn region rubyNestedCurlyBraces    start="{"  skip="\\\\\|\\}"  matchgroup=rubyString end="}"	transparent contained
-syn region rubyNestedAngleBrackets  start="<"  skip="\\\\\|\\>"  matchgroup=rubyString end=">"	transparent contained
-syn region rubyNestedSquareBrackets start="\[" skip="\\\\\|\\\]" matchgroup=rubyString end="\]"	transparent contained
+syn region rubyNestedParentheses    start="("  skip="\\\\\|\\)"  end=")"	transparent contained
+syn region rubyNestedCurlyBraces    start="{"  skip="\\\\\|\\}"  end="}"	transparent contained
+syn region rubyNestedAngleBrackets  start="<"  skip="\\\\\|\\>"  end=">"	transparent contained
+syn region rubyNestedSquareBrackets start="\[" skip="\\\\\|\\\]" end="\]"	transparent contained
 
 syn cluster rubySingleCharEscape contains=rubyBackslashEscape,rubyQuoteEscape,rubySpaceEscape,rubyParenthesisEscape,rubyCurlyBraceEscape,rubyAngleBracketEscape,rubySquareBracketEscape
 syn cluster rubyNestedBrackets	 contains=rubyNested.\+
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 057a0ed32..67dad5977 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -94,8 +94,7 @@ let s:zig_syntax_keywords = {
     \ ,                "callconv"
     \ ,                "noalias"]
     \ , 'zigBuiltinFn': ["align"
-    \ ,                  "@add"
-    \ ,                  "@WithOverflow"
+    \ ,                  "@addWithOverflow"
     \ ,                  "@as"
     \ ,                  "@atomicLoad"
     \ ,                  "@atomicStore"
@@ -107,7 +106,6 @@ let s:zig_syntax_keywords = {
     \ ,                  "@cImport"
     \ ,                  "@cInclude"
     \ ,                  "@cUndef"
-    \ ,                  "@canImplicitCast"
     \ ,                  "@clz"
     \ ,                  "@cmpxchgWeak"
     \ ,                  "@cmpxchgStrong"
@@ -142,6 +140,7 @@ let s:zig_syntax_keywords = {
     \ ,                  "@src"
     \ ,                  "@bitOffsetOf"
     \ ,                  "@byteOffsetOf"
+    \ ,                  "@offsetOf"
     \ ,                  "@OpaqueType"
     \ ,                  "@panic"
     \ ,                  "@ptrCast"
@@ -155,8 +154,6 @@ let s:zig_syntax_keywords = {
     \ ,                  "@setRuntimeSafety"
     \ ,                  "@setEvalBranchQuota"
     \ ,                  "@setFloatMode"
-    \ ,                  "@setGlobalLinkage"
-    \ ,                  "@setGlobalSection"
     \ ,                  "@shlExact"
     \ ,                  "@This"
     \ ,                  "@hasDecl"
@@ -179,8 +176,6 @@ let s:zig_syntax_keywords = {
     \ ,                  "@typeName"
     \ ,                  "@TypeOf"
     \ ,                  "@atomicRmw"
-    \ ,                  "@bytesToSlice"
-    \ ,                  "@sliceToBytes"
     \ ,                  "@intToError"
     \ ,                  "@errorToInt"
     \ ,                  "@intToEnum"

From c794f186c0a618d2d4cdd5445d9ff20e6f640762 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 8 Jul 2021 11:54:15 +0200
Subject: [PATCH 270/299] Update

---
 README.md                    |   5 +-
 autoload/csv.vim             | 124 +++++++++++++++++++++--------------
 autoload/fsharp.vim          |  25 ++++---
 autoload/hcl.vim             |  20 ++++++
 autoload/polyglot/init.vim   |   5 +-
 autoload/polyglot/sleuth.vim |   2 +-
 autoload/terraform.vim       |  11 ----
 extras/filetype.vim          |   8 ++-
 ftplugin/hcl.vim             |  56 ++++++++--------
 ftplugin/terraform.vim       |  47 ++++++-------
 indent/hcl.vim               |  65 ++++++++++++++++--
 indent/pascal.vim            |   4 +-
 indent/terraform.vim         |  61 +----------------
 packages.yaml                |  22 +++----
 syntax/8th.vim               |   2 +-
 syntax/csv.vim               |  14 +++-
 syntax/git.vim               |   2 +-
 syntax/gitcommit.vim         |   1 +
 syntax/go.vim                |   2 +-
 syntax/hcl.vim               | 112 +++++++++++++++++++------------
 syntax/julia.vim             |   6 +-
 syntax/kotlin.vim            |   4 +-
 syntax/ruby.vim              |   8 ++-
 syntax/terraform.vim         |  66 +------------------
 tests/filetypes.vim          |   2 +-
 25 files changed, 344 insertions(+), 330 deletions(-)
 create mode 100644 autoload/hcl.vim

diff --git a/README.md b/README.md
index 8ac2f5ca4..7d33b9cfd 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->607<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->606<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -96,7 +96,6 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [haproxy](https://github.com/CH-DanReif/haproxy.vim) (HAProxy syntax highlighting)
 - [haskell](https://github.com/neovimhaskell/haskell-vim) (Haskell syntax highlighting for hs, hs-boot, hsc, bpk and hsig files)
 - [haxe](https://github.com/jdonaldson/vaxe) (Haxe and HXML syntax highlighting for hx, hxsl, hxml and hss files)
-- [hcl](https://github.com/b4b4r07/vim-hcl) (HCL syntax highlighting for hcl, nomad and workflow files)
 - [helm](https://github.com/towolf/vim-helm)
 - [help](https://github.com/neovim/neovim/tree/master/runtime)
 - [hive](https://github.com/zebradil/hive.vim) (HiveQL syntax highlighting for q, hql and ql files)
@@ -187,7 +186,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [swift](https://github.com/keith/swift.vim) (Swift syntax highlighting for swift files)
 - [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (Syntax highlighting for sxhkdrc files)
 - [systemd](https://github.com/wgwoods/vim-systemd-syntax) (Syntax highlighting for automount, dnssd, link, mount, netdev and 9 more files)
-- [terraform](https://github.com/hashivim/vim-terraform) (Syntax highlighting for tf and tfvars files)
+- [terraform](https://github.com/hashivim/vim-terraform) (HCL syntax highlighting for tf, tfvars, hcl, nomad and workflow files)
 - [textile](https://github.com/timcharper/textile.vim) (Textile syntax highlighting for textile files)
 - [thrift](https://github.com/solarnz/thrift.vim) (Thrift syntax highlighting for thrift files)
 - [tmux](https://github.com/ericpruitt/tmux.vim/tree/master/vim)
diff --git a/autoload/csv.vim b/autoload/csv.vim
index 98feee757..36a65dd3e 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -14,7 +14,7 @@ endif
 " Some ideas are taken from the wiki http://vim.wikia.com/wiki/VimTip667
 " though, implementation differs.
 
-let s:csv_numeric_sort = v:version > 704 || v:version == 704 && has("patch341")
+let s:csv_numeric_sort = v:version > 704 || v:version == 704 && has("patch951")
 if !s:csv_numeric_sort "{{{2
   fu! csv#CSVSortValues(i1, i2) "{{{3
     return (a:i1+0) == (a:i2+0) ? 0 : (a:i1+0) > (a:i2+0) ? 1 : -1
@@ -222,6 +222,15 @@ fu! csv#LocalSettings(type) "{{{3
     endif
 endfu
 
+fu! csv#RemoveAutoHighlight() "{{{3
+    exe "aug CSV_HI".bufnr('')
+        exe "au! CursorMoved <buffer=".bufnr('').">"
+    aug end
+    exe "aug! CSV_HI".bufnr('')
+    " Remove any existing highlighting
+    HiColumn!
+endfu
+
 fu! csv#DoAutoCommands() "{{{3
     " Highlight column, on which the cursor is
     if exists("g:csv_highlight_column") && g:csv_highlight_column =~? 'y'
@@ -233,12 +242,7 @@ fu! csv#DoAutoCommands() "{{{3
         " Set highlighting for column, on which the cursor is currently
         HiColumn
     else
-        exe "aug CSV_HI".bufnr('')
-            exe "au! CursorMoved <buffer=".bufnr('').">"
-        aug end
-        exe "aug! CSV_HI".bufnr('')
-        " Remove any existing highlighting
-        HiColumn!
+        call csv#RemoveAutoHighlight()
     endif
     " undo autocommand:
     let b:undo_ftplugin .= '| exe "sil! au! CSV_HI'.bufnr('').' CursorMoved <buffer> "'
@@ -539,7 +543,7 @@ fu! csv#WColumn(...) "{{{3
         let temp=getpos('.')[2]
         let j=1
         let ret = 1
-        for i in sort(b:csv_fixed_width_cols, s:csv_numeric_sort ? 'n' : 'csv#CSVSortValues')
+        for i in sort(b:csv_fixed_width_cols, s:csv_numeric_sort ? 'N' : 'csv#CSVSortValues')
             if temp >= i
                 let ret = j
             endif
@@ -549,6 +553,9 @@ fu! csv#WColumn(...) "{{{3
     call setpos('.',_cur)
     return ret
 endfu
+fu! csv#ValidComment() "{{{3
+    return b:csv_cmt != ['', ''] && !empty(b:csv_cmt[0])
+endfu
 fu! csv#MaxColumns(...) "{{{3
     let this_col = exists("a:1")
     "return maximum number of columns in first 10 lines
@@ -561,8 +568,10 @@ fu! csv#MaxColumns(...) "{{{3
             endif
 
             " Filter comments out
-            let pat = '^\s*\V'. escape(b:csv_cmt[0], '\\')
-            call filter(l, 'v:val !~ pat')
+            if csv#ValidComment()
+                let pat = '^\s*\V'. escape(b:csv_cmt[0], '\\')
+                call filter(l, 'v:val !~ pat')
+            endif
             if !empty(l) || this_col
                 break
             else
@@ -606,8 +615,10 @@ fu! csv#ColWidth(colnr, row, silent) "{{{3
                 endif
             endif
             let b:csv_list=getline(skipfirst+1,last)
-            let pat = '^\s*\V'. escape(b:csv_cmt[0], '\\')
-            call filter(b:csv_list, 'v:val !~ pat')
+            if csv#ValidComment()
+                let pat = '^\s*\V'. escape(b:csv_cmt[0], '\\')
+                call filter(b:csv_list, 'v:val !~ pat')
+            endif
             call filter(b:csv_list, '!empty(v:val)')
             call map(b:csv_list, 'split(v:val, b:col.''\zs'')')
         endif
@@ -898,7 +909,7 @@ fu! csv#Columnize(field) "{{{3
         return result
     else
         " right align
-        return printf("%*S", width+1 ,  a:field)
+        return printf("%*S", width ,  a:field)
     endif
 endfun
 fu! csv#GetColPat(colnr, zs_flag) "{{{3
@@ -912,15 +923,15 @@ fu! csv#GetColPat(colnr, zs_flag) "{{{3
                 let pat='\%' . b:csv_fixed_width_cols[-1] . 'v.*'
             else
             let pat='\%' . b:csv_fixed_width_cols[(a:colnr - 1)] .
-            \ 'c.\{-}\%' .   b:csv_fixed_width_cols[a:colnr] . 'v'
+            \ 'c.*\%<' .   (b:csv_fixed_width_cols[a:colnr] + 1) . 'v'
             endif
         endif
     elseif !exists("b:csv_fixed_width_cols")
         let pat=b:col
     else
-        let pat='\%' . b:csv_fixed_width_cols[0] . 'v.\{-}' .
+        let pat='\%' . b:csv_fixed_width_cols[0] . 'v.*' .
             \ (len(b:csv_fixed_width_cols) > 1 ?
-            \ '\%' . b:csv_fixed_width_cols[1] . 'v' :
+            \ '\%<' . (b:csv_fixed_width_cols[1] + 1) . 'v' :
             \ '')
     endif
     return pat . (a:zs_flag ? '\zs' : '')
@@ -1115,7 +1126,12 @@ fu! csv#MoveCol(forward, line, ...) "{{{3
                 let pat=csv#GetColPat(1, 0)
             else
                 " Move backwards
-                let pat=csv#GetColPat(maxcol, 0)
+                if cpos == 1 && (exists("a:1") && a:1)
+                    " H move to previous line
+                    let pat=csv#GetColPat(maxcol, 0)
+                else
+                    let pat='\%1v'
+                endif
             endif
         endif
     else
@@ -1149,9 +1165,13 @@ fu! csv#MoveCol(forward, line, ...) "{{{3
                 " of a field.
                 let epos = getpos('.')
                 if getline('.')[col('.')-1] == ' '
-                    call search('\S', 'W', line('.'))
-                    if getpos('.')[2] > spos
-                        call setpos('.', epos)
+                    if !exists("b:csv_fixed_width_cols")
+                        call search('\S', 'W', line('.'))
+                        if getpos('.')[2] > spos
+                            call setpos('.', epos)
+                        endif
+                    elseif cpos > b:csv_fixed_width_cols[colnr]
+                        call search('\%'. b:csv_fixed_width_cols[colnr]. 'v', 'W', line('.'))
                     endif
                 endif
             endif
@@ -1246,8 +1266,10 @@ fu! csv#CopyCol(reg, col, cnt) "{{{3
         endfor
     endif
     " Filter comments out
-    let pat = '^\s*\V'. escape(b:csv_cmt[0], '\\')
-    call filter(a, 'v:val !~ pat')
+    if csv#ValidComment()
+        let pat = '^\s*\V'. escape(b:csv_cmt[0], '\\')
+        call filter(a, 'v:val !~ pat')
+    endif
 
     if !exists("b:csv_fixed_width_cols")
         call map(a, 'split(v:val, ''^'' . b:col . ''\zs'')[col-1:cnt_cols]')
@@ -1288,10 +1310,9 @@ fu! csv#MoveColumn(start, stop, ...) range "{{{3
     endif
 
     " Swap line by line, instead of reading the whole range into memory
-
     for i in range(a:start, a:stop)
         let content = getline(i)
-        if content =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
+        if b:csv_cmt != ['',''] && content =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
             " skip comments
             continue
         endif
@@ -1359,13 +1380,9 @@ fu! csv#DupColumn(start, stop, ...) range "{{{3
     " skipping comment lines (we could do it with a single :s statement,
     " but that would fail for the first and last column.
 
-    let commentpat = '\%(\%>'.(a:start-1).'l\V'.
-                \ escape(b:csv_cmt[0], '\\').'\m\)'. '\&\%(\%<'.
-                \ (a:stop+1). 'l\V'. escape(b:csv_cmt[0], '\\'). '\m\)'
-
     for i in range(a:start, a:stop)
         let content = getline(i)
-        if content =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
+        if csv#ValidComment() && content =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
             " skip comments
             continue
         endif
@@ -1429,10 +1446,12 @@ fu! csv#AddColumn(start, stop, ...) range "{{{3
     " skipping comment lines (we could do it with a single :s statement,
     " but that would fail for the first and last column.
 
-    let commentpat = '\%(\%>'.(a:start-1).'l\V'.
-                \ escape(b:csv_cmt[0], '\\').'\m\)'. '\&\%(\%<'.
-                \ (a:stop+1). 'l\V'. escape(b:csv_cmt[0], '\\'). '\m\)'
-    if search(commentpat)
+    if b:csv_cmt != ['','']
+        let commentpat = '\%(\%>'.(a:start-1).'l\V'.
+                    \ escape(b:csv_cmt[0], '\\').'\m\)'. '\&\%(\%<'.
+                    \ (a:stop+1). 'l\V'. escape(b:csv_cmt[0], '\\'). '\m\)'
+    endif
+    if !empty(commentpat) && search(commentpat)
         for i in range(a:start, a:stop)
             let content = getline(i)
             if content =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
@@ -1611,7 +1630,7 @@ fu! csv#MaxColumn(list) "{{{3
             endtry
             call add(result, str2float(nr))
         endfor
-        let result = sort(result, s:csv_numeric_sort ? 'n' : 'csv#CSVSortValues')
+        let result = sort(result, s:csv_numeric_sort ? 'N' : 'csv#CSVSortValues')
         let ind = len(result) > 9 ? 9 : len(result)
         if has_key(get(s:, 'additional', {}), 'distinct') && s:additional['distinct']
           if exists("*uniq")
@@ -1672,7 +1691,7 @@ fu! csv#DoForEachColumn(start, stop, bang) range "{{{3
         endif
         let t = g:csv_convert
         let line = getline(item)
-        if line =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
+        if b:csv_cmt!=['',''] && line =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
             " Filter comments out
             call add(result, line)
             continue
@@ -1736,7 +1755,7 @@ fu! csv#FoldValue(lnum, filter) "{{{3
     for item in values(a:filter)
         " always fold comments away
         let content = getline(a:lnum)
-        if content =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
+        if b:csv_cmt != ['',''] && content =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
             return 1
         elseif eval('content' .  (item.match ? '!~' : '=~') . 'item.pat')
             let result += 1
@@ -1898,7 +1917,7 @@ fu! csv#GetColumn(line, col, strip) "{{{3
     " Return Column content at a:line, a:col
     let a=getline(a:line)
     " Filter comments out
-    if a =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
+    if csv#ValidComment() && a =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
         return ''
     endif
 
@@ -1979,7 +1998,7 @@ fu! csv#AnalyzeColumn(...) "{{{3
         let res[item]+=1
     endfor
 
-    let max_items = reverse(sort(values(res), s:csv_numeric_sort ? 'n' : 'csv#CSVSortValues'))
+    let max_items = reverse(sort(values(res), s:csv_numeric_sort ? 'N' : 'csv#CSVSortValues'))
     " What about the minimum 5 items?
     let count_items = keys(res)
     if len(max_items) > topn
@@ -2057,6 +2076,7 @@ fu! csv#InitCSVFixedWidth() "{{{3
     endif
     " Turn off syntax highlighting
     syn clear
+    call csv#RemoveAutoHighlight()
     let max_line = line('$') > 10 ? 10 : line('$')
     let t = getline(1, max_line)
     let max_len = max(map(t, 'len(split(v:val, ''\zs''))'))
@@ -2118,8 +2138,8 @@ fu! csv#InitCSVFixedWidth() "{{{3
     endw
     let b:csv_fixed_width_cols=[]
     let tcc=0
-    let b:csv_fixed_width_cols = sort(keys(Dict), s:csv_numeric_sort ? 'n' : 'csv#CSVSortValues')
-    let b:csv_fixed_width = join(sort(keys(Dict), s:csv_numeric_sort ? 'n' : 'csv#CSVSortValues'), ',')
+    let b:csv_fixed_width_cols = sort(keys(Dict), s:csv_numeric_sort ? 'N' : 'csv#CSVSortValues')
+    let b:csv_fixed_width = join(sort(keys(Dict), s:csv_numeric_sort ? 'N' : 'csv#CSVSortValues'), ',')
     call csv#Init(1, line('$'))
 
     let &l:cc=_cc
@@ -2200,7 +2220,7 @@ fu! csv#CSVMappings() "{{{3
         call csv#Map('nnoremap', '<C-Right>', ':<C-U>call csv#MoveCol(1, line("."))<CR>')
         call csv#Map('nnoremap', 'L', ':<C-U>call csv#MoveCol(1, line("."))<CR>')
         try
-            if g:csv_bind_B == 1
+            if get(g:, 'csv_bind_B', 0) == 1
                 call csv#Map('nnoremap', 'B', ':<C-U>call csv#MoveCol(-1, line("."))<CR>')
             else
                 call csv#Map('nnoremap', 'E', ':<C-U>call csv#MoveCol(-1, line("."))<CR>')
@@ -2431,7 +2451,7 @@ fu! csv#NewDelimiter(newdelimiter, firstl, lastl) "{{{3
     let line=a:firstl
     while line <= a:lastl
         " Don't change delimiter for comments
-        if getline(line) =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
+        if csv#ValidComment() && getline(line) =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
             let line+=1
             continue
         endif
@@ -2476,7 +2496,7 @@ fu! csv#DuplicateRows(columnlist) "{{{3
         let i = 1
         let content = getline(line)
         " Skip comments
-        if content =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
+        if csv#ValidComment() && content =~ '^\s*\V'. escape(b:csv_cmt[0], '\\')
             continue
         endif
         let cols = split(content, b:col. '\zs')
@@ -2532,7 +2552,11 @@ fu! csv#Transpose(line1, line2) "{{{3
         let TrailingDelim = getline(1) =~ b:delimiter.'$'
     endif
 
-    let pat = '^\s*\V'. escape(b:csv_cmt[0], '\\')
+    if b:csv_cmt != ['','']
+        let pat = '^\s*\V'. escape(b:csv_cmt[0], '\\')
+    else
+        let pat = ''
+    endif
 
     try
         let columns = csv#MaxColumns(a:line1)
@@ -2544,7 +2568,7 @@ fu! csv#Transpose(line1, line2) "{{{3
     let matrix  = []
     for line in range(a:line1, a:line2)
         " Filter comments out
-        if getline(line) =~ pat
+        if !empty(pat) && getline(line) =~ pat
             continue
         endif
         let r   = []
@@ -3033,10 +3057,12 @@ fu! csv#SumCSVRow(line, nr) "{{{3
     endif
     let line=getline(ln)
     " Filter comments out
-    let pat = '^\s*\V'. escape(b:csv_cmt[0], '\\')
-    if line =~ pat
-        call csv#Warn("Invalid count specified")
-        return
+    if csv#ValidComment()
+        let pat = '^\s*\V'. escape(b:csv_cmt[0], '\\')
+        if line =~ pat
+            call csv#Warn("Invalid count specified")
+            return
+        endif
     endif
     let func='csv#SumColumn'
     let cells=split(line, b:col.'\zs')
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index 89287042d..67f564954 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -122,7 +122,7 @@ function! s:documentationSymbol(xmlSig, assembly, cont)
 endfunction
 
 " FSharpConfigDto from https://github.com/fsharp/FsAutoComplete/blob/master/src/FsAutoComplete/LspHelpers.fs
-" 
+"
 " * The following options seems not working with workspace/didChangeConfiguration
 "   since the initialization has already completed?
 "     'AutomaticWorkspaceInit',
@@ -153,7 +153,7 @@ let s:config_keys_camel =
     \     {'key': 'EnableAnalyzers', 'default': 0},
     \     {'key': 'AnalyzersPath'},
     \     {'key': 'DisableInMemoryProjectReferences', 'default': 0},
-    \     {'key': 'LineLens', 'default': {'enabled': 'replaceCodeLens', 'prefix': '//'}},
+    \     {'key': 'LineLens', 'default': {'enabled': 'never', 'prefix': ''}},
     \     {'key': 'UseSdkScripts', 'default': 1},
     \     {'key': 'dotNetRoot'},
     \     {'key': 'fsiExtraParameters', 'default': []},
@@ -182,7 +182,7 @@ endfunction
 
 function! g:fsharp#getServerConfig()
     let fsharp = {}
-    call s:buildConfigKeys() 
+    call s:buildConfigKeys()
     for key in s:config_keys
         if exists('g:fsharp#' . key.snake)
             let fsharp[key.camel] = g:fsharp#{key.snake}
@@ -323,11 +323,17 @@ endfunction
 let s:script_root_dir = expand('<sfile>:p:h') . "/../"
 let s:fsac = fnamemodify(s:script_root_dir . "fsac/fsautocomplete.dll", ":p")
 let g:fsharp#languageserver_command =
-    \ ['dotnet', s:fsac, 
+    \ ['dotnet', s:fsac,
         \ '--background-service-enabled'
     \ ]
 
-function! s:download(branch)
+function! s:update_win()
+    echom "[FSAC] Downloading FSAC. This may take a while..."
+    let script = s:script_root_dir . "install.ps1"
+    call system('powershell -ExecutionPolicy Unrestricted ' . script . " update")
+endfunction
+
+function! s:update_unix()
     echom "[FSAC] Downloading FSAC. This may take a while..."
     let zip = s:script_root_dir . "fsac.zip"
     call system(
@@ -337,19 +343,18 @@ function! s:download(branch)
     if v:shell_error == 0
         call system('unzip -o -d ' . s:script_root_dir . "/fsac " . zip)
         call system('find ' . s:script_root_dir . '/fsac' . ' -type f -exec chmod 777 \{\} \;')
-        echom "[FSAC] Updated FsAutoComplete to version " . a:branch . "" 
+        echom "[FSAC] Updated FsAutoComplete"
     else
         echom "[FSAC] Failed to update FsAutoComplete"
     endif
 endfunction
 
 function! fsharp#updateFSAC(...)
-    if len(a:000) == 0
-        let branch = "master"
+    if has('win32') && !has('win32unix')
+        call s:update_win()
     else
-        let branch = a:000[0]
+        call s:update_unix()
     endif
-    call s:download(branch)
 endfunction
 
 let s:fsi_buffer = -1
diff --git a/autoload/hcl.vim b/autoload/hcl.vim
new file mode 100644
index 000000000..b76def6ac
--- /dev/null
+++ b/autoload/hcl.vim
@@ -0,0 +1,20 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'terraform', 'autoload/hcl.vim')
+  finish
+endif
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+function! hcl#align() abort
+  let p = '^.*=[^>]*$'
+  if exists(':Tabularize') && getline('.') =~# '^.*=' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p)
+    let column = strlen(substitute(getline('.')[0:col('.')],'[^=]','','g'))
+    let position = strlen(matchstr(getline('.')[0:col('.')],'.*=\s*\zs.*'))
+    Tabularize/=.*/l1
+    normal! 0
+    call search(repeat('[^=]*=',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
+  endif
+endfunction
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 7aa949395..04353964f 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -1944,6 +1944,7 @@ endif
 
 if !has_key(g:polyglot_is_disabled, 'terraform')
   au BufNewFile,BufRead *.tf,*.tfvars setf terraform
+  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,{.,}terraformrc,Appfile,terraform.rc setf hcl
 endif
 
 if !has_key(g:polyglot_is_disabled, 'tf')
@@ -2309,10 +2310,6 @@ if !has_key(g:polyglot_is_disabled, 'hive')
   au BufNewFile,BufRead *.hql,*.q,*.ql setf hive
 endif
 
-if !has_key(g:polyglot_is_disabled, 'hcl')
-  au BufNewFile,BufRead *.hcl,*.nomad,*.workflow,Appfile setf hcl
-endif
-
 if !has_key(g:polyglot_is_disabled, 'haxe')
   au BufNewFile,BufRead *.hx,*.hxsl setf haxe
   au BufNewFile,BufRead *.hxml setf hxml
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index d308561c2..bf3166a43 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -217,7 +217,7 @@ let s:globs = {
   \ 'hastepreproc': '*.htpp',
   \ 'haxe': '*.hx,*.hxsl',
   \ 'hb': '*.hb',
-  \ 'hcl': '*.hcl,*.nomad,*.workflow,Appfile',
+  \ 'hcl': '*.hcl,*.nomad,*.workflow,Appfile,.terraformrc,terraform.rc',
   \ 'helm': '',
   \ 'help': '',
   \ 'hercules': '*.vc,*.ev,*.sum,*.errsum',
diff --git a/autoload/terraform.vim b/autoload/terraform.vim
index 324b978d7..852b261fb 100644
--- a/autoload/terraform.vim
+++ b/autoload/terraform.vim
@@ -35,17 +35,6 @@ function! terraform#fmt() abort
   call winrestview(curw)
 endfunction
 
-function! terraform#align() abort
-  let p = '^.*=[^>]*$'
-  if exists(':Tabularize') && getline('.') =~# '^.*=' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p)
-    let column = strlen(substitute(getline('.')[0:col('.')],'[^=]','','g'))
-    let position = strlen(matchstr(getline('.')[0:col('.')],'.*=\s*\zs.*'))
-    Tabularize/=.*/l1
-    normal! 0
-    call search(repeat('[^=]*=',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
-  endif
-endfunction
-
 function! terraform#commands(ArgLead, CmdLine, CursorPos) abort
   let commands = [
     \ 'init',
diff --git a/extras/filetype.vim b/extras/filetype.vim
index 4bee61e22..19f4a4ed8 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Jun 13
+" Last Change:	2021 Jul 03
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -650,6 +650,9 @@ au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
 " Gedcom
 au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
 
+" Gemtext
+au BufNewFile,BufRead *.gmi,*.gemini		setf gemtext
+
 " Gift (Moodle)
 autocmd BufRead,BufNewFile *.gift		setf gift
 
@@ -868,6 +871,9 @@ au BufNewFile,BufRead *.json-patch			setf json
 " Jupyter Notebook is also json
 au BufNewFile,BufRead *.ipynb				setf json
 
+" JSONC
+au BufNewFile,BufRead *.jsonc			setf jsonc
+
 " Kixtart
 au BufNewFile,BufRead *.kix			setf kix
 
diff --git a/ftplugin/hcl.vim b/ftplugin/hcl.vim
index 58dc67e42..10102b08d 100644
--- a/ftplugin/hcl.vim
+++ b/ftplugin/hcl.vim
@@ -1,41 +1,43 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'hcl', 'ftplugin/hcl.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'terraform', 'ftplugin/hcl.vim')
   finish
 endif
 
-" File: ftplugin/hcl.vim
-" Author: BABAROT <b4b4r07@gmail.com>
-" Description: FileType Plugin for HCL
-" Last Change: Nob 05, 2015
+" hcl.vim - basic vim/hcl integration
+" Maintainer: HashiVim <https://github.com/hashivim>
 
-if exists('b:did_ftplugin')
-    finish
+if exists('b:did_ftplugin') || v:version < 700 || &compatible
+  finish
 endif
 let b:did_ftplugin = 1
 
-let s:save_cpo = &cpo
-set cpo&vim
+let s:cpo_save = &cpoptions
+set cpoptions&vim
 
-setlocal commentstring=#\ %s
+" j is a relatively recent addition; silence warnings when setting it.
+setlocal formatoptions-=t formatoptions+=croql
+silent! setlocal formatoptions+=j
+let b:undo_ftplugin = 'setlocal formatoptions<'
 
-" Add NERDCommenter delimiters
+if !has('patch-7.4.1142')
+  " Include hyphens as keyword characters so that a keyword appearing as
+  " part of a longer name doesn't get partially highlighted.
+  setlocal iskeyword+=-
+  let b:undo_ftplugin .= ' iskeyword<'
+endif
 
-let s:delims = { 'left': '#' }
-if exists('g:NERDDelimiterMap')
-    if !has_key(g:NERDDelimiterMap, 'hcl')
-        let g:NERDDelimiterMap.hcl = s:delims
-    endif
-elseif exists('g:NERDCustomDelimiters')
-    if !has_key(g:NERDCustomDelimiters, 'hcl')
-        let g:NERDCustomDelimiters.hcl = s:delims
-    endif
-else
-    let g:NERDCustomDelimiters = { 'hcl': s:delims }
+if get(g:, 'hcl_fold_sections', 0)
+  setlocal foldmethod=syntax
+  let b:undo_ftplugin .= ' foldmethod<'
 endif
-unlet s:delims
 
-let b:undo_ftplugin = ""
+" Set the commentstring
+setlocal commentstring=#%s
+let b:undo_ftplugin .= ' commentstring<'
 
-let &cpo = s:save_cpo
-unlet s:save_cpo
+if get(g:, 'hcl_align', 0) && exists(':Tabularize')
+  inoremap <buffer> <silent> = =<Esc>:call hcl#align()<CR>a
+  let b:undo_ftplugin .= '|iunmap <buffer> ='
+endif
 
-" vim: set et sw=4 ts=4:
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index 36b42dbc7..1f4ef2ccd 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -8,39 +8,30 @@ endif
 if exists('b:did_ftplugin') || v:version < 700 || &compatible
   finish
 endif
-let b:did_ftplugin = 1
-
-let s:cpo_save = &cpoptions
-set cpoptions&vim
-
-" j is a relatively recent addition; silence warnings when setting it.
-setlocal formatoptions-=t formatoptions+=croql
-silent! setlocal formatoptions+=j
-let b:undo_ftplugin = 'setlocal formatoptions<'
-
-if !has('patch-7.4.1142')
-  " Include hyphens as keyword characters so that a keyword appearing as
-  " part of a longer name doesn't get partially highlighted.
-  setlocal iskeyword+=-
-  let b:undo_ftplugin .= ' iskeyword<'
-endif
 
+" Have only kept the terraform versions of these options for backwards
+" compatibility.
 if get(g:, 'terraform_fold_sections', 0)
-  setlocal foldmethod=syntax
-  let b:undo_ftplugin .= ' foldmethod<'
-endif
+  let s:hcl_fold_sections_save = get(g:, 'hcl_fold_sections', 0)
+  let g:hcl_fold_sections=1
+end
 
-" Set the commentstring
-setlocal commentstring=#%s
-let b:undo_ftplugin .= ' commentstring<'
+if get(g:, 'terraform_align', 0)
+  let s:hcl_align_save = get(g:, 'hcl_align', 0)
+  let g:hcl_align=1
+end
 
-if get(g:, 'terraform_align', 0) && exists(':Tabularize')
-  inoremap <buffer> <silent> = =<Esc>:call terraform#align()<CR>a
-  let b:undo_ftplugin .= '|iunmap <buffer> ='
-endif
+runtime! ftplugin/hcl.vim
 
-let &cpoptions = s:cpo_save
-unlet s:cpo_save
+if exists('s:hcl_align_save')
+  let g:hcl_align = s:hcl_align_save
+end
+if exists('s:hcl_fold_sections_save')
+  let g:hcl_fold_sections = s:hcl_fold_sections_save
+end
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
 
 if !exists('g:terraform_binary_path')
   let g:terraform_binary_path='terraform'
diff --git a/indent/hcl.vim b/indent/hcl.vim
index 346e8585d..1338fec06 100644
--- a/indent/hcl.vim
+++ b/indent/hcl.vim
@@ -1,15 +1,68 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'hcl', 'indent/hcl.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'terraform', 'indent/hcl.vim')
   finish
 endif
 
+" Only load this file if no other indent file was loaded
 if exists('b:did_indent')
   finish
 endif
-
 let b:did_indent = 1
 
-" cindent seems to work adequately with HCL's brace-y syntax
-setlocal cindent
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+setlocal nolisp
+setlocal autoindent shiftwidth=2 tabstop=2 softtabstop=2 expandtab
+setlocal indentexpr=HclIndent(v:lnum)
+setlocal indentkeys+=<:>,0=},0=)
+let b:undo_indent = 'setlocal lisp< autoindent< shiftwidth< tabstop< softtabstop<'
+  \ . ' expandtab< indentexpr< indentkeys<'
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
+
+if exists('*HclIndent')
+  finish
+endif
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+function! HclIndent(lnum)
+  " Beginning of the file should have no indent
+  if a:lnum == 0
+    return 0
+  endif
+
+  " Usual case is to continue at the same indent as the previous non-blank line.
+  let prevlnum = prevnonblank(a:lnum-1)
+  let thisindent = indent(prevlnum)
+
+  " If that previous line is a non-comment ending in [ { (, increase the
+  " indent level.
+  let prevline = getline(prevlnum)
+  if prevline !~# '^\s*\(#\|//\)' && prevline =~# '[\[{\(]\s*$'
+    let thisindent += &shiftwidth
+  endif
+
+  " If the current line ends a block, decrease the indent level.
+  let thisline = getline(a:lnum)
+  if thisline =~# '^\s*[\)}\]]'
+    let thisindent -= &shiftwidth
+  endif
+
+  " If the previous line starts a block comment /*, increase by one
+  if prevline =~# '/\*'
+    let thisindent += 1
+  endif
+
+  " If the previous line ends a block comment */, decrease by one
+  if prevline =~# '\*/'
+    let thisindent -= 1
+  endif
+
+  return thisindent
+endfunction
 
-" don't de-indent comments (cindent treats them like preprocessor directives)
-setlocal cinkeys-=0#
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/indent/pascal.vim b/indent/pascal.vim
index 9e1c3e960..d4a6a5a7b 100644
--- a/indent/pascal.vim
+++ b/indent/pascal.vim
@@ -6,7 +6,7 @@ endif
 " Language:    Pascal
 " Maintainer:  Neil Carter <n.carter@swansea.ac.uk>
 " Created:     2004 Jul 13
-" Last Change: 2017 Jun 13
+" Last Change: 2021 Jul 01
 "
 " This is version 2.0, a complete rewrite.
 "
@@ -24,6 +24,8 @@ setlocal indentkeys+==end;,==const,==type,==var,==begin,==repeat,==until,==for
 setlocal indentkeys+==program,==function,==procedure,==object,==private
 setlocal indentkeys+==record,==if,==else,==case
 
+let b:undo_indent = "setl indentkeys< indentexpr<"
+
 if exists("*GetPascalIndent")
 	finish
 endif
diff --git a/indent/terraform.vim b/indent/terraform.vim
index 32c194ef3..3f7690f8b 100644
--- a/indent/terraform.vim
+++ b/indent/terraform.vim
@@ -6,63 +6,4 @@ endif
 if exists('b:did_indent')
   finish
 endif
-let b:did_indent = 1
-
-let s:cpo_save = &cpoptions
-set cpoptions&vim
-
-setlocal nolisp
-setlocal autoindent shiftwidth=2 tabstop=2 softtabstop=2 expandtab
-setlocal indentexpr=TerraformIndent(v:lnum)
-setlocal indentkeys+=<:>,0=},0=)
-let b:undo_indent = 'setlocal lisp< autoindent< shiftwidth< tabstop< softtabstop<'
-  \ . ' expandtab< indentexpr< indentkeys<'
-
-let &cpoptions = s:cpo_save
-unlet s:cpo_save
-
-if exists('*TerraformIndent')
-  finish
-endif
-
-let s:cpo_save = &cpoptions
-set cpoptions&vim
-
-function! TerraformIndent(lnum)
-  " Beginning of the file should have no indent
-  if a:lnum == 0
-    return 0
-  endif
-
-  " Usual case is to continue at the same indent as the previous non-blank line.
-  let prevlnum = prevnonblank(a:lnum-1)
-  let thisindent = indent(prevlnum)
-
-  " If that previous line is a non-comment ending in [ { (, increase the
-  " indent level.
-  let prevline = getline(prevlnum)
-  if prevline !~# '^\s*\(#\|//\)' && prevline =~# '[\[{\(]\s*$'
-    let thisindent += &shiftwidth
-  endif
-
-  " If the current line ends a block, decrease the indent level.
-  let thisline = getline(a:lnum)
-  if thisline =~# '^\s*[\)}\]]'
-    let thisindent -= &shiftwidth
-  endif
-
-  " If the previous line starts a block comment /*, increase by one
-  if prevline =~# '/\*'
-    let thisindent += 1
-  endif
-
-  " If the previous line ends a block comment */, decrease by one
-  if prevline =~# '\*/'
-    let thisindent -= 1
-  endif
-
-  return thisindent
-endfunction
-
-let &cpoptions = s:cpo_save
-unlet s:cpo_save
+runtime! indent/hcl.vim
diff --git a/packages.yaml b/packages.yaml
index f76f522c7..e4295b077 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -787,18 +787,6 @@ ignored_dirs:
   - autoload
   - compiler
 ---
-name: hcl
-remote: b4b4r07/vim-hcl
-filetypes:
-- name: hcl
-  linguist: HCL
-  extra_filenames:
-  - Appfile
-  ignored_extensions:
-  # handled by vim-terraform
-  - tf
-  - tfvars
----
 name: hive
 remote: zebradil/hive.vim
 filetypes:
@@ -1632,6 +1620,16 @@ filetypes:
   extensions:
   - tf
   - tfvars
+- name: hcl
+  linguist: HCL
+  extra_filenames:
+  - Appfile
+  - .terraformrc
+  - terraform.rc
+  ignored_extensions:
+  # handled by vim-terraform
+  - tf
+  - tfvars
 ---
 name: textile
 remote: timcharper/textile.vim
diff --git a/syntax/8th.vim b/syntax/8th.vim
index f297dc540..abad00920 100644
--- a/syntax/8th.vim
+++ b/syntax/8th.vim
@@ -297,7 +297,7 @@ syn region eighthComment start="\zs\\" end="$" contains=eighthTodo
 " Define the default highlighting.
 if !exists("did_eighth_syntax_inits")
     let did_eighth_syntax_inits=1
-    " The default methods for highlighting. Can be overriden later.
+    " The default methods for highlighting. Can be overridden later.
     hi def link eighthTodo Todo
     hi def link eighthOperators Operator
     hi def link eighthMath Number
diff --git a/syntax/csv.vim b/syntax/csv.vim
index ed045c7f9..0e1d3a02b 100644
--- a/syntax/csv.vim
+++ b/syntax/csv.vim
@@ -55,6 +55,12 @@ fu! <sid>CheckSaneSearchPattern() "{{{3
         let b:csv_cmt = [g:csv_comment]
     endif
 
+    " Make sure, b:csv_cmt always has 2 items
+    " can happen with e.g. :set cms="#%s
+    if b:csv_cmt == []
+        let b:csv_cmt = ['', '']
+    endif
+
 
     " Second: Check for sane defaults for the column pattern
     " Not necessary to check for fixed width columns
@@ -131,9 +137,11 @@ fu! <sid>DoHighlight() "{{{3
         endfor
     endif
     " Comment regions
-    exe 'syn match CSVComment /'. s:cmts. '.*'.
-        \ (!empty(s:cmte) ? '\%('. s:cmte. '\)\?'
-        \: '').  '/'
+    if !empty(s:cmts)
+        exe 'syn match CSVComment /'. s:cmts. '.*'.
+            \ (!empty(s:cmte) ? '\%('. s:cmte. '\)\?'
+            \: '').  '/'
+    endif
     hi def link CSVComment Comment
 endfun
 
diff --git a/syntax/git.vim b/syntax/git.vim
index 5688874a5..558d39b55 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -33,7 +33,7 @@ syn match gitDiffAdded "{+[^}]*+}" contained containedin=gitDiff
 syn match gitDiffRemoved "^ \+-.*" contained containedin=gitDiffMerge
 syn match gitDiffRemoved "\[-[^]]*-\]" contained containedin=gitDiff
 
-syn match  gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\|summary\|boundary\|filename\|previous\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite contains=@NoSpell
+syn match  gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\|gpgsig\|summary\|boundary\|filename\|previous\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite contains=@NoSpell
 syn match  gitKeyword /^\%(tag\>\|ref:\)/ contained containedin=gitHead nextgroup=gitReference skipwhite contains=@NoSpell
 syn match  gitKeyword /^Merge:/  contained containedin=gitHead nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
 syn match  gitMode    /^\d\{6\}\>/ contained containedin=gitHead nextgroup=gitType,gitHash skipwhite
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index 8e8476502..842c453d5 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -14,6 +14,7 @@ endif
 
 syn case match
 syn sync minlines=50
+syn sync linebreaks=1
 
 if has("spell")
   syn spell toplevel
diff --git a/syntax/go.vim b/syntax/go.vim
index ecb941273..1bca27c26 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -171,7 +171,7 @@ syn match       goDecimalError      "\<-\=\(_\(\d\+_*\)\+\|\([1-9]\d*_*\)\+__\(\
 syn match       goHexadecimalInt    "\<-\=0[xX]_\?\(\x\+_\?\)\+\>"
 syn match       goHexadecimalError  "\<-\=0[xX]_\?\(\x\+_\?\)*\(\([^ \t0-9A-Fa-f_)]\|__\)\S*\|_\)\>"
 syn match       goOctalInt          "\<-\=0[oO]\?_\?\(\o\+_\?\)\+\>"
-syn match       goOctalError        "\<-\=0[0-7oO_]*\(\([^ \t0-7oOxX_/)\]\}\:]\|[oO]\{2,\}\|__\)\S*\|_\|[oOxX]\)\>"
+syn match       goOctalError        "\<-\=0[0-7oO_]*\(\([^ \t0-7oOxX_/)\]\}\:;]\|[oO]\{2,\}\|__\)\S*\|_\|[oOxX]\)\>"
 syn match       goBinaryInt         "\<-\=0[bB]_\?\([01]\+_\?\)\+\>"
 syn match       goBinaryError       "\<-\=0[bB]_\?[01_]*\([^ \t01_)]\S*\|__\S*\|_\)\>"
 
diff --git a/syntax/hcl.vim b/syntax/hcl.vim
index d11c031b5..7b6ab441e 100644
--- a/syntax/hcl.vim
+++ b/syntax/hcl.vim
@@ -1,48 +1,76 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'hcl', 'syntax/hcl.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'terraform', 'syntax/hcl.vim')
   finish
 endif
 
-
-if exists("b:current_syntax")
+" Forked from Larry Gilbert's syntax file
+" github.com/L2G/vim-syntax-terraform
+if exists('b:current_syntax')
   finish
 endif
 
-syn match hclEqual '='
-syn match hclSimpleString '"[^\"]*"'
-syn region hclComment display oneline start='\%\(^\|\s\)#' end='$'
-syn region hclComment display oneline start='\%\(^\|\s\)//' end='$'
-syn region hclInterpolation display oneline start='(' end=')' contains=hclInterpolation,hclSimpleString
-syn region hclSmartString display oneline start='"' end='"\s*$' contains=hclInterpolation
-
-syn keyword hclRootKeywords variable provider resource nextgroup=hclString,hclString skipwhite
-syn keyword hclRootKeywords default nextgroup=hclEquals skipwhite
-
-
-syn keyword hclAwsResourcesKeywords availability_zones desired_capacity force_delete health_check_grace_period health_check_type launch_configuration load_balancers max_size min_size name vpc_zone_identifier nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords allocated_storage availability_zone backup_retention_period backup_window db_subnet_group_name engine engine_version final_snapshot_identifier identifier instance_class iops maintenance_window multi_az name password port publicly_accessible security_group_names skip_final_snapshot username vpc_security_group_ids nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords cidr description ingress name security_group_id security_group_name security_group_owner_id source_security_group_id nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords description name subnet_ids nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords instance vpc nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords availability_zones health_check healthy_threshold instance_port instance_protocol instances internal interval lb_port lb_protocol listener name security_groups ssl_certificate_id subnets target timeout unhealthy_threshold nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords ami associate_public_ip_address availability_zone ebs_optimized iam_instance_profile instance_type key_name private_ip security_groups source_dest_check subnet_id tags user_data nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords vpc_id nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords iam_instance_profile image_id instance_type key_name name name_prefix security_groups user_data nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords name records ttl type zone_id nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords name nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords route_table_id subnet_id nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords cidr_block gateway_id instance_id route vpc_id nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords acl bucket nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords cidr_blocks description from_port ingress name owner_id protocol security_groups self tags to_port vpc_id nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords availability_zone- cidr_block map_public_ip_on_launch vpc_id nextgroup=hclEquals,hclString skipwhite
-syn keyword hclAwsResourcesKeywords cidr_block enable_dns_hostnames enable_dns_support tags nextgroup=hclEquals,hclString skipwhite
-
-
-hi def link hclComment                  Comment
-hi def link hclEqual                    Operator
-hi def link hclRootKeywords             Statement
-hi def link hclAwsResourcesKeywords     Type
-hi def link hclSmartString              String
-hi def link hclInterpolation            String
-hi def link hclSimpleString             PreProc
-
-let b:current_syntax = "hcl"
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+" Identifiers are made up of alphanumeric characters, underscores, and
+" hyphens.
+if has('patch-7.4.1142')
+    syn iskeyword a-z,A-Z,48-57,_,-
+endif
+
+syn case match
+
+" A block is introduced by a type, some number of labels - which are either
+" strings or identifiers - and an opening curly brace.  Match the type.
+syn match hclBlockType /^\s*\zs\K\k*\ze\s\+\(\("\K\k*"\|\K\k*\)\s\+\)*{/
+
+" An attribute name is an identifier followed by an equals sign.
+syn match hclAttributeAssignment /\(\K\k*\.\)*\K\k*\s\+=\s/ contains=hclAttributeName
+syn match hclAttributeName /\<\K\k*\>/ contained
+
+syn keyword hclValueBool true false
+
+syn keyword hclTodo         contained TODO FIXME XXX BUG
+syn region  hclComment      start="/\*" end="\*/" contains=hclTodo,@Spell
+syn region  hclComment      start="#" end="$" contains=hclTodo,@Spell
+syn region  hclComment      start="//" end="$" contains=hclTodo,@Spell
+
+""" misc.
+syn match hclValueDec      "\<[0-9]\+\([kKmMgG]b\?\)\?\>"
+syn match hclValueHexaDec  "\<0x[0-9a-f]\+\([kKmMgG]b\?\)\?\>"
+syn match hclBraces        "[\[\]]"
+
+""" skip \" and \\ in strings.
+syn region hclValueString   start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=hclStringInterp
+syn region hclStringInterp  matchgroup=hclBraces start=/\(^\|[^$]\)\$\zs{/ end=/}/ contained contains=ALLBUT,hclAttributeName
+syn region hclHereDocText   start=/<<-\?\z([a-z0-9A-Z]\+\)/ end=/^\s*\z1/ contains=hclStringInterp
+
+"" Functions.
+syn match hclFunction "[a-z0-9]\+(\@="
+
+""" HCL2
+syn keyword hclRepeat         for in
+syn keyword hclConditional    if
+syn keyword hclValueNull      null
+
+" enable block folding
+syn region hclBlockBody matchgroup=hclBraces start="{" end="}" fold transparent
+
+hi def link hclComment           Comment
+hi def link hclTodo              Todo
+hi def link hclBraces            Delimiter
+hi def link hclAttributeName     Identifier
+hi def link hclBlockType         Type
+hi def link hclValueBool         Boolean
+hi def link hclValueDec          Number
+hi def link hclValueHexaDec      Number
+hi def link hclValueString       String
+hi def link hclHereDocText       String
+hi def link hclFunction          Function
+hi def link hclRepeat            Repeat
+hi def link hclConditional       Conditional
+hi def link hclValueNull         Constant
+
+let b:current_syntax = 'hcl'
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 53dea0770..88aa464ed 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -327,15 +327,15 @@ exec 'syntax match   juliaStringVarsPla	contained "\$' . s:idregex . '"'
 " TODO improve RegEx
 syntax region  juliaRegEx		matchgroup=juliaStringDelim start=+\<r\z("\(""\)\?\)+ skip=+\%(\\\\\)*\\"+ end=+\z1[imsx]*+
 
-syntax cluster juliaSpecialChars	contains=juliaSpecialChar,juliaOctalEscapeChar,juliaHexEscapeChar,juliaUniCharSmall,juliaUniCharLarge
+syntax cluster juliaSpecialChars	contains=juliaSpecialChar,juliaDoubleBackslash,juliaEscapedQuote,juliaOctalEscapeChar,juliaHexEscapeChar,juliaUniCharSmall,juliaUniCharLarge
 syntax match   juliaSpecialChar		display contained "\\."
 syntax match   juliaOctalEscapeChar	display contained "\\\o\{3\}"
 syntax match   juliaHexEscapeChar	display contained "\\x\x\{2\}"
 syntax match   juliaUniCharSmall	display contained "\\u\x\{1,4\}"
 syntax match   juliaUniCharLarge	display contained "\\U\x\{1,8\}"
 syntax cluster juliaSpecialCharsRaw	contains=juliaDoubleBackslash,juliaEscapedQuote
-syntax match   juliaDoubleBackslash	display contained "\\\\"
-syntax match   juliaEscapedQuote	display contained "\\\""
+syntax match   juliaDoubleBackslash	contained "\\\\"
+syntax match   juliaEscapedQuote	contained "\\\""
 
 syntax cluster juliaPrintfChars		contains=juliaErrorPrintfFmt,juliaPrintfFmt
 syntax match   juliaErrorPrintfFmt	display contained "\\\?%."
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index ca7fbef55..b5e75dbaa 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language: Kotlin
 " Maintainer: Alexander Udalov
-" Latest Revision: 20 April 2021
+" Latest Revision: 3 July 2021
 
 if exists('b:current_syntax')
     finish
@@ -101,6 +101,8 @@ syn match ktEscapedName "\v`.*`"
 syn match ktExclExcl "!!"
 syn match ktArrow "->"
 
+exec "syntax sync ccomment ktComment minlines=10"
+
 hi def link ktStatement Statement
 hi def link ktConditional Conditional
 hi def link ktRepeat Repeat
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index ce28d3800..bbf86e8a6 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -69,7 +69,7 @@ endfunction
 com! -nargs=* SynFold call s:run_syntax_fold(<q-args>)
 
 " Not-Top Cluster {{{1
-syn cluster rubyNotTop contains=@rubyCommentNotTop,@rubyStringNotTop,@rubyRegexpSpecial,@rubyDeclaration,@rubyExceptionHandler,@rubyClassOperator,rubyConditional,rubyModuleName,rubyClassName,rubySymbolDelimiter,rubyParentheses,@Spell
+syn cluster rubyNotTop contains=@rubyCommentNotTop,@rubyStringNotTop,@rubyRegexpSpecial,@rubyDeclaration,@rubyExceptionHandler,@rubyClassOperator,rubyConditional,rubyModuleName,rubyClassName,rubySymbolDelimiter,rubyDoubleQuoteSymbolDelimiter,rubySingleQuoteSymbolDelimiter,rubyParentheses,@Spell
 
 " Whitespace Errors {{{1
 if exists("ruby_space_errors")
@@ -468,6 +468,10 @@ syn match rubyDefinedOperator "\%#=1\<defined?" display
 syn match rubySymbol "\%(\w\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[?!]\=::\@!"he=e-1 contained containedin=rubyBlockParameterList,rubyCurlyBlock
 syn match rubySymbol "[]})\"':]\@1<!\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[!?]\=:[[:space:],;]\@="he=e-1
 syn match rubySymbol "[[:space:],{(]\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[!?]\=:[[:space:],;]\@="hs=s+1,he=e-1
+syn match rubySingleQuoteSymbolDelimiter "'" contained
+syn match rubySymbol "'\%(\\.\|[^']\)*'::\@!"he=e-1 contains=rubyQuoteEscape,rubyBackslashEscape,rubySingleQuoteSymbolDelimiter
+syn match rubyDoubleQuoteSymbolDelimiter "\"" contained
+syn match rubySymbol "\"\%(\\.\|[^\"]\)*\"::\@!"he=e-1 contains=@rubyStringSpecial,rubyDoubleQuoteSymbolDelimiter
 
 " __END__ Directive {{{1
 SynFold '__END__' syn region rubyData matchgroup=rubyDataDirective start="^__END__$" end="\%$"
@@ -568,6 +572,8 @@ hi def link rubyHeredocDelimiter	rubyStringDelimiter
 hi def link rubyPercentRegexpDelimiter	rubyRegexpDelimiter
 hi def link rubyPercentStringDelimiter	rubyStringDelimiter
 hi def link rubyPercentSymbolDelimiter	rubySymbolDelimiter
+hi def link rubyDoubleQuoteSymbolDelimiter rubySymbolDelimiter
+hi def link rubySingleQuoteSymbolDelimiter rubySymbolDelimiter
 hi def link rubyRegexpDelimiter		rubyStringDelimiter
 hi def link rubySymbolDelimiter		rubySymbol
 hi def link rubyString			String
diff --git a/syntax/terraform.vim b/syntax/terraform.vim
index c99dbe47c..7a330e45c 100644
--- a/syntax/terraform.vim
+++ b/syntax/terraform.vim
@@ -2,74 +2,14 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'terraform', 'syntax/terraform
   finish
 endif
 
-" Forked from Larry Gilbert's syntax file
-" github.com/L2G/vim-syntax-terraform
-
 if exists('b:current_syntax')
   finish
 endif
+runtime! syntax/hcl.vim
+unlet b:current_syntax
 
-let s:cpo_save = &cpoptions
-set cpoptions&vim
-
-" Identifiers are made up of alphanumeric characters, underscores, and
-" hyphens.
-if has('patch-7.4.1142')
-    syn iskeyword a-z,A-Z,48-57,_,-
-endif
-
-syn case match
-
-" A block is introduced by a type, some number of labels - which are either
-" strings or identifiers - and an opening curly brace.  Match the type.
-syn match terraBlockIntroduction /^\s*\zs\K\k*\ze\s\+\(\("\K\k*"\|\K\k*\)\s\+\)*{/ contains=terraBlockType
-syn keyword terraBlockType contained data locals module output provider resource terraform variable
-
-syn keyword terraValueBool true false on off yes no
-
-syn keyword terraTodo         contained TODO FIXME XXX BUG TF-UPGRADE-TODO
-syn region  terraComment      start="/\*" end="\*/" contains=terraTodo,@Spell
-syn region  terraComment      start="#" end="$" contains=terraTodo,@Spell
-syn region  terraComment      start="//" end="$" contains=terraTodo,@Spell
-
-""" misc.
-syn match terraValueDec      "\<[0-9]\+\([kKmMgG]b\?\)\?\>"
-syn match terraValueHexaDec  "\<0x[0-9a-f]\+\([kKmMgG]b\?\)\?\>"
-syn match terraBraces        "[\[\]]"
-
-""" skip \" and \\ in strings.
-syn region terraValueString   start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=terraStringInterp
-syn region terraStringInterp  matchgroup=terraBraces start=/\(^\|[^$]\)\$\zs{/ end=/}/ contained contains=ALL
-syn region terraHereDocText   start=/<<-\?\z([a-z0-9A-Z]\+\)/ end=/^\s*\z1/ contains=terraStringInterp
-
-"" Functions.
-syn match terraFunction "[a-z0-9]\+(\@="
-
-""" HCL2
-syn keyword terraRepeat         for in
-syn keyword terraConditional    if
 syn keyword terraType           string bool number object tuple list map set any
-syn keyword terraValueNull      null
-
-" enable block folding
-syn region terraBlockBody matchgroup=terraBraces start="{" end="}" fold transparent
 
-hi def link terraComment           Comment
-hi def link terraTodo              Todo
-hi def link terraBraces            Delimiter
-hi def link terraBlockType         Structure
-hi def link terraValueBool         Boolean
-hi def link terraValueDec          Number
-hi def link terraValueHexaDec      Number
-hi def link terraValueString       String
-hi def link terraHereDocText       String
-hi def link terraFunction          Function
-hi def link terraRepeat            Repeat
-hi def link terraConditional       Conditional
-hi def link terraType              Type
-hi def link terraValueNull         Constant
+hi def link terraType           Type
 
 let b:current_syntax = 'terraform'
-
-let &cpoptions = s:cpo_save
-unlet s:cpo_save
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 055824241..15bd60e9e 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -119,7 +119,6 @@ call TestFiletype('haskell')
 call TestFiletype('haxe')
 call TestFiletype('hxml')
 call TestFiletype('hss')
-call TestFiletype('hcl')
 call TestFiletype('hive')
 call TestFiletype('icalendar')
 call TestFiletype('idris')
@@ -221,6 +220,7 @@ call TestFiletype('sxhkdrc')
 call TestFiletype('systemd')
 call TestFiletype('tf')
 call TestFiletype('terraform')
+call TestFiletype('hcl')
 call TestFiletype('textile')
 call TestFiletype('thrift')
 call TestFiletype('tmux')

From 554a6ac7575f87b5b85d1b2bf60e7071c4164cbc Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 8 Jul 2021 12:10:14 +0200
Subject: [PATCH 271/299] Remove java syntax, fixes #723

---
 ftplugin/java.vim |  55 -------
 indent/java.vim   | 154 --------------------
 packages.yaml     |   2 -
 syntax/java.vim   | 359 ----------------------------------------------
 4 files changed, 570 deletions(-)
 delete mode 100644 ftplugin/java.vim
 delete mode 100644 indent/java.vim
 delete mode 100644 syntax/java.vim

diff --git a/ftplugin/java.vim b/ftplugin/java.vim
deleted file mode 100644
index c94ff1fa0..000000000
--- a/ftplugin/java.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'java', 'ftplugin/java.vim')
-  finish
-endif
-
-" Vim filetype plugin file
-" Language:	Java
-" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
-" Last Change:  2012 Mar 11
-" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
-
-if exists("b:did_ftplugin") | finish | endif
-let b:did_ftplugin = 1
-
-" Make sure the continuation lines below do not cause problems in
-" compatibility mode.
-let s:save_cpo = &cpo
-set cpo-=C
-
-" For filename completion, prefer the .java extension over the .class
-" extension.
-set suffixes+=.class
-
-" Enable gf on import statements.  Convert . in the package
-" name to / and append .java to the name, then search the path.
-setlocal includeexpr=substitute(v:fname,'\\.','/','g')
-setlocal suffixesadd=.java
-if exists("g:ftplugin_java_source_path")
-    let &l:path=g:ftplugin_java_source_path . ',' . &l:path
-endif
-
-" Set 'formatoptions' to break comment lines but not other lines,
-" and insert the comment leader when hitting <CR> or using "o".
-setlocal formatoptions-=t formatoptions+=croql
-
-" Set 'comments' to format dashed lists in comments. Behaves just like C.
-setlocal comments& comments^=sO:*\ -,mO:*\ \ ,exO:*/
-
-setlocal commentstring=//%s
-
-" Change the :browse e filter to primarily show Java-related files.
-if has("gui_win32")
-    let  b:browsefilter="Java Files (*.java)\t*.java\n" .
-		\	"Properties Files (*.prop*)\t*.prop*\n" .
-		\	"Manifest Files (*.mf)\t*.mf\n" .
-		\	"All Files (*.*)\t*.*\n"
-endif
-
-" Undo the stuff we changed.
-let b:undo_ftplugin = "setlocal suffixes< suffixesadd<" .
-		\     " formatoptions< comments< commentstring< path< includeexpr<" .
-		\     " | unlet! b:browsefilter"
-
-" Restore the saved compatibility options.
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/indent/java.vim b/indent/java.vim
deleted file mode 100644
index 19f377b23..000000000
--- a/indent/java.vim
+++ /dev/null
@@ -1,154 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'java', 'indent/java.vim')
-  finish
-endif
-
-" Vim indent file
-" Language:	Java
-" Previous Maintainer: Toby Allsopp <toby.allsopp@peace.com>
-" Current Maintainer: Hong Xu <hong@topbug.net>
-" Homepage: http://www.vim.org/scripts/script.php?script_id=3899
-"           https://github.com/xuhdev/indent-java.vim
-" Last Change:	2016 Mar 7
-" Version: 1.1
-" License: Same as Vim.
-" Copyright (c) 2012-2016 Hong Xu
-" Before 2012, this file was maintained by Toby Allsopp.
-
-" Only load this indent file when no other was loaded.
-if exists("b:did_indent")
-  finish
-endif
-let b:did_indent = 1
-
-" Indent Java anonymous classes correctly.
-setlocal cindent cinoptions& cinoptions+=j1
-
-" The "extends" and "implements" lines start off with the wrong indent.
-setlocal indentkeys& indentkeys+=0=extends indentkeys+=0=implements
-
-" Set the function to do the work.
-setlocal indentexpr=GetJavaIndent()
-
-let b:undo_indent = "set cin< cino< indentkeys< indentexpr<"
-
-" Only define the function once.
-if exists("*GetJavaIndent")
-  finish
-endif
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-function! SkipJavaBlanksAndComments(startline)
-  let lnum = a:startline
-  while lnum > 1
-    let lnum = prevnonblank(lnum)
-    if getline(lnum) =~ '\*/\s*$'
-      while getline(lnum) !~ '/\*' && lnum > 1
-        let lnum = lnum - 1
-      endwhile
-      if getline(lnum) =~ '^\s*/\*'
-        let lnum = lnum - 1
-      else
-        break
-      endif
-    elseif getline(lnum) =~ '^\s*//'
-      let lnum = lnum - 1
-    else
-      break
-    endif
-  endwhile
-  return lnum
-endfunction
-
-function GetJavaIndent()
-
-  " Java is just like C; use the built-in C indenting and then correct a few
-  " specific cases.
-  let theIndent = cindent(v:lnum)
-
-  " If we're in the middle of a comment then just trust cindent
-  if getline(v:lnum) =~ '^\s*\*'
-    return theIndent
-  endif
-
-  " find start of previous line, in case it was a continuation line
-  let lnum = SkipJavaBlanksAndComments(v:lnum - 1)
-
-  " If the previous line starts with '@', we should have the same indent as
-  " the previous one
-  if getline(lnum) =~ '^\s*@.*$'
-    return indent(lnum)
-  endif
-
-  let prev = lnum
-  while prev > 1
-    let next_prev = SkipJavaBlanksAndComments(prev - 1)
-    if getline(next_prev) !~ ',\s*$'
-      break
-    endif
-    let prev = next_prev
-  endwhile
-
-  " Try to align "throws" lines for methods and "extends" and "implements" for
-  " classes.
-  if getline(v:lnum) =~ '^\s*\(throws\|extends\|implements\)\>'
-        \ && getline(lnum) !~ '^\s*\(throws\|extends\|implements\)\>'
-    let theIndent = theIndent + shiftwidth()
-  endif
-
-  " correct for continuation lines of "throws", "implements" and "extends"
-  let cont_kw = matchstr(getline(prev),
-        \ '^\s*\zs\(throws\|implements\|extends\)\>\ze.*,\s*$')
-  if strlen(cont_kw) > 0
-    let amount = strlen(cont_kw) + 1
-    if getline(lnum) !~ ',\s*$'
-      let theIndent = theIndent - (amount + shiftwidth())
-      if theIndent < 0
-        let theIndent = 0
-      endif
-    elseif prev == lnum
-      let theIndent = theIndent + amount
-      if cont_kw ==# 'throws'
-        let theIndent = theIndent + shiftwidth()
-      endif
-    endif
-  elseif getline(prev) =~ '^\s*\(throws\|implements\|extends\)\>'
-        \ && (getline(prev) =~ '{\s*$'
-        \  || getline(v:lnum) =~ '^\s*{\s*$')
-    let theIndent = theIndent - shiftwidth()
-  endif
-
-  " When the line starts with a }, try aligning it with the matching {,
-  " skipping over "throws", "extends" and "implements" clauses.
-  if getline(v:lnum) =~ '^\s*}\s*\(//.*\|/\*.*\)\=$'
-    call cursor(v:lnum, 1)
-    silent normal! %
-    let lnum = line('.')
-    if lnum < v:lnum
-      while lnum > 1
-        let next_lnum = SkipJavaBlanksAndComments(lnum - 1)
-        if getline(lnum) !~ '^\s*\(throws\|extends\|implements\)\>'
-              \ && getline(next_lnum) !~ ',\s*$'
-          break
-        endif
-        let lnum = prevnonblank(next_lnum)
-      endwhile
-      return indent(lnum)
-    endif
-  endif
-
-  " Below a line starting with "}" never indent more.  Needed for a method
-  " below a method with an indented "throws" clause.
-  let lnum = SkipJavaBlanksAndComments(v:lnum - 1)
-  if getline(lnum) =~ '^\s*}\s*\(//.*\|/\*.*\)\=$' && indent(lnum) < theIndent
-    let theIndent = indent(lnum)
-  endif
-
-  return theIndent
-endfunction
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vi: sw=2 et
diff --git a/packages.yaml b/packages.yaml
index e4295b077..4c4fa9ddf 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -3207,8 +3207,6 @@ filetypes:
   - pattern: Prl*.*,JAM*.*
 ---
 name: java
-remote: vim/vim:runtime
-glob: "**/java.vim"
 filetypes:
 - name: java
   patterns:
diff --git a/syntax/java.vim b/syntax/java.vim
deleted file mode 100644
index c445e00e7..000000000
--- a/syntax/java.vim
+++ /dev/null
@@ -1,359 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'java', 'syntax/java.vim')
-  finish
-endif
-
-" Vim syntax file
-" Language:	Java
-" Maintainer:	Claudio Fleiner <claudio@fleiner.com>
-" URL:          https://github.com/fleiner/vim/blob/master/runtime/syntax/java.vim
-" Last Change:	2018 July 26
-
-" Please check :help java.vim for comments on some of the options available.
-
-" quit when a syntax file was already loaded
-if !exists("main_syntax")
-  if exists("b:current_syntax")
-    finish
-  endif
-  " we define it here so that included files can test for it
-  let main_syntax='java'
-  syn region javaFold start="{" end="}" transparent fold
-endif
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-" some characters that cannot be in a java program (outside a string)
-syn match javaError "[\\@`]"
-syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|\*\/"
-
-syn match javaOK "\.\.\."
-
-" use separate name so that it can be deleted in javacc.vim
-syn match   javaError2 "#\|=<"
-hi def link javaError2 javaError
-
-" keyword definitions
-syn keyword javaExternal	native package
-syn match javaExternal		"\<import\>\(\s\+static\>\)\?"
-syn keyword javaError		goto const
-syn keyword javaConditional	if else switch
-syn keyword javaRepeat		while for do
-syn keyword javaBoolean		true false
-syn keyword javaConstant	null
-syn keyword javaTypedef		this super
-syn keyword javaOperator	var new instanceof
-syn keyword javaType		boolean char byte short int long float double
-syn keyword javaType		void
-syn keyword javaStatement	return
-syn keyword javaStorageClass	static synchronized transient volatile final strictfp serializable
-syn keyword javaExceptions	throw try catch finally
-syn keyword javaAssert		assert
-syn keyword javaMethodDecl	synchronized throws
-syn keyword javaClassDecl	extends implements interface
-" to differentiate the keyword class from MyClass.class we use a match here
-syn match   javaTypedef		"\.\s*\<class\>"ms=s+1
-syn keyword javaClassDecl	enum
-syn match   javaClassDecl	"^class\>"
-syn match   javaClassDecl	"[^.]\s*\<class\>"ms=s+1
-syn match   javaAnnotation	"@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>" contains=javaString
-syn match   javaClassDecl	"@interface\>"
-syn keyword javaBranch		break continue nextgroup=javaUserLabelRef skipwhite
-syn match   javaUserLabelRef	"\k\+" contained
-syn match   javaVarArg		"\.\.\."
-syn keyword javaScopeDecl	public protected private abstract
-
-" Java Modules(Since Java 9, for "module-info.java" file)
-if fnamemodify(bufname("%"), ":t") == "module-info.java"
-    syn keyword javaModuleStorageClass	module transitive
-    syn keyword javaModuleStmt		open requires exports opens uses provides
-    syn keyword javaModuleExternal	to with
-    syn cluster javaTop add=javaModuleStorageClass,javaModuleStmt,javaModuleExternal
-endif
-
-if exists("java_highlight_java_lang_ids")
-  let java_highlight_all=1
-endif
-if exists("java_highlight_all")  || exists("java_highlight_java")  || exists("java_highlight_java_lang")
-  " java.lang.*
-  syn match javaLangClass "\<System\>"
-  syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException
-  syn cluster javaTop add=javaR_JavaLang
-  syn cluster javaClasses add=javaR_JavaLang
-  hi def link javaR_JavaLang javaR_Java
-  syn keyword javaC_JavaLang Process RuntimePermission StringKeySet CharacterData01 Class ThreadLocal ThreadLocalMap CharacterData0E Package Character StringCoding Long ProcessImpl ProcessEnvironment Short AssertionStatusDirectives 1PackageInfoProxy UnicodeBlock InheritableThreadLocal AbstractStringBuilder StringEnvironment ClassLoader ConditionalSpecialCasing CharacterDataPrivateUse StringBuffer StringDecoder Entry StringEntry WrappedHook StringBuilder StrictMath State ThreadGroup Runtime CharacterData02 MethodArray Object CharacterDataUndefined Integer Gate Boolean Enum Variable Subset StringEncoder Void Terminator CharsetSD IntegerCache CharacterCache Byte CharsetSE Thread SystemClassLoaderAction CharacterDataLatin1 StringValues StackTraceElement Shutdown ShortCache String ConverterSD ByteCache Lock EnclosingMethodInfo Math Float Value Double SecurityManager LongCache ProcessBuilder StringEntrySet Compiler Number UNIXProcess ConverterSE ExternalData CaseInsensitiveComparator CharacterData00 NativeLibrary
-  syn cluster javaTop add=javaC_JavaLang
-  syn cluster javaClasses add=javaC_JavaLang
-  hi def link javaC_JavaLang javaC_Java
-  syn keyword javaE_JavaLang IncompatibleClassChangeError InternalError UnknownError ClassCircularityError AssertionError ThreadDeath IllegalAccessError NoClassDefFoundError ClassFormatError UnsupportedClassVersionError NoSuchFieldError VerifyError ExceptionInInitializerError InstantiationError LinkageError NoSuchMethodError Error UnsatisfiedLinkError StackOverflowError AbstractMethodError VirtualMachineError OutOfMemoryError
-  syn cluster javaTop add=javaE_JavaLang
-  syn cluster javaClasses add=javaE_JavaLang
-  hi def link javaE_JavaLang javaE_Java
-  syn keyword javaX_JavaLang CloneNotSupportedException Exception NoSuchMethodException IllegalAccessException NoSuchFieldException Throwable InterruptedException ClassNotFoundException InstantiationException
-  syn cluster javaTop add=javaX_JavaLang
-  syn cluster javaClasses add=javaX_JavaLang
-  hi def link javaX_JavaLang javaX_Java
-
-  hi def link javaR_Java javaR_
-  hi def link javaC_Java javaC_
-  hi def link javaE_Java javaE_
-  hi def link javaX_Java javaX_
-  hi def link javaX_		     javaExceptions
-  hi def link javaR_		     javaExceptions
-  hi def link javaE_		     javaExceptions
-  hi def link javaC_		     javaConstant
-
-  syn keyword javaLangObject clone equals finalize getClass hashCode
-  syn keyword javaLangObject notify notifyAll toString wait
-  hi def link javaLangObject		     javaConstant
-  syn cluster javaTop add=javaLangObject
-endif
-
-if filereadable(expand("<sfile>:p:h")."/javaid.vim")
-  source <sfile>:p:h/javaid.vim
-endif
-
-if exists("java_space_errors")
-  if !exists("java_no_trail_space_error")
-    syn match	javaSpaceError	"\s\+$"
-  endif
-  if !exists("java_no_tab_space_error")
-    syn match	javaSpaceError	" \+\t"me=e-1
-  endif
-endif
-
-syn region  javaLabelRegion	transparent matchgroup=javaLabel start="\<case\>" matchgroup=NONE end=":" contains=javaNumber,javaCharacter,javaString
-syn match   javaUserLabel	"^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=javaLabel
-syn keyword javaLabel		default
-
-" highlighting C++ keywords as errors removed, too many people find it
-" annoying.  Was: if !exists("java_allow_cpp_keywords")
-
-" The following cluster contains all java groups except the contained ones
-syn cluster javaTop add=javaExternal,javaError,javaError,javaBranch,javaLabelRegion,javaLabel,javaConditional,javaRepeat,javaBoolean,javaConstant,javaTypedef,javaOperator,javaType,javaType,javaStatement,javaStorageClass,javaAssert,javaExceptions,javaMethodDecl,javaClassDecl,javaClassDecl,javaClassDecl,javaScopeDecl,javaError,javaError2,javaUserLabel,javaLangObject,javaAnnotation,javaVarArg
-
-
-" Comments
-syn keyword javaTodo		 contained TODO FIXME XXX
-if exists("java_comment_strings")
-  syn region  javaCommentString    contained start=+"+ end=+"+ end=+$+ end=+\*/+me=s-1,he=s-1 contains=javaSpecial,javaCommentStar,javaSpecialChar,@Spell
-  syn region  javaComment2String   contained start=+"+	end=+$\|"+  contains=javaSpecial,javaSpecialChar,@Spell
-  syn match   javaCommentCharacter contained "'\\[^']\{1,6\}'" contains=javaSpecialChar
-  syn match   javaCommentCharacter contained "'\\''" contains=javaSpecialChar
-  syn match   javaCommentCharacter contained "'[^\\]'"
-  syn cluster javaCommentSpecial add=javaCommentString,javaCommentCharacter,javaNumber
-  syn cluster javaCommentSpecial2 add=javaComment2String,javaCommentCharacter,javaNumber
-endif
-syn region  javaComment		 start="/\*"  end="\*/" contains=@javaCommentSpecial,javaTodo,@Spell
-syn match   javaCommentStar	 contained "^\s*\*[^/]"me=e-1
-syn match   javaCommentStar	 contained "^\s*\*$"
-syn match   javaLineComment	 "//.*" contains=@javaCommentSpecial2,javaTodo,@Spell
-hi def link javaCommentString javaString
-hi def link javaComment2String javaString
-hi def link javaCommentCharacter javaCharacter
-
-syn cluster javaTop add=javaComment,javaLineComment
-
-if !exists("java_ignore_javadoc") && main_syntax != 'jsp'
-  syntax case ignore
-  " syntax coloring for javadoc comments (HTML)
-  syntax include @javaHtml <sfile>:p:h/html.vim
-  unlet b:current_syntax
-  " HTML enables spell checking for all text that is not in a syntax item. This
-  " is wrong for Java (all identifiers would be spell-checked), so it's undone
-  " here.
-  syntax spell default
-
-  syn region  javaDocComment	start="/\*\*"  end="\*/" keepend contains=javaCommentTitle,@javaHtml,javaDocTags,javaDocSeeTag,javaTodo,@Spell
-  syn region  javaCommentTitle	contained matchgroup=javaDocComment start="/\*\*"   matchgroup=javaCommentTitle keepend end="\.$" end="\.[ \t\r<&]"me=e-1 end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1 contains=@javaHtml,javaCommentStar,javaTodo,@Spell,javaDocTags,javaDocSeeTag
-
-  syn region javaDocTags	 contained start="{@\(code\|link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}"
-  syn match  javaDocTags	 contained "@\(param\|exception\|throws\|since\)\s\+\S\+" contains=javaDocParam
-  syn match  javaDocParam	 contained "\s\S\+"
-  syn match  javaDocTags	 contained "@\(version\|author\|return\|deprecated\|serial\|serialField\|serialData\)\>"
-  syn region javaDocSeeTag	 contained matchgroup=javaDocTags start="@see\s\+" matchgroup=NONE end="\_."re=e-1 contains=javaDocSeeTagParam
-  syn match  javaDocSeeTagParam  contained @"\_[^"]\+"\|<a\s\+\_.\{-}</a>\|\(\k\|\.\)*\(#\k\+\((\_[^)]\+)\)\=\)\=@ extend
-  syntax case match
-endif
-
-" match the special comment /**/
-syn match   javaComment		 "/\*\*/"
-
-" Strings and constants
-syn match   javaSpecialError	 contained "\\."
-syn match   javaSpecialCharError contained "[^']"
-syn match   javaSpecialChar	 contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\)"
-syn region  javaString		start=+"+ end=+"+ end=+$+ contains=javaSpecialChar,javaSpecialError,@Spell
-" next line disabled, it can cause a crash for a long line
-"syn match   javaStringError	  +"\([^"\\]\|\\.\)*$+
-syn match   javaCharacter	 "'[^']*'" contains=javaSpecialChar,javaSpecialCharError
-syn match   javaCharacter	 "'\\''" contains=javaSpecialChar
-syn match   javaCharacter	 "'[^\\]'"
-syn match   javaNumber		 "\<\(0[bB][0-1]\+\|0[0-7]*\|0[xX]\x\+\|\d\(\d\|_\d\)*\)[lL]\=\>"
-syn match   javaNumber		 "\(\<\d\(\d\|_\d\)*\.\(\d\(\d\|_\d\)*\)\=\|\.\d\(\d\|_\d\)*\)\([eE][-+]\=\d\(\d\|_\d\)*\)\=[fFdD]\="
-syn match   javaNumber		 "\<\d\(\d\|_\d\)*[eE][-+]\=\d\(\d\|_\d\)*[fFdD]\=\>"
-syn match   javaNumber		 "\<\d\(\d\|_\d\)*\([eE][-+]\=\d\(\d\|_\d\)*\)\=[fFdD]\>"
-
-" unicode characters
-syn match   javaSpecial "\\u\d\{4\}"
-
-syn cluster javaTop add=javaString,javaCharacter,javaNumber,javaSpecial,javaStringError
-
-if exists("java_highlight_functions")
-  if java_highlight_functions == "indent"
-    syn match  javaFuncDef "^\(\t\| \{8\}\)[_$a-zA-Z][_$a-zA-Z0-9_. \[\]<>]*([^-+*/]*)" contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses,javaAnnotation
-    syn region javaFuncDef start=+^\(\t\| \{8\}\)[$_a-zA-Z][$_a-zA-Z0-9_. \[\]<>]*([^-+*/]*,\s*+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses,javaAnnotation
-    syn match  javaFuncDef "^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]<>]*([^-+*/]*)" contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses,javaAnnotation
-    syn region javaFuncDef start=+^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]<>]*([^-+*/]*,\s*+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,@javaClasses,javaAnnotation
-  else
-    " This line catches method declarations at any indentation>0, but it assumes
-    " two things:
-    "	1. class names are always capitalized (ie: Button)
-    "	2. method names are never capitalized (except constructors, of course)
-    "syn region javaFuncDef start=+^\s\+\(\(public\|protected\|private\|static\|abstract\|final\|native\|synchronized\)\s\+\)*\(\(void\|boolean\|char\|byte\|short\|int\|long\|float\|double\|\([A-Za-z_][A-Za-z0-9_$]*\.\)*[A-Z][A-Za-z0-9_$]*\)\(<[^>]*>\)\=\(\[\]\)*\s\+[a-z][A-Za-z0-9_$]*\|[A-Z][A-Za-z0-9_$]*\)\s*([^0-9]+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,javaComment,javaLineComment,@javaClasses
-    syn region javaFuncDef start=+^\s\+\(\(public\|protected\|private\|static\|abstract\|final\|native\|synchronized\)\s\+\)*\(<.*>\s\+\)\?\(\(void\|boolean\|char\|byte\|short\|int\|long\|float\|double\|\([A-Za-z_][A-Za-z0-9_$]*\.\)*[A-Z][A-Za-z0-9_$]*\)\(<[^(){}]*>\)\=\(\[\]\)*\s\+[a-z][A-Za-z0-9_$]*\|[A-Z][A-Za-z0-9_$]*\)\s*(+ end=+)+ contains=javaScopeDecl,javaType,javaStorageClass,javaComment,javaLineComment,@javaClasses,javaAnnotation
-  endif
-  syn match javaLambdaDef "[a-zA-Z_][a-zA-Z0-9_]*\s*->"
-  syn match  javaBraces  "[{}]"
-  syn cluster javaTop add=javaFuncDef,javaBraces,javaLambdaDef
-endif
-
-if exists("java_highlight_debug")
-
-  " Strings and constants
-  syn match   javaDebugSpecial		contained "\\\d\d\d\|\\."
-  syn region  javaDebugString		contained start=+"+  end=+"+  contains=javaDebugSpecial
-  syn match   javaDebugStringError	+"\([^"\\]\|\\.\)*$+
-  syn match   javaDebugCharacter	contained "'[^\\]'"
-  syn match   javaDebugSpecialCharacter contained "'\\.'"
-  syn match   javaDebugSpecialCharacter contained "'\\''"
-  syn match   javaDebugNumber		contained "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
-  syn match   javaDebugNumber		contained "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
-  syn match   javaDebugNumber		contained "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
-  syn match   javaDebugNumber		contained "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
-  syn keyword javaDebugBoolean		contained true false
-  syn keyword javaDebugType		contained null this super
-  syn region javaDebugParen  start=+(+ end=+)+ contained contains=javaDebug.*,javaDebugParen
-
-  " to make this work you must define the highlighting for these groups
-  syn match javaDebug "\<System\.\(out\|err\)\.print\(ln\)*\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
-  syn match javaDebug "\<p\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
-  syn match javaDebug "[A-Za-z][a-zA-Z0-9_]*\.printStackTrace\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
-  syn match javaDebug "\<trace[SL]\=\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
-
-  syn cluster javaTop add=javaDebug
-
-  hi def link javaDebug		 Debug
-  hi def link javaDebugString		 DebugString
-  hi def link javaDebugStringError	 javaError
-  hi def link javaDebugType		 DebugType
-  hi def link javaDebugBoolean		 DebugBoolean
-  hi def link javaDebugNumber		 Debug
-  hi def link javaDebugSpecial		 DebugSpecial
-  hi def link javaDebugSpecialCharacter DebugSpecial
-  hi def link javaDebugCharacter	 DebugString
-  hi def link javaDebugParen		 Debug
-
-  hi def link DebugString		 String
-  hi def link DebugSpecial		 Special
-  hi def link DebugBoolean		 Boolean
-  hi def link DebugType		 Type
-endif
-
-if exists("java_mark_braces_in_parens_as_errors")
-  syn match javaInParen		 contained "[{}]"
-  hi def link javaInParen	javaError
-  syn cluster javaTop add=javaInParen
-endif
-
-" catch errors caused by wrong parenthesis
-syn region  javaParenT	transparent matchgroup=javaParen  start="(" end=")" contains=@javaTop,javaParenT1
-syn region  javaParenT1 transparent matchgroup=javaParen1 start="(" end=")" contains=@javaTop,javaParenT2 contained
-syn region  javaParenT2 transparent matchgroup=javaParen2 start="(" end=")" contains=@javaTop,javaParenT  contained
-syn match   javaParenError	 ")"
-" catch errors caused by wrong square parenthesis
-syn region  javaParenT	transparent matchgroup=javaParen  start="\[" end="\]" contains=@javaTop,javaParenT1
-syn region  javaParenT1 transparent matchgroup=javaParen1 start="\[" end="\]" contains=@javaTop,javaParenT2 contained
-syn region  javaParenT2 transparent matchgroup=javaParen2 start="\[" end="\]" contains=@javaTop,javaParenT  contained
-syn match   javaParenError	 "\]"
-
-hi def link javaParenError	javaError
-
-if exists("java_highlight_functions")
-   syn match javaLambdaDef "([a-zA-Z0-9_<>\[\], \t]*)\s*->"
-   " needs to be defined after the parenthesis error catcher to work
-endif
-
-if !exists("java_minlines")
-  let java_minlines = 10
-endif
-exec "syn sync ccomment javaComment minlines=" . java_minlines
-
-" The default highlighting.
-hi def link javaLambdaDef		Function
-hi def link javaFuncDef		Function
-hi def link javaVarArg			Function
-hi def link javaBraces			Function
-hi def link javaBranch			Conditional
-hi def link javaUserLabelRef		javaUserLabel
-hi def link javaLabel			Label
-hi def link javaUserLabel		Label
-hi def link javaConditional		Conditional
-hi def link javaRepeat			Repeat
-hi def link javaExceptions		Exception
-hi def link javaAssert			Statement
-hi def link javaStorageClass		StorageClass
-hi def link javaMethodDecl		javaStorageClass
-hi def link javaClassDecl		javaStorageClass
-hi def link javaScopeDecl		javaStorageClass
-
-hi def link javaBoolean		Boolean
-hi def link javaSpecial		Special
-hi def link javaSpecialError		Error
-hi def link javaSpecialCharError	Error
-hi def link javaString			String
-hi def link javaCharacter		Character
-hi def link javaSpecialChar		SpecialChar
-hi def link javaNumber			Number
-hi def link javaError			Error
-hi def link javaStringError		Error
-hi def link javaStatement		Statement
-hi def link javaOperator		Operator
-hi def link javaComment		Comment
-hi def link javaDocComment		Comment
-hi def link javaLineComment		Comment
-hi def link javaConstant		Constant
-hi def link javaTypedef		Typedef
-hi def link javaTodo			Todo
-hi def link javaAnnotation		PreProc
-
-hi def link javaCommentTitle		SpecialComment
-hi def link javaDocTags		Special
-hi def link javaDocParam		Function
-hi def link javaDocSeeTagParam		Function
-hi def link javaCommentStar		javaComment
-
-hi def link javaType			Type
-hi def link javaExternal		Include
-
-hi def link htmlComment		Special
-hi def link htmlCommentPart		Special
-hi def link javaSpaceError		Error
-
-if fnamemodify(bufname("%"), ":t") == "module-info.java"
-    hi def link javaModuleStorageClass	StorageClass
-    hi def link javaModuleStmt		Statement
-    hi def link javaModuleExternal	Include
-endif
-
-let b:current_syntax = "java"
-
-if main_syntax == 'java'
-  unlet main_syntax
-endif
-
-let b:spell_options="contained"
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: ts=8

From ce31cd1d2f4e8eee9fd91325e4599f15cb9566fd Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 28 Jul 2021 17:54:35 +0200
Subject: [PATCH 272/299] Update

---
 after/syntax/c.vim         |   4 +-
 autoload/fsharp.vim        | 171 +++++++++++++++++++++++++++++--------
 autoload/puppet/align.vim  |   4 +-
 autoload/puppet/ctags.vim  |  10 +--
 compiler/puppet-lint.vim   |   6 +-
 ftplugin/epuppet.vim       |  24 +++---
 ftplugin/puppet.vim        |   6 +-
 ftplugin/puppet_tagbar.vim |   2 +-
 ftplugin/terraform.vim     |   3 -
 indent/puppet.vim          |  16 ++--
 indent/ruby.vim            |  36 ++++++--
 syntax/ansible.vim         |   2 +-
 syntax/basic/members.vim   |   2 +-
 syntax/epuppet.vim         |   4 +-
 syntax/git.vim             |   2 +-
 syntax/puppet.vim          |   4 +-
 16 files changed, 209 insertions(+), 87 deletions(-)

diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index a5daa792a..0196b3d49 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -8,7 +8,7 @@ endif
 " Original Author: Mikhail Wolfson <mywolfson@gmail.com>
 " Maintainer:      bfrg <https://github.com/bfrg>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Nov 23, 2020
+" Last Change:     Jul 24, 2021
 "
 " This syntax file is based on:
 " https://github.com/octol/vim-cpp-enhanced-highlight
@@ -20,7 +20,7 @@ syn keyword cTodo contained BUG NOTE
 
 
 " Highlight function names
-if !get(g:, 'cpp_no_function_highlight', 0)
+if get(g:, 'cpp_function_highlight', 1)
     syn match cUserFunction "\<\h\w*\>\(\s\|\n\)*("me=e-1 contains=cParen,cCppParen
     hi def link cUserFunction Function
 endif
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index 67f564954..8567a0379 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -12,6 +12,15 @@ let g:loaded_autoload_fsharp = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
+
+" basic setups
+
+let s:script_root_dir = expand('<sfile>:p:h') . "/../"
+
+if has('nvim-0.5')
+    lua ionide = require("ionide")
+endif
+
 function! s:prompt(msg)
     let height = &cmdheight
     if height < 2
@@ -21,6 +30,9 @@ function! s:prompt(msg)
     let &cmdheight = height
 endfunction
 
+
+" FSAC payload interfaces
+
 function! s:PlainNotification(content)
     return { 'Content': a:content }
 endfunction
@@ -80,8 +92,24 @@ function! s:FsdnRequest(query)
     return { 'Query': a:query }
 endfunction
 
+
+" LSP functions
+
 function! s:call(method, params, cont)
-    call LanguageClient#Call(a:method, a:params, a:cont)
+    if g:fsharp#backend == 'languageclient-neovim'
+        call LanguageClient#Call(a:method, a:params, a:cont)
+    elseif g:fsharp#backend == 'nvim'
+        let key = fsharp#register_callback(a:cont)
+        call luaeval('ionide.call(_A[1], _A[2], _A[3])', [a:method, a:params, key])
+    endif
+endfunction
+
+function! s:notify(method, params)
+    if g:fsharp#backend == 'languageclient-neovim'
+        call LanguageClient#Notify(a:method, a:params)
+    elseif g:fsharp#backend == 'nvim'
+        call luaeval('ionide.notify(_A[1], _A[2])', [a:method, a:params])
+    endif
 endfunction
 
 function! s:signature(filePath, line, character, cont)
@@ -121,6 +149,9 @@ function! s:documentationSymbol(xmlSig, assembly, cont)
     return s:call('fsharp/documentationSymbol', s:DocumentationForSymbolRequest(a:xmlSig, a:assembly), a:cont)
 endfunction
 
+
+" FSAC configuration
+
 " FSharpConfigDto from https://github.com/fsharp/FsAutoComplete/blob/master/src/FsAutoComplete/LspHelpers.fs
 "
 " * The following options seems not working with workspace/didChangeConfiguration
@@ -160,7 +191,7 @@ let s:config_keys_camel =
     \ ]
 let s:config_keys = []
 
-function! fsharp#toSnakeCase(str)
+function! s:toSnakeCase(str)
     let sn = substitute(a:str, '\(\<\u\l\+\|\l\+\)\(\u\)', '\l\1_\l\2', 'g')
     if sn == a:str | return tolower(a:str) | endif
     return sn
@@ -170,7 +201,7 @@ function! s:buildConfigKeys()
     if len(s:config_keys) == 0
         for key_camel in s:config_keys_camel
             let key = {}
-            let key.snake = fsharp#toSnakeCase(key_camel.key)
+            let key.snake = s:toSnakeCase(key_camel.key)
             let key.camel = key_camel.key
             if has_key(key_camel, 'default')
                 let key.default = key_camel.default
@@ -180,7 +211,7 @@ function! s:buildConfigKeys()
     endif
 endfunction
 
-function! g:fsharp#getServerConfig()
+function! fsharp#getServerConfig()
     let fsharp = {}
     call s:buildConfigKeys()
     for key in s:config_keys
@@ -196,12 +227,76 @@ function! g:fsharp#getServerConfig()
     return fsharp
 endfunction
 
-function! g:fsharp#updateServerConfig()
+function! fsharp#updateServerConfig()
     let fsharp = fsharp#getServerConfig()
     let settings = {'settings': {'FSharp': fsharp}}
-    call LanguageClient#Notify('workspace/didChangeConfiguration', settings)
+    call s:notify('workspace/didChangeConfiguration', settings)
+endfunction
+
+
+" handlers for notifications
+
+let s:handlers = {
+    \ 'fsharp/notifyWorkspace': 'fsharp#handle_notifyWorkspace',
+    \ }
+
+function! s:registerAutocmds()
+    if g:fsharp#backend == 'nvim' && g:fsharp#lsp_codelens
+        augroup FSharp_AutoRefreshCodeLens
+            autocmd!
+            autocmd CursorHold,InsertLeave <buffer> lua vim.lsp.codelens.refresh()
+        augroup END
+    endif
+    if g:fsharp#backend != 'disable'
+        augroup FSharp_OnCursorMove
+            autocmd!
+            autocmd CursorMoved *.fs,*.fsi,*.fsx  call fsharp#OnCursorMove()
+        augroup END
+    endif
+endfunction
+
+function! fsharp#initialize()
+    echom '[FSAC] Initialized'
+    if g:fsharp#backend == 'languageclient-neovim'
+        call LanguageClient_registerHandlers(s:handlers)
+    endif
+    call fsharp#updateServerConfig()
+    call s:registerAutocmds()
+endfunction
+
+
+" nvim-lsp specific functions
+
+" handlers are picked up by ionide.setup()
+function! fsharp#get_handlers()
+    return s:handlers
 endfunction
 
+let s:callbacks = {}
+
+function! fsharp#register_callback(fn)
+    if g:fsharp#backend != 'nvim'
+        return -1
+    endif
+    let rnd = reltimestr(reltime())
+    let s:callbacks[rnd] = a:fn
+    return rnd
+endfunction
+
+function! fsharp#resolve_callback(key, arg)
+    if g:fsharp#backend != 'nvim'
+        return
+    endif
+    if has_key(s:callbacks, a:key)
+        let Callback = s:callbacks[a:key]
+        call Callback(a:arg)
+        call remove(s:callbacks, a:key)
+    endif
+endfunction
+
+
+" .NET/F# specific operations
+
 function! s:findWorkspace(dir, cont)
     let s:cont_findWorkspace = a:cont
     function! s:callback_findWorkspace(result)
@@ -237,13 +332,20 @@ endfunction
 
 let s:workspace = []
 
+function! fsharp#handle_notifyWorkspace(payload) abort
+    let content = json_decode(a:payload.content)
+    if content.Kind == 'projectLoading'
+        echom "[FSAC] Loading" content.Data.Project
+        let s:workspace = uniq(sort(add(s:workspace, content.Data.Project)))
+    elseif content.Kind == 'workspaceLoad' && content.Data.Status == 'finished'
+        echom printf("[FSAC] Workspace loaded (%d project(s))", len(s:workspace))
+        call fsharp#updateServerConfig()
+    endif
+endfunction
+
+
 function! s:load(arg)
-    let s:loading_workspace = a:arg
-    function! s:callback_load(_)
-        echo "[FSAC] Workspace loaded: " . join(s:loading_workspace, ', ')
-        let s:workspace = s:workspace + s:loading_workspace
-    endfunction
-    call s:workspaceLoad(a:arg, function("s:callback_load"))
+    call s:workspaceLoad(a:arg, v:null)
 endfunction
 
 function! fsharp#loadProject(...)
@@ -254,23 +356,15 @@ function! fsharp#loadProject(...)
     call s:load(prjs)
 endfunction
 
-function! fsharp#loadWorkspaceAuto()
-    if &ft == 'fsharp'
-        call fsharp#updateServerConfig()
-        if g:fsharp#automatic_workspace_init
-            echom "[FSAC] Loading workspace..."
-            let bufferDirectory = fnamemodify(resolve(expand('%:p')), ':h')
-            call s:findWorkspace(bufferDirectory, function("s:load"))
-        endif
-    endif
+function! fsharp#showLoadedProjects()
+    for proj in s:workspace
+        echo "-" proj
+    endfor
 endfunction
 
 function! fsharp#reloadProjects()
     if len(s:workspace) > 0
-        function! s:callback_reloadProjects(_)
-            call s:prompt("[FSAC] Workspace reloaded.")
-        endfunction
-        call s:workspaceLoad(s:workspace, function("s:callback_reloadProjects"))
+        call s:workspaceLoad(s:workspace, v:null)
     else
         echom "[FSAC] Workspace is empty"
     endif
@@ -288,7 +382,7 @@ function! fsharp#showSignature()
         if exists('result.result.content')
             let content = json_decode(result.result.content)
             if exists('content.Data')
-                echom substitute(content.Data, '\n\+$', ' ', 'g')
+                echo substitute(content.Data, '\n\+$', ' ', 'g')
             endif
         endif
     endfunction
@@ -306,13 +400,21 @@ function! fsharp#showF1Help()
     echo result
 endfunction
 
+function! s:hover()
+    if g:fsharp#backend == 'languageclient-neovim'
+        call LanguageClient#textDocument_hover()
+    elseif g:fsharp#backend == 'nvim'
+        lua vim.lsp.buf.hover()
+    endif
+endfunction
+
 function! fsharp#showTooltip()
     function! s:callback_showTooltip(result)
         let result = a:result
         if exists('result.result.content')
             let content = json_decode(result.result.content)
             if exists('content.Data')
-                call LanguageClient#textDocument_hover()
+                call s:hover()
             endif
         endif
     endfunction
@@ -320,12 +422,8 @@ function! fsharp#showTooltip()
     call s:signature(expand('%:p'), line('.') - 1, col('.') - 1, function("s:callback_showTooltip"))
 endfunction
 
-let s:script_root_dir = expand('<sfile>:p:h') . "/../"
-let s:fsac = fnamemodify(s:script_root_dir . "fsac/fsautocomplete.dll", ":p")
-let g:fsharp#languageserver_command =
-    \ ['dotnet', s:fsac,
-        \ '--background-service-enabled'
-    \ ]
+
+" FSAC update utils
 
 function! s:update_win()
     echom "[FSAC] Downloading FSAC. This may take a while..."
@@ -357,6 +455,9 @@ function! fsharp#updateFSAC(...)
     endif
 endfunction
 
+
+" FSI integration
+
 let s:fsi_buffer = -1
 let s:fsi_job    = -1
 let s:fsi_width  = 0
@@ -385,7 +486,6 @@ endfunction
 function! fsharp#openFsi(returnFocus)
     if bufwinid(s:fsi_buffer) <= 0
         let fsi_command = s:get_fsi_command()
-        " Neovim
         if exists('*termopen') || exists('*term_start')
             let current_win = win_getid()
             execute g:fsharp#fsi_window_command
@@ -429,7 +529,7 @@ function! fsharp#openFsi(returnFocus)
             if a:returnFocus | call s:win_gotoid_safe(current_win) | endif
             return s:fsi_buffer
         else
-            echom "[FSAC] Your Vim does not support terminal".
+            echom "[FSAC] Your (neo)vim does not support terminal".
             return 0
         endif
     endif
@@ -517,6 +617,7 @@ function! fsharp#sendAllToFsi()
     return fsharp#sendFsi(text)
 endfunction
 
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
diff --git a/autoload/puppet/align.vim b/autoload/puppet/align.vim
index 56270f097..811dee3dc 100644
--- a/autoload/puppet/align.vim
+++ b/autoload/puppet/align.vim
@@ -2,11 +2,11 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'autoload/puppet/ali
   finish
 endif
 
-function! puppet#align#IndentLevel(lnum)
+function! puppet#align#IndentLevel(lnum) abort
     return indent(a:lnum) / &shiftwidth
 endfunction
 
-function! puppet#align#LinesInBlock(lnum)
+function! puppet#align#LinesInBlock(lnum) abort
     let lines = []
     let indent_level = puppet#align#IndentLevel(a:lnum)
 
diff --git a/autoload/puppet/ctags.vim b/autoload/puppet/ctags.vim
index e5c7321e2..1a12890a0 100644
--- a/autoload/puppet/ctags.vim
+++ b/autoload/puppet/ctags.vim
@@ -10,9 +10,9 @@ endif
 let s:ctags_options_dir = expand('<sfile>:p:h:h:h') . '/ctags/'
 
 " Return full path to option file for ctags application
-function! puppet#ctags#OptionFile()
+function! puppet#ctags#OptionFile() abort
 
-  if puppet#ctags#Type() == 'universal'
+  if puppet#ctags#Type() ==? 'universal'
     let l:ctags_options = 'puppet_u.ctags'
   else
     let l:ctags_options = 'puppet.ctags'
@@ -22,13 +22,13 @@ endfunction
 
 " Return type of installed ctags application,
 " can be 'universal' or 'exuberant'
-function! puppet#ctags#Type()
+function! puppet#ctags#Type() abort
 
   if !s:ctags_type
     let l:version = system('ctags --version')
-    if l:version =~ 'Universal Ctags'
+    if l:version =~? 'Universal Ctags'
       let s:ctags_type = 'universal'
-    elseif l:version =~ 'Exuberant Ctags'
+    elseif l:version =~? 'Exuberant Ctags'
       let s:ctags_type = 'exuberant'
     else
        echoerr 'Unknown version of Ctags'
diff --git a/compiler/puppet-lint.vim b/compiler/puppet-lint.vim
index c65eeb198..584d0e193 100644
--- a/compiler/puppet-lint.vim
+++ b/compiler/puppet-lint.vim
@@ -6,12 +6,12 @@ endif
 " Compiler:	puppet-lint
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
 
-if exists("current_compiler")
+if exists('current_compiler')
   finish
 endif
-let current_compiler = "puppet-lint"
+let current_compiler = 'puppet-lint'
 
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+if exists(':CompilerSet') != 2		" older Vim always used :setlocal
   command -nargs=* CompilerSet setlocal <args>
 endif
 
diff --git a/ftplugin/epuppet.vim b/ftplugin/epuppet.vim
index 482d2af14..9c2156d57 100644
--- a/ftplugin/epuppet.vim
+++ b/ftplugin/epuppet.vim
@@ -9,7 +9,7 @@ endif
 " Last Change:          2019-09-01
 
 " Only do this when not done yet for this buffer
-if exists("b:did_ftplugin")
+if exists('b:did_ftplugin')
   finish
 endif
 
@@ -17,23 +17,23 @@ let s:save_cpo = &cpo
 set cpo-=C
 
 " Define some defaults in case the included ftplugins don't set them.
-let s:undo_ftplugin = ""
+let s:undo_ftplugin = ''
 let s:browsefilter = "All Files (*.*)\t*.*\n"
-let s:match_words = ""
+let s:match_words = ''
 
 runtime! ftplugin/sh.vim
 unlet! b:did_ftplugin
 
 " Override our defaults if these were set by an included ftplugin.
-if exists("b:undo_ftplugin")
+if exists('b:undo_ftplugin')
   let s:undo_ftplugin = b:undo_ftplugin
   unlet b:undo_ftplugin
 endif
-if exists("b:browsefilter")
+if exists('b:browsefilter')
   let s:browsefilter = b:browsefilter
   unlet b:browsefilter
 endif
-if exists("b:match_words")
+if exists('b:match_words')
   let s:match_words = b:match_words
   unlet b:match_words
 endif
@@ -46,13 +46,13 @@ runtime! ftplugin/puppet.vim
 let b:did_ftplugin = 1
 
 " Combine the new set of values with those previously included.
-if exists("b:undo_ftplugin")
-  let s:undo_ftplugin = b:undo_ftplugin . " | " . s:undo_ftplugin
+if exists('b:undo_ftplugin')
+  let s:undo_ftplugin = b:undo_ftplugin . ' | ' . s:undo_ftplugin
 endif
-if exists ("b:browsefilter")
+if exists ('b:browsefilter')
   let s:browsefilter = substitute(b:browsefilter,'\cAll Files (\*\.\*)\t\*\.\*\n','','') . s:browsefilter
 endif
-if exists("b:match_words")
+if exists('b:match_words')
   let s:match_words = b:match_words . ',' . s:match_words
 endif
 
@@ -64,14 +64,14 @@ let &l:suffixesadd = s:suffixesadd . (s:suffixesadd =~# ',$\|^$' ? '' : ',') . &
 unlet s:include s:path s:suffixesadd
 
 " Load the combined list of match_words for matchit.vim
-if exists("loaded_matchit")
+if exists('loaded_matchit')
   let b:match_words = s:match_words
 endif
 
 " TODO: comments=
 setlocal commentstring=<%#%s%>
 
-let b:undo_ftplugin = "setl cms< "
+let b:undo_ftplugin = 'setl cms< '
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 
 let &cpo = s:save_cpo
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index 0d4612383..5316cf5eb 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -8,7 +8,7 @@ endif
 " URL:                  https://github.com/rodjek/vim-puppet
 " Last Change:          2019-08-31
 
-if (exists("b:did_ftplugin"))
+if (exists('b:did_ftplugin'))
   finish
 endif
 let b:did_ftplugin = 1
@@ -25,8 +25,8 @@ setlocal commentstring=#\ %s
 setlocal formatoptions-=t formatoptions+=croql
 setlocal formatexpr=puppet#format#Format()
 
-let b:undo_ftplugin = "
+let b:undo_ftplugin = '
     \ setlocal tabstop< tabstop< softtabstop< shiftwidth< expandtab<
     \| setlocal keywordprg< iskeyword< comments< commentstring<
     \| setlocal formatoptions< formatexpr<
-    \"
+    \'
diff --git a/ftplugin/puppet_tagbar.vim b/ftplugin/puppet_tagbar.vim
index 4e87669ee..dc2c73e64 100644
--- a/ftplugin/puppet_tagbar.vim
+++ b/ftplugin/puppet_tagbar.vim
@@ -25,7 +25,7 @@ let g:tagbar_type_puppet = {
   \],
 \}
 
-if puppet#ctags#Type() == 'universal'
+if puppet#ctags#Type() ==? 'universal'
     " There no sense to split objects by colon
     let g:tagbar_type_puppet.sro = '__'
     let g:tagbar_type_puppet.kind2scope = {
diff --git a/ftplugin/terraform.vim b/ftplugin/terraform.vim
index 1f4ef2ccd..7e56d9ed2 100644
--- a/ftplugin/terraform.vim
+++ b/ftplugin/terraform.vim
@@ -30,9 +30,6 @@ if exists('s:hcl_fold_sections_save')
   let g:hcl_fold_sections = s:hcl_fold_sections_save
 end
 
-let s:cpo_save = &cpoptions
-set cpoptions&vim
-
 if !exists('g:terraform_binary_path')
   let g:terraform_binary_path='terraform'
 endif
diff --git a/indent/puppet.vim b/indent/puppet.vim
index 1067e9e06..ec7142659 100644
--- a/indent/puppet.vim
+++ b/indent/puppet.vim
@@ -8,7 +8,7 @@ endif
 " Last Change:  2009 Aug 19
 " vim: set sw=4 sts=4:
 
-if exists("b:did_indent")
+if exists('b:did_indent')
     finish
 endif
 let b:did_indent = 1
@@ -17,11 +17,11 @@ setlocal autoindent smartindent
 setlocal indentexpr=GetPuppetIndent()
 setlocal indentkeys+=0],0)
 
-let b:undo_indent = "
+let b:undo_indent = '
     \ setlocal autoindent< smartindent< indentexpr< indentkeys<
-    \"
+    \'
 
-if exists("*GetPuppetIndent")
+if exists('*GetPuppetIndent')
     finish
 endif
 
@@ -37,7 +37,7 @@ function! s:PartOfInclude(lnum)
         if line !~ ',$'
             break
         endif
-        if line =~ '^\s*include\s\+[^,]\+,$' && line !~ '[=>]>'
+        if line =~# '^\s*include\s\+[^,]\+,$' && line !~ '[=>]>'
             return 1
         endif
     endwhile
@@ -84,7 +84,7 @@ function! GetPuppetIndent(...)
     " the same indent here would be premature since for that particular case
     " we want to instead get the indent level of the matching opening brace or
     " parenthenses.
-    if pline =~ '^\s*#' && line !~ '^\s*\(}\(,\|;\)\?$\|]:\|],\|}]\|];\?$\|)\)'
+    if pline =~# '^\s*#' && line !~# '^\s*\(}\(,\|;\)\?$\|]:\|],\|}]\|];\?$\|)\)'
         return ind
     endif
 
@@ -123,12 +123,12 @@ function! GetPuppetIndent(...)
     endif
 
     " Match } }, }; ] ]: ], ]; )
-    if line =~ '^\s*\(}\(,\|;\)\?$\|]:\|],\|}]\|];\?$\|)\)'
+    if line =~# '^\s*\(}\(,\|;\)\?$\|]:\|],\|}]\|];\?$\|)\)'
         let ind = indent(s:OpenBrace(v:lnum))
     endif
 
     " Don't actually shift over for } else {
-    if line =~ '^\s*}\s*els\(e\|if\).*{\s*$'
+    if line =~# '^\s*}\s*els\(e\|if\).*{\s*$'
         let ind -= &sw
     endif
     " Don't indent resources that are one after another with a ->(ordering arrow)
diff --git a/indent/ruby.vim b/indent/ruby.vim
index afa72995a..e4a295fd9 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -93,6 +93,9 @@ let s:ruby_indent_keywords =
       \ '\|\%([=,*/%+-]\|<<\|>>\|:\s\)\s*\zs' .
       \    '\<\%(if\|for\|while\|until\|case\|unless\|begin\):\@!\>'
 
+" Def without an end clause: def method_call(...) = <expression>
+let s:ruby_endless_def = '\<def\s\+\k\+[!?]\=\%((.*)\|\s\)\s*='
+
 " Regex used for words that, at the start of a line, remove a level of indent.
 let s:ruby_deindent_keywords =
       \ '^\s*\zs\<\%(ensure\|else\|rescue\|elsif\|when\|end\):\@!\>'
@@ -112,10 +115,26 @@ let s:end_middle_regex = '\<\%(ensure\|else\|\%(\%(^\|;\)\s*\)\@<=\<rescue:\@!\>
 " Regex that defines the end-match for the 'end' keyword.
 let s:end_end_regex = '\%(^\|[^.:@$]\)\@<=\<end:\@!\>'
 
-" Expression used for searchpair() call for finding match for 'end' keyword.
-let s:end_skip_expr = s:skip_expr .
-      \ ' || (expand("<cword>") == "do"' .
-      \ ' && getline(".") =~ "^\\s*\\<\\(while\\|until\\|for\\):\\@!\\>")'
+" Expression used for searchpair() call for finding a match for an 'end' keyword.
+function! s:EndSkipExpr()
+  if eval(s:skip_expr)
+    return 1
+  elseif expand('<cword>') == 'do'
+        \ && getline(".") =~ '^\s*\<\(while\|until\|for\):\@!\>'
+    return 1
+  elseif getline('.') =~ s:ruby_endless_def
+    return 1
+  elseif getline('.') =~ '\<def\s\+\k\+[!?]\=([^)]*$'
+    " Then it's a `def method(` with a possible `) =` later
+    call search('\<def\s\+\k\+\zs(', 'W', line('.'))
+    normal! %
+    return getline('.') =~ ')\s*='
+  else
+    return 0
+  endif
+endfunction
+
+let s:end_skip_expr = function('s:EndSkipExpr')
 
 " Regex that defines continuation lines, not including (, {, or [.
 let s:non_bracket_continuation_regex =
@@ -575,6 +594,11 @@ function! s:AfterUnbalancedBracket(pline_info) abort
       call cursor(info.plnum, closing.pos + 1)
       normal! %
 
+      if strpart(info.pline, closing.pos) =~ '^)\s*='
+        " special case: the closing `) =` of an endless def
+        return indent(s:GetMSL(line('.')))
+      endif
+
       if s:Match(line('.'), s:ruby_indent_keywords)
         return indent('.') + info.sw
       else
@@ -613,7 +637,7 @@ function! s:AfterIndentKeyword(pline_info) abort
   let info = a:pline_info
   let col = s:Match(info.plnum, s:ruby_indent_keywords)
 
-  if col > 0
+  if col > 0 && s:Match(info.plnum, s:ruby_endless_def) <= 0
     call cursor(info.plnum, col)
     let ind = virtcol('.') - 1 + info.sw
     " TODO: make this better (we need to count them) (or, if a searchpair
@@ -660,7 +684,7 @@ function! s:IndentingKeywordInMSL(msl_info) abort
   " TODO: this does not take into account contrived things such as
   " module Foo; class Bar; end
   let col = s:Match(info.plnum_msl, s:ruby_indent_keywords)
-  if col > 0
+  if col > 0 && s:Match(info.plnum_msl, s:ruby_endless_def) <= 0
     let ind = indent(info.plnum_msl) + info.sw
     if s:Match(info.plnum_msl, s:end_end_regex)
       let ind = ind - info.sw
diff --git a/syntax/ansible.vim b/syntax/ansible.vim
index 8a10ec59f..1398a8c76 100644
--- a/syntax/ansible.vim
+++ b/syntax/ansible.vim
@@ -92,7 +92,7 @@ if exists("g:ansible_extra_keywords_highlight")
               \ debugger always_run check_mode diff no_log args tags force_handlers
               \ vars vars_files vars_prompt delegate_facts delegate_to
               \ any_errors_fatal ignore_errors ignore_unreachable max_fail_percentage
-              \ connection hosts port remote_user module_defaults
+              \ connection children hosts port remote_user module_defaults
               \ environment fact_path gather_facts gather_subset gather_timeout
               \ async poll throttle timeout order run_once serial strategy
               \ containedin='.s:yamlKey.' contained'
diff --git a/syntax/basic/members.vim b/syntax/basic/members.vim
index 46b8350b9..b3705e302 100644
--- a/syntax/basic/members.vim
+++ b/syntax/basic/members.vim
@@ -36,7 +36,7 @@ syntax keyword typescriptClassStatic static
 
 syntax keyword typescriptAccessibilityModifier public private protected contained
 
-syntax keyword typescriptReadonlyModifier readonly contained
+syntax keyword typescriptReadonlyModifier readonly override contained
 
 syntax region  typescriptStringMember   contained
   \ start=/\z(["']\)/  skip=/\\\\\|\\\z1\|\\\n/  end=/\z1/
diff --git a/syntax/epuppet.vim b/syntax/epuppet.vim
index 61c70d21d..d0c5f9650 100644
--- a/syntax/epuppet.vim
+++ b/syntax/epuppet.vim
@@ -9,7 +9,7 @@ endif
 " Last Change:          2019-09-01
 
 " quit when a syntax file was already loaded {{{1
-if exists("b:current_syntax")
+if exists('b:current_syntax')
   finish
 endif
 
@@ -29,5 +29,5 @@ syn region  ePuppetComment    matchgroup=ePuppetDelimiter start="<%-\=#"    end=
 hi def link ePuppetDelimiter              PreProc
 hi def link ePuppetComment                Comment
 
-let b:current_syntax = "epuppet"
+let b:current_syntax = 'epuppet'
 
diff --git a/syntax/git.vim b/syntax/git.vim
index 558d39b55..9d8efc69e 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -33,7 +33,7 @@ syn match gitDiffAdded "{+[^}]*+}" contained containedin=gitDiff
 syn match gitDiffRemoved "^ \+-.*" contained containedin=gitDiffMerge
 syn match gitDiffRemoved "\[-[^]]*-\]" contained containedin=gitDiff
 
-syn match  gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\|gpgsig\|summary\|boundary\|filename\|previous\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite contains=@NoSpell
+syn match  gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\|gpgsig\%(-\w\+\)\=\|summary\|boundary\|filename\|previous\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite contains=@NoSpell
 syn match  gitKeyword /^\%(tag\>\|ref:\)/ contained containedin=gitHead nextgroup=gitReference skipwhite contains=@NoSpell
 syn match  gitKeyword /^Merge:/  contained containedin=gitHead nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
 syn match  gitMode    /^\d\{6\}\>/ contained containedin=gitHead nextgroup=gitType,gitHash skipwhite
diff --git a/syntax/puppet.vim b/syntax/puppet.vim
index b246f7534..470404e4f 100644
--- a/syntax/puppet.vim
+++ b/syntax/puppet.vim
@@ -10,7 +10,7 @@ endif
 " and heredoc was copied from ruby and then modified to comply with Puppet syntax.
 
 " Prelude {{{1
-if exists("b:current_syntax")
+if exists('b:current_syntax')
   finish
 endif
 
@@ -437,4 +437,4 @@ HiLink puppetComment              Comment
 
 delcommand HiLink
 
-let b:current_syntax = "puppet"
+let b:current_syntax = 'puppet'

From 7f98e949d4922ba2109304bd4cabe9578a8062fb Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 9 Sep 2021 12:05:33 +0200
Subject: [PATCH 273/299] Update

---
 autoload/dart.vim            |  24 ++++++--
 autoload/elixir/indent.vim   | 110 +++++++++++++++++++++++++++++++++++
 autoload/fsharp.vim          | 102 +++++++++++++++++++++++++++++++-
 autoload/polyglot/ft.vim     |  19 ++++--
 autoload/polyglot/init.vim   |   2 +-
 autoload/polyglot/sleuth.vim |   2 +-
 extras/filetype.vim          |  27 +++++++--
 ftplugin/eelixir.vim         |   5 +-
 ftplugin/elixir.vim          |   2 +-
 ftplugin/julia.vim           |   3 +-
 ftplugin/juliadoc.vim        |   2 +-
 ftplugin/ocaml.vim           |   8 +--
 ftplugin/puppet.vim          |   4 +-
 ftplugin/scheme.vim          |   5 +-
 ftplugin/toml.vim            |  25 --------
 ftplugin/typescript.vim      |   2 +-
 indent/bzl.vim               |  41 ++++++++-----
 indent/elixir.vim            |   2 +-
 indent/erlang.vim            |   8 +--
 indent/ruby.vim              |   2 +-
 indent/scala.vim             |  30 +++++-----
 syntax/aptconf.vim           |  13 +++--
 syntax/c.vim                 |   5 +-
 syntax/cpp.vim               |  43 +++++++++-----
 syntax/debchangelog.vim      |   6 +-
 syntax/debsources.vim        |   6 +-
 syntax/eelixir.vim           |   5 +-
 syntax/git.vim               |  65 +++++++++++++++------
 syntax/julia.vim             |  42 +++++++------
 syntax/juliadoc.vim          |   6 ++
 syntax/meson.vim             |   3 +-
 syntax/pascal.vim            |   2 +-
 syntax/plantuml.vim          |   8 ++-
 syntax/scala.vim             |  12 ++--
 syntax/scheme.vim            |  13 +++--
 syntax/tmux.vim              |   6 +-
 syntax/toml.vim              |  80 -------------------------
 37 files changed, 491 insertions(+), 249 deletions(-)
 delete mode 100644 ftplugin/toml.vim
 delete mode 100644 syntax/toml.vim

diff --git a/autoload/dart.vim b/autoload/dart.vim
index 959b67cac..a5733d038 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -31,9 +31,9 @@ endfunction
 
 function! dart#fmt(...) abort
   let l:dartfmt = s:FindDartFmt()
-  if type(l:dartfmt) != type('') | return | endif
+  if empty(l:dartfmt) | return | endif
   let buffer_content = getline(1, '$')
-  let l:cmd = [l:dartfmt, '--stdin-name', shellescape(expand('%'))]
+  let l:cmd = extend(l:dartfmt, ['--stdin-name', shellescape(expand('%'))])
   if exists('g:dartfmt_options')
     call extend(l:cmd, g:dartfmt_options)
   endif
@@ -64,14 +64,30 @@ function! dart#fmt(...) abort
 endfunction
 
 function! s:FindDartFmt() abort
-  if executable('dartfmt') | return 'dartfmt' | endif
+  if executable('dart')
+    let l:version_text = system('dart --version')
+    let l:match = matchlist(l:version_text,
+        \ '\vDart SDK version: (\d+)\.(\d+)\.\d+.*')
+    if empty(l:match)
+      call s:error('Unable to determine dart version')
+      return []
+    endif
+    let l:major = l:match[1]
+    let l:minor = l:match[2]
+    if l:major > 2 || l:major == 2 && l:minor >= 14
+      return ['dart', 'format']
+    endif
+  endif
+  " Legacy fallback for Dart SDK pre 2.14
+  if executable('dartfmt') | return ['dartfmt'] | endif
   if executable('flutter')
     let l:flutter_cmd = resolve(exepath('flutter'))
     let l:bin = fnamemodify(l:flutter_cmd, ':h')
     let l:dartfmt = l:bin.'/cache/dart-sdk/bin/dartfmt'
-    if executable(l:dartfmt) | return l:dartfmt | endif
+    if executable(l:dartfmt) | return [l:dartfmt] | endif
   endif
   call s:error('Cannot find a `dartfmt` command')
+  return []
 endfunction
 
 function! dart#analyzer(q_args) abort
diff --git a/autoload/elixir/indent.vim b/autoload/elixir/indent.vim
index c9adcd0a1..ccf388b73 100644
--- a/autoload/elixir/indent.vim
+++ b/autoload/elixir/indent.vim
@@ -24,6 +24,7 @@ function! elixir#indent#indent(lnum)
   call cursor(lnum, 0)
 
   let handlers = [
+        \'inside_embedded_view',
         \'top_of_file',
         \'starts_with_string_continuation',
         \'following_trailing_binary_operator',
@@ -69,6 +70,17 @@ function! s:prev_starts_with(context, expr)
   return s:_starts_with(a:context.prev_nb_text, a:expr, a:context.prev_nb_lnum)
 endfunction
 
+function! s:in_embedded_view()
+  let groups = map(synstack(line('.'), col('.')), "synIDattr(v:val, 'name')")
+  for group in ['elixirPhoenixESigil', 'elixirLiveViewSigil', 'elixirSurfaceSigil']
+    if index(groups, group) >= 0
+      return 1
+    endif
+  endfor
+
+  return 0
+endfunction
+
 " Returns 0 or 1 based on whether or not the text starts with the given
 " expression and is not a string or comment
 function! s:_starts_with(text, expr, lnum)
@@ -160,6 +172,104 @@ function! s:find_last_pos(lnum, text, match)
   return -1
 endfunction
 
+function! elixir#indent#handle_inside_embedded_view(context)
+  if !s:in_embedded_view()
+    return -1
+  endif
+
+  " Multi-line Surface data delimiters
+  let pair_lnum = searchpair('{{', '', '}}', 'bW', "line('.') == ".a:context.lnum." || s:is_string_or_comment(line('.'), col('.'))", max([0, a:context.lnum - g:elixir_indent_max_lookbehind]))
+  if pair_lnum
+    if a:context.text =~ '}}$'
+      return indent(pair_lnum)
+    elseif a:context.text =~ '}}*>$'
+      return -1
+    elseif s:prev_ends_with(a:context, '[\|%{')
+      return indent(a:context.prev_nb_lnum) + s:sw()
+    elseif a:context.prev_nb_text =~ ',$'
+      return indent(a:context.prev_nb_lnum)
+    else
+      return indent(pair_lnum) + s:sw()
+    endif
+  endif
+
+  " Multi-line opening tag -- >, />, or %> are on a different line that their opening <
+  let pair_lnum = searchpair('^\s\+<.*[^>]$', '', '^[^<]*[/%}]\?>$', 'bW', "line('.') == ".a:context.lnum." || s:is_string_or_comment(line('.'), col('.'))", max([0, a:context.lnum - g:elixir_indent_max_lookbehind]))
+  if pair_lnum
+    if a:context.text =~ '^\s\+\%\(>\|\/>\|%>\|}}>\)$'
+      call s:debug("current line is a lone >, />, or %>")
+      return indent(pair_lnum)
+    elseif a:context.text =~ '\%\(>\|\/>\|%>\|}}>\)$'
+      call s:debug("current line ends in >, />, or %>")
+      if s:prev_ends_with(a:context, ',')
+        return indent(a:context.prev_nb_lnum)
+      else
+        return -1
+      endif
+    else
+      call s:debug("in the body of a multi-line opening tag")
+      return indent(pair_lnum) + s:sw()
+    endif
+  endif
+
+  " Special cases
+  if s:prev_ends_with(a:context, '^[^<]*do\s%>')
+    call s:debug("prev line closes a multi-line do block")
+    return indent(a:context.prev_nb_lnum)
+  elseif a:context.prev_nb_text =~ 'do\s*%>$'
+    call s:debug("prev line opens a do block")
+    return indent(a:context.prev_nb_lnum) + s:sw()
+  elseif a:context.text =~ '^\s\+<\/[a-zA-Z0-9\.\-_]\+>\|<% end %>'
+    call s:debug("a single closing tag")
+    if a:context.prev_nb_text =~ '^\s\+<[^%\/]*[^/]>.*<\/[a-zA-Z0-9\.\-_]\+>$'
+      call s:debug("opening and closing tags are on the same line")
+      return indent(a:context.prev_nb_lnum) - s:sw()
+    elseif a:context.prev_nb_text =~ '^\s\+<[^%\/]*[^/]>\|\s\+>' 
+      call s:debug("prev line is opening html tag or single >")
+      return indent(a:context.prev_nb_lnum)
+    elseif s:prev_ends_with(a:context, '^[^<]*\%\(do\s\)\@<!%>')
+      call s:debug("prev line closes a multi-line eex tag")
+      return indent(a:context.prev_nb_lnum) - 2 * s:sw()
+    else
+      return indent(a:context.prev_nb_lnum) - s:sw()
+    endif
+  elseif a:context.text =~ '^\s*<%\s*\%(end\|else\|catch\|rescue\)\>.*%>'
+    call s:debug("eex middle or closing eex tag")
+    return indent(a:context.prev_nb_lnum) - s:sw()
+  elseif a:context.prev_nb_text =~ '\s*<\/\|<% end %>$'
+    call s:debug("prev is closing tag")
+    return indent(a:context.prev_nb_lnum)
+  elseif a:context.prev_nb_text =~ '^\s\+<[^%\/]*[^/]>.*<\/[a-zA-Z0-9\.\-_]\+>$'
+    call s:debug("opening and closing tags are on the same line")
+    return indent(a:context.prev_nb_lnum)
+  elseif s:prev_ends_with(a:context, '\s\+\/>')
+    call s:debug("prev ends with a single \>")
+    return indent(a:context.prev_nb_lnum)
+  elseif s:prev_ends_with(a:context, '^[^<]*\/>')
+    call s:debug("prev line is closing a multi-line self-closing tag")
+    return indent(a:context.prev_nb_lnum) - s:sw()
+  elseif s:prev_ends_with(a:context, '^\s\+<.*\/>')
+    call s:debug("prev line is closing self-closing tag")
+    return indent(a:context.prev_nb_lnum)
+  elseif a:context.prev_nb_text =~ '^\s\+%\?>$'
+    call s:debug("prev line is a single > or %>")
+    return indent(a:context.prev_nb_lnum) + s:sw()
+  endif
+
+  " Simple HTML (ie, opening tag is not split across lines)
+  let pair_lnum = searchpair('^\s\+<[^%\/].*[^\/>]>$', '', '^\s\+<\/\w\+>$', 'bW', "line('.') == ".a:context.lnum." || s:is_string_or_comment(line('.'), col('.'))", max([0, a:context.lnum - g:elixir_indent_max_lookbehind]))
+  if pair_lnum
+    call s:debug("simple HTML")
+    if a:context.text =~ '^\s\+<\/\w\+>$'
+      return indent(pair_lnum)
+    else
+      return indent(pair_lnum) + s:sw()
+    endif
+  endif
+
+  return -1
+endfunction
+
 function! elixir#indent#handle_top_of_file(context)
   if a:context.prev_nb_lnum == 0
     return 0
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index 8567a0379..d18f2bbcd 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -233,6 +233,107 @@ function! fsharp#updateServerConfig()
     call s:notify('workspace/didChangeConfiguration', settings)
 endfunction
 
+function! fsharp#loadConfig()
+    if exists('s:config_is_loaded')
+        return
+    endif
+
+    if !exists('g:fsharp#fsautocomplete_command')
+        let s:fsac = fnamemodify(s:script_root_dir . "fsac/fsautocomplete.dll", ":p")
+
+        " check if FSAC exists
+        if empty(glob(s:fsac))
+            echoerr "FSAC not found. :FSharpUpdateFSAC to download."
+            let &cpo = s:cpo_save
+            finish
+        endif
+
+        let g:fsharp#fsautocomplete_command =
+            \ ['dotnet', s:fsac,
+                \ '--background-service-enabled'
+            \ ]
+    endif
+    if !exists('g:fsharp#use_recommended_server_config')
+        let g:fsharp#use_recommended_server_config = 1
+    endif
+    call fsharp#getServerConfig()
+    if !exists('g:fsharp#automatic_workspace_init')
+        let g:fsharp#automatic_workspace_init = 1
+    endif
+    if !exists('g:fsharp#automatic_reload_workspace')
+        let g:fsharp#automatic_reload_workspace = 1
+    endif
+    if !exists('g:fsharp#show_signature_on_cursor_move')
+        let g:fsharp#show_signature_on_cursor_move = 1
+    endif
+    if !exists('g:fsharp#fsi_command')
+        let g:fsharp#fsi_command = "dotnet fsi"
+    endif
+    if !exists('g:fsharp#fsi_keymap')
+        let g:fsharp#fsi_keymap = "vscode"
+    endif
+    if !exists('g:fsharp#fsi_window_command')
+        let g:fsharp#fsi_window_command = "botright 10new"
+    endif
+    if !exists('g:fsharp#fsi_focus_on_send')
+        let g:fsharp#fsi_focus_on_send = 0
+    endif
+    if !exists('g:fsharp#backend')
+        if has('nvim-0.5')
+            if exists('g:LanguageClient_loaded')
+                let g:fsharp#backend = "languageclient-neovim"
+            else
+                let g:fsharp#backend = "nvim"
+            endif
+        else
+            let g:fsharp#backend = "languageclient-neovim"
+        endif
+    endif
+
+    " backend configuration
+    if g:fsharp#backend == 'languageclient-neovim'
+        if !exists('g:LanguageClient_serverCommands')
+            let g:LanguageClient_serverCommands = {}
+        endif
+        if !has_key(g:LanguageClient_serverCommands, 'fsharp')
+            let g:LanguageClient_serverCommands.fsharp = {
+                \ 'name': 'fsautocomplete',
+                \ 'command': g:fsharp#fsautocomplete_command,
+                \ 'initializationOptions': {},
+                \}
+            if g:fsharp#automatic_workspace_init
+                let g:LanguageClient_serverCommands.fsharp.initializationOptions = {
+                    \ 'AutomaticWorkspaceInit': v:true,
+                    \}
+            endif
+        endif
+
+        if !exists('g:LanguageClient_rootMarkers')
+            let g:LanguageClient_rootMarkers = {}
+        endif
+        if !has_key(g:LanguageClient_rootMarkers, 'fsharp')
+            let g:LanguageClient_rootMarkers.fsharp = ['*.sln', '*.fsproj', '.git']
+        endif
+    elseif g:fsharp#backend == 'nvim'
+        if !exists('g:fsharp#lsp_auto_setup')
+            let g:fsharp#lsp_auto_setup = 1
+        endif
+        if !exists('g:fsharp#lsp_recommended_colorscheme')
+            let g:fsharp#lsp_recommended_colorscheme = 1
+        endif
+        if !exists('g:fsharp#lsp_codelens')
+            let g:fsharp#lsp_codelens = 1
+        endif
+
+    else
+        if g:fsharp#backend != 'disable'
+            echoerr "[FSAC] Invalid backend: " . g:fsharp#backend
+        endif
+    endif
+
+    let s:config_is_loaded = 1
+endfunction
+
 
 " handlers for notifications
 
@@ -617,7 +718,6 @@ function! fsharp#sendAllToFsi()
     return fsharp#sendFsi(text)
 endfunction
 
-
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
diff --git a/autoload/polyglot/ft.vim b/autoload/polyglot/ft.vim
index 2e4c1f690..e4c324158 100644
--- a/autoload/polyglot/ft.vim
+++ b/autoload/polyglot/ft.vim
@@ -264,6 +264,13 @@ func polyglot#ft#ProtoCheck(default)
 endfunc
 
 func polyglot#ft#FTm()
+  if exists("g:filetype_m")
+    exe "setf " . g:filetype_m
+    return
+  endif
+
+  let octave_block_terminators = '\<end\%(_try_catch\|classdef\|enumeration\|events\|for\|function\|if\|methods\|parfor\|properties\|switch\|while\)\>'
+
   let n = 1
   let saw_comment = 0 " Whether we've seen a multiline comment leader.
   while n < 100
@@ -278,6 +285,13 @@ func polyglot#ft#FTm()
       setf objc
       return
     endif
+    if line =~ '^\s*\%(#\|%!\|[#%]{\=\s*$\)' ||
+	  \ line =~ '^\s*unwind_protect\>' ||
+	  \ line =~ '\%(^\|;\)\s*' .. octave_block_terminators
+      setf octave
+      return
+    endif
+    " TODO: could be Matlab or Octave
     if line =~ '^\s*%'
       setf matlab
       return
@@ -298,11 +312,8 @@ func polyglot#ft#FTm()
     " or Murphi based on the comment leader. Assume the former as it is more
     " common.
     setf objc
-  elseif exists("g:filetype_m")
-    " Use user specified default filetype for .m
-    exe "setf " . g:filetype_m
   else
-    " Default is matlab
+    " Default is Matlab
     setf matlab
   endif
 endfunc
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 04353964f..d739ae7b5 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -2265,7 +2265,7 @@ if !has_key(g:polyglot_is_disabled, 'jsonnet')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'json')
-  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}htmlhintrc,{.,}imgbotconfig,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
+  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}auto-changelog,{.,}c8rc,{.,}htmlhintrc,{.,}imgbotconfig,{.,}nycrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
 endif
 
 if !has_key(g:polyglot_is_disabled, 'json5')
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index bf3166a43..a7a5b86aa 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -264,7 +264,7 @@ let s:globs = {
   \ 'jovial': '*.jov,*.j73,*.jovial',
   \ 'jproperties': '*.properties,*.properties_??,*.properties_??_??,*.properties_??_??_*',
   \ 'jq': '*.jq,.jqrc,.jqrc*',
-  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.imgbotconfig,.tern-config,.tern-project,.watchmanconfig,Pipfile.lock,composer.lock,mcmod.info',
+  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.auto-changelog,.c8rc,.htmlhintrc,.imgbotconfig,.nycrc,.tern-config,.tern-project,.watchmanconfig,Pipfile.lock,composer.lock,mcmod.info',
   \ 'json5': '*.json5',
   \ 'jsonc': '*.cjson,*.jsonc,coc-settings.json,.eslintrc.json,.babelrc,.jshintrc,.jslintrc,.mocharc.json,coffeelint.json,tsconfig.json,jsconfig.json',
   \ 'jsonnet': '*.jsonnet,*.libsonnet',
diff --git a/extras/filetype.vim b/extras/filetype.vim
index 19f4a4ed8..6ef1fa21b 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Jul 03
+" Last Change:	2021 Aug 23
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -537,8 +537,13 @@ au BufNewFile,BufRead *.drac,*.drc,*lvs,*lpe	setf dracula
 " Datascript
 au BufNewFile,BufRead *.ds			setf datascript
 
-" dsl
-au BufNewFile,BufRead *.dsl			setf dsl
+" dsl: DSSSL or Structurizr
+au BufNewFile,BufRead *.dsl
+	\ if getline(1) =~ '^\s*<\!' |
+	\   setf dsl |
+	\ else |
+	\   setf structurizr |
+	\ endif
 
 " DTD (Document Type Definition for XML)
 au BufNewFile,BufRead *.dtd			setf dtd
@@ -874,6 +879,9 @@ au BufNewFile,BufRead *.ipynb				setf json
 " JSONC
 au BufNewFile,BufRead *.jsonc			setf jsonc
 
+" Julia
+au BufNewFile,BufRead *.jl			setf julia
+
 " Kixtart
 au BufNewFile,BufRead *.kix			setf kix
 
@@ -1021,7 +1029,7 @@ au BufNewFile,BufRead *.markdown,*.mdown,*.mkd,*.mkdn,*.mdwn,*.md  setf markdown
 " Mason
 au BufNewFile,BufRead *.mason,*.mhtml,*.comp	setf mason
 
-" Mathematica, Matlab, Murphi or Objective C
+" Mathematica, Matlab, Murphi, Objective C or Octave
 au BufNewFile,BufRead *.m			call polyglot#ft#FTm()
 
 " Mathematica notebook
@@ -1167,6 +1175,9 @@ au BufNewFile,BufRead *.ml,*.mli,*.mll,*.mly,.ocamlinit,*.mlt,*.mlp,*.mlip,*.mli
 " Occam
 au BufNewFile,BufRead *.occ			setf occam
 
+" Octave
+au BufNewFile,BufRead octave.conf,.octaverc,octaverc	setf octave
+
 " Omnimark
 au BufNewFile,BufRead *.xom,*.xin		setf omnimark
 
@@ -1375,6 +1386,9 @@ au BufNewFile,BufRead *.pk			setf poke
 " Protocols
 au BufNewFile,BufRead */etc/protocols		setf protocols
 
+" Pyret
+au BufNewFile,BufRead *.arr			setf pyret
+
 " Pyrex
 au BufNewFile,BufRead *.pyx,*.pxd		setf pyrex
 
@@ -1523,6 +1537,9 @@ au BufNewFile,BufRead *.sbt			setf sbt
 " Scilab
 au BufNewFile,BufRead *.sci,*.sce		setf scilab
 
+" scdoc
+au BufNewFile,BufRead *.scd			setf scdoc
+
 " SCSS
 au BufNewFile,BufRead *.scss			setf scss
 
@@ -1612,7 +1629,7 @@ au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump setf zsh
 au BufNewFile,BufRead *.zsh			setf zsh
 
 " Scheme
-au BufNewFile,BufRead *.scm,*.ss,*.rkt		setf scheme
+au BufNewFile,BufRead *.scm,*.ss,*.rkt,*.rktd,*.rktl 	setf scheme
 
 " Screen RC
 au BufNewFile,BufRead .screenrc,screenrc	setf screen
diff --git a/ftplugin/eelixir.vim b/ftplugin/eelixir.vim
index 6e1d13fdd..d8fb26315 100644
--- a/ftplugin/eelixir.vim
+++ b/ftplugin/eelixir.vim
@@ -23,6 +23,9 @@ if !exists("b:eelixir_subtype")
   if b:eelixir_subtype == ''
     let b:eelixir_subtype = matchstr(&filetype,'^eex\.\zs\w\+')
   endif
+  if b:eelixir_subtype == ''
+    let b:eelixir_subtype = matchstr(&filetype,'^heex\.\zs\w\+')
+  endif
   if b:eelixir_subtype == ''
     let b:eelixir_subtype = matchstr(&filetype,'^leex\.\zs\w\+')
   endif
@@ -30,7 +33,7 @@ if !exists("b:eelixir_subtype")
     let b:eelixir_subtype = matchstr(&filetype,'^sface\.\zs\w\+')
   endif
   if b:eelixir_subtype == ''
-    let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.sface\|\.leex\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
+    let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.heex\|\.leex\|\.sface\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
   endif
   if b:eelixir_subtype == 'ex'
     let b:eelixir_subtype = 'elixir'
diff --git a/ftplugin/elixir.vim b/ftplugin/elixir.vim
index cd25464a0..253d522ee 100644
--- a/ftplugin/elixir.vim
+++ b/ftplugin/elixir.vim
@@ -33,7 +33,7 @@ let &l:path =
       \   &g:path
       \ ], ',')
 setlocal includeexpr=elixir#util#get_filename(v:fname)
-setlocal suffixesadd=.ex,.exs,.eex,.leex,.sface,.erl,.xrl,.yrl,.hrl
+setlocal suffixesadd=.ex,.exs,.eex,.heex,.leex,.sface,.erl,.xrl,.yrl,.hrl
 
 let &l:define = 'def\(macro\|guard\|delegate\)\=p\='
 
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index 391265985..dd84aa702 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -13,7 +13,7 @@ endif
 let b:did_ftplugin = 1
 
 let s:save_cpo = &cpo
-set cpo-=C
+set cpo&vim
 
 setlocal include=^\\s*\\%(reload\\\|include\\)\\>
 setlocal suffixesadd=.jl
@@ -89,7 +89,6 @@ if exists("loaded_matchit")
         \ . " | unlet! b:match_words b:match_skip b:match_ignorecase"
         \ . " | unlet! b:julia_begin_keywords b:julia_end_keywords"
         \ . " | delfunction JuliaGetMatchWords"
-        \ . " | call julia_blocks#remove_mappings()"
 
   if get(g:, "julia_blocks", 1)
     call julia_blocks#init_mappings()
diff --git a/ftplugin/juliadoc.vim b/ftplugin/juliadoc.vim
index 5b80149cc..161545d1f 100644
--- a/ftplugin/juliadoc.vim
+++ b/ftplugin/juliadoc.vim
@@ -11,7 +11,7 @@ endif
 let b:did_ftplugin = 1
 
 let s:save_cpo = &cpo
-set cpo-=C
+set cpo&vim
 
 setlocal conceallevel=2
 setlocal concealcursor=nc
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index 6babcef80..6ce2adcb3 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -373,7 +373,7 @@ endfunction
               endif
             else
               let annot_file_name = ''
-              "(Pierre Vittet: I have commented 4b because this was chrashing
+              "(Pierre Vittet: I have commented 4b because this was crashing
               "my vim (it produced infinite loop))
               "
               " 4b. anarchy : the renamed _build directory may be higher in the hierarchy
@@ -464,8 +464,8 @@ endfunction
 
   "b. 'search' and 'match' work to find the type information
 
-      "In:  - lin1,col1: postion of expression first char
-      "     - lin2,col2: postion of expression last char
+      "In:  - lin1,col1: position of expression first char
+      "     - lin2,col2: position of expression last char
       "Out: - the pattern to be looked for to find the block
       " Must be called in the source buffer (use of line2byte)
     function! s:Block_pattern(lin1,lin2,col1,col2)
@@ -583,7 +583,7 @@ endfunction
       let res = substitute (a:res, "\n", "", "g" )
       "remove double space
       let res =substitute(res , "  ", " ", "g")
-      "remove space at begining of string.
+      "remove space at beginning of string.
       let res = substitute(res, "^ *", "", "g")
       return res
     endfunction
diff --git a/ftplugin/puppet.vim b/ftplugin/puppet.vim
index 5316cf5eb..a57fe491c 100644
--- a/ftplugin/puppet.vim
+++ b/ftplugin/puppet.vim
@@ -18,9 +18,11 @@ setlocal softtabstop=2
 setlocal shiftwidth=2
 setlocal expandtab
 setlocal keywordprg=puppet\ describe\ --providers
-setlocal iskeyword=:,@,48-57,_,192-255
 setlocal comments=sr:/*,mb:*,ex:*/,b:#
 setlocal commentstring=#\ %s
+" adding : to iskeyword is tempting in order to make word movements skip over a
+" full resource name, however since : is used in many non-keyword contexts it
+" is a bad idea to add it to the option.
 
 setlocal formatoptions-=t formatoptions+=croql
 setlocal formatexpr=puppet#format#Format()
diff --git a/ftplugin/scheme.vim b/ftplugin/scheme.vim
index a5506d3ad..a2e8345c1 100644
--- a/ftplugin/scheme.vim
+++ b/ftplugin/scheme.vim
@@ -4,10 +4,11 @@ endif
 
 " Vim filetype plugin file
 " Language: Scheme (R7RS)
-" Last Change: 2019 Nov 18
+" Last Change: 2019-11-19
 " Author: Evan Hanson <evhan@foldling.org>
 " Maintainer: Evan Hanson <evhan@foldling.org>
 " Previous Maintainer: Sergey Khorev <sergey.khorev@gmail.com>
+" Repository: https://git.foldling.org/vim-scheme.git
 " URL: https://foldling.org/vim/ftplugin/scheme.vim
 
 if exists('b:did_ftplugin')
@@ -52,7 +53,7 @@ let b:undo_ftplugin = b:undo_ftplugin . ' lispwords<'
 let b:did_scheme_ftplugin = 1
 
 if exists('b:is_chicken') || exists('g:is_chicken')
-  exe 'ru! ftplugin/chicken.vim'
+  runtime! ftplugin/chicken.vim
 endif
 
 unlet b:did_scheme_ftplugin
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
deleted file mode 100644
index 8d45ea771..000000000
--- a/ftplugin/toml.vim
+++ /dev/null
@@ -1,25 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'toml', 'ftplugin/toml.vim')
-  finish
-endif
-
-" File: ftplugin/toml.vim
-" Author: Kevin Ballard <kevin@sb.org>
-" Description: FileType Plugin for Toml
-" Last Change: Feb 12, 2019
-
-if exists('b:did_ftplugin')
-    finish
-endif
-let b:did_ftplugin = 1
-
-let s:save_cpo = &cpo
-set cpo&vim
-let b:undo_ftplugin = 'setlocal commentstring< comments<'
-
-setlocal commentstring=#\ %s
-setlocal comments=:#
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-" vim: set et sw=4 ts=4:
diff --git a/ftplugin/typescript.vim b/ftplugin/typescript.vim
index fe0c7b8db..ce1de1d95 100644
--- a/ftplugin/typescript.vim
+++ b/ftplugin/typescript.vim
@@ -47,7 +47,7 @@ function! Fixedgq(lnum, count)
         return 1
     endif
 
-    " Put all the lines on one line and do normal spliting after that
+    " Put all the lines on one line and do normal splitting after that
     if l:count > 1
         while l:count > 1
             let l:count -= 1
diff --git a/indent/bzl.vim b/indent/bzl.vim
index 8780cc545..6a6ccb615 100644
--- a/indent/bzl.vim
+++ b/indent/bzl.vim
@@ -5,7 +5,7 @@ endif
 " Vim indent file
 " Language:	Bazel (http://bazel.io)
 " Maintainer:	David Barnett (https://github.com/google/vim-ft-bzl)
-" Last Change:	2017 Jun 13
+" Last Change:	2021 Jul 08
 
 if exists('b:did_indent')
   finish
@@ -45,30 +45,41 @@ function GetBzlIndent(lnum) abort
     if exists('g:pyindent_open_paren')
       let l:pyindent_open_paren = g:pyindent_open_paren
     endif
-    let g:pyindent_nested_paren = 'shiftwidth() * 2'
-    let g:pyindent_open_paren = 'shiftwidth() * 2'
+    let g:pyindent_nested_paren = 'shiftwidth()'
+    let g:pyindent_open_paren = 'shiftwidth()'
   endif
 
   let l:indent = -1
 
-  " Indent inside parens.
-  " Align with the open paren unless it is at the end of the line.
-  " E.g.
-  "   open_paren_not_at_EOL(100,
-  "                         (200,
-  "                          300),
-  "                         400)
-  "   open_paren_at_EOL(
-  "       100, 200, 300, 400)
   call cursor(a:lnum, 1)
   let [l:par_line, l:par_col] = searchpairpos('(\|{\|\[', '', ')\|}\|\]', 'bW',
       \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :" .
       \ " synIDattr(synID(line('.'), col('.'), 1), 'name')" .
       \ " =~ '\\(Comment\\|String\\)$'")
   if l:par_line > 0
-    call cursor(l:par_line, 1)
-    if l:par_col != col('$') - 1
-      let l:indent = l:par_col
+    " Indent inside parens.
+    if searchpair('(\|{\|\[', '', ')\|}\|\]', 'W',
+      \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :" .
+      \ " synIDattr(synID(line('.'), col('.'), 1), 'name')" .
+      \ " =~ '\\(Comment\\|String\\)$'") && line('.') == a:lnum
+      " If cursor is at close parens, match indent with open parens.
+      " E.g.
+      "   foo(
+      "   )
+      let l:indent = indent(l:par_line)
+    else
+      " Align with the open paren unless it is at the end of the line.
+      " E.g.
+      "   open_paren_not_at_EOL(100,
+      "                         (200,
+      "                          300),
+      "                         400)
+      "   open_paren_at_EOL(
+      "       100, 200, 300, 400)
+      call cursor(l:par_line, 1)
+      if l:par_col != col('$') - 1
+        let l:indent = l:par_col
+      endif
     endif
   endif
 
diff --git a/indent/elixir.vim b/indent/elixir.vim
index 4ff1257aa..d342e82d0 100644
--- a/indent/elixir.vim
+++ b/indent/elixir.vim
@@ -10,7 +10,7 @@ let b:did_indent = 1
 setlocal indentexpr=elixir#indent(v:lnum)
 
 setlocal indentkeys+==after,=catch,=do,=else,=end,=rescue,
-setlocal indentkeys+=*<Return>,=->,=\|>,=<>,0},0],0)
+setlocal indentkeys+=*<Return>,=->,=\|>,=<>,0},0],0),>
 
 " TODO: @jbodah 2017-02-27: all operators should cause reindent when typed
 
diff --git a/indent/erlang.vim b/indent/erlang.vim
index 1636cc577..5a5637a7f 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -61,7 +61,7 @@ endfunction
 " ======================
 
 " Indtokens are "indentation tokens". See their exact format in the
-" documentaiton of the s:GetTokensFromLine function.
+" documentation of the s:GetTokensFromLine function.
 
 " Purpose:
 "   Calculate the new virtual column after the given segment of a line.
@@ -79,7 +79,7 @@ endfunction
 "   s:CalcVCol("\t'\tx', b", 1, 4, 4)  -> 10
 function! s:CalcVCol(line, first_index, last_index, vcol, tabstop)
 
-  " We copy the relevent segment of the line, otherwise if the line were
+  " We copy the relevant segment of the line, otherwise if the line were
   " e.g. `"\t", term` then the else branch below would consume the `", term`
   " part at once.
   let line = a:line[a:first_index : a:last_index]
@@ -608,7 +608,7 @@ endfunction
 function! s:BeginElementFoundIfEmpty(stack, token, curr_vcol, stored_vcol, sw)
   if empty(a:stack)
     if a:stored_vcol ==# -1
-      call s:Log('    "' . a:token . '" directly preceeds LTI -> return')
+      call s:Log('    "' . a:token . '" directly precedes LTI -> return')
       return [1, a:curr_vcol + a:sw]
     else
       call s:Log('    "' . a:token .
@@ -829,7 +829,7 @@ function! s:ErlangCalcIndent2(lnum, stack)
         if ret | return res | endif
 
         if stored_vcol ==# -1
-          call s:Log('    End of clause directly preceeds LTI -> return')
+          call s:Log('    End of clause directly precedes LTI -> return')
           return 0
         else
           call s:Log('    End of clause (but not end of line) -> return')
diff --git a/indent/ruby.vim b/indent/ruby.vim
index e4a295fd9..a2d8814e8 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -287,7 +287,7 @@ function! GetRubyIndent(...) abort
         \ ]
 
   " Most Significant line based on the previous one -- in case it's a
-  " contination of something above
+  " continuation of something above
   let indent_info.plnum_msl = s:GetMSL(indent_info.plnum)
 
   for callback_name in indent_callback_names
diff --git a/indent/scala.vim b/indent/scala.vim
index 4ff04daaf..cba01f40a 100644
--- a/indent/scala.vim
+++ b/indent/scala.vim
@@ -416,19 +416,19 @@ function! GetScalaIndent()
     if prevline =~ '^\s*\.'
       return ind
     else
-      return ind + &shiftwidth
+      return ind + shiftwidth()
     endif
   endif
 
   " Indent html literals
   if prevline !~ '/>\s*$' && prevline =~ '^\s*<[a-zA-Z][^>]*>\s*$'
     call scala#ConditionalConfirm("3")
-    return ind + &shiftwidth
+    return ind + shiftwidth()
   endif
 
   " assumes curly braces around try-block
   if curline =~ '^\s*}\s*\<catch\>'
-    return ind - &shiftwidth
+    return ind - shiftwidth()
   elseif curline =~ '^\s*\<catch\>'
     return ind
   endif
@@ -442,7 +442,7 @@ function! GetScalaIndent()
         \ || prevline =~ '^\s*\%(}\s*\)\?\<else\>\s*$'
         \ || prevline =~ '=\s*$'
     call scala#ConditionalConfirm("4")
-    let ind = ind + &shiftwidth
+    let ind = ind + shiftwidth()
   elseif prevline =~ '^\s*\<\%(}\?\s*else\s\+\)\?if\>' && curline =~ '^\s*}\?\s*\<else\>'
     return ind
   endif
@@ -451,7 +451,7 @@ function! GetScalaIndent()
   let bracketCount = scala#CountBrackets(prevline, '{', '}')
   if bracketCount > 0 || prevline =~ '.*{\s*$'
     call scala#ConditionalConfirm("5b")
-    let ind = ind + &shiftwidth
+    let ind = ind + shiftwidth()
   elseif bracketCount < 0
     call scala#ConditionalConfirm("6b")
     " if the closing brace actually completes the braces entirely, then we
@@ -479,7 +479,7 @@ function! GetScalaIndent()
     let bracketCount = scala#CountBrackets(prevline, '(', ')')
     if bracketCount > 0 || prevline =~ '.*(\s*$'
       call scala#ConditionalConfirm("5a")
-      let ind = ind + &shiftwidth
+      let ind = ind + shiftwidth()
     elseif bracketCount < 0
       call scala#ConditionalConfirm("6a")
       " if the closing brace actually completes the braces entirely, then we
@@ -501,7 +501,7 @@ function! GetScalaIndent()
       else
         " This is the only part that's different from from the '{', '}' one below
         " Yup... some refactoring is necessary at some point.
-        let ind = ind + (bracketCount * &shiftwidth)
+        let ind = ind + (bracketCount * shiftwidth())
         let lineCompletedBrackets = 1
       endif
     endif
@@ -510,7 +510,7 @@ function! GetScalaIndent()
   if curline =~ '^\s*}\?\s*\<else\>\%(\s\+\<if\>\s*(.*)\)\?\s*{\?\s*$' &&
    \ ! scala#LineIsCompleteIf(prevline) &&
    \ prevline !~ '^.*}\s*$'
-    let ind = ind - &shiftwidth
+    let ind = ind - shiftwidth()
   endif
 
   " Subtract a 'shiftwidth' on '}' or html
@@ -521,7 +521,7 @@ function! GetScalaIndent()
     return indent(matchline)
   elseif curline =~ '^\s*</[a-zA-Z][^>]*>'
     call scala#ConditionalConfirm("14c")
-    return ind - &shiftwidth
+    return ind - shiftwidth()
   endif
 
   let prevParenCount = scala#CountParens(prevline)
@@ -533,7 +533,7 @@ function! GetScalaIndent()
   let prevCurlyCount = scala#CountCurlies(prevline)
   if prevCurlyCount == 0 && prevline =~ '^.*\%(=>\|⇒\)\s*$' && prevline !~ '^\s*this\s*:.*\%(=>\|⇒\)\s*$' && curline !~ '^\s*\<case\>'
     call scala#ConditionalConfirm("16")
-    let ind = ind + &shiftwidth
+    let ind = ind + shiftwidth()
   endif
 
   if ind == originalIndentValue && curline =~ '^\s*\<case\>'
@@ -559,7 +559,7 @@ function! GetScalaIndent()
   if scala#LineIsAClosingXML(prevline)
     if scala#LineCompletesXML(prevlnum, prevline)
       call scala#ConditionalConfirm("20a")
-      return ind - &shiftwidth
+      return ind - shiftwidth()
     else
       call scala#ConditionalConfirm("20b")
       return ind
@@ -570,7 +570,7 @@ function! GetScalaIndent()
     "let indentMultiplier = scala#LineCompletesDefValr(prevlnum, prevline)
     "if indentMultiplier != 0
     "  call scala#ConditionalConfirm("19a")
-    "  let ind = ind - (indentMultiplier * &shiftwidth)
+    "  let ind = ind - (indentMultiplier * shiftwidth())
     let defValrLine = scala#Test(prevlnum, prevline, '{', '}')
     if defValrLine != -1
       call scala#ConditionalConfirm("21a")
@@ -579,10 +579,10 @@ function! GetScalaIndent()
       call scala#ConditionalConfirm("21b")
       if scala#GetLine(prevnonblank(prevlnum - 1)) =~ '^.*\<else\>\s*\%(//.*\)\?$'
         call scala#ConditionalConfirm("21c")
-        let ind = ind - &shiftwidth
+        let ind = ind - shiftwidth()
       elseif scala#LineCompletesIfElse(prevlnum, prevline)
         call scala#ConditionalConfirm("21d")
-        let ind = ind - &shiftwidth
+        let ind = ind - shiftwidth()
       elseif scala#CountParens(curline) < 0 && curline =~ '^\s*)' && scala#GetLine(scala#GetLineThatMatchesBracket('(', ')')) =~ '.*(\s*$'
         " Handles situations that look like this:
         " 
@@ -596,7 +596,7 @@ function! GetScalaIndent()
         "     10
         "   ).somethingHere()
         call scala#ConditionalConfirm("21e")
-        let ind = ind - &shiftwidth
+        let ind = ind - shiftwidth()
       endif
     endif
   endif
diff --git a/syntax/aptconf.vim b/syntax/aptconf.vim
index 309b8faa1..70f9d1c93 100644
--- a/syntax/aptconf.vim
+++ b/syntax/aptconf.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:	APT config file
 " Maintainer:	Yann Amar <quidame@poivron.org>
-" Last Change:	2015 Dec 22
+" Last Change:	2021 Jul 12
 
 " quit when a syntax file was already loaded
 if !exists("main_syntax")
@@ -400,10 +400,13 @@ syn cluster	aptconfSynaptic_ contains=aptconfSynaptic,
 " }}}
 " Unattended Upgrade: {{{
 syn keyword	aptconfUnattendedUpgrade contained
-	\ AutoFixInterruptedDpkg Automatic-Reboot Automatic-Reboot-Time
-	\ Automatic-Reboot-WithUsers InstallOnShutdown Mail MailOnlyOnError
-	\ MinimalSteps Origins-Pattern Package-Blacklist
-	\ Remove-Unused-Dependencies
+	\ Allow-APT-Mark-Fallback Allow-downgrade AutoFixInterruptedDpkg
+	\ Automatic-Reboot Automatic-Reboot-Time Automatic-Reboot-WithUsers
+	\ Debug InstallOnShutdown Mail MailOnlyOnError MailReport MinimalSteps
+	\ OnlyOnACPower Origins-Pattern Package-Blacklist
+	\ Remove-New-Unused-Dependencies Remove-Unused-Dependencies
+	\ Remove-Unused-Kernel-Packages Skip-Updates-On-Metered-Connections
+	\ SyslogEnable SyslogFacility Verbose
 
 syn cluster	aptconfUnattendedUpgrade_ contains=aptconfUnattendedUpgrade
 " }}}
diff --git a/syntax/c.vim b/syntax/c.vim
index a11a95a21..714746007 100644
--- a/syntax/c.vim
+++ b/syntax/c.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Jan 11
+" Last Change:	2021 May 24
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -418,6 +418,9 @@ if exists("c_autodoc")
   syn cluster cPreProcGroup add=cAutodocReal
 endif
 
+" be able to fold #pragma regions
+syn region	cPragma		start="^\s*#pragma\s\+region\>" end="^\s*#pragma\s\+endregion\>" transparent keepend extend fold
+
 " Highlight User Labels
 syn cluster	cMultiGroup	contains=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString
 if s:ft ==# 'c' || exists("cpp_no_cpp11")
diff --git a/syntax/cpp.vim b/syntax/cpp.vim
index 95a56d360..db95a78dc 100644
--- a/syntax/cpp.vim
+++ b/syntax/cpp.vim
@@ -64,7 +64,7 @@ if !exists("cpp_no_cpp14")
   syn match cppFloat		display contained "\<\d\+\.\d*\(e[-+]\=\d\+\)\=\([FfLl]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
   syn match cppFloat		display contained "\<\.\d\+\(e[-+]\=\d\+\)\=\([FfLl]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
   syn match cppFloat		display contained "\<\d\+e[-+]\=\d\+\([FfLl]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
-  syn region cppString		start=+\(L\|u\|u8\|U\|R\|LR\|u8R\|uR\|UR\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"\(sv\|s\|_\i*\)\=+ end='$' contains=cSpecial,cFormat,@Spell
+  syn region cppString		start=+\(L\|u\|u8\|U\)\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"\(sv\|s\|_\i*\)\=+ end='$' contains=cSpecial,cFormat,@Spell
 endif
 
 " C++ 17 extensions
@@ -73,6 +73,20 @@ if !exists("cpp_no_cpp17")
   syn match cppCast		"\<reinterpret_pointer_cast\s*$"
   syn match cppFloat		display contained "\<0x\x*\.\x\+p[-+]\=\d\+\([FfLl]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
   syn match cppFloat		display contained "\<0x\x\+\.\=p[-+]\=\d\+\([FfLl]\|i[fl]\=\|h\|min\|s\|ms\|us\|ns\|_\i*\)\=\>"
+
+  " TODO: push this up to c.vim if/when supported in C23
+  syn match cppCharacter	"u8'[^\\]'"
+  syn match cppCharacter	"u8'[^']*'" contains=cSpecial
+  if exists("c_gnu")
+    syn match cppSpecialError	  "u8'\\[^'\"?\\abefnrtv]'"
+    syn match cppSpecialCharacter "u8'\\['\"?\\abefnrtv]'"
+  else
+    syn match cppSpecialError	  "u8'\\[^'\"?\\abfnrtv]'"
+    syn match cppSpecialCharacter "u8'\\['\"?\\abfnrtv]'"
+  endif
+  syn match cppSpecialCharacter display "u8'\\\o\{1,3}'"
+  syn match cppSpecialCharacter display "u8'\\x\x\+'"
+
 endif
 
 " C++ 20 extensions
@@ -93,23 +107,26 @@ endif
 syn match cppMinMax "[<>]?"
 
 " Default highlighting
-hi def link cppAccess		cppStatement
-hi def link cppCast		cppStatement
+hi def link cppAccess			cppStatement
+hi def link cppCast			cppStatement
 hi def link cppExceptions		Exception
-hi def link cppOperator		Operator
+hi def link cppOperator			Operator
 hi def link cppStatement		Statement
-hi def link cppModifier		Type
-hi def link cppType		Type
-hi def link cppStorageClass	StorageClass
+hi def link cppModifier			Type
+hi def link cppType			Type
+hi def link cppStorageClass		StorageClass
 hi def link cppStructure		Structure
-hi def link cppBoolean		Boolean
-hi def link cppConstant		Constant
+hi def link cppBoolean			Boolean
+hi def link cppCharacter		cCharacter
+hi def link cppSpecialCharacter		cSpecialCharacter
+hi def link cppSpecialError		cSpecialError
+hi def link cppConstant			Constant
 hi def link cppRawStringDelimiter	Delimiter
 hi def link cppRawString		String
-hi def link cppString		String
-hi def link cppNumber		Number
-hi def link cppFloat		Number
-hi def link cppModule		Include
+hi def link cppString			String
+hi def link cppNumber			Number
+hi def link cppFloat			Number
+hi def link cppModule			Include
 
 let b:current_syntax = "cpp"
 
diff --git a/syntax/debchangelog.vim b/syntax/debchangelog.vim
index 174d86d73..a6b5c8714 100644
--- a/syntax/debchangelog.vim
+++ b/syntax/debchangelog.vim
@@ -7,7 +7,7 @@ endif
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2020 Nov 28
+" Last Change: 2021 Aug 03
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -28,7 +28,7 @@ let s:supported = [
       \ 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
       \ 'trixie', 'sid', 'rc-buggy',
       \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'groovy', 'hirsute', 'devel'
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'hirsute', 'impish', 'devel'
       \ ]
 let s:unsupported = [
       \ 'frozen', 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
@@ -38,7 +38,7 @@ let s:unsupported = [
       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
       \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
       \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
-      \ 'disco', 'eoan'
+      \ 'disco', 'eoan', 'groovy'
       \ ]
 let &cpo=s:cpo
 
diff --git a/syntax/debsources.vim b/syntax/debsources.vim
index 6ea0bcb15..f8ed8d990 100644
--- a/syntax/debsources.vim
+++ b/syntax/debsources.vim
@@ -6,7 +6,7 @@ endif
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2020 Nov 28
+" Last Change: 2021 Aug 03
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -30,7 +30,7 @@ let s:supported = [
       \ 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
       \ 'trixie', 'sid', 'rc-buggy',
       \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'groovy', 'hirsute', 'devel'
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'hirsute', 'impish', 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
@@ -40,7 +40,7 @@ let s:unsupported = [
       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
       \ 'maverick', 'natty', 'oneiric', 'precise', 'quantal', 'raring', 'saucy',
       \ 'utopic', 'vivid', 'wily', 'yakkety', 'zesty', 'artful', 'cosmic',
-      \ 'disco', 'eoan'
+      \ 'disco', 'eoan', 'groovy'
       \ ]
 let &cpo=s:cpo
 
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index e30a51c99..8fbe92a77 100644
--- a/syntax/eelixir.vim
+++ b/syntax/eelixir.vim
@@ -23,6 +23,9 @@ if !exists("b:eelixir_subtype")
   if b:eelixir_subtype == ''
     let b:eelixir_subtype = matchstr(&filetype,'^eex\.\zs\w\+')
   endif
+  if b:eelixir_subtype == ''
+    let b:eelixir_subtype = matchstr(&filetype,'^heex\.\zs\w\+')
+  endif
   if b:eelixir_subtype == ''
     let b:eelixir_subtype = matchstr(&filetype,'^leex\.\zs\w\+')
   endif
@@ -30,7 +33,7 @@ if !exists("b:eelixir_subtype")
     let b:eelixir_subtype = matchstr(&filetype,'^sface\.\zs\w\+')
   endif
   if b:eelixir_subtype == ''
-    let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.sface\|\.leex\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
+    let b:eelixir_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.eex\|\.heex\|\.leex\|\.sface\|\.eelixir\)\+$','',''),'\.\zs\w\+$')
   endif
   if b:eelixir_subtype == 'ex'
     let b:eelixir_subtype = 'elixir'
diff --git a/syntax/git.vim b/syntax/git.vim
index 9d8efc69e..16a86a6aa 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -16,12 +16,28 @@ syn sync minlines=50
 
 syn include @gitDiff syntax/diff.vim
 
-syn region gitHead start=/\%^/ end=/^$/ contains=@NoSpell
-syn region gitHead start=/\%(^commit\%( \x\{40\}\)\{1,\}\%(\s*(.*)\)\=$\)\@=/ end=/^$/ contains=@NoSpell
-
-" For git reflog and git show ...^{tree}, avoid sync issues
-syn match gitHead /^\d\{6\} \%(\w\{4} \)\=\x\{40\}\%( [0-3]\)\=\t.*/ contains=@NoSpell
-syn match gitHead /^\x\{40\} \x\{40}\t.*/ contains=@NoSpell
+syn region gitHead start=/\%^\%(tag \|tree \|object \)\@=/ end=/^$/ contains=@NoSpell
+syn region gitHead start=/\%(^commit\%( \x\{4,\}\)\{1,\}\%(\s*(.*)\)\=$\)\@=/ end=/^$/ contains=@NoSpell
+" git log --oneline
+" minimize false positives by verifying contents of buffer
+if getline(1) =~# '^\x\{7,\} ' && getline('$') =~# '^\x\{7,\} '
+  syn match gitHashAbbrev /^\x\{7,\} \@=/ contains=@NoSpell
+elseif getline(1) =~#     '^[|\/\\_ ]\{-\}\*[|\/\\_ ]\{-\} \x\{7,\} '
+  syn match gitHashAbbrev /^[|\/\\_ ]\{-\}\*[|\/\\_ ]\{-\} \zs\x\{7,\} \@=/ contains=@NoSpell
+endif
+" git log --graph
+syn region gitGraph start=/\%(^[|\/\\_ ]*\*[|\/\\_ ]\{-\} commit\%( \x\{4,\}\)\{1,\}\%(\s*(.*)\)\=$\)\@=/ end=/^\%([|\/\\_ ]*$\)\@=/ contains=@NoSpell
+" git blame --porcelain
+syn region gitHead start=/\%(^\x\{40,\} \d\+ \d\+\%( \d\+\)\=$\)\@=/ end=/^\t\@=/ contains=@NoSpell
+" git ls-tree
+syn match  gitMode    /^\d\{6\}\%( \%(blob\|tree\) \x\{4,\}\t\)\@=/ nextgroup=gitType skipwhite contains=@NoSpell
+" git ls-files --stage
+syn match  gitMode    /^\d\{6\}\%( \x\{4,\} [0-3]\t\)\@=/ nextgroup=gitHashStage skipwhite contains=@NoSpell
+" .git/HEAD, .git/refs/
+syn match  gitKeyword /\%^ref: \@=/ nextgroup=gitReference skipwhite contains=@NoSpell
+syn match  gitHash /\%^\x\{40,}\%$/ skipwhite contains=@NoSpell
+" .git/logs/
+syn match  gitReflog /^\x\{40,\} \x\{40,\} .\{-\}\d\+\s-\d\{4\}\t.*/ skipwhite contains=@NoSpell,gitReflogOld
 
 syn region gitDiff start=/^\%(diff --git \)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff fold
 syn region gitDiff start=/^\%(@@ -\)\@=/ end=/^\%(diff --\%(git\|cc\|combined\) \|$\)\@=/ contains=@gitDiff
@@ -33,31 +49,43 @@ syn match gitDiffAdded "{+[^}]*+}" contained containedin=gitDiff
 syn match gitDiffRemoved "^ \+-.*" contained containedin=gitDiffMerge
 syn match gitDiffRemoved "\[-[^]]*-\]" contained containedin=gitDiff
 
-syn match  gitKeyword /^\%(object\|type\|tag\|commit\|tree\|parent\|encoding\|gpgsig\%(-\w\+\)\=\|summary\|boundary\|filename\|previous\)\>/ contained containedin=gitHead nextgroup=gitHash,gitType skipwhite contains=@NoSpell
-syn match  gitKeyword /^\%(tag\>\|ref:\)/ contained containedin=gitHead nextgroup=gitReference skipwhite contains=@NoSpell
+syn match  gitKeyword /^commit \@=/ contained containedin=gitHead nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
+syn match  gitKeyword /^\%(object\|tree\|parent\|encoding\|gpgsig\%(-\w\+\)\=\|previous\) \@=/ contained containedin=gitHead nextgroup=gitHash skipwhite contains=@NoSpell
 syn match  gitKeyword /^Merge:/  contained containedin=gitHead nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
-syn match  gitMode    /^\d\{6\}\>/ contained containedin=gitHead nextgroup=gitType,gitHash skipwhite
-syn match  gitIdentityKeyword /^\%(author\|committer\|tagger\)\%(-mail\|-time\|-tz\)\=\>/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
+syn match  gitIdentityKeyword /^\%(author\|committer\|tagger\) \@=/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
 syn match  gitIdentityHeader /^\%(Author\|Commit\|Tagger\):/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
 syn match  gitDateHeader /^\%(AuthorDate\|CommitDate\|Date\):/ contained containedin=gitHead nextgroup=gitDate skipwhite
 
+syn match  gitKeyword /^[*|\/\\_ ]\+\zscommit \@=/ contained containedin=gitGraph nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
+syn match  gitKeyword /^[|\/\\_ ]\+\zs\%(object\|tree\|parent\|encoding\|gpgsig\%(-\w\+\)\=\|previous\) \@=/ contained containedin=gitGraph nextgroup=gitHash skipwhite contains=@NoSpell
+syn match  gitKeyword /^[|\/\\_ ]\+\zsMerge:/  contained containedin=gitGraph nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
+syn match  gitIdentityKeyword /^[|\/\\_ ]\+\zs\%(author\|committer\|tagger\) \@=/ contained containedin=gitGraph nextgroup=gitIdentity skipwhite
+syn match  gitIdentityHeader /^[|\/\\_ ]\+\zs\%(Author\|Commit\|Tagger\):/ contained containedin=gitGraph nextgroup=gitIdentity skipwhite
+syn match  gitDateHeader /^[|\/\\_ ]\+\zs\%(AuthorDate\|CommitDate\|Date\):/ contained containedin=gitGraph nextgroup=gitDate skipwhite
+
+syn match  gitKeyword /^type \@=/ contained containedin=gitHead nextgroup=gitType skipwhite contains=@NoSpell
+syn match  gitKeyword /^\%(summary\|boundary\|filename\|\%(author\|committer\)-\%(time\|tz\)\) \@=/ contained containedin=gitHead skipwhite contains=@NoSpell
+syn match  gitKeyword /^tag \@=/ contained containedin=gitHead nextgroup=gitReference skipwhite contains=@NoSpell
+syn match  gitIdentityKeyword /^\%(author\|committer\)-mail \@=/ contained containedin=gitHead nextgroup=gitEmail skipwhite
 syn match  gitReflogHeader /^Reflog:/ contained containedin=gitHead nextgroup=gitReflogMiddle skipwhite
 syn match  gitReflogHeader /^Reflog message:/ contained containedin=gitHead skipwhite
 syn match  gitReflogMiddle /\S\+@{\d\+} (/he=e-2 nextgroup=gitIdentity
 
+syn match  gitIdentity /\S.\{-\} <[^>]*>/ contained nextgroup=gitDate skipwhite
+syn region gitEmail matchgroup=gitEmailDelimiter start=/</ end=/>/ keepend oneline contained containedin=gitIdentity
 syn match  gitDate      /\<\u\l\l \u\l\l \d\=\d \d\d:\d\d:\d\d \d\d\d\d [+-]\d\d\d\d/ contained
 syn match  gitDate      /-\=\d\+ [+-]\d\d\d\d\>/               contained
 syn match  gitDate      /\<\d\+ \l\+ ago\>/                    contained
-syn match  gitType      /\<\%(tag\|commit\|tree\|blob\)\>/     contained nextgroup=gitHash skipwhite
-syn match  gitStage     /\<\d\t\@=/                            contained
+syn match  gitType      /\<\%(tag\|commit\|tree\|blob\)\>/     contained nextgroup=gitHashAbbrev skipwhite
 syn match  gitReference /\S\+\S\@!/                            contained
-syn match  gitHash      /\<\x\{40\}\>/                         contained nextgroup=gitIdentity,gitStage,gitHash skipwhite contains=@NoSpell
-syn match  gitHash      /^\<\x\{40\}\>/ containedin=gitHead contained nextgroup=gitHash skipwhite contains=@NoSpell
-syn match  gitHashAbbrev /\<\x\{4,40\}\>/           contained nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
+syn match  gitHash      /\<\x\{40,\}\>/             contained nextgroup=gitIdentity,gitHash skipwhite contains=@NoSpell
+syn match  gitReflogOld /^\x\{40,\} \@=/            contained nextgroup=gitReflogNew skipwhite contains=@NoSpell
+syn match  gitReflogNew /\<\x\{40,\} \@=/           contained nextgroup=gitIdentity skipwhite contains=@NoSpell
+syn match  gitHashAbbrev /\<\x\{4,\}\>/             contained nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
 syn match  gitHashAbbrev /\<\x\{4,39\}\.\.\./he=e-3 contained nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
+syn match  gitHashStage /\<\x\{4,\}\>/              contained nextgroup=gitStage skipwhite contains=@NoSpell
+syn match  gitStage     /\<\d\t\@=/                 contained
 
-syn match  gitIdentity /\S.\{-\} <[^>]*>/ contained nextgroup=gitDate skipwhite
-syn region gitEmail matchgroup=gitEmailDelimiter start=/</ end=/>/ keepend oneline contained containedin=gitIdentity
 
 syn match  gitNotesHeader /^Notes:\ze\n    /
 
@@ -72,7 +100,10 @@ hi def link gitEmailDelimiter    Delimiter
 hi def link gitEmail             Special
 hi def link gitDate              Number
 hi def link gitMode              Number
+hi def link gitHashStage         gitHash
 hi def link gitHashAbbrev        gitHash
+hi def link gitReflogOld         gitHash
+hi def link gitReflogNew         gitHash
 hi def link gitHash              Identifier
 hi def link gitReflogMiddle      gitReference
 hi def link gitReference         Function
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 88aa464ed..bafae9b43 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -13,6 +13,9 @@ elseif exists("b:current_syntax")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 if version < 704
   " this is used to disable regex syntax like `\@3<='
   " on older vim versions
@@ -40,9 +43,9 @@ let s:julia_highlight_operators = get(g:, "julia_highlight_operators", 1)
 " It doesn't include a few characters (spaces and all closing parentheses)
 " because those may or may not be valid in the lookbehind on a case-by-case
 " basis.
-let s:nonid_chars = '\U00-\U08' . '\U0A-\U1F' .
-      \             '\U21-\U28' . '\U2A-\U2F' . '\U3A-\U40' . '\U5B-\U5E' . '\U60' . '\U7B\U7C' .
-      \             '\U7E-\UA1' . '\UA7\UA8' . '\UAB-\UAD' . '\UAF\UB1\UB4' . '\UB6-\UB8' . '\UBB\UBF' . '\UD7\UF7'
+let s:nonid_chars = '\U00-\U08' . '\U0A-\U1F'
+      \           . '\U21-\U28' . '\U2A-\U2F' . '\U3A-\U40' . '\U5B-\U5E' . '\U60' . '\U7B\U7C'
+      \           . '\U7E-\UA1' . '\UA7\UA8' . '\UAB-\UAD' . '\UAF\UB1\UB4' . '\UB6-\UB8' . '\UBB\UBF' . '\UD7\UF7'
 
 " The complete list
 let s:nonidS_chars = '[:space:])\U5D}' . s:nonid_chars
@@ -60,10 +63,10 @@ let s:op_chars = '\U25\U26\U2A\U2B\U2D\U2F\U3C-\U3E\U5C\U5E\U7C\U7E\UAC\UB1\UD7\
 let s:op_chars_wc = '\U2026\U205D\U214B\U2190-\U2194\U219A-\U219E\U21A0\U21A2-\U21A4\U21A6\U21A9-\U21AC\U21AE\U21B6\U21B7\U21BA-\U21BD\U21C0\U21C1\U21C4\U21C6\U21C7\U21C9\U21CB-\U21D0\U21D2\U21D4\U21DA-\U21DD\U21E0\U21E2\U21F4-\U21FF\U2208-\U220D\U2213\U2214\U2217-\U221D\U2224-\U222A\U2237\U2238\U223A\U223B\U223D\U223E\U2240-\U228B\U228D-\U229C\U229E-\U22A3\U22A9\U22AC\U22AE\U22B0-\U22B7\U22BB-\U22BD\U22C4-\U22C7\U22C9-\U22D3\U22D5-\U22FF\U233F\U25B7\U27C2\U27C8\U27C9\U27D1\U27D2\U27D5-\U27D7\U27F0\U27F1\U27F5-\U27F7\U27F9-\U27FF\U2900-\U2918\U291D-\U2920\U2944-\U2970\U29B7\U29B8\U29BC\U29BE-\U29C1\U29E1\U29E3-\U29E5\U29F4\U29F6\U29F7\U29FA\U29FB\U2A07\U2A08\U2A1D\U2A1F\U2A22-\U2A2E\U2A30-\U2A3D\U2A40-\U2A45\U2A4A-\U2A58\U2A5A-\U2A63\U2A66\U2A67\U2A6A-\U2AD9\U2ADB\U2AF7-\U2AFA\U2B30-\U2B44\U2B47-\U2B4C\UFFE9-\UFFEC'
 
 " Full operators regex
-let s:operators = '\%(' . '\.\%([-+*/^÷%|&⊻]\|//\|\\\|>>\|>>>\?\)\?=' .
-      \           '\|'  . '[:<>]=\|||\|&&\||>\|<|\|[<>:]:\|<<\|>>>\?\|//\|[-=]>\|\.\.\.\?' .
-      \           '\|'  . '\.\?[!' . s:op_chars . s:op_chars_wc . ']' .
-      \           '\)'
+let s:operators = '\%(' . '\.\%([-+*/^÷%|&⊻]\|//\|\\\|>>\|>>>\?\)\?='
+      \         . '\|'  . '[:<>]=\|||\|&&\||>\|<|\|[<>:]:\|<<\|>>>\?\|//\|[-=]>\|\.\.\.\?'
+      \         . '\|'  . '\.\?[!' . s:op_chars . s:op_chars_wc . ']'
+      \         . '\)'
 
 
 " Characters that can be used to start an identifier. Above \UBF we don't
@@ -247,11 +250,11 @@ let s:hex_regex = '0x\x\%(_\?\x\)*\%(\>\|im\>\|\ze\X\)'
 let s:bin_regex = '0b[01]\%(_\?[01]\)*\%(\>\|im\>\|\ze[^01]\)'
 let s:oct_regex = '0o\o\%(_\?\o\)*\%(\>\|im\>\|\ze\O\)'
 
-let s:int_regex = '\%(' . s:hex_regex .
-      \           '\|'  . s:bin_regex .
-      \           '\|'  . s:oct_regex .
-      \           '\|'  . s:dec_regex .
-      \           '\)'
+let s:int_regex = '\%(' . s:hex_regex
+      \         . '\|'  . s:bin_regex
+      \         . '\|'  . s:oct_regex
+      \         . '\|'  . s:dec_regex
+      \         . '\)'
 
 "floating point regexes
 "  starting with a dot, optional exponent
@@ -267,12 +270,12 @@ let s:hexfloat_regex1 = '0x\.\%\(\x\%(_\?\x\)*\)\?[pP][-+]\?\d\+\%(\>\|im\>\|\ze
 "  starting with a digit
 let s:hexfloat_regex2 = '0x\x\%(_\?\x\)*\%\(\.\%\(\x\%(_\?\x\)*\)\?\)\?[pP][-+]\?\d\+\%(\>\|im\>\|\ze\X\)'
 
-let s:float_regex = '\%(' . s:float_regex3 .
-      \             '\|'  . s:float_regex2 .
-      \             '\|'  . s:float_regex1 .
-      \             '\|'  . s:hexfloat_regex2 .
-      \             '\|'  . s:hexfloat_regex1 .
-      \             '\)'
+let s:float_regex = '\%(' . s:float_regex3
+      \           . '\|'  . s:float_regex2
+      \           . '\|'  . s:float_regex1
+      \           . '\|'  . s:hexfloat_regex2
+      \           . '\|'  . s:hexfloat_regex1
+      \           . '\)'
 
 exec 'syntax match   juliaNumber	contained "' . s:int_regex . '" contains=juliaComplexUnit'
 exec 'syntax match   juliaFloat		contained "' . s:float_regex . '" contains=juliaComplexUnit'
@@ -545,3 +548,6 @@ hi def link juliaError			Error
 syntax sync fromstart
 
 let b:current_syntax = "julia"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/syntax/juliadoc.vim b/syntax/juliadoc.vim
index c4dbfdbdc..41626d031 100644
--- a/syntax/juliadoc.vim
+++ b/syntax/juliadoc.vim
@@ -9,6 +9,9 @@ if exists('b:current_syntax')
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 syntax sync fromstart
 
 syntax region juliadocCode matchgroup=juliadocCodeDelimiter start="`" end="`" concealends display oneline
@@ -67,3 +70,6 @@ highlight default link juliadocAdmonitionsType Todo
 highlight default link juliadocAdmonitionsTitle Title
 
 let b:current_syntax = "juliadoc"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/syntax/meson.vim b/syntax/meson.vim
index 1a6cda37e..8e151a7e6 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -7,7 +7,7 @@ endif
 " License:	VIM License
 " Maintainer:	Nirbheek Chauhan <nirbheek.chauhan@gmail.com>
 "		Liam Beguin <liambeguin@gmail.com>
-" Last Change:	2016 Dec 7
+" Last Change:	2021 Aug 16
 " Credits:	Zvezdan Petkovic <zpetkovic@acm.org>
 "		Neil Schemenauer <nas@meson.ca>
 "		Dmitry Vasiliev
@@ -122,6 +122,7 @@ syn keyword mesonBuiltin
   \ summary
   \ target_machine
   \ test
+  \ unset_variable
   \ vcs_tag
   \ warning
   \ range
diff --git a/syntax/pascal.vim b/syntax/pascal.vim
index 3080352e9..d75f33547 100644
--- a/syntax/pascal.vim
+++ b/syntax/pascal.vim
@@ -7,7 +7,7 @@ endif
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainers:	Xavier Crégut <xavier.cregut@enseeiht.fr>
 "			Mario Eusebio <bio@dq.fct.unl.pt>
-" Last Change:		2021 Apr 23
+" Last Change:		2021 May 20
 
 " Contributors: Tim Chase <tchase@csc.com>,
 "		Stas Grabois <stsi@vtrails.com>,
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index 9b235afbe..538ef1e10 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -49,9 +49,11 @@ syntax keyword plantumlKeyword split start stereotype stop title top up while
 " Not in 'java - jar plantuml.jar - language' results
 syntax keyword plantumlKeyword endlegend sprite then
 " gantt
-syntax keyword plantumlTypeKeyword project monday tuesday wednesday thursday friday saturday sunday
-syntax keyword plantumlKeyword starts ends start end closed day after colored lasts happens in at are to the and
-
+syntax keyword plantumlTypeKeyword monday tuesday wednesday thursday friday saturday sunday today
+syntax keyword plantumlTypeKeyword project Project labels Labels last first column
+syntax keyword plantumlKeyword starts ends start end closed after colored lasts happens in at are to the and
+syntax keyword plantumlKeyword printscale ganttscale projectscale daily weekly monthly quarterly yearly zoom
+syntax keyword plantumlKeyword day days week weeks today then complete displays same row pauses
 
 syntax keyword plantumlCommentTODO XXX TODO FIXME NOTE contained
 syntax match plantumlColor /#[0-9A-Fa-f]\{6\}\>/
diff --git a/syntax/scala.vim b/syntax/scala.vim
index 6f802f3c4..decceba4b 100644
--- a/syntax/scala.vim
+++ b/syntax/scala.vim
@@ -70,11 +70,13 @@ syn match scalaChar /'\\u[A-Fa-f0-9]\{4}'/ contains=scalaUnicodeChar
 syn match scalaEscapedChar /\\[\\"'ntbrf]/
 syn match scalaUnicodeChar /\\u[A-Fa-f0-9]\{4}/
 hi link scalaChar Character
-hi link scalaEscapedChar Function
+hi link scalaEscapedChar Special
 hi link scalaUnicodeChar Special
 
 syn match scalaOperator "||"
 syn match scalaOperator "&&"
+syn match scalaOperator "|"
+syn match scalaOperator "&"
 hi link scalaOperator Special
 
 syn match scalaNameDefinition /\<[_A-Za-z0-9$]\+\>/ contained nextgroup=scalaPostNameDefinition,scalaVariableDeclarationList
@@ -122,7 +124,7 @@ hi link scalaTypePostExtension Keyword
 
 syn match scalaTypeAnnotation /\%([_a-zA-Z0-9$\s]:\_s*\)\ze[_=(\.A-Za-z0-9$]\+/ skipwhite nextgroup=scalaTypeDeclaration contains=scalaRoundBrackets
 syn match scalaTypeAnnotation /)\_s*:\_s*\ze[_=(\.A-Za-z0-9$]\+/ skipwhite nextgroup=scalaTypeDeclaration
-hi link scalaTypeAnnotation Normal
+hi clear scalaTypeAnnotation
 
 syn match scalaCaseFollowing /\<[_\.A-Za-z0-9$]\+\>/ contained contains=scalaCapitalWord
 syn match scalaCaseFollowing /`[^`]\+`/ contained contains=scalaCapitalWord
@@ -148,21 +150,21 @@ hi link scalaString String
 hi link scalaStringEmbeddedQuote String
 
 syn region scalaIString matchgroup=scalaInterpolationBrackets start=/\<[a-zA-Z][a-zA-Z0-9_]*"/ skip=/\\"/ end=/"/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar
-syn region scalaTripleIString matchgroup=scalaInterpolationBrackets start=/\<[a-zA-Z][a-zA-Z0-9_]*"""/ end=/"""\%([^"]\|$\)/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar
+syn region scalaTripleIString matchgroup=scalaInterpolationBrackets start=/\<[a-zA-Z][a-zA-Z0-9_]*"""/ end=/"""\ze\%([^"]\|$\)/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar
 hi link scalaIString String
 hi link scalaTripleIString String
 
 syn match scalaInterpolation /\$[a-zA-Z0-9_$]\+/ contained
 exe 'syn region scalaInterpolationB matchgroup=scalaInterpolationBoundary start=/\${/ end=/}/ contained contains=' . s:ContainedGroup()
 hi link scalaInterpolation Function
-hi link scalaInterpolationB Normal
+hi clear scalaInterpolationB
 
 syn region scalaFString matchgroup=scalaInterpolationBrackets start=/f"/ skip=/\\"/ end=/"/ contains=scalaFInterpolation,scalaFInterpolationB,scalaEscapedChar,scalaUnicodeChar
 syn match scalaFInterpolation /\$[a-zA-Z0-9_$]\+\(%[-A-Za-z0-9\.]\+\)\?/ contained
 exe 'syn region scalaFInterpolationB matchgroup=scalaInterpolationBoundary start=/${/ end=/}\(%[-A-Za-z0-9\.]\+\)\?/ contained contains=' . s:ContainedGroup()
 hi link scalaFString String
 hi link scalaFInterpolation Function
-hi link scalaFInterpolationB Normal
+hi clear scalaFInterpolationB
 
 syn region scalaTripleString start=/"""/ end=/"""\%([^"]\|$\)/ contains=scalaEscapedChar,scalaUnicodeChar
 syn region scalaTripleFString matchgroup=scalaInterpolationBrackets start=/f"""/ end=/"""\%([^"]\|$\)/ contains=scalaFInterpolation,scalaFInterpolationB,scalaEscapedChar,scalaUnicodeChar
diff --git a/syntax/scheme.vim b/syntax/scheme.vim
index 8e991aa98..2db92bcdf 100644
--- a/syntax/scheme.vim
+++ b/syntax/scheme.vim
@@ -4,11 +4,12 @@ endif
 
 " Vim syntax file
 " Language: Scheme (R7RS)
-" Last Change: 2018-01-06
+" Last Change: 2021-01-03
 " Author: Evan Hanson <evhan@foldling.org>
 " Maintainer: Evan Hanson <evhan@foldling.org>
 " Previous Author: Dirk van Deun <dirk@igwe.vub.ac.be>
 " Previous Maintainer: Sergey Khorev <sergey.khorev@gmail.com>
+" Repository: https://git.foldling.org/vim-scheme.git
 " URL: https://foldling.org/vim/syntax/scheme.vim
 
 if exists('b:current_syntax')
@@ -18,6 +19,8 @@ endif
 let s:cpo = &cpo
 set cpo&vim
 
+syn spell notoplevel
+
 syn match schemeParentheses "[^ '`\t\n()\[\]";]\+"
 syn match schemeParentheses "[)\]]"
 
@@ -39,7 +42,7 @@ syn region schemeUnquote matchgroup=schemeParentheses start=/,@(/ end=/)/ contai
 syn region schemeQuoteForm matchgroup=schemeData start=/(/ end=/)/ contained contains=ALLBUT,schemeQuasiquote,schemeQuasiquoteForm,schemeUnquote,schemeForm,schemeDatumCommentForm,schemeImport,@schemeImportCluster,@schemeSyntaxCluster
 syn region schemeQuasiquoteForm matchgroup=schemeData start=/(/ end=/)/ contained contains=ALLBUT,schemeQuote,schemeForm,schemeDatumCommentForm,schemeImport,@schemeImportCluster,@schemeSyntaxCluster
 
-syn region schemeString start=/\(\\\)\@<!"/ skip=/\\[\\"]/ end=/"/
+syn region schemeString start=/\(\\\)\@<!"/ skip=/\\[\\"]/ end=/"/ contains=@Spell
 syn region schemeSymbol start=/\(\\\)\@<!|/ skip=/\\[\\|]/ end=/|/
 
 syn match schemeNumber /\(#[dbeio]\)*[+\-]*\([0-9]\+\|inf.0\|nan.0\)\(\/\|\.\)\?[0-9+\-@\ilns]*\>/
@@ -51,9 +54,9 @@ syn match schemeBoolean /#f\(alse\)\?/
 syn match schemeCharacter /#\\.[^ `'\t\n\[\]()]*/
 syn match schemeCharacter /#\\x[0-9a-fA-F]\+/
 
-syn match schemeComment /;.*$/
+syn match schemeComment /;.*$/ contains=@Spell
 
-syn region schemeMultilineComment start=/#|/ end=/|#/ contains=schemeMultilineComment
+syn region schemeMultilineComment start=/#|/ end=/|#/ contains=schemeMultilineComment,@Spell
 
 syn region schemeForm matchgroup=schemeParentheses start="(" end=")" contains=ALLBUT,schemeUnquote,schemeDatumCommentForm,@schemeImportCluster
 syn region schemeForm matchgroup=schemeParentheses start="\[" end="\]" contains=ALLBUT,schemeUnquote,schemeDatumCommentForm,@schemeImportCluster
@@ -67,7 +70,7 @@ else
   syn region schemeImport matchgroup=schemeImport start="\(([ \t\n]*\)\@<=\(import\)\>" end=")"me=e-1 contained contains=schemeImportForm,schemeIdentifier,schemeComment,schemeDatumComment
 endif
 
-syn match   schemeImportKeyword "\(([ \t\n]*\)\@<=\(except\|only\|prefix\|rename\|srfi\)\>"
+syn match   schemeImportKeyword "\(([ \t\n]*\)\@<=\(except\|only\|prefix\|rename\)\>"
 syn region  schemeImportForm matchgroup=schemeParentheses start="(" end=")" contained contains=schemeIdentifier,schemeComment,schemeDatumComment,@schemeImportCluster
 syn cluster schemeImportCluster contains=schemeImportForm,schemeImportKeyword
 
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index e04ee988f..340b00fd6 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'tmux', 'syntax/tmux.vim')
 endif
 
 " Language: tmux(1) configuration file
-" Version: to_merge (git-c03b5746)
+" Version: 3.2a (git-44ada9cd)
 " URL: https://github.com/ericpruitt/tmux.vim/
 " Maintainer: Eric Pruitt <eric.pruitt@gmail.com>
 " License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause)
@@ -84,8 +84,8 @@ syn keyword tmuxOptions
 \ main-pane-width mode-keys mode-style monitor-activity monitor-bell
 \ monitor-silence mouse other-pane-height other-pane-width
 \ pane-active-border-style pane-base-index pane-border-format
-\ pane-border-lines pane-border-status pane-border-style prefix prefix2
-\ prompt-history-limit remain-on-exit renumber-windows repeat-time
+\ pane-border-lines pane-border-status pane-border-style pane-colours prefix
+\ prefix2 prompt-history-limit remain-on-exit renumber-windows repeat-time
 \ set-clipboard set-titles set-titles-string silence-action status status-bg
 \ status-fg status-format status-interval status-justify status-keys
 \ status-left status-left-length status-left-style status-position
diff --git a/syntax/toml.vim b/syntax/toml.vim
deleted file mode 100644
index 9540d2c58..000000000
--- a/syntax/toml.vim
+++ /dev/null
@@ -1,80 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'toml', 'syntax/toml.vim')
-  finish
-endif
-
-" Language:   TOML
-" Maintainer: Caleb Spare <cespare@gmail.com>
-" URL:        https://github.com/cespare/vim-toml
-" LICENSE:    MIT
-
-if exists('b:current_syntax')
-  finish
-endif
-
-syn match tomlEscape /\\[btnfr"/\\]/ display contained
-syn match tomlEscape /\\u\x\{4}/ contained
-syn match tomlEscape /\\U\x\{8}/ contained
-hi def link tomlEscape SpecialChar
-
-syn match tomlLineEscape /\\$/ contained
-hi def link tomlLineEscape SpecialChar
-
-" Basic strings
-syn region tomlString oneline start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=tomlEscape
-" Multi-line basic strings
-syn region tomlString start=/"""/ end=/"""/ contains=tomlEscape,tomlLineEscape
-" Literal strings
-syn region tomlString oneline start=/'/ end=/'/
-" Multi-line literal strings
-syn region tomlString start=/'''/ end=/'''/
-hi def link tomlString String
-
-syn match tomlInteger /[+-]\=\<[1-9]\(_\=\d\)*\>/ display
-syn match tomlInteger /[+-]\=\<0\>/ display
-syn match tomlInteger /[+-]\=\<0x[[:xdigit:]]\(_\=[[:xdigit:]]\)*\>/ display
-syn match tomlInteger /[+-]\=\<0o[0-7]\(_\=[0-7]\)*\>/ display
-syn match tomlInteger /[+-]\=\<0b[01]\(_\=[01]\)*\>/ display
-syn match tomlInteger /[+-]\=\<\(inf\|nan\)\>/ display
-hi def link tomlInteger Number
-
-syn match tomlFloat /[+-]\=\<\d\(_\=\d\)*\.\d\+\>/ display
-syn match tomlFloat /[+-]\=\<\d\(_\=\d\)*\(\.\d\(_\=\d\)*\)\=[eE][+-]\=\d\(_\=\d\)*\>/ display
-hi def link tomlFloat Float
-
-syn match tomlBoolean /\<\%(true\|false\)\>/ display
-hi def link tomlBoolean Boolean
-
-" https://tools.ietf.org/html/rfc3339
-syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}/ display
-syn match tomlDate /\d\{2\}:\d\{2\}:\d\{2\}\%(\.\d\+\)\?/ display
-syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}[T ]\d\{2\}:\d\{2\}:\d\{2\}\%(\.\d\+\)\?\%(Z\|[+-]\d\{2\}:\d\{2\}\)\?/ display
-hi def link tomlDate Constant
-
-syn match tomlKey /\v(^|[{,])\s*\zs[[:alnum:]._-]+\ze\s*\=/ display
-hi def link tomlKey Identifier
-
-syn region tomlKeyDq oneline start=/\v(^|[{,])\s*\zs"/ end=/"\ze\s*=/ contains=tomlEscape
-hi def link tomlKeyDq Identifier
-
-syn region tomlKeySq oneline start=/\v(^|[{,])\s*\zs'/ end=/'\ze\s*=/
-hi def link tomlKeySq Identifier
-
-syn region tomlTable oneline start=/^\s*\[[^\[]/ end=/\]/ contains=tomlKey,tomlKeyDq,tomlKeySq
-hi def link tomlTable Title
-
-syn region tomlTableArray oneline start=/^\s*\[\[/ end=/\]\]/ contains=tomlKey,tomlKeyDq,tomlKeySq
-hi def link tomlTableArray Title
-
-syn cluster tomlValue contains=tomlArray,tomlString,tomlInteger,tomlFloat,tomlBoolean,tomlDate,tomlComment
-syn region tomlKeyValueArray start=/=\s*\[\zs/ end=/\]/ contains=@tomlValue
-syn region tomlArray start=/\[/ end=/\]/ contains=@tomlValue contained
-
-syn keyword tomlTodo TODO FIXME XXX BUG contained
-hi def link tomlTodo Todo
-
-syn match tomlComment /#.*/ contains=@Spell,tomlTodo
-hi def link tomlComment Comment
-
-syn sync minlines=500
-
-let b:current_syntax = 'toml'

From b147123070e5d7418fe67e315a53599cfde38d58 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 9 Sep 2021 12:42:18 +0200
Subject: [PATCH 274/299] Ensure some files are compied from each package

---
 README.md                    |  10 +-
 autoload/polyglot/init.vim   |  34 +----
 autoload/polyglot/sleuth.vim |  10 +-
 compiler/lilypond.vim        |  40 +++++
 ftplugin/lilypond.vim        |  79 ++++++++++
 ftplugin/swayconfig.vim      |   5 +
 ftplugin/toml.vim            |  25 +++
 indent/lilypond.vim          |  81 ++++++++++
 indent/mermaid.vim           |  64 ++++++++
 packages.yaml                |  85 +----------
 scripts/build                |   7 +
 syntax/lilypond-words.vim    |   7 +
 syntax/lilypond.vim          | 108 +++++++++++++
 syntax/mermaid.vim           |  65 ++++++++
 syntax/swayconfig.vim        | 285 +++++++++++++++++++++++++++++++++++
 syntax/toml.vim              |  80 ++++++++++
 tests/filetypes.vim          |  10 +-
 17 files changed, 861 insertions(+), 134 deletions(-)
 create mode 100644 compiler/lilypond.vim
 create mode 100644 ftplugin/lilypond.vim
 create mode 100644 ftplugin/swayconfig.vim
 create mode 100644 ftplugin/toml.vim
 create mode 100644 indent/lilypond.vim
 create mode 100644 indent/mermaid.vim
 create mode 100644 syntax/lilypond-words.vim
 create mode 100644 syntax/lilypond.vim
 create mode 100644 syntax/mermaid.vim
 create mode 100644 syntax/swayconfig.vim
 create mode 100644 syntax/toml.vim

diff --git a/README.md b/README.md
index 7d33b9cfd..7b66e496e 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->606<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->598<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -119,7 +119,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [just](https://github.com/NoahTheDuke/vim-just) (Syntax highlighting for just files)
 - [kotlin](https://github.com/udalov/kotlin-vim) (Kotlin syntax highlighting for kt, ktm and kts files)
 - [ledger](https://github.com/ledger/vim-ledger) (Syntax highlighting for ldg, ledger and journal files)
-- [lilypond](https://github.com/anowlcalledjosh/vim-lilypond) (LilyPond syntax highlighting for ly and ily files)
+- [lilypond](https://github.com/anowlcalledjosh/vim-lilypond/tree/main) (LilyPond syntax highlighting for ly and ily files)
 - [livescript](https://github.com/gkz/vim-ls) (LiveScript syntax highlighting for ls files)
 - [llvm](https://github.com/rhysd/vim-llvm) (LLVM syntax highlighting for ll and td files)
 - [log](https://github.com/MTDL9/vim-log-highlighting) (Syntax highlighting for log and LOG files)
@@ -128,7 +128,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [markdown](https://github.com/plasticboy/vim-markdown) (Markdown syntax highlighting for md, markdown, mdown, mdwn, mkd, mkdn, mkdown, ronn, scd and workbook files)
 - [mathematica](https://github.com/voldikss/vim-mma) (Mathematica syntax highlighting for mathematica, cdf, m, ma, mt and 6 more files)
 - [mdx](https://github.com/jxnblk/vim-mdx-js) (Syntax highlighting for mdx files)
-- [mermaid](https://github.com/mracos/mermaid.vim) (Syntax highlighting for mermaid, mm and mmd files)
+- [mermaid](https://github.com/mracos/mermaid.vim/tree/main) (Syntax highlighting for mermaid, mm and mmd files)
 - [meson](https://github.com/mesonbuild/meson/tree/master/data/syntax-highlighting/vim) (Meson syntax highlighting for wrap files)
 - [mint](https://github.com/IrenejMarc/vim-mint) (Syntax highlighting for mint files)
 - [moonscript](https://github.com/leafo/moonscript-vim) (MoonScript syntax highlighting for moon files)
@@ -182,7 +182,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [svelte](https://github.com/leafOfTree/vim-svelte-plugin) (Svelte syntax highlighting for svelte files)
 - [svg-indent](https://github.com/jasonshell/vim-svg-indent)
 - [svg](https://github.com/vim-scripts/svg.vim) (SVG syntax highlighting for svg files)
-- [sway](https://github.com/jamespeapen/swayconfig.vim/tree/i3sway) (Syntax highlighting for i3config, i3.config, swayconfig and sway.config files)
+- [sway](https://github.com/jamespeapen/swayconfig.vim) (Syntax highlighting for swayconfig and sway.config files)
 - [swift](https://github.com/keith/swift.vim) (Swift syntax highlighting for swift files)
 - [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (Syntax highlighting for sxhkdrc files)
 - [systemd](https://github.com/wgwoods/vim-systemd-syntax) (Syntax highlighting for automount, dnssd, link, mount, netdev and 9 more files)
@@ -190,7 +190,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [textile](https://github.com/timcharper/textile.vim) (Textile syntax highlighting for textile files)
 - [thrift](https://github.com/solarnz/thrift.vim) (Thrift syntax highlighting for thrift files)
 - [tmux](https://github.com/ericpruitt/tmux.vim/tree/master/vim)
-- [toml](https://github.com/cespare/vim-toml) (TOML syntax highlighting for toml files)
+- [toml](https://github.com/cespare/vim-toml/tree/main) (TOML syntax highlighting for toml files)
 - [tptp](https://github.com/c-cube/vim-tptp) (Syntax highlighting for p, tptp and ax files)
 - [twig](https://github.com/lumiliet/vim-twig) (Twig syntax highlighting for twig and xml.twig files)
 - [typescript](https://github.com/HerringtonDarkholme/yats.vim) (TypeScript and TSX syntax highlighting for ts and tsx files)
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index d739ae7b5..0f3244531 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -190,7 +190,7 @@ if !has_key(g:polyglot_is_disabled, 'just')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'sway')
-  au BufNewFile,BufRead *.i3.config,*.i3config,*.sway.config,*.swayconfig,*sway/config,i3.config,sway.config setf i3config
+  au BufNewFile,BufRead *.sway.config,*.swayconfig,*sway/config,swayconfig setf swayconfig
 endif
 
 if !has_key(g:polyglot_is_disabled, 'hjson')
@@ -228,10 +228,6 @@ if !has_key(g:polyglot_is_disabled, 'xf86conf')
   au BufNewFile,BufRead XF86Config* call s:StarSetf('xf86conf')
 endif
 
-if !has_key(g:polyglot_is_disabled, 'pullrequest')
-  au BufNewFile,BufRead PULLREQ_EDITMSG setf pullrequest
-endif
-
 if !has_key(g:polyglot_is_disabled, 'text')
   au BufNewFile,BufRead *.text,README setf text
 endif
@@ -276,10 +272,6 @@ if !has_key(g:polyglot_is_disabled, 'z8a')
   au BufNewFile,BufRead *.z8a setf z8a
 endif
 
-if !has_key(g:polyglot_is_disabled, 'zimbutempl')
-  au BufNewFile,BufRead *.zut setf zimbutempl
-endif
-
 if !has_key(g:polyglot_is_disabled, 'zimbu')
   au BufNewFile,BufRead *.zu setf zimbu
 endif
@@ -801,10 +793,6 @@ if !has_key(g:polyglot_is_disabled, 'privoxy')
   au BufNewFile,BufRead *.action setf privoxy
 endif
 
-if !has_key(g:polyglot_is_disabled, 'proc')
-  au BufNewFile,BufRead *.pc setf proc
-endif
-
 if !has_key(g:polyglot_is_disabled, 'obj')
   au BufNewFile,BufRead *.obj setf obj
 endif
@@ -877,10 +865,6 @@ if !has_key(g:polyglot_is_disabled, 'pike')
   au BufNewFile,BufRead *.pike,*.pmod setf pike
 endif
 
-if !has_key(g:polyglot_is_disabled, 'pcmk')
-  au BufNewFile,BufRead *.pcmk setf pcmk
-endif
-
 if !has_key(g:polyglot_is_disabled, 'pdf')
   au BufNewFile,BufRead *.pdf setf pdf
 endif
@@ -1062,10 +1046,6 @@ if !has_key(g:polyglot_is_disabled, 'mel')
   au BufNewFile,BufRead *.mel setf mel
 endif
 
-if !has_key(g:polyglot_is_disabled, 'map')
-  au BufNewFile,BufRead *.map setf map
-endif
-
 if !has_key(g:polyglot_is_disabled, 'maple')
   au BufNewFile,BufRead *.mpl,*.mv,*.mws setf maple
 endif
@@ -1316,10 +1296,6 @@ if !has_key(g:polyglot_is_disabled, 'icon')
   au BufNewFile,BufRead *.icn setf icon
 endif
 
-if !has_key(g:polyglot_is_disabled, 'httest')
-  au BufNewFile,BufRead *.htb,*.htt setf httest
-endif
-
 if !has_key(g:polyglot_is_disabled, 'hb')
   au BufNewFile,BufRead *.hb setf hb
 endif
@@ -1452,10 +1428,6 @@ if !has_key(g:polyglot_is_disabled, 'fetchmail')
   au BufNewFile,BufRead {.,}fetchmailrc setf fetchmail
 endif
 
-if !has_key(g:polyglot_is_disabled, 'factor')
-  au BufNewFile,BufRead *.factor setf factor
-endif
-
 if !has_key(g:polyglot_is_disabled, 'fan')
   au BufNewFile,BufRead *.fan,*.fwt setf fan
 endif
@@ -1704,10 +1676,6 @@ if !has_key(g:polyglot_is_disabled, 'chaiscript')
   au BufNewFile,BufRead *.chai setf chaiscript
 endif
 
-if !has_key(g:polyglot_is_disabled, 'cfengine')
-  au BufNewFile,BufRead cfengine.conf setf cfengine
-endif
-
 if !has_key(g:polyglot_is_disabled, 'cdrdaoconf')
   au BufNewFile,BufRead */etc/cdrdao.conf,*/etc/default/cdrdao,*/etc/defaults/cdrdao,{.,}cdrdao setf cdrdaoconf
 endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index a7a5b86aa..e3c0752ec 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -66,7 +66,6 @@ let s:globs = {
   \ 'cdrdaoconf': '.cdrdao',
   \ 'cdrtoc': '*.toc',
   \ 'cf': '*.cfm,*.cfi,*.cfc',
-  \ 'cfengine': 'cfengine.conf',
   \ 'cfg': '*.cfg,*.hgrc,*hgrc',
   \ 'ch': '*.chf',
   \ 'chaiscript': '*.chai',
@@ -162,7 +161,6 @@ let s:globs = {
   \ 'exim': 'exim.conf',
   \ 'expect': '*.exp',
   \ 'exports': 'exports',
-  \ 'factor': '*.factor',
   \ 'falcon': '*.fal',
   \ 'fan': '*.fan,*.fwt',
   \ 'fbs': '*.fbs',
@@ -235,9 +233,7 @@ let s:globs = {
   \ 'html.twig': '*.twig',
   \ 'htmldjango': '*.jinja,*.j2,*.jinja2',
   \ 'htmlm4': '*.html.m4',
-  \ 'httest': '*.htt,*.htb',
   \ 'hxml': '*.hxml',
-  \ 'i3config': '*.i3config,*.i3.config,*.swayconfig,*.sway.config,i3.config,sway.config',
   \ 'ibasic': '*.iba,*.ibi',
   \ 'icalendar': '*.ics',
   \ 'icemenu': '',
@@ -321,7 +317,6 @@ let s:globs = {
   \ 'mako': '*.mako,*.mao',
   \ 'mallard': '*.page',
   \ 'manconf': 'man.config',
-  \ 'map': '*.map',
   \ 'maple': '*.mv,*.mpl,*.mws',
   \ 'markdown': '*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.scd,*.workbook,contents.lr',
   \ 'markdown.mdx': '*.mdx',
@@ -395,7 +390,6 @@ let s:globs = {
   \ 'pascal': '*.pas,*.pp,*.dpr,*.lpr',
   \ 'passwd': '',
   \ 'pccts': '*.g',
-  \ 'pcmk': '*.pcmk',
   \ 'pdf': '*.pdf',
   \ 'perl': '*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc,.gitolite.rc',
   \ 'pest': '*.pest',
@@ -420,7 +414,6 @@ let s:globs = {
   \ 'ppd': '*.ppd',
   \ 'ppwiz': '*.it,*.ih',
   \ 'privoxy': '*.action',
-  \ 'proc': '*.pc',
   \ 'procmail': '.procmail,.procmailrc',
   \ 'prolog': '*.pl,*.pro,*.prolog,*.yap,*.pdb',
   \ 'promela': '*.pml',
@@ -430,7 +423,6 @@ let s:globs = {
   \ 'ps1xml': '*.ps1xml',
   \ 'psf': '*.psf',
   \ 'pug': '*.jade,*.pug',
-  \ 'pullrequest': 'PULLREQ_EDITMSG',
   \ 'puppet': '*.pp,Modulefile',
   \ 'purescript': '*.purs',
   \ 'pyrex': '*.pyx,*.pxd',
@@ -531,6 +523,7 @@ let s:globs = {
   \ 'svelte': '*.svelte',
   \ 'svg': '*.svg',
   \ 'svn': 'svn-commit*.tmp',
+  \ 'swayconfig': '*.swayconfig,*.sway.config,swayconfig',
   \ 'swift': '*.swift',
   \ 'swiftgyb': '*.swift.gyb',
   \ 'sxhkdrc': '*.sxhkdrc,sxhkdrc',
@@ -636,7 +629,6 @@ let s:globs = {
   \ 'zephir': '*.zep',
   \ 'zig': '*.zig,*.zir',
   \ 'zimbu': '*.zu',
-  \ 'zimbutempl': '*.zut',
   \ 'zir': '*.zir',
   \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout,.zlog*,.zcompdump*,.zfbfmarks,.zsh*',
   \}
diff --git a/compiler/lilypond.vim b/compiler/lilypond.vim
new file mode 100644
index 000000000..d672b7236
--- /dev/null
+++ b/compiler/lilypond.vim
@@ -0,0 +1,40 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'compiler/lilypond.vim')
+  finish
+endif
+
+" LilyPond compiler file
+" Language:     LilyPond
+" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
+" License:      This file is part of LilyPond, the GNU music typesetter.
+"
+"               Copyright (C) 2004, 2007 Heikki Junes <hjunes@cc.hut.fi>
+"
+"               LilyPond is free software: you can redistribute it and/or modify
+"               it under the terms of the GNU General Public License as published by
+"               the Free Software Foundation, either version 3 of the License, or
+"               (at your option) any later version.
+"
+"               LilyPond is distributed in the hope that it will be useful,
+"               but WITHOUT ANY WARRANTY; without even the implied warranty of
+"               MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+"               GNU General Public License for more details.
+"
+"               You should have received a copy of the GNU General Public License
+"               along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+"
+" Last Change:  2007 Aug 19
+"
+" Installed As:	vim/compiler/lilypond.vim
+"
+" Only load this indent file when no other was loaded.
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "lilypond"
+
+" default make
+setlocal makeprg=lilypond\ $*
+" errorformat for lily (with columns) and gcc
+" (how to see multiple-line error messages?)
+setlocal errorformat=%f:%l:%c:\ %m,%f:%l:\ %m,In\ file\ included\ from\ %f:%l:,\^I\^Ifrom\ %f:%l%m
+"
diff --git a/ftplugin/lilypond.vim b/ftplugin/lilypond.vim
new file mode 100644
index 000000000..afc73eaf3
--- /dev/null
+++ b/ftplugin/lilypond.vim
@@ -0,0 +1,79 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'ftplugin/lilypond.vim')
+  finish
+endif
+
+" LilyPond filetype plugin
+" Language:     LilyPond (ft=ly)
+" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
+" License:      This file is part of LilyPond, the GNU music typesetter.
+"
+"               Copyright (C) 1998, 2002, 2004, 2010, 2016
+"                             Han-Wen Nienhuys <hanwen@xs4all.nl>
+"
+"               LilyPond is free software: you can redistribute it and/or modify
+"               it under the terms of the GNU General Public License as published by
+"               the Free Software Foundation, either version 3 of the License, or
+"               (at your option) any later version.
+"
+"               LilyPond is distributed in the hope that it will be useful,
+"               but WITHOUT ANY WARRANTY; without even the implied warranty of
+"               MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+"               GNU General Public License for more details.
+"
+"               You should have received a copy of the GNU General Public License
+"               along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+"
+" Last Change:  2016 May 21
+"
+" Installed As:	vim/ftplugin/lilypond.vim
+" Uses Generated File:	vim/syntax/lilypond-words.vim
+"
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+setlocal autoindent
+setlocal shiftwidth=2
+"
+" some handy key mappings
+"
+" <F4>  save & make and play midi with timidity
+noremap <buffer> <F4> :w<Return>:setl makeprg=lilypond\ \"%<\"<Return>:make<Return>:!timidity "%<.midi"<Return>
+"
+" <F5>  save & make
+noremap <buffer> <F5> :w<Return>:setl makeprg=lilypond\ \"%<\"<Return>:make<Return>
+"
+" <F6>  view pdf with ghostview
+noremap <buffer> <F6> :!gv --watch "%<.pdf" &<Return>
+"
+" <F7>  prev error
+noremap <buffer> <F7> :cp<Return>
+"
+" <F8>  next error
+noremap <buffer> <F8> :cn<Return>
+"
+" <F9>  make
+noremap <buffer> <F9> :w<Return>:setl makeprg=make\ -k<Return>:make<Return>
+"
+" <F10> menu
+source $VIMRUNTIME/menu.vim
+setlocal wildmenu
+setlocal cpo-=<
+setlocal wcm=<C-Z>
+noremap <buffer> <F10> :emenu <C-Z>
+"
+" <F12> comment region
+noremap <buffer> <F12> :g!/%.*/normal 0i%<Return>
+"
+" <S-F12> remove comments in region
+noremap <buffer> <S-F12> :g/%.*/normal 0x<Return>
+"
+" Completions in Insert/Replace-mode with <Ctrl-N>
+setlocal dictionary-=$VIM/syntax/lilypond-words dictionary+=$VIM/syntax/lilypond-words
+setlocal complete-=k complete+=k
+"
+setlocal showmatch
diff --git a/ftplugin/swayconfig.vim b/ftplugin/swayconfig.vim
new file mode 100644
index 000000000..b45edd304
--- /dev/null
+++ b/ftplugin/swayconfig.vim
@@ -0,0 +1,5 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sway', 'ftplugin/swayconfig.vim')
+  finish
+endif
+
+setlocal commentstring=#\ %s
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
new file mode 100644
index 000000000..8d45ea771
--- /dev/null
+++ b/ftplugin/toml.vim
@@ -0,0 +1,25 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'toml', 'ftplugin/toml.vim')
+  finish
+endif
+
+" File: ftplugin/toml.vim
+" Author: Kevin Ballard <kevin@sb.org>
+" Description: FileType Plugin for Toml
+" Last Change: Feb 12, 2019
+
+if exists('b:did_ftplugin')
+    finish
+endif
+let b:did_ftplugin = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+let b:undo_ftplugin = 'setlocal commentstring< comments<'
+
+setlocal commentstring=#\ %s
+setlocal comments=:#
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set et sw=4 ts=4:
diff --git a/indent/lilypond.vim b/indent/lilypond.vim
new file mode 100644
index 000000000..da836dbbe
--- /dev/null
+++ b/indent/lilypond.vim
@@ -0,0 +1,81 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'indent/lilypond.vim')
+  finish
+endif
+
+" LilyPond indent file
+" Language:     LilyPond
+" Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
+" License:      This file is part of LilyPond, the GNU music typesetter.
+"
+"               Copyright (C) 2004, 2010 Heikki Junes <hjunes@cc.hut.fi>
+"
+"               LilyPond is free software: you can redistribute it and/or modify
+"               it under the terms of the GNU General Public License as published by
+"               the Free Software Foundation, either version 3 of the License, or
+"               (at your option) any later version.
+"
+"               LilyPond is distributed in the hope that it will be useful,
+"               but WITHOUT ANY WARRANTY; without even the implied warranty of
+"               MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+"               GNU General Public License for more details.
+"
+"               You should have received a copy of the GNU General Public License
+"               along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+"
+" Last Change:  2010 Jul 26
+"
+" Installed As:	vim/indent/lilypond.vim
+"
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetLilyPondIndent()
+setlocal indentkeys=o,O,},>>,!^F
+
+" Only define the function once.
+if exists("*GetLilyPondIndent")
+  finish
+endif
+
+function GetLilyPondIndent()
+  if v:lnum == 1
+    return 0
+  endif
+
+  "Find a non-blank line above the current line.
+  let lnum = prevnonblank(v:lnum - 1)
+  "Check if a block was started: '{' or '<<' is the last non-blank character of the previous line.
+  if getline(lnum) =~ '^.*\({\|<<\)\s*$'
+    let ind = indent(lnum) + &sw
+  else
+    let ind = indent(lnum)
+  endif
+
+  "Check if a block was ended: '}' or '>>' is the first non-blank character of the current line.
+  if getline(v:lnum) =~ '^\s*\(}\|>>\)'
+    let ind = ind - &sw
+  endif
+
+  " Check if the first character from the previous line is within
+  " a `lilyScheme' region, and if so, use lisp-style indentation
+  " for the current line.
+  "
+  " TODO:
+  "   - Only works in version 7.1.215 or later, though it should
+  "     silently fail in older versions.
+  "   - We should support `lilyScheme' regions that begin in the
+  "     middle of the line, too.
+  for id in synstack(lnum, 1)
+    if synIDattr(id, "name") == "lilyScheme"
+      let ind = lispindent(v:lnum)
+    endif
+  endfor
+
+  return ind
+endfunction
+"
+"
+"
diff --git a/indent/mermaid.vim b/indent/mermaid.vim
new file mode 100644
index 000000000..e1ade7117
--- /dev/null
+++ b/indent/mermaid.vim
@@ -0,0 +1,64 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mermaid', 'indent/mermaid.vim')
+  finish
+endif
+
+let s:indent_next_line_keywords = [
+      \ '^classDiagram',
+      \ '^classDiagram-v2',
+      \ '^erDiagram',
+      \ '^gantt',
+      \ '^graph',
+      \ '^flowchart',
+      \ '^pie',
+      \ '^sequenceDiagram',
+      \ '^stateDiagram',
+      \ '^stateDiagram-v2',
+      \ 'class.*{',
+      \ 'subgraph',
+      \ 'loop',
+      \ 'alt',
+      \ 'else',
+      \ 'opt',
+      \ 'par',
+      \ 'and',
+      \ 'rect',
+      \ '[^a-z]activate',
+      \ ]
+
+let s:deindent_current_line_keywords = [
+      \ '^\s\+classDiagram',
+      \ '^\s\+classDiagram-v2',
+      \ '^\s\+erDiagram',
+      \ '^\s\+gantt',
+      \ '^\s\+graph',
+      \ '^\s\+flowchart',
+      \ '^\s\+pie',
+      \ '^\s\+sequenceDiagram',
+      \ '^\s\+stateDiagram',
+      \ '^\s\+stateDiagram-v2',
+      \ '^\s\+end$',
+      \ '^\s\+}$',
+      \ '^\s\+deactivate$'
+      \ ]
+
+function! s:matches_any_word_in(text, list)
+  return empty(filter(copy(a:list), {_idx, val -> matchstr(a:text, val) != ""})) == v:false
+endfunction
+
+function! MermaidIndent()
+  let sw = shiftwidth()
+  let indent_level = indent(v:lnum - 1) / sw
+  let current_line = getline(v:lnum)
+  let line_above = getline(v:lnum - 1)
+
+  " TODO don't incorrect indent when has empty lines inside graph
+  if s:matches_any_word_in(current_line, s:deindent_current_line_keywords)
+    return (indent_level - 1) * sw
+  endif
+
+  if s:matches_any_word_in(line_above, s:indent_next_line_keywords)
+    return (indent_level + 1) * sw
+  endif
+
+  return indent_level * sw
+endfunction
diff --git a/packages.yaml b/packages.yaml
index 4c4fa9ddf..524f77087 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -961,7 +961,7 @@ filetypes:
   linguist: Less
 ---
 name: lilypond
-remote: anowlcalledjosh/vim-lilypond
+remote: anowlcalledjosh/vim-lilypond@main
 filetypes:
 - name: lilypond
   linguist: LilyPond
@@ -1651,7 +1651,7 @@ filetypes:
   - '.tmux*.conf'
 ---
 name: toml
-remote: cespare/vim-toml
+remote: cespare/vim-toml@main
 filetypes:
 - name: toml
   linguist: TOML
@@ -2155,15 +2155,6 @@ filetypes:
   - pattern: "*/etc/cdrdao.conf,*/etc/defaults/cdrdao,*/etc/default/cdrdao,.cdrdao"
     description: Cdrdao config
 ---
-name: cfengine
-remote: vim/vim:runtime
-glob: "**/cfengine.vim"
-filetypes:
-- name: cfengine
-  patterns:
-  - pattern: cfengine.conf
-    description: Cfengine
----
 name: chaiscript
 remote: vim/vim:runtime
 glob: "**/chaiscript.vim"
@@ -2728,15 +2719,6 @@ filetypes:
   - pattern: "*.fan,*.fwt"
     description: Fantom
 ---
-name: factor
-remote: vim/vim:runtime
-glob: "**/factor.vim"
-filetypes:
-- name: factor
-  patterns:
-  - pattern: "*.factor"
-    description: Factor
----
 name: fetchmail
 remote: vim/vim:runtime
 glob: "**/fetchmail.vim"
@@ -3037,15 +3019,6 @@ filetypes:
   - pattern: "*.hb"
     description: Hyper Builder
 ---
-name: httest
-remote: vim/vim:runtime
-glob: "**/httest.vim"
-filetypes:
-- name: httest
-  patterns:
-  - pattern: "*.htt,*.htb"
-    description: Httest
----
 name: icon
 remote: vim/vim:runtime
 glob: "**/icon.vim"
@@ -3596,15 +3569,6 @@ filetypes:
   - pattern: "*.mv,*.mpl,*.mws"
     description: Maple V
 ---
-name: map
-remote: vim/vim:runtime
-glob: "**/map.vim"
-filetypes:
-- name: map
-  patterns:
-  - pattern: "*.map"
-    description: Map (UMN mapserver config file)
----
 name: mel
 remote: vim/vim:runtime
 glob: "**/mel.vim"
@@ -4010,15 +3974,6 @@ filetypes:
   - pattern: "*.pdf"
     description: PDF
 ---
-name: pcmk
-remote: vim/vim:runtime
-glob: "**/pcmk.vim"
-filetypes:
-- name: pcmk
-  patterns:
-  - pattern: "*.pcmk"
-    description: PCMK - HAE - crm configure edit
----
 name: pike
 remote: vim/vim:runtime
 glob: "**/pike.vim"
@@ -4183,15 +4138,6 @@ filetypes:
   - pattern: "*.obj"
     description: 'TODO: is there a way to avoid MS-Windows Object files?'
 ---
-name: proc
-remote: vim/vim:runtime
-glob: "**/proc.vim"
-filetypes:
-- name: proc
-  patterns:
-  - pattern: "*.pc"
-    description: Oracle Pro*C/C++
----
 name: privoxy
 remote: vim/vim:runtime
 glob: "**/privoxy.vim"
@@ -5394,15 +5340,6 @@ filetypes:
   - pattern: "*.zu"
     description: Zimbu
 ---
-name: zimbutempl
-remote: vim/vim:runtime
-glob: "**/zimbutempl.vim"
-filetypes:
-- name: zimbutempl
-  patterns:
-  - pattern: "*.zut"
-    description: Zimbu Templates
----
 name: z8a
 remote: vim/vim:runtime
 glob: "**/z8a.vim"
@@ -5487,14 +5424,6 @@ filetypes:
   - pattern: "*.text,README"
     description: the "conf" type being used if there is a line starting with '#'.
 ---
-name: pullrequest
-remote: vim/vim:runtime
-glob: "**/pullrequest.vim"
-filetypes:
-- name: pullrequest
-  patterns:
-  - pattern: PULLREQ_EDITMSG
----
 name: autodoc
 remote: vim/vim:runtime
 glob: "**/autodoc.vim"
@@ -5569,12 +5498,12 @@ filetypes:
     description: Hjson (https://hjson.github.io)
 ---
 name: sway
-remote: jamespeapen/swayconfig.vim/tree/i3sway
+remote: jamespeapen/swayconfig.vim
 filetypes:
-- name: i3config
+- name: swayconfig
   patterns:
-  - pattern: 'i3.config,*.i3config,*.i3.config,*sway/config,*.swayconfig,*.sway.config,sway.config'
-    description: Sway/i3 Configuration
+  - pattern: '*sway/config,*.swayconfig,*.sway.config,swayconfig'
+    description: Sway Configuration
 ---
 name: just
 remote: NoahTheDuke/vim-just
@@ -5603,7 +5532,7 @@ filetypes:
     description: OpenSCAD 3D modeling language
 ---
 name: mermaid
-remote: mracos/mermaid.vim
+remote: mracos/mermaid.vim@main
 filetypes:
 - name: mermaid
   patterns:
diff --git a/scripts/build b/scripts/build
index 77d71cdd8..c0a80b4fa 100755
--- a/scripts/build
+++ b/scripts/build
@@ -491,6 +491,7 @@ def extract(packages)
 
   output = []
   packages.map do |package|
+    copied_something = false
     if !package["remote"]
       next
     end
@@ -516,14 +517,20 @@ def extract(packages)
             if package["extract_in_after"] == true
               target = "after/#{target}"
             end
+            copied_something = true
             copy_file(package["name"], "#{subtree}#{p}", target)
           end
         end
       elsif File.exist?(subpath)
+        copied_something = true
         copy_file(package["name"], subpath, subdir)
       end
     end
 
+    if !copied_something
+      raise StandardError.new("No files in: #{package["name"]}")
+    end
+
     if repo == "vim/vim"
       next
     end
diff --git a/syntax/lilypond-words.vim b/syntax/lilypond-words.vim
new file mode 100644
index 000000000..cb137b8f8
--- /dev/null
+++ b/syntax/lilypond-words.vim
@@ -0,0 +1,7 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'syntax/lilypond-words.vim')
+  finish
+endif
+
+syn match lilyKeyword "[-_^]\?\\\(xNotesOn\|xNotesOff\|xNote\|wordwrap-string-internal\|wordwrap-string\|wordwrap-lines\|wordwrap-internal\|wordwrap-field\|wordwrap\|withMusicProperty\|with-url\|with-outline\|with-link\|with-dimensions-from\|with-dimensions\|with-color\|whiteout\|whiteTriangleMarkup\|whiteCircleMarkup\|walkerHeadsMinor\|walkerHeads\|vspace\|vowelTransition\|void\|voices\|voiceTwoStyle\|voiceTwo\|voiceThreeStyle\|voiceThree\|voiceOneStyle\|voiceOne\|voiceNeutralStyle\|voiceFourStyle\|voiceFour\|vocalName\|virgula\|virga\|veryshortfermata\|verylongfermata\|versus\|version\|verbatim-file\|vcenter\|varcoda\|upright\|upprall\|upmordent\|upbow\|up\|unset\|unit\|unfoldRepeats\|undo\|undertie\|underline\|unaCorda\|unHideNotes\|typewriter\|type\|tweak\|turn\|tupletUp\|tupletSpan\|tupletNeutral\|tupletDown\|tuplet\|trill\|triangle\|treCorde\|transposition\|transposedCueDuring\|transpose\|transparent\|translate-scaled\|translate\|topLevelAlignment\|tocTitleMarkup\|tocItemWithDotsMarkup\|tocItemMarkup\|tocItem\|tocIndentMarkup\|tocFormatMarkup\|tiny\|timing\|times\|timeSignatureSettings\|timeSignatureFraction\|time\|tied-lyric\|tieWaitForNote\|tieUp\|tieSolid\|tieNeutral\|tieHalfSolid\|tieHalfDashed\|tieDown\|tieDotted\|tieDashed\|tieDashPattern\|tie\|thumb\|textSpannerUp\|textSpannerNeutral\|textSpannerDown\|textLengthOn\|textLengthOff\|text\|tenuto\|temporary\|tempoWholesPerMinute\|tempo\|teeny\|tagGroup\|tag\|table-of-contents\|table\|tablatureFormat\|tabStaffLineLayoutFunction\|tabFullNotation\|systemStartDelimiter\|sustainOn\|sustainOff\|super\|subdivideBeams\|sub\|styledNoteHeads\|strut\|stropha\|strokeFingerOrientations\|stringTunings\|stringOneTopmost\|stringNumberOrientations\|stopped\|stopTrillSpan\|stopTextSpan\|stopStaff\|stopSlashedGraceMusic\|stopMeasureSpanner\|stopMeasureCount\|stopGroup\|stopGraceSlur\|stopGraceMusic\|stopAppoggiaturaMusic\|stopAcciaccaturaMusic\|stop\|stencil\|stemUp\|stemNeutral\|stemDown\|startTrillSpan\|startTextSpan\|startStaff\|startSlashedGraceMusic\|startRepeatType\|startMeasureSpanner\|startMeasureCount\|startGroup\|startGraceSlur\|startGraceMusic\|startAppoggiaturaMusic\|startAcciaccaturaMusic\|start\|staccato\|staccatissimo\|squashedPosition\|spp\|spacingTweaks\|sp\|southernHarmonyHeadsMinor\|southernHarmonyHeads\|sostenutoOn\|sostenutoOff\|soloText\|soloIIText\|snappizzicato\|smaller\|smallCaps\|small\|slurUp\|slurSolid\|slurNeutral\|slurHalfSolid\|slurHalfDashed\|slurDown\|slurDotted\|slurDashed\|slurDashPattern\|slashturn\|slashedGrace\|slashed-digit\|slashChordSeparator\|skipTypesetting\|skip\|single\|simultaneous\|simple\|signumcongruentiae\|showStaffSwitch\|showSplitTiedTabNotes\|shortfermata\|shortVocalName\|shortInstrumentName\|shiftOnnn\|shiftOnn\|shiftOn\|shiftOff\|shiftDurations\|sharp\|shape\|sfz\|sfp\|sff\|sf\|settingsFrom\|setDefaultDurationToQuarter\|set\|sesquisharp\|sesquiflat\|sequential\|semisharp\|semiflat\|semicirculus\|semiGermanChords\|segno\|searchForVoice\|scriptDefinitions\|score-lines\|score\|scaleDurations\|scale\|sans\|sacredHarpHeadsMinor\|sacredHarpHeads\|rtoe\|rounded-box\|rotate\|romanStringNumbers\|roman\|rightHandFinger\|right-column\|right-brace\|right-align\|right\|rheel\|rfz\|revertTimeSignatureSettings\|revert\|reverseturn\|retrograde\|restrainOpenStrings\|restNumberThreshold\|rest-by-number\|rest\|responsum\|resetRelativeOctave\|replace\|repeatTie\|repeatCountVisibility\|repeat\|removeWithTag\|remove\|relative\|rehearsalMark\|reduceChords\|raiseNote\|raise\|quotedEventTypes\|quotedCueEventTypes\|quoteDuring\|quilisma\|put-adjacent\|pushToTag\|pt\|propertyUnset\|propertyTweak\|propertySet\|propertyRevert\|propertyOverride\|property-recursive\|printPartCombineTexts\|printOctaveNames\|printKeyCancellation\|printAccidentalNames\|predefinedFretboardsOn\|predefinedFretboardsOff\|predefinedDiagramTable\|prallup\|prallprall\|prallmordent\|pralldown\|prall\|ppppp\|pppp\|ppp\|pp\|postscript\|portato\|pointAndClickTypes\|pointAndClickOn\|pointAndClickOff\|pitchedTrill\|phrygian\|phrasingSlurUp\|phrasingSlurSolid\|phrasingSlurNeutral\|phrasingSlurHalfSolid\|phrasingSlurHalfDashed\|phrasingSlurDown\|phrasingSlurDotted\|phrasingSlurDashed\|phrasingSlurDashPattern\|pes\|pedalUnaCordaStyle\|pedalUnaCordaStrings\|pedalSustainStyle\|pedalSustainStrings\|pedalSostenutoStyle\|pedalSostenutoStrings\|pattern\|path\|partial\|partCombineUp\|partCombineUnisono\|partCombineTextsOnNote\|partCombineSoloII\|partCombineSoloI\|partCombineListener\|partCombineForce\|partCombineDown\|partCombineChords\|partCombineAutomatic\|partCombineApart\|partCombine\|parenthesize\|parallelMusic\|paper\|palmMuteOn\|palmMuteOff\|palmMute\|pageTurn\|pageBreak\|page-ref\|page-link\|pad-x\|pad-to-box\|pad-markup\|pad-around\|p\|overtie\|overrideTimeSignatureSettings\|overrideProperty\|override-lines\|override\|overlay\|oval\|ottavationMarkups\|ottava\|oriscus\|open\|oneVoice\|once\|on-the-fly\|omit\|offset\|octaveCheck\|numericTimeSignature\|number\|nullAccidentals\|null\|notemode\|noteToFretFunction\|noteNameSeparator\|noteNameFunction\|note-by-number\|note\|normalsize\|normal-text\|normal-size-super\|normal-size-sub\|noPageTurn\|noPageBreak\|noChordSymbol\|noBreak\|noBeam\|newSpacingSection\|new\|neumeDemoLayout\|natural\|name\|n\|musicglyph\|musicMap\|mp\|mordent\|modalTranspose\|modalInversion\|mm\|mixolydian\|minorChordModifier\|minor\|midiInstrument\|midiChannelMapping\|midi\|middleCPosition\|middleCClefPosition\|mf\|metronomeMarkFormatter\|mergeDifferentlyHeadedOn\|mergeDifferentlyHeadedOff\|mergeDifferentlyDottedOn\|mergeDifferentlyDottedOff\|melismaEnd\|melismaBusyProperties\|melisma\|medium\|measurePosition\|maxima\|markuplist\|markupMap\|markup\|markletter\|markalphabet\|markLengthOn\|markLengthOff\|markFormatter\|mark\|marcato\|map-markup-commands\|makeClusters\|majorSevenSymbol\|major\|maininput\|magnifyStaff\|magnifyMusic\|magnify\|lyricsto\|lyrics\|lyricmode\|lyricMelismaAlignment\|lydian\|ltoe\|lower\|lookup\|longfermata\|longa\|locrian\|localAlterations\|lineprall\|linea\|line\|ligature\|lheel\|left-column\|left-brace\|left-align\|left\|layout\|larger\|large\|languageSaveAndChange\|languageRestore\|language\|laissezVibrer\|label\|killCues\|kievanOn\|kievanOff\|keyAlterationOrder\|key\|keepWithTag\|keepAliveInterfaces\|justify-string\|justify-line\|justify-field\|justify\|justified-lines\|italic\|italianChords\|ionian\|invertChords\|inversion\|instrumentTransposition\|instrumentSwitch\|instrumentName\|instrumentEqualizer\|initialTimeSignatureVisibility\|indent\|include\|inclinatum\|incipit\|inStaffSegno\|in\|improvisationOn\|improvisationOff\|ij\|iij\|ignoreFiguredBassRest\|ignoreBarNumberChecks\|ignoreBarChecks\|ignatzekExceptions\|ignatzekExceptionMusic\|ictus\|huge\|hspace\|highStringOne\|hideStaffSwitch\|hideSplitTiedTabNotes\|hideNotes\|hide\|henzeshortfermata\|henzelongfermata\|header\|hcenter-in\|hbracket\|haydnturn\|harp-pedal\|harmonicsOn\|harmonicsOff\|harmonicNote\|harmonicByRatio\|harmonicByFret\|harmonicAccidentals\|harmonic\|handleNegativeFrets\|halign\|halfopen\|grobdescriptions\|graceSettings\|grace\|glissando\|germanChords\|general-align\|fz\|funkHeadsMinor\|funkHeads\|fromproperty\|fret-diagram-verbose\|fret-diagram-terse\|fret-diagram\|frenchChords\|fraction\|fp\|footnote\|fontsize\|fontSize\|fontCaps\|flexa\|flat\|flageolet\|fixed\|firstClef\|first-visible\|fingeringOrientations\|finger\|finalis\|filled-box\|fill-with-pattern\|fill-line\|figures\|figuremode\|figuredBassFormatter\|fffff\|ffff\|fff\|ff\|fermata\|featherDurations\|f\|eyeglasses\|extraNatural\|extendersOverRests\|explicitKeySignatureVisibility\|explicitCueClefVisibility\|explicitClefVisibility\|expandEmptyMeasures\|eventChords\|etc\|espressivo\|epsfile\|episemInitium\|episemFinis\|enddim\|enddecresc\|enddecr\|endcresc\|endcr\|endSpanners\|endRepeatType\|ellipse\|easyHeadsOn\|easyHeadsOff\|dynamicUp\|dynamicNeutral\|dynamicDown\|dynamicAbsoluteVolumeFunction\|dynamic\|drums\|drummode\|drumStyleTable\|drumPitchTable\|dropNote\|draw-squiggle-line\|draw-line\|draw-hline\|draw-dotted-line\|draw-dashed-line\|draw-circle\|downprall\|downmordent\|downbow\|down\|doublesharp\|doubleflat\|doubleRepeatType\|dotsUp\|dotsNeutral\|dotsDown\|dorian\|divisioMinima\|divisioMaxima\|divisioMaior\|displayScheme\|displayMusic\|displayLilyMusic\|dir-column\|dimTextDim\|dimTextDecresc\|dimTextDecr\|dimHairpin\|dim\|description\|descendens\|deprecatedenddim\|deprecatedendcresc\|deprecateddim\|deprecatedcresc\|denies\|deminutum\|defineBarLine\|defaultchild\|defaultTimeSignature\|defaultNoteHeads\|defaultBarType\|default\|decrescendoSpanner\|decresc\|decr\|deadNotesOn\|deadNotesOff\|deadNote\|dashUnderscore\|dashPlus\|dashLarger\|dashHat\|dashDot\|dashDash\|dashBang\|cueDuringWithClef\|cueDuring\|cueClefUnset\|cueClefTranspositionFormatter\|cueClef\|crossStaff\|crescendoSpanner\|crescTextCresc\|crescHairpin\|cresc\|createSpacing\|cr\|context\|consists\|concat\|compressMMRests\|compressEmptyMeasures\|compoundMeter\|completionFactor\|command-name\|combine\|column-lines\|column\|coda\|cm\|clefTranspositionFormatter\|clefTransposition\|clefPosition\|clefGlyph\|clef\|circulus\|circle\|chords\|chordmodifiers\|chordmode\|chordRootNamer\|chordPrefixSpacer\|chordNoteNamer\|chordNameSeparator\|chordNameLowercaseMinor\|chordNameFunction\|chordNameExceptions\|char\|change\|center-column\|center-align\|center\|cavum\|caps\|caesura\|cadenzaOn\|cadenzaOff\|breve\|breathe\|breakDynamicSpan\|break\|bracket\|box\|bookpart\|bookOutputSuffix\|bookOutputName\|book\|bold\|blackTriangleMarkup\|bigger\|bendAfter\|beamHalfMeasure\|beamExceptions\|beam\|bassFigureStaffAlignmentUp\|bassFigureStaffAlignmentNeutral\|bassFigureStaffAlignmentDown\|bassFigureExtendersOn\|bassFigureExtendersOff\|barNumberVisibility\|barNumberFormatter\|barNumberCheck\|barCheckSynchronize\|barAlways\|bar\|balloonText\|balloonLengthOn\|balloonLengthOff\|balloonGrobText\|backslashed-digit\|automaticBars\|autoPageBreaksOn\|autoPageBreaksOff\|autoLineBreaksOn\|autoLineBreaksOff\|autoChange\|autoCautionaries\|autoBreaksOn\|autoBreaksOff\|autoBeaming\|autoBeamOn\|autoBeamOff\|autoBeamCheck\|autoAccidentals\|auto-footnote\|augmentum\|auctum\|associatedVoiceType\|assertBeamSlope\|assertBeamQuant\|ascendens\|arrow-head\|arpeggioParenthesisDashed\|arpeggioParenthesis\|arpeggioNormal\|arpeggioBracket\|arpeggioArrowUp\|arpeggioArrowDown\|arpeggio\|arabicStringNumbers\|appoggiatura\|applyOutput\|applyMusic\|applyContext\|appendToTag\|ambitusAfter\|alternativeRestores\|alternative\|alterBroken\|allowVoltaHook\|allowPageTurn\|alias\|aikenThinHeadsMinor\|aikenThinHeads\|aikenHeadsMinor\|aikenHeads\|afterGraceFraction\|afterGrace\|aeolian\|addlyrics\|additionalPitchPrefix\|addQuote\|addInstrumentDefinition\|accidentalStyle\|acciaccatura\|accepts\|accentus\|accent\|absolute\|abs-fontsize\|aDueText\|RemoveEmptyTabStaffContext\|RemoveEmptyStaffContext\|RemoveEmptyRhythmicStaffContext\|RemoveEmptyDrumStaffContext\|IJ\|IIJ\|C\|B\|AncientRemoveEmptyStaffContext\|A\|n\)\(\A\|\n\)"me=e-1
+syn match lilyReservedWord "\(\A\|\n\)\(staff\|spacing\|signature\|routine\|notes\|handler\|corrected\|beams\|arpeggios\|Volta_engraver\|Voice\|Vertical_align_engraver\|Vaticana_ligature_engraver\|VaticanaVoice\|VaticanaStaff\|Tweak_engraver\|Tuplet_engraver\|Trill_spanner_engraver\|Timing_translator\|Time_signature_performer\|Time_signature_engraver\|Tie_performer\|Tie_engraver\|Text_spanner_engraver\|Text_engraver\|Tempo_performer\|Tab_tie_follow_engraver\|Tab_staff_symbol_engraver\|Tab_note_heads_engraver\|TabVoice\|TabStaff\|System_start_delimiter_engraver\|Stem_engraver\|Stanza_number_engraver\|Stanza_number_align_engraver\|Staff_symbol_engraver\|Staff_performer\|Staff_collecting_engraver\|StaffGroup\|Staff\|Spanner_break_forbid_engraver\|Span_bar_stub_engraver\|Span_bar_engraver\|Span_arpeggio_engraver\|Spacing_engraver\|Slur_performer\|Slur_engraver\|Slash_repeat_engraver\|Separating_line_group_engraver\|Script_row_engraver\|Script_engraver\|Script_column_engraver\|Score\|Rhythmic_column_engraver\|RhythmicStaff\|Rest_engraver\|Rest_collision_engraver\|Repeat_tie_engraver\|Repeat_acknowledge_engraver\|Pure_from_neighbor_engraver\|Pitched_trill_engraver\|Pitch_squash_engraver\|Piano_pedal_performer\|Piano_pedal_engraver\|Piano_pedal_align_engraver\|PianoStaff\|Phrasing_slur_engraver\|PetrucciVoice\|PetrucciStaff\|Percent_repeat_engraver\|Part_combine_engraver\|Parenthesis_engraver\|Paper_column_engraver\|Output_property_engraver\|Ottava_spanner_engraver\|OneStaff\|NullVoice\|Note_spacing_engraver\|Note_performer\|Note_name_engraver\|Note_heads_engraver\|Note_head_line_engraver\|NoteNames\|NoteHead\|New_fingering_engraver\|Multi_measure_rest_engraver\|Midi_control_change_performer\|Metronome_mark_engraver\|Merge_mmrest_numbers_engraver\|Mensural_ligature_engraver\|MensuralVoice\|MensuralStaff\|Mark_engraver\|Lyrics\|Lyric_performer\|Lyric_engraver\|Ligature_bracket_engraver\|Ledger_line_engraver\|Laissez_vibrer_engraver\|Kievan_ligature_engraver\|KievanVoice\|KievanStaff\|Key_performer\|Key_engraver\|Keep_alive_together_engraver\|Instrument_switch_engraver\|Instrument_name_engraver\|Hyphen_engraver\|Grob_pq_engraver\|GregorianTranscriptionVoice\|GregorianTranscriptionStaff\|GrandStaff\|Grace_spacing_engraver\|Grace_engraver\|Grace_beam_engraver\|Grace_auto_beam_engraver\|Global\|Glissando_engraver\|Fretboard_engraver\|FretBoards\|Forbid_line_break_engraver\|Footnote_engraver\|Font_size_engraver\|Fingering_engraver\|Fingering_column_engraver\|Figured_bass_position_engraver\|Figured_bass_engraver\|FiguredBass\|Extender_engraver\|Episema_engraver\|Dynamics\|Dynamic_performer\|Dynamic_engraver\|Dynamic_align_engraver\|Drum_notes_engraver\|Drum_note_performer\|DrumVoice\|DrumStaff\|Double_percent_repeat_engraver\|Dots_engraver\|Dot_column_engraver\|Devnull\|Default_bar_line_engraver\|Custos_engraver\|Cue_clef_engraver\|CueVoice\|Control_track_performer\|Concurrent_hairpin_engraver\|Collision_engraver\|Cluster_spanner_engraver\|Clef_engraver\|Chord_tremolo_engraver\|Chord_name_engraver\|ChordNames\|ChoirStaff\|Breathing_sign_engraver\|Break_align_engraver\|Bend_engraver\|Beam_performer\|Beam_engraver\|Beam_collision_engraver\|Bar_number_engraver\|Bar_engraver\|Axis_group_engraver\|Auto_beam_engraver\|Arpeggio_engraver\|Accidental_engraver\|Score\)\(\A\|\n\)"ms=s+1,me=e-1
+syn match lilyNote "\<\(\(\(solx\|soltqs\|soltqd\|soltqb\|soltcs\|soltcb\|solstqt\|solss\|solsqt\|solsd\|solsb\|sols\|solqs\|solqd\|solqb\|solkk\|solkhk\|solk\|solhk\|solhb\|soldsd\|soldd\|sold\|solcs\|solcb\|solbtqt\|solbsb\|solbqt\|solbhb\|solbb\|solb\|sol\|six\|sitqs\|sitqd\|sitqb\|sitcs\|sitcb\|sistqt\|siss\|sisqt\|sisd\|sisb\|sis\|siqs\|siqd\|siqb\|sikk\|sikhk\|sik\|sihk\|sihb\|sidsd\|sidd\|sid\|sics\|sicb\|sibtqt\|sibsb\|sibqt\|sibhb\|sibb\|sib\|si\|rex\|retqs\|retqd\|retqb\|retcs\|retcb\|restqt\|ress\|resqt\|resd\|resb\|res\|reqs\|reqd\|reqb\|rekk\|rekhk\|rek\|rehk\|rehb\|redsd\|redd\|red\|recs\|recb\|rebtqt\|rebsb\|rebqt\|rebhb\|rebb\|reb\|re\|mix\|mitqs\|mitqd\|mitqb\|mitcs\|mitcb\|mistqt\|miss\|misqt\|misd\|misb\|mis\|miqs\|miqd\|miqb\|mikk\|mikhk\|mik\|mihk\|mihb\|midsd\|midd\|mid\|mics\|micb\|mibtqt\|mibsb\|mibqt\|mibhb\|mibb\|mib\|mi\|lax\|latqs\|latqd\|latqb\|latcs\|latcb\|lastqt\|lass\|lasqt\|lasd\|lasb\|las\|laqs\|laqd\|laqb\|lakk\|lakhk\|lak\|lahk\|lahb\|ladsd\|ladd\|lad\|lacs\|lacb\|labtqt\|labsb\|labqt\|labhb\|labb\|lab\|la\|hississ\|hissih\|hiss\|hisis\|hisih\|his\|hih\|hessess\|hesseh\|heses\|heseh\|heh\|h\|gx\|gtqs\|gtqf\|gtqd\|gtqb\|gss\|gshd\|gshb\|gs\|gqs\|gqf\|gississ\|gissih\|giss\|gisis\|gisih\|gis\|gih\|gfhd\|gfhb\|gff\|gf\|gessess\|gesseh\|gess\|geses\|geseh\|ges\|geh\|gdd\|gdb\|gd\|gb\|g\|fx\|ftqs\|ftqf\|ftqd\|ftqb\|fss\|fshd\|fshb\|fs\|fqs\|fqf\|fississ\|fissih\|fiss\|fisis\|fisih\|fis\|fih\|ffhd\|ffhb\|fff\|ff\|fessess\|fesseh\|fess\|feses\|feseh\|fes\|feh\|fdd\|fdb\|fd\|fb\|fax\|fatqs\|fatqd\|fatqb\|fatcs\|fatcb\|fastqt\|fass\|fasqt\|fasd\|fasb\|fas\|faqs\|faqd\|faqb\|fakk\|fakhk\|fak\|fahk\|fahb\|fadsd\|fadd\|fad\|facs\|facb\|fabtqt\|fabsb\|fabqt\|fabhb\|fabb\|fab\|fa\|f\|ex\|etqs\|etqf\|etqd\|etqb\|essess\|esseh\|ess\|eshd\|eshb\|eses\|eseh\|es\|eqs\|eqf\|eississ\|eissih\|eiss\|eisis\|eisih\|eis\|eih\|eh\|efhd\|efhb\|eff\|ef\|eessess\|eesseh\|eess\|eeses\|eeseh\|ees\|eeh\|edd\|edb\|ed\|eb\|e\|dx\|dtqs\|dtqf\|dtqd\|dtqb\|dss\|dshd\|dshb\|ds\|dqs\|dqf\|dox\|dotqs\|dotqd\|dotqb\|dotcs\|dotcb\|dostqt\|doss\|dosqt\|dosd\|dosb\|dos\|doqs\|doqd\|doqb\|dokk\|dokhk\|dok\|dohk\|dohb\|dodsd\|dodd\|dod\|docs\|docb\|dobtqt\|dobsb\|dobqt\|dobhb\|dobb\|dob\|do\|dississ\|dissih\|diss\|disis\|disih\|dis\|dih\|dfhd\|dfhb\|dff\|df\|dessess\|desseh\|dess\|deses\|deseh\|des\|deh\|ddd\|ddb\|dd\|db\|d\|cx\|ctqs\|ctqf\|ctqd\|ctqb\|css\|cshd\|cshb\|cs\|cqs\|cqf\|cississ\|cissih\|ciss\|cisis\|cisih\|cis\|cih\|cfhd\|cfhb\|cff\|cf\|cessess\|cesseh\|cess\|ceses\|ceseh\|ces\|ceh\|cdd\|cdb\|cd\|cb\|c\|bx\|btqs\|btqf\|btqd\|btqb\|bss\|bshd\|bshb\|bs\|bqs\|bqf\|bisis\|bisih\|bis\|bih\|bfhd\|bfhb\|bff\|bf\|bess\|beses\|beseh\|bes\|beh\|bdd\|bdb\|bd\|bb\|b\|ax\|atqs\|atqf\|atqd\|atqb\|assess\|asseh\|ass\|ashd\|ashb\|ases\|aseh\|asas\|asah\|as\|aqs\|aqf\|aississ\|aissih\|aiss\|aisis\|aisih\|ais\|aih\|ah\|afhd\|afhb\|aff\|af\|aessess\|aesseh\|aess\|aeses\|aeseh\|aes\|aeh\|add\|adb\|ad\|ab\|a\|a\)\([,']\)\{,4}\([?!]\)\?\)\|s\|r\|R\|q\)\(\(128\|64\|32\|16\|8\|4\|2\|1\|\\breve\|\\longa\|\\maxima\)[.]\{,8}\)\?\(\A\|\n\)"me=e-1
diff --git a/syntax/lilypond.vim b/syntax/lilypond.vim
new file mode 100644
index 000000000..b2c674e80
--- /dev/null
+++ b/syntax/lilypond.vim
@@ -0,0 +1,108 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'lilypond', 'syntax/lilypond.vim')
+  finish
+endif
+
+" LilyPond syntax file
+" Language:	LilyPond
+" Maintainer:	Heikki Junes <hjunes@cc.hut.fi>
+" License:      This file is part of LilyPond, the GNU music typesetter.
+"
+"               Copyright (C) 2002-2004, 2008-2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+"
+"               LilyPond is free software: you can redistribute it and/or modify
+"               it under the terms of the GNU General Public License as published by
+"               the Free Software Foundation, either version 3 of the License, or
+"               (at your option) any later version.
+"
+"               LilyPond is distributed in the hope that it will be useful,
+"               but WITHOUT ANY WARRANTY; without even the implied warranty of
+"               MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+"               GNU General Public License for more details.
+"
+"               You should have received a copy of the GNU General Public License
+"               along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+"
+" Last Change:	2010 Jul 26
+"
+" Installed As:	vim/syntax/lilypond.vim
+" Uses Generated File:	vim/syntax/lilypond-words.vim
+"
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+" Read the LilyPond syntax match groups: 
+"   lilyKeyword, lilyReservedWord, lilyNote
+if version < 600
+  so <sfile>:p:h/lilypond-words.vim
+else
+  runtime! syntax/lilypond-words.vim
+  if exists("b:current_syntax")
+    unlet b:current_syntax
+  endif
+endif
+
+" Match also parethesis of angle type
+setlocal mps+=<:>
+
+" Case matters
+syn case match
+
+syn cluster lilyMatchGroup	contains=lilyMatcher,lilyString,lilyComment,lilyStatement,lilyNumber,lilySlur,lilySpecial,lilyNote,lilyKeyword,lilyArticulation,lilyReservedWord,lilyScheme
+
+syn region lilyMatcher	matchgroup=Delimiter start="{" skip="\\\\\|\\[<>]"	end="}"	contains=@lilyMatchGroup fold
+syn region lilyMatcher	matchgroup=Delimiter start="\["		end="]"	contains=@lilyMatchGroup fold
+syn region lilyMatcher	matchgroup=Delimiter start="<" skip="\\\\\|\\[{<>}]" end=">"	contains=@lilyMatchGroup fold
+
+syn region lilyString	start=/"/ end=/"/ skip=/\\"/
+syn region lilyComment	start="%{" skip="%$" end="%}"
+syn region lilyComment	start="%\([^{]\|$\)" end="$"
+
+syn match lilyNumber	"[-_^.]\?\d\+[.]\?"
+syn match lilySlur	"[(~)]"
+syn match lilySlur	"\\[()]"
+syn match lilySpecial	"\\[<!>\\]"
+" avoid highlighting the extra character in situations like
+" c--\mf c^^\mf c__\mf
+syn match lilyArticulation	"[-_^][-_^+|>.]"
+
+" Include Scheme syntax highlighting, where appropriate
+syn include @embeddedScheme syntax/scheme.vim
+unlet b:current_syntax
+syn region lilyScheme matchgroup=Delimiter start="#['`]\?(" matchgroup=Delimiter end=")" contains=@embeddedScheme
+
+" Rest of syntax highlighting rules start here
+"
+" " Define the default highlighting.
+" " For version 5.7 and earlier: only when not done already
+" " For version 5.8 and later: only when an item doesn't have highlighting yet
+if version >= 508 || !exists("did_lily_syn_inits")
+  if version < 508
+    let did_lily_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink Delimiter	Identifier
+  
+  HiLink lilyString	String
+  HiLink lilyComment	Comment
+ 
+  HiLink lilyNote	Identifier
+  HiLink lilyArticulation	PreProc
+  HiLink lilyKeyword	Keyword
+  HiLink lilyReservedWord	Type
+
+  HiLink lilyNumber	Constant
+  HiLink lilySpecial	Special
+  HiLink lilySlur	ModeMsg
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "lilypond"
diff --git a/syntax/mermaid.vim b/syntax/mermaid.vim
new file mode 100644
index 000000000..91b8658e1
--- /dev/null
+++ b/syntax/mermaid.vim
@@ -0,0 +1,65 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mermaid', 'syntax/mermaid.vim')
+  finish
+endif
+
+setlocal iskeyword+=-
+
+syntax keyword mermaidDiagramType classDiagram classDiagram-v2 erDiagram gantt graph flowchart pie sequenceDiagram stateDiagram stateDiagram-v2
+syntax match mermaidOperator /\v(-|\<|\>|\+|\||\=)/
+syntax match mermaidComment /\v^(\s?)+\%\%.*$/
+syntax region mermaidString start=/"/ end=/"/ skip=/\\"/
+" is used in both class and state diagrams
+syntax match mermaidSpecialAnnotation /\v\<\<\w+\>\>/
+syntax match mermaidKeyword /\v^\s+(subgraph|loop|alt|else|opt|par[^a-z]|and|rect|end|participant|activate|deactivate)/
+
+syntax match mermaidGraphOperator /\v(\.-|-\.|\&|o-|-o|x-|-x)/
+syntax keyword mermaidGraphClickKeyword click
+
+syntax match mermaidNote /\v^\s+(note[^s]|Note[^s]|end note)/ nextgroup=mermaidNoteDirection
+syntax match mermaidNoteDirection /\v(left of|right of|over[^a-z])/
+
+syntax keyword mermaidSequenceFunction rgb
+
+" TODO: support class dashed link operator: `..`
+syntax match mermaidClassOperator /\v(\*-|-\*|\<\.\.|\.\.\>|\|\.\.|\.\.\|)/
+syntax keyword mermaidClassClassKeyword class
+syntax keyword mermaidClassType
+			\ int[eger] bool[ean] string float bigdec[imal] char[cter] double symbol
+syntax match mermaidClassGenericType /\v\w+\~\w+\~/
+			\ contains=ALLBUT,mermaidClassGenericType
+" TODO Fix matching on graph/flowchart round shape: `SecondStep(Go Shopping)`
+syntax match mermaidClassFunction /\v\w+\(((\w+|\s+|\~)?,?)+\)/ contains=ALLBUT,mermaidClassFunction
+" TODO support class visibility operators
+" https://mermaid-js.github.io/mermaid/#/classDiagram?id=visibility
+
+syntax match mermaidStateFinalKeyword /\[\*\]/
+syntax match mermaidStateKeyword /\v(\s+as[^a-z]|^\s+state)/
+
+" TODO highlight gantt keywords
+
+" TODO improve er operators
+syntax match mermaidErOperator /\v(\}\||\|\{|o\{)/
+
+highlight link mermaidDiagramType Constant
+highlight link mermaidOperator Operator
+highlight link mermaidComment Comment
+highlight link mermaidString String
+highlight link mermaidSpecialAnnotation Label
+highlight link mermaidNote Keyword
+highlight link mermaidNoteDirection Keyword
+
+highlight link mermaidGraphOperator Operator
+highlight link mermaidGraphClickKeyword Keyword
+
+highlight link mermaidKeyword Keyword
+highlight link mermaidSequenceFunction Function
+
+highlight link mermaidClassClassKeyword Keyword
+highlight link mermaidClassOperator Operator
+highlight link mermaidClassType Type
+highlight link mermaidClassGenericType Type
+
+highlight link mermaidStateFinalKeyword Keyword
+highlight link mermaidStateKeyword Keyword
+
+highlight link mermaidErOperator Operator
diff --git a/syntax/swayconfig.vim b/syntax/swayconfig.vim
new file mode 100644
index 000000000..962596655
--- /dev/null
+++ b/syntax/swayconfig.vim
@@ -0,0 +1,285 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'sway', 'syntax/swayconfig.vim')
+  finish
+endif
+
+" Vim syntax file
+" Language: sway config file
+" Original Author: Mohamed Boughaba <mohamed dot bgb at gmail dot com>
+" Maintainer: James Eapen <jamespeapen at gmail dot com>
+" Version: 1.0
+" Last Change: 2020-10-07 
+
+" References:
+" http://i3wm.org/docs/userguide.html#configuring
+" http://vimdoc.sourceforge.net/htmldoc/syntax.html
+"
+"
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syn clear
+elsei exists("b:current_syntax")
+  fini
+en
+
+scriptencoding utf-8
+
+" Error
+syn match swayConfigError /.*/
+
+" Todo
+syn keyword swayConfigTodo TODO FIXME XXX contained
+
+" Comment
+" Comments are started with a # and can only be used at the beginning of a line
+syn match swayConfigComment /^\s*#.*$/ contains=swayConfigTodo
+
+" Font
+" A FreeType font description is composed by:
+" a font family, a style, a weight, a variant, a stretch and a size.
+syn match swayConfigFontSeparator /,/ contained
+syn match swayConfigFontSeparator /:/ contained
+syn keyword swayConfigFontKeyword font contained
+syn match swayConfigFontNamespace /\w\+:/ contained contains=swayConfigFontSeparator
+syn match swayConfigFontContent /-\?\w\+\(-\+\|\s\+\|,\)/ contained contains=swayConfigFontNamespace,swayConfigFontSeparator,swayConfigFontKeyword
+syn match swayConfigFontSize /\s\=\d\+\(px\)\?\s\?$/ contained
+syn match swayConfigFont /^\s*font\s\+.*$/ contains=swayConfigFontContent,swayConfigFontSeparator,swayConfigFontSize,swayConfigFontNamespace
+syn match swayConfigFont /^\s*font\s\+.*\(\\\_.*\)\?$/ contains=swayConfigFontContent,swayConfigFontSeparator,swayConfigFontSize,swayConfigFontNamespace
+syn match swayConfigFont /^\s*font\s\+.*\(\\\_.*\)\?[^\\]\+$/ contains=swayConfigFontContent,swayConfigFontSeparator,swayConfigFontSize,swayConfigFontNamespace
+syn match swayConfigFont /^\s*font\s\+\(\(.*\\\_.*\)\|\(.*[^\\]\+$\)\)/ contains=swayConfigFontContent,swayConfigFontSeparator,swayConfigFontSize,swayConfigFontNamespace
+
+" variables
+syn match swayConfigString /\(['"]\)\(.\{-}\)\1/ contained
+syn match swayConfigColor /#\w\{6}/ contained
+syn match swayConfigVariableModifier /+/ contained
+syn match swayConfigVariableAndModifier /+\w\+/ contained contains=swayConfigVariableModifier
+syn match swayConfigVariable /\$\w\+\(\(-\w\+\)\+\)\?\(\s\|+\)\?/ contains=swayConfigVariableModifier,swayConfigVariableAndModifier
+syn keyword swayConfigInitializeKeyword set contained
+syn match swayConfigInitialize /^\s*set\s\+.*$/ contains=swayConfigVariable,swayConfigInitializeKeyword,swayConfigColor,swayConfigString
+
+" Gaps
+syn keyword swayConfigGapStyleKeyword inner outer horizontal vertical top right bottom left current all set plus minus toggle up down contained
+syn match swayConfigGapStyle /^\s*\(gaps\)\s\+\(inner\|outer\|horizontal\|vertical\|left\|top\|right\|bottom\)\(\s\+\(current\|all\)\)\?\(\s\+\(set\|plus\|minus\|toggle\)\)\?\(\s\+\(-\?\d\+\|\$.*\)\)$/ contains=swayConfigGapStyleKeyword,swayConfigNumber,swayConfigVariable
+syn keyword swayConfigSmartGapKeyword on inverse_outer contained
+syn match swayConfigSmartGap /^\s*smart_gaps\s\+\(on\|inverse_outer\)\s\?$/ contains=swayConfigSmartGapKeyword
+syn keyword swayConfigSmartBorderKeyword on no_gaps contained
+syn match swayConfigSmartBorder /^\s*smart_borders\s\+\(on\|no_gaps\)\s\?$/ contains=swayConfigSmartBorderKeyword
+
+" Keyboard bindings
+syn keyword swayConfigAction toggle fullscreen restart key import kill shrink grow contained
+syn keyword swayConfigAction focus move grow height width split layout resize restore reload mute unmute exit mode workspace container to output contained
+syn match swayConfigModifier /\w\++\w\+\(\(+\w\+\)\+\)\?/ contained contains=swayConfigVariableModifier
+syn match swayConfigNumber /\s\d\+/ contained
+syn match swayConfigUnit /\sp\(pt\|x\)/ contained
+syn match swayConfigUnitOr /\sor/ contained
+syn keyword swayConfigBindKeyword bindsym bindcode exec gaps border contained
+syn match swayConfigBindArgument /--\w\+\(\(-\w\+\)\+\)\?\s/ contained
+syn match swayConfigBind /^\s*\(bindsym\|bindcode\)\s\+.*$/ contains=swayConfigVariable,swayConfigBindKeyword,swayConfigVariableAndModifier,swayConfigNumber,swayConfigUnit,swayConfigUnitOr,swayConfigBindArgument,swayConfigModifier,swayConfigAction,swayConfigString,swayConfigGapStyleKeyword,swayConfigBorderStyleKeyword
+
+" Floating
+syn keyword swayConfigFloatingModifier floating_modifier contained
+syn match swayConfigFloatingMouseAction /^\s\?.*floating_modifier\s.*\(normal\|inverted\)$/ contains=swayConfigFloatingModifier,swayConfigVariable
+
+syn keyword swayConfigSizeSpecial x contained
+syn match swayConfigNegativeSize /-/ contained
+syn match swayConfigSize /-\?\d\+\s\?x\s\?-\?\d\+/ contained contains=swayConfigSizeSpecial,swayConfigNumber,swayConfigNegativeSize
+syn match swayConfigFloating /^\s*floating_\(maximum\|minimum\)_size\s\+-\?\d\+\s\?x\s\?-\?\d\+/ contains=swayConfigSize
+
+" Orientation
+syn keyword swayConfigOrientationKeyword vertical horizontal auto contained
+syn match swayConfigOrientation /^\s*default_orientation\s\+\(vertical\|horizontal\|auto\)\s\?$/ contains=swayConfigOrientationKeyword
+
+" Layout
+syn keyword swayConfigLayoutKeyword default stacking tabbed contained
+syn match swayConfigLayout /^\s*workspace_layout\s\+\(default\|stacking\|tabbed\)\s\?$/ contains=swayConfigLayoutKeyword
+
+" Border style
+syn keyword swayConfigBorderStyleKeyword none normal pixel contained
+syn match swayConfigBorderStyle /^\s*\(new_window\|new_float\|default_border\|default_floating_border\)\s\+\(none\|\(normal\|pixel\)\(\s\+\d\+\)\?\(\s\+\$\w\+\(\(-\w\+\)\+\)\?\(\s\|+\)\?\)\?\)\s\?$/ contains=swayConfigBorderStyleKeyword,swayConfigNumber,swayConfigVariable
+
+" Hide borders and edges
+syn keyword swayConfigEdgeKeyword none vertical horizontal both smart smart_no_gaps contained
+syn match swayConfigEdge /^\s*hide_edge_borders\s\+\(none\|vertical\|horizontal\|both\|smart\|smart_no_gaps\)\s\?$/ contains=swayConfigEdgeKeyword
+
+" Arbitrary commands for specific windows (for_window)
+syn keyword swayConfigCommandKeyword for_window contained
+syn region swayConfigWindowStringSpecial start=+"+  skip=+\\"+  end=+"+ contained contains=swayConfigString
+syn region swayConfigWindowCommandSpecial start="\[" end="\]" contained contains=swayConfigWindowStringSpacial,swayConfigString
+syn match swayConfigArbitraryCommand /^\s*for_window\s\+.*$/ contains=swayConfigWindowCommandSpecial,swayConfigCommandKeyword,swayConfigBorderStyleKeyword,swayConfigLayoutKeyword,swayConfigOrientationKeyword,Size,swayConfigNumber
+
+" Disable focus open opening
+syn keyword swayConfigNoFocusKeyword no_focus contained
+syn match swayConfigDisableFocus /^\s*no_focus\s\+.*$/ contains=swayConfigWindowCommandSpecial,swayConfigNoFocusKeyword
+
+" Move client to specific workspace automatically
+syn keyword swayConfigAssignKeyword assign contained
+syn match swayConfigAssignSpecial /→/ contained
+syn match swayConfigAssign /^\s*assign\s\+.*$/ contains=swayConfigAssignKeyword,swayConfigWindowCommandSpecial,swayConfigAssignSpecial
+
+" X resources
+syn keyword swayConfigResourceKeyword set_from_resource contained
+syn match swayConfigResource /^\s*set_from_resource\s\+.*$/ contains=swayConfigResourceKeyword,swayConfigWindowCommandSpecial,swayConfigColor,swayConfigVariable
+
+" Auto start applications
+syn keyword swayConfigExecKeyword exec exec_always contained
+syn match swayConfigNoStartupId /--no-startup-id/ contained " We are not using swayConfigBindArgument as only no-startup-id is supported here
+syn match swayConfigExec /^\s*exec\(_always\)\?\s\+.*$/ contains=swayConfigExecKeyword,swayConfigNoStartupId,swayConfigString
+
+" Automatically putting workspaces on specific screens
+syn keyword swayConfigWorkspaceKeyword workspace contained
+syn keyword swayConfigOutputKeyword output contained
+syn match swayConfigWorkspace /^\s*workspace\s\+.*$/ contains=swayConfigWorkspaceKeyword,swayConfigNumber,swayConfigString,swayConfigOutputKeyword
+
+" set display outputs
+syn match swayConfigOutput /^\s*output\s\+.*$/ contains=swayConfigOutputKeyword
+
+" set display focus 
+syn keyword swayConfigFocusKeyword focus contained
+syn keyword swayConfigFocusType output contained
+syn match swayConfigFocus /^\s*focus\soutput\s.*$/ contains=swayConfigFocusKeyword,swayConfigFocusType
+
+" Changing colors
+syn keyword swayConfigClientColorKeyword client focused focused_inactive unfocused urgent placeholder background contained
+syn match swayConfigClientColor /^\s*client.\w\+\s\+.*$/ contains=swayConfigClientColorKeyword,swayConfigColor,swayConfigVariable
+
+syn keyword swayConfigTitleAlignKeyword left center right contained
+syn match swayConfigTitleAlign /^\s*title_align\s\+.*$/ contains=swayConfigTitleAlignKeyword
+
+" Interprocess communication
+syn match swayConfigInterprocessKeyword /ipc-socket/ contained
+syn match swayConfigInterprocess /^\s*ipc-socket\s\+.*$/ contains=swayConfigInterprocessKeyword
+
+" Mouse warping
+syn keyword swayConfigMouseWarpingKeyword mouse_warping contained
+syn keyword swayConfigMouseWarpingType output none contained
+syn match swayConfigMouseWarping /^\s*mouse_warping\s\+\(output\|none\)\s\?$/ contains=swayConfigMouseWarpingKeyword,swayConfigMouseWarpingType
+
+" Focus follows mouse
+syn keyword swayConfigFocusFollowsMouseKeyword focus_follows_mouse contained
+syn keyword swayConfigFocusFollowsMouseType yes no contained
+syn match swayConfigFocusFollowsMouse /^\s*focus_follows_mouse\s\+\(yes\|no\)\s\?$/ contains=swayConfigFocusFollowsMouseKeyword,swayConfigFocusFollowsMouseType
+
+" Popups during fullscreen mode
+syn keyword swayConfigPopupOnFullscreenKeyword popup_during_fullscreen contained
+syn keyword swayConfigPopuponFullscreenType smart ignore leave_fullscreen contained
+syn match swayConfigPopupOnFullscreen /^\s*popup_during_fullscreen\s\+\w\+\s\?$/ contains=swayConfigPopupOnFullscreenKeyword,swayConfigPopupOnFullscreenType
+
+" Focus wrapping
+syn keyword swayConfigFocusWrappingKeyword force_focus_wrapping focus_wrapping contained
+syn keyword swayConfigFocusWrappingType yes no contained
+syn match swayConfigFocusWrapping /^\s*\(force_\)\?focus_wrapping\s\+\(yes\|no\)\s\?$/ contains=swayConfigFocusWrappingType,swayConfigFocusWrappingKeyword
+
+" Forcing Xinerama
+syn keyword swayConfigForceXineramaKeyword force_xinerama contained
+syn match swayConfigForceXinerama /^\s*force_xinerama\s\+\(yes\|no\)\s\?$/ contains=swayConfigFocusWrappingType,swayConfigForceXineramaKeyword
+
+" Automatic back-and-forth when switching to the current workspace
+syn keyword swayConfigAutomaticSwitchKeyword workspace_auto_back_and_forth contained
+syn match swayConfigAutomaticSwitch /^\s*workspace_auto_back_and_forth\s\+\(yes\|no\)\s\?$/ contains=swayConfigFocusWrappingType,swayConfigAutomaticSwitchKeyword
+
+" Delay urgency hint
+syn keyword swayConfigTimeUnit ms contained
+syn keyword swayConfigDelayUrgencyKeyword force_display_urgency_hint contained
+syn match swayConfigDelayUrgency /^\s*force_display_urgency_hint\s\+\d\+\s\+ms\s\?$/ contains=swayConfigFocusWrappingType,swayConfigDelayUrgencyKeyword,swayConfigNumber,swayConfigTimeUnit
+
+" Focus on window activation
+syn keyword swayConfigFocusOnActivationKeyword focus_on_window_activation contained
+syn keyword swayConfigFocusOnActivationType smart urgent focus none contained
+syn match swayConfigFocusOnActivation /^\s*focus_on_window_activation\s\+\(smart\|urgent\|focus\|none\)\s\?$/  contains=swayConfigFocusOnActivationKeyword,swayConfigFocusOnActivationType
+
+" Automatic back-and-forth when switching to the current workspace
+syn keyword swayConfigDrawingMarksKeyword show_marks contained
+syn match swayConfigDrawingMarks /^\s*show_marks\s\+\(yes\|no\)\s\?$/ contains=swayConfigFocusWrappingType,swayConfigDrawingMarksKeyword
+
+" Group mode/bar
+syn keyword swayConfigBlockKeyword mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained
+syn region swayConfigBlock start=+.*s\?{$+ end=+^}$+ contains=swayConfigBlockKeyword,swayConfigString,swayConfigBind,swayConfigComment,swayConfigFont,swayConfigFocusWrappingType,swayConfigColor,swayConfigVariable transparent keepend extend
+
+" Line continuation
+syn region swayConfigLineCont start=/^.*\\$/ end=/^.*$/ contains=swayConfigBlockKeyword,swayConfigString,swayConfigBind,swayConfigComment,swayConfigFont,swayConfigFocusWrappingType,swayConfigColor,swayConfigVariable transparent keepend extend
+
+" Includes with relative paths to config files
+syn keyword swayConfigInclude include contained
+syn match swayConfigFile /^include\s\(\~\?\/.*$\|\.\{0,2}\/.*$\)/ contains=swayConfigInclude
+
+" Define the highlighting.
+let b:current_syntax = "swayconfig"
+hi! def link swayConfigError                           Error
+hi! def link swayConfigTodo                            Todo
+hi! def link swayConfigComment                         Comment
+hi! def link swayConfigFontContent                     Type
+hi! def link swayConfigFocusOnActivationType           Type
+hi! def link swayConfigPopupOnFullscreenType           Type
+hi! def link swayConfigOrientationKeyword              Type
+hi! def link swayConfigMouseWarpingType                Type
+hi! def link swayConfigFocusFollowsMouseType           Type
+hi! def link swayConfigGapStyleKeyword                 Type
+hi! def link swayConfigTitleAlignKeyword               Type
+hi! def link swayConfigSmartGapKeyword                 Type
+hi! def link swayConfigSmartBorderKeyword              Type
+hi! def link swayConfigLayoutKeyword                   Type
+hi! def link swayConfigBorderStyleKeyword              Type
+hi! def link swayConfigEdgeKeyword                     Type
+hi! def link swayConfigAction                          Type
+hi! def link swayConfigCommand                         Type
+hi! def link swayConfigOutputKeyword                   Type
+hi! def link swayConfigWindowCommandSpecial            Type
+hi! def link swayConfigFocusWrappingType               Type
+hi! def link swayConfigUnitOr                          Type
+hi! def link swayConfigFontSize                        Constant
+hi! def link swayConfigColor                           Constant
+hi! def link swayConfigNumber                          Constant
+hi! def link swayConfigUnit                            Constant
+hi! def link swayConfigVariableAndModifier             Constant
+hi! def link swayConfigTimeUnit                        Constant
+hi! def link swayConfigModifier                        Constant
+hi! def link swayConfigString                          Constant
+hi! def link swayConfigNegativeSize                    Constant
+hi! def link swayConfigFontSeparator                   Special
+hi! def link swayConfigVariableModifier                Special
+hi! def link swayConfigSizeSpecial                     Special
+hi! def link swayConfigWindowSpecial                   Special
+hi! def link swayConfigAssignSpecial                   Special
+hi! def link swayConfigFontNamespace                   PreProc
+hi! def link swayConfigBindArgument                    PreProc
+hi! def link swayConfigNoStartupId                     PreProc
+hi! def link swayConfigFontKeyword                     Identifier
+hi! def link swayConfigBindKeyword                     Identifier
+hi! def link swayConfigOrientation                     Identifier
+hi! def link swayConfigGapStyle                        Identifier
+hi! def link swayConfigTitleAlign                      Identifier
+hi! def link swayConfigSmartGap                        Identifier
+hi! def link swayConfigSmartBorder                     Identifier
+hi! def link swayConfigLayout                          Identifier
+hi! def link swayConfigBorderStyle                     Identifier
+hi! def link swayConfigEdge                            Identifier
+hi! def link swayConfigFloating                        Identifier
+hi! def link swayConfigCommandKeyword                  Identifier
+hi! def link swayConfigNoFocusKeyword                  Identifier
+hi! def link swayConfigInitializeKeyword               Identifier
+hi! def link swayConfigAssignKeyword                   Identifier
+hi! def link swayConfigResourceKeyword                 Identifier
+hi! def link swayConfigExecKeyword                     Identifier
+hi! def link swayConfigWorkspaceKeyword                Identifier
+hi! def link swayConfigClientColorKeyword              Identifier
+hi! def link swayConfigInterprocessKeyword             Identifier
+hi! def link swayConfigMouseWarpingKeyword             Identifier
+hi! def link swayConfigFocusFollowsMouseKeyword        Identifier
+hi! def link swayConfigPopupOnFullscreenKeyword        Identifier
+hi! def link swayConfigFocusWrappingKeyword            Identifier
+hi! def link swayConfigForceXineramaKeyword            Identifier
+hi! def link swayConfigAutomaticSwitchKeyword          Identifier
+hi! def link swayConfigDelayUrgencyKeyword             Identifier
+hi! def link swayConfigFocusOnActivationKeyword        Identifier
+hi! def link swayConfigDrawingMarksKeyword             Identifier
+hi! def link swayConfigBlockKeyword                    Identifier
+hi! def link swayConfigVariable                        Statement
+hi! def link swayConfigArbitraryCommand                Type
+hi! def link swayConfigInclude                         Identifier
+hi! def link swayConfigFile                            Constant
+hi! def link swayConfigFloatingModifier                Identifier
+hi! def link swayConfigFloatingMouseAction             Type
+hi! def link swayConfigFocusKeyword                    Type
+hi! def link swayConfigFocusType                       Identifier
+
+
diff --git a/syntax/toml.vim b/syntax/toml.vim
new file mode 100644
index 000000000..9540d2c58
--- /dev/null
+++ b/syntax/toml.vim
@@ -0,0 +1,80 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'toml', 'syntax/toml.vim')
+  finish
+endif
+
+" Language:   TOML
+" Maintainer: Caleb Spare <cespare@gmail.com>
+" URL:        https://github.com/cespare/vim-toml
+" LICENSE:    MIT
+
+if exists('b:current_syntax')
+  finish
+endif
+
+syn match tomlEscape /\\[btnfr"/\\]/ display contained
+syn match tomlEscape /\\u\x\{4}/ contained
+syn match tomlEscape /\\U\x\{8}/ contained
+hi def link tomlEscape SpecialChar
+
+syn match tomlLineEscape /\\$/ contained
+hi def link tomlLineEscape SpecialChar
+
+" Basic strings
+syn region tomlString oneline start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=tomlEscape
+" Multi-line basic strings
+syn region tomlString start=/"""/ end=/"""/ contains=tomlEscape,tomlLineEscape
+" Literal strings
+syn region tomlString oneline start=/'/ end=/'/
+" Multi-line literal strings
+syn region tomlString start=/'''/ end=/'''/
+hi def link tomlString String
+
+syn match tomlInteger /[+-]\=\<[1-9]\(_\=\d\)*\>/ display
+syn match tomlInteger /[+-]\=\<0\>/ display
+syn match tomlInteger /[+-]\=\<0x[[:xdigit:]]\(_\=[[:xdigit:]]\)*\>/ display
+syn match tomlInteger /[+-]\=\<0o[0-7]\(_\=[0-7]\)*\>/ display
+syn match tomlInteger /[+-]\=\<0b[01]\(_\=[01]\)*\>/ display
+syn match tomlInteger /[+-]\=\<\(inf\|nan\)\>/ display
+hi def link tomlInteger Number
+
+syn match tomlFloat /[+-]\=\<\d\(_\=\d\)*\.\d\+\>/ display
+syn match tomlFloat /[+-]\=\<\d\(_\=\d\)*\(\.\d\(_\=\d\)*\)\=[eE][+-]\=\d\(_\=\d\)*\>/ display
+hi def link tomlFloat Float
+
+syn match tomlBoolean /\<\%(true\|false\)\>/ display
+hi def link tomlBoolean Boolean
+
+" https://tools.ietf.org/html/rfc3339
+syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}/ display
+syn match tomlDate /\d\{2\}:\d\{2\}:\d\{2\}\%(\.\d\+\)\?/ display
+syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}[T ]\d\{2\}:\d\{2\}:\d\{2\}\%(\.\d\+\)\?\%(Z\|[+-]\d\{2\}:\d\{2\}\)\?/ display
+hi def link tomlDate Constant
+
+syn match tomlKey /\v(^|[{,])\s*\zs[[:alnum:]._-]+\ze\s*\=/ display
+hi def link tomlKey Identifier
+
+syn region tomlKeyDq oneline start=/\v(^|[{,])\s*\zs"/ end=/"\ze\s*=/ contains=tomlEscape
+hi def link tomlKeyDq Identifier
+
+syn region tomlKeySq oneline start=/\v(^|[{,])\s*\zs'/ end=/'\ze\s*=/
+hi def link tomlKeySq Identifier
+
+syn region tomlTable oneline start=/^\s*\[[^\[]/ end=/\]/ contains=tomlKey,tomlKeyDq,tomlKeySq
+hi def link tomlTable Title
+
+syn region tomlTableArray oneline start=/^\s*\[\[/ end=/\]\]/ contains=tomlKey,tomlKeyDq,tomlKeySq
+hi def link tomlTableArray Title
+
+syn cluster tomlValue contains=tomlArray,tomlString,tomlInteger,tomlFloat,tomlBoolean,tomlDate,tomlComment
+syn region tomlKeyValueArray start=/=\s*\[\zs/ end=/\]/ contains=@tomlValue
+syn region tomlArray start=/\[/ end=/\]/ contains=@tomlValue contained
+
+syn keyword tomlTodo TODO FIXME XXX BUG contained
+hi def link tomlTodo Todo
+
+syn match tomlComment /#.*/ contains=@Spell,tomlTodo
+hi def link tomlComment Comment
+
+syn sync minlines=500
+
+let b:current_syntax = 'toml'
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 15bd60e9e..0d72c7274 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -279,7 +279,6 @@ call TestFiletype('csdl')
 call TestFiletype('cabal')
 call TestFiletype('cdrtoc')
 call TestFiletype('cdrdaoconf')
-call TestFiletype('cfengine')
 call TestFiletype('chaiscript')
 call TestFiletype('cdl')
 call TestFiletype('conaryrecipe')
@@ -341,7 +340,6 @@ call TestFiletype('expect')
 call TestFiletype('exports')
 call TestFiletype('falcon')
 call TestFiletype('fan')
-call TestFiletype('factor')
 call TestFiletype('fetchmail')
 call TestFiletype('focexec')
 call TestFiletype('reva')
@@ -374,7 +372,6 @@ call TestFiletype('template')
 call TestFiletype('hostconf')
 call TestFiletype('hostsaccess')
 call TestFiletype('hb')
-call TestFiletype('httest')
 call TestFiletype('icon')
 call TestFiletype('msidl')
 call TestFiletype('icemenu')
@@ -436,7 +433,6 @@ call TestFiletype('ist')
 call TestFiletype('mallard')
 call TestFiletype('manconf')
 call TestFiletype('maple')
-call TestFiletype('map')
 call TestFiletype('mel')
 call TestFiletype('hgcommit')
 call TestFiletype('messages')
@@ -480,7 +476,6 @@ call TestFiletype('papp')
 call TestFiletype('passwd')
 call TestFiletype('pascal')
 call TestFiletype('pdf')
-call TestFiletype('pcmk')
 call TestFiletype('pike')
 call TestFiletype('cmod')
 call TestFiletype('pinfo')
@@ -499,7 +494,6 @@ call TestFiletype('povini')
 call TestFiletype('pccts')
 call TestFiletype('ppwiz')
 call TestFiletype('obj')
-call TestFiletype('proc')
 call TestFiletype('privoxy')
 call TestFiletype('procmail')
 call TestFiletype('psf')
@@ -628,7 +622,6 @@ call TestFiletype('xsd')
 call TestFiletype('xslt')
 call TestFiletype('yacc')
 call TestFiletype('zimbu')
-call TestFiletype('zimbutempl')
 call TestFiletype('z8a')
 call TestFiletype('apachestyle')
 call TestFiletype('asterisk')
@@ -639,7 +632,6 @@ call TestFiletype('fvwm')
 call TestFiletype('logcheck')
 call TestFiletype('svn')
 call TestFiletype('text')
-call TestFiletype('pullrequest')
 call TestFiletype('xf86conf')
 call TestFiletype('xpm')
 call TestFiletype('xpm2')
@@ -648,7 +640,7 @@ call TestFiletype('mint')
 call TestFiletype('jsonc')
 call TestFiletype('gleam')
 call TestFiletype('hjson')
-call TestFiletype('i3config')
+call TestFiletype('swayconfig')
 call TestFiletype('just')
 call TestFiletype('nftables')
 call TestFiletype('openscad')

From 4d4aa5fe553a47ef5c5c6d0a97bb487fdfda2d5b Mon Sep 17 00:00:00 2001
From: John Karahalis <john.karahalis@gmail.com>
Date: Fri, 10 Sep 2021 07:52:11 -0400
Subject: [PATCH 275/299] Update README to clarify broader Docker support
 (#745)

The ekalinin/Dockerfile.vim plugin supports not only docker-compose
files, but also Dockerfile files. Therefore, I think it is more accurate
to say that vim-polyglot supports Docker in general.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7b66e496e..53451d468 100644
--- a/README.md
+++ b/README.md
@@ -70,7 +70,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [dart](https://github.com/dart-lang/dart-vim-plugin) (Dart syntax highlighting for dart and drt files)
 - [dhall](https://github.com/vmchale/dhall-vim) (Dhall syntax highlighting for dhall files)
 - [dlang](https://github.com/JesseKPhillips/d.vim) (D syntax highlighting for d, di, lst, dd, ddoc and sdl files)
-- [docker-compose](https://github.com/ekalinin/Dockerfile.vim)
+- [docker](https://github.com/ekalinin/Dockerfile.vim)
 - [elixir](https://github.com/elixir-lang/vim-elixir) (Elixir and HTML+EEX syntax highlighting for ex, exs, eex, html.leex and leex files)
 - [elm](https://github.com/andys8/vim-elm-syntax) (Elm syntax highlighting for elm files)
 - [emberscript](https://github.com/yalesov/vim-ember-script) (EmberScript syntax highlighting for em and emberscript files)

From 918610d427503c5c7b380eae4a954bd8cb427db5 Mon Sep 17 00:00:00 2001
From: NariyasuHeseri <31871512+NariyasuHeseri@users.noreply.github.com>
Date: Mon, 22 Nov 2021 08:54:40 +0900
Subject: [PATCH 276/299] Put shebang detection function in `s:` instead of
 `b:` (#746)

Fixes #743
---
 autoload/polyglot/init.vim | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 0f3244531..fcba050f8 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -2672,11 +2672,16 @@ endif
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 
-func! s:Observe(fn)
-  let b:PolyglotObserve = function("polyglot#" . a:fn)
+let s:detect_func = 'shebang#Detect'
+
+func! s:PolyglotObserve(fn)
+  call function("polyglot#" . a:fn)
+endfunc
+
+func! s:Observe()
   augroup polyglot-observer
     au!
-    au CursorHold,CursorHoldI <buffer> if (&ft == "" || &ft == "conf") | call b:PolyglotObserve() | endif
+    au CursorHold,CursorHoldI <buffer> if (&ft == "" || &ft == "conf") | call s:PolyglotObserve(s:detect_func) | endif
   augroup END
 endfunc
 
@@ -2684,7 +2689,7 @@ au BufNewFile,BufRead,StdinReadPost,BufWritePost * if (&ft == "" || &ft == "conf
   \ call polyglot#shebang#Detect() | endif
 
 au BufWinEnter * if &ft == "" && expand("<afile>:e") == "" |
-  \ call s:Observe('shebang#Detect') | endif
+  \ call s:Observe() | endif
 
 au BufWritePost * au! polyglot-observer
 

From 87a26c5bf169bafbee837e2323f24cfb07e35250 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 21 Dec 2021 14:41:23 +0100
Subject: [PATCH 277/299] Update

---
 README.md                         |   15 +-
 after/compiler/tex.vim            |    2 +-
 after/ftplugin/requirements.vim   |    2 +
 after/ftplugin/tex.vim            |    2 +-
 after/indent/tex.vim              |    2 +-
 after/syntax/rescript/graphql.vim |   42 +
 after/syntax/zsh.vim              |  126 ---
 autoload/ada.vim                  |    6 +-
 autoload/clojurecomplete.vim      |    4 +-
 autoload/csv.vim                  |    2 +-
 autoload/fsharp.vim               |   65 +-
 autoload/go/config.vim            |    4 +
 autoload/julia_blocks.vim         |   10 +-
 autoload/nim.vim                  |    6 +-
 autoload/polyglot/ft.vim          |   46 +-
 autoload/polyglot/init.vim        |   70 +-
 autoload/polyglot/sleuth.vim      |   16 +-
 autoload/smt2/parser.vim          |    2 +-
 autoload/unison.vim               |  108 +++
 compiler/ledger.vim               |    4 +-
 compiler/powershell.vim           |   24 +-
 extras/filetype.vim               |  106 ++-
 ftplugin/8th.vim                  |   10 +-
 ftplugin/aap.vim                  |   13 +-
 ftplugin/clojure.vim              |    4 +-
 ftplugin/diff.vim                 |   11 +-
 ftplugin/dosini.vim               |    2 +-
 ftplugin/dune.vim                 |    4 +-
 ftplugin/erlang.vim               |   22 +
 ftplugin/git.vim                  |   45 -
 ftplugin/gitcommit.vim            |   46 +-
 ftplugin/gitrebase.vim            |   13 +-
 ftplugin/indent.vim               |    7 +-
 ftplugin/kotlin.vim               |   21 +
 ftplugin/mail.vim                 |   10 +-
 ftplugin/meson.vim                |   23 +-
 ftplugin/nginx.vim                |    4 +
 ftplugin/nsis.vim                 |    4 +-
 ftplugin/oasis.vim                |    6 +
 ftplugin/ocaml.vim                |   38 +-
 ftplugin/ocamlbuild_tags.vim      |    6 +
 ftplugin/omake.vim                |    2 +
 ftplugin/ruby.vim                 |   40 +-
 ftplugin/sexplib.vim              |    2 +
 ftplugin/systemverilog.vim        |    2 +-
 ftplugin/toml.vim                 |   14 +-
 ftplugin/unison.vim               |   11 +
 ftplugin/vb.vim                   |   82 +-
 ftplugin/zig.vim                  |    8 +-
 ftplugin/zimbu.vim                |   61 +-
 indent/ada.vim                    |    2 +-
 indent/ansible.vim                |   26 +-
 indent/cdl.vim                    |   15 +-
 indent/clojure.vim                |   13 +-
 indent/cobol.vim                  |    3 +
 indent/config.vim                 |   17 +-
 indent/css.vim                    |   12 +-
 indent/dosbatch.vim               |    4 +-
 indent/dtd.vim                    |   15 +-
 indent/dune.vim                   |    2 +
 indent/dylan.vim                  |    3 +-
 indent/erlang.vim                 |    2 +
 indent/eterm.vim                  |    9 +-
 indent/framescript.vim            |    9 +-
 indent/haml.vim                   |    2 +
 indent/hamster.vim                |   21 +-
 indent/javascript.vim             |    2 +-
 indent/julia.vim                  |    2 +
 indent/kotlin.vim                 |   11 +-
 indent/ld.vim                     |    9 +-
 indent/lifelines.vim              |    2 +-
 indent/mail.vim                   |    4 +-
 indent/make.vim                   |    9 +-
 indent/meson.vim                  |    2 +
 indent/nginx.vim                  |    2 +
 indent/nsis.vim                   |    4 +-
 indent/ocaml.vim                  |    3 +
 indent/occam.vim                  |    3 +-
 indent/pascal.vim                 |   15 +-
 indent/postscr.vim                |    7 +-
 indent/pov.vim                    |    2 +-
 indent/prolog.vim                 |    7 +-
 indent/readline.vim               |    9 +-
 indent/rust.vim                   |    2 +
 indent/sdl.vim                    |    4 +-
 indent/svelte.vim                 |    2 +-
 indent/systemverilog.vim          |    4 +-
 indent/tcl.vim                    |    8 +-
 indent/teraterm.vim               |    4 +-
 indent/treetop.vim                |    2 +-
 indent/verilog.vim                |    4 +-
 indent/zimbu.vim                  |    4 +-
 packages.yaml                     |    5 -
 syntax/8th.vim                    |  535 ++++++-----
 syntax/abel.vim                   |    2 +-
 syntax/ada.vim                    |    2 +-
 syntax/ahdl.vim                   |    2 +-
 syntax/aspvbs.vim                 |   10 +-
 syntax/autoit.vim                 |    3 +-
 syntax/basic/identifiers.vim      |    2 +-
 syntax/basic/literal.vim          |    2 +-
 syntax/cfg.vim                    |    2 +-
 syntax/clojure.vim                |   37 +-
 syntax/csc.vim                    |    2 +-
 syntax/css.vim                    |   54 +-
 syntax/cupl.vim                   |    2 +-
 syntax/debchangelog.vim           |    5 +-
 syntax/debsources.vim             |    5 +-
 syntax/django.vim                 |    3 +-
 syntax/dosbatch.vim               |    2 +-
 syntax/elixir.vim                 |    1 +
 syntax/focexec.vim                |    2 +-
 syntax/forth.vim                  |    2 +-
 syntax/gdb.vim                    |   13 +-
 syntax/git.vim                    |   36 +-
 syntax/gitcommit.vim              |   91 +-
 syntax/gitrebase.vim              |   12 +-
 syntax/glsl.vim                   |    1 +
 syntax/go.vim                     |   16 +-
 syntax/hamster.vim                |    2 +-
 syntax/helm.vim                   |    2 +-
 syntax/help.vim                   |    2 +-
 syntax/indent.vim                 |    9 +-
 syntax/iss.vim                    |    4 +-
 syntax/kotlin.vim                 |   47 +-
 syntax/lisp.vim                   |   26 +-
 syntax/meson.vim                  |   16 +-
 syntax/nim.vim                    |    1 +
 syntax/nsis.vim                   |   42 +-
 syntax/ocaml.vim                  |    1 +
 syntax/odin.vim                   |    4 +-
 syntax/pgsql.vim                  | 1471 +++++++++++++++--------------
 syntax/postscr.vim                |   12 +-
 syntax/rst.vim                    |   36 +-
 syntax/ruby.vim                   |    6 +-
 syntax/sml.vim                    |    7 +-
 syntax/spup.vim                   |    6 +-
 syntax/st.vim                     |    4 +-
 syntax/swift.vim                  |    2 +
 syntax/tcl.vim                    |   24 +-
 syntax/texinfo.vim                |  406 +-------
 syntax/tmux.vim                   |   28 +-
 syntax/toml.vim                   |   55 +-
 syntax/vb.vim                     |   84 +-
 syntax/vlang.vim                  |   16 +-
 syntax/xpm.vim                    |    7 +-
 syntax/yats/es6-array.vim         |    6 +-
 syntax/yats/es6-object.vim        |    2 +-
 syntax/yats/es6-promise.vim       |    2 +-
 syntax/yats/es6-regexp.vim        |    2 +-
 syntax/yats/es6-string.vim        |    6 +-
 syntax/yats/es6-symbol.vim        |    2 +-
 syntax/zig.vim                    |    7 +-
 tests/filetypes.vim               |   18 +-
 154 files changed, 2479 insertions(+), 2192 deletions(-)
 create mode 100644 after/syntax/rescript/graphql.vim
 delete mode 100644 after/syntax/zsh.vim
 create mode 100644 autoload/unison.vim
 delete mode 100644 ftplugin/git.vim
 create mode 100644 ftplugin/unison.vim

diff --git a/README.md b/README.md
index 53451d468..2ded4872b 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->598<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->597<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -53,7 +53,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [autohotkey](https://github.com/hnamikaw/vim-autohotkey) (AutoHotkey syntax highlighting for ahk and ahkl files)
 - [blade](https://github.com/jwalton512/vim-blade) (Blade syntax highlighting for blade and blade.php files)
 - [brewfile](https://github.com/bfontaine/Brewfile.vim)
-- [c/c++](https://github.com/vim-jp/vim-cpp) (C++ and C syntax highlighting for cpp, c++, cc, cp, cxx and 17 more files)
+- [c/c++](https://github.com/vim-jp/vim-cpp) (C++ and C syntax highlighting for cpp, c++, cc, cp, cxx and 18 more files)
 - [caddyfile](https://github.com/isobit/vim-caddyfile)
 - [carp](https://github.com/hellerve/carp-vim) (Syntax highlighting for carp files)
 - [cjsx](https://github.com/mtscout6/vim-cjsx)
@@ -70,8 +70,8 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [dart](https://github.com/dart-lang/dart-vim-plugin) (Dart syntax highlighting for dart and drt files)
 - [dhall](https://github.com/vmchale/dhall-vim) (Dhall syntax highlighting for dhall files)
 - [dlang](https://github.com/JesseKPhillips/d.vim) (D syntax highlighting for d, di, lst, dd, ddoc and sdl files)
-- [docker](https://github.com/ekalinin/Dockerfile.vim)
-- [elixir](https://github.com/elixir-lang/vim-elixir) (Elixir and HTML+EEX syntax highlighting for ex, exs, eex, html.leex and leex files)
+- [docker-compose](https://github.com/ekalinin/Dockerfile.vim)
+- [elixir](https://github.com/elixir-lang/vim-elixir) (Elixir and HTML+EEX syntax highlighting for ex, exs, eex, html.heex, html.leex and leex files)
 - [elm](https://github.com/andys8/vim-elm-syntax) (Elm syntax highlighting for elm files)
 - [emberscript](https://github.com/yalesov/vim-ember-script) (EmberScript syntax highlighting for em and emberscript files)
 - [emblem](https://github.com/yalesov/vim-emblem) (Syntax highlighting for emblem and em files)
@@ -85,7 +85,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [git](https://github.com/tpope/vim-git) (Git Config syntax highlighting for gitconfig files)
 - [gitignore](https://github.com/SirJson/fzf-gitignore)
 - [gleam](https://github.com/gleam-lang/gleam.vim) (Syntax highlighting for gleam files)
-- [glsl](https://github.com/tikhomirov/vim-glsl) (GLSL syntax highlighting for glsl, fp, frag, frg, fs and 16 more files)
+- [glsl](https://github.com/tikhomirov/vim-glsl) (GLSL syntax highlighting for glsl, fp, frag, frg, fs and 18 more files)
 - [gmpl](https://github.com/maelvalais/gmpl.vim) (Syntax highlighting for mod files)
 - [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting) (Gnuplot syntax highlighting for gp, gnu, gnuplot, p, plot, plt and gpi files)
 - [go](https://github.com/fatih/vim-go) (Go syntax highlighting for go and tmpl files)
@@ -113,7 +113,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [json](https://github.com/elzr/vim-json) (JSON syntax highlighting for json, avsc, geojson, gltf, har and 13 more files)
 - [jsonc](https://github.com/neoclide/jsonc.vim) (Syntax highlighting for cjson and jsonc files)
 - [jsonnet](https://github.com/google/vim-jsonnet) (Jsonnet syntax highlighting for jsonnet and libsonnet files)
-- [jst](https://github.com/briancollins/vim-jst) (EJS syntax highlighting for ejs, ect and jst files)
+- [jst](https://github.com/briancollins/vim-jst) (EJS syntax highlighting for ejs, ect, ejs.t and jst files)
 - [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (Syntax highlighting for jsx files)
 - [julia](https://github.com/JuliaEditorSupport/julia-vim) (Julia syntax highlighting for jl files)
 - [just](https://github.com/NoahTheDuke/vim-just) (Syntax highlighting for just files)
@@ -202,12 +202,11 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [velocity](https://github.com/lepture/vim-velocity) (Syntax highlighting for vm files)
 - [vue](https://github.com/posva/vim-vue) (Vue syntax highlighting for vue and wpy files)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (Syntax highlighting for xdc files)
-- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 94 more files)
+- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 95 more files)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax) (XSLT syntax highlighting for xslt and xsl files)
 - [yard](https://github.com/noprompt/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting for zep files)
 - [zig](https://github.com/ziglang/zig.vim) (Zig syntax highlighting for zir, zig and zir files)
-- [zinit](https://github.com/zinit-zsh/zplugin-vim-syntax)
 <!--/Language Packs-->
 
 ## Updating
diff --git a/after/compiler/tex.vim b/after/compiler/tex.vim
index d6038c2b3..575c6684a 100644
--- a/after/compiler/tex.vim
+++ b/after/compiler/tex.vim
@@ -22,7 +22,7 @@ endif
 if exists('b:tex_ignore_makefile') || exists('g:tex_ignore_makefile') ||
 			\(!filereadable('Makefile') && !filereadable('makefile'))
 	" If buffer-local variable 'tex_flavor' exists, it defines TeX flavor,
-	" otherwize the same for global variable with same name, else it will be
+	" otherwise the same for global variable with same name, else it will be
 	" LaTeX
 	if exists("b:tex_flavor")
 		let current_compiler = b:tex_flavor
diff --git a/after/ftplugin/requirements.vim b/after/ftplugin/requirements.vim
index 6c3e1d244..5097952c3 100644
--- a/after/ftplugin/requirements.vim
+++ b/after/ftplugin/requirements.vim
@@ -37,4 +37,6 @@ if executable('pip-compile')
         setlocal makeprg=pip-compile\ %
     endif
 endif
+
+setlocal commentstring=#\ %s
 " vim: et sw=4 ts=4 sts=4:
diff --git a/after/ftplugin/tex.vim b/after/ftplugin/tex.vim
index e28983213..31542d040 100644
--- a/after/ftplugin/tex.vim
+++ b/after/ftplugin/tex.vim
@@ -32,7 +32,7 @@ let &l:define .= '\|\\\(re\)\=new\(boolean\|command\|counter\|environment\|font'
 
 " Tell Vim how to recognize LaTeX \include{foo} and plain \input bar :
 let &l:include .= '\|\\include{'
-" On some file systems, "{" and "}" are inluded in 'isfname'.  In case the
+" On some file systems, "{" and "}" are included in 'isfname'.  In case the
 " TeX file has \include{fname} (LaTeX only), strip everything except "fname".
 let &l:includeexpr = "substitute(v:fname, '^.\\{-}{\\|}.*', '', 'g')"
 
diff --git a/after/indent/tex.vim b/after/indent/tex.vim
index cbb4f01b3..79eb76090 100644
--- a/after/indent/tex.vim
+++ b/after/indent/tex.vim
@@ -292,7 +292,7 @@ function! GetTeXIndent() " {{{
             let ind = ind - shiftwidth()
             let stay = 0
         endif
-        " lines following to '\item' are intented once again:
+        " lines following to '\item' are indented once again:
         if line =~ g:tex_items
             let ind = ind + shiftwidth()
             let stay = 0
diff --git a/after/syntax/rescript/graphql.vim b/after/syntax/rescript/graphql.vim
new file mode 100644
index 000000000..f78913387
--- /dev/null
+++ b/after/syntax/rescript/graphql.vim
@@ -0,0 +1,42 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/rescript/graphql.vim')
+  finish
+endif
+
+" Copyright (c) 2016-2021 Jon Parise <jon@indelible.org>
+"
+" Permission is hereby granted, free of charge, to any person obtaining a copy
+" of this software and associated documentation files (the "Software"), to
+" deal in the Software without restriction, including without limitation the
+" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+" sell copies of the Software, and to permit persons to whom the Software is
+" furnished to do so, subject to the following conditions:
+"
+" The above copyright notice and this permission notice shall be included in
+" all copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+" IN THE SOFTWARE.
+"
+" Language: GraphQL
+" Maintainer: Jon Parise <jon@indelible.org>
+
+if exists('b:current_syntax')
+  let s:current_syntax = b:current_syntax
+  unlet b:current_syntax
+endif
+
+let b:graphql_nested_syntax = 1
+syn include @GraphQLSyntax syntax/graphql.vim
+unlet b:graphql_nested_syntax
+
+if exists('s:current_syntax')
+  let b:current_syntax = s:current_syntax
+endif
+
+syntax region graphqlExtensionPoint start=+%graphql(+ end=+)+ contains=graphqlExtensionPointS
+syntax region graphqlExtensionPointS matchgroup=String start=+`+ end=+`+ contains=@GraphQLSyntax contained
diff --git a/after/syntax/zsh.vim b/after/syntax/zsh.vim
deleted file mode 100644
index cf4f92462..000000000
--- a/after/syntax/zsh.vim
+++ /dev/null
@@ -1,126 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'zinit', 'after/syntax/zsh.vim')
-  finish
-endif
-
-" Copyright (c) 2019 Sebastian Gniazdowski
-"
-" Syntax highlighting for Zinit commands in any file of type `zsh'.
-" It adds definitions for the Zinit syntax to the ones from the
-" existing zsh.vim definitions-file.
-
-" Main Zinit command.
-" Should be the only TOP rule for the whole syntax.
-syntax match ZinitCommand     /\<zinit\>\s/me=e-1
-            \ skipwhite
-            \ nextgroup=ZinitSubCommands,ZinitPluginSubCommands,ZinitSnippetSubCommands
-            \ contains=ZinitSubCommands,ZinitPluginSubCommands,ZinitSnippetSubCommands
-
-" TODO: add options for e.g. light
-syntax match ZinitSubCommands /\s\<\%(ice\|compinit\|env-whitelist\|cdreplay\|cdclear\|update\)\>\s/ms=s+1,me=e-1
-            \ contained
-
-syntax match ZinitPluginSubCommands /\s\<\%(light\|load\)\>\s/ms=s+1,me=e-1
-            \ skipwhite nextgroup=ZinitPlugin1,ZinitPlugin2,ZinitPlugin3
-            \ contains=ZinitPlugin1,ZinitPlugin2,ZinitPlugin3
-
-syntax match ZinitSnippetSubCommands /\s\<\%(snippet\)\>\s/ms=s+1,me=e-1
-            \ skipwhite
-            \ nextgroup=ZinitSnippetShorthands1,ZinitSnippetShorthands2
-            \ contains=ZinitSnippetShorthands1,ZinitSnippetShorthands2
-
-" "user/plugin"
-syntax match ZinitPlugin1 /\s["]\%([!-_]*\%(\/[!-_]\+\)\+\|[!-_]\+\)["]/ms=s+1,hs=s+2,he=e-1
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-" 'user/plugin'
-syntax match ZinitPlugin2 /\s[']\%([!-_]*\%(\/[!-_]\+\)\+\|[!-_]\+\)[']/ms=s+1,hs=s+2,he=e-1
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-" user/plugin
-syntax match ZinitPlugin3 /\s\%([!-_]*\%(\/[!-_]\+\)\+\|[!-_]\+\)/ms=s+1,me=e+2 
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-" OMZ:: or PZT::
-" TODO: 'OMZ:: or 'PZT::
-syntax match ZinitSnippetShorthands1 /\s\<\%(\%(OMZ\|PZT\)\>::\|\)/hs=s+1,he=e-2
-            \ contained
-            \ skipwhite
-            \ nextgroup=ZinitSnippetUrl1,ZinitSnippetUrl2
-            \ contains=ZinitSnippetUrl1,ZinitSnippetUrl2
-
-" "OMZ:: or "PZT::
-syntax match ZinitSnippetShorthands2 /\s["]\%(\%(OMZ\|PZT\)\>::\|\)/hs=s+2,he=e-2
-            \ contained
-            \ skipwhite
-            \ nextgroup=ZinitSnippetUrl3,ZinitSnippetUrl4
-            \ contains=ZinitSnippetUrl3,ZinitSnippetUrl4
-
-syntax match ZinitSnippetUrl3 /\<\%(http:\/\/\|https:\/\/\|ftp:\/\/\|\$HOME\|\/\)[!-_]\+\%(\/[!-_]\+\)*\/\?["]/he=e-1
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-" TODO: Fix ZinitTrailingWhiteSpace not matching
-syntax match ZinitSnippetUrl4 /\%(\%(OMZ\|PZT\)::\)[!-_]\+\%(\/[!-_]\+\)*\/\?["]/hs=s+5,he=e-1
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-" http://… or https://… or ftp://… or $HOME/… or /…
-" TODO: Fix $HOME/… and /… not matching
-syntax match ZinitSnippetUrl1 /\<\%(http:\/\/\|https:\/\/\|ftp:\/\/\|\$HOME\|\/\)[!-_]\+\%(\/[!-_]\+\)*\/\?/
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-" TODO: Fix ZinitTrailingWhiteSpace not matching
-syntax match ZinitSnippetUrl2 /\<\%(\%(OMZ\|PZT\)::\)[!-_]\+\%(\/[!-_]\+\)*\/\?/hs=s+5
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-syntax match ZinitTrailingWhiteSpace /[[:space:]]\+$/ contained
-
-" TODO: differentiate the no-value ices
-" TODO: use contained
-syntax match ZinitIceSubCommand /\sice\s/ms=s+1,me=e-1 nextgroup=ZinitIceModifiers
-syntax match ZinitIceModifiers  /\s\<\%(svn\|proto\|from\|teleid\|bindmap\|cloneopts\|id-as\|depth\|if\|wait\|load\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(unload\|blockf\|on-update-of\|subscribe\|pick\|bpick\|src\|as\|ver\|silent\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(lucid\|notify\|mv\|cp\|atinit\|atclone\|atload\|atpull\|nocd\|run-atpull\|has\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(cloneonly\|make\|service\|trackbinds\|multisrc\|compile\|nocompile\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(nocompletions\|reset-prompt\|wrap-track\|reset\|aliases\|sh\|bash\|ksh\|csh\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(\\!sh\|!sh\|\\!bash\|!bash\|\\!ksh\|!ksh\|\\!csh\|!csh\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(blockf\|silent\|lucid\|trackbinds\|cloneonly\|nocd\|run-atpull\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(\|sh\|\!sh\|bash\|\!bash\|ksh\|\!ksh\|csh\|\!csh\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(nocompletions\|svn\|aliases\|trigger-load\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(light-mode\|is-snippet\|countdown\|ps-on-unload\|ps-on-update\)\>/ms=s+1
-            
-" Include also ices added by the existing annexes
-syntax match ZinitIceModifiers  /\s\<\%(test\|zman\|submod\|dl\|patch\|fbin\|sbin\|fsrc\|ferc\|fmod\|gem\|node\|rustup\|cargo\)\>/ms=s+1
-        
-" Additional Zsh and Zinit functions
-syntax match ZshAndZinitFunctions     /\<\%(compdef\|compinit\|zpcdreplay\|zpcdclear\|zpcompinit\|zpcompdef\)\>/
-
-" Link
-highlight def link ZshAndZinitFunctions    Keyword
-highlight def link ZinitCommand            Statement
-highlight def link ZinitSubCommands        Title
-highlight def link ZinitPluginSubCommands  Title
-highlight def link ZinitSnippetSubCommands Title
-highlight def link ZinitIceModifiers       Type
-highlight def link ZinitSnippetShorthands1 Keyword
-highlight def link ZinitSnippetShorthands2 Keyword
-highlight def link ZinitPlugin1            Macro
-highlight def link ZinitPlugin2            Macro
-highlight def link ZinitPlugin3            Macro
-highlight def link ZinitSnippetUrl1        Macro
-highlight def link ZinitSnippetUrl2        Macro
-highlight def link ZinitSnippetUrl3        Macro
-highlight def link ZinitSnippetUrl4        Macro
-highlight def link ZinitTrailingWhiteSpace Error
diff --git a/autoload/ada.vim b/autoload/ada.vim
index 792fc03f2..3d58cbb75 100644
--- a/autoload/ada.vim
+++ b/autoload/ada.vim
@@ -71,13 +71,13 @@ if exists ('g:ada_with_gnat_project_files')
     endfor
 endif
 
-" Section: add	standart exception {{{2
+" Section: add	standard exception {{{2
 "
 for Item in ['Constraint_Error', 'Program_Error', 'Storage_Error', 'Tasking_Error', 'Status_Error', 'Mode_Error', 'Name_Error', 'Use_Error', 'Device_Error', 'End_Error', 'Data_Error', 'Layout_Error', 'Length_Error', 'Pattern_Error', 'Index_Error', 'Translation_Error', 'Time_Error', 'Argument_Error', 'Tag_Error', 'Picture_Error', 'Terminator_Error', 'Conversion_Error', 'Pointer_Error', 'Dereference_Error', 'Update_Error']
     let g:ada#Keywords += [{
 	    \ 'word':  Item,
 	    \ 'menu':  'exception',
-	    \ 'info':  'Ada standart exception.',
+	    \ 'info':  'Ada standard exception.',
 	    \ 'kind':  'x',
 	    \ 'icase': 1}]
 endfor
@@ -214,7 +214,7 @@ function ada#Word (...)
    let l:Line = substitute (getline (l:Line_Nr), g:ada#Comment, '', '' )
 
    " Cope with tag searching for items in comments; if we are, don't loop
-   " backards looking for previous lines
+   " backwards looking for previous lines
    if l:Column_Nr > strlen(l:Line)
       " We were in a comment
       let l:Line = getline(l:Line_Nr)
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index ea2de4287..bc352ccb9 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -12,8 +12,8 @@ endif
 
 " -*- COMPLETION WORDS -*-
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-" Clojure version 1.10.2
-let s:words = ["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Inst","PrintWriter-on","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","any?","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc!","assoc","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case","case-fallthrough-err-impl","cast","cat","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj!","conj","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj!","disj","dissoc!","dissoc","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","if","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","new","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop!","pop","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","quote","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set!","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
+" Clojure version 1.10.3
+let s:words = ["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Inst","PrintWriter-on","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","any?","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc!","assoc","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case","cast","cat","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj!","conj","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj!","disj","dissoc!","dissoc","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","if","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","new","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop!","pop","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","quote","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set!","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
 
 " Simple word completion for special forms and public vars in clojure.core
 function! clojurecomplete#Complete(findstart, base)
diff --git a/autoload/csv.vim b/autoload/csv.vim
index 36a65dd3e..34943bc77 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -2724,7 +2724,7 @@ fu! csv#Tabularize(bang, first, last) "{{{3
     if getline(a:first)[-1:] isnot? b:delimiter
         let b:col_width[-1] += 1
     endif
-    let marginline = s:td.scol. join(map(copy(b:col_width), 'repeat(s:td.hbar, v:val)'), s:td.cros). s:td.ecol
+    let marginline = s:td.scol. join(map(copy(b:col_width), 'repeat(s:td.hbar, v:val-1)'), s:td.cros). s:td.ecol
 
     call csv#NewDelimiter(s:td.vbar, 1, line('$'))
     "exe printf('sil %d,%ds/%s/%s/ge', a:first, (a:last+adjust_last),
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index d18f2bbcd..5d8bb79d1 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -3,7 +3,6 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'fsharp', 'autoload/fsharp.vim
 endif
 
 " Vim autoload functions
-
 if exists('g:loaded_autoload_fsharp')
     finish
 endif
@@ -240,14 +239,6 @@ function! fsharp#loadConfig()
 
     if !exists('g:fsharp#fsautocomplete_command')
         let s:fsac = fnamemodify(s:script_root_dir . "fsac/fsautocomplete.dll", ":p")
-
-        " check if FSAC exists
-        if empty(glob(s:fsac))
-            echoerr "FSAC not found. :FSharpUpdateFSAC to download."
-            let &cpo = s:cpo_save
-            finish
-        endif
-
         let g:fsharp#fsautocomplete_command =
             \ ['dotnet', s:fsac,
                 \ '--background-service-enabled'
@@ -331,6 +322,29 @@ function! fsharp#loadConfig()
         endif
     endif
 
+    " FSI keymaps
+    if g:fsharp#fsi_keymap == "vscode"
+        if has('nvim')
+            let g:fsharp#fsi_keymap_send   = "<M-cr>"
+            let g:fsharp#fsi_keymap_toggle = "<M-@>"
+        else
+            let g:fsharp#fsi_keymap_send   = "<esc><cr>"
+            let g:fsharp#fsi_keymap_toggle = "<esc>@"
+        endif
+    elseif g:fsharp#fsi_keymap == "vim-fsharp"
+        let g:fsharp#fsi_keymap_send   = "<leader>i"
+        let g:fsharp#fsi_keymap_toggle = "<leader>e"
+    elseif g:fsharp#fsi_keymap == "custom"
+        let g:fsharp#fsi_keymap = "none"
+        if !exists('g:fsharp#fsi_keymap_send')
+            echoerr "g:fsharp#fsi_keymap_send is not set"
+        elseif !exists('g:fsharp#fsi_keymap_toggle')
+            echoerr "g:fsharp#fsi_keymap_toggle is not set"
+        else
+            let g:fsharp#fsi_keymap = "custom"
+        endif
+    endif
+
     let s:config_is_loaded = 1
 endfunction
 
@@ -398,39 +412,6 @@ endfunction
 
 " .NET/F# specific operations
 
-function! s:findWorkspace(dir, cont)
-    let s:cont_findWorkspace = a:cont
-    function! s:callback_findWorkspace(result)
-        let result = a:result
-        let content = json_decode(result.result.content)
-        if len(content.Data.Found) < 1
-            return []
-        endif
-        let workspace = { 'Type': 'none' }
-        for found in content.Data.Found
-            if workspace.Type == 'none'
-                let workspace = found
-            elseif found.Type == 'solution'
-                if workspace.Type == 'project'
-                    let workspace = found
-                else
-                    let curLen = len(workspace.Data.Items)
-                    let newLen = len(found.Data.Items)
-                    if newLen > curLen
-                        let workspace = found
-                    endif
-                endif
-            endif
-        endfor
-        if workspace.Type == 'solution'
-            call s:cont_findWorkspace([workspace.Data.Path])
-        else
-            call s:cont_findWorkspace(workspace.Data.Fsprojs)
-        endif
-    endfunction
-    call s:workspacePeek(a:dir, g:fsharp#workspace_mode_peek_deep_level, g:fsharp#exclude_project_directories, function("s:callback_findWorkspace"))
-endfunction
-
 let s:workspace = []
 
 function! fsharp#handle_notifyWorkspace(payload) abort
diff --git a/autoload/go/config.vim b/autoload/go/config.vim
index f7389cdce..0ee1466fe 100644
--- a/autoload/go/config.vim
+++ b/autoload/go/config.vim
@@ -215,6 +215,10 @@ function! go#config#DebugWindows() abort
 
 endfunction
 
+function! go#config#DebugSubstitutePaths() abort
+  return get(g:, 'go_debug_substitute_paths', [])
+endfunction
+
 function! go#config#DebugPreserveLayout() abort
   return get(g:, 'go_debug_preserve_layout', 0)
 endfunction
diff --git a/autoload/julia_blocks.vim b/autoload/julia_blocks.vim
index 6a0c05c97..11bbb4354 100644
--- a/autoload/julia_blocks.vim
+++ b/autoload/julia_blocks.vim
@@ -339,7 +339,7 @@ function! s:on_begin()
   let [l,c] = [line('.'), col('.')]
   normal! ^
   let patt = '\%<'.(c+1).'c\(' . b:julia_begin_keywordsm . '\)\%>'.(c-1).'c'
-  let n = search(patt, 'Wnc', l)
+  let n = search('\C' . patt, 'Wnc', l)
   call cursor(l, c)
   return n > 0
 endfunction
@@ -350,7 +350,7 @@ function! s:matchit()
 endfunction
 
 function! s:move_before_begin()
-  call search(b:julia_begin_keywordsm, 'Wbc')
+  call search('\C' . b:julia_begin_keywordsm, 'Wbc')
   normal! h
 endfunction
 
@@ -382,7 +382,7 @@ function! s:moveto_block_delim(toend, backwards, ...)
       normal! bh
     endif
     while 1
-      let searchret = search(pattern, flags)
+      let searchret = search('\C' . pattern, flags)
       if !searchret
 	return ret
       endif
@@ -473,7 +473,7 @@ function! s:moveto_currentblock_end()
     normal! b
   endif
 
-  let ret = searchpair(b:julia_begin_keywordsm, '', b:julia_end_keywords, flags, b:match_skip)
+  let ret = searchpair('\C' . b:julia_begin_keywordsm, '', '\C' . b:julia_end_keywords, flags, b:match_skip)
   if ret <= 0
     return s:abort()
   endif
@@ -679,7 +679,7 @@ function! s:find_block(current_mode)
     normal! l
     normal! b
   endif
-  let searchret = searchpair(b:julia_begin_keywordsm, '', b:julia_end_keywords, flags, b:match_skip)
+  let searchret = searchpair('\C' . b:julia_begin_keywordsm, '', '\C' . b:julia_end_keywords, flags, b:match_skip)
   if searchret <= 0
     if !b:jlblk_did_select
       return s:abort()
diff --git a/autoload/nim.vim b/autoload/nim.vim
index c0faf6e13..7f55f25f9 100644
--- a/autoload/nim.vim
+++ b/autoload/nim.vim
@@ -23,8 +23,8 @@ fun! nim#init() abort
   if !v:shell_error && expand('%:e') ==# 'nim'
     let false = 0 " Needed for eval of json
     let true = 1 " Needed for eval of json
-    let dumpdata = eval(substitute(raw_dumpdata, "\n", '', 'g'))
-    
+    let dumpdata = json_decode(raw_dumpdata)
+
     let b:nim_project_root = dumpdata['project_path']
     let b:nim_defined_symbols = dumpdata['defined_symbols']
     let b:nim_caas_enabled = g:nim_caas_enabled || index(dumpdata['defined_symbols'], 'forcecaas') != -1
@@ -211,7 +211,9 @@ fun! GotoDefinition_nim_ready(def_output) abort
   let defBits = split(rawDef, '\t')
   let file = defBits[4]
   let line = defBits[5]
+  let column = defBits[6]
   exe printf('e +%d %s', line, file)
+  call cursor(line, column + 1)
   return 1
 endf
 
diff --git a/autoload/polyglot/ft.vim b/autoload/polyglot/ft.vim
index e4c324158..56012da15 100644
--- a/autoload/polyglot/ft.vim
+++ b/autoload/polyglot/ft.vim
@@ -1,7 +1,7 @@
 " Vim functions for file type detection
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Aug 17
+" Last Change:	2021 Nov 27
 
 " These functions are moved here from runtime/filetype.vim to make startup
 " faster.
@@ -219,6 +219,23 @@ func polyglot#ft#FTe()
   endif
 endfunc
 
+" Distinguish between Forth and F#.
+" Provided by Doug Kearns.
+func polyglot#ft#FTfs()
+  if exists("g:filetype_fs")
+    exe "setf " . g:filetype_fs
+  else
+    let line = getline(nextnonblank(1))
+    " comments and colon definitions
+    if line =~ '^\s*\.\=( ' || line =~ '^\s*\\G\= ' || line =~ '^\\$'
+	  \ || line =~ '^\s*: \S'
+      setf forth
+    else
+      setf fsharp
+    endif
+  endif
+endfunc
+
 " Distinguish between HTML, XHTML and Django
 func polyglot#ft#FThtml()
   let n = 1
@@ -269,7 +286,10 @@ func polyglot#ft#FTm()
     return
   endif
 
-  let octave_block_terminators = '\<end\%(_try_catch\|classdef\|enumeration\|events\|for\|function\|if\|methods\|parfor\|properties\|switch\|while\)\>'
+  " excluding end(for|function|if|switch|while) common to Murphi
+  let octave_block_terminators = '\<end\%(_try_catch\|classdef\|enumeration\|events\|methods\|parfor\|properties\)\>'
+
+  let objc_preprocessor = '^\s*#\s*\%(import\|include\|define\|if\|ifn\=def\|undef\|line\|error\|pragma\)\>'
 
   let n = 1
   let saw_comment = 0 " Whether we've seen a multiline comment leader.
@@ -281,12 +301,11 @@ func polyglot#ft#FTm()
       " anything more definitive.
       let saw_comment = 1
     endif
-    if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|//\)'
+    if line =~ '^\s*//' || line =~ '^\s*@import\>' || line =~ objc_preprocessor
       setf objc
       return
     endif
-    if line =~ '^\s*\%(#\|%!\|[#%]{\=\s*$\)' ||
-	  \ line =~ '^\s*unwind_protect\>' ||
+    if line =~ '^\s*\%(#\|%!\)' || line =~ '^\s*unwind_protect\>' ||
 	  \ line =~ '\%(^\|;\)\s*' .. octave_block_terminators
       setf octave
       return
@@ -792,6 +811,23 @@ func polyglot#ft#Redif()
   endwhile
 endfunc
 
+" This function is called for all files under */debian/patches/*, make sure not
+" to non-dep3patch files, such as README and other text files.
+func polyglot#ft#Dep3patch()
+  if expand('%:t') ==# 'series'
+    return
+  endif
+
+  for ln in getline(1, 100)
+    if ln =~# '^\%(Description\|Subject\|Origin\|Bug\|Forwarded\|Author\|From\|Reviewed-by\|Acked-by\|Last-Updated\|Applied-Upstream\):'
+      setf dep3patch
+      return
+    elseif ln =~# '^---'
+      " end of headers found. stop processing
+      return
+    endif
+  endfor
+endfunc
 
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index fcba050f8..1457f11a6 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -1769,10 +1769,6 @@ if !has_key(g:polyglot_is_disabled, 'gitignore')
   au BufNewFile,BufRead *.git/info/exclude,*/.config/git/ignore,{.,}gitignore setf gitignore
 endif
 
-if !has_key(g:polyglot_is_disabled, 'tads')
-  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
-endif
-
 if !has_key(g:polyglot_is_disabled, 'prolog')
   au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
   au BufNewFile,BufRead *.pdb,*.pro,*.prolog,*.yap setf prolog
@@ -1787,7 +1783,7 @@ if !has_key(g:polyglot_is_disabled, 'odin')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'dosini')
-  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}npmrc,buildozer.spec setf dosini
+  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}flake8,{.,}npmrc,buildozer.spec setf dosini
   au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
   au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
 endif
@@ -1961,7 +1957,7 @@ if !has_key(g:polyglot_is_disabled, 'slim')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'sh')
-  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile setf sh
+  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}kshrc,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,kshrc,login,man,profile setf sh
   au BufNewFile,BufRead *.zsh,*/etc/zprofile,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
   au BufNewFile,BufRead .zsh* call s:StarSetf('zsh')
   au BufNewFile,BufRead .zlog* call s:StarSetf('zsh')
@@ -2011,13 +2007,6 @@ if !has_key(g:polyglot_is_disabled, 'raml')
   au BufNewFile,BufRead *.raml setf raml
 endif
 
-if !has_key(g:polyglot_is_disabled, 'raku')
-  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
-  au! BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
-  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
-  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 setf raku
-endif
-
 if !has_key(g:polyglot_is_disabled, 'ragel')
   au BufNewFile,BufRead *.rl setf ragel
 endif
@@ -2097,22 +2086,6 @@ if !has_key(g:polyglot_is_disabled, 'pgsql')
   au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
 endif
 
-if !has_key(g:polyglot_is_disabled, 'perl')
-  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
-  au! BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
-  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
-  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc setf perl
-  au BufNewFile,BufRead *.pod setf pod
-  au BufNewFile,BufRead *.comp,*.mason,*.mhtml setf mason
-  au! BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
-  au! BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
-  au BufNewFile,BufRead *.xs setf xs
-endif
-
-if !has_key(g:polyglot_is_disabled, 'rc')
-  au BufNewFile,BufRead *.rc,*.rch setf rc
-endif
-
 if !has_key(g:polyglot_is_disabled, 'opencl')
   au BufNewFile,BufRead *.cl,*.opencl setf opencl
 endif
@@ -2225,7 +2198,34 @@ if !has_key(g:polyglot_is_disabled, 'julia')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'jst')
-  au BufNewFile,BufRead *.ect,*.ejs,*.jst setf jst
+  au BufNewFile,BufRead *.ect,*.ejs,*.ejs.t,*.jst setf jst
+endif
+
+if !has_key(g:polyglot_is_disabled, 'tads')
+  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+endif
+
+if !has_key(g:polyglot_is_disabled, 'raku')
+  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead *.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl6,*.pm6,*.pod6,*.raku,*.rakudoc,*.rakumod,*.rakutest,*.t6 setf raku
+endif
+
+if !has_key(g:polyglot_is_disabled, 'perl')
+  au! BufNewFile,BufRead,BufWritePost *.t call polyglot#detect#T()
+  au! BufNewFile,BufRead,BufWritePost *.pm call polyglot#detect#Pm()
+  au! BufNewFile,BufRead,BufWritePost *.pl call polyglot#detect#Pl()
+  au BufNewFile,BufRead *.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.psgi,{.,}gitolite.rc,Makefile.PL,Rexfile,ack,cpanfile,example.gitolite.rc setf perl
+  au BufNewFile,BufRead *.pod setf pod
+  au BufNewFile,BufRead *.comp,*.mason,*.mhtml setf mason
+  au! BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
+  au! BufNewFile,BufRead,BufWritePost *.tt2 call polyglot#detect#Tt2()
+  au BufNewFile,BufRead *.xs setf xs
+endif
+
+if !has_key(g:polyglot_is_disabled, 'rc')
+  au BufNewFile,BufRead *.rc,*.rch setf rc
 endif
 
 if !has_key(g:polyglot_is_disabled, 'jsonnet')
@@ -2339,7 +2339,7 @@ endif
 
 if !has_key(g:polyglot_is_disabled, 'glsl')
   au! BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
-  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
+  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.rchit,*.rmiss,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
 endif
 
 if !has_key(g:polyglot_is_disabled, 'git')
@@ -2398,7 +2398,7 @@ endif
 
 if !has_key(g:polyglot_is_disabled, 'elixir')
   au BufNewFile,BufRead *.ex,*.exs,mix.lock setf elixir
-  au BufNewFile,BufRead *.eex,*.html.leex,*.leex setf eelixir
+  au BufNewFile,BufRead *.eex,*.html.heex,*.html.leex,*.leex setf eelixir
 endif
 
 if !has_key(g:polyglot_is_disabled, 'docker-compose')
@@ -2406,7 +2406,7 @@ if !has_key(g:polyglot_is_disabled, 'docker-compose')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'yaml')
-  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,fish_history,fish_read_history,glide.lock,yarn.lock setf yaml
+  au BufNewFile,BufRead *.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml,*.yml.mysql,{.,}clang-format,{.,}clang-tidy,{.,}gemrc,CITATION.cff,fish_history,fish_read_history,glide.lock,yarn.lock setf yaml
 endif
 
 if !has_key(g:polyglot_is_disabled, 'mysql')
@@ -2534,7 +2534,7 @@ endif
 
 if !has_key(g:polyglot_is_disabled, 'c/c++')
   au! BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
-  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.moc,*.tcc,*.tlh,*.tpp setf cpp
+  au BufNewFile,BufRead *.c++,*.cc,*.cp,*.cpp,*.cxx,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.ixx,*.moc,*.tcc,*.tlh,*.tpp setf cpp
   au! BufNewFile,BufRead,BufWritePost *.h call polyglot#detect#H()
   au BufNewFile,BufRead *.c,*.cats,*.idc,*.qc,*enlightenment/*.cfg setf c
 endif
@@ -2575,7 +2575,7 @@ if !has_key(g:polyglot_is_disabled, 'ant')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.hzp,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
 endif
 
 if !has_key(g:polyglot_is_disabled, 'csv')
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index e3c0752ec..9e943079c 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -85,7 +85,7 @@ let s:globs = {
   \ 'conf': '*.conf,auto.master,config',
   \ 'config': 'configure.in,configure.ac,Pipfile',
   \ 'context': '*.mkii,*.mkiv,*.mkvi',
-  \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh',
+  \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.ixx,*.tcc,*.tpp,*.moc,*.tlh',
   \ 'cql': '*.cql',
   \ 'crm': '*.crm',
   \ 'crontab': 'crontab,crontab.*',
@@ -129,7 +129,7 @@ let s:globs = {
   \ 'dnsmasq': '',
   \ 'dockerfile': '*.Dockerfile,*.dock,Containerfile,Dockerfile,dockerfile,Dockerfile*',
   \ 'dosbatch': '*.bat,*.sys',
-  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,buildozer.spec,.editorconfig,.npmrc,php.ini-*',
+  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,.flake8,buildozer.spec,.editorconfig,.npmrc,php.ini-*',
   \ 'dot': '*.dot,*.gv',
   \ 'dracula': '*.drac,*.drc,*lvs,*lpe,drac.*',
   \ 'dsdl': '*.sdl',
@@ -143,7 +143,7 @@ let s:globs = {
   \ 'ecd': '*.ecd',
   \ 'ecrystal': '*.ecr',
   \ 'edif': '*.ed\(f\|if\|o\)',
-  \ 'eelixir': '*.eex,*.html.leex,*.leex',
+  \ 'eelixir': '*.eex,*.html.heex,*.html.leex,*.leex',
   \ 'elf': '*.am',
   \ 'elinks': 'elinks.conf',
   \ 'elixir': '*.ex,*.exs,mix.lock',
@@ -190,7 +190,7 @@ let s:globs = {
   \ 'gitsendemail': '.gitsendemail.*',
   \ 'gkrellmrc': 'gkrellmrc,gkrellmrc_?',
   \ 'gleam': '*.gleam',
-  \ 'glsl': '*.glsl,*.fp,*.frag,*.frg,*.fs,*.fsh,*.fshader,*.geo,*.geom,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader,*.comp',
+  \ 'glsl': '*.glsl,*.fp,*.frag,*.frg,*.fs,*.fsh,*.fshader,*.geo,*.geom,*.glslf,*.glslv,*.gs,*.gshader,*.rchit,*.rmiss,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader,*.comp',
   \ 'gmpl': '*.mod',
   \ 'gnash': 'gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc',
   \ 'gnuplot': '*.gp,*.gnu,*.gnuplot,*.p,*.plot,*.plt,*.gpi',
@@ -265,7 +265,7 @@ let s:globs = {
   \ 'jsonc': '*.cjson,*.jsonc,coc-settings.json,.eslintrc.json,.babelrc,.jshintrc,.jslintrc,.mocharc.json,coffeelint.json,tsconfig.json,jsconfig.json',
   \ 'jsonnet': '*.jsonnet,*.libsonnet',
   \ 'jsp': '*.jsp',
-  \ 'jst': '*.ejs,*.ect,*.jst',
+  \ 'jst': '*.ejs,*.ect,*.ejs.t,*.jst',
   \ 'julia': '*.jl',
   \ 'just': '*.just,justfile',
   \ 'kconfig': 'Kconfig,Kconfig.debug,Kconfig.*',
@@ -480,7 +480,7 @@ let s:globs = {
   \ 'services': '',
   \ 'setserial': '',
   \ 'sexplib': '*.sexp',
-  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile',
+  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.kshrc,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,kshrc,login,man,profile',
   \ 'sieve': '*.siv,*.sieve',
   \ 'sil': '*.sil',
   \ 'simula': '*.sim',
@@ -611,7 +611,7 @@ let s:globs = {
   \ 'xhtml': '*.xhtml,*.xht',
   \ 'xinetd': '',
   \ 'xmath': '*.msc,*.msf',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.hzp,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
   \ 'xml.twig': '*.xml.twig',
   \ 'xmodmap': '*Xmodmap,*xmodmap*',
   \ 'xpm': '*.xpm,*.pm',
@@ -622,7 +622,7 @@ let s:globs = {
   \ 'xsl': '*.xslt,*.xsl',
   \ 'xslt': '*.xsl,*.xslt',
   \ 'yacc': '*.yy,*.yxx,*.y++',
-  \ 'yaml': '*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,.clang-format,.clang-tidy,.gemrc,glide.lock,yarn.lock,fish_history,fish_read_history',
+  \ 'yaml': '*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,.clang-format,.clang-tidy,.gemrc,CITATION.cff,glide.lock,yarn.lock,fish_history,fish_read_history',
   \ 'yaml.ansible': 'playbook.y{a,}ml,site.y{a,}ml,main.y{a,}ml,local.y{a,}ml,requirements.y{a,}ml,tasks.*.y{a,}ml,roles.*.y{a,}ml,handlers.*.y{a,}ml',
   \ 'yaml.docker-compose': 'docker-compose*.yaml,docker-compose*.yml',
   \ 'z8a': '*.z8a',
diff --git a/autoload/smt2/parser.vim b/autoload/smt2/parser.vim
index ef4068e5f..b9e4837f3 100644
--- a/autoload/smt2/parser.vim
+++ b/autoload/smt2/parser.vim
@@ -157,7 +157,7 @@ def ParseSExpr(scanner: dict<any>): dict<any>
     scanner->ParseLParen()
 
     # Expr*
-    var exprs: list<any>
+    var exprs: list<dict<any>>
     while scanner->AtStartOfExpr()
         exprs->add(scanner->ParseExpr())
     endwhile
diff --git a/autoload/unison.vim b/autoload/unison.vim
new file mode 100644
index 000000000..cdc2efe59
--- /dev/null
+++ b/autoload/unison.vim
@@ -0,0 +1,108 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'unison', 'autoload/unison.vim')
+  finish
+endif
+
+" Unison functionality for Vim, including type/term omnicompletion.
+"
+" Maintainer: Unison Computing
+" Original Author: Cody Allen (ceedubs)
+
+if exists('g:autoloaded_unison')
+  finish
+endif
+let g:autoloaded_unison = 1
+
+let s:required_config_value = "!REQUIRED!"
+
+" adapted from https://github.com/rust-lang/rust.vim/blob/4aa69b84c8a58fcec6b6dad6fe244b916b1cf830/autoload/rust.vim#L9-L18
+function! s:config(name, default) abort
+  let name = 'unison_' . a:name
+  " Local buffer variable with same name takes predeence over global
+  if has_key(b:, name)
+    return get(b:, name)
+  elseif has_key(g:, name)
+    return get(g:, name)
+  elseif a:default == s:required_config_value
+    throw 'Missing required configuration value: ' . name
+  else
+    return a:default
+  endif
+endfunction
+
+function! s:curl_path() abort
+  return s:config('curl_path', "curl")
+endfunction
+
+function! s:jq_path() abort
+  return s:config('jq_path', "jq")
+endfunction
+
+function! unison#SetBufferDefaults() abort
+  if s:config('set_buffer_defaults', 1)
+    " Since Unison completion is fuzzy and not prefix-based, 'longest' doesn't
+    " work well, and 'noinsert' behaves a little better.
+    setlocal completeopt=menuone,noinsert,preview
+
+    setlocal omnifunc=unison#Complete
+  endif
+endfunction
+
+" Unison completion satisfying the standard vim completion signature, such
+" that it can be assigned to omnifunc.
+" vim will first call this to find the base input that should be completed,
+" and then will call it again with the base input.
+function! unison#Complete(findstart, base) abort
+  if a:findstart
+    " locate the start of the word
+    let line = getline('.')
+    let start = col('.') - 1
+    while start > 0 && line[start - 1] !~ '\s' && line[start - 1] != '(' && line[start - 1] != ')'
+      let start -= 1
+    endwhile
+    return start
+  else
+    return unison#CompleteForBase(a:base)
+  endif
+endfunction
+
+" Return an array of completion items for the provided base input. For example
+" base could be 'List.foldL', in which case the top result would probably be
+" 'List.foldLeft'.
+function! unison#CompleteForBase(base) abort
+  let resultLimit = s:config('complete_result_limit', 20)
+  let apiHost = s:config('api_host', 'localhost')
+  let apiPort = s:config('api_port', s:required_config_value)
+  let apiToken = s:config('api_token', s:required_config_value)
+  let apiUri = 'http://' . apiHost . ':' . apiPort . '/' . apiToken . '/api/find'
+
+  let curlCommand = s:curl_path() . " -Gfs
+        \ --data-urlencode 'limit=" . resultLimit . "'
+        \ --data-urlencode 'query=" . a:base . "' "
+        \ . apiUri
+
+  let jqFilter = '
+        \ def prettyTermType: .termType|[(.[] | .segment)]|add;
+        \ def prettyTypeDef: if .tag == "BuiltinObject" then "builtin type " else "" end + (.contents|[(.[] | .segment)]|add);
+        \ def termToMatch: {
+        \   word: .bestFoundTermName,
+        \   info: (.namedTerm.termName + " : " + (.namedTerm|prettyTermType)),
+        \   menu: .namedTerm|prettyTermType
+        \ };
+        \ def typeToMatch: {
+        \   word: .bestFoundTypeName,
+        \   info: (.namedType.typeName + " : " + (.typeDef|prettyTypeDef)),
+        \   menu: .typeDef|prettyTypeDef
+        \ };
+        \ .[][1]|(
+        \   (select(.tag == "FoundTermResult")|.contents|termToMatch),
+        \   (select(.tag == "FoundTypeResult")|.contents|typeToMatch)
+        \ )'
+
+  let command = curlCommand . " | " . s:jq_path() . " -c '" . jqFilter . "'"
+  let lines = system(command)
+  let resultObjects = split(lines, "\n")
+  call map(resultObjects, {_, val -> json_decode(val)})
+  return resultObjects
+endfunction
+
+" vim: set et sw=2 sts=2 ts=2:
diff --git a/compiler/ledger.vim b/compiler/ledger.vim
index 3fca64421..1e35f64bf 100644
--- a/compiler/ledger.vim
+++ b/compiler/ledger.vim
@@ -30,7 +30,7 @@ if !g:ledger_is_hledger
 	CompilerSet errorformat+=%tarning:\ \"%f\"\\,\ line\ %l:\ %m
 	" Skip all other lines:
 	CompilerSet errorformat+=%-G%.%#
-	exe 'CompilerSet makeprg='.substitute(g:ledger_bin, ' ', '\\ ', 'g').'\ -f\ ' . expand('g:ledger_main::S') . '\ '.substitute(g:ledger_extra_options, ' ', '\\ ', 'g').'\ source\ ' . expand('g:ledger_main::S')
+	exe 'CompilerSet makeprg='.substitute(g:ledger_bin, ' ', '\\ ', 'g').'\ -f\ ' . substitute(shellescape(expand(g:ledger_main)), ' ', '\\ ', 'g') . '\ '.substitute(g:ledger_extra_options, ' ', '\\ ', 'g').'\ source\ ' . shellescape(expand(g:ledger_main))
 else
-	exe 'CompilerSet makeprg=('.substitute(g:ledger_bin, ' ', '\\ ', 'g').'\ -f\ ' . expand('g:ledger_main::S') . '\ print\ '.substitute(g:ledger_extra_options, ' ', '\\ ', 'g') . '\ >\ /dev/null)'
+	exe 'CompilerSet makeprg=('.substitute(g:ledger_bin, ' ', '\\ ', 'g').'\ -f\ ' . substitute(shellescape(expand(g:ledger_main)), ' ', '\\ ', 'g') . '\ print\ '.substitute(g:ledger_extra_options, ' ', '\\ ', 'g').'\ >\ /dev/null)'
 endif
diff --git a/compiler/powershell.vim b/compiler/powershell.vim
index 0ba5776c4..99fbfa326 100644
--- a/compiler/powershell.vim
+++ b/compiler/powershell.vim
@@ -33,14 +33,36 @@ endif
 
 if !executable(g:ps1_makeprg_cmd)
   echoerr "To use the powershell compiler, please set g:ps1_makeprg_cmd to the powershell executable!"
+  finish
 endif
 
 " Show CategoryInfo, FullyQualifiedErrorId, etc?
 let g:ps1_efm_show_error_categories = get(g:, 'ps1_efm_show_error_categories', 0)
 
+let &l:makeprg = g:ps1_makeprg_cmd
+" Load Vanilla Shell and show syntax errors
+" See https://zigford.org/powershell-syntax-now-supported-by-ale-vim-plugin.html
+if has('win32')
+setlocal makeprg+=\ -NoProfile\ -NoLogo\ -NonInteractive\ -command\ \"&{
+        \trap{$_.tostring();continue}&{
+        \[void]$executioncontext.invokecommand.invokescript('%')
+        \}
+    \}\"
+elseif has('unix')
+setlocal makeprg+=\ -NoProfile\ -NoLogo\ -NonInteractive\ -command\ "&{
+          \trap{\\$_.tostring();continue}&{
+          \[void]\\$executioncontext.invokecommand.invokescript('%')
+          \}
+          \}"
+    \}\"
+else
+  echoerr "To use the powershell compiler, please run it under Microsoft Windows or Unix!"
+  finish
+endif
 " Use absolute path because powershell requires explicit relative paths
 " (./file.ps1 is okay, but # expands to file.ps1)
-let &l:makeprg = g:ps1_makeprg_cmd .' %:p:S'
+setlocal makeprg+=\ %:p:S
+silent CompilerSet makeprg
 
 " Parse file, line, char from callstacks:
 "     Write-Ouput : The term 'Write-Ouput' is not recognized as the name of a
diff --git a/extras/filetype.vim b/extras/filetype.vim
index 6ef1fa21b..78087d044 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Aug 23
+" Last Change:	2021 Dec 14
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -123,7 +123,7 @@ au BufNewFile,BufRead *.aml			setf aml
 " APT config file
 au BufNewFile,BufRead apt.conf		       setf aptconf
 au BufNewFile,BufRead */.aptitude/config       setf aptconf
-au BufNewFile,BufRead */etc/apt/apt.conf.d/{[-_[:alnum:]]\+,[-_.[:alnum:]]\+.conf} setf aptconf
+" more generic pattern far down
 
 " Arch Inventory file
 au BufNewFile,BufRead .arch-inventory,=tagging-method	setf arch
@@ -260,7 +260,7 @@ au BufNewFile,BufRead *.lpc,*.ulpc		setf lpc
 au BufNewFile,BufRead calendar			setf calendar
 
 " C#
-au BufNewFile,BufRead *.cs			setf cs
+au BufNewFile,BufRead *.cs,*.csx		setf cs
 
 " CSDL
 au BufNewFile,BufRead *.csdl			setf csdl
@@ -488,7 +488,10 @@ au BufNewFile,BufRead *.desktop,*.directory	setf desktop
 au BufNewFile,BufRead dict.conf,.dictrc		setf dictconf
 
 " Dictd config
-au BufNewFile,BufRead dictd.conf		setf dictdconf
+au BufNewFile,BufRead dictd*.conf		setf dictdconf
+
+" DEP3 formatted patch files
+au BufNewFile,BufRead */debian/patches/*	call polyglot#ft#Dep3patch()
 
 " Diff files
 au BufNewFile,BufRead *.diff,*.rej		setf diff
@@ -617,6 +620,9 @@ autocmd BufRead,BufNewFile *.fnl		setf fennel
 " Fetchmail RC file
 au BufNewFile,BufRead .fetchmailrc		setf fetchmail
 
+" Fish shell
+au BufNewFile,BufRead *.fish			setf fish
+
 " FlexWiki - disabled, because it has side effects when a .wiki file
 " is not actually FlexWiki
 "au BufNewFile,BufRead *.wiki			setf flexwiki
@@ -629,7 +635,7 @@ au BufNewFile,BufRead auto.master		setf conf
 au BufNewFile,BufRead *.mas,*.master		setf master
 
 " Forth
-au BufNewFile,BufRead *.fs,*.ft,*.fth		setf forth
+au BufNewFile,BufRead *.ft,*.fth		setf forth
 
 " Reva Forth
 au BufNewFile,BufRead *.frt			setf reva
@@ -646,8 +652,14 @@ au BufNewFile,BufRead *.fsl			setf framescript
 " FStab
 au BufNewFile,BufRead fstab,mtab		setf fstab
 
+" F# or Forth
+au BufNewFile,BufRead *.fs			call polyglot#ft#FTfs()
+
+" F#
+au BufNewFile,BufRead *.fsi,*.fsx		setf fsharp
+
 " GDB command files
-au BufNewFile,BufRead .gdbinit			setf gdb
+au BufNewFile,BufRead .gdbinit,gdbinit		setf gdb
 
 " GDMO
 au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
@@ -707,6 +719,7 @@ au BufNewFile,BufRead *.gpi			setf gnuplot
 
 " Go (Google)
 au BufNewFile,BufRead *.go			setf go
+au BufNewFile,BufRead Gopkg.lock		setf toml
 
 " GrADS scripts
 au BufNewFile,BufRead *.gs			setf grads
@@ -780,6 +793,10 @@ au BufNewFile,BufRead *.hb			setf hb
 " Httest
 au BufNewFile,BufRead *.htt,*.htb		setf httest
 
+" i3 (and sway)
+au BufNewFile,BufRead */i3/config,*/sway/config		setf i3config
+au BufNewFile,BufRead */.i3/config,*/.sway/config	setf i3config
+
 " Icon
 au BufNewFile,BufRead *.icn			setf icon
 
@@ -876,6 +893,9 @@ au BufNewFile,BufRead *.json-patch			setf json
 " Jupyter Notebook is also json
 au BufNewFile,BufRead *.ipynb				setf json
 
+" Other files that look like json
+au BufNewFile,BufRead .babelrc,.eslintrc,.prettierrc,.firebaserc  setf json
+
 " JSONC
 au BufNewFile,BufRead *.jsonc			setf jsonc
 
@@ -1092,6 +1112,9 @@ au BufNewFile,BufRead *.moo			setf moo
 " Modconf
 au BufNewFile,BufRead */etc/modules.conf,*/etc/modules,*/etc/conf.modules setf modconf
 
+" MPD is based on XML
+au BufNewFile,BufRead *.mpd			setf xml
+
 " Mplayer config
 au BufNewFile,BufRead mplayer.conf,*/.mplayer/config	setf mplayerconf
 
@@ -1107,11 +1130,15 @@ au BufNewFile,BufRead *.msql			setf msql
 " Mysql
 au BufNewFile,BufRead *.mysql			setf mysql
 
-" Mutt setup files (must be before catch *.rc)
-au BufNewFile,BufRead */etc/Muttrc.d/*		call s:StarSetf('muttrc')
+" Tcl Shell RC file
+au BufNewFile,BufRead tclsh.rc			setf tcl
 
 " M$ Resource files
-au BufNewFile,BufRead *.rc,*.rch		setf rc
+" /etc/Muttrc.d/file.rc is muttrc
+au BufNewFile,BufRead *.rc,*.rch
+	\ if expand("<afile>") !~ "/etc/Muttrc.d/" |
+	\   setf rc |
+	\ endif
 
 " MuPAD source
 au BufRead,BufNewFile *.mu			setf mupad
@@ -1140,6 +1167,9 @@ au BufNewFile,BufRead Neomuttrc			setf neomuttrc
 " Netrc
 au BufNewFile,BufRead .netrc			setf netrc
 
+" Nginx
+au BufNewFile,BufRead *.nginx,nginx*.conf,*nginx.conf,*/etc/nginx/*,*/usr/local/nginx/conf/*,*/nginx/*.conf			setf nginx
+
 " Ninja file
 au BufNewFile,BufRead *.ninja			setf ninja
 
@@ -1278,7 +1308,7 @@ au BufNewFile,BufRead *.rcp			setf pilrc
 au BufNewFile,BufRead .pinerc,pinerc,.pinercex,pinercex		setf pine
 
 " Pipenv Pipfiles
-au BufNewFile,BufRead Pipfile			setf config
+au BufNewFile,BufRead Pipfile			setf toml
 au BufNewFile,BufRead Pipfile.lock		setf json
 
 " PL/1, PL/I
@@ -1400,7 +1430,7 @@ au BufNewFile,BufRead *.ptl,*.pyi,SConstruct		   setf python
 " Radiance
 au BufNewFile,BufRead *.rad,*.mat		setf radiance
 
-" Raku (formelly Perl6)
+" Raku (formerly Perl6)
 au BufNewFile,BufRead *.pm6,*.p6,*.t6,*.pod6,*.raku,*.rakumod,*.rakudoc,*.rakutest  setf raku
 
 " Ratpoison config/command files
@@ -1480,6 +1510,9 @@ au BufNewFile,BufRead robots.txt		setf robots
 " Rpcgen
 au BufNewFile,BufRead *.x			setf rpcgen
 
+" MikroTik RouterOS script
+au BufRead,BufNewFile *.rsc			setf routeros
+
 " reStructuredText Documentation Format
 au BufNewFile,BufRead *.rst			setf rst
 
@@ -1512,6 +1545,7 @@ au BufNewFile,BufRead [rR]antfile,*.rant,[rR]akefile,*.rake	setf ruby
 
 " Rust
 au BufNewFile,BufRead *.rs			setf rust
+au BufNewFile,BufRead Cargo.lock,*/.cargo/config,*/.cargo/credentials	setf toml
 
 " S-lang (or shader language, or SmallLisp)
 au BufNewFile,BufRead *.sl			setf slang
@@ -1623,6 +1657,9 @@ au BufNewFile,BufRead .tcshrc,*.tcsh,tcsh.tcshrc,tcsh.login	call polyglot#ft#Set
 " (patterns ending in a start further below)
 au BufNewFile,BufRead .login,.cshrc,csh.cshrc,csh.login,csh.logout,*.csh,.alias  call polyglot#ft#CSH()
 
+" Zig
+au BufNewFile,BufRead *.zig			setf zig
+
 " Z-Shell script (patterns ending in a star further below)
 au BufNewFile,BufRead .zprofile,*/etc/zprofile,.zfbfmarks  setf zsh
 au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump setf zsh
@@ -1709,6 +1746,9 @@ au BufNewFile,BufRead *.speedup,*.spdata,*.spd	setf spup
 " Slice
 au BufNewFile,BufRead *.ice			setf slice
 
+" Microsoft Visual Studio Solution
+au BufNewFile,BufRead *.sln			setf solution
+
 " Spice
 au BufNewFile,BufRead *.sp,*.spice		setf spice
 
@@ -1730,6 +1770,9 @@ au BufNewFile,BufRead *.sqlj			setf sqlj
 " SQR
 au BufNewFile,BufRead *.sqr,*.sqi		setf sqr
 
+" Squirrel
+au BufNewFile,BufRead *.nut			setf squirrel
+
 " OpenSSH configuration
 au BufNewFile,BufRead ssh_config,*/.ssh/config		setf sshconfig
 au BufNewFile,BufRead */etc/ssh/ssh_config.d/*.conf	setf sshconfig
@@ -1802,7 +1845,7 @@ au BufRead,BufNewFile {pending,completed,undo}.data  setf taskdata
 au BufRead,BufNewFile *.task			setf taskedit
 
 " Tcl (JACL too)
-au BufNewFile,BufRead *.tcl,*.tk,*.itcl,*.itk,*.jacl	setf tcl
+au BufNewFile,BufRead *.tcl,*.tm,*.tk,*.itcl,*.itk,*.jacl,.tclshrc,.wishrc	setf tcl
 
 " TealInfo
 au BufNewFile,BufRead *.tli			setf tli
@@ -1996,14 +2039,15 @@ au BufNewFile,BufRead *.ws[fc]			setf wsh
 " XHTML
 au BufNewFile,BufRead *.xhtml,*.xht		setf xhtml
 
-" X Pixmap (dynamically sets colors, use BufEnter to make it work better)
-au BufEnter *.xpm
+" X Pixmap (dynamically sets colors, this used to trigger on BufEnter to make
+" it work better, but that breaks setting 'filetype' manually)
+au BufNewFile,BufRead *.xpm
 	\ if getline(1) =~ "XPM2" |
 	\   setf xpm2 |
 	\ else |
 	\   setf xpm |
 	\ endif
-au BufEnter *.xpm2				setf xpm2
+au BufNewFile,BufRead *.xpm2			setf xpm2
 
 " XFree86 config
 au BufNewFile,BufRead XF86Config
@@ -2038,9 +2082,15 @@ au BufNewFile,BufRead *.xml			call polyglot#ft#FTxml()
 " XMI (holding UML models) is also XML
 au BufNewFile,BufRead *.xmi			setf xml
 
-" CSPROJ files are Visual Studio.NET's XML-based project config files
+" CSPROJ files are Visual Studio.NET's XML-based C# project config files
 au BufNewFile,BufRead *.csproj,*.csproj.user	setf xml
 
+" FSPROJ files are Visual Studio.NET's XML-based F# project config files
+au BufNewFile,BufRead *.fsproj,*.fsproj.user	setf xml
+
+" VBPROJ files are Visual Studio.NET's XML-based Visual Basic project config files
+au BufNewFile,BufRead *.vbproj,*.vbproj.user	setf xml
+
 " Qt Linguist translation source and Qt User Interface Files are XML
 " However, for .ts Typescript is more common.
 au BufNewFile,BufRead *.ui			setf xml
@@ -2124,6 +2174,12 @@ augroup filetypedetect
 
 
 
+" Plain text files, needs to be far down to not override others.  This avoids
+" the "conf" type being used if there is a line starting with '#'.
+" But before patterns matching everything in a directory.
+au BufNewFile,BufRead *.text,README,LICENSE,COPYING,AUTHORS	setf text
+
+
 " Extra checks for when no filetype has been detected now.  Mostly used for
 " patterns that end in "*".  E.g., "zsh*" matches "zsh.vim", but that's a Vim
 " script file.
@@ -2136,7 +2192,10 @@ au BufNewFile,BufRead proftpd.conf*					call s:StarSetf('apachestyle')
 
 " More Apache config files
 au BufNewFile,BufRead access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*	call s:StarSetf('apache')
-au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.d/*.conf*		call s:StarSetf('apache')
+au BufNewFile,BufRead */etc/apache2/*.conf*,*/etc/apache2/conf.*/*,*/etc/apache2/mods-*/*,*/etc/apache2/sites-*/*,*/etc/httpd/conf.*/*,*/etc/httpd/mods-*/*,*/etc/httpd/sites-*/*,*/etc/httpd/conf.d/*.conf*		call s:StarSetf('apache')
+
+" APT config file
+au BufNewFile,BufRead */etc/apt/apt.conf.d/{[-_[:alnum:]]\+,[-_.[:alnum:]]\+.conf} call s:StarSetf('aptconf')
 
 " Asterisk config file
 au BufNewFile,BufRead *asterisk/*.conf*		call s:StarSetf('asterisk')
@@ -2239,6 +2298,9 @@ au BufNewFile,BufRead */etc/modutils/*
 	\|endif
 au BufNewFile,BufRead */etc/modprobe.*		call s:StarSetf('modconf')
 
+" Mutt setup files (must be before catch *.rc)
+au BufNewFile,BufRead */etc/Muttrc.d/*		call s:StarSetf('muttrc')
+
 " Mutt setup file
 au BufNewFile,BufRead .mutt{ng,}rc*,*/.mutt{ng,}/mutt{ng,}rc*	call s:StarSetf('muttrc')
 au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc*		call s:StarSetf('muttrc')
@@ -2284,12 +2346,18 @@ au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]alias
 au BufNewFile,BufRead .kshrc* call polyglot#ft#SetFileTypeSH("ksh")
 au BufNewFile,BufRead .profile* call polyglot#ft#SetFileTypeSH(getline(1))
 
+" Sudoers
+au BufNewFile,BufRead */etc/sudoers.d/*		call s:StarSetf('sudoers')
+
 " tcsh scripts ending in a star
 au BufNewFile,BufRead .tcshrc*	call polyglot#ft#SetFileTypeShell("tcsh")
 
 " csh scripts ending in a star
 au BufNewFile,BufRead .login*,.cshrc*  call polyglot#ft#CSH()
 
+" tmux configuration with arbitrary extension
+au BufNewFile,BufRead {.,}tmux*.conf*		setf tmux
+
 " VHDL
 au BufNewFile,BufRead *.vhdl_[0-9]*		call s:StarSetf('vhdl')
 
@@ -2325,10 +2393,6 @@ au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump*  call s:StarSetf('zsh')
 au BufNewFile,BufRead zsh*,zlog*		call s:StarSetf('zsh')
 
 
-" Plain text files, needs to be far down to not override others.  This avoids
-" the "conf" type being used if there is a line starting with '#'.
-au BufNewFile,BufRead *.text,README		setf text
-
 " Help files match *.txt but should have a last line that is a modeline.
 au BufNewFile,BufRead *.txt
 	\  if getline('$') !~ 'vim:.*ft=help'
diff --git a/ftplugin/8th.vim b/ftplugin/8th.vim
index e9a63dc18..c7dce2b30 100644
--- a/ftplugin/8th.vim
+++ b/ftplugin/8th.vim
@@ -5,9 +5,10 @@ endif
 " Vim ftplugin file
 " Language:	8th
 " Version:	any
-" Last Change:	2015/11/08
+" Last Change:	2021 Sep 20
+" Last Change:	2021/09/20
 " Maintainer:	Ron Aaron <ron@aaron-tech.com>
-" URL:          https://8th-dev.com/
+" URL:		https://8th-dev.com/
 " Filetypes:	*.8th
 " NOTE: 	8th allows any non-whitespace in a name, so you need to do:
 " 		setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
@@ -18,12 +19,13 @@ if exists("b:did_8thplugin")
  finish
 endif
 
-" Don't load another plugin for this buffer
+" Don't load another 8th plugin for this buffer
 let b:did_8thplugin = 1
 
 setlocal ts=2 sts=2 sw=2 et
-setlocal com=s1:/*,mb:*,ex:*/,:\|,:\\
+setlocal com=s1:/*,mb:*,ex:*/,b:--,be:\\
 setlocal fo=tcrqol
 setlocal matchpairs+=\::;
 setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
 setlocal suffixesadd=.8th
+let b:undo_ftplugin = "setlocal ts< sts< sw< et< com< fo< mps< isk< sua<"
diff --git a/ftplugin/aap.vim b/ftplugin/aap.vim
index 3a8f1cbbd..40f4597b3 100644
--- a/ftplugin/aap.vim
+++ b/ftplugin/aap.vim
@@ -5,7 +5,7 @@ endif
 " Vim filetype plugin file
 " Language:	Aap recipe
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2013 Apr 05
+" Last Change:	2021 Nov 14
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -15,8 +15,9 @@ endif
 " Don't load another plugin for this buffer
 let b:did_ftplugin = 1
 
-" Reset 'formatoptions', 'comments' and 'expandtab' to undo this plugin.
-let b:undo_ftplugin = "setl fo< com< et<"
+" Reset 'formatoptions', 'comments', 'commentstring' and 'expandtab' to undo
+" this plugin.
+let b:undo_ftplugin = "setl fo< com< cms< et<"
 
 " Set 'formatoptions' to break comment lines but not other lines,
 " and insert the comment leader when hitting <CR> or using "o".
@@ -24,6 +25,12 @@ setlocal fo-=t fo+=croql
 
 " Set 'comments' to format dashed lists in comments.
 setlocal comments=s:#\ -,m:#\ \ ,e:#,n:#,fb:-
+setlocal commentstring=#\ %s
 
 " Expand tabs to spaces to avoid trouble.
 setlocal expandtab
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Aap Recipe Files (*.aap)\t*.aap\nAll Files (*.*)\t*.*\n"
+  let b:undo_ftplugin .= " | unlet! b:browsefilter"
+endif
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 2c2882e3e..7fe81f9d2 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -68,8 +68,8 @@ if exists('loaded_matchit')
 	let b:undo_ftplugin .= ' | unlet! b:match_words b:match_skip'
 endif
 
-" Win32 can filter files in the browse dialog
-if has("gui_win32") && !exists("b:browsefilter")
+" Filter files in the browse dialog
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
 	let b:browsefilter = "Clojure Source Files (*.clj)\t*.clj\n" .
 	                   \ "ClojureScript Source Files (*.cljs)\t*.cljs\n" .
 	                   \ "Java Source Files (*.java)\t*.java\n" .
diff --git a/ftplugin/diff.vim b/ftplugin/diff.vim
index c7d8cefce..feaefc579 100644
--- a/ftplugin/diff.vim
+++ b/ftplugin/diff.vim
@@ -5,7 +5,7 @@ endif
 " Vim filetype plugin file
 " Language:	Diff
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Jul 18
+" Last Change:	2021 Nov 14
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -13,10 +13,15 @@ if exists("b:did_ftplugin")
 endif
 let b:did_ftplugin = 1
 
-let b:undo_ftplugin = "setl modeline<"
+let b:undo_ftplugin = "setl modeline< commentstring<"
 
 " Don't use modelines in a diff, they apply to the diffed file
 setlocal nomodeline
 
 " If there are comments they start with #
-let &commentstring = "# %s"
+let &l:commentstring = "# %s"
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Diff Files (*.diff)\t*.diff\nPatch Files (*.patch)\t*.h\nAll Files (*.*)\t*.*\n"
+  let b:undo_ftplugin .= " | unlet! b:browsefilter"
+endif
diff --git a/ftplugin/dosini.vim b/ftplugin/dosini.vim
index fc739a015..5ee9a5e05 100644
--- a/ftplugin/dosini.vim
+++ b/ftplugin/dosini.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'dosini', 'ftplugin/dosini.vim
 endif
 
 " Vim filetype plugin file
-" Language:             Configuration File (ini file) for MSDOS/MS Windows
+" Language:             Configuration File (ini file) for MS-DOS/MS Windows
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2008-07-09
 
diff --git a/ftplugin/dune.vim b/ftplugin/dune.vim
index 4f78d7c6b..c89e40d2a 100644
--- a/ftplugin/dune.vim
+++ b/ftplugin/dune.vim
@@ -15,10 +15,12 @@ if exists("b:did_ftplugin")
 endif
 let b:did_ftplugin=1
 
-set lisp
+setl lisp
 
 " Comment string
 setl commentstring=;\ %s
 setl comments=n:;
 
 setl iskeyword+=#,?,.,/
+
+let b:undo_ftplugin = "setlocal lisp< cms< com< isk<"
diff --git a/ftplugin/erlang.vim b/ftplugin/erlang.vim
index 798f1dede..85f572095 100644
--- a/ftplugin/erlang.vim
+++ b/ftplugin/erlang.vim
@@ -34,6 +34,28 @@ setlocal commentstring=%%s
 
 setlocal formatoptions+=ro
 
+if get(g:, 'erlang_extend_path', 1)
+  " typical erlang.mk paths
+  let &l:path = join([
+        \ 'deps/*/include',
+        \ 'deps/*/src',
+        \ 'deps/*/test',
+        \ 'deps/*/apps/*/include',
+        \ 'deps/*/apps/*/src',
+        \ &g:path], ',')
+  " typical rebar3 paths
+  let &l:path = join([
+        \ 'apps/*/include',
+        \ 'apps/*/src',
+        \ '_build/default/lib/*/src',
+        \ '_build/default/*/include',
+        \ &l:path], ',')
+  " typical erlang paths
+  let &l:path = join(['include', 'src', 'test', &l:path], ',')
+
+  set wildignore+=*/.erlang.mk/*,*.beam
+endif
+
 setlocal suffixesadd=.erl,.hrl
 
 let &l:include = '^\s*-\%(include\|include_lib\)\s*("\zs\f*\ze")'
diff --git a/ftplugin/git.vim b/ftplugin/git.vim
deleted file mode 100644
index 9a5ac16c4..000000000
--- a/ftplugin/git.vim
+++ /dev/null
@@ -1,45 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'git', 'ftplugin/git.vim')
-  finish
-endif
-
-" Vim filetype plugin
-" Language:	generic git output
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2019 Dec 05
-
-" Only do this when not done yet for this buffer
-if (exists("b:did_ftplugin"))
-  finish
-endif
-let b:did_ftplugin = 1
-
-if !exists('b:git_dir')
-  if expand('%:p') =~# '[\/]\.git[\/]modules[\/]\|:[\/][\/]\|^\a\a\+:'
-    " Stay out of the way
-  elseif expand('%:p') =~# '[\/]\.git[\/]worktrees'
-    let b:git_dir = matchstr(expand('%:p'),'.*\.git[\/]worktrees[\/][^\/]\+\>')
-  elseif expand('%:p') =~# '\.git\>'
-    let b:git_dir = matchstr(expand('%:p'),'.*\.git\>')
-  elseif $GIT_DIR != ''
-    let b:git_dir = $GIT_DIR
-  endif
-  if (has('win32') || has('win64')) && exists('b:git_dir')
-    let b:git_dir = substitute(b:git_dir,'\\','/','g')
-  endif
-endif
-
-if exists('*shellescape') && exists('b:git_dir') && b:git_dir != ''
-  if b:git_dir =~# '/\.git$' " Not a bare repository
-    let &l:path = escape(fnamemodify(b:git_dir,':h'),'\, ').','.&l:path
-  endif
-  let &l:path = escape(b:git_dir,'\, ').','.&l:path
-  let &l:keywordprg = 'git --git-dir='.shellescape(b:git_dir).' show'
-else
-  setlocal keywordprg=git\ show
-endif
-if has('gui_running') && &guioptions !~# '!'
-  let &l:keywordprg = substitute(&l:keywordprg,'^git\>','git --no-pager','')
-endif
-
-setlocal includeexpr=substitute(v:fname,'^[^/]\\+/','','')
-let b:undo_ftplugin = "setl keywordprg< path< includeexpr<"
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim
index caa96db8b..56e72973a 100644
--- a/ftplugin/gitcommit.vim
+++ b/ftplugin/gitcommit.vim
@@ -12,60 +12,50 @@ if (exists("b:did_ftplugin"))
   finish
 endif
 
-runtime! ftplugin/git.vim
 let b:did_ftplugin = 1
 
-setlocal comments=:# commentstring=#\ %s
-setlocal include=^\+\+\+
 setlocal nomodeline tabstop=8 formatoptions+=tl textwidth=72
 setlocal formatoptions-=c formatoptions-=r formatoptions-=o formatoptions-=q formatoptions+=n
 setlocal formatlistpat+=\\\|^\\s*[-*+]\\s\\+
+setlocal include=^+++
+setlocal includeexpr=substitute(v:fname,'^[bi]/','','')
 
-let b:undo_ftplugin = 'setl modeline< tabstop< formatoptions< tw< com< cms< formatlistpat<'
+let b:undo_ftplugin = 'setl modeline< tabstop< formatoptions< tw< com< cms< formatlistpat< inc< inex<'
 
-if exists("g:no_gitcommit_commands") || v:version < 700
-  finish
-endif
+let s:l = search('\C\m^[#;@!$%^&|:] -\{24,\} >8 -\{24,\}$', 'cnW', '', 100)
+let &l:comments = ':' . (matchstr(getline(s:l ? s:l : '$'), '^[#;@!$%^&|:]\S\@!') . '#')[0]
+let &l:commentstring = &l:comments[1] . ' %s'
+unlet s:l
 
-if !exists("b:git_dir")
-  let b:git_dir = expand("%:p:h")
+if exists("g:no_gitcommit_commands")
+  finish
 endif
 
-command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0,b:git_dir,<f-args>)
+command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0, <f-args>)
 
 let b:undo_ftplugin = b:undo_ftplugin . "|delc DiffGitCached"
 
-function! s:diffcomplete(A,L,P)
+function! s:diffcomplete(A, L, P) abort
   let args = ""
   if a:P <= match(a:L." -- "," -- ")+3
     let args = args . "-p\n--stat\n--shortstat\n--summary\n--patch-with-stat\n--no-renames\n-B\n-M\n-C\n"
   end
-  if exists("b:git_dir") && a:A !~ '^-'
-    let tree = fnamemodify(b:git_dir,':h')
-    if strpart(getcwd(),0,strlen(tree)) == tree
-      let args = args."\n".system("git diff --cached --name-only")
-    endif
+  if a:A !~ '^-' && !empty(getftype('.git'))
+    let args = args."\n".system("git diff --cached --name-only")
   endif
   return args
 endfunction
 
-function! s:gitdiffcached(bang,gitdir,...)
-  let tree = fnamemodify(a:gitdir,':h')
+function! s:gitdiffcached(bang, ...) abort
   let name = tempname()
-  let git = "git"
-  if strpart(getcwd(),0,strlen(tree)) != tree
-    let git .= " --git-dir=".(exists("*shellescape") ? shellescape(a:gitdir) : '"'.a:gitdir.'"')
-  endif
   if a:0
-    let extra = join(map(copy(a:000),exists("*shellescape") ? 'shellescape(v:val)' : "'\"'.v:val.'\"'"))
+    let extra = join(map(copy(a:000), 'shellescape(v:val)'))
   else
     let extra = "-p --stat=".&columns
   endif
-  call system(git." diff --cached --no-color --no-ext-diff ".extra." > ".(exists("*shellescape") ? shellescape(name) : name))
-  exe "pedit ".(exists("*fnameescape") ? fnameescape(name) : name)
+  call system("git diff --cached --no-color --no-ext-diff ".extra." > ".shellescape(name))
+  exe "pedit " . fnameescape(name)
   wincmd P
-  let b:git_dir = a:gitdir
-  command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0,b:git_dir,<f-args>)
-  nnoremap <buffer> <silent> q :q<CR>
+  command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0, <f-args>)
   setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git
 endfunction
diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim
index 7163f9169..285f76a41 100644
--- a/ftplugin/gitrebase.vim
+++ b/ftplugin/gitrebase.vim
@@ -12,15 +12,13 @@ if (exists("b:did_ftplugin"))
   finish
 endif
 
-runtime! ftplugin/git.vim
 let b:did_ftplugin = 1
 
-setlocal comments=:# commentstring=#\ %s formatoptions-=t
+let &l:comments = ':' . (matchstr(getline('$'), '^[#;@!$%^&|:]\S\@!') . '#')[0]
+let &l:commentstring = &l:comments[1] . ' %s'
+setlocal formatoptions-=t
 setlocal nomodeline
-if !exists("b:undo_ftplugin")
-  let b:undo_ftplugin = ""
-endif
-let b:undo_ftplugin = b:undo_ftplugin."|setl com< cms< fo< ml<"
+let b:undo_ftplugin = "setl com< cms< fo< ml<"
 
 function! s:choose(word) abort
   s/^\(\w\+\>\)\=\(\s*\)\ze\x\{4,40\}\>/\=(strlen(submatch(1)) == 1 ? a:word[0] : a:word) . substitute(submatch(2),'^$',' ','')/e
@@ -45,8 +43,7 @@ if exists("g:no_plugin_maps") || exists("g:no_gitrebase_maps")
   finish
 endif
 
-nnoremap <buffer> <expr> K col('.') < 7 && expand('<Lt>cword>') =~ '\X' && getline('.') =~ '^\w\+\s\+\x\+\>' ? 'wK' : 'K'
 nnoremap <buffer> <silent> <C-A> :<C-U><C-R>=v:count1<CR>Cycle<CR>
 nnoremap <buffer> <silent> <C-X> :<C-U><C-R>=v:count1<CR>Cycle!<CR>
 
-let b:undo_ftplugin = b:undo_ftplugin . "|exe 'nunmap <buffer> K'|exe 'nunmap <buffer> <C-A>'|exe 'nunmap <buffer> <C-X>'"
+let b:undo_ftplugin = b:undo_ftplugin . "|exe 'nunmap <buffer> <C-A>'|exe 'nunmap <buffer> <C-X>'"
diff --git a/ftplugin/indent.vim b/ftplugin/indent.vim
index 89a779c4e..094dcd9e6 100644
--- a/ftplugin/indent.vim
+++ b/ftplugin/indent.vim
@@ -3,9 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'indent', 'ftplugin/indent.vim
 endif
 
 " Vim filetype plugin file
-" Language:             indent(1) configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-09
+" Language:		indent(1) configuration file
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Latest Revision:	2008-07-09
 
 if exists("b:did_ftplugin")
   finish
diff --git a/ftplugin/kotlin.vim b/ftplugin/kotlin.vim
index ca0b35fc4..e6677fdf8 100644
--- a/ftplugin/kotlin.vim
+++ b/ftplugin/kotlin.vim
@@ -2,8 +2,29 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'kotlin', 'ftplugin/kotlin.vim
   finish
 endif
 
+" Vim filetype plugin file
+" Language:     Kotlin
+" Maintainer:   Alexander Udalov
+" URL:          https://github.com/udalov/kotlin-vim
+" Last Change:  7 November 2021
+
 if exists('b:did_ftplugin') | finish | endif
 let b:did_ftplugin = 1
 
+let s:save_cpo = &cpo
+set cpo&vim
+
 setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,://
 setlocal commentstring=//\ %s
+
+setlocal formatoptions-=t formatoptions+=croqnl
+silent! setlocal formatoptions+=j
+
+setlocal includeexpr=substitute(v:fname,'\\.','/','g')
+setlocal suffixesadd=.kt
+
+let b:undo_ftplugin = "setlocal comments< commentstring< ".
+    \ "formatoptions< includeexpr< suffixesadd<"
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/ftplugin/mail.vim b/ftplugin/mail.vim
index 6e4e9a4fe..e621acca8 100644
--- a/ftplugin/mail.vim
+++ b/ftplugin/mail.vim
@@ -5,7 +5,7 @@ endif
 " Vim filetype plugin file
 " Language:	Mail
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Nov 20
+" Last Change:	2021 Oct 23
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -30,6 +30,14 @@ setlocal fo+=tcql
 " Add n:> to 'comments, in case it was removed elsewhere
 setlocal comments+=n:>
 
+" .eml files are universally formatted with DOS line-endings, per RFC5322.
+" If the file was not DOS the it will be marked as changed, which is probably
+" a good thing.
+if expand('%:e') ==? 'eml'
+  let b:undo_ftplugin .= " fileformat=" .. &fileformat
+  setlocal fileformat=dos
+endif
+
 " Add mappings, unless the user doesn't want this.
 if !exists("no_plugin_maps") && !exists("no_mail_maps")
   " Quote text by inserting "> "
diff --git a/ftplugin/meson.vim b/ftplugin/meson.vim
index 79ff47c6a..a36085227 100644
--- a/ftplugin/meson.vim
+++ b/ftplugin/meson.vim
@@ -16,9 +16,28 @@ set cpo&vim
 
 setlocal commentstring=#\ %s
 setlocal comments=:#
+setlocal formatoptions+=croql formatoptions-=t
 
-setlocal shiftwidth=2
-setlocal softtabstop=2
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+if get(g:, "meson_recommended_style", 1)
+  setlocal expandtab
+  setlocal shiftwidth=2
+  setlocal softtabstop=2
+  let b:undo_ftplugin .= " | setl et< sts< sw<"
+endif
+
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_words = '\<if\>:\<elif\>:\<else\>:\<endif\>,' .
+	\             '\<foreach\>:\<break\>:\<continue\>:\<endforeach\>'
+  let b:undo_ftplugin .= " | unlet! b:match_words"
+endif
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Meson Build Files (meson.build)\tmeson.build\n" .
+	\	       "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin .= " | unlet! b:browsefilter"
+endif
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
diff --git a/ftplugin/nginx.vim b/ftplugin/nginx.vim
index 454422428..61b8a7601 100644
--- a/ftplugin/nginx.vim
+++ b/ftplugin/nginx.vim
@@ -2,4 +2,8 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'nginx', 'ftplugin/nginx.vim')
   finish
 endif
 
+setlocal comments=:#
 setlocal commentstring=#\ %s
+setlocal formatoptions+=croql formatoptions-=t
+
+let b:undo_ftplugin = "setl fo< cms< com<"
diff --git a/ftplugin/nsis.vim b/ftplugin/nsis.vim
index ab54e5d3a..2a387b4ae 100644
--- a/ftplugin/nsis.vim
+++ b/ftplugin/nsis.vim
@@ -7,7 +7,7 @@ endif
 " Maintainer:		Ken Takata
 " URL:			https://github.com/k-takata/vim-nsis
 " Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
-" Last Change:		2018-01-26
+" Last Change:		2021-10-18
 
 if exists("b:did_ftplugin")
   finish
@@ -19,7 +19,6 @@ set cpo&vim
 let b:did_ftplugin = 1
 
 let b:undo_ftplugin = "setl com< cms< fo< def< inc<"
-      \ " | unlet! b:match_ignorecase b:match_words"
 
 setlocal comments=s1:/*,mb:*,ex:*/,b:#,:; commentstring=;\ %s
 setlocal formatoptions-=t formatoptions+=croql
@@ -41,6 +40,7 @@ if exists("loaded_matchit")
 	\ '\${MementoSection}:\${MementoSectionEnd},' .
 	\ '!if\%(\%(macro\)\?n\?def\)\?\>:!else\>:!endif\>,' .
 	\ '!macro\>:!macroend\>'
+  let b:undo_ftplugin .= " | unlet! b:match_ignorecase b:match_words"
 endif
 
 let &cpo = s:cpo_save
diff --git a/ftplugin/oasis.vim b/ftplugin/oasis.vim
index ad7dd1a56..7c5771db3 100644
--- a/ftplugin/oasis.vim
+++ b/ftplugin/oasis.vim
@@ -2,6 +2,12 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'ftplugin/oasis.vim')
   finish
 endif
 
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin=1
 
 setlocal comments=:#
 setlocal commentstring=#\ %s
+
+let b:undo_ftplugin = "com< cms<"
diff --git a/ftplugin/ocaml.vim b/ftplugin/ocaml.vim
index 6ce2adcb3..858e4fd42 100644
--- a/ftplugin/ocaml.vim
+++ b/ftplugin/ocaml.vim
@@ -46,6 +46,8 @@ setlocal comments=sr:(*\ ,mb:\ ,ex:*)
 setlocal comments^=sr:(**,mb:\ \ ,ex:*)
 setlocal commentstring=(*%s*)
 
+let b:undo_ftplugin = "setlocal com< cms<"
+
 " Add mappings, unless the user didn't want this.
 if !exists("no_plugin_maps") && !exists("no_ocaml_maps")
   " (un)commenting
@@ -54,6 +56,11 @@ if !exists("no_plugin_maps") && !exists("no_ocaml_maps")
     xmap <buffer> <LocalLeader>c <Plug>BUncomOn
     nmap <buffer> <LocalLeader>C <Plug>LUncomOff
     xmap <buffer> <LocalLeader>C <Plug>BUncomOff
+    let b:undo_ftplugin .=
+	  \ " | silent! execute 'nunmap <buffer> <LocalLeader>c'" .
+	  \ " | silent! execute 'xunmap <buffer> <LocalLeader>c'" .
+	  \ " | silent! execute 'nunmap <buffer> <LocalLeader>C'" .
+	  \ " | silent! execute 'xunmap <buffer> <LocalLeader>C'"
   endif
 
   nnoremap <buffer> <Plug>LUncomOn gI(* <End> *)<ESC>
@@ -66,17 +73,27 @@ if !exists("no_plugin_maps") && !exists("no_ocaml_maps")
 
   nmap <buffer> <LocalLeader>t <Plug>OCamlPrintType
   xmap <buffer> <LocalLeader>t <Plug>OCamlPrintType
+
+  let b:undo_ftplugin .=
+	\ " | silent! execute 'nunmap <buffer> <LocalLeader>s'" .
+	\ " | silent! execute 'nunmap <buffer> <LocalLeader>S'" .
+	\ " | silent! execute 'nunmap <buffer> <LocalLeader>t'" .
+	\ " | silent! execute 'xunmap <buffer> <LocalLeader>t'"
 endif
 
-" Let % jump between structure elements (due to Issac Trotts)
-let b:mw =         '\<let\>:\<and\>:\(\<in\>\|;;\)'
-let b:mw = b:mw . ',\<if\>:\<then\>:\<else\>'
-let b:mw = b:mw . ',\<\(for\|while\)\>:\<do\>:\<done\>'
-let b:mw = b:mw . ',\<\(object\|sig\|struct\|begin\)\>:\<end\>'
-let b:mw = b:mw . ',\<\(match\|try\)\>:\<with\>'
-let b:match_words = b:mw
+if exists("loaded_matchit") && !exists("b:match_words")
+  " Let % jump between structure elements (due to Issac Trotts)
+  let b:mw =         '\<let\>:\<and\>:\(\<in\>\|;;\)'
+  let b:mw = b:mw . ',\<if\>:\<then\>:\<else\>'
+  let b:mw = b:mw . ',\<\(for\|while\)\>:\<do\>:\<done\>'
+  let b:mw = b:mw . ',\<\(object\|sig\|struct\|begin\)\>:\<end\>'
+  let b:mw = b:mw . ',\<\(match\|try\)\>:\<with\>'
+  let b:match_words = b:mw
+
+  let b:match_ignorecase=0
 
-let b:match_ignorecase=0
+  let b:undo_ftplugin .= " | unlet! b:match_ignorecase b:match_words"
+endif
 
 function! s:OcpGrep(bang,args) abort
   let grepprg = &l:grepprg
@@ -154,12 +171,9 @@ endif
 if exists("g:ocaml_folding")
   setlocal foldmethod=expr
   setlocal foldexpr=OMLetFoldLevel(v:lnum)
+  let b:undo_ftplugin .= " | setlocal fdm< fde<"
 endif
 
-let b:undo_ftplugin = "setlocal efm< foldmethod< foldexpr<"
-	\ . "| unlet! b:mw b:match_words b:match_ignorecase"
-
-
 " - Only definitions below, executed once -------------------------------------
 
 if exists("*OMLetFoldLevel")
diff --git a/ftplugin/ocamlbuild_tags.vim b/ftplugin/ocamlbuild_tags.vim
index 5e83406d3..5eecc1cea 100644
--- a/ftplugin/ocamlbuild_tags.vim
+++ b/ftplugin/ocamlbuild_tags.vim
@@ -2,6 +2,12 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'ftplugin/ocamlbuild_
   finish
 endif
 
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin=1
 
 setlocal comments=:#
 setlocal commentstring=#\ %s
+
+let b:undo_ftplugin = "com< cms<"
diff --git a/ftplugin/omake.vim b/ftplugin/omake.vim
index 59e111019..fe99ea153 100644
--- a/ftplugin/omake.vim
+++ b/ftplugin/omake.vim
@@ -26,3 +26,5 @@ setlocal expandtab
 
 " Including files.
 let &l:include = '^\s*include'
+
+let b:undo_ftplugin = "fo< com< cms< et< inc<"
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index 1c6f828fd..fcf346a0b 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -90,8 +90,14 @@ endfunction
 
 function! s:build_path(path) abort
   let path = join(map(copy(a:path), 'v:val ==# "." ? "" : v:val'), ',')
-  if &g:path !~# '\v^%(\.,)=%(/%(usr|emx)/include,)=,$'
-    let path = substitute(&g:path,',,$',',','') . ',' . path
+  if &g:path =~# '\v^%(\.,)=%(/%(usr|emx)/include,)=,$'
+    let path = path . ',.,,'
+  elseif &g:path =~# ',\.,,$'
+    let path = &g:path[0:-4] . path . ',.,,'
+  elseif &g:path =~# ',,$'
+    let path = &g:path[0:-2] . path . ',,'
+  else
+    let path = substitute(&g:path, '[^,]\zs$', ',', '') . path
   endif
   return path
 endfunction
@@ -167,6 +173,8 @@ let b:undo_ftplugin .= "| sil! cunmap <buffer> <Plug><ctag>| sil! cunmap <buffer
 if !exists("g:no_plugin_maps") && !exists("g:no_ruby_maps")
   nmap <buffer><script> <SID>:  :<C-U>
   nmap <buffer><script> <SID>c: :<C-U><C-R>=v:count ? v:count : ''<CR>
+  cmap <buffer> <SID><cfile> <Plug><cfile>
+  cmap <buffer> <SID><ctag>  <Plug><ctag>
 
   nnoremap <silent> <buffer> [m :<C-U>call <SID>searchsyn('\<def\>',['rubyDefine'],'b','n')<CR>
   nnoremap <silent> <buffer> ]m :<C-U>call <SID>searchsyn('\<def\>',['rubyDefine'],'','n')<CR>
@@ -213,20 +221,20 @@ if !exists("g:no_plugin_maps") && !exists("g:no_ruby_maps")
   call s:map('c', '', '<C-R><C-F> <Plug><cfile>')
 
   cmap <buffer><script><expr> <SID>tagzv &foldopen =~# 'tag' ? '<Bar>norm! zv' : ''
-  call s:map('n', '<silent>', '<C-]>       <SID>:exe  v:count1."tag <Plug><ctag>"<SID>tagzv<CR>')
-  call s:map('n', '<silent>', 'g<C-]>      <SID>:exe         "tjump <Plug><ctag>"<SID>tagzv<CR>')
-  call s:map('n', '<silent>', 'g]          <SID>:exe       "tselect <Plug><ctag>"<SID>tagzv<CR>')
-  call s:map('n', '<silent>', '<C-W>]      <SID>:exe v:count1."stag <Plug><ctag>"<SID>tagzv<CR>')
-  call s:map('n', '<silent>', '<C-W><C-]>  <SID>:exe v:count1."stag <Plug><ctag>"<SID>tagzv<CR>')
-  call s:map('n', '<silent>', '<C-W>g<C-]> <SID>:exe        "stjump <Plug><ctag>"<SID>tagzv<CR>')
-  call s:map('n', '<silent>', '<C-W>g]     <SID>:exe      "stselect <Plug><ctag>"<SID>tagzv<CR>')
-  call s:map('n', '<silent>', '<C-W>}      <SID>:exe v:count1."ptag <Plug><ctag>"<CR>')
-  call s:map('n', '<silent>', '<C-W>g}     <SID>:exe        "ptjump <Plug><ctag>"<CR>')
-
-  call s:map('n', '<silent>', 'gf           <SID>c:find <Plug><cfile><CR>')
-  call s:map('n', '<silent>', '<C-W>f      <SID>c:sfind <Plug><cfile><CR>')
-  call s:map('n', '<silent>', '<C-W><C-F>  <SID>c:sfind <Plug><cfile><CR>')
-  call s:map('n', '<silent>', '<C-W>gf   <SID>c:tabfind <Plug><cfile><CR>')
+  call s:map('n', '<script><silent>', '<C-]>       <SID>:exe  v:count1."tag <SID><ctag>"<SID>tagzv<CR>')
+  call s:map('n', '<script><silent>', 'g<C-]>      <SID>:exe         "tjump <SID><ctag>"<SID>tagzv<CR>')
+  call s:map('n', '<script><silent>', 'g]          <SID>:exe       "tselect <SID><ctag>"<SID>tagzv<CR>')
+  call s:map('n', '<script><silent>', '<C-W>]      <SID>:exe v:count1."stag <SID><ctag>"<SID>tagzv<CR>')
+  call s:map('n', '<script><silent>', '<C-W><C-]>  <SID>:exe v:count1."stag <SID><ctag>"<SID>tagzv<CR>')
+  call s:map('n', '<script><silent>', '<C-W>g<C-]> <SID>:exe        "stjump <SID><ctag>"<SID>tagzv<CR>')
+  call s:map('n', '<script><silent>', '<C-W>g]     <SID>:exe      "stselect <SID><ctag>"<SID>tagzv<CR>')
+  call s:map('n', '<script><silent>', '<C-W>}      <SID>:exe v:count1."ptag <SID><ctag>"<CR>')
+  call s:map('n', '<script><silent>', '<C-W>g}     <SID>:exe        "ptjump <SID><ctag>"<CR>')
+
+  call s:map('n', '<script><silent>', 'gf           <SID>c:find <SID><cfile><CR>')
+  call s:map('n', '<script><silent>', '<C-W>f      <SID>c:sfind <SID><cfile><CR>')
+  call s:map('n', '<script><silent>', '<C-W><C-F>  <SID>c:sfind <SID><cfile><CR>')
+  call s:map('n', '<script><silent>', '<C-W>gf   <SID>c:tabfind <SID><cfile><CR>')
 endif
 
 let &cpo = s:cpo_save
diff --git a/ftplugin/sexplib.vim b/ftplugin/sexplib.vim
index 976e38971..74a00e549 100644
--- a/ftplugin/sexplib.vim
+++ b/ftplugin/sexplib.vim
@@ -17,3 +17,5 @@ let b:did_ftplugin=1
 " Comment string
 setl commentstring=;\ %s
 setl comments=n:;
+
+let b:undo_ftplugin = "setl cms< com<"
diff --git a/ftplugin/systemverilog.vim b/ftplugin/systemverilog.vim
index 53bd1351b..6db92d88b 100644
--- a/ftplugin/systemverilog.vim
+++ b/ftplugin/systemverilog.vim
@@ -36,7 +36,7 @@ if exists("loaded_matchit")
     \ '\<checker\>:\<endchecker\>,' .
     \ '\<class\>:\<endclass\>,' .
     \ '\<clocking\>:\<endclocking\>,' .
-    \ '\<gruop\>:\<endgruop\>,' .
+    \ '\<group\>:\<endgroup\>,' .
     \ '\<interface\>:\<endinterface\>,' .
     \ '\<package\>:\<endpackage\>,' .
     \ '\<program\>:\<endprogram\>,' .
diff --git a/ftplugin/toml.vim b/ftplugin/toml.vim
index 8d45ea771..689b016c3 100644
--- a/ftplugin/toml.vim
+++ b/ftplugin/toml.vim
@@ -2,13 +2,15 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'toml', 'ftplugin/toml.vim')
   finish
 endif
 
-" File: ftplugin/toml.vim
-" Author: Kevin Ballard <kevin@sb.org>
-" Description: FileType Plugin for Toml
-" Last Change: Feb 12, 2019
+" Vim filetype plugin
+" Language:    TOML
+" Homepage:    https://github.com/cespare/vim-toml
+" Maintainer:  Aman Verma
+" Author:      Kevin Ballard <kevin@sb.org>
+" Last Change: Sep 21, 2021
 
 if exists('b:did_ftplugin')
-    finish
+  finish
 endif
 let b:did_ftplugin = 1
 
@@ -22,4 +24,4 @@ setlocal comments=:#
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set et sw=4 ts=4:
+" vim: et sw=2 sts=2
diff --git a/ftplugin/unison.vim b/ftplugin/unison.vim
new file mode 100644
index 000000000..93ac81d6d
--- /dev/null
+++ b/ftplugin/unison.vim
@@ -0,0 +1,11 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'unison', 'ftplugin/unison.vim')
+  finish
+endif
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+call unison#SetBufferDefaults()
diff --git a/ftplugin/vb.vim b/ftplugin/vb.vim
index 0b5763f2c..36c2a9f14 100644
--- a/ftplugin/vb.vim
+++ b/ftplugin/vb.vim
@@ -3,46 +3,72 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'visual-basic', 'ftplugin/vb.v
 endif
 
 " Vim filetype plugin file
-" Language:	VisualBasic (ft=vb)
-" Maintainer:	Johannes Zellner <johannes@zellner.org>
-" Last Change:	Thu, 22 Nov 2001 12:56:14 W. Europe Standard Time
+" Language:		Visual Basic (ft=vb)
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Johannes Zellner <johannes@zellner.org>
+" Last Change:		2021 Nov 17
 
-if exists("b:did_ftplugin") | finish | endif
+if exists("b:did_ftplugin")
+  finish
+endif
 let b:did_ftplugin = 1
 
-setlocal com=sr:'\ -,mb:'\ \ ,el:'\ \ ,:'
+let s:cpo_save = &cpo
+set cpo&vim
+
+setlocal comments=sr:'\ -,mb:'\ \ ,el:'\ \ ,:'
+setlocal commentstring='\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let b:undo_ftplugin = "setlocal com< cms< fo<"
 
 " we need this wrapper, as call doesn't allow a count
-fun! <SID>VbSearch(pattern, flags)
+function! s:VbSearch(pattern, flags)
     let cnt = v:count1
     while cnt > 0
 	call search(a:pattern, a:flags)
 	let cnt = cnt - 1
     endwhile
-endfun
+endfunction
 
-let s:cpo_save = &cpo
-set cpo&vim
+if !exists("no_plugin_maps") && !exists("no_vb_maps")
+  nnoremap <buffer> <silent> [[ <Cmd>call <SID>VbSearch('^\s*\%(\%(private\<Bar>public\)\s\+\)\=\%(function\<Bar>sub\)', 'sbW')<CR>
+  vnoremap <buffer> <silent> [[ <Cmd>call <SID>VbSearch('^\s*\%(\%(private\<Bar>public\)\s\+\)\=\%(function\<Bar>sub\)', 'sbW')<CR>
+  nnoremap <buffer> <silent> ]] <Cmd>call <SID>VbSearch('^\s*\%(\%(private\<Bar>public\)\s\+\)\=\%(function\<Bar>sub\)', 'sW')<CR>
+  vnoremap <buffer> <silent> ]] <Cmd>call <SID>VbSearch('^\s*\%(\%(private\<Bar>public\)\s\+\)\=\%(function\<Bar>sub\)', 'sW')<CR>
+  nnoremap <buffer> <silent> [] <Cmd>call <SID>VbSearch('^\s*end\s\+\%(function\<Bar>sub\)', 'sbW')<CR>
+  vnoremap <buffer> <silent> [] <Cmd>call <SID>VbSearch('^\s*end\s\+\%(function\<Bar>sub\)', 'sbW')<CR>
+  nnoremap <buffer> <silent> ][ <Cmd>call <SID>VbSearch('^\s*end\s\+\%(function\<Bar>sub\)', 'sW')<CR>
+  vnoremap <buffer> <silent> ][ <Cmd>call <SID>VbSearch('^\s*end\s\+\%(function\<Bar>sub\)', 'sW')<CR>
+  let b:undo_ftplugin .= " | sil! exe 'nunmap <buffer> [[' | sil! exe 'vunmap <buffer> [['" .
+	\		 " | sil! exe 'nunmap <buffer> ]]' | sil! exe 'vunmap <buffer> ]]'" .
+	\		 " | sil! exe 'nunmap <buffer> []' | sil! exe 'vunmap <buffer> []'" .
+	\		 " | sil! exe 'nunmap <buffer> ][' | sil! exe 'vunmap <buffer> ]['"
+endif
+
+" TODO: line start anchors are almost certainly overly restrictive - allow
+" after statement separators.  Even in QuickBasic only block IF statements
+" were required to be at the start of a line.
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_ignorecase = 1
+  let b:match_words =
+	\ '\%(^\s*\)\@<=\<if\>.*\<then\>\s*\%($\|''\):\%(^\s*\)\@<=\<else\>:\%(^\s*\)\@<=\<elseif\>:\%(^\s*\)\@<=\<end\>\s\+\<if\>,' .
+	\ '\%(^\s*\)\@<=\<for\>:\%(^\s*\)\@<=\<next\>,' .
+	\ '\%(^\s*\)\@<=\<while\>:\%(^\s*\)\@<=\<wend\>,' .
+	\ '\%(^\s*\)\@<=\<do\>:\%(^\s*\)\@<=\<loop\>\s\+\<while\>,' .
+	\ '\%(^\s*\)\@<=\<select\>\s\+\<case\>:\%(^\s*\)\@<=\<case\>:\%(^\s*\)\@<=\<end\>\s\+\<select\>,' .
+	\ '\%(^\s*\)\@<=\<enum\>:\%(^\s*\)\@<=\<end\>\s\<enum\>,' .
+	\ '\%(^\s*\)\@<=\<with\>:\%(^\s*\)\@<=\<end\>\s\<with\>,' .
+	\ '\%(^\s*\)\@<=\%(\<\%(private\|public\)\>\s\+\)\=\<function\>\s\+\([^ \t(]\+\):\%(^\s*\)\@<=\<\1\>\s*=:\%(^\s*\)\@<=\<end\>\s\+\<function\>,' .
+	\ '\%(^\s*\)\@<=\%(\<\%(private\|public\)\>\s\+\)\=\<sub\>\s\+:\%(^\s*\)\@<=\<end\>\s\+\<sub\>'
+  let b:undo_ftplugin .= " | unlet! b:match_words b:match_ignorecase"
+endif
 
-" NOTE the double escaping \\|
-nnoremap <buffer> <silent> [[ :call <SID>VbSearch('^\s*\(\(private\|public\)\s\+\)\=\(function\\|sub\)', 'bW')<cr>
-nnoremap <buffer> <silent> ]] :call <SID>VbSearch('^\s*\(\(private\|public\)\s\+\)\=\(function\\|sub\)', 'W')<cr>
-nnoremap <buffer> <silent> [] :call <SID>VbSearch('^\s*\<end\>\s\+\(function\\|sub\)', 'bW')<cr>
-nnoremap <buffer> <silent> ][ :call <SID>VbSearch('^\s*\<end\>\s\+\(function\\|sub\)', 'W')<cr>
-
-" matchit support
-if exists("loaded_matchit")
-    let b:match_ignorecase=1
-    let b:match_words=
-    \ '\%(^\s*\)\@<=\<if\>.*\<then\>\s*$:\%(^\s*\)\@<=\<else\>:\%(^\s*\)\@<=\<elseif\>:\%(^\s*\)\@<=\<end\>\s\+\<if\>,' .
-    \ '\%(^\s*\)\@<=\<for\>:\%(^\s*\)\@<=\<next\>,' .
-    \ '\%(^\s*\)\@<=\<while\>:\%(^\s*\)\@<=\<wend\>,' .
-    \ '\%(^\s*\)\@<=\<do\>:\%(^\s*\)\@<=\<loop\>\s\+\<while\>,' .
-    \ '\%(^\s*\)\@<=\<select\>\s\+\<case\>:\%(^\s*\)\@<=\<case\>:\%(^\s*\)\@<=\<end\>\s\+\<select\>,' .
-    \ '\%(^\s*\)\@<=\<enum\>:\%(^\s*\)\@<=\<end\>\s\<enum\>,' .
-    \ '\%(^\s*\)\@<=\<with\>:\%(^\s*\)\@<=\<end\>\s\<with\>,' .
-    \ '\%(^\s*\)\@<=\%(\<\%(private\|public\)\>\s\+\)\=\<function\>\s\+\([^ \t(]\+\):\%(^\s*\)\@<=\<\1\>\s*=:\%(^\s*\)\@<=\<end\>\s\+\<function\>,' .
-    \ '\%(^\s*\)\@<=\%(\<\%(private\|public\)\>\s\+\)\=\<sub\>\s\+:\%(^\s*\)\@<=\<end\>\s\+\<sub\>'
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+  let b:browsefilter = "Visual Basic Source Files (*.bas)\t*.bas\n" .
+	\	       "Visual Basic Form Files (*.frm)\t*.frm\n" .
+	\	       "All Files (*.*)\t*.*\n"
+  let b:undo_ftplugin .= " | unlet! b:browsefilter"
 endif
 
 let &cpo = s:cpo_save
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index cb2f3e845..1e6f91b3a 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -39,14 +39,18 @@ endif
 
 let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
 
-if exists("*json_decode") && executable('zig')
+if !exists('g:zig_std_dir') && exists('*json_decode') && executable('zig')
     silent let s:env = system('zig env')
     if v:shell_error == 0
-        let &l:path=json_decode(s:env)['std_dir'] . ',' . &l:path
+        let g:zig_std_dir = json_decode(s:env)['std_dir']
     endif
     unlet! s:env
 endif
 
+if exists('g:zig_std_dir')
+    let &l:path = g:zig_std_dir . ',' . &l:path
+endif
+
 let b:undo_ftplugin =
     \ 'setl isk< et< ts< sts< sw< fo< sua< mp< com< cms< inex< inc< pa<'
 
diff --git a/ftplugin/zimbu.vim b/ftplugin/zimbu.vim
index a16fe8c02..0605d513d 100644
--- a/ftplugin/zimbu.vim
+++ b/ftplugin/zimbu.vim
@@ -5,7 +5,7 @@ endif
 " Vim filetype plugin file
 " Language:	Zimbu
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2017 Dec 05
+" Last Change:	2021 Nov 12
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -38,9 +38,11 @@ setlocal errorformat^=%f\ line\ %l\ col\ %c:\ %m,ERROR:\ %m
 
 " When the matchit plugin is loaded, this makes the % command skip parens and
 " braces in comments.
-let b:match_words = '\(^\s*\)\@<=\(MODULE\|CLASS\|INTERFACE\|BITS\|ENUM\|SHARED\|FUNC\|REPLACE\|DEFINE\|PROC\|EQUAL\|MAIN\|IF\|GENERATE_IF\|WHILE\|REPEAT\|WITH\|DO\|FOR\|SWITCH\|TRY\)\>\|{\s*$:\(^\s*\)\@<=\(ELSE\|ELSEIF\|GENERATE_ELSE\|GENERATE_ELSEIF\|CATCH\|FINALLY\)\>:\(^\s*\)\@<=\(}\|\<UNTIL\>\)'
-
-let b:match_skip = 's:comment\|string\|zimbuchar'
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_words = '\(^\s*\)\@<=\(MODULE\|CLASS\|INTERFACE\|BITS\|ENUM\|SHARED\|FUNC\|REPLACE\|DEFINE\|PROC\|EQUAL\|MAIN\|IF\|GENERATE_IF\|WHILE\|REPEAT\|WITH\|DO\|FOR\|SWITCH\|TRY\)\>\|{\s*$:\(^\s*\)\@<=\(ELSE\|ELSEIF\|GENERATE_ELSE\|GENERATE_ELSEIF\|CATCH\|FINALLY\)\>:\(^\s*\)\@<=\(}\|\<UNTIL\>\)'
+  let b:match_skip = 's:comment\|string\|zimbuchar'
+  let b:undo_ftplugin .= " | unlet! b:match_words b:match_skip"
+endif
 
 setlocal tw=78
 setlocal et sts=2 sw=2
@@ -139,9 +141,60 @@ iabbr <buffer> <expr> until GCUpperSpace("until")
 iabbr <buffer> <expr> while GCUpperSpace("while")
 iabbr <buffer> <expr> repeat GCUpper("repeat")
 
+let b:undo_ftplugin ..=
+      \ " | iunabbr <buffer> alias" ..
+      \ " | iunabbr <buffer> arg" ..
+      \ " | iunabbr <buffer> break" ..
+      \ " | iunabbr <buffer> case" ..
+      \ " | iunabbr <buffer> catch" ..
+      \ " | iunabbr <buffer> check" ..
+      \ " | iunabbr <buffer> class" ..
+      \ " | iunabbr <buffer> interface" ..
+      \ " | iunabbr <buffer> implements" ..
+      \ " | iunabbr <buffer> shared" ..
+      \ " | iunabbr <buffer> continue" ..
+      \ " | iunabbr <buffer> default" ..
+      \ " | iunabbr <buffer> extends" ..
+      \ " | iunabbr <buffer> do" ..
+      \ " | iunabbr <buffer> else" ..
+      \ " | iunabbr <buffer> elseif" ..
+      \ " | iunabbr <buffer> enum" ..
+      \ " | iunabbr <buffer> exit" ..
+      \ " | iunabbr <buffer> false" ..
+      \ " | iunabbr <buffer> fail" ..
+      \ " | iunabbr <buffer> finally" ..
+      \ " | iunabbr <buffer> for" ..
+      \ " | iunabbr <buffer> func" ..
+      \ " | iunabbr <buffer> if" ..
+      \ " | iunabbr <buffer> import" ..
+      \ " | iunabbr <buffer> in" ..
+      \ " | iunabbr <buffer> io" ..
+      \ " | iunabbr <buffer> main" ..
+      \ " | iunabbr <buffer> module" ..
+      \ " | iunabbr <buffer> new" ..
+      \ " | iunabbr <buffer> nil" ..
+      \ " | iunabbr <buffer> ok" ..
+      \ " | iunabbr <buffer> proc" ..
+      \ " | iunabbr <buffer> proceed" ..
+      \ " | iunabbr <buffer> return" ..
+      \ " | iunabbr <buffer> step" ..
+      \ " | iunabbr <buffer> switch" ..
+      \ " | iunabbr <buffer> sys" ..
+      \ " | iunabbr <buffer> this" ..
+      \ " | iunabbr <buffer> throw" ..
+      \ " | iunabbr <buffer> try" ..
+      \ " | iunabbr <buffer> to" ..
+      \ " | iunabbr <buffer> true" ..
+      \ " | iunabbr <buffer> until" ..
+      \ " | iunabbr <buffer> while" ..
+      \ " | iunabbr <buffer> repeat"
+
 if !exists("no_plugin_maps") && !exists("no_zimbu_maps")
   nnoremap <silent> <buffer> [[ m`:call ZimbuGoStartBlock()<CR>
   nnoremap <silent> <buffer> ]] m`:call ZimbuGoEndBlock()<CR>
+  let b:undo_ftplugin ..=
+	\ " | silent! exe 'nunmap <buffer> [['" ..
+	\ " | silent! exe 'nunmap <buffer> ]]'"
 endif
 
 " Using a function makes sure the search pattern is restored
diff --git a/indent/ada.vim b/indent/ada.vim
index 1127ca119..261d2af4d 100644
--- a/indent/ada.vim
+++ b/indent/ada.vim
@@ -223,7 +223,7 @@ function GetAdaIndent()
       " Move indent in twice (next 'when' will move back)
       let ind = ind + 2 * shiftwidth()
    elseif line =~ '^\s*end\s*record\>'
-      " Move indent back to tallying 'type' preceeding the 'record'.
+      " Move indent back to tallying 'type' preceding the 'record'.
       " Allow indent to be equal to 'end record's.
       let ind = s:MainBlockIndent( ind+shiftwidth(), lnum, 'type\>', '' )
    elseif line =~ '\(^\s*new\>.*\)\@<!)\s*[;,]\s*$'
diff --git a/indent/ansible.vim b/indent/ansible.vim
index 65a51a64c..6b2c49231 100644
--- a/indent/ansible.vim
+++ b/indent/ansible.vim
@@ -22,6 +22,7 @@ let s:named_module_entry = '\v^\s*-\s*(name|hosts|role):\s*\S' " - name: 'do stu
 let s:dictionary_entry = '\v^\s*[^:-]+:\s*$' " with_items:
 let s:key_value = '\v^\s*[^:-]+:\s*\S' " apt: name=package
 let s:scalar_value = '\v:\s*[>|\|]\s*$' " shell: >
+let s:blank = '\v^\s*$' " line with only spaces
 
 if exists('*GetAnsibleIndent')
   finish
@@ -37,26 +38,29 @@ function GetAnsibleIndent(lnum)
     endif
   endif
   let prevlnum = prevnonblank(a:lnum - 1)
-  let maintain = indent(prevlnum)
-  let increase = maintain + &sw
+  let default = GetYAMLIndent(a:lnum)
+  let increase = indent(prevlnum) + &sw
 
-  let line = getline(prevlnum)
-  if line =~ s:array_entry
-    if line =~ s:named_module_entry
+  let prevline = getline(prevlnum)
+  let line = getline(a:lnum)
+  if line !~ s:blank
+    return default  " we only special case blank lines
+  elseif prevline =~ s:array_entry
+    if prevline =~ s:named_module_entry
       return increase
     else
-      return maintain
+      return default
     endif
-  elseif line =~ s:dictionary_entry
+  elseif prevline =~ s:dictionary_entry
     return increase
-  elseif line =~ s:key_value
-    if line =~ s:scalar_value
+  elseif prevline =~ s:key_value
+    if prevline =~ s:scalar_value
       return increase
     else
-      return maintain
+      return default
     endif
   else
-    return maintain
+    return default
   endif
 endfunction
 
diff --git a/indent/cdl.vim b/indent/cdl.vim
index 4c679e838..9d39a01b3 100644
--- a/indent/cdl.vim
+++ b/indent/cdl.vim
@@ -3,7 +3,8 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'cdl', 'indent/cdl.vim')
 endif
 
 " Description:	Comshare Dimension Definition Language (CDL)
-" Author:	Raul Segura Acevedo <raulseguraaceved@netscape.net>
+" Maintainer:	Raul Segura Acevedo <raulseguraaceved@netscape.net> (Invalid email address)
+" 		Doug Kearns <dougkearns@gmail.com>
 " Last Change:	Fri Nov 30 13:35:48  2001 CST
 
 if exists("b:did_indent")
@@ -20,8 +21,8 @@ if exists("*CdlGetIndent")
     "finish
 endif
 
-" find out if an "...=..." expresion is an assignment (or a conditional)
-" it scans 'line' first, and then the previos lines
+" find out if an "...=..." expression is an assignment (or a conditional)
+" it scans 'line' first, and then the previous lines
 fun! CdlAsignment(lnum, line)
   let f = -1
   let lnum = a:lnum
@@ -37,7 +38,7 @@ fun! CdlAsignment(lnum, line)
       endif
       " it's formula if there's a ';', 'elsE', 'theN', 'enDif' or 'expr'
       " conditional if there's a '<', '>', 'elseif', 'if', 'and', 'or', 'not',
-      " 'memberis', 'childrenof' and other \k\+of funcions
+      " 'memberis', 'childrenof' and other \k\+of functions
       let f = line[inicio-1] =~? '[en;]' || strpart(line, inicio-4, 4) =~? 'ndif\|expr'
     endw
     let lnum = prevnonblank(lnum-1)
@@ -110,7 +111,7 @@ fun! CdlGetIndent(lnum)
     elseif c == '(' || c ==? 'f' " '(' or 'if'
       let ind = ind + shiftwidth()
     else " c == '='
-      " if it is an asignment increase indent
+      " if it is an assignment increase indent
       if f == -1 " we don't know yet, find out
 	let f = CdlAsignment(lnum, strpart(line, 0, inicio))
       end
@@ -121,11 +122,11 @@ fun! CdlGetIndent(lnum)
   endw
 
   " CURRENT LINE, if it starts with a closing element, decrease indent
-  " or if it starts with '=' (asignment), increase indent
+  " or if it starts with '=' (assignment), increase indent
   if match(thisline, '^\c\s*\(else\|then\|endif\|[);]\)') >= 0
     let ind = ind - shiftwidth()
   elseif match(thisline, '^\s*=') >= 0
-    if f == -1 " we don't know yet if is an asignment, find out
+    if f == -1 " we don't know yet if is an assignment, find out
       let f = CdlAsignment(lnum, "")
     end
     if f == 1 " formula increase it
diff --git a/indent/clojure.vim b/indent/clojure.vim
index 7f79c9a23..c60693241 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -60,8 +60,7 @@ if exists("*searchpairpos")
 	endfunction
 
 	function! s:ignored_region()
-		let name = s:syn_id_name()
-		return (name =~? '\vstring|regex|comment|character') && (name !~# '^clojureCommentReaderMacro\(Form\)\?$')
+		return s:syn_id_name() =~? '\vstring|regex|comment|character'
 	endfunction
 
 	function! s:current_char()
@@ -76,14 +75,10 @@ if exists("*searchpairpos")
 		return s:current_char() =~# '\v[\(\)\[\]\{\}]' && !s:ignored_region()
 	endfunction
 
-	" Returns 1 if string matches a pattern in 'patterns', which may be a
-	" list of patterns, or a comma-delimited string of implicitly anchored
-	" patterns.
+	" Returns 1 if string matches a pattern in 'patterns', which should be
+	" a list of patterns.
 	function! s:match_one(patterns, string)
-		let list = type(a:patterns) == type([])
-		           \ ? a:patterns
-		           \ : map(split(a:patterns, ','), '"^" . v:val . "$"')
-		for pat in list
+		for pat in a:patterns
 			if a:string =~# pat | return 1 | endif
 		endfor
 	endfunction
diff --git a/indent/cobol.vim b/indent/cobol.vim
index 7a0b7f074..37af5dcd1 100644
--- a/indent/cobol.vim
+++ b/indent/cobol.vim
@@ -11,6 +11,7 @@ endif
 " Ankit Jain      22.03.2019     Changes & fixes:
 "                                Allow chars in 1st 6 columns
 "                                #C22032019
+" Ankit Jain      24.09.2021     add b:undo_indent (request by tpope)
 
 if exists("b:did_indent")
     finish
@@ -22,6 +23,8 @@ setlocal indentexpr=GetCobolIndent(v:lnum)
 setlocal indentkeys&
 setlocal indentkeys+=0<*>,0/,0$,0=01,=~division,=~section,0=~end,0=~then,0=~else,0=~when,*<Return>,.
 
+let b:undo_indent = "setlocal expandtab< indentexpr< indentkeys<"
+
 " Only define the function once.
 if exists("*GetCobolIndent")
     finish
diff --git a/indent/config.vim b/indent/config.vim
index 986b8c4dc..5b1a3aa4c 100644
--- a/indent/config.vim
+++ b/indent/config.vim
@@ -3,11 +3,12 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'config', 'indent/config.vim')
 endif
 
 " Vim indent file
-" Language:             Autoconf configure.{ac,in} file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2006-12-20
-" TODO:                 how about nested [()]'s in one line
-"                   what's wrong with '\\\@!'?
+" Language:		Autoconf configure.{ac,in} file
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Last Change:		24 Sep 2021
+
+" TODO: how about nested [()]'s in one line what's wrong with '\\\@!'?
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -20,6 +21,8 @@ setlocal indentexpr=GetConfigIndent()
 setlocal indentkeys=!^F,o,O,=then,=do,=else,=elif,=esac,=fi,=fin,=fil,=done
 setlocal nosmartindent
 
+let b:undo_indent = "setl inde< indk< si<"
+
 " Only define the function once.
 if exists("*GetConfigIndent")
   finish
@@ -66,8 +69,8 @@ function GetConfigIndent()
     let ind = s:GetOffsetOf(line, '\[')
   endif
 
-  " if previous line had an unmatched closing parantheses,
-  " indent to the matching opening parantheses
+  " if previous line had an unmatched closing parentheses,
+  " indent to the matching opening parentheses
   if line =~ '[^(]\+\\\@<!)$'
     call search(')', 'bW')
     let lnum = searchpair('\\\@<!(', '', ')', 'bWn')
diff --git a/indent/css.vim b/indent/css.vim
index b383d4487..9f2bfb7a6 100644
--- a/indent/css.vim
+++ b/indent/css.vim
@@ -3,10 +3,12 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'css', 'indent/css.vim')
 endif
 
 " Vim indent file
-" Language:	    CSS
-" Maintainer:	    Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2012-05-30
-"		    Use of shiftwidth() added by Oleg Zubchenko.	
+" Language:		CSS
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Last Change:		24 Sep 2021
+
+" Use of shiftwidth() added by Oleg Zubchenko.
 
 if exists("b:did_indent")
   finish
@@ -17,7 +19,7 @@ setlocal indentexpr=GetCSSIndent()
 setlocal indentkeys=0{,0},!^F,o,O
 setlocal nosmartindent
 
-let b:undo_indent = "setl smartindent< indentkeys< indentexpr<"
+let b:undo_indent = "setl inde< indk< si<"
 
 if exists("*GetCSSIndent")
   finish
diff --git a/indent/dosbatch.vim b/indent/dosbatch.vim
index a98c38868..d91a42cd5 100644
--- a/indent/dosbatch.vim
+++ b/indent/dosbatch.vim
@@ -6,7 +6,7 @@ endif
 " Language:	MSDOS batch file (with NT command extensions)
 " Maintainer:	Ken Takata
 " URL:		https://github.com/k-takata/vim-dosbatch-indent
-" Last Change:	2017 May 10
+" Last Change:	2021-10-18
 " Filenames:	*.bat
 " License:	VIM License
 
@@ -21,6 +21,8 @@ setlocal indentexpr=GetDosBatchIndent(v:lnum)
 setlocal indentkeys=!^F,o,O
 setlocal indentkeys+=0=)
 
+let b:undo_indent = "setl ai< inde< indk< si<"
+
 if exists("*GetDosBatchIndent")
   finish
 endif
diff --git a/indent/dtd.vim b/indent/dtd.vim
index 7faa9483f..413634109 100644
--- a/indent/dtd.vim
+++ b/indent/dtd.vim
@@ -3,14 +3,17 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'dtd', 'indent/dtd.vim')
 endif
 
 " Vim indent file
-" Language:    	    DTD (Document Type Definition for XML)
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2011-07-08
+" Language:		DTD (Document Type Definition for XML)
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Last Change:		24 Sep 2021
 
 setlocal indentexpr=GetDTDIndent()
 setlocal indentkeys=!^F,o,O,>
 setlocal nosmartindent
 
+let b:undo_indent = "setl inde< indk< si<"
+
 if exists("*GetDTDIndent")
   finish
 endif
@@ -123,16 +126,16 @@ function GetDTDIndent()
     " Next comes the content model.  If the token we’ve found isn’t a
     " parenthesis it must be either ANY, EMPTY or some random junk.  Either
     " way, we’re done indenting this element, so set it to that of the first
-    " line so that the terminating “>” winds up having the same indention.
+    " line so that the terminating “>” winds up having the same indentation.
     if token != '('
       return indent
     endif
 
     " Now go through the content model.  We need to keep track of the nesting
     " of parentheses.  As soon as we hit 0 we’re done.  If that happens we must
-    " have a complete content model.  Thus set indention to be the same as that
+    " have a complete content model.  Thus set indentation to be the same as that
     " of the first line so that the terminating “>” winds up having the same
-    " indention.  Otherwise, we’ll indent to the innermost parentheses not yet
+    " indentation.  Otherwise, we’ll indent to the innermost parentheses not yet
     " matched.
     let [indent_of_innermost, end] = s:indent_to_innermost_parentheses(line, end)
     if indent_of_innermost != -1
diff --git a/indent/dune.vim b/indent/dune.vim
index 009f7eba2..429d6354d 100644
--- a/indent/dune.vim
+++ b/indent/dune.vim
@@ -15,3 +15,5 @@ let b:did_indent = 1
 
 " dune format-dune-file uses 1 space to indent
 setlocal softtabstop=1 shiftwidth=1 expandtab
+
+let b:undo_indent = "setl et< sts< sw<"
diff --git a/indent/dylan.vim b/indent/dylan.vim
index 4e83a51da..826265d7d 100644
--- a/indent/dylan.vim
+++ b/indent/dylan.vim
@@ -4,9 +4,10 @@ endif
 
 " Vim indent file
 " Language:	Dylan
+" Maintainer:	Brent A. Fulgham <bfulgham@debian.org> (Invalid email address)
+" 		Doug Kearns <dougkearns@gmail.com>
 " Version:	0.01
 " Last Change:	2017 Jun 13
-" Maintainer:	Brent A. Fulgham <bfulgham@debian.org>
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
diff --git a/indent/erlang.vim b/indent/erlang.vim
index 5a5637a7f..adfd0dd93 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -36,6 +36,8 @@ endif
 setlocal indentexpr=ErlangIndent()
 setlocal indentkeys+=0=end,0=of,0=catch,0=after,0=when,0=),0=],0=},0=>>
 
+let b:undo_indent = "setl inde< indk<"
+
 " Only define the functions once
 if exists("*ErlangIndent")
   finish
diff --git a/indent/eterm.vim b/indent/eterm.vim
index 88502cf47..67738fe94 100644
--- a/indent/eterm.vim
+++ b/indent/eterm.vim
@@ -3,9 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'eterm', 'indent/eterm.vim')
 endif
 
 " Vim indent file
-" Language:             Eterm configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2006-12-20
+" Language:		Eterm configuration file
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Last Change:		24 Sep 2021
 
 if exists("b:did_indent")
   finish
@@ -16,6 +17,8 @@ setlocal indentexpr=GetEtermIndent()
 setlocal indentkeys=!^F,o,O,=end
 setlocal nosmartindent
 
+let b:undo_indent = "setl inde< indk< si<"
+
 if exists("*GetEtermIndent")
   finish
 endif
diff --git a/indent/framescript.vim b/indent/framescript.vim
index 883f4a4d6..04abe1bd1 100644
--- a/indent/framescript.vim
+++ b/indent/framescript.vim
@@ -3,9 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'framescript', 'indent/framesc
 endif
 
 " Vim indent file
-" Language:             FrameScript
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2008-07-19
+" Language:		FrameScript
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Last Change:		24 Sep 2021
 
 if exists("b:did_indent")
   finish
@@ -16,6 +17,8 @@ setlocal indentexpr=GetFrameScriptIndent()
 setlocal indentkeys=!^F,o,O,0=~Else,0=~EndIf,0=~EndLoop,0=~EndSub
 setlocal nosmartindent
 
+let b:undo_indent = "setl inde< indk< si<"
+
 if exists("*GetFrameScriptIndent")
   finish
 endif
diff --git a/indent/haml.vim b/indent/haml.vim
index f0efff186..ae4f2d105 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -18,6 +18,8 @@ setlocal autoindent
 setlocal indentexpr=GetHamlIndent()
 setlocal indentkeys=o,O,*<Return>,},],0),!^F,=end,=else,=elsif,=rescue,=ensure,=when
 
+let b:undo_indent = "setl ai< inde< indk<"
+
 " Only define the function once.
 if exists("*GetHamlIndent")
   finish
diff --git a/indent/hamster.vim b/indent/hamster.vim
index 86f86bf8d..0e7ced5cc 100644
--- a/indent/hamster.vim
+++ b/indent/hamster.vim
@@ -4,9 +4,15 @@ endif
 
 " Vim indent file
 " Language:    Hamster Script 
-" Version:     2.0.6.0
-" Last Change: Wed Nov 08 2006 12:02:42 PM
-" Maintainer:  David Fishburn <fishburn@ianywhere.com>
+" Version:     2.0.6.1
+" Last Change: 2021 Oct 11
+" Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
+" Download: https://www.vim.org/scripts/script.php?script_id=1099
+"
+"    2.0.6.1 (Oct 2021)
+"        Added b:undo_indent
+"        Added cpo check
+"
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -18,12 +24,17 @@ setlocal indentkeys+==~if,=~else,=~endif,=~endfor,=~endwhile
 setlocal indentkeys+==~do,=~until,=~while,=~repeat,=~for,=~loop
 setlocal indentkeys+==~sub,=~endsub
 
+let b:undo_indent = "setl indentkeys<"
+
 " Define the appropriate indent function but only once
 setlocal indentexpr=HamGetFreeIndent()
 if exists("*HamGetFreeIndent")
   finish
 endif
 
+let s:keepcpo = &cpo
+set cpo&vim
+
 function HamGetIndent(lnum)
   let ind = indent(a:lnum)
   let prevline=getline(a:lnum)
@@ -56,4 +67,8 @@ function HamGetFreeIndent()
   return ind
 endfunction
 
+" Restore:
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
 " vim:sw=2 tw=80
diff --git a/indent/javascript.vim b/indent/javascript.vim
index 0a3b3bc2d..c3880b455 100644
--- a/indent/javascript.vim
+++ b/indent/javascript.vim
@@ -23,7 +23,7 @@ setlocal indentkeys+=0],0)
 "       "+norm! gg=G" '+%print' '+:q!' testfile.js \
 "       | diff -uBZ testfile.js -
 
-let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
+let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys< lisp<'
 
 " Only define the function once.
 if exists('*GetJavascriptIndent')
diff --git a/indent/julia.vim b/indent/julia.vim
index d118f3f47..9f7c4dd03 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -18,6 +18,8 @@ setlocal indentkeys-=0{
 setlocal indentkeys-=0}
 setlocal nosmartindent
 
+let b:undo_indent = "setl ai< inde< indk< si<"
+
 " Only define the function once.
 if exists("*GetJuliaIndent")
   finish
diff --git a/indent/kotlin.vim b/indent/kotlin.vim
index 8fdb2f850..fd7e0cea7 100644
--- a/indent/kotlin.vim
+++ b/indent/kotlin.vim
@@ -3,9 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'kotlin', 'indent/kotlin.vim')
 endif
 
 " Vim indent file
-" Language: Kotlin
-" Maintainer: Alexander Udalov
-" Latest Revision: 26 May 2019
+" Language:     Kotlin
+" Maintainer:   Alexander Udalov
+" URL:          https://github.com/udalov/kotlin-vim
+" Last Change:  7 November 2021
 
 if exists('b:did_indent')
     finish
@@ -49,11 +50,11 @@ function! GetKotlinIndent()
     let cur_close_brace = cur =~ '^\s*}.*$'
 
     if prev_open_paren && !cur_close_paren || prev_open_brace && !cur_close_brace
-        return prev_indent + &shiftwidth
+        return prev_indent + shiftwidth()
     endif
 
     if cur_close_paren && !prev_open_paren || cur_close_brace && !prev_open_brace
-        return prev_indent - &shiftwidth
+        return prev_indent - shiftwidth()
     endif
 
     return prev_indent
diff --git a/indent/ld.vim b/indent/ld.vim
index 339c15425..6fcd2f601 100644
--- a/indent/ld.vim
+++ b/indent/ld.vim
@@ -3,9 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'ld', 'indent/ld.vim')
 endif
 
 " Vim indent file
-" Language:             ld(1) script
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2006-12-20
+" Language:		ld(1) script
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Last Change:		24 Sep 2021
 
 if exists("b:did_indent")
   finish
@@ -16,6 +17,8 @@ setlocal indentexpr=GetLDIndent()
 setlocal indentkeys=0{,0},!^F,o,O
 setlocal nosmartindent
 
+let b:undo_indent = "setl inde< indk< si<"
+
 if exists("*GetLDIndent")
   finish
 endif
diff --git a/indent/lifelines.vim b/indent/lifelines.vim
index 960a01b3c..d569def5a 100644
--- a/indent/lifelines.vim
+++ b/indent/lifelines.vim
@@ -15,7 +15,7 @@ endif
 let b:did_indent = 1
 
 " LifeLines uses cindent without ; line terminator, C functions
-" declarations, C keywords, C++ formating
+" declarations, C keywords, C++ formatting
 setlocal cindent
 setlocal cinwords=""
 setlocal cinoptions+=+0
diff --git a/indent/mail.vim b/indent/mail.vim
index 633a2da5d..e5fb96bbe 100644
--- a/indent/mail.vim
+++ b/indent/mail.vim
@@ -5,7 +5,7 @@ endif
 " Vim indent file
 " Language:	Mail
 " Maintainer:	Bram Moolenaar
-" Last Change:	2009 Jun 03
+" Last Change:	2021 Sep 26
 
 if exists("b:did_indent")
   finish
@@ -15,3 +15,5 @@ let b:did_indent = 1
 " What works best is auto-indenting, disable other indenting.
 " For formatting see the ftplugin.
 setlocal autoindent nosmartindent nocindent indentexpr=
+
+let b:undo_indent = "setl ai< cin< inde< si<"
diff --git a/indent/make.vim b/indent/make.vim
index 59e698abf..728dd944c 100644
--- a/indent/make.vim
+++ b/indent/make.vim
@@ -3,9 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'make', 'indent/make.vim')
 endif
 
 " Vim indent file
-" Language:             Makefile
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2007-05-07
+" Language:		Makefile
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Last Change:		24 Sep 2021
 
 if exists("b:did_indent")
   finish
@@ -16,6 +17,8 @@ setlocal indentexpr=GetMakeIndent()
 setlocal indentkeys=!^F,o,O,<:>,=else,=endif
 setlocal nosmartindent
 
+let b:undo_indent = "setl ai< inde< indk<"
+
 if exists("*GetMakeIndent")
   finish
 endif
diff --git a/indent/meson.vim b/indent/meson.vim
index 65d039e92..eb726902d 100644
--- a/indent/meson.vim
+++ b/indent/meson.vim
@@ -24,6 +24,8 @@ setlocal autoindent	" indentexpr isn't much help otherwise
 setlocal indentexpr=GetMesonIndent(v:lnum)
 setlocal indentkeys+==elif,=else,=endforeach,=endif,0)
 
+let b:undo_indent = "setl ai< inde< indk< lisp<"
+
 " Only define the function once.
 if exists("*GetMesonIndent")
   finish
diff --git a/indent/nginx.vim b/indent/nginx.vim
index e9335e7af..dedcd9709 100644
--- a/indent/nginx.vim
+++ b/indent/nginx.vim
@@ -13,3 +13,5 @@ setlocal indentexpr=
 setlocal cindent
 " Just make sure that the comments are not reset as defs would be.
 setlocal cinkeys-=0#
+
+let b:undo_indent = "setl cin< cink< inde<"
diff --git a/indent/nsis.vim b/indent/nsis.vim
index d6e65634f..a4c09e392 100644
--- a/indent/nsis.vim
+++ b/indent/nsis.vim
@@ -6,7 +6,7 @@ endif
 " Language:		NSIS script
 " Maintainer:		Ken Takata
 " URL:			https://github.com/k-takata/vim-nsis
-" Last Change:		2018-01-21
+" Last Change:		2021-10-18
 " Filenames:		*.nsi
 " License:		VIM License
 
@@ -21,6 +21,8 @@ setlocal indentexpr=GetNsisIndent(v:lnum)
 setlocal indentkeys=!^F,o,O
 setlocal indentkeys+==~${Else,=~${EndIf,=~${EndUnless,=~${AndIf,=~${AndUnless,=~${OrIf,=~${OrUnless,=~${Case,=~${Default,=~${EndSelect,=~${EndSwith,=~${Loop,=~${Next,=~${MementoSectionEnd,=~FunctionEnd,=~SectionEnd,=~SectionGroupEnd,=~PageExEnd,0=~!macroend,0=~!if,0=~!else,0=~!endif
 
+let b:undo_indent = "setl ai< inde< indk< si<"
+
 if exists("*GetNsisIndent")
   finish
 endif
diff --git a/indent/ocaml.vim b/indent/ocaml.vim
index 82e5825e0..e2d098420 100644
--- a/indent/ocaml.vim
+++ b/indent/ocaml.vim
@@ -28,6 +28,8 @@ setlocal indentkeys+=0=and,0=class,0=constraint,0=done,0=else,0=end,0=exception,
 setlocal nolisp
 setlocal nosmartindent
 
+let b:undo_indent = "setl et< inde< indk< lisp< si<"
+
 " At least Marc Weber and Markus Mottl do not like this:
 " setlocal textwidth=80
 
@@ -37,6 +39,7 @@ if !exists("no_ocaml_comments")
    setlocal comments=sr:(*\ ,mb:\ ,ex:*)
    setlocal comments^=sr:(**,mb:\ \ ,ex:*)
    setlocal fo=cqort
+  let b:undo_indent .= " | setl com< fo<"
  endif
 endif
 
diff --git a/indent/occam.vim b/indent/occam.vim
index c9949c3f0..961143541 100644
--- a/indent/occam.vim
+++ b/indent/occam.vim
@@ -4,7 +4,8 @@ endif
 
 " Vim indent file
 " Language:	occam
-" Maintainer:	Mario Schweigler <ms44@kent.ac.uk>
+" Maintainer:	Mario Schweigler <ms44@kent.ac.uk> (Invalid email address)
+" 		Doug Kearns <dougkearns@gmail.com>
 " Last Change:	23 April 2003
 
 " Only load this indent file when no other was loaded.
diff --git a/indent/pascal.vim b/indent/pascal.vim
index d4a6a5a7b..a9b950764 100644
--- a/indent/pascal.vim
+++ b/indent/pascal.vim
@@ -6,11 +6,9 @@ endif
 " Language:    Pascal
 " Maintainer:  Neil Carter <n.carter@swansea.ac.uk>
 " Created:     2004 Jul 13
-" Last Change: 2021 Jul 01
+" Last Change: 2021 Sep 22
 "
-" This is version 2.0, a complete rewrite.
-"
-" For further documentation, see http://psy.swansea.ac.uk/staff/carter/vim/
+" For further documentation, see https://psy.swansea.ac.uk/staff/carter/vim/
 
 
 if exists("b:did_indent")
@@ -24,13 +22,14 @@ setlocal indentkeys+==end;,==const,==type,==var,==begin,==repeat,==until,==for
 setlocal indentkeys+==program,==function,==procedure,==object,==private
 setlocal indentkeys+==record,==if,==else,==case
 
-let b:undo_indent = "setl indentkeys< indentexpr<"
+let b:undo_indent = 'setlocal indentexpr< indentkeys<'
 
 if exists("*GetPascalIndent")
 	finish
 endif
 
 
+" ________________________________________________________________
 function! s:GetPrevNonCommentLineNum( line_num )
 
 	" Skip lines starting with a comment
@@ -48,6 +47,7 @@ function! s:GetPrevNonCommentLineNum( line_num )
 endfunction
 
 
+" ________________________________________________________________
 function! s:PurifyCode( line_num )
 	" Strip any trailing comments and whitespace
 	let pureline = 'TODO'
@@ -55,6 +55,7 @@ function! s:PurifyCode( line_num )
 endfunction
 
 
+" ________________________________________________________________
 function! GetPascalIndent( line_num )
 
 	" Line 0 always goes at column 0
@@ -188,7 +189,7 @@ function! GetPascalIndent( line_num )
 	endif
 
 
-" ____________________________________________________________________
+" ________________________________________________________________
 " Object/Borland Pascal/Delphi Extensions
 "
 " Note that extended-pascal is handled here, unless it is simpler to
@@ -226,8 +227,6 @@ function! GetPascalIndent( line_num )
 	endif
 
 
-" ____________________________________________________________________
-
 	" If nothing changed, return same indent.
 	return indnt
 endfunction
diff --git a/indent/postscr.vim b/indent/postscr.vim
index e3ba79425..5388ce20b 100644
--- a/indent/postscr.vim
+++ b/indent/postscr.vim
@@ -3,9 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'postscr', 'indent/postscr.vim
 endif
 
 " PostScript indent file
-" Language:    PostScript
-" Maintainer:  Mike Williams <mrw@netcomuk.co.uk>
-" Last Change: 2nd July 2001
+" Language:	PostScript
+" Maintainer:	Mike Williams <mrw@netcomuk.co.uk> (Invalid email address)
+" 		Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2nd July 2001
 "
 
 " Only load this indent file when no other was loaded.
diff --git a/indent/pov.vim b/indent/pov.vim
index ae2d15e8f..4c19f164c 100644
--- a/indent/pov.vim
+++ b/indent/pov.vim
@@ -48,7 +48,7 @@ function GetPoVRayIndent()
     return -1
   endif
 
-  " Search backwards for the frist non-empty, non-comment line.
+  " Search backwards for the first non-empty, non-comment line.
   let plnum = prevnonblank(v:lnum - 1)
   let plind = indent(plnum)
   while plnum > 0 && synIDattr(synID(plnum, plind+1, 0), "name") =~? "comment"
diff --git a/indent/prolog.vim b/indent/prolog.vim
index d23510a73..0aef18e83 100644
--- a/indent/prolog.vim
+++ b/indent/prolog.vim
@@ -3,9 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'prolog', 'indent/prolog.vim')
 endif
 
 "  vim: set sw=4 sts=4:
-"  Maintainer	: Gergely Kontra <kgergely@mcl.hu>
-"  Revised on	: 2002.02.18. 23:34:05
-"  Language	: Prolog
+"  Language:	Prolog
+"  Maintainer:	Gergely Kontra <kgergely@mcl.hu> (Invalid email address)
+" 		Doug Kearns <dougkearns@gmail.com>
+"  Revised on:	2002.02.18. 23:34:05
 "  Last change by: Takuya Fujiwara, 2018 Sep 23
 
 " TODO:
diff --git a/indent/readline.vim b/indent/readline.vim
index 100878fa4..21cb0875a 100644
--- a/indent/readline.vim
+++ b/indent/readline.vim
@@ -3,9 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'readline', 'indent/readline.v
 endif
 
 " Vim indent file
-" Language:             readline configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2006-12-20
+" Language:		readline configuration file
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Last Change:		24 Sep 2021
 
 if exists("b:did_indent")
   finish
@@ -16,6 +17,8 @@ setlocal indentexpr=GetReadlineIndent()
 setlocal indentkeys=!^F,o,O,=$else,=$endif
 setlocal nosmartindent
 
+let b:undo_indent = "setl inde< indk< si<"
+
 if exists("*GetReadlineIndent")
   finish
 endif
diff --git a/indent/rust.vim b/indent/rust.vim
index 8be1cc034..87f3d6add 100644
--- a/indent/rust.vim
+++ b/indent/rust.vim
@@ -28,6 +28,8 @@ setlocal indentkeys=0{,0},!^F,o,O,0[,0],0(,0)
 
 setlocal indentexpr=GetRustIndent(v:lnum)
 
+let b:undo_indent = "setlocal cindent< cinoptions< cinkeys< cinwords< lisp< autoindent< indentkeys< indentexpr<"
+
 " Only define the function once.
 if exists("*GetRustIndent")
     finish
diff --git a/indent/sdl.vim b/indent/sdl.vim
index 19c9d2645..7046c5243 100644
--- a/indent/sdl.vim
+++ b/indent/sdl.vim
@@ -5,7 +5,7 @@ endif
 " Vim indent file
 " Language:	SDL
 " Maintainer:	Michael Piefel <entwurf@piefel.de>
-" Last Change:	10 December 2011
+" Last Change:	2021 Oct 03
 
 " Shamelessly stolen from the Vim-Script indent file
 
@@ -18,6 +18,8 @@ let b:did_indent = 1
 setlocal indentexpr=GetSDLIndent()
 setlocal indentkeys+==~end,=~state,*<Return>
 
+let b:undo_indent = "setl inde< indk<"
+
 " Only define the function once.
 if exists("*GetSDLIndent")
 "  finish
diff --git a/indent/svelte.vim b/indent/svelte.vim
index 047d14791..147df65b3 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -183,7 +183,7 @@ function! GetSvelteIndent()
     call s:Log('... or current line is pug template tag')
     let ind = 0
   elseif s:has_init_indent
-    if s:SynSvelteScriptOrStyle(cursyn) && ind < 1
+    if s:SynSvelteScriptOrStyle(cursyn) && ind == 0
       call s:Log('add initial indent')
       let ind = &sw
     endif
diff --git a/indent/systemverilog.vim b/indent/systemverilog.vim
index ed1d97a5b..e39a670f1 100644
--- a/indent/systemverilog.vim
+++ b/indent/systemverilog.vim
@@ -68,7 +68,7 @@ function SystemVerilogIndent()
     let vverb = 0
   endif
 
-  " Indent accoding to last line
+  " Indent according to last line
   " End of multiple-line comment
   if last_line =~ '\*/\s*$' && last_line !~ '/\*.\{-}\*/'
     let ind = ind - offset_comment1
@@ -224,7 +224,7 @@ function SystemVerilogIndent()
 
   endif
 
-  " Return the indention
+  " Return the indentation
   return ind
 endfunction
 
diff --git a/indent/tcl.vim b/indent/tcl.vim
index 47fdb84f6..17e6d896b 100644
--- a/indent/tcl.vim
+++ b/indent/tcl.vim
@@ -3,10 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'tcl', 'indent/tcl.vim')
 endif
 
 " Vim indent file
-" Language:	    	Tcl
-" Latest Update:  	Chris Heithoff <chrisheithoff@gmail.com>
+" Language:		Tcl
+" Maintainer:		Chris Heithoff <chrisheithoff@gmail.com>
 " Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2018-12-05
+" Last Change:		24 Sep 2021
 
 if exists("b:did_indent")
   finish
@@ -17,6 +17,8 @@ setlocal indentexpr=GetTclIndent()
 setlocal indentkeys=0{,0},!^F,o,O,0]
 setlocal nosmartindent
 
+let b:undo_indent = "setl inde< indk< si<"
+
 if exists("*GetTclIndent")
   finish
 endif
diff --git a/indent/teraterm.vim b/indent/teraterm.vim
index c1239038f..efd35c8cc 100644
--- a/indent/teraterm.vim
+++ b/indent/teraterm.vim
@@ -7,7 +7,7 @@ endif
 "		Based on Tera Term Version 4.100
 " Maintainer:	Ken Takata
 " URL:		https://github.com/k-takata/vim-teraterm
-" Last Change:	2018-08-31
+" Last Change:	2021-10-18
 " Filenames:	*.ttl
 " License:	VIM License
 
@@ -22,6 +22,8 @@ setlocal indentexpr=GetTeraTermIndent(v:lnum)
 setlocal indentkeys=!^F,o,O,e
 setlocal indentkeys+==elseif,=endif,=loop,=next,=enduntil,=endwhile
 
+let b:undo_indent = "setl ai< inde< indk< si<"
+
 if exists("*GetTeraTermIndent")
   finish
 endif
diff --git a/indent/treetop.vim b/indent/treetop.vim
index 269be1b57..b3d0c9fe1 100644
--- a/indent/treetop.vim
+++ b/indent/treetop.vim
@@ -38,5 +38,5 @@ function GetTreetopIndent()
     let ind -= shiftwidth()
   end
 
-  retur ind
+  return ind
 endfunction
diff --git a/indent/verilog.vim b/indent/verilog.vim
index 77065208c..2e5cec01b 100644
--- a/indent/verilog.vim
+++ b/indent/verilog.vim
@@ -80,7 +80,7 @@ function GetVerilogIndent()
     let vverb = 0
   endif
 
-  " Indent accoding to last line
+  " Indent according to last line
   " End of multiple-line comment
   if last_line =~ '\*/\s*$' && last_line !~ '/\*.\{-}\*/'
     let ind = ind - offset_comment1
@@ -223,7 +223,7 @@ function GetVerilogIndent()
 
   endif
 
-  " Return the indention
+  " Return the indentation
   return ind
 endfunction
 
diff --git a/indent/zimbu.vim b/indent/zimbu.vim
index 51416adc2..0a8b9041b 100644
--- a/indent/zimbu.vim
+++ b/indent/zimbu.vim
@@ -5,7 +5,7 @@ endif
 " Vim indent file
 " Language:	Zimbu
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Jan 25
+" Last Change:	2021 Sep 26
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -20,7 +20,7 @@ setlocal indentkeys=0{,0},!^F,o,O,0=ELSE,0=ELSEIF,0=CASE,0=DEFAULT,0=FINALLY
 " We impose recommended defaults: no Tabs, 'shiftwidth' = 2
 setlocal sw=2 et
 
-let b:undo_indent = "setl et< sw< ai< indentkeys< indentexpr="
+let b:undo_indent = "setl ai< cin< et< indentkeys< indentexpr< lisp< sw<"
 
 " Only define the function once.
 if exists("*GetZimbuIndent")
diff --git a/packages.yaml b/packages.yaml
index 524f77087..266499338 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1517,11 +1517,6 @@ filetypes:
   - '.zsh*'
   - '*/etc/zprofile'
 ---
-name: zinit
-remote: zinit-zsh/zplugin-vim-syntax
-# just adds to zsh filetype
-filetypes: []
----
 name: slim
 remote: slim-template/vim-slim
 filetypes:
diff --git a/syntax/8th.vim b/syntax/8th.vim
index abad00920..b962e8559 100644
--- a/syntax/8th.vim
+++ b/syntax/8th.vim
@@ -4,7 +4,8 @@ endif
 
 " Vim syntax file
 " Language:     8th
-" Version:      19.01d
+" Version:      21.08
+" Last Change:  2021 Sep 20
 " Maintainer:   Ron Aaron <ron@aaron-tech.com>
 " URL:          https://8th-dev.com/
 " Filetypes:    *.8th
@@ -34,246 +35,318 @@ syn match eighthClassWord "\<\S\+:.\+" contains=eighthClasses
 syn keyword eighthEndOfColonDef ; i;
 syn keyword eighthDefine var var,
 
-" Built in words
+" Built in words:
 com! -nargs=+ Builtin syn keyword eighthBuiltin <args>
-"Builtin ^ < <# <#> = > - -- ,# ; ;; !  ???  / .  .# ' () @ * */ \ 
 
-Builtin  ! G:! #! G:#! ## G:## #> G:#> #if G:#if ' G:' ( G:( (* G:(* (:) G:(:) (code) G:(code) (getc) G:(getc)
-Builtin  (gets) G:(gets) (interp) G:(interp) (needs) G:(needs) (putc) G:(putc) (puts) G:(puts) (putslim) G:(putslim)
-Builtin  (say) G:(say) (stat) G:(stat) ) G:) +listener G:+listener +ref G:+ref ,# G:,# -- G:-- -----BEGIN G:-----BEGIN
-Builtin  -Inf G:-Inf -Inf? G:-Inf? -listener G:-listener -ref G:-ref -rot G:-rot . G:. .# G:.# .needs G:.needs
-Builtin  .r G:.r .s G:.s .stats G:.stats .ver G:.ver .with G:.with 0; G:0; 2dip G:2dip 2drop G:2drop
-Builtin  2dup G:2dup 2over G:2over 2swap G:2swap 3drop G:3drop 4drop G:4drop 8thdt? G:8thdt? 8thver? G:8thver?
-Builtin  : G:: ; G:; ;; G:;; ;;; G:;;; ;then G:;then ;with G:;with <# G:<# <#> G:<#> >clip G:>clip >json G:>json
-Builtin  >kind G:>kind >n G:>n >r G:>r >s G:>s ?: G:?: ??? G:??? @ G:@ Inf G:Inf Inf? G:Inf? NaN G:NaN
-Builtin  NaN? G:NaN? SED-CHECK G:SED-CHECK SED: G:SED: SED: G:SED: \ G:\ ` G:` `` G:`` actor: G:actor:
-Builtin  again G:again ahead G:ahead and G:and appname G:appname apropos G:apropos argc G:argc args G:args
-Builtin  array? G:array? assert G:assert base G:base bi G:bi bits G:bits break G:break break? G:break?
-Builtin  build? G:build? buildver? G:buildver? bye G:bye c# G:c# c/does G:c/does case G:case caseof G:caseof
-Builtin  chdir G:chdir clip> G:clip> clone G:clone clone-shallow G:clone-shallow cold G:cold compat-level G:compat-level
-Builtin  compile G:compile compile? G:compile? conflict G:conflict const G:const container? G:container?
-Builtin  cr G:cr curlang G:curlang curry G:curry curry: G:curry: decimal G:decimal defer: G:defer: deg>rad G:deg>rad
-Builtin  depth G:depth die G:die dip G:dip drop G:drop dstack G:dstack dump G:dump dup G:dup dup? G:dup?
-Builtin  else G:else enum: G:enum: eval G:eval eval! G:eval! eval0 G:eval0 execnull G:execnull expect G:expect
-Builtin  extra! G:extra! extra@ G:extra@ false G:false fnv G:fnv fourth G:fourth free G:free func: G:func:
-Builtin  getc G:getc getcwd G:getcwd getenv G:getenv gets G:gets handler G:handler header G:header help G:help
-Builtin  hex G:hex i: G:i: i; G:i; if G:if if; G:if; isa? G:isa? items-used G:items-used jcall G:jcall
-Builtin  jclass G:jclass jmethod G:jmethod json-nesting G:json-nesting json-pretty G:json-pretty json-throw G:json-throw
-Builtin  json> G:json> k32 G:k32 keep G:keep l: G:l: last G:last lib G:lib libbin G:libbin libc G:libc
+Builtin  args #:args b #:b dhm #:dhm exec# #:exec# id2ns #:id2ns id? #:id? idd #:idd key #:key oa #:oa
+Builtin  oid #:oid okey #:okey with #:with with! #:with! zip #:zip gen-secret 2fa:gen-secret gen-url 2fa:gen-url
+Builtin  validate-code 2fa:validate-code ! G:! #! G:#! ## G:## #> G:#> #if G:#if ' G:' ( G:( (* G:(*
+Builtin  (:) G:(:) (code) G:(code) (defer) G:(defer) (dump) G:(dump) (getc) G:(getc) (gets) G:(gets)
+Builtin  (interp) G:(interp) (log) G:(log) (needs) G:(needs) (parseln) G:(parseln) (putc) G:(putc) (puts) G:(puts)
+Builtin  (putslim) G:(putslim) (stat) G:(stat) (with) G:(with) ) G:) +hook G:+hook +listener G:+listener
+Builtin  +ref G:+ref ,# G:,# -- G:-- -----BEGIN G:-----BEGIN -Inf G:-Inf -Inf? G:-Inf? -hook G:-hook
+Builtin  -listener G:-listener -ref G:-ref -rot G:-rot . G:. .# G:.# .hook G:.hook .needs G:.needs .r G:.r
+Builtin  .s G:.s .s-truncate G:.s-truncate .stats G:.stats .ver G:.ver .with G:.with 0; G:0; 2dip G:2dip
+Builtin  2drop G:2drop 2dup G:2dup 2over G:2over 2swap G:2swap 3drop G:3drop 3rev G:3rev 4drop G:4drop
+Builtin  8thdt? G:8thdt? 8thsku G:8thsku 8thver? G:8thver? 8thvernum? G:8thvernum? : G:: ; G:; ;; G:;;
+Builtin  ;;; G:;;; ;with G:;with <# G:<# <#> G:<#> >clip G:>clip >json G:>json >kind G:>kind >n G:>n
+Builtin  >r G:>r >s G:>s ?: G:?: @ G:@ BITMAP: G:BITMAP: ENUM: G:ENUM: FLAG: G:FLAG: Inf G:Inf Inf? G:Inf?
+Builtin  NaN G:NaN NaN? G:NaN? SED-CHECK G:SED-CHECK SED: G:SED: SED: G:SED: \ G:\ _dup G:_dup _swap G:_swap
+Builtin  actor: G:actor: again G:again ahead G:ahead and G:and appname G:appname apropos G:apropos argc G:argc
+Builtin  args G:args array? G:array? assert G:assert base G:base bi G:bi bits G:bits break G:break break? G:break?
+Builtin  breakif G:breakif build? G:build? buildver? G:buildver? bye G:bye c# G:c# c/does G:c/does case: G:case:
+Builtin  catch G:catch chdir G:chdir clip> G:clip> clone G:clone clone-shallow G:clone-shallow cold G:cold
+Builtin  compile G:compile compile? G:compile? compiling? G:compiling? conflict G:conflict const G:const
+Builtin  container? G:container? counting-allocations G:counting-allocations cr G:cr curlang G:curlang
+Builtin  curry G:curry curry: G:curry: decimal G:decimal default: G:default: defer: G:defer: deferred: G:deferred:
+Builtin  deg>rad G:deg>rad depth G:depth die G:die dip G:dip drop G:drop dstack G:dstack dump G:dump
+Builtin  dup G:dup dup>r G:dup>r dup? G:dup? e# G:e# enum: G:enum: error? G:error? eval G:eval eval! G:eval!
+Builtin  eval0 G:eval0 execnull G:execnull expect G:expect extra! G:extra! extra@ G:extra@ false G:false
+Builtin  fnv G:fnv fourth G:fourth free G:free func: G:func: getc G:getc getcwd G:getcwd getenv G:getenv
+Builtin  gets G:gets handler G:handler header G:header help G:help hex G:hex i: G:i: i; G:i; isa? G:isa?
+Builtin  items-used G:items-used jcall G:jcall jclass G:jclass jmethod G:jmethod json! G:json! json-8th> G:json-8th>
+Builtin  json-nesting G:json-nesting json-pretty G:json-pretty json-throw G:json-throw json> G:json>
+Builtin  json@ G:json@ k32 G:k32 keep G:keep l: G:l: last G:last lib G:lib libbin G:libbin libc G:libc
 Builtin  listener@ G:listener@ literal G:literal locals: G:locals: lock G:lock lock-to G:lock-to locked? G:locked?
-Builtin  log G:log log-async G:log-async log-task G:log-task log-time G:log-time log-time-local G:log-time-local
-Builtin  long-days G:long-days long-months G:long-months loop G:loop loop- G:loop- map? G:map? mark G:mark
-Builtin  mark? G:mark? memfree G:memfree mobile? G:mobile? n# G:n# name>os G:name>os name>sem G:name>sem
-Builtin  ndrop G:ndrop needs G:needs new G:new next-arg G:next-arg nip G:nip noop G:noop not G:not ns G:ns
-Builtin  ns: G:ns: ns>ls G:ns>ls ns>s G:ns>s ns? G:ns? null G:null null; G:null; null? G:null? number? G:number?
-Builtin  off G:off on G:on onexit G:onexit only G:only op! G:op! or G:or os G:os os-names G:os-names
-Builtin  os>long-name G:os>long-name os>name G:os>name over G:over p: G:p: pack G:pack parse G:parse
-Builtin  parsech G:parsech parseln G:parseln parsews G:parsews pick G:pick poke G:poke pool-clear G:pool-clear
-Builtin  prior G:prior private G:private process-args G:process-args prompt G:prompt public G:public
-Builtin  putc G:putc puts G:puts putslim G:putslim quote G:quote r! G:r! r> G:r> r@ G:r@ rad>deg G:rad>deg
-Builtin  rand G:rand rand-pcg G:rand-pcg rand-pcg-seed G:rand-pcg-seed randbuf G:randbuf randbuf-pcg G:randbuf-pcg
-Builtin  rdrop G:rdrop recurse G:recurse recurse-stack G:recurse-stack ref@ G:ref@ reg! G:reg! reg@ G:reg@
-Builtin  regbin@ G:regbin@ remaining-args G:remaining-args repeat G:repeat reset G:reset roll G:roll
-Builtin  rop! G:rop! rot G:rot rpick G:rpick rroll G:rroll rstack G:rstack rswap G:rswap rusage G:rusage
-Builtin  s>ns G:s>ns same? G:same? scriptdir G:scriptdir scriptfile G:scriptfile sem G:sem sem-post G:sem-post
-Builtin  sem-rm G:sem-rm sem-wait G:sem-wait sem-wait? G:sem-wait? sem>name G:sem>name semi-throw G:semi-throw
-Builtin  set-wipe G:set-wipe setenv G:setenv settings! G:settings! settings![] G:settings![] settings@ G:settings@
-Builtin  settings@? G:settings@? settings@[] G:settings@[] sh G:sh sh$ G:sh$ short-days G:short-days
-Builtin  short-months G:short-months sleep G:sleep space G:space stack-check G:stack-check stack-size G:stack-size
-Builtin  step G:step string? G:string? struct: G:struct: swap G:swap syslang G:syslang sysregion G:sysregion
+Builtin  log G:log log-syslog G:log-syslog log-task G:log-task log-time G:log-time log-time-local G:log-time-local
+Builtin  long-days G:long-days long-months G:long-months longjmp G:longjmp lookup G:lookup loop G:loop
+Builtin  loop- G:loop- map? G:map? mark G:mark mark? G:mark? memfree G:memfree mobile? G:mobile? n# G:n#
+Builtin  name>os G:name>os name>sem G:name>sem ndrop G:ndrop needs G:needs new G:new next-arg G:next-arg
+Builtin  nip G:nip noop G:noop not G:not nothrow G:nothrow ns G:ns ns: G:ns: ns>ls G:ns>ls ns>s G:ns>s
+Builtin  ns? G:ns? null G:null null; G:null; null? G:null? number? G:number? of: G:of: off G:off on G:on
+Builtin  onexit G:onexit only G:only op! G:op! or G:or os G:os os-names G:os-names os>long-name G:os>long-name
+Builtin  os>name G:os>name over G:over p: G:p: pack G:pack parse G:parse parse-csv G:parse-csv parsech G:parsech
+Builtin  parseln G:parseln parsews G:parsews pick G:pick poke G:poke pool-clear G:pool-clear pool-clear-all G:pool-clear-all
+Builtin  prior G:prior private G:private process-args G:process-args process-args-fancy G:process-args-fancy
+Builtin  process-args-help G:process-args-help process-args-vars G:process-args-vars prompt G:prompt
+Builtin  public G:public putc G:putc puts G:puts putslim G:putslim quote G:quote r! G:r! r> G:r> r@ G:r@
+Builtin  rad>deg G:rad>deg rand-jit G:rand-jit rand-jsf G:rand-jsf rand-native G:rand-native rand-normal G:rand-normal
+Builtin  rand-pcg G:rand-pcg rand-pcg-seed G:rand-pcg-seed rand-range G:rand-range rand-select G:rand-select
+Builtin  randbuf-pcg G:randbuf-pcg random G:random rdrop G:rdrop recurse G:recurse recurse-stack G:recurse-stack
+Builtin  ref@ G:ref@ reg! G:reg! reg@ G:reg@ regbin@ G:regbin@ remaining-args G:remaining-args repeat G:repeat
+Builtin  required? G:required? requires G:requires reset G:reset roll G:roll rop! G:rop! rot G:rot rpick G:rpick
+Builtin  rroll G:rroll rstack G:rstack rswap G:rswap rusage G:rusage s>ns G:s>ns same? G:same? scriptdir G:scriptdir
+Builtin  scriptfile G:scriptfile sem G:sem sem-post G:sem-post sem-rm G:sem-rm sem-wait G:sem-wait sem-wait? G:sem-wait?
+Builtin  sem>name G:sem>name semi-throw G:semi-throw set-wipe G:set-wipe setenv G:setenv setjmp G:setjmp
+Builtin  settings! G:settings! settings![] G:settings![] settings@ G:settings@ settings@? G:settings@?
+Builtin  settings@[] G:settings@[] sh G:sh sh$ G:sh$ short-days G:short-days short-months G:short-months
+Builtin  sleep G:sleep sleep-until G:sleep-until slog G:slog space G:space stack-check G:stack-check
+Builtin  stack-size G:stack-size step G:step sthrow G:sthrow string? G:string? struct: G:struct: swap G:swap
 Builtin  tab-hook G:tab-hook tell-conflict G:tell-conflict tempdir G:tempdir tempfilename G:tempfilename
-Builtin  then G:then third G:third throw G:throw thrownull G:thrownull times G:times tlog G:tlog tri G:tri
-Builtin  true G:true tuck G:tuck type-check G:type-check typeassert G:typeassert unlock G:unlock unpack G:unpack
-Builtin  until G:until until! G:until! var G:var var, G:var, while G:while while! G:while! with: G:with:
+Builtin  third G:third throw G:throw thrownull G:thrownull times G:times tlog G:tlog tri G:tri true G:true
+Builtin  tuck G:tuck type-check G:type-check typeassert G:typeassert uid G:uid uname G:uname unlock G:unlock
+Builtin  unpack G:unpack until G:until until! G:until! while G:while while! G:while! with: G:with: word? G:word?
 Builtin  words G:words words-like G:words-like words/ G:words/ xchg G:xchg xor G:xor >auth HTTP:>auth
-Builtin  sh I:sh tpush I:tpush trace-word I:trace-word call JSONRPC:call auth-string OAuth:auth-string
-Builtin  gen-nonce OAuth:gen-nonce params OAuth:params call SOAP:call ! a:! + a:+ - a:- 2each a:2each
-Builtin  2map a:2map 2map+ a:2map+ 2map= a:2map= = a:= >map a:>map @ a:@ @@ a:@@ bsearch a:bsearch clear a:clear
-Builtin  close a:close diff a:diff dot a:dot each a:each each-slice a:each-slice exists? a:exists? filter a:filter
-Builtin  generate a:generate group a:group indexof a:indexof insert a:insert intersect a:intersect join a:join
-Builtin  len a:len map a:map map+ a:map+ map= a:map= mean a:mean mean&variance a:mean&variance new a:new
-Builtin  op a:op op! a:op! op= a:op= open a:open pop a:pop push a:push qsort a:qsort randeach a:randeach
-Builtin  reduce a:reduce reduce+ a:reduce+ rev a:rev shift a:shift shuffle a:shuffle slice a:slice slice+ a:slice+
-Builtin  slide a:slide sort a:sort union a:union when a:when when! a:when! x a:x x-each a:x-each xchg a:xchg
-Builtin  y a:y zip a:zip 8thdir app:8thdir asset app:asset atrun app:atrun atrun app:atrun atrun app:atrun
-Builtin  basedir app:basedir current app:current datadir app:datadir exename app:exename isgui app:isgui
-Builtin  main app:main oncrash app:oncrash orientation app:orientation pid app:pid restart app:restart
-Builtin  resumed app:resumed shared? app:shared? standalone app:standalone subdir app:subdir suspended app:suspended
-Builtin  sysquit app:sysquit (here) asm:(here) >n asm:>n avail asm:avail c, asm:c, here! asm:here! n> asm:n>
-Builtin  used asm:used w, asm:w, ! b:! + b:+ / b:/ = b:= >base64 b:>base64 >hex b:>hex >mpack b:>mpack
-Builtin  @ b:@ append b:append base64> b:base64> bit! b:bit! bit@ b:bit@ clear b:clear compress b:compress
-Builtin  conv b:conv each b:each each-slice b:each-slice expand b:expand fill b:fill getb b:getb hex> b:hex>
-Builtin  len b:len mem> b:mem> move b:move mpack-date b:mpack-date mpack-ignore b:mpack-ignore mpack> b:mpack>
-Builtin  new b:new op b:op rev b:rev search b:search shmem b:shmem slice b:slice splice b:splice ungetb b:ungetb
-Builtin  writable b:writable xor b:xor +block bc:+block .blocks bc:.blocks add-block bc:add-block block-hash bc:block-hash
+Builtin  (curry) I:(curry) notimpl I:notimpl sh I:sh trace-word I:trace-word call JSONRPC:call auth-string OAuth:auth-string
+Builtin  gen-nonce OAuth:gen-nonce params OAuth:params call SOAP:call ! a:! + a:+ - a:- / a:/ 2each a:2each
+Builtin  2map a:2map 2map+ a:2map+ 2map= a:2map= = a:= @ a:@ @? a:@? _@ a:_@ all a:all any a:any bsearch a:bsearch
+Builtin  centroid a:centroid clear a:clear close a:close diff a:diff dot a:dot each a:each each! a:each!
+Builtin  each-slice a:each-slice exists? a:exists? filter a:filter generate a:generate group a:group
+Builtin  indexof a:indexof insert a:insert intersect a:intersect join a:join len a:len map a:map map+ a:map+
+Builtin  map= a:map= mean a:mean mean&variance a:mean&variance merge a:merge new a:new op! a:op! open a:open
+Builtin  pop a:pop push a:push qsort a:qsort randeach a:randeach reduce a:reduce reduce+ a:reduce+ remove a:remove
+Builtin  rev a:rev shift a:shift shuffle a:shuffle slice a:slice slice+ a:slice+ slide a:slide smear a:smear
+Builtin  sort a:sort union a:union x a:x x-each a:x-each xchg a:xchg y a:y zip a:zip 8thdir app:8thdir
+Builtin  asset app:asset atrun app:atrun atrun app:atrun atrun app:atrun basedir app:basedir current app:current
+Builtin  datadir app:datadir exename app:exename lowmem app:lowmem main app:main name app:name oncrash app:oncrash
+Builtin  opts! app:opts! opts@ app:opts@ orientation app:orientation orientation! app:orientation! pid app:pid
+Builtin  post-main app:post-main pre-main app:pre-main raise app:raise request-perm app:request-perm
+Builtin  restart app:restart resumed app:resumed signal app:signal standalone app:standalone subdir app:subdir
+Builtin  suspended app:suspended sysquit app:sysquit terminated app:terminated trap app:trap (here) asm:(here)
+Builtin  >n asm:>n avail asm:avail c, asm:c, here! asm:here! n> asm:n> used asm:used w, asm:w, ! b:!
+Builtin  + b:+ / b:/ 1+ b:1+ 1- b:1- = b:= >base16 b:>base16 >base32 b:>base32 >base64 b:>base64 >base85 b:>base85
+Builtin  >hex b:>hex >mpack b:>mpack @ b:@ append b:append base16> b:base16> base32> b:base32> base64> b:base64>
+Builtin  base85> b:base85> bit! b:bit! bit@ b:bit@ clear b:clear compress b:compress conv b:conv each b:each
+Builtin  each! b:each! each-slice b:each-slice expand b:expand fill b:fill getb b:getb hex> b:hex> len b:len
+Builtin  mem> b:mem> move b:move mpack-compat b:mpack-compat mpack-date b:mpack-date mpack-ignore b:mpack-ignore
+Builtin  mpack> b:mpack> n! b:n! n+ b:n+ n@ b:n@ new b:new op b:op pad b:pad rev b:rev search b:search
+Builtin  shmem b:shmem slice b:slice splice b:splice ungetb b:ungetb unpad b:unpad writable b:writable
+Builtin  xor b:xor +block bc:+block .blocks bc:.blocks add-block bc:add-block block-hash bc:block-hash
 Builtin  block@ bc:block@ first-block bc:first-block hash bc:hash last-block bc:last-block load bc:load
 Builtin  new bc:new save bc:save set-sql bc:set-sql validate bc:validate validate-block bc:validate-block
 Builtin  add bloom:add filter bloom:filter in? bloom:in? accept bt:accept ch! bt:ch! ch@ bt:ch@ connect bt:connect
-Builtin  disconnect bt:disconnect err? bt:err? leconnect bt:leconnect lescan bt:lescan listen bt:listen
+Builtin  disconnect bt:disconnect init bt:init leconnect bt:leconnect lescan bt:lescan listen bt:listen
 Builtin  on? bt:on? read bt:read scan bt:scan service? bt:service? services? bt:services? write bt:write
 Builtin  * c:* * c:* + c:+ + c:+ = c:= = c:= >ri c:>ri >ri c:>ri abs c:abs abs c:abs arg c:arg arg c:arg
-Builtin  conj c:conj conj c:conj im c:im n> c:n> new c:new new c:new re c:re >aes128gcm cr:>aes128gcm
-Builtin  >aes256gcm cr:>aes256gcm >cp cr:>cp >cpe cr:>cpe >decrypt cr:>decrypt >edbox cr:>edbox >encrypt cr:>encrypt
-Builtin  >nbuf cr:>nbuf >rsabox cr:>rsabox >uuid cr:>uuid CBC cr:CBC CFB cr:CFB CTR cr:CTR ECB cr:ECB
-Builtin  GCM cr:GCM OFB cr:OFB aad? cr:aad? aes128box-sig cr:aes128box-sig aes128gcm> cr:aes128gcm>
-Builtin  aes256box-sig cr:aes256box-sig aes256gcm> cr:aes256gcm> aesgcm cr:aesgcm blakehash cr:blakehash
-Builtin  chacha20box-sig cr:chacha20box-sig chachapoly cr:chachapoly cipher! cr:cipher! cipher@ cr:cipher@
-Builtin  cp> cr:cp> cpe> cr:cpe> decrypt cr:decrypt decrypt+ cr:decrypt+ decrypt> cr:decrypt> dh-genkey cr:dh-genkey
-Builtin  dh-secret cr:dh-secret dh-sign cr:dh-sign dh-verify cr:dh-verify ebox-sig cr:ebox-sig ecc-genkey cr:ecc-genkey
-Builtin  ecc-secret cr:ecc-secret ecc-sign cr:ecc-sign ecc-verify cr:ecc-verify edbox-sig cr:edbox-sig
-Builtin  edbox> cr:edbox> encrypt cr:encrypt encrypt+ cr:encrypt+ encrypt> cr:encrypt> ensurekey cr:ensurekey
-Builtin  err? cr:err? gcm-tag-size cr:gcm-tag-size genkey cr:genkey hash cr:hash hash! cr:hash! hash+ cr:hash+
-Builtin  hash>b cr:hash>b hash>s cr:hash>s hash@ cr:hash@ hmac cr:hmac hotp cr:hotp iv? cr:iv? mode cr:mode
-Builtin  mode@ cr:mode@ randkey cr:randkey restore cr:restore root-certs cr:root-certs rsa_decrypt cr:rsa_decrypt
-Builtin  rsa_encrypt cr:rsa_encrypt rsa_sign cr:rsa_sign rsa_verify cr:rsa_verify rsabox-sig cr:rsabox-sig
-Builtin  rsabox> cr:rsabox> rsagenkey cr:rsagenkey save cr:save sbox-sig cr:sbox-sig sha1-hmac cr:sha1-hmac
-Builtin  shard cr:shard tag? cr:tag? totp cr:totp totp-epoch cr:totp-epoch totp-time-step cr:totp-time-step
-Builtin  unshard cr:unshard uuid cr:uuid uuid> cr:uuid> validate-pgp-sig cr:validate-pgp-sig (.hebrew) d:(.hebrew)
-Builtin  (.islamic) d:(.islamic) + d:+ +day d:+day +hour d:+hour +min d:+min +msec d:+msec - d:- .hebrew d:.hebrew
-Builtin  .islamic d:.islamic .time d:.time / d:/ = d:= >fixed d:>fixed >hebepoch d:>hebepoch >msec d:>msec
-Builtin  >unix d:>unix >ymd d:>ymd Adar d:Adar Adar2 d:Adar2 Adar2 d:Adar2 Av d:Av Elul d:Elul Fri d:Fri
-Builtin  Heshvan d:Heshvan Iyar d:Iyar Kislev d:Kislev Mon d:Mon Nissan d:Nissan Sat d:Sat Shevat d:Shevat
-Builtin  Sivan d:Sivan Sun d:Sun Tammuz d:Tammuz Tevet d:Tevet Thu d:Thu Tishrei d:Tishrei Tue d:Tue
-Builtin  Wed d:Wed adjust-dst d:adjust-dst between d:between d. d:d. dawn d:dawn days-in-hebrew-year d:days-in-hebrew-year
-Builtin  displaying-hebrew d:displaying-hebrew do-dawn d:do-dawn do-dusk d:do-dusk do-rise d:do-rise
-Builtin  doy d:doy dst? d:dst? dstquery d:dstquery dstzones? d:dstzones? dusk d:dusk elapsed-timer d:elapsed-timer
-Builtin  elapsed-timer-seconds d:elapsed-timer-seconds first-dow d:first-dow fixed> d:fixed> fixed>dow d:fixed>dow
-Builtin  fixed>hebrew d:fixed>hebrew fixed>islamic d:fixed>islamic format d:format hanukkah d:hanukkah
-Builtin  hebrew-epoch d:hebrew-epoch hebrew>fixed d:hebrew>fixed hebrewtoday d:hebrewtoday hmonth-name d:hmonth-name
-Builtin  islamic.epoch d:islamic.epoch islamic>fixed d:islamic>fixed islamictoday d:islamictoday join d:join
-Builtin  last-day-of-hebrew-month d:last-day-of-hebrew-month last-dow d:last-dow last-month d:last-month
-Builtin  last-week d:last-week last-year d:last-year latitude d:latitude longitude d:longitude longitude d:longitude
-Builtin  msec d:msec msec> d:msec> new d:new next-dow d:next-dow next-month d:next-month next-week d:next-week
-Builtin  next-year d:next-year number>hebrew d:number>hebrew omer d:omer parse d:parse pesach d:pesach
+Builtin  conj c:conj conj c:conj im c:im n> c:n> new c:new new c:new re c:re >redir con:>redir accept con:accept
+Builtin  accept-pwd con:accept-pwd ansi? con:ansi? black con:black blue con:blue clreol con:clreol cls con:cls
+Builtin  cyan con:cyan down con:down free con:free getxy con:getxy gotoxy con:gotoxy green con:green
+Builtin  key con:key key? con:key? left con:left load-history con:load-history magenta con:magenta onBlack con:onBlack
+Builtin  onBlue con:onBlue onCyan con:onCyan onGreen con:onGreen onMagenta con:onMagenta onRed con:onRed
+Builtin  onWhite con:onWhite onYellow con:onYellow print con:print red con:red redir> con:redir> redir? con:redir?
+Builtin  right con:right save-history con:save-history size? con:size? up con:up white con:white yellow con:yellow
+Builtin  >aes128gcm cr:>aes128gcm >aes256gcm cr:>aes256gcm >cp cr:>cp >cpe cr:>cpe >decrypt cr:>decrypt
+Builtin  >edbox cr:>edbox >encrypt cr:>encrypt >nbuf cr:>nbuf >rsabox cr:>rsabox >uuid cr:>uuid CBC cr:CBC
+Builtin  CFB cr:CFB CTR cr:CTR ECB cr:ECB GCM cr:GCM OFB cr:OFB aad? cr:aad? aes128box-sig cr:aes128box-sig
+Builtin  aes128gcm> cr:aes128gcm> aes256box-sig cr:aes256box-sig aes256gcm> cr:aes256gcm> aesgcm cr:aesgcm
+Builtin  blakehash cr:blakehash chacha20box-sig cr:chacha20box-sig chachapoly cr:chachapoly cipher! cr:cipher!
+Builtin  cipher@ cr:cipher@ cp> cr:cp> cpe> cr:cpe> decrypt cr:decrypt decrypt+ cr:decrypt+ decrypt> cr:decrypt>
+Builtin  dh-genkey cr:dh-genkey dh-secret cr:dh-secret dh-sign cr:dh-sign dh-verify cr:dh-verify ebox-sig cr:ebox-sig
+Builtin  ecc-genkey cr:ecc-genkey ecc-secret cr:ecc-secret ecc-sign cr:ecc-sign ecc-verify cr:ecc-verify
+Builtin  edbox-sig cr:edbox-sig edbox> cr:edbox> encrypt cr:encrypt encrypt+ cr:encrypt+ encrypt> cr:encrypt>
+Builtin  ensurekey cr:ensurekey gcm-tag-size cr:gcm-tag-size genkey cr:genkey hash cr:hash hash! cr:hash!
+Builtin  hash+ cr:hash+ hash>b cr:hash>b hash>s cr:hash>s hash@ cr:hash@ hmac cr:hmac hotp cr:hotp iv? cr:iv?
+Builtin  mode cr:mode mode@ cr:mode@ rand cr:rand randbuf cr:randbuf randkey cr:randkey restore cr:restore
+Builtin  root-certs cr:root-certs rsa_decrypt cr:rsa_decrypt rsa_encrypt cr:rsa_encrypt rsa_sign cr:rsa_sign
+Builtin  rsa_verify cr:rsa_verify rsabox-sig cr:rsabox-sig rsabox> cr:rsabox> rsagenkey cr:rsagenkey
+Builtin  save cr:save sbox-sig cr:sbox-sig sha1-hmac cr:sha1-hmac shard cr:shard tag? cr:tag? totp cr:totp
+Builtin  totp-epoch cr:totp-epoch totp-time-step cr:totp-time-step unshard cr:unshard uuid cr:uuid uuid> cr:uuid>
+Builtin  validate-pgp-sig cr:validate-pgp-sig (.hebrew) d:(.hebrew) (.islamic) d:(.islamic) + d:+ +day d:+day
+Builtin  +hour d:+hour +min d:+min +msec d:+msec - d:- .hebrew d:.hebrew .islamic d:.islamic .time d:.time
+Builtin  / d:/ = d:= >fixed d:>fixed >hebepoch d:>hebepoch >jdn d:>jdn >msec d:>msec >unix d:>unix >ymd d:>ymd
+Builtin  ?= d:?= Adar d:Adar Adar2 d:Adar2 Adar2 d:Adar2 Av d:Av Elul d:Elul Fri d:Fri Heshvan d:Heshvan
+Builtin  Iyar d:Iyar Kislev d:Kislev Mon d:Mon Nissan d:Nissan Sat d:Sat Shevat d:Shevat Sivan d:Sivan
+Builtin  Sun d:Sun Tammuz d:Tammuz Tevet d:Tevet Thu d:Thu Tishrei d:Tishrei Tue d:Tue Wed d:Wed adjust-dst d:adjust-dst
+Builtin  approx! d:approx! approx? d:approx? approximates! d:approximates! between d:between d. d:d.
+Builtin  dawn d:dawn days-in-hebrew-year d:days-in-hebrew-year displaying-hebrew d:displaying-hebrew
+Builtin  do-dawn d:do-dawn do-dusk d:do-dusk do-rise d:do-rise doy d:doy dst? d:dst? dstquery d:dstquery
+Builtin  dstzones? d:dstzones? dusk d:dusk elapsed-timer d:elapsed-timer elapsed-timer-seconds d:elapsed-timer-seconds
+Builtin  first-dow d:first-dow fixed> d:fixed> fixed>dow d:fixed>dow fixed>hebrew d:fixed>hebrew fixed>islamic d:fixed>islamic
+Builtin  format d:format hanukkah d:hanukkah hebrew-epoch d:hebrew-epoch hebrew>fixed d:hebrew>fixed
+Builtin  hebrewtoday d:hebrewtoday hmonth-name d:hmonth-name islamic.epoch d:islamic.epoch islamic>fixed d:islamic>fixed
+Builtin  islamictoday d:islamictoday jdn> d:jdn> join d:join last-day-of-hebrew-month d:last-day-of-hebrew-month
+Builtin  last-dow d:last-dow last-month d:last-month last-week d:last-week last-year d:last-year latitude d:latitude
+Builtin  longitude d:longitude longitude d:longitude msec d:msec msec> d:msec> new d:new next-dow d:next-dow
+Builtin  next-month d:next-month next-week d:next-week next-year d:next-year number>hebrew d:number>hebrew
+Builtin  omer d:omer parse d:parse parse-approx d:parse-approx parse-range d:parse-range pesach d:pesach
 Builtin  prev-dow d:prev-dow purim d:purim rosh-chodesh? d:rosh-chodesh? rosh-hashanah d:rosh-hashanah
 Builtin  shavuot d:shavuot start-timer d:start-timer sunrise d:sunrise taanit-esther d:taanit-esther
-Builtin  ticks d:ticks ticks/sec d:ticks/sec timer d:timer tisha-beav d:tisha-beav tzadjust d:tzadjust
-Builtin  unix> d:unix> updatetz d:updatetz year@ d:year@ ymd d:ymd ymd> d:ymd> yom-haatsmaut d:yom-haatsmaut
-Builtin  yom-kippur d:yom-kippur add-func db:add-func bind db:bind close db:close col db:col col[] db:col[]
-Builtin  col{} db:col{} err? db:err? errmsg db:errmsg exec db:exec exec-cb db:exec-cb key db:key mysql? db:mysql?
-Builtin  odbc? db:odbc? open db:open open? db:open? prepare db:prepare query db:query query-all db:query-all
-Builtin  rekey db:rekey sqlerrmsg db:sqlerrmsg bp dbg:bp except-task@ dbg:except-task@ go dbg:go line-info dbg:line-info
-Builtin  prompt dbg:prompt stop dbg:stop trace dbg:trace trace-enter dbg:trace-enter trace-leave dbg:trace-leave
-Builtin  abspath f:abspath append f:append associate f:associate atime f:atime canwrite? f:canwrite?
-Builtin  chmod f:chmod close f:close copy f:copy copydir f:copydir create f:create ctime f:ctime dir? f:dir?
-Builtin  dname f:dname eachbuf f:eachbuf eachline f:eachline enssep f:enssep eof? f:eof? err? f:err?
-Builtin  exists? f:exists? flush f:flush fname f:fname getb f:getb getc f:getc getline f:getline getmod f:getmod
-Builtin  glob f:glob glob-nocase f:glob-nocase include f:include launch f:launch link f:link link> f:link>
-Builtin  link? f:link? mkdir f:mkdir mmap f:mmap mmap-range f:mmap-range mmap-range? f:mmap-range? mtime f:mtime
-Builtin  mv f:mv open f:open open-ro f:open-ro popen f:popen print f:print read f:read relpath f:relpath
-Builtin  rglob f:rglob rm f:rm rmdir f:rmdir seek f:seek sep f:sep show f:show size f:size slurp f:slurp
-Builtin  stderr f:stderr stdin f:stdin stdout f:stdout tell f:tell times f:times trash f:trash ungetb f:ungetb
-Builtin  ungetc f:ungetc unzip f:unzip unzip-entry f:unzip-entry watch f:watch write f:write writen f:writen
-Builtin  zip+ f:zip+ zip@ f:zip@ zipentry f:zipentry zipnew f:zipnew zipopen f:zipopen zipsave f:zipsave
-Builtin  bold font:bold face? font:face? glyph-path font:glyph-path glyph-pos font:glyph-pos info font:info
-Builtin  italic font:italic ls font:ls measure font:measure new font:new pixels font:pixels pixels? font:pixels?
-Builtin  points font:points points? font:points? styles font:styles styles? font:styles? underline font:underline
-Builtin  +child g:+child +kind g:+kind +path g:+path -child g:-child /path g:/path >img g:>img >progress g:>progress
-Builtin  add-items g:add-items adjustwidth g:adjustwidth allow-orient g:allow-orient arc g:arc arc2 g:arc2
-Builtin  autohide g:autohide back g:back bezier g:bezier bg g:bg bg? g:bg? bounds g:bounds bounds? g:bounds?
-Builtin  box-label g:box-label btn-font g:btn-font bubble g:bubble button-size g:button-size buttons-visible g:buttons-visible
-Builtin  c-text g:c-text callout g:callout center g:center child g:child clear g:clear clearpath g:clearpath
-Builtin  clr>n g:clr>n coleven g:coleven colordlg g:colordlg colwidth g:colwidth connectededges g:connectededges
-Builtin  contrasting g:contrasting cp g:cp curmouse? g:curmouse? default-font g:default-font deselect-row g:deselect-row
-Builtin  dismiss g:dismiss do g:do draw-fitted-text g:draw-fitted-text draw-text g:draw-text draw-text-at g:draw-text-at
-Builtin  each g:each edit-on-double-click g:edit-on-double-click editable g:editable editdlg g:editdlg
-Builtin  empty-text g:empty-text enable g:enable enabled? g:enabled? fade g:fade fb-files g:fb-files
-Builtin  fcolor g:fcolor fg g:fg fg? g:fg? file-filter g:file-filter file-name g:file-name filedlg g:filedlg
-Builtin  fill g:fill fillall g:fillall fit-text g:fit-text flex! g:flex! focus g:focus fontdlg g:fontdlg
-Builtin  forward g:forward fullscreen g:fullscreen get-lasso-items g:get-lasso-items get-tab g:get-tab
-Builtin  getclr g:getclr getfont g:getfont getimage g:getimage getpath g:getpath getroot g:getroot gradient g:gradient
-Builtin  gui? g:gui? handle g:handle headerheight g:headerheight hide g:hide image g:image image-at g:image-at
-Builtin  invalidate g:invalidate ix? g:ix? justify g:justify keyinfo g:keyinfo l-text g:l-text laf g:laf
-Builtin  laf! g:laf! laf? g:laf? len g:len line-width g:line-width lineto g:lineto list+ g:list+ list- g:list-
-Builtin  loadcontent g:loadcontent localize g:localize m! g:m! m@ g:m@ menu-font g:menu-font menu-update g:menu-update
-Builtin  menuenabled g:menuenabled mouse? g:mouse? mousepos? g:mousepos? moveto g:moveto msgdlg g:msgdlg
-Builtin  multi g:multi name g:name named-skin g:named-skin new g:new new-laf g:new-laf next g:next obj g:obj
-Builtin  on g:on on? g:on? ontop g:ontop oshandle g:oshandle outlinethickness g:outlinethickness panel-size g:panel-size
-Builtin  panel-size? g:panel-size? parent g:parent path g:path path>s g:path>s pie g:pie pix! g:pix!
-Builtin  pop g:pop popmenu g:popmenu pos? g:pos? prev g:prev propval! g:propval! propval@ g:propval@
-Builtin  push g:push qbezier g:qbezier quit g:quit r-text g:r-text readonly g:readonly rect g:rect refresh g:refresh
-Builtin  restore g:restore root g:root root-item-visible g:root-item-visible rotate g:rotate rowheight g:rowheight
-Builtin  rrect g:rrect s>path g:s>path save g:save say g:say scale g:scale scolor g:scolor scrollthickness g:scrollthickness
-Builtin  sectionenable g:sectionenable select! g:select! select@ g:select@ selected-rows g:selected-rows
-Builtin  set-lasso g:set-lasso set-long-press g:set-long-press set-popup-font g:set-popup-font set-range g:set-range
-Builtin  set-swipe g:set-swipe set-value g:set-value setcursor g:setcursor setfont g:setfont setheader g:setheader
-Builtin  sethtml g:sethtml setimage g:setimage setname g:setname setroot g:setroot settab g:settab show g:show
-Builtin  show-line-numbers g:show-line-numbers show-pct g:show-pct showmenu g:showmenu showtooltip g:showtooltip
-Builtin  size g:size size? g:size? skin g:skin skin-class g:skin-class stackix g:stackix state g:state
-Builtin  state? g:state? stepsize g:stepsize stroke g:stroke stroke-fill g:stroke-fill style g:style
-Builtin  tabname g:tabname text g:text text-box-style g:text-box-style text? g:text? textcolor g:textcolor
-Builtin  textsize g:textsize timer! g:timer! timer@ g:timer@ toback g:toback tofront g:tofront toggle-row g:toggle-row
-Builtin  tooltip g:tooltip top g:top transition g:transition translate g:translate tree-open g:tree-open
-Builtin  triangle g:triangle update g:update updateitems g:updateitems url g:url user g:user user! g:user!
-Builtin  vertical g:vertical view g:view visible? g:visible? vpos! g:vpos! vpos@ g:vpos@ waitcursor g:waitcursor
-Builtin  winding g:winding xy g:xy xy? g:xy? +edge gr:+edge +edge+w gr:+edge+w +node gr:+node connect gr:connect
-Builtin  edges gr:edges m! gr:m! m@ gr:m@ neighbors gr:neighbors new gr:new node-edges gr:node-edges
-Builtin  nodes gr:nodes traverse gr:traverse + h:+ clear h:clear len h:len new h:new peek h:peek pop h:pop
-Builtin  push h:push unique h:unique arm? hw:arm? camera hw:camera camera-fmt hw:camera-fmt camera-img hw:camera-img
-Builtin  camera? hw:camera? cpu? hw:cpu? device? hw:device? displays? hw:displays? displaysize? hw:displaysize?
-Builtin  err? hw:err? gpio hw:gpio gpio! hw:gpio! gpio-mmap hw:gpio-mmap gpio@ hw:gpio@ i2c hw:i2c i2c! hw:i2c!
-Builtin  i2c!reg hw:i2c!reg i2c@ hw:i2c@ i2c@reg hw:i2c@reg isround? hw:isround? iswatch? hw:iswatch?
-Builtin  mac? hw:mac? mem? hw:mem? poll hw:poll sensor hw:sensor start hw:start stop hw:stop fetch-full imap:fetch-full
-Builtin  fetch-uid-mail imap:fetch-uid-mail login imap:login new imap:new select-inbox imap:select-inbox
-Builtin  >file img:>file copy img:copy crop img:crop data img:data desat img:desat fill img:fill filter img:filter
-Builtin  flip img:flip from-svg img:from-svg new img:new pix! img:pix! pix@ img:pix@ qr-gen img:qr-gen
-Builtin  qr-parse img:qr-parse rotate img:rotate scale img:scale scroll img:scroll size img:size countries iso:countries
-Builtin  find loc:find sort loc:sort ! m:! !? m:!? + m:+ +? m:+? - m:- @ m:@ @? m:@? @@ m:@@ clear m:clear
-Builtin  data m:data each m:each exists? m:exists? iter m:iter iter-all m:iter-all keys m:keys len m:len
-Builtin  map m:map new m:new op! m:op! open m:open vals m:vals xchg m:xchg ! mat:! * mat:* + mat:+ = mat:=
-Builtin  @ mat:@ col mat:col data mat:data det mat:det dim? mat:dim? get-n mat:get-n ident mat:ident
-Builtin  m. mat:m. minor mat:minor n* mat:n* new mat:new row mat:row same-size? mat:same-size? trans mat:trans
-Builtin  ! n:! * n:* */ n:*/ + n:+ +! n:+! - n:- / n:/ /mod n:/mod 1+ n:1+ 1- n:1- < n:< = n:= > n:>
-Builtin  BIGE n:BIGE BIGPI n:BIGPI E n:E PI n:PI ^ n:^ abs n:abs acos n:acos acos n:acos asin n:asin
-Builtin  asin n:asin atan n:atan atan n:atan atan2 n:atan2 band n:band between n:between bfloat n:bfloat
-Builtin  bic n:bic bint n:bint binv n:binv bnot n:bnot bor n:bor bxor n:bxor ceil n:ceil clamp n:clamp
-Builtin  cmp n:cmp comb n:comb cos n:cos cosd n:cosd exp n:exp expmod n:expmod float n:float floor n:floor
+Builtin  ticks d:ticks ticks/sec d:ticks/sec timer d:timer timer-ctrl d:timer-ctrl tisha-beav d:tisha-beav
+Builtin  tzadjust d:tzadjust unix> d:unix> unknown d:unknown unknown? d:unknown? updatetz d:updatetz
+Builtin  year@ d:year@ ymd d:ymd ymd> d:ymd> yom-haatsmaut d:yom-haatsmaut yom-kippur d:yom-kippur add-func db:add-func
+Builtin  aes! db:aes! begin db:begin bind db:bind bind-exec db:bind-exec bind-exec[] db:bind-exec[]
+Builtin  close db:close col db:col col[] db:col[] col{} db:col{} commit db:commit each db:each exec db:exec
+Builtin  exec-cb db:exec-cb exec-name db:exec-name get db:get get-sub db:get-sub key db:key kind? db:kind?
+Builtin  last-rowid db:last-rowid mysql? db:mysql? odbc? db:odbc? open db:open open? db:open? prep-name db:prep-name
+Builtin  prepare db:prepare query db:query query-all db:query-all rekey db:rekey rollback db:rollback
+Builtin  set db:set set-sub db:set-sub sql@ db:sql@ bp dbg:bp except-task@ dbg:except-task@ go dbg:go
+Builtin  line-info dbg:line-info prompt dbg:prompt stop dbg:stop trace dbg:trace trace-enter dbg:trace-enter
+Builtin  trace-leave dbg:trace-leave / f:/ abspath f:abspath absrel f:absrel append f:append associate f:associate
+Builtin  atime f:atime canwrite? f:canwrite? chmod f:chmod close f:close copy f:copy copydir f:copydir
+Builtin  create f:create ctime f:ctime dir? f:dir? dname f:dname eachbuf f:eachbuf eachline f:eachline
+Builtin  enssep f:enssep eof? f:eof? exists? f:exists? flush f:flush fname f:fname getb f:getb getc f:getc
+Builtin  getline f:getline getmod f:getmod glob f:glob glob-nocase f:glob-nocase homedir f:homedir homedir! f:homedir!
+Builtin  include f:include ioctl f:ioctl join f:join launch f:launch link f:link link> f:link> link? f:link?
+Builtin  mkdir f:mkdir mmap f:mmap mmap-range f:mmap-range mmap-range? f:mmap-range? mtime f:mtime mv f:mv
+Builtin  name@ f:name@ open f:open open-ro f:open-ro popen f:popen print f:print read f:read read? f:read?
+Builtin  relpath f:relpath rglob f:rglob rm f:rm rmdir f:rmdir seek f:seek sep f:sep size f:size slurp f:slurp
+Builtin  sparse? f:sparse? spit f:spit stderr f:stderr stdin f:stdin stdout f:stdout tell f:tell times f:times
+Builtin  tmpspit f:tmpspit trash f:trash truncate f:truncate ungetb f:ungetb ungetc f:ungetc unzip f:unzip
+Builtin  unzip-entry f:unzip-entry watch f:watch write f:write writen f:writen zip+ f:zip+ zip@ f:zip@
+Builtin  zipentry f:zipentry zipnew f:zipnew zipopen f:zipopen zipsave f:zipsave atlas! font:atlas!
+Builtin  atlas@ font:atlas@ default-size font:default-size info font:info ls font:ls measure font:measure
+Builtin  new font:new oversample font:oversample pixels font:pixels pixels? font:pixels? +edge gr:+edge
+Builtin  +edge+w gr:+edge+w +node gr:+node connect gr:connect edges gr:edges edges! gr:edges! m! gr:m!
+Builtin  m@ gr:m@ neighbors gr:neighbors new gr:new node-edges gr:node-edges nodes gr:nodes traverse gr:traverse
+Builtin  weight! gr:weight! + h:+ clear h:clear cmp! h:cmp! len h:len max! h:max! new h:new peek h:peek
+Builtin  pop h:pop push h:push unique h:unique arm? hw:arm? camera hw:camera camera-img hw:camera-img
+Builtin  camera-limits hw:camera-limits camera? hw:camera? cpu? hw:cpu? device? hw:device? displays? hw:displays?
+Builtin  displaysize? hw:displaysize? finger-match hw:finger-match finger-support hw:finger-support
+Builtin  gpio hw:gpio gpio! hw:gpio! gpio-mmap hw:gpio-mmap gpio@ hw:gpio@ i2c hw:i2c i2c! hw:i2c! i2c!reg hw:i2c!reg
+Builtin  i2c@ hw:i2c@ i2c@reg hw:i2c@reg isround? hw:isround? iswatch? hw:iswatch? mac? hw:mac? mem? hw:mem?
+Builtin  model? hw:model? poll hw:poll sensor hw:sensor start hw:start stop hw:stop uid? hw:uid? fetch-full imap:fetch-full
+Builtin  fetch-uid-mail imap:fetch-uid-mail login imap:login logout imap:logout new imap:new search imap:search
+Builtin  select-inbox imap:select-inbox >file img:>file >fmt img:>fmt copy img:copy crop img:crop data img:data
+Builtin  desat img:desat fill img:fill fillrect img:fillrect filter img:filter flip img:flip from-svg img:from-svg
+Builtin  new img:new pix! img:pix! pix@ img:pix@ qr-gen img:qr-gen qr-parse img:qr-parse rotate img:rotate
+Builtin  scale img:scale scroll img:scroll size img:size countries iso:countries find loc:find sort loc:sort
+Builtin  ! m:! !? m:!? + m:+ +? m:+? - m:- >arr m:>arr @ m:@ @? m:@? _! m:_! _@ m:_@ arr> m:arr> bitmap m:bitmap
+Builtin  clear m:clear data m:data each m:each exists? m:exists? filter m:filter iter m:iter iter-all m:iter-all
+Builtin  keys m:keys len m:len map m:map merge m:merge new m:new op! m:op! open m:open slice m:slice
+Builtin  vals m:vals xchg m:xchg zip m:zip ! mat:! * mat:* + mat:+ = mat:= @ mat:@ affine mat:affine
+Builtin  col mat:col data mat:data det mat:det dim? mat:dim? get-n mat:get-n ident mat:ident inv mat:inv
+Builtin  m. mat:m. minor mat:minor n* mat:n* new mat:new new-minor mat:new-minor rotate mat:rotate row mat:row
+Builtin  same-size? mat:same-size? scale mat:scale shear mat:shear trans mat:trans translate mat:translate
+Builtin  xform mat:xform 2console md:2console 2html md:2html 2nk md:2nk bounds meta:bounds color meta:color
+Builtin  console meta:console end meta:end ffi meta:ffi ! n:! * n:* */ n:*/ + n:+ +! n:+! - n:- / n:/
+Builtin  /mod n:/mod 1+ n:1+ 1- n:1- < n:< = n:= > n:> BIGE n:BIGE BIGPI n:BIGPI E n:E PI n:PI ^ n:^
+Builtin  _mod n:_mod abs n:abs acos n:acos acos n:acos asin n:asin asin n:asin atan n:atan atan n:atan
+Builtin  atan2 n:atan2 band n:band between n:between bfloat n:bfloat bic n:bic bint n:bint binv n:binv
+Builtin  bnot n:bnot bor n:bor bxor n:bxor cast n:cast ceil n:ceil clamp n:clamp cmp n:cmp comb n:comb
+Builtin  cos n:cos cosd n:cosd emod n:emod exp n:exp expm1 n:expm1 expmod n:expmod float n:float floor n:floor
 Builtin  fmod n:fmod frac n:frac gcd n:gcd int n:int invmod n:invmod kind? n:kind? lcm n:lcm ln n:ln
-Builtin  max n:max median n:median min n:min mod n:mod neg n:neg odd? n:odd? perm n:perm prime? n:prime?
-Builtin  quantize n:quantize quantize! n:quantize! r+ n:r+ range n:range rot32l n:rot32l rot32r n:rot32r
-Builtin  round n:round round2 n:round2 running-variance n:running-variance running-variance-finalize n:running-variance-finalize
-Builtin  sgn n:sgn shl n:shl shr n:shr sin n:sin sind n:sind sqr n:sqr sqrt n:sqrt tan n:tan tand n:tand
-Builtin  trunc n:trunc ~= n:~= ! net:! >url net:>url @ net:@ DGRAM net:DGRAM INET4 net:INET4 INET6 net:INET6
-Builtin  PROTO_TCP net:PROTO_TCP PROTO_UDP net:PROTO_UDP STREAM net:STREAM accept net:accept addrinfo>o net:addrinfo>o
-Builtin  again? net:again? alloc-and-read net:alloc-and-read alloc-buf net:alloc-buf bind net:bind browse net:browse
-Builtin  close net:close connect net:connect err>s net:err>s err? net:err? get net:get getaddrinfo net:getaddrinfo
-Builtin  getpeername net:getpeername head net:head ifaces? net:ifaces? listen net:listen net-socket net:net-socket
-Builtin  opts net:opts port-is-ssl? net:port-is-ssl? post net:post proxy! net:proxy! read net:read recvfrom net:recvfrom
-Builtin  s>url net:s>url sendto net:sendto server net:server setsockopt net:setsockopt socket net:socket
-Builtin  tlshello net:tlshello url> net:url> user-agent net:user-agent wait net:wait write net:write
-Builtin  MAX ns:MAX cast ptr:cast len ptr:len pack ptr:pack unpack ptr:unpack unpack_orig ptr:unpack_orig
+Builtin  ln1p n:ln1p max n:max median n:median min n:min mod n:mod neg n:neg odd? n:odd? perm n:perm
+Builtin  prime? n:prime? quantize n:quantize quantize! n:quantize! r+ n:r+ range n:range rot32l n:rot32l
+Builtin  rot32r n:rot32r round n:round round2 n:round2 rounding n:rounding running-variance n:running-variance
+Builtin  running-variance-finalize n:running-variance-finalize sgn n:sgn shl n:shl shr n:shr sin n:sin
+Builtin  sind n:sind sqr n:sqr sqrt n:sqrt tan n:tan tand n:tand trunc n:trunc ~= n:~= ! net:! !? net:!?
+Builtin  - net:- >url net:>url @ net:@ @? net:@? DGRAM net:DGRAM INET4 net:INET4 INET6 net:INET6 PROTO_TCP net:PROTO_TCP
+Builtin  PROTO_UDP net:PROTO_UDP STREAM net:STREAM accept net:accept addrinfo>o net:addrinfo>o again? net:again?
+Builtin  alloc-and-read net:alloc-and-read alloc-buf net:alloc-buf bind net:bind close net:close closed? net:closed?
+Builtin  connect net:connect debug? net:debug? delete net:delete get net:get getaddrinfo net:getaddrinfo
+Builtin  getpeername net:getpeername head net:head ifaces? net:ifaces? listen net:listen map>url net:map>url
+Builtin  net-socket net:net-socket opts net:opts port-is-ssl? net:port-is-ssl? post net:post proxy! net:proxy!
+Builtin  put net:put read net:read read-all net:read-all recvfrom net:recvfrom s>url net:s>url sendto net:sendto
+Builtin  server net:server setsockopt net:setsockopt socket net:socket tlshello net:tlshello url> net:url>
+Builtin  user-agent net:user-agent wait net:wait write net:write (begin) nk:(begin) (chart-begin) nk:(chart-begin)
+Builtin  (chart-begin-colored) nk:(chart-begin-colored) (chart-end) nk:(chart-end) (end) nk:(end) (group-begin) nk:(group-begin)
+Builtin  (group-end) nk:(group-end) (property) nk:(property) >img nk:>img addfont nk:addfont anti-alias nk:anti-alias
+Builtin  any-clicked? nk:any-clicked? bounds nk:bounds bounds! nk:bounds! button nk:button button-color nk:button-color
+Builtin  button-label nk:button-label button-set-behavior nk:button-set-behavior button-symbol  nk:button-symbol 
+Builtin  button-symbol-label nk:button-symbol-label chart-add-slot nk:chart-add-slot chart-add-slot-colored nk:chart-add-slot-colored
+Builtin  chart-push nk:chart-push chart-push-slot nk:chart-push-slot checkbox nk:checkbox clicked? nk:clicked?
+Builtin  close-this! nk:close-this! close-this? nk:close-this? close? nk:close? color-picker nk:color-picker
+Builtin  combo nk:combo combo-begin-color nk:combo-begin-color combo-begin-label nk:combo-begin-label
+Builtin  combo-cb nk:combo-cb combo-end nk:combo-end contextual-begin nk:contextual-begin contextual-close nk:contextual-close
+Builtin  contextual-end nk:contextual-end contextual-item-image-text nk:contextual-item-image-text contextual-item-symbol-text nk:contextual-item-symbol-text
+Builtin  contextual-item-text nk:contextual-item-text cp! nk:cp! cp@ nk:cp@ display-info nk:display-info
+Builtin  display@ nk:display@ do nk:do down? nk:down? draw-image nk:draw-image draw-image-at nk:draw-image-at
+Builtin  draw-image-centered nk:draw-image-centered draw-sub-image nk:draw-sub-image draw-text nk:draw-text
+Builtin  draw-text-high nk:draw-text-high draw-text-wrap nk:draw-text-wrap edit-focus nk:edit-focus
+Builtin  edit-string nk:edit-string event nk:event event-boost nk:event-boost event-msec nk:event-msec
+Builtin  event-wait nk:event-wait fill-arc nk:fill-arc fill-circle nk:fill-circle fill-poly nk:fill-poly
+Builtin  fill-rect nk:fill-rect fill-rect-color nk:fill-rect-color fill-triangle nk:fill-triangle flags! nk:flags!
+Builtin  flags@ nk:flags@ fullscreen nk:fullscreen get nk:get get-row-height nk:get-row-height getfont nk:getfont
+Builtin  getmap nk:getmap gl? nk:gl? grid nk:grid grid-push nk:grid-push group-scroll-ofs nk:group-scroll-ofs
+Builtin  group-scroll-ofs! nk:group-scroll-ofs! hovered? nk:hovered? image nk:image init nk:init input-button nk:input-button
+Builtin  input-key nk:input-key input-motion nk:input-motion input-scroll nk:input-scroll input-string nk:input-string
+Builtin  key-down? nk:key-down? key-pressed? nk:key-pressed? key-released? nk:key-released? label nk:label
+Builtin  label-colored nk:label-colored label-wrap nk:label-wrap label-wrap-colored nk:label-wrap-colored
+Builtin  layout-bounds nk:layout-bounds layout-grid-begin nk:layout-grid-begin layout-grid-end nk:layout-grid-end
+Builtin  layout-push-dynamic nk:layout-push-dynamic layout-push-static nk:layout-push-static layout-push-variable nk:layout-push-variable
+Builtin  layout-ratio-from-pixel nk:layout-ratio-from-pixel layout-reset-row-height nk:layout-reset-row-height
+Builtin  layout-row nk:layout-row layout-row-begin nk:layout-row-begin layout-row-dynamic nk:layout-row-dynamic
+Builtin  layout-row-end nk:layout-row-end layout-row-height nk:layout-row-height layout-row-push nk:layout-row-push
+Builtin  layout-row-static nk:layout-row-static layout-row-template-begin nk:layout-row-template-begin
+Builtin  layout-row-template-end nk:layout-row-template-end layout-space-begin nk:layout-space-begin
+Builtin  layout-space-end nk:layout-space-end layout-space-push nk:layout-space-push layout-widget-bounds nk:layout-widget-bounds
+Builtin  list-begin nk:list-begin list-end nk:list-end list-new nk:list-new list-range nk:list-range
+Builtin  m! nk:m! m@ nk:m@ make-style nk:make-style max-vertex-element nk:max-vertex-element measure nk:measure
+Builtin  measure-font nk:measure-font menu-begin nk:menu-begin menu-close nk:menu-close menu-end nk:menu-end
+Builtin  menu-item-image nk:menu-item-image menu-item-label nk:menu-item-label menu-item-symbol nk:menu-item-symbol
+Builtin  menubar-begin nk:menubar-begin menubar-end nk:menubar-end mouse-pos nk:mouse-pos msgdlg nk:msgdlg
+Builtin  option nk:option plot nk:plot plot-fn nk:plot-fn pop-font nk:pop-font popup-begin nk:popup-begin
+Builtin  popup-close nk:popup-close popup-end nk:popup-end popup-scroll-ofs nk:popup-scroll-ofs popup-scroll-ofs! nk:popup-scroll-ofs!
+Builtin  progress nk:progress prop-int nk:prop-int pt>local nk:pt>local pt>screen nk:pt>screen pts>rect nk:pts>rect
+Builtin  push-font nk:push-font rect-center nk:rect-center rect-intersect nk:rect-intersect rect-ofs nk:rect-ofs
+Builtin  rect-pad nk:rect-pad rect-shrink nk:rect-shrink rect-union nk:rect-union rect/high nk:rect/high
+Builtin  rect/wide nk:rect/wide rect>center nk:rect>center rect>local nk:rect>local rect>pos nk:rect>pos
+Builtin  rect>pts nk:rect>pts rect>screen nk:rect>screen rect>size nk:rect>size released? nk:released?
+Builtin  render nk:render restore nk:restore rotate nk:rotate save nk:save scale nk:scale scancode? nk:scancode?
+Builtin  screen-saver nk:screen-saver screen-size nk:screen-size screen-win-close nk:screen-win-close
+Builtin  selectable nk:selectable set nk:set set-font nk:set-font set-num-vertices nk:set-num-vertices
+Builtin  setpos nk:setpos setwin nk:setwin slider nk:slider slider-int nk:slider-int space nk:space
+Builtin  spacing nk:spacing stroke-arc nk:stroke-arc stroke-circle nk:stroke-circle stroke-curve nk:stroke-curve
+Builtin  stroke-line nk:stroke-line stroke-polygon nk:stroke-polygon stroke-polyline nk:stroke-polyline
+Builtin  stroke-rect nk:stroke-rect stroke-tri nk:stroke-tri style-from-table nk:style-from-table sw-gl nk:sw-gl
+Builtin  text? nk:text? tooltip nk:tooltip translate nk:translate tree-pop nk:tree-pop tree-state-push nk:tree-state-push
+Builtin  use-style nk:use-style vsync nk:vsync widget nk:widget widget-bounds nk:widget-bounds widget-fitting nk:widget-fitting
+Builtin  widget-high nk:widget-high widget-hovered? nk:widget-hovered? widget-mouse-click-down? nk:widget-mouse-click-down?
+Builtin  widget-mouse-clicked? nk:widget-mouse-clicked? widget-pos nk:widget-pos widget-size nk:widget-size
+Builtin  widget-wide nk:widget-wide win nk:win win-bounds nk:win-bounds win-bounds! nk:win-bounds! win-close nk:win-close
+Builtin  win-closed? nk:win-closed? win-collapse nk:win-collapse win-collapsed? nk:win-collapsed? win-content-bounds nk:win-content-bounds
+Builtin  win-focus nk:win-focus win-focused? nk:win-focused? win-hidden? nk:win-hidden? win-high nk:win-high
+Builtin  win-hovered? nk:win-hovered? win-pos nk:win-pos win-scroll-ofs nk:win-scroll-ofs win-scroll-ofs! nk:win-scroll-ofs!
+Builtin  win-show nk:win-show win-size nk:win-size win-wide nk:win-wide win? nk:win? MAX ns:MAX ! o:!
+Builtin  + o:+ +? o:+? ??? o:??? @ o:@ class o:class exec o:exec isa o:isa method o:method mutate o:mutate
+Builtin  new o:new super o:super devname os:devname env os:env lang os:lang mem-arenas os:mem-arenas
+Builtin  notify os:notify region os:region cast ptr:cast len ptr:len null? ptr:null? pack ptr:pack unpack ptr:unpack
+Builtin  unpack_orig ptr:unpack_orig publish pubsub:publish qsize pubsub:qsize subscribe pubsub:subscribe
 Builtin  + q:+ clear q:clear len q:len new q:new notify q:notify overwrite q:overwrite peek q:peek pick q:pick
-Builtin  pop q:pop push q:push shift q:shift size q:size slide q:slide throwing q:throwing wait q:wait
-Builtin  ++match r:++match +/ r:+/ +match r:+match / r:/ @ r:@ err? r:err? len r:len match r:match new r:new
-Builtin  rx r:rx str r:str ! s:! * s:* + s:+ - s:- / s:/ /scripts s:/scripts <+ s:<+ = s:= =ic s:=ic
-Builtin  >base64 s:>base64 >ucs2 s:>ucs2 @ s:@ append s:append base64> s:base64> clear s:clear cmp s:cmp
-Builtin  cmpi s:cmpi compress s:compress days! s:days! each s:each eachline s:eachline expand s:expand
-Builtin  fill s:fill fmt s:fmt gershayim s:gershayim globmatch s:globmatch hexupr s:hexupr insert s:insert
-Builtin  intl s:intl intl! s:intl! lang s:lang lc s:lc len s:len lsub s:lsub ltrim s:ltrim map s:map
-Builtin  months! s:months! new s:new replace s:replace replace! s:replace! rev s:rev rsearch s:rsearch
-Builtin  rsub s:rsub rtrim s:rtrim script? s:script? search s:search size s:size slice s:slice strfmap s:strfmap
-Builtin  strfmt s:strfmt trim s:trim tsub s:tsub uc s:uc ucs2> s:ucs2> utf8? s:utf8? zt s:zt close sio:close
-Builtin  enum sio:enum open sio:open opts! sio:opts! opts@ sio:opts@ read sio:read write sio:write new smtp:new
-Builtin  send smtp:send apply-filter snd:apply-filter devices? snd:devices? end-record snd:end-record
-Builtin  filter snd:filter formats? snd:formats? freq snd:freq gain snd:gain gain? snd:gain? len snd:len
-Builtin  loop snd:loop mix snd:mix new snd:new pause snd:pause play snd:play played snd:played rate snd:rate
-Builtin  record snd:record seek snd:seek stop snd:stop stopall snd:stopall unmix snd:unmix volume snd:volume
-Builtin  volume? snd:volume? + st:+ . st:. clear st:clear len st:len ndrop st:ndrop new st:new op! st:op!
-Builtin  peek st:peek pick st:pick pop st:pop push st:push roll st:roll shift st:shift size st:size
-Builtin  slide st:slide swap st:swap throwing st:throwing >buf struct:>buf arr> struct:arr> buf struct:buf
-Builtin  buf> struct:buf> byte struct:byte double struct:double field! struct:field! field@ struct:field@
-Builtin  float struct:float ignore struct:ignore int struct:int long struct:long struct; struct:struct;
-Builtin  word struct:word ! t:! @ t:@ assign t:assign curtask t:curtask def-queue t:def-queue def-stack t:def-stack
-Builtin  done? t:done? err! t:err! err? t:err? getq t:getq guitask t:guitask handler t:handler kill t:kill
-Builtin  list t:list main t:main name! t:name! name@ t:name@ notify t:notify pop t:pop priority t:priority
-Builtin  push t:push push< t:push< q-notify t:q-notify q-wait t:q-wait qlen t:qlen result t:result task t:task
-Builtin  task-n t:task-n task-stop t:task-stop wait t:wait ! w:! @ w:@ alias: w:alias: cb w:cb deprecate w:deprecate
-Builtin  exec w:exec exec? w:exec? ffifail w:ffifail find w:find forget w:forget is w:is undo w:undo
-Builtin  >s xml:>s >txt xml:>txt parse xml:parse parse-html xml:parse-html parse-stream xml:parse-stream
+Builtin  pop q:pop push q:push remove q:remove shift q:shift size q:size slide q:slide throwing q:throwing
+Builtin  wait q:wait ++match r:++match +/ r:+/ +match r:+match / r:/ @ r:@ len r:len match r:match new r:new
+Builtin  rx r:rx str r:str * rat:* + rat:+ - rat:- / rat:/ >n rat:>n >s rat:>s new rat:new proper rat:proper
+Builtin  ! s:! * s:* + s:+ - s:- / s:/ /scripts s:/scripts <+ s:<+ = s:= =ic s:=ic >base64 s:>base64
+Builtin  >ucs2 s:>ucs2 @ s:@ append s:append base64> s:base64> clear s:clear cmp s:cmp cmpi s:cmpi compress s:compress
+Builtin  days! s:days! dist s:dist each s:each each! s:each! eachline s:eachline escape s:escape expand s:expand
+Builtin  fill s:fill fmt s:fmt fold s:fold gershayim s:gershayim globmatch s:globmatch hexupr s:hexupr
+Builtin  insert s:insert intl s:intl intl! s:intl! lang s:lang lc s:lc lc? s:lc? len s:len lsub s:lsub
+Builtin  ltrim s:ltrim map s:map months! s:months! new s:new norm s:norm reduce s:reduce repinsert s:repinsert
+Builtin  replace s:replace replace! s:replace! rev s:rev rsearch s:rsearch rsub s:rsub rtrim s:rtrim
+Builtin  script? s:script? search s:search size s:size slice s:slice soundex s:soundex strfmap s:strfmap
+Builtin  strfmt s:strfmt text-wrap s:text-wrap trim s:trim tsub s:tsub uc s:uc uc? s:uc? ucs2> s:ucs2>
+Builtin  utf8? s:utf8? zt s:zt close sio:close enum sio:enum open sio:open opts! sio:opts! opts@ sio:opts@
+Builtin  read sio:read write sio:write @ slv:@ auto slv:auto build slv:build constraint slv:constraint
+Builtin  dump slv:dump edit slv:edit named-variable slv:named-variable new slv:new relation slv:relation
+Builtin  reset slv:reset suggest slv:suggest term slv:term update slv:update v[] slv:v[] variable slv:variable
+Builtin  v{} slv:v{} new smtp:new send smtp:send apply-filter snd:apply-filter devices? snd:devices?
+Builtin  end-record snd:end-record filter snd:filter formats? snd:formats? freq snd:freq gain snd:gain
+Builtin  gain? snd:gain? init snd:init len snd:len loop snd:loop loop? snd:loop? mix snd:mix new snd:new
+Builtin  pause snd:pause play snd:play played snd:played rate snd:rate ready? snd:ready? record snd:record
+Builtin  resume snd:resume seek snd:seek stop snd:stop stopall snd:stopall volume snd:volume volume? snd:volume?
+Builtin  + st:+ . st:. clear st:clear len st:len ndrop st:ndrop new st:new op! st:op! peek st:peek pick st:pick
+Builtin  pop st:pop push st:push roll st:roll shift st:shift size st:size slide st:slide swap st:swap
+Builtin  throwing st:throwing >buf struct:>buf arr> struct:arr> buf struct:buf buf> struct:buf> byte struct:byte
+Builtin  double struct:double field! struct:field! field@ struct:field@ float struct:float ignore struct:ignore
+Builtin  int struct:int long struct:long struct; struct:struct; word struct:word ! t:! @ t:@ by-name t:by-name
+Builtin  cor t:cor cor-drop t:cor-drop curtask t:curtask def-queue t:def-queue def-stack t:def-stack
+Builtin  done? t:done? err! t:err! err? t:err? errno? t:errno? getq t:getq handler t:handler handler@ t:handler@
+Builtin  kill t:kill list t:list main t:main max-exceptions t:max-exceptions name! t:name! name@ t:name@
+Builtin  notify t:notify parent t:parent pop t:pop priority t:priority push t:push q-notify t:q-notify
+Builtin  q-wait t:q-wait qlen t:qlen result t:result set-affinity t:set-affinity setq t:setq start t:start
+Builtin  task t:task task-n t:task-n task-stop t:task-stop wait t:wait yield t:yield yield! t:yield!
+Builtin  add tree:add binary tree:binary bk tree:bk btree tree:btree cmp! tree:cmp! data tree:data del tree:del
+Builtin  find tree:find iter tree:iter next tree:next nodes tree:nodes parent tree:parent parse tree:parse
+Builtin  prev tree:prev root tree:root search tree:search trie tree:trie ! w:! (is) w:(is) @ w:@ alias: w:alias:
+Builtin  cb w:cb deprecate w:deprecate dlcall w:dlcall dlopen w:dlopen dlsym w:dlsym exec w:exec exec? w:exec?
+Builtin  ffifail w:ffifail find w:find forget w:forget is w:is name w:name undo w:undo >s xml:>s >txt xml:>txt
+Builtin  md-init xml:md-init md-parse xml:md-parse parse xml:parse parse-html xml:parse-html parse-stream xml:parse-stream
 Builtin  getmsg[] zmq:getmsg[] sendmsg[] zmq:sendmsg[]
+
 " numbers
 syn keyword eighthMath decimal hex base@ base! 
 syn match eighthInteger '\<-\=[0-9.]*[0-9.]\+\>'
+
 " recognize hex and binary numbers, the '$' and '%' notation is for eighth
 syn match eighthInteger '\<\$\x*\x\+\>' " *1* --- dont't mess
 syn match eighthInteger '\<\x*\d\x*\>'  " *2* --- this order!
@@ -284,20 +357,17 @@ syn match eighthInteger "\<'.\>"
 syn region eighthString start=+\.\?\"+ skip=+"+ end=+$+
 syn keyword jsonNull null
 syn keyword jsonBool /\(true\|false\)/
- syn region eighthString start=/\<"/ end=/"\>/ 
+syn region eighthString start=/\<"/ end=/"\>/ 
 syn match jsonObjEntry /"\"[^"]\+\"\ze\s*:/
 
-"syn region jsonObject start=/{/ end=/}/ contained contains=jsonObjEntry,jsonArray,jsonObject, jsonBool, eighthString
-"syn region jsonArray start=/\[/ end=/\]/ contained contains=jsonArray,jsonObject, jsonBool, eighthString
-
 " Include files
-" syn match eighthInclude '\<\(libinclude\|include\|needs\)\s\+\S\+'
 syn region eighthComment start="\zs\\" end="$" contains=eighthTodo
 
 " Define the default highlighting.
 if !exists("did_eighth_syntax_inits")
     let did_eighth_syntax_inits=1
-    " The default methods for highlighting. Can be overridden later.
+
+    " The default methods for highlighting. Can be overriden later.
     hi def link eighthTodo Todo
     hi def link eighthOperators Operator
     hi def link eighthMath Number
@@ -324,16 +394,15 @@ if !exists("did_eighth_syntax_inits")
     hi def link eighthBuiltin Define
     hi def link eighthClasses Define
     hi def link eighthClassWord Keyword
-
     hi def link jsonObject Delimiter
     hi def link jsonObjEntry Label
     hi def link jsonArray Special
-  hi def link jsonNull            Function
-  hi def link jsonBool         Boolean
+    hi def link jsonNull Function
+    hi def link jsonBool Boolean
 endif
 
 let b:current_syntax = "8th"
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-" vim: ts=8:sw=4:nocindent:smartindent:
+" vim: ft=vim:ts=8:sw=4:nocindent:smartindent:
diff --git a/syntax/abel.vim b/syntax/abel.vim
index 26ee20c74..c6adb940e 100644
--- a/syntax/abel.vim
+++ b/syntax/abel.vim
@@ -63,7 +63,7 @@ syn region abelSpecifier start='istype' end=';' contains=abelTypeIdChar,abelType
 syn match  abelTypeIdChar "[,']" contained
 syn match  abelTypeIdEnd  ";" contained
 
-" string contstants and special characters within them
+" string constants and special characters within them
 syn match  abelSpecial contained "\\['\\]"
 syn region abelString start=+'+ skip=+\\"+ end=+'+ contains=abelSpecial
 
diff --git a/syntax/ada.vim b/syntax/ada.vim
index 87a3ad7be..fcf74e397 100644
--- a/syntax/ada.vim
+++ b/syntax/ada.vim
@@ -163,7 +163,7 @@ endif
 
 " Section: end {{{1
 " Unless special ("end loop", "end if", etc.), "end" marks the end of a
-" begin, package, task etc. Assiging it to adaEnd.
+" begin, package, task etc. Assigning it to adaEnd.
 syntax match    adaEnd	/\<end\>/
 
 syntax keyword  adaPreproc		 pragma
diff --git a/syntax/ahdl.vim b/syntax/ahdl.vim
index feaeb0fe9..80739e1f8 100644
--- a/syntax/ahdl.vim
+++ b/syntax/ahdl.vim
@@ -42,7 +42,7 @@ syn keyword ahdlMegafunction lpm_rom lpm_dff lpm_tff clklock pll ntsc
 
 syn keyword ahdlTodo contained TODO
 
-" String contstants
+" String constants
 syn region ahdlString start=+"+  skip=+\\"+  end=+"+
 
 " valid integer number formats (decimal, binary, octal, hex)
diff --git a/syntax/aspvbs.vim b/syntax/aspvbs.vim
index 8af436261..7cf341641 100644
--- a/syntax/aspvbs.vim
+++ b/syntax/aspvbs.vim
@@ -38,7 +38,7 @@ syn match AspVBSVariableComplex contained "\<\(arr\|ary\|obj\)\u\w*"
 
 
 " Functions and methods that are in VB but will cause errors in an ASP page
-" This is helpfull if your porting VB code to ASP
+" This is helpful if your porting VB code to ASP
 " I removed (Count, Item) because these are common variable names in AspVBScript
 syn keyword AspVBSError contained Val Str CVar CVDate DoEvents GoSub Return GoTo
 syn keyword AspVBSError contained Stop LinkExecute Add Type LinkPoke
@@ -60,7 +60,7 @@ syn match AspVBSError contained "\<Option\s\+\(Base\|Compare\|Private\s\+Module\
 syn match AspVBSError contained "Respon\?ce\.\S*"
 syn match AspVBSError contained "Respose\.\S*"
 " When I looked up the VBScript syntax it mentioned that Property Get/Set/Let
-" statements are illegal, however, I have recived reports that they do work.
+" statements are illegal, however, I have received reports that they do work.
 " So I commented it out for now.
 " syn match AspVBSError contained "\<Property\s\+\(Get\|Let\|Set\)\>"
 
@@ -112,7 +112,7 @@ syn match AspVBSMethods contained "Response\.\w*"
 " Colorize boolean constants:
 syn keyword AspVBSMethods contained true false
 
-" AspVBScript Number Contstants
+" AspVBScript Number Constants
 " Integer number, or floating point number without a dot.
 syn match  AspVBSNumber	contained	"\<\d\+\>"
 " Floating point number, with dot
@@ -120,7 +120,7 @@ syn match  AspVBSNumber	contained	"\<\d\+\.\d*\>"
 " Floating point number, starting with a dot
 syn match  AspVBSNumber	contained	"\.\d\+\>"
 
-" String and Character Contstants
+" String and Character Constants
 " removed (skip=+\\\\\|\\"+) because VB doesn't have backslash escaping in
 " strings (or does it?)
 syn region  AspVBSString	contained	  start=+"+  end=+"+ keepend
@@ -147,7 +147,7 @@ syn cluster AspVBScriptTop contains=AspVBSStatement,AspVBSFunction,AspVBSMethods
 syn region AspVBSFold start="^\s*\(class\)\s\+.*$" end="^\s*end\s\+\(class\)\>.*$" fold contained transparent keepend
 syn region AspVBSFold start="^\s*\(private\|public\)\=\(\s\+default\)\=\s\+\(sub\|function\)\s\+.*$" end="^\s*end\s\+\(function\|sub\)\>.*$" fold contained transparent keepend
 
-" Define AspVBScript delimeters
+" Define AspVBScript delimiters
 " <%= func("string_with_%>_in_it") %> This is illegal in ASP syntax.
 syn region  AspVBScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<%=\=+ end=+%>+ contains=@AspVBScriptTop, AspVBSFold
 syn region  AspVBScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<script\s\+language="\=vbscript"\=[^>]*\s\+runatserver[^>]*>+ end=+</script>+ contains=@AspVBScriptTop
diff --git a/syntax/autoit.vim b/syntax/autoit.vim
index 705aff02a..53903e3eb 100644
--- a/syntax/autoit.vim
+++ b/syntax/autoit.vim
@@ -9,6 +9,7 @@ endif
 " Authored By:	Riccardo Casini <ric@libero.it>
 " Script URL:	http://www.vim.org/scripts/script.php?script_id=1239
 " ChangeLog:	Please visit the script URL for detailed change information
+" 		Included change from #970.
 
 " Quit when a syntax file was already loaded.
 if exists("b:current_syntax")
@@ -936,7 +937,7 @@ syn match autoitConst "\$SD_POWERDOWN"
 " constants - string
 syn match autoitConst "\$STR_NOCASESENSE"
 syn match autoitConst "\$STR_CASESENSE"
-syn match autoitConst "\STR_STRIPLEADING"
+syn match autoitConst "\$STR_STRIPLEADING"
 syn match autoitConst "\$STR_STRIPTRAILING"
 syn match autoitConst "\$STR_STRIPSPACES"
 syn match autoitConst "\$STR_STRIPALL"
diff --git a/syntax/basic/identifiers.vim b/syntax/basic/identifiers.vim
index f85b2d15f..e238c8d22 100644
--- a/syntax/basic/identifiers.vim
+++ b/syntax/basic/identifiers.vim
@@ -22,7 +22,7 @@ syntax match   typescriptProp contained /\K\k*!\?/
   \ nextgroup=@afterIdentifier
   \ skipwhite skipempty
 
-syntax region  typescriptIndexExpr      contained matchgroup=typescriptProperty start=/\[/rs=s+1 end=/]/he=e-1 contains=@typescriptValue,typescriptCastKeyword nextgroup=@typescriptSymbols,typescriptDotNotation,typescriptFuncCallArg skipwhite skipempty
+syntax region  typescriptIndexExpr      contained matchgroup=typescriptProperty start=/\[/ end=/]/ contains=@typescriptValue,typescriptCastKeyword nextgroup=@typescriptSymbols,typescriptDotNotation,typescriptFuncCallArg skipwhite skipempty
 
 syntax match   typescriptDotNotation           /\.\|?\.\|!\./ nextgroup=typescriptProp skipnl
 syntax match   typescriptDotStyleNotation      /\.style\./ nextgroup=typescriptDOMStyle transparent
diff --git a/syntax/basic/literal.vim b/syntax/basic/literal.vim
index de71af926..d62040145 100644
--- a/syntax/basic/literal.vim
+++ b/syntax/basic/literal.vim
@@ -24,7 +24,7 @@ syntax match   typescriptSpecial            contained "\v\\%(x\x\x|u%(\x{4}|\{\x
 
 " From vim runtime
 " <https://github.com/vim/vim/blob/master/runtime/syntax/javascript.vim#L48>
-syntax region  typescriptRegexpString          start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gimuy]\{0,5\}\s*$+ end=+/[gimuy]\{0,5\}\s*[;.,)\]}:]+me=e-1 nextgroup=typescriptDotNotation oneline
+syntax region  typescriptRegexpString          start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gimsuy]\{0,5\}\s*$+ end=+/[gimsuy]\{0,5\}\s*[;.,)\]}:]+me=e-1 nextgroup=typescriptDotNotation oneline
 
 syntax region  typescriptTemplate
   \ start=/`/  skip=/\\\\\|\\`\|\n/  end=/`\|$/
diff --git a/syntax/cfg.vim b/syntax/cfg.vim
index ad81bb05d..cd6a91c4d 100644
--- a/syntax/cfg.vim
+++ b/syntax/cfg.vim
@@ -36,7 +36,7 @@ syn match  CfgComment	"#.*"
 syn match  CfgComment	";.*"
 syn match  CfgComment	"\/\/.*"
 
-" Define the default hightlighting.
+" Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 hi def link CfgOnOff     Label
 hi def link CfgComment	Comment
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index cdf8346d0..6fb362448 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -26,14 +26,14 @@ endif
 
 " -*- KEYWORDS -*-
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-" Clojure version 1.10.2
+" Clojure version 1.10.3
 let s:clojure_syntax_keywords = {
     \   'clojureBoolean': ["false","true"]
     \ , 'clojureCond': ["case","clojure.core/case","clojure.core/cond","clojure.core/cond->","clojure.core/cond->>","clojure.core/condp","clojure.core/if-let","clojure.core/if-not","clojure.core/if-some","clojure.core/when","clojure.core/when-first","clojure.core/when-let","clojure.core/when-not","clojure.core/when-some","cond","cond->","cond->>","condp","if-let","if-not","if-some","when","when-first","when-let","when-not","when-some"]
     \ , 'clojureConstant': ["nil"]
     \ , 'clojureDefine': ["clojure.core/definline","clojure.core/definterface","clojure.core/defmacro","clojure.core/defmethod","clojure.core/defmulti","clojure.core/defn","clojure.core/defn-","clojure.core/defonce","clojure.core/defprotocol","clojure.core/defrecord","clojure.core/defstruct","clojure.core/deftype","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype"]
     \ , 'clojureException': ["catch","finally","throw","try"]
-    \ , 'clojureFunc': ["*","*'","+","+'","-","-'","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods","/","<","<=","=","==",">",">=","PrintWriter-on","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","ancestors","any?","apply","array-map","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case-fallthrough-err-impl","cast","cat","char","char-array","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","clojure.core/*","clojure.core/*'","clojure.core/+","clojure.core/+'","clojure.core/-","clojure.core/-'","clojure.core/->ArrayChunk","clojure.core/->Eduction","clojure.core/->Vec","clojure.core/->VecNode","clojure.core/->VecSeq","clojure.core/-cache-protocol-fn","clojure.core/-reset-methods","clojure.core//","clojure.core/<","clojure.core/<=","clojure.core/=","clojure.core/==","clojure.core/>","clojure.core/>=","clojure.core/PrintWriter-on","clojure.core/StackTraceElement->vec","clojure.core/Throwable->map","clojure.core/accessor","clojure.core/aclone","clojure.core/add-classpath","clojure.core/add-tap","clojure.core/add-watch","clojure.core/agent","clojure.core/agent-error","clojure.core/agent-errors","clojure.core/aget","clojure.core/alength","clojure.core/alias","clojure.core/all-ns","clojure.core/alter","clojure.core/alter-meta!","clojure.core/alter-var-root","clojure.core/ancestors","clojure.core/any?","clojure.core/apply","clojure.core/array-map","clojure.core/aset","clojure.core/aset-boolean","clojure.core/aset-byte","clojure.core/aset-char","clojure.core/aset-double","clojure.core/aset-float","clojure.core/aset-int","clojure.core/aset-long","clojure.core/aset-short","clojure.core/assoc","clojure.core/assoc!","clojure.core/assoc-in","clojure.core/associative?","clojure.core/atom","clojure.core/await","clojure.core/await-for","clojure.core/await1","clojure.core/bases","clojure.core/bean","clojure.core/bigdec","clojure.core/bigint","clojure.core/biginteger","clojure.core/bit-and","clojure.core/bit-and-not","clojure.core/bit-clear","clojure.core/bit-flip","clojure.core/bit-not","clojure.core/bit-or","clojure.core/bit-set","clojure.core/bit-shift-left","clojure.core/bit-shift-right","clojure.core/bit-test","clojure.core/bit-xor","clojure.core/boolean","clojure.core/boolean-array","clojure.core/boolean?","clojure.core/booleans","clojure.core/bound-fn*","clojure.core/bound?","clojure.core/bounded-count","clojure.core/butlast","clojure.core/byte","clojure.core/byte-array","clojure.core/bytes","clojure.core/bytes?","clojure.core/case-fallthrough-err-impl","clojure.core/cast","clojure.core/cat","clojure.core/char","clojure.core/char-array","clojure.core/char?","clojure.core/chars","clojure.core/chunk","clojure.core/chunk-append","clojure.core/chunk-buffer","clojure.core/chunk-cons","clojure.core/chunk-first","clojure.core/chunk-next","clojure.core/chunk-rest","clojure.core/chunked-seq?","clojure.core/class","clojure.core/class?","clojure.core/clear-agent-errors","clojure.core/clojure-version","clojure.core/coll?","clojure.core/commute","clojure.core/comp","clojure.core/comparator","clojure.core/compare","clojure.core/compare-and-set!","clojure.core/compile","clojure.core/complement","clojure.core/completing","clojure.core/concat","clojure.core/conj","clojure.core/conj!","clojure.core/cons","clojure.core/constantly","clojure.core/construct-proxy","clojure.core/contains?","clojure.core/count","clojure.core/counted?","clojure.core/create-ns","clojure.core/create-struct","clojure.core/cycle","clojure.core/dec","clojure.core/dec'","clojure.core/decimal?","clojure.core/dedupe","clojure.core/delay?","clojure.core/deliver","clojure.core/denominator","clojure.core/deref","clojure.core/derive","clojure.core/descendants","clojure.core/destructure","clojure.core/disj","clojure.core/disj!","clojure.core/dissoc","clojure.core/dissoc!","clojure.core/distinct","clojure.core/distinct?","clojure.core/doall","clojure.core/dorun","clojure.core/double","clojure.core/double-array","clojure.core/double?","clojure.core/doubles","clojure.core/drop","clojure.core/drop-last","clojure.core/drop-while","clojure.core/eduction","clojure.core/empty","clojure.core/empty?","clojure.core/ensure","clojure.core/ensure-reduced","clojure.core/enumeration-seq","clojure.core/error-handler","clojure.core/error-mode","clojure.core/eval","clojure.core/even?","clojure.core/every-pred","clojure.core/every?","clojure.core/ex-cause","clojure.core/ex-data","clojure.core/ex-info","clojure.core/ex-message","clojure.core/extend","clojure.core/extenders","clojure.core/extends?","clojure.core/false?","clojure.core/ffirst","clojure.core/file-seq","clojure.core/filter","clojure.core/filterv","clojure.core/find","clojure.core/find-keyword","clojure.core/find-ns","clojure.core/find-protocol-impl","clojure.core/find-protocol-method","clojure.core/find-var","clojure.core/first","clojure.core/flatten","clojure.core/float","clojure.core/float-array","clojure.core/float?","clojure.core/floats","clojure.core/flush","clojure.core/fn?","clojure.core/fnext","clojure.core/fnil","clojure.core/force","clojure.core/format","clojure.core/frequencies","clojure.core/future-call","clojure.core/future-cancel","clojure.core/future-cancelled?","clojure.core/future-done?","clojure.core/future?","clojure.core/gensym","clojure.core/get","clojure.core/get-in","clojure.core/get-method","clojure.core/get-proxy-class","clojure.core/get-thread-bindings","clojure.core/get-validator","clojure.core/group-by","clojure.core/halt-when","clojure.core/hash","clojure.core/hash-combine","clojure.core/hash-map","clojure.core/hash-ordered-coll","clojure.core/hash-set","clojure.core/hash-unordered-coll","clojure.core/ident?","clojure.core/identical?","clojure.core/identity","clojure.core/ifn?","clojure.core/in-ns","clojure.core/inc","clojure.core/inc'","clojure.core/indexed?","clojure.core/init-proxy","clojure.core/inst-ms","clojure.core/inst-ms*","clojure.core/inst?","clojure.core/instance?","clojure.core/int","clojure.core/int-array","clojure.core/int?","clojure.core/integer?","clojure.core/interleave","clojure.core/intern","clojure.core/interpose","clojure.core/into","clojure.core/into-array","clojure.core/ints","clojure.core/isa?","clojure.core/iterate","clojure.core/iterator-seq","clojure.core/juxt","clojure.core/keep","clojure.core/keep-indexed","clojure.core/key","clojure.core/keys","clojure.core/keyword","clojure.core/keyword?","clojure.core/last","clojure.core/line-seq","clojure.core/list","clojure.core/list*","clojure.core/list?","clojure.core/load","clojure.core/load-file","clojure.core/load-reader","clojure.core/load-string","clojure.core/loaded-libs","clojure.core/long","clojure.core/long-array","clojure.core/longs","clojure.core/macroexpand","clojure.core/macroexpand-1","clojure.core/make-array","clojure.core/make-hierarchy","clojure.core/map","clojure.core/map-entry?","clojure.core/map-indexed","clojure.core/map?","clojure.core/mapcat","clojure.core/mapv","clojure.core/max","clojure.core/max-key","clojure.core/memoize","clojure.core/merge","clojure.core/merge-with","clojure.core/meta","clojure.core/method-sig","clojure.core/methods","clojure.core/min","clojure.core/min-key","clojure.core/mix-collection-hash","clojure.core/mod","clojure.core/munge","clojure.core/name","clojure.core/namespace","clojure.core/namespace-munge","clojure.core/nat-int?","clojure.core/neg-int?","clojure.core/neg?","clojure.core/newline","clojure.core/next","clojure.core/nfirst","clojure.core/nil?","clojure.core/nnext","clojure.core/not","clojure.core/not-any?","clojure.core/not-empty","clojure.core/not-every?","clojure.core/not=","clojure.core/ns-aliases","clojure.core/ns-imports","clojure.core/ns-interns","clojure.core/ns-map","clojure.core/ns-name","clojure.core/ns-publics","clojure.core/ns-refers","clojure.core/ns-resolve","clojure.core/ns-unalias","clojure.core/ns-unmap","clojure.core/nth","clojure.core/nthnext","clojure.core/nthrest","clojure.core/num","clojure.core/number?","clojure.core/numerator","clojure.core/object-array","clojure.core/odd?","clojure.core/parents","clojure.core/partial","clojure.core/partition","clojure.core/partition-all","clojure.core/partition-by","clojure.core/pcalls","clojure.core/peek","clojure.core/persistent!","clojure.core/pmap","clojure.core/pop","clojure.core/pop!","clojure.core/pop-thread-bindings","clojure.core/pos-int?","clojure.core/pos?","clojure.core/pr","clojure.core/pr-str","clojure.core/prefer-method","clojure.core/prefers","clojure.core/print","clojure.core/print-ctor","clojure.core/print-dup","clojure.core/print-method","clojure.core/print-simple","clojure.core/print-str","clojure.core/printf","clojure.core/println","clojure.core/println-str","clojure.core/prn","clojure.core/prn-str","clojure.core/promise","clojure.core/proxy-call-with-super","clojure.core/proxy-mappings","clojure.core/proxy-name","clojure.core/push-thread-bindings","clojure.core/qualified-ident?","clojure.core/qualified-keyword?","clojure.core/qualified-symbol?","clojure.core/quot","clojure.core/rand","clojure.core/rand-int","clojure.core/rand-nth","clojure.core/random-sample","clojure.core/range","clojure.core/ratio?","clojure.core/rational?","clojure.core/rationalize","clojure.core/re-find","clojure.core/re-groups","clojure.core/re-matcher","clojure.core/re-matches","clojure.core/re-pattern","clojure.core/re-seq","clojure.core/read","clojure.core/read+string","clojure.core/read-line","clojure.core/read-string","clojure.core/reader-conditional","clojure.core/reader-conditional?","clojure.core/realized?","clojure.core/record?","clojure.core/reduce","clojure.core/reduce-kv","clojure.core/reduced","clojure.core/reduced?","clojure.core/reductions","clojure.core/ref","clojure.core/ref-history-count","clojure.core/ref-max-history","clojure.core/ref-min-history","clojure.core/ref-set","clojure.core/refer","clojure.core/release-pending-sends","clojure.core/rem","clojure.core/remove","clojure.core/remove-all-methods","clojure.core/remove-method","clojure.core/remove-ns","clojure.core/remove-tap","clojure.core/remove-watch","clojure.core/repeat","clojure.core/repeatedly","clojure.core/replace","clojure.core/replicate","clojure.core/require","clojure.core/requiring-resolve","clojure.core/reset!","clojure.core/reset-meta!","clojure.core/reset-vals!","clojure.core/resolve","clojure.core/rest","clojure.core/restart-agent","clojure.core/resultset-seq","clojure.core/reverse","clojure.core/reversible?","clojure.core/rseq","clojure.core/rsubseq","clojure.core/run!","clojure.core/satisfies?","clojure.core/second","clojure.core/select-keys","clojure.core/send","clojure.core/send-off","clojure.core/send-via","clojure.core/seq","clojure.core/seq?","clojure.core/seqable?","clojure.core/seque","clojure.core/sequence","clojure.core/sequential?","clojure.core/set","clojure.core/set-agent-send-executor!","clojure.core/set-agent-send-off-executor!","clojure.core/set-error-handler!","clojure.core/set-error-mode!","clojure.core/set-validator!","clojure.core/set?","clojure.core/short","clojure.core/short-array","clojure.core/shorts","clojure.core/shuffle","clojure.core/shutdown-agents","clojure.core/simple-ident?","clojure.core/simple-keyword?","clojure.core/simple-symbol?","clojure.core/slurp","clojure.core/some","clojure.core/some-fn","clojure.core/some?","clojure.core/sort","clojure.core/sort-by","clojure.core/sorted-map","clojure.core/sorted-map-by","clojure.core/sorted-set","clojure.core/sorted-set-by","clojure.core/sorted?","clojure.core/special-symbol?","clojure.core/spit","clojure.core/split-at","clojure.core/split-with","clojure.core/str","clojure.core/string?","clojure.core/struct","clojure.core/struct-map","clojure.core/subs","clojure.core/subseq","clojure.core/subvec","clojure.core/supers","clojure.core/swap!","clojure.core/swap-vals!","clojure.core/symbol","clojure.core/symbol?","clojure.core/tagged-literal","clojure.core/tagged-literal?","clojure.core/take","clojure.core/take-last","clojure.core/take-nth","clojure.core/take-while","clojure.core/tap>","clojure.core/test","clojure.core/the-ns","clojure.core/thread-bound?","clojure.core/to-array","clojure.core/to-array-2d","clojure.core/trampoline","clojure.core/transduce","clojure.core/transient","clojure.core/tree-seq","clojure.core/true?","clojure.core/type","clojure.core/unchecked-add","clojure.core/unchecked-add-int","clojure.core/unchecked-byte","clojure.core/unchecked-char","clojure.core/unchecked-dec","clojure.core/unchecked-dec-int","clojure.core/unchecked-divide-int","clojure.core/unchecked-double","clojure.core/unchecked-float","clojure.core/unchecked-inc","clojure.core/unchecked-inc-int","clojure.core/unchecked-int","clojure.core/unchecked-long","clojure.core/unchecked-multiply","clojure.core/unchecked-multiply-int","clojure.core/unchecked-negate","clojure.core/unchecked-negate-int","clojure.core/unchecked-remainder-int","clojure.core/unchecked-short","clojure.core/unchecked-subtract","clojure.core/unchecked-subtract-int","clojure.core/underive","clojure.core/unreduced","clojure.core/unsigned-bit-shift-right","clojure.core/update","clojure.core/update-in","clojure.core/update-proxy","clojure.core/uri?","clojure.core/use","clojure.core/uuid?","clojure.core/val","clojure.core/vals","clojure.core/var-get","clojure.core/var-set","clojure.core/var?","clojure.core/vary-meta","clojure.core/vec","clojure.core/vector","clojure.core/vector-of","clojure.core/vector?","clojure.core/volatile!","clojure.core/volatile?","clojure.core/vreset!","clojure.core/with-bindings*","clojure.core/with-meta","clojure.core/with-redefs-fn","clojure.core/xml-seq","clojure.core/zero?","clojure.core/zipmap","coll?","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","dedupe","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","doall","dorun","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extenders","extends?","false?","ffirst","file-seq","filter","filterv","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn?","fnext","fnil","force","format","frequencies","future-call","future-cancel","future-cancelled?","future-done?","future?","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","ifn?","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","long","long-array","longs","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy-call-with-super","proxy-mappings","proxy-name","push-thread-bindings","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","with-bindings*","with-meta","with-redefs-fn","xml-seq","zero?","zipmap"]
+    \ , 'clojureFunc': ["*","*'","+","+'","-","-'","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods","/","<","<=","=","==",">",">=","PrintWriter-on","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","ancestors","any?","apply","array-map","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","cast","cat","char","char-array","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","clojure.core/*","clojure.core/*'","clojure.core/+","clojure.core/+'","clojure.core/-","clojure.core/-'","clojure.core/->ArrayChunk","clojure.core/->Eduction","clojure.core/->Vec","clojure.core/->VecNode","clojure.core/->VecSeq","clojure.core/-cache-protocol-fn","clojure.core/-reset-methods","clojure.core//","clojure.core/<","clojure.core/<=","clojure.core/=","clojure.core/==","clojure.core/>","clojure.core/>=","clojure.core/PrintWriter-on","clojure.core/StackTraceElement->vec","clojure.core/Throwable->map","clojure.core/accessor","clojure.core/aclone","clojure.core/add-classpath","clojure.core/add-tap","clojure.core/add-watch","clojure.core/agent","clojure.core/agent-error","clojure.core/agent-errors","clojure.core/aget","clojure.core/alength","clojure.core/alias","clojure.core/all-ns","clojure.core/alter","clojure.core/alter-meta!","clojure.core/alter-var-root","clojure.core/ancestors","clojure.core/any?","clojure.core/apply","clojure.core/array-map","clojure.core/aset","clojure.core/aset-boolean","clojure.core/aset-byte","clojure.core/aset-char","clojure.core/aset-double","clojure.core/aset-float","clojure.core/aset-int","clojure.core/aset-long","clojure.core/aset-short","clojure.core/assoc","clojure.core/assoc!","clojure.core/assoc-in","clojure.core/associative?","clojure.core/atom","clojure.core/await","clojure.core/await-for","clojure.core/await1","clojure.core/bases","clojure.core/bean","clojure.core/bigdec","clojure.core/bigint","clojure.core/biginteger","clojure.core/bit-and","clojure.core/bit-and-not","clojure.core/bit-clear","clojure.core/bit-flip","clojure.core/bit-not","clojure.core/bit-or","clojure.core/bit-set","clojure.core/bit-shift-left","clojure.core/bit-shift-right","clojure.core/bit-test","clojure.core/bit-xor","clojure.core/boolean","clojure.core/boolean-array","clojure.core/boolean?","clojure.core/booleans","clojure.core/bound-fn*","clojure.core/bound?","clojure.core/bounded-count","clojure.core/butlast","clojure.core/byte","clojure.core/byte-array","clojure.core/bytes","clojure.core/bytes?","clojure.core/cast","clojure.core/cat","clojure.core/char","clojure.core/char-array","clojure.core/char?","clojure.core/chars","clojure.core/chunk","clojure.core/chunk-append","clojure.core/chunk-buffer","clojure.core/chunk-cons","clojure.core/chunk-first","clojure.core/chunk-next","clojure.core/chunk-rest","clojure.core/chunked-seq?","clojure.core/class","clojure.core/class?","clojure.core/clear-agent-errors","clojure.core/clojure-version","clojure.core/coll?","clojure.core/commute","clojure.core/comp","clojure.core/comparator","clojure.core/compare","clojure.core/compare-and-set!","clojure.core/compile","clojure.core/complement","clojure.core/completing","clojure.core/concat","clojure.core/conj","clojure.core/conj!","clojure.core/cons","clojure.core/constantly","clojure.core/construct-proxy","clojure.core/contains?","clojure.core/count","clojure.core/counted?","clojure.core/create-ns","clojure.core/create-struct","clojure.core/cycle","clojure.core/dec","clojure.core/dec'","clojure.core/decimal?","clojure.core/dedupe","clojure.core/delay?","clojure.core/deliver","clojure.core/denominator","clojure.core/deref","clojure.core/derive","clojure.core/descendants","clojure.core/destructure","clojure.core/disj","clojure.core/disj!","clojure.core/dissoc","clojure.core/dissoc!","clojure.core/distinct","clojure.core/distinct?","clojure.core/doall","clojure.core/dorun","clojure.core/double","clojure.core/double-array","clojure.core/double?","clojure.core/doubles","clojure.core/drop","clojure.core/drop-last","clojure.core/drop-while","clojure.core/eduction","clojure.core/empty","clojure.core/empty?","clojure.core/ensure","clojure.core/ensure-reduced","clojure.core/enumeration-seq","clojure.core/error-handler","clojure.core/error-mode","clojure.core/eval","clojure.core/even?","clojure.core/every-pred","clojure.core/every?","clojure.core/ex-cause","clojure.core/ex-data","clojure.core/ex-info","clojure.core/ex-message","clojure.core/extend","clojure.core/extenders","clojure.core/extends?","clojure.core/false?","clojure.core/ffirst","clojure.core/file-seq","clojure.core/filter","clojure.core/filterv","clojure.core/find","clojure.core/find-keyword","clojure.core/find-ns","clojure.core/find-protocol-impl","clojure.core/find-protocol-method","clojure.core/find-var","clojure.core/first","clojure.core/flatten","clojure.core/float","clojure.core/float-array","clojure.core/float?","clojure.core/floats","clojure.core/flush","clojure.core/fn?","clojure.core/fnext","clojure.core/fnil","clojure.core/force","clojure.core/format","clojure.core/frequencies","clojure.core/future-call","clojure.core/future-cancel","clojure.core/future-cancelled?","clojure.core/future-done?","clojure.core/future?","clojure.core/gensym","clojure.core/get","clojure.core/get-in","clojure.core/get-method","clojure.core/get-proxy-class","clojure.core/get-thread-bindings","clojure.core/get-validator","clojure.core/group-by","clojure.core/halt-when","clojure.core/hash","clojure.core/hash-combine","clojure.core/hash-map","clojure.core/hash-ordered-coll","clojure.core/hash-set","clojure.core/hash-unordered-coll","clojure.core/ident?","clojure.core/identical?","clojure.core/identity","clojure.core/ifn?","clojure.core/in-ns","clojure.core/inc","clojure.core/inc'","clojure.core/indexed?","clojure.core/init-proxy","clojure.core/inst-ms","clojure.core/inst-ms*","clojure.core/inst?","clojure.core/instance?","clojure.core/int","clojure.core/int-array","clojure.core/int?","clojure.core/integer?","clojure.core/interleave","clojure.core/intern","clojure.core/interpose","clojure.core/into","clojure.core/into-array","clojure.core/ints","clojure.core/isa?","clojure.core/iterate","clojure.core/iterator-seq","clojure.core/juxt","clojure.core/keep","clojure.core/keep-indexed","clojure.core/key","clojure.core/keys","clojure.core/keyword","clojure.core/keyword?","clojure.core/last","clojure.core/line-seq","clojure.core/list","clojure.core/list*","clojure.core/list?","clojure.core/load","clojure.core/load-file","clojure.core/load-reader","clojure.core/load-string","clojure.core/loaded-libs","clojure.core/long","clojure.core/long-array","clojure.core/longs","clojure.core/macroexpand","clojure.core/macroexpand-1","clojure.core/make-array","clojure.core/make-hierarchy","clojure.core/map","clojure.core/map-entry?","clojure.core/map-indexed","clojure.core/map?","clojure.core/mapcat","clojure.core/mapv","clojure.core/max","clojure.core/max-key","clojure.core/memoize","clojure.core/merge","clojure.core/merge-with","clojure.core/meta","clojure.core/method-sig","clojure.core/methods","clojure.core/min","clojure.core/min-key","clojure.core/mix-collection-hash","clojure.core/mod","clojure.core/munge","clojure.core/name","clojure.core/namespace","clojure.core/namespace-munge","clojure.core/nat-int?","clojure.core/neg-int?","clojure.core/neg?","clojure.core/newline","clojure.core/next","clojure.core/nfirst","clojure.core/nil?","clojure.core/nnext","clojure.core/not","clojure.core/not-any?","clojure.core/not-empty","clojure.core/not-every?","clojure.core/not=","clojure.core/ns-aliases","clojure.core/ns-imports","clojure.core/ns-interns","clojure.core/ns-map","clojure.core/ns-name","clojure.core/ns-publics","clojure.core/ns-refers","clojure.core/ns-resolve","clojure.core/ns-unalias","clojure.core/ns-unmap","clojure.core/nth","clojure.core/nthnext","clojure.core/nthrest","clojure.core/num","clojure.core/number?","clojure.core/numerator","clojure.core/object-array","clojure.core/odd?","clojure.core/parents","clojure.core/partial","clojure.core/partition","clojure.core/partition-all","clojure.core/partition-by","clojure.core/pcalls","clojure.core/peek","clojure.core/persistent!","clojure.core/pmap","clojure.core/pop","clojure.core/pop!","clojure.core/pop-thread-bindings","clojure.core/pos-int?","clojure.core/pos?","clojure.core/pr","clojure.core/pr-str","clojure.core/prefer-method","clojure.core/prefers","clojure.core/print","clojure.core/print-ctor","clojure.core/print-dup","clojure.core/print-method","clojure.core/print-simple","clojure.core/print-str","clojure.core/printf","clojure.core/println","clojure.core/println-str","clojure.core/prn","clojure.core/prn-str","clojure.core/promise","clojure.core/proxy-call-with-super","clojure.core/proxy-mappings","clojure.core/proxy-name","clojure.core/push-thread-bindings","clojure.core/qualified-ident?","clojure.core/qualified-keyword?","clojure.core/qualified-symbol?","clojure.core/quot","clojure.core/rand","clojure.core/rand-int","clojure.core/rand-nth","clojure.core/random-sample","clojure.core/range","clojure.core/ratio?","clojure.core/rational?","clojure.core/rationalize","clojure.core/re-find","clojure.core/re-groups","clojure.core/re-matcher","clojure.core/re-matches","clojure.core/re-pattern","clojure.core/re-seq","clojure.core/read","clojure.core/read+string","clojure.core/read-line","clojure.core/read-string","clojure.core/reader-conditional","clojure.core/reader-conditional?","clojure.core/realized?","clojure.core/record?","clojure.core/reduce","clojure.core/reduce-kv","clojure.core/reduced","clojure.core/reduced?","clojure.core/reductions","clojure.core/ref","clojure.core/ref-history-count","clojure.core/ref-max-history","clojure.core/ref-min-history","clojure.core/ref-set","clojure.core/refer","clojure.core/release-pending-sends","clojure.core/rem","clojure.core/remove","clojure.core/remove-all-methods","clojure.core/remove-method","clojure.core/remove-ns","clojure.core/remove-tap","clojure.core/remove-watch","clojure.core/repeat","clojure.core/repeatedly","clojure.core/replace","clojure.core/replicate","clojure.core/require","clojure.core/requiring-resolve","clojure.core/reset!","clojure.core/reset-meta!","clojure.core/reset-vals!","clojure.core/resolve","clojure.core/rest","clojure.core/restart-agent","clojure.core/resultset-seq","clojure.core/reverse","clojure.core/reversible?","clojure.core/rseq","clojure.core/rsubseq","clojure.core/run!","clojure.core/satisfies?","clojure.core/second","clojure.core/select-keys","clojure.core/send","clojure.core/send-off","clojure.core/send-via","clojure.core/seq","clojure.core/seq?","clojure.core/seqable?","clojure.core/seque","clojure.core/sequence","clojure.core/sequential?","clojure.core/set","clojure.core/set-agent-send-executor!","clojure.core/set-agent-send-off-executor!","clojure.core/set-error-handler!","clojure.core/set-error-mode!","clojure.core/set-validator!","clojure.core/set?","clojure.core/short","clojure.core/short-array","clojure.core/shorts","clojure.core/shuffle","clojure.core/shutdown-agents","clojure.core/simple-ident?","clojure.core/simple-keyword?","clojure.core/simple-symbol?","clojure.core/slurp","clojure.core/some","clojure.core/some-fn","clojure.core/some?","clojure.core/sort","clojure.core/sort-by","clojure.core/sorted-map","clojure.core/sorted-map-by","clojure.core/sorted-set","clojure.core/sorted-set-by","clojure.core/sorted?","clojure.core/special-symbol?","clojure.core/spit","clojure.core/split-at","clojure.core/split-with","clojure.core/str","clojure.core/string?","clojure.core/struct","clojure.core/struct-map","clojure.core/subs","clojure.core/subseq","clojure.core/subvec","clojure.core/supers","clojure.core/swap!","clojure.core/swap-vals!","clojure.core/symbol","clojure.core/symbol?","clojure.core/tagged-literal","clojure.core/tagged-literal?","clojure.core/take","clojure.core/take-last","clojure.core/take-nth","clojure.core/take-while","clojure.core/tap>","clojure.core/test","clojure.core/the-ns","clojure.core/thread-bound?","clojure.core/to-array","clojure.core/to-array-2d","clojure.core/trampoline","clojure.core/transduce","clojure.core/transient","clojure.core/tree-seq","clojure.core/true?","clojure.core/type","clojure.core/unchecked-add","clojure.core/unchecked-add-int","clojure.core/unchecked-byte","clojure.core/unchecked-char","clojure.core/unchecked-dec","clojure.core/unchecked-dec-int","clojure.core/unchecked-divide-int","clojure.core/unchecked-double","clojure.core/unchecked-float","clojure.core/unchecked-inc","clojure.core/unchecked-inc-int","clojure.core/unchecked-int","clojure.core/unchecked-long","clojure.core/unchecked-multiply","clojure.core/unchecked-multiply-int","clojure.core/unchecked-negate","clojure.core/unchecked-negate-int","clojure.core/unchecked-remainder-int","clojure.core/unchecked-short","clojure.core/unchecked-subtract","clojure.core/unchecked-subtract-int","clojure.core/underive","clojure.core/unreduced","clojure.core/unsigned-bit-shift-right","clojure.core/update","clojure.core/update-in","clojure.core/update-proxy","clojure.core/uri?","clojure.core/use","clojure.core/uuid?","clojure.core/val","clojure.core/vals","clojure.core/var-get","clojure.core/var-set","clojure.core/var?","clojure.core/vary-meta","clojure.core/vec","clojure.core/vector","clojure.core/vector-of","clojure.core/vector?","clojure.core/volatile!","clojure.core/volatile?","clojure.core/vreset!","clojure.core/with-bindings*","clojure.core/with-meta","clojure.core/with-redefs-fn","clojure.core/xml-seq","clojure.core/zero?","clojure.core/zipmap","coll?","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","dedupe","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","doall","dorun","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extenders","extends?","false?","ffirst","file-seq","filter","filterv","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn?","fnext","fnil","force","format","frequencies","future-call","future-cancel","future-cancelled?","future-done?","future?","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","ifn?","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","long","long-array","longs","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy-call-with-super","proxy-mappings","proxy-name","push-thread-bindings","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","with-bindings*","with-meta","with-redefs-fn","xml-seq","zero?","zipmap"]
     \ , 'clojureMacro': ["->","->>","..","amap","and","areduce","as->","assert","binding","bound-fn","clojure.core/->","clojure.core/->>","clojure.core/..","clojure.core/amap","clojure.core/and","clojure.core/areduce","clojure.core/as->","clojure.core/assert","clojure.core/binding","clojure.core/bound-fn","clojure.core/comment","clojure.core/declare","clojure.core/delay","clojure.core/dosync","clojure.core/doto","clojure.core/extend-protocol","clojure.core/extend-type","clojure.core/for","clojure.core/future","clojure.core/gen-class","clojure.core/gen-interface","clojure.core/import","clojure.core/io!","clojure.core/lazy-cat","clojure.core/lazy-seq","clojure.core/letfn","clojure.core/locking","clojure.core/memfn","clojure.core/ns","clojure.core/or","clojure.core/proxy","clojure.core/proxy-super","clojure.core/pvalues","clojure.core/refer-clojure","clojure.core/reify","clojure.core/some->","clojure.core/some->>","clojure.core/sync","clojure.core/time","clojure.core/vswap!","clojure.core/with-bindings","clojure.core/with-in-str","clojure.core/with-loading-context","clojure.core/with-local-vars","clojure.core/with-open","clojure.core/with-out-str","clojure.core/with-precision","clojure.core/with-redefs","comment","declare","delay","dosync","doto","extend-protocol","extend-type","for","future","gen-class","gen-interface","import","io!","lazy-cat","lazy-seq","letfn","locking","memfn","ns","or","proxy","proxy-super","pvalues","refer-clojure","reify","some->","some->>","sync","time","vswap!","with-bindings","with-in-str","with-loading-context","with-local-vars","with-open","with-out-str","with-precision","with-redefs"]
     \ , 'clojureRepeat': ["clojure.core/doseq","clojure.core/dotimes","clojure.core/while","doseq","dotimes","while"]
     \ , 'clojureSpecial': [".","clojure.core/fn","clojure.core/let","clojure.core/loop","def","do","fn","if","let","loop","monitor-enter","monitor-exit","new","quote","recur","set!","var"]
@@ -102,7 +102,7 @@ syntax region clojureRegexpQuote  start=/\\Q/       skip=/\\\\\|\\"/ end=/\\E/
 
 " -*- CHARACTER PROPERTY CLASSES -*-
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-" Java version 15.0.2
+" Java version 17
 syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Cntrl|A%(l%(pha|num)|SCII)|Space|Graph|Upper|P%(rint|unct)|Blank|XDigit|Digit|Lower)\}" contained display
 syntax match clojureRegexpJavaCharClass "\v\\[pP]\{java%(Whitespace|JavaIdentifier%(Part|Start)|SpaceChar|Mirrored|TitleCase|I%(SOControl|de%(ographic|ntifierIgnorable))|D%(efined|igit)|U%(pperCase|nicodeIdentifier%(Part|Start))|L%(etter%(OrDigit)?|owerCase)|Alphabetic)\}" contained display
 syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\cIs%(l%(owercase|etter)|hex%(digit|_digit)|w%(hite%(_space|space)|ord)|noncharacter%(_code_point|codepoint)|p%(rint|unctuation)|ideographic|graph|a%(l%(num|phabetic)|ssigned)|uppercase|join%(control|_control)|titlecase|blank|digit|control)\}" contained display
@@ -137,21 +137,24 @@ syntax keyword clojureCommentTodo contained FIXME XXX TODO BUG NOTE HACK FIXME:
 
 syntax match clojureComment ";.*$" contains=clojureCommentTodo,@Spell
 syntax match clojureComment "#!.*$"
-
-" Comment forms highlight comment forms as comment.  Based on: <https://git.sr.ht/~evhan/vim-scheme/>
-syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*/   end=/[, \t\n()\[\]{}";]/me=e-1
-syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*"/  skip=/\\[\\"]/ end=/"/
-syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*(/  end=/)/  contains=clojureComentReaderMacroForm
-syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*\[/ end=/\]/ contains=clojureComentReaderMacroForm
-syntax region clojureComentReaderMacro matchgroup=clojureComentReaderMacro start=/#_[ ,\t\n`'~]*{/  end=/}/  contains=clojureComentReaderMacroForm
-
-syntax region clojureComentReaderMacroForm start="("  end=")"  contained contains=clojureComentReaderMacroForm
-syntax region clojureComentReaderMacroForm start="{"  end="}"  contained contains=clojureComentReaderMacroForm
-syntax region clojureComentReaderMacroForm start="\[" end="\]" contained contains=clojureComentReaderMacroForm
+syntax match clojureComment ","
+
+" Comment out discarded forms.  <https://clojure.org/guides/weird_characters#_discard>
+if exists('g:clojure_discard_macro') && g:clojure_discard_macro
+	syntax region clojureDiscard matchgroup=clojureDiscard start=/#_[ ,\t\n`'~]*/   end=/[, \t\n()\[\]{}";]/me=e-1
+	syntax region clojureDiscard matchgroup=clojureDiscard start=/#_[ ,\t\n`'~]*"/  skip=/\\[\\"]/ end=/"/
+	syntax region clojureDiscard matchgroup=clojureDiscard start=/#_[ ,\t\n`'~]*(/  end=/)/  contains=clojureDiscardForm
+	syntax region clojureDiscard matchgroup=clojureDiscard start=/#_[ ,\t\n`'~]*\[/ end=/\]/ contains=clojureDiscardForm
+	syntax region clojureDiscard matchgroup=clojureDiscard start=/#_[ ,\t\n`'~]*{/  end=/}/  contains=clojureDiscardForm
+
+	syntax region clojureDiscardForm start="("  end=")"  contained contains=clojureDiscardForm
+	syntax region clojureDiscardForm start="{"  end="}"  contained contains=clojureDiscardForm
+	syntax region clojureDiscardForm start="\[" end="\]" contained contains=clojureDiscardForm
+endif
 
 " -*- TOP CLUSTER -*-
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-syntax cluster clojureTop contains=@Spell,clojureAnonArg,clojureBoolean,clojureCharacter,clojureComment,clojureCond,clojureConstant,clojureDefine,clojureDeref,clojureDispatch,clojureError,clojureException,clojureFunc,clojureKeyword,clojureMacro,clojureMap,clojureMeta,clojureNumber,clojureQuote,clojureRegexp,clojureRepeat,clojureSexp,clojureSpecial,clojureString,clojureSymbol,clojureUnquote,clojureVarArg,clojureVariable,clojureVector,clojureComentReaderMacro
+syntax cluster clojureTop contains=@Spell,clojureAnonArg,clojureBoolean,clojureCharacter,clojureComment,clojureCond,clojureConstant,clojureDefine,clojureDeref,clojureDiscard,clojureDispatch,clojureError,clojureException,clojureFunc,clojureKeyword,clojureMacro,clojureMap,clojureMeta,clojureNumber,clojureQuote,clojureRegexp,clojureRepeat,clojureSexp,clojureSpecial,clojureString,clojureSymbol,clojureUnquote,clojureVarArg,clojureVariable,clojureVector
 
 syntax region clojureSexp   matchgroup=clojureParen start="("  end=")" contains=@clojureTop fold
 syntax region clojureVector matchgroup=clojureParen start="\[" end="]" contains=@clojureTop fold
@@ -206,8 +209,8 @@ highlight default link clojureDispatch                  SpecialChar
 
 highlight default link clojureComment                   Comment
 highlight default link clojureCommentTodo               Todo
-highlight default link clojureComentReaderMacro         clojureComment
-highlight default link clojureComentReaderMacroForm     clojureComentReaderMacro
+highlight default link clojureDiscard                   clojureComment
+highlight default link clojureDiscardForm               clojureDiscard
 
 highlight default link clojureError                     Error
 
diff --git a/syntax/csc.vim b/syntax/csc.vim
index 1d775e064..04f58950e 100644
--- a/syntax/csc.vim
+++ b/syntax/csc.vim
@@ -145,7 +145,7 @@ sy	keyword	cscBPMacro	contained EndLoop AllMembers SelectedMembers If Else EndIf
 sy	match	cscBPMacro	contained	"!"
 sy	match	cscBPW	"!\s*\a*"	contains=cscBPmacro
 
-" when wanted, highlighting lhs members or erros in asignments (may lag the editing)
+" when wanted, highlighting lhs members or errors in assignments (may lag the editing)
 if exists("csc_asignment")
 	sy	match	cscEqError	'\("[^"]*"\s*\|[^][\t !%()*+,--/:;<=>{}~]\+\s*\|->\s*\)*=\([^=]\@=\|$\)'
 	sy	region	cscFormula	transparent matchgroup=cscVarName start='\("[^"]*"\|[^][\t !%()*+,--/:;<=>{}~]\+\)\s*=\([^=]\@=\|\n\)' skip='"[^"]*"' end=';' contains=ALLBUT,cscFormula,cscFormulaIn,cscBPMacro,cscCondition
diff --git a/syntax/css.vim b/syntax/css.vim
index ba7f45953..ccaa6d696 100644
--- a/syntax/css.vim
+++ b/syntax/css.vim
@@ -6,12 +6,12 @@ endif
 " Language:     Cascading Style Sheets
 " Previous Contributor List:
 "               Jules Wang      <w.jq0722@gmail.com>
-"               Claudio Fleiner <claudio@fleiner.com> (Maintainer)
+"               Claudio Fleiner <claudio@fleiner.com>
 "               Yeti            (Add full CSS2, HTML4 support)
 "               Nikolai Weibull (Add CSS2 support)
-" URL:          https://github.com/jsit/css.vim
+" URL:          https://github.com/vim-language-dept/css-syntax.vim
 " Maintainer:   Jay Sitter <jay@jaysitter.com>
-" Last Change:  2019 Jul. 29
+" Last Change:  2021 Oct 20
 
 " quit when a syntax file was already loaded
 if !exists("main_syntax")
@@ -27,6 +27,8 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 syn case ignore
+" Add dash to allowed keyword characters.
+syn iskeyword @,48-57,_,192-255,-
 
 " HTML4 tags
 syn keyword cssTagName abbr address area a b base
@@ -36,7 +38,7 @@ syn keyword cssTagName dfn div dl dt em fieldset form
 syn keyword cssTagName h1 h2 h3 h4 h5 h6 head hr html img i
 syn keyword cssTagName iframe input ins isindex kbd label legend li
 syn keyword cssTagName link map menu meta noscript ol optgroup
-syn keyword cssTagName option p param pre q s samp script small
+syn keyword cssTagName option p param picture pre q s samp script small
 syn keyword cssTagName span strong sub sup tbody td
 syn keyword cssTagName textarea tfoot th thead title tr ul u var
 syn keyword cssTagName object svg
@@ -118,7 +120,7 @@ syn keyword cssColor contained ActiveBorder ActiveCaption AppWorkspace ButtonFac
 syn case ignore
 
 syn match cssImportant contained "!\s*important\>"
-syn match cssCustomProp contained "--[a-zA-Z0-9-_]*"
+syn match cssCustomProp contained "\<--[a-zA-Z0-9-_]*\>"
 
 syn match cssColor contained "\<transparent\>"
 syn match cssColor contained "\<currentColor\>"
@@ -128,10 +130,11 @@ syn match cssColor contained "#\x\{6\}\>" contains=cssUnitDecorators
 syn match cssColor contained "#\x\{8\}\>" contains=cssUnitDecorators
 
 syn region cssURL contained matchgroup=cssFunctionName start="\<\(uri\|url\|local\|format\)\s*(" end=")" contains=cssStringQ,cssStringQQ oneline
+syn region cssMathGroup contained matchgroup=cssMathParens start="(" end=")" containedin=cssFunction,cssMathGroup contains=cssCustomProp,cssValue.*,cssFunction,cssColor,cssStringQ,cssStringQQ oneline
 syn region cssFunction contained matchgroup=cssFunctionName start="\<\(var\|calc\)\s*(" end=")" contains=cssCustomProp,cssValue.*,cssFunction,cssColor,cssStringQ,cssStringQQ oneline
 syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgb\|clip\|attr\|counter\|rect\|cubic-bezier\|steps\)\s*(" end=")" oneline  contains=cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma
 syn region cssFunction contained matchgroup=cssFunctionName start="\<\(rgba\|hsl\|hsla\|color-stop\|from\|to\)\s*(" end=")" oneline  contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunctionComma,cssFunction
-syn region cssFunction contained matchgroup=cssFunctionName start="\<\(linear-\|radial-\)\=\gradient\s*(" end=")" oneline  contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunction,cssGradientAttr,cssFunctionComma
+syn region cssFunction contained matchgroup=cssFunctionName start="\<\(linear-\|radial-\|conic-\)\=\gradient\s*(" end=")" oneline  contains=cssColor,cssValueInteger,cssValueNumber,cssValueLength,cssFunction,cssGradientAttr,cssFunctionComma
 syn region cssFunction contained matchgroup=cssFunctionName start="\<\(matrix\(3d\)\=\|scale\(3d\|X\|Y\|Z\)\=\|translate\(3d\|X\|Y\|Z\)\=\|skew\(X\|Y\)\=\|rotate\(3d\|X\|Y\|Z\)\=\|perspective\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssValueAngle,cssFunctionComma
 syn region cssFunction contained matchgroup=cssFunctionName start="\<\(blur\|brightness\|contrast\|drop-shadow\|grayscale\|hue-rotate\|invert\|opacity\|saturate\|sepia\)\s*(" end=")" oneline contains=cssValueInteger,cssValueNumber,cssValueLength,cssValueAngle,cssFunctionComma
 syn keyword cssGradientAttr contained top bottom left right cover center middle ellipse at
@@ -224,7 +227,7 @@ syn keyword cssFlexibleBoxProp contained order
 syn match cssFlexibleBoxAttr contained "\<\(row\|column\|wrap\)\(-reverse\)\=\>"
 syn keyword cssFlexibleBoxAttr contained nowrap stretch baseline center
 syn match cssFlexibleBoxAttr contained "\<flex\(-\(start\|end\)\)\=\>"
-syn match cssFlexibleBoxAttr contained "\<space\(-\(between\|around\)\)\=\>"
+syn match cssFlexibleBoxAttr contained "\<space\(-\(between\|around\|evenly\)\)\=\>"
 
 " CSS Fonts Module Level 3
 " http://www.w3.org/TR/css-fonts-3/
@@ -238,9 +241,7 @@ syn keyword cssFontAttr contained larger smaller
 syn match cssFontAttr contained "\<\(x\{1,2\}-\)\=\(large\|small\)\>"
 syn match cssFontAttr contained "\<small-\(caps\|caption\)\>"
 " font-family attributes
-syn match cssFontAttr contained "\<\(sans-\)\=serif\>"
-syn keyword cssFontAttr contained Antiqua Arial Black Book Charcoal Comic Courier Dingbats Gadget Geneva Georgia Grande Helvetica Impact Linotype Lucida MS Monaco Neue New Palatino Roboto Roman Symbol Tahoma Times Trebuchet Verdana Webdings Wingdings York Zapf
-syn keyword cssFontAttr contained cursive fantasy monospace
+syn keyword cssFontAttr contained sans-serif serif cursive fantasy monospace
 " font-feature-settings attributes
 syn keyword cssFontAttr contained on off
 " font-stretch attributes
@@ -287,6 +288,7 @@ syn match cssGridProp contained "\<grid\>"
 syn match cssGridProp contained "\<grid-template\(-\(columns\|rows\|areas\)\)\=\>"
 syn match cssGridProp contained "\<grid-\(column\|row\)\(-\(start\|end\|gap\)\)\=\>"
 syn match cssGridProp contained "\<grid-\(area\|gap\)\>"
+syn match cssGridProp contained "\<gap\>"
 syn match cssGridProp contained "\<grid-auto-\(flow\|rows\|columns\)\>"
 
 syn match cssHyerlinkProp contained "\<target\(-\(name\|new\|position\)\)\=\>"
@@ -298,6 +300,10 @@ syn match cssListAttr contained "\<\(decimal\(-leading-zero\)\=\|cjk-ideographic
 syn keyword cssListAttr contained disc circle square hebrew armenian georgian
 syn keyword cssListAttr contained inside outside
 
+" object-fit https://www.w3.org/TR/css-images-3/#the-object-fit
+syn match cssObjectProp contained "\<object-\(fit\|position\)\>"
+syn keyword cssObjectAttr contained fill contain cover scale-down
+
 syn keyword cssPositioningProp contained bottom clear clip display float left
 syn keyword cssPositioningProp contained position right top visibility
 syn match cssPositioningProp contained "\<z-index\>"
@@ -307,7 +313,7 @@ syn keyword cssPositioningAttr contained left right both
 syn match cssPositioningAttr contained "\<list-item\>"
 syn match cssPositioningAttr contained "\<inline\(-\(block\|box\|table\|grid\|flex\)\)\=\>"
 syn match cssPositioningAttr contained "\<flow\(-root\)\=\>"
-syn keyword cssPositioningAttr contained static relative absolute fixed subgrid
+syn keyword cssPositioningAttr contained static relative absolute fixed subgrid sticky
 
 syn keyword cssPrintAttr contained landscape portrait crop cross always
 
@@ -394,9 +400,9 @@ syn match cssUIAttr contained '\<preserve-3d\>'
 syn match cssIEUIAttr contained '\<bicubic\>'
 
 " Webkit/iOS specific properties
-syn match cssUIProp contained '\<tap-highlight-color\|user-select\|touch-callout\>'
+syn match cssUIProp contained '\<\(tap-highlight-color\|user-select\|touch-callout\)\>'
 " IE specific properties
-syn match cssIEUIProp contained '\<interpolation-mode\|zoom\|filter\>'
+syn match cssIEUIProp contained '\<\(interpolation-mode\|zoom\|filter\)\>'
 
 " Webkit/Firebox specific properties/attributes
 syn keyword cssUIProp contained appearance
@@ -422,11 +428,15 @@ syn keyword cssAuralAttr contained male female child code digits continuous
 syn match cssMobileTextProp contained "\<text-size-adjust\>"
 
 syn keyword cssMediaProp contained width height orientation scan
-syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(\(device\)-\)\=aspect-ratio/
-syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-pixel-ratio/
-syn match cssMediaProp contained /\(\(max\|min\)-\)\=device-\(height\|width\)/
-syn match cssMediaProp contained /\(\(max\|min\)-\)\=\(height\|width\|resolution\|monochrome\|color\(-index\)\=\)/
+syn keyword cssMediaProp contained any-hover any-pointer color-gamut grid hover
+syn keyword cssMediaProp contained overflow-block overflow-inline pointer update
+syn match cssMediaProp contained /\<\(\(max\|min\)-\)\=\(\(device\)-\)\=aspect-ratio\>/
+syn match cssMediaProp contained /\<\(\(max\|min\)-\)\=device-pixel-ratio\>/
+syn match cssMediaProp contained /\<\(\(max\|min\)-\)\=device-\(height\|width\)\>/
+syn match cssMediaProp contained /\<\(\(max\|min\)-\)\=\(height\|width\|resolution\|monochrome\|color\(-index\)\=\)\>/
 syn keyword cssMediaAttr contained portrait landscape progressive interlace
+syn keyword cssMediaAttr contained coarse fast fine hover infinite p3 paged
+syn keyword cssMediaAttr contained rec2020 scroll slow srgb
 syn match cssKeyFrameProp contained /\(\d\+\(\.\d\+\)\?%\|\(\<from\|to\>\)\)/ nextgroup=cssDefinition
 syn match cssPageMarginProp /@\(\(top\|left\|right\|bottom\)-\(left\|center\|right\|middle\|bottom\)\)\(-corner\)\=/ contained nextgroup=cssDefinition
 syn keyword cssPageProp contained content size
@@ -444,17 +454,17 @@ syn match cssBraceError "}"
 syn match cssAttrComma ","
 
 " Pseudo class
-" http://www.w3.org/TR/css3-selectors/
+" https://www.w3.org/TR/selectors-4/
 syn match cssPseudoClass ":[A-Za-z0-9_-]*" contains=cssNoise,cssPseudoClassId,cssUnicodeEscape,cssVendor,cssPseudoClassFn
 syn keyword cssPseudoClassId contained link visited active hover before after left right
-syn keyword cssPseudoClassId contained root empty target enable disabled checked invalid
+syn keyword cssPseudoClassId contained root empty target enabled disabled checked invalid
 syn match cssPseudoClassId contained "\<first-\(line\|letter\)\>"
 syn match cssPseudoClassId contained "\<\(first\|last\|only\)-\(of-type\|child\)\>"
-syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<\(not\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(" end=")" contains=cssStringQ,cssStringQQ
+syn match cssPseudoClassId contained  "\<focus\(-within\|-visible\)\=\>"
+syn region cssPseudoClassFn contained matchgroup=cssFunctionName start="\<\(not\|is\|lang\|\(nth\|nth-last\)-\(of-type\|child\)\)(" end=")" contains=cssStringQ,cssStringQQ,cssTagName,cssAttributeSelector,cssClassName,cssIdentifier
 " ------------------------------------
 " Vendor specific properties
 syn match cssPseudoClassId contained  "\<selection\>"
-syn match cssPseudoClassId contained  "\<focus\(-inner\)\=\>"
 syn match cssPseudoClassId contained  "\<\(input-\)\=placeholder\>"
 
 " Misc highlight groups
@@ -552,6 +562,7 @@ hi def link cssMarqueeProp cssProp
 hi def link cssMultiColumnProp cssProp
 hi def link cssPagedMediaProp cssProp
 hi def link cssPositioningProp cssProp
+hi def link cssObjectProp cssProp
 hi def link cssPrintProp cssProp
 hi def link cssRubyProp cssProp
 hi def link cssSpeechProp cssProp
@@ -585,6 +596,7 @@ hi def link cssMultiColumnAttr cssAttr
 hi def link cssPaddingAttr cssAttr
 hi def link cssPagedMediaAttr cssAttr
 hi def link cssPositioningAttr cssAttr
+hi def link cssObjectAttr cssAttr
 hi def link cssGradientAttr cssAttr
 hi def link cssPrintAttr cssAttr
 hi def link cssRubyAttr cssAttr
diff --git a/syntax/cupl.vim b/syntax/cupl.vim
index 8ad97a814..913e6579a 100644
--- a/syntax/cupl.vim
+++ b/syntax/cupl.vim
@@ -27,7 +27,7 @@ syn keyword cuplTodo contained TODO XXX FIXME
 " cuplHeaderContents uses default highlighting except for numbers
 syn match cuplHeaderContents ".\+;"me=e-1 contains=cuplNumber contained
 
-" String contstants
+" String constants
 syn region cuplString start=+'+ end=+'+
 syn region cuplString start=+"+ end=+"+
 
diff --git a/syntax/debchangelog.vim b/syntax/debchangelog.vim
index a6b5c8714..7b0f6528f 100644
--- a/syntax/debchangelog.vim
+++ b/syntax/debchangelog.vim
@@ -7,7 +7,7 @@ endif
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2021 Aug 03
+" Last Change: 2021 Oct 19
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -28,7 +28,8 @@ let s:supported = [
       \ 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
       \ 'trixie', 'sid', 'rc-buggy',
       \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'hirsute', 'impish', 'devel'
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'hirsute', 'impish', 'jammy',
+      \ 'devel'
       \ ]
 let s:unsupported = [
       \ 'frozen', 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
diff --git a/syntax/debsources.vim b/syntax/debsources.vim
index f8ed8d990..9929e6296 100644
--- a/syntax/debsources.vim
+++ b/syntax/debsources.vim
@@ -6,7 +6,7 @@ endif
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2021 Aug 03
+" Last Change: 2021 Oct 19
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -30,7 +30,8 @@ let s:supported = [
       \ 'jessie', 'stretch', 'buster', 'bullseye', 'bookworm',
       \ 'trixie', 'sid', 'rc-buggy',
       \
-      \ 'trusty', 'xenial', 'bionic', 'focal', 'hirsute', 'impish', 'devel'
+      \ 'trusty', 'xenial', 'bionic', 'focal', 'hirsute', 'impish', 'jammy',
+      \ 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
diff --git a/syntax/django.vim b/syntax/django.vim
index 82e500704..2bf08faca 100644
--- a/syntax/django.vim
+++ b/syntax/django.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:	Django template
 " Maintainer:	Dave Hodder <dmh@dmh.org.uk>
-" Last Change:	2014 Jul 13
+" Last Change:	2021 Nov 29
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -35,6 +35,7 @@ syn keyword djangoStatement contained closecomment widthratio url with endwith
 syn keyword djangoStatement contained get_current_language trans noop blocktrans
 syn keyword djangoStatement contained endblocktrans get_available_languages
 syn keyword djangoStatement contained get_current_language_bidi plural
+syn keyword djangoStatement contained translate blocktranslate endblocktranslate
 
 " Django templete built-in filters
 syn keyword djangoFilter contained add addslashes capfirst center cut date
diff --git a/syntax/dosbatch.vim b/syntax/dosbatch.vim
index ce7bfed70..795062221 100644
--- a/syntax/dosbatch.vim
+++ b/syntax/dosbatch.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'dosbatch', 'syntax/dosbatch.v
 endif
 
 " Vim syntax file
-" Language:	MSDOS batch file (with NT command extensions)
+" Language:	MS-DOS batch file (with NT command extensions)
 " Maintainer:	Mike Williams <mrw@eandem.co.uk>
 " Filenames:    *.bat
 " Last Change:	6th September 2009
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index 5928805b9..22e0e5ed1 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -119,6 +119,7 @@ syntax include @HTML syntax/html.vim
 unlet b:current_syntax
 syntax region elixirLiveViewSigil matchgroup=elixirSigilDelimiter keepend start=+\~L\z("""\)+ end=+^\s*\z1+ skip=+\\"+ contains=@HTML fold
 syntax region elixirSurfaceSigil matchgroup=elixirSigilDelimiter keepend start=+\~H\z("""\)+ end=+^\s*\z1+ skip=+\\"+ contains=@HTML fold
+syntax region elixirSurfaceSigil matchgroup=elixirSigilDelimiter keepend start=+\~F\z("""\)+ end=+^\s*\z1+ skip=+\\"+ contains=@HTML fold
 syntax region elixirPhoenixESigil matchgroup=elixirSigilDelimiter keepend start=+\~E\z("""\)+ end=+^\s*\z1+ skip=+\\"+ contains=@HTML fold
 syntax region elixirPhoenixeSigil matchgroup=elixirSigilDelimiter keepend start=+\~e\z("""\)+ end=+^\s*\z1+ skip=+\\"+ contains=@HTML fold
 
diff --git a/syntax/focexec.vim b/syntax/focexec.vim
index c2ae774aa..d7a18403b 100644
--- a/syntax/focexec.vim
+++ b/syntax/focexec.vim
@@ -12,7 +12,7 @@ endif
 " this is a very simple syntax file - I will be improving it
 " one thing is how to do computes
 " I don't like that &vars and FUSE() functions highlight to the same color
-" I think some of these things should get different hilights -
+" I think some of these things should get different highlights -
 "  should MODIFY commands look different than TABLE?
 
 " quit when a syntax file was already loaded
diff --git a/syntax/forth.vim b/syntax/forth.vim
index 4090be42a..94bb78be6 100644
--- a/syntax/forth.vim
+++ b/syntax/forth.vim
@@ -185,7 +185,7 @@ syn keyword forthMath DECIMAL HEX BASE
 syn match forthInteger '\<-\=[0-9]\+.\=\>'
 syn match forthInteger '\<&-\=[0-9]\+.\=\>'
 " recognize hex and binary numbers, the '$' and '%' notation is for gforth
-syn match forthInteger '\<\$\x*\x\+\>' " *1* --- dont't mess
+syn match forthInteger '\<\$\x*\x\+\>' " *1* --- don't mess
 syn match forthInteger '\<\x*\d\x*\>'  " *2* --- this order!
 syn match forthInteger '\<%[0-1]*[0-1]\+\>'
 syn match forthFloat '\<-\=\d*[.]\=\d\+[DdEe]\d\+\>'
diff --git a/syntax/gdb.vim b/syntax/gdb.vim
index 587274fd7..0e0931bf2 100644
--- a/syntax/gdb.vim
+++ b/syntax/gdb.vim
@@ -6,7 +6,8 @@ endif
 " Language:	GDB command files
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
 " URL:		http://www.fleiner.com/vim/syntax/gdb.vim
-" Last Change:	2012 Oct 05
+" Last Change:	2021 Nov 15
+" 		Additional changes by Simon Sobisch
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -25,19 +26,19 @@ syn match gdbInfo contained "all-registers"
 
 
 syn keyword gdbStatement contained actions apply attach awatch backtrace break bt call catch cd clear collect commands
-syn keyword gdbStatement contained complete condition continue delete detach directory disable disassemble display down
+syn keyword gdbStatement contained complete condition continue delete detach directory disable disas[semble] disp[lay] down
 syn keyword gdbStatement contained echo else enable end file finish frame handle hbreak help if ignore
 syn keyword gdbStatement contained inspect jump kill list load maintenance make next nexti ni output overlay
-syn keyword gdbStatement contained passcount path print printf ptype pwd quit rbreak remote return run rwatch
-syn keyword gdbStatement contained search section set sharedlibrary shell show si signal source step stepi stepping
+syn keyword gdbStatement contained passcount path print printf ptype python pwd quit rbreak remote return run rwatch
+syn keyword gdbStatement contained search section set sharedlibrary shell show si signal skip source step stepi stepping
 syn keyword gdbStatement contained stop target tbreak tdump tfind thbreak thread tp trace tstart tstatus tstop
-syn keyword gdbStatement contained tty undisplay unset until up watch whatis where while ws x
+syn keyword gdbStatement contained tty und[isplay] unset until up watch whatis where while ws x
 syn match gdbFuncDef "\<define\>.*"
 syn match gdbStatmentContainer "^\s*\S\+" contains=gdbStatement,gdbFuncDef
 syn match gdbStatement "^\s*info" nextgroup=gdbInfo skipwhite skipempty
 
 " some commonly used abbreviations
-syn keyword gdbStatement c disp undisp disas p
+syn keyword gdbStatement c cont p py
 
 syn region gdbDocument matchgroup=gdbFuncDef start="\<document\>.*$" matchgroup=gdbFuncDef end="^end\s*$"
 
diff --git a/syntax/git.vim b/syntax/git.vim
index 16a86a6aa..66a77c206 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -52,39 +52,39 @@ syn match gitDiffRemoved "\[-[^]]*-\]" contained containedin=gitDiff
 syn match  gitKeyword /^commit \@=/ contained containedin=gitHead nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
 syn match  gitKeyword /^\%(object\|tree\|parent\|encoding\|gpgsig\%(-\w\+\)\=\|previous\) \@=/ contained containedin=gitHead nextgroup=gitHash skipwhite contains=@NoSpell
 syn match  gitKeyword /^Merge:/  contained containedin=gitHead nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
-syn match  gitIdentityKeyword /^\%(author\|committer\|tagger\) \@=/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
-syn match  gitIdentityHeader /^\%(Author\|Commit\|Tagger\):/ contained containedin=gitHead nextgroup=gitIdentity skipwhite
-syn match  gitDateHeader /^\%(AuthorDate\|CommitDate\|Date\):/ contained containedin=gitHead nextgroup=gitDate skipwhite
+syn match  gitIdentityKeyword /^\%(author\|committer\|tagger\) \@=/ contained containedin=gitHead nextgroup=gitIdentity skipwhite contains=@NoSpell
+syn match  gitIdentityHeader /^\%(Author\|Commit\|Tagger\):/ contained containedin=gitHead nextgroup=gitIdentity skipwhite contains=@NoSpell
+syn match  gitDateHeader /^\%(AuthorDate\|CommitDate\|Date\):/ contained containedin=gitHead nextgroup=gitDate skipwhite contains=@NoSpell
 
 syn match  gitKeyword /^[*|\/\\_ ]\+\zscommit \@=/ contained containedin=gitGraph nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
 syn match  gitKeyword /^[|\/\\_ ]\+\zs\%(object\|tree\|parent\|encoding\|gpgsig\%(-\w\+\)\=\|previous\) \@=/ contained containedin=gitGraph nextgroup=gitHash skipwhite contains=@NoSpell
 syn match  gitKeyword /^[|\/\\_ ]\+\zsMerge:/  contained containedin=gitGraph nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
-syn match  gitIdentityKeyword /^[|\/\\_ ]\+\zs\%(author\|committer\|tagger\) \@=/ contained containedin=gitGraph nextgroup=gitIdentity skipwhite
-syn match  gitIdentityHeader /^[|\/\\_ ]\+\zs\%(Author\|Commit\|Tagger\):/ contained containedin=gitGraph nextgroup=gitIdentity skipwhite
-syn match  gitDateHeader /^[|\/\\_ ]\+\zs\%(AuthorDate\|CommitDate\|Date\):/ contained containedin=gitGraph nextgroup=gitDate skipwhite
+syn match  gitIdentityKeyword /^[|\/\\_ ]\+\zs\%(author\|committer\|tagger\) \@=/ contained containedin=gitGraph nextgroup=gitIdentity skipwhite contains=@NoSpell
+syn match  gitIdentityHeader /^[|\/\\_ ]\+\zs\%(Author\|Commit\|Tagger\):/ contained containedin=gitGraph nextgroup=gitIdentity skipwhite contains=@NoSpell
+syn match  gitDateHeader /^[|\/\\_ ]\+\zs\%(AuthorDate\|CommitDate\|Date\):/ contained containedin=gitGraph nextgroup=gitDate skipwhite contains=@NoSpell
 
 syn match  gitKeyword /^type \@=/ contained containedin=gitHead nextgroup=gitType skipwhite contains=@NoSpell
 syn match  gitKeyword /^\%(summary\|boundary\|filename\|\%(author\|committer\)-\%(time\|tz\)\) \@=/ contained containedin=gitHead skipwhite contains=@NoSpell
 syn match  gitKeyword /^tag \@=/ contained containedin=gitHead nextgroup=gitReference skipwhite contains=@NoSpell
-syn match  gitIdentityKeyword /^\%(author\|committer\)-mail \@=/ contained containedin=gitHead nextgroup=gitEmail skipwhite
-syn match  gitReflogHeader /^Reflog:/ contained containedin=gitHead nextgroup=gitReflogMiddle skipwhite
-syn match  gitReflogHeader /^Reflog message:/ contained containedin=gitHead skipwhite
-syn match  gitReflogMiddle /\S\+@{\d\+} (/he=e-2 nextgroup=gitIdentity
+syn match  gitIdentityKeyword /^\%(author\|committer\)-mail \@=/ contained containedin=gitHead nextgroup=gitEmail skipwhite contains=@NoSpell
+syn match  gitReflogHeader /^Reflog:/ contained containedin=gitHead nextgroup=gitReflogMiddle skipwhite contains=@NoSpell
+syn match  gitReflogHeader /^Reflog message:/ contained containedin=gitHead skipwhite contains=@NoSpell
+syn match  gitReflogMiddle /\S\+@{\d\+} (/he=e-2 nextgroup=gitIdentity contains=@NoSpell
 
-syn match  gitIdentity /\S.\{-\} <[^>]*>/ contained nextgroup=gitDate skipwhite
-syn region gitEmail matchgroup=gitEmailDelimiter start=/</ end=/>/ keepend oneline contained containedin=gitIdentity
-syn match  gitDate      /\<\u\l\l \u\l\l \d\=\d \d\d:\d\d:\d\d \d\d\d\d [+-]\d\d\d\d/ contained
-syn match  gitDate      /-\=\d\+ [+-]\d\d\d\d\>/               contained
-syn match  gitDate      /\<\d\+ \l\+ ago\>/                    contained
-syn match  gitType      /\<\%(tag\|commit\|tree\|blob\)\>/     contained nextgroup=gitHashAbbrev skipwhite
-syn match  gitReference /\S\+\S\@!/                            contained
+syn match  gitIdentity /\S.\{-\} <[^>]*>/ contained nextgroup=gitDate skipwhite contains=@NoSpell
+syn region gitEmail matchgroup=gitEmailDelimiter start=/</ end=/>/ keepend oneline contained containedin=gitIdentity contains=@NoSpell
+syn match  gitDate      /\<\u\l\l \u\l\l \d\=\d \d\d:\d\d:\d\d \d\d\d\d [+-]\d\d\d\d/ contained contains=@NoSpell
+syn match  gitDate      /-\=\d\+ [+-]\d\d\d\d\>/               contained contains=@NoSpell
+syn match  gitDate      /\<\d\+ \l\+ ago\>/                    contained contains=@NoSpell
+syn match  gitType      /\<\%(tag\|commit\|tree\|blob\)\>/     contained nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
+syn match  gitReference /\S\+\S\@!/                            contained contains=@NoSpell
 syn match  gitHash      /\<\x\{40,\}\>/             contained nextgroup=gitIdentity,gitHash skipwhite contains=@NoSpell
 syn match  gitReflogOld /^\x\{40,\} \@=/            contained nextgroup=gitReflogNew skipwhite contains=@NoSpell
 syn match  gitReflogNew /\<\x\{40,\} \@=/           contained nextgroup=gitIdentity skipwhite contains=@NoSpell
 syn match  gitHashAbbrev /\<\x\{4,\}\>/             contained nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
 syn match  gitHashAbbrev /\<\x\{4,39\}\.\.\./he=e-3 contained nextgroup=gitHashAbbrev skipwhite contains=@NoSpell
 syn match  gitHashStage /\<\x\{4,\}\>/              contained nextgroup=gitStage skipwhite contains=@NoSpell
-syn match  gitStage     /\<\d\t\@=/                 contained
+syn match  gitStage     /\<\d\t\@=/                 contained contains=@NoSpell
 
 
 syn match  gitNotesHeader /^Notes:\ze\n    /
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index 842c453d5..3839fffbb 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -12,6 +12,8 @@ if exists("b:current_syntax")
   finish
 endif
 
+scriptencoding utf-8
+
 syn case match
 syn sync minlines=50
 syn sync linebreaks=1
@@ -21,62 +23,69 @@ if has("spell")
 endif
 
 syn include @gitcommitDiff syntax/diff.vim
-syn region gitcommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|#\)\@=/ fold contains=@gitcommitDiff
+syn region gitcommitDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^\%(diff --\|$\|@@\@!\|[^[:alnum:]\ +-]\S\@!\)\@=/ fold contains=@gitcommitDiff
 
 syn match   gitcommitSummary	"^.*\%<51v." contained containedin=gitcommitFirstLine nextgroup=gitcommitOverflow contains=@Spell
 syn match   gitcommitOverflow	".*" contained contains=@Spell
-syn match   gitcommitBlank	"^[^#].*" contained contains=@Spell
-
-syn match   gitcommitTrailers	"\n\@<=\n\%([[:alnum:]-]\+\s*:.*\|(cherry picked from commit .*\)\%(\n\s.*\|\n[[:alnum:]-]\+\s*:.*\|\n(cherry picked from commit .*\)*\%(\n\n*#\|\n*\%$\)\@="
-syn match   gitcommitTrailerToken "^[[:alnum:]-]\+\s*:" contained containedin=gitcommitTrailers
+syn match   gitcommitBlank	"^.\+" contained contains=@Spell
+syn match   gitcommitFirstLine	"\%^.*" nextgroup=gitcommitBlank,gitcommitComment skipnl
+
+let s:scissors = 0
+let s:l = search('^[#;@!$%^&|:] -\{24,\} >8 -\{24,\}$', 'cnW', '', 100)
+if s:l == 0
+  let s:l = line('$')
+elseif getline(s:l)[0] !=# getline(s:l - 1)[0]
+  let s:scissors = 1
+endif
+let s:comment = escape((matchstr(getline(s:l), '^[#;@!$%^&|:]\S\@!') . '#')[0], '^$.*[]~\"/')
 
-if get(b:, "gitcommit_cleanup", get(g:, "gitcommit_cleanup", "")) is# "scissors"
-  syn match gitcommitFirstLine	"\%^.*" nextgroup=gitcommitBlank skipnl
-  syn region gitcommitComment start=/^# -\+ >8 -\+$/ end=/\%$/ contains=gitcommitDiff
+if s:scissors
+  let s:comment .= ' -\{24,\} >8 -\{24,\}$'
+  exe 'syn region gitcommitComment start="^' . s:comment . '" end="\%$" contains=gitcommitDiff'
 else
-  syn match gitcommitFirstLine	"\%^[^#].*" nextgroup=gitcommitBlank skipnl
-  syn match gitcommitComment	"^#.*"
+  exe 'syn match gitcommitComment "^' . s:comment . '.*"'
 endif
+exe 'syn match   gitcommitTrailers "\n\@<=\n\%([[:alnum:]-]\+\s*:.*\|(cherry picked from commit .*\)\%(\n\s.*\|\n[[:alnum:]-]\+\s*:.*\|\n(cherry picked from commit .*\)*\%(\n\n*\%(' . s:comment . '\)\|\n*\%$\)\@="'
 
-syn match   gitcommitHash	"\<\x\{40,}\>" contains=@NoSpell display
-syn match   gitcommitHead	"^\%(#   .*\n\)\+#$" contained transparent
-syn match   gitcommitOnBranch	"\%(^# \)\@<=On branch" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite
-syn match   gitcommitOnBranch	"\%(^# \)\@<=Your branch .\{-\} '" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite
-syn match   gitcommitBranch	"[^ ']\+" contained
-syn match   gitcommitNoBranch	"\%(^# \)\@<=Not currently on any branch." contained containedin=gitcommitComment
-syn match   gitcommitHeader	"\%(^# \)\@<=.*:$"	contained containedin=gitcommitComment
-syn region  gitcommitAuthor	matchgroup=gitCommitHeader start=/\%(^# \)\@<=\%(Author\|Committer\):/ end=/$/ keepend oneline contained containedin=gitcommitComment transparent
-syn match   gitcommitNoChanges	"\%(^# \)\@<=No changes$" contained containedin=gitcommitComment
-
-syn region  gitcommitUntracked	start=/^# Untracked files:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUntrackedFile fold
-syn match   gitcommitUntrackedFile  "\t\@<=.*"	contained
-
-syn region  gitcommitDiscarded	start=/^# Change\%(s not staged for commit\|d but not updated\):/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitDiscardedType fold
-syn region  gitcommitSelected	start=/^# Changes to be committed:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitSelectedType fold
-syn region  gitcommitUnmerged	start=/^# Unmerged paths:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUnmergedType fold
+unlet s:l s:comment s:scissors
 
+syn match   gitcommitTrailerToken "^[[:alnum:]-]\+\s*:" contained containedin=gitcommitTrailers
 
-syn match   gitcommitDiscardedType	"\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitDiscardedFile skipwhite
-syn match   gitcommitSelectedType	"\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitSelectedFile skipwhite
-syn match   gitcommitUnmergedType	"\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitUnmergedFile skipwhite
-syn match   gitcommitDiscardedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitDiscardedArrow
-syn match   gitcommitSelectedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow
-syn match   gitcommitUnmergedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow
+syn match   gitcommitHash	"\<\x\{40,}\>" contains=@NoSpell display
+syn match   gitcommitOnBranch	"\%(^. \)\@<=On branch" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite
+syn match   gitcommitOnBranch	"\%(^. \)\@<=Your branch .\{-\} '" contained containedin=gitcommitComment nextgroup=gitcommitBranch skipwhite
+syn match   gitcommitBranch	"[^ ']\+" contained
+syn match   gitcommitNoBranch	"\%(^. \)\@<=Not currently on any branch." contained containedin=gitcommitComment
+syn match   gitcommitHeader	"\%(^. \)\@<=\S.*[:：]\%(\n^$\)\@!$" contained containedin=gitcommitComment
+syn region  gitcommitAuthor	matchgroup=gitCommitHeader start=/\%(^. \)\@<=\%(Author\|Committer\|Date\):/ end=/$/ keepend oneline contained containedin=gitcommitComment transparent
+syn match   gitcommitHeader	"\%(^. \)\@<=commit\%( \x\{40,\}$\)\@=" contained containedin=gitcommitComment nextgroup=gitcommitHash skipwhite
+syn match   gitcommitNoChanges	"\%(^. \)\@<=No changes$" contained containedin=gitcommitComment
+
+syn match   gitcommitType		"\%(^.\t\)\@<=[^[:punct:][:space:]][^/:：]*[^[:punct:][:space:]][:：]\ze "he=e-1 contained containedin=gitcommitComment nextgroup=gitcommitFile skipwhite
+syn match   gitcommitFile		".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitArrow
+syn match   gitcommitArrow		" -> " contained nextgroup=gitcommitFile
+syn match   gitcommitUntrackedFile	"\%(^.\t\)\@<=[^:：/]*\%(/.*\)\=$" contained containedin=gitcommitComment
+
+syn region  gitcommitUntracked	start=/^\z(.\) Untracked files:$/ end=/^\z1\=$\|^\z1\@!/ contains=gitcommitHeader containedin=gitcommitComment containedin=gitcommitComment contained transparent fold
+syn region  gitcommitDiscarded	start=/^\z(.\) Change\%(s not staged for commit\|d but not updated\):$/ end=/^\z1\=$\|^\z1\@!/ contains=gitcommitHeader,gitcommitDiscardedType containedin=gitcommitComment containedin=gitcommitComment contained transparent fold
+syn region  gitcommitSelected	start=/^\z(.\) Changes to be committed:$/ end=/^\z1$\|^\z1\@!/ contains=gitcommitHeader,gitcommitSelectedType containedin=gitcommitComment containedin=gitcommitComment contained transparent fold
+syn region  gitcommitUnmerged	start=/^\z(.\) Unmerged paths:$/ end=/^\z1\=$\|^\z1\@!/ contains=gitcommitHeader,gitcommitUnmergedType containedin=gitcommitComment containedin=gitcommitComment contained transparent fold
+
+syn match   gitcommitUntrackedFile	"\%(^.\t\)\@<=.*" contained containedin=gitcommitUntracked
+
+syn match   gitcommitDiscardedType	"\%(^.\t\)\@<=[^[:punct:][:space:]][^/:：]*[^[:punct:][:space:]][:：]\ze "he=e-1 contained nextgroup=gitcommitDiscardedFile skipwhite
+syn match   gitcommitSelectedType	"\%(^.\t\)\@<=[^[:punct:][:space:]][^/:：]*[^[:punct:][:space:]][:：]\ze "he=e-1 contained nextgroup=gitcommitSelectedFile skipwhite
+syn match   gitcommitUnmergedType	"\%(^.\t\)\@<=[^[:punct:][:space:]][^/:：]*[^[:punct:][:space:]][:：]\ze "he=e-1 contained nextgroup=gitcommitUnmergedFile skipwhite
+syn match   gitcommitDiscardedFile	"\S.\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitDiscardedArrow
+syn match   gitcommitSelectedFile	"\S.\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow
+syn match   gitcommitUnmergedFile	"\S.\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitUnmergedArrow
 syn match   gitcommitDiscardedArrow	" -> " contained nextgroup=gitcommitDiscardedFile
 syn match   gitcommitSelectedArrow	" -> " contained nextgroup=gitcommitSelectedFile
-syn match   gitcommitUnmergedArrow	" -> " contained nextgroup=gitcommitSelectedFile
-
-syn match   gitcommitWarning		"\%^[^#].*: needs merge$" nextgroup=gitcommitWarning skipnl
-syn match   gitcommitWarning		"^[^#].*: needs merge$" nextgroup=gitcommitWarning skipnl contained
-syn match   gitcommitWarning		"^\%(no changes added to commit\|nothing \%(added \)\=to commit\)\>.*\%$"
+syn match   gitcommitUnmergedArrow	" -> " contained nextgroup=gitcommitUnmergedFile
 
 hi def link gitcommitSummary		Keyword
 hi def link gitcommitTrailerToken	Label
 hi def link gitcommitComment		Comment
-hi def link gitcommitUntracked		gitcommitComment
-hi def link gitcommitDiscarded		gitcommitComment
-hi def link gitcommitSelected		gitcommitComment
-hi def link gitcommitUnmerged		gitcommitComment
 hi def link gitcommitHash		Identifier
 hi def link gitcommitOnBranch		Comment
 hi def link gitcommitBranch		Special
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index 762c2f447..c042f1939 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/gitrebase.vim
@@ -14,6 +14,8 @@ endif
 
 syn case match
 
+let s:c = escape((matchstr(getline('$'), '^[#;@!$%^&|:]\S\@!') . '#')[0], '^$.*[]~\"/')
+
 syn match   gitrebaseHash   "\v<\x{7,}>"                               contained contains=@NoSpell
 syn match   gitrebaseCommit "\v<\x{7,}>"    nextgroup=gitrebaseSummary skipwhite contains=@NoSpell
 syn match   gitrebasePick   "\v^p%(ick)=>"   nextgroup=gitrebaseCommit skipwhite
@@ -30,14 +32,15 @@ syn match   gitrebaseLabel  "\v^l(abel)=>"   nextgroup=gitrebaseName skipwhite
 syn match   gitrebaseReset  "\v^(t|reset)=>" nextgroup=gitrebaseName skipwhite
 syn match   gitrebaseSummary ".*"               contains=gitrebaseHash contained
 syn match   gitrebaseCommand ".*"                                      contained
-syn match   gitrebaseEmpty   " \zs# empty$"        containedin=gitrebaseSummary contained
-syn match   gitrebaseComment "# "                  containedin=gitrebaseEmpty   contained
-syn match   gitrebaseComment "^\s*#.*"             contains=gitrebaseHash
+exe 'syn match gitrebaseComment " \@<=' . s:c . ' empty$" containedin=gitrebaseSummary contained'
+exe 'syn match gitrebaseComment "^\s*' . s:c . '.*" contains=gitrebaseHash'
 syn match   gitrebaseSquashError "\v%^%(s%(quash)=>|f%(ixup)=>)" nextgroup=gitrebaseCommit skipwhite
 syn match   gitrebaseMergeOption "\v-[Cc]>"  nextgroup=gitrebaseMergeCommit skipwhite contained
 syn match   gitrebaseMergeCommit "\v<\x{7,}>"  nextgroup=gitrebaseName skipwhite contained
 syn match   gitrebaseName        "\v[^[:space:].*?i:^~/-]\S+" nextgroup=gitrebaseMergeComment skipwhite contained
-syn match   gitrebaseMergeComment "#"  nextgroup=gitrebaseSummary skipwhite contained
+exe 'syn match gitrebaseMergeComment "' . s:c . '"  nextgroup=gitrebaseSummary skipwhite contained'
+
+unlet s:c
 
 hi def link gitrebaseCommit         gitrebaseHash
 hi def link gitrebaseHash           Identifier
@@ -54,7 +57,6 @@ hi def link gitrebaseMerge          Exception
 hi def link gitrebaseLabel          Label
 hi def link gitrebaseReset          Keyword
 hi def link gitrebaseSummary        String
-hi def link gitrebaseEmpty          Error
 hi def link gitrebaseComment        Comment
 hi def link gitrebaseSquashError    Error
 hi def link gitrebaseMergeCommit    gitrebaseCommit
diff --git a/syntax/glsl.vim b/syntax/glsl.vim
index eee593f1f..34230a914 100644
--- a/syntax/glsl.vim
+++ b/syntax/glsl.vim
@@ -454,6 +454,7 @@ syn keyword glslBuiltinVariable gl_TextureMatrixInverseTranspose
 syn keyword glslBuiltinVariable gl_TextureMatrixTranspose
 syn keyword glslBuiltinVariable gl_Vertex
 syn keyword glslBuiltinVariable gl_VertexID
+syn keyword glslBuiltinVariable gl_VertexIndex
 syn keyword glslBuiltinVariable gl_ViewportIndex
 syn keyword glslBuiltinVariable gl_WorkGroupID
 syn keyword glslBuiltinVariable gl_WorkGroupSize
diff --git a/syntax/go.vim b/syntax/go.vim
index 1bca27c26..c4861715a 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -108,6 +108,8 @@ else
   syn region      goRawString         start=+`+ end=+`+
 endif
 
+syn match       goImportString      /^\%(\s\+\|import \)\(\h\w* \)\?\zs"[^"]\+"$/ contained containedin=goImport
+
 if go#config#HighlightFormatStrings()
   " [n] notation is valid for specifying explicit argument indexes
   " 1. Match a literal % not preceded by a %.
@@ -125,6 +127,7 @@ if go#config#HighlightFormatStrings()
   hi def link     goFormatSpecifier   goSpecialString
 endif
 
+hi def link     goImportString      String
 hi def link     goString            String
 hi def link     goRawString         String
 
@@ -144,9 +147,9 @@ endif
 
 " import
 if go#config#FoldEnable('import')
-  syn region    goImport            start='import (' end=')' transparent fold contains=goImport,goString,goComment
+  syn region    goImport            start='import (' end=')' transparent fold contains=goImport,goImportString,goComment
 else
-  syn region    goImport            start='import (' end=')' transparent contains=goImport,goString,goComment
+  syn region    goImport            start='import (' end=')' transparent contains=goImport,goImportString,goComment
 endif
 
 " var, const
@@ -277,10 +280,11 @@ hi def link     goOperator          Operator
 " Functions;
 if go#config#HighlightFunctions() || go#config#HighlightFunctionParameters()
   syn match goDeclaration       /\<func\>/ nextgroup=goReceiver,goFunction,goSimpleParams skipwhite skipnl
+  syn match goReceiverDecl      /(\s*\zs\%(\%(\w\+\s\+\)\?\*\?\w\+\)\ze\s*)/ contained contains=goReceiverVar,goReceiverType,goPointerOperator
   syn match goReceiverVar       /\w\+\ze\s\+\%(\w\|\*\)/ nextgroup=goPointerOperator,goReceiverType skipwhite skipnl contained
   syn match goPointerOperator   /\*/ nextgroup=goReceiverType contained skipwhite skipnl
   syn match goFunction          /\w\+/ nextgroup=goSimpleParams contained skipwhite skipnl
-  syn match goReceiverType      /\w\+/ contained
+  syn match goReceiverType      /\w\+\ze\s*)/ contained
   if go#config#HighlightFunctionParameters()
     syn match goSimpleParams      /(\%(\w\|\_s\|[*\.\[\],\{\}<>-]\)*)/ contained contains=goParamName,goType nextgroup=goFunctionReturn skipwhite skipnl
     syn match goFunctionReturn   /(\%(\w\|\_s\|[*\.\[\],\{\}<>-]\)*)/ contained contains=goParamName,goType skipwhite skipnl
@@ -290,7 +294,7 @@ if go#config#HighlightFunctions() || go#config#HighlightFunctionParameters()
     hi def link   goReceiverVar    goParamName
     hi def link   goParamName      Identifier
   endif
-  syn match goReceiver          /(\s*\w\+\%(\s\+\*\?\s*\w\+\)\?\s*)\ze\s*\w/ contained nextgroup=goFunction contains=goReceiverVar skipwhite skipnl
+  syn match goReceiver          /(\s*\%(\w\+\s\+\)\?\*\?\s*\w\+\s*)\ze\s*\w/ contained nextgroup=goFunction contains=goReceiverDecl skipwhite skipnl
 else
   syn keyword goDeclaration func
 endif
@@ -351,7 +355,7 @@ endif
 
 " Build Constraints
 if go#config#HighlightBuildConstraints()
-  syn match   goBuildKeyword      display contained "+build"
+  syn match   goBuildKeyword      display contained "+build\|go:build"
   " Highlight the known values of GOOS, GOARCH, and other +build options.
   syn keyword goBuildDirectives   contained
         \ android darwin dragonfly freebsd linux nacl netbsd openbsd plan9
@@ -365,7 +369,7 @@ if go#config#HighlightBuildConstraints()
   " The rs=s+2 option lets the \s*+build portion be part of the inner region
   " instead of the matchgroup so it will be highlighted as a goBuildKeyword.
   syn region  goBuildComment      matchgroup=goBuildCommentStart
-        \ start="//\s*+build\s"rs=s+2 end="$"
+        \ start="//\(\s*+build\s\|go:build\)"rs=s+2 end="$"
         \ contains=goBuildKeyword,goBuildDirectives
   hi def link goBuildCommentStart Comment
   hi def link goBuildDirectives   Type
diff --git a/syntax/hamster.vim b/syntax/hamster.vim
index dda5dd484..35750f607 100644
--- a/syntax/hamster.vim
+++ b/syntax/hamster.vim
@@ -13,7 +13,7 @@ endif
 " It allows the use of multiple news- and mailserver and combines them to one
 " mail- and newsserver for the news/mail-client. It load faster than a normal
 " newsreader because many threads can run simultaneous. It contains scorefile
-" for news and mail, a build-in script language, the GUI allows translation to
+" for news and mail, a built-in script language, the GUI allows translation to
 " other languages, it can be used in a network and that's not all features...
 "
 " quit when a syntax file was already loaded
diff --git a/syntax/helm.vim b/syntax/helm.vim
index 85d82edcf..06265a865 100644
--- a/syntax/helm.vim
+++ b/syntax/helm.vim
@@ -74,7 +74,7 @@ hi def link     goImaginary  Number
 syn cluster     gotplLiteral     contains=goString,goRawString,goCharacter,@goInt,goFloat,goImaginary
 syn keyword     gotplControl     contained   if else end range with template include tpl required define
 syn keyword     gotplFunctions   contained   and call html index js len not or print printf println urlquery eq ne lt le gt ge
-syn keyword     goSprigFunctions contained   abbrev abbrevboth add add1 adler32sum ago append atoi b32dec b32enc b64dec b64enc base biggest buildCustomCert camelcase cat ceil clean coalesce \contains compact date dateInZone dateModify date_in_zone date_modify default derivePassword dict dir div empty ext fail first float64 floor fromJson fromYaml genCA genPrivateKey genSelfSignedCert genSignedCert has hasKey hasPrefix hasSuffix hello htmlDate htmlDateInZone indent initial initials int int64 isAbs join kebabcase keys kindIs kindOf last list lower max merge mergeOverwrite min mod mul nindent nospace now omit pick pluck plural prepend quote randAlpha randAlphaNum randAscii randNumeric regexFind regexFindAll regexMatch regexReplaceAll regexReplaceAllLiteral regexSplit repeat replace rest reverse round semver semverCompare set sha1sum sha256sum shuffle slice snakecase sortAlpha split splitList splitn squote sub substr swapcase ternary title toDate toJson toPrettyJson toString toStrings toToml toYaml trim trimAll trimPrefix trimSuffix trimall trunc tuple typeIs typeIsLike typeOf uniq unixEpoch unset until untilStep untitle upper uuidv4 values without wrap wrapWith
+syn keyword     goSprigFunctions contained   abbrev abbrevboth add add1 adler32sum ago append atoi b32dec b32enc b64dec b64enc base biggest buildCustomCert bcrypt camelcase cat ceil clean coalesce \contains compact chunk date dateInZone dateModify date_in_zone date_modify default derivePassword dict dir div dig deepCopy decryptAES encryptAES env expandenv empty ext fail first float64 floor fromJson fromYaml genCA genCAWithKey genPrivateKey genSelfSignedCert genSelfSignedCertWithKey genSignedCert genSignedCertWithKey getHostByName has hasKey hasPrefix hasSuffix hello htmlDate htmlDateInZone htpasswd indent initial initials int int64 isAbs join kebabcase keys kindIs kindOf last list lower max merge mergeOverwrite min mod mul nindent nospace now omit pick pluck plural prepend quote randAlpha randAlphaNum randAscii randNumeric randBytes regexFind regexFindAll regexMatch regexReplaceAll regexReplaceAllLiteral regexSplit repeat replace rest reverse round semver semverCompare set sha1sum sha256sum shuffle slice snakecase sortAlpha split splitList splitn squote sub substr swapcase ternary title toDate toJson toPrettyJson toString toStrings toToml toYaml trim trimAll trimPrefix trimSuffix trimall trunc tuple typeIs typeIsLike typeOf uniq unixEpoch unset until untilStep untitle upper uuidv4 values without wrap wrapWith
 syn match       gotplVariable    contained   /\$[a-zA-Z0-9_]*\>/
 syn match       goTplIdentifier  contained   /\.[^\s}]+\>/
 
diff --git a/syntax/help.vim b/syntax/help.vim
index 9f7fc1011..5a39fd999 100644
--- a/syntax/help.vim
+++ b/syntax/help.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:	Vim help file
 " Maintainer:	Bram Moolenaar (Bram@vim.org)
-" Last Change:	2020 Jul 28
+" Last Change:	2021 Jun 13
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
diff --git a/syntax/indent.vim b/syntax/indent.vim
index 14785ca62..b5dcdb299 100644
--- a/syntax/indent.vim
+++ b/syntax/indent.vim
@@ -3,9 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'indent', 'syntax/indent.vim')
 endif
 
 " Vim syntax file
-" Language:             indent(1) configuration file
-" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
-" Latest Revision:      2010-01-23
+" Language:		indent(1) configuration file
+" Maintainer:		Doug Kearns <dougkearns@gmail.com>
+" Previous Maintainer:	Nikolai Weibull <now@bitwi.se>
+" Last Change:		2021 Nov 17
 "   indent_is_bsd:      If exists, will change somewhat to match BSD implementation
 "
 " TODO:     is the deny-all (a la lilo.vim nice or no?)...
@@ -31,7 +32,7 @@ syn region  indentComment start='//' skip='\\$' end='$'
                           \ contains=indentTodo,@Spell
 
 if !exists("indent_is_bsd")
-  syn match indentOptions '-i\|--indentation-level\|-il\|--indent-level'
+  syn match indentOptions '-i\|--indent-level\|-il\|--indent-label'
                         \ nextgroup=indentNumber skipwhite skipempty
 endif
 syn match   indentOptions '-\%(bli\|c\%([bl]i\|[dip]\)\=\|di\=\|ip\=\|lc\=\|pp\=i\|sbi\|ts\|-\%(brace-indent\|comment-indentation\|case-brace-indentation\|declaration-comment-column\|continuation-indentation\|case-indentation\|else-endif-column\|line-comments-indentation\|declaration-indentation\|indent-level\|parameter-indentation\|line-length\|comment-line-length\|paren-indentation\|preprocessor-indentation\|struct-brace-indentation\|tab-size\)\)'
diff --git a/syntax/iss.vim b/syntax/iss.vim
index 5c82ae345..819f0aaed 100644
--- a/syntax/iss.vim
+++ b/syntax/iss.vim
@@ -6,10 +6,10 @@ endif
 " Language:             Inno Setup File (iss file) and My InnoSetup extension
 " Maintainer:           Jason Mills (jmills@cs.mun.ca)
 " Previous Maintainer:  Dominique Stéphan (dominique@mggen.com)
-" Last Change:          2019 Sep 27
+" Last Change:          2021 Aug 30
 "
 " Todo:
-"  - The paramter String: is matched as flag string (because of case ignore).
+"  - The parameter String: is matched as flag string (because of case ignore).
 "  - Pascal scripting syntax is not recognized.
 "  - Embedded double quotes confuse string matches. e.g. "asfd""asfa"
 
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index b5e75dbaa..7175f7e34 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -3,9 +3,10 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'kotlin', 'syntax/kotlin.vim')
 endif
 
 " Vim syntax file
-" Language: Kotlin
-" Maintainer: Alexander Udalov
-" Latest Revision: 3 July 2021
+" Language:     Kotlin
+" Maintainer:   Alexander Udalov
+" URL:          https://github.com/udalov/kotlin-vim
+" Last Change:  7 November 2021
 
 if exists('b:current_syntax')
     finish
@@ -20,11 +21,12 @@ syn keyword ktException try catch finally throw
 
 syn keyword ktInclude import package
 
-" The following is generated by generate-stdlib-class-names.main.kts
+" Generated stdlib class names {{{
+" The following is generated by https://github.com/udalov/kotlin-vim/blob/master/extra/generate-stdlib-class-names.main.kts
 syn keyword ktType AbstractCollection AbstractCoroutineContextElement AbstractCoroutineContextKey AbstractDoubleTimeSource AbstractIterator AbstractList AbstractLongTimeSource
 syn keyword ktType AbstractMap AbstractMutableCollection AbstractMutableList AbstractMutableMap AbstractMutableSet AbstractSet AccessDeniedException Accessor Annotation
 syn keyword ktType AnnotationRetention AnnotationTarget Any Appendable ArithmeticException Array ArrayDeque ArrayList AssertionError Boolean BooleanArray BooleanIterator
-syn keyword ktType BuilderInference Byte ByteArray ByteIterator CallsInPlace CancellationException Char CharArray CharCategory CharDirectionality CharIterator CharProgression
+syn keyword ktType BuilderInference Byte ByteArray ByteIterator CName CallsInPlace CancellationException Char CharArray CharCategory CharDirectionality CharIterator CharProgression
 syn keyword ktType CharRange CharSequence CharacterCodingException Charsets ClassCastException Cloneable ClosedFloatingPointRange ClosedRange Collection Comparable Comparator
 syn keyword ktType ConcurrentModificationException ConditionalEffect Continuation ContinuationInterceptor ContractBuilder CoroutineContext DeepRecursiveFunction DeepRecursiveScope
 syn keyword ktType Delegates Deprecated DeprecatedSinceKotlin DeprecationLevel Destructured Double DoubleArray DoubleIterator DslMarker Duration DurationUnit Effect Element
@@ -33,19 +35,20 @@ syn keyword ktType ExperimentalTime ExperimentalTypeInference ExperimentalUnsign
 syn keyword ktType FileWalkDirection Float FloatArray FloatIterator Function Function0 Function1 Function10 Function11 Function12 Function13 Function14 Function15 Function16
 syn keyword ktType Function17 Function18 Function19 Function2 Function20 Function21 Function22 Function3 Function4 Function5 Function6 Function7 Function8 Function9 FunctionN
 syn keyword ktType Getter Grouping HashMap HashSet IllegalArgumentException IllegalStateException IndexOutOfBoundsException IndexedValue Int IntArray IntIterator IntProgression
-syn keyword ktType IntRange InvocationKind Iterable Iterator JsExport JsName JvmDefault JvmDefaultWithoutCompatibility JvmField JvmInline JvmMultifileClass JvmName JvmOverloads
-syn keyword ktType JvmRecord JvmStatic JvmSuppressWildcards JvmSynthetic JvmWildcard KAnnotatedElement KCallable KClass KClassifier KDeclarationContainer KFunction KMutableProperty
-syn keyword ktType KMutableProperty0 KMutableProperty1 KMutableProperty2 KParameter KProperty KProperty0 KProperty1 KProperty2 KType KTypeParameter KTypeProjection KVariance
-syn keyword ktType KVisibility Key Kind KotlinNullPointerException KotlinReflectionNotSupportedError KotlinVersion Lazy LazyThreadSafetyMode Level LinkedHashMap LinkedHashSet List
-syn keyword ktType ListIterator Long LongArray LongIterator LongProgression LongRange Map MatchGroup MatchGroupCollection MatchNamedGroupCollection MatchResult Metadata Monotonic
-syn keyword ktType MustBeDocumented MutableCollection MutableEntry MutableIterable MutableIterator MutableList MutableListIterator MutableMap MutableSet NoSuchElementException
-syn keyword ktType NoSuchFileException NoWhenBranchMatchedException NotImplementedError Nothing NullPointerException Number NumberFormatException ObservableProperty OnErrorAction
-syn keyword ktType OptIn OptionalExpectation OverloadResolutionByLambdaReturnType Pair ParameterName PropertyDelegateProvider PublishedApi PurelyImplements Random RandomAccess
-syn keyword ktType ReadOnlyProperty ReadWriteProperty Regex RegexOption Repeatable ReplaceWith RequiresOptIn RestrictsSuspension Result Retention Returns ReturnsNotNull
-syn keyword ktType RuntimeException Sequence SequenceScope Set Setter SharedImmutable Short ShortArray ShortIterator SimpleEffect SinceKotlin Strictfp String StringBuilder Suppress
-syn keyword ktType Synchronized Target TestTimeSource ThreadLocal Throwable Throws TimeMark TimeSource TimedValue Transient Triple TypeCastException Typography UByte UByteArray
-syn keyword ktType UByteIterator UInt UIntArray UIntIterator UIntProgression UIntRange ULong ULongArray ULongIterator ULongProgression ULongRange UShort UShortArray UShortIterator
-syn keyword ktType UninitializedPropertyAccessException Unit UnsafeVariance UnsupportedOperationException UseExperimental Volatile
+syn keyword ktType IntRange InvocationKind Iterable Iterator JsEagerInitialization JsExport JsName JvmDefault JvmDefaultWithoutCompatibility JvmField JvmInline JvmMultifileClass
+syn keyword ktType JvmName JvmOverloads JvmRecord JvmStatic JvmSuppressWildcards JvmSynthetic JvmWildcard KAnnotatedElement KCallable KClass KClassifier KDeclarationContainer
+syn keyword ktType KFunction KMutableProperty KMutableProperty0 KMutableProperty1 KMutableProperty2 KParameter KProperty KProperty0 KProperty1 KProperty2 KType KTypeParameter
+syn keyword ktType KTypeProjection KVariance KVisibility Key Kind KotlinNullPointerException KotlinReflectionNotSupportedError KotlinVersion Lazy LazyThreadSafetyMode Level
+syn keyword ktType LinkedHashMap LinkedHashSet List ListIterator Long LongArray LongIterator LongProgression LongRange Map MatchGroup MatchGroupCollection MatchNamedGroupCollection
+syn keyword ktType MatchResult Metadata Monotonic MustBeDocumented MutableCollection MutableEntry MutableIterable MutableIterator MutableList MutableListIterator MutableMap
+syn keyword ktType MutableSet NoSuchElementException NoSuchFileException NoWhenBranchMatchedException NotImplementedError Nothing NullPointerException Number NumberFormatException
+syn keyword ktType ObservableProperty OnErrorAction OptIn OptionalExpectation OverloadResolutionByLambdaReturnType Pair ParameterName PropertyDelegateProvider PublishedApi
+syn keyword ktType PurelyImplements Random RandomAccess ReadOnlyProperty ReadWriteProperty Regex RegexOption Repeatable ReplaceWith RequiresOptIn RestrictsSuspension Result
+syn keyword ktType Retention Returns ReturnsNotNull RuntimeException Sequence SequenceScope Set Setter SharedImmutable Short ShortArray ShortIterator SimpleEffect SinceKotlin
+syn keyword ktType Strictfp String StringBuilder Suppress Synchronized Target TestTimeSource ThreadLocal Throwable Throws TimeMark TimeSource TimedValue Transient Triple
+syn keyword ktType TypeCastException Typography UByte UByteArray UByteIterator UInt UIntArray UIntIterator UIntProgression UIntRange ULong ULongArray ULongIterator ULongProgression
+syn keyword ktType ULongRange UShort UShortArray UShortIterator UninitializedPropertyAccessException Unit UnsafeVariance UnsupportedOperationException UseExperimental Volatile
+" }}}
 
 syn keyword ktModifier annotation companion enum inner abstract final open override sealed vararg dynamic expect actual suspend
 syn keyword ktStructure class object interface typealias fun val var constructor init
@@ -63,7 +66,7 @@ syn match ktModifier "\v<(const)>\ze\@=.*<val>"
 syn match ktModifier "\v<(lateinit)>\ze\@=.*<var>"
 syn match ktModifier "\v<(internal|private|protected|public)>\ze\@=.*<(class|object|interface|typealias|fun|val|var|constructor|get|set)>"
 
-syn match ktOperator "\v\?:|::|\<\=? | \>\=?|[!=]\=\=?|<as>\??|[-!%&*+/|]"
+syn match ktOperator "\v\?:|::|\<\=? | \>\=?|[!=]\=\=?|<as>\??|[-*+/%]\=?|[!&|]"
 
 syn keyword ktTodo TODO FIXME XXX contained
 syn match ktShebang "\v^#!.*$"
@@ -84,9 +87,9 @@ syn match ktCharacter "\v'[^']*'" contains=ktSpecialChar,ktSpecialCharError
 syn match ktCharacter "\v'\\''" contains=ktSpecialChar
 syn match ktCharacter "\v'[^\\]'"
 
-" TODO: highlight label in 'this@Foo'
 syn match ktAnnotation "\v(\w)@<!\@[[:alnum:]_.]*(:[[:alnum:]_.]*)?"
 syn match ktLabel "\v\w+\@"
+syn match ktLabel "\v(\w)@<=\@\w+"
 
 syn match ktSimpleInterpolation "\v\$\h\w*" contained
 syn region ktComplexInterpolation matchgroup=ktComplexInterpolationBrace start="\v\$\{" end="\v\}" contains=ALLBUT,ktSimpleInterpolation,ktTodo,ktSpecialCharError,ktSpecialChar,ktDocTag,ktDocTagParam
@@ -101,6 +104,8 @@ syn match ktEscapedName "\v`.*`"
 syn match ktExclExcl "!!"
 syn match ktArrow "->"
 
+syn region ktFold start="{" end="}" transparent fold
+
 exec "syntax sync ccomment ktComment minlines=10"
 
 hi def link ktStatement Statement
@@ -148,3 +153,5 @@ hi def link ktExclExcl Special
 hi def link ktArrow Structure
 
 let b:current_syntax = 'kotlin'
+
+" vim:foldmethod=marker
diff --git a/syntax/lisp.vim b/syntax/lisp.vim
index d8dd9ca8b..beeee5af3 100644
--- a/syntax/lisp.vim
+++ b/syntax/lisp.vim
@@ -5,8 +5,8 @@ endif
 " Vim syntax file
 " Language:    Lisp
 " Maintainer:  Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
-" Last Change: Jul 11, 2019
-" Version:     30
+" Last Change: Nov 10, 2021
+" Version:     31
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_LISP
 "
 "  Thanks to F Xavier Noria for a list of 978 Common Lisp symbols taken from HyperSpec
@@ -58,20 +58,20 @@ if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
  syn region lispParen8 contained matchgroup=hlLevel8 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen9
  syn region lispParen9 contained matchgroup=hlLevel9 start="`\=(" end=")" skip="|.\{-}|" contains=@lispListCluster,lispParen0
 else
- syn region lispList			matchgroup=lispParen start="("   skip="|.\{-}|"			matchgroup=lispParen end=")"	contains=@lispListCluster
- syn region lispBQList			matchgroup=PreProc   start="`("  skip="|.\{-}|"			matchgroup=PreProc   end=")"		contains=@lispListCluster
+ syn region lispList		matchgroup=lispParen start="("   skip="|.\{-}|"		matchgroup=lispParen end=")"	contains=@lispListCluster
+ syn region lispBQList		matchgroup=PreProc   start="`("  skip="|.\{-}|"		matchgroup=PreProc   end=")"	contains=@lispListCluster
 endif
 
 " ---------------------------------------------------------------------
 " Atoms: {{{1
-syn match lispAtomMark			"'"
-syn match lispAtom			"'("me=e-1			contains=lispAtomMark	nextgroup=lispAtomList
-syn match lispAtom			"'[^ \t()]\+"			contains=lispAtomMark
-syn match lispAtomBarSymbol		!'|..\{-}|!			contains=lispAtomMark
-syn region lispAtom			start=+'"+			skip=+\\"+ end=+"+
-syn region lispAtomList			contained			matchgroup=Special start="("	skip="|.\{-}|" matchgroup=Special end=")"	contains=@lispAtomCluster,lispString,lispEscapeSpecial
-syn match lispAtomNmbr			contained			"\<\d\+"
-syn match lispLeadWhite			contained			"^\s\+"
+syn match lispAtomMark		"'"
+syn match lispAtom		"'("me=e-1			contains=lispAtomMark	nextgroup=lispAtomList
+syn match lispAtom		"'[^ \t()]\+"			contains=lispAtomMark
+syn match lispAtomBarSymbol	!'|..\{-}|!			contains=lispAtomMark
+syn region lispAtom		start=+'"+			skip=+\\"+ end=+"+
+syn region lispAtomList		contained			matchgroup=Special start="("	skip="|.\{-}|" matchgroup=Special end=")"	contains=@lispAtomCluster,lispString,lispEscapeSpecial
+syn match lispAtomNmbr		contained			"\<\d\+"
+syn match lispLeadWhite		contained			"^\s\+"
 
 " ---------------------------------------------------------------------
 " Standard Lisp Functions and Macros: {{{1
@@ -557,6 +557,8 @@ syn match lispParenError	")"
 syn cluster lispCommentGroup	contains=lispTodo,@Spell
 syn match   lispComment		";.*$"				contains=@lispCommentGroup
 syn region  lispCommentRegion	start="#|" end="|#"		contains=lispCommentRegion,@lispCommentGroup
+syn region  lispComment		start="#+nil"	end="\ze)"	contains=@lispCommentGroup
+syn match   lispComment		'^\s*#+nil.*$'			contains=@lispCommentGroup
 syn keyword lispTodo		contained			combak			combak:			todo			todo:
 
 " ---------------------------------------------------------------------
diff --git a/syntax/meson.vim b/syntax/meson.vim
index 8e151a7e6..3a5b50e27 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -60,9 +60,11 @@ syn match   mesonEscape	"\\$"
 " Meson only supports integer numbers
 " http://mesonbuild.com/Syntax.html#numbers
 syn match   mesonNumber	"\<\d\+\>"
+syn match   mesonNumber	"\<0x\x\+\>"
+syn match   mesonNumber	"\<0o\o\+\>"
 
 " booleans
-syn keyword mesonConstant	false true
+syn keyword mesonBoolean	false true
 
 " Built-in functions
 syn keyword mesonBuiltin
@@ -101,6 +103,8 @@ syn keyword mesonBuiltin
   \ install_headers
   \ install_man
   \ install_subdir
+  \ install_symlink
+  \ install_emptydir
   \ is_disabler
   \ is_variable
   \ jar
@@ -138,15 +142,15 @@ endif
 " The default highlight links.  Can be overridden later.
 hi def link mesonStatement	Statement
 hi def link mesonConditional	Conditional
-hi def link mesonRepeat	Repeat
+hi def link mesonRepeat		Repeat
 hi def link mesonOperator	Operator
 hi def link mesonComment	Comment
 hi def link mesonTodo		Todo
-hi def link mesonString	String
-hi def link mesonEscape	Special
-hi def link mesonNumber	Number
+hi def link mesonString		String
+hi def link mesonEscape		Special
+hi def link mesonNumber		Number
 hi def link mesonBuiltin	Function
-hi def link mesonConstant	Number
+hi def link mesonBoolean	Boolean
 if exists("meson_space_error_higlight")
   hi def link mesonSpaceError	Error
 endif
diff --git a/syntax/nim.vim b/syntax/nim.vim
index c3aa7b3f2..2957866cf 100644
--- a/syntax/nim.vim
+++ b/syntax/nim.vim
@@ -116,6 +116,7 @@ if nim_highlight_builtins == 1
   syn keyword nimBuiltin addquitproc addQuitProc
   syn keyword nimBuiltin copy setlen setLen newstring newString zeromem zeroMem copymem copyMem movemem moveMem
   syn keyword nimBuiltin equalmem equalMem alloc alloc0 realloc dealloc assert
+  syn keyword nimBuiltin typedesc typed untyped stmt expr
   syn keyword nimBuiltin echo swap getrefcount getRefcount getcurrentexception getCurrentException Msg
   syn keyword nimBuiltin getoccupiedmem getOccupiedMem getfreemem getFreeMem gettotalmem getTotalMem isnil isNil seqtoptr seqToPtr
   syn keyword nimBuiltin find pop GC_disable GC_enable GC_fullCollect
diff --git a/syntax/nsis.vim b/syntax/nsis.vim
index 76a338f61..5ada2c2ce 100644
--- a/syntax/nsis.vim
+++ b/syntax/nsis.vim
@@ -3,11 +3,11 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'nsis', 'syntax/nsis.vim')
 endif
 
 " Vim syntax file
-" Language:		NSIS script, for version of NSIS 3.03 and later
+" Language:		NSIS script, for version of NSIS 3.08 and later
 " Maintainer:		Ken Takata
 " URL:			https://github.com/k-takata/vim-nsis
 " Previous Maintainer:	Alex Jakushev <Alex.Jakushev@kemek.lt>
-" Last Change:		2018-10-02
+" Last Change:		2020-10-18
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -101,6 +101,8 @@ syn match nsisSysVar		"$RESOURCES_LOCALIZED"
 syn match nsisSysVar		"$CDBURN_AREA"
 syn match nsisSysVar		"$HWNDPARENT"
 syn match nsisSysVar		"$PLUGINSDIR"
+syn match nsisSysVar		"$\%(USERTEMPLATES\|USERSTARTMENU\|USERSMPROGRAMS\|USERDESKTOP\)"
+syn match nsisSysVar		"$\%(COMMONTEMPLATES\|COMMONSTARTMENU\|COMMONSMPROGRAMS\|COMMONDESKTOP\|COMMONPROGRAMDATA\)"
 syn match nsisSysVar		"$\\r"
 syn match nsisSysVar		"$\\n"
 syn match nsisSysVar		"$\\t"
@@ -153,7 +155,7 @@ syn keyword nsisStatement	contained Section nextgroup=nsisSectionOpt skipwhite
 syn region nsisSectionOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSectionKwd
 syn match nsisSectionKwd	contained "/o\>"
 
-syn keyword nsisStatement	contained SectionIn nextgroup=nsisSectionInOpt skipwhite
+syn keyword nsisStatement	contained SectionInstType SectionIn nextgroup=nsisSectionInOpt skipwhite
 syn region nsisSectionInOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSectionInKwd
 syn keyword nsisSectionInKwd	contained RO
 
@@ -273,10 +275,22 @@ syn keyword nsisAttribute	contained ManifestDPIAware nextgroup=nsisManifestDPIAw
 syn region nsisManifestDPIAwareOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisManifestDPIAwareKwd
 syn keyword nsisManifestDPIAwareKwd	contained notset true false
 
+syn keyword nsisAttribute	contained ManifestLongPathAware nextgroup=nsisManifestLongPathAwareOpt skipwhite
+syn region nsisManifestLongPathAwareOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisManifestLongPathAwareKwd
+syn match nsisManifestLongPathAwareKwd	contained "\<\%(notset\|true\|false\)\>"
+
 syn keyword nsisAttribute	contained ManifestSupportedOS nextgroup=nsisManifestSupportedOSOpt skipwhite
 syn region nsisManifestSupportedOSOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisManifestSupportedOSKwd
 syn match nsisManifestSupportedOSKwd	contained "\<\%(none\|all\|WinVista\|Win7\|Win8\|Win8\.1\|Win10\)\>"
 
+syn keyword nsisAttribute	contained PEAddResource nextgroup=nsisPEAddResourceOpt skipwhite
+syn region nsisPEAddResourceOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisPEAddResourceKwd
+syn match nsisPEAddResourceKwd	contained "/\%(OVERWRITE\|REPLACE\)\>"
+
+syn keyword nsisAttribute	contained PERemoveResource nextgroup=nsisPERemoveResourceOpt skipwhite
+syn region nsisPERemoveResourceOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisPERemoveResourceKwd
+syn match nsisPERemoveResourceKwd	contained "/NOERRORS\>"
+
 syn keyword nsisAttribute	contained RequestExecutionLevel nextgroup=nsisRequestExecutionLevelOpt skipwhite
 syn region nsisRequestExecutionLevelOpt  contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisRequestExecutionLevelKwd
 syn keyword nsisRequestExecutionLevelKwd contained none user highest admin
@@ -357,7 +371,7 @@ syn keyword nsisInstruction	contained ExpandEnvStrings ReadEnvStr
 
 syn keyword nsisInstruction	contained DeleteRegKey nextgroup=nsisDeleteRegKeyOpt skipwhite
 syn region nsisDeleteRegKeyOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisDeleteRegKeyKwd,nsisRegistry
-syn match nsisDeleteRegKeyKwd	contained "/ifempty\>"
+syn match nsisDeleteRegKeyKwd	contained "/\%(ifempty\|ifnosubkeys\|ifnovalues\)\>"
 
 syn keyword nsisInstruction	contained nextgroup=nsisRegistryOpt skipwhite
 			\ DeleteRegValue EnumRegKey EnumRegValue ReadRegDWORD ReadRegStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegStr
@@ -372,8 +386,8 @@ syn region nsisSetRegViewOpt	contained start="" end="$" transparent keepend cont
 syn keyword nsisSetRegViewKwd	contained default lastused
 
 "FUNCTIONS - general purpose (4.9.3)
-syn keyword nsisInstruction	contained CallInstDLL CreateDirectory GetDLLVersion
-syn keyword nsisInstruction	contained GetDLLVersionLocal GetFileTime GetFileTimeLocal
+syn keyword nsisInstruction	contained CallInstDLL CreateDirectory GetWinVer
+syn keyword nsisInstruction	contained GetFileTime GetFileTimeLocal GetKnownFolderPath
 syn keyword nsisInstruction	contained GetTempFileName SearchPath RegDLL UnRegDLL
 
 syn keyword nsisInstruction	contained CopyFiles nextgroup=nsisCopyFilesOpt skipwhite
@@ -384,6 +398,10 @@ syn keyword nsisInstruction	contained CreateShortcut nextgroup=nsisCreateShortcu
 syn region nsisCreateShortcutOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisCreateShortcutKwd
 syn match nsisCreateShortcutKwd	 contained "/NoWorkingDir\>"
 
+syn keyword nsisInstruction	contained GetDLLVersion GetDLLVersionLocal nextgroup=nsisGetDLLVersionOpt skipwhite
+syn region nsisGetDLLVersionOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisGetDLLVersionKwd
+syn match nsisGetDLLVersionKwd	 contained "/ProductVersion\>"
+
 syn keyword nsisInstruction	contained GetFullPathName nextgroup=nsisGetFullPathNameOpt skipwhite
 syn region nsisGetFullPathNameOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisGetFullPathNameKwd
 syn match nsisGetFullPathNameKwd  contained "/SHORT\>"
@@ -399,6 +417,7 @@ syn keyword nsisFileAttrib	contained FILE_ATTRIBUTE_TEMPORARY
 syn keyword nsisInstruction	contained Abort Call ClearErrors GetCurrentAddress
 syn keyword nsisInstruction	contained GetFunctionAddress GetLabelAddress Goto
 syn keyword nsisInstruction	contained IfAbort IfErrors IfFileExists IfRebootFlag IfSilent
+syn keyword nsisInstruction	contained IfShellVarContextAll IfRtlLanguage
 syn keyword nsisInstruction	contained IntCmp IntCmpU Int64Cmp Int64CmpU IntPtrCmp IntPtrCmpU
 syn keyword nsisInstruction	contained Return Quit SetErrors StrCmp StrCmpS
 
@@ -464,6 +483,10 @@ syn keyword nsisInstruction	contained CreateFont nextgroup=nsisFontOpt skipwhite
 syn keyword nsisInstruction	contained nextgroup=nsisBooleanOpt skipwhite
 			\ LockWindow SetAutoClose
 
+syn keyword nsisInstruction	contained LoadAndSetImage nextgroup=nsisLoadAndSetImageOpt skipwhite
+syn region nsisLoadAndSetImageOpt contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisLoadAndSetImageKwd
+syn match nsisLoadAndSetImageKwd  contained "/\%(EXERESOURCE\|STRINGID\|RESIZETOFIT\%(WIDTH\|HEIGHT\)\)\>"
+
 syn keyword nsisInstruction	contained SendMessage nextgroup=nsisSendMessageOpt skipwhite
 syn region nsisSendMessageOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisSendMessageKwd
 syn match nsisSendMessageKwd	contained "/TIMEOUT\>"
@@ -560,7 +583,7 @@ syn keyword nsisVerboseKwd	contained push pop
 "PREPROCESSOR (5.4)
 syn match nsisDefine		contained "!define\>" nextgroup=nsisDefineOpt skipwhite
 syn region nsisDefineOpt	contained start="" end="$" transparent keepend contains=@nsisAnyOpt,nsisDefineKwd
-syn match nsisDefineKwd		contained "/\%(ifndef\|redef\|date\|utcdate\|math\|file\)\>"
+syn match nsisDefineKwd		contained "/\%(ifndef\|redef\|date\|utcdate\|file\|intfmt\|math\)\>"
 
 syn match nsisDefine		contained "!undef\>"
 syn match nsisPreCondit		contained "!ifdef\>"
@@ -619,7 +642,10 @@ hi def link nsisInstTypeKwd		Constant
 hi def link nsisLicenseBkColorKwd	Constant
 hi def link nsisLicenseForceSelectionKwd Constant
 hi def link nsisManifestDPIAwareKwd	Constant
+hi def link nsisManifestLongPathAwareKwd Constant
 hi def link nsisManifestSupportedOSKwd	Constant
+hi def link nsisPEAddResourceKwd	Constant
+hi def link nsisPERemoveResourceKwd	Constant
 hi def link nsisRequestExecutionLevelKwd Constant
 hi def link nsisShowInstDetailsKwd	Constant
 hi def link nsisSilentInstallKwd	Constant
@@ -637,11 +663,13 @@ hi def link nsisWriteRegMultiStrKwd	Constant
 hi def link nsisSetRegViewKwd		Constant
 hi def link nsisCopyFilesKwd		Constant
 hi def link nsisCreateShortcutKwd	Constant
+hi def link nsisGetDLLVersionKwd	Constant
 hi def link nsisGetFullPathNameKwd	Constant
 hi def link nsisFileAttrib		Constant
 hi def link nsisMessageBox		Constant
 hi def link nsisFileWriteUTF16LEKwd	Constant
 hi def link nsisSetShellVarContextKwd	Constant
+hi def link nsisLoadAndSetImageKwd	Constant
 hi def link nsisSendMessageKwd		Constant
 hi def link nsisSetBrandingImageKwd	Constant
 hi def link nsisSetDetailsViewKwd	Constant
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index 14939535b..e3e6cfa3e 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -172,6 +172,7 @@ syn match    ocamlMTDef "=\s*\w\(\w\|'\)*\>"hs=s+1,me=s+1 skipwhite skipempty ne
 
 " Quoted strings
 syn region ocamlString matchgroup=ocamlQuotedStringDelim start="{\z\([a-z_]*\)|" end="|\z1}" contains=@Spell
+syn region ocamlString matchgroup=ocamlQuotedStringDelim start="{%[a-z_]\+\(\.[a-z_]\+\)\?\( \z\([a-z_]\+\)\)\?|" end="|\z1}" contains=@Spell
 
 syn keyword  ocamlKeyword  and as assert class
 syn keyword  ocamlKeyword  constraint else
diff --git a/syntax/odin.vim b/syntax/odin.vim
index 10374351b..ed09f607d 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -44,7 +44,7 @@ syntax match odinFixMe "FIXME"
 syntax match odinNoCheckin "NOCHECKIN"
 syntax match odinHack "HACK"
 
-syntax keyword odinDataType string cstring bool b8 b16 b32 b64 rune any rawptr f32 f64 f32le f32be f64le f64be u8 u16 u32 u64 u128 u16le u32le u64le u128le u16be u32be u64be u128be uint uintptr i8 i16 i32 i64 i128 i16le i32le i64le i128le i16be i32be i64be i128be int
+syntax keyword odinDataType string cstring bool b8 b16 b32 b64 rune any rawptr f32 f64 f32le f32be f64le f64be u8 u16 u32 u64 u128 u16le u32le u64le u128le u16be u32be u64be u128be uint uintptr i8 i16 i32 i64 i128 i16le i32le i64le i128le i16be i32be i64be i128be int complex complex32 complex64 complex128 quaternion quaternion64 quaternion128 quaternion256 matrix
 syntax keyword odinBool true false
 syntax keyword odinNull nil
 syntax keyword odinDynamic dynamic
@@ -64,6 +64,7 @@ syntax keyword odinDefer defer
 
 syntax region odinChar start=/\v'/ skip=/\v\\./ end=/\v'/
 syntax region odinString start=/\v"/ skip=/\v\\./ end=/\v"/
+syntax region odinRawString start=/\v`/ skip=/\v\\./ end=/\v`/
 
 syntax match odinFunction "\v<\w*>(\s*::\s*proc)@="
 
@@ -140,6 +141,7 @@ highlight link odinTernaryQMark Operator
 highlight link odinReturnOp Operator
 
 highlight link odinString String
+highlight link odinRawString String
 highlight link odinChar String
 
 highlight link odinStruct Structure
diff --git a/syntax/pgsql.vim b/syntax/pgsql.vim
index 48bccdc67..807f998e8 100644
--- a/syntax/pgsql.vim
+++ b/syntax/pgsql.vim
@@ -8,8 +8,8 @@ endif
 " Version:      2.3.1
 " License:      Vim license (see `:help license`)
 
-" Based on PostgreSQL 13.2
-" Automatically generated on 2021-04-22 at 08:36:13
+" Based on PostgreSQL 14.1
+" Automatically generated on 2021-12-03 at 11:21:19
 
 if exists("b:current_syntax")
   finish
@@ -38,42 +38,41 @@ syn keyword sqlStatement contained rollback savepoint security select select set
 syn keyword sqlStatement contained truncate unlisten update vacuum values work
 syn match sqlStatement contained /\<create\%(\_s\+or\_s\+replace\)\=\>/
 " Types
-syn keyword sqlType contained aclitem addbandarg addr addr_gid_seq addrfeat addrfeat_gid_seq
-syn keyword sqlType contained agg_count agg_samealignment anyarray anycompatible
-syn keyword sqlType contained anycompatiblearray anycompatiblenonarray anycompatiblerange anyelement
-syn keyword sqlType contained anyenum anynonarray anyrange bg bg_gid_seq bit bool box box2d box2df box3d
+syn keyword sqlType contained aclitem addbandarg addr addrfeat agg_count agg_samealignment
+syn keyword sqlType contained anyarray anycompatible anycompatiblearray anycompatiblemultirange
+syn keyword sqlType contained anycompatiblenonarray anycompatiblerange anyelement anyenum
+syn keyword sqlType contained anymultirange anynonarray anyrange bg bit bool box box2d box2df box3d
 syn keyword sqlType contained bpchar bytea cardinal_number char character_data cid cidr circle
-syn keyword sqlType contained citext county county_gid_seq county_lookup countysub_lookup cousub
-syn keyword sqlType contained cousub_gid_seq cstring cube date daterange dblink_pkey_results
-syn keyword sqlType contained direction_lookup ean13 earth edges edges_gid_seq errcodes
-syn keyword sqlType contained event_trigger faces faces_gid_seq fdw_handler featnames featnames_gid_seq
+syn keyword sqlType contained citext county county_lookup countysub_lookup cousub cstring cube date
+syn keyword sqlType contained datemultirange daterange dblink_pkey_results direction_lookup
+syn keyword sqlType contained ean13 earth edges errcodes event_trigger faces fdw_handler featnames
 syn keyword sqlType contained float4 float8 gbtreekey16 gbtreekey32 gbtreekey4 gbtreekey8
 syn keyword sqlType contained gbtreekey_var geocode_settings geocode_settings_default geography
 syn keyword sqlType contained geography_columns geometry geometry_columns geometry_dump geomval
 syn keyword sqlType contained getfaceedges_returntype ghstore gidx gtrgm gtsvector hstore
-syn keyword sqlType contained index_am_handler inet int2 int2vector int4 int4range int8 int8range
-syn keyword sqlType contained intbig_gkey internal interval isbn isbn13 ismn ismn13 issn issn13 json
-syn keyword sqlType contained jsonb jsonpath language_handler layer line lo loader_lookuptables
-syn keyword sqlType contained loader_platform loader_variables lquery lseg ltree ltree_gist
-syn keyword sqlType contained ltxtquery macaddr macaddr8 money norm_addy numeric numrange oid
-syn keyword sqlType contained oidvector pagc_gaz pagc_gaz_id_seq pagc_lex pagc_lex_id_seq pagc_rules
-syn keyword sqlType contained pagc_rules_id_seq path pg_all_foreign_keys pg_ddl_command
-syn keyword sqlType contained pg_dependencies pg_lsn pg_mcv_list pg_ndistinct pg_node_tree
-syn keyword sqlType contained pg_snapshot place place_gid_seq place_lookup point polygon query_int
-syn keyword sqlType contained rastbandarg raster raster_columns raster_overviews reclassarg record
-syn keyword sqlType contained refcursor regclass regcollation regconfig regdictionary
-syn keyword sqlType contained regnamespace regoper regoperator regproc regprocedure regrole regtype
+syn keyword sqlType contained index_am_handler inet int2 int2vector int4 int4multirange int4range
+syn keyword sqlType contained int8 int8multirange int8range intbig_gkey internal interval isbn
+syn keyword sqlType contained isbn13 ismn ismn13 issn issn13 json jsonb jsonpath language_handler
+syn keyword sqlType contained layer line lo loader_lookuptables loader_platform loader_variables
+syn keyword sqlType contained lquery lseg ltree ltree_gist ltxtquery macaddr macaddr8 money
+syn keyword sqlType contained norm_addy numeric nummultirange numrange oid oidvector pagc_gaz pagc_lex
+syn keyword sqlType contained pagc_rules path pg_all_foreign_keys pg_brin_bloom_summary
+syn keyword sqlType contained pg_brin_minmax_multi_summary pg_ddl_command pg_dependencies pg_lsn
+syn keyword sqlType contained pg_mcv_list pg_ndistinct pg_node_tree pg_snapshot
+syn keyword sqlType contained pg_stat_statements_info place place_lookup point polygon query_int rastbandarg
+syn keyword sqlType contained raster raster_columns raster_overviews reclassarg record refcursor
+syn keyword sqlType contained regclass regcollation regconfig regdictionary regnamespace
+syn keyword sqlType contained regoper regoperator regproc regprocedure regrole regtype
 syn keyword sqlType contained secondary_unit_lookup seg spatial_ref_sys spheroid sql_identifier state
-syn keyword sqlType contained state_gid_seq state_lookup stdaddr street_type_lookup
-syn keyword sqlType contained summarystats tabblock tabblock_gid_seq table_am_handler
-syn keyword sqlType contained tablefunc_crosstab_2 tablefunc_crosstab_3 tablefunc_crosstab_4 tap_funky text
-syn keyword sqlType contained tid time time_stamp timestamp timestamptz timetz topoelement
-syn keyword sqlType contained topoelementarray topogeometry topology topology_id_seq tract
-syn keyword sqlType contained tract_gid_seq tsm_handler tsquery tsrange tstzrange tsvector txid_snapshot
-syn keyword sqlType contained unionarg upc us_gaz us_gaz_id_seq us_lex us_lex_id_seq us_rules
-syn keyword sqlType contained us_rules_id_seq uuid valid_detail validatetopology_returntype
-syn keyword sqlType contained varbit varchar void xid xid8 xml yes_or_no zcta5 zcta5_gid_seq
-syn keyword sqlType contained zip_lookup zip_lookup_all zip_lookup_base zip_state zip_state_loc
+syn keyword sqlType contained state_lookup stdaddr street_type_lookup summarystats tabblock
+syn keyword sqlType contained tabblock20 table_am_handler tablefunc_crosstab_2 tablefunc_crosstab_3
+syn keyword sqlType contained tablefunc_crosstab_4 tap_funky text tid time time_stamp timestamp
+syn keyword sqlType contained timestamptz timetz topoelement topoelementarray topogeometry
+syn keyword sqlType contained topology tract tsm_handler tsmultirange tsquery tsrange
+syn keyword sqlType contained tstzmultirange tstzrange tsvector txid_snapshot unionarg upc us_gaz us_lex
+syn keyword sqlType contained us_rules uuid valid_detail validatetopology_returntype varbit varchar
+syn keyword sqlType contained void xid xid8 xml yes_or_no zcta5 zip_lookup zip_lookup_all
+syn keyword sqlType contained zip_lookup_base zip_state zip_state_loc
 syn match sqlType /\<pg_toast_\d\+\>/
 syn match sqlType /\<time\%[stamp]\s\+with\%[out]\>/
 syn match sqlKeyword /\<with\s\+grant\>/
@@ -86,57 +85,58 @@ syn keyword sqlType contained int integer interval numeric precision real serial
 syn keyword sqlType contained serial8 smallint smallserial timestamp varying xml zone
 " Keywords
 syn keyword sqlKeyword contained absolute access action admin after aggregate all also always
-syn keyword sqlKeyword contained analyse and any as asc assertion assignment asymmetric attach attribute
-syn keyword sqlKeyword contained authorization backward basetype before between binary both by
-syn keyword sqlKeyword contained bypassrls cache call called cascade cascaded case cast catalog century chain
-syn keyword sqlKeyword contained characteristics check class coalesce collate collation column
-syn keyword sqlKeyword contained columns combinefunc comments committed concurrently configuration
-syn keyword sqlKeyword contained conflict connection constraint content continue conversion cost
-syn keyword sqlKeyword contained createdb createrole cross csv current current_catalog current_date
-syn keyword sqlKeyword contained current_role current_schema current_time current_timestamp
-syn keyword sqlKeyword contained current_user cursor cycle data database day dec decade default defaults
-syn keyword sqlKeyword contained deferrable deferred definer delimiter delimiters depends desc
-syn keyword sqlKeyword contained deserialfunc detach dictionary disable distinct document domain dow doy each
-syn keyword sqlKeyword contained else enable encoding encrypted enum epoch escape event except exclude
-syn keyword sqlKeyword contained excluding exclusive exists expression extension external extract
-syn keyword sqlKeyword contained false family filter finalfunc finalfunc_extra finalfunc_modify
-syn keyword sqlKeyword contained first float following for force foreign forward freeze from full function
-syn keyword sqlKeyword contained functions generated global granted greatest group grouping groups
-syn keyword sqlKeyword contained handler having header hold hour hypothetical identity if ilike
-syn keyword sqlKeyword contained immediate immutable implicit in include including increment index indexes
-syn keyword sqlKeyword contained inherit inherits initcond initially inline inner inout input
-syn keyword sqlKeyword contained insensitive instead intersect into invoker is isnull isodow isolation
-syn keyword sqlKeyword contained isoyear join key language large last lateral lc_collate lc_ctype leading
-syn keyword sqlKeyword contained leakproof least left level like limit local locale localtime
-syn keyword sqlKeyword contained localtimestamp location locked logged login mapping match materialized
-syn keyword sqlKeyword contained maxvalue method mfinalfunc mfinalfunc_extra mfinalfunc_modify
-syn keyword sqlKeyword contained microseconds millennium milliseconds minitcond minute minvalue
-syn keyword sqlKeyword contained minvfunc mode month msfunc msspace mstype name names national natural nchar
-syn keyword sqlKeyword contained new next nfc nfd nfkc nfkd no nobypassrls nocreatedb nocreaterole
-syn keyword sqlKeyword contained noinherit nologin none noreplication normalize normalized nosuperuser
-syn keyword sqlKeyword contained not nothing notnull nowait null nullif nulls object of off offset oids
-syn keyword sqlKeyword contained old on only operator option options or order ordinality others out
-syn keyword sqlKeyword contained outer over overlaps overlay overriding owned owner parallel parser
-syn keyword sqlKeyword contained partial partition passing password permissive placing plans policy
-syn keyword sqlKeyword contained position preceding preserve primary prior privileges procedural
-syn keyword sqlKeyword contained procedure procedures program provider public publication quarter quote
-syn keyword sqlKeyword contained range read read_write readonly recheck recursive ref references
-syn keyword sqlKeyword contained referencing relative rename repeatable replace replica replication
-syn keyword sqlKeyword contained restart restrict restricted restrictive returning returns right role
-syn keyword sqlKeyword contained rollup routine routines row rows rule safe schema schemas scroll search
-syn keyword sqlKeyword contained second sequence sequences serialfunc serializable server session
-syn keyword sqlKeyword contained session_user setof sets sfunc share shareable similar simple skip
-syn keyword sqlKeyword contained snapshot some sortop sql sspace stable standalone statement statistics
-syn keyword sqlKeyword contained stdin stdout storage stored strict strip stype subscription
-syn keyword sqlKeyword contained substring superuser support symmetric sysid system table tables
-syn keyword sqlKeyword contained tablesample tablespace temp template temporary then ties timezone
-syn keyword sqlKeyword contained timezone_hour timezone_minute to trailing transform treat trigger trim true
-syn keyword sqlKeyword contained trusted type types uescape unbounded uncommitted unencrypted union
-syn keyword sqlKeyword contained unique unknown unlogged unsafe until usage user using valid validate
-syn keyword sqlKeyword contained validator value variadic verbose version view views volatile week when
-syn keyword sqlKeyword contained where whitespace window with within without wrapper write
-syn keyword sqlKeyword contained xmlattributes xmlconcat xmlelement xmlexists xmlforest xmlnamespaces
-syn keyword sqlKeyword contained xmlparse xmlpi xmlroot xmlserialize xmltable year yes
+syn keyword sqlKeyword contained analyse and any as asc asensitive assertion assignment asymmetric atomic
+syn keyword sqlKeyword contained attach attribute authorization backward basetype before between
+syn keyword sqlKeyword contained binary both breadth by bypassrls cache call called cascade cascaded case
+syn keyword sqlKeyword contained cast catalog century chain characteristics check class coalesce
+syn keyword sqlKeyword contained collate collation column columns combinefunc comments committed
+syn keyword sqlKeyword contained compression concurrently configuration conflict connection constraint
+syn keyword sqlKeyword contained content continue conversion cost createdb createrole cross csv
+syn keyword sqlKeyword contained current current_catalog current_date current_role current_schema
+syn keyword sqlKeyword contained current_time current_timestamp current_user cursor cycle data
+syn keyword sqlKeyword contained database day dec decade default defaults deferrable deferred definer
+syn keyword sqlKeyword contained delimiter delimiters depends depth desc deserialfunc detach dictionary
+syn keyword sqlKeyword contained disable distinct document domain dow doy each else enable encoding
+syn keyword sqlKeyword contained encrypted enum epoch escape event except exclude excluding exclusive
+syn keyword sqlKeyword contained exists expression extension external extract false family filter
+syn keyword sqlKeyword contained finalfunc finalfunc_extra finalfunc_modify finalize first float
+syn keyword sqlKeyword contained following for force foreign forward freeze from full function functions
+syn keyword sqlKeyword contained generated global granted greatest group grouping groups handler having
+syn keyword sqlKeyword contained header hold hour hypothetical identity if ilike immediate immutable
+syn keyword sqlKeyword contained implicit in include including increment index indexes inherit
+syn keyword sqlKeyword contained inherits initcond initially inline inner inout input insensitive instead
+syn keyword sqlKeyword contained intersect into invoker is isnull isodow isolation isoyear join key
+syn keyword sqlKeyword contained language large last lateral lc_collate lc_ctype leading leakproof
+syn keyword sqlKeyword contained least left level like limit local locale localtime localtimestamp
+syn keyword sqlKeyword contained location locked logged login mapping match materialized maxvalue method
+syn keyword sqlKeyword contained mfinalfunc mfinalfunc_extra mfinalfunc_modify microseconds
+syn keyword sqlKeyword contained millennium milliseconds minitcond minute minvalue minvfunc mode month
+syn keyword sqlKeyword contained msfunc msspace mstype name names national natural nchar new next nfc nfd
+syn keyword sqlKeyword contained nfkc nfkd no nobypassrls nocreatedb nocreaterole noinherit nologin
+syn keyword sqlKeyword contained none noreplication normalize normalized nosuperuser not nothing
+syn keyword sqlKeyword contained notnull nowait null nullif nulls object of off offset oids old on only
+syn keyword sqlKeyword contained operator option options or order ordinality others out outer over
+syn keyword sqlKeyword contained overlaps overlay overriding owned owner parallel parser partial partition
+syn keyword sqlKeyword contained passing password permissive placing plans policy position
+syn keyword sqlKeyword contained preceding preserve primary prior privileges procedural procedure
+syn keyword sqlKeyword contained procedures program provider public publication quarter quote range read
+syn keyword sqlKeyword contained read_write readonly recheck recursive ref references referencing
+syn keyword sqlKeyword contained relative rename repeatable replace replica replication restart restrict
+syn keyword sqlKeyword contained restricted restrictive return returning returns right role rollup
+syn keyword sqlKeyword contained routine routines row rows rule safe schema schemas scroll search second
+syn keyword sqlKeyword contained sequence sequences serialfunc serializable server session
+syn keyword sqlKeyword contained session_user setof sets sfunc share shareable similar simple skip snapshot
+syn keyword sqlKeyword contained some sortop sql sspace stable standalone statement statistics stdin
+syn keyword sqlKeyword contained stdout storage stored strict strip stype subscription substring
+syn keyword sqlKeyword contained superuser support symmetric sysid system table tables tablesample
+syn keyword sqlKeyword contained tablespace temp template temporary then ties timezone timezone_hour
+syn keyword sqlKeyword contained timezone_minute to trailing transform treat trigger trim true trusted
+syn keyword sqlKeyword contained type types uescape unbounded uncommitted unencrypted union unique
+syn keyword sqlKeyword contained unknown unlogged unsafe until usage user using valid validate validator
+syn keyword sqlKeyword contained value variadic verbose version view views volatile week when where
+syn keyword sqlKeyword contained whitespace window with within without wrapper write xmlattributes
+syn keyword sqlKeyword contained xmlconcat xmlelement xmlexists xmlforest xmlnamespaces xmlparse
+syn keyword sqlKeyword contained xmlpi xmlroot xmlserialize xmltable year yes
 syn keyword sqlConstant contained information_schema pg_catalog
 " Built-in functions
 syn keyword sqlFunction contained RI_FKey_cascade_del RI_FKey_cascade_upd RI_FKey_check_ins
@@ -148,242 +148,265 @@ syn keyword sqlFunction contained aclitemin aclitemout aclremove acos acosd acos
 syn keyword sqlFunction contained any_out anyarray_in anyarray_out anyarray_recv anyarray_send
 syn keyword sqlFunction contained anycompatible_in anycompatible_out anycompatiblearray_in
 syn keyword sqlFunction contained anycompatiblearray_out anycompatiblearray_recv
-syn keyword sqlFunction contained anycompatiblearray_send anycompatiblenonarray_in anycompatiblenonarray_out
-syn keyword sqlFunction contained anycompatiblerange_in anycompatiblerange_out anyelement_in
-syn keyword sqlFunction contained anyelement_out anyenum_in anyenum_out anynonarray_in anynonarray_out
-syn keyword sqlFunction contained anyrange_in anyrange_out anytextcat area areajoinsel areasel array_agg
-syn keyword sqlFunction contained array_agg_array_finalfn array_agg_array_transfn
-syn keyword sqlFunction contained array_agg_finalfn array_agg_transfn array_append array_cat array_dims array_eq
-syn keyword sqlFunction contained array_fill array_ge array_gt array_in array_larger array_le
-syn keyword sqlFunction contained array_length array_lower array_lt array_ndims array_ne array_out
-syn keyword sqlFunction contained array_position array_positions array_prepend array_recv array_remove
-syn keyword sqlFunction contained array_replace array_send array_smaller array_to_json
-syn keyword sqlFunction contained array_to_string array_to_tsvector array_typanalyze array_unnest_support
-syn keyword sqlFunction contained array_upper arraycontained arraycontains arraycontjoinsel
-syn keyword sqlFunction contained arraycontsel arrayoverlap ascii asin asind asinh atan atan2 atan2d atand
-syn keyword sqlFunction contained atanh avg bernoulli big5_to_euc_tw big5_to_mic big5_to_utf8
-syn keyword sqlFunction contained binary_upgrade_create_empty_extension
-syn keyword sqlFunction contained binary_upgrade_set_missing_value binary_upgrade_set_next_array_pg_type_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_heap_pg_class_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_index_pg_class_oid binary_upgrade_set_next_pg_authid_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_pg_enum_oid binary_upgrade_set_next_pg_type_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_toast_pg_class_oid
-syn keyword sqlFunction contained binary_upgrade_set_next_toast_pg_type_oid binary_upgrade_set_record_init_privs
-syn keyword sqlFunction contained bit bit_and bit_in bit_length bit_or bit_out bit_recv bit_send bitand
-syn keyword sqlFunction contained bitcat bitcmp biteq bitge bitgt bitle bitlt bitne bitnot bitor
+syn keyword sqlFunction contained anycompatiblearray_send anycompatiblemultirange_in anycompatiblemultirange_out
+syn keyword sqlFunction contained anycompatiblenonarray_in anycompatiblenonarray_out
+syn keyword sqlFunction contained anycompatiblerange_in anycompatiblerange_out anyelement_in anyelement_out
+syn keyword sqlFunction contained anyenum_in anyenum_out anymultirange_in anymultirange_out
+syn keyword sqlFunction contained anynonarray_in anynonarray_out anyrange_in anyrange_out anytextcat area
+syn keyword sqlFunction contained areajoinsel areasel array_agg array_agg_array_finalfn
+syn keyword sqlFunction contained array_agg_array_transfn array_agg_finalfn array_agg_transfn array_append
+syn keyword sqlFunction contained array_cat array_dims array_eq array_fill array_ge array_gt
+syn keyword sqlFunction contained array_in array_larger array_le array_length array_lower array_lt
+syn keyword sqlFunction contained array_ndims array_ne array_out array_position array_positions
+syn keyword sqlFunction contained array_prepend array_recv array_remove array_replace array_send
+syn keyword sqlFunction contained array_smaller array_subscript_handler array_to_json array_to_string
+syn keyword sqlFunction contained array_to_tsvector array_typanalyze array_unnest_support array_upper
+syn keyword sqlFunction contained arraycontained arraycontains arraycontjoinsel arraycontsel
+syn keyword sqlFunction contained arrayoverlap ascii asin asind asinh atan atan2 atan2d atand atanh avg
+syn keyword sqlFunction contained bernoulli big5_to_euc_tw big5_to_mic big5_to_utf8
+syn keyword sqlFunction contained binary_upgrade_create_empty_extension binary_upgrade_set_missing_value
+syn keyword sqlFunction contained binary_upgrade_set_next_array_pg_type_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_heap_pg_class_oid binary_upgrade_set_next_index_pg_class_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_multirange_array_pg_type_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_multirange_pg_type_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_pg_authid_oid binary_upgrade_set_next_pg_enum_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_pg_type_oid
+syn keyword sqlFunction contained binary_upgrade_set_next_toast_pg_class_oid binary_upgrade_set_record_init_privs bit bit_and
+syn keyword sqlFunction contained bit_count bit_in bit_length bit_or bit_out bit_recv bit_send bit_xor
+syn keyword sqlFunction contained bitand bitcat bitcmp biteq bitge bitgt bitle bitlt bitne bitnot bitor
 syn keyword sqlFunction contained bitshiftleft bitshiftright bittypmodin bittypmodout bitxor bool
-syn keyword sqlFunction contained bool_accum bool_accum_inv bool_alltrue bool_and bool_anytrue bool_or
-syn keyword sqlFunction contained booland_statefunc booleq boolge boolgt boolin boolle boollt boolne
-syn keyword sqlFunction contained boolor_statefunc boolout boolrecv boolsend bound_box box box_above
-syn keyword sqlFunction contained box_above_eq box_add box_below box_below_eq box_center box_contain
-syn keyword sqlFunction contained box_contain_pt box_contained box_distance box_div box_eq box_ge
-syn keyword sqlFunction contained box_gt box_in box_intersect box_le box_left box_lt box_mul box_out
-syn keyword sqlFunction contained box_overabove box_overbelow box_overlap box_overleft
+syn keyword sqlFunction contained bool_accum bool_accum_inv bool_alltrue bool_and bool_anytrue
+syn keyword sqlFunction contained bool_or booland_statefunc booleq boolge boolgt boolin boolle boollt
+syn keyword sqlFunction contained boolne boolor_statefunc boolout boolrecv boolsend bound_box box
+syn keyword sqlFunction contained box_above box_above_eq box_add box_below box_below_eq box_center
+syn keyword sqlFunction contained box_contain box_contain_pt box_contained box_distance box_div box_eq
+syn keyword sqlFunction contained box_ge box_gt box_in box_intersect box_le box_left box_lt box_mul
+syn keyword sqlFunction contained box_out box_overabove box_overbelow box_overlap box_overleft
 syn keyword sqlFunction contained box_overright box_recv box_right box_same box_send box_sub bpchar
 syn keyword sqlFunction contained bpchar_larger bpchar_pattern_ge bpchar_pattern_gt bpchar_pattern_le
 syn keyword sqlFunction contained bpchar_pattern_lt bpchar_smaller bpchar_sortsupport bpcharcmp
-syn keyword sqlFunction contained bpchareq bpcharge bpchargt bpchariclike bpcharicnlike bpcharicregexeq
-syn keyword sqlFunction contained bpcharicregexne bpcharin bpcharle bpcharlike bpcharlt bpcharne
-syn keyword sqlFunction contained bpcharnlike bpcharout bpcharrecv bpcharregexeq bpcharregexne
-syn keyword sqlFunction contained bpcharsend bpchartypmodin bpchartypmodout brin_desummarize_range
-syn keyword sqlFunction contained brin_inclusion_add_value brin_inclusion_consistent
+syn keyword sqlFunction contained bpchareq bpcharge bpchargt bpchariclike bpcharicnlike
+syn keyword sqlFunction contained bpcharicregexeq bpcharicregexne bpcharin bpcharle bpcharlike bpcharlt
+syn keyword sqlFunction contained bpcharne bpcharnlike bpcharout bpcharrecv bpcharregexeq bpcharregexne
+syn keyword sqlFunction contained bpcharsend bpchartypmodin bpchartypmodout brin_bloom_add_value
+syn keyword sqlFunction contained brin_bloom_consistent brin_bloom_opcinfo brin_bloom_options
+syn keyword sqlFunction contained brin_bloom_summary_in brin_bloom_summary_out
+syn keyword sqlFunction contained brin_bloom_summary_recv brin_bloom_summary_send brin_bloom_union
+syn keyword sqlFunction contained brin_desummarize_range brin_inclusion_add_value brin_inclusion_consistent
 syn keyword sqlFunction contained brin_inclusion_opcinfo brin_inclusion_union brin_minmax_add_value
-syn keyword sqlFunction contained brin_minmax_consistent brin_minmax_opcinfo brin_minmax_union
-syn keyword sqlFunction contained brin_summarize_new_values brin_summarize_range brinhandler broadcast
-syn keyword sqlFunction contained btarraycmp btboolcmp btbpchar_pattern_cmp
-syn keyword sqlFunction contained btbpchar_pattern_sortsupport btcharcmp btequalimage btfloat48cmp btfloat4cmp
-syn keyword sqlFunction contained btfloat4sortsupport btfloat84cmp btfloat8cmp btfloat8sortsupport bthandler
-syn keyword sqlFunction contained btint24cmp btint28cmp btint2cmp btint2sortsupport btint42cmp
-syn keyword sqlFunction contained btint48cmp btint4cmp btint4sortsupport btint82cmp btint84cmp
-syn keyword sqlFunction contained btint8cmp btint8sortsupport btnamecmp btnamesortsupport btnametextcmp
-syn keyword sqlFunction contained btoidcmp btoidsortsupport btoidvectorcmp btrecordcmp
-syn keyword sqlFunction contained btrecordimagecmp btrim bttext_pattern_cmp bttext_pattern_sortsupport
-syn keyword sqlFunction contained bttextcmp bttextnamecmp bttextsortsupport bttidcmp btvarstrequalimage
-syn keyword sqlFunction contained bytea_sortsupport bytea_string_agg_finalfn
-syn keyword sqlFunction contained bytea_string_agg_transfn byteacat byteacmp byteaeq byteage byteagt byteain byteale
-syn keyword sqlFunction contained bytealike bytealt byteane byteanlike byteaout bytearecv byteasend
-syn keyword sqlFunction contained cardinality cash_cmp cash_div_cash cash_div_flt4 cash_div_flt8
-syn keyword sqlFunction contained cash_div_int2 cash_div_int4 cash_div_int8 cash_eq cash_ge cash_gt
-syn keyword sqlFunction contained cash_in cash_le cash_lt cash_mi cash_mul_flt4 cash_mul_flt8
-syn keyword sqlFunction contained cash_mul_int2 cash_mul_int4 cash_mul_int8 cash_ne cash_out cash_pl
-syn keyword sqlFunction contained cash_recv cash_send cash_words cashlarger cashsmaller cbrt ceil ceiling
-syn keyword sqlFunction contained center char_length character_length chareq charge chargt charin
-syn keyword sqlFunction contained charle charlt charne charout charrecv charsend chr cideq cidin cidout
-syn keyword sqlFunction contained cidr cidr_in cidr_out cidr_recv cidr_send cidrecv cidsend circle
-syn keyword sqlFunction contained circle_above circle_add_pt circle_below circle_center
-syn keyword sqlFunction contained circle_contain circle_contain_pt circle_contained circle_distance
-syn keyword sqlFunction contained circle_div_pt circle_eq circle_ge circle_gt circle_in circle_le
-syn keyword sqlFunction contained circle_left circle_lt circle_mul_pt circle_ne circle_out circle_overabove
-syn keyword sqlFunction contained circle_overbelow circle_overlap circle_overleft
-syn keyword sqlFunction contained circle_overright circle_recv circle_right circle_same circle_send circle_sub_pt
-syn keyword sqlFunction contained clock_timestamp close_lb close_ls close_lseg close_pb close_pl
-syn keyword sqlFunction contained close_ps close_sb close_sl col_description concat concat_ws
-syn keyword sqlFunction contained contjoinsel contsel convert convert_from convert_to corr cos cosd cosh cot
-syn keyword sqlFunction contained cotd count covar_pop covar_samp cstring_in cstring_out
-syn keyword sqlFunction contained cstring_recv cstring_send cume_dist cume_dist_final current_database
-syn keyword sqlFunction contained current_query current_schema current_schemas current_setting
-syn keyword sqlFunction contained current_user currtid currtid2 currval cursor_to_xml cursor_to_xmlschema
-syn keyword sqlFunction contained database_to_xml database_to_xml_and_xmlschema
-syn keyword sqlFunction contained database_to_xmlschema date date_cmp date_cmp_timestamp date_cmp_timestamptz
-syn keyword sqlFunction contained date_eq date_eq_timestamp date_eq_timestamptz date_ge
-syn keyword sqlFunction contained date_ge_timestamp date_ge_timestamptz date_gt date_gt_timestamp
-syn keyword sqlFunction contained date_gt_timestamptz date_in date_larger date_le date_le_timestamp
-syn keyword sqlFunction contained date_le_timestamptz date_lt date_lt_timestamp date_lt_timestamptz date_mi
-syn keyword sqlFunction contained date_mi_interval date_mii date_ne date_ne_timestamp
-syn keyword sqlFunction contained date_ne_timestamptz date_out date_part date_pl_interval date_pli date_recv
-syn keyword sqlFunction contained date_send date_smaller date_sortsupport date_trunc daterange
-syn keyword sqlFunction contained daterange_canonical daterange_subdiff datetime_pl datetimetz_pl
-syn keyword sqlFunction contained dcbrt decode degrees dense_rank dense_rank_final dexp diagonal
-syn keyword sqlFunction contained diameter dispell_init dispell_lexize dist_bl dist_bp dist_bs
-syn keyword sqlFunction contained dist_cpoint dist_cpoly dist_lb dist_lp dist_ls dist_pathp dist_pb dist_pc
+syn keyword sqlFunction contained brin_minmax_consistent brin_minmax_multi_add_value
+syn keyword sqlFunction contained brin_minmax_multi_consistent brin_minmax_multi_distance_date
+syn keyword sqlFunction contained brin_minmax_multi_distance_float4 brin_minmax_multi_distance_float8
+syn keyword sqlFunction contained brin_minmax_multi_distance_inet brin_minmax_multi_distance_int2
+syn keyword sqlFunction contained brin_minmax_multi_distance_int4
+syn keyword sqlFunction contained brin_minmax_multi_distance_int8 brin_minmax_multi_distance_interval
+syn keyword sqlFunction contained brin_minmax_multi_distance_macaddr brin_minmax_multi_distance_macaddr8
+syn keyword sqlFunction contained brin_minmax_multi_distance_numeric brin_minmax_multi_distance_pg_lsn
+syn keyword sqlFunction contained brin_minmax_multi_distance_tid brin_minmax_multi_distance_time
+syn keyword sqlFunction contained brin_minmax_multi_distance_timestamp
+syn keyword sqlFunction contained brin_minmax_multi_distance_timetz brin_minmax_multi_distance_uuid
+syn keyword sqlFunction contained brin_minmax_multi_opcinfo brin_minmax_multi_options brin_minmax_multi_summary_in
+syn keyword sqlFunction contained brin_minmax_multi_summary_out brin_minmax_multi_summary_recv
+syn keyword sqlFunction contained brin_minmax_multi_summary_send brin_minmax_multi_union
+syn keyword sqlFunction contained brin_minmax_opcinfo brin_minmax_union brin_summarize_new_values
+syn keyword sqlFunction contained brin_summarize_range brinhandler broadcast btarraycmp btboolcmp
+syn keyword sqlFunction contained btbpchar_pattern_cmp btbpchar_pattern_sortsupport btcharcmp
+syn keyword sqlFunction contained btequalimage btfloat48cmp btfloat4cmp btfloat4sortsupport btfloat84cmp
+syn keyword sqlFunction contained btfloat8cmp btfloat8sortsupport bthandler btint24cmp btint28cmp
+syn keyword sqlFunction contained btint2cmp btint2sortsupport btint42cmp btint48cmp btint4cmp
+syn keyword sqlFunction contained btint4sortsupport btint82cmp btint84cmp btint8cmp btint8sortsupport
+syn keyword sqlFunction contained btnamecmp btnamesortsupport btnametextcmp btoidcmp
+syn keyword sqlFunction contained btoidsortsupport btoidvectorcmp btrecordcmp btrecordimagecmp btrim
+syn keyword sqlFunction contained bttext_pattern_cmp bttext_pattern_sortsupport bttextcmp bttextnamecmp
+syn keyword sqlFunction contained bttextsortsupport bttidcmp btvarstrequalimage bytea_sortsupport
+syn keyword sqlFunction contained bytea_string_agg_finalfn bytea_string_agg_transfn byteacat
+syn keyword sqlFunction contained byteacmp byteaeq byteage byteagt byteain byteale bytealike bytealt
+syn keyword sqlFunction contained byteane byteanlike byteaout bytearecv byteasend cardinality cash_cmp
+syn keyword sqlFunction contained cash_div_cash cash_div_flt4 cash_div_flt8 cash_div_int2
+syn keyword sqlFunction contained cash_div_int4 cash_div_int8 cash_eq cash_ge cash_gt cash_in cash_le
+syn keyword sqlFunction contained cash_lt cash_mi cash_mul_flt4 cash_mul_flt8 cash_mul_int2
+syn keyword sqlFunction contained cash_mul_int4 cash_mul_int8 cash_ne cash_out cash_pl cash_recv cash_send
+syn keyword sqlFunction contained cash_words cashlarger cashsmaller cbrt ceil ceiling center char_length
+syn keyword sqlFunction contained character_length chareq charge chargt charin charle charlt charne
+syn keyword sqlFunction contained charout charrecv charsend chr cideq cidin cidout cidr cidr_in cidr_out
+syn keyword sqlFunction contained cidr_recv cidr_send cidrecv cidsend circle circle_above
+syn keyword sqlFunction contained circle_add_pt circle_below circle_center circle_contain
+syn keyword sqlFunction contained circle_contain_pt circle_contained circle_distance circle_div_pt circle_eq
+syn keyword sqlFunction contained circle_ge circle_gt circle_in circle_le circle_left circle_lt
+syn keyword sqlFunction contained circle_mul_pt circle_ne circle_out circle_overabove circle_overbelow
+syn keyword sqlFunction contained circle_overlap circle_overleft circle_overright circle_recv
+syn keyword sqlFunction contained circle_right circle_same circle_send circle_sub_pt clock_timestamp
+syn keyword sqlFunction contained close_lb close_ls close_lseg close_pb close_pl close_ps close_sb
+syn keyword sqlFunction contained close_sl col_description concat concat_ws contjoinsel contsel convert
+syn keyword sqlFunction contained convert_from convert_to corr cos cosd cosh cot cotd count covar_pop
+syn keyword sqlFunction contained covar_samp cstring_in cstring_out cstring_recv cstring_send
+syn keyword sqlFunction contained cume_dist cume_dist_final current_database current_query
+syn keyword sqlFunction contained current_schema current_schemas current_setting current_user currtid2
+syn keyword sqlFunction contained currval cursor_to_xml cursor_to_xmlschema database_to_xml
+syn keyword sqlFunction contained database_to_xml_and_xmlschema database_to_xmlschema date date_bin date_cmp
+syn keyword sqlFunction contained date_cmp_timestamp date_cmp_timestamptz date_eq
+syn keyword sqlFunction contained date_eq_timestamp date_eq_timestamptz date_ge date_ge_timestamp
+syn keyword sqlFunction contained date_ge_timestamptz date_gt date_gt_timestamp date_gt_timestamptz date_in
+syn keyword sqlFunction contained date_larger date_le date_le_timestamp date_le_timestamptz date_lt
+syn keyword sqlFunction contained date_lt_timestamp date_lt_timestamptz date_mi date_mi_interval
+syn keyword sqlFunction contained date_mii date_ne date_ne_timestamp date_ne_timestamptz date_out
+syn keyword sqlFunction contained date_part date_pl_interval date_pli date_recv date_send
+syn keyword sqlFunction contained date_smaller date_sortsupport date_trunc datemultirange daterange
+syn keyword sqlFunction contained daterange_canonical daterange_subdiff datetime_pl datetimetz_pl dcbrt
+syn keyword sqlFunction contained decode degrees dense_rank dense_rank_final dexp diagonal diameter
+syn keyword sqlFunction contained dispell_init dispell_lexize dist_bl dist_bp dist_bs dist_cpoint
+syn keyword sqlFunction contained dist_cpoly dist_lb dist_lp dist_ls dist_pathp dist_pb dist_pc
 syn keyword sqlFunction contained dist_pl dist_polyc dist_polyp dist_ppath dist_ppoly dist_ps dist_sb
 syn keyword sqlFunction contained dist_sl dist_sp div dlog1 dlog10 domain_in domain_recv dpow dround
 syn keyword sqlFunction contained dsimple_init dsimple_lexize dsnowball_init dsnowball_lexize dsqrt
-syn keyword sqlFunction contained dsynonym_init dsynonym_lexize dtrunc elem_contained_by_range
-syn keyword sqlFunction contained encode enum_cmp enum_eq enum_first enum_ge enum_gt enum_in
-syn keyword sqlFunction contained enum_larger enum_last enum_le enum_lt enum_ne enum_out enum_range enum_recv
-syn keyword sqlFunction contained enum_send enum_smaller eqjoinsel eqsel euc_cn_to_mic
-syn keyword sqlFunction contained euc_cn_to_utf8 euc_jis_2004_to_shift_jis_2004 euc_jis_2004_to_utf8
-syn keyword sqlFunction contained euc_jp_to_mic euc_jp_to_sjis euc_jp_to_utf8 euc_kr_to_mic
-syn keyword sqlFunction contained euc_kr_to_utf8 euc_tw_to_big5 euc_tw_to_mic euc_tw_to_utf8
-syn keyword sqlFunction contained event_trigger_in event_trigger_out every exp factorial family fdw_handler_in
-syn keyword sqlFunction contained fdw_handler_out first_value float4 float48div float48eq float48ge
-syn keyword sqlFunction contained float48gt float48le float48lt float48mi float48mul float48ne
-syn keyword sqlFunction contained float48pl float4_accum float4abs float4div float4eq float4ge float4gt
-syn keyword sqlFunction contained float4in float4larger float4le float4lt float4mi float4mul float4ne
-syn keyword sqlFunction contained float4out float4pl float4recv float4send float4smaller float4um
-syn keyword sqlFunction contained float4up float8 float84div float84eq float84ge float84gt float84le
-syn keyword sqlFunction contained float84lt float84mi float84mul float84ne float84pl float8_accum
-syn keyword sqlFunction contained float8_avg float8_combine float8_corr float8_covar_pop
-syn keyword sqlFunction contained float8_covar_samp float8_regr_accum float8_regr_avgx float8_regr_avgy
-syn keyword sqlFunction contained float8_regr_combine float8_regr_intercept float8_regr_r2
-syn keyword sqlFunction contained float8_regr_slope float8_regr_sxx float8_regr_sxy float8_regr_syy
-syn keyword sqlFunction contained float8_stddev_pop float8_stddev_samp float8_var_pop float8_var_samp
-syn keyword sqlFunction contained float8abs float8div float8eq float8ge float8gt float8in
-syn keyword sqlFunction contained float8larger float8le float8lt float8mi float8mul float8ne float8out
-syn keyword sqlFunction contained float8pl float8recv float8send float8smaller float8um float8up floor
-syn keyword sqlFunction contained flt4_mul_cash flt8_mul_cash fmgr_c_validator
-syn keyword sqlFunction contained fmgr_internal_validator fmgr_sql_validator format format_type gb18030_to_utf8
-syn keyword sqlFunction contained gbk_to_utf8 gcd gen_random_uuid generate_series
-syn keyword sqlFunction contained generate_series_int4_support generate_series_int8_support generate_subscripts
-syn keyword sqlFunction contained get_bit get_byte get_current_ts_config getdatabaseencoding
-syn keyword sqlFunction contained getpgusername gin_clean_pending_list gin_cmp_prefix gin_cmp_tslexeme
-syn keyword sqlFunction contained gin_compare_jsonb gin_consistent_jsonb gin_consistent_jsonb_path
-syn keyword sqlFunction contained gin_extract_jsonb gin_extract_jsonb_path
-syn keyword sqlFunction contained gin_extract_jsonb_query gin_extract_jsonb_query_path gin_extract_tsquery
-syn keyword sqlFunction contained gin_extract_tsvector gin_triconsistent_jsonb
-syn keyword sqlFunction contained gin_triconsistent_jsonb_path gin_tsquery_consistent gin_tsquery_triconsistent
-syn keyword sqlFunction contained ginarrayconsistent ginarrayextract ginarraytriconsistent ginhandler
-syn keyword sqlFunction contained ginqueryarrayextract gist_box_consistent gist_box_distance
-syn keyword sqlFunction contained gist_box_penalty gist_box_picksplit gist_box_same gist_box_union
-syn keyword sqlFunction contained gist_circle_compress gist_circle_consistent gist_circle_distance
-syn keyword sqlFunction contained gist_point_compress gist_point_consistent gist_point_distance
-syn keyword sqlFunction contained gist_point_fetch gist_poly_compress gist_poly_consistent
+syn keyword sqlFunction contained dsynonym_init dsynonym_lexize dtrunc elem_contained_by_multirange
+syn keyword sqlFunction contained elem_contained_by_range encode enum_cmp enum_eq enum_first
+syn keyword sqlFunction contained enum_ge enum_gt enum_in enum_larger enum_last enum_le enum_lt enum_ne
+syn keyword sqlFunction contained enum_out enum_range enum_recv enum_send enum_smaller eqjoinsel
+syn keyword sqlFunction contained eqsel euc_cn_to_mic euc_cn_to_utf8 euc_jis_2004_to_shift_jis_2004
+syn keyword sqlFunction contained euc_jis_2004_to_utf8 euc_jp_to_mic euc_jp_to_sjis
+syn keyword sqlFunction contained euc_jp_to_utf8 euc_kr_to_mic euc_kr_to_utf8 euc_tw_to_big5 euc_tw_to_mic
+syn keyword sqlFunction contained euc_tw_to_utf8 event_trigger_in event_trigger_out every exp extract
+syn keyword sqlFunction contained factorial family fdw_handler_in fdw_handler_out first_value
+syn keyword sqlFunction contained float4 float48div float48eq float48ge float48gt float48le float48lt
+syn keyword sqlFunction contained float48mi float48mul float48ne float48pl float4_accum float4abs
+syn keyword sqlFunction contained float4div float4eq float4ge float4gt float4in float4larger float4le
+syn keyword sqlFunction contained float4lt float4mi float4mul float4ne float4out float4pl float4recv
+syn keyword sqlFunction contained float4send float4smaller float4um float4up float8 float84div
+syn keyword sqlFunction contained float84eq float84ge float84gt float84le float84lt float84mi float84mul
+syn keyword sqlFunction contained float84ne float84pl float8_accum float8_avg float8_combine
+syn keyword sqlFunction contained float8_corr float8_covar_pop float8_covar_samp float8_regr_accum
+syn keyword sqlFunction contained float8_regr_avgx float8_regr_avgy float8_regr_combine
+syn keyword sqlFunction contained float8_regr_intercept float8_regr_r2 float8_regr_slope float8_regr_sxx
+syn keyword sqlFunction contained float8_regr_sxy float8_regr_syy float8_stddev_pop
+syn keyword sqlFunction contained float8_stddev_samp float8_var_pop float8_var_samp float8abs float8div float8eq
+syn keyword sqlFunction contained float8ge float8gt float8in float8larger float8le float8lt float8mi
+syn keyword sqlFunction contained float8mul float8ne float8out float8pl float8recv float8send
+syn keyword sqlFunction contained float8smaller float8um float8up floor flt4_mul_cash flt8_mul_cash
+syn keyword sqlFunction contained fmgr_c_validator fmgr_internal_validator fmgr_sql_validator format
+syn keyword sqlFunction contained format_type gb18030_to_utf8 gbk_to_utf8 gcd gen_random_uuid
+syn keyword sqlFunction contained generate_series generate_series_int4_support
+syn keyword sqlFunction contained generate_series_int8_support generate_subscripts get_bit get_byte
+syn keyword sqlFunction contained get_current_ts_config getdatabaseencoding getpgusername gin_clean_pending_list
+syn keyword sqlFunction contained gin_cmp_prefix gin_cmp_tslexeme gin_compare_jsonb
+syn keyword sqlFunction contained gin_consistent_jsonb gin_consistent_jsonb_path gin_extract_jsonb
+syn keyword sqlFunction contained gin_extract_jsonb_path gin_extract_jsonb_query
+syn keyword sqlFunction contained gin_extract_jsonb_query_path gin_extract_tsquery gin_extract_tsvector
+syn keyword sqlFunction contained gin_triconsistent_jsonb gin_triconsistent_jsonb_path gin_tsquery_consistent
+syn keyword sqlFunction contained gin_tsquery_triconsistent ginarrayconsistent ginarrayextract
+syn keyword sqlFunction contained ginarraytriconsistent ginhandler ginqueryarrayextract
+syn keyword sqlFunction contained gist_box_consistent gist_box_distance gist_box_penalty gist_box_picksplit
+syn keyword sqlFunction contained gist_box_same gist_box_union gist_circle_compress
+syn keyword sqlFunction contained gist_circle_consistent gist_circle_distance gist_point_compress
+syn keyword sqlFunction contained gist_point_consistent gist_point_distance gist_point_fetch
+syn keyword sqlFunction contained gist_point_sortsupport gist_poly_compress gist_poly_consistent
 syn keyword sqlFunction contained gist_poly_distance gisthandler gtsquery_compress gtsquery_consistent
-syn keyword sqlFunction contained gtsquery_penalty gtsquery_picksplit gtsquery_same
-syn keyword sqlFunction contained gtsquery_union gtsvector_compress gtsvector_consistent gtsvector_decompress
+syn keyword sqlFunction contained gtsquery_penalty gtsquery_picksplit gtsquery_same gtsquery_union
+syn keyword sqlFunction contained gtsvector_compress gtsvector_consistent gtsvector_decompress
 syn keyword sqlFunction contained gtsvector_options gtsvector_penalty gtsvector_picksplit
 syn keyword sqlFunction contained gtsvector_same gtsvector_union gtsvectorin gtsvectorout
 syn keyword sqlFunction contained has_any_column_privilege has_column_privilege has_database_privilege
 syn keyword sqlFunction contained has_foreign_data_wrapper_privilege has_function_privilege
 syn keyword sqlFunction contained has_language_privilege has_schema_privilege has_sequence_privilege
 syn keyword sqlFunction contained has_server_privilege has_table_privilege has_tablespace_privilege
-syn keyword sqlFunction contained has_type_privilege hash_aclitem hash_aclitem_extended
-syn keyword sqlFunction contained hash_array hash_array_extended hash_numeric hash_numeric_extended
-syn keyword sqlFunction contained hash_range hash_range_extended hashbpchar hashbpcharextended
+syn keyword sqlFunction contained has_type_privilege hash_aclitem hash_aclitem_extended hash_array
+syn keyword sqlFunction contained hash_array_extended hash_multirange hash_multirange_extended
+syn keyword sqlFunction contained hash_numeric hash_numeric_extended hash_range hash_range_extended
+syn keyword sqlFunction contained hash_record hash_record_extended hashbpchar hashbpcharextended
 syn keyword sqlFunction contained hashchar hashcharextended hashenum hashenumextended hashfloat4
-syn keyword sqlFunction contained hashfloat4extended hashfloat8 hashfloat8extended hashhandler hashinet
-syn keyword sqlFunction contained hashinetextended hashint2 hashint2extended hashint4
+syn keyword sqlFunction contained hashfloat4extended hashfloat8 hashfloat8extended hashhandler
+syn keyword sqlFunction contained hashinet hashinetextended hashint2 hashint2extended hashint4
 syn keyword sqlFunction contained hashint4extended hashint8 hashint8extended hashmacaddr hashmacaddr8
-syn keyword sqlFunction contained hashmacaddr8extended hashmacaddrextended hashname hashnameextended
-syn keyword sqlFunction contained hashoid hashoidextended hashoidvector hashoidvectorextended hashtext
-syn keyword sqlFunction contained hashtextextended hashtid hashtidextended hashvarlena
+syn keyword sqlFunction contained hashmacaddr8extended hashmacaddrextended hashname
+syn keyword sqlFunction contained hashnameextended hashoid hashoidextended hashoidvector hashoidvectorextended
+syn keyword sqlFunction contained hashtext hashtextextended hashtid hashtidextended hashvarlena
 syn keyword sqlFunction contained hashvarlenaextended heap_tableam_handler height host hostmask
 syn keyword sqlFunction contained iclikejoinsel iclikesel icnlikejoinsel icnlikesel icregexeqjoinsel
-syn keyword sqlFunction contained icregexeqsel icregexnejoinsel icregexnesel in_range index_am_handler_in
-syn keyword sqlFunction contained index_am_handler_out inet_client_addr inet_client_port
+syn keyword sqlFunction contained icregexeqsel icregexnejoinsel icregexnesel in_range
+syn keyword sqlFunction contained index_am_handler_in index_am_handler_out inet_client_addr inet_client_port
 syn keyword sqlFunction contained inet_gist_compress inet_gist_consistent inet_gist_fetch
-syn keyword sqlFunction contained inet_gist_penalty inet_gist_picksplit inet_gist_same inet_gist_union inet_in
-syn keyword sqlFunction contained inet_merge inet_out inet_recv inet_same_family inet_send
-syn keyword sqlFunction contained inet_server_addr inet_server_port inet_spg_choose inet_spg_config
-syn keyword sqlFunction contained inet_spg_inner_consistent inet_spg_leaf_consistent
-syn keyword sqlFunction contained inet_spg_picksplit inetand inetmi inetmi_int8 inetnot inetor inetpl initcap int2
-syn keyword sqlFunction contained int24div int24eq int24ge int24gt int24le int24lt int24mi int24mul
-syn keyword sqlFunction contained int24ne int24pl int28div int28eq int28ge int28gt int28le int28lt
-syn keyword sqlFunction contained int28mi int28mul int28ne int28pl int2_accum int2_accum_inv
-syn keyword sqlFunction contained int2_avg_accum int2_avg_accum_inv int2_mul_cash int2_sum int2abs int2and
-syn keyword sqlFunction contained int2div int2eq int2ge int2gt int2in int2int4_sum int2larger int2le
-syn keyword sqlFunction contained int2lt int2mi int2mod int2mul int2ne int2not int2or int2out int2pl
-syn keyword sqlFunction contained int2recv int2send int2shl int2shr int2smaller int2um int2up
-syn keyword sqlFunction contained int2vectorin int2vectorout int2vectorrecv int2vectorsend int2xor int4
-syn keyword sqlFunction contained int42div int42eq int42ge int42gt int42le int42lt int42mi int42mul
-syn keyword sqlFunction contained int42ne int42pl int48div int48eq int48ge int48gt int48le int48lt int48mi
-syn keyword sqlFunction contained int48mul int48ne int48pl int4_accum int4_accum_inv int4_avg_accum
-syn keyword sqlFunction contained int4_avg_accum_inv int4_avg_combine int4_mul_cash int4_sum
-syn keyword sqlFunction contained int4abs int4and int4div int4eq int4ge int4gt int4in int4inc int4larger
-syn keyword sqlFunction contained int4le int4lt int4mi int4mod int4mul int4ne int4not int4or int4out
-syn keyword sqlFunction contained int4pl int4range int4range_canonical int4range_subdiff int4recv
-syn keyword sqlFunction contained int4send int4shl int4shr int4smaller int4um int4up int4xor int8
-syn keyword sqlFunction contained int82div int82eq int82ge int82gt int82le int82lt int82mi int82mul
-syn keyword sqlFunction contained int82ne int82pl int84div int84eq int84ge int84gt int84le int84lt int84mi
-syn keyword sqlFunction contained int84mul int84ne int84pl int8_accum int8_accum_inv int8_avg
-syn keyword sqlFunction contained int8_avg_accum int8_avg_accum_inv int8_avg_combine
-syn keyword sqlFunction contained int8_avg_deserialize int8_avg_serialize int8_mul_cash int8_sum int8abs int8and
-syn keyword sqlFunction contained int8dec int8dec_any int8div int8eq int8ge int8gt int8in int8inc
-syn keyword sqlFunction contained int8inc_any int8inc_float8_float8 int8larger int8le int8lt int8mi
-syn keyword sqlFunction contained int8mod int8mul int8ne int8not int8or int8out int8pl int8pl_inet
-syn keyword sqlFunction contained int8range int8range_canonical int8range_subdiff int8recv int8send
-syn keyword sqlFunction contained int8shl int8shr int8smaller int8um int8up int8xor integer_pl_date
-syn keyword sqlFunction contained inter_lb inter_sb inter_sl internal_in internal_out interval
-syn keyword sqlFunction contained interval_accum interval_accum_inv interval_avg interval_cmp
-syn keyword sqlFunction contained interval_combine interval_div interval_eq interval_ge interval_gt
-syn keyword sqlFunction contained interval_hash interval_hash_extended interval_in interval_larger
-syn keyword sqlFunction contained interval_le interval_lt interval_mi interval_mul interval_ne
-syn keyword sqlFunction contained interval_out interval_pl interval_pl_date interval_pl_time
-syn keyword sqlFunction contained interval_pl_timestamp interval_pl_timestamptz interval_pl_timetz
-syn keyword sqlFunction contained interval_recv interval_send interval_smaller interval_support interval_um
-syn keyword sqlFunction contained intervaltypmodin intervaltypmodout is_normalized isclosed isempty
-syn keyword sqlFunction contained isfinite ishorizontal iso8859_1_to_utf8 iso8859_to_utf8
-syn keyword sqlFunction contained iso_to_koi8r iso_to_mic iso_to_win1251 iso_to_win866 isopen isparallel
-syn keyword sqlFunction contained isperp isvertical johab_to_utf8 json_agg json_agg_finalfn
-syn keyword sqlFunction contained json_agg_transfn json_array_element json_array_element_text
-syn keyword sqlFunction contained json_array_elements json_array_elements_text json_array_length
-syn keyword sqlFunction contained json_build_array json_build_object json_each json_each_text
-syn keyword sqlFunction contained json_extract_path json_extract_path_text json_in json_object
-syn keyword sqlFunction contained json_object_agg json_object_agg_finalfn json_object_agg_transfn
-syn keyword sqlFunction contained json_object_field json_object_field_text json_object_keys json_out
-syn keyword sqlFunction contained json_populate_record json_populate_recordset json_recv json_send
-syn keyword sqlFunction contained json_strip_nulls json_to_record json_to_recordset json_to_tsvector
-syn keyword sqlFunction contained json_typeof jsonb_agg jsonb_agg_finalfn jsonb_agg_transfn
-syn keyword sqlFunction contained jsonb_array_element jsonb_array_element_text jsonb_array_elements
-syn keyword sqlFunction contained jsonb_array_elements_text jsonb_array_length jsonb_build_array
-syn keyword sqlFunction contained jsonb_build_object jsonb_cmp jsonb_concat jsonb_contained
-syn keyword sqlFunction contained jsonb_contains jsonb_delete jsonb_delete_path jsonb_each
-syn keyword sqlFunction contained jsonb_each_text jsonb_eq jsonb_exists jsonb_exists_all jsonb_exists_any
-syn keyword sqlFunction contained jsonb_extract_path jsonb_extract_path_text jsonb_ge jsonb_gt
-syn keyword sqlFunction contained jsonb_hash jsonb_hash_extended jsonb_in jsonb_insert jsonb_le jsonb_lt
-syn keyword sqlFunction contained jsonb_ne jsonb_object jsonb_object_agg
-syn keyword sqlFunction contained jsonb_object_agg_finalfn jsonb_object_agg_transfn jsonb_object_field
-syn keyword sqlFunction contained jsonb_object_field_text jsonb_object_keys jsonb_out jsonb_path_exists
-syn keyword sqlFunction contained jsonb_path_exists_opr jsonb_path_exists_tz jsonb_path_match
-syn keyword sqlFunction contained jsonb_path_match_opr jsonb_path_match_tz jsonb_path_query
-syn keyword sqlFunction contained jsonb_path_query_array jsonb_path_query_array_tz jsonb_path_query_first
-syn keyword sqlFunction contained jsonb_path_query_first_tz jsonb_path_query_tz
-syn keyword sqlFunction contained jsonb_populate_record jsonb_populate_recordset jsonb_pretty jsonb_recv jsonb_send
-syn keyword sqlFunction contained jsonb_set jsonb_set_lax jsonb_strip_nulls jsonb_to_record
+syn keyword sqlFunction contained inet_gist_penalty inet_gist_picksplit inet_gist_same inet_gist_union
+syn keyword sqlFunction contained inet_in inet_merge inet_out inet_recv inet_same_family inet_send
+syn keyword sqlFunction contained inet_server_addr inet_server_port inet_spg_choose
+syn keyword sqlFunction contained inet_spg_config inet_spg_inner_consistent inet_spg_leaf_consistent
+syn keyword sqlFunction contained inet_spg_picksplit inetand inetmi inetmi_int8 inetnot inetor inetpl initcap
+syn keyword sqlFunction contained int2 int24div int24eq int24ge int24gt int24le int24lt int24mi
+syn keyword sqlFunction contained int24mul int24ne int24pl int28div int28eq int28ge int28gt int28le
+syn keyword sqlFunction contained int28lt int28mi int28mul int28ne int28pl int2_accum int2_accum_inv
+syn keyword sqlFunction contained int2_avg_accum int2_avg_accum_inv int2_mul_cash int2_sum int2abs
+syn keyword sqlFunction contained int2and int2div int2eq int2ge int2gt int2in int2int4_sum int2larger
+syn keyword sqlFunction contained int2le int2lt int2mi int2mod int2mul int2ne int2not int2or int2out
+syn keyword sqlFunction contained int2pl int2recv int2send int2shl int2shr int2smaller int2um int2up
+syn keyword sqlFunction contained int2vectorin int2vectorout int2vectorrecv int2vectorsend int2xor
+syn keyword sqlFunction contained int4 int42div int42eq int42ge int42gt int42le int42lt int42mi int42mul
+syn keyword sqlFunction contained int42ne int42pl int48div int48eq int48ge int48gt int48le int48lt
+syn keyword sqlFunction contained int48mi int48mul int48ne int48pl int4_accum int4_accum_inv
+syn keyword sqlFunction contained int4_avg_accum int4_avg_accum_inv int4_avg_combine int4_mul_cash
+syn keyword sqlFunction contained int4_sum int4abs int4and int4div int4eq int4ge int4gt int4in int4inc
+syn keyword sqlFunction contained int4larger int4le int4lt int4mi int4mod int4mul int4multirange int4ne
+syn keyword sqlFunction contained int4not int4or int4out int4pl int4range int4range_canonical
+syn keyword sqlFunction contained int4range_subdiff int4recv int4send int4shl int4shr int4smaller int4um
+syn keyword sqlFunction contained int4up int4xor int8 int82div int82eq int82ge int82gt int82le int82lt
+syn keyword sqlFunction contained int82mi int82mul int82ne int82pl int84div int84eq int84ge int84gt
+syn keyword sqlFunction contained int84le int84lt int84mi int84mul int84ne int84pl int8_accum
+syn keyword sqlFunction contained int8_accum_inv int8_avg int8_avg_accum int8_avg_accum_inv
+syn keyword sqlFunction contained int8_avg_combine int8_avg_deserialize int8_avg_serialize int8_mul_cash
+syn keyword sqlFunction contained int8_sum int8abs int8and int8dec int8dec_any int8div int8eq int8ge
+syn keyword sqlFunction contained int8gt int8in int8inc int8inc_any int8inc_float8_float8 int8larger
+syn keyword sqlFunction contained int8le int8lt int8mi int8mod int8mul int8multirange int8ne int8not
+syn keyword sqlFunction contained int8or int8out int8pl int8pl_inet int8range int8range_canonical
+syn keyword sqlFunction contained int8range_subdiff int8recv int8send int8shl int8shr int8smaller
+syn keyword sqlFunction contained int8um int8up int8xor integer_pl_date inter_lb inter_sb inter_sl
+syn keyword sqlFunction contained internal_in internal_out interval interval_accum interval_accum_inv
+syn keyword sqlFunction contained interval_avg interval_cmp interval_combine interval_div
+syn keyword sqlFunction contained interval_eq interval_ge interval_gt interval_hash interval_hash_extended
+syn keyword sqlFunction contained interval_in interval_larger interval_le interval_lt interval_mi
+syn keyword sqlFunction contained interval_mul interval_ne interval_out interval_pl
+syn keyword sqlFunction contained interval_pl_date interval_pl_time interval_pl_timestamp
+syn keyword sqlFunction contained interval_pl_timestamptz interval_pl_timetz interval_recv interval_send
+syn keyword sqlFunction contained interval_smaller interval_support interval_um intervaltypmodin
+syn keyword sqlFunction contained intervaltypmodout is_normalized isclosed isempty isfinite ishorizontal
+syn keyword sqlFunction contained iso8859_1_to_utf8 iso8859_to_utf8 iso_to_koi8r iso_to_mic
+syn keyword sqlFunction contained iso_to_win1251 iso_to_win866 isopen isparallel isperp isvertical
+syn keyword sqlFunction contained johab_to_utf8 json_agg json_agg_finalfn json_agg_transfn
+syn keyword sqlFunction contained json_array_element json_array_element_text json_array_elements
+syn keyword sqlFunction contained json_array_elements_text json_array_length json_build_array json_build_object
+syn keyword sqlFunction contained json_each json_each_text json_extract_path
+syn keyword sqlFunction contained json_extract_path_text json_in json_object json_object_agg json_object_agg_finalfn
+syn keyword sqlFunction contained json_object_agg_transfn json_object_field
+syn keyword sqlFunction contained json_object_field_text json_object_keys json_out json_populate_record
+syn keyword sqlFunction contained json_populate_recordset json_recv json_send json_strip_nulls json_to_record
+syn keyword sqlFunction contained json_to_recordset json_to_tsvector json_typeof jsonb_agg
+syn keyword sqlFunction contained jsonb_agg_finalfn jsonb_agg_transfn jsonb_array_element
+syn keyword sqlFunction contained jsonb_array_element_text jsonb_array_elements jsonb_array_elements_text
+syn keyword sqlFunction contained jsonb_array_length jsonb_build_array jsonb_build_object
+syn keyword sqlFunction contained jsonb_cmp jsonb_concat jsonb_contained jsonb_contains jsonb_delete
+syn keyword sqlFunction contained jsonb_delete_path jsonb_each jsonb_each_text jsonb_eq jsonb_exists
+syn keyword sqlFunction contained jsonb_exists_all jsonb_exists_any jsonb_extract_path
+syn keyword sqlFunction contained jsonb_extract_path_text jsonb_ge jsonb_gt jsonb_hash jsonb_hash_extended
+syn keyword sqlFunction contained jsonb_in jsonb_insert jsonb_le jsonb_lt jsonb_ne jsonb_object
+syn keyword sqlFunction contained jsonb_object_agg jsonb_object_agg_finalfn jsonb_object_agg_transfn
+syn keyword sqlFunction contained jsonb_object_field jsonb_object_field_text jsonb_object_keys
+syn keyword sqlFunction contained jsonb_out jsonb_path_exists jsonb_path_exists_opr
+syn keyword sqlFunction contained jsonb_path_exists_tz jsonb_path_match jsonb_path_match_opr
+syn keyword sqlFunction contained jsonb_path_match_tz jsonb_path_query jsonb_path_query_array
+syn keyword sqlFunction contained jsonb_path_query_array_tz jsonb_path_query_first jsonb_path_query_first_tz
+syn keyword sqlFunction contained jsonb_path_query_tz jsonb_populate_record jsonb_populate_recordset
+syn keyword sqlFunction contained jsonb_pretty jsonb_recv jsonb_send jsonb_set jsonb_set_lax
+syn keyword sqlFunction contained jsonb_strip_nulls jsonb_subscript_handler jsonb_to_record
 syn keyword sqlFunction contained jsonb_to_recordset jsonb_to_tsvector jsonb_typeof jsonpath_in
 syn keyword sqlFunction contained jsonpath_out jsonpath_recv jsonpath_send justify_days justify_hours
 syn keyword sqlFunction contained justify_interval koi8r_to_iso koi8r_to_mic koi8r_to_utf8
 syn keyword sqlFunction contained koi8r_to_win1251 koi8r_to_win866 koi8u_to_utf8 lag language_handler_in
-syn keyword sqlFunction contained language_handler_out last_value lastval latin1_to_mic
-syn keyword sqlFunction contained latin2_to_mic latin2_to_win1250 latin3_to_mic latin4_to_mic lcm lead left
-syn keyword sqlFunction contained length like like_escape likejoinsel likesel line line_distance line_eq
+syn keyword sqlFunction contained language_handler_out last_value lastval latin1_to_mic latin2_to_mic
+syn keyword sqlFunction contained latin2_to_win1250 latin3_to_mic latin4_to_mic lcm lead left length
+syn keyword sqlFunction contained like like_escape likejoinsel likesel line line_distance line_eq
 syn keyword sqlFunction contained line_horizontal line_in line_interpt line_intersect line_out
-syn keyword sqlFunction contained line_parallel line_perp line_recv line_send line_vertical ln
-syn keyword sqlFunction contained lo_close lo_creat lo_create lo_export lo_from_bytea lo_get lo_import
+syn keyword sqlFunction contained line_parallel line_perp line_recv line_send line_vertical ln lo_close
+syn keyword sqlFunction contained lo_creat lo_create lo_export lo_from_bytea lo_get lo_import
 syn keyword sqlFunction contained lo_lseek lo_lseek64 lo_open lo_put lo_tell lo_tell64 lo_truncate
-syn keyword sqlFunction contained lo_truncate64 lo_unlink log log10 loread lower lower_inc lower_inf
-syn keyword sqlFunction contained lowrite lpad lseg lseg_center lseg_distance lseg_eq lseg_ge lseg_gt
+syn keyword sqlFunction contained lo_truncate64 lo_unlink log log10 loread lower lower_inc lower_inf lowrite
+syn keyword sqlFunction contained lpad lseg lseg_center lseg_distance lseg_eq lseg_ge lseg_gt
 syn keyword sqlFunction contained lseg_horizontal lseg_in lseg_interpt lseg_intersect lseg_le
 syn keyword sqlFunction contained lseg_length lseg_lt lseg_ne lseg_out lseg_parallel lseg_perp lseg_recv
 syn keyword sqlFunction contained lseg_send lseg_vertical ltrim macaddr macaddr8 macaddr8_and
@@ -392,65 +415,79 @@ syn keyword sqlFunction contained macaddr8_lt macaddr8_ne macaddr8_not macaddr8_
 syn keyword sqlFunction contained macaddr8_recv macaddr8_send macaddr8_set7bit macaddr_and
 syn keyword sqlFunction contained macaddr_cmp macaddr_eq macaddr_ge macaddr_gt macaddr_in macaddr_le
 syn keyword sqlFunction contained macaddr_lt macaddr_ne macaddr_not macaddr_or macaddr_out macaddr_recv
-syn keyword sqlFunction contained macaddr_send macaddr_sortsupport make_date make_interval
-syn keyword sqlFunction contained make_time make_timestamp make_timestamptz makeaclitem masklen
-syn keyword sqlFunction contained matchingjoinsel matchingsel max md5 mic_to_big5 mic_to_euc_cn
-syn keyword sqlFunction contained mic_to_euc_jp mic_to_euc_kr mic_to_euc_tw mic_to_iso mic_to_koi8r
+syn keyword sqlFunction contained macaddr_send macaddr_sortsupport make_date make_interval make_time
+syn keyword sqlFunction contained make_timestamp make_timestamptz makeaclitem masklen
+syn keyword sqlFunction contained matchingjoinsel matchingsel max md5 mic_to_big5 mic_to_euc_cn mic_to_euc_jp
+syn keyword sqlFunction contained mic_to_euc_kr mic_to_euc_tw mic_to_iso mic_to_koi8r
 syn keyword sqlFunction contained mic_to_latin1 mic_to_latin2 mic_to_latin3 mic_to_latin4 mic_to_sjis
 syn keyword sqlFunction contained mic_to_win1250 mic_to_win1251 mic_to_win866 min min_scale mod mode
-syn keyword sqlFunction contained mode_final money mul_d_interval mxid_age name nameconcatoid nameeq
-syn keyword sqlFunction contained nameeqtext namege namegetext namegt namegttext nameiclike nameicnlike
-syn keyword sqlFunction contained nameicregexeq nameicregexne namein namele nameletext namelike
-syn keyword sqlFunction contained namelt namelttext namene namenetext namenlike nameout namerecv
-syn keyword sqlFunction contained nameregexeq nameregexne namesend neqjoinsel neqsel netmask network
-syn keyword sqlFunction contained network_cmp network_eq network_ge network_gt network_larger
-syn keyword sqlFunction contained network_le network_lt network_ne network_overlap network_smaller
-syn keyword sqlFunction contained network_sortsupport network_sub network_subeq network_subset_support
-syn keyword sqlFunction contained network_sup network_supeq networkjoinsel networksel nextval
-syn keyword sqlFunction contained nlikejoinsel nlikesel normalize notlike now npoints nth_value ntile
-syn keyword sqlFunction contained num_nonnulls num_nulls numeric numeric_abs numeric_accum
-syn keyword sqlFunction contained numeric_accum_inv numeric_add numeric_avg numeric_avg_accum
-syn keyword sqlFunction contained numeric_avg_combine numeric_avg_deserialize numeric_avg_serialize numeric_cmp
-syn keyword sqlFunction contained numeric_combine numeric_deserialize numeric_div
-syn keyword sqlFunction contained numeric_div_trunc numeric_eq numeric_exp numeric_fac numeric_ge numeric_gt
-syn keyword sqlFunction contained numeric_in numeric_inc numeric_larger numeric_le numeric_ln
-syn keyword sqlFunction contained numeric_log numeric_lt numeric_mod numeric_mul numeric_ne numeric_out
-syn keyword sqlFunction contained numeric_poly_avg numeric_poly_combine numeric_poly_deserialize
-syn keyword sqlFunction contained numeric_poly_serialize numeric_poly_stddev_pop
-syn keyword sqlFunction contained numeric_poly_stddev_samp numeric_poly_sum numeric_poly_var_pop
-syn keyword sqlFunction contained numeric_poly_var_samp numeric_power numeric_recv numeric_send
-syn keyword sqlFunction contained numeric_serialize numeric_smaller numeric_sortsupport numeric_sqrt
-syn keyword sqlFunction contained numeric_stddev_pop numeric_stddev_samp numeric_sub numeric_sum
-syn keyword sqlFunction contained numeric_support numeric_uminus numeric_uplus numeric_var_pop
-syn keyword sqlFunction contained numeric_var_samp numerictypmodin numerictypmodout numnode numrange
-syn keyword sqlFunction contained numrange_subdiff obj_description octet_length oid oideq oidge oidgt oidin
-syn keyword sqlFunction contained oidlarger oidle oidlt oidne oidout oidrecv oidsend oidsmaller
-syn keyword sqlFunction contained oidvectoreq oidvectorge oidvectorgt oidvectorin oidvectorle oidvectorlt
-syn keyword sqlFunction contained oidvectorne oidvectorout oidvectorrecv oidvectorsend
-syn keyword sqlFunction contained oidvectortypes on_pb on_pl on_ppath on_ps on_sb on_sl ordered_set_transition
-syn keyword sqlFunction contained ordered_set_transition_multi overlaps overlay parse_ident path
-syn keyword sqlFunction contained path_add path_add_pt path_center path_contain_pt path_distance
-syn keyword sqlFunction contained path_div_pt path_in path_inter path_length path_mul_pt path_n_eq
-syn keyword sqlFunction contained path_n_ge path_n_gt path_n_le path_n_lt path_npoints path_out
-syn keyword sqlFunction contained path_recv path_send path_sub_pt pclose percent_rank percent_rank_final
-syn keyword sqlFunction contained percentile_cont percentile_cont_float8_final
-syn keyword sqlFunction contained percentile_cont_float8_multi_final percentile_cont_interval_final
-syn keyword sqlFunction contained percentile_cont_interval_multi_final percentile_disc
-syn keyword sqlFunction contained percentile_disc_final percentile_disc_multi_final pg_advisory_lock
-syn keyword sqlFunction contained pg_advisory_lock_shared pg_advisory_unlock pg_advisory_unlock_all
-syn keyword sqlFunction contained pg_advisory_unlock_shared pg_advisory_xact_lock
-syn keyword sqlFunction contained pg_advisory_xact_lock_shared pg_available_extension_versions pg_available_extensions
-syn keyword sqlFunction contained pg_backend_pid pg_backup_start_time pg_blocking_pids
-syn keyword sqlFunction contained pg_cancel_backend pg_char_to_encoding pg_client_encoding
-syn keyword sqlFunction contained pg_collation_actual_version pg_collation_for pg_collation_is_visible
+syn keyword sqlFunction contained mode_final money mul_d_interval multirange
+syn keyword sqlFunction contained multirange_adjacent_multirange multirange_adjacent_range multirange_after_multirange
+syn keyword sqlFunction contained multirange_after_range multirange_before_multirange
+syn keyword sqlFunction contained multirange_before_range multirange_cmp multirange_contained_by_multirange
+syn keyword sqlFunction contained multirange_contained_by_range multirange_contains_elem
+syn keyword sqlFunction contained multirange_contains_multirange multirange_contains_range
+syn keyword sqlFunction contained multirange_eq multirange_ge multirange_gist_compress
+syn keyword sqlFunction contained multirange_gist_consistent multirange_gt multirange_in multirange_intersect
+syn keyword sqlFunction contained multirange_intersect_agg_transfn multirange_le multirange_lt
+syn keyword sqlFunction contained multirange_minus multirange_ne multirange_out
+syn keyword sqlFunction contained multirange_overlaps_multirange multirange_overlaps_range
+syn keyword sqlFunction contained multirange_overleft_multirange multirange_overleft_range multirange_overright_multirange
+syn keyword sqlFunction contained multirange_overright_range multirange_recv multirange_send
+syn keyword sqlFunction contained multirange_typanalyze multirange_union multirangesel mxid_age name
+syn keyword sqlFunction contained nameconcatoid nameeq nameeqtext namege namegetext namegt
+syn keyword sqlFunction contained namegttext nameiclike nameicnlike nameicregexeq nameicregexne namein
+syn keyword sqlFunction contained namele nameletext namelike namelt namelttext namene namenetext
+syn keyword sqlFunction contained namenlike nameout namerecv nameregexeq nameregexne namesend neqjoinsel
+syn keyword sqlFunction contained neqsel netmask network network_cmp network_eq network_ge network_gt
+syn keyword sqlFunction contained network_larger network_le network_lt network_ne network_overlap
+syn keyword sqlFunction contained network_smaller network_sortsupport network_sub network_subeq
+syn keyword sqlFunction contained network_subset_support network_sup network_supeq networkjoinsel
+syn keyword sqlFunction contained networksel nextval nlikejoinsel nlikesel normalize notlike now
+syn keyword sqlFunction contained npoints nth_value ntile num_nonnulls num_nulls numeric numeric_abs
+syn keyword sqlFunction contained numeric_accum numeric_accum_inv numeric_add numeric_avg
+syn keyword sqlFunction contained numeric_avg_accum numeric_avg_combine numeric_avg_deserialize
+syn keyword sqlFunction contained numeric_avg_serialize numeric_cmp numeric_combine numeric_deserialize
+syn keyword sqlFunction contained numeric_div numeric_div_trunc numeric_eq numeric_exp numeric_ge
+syn keyword sqlFunction contained numeric_gt numeric_in numeric_inc numeric_larger numeric_le
+syn keyword sqlFunction contained numeric_ln numeric_log numeric_lt numeric_mod numeric_mul numeric_ne
+syn keyword sqlFunction contained numeric_out numeric_pl_pg_lsn numeric_poly_avg
+syn keyword sqlFunction contained numeric_poly_combine numeric_poly_deserialize numeric_poly_serialize
+syn keyword sqlFunction contained numeric_poly_stddev_pop numeric_poly_stddev_samp numeric_poly_sum
+syn keyword sqlFunction contained numeric_poly_var_pop numeric_poly_var_samp numeric_power numeric_recv
+syn keyword sqlFunction contained numeric_send numeric_serialize numeric_smaller
+syn keyword sqlFunction contained numeric_sortsupport numeric_sqrt numeric_stddev_pop numeric_stddev_samp
+syn keyword sqlFunction contained numeric_sub numeric_sum numeric_support numeric_uminus numeric_uplus
+syn keyword sqlFunction contained numeric_var_pop numeric_var_samp numerictypmodin
+syn keyword sqlFunction contained numerictypmodout nummultirange numnode numrange numrange_subdiff
+syn keyword sqlFunction contained obj_description octet_length oid oideq oidge oidgt oidin oidlarger oidle oidlt
+syn keyword sqlFunction contained oidne oidout oidrecv oidsend oidsmaller oidvectoreq oidvectorge
+syn keyword sqlFunction contained oidvectorgt oidvectorin oidvectorle oidvectorlt oidvectorne
+syn keyword sqlFunction contained oidvectorout oidvectorrecv oidvectorsend oidvectortypes on_pb on_pl
+syn keyword sqlFunction contained on_ppath on_ps on_sb on_sl ordered_set_transition
+syn keyword sqlFunction contained ordered_set_transition_multi overlaps overlay parse_ident path path_add path_add_pt
+syn keyword sqlFunction contained path_center path_contain_pt path_distance path_div_pt path_in
+syn keyword sqlFunction contained path_inter path_length path_mul_pt path_n_eq path_n_ge path_n_gt
+syn keyword sqlFunction contained path_n_le path_n_lt path_npoints path_out path_recv path_send
+syn keyword sqlFunction contained path_sub_pt pclose percent_rank percent_rank_final percentile_cont
+syn keyword sqlFunction contained percentile_cont_float8_final percentile_cont_float8_multi_final
+syn keyword sqlFunction contained percentile_cont_interval_final
+syn keyword sqlFunction contained percentile_cont_interval_multi_final percentile_disc percentile_disc_final
+syn keyword sqlFunction contained percentile_disc_multi_final pg_advisory_lock pg_advisory_lock_shared
+syn keyword sqlFunction contained pg_advisory_unlock pg_advisory_unlock_all pg_advisory_unlock_shared
+syn keyword sqlFunction contained pg_advisory_xact_lock pg_advisory_xact_lock_shared
+syn keyword sqlFunction contained pg_available_extension_versions pg_available_extensions pg_backend_pid
+syn keyword sqlFunction contained pg_backup_start_time pg_blocking_pids pg_cancel_backend
+syn keyword sqlFunction contained pg_char_to_encoding pg_client_encoding pg_collation_actual_version
+syn keyword sqlFunction contained pg_collation_for pg_collation_is_visible pg_column_compression
 syn keyword sqlFunction contained pg_column_is_updatable pg_column_size pg_conf_load_time pg_config
 syn keyword sqlFunction contained pg_control_checkpoint pg_control_init pg_control_recovery
 syn keyword sqlFunction contained pg_control_system pg_conversion_is_visible
 syn keyword sqlFunction contained pg_copy_logical_replication_slot pg_copy_physical_replication_slot
 syn keyword sqlFunction contained pg_create_logical_replication_slot pg_create_physical_replication_slot
 syn keyword sqlFunction contained pg_create_restore_point pg_current_logfile pg_current_snapshot
-syn keyword sqlFunction contained pg_current_wal_flush_lsn pg_current_wal_insert_lsn pg_current_wal_lsn
-syn keyword sqlFunction contained pg_current_xact_id pg_current_xact_id_if_assigned pg_cursor
+syn keyword sqlFunction contained pg_current_wal_flush_lsn pg_current_wal_insert_lsn
+syn keyword sqlFunction contained pg_current_wal_lsn pg_current_xact_id pg_current_xact_id_if_assigned pg_cursor
 syn keyword sqlFunction contained pg_database_size pg_ddl_command_in pg_ddl_command_out
 syn keyword sqlFunction contained pg_ddl_command_recv pg_ddl_command_send pg_dependencies_in
 syn keyword sqlFunction contained pg_dependencies_out pg_dependencies_recv pg_dependencies_send
@@ -458,33 +495,37 @@ syn keyword sqlFunction contained pg_describe_object pg_drop_replication_slot pg
 syn keyword sqlFunction contained pg_encoding_to_char pg_event_trigger_ddl_commands
 syn keyword sqlFunction contained pg_event_trigger_dropped_objects pg_event_trigger_table_rewrite_oid
 syn keyword sqlFunction contained pg_event_trigger_table_rewrite_reason pg_export_snapshot
-syn keyword sqlFunction contained pg_extension_config_dump pg_extension_update_paths pg_file_rename pg_file_sync
-syn keyword sqlFunction contained pg_file_unlink pg_file_write pg_filenode_relation
-syn keyword sqlFunction contained pg_function_is_visible pg_get_constraintdef pg_get_expr
+syn keyword sqlFunction contained pg_extension_config_dump pg_extension_update_paths pg_file_rename
+syn keyword sqlFunction contained pg_file_sync pg_file_unlink pg_file_write pg_filenode_relation
+syn keyword sqlFunction contained pg_function_is_visible pg_get_backend_memory_contexts
+syn keyword sqlFunction contained pg_get_catalog_foreign_keys pg_get_constraintdef pg_get_expr
 syn keyword sqlFunction contained pg_get_function_arg_default pg_get_function_arguments
-syn keyword sqlFunction contained pg_get_function_identity_arguments pg_get_function_result pg_get_functiondef
-syn keyword sqlFunction contained pg_get_indexdef pg_get_keywords pg_get_multixact_members
-syn keyword sqlFunction contained pg_get_object_address pg_get_partition_constraintdef pg_get_partkeydef
-syn keyword sqlFunction contained pg_get_publication_tables pg_get_replica_identity_index
-syn keyword sqlFunction contained pg_get_replication_slots pg_get_ruledef pg_get_serial_sequence
-syn keyword sqlFunction contained pg_get_shmem_allocations pg_get_statisticsobjdef pg_get_triggerdef
-syn keyword sqlFunction contained pg_get_userbyid pg_get_viewdef pg_has_role pg_hba_file_rules
+syn keyword sqlFunction contained pg_get_function_identity_arguments pg_get_function_result pg_get_function_sqlbody
+syn keyword sqlFunction contained pg_get_functiondef pg_get_indexdef pg_get_keywords
+syn keyword sqlFunction contained pg_get_multixact_members pg_get_object_address pg_get_partition_constraintdef
+syn keyword sqlFunction contained pg_get_partkeydef pg_get_publication_tables
+syn keyword sqlFunction contained pg_get_replica_identity_index pg_get_replication_slots pg_get_ruledef
+syn keyword sqlFunction contained pg_get_serial_sequence pg_get_shmem_allocations pg_get_statisticsobjdef
+syn keyword sqlFunction contained pg_get_statisticsobjdef_columns
+syn keyword sqlFunction contained pg_get_statisticsobjdef_expressions pg_get_triggerdef pg_get_userbyid pg_get_viewdef
+syn keyword sqlFunction contained pg_get_wal_replay_pause_state pg_has_role pg_hba_file_rules
 syn keyword sqlFunction contained pg_identify_object pg_identify_object_as_address
 syn keyword sqlFunction contained pg_import_system_collations pg_index_column_has_property pg_index_has_property
 syn keyword sqlFunction contained pg_indexam_has_property pg_indexam_progress_phasename
-syn keyword sqlFunction contained pg_indexes_size pg_is_in_backup pg_is_in_recovery pg_is_other_temp_schema
-syn keyword sqlFunction contained pg_is_wal_replay_paused pg_isolation_test_session_is_blocked
-syn keyword sqlFunction contained pg_jit_available pg_last_committed_xact
+syn keyword sqlFunction contained pg_indexes_size pg_is_in_backup pg_is_in_recovery
+syn keyword sqlFunction contained pg_is_other_temp_schema pg_is_wal_replay_paused
+syn keyword sqlFunction contained pg_isolation_test_session_is_blocked pg_jit_available pg_last_committed_xact
 syn keyword sqlFunction contained pg_last_wal_receive_lsn pg_last_wal_replay_lsn pg_last_xact_replay_timestamp
-syn keyword sqlFunction contained pg_listening_channels pg_lock_status pg_logdir_ls
-syn keyword sqlFunction contained pg_logical_emit_message pg_logical_slot_get_binary_changes
-syn keyword sqlFunction contained pg_logical_slot_get_changes pg_logical_slot_peek_binary_changes
-syn keyword sqlFunction contained pg_logical_slot_peek_changes pg_ls_archive_statusdir pg_ls_dir pg_ls_logdir
-syn keyword sqlFunction contained pg_ls_tmpdir pg_ls_waldir pg_lsn_cmp pg_lsn_eq pg_lsn_ge pg_lsn_gt
-syn keyword sqlFunction contained pg_lsn_hash pg_lsn_hash_extended pg_lsn_in pg_lsn_larger
-syn keyword sqlFunction contained pg_lsn_le pg_lsn_lt pg_lsn_mi pg_lsn_ne pg_lsn_out pg_lsn_recv
-syn keyword sqlFunction contained pg_lsn_send pg_lsn_smaller pg_mcv_list_in pg_mcv_list_items
-syn keyword sqlFunction contained pg_mcv_list_out pg_mcv_list_recv pg_mcv_list_send pg_my_temp_schema
+syn keyword sqlFunction contained pg_listening_channels pg_lock_status
+syn keyword sqlFunction contained pg_log_backend_memory_contexts pg_logdir_ls pg_logical_emit_message
+syn keyword sqlFunction contained pg_logical_slot_get_binary_changes pg_logical_slot_get_changes
+syn keyword sqlFunction contained pg_logical_slot_peek_binary_changes pg_logical_slot_peek_changes
+syn keyword sqlFunction contained pg_ls_archive_statusdir pg_ls_dir pg_ls_logdir pg_ls_tmpdir pg_ls_waldir pg_lsn
+syn keyword sqlFunction contained pg_lsn_cmp pg_lsn_eq pg_lsn_ge pg_lsn_gt pg_lsn_hash
+syn keyword sqlFunction contained pg_lsn_hash_extended pg_lsn_in pg_lsn_larger pg_lsn_le pg_lsn_lt pg_lsn_mi
+syn keyword sqlFunction contained pg_lsn_mii pg_lsn_ne pg_lsn_out pg_lsn_pli pg_lsn_recv pg_lsn_send
+syn keyword sqlFunction contained pg_lsn_smaller pg_mcv_list_in pg_mcv_list_items pg_mcv_list_out
+syn keyword sqlFunction contained pg_mcv_list_recv pg_mcv_list_send pg_my_temp_schema
 syn keyword sqlFunction contained pg_ndistinct_in pg_ndistinct_out pg_ndistinct_recv pg_ndistinct_send
 syn keyword sqlFunction contained pg_nextoid pg_node_tree_in pg_node_tree_out pg_node_tree_recv
 syn keyword sqlFunction contained pg_node_tree_send pg_notification_queue_usage pg_notify
@@ -493,8 +534,8 @@ syn keyword sqlFunction contained pg_options_to_table pg_partition_ancestors pg_
 syn keyword sqlFunction contained pg_partition_tree pg_postmaster_start_time pg_prepared_statement
 syn keyword sqlFunction contained pg_prepared_xact pg_promote pg_read_binary_file pg_read_file
 syn keyword sqlFunction contained pg_read_file_old pg_relation_filenode pg_relation_filepath
-syn keyword sqlFunction contained pg_relation_is_publishable pg_relation_is_updatable
-syn keyword sqlFunction contained pg_relation_size pg_reload_conf pg_replication_origin_advance
+syn keyword sqlFunction contained pg_relation_is_publishable pg_relation_is_updatable pg_relation_size
+syn keyword sqlFunction contained pg_reload_conf pg_replication_origin_advance
 syn keyword sqlFunction contained pg_replication_origin_create pg_replication_origin_drop
 syn keyword sqlFunction contained pg_replication_origin_oid pg_replication_origin_progress
 syn keyword sqlFunction contained pg_replication_origin_session_is_setup pg_replication_origin_session_progress
@@ -520,205 +561,216 @@ syn keyword sqlFunction contained pg_stat_get_bgwriter_buf_written_checkpoints p
 syn keyword sqlFunction contained pg_stat_get_bgwriter_maxwritten_clean
 syn keyword sqlFunction contained pg_stat_get_bgwriter_requested_checkpoints pg_stat_get_bgwriter_stat_reset_time
 syn keyword sqlFunction contained pg_stat_get_bgwriter_timed_checkpoints pg_stat_get_blocks_fetched
-syn keyword sqlFunction contained pg_stat_get_blocks_hit pg_stat_get_buf_alloc
-syn keyword sqlFunction contained pg_stat_get_buf_fsync_backend pg_stat_get_buf_written_backend
+syn keyword sqlFunction contained pg_stat_get_blocks_hit pg_stat_get_buf_alloc pg_stat_get_buf_fsync_backend
+syn keyword sqlFunction contained pg_stat_get_buf_written_backend
 syn keyword sqlFunction contained pg_stat_get_checkpoint_sync_time pg_stat_get_checkpoint_write_time
-syn keyword sqlFunction contained pg_stat_get_db_blk_read_time pg_stat_get_db_blk_write_time
-syn keyword sqlFunction contained pg_stat_get_db_blocks_fetched pg_stat_get_db_blocks_hit
-syn keyword sqlFunction contained pg_stat_get_db_checksum_failures pg_stat_get_db_checksum_last_failure
-syn keyword sqlFunction contained pg_stat_get_db_conflict_all pg_stat_get_db_conflict_bufferpin
-syn keyword sqlFunction contained pg_stat_get_db_conflict_lock pg_stat_get_db_conflict_snapshot
-syn keyword sqlFunction contained pg_stat_get_db_conflict_startup_deadlock pg_stat_get_db_conflict_tablespace
-syn keyword sqlFunction contained pg_stat_get_db_deadlocks pg_stat_get_db_numbackends
-syn keyword sqlFunction contained pg_stat_get_db_stat_reset_time pg_stat_get_db_temp_bytes
-syn keyword sqlFunction contained pg_stat_get_db_temp_files pg_stat_get_db_tuples_deleted
-syn keyword sqlFunction contained pg_stat_get_db_tuples_fetched pg_stat_get_db_tuples_inserted
-syn keyword sqlFunction contained pg_stat_get_db_tuples_returned pg_stat_get_db_tuples_updated
-syn keyword sqlFunction contained pg_stat_get_db_xact_commit pg_stat_get_db_xact_rollback pg_stat_get_dead_tuples
-syn keyword sqlFunction contained pg_stat_get_function_calls pg_stat_get_function_self_time
-syn keyword sqlFunction contained pg_stat_get_function_total_time pg_stat_get_ins_since_vacuum
-syn keyword sqlFunction contained pg_stat_get_last_analyze_time pg_stat_get_last_autoanalyze_time
-syn keyword sqlFunction contained pg_stat_get_last_autovacuum_time pg_stat_get_last_vacuum_time
-syn keyword sqlFunction contained pg_stat_get_live_tuples pg_stat_get_mod_since_analyze
-syn keyword sqlFunction contained pg_stat_get_numscans pg_stat_get_progress_info pg_stat_get_slru
+syn keyword sqlFunction contained pg_stat_get_db_active_time pg_stat_get_db_blk_read_time
+syn keyword sqlFunction contained pg_stat_get_db_blk_write_time pg_stat_get_db_blocks_fetched pg_stat_get_db_blocks_hit
+syn keyword sqlFunction contained pg_stat_get_db_checksum_failures
+syn keyword sqlFunction contained pg_stat_get_db_checksum_last_failure pg_stat_get_db_conflict_all
+syn keyword sqlFunction contained pg_stat_get_db_conflict_bufferpin pg_stat_get_db_conflict_lock
+syn keyword sqlFunction contained pg_stat_get_db_conflict_snapshot pg_stat_get_db_conflict_startup_deadlock
+syn keyword sqlFunction contained pg_stat_get_db_conflict_tablespace pg_stat_get_db_deadlocks
+syn keyword sqlFunction contained pg_stat_get_db_idle_in_transaction_time pg_stat_get_db_numbackends
+syn keyword sqlFunction contained pg_stat_get_db_session_time pg_stat_get_db_sessions
+syn keyword sqlFunction contained pg_stat_get_db_sessions_abandoned pg_stat_get_db_sessions_fatal
+syn keyword sqlFunction contained pg_stat_get_db_sessions_killed pg_stat_get_db_stat_reset_time
+syn keyword sqlFunction contained pg_stat_get_db_temp_bytes pg_stat_get_db_temp_files
+syn keyword sqlFunction contained pg_stat_get_db_tuples_deleted pg_stat_get_db_tuples_fetched
+syn keyword sqlFunction contained pg_stat_get_db_tuples_inserted pg_stat_get_db_tuples_returned
+syn keyword sqlFunction contained pg_stat_get_db_tuples_updated pg_stat_get_db_xact_commit
+syn keyword sqlFunction contained pg_stat_get_db_xact_rollback pg_stat_get_dead_tuples pg_stat_get_function_calls
+syn keyword sqlFunction contained pg_stat_get_function_self_time pg_stat_get_function_total_time
+syn keyword sqlFunction contained pg_stat_get_ins_since_vacuum pg_stat_get_last_analyze_time
+syn keyword sqlFunction contained pg_stat_get_last_autoanalyze_time pg_stat_get_last_autovacuum_time
+syn keyword sqlFunction contained pg_stat_get_last_vacuum_time pg_stat_get_live_tuples
+syn keyword sqlFunction contained pg_stat_get_mod_since_analyze pg_stat_get_numscans
+syn keyword sqlFunction contained pg_stat_get_progress_info pg_stat_get_replication_slot pg_stat_get_slru
 syn keyword sqlFunction contained pg_stat_get_snapshot_timestamp pg_stat_get_subscription
 syn keyword sqlFunction contained pg_stat_get_tuples_deleted pg_stat_get_tuples_fetched
 syn keyword sqlFunction contained pg_stat_get_tuples_hot_updated pg_stat_get_tuples_inserted
 syn keyword sqlFunction contained pg_stat_get_tuples_returned pg_stat_get_tuples_updated pg_stat_get_vacuum_count
-syn keyword sqlFunction contained pg_stat_get_wal_receiver pg_stat_get_wal_senders
+syn keyword sqlFunction contained pg_stat_get_wal pg_stat_get_wal_receiver pg_stat_get_wal_senders
 syn keyword sqlFunction contained pg_stat_get_xact_blocks_fetched pg_stat_get_xact_blocks_hit
-syn keyword sqlFunction contained pg_stat_get_xact_function_calls pg_stat_get_xact_function_self_time
-syn keyword sqlFunction contained pg_stat_get_xact_function_total_time pg_stat_get_xact_numscans
-syn keyword sqlFunction contained pg_stat_get_xact_tuples_deleted pg_stat_get_xact_tuples_fetched
-syn keyword sqlFunction contained pg_stat_get_xact_tuples_hot_updated
+syn keyword sqlFunction contained pg_stat_get_xact_function_calls
+syn keyword sqlFunction contained pg_stat_get_xact_function_self_time pg_stat_get_xact_function_total_time
+syn keyword sqlFunction contained pg_stat_get_xact_numscans pg_stat_get_xact_tuples_deleted
+syn keyword sqlFunction contained pg_stat_get_xact_tuples_fetched pg_stat_get_xact_tuples_hot_updated
 syn keyword sqlFunction contained pg_stat_get_xact_tuples_inserted pg_stat_get_xact_tuples_returned
-syn keyword sqlFunction contained pg_stat_get_xact_tuples_updated pg_stat_reset pg_stat_reset_shared
-syn keyword sqlFunction contained pg_stat_reset_single_function_counters pg_stat_reset_single_table_counters
-syn keyword sqlFunction contained pg_stat_reset_slru pg_statistics_obj_is_visible pg_stop_backup
-syn keyword sqlFunction contained pg_switch_wal pg_table_is_visible pg_table_size
-syn keyword sqlFunction contained pg_tablespace_databases pg_tablespace_location pg_tablespace_size
-syn keyword sqlFunction contained pg_terminate_backend pg_timezone_abbrevs pg_timezone_names
-syn keyword sqlFunction contained pg_total_relation_size pg_trigger_depth pg_try_advisory_lock
-syn keyword sqlFunction contained pg_try_advisory_lock_shared pg_try_advisory_xact_lock
-syn keyword sqlFunction contained pg_try_advisory_xact_lock_shared pg_ts_config_is_visible pg_ts_dict_is_visible
-syn keyword sqlFunction contained pg_ts_parser_is_visible pg_ts_template_is_visible
-syn keyword sqlFunction contained pg_type_is_visible pg_typeof pg_visible_in_snapshot pg_wal_lsn_diff
-syn keyword sqlFunction contained pg_wal_replay_pause pg_wal_replay_resume pg_walfile_name
-syn keyword sqlFunction contained pg_walfile_name_offset pg_xact_commit_timestamp pg_xact_status
-syn keyword sqlFunction contained phraseto_tsquery pi plainto_tsquery plperl_call_handler plperl_inline_handler
-syn keyword sqlFunction contained plperl_validator plperlu_call_handler plperlu_inline_handler
-syn keyword sqlFunction contained plperlu_validator plpgsql_call_handler plpgsql_inline_handler
-syn keyword sqlFunction contained plpgsql_validator pltcl_call_handler pltclu_call_handler point
-syn keyword sqlFunction contained point_above point_add point_below point_distance point_div
-syn keyword sqlFunction contained point_eq point_horiz point_in point_left point_mul point_ne point_out
-syn keyword sqlFunction contained point_recv point_right point_send point_sub point_vert poly_above
-syn keyword sqlFunction contained poly_below poly_center poly_contain poly_contain_pt
-syn keyword sqlFunction contained poly_contained poly_distance poly_in poly_left poly_npoints poly_out
-syn keyword sqlFunction contained poly_overabove poly_overbelow poly_overlap poly_overleft poly_overright
-syn keyword sqlFunction contained poly_recv poly_right poly_same poly_send polygon popen position
-syn keyword sqlFunction contained positionjoinsel positionsel postgresql_fdw_validator pow power
-syn keyword sqlFunction contained prefixjoinsel prefixsel prsd_end prsd_headline prsd_lextype
-syn keyword sqlFunction contained prsd_nexttoken prsd_start pt_contained_circle pt_contained_poly
-syn keyword sqlFunction contained query_to_xml query_to_xml_and_xmlschema query_to_xmlschema querytree
-syn keyword sqlFunction contained quote_ident quote_literal quote_nullable radians radius random
-syn keyword sqlFunction contained range_adjacent range_after range_before range_cmp
-syn keyword sqlFunction contained range_contained_by range_contains range_contains_elem range_eq range_ge
+syn keyword sqlFunction contained pg_stat_get_xact_tuples_updated pg_stat_reset
+syn keyword sqlFunction contained pg_stat_reset_replication_slot pg_stat_reset_shared
+syn keyword sqlFunction contained pg_stat_reset_single_function_counters pg_stat_reset_single_table_counters pg_stat_reset_slru
+syn keyword sqlFunction contained pg_statistics_obj_is_visible pg_stop_backup pg_switch_wal
+syn keyword sqlFunction contained pg_table_is_visible pg_table_size pg_tablespace_databases
+syn keyword sqlFunction contained pg_tablespace_location pg_tablespace_size pg_terminate_backend
+syn keyword sqlFunction contained pg_timezone_abbrevs pg_timezone_names pg_total_relation_size
+syn keyword sqlFunction contained pg_trigger_depth pg_try_advisory_lock pg_try_advisory_lock_shared
+syn keyword sqlFunction contained pg_try_advisory_xact_lock pg_try_advisory_xact_lock_shared
+syn keyword sqlFunction contained pg_ts_config_is_visible pg_ts_dict_is_visible
+syn keyword sqlFunction contained pg_ts_parser_is_visible pg_ts_template_is_visible pg_type_is_visible pg_typeof
+syn keyword sqlFunction contained pg_visible_in_snapshot pg_wal_lsn_diff pg_wal_replay_pause
+syn keyword sqlFunction contained pg_wal_replay_resume pg_walfile_name pg_walfile_name_offset
+syn keyword sqlFunction contained pg_xact_commit_timestamp pg_xact_commit_timestamp_origin pg_xact_status
+syn keyword sqlFunction contained phraseto_tsquery pi plainto_tsquery plperl_call_handler
+syn keyword sqlFunction contained plperl_inline_handler plperl_validator plperlu_call_handler
+syn keyword sqlFunction contained plperlu_inline_handler plperlu_validator plpgsql_call_handler
+syn keyword sqlFunction contained plpgsql_inline_handler plpgsql_validator pltcl_call_handler
+syn keyword sqlFunction contained pltclu_call_handler point point_above point_add point_below point_distance
+syn keyword sqlFunction contained point_div point_eq point_horiz point_in point_left point_mul
+syn keyword sqlFunction contained point_ne point_out point_recv point_right point_send point_sub
+syn keyword sqlFunction contained point_vert poly_above poly_below poly_center poly_contain
+syn keyword sqlFunction contained poly_contain_pt poly_contained poly_distance poly_in poly_left poly_npoints
+syn keyword sqlFunction contained poly_out poly_overabove poly_overbelow poly_overlap poly_overleft
+syn keyword sqlFunction contained poly_overright poly_recv poly_right poly_same poly_send polygon
+syn keyword sqlFunction contained popen position positionjoinsel positionsel
+syn keyword sqlFunction contained postgresql_fdw_validator pow power prefixjoinsel prefixsel prsd_end prsd_headline
+syn keyword sqlFunction contained prsd_lextype prsd_nexttoken prsd_start pt_contained_circle
+syn keyword sqlFunction contained pt_contained_poly query_to_xml query_to_xml_and_xmlschema
+syn keyword sqlFunction contained query_to_xmlschema querytree quote_ident quote_literal quote_nullable radians
+syn keyword sqlFunction contained radius random range_adjacent range_adjacent_multirange
+syn keyword sqlFunction contained range_after range_after_multirange range_agg range_agg_finalfn
+syn keyword sqlFunction contained range_agg_transfn range_before range_before_multirange range_cmp
+syn keyword sqlFunction contained range_contained_by range_contained_by_multirange range_contains
+syn keyword sqlFunction contained range_contains_elem range_contains_multirange range_eq range_ge
 syn keyword sqlFunction contained range_gist_consistent range_gist_penalty range_gist_picksplit
 syn keyword sqlFunction contained range_gist_same range_gist_union range_gt range_in range_intersect
-syn keyword sqlFunction contained range_le range_lt range_merge range_minus range_ne range_out
-syn keyword sqlFunction contained range_overlaps range_overleft range_overright range_recv range_send
-syn keyword sqlFunction contained range_typanalyze range_union rangesel rank rank_final record_eq
-syn keyword sqlFunction contained record_ge record_gt record_image_eq record_image_ge record_image_gt
-syn keyword sqlFunction contained record_image_le record_image_lt record_image_ne record_in
-syn keyword sqlFunction contained record_le record_lt record_ne record_out record_recv record_send
-syn keyword sqlFunction contained regclass regclassin regclassout regclassrecv regclasssend
-syn keyword sqlFunction contained regcollationin regcollationout regcollationrecv regcollationsend regconfigin
-syn keyword sqlFunction contained regconfigout regconfigrecv regconfigsend regdictionaryin
-syn keyword sqlFunction contained regdictionaryout regdictionaryrecv regdictionarysend regexeqjoinsel
-syn keyword sqlFunction contained regexeqsel regexnejoinsel regexnesel regexp_match regexp_matches
-syn keyword sqlFunction contained regexp_replace regexp_split_to_array regexp_split_to_table
-syn keyword sqlFunction contained regnamespacein regnamespaceout regnamespacerecv regnamespacesend
-syn keyword sqlFunction contained regoperatorin regoperatorout regoperatorrecv regoperatorsend
-syn keyword sqlFunction contained regoperin regoperout regoperrecv regopersend regprocedurein
-syn keyword sqlFunction contained regprocedureout regprocedurerecv regproceduresend regprocin regprocout
-syn keyword sqlFunction contained regprocrecv regprocsend regr_avgx regr_avgy regr_count
-syn keyword sqlFunction contained regr_intercept regr_r2 regr_slope regr_sxx regr_sxy regr_syy regrolein
-syn keyword sqlFunction contained regroleout regrolerecv regrolesend regtypein regtypeout regtyperecv
-syn keyword sqlFunction contained regtypesend repeat replace reverse right round row_number
-syn keyword sqlFunction contained row_security_active row_to_json rpad rtrim satisfies_hash_partition
-syn keyword sqlFunction contained scalargejoinsel scalargesel scalargtjoinsel scalargtsel
-syn keyword sqlFunction contained scalarlejoinsel scalarlesel scalarltjoinsel scalarltsel scale schema_to_xml
-syn keyword sqlFunction contained schema_to_xml_and_xmlschema schema_to_xmlschema session_user
-syn keyword sqlFunction contained set_bit set_byte set_config set_masklen setseed setval setweight
-syn keyword sqlFunction contained sha224 sha256 sha384 sha512 shell_in shell_out
-syn keyword sqlFunction contained shift_jis_2004_to_euc_jis_2004 shift_jis_2004_to_utf8 shobj_description sign
-syn keyword sqlFunction contained similar_escape similar_to_escape sin sind sinh sjis_to_euc_jp
-syn keyword sqlFunction contained sjis_to_mic sjis_to_utf8 slope spg_bbox_quad_config spg_box_quad_choose
-syn keyword sqlFunction contained spg_box_quad_config spg_box_quad_inner_consistent
-syn keyword sqlFunction contained spg_box_quad_leaf_consistent spg_box_quad_picksplit spg_kd_choose
-syn keyword sqlFunction contained spg_kd_config spg_kd_inner_consistent spg_kd_picksplit
-syn keyword sqlFunction contained spg_poly_quad_compress spg_quad_choose spg_quad_config
-syn keyword sqlFunction contained spg_quad_inner_consistent spg_quad_leaf_consistent spg_quad_picksplit
-syn keyword sqlFunction contained spg_range_quad_choose spg_range_quad_config spg_range_quad_inner_consistent
-syn keyword sqlFunction contained spg_range_quad_leaf_consistent spg_range_quad_picksplit
-syn keyword sqlFunction contained spg_text_choose spg_text_config spg_text_inner_consistent
-syn keyword sqlFunction contained spg_text_leaf_consistent spg_text_picksplit spghandler split_part sqrt
-syn keyword sqlFunction contained starts_with statement_timestamp stddev stddev_pop stddev_samp
-syn keyword sqlFunction contained string_agg string_agg_finalfn string_agg_transfn string_to_array
-syn keyword sqlFunction contained strip strpos substr substring sum
-syn keyword sqlFunction contained suppress_redundant_updates_trigger system table_am_handler_in table_am_handler_out table_to_xml
-syn keyword sqlFunction contained table_to_xml_and_xmlschema table_to_xmlschema tan tand tanh text
-syn keyword sqlFunction contained text_ge text_gt text_larger text_le text_lt text_pattern_ge
-syn keyword sqlFunction contained text_pattern_gt text_pattern_le text_pattern_lt text_smaller
-syn keyword sqlFunction contained textanycat textcat texteq texteqname textgename textgtname texticlike
+syn keyword sqlFunction contained range_intersect_agg range_intersect_agg_transfn range_le
+syn keyword sqlFunction contained range_lt range_merge range_minus range_ne range_out range_overlaps
+syn keyword sqlFunction contained range_overlaps_multirange range_overleft
+syn keyword sqlFunction contained range_overleft_multirange range_overright range_overright_multirange range_recv
+syn keyword sqlFunction contained range_send range_typanalyze range_union rangesel rank rank_final
+syn keyword sqlFunction contained raw_array_subscript_handler record_eq record_ge record_gt
+syn keyword sqlFunction contained record_image_eq record_image_ge record_image_gt record_image_le
+syn keyword sqlFunction contained record_image_lt record_image_ne record_in record_le record_lt record_ne
+syn keyword sqlFunction contained record_out record_recv record_send regclass regclassin regclassout
+syn keyword sqlFunction contained regclassrecv regclasssend regcollationin regcollationout
+syn keyword sqlFunction contained regcollationrecv regcollationsend regconfigin regconfigout
+syn keyword sqlFunction contained regconfigrecv regconfigsend regdictionaryin regdictionaryout
+syn keyword sqlFunction contained regdictionaryrecv regdictionarysend regexeqjoinsel regexeqsel regexnejoinsel
+syn keyword sqlFunction contained regexnesel regexp_match regexp_matches regexp_replace
+syn keyword sqlFunction contained regexp_split_to_array regexp_split_to_table regnamespacein
+syn keyword sqlFunction contained regnamespaceout regnamespacerecv regnamespacesend regoperatorin
+syn keyword sqlFunction contained regoperatorout regoperatorrecv regoperatorsend regoperin regoperout
+syn keyword sqlFunction contained regoperrecv regopersend regprocedurein regprocedureout regprocedurerecv
+syn keyword sqlFunction contained regproceduresend regprocin regprocout regprocrecv regprocsend
+syn keyword sqlFunction contained regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope
+syn keyword sqlFunction contained regr_sxx regr_sxy regr_syy regrolein regroleout regrolerecv
+syn keyword sqlFunction contained regrolesend regtypein regtypeout regtyperecv regtypesend repeat replace
+syn keyword sqlFunction contained reverse right round row_number row_security_active row_to_json
+syn keyword sqlFunction contained rpad rtrim satisfies_hash_partition scalargejoinsel scalargesel
+syn keyword sqlFunction contained scalargtjoinsel scalargtsel scalarlejoinsel scalarlesel
+syn keyword sqlFunction contained scalarltjoinsel scalarltsel scale schema_to_xml
+syn keyword sqlFunction contained schema_to_xml_and_xmlschema schema_to_xmlschema session_user set_bit set_byte set_config
+syn keyword sqlFunction contained set_masklen setseed setval setweight sha224 sha256 sha384 sha512
+syn keyword sqlFunction contained shell_in shell_out shift_jis_2004_to_euc_jis_2004
+syn keyword sqlFunction contained shift_jis_2004_to_utf8 shobj_description sign similar_escape similar_to_escape
+syn keyword sqlFunction contained sin sind sinh sjis_to_euc_jp sjis_to_mic sjis_to_utf8 slope
+syn keyword sqlFunction contained spg_bbox_quad_config spg_box_quad_choose spg_box_quad_config
+syn keyword sqlFunction contained spg_box_quad_inner_consistent spg_box_quad_leaf_consistent
+syn keyword sqlFunction contained spg_box_quad_picksplit spg_kd_choose spg_kd_config
+syn keyword sqlFunction contained spg_kd_inner_consistent spg_kd_picksplit spg_poly_quad_compress spg_quad_choose
+syn keyword sqlFunction contained spg_quad_config spg_quad_inner_consistent
+syn keyword sqlFunction contained spg_quad_leaf_consistent spg_quad_picksplit spg_range_quad_choose
+syn keyword sqlFunction contained spg_range_quad_config spg_range_quad_inner_consistent
+syn keyword sqlFunction contained spg_range_quad_leaf_consistent spg_range_quad_picksplit spg_text_choose spg_text_config
+syn keyword sqlFunction contained spg_text_inner_consistent spg_text_leaf_consistent
+syn keyword sqlFunction contained spg_text_picksplit spghandler split_part sqrt starts_with
+syn keyword sqlFunction contained statement_timestamp stddev stddev_pop stddev_samp string_agg string_agg_finalfn
+syn keyword sqlFunction contained string_agg_transfn string_to_array string_to_table strip strpos
+syn keyword sqlFunction contained substr substring sum suppress_redundant_updates_trigger system
+syn keyword sqlFunction contained table_am_handler_in table_am_handler_out table_to_xml
+syn keyword sqlFunction contained table_to_xml_and_xmlschema table_to_xmlschema tan tand tanh text text_ge
+syn keyword sqlFunction contained text_gt text_larger text_le text_lt text_pattern_ge text_pattern_gt
+syn keyword sqlFunction contained text_pattern_le text_pattern_lt text_smaller textanycat textcat
+syn keyword sqlFunction contained texteq texteqname textgename textgtname texticlike
 syn keyword sqlFunction contained texticlike_support texticnlike texticregexeq texticregexeq_support
-syn keyword sqlFunction contained texticregexne textin textlen textlename textlike
-syn keyword sqlFunction contained textlike_support textltname textne textnename textnlike textout textrecv
-syn keyword sqlFunction contained textregexeq textregexeq_support textregexne textsend thesaurus_init
-syn keyword sqlFunction contained thesaurus_lexize tideq tidge tidgt tidin tidlarger tidle tidlt tidne
-syn keyword sqlFunction contained tidout tidrecv tidsend tidsmaller time time_cmp time_eq time_ge
-syn keyword sqlFunction contained time_gt time_hash time_hash_extended time_in time_larger time_le
-syn keyword sqlFunction contained time_lt time_mi_interval time_mi_time time_ne time_out
-syn keyword sqlFunction contained time_pl_interval time_recv time_send time_smaller time_support timedate_pl
-syn keyword sqlFunction contained timeofday timestamp timestamp_cmp timestamp_cmp_date
-syn keyword sqlFunction contained timestamp_cmp_timestamptz timestamp_eq timestamp_eq_date
-syn keyword sqlFunction contained timestamp_eq_timestamptz timestamp_ge timestamp_ge_date timestamp_ge_timestamptz
-syn keyword sqlFunction contained timestamp_gt timestamp_gt_date timestamp_gt_timestamptz
-syn keyword sqlFunction contained timestamp_hash timestamp_hash_extended timestamp_in timestamp_larger
-syn keyword sqlFunction contained timestamp_le timestamp_le_date timestamp_le_timestamptz
-syn keyword sqlFunction contained timestamp_lt timestamp_lt_date timestamp_lt_timestamptz timestamp_mi
+syn keyword sqlFunction contained texticregexne textin textlen textlename textlike textlike_support
+syn keyword sqlFunction contained textltname textne textnename textnlike textout textrecv textregexeq
+syn keyword sqlFunction contained textregexeq_support textregexne textsend thesaurus_init
+syn keyword sqlFunction contained thesaurus_lexize tideq tidge tidgt tidin tidlarger tidle tidlt tidne tidout
+syn keyword sqlFunction contained tidrecv tidsend tidsmaller time time_cmp time_eq time_ge time_gt
+syn keyword sqlFunction contained time_hash time_hash_extended time_in time_larger time_le time_lt
+syn keyword sqlFunction contained time_mi_interval time_mi_time time_ne time_out time_pl_interval
+syn keyword sqlFunction contained time_recv time_send time_smaller time_support timedate_pl timeofday
+syn keyword sqlFunction contained timestamp timestamp_cmp timestamp_cmp_date
+syn keyword sqlFunction contained timestamp_cmp_timestamptz timestamp_eq timestamp_eq_date timestamp_eq_timestamptz
+syn keyword sqlFunction contained timestamp_ge timestamp_ge_date timestamp_ge_timestamptz
+syn keyword sqlFunction contained timestamp_gt timestamp_gt_date timestamp_gt_timestamptz timestamp_hash
+syn keyword sqlFunction contained timestamp_hash_extended timestamp_in timestamp_larger
+syn keyword sqlFunction contained timestamp_le timestamp_le_date timestamp_le_timestamptz timestamp_lt
+syn keyword sqlFunction contained timestamp_lt_date timestamp_lt_timestamptz timestamp_mi
 syn keyword sqlFunction contained timestamp_mi_interval timestamp_ne timestamp_ne_date
-syn keyword sqlFunction contained timestamp_ne_timestamptz timestamp_out timestamp_pl_interval
-syn keyword sqlFunction contained timestamp_recv timestamp_send timestamp_smaller timestamp_sortsupport
+syn keyword sqlFunction contained timestamp_ne_timestamptz timestamp_out timestamp_pl_interval timestamp_recv
+syn keyword sqlFunction contained timestamp_send timestamp_smaller timestamp_sortsupport
 syn keyword sqlFunction contained timestamp_support timestamptypmodin timestamptypmodout timestamptz
 syn keyword sqlFunction contained timestamptz_cmp timestamptz_cmp_date timestamptz_cmp_timestamp
 syn keyword sqlFunction contained timestamptz_eq timestamptz_eq_date timestamptz_eq_timestamp
 syn keyword sqlFunction contained timestamptz_ge timestamptz_ge_date timestamptz_ge_timestamp
-syn keyword sqlFunction contained timestamptz_gt timestamptz_gt_date timestamptz_gt_timestamp
-syn keyword sqlFunction contained timestamptz_in timestamptz_larger timestamptz_le timestamptz_le_date
+syn keyword sqlFunction contained timestamptz_gt timestamptz_gt_date timestamptz_gt_timestamp timestamptz_in
+syn keyword sqlFunction contained timestamptz_larger timestamptz_le timestamptz_le_date
 syn keyword sqlFunction contained timestamptz_le_timestamp timestamptz_lt timestamptz_lt_date
 syn keyword sqlFunction contained timestamptz_lt_timestamp timestamptz_mi timestamptz_mi_interval
 syn keyword sqlFunction contained timestamptz_ne timestamptz_ne_date timestamptz_ne_timestamp
-syn keyword sqlFunction contained timestamptz_out timestamptz_pl_interval timestamptz_recv
-syn keyword sqlFunction contained timestamptz_send timestamptz_smaller timestamptztypmodin
-syn keyword sqlFunction contained timestamptztypmodout timetypmodin timetypmodout timetz timetz_cmp timetz_eq
-syn keyword sqlFunction contained timetz_ge timetz_gt timetz_hash timetz_hash_extended timetz_in
-syn keyword sqlFunction contained timetz_larger timetz_le timetz_lt timetz_mi_interval timetz_ne
-syn keyword sqlFunction contained timetz_out timetz_pl_interval timetz_recv timetz_send
-syn keyword sqlFunction contained timetz_smaller timetzdate_pl timetztypmodin timetztypmodout timezone
-syn keyword sqlFunction contained to_ascii to_char to_date to_hex to_json to_jsonb to_number to_regclass
-syn keyword sqlFunction contained to_regcollation to_regnamespace to_regoper to_regoperator
-syn keyword sqlFunction contained to_regproc to_regprocedure to_regrole to_regtype to_timestamp to_tsquery
-syn keyword sqlFunction contained to_tsvector transaction_timestamp translate trigger_in
-syn keyword sqlFunction contained trigger_out trim_scale trunc ts_debug ts_delete ts_filter ts_headline
+syn keyword sqlFunction contained timestamptz_out timestamptz_pl_interval timestamptz_recv timestamptz_send
+syn keyword sqlFunction contained timestamptz_smaller timestamptztypmodin timestamptztypmodout
+syn keyword sqlFunction contained timetypmodin timetypmodout timetz timetz_cmp timetz_eq timetz_ge
+syn keyword sqlFunction contained timetz_gt timetz_hash timetz_hash_extended timetz_in
+syn keyword sqlFunction contained timetz_larger timetz_le timetz_lt timetz_mi_interval timetz_ne timetz_out
+syn keyword sqlFunction contained timetz_pl_interval timetz_recv timetz_send timetz_smaller
+syn keyword sqlFunction contained timetzdate_pl timetztypmodin timetztypmodout timezone to_ascii to_char
+syn keyword sqlFunction contained to_date to_hex to_json to_jsonb to_number to_regclass
+syn keyword sqlFunction contained to_regcollation to_regnamespace to_regoper to_regoperator to_regproc
+syn keyword sqlFunction contained to_regprocedure to_regrole to_regtype to_timestamp to_tsquery
+syn keyword sqlFunction contained to_tsvector transaction_timestamp translate trigger_in trigger_out
+syn keyword sqlFunction contained trim_array trim_scale trunc ts_debug ts_delete ts_filter ts_headline
 syn keyword sqlFunction contained ts_lexize ts_match_qv ts_match_tq ts_match_tt ts_match_vq ts_parse
 syn keyword sqlFunction contained ts_rank ts_rank_cd ts_rewrite ts_stat ts_token_type ts_typanalyze
 syn keyword sqlFunction contained tsm_handler_in tsm_handler_out tsmatchjoinsel tsmatchsel
-syn keyword sqlFunction contained tsq_mcontained tsq_mcontains tsquery_and tsquery_cmp tsquery_eq
-syn keyword sqlFunction contained tsquery_ge tsquery_gt tsquery_le tsquery_lt tsquery_ne tsquery_not
-syn keyword sqlFunction contained tsquery_or tsquery_phrase tsqueryin tsqueryout tsqueryrecv
-syn keyword sqlFunction contained tsquerysend tsrange tsrange_subdiff tstzrange tstzrange_subdiff
-syn keyword sqlFunction contained tsvector_cmp tsvector_concat tsvector_eq tsvector_ge tsvector_gt
-syn keyword sqlFunction contained tsvector_le tsvector_lt tsvector_ne tsvector_to_array
-syn keyword sqlFunction contained tsvector_update_trigger tsvector_update_trigger_column tsvectorin tsvectorout
-syn keyword sqlFunction contained tsvectorrecv tsvectorsend txid_current txid_current_if_assigned
-syn keyword sqlFunction contained txid_current_snapshot txid_snapshot_in txid_snapshot_out
-syn keyword sqlFunction contained txid_snapshot_recv txid_snapshot_send txid_snapshot_xip
-syn keyword sqlFunction contained txid_snapshot_xmax txid_snapshot_xmin txid_status txid_visible_in_snapshot
-syn keyword sqlFunction contained uhc_to_utf8 unique_key_recheck unknownin unknownout unknownrecv
-syn keyword sqlFunction contained unknownsend unnest upper upper_inc upper_inf utf8_to_big5
-syn keyword sqlFunction contained utf8_to_euc_cn utf8_to_euc_jis_2004 utf8_to_euc_jp utf8_to_euc_kr
-syn keyword sqlFunction contained utf8_to_euc_tw utf8_to_gb18030 utf8_to_gbk utf8_to_iso8859
-syn keyword sqlFunction contained utf8_to_iso8859_1 utf8_to_johab utf8_to_koi8r utf8_to_koi8u
-syn keyword sqlFunction contained utf8_to_shift_jis_2004 utf8_to_sjis utf8_to_uhc utf8_to_win uuid_cmp uuid_eq
-syn keyword sqlFunction contained uuid_ge uuid_gt uuid_hash uuid_hash_extended uuid_in uuid_le
-syn keyword sqlFunction contained uuid_lt uuid_ne uuid_out uuid_recv uuid_send uuid_sortsupport var_pop
-syn keyword sqlFunction contained var_samp varbit varbit_in varbit_out varbit_recv varbit_send
-syn keyword sqlFunction contained varbit_support varbitcmp varbiteq varbitge varbitgt varbitle varbitlt
-syn keyword sqlFunction contained varbitne varbittypmodin varbittypmodout varchar_support
-syn keyword sqlFunction contained varcharin varcharout varcharrecv varcharsend varchartypmodin
-syn keyword sqlFunction contained varchartypmodout variance version void_in void_out void_recv void_send
-syn keyword sqlFunction contained websearch_to_tsquery width width_bucket win1250_to_latin2
-syn keyword sqlFunction contained win1250_to_mic win1251_to_iso win1251_to_koi8r win1251_to_mic
-syn keyword sqlFunction contained win1251_to_win866 win866_to_iso win866_to_koi8r win866_to_mic
-syn keyword sqlFunction contained win866_to_win1251 win_to_utf8 xid xid8cmp xid8eq xid8ge xid8gt xid8in xid8le
-syn keyword sqlFunction contained xid8lt xid8ne xid8out xid8recv xid8send xideq xideqint4 xidin xidneq
-syn keyword sqlFunction contained xidneqint4 xidout xidrecv xidsend xml xml_in xml_is_well_formed
-syn keyword sqlFunction contained xml_is_well_formed_content xml_is_well_formed_document xml_out
-syn keyword sqlFunction contained xml_recv xml_send xmlagg xmlcomment xmlconcat2 xmlexists xmlvalidate
-syn keyword sqlFunction contained xpath xpath_exists
+syn keyword sqlFunction contained tsmultirange tsq_mcontained tsq_mcontains tsquery_and tsquery_cmp
+syn keyword sqlFunction contained tsquery_eq tsquery_ge tsquery_gt tsquery_le tsquery_lt tsquery_ne
+syn keyword sqlFunction contained tsquery_not tsquery_or tsquery_phrase tsqueryin tsqueryout
+syn keyword sqlFunction contained tsqueryrecv tsquerysend tsrange tsrange_subdiff tstzmultirange tstzrange
+syn keyword sqlFunction contained tstzrange_subdiff tsvector_cmp tsvector_concat tsvector_eq
+syn keyword sqlFunction contained tsvector_ge tsvector_gt tsvector_le tsvector_lt tsvector_ne
+syn keyword sqlFunction contained tsvector_to_array tsvector_update_trigger
+syn keyword sqlFunction contained tsvector_update_trigger_column tsvectorin tsvectorout tsvectorrecv tsvectorsend
+syn keyword sqlFunction contained txid_current txid_current_if_assigned txid_current_snapshot
+syn keyword sqlFunction contained txid_snapshot_in txid_snapshot_out txid_snapshot_recv txid_snapshot_send
+syn keyword sqlFunction contained txid_snapshot_xip txid_snapshot_xmax txid_snapshot_xmin
+syn keyword sqlFunction contained txid_status txid_visible_in_snapshot uhc_to_utf8 unique_key_recheck
+syn keyword sqlFunction contained unistr unknownin unknownout unknownrecv unknownsend unnest upper
+syn keyword sqlFunction contained upper_inc upper_inf utf8_to_big5 utf8_to_euc_cn utf8_to_euc_jis_2004
+syn keyword sqlFunction contained utf8_to_euc_jp utf8_to_euc_kr utf8_to_euc_tw utf8_to_gb18030
+syn keyword sqlFunction contained utf8_to_gbk utf8_to_iso8859 utf8_to_iso8859_1 utf8_to_johab
+syn keyword sqlFunction contained utf8_to_koi8r utf8_to_koi8u utf8_to_shift_jis_2004 utf8_to_sjis
+syn keyword sqlFunction contained utf8_to_uhc utf8_to_win uuid_cmp uuid_eq uuid_ge uuid_gt uuid_hash
+syn keyword sqlFunction contained uuid_hash_extended uuid_in uuid_le uuid_lt uuid_ne uuid_out
+syn keyword sqlFunction contained uuid_recv uuid_send uuid_sortsupport var_pop var_samp varbit varbit_in
+syn keyword sqlFunction contained varbit_out varbit_recv varbit_send varbit_support varbitcmp
+syn keyword sqlFunction contained varbiteq varbitge varbitgt varbitle varbitlt varbitne varbittypmodin
+syn keyword sqlFunction contained varbittypmodout varchar_support varcharin varcharout varcharrecv
+syn keyword sqlFunction contained varcharsend varchartypmodin varchartypmodout variance version
+syn keyword sqlFunction contained void_in void_out void_recv void_send websearch_to_tsquery width
+syn keyword sqlFunction contained width_bucket win1250_to_latin2 win1250_to_mic win1251_to_iso
+syn keyword sqlFunction contained win1251_to_koi8r win1251_to_mic win1251_to_win866 win866_to_iso
+syn keyword sqlFunction contained win866_to_koi8r win866_to_mic win866_to_win1251 win_to_utf8 xid xid8cmp
+syn keyword sqlFunction contained xid8eq xid8ge xid8gt xid8in xid8le xid8lt xid8ne xid8out xid8recv
+syn keyword sqlFunction contained xid8send xideq xideqint4 xidin xidneq xidneqint4 xidout xidrecv
+syn keyword sqlFunction contained xidsend xml xml_in xml_is_well_formed xml_is_well_formed_content
+syn keyword sqlFunction contained xml_is_well_formed_document xml_out xml_recv xml_send xmlagg
+syn keyword sqlFunction contained xmlcomment xmlconcat2 xmlexists xmlvalidate xpath xpath_exists
 " Extensions names
 syn keyword sqlConstant contained address_standardizer address_standardizer_data_us adminpack
 syn keyword sqlConstant contained amcheck autoinc bloom bool_plperl bool_plperlu btree_gin
 syn keyword sqlConstant contained btree_gist citext cube dblink dict_int dict_xsyn earthdistance file_fdw
 syn keyword sqlConstant contained fuzzystrmatch hstore hstore_plperl hstore_plperlu insert_username
 syn keyword sqlConstant contained intagg intarray isn jsonb_plperl jsonb_plperlu lo ltree moddatetime
-syn keyword sqlConstant contained pageinspect pg_buffercache pg_freespacemap pg_prewarm
-syn keyword sqlConstant contained pg_stat_statements pg_trgm pg_visibility pgcrypto pgrouting pgrowlocks
-syn keyword sqlConstant contained pgstattuple pgtap plperl plperlu plpgsql pltcl pltclu postgis
-syn keyword sqlConstant contained postgis_raster postgis_sfcgal postgis_tiger_geocoder postgis_topology
-syn keyword sqlConstant contained postgres_fdw refint seg sslinfo tablefunc tcn temporal_tables
-syn keyword sqlConstant contained tsm_system_rows tsm_system_time unaccent xml2
+syn keyword sqlConstant contained old_snapshot pageinspect pg_buffercache pg_freespacemap
+syn keyword sqlConstant contained pg_prewarm pg_stat_statements pg_surgery pg_trgm pg_visibility pgcrypto
+syn keyword sqlConstant contained pgrouting pgrowlocks pgstattuple pgtap plperl plperlu plpgsql pltcl
+syn keyword sqlConstant contained pltclu postgis postgis_raster postgis_sfcgal
+syn keyword sqlConstant contained postgis_tiger_geocoder postgis_topology postgres_fdw refint seg sslinfo tablefunc
+syn keyword sqlConstant contained tcn temporal_tables tsm_system_rows tsm_system_time unaccent xml2
 " Legacy extensions names
 syn keyword sqlConstant contained chkpass hstore_plpython2u hstore_plpython3u hstore_plpythonu
 syn keyword sqlConstant contained jsonb_plpython3u ltree_plpython2u ltree_plpython3u
@@ -727,7 +779,7 @@ syn keyword sqlConstant contained ltree_plpythonu pldbgapi plpython2u plpython3u
 if index(get(g:, 'pgsql_disabled_extensions', []), 'refint') == -1
   syn keyword sqlFunction contained check_foreign_key check_primary_key
 endif " refint
-" Extension: postgis (v3.1.1)
+" Extension: postgis (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis') == -1
   syn keyword sqlFunction contained addauth addgeometrycolumn box
   syn keyword sqlFunction contained box2d box2d_in box2d_out box2df_in
@@ -1022,7 +1074,7 @@ endif " dict_xsyn
 if index(get(g:, 'pgsql_disabled_extensions', []), 'bool_plperlu') == -1
   syn keyword sqlFunction contained bool_to_plperlu plperlu_to_bool
 endif " bool_plperlu
-" Extension: address_standardizer (v3.1.1)
+" Extension: address_standardizer (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'address_standardizer') == -1
   syn keyword sqlFunction contained parse_address standardize_address
   syn keyword sqlType contained stdaddr
@@ -1037,7 +1089,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'xml2') == -1
   syn keyword sqlFunction contained xpath_bool xpath_list xpath_nodeset
   syn keyword sqlFunction contained xpath_number xpath_string xpath_table xslt_process
 endif " xml2
-" Extension: hstore (v1.7)
+" Extension: hstore (v1.8)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'hstore') == -1
   syn keyword sqlFunction contained akeys avals defined delete
   syn keyword sqlFunction contained each exist exists_all exists_any
@@ -1051,12 +1103,12 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'hstore') == -1
   syn keyword sqlFunction contained hstore_ge hstore_gt hstore_hash
   syn keyword sqlFunction contained hstore_hash_extended hstore_in hstore_le hstore_lt
   syn keyword sqlFunction contained hstore_ne hstore_out hstore_recv
-  syn keyword sqlFunction contained hstore_send hstore_to_array hstore_to_json
-  syn keyword sqlFunction contained hstore_to_json_loose hstore_to_jsonb
-  syn keyword sqlFunction contained hstore_to_jsonb_loose hstore_to_matrix hstore_version_diag
-  syn keyword sqlFunction contained isdefined isexists populate_record
-  syn keyword sqlFunction contained skeys slice slice_array svals
-  syn keyword sqlFunction contained tconvert
+  syn keyword sqlFunction contained hstore_send hstore_subscript_handler
+  syn keyword sqlFunction contained hstore_to_array hstore_to_json hstore_to_json_loose
+  syn keyword sqlFunction contained hstore_to_jsonb hstore_to_jsonb_loose
+  syn keyword sqlFunction contained hstore_to_matrix hstore_version_diag isdefined
+  syn keyword sqlFunction contained isexists populate_record skeys slice
+  syn keyword sqlFunction contained slice_array svals tconvert
   syn keyword sqlType contained ghstore hstore
 endif " hstore
 " Extension: pg_visibility (v1.2)
@@ -1065,7 +1117,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_visibility') == -1
   syn keyword sqlFunction contained pg_truncate_visibility_map pg_visibility
   syn keyword sqlFunction contained pg_visibility_map pg_visibility_map_summary
 endif " pg_visibility
-" Extension: cube (v1.4)
+" Extension: cube (v1.5)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'cube') == -1
   syn keyword sqlFunction contained cube cube_cmp cube_contained
   syn keyword sqlFunction contained cube_contains cube_coord cube_coord_llur
@@ -1073,15 +1125,15 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'cube') == -1
   syn keyword sqlFunction contained cube_ge cube_gt cube_in cube_inter
   syn keyword sqlFunction contained cube_is_point cube_le cube_ll_coord
   syn keyword sqlFunction contained cube_lt cube_ne cube_out cube_overlap
-  syn keyword sqlFunction contained cube_size cube_subset cube_union
-  syn keyword sqlFunction contained cube_ur_coord distance_chebyshev distance_taxicab
-  syn keyword sqlFunction contained g_cube_consistent g_cube_distance
-  syn keyword sqlFunction contained g_cube_penalty g_cube_picksplit g_cube_same
-  syn keyword sqlFunction contained g_cube_union
+  syn keyword sqlFunction contained cube_recv cube_send cube_size
+  syn keyword sqlFunction contained cube_subset cube_union cube_ur_coord
+  syn keyword sqlFunction contained distance_chebyshev distance_taxicab g_cube_consistent
+  syn keyword sqlFunction contained g_cube_distance g_cube_penalty
+  syn keyword sqlFunction contained g_cube_picksplit g_cube_same g_cube_union
   syn keyword sqlType contained cube
   syn keyword sqlFunction contained g_cube_compress g_cube_decompress
 endif " cube
-" Extension: postgis_tiger_geocoder (v3.1.1)
+" Extension: postgis_tiger_geocoder (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_tiger_geocoder') == -1
   syn keyword sqlFunction contained count_words create_census_base_tables
   syn keyword sqlFunction contained cull_null diff_zip
@@ -1112,12 +1164,12 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_tiger_geocoder') ==
   syn keyword sqlTable contained loader_platform loader_variables pagc_gaz
   syn keyword sqlTable contained pagc_lex pagc_rules place place_lookup
   syn keyword sqlTable contained secondary_unit_lookup state state_lookup
-  syn keyword sqlTable contained street_type_lookup tabblock tract zcta5
-  syn keyword sqlTable contained zip_lookup zip_lookup_all zip_lookup_base
-  syn keyword sqlTable contained zip_state zip_state_loc
+  syn keyword sqlTable contained street_type_lookup tabblock tabblock20 tract
+  syn keyword sqlTable contained zcta5 zip_lookup zip_lookup_all
+  syn keyword sqlTable contained zip_lookup_base zip_state zip_state_loc
   syn keyword sqlType contained norm_addy
 endif " postgis_tiger_geocoder
-" Extension: seg (v1.3)
+" Extension: seg (v1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'seg') == -1
   syn keyword sqlFunction contained gseg_consistent gseg_penalty
   syn keyword sqlFunction contained gseg_picksplit gseg_same gseg_union seg_center
@@ -1185,11 +1237,11 @@ endif " pgstattuple
 if index(get(g:, 'pgsql_disabled_extensions', []), 'autoinc') == -1
   syn keyword sqlFunction contained autoinc
 endif " autoinc
-" Extension: address_standardizer_data_us (v3.1.1)
+" Extension: address_standardizer_data_us (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'address_standardizer_data_us') == -1
   syn keyword sqlTable contained us_gaz us_lex us_rules
 endif " address_standardizer_data_us
-" Extension: postgis_topology (v3.1.1)
+" Extension: postgis_topology (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_topology') == -1
   syn keyword sqlFunction contained addedge addface addnode
   syn keyword sqlFunction contained addtopogeometrycolumn addtosearchpath asgml
@@ -1222,7 +1274,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_topology') == -1
   syn keyword sqlType contained topoelementarray topogeometry
   syn keyword sqlType contained validatetopology_returntype
 endif " postgis_topology
-" Extension: postgis_raster (v3.1.1)
+" Extension: postgis_raster (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_raster') == -1
   syn keyword sqlFunction contained addoverviewconstraints addrasterconstraints
   syn keyword sqlFunction contained box3d bytea dropoverviewconstraints
@@ -1299,6 +1351,10 @@ endif " pg_freespacemap
 if index(get(g:, 'pgsql_disabled_extensions', []), 'file_fdw') == -1
   syn keyword sqlFunction contained file_fdw_handler file_fdw_validator
 endif " file_fdw
+" Extension: pg_surgery (v1.0)
+if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_surgery') == -1
+  syn keyword sqlFunction contained heap_force_freeze heap_force_kill
+endif " pg_surgery
 " Extension: pg_buffercache (v1.3)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_buffercache') == -1
   syn keyword sqlFunction contained pg_buffercache_pages
@@ -1317,10 +1373,11 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'dblink') == -1
   syn keyword sqlFunction contained dblink_open dblink_send_query
   syn keyword sqlType contained dblink_pkey_results
 endif " dblink
-" Extension: pg_stat_statements (v1.8)
+" Extension: pg_stat_statements (v1.9)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_stat_statements') == -1
-  syn keyword sqlFunction contained pg_stat_statements pg_stat_statements_reset
-  syn keyword sqlView contained pg_stat_statements
+  syn keyword sqlFunction contained pg_stat_statements pg_stat_statements_info
+  syn keyword sqlFunction contained pg_stat_statements_reset
+  syn keyword sqlView contained pg_stat_statements pg_stat_statements_info
 endif " pg_stat_statements
 " Extension: insert_username (v1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'insert_username') == -1
@@ -1331,6 +1388,10 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_prewarm') == -1
   syn keyword sqlFunction contained autoprewarm_dump_now autoprewarm_start_worker
   syn keyword sqlFunction contained pg_prewarm
 endif " pg_prewarm
+" Extension: old_snapshot (v1.0)
+if index(get(g:, 'pgsql_disabled_extensions', []), 'old_snapshot') == -1
+  syn keyword sqlFunction contained pg_old_snapshot_time_mapping
+endif " old_snapshot
 " Extension: pgtap (v1.1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pgtap') == -1
   syn keyword sqlFunction contained is add_result alike
@@ -1423,7 +1484,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'plperlu') == -1
   syn keyword sqlFunction contained plperlu_call_handler plperlu_inline_handler
   syn keyword sqlFunction contained plperlu_validator
 endif " plperlu
-" Extension: intarray (v1.3)
+" Extension: intarray (v1.5)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'intarray') == -1
   syn keyword sqlFunction contained boolop bqarr_in bqarr_out
   syn keyword sqlFunction contained g_int_compress g_int_consistent g_int_decompress
@@ -1439,7 +1500,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'intarray') == -1
   syn keyword sqlFunction contained sort_asc sort_desc subarray uniq
   syn keyword sqlType contained intbig_gkey query_int
 endif " intarray
-" Extension: pg_trgm (v1.5)
+" Extension: pg_trgm (v1.6)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pg_trgm') == -1
   syn keyword sqlFunction contained gin_extract_query_trgm gin_extract_value_trgm
   syn keyword sqlFunction contained gin_trgm_consistent gin_trgm_triconsistent
@@ -1461,11 +1522,12 @@ endif " pg_trgm
 if index(get(g:, 'pgsql_disabled_extensions', []), 'dict_int') == -1
   syn keyword sqlFunction contained dintdict_init dintdict_lexize
 endif " dict_int
-" Extension: amcheck (v1.2)
+" Extension: amcheck (v1.3)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'amcheck') == -1
   syn keyword sqlFunction contained bt_index_check bt_index_parent_check
+  syn keyword sqlFunction contained verify_heapam
 endif " amcheck
-" Extension: btree_gist (v1.5)
+" Extension: btree_gist (v1.6)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'btree_gist') == -1
   syn keyword sqlFunction contained cash_dist date_dist float4_dist
   syn keyword sqlFunction contained float8_dist gbt_bit_compress gbt_bit_consistent
@@ -1540,17 +1602,19 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'btree_gist') == -1
   syn keyword sqlType contained gbtreekey16 gbtreekey32 gbtreekey4
   syn keyword sqlType contained gbtreekey8 gbtreekey_var
 endif " btree_gist
-" Extension: pageinspect (v1.8)
+" Extension: pageinspect (v1.9)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pageinspect') == -1
   syn keyword sqlFunction contained brin_metapage_info brin_page_items
   syn keyword sqlFunction contained brin_page_type brin_revmap_data bt_metap
   syn keyword sqlFunction contained bt_page_items bt_page_stats fsm_page_contents
   syn keyword sqlFunction contained get_raw_page gin_leafpage_items
-  syn keyword sqlFunction contained gin_metapage_info gin_page_opaque_info hash_bitmap_info
-  syn keyword sqlFunction contained hash_metapage_info hash_page_items
-  syn keyword sqlFunction contained hash_page_stats hash_page_type heap_page_item_attrs
-  syn keyword sqlFunction contained heap_page_items heap_tuple_infomask_flags
-  syn keyword sqlFunction contained page_checksum page_header tuple_data_split
+  syn keyword sqlFunction contained gin_metapage_info gin_page_opaque_info gist_page_items
+  syn keyword sqlFunction contained gist_page_items_bytea gist_page_opaque_info
+  syn keyword sqlFunction contained hash_bitmap_info hash_metapage_info
+  syn keyword sqlFunction contained hash_page_items hash_page_stats hash_page_type
+  syn keyword sqlFunction contained heap_page_item_attrs heap_page_items
+  syn keyword sqlFunction contained heap_tuple_infomask_flags page_checksum page_header
+  syn keyword sqlFunction contained tuple_data_split
 endif " pageinspect
 " Extension: pltclu (v1.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pltclu') == -1
@@ -1570,7 +1634,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'fuzzystrmatch') == -1
   syn keyword sqlFunction contained levenshtein levenshtein_less_equal
   syn keyword sqlFunction contained metaphone soundex text_soundex
 endif " fuzzystrmatch
-" Extension: pgrouting (v3.1.3)
+" Extension: pgrouting (v3.3.0)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'pgrouting') == -1
   syn keyword sqlFunction contained pgr_alphashape pgr_analyzegraph
   syn keyword sqlFunction contained pgr_analyzeoneway pgr_articulationpoints pgr_astar
@@ -1579,22 +1643,26 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'pgrouting') == -1
   syn keyword sqlFunction contained pgr_bddijkstra pgr_bddijkstracost
   syn keyword sqlFunction contained pgr_bddijkstracostmatrix pgr_bellmanford
   syn keyword sqlFunction contained pgr_biconnectedcomponents pgr_binarybreadthfirstsearch
-  syn keyword sqlFunction contained pgr_boykovkolmogorov pgr_breadthfirstsearch pgr_bridges
-  syn keyword sqlFunction contained pgr_chinesepostman pgr_chinesepostmancost
-  syn keyword sqlFunction contained pgr_connectedcomponents pgr_contraction
-  syn keyword sqlFunction contained pgr_createtopology pgr_createverticestable
-  syn keyword sqlFunction contained pgr_dagshortestpath pgr_dijkstra pgr_dijkstracost
-  syn keyword sqlFunction contained pgr_dijkstracostmatrix pgr_dijkstravia
-  syn keyword sqlFunction contained pgr_drivingdistance pgr_edgedisjointpaths pgr_edmondskarp
+  syn keyword sqlFunction contained pgr_bipartite pgr_boykovkolmogorov pgr_breadthfirstsearch
+  syn keyword sqlFunction contained pgr_bridges pgr_chinesepostman
+  syn keyword sqlFunction contained pgr_chinesepostmancost pgr_connectedcomponents
+  syn keyword sqlFunction contained pgr_contraction pgr_createtopology pgr_createverticestable
+  syn keyword sqlFunction contained pgr_dagshortestpath pgr_depthfirstsearch
+  syn keyword sqlFunction contained pgr_dijkstra pgr_dijkstracost
+  syn keyword sqlFunction contained pgr_dijkstracostmatrix pgr_dijkstranear pgr_dijkstranearcost
+  syn keyword sqlFunction contained pgr_dijkstravia pgr_drivingdistance
+  syn keyword sqlFunction contained pgr_edgecoloring pgr_edgedisjointpaths pgr_edmondskarp
   syn keyword sqlFunction contained pgr_edwardmoore pgr_extractvertices
-  syn keyword sqlFunction contained pgr_floydwarshall pgr_full_version pgr_johnson
-  syn keyword sqlFunction contained pgr_kruskal pgr_kruskalbfs pgr_kruskaldd
-  syn keyword sqlFunction contained pgr_kruskaldfs pgr_ksp pgr_linegraph
-  syn keyword sqlFunction contained pgr_linegraphfull pgr_maxcardinalitymatch
-  syn keyword sqlFunction contained pgr_maxflow pgr_maxflowmincost pgr_maxflowmincost_cost
-  syn keyword sqlFunction contained pgr_nodenetwork pgr_pickdeliver
-  syn keyword sqlFunction contained pgr_pickdelivereuclidean pgr_prim pgr_primbfs
-  syn keyword sqlFunction contained pgr_primdd pgr_primdfs pgr_pushrelabel
+  syn keyword sqlFunction contained pgr_floydwarshall pgr_full_version pgr_isplanar
+  syn keyword sqlFunction contained pgr_johnson pgr_kruskal pgr_kruskalbfs
+  syn keyword sqlFunction contained pgr_kruskaldd pgr_kruskaldfs pgr_ksp
+  syn keyword sqlFunction contained pgr_lengauertarjandominatortree pgr_linegraph
+  syn keyword sqlFunction contained pgr_linegraphfull pgr_makeconnected
+  syn keyword sqlFunction contained pgr_maxcardinalitymatch pgr_maxflow pgr_maxflowmincost
+  syn keyword sqlFunction contained pgr_maxflowmincost_cost pgr_nodenetwork
+  syn keyword sqlFunction contained pgr_pickdeliver pgr_pickdelivereuclidean pgr_prim
+  syn keyword sqlFunction contained pgr_primbfs pgr_primdd pgr_primdfs
+  syn keyword sqlFunction contained pgr_pushrelabel pgr_sequentialvertexcoloring
   syn keyword sqlFunction contained pgr_stoerwagner pgr_strongcomponents
   syn keyword sqlFunction contained pgr_topologicalsort pgr_transitiveclosure pgr_trsp
   syn keyword sqlFunction contained pgr_trspviaedges pgr_trspviavertices pgr_tsp
@@ -1614,7 +1682,7 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'pgcrypto') == -1
   syn keyword sqlFunction contained pgp_sym_decrypt_bytea pgp_sym_encrypt
   syn keyword sqlFunction contained pgp_sym_encrypt_bytea
 endif " pgcrypto
-" Extension: postgis_sfcgal (v3.1.1)
+" Extension: postgis_sfcgal (v3.1.4)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgis_sfcgal') == -1
   syn keyword sqlFunction contained postgis_sfcgal_noop
   syn keyword sqlFunction contained postgis_sfcgal_scripts_installed postgis_sfcgal_version st_3darea
@@ -1640,8 +1708,10 @@ if index(get(g:, 'pgsql_disabled_extensions', []), 'tablefunc') == -1
   syn keyword sqlType contained tablefunc_crosstab_2 tablefunc_crosstab_3
   syn keyword sqlType contained tablefunc_crosstab_4
 endif " tablefunc
-" Extension: postgres_fdw (v1.0)
+" Extension: postgres_fdw (v1.1)
 if index(get(g:, 'pgsql_disabled_extensions', []), 'postgres_fdw') == -1
+  syn keyword sqlFunction contained postgres_fdw_disconnect
+  syn keyword sqlFunction contained postgres_fdw_disconnect_all postgres_fdw_get_connections
   syn keyword sqlFunction contained postgres_fdw_handler postgres_fdw_validator
 endif " postgres_fdw
 " Extension: bloom (v1.0)
@@ -1748,44 +1818,47 @@ syn keyword sqlCatalog contained foreign_servers foreign_table_options foreign_t
 syn keyword sqlCatalog contained information_schema_catalog_name key_column_usage parameters pg_aggregate pg_am
 syn keyword sqlCatalog contained pg_amop pg_amproc pg_attrdef pg_attribute pg_auth_members pg_authid
 syn keyword sqlCatalog contained pg_available_extension_versions pg_available_extensions
-syn keyword sqlCatalog contained pg_cast pg_class pg_collation pg_config pg_constraint pg_conversion
-syn keyword sqlCatalog contained pg_cursors pg_database pg_db_role_setting pg_default_acl
-syn keyword sqlCatalog contained pg_depend pg_description pg_enum pg_event_trigger pg_extension
-syn keyword sqlCatalog contained pg_file_settings pg_foreign_data_wrapper pg_foreign_server
-syn keyword sqlCatalog contained pg_foreign_table pg_group pg_hba_file_rules pg_index pg_indexes pg_inherits
-syn keyword sqlCatalog contained pg_init_privs pg_language pg_largeobject
-syn keyword sqlCatalog contained pg_largeobject_metadata pg_locks pg_matviews pg_namespace pg_opclass pg_operator
-syn keyword sqlCatalog contained pg_opfamily pg_partitioned_table pg_policies pg_policy
-syn keyword sqlCatalog contained pg_prepared_statements pg_prepared_xacts pg_proc pg_publication
-syn keyword sqlCatalog contained pg_publication_rel pg_publication_tables pg_range pg_replication_origin
-syn keyword sqlCatalog contained pg_replication_origin_status pg_replication_slots pg_rewrite
-syn keyword sqlCatalog contained pg_roles pg_rules pg_seclabel pg_seclabels pg_sequence pg_sequences
-syn keyword sqlCatalog contained pg_settings pg_shadow pg_shdepend pg_shdescription
-syn keyword sqlCatalog contained pg_shmem_allocations pg_shseclabel pg_stat_activity pg_stat_all_indexes
-syn keyword sqlCatalog contained pg_stat_all_tables pg_stat_archiver pg_stat_bgwriter
-syn keyword sqlCatalog contained pg_stat_database pg_stat_database_conflicts pg_stat_gssapi
-syn keyword sqlCatalog contained pg_stat_progress_analyze pg_stat_progress_basebackup pg_stat_progress_cluster
-syn keyword sqlCatalog contained pg_stat_progress_create_index pg_stat_progress_vacuum
-syn keyword sqlCatalog contained pg_stat_replication pg_stat_slru pg_stat_ssl pg_stat_subscription
-syn keyword sqlCatalog contained pg_stat_sys_indexes pg_stat_sys_tables pg_stat_user_functions
-syn keyword sqlCatalog contained pg_stat_user_indexes pg_stat_user_tables pg_stat_wal_receiver
-syn keyword sqlCatalog contained pg_stat_xact_all_tables pg_stat_xact_sys_tables
-syn keyword sqlCatalog contained pg_stat_xact_user_functions pg_stat_xact_user_tables pg_statio_all_indexes
-syn keyword sqlCatalog contained pg_statio_all_sequences pg_statio_all_tables pg_statio_sys_indexes
-syn keyword sqlCatalog contained pg_statio_sys_sequences pg_statio_sys_tables
-syn keyword sqlCatalog contained pg_statio_user_indexes pg_statio_user_sequences pg_statio_user_tables
-syn keyword sqlCatalog contained pg_statistic pg_statistic_ext pg_statistic_ext_data pg_stats
-syn keyword sqlCatalog contained pg_stats_ext pg_subscription pg_subscription_rel pg_tables pg_tablespace
-syn keyword sqlCatalog contained pg_timezone_abbrevs pg_timezone_names pg_transform pg_trigger
-syn keyword sqlCatalog contained pg_ts_config pg_ts_config_map pg_ts_dict pg_ts_parser
-syn keyword sqlCatalog contained pg_ts_template pg_type pg_user pg_user_mapping pg_user_mappings pg_views
-syn keyword sqlCatalog contained referential_constraints role_column_grants role_routine_grants
-syn keyword sqlCatalog contained role_table_grants role_udt_grants role_usage_grants
-syn keyword sqlCatalog contained routine_privileges routines schemata sequences sql_features
-syn keyword sqlCatalog contained sql_implementation_info sql_parts sql_sizing table_constraints table_privileges
-syn keyword sqlCatalog contained tables transforms triggered_update_columns triggers
-syn keyword sqlCatalog contained udt_privileges usage_privileges user_defined_types user_mapping_options
-syn keyword sqlCatalog contained user_mappings view_column_usage view_routine_usage
+syn keyword sqlCatalog contained pg_backend_memory_contexts pg_cast pg_class pg_collation pg_config
+syn keyword sqlCatalog contained pg_constraint pg_conversion pg_cursors pg_database
+syn keyword sqlCatalog contained pg_db_role_setting pg_default_acl pg_depend pg_description pg_enum
+syn keyword sqlCatalog contained pg_event_trigger pg_extension pg_file_settings pg_foreign_data_wrapper
+syn keyword sqlCatalog contained pg_foreign_server pg_foreign_table pg_group pg_hba_file_rules
+syn keyword sqlCatalog contained pg_index pg_indexes pg_inherits pg_init_privs pg_language
+syn keyword sqlCatalog contained pg_largeobject pg_largeobject_metadata pg_locks pg_matviews pg_namespace
+syn keyword sqlCatalog contained pg_opclass pg_operator pg_opfamily pg_partitioned_table
+syn keyword sqlCatalog contained pg_policies pg_policy pg_prepared_statements pg_prepared_xacts pg_proc
+syn keyword sqlCatalog contained pg_publication pg_publication_rel pg_publication_tables
+syn keyword sqlCatalog contained pg_range pg_replication_origin pg_replication_origin_status
+syn keyword sqlCatalog contained pg_replication_slots pg_rewrite pg_roles pg_rules pg_seclabel
+syn keyword sqlCatalog contained pg_seclabels pg_sequence pg_sequences pg_settings pg_shadow pg_shdepend
+syn keyword sqlCatalog contained pg_shdescription pg_shmem_allocations pg_shseclabel
+syn keyword sqlCatalog contained pg_stat_activity pg_stat_all_indexes pg_stat_all_tables pg_stat_archiver
+syn keyword sqlCatalog contained pg_stat_bgwriter pg_stat_database pg_stat_database_conflicts
+syn keyword sqlCatalog contained pg_stat_gssapi pg_stat_progress_analyze
+syn keyword sqlCatalog contained pg_stat_progress_basebackup pg_stat_progress_cluster pg_stat_progress_copy
+syn keyword sqlCatalog contained pg_stat_progress_create_index pg_stat_progress_vacuum pg_stat_replication
+syn keyword sqlCatalog contained pg_stat_replication_slots pg_stat_slru pg_stat_ssl
+syn keyword sqlCatalog contained pg_stat_subscription pg_stat_sys_indexes pg_stat_sys_tables
+syn keyword sqlCatalog contained pg_stat_user_functions pg_stat_user_indexes pg_stat_user_tables pg_stat_wal
+syn keyword sqlCatalog contained pg_stat_wal_receiver pg_stat_xact_all_tables
+syn keyword sqlCatalog contained pg_stat_xact_sys_tables pg_stat_xact_user_functions pg_stat_xact_user_tables
+syn keyword sqlCatalog contained pg_statio_all_indexes pg_statio_all_sequences
+syn keyword sqlCatalog contained pg_statio_all_tables pg_statio_sys_indexes pg_statio_sys_sequences
+syn keyword sqlCatalog contained pg_statio_sys_tables pg_statio_user_indexes pg_statio_user_sequences
+syn keyword sqlCatalog contained pg_statio_user_tables pg_statistic pg_statistic_ext
+syn keyword sqlCatalog contained pg_statistic_ext_data pg_stats pg_stats_ext pg_stats_ext_exprs pg_subscription
+syn keyword sqlCatalog contained pg_subscription_rel pg_tables pg_tablespace
+syn keyword sqlCatalog contained pg_timezone_abbrevs pg_timezone_names pg_transform pg_trigger pg_ts_config
+syn keyword sqlCatalog contained pg_ts_config_map pg_ts_dict pg_ts_parser pg_ts_template pg_type pg_user
+syn keyword sqlCatalog contained pg_user_mapping pg_user_mappings pg_views
+syn keyword sqlCatalog contained referential_constraints role_column_grants role_routine_grants role_table_grants
+syn keyword sqlCatalog contained role_udt_grants role_usage_grants routine_column_usage
+syn keyword sqlCatalog contained routine_privileges routine_routine_usage routine_sequence_usage
+syn keyword sqlCatalog contained routine_table_usage routines schemata sequences sql_features
+syn keyword sqlCatalog contained sql_implementation_info sql_parts sql_sizing table_constraints
+syn keyword sqlCatalog contained table_privileges tables transforms triggered_update_columns triggers
+syn keyword sqlCatalog contained udt_privileges usage_privileges user_defined_types
+syn keyword sqlCatalog contained user_mapping_options user_mappings view_column_usage view_routine_usage
 syn keyword sqlCatalog contained view_table_usage views
 " Error codes (Appendix A, Table A-1)
 syn keyword sqlErrorCode contained active_sql_transaction admin_shutdown ambiguous_alias
@@ -1822,75 +1895,75 @@ syn keyword sqlErrorCode contained fdw_unable_to_create_reply fdw_unable_to_esta
 syn keyword sqlErrorCode contained floating_point_exception foreign_key_violation
 syn keyword sqlErrorCode contained function_executed_no_return_statement generated_always grouping_error
 syn keyword sqlErrorCode contained held_cursor_requires_same_isolation_level
-syn keyword sqlErrorCode contained idle_in_transaction_session_timeout implicit_zero_bit_padding in_failed_sql_transaction
+syn keyword sqlErrorCode contained idle_in_transaction_session_timeout idle_session_timeout implicit_zero_bit_padding
+syn keyword sqlErrorCode contained in_failed_sql_transaction
 syn keyword sqlErrorCode contained inappropriate_access_mode_for_branch_transaction
-syn keyword sqlErrorCode contained inappropriate_isolation_level_for_branch_transaction
-syn keyword sqlErrorCode contained indeterminate_collation indeterminate_datatype index_corrupted indicator_overflow
-syn keyword sqlErrorCode contained insufficient_privilege insufficient_resources
-syn keyword sqlErrorCode contained integrity_constraint_violation internal_error interval_field_overflow
-syn keyword sqlErrorCode contained invalid_argument_for_logarithm
+syn keyword sqlErrorCode contained inappropriate_isolation_level_for_branch_transaction indeterminate_collation indeterminate_datatype
+syn keyword sqlErrorCode contained index_corrupted indicator_overflow insufficient_privilege
+syn keyword sqlErrorCode contained insufficient_resources integrity_constraint_violation internal_error
+syn keyword sqlErrorCode contained interval_field_overflow invalid_argument_for_logarithm
 syn keyword sqlErrorCode contained invalid_argument_for_nth_value_function invalid_argument_for_ntile_function
 syn keyword sqlErrorCode contained invalid_argument_for_power_function
-syn keyword sqlErrorCode contained invalid_argument_for_sql_json_datetime_function invalid_argument_for_width_bucket_function
-syn keyword sqlErrorCode contained invalid_authorization_specification invalid_binary_representation
-syn keyword sqlErrorCode contained invalid_catalog_name invalid_character_value_for_cast
-syn keyword sqlErrorCode contained invalid_column_definition invalid_column_reference invalid_cursor_definition
-syn keyword sqlErrorCode contained invalid_cursor_name invalid_cursor_state
-syn keyword sqlErrorCode contained invalid_database_definition invalid_datetime_format invalid_escape_character
-syn keyword sqlErrorCode contained invalid_escape_octet invalid_escape_sequence invalid_foreign_key
-syn keyword sqlErrorCode contained invalid_function_definition invalid_grant_operation
-syn keyword sqlErrorCode contained invalid_grantor invalid_indicator_parameter_value invalid_json_text
-syn keyword sqlErrorCode contained invalid_locator_specification invalid_name invalid_object_definition
-syn keyword sqlErrorCode contained invalid_parameter_value invalid_password
-syn keyword sqlErrorCode contained invalid_preceding_or_following_size invalid_prepared_statement_definition
-syn keyword sqlErrorCode contained invalid_recursion invalid_regular_expression
+syn keyword sqlErrorCode contained invalid_argument_for_sql_json_datetime_function
+syn keyword sqlErrorCode contained invalid_argument_for_width_bucket_function invalid_authorization_specification
+syn keyword sqlErrorCode contained invalid_binary_representation invalid_catalog_name
+syn keyword sqlErrorCode contained invalid_character_value_for_cast invalid_column_definition invalid_column_reference
+syn keyword sqlErrorCode contained invalid_cursor_definition invalid_cursor_name invalid_cursor_state
+syn keyword sqlErrorCode contained invalid_database_definition invalid_datetime_format
+syn keyword sqlErrorCode contained invalid_escape_character invalid_escape_octet invalid_escape_sequence
+syn keyword sqlErrorCode contained invalid_foreign_key invalid_function_definition
+syn keyword sqlErrorCode contained invalid_grant_operation invalid_grantor invalid_indicator_parameter_value
+syn keyword sqlErrorCode contained invalid_json_text invalid_locator_specification invalid_name
+syn keyword sqlErrorCode contained invalid_object_definition invalid_parameter_value invalid_password
+syn keyword sqlErrorCode contained invalid_preceding_or_following_size
+syn keyword sqlErrorCode contained invalid_prepared_statement_definition invalid_recursion invalid_regular_expression
 syn keyword sqlErrorCode contained invalid_role_specification invalid_row_count_in_limit_clause
-syn keyword sqlErrorCode contained invalid_row_count_in_result_offset_clause invalid_savepoint_specification
-syn keyword sqlErrorCode contained invalid_schema_definition invalid_schema_name
-syn keyword sqlErrorCode contained invalid_sql_json_subscript invalid_sql_statement_name invalid_sqlstate_returned
-syn keyword sqlErrorCode contained invalid_table_definition invalid_tablesample_argument
-syn keyword sqlErrorCode contained invalid_tablesample_repeat invalid_text_representation
-syn keyword sqlErrorCode contained invalid_time_zone_displacement_value invalid_transaction_initiation
-syn keyword sqlErrorCode contained invalid_transaction_state invalid_transaction_termination
-syn keyword sqlErrorCode contained invalid_use_of_escape_character invalid_xml_comment invalid_xml_content
-syn keyword sqlErrorCode contained invalid_xml_document invalid_xml_processing_instruction io_error
-syn keyword sqlErrorCode contained locator_exception lock_file_exists lock_not_available
-syn keyword sqlErrorCode contained modifying_sql_data_not_permitted more_than_one_sql_json_item
-syn keyword sqlErrorCode contained most_specific_type_mismatch name_too_long no_active_sql_transaction
-syn keyword sqlErrorCode contained no_active_sql_transaction_for_branch_transaction
-syn keyword sqlErrorCode contained no_additional_dynamic_result_sets_returned no_data no_data_found
-syn keyword sqlErrorCode contained no_sql_json_item non_numeric_sql_json_item
-syn keyword sqlErrorCode contained non_unique_keys_in_a_json_object nonstandard_use_of_escape_character not_an_xml_document
-syn keyword sqlErrorCode contained not_null_violation null_value_eliminated_in_set_function
-syn keyword sqlErrorCode contained null_value_no_indicator_parameter null_value_not_allowed
-syn keyword sqlErrorCode contained numeric_value_out_of_range object_in_use object_not_in_prerequisite_state
-syn keyword sqlErrorCode contained operator_intervention out_of_memory plpgsql_error
-syn keyword sqlErrorCode contained privilege_not_granted privilege_not_revoked program_limit_exceeded
-syn keyword sqlErrorCode contained prohibited_sql_statement_attempted protocol_violation query_canceled
-syn keyword sqlErrorCode contained raise_exception read_only_sql_transaction
-syn keyword sqlErrorCode contained reading_sql_data_not_permitted reserved_name restrict_violation
-syn keyword sqlErrorCode contained savepoint_exception schema_and_data_statement_mixing_not_supported
-syn keyword sqlErrorCode contained sequence_generator_limit_exceeded serialization_failure
-syn keyword sqlErrorCode contained singleton_sql_json_item_required snapshot_too_old sql_json_array_not_found
-syn keyword sqlErrorCode contained sql_json_member_not_found sql_json_number_not_found
-syn keyword sqlErrorCode contained sql_json_object_not_found sql_json_scalar_required sql_routine_exception
-syn keyword sqlErrorCode contained sql_statement_not_yet_complete
+syn keyword sqlErrorCode contained invalid_row_count_in_result_offset_clause
+syn keyword sqlErrorCode contained invalid_savepoint_specification invalid_schema_definition invalid_schema_name
+syn keyword sqlErrorCode contained invalid_sql_json_subscript invalid_sql_statement_name
+syn keyword sqlErrorCode contained invalid_sqlstate_returned invalid_table_definition
+syn keyword sqlErrorCode contained invalid_tablesample_argument invalid_tablesample_repeat invalid_text_representation
+syn keyword sqlErrorCode contained invalid_time_zone_displacement_value
+syn keyword sqlErrorCode contained invalid_transaction_initiation invalid_transaction_state
+syn keyword sqlErrorCode contained invalid_transaction_termination invalid_use_of_escape_character invalid_xml_comment
+syn keyword sqlErrorCode contained invalid_xml_content invalid_xml_document
+syn keyword sqlErrorCode contained invalid_xml_processing_instruction io_error locator_exception lock_file_exists
+syn keyword sqlErrorCode contained lock_not_available modifying_sql_data_not_permitted
+syn keyword sqlErrorCode contained more_than_one_sql_json_item most_specific_type_mismatch name_too_long
+syn keyword sqlErrorCode contained no_active_sql_transaction
+syn keyword sqlErrorCode contained no_active_sql_transaction_for_branch_transaction no_additional_dynamic_result_sets_returned no_data
+syn keyword sqlErrorCode contained no_data_found no_sql_json_item non_numeric_sql_json_item
+syn keyword sqlErrorCode contained non_unique_keys_in_a_json_object nonstandard_use_of_escape_character
+syn keyword sqlErrorCode contained not_an_xml_document not_null_violation
+syn keyword sqlErrorCode contained null_value_eliminated_in_set_function null_value_no_indicator_parameter
+syn keyword sqlErrorCode contained null_value_not_allowed numeric_value_out_of_range object_in_use
+syn keyword sqlErrorCode contained object_not_in_prerequisite_state operator_intervention out_of_memory
+syn keyword sqlErrorCode contained plpgsql_error privilege_not_granted privilege_not_revoked
+syn keyword sqlErrorCode contained program_limit_exceeded prohibited_sql_statement_attempted
+syn keyword sqlErrorCode contained protocol_violation query_canceled raise_exception
+syn keyword sqlErrorCode contained read_only_sql_transaction reading_sql_data_not_permitted reserved_name
+syn keyword sqlErrorCode contained restrict_violation savepoint_exception
+syn keyword sqlErrorCode contained schema_and_data_statement_mixing_not_supported sequence_generator_limit_exceeded
+syn keyword sqlErrorCode contained serialization_failure singleton_sql_json_item_required snapshot_too_old
+syn keyword sqlErrorCode contained sql_json_array_not_found sql_json_member_not_found
+syn keyword sqlErrorCode contained sql_json_number_not_found sql_json_object_not_found sql_json_scalar_required
+syn keyword sqlErrorCode contained sql_routine_exception sql_statement_not_yet_complete
 syn keyword sqlErrorCode contained sqlclient_unable_to_establish_sqlconnection
 syn keyword sqlErrorCode contained sqlserver_rejected_establishment_of_sqlconnection srf_protocol_violated
-syn keyword sqlErrorCode contained stacked_diagnostics_accessed_without_active_handler statement_completion_unknown
-syn keyword sqlErrorCode contained statement_too_complex string_data_length_mismatch
-syn keyword sqlErrorCode contained string_data_right_truncation substring_error successful_completion syntax_error
-syn keyword sqlErrorCode contained syntax_error_or_access_rule_violation system_error too_many_arguments
-syn keyword sqlErrorCode contained too_many_columns too_many_connections
-syn keyword sqlErrorCode contained too_many_json_array_elements too_many_json_object_members too_many_rows
-syn keyword sqlErrorCode contained transaction_integrity_constraint_violation transaction_resolution_unknown
-syn keyword sqlErrorCode contained transaction_rollback trigger_protocol_violated
-syn keyword sqlErrorCode contained triggered_action_exception triggered_data_change_violation trim_error
-syn keyword sqlErrorCode contained undefined_column undefined_file undefined_function undefined_object
-syn keyword sqlErrorCode contained undefined_parameter undefined_table unique_violation
-syn keyword sqlErrorCode contained unsafe_new_enum_value_usage unterminated_c_string
-syn keyword sqlErrorCode contained untranslatable_character warning windowing_error with_check_option_violation
-syn keyword sqlErrorCode contained wrong_object_type zero_length_character_string
+syn keyword sqlErrorCode contained stacked_diagnostics_accessed_without_active_handler
+syn keyword sqlErrorCode contained statement_completion_unknown statement_too_complex string_data_length_mismatch
+syn keyword sqlErrorCode contained string_data_right_truncation substring_error successful_completion
+syn keyword sqlErrorCode contained syntax_error syntax_error_or_access_rule_violation
+syn keyword sqlErrorCode contained system_error too_many_arguments too_many_columns too_many_connections
+syn keyword sqlErrorCode contained too_many_json_array_elements too_many_json_object_members
+syn keyword sqlErrorCode contained too_many_rows transaction_integrity_constraint_violation
+syn keyword sqlErrorCode contained transaction_resolution_unknown transaction_rollback
+syn keyword sqlErrorCode contained trigger_protocol_violated triggered_action_exception
+syn keyword sqlErrorCode contained triggered_data_change_violation trim_error undefined_column undefined_file
+syn keyword sqlErrorCode contained undefined_function undefined_object undefined_parameter undefined_table
+syn keyword sqlErrorCode contained unique_violation unsafe_new_enum_value_usage unterminated_c_string
+syn keyword sqlErrorCode contained untranslatable_character warning windowing_error
+syn keyword sqlErrorCode contained with_check_option_violation wrong_object_type zero_length_character_string
 
 " Legacy keywords
 syn keyword sqlFunction contained gist_box_compress gist_box_decompress gist_box_fetch
@@ -1927,10 +2000,10 @@ syn match sqlOperator contained "\%(!\~\~\|\#<\#\|\#>\#\|\#>>\|%>>\|&&&\|&/&\|&<
 syn match sqlOperator contained "\%(<<@\|<<|\|<=>\|<@>\|>>=\|?-|\|?<@\|?@>\|?||\|@-@\|@>>\|@@@\|\^<@\|\^@>\||&>\||=|\)\ze\%([^!?~#^@<=>%&|*/+-]\|$\)"
 syn match sqlOperator contained "\%(|>>\|||/\|\~<\~\|\~==\|\~>\~\|\~\~\*\|\~\~=\|!!\|!\~\|\#\#\|\#-\|\#=\|\#>\|%\#\|%%\|%>\|&&\|&<\|&>\|\*<\|\*=\)\ze\%([^!?~#^@<=>%&|*/+-]\|$\)"
 syn match sqlOperator contained "\%(\*>\|->\|<%\|<<\|<=\|<>\|<@\|<\^\|=>\|>=\|>>\|>\^\|?\#\|?&\|?-\|?@\|?|\|?\~\|@>\|@?\|@@\|\^?\|\^@\|\^\~\||/\)\ze\%([^!?~#^@<=>%&|*/+-]\|$\)"
-syn match sqlOperator contained "\%(||\|\~\*\|\~=\|\~>\|\~\~\|!\|\#\|%\|&\|\*\|+\|-\|/\|<\|=\|>\|?\|@\|\^\||\|\~\)\ze\%([^!?~#^@<=>%&|*/+-]\|$\)"
+syn match sqlOperator contained "\%(||\|\~\*\|\~=\|\~>\|\~\~\|\#\|%\|&\|\*\|+\|-\|/\|<\|=\|>\|?\|@\|\^\||\|\~\)\ze\%([^!?~#^@<=>%&|*/+-]\|$\)"
 
 " Comments
-syn region sqlComment    start="/\*" end="\*/" contains=sqlTodo,@Spell
+syn region sqlComment    start="/\*" end="\*/" contains=sqlTodo,@Spell,sqlComment
 syn match  sqlComment    "#\s.*$"              contains=sqlTodo,@Spell
 syn match  sqlComment    "--.*$"               contains=sqlTodo,@Spell
 
@@ -2006,12 +2079,12 @@ syn match sqlPlpgsqlVariable ".\zs@[A-z0-9_]\+" contained
 syn match sqlPlpgsqlOperator ":=" contained
 
 syn region plpgsql matchgroup=sqlString start=+\$\z(pgsql\|body\|function\)\$+ end=+\$\z1\$+ keepend
-  \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlString,sqlTodo
+  \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlIdentifier,sqlString,sqlTodo
 if get(g:, 'pgsql_dollar_strings', 0)
   syn region sqlString start=+\$\$+ end=+\$\$+ contains=@Spell
 else
   syn region plpgsql matchgroup=sqlString start=+\$\$+ end=+\$\$+ keepend
-    \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlString,sqlTodo
+    \ contains=sqlIsKeyword,sqlIsFunction,sqlComment,sqlPlpgsqlKeyword,sqlPlpgsqlVariable,sqlPlpgsqlOperator,sqlNumber,sqlIsOperator,sqlIdentifier,sqlString,sqlTodo
 endif
 
 let s:plgroups = 'plpgsql'
diff --git a/syntax/postscr.vim b/syntax/postscr.vim
index 2a2b5a8fa..1466fdb4b 100644
--- a/syntax/postscr.vim
+++ b/syntax/postscr.vim
@@ -10,7 +10,7 @@ endif
 " URL:          http://www.eandem.co.uk/mrw/vim
 "
 " Options Flags:
-" postscr_level                 - language level to use for highligting (1, 2, or 3)
+" postscr_level                 - language level to use for highlighting (1, 2, or 3)
 " postscr_display               - include display PS operators
 " postscr_ghostscript           - include GS extensions
 " postscr_fonts                 - highlight standard font names (a lot for PS 3)
@@ -473,12 +473,12 @@ if postscr_level == 2 || postscr_level == 3
   syn keyword postscrConstant   contained SubsVector UnderlineThickness FamilyName FontBBox CurMID
   syn keyword postscrConstant   contained Weight
 
-" PS2 User paramters
+" PS2 User parameters
   syn keyword postscrConstant   contained MaxFontItem MinFontCompress MaxUPathItem MaxFormItem MaxPatternItem
   syn keyword postscrConstant   contained MaxScreenItem MaxOpStack MaxDictStack MaxExecStack MaxLocalVM
   syn keyword postscrConstant   contained VMReclaim VMThreshold
 
-" PS2 System paramters
+" PS2 System parameters
   syn keyword postscrConstant   contained SystemParamsPassword StartJobPassword BuildTime ByteOrder RealFormat
   syn keyword postscrConstant   contained MaxFontCache CurFontCache MaxOutlineCache CurOutlineCache
   syn keyword postscrConstant   contained MaxUPathCache CurUPathCache MaxFormCache CurFormCache
@@ -500,15 +500,15 @@ if postscr_level == 2 || postscr_level == 3
 " Page duplexing operators
   syn keyword postscrL2Operator   duplexmode firstside newsheet setduplexmode settumble tumble
 
-" Device compatability operators
+" Device compatibility operators
   syn keyword postscrL2Operator   devdismount devformat devmount devstatus
   syn keyword postscrL2Repeat     devforall
 
-" Imagesetter compatability operators
+" Imagesetter compatibility operators
   syn keyword postscrL2Operator   accuratescreens checkscreen pagemargin pageparams setaccuratescreens setpage
   syn keyword postscrL2Operator   setpagemargin setpageparams
 
-" Misc compatability operators
+" Misc compatibility operators
   syn keyword postscrL2Operator   appletalktype buildtime byteorder checkpassword defaulttimeouts diskonline
   syn keyword postscrL2Operator   diskstatus manualfeed manualfeedtimeout margins mirrorprint pagecount
   syn keyword postscrL2Operator   pagestackorder printername processcolors sethardwareiomode setjobtimeout
diff --git a/syntax/rst.vim b/syntax/rst.vim
index f20eafebb..810352205 100644
--- a/syntax/rst.vim
+++ b/syntax/rst.vim
@@ -33,8 +33,11 @@ syn region  rstQuotedLiteralBlock   matchgroup=rstDelimiter
       \ start="::\_s*\n\ze\z([!\"#$%&'()*+,-./:;<=>?@[\]^_`{|}~]\)"
       \ end='^\z1\@!' contains=@NoSpell
 
-syn region  rstDoctestBlock         oneline display matchgroup=rstDelimiter
+syn region  rstDoctestBlock         matchgroup=rstDoctestBlockPrompt
       \ start='^>>>\s' end='^$'
+      \ contains=rstDoctestBlockPrompt
+
+syn match   rstDoctestBlockPrompt   contained '^>>>\s'
 
 syn region  rstTable                transparent start='^\n\s*+[-=+]\+' end='^$'
       \ contains=rstTableLines,@rstCruft
@@ -53,7 +56,8 @@ syn cluster rstDirectives           contains=rstFootnote,rstCitation,
       \ rstHyperlinkTarget,rstExDirective
 
 syn match   rstExplicitMarkup       '^\s*\.\.\_s'
-      \ nextgroup=@rstDirectives,rstComment,rstSubstitutionDefinition
+      \ nextgroup=@rstDirectives,rstSubstitutionDefinition
+      \ contains=rstComment
 
 " "Simple reference names are single words consisting of alphanumerics plus
 " isolated (no two adjacent) internal hyphens, underscores, periods, colons
@@ -62,20 +66,23 @@ let s:ReferenceName = '[[:alnum:]]\%([-_.:+]\?[[:alnum:]]\+\)*'
 
 syn keyword     rstTodo             contained FIXME TODO XXX NOTE
 
-execute 'syn region rstComment contained' .
-      \ ' start=/.*/'
+syn region rstComment
+      \ start='\v^\z(\s*)\.\.(\_s+[\[|_]|\_s+.*::)@!' skip=+^$+ end=/^\(\z1   \)\@!/
+      \ contains=@Spell,rstTodo
+
+" Note: Order matters for rstCitation and rstFootnote as the regex for
+" citations also matches numeric only patterns, e.g. [1], which are footnotes.
+" Since we define rstFootnote after rstCitation, it takes precedence, see
+" |:syn-define|.
+execute 'syn region rstCitation contained matchgroup=rstDirective' .
+      \ ' start=+\[' . s:ReferenceName . '\]\_s+' .
       \ ' skip=+^$+' .
-      \ ' end=/^\s\@!/ contains=rstTodo'
+      \ ' end=+^\s\@!+ contains=@Spell,@rstCruft'
 
 execute 'syn region rstFootnote contained matchgroup=rstDirective' .
       \ ' start=+\[\%(\d\+\|#\%(' . s:ReferenceName . '\)\=\|\*\)\]\_s+' .
       \ ' skip=+^$+' .
-      \ ' end=+^\s\@!+ contains=@rstCruft,@NoSpell'
-
-execute 'syn region rstCitation contained matchgroup=rstDirective' .
-      \ ' start=+\[' . s:ReferenceName . '\]\_s+' .
-      \ ' skip=+^$+' .
-      \ ' end=+^\s\@!+ contains=@rstCruft,@NoSpell'
+      \ ' end=+^\s\@!+ contains=@Spell,@rstCruft'
 
 syn region rstHyperlinkTarget contained matchgroup=rstDirective
       \ start='_\%(_\|[^:\\]*\%(\\.[^:\\]*\)*\):\_s' skip=+^$+ end=+^\s\@!+
@@ -89,7 +96,7 @@ syn region rstHyperlinkTarget matchgroup=rstDirective
 execute 'syn region rstExDirective contained matchgroup=rstDirective' .
       \ ' start=+' . s:ReferenceName . '::\_s+' .
       \ ' skip=+^$+' .
-      \ ' end=+^\s\@!+ contains=@rstCruft,rstLiteralBlock,rstExplicitMarkup'
+      \ ' end=+^\s\@!+ contains=@Spell,@rstCruft,rstLiteralBlock,rstExplicitMarkup'
 
 execute 'syn match rstSubstitutionDefinition contained' .
       \ ' /|.*|\_s\+/ nextgroup=@rstDirectives'
@@ -103,10 +110,10 @@ function! s:DefineOneInlineMarkup(name, start, middle, end, char_left, char_righ
   endif
 
   if a:start != '``'
-    let rst_contains=' contains=rstEscape' . a:name
+    let rst_contains=' contains=@Spell,rstEscape' . a:name
     execute 'syn match rstEscape'.a:name.' +\\\\\|\\'.first.'+'.' contained'
   else
-    let rst_contains=''
+    let rst_contains=' contains=@Spell'
   endif
 
   execute 'syn region rst' . a:name .
@@ -271,6 +278,7 @@ hi def link rstTransition                   rstSections
 hi def link rstLiteralBlock                 String
 hi def link rstQuotedLiteralBlock           String
 hi def link rstDoctestBlock                 PreProc
+hi def link rstDoctestBlockPrompt           rstDelimiter
 hi def link rstTableLines                   rstDelimiter
 hi def link rstSimpleTableLines             rstTableLines
 hi def link rstExplicitMarkup               rstDirective
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index bbf86e8a6..d5c9e7288 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -367,6 +367,9 @@ if !exists("b:ruby_no_expensive") && !exists("ruby_no_expensive")
   SynFold 'class'  syn region rubyClassBlock  start="\<class\>"  matchgroup=rubyClass  skip="\<end:"			       end="\<end\>" contains=ALLBUT,@rubyNotTop
   SynFold 'module' syn region rubyModuleBlock start="\<module\>" matchgroup=rubyModule skip="\<end:"			       end="\<end\>" contains=ALLBUT,@rubyNotTop
 
+  " endless def
+  syn match rubyDefine "\<def\s\+\ze[^[:space:];#(]\+\%(\s\+\|\s*(.*)\s*\)=" nextgroup=rubyMethodDeclaration skipwhite
+
   " modifiers
   syn match rubyLineContinuation    "\\$" nextgroup=@rubyModifier skipwhite skipnl
   syn match rubyConditionalModifier "\<\%(if\|unless\)\>"
@@ -433,9 +436,10 @@ endif
 " Comments and Documentation {{{1
 syn match   rubySharpBang    "\%^#!.*" display
 syn keyword rubyTodo	     FIXME NOTE TODO OPTIMIZE HACK REVIEW XXX todo contained
-syn match   rubyEncoding     "[[:alnum:]-]\+" contained display
+syn match   rubyEncoding     "[[:alnum:]-_]\+" contained display
 syn match   rubyMagicComment "\c\%<3l#\s*\zs\%(coding\|encoding\):"					contained nextgroup=rubyEncoding skipwhite
 syn match   rubyMagicComment "\c\%<10l#\s*\zs\%(frozen_string_literal\|warn_indent\|warn_past_scope\):" contained nextgroup=rubyBoolean  skipwhite
+syn match   rubyMagicComment "\c\%<10l#\s*\zs\%(shareable_constant_value\):"				contained nextgroup=rubyEncoding  skipwhite
 syn match   rubyComment	     "#.*" contains=@rubyCommentSpecial,rubySpaceError,@Spell
 
 syn cluster rubyCommentSpecial contains=rubySharpBang,rubyTodo,rubyMagicComment
diff --git a/syntax/sml.vim b/syntax/sml.vim
index 26347128f..098d023aa 100644
--- a/syntax/sml.vim
+++ b/syntax/sml.vim
@@ -7,19 +7,18 @@ endif
 " Filenames:    *.sml *.sig
 " Maintainers:  Markus Mottl            <markus.mottl@gmail.com>
 "               Fabrizio Zeno Cornelli  <zeno@filibusta.crema.unimi.it>
-" Last Change:  2019 Oct 01 - Only spell check strings & comments (Chuan Wei Foo)
+" Last Change:  2021 Oct 04
 "               2015 Aug 31 - Fixed opening of modules (Ramana Kumar)
 "               2006 Oct 23 - Fixed character highlighting bug (MM)
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
+  finish
+endif
 
 " Disable spell checking of syntax.
 syn spell notoplevel
 
-  finish
-endif
-
 " SML is case sensitive.
 syn case match
 
diff --git a/syntax/spup.vim b/syntax/spup.vim
index 943e0e555..82231863a 100644
--- a/syntax/spup.vim
+++ b/syntax/spup.vim
@@ -29,7 +29,7 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" don't hightlight several keywords like subsections
+" don't highlight several keywords like subsections
 "let strict_subsections = 1
 
 " highlight types usually found in DECLARE section
@@ -39,7 +39,7 @@ endif
 
 " one line comment syntax (# comments)
 " 1. allow appended code after comment, do not complain
-" 2. show code beginnig with the second # as an error
+" 2. show code beginning with the second # as an error
 " 3. show whole lines with more than one # as an error
 if !exists("oneline_comments")
     let oneline_comments = 2
@@ -181,7 +181,7 @@ syn cluster spupOrdinary  contains=spupNumber,spupIdentifier,spupSymbol
 syn cluster spupOrdinary  add=spupError,spupString,spupComment
 syn cluster spupTextproc  contains=spupTextprocGeneric,spupTextprocError
 
-" define syncronizing; especially OPERATION sections can become very large
+" define synchronizing; especially OPERATION sections can become very large
 syn sync clear
 syn sync minlines=100
 syn sync maxlines=500
diff --git a/syntax/st.vim b/syntax/st.vim
index 5ad026bfd..7f214c886 100644
--- a/syntax/st.vim
+++ b/syntax/st.vim
@@ -48,7 +48,7 @@ syn match  stCharacter	"$."
 
 syn case ignore
 
-" the symols prefixed by a '#'
+" the symbols prefixed by a '#'
 syn match  stSymbol	"\(#\<[a-z_][a-z0-9_]*\>\)"
 syn match  stSymbol	"\(#'[^']*'\)"
 
@@ -62,7 +62,7 @@ syn match  stFloat	"\<\d\+e[-+]\=\d\+[fl]\=\>"
 
 syn case match
 
-" a try to higlight paren mismatches
+" a try to highlight paren mismatches
 syn region stParen	transparent start='(' end=')' contains=ALLBUT,stParenError
 syn match  stParenError	")"
 syn region stBlock	transparent start='\[' end='\]' contains=ALLBUT,stBlockError
diff --git a/syntax/swift.vim b/syntax/swift.vim
index 25c629422..8b41f5602 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -232,6 +232,8 @@ syntax keyword swiftStructure
 syntax keyword swiftDebugIdentifier
       \ #column
       \ #file
+      \ #fileID
+      \ #filePath
       \ #function
       \ #line
       \ __COLUMN__
diff --git a/syntax/tcl.vim b/syntax/tcl.vim
index 73d1e6072..54ec20a7c 100644
--- a/syntax/tcl.vim
+++ b/syntax/tcl.vim
@@ -10,9 +10,9 @@ endif
 "		(previously Matt Neumann <mattneu@purpleturtle.com>)
 "		(previously Allan Kelly <allan@fruitloaf.co.uk>)
 " Original:	Robin Becker <robin@jessikat.demon.co.uk>
-" Last Change:	2014-02-12
-" Version:	1.14
-" URL:		http://bitbucket.org/taylor_venable/metasyntax/src/tip/Config/vim/syntax/tcl.vim
+" Last Change:	2021 Nov 16
+" Version:	1.14 plus improvements from PR #8948
+" URL:		(removed, no longer worked)
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -172,7 +172,7 @@ syn region tcltkCommand matchgroup=tcltkCommandColor start="\<format\>" matchgro
 
 " PACK
 " commands associated with pack
-syn keyword tcltkPackSwitch	contained	forget info propogate slaves
+syn keyword tcltkPackSwitch	contained	forget info propagate slaves
 syn keyword tcltkPackConfSwitch	contained	after anchor before expand fill in ipadx ipady padx pady side
 syn region tcltkCommand matchgroup=tcltkCommandColor start="\<pack\>" matchgroup=NONE skip="^\s*$" end="]\|[^\\]*\s*$"he=e-1  contains=tclLineContinue,tcltkPackSwitch,tcltkPackConf,tcltkPackConfSwitch,tclNumber,tclVarRef,tclString,tcltkCommand keepend
 
@@ -196,18 +196,18 @@ syn region tcltkCommand matchgroup=tcltkCommandColor start="\<lsort\>" matchgrou
 syn keyword tclTodo contained	TODO
 
 " Sequences which are backslash-escaped: http://www.tcl.tk/man/tcl8.5/TclCmd/Tcl.htm#M16
-" Octal, hexadecimal, unicode codepoints, and the classics.
+" Octal, hexadecimal, Unicode codepoints, and the classics.
 " Tcl takes as many valid characters in a row as it can, so \xAZ in a string is newline followed by 'Z'.
-syn match   tclSpecial contained '\\\([0-7]\{1,3}\|x\x\{1,2}\|u\x\{1,4}\|[abfnrtv]\)'
+syn match   tclSpecial contained '\\\(\o\{1,3}\|x\x\{1,2}\|u\x\{1,4}\|[abfnrtv]\)'
 syn match   tclSpecial contained '\\[\[\]\{\}\"\$]'
 
 " Command appearing inside another command or inside a string.
 syn region tclEmbeddedStatement	start='\[' end='\]' contained contains=tclCommand,tclNumber,tclLineContinue,tclString,tclVarRef,tclEmbeddedStatement
 " A string needs the skip argument as it may legitimately contain \".
 " Match at start of line
-syn region  tclString		  start=+^"+ end=+"+ contains=@tclSpecialC skip=+\\\\\|\\"+
+syn region  tclString		  start=+^"+ end=+"+ contains=@tclSpecialC,@Spell skip=+\\\\\|\\"+
 "Match all other legal strings.
-syn region  tclString		  start=+[^\\]"+ms=s+1  end=+"+ contains=@tclSpecialC,@tclVarRefC,tclEmbeddedStatement skip=+\\\\\|\\"+
+syn region  tclString		  start=+[^\\]"+ms=s+1  end=+"+ contains=@tclSpecialC,@tclVarRefC,tclEmbeddedStatement,@Spell skip=+\\\\\|\\"+
 
 " Line continuation is backslash immediately followed by newline.
 syn match tclLineContinue '\\$'
@@ -226,12 +226,12 @@ syn match  tclNumber		"\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>"
 "floating point number, without dot, with exponent
 syn match  tclNumber		"\<\d\+e[-+]\=\d\+[fl]\=\>"
 "hex number
-syn match  tclNumber		"0x[0-9a-f]\+\(u\=l\=\|lu\)\>"
-"syn match  tclIdentifier	"\<[a-z_][a-z0-9_]*\>"
+syn match  tclNumber		"0x\x\+\(u\=l\=\|lu\)\>"
+"syn match  tclIdentifier	"\<\h\w*\>"
 syn case match
 
-syn region  tclComment		start="^\s*\#" skip="\\$" end="$" contains=tclTodo
-syn region  tclComment		start=/;\s*\#/hs=s+1 skip="\\$" end="$" contains=tclTodo
+syn region  tclComment		start="^\s*\#" skip="\\$" end="$" contains=tclTodo,@Spell
+syn region  tclComment		start=/;\s*\#/hs=s+1 skip="\\$" end="$" contains=tclTodo,@Spell
 
 "syn match tclComment /^\s*\#.*$/
 "syn match tclComment /;\s*\#.*$/hs=s+1
diff --git a/syntax/texinfo.vim b/syntax/texinfo.vim
index fa5659ad0..deb81c4ca 100644
--- a/syntax/texinfo.vim
+++ b/syntax/texinfo.vim
@@ -3,398 +3,48 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'texinfo', 'syntax/texinfo.vim
 endif
 
 " Vim syntax file
-" Language:	Texinfo (macro package for TeX)
-" Maintainer:	Sandor Kopanyi <sandor.kopanyi@mailbox.hu>
-" URL:		<->
-" Last Change:	2004 Jun 23
-"
-" the file follows the Texinfo manual structure; this file is based
-" on manual for Texinfo version 4.0, 28 September 1999
-" since @ can have special meanings, everything is 'match'-ed and 'region'-ed
-" (including @ in 'iskeyword' option has unexpected effects)
+" Language:         Texinfo (documentation format)
+" Maintainer:       Robert Dodier <robert.dodier@gmail.com>
+" Latest Revision:  2021-12-15
 
-" quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 
-if !exists("main_syntax")
-  let main_syntax = 'texinfo'
-endif
-
-"in Texinfo can be real big things, like tables; sync for that
-syn sync lines=200
-
-"some general stuff
-"syn match texinfoError     "\S" contained TODO
-syn match texinfoIdent	    "\k\+"		  contained "IDENTifier
-syn match texinfoAssignment "\k\+\s*=\s*\k\+\s*$" contained "assigment statement ( var = val )
-syn match texinfoSinglePar  "\k\+\s*$"		  contained "single parameter (used for several @-commands)
-syn match texinfoIndexPar   "\k\k\s*$"		  contained "param. used for different *index commands (+ @documentlanguage command)
-
-
-"marking words and phrases (chap. 9 in Texinfo manual)
-"(almost) everything appears as 'contained' too; is for tables (@table)
-
-"this chapter is at the beginning of this file to avoid overwritings
-
-syn match texinfoSpecialChar				    "@acronym"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@acronym{" end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@b"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@b{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@cite"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@cite{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@code"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@code{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@command"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@command{" end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@dfn"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@dfn{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@email"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@email{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@emph"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@emph{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@env"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@env{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@file"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@file{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@i"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@i{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@kbd"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@kbd{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@key"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@key{"	end="}" contains=texinfoSpecialChar
-syn match texinfoSpecialChar				    "@option"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@option{"	end="}" contains=texinfoSpecialChar
-syn match texinfoSpecialChar				    "@r"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@r{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@samp"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@samp{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@sc"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@sc{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@strong"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@strong{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@t"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@t{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@url"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@url{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoSpecialChar				    "@var"		contained
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@var{"	end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn match texinfoAtCmd "^@kbdinputstyle" nextgroup=texinfoSinglePar skipwhite
-
-
-"overview of Texinfo (chap. 1 in Texinfo manual)
-syn match texinfoComment  "@c .*"
-syn match texinfoComment  "@c$"
-syn match texinfoComment  "@comment .*"
-syn region texinfoMltlnAtCmd matchgroup=texinfoComment start="^@ignore\s*$" end="^@end ignore\s*$" contains=ALL
-
-
-"beginning a Texinfo file (chap. 3 in Texinfo manual)
-syn region texinfoPrmAtCmd     matchgroup=texinfoAtCmd start="@center "		 skip="\\$" end="$"		       contains=texinfoSpecialChar,texinfoBrcPrmAtCmd oneline
-syn region texinfoMltlnDMAtCmd matchgroup=texinfoAtCmd start="^@detailmenu\s*$"		    end="^@end detailmenu\s*$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn region texinfoPrmAtCmd     matchgroup=texinfoAtCmd start="^@setfilename "    skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd     matchgroup=texinfoAtCmd start="^@settitle "       skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd     matchgroup=texinfoAtCmd start="^@shorttitlepage " skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd     matchgroup=texinfoAtCmd start="^@title "		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoBrcPrmAtCmd  matchgroup=texinfoAtCmd start="@titlefont{"		    end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn region texinfoMltlnAtCmd   matchgroup=texinfoAtCmd start="^@titlepage\s*$"		    end="^@end titlepage\s*$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoMltlnDMAtCmd,texinfoAtCmd,texinfoPrmAtCmd,texinfoMltlnAtCmd
-syn region texinfoPrmAtCmd     matchgroup=texinfoAtCmd start="^@vskip "		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn match texinfoAtCmd "^@exampleindent"     nextgroup=texinfoSinglePar skipwhite
-syn match texinfoAtCmd "^@headings"	     nextgroup=texinfoSinglePar skipwhite
-syn match texinfoAtCmd "^\\input"	     nextgroup=texinfoSinglePar skipwhite
-syn match texinfoAtCmd "^@paragraphindent"   nextgroup=texinfoSinglePar skipwhite
-syn match texinfoAtCmd "^@setchapternewpage" nextgroup=texinfoSinglePar skipwhite
-
-
-"ending a Texinfo file (chap. 4 in Texinfo manual)
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="@author " skip="\\$" end="$" contains=texinfoSpecialChar oneline
-"all below @bye should be comment TODO
-syn match texinfoAtCmd "^@bye\s*$"
-syn match texinfoAtCmd "^@contents\s*$"
-syn match texinfoAtCmd "^@printindex" nextgroup=texinfoIndexPar skipwhite
-syn match texinfoAtCmd "^@setcontentsaftertitlepage\s*$"
-syn match texinfoAtCmd "^@setshortcontentsaftertitlepage\s*$"
-syn match texinfoAtCmd "^@shortcontents\s*$"
-syn match texinfoAtCmd "^@summarycontents\s*$"
-
-
-"chapter structuring (chap. 5 in Texinfo manual)
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@appendix"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@appendixsec"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@appendixsection"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@appendixsubsec"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@appendixsubsubsec"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@centerchap"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@chapheading"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@chapter"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@heading"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@majorheading"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@section"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@subheading "	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@subsection"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@subsubheading"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@subsubsection"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@subtitle"		 skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@unnumbered"		 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@unnumberedsec"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@unnumberedsubsec"	 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@unnumberedsubsubsec" skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn match  texinfoAtCmd "^@lowersections\s*$"
-syn match  texinfoAtCmd "^@raisesections\s*$"
-
-
-"nodes (chap. 6 in Texinfo manual)
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@anchor{"		  end="}"
-syn region texinfoPrmAtCmd    matchgroup=texinfoAtCmd start="^@top"    skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd    matchgroup=texinfoAtCmd start="^@node"   skip="\\$" end="$" contains=texinfoSpecialChar oneline
-
-
-"menus (chap. 7 in Texinfo manual)
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@menu\s*$" end="^@end menu\s*$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoMltlnDMAtCmd
-
-
-"cross references (chap. 8 in Texinfo manual)
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@inforef{" end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@pxref{"   end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@ref{"     end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@uref{"    end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@xref{"    end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-
-
-"marking words and phrases (chap. 9 in Texinfo manual)
-"(almost) everything appears as 'contained' too; is for tables (@table)
-
-"this chapter is at the beginning of this file to avoid overwritings
-
-
-"quotations and examples (chap. 10 in Texinfo manual)
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@cartouche\s*$"	    end="^@end cartouche\s*$"	    contains=ALL
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@display\s*$"	    end="^@end display\s*$"	    contains=ALL
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@example\s*$"	    end="^@end example\s*$"	    contains=ALL
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@flushleft\s*$"	    end="^@end flushleft\s*$"	    contains=ALL
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@flushright\s*$"	    end="^@end flushright\s*$"	    contains=ALL
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@format\s*$"	    end="^@end format\s*$"	    contains=ALL
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@lisp\s*$"		    end="^@end lisp\s*$"	    contains=ALL
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@quotation\s*$"	    end="^@end quotation\s*$"	    contains=ALL
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@smalldisplay\s*$"     end="^@end smalldisplay\s*$"    contains=ALL
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@smallexample\s*$"     end="^@end smallexample\s*$"    contains=ALL
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@smallformat\s*$"	    end="^@end smallformat\s*$"     contains=ALL
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@smalllisp\s*$"	    end="^@end smalllisp\s*$"	    contains=ALL
-syn region texinfoPrmAtCmd   matchgroup=texinfoAtCmd start="^@exdent"	 skip="\\$" end="$"			    contains=texinfoSpecialChar oneline
-syn match texinfoAtCmd "^@noindent\s*$"
-syn match texinfoAtCmd "^@smallbook\s*$"
-
-
-"lists and tables (chap. 11 in Texinfo manual)
-syn match texinfoAtCmd "@asis"		   contained
-syn match texinfoAtCmd "@columnfractions"  contained
-syn match texinfoAtCmd "@item"		   contained
-syn match texinfoAtCmd "@itemx"		   contained
-syn match texinfoAtCmd "@tab"		   contained
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@enumerate"  end="^@end enumerate\s*$"  contains=ALL
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ftable"     end="^@end ftable\s*$"     contains=ALL
-syn region texinfoMltlnNAtCmd matchgroup=texinfoAtCmd start="^@itemize"    end="^@end itemize\s*$"    contains=ALL
-syn region texinfoMltlnNAtCmd matchgroup=texinfoAtCmd start="^@multitable" end="^@end multitable\s*$" contains=ALL
-syn region texinfoMltlnNAtCmd matchgroup=texinfoAtCmd start="^@table"      end="^@end table\s*$"      contains=ALL
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@vtable"     end="^@end vtable\s*$"     contains=ALL
+let s:cpo_save = &cpo
+set cpo&vim
 
+syn match texinfoControlSequence display '\(@end [a-zA-Z@]\+\|@[a-zA-Z@]\+\)'
 
-"indices (chap. 12 in Texinfo manual)
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@\(c\|f\|k\|p\|t\|v\)index"   skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@..index"			 skip="\\$" end="$" contains=texinfoSpecialChar oneline
-"@defcodeindex and @defindex is defined after chap. 15's @def* commands (otherwise those ones will overwrite these ones)
-syn match texinfoSIPar "\k\k\s*\k\k\s*$" contained
-syn match texinfoAtCmd "^@syncodeindex" nextgroup=texinfoSIPar skipwhite
-syn match texinfoAtCmd "^@synindex"     nextgroup=texinfoSIPar skipwhite
+syn match texinfoComment         display '^\s*\(@comment\|@c\)\>.*$'
 
-"special insertions (chap. 13 in Texinfo manual)
-syn match texinfoSpecialChar "@\(!\|?\|@\|\s\)"
-syn match texinfoSpecialChar "@{"
-syn match texinfoSpecialChar "@}"
-"accents
-syn match texinfoSpecialChar "@=."
-syn match texinfoSpecialChar "@\('\|\"\|\^\|`\)[aeiouyAEIOUY]"
-syn match texinfoSpecialChar "@\~[aeinouyAEINOUY]"
-syn match texinfoSpecialChar "@dotaccent{.}"
-syn match texinfoSpecialChar "@H{.}"
-syn match texinfoSpecialChar "@,{[cC]}"
-syn match texinfoSpecialChar "@AA{}"
-syn match texinfoSpecialChar "@aa{}"
-syn match texinfoSpecialChar "@L{}"
-syn match texinfoSpecialChar "@l{}"
-syn match texinfoSpecialChar "@O{}"
-syn match texinfoSpecialChar "@o{}"
-syn match texinfoSpecialChar "@ringaccent{.}"
-syn match texinfoSpecialChar "@tieaccent{..}"
-syn match texinfoSpecialChar "@u{.}"
-syn match texinfoSpecialChar "@ubaraccent{.}"
-syn match texinfoSpecialChar "@udotaccent{.}"
-syn match texinfoSpecialChar "@v{.}"
-"ligatures
-syn match texinfoSpecialChar "@AE{}"
-syn match texinfoSpecialChar "@ae{}"
-syn match texinfoSpecialChar "@copyright{}"
-syn match texinfoSpecialChar "@bullet" contained "for tables and lists
-syn match texinfoSpecialChar "@bullet{}"
-syn match texinfoSpecialChar "@dotless{i}"
-syn match texinfoSpecialChar "@dotless{j}"
-syn match texinfoSpecialChar "@dots{}"
-syn match texinfoSpecialChar "@enddots{}"
-syn match texinfoSpecialChar "@equiv" contained "for tables and lists
-syn match texinfoSpecialChar "@equiv{}"
-syn match texinfoSpecialChar "@error{}"
-syn match texinfoSpecialChar "@exclamdown{}"
-syn match texinfoSpecialChar "@expansion{}"
-syn match texinfoSpecialChar "@minus" contained "for tables and lists
-syn match texinfoSpecialChar "@minus{}"
-syn match texinfoSpecialChar "@OE{}"
-syn match texinfoSpecialChar "@oe{}"
-syn match texinfoSpecialChar "@point" contained "for tables and lists
-syn match texinfoSpecialChar "@point{}"
-syn match texinfoSpecialChar "@pounds{}"
-syn match texinfoSpecialChar "@print{}"
-syn match texinfoSpecialChar "@questiondown{}"
-syn match texinfoSpecialChar "@result" contained "for tables and lists
-syn match texinfoSpecialChar "@result{}"
-syn match texinfoSpecialChar "@ss{}"
-syn match texinfoSpecialChar "@TeX{}"
-"other
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@dmn{"      end="}"
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@footnote{" end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@image{"    end="}"
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@math{"     end="}"
-syn match texinfoAtCmd "@footnotestyle" nextgroup=texinfoSinglePar skipwhite
+syn region texinfoCode matchgroup=texinfoControlSequence start="@code{" end="}" contains=ALL
+syn region texinfoVerb matchgroup=texinfoControlSequence start="@verb{" end="}" contains=ALL
 
+syn region texinfoArgument matchgroup=texinfoBrace start="{" end="}" contains=ALLBUT
 
-"making and preventing breaks (chap. 14 in Texinfo manual)
-syn match texinfoSpecialChar  "@\(\*\|-\|\.\)"
-syn match texinfoAtCmd	      "^@need"	   nextgroup=texinfoSinglePar skipwhite
-syn match texinfoAtCmd	      "^@page\s*$"
-syn match texinfoAtCmd	      "^@sp"	   nextgroup=texinfoSinglePar skipwhite
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@group\s*$"   end="^@end group\s*$" contains=ALL
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@hyphenation{" end="}"
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@w{"	    end="}"		  contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
+syn region texinfoExample matchgroup=texinfoControlSequence start="^@example\s*$" end="^@end example\s*$" contains=ALL
 
+syn region texinfoVerbatim matchgroup=texinfoControlSequence start="^@verbatim\s*$" end="^@end verbatim\s*$"
 
-"definition commands (chap. 15 in Texinfo manual)
-syn match texinfoMltlnAtCmdFLine "^@def\k\+" contained
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@def\k\+" end="^@end def\k\+$"      contains=ALL
-
-"next 2 commands are from chap. 12; must be defined after @def* commands above to overwrite them
-syn match texinfoAtCmd "@defcodeindex" nextgroup=texinfoIndexPar skipwhite
-syn match texinfoAtCmd "@defindex" nextgroup=texinfoIndexPar skipwhite
-
-
-"conditionally visible text (chap. 16 in Texinfo manual)
-syn match texinfoAtCmd "^@clear" nextgroup=texinfoSinglePar skipwhite
-syn region texinfoMltln2AtCmd matchgroup=texinfoAtCmd start="^@html\s*$"	end="^@end html\s*$"
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifclear"		end="^@end ifclear\s*$"   contains=ALL
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifhtml"		end="^@end ifhtml\s*$"	  contains=ALL
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifinfo"		end="^@end ifinfo\s*$"	  contains=ALL
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifnothtml"	end="^@end ifnothtml\s*$" contains=ALL
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifnotinfo"	end="^@end ifnotinfo\s*$" contains=ALL
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifnottex"	end="^@end ifnottex\s*$"  contains=ALL
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@ifset"		end="^@end ifset\s*$"	  contains=ALL
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@iftex"		end="^@end iftex\s*$"	  contains=ALL
-syn region texinfoPrmAtCmd    matchgroup=texinfoAtCmd start="^@set " skip="\\$" end="$" contains=texinfoSpecialChar oneline
-syn region texinfoTexCmd			      start="\$\$"		end="\$\$" contained
-syn region texinfoMltlnAtCmd  matchgroup=texinfoAtCmd start="^@tex"		end="^@end tex\s*$"	  contains=texinfoTexCmd
-syn region texinfoBrcPrmAtCmd matchgroup=texinfoAtCmd start="@value{"		end="}" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-
-
-"internationalization (chap. 17 in Texinfo manual)
-syn match texinfoAtCmd "@documentencoding" nextgroup=texinfoSinglePar skipwhite
-syn match texinfoAtCmd "@documentlanguage" nextgroup=texinfoIndexPar skipwhite
-
-
-"defining new texinfo commands (chap. 18 in Texinfo manual)
-syn match texinfoAtCmd	"@alias"		      nextgroup=texinfoAssignment skipwhite
-syn match texinfoDIEPar "\S*\s*,\s*\S*\s*,\s*\S*\s*$" contained
-syn match texinfoAtCmd	"@definfoenclose"	      nextgroup=texinfoDIEPar	  skipwhite
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@macro" end="^@end macro\s*$" contains=ALL
-
-
-"formatting hardcopy (chap. 19 in Texinfo manual)
-syn match texinfoAtCmd "^@afourlatex\s*$"
-syn match texinfoAtCmd "^@afourpaper\s*$"
-syn match texinfoAtCmd "^@afourwide\s*$"
-syn match texinfoAtCmd "^@finalout\s*$"
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@pagesizes" end="$" oneline
-
-
-"creating and installing Info Files (chap. 20 in Texinfo manual)
-syn region texinfoPrmAtCmd   matchgroup=texinfoAtCmd start="^@dircategory"  skip="\\$" end="$" oneline
-syn region texinfoMltlnAtCmd matchgroup=texinfoAtCmd start="^@direntry\s*$"	       end="^@end direntry\s*$" contains=texinfoSpecialChar
-syn match  texinfoAtCmd "^@novalidate\s*$"
-
-
-"include files (appendix E in Texinfo manual)
-syn match texinfoAtCmd "^@include" nextgroup=texinfoSinglePar skipwhite
-
-
-"page headings (appendix F in Texinfo manual)
-syn match texinfoHFSpecialChar "@|"		  contained
-syn match texinfoThisAtCmd     "@thischapter"	  contained
-syn match texinfoThisAtCmd     "@thischaptername" contained
-syn match texinfoThisAtCmd     "@thisfile"	  contained
-syn match texinfoThisAtCmd     "@thispage"	  contained
-syn match texinfoThisAtCmd     "@thistitle"	  contained
-syn match texinfoThisAtCmd     "@today{}"	  contained
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@evenfooting"  skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoThisAtCmd,texinfoHFSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@evenheading"  skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoThisAtCmd,texinfoHFSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@everyfooting" skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoThisAtCmd,texinfoHFSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@everyheading" skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoThisAtCmd,texinfoHFSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@oddfooting"   skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoThisAtCmd,texinfoHFSpecialChar oneline
-syn region texinfoPrmAtCmd matchgroup=texinfoAtCmd start="^@oddheading"   skip="\\$" end="$" contains=texinfoSpecialChar,texinfoBrcPrmAtCmd,texinfoThisAtCmd,texinfoHFSpecialChar oneline
-
-
-"refilling paragraphs (appendix H in Texinfo manual)
-syn match  texinfoAtCmd "@refill"
-
-
-syn cluster texinfoAll contains=ALLBUT,texinfoThisAtCmd,texinfoHFSpecialChar
-syn cluster texinfoReducedAll contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
-"==============================================================================
-" highlighting
-
-" Only when an item doesn't have highlighting yet
-
-hi def link texinfoSpecialChar	Special
-hi def link texinfoHFSpecialChar	Special
-
-hi def link texinfoError		Error
-hi def link texinfoIdent		Identifier
-hi def link texinfoAssignment	Identifier
-hi def link texinfoSinglePar	Identifier
-hi def link texinfoIndexPar	Identifier
-hi def link texinfoSIPar		Identifier
-hi def link texinfoDIEPar		Identifier
-hi def link texinfoTexCmd		PreProc
-
-
-hi def link texinfoAtCmd		Statement	"@-command
-hi def link texinfoPrmAtCmd	String		"@-command in one line with unknown nr. of parameters
-					      "is String because is found as a region and is 'matchgroup'-ed
-					      "to texinfoAtCmd
-hi def link texinfoBrcPrmAtCmd	String		"@-command with parameter(s) in braces ({})
-					      "is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
-hi def link texinfoMltlnAtCmdFLine  texinfoAtCmd	"repeated embedded First lines in @-commands
-hi def link texinfoMltlnAtCmd	String		"@-command in multiple lines
-					      "is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
-hi def link texinfoMltln2AtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
-hi def link texinfoMltlnDMAtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors; used for @detailmenu, which can be included in @menu)
-hi def link texinfoMltlnNAtCmd	Normal		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
-hi def link texinfoThisAtCmd	Statement	"@-command used in headers and footers (@this... series)
-
-hi def link texinfoComment	Comment
+syn region texinfoMenu matchgroup=texinfoControlSequence start="^@menu\s*$" end="^@end menu\s*$"
 
+if exists("g:texinfo_delimiters")
+  syn match texinfoDelimiter display '[][{}]'
+endif
 
+hi def link texinfoDelimiter       Delimiter
+hi def link texinfoComment         Comment
+hi def link texinfoControlSequence Identifier
+hi def link texinfoBrace           Operator
+hi def link texinfoArgument        Special
+hi def link texinfoExample         String
+hi def link texinfoVerbatim        String
+hi def link texinfoVerb            String
+hi def link texinfoCode            String
+hi def link texinfoMenu            String
 
 let b:current_syntax = "texinfo"
 
-if main_syntax == 'texinfo'
-  unlet main_syntax
-endif
-
-" vim: ts=8
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index 340b00fd6..4505f10ec 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'tmux', 'syntax/tmux.vim')
 endif
 
 " Language: tmux(1) configuration file
-" Version: 3.2a (git-44ada9cd)
+" Version: 3.3-rc (git-77fc7ac3)
 " URL: https://github.com/ericpruitt/tmux.vim/
 " Maintainer: Eric Pruitt <eric.pruitt@gmail.com>
 " License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause)
@@ -12,7 +12,7 @@ if exists("b:current_syntax")
     finish
 endif
 
-" Explicitly change compatiblity options to Vim's defaults because this file
+" Explicitly change compatibility options to Vim's defaults because this file
 " uses line continuations.
 let s:original_cpo = &cpo
 set cpo&vim
@@ -71,21 +71,23 @@ if get(g:, "tmux_syntax_colors", 1)
 endif
 
 syn keyword tmuxOptions
-\ backspace buffer-limit command-alias copy-command default-terminal editor
-\ escape-time exit-empty activity-action assume-paste-time base-index
-\ bell-action default-command default-shell default-size destroy-unattached
-\ detach-on-destroy display-panes-active-colour display-panes-colour
-\ display-panes-time display-time exit-unattached extended-keys focus-events
+\ backspace buffer-limit command-alias copy-command cursor-colour
+\ cursor-style default-terminal editor escape-time activity-action
+\ assume-paste-time base-index bell-action default-command default-shell
+\ default-size destroy-unattached detach-on-destroy
+\ display-panes-active-colour display-panes-colour display-panes-time
+\ display-time exit-empty exit-unattached extended-keys focus-events
 \ history-file history-limit key-table lock-after-time lock-command
-\ message-command-style message-limit message-style aggressive-resize
-\ allow-rename alternate-screen automatic-rename automatic-rename-format
+\ message-command-style message-limit aggressive-resize allow-rename
+\ alternate-screen automatic-rename automatic-rename-format
 \ clock-mode-colour clock-mode-style copy-mode-current-match-style
 \ copy-mode-mark-style copy-mode-match-style main-pane-height
-\ main-pane-width mode-keys mode-style monitor-activity monitor-bell
-\ monitor-silence mouse other-pane-height other-pane-width
+\ main-pane-width message-style mode-keys mode-style monitor-activity
+\ monitor-bell monitor-silence mouse other-pane-height other-pane-width
 \ pane-active-border-style pane-base-index pane-border-format
-\ pane-border-lines pane-border-status pane-border-style pane-colours prefix
-\ prefix2 prompt-history-limit remain-on-exit renumber-windows repeat-time
+\ pane-border-lines pane-border-status pane-border-style pane-colours
+\ popup-border-lines popup-border-style popup-style prefix prefix2
+\ prompt-history-limit remain-on-exit renumber-windows repeat-time
 \ set-clipboard set-titles set-titles-string silence-action status status-bg
 \ status-fg status-format status-interval status-justify status-keys
 \ status-left status-left-length status-left-style status-position
diff --git a/syntax/toml.vim b/syntax/toml.vim
index 9540d2c58..98ac4698a 100644
--- a/syntax/toml.vim
+++ b/syntax/toml.vim
@@ -2,10 +2,12 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'toml', 'syntax/toml.vim')
   finish
 endif
 
-" Language:   TOML
-" Maintainer: Caleb Spare <cespare@gmail.com>
-" URL:        https://github.com/cespare/vim-toml
-" LICENSE:    MIT
+" Vim syntax file
+" Language:            TOML
+" Homepage:            https://github.com/cespare/vim-toml
+" Maintainer:          Aman Verma
+" Previous Maintainer: Caleb Spare <cespare@gmail.com>
+" Last Change:         Oct 8, 2021
 
 if exists('b:current_syntax')
   finish
@@ -14,10 +16,7 @@ endif
 syn match tomlEscape /\\[btnfr"/\\]/ display contained
 syn match tomlEscape /\\u\x\{4}/ contained
 syn match tomlEscape /\\U\x\{8}/ contained
-hi def link tomlEscape SpecialChar
-
 syn match tomlLineEscape /\\$/ contained
-hi def link tomlLineEscape SpecialChar
 
 " Basic strings
 syn region tomlString oneline start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=tomlEscape
@@ -27,7 +26,6 @@ syn region tomlString start=/"""/ end=/"""/ contains=tomlEscape,tomlLineEscape
 syn region tomlString oneline start=/'/ end=/'/
 " Multi-line literal strings
 syn region tomlString start=/'''/ end=/'''/
-hi def link tomlString String
 
 syn match tomlInteger /[+-]\=\<[1-9]\(_\=\d\)*\>/ display
 syn match tomlInteger /[+-]\=\<0\>/ display
@@ -35,46 +33,53 @@ syn match tomlInteger /[+-]\=\<0x[[:xdigit:]]\(_\=[[:xdigit:]]\)*\>/ display
 syn match tomlInteger /[+-]\=\<0o[0-7]\(_\=[0-7]\)*\>/ display
 syn match tomlInteger /[+-]\=\<0b[01]\(_\=[01]\)*\>/ display
 syn match tomlInteger /[+-]\=\<\(inf\|nan\)\>/ display
-hi def link tomlInteger Number
 
 syn match tomlFloat /[+-]\=\<\d\(_\=\d\)*\.\d\+\>/ display
 syn match tomlFloat /[+-]\=\<\d\(_\=\d\)*\(\.\d\(_\=\d\)*\)\=[eE][+-]\=\d\(_\=\d\)*\>/ display
-hi def link tomlFloat Float
 
 syn match tomlBoolean /\<\%(true\|false\)\>/ display
-hi def link tomlBoolean Boolean
 
 " https://tools.ietf.org/html/rfc3339
 syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}/ display
 syn match tomlDate /\d\{2\}:\d\{2\}:\d\{2\}\%(\.\d\+\)\?/ display
 syn match tomlDate /\d\{4\}-\d\{2\}-\d\{2\}[T ]\d\{2\}:\d\{2\}:\d\{2\}\%(\.\d\+\)\?\%(Z\|[+-]\d\{2\}:\d\{2\}\)\?/ display
-hi def link tomlDate Constant
-
-syn match tomlKey /\v(^|[{,])\s*\zs[[:alnum:]._-]+\ze\s*\=/ display
-hi def link tomlKey Identifier
 
+syn match tomlDotInKey /\v[^.]+\zs\./ contained display
+syn match tomlKey /\v(^|[{,])\s*\zs[[:alnum:]._-]+\ze\s*\=/ contains=tomlDotInKey display
 syn region tomlKeyDq oneline start=/\v(^|[{,])\s*\zs"/ end=/"\ze\s*=/ contains=tomlEscape
-hi def link tomlKeyDq Identifier
-
 syn region tomlKeySq oneline start=/\v(^|[{,])\s*\zs'/ end=/'\ze\s*=/
-hi def link tomlKeySq Identifier
 
-syn region tomlTable oneline start=/^\s*\[[^\[]/ end=/\]/ contains=tomlKey,tomlKeyDq,tomlKeySq
-hi def link tomlTable Title
+syn region tomlTable oneline start=/^\s*\[[^\[]/ end=/\]/ contains=tomlKey,tomlKeyDq,tomlKeySq,tomlDotInKey
 
-syn region tomlTableArray oneline start=/^\s*\[\[/ end=/\]\]/ contains=tomlKey,tomlKeyDq,tomlKeySq
-hi def link tomlTableArray Title
+syn region tomlTableArray oneline start=/^\s*\[\[/ end=/\]\]/ contains=tomlKey,tomlKeyDq,tomlKeySq,tomlDotInKey
 
-syn cluster tomlValue contains=tomlArray,tomlString,tomlInteger,tomlFloat,tomlBoolean,tomlDate,tomlComment
 syn region tomlKeyValueArray start=/=\s*\[\zs/ end=/\]/ contains=@tomlValue
+
 syn region tomlArray start=/\[/ end=/\]/ contains=@tomlValue contained
 
+syn cluster tomlValue contains=tomlArray,tomlString,tomlInteger,tomlFloat,tomlBoolean,tomlDate,tomlComment
+
 syn keyword tomlTodo TODO FIXME XXX BUG contained
-hi def link tomlTodo Todo
 
 syn match tomlComment /#.*/ contains=@Spell,tomlTodo
+
 hi def link tomlComment Comment
+hi def link tomlTodo Todo
+hi def link tomlTableArray Title
+hi def link tomlTable Title
+hi def link tomlDotInKey Normal
+hi def link tomlKeySq Identifier
+hi def link tomlKeyDq Identifier
+hi def link tomlKey Identifier
+hi def link tomlDate Constant
+hi def link tomlBoolean Boolean
+hi def link tomlFloat Float
+hi def link tomlInteger Number
+hi def link tomlString String
+hi def link tomlLineEscape SpecialChar
+hi def link tomlEscape SpecialChar
 
 syn sync minlines=500
-
 let b:current_syntax = 'toml'
+
+" vim: et sw=2 sts=2
diff --git a/syntax/vb.vim b/syntax/vb.vim
index 0641dc1e0..5f4006caf 100644
--- a/syntax/vb.vim
+++ b/syntax/vb.vim
@@ -3,11 +3,13 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'visual-basic', 'syntax/vb.vim
 endif
 
 " Vim syntax file
-" Language:	Visual Basic
-" Maintainer:	Tim Chase <vb.vim@tim.thechases.com>
-" Former Maintainer:	Robert M. Cortopassi <cortopar@mindspring.com>
-"	(tried multiple times to contact, but email bounced)
+" Language:     Visual Basic
+" Maintainer:   Doug Kearns <dougkearns@gmail.com>
+" Former Maintainer:    Tim Chase <vb.vim@tim.thechases.com>
+" Former Maintainer:    Robert M. Cortopassi <cortopar@mindspring.com>
+"       (tried multiple times to contact, but email bounced)
 " Last Change:
+"   2021 Nov 26  Incorporated additions from Doug Kearns
 "   2005 May 25  Synched with work by Thomas Barthel
 "   2004 May 30  Added a few keywords
 
@@ -17,7 +19,7 @@ endif
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
-	finish
+        finish
 endif
 
 " VB is case insensitive
@@ -237,7 +239,7 @@ syn keyword vbKeyword Public PublicNotCreateable OnNewProcessSingleUse
 syn keyword vbKeyword InSameProcessMultiUse GlobalMultiUse Resume Seek
 syn keyword vbKeyword Set Static Step String Time WithEvents
 
-syn keyword vbTodo contained	TODO
+syn keyword vbTodo contained    TODO
 
 "Datatypes
 syn keyword vbTypes Boolean Byte Currency Date Decimal Double Empty
@@ -323,46 +325,54 @@ syn match vbNumber "\<\d\+\>"
 syn match vbNumber "\<\d\+\.\d*\>"
 "floating point number, starting with a dot
 syn match vbNumber "\.\d\+\>"
-"syn match  vbNumber		"{[[:xdigit:]-]\+}\|&[hH][[:xdigit:]]\+&"
-"syn match  vbNumber		":[[:xdigit:]]\+"
-"syn match  vbNumber		"[-+]\=\<\d\+\>"
-syn match  vbFloat		"[-+]\=\<\d\+[eE][\-+]\=\d\+"
-syn match  vbFloat		"[-+]\=\<\d\+\.\d*\([eE][\-+]\=\d\+\)\="
-syn match  vbFloat		"[-+]\=\<\.\d\+\([eE][\-+]\=\d\+\)\="
+"syn match  vbNumber            "{[[:xdigit:]-]\+}\|&[hH][[:xdigit:]]\+&"
+"syn match  vbNumber            ":[[:xdigit:]]\+"
+"syn match  vbNumber            "[-+]\=\<\d\+\>"
+syn match  vbFloat              "[-+]\=\<\d\+[eE][\-+]\=\d\+"
+syn match  vbFloat              "[-+]\=\<\d\+\.\d*\([eE][\-+]\=\d\+\)\="
+syn match  vbFloat              "[-+]\=\<\.\d\+\([eE][\-+]\=\d\+\)\="
 
-" String and Character contstants
+" String and Character constants
 syn region  vbString		start=+"+  end=+"\|$+
 syn region  vbComment		start="\(^\|\s\)REM\s" end="$" contains=vbTodo
 syn region  vbComment		start="\(^\|\s\)\'"   end="$" contains=vbTodo
-syn match   vbLineNumber	"^\d\+\(\s\|$\)"
-syn match   vbTypeSpecifier  "[a-zA-Z0-9][\$%&!#]"ms=s+1
+syn match   vbLineLabel		"^\h\w\+:"
+syn match   vbLineNumber	"^\d\+\(:\|\s\|$\)"
+syn match   vbTypeSpecifier  "\<\a\w*[@\$%&!#]"ms=s+1
 syn match   vbTypeSpecifier  "#[a-zA-Z0-9]"me=e-1
+" Conditional Compilation
+syn match  vbPreProc "^#const\>"
+syn region vbPreProc matchgroup=PreProc start="^#if\>"     end="\<then\>" transparent contains=TOP
+syn region vbPreProc matchgroup=PreProc start="^#elseif\>" end="\<then\>" transparent contains=TOP
+syn match  vbPreProc "^#else\>"
+syn match  vbPreProc "^#end\s*if\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
-hi def link vbBoolean		Boolean
-hi def link vbLineNumber		Comment
-hi def link vbComment		Comment
-hi def link vbConditional	Conditional
-hi def link vbConst			Constant
-hi def link vbDefine			Constant
-hi def link vbError			Error
-hi def link vbFunction		Identifier
-hi def link vbIdentifier		Identifier
-hi def link vbNumber			Number
-hi def link vbFloat			Float
-hi def link vbMethods		PreProc
-hi def link vbOperator		Operator
-hi def link vbRepeat			Repeat
-hi def link vbString			String
-hi def link vbStatement		Statement
-hi def link vbKeyword		Statement
-hi def link vbEvents			Special
-hi def link vbTodo			Todo
-hi def link vbTypes			Type
-hi def link vbTypeSpecifier	Type
-
+hi def link vbBoolean           Boolean
+hi def link vbLineNumber        Comment
+hi def link vbLineLabel         Comment
+hi def link vbComment           Comment
+hi def link vbConditional       Conditional
+hi def link vbConst             Constant
+hi def link vbDefine            Constant
+hi def link vbError             Error
+hi def link vbFunction          Identifier
+hi def link vbIdentifier        Identifier
+hi def link vbNumber            Number
+hi def link vbFloat             Float
+hi def link vbMethods           PreProc
+hi def link vbOperator          Operator
+hi def link vbRepeat            Repeat
+hi def link vbString            String
+hi def link vbStatement         Statement
+hi def link vbKeyword           Statement
+hi def link vbEvents            Special
+hi def link vbTodo              Todo
+hi def link vbTypes             Type
+hi def link vbTypeSpecifier     Type
+hi def link vbPreProc           PreProc
 
 let b:current_syntax = "vb"
 
diff --git a/syntax/vlang.vim b/syntax/vlang.vim
index 4584ebdf4..aae1bd9b4 100644
--- a/syntax/vlang.vim
+++ b/syntax/vlang.vim
@@ -91,10 +91,10 @@ syn match       vCodeGen            /$if\>/
 hi def link     vCodeGen            Identifier
 
 " Predefined types
-syn keyword     vType               chan map bool string error voidptr
+syn keyword     vType               any chan char map bool string error voidptr
 syn match       vOptionalType       "\%(\<?\)\@<=\(chan\|map\|bool\|string\|error\|voidptr\)"
-syn keyword     vSignedInts         int i8 i16 i64 rune intptr
-syn keyword     vUnsignedInts       byte u16 u32 u64 byteptr
+syn keyword     vSignedInts         int i8 i16 i64 isize rune intptr
+syn keyword     vUnsignedInts       byte u16 u32 u64 usize byteptr
 syn keyword     vFloats             f32 f64 floatptr
 " XXX Enable when complex numbers are implemented in V
 " syn keyword    	vComplexes          complex64 complex128
@@ -160,8 +160,8 @@ syn cluster     vStringGroup        contains=@vCharacterGroup,vStringError
 syn region      vString             start=+"+ skip=+\\\\\|\\'+ end=+"+ contains=@vStringGroup
 syn region      vString             start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=@vStringGroup
 
-syn region      vRawString          start=+r"+ skip=+\\\\\|\\'+ end=+"+
-syn region      vRawString          start=+r'+ skip=+\\\\\|\\'+ end=+'+
+syn region      vRawString          start=+r"+ end=+"+
+syn region      vRawString          start=+r'+ end=+'+
 
 hi def link     vString             String
 hi def link     vRawString          String
@@ -173,9 +173,15 @@ syn region      vParen              start='(' end=')' transparent
 " Integers
 syn match       vDecimalInt         "\<\d\+\([Ee]\d\+\)\?\>"
 syn match       vOctalInt           "\<0o\o\+\>"
+syn match       vHexInt             "\<0x\x\+\>"
+syn match       vBinaryInt          "\<0b[01]\+\>"
+syn match       vSnakeInt           "\<[0-9_]\+\>"
 
 hi def link     vDecimalInt         Integer
 hi def link     vOctalInt           Integer
+hi def link     vHexInt             Integer
+hi def link     vBinaryInt          Integer
+hi def link     vSnakeInt           Integer
 hi def link     Integer             Number
 
 " Floating point
diff --git a/syntax/xpm.vim b/syntax/xpm.vim
index dfc326b05..9b5563fc0 100644
--- a/syntax/xpm.vim
+++ b/syntax/xpm.vim
@@ -5,19 +5,22 @@ endif
 " Vim syntax file
 " Language:	X Pixmap
 " Maintainer:	Ronald Schild <rs@scutum.de>
-" Last Change:	2017 Feb 01
+" Last Change:	2021 Oct 04
 " Version:	5.4n.1
 "               Jemma Nelson added termguicolors support
+"               Dominique Pellé fixed spelling support
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 
+syn spell notoplevel
+
 syn keyword xpmType		char
 syn keyword xpmStorageClass	static
 syn keyword xpmTodo		TODO FIXME XXX  contained
-syn region  xpmComment		start="/\*"  end="\*/"  contains=xpmTodo
+syn region  xpmComment		start="/\*"  end="\*/"  contains=xpmTodo,@Spell
 syn region  xpmPixelString	start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=@xpmColors
 
 if has("gui_running") || has("termguicolors") && &termguicolors
diff --git a/syntax/yats/es6-array.vim b/syntax/yats/es6-array.vim
index 23009b434..26db1c7ad 100644
--- a/syntax/yats/es6-array.vim
+++ b/syntax/yats/es6-array.vim
@@ -8,11 +8,11 @@ syntax keyword typescriptArrayStaticMethod contained from isArray of nextgroup=t
 if exists("did_typescript_hilink") | HiLink typescriptArrayStaticMethod Keyword
 endif
 syntax keyword typescriptArrayMethod contained concat copyWithin entries every fill nextgroup=typescriptFuncCallArg
-syntax keyword typescriptArrayMethod contained filter find findIndex forEach indexOf nextgroup=typescriptFuncCallArg
-syntax keyword typescriptArrayMethod contained includes join keys lastIndexOf map nextgroup=typescriptFuncCallArg
+syntax keyword typescriptArrayMethod contained filter find findIndex flat flatMap forEach nextgroup=typescriptFuncCallArg
+syntax keyword typescriptArrayMethod contained includes indexOf join keys lastIndexOf map nextgroup=typescriptFuncCallArg
 syntax keyword typescriptArrayMethod contained pop push reduce reduceRight reverse nextgroup=typescriptFuncCallArg
 syntax keyword typescriptArrayMethod contained shift slice some sort splice toLocaleString nextgroup=typescriptFuncCallArg
-syntax keyword typescriptArrayMethod contained toSource toString unshift nextgroup=typescriptFuncCallArg
+syntax keyword typescriptArrayMethod contained toSource toString unshift values nextgroup=typescriptFuncCallArg
 syntax cluster props add=typescriptArrayMethod
 if exists("did_typescript_hilink") | HiLink typescriptArrayMethod Keyword
 endif
diff --git a/syntax/yats/es6-object.vim b/syntax/yats/es6-object.vim
index 40dc58065..cd94fc984 100644
--- a/syntax/yats/es6-object.vim
+++ b/syntax/yats/es6-object.vim
@@ -5,7 +5,7 @@ endif
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Object nextgroup=typescriptGlobalObjectDot,typescriptFuncCallArg
 syntax match   typescriptGlobalObjectDot /\./ contained nextgroup=typescriptObjectStaticMethod,typescriptProp
 syntax keyword typescriptObjectStaticMethod contained create defineProperties defineProperty nextgroup=typescriptFuncCallArg
-syntax keyword typescriptObjectStaticMethod contained entries freeze getOwnPropertyDescriptors nextgroup=typescriptFuncCallArg
+syntax keyword typescriptObjectStaticMethod contained entries freeze fromEntries getOwnPropertyDescriptors nextgroup=typescriptFuncCallArg
 syntax keyword typescriptObjectStaticMethod contained getOwnPropertyDescriptor getOwnPropertyNames nextgroup=typescriptFuncCallArg
 syntax keyword typescriptObjectStaticMethod contained getOwnPropertySymbols getPrototypeOf nextgroup=typescriptFuncCallArg
 syntax keyword typescriptObjectStaticMethod contained is isExtensible isFrozen isSealed nextgroup=typescriptFuncCallArg
diff --git a/syntax/yats/es6-promise.vim b/syntax/yats/es6-promise.vim
index 3c9d0ffc0..8c52ec66c 100644
--- a/syntax/yats/es6-promise.vim
+++ b/syntax/yats/es6-promise.vim
@@ -4,7 +4,7 @@ endif
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Promise nextgroup=typescriptGlobalPromiseDot,typescriptFuncCallArg
 syntax match   typescriptGlobalPromiseDot /\./ contained nextgroup=typescriptPromiseStaticMethod,typescriptProp
-syntax keyword typescriptPromiseStaticMethod contained resolve reject all race nextgroup=typescriptFuncCallArg
+syntax keyword typescriptPromiseStaticMethod contained all allSettled any race reject resolve nextgroup=typescriptFuncCallArg
 if exists("did_typescript_hilink") | HiLink typescriptPromiseStaticMethod Keyword
 endif
 syntax keyword typescriptPromiseMethod contained then catch finally nextgroup=typescriptFuncCallArg
diff --git a/syntax/yats/es6-regexp.vim b/syntax/yats/es6-regexp.vim
index 34e0a2070..0875aa6e9 100644
--- a/syntax/yats/es6-regexp.vim
+++ b/syntax/yats/es6-regexp.vim
@@ -7,7 +7,7 @@ syntax match   typescriptGlobalRegExpDot /\./ contained nextgroup=typescriptRegE
 syntax keyword typescriptRegExpStaticProp contained lastIndex
 if exists("did_typescript_hilink") | HiLink typescriptRegExpStaticProp Keyword
 endif
-syntax keyword typescriptRegExpProp contained global ignoreCase multiline source sticky
+syntax keyword typescriptRegExpProp contained dotAll global ignoreCase multiline source sticky
 syntax cluster props add=typescriptRegExpProp
 if exists("did_typescript_hilink") | HiLink typescriptRegExpProp Keyword
 endif
diff --git a/syntax/yats/es6-string.vim b/syntax/yats/es6-string.vim
index c99541212..a1da20ce0 100644
--- a/syntax/yats/es6-string.vim
+++ b/syntax/yats/es6-string.vim
@@ -9,12 +9,12 @@ if exists("did_typescript_hilink") | HiLink typescriptStringStaticMethod Keyword
 endif
 syntax keyword typescriptStringMethod contained anchor charAt charCodeAt codePointAt nextgroup=typescriptFuncCallArg
 syntax keyword typescriptStringMethod contained concat endsWith includes indexOf lastIndexOf nextgroup=typescriptFuncCallArg
-syntax keyword typescriptStringMethod contained link localeCompare match normalize nextgroup=typescriptFuncCallArg
-syntax keyword typescriptStringMethod contained padStart padEnd repeat replace search nextgroup=typescriptFuncCallArg
+syntax keyword typescriptStringMethod contained link localeCompare match matchAll normalize nextgroup=typescriptFuncCallArg
+syntax keyword typescriptStringMethod contained padStart padEnd repeat replace replaceAll search nextgroup=typescriptFuncCallArg
 syntax keyword typescriptStringMethod contained slice split startsWith substr substring nextgroup=typescriptFuncCallArg
 syntax keyword typescriptStringMethod contained toLocaleLowerCase toLocaleUpperCase nextgroup=typescriptFuncCallArg
 syntax keyword typescriptStringMethod contained toLowerCase toString toUpperCase trim nextgroup=typescriptFuncCallArg
-syntax keyword typescriptStringMethod contained valueOf nextgroup=typescriptFuncCallArg
+syntax keyword typescriptStringMethod contained trimEnd trimStart valueOf nextgroup=typescriptFuncCallArg
 syntax cluster props add=typescriptStringMethod
 if exists("did_typescript_hilink") | HiLink typescriptStringMethod Keyword
 endif
diff --git a/syntax/yats/es6-symbol.vim b/syntax/yats/es6-symbol.vim
index f90fd7b2f..10bc5c764 100644
--- a/syntax/yats/es6-symbol.vim
+++ b/syntax/yats/es6-symbol.vim
@@ -4,7 +4,7 @@ endif
 
 syntax keyword typescriptGlobal containedin=typescriptIdentifierName Symbol nextgroup=typescriptGlobalSymbolDot,typescriptFuncCallArg
 syntax match   typescriptGlobalSymbolDot /\./ contained nextgroup=typescriptSymbolStaticProp,typescriptSymbolStaticMethod,typescriptProp
-syntax keyword typescriptSymbolStaticProp contained length iterator match replace
+syntax keyword typescriptSymbolStaticProp contained description length iterator match matchAll replace
 syntax keyword typescriptSymbolStaticProp contained search split hasInstance isConcatSpreadable
 syntax keyword typescriptSymbolStaticProp contained unscopables species toPrimitive
 syntax keyword typescriptSymbolStaticProp contained toStringTag
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 67dad5977..a8d2ddd76 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -132,9 +132,12 @@ let s:zig_syntax_keywords = {
     \ ,                  "@newStackCall"
     \ ,                  "@asyncCall"
     \ ,                  "@intToPtr"
+    \ ,                  "@maximum"
+    \ ,                  "@minimum"
     \ ,                  "@memcpy"
     \ ,                  "@memset"
     \ ,                  "@mod"
+    \ ,                  "@mulAdd"
     \ ,                  "@mulWithOverflow"
     \ ,                  "@splat"
     \ ,                  "@src"
@@ -251,11 +254,11 @@ highlight default link zigCommentLineDoc Comment
 highlight default link zigDummyVariable Comment
 highlight default link zigTodo Todo
 highlight default link zigString String
-highlight default link zigStringDelimiter Delimiter
+highlight default link zigStringDelimiter String
 highlight default link zigMultilineString String
 highlight default link zigMultilineStringContent String
 highlight default link zigMultilineStringPrefix String
-highlight default link zigMultilineStringDelimiter Ignore
+highlight default link zigMultilineStringDelimiter Delimiter
 highlight default link zigCharacterInvalid Error
 highlight default link zigCharacterInvalidUnicode zigCharacterInvalid
 highlight default link zigCharacter Character
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 0d72c7274..6f7c5f050 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -131,6 +131,15 @@ call TestFiletype('jq')
 call TestFiletype('json5')
 call TestFiletype('json')
 call TestFiletype('jsonnet')
+call TestFiletype('rc')
+call TestFiletype('perl')
+call TestFiletype('pod')
+call TestFiletype('mason')
+call TestFiletype('tt2')
+call TestFiletype('tt2html')
+call TestFiletype('xs')
+call TestFiletype('raku')
+call TestFiletype('tads')
 call TestFiletype('jst')
 call TestFiletype('julia')
 call TestFiletype('kotlin')
@@ -165,13 +174,6 @@ call TestFiletype('ocpbuildroot')
 call TestFiletype('sexplib')
 call TestFiletype('octave')
 call TestFiletype('opencl')
-call TestFiletype('rc')
-call TestFiletype('perl')
-call TestFiletype('pod')
-call TestFiletype('mason')
-call TestFiletype('tt2')
-call TestFiletype('tt2html')
-call TestFiletype('xs')
 call TestFiletype('sql')
 call TestFiletype('cql')
 call TestFiletype('php')
@@ -194,7 +196,6 @@ call TestFiletype('r')
 call TestFiletype('rhelp')
 call TestFiletype('racket')
 call TestFiletype('ragel')
-call TestFiletype('raku')
 call TestFiletype('raml')
 call TestFiletype('razor')
 call TestFiletype('reason')
@@ -256,7 +257,6 @@ call TestFiletype('dosini')
 call TestFiletype('odin')
 call TestFiletype('bzl')
 call TestFiletype('prolog')
-call TestFiletype('tads')
 call TestFiletype('gitignore')
 call TestFiletype('sql')
 call TestFiletype('b')

From cb80947143fe342797bcf571b6190c86b3c07700 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 21 Dec 2021 14:51:15 +0100
Subject: [PATCH 278/299] Reintroduce zinit, closes #772

---
 README.md            |   3 +-
 after/syntax/zsh.vim | 126 +++++++++++++++++++++++++++++++++++++++++++
 packages.yaml        |   5 ++
 3 files changed, 133 insertions(+), 1 deletion(-)
 create mode 100644 after/syntax/zsh.vim

diff --git a/README.md b/README.md
index 2ded4872b..3e71fc233 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->597<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->598<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -207,6 +207,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [yard](https://github.com/noprompt/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting for zep files)
 - [zig](https://github.com/ziglang/zig.vim) (Zig syntax highlighting for zir, zig and zir files)
+- [zinit](https://github.com/zdharma-continuum/zinit-vim-syntax/tree/main)
 <!--/Language Packs-->
 
 ## Updating
diff --git a/after/syntax/zsh.vim b/after/syntax/zsh.vim
new file mode 100644
index 000000000..cf4f92462
--- /dev/null
+++ b/after/syntax/zsh.vim
@@ -0,0 +1,126 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zinit', 'after/syntax/zsh.vim')
+  finish
+endif
+
+" Copyright (c) 2019 Sebastian Gniazdowski
+"
+" Syntax highlighting for Zinit commands in any file of type `zsh'.
+" It adds definitions for the Zinit syntax to the ones from the
+" existing zsh.vim definitions-file.
+
+" Main Zinit command.
+" Should be the only TOP rule for the whole syntax.
+syntax match ZinitCommand     /\<zinit\>\s/me=e-1
+            \ skipwhite
+            \ nextgroup=ZinitSubCommands,ZinitPluginSubCommands,ZinitSnippetSubCommands
+            \ contains=ZinitSubCommands,ZinitPluginSubCommands,ZinitSnippetSubCommands
+
+" TODO: add options for e.g. light
+syntax match ZinitSubCommands /\s\<\%(ice\|compinit\|env-whitelist\|cdreplay\|cdclear\|update\)\>\s/ms=s+1,me=e-1
+            \ contained
+
+syntax match ZinitPluginSubCommands /\s\<\%(light\|load\)\>\s/ms=s+1,me=e-1
+            \ skipwhite nextgroup=ZinitPlugin1,ZinitPlugin2,ZinitPlugin3
+            \ contains=ZinitPlugin1,ZinitPlugin2,ZinitPlugin3
+
+syntax match ZinitSnippetSubCommands /\s\<\%(snippet\)\>\s/ms=s+1,me=e-1
+            \ skipwhite
+            \ nextgroup=ZinitSnippetShorthands1,ZinitSnippetShorthands2
+            \ contains=ZinitSnippetShorthands1,ZinitSnippetShorthands2
+
+" "user/plugin"
+syntax match ZinitPlugin1 /\s["]\%([!-_]*\%(\/[!-_]\+\)\+\|[!-_]\+\)["]/ms=s+1,hs=s+2,he=e-1
+            \ contained
+            \ nextgroup=ZinitTrailingWhiteSpace
+            \ contains=ZinitTrailingWhiteSpace
+
+" 'user/plugin'
+syntax match ZinitPlugin2 /\s[']\%([!-_]*\%(\/[!-_]\+\)\+\|[!-_]\+\)[']/ms=s+1,hs=s+2,he=e-1
+            \ contained
+            \ nextgroup=ZinitTrailingWhiteSpace
+            \ contains=ZinitTrailingWhiteSpace
+
+" user/plugin
+syntax match ZinitPlugin3 /\s\%([!-_]*\%(\/[!-_]\+\)\+\|[!-_]\+\)/ms=s+1,me=e+2 
+            \ contained
+            \ nextgroup=ZinitTrailingWhiteSpace
+            \ contains=ZinitTrailingWhiteSpace
+
+" OMZ:: or PZT::
+" TODO: 'OMZ:: or 'PZT::
+syntax match ZinitSnippetShorthands1 /\s\<\%(\%(OMZ\|PZT\)\>::\|\)/hs=s+1,he=e-2
+            \ contained
+            \ skipwhite
+            \ nextgroup=ZinitSnippetUrl1,ZinitSnippetUrl2
+            \ contains=ZinitSnippetUrl1,ZinitSnippetUrl2
+
+" "OMZ:: or "PZT::
+syntax match ZinitSnippetShorthands2 /\s["]\%(\%(OMZ\|PZT\)\>::\|\)/hs=s+2,he=e-2
+            \ contained
+            \ skipwhite
+            \ nextgroup=ZinitSnippetUrl3,ZinitSnippetUrl4
+            \ contains=ZinitSnippetUrl3,ZinitSnippetUrl4
+
+syntax match ZinitSnippetUrl3 /\<\%(http:\/\/\|https:\/\/\|ftp:\/\/\|\$HOME\|\/\)[!-_]\+\%(\/[!-_]\+\)*\/\?["]/he=e-1
+            \ contained
+            \ nextgroup=ZinitTrailingWhiteSpace
+            \ contains=ZinitTrailingWhiteSpace
+
+" TODO: Fix ZinitTrailingWhiteSpace not matching
+syntax match ZinitSnippetUrl4 /\%(\%(OMZ\|PZT\)::\)[!-_]\+\%(\/[!-_]\+\)*\/\?["]/hs=s+5,he=e-1
+            \ contained
+            \ nextgroup=ZinitTrailingWhiteSpace
+            \ contains=ZinitTrailingWhiteSpace
+
+" http://… or https://… or ftp://… or $HOME/… or /…
+" TODO: Fix $HOME/… and /… not matching
+syntax match ZinitSnippetUrl1 /\<\%(http:\/\/\|https:\/\/\|ftp:\/\/\|\$HOME\|\/\)[!-_]\+\%(\/[!-_]\+\)*\/\?/
+            \ contained
+            \ nextgroup=ZinitTrailingWhiteSpace
+            \ contains=ZinitTrailingWhiteSpace
+
+" TODO: Fix ZinitTrailingWhiteSpace not matching
+syntax match ZinitSnippetUrl2 /\<\%(\%(OMZ\|PZT\)::\)[!-_]\+\%(\/[!-_]\+\)*\/\?/hs=s+5
+            \ contained
+            \ nextgroup=ZinitTrailingWhiteSpace
+            \ contains=ZinitTrailingWhiteSpace
+
+syntax match ZinitTrailingWhiteSpace /[[:space:]]\+$/ contained
+
+" TODO: differentiate the no-value ices
+" TODO: use contained
+syntax match ZinitIceSubCommand /\sice\s/ms=s+1,me=e-1 nextgroup=ZinitIceModifiers
+syntax match ZinitIceModifiers  /\s\<\%(svn\|proto\|from\|teleid\|bindmap\|cloneopts\|id-as\|depth\|if\|wait\|load\)\>/ms=s+1
+syntax match ZinitIceModifiers  /\s\<\%(unload\|blockf\|on-update-of\|subscribe\|pick\|bpick\|src\|as\|ver\|silent\)\>/ms=s+1
+syntax match ZinitIceModifiers  /\s\<\%(lucid\|notify\|mv\|cp\|atinit\|atclone\|atload\|atpull\|nocd\|run-atpull\|has\)\>/ms=s+1
+syntax match ZinitIceModifiers  /\s\<\%(cloneonly\|make\|service\|trackbinds\|multisrc\|compile\|nocompile\)\>/ms=s+1
+syntax match ZinitIceModifiers  /\s\<\%(nocompletions\|reset-prompt\|wrap-track\|reset\|aliases\|sh\|bash\|ksh\|csh\)\>/ms=s+1
+syntax match ZinitIceModifiers  /\s\<\%(\\!sh\|!sh\|\\!bash\|!bash\|\\!ksh\|!ksh\|\\!csh\|!csh\)\>/ms=s+1
+syntax match ZinitIceModifiers  /\s\<\%(blockf\|silent\|lucid\|trackbinds\|cloneonly\|nocd\|run-atpull\)\>/ms=s+1
+syntax match ZinitIceModifiers  /\s\<\%(\|sh\|\!sh\|bash\|\!bash\|ksh\|\!ksh\|csh\|\!csh\)\>/ms=s+1
+syntax match ZinitIceModifiers  /\s\<\%(nocompletions\|svn\|aliases\|trigger-load\)\>/ms=s+1
+syntax match ZinitIceModifiers  /\s\<\%(light-mode\|is-snippet\|countdown\|ps-on-unload\|ps-on-update\)\>/ms=s+1
+            
+" Include also ices added by the existing annexes
+syntax match ZinitIceModifiers  /\s\<\%(test\|zman\|submod\|dl\|patch\|fbin\|sbin\|fsrc\|ferc\|fmod\|gem\|node\|rustup\|cargo\)\>/ms=s+1
+        
+" Additional Zsh and Zinit functions
+syntax match ZshAndZinitFunctions     /\<\%(compdef\|compinit\|zpcdreplay\|zpcdclear\|zpcompinit\|zpcompdef\)\>/
+
+" Link
+highlight def link ZshAndZinitFunctions    Keyword
+highlight def link ZinitCommand            Statement
+highlight def link ZinitSubCommands        Title
+highlight def link ZinitPluginSubCommands  Title
+highlight def link ZinitSnippetSubCommands Title
+highlight def link ZinitIceModifiers       Type
+highlight def link ZinitSnippetShorthands1 Keyword
+highlight def link ZinitSnippetShorthands2 Keyword
+highlight def link ZinitPlugin1            Macro
+highlight def link ZinitPlugin2            Macro
+highlight def link ZinitPlugin3            Macro
+highlight def link ZinitSnippetUrl1        Macro
+highlight def link ZinitSnippetUrl2        Macro
+highlight def link ZinitSnippetUrl3        Macro
+highlight def link ZinitSnippetUrl4        Macro
+highlight def link ZinitTrailingWhiteSpace Error
diff --git a/packages.yaml b/packages.yaml
index 266499338..77979123d 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5541,3 +5541,8 @@ filetypes:
   patterns:
   - pattern: '*.org'
     description: GNU Emacs' Org mode
+---
+name: zinit
+remote: zdharma-continuum/zinit-vim-syntax@main
+# just adds to zsh filetype
+filetypes: []

From f621f6c1eeadf73780ff7a7929a025a25a66702a Mon Sep 17 00:00:00 2001
From: Agorgianitis Loukas <agorg_louk@icloud.com>
Date: Sat, 1 Jan 2022 19:33:32 +0200
Subject: [PATCH 279/299] Add heuristic for fragment shader files (#737)

Another step towards solving #570
---
 heuristics.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/heuristics.yaml b/heuristics.yaml
index fd7fbe945..e9d81154b 100644
--- a/heuristics.yaml
+++ b/heuristics.yaml
@@ -77,6 +77,13 @@ rules:
 - override: true
 - filetype: forth
 ---
+extensions: [frag]
+rules:
+- lines: 50
+  rules:
+  - pattern: '\s*(#version|precision|uniform|varying|vec[234])'
+    filetype: glsl
+---
 extensions: [re]
 rules:
 - lines: 50

From c96947b1c64c56f70125a9bac9c006f69e45d5d3 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 1 Jan 2022 18:34:50 +0100
Subject: [PATCH 280/299] Update

---
 autoload/polyglot/detect.vim | 12 ++++++++++++
 autoload/polyglot/ft.vim     |  2 +-
 autoload/polyglot/init.vim   |  6 ++++--
 extras/filetype.vim          | 17 ++++++++++++-----
 extras/menu.vim              |  7 ++++++-
 ftplugin/clojure.vim         |  8 ++++----
 indent/ruby.vim              |  8 ++++----
 syntax/debcontrol.vim        | 20 ++++++++++----------
 syntax/dtd.vim               |  6 +++---
 syntax/plantuml.vim          | 26 ++++++++++++++++----------
 syntax/vlang.vim             |  2 +-
 syntax/zig.vim               |  2 +-
 12 files changed, 74 insertions(+), 42 deletions(-)

diff --git a/autoload/polyglot/detect.vim b/autoload/polyglot/detect.vim
index cac826cf1..2b1900e61 100644
--- a/autoload/polyglot/detect.vim
+++ b/autoload/polyglot/detect.vim
@@ -134,6 +134,18 @@ func! polyglot#detect#Fs(...)
   set ft=forth | return
 endfunc
 
+func! polyglot#detect#Frag(...)
+  if a:0 != 1 && did_filetype()
+    return
+  endif
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '\s*\(#version\|precision\|uniform\|varying\|vec[234]\)'
+      set ft=glsl | return
+    endif
+  endfor
+endfunc
+
 func! polyglot#detect#Re(...)
   if a:0 != 1 && did_filetype()
     return
diff --git a/autoload/polyglot/ft.vim b/autoload/polyglot/ft.vim
index 56012da15..2ba69ed13 100644
--- a/autoload/polyglot/ft.vim
+++ b/autoload/polyglot/ft.vim
@@ -1,7 +1,7 @@
 " Vim functions for file type detection
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Nov 27
+" Last Change:	2021 Dec 17
 
 " These functions are moved here from runtime/filetype.vim to make startup
 " faster.
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 1457f11a6..353da7e47 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -2319,7 +2319,8 @@ if !has_key(g:polyglot_is_disabled, 'jsx')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'javascript')
-  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
+  au! BufNewFile,BufRead,BufWritePost *.frag call polyglot#detect#Frag()
+  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
   au BufNewFile,BufRead *.flow setf flow
 endif
 
@@ -2339,7 +2340,8 @@ endif
 
 if !has_key(g:polyglot_is_disabled, 'glsl')
   au! BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
-  au BufNewFile,BufRead *.comp,*.fp,*.frag,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.rchit,*.rmiss,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
+  au! BufNewFile,BufRead,BufWritePost *.frag call polyglot#detect#Frag()
+  au BufNewFile,BufRead *.comp,*.fp,*.frg,*.fsh,*.fshader,*.geo,*.geom,*.glsl,*.glslf,*.glslv,*.gs,*.gshader,*.rchit,*.rmiss,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader setf glsl
 endif
 
 if !has_key(g:polyglot_is_disabled, 'git')
diff --git a/extras/filetype.vim b/extras/filetype.vim
index 78087d044..4313adc21 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Dec 14
+" Last Change:	2021 Dec 27
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -397,6 +397,7 @@ au BufNewFile,BufRead configure.in,configure.ac setf config
 au BufNewFile,BufRead *.cu,*.cuh		setf cuda
 
 " Dockerfile; Podman uses the same syntax with name Containerfile
+" Also see Dockerfile.* below.
 au BufNewFile,BufRead Containerfile,Dockerfile,*.Dockerfile	setf dockerfile
 
 " WildPackets EtherPeek Decoder
@@ -962,9 +963,9 @@ au BufNewFile,BufRead lilo.conf			setf lilo
 " Lisp (*.el = ELisp, *.cl = Common Lisp)
 " *.jl was removed, it's also used for Julia, better skip than guess wrong.
 if has("fname_case")
-  au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,*.L,.emacs,.sawfishrc setf lisp
+  au BufNewFile,BufRead *.lsp,*.lisp,*.asd,*.el,*.cl,*.L,.emacs,.sawfishrc setf lisp
 else
-  au BufNewFile,BufRead *.lsp,*.lisp,*.el,*.cl,.emacs,.sawfishrc setf lisp
+  au BufNewFile,BufRead *.lsp,*.lisp,*.asd,*.el,*.cl,.emacs,.sawfishrc setf lisp
 endif
 
 " SBCL implementation of Common Lisp
@@ -1091,7 +1092,9 @@ au BufNewFile,BufRead *.mmp			setf mmp
 
 " Modsim III (or LambdaProlog)
 au BufNewFile,BufRead *.mod
-	\ if getline(1) =~ '\<module\>' |
+	\ if expand("<afile>") =~ '\<go.mod$' |
+	\   setf gomod |
+	\ elseif getline(1) =~ '\<module\>' |
 	\   setf lprolog |
 	\ else |
 	\   setf modsim3 |
@@ -1666,7 +1669,7 @@ au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump setf zsh
 au BufNewFile,BufRead *.zsh			setf zsh
 
 " Scheme
-au BufNewFile,BufRead *.scm,*.ss,*.rkt,*.rktd,*.rktl 	setf scheme
+au BufNewFile,BufRead *.scm,*.ss,*.sld,*.rkt,*.rktd,*.rktl 	setf scheme
 
 " Screen RC
 au BufNewFile,BufRead .screenrc,screenrc	setf screen
@@ -1748,6 +1751,7 @@ au BufNewFile,BufRead *.ice			setf slice
 
 " Microsoft Visual Studio Solution
 au BufNewFile,BufRead *.sln			setf solution
+au BufNewFile,BufRead *.slnf			setf json
 
 " Spice
 au BufNewFile,BufRead *.sp,*.spice		setf spice
@@ -2233,6 +2237,9 @@ au BufNewFile,BufRead crontab,crontab.*,*/etc/cron.d/*		call s:StarSetf('crontab
 " dnsmasq(8) configuration
 au BufNewFile,BufRead */etc/dnsmasq.d/*		call s:StarSetf('dnsmasq')
 
+" Dockerfile
+au BufNewFile,BufRead Dockerfile.*,Containerfile.*	call s:StarSetf('dockerfile')
+
 " Dracula
 au BufNewFile,BufRead drac.*			call s:StarSetf('dracula')
 
diff --git a/extras/menu.vim b/extras/menu.vim
index e17652432..5f4e395e1 100644
--- a/extras/menu.vim
+++ b/extras/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2020 Sep 28
+" Last Change:	2021 Dec 22
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -717,6 +717,11 @@ func s:BMCanAdd(name, num)
     return 0
   endif
 
+  " no name with control characters
+  if a:name =~ '[\x01-\x1f]'
+    return 0
+  endif
+
   " no special buffer, such as terminal or popup
   let buftype = getbufvar(a:num, '&buftype')
   if buftype != '' && buftype != 'nofile' && buftype != 'nowrite'
diff --git a/ftplugin/clojure.vim b/ftplugin/clojure.vim
index 7fe81f9d2..853339ff9 100644
--- a/ftplugin/clojure.vim
+++ b/ftplugin/clojure.vim
@@ -70,10 +70,10 @@ endif
 
 " Filter files in the browse dialog
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-	let b:browsefilter = "Clojure Source Files (*.clj)\t*.clj\n" .
-	                   \ "ClojureScript Source Files (*.cljs)\t*.cljs\n" .
-	                   \ "Java Source Files (*.java)\t*.java\n" .
-	                   \ "All Files (*.*)\t*.*\n"
+	let b:browsefilter = "All Files\t*\n" .
+				\ "Clojure Files\t*.clj;*.cljc;*.cljs;*.cljx\n" .
+				\ "EDN Files\t*.edn\n" .
+				\ "Java Files\t*.java\n"
 	let b:undo_ftplugin .= ' | unlet! b:browsefilter'
 endif
 
diff --git a/indent/ruby.vim b/indent/ruby.vim
index a2d8814e8..0a7cfae64 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -43,7 +43,7 @@ setlocal nosmartindent
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetRubyIndent(v:lnum)
 setlocal indentkeys=0{,0},0),0],!^F,o,O,e,:,.
-setlocal indentkeys+==end,=else,=elsif,=when,=ensure,=rescue,==begin,==end
+setlocal indentkeys+==end,=else,=elsif,=when,=in,=ensure,=rescue,==begin,==end
 setlocal indentkeys+==private,=protected,=public
 
 " Only define the function once.
@@ -88,7 +88,7 @@ let s:skip_expr =
 " Regex used for words that, at the start of a line, add a level of indent.
 let s:ruby_indent_keywords =
       \ '^\s*\zs\<\%(module\|class\|if\|for' .
-      \   '\|while\|until\|else\|elsif\|case\|when\|unless\|begin\|ensure\|rescue' .
+      \   '\|while\|until\|else\|elsif\|case\|when\|in\|unless\|begin\|ensure\|rescue' .
       \   '\|\%(\K\k*[!?]\?\s\+\)\=def\):\@!\>' .
       \ '\|\%([=,*/%+-]\|<<\|>>\|:\s\)\s*\zs' .
       \    '\<\%(if\|for\|while\|until\|case\|unless\|begin\):\@!\>'
@@ -98,7 +98,7 @@ let s:ruby_endless_def = '\<def\s\+\k\+[!?]\=\%((.*)\|\s\)\s*='
 
 " Regex used for words that, at the start of a line, remove a level of indent.
 let s:ruby_deindent_keywords =
-      \ '^\s*\zs\<\%(ensure\|else\|rescue\|elsif\|when\|end\):\@!\>'
+      \ '^\s*\zs\<\%(ensure\|else\|rescue\|elsif\|when\|in\|end\):\@!\>'
 
 " Regex that defines the start-match for the 'end' keyword.
 "let s:end_start_regex = '\%(^\|[^.]\)\<\%(module\|class\|def\|if\|for\|while\|until\|case\|unless\|begin\|do\)\>'
@@ -110,7 +110,7 @@ let s:end_start_regex =
       \ '\|\%(^\|[^.:@$]\)\@<=\<do:\@!\>'
 
 " Regex that defines the middle-match for the 'end' keyword.
-let s:end_middle_regex = '\<\%(ensure\|else\|\%(\%(^\|;\)\s*\)\@<=\<rescue:\@!\>\|when\|elsif\):\@!\>'
+let s:end_middle_regex = '\<\%(ensure\|else\|\%(\%(^\|;\)\s*\)\@<=\<rescue:\@!\>\|when\|\%(\%(^\|;\)\s*\)\@<=\<in\|elsif\):\@!\>'
 
 " Regex that defines the end-match for the 'end' keyword.
 let s:end_end_regex = '\%(^\|[^.:@$]\)\@<=\<end:\@!\>'
diff --git a/syntax/debcontrol.vim b/syntax/debcontrol.vim
index 67f98588a..630c17733 100644
--- a/syntax/debcontrol.vim
+++ b/syntax/debcontrol.vim
@@ -7,7 +7,7 @@ endif
 " Maintainer:  Debian Vim Maintainers
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2020 Oct 26
+" Last Change: 2021 Nov 26
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/master/syntax/debcontrol.vim
 
 " Standard syntax initialization
@@ -95,6 +95,11 @@ syn case ignore
 
 " Handle all fields from deb-src-control(5)
 
+" Catch-all for the legal fields
+syn region debcontrolField matchgroup=debcontrolKey start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\|\%(XS-\)\=Testsuite\%(-Triggers\)\=\|Build-Profiles\|Tag\|Subarchitecture\|Kernel-Version\|Installer-Menu-Item\): " end="$" contains=debcontrolVariable,debcontrolEmail oneline
+syn region debcontrolMultiField matchgroup=debcontrolKey start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Breaks\|Enhances\|Replaces\|Conflicts\|Provides\|Built-Using\|Uploaders\|X[SBC]\{0,3\}\%(Private-\)\=-[-a-zA-Z0-9]\+\): *" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolEmail,debcontrolVariable,debcontrolComment
+syn region debcontrolMultiFieldSpell matchgroup=debcontrolKey start="^Description: *" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolEmail,debcontrolVariable,debcontrolComment,@Spell
+
 " Fields for which we do strict syntax checking
 syn region debcontrolStrictField matchgroup=debcontrolKey start="^Architecture: *" end="$" contains=debcontrolArchitecture,debcontrolSpace oneline
 syn region debcontrolStrictField matchgroup=debcontrolKey start="^Multi-Arch: *" end="$" contains=debcontrolMultiArch oneline
@@ -103,20 +108,15 @@ syn region debcontrolStrictField matchgroup=debcontrolKey start="^Priority: *" e
 syn region debcontrolStrictField matchgroup=debcontrolKey start="^Section: *" end="$" contains=debcontrolSection oneline
 syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XC-\)\=Package-Type: *" end="$" contains=debcontrolPackageType oneline
 syn region debcontrolStrictField matchgroup=debcontrolKey start="^Homepage: *" end="$" contains=debcontrolHTTPUrl oneline keepend
-syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XS-\)\=Vcs-\%(Browser\|Arch\|Bzr\|Darcs\|Hg\): *" end="$" contains=debcontrolHTTPUrl oneline keepend
-syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XS-\)\=Vcs-Svn: *" end="$" contains=debcontrolVcsSvn,debcontrolHTTPUrl oneline keepend
-syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XS-\)\=Vcs-Cvs: *" end="$" contains=debcontrolVcsCvs oneline keepend
-syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XS-\)\=Vcs-Git: *" end="$" contains=debcontrolVcsGit oneline keepend
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XS-[-a-zA-Z0-9]\+-\)\=Vcs-\%(Browser\|Arch\|Bzr\|Darcs\|Hg\): *" end="$" contains=debcontrolHTTPUrl oneline keepend
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XS-[-a-zA-Z0-9]\+-\)\=Vcs-Svn: *" end="$" contains=debcontrolVcsSvn,debcontrolHTTPUrl oneline keepend
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XS-[-a-zA-Z0-9]\+-\)\=Vcs-Cvs: *" end="$" contains=debcontrolVcsCvs oneline keepend
+syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(XS-[-a-zA-Z0-9]\+-\)\=Vcs-Git: *" end="$" contains=debcontrolVcsGit oneline keepend
 syn region debcontrolStrictField matchgroup=debcontrolKey start="^Rules-Requires-Root: *" end="$" contains=debcontrolR3 oneline
 syn region debcontrolStrictField matchgroup=debcontrolKey start="^\%(Build-\)\=Essential: *" end="$" contains=debcontrolYesNo oneline
 
 syn region debcontrolStrictField matchgroup=debcontrolDeprecatedKey start="^\%(XS-\)\=DM-Upload-Allowed: *" end="$" contains=debcontrolDmUpload oneline
 
-" Catch-all for the other legal fields
-syn region debcontrolField matchgroup=debcontrolKey start="^\%(\%(XSBC-Original-\)\=Maintainer\|Standards-Version\|Bugs\|Origin\|X[SB]-Python-Version\|\%(XS-\)\=Vcs-Mtn\|\%(XS-\)\=Testsuite\%(-Triggers\)\=\|Build-Profiles\|Tag\|Subarchitecture\|Kernel-Version\|Installer-Menu-Item\): " end="$" contains=debcontrolVariable,debcontrolEmail oneline
-syn region debcontrolMultiField matchgroup=debcontrolKey start="^\%(Build-\%(Conflicts\|Depends\)\%(-Arch\|-Indep\)\=\|\%(Pre-\)\=Depends\|Recommends\|Suggests\|Breaks\|Enhances\|Replaces\|Conflicts\|Provides\|Built-Using\|Uploaders\|X[SBC]\{0,3\}\%(Private-\)\=-[-a-zA-Z0-9]\+\): *" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolEmail,debcontrolVariable,debcontrolComment
-syn region debcontrolMultiFieldSpell matchgroup=debcontrolKey start="^Description: *" skip="^[ \t]" end="^$"me=s-1 end="^[^ \t#]"me=s-1 contains=debcontrolEmail,debcontrolVariable,debcontrolComment,@Spell
-
 " Associate our matches and regions with pretty colours
 hi def link debcontrolKey           Keyword
 hi def link debcontrolField         Normal
diff --git a/syntax/dtd.vim b/syntax/dtd.vim
index 061b5f10b..b54e7ae1e 100644
--- a/syntax/dtd.vim
+++ b/syntax/dtd.vim
@@ -49,7 +49,7 @@ if !exists("dtd_no_tag_errors")
     syn region dtdError contained start=+<!+lc=2 end=+>+
 endif
 
-" if this is a html like comment hightlight also
+" if this is a html like comment highlight also
 " the opening <! and the closing > as Comment.
 syn region dtdComment		start=+<![ \t]*--+ end=+-->+ contains=dtdTodo,@Spell
 
@@ -103,8 +103,8 @@ syn match   dtdEntity		      "&[^; \t]*;" contains=dtdEntityPunct
 syn match   dtdEntityPunct  contained "[&.;]"
 
 " Strings are between quotes
-syn region dtdString    start=+"+ skip=+\\\\\|\\"+  end=+"+ contains=dtdAttrDef,dtdAttrType,dtdEnum,dtdParamEntityInst,dtdEntity,dtdCard
-syn region dtdString    start=+'+ skip=+\\\\\|\\'+  end=+'+ contains=dtdAttrDef,dtdAttrType,dtdEnum,dtdParamEntityInst,dtdEntity,dtdCard
+syn region dtdString    start=+"+ skip=+\\\\\|\\"+  end=+"+ contains=dtdAttrDef,dtdAttrType,dtdParamEntityInst,dtdEntity,dtdCard
+syn region dtdString    start=+'+ skip=+\\\\\|\\'+  end=+'+ contains=dtdAttrDef,dtdAttrType,dtdParamEntityInst,dtdEntity,dtdCard
 
 " Enumeration of elements or data between parenthesis
 "
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index 538ef1e10..701cd99ad 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -158,19 +158,24 @@ let s:mindmapHilightLinks = [
       \ 'Function', 'Todo'
       \  ]
 
-let i = 1
-let contained = []
-while i < len(s:mindmapHilightLinks)
-  execute 'syntax match plantumlMindmap' . i . ' /^\([-+*]\)\1\{' . (i - 1) . '}_\?\s\+/ contained'
-  execute 'syntax match plantumlMindmap' . i . ' /^\s\{' . (i - 1) . '}\*_\?\s\+/ contained'
-  execute 'highlight default link plantumlMindmap' . i . ' ' . s:mindmapHilightLinks[i - 1]
-  call add(contained, 'plantumlMindmap' . i)
-  let i = i + 1
+let s:i = 1
+let s:contained = []
+let s:mindmap_color = '\(\[#[^\]]\+\]\)\?'
+let s:mindmap_removing_box = '_\?'
+let s:mindmap_options = join([s:mindmap_color, s:mindmap_removing_box], '')
+while s:i < len(s:mindmapHilightLinks)
+  execute 'syntax match plantumlMindmap' . s:i . ' /^\([-+*]\)\1\{' . (s:i - 1) . '}' . s:mindmap_options . '\(:\|\s\+\)/ contained'
+  execute 'syntax match plantumlMindmap' . s:i . ' /^\s\{' . (s:i - 1) . '}\*' . s:mindmap_options . '\(:\|\s\+\)/ contained'
+  execute 'highlight default link plantumlMindmap' . s:i . ' ' . s:mindmapHilightLinks[s:i - 1]
+  call add(s:contained, 'plantumlMindmap' . s:i)
+  let s:i = s:i + 1
 endwhile
 
-execute 'syntax region plantumlMindmap oneline start=/^\([-+*]\)\1*_\?\s/ end=/$/ contains=' . join(contained, ',')
+execute 'syntax region plantumlMindmap oneline start=/^\([-+*]\)\1*' . s:mindmap_options . '\s/ end=/$/ contains=' . join(s:contained, ',')
+" Multilines
+execute 'syntax region plantumlMindmap start=/^\([-+*]\)\1*' . s:mindmap_options . ':/ end=/;$/ contains=' . join(s:contained, ',')
 " Markdown syntax
-execute 'syntax region plantumlMindmap oneline start=/^\s*\*_\?\s/ end=/$/ contains=' . join(contained, ',')
+execute 'syntax region plantumlMindmap oneline start=/^\s*\*' . s:mindmap_options . '\s/ end=/$/ contains=' . join(s:contained, ',')
 
 
 " Skinparam keywords
@@ -258,6 +263,7 @@ syntax keyword plantumlSkinparamKeyword InterfaceStereotypeFontSize InterfaceSte
 syntax keyword plantumlSkinparamKeyword LegendBorderColor LegendBorderThickness LegendFontColor LegendFontName
 syntax keyword plantumlSkinparamKeyword LegendFontSize LegendFontStyle LexicalBackgroundColor LexicalBorderColor
 syntax keyword plantumlSkinparamKeyword LifelineStrategy Linetype MachineBackgroundColor MachineBorderColor
+syntax keyword plantumlSkinparamKeyword LineColor LineStyle LineThickness
 syntax keyword plantumlSkinparamKeyword MachineBorderThickness MachineFontColor MachineFontName MachineFontSize
 syntax keyword plantumlSkinparamKeyword MachineFontStyle MachineStereotypeFontColor MachineStereotypeFontName
 syntax keyword plantumlSkinparamKeyword MachineStereotypeFontSize MachineStereotypeFontStyle MaxAsciiMessageLength
diff --git a/syntax/vlang.vim b/syntax/vlang.vim
index aae1bd9b4..fbb17b358 100644
--- a/syntax/vlang.vim
+++ b/syntax/vlang.vim
@@ -136,7 +136,7 @@ hi def link     vComment            Comment
 " V escapes
 syn match       vStringVar          display contained +\$[0-9A-Za-z\._]*\([(][^)]*[)]\)\?+
 syn match       vStringVar          display contained "\${[^}]*}"
-syn match       vStringSpeChar      display contained +\\[abfnrtv\\'"]+
+syn match       vStringSpeChar      display contained +\\[abfnrtv\\'"`]+
 syn match       vStringX            display contained "\\x\x\{1,2}"
 syn match       vStringU            display contained "\\u\x\{4}"
 syn match       vStringBigU         display contained "\\U\x\{8}"
diff --git a/syntax/zig.vim b/syntax/zig.vim
index a8d2ddd76..b3ad6fb26 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -47,7 +47,7 @@ let s:zig_syntax_keywords = {
     \ ,             "c_longlong"
     \ ,             "c_ulonglong"
     \ ,             "c_longdouble"
-    \ ,             "c_void"]
+    \ ,             "anyopaque"]
     \ , 'zigConstant': ["undefined"
     \ ,                 "unreachable"]
     \ , 'zigConditional': ["if"

From 040e90bd0291edfb2415fed5907fee8c66550f6b Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 23 Jan 2022 22:36:22 +0100
Subject: [PATCH 281/299] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 3e71fc233..270bf6943 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+This is my top-rater repository, so I've decided to put this "ad" here:
+
+If you seek consultation, please visit following repository: https://github.com/sheerun/consultation
+
 ![vim-polyglot](https://i.imgur.com/9RxQK6k.png)
 
 [![build](https://github.com/sheerun/vim-polyglot/workflows/Vim%20Polyglot%20CI/badge.svg)](https://github.com/sheerun/vim-polyglot/actions) [![Maintenance](https://img.shields.io/badge/maintained%20since-2013-yes)]()

From b1704aba87919a27a2865f1655e889a55acc5c21 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 23 Jan 2022 22:36:51 +0100
Subject: [PATCH 282/299] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 270bf6943..5ad70d908 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-This is my top-rater repository, so I've decided to put this "ad" here:
+This is my top-starred repository on Github, so I've decided to put this "ad" here:
 
 If you seek consultation, please visit following repository: https://github.com/sheerun/consultation
 

From 3a1fd1b41efbd3abae133a1c976d69e7e7594d63 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 23 Jan 2022 22:37:28 +0100
Subject: [PATCH 283/299] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5ad70d908..bc7df7cbd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-This is my top-starred repository on Github, so I've decided to put this "ad" here:
+This is my top-starred repository on Github, so I've decided to put this ad here:
 
 If you seek consultation, please visit following repository: https://github.com/sheerun/consultation
 

From 2c5af8f89d3e61e04e761c07a1f043b0f35203c6 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sun, 23 Jan 2022 22:38:54 +0100
Subject: [PATCH 284/299] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bc7df7cbd..a33ce80f6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 This is my top-starred repository on Github, so I've decided to put this ad here:
 
-If you seek consultation, please visit following repository: https://github.com/sheerun/consultation
+If you work for big corp and seek consulting, please visit following repository: https://github.com/sheerun/consultation
 
 ![vim-polyglot](https://i.imgur.com/9RxQK6k.png)
 

From b77c5f11070ecb2ff343aa18b4ea859e6168f16c Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Thu, 17 Feb 2022 04:31:35 +0100
Subject: [PATCH 285/299] Update

---
 README.md                           |   4 +-
 after/syntax/javascript/graphql.vim |   4 +-
 after/syntax/typescript/graphql.vim |   9 +
 after/syntax/zsh.vim                | 275 +++++-----
 autoload/clojurecomplete.vim        |   2 +-
 autoload/csv.vim                    |   6 +-
 autoload/dart.vim                   |  12 -
 autoload/freebasic.vim              |  45 ++
 autoload/fsharp.vim                 |  53 +-
 autoload/polyglot/ft.vim            | 753 +++++++++++++++-------------
 autoload/polyglot/init.vim          |   6 +-
 autoload/polyglot/sleuth.vim        |   6 +-
 autoload/unison.vim                 |  12 +-
 compiler/ocaml.vim                  |   8 +-
 extras/filetype.vim                 | 111 +++-
 extras/menu.vim                     | 675 +++++++++++++------------
 ftplugin/basic.vim                  |  43 +-
 ftplugin/freebasic.vim              |  60 ++-
 ftplugin/markdown.vim               |  86 ++--
 ftplugin/plantuml.vim               |   1 -
 indent/basic.vim                    |  15 +
 indent/freebasic.vim                |  15 +
 indent/glsl.vim                     |   2 +-
 indent/markdown.vim                 |  18 +-
 indent/plantuml.vim                 |   3 +-
 indent/solidity.vim                 |   4 +-
 syntax/basic.vim                    | 482 +++++++++++++-----
 syntax/clojure.vim                  |  32 +-
 syntax/crystal.vim                  |   6 +-
 syntax/eelixir.vim                  |   2 +
 syntax/glsl.vim                     |  76 ++-
 syntax/go.vim                       |   2 +-
 syntax/julia.vim                    |   2 +-
 syntax/markdown.vim                 |  10 +-
 syntax/mermaid.vim                  |   8 +-
 syntax/odin.vim                     |   5 +
 syntax/opam.vim                     |  34 +-
 syntax/plantuml.vim                 | 129 +++--
 syntax/rc.vim                       |  21 +-
 syntax/swift.vim                    |   5 +-
 syntax/tmux.vim                     |  27 +-
 syntax/zig.vim                      |   3 +
 42 files changed, 1870 insertions(+), 1202 deletions(-)
 create mode 100644 autoload/freebasic.vim
 create mode 100644 indent/basic.vim
 create mode 100644 indent/freebasic.vim

diff --git a/README.md b/README.md
index a33ce80f6..0b5822235 100644
--- a/README.md
+++ b/README.md
@@ -177,7 +177,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [rust](https://github.com/rust-lang/rust.vim) (Rust syntax highlighting for rs and rs.in files)
 - [scala](https://github.com/derekwyatt/vim-scala) (Scala syntax highlighting for scala, kojo and sc files)
 - [scss](https://github.com/cakebaker/scss-syntax.vim) (SCSS syntax highlighting for scss files)
-- [sh](https://github.com/arzg/vim-sh) (Shell syntax highlighting for sh, bash, bats, cgi, command and 7 more files)
+- [sh](https://github.com/arzg/vim-sh) (Shell syntax highlighting for sh, bash, bats, cgi, command and 8 more files)
 - [slim](https://github.com/slim-template/vim-slim) (Slim syntax highlighting for slim files)
 - [slime](https://github.com/slime-lang/vim-slime-syntax) (Syntax highlighting for slime files)
 - [smt2](https://github.com/bohlender/vim-smt2) (SMT syntax highlighting for smt2 and smt files)
@@ -206,7 +206,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [velocity](https://github.com/lepture/vim-velocity) (Syntax highlighting for vm files)
 - [vue](https://github.com/posva/vim-vue) (Vue syntax highlighting for vue and wpy files)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (Syntax highlighting for xdc files)
-- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axml and 95 more files)
+- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axaml and 96 more files)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax) (XSLT syntax highlighting for xslt and xsl files)
 - [yard](https://github.com/noprompt/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting for zep files)
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index f76f0fab8..459f79f7c 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -46,7 +46,7 @@ if graphql#has_syntax_group('jsTemplateExpression')
   exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlTemplateString'
   syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=jsTemplateExpression containedin=graphqlFold keepend
 
-  syntax region graphqlTemplateString matchgroup=jsTemplateString start=+`#\s\{,4\}gql\>\s*$+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,jsTemplateExpression,jsSpecial extend
+  syntax region graphqlTemplateString matchgroup=jsTemplateString start=+`#\s\{,4\}\(gql\|graphql\)\>\s*$+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,jsTemplateExpression,jsSpecial extend
 
   hi def link graphqlTemplateString jsTemplateString
   hi def link graphqlTaggedTemplate jsTaggedTemplate
@@ -60,7 +60,7 @@ elseif graphql#has_syntax_group('javaScriptStringT')
   exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlTemplateString'
   syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=@javaScriptEmbededExpr containedin=graphqlFold keepend
 
-  syntax region graphqlTemplateString matchgroup=javaScriptStringT start=+`#\s\{,4\}gql\>\s*$+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,javaScriptSpecial,javaScriptEmbed,@htmlPreproc extend
+  syntax region graphqlTemplateString matchgroup=javaScriptStringT start=+`#\s\{,4\}\(gql\|graphql\)\>\s*$+ skip=+\\\\\|\\`+ end=+`+ contains=@GraphQLSyntax,javaScriptSpecial,javaScriptEmbed,@htmlPreproc extend
 
   hi def link graphqlTemplateString javaScriptStringT
   hi def link graphqlTaggedTemplate javaScriptEmbed
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index 950550062..1363f7a5e 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -46,6 +46,15 @@ exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlT
 " Support expression interpolation ((${...})) inside template strings.
 syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=typescriptTemplateSubstitution containedin=graphqlFold keepend
 
+" support #graphql , #gql comment strings
+syntax region graphqlTemplateString
+      \ start=+`\(#\s\{,4\}\(gql\|graphql\)\)\@=+
+      \ skip=+\\\\\|\\`+
+      \ end=+`+me=s-1
+      \ containedin=typescriptTemplate
+      \ contained
+      \ contains=@GraphQLSyntax,typescriptTemplateSubstitution extend
+
 hi def link graphqlTemplateString typescriptTemplate
 hi def link graphqlTemplateExpression typescriptTemplateSubstitution
 
diff --git a/after/syntax/zsh.vim b/after/syntax/zsh.vim
index cf4f92462..118345c43 100644
--- a/after/syntax/zsh.vim
+++ b/after/syntax/zsh.vim
@@ -3,6 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'zinit', 'after/syntax/zsh.vim
 endif
 
 " Copyright (c) 2019 Sebastian Gniazdowski
+" Copyright (c) 2021 Joakim Gottzén
 "
 " Syntax highlighting for Zinit commands in any file of type `zsh'.
 " It adds definitions for the Zinit syntax to the ones from the
@@ -10,117 +11,163 @@ endif
 
 " Main Zinit command.
 " Should be the only TOP rule for the whole syntax.
-syntax match ZinitCommand     /\<zinit\>\s/me=e-1
-            \ skipwhite
-            \ nextgroup=ZinitSubCommands,ZinitPluginSubCommands,ZinitSnippetSubCommands
-            \ contains=ZinitSubCommands,ZinitPluginSubCommands,ZinitSnippetSubCommands
-
-" TODO: add options for e.g. light
-syntax match ZinitSubCommands /\s\<\%(ice\|compinit\|env-whitelist\|cdreplay\|cdclear\|update\)\>\s/ms=s+1,me=e-1
-            \ contained
-
-syntax match ZinitPluginSubCommands /\s\<\%(light\|load\)\>\s/ms=s+1,me=e-1
-            \ skipwhite nextgroup=ZinitPlugin1,ZinitPlugin2,ZinitPlugin3
-            \ contains=ZinitPlugin1,ZinitPlugin2,ZinitPlugin3
-
-syntax match ZinitSnippetSubCommands /\s\<\%(snippet\)\>\s/ms=s+1,me=e-1
-            \ skipwhite
-            \ nextgroup=ZinitSnippetShorthands1,ZinitSnippetShorthands2
-            \ contains=ZinitSnippetShorthands1,ZinitSnippetShorthands2
-
-" "user/plugin"
-syntax match ZinitPlugin1 /\s["]\%([!-_]*\%(\/[!-_]\+\)\+\|[!-_]\+\)["]/ms=s+1,hs=s+2,he=e-1
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-" 'user/plugin'
-syntax match ZinitPlugin2 /\s[']\%([!-_]*\%(\/[!-_]\+\)\+\|[!-_]\+\)[']/ms=s+1,hs=s+2,he=e-1
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-" user/plugin
-syntax match ZinitPlugin3 /\s\%([!-_]*\%(\/[!-_]\+\)\+\|[!-_]\+\)/ms=s+1,me=e+2 
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-" OMZ:: or PZT::
-" TODO: 'OMZ:: or 'PZT::
-syntax match ZinitSnippetShorthands1 /\s\<\%(\%(OMZ\|PZT\)\>::\|\)/hs=s+1,he=e-2
-            \ contained
-            \ skipwhite
-            \ nextgroup=ZinitSnippetUrl1,ZinitSnippetUrl2
-            \ contains=ZinitSnippetUrl1,ZinitSnippetUrl2
-
-" "OMZ:: or "PZT::
-syntax match ZinitSnippetShorthands2 /\s["]\%(\%(OMZ\|PZT\)\>::\|\)/hs=s+2,he=e-2
-            \ contained
-            \ skipwhite
-            \ nextgroup=ZinitSnippetUrl3,ZinitSnippetUrl4
-            \ contains=ZinitSnippetUrl3,ZinitSnippetUrl4
-
-syntax match ZinitSnippetUrl3 /\<\%(http:\/\/\|https:\/\/\|ftp:\/\/\|\$HOME\|\/\)[!-_]\+\%(\/[!-_]\+\)*\/\?["]/he=e-1
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-" TODO: Fix ZinitTrailingWhiteSpace not matching
-syntax match ZinitSnippetUrl4 /\%(\%(OMZ\|PZT\)::\)[!-_]\+\%(\/[!-_]\+\)*\/\?["]/hs=s+5,he=e-1
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-" http://… or https://… or ftp://… or $HOME/… or /…
-" TODO: Fix $HOME/… and /… not matching
-syntax match ZinitSnippetUrl1 /\<\%(http:\/\/\|https:\/\/\|ftp:\/\/\|\$HOME\|\/\)[!-_]\+\%(\/[!-_]\+\)*\/\?/
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-" TODO: Fix ZinitTrailingWhiteSpace not matching
-syntax match ZinitSnippetUrl2 /\<\%(\%(OMZ\|PZT\)::\)[!-_]\+\%(\/[!-_]\+\)*\/\?/hs=s+5
-            \ contained
-            \ nextgroup=ZinitTrailingWhiteSpace
-            \ contains=ZinitTrailingWhiteSpace
-
-syntax match ZinitTrailingWhiteSpace /[[:space:]]\+$/ contained
-
-" TODO: differentiate the no-value ices
-" TODO: use contained
-syntax match ZinitIceSubCommand /\sice\s/ms=s+1,me=e-1 nextgroup=ZinitIceModifiers
-syntax match ZinitIceModifiers  /\s\<\%(svn\|proto\|from\|teleid\|bindmap\|cloneopts\|id-as\|depth\|if\|wait\|load\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(unload\|blockf\|on-update-of\|subscribe\|pick\|bpick\|src\|as\|ver\|silent\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(lucid\|notify\|mv\|cp\|atinit\|atclone\|atload\|atpull\|nocd\|run-atpull\|has\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(cloneonly\|make\|service\|trackbinds\|multisrc\|compile\|nocompile\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(nocompletions\|reset-prompt\|wrap-track\|reset\|aliases\|sh\|bash\|ksh\|csh\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(\\!sh\|!sh\|\\!bash\|!bash\|\\!ksh\|!ksh\|\\!csh\|!csh\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(blockf\|silent\|lucid\|trackbinds\|cloneonly\|nocd\|run-atpull\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(\|sh\|\!sh\|bash\|\!bash\|ksh\|\!ksh\|csh\|\!csh\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(nocompletions\|svn\|aliases\|trigger-load\)\>/ms=s+1
-syntax match ZinitIceModifiers  /\s\<\%(light-mode\|is-snippet\|countdown\|ps-on-unload\|ps-on-update\)\>/ms=s+1
-            
-" Include also ices added by the existing annexes
-syntax match ZinitIceModifiers  /\s\<\%(test\|zman\|submod\|dl\|patch\|fbin\|sbin\|fsrc\|ferc\|fmod\|gem\|node\|rustup\|cargo\)\>/ms=s+1
-        
-" Additional Zsh and Zinit functions
-syntax match ZshAndZinitFunctions     /\<\%(compdef\|compinit\|zpcdreplay\|zpcdclear\|zpcompinit\|zpcompdef\)\>/
-
-" Link
-highlight def link ZshAndZinitFunctions    Keyword
-highlight def link ZinitCommand            Statement
-highlight def link ZinitSubCommands        Title
-highlight def link ZinitPluginSubCommands  Title
-highlight def link ZinitSnippetSubCommands Title
-highlight def link ZinitIceModifiers       Type
-highlight def link ZinitSnippetShorthands1 Keyword
-highlight def link ZinitSnippetShorthands2 Keyword
-highlight def link ZinitPlugin1            Macro
-highlight def link ZinitPlugin2            Macro
-highlight def link ZinitPlugin3            Macro
-highlight def link ZinitSnippetUrl1        Macro
-highlight def link ZinitSnippetUrl2        Macro
-highlight def link ZinitSnippetUrl3        Macro
-highlight def link ZinitSnippetUrl4        Macro
-highlight def link ZinitTrailingWhiteSpace Error
+syn match ZinitCommand '\(^\|\s\)zinit\s'ms=e-5,me=e-1 skipwhite
+            \ nextgroup=ZinitCommand,ZinitIceCommand,ZinitPluginCommand,ZinitSnippetCommand,ZinitForCommand,ZinitContinue,ZinitIceWithParam,ZinitIce
+
+syn match ZinitCommand '\s\%(help\|man\)\>'ms=s+1 skipwhite contained
+syn match ZinitCommand '\s\%(unload\)\>'ms=s+1 skipwhite contained " load,light and snippet are handled elsewhere
+syn match ZinitCommand '\s\%(clist\|completions\|cdisable\|cenable\|creinstall\|cuninstall\)\>'ms=s+1 skipwhite contained
+syn match ZinitCommand '\s\%(csearch\|compinit\|cclear\|cdlist\|cdreplay\|cdclear\)\>'ms=s+1 skipwhite contained
+syn match ZinitCommand '\s\%(dtrace\|dstart\|dstop\|dunload\|dreport\|dclear\)\>'ms=s+1 skipwhite contained
+syn match ZinitCommand '\s\%(times\|zstatus\|report\|loaded\|list\|ls\|status\|recently\|bindkeys\)\>'ms=s+1 skipwhite contained
+syn match ZinitCommand '\s\%(compile\|uncompile\|compiled\)\>'ms=s+1 skipwhite contained
+syn match ZinitCommand '\s\%(self-update\|update\|delete\|cd\|edit\|glance\|stress\|changes\|create\)\>'ms=s+1 skipwhite contained
+syn match ZinitCommand '\s\%(srv\|recall\|env-whitelist\|module\|add-fpath\|fpath\|run\)\>'ms=s+1 skipwhite contained
+
+syn match ZinitIceCommand '\sice\s'ms=s+1,me=e-1 skipwhite contained nextgroup=ZinitIce,ZinitIceWithParam
+
+syn match ZinitPluginCommand '\s\%(light\|load\)\s'ms=s+1,me=e-1 skipwhite contained nextgroup=ZinitPlugin,ZinitContinue
+
+syn match ZinitSnippetCommand '\s\%(snippet\)\s'ms=s+1,me=e-1 skipwhite contained nextgroup=ZinitSnippet,ZinitContinue
+
+syn match ZinitForCommand '\sfor\s'ms=s+1,me=e-1 skipwhite contained
+            \ nextgroup=ZinitPlugin,ZinitSnippet,ZinitContinue
+
+syn cluster ZinitLine contains=ZinitIce,ZinitIceWithParam,ZinitPlugin,ZinitSnippet,ZinitForCommand
+
+syn match ZinitContinue '\s\\\s*$'ms=s+1,me=s+2 skipwhite contained skipnl
+            \ nextgroup=@ZinitLine
+
+" user/plugin or @user/plugin
+syn match ZinitPlugin '\s@\?\<[a-zA-Z0-9][a-zA-Z0-9_\-]*\/[a-zA-Z0-9_\-\.]\+\>'ms=s+1 skipwhite contained
+            \ nextgroup=ZinitPlugin,ZinitSnippet,ZinitContinue
+
+" shorthands
+syn match ZinitSnippet '\s\%(OMZ[LPT]\?\|PZT[M]\?\)::[a-zA-Z0-9_\-\.\/]\+\>'ms=s+1 skipwhite contained
+            \ nextgroup=ZinitPlugin,ZinitSnippet,ZinitContinue
+" url
+syn match ZinitSnippet '\s\%(http[s]\?\|ftp\):\/\/[[:alnum:]%\/_#.-]*\>'ms=s+1 skipwhite contained
+            \ nextgroup=ZinitPlugin,ZinitSnippet,ZinitContinue
+" "$VAR" local path
+syn match ZinitSnippet +\s"\$\<[a-zA-Z0-9_]\+[^"]*"+ms=s+1 skipwhite contained
+            \ nextgroup=ZinitPlugin,ZinitSnippet,ZinitContinue
+" "${VAR}" local path
+syn match ZinitSnippet +\s"\${\<[a-zA-Z0-9_]\+}[^"]*"+ms=s+1 skipwhite contained
+            \ nextgroup=ZinitPlugin,ZinitSnippet,ZinitContinue
+
+" ices which takes a param enclosed in "
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(proto\|from\|ver\|bpick\|depth\|cloneopts\|pullopts\)"+ skip=+\\"+ end=+"+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceDoubleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(pick\|src\|multisrc\)"+ skip=+\\"+ end=+"+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceDoubleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(wait\|load\|unload\|if\|has\|subscribe\|on-update-of\|trigger-load\)"+ skip=+\\"+ end=+"+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceDoubleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(mv\|cp\|atclone\|atpull\|atinit\|atload\|atdelete\|make\)"+ skip=+\\"+ end=+"+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceDoubleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(as\|id-as\|compile\|nocompile\|service\|bindmap\|wrap-track\)"+ skip=+\\"+ end=+"+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceDoubleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(extract\|subst\|autoload\)"+ skip=+\\"+ end=+"+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceDoubleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(wrap\|ps-on-unload\|ps-on-update\)"+ skip=+\\"+ end=+"+ skipwhite contained
+
+" zinit packages
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(param\)"+ skip=+\\"+ end=+"+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceDoubleQuoteParam
+
+" added by the existing annexes
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(fbin\|sbin\|gem\|node\|pip\|fmod\|fsrc\|ferc\)"+ skip=+\\"+ end=+"+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceDoubleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(dl\|patch\|submods\|cargo\|dlink\|dlink0\)"+ skip=+\\"+ end=+"+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceDoubleQuoteParam
+
+syn match ZinitIceDoubleQuoteParam +[^"]*+ contained
+
+" ices that takes a param enclosed in '
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(proto\|from\|ver\|bpick\|depth\|cloneopts\|pullopts\)'+ skip=+\\'+ end=+'+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceSingleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(pick\|src\|multisrc\)'+ skip=+\\'+ end=+'+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceSingleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(wait\|load\|unload\|if\|has\|subscribe\|on-update-of\|trigger-load\)'+ skip=+\\'+ end=+'+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceSingleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(mv\|cp\|atclone\|atpull\|atinit\|atload\|atdelete\|make\)'+ skip=+\\'+ end=+'+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceSingleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(as\|id-as\|compile\|nocompile\|service\|bindmap\|wrap-track\)'+ skip=+\\'+ end=+'+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceSingleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(extract\|subst\|autoload\)'+ skip=+\\'+ end=+'+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceSingleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(wrap\|ps-on-unload\|ps-on-update\)'+ skip=+\\'+ end=+'+ skipwhite contained
+
+" zinit packages
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(param\)'+ skip=+\\'+ end=+'+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceSingleQuoteParam
+
+" added by the existing annexes
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(fbin\|sbin\|gem\|node\|pip\|fmod\|fsrc\|ferc\)'+ skip=+\\'+ end=+'+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceSingleQuoteParam
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(dl\|patch\|submods\|cargo\|dlink\|dlink0\)'+ skip=+\\'+ end=+'+ skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+            \ contains=ZinitIceSingleQuoteParam
+
+syn match ZinitIceSingleQuoteParam +[^']*+ contained
+
+" ices that doens't take a param
+syn match ZinitIce '\s\%(teleid\|svn\)\>'ms=s+1 skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+syn match ZinitIce '\s\%(wait\|cloneonly\)\>'ms=s+1 skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+syn match ZinitIce '\s\%(silent\|lucid\|notify\)\>'ms=s+1 skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+syn match ZinitIce '\s\%(blockf\|nocompletions\)\>'ms=s+1 skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+syn match ZinitIce '\s\%(run-atpull\|nocd\|make\|countdown\|reset\)\>'ms=s+1 skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+syn match ZinitIce '\s!\?\%(sh\|bash\|ksh\|csh\)\>'ms=s+1 skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+syn match ZinitIce '\s\%(id-as\|nocompile\|reset-prompt\|trackbinds\|aliases\|light-mode\)\>'ms=s+1 skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+syn match ZinitIce '\s\%(is-snippet\)\>'ms=s+1 skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+
+" ices that doens't take a param, from zinit packages
+syn match ZinitIce '\s\%(pack\|git\|null\)\>'ms=s+1 skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+
+" ices that doens't take a param, added by the existing annexes
+syn match ZinitIce '\s\%(notest\|rustup\|default-ice\|skip\|debug\)\>'ms=s+1 skipwhite contained
+            \ nextgroup=@ZinitLine,ZinitContinue
+
+" additional Zsh and zinit functions
+syn match ZshAndZinitFunctions '\<\%(compdef\|compinit\|zpcdreplay\|zpcdclear\|zpcompinit\|zpcompdef\)\>'
+
+" highlights
+hi def link ZinitCommand             Statement
+hi def link ZinitCommand             Title
+hi def link ZinitIceCommand          Title
+hi def link ZinitPluginCommand       Title
+hi def link ZinitSnippetCommand      Title
+hi def link ZinitForCommand          zshRepeat
+hi def link ZinitContinue            Normal
+hi def link ZinitPlugin              Macro
+hi def link ZinitSnippet             Macro
+hi def link ZinitIce                 Type
+hi def link ZinitIceDoubleQuoteParam Special
+hi def link ZinitIceSingleQuoteParam Special
+hi def link ZshAndZinitFunctions     Keyword
+
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index bc352ccb9..358330045 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -13,7 +13,7 @@ endif
 " -*- COMPLETION WORDS -*-
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
 " Clojure version 1.10.3
-let s:words = ["*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Inst","PrintWriter-on","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","any?","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc!","assoc","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case","cast","cat","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj!","conj","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj!","disj","dissoc!","dissoc","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extend-protocol","extend-type","extenders","extends?","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","if","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let","letfn","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","new","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop!","pop","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","quote","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set!","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
+let s:words = ["&","*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Inst","PrintWriter-on","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","any?","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case","case*","cast","cat","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","deftype*","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extend-protocol","extend-type","extenders","extends?","false","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn*","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","if","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let*","letfn","letfn*","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop*","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","new","newline","next","nfirst","nil","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","quote","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","reify*","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set","set!","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
 
 " Simple word completion for special forms and public vars in clojure.core
 function! clojurecomplete#Complete(findstart, base)
diff --git a/autoload/csv.vim b/autoload/csv.vim
index 34943bc77..ba04d2bcc 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -780,8 +780,7 @@ fu! csv#CalculateColumnWidth(row, silent) "{{{3
     " row for the row for which to calculate the width
     let b:col_width=[]
     if has( 'vartabs' ) && b:delimiter == "\t"
-        let vts_save=&vts
-        set vts=
+        setlocal vts=
     endif
     try
         if exists("b:csv_headerline")
@@ -801,9 +800,6 @@ fu! csv#CalculateColumnWidth(row, silent) "{{{3
     " delete buffer content in variable b:csv_list,
     " this was only necessary for calculating the max width
     unlet! b:csv_list s:columnize_count s:decimal_column
-    if has( 'vartabs' ) && b:delimiter == "\t"
-        let &vts=vts_save
-    endif
 endfu
 fu! csv#Columnize(field) "{{{3
     " Internal function, not called from external,
diff --git a/autoload/dart.vim b/autoload/dart.vim
index a5733d038..28e55552c 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -90,18 +90,6 @@ function! s:FindDartFmt() abort
   return []
 endfunction
 
-function! dart#analyzer(q_args) abort
-  call s:error('DartAnalyzer support has been removed. '.
-      \'If this broke your workflow please comment on '.
-      \'https://github.com/dart-lang/dart-vim-plugin/issues/89')
-endfunction
-
-function! dart#tojs(q_args) abort
-  call s:error('Dart2JS support has been removed. '.
-      \'If this broke your workflow please comment on '.
-      \'https://github.com/dart-lang/dart-vim-plugin/issues/89')
-endfunction
-
 " Finds the path to `uri`.
 "
 " If the file is a package: uri, looks for a .packages file to resolve the path.
diff --git a/autoload/freebasic.vim b/autoload/freebasic.vim
new file mode 100644
index 000000000..50be90451
--- /dev/null
+++ b/autoload/freebasic.vim
@@ -0,0 +1,45 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'freebasic', 'autoload/freebasic.vim')
+  finish
+endif
+
+" Vim filetype plugin file
+" Language:	FreeBASIC
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2021 Mar 16
+
+" Dialects can be one of fb, qb, fblite, or deprecated
+" Precedence is forcelang > #lang > lang
+function! freebasic#GetDialect() abort
+  if exists("g:freebasic_forcelang")
+    return g:freebasic_forcelang
+  endif
+
+  if exists("g:freebasic_lang")
+    let dialect = g:freebasic_lang
+  else
+    let dialect = "fb"
+  endif
+
+  " override with #lang directive or metacommand
+
+  let skip = "has('syntax_items') && synIDattr(synID(line('.'), col('.'), 1), 'name') =~ 'Comment$'"
+  let pat = '\c^\s*\%(#\s*lang\s\+\|''\s*$lang\s*:\s*\)"\([^"]*\)"'
+
+  let save_cursor = getcurpos()
+  call cursor(1, 1)
+  let lnum = search(pat, 'n', '', '', skip)
+  call setpos('.', save_cursor)
+
+  if lnum
+    let word = matchlist(getline(lnum), pat)[1]
+    if word =~? '\%(fb\|deprecated\|fblite\|qb\)'
+      let dialect = word
+    else
+      echomsg "freebasic#GetDialect: Invalid lang, found '" .. word .. "' at line " .. lnum .. " " .. getline(lnum)
+    endif
+  endif
+
+  return dialect
+endfunction
+
+" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index 5d8bb79d1..275913cfd 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -238,11 +238,7 @@ function! fsharp#loadConfig()
     endif
 
     if !exists('g:fsharp#fsautocomplete_command')
-        let s:fsac = fnamemodify(s:script_root_dir . "fsac/fsautocomplete.dll", ":p")
-        let g:fsharp#fsautocomplete_command =
-            \ ['dotnet', s:fsac,
-                \ '--background-service-enabled'
-            \ ]
+        let g:fsharp#fsautocomplete_command = ['fsautocomplete', '--background-service-enabled']
     endif
     if !exists('g:fsharp#use_recommended_server_config')
         let g:fsharp#use_recommended_server_config = 1
@@ -283,6 +279,7 @@ function! fsharp#loadConfig()
 
     " backend configuration
     if g:fsharp#backend == 'languageclient-neovim'
+        let $DOTNET_ROLL_FORWARD='LatestMajor'
         if !exists('g:LanguageClient_serverCommands')
             let g:LanguageClient_serverCommands = {}
         endif
@@ -478,8 +475,17 @@ function! fsharp#OnCursorMove()
 endfunction
 
 function! fsharp#showF1Help()
-    let result = s:f1Help(expand('%:p'), line('.') - 1, col('.') - 1)
-    echo result
+    function! s:callback_showF1Help(result)
+        let result = a:result
+        if exists('result.result.content')
+            let content = json_decode(result.result.content)
+            if exists('content.Data')
+                let url = 'https://docs.microsoft.com/en-us/dotnet/api/' . substitute(content.Data, '#ctor', '-ctor', 'g')
+                echo url
+            endif
+        endif
+    endfunction
+    call s:f1Help(expand('%:p'), line('.') - 1, col('.') - 1, function("s:callback_showF1Help"))
 endfunction
 
 function! s:hover()
@@ -505,39 +511,6 @@ function! fsharp#showTooltip()
 endfunction
 
 
-" FSAC update utils
-
-function! s:update_win()
-    echom "[FSAC] Downloading FSAC. This may take a while..."
-    let script = s:script_root_dir . "install.ps1"
-    call system('powershell -ExecutionPolicy Unrestricted ' . script . " update")
-endfunction
-
-function! s:update_unix()
-    echom "[FSAC] Downloading FSAC. This may take a while..."
-    let zip = s:script_root_dir . "fsac.zip"
-    call system(
-        \ 'curl -fLo ' . zip .  ' --create-dirs ' .
-        \ '"https://github.com/fsharp/FsAutoComplete/releases/latest/download/fsautocomplete.netcore.zip"'
-        \ )
-    if v:shell_error == 0
-        call system('unzip -o -d ' . s:script_root_dir . "/fsac " . zip)
-        call system('find ' . s:script_root_dir . '/fsac' . ' -type f -exec chmod 777 \{\} \;')
-        echom "[FSAC] Updated FsAutoComplete"
-    else
-        echom "[FSAC] Failed to update FsAutoComplete"
-    endif
-endfunction
-
-function! fsharp#updateFSAC(...)
-    if has('win32') && !has('win32unix')
-        call s:update_win()
-    else
-        call s:update_unix()
-    endif
-endfunction
-
-
 " FSI integration
 
 let s:fsi_buffer = -1
diff --git a/autoload/polyglot/ft.vim b/autoload/polyglot/ft.vim
index 2ba69ed13..a8ca90080 100644
--- a/autoload/polyglot/ft.vim
+++ b/autoload/polyglot/ft.vim
@@ -1,113 +1,127 @@
-" Vim functions for file type detection
-"
-" Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Dec 17
+vim9script
 
-" These functions are moved here from runtime/filetype.vim to make startup
-" faster.
+# Vim functions for file type detection
+#
+# Maintainer:	Bram Moolenaar <Bram@vim.org>
+# Last Change:	2022 Feb 05
 
-" Line continuation is used here, remove 'C' from 'cpoptions'
-let s:cpo_save = &cpo
-set cpo&vim
+# These functions are moved here from runtime/filetype.vim to make startup
+# faster.
 
-func polyglot#ft#Check_inp()
+export def Check_inp()
   if getline(1) =~ '^\*'
     setf abaqus
   else
-    let n = 1
-    if line("$") > 500
-      let nmax = 500
-    else
-      let nmax = line("$")
-    endif
+    var n = 1
+    var nmax = line("$") > 500 ? 500 : line("$")
     while n <= nmax
       if getline(n) =~? "^header surface data"
 	setf trasys
 	break
       endif
-      let n = n + 1
+      n += 1
     endwhile
   endif
-endfunc
+enddef
 
-" This function checks for the kind of assembly that is wanted by the user, or
-" can be detected from the first five lines of the file.
-func polyglot#ft#FTasm()
-  " make sure b:asmsyntax exists
+# This function checks for the kind of assembly that is wanted by the user, or
+# can be detected from the first five lines of the file.
+export def FTasm()
+  # make sure b:asmsyntax exists
   if !exists("b:asmsyntax")
-    let b:asmsyntax = ""
+    b:asmsyntax = ""
   endif
 
   if b:asmsyntax == ""
-    call polyglot#ft#FTasmsyntax()
+    FTasmsyntax()
   endif
 
-  " if b:asmsyntax still isn't set, default to asmsyntax or GNU
+  # if b:asmsyntax still isn't set, default to asmsyntax or GNU
   if b:asmsyntax == ""
     if exists("g:asmsyntax")
-      let b:asmsyntax = g:asmsyntax
+      b:asmsyntax = g:asmsyntax
     else
-      let b:asmsyntax = "asm"
+      b:asmsyntax = "asm"
     endif
   endif
 
-  exe "setf " . fnameescape(b:asmsyntax)
-endfunc
+  exe "setf " .. fnameescape(b:asmsyntax)
+enddef
 
-func polyglot#ft#FTasmsyntax()
-  " see if file contains any asmsyntax=foo overrides. If so, change
-  " b:asmsyntax appropriately
-  let head = " ".getline(1)." ".getline(2)." ".getline(3)." ".getline(4).
-	\" ".getline(5)." "
-  let match = matchstr(head, '\sasmsyntax=\zs[a-zA-Z0-9]\+\ze\s')
+export def FTasmsyntax()
+  # see if the file contains any asmsyntax=foo overrides. If so, change
+  # b:asmsyntax appropriately
+  var head = " " .. getline(1) .. " " .. getline(2) .. " "
+	.. getline(3) .. " " .. getline(4) ..  " " .. getline(5) .. " "
+  var match = matchstr(head, '\sasmsyntax=\zs[a-zA-Z0-9]\+\ze\s')
   if match != ''
-    let b:asmsyntax = match
+    b:asmsyntax = match
   elseif ((head =~? '\.title') || (head =~? '\.ident') || (head =~? '\.macro') || (head =~? '\.subtitle') || (head =~? '\.library'))
-    let b:asmsyntax = "vmasm"
+    b:asmsyntax = "vmasm"
+  endif
+enddef
+
+var ft_visual_basic_content = '\cVB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
+
+# See FTfrm() for Visual Basic form file detection
+export def FTbas()
+  if exists("g:filetype_bas")
+    exe "setf " .. g:filetype_bas
+    return
   endif
-endfunc
 
-" Check if one of the first five lines contains "VB_Name".  In that case it is
-" probably a Visual Basic file.  Otherwise it's assumed to be "alt" filetype.
-func polyglot#ft#FTVB(alt)
-  if getline(1).getline(2).getline(3).getline(4).getline(5) =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
+  # most frequent FreeBASIC-specific keywords in distro files
+  var fb_keywords = '\c^\s*\%(extern\|var\|enum\|private\|scope\|union\|byref\|operator\|constructor\|delete\|namespace\|public\|property\|with\|destructor\|using\)\>\%(\s*[:=(]\)\@!'
+  var fb_preproc  = '\c^\s*\%(#\a\+\|option\s\+\%(byval\|dynamic\|escape\|\%(no\)\=gosub\|nokeyword\|private\|static\)\>\)'
+  var fb_comment  = "^\\s*/'"
+  # OPTION EXPLICIT, without the leading underscore, is common to many dialects
+  var qb64_preproc = '\c^\s*\%($\a\+\|option\s\+\%(_explicit\|_\=explicitarray\)\>\)'
+
+  var lines = getline(1, min([line("$"), 100]))
+
+  if match(lines, fb_preproc) > -1 || match(lines, fb_comment) > -1 || match(lines, fb_keywords) > -1
+    setf freebasic
+  elseif match(lines, qb64_preproc) > -1
+    setf qb64
+  elseif match(lines, s:ft_visual_basic_content) > -1
     setf vb
   else
-    exe "setf " . a:alt
+    setf basic
   endif
-endfunc
+enddef
 
-func polyglot#ft#FTbtm()
+export def FTbtm()
   if exists("g:dosbatch_syntax_for_btm") && g:dosbatch_syntax_for_btm
     setf dosbatch
   else
     setf btm
   endif
-endfunc
+enddef
 
-func polyglot#ft#BindzoneCheck(default)
-  if getline(1).getline(2).getline(3).getline(4) =~ '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
+export def BindzoneCheck(default = '')
+  if getline(1) .. getline(2) .. getline(3) .. getline(4)
+	  =~ '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
     setf bindzone
-  elseif a:default != ''
-    exe 'setf ' . a:default
+  elseif default != ''
+    exe 'setf ' .. default
   endif
-endfunc
+enddef
 
-func polyglot#ft#FTlpc()
+export def FTlpc()
   if exists("g:lpc_syntax_for_c")
-    let lnum = 1
+    var lnum = 1
     while lnum <= 12
       if getline(lnum) =~# '^\(//\|inherit\|private\|protected\|nosave\|string\|object\|mapping\|mixed\)'
 	setf lpc
 	return
       endif
-      let lnum = lnum + 1
+      lnum += 1
     endwhile
   endif
   setf c
-endfunc
+enddef
 
-func polyglot#ft#FTheader()
+export def FTheader()
   if match(getline(1, min([line("$"), 200])), '^@\(interface\|end\|class\)') > -1
     if exists("g:c_syntax_for_h")
       setf objc
@@ -121,15 +135,15 @@ func polyglot#ft#FTheader()
   else
     setf cpp
   endif
-endfunc
+enddef
 
-" This function checks if one of the first ten lines start with a '@'.  In
-" that case it is probably a change file.
-" If the first line starts with # or ! it's probably a ch file.
-" If a line has "main", "include", "//" or "/*" it's probably ch.
-" Otherwise CHILL is assumed.
-func polyglot#ft#FTchange()
-  let lnum = 1
+# This function checks if one of the first ten lines start with a '@'.  In
+# that case it is probably a change file.
+# If the first line starts with # or ! it's probably a ch file.
+# If a line has "main", "include", "//" or "/*" it's probably ch.
+# Otherwise CHILL is assumed.
+export def FTchange()
+  var lnum = 1
   while lnum <= 10
     if getline(lnum)[0] == '@'
       setf change
@@ -147,86 +161,101 @@ func polyglot#ft#FTchange()
       setf ch
       return
     endif
-    let lnum = lnum + 1
+    lnum += 1
   endwhile
   setf chill
-endfunc
+enddef
 
-func polyglot#ft#FTent()
-  " This function checks for valid cl syntax in the first five lines.
-  " Look for either an opening comment, '#', or a block start, '{".
-  " If not found, assume SGML.
-  let lnum = 1
+export def FTent()
+  # This function checks for valid cl syntax in the first five lines.
+  # Look for either an opening comment, '#', or a block start, '{".
+  # If not found, assume SGML.
+  var lnum = 1
   while lnum < 6
-    let line = getline(lnum)
+    var line = getline(lnum)
     if line =~ '^\s*[#{]'
       setf cl
       return
     elseif line !~ '^\s*$'
-      " Not a blank line, not a comment, and not a block start,
-      " so doesn't look like valid cl code.
+      # Not a blank line, not a comment, and not a block start,
+      # so doesn't look like valid cl code.
       break
     endif
-    let lnum = lnum + 1
+    lnum += 1
   endw
   setf dtd
-endfunc
+enddef
 
-func polyglot#ft#ExCheck()
-  let lines = getline(1, min([line("$"), 100]))
+export def ExCheck()
+  var lines = getline(1, min([line("$"), 100]))
   if exists('g:filetype_euphoria')
-    exe 'setf ' . g:filetype_euphoria
+    exe 'setf ' .. g:filetype_euphoria
   elseif match(lines, '^--\|^ifdef\>\|^include\>') > -1
     setf euphoria3
   else
     setf elixir
   endif
-endfunc
+enddef
 
-func polyglot#ft#EuphoriaCheck()
+export def EuphoriaCheck()
   if exists('g:filetype_euphoria')
-    exe 'setf ' . g:filetype_euphoria
+    exe 'setf ' .. g:filetype_euphoria
   else
     setf euphoria3
   endif
-endfunc
+enddef
 
-func polyglot#ft#DtraceCheck()
-  let lines = getline(1, min([line("$"), 100]))
+export def DtraceCheck()
+  var lines = getline(1, min([line("$"), 100]))
   if match(lines, '^module\>\|^import\>') > -1
-    " D files often start with a module and/or import statement.
+    # D files often start with a module and/or import statement.
     setf d
   elseif match(lines, '^#!\S\+dtrace\|#pragma\s\+D\s\+option\|:\S\{-}:\S\{-}:') > -1
     setf dtrace
   else
     setf d
   endif
-endfunc
+enddef
 
-func polyglot#ft#FTe()
+export def FTe()
   if exists('g:filetype_euphoria')
-    exe 'setf ' . g:filetype_euphoria
+    exe 'setf ' .. g:filetype_euphoria
   else
-    let n = 1
+    var n = 1
     while n < 100 && n <= line("$")
       if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$"
 	setf specman
 	return
       endif
-      let n = n + 1
+      n += 1
     endwhile
     setf eiffel
   endif
-endfunc
+enddef
+
+export def FTfrm()
+  if exists("g:filetype_frm")
+    exe "setf " .. g:filetype_frm
+    return
+  endif
+
+  var lines = getline(1, min([line("$"), 5]))
 
-" Distinguish between Forth and F#.
-" Provided by Doug Kearns.
-func polyglot#ft#FTfs()
+  if match(lines, s:ft_visual_basic_content) > -1
+    setf vb
+  else
+    setf form
+  endif
+enddef
+
+# Distinguish between Forth and F#.
+# Provided by Doug Kearns.
+export def FTfs()
   if exists("g:filetype_fs")
-    exe "setf " . g:filetype_fs
+    exe "setf " .. g:filetype_fs
   else
-    let line = getline(nextnonblank(1))
-    " comments and colon definitions
+    var line = getline(nextnonblank(1))
+    # comments and colon definitions
     if line =~ '^\s*\.\=( ' || line =~ '^\s*\\G\= ' || line =~ '^\\$'
 	  \ || line =~ '^\s*: \S'
       setf forth
@@ -234,11 +263,11 @@ func polyglot#ft#FTfs()
       setf fsharp
     endif
   endif
-endfunc
+enddef
 
-" Distinguish between HTML, XHTML and Django
-func polyglot#ft#FThtml()
-  let n = 1
+# Distinguish between HTML, XHTML and Django
+export def FThtml()
+  var n = 1
   while n < 10 && n <= line("$")
     if getline(n) =~ '\<DTD\s\+XHTML\s'
       setf xhtml
@@ -248,58 +277,58 @@ func polyglot#ft#FThtml()
       setf htmldjango
       return
     endif
-    let n = n + 1
+    n += 1
   endwhile
   setf FALLBACK html
-endfunc
+enddef
 
-" Distinguish between standard IDL and MS-IDL
-func polyglot#ft#FTidl()
-  let n = 1
+# Distinguish between standard IDL and MS-IDL
+export def FTidl()
+  var n = 1
   while n < 50 && n <= line("$")
     if getline(n) =~ '^\s*import\s\+"\(unknwn\|objidl\)\.idl"'
       setf msidl
       return
     endif
-    let n = n + 1
+    n += 1
   endwhile
   setf idl
-endfunc
-
-" Distinguish between "default" and Cproto prototype file. */
-func polyglot#ft#ProtoCheck(default)
-  " Cproto files have a comment in the first line and a function prototype in
-  " the second line, it always ends in ";".  Indent files may also have
-  " comments, thus we can't match comments to see the difference.
-  " IDL files can have a single ';' in the second line, require at least one
-  " chacter before the ';'.
+enddef
+
+# Distinguish between "default" and Cproto prototype file. */
+export def ProtoCheck(default: string)
+  # Cproto files have a comment in the first line and a function prototype in
+  # the second line, it always ends in ";".  Indent files may also have
+  # comments, thus we can't match comments to see the difference.
+  # IDL files can have a single ';' in the second line, require at least one
+  # chacter before the ';'.
   if getline(2) =~ '.;$'
     setf cpp
   else
-    exe 'setf ' . a:default
+    exe 'setf ' .. default
   endif
-endfunc
+enddef
 
-func polyglot#ft#FTm()
+export def FTm()
   if exists("g:filetype_m")
-    exe "setf " . g:filetype_m
+    exe "setf " .. g:filetype_m
     return
   endif
 
-  " excluding end(for|function|if|switch|while) common to Murphi
-  let octave_block_terminators = '\<end\%(_try_catch\|classdef\|enumeration\|events\|methods\|parfor\|properties\)\>'
+  # excluding end(for|function|if|switch|while) common to Murphi
+  var octave_block_terminators = '\<end\%(_try_catch\|classdef\|enumeration\|events\|methods\|parfor\|properties\)\>'
 
-  let objc_preprocessor = '^\s*#\s*\%(import\|include\|define\|if\|ifn\=def\|undef\|line\|error\|pragma\)\>'
+  var objc_preprocessor = '^\s*#\s*\%(import\|include\|define\|if\|ifn\=def\|undef\|line\|error\|pragma\)\>'
 
-  let n = 1
-  let saw_comment = 0 " Whether we've seen a multiline comment leader.
+  var n = 1
+  var saw_comment = 0  # Whether we've seen a multiline comment leader.
   while n < 100
-    let line = getline(n)
+    var line = getline(n)
     if line =~ '^\s*/\*'
-      " /* ... */ is a comment in Objective C and Murphi, so we can't conclude
-      " it's either of them yet, but track this as a hint in case we don't see
-      " anything more definitive.
-      let saw_comment = 1
+      # /* ... */ is a comment in Objective C and Murphi, so we can't conclude
+      # it's either of them yet, but track this as a hint in case we don't see
+      # anything more definitive.
+      saw_comment = 1
     endif
     if line =~ '^\s*//' || line =~ '^\s*@import\>' || line =~ objc_preprocessor
       setf objc
@@ -310,7 +339,7 @@ func polyglot#ft#FTm()
       setf octave
       return
     endif
-    " TODO: could be Matlab or Octave
+    # TODO: could be Matlab or Octave
     if line =~ '^\s*%'
       setf matlab
       return
@@ -323,24 +352,24 @@ func polyglot#ft#FTm()
       setf murphi
       return
     endif
-    let n = n + 1
+    n += 1
   endwhile
 
   if saw_comment
-    " We didn't see anything definitive, but this looks like either Objective C
-    " or Murphi based on the comment leader. Assume the former as it is more
-    " common.
+    # We didn't see anything definitive, but this looks like either Objective C
+    # or Murphi based on the comment leader. Assume the former as it is more
+    # common.
     setf objc
   else
-    " Default is Matlab
+    # Default is Matlab
     setf matlab
   endif
-endfunc
+enddef
 
-func polyglot#ft#FTmms()
-  let n = 1
+export def FTmms()
+  var n = 1
   while n < 20
-    let line = getline(n)
+    var line = getline(n)
     if line =~ '^\s*\(%\|//\)' || line =~ '^\*'
       setf mmix
       return
@@ -349,78 +378,78 @@ func polyglot#ft#FTmms()
       setf make
       return
     endif
-    let n = n + 1
+    n += 1
   endwhile
   setf mmix
-endfunc
+enddef
 
-" This function checks if one of the first five lines start with a dot.  In
-" that case it is probably an nroff file: 'filetype' is set and 1 is returned.
-func polyglot#ft#FTnroff()
-  if getline(1)[0] . getline(2)[0] . getline(3)[0] . getline(4)[0] . getline(5)[0] =~ '\.'
+# This function checks if one of the first five lines start with a dot.  In
+# that case it is probably an nroff file: 'filetype' is set and 1 is returned.
+export def FTnroff(): number
+  if getline(1)[0] .. getline(2)[0] .. getline(3)[0]
+    			.. getline(4)[0] .. getline(5)[0] =~ '\.'
     setf nroff
     return 1
   endif
   return 0
-endfunc
+enddef
 
-func polyglot#ft#FTmm()
-  let n = 1
+export def FTmm()
+  var n = 1
   while n < 20
-    let line = getline(n)
-    if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)'
+    if getline(n) =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)'
       setf objcpp
       return
     endif
-    let n = n + 1
+    n += 1
   endwhile
   setf nroff
-endfunc
+enddef
 
-func polyglot#ft#FTpl()
+export def FTpl()
   if exists("g:filetype_pl")
-    exe "setf " . g:filetype_pl
+    exe "setf " .. g:filetype_pl
   else
-    " recognize Prolog by specific text in the first non-empty line
-    " require a blank after the '%' because Perl uses "%list" and "%translate"
-    let l = getline(nextnonblank(1))
+    # recognize Prolog by specific text in the first non-empty line
+    # require a blank after the '%' because Perl uses "%list" and "%translate"
+    var l = getline(nextnonblank(1))
     if l =~ '\<prolog\>' || l =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || l =~ ':-'
       setf prolog
     else
       setf perl
     endif
   endif
-endfunc
+enddef
 
-func polyglot#ft#FTinc()
+export def FTinc()
   if exists("g:filetype_inc")
-    exe "setf " . g:filetype_inc
+    exe "setf " .. g:filetype_inc
   else
-    let lines = getline(1).getline(2).getline(3)
+    var lines = getline(1) .. getline(2) .. getline(3)
     if lines =~? "perlscript"
       setf aspperl
     elseif lines =~ "<%"
       setf aspvbs
     elseif lines =~ "<?"
       setf php
-    " Pascal supports // comments but they're vary rarely used for file
-    " headers so assume POV-Ray
+    # Pascal supports // comments but they're vary rarely used for file
+    # headers so assume POV-Ray
     elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? s:ft_pascal_keywords
       setf pascal
     else
-      call polyglot#ft#FTasmsyntax()
+      FTasmsyntax()
       if exists("b:asmsyntax")
-	exe "setf " . fnameescape(b:asmsyntax)
+	exe "setf " .. fnameescape(b:asmsyntax)
       else
 	setf pov
       endif
     endif
   endif
-endfunc
+enddef
 
-func polyglot#ft#FTprogress_cweb()
+export def FTprogress_cweb()
   if exists("g:filetype_w")
-    exe "setf " . g:filetype_w
+    exe "setf " .. g:filetype_w
     return
   endif
   if getline(1) =~ '&ANALYZE' || getline(3) =~ '&GLOBAL-DEFINE'
@@ -428,76 +457,76 @@ func polyglot#ft#FTprogress_cweb()
   else
     setf cweb
   endif
-endfunc
+enddef
 
-func polyglot#ft#FTprogress_asm()
+export def FTprogress_asm()
   if exists("g:filetype_i")
-    exe "setf " . g:filetype_i
+    exe "setf " .. g:filetype_i
     return
   endif
-  " This function checks for an assembly comment the first ten lines.
-  " If not found, assume Progress.
-  let lnum = 1
+  # This function checks for an assembly comment the first ten lines.
+  # If not found, assume Progress.
+  var lnum = 1
   while lnum <= 10 && lnum < line('$')
-    let line = getline(lnum)
+    var line = getline(lnum)
     if line =~ '^\s*;' || line =~ '^\*'
-      call polyglot#ft#FTasm()
+      FTasm()
       return
     elseif line !~ '^\s*$' || line =~ '^/\*'
-      " Not an empty line: Doesn't look like valid assembly code.
-      " Or it looks like a Progress /* comment
+      # Not an empty line: Doesn't look like valid assembly code.
+      # Or it looks like a Progress /* comment
       break
     endif
-    let lnum = lnum + 1
+    lnum += 1
   endw
   setf progress
-endfunc
+enddef
 
-let s:ft_pascal_comments = '^\s*\%({\|(\*\|//\)'
-let s:ft_pascal_keywords = '^\s*\%(program\|unit\|library\|uses\|begin\|procedure\|function\|const\|type\|var\)\>'
+var ft_pascal_comments = '^\s*\%({\|(\*\|//\)'
+var ft_pascal_keywords = '^\s*\%(program\|unit\|library\|uses\|begin\|procedure\|function\|const\|type\|var\)\>'
 
-func polyglot#ft#FTprogress_pascal()
+export def FTprogress_pascal()
   if exists("g:filetype_p")
-    exe "setf " . g:filetype_p
+    exe "setf " .. g:filetype_p
     return
   endif
-  " This function checks for valid Pascal syntax in the first ten lines.
-  " Look for either an opening comment or a program start.
-  " If not found, assume Progress.
-  let lnum = 1
+  # This function checks for valid Pascal syntax in the first ten lines.
+  # Look for either an opening comment or a program start.
+  # If not found, assume Progress.
+  var lnum = 1
   while lnum <= 10 && lnum < line('$')
-    let line = getline(lnum)
+    var line = getline(lnum)
     if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
       setf pascal
       return
     elseif line !~ '^\s*$' || line =~ '^/\*'
-      " Not an empty line: Doesn't look like valid Pascal code.
-      " Or it looks like a Progress /* comment
+      # Not an empty line: Doesn't look like valid Pascal code.
+      # Or it looks like a Progress /* comment
       break
     endif
-    let lnum = lnum + 1
+    lnum += 1
   endw
   setf progress
-endfunc
+enddef
 
-func polyglot#ft#FTpp()
+export def FTpp()
   if exists("g:filetype_pp")
-    exe "setf " . g:filetype_pp
+    exe "setf " .. g:filetype_pp
   else
-    let line = getline(nextnonblank(1))
+    var line = getline(nextnonblank(1))
     if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
       setf pascal
     else
       setf puppet
     endif
   endif
-endfunc
+enddef
 
-func polyglot#ft#FTr()
-  let max = line("$") > 50 ? 50 : line("$")
+export def FTr()
+  var max = line("$") > 50 ? 50 : line("$")
 
   for n in range(1, max)
-    " Rebol is easy to recognize, check for that first
+    # Rebol is easy to recognize, check for that first
     if getline(n) =~? '\<REBOL\>'
       setf rebol
       return
@@ -505,82 +534,82 @@ func polyglot#ft#FTr()
   endfor
 
   for n in range(1, max)
-    " R has # comments
+    # R has # comments
     if getline(n) =~ '^\s*#'
       setf r
       return
     endif
-    " Rexx has /* comments */
+    # Rexx has /* comments */
     if getline(n) =~ '^\s*/\*'
       setf rexx
       return
     endif
   endfor
 
-  " Nothing recognized, use user default or assume Rexx
+  # Nothing recognized, use user default or assume Rexx
   if exists("g:filetype_r")
-    exe "setf " . g:filetype_r
+    exe "setf " .. g:filetype_r
   else
-    " Rexx used to be the default, but R appears to be much more popular.
+    # Rexx used to be the default, but R appears to be much more popular.
     setf r
   endif
-endfunc
+enddef
 
-func polyglot#ft#McSetf()
-  " Rely on the file to start with a comment.
-  " MS message text files use ';', Sendmail files use '#' or 'dnl'
+export def McSetf()
+  # Rely on the file to start with a comment.
+  # MS message text files use ';', Sendmail files use '#' or 'dnl'
   for lnum in range(1, min([line("$"), 20]))
-    let line = getline(lnum)
+    var line = getline(lnum)
     if line =~ '^\s*\(#\|dnl\)'
-      setf m4  " Sendmail .mc file
+      setf m4  # Sendmail .mc file
       return
     elseif line =~ '^\s*;'
-      setf msmessages  " MS Message text file
+      setf msmessages  # MS Message text file
       return
     endif
   endfor
   setf m4  " Default: Sendmail .mc file
-endfunc
+enddef
 
-" Called from filetype.vim and scripts.vim.
-func polyglot#ft#SetFileTypeSH(name)
+# Called from filetype.vim and scripts.vim.
+export def SetFileTypeSH(name: string)
   if did_filetype()
-    " Filetype was already detected
+    # Filetype was already detected
     return
   endif
   if expand("<amatch>") =~ g:ft_ignore_pat
     return
   endif
-  if a:name =~ '\<csh\>'
-    " Some .sh scripts contain #!/bin/csh.
-    call polyglot#ft#SetFileTypeShell("csh")
+  if name =~ '\<csh\>'
+    # Some .sh scripts contain #!/bin/csh.
+    SetFileTypeShell("csh")
     return
-  elseif a:name =~ '\<tcsh\>'
-    " Some .sh scripts contain #!/bin/tcsh.
-    call polyglot#ft#SetFileTypeShell("tcsh")
+  elseif name =~ '\<tcsh\>'
+    # Some .sh scripts contain #!/bin/tcsh.
+    SetFileTypeShell("tcsh")
     return
-  elseif a:name =~ '\<zsh\>'
-    " Some .sh scripts contain #!/bin/zsh.
-    call polyglot#ft#SetFileTypeShell("zsh")
+  elseif name =~ '\<zsh\>'
+    # Some .sh scripts contain #!/bin/zsh.
+    SetFileTypeShell("zsh")
     return
-  elseif a:name =~ '\<ksh\>'
-    let b:is_kornshell = 1
+  elseif name =~ '\<ksh\>'
+    b:is_kornshell = 1
     if exists("b:is_bash")
       unlet b:is_bash
     endif
     if exists("b:is_sh")
       unlet b:is_sh
     endif
-  elseif exists("g:bash_is_sh") || a:name =~ '\<bash\>' || a:name =~ '\<bash2\>'
-    let b:is_bash = 1
+  elseif exists("g:bash_is_sh") || name =~ '\<bash\>' || name =~ '\<bash2\>'
+    b:is_bash = 1
     if exists("b:is_kornshell")
       unlet b:is_kornshell
     endif
     if exists("b:is_sh")
       unlet b:is_sh
     endif
-  elseif a:name =~ '\<sh\>'
-    let b:is_sh = 1
+  elseif name =~ '\<sh\>'
+    b:is_sh = 1
     if exists("b:is_kornshell")
       unlet b:is_kornshell
     endif
@@ -588,75 +617,76 @@ func polyglot#ft#SetFileTypeSH(name)
       unlet b:is_bash
     endif
   endif
-  call polyglot#ft#SetFileTypeShell("sh")
-endfunc
+  SetFileTypeShell("sh")
+enddef
 
-" For shell-like file types, check for an "exec" command hidden in a comment,
-" as used for Tcl.
-" Also called from scripts.vim, thus can't be local to this script.
-func polyglot#ft#SetFileTypeShell(name)
+# For shell-like file types, check for an "exec" command hidden in a comment,
+# as used for Tcl.
+# Also called from scripts.vim, thus can't be local to this script.
+export def SetFileTypeShell(name: string)
   if did_filetype()
-    " Filetype was already detected
+    # Filetype was already detected
     return
   endif
   if expand("<amatch>") =~ g:ft_ignore_pat
     return
   endif
-  let l = 2
+  var l = 2
   while l < 20 && l < line("$") && getline(l) =~ '^\s*\(#\|$\)'
-    " Skip empty and comment lines.
-    let l = l + 1
+    # Skip empty and comment lines.
+    l += 1
   endwhile
   if l < line("$") && getline(l) =~ '\s*exec\s' && getline(l - 1) =~ '^\s*#.*\\$'
-    " Found an "exec" line after a comment with continuation
-    let n = substitute(getline(l),'\s*exec\s\+\([^ ]*/\)\=', '', '')
+    # Found an "exec" line after a comment with continuation
+    var n = substitute(getline(l), '\s*exec\s\+\([^ ]*/\)\=', '', '')
     if n =~ '\<tclsh\|\<wish'
       setf tcl
       return
     endif
   endif
-  exe "setf " . a:name
-endfunc
+  exe "setf " .. name
+enddef
 
-func polyglot#ft#CSH()
+export def CSH()
   if did_filetype()
-    " Filetype was already detected
+    # Filetype was already detected
     return
   endif
   if exists("g:filetype_csh")
-    call polyglot#ft#SetFileTypeShell(g:filetype_csh)
+    SetFileTypeShell(g:filetype_csh)
   elseif &shell =~ "tcsh"
-    call polyglot#ft#SetFileTypeShell("tcsh")
+    SetFileTypeShell("tcsh")
   else
-    call polyglot#ft#SetFileTypeShell("csh")
+    SetFileTypeShell("csh")
   endif
-endfunc
+enddef
 
-let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*'
-func polyglot#ft#FTRules()
-  let path = expand('<amatch>:p')
+var ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*'
+export def FTRules()
+  var path = expand('<amatch>:p')
   if path =~ '/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|\%(usr/\)\=lib/udev/\%(rules\.d/\)\=.*\.rules\)$'
     setf udevrules
     return
   endif
   if path =~ '^/etc/ufw/'
-    setf conf  " Better than hog
+    setf conf  # Better than hog
     return
   endif
   if path =~ '^/\(etc\|usr/share\)/polkit-1/rules\.d'
     setf javascript
     return
   endif
+  var config_lines: list<string>
   try
-    let config_lines = readfile('/etc/udev/udev.conf')
+    config_lines = readfile('/etc/udev/udev.conf')
   catch /^Vim\%((\a\+)\)\=:E484/
     setf hog
     return
   endtry
-  let dir = expand('<amatch>:p:h')
+  var dir = expand('<amatch>:p:h')
   for line in config_lines
     if line =~ s:ft_rules_udev_rules_pattern
-      let udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "")
+      var udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "")
       if dir == udev_rules
 	setf udevrules
       endif
@@ -664,24 +694,24 @@ func polyglot#ft#FTRules()
     endif
   endfor
   setf hog
-endfunc
+enddef
 
-func polyglot#ft#SQL()
+export def SQL()
   if exists("g:filetype_sql")
-    exe "setf " . g:filetype_sql
+    exe "setf " .. g:filetype_sql
   else
     setf sql
   endif
-endfunc
+enddef
 
-" If the file has an extension of 't' and is in a directory 't' or 'xt' then
-" it is almost certainly a Perl test file.
-" If the first line starts with '#' and contains 'perl' it's probably a Perl
-" file.
-" (Slow test) If a file contains a 'use' statement then it is almost certainly
-" a Perl file.
-func polyglot#ft#FTperl()
-  let dirname = expand("%:p:h:t")
+# If the file has an extension of 't' and is in a directory 't' or 'xt' then
+# it is almost certainly a Perl test file.
+# If the first line starts with '#' and contains 'perl' it's probably a Perl
+# file.
+# (Slow test) If a file contains a 'use' statement then it is almost certainly
+# a Perl file.
+export def FTperl(): number
+  var dirname = expand("%:p:h:t")
   if expand("%:e") == 't' && (dirname == 't' || dirname == 'xt')
     setf perl
     return 1
@@ -690,86 +720,88 @@ func polyglot#ft#FTperl()
     setf perl
     return 1
   endif
-  let save_cursor = getpos('.')
-  call cursor(1,1)
-  let has_use = search('^use\s\s*\k', 'c', 30)
+  var save_cursor = getpos('.')
+  call cursor(1, 1)
+  var has_use = search('^use\s\s*\k', 'c', 30) > 0
   call setpos('.', save_cursor)
   if has_use
     setf perl
     return 1
   endif
   return 0
-endfunc
-
-" Choose context, plaintex, or tex (LaTeX) based on these rules:
-" 1. Check the first line of the file for "%&<format>".
-" 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords.
-" 3. Default to "plain" or to g:tex_flavor, can be set in user's vimrc.
-func polyglot#ft#FTtex()
-  let firstline = getline(1)
+enddef
+
+# Choose context, plaintex, or tex (LaTeX) based on these rules:
+# 1. Check the first line of the file for "%&<format>".
+# 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords.
+# 3. Default to "plain" or to g:tex_flavor, can be set in user's vimrc.
+export def FTtex()
+  var firstline = getline(1)
+  var format: string
   if firstline =~ '^%&\s*\a\+'
-    let format = tolower(matchstr(firstline, '\a\+'))
-    let format = substitute(format, 'pdf', '', '')
+    format = tolower(matchstr(firstline, '\a\+'))
+    format = substitute(format, 'pdf', '', '')
     if format == 'tex'
-      let format = 'latex'
+      format = 'latex'
     elseif format == 'plaintex'
-      let format = 'plain'
+      format = 'plain'
     endif
   elseif expand('%') =~ 'tex/context/.*/.*.tex'
-    let format = 'context'
+    format = 'context'
   else
-    " Default value, may be changed later:
-    let format = exists("g:tex_flavor") ? g:tex_flavor : 'plain'
-    " Save position, go to the top of the file, find first non-comment line.
-    let save_cursor = getpos('.')
-    call cursor(1,1)
-    let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
-    if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
-      let lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>'
-      let cpat = 'start\a\+\|setup\a\+\|usemodule\|enablemode\|enableregime\|setvariables\|useencoding\|usesymbols\|stelle\a\+\|verwende\a\+\|stel\a\+\|gebruik\a\+\|usa\a\+\|imposta\a\+\|regle\a\+\|utilisemodule\>'
-      let kwline = search('^\s*\\\%(' . lpat . '\)\|^\s*\\\(' . cpat . '\)',
-			      \ 'cnp', firstNC + 1000)
-      if kwline == 1	" lpat matched
-	let format = 'latex'
-      elseif kwline == 2	" cpat matched
-	let format = 'context'
-      endif		" If neither matched, keep default set above.
-      " let lline = search('^\s*\\\%(' . lpat . '\)', 'cn', firstNC + 1000)
-      " let cline = search('^\s*\\\%(' . cpat . '\)', 'cn', firstNC + 1000)
-      " if cline > 0
-      "   let format = 'context'
-      " endif
-      " if lline > 0 && (cline == 0 || cline > lline)
-      "   let format = 'tex'
-      " endif
-    endif " firstNC
+    # Default value, may be changed later:
+    format = exists("g:tex_flavor") ? g:tex_flavor : 'plain'
+    # Save position, go to the top of the file, find first non-comment line.
+    var save_cursor = getpos('.')
+    call cursor(1, 1)
+    var firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
+    if firstNC > 0
+      # Check the next thousand lines for a LaTeX or ConTeXt keyword.
+      var lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>'
+      var cpat = 'start\a\+\|setup\a\+\|usemodule\|enablemode\|enableregime\|setvariables\|useencoding\|usesymbols\|stelle\a\+\|verwende\a\+\|stel\a\+\|gebruik\a\+\|usa\a\+\|imposta\a\+\|regle\a\+\|utilisemodule\>'
+      var kwline = search('^\s*\\\%(' .. lpat .. '\)\|^\s*\\\(' .. cpat .. '\)',
+			      'cnp', firstNC + 1000)
+      if kwline == 1		# lpat matched
+	format = 'latex'
+      elseif kwline == 2	# cpat matched
+	format = 'context'
+      endif		# If neither matched, keep default set above.
+      # let lline = search('^\s*\\\%(' . lpat . '\)', 'cn', firstNC + 1000)
+      # let cline = search('^\s*\\\%(' . cpat . '\)', 'cn', firstNC + 1000)
+      # if cline > 0
+      #   let format = 'context'
+      # endif
+      # if lline > 0 && (cline == 0 || cline > lline)
+      #   let format = 'tex'
+      # endif
+    endif # firstNC
     call setpos('.', save_cursor)
-  endif " firstline =~ '^%&\s*\a\+'
+  endif # firstline =~ '^%&\s*\a\+'
 
-  " Translation from formats to file types.  TODO:  add AMSTeX, RevTex, others?
+  # Translation from formats to file types.  TODO:  add AMSTeX, RevTex, others?
   if format == 'plain'
     setf plaintex
   elseif format == 'context'
     setf context
-  else " probably LaTeX
+  else # probably LaTeX
     setf tex
   endif
   return
-endfunc
+enddef
 
-func polyglot#ft#FTxml()
-  let n = 1
+export def FTxml()
+  var n = 1
   while n < 100 && n <= line("$")
-    let line = getline(n)
-    " DocBook 4 or DocBook 5.
-    let is_docbook4 = line =~ '<!DOCTYPE.*DocBook'
-    let is_docbook5 = line =~ ' xmlns="http://docbook.org/ns/docbook"'
+    var line = getline(n)
+    # DocBook 4 or DocBook 5.
+    var is_docbook4 = line =~ '<!DOCTYPE.*DocBook'
+    var is_docbook5 = line =~ ' xmlns="http://docbook.org/ns/docbook"'
     if is_docbook4 || is_docbook5
-      let b:docbk_type = "xml"
+      b:docbk_type = "xml"
       if is_docbook5
-	let b:docbk_ver = 5
+	b:docbk_ver = 5
       else
-	let b:docbk_ver = 4
+	b:docbk_ver = 4
       endif
       setf docbk
       return
@@ -778,15 +810,15 @@ func polyglot#ft#FTxml()
       setf xbl
       return
     endif
-    let n += 1
+    n += 1
   endwhile
   setf xml
-endfunc
+enddef
 
-func polyglot#ft#FTy()
-  let n = 1
+export def FTy()
+  var n = 1
   while n < 100 && n <= line("$")
-    let line = getline(n)
+    var line = getline(n)
     if line =~ '^\s*%'
       setf yacc
       return
@@ -795,25 +827,25 @@ func polyglot#ft#FTy()
       setf racc
       return
     endif
-    let n = n + 1
+    n += 1
   endwhile
   setf yacc
-endfunc
+enddef
 
-func polyglot#ft#Redif()
-  let lnum = 1
+export def Redif()
+  var lnum = 1
   while lnum <= 5 && lnum < line('$')
     if getline(lnum) =~ "^\ctemplate-type:"
       setf redif
       return
     endif
-    let lnum = lnum + 1
+    lnum += 1
   endwhile
-endfunc
+enddef
 
-" This function is called for all files under */debian/patches/*, make sure not
-" to non-dep3patch files, such as README and other text files.
-func polyglot#ft#Dep3patch()
+# This function is called for all files under */debian/patches/*, make sure not
+# to non-dep3patch files, such as README and other text files.
+export def Dep3patch()
   if expand('%:t') ==# 'series'
     return
   endif
@@ -823,12 +855,43 @@ func polyglot#ft#Dep3patch()
       setf dep3patch
       return
     elseif ln =~# '^---'
-      " end of headers found. stop processing
+      # end of headers found. stop processing
       return
     endif
   endfor
-endfunc
+enddef
+
+# This function checks the first 15 lines for appearance of 'FoamFile'
+# and then 'object' in a following line.
+# In that case, it's probably an OpenFOAM file
+export def FTfoam()
+    var ffile = 0
+    var lnum = 1
+    while lnum <= 15
+      if getline(lnum) =~# '^FoamFile'
+	ffile = 1
+      elseif ffile == 1 && getline(lnum) =~# '^\s*object'
+	setf foam
+	return
+      endif
+      lnum += 1
+    endwhile
+enddef
+
+# Determine if a *.tf file is TF mud client or terraform
+export def FTtf()
+  var numberOfLines = line('$')
+  for i in range(1, numberOfLines)
+    var currentLine = trim(getline(i))
+    var firstCharacter = currentLine[0]
+    if firstCharacter !=? ";" && firstCharacter !=? "/" && firstCharacter !=? ""
+      setf terraform
+      return
+    endif
+  endfor
+  setf tf
+enddef
+
 
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save
+# Uncomment this line to check for compilation errors early
+# defcompile
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 353da7e47..edf1f2bca 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -1957,7 +1957,7 @@ if !has_key(g:polyglot_is_disabled, 'slim')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'sh')
-  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}kshrc,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,kshrc,login,man,profile setf sh
+  au BufNewFile,BufRead *.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh,*.sh.in,*.tmux,*.tool,*.zsh-theme,*/etc/udev/cdsymlinks.conf,{.,}bash_aliases,{.,}bash_history,{.,}bash_logout,{.,}bash_profile,{.,}bashrc,{.,}cshrc,{.,}env,{.,}env.example,{.,}flaskenv,{.,}kshrc,{.,}login,{.,}profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,kshrc,login,man,profile setf sh
   au BufNewFile,BufRead *.zsh,*/etc/zprofile,{.,}zfbfmarks,{.,}zlogin,{.,}zlogout,{.,}zprofile,{.,}zshenv,{.,}zshrc setf zsh
   au BufNewFile,BufRead .zsh* call s:StarSetf('zsh')
   au BufNewFile,BufRead .zlog* call s:StarSetf('zsh')
@@ -1985,7 +1985,7 @@ if !has_key(g:polyglot_is_disabled, 'rspec')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'ruby')
-  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.prawn,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Routefile,Snapfile,Thorfile,Vagrantfile,[Rr]antfile,buildfile,vagrantfile setf ruby
+  au BufNewFile,BufRead *.axlsx,*.builder,*.cap,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.opal,*.pluginspec,*.podspec,*.prawn,*.rabl,*.rake,*.rant,*.rb,*.rbi,*.rbuild,*.rbw,*.rbx,*.rjs,*.ru,*.ruby,*.rxml,*.spec,*.thor,*.watchr,{.,}Brewfile,{.,}Guardfile,{.,}autotest,{.,}irbrc,{.,}pryrc,{.,}simplecov,Appraisals,Berksfile,Buildfile,Capfile,Cheffile,Dangerfile,Deliverfile,Fastfile,Gemfile,Guardfile,Jarfile,KitchenSink,Mavenfile,Podfile,Puppetfile,Rakefile,Routefile,Snapfile,Steepfile,Thorfile,Vagrantfile,[Rr]antfile,buildfile,vagrantfile setf ruby
   au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
   au BufNewFile,BufRead *.erb,*.erb.deface,*.rhtml setf eruby
 endif
@@ -2577,7 +2577,7 @@ if !has_key(g:polyglot_is_disabled, 'ant')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.hzp,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axaml,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.hzp,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
 endif
 
 if !has_key(g:polyglot_is_disabled, 'csv')
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index 9e943079c..c031c1575 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -460,7 +460,7 @@ let s:globs = {
   \ 'rrst': '*.rrst,*.srst',
   \ 'rst': '*.rst,*.rest,*.rest.txt,*.rst.txt',
   \ 'rtf': '*.rtf',
-  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.prawn,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,[Rr]antfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb',
+  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.prawn,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Steepfile,Thorfile,Vagrantfile,buildfile,[Rr]antfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb',
   \ 'rust': '*.rs,*.rs.in',
   \ 'samba': 'smb.conf',
   \ 'sas': '*.sas',
@@ -480,7 +480,7 @@ let s:globs = {
   \ 'services': '',
   \ 'setserial': '',
   \ 'sexplib': '*.sexp',
-  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.kshrc,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,kshrc,login,man,profile',
+  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,*.zsh-theme,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.kshrc,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,kshrc,login,man,profile',
   \ 'sieve': '*.siv,*.sieve',
   \ 'sil': '*.sil',
   \ 'simula': '*.sim',
@@ -611,7 +611,7 @@ let s:globs = {
   \ 'xhtml': '*.xhtml,*.xht',
   \ 'xinetd': '',
   \ 'xmath': '*.msc,*.msf',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.hzp,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axaml,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.hzp,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
   \ 'xml.twig': '*.xml.twig',
   \ 'xmodmap': '*Xmodmap,*xmodmap*',
   \ 'xpm': '*.xpm,*.pm',
diff --git a/autoload/unison.vim b/autoload/unison.vim
index cdc2efe59..e91699f02 100644
--- a/autoload/unison.vim
+++ b/autoload/unison.vim
@@ -56,7 +56,17 @@ function! unison#Complete(findstart, base) abort
     " locate the start of the word
     let line = getline('.')
     let start = col('.') - 1
-    while start > 0 && line[start - 1] !~ '\s' && line[start - 1] != '(' && line[start - 1] != ')'
+    " Examples of where we want to count the start of a word:
+    "
+    " foo List.fold<cursor>
+    "     ^
+    "
+    " {Abor<cursor>
+    "  ^
+    "
+    " (List.fol<cursor>
+    "  ^
+    while start > 0 && line[start - 1] !~ '\v\s|[(){}\[\]]'
       let start -= 1
     endwhile
     return start
diff --git a/compiler/ocaml.vim b/compiler/ocaml.vim
index cc45414aa..cad914396 100644
--- a/compiler/ocaml.vim
+++ b/compiler/ocaml.vim
@@ -7,6 +7,7 @@ endif
 " Maintainer:  Markus Mottl <markus.mottl@gmail.com>
 " URL:         https://github.com/ocaml/vim-ocaml
 " Last Change:
+"              2021 Nov 03 - Improved error format (Jules Aguillon)
 "              2020 Mar 28 - Improved error format (Thomas Leonard)
 "              2017 Nov 26 - Improved error format (Markus Mottl)
 "              2013 Aug 27 - Added a new OCaml error format (Markus Mottl)
@@ -39,10 +40,13 @@ CompilerSet errorformat =
       \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
       \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d\ %.%#,
       \%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
+      \%EFile\ \"%f\"\\,\ line\ %l:,
       \%+EReference\ to\ unbound\ regexp\ name\ %m,
       \%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m,
       \%Wocamlyacc:\ w\ -\ %m,
       \%-Zmake%.%#,
+      \%C%*\\d\ \|%.%#,
+      \%C%p^%#,
       \%C%m,
       \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
       \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
@@ -54,7 +58,9 @@ CompilerSet errorformat =
       \%X%*\\a:\ Leaving\ directory\ '%f',
       \%DEntering\ directory\ '%f',
       \%XLeaving\ directory\ '%f',
-      \%DMaking\ %*\\a\ in\ %f
+      \%DMaking\ %*\\a\ in\ %f,
+      \%+G%m
+
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/extras/filetype.vim b/extras/filetype.vim
index 4313adc21..f9f1ae755 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Dec 27
+" Last Change:	2022 Jan 31
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -193,7 +193,8 @@ au BufNewFile,BufRead *.awk,*.gawk		setf awk
 au BufNewFile,BufRead *.mch,*.ref,*.imp		setf b
 
 " BASIC or Visual Basic
-au BufNewFile,BufRead *.bas			call polyglot#ft#FTVB("basic")
+au BufNewFile,BufRead *.bas			call polyglot#ft#FTbas()
+au BufNewFile,BufRead *.bi,*.bm			call polyglot#ft#FTbas()
 
 " Visual Basic Script (close to Visual Basic) or Visual Basic .NET
 au BufNewFile,BufRead *.vb,*.vbs,*.dsm,*.ctl	setf vb
@@ -202,7 +203,7 @@ au BufNewFile,BufRead *.vb,*.vbs,*.dsm,*.ctl	setf vb
 au BufNewFile,BufRead *.iba,*.ibi		setf ibasic
 
 " FreeBasic file (similar to QBasic)
-au BufNewFile,BufRead *.fb,*.bi			setf freebasic
+au BufNewFile,BufRead *.fb			setf freebasic
 
 " Batch file for MSDOS.
 au BufNewFile,BufRead *.bat,*.sys		setf dosbatch
@@ -497,7 +498,7 @@ au BufNewFile,BufRead */debian/patches/*	call polyglot#ft#Dep3patch()
 " Diff files
 au BufNewFile,BufRead *.diff,*.rej		setf diff
 au BufNewFile,BufRead *.patch
-	\ if getline(1) =~ '^From [0-9a-f]\{40\} Mon Sep 17 00:00:00 2001$' |
+	\ if getline(1) =~# '^From [0-9a-f]\{40,\} Mon Sep 17 00:00:00 2001$' |
 	\   setf gitsendemail |
 	\ else |
 	\   setf diff |
@@ -653,6 +654,9 @@ au BufNewFile,BufRead *.fsl			setf framescript
 " FStab
 au BufNewFile,BufRead fstab,mtab		setf fstab
 
+" Fusion
+au BufRead,BufNewFile *.fusion			setf fusion
+
 " F# or Forth
 au BufNewFile,BufRead *.fs			call polyglot#ft#FTfs()
 
@@ -665,6 +669,12 @@ au BufNewFile,BufRead .gdbinit,gdbinit		setf gdb
 " GDMO
 au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
 
+" GDscript
+au BufNewFile,BufRead *.gd			setf gdscript
+
+" Godot resource
+au BufRead,BufNewFile *.tscn,*.tres			setf gdresource
+
 " Gedcom
 au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
 
@@ -676,26 +686,28 @@ autocmd BufRead,BufNewFile *.gift		setf gift
 
 " Git
 au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG	setf gitcommit
-au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig	setf gitconfig
+au BufNewFile,BufRead NOTES_EDITMSG,EDIT_DESCRIPTION		setf gitcommit
+au BufNewFile,BufRead *.git/config,.gitconfig,*/etc/gitconfig	setf gitconfig
 au BufNewFile,BufRead */.config/git/config			setf gitconfig
+au BufNewFile,BufRead *.git/config.worktree			setf gitconfig
+au BufNewFile,BufRead *.git/worktrees/*/config.worktree		setf gitconfig
 au BufNewFile,BufRead .gitmodules,*.git/modules/*/config	setf gitconfig
 if !empty($XDG_CONFIG_HOME)
   au BufNewFile,BufRead $XDG_CONFIG_HOME/git/config		setf gitconfig
 endif
 au BufNewFile,BufRead git-rebase-todo		setf gitrebase
 au BufRead,BufNewFile .gitsendemail.msg.??????	setf gitsendemail
-au BufNewFile,BufRead .msg.[0-9]*
-      \ if getline(1) =~ '^From.*# This line is ignored.$' |
-      \   setf gitsendemail |
-      \ endif
 au BufNewFile,BufRead *.git/*
-      \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
+      \ if getline(1) =~# '^\x\{40,\}\>\|^ref: ' |
       \   setf git |
       \ endif
 
 " Gkrellmrc
 au BufNewFile,BufRead gkrellmrc,gkrellmrc_?	setf gkrellmrc
 
+" GLSL
+au BufNewFile,BufRead *.glsl			setf glsl
+
 " GP scripts (2.0 and onward)
 au BufNewFile,BufRead *.gp,.gprc		setf gp
 
@@ -716,15 +728,19 @@ au BufNewFile,BufRead gitolite.conf		setf gitolite
 au BufNewFile,BufRead {,.}gitolite.rc,example.gitolite.rc	setf perl
 
 " Gnuplot scripts
-au BufNewFile,BufRead *.gpi			setf gnuplot
+au BufNewFile,BufRead *.gpi,.gnuplot		setf gnuplot
 
 " Go (Google)
 au BufNewFile,BufRead *.go			setf go
 au BufNewFile,BufRead Gopkg.lock		setf toml
+au BufRead,BufNewFile go.work			setf gowork
 
 " GrADS scripts
 au BufNewFile,BufRead *.gs			setf grads
 
+" GraphQL
+au BufNewFile,BufRead *.graphql,*.graphqls,*.gql			setf graphql
+
 " Gretl
 au BufNewFile,BufRead *.gretl			setf gretl
 
@@ -740,12 +756,18 @@ au BufNewFile,BufRead */etc/group,*/etc/group-,*/etc/group.edit,*/etc/gshadow,*/
 " GTK RC
 au BufNewFile,BufRead .gtkrc,gtkrc		setf gtkrc
 
+" Hack
+au BufRead,BufNewFile *.hack,*.hackpartial			setf hack
+
 " Haml
 au BufNewFile,BufRead *.haml			setf haml
 
 " Hamster Classic | Playground files
 au BufNewFile,BufRead *.hsm			setf hamster
 
+" Handlebars
+au BufNewFile,BufRead *.hbs			setf handlebars
+
 " Haskell
 au BufNewFile,BufRead *.hs,*.hsc,*.hs-boot,*.hsig setf haskell
 au BufNewFile,BufRead *.lhs			setf lhaskell
@@ -758,12 +780,21 @@ au BufNewFile,BufRead cabal.config		setf cabalconfig
 au BufNewFile,BufRead *.ht			setf haste
 au BufNewFile,BufRead *.htpp			setf hastepreproc
 
+" HCL
+au BufRead,BufNewFile *.hcl			setf hcl
+
 " Hercules
 au BufNewFile,BufRead *.vc,*.ev,*.sum,*.errsum	setf hercules
 
+" HEEx
+au BufRead,BufNewFile *.heex			setf heex
+
 " HEX (Intel)
 au BufNewFile,BufRead *.hex,*.h32		setf hex
 
+" Hjson
+au BufNewFile,BufRead *.hjson			setf hjson
+
 " Hollywood
 au BufRead,BufNewFile *.hws			setf hollywood
 
@@ -888,6 +919,9 @@ au BufNewFile,BufRead *.jov,*.j73,*.jovial	setf jovial
 " JSON
 au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest	setf json
 
+" JSON5
+au BufNewFile,BufRead *.json5			setf json5
+
 " JSON Patch (RFC 6902)
 au BufNewFile,BufRead *.json-patch			setf json
 
@@ -939,6 +973,9 @@ au BufNewFile,BufRead *.ldif			setf ldif
 " Ld loader
 au BufNewFile,BufRead *.ld			setf ld
 
+" Ledger
+au BufRead,BufNewFile *.ldg,*.ledger,*.journal			setf ledger
+
 " Less
 au BufNewFile,BufRead *.less			setf less
 
@@ -1176,6 +1213,9 @@ au BufNewFile,BufRead *.nginx,nginx*.conf,*nginx.conf,*/etc/nginx/*,*/usr/local/
 " Ninja file
 au BufNewFile,BufRead *.ninja			setf ninja
 
+" Nix
+au BufRead,BufNewFile *.nix			setf nix
+
 " NPM RC file
 au BufNewFile,BufRead npmrc,.npmrc		setf dosini
 
@@ -1217,6 +1257,9 @@ au BufNewFile,BufRead *.xom,*.xin		setf omnimark
 " OPAM
 au BufNewFile,BufRead opam,*.opam,*.opam.template setf opam
 
+" OpenFOAM
+au BufNewFile,BufRead [a-zA-Z0-9]*Dict\(.*\)\=,[a-zA-Z]*Properties\(.*\)\=,*Transport\(.*\),fvSchemes,fvSolution,fvConstrains,fvModels,*/constant/g,*/0\(\.orig\)\=/* call polyglot#ft#FTfoam()
+
 " OpenROAD
 au BufNewFile,BufRead *.or			setf openroad
 
@@ -1358,6 +1401,9 @@ au BufNewFile,BufRead *printcap
 au BufNewFile,BufRead *termcap
 	\ let b:ptcap_type = "term" | setf ptcap
 
+" Prisma
+au BufRead,BufNewFile *.prisma			setf prisma
+
 " PCCTS / ANTLR
 "au BufNewFile,BufRead *.g			setf antlr
 au BufNewFile,BufRead *.g			setf pccts
@@ -1365,6 +1411,9 @@ au BufNewFile,BufRead *.g			setf pccts
 " PPWizard
 au BufNewFile,BufRead *.it,*.ih			setf ppwiz
 
+" Pug
+au BufRead,BufNewFile *.pug			setf pug
+
 " Puppet
 au BufNewFile,BufRead Puppetfile		setf ruby
 
@@ -1430,6 +1479,9 @@ au BufNewFile,BufRead *.pyx,*.pxd		setf pyrex
 au BufNewFile,BufRead *.py,*.pyw,.pythonstartup,.pythonrc  setf python
 au BufNewFile,BufRead *.ptl,*.pyi,SConstruct		   setf python
 
+" QL
+au BufRead,BufNewFile *.ql,*.qll		setf ql
+
 " Radiance
 au BufNewFile,BufRead *.rad,*.mat		setf radiance
 
@@ -1495,6 +1547,9 @@ au BufNewFile,BufRead *.r,*.R				call polyglot#ft#FTr()
 " Remind
 au BufNewFile,BufRead .reminders,*.remind,*.rem		setf remind
 
+" ReScript
+au BufNewFile,BufRead *.res,*.resi			setf rescript
+
 " Resolv.conf
 au BufNewFile,BufRead resolv.conf		setf resolv
 
@@ -1778,8 +1833,8 @@ au BufNewFile,BufRead *.sqr,*.sqi		setf sqr
 au BufNewFile,BufRead *.nut			setf squirrel
 
 " OpenSSH configuration
-au BufNewFile,BufRead ssh_config,*/.ssh/config		setf sshconfig
-au BufNewFile,BufRead */etc/ssh/ssh_config.d/*.conf	setf sshconfig
+au BufNewFile,BufRead ssh_config,*/.ssh/config,*/.ssh/*.conf	setf sshconfig
+au BufNewFile,BufRead */etc/ssh/ssh_config.d/*.conf		setf sshconfig
 
 " OpenSSH server configuration
 au BufNewFile,BufRead sshd_config			setf sshdconfig
@@ -1834,6 +1889,9 @@ au BufNewFile,BufRead */etc/sudoers,sudoers.tmp	setf sudoers
 " SVG (Scalable Vector Graphics)
 au BufNewFile,BufRead *.svg			setf svg
 
+" Surface
+au BufRead,BufNewFile *.sface			setf surface
+
 " Tads (or Nroff or Perl test file)
 au BufNewFile,BufRead *.t
 	\ if !polyglot#ft#FTnroff() && !polyglot#ft#FTperl() | setf tads | endif
@@ -1851,6 +1909,9 @@ au BufRead,BufNewFile *.task			setf taskedit
 " Tcl (JACL too)
 au BufNewFile,BufRead *.tcl,*.tm,*.tk,*.itcl,*.itk,*.jacl,.tclshrc,.wishrc	setf tcl
 
+" Teal
+au BufRead,BufNewFile *.tl			setf teal
+
 " TealInfo
 au BufNewFile,BufRead *.tli			setf tli
 
@@ -1868,6 +1929,9 @@ au BufRead,BufNewFile *.ttl
 " Terminfo
 au BufNewFile,BufRead *.ti			setf terminfo
 
+" Terraform
+au BufRead,BufNewFile *.tfvars			setf terraform
+
 " TeX
 au BufNewFile,BufRead *.latex,*.sty,*.dtx,*.ltx,*.bbl	setf tex
 au BufNewFile,BufRead *.tex			call polyglot#ft#FTtex()
@@ -1885,7 +1949,13 @@ au BufNewFile,BufRead texmf.cnf			setf texmf
 au BufNewFile,BufRead .tidyrc,tidyrc,tidy.conf	setf tidy
 
 " TF mud client
-au BufNewFile,BufRead *.tf,.tfrc,tfrc		setf tf
+au BufNewFile,BufRead .tfrc,tfrc		setf tf
+
+" TF mud client or terraform
+au BufNewFile,BufRead *.tf			call polyglot#ft#FTtf()
+
+" TLA+
+au BufNewFile,BufRead *.tla			setf tla
 
 " tmux configuration
 au BufNewFile,BufRead {.,}tmux*.conf		setf tmux
@@ -1894,7 +1964,7 @@ au BufNewFile,BufRead {.,}tmux*.conf		setf tmux
 au BufNewFile,BufRead *.toml			setf toml
 
 " TPP - Text Presentation Program
-au BufNewFile,BufReadPost *.tpp			setf tpp
+au BufNewFile,BufRead *.tpp			setf tpp
 
 " Treetop
 au BufRead,BufNewFile *.treetop			setf treetop
@@ -1951,6 +2021,9 @@ au BufNewFile,BufRead */.init/*.conf,*/.init/*.override	       setf upstart
 au BufNewFile,BufRead */.config/upstart/*.conf		       setf upstart
 au BufNewFile,BufRead */.config/upstart/*.override	       setf upstart
 
+" Vala
+au BufNewFile,BufRead *.vala			setf vala
+
 " Vera
 au BufNewFile,BufRead *.vr,*.vri,*.vrh		setf vera
 
@@ -1981,7 +2054,7 @@ au BufRead,BufNewFile *.hw,*.module,*.pkg
 	\ endif
 
 " Visual Basic (also uses *.bas) or FORM
-au BufNewFile,BufRead *.frm			call polyglot#ft#FTVB("form")
+au BufNewFile,BufRead *.frm			call polyglot#ft#FTfrm()
 
 " SaxBasic is close to Visual Basic
 au BufNewFile,BufRead *.sba			setf vb
@@ -2145,6 +2218,9 @@ au BufNewFile,BufRead *.raml			setf raml
 " yum conf (close enough to dosini)
 au BufNewFile,BufRead */etc/yum.conf		setf dosini
 
+" YANG
+au BufRead,BufNewFile *.yang			setf yang
+
 " Zimbu
 au BufNewFile,BufRead *.zu			setf zimbu
 " Zimbu Templates
@@ -2284,6 +2360,9 @@ au BufNewFile,BufRead Kconfig.*			call s:StarSetf('kconfig')
 " Lilo: Linux loader
 au BufNewFile,BufRead lilo.conf*		call s:StarSetf('lilo')
 
+" Libsensors
+au BufNewFile,BufRead */etc/sensors.d/[^.]*	call s:StarSetf('sensors')
+
 " Logcheck
 au BufNewFile,BufRead */etc/logcheck/*.d*/*	call s:StarSetf('logcheck')
 
diff --git a/extras/menu.vim b/extras/menu.vim
index 5f4e395e1..12924af6f 100644
--- a/extras/menu.vim
+++ b/extras/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2021 Dec 22
+" Last Change:	2022 Feb 04
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -33,7 +33,7 @@ if exists("v:lang") || &langmenu != ""
   if strlen(s:lang) > 1 && s:lang !~? '^en_us'
     " When the language does not include the charset add 'encoding'
     if s:lang =~ '^\a\a$\|^\a\a_\a\a$'
-      let s:lang = s:lang . '.' . &enc
+      let s:lang = s:lang .. '.' .. &enc
     endif
 
     " We always use a lowercase name.
@@ -49,26 +49,26 @@ if exists("v:lang") || &langmenu != ""
     " same menu file for them.
     let s:lang = substitute(s:lang, 'iso_8859-15\=$', "latin1", "")
     menutrans clear
-    exe "runtime! lang/menu_" . s:lang . ".vim"
+    exe "runtime! lang/menu_" .. s:lang .. ".vim"
 
     if !exists("did_menu_trans")
       " There is no exact match, try matching with a wildcard added
       " (e.g. find menu_de_de.iso_8859-1.vim if s:lang == de_DE).
       let s:lang = substitute(s:lang, '\.[^.]*', "", "")
-      exe "runtime! lang/menu_" . s:lang . "[^a-z]*vim"
+      exe "runtime! lang/menu_" .. s:lang .. "[^a-z]*vim"
 
       if !exists("did_menu_trans") && s:lang =~ '_'
 	" If the language includes a region try matching without that region.
 	" (e.g. find menu_de.vim if s:lang == de_DE).
 	let langonly = substitute(s:lang, '_.*', "", "")
-	exe "runtime! lang/menu_" . langonly . "[^a-z]*vim"
+	exe "runtime! lang/menu_" .. langonly .. "[^a-z]*vim"
       endif
 
       if !exists("did_menu_trans") && strlen($LANG) > 1 && s:lang !~ '^en_us'
 	" On windows locale names are complicated, try using $LANG, it might
 	" have been set by set_init_1().  But don't do this for "en" or "en_us".
 	" But don't match "slovak" when $LANG is "sl".
-	exe "runtime! lang/menu_" . tolower($LANG) . "[^a-z]*vim"
+	exe "runtime! lang/menu_" .. tolower($LANG) .. "[^a-z]*vim"
       endif
     endif
   endif
@@ -104,19 +104,19 @@ if exists(':tlmenu')
   tlnoremenu 9999.90 &Help.&About			<C-W>:intro<CR>
 endif
 
-fun! s:Helpfind()
+def s:Helpfind()
   if !exists("g:menutrans_help_dialog")
-    let g:menutrans_help_dialog = "Enter a command or word to find help on:\n\nPrepend i_ for Input mode commands (e.g.: i_CTRL-X)\nPrepend c_ for command-line editing commands (e.g.: c_<Del>)\nPrepend ' for an option name (e.g.: 'shiftwidth')"
+    g:menutrans_help_dialog = "Enter a command or word to find help on:\n\nPrepend i_ for Input mode commands (e.g.: i_CTRL-X)\nPrepend c_ for command-line editing commands (e.g.: c_<Del>)\nPrepend ' for an option name (e.g.: 'shiftwidth')"
   endif
-  let h = inputdialog(g:menutrans_help_dialog)
+  var h = inputdialog(g:menutrans_help_dialog)
   if h != ""
-    let v:errmsg = ""
-    silent! exe "help " . h
+    v:errmsg = ""
+    silent! exe "help " .. h
     if v:errmsg != ""
       echo v:errmsg
     endif
   endif
-endfun
+enddef
 
 " File menu
 an 10.310 &File.&Open\.\.\.<Tab>:e		:browse confirm e<CR>
@@ -154,16 +154,9 @@ an 10.600 &File.-SEP4-				<Nop>
 an 10.610 &File.Sa&ve-Exit<Tab>:wqa		:confirm wqa<CR>
 an 10.620 &File.E&xit<Tab>:qa			:confirm qa<CR>
 
-func s:SelectAll()
-  exe "norm! gg" . (&slm == "" ? "VG" : "gH\<C-O>G")
-endfunc
-
-func s:FnameEscape(fname)
-  if exists('*fnameescape')
-    return fnameescape(a:fname)
-  endif
-  return escape(a:fname, " \t\n*?[{`$\\%#'\"|!<")
-endfunc
+def s:SelectAll()
+  exe "norm! gg" .. (&slm == "" ? "VG" : "gH\<C-O>G")
+enddef
 
 " Edit menu
 an 20.310 &Edit.&Undo<Tab>u			u
@@ -182,8 +175,8 @@ cnoremenu	 &Edit.&Paste<Tab>"+gP		<C-R>+
 if exists(':tlmenu')
   tlnoremenu	 &Edit.&Paste<Tab>"+gP		<C-W>"+
 endif
-exe 'vnoremenu <script> &Edit.&Paste<Tab>"+gP	' . paste#paste_cmd['v']
-exe 'inoremenu <script> &Edit.&Paste<Tab>"+gP	' . paste#paste_cmd['i']
+exe 'vnoremenu <script> &Edit.&Paste<Tab>"+gP	' .. paste#paste_cmd['v']
+exe 'inoremenu <script> &Edit.&Paste<Tab>"+gP	' .. paste#paste_cmd['i']
 nnoremenu 20.370 &Edit.Put\ &Before<Tab>[p	[p
 inoremenu	 &Edit.Put\ &Before<Tab>[p	<C-O>[p
 nnoremenu 20.380 &Edit.Put\ &After<Tab>]p	]p
@@ -214,32 +207,33 @@ an 20.425	 &Edit.-SEP3-				<Nop>
 an 20.430	 &Edit.Settings\ &Window		:options<CR>
 an 20.435	 &Edit.Startup\ &Settings		:call <SID>EditVimrc()<CR>
 
-fun! s:EditVimrc()
+def s:EditVimrc()
+  var fname: string
   if $MYVIMRC != ''
-    let fname = $MYVIMRC
+    fname = $MYVIMRC
   elseif has("win32")
     if $HOME != ''
-      let fname = $HOME . "/_vimrc"
+      fname = $HOME .. "/_vimrc"
     else
-      let fname = $VIM . "/_vimrc"
+      fname = $VIM .. "/_vimrc"
     endif
   elseif has("amiga")
-    let fname = "s:.vimrc"
+    fname = "s:.vimrc"
   else
-    let fname = $HOME . "/.vimrc"
+    fname = $HOME .. "/.vimrc"
   endif
-  let fname = s:FnameEscape(fname)
+  fname = fnameescape(fname)
   if &mod
-    exe "split " . fname
+    exe "split " .. fname
   else
-    exe "edit " . fname
+    exe "edit " .. fname
   endif
-endfun
+enddef
 
-fun! s:FixFText()
-  " Fix text in nameless register to be used with :promptfind.
+def s:FixFText(): string
+  # Fix text in nameless register to be used with :promptfind.
   return substitute(@", "[\r\n]", '\\n', 'g')
-endfun
+enddef
 
 " Edit/Global Settings
 an 20.440.100 &Edit.&Global\ Settings.Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	:set hls! hls?<CR>
@@ -272,34 +266,34 @@ an <silent> 20.440.320 &Edit.&Global\ Settings.Toggle\ &Bottom\ Scrollbar :call
 an <silent> 20.440.330 &Edit.&Global\ Settings.Toggle\ &Left\ Scrollbar	:call <SID>ToggleGuiOption("l")<CR>
 an <silent> 20.440.340 &Edit.&Global\ Settings.Toggle\ &Right\ Scrollbar :call <SID>ToggleGuiOption("r")<CR>
 
-fun! s:SearchP()
+def s:SearchP()
   if !exists("g:menutrans_path_dialog")
-    let g:menutrans_path_dialog = "Enter search path for files.\nSeparate directory names with a comma."
+    g:menutrans_path_dialog = "Enter search path for files.\nSeparate directory names with a comma."
   endif
-  let n = inputdialog(g:menutrans_path_dialog, substitute(&path, '\\ ', ' ', 'g'))
+  var n = inputdialog(g:menutrans_path_dialog, substitute(&path, '\\ ', ' ', 'g'))
   if n != ""
-    let &path = substitute(n, ' ', '\\ ', 'g')
+    &path = substitute(n, ' ', '\\ ', 'g')
   endif
-endfun
+enddef
 
-fun! s:TagFiles()
+def s:TagFiles()
   if !exists("g:menutrans_tags_dialog")
-    let g:menutrans_tags_dialog = "Enter names of tag files.\nSeparate the names with a comma."
+    g:menutrans_tags_dialog = "Enter names of tag files.\nSeparate the names with a comma."
   endif
-  let n = inputdialog(g:menutrans_tags_dialog, substitute(&tags, '\\ ', ' ', 'g'))
+  var n = inputdialog(g:menutrans_tags_dialog, substitute(&tags, '\\ ', ' ', 'g'))
   if n != ""
-    let &tags = substitute(n, ' ', '\\ ', 'g')
+    &tags = substitute(n, ' ', '\\ ', 'g')
   endif
-endfun
+enddef
 
-fun! s:ToggleGuiOption(option)
-    " If a:option is already set in guioptions, then we want to remove it
-    if match(&guioptions, "\\C" . a:option) > -1
-	exec "set go-=" . a:option
-    else
-	exec "set go+=" . a:option
-    endif
-endfun
+def s:ToggleGuiOption(option: string)
+  # If a:option is already set in guioptions, then we want to remove it
+  if match(&guioptions, "\\C" .. option) > -1
+    exec "set go-=" .. option
+  else
+    exec "set go+=" .. option
+  endif
+enddef
 
 " Edit/File Settings
 
@@ -331,34 +325,36 @@ an 20.440.620.80 &Edit.F&ile\ Settings.Soft\ &Tabstop.8	:set sts=8 sts?<CR>
 
 an <silent> 20.440.630 &Edit.F&ile\ Settings.Te&xt\ Width\.\.\.  :call <SID>TextWidth()<CR>
 an <silent> 20.440.640 &Edit.F&ile\ Settings.&File\ Format\.\.\.  :call <SID>FileFormat()<CR>
-fun! s:TextWidth()
+
+def s:TextWidth()
   if !exists("g:menutrans_textwidth_dialog")
-    let g:menutrans_textwidth_dialog = "Enter new text width (0 to disable formatting): "
+    g:menutrans_textwidth_dialog = "Enter new text width (0 to disable formatting): "
   endif
-  let n = inputdialog(g:menutrans_textwidth_dialog, &tw)
+  var n = inputdialog(g:menutrans_textwidth_dialog, &tw .. '')
   if n != ""
-    " Remove leading zeros to avoid it being used as an octal number.
-    " But keep a zero by itself.
-    let tw = substitute(n, "^0*", "", "")
-    let &tw = tw == '' ? 0 : tw
+    # Remove leading zeros to avoid it being used as an octal number.
+    # But keep a zero by itself.
+    var tw = substitute(n, "^0*", "", "")
+    &tw = tw == '' ? 0 : tw
   endif
-endfun
+enddef
 
-fun! s:FileFormat()
+def s:FileFormat()
   if !exists("g:menutrans_fileformat_dialog")
-    let g:menutrans_fileformat_dialog = "Select format for writing the file"
+    g:menutrans_fileformat_dialog = "Select format for writing the file"
   endif
   if !exists("g:menutrans_fileformat_choices")
-    let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Cancel"
+    g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Cancel"
   endif
+  var def_choice: number
   if &ff == "dos"
-    let def = 2
+    def_choice = 2
   elseif &ff == "mac"
-    let def = 3
+    def_choice = 3
   else
-    let def = 1
+    def_choice = 1
   endif
-  let n = confirm(g:menutrans_fileformat_dialog, g:menutrans_fileformat_choices, def, "Question")
+  var n = confirm(g:menutrans_fileformat_dialog, g:menutrans_fileformat_choices, def_choice, "Question")
   if n == 1
     set ff=unix
   elseif n == 2
@@ -366,32 +362,33 @@ fun! s:FileFormat()
   elseif n == 3
     set ff=mac
   endif
-endfun
+enddef
 
 let s:did_setup_color_schemes = 0
 
 " Setup the Edit.Color Scheme submenu
-func s:SetupColorSchemes() abort
+def s:SetupColorSchemes()
   if s:did_setup_color_schemes
     return
   endif
-  let s:did_setup_color_schemes = 1
+  s:did_setup_color_schemes = 1
 
-  let n = globpath(&runtimepath, "colors/*.vim", 1, 1)
-  let n += globpath(&packpath, "pack/*/start/*/colors/*.vim", 1, 1)
-  let n += globpath(&packpath, "pack/*/opt/*/colors/*.vim", 1, 1)
+  var n = globpath(&runtimepath, "colors/*.vim", 1, 1)
+  n += globpath(&packpath, "pack/*/start/*/colors/*.vim", 1, 1)
+  n += globpath(&packpath, "pack/*/opt/*/colors/*.vim", 1, 1)
 
-  " Ignore case for VMS and windows, sort on name
-  let names = sort(map(n, 'substitute(v:val, "\\c.*[/\\\\:\\]]\\([^/\\\\:]*\\)\\.vim", "\\1", "")'), 1)
+  # Ignore case for VMS and windows, sort on name
+  var names = sort(map(n, 'substitute(v:val, "\\c.*[/\\\\:\\]]\\([^/\\\\:]*\\)\\.vim", "\\1", "")'), 1)
 
-  " define all the submenu entries
-  let idx = 100
+  # define all the submenu entries
+  var idx = 100
   for name in names
-    exe "an 20.450." . idx . ' &Edit.C&olor\ Scheme.' . name . " :colors " . name . "<CR>"
-    let idx = idx + 10
+    exe "an 20.450." .. idx .. ' &Edit.C&olor\ Scheme.' .. name .. " :colors " .. name .. "<CR>"
+    idx += 10
   endfor
   silent! aunmenu &Edit.Show\ C&olor\ Schemes\ in\ Menu
-endfun
+enddef
+
 if exists("do_no_lazyload_menus")
   call s:SetupColorSchemes()
 else
@@ -403,31 +400,33 @@ endif
 if has("keymap")
   let s:did_setup_keymaps = 0
 
-  func s:SetupKeymaps() abort
+  def s:SetupKeymaps()
     if s:did_setup_keymaps
       return
     endif
-    let s:did_setup_keymaps = 1
+    s:did_setup_keymaps = 1
 
-    let n = globpath(&runtimepath, "keymap/*.vim", 1, 1)
-    if !empty(n)
-      let idx = 100
+    var names = globpath(&runtimepath, "keymap/*.vim", 1, 1)
+    if !empty(names)
+      var idx = 100
       an 20.460.90 &Edit.&Keymap.None :set keymap=<CR>
-      for name in n
-	" Ignore case for VMS and windows
-	let name = substitute(name, '\c.*[/\\:\]]\([^/\\:_]*\)\(_[0-9a-zA-Z-]*\)\=\.vim', '\1', '')
-	exe "an 20.460." . idx . ' &Edit.&Keymap.' . name . " :set keymap=" . name . "<CR>"
-	let idx = idx + 10
+      for name in names
+	# Ignore case for VMS and windows
+	var mapname = substitute(name, '\c.*[/\\:\]]\([^/\\:_]*\)\(_[0-9a-zA-Z-]*\)\=\.vim', '\1', '')
+	exe "an 20.460." .. idx .. ' &Edit.&Keymap.' .. mapname .. " :set keymap=" .. mapname .. "<CR>"
+	idx += 10
       endfor
     endif
     silent! aunmenu &Edit.Show\ &Keymaps\ in\ Menu
-  endfun
+  enddef
+
   if exists("do_no_lazyload_menus")
     call s:SetupKeymaps()
   else
     an <silent> 20.460 &Edit.Show\ &Keymaps\ in\ Menu :call <SID>SetupKeymaps()<CR>
   endif
 endif
+
 if has("win32") || has("gui_motif") || has("gui_gtk") || has("gui_kde") || has("gui_photon") || has("gui_mac")
   an 20.470 &Edit.Select\ Fo&nt\.\.\.	:set guifont=*<CR>
 endif
@@ -445,7 +444,7 @@ an 40.300 &Tools.&Jump\ to\ This\ Tag<Tab>g^]	g<C-]>
 vunmenu &Tools.&Jump\ to\ This\ Tag<Tab>g^]
 vnoremenu &Tools.&Jump\ to\ This\ Tag<Tab>g^]	g<C-]>
 an 40.310 &Tools.Jump\ &Back<Tab>^T		<C-T>
-an 40.320 &Tools.Build\ &Tags\ File		:exe "!" . g:ctags_command<CR>
+an 40.320 &Tools.Build\ &Tags\ File		:exe "!" .. g:ctags_command<CR>
 
 if has("folding") || has("spell")
   an 40.330 &Tools.-SEP1-						<Nop>
@@ -469,50 +468,47 @@ if has("spell")
   an <silent> 40.335.270 &Tools.&Spelling.&Find\ More\ Languages	:call <SID>SpellLang()<CR>
 
   let s:undo_spelllang = ['aun &Tools.&Spelling.&Find\ More\ Languages']
-  func s:SpellLang()
+  def s:SpellLang()
     for cmd in s:undo_spelllang
-      exe "silent! " . cmd
+      exe "silent! " .. cmd
     endfor
-    let s:undo_spelllang = []
+    s:undo_spelllang = []
 
-    if &enc == "iso-8859-15"
-      let enc = "latin1"
-    else
-      let enc = &enc
-    endif
+    var enc = &enc == "iso-8859-15" ? "latin1" : &enc
 
     if !exists("g:menutrans_set_lang_to")
-      let g:menutrans_set_lang_to = 'Set Language to'
+      g:menutrans_set_lang_to = 'Set Language to'
     endif
 
-    let found = 0
-    let s = globpath(&runtimepath, "spell/*." . enc . ".spl", 1, 1)
-    if !empty(s)
-      let n = 300
-      for f in s
-	let nm = substitute(f, '.*spell[/\\]\(..\)\.[^/\\]*\.spl', '\1', "")
+    var found = 0
+    var _nm = ''
+    var names = globpath(&runtimepath, "spell/*." .. enc .. ".spl", 1, 1)
+    if !empty(names)
+      var n = 300
+      for f in names
+	var nm = substitute(f, '.*spell[/\\]\(..\)\.[^/\\]*\.spl', '\1', "")
 	if nm != "en" && nm !~ '/'
-          let _nm = nm
-	  let found += 1
-	  let menuname = '&Tools.&Spelling.' . escape(g:menutrans_set_lang_to, "\\. \t|") . '\ "' . nm . '"'
-	  exe 'an 40.335.' . n . ' ' . menuname . ' :set spl=' . nm . ' spell<CR>'
-	  let s:undo_spelllang += ['aun ' . menuname]
+          _nm = nm
+	  found += 1
+	  var menuname = '&Tools.&Spelling.' .. escape(g:menutrans_set_lang_to, "\\. \t|") .. '\ "' .. nm .. '"'
+	  exe 'an 40.335.' .. n .. ' ' .. menuname .. ' :set spl=' .. nm .. ' spell<CR>'
+	  s:undo_spelllang += ['aun ' .. menuname]
 	endif
-	let n += 10
+	n += 10
       endfor
     endif
     if found == 0
       echomsg "Could not find other spell files"
     elseif found == 1
-      echomsg "Found spell file " . _nm
+      echomsg "Found spell file " .. _nm
     else
-      echomsg "Found " . found . " more spell files"
+      echomsg "Found " .. found .. " more spell files"
     endif
-    " Need to redo this when 'encoding' is changed.
+    # Need to redo this when 'encoding' is changed.
     augroup spellmenu
     au! EncodingChanged * call <SID>SpellLang()
     augroup END
-  endfun
+  enddef
 
 endif
 
@@ -581,66 +577,67 @@ an <silent> 40.540 &Tools.Conve&rt\ Back<Tab>:%!xxd\ -r
 
 " Use a function to do the conversion, so that it also works with 'insertmode'
 " set.
-func s:XxdConv()
-  let mod = &mod
+def s:XxdConv()
+  var mod = &mod
   if has("vms")
-    %!mc vim:xxd
+    :%!mc vim:xxd
   else
-    call s:XxdFind()
-    exe '%!' . g:xxdprogram
+    s:XxdFind()
+    exe '%!' .. g:xxdprogram
   endif
-  if getline(1) =~ "^0000000:"		" only if it worked
+  if getline(1) =~ "^0000000:"		# only if it worked
     set ft=xxd
   endif
-  let &mod = mod
-endfun
+  &mod = mod
+enddef
 
-func s:XxdBack()
-  let mod = &mod
+def s:XxdBack()
+  var mod = &mod
   if has("vms")
-    %!mc vim:xxd -r
+    :%!mc vim:xxd -r
   else
-    call s:XxdFind()
-    exe '%!' . g:xxdprogram . ' -r'
+    s:XxdFind()
+    exe '%!' .. g:xxdprogram .. ' -r'
   endif
   set ft=
   doautocmd filetypedetect BufReadPost
-  let &mod = mod
-endfun
+  &mod = mod
+enddef
 
-func s:XxdFind()
+def s:XxdFind()
   if !exists("g:xxdprogram")
-    " On the PC xxd may not be in the path but in the install directory
+    # On the PC xxd may not be in the path but in the install directory
     if has("win32") && !executable("xxd")
-      let g:xxdprogram = $VIMRUNTIME . (&shellslash ? '/' : '\') . "xxd.exe"
+      g:xxdprogram = $VIMRUNTIME .. (&shellslash ? '/' : '\') .. "xxd.exe"
       if g:xxdprogram =~ ' '
-	let g:xxdprogram = '"' .. g:xxdprogram .. '"'
+	g:xxdprogram = '"' .. g:xxdprogram .. '"'
       endif
     else
-      let g:xxdprogram = "xxd"
+      g:xxdprogram = "xxd"
     endif
   endif
-endfun
+enddef
 
 let s:did_setup_compilers = 0
 
 " Setup the Tools.Compiler submenu
-func s:SetupCompilers() abort
+def s:SetupCompilers()
   if s:did_setup_compilers
     return
   endif
-  let s:did_setup_compilers = 1
-
-  let n = globpath(&runtimepath, "compiler/*.vim", 1, 1)
-  let idx = 100
-  for name in n
-    " Ignore case for VMS and windows
-    let name = substitute(name, '\c.*[/\\:\]]\([^/\\:]*\)\.vim', '\1', '')
-    exe "an 30.440." . idx . ' &Tools.Se&t\ Compiler.' . name . " :compiler " . name . "<CR>"
-    let idx = idx + 10
+  s:did_setup_compilers = 1
+
+  var names = globpath(&runtimepath, "compiler/*.vim", 1, 1)
+  var idx = 100
+  for name in names
+    # Ignore case for VMS and windows
+    var cname = substitute(name, '\c.*[/\\:\]]\([^/\\:]*\)\.vim', '\1', '')
+    exe "an 30.440." .. idx .. ' &Tools.Se&t\ Compiler.' .. cname .. " :compiler " .. cname .. "<CR>"
+    idx += 10
   endfor
   silent! aunmenu &Tools.Show\ Compiler\ Se&ttings\ in\ Menu
-endfun
+enddef
+
 if exists("do_no_lazyload_menus")
   call s:SetupCompilers()
 else
@@ -649,13 +646,13 @@ endif
 
 " Load ColorScheme, Compiler Setting and Keymap menus when idle.
 if !exists("do_no_lazyload_menus")
-  func s:SetupLazyloadMenus()
-    call s:SetupColorSchemes()
-    call s:SetupCompilers()
+  def s:SetupLazyloadMenus()
+    s:SetupColorSchemes()
+    s:SetupCompilers()
     if has("keymap")
-      call s:SetupKeymaps()
+      s:SetupKeymaps()
     endif
-  endfunc
+  enddef
   augroup SetupLazyloadMenus
     au!
     au CursorHold,CursorHoldI * call <SID>SetupLazyloadMenus() | au! SetupLazyloadMenus
@@ -680,135 +677,133 @@ if !exists("bmenu_priority")
 endif
 
 " invoked from a BufCreate or BufFilePost autocommand
-func s:BMAdd()
+def s:BMAdd()
   if s:bmenu_wait == 0
-    " when adding too many buffers, redraw in short format
+    # when adding too many buffers, redraw in short format
     if s:bmenu_count == &menuitems && s:bmenu_short == 0
-      call s:BMShow()
+      s:BMShow()
     else
-      let name = expand("<afile>")
-      let num = expand("<abuf>") + 0 " add zero to convert to a number type
+      var name = expand("<afile>")
+      var num = str2nr(expand("<abuf>"))
       if s:BMCanAdd(name, num)
-	call <SID>BMFilename(name, num)
-	let s:bmenu_count += 1
+	s:BMFilename(name, num)
+	s:bmenu_count += 1
       endif
     endif
   endif
-endfunc
+enddef
 
 " invoked from a BufDelete or BufFilePre autocommand
-func s:BMRemove()
+def s:BMRemove()
   if s:bmenu_wait == 0
-    let bufnum = expand("<abuf>")
+    var bufnum = expand("<abuf>")
     if s:bmenu_items->has_key(bufnum)
-      let menu_name = s:bmenu_items[bufnum]
-      exe 'silent! aun &Buffers.' . menu_name
-      let s:bmenu_count = s:bmenu_count - 1
+      var menu_name = s:bmenu_items[bufnum]
+      exe 'silent! aun &Buffers.' .. menu_name
+      s:bmenu_count = s:bmenu_count - 1
       unlet s:bmenu_items[bufnum]
     endif
   endif
-endfunc
+enddef
 
 " Return non-zero if buffer with number "name" / "num" is useful to add in the
 " buffer menu.
-func s:BMCanAdd(name, num)
-  " no directory or unlisted buffer
-  if isdirectory(a:name) || !buflisted(a:num)
-    return 0
+def s:BMCanAdd(name: string, num: number): bool
+  # no directory or unlisted buffer
+  if isdirectory(name) || !buflisted(num)
+    return false
   endif
 
-  " no name with control characters
-  if a:name =~ '[\x01-\x1f]'
-    return 0
+  # no name with control characters
+  if name =~ '[\x01-\x1f]'
+    return false
   endif
 
-  " no special buffer, such as terminal or popup
-  let buftype = getbufvar(a:num, '&buftype')
+  # no special buffer, such as terminal or popup
+  var buftype = getbufvar(num, '&buftype')
   if buftype != '' && buftype != 'nofile' && buftype != 'nowrite'
-    return 0
+    return false
   endif
 
-  " only existing buffers
-  return bufexists(a:num)
-endfunc
+  # only existing buffers
+  return bufexists(num)
+enddef
 
 " Create the buffer menu (delete an existing one first).
-func s:BMShow(...)
-  let s:bmenu_wait = 1
-  let s:bmenu_short = 1
-  let s:bmenu_count = 0
-  let s:bmenu_items = {}
-  "
-  " get new priority, if exists
-  if a:0 == 1
-    let g:bmenu_priority = a:1
-  endif
-
-  " Remove old menu, if it exists; keep one entry to avoid a torn off menu to
-  " disappear.  Use try/catch to avoid setting v:errmsg
-  try | unmenu &Buffers | catch | endtry
-  exe 'noremenu ' . g:bmenu_priority . ".1 &Buffers.Dummy l"
-  try | unmenu! &Buffers | catch | endtry
-
-  " create new menu; set 'cpo' to include the <CR>
-  let cpo_save = &cpo
-  set cpo&vim
-  exe 'an <silent> ' . g:bmenu_priority . ".2 &Buffers.&Refresh\\ menu :call <SID>BMShow()<CR>"
-  exe 'an ' . g:bmenu_priority . ".4 &Buffers.&Delete :confirm bd<CR>"
-  exe 'an ' . g:bmenu_priority . ".6 &Buffers.&Alternate :confirm b #<CR>"
-  exe 'an ' . g:bmenu_priority . ".7 &Buffers.&Next :confirm bnext<CR>"
-  exe 'an ' . g:bmenu_priority . ".8 &Buffers.&Previous :confirm bprev<CR>"
-  exe 'an ' . g:bmenu_priority . ".9 &Buffers.-SEP- :"
-  let &cpo = cpo_save
+def s:BMShow()
+  s:bmenu_wait = 1
+  s:bmenu_short = 1
+  s:bmenu_count = 0
+  s:bmenu_items = {}
+
+  # Remove old menu, if it exists; keep one entry to avoid a torn off menu to
+  # disappear.  Use try/catch to avoid setting v:errmsg
+  try 
+    unmenu &Buffers 
+  catch 
+  endtry
+  exe 'noremenu ' .. g:bmenu_priority .. ".1 &Buffers.Dummy l"
+  try 
+    unmenu! &Buffers 
+  catch 
+  endtry
+
+  # create new menu
+  exe 'an <silent> ' .. g:bmenu_priority .. ".2 &Buffers.&Refresh\\ menu :call <SID>BMShow()<CR>"
+  exe 'an ' .. g:bmenu_priority .. ".4 &Buffers.&Delete :confirm bd<CR>"
+  exe 'an ' .. g:bmenu_priority .. ".6 &Buffers.&Alternate :confirm b #<CR>"
+  exe 'an ' .. g:bmenu_priority .. ".7 &Buffers.&Next :confirm bnext<CR>"
+  exe 'an ' .. g:bmenu_priority .. ".8 &Buffers.&Previous :confirm bprev<CR>"
+  exe 'an ' .. g:bmenu_priority .. ".9 &Buffers.-SEP- :"
   unmenu &Buffers.Dummy
 
-  " figure out how many buffers there are
-  let buf = 1
+  # figure out how many buffers there are
+  var buf = 1
   while buf <= bufnr('$')
     if s:BMCanAdd(bufname(buf), buf)
-      let s:bmenu_count = s:bmenu_count + 1
+      s:bmenu_count = s:bmenu_count + 1
     endif
-    let buf = buf + 1
+    buf += 1
   endwhile
   if s:bmenu_count <= &menuitems
-    let s:bmenu_short = 0
+    s:bmenu_short = 0
   endif
 
-  " iterate through buffer list, adding each buffer to the menu:
-  let buf = 1
+  # iterate through buffer list, adding each buffer to the menu:
+  buf = 1
   while buf <= bufnr('$')
-    let name = bufname(buf)
+    var name = bufname(buf)
     if s:BMCanAdd(name, buf)
-      call <SID>BMFilename(name, buf)
+      call s:BMFilename(name, buf)
     endif
-    let buf = buf + 1
+    buf += 1
   endwhile
-  let s:bmenu_wait = 0
+  s:bmenu_wait = 0
   aug buffer_list
-  au!
-  au BufCreate,BufFilePost * call <SID>BMAdd()
-  au BufDelete,BufFilePre * call <SID>BMRemove()
+    au!
+    au BufCreate,BufFilePost * call s:BMAdd()
+    au BufDelete,BufFilePre * call s:BMRemove()
   aug END
-endfunc
+enddef
 
-func s:BMHash(name)
-  " Make name all upper case, so that chars are between 32 and 96
-  let nm = substitute(a:name, ".*", '\U\0', "")
+def s:BMHash(name: string): number
+  # Make name all upper case, so that chars are between 32 and 96
+  var nm = substitute(name, ".*", '\U\0', "")
+  var sp: number
   if has("ebcdic")
-    " HACK: Replace all non alphabetics with 'Z'
-    "       Just to make it work for now.
-    let nm = substitute(nm, "[^A-Z]", 'Z', "g")
-    let sp = char2nr('A') - 1
+    # HACK: Replace all non alphabetics with 'Z'
+    #       Just to make it work for now.
+    nm = substitute(nm, "[^A-Z]", 'Z', "g")
+    sp = char2nr('A') - 1
   else
-    let sp = char2nr(' ')
+    sp = char2nr(' ')
   endif
-  " convert first six chars into a number for sorting:
+  # convert first six chars into a number for sorting:
   return (char2nr(nm[0]) - sp) * 0x800000 + (char2nr(nm[1]) - sp) * 0x20000 + (char2nr(nm[2]) - sp) * 0x1000 + (char2nr(nm[3]) - sp) * 0x80 + (char2nr(nm[4]) - sp) * 0x20 + (char2nr(nm[5]) - sp)
-endfunc
+enddef
 
-func s:BMHash2(name)
-  let nm = substitute(a:name, ".", '\L\0', "")
-  " Not exactly right for EBCDIC...
+def s:BMHash2(name: string): string
+  var nm = substitute(name, ".", '\L\0', "")
   if nm[0] < 'a' || nm[0] > 'z'
     return '&others.'
   elseif nm[0] <= 'd'
@@ -824,72 +819,70 @@ func s:BMHash2(name)
   else
     return '&u-z.'
   endif
-endfunc
+enddef
 
 " Insert a buffer name into the buffer menu.
-func s:BMFilename(name, num)
-  let munge = <SID>BMMunge(a:name, a:num)
-  let hash = <SID>BMHash(munge)
+def s:BMFilename(name: string, num: number)
+  var munge = s:BMMunge(name, num)
+  var hash = s:BMHash(munge)
+  var cmd: string
   if s:bmenu_short == 0
-    let s:bmenu_items[a:num] = munge
-    let cmd = 'an ' . g:bmenu_priority . '.' . hash . ' &Buffers.' . munge
+    s:bmenu_items[num] = munge
+    cmd = 'an ' .. g:bmenu_priority .. '.' .. hash .. ' &Buffers.' .. munge
   else
-    let menu_name = <SID>BMHash2(munge) . munge
-    let s:bmenu_items[a:num] = menu_name
-    let cmd = 'an ' . g:bmenu_priority . '.' . hash . '.' . hash . ' &Buffers.' . menu_name
+    var menu_name = s:BMHash2(munge) .. munge
+    s:bmenu_items[num] = menu_name
+    cmd = 'an ' .. g:bmenu_priority .. '.' .. hash .. '.' .. hash .. ' &Buffers.' .. menu_name
   endif
-  " set 'cpo' to include the <CR>
-  let cpo_save = &cpo
-  set cpo&vim
-  exe cmd . ' :confirm b' . a:num . '<CR>'
-  let &cpo = cpo_save
-endfunc
+  exe cmd .. ' :confirm b' .. num .. '<CR>'
+enddef
 
 " Truncate a long path to fit it in a menu item.
 if !exists("g:bmenu_max_pathlen")
   let g:bmenu_max_pathlen = 35
 endif
-func s:BMTruncName(fname)
-  let name = a:fname
+
+def s:BMTruncName(fname: string): string
+  var name = fname
   if g:bmenu_max_pathlen < 5
-    let name = ""
+    name = ""
   else
-    let len = strlen(name)
+    var len = strlen(name)
     if len > g:bmenu_max_pathlen
-      let amountl = (g:bmenu_max_pathlen / 2) - 2
-      let amountr = g:bmenu_max_pathlen - amountl - 3
-      let pattern = '^\(.\{,' . amountl . '}\).\{-}\(.\{,' . amountr . '}\)$'
-      let left = substitute(name, pattern, '\1', '')
-      let right = substitute(name, pattern, '\2', '')
+      var amountl = (g:bmenu_max_pathlen / 2) - 2
+      var amountr = g:bmenu_max_pathlen - amountl - 3
+      var pattern = '^\(.\{,' .. amountl .. '}\).\{-}\(.\{,' .. amountr .. '}\)$'
+      var left = substitute(name, pattern, '\1', '')
+      var right = substitute(name, pattern, '\2', '')
       if strlen(left) + strlen(right) < len
-	let name = left . '...' . right
+	name = left .. '...' .. right
       endif
     endif
   endif
   return name
-endfunc
+enddef
 
-func s:BMMunge(fname, bnum)
-  let name = a:fname
+def s:BMMunge(fname: string, bnum: number): string
+  var name = fname
   if name == ''
     if !exists("g:menutrans_no_file")
-      let g:menutrans_no_file = "[No Name]"
+      g:menutrans_no_file = "[No Name]"
     endif
-    let name = g:menutrans_no_file
+    name = g:menutrans_no_file
   else
-    let name = fnamemodify(name, ':p:~')
+    name = fnamemodify(name, ':p:~')
   endif
-  " detach file name and separate it out:
-  let name2 = fnamemodify(name, ':t')
-  if a:bnum >= 0
-    let name2 = name2 . ' (' . a:bnum . ')'
+  # detach file name and separate it out:
+  var name2 = fnamemodify(name, ':t')
+  if bnum >= 0
+    name2 = name2 .. ' (' .. bnum .. ')'
   endif
-  let name = name2 . "\t" . <SID>BMTruncName(fnamemodify(name,':h'))
-  let name = escape(name, "\\. \t|")
-  let name = substitute(name, "&", "&&", "g")
-  let name = substitute(name, "\n", "^@", "g")
+  name = name2 .. "\t" .. s:BMTruncName(fnamemodify(name, ':h'))
+  name = escape(name, "\\. \t|")
+  name = substitute(name, "&", "&&", "g")
+  name = substitute(name, "\n", "^@", "g")
   return name
-endfunc
+enddef
 
 " When just starting Vim, load the buffer menu later
 if has("vim_starting")
@@ -910,13 +903,13 @@ an 70.320 &Window.Sp&lit\ To\ #<Tab>^W^^	<C-W><C-^>
 an 70.330 &Window.Split\ &Vertically<Tab>^Wv	<C-W>v
 an <silent> 70.332 &Window.Split\ File\ E&xplorer	:call MenuExplOpen()<CR>
 if !exists("*MenuExplOpen")
-  fun MenuExplOpen()
+  def MenuExplOpen()
     if @% == ""
-      20vsp .
+      :20vsp .
     else
-      exe "20vsp " . s:FnameEscape(expand("%:p:h"))
+      exe ":20vsp " .. fnameescape(expand("%:p:h"))
     endif
-  endfun
+  enddef
 endif
 an 70.335 &Window.-SEP1-				<Nop>
 an 70.340 &Window.&Close<Tab>^Wc			:confirm close<CR>
@@ -943,8 +936,8 @@ vnoremenu 1.30 PopUp.&Copy		"+y
 cnoremenu 1.30 PopUp.&Copy		<C-Y>
 nnoremenu 1.40 PopUp.&Paste		"+gP
 cnoremenu 1.40 PopUp.&Paste		<C-R>+
-exe 'vnoremenu <script> 1.40 PopUp.&Paste	' . paste#paste_cmd['v']
-exe 'inoremenu <script> 1.40 PopUp.&Paste	' . paste#paste_cmd['i']
+exe 'vnoremenu <script> 1.40 PopUp.&Paste	' .. paste#paste_cmd['v']
+exe 'inoremenu <script> 1.40 PopUp.&Paste	' .. paste#paste_cmd['i']
 vnoremenu 1.50 PopUp.&Delete		x
 an 1.55 PopUp.-SEP2-			<Nop>
 vnoremenu 1.60 PopUp.Select\ Blockwise	<C-V>
@@ -986,77 +979,75 @@ cnoremenu <script> <silent> 1.100 PopUp.Select\ &All	<C-U>call <SID>SelectAll()<
 if has("spell")
   " Spell suggestions in the popup menu.  Note that this will slow down the
   " appearance of the menu!
-  func s:SpellPopup()
+  def s:SpellPopup()
     if exists("s:changeitem") && s:changeitem != ''
-      call <SID>SpellDel()
+      call s:SpellDel()
     endif
 
-    " Return quickly if spell checking is not enabled.
+    # Return quickly if spell checking is not enabled.
     if !&spell || &spelllang == ''
       return
     endif
 
-    let curcol = col('.')
-    let [w, a] = spellbadword()
-    if col('.') > curcol		" don't use word after the cursor
-      let w = ''
+    var curcol = col('.')
+    var w: string
+    var a: string
+    [w, a] = spellbadword()
+    if col('.') > curcol		# don't use word after the cursor
+      w = ''
     endif
     if w != ''
       if a == 'caps'
-	let s:suglist = [substitute(w, '.*', '\u&', '')]
+	s:suglist = [substitute(w, '.*', '\u&', '')]
       else
-	let s:suglist = spellsuggest(w, 10)
+	s:suglist = spellsuggest(w, 10)
       endif
       if len(s:suglist) > 0
 	if !exists("g:menutrans_spell_change_ARG_to")
-	  let g:menutrans_spell_change_ARG_to = 'Change\ "%s"\ to'
+	  g:menutrans_spell_change_ARG_to = 'Change\ "%s"\ to'
 	endif
-	let s:changeitem = printf(g:menutrans_spell_change_ARG_to, escape(w, ' .'))
-	let s:fromword = w
-	let pri = 1
-	" set 'cpo' to include the <CR>
-	let cpo_save = &cpo
-	set cpo&vim
+	s:changeitem = printf(g:menutrans_spell_change_ARG_to, escape(w, ' .'))
+	s:fromword = w
+	var pri = 1
 	for sug in s:suglist
-	  exe 'anoremenu 1.5.' . pri . ' PopUp.' . s:changeitem . '.' . escape(sug, ' .')
-		\ . ' :call <SID>SpellReplace(' . pri . ')<CR>'
-	  let pri += 1
+	  exe 'anoremenu 1.5.' .. pri .. ' PopUp.' .. s:changeitem .. '.' .. escape(sug, ' .')
+		\ .. ' :call <SID>SpellReplace(' .. pri .. ')<CR>'
+	  pri += 1
 	endfor
 
 	if !exists("g:menutrans_spell_add_ARG_to_word_list")
-	  let g:menutrans_spell_add_ARG_to_word_list = 'Add\ "%s"\ to\ Word\ List'
+	  g:menutrans_spell_add_ARG_to_word_list = 'Add\ "%s"\ to\ Word\ List'
 	endif
-	let s:additem = printf(g:menutrans_spell_add_ARG_to_word_list, escape(w, ' .'))
-	exe 'anoremenu 1.6 PopUp.' . s:additem . ' :spellgood ' . w . '<CR>'
+	s:additem = printf(g:menutrans_spell_add_ARG_to_word_list, escape(w, ' .'))
+	exe 'anoremenu 1.6 PopUp.' .. s:additem .. ' :spellgood ' .. w .. '<CR>'
 
 	if !exists("g:menutrans_spell_ignore_ARG")
-	  let g:menutrans_spell_ignore_ARG = 'Ignore\ "%s"'
+	  g:menutrans_spell_ignore_ARG = 'Ignore\ "%s"'
 	endif
-	let s:ignoreitem = printf(g:menutrans_spell_ignore_ARG, escape(w, ' .'))
-	exe 'anoremenu 1.7 PopUp.' . s:ignoreitem . ' :spellgood! ' . w . '<CR>'
+	s:ignoreitem = printf(g:menutrans_spell_ignore_ARG, escape(w, ' .'))
+	exe 'anoremenu 1.7 PopUp.' .. s:ignoreitem .. ' :spellgood! ' .. w .. '<CR>'
 
 	anoremenu 1.8 PopUp.-SpellSep- :
-	let &cpo = cpo_save
       endif
     endif
-    call cursor(0, curcol)	" put the cursor back where it was
-  endfunc
+    call cursor(0, curcol)	# put the cursor back where it was
+  enddef
 
-  func s:SpellReplace(n)
-    let l = getline('.')
-    " Move the cursor to the start of the word.
+  def s:SpellReplace(n: number)
+    var l = getline('.')
+    # Move the cursor to the start of the word.
     call spellbadword()
-    call setline('.', strpart(l, 0, col('.') - 1) . s:suglist[a:n - 1]
-	  \ . strpart(l, col('.') + len(s:fromword) - 1))
-  endfunc
-
-  func s:SpellDel()
-    exe "aunmenu PopUp." . s:changeitem
-    exe "aunmenu PopUp." . s:additem
-    exe "aunmenu PopUp." . s:ignoreitem
+    call setline('.', strpart(l, 0, col('.') - 1) .. s:suglist[n - 1]
+	  \ .. strpart(l, col('.') + len(s:fromword) - 1))
+  enddef
+
+  def s:SpellDel()
+    exe "aunmenu PopUp." .. s:changeitem
+    exe "aunmenu PopUp." .. s:additem
+    exe "aunmenu PopUp." .. s:ignoreitem
     aunmenu PopUp.-SpellSep-
-    let s:changeitem = ''
-  endfun
+    s:changeitem = ''
+  enddef
 
   augroup SpellPopupMenu
     au! MenuPopup * call <SID>SpellPopup()
@@ -1089,8 +1080,8 @@ if has("toolbar")
   cnoremenu 1.80 ToolBar.Copy		<C-Y>
   nnoremenu 1.90 ToolBar.Paste		"+gP
   cnoremenu	 ToolBar.Paste		<C-R>+
-  exe 'vnoremenu <script>	 ToolBar.Paste	' . paste#paste_cmd['v']
-  exe 'inoremenu <script>	 ToolBar.Paste	' . paste#paste_cmd['i']
+  exe 'vnoremenu <script>	 ToolBar.Paste	' .. paste#paste_cmd['v']
+  exe 'inoremenu <script>	 ToolBar.Paste	' .. paste#paste_cmd['i']
 
   if !has("gui_athena")
     an 1.95   ToolBar.-sep3-		<Nop>
@@ -1108,7 +1099,7 @@ if has("toolbar")
 
   an 1.245 ToolBar.-sep6-		<Nop>
   an 1.250 ToolBar.Make			:make<CR>
-  an 1.270 ToolBar.RunCtags		:exe "!" . g:ctags_command<CR>
+  an 1.270 ToolBar.RunCtags		:exe "!" .. g:ctags_command<CR>
   an 1.280 ToolBar.TagJump		g<C-]>
 
   an 1.295 ToolBar.-sep7-		<Nop>
@@ -1145,22 +1136,23 @@ else
 endif
 
 " Select a session to load; default to current session name if present
-fun! s:LoadVimSesn()
+def s:LoadVimSesn()
+  var name: string
   if strlen(v:this_session) > 0
-    let name = s:FnameEscape(v:this_session)
+    name = fnameescape(v:this_session)
   else
-    let name = "Session.vim"
+    name = "Session.vim"
   endif
-  execute "browse so " . name
-endfun
+  execute "browse so " .. name
+enddef
 
 " Select a session to save; default to current session name if present
-fun! s:SaveVimSesn()
+def s:SaveVimSesn()
   if strlen(v:this_session) == 0
-    let v:this_session = "Session.vim"
+    v:this_session = "Session.vim"
   endif
-  execute "browse mksession! " . s:FnameEscape(v:this_session)
-endfun
+  execute "browse mksession! " .. fnameescape(v:this_session)
+enddef
 
 endif
 
@@ -1173,7 +1165,7 @@ if !exists("did_install_syntax_menu")
   an 50.214 &Syntax.A&utomatic		:syn on<CR>
   an <silent> 50.216 &Syntax.On/Off\ for\ &This\ File :call <SID>SynOnOff()<CR>
   if !exists("*s:SynOnOff")
-    fun s:SynOnOff()
+    def s:SynOnOff()
       if has("syntax_items")
 	syn clear
       else
@@ -1182,7 +1174,7 @@ if !exists("did_install_syntax_menu")
 	endif
 	set syn=ON
       endif
-    endfun
+    enddef
   endif
 endif
 
@@ -1209,6 +1201,9 @@ an 50.710 &Syntax.Co&lor\ Test		:sp $VIMRUNTIME/syntax/colortest.vim<Bar>so %<CR
 an 50.720 &Syntax.&Highlight\ Test	:runtime syntax/hitest.vim<CR>
 an 50.730 &Syntax.&Convert\ to\ HTML	:runtime syntax/2html.vim<CR>
 
+" Uncomment the next line to compile the functions early to find any mistakes
+" defcompile
+
 endif " !exists("did_install_syntax_menu")
 
 " Restore the previous value of 'cpoptions'.
diff --git a/ftplugin/basic.vim b/ftplugin/basic.vim
index 016253f67..1702fbd6b 100644
--- a/ftplugin/basic.vim
+++ b/ftplugin/basic.vim
@@ -3,9 +3,9 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'basic', 'ftplugin/basic.vim')
 endif
 
 " Vim filetype plugin file
-" Language:	BASIC
+" Language:	BASIC (QuickBASIC 4.5)
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2015 Jan 10
+" Last Change:	2021 Mar 16
 
 if exists("b:did_ftplugin")
   finish
@@ -15,17 +15,46 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-setlocal comments=:REM,:'
+setlocal comments=:REM\ ,:Rem\ ,:rem\ ,:'
 setlocal commentstring='\ %s
 setlocal formatoptions-=t formatoptions+=croql
 
+" TODO: support exit ... as middle matches?
+if exists("loaded_matchit") && !exists("b:match_words")
+  let s:line_start	= '\%(^\s*\)\@<='
+  let s:not_end		= '\%(end\s\+\)\@<!'
+  let s:not_end_or_exit	= '\%(\%(end\|exit\)\s\+\)\@<!'
+
+  let b:match_ignorecase = 1
+  let b:match_words =
+		\     s:not_end_or_exit .. '\<def\s\+fn:\<end\s\+def\>,' ..
+		\     s:not_end_or_exit .. '\<function\>:\<end\s\+function\>,' ..
+		\     s:not_end_or_exit .. '\<sub\>:\<end\s\+sub\>,' ..
+		\     s:not_end .. '\<type\>:\<end\s\+type\>,' ..
+		\     s:not_end .. '\<select\>:\%(select\s\+\)\@<!\<case\%(\s\+\%(else\|is\)\)\=\>:\<end\s\+select\>,' ..
+		\     '\<do\>:\<loop\>,' ..
+		\     '\<for\>\%(\s\+\%(input\|output\|random\|append\|binary\)\)\@!:\<next\>,' ..
+		\     '\<while\>:\<wend\>,' ..
+		\     s:line_start .. 'if\%(.*\<then\s*\%($\|''\)\)\@=:\<\%(' .. s:line_start .. 'else\|elseif\)\>:\<end\s\+if\>,' ..
+		\     '\<lock\>:\<unlock\>'
+
+  let b:match_skip = 'synIDattr(synID(line("."),col("."),1),"name") =~? "comment\\|string" || ' ..
+		\    'strpart(getline("."), 0, col(".") ) =~? "\\<exit\\s\\+"'
+
+  unlet s:line_start s:not_end s:not_end_or_exit
+endif
+
 if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
-  let b:browsefilter = "BASIC Source Files (*.bas)\t*.bas\n" .
-		     \ "All Files (*.*)\t*.*\n"
+  let b:browsefilter = "BASIC Source Files (*.bas)\t*.bas\n" ..
+		\      "BASIC Include Files (*.bi, *.bm)\t*.bi;*.bm\n" ..
+		\      "All Files (*.*)\t*.*\n"
 endif
 
-let b:undo_ftplugin = "setl fo< com< cms< sua<" .
-		    \ " | unlet! b:browsefilter"
+let b:undo_ftplugin = "setl fo< com< cms<" ..
+		\     " | unlet! b:match_ignorecase b:match_skip b:match_words" ..
+		\     " | unlet! b:browsefilter"
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/ftplugin/freebasic.vim b/ftplugin/freebasic.vim
index d2212481c..41aa2d30a 100644
--- a/ftplugin/freebasic.vim
+++ b/ftplugin/freebasic.vim
@@ -3,15 +3,67 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'freebasic', 'ftplugin/freebas
 endif
 
 " Vim filetype plugin file
-" Language:	FreeBasic
+" Language:	FreeBASIC
 " Maintainer:	Doug Kearns <dougkearns@gmail.com>
-" Last Change:	2015 Jan 10
+" Last Change:	2021 Mar 16
 
+" Setup {{{1
 if exists("b:did_ftplugin")
   finish
 endif
-let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
 
 runtime! ftplugin/basic.vim
 
-" vim: ts=8
+let s:dialect = freebasic#GetDialect()
+
+" Comments {{{1
+" add ''comments before 'comments
+let &l:comments = "sO:*\ -,mO:*\ \ ,exO:*/,s1:/',mb:',ex:'/,:''," .. &l:comments
+
+" Match words {{{1
+if exists("loaded_matchit")
+  let s:not_end = '\%(end\s\+\)\@<!'
+
+  let b:match_words .= ','
+
+  if s:dialect == 'fb'
+    let b:match_words .= s:not_end .. '\<constructor\>:\<end\s\+constructor\>,' ..
+		  \	  s:not_end .. '\<destructor\>:\<end\s\+destructor\>,' ..
+		  \	  s:not_end .. '\<property\>:\<end\s\+property\>,' ..
+		  \	  s:not_end .. '\<operator\>:\<end\s\+operator\>,' ..
+		  \	  s:not_end .. '\<extern\%(\s\+"\)\@=:\<end\s\+extern\>,'
+  endif
+
+  if s:dialect == 'fb' || s:dialect == 'deprecated'
+    let b:match_words .= s:not_end .. '\<scope\>:\<end\s\+scope\>,'
+  endif
+
+  if s:dialect == 'qb'
+    let b:match_words .= s:not_end .. '\<__asm\>:\<end\s\+__asm\>,' ..
+		  \	  s:not_end .. '\<__union\>:\<end\s\+__union\>,' ..
+		  \	  s:not_end .. '\<__with\>:\<end\s\+__with\>,'
+  else
+    let b:match_words .= s:not_end .. '\<asm\>:\<end\s\+asm\>,' ..
+		  \	  s:not_end .. '\<namespace\>:\<end\s\+namespace\>,' ..
+		  \	  s:not_end .. '\<union\>:\<end\s\+union\>,' ..
+		  \	  s:not_end .. '\<with\>:\<end\s\+with\>,'
+  endif
+
+  let b:match_words .= s:not_end .. '\<enum\>:\<end\s\+enum\>,' ..
+		  \	'^#\s*\%(if\|ifdef\|ifndef\)\>:^#\s*\%(else\|elseif\)\>:^#\s*endif\>,' ..
+		  \	'^#\s*macro\>:^#\s*endmacro\>'
+
+  " skip "function = <retval>"
+  let b:match_skip .= '|| strpart(getline("."), col(".") - 1) =~? "^\\<function\\s\\+="'
+
+  unlet s:not_end
+endif
+
+" Cleanup {{{1
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index cb5edc8d4..7ed65fe86 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -98,7 +98,7 @@ endfunction
 "
 function! s:MoveToCurHeader()
     let l:lineNum = s:GetHeaderLineNum()
-    if l:lineNum != 0
+    if l:lineNum !=# 0
         call cursor(l:lineNum, 1)
     else
         echo 'outside any header'
@@ -151,7 +151,7 @@ function! s:GetHeaderLevel(...)
         let l:line = a:1
     endif
     let l:linenum = s:GetHeaderLineNum(l:line)
-    if l:linenum != 0
+    if l:linenum !=# 0
         return s:GetLevelOfHeaderAtLine(l:linenum)
     else
         return 0
@@ -165,13 +165,13 @@ function! s:GetHeaderList()
     let l:fenced_block = 0
     let l:front_matter = 0
     let l:header_list = []
-    let l:vim_markdown_frontmatter = get(g:, "vim_markdown_frontmatter", 0)
+    let l:vim_markdown_frontmatter = get(g:, 'vim_markdown_frontmatter', 0)
     for i in range(1, line('$'))
         let l:lineraw = getline(i)
         let l:l1 = getline(i+1)
-        let l:line = substitute(l:lineraw, "#", "\\\#", "g")
+        let l:line = substitute(l:lineraw, '#', "\\\#", 'g')
         " exclude lines in fenced code blocks
-        if l:line =~ '````*' || l:line =~ '\~\~\~\~*'
+        if l:line =~# '````*' || l:line =~# '\~\~\~\~*'
             if l:fenced_block == 0
                 let l:fenced_block = 1
             elseif l:fenced_block == 1
@@ -180,24 +180,24 @@ function! s:GetHeaderList()
         " exclude lines in frontmatters
         elseif l:vim_markdown_frontmatter == 1
             if l:front_matter == 1
-                if l:line == '---'
+                if l:line ==# '---'
                     let l:front_matter = 0
                 endif
             elseif i == 1
-                if l:line == '---'
+                if l:line ==# '---'
                     let l:front_matter = 1
                 endif
             endif
         endif
         " match line against header regex
-        if join(getline(i, i + 1), "\n") =~ s:headersRegexp && l:line =~ '^\S'
+        if join(getline(i, i + 1), "\n") =~# s:headersRegexp && l:line =~# '^\S'
             let l:is_header = 1
         else
             let l:is_header = 0
         endif
-        if l:is_header == 1 && l:fenced_block == 0 && l:front_matter == 0
+        if l:is_header ==# 1 && l:fenced_block ==# 0 && l:front_matter ==# 0
             " remove hashes from atx headers
-            if match(l:line, "^#") > -1
+            if match(l:line, '^#') > -1
                 let l:line = substitute(l:line, '\v^#*[ ]*', '', '')
                 let l:line = substitute(l:line, '\v[ ]*#*$', '', '')
             endif
@@ -365,11 +365,11 @@ function! s:Toc(...)
     let l:header_list = s:GetHeaderList()
     let l:indented_header_list = []
     if len(l:header_list) == 0
-        echom "Toc: No headers."
+        echom 'Toc: No headers.'
         return
     endif
     let l:header_max_len = 0
-    let l:vim_markdown_toc_autofit = get(g:, "vim_markdown_toc_autofit", 0)
+    let l:vim_markdown_toc_autofit = get(g:, 'vim_markdown_toc_autofit', 0)
     for h in l:header_list
         " set header number of the cursor position
         if l:cursor_header == 0
@@ -442,7 +442,7 @@ function! s:InsertToc(format, ...)
     let l:toc = []
     let l:header_list = s:GetHeaderList()
     if len(l:header_list) == 0
-        echom "InsertToc: No headers."
+        echom 'InsertToc: No headers.'
         return
     endif
 
@@ -554,7 +554,7 @@ function! s:TableFormat()
     " Move colons for alignment to left or right side of the cell.
     execute 's/:\( \+\)|/\1:|/e' . l:flags
     execute 's/|\( \+\):/|:\1/e' . l:flags
-    execute 's/ /-/' . l:flags
+    execute 's/|:\?\zs[ -]\+\ze:\?|/\=repeat("-", len(submatch(0)))/' . l:flags
     call setpos('.', l:pos)
 endfunction
 
@@ -657,7 +657,7 @@ endfunction
 "
 function! s:OpenUrlUnderCursor()
     let l:url = s:Markdown_GetUrlForPosition(line('.'), col('.'))
-    if l:url != ''
+    if l:url !=# ''
         call s:VersionAwareNetrwBrowseX(l:url)
     else
         echomsg 'The cursor is not on a link.'
@@ -668,8 +668,24 @@ endfunction
 " script while this function is running. We must not replace it.
 if !exists('*s:EditUrlUnderCursor')
     function s:EditUrlUnderCursor()
+        let l:editmethod = ''
+        " determine how to open the linked file (split, tab, etc)
+        if exists('g:vim_markdown_edit_url_in')
+          if g:vim_markdown_edit_url_in ==# 'tab'
+            let l:editmethod = 'tabnew'
+          elseif g:vim_markdown_edit_url_in ==# 'vsplit'
+            let l:editmethod = 'vsp'
+          elseif g:vim_markdown_edit_url_in ==# 'hsplit'
+            let l:editmethod = 'sp'
+          else
+            let l:editmethod = 'edit'
+          endif
+        else
+          " default to current buffer
+          let l:editmethod = 'edit'
+        endif
         let l:url = s:Markdown_GetUrlForPosition(line('.'), col('.'))
-        if l:url != ''
+        if l:url !=# ''
             if get(g:, 'vim_markdown_autowrite', 0)
                 write
             endif
@@ -679,14 +695,14 @@ if !exists('*s:EditUrlUnderCursor')
                 if len(l:parts) == 2
                     let [l:url, l:anchor] = parts
                     let l:anchorexpr = get(g:, 'vim_markdown_anchorexpr', '')
-                    if l:anchorexpr != ''
+                    if l:anchorexpr !=# ''
                         let l:anchor = eval(substitute(
                             \ l:anchorexpr, 'v:anchor',
                             \ escape('"'.l:anchor.'"', '"'), ''))
                     endif
                 endif
             endif
-            if l:url != ''
+            if l:url !=# ''
                 let l:ext = ''
                 if get(g:, 'vim_markdown_no_extensions_in_markdown', 0)
                     " use another file extension if preferred
@@ -697,29 +713,13 @@ if !exists('*s:EditUrlUnderCursor')
                     endif
                 endif
                 let l:url = fnameescape(fnamemodify(expand('%:h').'/'.l:url.l:ext, ':.'))
-                let l:editmethod = ''
-                " determine how to open the linked file (split, tab, etc)
-                if exists('g:vim_markdown_edit_url_in')
-                  if g:vim_markdown_edit_url_in == 'tab'
-                    let l:editmethod = 'tabnew'
-                  elseif g:vim_markdown_edit_url_in == 'vsplit'
-                    let l:editmethod = 'vsp'
-                  elseif g:vim_markdown_edit_url_in == 'hsplit'
-                    let l:editmethod = 'sp'
-                  else
-                    let l:editmethod = 'edit'
-                  endif
-                else
-                  " default to current buffer
-                  let l:editmethod = 'edit'
-                endif
                 execute l:editmethod l:url
             endif
-            if l:anchor != ''
+            if l:anchor !=# ''
                 silent! execute '/'.l:anchor
             endif
         else
-            echomsg 'The cursor is not on a link.'
+            execute l:editmethod . ' <cfile>'
         endif
     endfunction
 endif
@@ -754,7 +754,7 @@ if !get(g:, 'vim_markdown_no_default_key_mappings', 0)
     call <sid>MapNotHasmapto('][', 'Markdown_MoveToNextSiblingHeader')
     call <sid>MapNotHasmapto('[]', 'Markdown_MoveToPreviousSiblingHeader')
     call <sid>MapNotHasmapto(']u', 'Markdown_MoveToParentHeader')
-    call <sid>MapNotHasmapto(']c', 'Markdown_MoveToCurHeader')
+    call <sid>MapNotHasmapto(']h', 'Markdown_MoveToCurHeader')
     call <sid>MapNotHasmapto('gx', 'Markdown_OpenUrlUnderCursor')
     call <sid>MapNotHasmapto('ge', 'Markdown_EditUrlUnderCursor')
 endif
@@ -774,8 +774,8 @@ command! -buffer -nargs=? InsertNToc call s:InsertToc('numbers', <args>)
 if exists('g:vim_markdown_fenced_languages')
     let s:filetype_dict = {}
     for s:filetype in g:vim_markdown_fenced_languages
-        let key = matchstr(s:filetype, "[^=]*")
-        let val = matchstr(s:filetype, "[^=]*$")
+        let key = matchstr(s:filetype, '[^=]*')
+        let val = matchstr(s:filetype, '[^=]*$')
         let s:filetype_dict[key] = val
     endfor
 else
@@ -793,7 +793,7 @@ function! s:MarkdownHighlightSources(force)
     let filetypes = {}
     for line in getline(1, '$')
         let ft = matchstr(line, '```\s*\zs[0-9A-Za-z_+-]*\ze.*')
-        if !empty(ft) && ft !~ '^\d*$' | let filetypes[ft] = 1 | endif
+        if !empty(ft) && ft !~# '^\d*$' | let filetypes[ft] = 1 | endif
     endfor
     if !exists('b:mkd_known_filetypes')
         let b:mkd_known_filetypes = {}
@@ -816,7 +816,7 @@ function! s:MarkdownHighlightSources(force)
             else
                 let filetype = ft
             endif
-            let group = 'mkdSnippet' . toupper(substitute(filetype, "[+-]", "_", "g"))
+            let group = 'mkdSnippet' . toupper(substitute(filetype, '[+-]', '_', 'g'))
             if !has_key(b:mkd_included_filetypes, filetype)
                 let include = s:SyntaxInclude(filetype)
                 let b:mkd_included_filetypes[filetype] = 1
@@ -858,13 +858,13 @@ endfunction
 
 
 function! s:MarkdownRefreshSyntax(force)
-    if &filetype =~ 'markdown' && line('$') > 1
+    if &filetype =~# 'markdown' && line('$') > 1
         call s:MarkdownHighlightSources(a:force)
     endif
 endfunction
 
 function! s:MarkdownClearSyntaxVariables()
-    if &filetype =~ 'markdown'
+    if &filetype =~# 'markdown'
         unlet! b:mkd_included_filetypes
     endif
 endfunction
diff --git a/ftplugin/plantuml.vim b/ftplugin/plantuml.vim
index 9f525dc38..5d59c507b 100644
--- a/ftplugin/plantuml.vim
+++ b/ftplugin/plantuml.vim
@@ -5,7 +5,6 @@ endif
 scriptencoding utf-8
 " Vim filetype plugin file
 " Language:     PlantUML
-" Maintainer:   Anders Thøgersen <first name at bladre dot dk>
 " License:      VIM LICENSE
 
 if exists('b:loaded_plantuml_plugin')
diff --git a/indent/basic.vim b/indent/basic.vim
new file mode 100644
index 000000000..7775bc4e0
--- /dev/null
+++ b/indent/basic.vim
@@ -0,0 +1,15 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'basic', 'indent/basic.vim')
+  finish
+endif
+
+" Vim indent file
+" Language:	BASIC (QuickBASIC 4.5)
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2022 Jan 24
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+runtime! indent/vb.vim
diff --git a/indent/freebasic.vim b/indent/freebasic.vim
new file mode 100644
index 000000000..9399b57fb
--- /dev/null
+++ b/indent/freebasic.vim
@@ -0,0 +1,15 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'freebasic', 'indent/freebasic.vim')
+  finish
+endif
+
+" Vim indent file
+" Language:	FreeBASIC
+" Maintainer:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:	2022 Jan 24
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+runtime! indent/vb.vim
diff --git a/indent/glsl.vim b/indent/glsl.vim
index b16fec474..604592847 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'glsl', 'indent/glsl.vim')
 endif
 
 " Language: OpenGL Shading Language
-" Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
+" Maintainer: Sergii Tykhomyrov <sergii@tykhomyrov.net>
 
 if exists("b:did_indent")
   finish
diff --git a/indent/markdown.vim b/indent/markdown.vim
index dd8888f45..3ad1d02e8 100644
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'markdown', 'indent/markdown.v
   finish
 endif
 
-if exists("b:did_indent") | finish | endif
+if exists('b:did_indent') | finish | endif
 let b:did_indent = 1
 
 setlocal indentexpr=GetMarkdownIndent()
@@ -12,7 +12,7 @@ setlocal autoindent
 " Automatically continue blockquote on line break
 setlocal formatoptions+=r
 setlocal comments=b:>
-if get(g:, "vim_markdown_auto_insert_bullets", 1)
+if get(g:, 'vim_markdown_auto_insert_bullets', 1)
     " Do not automatically insert bullets when auto-wrapping with text-width
     setlocal formatoptions-=c
     " Accept various markers as bullets
@@ -20,24 +20,24 @@ if get(g:, "vim_markdown_auto_insert_bullets", 1)
 endif
 
 " Only define the function once
-if exists("*GetMarkdownIndent") | finish | endif
+if exists('*GetMarkdownIndent') | finish | endif
 
 function! s:IsMkdCode(lnum)
     let name = synIDattr(synID(a:lnum, 1, 0), 'name')
-    return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)')
+    return (name =~# '^mkd\%(Code$\|Snippet\)' || name !=# '' && name !~? '^\%(mkd\|html\)')
 endfunction
 
 function! s:IsLiStart(line)
-    return a:line !~ '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' &&
-      \    a:line =~ '^\s*[*+-] \+'
+    return a:line !~# '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' &&
+      \    a:line =~# '^\s*[*+-] \+'
 endfunction
 
 function! s:IsHeaderLine(line)
-    return a:line =~ '^\s*#'
+    return a:line =~# '^\s*#'
 endfunction
 
 function! s:IsBlankLine(line)
-    return a:line =~ '^$'
+    return a:line =~# '^$'
 endfunction
 
 function! s:PrevNonBlank(lnum)
@@ -52,7 +52,7 @@ function GetMarkdownIndent()
     if v:lnum > 2 && s:IsBlankLine(getline(v:lnum - 1)) && s:IsBlankLine(getline(v:lnum - 2))
         return 0
     endif
-    let list_ind = get(g:, "vim_markdown_new_list_item_indent", 4)
+    let list_ind = get(g:, 'vim_markdown_new_list_item_indent', 4)
     " Find a non-blank line above the current line.
     let lnum = s:PrevNonBlank(v:lnum - 1)
     " At the start of the file use zero indent.
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index 71af587cf..1bf9d13e6 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -5,7 +5,6 @@ endif
 scriptencoding utf-8
 " Vim indent file
 " Language:     PlantUML
-" Maintainer:   Anders Thøgersen <first name at bladre dot dk>
 " License:      VIM LICENSE
 
 if exists('b:did_indent')
@@ -21,7 +20,7 @@ if exists('*GetPlantUMLIndent')
   finish
 endif
 
-let s:decIndent = '^\s*\%(end\|else\|}\)'
+let s:decIndent = '^\s*\%(end\|else\|fork again\|}\)'
 
 function! GetPlantUMLIndent(...) abort
   "for current line, use arg if given or v:lnum otherwise
diff --git a/indent/solidity.vim b/indent/solidity.vim
index 7744f7a7d..26cb4c144 100644
--- a/indent/solidity.vim
+++ b/indent/solidity.vim
@@ -19,7 +19,7 @@ setlocal nosmartindent
 
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetSolidityIndent()
-setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e
+setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e,0*
 
 " Only define the function once.
 if exists("*GetSolidityIndent")
@@ -41,7 +41,7 @@ let s:syng_strcom = 'string\|regex\|comment\c'
 let s:syng_string = 'regex\c'
 
 " Regex of syntax group names that are strings or documentation.
-let s:syng_multiline = 'comment\c'
+let s:syng_multiline = 'comment\|natspecblock\c'
 
 " Regex of syntax group names that are line comment.
 let s:syng_linecom = 'linecomment\c'
diff --git a/syntax/basic.vim b/syntax/basic.vim
index 3502fa14c..2984c9af0 100644
--- a/syntax/basic.vim
+++ b/syntax/basic.vim
@@ -3,16 +3,17 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'basic', 'syntax/basic.vim')
 endif
 
 " Vim syntax file
-" Language:		BASIC
+" Language:		BASIC (QuickBASIC 4.5)
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " Previous Maintainer:	Allan Kelly <allan@fruitloaf.co.uk>
 " Contributors:		Thilo Six
-" Last Change:		2015 Jan 10
+" Last Change:		2021 Aug 08
 
 " First version based on Micro$soft QBASIC circa 1989, as documented in
 " 'Learn BASIC Now' by Halvorson&Rygmyr. Microsoft Press 1989.
-" This syntax file not a complete implementation yet.  Send suggestions to the
-" maintainer.
+"
+" Second version attempts to match Microsoft QuickBASIC 4.5 while keeping FreeBASIC
+" (-lang qb) and QB64 (excluding extensions) in mind. -- DJK
 
 " Prelude {{{1
 if exists("b:current_syntax")
@@ -22,154 +23,357 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
+syn iskeyword @,48-57,.,!,#,%,&,$
+syn case      ignore
+
+" Whitespace Errors {{{1
+if exists("basic_space_errors")
+  if !exists("basic_no_trail_space_error")
+    syn match basicSpaceError display excludenl "\s\+$"
+  endif
+  if !exists("basic_no_tab_space_error")
+    syn match basicSpaceError display " \+\t"me=e-1
+  endif
+endif
+
+" Comment Errors {{{1
+if !exists("basic_no_comment_errors")
+  syn match basicCommentError "\<REM\>.*"
+endif
+
+" Not Top Cluster {{{1
+syn cluster basicNotTop contains=@basicLineIdentifier,basicDataString,basicDataSeparator,basicTodo
+
+" Statements {{{1
+
+syn cluster basicStatements contains=basicStatement,basicDataStatement,basicMetaRemStatement,basicPutStatement,basicRemStatement
+
+let s:statements =<< trim EOL " {{{2
+  beep
+  bload
+  bsave
+  call
+  calls
+  case
+  chain
+  chdir
+  circle
+  clear
+  close
+  cls
+  color
+  com
+  common
+  const
+  declare
+  def
+  def\s\+seg
+  defdbl
+  defint
+  deflng
+  defsng
+  defstr
+  dim
+  do
+  draw
+  elseif
+  end
+  end\s\+\%(def\|function\|if\|select\|sub\|type\)
+  environ
+  erase
+  error
+  exit\s\+\%(def\|do\|for\|function\|sub\)
+  field
+  files
+  for
+  function
+  get
+  gosub
+  goto
+  if
+  input
+  ioctl
+  key
+  kill
+  let
+  line
+  line\s\+input
+  locate
+  lock
+  loop
+  lprint
+  lset
+  mkdir
+  name
+  next
+  on
+  on\s\+error
+  on\s\+uevent
+  open
+  open\s\+com
+  option
+  out
+  paint
+  palette
+  palette\s\+using
+  pcopy
+  pen
+  pmap
+  poke
+  preset
+  print
+  pset
+  randomize
+  read
+  redim
+  reset
+  restore
+  resume
+  return
+  rmdir
+  rset
+  run
+  select\s\+case
+  shared
+  shell
+  sleep
+  sound
+  static
+  stop
+  strig
+  sub
+  swap
+  system
+  troff
+  tron
+  type
+  uevent
+  unlock
+  using
+  view
+  view\s\+print
+  wait
+  wend
+  while
+  width
+  window
+  write
+EOL
+" }}}
+
+for s in s:statements
+  exe 'syn match basicStatement "\<' .. s .. '\>" contained'
+endfor
+
+syn match basicStatement "\<\%(then\|else\)\>" nextgroup=@basicStatements skipwhite
+
+" DATA Statement
+syn match  basicDataSeparator "," contained
+syn region basicDataStatement matchgroup=basicStatement start="\<data\>" matchgroup=basicStatementSeparator end=":\|$" contained contains=basicDataSeparator,basicDataString,basicNumber,basicFloat,basicString
+
+if !exists("basic_no_data_fold")
+  syn region basicMultilineData start="^\s*\<data\>.*\n\%(^\s*\<data\>\)\@=" end="^\s*\<data\>.*\n\%(^\s*\<data\>\)\@!" contains=basicDataStatement transparent fold keepend
+endif
+
+" PUT File I/O and Graphics statements - needs special handling for graphics
+" action verbs
+syn match  basicPutAction "\<\%(pset\|preset\|and\|or\|xor\)\>" contained
+syn region basicPutStatement matchgroup=basicStatement start="\<put\>" matchgroup=basicStatementSeparator end=":\|$" contained contains=basicKeyword,basicPutAction,basicFilenumber
+
 " Keywords {{{1
-syn keyword basicStatement	BEEP beep Beep BLOAD bload Bload BSAVE bsave Bsave
-syn keyword basicStatement	CALL call Call ABSOLUTE absolute Absolute
-syn keyword basicStatement	CHAIN chain Chain CHDIR chdir Chdir
-syn keyword basicStatement	CIRCLE circle Circle CLEAR clear Clear
-syn keyword basicStatement	CLOSE close Close CLS cls Cls COLOR color Color
-syn keyword basicStatement	COM com Com COMMON common Common
-syn keyword basicStatement	CONST const Const DATA data Data
-syn keyword basicStatement	DECLARE declare Declare DEF def Def
-syn keyword basicStatement	DEFDBL defdbl Defdbl DEFINT defint Defint
-syn keyword basicStatement	DEFLNG deflng Deflng DEFSNG defsng Defsng
-syn keyword basicStatement	DEFSTR defstr Defstr DIM dim Dim
-syn keyword basicStatement	DO do Do LOOP loop Loop
-syn keyword basicStatement	DRAW draw Draw END end End
-syn keyword basicStatement	ENVIRON environ Environ ERASE erase Erase
-syn keyword basicStatement	ERROR error Error EXIT exit Exit
-syn keyword basicStatement	FIELD field Field FILES files Files
-syn keyword basicStatement	FOR for For NEXT next Next
-syn keyword basicStatement	FUNCTION function Function GET get Get
-syn keyword basicStatement	GOSUB gosub Gosub GOTO goto Goto
-syn keyword basicStatement	IF if If THEN then Then ELSE else Else
-syn keyword basicStatement	INPUT input Input INPUT# input# Input#
-syn keyword basicStatement	IOCTL ioctl Ioctl KEY key Key
-syn keyword basicStatement	KILL kill Kill LET let Let
-syn keyword basicStatement	LINE line Line LOCATE locate Locate
-syn keyword basicStatement	LOCK lock Lock UNLOCK unlock Unlock
-syn keyword basicStatement	LPRINT lprint Lprint USING using Using
-syn keyword basicStatement	LSET lset Lset MKDIR mkdir Mkdir
-syn keyword basicStatement	NAME name Name ON on On
-syn keyword basicStatement	ERROR error Error OPEN open Open
-syn keyword basicStatement	OPTION option Option BASE base Base
-syn keyword basicStatement	OUT out Out PAINT paint Paint
-syn keyword basicStatement	PALETTE palette Palette PCOPY pcopy Pcopy
-syn keyword basicStatement	PEN pen Pen PLAY play Play
-syn keyword basicStatement	PMAP pmap Pmap POKE poke Poke
-syn keyword basicStatement	PRESET preset Preset PRINT print Print
-syn keyword basicStatement	PRINT# print# Print# USING using Using
-syn keyword basicStatement	PSET pset Pset PUT put Put
-syn keyword basicStatement	RANDOMIZE randomize Randomize READ read Read
-syn keyword basicStatement	REDIM redim Redim RESET reset Reset
-syn keyword basicStatement	RESTORE restore Restore RESUME resume Resume
-syn keyword basicStatement	RETURN return Return RMDIR rmdir Rmdir
-syn keyword basicStatement	RSET rset Rset RUN run Run
-syn keyword basicStatement	SEEK seek Seek SELECT select Select
-syn keyword basicStatement	CASE case Case SHARED shared Shared
-syn keyword basicStatement	SHELL shell Shell SLEEP sleep Sleep
-syn keyword basicStatement	SOUND sound Sound STATIC static Static
-syn keyword basicStatement	STOP stop Stop STRIG strig Strig
-syn keyword basicStatement	SUB sub Sub SWAP swap Swap
-syn keyword basicStatement	SYSTEM system System TIMER timer Timer
-syn keyword basicStatement	TROFF troff Troff TRON tron Tron
-syn keyword basicStatement	TYPE type Type UNLOCK unlock Unlock
-syn keyword basicStatement	VIEW view View WAIT wait Wait
-syn keyword basicStatement	WHILE while While WEND wend Wend
-syn keyword basicStatement	WIDTH width Width WINDOW window Window
-syn keyword basicStatement	WRITE write Write DATE$ date$ Date$
-syn keyword basicStatement	MID$ mid$ Mid$ TIME$ time$ Time$
-
-syn keyword basicFunction	ABS abs Abs ASC asc Asc
-syn keyword basicFunction	ATN atn Atn CDBL cdbl Cdbl
-syn keyword basicFunction	CINT cint Cint CLNG clng Clng
-syn keyword basicFunction	COS cos Cos CSNG csng Csng
-syn keyword basicFunction	CSRLIN csrlin Csrlin CVD cvd Cvd
-syn keyword basicFunction	CVDMBF cvdmbf Cvdmbf CVI cvi Cvi
-syn keyword basicFunction	CVL cvl Cvl CVS cvs Cvs
-syn keyword basicFunction	CVSMBF cvsmbf Cvsmbf EOF eof Eof
-syn keyword basicFunction	ERDEV erdev Erdev ERL erl Erl
-syn keyword basicFunction	ERR err Err EXP exp Exp
-syn keyword basicFunction	FILEATTR fileattr Fileattr FIX fix Fix
-syn keyword basicFunction	FRE fre Fre FREEFILE freefile Freefile
-syn keyword basicFunction	INP inp Inp INSTR instr Instr
-syn keyword basicFunction	INT int Int LBOUND lbound Lbound
-syn keyword basicFunction	LEN len Len LOC loc Loc
-syn keyword basicFunction	LOF lof Lof LOG log Log
-syn keyword basicFunction	LPOS lpos Lpos PEEK peek Peek
-syn keyword basicFunction	PEN pen Pen POINT point Point
-syn keyword basicFunction	POS pos Pos RND rnd Rnd
-syn keyword basicFunction	SADD sadd Sadd SCREEN screen Screen
-syn keyword basicFunction	SEEK seek Seek SETMEM setmem Setmem
-syn keyword basicFunction	SGN sgn Sgn SIN sin Sin
-syn keyword basicFunction	SPC spc Spc SQR sqr Sqr
-syn keyword basicFunction	STICK stick Stick STRIG strig Strig
-syn keyword basicFunction	TAB tab Tab TAN tan Tan
-syn keyword basicFunction	UBOUND ubound Ubound VAL val Val
-syn keyword basicFunction	VALPTR valptr Valptr VALSEG valseg Valseg
-syn keyword basicFunction	VARPTR varptr Varptr VARSEG varseg Varseg
-syn keyword basicFunction	CHR$ Chr$ chr$ COMMAND$ command$ Command$
-syn keyword basicFunction	DATE$ date$ Date$ ENVIRON$ environ$ Environ$
-syn keyword basicFunction	ERDEV$ erdev$ Erdev$ HEX$ hex$ Hex$
-syn keyword basicFunction	INKEY$ inkey$ Inkey$ INPUT$ input$ Input$
-syn keyword basicFunction	IOCTL$ ioctl$ Ioctl$ LCASES$ lcases$ Lcases$
-syn keyword basicFunction	LAFT$ laft$ Laft$ LTRIM$ ltrim$ Ltrim$
-syn keyword basicFunction	MID$ mid$ Mid$ MKDMBF$ mkdmbf$ Mkdmbf$
-syn keyword basicFunction	MKD$ mkd$ Mkd$ MKI$ mki$ Mki$
-syn keyword basicFunction	MKL$ mkl$ Mkl$ MKSMBF$ mksmbf$ Mksmbf$
-syn keyword basicFunction	MKS$ mks$ Mks$ OCT$ oct$ Oct$
-syn keyword basicFunction	RIGHT$ right$ Right$ RTRIM$ rtrim$ Rtrim$
-syn keyword basicFunction	SPACE$ space$ Space$ STR$ str$ Str$
-syn keyword basicFunction	STRING$ string$ String$ TIME$ time$ Time$
-syn keyword basicFunction	UCASE$ ucase$ Ucase$ VARPTR$ varptr$ Varptr$
+let s:keywords =<< trim EOL " {{{2
+  absolute
+  access
+  alias
+  append
+  as
+  base
+  binary
+  byval
+  cdecl
+  com
+  def
+  do
+  for
+  function
+  gosub
+  goto
+  input
+  int86old
+  int86xold
+  interrupt
+  interruptx
+  is
+  key
+  len
+  list
+  local
+  lock
+  lprint
+  next
+  off
+  on
+  output
+  pen
+  play
+  random
+  read
+  resume
+  screen
+  seg
+  shared
+  signal
+  static
+  step
+  stop
+  strig
+  sub
+  timer
+  to
+  until
+  using
+  while
+  write
+EOL
+" }}}
+
+for k in s:keywords
+  exe 'syn match basicKeyword "\<' .. k .. '\>"'
+endfor
+
+" Functions {{{1
+syn keyword basicFunction abs asc atn cdbl chr$ cint clng command$ cos csng
+syn keyword basicFunction csrlin cvd cvdmbf cvi cvl cvs cvsmbf environ$ eof
+syn keyword basicFunction erdev erdev$ erl err exp fileattr fix fre freefile
+syn keyword basicFunction hex$ inkey$ inp input$ instr int ioctl$ left$ lbound
+syn keyword basicFunction lcase$ len loc lof log lpos ltrim$ mkd$ mkdmbf$ mki$
+syn keyword basicFunction mkl$ mks$ mksmbf$ oct$ peek pen point pos right$ rnd
+syn keyword basicFunction rtrim$ sadd setmem sgn sin space$ spc sqr stick str$
+syn keyword basicFunction strig string$ tab tan ubound ucase$ val valptr
+syn keyword basicFunction valseg varptr varptr$ varseg
+
+" Functions and statements (same name) {{{1
+syn match   basicStatement "\<\%(date\$\|mid\$\|play\|screen\|seek\|time\$\|timer\)\>" contained
+syn match   basicFunction  "\<\%(date\$\|mid\$\|play\|screen\|seek\|time\$\|timer\)\>"
+
+" Types {{{1
+syn keyword basicType integer long single double string any
+
+" Strings {{{1
+
+" Unquoted DATA strings - anything except [:,] and leading or trailing whitespace
+" Needs lower priority than numbers
+syn match basicDataString "[^[:space:],:]\+\%(\s\+[^[:space:],:]\+\)*" contained
+
+syn region basicString start=+"+ end=+"+ oneline
+
+" Booleans {{{1
+if exists("basic_booleans")
+  syn keyword basicBoolean true false
+endif
 
 " Numbers {{{1
-" Integer number, or floating point number without a dot.
-syn match  basicNumber		"\<\d\+\>"
-" Floating point number, with dot
-syn match  basicNumber		"\<\d\+\.\d*\>"
-" Floating point number, starting with a dot
-syn match  basicNumber		"\.\d\+\>"
 
-" String and Character constants {{{1
-syn match   basicSpecial	"\\\d\d\d\|\\." contained
-syn region  basicString		start=+"+  skip=+\\\\\|\\"+  end=+"+	contains=basicSpecial
+" Integers
+syn match basicNumber "-\=&o\=\o\+[%&]\=\>"
+syn match basicNumber "-\=&h\x\+[%&]\=\>"
+syn match basicNumber "-\=\<\d\+[%&]\=\>"
+
+" Floats
+syn match basicFloat "-\=\<\d\+\.\=\d*\%(\%([ed][+-]\=\d*\)\|[!#]\)\=\>"
+syn match basicFloat      "-\=\<\.\d\+\%(\%([ed][+-]\=\d*\)\|[!#]\)\=\>"
 
-" Line numbers {{{1
-syn region  basicLineNumber	start="^\d" end="\s"
+" Statement anchors {{{1
+syn match basicLineStart	  "^" nextgroup=@basicStatements,@basicLineIdentifier skipwhite
+syn match basicStatementSeparator ":" nextgroup=@basicStatements		      skipwhite
 
-" Data-type suffixes {{{1
-syn match   basicTypeSpecifier	"[a-zA-Z0-9][$%&!#]"ms=s+1
-" Used with OPEN statement
-syn match   basicFilenumber  "#\d\+"
+" Line numbers and labels {{{1
+
+" QuickBASIC limits these to 65,529 and 40 chars respectively
+syn match basicLineNumber "\d\+"		  nextgroup=@basicStatements skipwhite contained
+syn match basicLineLabel  "\a[[:alnum:]]*\ze\s*:" nextgroup=@basicStatements skipwhite contained
+
+syn cluster basicLineIdentifier contains=basicLineNumber,basicLineLabel
+
+" Line Continuation {{{1
+syn match basicLineContinuation "\s*\zs_\ze\s*$"
+
+" Type suffixes {{{1
+if exists("basic_type_suffixes")
+  syn match basicTypeSuffix "\a[[:alnum:].]*\zs[$%&!#]"
+endif
 
-" Mathematical operators {{{1
-" syn match   basicMathsOperator "[<>+\*^/\\=-]"
-syn match   basicMathsOperator	 "-\|=\|[:<>+\*^/\\]\|AND\|OR"
+" File numbers {{{1
+syn match basicFilenumber "#\d\+"
+syn match basicFilenumber "#\a[[:alnum:].]*[%&!#]\="
+
+" Operators {{{1
+if exists("basic_operators")
+  syn match basicArithmeticOperator "[-+*/\\^]"
+  syn match basicRelationalOperator "<>\|<=\|>=\|[><=]"
+endif
+syn match basicLogicalOperator	  "\<\%(not\|and\|or\|xor\|eqv\|imp\)\>"
+syn match basicArithmeticOperator "\<mod\>"
+
+" Metacommands {{{1
+" Note: No trailing word boundaries.  Text may be freely mixed however there
+" must be only leading whitespace prior to the first metacommand
+syn match basicMetacommand "$INCLUDE\s*:\s*'[^']\+'" contained containedin=@basicMetaComments
+syn match basicMetacommand "$\%(DYNAMIC\|STATIC\)"   contained containedin=@basicMetaComments
 
 " Comments {{{1
-syn keyword basicTodo		TODO FIXME XXX NOTE contained
-syn region  basicComment	start="^\s*\zsREM\>" start="\%(:\s*\)\@<=REM\>" end="$" contains=basicTodo
-syn region  basicComment	start="'"					end="$" contains=basicTodo
+syn keyword basicTodo TODO FIXME XXX NOTE contained
+
+syn region basicRemStatement matchgroup=basicStatement start="REM\>" end="$" contains=basicTodo,@Spell contained
+syn region basicComment				       start="'"     end="$" contains=basicTodo,@Spell
+
+if !exists("basic_no_comment_fold")
+  syn region basicMultilineComment start="^\s*'.*\n\%(\s*'\)\@=" end="^\s*'.*\n\%(\s*'\)\@!" contains=@basicComments transparent fold keepend
+endif
+
+" Metacommands
+syn region  basicMetaRemStatement matchgroup=basicStatement start="REM\>\s*\$\@=" end="$" contains=basicTodo contained
+syn region  basicMetaComment				    start="'\s*\$\@="	  end="$" contains=basicTodo
+
+syn cluster basicMetaComments contains=basicMetaComment,basicMetaRemStatement
+syn cluster basicComments     contains=basicComment,basicMetaComment
 
 "syn sync ccomment basicComment
 
 " Default Highlighting {{{1
-hi def link basicLabel		Label
-hi def link basicConditional	Conditional
-hi def link basicRepeat		Repeat
-hi def link basicLineNumber	Comment
-hi def link basicNumber		Number
-hi def link basicError		Error
-hi def link basicStatement	Statement
-hi def link basicString		String
-hi def link basicComment	Comment
-hi def link basicSpecial	Special
-hi def link basicTodo		Todo
-hi def link basicFunction	Identifier
-hi def link basicTypeSpecifier	Type
-hi def link basicFilenumber	basicTypeSpecifier
-"hi basicMathsOperator term=bold cterm=bold gui=bold
+hi def link basicArithmeticOperator basicOperator
+hi def link basicBoolean	    Boolean
+hi def link basicComment	    Comment
+hi def link basicCommentError	    Error
+hi def link basicDataString	    basicString
+hi def link basicFilenumber	    basicTypeSuffix " TODO: better group
+hi def link basicFloat		    Float
+hi def link basicFunction	    Identifier
+hi def link basicKeyword	    Keyword
+hi def link basicLineIdentifier	    LineNr
+hi def link basicLineContinuation   Special
+hi def link basicLineLabel	    basicLineIdentifier
+hi def link basicLineNumber	    basicLineIdentifier
+hi def link basicLogicalOperator    basicOperator
+hi def link basicMetacommand	    SpecialComment
+hi def link basicMetaComment	    Comment
+hi def link basicMetaRemStatement   Comment
+hi def link basicNumber		    Number
+hi def link basicOperator	    Operator
+hi def link basicPutAction	    Keyword
+hi def link basicRelationalOperator basicOperator
+hi def link basicRemStatement	    Comment
+hi def link basicSpaceError	    Error
+hi def link basicStatementSeparator Special
+hi def link basicStatement	    Statement
+hi def link basicString		    String
+hi def link basicTodo		    Todo
+hi def link basicType		    Type
+hi def link basicTypeSuffix	    Special
+if exists("basic_legacy_syntax_groups")
+  hi def link basicTypeSpecifier      Type
+  hi def link basicTypeSuffix	      basicTypeSpecifier
+endif
 
 " Postscript {{{1
 let b:current_syntax = "basic"
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index 6fb362448..2be3626fc 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -28,17 +28,17 @@ endif
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
 " Clojure version 1.10.3
 let s:clojure_syntax_keywords = {
-    \   'clojureBoolean': ["false","true"]
-    \ , 'clojureCond': ["case","clojure.core/case","clojure.core/cond","clojure.core/cond->","clojure.core/cond->>","clojure.core/condp","clojure.core/if-let","clojure.core/if-not","clojure.core/if-some","clojure.core/when","clojure.core/when-first","clojure.core/when-let","clojure.core/when-not","clojure.core/when-some","cond","cond->","cond->>","condp","if-let","if-not","if-some","when","when-first","when-let","when-not","when-some"]
-    \ , 'clojureConstant': ["nil"]
-    \ , 'clojureDefine': ["clojure.core/definline","clojure.core/definterface","clojure.core/defmacro","clojure.core/defmethod","clojure.core/defmulti","clojure.core/defn","clojure.core/defn-","clojure.core/defonce","clojure.core/defprotocol","clojure.core/defrecord","clojure.core/defstruct","clojure.core/deftype","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype"]
-    \ , 'clojureException': ["catch","finally","throw","try"]
-    \ , 'clojureFunc': ["*","*'","+","+'","-","-'","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods","/","<","<=","=","==",">",">=","PrintWriter-on","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","ancestors","any?","apply","array-map","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","cast","cat","char","char-array","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","clojure.core/*","clojure.core/*'","clojure.core/+","clojure.core/+'","clojure.core/-","clojure.core/-'","clojure.core/->ArrayChunk","clojure.core/->Eduction","clojure.core/->Vec","clojure.core/->VecNode","clojure.core/->VecSeq","clojure.core/-cache-protocol-fn","clojure.core/-reset-methods","clojure.core//","clojure.core/<","clojure.core/<=","clojure.core/=","clojure.core/==","clojure.core/>","clojure.core/>=","clojure.core/PrintWriter-on","clojure.core/StackTraceElement->vec","clojure.core/Throwable->map","clojure.core/accessor","clojure.core/aclone","clojure.core/add-classpath","clojure.core/add-tap","clojure.core/add-watch","clojure.core/agent","clojure.core/agent-error","clojure.core/agent-errors","clojure.core/aget","clojure.core/alength","clojure.core/alias","clojure.core/all-ns","clojure.core/alter","clojure.core/alter-meta!","clojure.core/alter-var-root","clojure.core/ancestors","clojure.core/any?","clojure.core/apply","clojure.core/array-map","clojure.core/aset","clojure.core/aset-boolean","clojure.core/aset-byte","clojure.core/aset-char","clojure.core/aset-double","clojure.core/aset-float","clojure.core/aset-int","clojure.core/aset-long","clojure.core/aset-short","clojure.core/assoc","clojure.core/assoc!","clojure.core/assoc-in","clojure.core/associative?","clojure.core/atom","clojure.core/await","clojure.core/await-for","clojure.core/await1","clojure.core/bases","clojure.core/bean","clojure.core/bigdec","clojure.core/bigint","clojure.core/biginteger","clojure.core/bit-and","clojure.core/bit-and-not","clojure.core/bit-clear","clojure.core/bit-flip","clojure.core/bit-not","clojure.core/bit-or","clojure.core/bit-set","clojure.core/bit-shift-left","clojure.core/bit-shift-right","clojure.core/bit-test","clojure.core/bit-xor","clojure.core/boolean","clojure.core/boolean-array","clojure.core/boolean?","clojure.core/booleans","clojure.core/bound-fn*","clojure.core/bound?","clojure.core/bounded-count","clojure.core/butlast","clojure.core/byte","clojure.core/byte-array","clojure.core/bytes","clojure.core/bytes?","clojure.core/cast","clojure.core/cat","clojure.core/char","clojure.core/char-array","clojure.core/char?","clojure.core/chars","clojure.core/chunk","clojure.core/chunk-append","clojure.core/chunk-buffer","clojure.core/chunk-cons","clojure.core/chunk-first","clojure.core/chunk-next","clojure.core/chunk-rest","clojure.core/chunked-seq?","clojure.core/class","clojure.core/class?","clojure.core/clear-agent-errors","clojure.core/clojure-version","clojure.core/coll?","clojure.core/commute","clojure.core/comp","clojure.core/comparator","clojure.core/compare","clojure.core/compare-and-set!","clojure.core/compile","clojure.core/complement","clojure.core/completing","clojure.core/concat","clojure.core/conj","clojure.core/conj!","clojure.core/cons","clojure.core/constantly","clojure.core/construct-proxy","clojure.core/contains?","clojure.core/count","clojure.core/counted?","clojure.core/create-ns","clojure.core/create-struct","clojure.core/cycle","clojure.core/dec","clojure.core/dec'","clojure.core/decimal?","clojure.core/dedupe","clojure.core/delay?","clojure.core/deliver","clojure.core/denominator","clojure.core/deref","clojure.core/derive","clojure.core/descendants","clojure.core/destructure","clojure.core/disj","clojure.core/disj!","clojure.core/dissoc","clojure.core/dissoc!","clojure.core/distinct","clojure.core/distinct?","clojure.core/doall","clojure.core/dorun","clojure.core/double","clojure.core/double-array","clojure.core/double?","clojure.core/doubles","clojure.core/drop","clojure.core/drop-last","clojure.core/drop-while","clojure.core/eduction","clojure.core/empty","clojure.core/empty?","clojure.core/ensure","clojure.core/ensure-reduced","clojure.core/enumeration-seq","clojure.core/error-handler","clojure.core/error-mode","clojure.core/eval","clojure.core/even?","clojure.core/every-pred","clojure.core/every?","clojure.core/ex-cause","clojure.core/ex-data","clojure.core/ex-info","clojure.core/ex-message","clojure.core/extend","clojure.core/extenders","clojure.core/extends?","clojure.core/false?","clojure.core/ffirst","clojure.core/file-seq","clojure.core/filter","clojure.core/filterv","clojure.core/find","clojure.core/find-keyword","clojure.core/find-ns","clojure.core/find-protocol-impl","clojure.core/find-protocol-method","clojure.core/find-var","clojure.core/first","clojure.core/flatten","clojure.core/float","clojure.core/float-array","clojure.core/float?","clojure.core/floats","clojure.core/flush","clojure.core/fn?","clojure.core/fnext","clojure.core/fnil","clojure.core/force","clojure.core/format","clojure.core/frequencies","clojure.core/future-call","clojure.core/future-cancel","clojure.core/future-cancelled?","clojure.core/future-done?","clojure.core/future?","clojure.core/gensym","clojure.core/get","clojure.core/get-in","clojure.core/get-method","clojure.core/get-proxy-class","clojure.core/get-thread-bindings","clojure.core/get-validator","clojure.core/group-by","clojure.core/halt-when","clojure.core/hash","clojure.core/hash-combine","clojure.core/hash-map","clojure.core/hash-ordered-coll","clojure.core/hash-set","clojure.core/hash-unordered-coll","clojure.core/ident?","clojure.core/identical?","clojure.core/identity","clojure.core/ifn?","clojure.core/in-ns","clojure.core/inc","clojure.core/inc'","clojure.core/indexed?","clojure.core/init-proxy","clojure.core/inst-ms","clojure.core/inst-ms*","clojure.core/inst?","clojure.core/instance?","clojure.core/int","clojure.core/int-array","clojure.core/int?","clojure.core/integer?","clojure.core/interleave","clojure.core/intern","clojure.core/interpose","clojure.core/into","clojure.core/into-array","clojure.core/ints","clojure.core/isa?","clojure.core/iterate","clojure.core/iterator-seq","clojure.core/juxt","clojure.core/keep","clojure.core/keep-indexed","clojure.core/key","clojure.core/keys","clojure.core/keyword","clojure.core/keyword?","clojure.core/last","clojure.core/line-seq","clojure.core/list","clojure.core/list*","clojure.core/list?","clojure.core/load","clojure.core/load-file","clojure.core/load-reader","clojure.core/load-string","clojure.core/loaded-libs","clojure.core/long","clojure.core/long-array","clojure.core/longs","clojure.core/macroexpand","clojure.core/macroexpand-1","clojure.core/make-array","clojure.core/make-hierarchy","clojure.core/map","clojure.core/map-entry?","clojure.core/map-indexed","clojure.core/map?","clojure.core/mapcat","clojure.core/mapv","clojure.core/max","clojure.core/max-key","clojure.core/memoize","clojure.core/merge","clojure.core/merge-with","clojure.core/meta","clojure.core/method-sig","clojure.core/methods","clojure.core/min","clojure.core/min-key","clojure.core/mix-collection-hash","clojure.core/mod","clojure.core/munge","clojure.core/name","clojure.core/namespace","clojure.core/namespace-munge","clojure.core/nat-int?","clojure.core/neg-int?","clojure.core/neg?","clojure.core/newline","clojure.core/next","clojure.core/nfirst","clojure.core/nil?","clojure.core/nnext","clojure.core/not","clojure.core/not-any?","clojure.core/not-empty","clojure.core/not-every?","clojure.core/not=","clojure.core/ns-aliases","clojure.core/ns-imports","clojure.core/ns-interns","clojure.core/ns-map","clojure.core/ns-name","clojure.core/ns-publics","clojure.core/ns-refers","clojure.core/ns-resolve","clojure.core/ns-unalias","clojure.core/ns-unmap","clojure.core/nth","clojure.core/nthnext","clojure.core/nthrest","clojure.core/num","clojure.core/number?","clojure.core/numerator","clojure.core/object-array","clojure.core/odd?","clojure.core/parents","clojure.core/partial","clojure.core/partition","clojure.core/partition-all","clojure.core/partition-by","clojure.core/pcalls","clojure.core/peek","clojure.core/persistent!","clojure.core/pmap","clojure.core/pop","clojure.core/pop!","clojure.core/pop-thread-bindings","clojure.core/pos-int?","clojure.core/pos?","clojure.core/pr","clojure.core/pr-str","clojure.core/prefer-method","clojure.core/prefers","clojure.core/print","clojure.core/print-ctor","clojure.core/print-dup","clojure.core/print-method","clojure.core/print-simple","clojure.core/print-str","clojure.core/printf","clojure.core/println","clojure.core/println-str","clojure.core/prn","clojure.core/prn-str","clojure.core/promise","clojure.core/proxy-call-with-super","clojure.core/proxy-mappings","clojure.core/proxy-name","clojure.core/push-thread-bindings","clojure.core/qualified-ident?","clojure.core/qualified-keyword?","clojure.core/qualified-symbol?","clojure.core/quot","clojure.core/rand","clojure.core/rand-int","clojure.core/rand-nth","clojure.core/random-sample","clojure.core/range","clojure.core/ratio?","clojure.core/rational?","clojure.core/rationalize","clojure.core/re-find","clojure.core/re-groups","clojure.core/re-matcher","clojure.core/re-matches","clojure.core/re-pattern","clojure.core/re-seq","clojure.core/read","clojure.core/read+string","clojure.core/read-line","clojure.core/read-string","clojure.core/reader-conditional","clojure.core/reader-conditional?","clojure.core/realized?","clojure.core/record?","clojure.core/reduce","clojure.core/reduce-kv","clojure.core/reduced","clojure.core/reduced?","clojure.core/reductions","clojure.core/ref","clojure.core/ref-history-count","clojure.core/ref-max-history","clojure.core/ref-min-history","clojure.core/ref-set","clojure.core/refer","clojure.core/release-pending-sends","clojure.core/rem","clojure.core/remove","clojure.core/remove-all-methods","clojure.core/remove-method","clojure.core/remove-ns","clojure.core/remove-tap","clojure.core/remove-watch","clojure.core/repeat","clojure.core/repeatedly","clojure.core/replace","clojure.core/replicate","clojure.core/require","clojure.core/requiring-resolve","clojure.core/reset!","clojure.core/reset-meta!","clojure.core/reset-vals!","clojure.core/resolve","clojure.core/rest","clojure.core/restart-agent","clojure.core/resultset-seq","clojure.core/reverse","clojure.core/reversible?","clojure.core/rseq","clojure.core/rsubseq","clojure.core/run!","clojure.core/satisfies?","clojure.core/second","clojure.core/select-keys","clojure.core/send","clojure.core/send-off","clojure.core/send-via","clojure.core/seq","clojure.core/seq?","clojure.core/seqable?","clojure.core/seque","clojure.core/sequence","clojure.core/sequential?","clojure.core/set","clojure.core/set-agent-send-executor!","clojure.core/set-agent-send-off-executor!","clojure.core/set-error-handler!","clojure.core/set-error-mode!","clojure.core/set-validator!","clojure.core/set?","clojure.core/short","clojure.core/short-array","clojure.core/shorts","clojure.core/shuffle","clojure.core/shutdown-agents","clojure.core/simple-ident?","clojure.core/simple-keyword?","clojure.core/simple-symbol?","clojure.core/slurp","clojure.core/some","clojure.core/some-fn","clojure.core/some?","clojure.core/sort","clojure.core/sort-by","clojure.core/sorted-map","clojure.core/sorted-map-by","clojure.core/sorted-set","clojure.core/sorted-set-by","clojure.core/sorted?","clojure.core/special-symbol?","clojure.core/spit","clojure.core/split-at","clojure.core/split-with","clojure.core/str","clojure.core/string?","clojure.core/struct","clojure.core/struct-map","clojure.core/subs","clojure.core/subseq","clojure.core/subvec","clojure.core/supers","clojure.core/swap!","clojure.core/swap-vals!","clojure.core/symbol","clojure.core/symbol?","clojure.core/tagged-literal","clojure.core/tagged-literal?","clojure.core/take","clojure.core/take-last","clojure.core/take-nth","clojure.core/take-while","clojure.core/tap>","clojure.core/test","clojure.core/the-ns","clojure.core/thread-bound?","clojure.core/to-array","clojure.core/to-array-2d","clojure.core/trampoline","clojure.core/transduce","clojure.core/transient","clojure.core/tree-seq","clojure.core/true?","clojure.core/type","clojure.core/unchecked-add","clojure.core/unchecked-add-int","clojure.core/unchecked-byte","clojure.core/unchecked-char","clojure.core/unchecked-dec","clojure.core/unchecked-dec-int","clojure.core/unchecked-divide-int","clojure.core/unchecked-double","clojure.core/unchecked-float","clojure.core/unchecked-inc","clojure.core/unchecked-inc-int","clojure.core/unchecked-int","clojure.core/unchecked-long","clojure.core/unchecked-multiply","clojure.core/unchecked-multiply-int","clojure.core/unchecked-negate","clojure.core/unchecked-negate-int","clojure.core/unchecked-remainder-int","clojure.core/unchecked-short","clojure.core/unchecked-subtract","clojure.core/unchecked-subtract-int","clojure.core/underive","clojure.core/unreduced","clojure.core/unsigned-bit-shift-right","clojure.core/update","clojure.core/update-in","clojure.core/update-proxy","clojure.core/uri?","clojure.core/use","clojure.core/uuid?","clojure.core/val","clojure.core/vals","clojure.core/var-get","clojure.core/var-set","clojure.core/var?","clojure.core/vary-meta","clojure.core/vec","clojure.core/vector","clojure.core/vector-of","clojure.core/vector?","clojure.core/volatile!","clojure.core/volatile?","clojure.core/vreset!","clojure.core/with-bindings*","clojure.core/with-meta","clojure.core/with-redefs-fn","clojure.core/xml-seq","clojure.core/zero?","clojure.core/zipmap","coll?","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","dedupe","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","doall","dorun","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extenders","extends?","false?","ffirst","file-seq","filter","filterv","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn?","fnext","fnil","force","format","frequencies","future-call","future-cancel","future-cancelled?","future-done?","future?","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","ifn?","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","long","long-array","longs","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy-call-with-super","proxy-mappings","proxy-name","push-thread-bindings","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","with-bindings*","with-meta","with-redefs-fn","xml-seq","zero?","zipmap"]
-    \ , 'clojureMacro': ["->","->>","..","amap","and","areduce","as->","assert","binding","bound-fn","clojure.core/->","clojure.core/->>","clojure.core/..","clojure.core/amap","clojure.core/and","clojure.core/areduce","clojure.core/as->","clojure.core/assert","clojure.core/binding","clojure.core/bound-fn","clojure.core/comment","clojure.core/declare","clojure.core/delay","clojure.core/dosync","clojure.core/doto","clojure.core/extend-protocol","clojure.core/extend-type","clojure.core/for","clojure.core/future","clojure.core/gen-class","clojure.core/gen-interface","clojure.core/import","clojure.core/io!","clojure.core/lazy-cat","clojure.core/lazy-seq","clojure.core/letfn","clojure.core/locking","clojure.core/memfn","clojure.core/ns","clojure.core/or","clojure.core/proxy","clojure.core/proxy-super","clojure.core/pvalues","clojure.core/refer-clojure","clojure.core/reify","clojure.core/some->","clojure.core/some->>","clojure.core/sync","clojure.core/time","clojure.core/vswap!","clojure.core/with-bindings","clojure.core/with-in-str","clojure.core/with-loading-context","clojure.core/with-local-vars","clojure.core/with-open","clojure.core/with-out-str","clojure.core/with-precision","clojure.core/with-redefs","comment","declare","delay","dosync","doto","extend-protocol","extend-type","for","future","gen-class","gen-interface","import","io!","lazy-cat","lazy-seq","letfn","locking","memfn","ns","or","proxy","proxy-super","pvalues","refer-clojure","reify","some->","some->>","sync","time","vswap!","with-bindings","with-in-str","with-loading-context","with-local-vars","with-open","with-out-str","with-precision","with-redefs"]
-    \ , 'clojureRepeat': ["clojure.core/doseq","clojure.core/dotimes","clojure.core/while","doseq","dotimes","while"]
-    \ , 'clojureSpecial': [".","clojure.core/fn","clojure.core/let","clojure.core/loop","def","do","fn","if","let","loop","monitor-enter","monitor-exit","new","quote","recur","set!","var"]
-    \ , 'clojureVariable': ["*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","EMPTY-NODE","Inst","char-escape-string","char-name-string","clojure.core/*1","clojure.core/*2","clojure.core/*3","clojure.core/*agent*","clojure.core/*allow-unresolved-vars*","clojure.core/*assert*","clojure.core/*clojure-version*","clojure.core/*command-line-args*","clojure.core/*compile-files*","clojure.core/*compile-path*","clojure.core/*compiler-options*","clojure.core/*data-readers*","clojure.core/*default-data-reader-fn*","clojure.core/*e","clojure.core/*err*","clojure.core/*file*","clojure.core/*flush-on-newline*","clojure.core/*fn-loader*","clojure.core/*in*","clojure.core/*math-context*","clojure.core/*ns*","clojure.core/*out*","clojure.core/*print-dup*","clojure.core/*print-length*","clojure.core/*print-level*","clojure.core/*print-meta*","clojure.core/*print-namespace-maps*","clojure.core/*print-readably*","clojure.core/*read-eval*","clojure.core/*reader-resolver*","clojure.core/*source-path*","clojure.core/*suppress-read*","clojure.core/*unchecked-math*","clojure.core/*use-context-classloader*","clojure.core/*verbose-defrecords*","clojure.core/*warn-on-reflection*","clojure.core/EMPTY-NODE","clojure.core/Inst","clojure.core/char-escape-string","clojure.core/char-name-string","clojure.core/default-data-readers","clojure.core/primitives-classnames","clojure.core/unquote","clojure.core/unquote-splicing","default-data-readers","primitives-classnames","unquote","unquote-splicing"]
-    \ }
+	\ 'clojureBoolean': ["false","true"],
+	\ 'clojureCond': ["case","case*","clojure.core/case","clojure.core/cond","clojure.core/cond->","clojure.core/cond->>","clojure.core/condp","clojure.core/if-let","clojure.core/if-not","clojure.core/if-some","clojure.core/when","clojure.core/when-first","clojure.core/when-let","clojure.core/when-not","clojure.core/when-some","cond","cond->","cond->>","condp","if","if-let","if-not","if-some","when","when-first","when-let","when-not","when-some"],
+	\ 'clojureConstant': ["nil"],
+	\ 'clojureDefine': ["clojure.core/definline","clojure.core/definterface","clojure.core/defmacro","clojure.core/defmethod","clojure.core/defmulti","clojure.core/defn","clojure.core/defn-","clojure.core/defonce","clojure.core/defprotocol","clojure.core/defrecord","clojure.core/defstruct","clojure.core/deftype","def","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","deftype*"],
+	\ 'clojureException': ["catch","finally","throw","try"],
+	\ 'clojureFunc': ["*","*'","+","+'","-","-'","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods","/","<","<=","=","==",">",">=","PrintWriter-on","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","ancestors","any?","apply","array-map","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","cast","cat","char","char-array","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","clojure.core/*","clojure.core/*'","clojure.core/+","clojure.core/+'","clojure.core/-","clojure.core/-'","clojure.core/->ArrayChunk","clojure.core/->Eduction","clojure.core/->Vec","clojure.core/->VecNode","clojure.core/->VecSeq","clojure.core/-cache-protocol-fn","clojure.core/-reset-methods","clojure.core//","clojure.core/<","clojure.core/<=","clojure.core/=","clojure.core/==","clojure.core/>","clojure.core/>=","clojure.core/PrintWriter-on","clojure.core/StackTraceElement->vec","clojure.core/Throwable->map","clojure.core/accessor","clojure.core/aclone","clojure.core/add-classpath","clojure.core/add-tap","clojure.core/add-watch","clojure.core/agent","clojure.core/agent-error","clojure.core/agent-errors","clojure.core/aget","clojure.core/alength","clojure.core/alias","clojure.core/all-ns","clojure.core/alter","clojure.core/alter-meta!","clojure.core/alter-var-root","clojure.core/ancestors","clojure.core/any?","clojure.core/apply","clojure.core/array-map","clojure.core/aset","clojure.core/aset-boolean","clojure.core/aset-byte","clojure.core/aset-char","clojure.core/aset-double","clojure.core/aset-float","clojure.core/aset-int","clojure.core/aset-long","clojure.core/aset-short","clojure.core/assoc","clojure.core/assoc!","clojure.core/assoc-in","clojure.core/associative?","clojure.core/atom","clojure.core/await","clojure.core/await-for","clojure.core/await1","clojure.core/bases","clojure.core/bean","clojure.core/bigdec","clojure.core/bigint","clojure.core/biginteger","clojure.core/bit-and","clojure.core/bit-and-not","clojure.core/bit-clear","clojure.core/bit-flip","clojure.core/bit-not","clojure.core/bit-or","clojure.core/bit-set","clojure.core/bit-shift-left","clojure.core/bit-shift-right","clojure.core/bit-test","clojure.core/bit-xor","clojure.core/boolean","clojure.core/boolean-array","clojure.core/boolean?","clojure.core/booleans","clojure.core/bound-fn*","clojure.core/bound?","clojure.core/bounded-count","clojure.core/butlast","clojure.core/byte","clojure.core/byte-array","clojure.core/bytes","clojure.core/bytes?","clojure.core/cast","clojure.core/cat","clojure.core/char","clojure.core/char-array","clojure.core/char?","clojure.core/chars","clojure.core/chunk","clojure.core/chunk-append","clojure.core/chunk-buffer","clojure.core/chunk-cons","clojure.core/chunk-first","clojure.core/chunk-next","clojure.core/chunk-rest","clojure.core/chunked-seq?","clojure.core/class","clojure.core/class?","clojure.core/clear-agent-errors","clojure.core/clojure-version","clojure.core/coll?","clojure.core/commute","clojure.core/comp","clojure.core/comparator","clojure.core/compare","clojure.core/compare-and-set!","clojure.core/compile","clojure.core/complement","clojure.core/completing","clojure.core/concat","clojure.core/conj","clojure.core/conj!","clojure.core/cons","clojure.core/constantly","clojure.core/construct-proxy","clojure.core/contains?","clojure.core/count","clojure.core/counted?","clojure.core/create-ns","clojure.core/create-struct","clojure.core/cycle","clojure.core/dec","clojure.core/dec'","clojure.core/decimal?","clojure.core/dedupe","clojure.core/delay?","clojure.core/deliver","clojure.core/denominator","clojure.core/deref","clojure.core/derive","clojure.core/descendants","clojure.core/destructure","clojure.core/disj","clojure.core/disj!","clojure.core/dissoc","clojure.core/dissoc!","clojure.core/distinct","clojure.core/distinct?","clojure.core/doall","clojure.core/dorun","clojure.core/double","clojure.core/double-array","clojure.core/double?","clojure.core/doubles","clojure.core/drop","clojure.core/drop-last","clojure.core/drop-while","clojure.core/eduction","clojure.core/empty","clojure.core/empty?","clojure.core/ensure","clojure.core/ensure-reduced","clojure.core/enumeration-seq","clojure.core/error-handler","clojure.core/error-mode","clojure.core/eval","clojure.core/even?","clojure.core/every-pred","clojure.core/every?","clojure.core/ex-cause","clojure.core/ex-data","clojure.core/ex-info","clojure.core/ex-message","clojure.core/extend","clojure.core/extenders","clojure.core/extends?","clojure.core/false?","clojure.core/ffirst","clojure.core/file-seq","clojure.core/filter","clojure.core/filterv","clojure.core/find","clojure.core/find-keyword","clojure.core/find-ns","clojure.core/find-protocol-impl","clojure.core/find-protocol-method","clojure.core/find-var","clojure.core/first","clojure.core/flatten","clojure.core/float","clojure.core/float-array","clojure.core/float?","clojure.core/floats","clojure.core/flush","clojure.core/fn?","clojure.core/fnext","clojure.core/fnil","clojure.core/force","clojure.core/format","clojure.core/frequencies","clojure.core/future-call","clojure.core/future-cancel","clojure.core/future-cancelled?","clojure.core/future-done?","clojure.core/future?","clojure.core/gensym","clojure.core/get","clojure.core/get-in","clojure.core/get-method","clojure.core/get-proxy-class","clojure.core/get-thread-bindings","clojure.core/get-validator","clojure.core/group-by","clojure.core/halt-when","clojure.core/hash","clojure.core/hash-combine","clojure.core/hash-map","clojure.core/hash-ordered-coll","clojure.core/hash-set","clojure.core/hash-unordered-coll","clojure.core/ident?","clojure.core/identical?","clojure.core/identity","clojure.core/ifn?","clojure.core/in-ns","clojure.core/inc","clojure.core/inc'","clojure.core/indexed?","clojure.core/init-proxy","clojure.core/inst-ms","clojure.core/inst-ms*","clojure.core/inst?","clojure.core/instance?","clojure.core/int","clojure.core/int-array","clojure.core/int?","clojure.core/integer?","clojure.core/interleave","clojure.core/intern","clojure.core/interpose","clojure.core/into","clojure.core/into-array","clojure.core/ints","clojure.core/isa?","clojure.core/iterate","clojure.core/iterator-seq","clojure.core/juxt","clojure.core/keep","clojure.core/keep-indexed","clojure.core/key","clojure.core/keys","clojure.core/keyword","clojure.core/keyword?","clojure.core/last","clojure.core/line-seq","clojure.core/list","clojure.core/list*","clojure.core/list?","clojure.core/load","clojure.core/load-file","clojure.core/load-reader","clojure.core/load-string","clojure.core/loaded-libs","clojure.core/long","clojure.core/long-array","clojure.core/longs","clojure.core/macroexpand","clojure.core/macroexpand-1","clojure.core/make-array","clojure.core/make-hierarchy","clojure.core/map","clojure.core/map-entry?","clojure.core/map-indexed","clojure.core/map?","clojure.core/mapcat","clojure.core/mapv","clojure.core/max","clojure.core/max-key","clojure.core/memoize","clojure.core/merge","clojure.core/merge-with","clojure.core/meta","clojure.core/method-sig","clojure.core/methods","clojure.core/min","clojure.core/min-key","clojure.core/mix-collection-hash","clojure.core/mod","clojure.core/munge","clojure.core/name","clojure.core/namespace","clojure.core/namespace-munge","clojure.core/nat-int?","clojure.core/neg-int?","clojure.core/neg?","clojure.core/newline","clojure.core/next","clojure.core/nfirst","clojure.core/nil?","clojure.core/nnext","clojure.core/not","clojure.core/not-any?","clojure.core/not-empty","clojure.core/not-every?","clojure.core/not=","clojure.core/ns-aliases","clojure.core/ns-imports","clojure.core/ns-interns","clojure.core/ns-map","clojure.core/ns-name","clojure.core/ns-publics","clojure.core/ns-refers","clojure.core/ns-resolve","clojure.core/ns-unalias","clojure.core/ns-unmap","clojure.core/nth","clojure.core/nthnext","clojure.core/nthrest","clojure.core/num","clojure.core/number?","clojure.core/numerator","clojure.core/object-array","clojure.core/odd?","clojure.core/parents","clojure.core/partial","clojure.core/partition","clojure.core/partition-all","clojure.core/partition-by","clojure.core/pcalls","clojure.core/peek","clojure.core/persistent!","clojure.core/pmap","clojure.core/pop","clojure.core/pop!","clojure.core/pop-thread-bindings","clojure.core/pos-int?","clojure.core/pos?","clojure.core/pr","clojure.core/pr-str","clojure.core/prefer-method","clojure.core/prefers","clojure.core/print","clojure.core/print-ctor","clojure.core/print-dup","clojure.core/print-method","clojure.core/print-simple","clojure.core/print-str","clojure.core/printf","clojure.core/println","clojure.core/println-str","clojure.core/prn","clojure.core/prn-str","clojure.core/promise","clojure.core/proxy-call-with-super","clojure.core/proxy-mappings","clojure.core/proxy-name","clojure.core/push-thread-bindings","clojure.core/qualified-ident?","clojure.core/qualified-keyword?","clojure.core/qualified-symbol?","clojure.core/quot","clojure.core/rand","clojure.core/rand-int","clojure.core/rand-nth","clojure.core/random-sample","clojure.core/range","clojure.core/ratio?","clojure.core/rational?","clojure.core/rationalize","clojure.core/re-find","clojure.core/re-groups","clojure.core/re-matcher","clojure.core/re-matches","clojure.core/re-pattern","clojure.core/re-seq","clojure.core/read","clojure.core/read+string","clojure.core/read-line","clojure.core/read-string","clojure.core/reader-conditional","clojure.core/reader-conditional?","clojure.core/realized?","clojure.core/record?","clojure.core/reduce","clojure.core/reduce-kv","clojure.core/reduced","clojure.core/reduced?","clojure.core/reductions","clojure.core/ref","clojure.core/ref-history-count","clojure.core/ref-max-history","clojure.core/ref-min-history","clojure.core/ref-set","clojure.core/refer","clojure.core/release-pending-sends","clojure.core/rem","clojure.core/remove","clojure.core/remove-all-methods","clojure.core/remove-method","clojure.core/remove-ns","clojure.core/remove-tap","clojure.core/remove-watch","clojure.core/repeat","clojure.core/repeatedly","clojure.core/replace","clojure.core/replicate","clojure.core/require","clojure.core/requiring-resolve","clojure.core/reset!","clojure.core/reset-meta!","clojure.core/reset-vals!","clojure.core/resolve","clojure.core/rest","clojure.core/restart-agent","clojure.core/resultset-seq","clojure.core/reverse","clojure.core/reversible?","clojure.core/rseq","clojure.core/rsubseq","clojure.core/run!","clojure.core/satisfies?","clojure.core/second","clojure.core/select-keys","clojure.core/send","clojure.core/send-off","clojure.core/send-via","clojure.core/seq","clojure.core/seq?","clojure.core/seqable?","clojure.core/seque","clojure.core/sequence","clojure.core/sequential?","clojure.core/set","clojure.core/set-agent-send-executor!","clojure.core/set-agent-send-off-executor!","clojure.core/set-error-handler!","clojure.core/set-error-mode!","clojure.core/set-validator!","clojure.core/set?","clojure.core/short","clojure.core/short-array","clojure.core/shorts","clojure.core/shuffle","clojure.core/shutdown-agents","clojure.core/simple-ident?","clojure.core/simple-keyword?","clojure.core/simple-symbol?","clojure.core/slurp","clojure.core/some","clojure.core/some-fn","clojure.core/some?","clojure.core/sort","clojure.core/sort-by","clojure.core/sorted-map","clojure.core/sorted-map-by","clojure.core/sorted-set","clojure.core/sorted-set-by","clojure.core/sorted?","clojure.core/special-symbol?","clojure.core/spit","clojure.core/split-at","clojure.core/split-with","clojure.core/str","clojure.core/string?","clojure.core/struct","clojure.core/struct-map","clojure.core/subs","clojure.core/subseq","clojure.core/subvec","clojure.core/supers","clojure.core/swap!","clojure.core/swap-vals!","clojure.core/symbol","clojure.core/symbol?","clojure.core/tagged-literal","clojure.core/tagged-literal?","clojure.core/take","clojure.core/take-last","clojure.core/take-nth","clojure.core/take-while","clojure.core/tap>","clojure.core/test","clojure.core/the-ns","clojure.core/thread-bound?","clojure.core/to-array","clojure.core/to-array-2d","clojure.core/trampoline","clojure.core/transduce","clojure.core/transient","clojure.core/tree-seq","clojure.core/true?","clojure.core/type","clojure.core/unchecked-add","clojure.core/unchecked-add-int","clojure.core/unchecked-byte","clojure.core/unchecked-char","clojure.core/unchecked-dec","clojure.core/unchecked-dec-int","clojure.core/unchecked-divide-int","clojure.core/unchecked-double","clojure.core/unchecked-float","clojure.core/unchecked-inc","clojure.core/unchecked-inc-int","clojure.core/unchecked-int","clojure.core/unchecked-long","clojure.core/unchecked-multiply","clojure.core/unchecked-multiply-int","clojure.core/unchecked-negate","clojure.core/unchecked-negate-int","clojure.core/unchecked-remainder-int","clojure.core/unchecked-short","clojure.core/unchecked-subtract","clojure.core/unchecked-subtract-int","clojure.core/underive","clojure.core/unreduced","clojure.core/unsigned-bit-shift-right","clojure.core/update","clojure.core/update-in","clojure.core/update-proxy","clojure.core/uri?","clojure.core/use","clojure.core/uuid?","clojure.core/val","clojure.core/vals","clojure.core/var-get","clojure.core/var-set","clojure.core/var?","clojure.core/vary-meta","clojure.core/vec","clojure.core/vector","clojure.core/vector-of","clojure.core/vector?","clojure.core/volatile!","clojure.core/volatile?","clojure.core/vreset!","clojure.core/with-bindings*","clojure.core/with-meta","clojure.core/with-redefs-fn","clojure.core/xml-seq","clojure.core/zero?","clojure.core/zipmap","coll?","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","dedupe","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","doall","dorun","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extenders","extends?","false?","ffirst","file-seq","filter","filterv","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn?","fnext","fnil","force","format","frequencies","future-call","future-cancel","future-cancelled?","future-done?","future?","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","ifn?","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","long","long-array","longs","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy-call-with-super","proxy-mappings","proxy-name","push-thread-bindings","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","with-bindings*","with-meta","with-redefs-fn","xml-seq","zero?","zipmap"],
+	\ 'clojureMacro': ["->","->>","..","amap","and","areduce","as->","assert","binding","bound-fn","clojure.core/->","clojure.core/->>","clojure.core/..","clojure.core/amap","clojure.core/and","clojure.core/areduce","clojure.core/as->","clojure.core/assert","clojure.core/binding","clojure.core/bound-fn","clojure.core/comment","clojure.core/declare","clojure.core/delay","clojure.core/dosync","clojure.core/doto","clojure.core/extend-protocol","clojure.core/extend-type","clojure.core/for","clojure.core/future","clojure.core/gen-class","clojure.core/gen-interface","clojure.core/import","clojure.core/io!","clojure.core/lazy-cat","clojure.core/lazy-seq","clojure.core/locking","clojure.core/memfn","clojure.core/ns","clojure.core/or","clojure.core/proxy","clojure.core/proxy-super","clojure.core/pvalues","clojure.core/refer-clojure","clojure.core/reify","clojure.core/some->","clojure.core/some->>","clojure.core/sync","clojure.core/time","clojure.core/vswap!","clojure.core/with-bindings","clojure.core/with-in-str","clojure.core/with-loading-context","clojure.core/with-local-vars","clojure.core/with-open","clojure.core/with-out-str","clojure.core/with-precision","clojure.core/with-redefs","comment","declare","delay","dosync","doto","extend-protocol","extend-type","for","future","gen-class","gen-interface","import","io!","lazy-cat","lazy-seq","locking","memfn","ns","or","proxy","proxy-super","pvalues","refer-clojure","reify","some->","some->>","sync","time","vswap!","with-bindings","with-in-str","with-loading-context","with-local-vars","with-open","with-out-str","with-precision","with-redefs"],
+	\ 'clojureRepeat': ["clojure.core/doseq","clojure.core/dotimes","clojure.core/loop","clojure.core/while","doseq","dotimes","loop","loop*","recur","while"],
+	\ 'clojureSpecial': ["&",".","clojure.core/fn","clojure.core/import*","clojure.core/let","clojure.core/letfn","do","fn","fn*","let","let*","letfn","letfn*","monitor-enter","monitor-exit","new","quote","reify*","set!","var"],
+	\ 'clojureVariable': ["*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","EMPTY-NODE","Inst","char-escape-string","char-name-string","clojure.core/*1","clojure.core/*2","clojure.core/*3","clojure.core/*agent*","clojure.core/*allow-unresolved-vars*","clojure.core/*assert*","clojure.core/*clojure-version*","clojure.core/*command-line-args*","clojure.core/*compile-files*","clojure.core/*compile-path*","clojure.core/*compiler-options*","clojure.core/*data-readers*","clojure.core/*default-data-reader-fn*","clojure.core/*e","clojure.core/*err*","clojure.core/*file*","clojure.core/*flush-on-newline*","clojure.core/*fn-loader*","clojure.core/*in*","clojure.core/*math-context*","clojure.core/*ns*","clojure.core/*out*","clojure.core/*print-dup*","clojure.core/*print-length*","clojure.core/*print-level*","clojure.core/*print-meta*","clojure.core/*print-namespace-maps*","clojure.core/*print-readably*","clojure.core/*read-eval*","clojure.core/*reader-resolver*","clojure.core/*source-path*","clojure.core/*suppress-read*","clojure.core/*unchecked-math*","clojure.core/*use-context-classloader*","clojure.core/*verbose-defrecords*","clojure.core/*warn-on-reflection*","clojure.core/EMPTY-NODE","clojure.core/Inst","clojure.core/char-escape-string","clojure.core/char-name-string","clojure.core/default-data-readers","clojure.core/primitives-classnames","clojure.core/print-dup","clojure.core/print-method","clojure.core/unquote","clojure.core/unquote-splicing","default-data-readers","primitives-classnames","print-dup","print-method","unquote","unquote-splicing"]
+	\ }
 
 function! s:syntax_keyword(dict)
 	for key in keys(a:dict)
@@ -85,8 +85,6 @@ syntax match clojureSymbol "\v%([a-zA-Z!$&*_+=|<.>?-]|[^\x00-\x7F])+%(:?%([a-zA-
 " NB. Correct matching of radix literals was removed for better performance.
 syntax match clojureNumber "\v<[-+]?%(%([2-9]|[12]\d|3[0-6])[rR][[:alnum:]]+|%(0\o*|0x\x+|[1-9]\d*)N?|%(0|[1-9]\d*|%(0|[1-9]\d*)\.\d*)%(M|[eE][-+]?\d+)?|%(0|[1-9]\d*)/%(0|[1-9]\d*))>"
 
-syntax match clojureVarArg "&"
-
 syntax match clojureQuote "\v['`]"
 syntax match clojureUnquote "\v\~\@?"
 syntax match clojureMeta "\^"
@@ -102,7 +100,7 @@ syntax region clojureRegexpQuote  start=/\\Q/       skip=/\\\\\|\\"/ end=/\\E/
 
 " -*- CHARACTER PROPERTY CLASSES -*-
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-" Java version 17
+" Java version 17.0.2
 syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Cntrl|A%(l%(pha|num)|SCII)|Space|Graph|Upper|P%(rint|unct)|Blank|XDigit|Digit|Lower)\}" contained display
 syntax match clojureRegexpJavaCharClass "\v\\[pP]\{java%(Whitespace|JavaIdentifier%(Part|Start)|SpaceChar|Mirrored|TitleCase|I%(SOControl|de%(ographic|ntifierIgnorable))|D%(efined|igit)|U%(pperCase|nicodeIdentifier%(Part|Start))|L%(etter%(OrDigit)?|owerCase)|Alphabetic)\}" contained display
 syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\cIs%(l%(owercase|etter)|hex%(digit|_digit)|w%(hite%(_space|space)|ord)|noncharacter%(_code_point|codepoint)|p%(rint|unctuation)|ideographic|graph|a%(l%(num|phabetic)|ssigned)|uppercase|join%(control|_control)|titlecase|blank|digit|control)\}" contained display
@@ -131,7 +129,7 @@ syntax match clojureRegexpMod "\v\(@<=\?%(\<?[=!]|\>)" contained display
 syntax match clojureRegexpMod "\v\(@<=\?\<[[:alpha:]]+\>" contained display
 
 syntax region clojureRegexpGroup start="(" skip=/\\\\\|\\)/ end=")" matchgroup=clojureRegexpGroup contained contains=clojureRegexpMod,clojureRegexpQuantifier,clojureRegexpBoundary,clojureRegexpEscape,@clojureRegexpCharClasses
-syntax region clojureRegexp start=/\#"/ skip=/\\\\\|\\"/ end=/"/ contains=@clojureRegexpCharClasses,clojureRegexpEscape,clojureRegexpQuote,clojureRegexpBoundary,clojureRegexpQuantifier,clojureRegexpOr,clojureRegexpBackRef,clojureRegexpGroup keepend
+syntax region clojureRegexp matchgroup=clojureRegexpDelimiter start=/\#"/ skip=/\\\\\|\\"/ end=/"/ contains=@clojureRegexpCharClasses,clojureRegexpEscape,clojureRegexpQuote,clojureRegexpBoundary,clojureRegexpQuantifier,clojureRegexpOr,clojureRegexpBackRef,clojureRegexpGroup keepend
 
 syntax keyword clojureCommentTodo contained FIXME XXX TODO BUG NOTE HACK FIXME: XXX: TODO: BUG: NOTE: HACK:
 
@@ -154,7 +152,7 @@ endif
 
 " -*- TOP CLUSTER -*-
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-syntax cluster clojureTop contains=@Spell,clojureAnonArg,clojureBoolean,clojureCharacter,clojureComment,clojureCond,clojureConstant,clojureDefine,clojureDeref,clojureDiscard,clojureDispatch,clojureError,clojureException,clojureFunc,clojureKeyword,clojureMacro,clojureMap,clojureMeta,clojureNumber,clojureQuote,clojureRegexp,clojureRepeat,clojureSexp,clojureSpecial,clojureString,clojureSymbol,clojureUnquote,clojureVarArg,clojureVariable,clojureVector
+syntax cluster clojureTop contains=@Spell,clojureAnonArg,clojureBoolean,clojureCharacter,clojureComment,clojureCond,clojureConstant,clojureDefine,clojureDeref,clojureDiscard,clojureDispatch,clojureError,clojureException,clojureFunc,clojureKeyword,clojureMacro,clojureMap,clojureMeta,clojureNumber,clojureQuote,clojureRegexp,clojureRepeat,clojureSexp,clojureSpecial,clojureString,clojureSymbol,clojureUnquote,clojureVariable,clojureVector
 
 syntax region clojureSexp   matchgroup=clojureParen start="("  end=")" contains=@clojureTop fold
 syntax region clojureVector matchgroup=clojureParen start="\[" end="]" contains=@clojureTop fold
@@ -175,6 +173,7 @@ highlight default link clojureStringDelimiter           String
 highlight default link clojureStringEscape              Character
 
 highlight default link clojureRegexp                    Constant
+highlight default link clojureRegexpDelimiter           Constant
 highlight default link clojureRegexpEscape              Character
 highlight default link clojureRegexpCharClass           SpecialChar
 highlight default link clojureRegexpPosixCharClass      clojureRegexpCharClass
@@ -199,7 +198,6 @@ highlight default link clojureMacro                     Macro
 highlight default link clojureRepeat                    Repeat
 
 highlight default link clojureSpecial                   Special
-highlight default link clojureVarArg                    Special
 highlight default link clojureQuote                     SpecialChar
 highlight default link clojureUnquote                   SpecialChar
 highlight default link clojureMeta                      SpecialChar
diff --git a/syntax/crystal.vim b/syntax/crystal.vim
index ea862acd9..ebac0b235 100644
--- a/syntax/crystal.vim
+++ b/syntax/crystal.vim
@@ -380,13 +380,14 @@ syn cluster crystalMacroGroup add=crystalMacroKeyword
 " Comments and Documentation
 syn match   crystalSharpBang "\%^#!.*" display
 syn keyword crystalTodo      FIXME NOTE TODO OPTIMIZE XXX todo contained
+syn match   crystalCommentDirective ":\%(nodoc\|nodoc\|inherit\):" contained
 
 if exists('g:main_syntax') && g:main_syntax ==# 'ecrystal'
   " eCrystal tags can contain Crystal comments, so we need to modify the
   " pattern for comments so that it does not consume delimiters
-  syn match crystalComment "#.*\ze\%($\|-\=%>\)" contains=crystalSharpBang,crystalSpaceError,crystalTodo,@Spell
+  syn match crystalComment "#.*\ze\%($\|-\=%>\)" contains=crystalSharpBang,crystalSpaceError,crystalTodo,crystalCommentDirective,@Spell
 else
-  syn match crystalComment "#.*" contains=crystalSharpBang,crystalSpaceError,crystalTodo,@Spell
+  syn match crystalComment "#.*" contains=crystalSharpBang,crystalSpaceError,crystalTodo,crystalCommentDirective,@Spell
 endif
 
 SynFold '#' syn region crystalMultilineComment start="\%(\%(^\s*#.*\n\)\@<!\%(^\s*#.*\n\)\)\%(\(^\s*#.*\n\)\{1,}\)\@=" end="\%(^\s*#.*\n\)\@<=\%(^\s*#.*\n\)\%(^\s*#\)\@!" contains=crystalComment transparent keepend
@@ -456,6 +457,7 @@ hi def link crystalPseudoVariable       Constant
 hi def link crystalCharLiteral          Character
 hi def link crystalComment              Comment
 hi def link crystalTodo                 Todo
+hi def link crystalCommentDirective     SpecialComment
 hi def link crystalStringEscape         Special
 hi def link crystalInterpolationDelim   Delimiter
 hi def link crystalNoInterpolation      crystalString
diff --git a/syntax/eelixir.vim b/syntax/eelixir.vim
index 8fbe92a77..0b8669bf3 100644
--- a/syntax/eelixir.vim
+++ b/syntax/eelixir.vim
@@ -63,6 +63,8 @@ syn cluster eelixirRegions contains=eelixirBlock,surfaceExpression,eelixirExpres
 exe 'syn region  eelixirExpression matchgroup=eelixirDelimiter start="<%"  end="%\@<!%>" contains=@elixirTop  containedin=ALLBUT,@eelixirRegions keepend'
 exe 'syn region  eelixirExpression matchgroup=eelixirDelimiter start="<%=" end="%\@<!%>" contains=@elixirTop  containedin=ALLBUT,@eelixirRegions keepend'
 exe 'syn region  surfaceExpression matchgroup=surfaceDelimiter start="{{" end="}}" contains=@elixirTop  containedin=ALLBUT,@eelixirRegions keepend'
+exe 'syn region  surfaceExpression matchgroup=surfaceDelimiter start="{" end="}" contains=@elixirTop  containedin=ALLBUT,@eelixirRegions keepend'
+exe 'syn region  surfaceExpression matchgroup=surfaceDelimiter start="{" end="}" skip="#{[^}]*}" contains=@elixirTop  containedin=htmlValue keepend'
 exe 'syn region  eelixirQuote      matchgroup=eelixirDelimiter start="<%%" end="%\@<!%>" contains=@elixirTop  containedin=ALLBUT,@eelixirRegions keepend'
 exe 'syn region  eelixirComment    matchgroup=eelixirDelimiter start="<%#" end="%\@<!%>" contains=elixirTodo,@Spell containedin=ALLBUT,@eelixirRegions keepend'
 
diff --git a/syntax/glsl.vim b/syntax/glsl.vim
index 34230a914..658331685 100644
--- a/syntax/glsl.vim
+++ b/syntax/glsl.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'glsl', 'syntax/glsl.vim')
 endif
 
 " Language: OpenGL Shading Language
-" Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
+" Maintainer: Sergii Tykhomyrov <sergii@tykhomyrov.net>
 
 if exists("b:current_syntax") && b:current_syntax == "glsl"
   finish
@@ -51,6 +51,7 @@ syn keyword glslStructure struct nextgroup=glslIdentifier skipwhite skipempty
 syn match glslIdentifier contains=glslIdentifierPrime "\%([a-zA-Z_]\)\%([a-zA-Z0-9_]\)*" display contained
 
 " Types
+syn keyword glslType accelerationStructureEXT
 syn keyword glslType atomic_uint
 syn keyword glslType bool
 syn keyword glslType bvec2
@@ -122,6 +123,7 @@ syn keyword glslType mat4
 syn keyword glslType mat4x2
 syn keyword glslType mat4x3
 syn keyword glslType mat4x4
+syn keyword glslType rayQueryEXT
 syn keyword glslType sampler1D
 syn keyword glslType sampler1DArray
 syn keyword glslType sampler1DArrayShadow
@@ -176,6 +178,8 @@ syn keyword glslQualifier align
 syn keyword glslQualifier attribute
 syn keyword glslQualifier binding
 syn keyword glslQualifier buffer
+syn keyword glslQualifier callableDataEXT
+syn keyword glslQualifier callableDataInEXT
 syn keyword glslQualifier ccw
 syn keyword glslQualifier centroid
 syn keyword glslQualifier centroid varying
@@ -193,6 +197,7 @@ syn keyword glslQualifier flat
 syn keyword glslQualifier fractional_even_spacing
 syn keyword glslQualifier fractional_odd_spacing
 syn keyword glslQualifier highp
+syn keyword glslQualifier hitAttributeEXT
 syn keyword glslQualifier in
 syn keyword glslQualifier index
 syn keyword glslQualifier inout
@@ -210,6 +215,7 @@ syn keyword glslQualifier location
 syn keyword glslQualifier lowp
 syn keyword glslQualifier max_vertices
 syn keyword glslQualifier mediump
+syn keyword glslQualifier nonuniformEXT
 syn keyword glslQualifier noperspective
 syn keyword glslQualifier offset
 syn keyword glslQualifier origin_upper_left
@@ -235,6 +241,8 @@ syn keyword glslQualifier r8
 syn keyword glslQualifier r8_snorm
 syn keyword glslQualifier r8i
 syn keyword glslQualifier r8ui
+syn keyword glslQualifier rayPayloadEXT
+syn keyword glslQualifier rayPayloadInEXT
 syn keyword glslQualifier readonly
 syn keyword glslQualifier restrict
 syn keyword glslQualifier rg16
@@ -265,6 +273,7 @@ syn keyword glslQualifier rgba8i
 syn keyword glslQualifier rgba8ui
 syn keyword glslQualifier row_major
 syn keyword glslQualifier sample
+syn keyword glslQualifier shaderRecordEXT
 syn keyword glslQualifier shared
 syn keyword glslQualifier smooth
 syn keyword glslQualifier std140
@@ -279,11 +288,13 @@ syn keyword glslQualifier vertices
 syn keyword glslQualifier volatile
 syn keyword glslQualifier writeonly
 syn keyword glslQualifier xfb_buffer
-syn keyword glslQualifier xfb_stride
 syn keyword glslQualifier xfb_offset
+syn keyword glslQualifier xfb_stride
 
 " Built-in Constants
 syn keyword glslBuiltinConstant gl_CullDistance
+syn keyword glslBuiltinConstant gl_HitKindBackFacingTriangleEXT
+syn keyword glslBuiltinConstant gl_HitKindFrontFacingTriangleEXT
 syn keyword glslBuiltinConstant gl_MaxAtomicCounterBindings
 syn keyword glslBuiltinConstant gl_MaxAtomicCounterBufferSize
 syn keyword glslBuiltinConstant gl_MaxClipDistances
@@ -363,6 +374,20 @@ syn keyword glslBuiltinConstant gl_MaxVertexUniformComponents
 syn keyword glslBuiltinConstant gl_MaxVertexUniformVectors
 syn keyword glslBuiltinConstant gl_MaxViewports
 syn keyword glslBuiltinConstant gl_MinProgramTexelOffset
+syn keyword glslBuiltinConstant gl_RayFlagsCullBackFacingTrianglesEXT
+syn keyword glslBuiltinConstant gl_RayFlagsCullFrontFacingTrianglesEXT
+syn keyword glslBuiltinConstant gl_RayFlagsCullNoOpaqueEXT
+syn keyword glslBuiltinConstant gl_RayFlagsCullOpaqueEXT
+syn keyword glslBuiltinConstant gl_RayFlagsNoOpaqueEXT
+syn keyword glslBuiltinConstant gl_RayFlagsNoneEXT
+syn keyword glslBuiltinConstant gl_RayFlagsOpaqueEXT
+syn keyword glslBuiltinConstant gl_RayFlagsSkipClosestHitShaderEXT
+syn keyword glslBuiltinConstant gl_RayFlagsTerminateOnFirstHitEXT
+syn keyword glslBuiltinConstant gl_RayQueryCandidateIntersectionAABBEXT
+syn keyword glslBuiltinConstant gl_RayQueryCandidateIntersectionTriangleEXT
+syn keyword glslBuiltinConstant gl_RayQueryCommittedIntersectionGeneratedEXT
+syn keyword glslBuiltinConstant gl_RayQueryCommittedIntersectionNoneEXT
+syn keyword glslBuiltinConstant gl_RayQueryCommittedIntersectionTriangleEXT
 
 " Built-in Variables
 syn keyword glslBuiltinVariable gl_BackColor
@@ -393,10 +418,18 @@ syn keyword glslBuiltinVariable gl_FrontLightModelProduct
 syn keyword glslBuiltinVariable gl_FrontLightProduct
 syn keyword glslBuiltinVariable gl_FrontMaterial
 syn keyword glslBuiltinVariable gl_FrontSecondaryColor
+syn keyword glslBuiltinVariable gl_GeometryIndexEXT
 syn keyword glslBuiltinVariable gl_GlobalInvocationID
 syn keyword glslBuiltinVariable gl_HelperInvocation
+syn keyword glslBuiltinVariable gl_HitKindEXT
+syn keyword glslBuiltinVariable gl_HitTEXT
+syn keyword glslBuiltinVariable gl_IncomingRayFlagsEXT
+syn keyword glslBuiltinVariable gl_InstanceCustomIndexEXT
+syn keyword glslBuiltinVariable gl_InstanceID
 syn keyword glslBuiltinVariable gl_InstanceID
 syn keyword glslBuiltinVariable gl_InvocationID
+syn keyword glslBuiltinVariable gl_LaunchIDEXT
+syn keyword glslBuiltinVariable gl_LaunchSizeEXT
 syn keyword glslBuiltinVariable gl_Layer
 syn keyword glslBuiltinVariable gl_LightModel
 syn keyword glslBuiltinVariable gl_LightSource
@@ -427,17 +460,24 @@ syn keyword glslBuiltinVariable gl_ObjectPlaneQ
 syn keyword glslBuiltinVariable gl_ObjectPlaneR
 syn keyword glslBuiltinVariable gl_ObjectPlaneS
 syn keyword glslBuiltinVariable gl_ObjectPlaneT
+syn keyword glslBuiltinVariable gl_ObjectRayDirectionEXT
+syn keyword glslBuiltinVariable gl_ObjectRayOriginEXT
+syn keyword glslBuiltinVariable gl_ObjectToWorld3x4EXT
+syn keyword glslBuiltinVariable gl_ObjectToWorldEXT
 syn keyword glslBuiltinVariable gl_PatchVerticesIn
 syn keyword glslBuiltinVariable gl_Point
 syn keyword glslBuiltinVariable gl_PointCoord
 syn keyword glslBuiltinVariable gl_PointSize
 syn keyword glslBuiltinVariable gl_Position
 syn keyword glslBuiltinVariable gl_PrimitiveID
+syn keyword glslBuiltinVariable gl_PrimitiveID
 syn keyword glslBuiltinVariable gl_PrimitiveIDIn
 syn keyword glslBuiltinVariable gl_ProjectionMatrix
 syn keyword glslBuiltinVariable gl_ProjectionMatrixInverse
 syn keyword glslBuiltinVariable gl_ProjectionMatrixInverseTranspose
 syn keyword glslBuiltinVariable gl_ProjectionMatrixTranspose
+syn keyword glslBuiltinVariable gl_RayTmaxEXT
+syn keyword glslBuiltinVariable gl_RayTminEXT
 syn keyword glslBuiltinVariable gl_SampleID
 syn keyword glslBuiltinVariable gl_SampleMask
 syn keyword glslBuiltinVariable gl_SampleMaskIn
@@ -458,6 +498,10 @@ syn keyword glslBuiltinVariable gl_VertexIndex
 syn keyword glslBuiltinVariable gl_ViewportIndex
 syn keyword glslBuiltinVariable gl_WorkGroupID
 syn keyword glslBuiltinVariable gl_WorkGroupSize
+syn keyword glslBuiltinVariable gl_WorldRayDirectionEXT
+syn keyword glslBuiltinVariable gl_WorldRayOriginEXT
+syn keyword glslBuiltinVariable gl_WorldToObject3x4EXT
+syn keyword glslBuiltinVariable gl_WorldToObjectEXT
 syn keyword glslBuiltinVariable gl_in
 syn keyword glslBuiltinVariable gl_out
 
@@ -507,6 +551,7 @@ syn keyword glslBuiltinFunction determinant
 syn keyword glslBuiltinFunction distance
 syn keyword glslBuiltinFunction dot
 syn keyword glslBuiltinFunction equal
+syn keyword glslBuiltinFunction executeCallableEXT
 syn keyword glslBuiltinFunction exp
 syn keyword glslBuiltinFunction exp2
 syn keyword glslBuiltinFunction faceforward
@@ -525,6 +570,7 @@ syn keyword glslBuiltinFunction fwidthFine
 syn keyword glslBuiltinFunction greaterThan
 syn keyword glslBuiltinFunction greaterThanEqual
 syn keyword glslBuiltinFunction groupMemoryBarrier
+syn keyword glslBuiltinFunction ignoreIntersectionEXT
 syn keyword glslBuiltinFunction imageAtomicAdd
 syn keyword glslBuiltinFunction imageAtomicAnd
 syn keyword glslBuiltinFunction imageAtomicCompSwap
@@ -578,8 +624,32 @@ syn keyword glslBuiltinFunction packUnorm2x16
 syn keyword glslBuiltinFunction packUnorm4x8
 syn keyword glslBuiltinFunction pow
 syn keyword glslBuiltinFunction radians
+syn keyword glslBuiltinFunction rayQueryConfirmIntersectionEXT
+syn keyword glslBuiltinFunction rayQueryGenerateIntersectionEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionBarycentricsEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionCandidateAABBOpaqueEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionFrontFaceEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionGeometryIndexEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionInstanceCustomIndexEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionInstanceIdEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionInstanceShaderBindingTableRecordOffsetEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionObjectRayDirectionEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionObjectRayOriginEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionObjectToWorldEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionPrimitiveIndexEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionTEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionTypeEXT
+syn keyword glslBuiltinFunction rayQueryGetIntersectionWorldToObjectEXT
+syn keyword glslBuiltinFunction rayQueryGetRayFlagsEXT
+syn keyword glslBuiltinFunction rayQueryGetRayTMinEXT
+syn keyword glslBuiltinFunction rayQueryGetWorldRayDirectionEXT
+syn keyword glslBuiltinFunction rayQueryGetWorldRayOriginEXT
+syn keyword glslBuiltinFunction rayQueryInitializeEXT
+syn keyword glslBuiltinFunction rayQueryProceedEXT
+syn keyword glslBuiltinFunction rayQueryTerminateEXT
 syn keyword glslBuiltinFunction reflect
 syn keyword glslBuiltinFunction refract
+syn keyword glslBuiltinFunction reportIntersectionEXT
 syn keyword glslBuiltinFunction round
 syn keyword glslBuiltinFunction roundEven
 syn keyword glslBuiltinFunction shadow1D
@@ -598,6 +668,7 @@ syn keyword glslBuiltinFunction sqrt
 syn keyword glslBuiltinFunction step
 syn keyword glslBuiltinFunction tan
 syn keyword glslBuiltinFunction tanh
+syn keyword glslBuiltinFunction terminateRayEXT
 syn keyword glslBuiltinFunction texelFetch
 syn keyword glslBuiltinFunction texelFetchOffset
 syn keyword glslBuiltinFunction texture
@@ -632,6 +703,7 @@ syn keyword glslBuiltinFunction textureProjOffset
 syn keyword glslBuiltinFunction textureQueryLevels
 syn keyword glslBuiltinFunction textureQueryLod
 syn keyword glslBuiltinFunction textureSize
+syn keyword glslBuiltinFunction traceRayEXT
 syn keyword glslBuiltinFunction transpose
 syn keyword glslBuiltinFunction trunc
 syn keyword glslBuiltinFunction uaddCarry
diff --git a/syntax/go.vim b/syntax/go.vim
index c4861715a..19763ee0b 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -38,7 +38,7 @@ hi def link     goLabel             Label
 hi def link     goRepeat            Repeat
 
 " Predefined types
-syn keyword     goType              chan map bool string error
+syn keyword     goType              chan map bool string error any comparable
 syn keyword     goSignedInts        int int8 int16 int32 int64 rune
 syn keyword     goUnsignedInts      byte uint uint8 uint16 uint32 uint64 uintptr
 syn keyword     goFloats            float32 float64
diff --git a/syntax/julia.vim b/syntax/julia.vim
index bafae9b43..3d02d5ed5 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -44,7 +44,7 @@ let s:julia_highlight_operators = get(g:, "julia_highlight_operators", 1)
 " because those may or may not be valid in the lookbehind on a case-by-case
 " basis.
 let s:nonid_chars = '\U00-\U08' . '\U0A-\U1F'
-      \           . '\U21-\U28' . '\U2A-\U2F' . '\U3A-\U40' . '\U5B-\U5E' . '\U60' . '\U7B\U7C'
+      \           . '\U21-\U28' . '\U2A-\U2F' . '\U3A-\U40' . '\U5B\U5C\U5E' . '\U60' . '\U7B\U7C'
       \           . '\U7E-\UA1' . '\UA7\UA8' . '\UAB-\UAD' . '\UAF\UB1\UB4' . '\UB6-\UB8' . '\UBB\UBF' . '\UD7\UF7'
 
 " The complete list
diff --git a/syntax/markdown.vim b/syntax/markdown.vim
index eeda03dae..2c4d7951a 100644
--- a/syntax/markdown.vim
+++ b/syntax/markdown.vim
@@ -11,7 +11,7 @@ endif
 
 
 " Read the HTML syntax to start with
-if version < 600
+if v:version < 600
   so <sfile>:p:h/html.vim
 else
   runtime! syntax/html.vim
@@ -21,14 +21,14 @@ else
   endif
 endif
 
-if version < 600
+if v:version < 600
   syntax clear
-elseif exists("b:current_syntax")
+elseif exists('b:current_syntax')
   finish
 endif
 
 " don't use standard HiLink, it will not work with included syntax files
-if version < 508
+if v:version < 508
   command! -nargs=+ HtmlHiLink hi link <args>
 else
   command! -nargs=+ HtmlHiLink hi def link <args>
@@ -182,7 +182,7 @@ HtmlHiLink mkdLinkDefTarget mkdURL
 HtmlHiLink mkdLinkTitle     htmlString
 HtmlHiLink mkdDelimiter     Delimiter
 
-let b:current_syntax = "mkd"
+let b:current_syntax = 'mkd'
 
 delcommand HtmlHiLink
 " vim: ts=8
diff --git a/syntax/mermaid.vim b/syntax/mermaid.vim
index 91b8658e1..4d9bee26c 100644
--- a/syntax/mermaid.vim
+++ b/syntax/mermaid.vim
@@ -4,7 +4,7 @@ endif
 
 setlocal iskeyword+=-
 
-syntax keyword mermaidDiagramType classDiagram classDiagram-v2 erDiagram gantt graph flowchart pie sequenceDiagram stateDiagram stateDiagram-v2
+syntax keyword mermaidDiagramType classDiagram classDiagram-v2 erDiagram gantt graph flowchart pie sequenceDiagram stateDiagram stateDiagram-v2 gitGraph
 syntax match mermaidOperator /\v(-|\<|\>|\+|\||\=)/
 syntax match mermaidComment /\v^(\s?)+\%\%.*$/
 syntax region mermaidString start=/"/ end=/"/ skip=/\\"/
@@ -35,6 +35,9 @@ syntax match mermaidClassFunction /\v\w+\(((\w+|\s+|\~)?,?)+\)/ contains=ALLBUT,
 syntax match mermaidStateFinalKeyword /\[\*\]/
 syntax match mermaidStateKeyword /\v(\s+as[^a-z]|^\s+state)/
 
+syntax match mermaidGitOption /\v^(options|end)/
+syntax match mermaidGitCommands /\v^(commit|branch|merge|reset|checkout)/
+
 " TODO highlight gantt keywords
 
 " TODO improve er operators
@@ -63,3 +66,6 @@ highlight link mermaidStateFinalKeyword Keyword
 highlight link mermaidStateKeyword Keyword
 
 highlight link mermaidErOperator Operator
+
+highlight link mermaidGitOption Keyword
+highlight link mermaidGitCommands Keyword
diff --git a/syntax/odin.vim b/syntax/odin.vim
index ed09f607d..9f8521ae8 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -34,6 +34,9 @@ syntax keyword odinTypeIdOf typeid_of
 syntax keyword odinTypeOf type_of
 syntax keyword odinAlignOf align_of
 
+syntax keyword odinOrReturn or_return
+syntax keyword odinOrElse or_else
+
 syntax keyword odinInline inline
 syntax keyword odinNoInline no_inline
 
@@ -116,6 +119,8 @@ highlight link odinTypeInfoOf Keyword
 highlight link odinTypeIdOf Keyword
 highlight link odinAlignOf Keyword
 highlight link odinPackage Keyword
+highlight link odinOrReturn Keyword
+highlight link odinOrElse Keyword
 
 highlight link odinInline Keyword
 highlight link odinNoInline Keyword
diff --git a/syntax/opam.vim b/syntax/opam.vim
index 21ffb0ffd..fca9c02a1 100644
--- a/syntax/opam.vim
+++ b/syntax/opam.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'ocaml', 'syntax/opam.vim')
 endif
 
 " Vim syntax file
-" Language:    OPAM - OCaml package manager
+" Language:    opam - OCaml package manager
 " Maintainer:  Markus Mottl        <markus.mottl@gmail.com>
 " URL:         https://github.com/ocaml/vim-ocaml
 " Last Change:
@@ -15,8 +15,36 @@ endif
 
 " need %{vars}%
 " env: [[CAML_LD_LIBRARY_PATH = "%{lib}%/stublibs"]]
-syn keyword opamKeyword1 remove depends pin-depends depopts conflicts env packages patches version maintainer tags license homepage authors doc install author available name depexts substs synopsis description
-syn match opamKeyword2 "\v(bug-reports|post-messages|ocaml-version|opam-version|dev-repo|build-test|build-doc|build)"
+syn keyword opamKeyword1 author
+syn keyword opamKeyword1 authors
+syn keyword opamKeyword1 available
+syn keyword opamKeyword1 conflicts
+syn keyword opamKeyword1 depends
+syn keyword opamKeyword1 depexts
+syn keyword opamKeyword1 depopts
+syn keyword opamKeyword1 description
+syn keyword opamKeyword1 doc
+syn keyword opamKeyword1 extra-files
+syn keyword opamKeyword1 features
+syn keyword opamKeyword1 flags
+syn keyword opamKeyword1 homepage
+syn keyword opamKeyword1 install
+syn keyword opamKeyword1 libraries
+syn keyword opamKeyword1 license
+syn keyword opamKeyword1 maintainer
+syn keyword opamKeyword1 messages
+syn keyword opamKeyword1 name
+syn keyword opamKeyword1 patches
+syn keyword opamKeyword1 pin-depends
+syn keyword opamKeyword1 remove
+syn keyword opamKeyword1 run-test
+syn keyword opamKeyword1 setenv
+syn keyword opamKeyword1 substs
+syn keyword opamKeyword1 synopsis
+syn keyword opamKeyword1 syntax
+syn keyword opamKeyword1 tags
+syn keyword opamKeyword1 version
+syn match opamKeyword2 "\v(bug-reports|post-messages|opam-version|dev-repo|build)"
 
 syn keyword opamTodo FIXME NOTE NOTES TODO XXX contained
 syn match opamComment "#.*$" contains=opamTodo,@Spell
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index 701cd99ad..6e8ecf2d3 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -5,10 +5,9 @@ endif
 scriptencoding utf-8
 " Vim syntax file
 " Language:     PlantUML
-" Maintainer:   Anders Thøgersen <first name at bladre dot dk>
 " License:      VIM LICENSE
 if exists('b:current_syntax')
-  " finish
+  finish
 endif
 
 if v:version < 600
@@ -22,14 +21,16 @@ let b:current_syntax = 'plantuml'
 
 syntax sync minlines=100
 
-syntax match plantumlPreProc /\%(\%(^@start\|^@end\)\%(dot\|mindmap\|uml\|salt\|wbs\|gantt\)\)\|!\%(define\|definelong\|else\|enddefinelong\|endif\|exit\|if\|ifdef\|ifndef\|include\|pragma\|undef\|gantt\)\s*.*/ contains=plantumlDir
+syntax match plantumlPreProc /\%(^@start\|^@end\)\%(board\|bpm\|creole\|cute\|def\|ditaa\|dot\|flow\|gantt\|git\|jcckit\|json\|latex\|math\|mindmap\|nwdiag\|project\|salt\|tree\|uml\|wbs\|wire\|yaml\)/
+syntax match plantumlPreProc /!\%(assert\|define\|definelong\|dump_memory\|else\|enddefinelong\|endfunction\|endif\|endprocedure\|endsub\|exit\|function\|if\|ifdef\|ifndef\|import\|include\|local\|log\|pragma\|procedure\|return\|startsub\|theme\|undef\|unquoted\)\s*.*/ contains=plantumlDir
 syntax region plantumlDir start=/\s\+/ms=s+1 end=/$/ contained
 
 " type
 " From 'java - jar plantuml.jar - language' results {{{
-syntax keyword plantumlTypeKeyword abstract actor agent archimate artifact boundary card cloud component control
-syntax keyword plantumlTypeKeyword database detach diamond entity enum file folder frame node object package
-syntax keyword plantumlTypeKeyword participant queue rectangle stack state storage usecase
+syntax keyword plantumlTypeKeyword abstract actor agent annotation archimate artifact boundary card cloud
+syntax keyword plantumlTypeKeyword collections component control database diamond entity enum file folder frame
+syntax keyword plantumlTypeKeyword hexagon label node object package participant person queue rectangle stack state
+syntax keyword plantumlTypeKeyword storage usecase
 " class and interface are defined as plantumlClassKeyword
 syntax keyword plantumlClassKeyword class interface
 "}}}
@@ -38,13 +39,16 @@ syntax keyword plantumlTypeKeyword concise robust
 
 " keyword
 " From 'java - jar plantuml.jar - language' results {{{
-" Since "syntax keyword" can handle only words, "top to bottom direction" is excluded.
-syntax keyword plantumlKeyword accross activate again allow_mixing allowmixing also alt as autonumber bottom
-syntax keyword plantumlKeyword box break caption center create critical deactivate destroy down else elseif end
-syntax keyword plantumlKeyword endif endwhile footbox footer fork group header hide hnote if is kill left
-syntax keyword plantumlKeyword legend link loop mainframe namespace newpage note of on opt order over package
-syntax keyword plantumlKeyword page par partition ref repeat return right rnote rotate show skin skinparam
-syntax keyword plantumlKeyword split start stereotype stop title top up while
+" Since "syntax keyword" can handle only words, "top to bottom direction", "left to right direction" are excluded.
+syntax keyword plantumlKeyword across activate again allow_mixing allowmixing also alt as autonumber bold
+syntax keyword plantumlKeyword bottom box break caption center circle color create critical dashed deactivate
+syntax keyword plantumlKeyword description destroy detach dotted down else elseif empty end endif endwhile
+syntax keyword plantumlKeyword false footbox footer fork group header hide hnote if is italic kill left legend
+syntax keyword plantumlKeyword link loop mainframe map members namespace newpage normal note of on opt order
+syntax keyword plantumlKeyword over package page par partition plain ref repeat return right rnote rotate show
+syntax keyword plantumlKeyword skin skinparam split sprite start stereotype stop style then title top true up
+syntax keyword plantumlKeyword while
+
 "}}}
 " Not in 'java - jar plantuml.jar - language' results
 syntax keyword plantumlKeyword endlegend sprite then
@@ -122,8 +126,8 @@ syntax cluster plantumlClassOp contains=plantumlClassPublic,
 " Strings
 syntax match plantumlSpecialString /\\n/ contained
 syntax region plantumlString start=/"/ skip=/\\\\\|\\"/ end=/"/ contains=plantumlSpecialString
-syntax region plantumlString start=/'/ skip=/\\\\\|\\'/ end=/'/ contains=plantumlSpecialString
-syntax match plantumlComment /'.*$/ contains=plantumlCommentTODO
+syntax region plantumlString start=/'/ skip=/\\\\\|\\'/ end=/'/ oneline contains=plantumlSpecialString
+syntax match plantumlComment /^\s*'.*$/ contains=plantumlCommentTODO
 syntax region plantumlMultilineComment start=/\/'/ end=/'\// contains=plantumlCommentTODO
 
 syntax match plantumlTag /<\/\?[bi]>/
@@ -177,6 +181,9 @@ execute 'syntax region plantumlMindmap start=/^\([-+*]\)\1*' . s:mindmap_options
 " Markdown syntax
 execute 'syntax region plantumlMindmap oneline start=/^\s*\*' . s:mindmap_options . '\s/ end=/$/ contains=' . join(s:contained, ',')
 
+" Gantt diagram
+syntax match plantumlGanttTask /\[[^\]]\{-}\]\%('s\)\?/ contains=plantumlSpecialString
+
 
 " Skinparam keywords
 syntax case ignore
@@ -195,10 +202,10 @@ syntax keyword plantumlSkinparamKeyword ArchimateBackgroundColor ArchimateBorder
 syntax keyword plantumlSkinparamKeyword ArchimateFontColor ArchimateFontName ArchimateFontSize ArchimateFontStyle
 syntax keyword plantumlSkinparamKeyword ArchimateStereotypeFontColor ArchimateStereotypeFontName
 syntax keyword plantumlSkinparamKeyword ArchimateStereotypeFontSize ArchimateStereotypeFontStyle ArrowColor
-syntax keyword plantumlSkinparamKeyword ArrowFontColor ArrowFontName ArrowFontSize ArrowFontStyle ArrowLollipopColor
-syntax keyword plantumlSkinparamKeyword ArrowMessageAlignment ArrowThickness ArtifactBackgroundColor ArtifactBorderColor
-syntax keyword plantumlSkinparamKeyword ArtifactFontColor ArtifactFontName ArtifactFontSize ArtifactFontStyle
-syntax keyword plantumlSkinparamKeyword ArtifactStereotypeFontColor ArtifactStereotypeFontName
+syntax keyword plantumlSkinparamKeyword ArrowFontColor ArrowFontName ArrowFontSize ArrowFontStyle ArrowHeadColor
+syntax keyword plantumlSkinparamKeyword ArrowLollipopColor ArrowMessageAlignment ArrowThickness ArtifactBackgroundColor
+syntax keyword plantumlSkinparamKeyword ArtifactBorderColor ArtifactFontColor ArtifactFontName ArtifactFontSize
+syntax keyword plantumlSkinparamKeyword ArtifactFontStyle ArtifactStereotypeFontColor ArtifactStereotypeFontName
 syntax keyword plantumlSkinparamKeyword ArtifactStereotypeFontSize ArtifactStereotypeFontStyle BackgroundColor
 syntax keyword plantumlSkinparamKeyword BiddableBackgroundColor BiddableBorderColor BoundaryBackgroundColor
 syntax keyword plantumlSkinparamKeyword BoundaryBorderColor BoundaryFontColor BoundaryFontName BoundaryFontSize
@@ -252,42 +259,50 @@ syntax keyword plantumlSkinparamKeyword FooterFontStyle FrameBackgroundColor Fra
 syntax keyword plantumlSkinparamKeyword FrameFontName FrameFontSize FrameFontStyle FrameStereotypeFontColor
 syntax keyword plantumlSkinparamKeyword FrameStereotypeFontName FrameStereotypeFontSize FrameStereotypeFontStyle
 syntax keyword plantumlSkinparamKeyword GenericDisplay Guillemet Handwritten HeaderFontColor HeaderFontName
-syntax keyword plantumlSkinparamKeyword HeaderFontSize HeaderFontStyle HyperlinkColor HyperlinkUnderline
-syntax keyword plantumlSkinparamKeyword IconIEMandatoryColor IconPackageBackgroundColor IconPackageColor
-syntax keyword plantumlSkinparamKeyword IconPrivateBackgroundColor IconPrivateColor IconProtectedBackgroundColor
-syntax keyword plantumlSkinparamKeyword IconProtectedColor IconPublicBackgroundColor IconPublicColor
-syntax keyword plantumlSkinparamKeyword InterfaceBackgroundColor InterfaceBorderColor InterfaceFontColor
+syntax keyword plantumlSkinparamKeyword HeaderFontSize HeaderFontStyle HexagonBackgroundColor HexagonBorderColor
+syntax keyword plantumlSkinparamKeyword HexagonBorderThickness HexagonFontColor HexagonFontName HexagonFontSize
+syntax keyword plantumlSkinparamKeyword HexagonFontStyle HexagonStereotypeFontColor HexagonStereotypeFontName
+syntax keyword plantumlSkinparamKeyword HexagonStereotypeFontSize HexagonStereotypeFontStyle HyperlinkColor
+syntax keyword plantumlSkinparamKeyword HyperlinkUnderline IconIEMandatoryColor IconPackageBackgroundColor
+syntax keyword plantumlSkinparamKeyword IconPackageColor IconPrivateBackgroundColor IconPrivateColor
+syntax keyword plantumlSkinparamKeyword IconProtectedBackgroundColor IconProtectedColor IconPublicBackgroundColor
+syntax keyword plantumlSkinparamKeyword IconPublicColor InterfaceBackgroundColor InterfaceBorderColor InterfaceFontColor
 syntax keyword plantumlSkinparamKeyword InterfaceFontName InterfaceFontSize InterfaceFontStyle
 syntax keyword plantumlSkinparamKeyword InterfaceStereotypeFontColor InterfaceStereotypeFontName
-syntax keyword plantumlSkinparamKeyword InterfaceStereotypeFontSize InterfaceStereotypeFontStyle LegendBackgroundColor
-syntax keyword plantumlSkinparamKeyword LegendBorderColor LegendBorderThickness LegendFontColor LegendFontName
-syntax keyword plantumlSkinparamKeyword LegendFontSize LegendFontStyle LexicalBackgroundColor LexicalBorderColor
-syntax keyword plantumlSkinparamKeyword LifelineStrategy Linetype MachineBackgroundColor MachineBorderColor
-syntax keyword plantumlSkinparamKeyword LineColor LineStyle LineThickness
-syntax keyword plantumlSkinparamKeyword MachineBorderThickness MachineFontColor MachineFontName MachineFontSize
-syntax keyword plantumlSkinparamKeyword MachineFontStyle MachineStereotypeFontColor MachineStereotypeFontName
-syntax keyword plantumlSkinparamKeyword MachineStereotypeFontSize MachineStereotypeFontStyle MaxAsciiMessageLength
-syntax keyword plantumlSkinparamKeyword MaxMessageSize MinClassWidth Monochrome NodeBackgroundColor NodeBorderColor
-syntax keyword plantumlSkinparamKeyword NodeFontColor NodeFontName NodeFontSize NodeFontStyle NodeStereotypeFontColor
-syntax keyword plantumlSkinparamKeyword NodeStereotypeFontName NodeStereotypeFontSize NodeStereotypeFontStyle Nodesep
-syntax keyword plantumlSkinparamKeyword NoteBackgroundColor NoteBorderColor NoteBorderThickness NoteFontColor
-syntax keyword plantumlSkinparamKeyword NoteFontName NoteFontSize NoteFontStyle NoteShadowing NoteTextAlignment
-syntax keyword plantumlSkinparamKeyword ObjectAttributeFontColor ObjectAttributeFontName ObjectAttributeFontSize
-syntax keyword plantumlSkinparamKeyword ObjectAttributeFontStyle ObjectBackgroundColor ObjectBorderColor
-syntax keyword plantumlSkinparamKeyword ObjectBorderThickness ObjectFontColor ObjectFontName ObjectFontSize
-syntax keyword plantumlSkinparamKeyword ObjectFontStyle ObjectStereotypeFontColor ObjectStereotypeFontName
-syntax keyword plantumlSkinparamKeyword ObjectStereotypeFontSize ObjectStereotypeFontStyle PackageBackgroundColor
-syntax keyword plantumlSkinparamKeyword PackageBorderColor PackageBorderThickness PackageFontColor PackageFontName
-syntax keyword plantumlSkinparamKeyword PackageFontSize PackageFontStyle PackageStereotypeFontColor
-syntax keyword plantumlSkinparamKeyword PackageStereotypeFontName PackageStereotypeFontSize PackageStereotypeFontStyle
-syntax keyword plantumlSkinparamKeyword PackageStyle PackageTitleAlignment Padding PageBorderColor PageExternalColor
-syntax keyword plantumlSkinparamKeyword PageMargin ParticipantBackgroundColor ParticipantBorderColor
-syntax keyword plantumlSkinparamKeyword ParticipantFontColor ParticipantFontName ParticipantFontSize
-syntax keyword plantumlSkinparamKeyword ParticipantFontStyle ParticipantPadding ParticipantStereotypeFontColor
-syntax keyword plantumlSkinparamKeyword ParticipantStereotypeFontName ParticipantStereotypeFontSize
-syntax keyword plantumlSkinparamKeyword ParticipantStereotypeFontStyle PartitionBackgroundColor PartitionBorderColor
-syntax keyword plantumlSkinparamKeyword PartitionBorderThickness PartitionFontColor PartitionFontName PartitionFontSize
-syntax keyword plantumlSkinparamKeyword PartitionFontStyle PathHoverColor QueueBackgroundColor QueueBorderColor
+syntax keyword plantumlSkinparamKeyword InterfaceStereotypeFontSize InterfaceStereotypeFontStyle LabelFontColor
+syntax keyword plantumlSkinparamKeyword LabelFontName LabelFontSize LabelFontStyle LabelStereotypeFontColor
+syntax keyword plantumlSkinparamKeyword LabelStereotypeFontName LabelStereotypeFontSize LabelStereotypeFontStyle
+syntax keyword plantumlSkinparamKeyword LegendBackgroundColor LegendBorderColor LegendBorderThickness LegendFontColor
+syntax keyword plantumlSkinparamKeyword LegendFontName LegendFontSize LegendFontStyle LexicalBackgroundColor
+syntax keyword plantumlSkinparamKeyword LexicalBorderColor LifelineStrategy Linetype MachineBackgroundColor
+syntax keyword plantumlSkinparamKeyword MachineBorderColor MachineBorderThickness MachineFontColor MachineFontName
+syntax keyword plantumlSkinparamKeyword MachineFontSize MachineFontStyle MachineStereotypeFontColor
+syntax keyword plantumlSkinparamKeyword MachineStereotypeFontName MachineStereotypeFontSize MachineStereotypeFontStyle
+syntax keyword plantumlSkinparamKeyword MaxAsciiMessageLength MaxMessageSize MinClassWidth Monochrome
+syntax keyword plantumlSkinparamKeyword NodeBackgroundColor NodeBorderColor NodeFontColor NodeFontName NodeFontSize
+syntax keyword plantumlSkinparamKeyword NodeFontStyle NodeStereotypeFontColor NodeStereotypeFontName
+syntax keyword plantumlSkinparamKeyword NodeStereotypeFontSize NodeStereotypeFontStyle Nodesep NoteBackgroundColor
+syntax keyword plantumlSkinparamKeyword NoteBorderColor NoteBorderThickness NoteFontColor NoteFontName NoteFontSize
+syntax keyword plantumlSkinparamKeyword NoteFontStyle NoteShadowing NoteTextAlignment ObjectAttributeFontColor
+syntax keyword plantumlSkinparamKeyword ObjectAttributeFontName ObjectAttributeFontSize ObjectAttributeFontStyle
+syntax keyword plantumlSkinparamKeyword ObjectBackgroundColor ObjectBorderColor ObjectBorderThickness ObjectFontColor
+syntax keyword plantumlSkinparamKeyword ObjectFontName ObjectFontSize ObjectFontStyle ObjectStereotypeFontColor
+syntax keyword plantumlSkinparamKeyword ObjectStereotypeFontName ObjectStereotypeFontSize ObjectStereotypeFontStyle
+syntax keyword plantumlSkinparamKeyword PackageBackgroundColor PackageBorderColor PackageBorderThickness
+syntax keyword plantumlSkinparamKeyword PackageFontColor PackageFontName PackageFontSize PackageFontStyle
+syntax keyword plantumlSkinparamKeyword PackageStereotypeFontColor PackageStereotypeFontName PackageStereotypeFontSize
+syntax keyword plantumlSkinparamKeyword PackageStereotypeFontStyle PackageStyle PackageTitleAlignment Padding
+syntax keyword plantumlSkinparamKeyword PageBorderColor PageExternalColor PageMargin ParticipantBackgroundColor
+syntax keyword plantumlSkinparamKeyword ParticipantBorderColor ParticipantFontColor ParticipantFontName
+syntax keyword plantumlSkinparamKeyword ParticipantFontSize ParticipantFontStyle ParticipantPadding
+syntax keyword plantumlSkinparamKeyword ParticipantStereotypeFontColor ParticipantStereotypeFontName
+syntax keyword plantumlSkinparamKeyword ParticipantStereotypeFontSize ParticipantStereotypeFontStyle
+syntax keyword plantumlSkinparamKeyword PartitionBackgroundColor PartitionBorderColor PartitionBorderThickness
+syntax keyword plantumlSkinparamKeyword PartitionFontColor PartitionFontName PartitionFontSize PartitionFontStyle
+syntax keyword plantumlSkinparamKeyword PathHoverColor PersonBackgroundColor PersonBorderColor PersonBorderThickness
+syntax keyword plantumlSkinparamKeyword PersonFontColor PersonFontName PersonFontSize PersonFontStyle
+syntax keyword plantumlSkinparamKeyword PersonStereotypeFontColor PersonStereotypeFontName PersonStereotypeFontSize
+syntax keyword plantumlSkinparamKeyword PersonStereotypeFontStyle QueueBackgroundColor QueueBorderColor
 syntax keyword plantumlSkinparamKeyword QueueBorderThickness QueueFontColor QueueFontName QueueFontSize QueueFontStyle
 syntax keyword plantumlSkinparamKeyword QueueStereotypeFontColor QueueStereotypeFontName QueueStereotypeFontSize
 syntax keyword plantumlSkinparamKeyword QueueStereotypeFontStyle Ranksep RectangleBackgroundColor RectangleBorderColor
@@ -343,6 +358,7 @@ syntax keyword plantumlSkinparamKeyword UsecaseBackgroundColor UsecaseBorderColo
 syntax keyword plantumlSkinparamKeyword UsecaseFontColor UsecaseFontName UsecaseFontSize UsecaseFontStyle
 syntax keyword plantumlSkinparamKeyword UsecaseStereotypeFontColor UsecaseStereotypeFontName UsecaseStereotypeFontSize
 syntax keyword plantumlSkinparamKeyword UsecaseStereotypeFontStyle WrapWidth
+
 " Not in 'java - jar plantuml.jar - language' output
 syntax keyword plantumlSkinparamKeyword activityArrowColor activityArrowFontColor activityArrowFontName
 syntax keyword plantumlSkinparamKeyword activityArrowFontSize activityArrowFontStyle BarColor BorderColor
@@ -357,6 +373,7 @@ syntax keyword plantumlSkinparamKeyword FontSize FontStyle GroupBackgroundColor
 syntax keyword plantumlSkinparamKeyword GroupingFontSize GroupingFontStyle GroupingHeaderFontColor
 syntax keyword plantumlSkinparamKeyword GroupingHeaderFontName GroupingHeaderFontSize GroupingHeaderFontStyle
 syntax keyword plantumlSkinparamKeyword LifeLineBackgroundColor LifeLineBorderColor
+syntax keyword plantumlSkinparamKeyword LineColor LineStyle LineThickness
 syntax keyword plantumlSkinparamKeyword sequenceActorBackgroundColor sequenceActorBorderColor sequenceActorFontColor
 syntax keyword plantumlSkinparamKeyword sequenceActorFontName sequenceActorFontSize sequenceActorFontStyle
 syntax keyword plantumlSkinparamKeyword sequenceArrowColor sequenceArrowFontColor sequenceArrowFontName
@@ -377,6 +394,10 @@ syntax keyword plantumlSkinparamKeyword usecaseActorStereotypeFontStyle usecaseA
 syntax keyword plantumlSkinparamKeyword usecaseArrowFontName usecaseArrowFontSize usecaseArrowFontStyle
 syntax case match
 
+" Builtin Function
+" https://plantuml.com/ja/preprocessing
+syntax match plantumlBuiltinFunction /%\%(chr\|darken\|date\|dec2hex\|dirpath\|feature\|false\|file_exists\|filename\|function_exists\|get_variable_value\|getenv\|hex2dec\|hsl_color\|intval\|is_dark\|is_light\|lighten\|loadJSON\|lower\|newline\|not\|lighten\|reverse_color\|reverse_hsluv_color\|set_variable_value\|size\|string\|strlen\|strpos\|substr\|true\|upper\|variable_exists\|version\)/
+
 " Highlight
 highlight default link plantumlCommentTODO Todo
 highlight default link plantumlKeyword Keyword
@@ -415,6 +436,8 @@ highlight default link plantumlSkinparamKeyword Identifier
 highlight default link plantumlNoteMultiLine String
 highlight default link plantumlUsecaseActor String
 highlight default link plantumlStereotype Type
+highlight default link plantumlBuiltinFunction Function
+highlight default link plantumlGanttTask Type
 
 let &cpoptions=s:cpo_orig
 unlet s:cpo_orig
diff --git a/syntax/rc.vim b/syntax/rc.vim
index 7d85d60ae..ab14a43ff 100644
--- a/syntax/rc.vim
+++ b/syntax/rc.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:	M$ Resource files (*.rc)
 " Maintainer:	Christian Brabandt
-" Last Change:	2015-05-29
+" Last Change:	20220116
 " Repository:   https://github.com/chrisbra/vim-rc-syntax
 " License:	Vim (see :h license)
 " Previous Maintainer:	Heiko Erhardt <Heiko.Erhardt@munich.netsurf.de>
@@ -177,16 +177,17 @@ hi def link rcAttribute	rcCommonAttribute
 hi def link rcStdId	rcStatement
 hi def link rcStatement	Statement
 
-" Default color overrides
-hi def rcLanguage	term=reverse ctermbg=Red ctermfg=Yellow guibg=Red guifg=Yellow
-hi def rcMainObject	term=underline ctermfg=Blue guifg=Blue
-hi def rcSubObject	ctermfg=Green guifg=Green
-hi def rcCaptionParam	term=underline ctermfg=DarkGreen guifg=Green
-hi def rcParam	ctermfg=DarkGreen guifg=DarkGreen
-hi def rcStatement	ctermfg=DarkGreen guifg=DarkGreen
-hi def rcCommonAttribute	ctermfg=Brown guifg=Brown
+hi def link rcLanguage	Constant
+hi def link rcCaptionParam Constant
+hi def link rcCommonAttribute Constant
+
+hi def link rcMainObject Identifier
+hi def link rcSubObject	Define
+hi def link rcParam	Constant
+hi def link rcStatement	Statement
+"
+"hi def link rcIdentifier Identifier
 
-"hi def link rcIdentifier	Identifier
 
 
 let b:current_syntax = "rc"
diff --git a/syntax/swift.vim b/syntax/swift.vim
index 8b41f5602..6ea8a81f3 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -215,6 +215,7 @@ syntax keyword swiftAttributes
       \ @NSCopying
       \ @NSManaged
       \ @objc
+      \ @preconcurrency
       \ @propertyWrapper
       \ @resultBuilder
       \ @Sendable
@@ -223,7 +224,9 @@ syntax keyword swiftAttributes
       \ @usableFromInline
       \ @warn_unused_result
 
-syntax keyword swiftConditionStatement #available
+syntax keyword swiftConditionStatement
+      \ #available
+      \ #unavailable
 
 syntax keyword swiftStructure
       \ struct
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index 4505f10ec..69fdd6114 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'tmux', 'syntax/tmux.vim')
 endif
 
 " Language: tmux(1) configuration file
-" Version: 3.3-rc (git-77fc7ac3)
+" Version: 3.3-rc (git-85ef7359)
 " URL: https://github.com/ericpruitt/tmux.vim/
 " Maintainer: Eric Pruitt <eric.pruitt@gmail.com>
 " License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause)
@@ -78,23 +78,24 @@ syn keyword tmuxOptions
 \ display-panes-active-colour display-panes-colour display-panes-time
 \ display-time exit-empty exit-unattached extended-keys focus-events
 \ history-file history-limit key-table lock-after-time lock-command
-\ message-command-style message-limit aggressive-resize allow-rename
-\ alternate-screen automatic-rename automatic-rename-format
+\ message-command-style message-limit aggressive-resize allow-passthrough
+\ allow-rename alternate-screen automatic-rename automatic-rename-format
 \ clock-mode-colour clock-mode-style copy-mode-current-match-style
 \ copy-mode-mark-style copy-mode-match-style main-pane-height
 \ main-pane-width message-style mode-keys mode-style monitor-activity
 \ monitor-bell monitor-silence mouse other-pane-height other-pane-width
 \ pane-active-border-style pane-base-index pane-border-format
-\ pane-border-lines pane-border-status pane-border-style pane-colours
-\ popup-border-lines popup-border-style popup-style prefix prefix2
-\ prompt-history-limit remain-on-exit renumber-windows repeat-time
-\ set-clipboard set-titles set-titles-string silence-action status status-bg
-\ status-fg status-format status-interval status-justify status-keys
-\ status-left status-left-length status-left-style status-position
-\ status-right status-right-length status-right-style status-style
-\ synchronize-panes terminal-features terminal-overrides update-environment
-\ user-keys visual-activity visual-bell visual-silence window-active-style
-\ window-size window-status-activity-style window-status-bell-style
+\ pane-border-indicators pane-border-lines pane-border-status
+\ pane-border-style pane-colours popup-border-lines popup-border-style
+\ popup-style prefix prefix2 prompt-history-limit remain-on-exit
+\ renumber-windows repeat-time set-clipboard set-titles set-titles-string
+\ silence-action status status-bg status-fg status-format status-interval
+\ status-justify status-keys status-left status-left-length
+\ status-left-style status-position status-right status-right-length
+\ status-right-style status-style synchronize-panes terminal-features
+\ terminal-overrides update-environment user-keys visual-activity
+\ visual-bell visual-silence window-active-style window-size
+\ window-status-activity-style window-status-bell-style
 \ window-status-current-format window-status-current-style
 \ window-status-format window-status-last-style window-status-separator
 \ window-status-style window-style word-separators wrap-search
diff --git a/syntax/zig.vim b/syntax/zig.vim
index b3ad6fb26..287ce0ba5 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -22,6 +22,7 @@ let s:zig_syntax_keywords = {
     \ ,             "f16"
     \ ,             "f32"
     \ ,             "f64"
+    \ ,             "f80"
     \ ,             "f128"
     \ ,             "void"
     \ ,             "type"
@@ -146,6 +147,7 @@ let s:zig_syntax_keywords = {
     \ ,                  "@offsetOf"
     \ ,                  "@OpaqueType"
     \ ,                  "@panic"
+    \ ,                  "@prefetch"
     \ ,                  "@ptrCast"
     \ ,                  "@ptrToInt"
     \ ,                  "@rem"
@@ -154,6 +156,7 @@ let s:zig_syntax_keywords = {
     \ ,                  "@Type"
     \ ,                  "@shuffle"
     \ ,                  "@reduce"
+    \ ,                  "@select"
     \ ,                  "@setRuntimeSafety"
     \ ,                  "@setEvalBranchQuota"
     \ ,                  "@setFloatMode"

From 83422e0a1fcfc88f3475104b0e0674e8dbe3130e Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 21 Feb 2022 00:04:43 +0100
Subject: [PATCH 286/299] Use old version of vim repository, fixes #779

closes #780
---
 autoload/julia_latex_symbols.vim | 421 ++++++++++++++-
 autoload/polyglot/ft.vim         | 739 +++++++++++++-------------
 autoload/unison.vim              |   2 +-
 extras/filetype.vim              |   3 -
 extras/menu.vim                  | 675 ++++++++++++------------
 ftplugin/crystal.vim             |   2 +-
 ftplugin/julia.vim               |   2 +-
 ftplugin/plantuml.vim            |   1 -
 indent/plantuml.vim              |   1 -
 indent/yaml.vim                  |  17 +-
 packages.yaml                    | 864 +++++++++++++++----------------
 scripts/build                    |  11 +-
 syntax/plantuml.vim              |   1 -
 syntax/solidity.vim              |  14 +-
 14 files changed, 1568 insertions(+), 1185 deletions(-)

diff --git a/autoload/julia_latex_symbols.vim b/autoload/julia_latex_symbols.vim
index 5fb5821af..05d1fb6a4 100644
--- a/autoload/julia_latex_symbols.vim
+++ b/autoload/julia_latex_symbols.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'julia', 'autoload/julia_latex
 endif
 
 " This file is autogenerated from the script 'generate_latex_symbols_table.jl'
-" The symbols are based on Julia version 1.5.0-DEV.67
+" The symbols are based on Julia version 1.9.0-DEV.16
 
 scriptencoding utf-8
 
@@ -267,7 +267,7 @@ function! julia_latex_symbols#get_dict()
     \ '\^c': 'ᶜ',
     \ '\^f': 'ᶠ',
     \ '\^iota': 'ᶥ',
-    \ '\^Phi': 'ᶲ',
+    \ '\^ltphi': 'ᶲ',
     \ '\^z': 'ᶻ',
     \ '\^theta': 'ᶿ',
     \ '\enspace': ' ',
@@ -281,8 +281,8 @@ function! julia_latex_symbols#get_dict()
     \ '\lq': '‘',
     \ '\rq': '’',
     \ '\reapos': '‛',
-    \ '\quotedblleft': '“',
-    \ '\quotedblright': '”',
+    \ '\ldq': '“',
+    \ '\rdq': '”',
     \ '\dagger': '†',
     \ '\ddagger': '‡',
     \ '\bullet': '•',
@@ -374,10 +374,12 @@ function! julia_latex_symbols#get_dict()
     \ '\scrH': 'ℋ',
     \ '\frakH': 'ℌ',
     \ '\bbH': 'ℍ',
+    \ '\ith': 'ℎ',
     \ '\planck': 'ℎ',
     \ '\hslash': 'ℏ',
     \ '\scrI': 'ℐ',
     \ '\Im': 'ℑ',
+    \ '\frakI': 'ℑ',
     \ '\scrL': 'ℒ',
     \ '\ell': 'ℓ',
     \ '\bbN': 'ℕ',
@@ -387,6 +389,7 @@ function! julia_latex_symbols#get_dict()
     \ '\bbQ': 'ℚ',
     \ '\scrR': 'ℛ',
     \ '\Re': 'ℜ',
+    \ '\frakR': 'ℜ',
     \ '\bbR': 'ℝ',
     \ '\xrat': '℞',
     \ '\trademark': '™',
@@ -759,7 +762,9 @@ function! julia_latex_symbols#get_dict()
     \ '\veebar': '⊻',
     \ '\xor': '⊻',
     \ '\barwedge': '⊼',
+    \ '\nand': '⊼',
     \ '\barvee': '⊽',
+    \ '\nor': '⊽',
     \ '\rightanglearc': '⊾',
     \ '\varlrtriangle': '⊿',
     \ '\bigwedge': '⋀',
@@ -1009,6 +1014,7 @@ function! julia_latex_symbols#get_dict()
     \ '\astrosun': '☉',
     \ '\:phone:': '☎',
     \ '\:ballot_box_with_check:': '☑',
+    \ '\:umbrella_with_rain_drops:': '☔',
     \ '\:umbrella:': '☔',
     \ '\:coffee:': '☕',
     \ '\:point_up:': '☝',
@@ -1097,6 +1103,7 @@ function! julia_latex_symbols#get_dict()
     \ '\:soccer:': '⚽',
     \ '\:baseball:': '⚾',
     \ '\:snowman:': '⛄',
+    \ '\:snowman_without_snow:': '⛄',
     \ '\:partly_sunny:': '⛅',
     \ '\:ophiuchus:': '⛎',
     \ '\:no_entry:': '⛔',
@@ -1352,8 +1359,8 @@ function! julia_latex_symbols#get_dict()
     \ '\intcup': '⨚',
     \ '\upint': '⨛',
     \ '\lowint': '⨜',
-    \ '\Join': '⨝',
     \ '\join': '⨝',
+    \ '\bbsemi': '⨟',
     \ '\ringplus': '⨢',
     \ '\plushat': '⨣',
     \ '\simplus': '⨤',
@@ -1541,6 +1548,11 @@ function! julia_latex_symbols#get_dict()
     \ '\forksnot': '⫝',
     \ '\dashV': '⫣',
     \ '\Dashv': '⫤',
+    \ '\Top': '⫪',
+    \ '\downvDash': '⫪',
+    \ '\upvDash': '⫫',
+    \ '\Bot': '⫫',
+    \ '\indep': '⫫',
     \ '\interleave': '⫴',
     \ '\tdcol': '⫶',
     \ '\lllnest': '⫷',
@@ -1625,6 +1637,9 @@ function! julia_latex_symbols#get_dict()
     \ '\:part_alternation_mark:': '〽',
     \ '\:congratulations:': '㊗',
     \ '\:secret:': '㊙',
+    \ '\^uparrow': 'ꜛ',
+    \ '\^downarrow': 'ꜜ',
+    \ '\^!': 'ꜝ',
     \ '\bfA': '𝐀',
     \ '\bfB': '𝐁',
     \ '\bfC': '𝐂',
@@ -2309,7 +2324,7 @@ function! julia_latex_symbols#get_dict()
     \ '\bfbeta': '𝛃',
     \ '\bfgamma': '𝛄',
     \ '\bfdelta': '𝛅',
-    \ '\bfepsilon': '𝛆',
+    \ '\bfvarepsilon': '𝛆',
     \ '\bfzeta': '𝛇',
     \ '\bfeta': '𝛈',
     \ '\bftheta': '𝛉',
@@ -2331,7 +2346,7 @@ function! julia_latex_symbols#get_dict()
     \ '\bfpsi': '𝛙',
     \ '\bfomega': '𝛚',
     \ '\bfpartial': '𝛛',
-    \ '\bfvarepsilon': '𝛜',
+    \ '\bfepsilon': '𝛜',
     \ '\bfvartheta': '𝛝',
     \ '\bfvarkappa': '𝛞',
     \ '\bfphi': '𝛟',
@@ -2367,7 +2382,7 @@ function! julia_latex_symbols#get_dict()
     \ '\itbeta': '𝛽',
     \ '\itgamma': '𝛾',
     \ '\itdelta': '𝛿',
-    \ '\itepsilon': '𝜀',
+    \ '\itvarepsilon': '𝜀',
     \ '\itzeta': '𝜁',
     \ '\iteta': '𝜂',
     \ '\ittheta': '𝜃',
@@ -2384,15 +2399,15 @@ function! julia_latex_symbols#get_dict()
     \ '\itsigma': '𝜎',
     \ '\ittau': '𝜏',
     \ '\itupsilon': '𝜐',
-    \ '\itphi': '𝜑',
+    \ '\itvarphi': '𝜑',
     \ '\itchi': '𝜒',
     \ '\itpsi': '𝜓',
     \ '\itomega': '𝜔',
     \ '\itpartial': '𝜕',
-    \ '\itvarepsilon': '𝜖',
+    \ '\itepsilon': '𝜖',
     \ '\itvartheta': '𝜗',
     \ '\itvarkappa': '𝜘',
-    \ '\itvarphi': '𝜙',
+    \ '\itphi': '𝜙',
     \ '\itvarrho': '𝜚',
     \ '\itvarpi': '𝜛',
     \ '\biAlpha': '𝜜',
@@ -2425,7 +2440,7 @@ function! julia_latex_symbols#get_dict()
     \ '\bibeta': '𝜷',
     \ '\bigamma': '𝜸',
     \ '\bidelta': '𝜹',
-    \ '\biepsilon': '𝜺',
+    \ '\bivarepsilon': '𝜺',
     \ '\bizeta': '𝜻',
     \ '\bieta': '𝜼',
     \ '\bitheta': '𝜽',
@@ -2442,15 +2457,15 @@ function! julia_latex_symbols#get_dict()
     \ '\bisigma': '𝝈',
     \ '\bitau': '𝝉',
     \ '\biupsilon': '𝝊',
-    \ '\biphi': '𝝋',
+    \ '\bivarphi': '𝝋',
     \ '\bichi': '𝝌',
     \ '\bipsi': '𝝍',
     \ '\biomega': '𝝎',
     \ '\bipartial': '𝝏',
-    \ '\bivarepsilon': '𝝐',
+    \ '\biepsilon': '𝝐',
     \ '\bivartheta': '𝝑',
     \ '\bivarkappa': '𝝒',
-    \ '\bivarphi': '𝝓',
+    \ '\biphi': '𝝓',
     \ '\bivarrho': '𝝔',
     \ '\bivarpi': '𝝕',
     \ '\bsansAlpha': '𝝖',
@@ -2483,7 +2498,7 @@ function! julia_latex_symbols#get_dict()
     \ '\bsansbeta': '𝝱',
     \ '\bsansgamma': '𝝲',
     \ '\bsansdelta': '𝝳',
-    \ '\bsansepsilon': '𝝴',
+    \ '\bsansvarepsilon': '𝝴',
     \ '\bsanszeta': '𝝵',
     \ '\bsanseta': '𝝶',
     \ '\bsanstheta': '𝝷',
@@ -2500,15 +2515,15 @@ function! julia_latex_symbols#get_dict()
     \ '\bsanssigma': '𝞂',
     \ '\bsanstau': '𝞃',
     \ '\bsansupsilon': '𝞄',
-    \ '\bsansphi': '𝞅',
+    \ '\bsansvarphi': '𝞅',
     \ '\bsanschi': '𝞆',
     \ '\bsanspsi': '𝞇',
     \ '\bsansomega': '𝞈',
     \ '\bsanspartial': '𝞉',
-    \ '\bsansvarepsilon': '𝞊',
+    \ '\bsansepsilon': '𝞊',
     \ '\bsansvartheta': '𝞋',
     \ '\bsansvarkappa': '𝞌',
-    \ '\bsansvarphi': '𝞍',
+    \ '\bsansphi': '𝞍',
     \ '\bsansvarrho': '𝞎',
     \ '\bsansvarpi': '𝞏',
     \ '\bisansAlpha': '𝞐',
@@ -2541,7 +2556,7 @@ function! julia_latex_symbols#get_dict()
     \ '\bisansbeta': '𝞫',
     \ '\bisansgamma': '𝞬',
     \ '\bisansdelta': '𝞭',
-    \ '\bisansepsilon': '𝞮',
+    \ '\bisansvarepsilon': '𝞮',
     \ '\bisanszeta': '𝞯',
     \ '\bisanseta': '𝞰',
     \ '\bisanstheta': '𝞱',
@@ -2558,15 +2573,15 @@ function! julia_latex_symbols#get_dict()
     \ '\bisanssigma': '𝞼',
     \ '\bisanstau': '𝞽',
     \ '\bisansupsilon': '𝞾',
-    \ '\bisansphi': '𝞿',
+    \ '\bisansvarphi': '𝞿',
     \ '\bisanschi': '𝟀',
     \ '\bisanspsi': '𝟁',
     \ '\bisansomega': '𝟂',
     \ '\bisanspartial': '𝟃',
-    \ '\bisansvarepsilon': '𝟄',
+    \ '\bisansepsilon': '𝟄',
     \ '\bisansvartheta': '𝟅',
     \ '\bisansvarkappa': '𝟆',
-    \ '\bisansvarphi': '𝟇',
+    \ '\bisansphi': '𝟇',
     \ '\bisansvarrho': '𝟈',
     \ '\bisansvarpi': '𝟉',
     \ '\bfDigamma': '𝟊',
@@ -2686,6 +2701,9 @@ function! julia_latex_symbols#get_dict()
     \ '\:sun_with_face:': '🌞',
     \ '\:star2:': '🌟',
     \ '\:stars:': '🌠',
+    \ '\:hotdog:': '🌭',
+    \ '\:taco:': '🌮',
+    \ '\:burrito:': '🌯',
     \ '\:chestnut:': '🌰',
     \ '\:seedling:': '🌱',
     \ '\:evergreen_tree:': '🌲',
@@ -2752,7 +2770,7 @@ function! julia_latex_symbols#get_dict()
     \ '\:cake:': '🍰',
     \ '\:bento:': '🍱',
     \ '\:stew:': '🍲',
-    \ '\:egg:': '🍳',
+    \ '\:fried_egg:': '🍳',
     \ '\:fork_and_knife:': '🍴',
     \ '\:tea:': '🍵',
     \ '\:sake:': '🍶',
@@ -2762,6 +2780,8 @@ function! julia_latex_symbols#get_dict()
     \ '\:beer:': '🍺',
     \ '\:beers:': '🍻',
     \ '\:baby_bottle:': '🍼',
+    \ '\:champagne:': '🍾',
+    \ '\:popcorn:': '🍿',
     \ '\:ribbon:': '🎀',
     \ '\:gift:': '🎁',
     \ '\:birthday:': '🎂',
@@ -2819,11 +2839,17 @@ function! julia_latex_symbols#get_dict()
     \ '\:snowboarder:': '🏂',
     \ '\:runner:': '🏃',
     \ '\:surfer:': '🏄',
+    \ '\:sports_medal:': '🏅',
     \ '\:trophy:': '🏆',
     \ '\:horse_racing:': '🏇',
     \ '\:football:': '🏈',
     \ '\:rugby_football:': '🏉',
     \ '\:swimmer:': '🏊',
+    \ '\:cricket_bat_and_ball:': '🏏',
+    \ '\:volleyball:': '🏐',
+    \ '\:field_hockey_stick_and_ball:': '🏑',
+    \ '\:ice_hockey_stick_and_puck:': '🏒',
+    \ '\:table_tennis_paddle_and_ball:': '🏓',
     \ '\:house:': '🏠',
     \ '\:house_with_garden:': '🏡',
     \ '\:office:': '🏢',
@@ -2841,6 +2867,10 @@ function! julia_latex_symbols#get_dict()
     \ '\:izakaya_lantern:': '🏮',
     \ '\:japanese_castle:': '🏯',
     \ '\:european_castle:': '🏰',
+    \ '\:waving_black_flag:': '🏴',
+    \ '\:badminton_racquet_and_shuttlecock:': '🏸',
+    \ '\:bow_and_arrow:': '🏹',
+    \ '\:amphora:': '🏺',
     \ '\:skin-tone-2:': '🏻',
     \ '\:skin-tone-3:': '🏼',
     \ '\:skin-tone-4:': '🏽',
@@ -2876,7 +2906,7 @@ function! julia_latex_symbols#get_dict()
     \ '\:bug:': '🐛',
     \ '\:ant:': '🐜',
     \ '\:bee:': '🐝',
-    \ '\:beetle:': '🐞',
+    \ '\:ladybug:': '🐞',
     \ '\:fish:': '🐟',
     \ '\:tropical_fish:': '🐠',
     \ '\:blowfish:': '🐡',
@@ -2952,6 +2982,7 @@ function! julia_latex_symbols#get_dict()
     \ '\:woman:': '👩',
     \ '\:family:': '👪',
     \ '\:couple:': '👫',
+    \ '\:man_and_woman_holding_hands:': '👫',
     \ '\:two_men_holding_hands:': '👬',
     \ '\:two_women_holding_hands:': '👭',
     \ '\:cop:': '👮',
@@ -3070,6 +3101,7 @@ function! julia_latex_symbols#get_dict()
     \ '\:pager:': '📟',
     \ '\:fax:': '📠',
     \ '\:satellite:': '📡',
+    \ '\:satellite_antenna:': '📡',
     \ '\:loudspeaker:': '📢',
     \ '\:mega:': '📣',
     \ '\:outbox_tray:': '📤',
@@ -3092,10 +3124,12 @@ function! julia_latex_symbols#get_dict()
     \ '\:no_mobile_phones:': '📵',
     \ '\:signal_strength:': '📶',
     \ '\:camera:': '📷',
+    \ '\:camera_with_flash:': '📸',
     \ '\:video_camera:': '📹',
     \ '\:tv:': '📺',
     \ '\:radio:': '📻',
     \ '\:vhs:': '📼',
+    \ '\:prayer_beads:': '📿',
     \ '\:twisted_rightwards_arrows:': '🔀',
     \ '\:repeat:': '🔁',
     \ '\:repeat_one:': '🔂',
@@ -3158,6 +3192,10 @@ function! julia_latex_symbols#get_dict()
     \ '\:small_red_triangle_down:': '🔻',
     \ '\:arrow_up_small:': '🔼',
     \ '\:arrow_down_small:': '🔽',
+    \ '\:kaaba:': '🕋',
+    \ '\:mosque:': '🕌',
+    \ '\:synagogue:': '🕍',
+    \ '\:menorah_with_nine_branches:': '🕎',
     \ '\:clock1:': '🕐',
     \ '\:clock2:': '🕑',
     \ '\:clock3:': '🕒',
@@ -3182,6 +3220,10 @@ function! julia_latex_symbols#get_dict()
     \ '\:clock1030:': '🕥',
     \ '\:clock1130:': '🕦',
     \ '\:clock1230:': '🕧',
+    \ '\:man_dancing:': '🕺',
+    \ '\:middle_finger:': '🖕',
+    \ '\:spock-hand:': '🖖',
+    \ '\:black_heart:': '🖤',
     \ '\:mount_fuji:': '🗻',
     \ '\:tokyo_tower:': '🗼',
     \ '\:statue_of_liberty:': '🗽',
@@ -3252,6 +3294,10 @@ function! julia_latex_symbols#get_dict()
     \ '\:pouting_cat:': '😾',
     \ '\:crying_cat_face:': '😿',
     \ '\:scream_cat:': '🙀',
+    \ '\:slightly_frowning_face:': '🙁',
+    \ '\:slightly_smiling_face:': '🙂',
+    \ '\:upside_down_face:': '🙃',
+    \ '\:face_with_rolling_eyes:': '🙄',
     \ '\:no_good:': '🙅',
     \ '\:ok_woman:': '🙆',
     \ '\:bow:': '🙇',
@@ -3332,5 +3378,328 @@ function! julia_latex_symbols#get_dict()
     \ '\:passport_control:': '🛂',
     \ '\:customs:': '🛃',
     \ '\:baggage_claim:': '🛄',
-    \ '\:left_luggage:': '🛅'}
+    \ '\:left_luggage:': '🛅',
+    \ '\:sleeping_accommodation:': '🛌',
+    \ '\:place_of_worship:': '🛐',
+    \ '\:octagonal_sign:': '🛑',
+    \ '\:shopping_trolley:': '🛒',
+    \ '\:hindu_temple:': '🛕',
+    \ '\:hut:': '🛖',
+    \ '\:elevator:': '🛗',
+    \ '\:airplane_departure:': '🛫',
+    \ '\:airplane_arriving:': '🛬',
+    \ '\:scooter:': '🛴',
+    \ '\:motor_scooter:': '🛵',
+    \ '\:canoe:': '🛶',
+    \ '\:sled:': '🛷',
+    \ '\:flying_saucer:': '🛸',
+    \ '\:skateboard:': '🛹',
+    \ '\:auto_rickshaw:': '🛺',
+    \ '\:pickup_truck:': '🛻',
+    \ '\:roller_skate:': '🛼',
+    \ '\:large_orange_circle:': '🟠',
+    \ '\:large_yellow_circle:': '🟡',
+    \ '\:large_green_circle:': '🟢',
+    \ '\:large_purple_circle:': '🟣',
+    \ '\:large_brown_circle:': '🟤',
+    \ '\:large_red_square:': '🟥',
+    \ '\:large_blue_square:': '🟦',
+    \ '\:large_orange_square:': '🟧',
+    \ '\:large_yellow_square:': '🟨',
+    \ '\:large_green_square:': '🟩',
+    \ '\:large_purple_square:': '🟪',
+    \ '\:large_brown_square:': '🟫',
+    \ '\:pinched_fingers:': '🤌',
+    \ '\:white_heart:': '🤍',
+    \ '\:brown_heart:': '🤎',
+    \ '\:pinching_hand:': '🤏',
+    \ '\:zipper_mouth_face:': '🤐',
+    \ '\:money_mouth_face:': '🤑',
+    \ '\:face_with_thermometer:': '🤒',
+    \ '\:nerd_face:': '🤓',
+    \ '\:thinking_face:': '🤔',
+    \ '\:face_with_head_bandage:': '🤕',
+    \ '\:robot_face:': '🤖',
+    \ '\:hugging_face:': '🤗',
+    \ '\:the_horns:': '🤘',
+    \ '\:call_me_hand:': '🤙',
+    \ '\:raised_back_of_hand:': '🤚',
+    \ '\:left-facing_fist:': '🤛',
+    \ '\:right-facing_fist:': '🤜',
+    \ '\:handshake:': '🤝',
+    \ '\:crossed_fingers:': '🤞',
+    \ '\:i_love_you_hand_sign:': '🤟',
+    \ '\:face_with_cowboy_hat:': '🤠',
+    \ '\:clown_face:': '🤡',
+    \ '\:nauseated_face:': '🤢',
+    \ '\:rolling_on_the_floor_laughing:': '🤣',
+    \ '\:drooling_face:': '🤤',
+    \ '\:lying_face:': '🤥',
+    \ '\:face_palm:': '🤦',
+    \ '\:sneezing_face:': '🤧',
+    \ '\:face_with_raised_eyebrow:': '🤨',
+    \ '\:star-struck:': '🤩',
+    \ '\:zany_face:': '🤪',
+    \ '\:shushing_face:': '🤫',
+    \ '\:face_with_symbols_on_mouth:': '🤬',
+    \ '\:face_with_hand_over_mouth:': '🤭',
+    \ '\:face_vomiting:': '🤮',
+    \ '\:exploding_head:': '🤯',
+    \ '\:pregnant_woman:': '🤰',
+    \ '\:breast-feeding:': '🤱',
+    \ '\:palms_up_together:': '🤲',
+    \ '\:selfie:': '🤳',
+    \ '\:prince:': '🤴',
+    \ '\:person_in_tuxedo:': '🤵',
+    \ '\:mrs_claus:': '🤶',
+    \ '\:shrug:': '🤷',
+    \ '\:person_doing_cartwheel:': '🤸',
+    \ '\:juggling:': '🤹',
+    \ '\:fencer:': '🤺',
+    \ '\:wrestlers:': '🤼',
+    \ '\:water_polo:': '🤽',
+    \ '\:handball:': '🤾',
+    \ '\:diving_mask:': '🤿',
+    \ '\:wilted_flower:': '🥀',
+    \ '\:drum_with_drumsticks:': '🥁',
+    \ '\:clinking_glasses:': '🥂',
+    \ '\:tumbler_glass:': '🥃',
+    \ '\:spoon:': '🥄',
+    \ '\:goal_net:': '🥅',
+    \ '\:first_place_medal:': '🥇',
+    \ '\:second_place_medal:': '🥈',
+    \ '\:third_place_medal:': '🥉',
+    \ '\:boxing_glove:': '🥊',
+    \ '\:martial_arts_uniform:': '🥋',
+    \ '\:curling_stone:': '🥌',
+    \ '\:lacrosse:': '🥍',
+    \ '\:softball:': '🥎',
+    \ '\:flying_disc:': '🥏',
+    \ '\:croissant:': '🥐',
+    \ '\:avocado:': '🥑',
+    \ '\:cucumber:': '🥒',
+    \ '\:bacon:': '🥓',
+    \ '\:potato:': '🥔',
+    \ '\:carrot:': '🥕',
+    \ '\:baguette_bread:': '🥖',
+    \ '\:green_salad:': '🥗',
+    \ '\:shallow_pan_of_food:': '🥘',
+    \ '\:stuffed_flatbread:': '🥙',
+    \ '\:egg:': '🥚',
+    \ '\:glass_of_milk:': '🥛',
+    \ '\:peanuts:': '🥜',
+    \ '\:kiwifruit:': '🥝',
+    \ '\:pancakes:': '🥞',
+    \ '\:dumpling:': '🥟',
+    \ '\:fortune_cookie:': '🥠',
+    \ '\:takeout_box:': '🥡',
+    \ '\:chopsticks:': '🥢',
+    \ '\:bowl_with_spoon:': '🥣',
+    \ '\:cup_with_straw:': '🥤',
+    \ '\:coconut:': '🥥',
+    \ '\:broccoli:': '🥦',
+    \ '\:pie:': '🥧',
+    \ '\:pretzel:': '🥨',
+    \ '\:cut_of_meat:': '🥩',
+    \ '\:sandwich:': '🥪',
+    \ '\:canned_food:': '🥫',
+    \ '\:leafy_green:': '🥬',
+    \ '\:mango:': '🥭',
+    \ '\:moon_cake:': '🥮',
+    \ '\:bagel:': '🥯',
+    \ '\:smiling_face_with_3_hearts:': '🥰',
+    \ '\:yawning_face:': '🥱',
+    \ '\:smiling_face_with_tear:': '🥲',
+    \ '\:partying_face:': '🥳',
+    \ '\:woozy_face:': '🥴',
+    \ '\:hot_face:': '🥵',
+    \ '\:cold_face:': '🥶',
+    \ '\:ninja:': '🥷',
+    \ '\:disguised_face:': '🥸',
+    \ '\:pleading_face:': '🥺',
+    \ '\:sari:': '🥻',
+    \ '\:lab_coat:': '🥼',
+    \ '\:goggles:': '🥽',
+    \ '\:hiking_boot:': '🥾',
+    \ '\:womans_flat_shoe:': '🥿',
+    \ '\:crab:': '🦀',
+    \ '\:lion_face:': '🦁',
+    \ '\:scorpion:': '🦂',
+    \ '\:turkey:': '🦃',
+    \ '\:unicorn_face:': '🦄',
+    \ '\:eagle:': '🦅',
+    \ '\:duck:': '🦆',
+    \ '\:bat:': '🦇',
+    \ '\:shark:': '🦈',
+    \ '\:owl:': '🦉',
+    \ '\:fox_face:': '🦊',
+    \ '\:butterfly:': '🦋',
+    \ '\:deer:': '🦌',
+    \ '\:gorilla:': '🦍',
+    \ '\:lizard:': '🦎',
+    \ '\:rhinoceros:': '🦏',
+    \ '\:shrimp:': '🦐',
+    \ '\:squid:': '🦑',
+    \ '\:giraffe_face:': '🦒',
+    \ '\:zebra_face:': '🦓',
+    \ '\:hedgehog:': '🦔',
+    \ '\:sauropod:': '🦕',
+    \ '\:t-rex:': '🦖',
+    \ '\:cricket:': '🦗',
+    \ '\:kangaroo:': '🦘',
+    \ '\:llama:': '🦙',
+    \ '\:peacock:': '🦚',
+    \ '\:hippopotamus:': '🦛',
+    \ '\:parrot:': '🦜',
+    \ '\:raccoon:': '🦝',
+    \ '\:lobster:': '🦞',
+    \ '\:mosquito:': '🦟',
+    \ '\:microbe:': '🦠',
+    \ '\:badger:': '🦡',
+    \ '\:swan:': '🦢',
+    \ '\:mammoth:': '🦣',
+    \ '\:dodo:': '🦤',
+    \ '\:sloth:': '🦥',
+    \ '\:otter:': '🦦',
+    \ '\:orangutan:': '🦧',
+    \ '\:skunk:': '🦨',
+    \ '\:flamingo:': '🦩',
+    \ '\:oyster:': '🦪',
+    \ '\:beaver:': '🦫',
+    \ '\:bison:': '🦬',
+    \ '\:seal:': '🦭',
+    \ '\:guide_dog:': '🦮',
+    \ '\:probing_cane:': '🦯',
+    \ '\:bone:': '🦴',
+    \ '\:leg:': '🦵',
+    \ '\:foot:': '🦶',
+    \ '\:tooth:': '🦷',
+    \ '\:superhero:': '🦸',
+    \ '\:supervillain:': '🦹',
+    \ '\:safety_vest:': '🦺',
+    \ '\:ear_with_hearing_aid:': '🦻',
+    \ '\:motorized_wheelchair:': '🦼',
+    \ '\:manual_wheelchair:': '🦽',
+    \ '\:mechanical_arm:': '🦾',
+    \ '\:mechanical_leg:': '🦿',
+    \ '\:cheese_wedge:': '🧀',
+    \ '\:cupcake:': '🧁',
+    \ '\:salt:': '🧂',
+    \ '\:beverage_box:': '🧃',
+    \ '\:garlic:': '🧄',
+    \ '\:onion:': '🧅',
+    \ '\:falafel:': '🧆',
+    \ '\:waffle:': '🧇',
+    \ '\:butter:': '🧈',
+    \ '\:mate_drink:': '🧉',
+    \ '\:ice_cube:': '🧊',
+    \ '\:bubble_tea:': '🧋',
+    \ '\:standing_person:': '🧍',
+    \ '\:kneeling_person:': '🧎',
+    \ '\:deaf_person:': '🧏',
+    \ '\:face_with_monocle:': '🧐',
+    \ '\:adult:': '🧑',
+    \ '\:child:': '🧒',
+    \ '\:older_adult:': '🧓',
+    \ '\:bearded_person:': '🧔',
+    \ '\:person_with_headscarf:': '🧕',
+    \ '\:person_in_steamy_room:': '🧖',
+    \ '\:person_climbing:': '🧗',
+    \ '\:person_in_lotus_position:': '🧘',
+    \ '\:mage:': '🧙',
+    \ '\:fairy:': '🧚',
+    \ '\:vampire:': '🧛',
+    \ '\:merperson:': '🧜',
+    \ '\:elf:': '🧝',
+    \ '\:genie:': '🧞',
+    \ '\:zombie:': '🧟',
+    \ '\:brain:': '🧠',
+    \ '\:orange_heart:': '🧡',
+    \ '\:billed_cap:': '🧢',
+    \ '\:scarf:': '🧣',
+    \ '\:gloves:': '🧤',
+    \ '\:coat:': '🧥',
+    \ '\:socks:': '🧦',
+    \ '\:red_envelope:': '🧧',
+    \ '\:firecracker:': '🧨',
+    \ '\:jigsaw:': '🧩',
+    \ '\:test_tube:': '🧪',
+    \ '\:petri_dish:': '🧫',
+    \ '\:dna:': '🧬',
+    \ '\:compass:': '🧭',
+    \ '\:abacus:': '🧮',
+    \ '\:fire_extinguisher:': '🧯',
+    \ '\:toolbox:': '🧰',
+    \ '\:bricks:': '🧱',
+    \ '\:magnet:': '🧲',
+    \ '\:luggage:': '🧳',
+    \ '\:lotion_bottle:': '🧴',
+    \ '\:thread:': '🧵',
+    \ '\:yarn:': '🧶',
+    \ '\:safety_pin:': '🧷',
+    \ '\:teddy_bear:': '🧸',
+    \ '\:broom:': '🧹',
+    \ '\:basket:': '🧺',
+    \ '\:roll_of_paper:': '🧻',
+    \ '\:soap:': '🧼',
+    \ '\:sponge:': '🧽',
+    \ '\:receipt:': '🧾',
+    \ '\:nazar_amulet:': '🧿',
+    \ '\:ballet_shoes:': '🩰',
+    \ '\:one-piece_swimsuit:': '🩱',
+    \ '\:briefs:': '🩲',
+    \ '\:shorts:': '🩳',
+    \ '\:thong_sandal:': '🩴',
+    \ '\:drop_of_blood:': '🩸',
+    \ '\:adhesive_bandage:': '🩹',
+    \ '\:stethoscope:': '🩺',
+    \ '\:yo-yo:': '🪀',
+    \ '\:kite:': '🪁',
+    \ '\:parachute:': '🪂',
+    \ '\:boomerang:': '🪃',
+    \ '\:magic_wand:': '🪄',
+    \ '\:pinata:': '🪅',
+    \ '\:nesting_dolls:': '🪆',
+    \ '\:ringed_planet:': '🪐',
+    \ '\:chair:': '🪑',
+    \ '\:razor:': '🪒',
+    \ '\:axe:': '🪓',
+    \ '\:diya_lamp:': '🪔',
+    \ '\:banjo:': '🪕',
+    \ '\:military_helmet:': '🪖',
+    \ '\:accordion:': '🪗',
+    \ '\:long_drum:': '🪘',
+    \ '\:coin:': '🪙',
+    \ '\:carpentry_saw:': '🪚',
+    \ '\:screwdriver:': '🪛',
+    \ '\:ladder:': '🪜',
+    \ '\:hook:': '🪝',
+    \ '\:mirror:': '🪞',
+    \ '\:window:': '🪟',
+    \ '\:plunger:': '🪠',
+    \ '\:sewing_needle:': '🪡',
+    \ '\:knot:': '🪢',
+    \ '\:bucket:': '🪣',
+    \ '\:mouse_trap:': '🪤',
+    \ '\:toothbrush:': '🪥',
+    \ '\:headstone:': '🪦',
+    \ '\:placard:': '🪧',
+    \ '\:rock:': '🪨',
+    \ '\:fly:': '🪰',
+    \ '\:worm:': '🪱',
+    \ '\:beetle:': '🪲',
+    \ '\:cockroach:': '🪳',
+    \ '\:potted_plant:': '🪴',
+    \ '\:wood:': '🪵',
+    \ '\:feather:': '🪶',
+    \ '\:anatomical_heart:': '🫀',
+    \ '\:lungs:': '🫁',
+    \ '\:people_hugging:': '🫂',
+    \ '\:blueberries:': '🫐',
+    \ '\:bell_pepper:': '🫑',
+    \ '\:olive:': '🫒',
+    \ '\:flatbread:': '🫓',
+    \ '\:tamale:': '🫔',
+    \ '\:fondue:': '🫕',
+    \ '\:teapot:': '🫖'}
 endfunction
diff --git a/autoload/polyglot/ft.vim b/autoload/polyglot/ft.vim
index a8ca90080..92c65ac19 100644
--- a/autoload/polyglot/ft.vim
+++ b/autoload/polyglot/ft.vim
@@ -1,83 +1,89 @@
-vim9script
+" Vim functions for file type detection
+"
+" Maintainer:	Bram Moolenaar <Bram@vim.org>
+" Last Change:	2022 Jan 31
 
-# Vim functions for file type detection
-#
-# Maintainer:	Bram Moolenaar <Bram@vim.org>
-# Last Change:	2022 Feb 05
+" These functions are moved here from runtime/filetype.vim to make startup
+" faster.
 
-# These functions are moved here from runtime/filetype.vim to make startup
-# faster.
+" Line continuation is used here, remove 'C' from 'cpoptions'
+let s:cpo_save = &cpo
+set cpo&vim
 
-export def Check_inp()
+func polyglot#ft#Check_inp()
   if getline(1) =~ '^\*'
     setf abaqus
   else
-    var n = 1
-    var nmax = line("$") > 500 ? 500 : line("$")
+    let n = 1
+    if line("$") > 500
+      let nmax = 500
+    else
+      let nmax = line("$")
+    endif
     while n <= nmax
       if getline(n) =~? "^header surface data"
 	setf trasys
 	break
       endif
-      n += 1
+      let n = n + 1
     endwhile
   endif
-enddef
+endfunc
 
-# This function checks for the kind of assembly that is wanted by the user, or
-# can be detected from the first five lines of the file.
-export def FTasm()
-  # make sure b:asmsyntax exists
+" This function checks for the kind of assembly that is wanted by the user, or
+" can be detected from the first five lines of the file.
+func polyglot#ft#FTasm()
+  " make sure b:asmsyntax exists
   if !exists("b:asmsyntax")
-    b:asmsyntax = ""
+    let b:asmsyntax = ""
   endif
 
   if b:asmsyntax == ""
-    FTasmsyntax()
+    call polyglot#ft#FTasmsyntax()
   endif
 
-  # if b:asmsyntax still isn't set, default to asmsyntax or GNU
+  " if b:asmsyntax still isn't set, default to asmsyntax or GNU
   if b:asmsyntax == ""
     if exists("g:asmsyntax")
-      b:asmsyntax = g:asmsyntax
+      let b:asmsyntax = g:asmsyntax
     else
-      b:asmsyntax = "asm"
+      let b:asmsyntax = "asm"
     endif
   endif
 
-  exe "setf " .. fnameescape(b:asmsyntax)
-enddef
+  exe "setf " . fnameescape(b:asmsyntax)
+endfunc
 
-export def FTasmsyntax()
-  # see if the file contains any asmsyntax=foo overrides. If so, change
-  # b:asmsyntax appropriately
-  var head = " " .. getline(1) .. " " .. getline(2) .. " "
-	.. getline(3) .. " " .. getline(4) ..  " " .. getline(5) .. " "
-  var match = matchstr(head, '\sasmsyntax=\zs[a-zA-Z0-9]\+\ze\s')
+func polyglot#ft#FTasmsyntax()
+  " see if file contains any asmsyntax=foo overrides. If so, change
+  " b:asmsyntax appropriately
+  let head = " ".getline(1)." ".getline(2)." ".getline(3)." ".getline(4).
+	\" ".getline(5)." "
+  let match = matchstr(head, '\sasmsyntax=\zs[a-zA-Z0-9]\+\ze\s')
   if match != ''
-    b:asmsyntax = match
+    let b:asmsyntax = match
   elseif ((head =~? '\.title') || (head =~? '\.ident') || (head =~? '\.macro') || (head =~? '\.subtitle') || (head =~? '\.library'))
-    b:asmsyntax = "vmasm"
+    let b:asmsyntax = "vmasm"
   endif
-enddef
+endfunc
 
-var ft_visual_basic_content = '\cVB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
+let s:ft_visual_basic_content = '\cVB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
 
-# See FTfrm() for Visual Basic form file detection
-export def FTbas()
+" See FTfrm() for Visual Basic form file detection
+func polyglot#ft#FTbas()
   if exists("g:filetype_bas")
-    exe "setf " .. g:filetype_bas
+    exe "setf " . g:filetype_bas
     return
   endif
 
-  # most frequent FreeBASIC-specific keywords in distro files
-  var fb_keywords = '\c^\s*\%(extern\|var\|enum\|private\|scope\|union\|byref\|operator\|constructor\|delete\|namespace\|public\|property\|with\|destructor\|using\)\>\%(\s*[:=(]\)\@!'
-  var fb_preproc  = '\c^\s*\%(#\a\+\|option\s\+\%(byval\|dynamic\|escape\|\%(no\)\=gosub\|nokeyword\|private\|static\)\>\)'
-  var fb_comment  = "^\\s*/'"
-  # OPTION EXPLICIT, without the leading underscore, is common to many dialects
-  var qb64_preproc = '\c^\s*\%($\a\+\|option\s\+\%(_explicit\|_\=explicitarray\)\>\)'
+  " most frequent FreeBASIC-specific keywords in distro files
+  let fb_keywords = '\c^\s*\%(extern\|var\|enum\|private\|scope\|union\|byref\|operator\|constructor\|delete\|namespace\|public\|property\|with\|destructor\|using\)\>\%(\s*[:=(]\)\@!'
+  let fb_preproc  = '\c^\s*\%(#\a\+\|option\s\+\%(byval\|dynamic\|escape\|\%(no\)\=gosub\|nokeyword\|private\|static\)\>\)'
+  let fb_comment  = "^\\s*/'"
+  " OPTION EXPLICIT, without the leading underscore, is common to many dialects
+  let qb64_preproc = '\c^\s*\%($\a\+\|option\s\+\%(_explicit\|_\=explicitarray\)\>\)'
 
-  var lines = getline(1, min([line("$"), 100]))
+  let lines = getline(1, min([line("$"), 100]))
 
   if match(lines, fb_preproc) > -1 || match(lines, fb_comment) > -1 || match(lines, fb_keywords) > -1
     setf freebasic
@@ -88,40 +94,39 @@ export def FTbas()
   else
     setf basic
   endif
-enddef
+endfunc
 
-export def FTbtm()
+func polyglot#ft#FTbtm()
   if exists("g:dosbatch_syntax_for_btm") && g:dosbatch_syntax_for_btm
     setf dosbatch
   else
     setf btm
   endif
-enddef
+endfunc
 
-export def BindzoneCheck(default = '')
-  if getline(1) .. getline(2) .. getline(3) .. getline(4)
-	  =~ '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
+func polyglot#ft#BindzoneCheck(default)
+  if getline(1).getline(2).getline(3).getline(4) =~ '^; <<>> DiG [0-9.]\+.* <<>>\|$ORIGIN\|$TTL\|IN\s\+SOA'
     setf bindzone
-  elseif default != ''
-    exe 'setf ' .. default
+  elseif a:default != ''
+    exe 'setf ' . a:default
   endif
-enddef
+endfunc
 
-export def FTlpc()
+func polyglot#ft#FTlpc()
   if exists("g:lpc_syntax_for_c")
-    var lnum = 1
+    let lnum = 1
     while lnum <= 12
       if getline(lnum) =~# '^\(//\|inherit\|private\|protected\|nosave\|string\|object\|mapping\|mixed\)'
 	setf lpc
 	return
       endif
-      lnum += 1
+      let lnum = lnum + 1
     endwhile
   endif
   setf c
-enddef
+endfunc
 
-export def FTheader()
+func polyglot#ft#FTheader()
   if match(getline(1, min([line("$"), 200])), '^@\(interface\|end\|class\)') > -1
     if exists("g:c_syntax_for_h")
       setf objc
@@ -135,15 +140,15 @@ export def FTheader()
   else
     setf cpp
   endif
-enddef
+endfunc
 
-# This function checks if one of the first ten lines start with a '@'.  In
-# that case it is probably a change file.
-# If the first line starts with # or ! it's probably a ch file.
-# If a line has "main", "include", "//" or "/*" it's probably ch.
-# Otherwise CHILL is assumed.
-export def FTchange()
-  var lnum = 1
+" This function checks if one of the first ten lines start with a '@'.  In
+" that case it is probably a change file.
+" If the first line starts with # or ! it's probably a ch file.
+" If a line has "main", "include", "//" or "/*" it's probably ch.
+" Otherwise CHILL is assumed.
+func polyglot#ft#FTchange()
+  let lnum = 1
   while lnum <= 10
     if getline(lnum)[0] == '@'
       setf change
@@ -161,101 +166,101 @@ export def FTchange()
       setf ch
       return
     endif
-    lnum += 1
+    let lnum = lnum + 1
   endwhile
   setf chill
-enddef
+endfunc
 
-export def FTent()
-  # This function checks for valid cl syntax in the first five lines.
-  # Look for either an opening comment, '#', or a block start, '{".
-  # If not found, assume SGML.
-  var lnum = 1
+func polyglot#ft#FTent()
+  " This function checks for valid cl syntax in the first five lines.
+  " Look for either an opening comment, '#', or a block start, '{".
+  " If not found, assume SGML.
+  let lnum = 1
   while lnum < 6
-    var line = getline(lnum)
+    let line = getline(lnum)
     if line =~ '^\s*[#{]'
       setf cl
       return
     elseif line !~ '^\s*$'
-      # Not a blank line, not a comment, and not a block start,
-      # so doesn't look like valid cl code.
+      " Not a blank line, not a comment, and not a block start,
+      " so doesn't look like valid cl code.
       break
     endif
-    lnum += 1
+    let lnum = lnum + 1
   endw
   setf dtd
-enddef
+endfunc
 
-export def ExCheck()
-  var lines = getline(1, min([line("$"), 100]))
+func polyglot#ft#ExCheck()
+  let lines = getline(1, min([line("$"), 100]))
   if exists('g:filetype_euphoria')
-    exe 'setf ' .. g:filetype_euphoria
+    exe 'setf ' . g:filetype_euphoria
   elseif match(lines, '^--\|^ifdef\>\|^include\>') > -1
     setf euphoria3
   else
     setf elixir
   endif
-enddef
+endfunc
 
-export def EuphoriaCheck()
+func polyglot#ft#EuphoriaCheck()
   if exists('g:filetype_euphoria')
-    exe 'setf ' .. g:filetype_euphoria
+    exe 'setf ' . g:filetype_euphoria
   else
     setf euphoria3
   endif
-enddef
+endfunc
 
-export def DtraceCheck()
-  var lines = getline(1, min([line("$"), 100]))
+func polyglot#ft#DtraceCheck()
+  let lines = getline(1, min([line("$"), 100]))
   if match(lines, '^module\>\|^import\>') > -1
-    # D files often start with a module and/or import statement.
+    " D files often start with a module and/or import statement.
     setf d
   elseif match(lines, '^#!\S\+dtrace\|#pragma\s\+D\s\+option\|:\S\{-}:\S\{-}:') > -1
     setf dtrace
   else
     setf d
   endif
-enddef
+endfunc
 
-export def FTe()
+func polyglot#ft#FTe()
   if exists('g:filetype_euphoria')
-    exe 'setf ' .. g:filetype_euphoria
+    exe 'setf ' . g:filetype_euphoria
   else
-    var n = 1
+    let n = 1
     while n < 100 && n <= line("$")
       if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$"
 	setf specman
 	return
       endif
-      n += 1
+      let n = n + 1
     endwhile
     setf eiffel
   endif
-enddef
+endfunc
 
-export def FTfrm()
+func polyglot#ft#FTfrm()
   if exists("g:filetype_frm")
-    exe "setf " .. g:filetype_frm
+    exe "setf " . g:filetype_frm
     return
   endif
 
-  var lines = getline(1, min([line("$"), 5]))
+  let lines = getline(1, min([line("$"), 5]))
 
   if match(lines, s:ft_visual_basic_content) > -1
     setf vb
   else
     setf form
   endif
-enddef
+endfunc
 
-# Distinguish between Forth and F#.
-# Provided by Doug Kearns.
-export def FTfs()
+" Distinguish between Forth and F#.
+" Provided by Doug Kearns.
+func polyglot#ft#FTfs()
   if exists("g:filetype_fs")
-    exe "setf " .. g:filetype_fs
+    exe "setf " . g:filetype_fs
   else
-    var line = getline(nextnonblank(1))
-    # comments and colon definitions
+    let line = getline(nextnonblank(1))
+    " comments and colon definitions
     if line =~ '^\s*\.\=( ' || line =~ '^\s*\\G\= ' || line =~ '^\\$'
 	  \ || line =~ '^\s*: \S'
       setf forth
@@ -263,11 +268,11 @@ export def FTfs()
       setf fsharp
     endif
   endif
-enddef
+endfunc
 
-# Distinguish between HTML, XHTML and Django
-export def FThtml()
-  var n = 1
+" Distinguish between HTML, XHTML and Django
+func polyglot#ft#FThtml()
+  let n = 1
   while n < 10 && n <= line("$")
     if getline(n) =~ '\<DTD\s\+XHTML\s'
       setf xhtml
@@ -277,58 +282,58 @@ export def FThtml()
       setf htmldjango
       return
     endif
-    n += 1
+    let n = n + 1
   endwhile
   setf FALLBACK html
-enddef
+endfunc
 
-# Distinguish between standard IDL and MS-IDL
-export def FTidl()
-  var n = 1
+" Distinguish between standard IDL and MS-IDL
+func polyglot#ft#FTidl()
+  let n = 1
   while n < 50 && n <= line("$")
     if getline(n) =~ '^\s*import\s\+"\(unknwn\|objidl\)\.idl"'
       setf msidl
       return
     endif
-    n += 1
+    let n = n + 1
   endwhile
   setf idl
-enddef
-
-# Distinguish between "default" and Cproto prototype file. */
-export def ProtoCheck(default: string)
-  # Cproto files have a comment in the first line and a function prototype in
-  # the second line, it always ends in ";".  Indent files may also have
-  # comments, thus we can't match comments to see the difference.
-  # IDL files can have a single ';' in the second line, require at least one
-  # chacter before the ';'.
+endfunc
+
+" Distinguish between "default" and Cproto prototype file. */
+func polyglot#ft#ProtoCheck(default)
+  " Cproto files have a comment in the first line and a function prototype in
+  " the second line, it always ends in ";".  Indent files may also have
+  " comments, thus we can't match comments to see the difference.
+  " IDL files can have a single ';' in the second line, require at least one
+  " chacter before the ';'.
   if getline(2) =~ '.;$'
     setf cpp
   else
-    exe 'setf ' .. default
+    exe 'setf ' . a:default
   endif
-enddef
+endfunc
 
-export def FTm()
+func polyglot#ft#FTm()
   if exists("g:filetype_m")
-    exe "setf " .. g:filetype_m
+    exe "setf " . g:filetype_m
     return
   endif
 
-  # excluding end(for|function|if|switch|while) common to Murphi
-  var octave_block_terminators = '\<end\%(_try_catch\|classdef\|enumeration\|events\|methods\|parfor\|properties\)\>'
+  " excluding end(for|function|if|switch|while) common to Murphi
+  let octave_block_terminators = '\<end\%(_try_catch\|classdef\|enumeration\|events\|methods\|parfor\|properties\)\>'
 
-  var objc_preprocessor = '^\s*#\s*\%(import\|include\|define\|if\|ifn\=def\|undef\|line\|error\|pragma\)\>'
+  let objc_preprocessor = '^\s*#\s*\%(import\|include\|define\|if\|ifn\=def\|undef\|line\|error\|pragma\)\>'
 
-  var n = 1
-  var saw_comment = 0  # Whether we've seen a multiline comment leader.
+  let n = 1
+  let saw_comment = 0 " Whether we've seen a multiline comment leader.
   while n < 100
-    var line = getline(n)
+    let line = getline(n)
     if line =~ '^\s*/\*'
-      # /* ... */ is a comment in Objective C and Murphi, so we can't conclude
-      # it's either of them yet, but track this as a hint in case we don't see
-      # anything more definitive.
-      saw_comment = 1
+      " /* ... */ is a comment in Objective C and Murphi, so we can't conclude
+      " it's either of them yet, but track this as a hint in case we don't see
+      " anything more definitive.
+      let saw_comment = 1
     endif
     if line =~ '^\s*//' || line =~ '^\s*@import\>' || line =~ objc_preprocessor
       setf objc
@@ -339,7 +344,7 @@ export def FTm()
       setf octave
       return
     endif
-    # TODO: could be Matlab or Octave
+    " TODO: could be Matlab or Octave
     if line =~ '^\s*%'
       setf matlab
       return
@@ -352,24 +357,24 @@ export def FTm()
       setf murphi
       return
     endif
-    n += 1
+    let n = n + 1
   endwhile
 
   if saw_comment
-    # We didn't see anything definitive, but this looks like either Objective C
-    # or Murphi based on the comment leader. Assume the former as it is more
-    # common.
+    " We didn't see anything definitive, but this looks like either Objective C
+    " or Murphi based on the comment leader. Assume the former as it is more
+    " common.
     setf objc
   else
-    # Default is Matlab
+    " Default is Matlab
     setf matlab
   endif
-enddef
+endfunc
 
-export def FTmms()
-  var n = 1
+func polyglot#ft#FTmms()
+  let n = 1
   while n < 20
-    var line = getline(n)
+    let line = getline(n)
     if line =~ '^\s*\(%\|//\)' || line =~ '^\*'
       setf mmix
       return
@@ -378,78 +383,78 @@ export def FTmms()
       setf make
       return
     endif
-    n += 1
+    let n = n + 1
   endwhile
   setf mmix
-enddef
+endfunc
 
-# This function checks if one of the first five lines start with a dot.  In
-# that case it is probably an nroff file: 'filetype' is set and 1 is returned.
-export def FTnroff(): number
-  if getline(1)[0] .. getline(2)[0] .. getline(3)[0]
-    			.. getline(4)[0] .. getline(5)[0] =~ '\.'
+" This function checks if one of the first five lines start with a dot.  In
+" that case it is probably an nroff file: 'filetype' is set and 1 is returned.
+func polyglot#ft#FTnroff()
+  if getline(1)[0] . getline(2)[0] . getline(3)[0] . getline(4)[0] . getline(5)[0] =~ '\.'
     setf nroff
     return 1
   endif
   return 0
-enddef
+endfunc
 
-export def FTmm()
-  var n = 1
+func polyglot#ft#FTmm()
+  let n = 1
   while n < 20
-    if getline(n) =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)'
+    let line = getline(n)
+    if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|/\*\)'
       setf objcpp
       return
     endif
-    n += 1
+    let n = n + 1
   endwhile
   setf nroff
-enddef
+endfunc
 
-export def FTpl()
+func polyglot#ft#FTpl()
   if exists("g:filetype_pl")
-    exe "setf " .. g:filetype_pl
+    exe "setf " . g:filetype_pl
   else
-    # recognize Prolog by specific text in the first non-empty line
-    # require a blank after the '%' because Perl uses "%list" and "%translate"
-    var l = getline(nextnonblank(1))
+    " recognize Prolog by specific text in the first non-empty line
+    " require a blank after the '%' because Perl uses "%list" and "%translate"
+    let l = getline(nextnonblank(1))
     if l =~ '\<prolog\>' || l =~ '^\s*\(%\+\(\s\|$\)\|/\*\)' || l =~ ':-'
       setf prolog
     else
       setf perl
     endif
   endif
-enddef
+endfunc
 
-export def FTinc()
+func polyglot#ft#FTinc()
   if exists("g:filetype_inc")
-    exe "setf " .. g:filetype_inc
+    exe "setf " . g:filetype_inc
   else
-    var lines = getline(1) .. getline(2) .. getline(3)
+    let lines = getline(1).getline(2).getline(3)
     if lines =~? "perlscript"
       setf aspperl
     elseif lines =~ "<%"
       setf aspvbs
     elseif lines =~ "<?"
       setf php
-    # Pascal supports // comments but they're vary rarely used for file
-    # headers so assume POV-Ray
+    " Pascal supports // comments but they're vary rarely used for file
+    " headers so assume POV-Ray
     elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? s:ft_pascal_keywords
       setf pascal
     else
-      FTasmsyntax()
+      call polyglot#ft#FTasmsyntax()
       if exists("b:asmsyntax")
-	exe "setf " .. fnameescape(b:asmsyntax)
+	exe "setf " . fnameescape(b:asmsyntax)
       else
 	setf pov
       endif
     endif
   endif
-enddef
+endfunc
 
-export def FTprogress_cweb()
+func polyglot#ft#FTprogress_cweb()
   if exists("g:filetype_w")
-    exe "setf " .. g:filetype_w
+    exe "setf " . g:filetype_w
     return
   endif
   if getline(1) =~ '&ANALYZE' || getline(3) =~ '&GLOBAL-DEFINE'
@@ -457,76 +462,76 @@ export def FTprogress_cweb()
   else
     setf cweb
   endif
-enddef
+endfunc
 
-export def FTprogress_asm()
+func polyglot#ft#FTprogress_asm()
   if exists("g:filetype_i")
-    exe "setf " .. g:filetype_i
+    exe "setf " . g:filetype_i
     return
   endif
-  # This function checks for an assembly comment the first ten lines.
-  # If not found, assume Progress.
-  var lnum = 1
+  " This function checks for an assembly comment the first ten lines.
+  " If not found, assume Progress.
+  let lnum = 1
   while lnum <= 10 && lnum < line('$')
-    var line = getline(lnum)
+    let line = getline(lnum)
     if line =~ '^\s*;' || line =~ '^\*'
-      FTasm()
+      call polyglot#ft#FTasm()
       return
     elseif line !~ '^\s*$' || line =~ '^/\*'
-      # Not an empty line: Doesn't look like valid assembly code.
-      # Or it looks like a Progress /* comment
+      " Not an empty line: Doesn't look like valid assembly code.
+      " Or it looks like a Progress /* comment
       break
     endif
-    lnum += 1
+    let lnum = lnum + 1
   endw
   setf progress
-enddef
+endfunc
 
-var ft_pascal_comments = '^\s*\%({\|(\*\|//\)'
-var ft_pascal_keywords = '^\s*\%(program\|unit\|library\|uses\|begin\|procedure\|function\|const\|type\|var\)\>'
+let s:ft_pascal_comments = '^\s*\%({\|(\*\|//\)'
+let s:ft_pascal_keywords = '^\s*\%(program\|unit\|library\|uses\|begin\|procedure\|function\|const\|type\|var\)\>'
 
-export def FTprogress_pascal()
+func polyglot#ft#FTprogress_pascal()
   if exists("g:filetype_p")
-    exe "setf " .. g:filetype_p
+    exe "setf " . g:filetype_p
     return
   endif
-  # This function checks for valid Pascal syntax in the first ten lines.
-  # Look for either an opening comment or a program start.
-  # If not found, assume Progress.
-  var lnum = 1
+  " This function checks for valid Pascal syntax in the first ten lines.
+  " Look for either an opening comment or a program start.
+  " If not found, assume Progress.
+  let lnum = 1
   while lnum <= 10 && lnum < line('$')
-    var line = getline(lnum)
+    let line = getline(lnum)
     if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
       setf pascal
       return
     elseif line !~ '^\s*$' || line =~ '^/\*'
-      # Not an empty line: Doesn't look like valid Pascal code.
-      # Or it looks like a Progress /* comment
+      " Not an empty line: Doesn't look like valid Pascal code.
+      " Or it looks like a Progress /* comment
       break
     endif
-    lnum += 1
+    let lnum = lnum + 1
   endw
   setf progress
-enddef
+endfunc
 
-export def FTpp()
+func polyglot#ft#FTpp()
   if exists("g:filetype_pp")
-    exe "setf " .. g:filetype_pp
+    exe "setf " . g:filetype_pp
   else
-    var line = getline(nextnonblank(1))
+    let line = getline(nextnonblank(1))
     if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
       setf pascal
     else
       setf puppet
     endif
   endif
-enddef
+endfunc
 
-export def FTr()
-  var max = line("$") > 50 ? 50 : line("$")
+func polyglot#ft#FTr()
+  let max = line("$") > 50 ? 50 : line("$")
 
   for n in range(1, max)
-    # Rebol is easy to recognize, check for that first
+    " Rebol is easy to recognize, check for that first
     if getline(n) =~? '\<REBOL\>'
       setf rebol
       return
@@ -534,82 +539,82 @@ export def FTr()
   endfor
 
   for n in range(1, max)
-    # R has # comments
+    " R has # comments
     if getline(n) =~ '^\s*#'
       setf r
       return
     endif
-    # Rexx has /* comments */
+    " Rexx has /* comments */
     if getline(n) =~ '^\s*/\*'
       setf rexx
       return
     endif
   endfor
 
-  # Nothing recognized, use user default or assume Rexx
+  " Nothing recognized, use user default or assume Rexx
   if exists("g:filetype_r")
-    exe "setf " .. g:filetype_r
+    exe "setf " . g:filetype_r
   else
-    # Rexx used to be the default, but R appears to be much more popular.
+    " Rexx used to be the default, but R appears to be much more popular.
     setf r
   endif
-enddef
+endfunc
 
-export def McSetf()
-  # Rely on the file to start with a comment.
-  # MS message text files use ';', Sendmail files use '#' or 'dnl'
+func polyglot#ft#McSetf()
+  " Rely on the file to start with a comment.
+  " MS message text files use ';', Sendmail files use '#' or 'dnl'
   for lnum in range(1, min([line("$"), 20]))
-    var line = getline(lnum)
+    let line = getline(lnum)
     if line =~ '^\s*\(#\|dnl\)'
-      setf m4  # Sendmail .mc file
+      setf m4  " Sendmail .mc file
       return
     elseif line =~ '^\s*;'
-      setf msmessages  # MS Message text file
+      setf msmessages  " MS Message text file
       return
     endif
   endfor
   setf m4  " Default: Sendmail .mc file
-enddef
+endfunc
 
-# Called from filetype.vim and scripts.vim.
-export def SetFileTypeSH(name: string)
+" Called from filetype.vim and scripts.vim.
+func polyglot#ft#SetFileTypeSH(name)
   if did_filetype()
-    # Filetype was already detected
+    " Filetype was already detected
     return
   endif
   if expand("<amatch>") =~ g:ft_ignore_pat
     return
   endif
-  if name =~ '\<csh\>'
-    # Some .sh scripts contain #!/bin/csh.
-    SetFileTypeShell("csh")
+  if a:name =~ '\<csh\>'
+    " Some .sh scripts contain #!/bin/csh.
+    call polyglot#ft#SetFileTypeShell("csh")
     return
-  elseif name =~ '\<tcsh\>'
-    # Some .sh scripts contain #!/bin/tcsh.
-    SetFileTypeShell("tcsh")
+  elseif a:name =~ '\<tcsh\>'
+    " Some .sh scripts contain #!/bin/tcsh.
+    call polyglot#ft#SetFileTypeShell("tcsh")
     return
-  elseif name =~ '\<zsh\>'
-    # Some .sh scripts contain #!/bin/zsh.
-    SetFileTypeShell("zsh")
+  elseif a:name =~ '\<zsh\>'
+    " Some .sh scripts contain #!/bin/zsh.
+    call polyglot#ft#SetFileTypeShell("zsh")
     return
-  elseif name =~ '\<ksh\>'
-    b:is_kornshell = 1
+  elseif a:name =~ '\<ksh\>'
+    let b:is_kornshell = 1
     if exists("b:is_bash")
       unlet b:is_bash
     endif
     if exists("b:is_sh")
       unlet b:is_sh
     endif
-  elseif exists("g:bash_is_sh") || name =~ '\<bash\>' || name =~ '\<bash2\>'
-    b:is_bash = 1
+  elseif exists("g:bash_is_sh") || a:name =~ '\<bash\>' || a:name =~ '\<bash2\>'
+    let b:is_bash = 1
     if exists("b:is_kornshell")
       unlet b:is_kornshell
     endif
     if exists("b:is_sh")
       unlet b:is_sh
     endif
-  elseif name =~ '\<sh\>'
-    b:is_sh = 1
+  elseif a:name =~ '\<sh\>'
+    let b:is_sh = 1
     if exists("b:is_kornshell")
       unlet b:is_kornshell
     endif
@@ -617,76 +622,75 @@ export def SetFileTypeSH(name: string)
       unlet b:is_bash
     endif
   endif
-  SetFileTypeShell("sh")
-enddef
+  call polyglot#ft#SetFileTypeShell("sh")
+endfunc
 
-# For shell-like file types, check for an "exec" command hidden in a comment,
-# as used for Tcl.
-# Also called from scripts.vim, thus can't be local to this script.
-export def SetFileTypeShell(name: string)
+" For shell-like file types, check for an "exec" command hidden in a comment,
+" as used for Tcl.
+" Also called from scripts.vim, thus can't be local to this script.
+func polyglot#ft#SetFileTypeShell(name)
   if did_filetype()
-    # Filetype was already detected
+    " Filetype was already detected
     return
   endif
   if expand("<amatch>") =~ g:ft_ignore_pat
     return
   endif
-  var l = 2
+  let l = 2
   while l < 20 && l < line("$") && getline(l) =~ '^\s*\(#\|$\)'
-    # Skip empty and comment lines.
-    l += 1
+    " Skip empty and comment lines.
+    let l = l + 1
   endwhile
   if l < line("$") && getline(l) =~ '\s*exec\s' && getline(l - 1) =~ '^\s*#.*\\$'
-    # Found an "exec" line after a comment with continuation
-    var n = substitute(getline(l), '\s*exec\s\+\([^ ]*/\)\=', '', '')
+    " Found an "exec" line after a comment with continuation
+    let n = substitute(getline(l),'\s*exec\s\+\([^ ]*/\)\=', '', '')
     if n =~ '\<tclsh\|\<wish'
       setf tcl
       return
     endif
   endif
-  exe "setf " .. name
-enddef
+  exe "setf " . a:name
+endfunc
 
-export def CSH()
+func polyglot#ft#CSH()
   if did_filetype()
-    # Filetype was already detected
+    " Filetype was already detected
     return
   endif
   if exists("g:filetype_csh")
-    SetFileTypeShell(g:filetype_csh)
+    call polyglot#ft#SetFileTypeShell(g:filetype_csh)
   elseif &shell =~ "tcsh"
-    SetFileTypeShell("tcsh")
+    call polyglot#ft#SetFileTypeShell("tcsh")
   else
-    SetFileTypeShell("csh")
+    call polyglot#ft#SetFileTypeShell("csh")
   endif
-enddef
+endfunc
 
-var ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*'
-export def FTRules()
-  var path = expand('<amatch>:p')
+let s:ft_rules_udev_rules_pattern = '^\s*\cudev_rules\s*=\s*"\([^"]\{-1,}\)/*".*'
+func polyglot#ft#FTRules()
+  let path = expand('<amatch>:p')
   if path =~ '/\(etc/udev/\%(rules\.d/\)\=.*\.rules\|\%(usr/\)\=lib/udev/\%(rules\.d/\)\=.*\.rules\)$'
     setf udevrules
     return
   endif
   if path =~ '^/etc/ufw/'
-    setf conf  # Better than hog
+    setf conf  " Better than hog
     return
   endif
   if path =~ '^/\(etc\|usr/share\)/polkit-1/rules\.d'
     setf javascript
     return
   endif
-  var config_lines: list<string>
   try
-    config_lines = readfile('/etc/udev/udev.conf')
+    let config_lines = readfile('/etc/udev/udev.conf')
   catch /^Vim\%((\a\+)\)\=:E484/
     setf hog
     return
   endtry
-  var dir = expand('<amatch>:p:h')
+  let dir = expand('<amatch>:p:h')
   for line in config_lines
     if line =~ s:ft_rules_udev_rules_pattern
-      var udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "")
+      let udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "")
       if dir == udev_rules
 	setf udevrules
       endif
@@ -694,24 +698,24 @@ export def FTRules()
     endif
   endfor
   setf hog
-enddef
+endfunc
 
-export def SQL()
+func polyglot#ft#SQL()
   if exists("g:filetype_sql")
-    exe "setf " .. g:filetype_sql
+    exe "setf " . g:filetype_sql
   else
     setf sql
   endif
-enddef
+endfunc
 
-# If the file has an extension of 't' and is in a directory 't' or 'xt' then
-# it is almost certainly a Perl test file.
-# If the first line starts with '#' and contains 'perl' it's probably a Perl
-# file.
-# (Slow test) If a file contains a 'use' statement then it is almost certainly
-# a Perl file.
-export def FTperl(): number
-  var dirname = expand("%:p:h:t")
+" If the file has an extension of 't' and is in a directory 't' or 'xt' then
+" it is almost certainly a Perl test file.
+" If the first line starts with '#' and contains 'perl' it's probably a Perl
+" file.
+" (Slow test) If a file contains a 'use' statement then it is almost certainly
+" a Perl file.
+func polyglot#ft#FTperl()
+  let dirname = expand("%:p:h:t")
   if expand("%:e") == 't' && (dirname == 't' || dirname == 'xt')
     setf perl
     return 1
@@ -720,88 +724,86 @@ export def FTperl(): number
     setf perl
     return 1
   endif
-  var save_cursor = getpos('.')
-  call cursor(1, 1)
-  var has_use = search('^use\s\s*\k', 'c', 30) > 0
+  let save_cursor = getpos('.')
+  call cursor(1,1)
+  let has_use = search('^use\s\s*\k', 'c', 30)
   call setpos('.', save_cursor)
   if has_use
     setf perl
     return 1
   endif
   return 0
-enddef
-
-# Choose context, plaintex, or tex (LaTeX) based on these rules:
-# 1. Check the first line of the file for "%&<format>".
-# 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords.
-# 3. Default to "plain" or to g:tex_flavor, can be set in user's vimrc.
-export def FTtex()
-  var firstline = getline(1)
-  var format: string
+endfunc
+
+" Choose context, plaintex, or tex (LaTeX) based on these rules:
+" 1. Check the first line of the file for "%&<format>".
+" 2. Check the first 1000 non-comment lines for LaTeX or ConTeXt keywords.
+" 3. Default to "plain" or to g:tex_flavor, can be set in user's vimrc.
+func polyglot#ft#FTtex()
+  let firstline = getline(1)
   if firstline =~ '^%&\s*\a\+'
-    format = tolower(matchstr(firstline, '\a\+'))
-    format = substitute(format, 'pdf', '', '')
+    let format = tolower(matchstr(firstline, '\a\+'))
+    let format = substitute(format, 'pdf', '', '')
     if format == 'tex'
-      format = 'latex'
+      let format = 'latex'
     elseif format == 'plaintex'
-      format = 'plain'
+      let format = 'plain'
     endif
   elseif expand('%') =~ 'tex/context/.*/.*.tex'
-    format = 'context'
+    let format = 'context'
   else
-    # Default value, may be changed later:
-    format = exists("g:tex_flavor") ? g:tex_flavor : 'plain'
-    # Save position, go to the top of the file, find first non-comment line.
-    var save_cursor = getpos('.')
-    call cursor(1, 1)
-    var firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
-    if firstNC > 0
-      # Check the next thousand lines for a LaTeX or ConTeXt keyword.
-      var lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>'
-      var cpat = 'start\a\+\|setup\a\+\|usemodule\|enablemode\|enableregime\|setvariables\|useencoding\|usesymbols\|stelle\a\+\|verwende\a\+\|stel\a\+\|gebruik\a\+\|usa\a\+\|imposta\a\+\|regle\a\+\|utilisemodule\>'
-      var kwline = search('^\s*\\\%(' .. lpat .. '\)\|^\s*\\\(' .. cpat .. '\)',
-			      'cnp', firstNC + 1000)
-      if kwline == 1		# lpat matched
-	format = 'latex'
-      elseif kwline == 2	# cpat matched
-	format = 'context'
-      endif		# If neither matched, keep default set above.
-      # let lline = search('^\s*\\\%(' . lpat . '\)', 'cn', firstNC + 1000)
-      # let cline = search('^\s*\\\%(' . cpat . '\)', 'cn', firstNC + 1000)
-      # if cline > 0
-      #   let format = 'context'
-      # endif
-      # if lline > 0 && (cline == 0 || cline > lline)
-      #   let format = 'tex'
-      # endif
-    endif # firstNC
+    " Default value, may be changed later:
+    let format = exists("g:tex_flavor") ? g:tex_flavor : 'plain'
+    " Save position, go to the top of the file, find first non-comment line.
+    let save_cursor = getpos('.')
+    call cursor(1,1)
+    let firstNC = search('^\s*[^[:space:]%]', 'c', 1000)
+    if firstNC " Check the next thousand lines for a LaTeX or ConTeXt keyword.
+      let lpat = 'documentclass\>\|usepackage\>\|begin{\|newcommand\>\|renewcommand\>'
+      let cpat = 'start\a\+\|setup\a\+\|usemodule\|enablemode\|enableregime\|setvariables\|useencoding\|usesymbols\|stelle\a\+\|verwende\a\+\|stel\a\+\|gebruik\a\+\|usa\a\+\|imposta\a\+\|regle\a\+\|utilisemodule\>'
+      let kwline = search('^\s*\\\%(' . lpat . '\)\|^\s*\\\(' . cpat . '\)',
+			      \ 'cnp', firstNC + 1000)
+      if kwline == 1	" lpat matched
+	let format = 'latex'
+      elseif kwline == 2	" cpat matched
+	let format = 'context'
+      endif		" If neither matched, keep default set above.
+      " let lline = search('^\s*\\\%(' . lpat . '\)', 'cn', firstNC + 1000)
+      " let cline = search('^\s*\\\%(' . cpat . '\)', 'cn', firstNC + 1000)
+      " if cline > 0
+      "   let format = 'context'
+      " endif
+      " if lline > 0 && (cline == 0 || cline > lline)
+      "   let format = 'tex'
+      " endif
+    endif " firstNC
     call setpos('.', save_cursor)
-  endif # firstline =~ '^%&\s*\a\+'
+  endif " firstline =~ '^%&\s*\a\+'
 
-  # Translation from formats to file types.  TODO:  add AMSTeX, RevTex, others?
+  " Translation from formats to file types.  TODO:  add AMSTeX, RevTex, others?
   if format == 'plain'
     setf plaintex
   elseif format == 'context'
     setf context
-  else # probably LaTeX
+  else " probably LaTeX
     setf tex
   endif
   return
-enddef
+endfunc
 
-export def FTxml()
-  var n = 1
+func polyglot#ft#FTxml()
+  let n = 1
   while n < 100 && n <= line("$")
-    var line = getline(n)
-    # DocBook 4 or DocBook 5.
-    var is_docbook4 = line =~ '<!DOCTYPE.*DocBook'
-    var is_docbook5 = line =~ ' xmlns="http://docbook.org/ns/docbook"'
+    let line = getline(n)
+    " DocBook 4 or DocBook 5.
+    let is_docbook4 = line =~ '<!DOCTYPE.*DocBook'
+    let is_docbook5 = line =~ ' xmlns="http://docbook.org/ns/docbook"'
     if is_docbook4 || is_docbook5
-      b:docbk_type = "xml"
+      let b:docbk_type = "xml"
       if is_docbook5
-	b:docbk_ver = 5
+	let b:docbk_ver = 5
       else
-	b:docbk_ver = 4
+	let b:docbk_ver = 4
       endif
       setf docbk
       return
@@ -810,15 +812,15 @@ export def FTxml()
       setf xbl
       return
     endif
-    n += 1
+    let n += 1
   endwhile
   setf xml
-enddef
+endfunc
 
-export def FTy()
-  var n = 1
+func polyglot#ft#FTy()
+  let n = 1
   while n < 100 && n <= line("$")
-    var line = getline(n)
+    let line = getline(n)
     if line =~ '^\s*%'
       setf yacc
       return
@@ -827,25 +829,25 @@ export def FTy()
       setf racc
       return
     endif
-    n += 1
+    let n = n + 1
   endwhile
   setf yacc
-enddef
+endfunc
 
-export def Redif()
-  var lnum = 1
+func polyglot#ft#Redif()
+  let lnum = 1
   while lnum <= 5 && lnum < line('$')
     if getline(lnum) =~ "^\ctemplate-type:"
       setf redif
       return
     endif
-    lnum += 1
+    let lnum = lnum + 1
   endwhile
-enddef
+endfunc
 
-# This function is called for all files under */debian/patches/*, make sure not
-# to non-dep3patch files, such as README and other text files.
-export def Dep3patch()
+" This function is called for all files under */debian/patches/*, make sure not
+" to non-dep3patch files, such as README and other text files.
+func polyglot#ft#Dep3patch()
   if expand('%:t') ==# 'series'
     return
   endif
@@ -855,43 +857,44 @@ export def Dep3patch()
       setf dep3patch
       return
     elseif ln =~# '^---'
-      # end of headers found. stop processing
+      " end of headers found. stop processing
       return
     endif
   endfor
-enddef
-
-# This function checks the first 15 lines for appearance of 'FoamFile'
-# and then 'object' in a following line.
-# In that case, it's probably an OpenFOAM file
-export def FTfoam()
-    var ffile = 0
-    var lnum = 1
+endfunc
+
+" This function checks the first 15 lines for appearance of 'FoamFile'
+" and then 'object' in a following line.
+" In that case, it's probably an OpenFOAM file
+func polyglot#ft#FTfoam()
+    let ffile = 0
+    let lnum = 1
     while lnum <= 15
       if getline(lnum) =~# '^FoamFile'
-	ffile = 1
+	let ffile = 1
       elseif ffile == 1 && getline(lnum) =~# '^\s*object'
 	setf foam
 	return
       endif
-      lnum += 1
+      let lnum = lnum + 1
     endwhile
-enddef
+endfunc
 
-# Determine if a *.tf file is TF mud client or terraform
-export def FTtf()
-  var numberOfLines = line('$')
+" Determine if a *.tf file is TF mud client or terraform
+func polyglot#ft#FTtf()
+  let numberOfLines = line('$')
   for i in range(1, numberOfLines)
-    var currentLine = trim(getline(i))
-    var firstCharacter = currentLine[0]
+    let currentLine = trim(getline(i))
+    let firstCharacter = currentLine[0]
     if firstCharacter !=? ";" && firstCharacter !=? "/" && firstCharacter !=? ""
       setf terraform
       return
     endif
   endfor
   setf tf
-enddef
+endfunc
 
 
-# Uncomment this line to check for compilation errors early
-# defcompile
+" Restore 'cpoptions'
+let &cpo = s:cpo_save
+unlet s:cpo_save
diff --git a/autoload/unison.vim b/autoload/unison.vim
index e91699f02..292deda6b 100644
--- a/autoload/unison.vim
+++ b/autoload/unison.vim
@@ -66,7 +66,7 @@ function! unison#Complete(findstart, base) abort
     "
     " (List.fol<cursor>
     "  ^
-    while start > 0 && line[start - 1] !~ '\v\s|[(){}\[\]]'
+    while start > 0 && line[start - 1] !~ '\v\s|[!(){}\[\]]'
       let start -= 1
     endwhile
     return start
diff --git a/extras/filetype.vim b/extras/filetype.vim
index f9f1ae755..f6cb13a14 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -1547,9 +1547,6 @@ au BufNewFile,BufRead *.r,*.R				call polyglot#ft#FTr()
 " Remind
 au BufNewFile,BufRead .reminders,*.remind,*.rem		setf remind
 
-" ReScript
-au BufNewFile,BufRead *.res,*.resi			setf rescript
-
 " Resolv.conf
 au BufNewFile,BufRead resolv.conf		setf resolv
 
diff --git a/extras/menu.vim b/extras/menu.vim
index 12924af6f..5f4e395e1 100644
--- a/extras/menu.vim
+++ b/extras/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2022 Feb 04
+" Last Change:	2021 Dec 22
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -33,7 +33,7 @@ if exists("v:lang") || &langmenu != ""
   if strlen(s:lang) > 1 && s:lang !~? '^en_us'
     " When the language does not include the charset add 'encoding'
     if s:lang =~ '^\a\a$\|^\a\a_\a\a$'
-      let s:lang = s:lang .. '.' .. &enc
+      let s:lang = s:lang . '.' . &enc
     endif
 
     " We always use a lowercase name.
@@ -49,26 +49,26 @@ if exists("v:lang") || &langmenu != ""
     " same menu file for them.
     let s:lang = substitute(s:lang, 'iso_8859-15\=$', "latin1", "")
     menutrans clear
-    exe "runtime! lang/menu_" .. s:lang .. ".vim"
+    exe "runtime! lang/menu_" . s:lang . ".vim"
 
     if !exists("did_menu_trans")
       " There is no exact match, try matching with a wildcard added
       " (e.g. find menu_de_de.iso_8859-1.vim if s:lang == de_DE).
       let s:lang = substitute(s:lang, '\.[^.]*', "", "")
-      exe "runtime! lang/menu_" .. s:lang .. "[^a-z]*vim"
+      exe "runtime! lang/menu_" . s:lang . "[^a-z]*vim"
 
       if !exists("did_menu_trans") && s:lang =~ '_'
 	" If the language includes a region try matching without that region.
 	" (e.g. find menu_de.vim if s:lang == de_DE).
 	let langonly = substitute(s:lang, '_.*', "", "")
-	exe "runtime! lang/menu_" .. langonly .. "[^a-z]*vim"
+	exe "runtime! lang/menu_" . langonly . "[^a-z]*vim"
       endif
 
       if !exists("did_menu_trans") && strlen($LANG) > 1 && s:lang !~ '^en_us'
 	" On windows locale names are complicated, try using $LANG, it might
 	" have been set by set_init_1().  But don't do this for "en" or "en_us".
 	" But don't match "slovak" when $LANG is "sl".
-	exe "runtime! lang/menu_" .. tolower($LANG) .. "[^a-z]*vim"
+	exe "runtime! lang/menu_" . tolower($LANG) . "[^a-z]*vim"
       endif
     endif
   endif
@@ -104,19 +104,19 @@ if exists(':tlmenu')
   tlnoremenu 9999.90 &Help.&About			<C-W>:intro<CR>
 endif
 
-def s:Helpfind()
+fun! s:Helpfind()
   if !exists("g:menutrans_help_dialog")
-    g:menutrans_help_dialog = "Enter a command or word to find help on:\n\nPrepend i_ for Input mode commands (e.g.: i_CTRL-X)\nPrepend c_ for command-line editing commands (e.g.: c_<Del>)\nPrepend ' for an option name (e.g.: 'shiftwidth')"
+    let g:menutrans_help_dialog = "Enter a command or word to find help on:\n\nPrepend i_ for Input mode commands (e.g.: i_CTRL-X)\nPrepend c_ for command-line editing commands (e.g.: c_<Del>)\nPrepend ' for an option name (e.g.: 'shiftwidth')"
   endif
-  var h = inputdialog(g:menutrans_help_dialog)
+  let h = inputdialog(g:menutrans_help_dialog)
   if h != ""
-    v:errmsg = ""
-    silent! exe "help " .. h
+    let v:errmsg = ""
+    silent! exe "help " . h
     if v:errmsg != ""
       echo v:errmsg
     endif
   endif
-enddef
+endfun
 
 " File menu
 an 10.310 &File.&Open\.\.\.<Tab>:e		:browse confirm e<CR>
@@ -154,9 +154,16 @@ an 10.600 &File.-SEP4-				<Nop>
 an 10.610 &File.Sa&ve-Exit<Tab>:wqa		:confirm wqa<CR>
 an 10.620 &File.E&xit<Tab>:qa			:confirm qa<CR>
 
-def s:SelectAll()
-  exe "norm! gg" .. (&slm == "" ? "VG" : "gH\<C-O>G")
-enddef
+func s:SelectAll()
+  exe "norm! gg" . (&slm == "" ? "VG" : "gH\<C-O>G")
+endfunc
+
+func s:FnameEscape(fname)
+  if exists('*fnameescape')
+    return fnameescape(a:fname)
+  endif
+  return escape(a:fname, " \t\n*?[{`$\\%#'\"|!<")
+endfunc
 
 " Edit menu
 an 20.310 &Edit.&Undo<Tab>u			u
@@ -175,8 +182,8 @@ cnoremenu	 &Edit.&Paste<Tab>"+gP		<C-R>+
 if exists(':tlmenu')
   tlnoremenu	 &Edit.&Paste<Tab>"+gP		<C-W>"+
 endif
-exe 'vnoremenu <script> &Edit.&Paste<Tab>"+gP	' .. paste#paste_cmd['v']
-exe 'inoremenu <script> &Edit.&Paste<Tab>"+gP	' .. paste#paste_cmd['i']
+exe 'vnoremenu <script> &Edit.&Paste<Tab>"+gP	' . paste#paste_cmd['v']
+exe 'inoremenu <script> &Edit.&Paste<Tab>"+gP	' . paste#paste_cmd['i']
 nnoremenu 20.370 &Edit.Put\ &Before<Tab>[p	[p
 inoremenu	 &Edit.Put\ &Before<Tab>[p	<C-O>[p
 nnoremenu 20.380 &Edit.Put\ &After<Tab>]p	]p
@@ -207,33 +214,32 @@ an 20.425	 &Edit.-SEP3-				<Nop>
 an 20.430	 &Edit.Settings\ &Window		:options<CR>
 an 20.435	 &Edit.Startup\ &Settings		:call <SID>EditVimrc()<CR>
 
-def s:EditVimrc()
-  var fname: string
+fun! s:EditVimrc()
   if $MYVIMRC != ''
-    fname = $MYVIMRC
+    let fname = $MYVIMRC
   elseif has("win32")
     if $HOME != ''
-      fname = $HOME .. "/_vimrc"
+      let fname = $HOME . "/_vimrc"
     else
-      fname = $VIM .. "/_vimrc"
+      let fname = $VIM . "/_vimrc"
     endif
   elseif has("amiga")
-    fname = "s:.vimrc"
+    let fname = "s:.vimrc"
   else
-    fname = $HOME .. "/.vimrc"
+    let fname = $HOME . "/.vimrc"
   endif
-  fname = fnameescape(fname)
+  let fname = s:FnameEscape(fname)
   if &mod
-    exe "split " .. fname
+    exe "split " . fname
   else
-    exe "edit " .. fname
+    exe "edit " . fname
   endif
-enddef
+endfun
 
-def s:FixFText(): string
-  # Fix text in nameless register to be used with :promptfind.
+fun! s:FixFText()
+  " Fix text in nameless register to be used with :promptfind.
   return substitute(@", "[\r\n]", '\\n', 'g')
-enddef
+endfun
 
 " Edit/Global Settings
 an 20.440.100 &Edit.&Global\ Settings.Toggle\ Pattern\ &Highlight<Tab>:set\ hls!	:set hls! hls?<CR>
@@ -266,34 +272,34 @@ an <silent> 20.440.320 &Edit.&Global\ Settings.Toggle\ &Bottom\ Scrollbar :call
 an <silent> 20.440.330 &Edit.&Global\ Settings.Toggle\ &Left\ Scrollbar	:call <SID>ToggleGuiOption("l")<CR>
 an <silent> 20.440.340 &Edit.&Global\ Settings.Toggle\ &Right\ Scrollbar :call <SID>ToggleGuiOption("r")<CR>
 
-def s:SearchP()
+fun! s:SearchP()
   if !exists("g:menutrans_path_dialog")
-    g:menutrans_path_dialog = "Enter search path for files.\nSeparate directory names with a comma."
+    let g:menutrans_path_dialog = "Enter search path for files.\nSeparate directory names with a comma."
   endif
-  var n = inputdialog(g:menutrans_path_dialog, substitute(&path, '\\ ', ' ', 'g'))
+  let n = inputdialog(g:menutrans_path_dialog, substitute(&path, '\\ ', ' ', 'g'))
   if n != ""
-    &path = substitute(n, ' ', '\\ ', 'g')
+    let &path = substitute(n, ' ', '\\ ', 'g')
   endif
-enddef
+endfun
 
-def s:TagFiles()
+fun! s:TagFiles()
   if !exists("g:menutrans_tags_dialog")
-    g:menutrans_tags_dialog = "Enter names of tag files.\nSeparate the names with a comma."
+    let g:menutrans_tags_dialog = "Enter names of tag files.\nSeparate the names with a comma."
   endif
-  var n = inputdialog(g:menutrans_tags_dialog, substitute(&tags, '\\ ', ' ', 'g'))
+  let n = inputdialog(g:menutrans_tags_dialog, substitute(&tags, '\\ ', ' ', 'g'))
   if n != ""
-    &tags = substitute(n, ' ', '\\ ', 'g')
+    let &tags = substitute(n, ' ', '\\ ', 'g')
   endif
-enddef
+endfun
 
-def s:ToggleGuiOption(option: string)
-  # If a:option is already set in guioptions, then we want to remove it
-  if match(&guioptions, "\\C" .. option) > -1
-    exec "set go-=" .. option
-  else
-    exec "set go+=" .. option
-  endif
-enddef
+fun! s:ToggleGuiOption(option)
+    " If a:option is already set in guioptions, then we want to remove it
+    if match(&guioptions, "\\C" . a:option) > -1
+	exec "set go-=" . a:option
+    else
+	exec "set go+=" . a:option
+    endif
+endfun
 
 " Edit/File Settings
 
@@ -325,36 +331,34 @@ an 20.440.620.80 &Edit.F&ile\ Settings.Soft\ &Tabstop.8	:set sts=8 sts?<CR>
 
 an <silent> 20.440.630 &Edit.F&ile\ Settings.Te&xt\ Width\.\.\.  :call <SID>TextWidth()<CR>
 an <silent> 20.440.640 &Edit.F&ile\ Settings.&File\ Format\.\.\.  :call <SID>FileFormat()<CR>
-
-def s:TextWidth()
+fun! s:TextWidth()
   if !exists("g:menutrans_textwidth_dialog")
-    g:menutrans_textwidth_dialog = "Enter new text width (0 to disable formatting): "
+    let g:menutrans_textwidth_dialog = "Enter new text width (0 to disable formatting): "
   endif
-  var n = inputdialog(g:menutrans_textwidth_dialog, &tw .. '')
+  let n = inputdialog(g:menutrans_textwidth_dialog, &tw)
   if n != ""
-    # Remove leading zeros to avoid it being used as an octal number.
-    # But keep a zero by itself.
-    var tw = substitute(n, "^0*", "", "")
-    &tw = tw == '' ? 0 : tw
+    " Remove leading zeros to avoid it being used as an octal number.
+    " But keep a zero by itself.
+    let tw = substitute(n, "^0*", "", "")
+    let &tw = tw == '' ? 0 : tw
   endif
-enddef
+endfun
 
-def s:FileFormat()
+fun! s:FileFormat()
   if !exists("g:menutrans_fileformat_dialog")
-    g:menutrans_fileformat_dialog = "Select format for writing the file"
+    let g:menutrans_fileformat_dialog = "Select format for writing the file"
   endif
   if !exists("g:menutrans_fileformat_choices")
-    g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Cancel"
+    let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&Cancel"
   endif
-  var def_choice: number
   if &ff == "dos"
-    def_choice = 2
+    let def = 2
   elseif &ff == "mac"
-    def_choice = 3
+    let def = 3
   else
-    def_choice = 1
+    let def = 1
   endif
-  var n = confirm(g:menutrans_fileformat_dialog, g:menutrans_fileformat_choices, def_choice, "Question")
+  let n = confirm(g:menutrans_fileformat_dialog, g:menutrans_fileformat_choices, def, "Question")
   if n == 1
     set ff=unix
   elseif n == 2
@@ -362,33 +366,32 @@ def s:FileFormat()
   elseif n == 3
     set ff=mac
   endif
-enddef
+endfun
 
 let s:did_setup_color_schemes = 0
 
 " Setup the Edit.Color Scheme submenu
-def s:SetupColorSchemes()
+func s:SetupColorSchemes() abort
   if s:did_setup_color_schemes
     return
   endif
-  s:did_setup_color_schemes = 1
+  let s:did_setup_color_schemes = 1
 
-  var n = globpath(&runtimepath, "colors/*.vim", 1, 1)
-  n += globpath(&packpath, "pack/*/start/*/colors/*.vim", 1, 1)
-  n += globpath(&packpath, "pack/*/opt/*/colors/*.vim", 1, 1)
+  let n = globpath(&runtimepath, "colors/*.vim", 1, 1)
+  let n += globpath(&packpath, "pack/*/start/*/colors/*.vim", 1, 1)
+  let n += globpath(&packpath, "pack/*/opt/*/colors/*.vim", 1, 1)
 
-  # Ignore case for VMS and windows, sort on name
-  var names = sort(map(n, 'substitute(v:val, "\\c.*[/\\\\:\\]]\\([^/\\\\:]*\\)\\.vim", "\\1", "")'), 1)
+  " Ignore case for VMS and windows, sort on name
+  let names = sort(map(n, 'substitute(v:val, "\\c.*[/\\\\:\\]]\\([^/\\\\:]*\\)\\.vim", "\\1", "")'), 1)
 
-  # define all the submenu entries
-  var idx = 100
+  " define all the submenu entries
+  let idx = 100
   for name in names
-    exe "an 20.450." .. idx .. ' &Edit.C&olor\ Scheme.' .. name .. " :colors " .. name .. "<CR>"
-    idx += 10
+    exe "an 20.450." . idx . ' &Edit.C&olor\ Scheme.' . name . " :colors " . name . "<CR>"
+    let idx = idx + 10
   endfor
   silent! aunmenu &Edit.Show\ C&olor\ Schemes\ in\ Menu
-enddef
-
+endfun
 if exists("do_no_lazyload_menus")
   call s:SetupColorSchemes()
 else
@@ -400,33 +403,31 @@ endif
 if has("keymap")
   let s:did_setup_keymaps = 0
 
-  def s:SetupKeymaps()
+  func s:SetupKeymaps() abort
     if s:did_setup_keymaps
       return
     endif
-    s:did_setup_keymaps = 1
+    let s:did_setup_keymaps = 1
 
-    var names = globpath(&runtimepath, "keymap/*.vim", 1, 1)
-    if !empty(names)
-      var idx = 100
+    let n = globpath(&runtimepath, "keymap/*.vim", 1, 1)
+    if !empty(n)
+      let idx = 100
       an 20.460.90 &Edit.&Keymap.None :set keymap=<CR>
-      for name in names
-	# Ignore case for VMS and windows
-	var mapname = substitute(name, '\c.*[/\\:\]]\([^/\\:_]*\)\(_[0-9a-zA-Z-]*\)\=\.vim', '\1', '')
-	exe "an 20.460." .. idx .. ' &Edit.&Keymap.' .. mapname .. " :set keymap=" .. mapname .. "<CR>"
-	idx += 10
+      for name in n
+	" Ignore case for VMS and windows
+	let name = substitute(name, '\c.*[/\\:\]]\([^/\\:_]*\)\(_[0-9a-zA-Z-]*\)\=\.vim', '\1', '')
+	exe "an 20.460." . idx . ' &Edit.&Keymap.' . name . " :set keymap=" . name . "<CR>"
+	let idx = idx + 10
       endfor
     endif
     silent! aunmenu &Edit.Show\ &Keymaps\ in\ Menu
-  enddef
-
+  endfun
   if exists("do_no_lazyload_menus")
     call s:SetupKeymaps()
   else
     an <silent> 20.460 &Edit.Show\ &Keymaps\ in\ Menu :call <SID>SetupKeymaps()<CR>
   endif
 endif
-
 if has("win32") || has("gui_motif") || has("gui_gtk") || has("gui_kde") || has("gui_photon") || has("gui_mac")
   an 20.470 &Edit.Select\ Fo&nt\.\.\.	:set guifont=*<CR>
 endif
@@ -444,7 +445,7 @@ an 40.300 &Tools.&Jump\ to\ This\ Tag<Tab>g^]	g<C-]>
 vunmenu &Tools.&Jump\ to\ This\ Tag<Tab>g^]
 vnoremenu &Tools.&Jump\ to\ This\ Tag<Tab>g^]	g<C-]>
 an 40.310 &Tools.Jump\ &Back<Tab>^T		<C-T>
-an 40.320 &Tools.Build\ &Tags\ File		:exe "!" .. g:ctags_command<CR>
+an 40.320 &Tools.Build\ &Tags\ File		:exe "!" . g:ctags_command<CR>
 
 if has("folding") || has("spell")
   an 40.330 &Tools.-SEP1-						<Nop>
@@ -468,47 +469,50 @@ if has("spell")
   an <silent> 40.335.270 &Tools.&Spelling.&Find\ More\ Languages	:call <SID>SpellLang()<CR>
 
   let s:undo_spelllang = ['aun &Tools.&Spelling.&Find\ More\ Languages']
-  def s:SpellLang()
+  func s:SpellLang()
     for cmd in s:undo_spelllang
-      exe "silent! " .. cmd
+      exe "silent! " . cmd
     endfor
-    s:undo_spelllang = []
+    let s:undo_spelllang = []
 
-    var enc = &enc == "iso-8859-15" ? "latin1" : &enc
+    if &enc == "iso-8859-15"
+      let enc = "latin1"
+    else
+      let enc = &enc
+    endif
 
     if !exists("g:menutrans_set_lang_to")
-      g:menutrans_set_lang_to = 'Set Language to'
+      let g:menutrans_set_lang_to = 'Set Language to'
     endif
 
-    var found = 0
-    var _nm = ''
-    var names = globpath(&runtimepath, "spell/*." .. enc .. ".spl", 1, 1)
-    if !empty(names)
-      var n = 300
-      for f in names
-	var nm = substitute(f, '.*spell[/\\]\(..\)\.[^/\\]*\.spl', '\1', "")
+    let found = 0
+    let s = globpath(&runtimepath, "spell/*." . enc . ".spl", 1, 1)
+    if !empty(s)
+      let n = 300
+      for f in s
+	let nm = substitute(f, '.*spell[/\\]\(..\)\.[^/\\]*\.spl', '\1', "")
 	if nm != "en" && nm !~ '/'
-          _nm = nm
-	  found += 1
-	  var menuname = '&Tools.&Spelling.' .. escape(g:menutrans_set_lang_to, "\\. \t|") .. '\ "' .. nm .. '"'
-	  exe 'an 40.335.' .. n .. ' ' .. menuname .. ' :set spl=' .. nm .. ' spell<CR>'
-	  s:undo_spelllang += ['aun ' .. menuname]
+          let _nm = nm
+	  let found += 1
+	  let menuname = '&Tools.&Spelling.' . escape(g:menutrans_set_lang_to, "\\. \t|") . '\ "' . nm . '"'
+	  exe 'an 40.335.' . n . ' ' . menuname . ' :set spl=' . nm . ' spell<CR>'
+	  let s:undo_spelllang += ['aun ' . menuname]
 	endif
-	n += 10
+	let n += 10
       endfor
     endif
     if found == 0
       echomsg "Could not find other spell files"
     elseif found == 1
-      echomsg "Found spell file " .. _nm
+      echomsg "Found spell file " . _nm
     else
-      echomsg "Found " .. found .. " more spell files"
+      echomsg "Found " . found . " more spell files"
     endif
-    # Need to redo this when 'encoding' is changed.
+    " Need to redo this when 'encoding' is changed.
     augroup spellmenu
     au! EncodingChanged * call <SID>SpellLang()
     augroup END
-  enddef
+  endfun
 
 endif
 
@@ -577,67 +581,66 @@ an <silent> 40.540 &Tools.Conve&rt\ Back<Tab>:%!xxd\ -r
 
 " Use a function to do the conversion, so that it also works with 'insertmode'
 " set.
-def s:XxdConv()
-  var mod = &mod
+func s:XxdConv()
+  let mod = &mod
   if has("vms")
-    :%!mc vim:xxd
+    %!mc vim:xxd
   else
-    s:XxdFind()
-    exe '%!' .. g:xxdprogram
+    call s:XxdFind()
+    exe '%!' . g:xxdprogram
   endif
-  if getline(1) =~ "^0000000:"		# only if it worked
+  if getline(1) =~ "^0000000:"		" only if it worked
     set ft=xxd
   endif
-  &mod = mod
-enddef
+  let &mod = mod
+endfun
 
-def s:XxdBack()
-  var mod = &mod
+func s:XxdBack()
+  let mod = &mod
   if has("vms")
-    :%!mc vim:xxd -r
+    %!mc vim:xxd -r
   else
-    s:XxdFind()
-    exe '%!' .. g:xxdprogram .. ' -r'
+    call s:XxdFind()
+    exe '%!' . g:xxdprogram . ' -r'
   endif
   set ft=
   doautocmd filetypedetect BufReadPost
-  &mod = mod
-enddef
+  let &mod = mod
+endfun
 
-def s:XxdFind()
+func s:XxdFind()
   if !exists("g:xxdprogram")
-    # On the PC xxd may not be in the path but in the install directory
+    " On the PC xxd may not be in the path but in the install directory
     if has("win32") && !executable("xxd")
-      g:xxdprogram = $VIMRUNTIME .. (&shellslash ? '/' : '\') .. "xxd.exe"
+      let g:xxdprogram = $VIMRUNTIME . (&shellslash ? '/' : '\') . "xxd.exe"
       if g:xxdprogram =~ ' '
-	g:xxdprogram = '"' .. g:xxdprogram .. '"'
+	let g:xxdprogram = '"' .. g:xxdprogram .. '"'
       endif
     else
-      g:xxdprogram = "xxd"
+      let g:xxdprogram = "xxd"
     endif
   endif
-enddef
+endfun
 
 let s:did_setup_compilers = 0
 
 " Setup the Tools.Compiler submenu
-def s:SetupCompilers()
+func s:SetupCompilers() abort
   if s:did_setup_compilers
     return
   endif
-  s:did_setup_compilers = 1
-
-  var names = globpath(&runtimepath, "compiler/*.vim", 1, 1)
-  var idx = 100
-  for name in names
-    # Ignore case for VMS and windows
-    var cname = substitute(name, '\c.*[/\\:\]]\([^/\\:]*\)\.vim', '\1', '')
-    exe "an 30.440." .. idx .. ' &Tools.Se&t\ Compiler.' .. cname .. " :compiler " .. cname .. "<CR>"
-    idx += 10
+  let s:did_setup_compilers = 1
+
+  let n = globpath(&runtimepath, "compiler/*.vim", 1, 1)
+  let idx = 100
+  for name in n
+    " Ignore case for VMS and windows
+    let name = substitute(name, '\c.*[/\\:\]]\([^/\\:]*\)\.vim', '\1', '')
+    exe "an 30.440." . idx . ' &Tools.Se&t\ Compiler.' . name . " :compiler " . name . "<CR>"
+    let idx = idx + 10
   endfor
   silent! aunmenu &Tools.Show\ Compiler\ Se&ttings\ in\ Menu
-enddef
-
+endfun
 if exists("do_no_lazyload_menus")
   call s:SetupCompilers()
 else
@@ -646,13 +649,13 @@ endif
 
 " Load ColorScheme, Compiler Setting and Keymap menus when idle.
 if !exists("do_no_lazyload_menus")
-  def s:SetupLazyloadMenus()
-    s:SetupColorSchemes()
-    s:SetupCompilers()
+  func s:SetupLazyloadMenus()
+    call s:SetupColorSchemes()
+    call s:SetupCompilers()
     if has("keymap")
-      s:SetupKeymaps()
+      call s:SetupKeymaps()
     endif
-  enddef
+  endfunc
   augroup SetupLazyloadMenus
     au!
     au CursorHold,CursorHoldI * call <SID>SetupLazyloadMenus() | au! SetupLazyloadMenus
@@ -677,133 +680,135 @@ if !exists("bmenu_priority")
 endif
 
 " invoked from a BufCreate or BufFilePost autocommand
-def s:BMAdd()
+func s:BMAdd()
   if s:bmenu_wait == 0
-    # when adding too many buffers, redraw in short format
+    " when adding too many buffers, redraw in short format
     if s:bmenu_count == &menuitems && s:bmenu_short == 0
-      s:BMShow()
+      call s:BMShow()
     else
-      var name = expand("<afile>")
-      var num = str2nr(expand("<abuf>"))
+      let name = expand("<afile>")
+      let num = expand("<abuf>") + 0 " add zero to convert to a number type
       if s:BMCanAdd(name, num)
-	s:BMFilename(name, num)
-	s:bmenu_count += 1
+	call <SID>BMFilename(name, num)
+	let s:bmenu_count += 1
       endif
     endif
   endif
-enddef
+endfunc
 
 " invoked from a BufDelete or BufFilePre autocommand
-def s:BMRemove()
+func s:BMRemove()
   if s:bmenu_wait == 0
-    var bufnum = expand("<abuf>")
+    let bufnum = expand("<abuf>")
     if s:bmenu_items->has_key(bufnum)
-      var menu_name = s:bmenu_items[bufnum]
-      exe 'silent! aun &Buffers.' .. menu_name
-      s:bmenu_count = s:bmenu_count - 1
+      let menu_name = s:bmenu_items[bufnum]
+      exe 'silent! aun &Buffers.' . menu_name
+      let s:bmenu_count = s:bmenu_count - 1
       unlet s:bmenu_items[bufnum]
     endif
   endif
-enddef
+endfunc
 
 " Return non-zero if buffer with number "name" / "num" is useful to add in the
 " buffer menu.
-def s:BMCanAdd(name: string, num: number): bool
-  # no directory or unlisted buffer
-  if isdirectory(name) || !buflisted(num)
-    return false
+func s:BMCanAdd(name, num)
+  " no directory or unlisted buffer
+  if isdirectory(a:name) || !buflisted(a:num)
+    return 0
   endif
 
-  # no name with control characters
-  if name =~ '[\x01-\x1f]'
-    return false
+  " no name with control characters
+  if a:name =~ '[\x01-\x1f]'
+    return 0
   endif
 
-  # no special buffer, such as terminal or popup
-  var buftype = getbufvar(num, '&buftype')
+  " no special buffer, such as terminal or popup
+  let buftype = getbufvar(a:num, '&buftype')
   if buftype != '' && buftype != 'nofile' && buftype != 'nowrite'
-    return false
+    return 0
   endif
 
-  # only existing buffers
-  return bufexists(num)
-enddef
+  " only existing buffers
+  return bufexists(a:num)
+endfunc
 
 " Create the buffer menu (delete an existing one first).
-def s:BMShow()
-  s:bmenu_wait = 1
-  s:bmenu_short = 1
-  s:bmenu_count = 0
-  s:bmenu_items = {}
-
-  # Remove old menu, if it exists; keep one entry to avoid a torn off menu to
-  # disappear.  Use try/catch to avoid setting v:errmsg
-  try 
-    unmenu &Buffers 
-  catch 
-  endtry
-  exe 'noremenu ' .. g:bmenu_priority .. ".1 &Buffers.Dummy l"
-  try 
-    unmenu! &Buffers 
-  catch 
-  endtry
-
-  # create new menu
-  exe 'an <silent> ' .. g:bmenu_priority .. ".2 &Buffers.&Refresh\\ menu :call <SID>BMShow()<CR>"
-  exe 'an ' .. g:bmenu_priority .. ".4 &Buffers.&Delete :confirm bd<CR>"
-  exe 'an ' .. g:bmenu_priority .. ".6 &Buffers.&Alternate :confirm b #<CR>"
-  exe 'an ' .. g:bmenu_priority .. ".7 &Buffers.&Next :confirm bnext<CR>"
-  exe 'an ' .. g:bmenu_priority .. ".8 &Buffers.&Previous :confirm bprev<CR>"
-  exe 'an ' .. g:bmenu_priority .. ".9 &Buffers.-SEP- :"
+func s:BMShow(...)
+  let s:bmenu_wait = 1
+  let s:bmenu_short = 1
+  let s:bmenu_count = 0
+  let s:bmenu_items = {}
+  "
+  " get new priority, if exists
+  if a:0 == 1
+    let g:bmenu_priority = a:1
+  endif
+
+  " Remove old menu, if it exists; keep one entry to avoid a torn off menu to
+  " disappear.  Use try/catch to avoid setting v:errmsg
+  try | unmenu &Buffers | catch | endtry
+  exe 'noremenu ' . g:bmenu_priority . ".1 &Buffers.Dummy l"
+  try | unmenu! &Buffers | catch | endtry
+
+  " create new menu; set 'cpo' to include the <CR>
+  let cpo_save = &cpo
+  set cpo&vim
+  exe 'an <silent> ' . g:bmenu_priority . ".2 &Buffers.&Refresh\\ menu :call <SID>BMShow()<CR>"
+  exe 'an ' . g:bmenu_priority . ".4 &Buffers.&Delete :confirm bd<CR>"
+  exe 'an ' . g:bmenu_priority . ".6 &Buffers.&Alternate :confirm b #<CR>"
+  exe 'an ' . g:bmenu_priority . ".7 &Buffers.&Next :confirm bnext<CR>"
+  exe 'an ' . g:bmenu_priority . ".8 &Buffers.&Previous :confirm bprev<CR>"
+  exe 'an ' . g:bmenu_priority . ".9 &Buffers.-SEP- :"
+  let &cpo = cpo_save
   unmenu &Buffers.Dummy
 
-  # figure out how many buffers there are
-  var buf = 1
+  " figure out how many buffers there are
+  let buf = 1
   while buf <= bufnr('$')
     if s:BMCanAdd(bufname(buf), buf)
-      s:bmenu_count = s:bmenu_count + 1
+      let s:bmenu_count = s:bmenu_count + 1
     endif
-    buf += 1
+    let buf = buf + 1
   endwhile
   if s:bmenu_count <= &menuitems
-    s:bmenu_short = 0
+    let s:bmenu_short = 0
   endif
 
-  # iterate through buffer list, adding each buffer to the menu:
-  buf = 1
+  " iterate through buffer list, adding each buffer to the menu:
+  let buf = 1
   while buf <= bufnr('$')
-    var name = bufname(buf)
+    let name = bufname(buf)
     if s:BMCanAdd(name, buf)
-      call s:BMFilename(name, buf)
+      call <SID>BMFilename(name, buf)
     endif
-    buf += 1
+    let buf = buf + 1
   endwhile
-  s:bmenu_wait = 0
+  let s:bmenu_wait = 0
   aug buffer_list
-    au!
-    au BufCreate,BufFilePost * call s:BMAdd()
-    au BufDelete,BufFilePre * call s:BMRemove()
+  au!
+  au BufCreate,BufFilePost * call <SID>BMAdd()
+  au BufDelete,BufFilePre * call <SID>BMRemove()
   aug END
-enddef
+endfunc
 
-def s:BMHash(name: string): number
-  # Make name all upper case, so that chars are between 32 and 96
-  var nm = substitute(name, ".*", '\U\0', "")
-  var sp: number
+func s:BMHash(name)
+  " Make name all upper case, so that chars are between 32 and 96
+  let nm = substitute(a:name, ".*", '\U\0', "")
   if has("ebcdic")
-    # HACK: Replace all non alphabetics with 'Z'
-    #       Just to make it work for now.
-    nm = substitute(nm, "[^A-Z]", 'Z', "g")
-    sp = char2nr('A') - 1
+    " HACK: Replace all non alphabetics with 'Z'
+    "       Just to make it work for now.
+    let nm = substitute(nm, "[^A-Z]", 'Z', "g")
+    let sp = char2nr('A') - 1
   else
-    sp = char2nr(' ')
+    let sp = char2nr(' ')
   endif
-  # convert first six chars into a number for sorting:
+  " convert first six chars into a number for sorting:
   return (char2nr(nm[0]) - sp) * 0x800000 + (char2nr(nm[1]) - sp) * 0x20000 + (char2nr(nm[2]) - sp) * 0x1000 + (char2nr(nm[3]) - sp) * 0x80 + (char2nr(nm[4]) - sp) * 0x20 + (char2nr(nm[5]) - sp)
-enddef
+endfunc
 
-def s:BMHash2(name: string): string
-  var nm = substitute(name, ".", '\L\0', "")
+func s:BMHash2(name)
+  let nm = substitute(a:name, ".", '\L\0', "")
+  " Not exactly right for EBCDIC...
   if nm[0] < 'a' || nm[0] > 'z'
     return '&others.'
   elseif nm[0] <= 'd'
@@ -819,70 +824,72 @@ def s:BMHash2(name: string): string
   else
     return '&u-z.'
   endif
-enddef
+endfunc
 
 " Insert a buffer name into the buffer menu.
-def s:BMFilename(name: string, num: number)
-  var munge = s:BMMunge(name, num)
-  var hash = s:BMHash(munge)
-  var cmd: string
+func s:BMFilename(name, num)
+  let munge = <SID>BMMunge(a:name, a:num)
+  let hash = <SID>BMHash(munge)
   if s:bmenu_short == 0
-    s:bmenu_items[num] = munge
-    cmd = 'an ' .. g:bmenu_priority .. '.' .. hash .. ' &Buffers.' .. munge
+    let s:bmenu_items[a:num] = munge
+    let cmd = 'an ' . g:bmenu_priority . '.' . hash . ' &Buffers.' . munge
   else
-    var menu_name = s:BMHash2(munge) .. munge
-    s:bmenu_items[num] = menu_name
-    cmd = 'an ' .. g:bmenu_priority .. '.' .. hash .. '.' .. hash .. ' &Buffers.' .. menu_name
+    let menu_name = <SID>BMHash2(munge) . munge
+    let s:bmenu_items[a:num] = menu_name
+    let cmd = 'an ' . g:bmenu_priority . '.' . hash . '.' . hash . ' &Buffers.' . menu_name
   endif
-  exe cmd .. ' :confirm b' .. num .. '<CR>'
-enddef
+  " set 'cpo' to include the <CR>
+  let cpo_save = &cpo
+  set cpo&vim
+  exe cmd . ' :confirm b' . a:num . '<CR>'
+  let &cpo = cpo_save
+endfunc
 
 " Truncate a long path to fit it in a menu item.
 if !exists("g:bmenu_max_pathlen")
   let g:bmenu_max_pathlen = 35
 endif
-
-def s:BMTruncName(fname: string): string
-  var name = fname
+func s:BMTruncName(fname)
+  let name = a:fname
   if g:bmenu_max_pathlen < 5
-    name = ""
+    let name = ""
   else
-    var len = strlen(name)
+    let len = strlen(name)
     if len > g:bmenu_max_pathlen
-      var amountl = (g:bmenu_max_pathlen / 2) - 2
-      var amountr = g:bmenu_max_pathlen - amountl - 3
-      var pattern = '^\(.\{,' .. amountl .. '}\).\{-}\(.\{,' .. amountr .. '}\)$'
-      var left = substitute(name, pattern, '\1', '')
-      var right = substitute(name, pattern, '\2', '')
+      let amountl = (g:bmenu_max_pathlen / 2) - 2
+      let amountr = g:bmenu_max_pathlen - amountl - 3
+      let pattern = '^\(.\{,' . amountl . '}\).\{-}\(.\{,' . amountr . '}\)$'
+      let left = substitute(name, pattern, '\1', '')
+      let right = substitute(name, pattern, '\2', '')
       if strlen(left) + strlen(right) < len
-	name = left .. '...' .. right
+	let name = left . '...' . right
       endif
     endif
   endif
   return name
-enddef
+endfunc
 
-def s:BMMunge(fname: string, bnum: number): string
-  var name = fname
+func s:BMMunge(fname, bnum)
+  let name = a:fname
   if name == ''
     if !exists("g:menutrans_no_file")
-      g:menutrans_no_file = "[No Name]"
+      let g:menutrans_no_file = "[No Name]"
     endif
-    name = g:menutrans_no_file
+    let name = g:menutrans_no_file
   else
-    name = fnamemodify(name, ':p:~')
+    let name = fnamemodify(name, ':p:~')
   endif
-  # detach file name and separate it out:
-  var name2 = fnamemodify(name, ':t')
-  if bnum >= 0
-    name2 = name2 .. ' (' .. bnum .. ')'
+  " detach file name and separate it out:
+  let name2 = fnamemodify(name, ':t')
+  if a:bnum >= 0
+    let name2 = name2 . ' (' . a:bnum . ')'
   endif
-  name = name2 .. "\t" .. s:BMTruncName(fnamemodify(name, ':h'))
-  name = escape(name, "\\. \t|")
-  name = substitute(name, "&", "&&", "g")
-  name = substitute(name, "\n", "^@", "g")
+  let name = name2 . "\t" . <SID>BMTruncName(fnamemodify(name,':h'))
+  let name = escape(name, "\\. \t|")
+  let name = substitute(name, "&", "&&", "g")
+  let name = substitute(name, "\n", "^@", "g")
   return name
-enddef
+endfunc
 
 " When just starting Vim, load the buffer menu later
 if has("vim_starting")
@@ -903,13 +910,13 @@ an 70.320 &Window.Sp&lit\ To\ #<Tab>^W^^	<C-W><C-^>
 an 70.330 &Window.Split\ &Vertically<Tab>^Wv	<C-W>v
 an <silent> 70.332 &Window.Split\ File\ E&xplorer	:call MenuExplOpen()<CR>
 if !exists("*MenuExplOpen")
-  def MenuExplOpen()
+  fun MenuExplOpen()
     if @% == ""
-      :20vsp .
+      20vsp .
     else
-      exe ":20vsp " .. fnameescape(expand("%:p:h"))
+      exe "20vsp " . s:FnameEscape(expand("%:p:h"))
     endif
-  enddef
+  endfun
 endif
 an 70.335 &Window.-SEP1-				<Nop>
 an 70.340 &Window.&Close<Tab>^Wc			:confirm close<CR>
@@ -936,8 +943,8 @@ vnoremenu 1.30 PopUp.&Copy		"+y
 cnoremenu 1.30 PopUp.&Copy		<C-Y>
 nnoremenu 1.40 PopUp.&Paste		"+gP
 cnoremenu 1.40 PopUp.&Paste		<C-R>+
-exe 'vnoremenu <script> 1.40 PopUp.&Paste	' .. paste#paste_cmd['v']
-exe 'inoremenu <script> 1.40 PopUp.&Paste	' .. paste#paste_cmd['i']
+exe 'vnoremenu <script> 1.40 PopUp.&Paste	' . paste#paste_cmd['v']
+exe 'inoremenu <script> 1.40 PopUp.&Paste	' . paste#paste_cmd['i']
 vnoremenu 1.50 PopUp.&Delete		x
 an 1.55 PopUp.-SEP2-			<Nop>
 vnoremenu 1.60 PopUp.Select\ Blockwise	<C-V>
@@ -979,75 +986,77 @@ cnoremenu <script> <silent> 1.100 PopUp.Select\ &All	<C-U>call <SID>SelectAll()<
 if has("spell")
   " Spell suggestions in the popup menu.  Note that this will slow down the
   " appearance of the menu!
-  def s:SpellPopup()
+  func s:SpellPopup()
     if exists("s:changeitem") && s:changeitem != ''
-      call s:SpellDel()
+      call <SID>SpellDel()
     endif
 
-    # Return quickly if spell checking is not enabled.
+    " Return quickly if spell checking is not enabled.
     if !&spell || &spelllang == ''
       return
     endif
 
-    var curcol = col('.')
-    var w: string
-    var a: string
-    [w, a] = spellbadword()
-    if col('.') > curcol		# don't use word after the cursor
-      w = ''
+    let curcol = col('.')
+    let [w, a] = spellbadword()
+    if col('.') > curcol		" don't use word after the cursor
+      let w = ''
     endif
     if w != ''
       if a == 'caps'
-	s:suglist = [substitute(w, '.*', '\u&', '')]
+	let s:suglist = [substitute(w, '.*', '\u&', '')]
       else
-	s:suglist = spellsuggest(w, 10)
+	let s:suglist = spellsuggest(w, 10)
       endif
       if len(s:suglist) > 0
 	if !exists("g:menutrans_spell_change_ARG_to")
-	  g:menutrans_spell_change_ARG_to = 'Change\ "%s"\ to'
+	  let g:menutrans_spell_change_ARG_to = 'Change\ "%s"\ to'
 	endif
-	s:changeitem = printf(g:menutrans_spell_change_ARG_to, escape(w, ' .'))
-	s:fromword = w
-	var pri = 1
+	let s:changeitem = printf(g:menutrans_spell_change_ARG_to, escape(w, ' .'))
+	let s:fromword = w
+	let pri = 1
+	" set 'cpo' to include the <CR>
+	let cpo_save = &cpo
+	set cpo&vim
 	for sug in s:suglist
-	  exe 'anoremenu 1.5.' .. pri .. ' PopUp.' .. s:changeitem .. '.' .. escape(sug, ' .')
-		\ .. ' :call <SID>SpellReplace(' .. pri .. ')<CR>'
-	  pri += 1
+	  exe 'anoremenu 1.5.' . pri . ' PopUp.' . s:changeitem . '.' . escape(sug, ' .')
+		\ . ' :call <SID>SpellReplace(' . pri . ')<CR>'
+	  let pri += 1
 	endfor
 
 	if !exists("g:menutrans_spell_add_ARG_to_word_list")
-	  g:menutrans_spell_add_ARG_to_word_list = 'Add\ "%s"\ to\ Word\ List'
+	  let g:menutrans_spell_add_ARG_to_word_list = 'Add\ "%s"\ to\ Word\ List'
 	endif
-	s:additem = printf(g:menutrans_spell_add_ARG_to_word_list, escape(w, ' .'))
-	exe 'anoremenu 1.6 PopUp.' .. s:additem .. ' :spellgood ' .. w .. '<CR>'
+	let s:additem = printf(g:menutrans_spell_add_ARG_to_word_list, escape(w, ' .'))
+	exe 'anoremenu 1.6 PopUp.' . s:additem . ' :spellgood ' . w . '<CR>'
 
 	if !exists("g:menutrans_spell_ignore_ARG")
-	  g:menutrans_spell_ignore_ARG = 'Ignore\ "%s"'
+	  let g:menutrans_spell_ignore_ARG = 'Ignore\ "%s"'
 	endif
-	s:ignoreitem = printf(g:menutrans_spell_ignore_ARG, escape(w, ' .'))
-	exe 'anoremenu 1.7 PopUp.' .. s:ignoreitem .. ' :spellgood! ' .. w .. '<CR>'
+	let s:ignoreitem = printf(g:menutrans_spell_ignore_ARG, escape(w, ' .'))
+	exe 'anoremenu 1.7 PopUp.' . s:ignoreitem . ' :spellgood! ' . w . '<CR>'
 
 	anoremenu 1.8 PopUp.-SpellSep- :
+	let &cpo = cpo_save
       endif
     endif
-    call cursor(0, curcol)	# put the cursor back where it was
-  enddef
+    call cursor(0, curcol)	" put the cursor back where it was
+  endfunc
 
-  def s:SpellReplace(n: number)
-    var l = getline('.')
-    # Move the cursor to the start of the word.
+  func s:SpellReplace(n)
+    let l = getline('.')
+    " Move the cursor to the start of the word.
     call spellbadword()
-    call setline('.', strpart(l, 0, col('.') - 1) .. s:suglist[n - 1]
-	  \ .. strpart(l, col('.') + len(s:fromword) - 1))
-  enddef
-
-  def s:SpellDel()
-    exe "aunmenu PopUp." .. s:changeitem
-    exe "aunmenu PopUp." .. s:additem
-    exe "aunmenu PopUp." .. s:ignoreitem
+    call setline('.', strpart(l, 0, col('.') - 1) . s:suglist[a:n - 1]
+	  \ . strpart(l, col('.') + len(s:fromword) - 1))
+  endfunc
+
+  func s:SpellDel()
+    exe "aunmenu PopUp." . s:changeitem
+    exe "aunmenu PopUp." . s:additem
+    exe "aunmenu PopUp." . s:ignoreitem
     aunmenu PopUp.-SpellSep-
-    s:changeitem = ''
-  enddef
+    let s:changeitem = ''
+  endfun
 
   augroup SpellPopupMenu
     au! MenuPopup * call <SID>SpellPopup()
@@ -1080,8 +1089,8 @@ if has("toolbar")
   cnoremenu 1.80 ToolBar.Copy		<C-Y>
   nnoremenu 1.90 ToolBar.Paste		"+gP
   cnoremenu	 ToolBar.Paste		<C-R>+
-  exe 'vnoremenu <script>	 ToolBar.Paste	' .. paste#paste_cmd['v']
-  exe 'inoremenu <script>	 ToolBar.Paste	' .. paste#paste_cmd['i']
+  exe 'vnoremenu <script>	 ToolBar.Paste	' . paste#paste_cmd['v']
+  exe 'inoremenu <script>	 ToolBar.Paste	' . paste#paste_cmd['i']
 
   if !has("gui_athena")
     an 1.95   ToolBar.-sep3-		<Nop>
@@ -1099,7 +1108,7 @@ if has("toolbar")
 
   an 1.245 ToolBar.-sep6-		<Nop>
   an 1.250 ToolBar.Make			:make<CR>
-  an 1.270 ToolBar.RunCtags		:exe "!" .. g:ctags_command<CR>
+  an 1.270 ToolBar.RunCtags		:exe "!" . g:ctags_command<CR>
   an 1.280 ToolBar.TagJump		g<C-]>
 
   an 1.295 ToolBar.-sep7-		<Nop>
@@ -1136,23 +1145,22 @@ else
 endif
 
 " Select a session to load; default to current session name if present
-def s:LoadVimSesn()
-  var name: string
+fun! s:LoadVimSesn()
   if strlen(v:this_session) > 0
-    name = fnameescape(v:this_session)
+    let name = s:FnameEscape(v:this_session)
   else
-    name = "Session.vim"
+    let name = "Session.vim"
   endif
-  execute "browse so " .. name
-enddef
+  execute "browse so " . name
+endfun
 
 " Select a session to save; default to current session name if present
-def s:SaveVimSesn()
+fun! s:SaveVimSesn()
   if strlen(v:this_session) == 0
-    v:this_session = "Session.vim"
+    let v:this_session = "Session.vim"
   endif
-  execute "browse mksession! " .. fnameescape(v:this_session)
-enddef
+  execute "browse mksession! " . s:FnameEscape(v:this_session)
+endfun
 
 endif
 
@@ -1165,7 +1173,7 @@ if !exists("did_install_syntax_menu")
   an 50.214 &Syntax.A&utomatic		:syn on<CR>
   an <silent> 50.216 &Syntax.On/Off\ for\ &This\ File :call <SID>SynOnOff()<CR>
   if !exists("*s:SynOnOff")
-    def s:SynOnOff()
+    fun s:SynOnOff()
       if has("syntax_items")
 	syn clear
       else
@@ -1174,7 +1182,7 @@ if !exists("did_install_syntax_menu")
 	endif
 	set syn=ON
       endif
-    enddef
+    endfun
   endif
 endif
 
@@ -1201,9 +1209,6 @@ an 50.710 &Syntax.Co&lor\ Test		:sp $VIMRUNTIME/syntax/colortest.vim<Bar>so %<CR
 an 50.720 &Syntax.&Highlight\ Test	:runtime syntax/hitest.vim<CR>
 an 50.730 &Syntax.&Convert\ to\ HTML	:runtime syntax/2html.vim<CR>
 
-" Uncomment the next line to compile the functions early to find any mistakes
-" defcompile
-
 endif " !exists("did_install_syntax_menu")
 
 " Restore the previous value of 'cpoptions'.
diff --git a/ftplugin/crystal.vim b/ftplugin/crystal.vim
index 3d0887b68..2e6a96fcb 100644
--- a/ftplugin/crystal.vim
+++ b/ftplugin/crystal.vim
@@ -53,7 +53,7 @@ if get(g:, 'crystal_define_mappings', 1)
   nmap <buffer>gsc <Plug>(crystal-spec-run-current)
 endif
 
-if &l:ofu ==# ''
+if &l:ofu ==# '' && get(g:, 'crystal_enable_completion', 1)
   setlocal omnifunc=crystal_lang#complete
 endif
 
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index dd84aa702..1213c6b70 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -26,7 +26,7 @@ setlocal fo-=t fo+=croql
 let b:julia_vim_loaded = 1
 
 let b:undo_ftplugin = "setlocal include< suffixesadd< comments< commentstring<"
-      \ . " define< fo< shiftwidth< expandtab< indentexpr< indentkeys< cinoptions< completefunc<"
+      \ . " define< fo< indentexpr< indentkeys< cinoptions< completefunc<"
       \ . " | unlet! b:commentary_format"
       \ . " | unlet! b:smartcomment_force_linemode"
       \ . " | unlet! b:julia_vim_loaded"
diff --git a/ftplugin/plantuml.vim b/ftplugin/plantuml.vim
index 5d59c507b..088559518 100644
--- a/ftplugin/plantuml.vim
+++ b/ftplugin/plantuml.vim
@@ -2,7 +2,6 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'plantuml', 'ftplugin/plantuml
   finish
 endif
 
-scriptencoding utf-8
 " Vim filetype plugin file
 " Language:     PlantUML
 " License:      VIM LICENSE
diff --git a/indent/plantuml.vim b/indent/plantuml.vim
index 1bf9d13e6..81dc5049c 100644
--- a/indent/plantuml.vim
+++ b/indent/plantuml.vim
@@ -2,7 +2,6 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'plantuml', 'indent/plantuml.v
   finish
 endif
 
-scriptencoding utf-8
 " Vim indent file
 " Language:     PlantUML
 " License:      VIM LICENSE
diff --git a/indent/yaml.vim b/indent/yaml.vim
index f19e76844..6c674b3bf 100644
--- a/indent/yaml.vim
+++ b/indent/yaml.vim
@@ -3,18 +3,16 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'yaml', 'indent/yaml.vim')
 endif
 
 " Vim indent file
-" Language:         YAML
-" Maintainer:       Nikolai Pavlov <zyx.vim@gmail.com>
-" Last Change:	    2019 Sep 28
+" Language:	YAML
+" Maintainer:	Nikolai Pavlov <zyx.vim@gmail.com>
+" Last Update:	Lukas Reineke
+" Last Change:	2021 Aug 13
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
   finish
 endif
 
-let s:save_cpo = &cpo
-set cpo&vim
-
 let b:did_indent = 1
 
 setlocal indentexpr=GetYAMLIndent(v:lnum)
@@ -28,6 +26,9 @@ if exists('*GetYAMLIndent')
     finish
 endif
 
+let s:save_cpo = &cpo
+set cpo&vim
+
 function s:FindPrevLessIndentedLine(lnum, ...)
     let prevlnum = prevnonblank(a:lnum-1)
     let curindent = a:0 ? a:1 : indent(a:lnum)
@@ -57,7 +58,7 @@ let s:c_ns_anchor_name = s:c_ns_anchor_char.'+'
 let s:c_ns_anchor_property =  '\v\&'.s:c_ns_anchor_name
 
 let s:ns_word_char = '\v[[:alnum:]_\-]'
-let s:ns_tag_char  = '\v%(%\x\x|'.s:ns_word_char.'|[#/;?:@&=+$.~*''()])'
+let s:ns_tag_char  = '\v%('.s:ns_word_char.'|[#/;?:@&=+$.~*''()])'
 let s:c_named_tag_handle     = '\v\!'.s:ns_word_char.'+\!'
 let s:c_secondary_tag_handle = '\v\!\!'
 let s:c_primary_tag_handle   = '\v\!'
@@ -66,7 +67,7 @@ let s:c_tag_handle = '\v%('.s:c_named_tag_handle.
             \            '|'.s:c_primary_tag_handle.')'
 let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+'
 let s:c_non_specific_tag = '\v\!'
-let s:ns_uri_char  = '\v%(%\x\x|'.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])'
+let s:ns_uri_char  = '\v%('.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])'
 let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>'
 let s:c_ns_tag_property = '\v'.s:c_verbatim_tag.
             \               '\v|'.s:c_ns_shorthand_tag.
diff --git a/packages.yaml b/packages.yaml
index 77979123d..e0b3db529 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -1,6 +1,6 @@
 ---
 name: 8th
-remote: vim/vim:runtime
+native: true
 glob: '**/8th.vim'
 filetypes:
 - name: 8th
@@ -9,7 +9,7 @@ filetypes:
   - 8th
 ---
 name: a2ps
-remote: vim/vim:runtime
+native: true
 glob: '**/a2ps.vim'
 filetypes:
 - name: a2ps
@@ -20,7 +20,7 @@ filetypes:
   - .a2psrc
 ---
 name: a65
-remote: vim/vim:runtime
+native: true
 glob: '**/a65.vim'
 filetypes:
 - name: a65
@@ -29,7 +29,7 @@ filetypes:
   - a65
 ---
 name: aap
-remote: vim/vim:runtime
+native: true
 glob: '**/aap.vim'
 filetypes:
 - name: aap
@@ -38,7 +38,7 @@ filetypes:
   - aap
 ---
 name: abap
-remote: vim/vim:runtime
+native: true
 glob: '**/abap.vim'
 filetypes:
 - name: abap
@@ -47,7 +47,7 @@ filetypes:
   - abap
 ---
 name: abaqus
-remote: vim/vim:runtime
+native: true
 glob: '**/abaqus.vim'
 filetypes:
 - name: abaqus
@@ -55,7 +55,7 @@ filetypes:
   - inp
 ---
 name: abc
-remote: vim/vim:runtime
+native: true
 glob: '**/abc.vim'
 filetypes:
 - name: abc
@@ -64,7 +64,7 @@ filetypes:
   - abc
 ---
 name: abel
-remote: vim/vim:runtime
+native: true
 glob: '**/abel.vim'
 filetypes:
 - name: abel
@@ -73,7 +73,7 @@ filetypes:
   - abl
 ---
 name: acedb
-remote: vim/vim:runtime
+native: true
 glob: '**/acedb.vim'
 filetypes:
 - name: acedb
@@ -90,7 +90,7 @@ filetypes:
   - dsl
 ---
 name: ada
-remote: vim/vim:runtime
+native: true
 glob: '**/ada.vim'
 filetypes:
 - name: ada
@@ -104,7 +104,7 @@ filetypes:
   - ada_m
 ---
 name: ahdl
-remote: vim/vim:runtime
+native: true
 glob: '**/ahdl.vim'
 filetypes:
 - name: ahdl
@@ -113,7 +113,7 @@ filetypes:
   - tdf
 ---
 name: aidl
-remote: vim/vim:runtime
+native: true
 glob: '**/aidl.vim'
 filetypes:
 - name: aidl
@@ -122,7 +122,7 @@ filetypes:
   - aidl
 ---
 name: alsaconf
-remote: vim/vim:runtime
+native: true
 glob: '**/alsaconf.vim'
 filetypes:
 - name: alsaconf
@@ -132,7 +132,7 @@ filetypes:
   - '*/etc/asound.conf'
 ---
 name: aml
-remote: vim/vim:runtime
+native: true
 glob: '**/aml.vim'
 filetypes:
 - name: aml
@@ -140,7 +140,7 @@ filetypes:
   - aml
 ---
 name: ampl
-remote: vim/vim:runtime
+native: true
 glob: '**/ampl.vim'
 filetypes:
 - name: ampl
@@ -149,7 +149,7 @@ filetypes:
   - run
 ---
 name: ant
-remote: vim/vim:runtime
+native: true
 glob: '**/ant.vim'
 filetypes:
 - name: ant
@@ -157,7 +157,7 @@ filetypes:
   - build.xml
 ---
 name: apache
-remote: vim/vim:runtime
+native: true
 glob: '**/apache.vim'
 filetypes:
 - name: apache
@@ -192,7 +192,7 @@ filetypes:
   linguist: AppleScript
 ---
 name: aptconf
-remote: vim/vim:runtime
+native: true
 glob: '**/aptconf.vim'
 filetypes:
 - name: aptconf
@@ -208,7 +208,7 @@ filetypes:
   - '*/etc/apt/apt.conf.d/]\+.conf'
 ---
 name: arch
-remote: vim/vim:runtime
+native: true
 glob: '**/arch.vim'
 filetypes:
 - name: arch
@@ -226,7 +226,7 @@ filetypes:
   - ino
 ---
 name: art
-remote: vim/vim:runtime
+native: true
 glob: '**/art.vim'
 filetypes:
 - name: art
@@ -246,7 +246,7 @@ filetypes:
   linguist: AutoHotkey
 ---
 name: make
-remote: vim/vim:runtime
+native: true
 glob: '**/make.vim'
 filetypes:
 - name: make
@@ -258,7 +258,7 @@ filetypes:
   - mk
 ---
 name: automake
-remote: vim/vim:runtime
+native: true
 glob: '**/automake.vim'
 filetypes:
 - name: automake
@@ -267,7 +267,7 @@ filetypes:
   - GNUmakefile.am
 ---
 name: asn
-remote: vim/vim:runtime
+native: true
 glob: '**/asn.vim'
 filetypes:
 - name: asn
@@ -276,7 +276,7 @@ filetypes:
   - asn1
 ---
 name: aspvbs
-remote: vim/vim:runtime
+native: true
 globs:
 - '**/aspvbs.vim'
 filetypes:
@@ -286,7 +286,7 @@ filetypes:
   - asp
 ---
 name: aspperl
-remote: vim/vim:runtime
+native: true
 globs:
 - '**/aspperl.vim'
 filetypes:
@@ -295,7 +295,7 @@ filetypes:
   - asp
 ---
 name: atlas
-remote: vim/vim:runtime
+native: true
 glob: '**/atlas.vim'
 filetypes:
 - name: atlas
@@ -304,7 +304,7 @@ filetypes:
   - as
 ---
 name: autoit
-remote: vim/vim:runtime
+native: true
 glob: '**/autoit.vim'
 filetypes:
 - name: autoit
@@ -312,7 +312,7 @@ filetypes:
   - au3
 ---
 name: ave
-remote: vim/vim:runtime
+native: true
 glob: '**/ave.vim'
 filetypes:
 - name: ave
@@ -320,7 +320,7 @@ filetypes:
   - ave
 ---
 name: awk
-remote: vim/vim:runtime
+native: true
 glob: '**/awk.vim'
 filetypes:
 - name: awk
@@ -513,7 +513,7 @@ filetypes:
   - 'docker-compose*.yml*'
 ---
 name: elf
-remote: vim/vim:runtime
+native: true
 glob: '**/elf.vim'
 filetypes:
 - name: elf
@@ -589,7 +589,7 @@ filetypes:
   - fbs
 ---
 name: forth
-remote: vim/vim:runtime
+native: true
 glob: '**/forth.vim'
 filetypes:
 - name: forth
@@ -705,7 +705,7 @@ dependencies: groovy
 filetypes: []
 ---
 name: groovy
-remote: vim/vim:runtime
+native: true
 glob: '**/groovy.vim'
 filetypes:
 - name: groovy
@@ -714,7 +714,7 @@ filetypes:
   - gradle
 ---
 name: grub
-remote: vim/vim:runtime
+native: true
 glob: '**/grub.vim'
 filetypes:
 - name: grub
@@ -865,7 +865,7 @@ filetypes:
   - Jenkinsfile*
 ---
 name: htmldjango
-remote: vim/vim:runtime
+native: true
 globs:
 - '**/django.vim'
 - '**/htmldjango.vim'
@@ -954,7 +954,7 @@ filetypes:
   - journal
 ---
 name: less
-remote: vim/vim:runtime
+native: true
 glob: '**/less.vim'
 filetypes:
 - name: less
@@ -999,7 +999,7 @@ filetypes:
   linguist: Lua
 ---
 name: m4
-remote: vim/vim:runtime
+native: true
 glob: '**/m4.vim'
 filetypes:
 - name: m4
@@ -1061,7 +1061,7 @@ filetypes:
   linguist: MoonScript
 ---
 name: murphi
-remote: vim/vim:runtime
+native: true
 glob: '**/murphi.vim'
 filetypes:
 - name: murphi
@@ -1737,7 +1737,7 @@ filetypes:
   - vm
 ---
 name: vmasm
-remote: vim/vim:runtime
+native: true
 glob: '**/vmasm.vim'
 filetypes:
 - name: vmasm
@@ -1788,9 +1788,9 @@ filetypes:
 - name: xsl
   linguist: XSLT
 ---
-name: yaml
 # Fixes indentation issue: https://github.com/vim/vim/issues/6417
-remote: vim/vim@df44a27b53586fccfc6a3aedc89061fdd9a515ff:runtime
+name: yaml
+native: true
 glob: '**/yaml.vim'
 filetypes:
 - name: yaml
@@ -1854,7 +1854,7 @@ filetypes:
   - zir
 ---
 name: trasys
-remote: vim/vim:runtime
+native: true
 glob: '**/trasys.vim'
 filetypes:
 - name: trasys
@@ -1862,7 +1862,7 @@ filetypes:
   - inp
 ---
 name: basic
-remote: vim/vim:runtime
+native: true
 glob: '**/basic.vim'
 filetypes:
 - name: basic
@@ -1870,7 +1870,7 @@ filetypes:
   - basic
 ---
 name: visual-basic
-remote: vim/vim:runtime
+native: true
 glob: '**/vb.vim'
 filetypes:
 - name: vb
@@ -1885,7 +1885,7 @@ filetypes:
   - '*.vb'
 ---
 name: dosini
-remote: vim/vim:runtime
+native: true
 glob: '**/dosini.vim'
 filetypes:
 - name: dosini
@@ -1907,7 +1907,7 @@ filetypes:
   linguist: Odin
 ---
 name: bzl
-remote: vim/vim:runtime
+native: true
 glob: '**/bzl.vim'
 filetypes:
 - name: bzl
@@ -1917,7 +1917,7 @@ filetypes:
   - BUILD
 ---
 name: prolog
-remote: vim/vim:runtime
+native: true
 glob: '**/prolog.vim'
 filetypes:
 - name: prolog
@@ -1926,7 +1926,7 @@ filetypes:
   - pdb
 ---
 name: tads
-remote: vim/vim:runtime
+native: true
 glob: '**/tads.vim'
 filetypes:
 - name: tads
@@ -1943,7 +1943,7 @@ filetypes:
   - '*.git/info/exclude'
 ---
 name: sql
-remote: vim/vim:runtime
+native: true
 glob: 
 - '**/sql.vim'
 - '**/sqloracle.vim'
@@ -1956,7 +1956,7 @@ filetypes:
   - tyc
 ---
 name: conf
-remote: vim/vim:runtime
+native: true
 glob: '**/conf.vim'
 filetypes:
 - name: conf
@@ -1968,7 +1968,7 @@ filetypes:
   - '*/etc/hosts'
 ---
 name: b
-remote: vim/vim:runtime
+native: true
 glob: '**/b.vim'
 filetypes:
 - name: b
@@ -1978,7 +1978,7 @@ filetypes:
   - imp
 ---
 name: ibasic
-remote: vim/vim:runtime
+native: true
 glob: '**/ibasic.vim'
 filetypes:
 - name: ibasic
@@ -1987,7 +1987,7 @@ filetypes:
   - ibi
 ---
 name: freebasic
-remote: vim/vim:runtime
+native: true
 glob: '**/freebasic.vim'
 filetypes:
 - name: freebasic
@@ -1996,7 +1996,7 @@ filetypes:
   - bi
 ---
 name: hamster
-remote: vim/vim:runtime
+native: true
 glob: '**/hamster.vim'
 filetypes:
 - name: hamster
@@ -2005,7 +2005,7 @@ filetypes:
   - hsm
 ---
 name: dosbatch
-remote: vim/vim:runtime
+native: true
 glob: "**/dosbatch.vim"
 filetypes:
 - name: dosbatch
@@ -2014,7 +2014,7 @@ filetypes:
     description: Batch file for MSDOS.
 ---
 name: bc
-remote: vim/vim:runtime
+native: true
 glob: "**/bc.vim"
 filetypes:
 - name: bc
@@ -2023,7 +2023,7 @@ filetypes:
     description: BC calculator
 ---
 name: bdf
-remote: vim/vim:runtime
+native: true
 glob: "**/bdf.vim"
 filetypes:
 - name: bdf
@@ -2032,7 +2032,7 @@ filetypes:
     description: BDF font
 ---
 name: bib
-remote: vim/vim:runtime
+native: true
 glob: "**/bib.vim"
 filetypes:
 - name: bib
@@ -2041,7 +2041,7 @@ filetypes:
     description: BibTeX bibliography database file
 ---
 name: bst
-remote: vim/vim:runtime
+native: true
 glob: "**/bst.vim"
 filetypes:
 - name: bst
@@ -2050,7 +2050,7 @@ filetypes:
     description: BibTeX Bibliography Style
 ---
 name: named
-remote: vim/vim:runtime
+native: true
 glob: "**/named.vim"
 filetypes:
 - name: named
@@ -2059,7 +2059,7 @@ filetypes:
     description: sudoedit uses namedXXXX.conf
 ---
 name: bindzone
-remote: vim/vim:runtime
+native: true
 glob: "**/bindzone.vim"
 filetypes:
 - name: bindzone
@@ -2069,7 +2069,7 @@ filetypes:
   - pattern: "*/named/db.*,*/bind/db.*"
 ---
 name: blank
-remote: vim/vim:runtime
+native: true
 glob: "**/blank.vim"
 filetypes:
 - name: blank
@@ -2078,7 +2078,7 @@ filetypes:
     description: Blank
 ---
 name: bsdl
-remote: vim/vim:runtime
+native: true
 glob: "**/bsdl.vim"
 filetypes:
 - name: bsdl
@@ -2087,7 +2087,7 @@ filetypes:
     description: BSDL
 ---
 name: lpc
-remote: vim/vim:runtime
+native: true
 glob: "**/lpc.vim"
 filetypes:
 - name: lpc
@@ -2096,7 +2096,7 @@ filetypes:
     description: C or lpc
 ---
 name: calendar
-remote: vim/vim:runtime
+native: true
 glob: "**/calendar.vim"
 filetypes:
 - name: calendar
@@ -2106,7 +2106,7 @@ filetypes:
   - pattern: "*/.calendar/*,*/share/calendar/*/calendar.*,*/share/calendar/calendar.*"
 ---
 name: cs
-remote: vim/vim:runtime
+native: true
 glob: "**/cs.vim"
 filetypes:
 - name: cs
@@ -2115,7 +2115,7 @@ filetypes:
     description: C#
 ---
 name: csdl
-remote: vim/vim:runtime
+native: true
 glob: "**/csdl.vim"
 filetypes:
 - name: csdl
@@ -2124,7 +2124,7 @@ filetypes:
     description: CSDL
 ---
 name: cabal
-remote: vim/vim:runtime
+native: true
 glob: "**/cabal.vim"
 filetypes:
 - name: cabal
@@ -2133,7 +2133,7 @@ filetypes:
     description: Cabal
 ---
 name: cdrtoc
-remote: vim/vim:runtime
+native: true
 glob: "**/cdrtoc.vim"
 filetypes:
 - name: cdrtoc
@@ -2142,7 +2142,7 @@ filetypes:
     description: Cdrdao TOC
 ---
 name: cdrdaoconf
-remote: vim/vim:runtime
+native: true
 glob: "**/cdrdaoconf.vim"
 filetypes:
 - name: cdrdaoconf
@@ -2151,7 +2151,7 @@ filetypes:
     description: Cdrdao config
 ---
 name: chaiscript
-remote: vim/vim:runtime
+native: true
 glob: "**/chaiscript.vim"
 filetypes:
 - name: chaiscript
@@ -2160,7 +2160,7 @@ filetypes:
     description: ChaiScript
 ---
 name: cdl
-remote: vim/vim:runtime
+native: true
 glob: "**/cdl.vim"
 filetypes:
 - name: cdl
@@ -2169,7 +2169,7 @@ filetypes:
     description: Comshare Dimension Definition Language
 ---
 name: conaryrecipe
-remote: vim/vim:runtime
+native: true
 glob: "**/conaryrecipe.vim"
 filetypes:
 - name: conaryrecipe
@@ -2178,7 +2178,7 @@ filetypes:
     description: Conary Recipe
 ---
 name: crm
-remote: vim/vim:runtime
+native: true
 glob: "**/crm.vim"
 filetypes:
 - name: crm
@@ -2187,7 +2187,7 @@ filetypes:
     description: Controllable Regex Mutilator
 ---
 name: cynpp
-remote: vim/vim:runtime
+native: true
 glob: "**/cynpp.vim"
 filetypes:
 - name: cynpp
@@ -2196,7 +2196,7 @@ filetypes:
     description: Cyn++
 ---
 name: ch
-remote: vim/vim:runtime
+native: true
 glob: "**/ch.vim"
 filetypes:
 - name: ch
@@ -2205,7 +2205,7 @@ filetypes:
     description: Ch (CHscript)
 ---
 name: css
-remote: vim/vim:runtime
+native: true
 glob: "**/css.vim"
 filetypes:
 - name: css
@@ -2214,7 +2214,7 @@ filetypes:
     description: Cascading Style Sheets
 ---
 name: cterm
-remote: vim/vim:runtime
+native: true
 glob: "**/cterm.vim"
 filetypes:
 - name: cterm
@@ -2223,7 +2223,7 @@ filetypes:
     description: Century Term Command Scripts (*.cmd too)
 ---
 name: debchangelog
-remote: vim/vim:runtime
+native: true
 glob: "**/debchangelog.vim"
 filetypes:
 - name: debchangelog
@@ -2231,7 +2231,7 @@ filetypes:
   - pattern: changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch,*/debian/changelog
 ---
 name: chill
-remote: vim/vim:runtime
+native: true
 glob: "**/chill.vim"
 filetypes:
 - name: chill
@@ -2240,7 +2240,7 @@ filetypes:
     description: CHILL
 ---
 name: chordpro
-remote: vim/vim:runtime
+native: true
 glob: "**/chordpro.vim"
 filetypes:
 - name: chordpro
@@ -2249,7 +2249,7 @@ filetypes:
     description: ChordPro
 ---
 name: clean
-remote: vim/vim:runtime
+native: true
 glob: "**/clean.vim"
 filetypes:
 - name: clean
@@ -2258,7 +2258,7 @@ filetypes:
     description: Clean
 ---
 name: cl
-remote: vim/vim:runtime
+native: true
 glob: "**/cl.vim"
 filetypes:
 - name: cl
@@ -2267,7 +2267,7 @@ filetypes:
     description: Clever
 ---
 name: cmusrc
-remote: vim/vim:runtime
+native: true
 glob: "**/cmusrc.vim"
 filetypes:
 - name: cmusrc
@@ -2276,7 +2276,7 @@ filetypes:
     description: Cmusrc
 ---
 name: cobol
-remote: vim/vim:runtime
+native: true
 glob: "**/cobol.vim"
 filetypes:
 - name: cobol
@@ -2285,7 +2285,7 @@ filetypes:
     description: Cobol
 ---
 name: coco
-remote: vim/vim:runtime
+native: true
 glob: "**/coco.vim"
 filetypes:
 - name: coco
@@ -2294,7 +2294,7 @@ filetypes:
     description: Coco/R
 ---
 name: cf
-remote: vim/vim:runtime
+native: true
 glob: "**/cf.vim"
 filetypes:
 - name: cf
@@ -2303,7 +2303,7 @@ filetypes:
     description: Cold Fusion
 ---
 name: config
-remote: vim/vim:runtime
+native: true
 glob: "**/config.vim"
 filetypes:
 - name: config
@@ -2315,7 +2315,7 @@ filetypes:
   - pattern: "/etc/hostname.*"
 ---
 name: cuda
-remote: vim/vim:runtime
+native: true
 glob: "**/cuda.vim"
 filetypes:
 - name: cuda
@@ -2324,7 +2324,7 @@ filetypes:
     description: CUDA  Cumpute Unified Device Architecture
 ---
 name: dockerfile
-remote: vim/vim:runtime
+native: true
 glob: "**/dockerfile.vim"
 filetypes:
 - name: dockerfile
@@ -2333,7 +2333,7 @@ filetypes:
     description: Dockerfile; Podman uses the same syntax with name Containerfile
 ---
 name: dcd
-remote: vim/vim:runtime
+native: true
 glob: "**/dcd.vim"
 filetypes:
 - name: dcd
@@ -2342,7 +2342,7 @@ filetypes:
     description: WildPackets EtherPeek Decoder
 ---
 name: eterm
-remote: vim/vim:runtime
+native: true
 glob: "**/eterm.vim"
 filetypes:
 - name: eterm
@@ -2351,7 +2351,7 @@ filetypes:
     description: Eterm
 ---
 name: lynx
-remote: vim/vim:runtime
+native: true
 glob: "**/lynx.vim"
 filetypes:
 - name: lynx
@@ -2360,7 +2360,7 @@ filetypes:
     description: Lynx config files
 ---
 name: quake
-remote: vim/vim:runtime
+native: true
 glob: "**/quake.vim"
 filetypes:
 - name: quake
@@ -2369,7 +2369,7 @@ filetypes:
     description: Quake
 ---
 name: cfg
-remote: vim/vim:runtime
+native: true
 glob: "**/cfg.vim"
 filetypes:
 - name: cfg
@@ -2380,7 +2380,7 @@ filetypes:
     description: Mercurial config (looks like generic config file)
 ---
 name: csp
-remote: vim/vim:runtime
+native: true
 glob: "**/csp.vim"
 filetypes:
 - name: csp
@@ -2389,7 +2389,7 @@ filetypes:
     description: Communicating Sequential Processes
 ---
 name: cupl
-remote: vim/vim:runtime
+native: true
 glob: "**/cupl.vim"
 filetypes:
 - name: cupl
@@ -2398,7 +2398,7 @@ filetypes:
     description: CUPL logic description and simulation
 ---
 name: cuplsim
-remote: vim/vim:runtime
+native: true
 glob: "**/cuplsim.vim"
 filetypes:
 - name: cuplsim
@@ -2407,7 +2407,7 @@ filetypes:
     description: CUPL logic description and simulation
 ---
 name: debcontrol
-remote: vim/vim:runtime
+native: true
 glob: "**/debcontrol.vim"
 filetypes:
 - name: debcontrol
@@ -2416,7 +2416,7 @@ filetypes:
     description: Debian Control
 ---
 name: debcopyright
-remote: vim/vim:runtime
+native: true
 glob: "**/debcopyright.vim"
 filetypes:
 - name: debcopyright
@@ -2425,7 +2425,7 @@ filetypes:
     description: Debian Copyright
 ---
 name: debsources
-remote: vim/vim:runtime
+native: true
 glob: "**/debsources.vim"
 filetypes:
 - name: debsources
@@ -2434,7 +2434,7 @@ filetypes:
     description: Debian Sources.list
 ---
 name: denyhosts
-remote: vim/vim:runtime
+native: true
 glob: "**/denyhosts.vim"
 filetypes:
 - name: denyhosts
@@ -2443,7 +2443,7 @@ filetypes:
     description: Deny hosts
 ---
 name: dnsmasq
-remote: vim/vim:runtime
+native: true
 glob: "**/dnsmasq.vim"
 filetypes:
 - name: dnsmasq
@@ -2453,7 +2453,7 @@ filetypes:
   - pattern: "*/etc/dnsmasq.d/*"
 ---
 name: desc
-remote: vim/vim:runtime
+native: true
 glob: "**/desc.vim"
 filetypes:
 - name: desc
@@ -2462,7 +2462,7 @@ filetypes:
     description: ROCKLinux package description
 ---
 name: desktop
-remote: vim/vim:runtime
+native: true
 glob: "**/desktop.vim"
 filetypes:
 - name: desktop
@@ -2471,7 +2471,7 @@ filetypes:
     description: Desktop files
 ---
 name: dictconf
-remote: vim/vim:runtime
+native: true
 glob: "**/dictconf.vim"
 filetypes:
 - name: dictconf
@@ -2480,7 +2480,7 @@ filetypes:
     description: Dict config
 ---
 name: dictdconf
-remote: vim/vim:runtime
+native: true
 glob: "**/dictdconf.vim"
 filetypes:
 - name: dictdconf
@@ -2489,7 +2489,7 @@ filetypes:
     description: Dictd config
 ---
 name: diff
-remote: vim/vim:runtime
+native: true
 glob: "**/diff.vim"
 filetypes:
 - name: diff
@@ -2498,7 +2498,7 @@ filetypes:
     description: Diff files
 ---
 name: dircolors
-remote: vim/vim:runtime
+native: true
 glob: "**/dircolors.vim"
 filetypes:
 - name: dircolors
@@ -2507,7 +2507,7 @@ filetypes:
     description: Dircolors
 ---
 name: dot
-remote: vim/vim:runtime
+native: true
 glob: "**/dot.vim"
 filetypes:
 - name: dot
@@ -2516,7 +2516,7 @@ filetypes:
     description: DOT
 ---
 name: dylanlid
-remote: vim/vim:runtime
+native: true
 glob: "**/dylanlid.vim"
 filetypes:
 - name: dylanlid
@@ -2525,7 +2525,7 @@ filetypes:
     description: Dylan - lid files
 ---
 name: dylanintr
-remote: vim/vim:runtime
+native: true
 glob: "**/dylanintr.vim"
 filetypes:
 - name: dylanintr
@@ -2534,7 +2534,7 @@ filetypes:
     description: Dylan - intr files (melange)
 ---
 name: dylan
-remote: vim/vim:runtime
+native: true
 glob: "**/dylan.vim"
 filetypes:
 - name: dylan
@@ -2543,7 +2543,7 @@ filetypes:
     description: Dylan
 ---
 name: def
-remote: vim/vim:runtime
+native: true
 glob: "**/def.vim"
 filetypes:
 - name: def
@@ -2552,7 +2552,7 @@ filetypes:
     description: Microsoft Module Definition
 ---
 name: dracula
-remote: vim/vim:runtime
+native: true
 glob: "**/dracula.vim"
 filetypes:
 - name: dracula
@@ -2562,7 +2562,7 @@ filetypes:
   - pattern: drac.*
 ---
 name: datascript
-remote: vim/vim:runtime
+native: true
 glob: "**/datascript.vim"
 filetypes:
 - name: datascript
@@ -2571,7 +2571,7 @@ filetypes:
     description: Datascript
 ---
 name: dsl
-remote: vim/vim:runtime
+native: true
 glob: "**/dsl.vim"
 filetypes:
 - name: dsl
@@ -2580,7 +2580,7 @@ filetypes:
     description: dsl
 ---
 name: dtd
-remote: vim/vim:runtime
+native: true
 glob: "**/dtd.vim"
 filetypes:
 - name: dtd
@@ -2589,7 +2589,7 @@ filetypes:
     description: DTD (Document Type Definition for XML)
 ---
 name: dts
-remote: vim/vim:runtime
+native: true
 glob: "**/dts.vim"
 filetypes:
 - name: dts
@@ -2598,7 +2598,7 @@ filetypes:
     description: DTS/DSTI (device tree files)
 ---
 name: edif
-remote: vim/vim:runtime
+native: true
 glob: "**/edif.vim"
 filetypes:
 - name: edif
@@ -2606,7 +2606,7 @@ filetypes:
   - pattern: "*.ed\\(f\\|if\\|o\\)"
 ---
 name: ecd
-remote: vim/vim:runtime
+native: true
 glob: "**/ecd.vim"
 filetypes:
 - name: ecd
@@ -2615,7 +2615,7 @@ filetypes:
     description: Embedix Component Description
 ---
 name: elinks
-remote: vim/vim:runtime
+native: true
 glob: "**/elinks.vim"
 filetypes:
 - name: elinks
@@ -2624,7 +2624,7 @@ filetypes:
     description: Elinks configuration
 ---
 name: elmfilt
-remote: vim/vim:runtime
+native: true
 glob: "**/elmfilt.vim"
 filetypes:
 - name: elmfilt
@@ -2633,7 +2633,7 @@ filetypes:
     description: Elm Filter Rules file
 ---
 name: esmtprc
-remote: vim/vim:runtime
+native: true
 glob: "**/esmtprc.vim"
 filetypes:
 - name: esmtprc
@@ -2642,7 +2642,7 @@ filetypes:
     description: ESMTP rc file
 ---
 name: esqlc
-remote: vim/vim:runtime
+native: true
 glob: "**/esqlc.vim"
 filetypes:
 - name: esqlc
@@ -2651,7 +2651,7 @@ filetypes:
     description: ESQL-C
 ---
 name: esterel
-remote: vim/vim:runtime
+native: true
 glob: "**/esterel.vim"
 filetypes:
 - name: esterel
@@ -2660,7 +2660,7 @@ filetypes:
     description: Esterel
 ---
 name: csc
-remote: vim/vim:runtime
+native: true
 glob: "**/csc.vim"
 filetypes:
 - name: csc
@@ -2669,7 +2669,7 @@ filetypes:
     description: Essbase script
 ---
 name: exim
-remote: vim/vim:runtime
+native: true
 glob: "**/exim.vim"
 filetypes:
 - name: exim
@@ -2678,7 +2678,7 @@ filetypes:
     description: Exim
 ---
 name: expect
-remote: vim/vim:runtime
+native: true
 glob: "**/expect.vim"
 filetypes:
 - name: expect
@@ -2687,7 +2687,7 @@ filetypes:
     description: Expect
 ---
 name: exports
-remote: vim/vim:runtime
+native: true
 glob: "**/exports.vim"
 filetypes:
 - name: exports
@@ -2697,7 +2697,7 @@ filetypes:
 ---
 # TODO: change after merge: 
 name: falcon
-remote: vim/vim:runtime
+native: true
 glob: "**/falcon.vim"
 filetypes:
 - name: falcon
@@ -2706,7 +2706,7 @@ filetypes:
     description: Falcon
 ---
 name: fan
-remote: vim/vim:runtime
+native: true
 glob: "**/fan.vim"
 filetypes:
 - name: fan
@@ -2715,7 +2715,7 @@ filetypes:
     description: Fantom
 ---
 name: fetchmail
-remote: vim/vim:runtime
+native: true
 glob: "**/fetchmail.vim"
 filetypes:
 - name: fetchmail
@@ -2724,7 +2724,7 @@ filetypes:
     description: Fetchmail RC file
 ---
 name: focexec
-remote: vim/vim:runtime
+native: true
 glob: "**/focexec.vim"
 filetypes:
 - name: focexec
@@ -2733,7 +2733,7 @@ filetypes:
     description: Focus Executable
 ---
 name: master
-remote: vim/vim:runtime
+native: true
 glob: "**/master.vim"
 filetypes:
 - name: master
@@ -2742,7 +2742,7 @@ filetypes:
     description: Focus Master file (but not for auto.master)
 ---
 name: reva
-remote: vim/vim:runtime
+native: true
 glob: "**/reva.vim"
 filetypes:
 - name: reva
@@ -2751,7 +2751,7 @@ filetypes:
     description: Reva Forth
 ---
 name: fortran
-remote: vim/vim:runtime
+native: true
 glob: "**/fortran.vim"
 filetypes:
 - name: fortran
@@ -2760,7 +2760,7 @@ filetypes:
     description: Fortran
 ---
 name: framescript
-remote: vim/vim:runtime
+native: true
 glob: "**/framescript.vim"
 filetypes:
 - name: framescript
@@ -2769,7 +2769,7 @@ filetypes:
     description: Framescript
 ---
 name: fstab
-remote: vim/vim:runtime
+native: true
 glob: "**/fstab.vim"
 filetypes:
 - name: fstab
@@ -2778,7 +2778,7 @@ filetypes:
     description: FStab
 ---
 name: gdb
-remote: vim/vim:runtime
+native: true
 glob: "**/gdb.vim"
 filetypes:
 - name: gdb
@@ -2787,7 +2787,7 @@ filetypes:
     description: GDB command files
 ---
 name: gdmo
-remote: vim/vim:runtime
+native: true
 glob: "**/gdmo.vim"
 filetypes:
 - name: gdmo
@@ -2796,7 +2796,7 @@ filetypes:
     description: GDMO
 ---
 name: gedcom
-remote: vim/vim:runtime
+native: true
 glob: "**/gedcom.vim"
 filetypes:
 - name: gedcom
@@ -2806,7 +2806,7 @@ filetypes:
   - pattern: "*/tmp/lltmp*"
 ---
 name: gkrellmrc
-remote: vim/vim:runtime
+native: true
 glob: "**/gkrellmrc.vim"
 filetypes:
 - name: gkrellmrc
@@ -2815,7 +2815,7 @@ filetypes:
     description: Gkrellmrc
 ---
 name: gp
-remote: vim/vim:runtime
+native: true
 glob: "**/gp.vim"
 filetypes:
 - name: gp
@@ -2824,7 +2824,7 @@ filetypes:
     description: GP scripts (2.0 and onward)
 ---
 name: gpg
-remote: vim/vim:runtime
+native: true
 glob: "**/gpg.vim"
 filetypes:
 - name: gpg
@@ -2833,7 +2833,7 @@ filetypes:
     description: GPG
 ---
 name: gnash
-remote: vim/vim:runtime
+native: true
 glob: "**/gnash.vim"
 filetypes:
 - name: gnash
@@ -2842,7 +2842,7 @@ filetypes:
     description: gnash(1) configuration files
 ---
 name: gitolite
-remote: vim/vim:runtime
+native: true
 glob: "**/gitolite.vim"
 filetypes:
 - name: gitolite
@@ -2852,7 +2852,7 @@ filetypes:
   - pattern: "*/gitolite-admin/conf/*"
 ---
 name: grads
-remote: vim/vim:runtime
+native: true
 glob: "**/grads.vim"
 filetypes:
 - name: grads
@@ -2861,7 +2861,7 @@ filetypes:
     description: GrADS scripts
 ---
 name: gretl
-remote: vim/vim:runtime
+native: true
 glob: "**/gretl.vim"
 filetypes:
 - name: gretl
@@ -2870,7 +2870,7 @@ filetypes:
     description: Gretl
 ---
 name: gsp
-remote: vim/vim:runtime
+native: true
 glob: "**/gsp.vim"
 filetypes:
 - name: gsp
@@ -2879,7 +2879,7 @@ filetypes:
     description: GNU Server Pages
 ---
 name: group
-remote: vim/vim:runtime
+native: true
 glob: "**/group.vim"
 filetypes:
 - name: group
@@ -2888,7 +2888,7 @@ filetypes:
     description: Group file
 ---
 name: gtkrc
-remote: vim/vim:runtime
+native: true
 glob: "**/gtkrc.vim"
 filetypes:
 - name: gtkrc
@@ -2898,7 +2898,7 @@ filetypes:
   - pattern: ".gtkrc*,gtkrc*"
 ---
 name: lhaskell
-remote: vim/vim:runtime
+native: true
 glob: "**/lhaskell.vim"
 filetypes:
 - name: lhaskell
@@ -2907,7 +2907,7 @@ filetypes:
     description: Haskell
 ---
 name: chaskell
-remote: vim/vim:runtime
+native: true
 glob: "**/chaskell.vim"
 filetypes:
 - name: chaskell
@@ -2916,7 +2916,7 @@ filetypes:
     description: Haskell
 ---
 name: haste
-remote: vim/vim:runtime
+native: true
 glob: "**/haste.vim"
 filetypes:
 - name: haste
@@ -2925,7 +2925,7 @@ filetypes:
     description: Haste
 ---
 name: hastepreproc
-remote: vim/vim:runtime
+native: true
 glob: "**/hastepreproc.vim"
 filetypes:
 - name: hastepreproc
@@ -2934,7 +2934,7 @@ filetypes:
     description: Haste
 ---
 name: hercules
-remote: vim/vim:runtime
+native: true
 glob: "**/hercules.vim"
 filetypes:
 - name: hercules
@@ -2943,7 +2943,7 @@ filetypes:
     description: Hercules
 ---
 name: hex
-remote: vim/vim:runtime
+native: true
 glob: "**/hex.vim"
 filetypes:
 - name: hex
@@ -2952,7 +2952,7 @@ filetypes:
     description: HEX (Intel)
 ---
 name: hollywood
-remote: vim/vim:runtime
+native: true
 glob: "**/hollywood.vim"
 filetypes:
 - name: hollywood
@@ -2961,7 +2961,7 @@ filetypes:
     description: Hollywood
 ---
 name: tilde
-remote: vim/vim:runtime
+native: true
 glob: "**/tilde.vim"
 filetypes:
 - name: tilde
@@ -2970,7 +2970,7 @@ filetypes:
     description: Tilde (must be before HTML)
 ---
 name: htmlm4
-remote: vim/vim:runtime
+native: true
 glob: "**/htmlm4.vim"
 filetypes:
 - name: htmlm4
@@ -2979,7 +2979,7 @@ filetypes:
     description: HTML with M4
 ---
 name: template
-remote: vim/vim:runtime
+native: true
 glob: "**/template.vim"
 filetypes:
 - name: template
@@ -2988,7 +2988,7 @@ filetypes:
     description: Some template.  Used to be HTML Cheetah.
 ---
 name: hostconf
-remote: vim/vim:runtime
+native: true
 glob: "**/hostconf.vim"
 filetypes:
 - name: hostconf
@@ -2997,7 +2997,7 @@ filetypes:
     description: Host config
 ---
 name: hostsaccess
-remote: vim/vim:runtime
+native: true
 glob: "**/hostsaccess.vim"
 filetypes:
 - name: hostsaccess
@@ -3006,7 +3006,7 @@ filetypes:
     description: Hosts access
 ---
 name: hb
-remote: vim/vim:runtime
+native: true
 glob: "**/hb.vim"
 filetypes:
 - name: hb
@@ -3015,7 +3015,7 @@ filetypes:
     description: Hyper Builder
 ---
 name: icon
-remote: vim/vim:runtime
+native: true
 glob: "**/icon.vim"
 filetypes:
 - name: icon
@@ -3024,7 +3024,7 @@ filetypes:
     description: Icon
 ---
 name: msidl
-remote: vim/vim:runtime
+native: true
 glob: "**/msidl.vim"
 filetypes:
 - name: msidl
@@ -3033,7 +3033,7 @@ filetypes:
     description: MOF = WMI (Windows Management Instrumentation) Managed Object Format
 ---
 name: icemenu
-remote: vim/vim:runtime
+native: true
 glob: "**/icemenu.vim"
 filetypes:
 - name: icemenu
@@ -3042,7 +3042,7 @@ filetypes:
     description: Icewm menu
 ---
 name: indent
-remote: vim/vim:runtime
+native: true
 glob: "**/indent.vim"
 filetypes:
 - name: indent
@@ -3053,7 +3053,7 @@ filetypes:
     description: Indent RC
 ---
 name: inform
-remote: vim/vim:runtime
+native: true
 glob: "**/inform.vim"
 filetypes:
 - name: inform
@@ -3062,7 +3062,7 @@ filetypes:
     description: Inform
 ---
 name: initng
-remote: vim/vim:runtime
+native: true
 glob: "**/initng.vim"
 filetypes:
 - name: initng
@@ -3071,7 +3071,7 @@ filetypes:
     description: Initng
 ---
 name: upstreamdat
-remote: vim/vim:runtime
+native: true
 glob: "**/upstreamdat.vim"
 filetypes:
 - name: upstreamdat
@@ -3079,7 +3079,7 @@ filetypes:
   - pattern: upstream.dat\c,upstream.*.dat\c,*.upstream.dat\c
 ---
 name: upstreamlog
-remote: vim/vim:runtime
+native: true
 glob: "**/upstreamlog.vim"
 filetypes:
 - name: upstreamlog
@@ -3087,7 +3087,7 @@ filetypes:
   - pattern: fdrupstream.log,upstream.log\c,upstream.*.log\c,*.upstream.log\c,UPSTREAM-*.log\c
 ---
 name: upstreaminstalllog
-remote: vim/vim:runtime
+native: true
 glob: "**/upstreaminstalllog.vim"
 filetypes:
 - name: upstreaminstalllog
@@ -3095,7 +3095,7 @@ filetypes:
   - pattern: upstreaminstall.log\c,upstreaminstall.*.log\c,*.upstreaminstall.log\c
 ---
 name: usserverlog
-remote: vim/vim:runtime
+native: true
 glob: "**/usserverlog.vim"
 filetypes:
 - name: usserverlog
@@ -3103,7 +3103,7 @@ filetypes:
   - pattern: usserver.log\c,usserver.*.log\c,*.usserver.log\c
 ---
 name: usw2kagtlog
-remote: vim/vim:runtime
+native: true
 glob: "**/usw2kagtlog.vim"
 filetypes:
 - name: usw2kagtlog
@@ -3111,7 +3111,7 @@ filetypes:
   - pattern: usw2kagt.log\c,usw2kagt.*.log\c,*.usw2kagt.log\c
 ---
 name: ipfilter
-remote: vim/vim:runtime
+native: true
 glob: "**/ipfilter.vim"
 filetypes:
 - name: ipfilter
@@ -3120,7 +3120,7 @@ filetypes:
     description: Ipfilter
 ---
 name: fgl
-remote: vim/vim:runtime
+native: true
 glob: "**/fgl.vim"
 filetypes:
 - name: fgl
@@ -3129,7 +3129,7 @@ filetypes:
     description: Informix 4GL (source - canonical, include file, I4GL+M4 preproc.)
 ---
 name: inittab
-remote: vim/vim:runtime
+native: true
 glob: "**/inittab.vim"
 filetypes:
 - name: inittab
@@ -3138,7 +3138,7 @@ filetypes:
     description: SysV Inittab
 ---
 name: iss
-remote: vim/vim:runtime
+native: true
 glob: "**/iss.vim"
 filetypes:
 - name: iss
@@ -3147,7 +3147,7 @@ filetypes:
     description: Inno Setup
 ---
 name: j
-remote: vim/vim:runtime
+native: true
 glob: "**/j.vim"
 filetypes:
 - name: j
@@ -3156,7 +3156,7 @@ filetypes:
     description: J
 ---
 name: jal
-remote: vim/vim:runtime
+native: true
 glob: "**/jal.vim"
 filetypes:
 - name: jal
@@ -3165,7 +3165,7 @@ filetypes:
     description: JAL
 ---
 name: jam
-remote: vim/vim:runtime
+native: true
 glob: "**/jam.vim"
 filetypes:
 - name: jam
@@ -3182,7 +3182,7 @@ filetypes:
     description: Java
 ---
 name: javacc
-remote: vim/vim:runtime
+native: true
 glob: "**/javacc.vim"
 filetypes:
 - name: javacc
@@ -3191,7 +3191,7 @@ filetypes:
     description: JavaCC
 ---
 name: jsp
-remote: vim/vim:runtime
+native: true
 glob: "**/jsp.vim"
 filetypes:
 - name: jsp
@@ -3200,7 +3200,7 @@ filetypes:
     description: Java Server Pages
 ---
 name: jproperties
-remote: vim/vim:runtime
+native: true
 glob: "**/jproperties.vim"
 filetypes:
 - name: jproperties
@@ -3210,7 +3210,7 @@ filetypes:
   - pattern: "*.properties_??_??_*"
 ---
 name: jess
-remote: vim/vim:runtime
+native: true
 glob: "**/jess.vim"
 filetypes:
 - name: jess
@@ -3219,7 +3219,7 @@ filetypes:
     description: Jess
 ---
 name: jgraph
-remote: vim/vim:runtime
+native: true
 glob: "**/jgraph.vim"
 filetypes:
 - name: jgraph
@@ -3228,7 +3228,7 @@ filetypes:
     description: Jgraph
 ---
 name: jovial
-remote: vim/vim:runtime
+native: true
 glob: "**/jovial.vim"
 filetypes:
 - name: jovial
@@ -3237,7 +3237,7 @@ filetypes:
     description: Jovial
 ---
 name: kix
-remote: vim/vim:runtime
+native: true
 glob: "**/kix.vim"
 filetypes:
 - name: kix
@@ -3246,7 +3246,7 @@ filetypes:
     description: Kixtart
 ---
 name: kwt
-remote: vim/vim:runtime
+native: true
 glob: "**/kwt.vim"
 filetypes:
 - name: kwt
@@ -3255,7 +3255,7 @@ filetypes:
     description: Kimwitu[++]
 ---
 name: kivy
-remote: vim/vim:runtime
+native: true
 glob: "**/kivy.vim"
 filetypes:
 - name: kivy
@@ -3264,7 +3264,7 @@ filetypes:
     description: Kivy
 ---
 name: kscript
-remote: vim/vim:runtime
+native: true
 glob: "**/kscript.vim"
 filetypes:
 - name: kscript
@@ -3273,7 +3273,7 @@ filetypes:
     description: KDE script
 ---
 name: kconfig
-remote: vim/vim:runtime
+native: true
 glob: "**/kconfig.vim"
 filetypes:
 - name: kconfig
@@ -3283,7 +3283,7 @@ filetypes:
   - pattern: Kconfig.*
 ---
 name: lace
-remote: vim/vim:runtime
+native: true
 glob: "**/lace.vim"
 filetypes:
 - name: lace
@@ -3292,7 +3292,7 @@ filetypes:
     description: Lace (ISE)
 ---
 name: latte
-remote: vim/vim:runtime
+native: true
 glob: "**/latte.vim"
 filetypes:
 - name: latte
@@ -3301,7 +3301,7 @@ filetypes:
     description: Latte
 ---
 name: limits
-remote: vim/vim:runtime
+native: true
 glob: "**/limits.vim"
 filetypes:
 - name: limits
@@ -3310,7 +3310,7 @@ filetypes:
     description: Limits
 ---
 name: lprolog
-remote: vim/vim:runtime
+native: true
 glob: "**/lprolog.vim"
 filetypes:
 - name: lprolog
@@ -3319,7 +3319,7 @@ filetypes:
     description: LambdaProlog (*.mod too, see Modsim)
 ---
 name: ldif
-remote: vim/vim:runtime
+native: true
 glob: "**/ldif.vim"
 filetypes:
 - name: ldif
@@ -3328,7 +3328,7 @@ filetypes:
     description: LDAP LDIF
 ---
 name: ld
-remote: vim/vim:runtime
+native: true
 glob: "**/ld.vim"
 filetypes:
 - name: ld
@@ -3337,7 +3337,7 @@ filetypes:
     description: Ld loader
 ---
 name: lex
-remote: vim/vim:runtime
+native: true
 glob: "**/lex.vim"
 filetypes:
 - name: lex
@@ -3346,7 +3346,7 @@ filetypes:
     description: Lex
 ---
 name: libao
-remote: vim/vim:runtime
+native: true
 glob: "**/libao.vim"
 filetypes:
 - name: libao
@@ -3355,7 +3355,7 @@ filetypes:
     description: Libao
 ---
 name: sensors
-remote: vim/vim:runtime
+native: true
 glob: "**/sensors.vim"
 filetypes:
 - name: sensors
@@ -3364,7 +3364,7 @@ filetypes:
     description: Libsensors
 ---
 name: lftp
-remote: vim/vim:runtime
+native: true
 glob: "**/lftp.vim"
 filetypes:
 - name: lftp
@@ -3373,7 +3373,7 @@ filetypes:
     description: LFTP
 ---
 name: lifelines
-remote: vim/vim:runtime
+native: true
 glob: "**/lifelines.vim"
 filetypes:
 - name: lifelines
@@ -3382,7 +3382,7 @@ filetypes:
     description: Lifelines (or Lex for C++!)
 ---
 name: lilo
-remote: vim/vim:runtime
+native: true
 glob: "**/lilo.vim"
 filetypes:
 - name: lilo
@@ -3392,7 +3392,7 @@ filetypes:
   - pattern: lilo.conf*
 ---
 name: lisp
-remote: vim/vim:runtime
+native: true
 glob: "**/lisp.vim"
 filetypes:
 - name: lisp
@@ -3404,7 +3404,7 @@ filetypes:
     description: SBCL implementation of Common Lisp
 ---
 name: liquid
-remote: vim/vim:runtime
+native: true
 glob: "**/liquid.vim"
 filetypes:
 - name: liquid
@@ -3413,7 +3413,7 @@ filetypes:
     description: Liquid
 ---
 name: lite
-remote: vim/vim:runtime
+native: true
 glob: "**/lite.vim"
 filetypes:
 - name: lite
@@ -3422,7 +3422,7 @@ filetypes:
     description: Lite
 ---
 name: litestep
-remote: vim/vim:runtime
+native: true
 glob: "**/litestep.vim"
 filetypes:
 - name: litestep
@@ -3431,7 +3431,7 @@ filetypes:
     description: LiteStep RC files
 ---
 name: loginaccess
-remote: vim/vim:runtime
+native: true
 glob: "**/loginaccess.vim"
 filetypes:
 - name: loginaccess
@@ -3440,7 +3440,7 @@ filetypes:
     description: Login access
 ---
 name: logindefs
-remote: vim/vim:runtime
+native: true
 glob: "**/logindefs.vim"
 filetypes:
 - name: logindefs
@@ -3449,7 +3449,7 @@ filetypes:
     description: Login defs
 ---
 name: logtalk
-remote: vim/vim:runtime
+native: true
 glob: "**/logtalk.vim"
 filetypes:
 - name: logtalk
@@ -3458,7 +3458,7 @@ filetypes:
     description: Logtalk
 ---
 name: lotos
-remote: vim/vim:runtime
+native: true
 glob: "**/lotos.vim"
 filetypes:
 - name: lotos
@@ -3467,7 +3467,7 @@ filetypes:
     description: LOTOS
 ---
 name: lout
-remote: vim/vim:runtime
+native: true
 glob: "**/lout.vim"
 filetypes:
 - name: lout
@@ -3476,7 +3476,7 @@ filetypes:
     description: 'Lout (also: *.lt)'
 ---
 name: lsl
-remote: vim/vim:runtime
+native: true
 glob: "**/lsl.vim"
 filetypes:
 - name: lsl
@@ -3485,7 +3485,7 @@ filetypes:
     description: Linden Scripting Language (Second Life)
 ---
 name: lss
-remote: vim/vim:runtime
+native: true
 glob: "**/lss.vim"
 filetypes:
 - name: lss
@@ -3494,7 +3494,7 @@ filetypes:
     description: Lynx style file (or LotusScript!)
 ---
 name: mgp
-remote: vim/vim:runtime
+native: true
 glob: "**/mgp.vim"
 filetypes:
 - name: mgp
@@ -3503,7 +3503,7 @@ filetypes:
     description: MaGic Point
 ---
 name: mail
-remote: vim/vim:runtime
+native: true
 glob: "**/mail.vim"
 filetypes:
 - name: mail
@@ -3511,7 +3511,7 @@ filetypes:
   - pattern: snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\\\{6\},neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},ae\d\+.txt,/tmp/SLRN[0-9A-Z.]\+,*.eml,{neo,}mutt[[:alnum:]._-]\\\{6\},reportbug-*
 ---
 name: mailaliases
-remote: vim/vim:runtime
+native: true
 glob: "**/mailaliases.vim"
 filetypes:
 - name: mailaliases
@@ -3520,7 +3520,7 @@ filetypes:
     description: Mail aliases
 ---
 name: mailcap
-remote: vim/vim:runtime
+native: true
 glob: "**/mailcap.vim"
 filetypes:
 - name: mailcap
@@ -3529,7 +3529,7 @@ filetypes:
     description: Mailcap configuration file
 ---
 name: ist
-remote: vim/vim:runtime
+native: true
 glob: "**/ist.vim"
 filetypes:
 - name: ist
@@ -3538,7 +3538,7 @@ filetypes:
     description: MakeIndex
 ---
 name: mallard
-remote: vim/vim:runtime
+native: true
 glob: "**/mallard.vim"
 filetypes:
 - name: mallard
@@ -3547,7 +3547,7 @@ filetypes:
     description: Mallard
 ---
 name: manconf
-remote: vim/vim:runtime
+native: true
 glob: "**/manconf.vim"
 filetypes:
 - name: manconf
@@ -3556,7 +3556,7 @@ filetypes:
     description: Man config
 ---
 name: maple
-remote: vim/vim:runtime
+native: true
 glob: "**/maple.vim"
 filetypes:
 - name: maple
@@ -3565,7 +3565,7 @@ filetypes:
     description: Maple V
 ---
 name: mel
-remote: vim/vim:runtime
+native: true
 glob: "**/mel.vim"
 filetypes:
 - name: mel
@@ -3574,7 +3574,7 @@ filetypes:
     description: Maya Extension Language
 ---
 name: hgcommit
-remote: vim/vim:runtime
+native: true
 glob: "**/hgcommit.vim"
 filetypes:
 - name: hgcommit
@@ -3583,7 +3583,7 @@ filetypes:
     description: Mercurial (hg) commit file
 ---
 name: messages
-remote: vim/vim:runtime
+native: true
 glob: "**/messages.vim"
 filetypes:
 - name: messages
@@ -3592,7 +3592,7 @@ filetypes:
     description: Messages (logs mostly)
 ---
 name: mf
-remote: vim/vim:runtime
+native: true
 glob: "**/mf.vim"
 filetypes:
 - name: mf
@@ -3601,7 +3601,7 @@ filetypes:
     description: Metafont
 ---
 name: mp
-remote: vim/vim:runtime
+native: true
 glob: "**/mp.vim"
 filetypes:
 - name: mp
@@ -3610,7 +3610,7 @@ filetypes:
     description: MetaPost
 ---
 name: mgl
-remote: vim/vim:runtime
+native: true
 glob: "**/mgl.vim"
 filetypes:
 - name: mgl
@@ -3619,7 +3619,7 @@ filetypes:
     description: MGL
 ---
 name: mix
-remote: vim/vim:runtime
+native: true
 glob: "**/mix.vim"
 filetypes:
 - name: mix
@@ -3628,7 +3628,7 @@ filetypes:
     description: MIX - Knuth assembly
 ---
 name: mmp
-remote: vim/vim:runtime
+native: true
 glob: "**/mmp.vim"
 filetypes:
 - name: mmp
@@ -3637,7 +3637,7 @@ filetypes:
     description: Symbian meta-makefile definition (MMP)
 ---
 name: modula2
-remote: vim/vim:runtime
+native: true
 glob: "**/modula2.vim"
 filetypes:
 - name: modula2
@@ -3646,7 +3646,7 @@ filetypes:
     description: Modula 2  (.md removed in favor of Markdown)
 ---
 name: modula3
-remote: vim/vim:runtime
+native: true
 glob: "**/modula3.vim"
 filetypes:
 - name: modula3
@@ -3655,7 +3655,7 @@ filetypes:
     description: Modula 3 (.m3, .i3, .mg, .ig)
 ---
 name: monk
-remote: vim/vim:runtime
+native: true
 glob: "**/monk.vim"
 filetypes:
 - name: monk
@@ -3664,7 +3664,7 @@ filetypes:
     description: Monk
 ---
 name: moo
-remote: vim/vim:runtime
+native: true
 glob: "**/moo.vim"
 filetypes:
 - name: moo
@@ -3673,7 +3673,7 @@ filetypes:
     description: MOO
 ---
 name: modconf
-remote: vim/vim:runtime
+native: true
 glob: "**/modconf.vim"
 filetypes:
 - name: modconf
@@ -3683,7 +3683,7 @@ filetypes:
   - pattern: "*/etc/modprobe.*"
 ---
 name: mplayerconf
-remote: vim/vim:runtime
+native: true
 glob: "**/mplayerconf.vim"
 filetypes:
 - name: mplayerconf
@@ -3692,7 +3692,7 @@ filetypes:
     description: Mplayer config
 ---
 name: srec
-remote: vim/vim:runtime
+native: true
 glob: "**/srec.vim"
 filetypes:
 - name: srec
@@ -3701,7 +3701,7 @@ filetypes:
     description: Motorola S record
 ---
 name: mrxvtrc
-remote: vim/vim:runtime
+native: true
 glob: "**/mrxvtrc.vim"
 filetypes:
 - name: mrxvtrc
@@ -3710,7 +3710,7 @@ filetypes:
     description: Mrxvtrc
 ---
 name: msql
-remote: vim/vim:runtime
+native: true
 glob: "**/msql.vim"
 filetypes:
 - name: msql
@@ -3719,7 +3719,7 @@ filetypes:
     description: Msql
 ---
 name: mysql
-remote: vim/vim:runtime
+native: true
 glob: "**/mysql.vim"
 filetypes:
 - name: mysql
@@ -3728,7 +3728,7 @@ filetypes:
     description: Mysql
 ---
 name: muttrc
-remote: vim/vim:runtime
+native: true
 glob: "**/muttrc.vim"
 filetypes:
 - name: muttrc
@@ -3738,7 +3738,7 @@ filetypes:
     description: Mutt setup file (also for Muttng)
 ---
 name: rc
-remote: vim/vim:runtime
+native: true
 glob: "**/rc.vim"
 filetypes:
 - name: rc
@@ -3747,7 +3747,7 @@ filetypes:
     description: M$ Resource files
 ---
 name: mupad
-remote: vim/vim:runtime
+native: true
 glob: "**/mupad.vim"
 filetypes:
 - name: mupad
@@ -3756,7 +3756,7 @@ filetypes:
     description: MuPAD source
 ---
 name: mush
-remote: vim/vim:runtime
+native: true
 glob: "**/mush.vim"
 filetypes:
 - name: mush
@@ -3765,7 +3765,7 @@ filetypes:
     description: Mush
 ---
 name: n1ql
-remote: vim/vim:runtime
+native: true
 glob: "**/n1ql.vim"
 filetypes:
 - name: n1ql
@@ -3774,7 +3774,7 @@ filetypes:
     description: N1QL
 ---
 name: nanorc
-remote: vim/vim:runtime
+native: true
 glob: "**/nanorc.vim"
 filetypes:
 - name: nanorc
@@ -3783,7 +3783,7 @@ filetypes:
     description: Nano
 ---
 name: natural
-remote: vim/vim:runtime
+native: true
 glob: "**/natural.vim"
 filetypes:
 - name: natural
@@ -3792,7 +3792,7 @@ filetypes:
     description: Natural
 ---
 name: neomuttrc
-remote: vim/vim:runtime
+native: true
 glob: "**/neomuttrc.vim"
 filetypes:
 - name: neomuttrc
@@ -3802,7 +3802,7 @@ filetypes:
   - pattern: ".neomuttrc*,*/.neomutt/neomuttrc*,neomuttrc*,Neomuttrc*"
 ---
 name: netrc
-remote: vim/vim:runtime
+native: true
 glob: "**/netrc.vim"
 filetypes:
 - name: netrc
@@ -3811,7 +3811,7 @@ filetypes:
     description: Netrc
 ---
 name: ninja
-remote: vim/vim:runtime
+native: true
 glob: "**/ninja.vim"
 filetypes:
 - name: ninja
@@ -3820,7 +3820,7 @@ filetypes:
     description: Ninja file
 ---
 name: ncf
-remote: vim/vim:runtime
+native: true
 glob: "**/ncf.vim"
 filetypes:
 - name: ncf
@@ -3829,7 +3829,7 @@ filetypes:
     description: Novell netware batch files
 ---
 name: nroff
-remote: vim/vim:runtime
+native: true
 glob: "**/nroff.vim"
 filetypes:
 - name: nroff
@@ -3841,7 +3841,7 @@ filetypes:
   - pattern: tmac.*
 ---
 name: nqc
-remote: vim/vim:runtime
+native: true
 glob: "**/nqc.vim"
 filetypes:
 - name: nqc
@@ -3850,7 +3850,7 @@ filetypes:
     description: Not Quite C
 ---
 name: nsis
-remote: vim/vim:runtime
+native: true
 glob: "**/nsis.vim"
 filetypes:
 - name: nsis
@@ -3859,7 +3859,7 @@ filetypes:
     description: NSIS
 ---
 name: occam
-remote: vim/vim:runtime
+native: true
 glob: "**/occam.vim"
 filetypes:
 - name: occam
@@ -3868,7 +3868,7 @@ filetypes:
     description: Occam
 ---
 name: omnimark
-remote: vim/vim:runtime
+native: true
 glob: "**/omnimark.vim"
 filetypes:
 - name: omnimark
@@ -3877,7 +3877,7 @@ filetypes:
     description: Omnimark
 ---
 name: openroad
-remote: vim/vim:runtime
+native: true
 glob: "**/openroad.vim"
 filetypes:
 - name: openroad
@@ -3886,7 +3886,7 @@ filetypes:
     description: OpenROAD
 ---
 name: opl
-remote: vim/vim:runtime
+native: true
 glob: "**/opl.vim"
 filetypes:
 - name: opl
@@ -3895,7 +3895,7 @@ filetypes:
     description: OPL
 ---
 name: ora
-remote: vim/vim:runtime
+native: true
 glob: "**/ora.vim"
 filetypes:
 - name: ora
@@ -3904,7 +3904,7 @@ filetypes:
     description: Oracle config file
 ---
 name: pf
-remote: vim/vim:runtime
+native: true
 glob: "**/pf.vim"
 filetypes:
 - name: pf
@@ -3913,7 +3913,7 @@ filetypes:
     description: Packet filter conf
 ---
 name: pamconf
-remote: vim/vim:runtime
+native: true
 glob: "**/pamconf.vim"
 filetypes:
 - name: pamconf
@@ -3923,7 +3923,7 @@ filetypes:
   - pattern: "*/etc/pam.d/*"
 ---
 name: pamenv
-remote: vim/vim:runtime
+native: true
 glob: "**/pamenv.vim"
 filetypes:
 - name: pamenv
@@ -3932,7 +3932,7 @@ filetypes:
     description: Pam environment
 ---
 name: papp
-remote: vim/vim:runtime
+native: true
 glob: "**/papp.vim"
 filetypes:
 - name: papp
@@ -3941,7 +3941,7 @@ filetypes:
     description: PApp
 ---
 name: passwd
-remote: vim/vim:runtime
+native: true
 glob: "**/passwd.vim"
 filetypes:
 - name: passwd
@@ -3950,7 +3950,7 @@ filetypes:
     description: Password file
 ---
 name: pascal
-remote: vim/vim:runtime
+native: true
 glob: "**/pascal.vim"
 filetypes:
 - name: pascal
@@ -3961,7 +3961,7 @@ filetypes:
     description: Delphi or Lazarus program file
 ---
 name: pdf
-remote: vim/vim:runtime
+native: true
 glob: "**/pdf.vim"
 filetypes:
 - name: pdf
@@ -3970,7 +3970,7 @@ filetypes:
     description: PDF
 ---
 name: pike
-remote: vim/vim:runtime
+native: true
 glob: "**/pike.vim"
 dependencies: autodoc
 filetypes:
@@ -3980,7 +3980,7 @@ filetypes:
     description: Pike and Cmod
 ---
 name: cmod
-remote: vim/vim:runtime
+native: true
 glob: "**/cmod.vim"
 dependencies: autodoc
 filetypes:
@@ -3990,7 +3990,7 @@ filetypes:
     description: Pike and Cmod
 ---
 name: pinfo
-remote: vim/vim:runtime
+native: true
 glob: "**/pinfo.vim"
 filetypes:
 - name: pinfo
@@ -3999,7 +3999,7 @@ filetypes:
     description: Pinfo config
 ---
 name: pilrc
-remote: vim/vim:runtime
+native: true
 glob: "**/pilrc.vim"
 filetypes:
 - name: pilrc
@@ -4008,7 +4008,7 @@ filetypes:
     description: Palm Resource compiler
 ---
 name: pine
-remote: vim/vim:runtime
+native: true
 glob: "**/pine.vim"
 filetypes:
 - name: pine
@@ -4017,7 +4017,7 @@ filetypes:
     description: Pine config
 ---
 name: pli
-remote: vim/vim:runtime
+native: true
 glob: "**/pli.vim"
 filetypes:
 - name: pli
@@ -4026,7 +4026,7 @@ filetypes:
     description: PL/1, PL/I
 ---
 name: plm
-remote: vim/vim:runtime
+native: true
 glob: "**/plm.vim"
 filetypes:
 - name: plm
@@ -4035,7 +4035,7 @@ filetypes:
     description: 'PL/M (also: *.inp)'
 ---
 name: plsql
-remote: vim/vim:runtime
+native: true
 glob: "**/plsql.vim"
 filetypes:
 - name: plsql
@@ -4044,7 +4044,7 @@ filetypes:
     description: PL/SQL
 ---
 name: plp
-remote: vim/vim:runtime
+native: true
 glob: "**/plp.vim"
 filetypes:
 - name: plp
@@ -4053,7 +4053,7 @@ filetypes:
     description: PLP
 ---
 name: po
-remote: vim/vim:runtime
+native: true
 glob: "**/po.vim"
 filetypes:
 - name: po
@@ -4062,7 +4062,7 @@ filetypes:
     description: PO and PO template (GNU gettext)
 ---
 name: pfmain
-remote: vim/vim:runtime
+native: true
 glob: "**/pfmain.vim"
 filetypes:
 - name: pfmain
@@ -4071,7 +4071,7 @@ filetypes:
     description: Postfix main config
 ---
 name: postscr
-remote: vim/vim:runtime
+native: true
 glob: "**/postscr.vim"
 filetypes:
 - name: postscr
@@ -4080,7 +4080,7 @@ filetypes:
     description: PostScript (+ font files, encapsulated PostScript, Adobe Illustrator)
 ---
 name: ppd
-remote: vim/vim:runtime
+native: true
 glob: "**/ppd.vim"
 filetypes:
 - name: ppd
@@ -4089,7 +4089,7 @@ filetypes:
     description: PostScript Printer Description
 ---
 name: pov
-remote: vim/vim:runtime
+native: true
 glob: "**/pov.vim"
 filetypes:
 - name: pov
@@ -4098,7 +4098,7 @@ filetypes:
     description: Povray
 ---
 name: povini
-remote: vim/vim:runtime
+native: true
 glob: "**/povini.vim"
 filetypes:
 - name: povini
@@ -4107,7 +4107,7 @@ filetypes:
     description: Povray configuration
 ---
 name: pccts
-remote: vim/vim:runtime
+native: true
 glob: "**/pccts.vim"
 filetypes:
 - name: pccts
@@ -4116,7 +4116,7 @@ filetypes:
     description: "u BufNewFile,BufRead *.g\t\t\tsetf antrl"
 ---
 name: ppwiz
-remote: vim/vim:runtime
+native: true
 glob: "**/ppwiz.vim"
 filetypes:
 - name: ppwiz
@@ -4125,7 +4125,7 @@ filetypes:
     description: PPWizard
 ---
 name: obj
-remote: vim/vim:runtime
+native: true
 glob: "**/obj.vim"
 filetypes:
 - name: obj
@@ -4134,7 +4134,7 @@ filetypes:
     description: 'TODO: is there a way to avoid MS-Windows Object files?'
 ---
 name: privoxy
-remote: vim/vim:runtime
+native: true
 glob: "**/privoxy.vim"
 filetypes:
 - name: privoxy
@@ -4143,7 +4143,7 @@ filetypes:
     description: Privoxy actions file
 ---
 name: procmail
-remote: vim/vim:runtime
+native: true
 glob: "**/procmail.vim"
 filetypes:
 - name: procmail
@@ -4152,7 +4152,7 @@ filetypes:
     description: Procmail
 ---
 name: psf
-remote: vim/vim:runtime
+native: true
 glob: "**/psf.vim"
 filetypes:
 - name: psf
@@ -4161,7 +4161,7 @@ filetypes:
     description: Software Distributor Product Specification File (POSIX 1387.2-1995)
 ---
 name: promela
-remote: vim/vim:runtime
+native: true
 glob: "**/promela.vim"
 filetypes:
 - name: promela
@@ -4170,7 +4170,7 @@ filetypes:
     description: Promela
 ---
 name: protocols
-remote: vim/vim:runtime
+native: true
 glob: "**/protocols.vim"
 filetypes:
 - name: protocols
@@ -4179,7 +4179,7 @@ filetypes:
     description: Protocols
 ---
 name: pyrex
-remote: vim/vim:runtime
+native: true
 glob: "**/pyrex.vim"
 filetypes:
 - name: pyrex
@@ -4188,7 +4188,7 @@ filetypes:
     description: Pyrex
 ---
 name: radiance
-remote: vim/vim:runtime
+native: true
 glob: "**/radiance.vim"
 filetypes:
 - name: radiance
@@ -4197,7 +4197,7 @@ filetypes:
     description: Radiance
 ---
 name: ratpoison
-remote: vim/vim:runtime
+native: true
 glob: "**/ratpoison.vim"
 filetypes:
 - name: ratpoison
@@ -4206,7 +4206,7 @@ filetypes:
     description: Ratpoison config/command files
 ---
 name: rcs
-remote: vim/vim:runtime
+native: true
 glob: "**/rcs.vim"
 filetypes:
 - name: rcs
@@ -4214,7 +4214,7 @@ filetypes:
   - pattern: "*\\,v"
 ---
 name: readline
-remote: vim/vim:runtime
+native: true
 glob: "**/readline.vim"
 filetypes:
 - name: readline
@@ -4223,7 +4223,7 @@ filetypes:
     description: Readline
 ---
 name: rib
-remote: vim/vim:runtime
+native: true
 glob: "**/rib.vim"
 filetypes:
 - name: rib
@@ -4232,7 +4232,7 @@ filetypes:
     description: Renderman Interface Bytestream
 ---
 name: rego
-remote: vim/vim:runtime
+native: true
 glob: "**/rego.vim"
 filetypes:
 - name: rego
@@ -4241,7 +4241,7 @@ filetypes:
     description: Rego Policy Language
 ---
 name: rexx
-remote: vim/vim:runtime
+native: true
 glob: "**/rexx.vim"
 filetypes:
 - name: rexx
@@ -4250,7 +4250,7 @@ filetypes:
     description: Rexx
 ---
 name: rnoweb
-remote: vim/vim:runtime
+native: true
 glob: "**/rnoweb.vim"
 filetypes:
 - name: rnoweb
@@ -4259,7 +4259,7 @@ filetypes:
     description: R noweb file
 ---
 name: rmd
-remote: vim/vim:runtime
+native: true
 glob: "**/rmd.vim"
 filetypes:
 - name: rmd
@@ -4268,7 +4268,7 @@ filetypes:
     description: R Markdown file
 ---
 name: rrst
-remote: vim/vim:runtime
+native: true
 glob: "**/rrst.vim"
 filetypes:
 - name: rrst
@@ -4277,7 +4277,7 @@ filetypes:
     description: R reStructuredText file
 ---
 name: remind
-remote: vim/vim:runtime
+native: true
 glob: "**/remind.vim"
 filetypes:
 - name: remind
@@ -4287,7 +4287,7 @@ filetypes:
   - pattern: ".reminders*"
 ---
 name: resolv
-remote: vim/vim:runtime
+native: true
 glob: "**/resolv.vim"
 filetypes:
 - name: resolv
@@ -4296,7 +4296,7 @@ filetypes:
     description: Resolv.conf
 ---
 name: rnc
-remote: vim/vim:runtime
+native: true
 glob: "**/rnc.vim"
 filetypes:
 - name: rnc
@@ -4305,7 +4305,7 @@ filetypes:
     description: Relax NG Compact
 ---
 name: rng
-remote: vim/vim:runtime
+native: true
 glob: "**/rng.vim"
 filetypes:
 - name: rng
@@ -4314,7 +4314,7 @@ filetypes:
     description: Relax NG XML
 ---
 name: rpl
-remote: vim/vim:runtime
+native: true
 glob: "**/rpl.vim"
 filetypes:
 - name: rpl
@@ -4323,7 +4323,7 @@ filetypes:
     description: RPL/2
 ---
 name: robots
-remote: vim/vim:runtime
+native: true
 glob: "**/robots.vim"
 filetypes:
 - name: robots
@@ -4332,7 +4332,7 @@ filetypes:
     description: Robots.txt
 ---
 name: rpcgen
-remote: vim/vim:runtime
+native: true
 glob: "**/rpcgen.vim"
 filetypes:
 - name: rpcgen
@@ -4341,7 +4341,7 @@ filetypes:
     description: Rpcgen
 ---
 name: rtf
-remote: vim/vim:runtime
+native: true
 glob: "**/rtf.vim"
 filetypes:
 - name: rtf
@@ -4350,7 +4350,7 @@ filetypes:
     description: RTF
 ---
 name: slang
-remote: vim/vim:runtime
+native: true
 glob: "**/slang.vim"
 filetypes:
 - name: slang
@@ -4359,7 +4359,7 @@ filetypes:
     description: S-lang (or shader language, or SmallLisp)
 ---
 name: samba
-remote: vim/vim:runtime
+native: true
 glob: "**/samba.vim"
 filetypes:
 - name: samba
@@ -4368,7 +4368,7 @@ filetypes:
     description: Samba config
 ---
 name: sas
-remote: vim/vim:runtime
+native: true
 glob: "**/sas.vim"
 filetypes:
 - name: sas
@@ -4377,7 +4377,7 @@ filetypes:
     description: SAS script
 ---
 name: sass
-remote: vim/vim:runtime
+native: true
 glob: "**/sass.vim"
 filetypes:
 - name: sass
@@ -4386,7 +4386,7 @@ filetypes:
     description: Sass
 ---
 name: sather
-remote: vim/vim:runtime
+native: true
 glob: "**/sather.vim"
 filetypes:
 - name: sather
@@ -4395,7 +4395,7 @@ filetypes:
     description: Sather
 ---
 name: sbt
-remote: vim/vim:runtime
+native: true
 glob: "**/sbt.vim"
 filetypes:
 - name: sbt
@@ -4404,7 +4404,7 @@ filetypes:
     description: SBT - Scala Build Tool
 ---
 name: scilab
-remote: vim/vim:runtime
+native: true
 glob: "**/scilab.vim"
 filetypes:
 - name: scilab
@@ -4413,7 +4413,7 @@ filetypes:
     description: Scilab
 ---
 name: sd
-remote: vim/vim:runtime
+native: true
 glob: "**/sd.vim"
 filetypes:
 - name: sd
@@ -4422,7 +4422,7 @@ filetypes:
     description: 'SD: Streaming Descriptors'
 ---
 name: sdl
-remote: vim/vim:runtime
+native: true
 glob: "**/sdl.vim"
 filetypes:
 - name: sdl
@@ -4431,7 +4431,7 @@ filetypes:
     description: SDL
 ---
 name: sed
-remote: vim/vim:runtime
+native: true
 glob: "**/sed.vim"
 filetypes:
 - name: sed
@@ -4440,7 +4440,7 @@ filetypes:
     description: sed
 ---
 name: sieve
-remote: vim/vim:runtime
+native: true
 glob: "**/sieve.vim"
 filetypes:
 - name: sieve
@@ -4449,7 +4449,7 @@ filetypes:
     description: Sieve (RFC 3028, 5228)
 ---
 name: sm
-remote: vim/vim:runtime
+native: true
 glob: "**/sm.vim"
 filetypes:
 - name: sm
@@ -4458,7 +4458,7 @@ filetypes:
     description: Sendmail
 ---
 name: services
-remote: vim/vim:runtime
+native: true
 glob: "**/services.vim"
 filetypes:
 - name: services
@@ -4467,7 +4467,7 @@ filetypes:
     description: Services
 ---
 name: slpconf
-remote: vim/vim:runtime
+native: true
 glob: "**/slpconf.vim"
 filetypes:
 - name: slpconf
@@ -4476,7 +4476,7 @@ filetypes:
     description: Service Location config
 ---
 name: slpreg
-remote: vim/vim:runtime
+native: true
 glob: "**/slpreg.vim"
 filetypes:
 - name: slpreg
@@ -4485,7 +4485,7 @@ filetypes:
     description: Service Location registration
 ---
 name: slpspi
-remote: vim/vim:runtime
+native: true
 glob: "**/slpspi.vim"
 filetypes:
 - name: slpspi
@@ -4494,7 +4494,7 @@ filetypes:
     description: Service Location SPI
 ---
 name: setserial
-remote: vim/vim:runtime
+native: true
 glob: "**/setserial.vim"
 filetypes:
 - name: setserial
@@ -4503,7 +4503,7 @@ filetypes:
     description: Setserial config
 ---
 name: catalog
-remote: vim/vim:runtime
+native: true
 glob: "**/catalog.vim"
 filetypes:
 - name: catalog
@@ -4513,7 +4513,7 @@ filetypes:
   - pattern: sgml.catalog*
 ---
 name: scheme
-remote: vim/vim:runtime
+native: true
 glob: "**/scheme.vim"
 filetypes:
 - name: scheme
@@ -4522,7 +4522,7 @@ filetypes:
     description: Scheme
 ---
 name: screen
-remote: vim/vim:runtime
+native: true
 glob: "**/screen.vim"
 filetypes:
 - name: screen
@@ -4531,7 +4531,7 @@ filetypes:
     description: Screen RC
 ---
 name: simula
-remote: vim/vim:runtime
+native: true
 glob: "**/simula.vim"
 filetypes:
 - name: simula
@@ -4540,7 +4540,7 @@ filetypes:
     description: Simula
 ---
 name: sinda
-remote: vim/vim:runtime
+native: true
 glob: "**/sinda.vim"
 filetypes:
 - name: sinda
@@ -4549,7 +4549,7 @@ filetypes:
     description: SINDA
 ---
 name: sisu
-remote: vim/vim:runtime
+native: true
 glob: "**/sisu.vim"
 filetypes:
 - name: sisu
@@ -4558,7 +4558,7 @@ filetypes:
     description: SiSU
 ---
 name: skill
-remote: vim/vim:runtime
+native: true
 glob: "**/skill.vim"
 filetypes:
 - name: skill
@@ -4567,7 +4567,7 @@ filetypes:
     description: SKILL
 ---
 name: slrnrc
-remote: vim/vim:runtime
+native: true
 glob: "**/slrnrc.vim"
 filetypes:
 - name: slrnrc
@@ -4576,7 +4576,7 @@ filetypes:
     description: SLRN
 ---
 name: slrnsc
-remote: vim/vim:runtime
+native: true
 glob: "**/slrnsc.vim"
 filetypes:
 - name: slrnsc
@@ -4585,7 +4585,7 @@ filetypes:
     description: SLRN
 ---
 name: st
-remote: vim/vim:runtime
+native: true
 glob: "**/st.vim"
 after: html
 filetypes:
@@ -4595,7 +4595,7 @@ filetypes:
     description: Smalltalk (and TeX)
 ---
 name: smarty
-remote: vim/vim:runtime
+native: true
 glob: "**/smarty.vim"
 filetypes:
 - name: smarty
@@ -4604,7 +4604,7 @@ filetypes:
     description: Smarty templates
 ---
 name: smith
-remote: vim/vim:runtime
+native: true
 glob: "**/smith.vim"
 filetypes:
 - name: smith
@@ -4613,7 +4613,7 @@ filetypes:
     description: SMITH
 ---
 name: snobol4
-remote: vim/vim:runtime
+native: true
 glob: "**/snobol4.vim"
 filetypes:
 - name: snobol4
@@ -4622,7 +4622,7 @@ filetypes:
     description: Snobol4 and spitbol
 ---
 name: mib
-remote: vim/vim:runtime
+native: true
 glob: "**/mib.vim"
 filetypes:
 - name: mib
@@ -4631,7 +4631,7 @@ filetypes:
     description: SNMP MIB files
 ---
 name: hog
-remote: vim/vim:runtime
+native: true
 glob: "**/hog.vim"
 filetypes:
 - name: hog
@@ -4640,7 +4640,7 @@ filetypes:
     description: Snort Configuration
 ---
 name: spec
-remote: vim/vim:runtime
+native: true
 glob: "**/spec.vim"
 filetypes:
 - name: spec
@@ -4649,7 +4649,7 @@ filetypes:
     description: Spec (Linux RPM)
 ---
 name: spup
-remote: vim/vim:runtime
+native: true
 glob: "**/spup.vim"
 filetypes:
 - name: spup
@@ -4658,7 +4658,7 @@ filetypes:
     description: Speedup (AspenTech plant simulator)
 ---
 name: slice
-remote: vim/vim:runtime
+native: true
 glob: "**/slice.vim"
 filetypes:
 - name: slice
@@ -4667,7 +4667,7 @@ filetypes:
     description: Slice
 ---
 name: spice
-remote: vim/vim:runtime
+native: true
 glob: "**/spice.vim"
 filetypes:
 - name: spice
@@ -4676,7 +4676,7 @@ filetypes:
     description: Spice
 ---
 name: spyce
-remote: vim/vim:runtime
+native: true
 glob: "**/spyce.vim"
 filetypes:
 - name: spyce
@@ -4685,7 +4685,7 @@ filetypes:
     description: Spyce
 ---
 name: squid
-remote: vim/vim:runtime
+native: true
 glob: "**/squid.vim"
 filetypes:
 - name: squid
@@ -4694,7 +4694,7 @@ filetypes:
     description: Squid
 ---
 name: sqlj
-remote: vim/vim:runtime
+native: true
 glob: "**/sqlj.vim"
 filetypes:
 - name: sqlj
@@ -4703,7 +4703,7 @@ filetypes:
     description: SQLJ
 ---
 name: sqr
-remote: vim/vim:runtime
+native: true
 glob: "**/sqr.vim"
 filetypes:
 - name: sqr
@@ -4712,7 +4712,7 @@ filetypes:
     description: SQR
 ---
 name: sshconfig
-remote: vim/vim:runtime
+native: true
 glob: "**/sshconfig.vim"
 filetypes:
 - name: sshconfig
@@ -4721,7 +4721,7 @@ filetypes:
     description: OpenSSH configuration
 ---
 name: sshdconfig
-remote: vim/vim:runtime
+native: true
 glob: "**/sshdconfig.vim"
 filetypes:
 - name: sshdconfig
@@ -4730,7 +4730,7 @@ filetypes:
     description: OpenSSH server configuration
 ---
 name: stata
-remote: vim/vim:runtime
+native: true
 glob: "**/stata.vim"
 filetypes:
 - name: stata
@@ -4739,7 +4739,7 @@ filetypes:
     description: Stata
 ---
 name: smcl
-remote: vim/vim:runtime
+native: true
 glob: "**/smcl.vim"
 filetypes:
 - name: smcl
@@ -4748,7 +4748,7 @@ filetypes:
     description: SMCL
 ---
 name: stp
-remote: vim/vim:runtime
+native: true
 glob: "**/stp.vim"
 filetypes:
 - name: stp
@@ -4757,7 +4757,7 @@ filetypes:
     description: Stored Procedures
 ---
 name: sml
-remote: vim/vim:runtime
+native: true
 glob: "**/sml.vim"
 filetypes:
 - name: sml
@@ -4766,7 +4766,7 @@ filetypes:
     description: Standard ML
 ---
 name: voscm
-remote: vim/vim:runtime
+native: true
 glob: "**/voscm.vim"
 filetypes:
 - name: voscm
@@ -4775,7 +4775,7 @@ filetypes:
     description: Sratus VOS command macro
 ---
 name: swiftgyb
-remote: vim/vim:runtime
+native: true
 glob: "**/swiftgyb.vim"
 filetypes:
 - name: swiftgyb
@@ -4784,7 +4784,7 @@ filetypes:
     description: Swift
 ---
 name: sil
-remote: vim/vim:runtime
+native: true
 glob: "**/sil.vim"
 filetypes:
 - name: sil
@@ -4793,7 +4793,7 @@ filetypes:
     description: Swift Intermediate Language
 ---
 name: sysctl
-remote: vim/vim:runtime
+native: true
 glob: "**/sysctl.vim"
 filetypes:
 - name: sysctl
@@ -4802,7 +4802,7 @@ filetypes:
     description: Sysctl
 ---
 name: sdc
-remote: vim/vim:runtime
+native: true
 glob: "**/sdc.vim"
 filetypes:
 - name: sdc
@@ -4811,7 +4811,7 @@ filetypes:
     description: Synopsys Design Constraints
 ---
 name: sudoers
-remote: vim/vim:runtime
+native: true
 glob: "**/sudoers.vim"
 filetypes:
 - name: sudoers
@@ -4820,7 +4820,7 @@ filetypes:
     description: Sudoers
 ---
 name: tags
-remote: vim/vim:runtime
+native: true
 glob: "**/tags.vim"
 filetypes:
 - name: tags
@@ -4829,7 +4829,7 @@ filetypes:
     description: Tags
 ---
 name: tak
-remote: vim/vim:runtime
+native: true
 glob: "**/tak.vim"
 filetypes:
 - name: tak
@@ -4838,7 +4838,7 @@ filetypes:
     description: TAK
 ---
 name: taskdata
-remote: vim/vim:runtime
+native: true
 glob: "**/taskdata.vim"
 filetypes:
 - name: taskdata
@@ -4847,7 +4847,7 @@ filetypes:
     description: Task
 ---
 name: taskedit
-remote: vim/vim:runtime
+native: true
 glob: "**/taskedit.vim"
 filetypes:
 - name: taskedit
@@ -4856,7 +4856,7 @@ filetypes:
     description: Task
 ---
 name: tcl
-remote: vim/vim:runtime
+native: true
 glob: "**/tcl.vim"
 filetypes:
 - name: tcl
@@ -4865,7 +4865,7 @@ filetypes:
     description: Tcl (JACL too)
 ---
 name: tli
-remote: vim/vim:runtime
+native: true
 glob: "**/tli.vim"
 filetypes:
 - name: tli
@@ -4874,7 +4874,7 @@ filetypes:
     description: TealInfo
 ---
 name: tsalt
-remote: vim/vim:runtime
+native: true
 glob: "**/tsalt.vim"
 filetypes:
 - name: tsalt
@@ -4883,7 +4883,7 @@ filetypes:
     description: Telix Salt
 ---
 name: teraterm
-remote: vim/vim:runtime
+native: true
 glob: "**/teraterm.vim"
 filetypes:
 - name: teraterm
@@ -4892,7 +4892,7 @@ filetypes:
     description: Tera Term Language
 ---
 name: terminfo
-remote: vim/vim:runtime
+native: true
 glob: "**/terminfo.vim"
 filetypes:
 - name: terminfo
@@ -4901,7 +4901,7 @@ filetypes:
     description: Terminfo
 ---
 name: tex
-remote: vim/vim:runtime
+native: true
 glob: "**/tex.vim"
 extract_in_after: true
 filetypes:
@@ -4911,7 +4911,7 @@ filetypes:
     description: TeX
 ---
 name: texinfo
-remote: vim/vim:runtime
+native: true
 glob: "**/texinfo.vim"
 filetypes:
 - name: texinfo
@@ -4920,7 +4920,7 @@ filetypes:
     description: Texinfo
 ---
 name: texmf
-remote: vim/vim:runtime
+native: true
 glob: "**/texmf.vim"
 filetypes:
 - name: texmf
@@ -4929,7 +4929,7 @@ filetypes:
     description: TeX configuration
 ---
 name: tidy
-remote: vim/vim:runtime
+native: true
 glob: "**/tidy.vim"
 filetypes:
 - name: tidy
@@ -4938,7 +4938,7 @@ filetypes:
     description: Tidy config
 ---
 name: tf
-remote: vim/vim:runtime
+native: true
 glob: "**/tf.vim"
 filetypes:
 - name: tf
@@ -4947,7 +4947,7 @@ filetypes:
     description: TF mud client
 ---
 name: tpp
-remote: vim/vim:runtime
+native: true
 glob: "**/tpp.vim"
 filetypes:
 - name: tpp
@@ -4956,7 +4956,7 @@ filetypes:
     description: TPP - Text Presentation Program
 ---
 name: treetop
-remote: vim/vim:runtime
+native: true
 glob: "**/treetop.vim"
 filetypes:
 - name: treetop
@@ -4965,7 +4965,7 @@ filetypes:
     description: Treetop
 ---
 name: trustees
-remote: vim/vim:runtime
+native: true
 glob: "**/trustees.vim"
 filetypes:
 - name: trustees
@@ -4974,7 +4974,7 @@ filetypes:
     description: Trustees
 ---
 name: tssgm
-remote: vim/vim:runtime
+native: true
 glob: "**/tssgm.vim"
 filetypes:
 - name: tssgm
@@ -4983,7 +4983,7 @@ filetypes:
     description: TSS - Geometry
 ---
 name: tssop
-remote: vim/vim:runtime
+native: true
 glob: "**/tssop.vim"
 filetypes:
 - name: tssop
@@ -4992,7 +4992,7 @@ filetypes:
     description: TSS - Optics
 ---
 name: tsscl
-remote: vim/vim:runtime
+native: true
 glob: "**/tsscl.vim"
 filetypes:
 - name: tsscl
@@ -5001,7 +5001,7 @@ filetypes:
     description: TSS - Command Line (temporary)
 ---
 name: twig
-remote: vim/vim:runtime
+native: true
 glob: "**/twig.vim"
 filetypes:
 - name: twig
@@ -5010,7 +5010,7 @@ filetypes:
     description: TWIG files
 ---
 name: uil
-remote: vim/vim:runtime
+native: true
 glob: "**/uil.vim"
 filetypes:
 - name: uil
@@ -5019,7 +5019,7 @@ filetypes:
     description: Motif UIT/UIL files
 ---
 name: udevconf
-remote: vim/vim:runtime
+native: true
 glob: "**/udevconf.vim"
 filetypes:
 - name: udevconf
@@ -5028,7 +5028,7 @@ filetypes:
     description: Udev conf
 ---
 name: udevperm
-remote: vim/vim:runtime
+native: true
 glob: "**/udevperm.vim"
 filetypes:
 - name: udevperm
@@ -5037,7 +5037,7 @@ filetypes:
     description: Udev permissions
 ---
 name: uc
-remote: vim/vim:runtime
+native: true
 glob: "**/uc.vim"
 filetypes:
 - name: uc
@@ -5046,7 +5046,7 @@ filetypes:
     description: UnrealScript
 ---
 name: updatedb
-remote: vim/vim:runtime
+native: true
 glob: "**/updatedb.vim"
 filetypes:
 - name: updatedb
@@ -5055,7 +5055,7 @@ filetypes:
     description: Updatedb
 ---
 name: upstart
-remote: vim/vim:runtime
+native: true
 glob: "**/upstart.vim"
 filetypes:
 - name: upstart
@@ -5064,7 +5064,7 @@ filetypes:
     description: Upstart (init(8)) config files
 ---
 name: vera
-remote: vim/vim:runtime
+native: true
 glob: "**/vera.vim"
 filetypes:
 - name: vera
@@ -5073,7 +5073,7 @@ filetypes:
     description: Vera
 ---
 name: verilog
-remote: vim/vim:runtime
+native: true
 glob: "**/verilog.vim"
 filetypes:
 - name: verilog
@@ -5082,7 +5082,7 @@ filetypes:
     description: Verilog HDL
 ---
 name: verilogams
-remote: vim/vim:runtime
+native: true
 glob: "**/verilogams.vim"
 filetypes:
 - name: verilogams
@@ -5091,7 +5091,7 @@ filetypes:
     description: Verilog-AMS HDL
 ---
 name: systemverilog
-remote: vim/vim:runtime
+native: true
 glob: "**/systemverilog.vim"
 filetypes:
 - name: systemverilog
@@ -5100,7 +5100,7 @@ filetypes:
     description: SystemVerilog
 ---
 name: vhdl
-remote: vim/vim:runtime
+native: true
 glob: "**/vhdl.vim"
 filetypes:
 - name: vhdl
@@ -5118,7 +5118,7 @@ filetypes:
   - pattern: "*vimrc*"
 ---
 name: viminfo
-remote: vim/vim:runtime
+native: true
 glob: "**/viminfo.vim"
 filetypes:
 - name: viminfo
@@ -5127,7 +5127,7 @@ filetypes:
     description: Viminfo file
 ---
 name: vgrindefs
-remote: vim/vim:runtime
+native: true
 glob: "**/vgrindefs.vim"
 filetypes:
 - name: vgrindefs
@@ -5136,7 +5136,7 @@ filetypes:
     description: Vgrindefs file
 ---
 name: vrml
-remote: vim/vim:runtime
+native: true
 glob: "**/vrml.vim"
 filetypes:
 - name: vrml
@@ -5145,7 +5145,7 @@ filetypes:
     description: VRML V1.0c
 ---
 name: vroom
-remote: vim/vim:runtime
+native: true
 glob: "**/vroom.vim"
 filetypes:
 - name: vroom
@@ -5154,7 +5154,7 @@ filetypes:
     description: Vroom (vim testing and executable documentation)
 ---
 name: wast
-remote: vim/vim:runtime
+native: true
 glob: "**/wast.vim"
 filetypes:
 - name: wast
@@ -5163,7 +5163,7 @@ filetypes:
     description: WebAssembly
 ---
 name: webmacro
-remote: vim/vim:runtime
+native: true
 glob: "**/webmacro.vim"
 filetypes:
 - name: webmacro
@@ -5172,7 +5172,7 @@ filetypes:
     description: Webmacro
 ---
 name: wget
-remote: vim/vim:runtime
+native: true
 glob: "**/wget.vim"
 filetypes:
 - name: wget
@@ -5181,7 +5181,7 @@ filetypes:
     description: Wget config
 ---
 name: wml
-remote: vim/vim:runtime
+native: true
 glob: "**/wml.vim"
 filetypes:
 - name: wml
@@ -5190,7 +5190,7 @@ filetypes:
     description: Website MetaLanguage
 ---
 name: winbatch
-remote: vim/vim:runtime
+native: true
 glob: "**/winbatch.vim"
 filetypes:
 - name: winbatch
@@ -5199,7 +5199,7 @@ filetypes:
     description: Winbatch
 ---
 name: wsml
-remote: vim/vim:runtime
+native: true
 glob: "**/wsml.vim"
 filetypes:
 - name: wsml
@@ -5208,7 +5208,7 @@ filetypes:
     description: WSML
 ---
 name: wvdial
-remote: vim/vim:runtime
+native: true
 glob: "**/wvdial.vim"
 filetypes:
 - name: wvdial
@@ -5217,7 +5217,7 @@ filetypes:
     description: WvDial
 ---
 name: cvsrc
-remote: vim/vim:runtime
+native: true
 glob: "**/cvsrc.vim"
 filetypes:
 - name: cvsrc
@@ -5226,7 +5226,7 @@ filetypes:
     description: CVS RC file
 ---
 name: cvs
-remote: vim/vim:runtime
+native: true
 glob: "**/cvs.vim"
 filetypes:
 - name: cvs
@@ -5234,7 +5234,7 @@ filetypes:
   - pattern: cvs\d\+
 ---
 name: wsh
-remote: vim/vim:runtime
+native: true
 glob: "**/wsh.vim"
 filetypes:
 - name: wsh
@@ -5243,7 +5243,7 @@ filetypes:
     description: Windows Scripting Host and Windows Script Component
 ---
 name: xhtml
-remote: vim/vim:runtime
+native: true
 glob: "**/xhtml.vim"
 filetypes:
 - name: xhtml
@@ -5252,7 +5252,7 @@ filetypes:
     description: XHTML
 ---
 name: xinetd
-remote: vim/vim:runtime
+native: true
 glob: "**/xinetd.vim"
 filetypes:
 - name: xinetd
@@ -5262,7 +5262,7 @@ filetypes:
   - pattern: "*/etc/xinetd.d/*"
 ---
 name: xdefaults
-remote: vim/vim:runtime
+native: true
 glob: "**/xdefaults.vim"
 filetypes:
 - name: xdefaults
@@ -5272,7 +5272,7 @@ filetypes:
   - pattern: Xresources*,*/app-defaults/*,*/Xresources/*
 ---
 name: xmath
-remote: vim/vim:runtime
+native: true
 glob: "**/xmath.vim"
 filetypes:
 - name: xmath
@@ -5281,7 +5281,7 @@ filetypes:
     description: Xmath
 ---
 name: xmodmap
-remote: vim/vim:runtime
+native: true
 glob: "**/xmodmap.vim"
 filetypes:
 - name: xmodmap
@@ -5291,7 +5291,7 @@ filetypes:
   - pattern: "*xmodmap*"
 ---
 name: xquery
-remote: vim/vim:runtime
+native: true
 glob: "**/xquery.vim"
 filetypes:
 - name: xquery
@@ -5300,7 +5300,7 @@ filetypes:
     description: Xquery
 ---
 name: xsd
-remote: vim/vim:runtime
+native: true
 glob: "**/xsd.vim"
 filetypes:
 - name: xsd
@@ -5309,7 +5309,7 @@ filetypes:
     description: XSD
 ---
 name: xslt
-remote: vim/vim:runtime
+native: true
 glob: "**/xslt.vim"
 filetypes:
 - name: xslt
@@ -5318,7 +5318,7 @@ filetypes:
     description: Xslt
 ---
 name: yacc
-remote: vim/vim:runtime
+native: true
 glob: "**/yacc.vim"
 filetypes:
 - name: yacc
@@ -5327,7 +5327,7 @@ filetypes:
     description: Yacc
 ---
 name: zimbu
-remote: vim/vim:runtime
+native: true
 glob: "**/zimbu.vim"
 filetypes:
 - name: zimbu
@@ -5336,7 +5336,7 @@ filetypes:
     description: Zimbu
 ---
 name: z8a
-remote: vim/vim:runtime
+native: true
 glob: "**/z8a.vim"
 filetypes:
 - name: z8a
@@ -5345,7 +5345,7 @@ filetypes:
     description: Z80 assembler asz80
 ---
 name: apachestyle
-remote: vim/vim:runtime
+native: true
 glob: "**/apachestyle.vim"
 filetypes:
 - name: apachestyle
@@ -5353,7 +5353,7 @@ filetypes:
   - pattern: "*/etc/proftpd/*.conf*,*/etc/proftpd/conf.*/*,proftpd.conf*"
 ---
 name: asterisk
-remote: vim/vim:runtime
+native: true
 glob: "**/asterisk.vim"
 filetypes:
 - name: asterisk
@@ -5361,7 +5361,7 @@ filetypes:
   - pattern: "*asterisk/*.conf*"
 ---
 name: asteriskvm
-remote: vim/vim:runtime
+native: true
 glob: "**/asteriskvm.vim"
 filetypes:
 - name: asteriskvm
@@ -5369,7 +5369,7 @@ filetypes:
   - pattern: "*asterisk*/*voicemail.conf*"
 ---
 name: bzr
-remote: vim/vim:runtime
+native: true
 glob: "**/bzr.vim"
 filetypes:
 - name: bzr
@@ -5378,7 +5378,7 @@ filetypes:
     description: Bazaar version control
 ---
 name: crontab
-remote: vim/vim:runtime
+native: true
 glob: "**/crontab.vim"
 filetypes:
 - name: crontab
@@ -5386,7 +5386,7 @@ filetypes:
   - pattern: crontab,crontab.*,*/etc/cron.d/*
 ---
 name: fvwm
-remote: vim/vim:runtime
+native: true
 glob: "**/fvwm.vim"
 filetypes:
 - name: fvwm
@@ -5394,7 +5394,7 @@ filetypes:
   - pattern: "*/.fvwm/*"
 ---
 name: logcheck
-remote: vim/vim:runtime
+native: true
 glob: "**/logcheck.vim"
 filetypes:
 - name: logcheck
@@ -5402,7 +5402,7 @@ filetypes:
   - pattern: "*/etc/logcheck/*.d*/*"
 ---
 name: svn
-remote: vim/vim:runtime
+native: true
 glob: "**/svn.vim"
 filetypes:
 - name: svn
@@ -5411,7 +5411,7 @@ filetypes:
     description: Subversion commit file
 ---
 name: text
-remote: vim/vim:runtime
+native: true
 glob: "**/text.vim"
 filetypes:
 - name: text
@@ -5420,7 +5420,7 @@ filetypes:
     description: the "conf" type being used if there is a line starting with '#'.
 ---
 name: autodoc
-remote: vim/vim:runtime
+native: true
 glob: "**/autodoc.vim"
 # Needed by c, cmod, and pike
 filetypes: []
@@ -5431,7 +5431,7 @@ dependencies: html
 filetypes: []
 ---
 name: xf86conf
-remote: vim/vim:runtime
+native: true
 glob: "**/xf86conf.vim"
 filetypes:
 - name: xf86conf
@@ -5439,14 +5439,14 @@ filetypes:
   - pattern: "XF86Config-4*,XF86Config*,*/xorg.conf.d/*.conf,xorg.conf,xorg.conf-4"
 ---
 name: xpm
-remote: vim/vim:runtime
+native: true
 glob: "**/xpm.vim"
 filetypes:
 - name: xpm
   linguist: X PixMap
 ---
 name: xpm2
-remote: vim/vim:runtime
+native: true
 glob: "**/xpm2.vim"
 filetypes:
 - name: xpm2
diff --git a/scripts/build b/scripts/build
index c0a80b4fa..8ff113f3e 100755
--- a/scripts/build
+++ b/scripts/build
@@ -896,16 +896,16 @@ def show_warnings(all_filetypes, expected_filetypes)
 end
 
 def generate_fallback
-  filetype_content = File.read('tmp/vim/vim/runtime/filetype.vim') 
+  filetype_content = File.read('tmp/vim/vim-v8.2.4274/runtime/filetype.vim') 
   filetype_content.gsub!('runtime! ftdetect/*.vim', '')
   filetype_content.gsub!(/^au BufNewFile,BufRead \*\n.+?runtime!.+?endif/m) {}
   filetype_content.gsub!(/^au StdinReadPost \* .+?runtime!.+?endif/m) {}
   filetype_content.gsub!(/^au filetypedetect BufNewFile,BufRead,StdinReadPost \*\n.+?endif/m) {}
   filetype_content.gsub!("dist#ft#", "polyglot#ft#")
   File.write('extras/filetype.vim', filetype_content)
-  File.write('extras/menu.vim', File.read('tmp/vim/vim/runtime/menu.vim'))
+  File.write('extras/menu.vim', File.read('tmp/vim/vim-v8.2.4274/runtime/menu.vim'))
 
-  autoload_content = File.read('tmp/vim/vim/runtime/autoload/dist/ft.vim') 
+  autoload_content = File.read('tmp/vim/vim-v8.2.4274/runtime/autoload/dist/ft.vim') 
   autoload_content.gsub!('dist#ft#', 'polyglot#ft#')
   File.write('autoload/polyglot/ft.vim', autoload_content)
 end
@@ -919,6 +919,11 @@ if __FILE__ == $0
   Dir.mkdir('tmp') unless File.exists?('tmp')
 
   packages, heuristics = load_data()
+  packages.each do |package|
+    if package["native"] == true
+      package["remote"] = "vim/vim@v8.2.4274:runtime"
+    end
+  end
   download(packages)
   extract(packages)
   generate_fallback()
diff --git a/syntax/plantuml.vim b/syntax/plantuml.vim
index 6e8ecf2d3..50e08dc1c 100644
--- a/syntax/plantuml.vim
+++ b/syntax/plantuml.vim
@@ -2,7 +2,6 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'plantuml', 'syntax/plantuml.v
   finish
 endif
 
-scriptencoding utf-8
 " Vim syntax file
 " Language:     PlantUML
 " License:      VIM LICENSE
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index 55e007bd7..516f207f9 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -120,11 +120,11 @@ syn region    solFuncModParens    contained contains=solString,solFuncCall,solCo
       \ end=')'
 syn keyword   solFuncReturn       contained nextgroup=solFuncRetParens skipwhite skipempty returns
 syn region    solFuncRetParens    contains=solValueType,solFuncStorageType nextgroup=solFuncBody skipempty skipwhite
-      \ start='(' 
-      \ end=')' 
+      \ start='('
+      \ end=')'
 syn region    solFuncBody         contained contains=solDestructure,solComment,solAssemblyBlock,solEmitEvent,solTypeCast,solMethod,solValueType,solConstant,solKeyword,solRepeat,solLabel,solException,solStructure,solFuncStorageType,solOperator,solNumber,solString,solFuncCall,solIf,solElse,solLoop skipempty skipwhite
-      \ start='{' 
-      \ end='}' 
+      \ start='{'
+      \ end='}'
 syn match     solFuncCall         contained skipempty skipwhite nextgroup=solCallOptions,solFuncCallParens
       \ '\v%(%(<if>|<uint>|<int>|<ufixed>|<bytes>|<address>|<string>|<bool>)\s*)@<!<[a-zA-Z_][0-9a-zA-Z_]*\s*%((\{(\n|.|\s)*\})?\s*(\((\n|.|\s)*\)))@='
 syn region    solFuncCallParens   contained transparent contains=solComment,solString,solFuncCall,solConstant,solNumber,solMethod,solTypeCast,solComma,solOperator
@@ -185,6 +185,12 @@ hi def link   solEventName        Function
 hi def link   solEventParamMod    Keyword
 hi def link   solEmitEvent        Special
 
+" Errors
+syn match     solError            /\<error\>/ nextgroup=solErrorName,solFuncParams skipwhite
+syn match     solErrorName        /\<[a-zA-Z_][0-9a-zA-Z_]*/ nextgroup=solFuncParam contained skipwhite
+
+hi def link   solErrorName        Function
+
 " Constants
 syn keyword   solConstant         true false wei szabo finney ether seconds minutes hours days weeks years now super
 syn keyword   solConstant         block msg now tx this abi

From a4f98d2a9e9dfeb110d4a910ea177432fec88b81 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 12 Mar 2022 15:46:18 +0100
Subject: [PATCH 287/299] Update

---
 autoload/julia_blocks.vim | 94 +++++++++++++++++++++++++++++----------
 ftplugin/julia.vim        |  2 +-
 indent/julia.vim          |  6 +--
 indent/svelte.vim         | 16 ++++++-
 syntax/julia.vim          |  5 ++-
 syntax/smt2.vim           |  2 -
 syntax/solidity.vim       |  2 +-
 syntax/svelte-html.vim    | 41 ++++++++---------
 syntax/swayconfig.vim     |  9 +++-
 syntax/swift.vim          | 20 ++++++++-
 syntax/tmux.vim           | 16 +++----
 syntax/zig.vim            |  2 +
 12 files changed, 150 insertions(+), 65 deletions(-)

diff --git a/autoload/julia_blocks.vim b/autoload/julia_blocks.vim
index 11bbb4354..0f50eb76d 100644
--- a/autoload/julia_blocks.vim
+++ b/autoload/julia_blocks.vim
@@ -117,8 +117,8 @@ function! s:unmap(function)
     return
   endif
   let mapids = a:function =~# "^move" ? ["n", "x", "o"] :
-	\      a:function =~# "^select" ? ["x", "o"] :
-	\      ["n"]
+        \      a:function =~# "^select" ? ["x", "o"] :
+        \      ["n"]
   let fn = "julia_blocks#" . a:function
   let cmd = "<buffer> " . chars
   for m in mapids
@@ -355,10 +355,10 @@ function! s:move_before_begin()
 endfunction
 
 function! s:cycle_until_end()
-  let pos = getpos('.')
+  let c = 0
   while !s:on_end()
+    let pos = getpos('.')
     call s:matchit()
-    let c = 0
     if getpos('.') == pos || c > 1000
       " shouldn't happen, but let's avoid infinite loops anyway
       return 0
@@ -384,12 +384,12 @@ function! s:moveto_block_delim(toend, backwards, ...)
     while 1
       let searchret = search('\C' . pattern, flags)
       if !searchret
-	return ret
+        return ret
       endif
       exe "let skip = " . b:match_skip
       if !skip
-	let ret = 1
-	break
+        let ret = 1
+        break
       endif
     endwhile
   endfor
@@ -495,15 +495,15 @@ function! julia_blocks#moveblock_N()
       let start1_pos = ret_start ? getpos('.') : [0,0,0,0]
       call setpos('.', save_pos)
       if s:on_end()
-	normal! h
+        normal! h
       endif
       let ret_end = s:moveto_block_delim(1, 0, 1)
       let end1_pos = ret_end ? getpos('.')  : [0,0,0,0]
 
       if ret_start && (!ret_end || s:compare_pos(start1_pos, end1_pos) < 0)
-	call setpos('.', start1_pos)
+        call setpos('.', start1_pos)
       else
-	call setpos('.', save_pos)
+        call setpos('.', save_pos)
       endif
     endif
 
@@ -564,7 +564,7 @@ function! julia_blocks#moveblock_p()
     if s:on_begin()
       call s:move_before_begin()
       if s:on_end()
-	normal! l
+        normal! l
       endif
       let save_pos = getpos('.')
       let ret_start = s:moveto_block_delim(0, 1, 1)
@@ -574,9 +574,9 @@ function! julia_blocks#moveblock_p()
       let end1_pos = ret_end ? getpos('.') : [0,0,0,0]
 
       if ret_end && (!ret_start || s:compare_pos(start1_pos, end1_pos) < 0)
-	call setpos('.', end1_pos)
+        call setpos('.', end1_pos)
       else
-	call setpos('.', save_pos)
+        call setpos('.', save_pos)
       endif
     endif
 
@@ -700,7 +700,7 @@ function! s:find_block(current_mode)
 endfunction
 
 function! s:repeated_find(ai_mode)
-  let repeat = b:jlblk_count + (a:ai_mode == 'i' && v:count1 > 1 ? 1 : 0)
+  let repeat = b:jlblk_count + (a:ai_mode == 'i' && b:jlblk_count > 1 ? 1 : 0)
   for c in range(repeat)
     let current_mode = (c < repeat - 1 ? 'a' : a:ai_mode)
     let ret_find_block = s:find_block(current_mode)
@@ -734,8 +734,8 @@ function! julia_blocks#select_a(...)
 
   let b:jlblk_doing_select = 1
 
-  " CursorMove is only triggered if end_pos
-  " end_pos is different than the staring position;
+  " CursorMoved is only triggered if end_pos
+  " is different than the staring position;
   " so when starting from the 'd' in 'end' we need to
   " force it
   if current_pos == end_pos
@@ -746,6 +746,39 @@ function! julia_blocks#select_a(...)
   return [start_pos, end_pos]
 endfunction
 
+let s:bracketBlocks = '\<julia\%(\%(\%(Printf\)\?Par\|SqBra\%(Idx\)\?\|CurBra\)Block\|ParBlockInRange\|StringVars\%(Par\|SqBra\|CurBra\)\|Dollar\%(Par\|SqBra\)\|QuotedParBlockS\?\)\>'
+let s:codeBlocks = '\<julia\%(Conditional\|While\|For\|Begin\|Function\|Macro\|Quote\|\%(Mutable\)\?Struct\|Let\|Do\|Exception\|Abstract\|Primitive\)Block\>'
+
+function s:is_in_brackets(lnum, c)
+  let stack = map(synstack(a:lnum, a:c), 'synIDattr(v:val, "name")')
+  for i in range(len(stack)-1, 0, -1)
+    if stack[i] =~# s:bracketBlocks
+      return 1
+    elseif stack[i] =~# s:codeBlocks
+      return 0
+    endif
+  endfor
+  return 0
+endfunction
+
+function! s:seek_bracket_end()
+  let [lnum, c] = [line('.'), col('.')]
+  if !s:is_in_brackets(lnum, c)
+    return
+  endif
+  while c > 0 && s:is_in_brackets(lnum, c)
+    let c -= 1
+  endwhile
+  let c += 1
+  if !s:is_in_brackets(lnum, c)
+    echoerr "this is a bug, please report it"
+    return
+  end
+  call cursor(lnum, c)
+  call s:matchit()
+  return
+endfunction
+
 function! julia_blocks#select_i()
   call s:get_save_pos(!b:jlblk_did_select)
   let current_pos = getpos('.')
@@ -759,19 +792,32 @@ function! julia_blocks#select_i()
     return s:abort()
   endif
 
-  call setpos('.', end_pos)
-
   let b:jlblk_doing_select = 1
 
-  let start_pos[1] += 1
   call setpos('.', start_pos)
-  normal! ^
+  normal! $
+  call s:seek_bracket_end()
+  let l = getline('.')
+  while col('.') < len(l) && l[col('.'):] =~# '^\s*;'
+    normal! l
+  endwhile
+  if col('.') == len(l) || l[col('.')] =~# '\s'
+    normal! W
+  else
+    normal! l
+  endif
   let start_pos = getpos('.')
-  let end_pos[1] -= 1
-  let end_pos[2] = len(getline(end_pos[1]))
 
-  " CursorMove is only triggered if end_pos
-  " end_pos is different than the staring position;
+  call setpos('.', end_pos)
+  if end_pos[2] > 1 && getline('.')[end_pos[2]-2] =~# '\S'
+    normal! h
+  else
+    normal! gE
+  endif
+  let end_pos = getpos('.')
+
+  " CursorMoved is only triggered if end_pos
+  " is different than the staring position;
   " so when starting from the 'd' in 'end' we need to
   " force it
   if current_pos == end_pos
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index 1213c6b70..e33b1a42a 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -72,7 +72,7 @@ if exists("loaded_matchit")
     elseif attr == 'juliaBlKeyword'
       return b:julia_begin_keywordsm . ':' . b:julia_end_keywords
     elseif attr == 'juliaException'
-      return b:julia_begin_keywordsm . ':\<\%(catch\|finally\)\>:' . b:julia_end_keywords
+      return b:julia_begin_keywordsm . ':\<\%(catch\|else\|finally\)\>:' . b:julia_end_keywords
     endif
     return '\<\>:\<\>'
   endfunction
diff --git a/indent/julia.vim b/indent/julia.vim
index 9f7c4dd03..fabef0224 100644
--- a/indent/julia.vim
+++ b/indent/julia.vim
@@ -92,7 +92,7 @@ function GetJuliaNestingStruct(lnum, ...)
       let i = JuliaMatch(a:lnum, line, '\<else\>', s)
       if i >= 0 && i == fb
         let s = i+1
-        if len(blocks_stack) > 0 && blocks_stack[-1] =~# '\<\%(else\)\=if\>'
+        if len(blocks_stack) > 0 && blocks_stack[-1] =~# '\<\%(\%(else\)\=if\|catch\)\>'
           let blocks_stack[-1] = 'else'
         else
           call add(blocks_stack, 'else')
@@ -110,7 +110,7 @@ function GetJuliaNestingStruct(lnum, ...)
       let i = JuliaMatch(a:lnum, line, '\<catch\>', s)
       if i >= 0 && i == fb
         let s = i+1
-        if len(blocks_stack) > 0 && blocks_stack[-1] == 'try'
+        if len(blocks_stack) > 0 && blocks_stack[-1] =~# '\<\%(try\|finally\)\>'
           let blocks_stack[-1] = 'catch'
         else
           call add(blocks_stack, 'catch')
@@ -121,7 +121,7 @@ function GetJuliaNestingStruct(lnum, ...)
       let i = JuliaMatch(a:lnum, line, '\<finally\>', s)
       if i >= 0 && i == fb
         let s = i+1
-        if len(blocks_stack) > 0 && (blocks_stack[-1] == 'try' || blocks_stack[-1] == 'catch')
+        if len(blocks_stack) > 0 && blocks_stack[-1] =~# '\<\%(try\|catch\|else\)\>'
           let blocks_stack[-1] = 'finally'
         else
           call add(blocks_stack, 'finally')
diff --git a/indent/svelte.vim b/indent/svelte.vim
index 147df65b3..bae715df3 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -119,7 +119,7 @@ function! GetSvelteIndent()
   let cursyns = s:SynsSOL(v:lnum)
   let cursyn = get(cursyns, 0, '')
 
-  if s:SynHTML(cursyn)
+  if s:SynHTML(cursyn) && !s:IsMultipleLineSvelteExpression(curline, cursyns)
     call s:Log('syntax: html')
     let ind = XmlIndentGet(v:lnum, 0)
     if prevline =~? s:empty_tag
@@ -233,6 +233,20 @@ function! s:SynHTML(syn)
   return a:syn ==? 'htmlSvelteTemplate'
 endfunction
 
+function! s:IsMultipleLineSvelteExpression(curline, syns)
+  if a:curline =~ '^\s*{.*}\s*$'
+    return 0
+  endif
+
+  for syn in a:syns
+    if syn ==? 'svelteExpression'
+      return 1
+    endif
+  endfor
+
+  return 0
+endfunction
+
 function! s:SynBlockBody(syn)
   return a:syn ==? 'svelteBlockBody'
 endfunction
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 3d02d5ed5..0dcb1382e 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -183,8 +183,9 @@ syntax region  juliaLetBlock		matchgroup=juliaBlKeyword start="\<let\>" end="\<e
 syntax region  juliaDoBlock		matchgroup=juliaBlKeyword start="\<do\>" end="\<end\>" contains=@juliaExpressions fold
 syntax region  juliaModuleBlock		matchgroup=juliaBlKeyword start="\<\%(bare\)\?module\>" end="\<end\>" contains=@juliaExpressions fold
 syntax region  juliaExceptionBlock	matchgroup=juliaException start="\<try\>" end="\<end\>" contains=@juliaExpressions,juliaCatchBlock,juliaFinallyBlock fold
-syntax region  juliaCatchBlock		matchgroup=juliaException transparent contained start="\<catch\>" end="\<end\>"me=s-1 contains=@juliaExpressions,juliaFinallyBlock
-syntax region  juliaFinallyBlock	matchgroup=juliaException transparent contained start="\<finally\>" end="\<end\>"me=s-1 contains=@juliaExpressions
+syntax region  juliaCatchBlock		matchgroup=juliaException transparent contained start="\<catch\>" end="\<end\>"me=s-1 contains=@juliaExpressions,juliaTryElseBlock,juliaFinallyBlock
+syntax region  juliaTryElseBlock	matchgroup=juliaException transparent contained start="\<else\>" end="\<end\>"me=s-1 contains=@juliaExpressions,juliaFinallyBlock
+syntax region  juliaFinallyBlock	matchgroup=juliaException transparent contained start="\<finally\>" end="\<end\>"me=s-1 contains=@juliaExpressions,juliaCatchBlock
 syntax region  juliaAbstractBlock	matchgroup=juliaBlKeyword start="\<abstract\s\+type\>" end="\<end\>" fold contains=@juliaExpressions,juliaStructR
 syntax region  juliaPrimitiveBlock	matchgroup=juliaBlKeyword start="\<primitive\s\+type\>" end="\<end\>" fold contains=@juliaExpressions,juliaStructR
 
diff --git a/syntax/smt2.vim b/syntax/smt2.vim
index 29cb4625d..647732b24 100644
--- a/syntax/smt2.vim
+++ b/syntax/smt2.vim
@@ -129,7 +129,6 @@ syntax keyword smt2Builtin
       \ rotate_left
       \ rotate_right
       \ sat
-      \ sat
       \ select
       \ sign_extend
       \ store
@@ -137,7 +136,6 @@ syntax keyword smt2Builtin
       \ to_real
       \ true
       \ unsat
-      \ unsat
       \ xor
       \ zero_extend
 syntax match smt2Builtin "\m\C[\^\~]"
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index 516f207f9..e533ab545 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -247,7 +247,7 @@ syn keyword   solMethod           delete new var return import
 syn region    solMethodParens     start='(' end=')' contains=solString,solConstant,solNumber,solFuncCall,solTypeCast,solMethod,solComma,solOperator contained transparent
 syn keyword   solMethod           nextgroup=solMethodParens skipwhite skipempty
       \ blockhash require revert assert keccak256 sha256
-      \ ripemd160 ecrecover addmod mullmod selfdestruct
+      \ ripemd160 ecrecover addmod mulmod selfdestruct
 
 hi def link   solMethod           Special
 
diff --git a/syntax/svelte-html.vim b/syntax/svelte-html.vim
index c0b243b13..31638cd57 100644
--- a/syntax/svelte-html.vim
+++ b/syntax/svelte-html.vim
@@ -22,43 +22,41 @@ syntax match svelteComponentName containedin=htmlTagN '\v\C<[a-z0-9]+(-[a-z0-9]+
 syntax match svelteComponentName containedin=htmlTagN '\vsvelte:\w*'
 
 " Syntax for vim-svelte-theme
-syntax match htmlAttr '\v(\S|\<)@<![^\/\<\>[:blank:]]+' containedin=htmlTag
+syntax match htmlAttr '\v(\S|\<)@<![^\/\<\>[:blank:]]+'
+      \ containedin=htmlTag
       \ contains=htmlString,svelteValue,htmlArg
 syntax match htmlAttrEqual '\v\=' containedin=htmlAttr
 
-syntax match svelteAttr 
-      \ '\v(\S)@<!(on|bind|use|in|out|transition|animate|class):[^\=\>[:blank:]]+(\=\"[^"]*\"|\=\{[^}]*\})?'
+syntax match svelteAttr
+      \ '\(\S\)\@<!\w\+:[^=>[:blank:]]\+\(="[^"]*"\|={[^}]*}\)\?'
       \ containedin=htmlTag 
       \ contains=svelteKey,svelteValue
-
-syntax match svelteKey contained '\v(on|bind|use|in|out|transition|animate|class):[^\=\>[:blank:]]+'
-syntax match svelteValue contained '\v\{[^}]*\}'
+syntax match svelteValue contained '{[^}]*}'
+syntax match svelteKey contained '\w\+:[^=>[:blank:]]\+'
 
 syntax region svelteExpression 
       \ containedin=htmlH.*,htmlItalic
       \ matchgroup=svelteBrace
-      \ transparent
       \ start="{"
-      \ end="}\(}\)\@!"
+      \ end="}\(}\|;\)\@!"
 
+" Multiple lines expressions are supposed to end with '}}'
 syntax region svelteExpression 
-      \ containedin=htmlSvelteTemplate,svelteValue,htmlString,htmlValue,htmlArg,htmlTag
-      \ contains=@simpleJavascriptExpression,svelteAtTags
+      \ containedin=svelteValue,htmlValue,htmlAttr
+      \ contains=@simpleJavascriptExpression
       \ matchgroup=svelteBrace
-      \ transparent
       \ start="{"
-      \ end="}\(}\)\@!"
+      \ end="\(}\)\@<=}"
 
 syntax region svelteExpression 
-      \ containedin=htmlTag
-      \ contains=@simpleJavascriptExpression,svelteAtTags,svelteShortProp
+      \ containedin=htmlSvelteTemplate,svelteValue,htmlString,htmlArg,htmlTag,htmlAttr,htmlValue,htmlAttr
+      \ contains=@simpleJavascriptExpression,svelteAtTags
       \ matchgroup=svelteBrace
-      \ transparent
       \ start="{"
-      \ end="}\(}\)\@!"
+      \ end="}\(}\|;\)\@!"
+      \ oneline
 
-syntax match svelteAtTags '\v\@(html|debug)'
-syntax match svelteShortProp '\v<\w+>'
+syntax match svelteAtTags '@\(html\|debug\)'
 
 syntax region svelteBlockBody
       \ containedin=htmlSvelteTemplate,htmlLink
@@ -101,7 +99,9 @@ syntax region javaScriptTemplateExpression
 syntax match javaScriptNumber '\v<-?\d+L?>|0[xX][0-9a-fA-F]+>' contained
 syntax match javaScriptOperator '[-!|&+<>=%*~^]' contained
 syntax match javaScriptOperator '\v(*)@<!/(/|*)@!' contained
-syntax keyword javaScriptOperator delete instanceof typeof void new in of contained
+syntax keyword javaScriptOperator contained
+      \ delete instanceof typeof void new in of const let var
+      \ return function
 
 highlight default link svelteAttr htmlTag
 if s:highlight_svelte_attr
@@ -112,7 +112,9 @@ else
   highlight default link svelteValue String
 endif
 
+highlight default link svelteExpression None
 highlight default link svelteBrace Type
+highlight default link svelteAtTags Type
 highlight default link svelteBlockKeyword Statement
 highlight default link svelteComponentName htmlTagName
 highlight default link javaScriptTemplateString String
@@ -122,6 +124,5 @@ highlight default link javaScriptNumber	Constant
 highlight default link javaScriptOperator	Operator
 highlight default link svelteAttr	htmlTag
 highlight default link svelteAttrEqual htmlTag
-highlight default link svelteShortProp htmlValue
 "}}}
 " vim: fdm=marker
diff --git a/syntax/swayconfig.vim b/syntax/swayconfig.vim
index 962596655..93832bcf3 100644
--- a/syntax/swayconfig.vim
+++ b/syntax/swayconfig.vim
@@ -192,7 +192,7 @@ syn keyword swayConfigDrawingMarksKeyword show_marks contained
 syn match swayConfigDrawingMarks /^\s*show_marks\s\+\(yes\|no\)\s\?$/ contains=swayConfigFocusWrappingType,swayConfigDrawingMarksKeyword
 
 " Group mode/bar
-syn keyword swayConfigBlockKeyword mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained
+syn keyword swayConfigBlockKeyword set input mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained
 syn region swayConfigBlock start=+.*s\?{$+ end=+^}$+ contains=swayConfigBlockKeyword,swayConfigString,swayConfigBind,swayConfigComment,swayConfigFont,swayConfigFocusWrappingType,swayConfigColor,swayConfigVariable transparent keepend extend
 
 " Line continuation
@@ -202,6 +202,10 @@ syn region swayConfigLineCont start=/^.*\\$/ end=/^.*$/ contains=swayConfigBlock
 syn keyword swayConfigInclude include contained
 syn match swayConfigFile /^include\s\(\~\?\/.*$\|\.\{0,2}\/.*$\)/ contains=swayConfigInclude
 
+" xwayland 
+syn keyword swayConfigXwaylandKeyword xwayland contained
+syn match swayConfigXwaylandModifier /^\s*xwayland\s\+\(enable\|disable\|force\)\s\?$/ contains=swayConfigXwaylandKeyword
+
 " Define the highlighting.
 let b:current_syntax = "swayconfig"
 hi! def link swayConfigError                           Error
@@ -281,5 +285,6 @@ hi! def link swayConfigFloatingModifier                Identifier
 hi! def link swayConfigFloatingMouseAction             Type
 hi! def link swayConfigFocusKeyword                    Type
 hi! def link swayConfigFocusType                       Identifier
-
+hi! def link swayConfigXwaylandKeyword                 Identifier
+hi! def link swayConfigXwaylandModifier                Type
 
diff --git a/syntax/swift.vim b/syntax/swift.vim
index 6ea8a81f3..2dcb0376e 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -140,10 +140,12 @@ syntax keyword swiftKeywords
       \ init
       \ inout
       \ internal
+      \ isolated
       \ lazy
       \ let
       \ mutating
       \ nil
+      \ nonisolated
       \ nonmutating
       \ open
       \ operator
@@ -193,14 +195,22 @@ syntax keyword swiftAttributes
       \ @_exported
       \ @_implementationOnly
       \ @_silgen_name
+      \ @AppStorage
       \ @assignment
       \ @autoclosure
       \ @available
+      \ @Binding
       \ @convention
       \ @discardableResult
+      \ @Environment
+      \ @EnvironmentObject
       \ @escaping
       \ @exported
+      \ @FetchRequest
+      \ @FocusedBinding
+      \ @FocusedValue
       \ @frozen
+      \ @GestureState
       \ @IBAction
       \ @IBDesignable
       \ @IBInspectable
@@ -208,21 +218,29 @@ syntax keyword swiftAttributes
       \ @inlinable
       \ @main
       \ @MainActor
+      \ @Namespace
       \ @noescape
       \ @nonobjc
       \ @noreturn
+      \ @NSApplicationDelegateAdaptor
       \ @NSApplicationMain
       \ @NSCopying
       \ @NSManaged
       \ @objc
+      \ @ObservedObject
       \ @preconcurrency
       \ @propertyWrapper
+      \ @Published
       \ @resultBuilder
+      \ @ScaledMetric
+      \ @SceneStorage
       \ @Sendable
+      \ @State
+      \ @StateObject
       \ @testable
+      \ @UIApplicationDelegateAdaptor
       \ @UIApplicationMain
       \ @usableFromInline
-      \ @warn_unused_result
 
 syntax keyword swiftConditionStatement
       \ #available
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index 69fdd6114..e15761cf3 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'tmux', 'syntax/tmux.vim')
 endif
 
 " Language: tmux(1) configuration file
-" Version: 3.3-rc (git-85ef7359)
+" Version: 3.3-rc (git-ee3f1d25)
 " URL: https://github.com/ericpruitt/tmux.vim/
 " Maintainer: Eric Pruitt <eric.pruitt@gmail.com>
 " License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause)
@@ -88,13 +88,13 @@ syn keyword tmuxOptions
 \ pane-border-indicators pane-border-lines pane-border-status
 \ pane-border-style pane-colours popup-border-lines popup-border-style
 \ popup-style prefix prefix2 prompt-history-limit remain-on-exit
-\ renumber-windows repeat-time set-clipboard set-titles set-titles-string
-\ silence-action status status-bg status-fg status-format status-interval
-\ status-justify status-keys status-left status-left-length
-\ status-left-style status-position status-right status-right-length
-\ status-right-style status-style synchronize-panes terminal-features
-\ terminal-overrides update-environment user-keys visual-activity
-\ visual-bell visual-silence window-active-style window-size
+\ remain-on-exit-format renumber-windows repeat-time set-clipboard
+\ set-titles set-titles-string silence-action status status-bg status-fg
+\ status-format status-interval status-justify status-keys status-left
+\ status-left-length status-left-style status-position status-right
+\ status-right-length status-right-style status-style synchronize-panes
+\ terminal-features terminal-overrides update-environment user-keys
+\ visual-activity visual-bell visual-silence window-active-style window-size
 \ window-status-activity-style window-status-bell-style
 \ window-status-current-format window-status-current-style
 \ window-status-format window-status-last-style window-status-separator
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 287ce0ba5..9441b37f3 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -203,6 +203,8 @@ let s:zig_syntax_keywords = {
     \ ,                  "@floor"
     \ ,                  "@ceil"
     \ ,                  "@trunc"
+    \ ,                  "@wasmMemorySize"
+    \ ,                  "@wasmMemoryGrow"
     \ ,                  "@round"]
     \ }
 

From 0e1b19120995c5ba488cbe16a5281a1bf4af3aab Mon Sep 17 00:00:00 2001
From: Olaf Alders <olaf@wundersolutions.com>
Date: Mon, 18 Apr 2022 06:03:02 -0400
Subject: [PATCH 288/299] Check if TestFiletypeFuncs exists before defining it
 (#788)

Fixes #783
---
 extras/filetype.vim | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/extras/filetype.vim b/extras/filetype.vim
index f6cb13a14..391c2d491 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -2506,17 +2506,20 @@ endif
 " Function called for testing all functions defined here.  These are
 " script-local, thus need to be executed here.
 " Returns a string with error messages (hopefully empty).
-func! TestFiletypeFuncs(testlist)
-  let output = ''
-  for f in a:testlist
-    try
-      exe f
-    catch
-      let output = output . "\n" . f . ": " . v:exception
-    endtry
-  endfor
-  return output
-endfunc
+" Check if function exists first. See https://github.com/vim/vim/issues/9890
+if !exists("*TestFiletypeFuncs")
+  func! TestFiletypeFuncs(testlist)
+    let output = ''
+    for f in a:testlist
+      try
+        exe f
+      catch
+        let output = output . "\n" . f . ": " . v:exception
+      endtry
+    endfor
+    return output
+  endfunc
+endif
 
 " Restore 'cpoptions'
 let &cpo = s:cpo_save

From 32d08013a68efb59f0800f398dbfc64237346f35 Mon Sep 17 00:00:00 2001
From: Michael Meyer <me@entrez.cc>
Date: Mon, 18 Apr 2022 06:03:43 -0400
Subject: [PATCH 289/299] Fix doubled comma in autocmd (#791)

The doubled comma (,,) in the list of autocmd patterns introduces a
blank pattern which matches all filenames in the most recent version of
neovim, causing the default filetype to be sh unless another rule
overrides it.
---
 autoload/polyglot/init.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index edf1f2bca..3d226bb3a 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -3510,7 +3510,7 @@ au BufNewFile,BufRead .reminders*		call s:StarSetf('remind')
 au BufNewFile,BufRead sgml.catalog*		call s:StarSetf('catalog')
 
 " Shell scripts ending in a star
-au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,,PKGBUILD* call polyglot#ft#SetFileTypeSH("bash")
+au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]aliases*,bash-fc[-.]*,PKGBUILD* call polyglot#ft#SetFileTypeSH("bash")
 au BufNewFile,BufRead .kshrc* call polyglot#ft#SetFileTypeSH("ksh")
 au BufNewFile,BufRead .profile* call polyglot#ft#SetFileTypeSH(getline(1))
 

From 8bb92037902a697077259fe4b6f953d00218f7ac Mon Sep 17 00:00:00 2001
From: Josa Gesell <josa@gesell.me>
Date: Mon, 18 Apr 2022 12:04:09 +0200
Subject: [PATCH 290/299] Add missing filetypes for go.sum and go.work (#789)

* Add filetype for go.sum

* Add filetype for go.work
---
 packages.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages.yaml b/packages.yaml
index e0b3db529..05eee7599 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -686,6 +686,12 @@ filetypes:
 - name: gomod
   filenames:
   - go.mod
+- name: gosum
+  filenames:
+  - go.sum
+- name: gowork
+  filenames:
+  - go.work
 - name: gohtmltmpl
   extensions:
   - tmpl

From db3a87a50b559c070b721a40394faa681b8bc1d6 Mon Sep 17 00:00:00 2001
From: nyuszika7h <nyuszika7h@gmail.com>
Date: Mon, 18 Apr 2022 12:04:32 +0200
Subject: [PATCH 291/299] Fix files being misdetected as shell scripts (#787)

Closes #784.

From 55eed00f71914e21c804cc0b8f271b04f4e11c2b Mon Sep 17 00:00:00 2001
From: Carl Smedstad <carl.smedstad@protonmail.com>
Date: Mon, 18 Apr 2022 12:05:30 +0200
Subject: [PATCH 292/299] Add support for Microsoft's DSL Bicep (#776)

See: https://docs.microsoft.com/en-us/azure/azure-resource-manager/bicep/overview
---
 README.md           | 3 ++-
 packages.yaml       | 8 ++++++++
 tests/filetypes.vim | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0b5822235..8943c5fe0 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->598<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->599<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -55,6 +55,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [arduino](https://github.com/sudar/vim-arduino-syntax) (Processing syntax highlighting for pde and ino files)
 - [asciidoc](https://github.com/asciidoc/vim-asciidoc) (AsciiDoc syntax highlighting for asciidoc, adoc and asc files)
 - [autohotkey](https://github.com/hnamikaw/vim-autohotkey) (AutoHotkey syntax highlighting for ahk and ahkl files)
+- [bicep](https://github.com/carlsmedstad/vim-bicep) (Syntax highlighting for bicep files)
 - [blade](https://github.com/jwalton512/vim-blade) (Blade syntax highlighting for blade and blade.php files)
 - [brewfile](https://github.com/bfontaine/Brewfile.vim)
 - [c/c++](https://github.com/vim-jp/vim-cpp) (C++ and C syntax highlighting for cpp, c++, cc, cp, cxx and 18 more files)
diff --git a/packages.yaml b/packages.yaml
index 05eee7599..7753cb245 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -5552,3 +5552,11 @@ name: zinit
 remote: zdharma-continuum/zinit-vim-syntax@main
 # just adds to zsh filetype
 filetypes: []
+---
+name: bicep
+remote: carlsmedstad/vim-bicep
+filetypes:
+- name: bicep
+  patterns:
+  - pattern: '*.bicep'
+    description: Microsoft Bicep
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 6f7c5f050..584008e05 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -646,6 +646,7 @@ call TestFiletype('nftables')
 call TestFiletype('openscad')
 call TestFiletype('mermaid')
 call TestFiletype('org')
+call TestFiletype('bicep')
 
 " DO NOT EDIT CODE ABOVE, IT IS GENERATED WITH MAKEFILE
 

From db7bb8ba22f5798bf3abe9f786bc6e6d002725f8 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Mon, 18 Apr 2022 12:08:27 +0200
Subject: [PATCH 293/299] Update

---
 README.md                    |   2 +-
 autoload/clojurecomplete.vim |   4 +-
 autoload/fish.vim            |   4 +-
 autoload/polyglot/init.vim   |  20 +++--
 autoload/polyglot/sleuth.vim |   9 +-
 extras/filetype.vim          |  25 +++---
 ftplugin/bicep.vim           |  21 +++++
 ftplugin/rst.vim             |   4 +-
 ftplugin/ruby.vim            |   2 +-
 indent/bicep.vim             |  68 +++++++++++++++
 indent/rst.vim               |   2 +
 indent/ruby.vim              |   4 +-
 syntax/bicep.vim             |  83 ++++++++++++++++++
 syntax/clojure.vim           |   4 +-
 syntax/elixir.vim            |   2 +
 syntax/eruby.vim             |  10 +--
 syntax/go.vim                |  45 +++++++---
 syntax/gowork.vim            | 100 +++++++++++++++++++++
 syntax/meson.vim             |   2 +
 syntax/svelte.vim            |   9 ++
 syntax/tmux.vim              | 165 ++++++++++++++++++++++-------------
 syntax/zig.vim               |   1 +
 tests/filetypes.vim          |   4 +-
 23 files changed, 478 insertions(+), 112 deletions(-)
 create mode 100644 ftplugin/bicep.vim
 create mode 100644 indent/bicep.vim
 create mode 100644 syntax/bicep.vim
 create mode 100644 syntax/gowork.vim

diff --git a/README.md b/README.md
index 8943c5fe0..0bb21ce9f 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [idris](https://github.com/idris-hackers/idris-vim) (Idris syntax highlighting for idr and lidr files)
 - [ion](https://github.com/vmchale/ion-vim) (Syntax highlighting for ion files)
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
-- [javascript](https://github.com/pangloss/vim-javascript) (JavaScript syntax highlighting for js, bones, cjs, es, es6 and 18 more files)
+- [javascript](https://github.com/pangloss/vim-javascript) (JavaScript syntax highlighting for js, bones, cjs, es, es6 and 20 more files)
 - [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax) (Syntax highlighting for jenkinsfile and Jenkinsfile files)
 - [jq](https://github.com/vito-c/jq.vim) (JSONiq syntax highlighting for jq files)
 - [json5](https://github.com/GutenYe/json5.vim) (JSON5 syntax highlighting for json5 files)
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index 358330045..e5dfb205a 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -12,8 +12,8 @@ endif
 
 " -*- COMPLETION WORDS -*-
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-" Clojure version 1.10.3
-let s:words = ["&","*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Inst","PrintWriter-on","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","any?","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case","case*","cast","cat","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","deftype*","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extend-protocol","extend-type","extenders","extends?","false","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn*","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","if","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let*","letfn","letfn*","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop*","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","new","newline","next","nfirst","nil","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","quote","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","reify*","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set","set!","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
+" Clojure version 1.11.0
+let s:words = ["&","*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Inst","NaN?","PrintWriter-on","StackTraceElement->vec","Throwable->map","abs","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","any?","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case","case*","cast","cat","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","deftype*","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extend-protocol","extend-type","extenders","extends?","false","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn*","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","if","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","indexed?","infinite?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iteration","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let*","letfn","letfn*","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop*","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","new","newline","next","nfirst","nil","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","parse-boolean","parse-double","parse-long","parse-uuid","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","quote","rand","rand-int","rand-nth","random-sample","random-uuid","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","reify*","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq-to-map-for-destructuring","seq?","seqable?","seque","sequence","sequential?","set","set!","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-keys","update-proxy","update-vals","uri?","use","uuid?","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
 
 " Simple word completion for special forms and public vars in clojure.core
 function! clojurecomplete#Complete(findstart, base)
diff --git a/autoload/fish.vim b/autoload/fish.vim
index d495f7db1..924f38b7f 100644
--- a/autoload/fish.vim
+++ b/autoload/fish.vim
@@ -71,8 +71,6 @@ function! fish#Indent()
     let l:prevline = getline(l:prevlnum)
     let l:previndent = indent(l:prevlnum)
     if s:IsContinuedLine(v:lnum)
-        " It is customary to increment indentation of continued lines by three
-        " or a custom value defined by the user if available.
         let l:previndent = indent(v:lnum - 1)
         if s:IsContinuedLine(v:lnum - 1)
             return l:previndent
@@ -81,7 +79,7 @@ function! fish#Indent()
         elseif exists('g:indent_cont')
             return l:previndent + g:indent_cont
         else
-            return l:previndent + 3
+            return l:previndent + l:shiftwidth
         endif
     endif
     if l:prevline =~# '\v^\s*%(begin|if|else|while|for|function|case|switch)>'
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 3d226bb3a..45e9aab2a 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -169,6 +169,10 @@ let did_load_filetypes = 1
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(g:polyglot_is_disabled, 'bicep')
+  au BufNewFile,BufRead *.bicep setf bicep
+endif
+
 if !has_key(g:polyglot_is_disabled, 'org')
   au BufNewFile,BufRead *.org setf org
 endif
@@ -1328,10 +1332,6 @@ if !has_key(g:polyglot_is_disabled, 'hex')
   au BufNewFile,BufRead *.h32,*.hex setf hex
 endif
 
-if !has_key(g:polyglot_is_disabled, 'hercules')
-  au BufNewFile,BufRead *.errsum,*.ev,*.sum,*.vc setf hercules
-endif
-
 if !has_key(g:polyglot_is_disabled, 'hastepreproc')
   au BufNewFile,BufRead *.htpp setf hastepreproc
 endif
@@ -1783,7 +1783,7 @@ if !has_key(g:polyglot_is_disabled, 'odin')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'dosini')
-  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}flake8,{.,}npmrc,buildozer.spec setf dosini
+  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*.url,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}flake8,{.,}npmrc,buildozer.spec setf dosini
   au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
   au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
 endif
@@ -2157,7 +2157,7 @@ if !has_key(g:polyglot_is_disabled, 'mako')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'm4')
-  au BufNewFile,BufRead *.at,*.m4 setf m4
+  au BufNewFile,BufRead *.at,*.m4,*.mc setf m4
 endif
 
 if !has_key(g:polyglot_is_disabled, 'lua')
@@ -2320,16 +2320,22 @@ endif
 
 if !has_key(g:polyglot_is_disabled, 'javascript')
   au! BufNewFile,BufRead,BufWritePost *.frag call polyglot#detect#Frag()
-  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
+  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jslib,*.jsm,*.jspre,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
   au BufNewFile,BufRead *.flow setf flow
 endif
 
 if !has_key(g:polyglot_is_disabled, 'go')
   au BufNewFile,BufRead *.go setf go
   au BufNewFile,BufRead go.mod setf gomod
+  au BufNewFile,BufRead go.sum setf gosum
+  au BufNewFile,BufRead go.work setf gowork
   au BufNewFile,BufRead *.tmpl setf gohtmltmpl
 endif
 
+if !has_key(g:polyglot_is_disabled, 'hercules')
+  au BufNewFile,BufRead *.errsum,*.ev,*.sum,*.vc setf hercules
+endif
+
 if !has_key(g:polyglot_is_disabled, 'gnuplot')
   au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt setf gnuplot
 endif
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index c031c1575..ba166bf78 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -48,6 +48,7 @@ let s:globs = {
   \ 'bc': '*.bc',
   \ 'bdf': '*.bdf',
   \ 'bib': '*.bib',
+  \ 'bicep': '*.bicep',
   \ 'bindzone': 'named.root',
   \ 'blade': '*.blade,*.blade.php',
   \ 'blank': '*.bl',
@@ -129,7 +130,7 @@ let s:globs = {
   \ 'dnsmasq': '',
   \ 'dockerfile': '*.Dockerfile,*.dock,Containerfile,Dockerfile,dockerfile,Dockerfile*',
   \ 'dosbatch': '*.bat,*.sys',
-  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,.flake8,buildozer.spec,.editorconfig,.npmrc,php.ini-*',
+  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,*.url,.flake8,buildozer.spec,.editorconfig,.npmrc,php.ini-*',
   \ 'dot': '*.dot,*.gv',
   \ 'dracula': '*.drac,*.drc,*lvs,*lpe,drac.*',
   \ 'dsdl': '*.sdl',
@@ -197,6 +198,8 @@ let s:globs = {
   \ 'go': '*.go',
   \ 'gohtmltmpl': '*.tmpl',
   \ 'gomod': 'go.mod',
+  \ 'gosum': 'go.sum',
+  \ 'gowork': 'go.work',
   \ 'gp': '*.gp,.gprc',
   \ 'gpg': '',
   \ 'grads': '*.gs',
@@ -253,7 +256,7 @@ let s:globs = {
   \ 'jam': '*.jpl,*.jpr,Prl*.*,JAM*.*',
   \ 'java': '*.java,*.jav',
   \ 'javacc': '*.jj,*.jjt',
-  \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
+  \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.jsb,*.jscad,*.jsfl,*.jslib,*.jsm,*.jspre,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
   \ 'javascriptreact': '*.jsx',
   \ 'jess': '*.clp',
   \ 'jgraph': '*.jgr',
@@ -309,7 +312,7 @@ let s:globs = {
   \ 'lss': '*.lss',
   \ 'lua': '*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,.luacheckrc',
   \ 'lynx': 'lynx.cfg',
-  \ 'm4': '*.m4,*.at',
+  \ 'm4': '*.m4,*.mc,*.at',
   \ 'mail': '*.eml,snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\\\{6\},neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},ae\d\+.txt,{neo,}mutt[[:alnum:]._-]\\\{6\},reportbug-*',
   \ 'mailaliases': '',
   \ 'mailcap': '.mailcap,mailcap',
diff --git a/extras/filetype.vim b/extras/filetype.vim
index 391c2d491..f6cb13a14 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -2506,20 +2506,17 @@ endif
 " Function called for testing all functions defined here.  These are
 " script-local, thus need to be executed here.
 " Returns a string with error messages (hopefully empty).
-" Check if function exists first. See https://github.com/vim/vim/issues/9890
-if !exists("*TestFiletypeFuncs")
-  func! TestFiletypeFuncs(testlist)
-    let output = ''
-    for f in a:testlist
-      try
-        exe f
-      catch
-        let output = output . "\n" . f . ": " . v:exception
-      endtry
-    endfor
-    return output
-  endfunc
-endif
+func! TestFiletypeFuncs(testlist)
+  let output = ''
+  for f in a:testlist
+    try
+      exe f
+    catch
+      let output = output . "\n" . f . ": " . v:exception
+    endtry
+  endfor
+  return output
+endfunc
 
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
diff --git a/ftplugin/bicep.vim b/ftplugin/bicep.vim
new file mode 100644
index 000000000..112c429e0
--- /dev/null
+++ b/ftplugin/bicep.vim
@@ -0,0 +1,21 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bicep', 'ftplugin/bicep.vim')
+  finish
+endif
+
+" bicep.vim - basic bicep integration
+" Maintainer: Carl Smedstad <carl.smedstad at protonmail dot com>
+
+if exists('b:did_ftplugin') || v:version < 700 || &compatible
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+" Set the commentstring
+setlocal commentstring=//%s
+let b:undo_ftplugin = ' commentstring<'
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/ftplugin/rst.vim b/ftplugin/rst.vim
index 7c4a82a62..719d9fe78 100644
--- a/ftplugin/rst.vim
+++ b/ftplugin/rst.vim
@@ -22,7 +22,7 @@ if !exists('g:rst_fold_enabled')
   let g:rst_fold_enabled = 0
 endif
 
-let b:undo_ftplugin = "setl com< cms< et< fo<"
+let b:undo_ftplugin = "setlocal comments< commentstring< expandtab< formatoptions<"
 
 setlocal comments=fb:.. commentstring=..\ %s expandtab
 setlocal formatoptions+=tcroql
@@ -36,6 +36,7 @@ setlocal formatoptions+=tcroql
 
 if exists("g:rst_style") && g:rst_style != 0
     setlocal expandtab shiftwidth=3 softtabstop=3 tabstop=8
+    let b:undo_ftplugin .= " | setlocal softtabstop< shiftwidth< tabstop<"
 endif
 
 if g:rst_fold_enabled != 0 && has('patch-7.3.867')  " Introduced the TextChanged event.
@@ -45,6 +46,7 @@ if g:rst_fold_enabled != 0 && has('patch-7.3.867')  " Introduced the TextChanged
   augroup RstFold
     autocmd TextChanged,InsertLeave <buffer> unlet! b:RstFoldCache
   augroup END
+  let b:undo_ftplugin .= " | setlocal foldexpr< foldmethod< foldtext<"
 endif
 
 let &cpo = s:cpo_save
diff --git a/ftplugin/ruby.vim b/ftplugin/ruby.vim
index fcf346a0b..04eb12390 100644
--- a/ftplugin/ruby.vim
+++ b/ftplugin/ruby.vim
@@ -56,7 +56,7 @@ endif
 " TODO:
 "setlocal define=^\\s*def
 
-setlocal comments=:#
+setlocal comments=b:#
 setlocal commentstring=#\ %s
 
 if !exists('g:ruby_version_paths')
diff --git a/indent/bicep.vim b/indent/bicep.vim
new file mode 100644
index 000000000..08c8cd6b0
--- /dev/null
+++ b/indent/bicep.vim
@@ -0,0 +1,68 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bicep', 'indent/bicep.vim')
+  finish
+endif
+
+" Only load this file if no other indent file was loaded
+if exists('b:did_indent')
+  finish
+endif
+let b:did_indent = 1
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+setlocal nolisp
+setlocal autoindent shiftwidth=2 tabstop=2 softtabstop=2 expandtab
+setlocal indentexpr=BicepIndent(v:lnum)
+setlocal indentkeys+=<:>,0=},0=),0=*/
+let b:undo_indent = 'setlocal lisp< autoindent< shiftwidth< tabstop< softtabstop<'
+  \ . ' expandtab< indentexpr< indentkeys<'
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
+
+if exists('*BicepIndent')
+  finish
+endif
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+function! BicepIndent(lnum)
+  " Beginning of the file should have no indent
+  if a:lnum == 0
+    return 0
+  endif
+
+  " Usual case is to continue at the same indent as the previous non-blank line.
+  let prevlnum = prevnonblank(a:lnum-1)
+  let thisindent = indent(prevlnum)
+
+  " If that previous line is a non-comment ending in [ { (, increase the
+  " indent level.
+  let prevline = getline(prevlnum)
+  if prevline !~# '^\s*//' && prevline =~# '[\[{\(]\s*$'
+    let thisindent += &shiftwidth
+  endif
+
+  " If the current line ends a block, decrease the indent level.
+  let thisline = getline(a:lnum)
+  if thisline =~# '^\s*[\)}\]]'
+    let thisindent -= &shiftwidth
+  endif
+
+  " If the previous line starts a block comment /*, increase by one
+  if prevline =~# '/\*'
+    let thisindent += 2
+  endif
+
+  " If the this line ends a block comment */, decrease by one
+  if thisline =~# '\*/'
+    let thisindent -= 2
+  endif
+
+  return thisindent
+endfunction
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/indent/rst.vim b/indent/rst.vim
index f27c5ecb1..66920d833 100644
--- a/indent/rst.vim
+++ b/indent/rst.vim
@@ -18,6 +18,8 @@ setlocal indentexpr=GetRSTIndent()
 setlocal indentkeys=!^F,o,O
 setlocal nosmartindent
 
+let b:undo_indent = "setlocal indentexpr< indentkeys< smartindent<"
+
 if exists("*GetRSTIndent")
   finish
 endif
diff --git a/indent/ruby.vim b/indent/ruby.vim
index 0a7cfae64..e08a38cf2 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -43,9 +43,11 @@ setlocal nosmartindent
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetRubyIndent(v:lnum)
 setlocal indentkeys=0{,0},0),0],!^F,o,O,e,:,.
-setlocal indentkeys+==end,=else,=elsif,=when,=in,=ensure,=rescue,==begin,==end
+setlocal indentkeys+==end,=else,=elsif,=when,=in\ ,=ensure,=rescue,==begin,==end
 setlocal indentkeys+==private,=protected,=public
 
+let b:undo_indent = "setlocal indentexpr< indentkeys< smartindent<"
+
 " Only define the function once.
 if exists("*GetRubyIndent")
   finish
diff --git a/syntax/bicep.vim b/syntax/bicep.vim
new file mode 100644
index 000000000..dcd921428
--- /dev/null
+++ b/syntax/bicep.vim
@@ -0,0 +1,83 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bicep', 'syntax/bicep.vim')
+  finish
+endif
+
+if exists('b:current_syntax')
+  finish
+endif
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+if has('patch-7.4.1142')
+    syn iskeyword a-z,A-Z,48-57,_,-
+endif
+
+syn case match
+
+
+syn keyword bicepDataType  array bool int object string contained
+
+syn keyword bicepStatement var module targetScope
+
+syn keyword bicepStatement     param nextgroup=bicepParameterName skipwhite
+syn match   bicepParameterName /\h\w*/ nextgroup=bicepDataType skipwhite contained
+
+syn keyword bicepStatement  output nextgroup=bicepOutputName skipwhite
+syn match   bicepOutputName /\h\w*/ nextgroup=bicepDataType skipwhite contained
+
+syn keyword bicepStatement      resource nextgroup=bicepResourceName skipwhite
+syn match   bicepResourceName   /\h\w*/ nextgroup=bicepResourceString skipwhite contained
+syn region  bicepResourceString start=/'/ skip=/\\\\\|\\'/ end=/'/ contains=bicepStringInterp nextgroup=bicepExisting skipwhite
+syn keyword bicepExisting       existing contained
+
+syn match bicepDecoratorName /@\s*\h\%(\w\|\.\)*/ contains=bicepDecorator
+syn match bicepDecorator     /@/ contained
+
+syn region  bicepComment start="/\*" end="\*/" contains=bicepTodo,@Spell
+syn region  bicepComment start="//" end="$" contains=bicepTodo,@Spell
+syn keyword bicepTodo    TODO FIXME XXX BUG contained
+
+syn keyword bicepValueBool true false
+syn keyword bicepValueNull null
+syn match   bicepValueDec  /\<[0-9]\+\([kKmMgG]b\?\)\?\>/
+
+syn region bicepValueString  start=/'/ skip=/\\\\\|\\'/ end=/'/ contains=bicepStringInterp,bicepEscape
+syn region bicepStringInterp start=/${/ end=/}/ contained
+syn match  bicepEscape       /\\n/ contained
+syn match  bicepEscape       /\\r/ contained
+
+syn keyword bicepRepeat      for in
+syn keyword bicepConditional if
+
+syn match bicepBraces /[{}\[\]]/
+
+
+hi def link bicepDataType          Type
+hi def link bicepStatement         Statement
+hi def link bicepResourceString    String
+hi def link bicepExisting          Label
+
+hi def link bicepDecorator         Define
+
+hi def link bicepComment           Comment
+hi def link bicepTodo              Todo
+
+hi def link bicepValueBool         Boolean
+hi def link bicepValueDec          Number
+hi def link bicepValueNull         Constant
+
+hi def link bicepValueString       String
+hi def link bicepStringInterp      Identifier
+hi def link bicepEscape            Special
+
+hi def link bicepRepeat            Repeat
+hi def link bicepConditional       Conditional
+
+hi def link bicepBraces            Delimiter
+
+
+let b:current_syntax = 'bicep'
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index 2be3626fc..c892c2673 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -26,14 +26,14 @@ endif
 
 " -*- KEYWORDS -*-
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-" Clojure version 1.10.3
+" Clojure version 1.11.0
 let s:clojure_syntax_keywords = {
 	\ 'clojureBoolean': ["false","true"],
 	\ 'clojureCond': ["case","case*","clojure.core/case","clojure.core/cond","clojure.core/cond->","clojure.core/cond->>","clojure.core/condp","clojure.core/if-let","clojure.core/if-not","clojure.core/if-some","clojure.core/when","clojure.core/when-first","clojure.core/when-let","clojure.core/when-not","clojure.core/when-some","cond","cond->","cond->>","condp","if","if-let","if-not","if-some","when","when-first","when-let","when-not","when-some"],
 	\ 'clojureConstant': ["nil"],
 	\ 'clojureDefine': ["clojure.core/definline","clojure.core/definterface","clojure.core/defmacro","clojure.core/defmethod","clojure.core/defmulti","clojure.core/defn","clojure.core/defn-","clojure.core/defonce","clojure.core/defprotocol","clojure.core/defrecord","clojure.core/defstruct","clojure.core/deftype","def","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","deftype*"],
 	\ 'clojureException': ["catch","finally","throw","try"],
-	\ 'clojureFunc': ["*","*'","+","+'","-","-'","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods","/","<","<=","=","==",">",">=","PrintWriter-on","StackTraceElement->vec","Throwable->map","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","ancestors","any?","apply","array-map","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","cast","cat","char","char-array","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","clojure.core/*","clojure.core/*'","clojure.core/+","clojure.core/+'","clojure.core/-","clojure.core/-'","clojure.core/->ArrayChunk","clojure.core/->Eduction","clojure.core/->Vec","clojure.core/->VecNode","clojure.core/->VecSeq","clojure.core/-cache-protocol-fn","clojure.core/-reset-methods","clojure.core//","clojure.core/<","clojure.core/<=","clojure.core/=","clojure.core/==","clojure.core/>","clojure.core/>=","clojure.core/PrintWriter-on","clojure.core/StackTraceElement->vec","clojure.core/Throwable->map","clojure.core/accessor","clojure.core/aclone","clojure.core/add-classpath","clojure.core/add-tap","clojure.core/add-watch","clojure.core/agent","clojure.core/agent-error","clojure.core/agent-errors","clojure.core/aget","clojure.core/alength","clojure.core/alias","clojure.core/all-ns","clojure.core/alter","clojure.core/alter-meta!","clojure.core/alter-var-root","clojure.core/ancestors","clojure.core/any?","clojure.core/apply","clojure.core/array-map","clojure.core/aset","clojure.core/aset-boolean","clojure.core/aset-byte","clojure.core/aset-char","clojure.core/aset-double","clojure.core/aset-float","clojure.core/aset-int","clojure.core/aset-long","clojure.core/aset-short","clojure.core/assoc","clojure.core/assoc!","clojure.core/assoc-in","clojure.core/associative?","clojure.core/atom","clojure.core/await","clojure.core/await-for","clojure.core/await1","clojure.core/bases","clojure.core/bean","clojure.core/bigdec","clojure.core/bigint","clojure.core/biginteger","clojure.core/bit-and","clojure.core/bit-and-not","clojure.core/bit-clear","clojure.core/bit-flip","clojure.core/bit-not","clojure.core/bit-or","clojure.core/bit-set","clojure.core/bit-shift-left","clojure.core/bit-shift-right","clojure.core/bit-test","clojure.core/bit-xor","clojure.core/boolean","clojure.core/boolean-array","clojure.core/boolean?","clojure.core/booleans","clojure.core/bound-fn*","clojure.core/bound?","clojure.core/bounded-count","clojure.core/butlast","clojure.core/byte","clojure.core/byte-array","clojure.core/bytes","clojure.core/bytes?","clojure.core/cast","clojure.core/cat","clojure.core/char","clojure.core/char-array","clojure.core/char?","clojure.core/chars","clojure.core/chunk","clojure.core/chunk-append","clojure.core/chunk-buffer","clojure.core/chunk-cons","clojure.core/chunk-first","clojure.core/chunk-next","clojure.core/chunk-rest","clojure.core/chunked-seq?","clojure.core/class","clojure.core/class?","clojure.core/clear-agent-errors","clojure.core/clojure-version","clojure.core/coll?","clojure.core/commute","clojure.core/comp","clojure.core/comparator","clojure.core/compare","clojure.core/compare-and-set!","clojure.core/compile","clojure.core/complement","clojure.core/completing","clojure.core/concat","clojure.core/conj","clojure.core/conj!","clojure.core/cons","clojure.core/constantly","clojure.core/construct-proxy","clojure.core/contains?","clojure.core/count","clojure.core/counted?","clojure.core/create-ns","clojure.core/create-struct","clojure.core/cycle","clojure.core/dec","clojure.core/dec'","clojure.core/decimal?","clojure.core/dedupe","clojure.core/delay?","clojure.core/deliver","clojure.core/denominator","clojure.core/deref","clojure.core/derive","clojure.core/descendants","clojure.core/destructure","clojure.core/disj","clojure.core/disj!","clojure.core/dissoc","clojure.core/dissoc!","clojure.core/distinct","clojure.core/distinct?","clojure.core/doall","clojure.core/dorun","clojure.core/double","clojure.core/double-array","clojure.core/double?","clojure.core/doubles","clojure.core/drop","clojure.core/drop-last","clojure.core/drop-while","clojure.core/eduction","clojure.core/empty","clojure.core/empty?","clojure.core/ensure","clojure.core/ensure-reduced","clojure.core/enumeration-seq","clojure.core/error-handler","clojure.core/error-mode","clojure.core/eval","clojure.core/even?","clojure.core/every-pred","clojure.core/every?","clojure.core/ex-cause","clojure.core/ex-data","clojure.core/ex-info","clojure.core/ex-message","clojure.core/extend","clojure.core/extenders","clojure.core/extends?","clojure.core/false?","clojure.core/ffirst","clojure.core/file-seq","clojure.core/filter","clojure.core/filterv","clojure.core/find","clojure.core/find-keyword","clojure.core/find-ns","clojure.core/find-protocol-impl","clojure.core/find-protocol-method","clojure.core/find-var","clojure.core/first","clojure.core/flatten","clojure.core/float","clojure.core/float-array","clojure.core/float?","clojure.core/floats","clojure.core/flush","clojure.core/fn?","clojure.core/fnext","clojure.core/fnil","clojure.core/force","clojure.core/format","clojure.core/frequencies","clojure.core/future-call","clojure.core/future-cancel","clojure.core/future-cancelled?","clojure.core/future-done?","clojure.core/future?","clojure.core/gensym","clojure.core/get","clojure.core/get-in","clojure.core/get-method","clojure.core/get-proxy-class","clojure.core/get-thread-bindings","clojure.core/get-validator","clojure.core/group-by","clojure.core/halt-when","clojure.core/hash","clojure.core/hash-combine","clojure.core/hash-map","clojure.core/hash-ordered-coll","clojure.core/hash-set","clojure.core/hash-unordered-coll","clojure.core/ident?","clojure.core/identical?","clojure.core/identity","clojure.core/ifn?","clojure.core/in-ns","clojure.core/inc","clojure.core/inc'","clojure.core/indexed?","clojure.core/init-proxy","clojure.core/inst-ms","clojure.core/inst-ms*","clojure.core/inst?","clojure.core/instance?","clojure.core/int","clojure.core/int-array","clojure.core/int?","clojure.core/integer?","clojure.core/interleave","clojure.core/intern","clojure.core/interpose","clojure.core/into","clojure.core/into-array","clojure.core/ints","clojure.core/isa?","clojure.core/iterate","clojure.core/iterator-seq","clojure.core/juxt","clojure.core/keep","clojure.core/keep-indexed","clojure.core/key","clojure.core/keys","clojure.core/keyword","clojure.core/keyword?","clojure.core/last","clojure.core/line-seq","clojure.core/list","clojure.core/list*","clojure.core/list?","clojure.core/load","clojure.core/load-file","clojure.core/load-reader","clojure.core/load-string","clojure.core/loaded-libs","clojure.core/long","clojure.core/long-array","clojure.core/longs","clojure.core/macroexpand","clojure.core/macroexpand-1","clojure.core/make-array","clojure.core/make-hierarchy","clojure.core/map","clojure.core/map-entry?","clojure.core/map-indexed","clojure.core/map?","clojure.core/mapcat","clojure.core/mapv","clojure.core/max","clojure.core/max-key","clojure.core/memoize","clojure.core/merge","clojure.core/merge-with","clojure.core/meta","clojure.core/method-sig","clojure.core/methods","clojure.core/min","clojure.core/min-key","clojure.core/mix-collection-hash","clojure.core/mod","clojure.core/munge","clojure.core/name","clojure.core/namespace","clojure.core/namespace-munge","clojure.core/nat-int?","clojure.core/neg-int?","clojure.core/neg?","clojure.core/newline","clojure.core/next","clojure.core/nfirst","clojure.core/nil?","clojure.core/nnext","clojure.core/not","clojure.core/not-any?","clojure.core/not-empty","clojure.core/not-every?","clojure.core/not=","clojure.core/ns-aliases","clojure.core/ns-imports","clojure.core/ns-interns","clojure.core/ns-map","clojure.core/ns-name","clojure.core/ns-publics","clojure.core/ns-refers","clojure.core/ns-resolve","clojure.core/ns-unalias","clojure.core/ns-unmap","clojure.core/nth","clojure.core/nthnext","clojure.core/nthrest","clojure.core/num","clojure.core/number?","clojure.core/numerator","clojure.core/object-array","clojure.core/odd?","clojure.core/parents","clojure.core/partial","clojure.core/partition","clojure.core/partition-all","clojure.core/partition-by","clojure.core/pcalls","clojure.core/peek","clojure.core/persistent!","clojure.core/pmap","clojure.core/pop","clojure.core/pop!","clojure.core/pop-thread-bindings","clojure.core/pos-int?","clojure.core/pos?","clojure.core/pr","clojure.core/pr-str","clojure.core/prefer-method","clojure.core/prefers","clojure.core/print","clojure.core/print-ctor","clojure.core/print-dup","clojure.core/print-method","clojure.core/print-simple","clojure.core/print-str","clojure.core/printf","clojure.core/println","clojure.core/println-str","clojure.core/prn","clojure.core/prn-str","clojure.core/promise","clojure.core/proxy-call-with-super","clojure.core/proxy-mappings","clojure.core/proxy-name","clojure.core/push-thread-bindings","clojure.core/qualified-ident?","clojure.core/qualified-keyword?","clojure.core/qualified-symbol?","clojure.core/quot","clojure.core/rand","clojure.core/rand-int","clojure.core/rand-nth","clojure.core/random-sample","clojure.core/range","clojure.core/ratio?","clojure.core/rational?","clojure.core/rationalize","clojure.core/re-find","clojure.core/re-groups","clojure.core/re-matcher","clojure.core/re-matches","clojure.core/re-pattern","clojure.core/re-seq","clojure.core/read","clojure.core/read+string","clojure.core/read-line","clojure.core/read-string","clojure.core/reader-conditional","clojure.core/reader-conditional?","clojure.core/realized?","clojure.core/record?","clojure.core/reduce","clojure.core/reduce-kv","clojure.core/reduced","clojure.core/reduced?","clojure.core/reductions","clojure.core/ref","clojure.core/ref-history-count","clojure.core/ref-max-history","clojure.core/ref-min-history","clojure.core/ref-set","clojure.core/refer","clojure.core/release-pending-sends","clojure.core/rem","clojure.core/remove","clojure.core/remove-all-methods","clojure.core/remove-method","clojure.core/remove-ns","clojure.core/remove-tap","clojure.core/remove-watch","clojure.core/repeat","clojure.core/repeatedly","clojure.core/replace","clojure.core/replicate","clojure.core/require","clojure.core/requiring-resolve","clojure.core/reset!","clojure.core/reset-meta!","clojure.core/reset-vals!","clojure.core/resolve","clojure.core/rest","clojure.core/restart-agent","clojure.core/resultset-seq","clojure.core/reverse","clojure.core/reversible?","clojure.core/rseq","clojure.core/rsubseq","clojure.core/run!","clojure.core/satisfies?","clojure.core/second","clojure.core/select-keys","clojure.core/send","clojure.core/send-off","clojure.core/send-via","clojure.core/seq","clojure.core/seq?","clojure.core/seqable?","clojure.core/seque","clojure.core/sequence","clojure.core/sequential?","clojure.core/set","clojure.core/set-agent-send-executor!","clojure.core/set-agent-send-off-executor!","clojure.core/set-error-handler!","clojure.core/set-error-mode!","clojure.core/set-validator!","clojure.core/set?","clojure.core/short","clojure.core/short-array","clojure.core/shorts","clojure.core/shuffle","clojure.core/shutdown-agents","clojure.core/simple-ident?","clojure.core/simple-keyword?","clojure.core/simple-symbol?","clojure.core/slurp","clojure.core/some","clojure.core/some-fn","clojure.core/some?","clojure.core/sort","clojure.core/sort-by","clojure.core/sorted-map","clojure.core/sorted-map-by","clojure.core/sorted-set","clojure.core/sorted-set-by","clojure.core/sorted?","clojure.core/special-symbol?","clojure.core/spit","clojure.core/split-at","clojure.core/split-with","clojure.core/str","clojure.core/string?","clojure.core/struct","clojure.core/struct-map","clojure.core/subs","clojure.core/subseq","clojure.core/subvec","clojure.core/supers","clojure.core/swap!","clojure.core/swap-vals!","clojure.core/symbol","clojure.core/symbol?","clojure.core/tagged-literal","clojure.core/tagged-literal?","clojure.core/take","clojure.core/take-last","clojure.core/take-nth","clojure.core/take-while","clojure.core/tap>","clojure.core/test","clojure.core/the-ns","clojure.core/thread-bound?","clojure.core/to-array","clojure.core/to-array-2d","clojure.core/trampoline","clojure.core/transduce","clojure.core/transient","clojure.core/tree-seq","clojure.core/true?","clojure.core/type","clojure.core/unchecked-add","clojure.core/unchecked-add-int","clojure.core/unchecked-byte","clojure.core/unchecked-char","clojure.core/unchecked-dec","clojure.core/unchecked-dec-int","clojure.core/unchecked-divide-int","clojure.core/unchecked-double","clojure.core/unchecked-float","clojure.core/unchecked-inc","clojure.core/unchecked-inc-int","clojure.core/unchecked-int","clojure.core/unchecked-long","clojure.core/unchecked-multiply","clojure.core/unchecked-multiply-int","clojure.core/unchecked-negate","clojure.core/unchecked-negate-int","clojure.core/unchecked-remainder-int","clojure.core/unchecked-short","clojure.core/unchecked-subtract","clojure.core/unchecked-subtract-int","clojure.core/underive","clojure.core/unreduced","clojure.core/unsigned-bit-shift-right","clojure.core/update","clojure.core/update-in","clojure.core/update-proxy","clojure.core/uri?","clojure.core/use","clojure.core/uuid?","clojure.core/val","clojure.core/vals","clojure.core/var-get","clojure.core/var-set","clojure.core/var?","clojure.core/vary-meta","clojure.core/vec","clojure.core/vector","clojure.core/vector-of","clojure.core/vector?","clojure.core/volatile!","clojure.core/volatile?","clojure.core/vreset!","clojure.core/with-bindings*","clojure.core/with-meta","clojure.core/with-redefs-fn","clojure.core/xml-seq","clojure.core/zero?","clojure.core/zipmap","coll?","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","dedupe","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","doall","dorun","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extenders","extends?","false?","ffirst","file-seq","filter","filterv","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn?","fnext","fnil","force","format","frequencies","future-call","future-cancel","future-cancelled?","future-done?","future?","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","ifn?","in-ns","inc","inc'","indexed?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","isa?","iterate","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","long","long-array","longs","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","parents","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy-call-with-super","proxy-mappings","proxy-name","push-thread-bindings","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","rand","rand-int","rand-nth","random-sample","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq?","seqable?","seque","sequence","sequential?","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unreduced","unsigned-bit-shift-right","update","update-in","update-proxy","uri?","use","uuid?","val","vals","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","with-bindings*","with-meta","with-redefs-fn","xml-seq","zero?","zipmap"],
+	\ 'clojureFunc': ["*","*'","+","+'","-","-'","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods","/","<","<=","=","==",">",">=","NaN?","PrintWriter-on","StackTraceElement->vec","Throwable->map","abs","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","ancestors","any?","apply","array-map","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","cast","cat","char","char-array","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","clojure.core/*","clojure.core/*'","clojure.core/+","clojure.core/+'","clojure.core/-","clojure.core/-'","clojure.core/->ArrayChunk","clojure.core/->Eduction","clojure.core/->Vec","clojure.core/->VecNode","clojure.core/->VecSeq","clojure.core/-cache-protocol-fn","clojure.core/-reset-methods","clojure.core//","clojure.core/<","clojure.core/<=","clojure.core/=","clojure.core/==","clojure.core/>","clojure.core/>=","clojure.core/NaN?","clojure.core/PrintWriter-on","clojure.core/StackTraceElement->vec","clojure.core/Throwable->map","clojure.core/abs","clojure.core/accessor","clojure.core/aclone","clojure.core/add-classpath","clojure.core/add-tap","clojure.core/add-watch","clojure.core/agent","clojure.core/agent-error","clojure.core/agent-errors","clojure.core/aget","clojure.core/alength","clojure.core/alias","clojure.core/all-ns","clojure.core/alter","clojure.core/alter-meta!","clojure.core/alter-var-root","clojure.core/ancestors","clojure.core/any?","clojure.core/apply","clojure.core/array-map","clojure.core/aset","clojure.core/aset-boolean","clojure.core/aset-byte","clojure.core/aset-char","clojure.core/aset-double","clojure.core/aset-float","clojure.core/aset-int","clojure.core/aset-long","clojure.core/aset-short","clojure.core/assoc","clojure.core/assoc!","clojure.core/assoc-in","clojure.core/associative?","clojure.core/atom","clojure.core/await","clojure.core/await-for","clojure.core/await1","clojure.core/bases","clojure.core/bean","clojure.core/bigdec","clojure.core/bigint","clojure.core/biginteger","clojure.core/bit-and","clojure.core/bit-and-not","clojure.core/bit-clear","clojure.core/bit-flip","clojure.core/bit-not","clojure.core/bit-or","clojure.core/bit-set","clojure.core/bit-shift-left","clojure.core/bit-shift-right","clojure.core/bit-test","clojure.core/bit-xor","clojure.core/boolean","clojure.core/boolean-array","clojure.core/boolean?","clojure.core/booleans","clojure.core/bound-fn*","clojure.core/bound?","clojure.core/bounded-count","clojure.core/butlast","clojure.core/byte","clojure.core/byte-array","clojure.core/bytes","clojure.core/bytes?","clojure.core/cast","clojure.core/cat","clojure.core/char","clojure.core/char-array","clojure.core/char?","clojure.core/chars","clojure.core/chunk","clojure.core/chunk-append","clojure.core/chunk-buffer","clojure.core/chunk-cons","clojure.core/chunk-first","clojure.core/chunk-next","clojure.core/chunk-rest","clojure.core/chunked-seq?","clojure.core/class","clojure.core/class?","clojure.core/clear-agent-errors","clojure.core/clojure-version","clojure.core/coll?","clojure.core/commute","clojure.core/comp","clojure.core/comparator","clojure.core/compare","clojure.core/compare-and-set!","clojure.core/compile","clojure.core/complement","clojure.core/completing","clojure.core/concat","clojure.core/conj","clojure.core/conj!","clojure.core/cons","clojure.core/constantly","clojure.core/construct-proxy","clojure.core/contains?","clojure.core/count","clojure.core/counted?","clojure.core/create-ns","clojure.core/create-struct","clojure.core/cycle","clojure.core/dec","clojure.core/dec'","clojure.core/decimal?","clojure.core/dedupe","clojure.core/delay?","clojure.core/deliver","clojure.core/denominator","clojure.core/deref","clojure.core/derive","clojure.core/descendants","clojure.core/destructure","clojure.core/disj","clojure.core/disj!","clojure.core/dissoc","clojure.core/dissoc!","clojure.core/distinct","clojure.core/distinct?","clojure.core/doall","clojure.core/dorun","clojure.core/double","clojure.core/double-array","clojure.core/double?","clojure.core/doubles","clojure.core/drop","clojure.core/drop-last","clojure.core/drop-while","clojure.core/eduction","clojure.core/empty","clojure.core/empty?","clojure.core/ensure","clojure.core/ensure-reduced","clojure.core/enumeration-seq","clojure.core/error-handler","clojure.core/error-mode","clojure.core/eval","clojure.core/even?","clojure.core/every-pred","clojure.core/every?","clojure.core/ex-cause","clojure.core/ex-data","clojure.core/ex-info","clojure.core/ex-message","clojure.core/extend","clojure.core/extenders","clojure.core/extends?","clojure.core/false?","clojure.core/ffirst","clojure.core/file-seq","clojure.core/filter","clojure.core/filterv","clojure.core/find","clojure.core/find-keyword","clojure.core/find-ns","clojure.core/find-protocol-impl","clojure.core/find-protocol-method","clojure.core/find-var","clojure.core/first","clojure.core/flatten","clojure.core/float","clojure.core/float-array","clojure.core/float?","clojure.core/floats","clojure.core/flush","clojure.core/fn?","clojure.core/fnext","clojure.core/fnil","clojure.core/force","clojure.core/format","clojure.core/frequencies","clojure.core/future-call","clojure.core/future-cancel","clojure.core/future-cancelled?","clojure.core/future-done?","clojure.core/future?","clojure.core/gensym","clojure.core/get","clojure.core/get-in","clojure.core/get-method","clojure.core/get-proxy-class","clojure.core/get-thread-bindings","clojure.core/get-validator","clojure.core/group-by","clojure.core/halt-when","clojure.core/hash","clojure.core/hash-combine","clojure.core/hash-map","clojure.core/hash-ordered-coll","clojure.core/hash-set","clojure.core/hash-unordered-coll","clojure.core/ident?","clojure.core/identical?","clojure.core/identity","clojure.core/ifn?","clojure.core/in-ns","clojure.core/inc","clojure.core/inc'","clojure.core/indexed?","clojure.core/infinite?","clojure.core/init-proxy","clojure.core/inst-ms","clojure.core/inst-ms*","clojure.core/inst?","clojure.core/instance?","clojure.core/int","clojure.core/int-array","clojure.core/int?","clojure.core/integer?","clojure.core/interleave","clojure.core/intern","clojure.core/interpose","clojure.core/into","clojure.core/into-array","clojure.core/ints","clojure.core/isa?","clojure.core/iterate","clojure.core/iteration","clojure.core/iterator-seq","clojure.core/juxt","clojure.core/keep","clojure.core/keep-indexed","clojure.core/key","clojure.core/keys","clojure.core/keyword","clojure.core/keyword?","clojure.core/last","clojure.core/line-seq","clojure.core/list","clojure.core/list*","clojure.core/list?","clojure.core/load","clojure.core/load-file","clojure.core/load-reader","clojure.core/load-string","clojure.core/loaded-libs","clojure.core/long","clojure.core/long-array","clojure.core/longs","clojure.core/macroexpand","clojure.core/macroexpand-1","clojure.core/make-array","clojure.core/make-hierarchy","clojure.core/map","clojure.core/map-entry?","clojure.core/map-indexed","clojure.core/map?","clojure.core/mapcat","clojure.core/mapv","clojure.core/max","clojure.core/max-key","clojure.core/memoize","clojure.core/merge","clojure.core/merge-with","clojure.core/meta","clojure.core/method-sig","clojure.core/methods","clojure.core/min","clojure.core/min-key","clojure.core/mix-collection-hash","clojure.core/mod","clojure.core/munge","clojure.core/name","clojure.core/namespace","clojure.core/namespace-munge","clojure.core/nat-int?","clojure.core/neg-int?","clojure.core/neg?","clojure.core/newline","clojure.core/next","clojure.core/nfirst","clojure.core/nil?","clojure.core/nnext","clojure.core/not","clojure.core/not-any?","clojure.core/not-empty","clojure.core/not-every?","clojure.core/not=","clojure.core/ns-aliases","clojure.core/ns-imports","clojure.core/ns-interns","clojure.core/ns-map","clojure.core/ns-name","clojure.core/ns-publics","clojure.core/ns-refers","clojure.core/ns-resolve","clojure.core/ns-unalias","clojure.core/ns-unmap","clojure.core/nth","clojure.core/nthnext","clojure.core/nthrest","clojure.core/num","clojure.core/number?","clojure.core/numerator","clojure.core/object-array","clojure.core/odd?","clojure.core/parents","clojure.core/parse-boolean","clojure.core/parse-double","clojure.core/parse-long","clojure.core/parse-uuid","clojure.core/partial","clojure.core/partition","clojure.core/partition-all","clojure.core/partition-by","clojure.core/pcalls","clojure.core/peek","clojure.core/persistent!","clojure.core/pmap","clojure.core/pop","clojure.core/pop!","clojure.core/pop-thread-bindings","clojure.core/pos-int?","clojure.core/pos?","clojure.core/pr","clojure.core/pr-str","clojure.core/prefer-method","clojure.core/prefers","clojure.core/print","clojure.core/print-ctor","clojure.core/print-dup","clojure.core/print-method","clojure.core/print-simple","clojure.core/print-str","clojure.core/printf","clojure.core/println","clojure.core/println-str","clojure.core/prn","clojure.core/prn-str","clojure.core/promise","clojure.core/proxy-call-with-super","clojure.core/proxy-mappings","clojure.core/proxy-name","clojure.core/push-thread-bindings","clojure.core/qualified-ident?","clojure.core/qualified-keyword?","clojure.core/qualified-symbol?","clojure.core/quot","clojure.core/rand","clojure.core/rand-int","clojure.core/rand-nth","clojure.core/random-sample","clojure.core/random-uuid","clojure.core/range","clojure.core/ratio?","clojure.core/rational?","clojure.core/rationalize","clojure.core/re-find","clojure.core/re-groups","clojure.core/re-matcher","clojure.core/re-matches","clojure.core/re-pattern","clojure.core/re-seq","clojure.core/read","clojure.core/read+string","clojure.core/read-line","clojure.core/read-string","clojure.core/reader-conditional","clojure.core/reader-conditional?","clojure.core/realized?","clojure.core/record?","clojure.core/reduce","clojure.core/reduce-kv","clojure.core/reduced","clojure.core/reduced?","clojure.core/reductions","clojure.core/ref","clojure.core/ref-history-count","clojure.core/ref-max-history","clojure.core/ref-min-history","clojure.core/ref-set","clojure.core/refer","clojure.core/release-pending-sends","clojure.core/rem","clojure.core/remove","clojure.core/remove-all-methods","clojure.core/remove-method","clojure.core/remove-ns","clojure.core/remove-tap","clojure.core/remove-watch","clojure.core/repeat","clojure.core/repeatedly","clojure.core/replace","clojure.core/replicate","clojure.core/require","clojure.core/requiring-resolve","clojure.core/reset!","clojure.core/reset-meta!","clojure.core/reset-vals!","clojure.core/resolve","clojure.core/rest","clojure.core/restart-agent","clojure.core/resultset-seq","clojure.core/reverse","clojure.core/reversible?","clojure.core/rseq","clojure.core/rsubseq","clojure.core/run!","clojure.core/satisfies?","clojure.core/second","clojure.core/select-keys","clojure.core/send","clojure.core/send-off","clojure.core/send-via","clojure.core/seq","clojure.core/seq-to-map-for-destructuring","clojure.core/seq?","clojure.core/seqable?","clojure.core/seque","clojure.core/sequence","clojure.core/sequential?","clojure.core/set","clojure.core/set-agent-send-executor!","clojure.core/set-agent-send-off-executor!","clojure.core/set-error-handler!","clojure.core/set-error-mode!","clojure.core/set-validator!","clojure.core/set?","clojure.core/short","clojure.core/short-array","clojure.core/shorts","clojure.core/shuffle","clojure.core/shutdown-agents","clojure.core/simple-ident?","clojure.core/simple-keyword?","clojure.core/simple-symbol?","clojure.core/slurp","clojure.core/some","clojure.core/some-fn","clojure.core/some?","clojure.core/sort","clojure.core/sort-by","clojure.core/sorted-map","clojure.core/sorted-map-by","clojure.core/sorted-set","clojure.core/sorted-set-by","clojure.core/sorted?","clojure.core/special-symbol?","clojure.core/spit","clojure.core/split-at","clojure.core/split-with","clojure.core/str","clojure.core/string?","clojure.core/struct","clojure.core/struct-map","clojure.core/subs","clojure.core/subseq","clojure.core/subvec","clojure.core/supers","clojure.core/swap!","clojure.core/swap-vals!","clojure.core/symbol","clojure.core/symbol?","clojure.core/tagged-literal","clojure.core/tagged-literal?","clojure.core/take","clojure.core/take-last","clojure.core/take-nth","clojure.core/take-while","clojure.core/tap>","clojure.core/test","clojure.core/the-ns","clojure.core/thread-bound?","clojure.core/to-array","clojure.core/to-array-2d","clojure.core/trampoline","clojure.core/transduce","clojure.core/transient","clojure.core/tree-seq","clojure.core/true?","clojure.core/type","clojure.core/unchecked-add","clojure.core/unchecked-add-int","clojure.core/unchecked-byte","clojure.core/unchecked-char","clojure.core/unchecked-dec","clojure.core/unchecked-dec-int","clojure.core/unchecked-divide-int","clojure.core/unchecked-double","clojure.core/unchecked-float","clojure.core/unchecked-inc","clojure.core/unchecked-inc-int","clojure.core/unchecked-int","clojure.core/unchecked-long","clojure.core/unchecked-multiply","clojure.core/unchecked-multiply-int","clojure.core/unchecked-negate","clojure.core/unchecked-negate-int","clojure.core/unchecked-remainder-int","clojure.core/unchecked-short","clojure.core/unchecked-subtract","clojure.core/unchecked-subtract-int","clojure.core/underive","clojure.core/unreduced","clojure.core/unsigned-bit-shift-right","clojure.core/update","clojure.core/update-in","clojure.core/update-keys","clojure.core/update-proxy","clojure.core/update-vals","clojure.core/uri?","clojure.core/use","clojure.core/uuid?","clojure.core/val","clojure.core/vals","clojure.core/var-get","clojure.core/var-set","clojure.core/var?","clojure.core/vary-meta","clojure.core/vec","clojure.core/vector","clojure.core/vector-of","clojure.core/vector?","clojure.core/volatile!","clojure.core/volatile?","clojure.core/vreset!","clojure.core/with-bindings*","clojure.core/with-meta","clojure.core/with-redefs-fn","clojure.core/xml-seq","clojure.core/zero?","clojure.core/zipmap","coll?","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","dedupe","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","doall","dorun","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extenders","extends?","false?","ffirst","file-seq","filter","filterv","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn?","fnext","fnil","force","format","frequencies","future-call","future-cancel","future-cancelled?","future-done?","future?","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","ifn?","in-ns","inc","inc'","indexed?","infinite?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","isa?","iterate","iteration","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","long","long-array","longs","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","newline","next","nfirst","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","parents","parse-boolean","parse-double","parse-long","parse-uuid","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy-call-with-super","proxy-mappings","proxy-name","push-thread-bindings","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","rand","rand-int","rand-nth","random-sample","random-uuid","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq-to-map-for-destructuring","seq?","seqable?","seque","sequence","sequential?","set","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true?","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unreduced","unsigned-bit-shift-right","update","update-in","update-keys","update-proxy","update-vals","uri?","use","uuid?","val","vals","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","with-bindings*","with-meta","with-redefs-fn","xml-seq","zero?","zipmap"],
 	\ 'clojureMacro': ["->","->>","..","amap","and","areduce","as->","assert","binding","bound-fn","clojure.core/->","clojure.core/->>","clojure.core/..","clojure.core/amap","clojure.core/and","clojure.core/areduce","clojure.core/as->","clojure.core/assert","clojure.core/binding","clojure.core/bound-fn","clojure.core/comment","clojure.core/declare","clojure.core/delay","clojure.core/dosync","clojure.core/doto","clojure.core/extend-protocol","clojure.core/extend-type","clojure.core/for","clojure.core/future","clojure.core/gen-class","clojure.core/gen-interface","clojure.core/import","clojure.core/io!","clojure.core/lazy-cat","clojure.core/lazy-seq","clojure.core/locking","clojure.core/memfn","clojure.core/ns","clojure.core/or","clojure.core/proxy","clojure.core/proxy-super","clojure.core/pvalues","clojure.core/refer-clojure","clojure.core/reify","clojure.core/some->","clojure.core/some->>","clojure.core/sync","clojure.core/time","clojure.core/vswap!","clojure.core/with-bindings","clojure.core/with-in-str","clojure.core/with-loading-context","clojure.core/with-local-vars","clojure.core/with-open","clojure.core/with-out-str","clojure.core/with-precision","clojure.core/with-redefs","comment","declare","delay","dosync","doto","extend-protocol","extend-type","for","future","gen-class","gen-interface","import","io!","lazy-cat","lazy-seq","locking","memfn","ns","or","proxy","proxy-super","pvalues","refer-clojure","reify","some->","some->>","sync","time","vswap!","with-bindings","with-in-str","with-loading-context","with-local-vars","with-open","with-out-str","with-precision","with-redefs"],
 	\ 'clojureRepeat': ["clojure.core/doseq","clojure.core/dotimes","clojure.core/loop","clojure.core/while","doseq","dotimes","loop","loop*","recur","while"],
 	\ 'clojureSpecial': ["&",".","clojure.core/fn","clojure.core/import*","clojure.core/let","clojure.core/letfn","do","fn","fn*","let","let*","letfn","letfn*","monitor-enter","monitor-exit","new","quote","reify*","set!","var"],
diff --git a/syntax/elixir.vim b/syntax/elixir.vim
index 22e0e5ed1..6570ff5e1 100644
--- a/syntax/elixir.vim
+++ b/syntax/elixir.vim
@@ -149,6 +149,7 @@ syn region elixirDocString matchgroup=elixirDocSigilDelimiter  start=+\%(@\w*doc
 " Defines
 syn match elixirDefine              '\<def\>\(:\)\@!'             nextgroup=elixirFunctionDeclaration        skipwhite skipnl
 syn match elixirPrivateDefine       '\<defp\>\(:\)\@!'            nextgroup=elixirPrivateFunctionDeclaration skipwhite skipnl
+syn match elixirNumericalDefine     '\<defn\>\(:\)\@!'            nextgroup=elixirFunctionDeclaration        skipwhite skipnl
 syn match elixirGuard               '\<defguard\>\(:\)\@!'        nextgroup=elixirFunctionDeclaration        skipwhite skipnl
 syn match elixirPrivateGuard        '\<defguardp\>\(:\)\@!'       nextgroup=elixirPrivateFunctionDeclaration skipwhite skipnl
 syn match elixirModuleDefine        '\<defmodule\>\(:\)\@!'       nextgroup=elixirModuleDeclaration          skipwhite skipnl
@@ -191,6 +192,7 @@ syn sync minlines=2000
 hi def link elixirBlockDefinition            Define
 hi def link elixirDefine                     Define
 hi def link elixirPrivateDefine              Define
+hi def link elixirNumericalDefine            Define
 hi def link elixirGuard                      Define
 hi def link elixirPrivateGuard               Define
 hi def link elixirModuleDefine               Define
diff --git a/syntax/eruby.vim b/syntax/eruby.vim
index d695d60fe..b78c8fc61 100644
--- a/syntax/eruby.vim
+++ b/syntax/eruby.vim
@@ -8,7 +8,7 @@ endif
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
 
-if &syntax !~# '\<eruby\>' || get(b:, 'current_syntax') =~# '\<eruby\>'
+if exists("b:current_syntax")
   finish
 endif
 
@@ -22,8 +22,6 @@ endif
 
 if &filetype =~ '^eruby\.'
   let b:eruby_subtype = matchstr(&filetype,'^eruby\.\zs\w\+')
-elseif &filetype =~ '^.*\.eruby\>'
-  let b:eruby_subtype = matchstr(&filetype,'^.\{-\}\ze\.eruby\>')
 elseif !exists("b:eruby_subtype") && main_syntax == 'eruby'
   let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
   let b:eruby_subtype = matchstr(s:lines,'eruby_subtype=\zs\w\+')
@@ -57,10 +55,10 @@ if !b:eruby_nest_level
   let b:eruby_nest_level = 1
 endif
 
-if get(b:, 'eruby_subtype', '') !~# '^\%(eruby\)\=$' && &syntax =~# '^eruby\>'
+if exists("b:eruby_subtype") && b:eruby_subtype != '' && b:eruby_subtype !=? 'eruby'
   exe "runtime! syntax/".b:eruby_subtype.".vim"
+  unlet! b:current_syntax
 endif
-unlet! b:current_syntax
 syn include @rubyTop syntax/ruby.vim
 
 syn cluster erubyRegions contains=erubyOneLiner,erubyBlock,erubyExpression,erubyComment
@@ -75,7 +73,7 @@ exe 'syn region  erubyComment    matchgroup=erubyDelimiter start="<%\{1,'.b:erub
 hi def link erubyDelimiter		PreProc
 hi def link erubyComment		Comment
 
-let b:current_syntax = matchstr(&syntax, '^.*\<eruby\>')
+let b:current_syntax = 'eruby'
 
 if main_syntax == 'eruby'
   unlet main_syntax
diff --git a/syntax/go.vim b/syntax/go.vim
index 19763ee0b..23270e842 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -170,13 +170,13 @@ syn match       goSingleDecl        /\%(import\|var\|const\) [^(]\@=/ contains=g
 
 " Integers
 syn match       goDecimalInt        "\<-\=\(0\|[1-9]_\?\(\d\|\d\+_\?\d\+\)*\)\%([Ee][-+]\=\d\+\)\=\>"
-syn match       goDecimalError      "\<-\=\(_\(\d\+_*\)\+\|\([1-9]\d*_*\)\+__\(\d\+_*\)\+\|\([1-9]\d*_*\)\+_\+\)\%([Ee][-+]\=\d\+\)\=\>"
+"syn match       goDecimalError      "\<-\=\(_\(\d\+_*\)\+\|\([1-9]\d*_*\)\+__\(\d\+_*\)\+\|\([1-9]\d*_*\)\+_\+\)\%([Ee][-+]\=\d\+\)\=\>"
 syn match       goHexadecimalInt    "\<-\=0[xX]_\?\(\x\+_\?\)\+\>"
-syn match       goHexadecimalError  "\<-\=0[xX]_\?\(\x\+_\?\)*\(\([^ \t0-9A-Fa-f_)]\|__\)\S*\|_\)\>"
+"syn match       goHexadecimalError  "\<-\=0[xX]_\?\(\x\+_\?\)*\(\([^-+%&|^*/ \t0-9A-Fa-f_)]\|__\)\S*\|_\)\>"
 syn match       goOctalInt          "\<-\=0[oO]\?_\?\(\o\+_\?\)\+\>"
-syn match       goOctalError        "\<-\=0[0-7oO_]*\(\([^ \t0-7oOxX_/)\]\}\:;]\|[oO]\{2,\}\|__\)\S*\|_\|[oOxX]\)\>"
+"syn match       goOctalError        "\<-\=0[0-7oO_]*\(\([^-+%&|^*/ \t0-7oOxX_/)\]\}\:;]\|[oO]\{2,\}\|__\)\S*\|_\|[oOxX]\)\>"
 syn match       goBinaryInt         "\<-\=0[bB]_\?\([01]\+_\?\)\+\>"
-syn match       goBinaryError       "\<-\=0[bB]_\?[01_]*\([^ \t01_)]\S*\|__\S*\|_\)\>"
+"syn match       goBinaryError       "\<-\=0[bB]_\?[01_]*\([^-+%&|^*/ \t01_)]\S*\|__\S*\|_\)\>"
 
 hi def link     goDecimalInt        Integer
 hi def link     goDecimalError      Error
@@ -270,6 +270,8 @@ if go#config#HighlightOperators()
   syn match goOperator /\%(<<\|>>\|&^\)=\?/
   " match remaining two-char operators: := && || <- ++ --
   syn match goOperator /:=\|||\|<-\|++\|--/
+  " match ~
+  syn match goOperator /\~/
   " match ...
 
   hi def link     goPointerOperator   goOperator
@@ -277,14 +279,37 @@ if go#config#HighlightOperators()
 endif
 hi def link     goOperator          Operator
 
+"                               -> type constraint opening bracket
+"                               |-> start non-counting group
+"                               ||  -> any word character
+"                               ||  |  -> at least one, as many as possible
+"                               ||  |  |    -> start non-counting group
+"                               ||  |  |    |   -> match ~
+"                               ||  |  |    |   | -> at most once
+"                               ||  |  |    |   | |     -> allow a slice type
+"                               ||  |  |    |   | |     |      -> any word character
+"                               ||  |  |    |   | |     |      | -> start a non-counting group
+"                               ||  |  |    |   | |     |      | | -> that matches word characters and |
+"                               ||  |  |    |   | |     |      | | |     -> close the non-counting group
+"                               ||  |  |    |   | |     |      | | |     | -> close the non-counting group
+"                               ||  |  |    |   | |     |      | | |     | |-> any number of matches
+"                               ||  |  |    |   | |     |      | | |     | || -> start a non-counting group
+"                               ||  |  |    |   | |     |      | | |     | || | -> a comma and whitespace
+"                               ||  |  |    |   | |     |      | | |     | || | |      -> at most once
+"                               ||  |  |    |   | |     |      | | |     | || | |      | -> close the non-counting group
+"                               ||  |  |    |   | |     |      | | |     | || | |      | | -> at least one of those non-counting groups, as many as possible
+"                               ||  |  |    |   | | --------   | | |     | || | |      | | | -> type constraint closing bracket
+"                               ||  |  |    |   | ||        |  | | |     | || | |      | | | |
+syn match goTypeParams        /\[\%(\w\+\s\+\%(\~\?\%(\[]\)\?\w\%(\w\||\)\)*\%(,\s*\)\?\)\+\]/ nextgroup=goSimpleParams,goDeclType contained
+
 " Functions;
 if go#config#HighlightFunctions() || go#config#HighlightFunctionParameters()
   syn match goDeclaration       /\<func\>/ nextgroup=goReceiver,goFunction,goSimpleParams skipwhite skipnl
-  syn match goReceiverDecl      /(\s*\zs\%(\%(\w\+\s\+\)\?\*\?\w\+\)\ze\s*)/ contained contains=goReceiverVar,goReceiverType,goPointerOperator
+  syn match goReceiverDecl      /(\s*\zs\%(\%(\w\+\s\+\)\?\*\?\w\+\%(\[\%(\%(\[\]\)\?\w\+\%(,\s*\)\?\)\+\]\)\?\)\ze\s*)/ contained contains=goReceiverVar,goReceiverType,goPointerOperator
   syn match goReceiverVar       /\w\+\ze\s\+\%(\w\|\*\)/ nextgroup=goPointerOperator,goReceiverType skipwhite skipnl contained
   syn match goPointerOperator   /\*/ nextgroup=goReceiverType contained skipwhite skipnl
-  syn match goFunction          /\w\+/ nextgroup=goSimpleParams contained skipwhite skipnl
-  syn match goReceiverType      /\w\+\ze\s*)/ contained
+  syn match goFunction          /\w\+/ nextgroup=goSimpleParams,goTypeParams contained skipwhite skipnl
+  syn match goReceiverType      /\w\+\%(\[\%(\%(\[\]\)\?\w\+\%(,\s*\)\?\)\+\]\)\?\ze\s*)/ contained
   if go#config#HighlightFunctionParameters()
     syn match goSimpleParams      /(\%(\w\|\_s\|[*\.\[\],\{\}<>-]\)*)/ contained contains=goParamName,goType nextgroup=goFunctionReturn skipwhite skipnl
     syn match goFunctionReturn   /(\%(\w\|\_s\|[*\.\[\],\{\}<>-]\)*)/ contained contains=goParamName,goType skipwhite skipnl
@@ -294,7 +319,7 @@ if go#config#HighlightFunctions() || go#config#HighlightFunctionParameters()
     hi def link   goReceiverVar    goParamName
     hi def link   goParamName      Identifier
   endif
-  syn match goReceiver          /(\s*\%(\w\+\s\+\)\?\*\?\s*\w\+\s*)\ze\s*\w/ contained nextgroup=goFunction contains=goReceiverDecl skipwhite skipnl
+  syn match goReceiver          /(\s*\%(\w\+\s\+\)\?\*\?\s*\w\+\%(\[\%(\%(\[\]\)\?\w\+\%(,\s*\)\?\)\+\]\)\?\s*)\ze\s*\w/ contained nextgroup=goFunction contains=goReceiverDecl skipwhite skipnl
 else
   syn keyword goDeclaration func
 endif
@@ -302,7 +327,7 @@ hi def link     goFunction          Function
 
 " Function calls;
 if go#config#HighlightFunctionCalls()
-  syn match goFunctionCall      /\w\+\ze(/ contains=goBuiltins,goDeclaration
+  syn match goFunctionCall      /\w\+\ze\%(\[\%(\%(\[]\)\?\w\+\(,\s*\)\?\)\+\]\)\?(/ contains=goBuiltins,goDeclaration
 endif
 hi def link     goFunctionCall      Type
 
@@ -329,7 +354,7 @@ hi def link    goField              Identifier
 if go#config#HighlightTypes()
   syn match goTypeConstructor      /\<\w\+{\@=/
   syn match goTypeDecl             /\<type\>/ nextgroup=goTypeName skipwhite skipnl
-  syn match goTypeName             /\w\+/ contained nextgroup=goDeclType skipwhite skipnl
+  syn match goTypeName             /\w\+/ contained nextgroup=goDeclType,goTypeParams skipwhite skipnl
   syn match goDeclType             /\<\%(interface\|struct\)\>/ skipwhite skipnl
   hi def link     goReceiverType      Type
 else
diff --git a/syntax/gowork.vim b/syntax/gowork.vim
new file mode 100644
index 000000000..eb641df28
--- /dev/null
+++ b/syntax/gowork.vim
@@ -0,0 +1,100 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'go', 'syntax/gowork.vim')
+  finish
+endif
+
+" gowork.vim: Vim syntax file for go.work file
+"
+" Quit when a (custom) syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax case match
+
+" Reference documentation:
+" https://go.dev/ref/mod#workspaces
+
+" match keywords
+syntax keyword goworkGo      go      contained
+syntax keyword goworkUse use
+syntax keyword goworkExclude exclude
+syntax keyword goworkReplace replace
+syntax keyword goworkRetract retract
+
+" require, exclude, replace, and go can be also grouped into block
+syntax region goworkUse start='require (' end=')' transparent contains=goworkUse,goworkPath
+syntax region goworkReplace start='replace (' end=')' transparent contains=goworkReplace,goworkVersion
+syntax match  goworkGo            '^go .*$'           transparent contains=goworkGo,goworkGoVersion
+
+" set highlights
+highlight default link goworkGo      Keyword
+highlight default link goworkUse     Keyword
+highlight default link goworkReplace Keyword
+
+" comments are always in form of // ...
+syntax region goworkComment  start="//" end="$" contains=@Spell
+highlight default link goworkComment Comment
+
+" make sure quoted import paths are higlighted
+syntax region goworkString start=+"+ skip=+\\\\\|\\"+ end=+"+ 
+highlight default link goworkString  String 
+
+" replace operator is in the form of '=>'
+syntax match goworkReplaceOperator "\v\=\>"
+highlight default link goworkReplaceOperator Operator
+
+" match go versions
+syntax match goworkGoVersion "1\.\d\+" contained
+highlight default link goworkGoVersion Identifier
+
+
+" match paths in use directives
+syntax match goworkPath "\f\+"
+
+highlight default link goworkPath Identifier
+" highlight versions:
+"  * vX.Y.Z-pre
+"  * vX.Y.Z
+"  * vX.0.0-yyyyymmddhhmmss-abcdefabcdef
+"  * vX.Y.Z-pre.0.yyyymmddhhmmss-abcdefabcdef
+"  * vX.Y.(Z+1)-0.yyyymmddhhss-abcdefabcdef
+"  see https://godoc.org/golang.org/x/tools/internal/semver for more
+"  information about how semantic versions are parsed and
+"  https://golang.org/cmd/go/ for how pseudo-versions and +incompatible
+"  are applied.
+
+
+" match vX.Y.Z and their prereleases
+syntax match goworkVersion "v\d\+\.\d\+\.\d\+\%(-\%([0-9A-Za-z-]\+\)\%(\.[0-9A-Za-z-]\+\)*\)\?\%(+\%([0-9A-Za-z-]\+\)\(\.[0-9A-Za-z-]\+\)*\)\?"
+"                          ^--- version ---^^------------ pre-release  ---------------------^^--------------- metadata ---------------------^
+"   	                     ^--------------------------------------- semantic version -------------------------------------------------------^
+
+" match pseudo versions
+" without a major version before the commit (e.g.  vX.0.0-yyyymmddhhmmss-abcdefabcdef)
+syntax match goworkVersion  "v\d\+\.0\.0-\d\{14\}-\x\+"
+" when most recent version before target is a pre-release
+syntax match goworkVersion  "v\d\+\.\d\+\.\d\+-\%([0-9A-Za-z-]\+\)\%(\.[0-9A-Za-z-]\+\)*\%(+\%([0-9A-Za-z-]\+\)\(\.[0-9A-Za-z-]\+\)*\)\?\.0\.\d\{14}-\x\+"
+"                          ^--- version ---^^--- ------ pre-release -----------------^^--------------- metadata ---------------------^
+"                     	   ^------------------------------------- semantic version --------------------------------------------------^
+" most recent version before the target is X.Y.Z
+syntax match goworkVersion "v\d\+\.\d\+\.\d\+\%(+\%([0-9A-Za-z-]\+\)\(\.[0-9A-Za-z-]\+\)*\)\?-0\.\d\{14}-\x\+"
+"                          ^--- version ---^^--------------- metadata ---------------------^
+
+" match incompatible vX.Y.Z and their prereleases
+syntax match goworkVersion "v[2-9]\{1}\d*\.\d\+\.\d\+\%(-\%([0-9A-Za-z-]\+\)\%(\.[0-9A-Za-z-]\+\)*\)\?\%(+\%([0-9A-Za-z-]\+\)\(\.[0-9A-Za-z-]\+\)*\)\?+incompatible"
+"                          ^------- version -------^^------------- pre-release ---------------------^^--------------- metadata ---------------------^
+"               	         ^------------------------------------------- semantic version -----------------------------------------------------------^
+
+" match incompatible pseudo versions
+" incompatible without a major version before the commit (e.g.  vX.0.0-yyyymmddhhmmss-abcdefabcdef)
+syntax match goworkVersion "v[2-9]\{1}\d*\.0\.0-\d\{14\}-\x\++incompatible"
+" when most recent version before target is a pre-release
+syntax match goworkVersion "v[2-9]\{1}\d*\.\d\+\.\d\+-\%([0-9A-Za-z-]\+\)\%(\.[0-9A-Za-z-]\+\)*\%(+\%([0-9A-Za-z-]\+\)\(\.[0-9A-Za-z-]\+\)*\)\?\.0\.\d\{14}-\x\++incompatible"
+"                          ^------- version -------^^---------- pre-release -----------------^^--------------- metadata ---------------------^
+"                     	   ^---------------------------------------- semantic version ------------------------------------------------------^
+" most recent version before the target is X.Y.Z
+syntax match goworkVersion "v[2-9]\{1}\d*\.\d\+\.\d\+\%(+\%([0-9A-Za-z-]\+\)\%(\.[0-9A-Za-z-]\+\)*\)\?-0\.\d\{14}-\x\++incompatible"
+"                          ^------- version -------^^---------------- metadata ---------------------^
+highlight default link goworkVersion Identifier
+
+let b:current_syntax = "gowork"
diff --git a/syntax/meson.vim b/syntax/meson.vim
index 3a5b50e27..c392cccd9 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -120,6 +120,7 @@ syn keyword mesonBuiltin
   \ shared_library
   \ shared_module
   \ static_library
+  \ structured_sources
   \ subdir
   \ subdir_done
   \ subproject
@@ -130,6 +131,7 @@ syn keyword mesonBuiltin
   \ vcs_tag
   \ warning
   \ range
+  \ debug
 
 if exists("meson_space_error_highlight")
   " trailing whitespace
diff --git a/syntax/svelte.vim b/syntax/svelte.vim
index f67c8cafa..7ff85e4c8 100644
--- a/syntax/svelte.vim
+++ b/syntax/svelte.vim
@@ -271,6 +271,15 @@ silent! syntax clear htmlHead
 syntax match javaScriptNumber '\v<-?\d+L?>|0[xX][0-9a-fA-F]+>' 
       \ containedin=@javascriptSvelteScript display
 
+" TypeScript
+" Fix template string `...` breaking syntax highlighting
+syntax region  typescriptTemplate
+  \ start=/`/  skip=/\\\\\|\\`\|\n/  end=/`\|$/
+  \ contains=typescriptTemplateSubstitution,typescriptSpecial,@Spell
+  \ containedin=typescriptObjectLiteral
+  \ nextgroup=@typescriptSymbols
+  \ skipwhite skipempty
+
 " html5 data-*
 syntax match htmlArg '\v<data(-[.a-z0-9]+)+>' containedin=@HTMLSyntax
 "}}}
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index e15761cf3..f73e8e49b 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'tmux', 'syntax/tmux.vim')
 endif
 
 " Language: tmux(1) configuration file
-" Version: 3.3-rc (git-ee3f1d25)
+" Version: 3.3-rc (git-8bcd392e)
 " URL: https://github.com/ericpruitt/tmux.vim/
 " Maintainer: Eric Pruitt <eric.pruitt@gmail.com>
 " License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause)
@@ -21,41 +21,62 @@ let b:current_syntax = "tmux"
 syntax iskeyword @,48-57,_,192-255,-
 syntax case match
 
-syn keyword tmuxAction  none any current other
-syn keyword tmuxBoolean off on
+" The values "yes" and "no" are synonyms for "on" and "off", so they do not
+" appear in the option table file.
+syn keyword tmuxEnums yes no
 
 syn keyword tmuxTodo FIXME NOTE TODO XXX contained
 
-syn match tmuxColour            /\<colour[0-9]\+/      display
+syn match tmuxColour            /\<colou\?r[0-9]\+\>/  display
 syn match tmuxKey               /\(C-\|M-\|\^\)\+\S\+/ display
 syn match tmuxNumber            /\<\d\+\>/             display
 syn match tmuxFlags             /\s-\a\+/              display
-syn match tmuxVariable          /\w\+=/                display
-syn match tmuxVariableExpansion /\${\=\w\+}\=/         display
-syn match tmuxControl           /%\(if\|elif\|else\|endif\)/
+syn match tmuxVariableExpansion /\$\({[A-Za-z_]\w*}\|[A-Za-z_]\w*\)/ display
+syn match tmuxControl           /\(^\|\s\)%\(if\|elif\|else\|endif\)\($\|\s\)/ display
+syn match tmuxEscape            /\\\(u\x\{4\}\|U\x\{8\}\|\o\{3\}\|[\\ernt$]\)/ display
+
+" Missing closing bracket.
+syn match tmuxInvalidVariableExpansion /\${[^}]*$/ display
+" Starts with invalid character.
+syn match tmuxInvalidVariableExpansion /\${[^A-Za-z_][^}]*}/ display
+syn match tmuxInvalidVariableExpansion /\$[^A-Za-z_{ \t]/ display
+" Contains invalid character.
+syn match tmuxInvalidVariableExpansion /\${[^}]*[^A-Za-z0-9_][^}]*}/ display
 
 syn region tmuxComment start=/#/ skip=/\\\@<!\\$/ end=/$/ contains=tmuxTodo,@Spell
 
-syn region tmuxString start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=tmuxFormatString,@Spell
-syn region tmuxString start=+'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end='$' contains=tmuxFormatString,@Spell
+syn region tmuxString start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=tmuxFormatString,tmuxEscape,tmuxVariableExpansion,tmuxInvalidVariableExpansion,@Spell
+syn region tmuxUninterpolatedString start=+'+ skip=+\\$+ excludenl end=+'+ end='$' contains=tmuxFormatString,@Spell
 
 " TODO: Figure out how escaping works inside of #(...) and #{...} blocks.
 syn region tmuxFormatString start=/#[#DFhHIPSTW]/ end=// contained keepend
 syn region tmuxFormatString start=/#{/ skip=/#{.\{-}}/ end=/}/ keepend
 syn region tmuxFormatString start=/#(/ skip=/#(.\{-})/ end=/)/ contained keepend
 
+" At the time of this writing, the latest tmux release will parse a line
+" reading "abc=xyz set-option ..." as an assignment followed by a command
+" hence the presence of "\s" in the "end" argument.
+syn region tmuxAssignment matchgroup=tmuxVariable start=/^\s*[A-Za-z_]\w*=\@=/ skip=/\\$\|\\\s/ end=/\s\|$/ contains=tmuxString,tmuxUninterpolatedString,tmuxVariableExpansion,tmuxControl,tmuxEscape,tmuxInvalidVariableExpansion
+
 hi def link tmuxFormatString      Identifier
 hi def link tmuxAction            Boolean
 hi def link tmuxBoolean           Boolean
 hi def link tmuxCommands          Keyword
-hi def link tmuxControl           Keyword
+hi def link tmuxControl           PreCondit
 hi def link tmuxComment           Comment
+hi def link tmuxEnums             Boolean
+hi def link tmuxEscape            Special
+hi def link tmuxEscapeUnquoted    Special
+hi def link tmuxInvalidVariableExpansion
+\                                 Error
 hi def link tmuxKey               Special
 hi def link tmuxNumber            Number
 hi def link tmuxFlags             Identifier
 hi def link tmuxOptions           Function
 hi def link tmuxString            String
 hi def link tmuxTodo              Todo
+hi def link tmuxUninterpolatedString
+\                                 String
 hi def link tmuxVariable          Identifier
 hi def link tmuxVariableExpansion Identifier
 
@@ -65,66 +86,90 @@ hi def link tmuxVariableExpansion Identifier
 if get(g:, "tmux_syntax_colors", 1)
     for s:i in range(0, 255)
         let s:bg = (!s:i || s:i == 16 || (s:i > 231 && s:i < 235)) ? 15 : "none"
-        exec "syn match tmuxColour" . s:i . " /\\<colour" . s:i . "\\>/ display"
+        exec "syn match tmuxColour" . s:i . " /\\<colou\\?r" . s:i . "\\>/ display"
 \         " | highlight tmuxColour" . s:i . " ctermfg=" . s:i . " ctermbg=" . s:bg
     endfor
 endif
 
 syn keyword tmuxOptions
-\ backspace buffer-limit command-alias copy-command cursor-colour
-\ cursor-style default-terminal editor escape-time activity-action
-\ assume-paste-time base-index bell-action default-command default-shell
-\ default-size destroy-unattached detach-on-destroy
-\ display-panes-active-colour display-panes-colour display-panes-time
-\ display-time exit-empty exit-unattached extended-keys focus-events
+\ activity-action after-bind-key after-capture-pane after-copy-mode
+\ after-display-message after-display-panes after-kill-pane after-list-buffers
+\ after-list-clients after-list-keys after-list-panes after-list-sessions
+\ after-list-windows after-load-buffer after-lock-server after-new-session
+\ after-new-window after-paste-buffer after-pipe-pane after-queue
+\ after-refresh-client after-rename-session after-rename-window
+\ after-resize-pane after-resize-window after-save-buffer after-select-layout
+\ after-select-pane after-select-window after-send-keys after-set-buffer
+\ after-set-environment after-set-hook after-set-option after-show-environment
+\ after-show-messages after-show-options after-split-window after-unbind-key
+\ aggressive-resize alert-activity alert-bell alert-silence allow-passthrough
+\ allow-rename alternate-screen assume-paste-time automatic-rename
+\ automatic-rename-format backspace base-index bell-action buffer-limit
+\ client-active client-attached client-detached client-focus-in
+\ client-focus-out client-resized client-session-changed clock-mode-color
+\ clock-mode-colour clock-mode-style command-alias copy-command
+\ copy-mode-current-match-style copy-mode-mark-style copy-mode-match-style
+\ cursor-color cursor-colour cursor-style default-command default-shell
+\ default-size default-terminal destroy-unattached detach-on-destroy
+\ display-panes-active-color display-panes-active-colour display-panes-color
+\ display-panes-colour display-panes-time display-time editor escape-time
+\ exit-empty exit-unattached extended-keys fill-character focus-events
 \ history-file history-limit key-table lock-after-time lock-command
-\ message-command-style message-limit aggressive-resize allow-passthrough
-\ allow-rename alternate-screen automatic-rename automatic-rename-format
-\ clock-mode-colour clock-mode-style copy-mode-current-match-style
-\ copy-mode-mark-style copy-mode-match-style main-pane-height
-\ main-pane-width message-style mode-keys mode-style monitor-activity
-\ monitor-bell monitor-silence mouse other-pane-height other-pane-width
+\ main-pane-height main-pane-width message-command-style message-limit
+\ message-style mode-keys mode-style monitor-activity monitor-bell
+\ monitor-silence mouse other-pane-height other-pane-width
 \ pane-active-border-style pane-base-index pane-border-format
-\ pane-border-indicators pane-border-lines pane-border-status
-\ pane-border-style pane-colours popup-border-lines popup-border-style
-\ popup-style prefix prefix2 prompt-history-limit remain-on-exit
-\ remain-on-exit-format renumber-windows repeat-time set-clipboard
-\ set-titles set-titles-string silence-action status status-bg status-fg
-\ status-format status-interval status-justify status-keys status-left
-\ status-left-length status-left-style status-position status-right
-\ status-right-length status-right-style status-style synchronize-panes
-\ terminal-features terminal-overrides update-environment user-keys
-\ visual-activity visual-bell visual-silence window-active-style window-size
-\ window-status-activity-style window-status-bell-style
-\ window-status-current-format window-status-current-style
-\ window-status-format window-status-last-style window-status-separator
-\ window-status-style window-style word-separators wrap-search
+\ pane-border-indicators pane-border-lines pane-border-status pane-border-style
+\ pane-colors pane-colours pane-died pane-exited pane-focus-in pane-focus-out
+\ pane-mode-changed pane-set-clipboard pane-title-changed popup-border-lines
+\ popup-border-style popup-style prefix prefix2 prompt-history-limit
+\ remain-on-exit remain-on-exit-format renumber-windows repeat-time
+\ scroll-on-clear session-closed session-created session-renamed
+\ session-window-changed set-clipboard set-titles set-titles-string
+\ silence-action status status-bg status-fg status-format status-interval
+\ status-justify status-keys status-left status-left-length status-left-style
+\ status-position status-right status-right-length status-right-style
+\ status-style synchronize-panes terminal-features terminal-overrides
+\ update-environment user-keys visual-activity visual-bell visual-silence
+\ window-active-style window-layout-changed window-linked window-pane-changed
+\ window-renamed window-resized window-size window-status-activity-style
+\ window-status-bell-style window-status-current-format
+\ window-status-current-style window-status-format window-status-last-style
+\ window-status-separator window-status-style window-style window-unlinked
+\ word-separators wrap-search xterm-keys
 
 syn keyword tmuxCommands
-\ attach attach-session bind bind-key break-pane breakp capture-pane
-\ capturep choose-buffer choose-client choose-tree clear-history clearhist
-\ clock-mode command-prompt confirm confirm-before copy-mode customize-mode
-\ detach detach-client display display-menu display-message display-panes
-\ display-popup displayp find-window findw if if-shell join-pane joinp
-\ kill-pane kill-server kill-session kill-window killp has has-session killw
-\ link-window linkw list-buffers list-clients list-commands list-keys
-\ list-panes list-sessions list-windows load-buffer loadb lock lock-client
-\ lock-server lock-session lockc last-pane lastp locks ls last last-window
-\ lsb delete-buffer deleteb lsc lscm lsk lsp lsw menu move-pane move-window
-\ clear-prompt-history clearphist movep movew new new-session new-window
-\ neww next next-layout next-window nextl paste-buffer pasteb pipe-pane
-\ pipep popup prev previous-layout previous-window prevl refresh
-\ refresh-client rename rename-session rename-window renamew resize-pane
-\ resize-window resizep resizew respawn-pane respawn-window respawnp
-\ respawnw rotate-window rotatew run run-shell save-buffer saveb
+\ attach attach-session bind bind-key break-pane breakp capture-pane capturep
+\ choose-buffer choose-client choose-session choose-tree choose-window
+\ clear-history clear-prompt-history clearhist clearphist clock-mode
+\ command-prompt confirm confirm-before copy-mode customize-mode delete-buffer
+\ deleteb detach detach-client display display-menu display-message
+\ display-panes display-popup displayp find-window findw has has-session if
+\ if-shell info join-pane joinp kill-pane kill-server kill-session kill-window
+\ killp killw last last-pane last-window lastp link-window linkw list-buffers
+\ list-clients list-commands list-keys list-panes list-sessions list-windows
+\ load-buffer loadb lock lock-client lock-server lock-session lockc locks ls
+\ lsb lsc lscm lsk lsp lsw menu move-pane move-window movep movew new
+\ new-session new-window neww next next-layout next-window nextl paste-buffer
+\ pasteb pipe-pane pipep popup prev previous-layout previous-window prevl
+\ refresh refresh-client rename rename-session rename-window renamew
+\ resize-pane resize-window resizep resizew respawn-pane respawn-window
+\ respawnp respawnw rotate-window rotatew run run-shell save-buffer saveb
 \ select-layout select-pane select-window selectl selectp selectw send
-\ send-keys send-prefix set set-buffer set-environment set-hook set-option
-\ set-window-option setb setenv setw show show-buffer show-environment
-\ show-hooks show-messages show-options show-prompt-history
-\ show-window-options showb showenv showmsgs showphist showw source
-\ source-file split-window splitw start start-server suspend-client suspendc
-\ swap-pane swap-window swapp swapw switch-client switchc unbind unbind-key
-\ unlink-window unlinkw wait wait-for
+\ send-keys send-prefix server-access server-info set set-buffer
+\ set-environment set-hook set-option set-window-option setb setenv setw show
+\ show-buffer show-environment show-hooks show-messages show-options
+\ show-prompt-history show-window-options showb showenv showmsgs showphist
+\ showw source source-file split-pane split-window splitp splitw start
+\ start-server suspend-client suspendc swap-pane swap-window swapp swapw
+\ switch-client switchc unbind unbind-key unlink-window unlinkw wait wait-for
+
+syn keyword tmuxEnums
+\ absolute-centre always any arrows bar blinking-bar blinking-block
+\ blinking-underline block both bottom centre color colour current default
+\ double emacs external failed heavy largest latest left manual no-detached
+\ none number off on other padded right rounded simple single smallest top
+\ underline vi
 
 let &cpo = s:original_cpo
 unlet! s:original_cpo s:bg s:i
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 9441b37f3..8946000c8 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -119,6 +119,7 @@ let s:zig_syntax_keywords = {
     \ ,                  "@divTrunc"
     \ ,                  "@embedFile"
     \ ,                  "@export"
+    \ ,                  "@extern"
     \ ,                  "@tagName"
     \ ,                  "@TagType"
     \ ,                  "@errorName"
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 584008e05..1e54cfbe7 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -102,8 +102,11 @@ call TestFiletype('gitcommit')
 call TestFiletype('glsl')
 call TestFiletype('gmpl')
 call TestFiletype('gnuplot')
+call TestFiletype('hercules')
 call TestFiletype('go')
 call TestFiletype('gomod')
+call TestFiletype('gosum')
+call TestFiletype('gowork')
 call TestFiletype('gohtmltmpl')
 call TestFiletype('javascript')
 call TestFiletype('flow')
@@ -363,7 +366,6 @@ call TestFiletype('lhaskell')
 call TestFiletype('chaskell')
 call TestFiletype('haste')
 call TestFiletype('hastepreproc')
-call TestFiletype('hercules')
 call TestFiletype('hex')
 call TestFiletype('hollywood')
 call TestFiletype('tilde')

From 36a2bf60adbf113cb6a096c9edd22c711782d912 Mon Sep 17 00:00:00 2001
From: ptzz <ptzzptzzp@gmail.com>
Date: Wed, 27 Apr 2022 10:51:23 +0200
Subject: [PATCH 294/299] Rename `TestFiletypeFuncs` to avoid name collision
 (#796)

Fixes #783.
---
 extras/filetype.vim | 2 +-
 scripts/build       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/extras/filetype.vim b/extras/filetype.vim
index f6cb13a14..3da520b42 100644
--- a/extras/filetype.vim
+++ b/extras/filetype.vim
@@ -2506,7 +2506,7 @@ endif
 " Function called for testing all functions defined here.  These are
 " script-local, thus need to be executed here.
 " Returns a string with error messages (hopefully empty).
-func! TestFiletypeFuncs(testlist)
+func! TestPolyglotFiletypeFuncs(testlist)
   let output = ''
   for f in a:testlist
     try
diff --git a/scripts/build b/scripts/build
index 8ff113f3e..3b86d71ea 100755
--- a/scripts/build
+++ b/scripts/build
@@ -902,6 +902,7 @@ def generate_fallback
   filetype_content.gsub!(/^au StdinReadPost \* .+?runtime!.+?endif/m) {}
   filetype_content.gsub!(/^au filetypedetect BufNewFile,BufRead,StdinReadPost \*\n.+?endif/m) {}
   filetype_content.gsub!("dist#ft#", "polyglot#ft#")
+  filetype_content.gsub!("TestFiletypeFuncs", "TestPolyglotFiletypeFuncs")
   File.write('extras/filetype.vim', filetype_content)
   File.write('extras/menu.vim', File.read('tmp/vim/vim-v8.2.4274/runtime/menu.vim'))
 

From 38282d58387cff48ac203f6912c05e4c8686141b Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Sat, 30 Apr 2022 15:07:33 +0200
Subject: [PATCH 295/299] Update

---
 ftplugin/bicep.vim    |   2 +-
 ftplugin/markdown.vim |   8 +--
 indent/svelte-css.vim |  91 ++++++++++++++++++++++++++++++++++
 indent/svelte-xml.vim | 111 ++++++++++++++++++++++++++++++++++++++++++
 indent/svelte.vim     |   6 +--
 syntax/nix.vim        |  10 ++--
 syntax/ruby.vim       |  10 ++--
 syntax/zig.vim        |   1 +
 8 files changed, 223 insertions(+), 16 deletions(-)
 create mode 100644 indent/svelte-css.vim
 create mode 100644 indent/svelte-xml.vim

diff --git a/ftplugin/bicep.vim b/ftplugin/bicep.vim
index 112c429e0..08af66d81 100644
--- a/ftplugin/bicep.vim
+++ b/ftplugin/bicep.vim
@@ -15,7 +15,7 @@ set cpoptions&vim
 
 " Set the commentstring
 setlocal commentstring=//%s
-let b:undo_ftplugin = ' commentstring<'
+let b:undo_ftplugin = 'setlocal commentstring<'
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index 7ed65fe86..d3129a876 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -792,7 +792,7 @@ function! s:MarkdownHighlightSources(force)
     " Look for code blocks in the current file
     let filetypes = {}
     for line in getline(1, '$')
-        let ft = matchstr(line, '```\s*\zs[0-9A-Za-z_+-]*\ze.*')
+        let ft = matchstr(line, '\(`\{3,}\|\~\{3,}\)\s*\zs[0-9A-Za-z_+-]*\ze.*')
         if !empty(ft) && ft !~# '^\d*$' | let filetypes[ft] = 1 | endif
     endfor
     if !exists('b:mkd_known_filetypes')
@@ -823,8 +823,10 @@ function! s:MarkdownHighlightSources(force)
             else
                 let include = '@' . toupper(filetype)
             endif
-            let command = 'syntax region %s matchgroup=%s start="^\s*```\s*%s.*$" matchgroup=%s end="\s*```$" keepend contains=%s%s'
-            execute printf(command, group, startgroup, ft, endgroup, include, has('conceal') && get(g:, 'vim_markdown_conceal', 1) && get(g:, 'vim_markdown_conceal_code_blocks', 1) ? ' concealends' : '')
+            let command_backtick = 'syntax region %s matchgroup=%s start="^\s*`\{3,}\s*%s.*$" matchgroup=%s end="\s*`\{3,}$" keepend contains=%s%s'
+            let command_tilde    = 'syntax region %s matchgroup=%s start="^\s*\~\{3,}\s*%s.*$" matchgroup=%s end="\s*\~\{3,}$" keepend contains=%s%s'
+            execute printf(command_backtick, group, startgroup, ft, endgroup, include, has('conceal') && get(g:, 'vim_markdown_conceal', 1) && get(g:, 'vim_markdown_conceal_code_blocks', 1) ? ' concealends' : '')
+            execute printf(command_tilde,    group, startgroup, ft, endgroup, include, has('conceal') && get(g:, 'vim_markdown_conceal', 1) && get(g:, 'vim_markdown_conceal_code_blocks', 1) ? ' concealends' : '')
             execute printf('syntax cluster mkdNonListItem add=%s', group)
 
             let b:mkd_known_filetypes[ft] = 1
diff --git a/indent/svelte-css.vim b/indent/svelte-css.vim
new file mode 100644
index 000000000..6e07835b5
--- /dev/null
+++ b/indent/svelte-css.vim
@@ -0,0 +1,91 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'svelte', 'indent/svelte-css.vim')
+  finish
+endif
+
+" Vim indent file
+" Language:	    CSS
+" Maintainer:	    Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2012-05-30
+"		    Use of shiftwidth() added by Oleg Zubchenko.	
+
+" Changes: 1) Reacquire the line while checking comment lines.
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetCSSIndent()
+setlocal indentkeys=0{,0},!^F,o,O
+setlocal nosmartindent
+
+let b:undo_indent = "setl smartindent< indentkeys< indentexpr<"
+
+if exists("*GetCSSIndent")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+function s:prevnonblanknoncomment(lnum)
+  let lnum = a:lnum
+  while lnum > 1
+    let lnum = prevnonblank(lnum)
+    let line = getline(lnum)
+    if line =~ '\*/'
+      while lnum > 1 && line !~ '/\*'
+        let lnum -= 1
+        let line = getline(lnum)
+      endwhile
+      if line =~ '^\s*/\*'
+        let lnum -= 1
+      else
+        break
+      endif
+    else
+      break
+    endif
+  endwhile
+  return lnum
+endfunction
+
+function s:count_braces(lnum, count_open)
+  let n_open = 0
+  let n_close = 0
+  let line = getline(a:lnum)
+  let pattern = '[{}]'
+  let i = match(line, pattern)
+  while i != -1
+    if synIDattr(synID(a:lnum, i + 1, 0), 'name') !~ 'css\%(Comment\|StringQ\{1,2}\)'
+      if line[i] == '{'
+        let n_open += 1
+      elseif line[i] == '}'
+        if n_open > 0
+          let n_open -= 1
+        else
+          let n_close += 1
+        endif
+      endif
+    endif
+    let i = match(line, pattern, i + 1)
+  endwhile
+  return a:count_open ? n_open : n_close
+endfunction
+
+function GetCSSIndent()
+  let line = getline(v:lnum)
+  if line =~ '^\s*\*'
+    return cindent(v:lnum)
+  endif
+
+  let pnum = s:prevnonblanknoncomment(v:lnum - 1)
+  if pnum == 0
+    return 0
+  endif
+
+  return indent(pnum) + s:count_braces(pnum, 1) * shiftwidth()
+        \ - s:count_braces(v:lnum, 0) * shiftwidth()
+endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/indent/svelte-xml.vim b/indent/svelte-xml.vim
new file mode 100644
index 000000000..18148abb1
--- /dev/null
+++ b/indent/svelte-xml.vim
@@ -0,0 +1,111 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'svelte', 'indent/svelte-xml.vim')
+  finish
+endif
+
+" Language:	xml
+" Maintainer:	Johannes Zellner <johannes@zellner.org>
+" Last Change:	2017 Jun 13
+" Notes:	1) does not indent pure non-xml code (e.g. embedded scripts)
+"		2) will be confused by unbalanced tags in comments
+"		or CDATA sections.
+"		2009-05-26 patch by Nikolai Weibull
+" TODO: 	implement pre-like tags, see xml_indent_open / xml_indent_close
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+let s:keepcpo= &cpo
+set cpo&vim
+
+" [-- local settings (must come before aborting the script) --]
+setlocal indentexpr=XmlIndentGet(v:lnum,1)
+setlocal indentkeys=o,O,*<Return>,<>>,<<>,/,{,}
+
+if !exists('b:xml_indent_open')
+    let b:xml_indent_open = '.\{-}<\a'
+    " pre tag, e.g. <address>
+    " let b:xml_indent_open = '.\{-}<[/]\@!\(address\)\@!'
+endif
+
+if !exists('b:xml_indent_close')
+    let b:xml_indent_close = '.\{-}</'
+    " end pre tag, e.g. </address>
+    " let b:xml_indent_close = '.\{-}</\(address\)\@!'
+endif
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" [-- finish, if the function already exists --]
+if exists('*XmlIndentGet')
+  finish
+endif
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+fun! <SID>XmlIndentWithPattern(line, pat)
+    let s = substitute('x'.a:line, a:pat, "\1", 'g')
+    return strlen(substitute(s, "[^\1].*$", '', ''))
+endfun
+
+" [-- check if it's xml --]
+fun! <SID>XmlIndentSynCheck(lnum)
+    if '' != &syntax
+	let syn1 = synIDattr(synID(a:lnum, 1, 1), 'name')
+	let syn2 = synIDattr(synID(a:lnum, strlen(getline(a:lnum)) - 1, 1), 'name')
+	if '' != syn1 && syn1 !~ 'xml' && '' != syn2 && syn2 !~ 'xml'
+	    " don't indent pure non-xml code
+	    return 0
+	elseif syn1 =~ '^xmlComment' && syn2 =~ '^xmlComment'
+	    " indent comments specially
+	    return -1
+	endif
+    endif
+    return 1
+endfun
+
+" [-- return the sum of indents of a:lnum --]
+fun! <SID>XmlIndentSum(lnum, style, add)
+    let line = getline(a:lnum)
+    if a:style == match(line, '^\s*</')
+	return (shiftwidth() *
+	\  (<SID>XmlIndentWithPattern(line, b:xml_indent_open)
+	\ - <SID>XmlIndentWithPattern(line, b:xml_indent_close)
+	\ - <SID>XmlIndentWithPattern(line, '.\{-}/>'))) + a:add
+    else
+	return a:add
+    endif
+endfun
+
+fun! XmlIndentGet(lnum, use_syntax_check)
+    " Find a non-empty line above the current line.
+    let lnum = prevnonblank(a:lnum - 1)
+
+    " Hit the start of the file, use zero indent.
+    if lnum == 0
+	return 0
+    endif
+
+    if a:use_syntax_check
+	let check_lnum = <SID>XmlIndentSynCheck(lnum)
+	let check_alnum = <SID>XmlIndentSynCheck(a:lnum)
+	if 0 == check_lnum || 0 == check_alnum
+	    return indent(a:lnum)
+	elseif -1 == check_lnum || -1 == check_alnum
+	    return -1
+	endif
+    endif
+
+    let ind = <SID>XmlIndentSum(lnum, -1, indent(lnum))
+    let ind = <SID>XmlIndentSum(a:lnum, 0, ind)
+
+    return ind
+endfun
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim:ts=8
diff --git a/indent/svelte.vim b/indent/svelte.vim
index bae715df3..7c09f361e 100644
--- a/indent/svelte.vim
+++ b/indent/svelte.vim
@@ -55,12 +55,12 @@ let s:debug = svelte#GetConfig('debug', 0)
 " Save shiftwidth
 let s:sw = &sw
 
-" Use lib/indent/ files for compatibility
+" Use specific indent files for compatibility
 unlet! b:did_indent
-runtime lib/indent/xml.vim
+runtime indent/svelte-xml.vim
 
 unlet! b:did_indent
-runtime lib/indent/css.vim
+runtime indent/svelte-css.vim
 
 " Use normal indent files
 unlet! b:did_indent
diff --git a/syntax/nix.vim b/syntax/nix.vim
index c3185bad7..b45299bf7 100644
--- a/syntax/nix.vim
+++ b/syntax/nix.vim
@@ -43,6 +43,8 @@ syn match nixStringSpecial /''['$]/ contained
 syn match nixStringSpecial /\$\$/ contained
 syn match nixStringSpecial /''\\[nrt]/ contained
 
+syn match nixSimpleStringSpecial /\$\$/ contained
+
 syn match nixInvalidSimpleStringEscape /\\[^nrt"\\$]/ contained
 syn match nixInvalidStringEscape /''\\[^nrt]/ contained
 
@@ -63,7 +65,7 @@ syn match nixAttribute "[a-zA-Z_][a-zA-Z0-9_'-]*\ze\%([^a-zA-Z0-9_'.-]\|$\)" con
 syn region nixAttributeAssignment start="=" end="\ze;" contained contains=@nixExpr
 syn region nixAttributeDefinition start=/\ze[a-zA-Z_"$]/ end=";" contained contains=nixComment,nixAttribute,nixInterpolation,nixSimpleString,nixAttributeDot,nixAttributeAssignment
 
-syn region nixInheritAttributeScope start="(" end=")" contained contains=nixComment,nixAttributeDot
+syn region nixInheritAttributeScope start="(" end="\ze)" contained contains=@nixExpr
 syn region nixAttributeDefinition matchgroup=nixInherit start="\<inherit\>" end=";" contained contains=nixComment,nixInheritAttributeScope,nixAttribute
 
 syn region nixAttributeSet start="{" end="}" contains=nixComment,nixAttributeDefinition
@@ -133,7 +135,7 @@ syn match nixInterpolationParam "[a-zA-Z_][a-zA-Z0-9_'-]*\%(\.[a-zA-Z_][a-zA-Z0-
 " Non-namespaced Nix builtins as of version 2.0:
 syn keyword nixSimpleBuiltin
       \ abort baseNameOf derivation derivationStrict dirOf fetchGit
-      \ fetchMercurial fetchTarball import isNull map placeholder removeAttrs
+      \ fetchMercurial fetchTarball import isNull map mapAttrs placeholder removeAttrs
       \ scopedImport throw toString
 
 
@@ -146,13 +148,13 @@ syn keyword nixNamespacedBuiltin contained
       \ findFile foldl' fromJSON functionArgs genList \ genericClosure getAttr
       \ getEnv hasAttr hasContext hashString head import intersectAttrs isAttrs
       \ isBool isFloat isFunction isInt isList isNull isString langVersion
-      \ length lessThan listToAttrs map match mul nixPath nixVersion
+      \ length lessThan listToAttrs map mapAttrs match mul nixPath nixVersion
       \ parseDrvName partition path pathExists placeholder readDir readFile
       \ removeAttrs replaceStrings scopedImport seq sort split splitVersion
       \ storeDir storePath stringLength sub substring tail throw toFile toJSON
       \ toPath toString toXML trace tryEval typeOf unsafeDiscardOutputDependency
       \ unsafeDiscardStringContext unsafeGetAttrPos valueSize fromTOML bitAnd
-      \ bitOr bitXor
+      \ bitOr bitXor floor ceil
 
 syn match nixBuiltin "builtins\.[a-zA-Z']\+"he=s+9 contains=nixComment,nixNamespacedBuiltin
 
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index d5c9e7288..a2fae63a3 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -148,9 +148,9 @@ syn cluster rubyStringSpecial	 contains=rubyInterpolation,rubyStringEscape
 syn cluster rubyStringNotTop	 contains=@rubyStringSpecial,@rubyNestedBrackets,@rubySingleCharEscape
 
 " Regular Expression Metacharacters {{{1
-syn region rubyRegexpComment	  matchgroup=rubyRegexpSpecial	 start="(?#"								    skip="\\\\\|\\)"  end=")"  contained
-syn region rubyRegexpParens	  matchgroup=rubyRegexpSpecial	 start="(\(?:\|?<\=[=!]\|?>\|?<[a-z_]\w*>\|?[imx]*-[imx]*:\=\|\%(?#\)\@!\)" skip="\\\\\|\\)"  end=")"  contained transparent contains=@rubyRegexpSpecial
-syn region rubyRegexpBrackets	  matchgroup=rubyRegexpCharClass start="\[\^\="								    skip="\\\\\|\\\]" end="\]" contained transparent contains=rubyRegexpBrackets,rubyStringEscape,rubyRegexpEscape,rubyRegexpCharClass,rubyRegexpIntersection oneline
+syn region rubyRegexpComment	  matchgroup=rubyRegexpSpecial	 start="(?#"								     skip="\\\\\|\\)"  end=")"	contained
+syn region rubyRegexpParens	  matchgroup=rubyRegexpSpecial	 start="(\%(?:\|?<\=[=!]\|?>\|?<[a-z_]\w*>\|?[imx]*-[imx]*:\=\|\%(?#\)\@!\)" skip="\\\\\|\\)"  end=")"	contained transparent contains=@rubyRegexpSpecial
+syn region rubyRegexpBrackets	  matchgroup=rubyRegexpCharClass start="\[\^\="								     skip="\\\\\|\\\]" end="\]" contained transparent contains=rubyRegexpBrackets,rubyStringEscape,rubyRegexpEscape,rubyRegexpCharClass,rubyRegexpIntersection oneline
 syn match  rubyRegexpCharClass	  "\\[DdHhRSsWw]"	 contained display
 syn match  rubyRegexpCharClass	  "\[:\^\=\%(alnum\|alpha\|ascii\|blank\|cntrl\|digit\|graph\|lower\|print\|punct\|space\|upper\|word\|xdigit\):\]" contained
 syn match  rubyRegexpCharClass	  "\\[pP]{^\=.\{-}}"	 contained display
@@ -349,7 +349,7 @@ syn cluster rubyDeclaration contains=rubyAliasDeclaration,rubyAliasDeclaration2,
 syn match rubyControl	     "\%#=1\<\%(break\|in\|next\|redo\|retry\|return\)\>"
 syn match rubyKeyword	     "\%#=1\<\%(super\|yield\)\>"
 syn match rubyBoolean	     "\%#=1\<\%(true\|false\)\>[?!]\@!"
-syn match rubyPseudoVariable "\%#=1\<\(self\|nil\)\>[?!]\@!"
+syn match rubyPseudoVariable "\%#=1\<\%(self\|nil\)\>[?!]\@!"
 syn match rubyPseudoVariable "\%#=1\<__\%(ENCODING\|dir\|FILE\|LINE\|callee\|method\)__\>"
 syn match rubyBeginEnd	     "\%#=1\<\%(BEGIN\|END\)\>"
 
@@ -421,7 +421,7 @@ if !exists("ruby_no_special_methods")
   syn match rubyAccess	  "\%#=1\<\%(public\|private\)_class_method\>"
   syn match rubyAccess	  "\%#=1\<\%(public\|private\)_constant\>"
   syn match rubyAccess	  "\%#=1\<module_function\>"
-  syn match rubyAttribute "\%#=1\%(\%(^\|;\)\s*\)\@<=attr\>\(\s*[.=]\)\@!" " attr is a common variable name
+  syn match rubyAttribute "\%#=1\%(\%(^\|;\)\s*\)\@<=attr\>\%(\s*[.=]\)\@!" " attr is a common variable name
   syn match rubyAttribute "\%#=1\<attr_\%(accessor\|reader\|writer\)\>"
   syn match rubyControl   "\%#=1\<\%(abort\|at_exit\|exit\|fork\|loop\|trap\)\>"
   syn match rubyEval	  "\%#=1\<eval\>"
diff --git a/syntax/zig.vim b/syntax/zig.vim
index 8946000c8..ddc5bf762 100644
--- a/syntax/zig.vim
+++ b/syntax/zig.vim
@@ -195,6 +195,7 @@ let s:zig_syntax_keywords = {
     \ ,                  "@Vector"
     \ ,                  "@sin"
     \ ,                  "@cos"
+    \ ,                  "@tan"
     \ ,                  "@exp"
     \ ,                  "@exp2"
     \ ,                  "@log"

From bc8a81d3592dab86334f27d1d43c080ebf680d42 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Fri, 14 Oct 2022 17:40:10 +0200
Subject: [PATCH 296/299] Update

---
 README.md                                     |  13 +-
 after/syntax/cpp.vim                          |  23 +-
 after/syntax/reason/graphql.vim               |   2 +-
 after/syntax/rescript/graphql.vim             |   2 +-
 after/syntax/zsh.vim                          |   4 +-
 autoload/LaTeXtoUnicode.vim                   |   2 +-
 autoload/clojurecomplete.vim                  |   2 +-
 autoload/coc/source/requirements.vim          |  24 ++
 autoload/crystal/indent.vim                   |   6 +-
 autoload/csv.vim                              |  11 +-
 autoload/dart.vim                             |  98 +++--
 autoload/fsharp.vim                           |   2 +-
 autoload/ledger.vim                           |  28 +-
 autoload/polyglot/init.vim                    |  18 +-
 autoload/polyglot/shebang.vim                 |   1 +
 autoload/polyglot/sleuth.vim                  |  15 +-
 autoload/requirements.vim                     |  70 ++--
 autoload/requirements/utils.vim               |  15 +
 compiler/cargo.vim                            |   2 +
 compiler/pip_compile.vim                      |  49 +++
 extras/jsdoc.vim                              |   3 +-
 ftplugin/caddyfile.vim                        |   7 +-
 ftplugin/erlang.vim                           |  22 +-
 ftplugin/eruby.vim                            |  10 +-
 ftplugin/gitcommit.vim                        |  15 +-
 ftplugin/gitrebase.vim                        |   2 +-
 ftplugin/haml.vim                             |   2 +-
 ftplugin/julia.vim                            |   6 +
 ftplugin/markdown.vim                         |   6 +-
 ftplugin/mir.vim                              |  17 +
 ftplugin/ps1.vim                              |   2 +-
 {after/ftplugin => ftplugin}/requirements.vim |  26 +-
 ftplugin/zig.vim                              |   7 +
 indent/clojure.vim                            |  11 +
 indent/dart.vim                               |   7 +-
 indent/erlang.vim                             | 141 ++++---
 indent/gdscript3.vim                          | 204 ----------
 indent/glsl.vim                               |   1 +
 indent/haml.vim                               |   2 +-
 indent/ruby.vim                               |   2 +-
 indent/zig.vim                                |   2 +
 packages.yaml                                 |   9 -
 syntax/basic/keyword.vim                      |  16 +-
 syntax/basic/literal.vim                      |  17 +-
 syntax/caddyfile.vim                          |  39 +-
 syntax/clojure.vim                            |   4 +-
 syntax/erlang.vim                             |  17 +-
 syntax/gdscript3.vim                          | 101 -----
 syntax/git.vim                                |   4 +-
 syntax/gitcommit.vim                          |   2 +-
 syntax/gitrebase.vim                          |   2 +-
 syntax/go.vim                                 |  66 +++-
 syntax/gsl.vim                                |  63 ---
 syntax/haml.vim                               |   2 +-
 syntax/help.vim                               |   3 +-
 syntax/javascript.vim                         |  40 +-
 syntax/julia.vim                              |  18 +-
 syntax/kotlin.vim                             |   7 +-
 syntax/llvm.vim                               |  77 ++--
 syntax/machine-ir.vim                         |  42 ++
 syntax/meson.vim                              |   1 +
 syntax/mir.vim                                |  52 +++
 syntax/mlir.vim                               |  34 +-
 syntax/ocaml.vim                              | 372 +++++++++++++++---
 syntax/odin.vim                               |  14 +-
 syntax/openscad.vim                           |   2 +-
 syntax/qml.vim                                |   6 +-
 syntax/requirements.vim                       |  20 +-
 syntax/ruby.vim                               |  10 +-
 syntax/solidity.vim                           |   2 +-
 syntax/swayconfig.vim                         |  64 ++-
 syntax/swift.vim                              |   1 +
 syntax/tmux.vim                               |   4 +-
 tests/filetypes.vim                           |   1 -
 74 files changed, 1218 insertions(+), 776 deletions(-)
 create mode 100644 autoload/coc/source/requirements.vim
 create mode 100644 autoload/requirements/utils.vim
 create mode 100644 compiler/pip_compile.vim
 create mode 100644 ftplugin/mir.vim
 rename {after/ftplugin => ftplugin}/requirements.vim (76%)
 delete mode 100644 indent/gdscript3.vim
 delete mode 100644 syntax/gdscript3.vim
 delete mode 100644 syntax/gsl.vim
 create mode 100644 syntax/machine-ir.vim
 create mode 100644 syntax/mir.vim

diff --git a/README.md b/README.md
index 0bb21ce9f..113ce5a60 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->599<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->598<!--/Package Count--> packages it consists of.
 - It is also more secure (scripts loaded for every filetype are generated by vim-polyglot)
 - Best syntax and indentation support (no other features). Hand-selected language packs.
 - Automatically detects indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth), can be disabled)
@@ -62,7 +62,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [caddyfile](https://github.com/isobit/vim-caddyfile)
 - [carp](https://github.com/hellerve/carp-vim) (Syntax highlighting for carp files)
 - [cjsx](https://github.com/mtscout6/vim-cjsx)
-- [clojure](https://github.com/clojure-vim/clojure.vim) (Clojure syntax highlighting for clj, boot, cl2, cljc, cljs, cljs.hl, cljscm, cljx, hic and edn files)
+- [clojure](https://github.com/clojure-vim/clojure.vim) (Clojure syntax highlighting for clj, bb, boot, cl2, cljc and 6 more files)
 - [cmake](https://github.com/pboettch/vim-cmake-syntax) (CMake syntax highlighting for cmake and cmake.in files)
 - [coffee-script](https://github.com/kchmck/vim-coffee-script) (CoffeeScript and Literate CoffeeScript syntax highlighting for coffee, cake, cjsx, iced, coffeekup, cson, litcoffee and coffee.md files)
 - [cpp-modern](https://github.com/bfrg/vim-cpp-modern)
@@ -86,7 +86,6 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [fish](https://github.com/blankname/vim-fish) (fish syntax highlighting for fish files)
 - [flatbuffers](https://github.com/dcharbon/vim-flatbuffers) (Syntax highlighting for fbs files)
 - [fsharp](https://github.com/ionide/Ionide-vim) (F# syntax highlighting for fs, fsi and fsx files)
-- [gdscript](https://github.com/calviken/vim-gdscript3) (GDScript syntax highlighting for gd files)
 - [git](https://github.com/tpope/vim-git) (Git Config syntax highlighting for gitconfig files)
 - [gitignore](https://github.com/SirJson/fzf-gitignore)
 - [gleam](https://github.com/gleam-lang/gleam.vim) (Syntax highlighting for gleam files)
@@ -115,7 +114,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax) (Syntax highlighting for jenkinsfile and Jenkinsfile files)
 - [jq](https://github.com/vito-c/jq.vim) (JSONiq syntax highlighting for jq files)
 - [json5](https://github.com/GutenYe/json5.vim) (JSON5 syntax highlighting for json5 files)
-- [json](https://github.com/elzr/vim-json) (JSON syntax highlighting for json, avsc, geojson, gltf, har and 13 more files)
+- [json](https://github.com/elzr/vim-json) (JSON syntax highlighting for json, 4DForm, 4DProject, avsc, geojson and 15 more files)
 - [jsonc](https://github.com/neoclide/jsonc.vim) (Syntax highlighting for cjson and jsonc files)
 - [jsonnet](https://github.com/google/vim-jsonnet) (Jsonnet syntax highlighting for jsonnet and libsonnet files)
 - [jst](https://github.com/briancollins/vim-jst) (EJS syntax highlighting for ejs, ect, ejs.t and jst files)
@@ -130,7 +129,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [log](https://github.com/MTDL9/vim-log-highlighting) (Syntax highlighting for log and LOG files)
 - [lua](https://github.com/tbastos/vim-lua) (Lua syntax highlighting for lua, fcgi, nse, p8, rbxs, rockspec and wlua files)
 - [mako](https://github.com/sophacles/vim-bundle-mako) (Mako syntax highlighting for mako and mao files)
-- [markdown](https://github.com/plasticboy/vim-markdown) (Markdown syntax highlighting for md, markdown, mdown, mdwn, mkd, mkdn, mkdown, ronn, scd and workbook files)
+- [markdown](https://github.com/plasticboy/vim-markdown) (Markdown syntax highlighting for md, livemd, markdown, mdown, mdwn and 6 more files)
 - [mathematica](https://github.com/voldikss/vim-mma) (Mathematica syntax highlighting for mathematica, cdf, m, ma, mt and 6 more files)
 - [mdx](https://github.com/jxnblk/vim-mdx-js) (Syntax highlighting for mdx files)
 - [mermaid](https://github.com/mracos/mermaid.vim/tree/main) (Syntax highlighting for mermaid, mm and mmd files)
@@ -198,7 +197,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [toml](https://github.com/cespare/vim-toml/tree/main) (TOML syntax highlighting for toml files)
 - [tptp](https://github.com/c-cube/vim-tptp) (Syntax highlighting for p, tptp and ax files)
 - [twig](https://github.com/lumiliet/vim-twig) (Twig syntax highlighting for twig and xml.twig files)
-- [typescript](https://github.com/HerringtonDarkholme/yats.vim) (TypeScript and TSX syntax highlighting for ts and tsx files)
+- [typescript](https://github.com/HerringtonDarkholme/yats.vim) (TypeScript and TSX syntax highlighting for ts, cts, mts and tsx files)
 - [unison](https://github.com/unisonweb/unison/tree/trunk/editor-support/vim) (Syntax highlighting for u and uu files)
 - [v](https://github.com/ollykel/v-vim) (V syntax highlighting for v, vv and vsh files)
 - [vala](https://github.com/arrufat/vala.vim) (Vala syntax highlighting for vala, vapi and valadoc files)
@@ -207,7 +206,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [velocity](https://github.com/lepture/vim-velocity) (Syntax highlighting for vm files)
 - [vue](https://github.com/posva/vim-vue) (Vue syntax highlighting for vue and wpy files)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (Syntax highlighting for xdc files)
-- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axaml and 96 more files)
+- [xml](https://github.com/amadeus/vim-xml) (XML syntax highlighting for xml, adml, admx, ant, axaml and 97 more files)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax) (XSLT syntax highlighting for xslt and xsl files)
 - [yard](https://github.com/noprompt/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir) (Zephir syntax highlighting for zep files)
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index c8d98dbbd..2e8f5ac6e 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -8,7 +8,7 @@ endif
 " Original Author: Jon Haggblad <https://github.com/octol>
 " Maintainer:      bfrg <https://github.com/bfrg>
 " Website:         https://github.com/bfrg/vim-cpp-modern
-" Last Change:     Nov 23, 2020
+" Last Change:     Sep 15, 2022
 "
 " This syntax file is based on:
 " https://github.com/octol/vim-cpp-enhanced-highlight
@@ -70,7 +70,7 @@ if !exists('cpp_no_cpp11')
     syntax keyword cppSTLnamespace chrono this_thread
 
     syntax keyword cppSTLtype
-            \ array atomic atomic_bool atomic_char atomic_flag atomic_int atomic_llong atomic_long atomic_schar atomic_short atomic_uchar atomic_uint atomic_ullong atomic_ulong atomic_ushort duration duration_values high_resolution_clock hours microseconds milliseconds minutes nanoseconds seconds steady_clock system_clock time_point treat_as_floating_point condition_variable exception_ptr nested_exception hash is_bind_expression is_placeholder reference_wrapper forward_list future packaged_task promise shared_future initializer_list codecvt_mode codecvt_utf16 codecvt_utf8 codecvt_utf8_utf16 wbuffer_convert wstring_convert allocator_traits allocator_type default_delete enable_shared_from_this is_always_equal owner_less pointer_safety pointer_traits propagate_on_container_copy_assignment propagate_on_container_move_assignment propagate_on_container_swap rebind_alloc rebind_traits shared_ptr unique_ptr uses_allocator void_pointer const_void_pointer weak_ptr condition_variable_any lock_guard mutex once_flag recursive_mutex recursive_timed_mutex timed_mutex unique_lock bernoulli_distribution binomial_distribution cauchy_distribution chi_squared_distribution default_random_engine discard_block_engine discrete_distribution exponential_distribution extreme_value_distribution fisher_f_distribution gamma_distribution geometric_distribution independent_bits_engine knuth_b linear_congruential_engine lognormal_distribution mersenne_twister_engine minstd_rand minstd_rand0 mt19937 mt19937_64 negative_binomial_distribution normal_distribution piecewise_constant_distribution piecewise_linear_distribution poisson_distribution random_device ranlux24 ranlux24_base ranlux48 ranlux48_base seed_seq shuffle_order_engine student_t_distribution subtract_with_carry_engine uniform_int_distribution uniform_real_distribution weibull_distribution atto centi deca deci exa femto giga hecto kilo mega micro milli nano peta pico ratio ratio_add ratio_divide ratio_equal ratio_greater ratio_greater_equal ratio_less ratio_less_equal ratio_multiply ratio_not_equal ratio_subtract tera yocto yotta zepto zetta basic_regex match_results regex_traits sub_match syntax_option_type match_flag_type error_type scoped_allocator_adaptor outer_allocator_type inner_allocator_type error_code error_condition error_category is_error_code_enum is_error_condition_enum thread tuple tuple_size tuple_element type_index add_const add_cv add_lvalue_reference add_pointer add_rvalue_reference add_volatile aligned_storage aligned_union alignment_of common_type conditional decay enable_if extent false_type has_virtual_destructor integral_constant is_abstract is_arithmetic is_array is_assignable is_base_of is_class is_compound is_const is_constructible is_convertible is_copy_assignable is_copy_constructible is_default_constructible is_destructible is_empty is_enum is_floating_point is_function is_fundamental is_integral is_literal_type is_lvalue_reference is_member_function_pointer is_member_object_pointer is_member_pointer is_move_assignable is_move_constructible is_nothrow_assignable is_nothrow_constructible is_nothrow_copy_assignable is_nothrow_copy_constructible is_nothrow_default_constructible is_nothrow_destructible is_nothrow_move_assignable is_nothrow_move_constructible is_object is_pod is_pointer is_polymorphic is_reference is_rvalue_reference is_same is_scalar is_signed is_standard_layout is_trivial is_trivially_assignable is_trivially_constructible is_trivially_copy_assignable is_trivially_copy_constructible is_trivially_copyable is_trivially_default_constructible is_trivially_destructible is_trivially_move_assignable is_trivially_move_constructible is_union is_unsigned is_void is_volatile make_signed make_unsigned rank remove_all_extents remove_const remove_cv remove_extent remove_pointer remove_reference remove_volatile result_of true_type underlying_type hasher key_equal unordered_map unordered_multimap unordered_multiset unordered_set function
+            \ array atomic atomic_bool atomic_char atomic_flag atomic_int atomic_llong atomic_long atomic_schar atomic_short atomic_uchar atomic_uint atomic_ullong atomic_ulong atomic_ushort duration duration_values high_resolution_clock hours microseconds milliseconds minutes nanoseconds seconds steady_clock system_clock time_point treat_as_floating_point condition_variable exception_ptr nested_exception hash is_bind_expression is_placeholder reference_wrapper forward_list future packaged_task promise shared_future initializer_list codecvt_mode codecvt_utf16 codecvt_utf8 codecvt_utf8_utf16 wbuffer_convert wstring_convert allocator_traits allocator_type default_delete enable_shared_from_this is_always_equal owner_less pointer_safety pointer_traits propagate_on_container_copy_assignment propagate_on_container_move_assignment propagate_on_container_swap rebind_alloc rebind_traits shared_ptr unique_ptr uses_allocator void_pointer const_void_pointer weak_ptr condition_variable_any lock_guard mutex once_flag recursive_mutex recursive_timed_mutex timed_mutex unique_lock bernoulli_distribution binomial_distribution cauchy_distribution chi_squared_distribution default_random_engine discard_block_engine discrete_distribution exponential_distribution extreme_value_distribution fisher_f_distribution gamma_distribution geometric_distribution independent_bits_engine knuth_b linear_congruential_engine lognormal_distribution mersenne_twister_engine minstd_rand minstd_rand0 mt19937 mt19937_64 negative_binomial_distribution normal_distribution piecewise_constant_distribution piecewise_linear_distribution poisson_distribution random_device ranlux24 ranlux24_base ranlux48 ranlux48_base seed_seq shuffle_order_engine student_t_distribution subtract_with_carry_engine uniform_int_distribution uniform_real_distribution weibull_distribution atto centi deca deci exa femto giga hecto kilo mega micro milli nano peta pico ratio ratio_add ratio_divide ratio_equal ratio_greater ratio_greater_equal ratio_less ratio_less_equal ratio_multiply ratio_not_equal ratio_subtract tera yocto yotta zepto zetta basic_regex regex wregex match_results regex_traits sub_match syntax_option_type match_flag_type error_type scoped_allocator_adaptor outer_allocator_type inner_allocator_type error_code error_condition error_category is_error_code_enum is_error_condition_enum thread tuple tuple_size tuple_element type_index add_const add_cv add_lvalue_reference add_pointer add_rvalue_reference add_volatile aligned_storage aligned_union alignment_of common_type conditional decay enable_if extent false_type has_virtual_destructor integral_constant is_abstract is_arithmetic is_array is_assignable is_base_of is_class is_compound is_const is_constructible is_convertible is_copy_assignable is_copy_constructible is_default_constructible is_destructible is_empty is_enum is_floating_point is_function is_fundamental is_integral is_literal_type is_lvalue_reference is_member_function_pointer is_member_object_pointer is_member_pointer is_move_assignable is_move_constructible is_nothrow_assignable is_nothrow_constructible is_nothrow_copy_assignable is_nothrow_copy_constructible is_nothrow_default_constructible is_nothrow_destructible is_nothrow_move_assignable is_nothrow_move_constructible is_object is_pod is_pointer is_polymorphic is_reference is_rvalue_reference is_same is_scalar is_signed is_standard_layout is_trivial is_trivially_assignable is_trivially_constructible is_trivially_copy_assignable is_trivially_copy_constructible is_trivially_copyable is_trivially_default_constructible is_trivially_destructible is_trivially_move_assignable is_trivially_move_constructible is_union is_unsigned is_void is_volatile make_signed make_unsigned rank remove_all_extents remove_const remove_cv remove_extent remove_pointer remove_reference remove_volatile result_of true_type underlying_type hasher key_equal unordered_map unordered_multimap unordered_multiset unordered_set function
 
     syntax keyword cppSTLtypedef
             \ atomic_char16_t atomic_char32_t atomic_int_fast16_t atomic_int_fast32_t atomic_int_fast64_t atomic_int_fast8_t atomic_int_least16_t atomic_int_least32_t atomic_int_least64_t atomic_int_least8_t atomic_intmax_t atomic_intptr_t atomic_ptrdiff_t atomic_size_t atomic_uint_fast16_t atomic_uint_fast32_t atomic_uint_fast64_t atomic_uint_fast8_t atomic_uint_least16_t atomic_uint_least32_t atomic_uint_least64_t atomic_uint_least8_t atomic_uintmax_t atomic_uintptr_t atomic_wchar_t nullptr_t max_align_t allocator_arg_t adopt_lock_t defer_lock_t try_to_lock_t piecewise_construct_t
@@ -92,7 +92,6 @@ if !exists('cpp_no_cpp11')
     syntax keyword cppSTLexception
             \ bad_function_call future_error regex_error system_error bad_weak_ptr bad_array_new_length
 
-    " syntax keyword cppSTLiterator contained
     syntax keyword cppSTLiterator
             \ move_iterator regex_iterator regex_token_iterator const_local_iterator local_iterator
 
@@ -120,7 +119,7 @@ if !exists('cpp_no_cpp17')
     syntax keyword cppSTLnamespace filesystem execution string_view_literals
 
     syntax keyword cppSTLtype
-            \ any byte is_execution_policy parallel_policy parallel_unsequenced_policy sequenced_policy directory_entry directory_iterator file_status file_time_type path recursive_directory_iterator space_info default_order default_searcher boyer_moore_searcher boyer_moore_horspool_searcher memory_resource monotonic_buffer_resource polymorphic_allocator pool_options synchronized_pool_resource unsynchronized_pool_resource scoped_lock optional shared_mutex basic_string_view string_view u16string_view u32string_view wstring_view bool_constant conjunction disjunction has_unique_object_representations invoke_result is_aggregate is_callable is_invocable is_invocable_r is_nothrow_invocable is_nothrow_invocable_r is_nothrow_swappable is_nothrow_swappable_with is_nowthrow_callable is_swappable is_swappable_with negation node_type insert_return_type in_place_tag monostate variant variant_size variant_alternative
+            \ any byte is_execution_policy parallel_policy parallel_unsequenced_policy sequenced_policy directory_entry directory_iterator file_status file_time_type path recursive_directory_iterator space_info default_order default_searcher boyer_moore_searcher boyer_moore_horspool_searcher memory_resource monotonic_buffer_resource polymorphic_allocator pool_options synchronized_pool_resource unsynchronized_pool_resource scoped_lock optional shared_mutex basic_string_view string_view u16string_view u32string_view wstring_view bool_constant conjunction disjunction has_unique_object_representations invoke_result is_aggregate is_callable is_invocable is_invocable_r is_nothrow_invocable is_nothrow_invocable_r is_nothrow_swappable is_nothrow_swappable_with is_nowthrow_callable is_swappable is_swappable_with negation node_type insert_return_type in_place_tag monostate variant variant_size variant_alternative from_chars_result to_chars_result chars_format
 
     syntax keyword cppSTLtypedef
             \ invoke_result_t default_order_t nullopt_t void_t in_place_t in_place_type_t in_place_index_t variant_alternative_t
@@ -157,12 +156,13 @@ if !exists('cpp_no_cpp20')
     syntax keyword cppSTLnamespace ranges views
     syntax keyword cppSTLconstant dynamic_extent
     syntax keyword cppSTLvariable default_sentinel unreachable_sentinel
+    syntax keyword cppSTLexception format_error
 
     syntax keyword cppSTLtype
-            \ atomic_ref endian weak_ordering strong_ordering partial_ordering weak_equality strong_equality common_comparison_category contract_violation coroutine_traits coroutine_handle noop_coroutine_handle noop_coroutine_promise suspend_never suspend_always remove_cvref is_bounded_array is_layout_compatible is_unbounded_array is_nothrow_convertible has_strong_structural_equality is_pointer_interconvertible_base_of unwrap_reference unwrap_ref_decay basic_common_reference common_reference dangling ref_view filter_view transform_view iota_view join_view empty_view single_view split_view common_view reverse_view view_interface span basic_syncbuf basic_osyncstream syncbuf wsyncbuf osyncstream wosyncstream jthread latch barrier stop_token stop_source stop_callback counting_semaphore binary_semaphore source_location compare_three_way_result contiguous_iterator_tag incrementable_traits indirectly_readable_traits move_sentinel common_iterator counted_iterator projected type_identity
+            \ atomic_ref endian weak_ordering strong_ordering partial_ordering weak_equality strong_equality common_comparison_category contract_violation coroutine_traits coroutine_handle noop_coroutine_handle noop_coroutine_promise suspend_never suspend_always remove_cvref is_bounded_array is_layout_compatible is_unbounded_array is_nothrow_convertible has_strong_structural_equality is_pointer_interconvertible_base_of unwrap_reference unwrap_ref_decay basic_common_reference common_reference dangling ref_view filter_view transform_view iota_view join_view empty_view single_view split_view common_view reverse_view view_interface span basic_syncbuf basic_osyncstream syncbuf wsyncbuf osyncstream wosyncstream jthread latch barrier stop_token stop_source stop_callback counting_semaphore binary_semaphore source_location compare_three_way_result contiguous_iterator_tag incrementable_traits indirectly_readable_traits move_sentinel common_iterator counted_iterator projected type_identity formatter basic_format_context basic_format_args basic_format_string basic_format_parse_context
 
     syntax keyword cppSTLtypedef
-            \ common_comparison_category_t remove_cvref_t unwrap_reference_t unwrap_ref_decay_t common_reference_t iterator_t sentinel_t safe_iterator_t safe_subrange_t compare_three_way_result_t iter_value_t iter_reference_t iter_difference_t iter_rvalue_reference_t iter_common_reference_t default_sentinel_t unreachable_sentinel_t indirect_result_t type_identity_t
+            \ common_comparison_category_t remove_cvref_t unwrap_reference_t unwrap_ref_decay_t common_reference_t iterator_t sentinel_t safe_iterator_t safe_subrange_t compare_three_way_result_t iter_value_t iter_reference_t iter_difference_t iter_rvalue_reference_t iter_common_reference_t default_sentinel_t unreachable_sentinel_t indirect_result_t type_identity_t format_context wformat_context format_args wformat_args format_string wformat_string format_parse_context wformat_parse_context
 
     syntax keyword cppSTLfunction
             \ make_unique_default_init make_shared_default_init allocate_shared_default_init uses_allocator_construction_args make_obj_using_allocator is_corresponding_member subspan in_range is_pointer_interconvertible_with_class
@@ -175,6 +175,17 @@ if !exists('cpp_no_cpp20')
 endif
 
 
+" C++23 extensions {{{1
+if !exists('cpp_no_cpp23')
+    syntax keyword cppSTLtype basic_stacktrace stacktrace_entry is_scoped_enum
+    syntax keyword cppSTLtypedef stacktrace
+    syntax keyword cppSTLbool is_scoped_enum_v
+    syntax keyword cppSTLfunction invoke_r
+    syntax keyword cppSTLtype expected unexpected unexpect_t bad_expected_access
+    syntax keyword cppSTLvariable unexpect
+endif
+
+
 " Boost {{{1
 if !exists('cpp_no_boost')
     syntax keyword cppSTLnamespace boost
diff --git a/after/syntax/reason/graphql.vim b/after/syntax/reason/graphql.vim
index af28b8e4e..47a63e624 100644
--- a/after/syntax/reason/graphql.vim
+++ b/after/syntax/reason/graphql.vim
@@ -38,5 +38,5 @@ if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
 
-syntax region graphqlExtensionPoint start=+\[%graphql+ end=+\]+ contains=graphqlExtensionPointS
+syntax region graphqlExtensionPoint start=+\[%\(graphql\|relay\)+ end=+\]+ contains=graphqlExtensionPointS
 syntax region graphqlExtensionPointS matchgroup=String start=+{|+ end=+|}+ contains=@GraphQLSyntax contained
diff --git a/after/syntax/rescript/graphql.vim b/after/syntax/rescript/graphql.vim
index f78913387..1e5ed04ca 100644
--- a/after/syntax/rescript/graphql.vim
+++ b/after/syntax/rescript/graphql.vim
@@ -38,5 +38,5 @@ if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
 
-syntax region graphqlExtensionPoint start=+%graphql(+ end=+)+ contains=graphqlExtensionPointS
+syntax region graphqlExtensionPoint start=+%\(graphql\|relay\)(+ end=+)+ contains=graphqlExtensionPointS
 syntax region graphqlExtensionPointS matchgroup=String start=+`+ end=+`+ contains=@GraphQLSyntax contained
diff --git a/after/syntax/zsh.vim b/after/syntax/zsh.vim
index 118345c43..90349e37d 100644
--- a/after/syntax/zsh.vim
+++ b/after/syntax/zsh.vim
@@ -82,7 +82,7 @@ syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(param\)"+ skip=+\\"
             \ contains=ZinitIceDoubleQuoteParam
 
 " added by the existing annexes
-syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(fbin\|sbin\|gem\|node\|pip\|fmod\|fsrc\|ferc\)"+ skip=+\\"+ end=+"+ skipwhite contained
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(fbin\|lbin\|sbin\|gem\|node\|pip\|fmod\|fsrc\|ferc\)"+ skip=+\\"+ end=+"+ skipwhite contained
             \ nextgroup=@ZinitLine,ZinitContinue
             \ contains=ZinitIceDoubleQuoteParam
 syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(dl\|patch\|submods\|cargo\|dlink\|dlink0\)"+ skip=+\\"+ end=+"+ skipwhite contained
@@ -118,7 +118,7 @@ syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(param\)'+ skip=+\\'
             \ contains=ZinitIceSingleQuoteParam
 
 " added by the existing annexes
-syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(fbin\|sbin\|gem\|node\|pip\|fmod\|fsrc\|ferc\)'+ skip=+\\'+ end=+'+ skipwhite contained
+syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(fbin\|lbin\|sbin\|gem\|node\|pip\|fmod\|fsrc\|ferc\)'+ skip=+\\'+ end=+'+ skipwhite contained
             \ nextgroup=@ZinitLine,ZinitContinue
             \ contains=ZinitIceSingleQuoteParam
 syn region ZinitIceWithParam matchgroup=ZinitIce start=+\s\%(dl\|patch\|submods\|cargo\|dlink\|dlink0\)'+ skip=+\\'+ end=+'+ skipwhite contained
diff --git a/autoload/LaTeXtoUnicode.vim b/autoload/LaTeXtoUnicode.vim
index 86420ccac..b512a734e 100644
--- a/autoload/LaTeXtoUnicode.vim
+++ b/autoload/LaTeXtoUnicode.vim
@@ -348,7 +348,7 @@ endfunction
 " be reinstated if needed.
 function! s:L2U_SetFallbackMapping(s, k)
   let mmdict = maparg(a:s, 'i', 0, 1)
-  if empty(mmdict)
+  if empty(mmdict) || !has_key(mmdict, "rhs")
     exe 'inoremap <buffer> ' . a:k . ' ' . a:s
     return mmdict
   endif
diff --git a/autoload/clojurecomplete.vim b/autoload/clojurecomplete.vim
index e5dfb205a..31065c1fe 100644
--- a/autoload/clojurecomplete.vim
+++ b/autoload/clojurecomplete.vim
@@ -12,7 +12,7 @@ endif
 
 " -*- COMPLETION WORDS -*-
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-" Clojure version 1.11.0
+" Clojure version 1.11.1
 let s:words = ["&","*","*'","*1","*2","*3","*agent*","*allow-unresolved-vars*","*assert*","*clojure-version*","*command-line-args*","*compile-files*","*compile-path*","*compiler-options*","*data-readers*","*default-data-reader-fn*","*e","*err*","*file*","*flush-on-newline*","*fn-loader*","*in*","*math-context*","*ns*","*out*","*print-dup*","*print-length*","*print-level*","*print-meta*","*print-namespace-maps*","*print-readably*","*read-eval*","*reader-resolver*","*source-path*","*suppress-read*","*unchecked-math*","*use-context-classloader*","*verbose-defrecords*","*warn-on-reflection*","+","+'","-","-'","->","->>","->ArrayChunk","->Eduction","->Vec","->VecNode","->VecSeq","-cache-protocol-fn","-reset-methods",".","..","/","<","<=","=","==",">",">=","EMPTY-NODE","Inst","NaN?","PrintWriter-on","StackTraceElement->vec","Throwable->map","abs","accessor","aclone","add-classpath","add-tap","add-watch","agent","agent-error","agent-errors","aget","alength","alias","all-ns","alter","alter-meta!","alter-var-root","amap","ancestors","and","any?","apply","areduce","array-map","as->","aset","aset-boolean","aset-byte","aset-char","aset-double","aset-float","aset-int","aset-long","aset-short","assert","assoc","assoc!","assoc-in","associative?","atom","await","await-for","await1","bases","bean","bigdec","bigint","biginteger","binding","bit-and","bit-and-not","bit-clear","bit-flip","bit-not","bit-or","bit-set","bit-shift-left","bit-shift-right","bit-test","bit-xor","boolean","boolean-array","boolean?","booleans","bound-fn","bound-fn*","bound?","bounded-count","butlast","byte","byte-array","bytes","bytes?","case","case*","cast","cat","catch","char","char-array","char-escape-string","char-name-string","char?","chars","chunk","chunk-append","chunk-buffer","chunk-cons","chunk-first","chunk-next","chunk-rest","chunked-seq?","class","class?","clear-agent-errors","clojure-version","coll?","comment","commute","comp","comparator","compare","compare-and-set!","compile","complement","completing","concat","cond","cond->","cond->>","condp","conj","conj!","cons","constantly","construct-proxy","contains?","count","counted?","create-ns","create-struct","cycle","dec","dec'","decimal?","declare","dedupe","def","default-data-readers","definline","definterface","defmacro","defmethod","defmulti","defn","defn-","defonce","defprotocol","defrecord","defstruct","deftype","deftype*","delay","delay?","deliver","denominator","deref","derive","descendants","destructure","disj","disj!","dissoc","dissoc!","distinct","distinct?","do","doall","dorun","doseq","dosync","dotimes","doto","double","double-array","double?","doubles","drop","drop-last","drop-while","eduction","empty","empty?","ensure","ensure-reduced","enumeration-seq","error-handler","error-mode","eval","even?","every-pred","every?","ex-cause","ex-data","ex-info","ex-message","extend","extend-protocol","extend-type","extenders","extends?","false","false?","ffirst","file-seq","filter","filterv","finally","find","find-keyword","find-ns","find-protocol-impl","find-protocol-method","find-var","first","flatten","float","float-array","float?","floats","flush","fn","fn*","fn?","fnext","fnil","for","force","format","frequencies","future","future-call","future-cancel","future-cancelled?","future-done?","future?","gen-class","gen-interface","gensym","get","get-in","get-method","get-proxy-class","get-thread-bindings","get-validator","group-by","halt-when","hash","hash-combine","hash-map","hash-ordered-coll","hash-set","hash-unordered-coll","ident?","identical?","identity","if","if-let","if-not","if-some","ifn?","import","in-ns","inc","inc'","indexed?","infinite?","init-proxy","inst-ms","inst-ms*","inst?","instance?","int","int-array","int?","integer?","interleave","intern","interpose","into","into-array","ints","io!","isa?","iterate","iteration","iterator-seq","juxt","keep","keep-indexed","key","keys","keyword","keyword?","last","lazy-cat","lazy-seq","let","let*","letfn","letfn*","line-seq","list","list*","list?","load","load-file","load-reader","load-string","loaded-libs","locking","long","long-array","longs","loop","loop*","macroexpand","macroexpand-1","make-array","make-hierarchy","map","map-entry?","map-indexed","map?","mapcat","mapv","max","max-key","memfn","memoize","merge","merge-with","meta","method-sig","methods","min","min-key","mix-collection-hash","mod","monitor-enter","monitor-exit","munge","name","namespace","namespace-munge","nat-int?","neg-int?","neg?","new","newline","next","nfirst","nil","nil?","nnext","not","not-any?","not-empty","not-every?","not=","ns","ns-aliases","ns-imports","ns-interns","ns-map","ns-name","ns-publics","ns-refers","ns-resolve","ns-unalias","ns-unmap","nth","nthnext","nthrest","num","number?","numerator","object-array","odd?","or","parents","parse-boolean","parse-double","parse-long","parse-uuid","partial","partition","partition-all","partition-by","pcalls","peek","persistent!","pmap","pop","pop!","pop-thread-bindings","pos-int?","pos?","pr","pr-str","prefer-method","prefers","primitives-classnames","print","print-ctor","print-dup","print-method","print-simple","print-str","printf","println","println-str","prn","prn-str","promise","proxy","proxy-call-with-super","proxy-mappings","proxy-name","proxy-super","push-thread-bindings","pvalues","qualified-ident?","qualified-keyword?","qualified-symbol?","quot","quote","rand","rand-int","rand-nth","random-sample","random-uuid","range","ratio?","rational?","rationalize","re-find","re-groups","re-matcher","re-matches","re-pattern","re-seq","read","read+string","read-line","read-string","reader-conditional","reader-conditional?","realized?","record?","recur","reduce","reduce-kv","reduced","reduced?","reductions","ref","ref-history-count","ref-max-history","ref-min-history","ref-set","refer","refer-clojure","reify","reify*","release-pending-sends","rem","remove","remove-all-methods","remove-method","remove-ns","remove-tap","remove-watch","repeat","repeatedly","replace","replicate","require","requiring-resolve","reset!","reset-meta!","reset-vals!","resolve","rest","restart-agent","resultset-seq","reverse","reversible?","rseq","rsubseq","run!","satisfies?","second","select-keys","send","send-off","send-via","seq","seq-to-map-for-destructuring","seq?","seqable?","seque","sequence","sequential?","set","set!","set-agent-send-executor!","set-agent-send-off-executor!","set-error-handler!","set-error-mode!","set-validator!","set?","short","short-array","shorts","shuffle","shutdown-agents","simple-ident?","simple-keyword?","simple-symbol?","slurp","some","some->","some->>","some-fn","some?","sort","sort-by","sorted-map","sorted-map-by","sorted-set","sorted-set-by","sorted?","special-symbol?","spit","split-at","split-with","str","string?","struct","struct-map","subs","subseq","subvec","supers","swap!","swap-vals!","symbol","symbol?","sync","tagged-literal","tagged-literal?","take","take-last","take-nth","take-while","tap>","test","the-ns","thread-bound?","throw","time","to-array","to-array-2d","trampoline","transduce","transient","tree-seq","true","true?","try","type","unchecked-add","unchecked-add-int","unchecked-byte","unchecked-char","unchecked-dec","unchecked-dec-int","unchecked-divide-int","unchecked-double","unchecked-float","unchecked-inc","unchecked-inc-int","unchecked-int","unchecked-long","unchecked-multiply","unchecked-multiply-int","unchecked-negate","unchecked-negate-int","unchecked-remainder-int","unchecked-short","unchecked-subtract","unchecked-subtract-int","underive","unquote","unquote-splicing","unreduced","unsigned-bit-shift-right","update","update-in","update-keys","update-proxy","update-vals","uri?","use","uuid?","val","vals","var","var-get","var-set","var?","vary-meta","vec","vector","vector-of","vector?","volatile!","volatile?","vreset!","vswap!","when","when-first","when-let","when-not","when-some","while","with-bindings","with-bindings*","with-in-str","with-loading-context","with-local-vars","with-meta","with-open","with-out-str","with-precision","with-redefs","with-redefs-fn","xml-seq","zero?","zipmap"]
 
 " Simple word completion for special forms and public vars in clojure.core
diff --git a/autoload/coc/source/requirements.vim b/autoload/coc/source/requirements.vim
new file mode 100644
index 000000000..c2c64dbd0
--- /dev/null
+++ b/autoload/coc/source/requirements.vim
@@ -0,0 +1,24 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'requirements', 'autoload/coc/source/requirements.vim')
+  finish
+endif
+
+""
+" https://github.com/neoclide/coc.nvim/wiki/Create-custom-source
+function! coc#source#requirements#init() abort
+    return {
+                \ 'shortcut': 'pip',
+                \ 'priority': 9,
+                \ 'filetypes': ['requirements'],
+                \ }
+endfunction
+
+""
+" https://github.com/neoclide/coc.nvim/wiki/Create-custom-source
+"
+" Completion pip option and PYPI package names.
+" Note: completion PYPI package names need install pip-cache from PYPI,
+" and run `pip-cache update` first to generate cache.
+function! coc#source#requirements#complete(opt, cb) abort
+    call a:cb(g:requirements#items)
+endfunction
+" vim: et sw=4 ts=4 sts=4:
diff --git a/autoload/crystal/indent.vim b/autoload/crystal/indent.vim
index 3e8b07e5c..4e9ddcf73 100644
--- a/autoload/crystal/indent.vim
+++ b/autoload/crystal/indent.vim
@@ -96,7 +96,7 @@ lockvar g:crystal#indent#block_regex
 " Regex that defines the beginning of a hanging expression.
 let g:crystal#indent#hanging_assignment_regex =
       \ '\%('.g:crystal#indent#operator_regex.'\s*\)\@<=' .
-      \ '\.\@1<!\<\%(if\||unless\|case\|begin\)\>'
+      \ '\.\@1<!\<\%(if\||unless\|case\|begin\|select\)\>'
 lockvar g:crystal#indent#hanging_assignment_regex
 
 " Regex that defines the start-match for the 'end' keyword.
@@ -107,7 +107,7 @@ let g:crystal#indent#end_start_regex =
       \ '\%(\<\%(private\|protected\)\s\+\)\=' .
       \ '\%(\<\%(abstract\s\+\)\=\%(class\|struct\)\>\|\<\%(def\|module\|macro\|lib\|enum\|annotation\)\>\)' .
       \ '\|' .
-      \ '\<\%(if\|unless\|while\|until\|case\|begin\|union\)\>' .
+      \ '\<\%(if\|unless\|while\|until\|case\|begin\|union\|select\)\>' .
       \ '\)' .
       \ '\|' .
       \ g:crystal#indent#hanging_assignment_regex .
@@ -1042,4 +1042,4 @@ endfunction
 
 " }}}1
 
-" vim:sw=2 sts=2 ts=8 fdm=marker et:
\ No newline at end of file
+" vim:sw=2 sts=2 ts=8 fdm=marker et:
diff --git a/autoload/csv.vim b/autoload/csv.vim
index ba04d2bcc..4111f6ed8 100644
--- a/autoload/csv.vim
+++ b/autoload/csv.vim
@@ -826,8 +826,8 @@ fu! csv#Columnize(field) "{{{3
     let colnr = s:columnize_count % s:max_cols
     let width = get(b:col_width, colnr, 20)
     let align = 'r'
-    if exists('b:csv_arrange_align')
-        let align=b:csv_arrange_align
+    if exists('b:csv_arrange_align') || exists('g:csv_arrange_align')
+        let align=get(b:, 'csv_arrange_align', g:csv_arrange_align)
         let indx=match(align, '\*')
         if indx > 0
             let align = align[0:(indx-1)]. repeat(align[indx-1], len(b:col_width)-indx)
@@ -934,6 +934,11 @@ fu! csv#GetColPat(colnr, zs_flag) "{{{3
 endfu
 fu! csv#SetupAutoCmd(window,bufnr) "{{{3
     " Setup QuitPre autocommand to quit cleanly
+    if a:bufnr == 0
+        " something went wrong, 
+        " how can this happen?
+        return
+    endif
     aug CSV_QuitPre
         au!
         exe "au QuitPre * call CSV_CloseBuffer(".winbufnr(a:window).")"
@@ -1024,7 +1029,7 @@ fu! csv#SplitHeaderLine(lines, bang, hor) "{{{3
         " disable airline
         let w:airline_disabled = 1
         let win = winnr()
-        setl scrollbind buftype=nowrite bufhidden=wipe noswapfile nobuflisted
+        setl scrollbind buftype=nofile bufhidden=wipe noswapfile nobuflisted
         noa wincmd p
         let b:csv_SplitWindow = win
         aug CSV_Preview
diff --git a/autoload/dart.vim b/autoload/dart.vim
index 28e55552c..09ca49e05 100644
--- a/autoload/dart.vim
+++ b/autoload/dart.vim
@@ -92,9 +92,9 @@ endfunction
 
 " Finds the path to `uri`.
 "
-" If the file is a package: uri, looks for a .packages file to resolve the path.
-" If the path cannot be resolved, or is not a package: uri, returns the
-" original.
+" If the file is a package: uri, looks for a package_config.json or .packages
+" file to resolve the path. If the path cannot be resolved, or is not a
+" package: uri, returns the original.
 function! dart#resolveUri(uri) abort
   if a:uri !~# 'package:'
     return a:uri
@@ -102,7 +102,7 @@ function! dart#resolveUri(uri) abort
   let package_name = substitute(a:uri, 'package:\(\w\+\)\/.*', '\1', '')
   let [found, package_map] = s:PackageMap()
   if !found
-    call s:error('cannot find .packages file')
+    call s:error('cannot find .packages or package_config.json file')
     return a:uri
   endif
   if !has_key(package_map, package_name)
@@ -116,37 +116,63 @@ function! dart#resolveUri(uri) abort
       \ '')
 endfunction
 
-" A map from package name to lib directory parse from a '.packages' file.
+" A map from package name to lib directory parse from a 'package_config.json'
+" or '.packages' file.
 "
 " Returns [found, package_map]
 function! s:PackageMap() abort
-  let [found, dot_packages] = s:DotPackagesFile()
-  if !found
-    return [v:false, {}]
-  endif
-  let dot_packages_dir = fnamemodify(dot_packages, ':p:h')
-  let lines = readfile(dot_packages)
-  let map = {}
-  for line in lines
-    if line =~# '\s*#'
-      continue
+  let [found, package_config] = s:FindFile('.dart_tool/package_config.json')
+  if found
+    let dart_tool_dir = fnamemodify(package_config, ':p:h')
+    let content = join(readfile(package_config), "\n")
+    let packages_dict = json_decode(content)
+    if packages_dict['configVersion'] != '2'
+      s:error('Unsupported version of package_config.json')
+      return [v:false, {}]
     endif
-    let package = substitute(line, ':.*$', '', '')
-    let lib_dir = substitute(line, '^[^:]*:', '', '')
-    if lib_dir =~# 'file:/'
-      let lib_dir = substitute(lib_dir, 'file://', '', '')
-      if lib_dir =~# '/[A-Z]:/'
-        let lib_dir = lib_dir[1:]
+    let map = {}
+    for package in packages_dict['packages']
+      let name = package['name']
+      let uri = package['rootUri']
+      let package_uri = package['packageUri']
+      if uri =~# 'file:/'
+        let uri = substitute(uri, 'file://', '', '')
+        let lib_dir = resolve(uri.'/'.package_uri)
+      else
+        let lib_dir = resolve(dart_tool_dir.'/'.uri.'/'.package_uri)
       endif
-    else
-      let lib_dir = resolve(dot_packages_dir.'/'.lib_dir)
-    endif
-    if lib_dir =~# '/$'
-      let lib_dir = lib_dir[:len(lib_dir) - 2]
-    endif
-    let map[package] = lib_dir
-  endfor
-  return [v:true, map]
+      let map[name] = lib_dir
+    endfor
+    return [v:true, map]
+  endif
+
+  let [found, dot_packages] = s:FindFile('.packages')
+  if found
+    let dot_packages_dir = fnamemodify(dot_packages, ':p:h')
+    let lines = readfile(dot_packages)
+    let map = {}
+    for line in lines
+      if line =~# '\s*#'
+        continue
+      endif
+      let package = substitute(line, ':.*$', '', '')
+      let lib_dir = substitute(line, '^[^:]*:', '', '')
+      if lib_dir =~# 'file:/'
+        let lib_dir = substitute(lib_dir, 'file://', '', '')
+        if lib_dir =~# '/[A-Z]:/'
+          let lib_dir = lib_dir[1:]
+        endif
+      else
+        let lib_dir = resolve(dot_packages_dir.'/'.lib_dir)
+      endif
+      if lib_dir =~# '/$'
+        let lib_dir = lib_dir[:len(lib_dir) - 2]
+      endif
+      let map[package] = lib_dir
+    endfor
+    return [v:true, map]
+  endif
+  return [v:false, {}]
 endfunction
 
 " Toggle whether dartfmt is run on save or not.
@@ -158,17 +184,17 @@ function! dart#ToggleFormatOnSave() abort
   let g:dart_format_on_save = 1
 endfunction
 
-" Finds a file name '.packages' in the cwd, or in any directory above the open
+" Finds a file named [a:path] in the cwd, or in any directory above the open
 " file.
 "
-" Returns [found, file].
-function! s:DotPackagesFile() abort
-  if filereadable('.packages')
-    return [v:true, '.packages']
+" Returns [found, file]
+function! s:FindFile(path) abort
+  if filereadable(a:path)
+    return [v:true, a:path]
   endif
   let dir_path = expand('%:p:h')
   while v:true
-    let file_path = dir_path.'/.packages'
+    let file_path = dir_path.'/'.a:path
     if filereadable(file_path)
       return [v:true, file_path]
     endif
diff --git a/autoload/fsharp.vim b/autoload/fsharp.vim
index 275913cfd..bb93b9cd7 100644
--- a/autoload/fsharp.vim
+++ b/autoload/fsharp.vim
@@ -251,7 +251,7 @@ function! fsharp#loadConfig()
         let g:fsharp#automatic_reload_workspace = 1
     endif
     if !exists('g:fsharp#show_signature_on_cursor_move')
-        let g:fsharp#show_signature_on_cursor_move = 1
+        let g:fsharp#show_signature_on_cursor_move = 0
     endif
     if !exists('g:fsharp#fsi_command')
         let g:fsharp#fsi_command = "dotnet fsi"
diff --git a/autoload/ledger.vim b/autoload/ledger.vim
index 90c888029..984070c08 100644
--- a/autoload/ledger.vim
+++ b/autoload/ledger.vim
@@ -25,7 +25,7 @@ function! ledger#transaction_state_toggle(lnum, ...) abort
 endf
 
 function! ledger#transaction_state_set(lnum, char) abort
-  " modifies or sets the state of the transaction at the cursor,
+  " modifies or sets the state of the transaction at the given line no.,
   " removing the state altogether if a:char is empty
   let trans = s:transaction.from_lnum(a:lnum)
   if empty(trans) || has_key(trans, 'expr')
@@ -130,7 +130,7 @@ function! ledger#transaction_post_state_set(lnum, char) abort
     return
   endif
 
-  let line = getline('.')
+  let line = getline(a:lnum)
   if a:char =~# '^\s*$'
     let newline = substitute(line, '\V' . state . '\m[ \t]', '', '')
   elseif state ==# ' '
@@ -457,10 +457,20 @@ endf
 
 " Return character position of decimal separator (multibyte safe)
 function! s:decimalpos(expr) abort
-  let pos = match(a:expr, '\V' . g:ledger_decimal_sep)
-  if pos > 0
-    let pos = strchars(a:expr[:pos]) - 1
-  endif
+  " Remove trailing comments
+  let l:expr = substitute(a:expr, '\v +;.*$', '', '')
+  " Find first or last possible decimal separator candidate
+  if g:ledger_align_last
+    let pos = matchend(l:expr, '\v.*[' . g:ledger_decimal_sep . ']')
+    if pos > 0
+      let pos = strchars(a:expr[:pos]) + 1
+    endif
+  else
+    let pos = match(l:expr, '\v[' . g:ledger_decimal_sep . ']')
+    if pos > 0
+      let pos = strchars(a:expr[:pos]) - 1
+    endif
+  end
   return pos
 endf
 
@@ -544,6 +554,10 @@ function! ledger#align_amount_at_cursor() abort
   endif
 endf
 
+function! ledger#align_formatexpr(lnum, count) abort
+  execute a:lnum . ',' . (a:lnum + a:count - 1) . 'call ledger#align_commodity()'
+endfunction
+
 " Report generation {{{1
 
 " Helper functions and variables {{{2
@@ -732,8 +746,6 @@ function! ledger#register(file, args) abort
 endf
 
 " Reconcile the given account.
-" This function accepts a file path as a third optional argument.
-" The default is to use the value of g:ledger_main.
 "
 " Parameters:
 " file  The file to be processed
diff --git a/autoload/polyglot/init.vim b/autoload/polyglot/init.vim
index 45e9aab2a..9e991f369 100644
--- a/autoload/polyglot/init.vim
+++ b/autoload/polyglot/init.vim
@@ -1775,7 +1775,7 @@ if !has_key(g:polyglot_is_disabled, 'prolog')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'bzl')
-  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE setf bzl
+  au BufNewFile,BufRead *.BUILD,*.bazel,*.bzl,*.star,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE setf bzl
 endif
 
 if !has_key(g:polyglot_is_disabled, 'odin')
@@ -1783,7 +1783,7 @@ if !has_key(g:polyglot_is_disabled, 'odin')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'dosini')
-  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*.url,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}flake8,{.,}npmrc,buildozer.spec setf dosini
+  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*.url,*/etc/pacman.conf,*/etc/yum.conf,{.,}coveragerc,{.,}editorconfig,{.,}flake8,{.,}npmrc,{.,}pylintrc,buildozer.spec,pylintrc setf dosini
   au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
   au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
 endif
@@ -1873,7 +1873,7 @@ if !has_key(g:polyglot_is_disabled, 'unison')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'typescript')
-  au BufNewFile,BufRead *.ts setf typescript
+  au BufNewFile,BufRead *.cts,*.mts,*.ts setf typescript
   au BufNewFile,BufRead *.tsx setf typescriptreact
 endif
 
@@ -2233,7 +2233,7 @@ if !has_key(g:polyglot_is_disabled, 'jsonnet')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'json')
-  au BufNewFile,BufRead *.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}auto-changelog,{.,}c8rc,{.,}htmlhintrc,{.,}imgbotconfig,{.,}nycrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
+  au BufNewFile,BufRead *.4DForm,*.4DProject,*.JSON-tmLanguage,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.json,*.jsonl,*.jsonp,*.mcmeta,*.template,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,{.,}arcconfig,{.,}auto-changelog,{.,}c8rc,{.,}htmlhintrc,{.,}imgbotconfig,{.,}nycrc,{.,}tern-config,{.,}tern-project,{.,}watchmanconfig,Pipfile.lock,composer.lock,mcmod.info setf json
 endif
 
 if !has_key(g:polyglot_is_disabled, 'json5')
@@ -2358,10 +2358,6 @@ if !has_key(g:polyglot_is_disabled, 'git')
   au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
 endif
 
-if !has_key(g:polyglot_is_disabled, 'gdscript')
-  au BufNewFile,BufRead *.gd setf gdscript3
-endif
-
 if !has_key(g:polyglot_is_disabled, 'fsharp')
   au! BufNewFile,BufRead,BufWritePost *.fs call polyglot#detect#Fs()
   au BufNewFile,BufRead *.fsi,*.fsx setf fsharp
@@ -2464,7 +2460,7 @@ if !has_key(g:polyglot_is_disabled, 'coffee-script')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'markdown')
-  au BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.scd,*.workbook,contents.lr setf markdown
+  au BufNewFile,BufRead *.livemd,*.markdown,*.md,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.scd,*.workbook,contents.lr setf markdown
 endif
 
 if !has_key(g:polyglot_is_disabled, 'cmake')
@@ -2472,7 +2468,7 @@ if !has_key(g:polyglot_is_disabled, 'cmake')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'clojure')
-  au BufNewFile,BufRead *.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config setf clojure
+  au BufNewFile,BufRead *.bb,*.boot,*.cl2,*.clj,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.edn,*.hic,build.boot,profile.boot,riemann.config setf clojure
 endif
 
 if !has_key(g:polyglot_is_disabled, 'carp')
@@ -2583,7 +2579,7 @@ if !has_key(g:polyglot_is_disabled, 'ant')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'xml')
-  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axaml,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.hzp,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
+  au BufNewFile,BufRead *.adml,*.admx,*.ant,*.axaml,*.axml,*.builds,*.ccproj,*.ccxml,*.cdxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.csproj.user,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.hzp,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.qhelp,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.tpm,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wpl,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*/etc/blkid.tab,*/etc/blkid.tab.old,*/etc/xdg/menus/*.menu,*fglrxrc,{.,}classpath,{.,}cproject,{.,}project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config setf xml
 endif
 
 if !has_key(g:polyglot_is_disabled, 'csv')
diff --git a/autoload/polyglot/shebang.vim b/autoload/polyglot/shebang.vim
index a8f103484..31b975681 100644
--- a/autoload/polyglot/shebang.vim
+++ b/autoload/polyglot/shebang.vim
@@ -462,6 +462,7 @@ endfunc
 let s:interpreters = {
   \ 'osascript': 'applescript',
   \ 'tcc': 'c',
+  \ 'bb': 'clojure',
   \ 'coffee': 'coffee',
   \ 'crystal': 'crystal',
   \ 'dart': 'dart',
diff --git a/autoload/polyglot/sleuth.vim b/autoload/polyglot/sleuth.vim
index ba166bf78..5eb946e13 100644
--- a/autoload/polyglot/sleuth.vim
+++ b/autoload/polyglot/sleuth.vim
@@ -55,7 +55,7 @@ let s:globs = {
   \ 'brewfile': 'Brewfile',
   \ 'bsdl': '*.bsdl,*bsd',
   \ 'bst': '*.bst',
-  \ 'bzl': '*.bzl,*.bazel,*.BUILD,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE',
+  \ 'bzl': '*.bzl,*.star,*.bazel,*.BUILD,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE',
   \ 'bzr': 'bzr_log.*',
   \ 'c': '*.c,*.cats,*.h,*.idc,*.qc',
   \ 'cabal': '*.cabal',
@@ -75,7 +75,7 @@ let s:globs = {
   \ 'chordpro': '*.chopro,*.crd,*.cho,*.crdpro,*.chordpro',
   \ 'cl': '*.eni',
   \ 'clean': '*.dcl,*.icl',
-  \ 'clojure': '*.clj,*.boot,*.cl2,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.hic,*.edn,riemann.config,build.boot,profile.boot',
+  \ 'clojure': '*.clj,*.bb,*.boot,*.cl2,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.hic,*.edn,riemann.config,build.boot,profile.boot',
   \ 'cmake': '*.cmake,*.cmake.in,CMakeLists.txt',
   \ 'cmod': '*.cmod',
   \ 'cmusrc': '',
@@ -130,7 +130,7 @@ let s:globs = {
   \ 'dnsmasq': '',
   \ 'dockerfile': '*.Dockerfile,*.dock,Containerfile,Dockerfile,dockerfile,Dockerfile*',
   \ 'dosbatch': '*.bat,*.sys',
-  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,*.url,.flake8,buildozer.spec,.editorconfig,.npmrc,php.ini-*',
+  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,*.url,.coveragerc,.flake8,.pylintrc,buildozer.spec,pylintrc,.editorconfig,.npmrc,php.ini-*',
   \ 'dot': '*.dot,*.gv',
   \ 'dracula': '*.drac,*.drc,*lvs,*lpe,drac.*',
   \ 'dsdl': '*.sdl',
@@ -181,7 +181,6 @@ let s:globs = {
   \ 'fvwm': '',
   \ 'gdb': '.gdbinit',
   \ 'gdmo': '*.mo,*.gdmo',
-  \ 'gdscript3': '*.gd',
   \ 'gedcom': '*.ged,lltxxxxx.txt',
   \ 'gitcommit': 'COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG',
   \ 'gitconfig': '*.gitconfig,.gitconfig,.gitmodules',
@@ -263,7 +262,7 @@ let s:globs = {
   \ 'jovial': '*.jov,*.j73,*.jovial',
   \ 'jproperties': '*.properties,*.properties_??,*.properties_??_??,*.properties_??_??_*',
   \ 'jq': '*.jq,.jqrc,.jqrc*',
-  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.auto-changelog,.c8rc,.htmlhintrc,.imgbotconfig,.nycrc,.tern-config,.tern-project,.watchmanconfig,Pipfile.lock,composer.lock,mcmod.info',
+  \ 'json': '*.json,*.4DForm,*.4DProject,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.auto-changelog,.c8rc,.htmlhintrc,.imgbotconfig,.nycrc,.tern-config,.tern-project,.watchmanconfig,Pipfile.lock,composer.lock,mcmod.info',
   \ 'json5': '*.json5',
   \ 'jsonc': '*.cjson,*.jsonc,coc-settings.json,.eslintrc.json,.babelrc,.jshintrc,.jslintrc,.mocharc.json,coffeelint.json,tsconfig.json,jsconfig.json',
   \ 'jsonnet': '*.jsonnet,*.libsonnet',
@@ -321,7 +320,7 @@ let s:globs = {
   \ 'mallard': '*.page',
   \ 'manconf': 'man.config',
   \ 'maple': '*.mv,*.mpl,*.mws',
-  \ 'markdown': '*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.scd,*.workbook,contents.lr',
+  \ 'markdown': '*.md,*.livemd,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.scd,*.workbook,contents.lr',
   \ 'markdown.mdx': '*.mdx',
   \ 'mason': '*.mason,*.mhtml,*.comp',
   \ 'master': '*.mas,*.master',
@@ -568,7 +567,7 @@ let s:globs = {
   \ 'tt2': '*.tt2',
   \ 'tt2html': '*.tt2',
   \ 'tutor': '*.tutor',
-  \ 'typescript': '*.ts',
+  \ 'typescript': '*.ts,*.cts,*.mts',
   \ 'typescriptreact': '*.tsx',
   \ 'uc': '*.uc',
   \ 'udevconf': '',
@@ -614,7 +613,7 @@ let s:globs = {
   \ 'xhtml': '*.xhtml,*.xht',
   \ 'xinetd': '',
   \ 'xmath': '*.msc,*.msf',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axaml,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.hzp,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axaml,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.hzp,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.psc1,*.pt,*.qhelp,*.rdf,*.res,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xmp,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config,*fglrxrc',
   \ 'xml.twig': '*.xml.twig',
   \ 'xmodmap': '*Xmodmap,*xmodmap*',
   \ 'xpm': '*.xpm,*.pm',
diff --git a/autoload/requirements.vim b/autoload/requirements.vim
index 3d7837945..1132d7b27 100644
--- a/autoload/requirements.vim
+++ b/autoload/requirements.vim
@@ -2,35 +2,47 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'requirements', 'autoload/requ
   finish
 endif
 
-" the Requirements File Format syntax support for Vim
-" Version: 1.6.0
-" Author:  raimon <raimon49@hotmail.com>
-" License: MIT LICENSE
-" The MIT License (MIT)
-"
-" Copyright (c) 2015 raimon
-"
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to deal
-" in the Software without restriction, including without limitation the rights
-" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-" copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in all
-" copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-" SOFTWARE.
+""
+" @section Introduction, intro
+" @library
+" <doc/@plugin(name).txt> is generated by <https://github.com/google/vimdoc>.
+" See <README.md> for more information about installation and screenshots.
 
-let s:save_cpo = &cpo
-set cpo&vim
+""
+" Update cache.
+function! requirements#update_cache() abort
+    let s:items = []
+    let l:pip_items = split(system('COMP_WORDS="pip install -" COMP_CWORD=2 PIP_AUTO_COMPLETE=1 pip'))
+    let l:pypi_items = split(system('pip-cache pkgnames'))
+    for l:item in l:pip_items
+        let s:items += [{'word': l:item, 'menu': 'pip'}]
+    endfor
+    for l:item in l:pypi_items
+        let s:items += [{'word': l:item, 'menu': 'pypi'}]
+    endfor
+    call writefile([json_encode(s:items)], s:cache)
+endfunction
 
-let &cpo = s:save_cpo
-unlet s:save_cpo
+if exists('*stdpath')
+    let s:cache_dir_home = stdpath('cache')
+else
+    let s:cache_dir_home = $HOME . '/.cache/nvim'
+endif
+let s:cache_dir = s:cache_dir_home . '/requirements.vim'
+call mkdir(s:cache_dir, 'p')
+""
+" Completion cache path.
+call g:requirements#utils#plugin.Flag('g:requirements#cache',
+            \ s:cache_dir . '/requirements.json'
+            \ )
+let s:cache = g:requirements#cache
+try
+    let s:items = json_decode(readfile(s:cache)[0])
+catch /\v^Vim%(\(\a+\))?:E(684|484|491):/
+    call requirements#update_cache()
+    let s:items = json_decode(readfile(s:cache)[0])
+endtry
+""
+" Completion cache contents. For program.
+call g:requirements#utils#plugin.Flag('g:requirements#items', s:items)
 " vim: et sw=4 ts=4 sts=4:
diff --git a/autoload/requirements/utils.vim b/autoload/requirements/utils.vim
new file mode 100644
index 000000000..963ecb719
--- /dev/null
+++ b/autoload/requirements/utils.vim
@@ -0,0 +1,15 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'requirements', 'autoload/requirements/utils.vim')
+  finish
+endif
+
+""
+" @section Configuration, config
+
+function! s:Flag(name, default) abort
+    let l:scope = get(split(a:name, ':'), 0, 'g:')
+    let l:name = get(split(a:name, ':'), -1)
+    let {l:scope}:{l:name} = get({l:scope}:, l:name, a:default)
+endfunction
+
+let g:requirements#utils#plugin = {'Flag': funcref('s:Flag')}
+" vim: et sw=4 ts=4 sts=4:
diff --git a/compiler/cargo.vim b/compiler/cargo.vim
index d56612f2c..f5854a4d1 100644
--- a/compiler/cargo.vim
+++ b/compiler/cargo.vim
@@ -38,10 +38,12 @@ augroup END
 " Ignore general cargo progress messages
 CompilerSet errorformat+=
             \%-G%\\s%#Downloading%.%#,
+            \%-G%\\s%#Checking%.%#,
             \%-G%\\s%#Compiling%.%#,
             \%-G%\\s%#Finished%.%#,
             \%-G%\\s%#error:\ Could\ not\ compile\ %.%#,
             \%-G%\\s%#To\ learn\ more\\,%.%#,
+            \%-G%\\s%#For\ more\ information\ about\ this\ error\\,%.%#,
             \%-Gnote:\ Run\ with\ \`RUST_BACKTRACE=%.%#,
             \%.%#panicked\ at\ \\'%m\\'\\,\ %f:%l:%c
 
diff --git a/compiler/pip_compile.vim b/compiler/pip_compile.vim
new file mode 100644
index 000000000..5b6b29d5e
--- /dev/null
+++ b/compiler/pip_compile.vim
@@ -0,0 +1,49 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'requirements', 'compiler/pip_compile.vim')
+  finish
+endif
+
+" the Requirements File Format syntax support for Vim
+" Version: 1.7.1
+" Author:  raimon <raimon49@hotmail.com>
+" License: MIT LICENSE
+" The MIT License (MIT)
+"
+" Copyright (c) 2015 raimon
+"
+" Permission is hereby granted, free of charge, to any person obtaining a copy
+" of this software and associated documentation files (the "Software"), to deal
+" in the Software without restriction, including without limitation the rights
+" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+" copies of the Software, and to permit persons to whom the Software is
+" furnished to do so, subject to the following conditions:
+"
+" The above copyright notice and this permission notice shall be included in all
+" copies or substantial portions of the Software.
+"
+" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+" SOFTWARE.
+
+if exists('b:current_compiler')
+    finish
+endif
+let b:current_compiler = 'pip_compile'
+
+let s:save_cpoptions = &cpoptions
+set cpoptions&vim
+
+if exists(':CompilerSet') != 2
+    command -nargs=* CompilerSet setlocal <args>
+endif
+CompilerSet makeprg=pip-compile\ %:S
+CompilerSet errorformat=%ECould\ not\ find\ a\ version\ that\ matches\ %o\ (from\ -r\ %f\ (line\ %l)),
+            \%C%m,
+            \%Z,
+            \%-G%.%#
+let &cpoptions = s:save_cpoptions
+unlet s:save_cpoptions
+" vim: et sw=4 ts=4 sts=4:
diff --git a/extras/jsdoc.vim b/extras/jsdoc.vim
index 369027c40..1acbb0216 100644
--- a/extras/jsdoc.vim
+++ b/extras/jsdoc.vim
@@ -22,7 +22,8 @@ syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRe
 syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
 syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
 syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.\{-}]\|=\)\+"
+syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\~\|\.\|:\|\/\|\[.\{-}]\|=\)\+"
+
 syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 
 if version >= 508 || !exists("did_javascript_syn_inits")
diff --git a/ftplugin/caddyfile.vim b/ftplugin/caddyfile.vim
index b3e48a088..ae45e27e2 100644
--- a/ftplugin/caddyfile.vim
+++ b/ftplugin/caddyfile.vim
@@ -2,8 +2,9 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'caddyfile', 'ftplugin/caddyfi
   finish
 endif
 
-" Language:	    Caddyfile
-" Author:	    Josh Glendenning <josh@isobit.io>
+" Language:			Caddyfile
+" Maintainer:		0az <0az@afzhou.com>
+" Original Author:	Josh Glendenning <josh@isobit.io>
 
 if exists('b:did_ftplugin')
 	finish
@@ -20,7 +21,7 @@ if exists('g:NERDDelimiterMap')
 	endif
 elseif exists('g:NERDCustomDelimiters')
 	if !has_key(g:NERDCustomDelimiters, 'caddyfile')
-		let g:NERDDelimiterMap.caddyfile = s:delimiters
+		let g:NERDCustomDelimiters.caddyfile = s:delimiters
 	endif
 else
 	let g:NERDCustomDelimiters = {'caddyfile': s:delimiters}
diff --git a/ftplugin/erlang.vim b/ftplugin/erlang.vim
index 85f572095..d9a7eaeb1 100644
--- a/ftplugin/erlang.vim
+++ b/ftplugin/erlang.vim
@@ -9,7 +9,8 @@ endif
 " Contributors: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
 "               Eduardo Lopez (http://github.com/tapichu)
 "               Arvid Bjurklint (http://github.com/slarwise)
-" Last Update:  2021-Jan-08
+"               Paweł Zacharek (http://github.com/subc2)
+" Last Update:  2022-Sep-28
 " License:      Vim license
 " URL:          https://github.com/vim-erlang/vim-erlang-runtime
 
@@ -61,7 +62,7 @@ setlocal suffixesadd=.erl,.hrl
 let &l:include = '^\s*-\%(include\|include_lib\)\s*("\zs\f*\ze")'
 let &l:define  = '^\s*-\%(define\|record\|type\|opaque\)'
 
-let s:erlang_fun_begin = '^\a\w*(.*$'
+let s:erlang_fun_begin = '^\l[A-Za-z0-9_@]*(.*$'
 let s:erlang_fun_end   = '^[^%]*\.\s*\(%.*\)\?$'
 
 if !exists('*GetErlangFold')
@@ -103,6 +104,23 @@ let b:undo_ftplugin = "setlocal keywordprg< foldmethod< foldexpr< foldtext<"
       \ . " comments< commentstring< formatoptions< suffixesadd< include<"
       \ . " define<"
 
+" The following lines enable the macros/matchit.vim plugin for
+" extended matching with the % key.
+if exists("loaded_matchit")
+  let s:sw = &sw
+  if exists('*shiftwidth')
+    let s:sw = shiftwidth()
+  endif
+
+  let b:match_words =
+    \ '\<\%(begin\|case\|fun\|if\|maybe\|receive\|try\)\>' .
+    \ ':\<\%(after\|catch\|else\|of\)\>' .
+    \ ':\<end\>,' .
+    \ '^\l[A-Za-z0-9_@]*' .
+    \ ':^\%(\%(\t\| \{' . s:sw . '}\)\%([^\t\ %][^%]*\)\?\)\?;\s*\%(%.*\)\?$\|\.[\t\ %]\|\.$'
+  let b:match_skip = 's:comment\|string\|erlangmodifier\|erlangquotedatom'
+endif
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
diff --git a/ftplugin/eruby.vim b/ftplugin/eruby.vim
index 7ea19deab..33c769dd9 100644
--- a/ftplugin/eruby.vim
+++ b/ftplugin/eruby.vim
@@ -89,8 +89,12 @@ runtime! ftplugin/ruby.vim ftplugin/ruby_*.vim ftplugin/ruby/*.vim
 let b:did_ftplugin = 1
 
 " Combine the new set of values with those previously included.
-if exists("b:undo_ftplugin")
-  let s:undo_ftplugin = b:undo_ftplugin . " | " . s:undo_ftplugin
+if !exists('b:undo_ftplugin')
+  " No-op
+  let b:undo_ftplugin = 'exe'
+endif
+if !empty(s:undo_ftplugin)
+  let b:undo_ftplugin .= '|' . s:undo_ftplugin
 endif
 if exists ("b:browsefilter")
   let s:browsefilter = substitute(b:browsefilter,'\cAll Files (\*\.\*)\t\*\.\*\n','','') . s:browsefilter
@@ -122,7 +126,7 @@ endif
 setlocal commentstring=<%#%s%>
 
 let b:undo_ftplugin = "setl cms< " .
-      \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
+      \ " | unlet! b:browsefilter b:match_words | " . b:undo_ftplugin
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/ftplugin/gitcommit.vim b/ftplugin/gitcommit.vim
index 56e72973a..bcd823567 100644
--- a/ftplugin/gitcommit.vim
+++ b/ftplugin/gitcommit.vim
@@ -5,7 +5,7 @@ endif
 " Vim filetype plugin
 " Language:	git commit file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2019 Dec 05
+" Last Change:	2022 Jan 05
 
 " Only do this when not done yet for this buffer
 if (exists("b:did_ftplugin"))
@@ -16,7 +16,7 @@ let b:did_ftplugin = 1
 
 setlocal nomodeline tabstop=8 formatoptions+=tl textwidth=72
 setlocal formatoptions-=c formatoptions-=r formatoptions-=o formatoptions-=q formatoptions+=n
-setlocal formatlistpat+=\\\|^\\s*[-*+]\\s\\+
+setlocal formatlistpat=^\\s*\\d\\+[\\]:.)}]\\s\\+\\\|^\\s*[-*+]\\s\\+
 setlocal include=^+++
 setlocal includeexpr=substitute(v:fname,'^[bi]/','','')
 
@@ -46,6 +46,11 @@ function! s:diffcomplete(A, L, P) abort
   return args
 endfunction
 
+function! s:setupdiff() abort
+  command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0, <f-args>)
+  setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git
+endfunction
+
 function! s:gitdiffcached(bang, ...) abort
   let name = tempname()
   if a:0
@@ -54,8 +59,6 @@ function! s:gitdiffcached(bang, ...) abort
     let extra = "-p --stat=".&columns
   endif
   call system("git diff --cached --no-color --no-ext-diff ".extra." > ".shellescape(name))
-  exe "pedit " . fnameescape(name)
-  wincmd P
-  command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0, <f-args>)
-  setlocal buftype=nowrite nobuflisted noswapfile nomodifiable filetype=git
+  exe 'pedit +call\ s:setupdiff()' fnameescape(name)
+  silent! wincmd P
 endfunction
diff --git a/ftplugin/gitrebase.vim b/ftplugin/gitrebase.vim
index 285f76a41..f83280a1e 100644
--- a/ftplugin/gitrebase.vim
+++ b/ftplugin/gitrebase.vim
@@ -5,7 +5,7 @@ endif
 " Vim filetype plugin
 " Language:	git rebase --interactive
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2019 Dec 05
+" Last Change:	2022 Jan 05
 
 " Only do this when not done yet for this buffer
 if (exists("b:did_ftplugin"))
diff --git a/ftplugin/haml.vim b/ftplugin/haml.vim
index ec6f249d7..1dc83371c 100644
--- a/ftplugin/haml.vim
+++ b/ftplugin/haml.vim
@@ -5,7 +5,7 @@ endif
 " Vim filetype plugin
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2016 Aug 29
+" Last Change:	2019 Dec 05
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/ftplugin/julia.vim b/ftplugin/julia.vim
index e33b1a42a..de9834661 100644
--- a/ftplugin/julia.vim
+++ b/ftplugin/julia.vim
@@ -26,10 +26,16 @@ setlocal fo-=t fo+=croql
 let b:julia_vim_loaded = 1
 
 let b:undo_ftplugin = "setlocal include< suffixesadd< comments< commentstring<"
+      \ . " expandtab< shiftwidth<"
       \ . " define< fo< indentexpr< indentkeys< cinoptions< completefunc<"
       \ . " | unlet! b:commentary_format"
       \ . " | unlet! b:smartcomment_force_linemode"
       \ . " | unlet! b:julia_vim_loaded"
+      
+if !exists("g:julia_set_indentation") || g:julia_set_indentation != 0
+    " As suggested by Style Guide.
+    setlocal expandtab shiftwidth=4
+endif
 
 " MatchIt plugin support
 if exists("loaded_matchit")
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index d3129a876..a0474d945 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -860,7 +860,11 @@ endfunction
 
 
 function! s:MarkdownRefreshSyntax(force)
-    if &filetype =~# 'markdown' && line('$') > 1
+    " Use != to compare &syntax's value to use the same logic run on
+    " $VIMRUNTIME/syntax/synload.vim.
+    "
+    " vint: next-line -ProhibitEqualTildeOperator
+    if &filetype =~# 'markdown' && line('$') > 1 && &syntax != 'OFF'
         call s:MarkdownHighlightSources(a:force)
     endif
 endfunction
diff --git a/ftplugin/mir.vim b/ftplugin/mir.vim
new file mode 100644
index 000000000..332e3272b
--- /dev/null
+++ b/ftplugin/mir.vim
@@ -0,0 +1,17 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'ftplugin/mir.vim')
+  finish
+endif
+
+" Vim filetype plugin file
+" Language: LLVM Machine IR
+" Maintainer: The LLVM team, http://llvm.org/
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal softtabstop=2 shiftwidth=2
+setlocal expandtab
+setlocal comments+=:;
+
diff --git a/ftplugin/ps1.vim b/ftplugin/ps1.vim
index e7c1a8533..82e184691 100644
--- a/ftplugin/ps1.vim
+++ b/ftplugin/ps1.vim
@@ -17,7 +17,7 @@ let b:did_ftplugin = 1
 
 setlocal tw=0
 setlocal commentstring=#%s
-setlocal formatoptions=tcqro
+setlocal formatoptions+=tcqroj
 " Enable autocompletion of hyphenated PowerShell commands,
 " e.g. Get-Content or Get-ADUser
 setlocal iskeyword+=-
diff --git a/after/ftplugin/requirements.vim b/ftplugin/requirements.vim
similarity index 76%
rename from after/ftplugin/requirements.vim
rename to ftplugin/requirements.vim
index 5097952c3..b79e55e70 100644
--- a/after/ftplugin/requirements.vim
+++ b/ftplugin/requirements.vim
@@ -1,9 +1,9 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'requirements', 'after/ftplugin/requirements.vim')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'requirements', 'ftplugin/requirements.vim')
   finish
 endif
 
 " the Requirements File Format syntax support for Vim
-" Version: 1.6.0
+" Version: 1.7.1
 " Author:  raimon <raimon49@hotmail.com>
 " License: MIT LICENSE
 " The MIT License (MIT)
@@ -27,16 +27,20 @@ endif
 " LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 " OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 " SOFTWARE.
-if executable('pip-compile')
-    let s:filename = expand("%:p")
-    if fnamemodify(s:filename, ":t") ==# 'requirements.in'
-        " this is the default filename for pip-compile
-        setlocal makeprg=pip-compile
-    elseif fnamemodify(s:filename, ":e") ==# 'in'
-        \ && Requirements_matched_filename(s:filename)
-        setlocal makeprg=pip-compile\ %
-    endif
+if exists("b:did_ftplugin")
+  finish
 endif
+let b:did_ftplugin = 1
+
+let s:save_cpoptions = &cpoptions
+set cpoptions&vim
 
+let b:undo_ftplugin = "setl iskeyword< commentstring<"
+" pip options contain "-"
+setlocal iskeyword+=-
 setlocal commentstring=#\ %s
+compiler pip_compile
+
+let &cpoptions = s:save_cpoptions
+unlet s:save_cpoptions
 " vim: et sw=4 ts=4 sts=4:
diff --git a/ftplugin/zig.vim b/ftplugin/zig.vim
index 1e6f91b3a..a2921a9b0 100644
--- a/ftplugin/zig.vim
+++ b/ftplugin/zig.vim
@@ -54,6 +54,13 @@ endif
 let b:undo_ftplugin =
     \ 'setl isk< et< ts< sts< sw< fo< sua< mp< com< cms< inex< inc< pa<'
 
+augroup vim-zig
+    autocmd! * <buffer>
+    autocmd BufWritePre <buffer> if get(g:, 'zig_fmt_autosave', 1) | call zig#fmt#Format() | endif
+augroup END
+
+let b:undo_ftplugin .= '|au! vim-zig * <buffer>'
+
 let &cpo = s:cpo_orig
 unlet s:cpo_orig
 " vim: tabstop=8 shiftwidth=4 softtabstop=4 expandtab
diff --git a/indent/clojure.vim b/indent/clojure.vim
index c60693241..583df7dd6 100644
--- a/indent/clojure.vim
+++ b/indent/clojure.vim
@@ -55,6 +55,10 @@ if exists("*searchpairpos")
 		let g:clojure_align_subforms = 0
 	endif
 
+	if !exists('g:clojure_cljfmt_compat')
+		let g:clojure_cljfmt_compat = 0
+	endif
+
 	function! s:syn_id_name()
 		return synIDattr(synID(line("."), col("."), 0), "name")
 	endfunction
@@ -326,9 +330,16 @@ if exists("*searchpairpos")
 				return [paren[0], paren[1] + (g:clojure_align_subforms ? 0 : &shiftwidth - 1)]
 			elseif w[1] == '_'
 				return paren
+			elseif w[1] == "'" && g:clojure_cljfmt_compat
+				return paren
 			endif
 		endif
 
+		" Paren indent for keywords, symbols and derefs
+		if g:clojure_cljfmt_compat && w[0] =~# "[:@']"
+			return paren
+		endif
+
 		" Test words without namespace qualifiers and leading reader macro
 		" metacharacters.
 		"
diff --git a/indent/dart.vim b/indent/dart.vim
index 4f08a36f0..f685cfa7f 100644
--- a/indent/dart.vim
+++ b/indent/dart.vim
@@ -8,7 +8,12 @@ endif
 let b:did_indent = 1
 
 setlocal cindent
-setlocal cinoptions+=j1,J1,(2s,u2s,U1,m1,+2s
+setlocal cinoptions+=j1,J1,U1,m1,+2s
+if get(g:, 'dart_trailing_comma_indent', v:false)
+  setlocal cinoptions+=(2s,u2s
+else
+  setlocal cinoptions+=(s,us
+endif
 
 setlocal indentexpr=DartIndent()
 
diff --git a/indent/erlang.vim b/indent/erlang.vim
index adfd0dd93..8a24126e7 100644
--- a/indent/erlang.vim
+++ b/indent/erlang.vim
@@ -8,7 +8,7 @@ endif
 " Contributors: Edwin Fine <efine145_nospam01 at usa dot net>
 "               Pawel 'kTT' Salata <rockplayer.pl@gmail.com>
 "               Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
-" Last Update:  2020-Jun-11
+" Last Update:  2022-Sep-06
 " License:      Vim license
 " URL:          https://github.com/vim-erlang/vim-erlang-runtime
 
@@ -34,7 +34,7 @@ else
 endif
 
 setlocal indentexpr=ErlangIndent()
-setlocal indentkeys+=0=end,0=of,0=catch,0=after,0=when,0=),0=],0=},0=>>
+setlocal indentkeys+=0=end,0=of,0=catch,0=after,0=else,0=when,0=),0=],0=},0=>>
 
 let b:undo_indent = "setl inde< indk<"
 
@@ -241,8 +241,8 @@ function! s:GetTokensFromLine(line, string_continuation, atom_continuation,
 
     " Two-character tokens
     elseif i + 1 < linelen &&
-         \ index(['->', '<<', '>>', '||', '==', '/=', '=<', '>=', '++', '--',
-         \        '::'],
+         \ index(['->', '<<', '>>', '||', '==', '/=', '=<', '>=', '?=', '++',
+         \        '--', '::'],
          \       a:line[i : i + 1]) != -1
       call add(indtokens, [a:line[i : i + 1], vcol, i])
       let next_i = i + 2
@@ -564,8 +564,8 @@ function! s:IsCatchStandalone(lnum, i)
     let is_standalone = 0
   elseif prev_token =~# '[a-z]'
     if index(['after', 'and', 'andalso', 'band', 'begin', 'bnot', 'bor', 'bsl',
-            \ 'bsr', 'bxor', 'case', 'catch', 'div', 'not', 'or', 'orelse',
-            \ 'rem', 'try', 'xor'], prev_token) != -1
+            \ 'bsr', 'bxor', 'case', 'catch', 'div', 'maybe', 'not', 'or',
+            \ 'orelse', 'rem', 'try', 'xor'], prev_token) != -1
       " If catch is after these keywords, it is standalone
       let is_standalone = 1
     else
@@ -574,7 +574,7 @@ function! s:IsCatchStandalone(lnum, i)
       "
       " Keywords:
       " - may precede 'catch': end
-      " - may not precede 'catch': fun if of receive when
+      " - may not precede 'catch': else fun if of receive when
       " - unused: cond let query
       let is_standalone = 0
     endif
@@ -583,7 +583,7 @@ function! s:IsCatchStandalone(lnum, i)
     let is_standalone = 0
   else
     " This 'else' branch includes the following tokens:
-    "   -> == /= =< < >= > =:= =/= + - * / ++ -- :: < > ; ( [ { ? = ! . |
+    "   -> == /= =< < >= > ?= =:= =/= + - * / ++ -- :: < > ; ( [ { ? = ! . |
     let is_standalone = 1
   endif
 
@@ -596,6 +596,7 @@ endfunction
 " Purpose:
 "   This function is called when a begin-type element ('begin', 'case',
 "   '[', '<<', etc.) is found. It asks the caller to return if the stack
+"   if already empty.
 " Parameters:
 "   stack: [token]
 "   token: string
@@ -764,7 +765,7 @@ endfunction
 function! s:SearchEndPair(lnum, curr_col)
   return s:SearchPair(
          \ a:lnum, a:curr_col,
-         \ '\C\<\%(case\|try\|begin\|receive\|if\)\>\|' .
+         \ '\C\<\%(case\|try\|begin\|receive\|if\|maybe\)\>\|' .
          \ '\<fun\>\%(\s\|\n\|%.*$\|[A-Z_@][a-zA-Z_@]*\)*(',
          \ '',
          \ '\<end\>')
@@ -853,6 +854,7 @@ function! s:ErlangCalcIndent2(lnum, stack)
         if ret | return res | endif
 
       " case EXPR of BRANCHES end
+      " if BRANCHES end
       " try EXPR catch BRANCHES end
       " try EXPR after BODY end
       " try EXPR catch BRANCHES after BODY end
@@ -861,15 +863,17 @@ function! s:ErlangCalcIndent2(lnum, stack)
       " try EXPR of BRANCHES catch BRANCHES after BODY end
       " receive BRANCHES end
       " receive BRANCHES after BRANCHES end
+      " maybe EXPR end
+      " maybe EXPR else BRANCHES end
 
       " This branch is not Emacs-compatible
-      elseif (index(['of', 'receive', 'after', 'if'], token) != -1 ||
+      elseif (index(['of', 'receive', 'after', 'if', 'else'], token) != -1 ||
            \  (token ==# 'catch' && !s:IsCatchStandalone(lnum, i))) &&
            \ !last_token_of_line &&
            \ (empty(stack) || stack ==# ['when'] || stack ==# ['->'] ||
            \  stack ==# ['->', ';'])
 
-        " If we are after of/receive, but these are not the last
+        " If we are after of/receive/etc, but these are not the last
         " tokens of the line, we want to indent like this:
         "
         "   % stack == []
@@ -895,21 +899,21 @@ function! s:ErlangCalcIndent2(lnum, stack)
         " stack = ['when']  =>  LTI is a guard
         if empty(stack) || stack == ['->', ';']
           call s:Log('    LTI is in a condition after ' .
-                    \'"of/receive/after/if/catch" -> return')
+                    \'"of/receive/after/if/else/catch" -> return')
           return stored_vcol
         elseif stack == ['->']
           call s:Log('    LTI is in a branch after ' .
-                    \'"of/receive/after/if/catch" -> return')
+                    \'"of/receive/after/if/else/catch" -> return')
           return stored_vcol + shiftwidth()
         elseif stack == ['when']
           call s:Log('    LTI is in a guard after ' .
-                    \'"of/receive/after/if/catch" -> return')
+                    \'"of/receive/after/if/else/catch" -> return')
           return stored_vcol + shiftwidth()
         else
           return s:UnexpectedToken(token, stack)
         endif
 
-      elseif index(['case', 'if', 'try', 'receive'], token) != -1
+      elseif index(['case', 'if', 'try', 'receive', 'maybe'], token) != -1
 
         " stack = []  =>  LTI is a condition
         " stack = ['->']  =>  LTI is a branch
@@ -919,45 +923,47 @@ function! s:ErlangCalcIndent2(lnum, stack)
           " pass
         elseif (token ==# 'case' && stack[0] ==# 'of') ||
              \ (token ==# 'if') ||
+             \ (token ==# 'maybe' && stack[0] ==# 'else') ||
              \ (token ==# 'try' && (stack[0] ==# 'of' ||
              \                     stack[0] ==# 'catch' ||
              \                     stack[0] ==# 'after')) ||
              \ (token ==# 'receive')
 
           " From the indentation point of view, the keyword
-          " (of/catch/after/end) before the LTI is what counts, so
+          " (of/catch/after/else/end) before the LTI is what counts, so
           " when we reached these tokens, and the stack already had
-          " a catch/after/end, we didn't modify it.
+          " a catch/after/else/end, we didn't modify it.
           "
-          " This way when we reach case/try/receive (i.e. now),
-          " there is at most one of/catch/after/end token in the
+          " This way when we reach case/try/receive/maybe (i.e. now),
+          " there is at most one of/catch/after/else/end token in the
           " stack.
           if token ==# 'case' || token ==# 'try' ||
-           \ (token ==# 'receive' && stack[0] ==# 'after')
+           \ (token ==# 'receive' && stack[0] ==# 'after') ||
+           \ (token ==# 'maybe' && stack[0] ==# 'else')
             call s:Pop(stack)
           endif
 
           if empty(stack)
             call s:Log('    LTI is in a condition; matching ' .
-                      \'"case/if/try/receive" found')
+                      \'"case/if/try/receive/maybe" found')
             let stored_vcol = curr_vcol + shiftwidth()
           elseif stack[0] ==# 'align_to_begin_element'
             call s:Pop(stack)
             let stored_vcol = curr_vcol
           elseif len(stack) > 1 && stack[0] ==# '->' && stack[1] ==# ';'
             call s:Log('    LTI is in a condition; matching ' .
-                      \'"case/if/try/receive" found')
+                      \'"case/if/try/receive/maybe" found')
             call s:Pop(stack)
             call s:Pop(stack)
             let stored_vcol = curr_vcol + shiftwidth()
           elseif stack[0] ==# '->'
             call s:Log('    LTI is in a branch; matching ' .
-                      \'"case/if/try/receive" found')
+                      \'"case/if/try/receive/maybe" found')
             call s:Pop(stack)
             let stored_vcol = curr_vcol + 2 * shiftwidth()
           elseif stack[0] ==# 'when'
             call s:Log('    LTI is in a guard; matching ' .
-                      \'"case/if/try/receive" found')
+                      \'"case/if/try/receive/maybe" found')
             call s:Pop(stack)
             let stored_vcol = curr_vcol + 2 * shiftwidth() + 2
           endif
@@ -1219,7 +1225,7 @@ function! s:ErlangCalcIndent2(lnum, stack)
 
         if empty(stack)
           call s:Push(stack, ';')
-        elseif index([';', '->', 'when', 'end', 'after', 'catch'],
+        elseif index([';', '->', 'when', 'end', 'after', 'catch', 'else'],
                     \stack[0]) != -1
           " Pass:
           "
@@ -1229,10 +1235,10 @@ function! s:ErlangCalcIndent2(lnum, stack)
           "   should keep that, because they signify the type of the
           "   LTI (branch, condition or guard).
           " - From the indentation point of view, the keyword
-          "   (of/catch/after/end) before the LTI is what counts, so
-          "   if the stack already has a catch/after/end, we don't
-          "   modify it. This way when we reach case/try/receive,
-          "   there will be at most one of/catch/after/end token in
+          "   (of/catch/after/else/end) before the LTI is what counts, so
+          "   if the stack already has a catch/after/else/end, we don't
+          "   modify it. This way when we reach case/try/receive/maybe,
+          "   there will be at most one of/catch/after/else/end token in
           "   the stack.
         else
           return s:UnexpectedToken(token, stack)
@@ -1248,7 +1254,8 @@ function! s:ErlangCalcIndent2(lnum, stack)
           " stack = ['->']  ->  LTI is a condition
           " stack = ['->', ';']  -> LTI is a branch
           call s:Push(stack, '->')
-        elseif index(['->', 'when', 'end', 'after', 'catch'], stack[0]) != -1
+        elseif index(['->', 'when', 'end', 'after', 'catch', 'else'],
+                    \stack[0]) != -1
           " Pass:
           "
           " - If the stack top is another '->', then one '->' is
@@ -1256,10 +1263,10 @@ function! s:ErlangCalcIndent2(lnum, stack)
           " - If the stack top is a 'when', then we should keep
           "   that, because this signifies that LTI is a in a guard.
           " - From the indentation point of view, the keyword
-          "   (of/catch/after/end) before the LTI is what counts, so
-          "   if the stack already has a catch/after/end, we don't
-          "   modify it. This way when we reach case/try/receive,
-          "   there will be at most one of/catch/after/end token in
+          "   (of/catch/after/else/end) before the LTI is what counts, so
+          "   if the stack already has a catch/after/else/end, we don't
+          "   modify it. This way when we reach case/try/receive/maybe,
+          "   there will be at most one of/catch/after/else/end token in
           "   the stack.
         else
           return s:UnexpectedToken(token, stack)
@@ -1289,7 +1296,8 @@ function! s:ErlangCalcIndent2(lnum, stack)
             "       LTI
             call s:Push(stack, token)
           endif
-        elseif index(['->', 'when', 'end', 'after', 'catch'], stack[0]) != -1
+        elseif index(['->', 'when', 'end', 'after', 'catch', 'else'],
+                    \stack[0]) != -1
           " Pass:
           " - If the stack top is another 'when', then one 'when' is
           "   enough.
@@ -1297,21 +1305,63 @@ function! s:ErlangCalcIndent2(lnum, stack)
           "   should keep that, because they signify the type of the
           "   LTI (branch, condition or guard).
           " - From the indentation point of view, the keyword
-          "   (of/catch/after/end) before the LTI is what counts, so
-          "   if the stack already has a catch/after/end, we don't
-          "   modify it. This way when we reach case/try/receive,
-          "   there will be at most one of/catch/after/end token in
+          "   (of/catch/after/else/end) before the LTI is what counts, so
+          "   if the stack already has a catch/after/else/end, we don't
+          "   modify it. This way when we reach case/try/receive/maybe,
+          "   there will be at most one of/catch/after/else/end token in
           "   the stack.
         else
           return s:UnexpectedToken(token, stack)
         endif
 
-      elseif token ==# 'of' || token ==# 'after' ||
+      elseif token ==# 'of' || token ==# 'after' || token ==# 'else' ||
            \ (token ==# 'catch' && !s:IsCatchStandalone(lnum, i))
 
-        if token ==# 'after'
-          " If LTI is between an 'after' and the corresponding
-          " 'end', then let's return
+        if token ==# 'after' || token ==# 'else'
+          " If LTI is between an after/else and the corresponding 'end', then
+          " let's return because calculating the indentation based on
+          " after/else is enough.
+          "
+          " Example:
+          "   receive A after
+          "                 LTI
+          "   maybe A else
+          "               LTI
+          "
+          " Note about Emacs compabitility {{{
+          "
+          " It would be fine to indent the examples above the following way:
+          "
+          "   receive A after
+          "       LTI
+          "   maybe A else
+          "       LTI
+          "
+          " We intend it the way above because that is how Emacs does it.
+          " Also, this is a bit faster.
+          "
+          " We are still not 100% Emacs compatible because of placing the
+          " 'end' after the indented blocks.
+          "
+          " Emacs example:
+          "
+          "   receive A after
+          "                 LTI
+          "             end,
+          "   maybe A else
+          "               LTI
+          "               end % Yes, it's here (in OTP 25.0, might change
+          "                   % later)
+          "
+          " vim-erlang example:
+          "
+          "   receive A after
+          "                 LTI
+          "   end,
+          "   maybe A else
+          "               LTI
+          "   end
+          " }}}
           let [ret, res] = s:BeginElementFoundIfEmpty(stack, token, curr_vcol,
                                                      \stored_vcol, shiftwidth())
           if ret | return res | endif
@@ -1319,7 +1369,8 @@ function! s:ErlangCalcIndent2(lnum, stack)
 
         if empty(stack) || stack[0] ==# '->' || stack[0] ==# 'when'
           call s:Push(stack, token)
-        elseif stack[0] ==# 'catch' || stack[0] ==# 'after' || stack[0] ==# 'end'
+        elseif stack[0] ==# 'catch' || stack[0] ==# 'after' ||
+              \stack[0] ==# 'else' || stack[0] ==# 'end'
           " Pass: From the indentation point of view, the keyword
           " (of/catch/after/end) before the LTI is what counts, so
           " if the stack already has a catch/after/end, we don't
@@ -1409,7 +1460,7 @@ function! ErlangIndent()
   endif
 
   let ml = matchlist(currline,
-                    \'^\(\s*\)\(\%(end\|of\|catch\|after\)\>\|[)\]}]\|>>\)')
+                    \'^\(\s*\)\(\%(end\|of\|catch\|after\|else\)\>\|[)\]}]\|>>\)')
 
   " If the line has a special beginning, but not a standalone catch
   if !empty(ml) && !(ml[2] ==# 'catch' && s:IsCatchStandalone(v:lnum, 0))
diff --git a/indent/gdscript3.vim b/indent/gdscript3.vim
deleted file mode 100644
index 8d69ed1b7..000000000
--- a/indent/gdscript3.vim
+++ /dev/null
@@ -1,204 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'gdscript', 'indent/gdscript3.vim')
-  finish
-endif
-
-" Vim indent file
-" Language:		Python
-" Maintainer:		Bram Moolenaar <Bram@vim.org>
-" Original Author:	David Bustos <bustos@caltech.edu>
-" Last Change:		2013 Jul 9
-
-" Modified for GDScript
-
-" Only load this indent file when no other was loaded.
-if exists("b:did_indent")
-  finish
-endif
-let b:did_indent = 1
-
-" Some preliminary settings
-setlocal nolisp		" Make sure lisp indenting doesn't supersede us
-setlocal autoindent	" indentexpr isn't much help otherwise
-
-setlocal indentexpr=GetPythonIndent(v:lnum)
-setlocal indentkeys+=<:>,=elif
-
-" Only define the function once.
-if exists("*GetPythonIndent")
-  finish
-endif
-let s:keepcpo= &cpo
-set cpo&vim
-
-" Come here when loading the script the first time.
-
-let s:maxoff = 50	" maximum number of lines to look backwards for ()
-
-function GetPythonIndent(lnum)
-
-  " If this line is explicitly joined: If the previous line was also joined,
-  " line it up with that one, otherwise add two 'shiftwidth'
-  if getline(a:lnum - 1) =~ '\\$'
-    if a:lnum > 1 && getline(a:lnum - 2) =~ '\\$'
-      return indent(a:lnum - 1)
-    endif
-    return indent(a:lnum - 1) + (exists("g:pyindent_continue") ? eval(g:pyindent_continue) : (shiftwidth() * 2))
-  endif
-
-  " If the start of the line is in a string don't change the indent.
-  if has('syntax_items')
-	\ && synIDattr(synID(a:lnum, 1, 1), "name") =~ "String$"
-    return -1
-  endif
-
-  " Search backwards for the previous non-empty line.
-  let plnum = prevnonblank(v:lnum - 1)
-
-  if plnum == 0
-    " This is the first non-empty line, use zero indent.
-    return 0
-  endif
-
-  " If the previous line is inside parenthesis, use the indent of the starting
-  " line.
-  " Trick: use the non-existing "dummy" variable to break out of the loop when
-  " going too far back.
-  call cursor(plnum, 1)
-  let parlnum = searchpair('(\|{\|\[', '', ')\|}\|\]', 'nbW',
-	  \ "line('.') < " . (plnum - s:maxoff) . " ? dummy :"
-	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
-	  \ . " =~ '\\(Comment\\|Todo\\|String\\)$'")
-  if parlnum > 0
-    let plindent = indent(parlnum)
-    let plnumstart = parlnum
-  else
-    let plindent = indent(plnum)
-    let plnumstart = plnum
-  endif
-
-
-  " When inside parenthesis: If at the first line below the parenthesis add
-  " two 'shiftwidth', otherwise same as previous line.
-  " i = (a
-  "       + b
-  "       + c)
-  call cursor(a:lnum, 1)
-  let p = searchpair('(\|{\|\[', '', ')\|}\|\]', 'bW',
-	  \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
-	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
-	  \ . " =~ '\\(Comment\\|Todo\\|String\\)$'")
-  if p > 0
-    if p == plnum
-      " When the start is inside parenthesis, only indent one 'shiftwidth'.
-      let pp = searchpair('(\|{\|\[', '', ')\|}\|\]', 'bW',
-	  \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :"
-	  \ . " synIDattr(synID(line('.'), col('.'), 1), 'name')"
-	  \ . " =~ '\\(Comment\\|Todo\\|String\\)$'")
-      if pp > 0
-	return indent(plnum) + (exists("g:pyindent_nested_paren") ? eval(g:pyindent_nested_paren) : shiftwidth())
-      endif
-      return indent(plnum) + (exists("g:pyindent_open_paren") ? eval(g:pyindent_open_paren) : (shiftwidth() * 2))
-    endif
-    if plnumstart == p
-      return indent(plnum)
-    endif
-    return plindent
-  endif
-
-
-  " Get the line and remove a trailing comment.
-  " Use syntax highlighting attributes when possible.
-  let pline = getline(plnum)
-  let pline_len = strlen(pline)
-  if has('syntax_items')
-    " If the last character in the line is a comment, do a binary search for
-    " the start of the comment.  synID() is slow, a linear search would take
-    " too long on a long line.
-    if synIDattr(synID(plnum, pline_len, 1), "name") =~ "\\(Comment\\|Todo\\)$"
-      let min = 1
-      let max = pline_len
-      while min < max
-	let col = (min + max) / 2
-	if synIDattr(synID(plnum, col, 1), "name") =~ "\\(Comment\\|Todo\\)$"
-	  let max = col
-	else
-	  let min = col + 1
-	endif
-      endwhile
-      let pline = strpart(pline, 0, min - 1)
-    endif
-  else
-    let col = 0
-    while col < pline_len
-      if pline[col] == '#'
-	let pline = strpart(pline, 0, col)
-	break
-      endif
-      let col = col + 1
-    endwhile
-  endif
-
-  " If the previous line ended with a colon, indent this line
-  if pline =~ ':\s*$'
-    return plindent + shiftwidth()
-  endif
-
-  " If the previous line was a stop-execution statement...
-  if getline(plnum) =~ '^\s*\(break\|continue\|return\|pass\)\>'
-    " See if the user has already dedented
-    if indent(a:lnum) > indent(plnum) - shiftwidth()
-      " If not, recommend one dedent
-      return indent(plnum) - shiftwidth()
-    endif
-    " Otherwise, trust the user
-    return -1
-  endif
-
-  " If the current line begins with a keyword that lines up with "try"
-  " if getline(a:lnum) =~ '^\s*\(except\|finally\)\>'
-  "   let lnum = a:lnum - 1
-  "   while lnum >= 1
-  "     if getline(lnum) =~ '^\s*\(try\|except\)\>'
-	" let ind = indent(lnum)
-	" if ind >= indent(a:lnum)
-	  " return -1	" indent is already less than this
-	" endif
-	" return ind	" line up with previous try or except
-  "     endif
-  "     let lnum = lnum - 1
-  "   endwhile
-  "   return -1		" no matching "try"!
-  " endif
-
-  " If the current line begins with a header keyword, dedent
-  if getline(a:lnum) =~ '^\s*\(elif\|else\)\>'
-
-    " Unless the previous line was a one-liner
-    if getline(plnumstart) =~ '^\s*\(for\|if\)\>'
-      return plindent
-    endif
-
-    " Or the user has already dedented
-    if indent(a:lnum) <= plindent - shiftwidth()
-      return -1
-    endif
-
-    return plindent - shiftwidth()
-  endif
-
-  " When after a () construct we probably want to go back to the start line.
-  " a = (b
-  "       + c)
-  " here
-  if parlnum > 0
-    return plindent
-  endif
-
-  return -1
-
-endfunction
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-" vim:sw=2
diff --git a/indent/glsl.vim b/indent/glsl.vim
index 604592847..8b957b480 100644
--- a/indent/glsl.vim
+++ b/indent/glsl.vim
@@ -11,5 +11,6 @@ endif
 
 setlocal autoindent cindent
 setlocal formatoptions+=roq
+setlocal cinoptions&
 
 " vim:set sts=2 sw=2 :
diff --git a/indent/haml.vim b/indent/haml.vim
index ae4f2d105..c636a6e75 100644
--- a/indent/haml.vim
+++ b/indent/haml.vim
@@ -5,7 +5,7 @@ endif
 " Vim indent file
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2017 Jun 13
+" Last Change:	2022 Mar 15
 
 if exists("b:did_indent")
   finish
diff --git a/indent/ruby.vim b/indent/ruby.vim
index e08a38cf2..4bba63de9 100644
--- a/indent/ruby.vim
+++ b/indent/ruby.vim
@@ -96,7 +96,7 @@ let s:ruby_indent_keywords =
       \    '\<\%(if\|for\|while\|until\|case\|unless\|begin\):\@!\>'
 
 " Def without an end clause: def method_call(...) = <expression>
-let s:ruby_endless_def = '\<def\s\+\k\+[!?]\=\%((.*)\|\s\)\s*='
+let s:ruby_endless_def = '\<def\s\+\%(\k\+\.\)\=\k\+[!?]\=\%((.*)\|\s\)\s*='
 
 " Regex used for words that, at the start of a line, remove a level of indent.
 let s:ruby_deindent_keywords =
diff --git a/indent/zig.vim b/indent/zig.vim
index fc9f5d6d2..7131c2ed1 100644
--- a/indent/zig.vim
+++ b/indent/zig.vim
@@ -37,6 +37,8 @@ setlocal cinkeys=0{,0},0),0],!^F,o,O
 
 setlocal indentexpr=GetZigIndent(v:lnum)
 
+let b:undo_indent = "setlocal cindent< cinkeys< cinoptions< indentexpr<"
+
 function! GetZigIndent(lnum)
     let curretLineNum = a:lnum
     let currentLine = getline(a:lnum)
diff --git a/packages.yaml b/packages.yaml
index 7753cb245..4335324ce 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -606,15 +606,6 @@ filetypes:
 - name: fsharp
   linguist: F#
 ---
-name: gdscript
-remote: calviken/vim-gdscript3
-dirs:
-- syntax
-- indent
-filetypes:
-- name: gdscript3
-  linguist: GDScript
----
 name: git
 remote: tpope/vim-git
 filetypes:
diff --git a/syntax/basic/keyword.vim b/syntax/basic/keyword.vim
index 611a3f917..adcd950bd 100644
--- a/syntax/basic/keyword.vim
+++ b/syntax/basic/keyword.vim
@@ -5,7 +5,7 @@ endif
 "Import
 syntax keyword typescriptImport                from as
 syntax keyword typescriptImport                import
-  \ nextgroup=typescriptImportType
+  \ nextgroup=typescriptImportType,typescriptTypeBlock,typescriptDefaultImportName
   \ skipwhite
 syntax keyword typescriptImportType            type
   \ contained
@@ -17,11 +17,10 @@ syntax match typescriptExportType              /\<type\s*{\@=/
 syntax keyword typescriptModule                namespace module
 
 
-syntax keyword typescriptCastKeyword           as
+syntax keyword typescriptCastKeyword           as satisfies
   \ nextgroup=@typescriptType
   \ skipwhite
 
-
 syntax keyword typescriptVariable              let var
   \ nextgroup=@typescriptVariableDeclarations
   \ skipwhite skipempty
@@ -90,6 +89,17 @@ syntax cluster typescriptAmbients contains=
   \ typescriptModule
 
 syntax keyword typescriptIdentifier            arguments  nextgroup=@afterIdentifier
+syntax match typescriptDefaultImportName /\v\h\k*( |,)/
+  \ contained
+  \ nextgroup=typescriptTypeBlock
+  \ skipwhite skipempty
+
+syntax region  typescriptTypeBlock
+  \ matchgroup=typescriptBraces
+  \ start=/{/ end=/}/
+  \ contained
+  \ contains=typescriptIdentifierName,typescriptImportType
+  \ fold
 
 "Program Keywords
 exec 'syntax keyword typescriptNull null '.(exists('g:typescript_conceal_null') ? 'conceal cchar='.g:typescript_conceal_null : '').' nextgroup=@typescriptSymbols skipwhite skipempty'
diff --git a/syntax/basic/literal.vim b/syntax/basic/literal.vim
index d62040145..1ecbcd9de 100644
--- a/syntax/basic/literal.vim
+++ b/syntax/basic/literal.vim
@@ -22,9 +22,20 @@ syntax region  typescriptString
 
 syntax match   typescriptSpecial            contained "\v\\%(x\x\x|u%(\x{4}|\{\x{1,6}})|c\u|.)"
 
-" From vim runtime
-" <https://github.com/vim/vim/blob/master/runtime/syntax/javascript.vim#L48>
-syntax region  typescriptRegexpString          start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gimsuy]\{0,5\}\s*$+ end=+/[gimsuy]\{0,5\}\s*[;.,)\]}:]+me=e-1 nextgroup=typescriptDotNotation oneline
+" From pangloss/vim-javascript
+" <https://github.com/pangloss/vim-javascript/blob/d6e137563c47fb59f26ed25d044c0c7532304f18/syntax/javascript.vim#L64-L72>
+syntax region  typescriptRegexpCharClass    contained start=+\[+ skip=+\\.+ end=+\]+ contains=typescriptSpecial extend
+syntax match   typescriptRegexpBoundary     contained "\v\c[$^]|\\b"
+syntax match   typescriptRegexpBackRef      contained "\v\\[1-9]\d*"
+syntax match   typescriptRegexpQuantifier   contained "\v[^\\]%([?*+]|\{\d+%(,\d*)?})\??"lc=1
+syntax match   typescriptRegexpOr           contained "|"
+syntax match   typescriptRegexpMod          contained "\v\(\?[:=!>]"lc=1
+syntax region  typescriptRegexpGroup        contained start="[^\\]("lc=1 skip="\\.\|\[\(\\.\|[^]]\+\)\]" end=")" contains=typescriptRegexpCharClass,@typescriptRegexpSpecial keepend
+syntax region  typescriptRegexpString
+  \ start=+\%(\%(\<return\|\<typeof\|\_[^)\]'"[:blank:][:alnum:]_$]\)\s*\)\@<=/\ze[^*/]+ skip=+\\.\|\[[^]]\{1,}\]+ end=+/[gimyus]\{,6}+
+  \ contains=typescriptRegexpCharClass,typescriptRegexpGroup,@typescriptRegexpSpecial
+  \ oneline keepend extend
+syntax cluster typescriptRegexpSpecial    contains=typescriptSpecial,typescriptRegexpBoundary,typescriptRegexpBackRef,typescriptRegexpQuantifier,typescriptRegexpOr,typescriptRegexpMod
 
 syntax region  typescriptTemplate
   \ start=/`/  skip=/\\\\\|\\`\|\n/  end=/`\|$/
diff --git a/syntax/caddyfile.vim b/syntax/caddyfile.vim
index ab0c24d1d..12300a7c0 100644
--- a/syntax/caddyfile.vim
+++ b/syntax/caddyfile.vim
@@ -2,32 +2,51 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'caddyfile', 'syntax/caddyfile
   finish
 endif
 
-" Language: Caddyfile
-" Author:   Josh Glendenning <josh@isobit.io>
+" Language:			Caddyfile
+" Maintainer:		0az <0az@afzhou.com>
+" Original Author:	Josh Glendenning <josh@isobit.io>
 
 if exists("b:current_syntax")
 	finish
 endif
 
-syn match caddyDirective "^\s*\([a-zA-Z0-9_]\+\)" nextgroup=caddyDirectiveArgs skipwhite
-syn region caddyDirectiveArgs start="" end="\({\|#\|$\)"me=s-1 oneline contained contains=caddyPlaceholder,caddyString nextgroup=caddyDirectiveBlock skipwhite
-syn region caddyDirectiveBlock start="{" skip="\\}" end="}" contained contains=caddySubdirective,caddyComment
+syn match caddyDirective "\v^\s*(\w\S*)" nextgroup=caddyDirectiveArgs skipwhite
+syn region caddyDirectiveArgs start="" end="\({\|#\|$\)"me=s-1 oneline contained contains=caddyPlaceholder,caddyString,caddyNamedMatcher nextgroup=caddyDirectiveBlock skipwhite
+syn region caddyDirectiveBlock start="{" skip="\\}" end="}" contained contains=caddySubdirective,caddyComment,caddyImport
 
-syn match caddySubdirective "^\s*\([a-zA-Z0-9_]\+\)" contained nextgroup=caddySubdirectiveArgs skipwhite
-syn region caddySubdirectiveArgs start="" end="\(#\|$\)"me=s-1 oneline contained contains=caddyPlaceholder,caddyString
+syn match caddySubdirective "\v^\s*(\w\S*)" contained nextgroup=caddySubdirectiveArgs skipwhite
+syn region caddySubdirectiveArgs start="" end="\(#\|$\)"me=s-1 oneline contained contains=caddyPlaceholder,caddyString,caddyNamedMatcher
 
-syn match caddyHost "\(https\?:\/\/\)\?\(\(\w\{1,}\.\)\(\w\{2,}\.\?\)\+\|localhost\)\(:[0-9]\{1,5}\)\?" nextgroup=caddyHostBlock skipwhite
-syn region caddyHostBlock start="{" skip="\\}" end="}" contained contains=caddyDirective,caddyComment
+" Needs priority over Directive
+syn match caddyImport "\v^\s*<import>" nextgroup=caddyImportPattern skipwhite
+syn match caddyImportPattern "\v\c\S+" contained nextgroup=caddyImportArgs skipwhite
+syn region caddyImportArgs start="" end="$"me=s-1 oneline contained contains=caddyPlaceholder,caddyString,caddyNamedMatcher
+
+syn match caddyHost "\v\c^\s*\zs(https?://)?(([0-9a-z-]+\.)([0-9a-z-]+\.?)+|[0-9a-z-]+)?(:\d{1,5})?" nextgroup=caddyHostBlock skipwhite
+syn region caddyHostBlock start="{" skip="\\}" end="}" contained contains=caddyDirective,caddyComment,caddyNamedMatcherDef,caddyImport
+
+" Needs priority over Host
+syn region caddySnippetDef start="("rs=e+1 end=")"re=s-1 oneline keepend contains=caddySnippet
+syn match caddySnippet "\v\w+" contained nextgroup=caddySnippetBlock skipwhite
+
+syn match caddyNamedMatcher "\v^\s*\zs\@\S+" contained skipwhite
+syn match caddyNamedMatcherDef "\v\s*\zs\@\S+" nextgroup=caddyNamedMatcherDefBlock
+syn region caddyNamedMatcherDefBlock start="{" skip="\\}" end="}" contained contains=caddySubdirective,caddyComment,caddyImport
 
 syn region caddyPlaceholder start="{" skip="\\}" end="}" oneline contained
 syn region caddyString start='"' skip='\\\\\|\\"' end='"' oneline
-syn match caddyComment "#.*$"
+syn region caddyComment start="#" end="$" oneline
 
 hi link caddyDirective Keyword
 hi link caddySubdirective Structure
 hi link caddyHost Identifier
+hi link caddyImport PreProc
+hi link caddySnippetDef PreProc
+hi link caddySnippet Identifier
 hi link caddyPlaceholder Special
 hi link caddyString String
 hi link caddyComment Comment
+hi link caddyNamedMatcherDef caddyNamedMatcher
+hi link caddyNamedMatcher Identifier
 
 let b:current_syntax = "caddyfile"
diff --git a/syntax/clojure.vim b/syntax/clojure.vim
index c892c2673..4397b89be 100644
--- a/syntax/clojure.vim
+++ b/syntax/clojure.vim
@@ -26,7 +26,7 @@ endif
 
 " -*- KEYWORDS -*-
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-" Clojure version 1.11.0
+" Clojure version 1.11.1
 let s:clojure_syntax_keywords = {
 	\ 'clojureBoolean': ["false","true"],
 	\ 'clojureCond': ["case","case*","clojure.core/case","clojure.core/cond","clojure.core/cond->","clojure.core/cond->>","clojure.core/condp","clojure.core/if-let","clojure.core/if-not","clojure.core/if-some","clojure.core/when","clojure.core/when-first","clojure.core/when-let","clojure.core/when-not","clojure.core/when-some","cond","cond->","cond->>","condp","if","if-let","if-not","if-some","when","when-first","when-let","when-not","when-some"],
@@ -100,7 +100,7 @@ syntax region clojureRegexpQuote  start=/\\Q/       skip=/\\\\\|\\"/ end=/\\E/
 
 " -*- CHARACTER PROPERTY CLASSES -*-
 " Generated from https://github.com/clojure-vim/clojure.vim/blob/%%RELEASE_TAG%%/clj/src/vim_clojure_static/generate.clj
-" Java version 17.0.2
+" Java version 18.0.1
 syntax match clojureRegexpPosixCharClass "\v\\[pP]\{%(Cntrl|A%(l%(pha|num)|SCII)|Space|Graph|Upper|P%(rint|unct)|Blank|XDigit|Digit|Lower)\}" contained display
 syntax match clojureRegexpJavaCharClass "\v\\[pP]\{java%(Whitespace|JavaIdentifier%(Part|Start)|SpaceChar|Mirrored|TitleCase|I%(SOControl|de%(ographic|ntifierIgnorable))|D%(efined|igit)|U%(pperCase|nicodeIdentifier%(Part|Start))|L%(etter%(OrDigit)?|owerCase)|Alphabetic)\}" contained display
 syntax match clojureRegexpUnicodeCharClass "\v\\[pP]\{\cIs%(l%(owercase|etter)|hex%(digit|_digit)|w%(hite%(_space|space)|ord)|noncharacter%(_code_point|codepoint)|p%(rint|unctuation)|ideographic|graph|a%(l%(num|phabetic)|ssigned)|uppercase|join%(control|_control)|titlecase|blank|digit|control)\}" contained display
diff --git a/syntax/erlang.vim b/syntax/erlang.vim
index 473c0606a..72bfb2d52 100644
--- a/syntax/erlang.vim
+++ b/syntax/erlang.vim
@@ -6,7 +6,7 @@ endif
 " Language:     Erlang (http://www.erlang.org)
 " Maintainer:   Csaba Hoch <csaba.hoch@gmail.com>
 " Contributor:  Adam Rutkowski <hq@mtod.org>
-" Last Update:  2020-May-26
+" Last Update:  2022-Sep-06
 " License:      Vim license
 " URL:          https://github.com/vim-erlang/vim-erlang-runtime
 
@@ -65,7 +65,8 @@ syn match erlangQuotedAtomModifier '\\\%(\o\{1,3}\|x\x\x\|x{\x\+}\|\^.\|.\)' con
 syn match erlangModifier           '\$\%([^\\]\|\\\%(\o\{1,3}\|x\x\x\|x{\x\+}\|\^.\|.\)\)'
 
 " Operators, separators
-syn match erlangOperator   '==\|=:=\|/=\|=/=\|<\|=<\|>\|>=\|=>\|:=\|++\|--\|=\|!\|<-\|+\|-\|\*\|\/'
+syn match erlangOperator   '==\|=:=\|/=\|=/=\|<\|=<\|>\|>=\|=>\|:=\|?=\|++\|--\|=\|!\|<-\|+\|-\|\*\|\/'
+syn match erlangEqualsBinary '=<<\%(<\)\@!'
 syn keyword erlangOperator div rem or xor bor bxor bsl bsr and band not bnot andalso orelse
 syn match erlangBracket    '{\|}\|\[\|]\||\|||'
 syn match erlangPipe       '|'
@@ -80,7 +81,8 @@ syn match erlangGlobalFuncCall '\<\%(\a[[:alnum:]_@]*\%(\s\|\n\|%.*\n\)*\.\%(\s\
 syn match erlangGlobalFuncRef  '\<\%(\a[[:alnum:]_@]*\%(\s\|\n\|%.*\n\)*\.\%(\s\|\n\|%.*\n\)*\)*\a[[:alnum:]_@]*\%(\s\|\n\|%.*\n\)*:\%(\s\|\n\|%.*\n\)*\a[[:alnum:]_@]*\>\%(\%(\s\|\n\|%.*\n\)*/\)\@=' contains=erlangComment,erlangVariable
 
 " Variables, macros, records, maps
-syn match erlangVariable '\<[A-Z_][[:alnum:]_@]*'
+syn match erlangVariable '\<[A-Z][[:alnum:]_@]*'
+syn match erlangAnonymousVariable '\<_[[:alnum:]_@]*'
 syn match erlangMacro    '??\=[[:alnum:]_@]\+'
 syn match erlangMacro    '\%(-define(\)\@<=[[:alnum:]_@]\+'
 syn region erlangQuotedMacro         start=/??\=\s*'/ end=/'/ contains=erlangQuotedAtomModifier
@@ -96,7 +98,7 @@ syn match erlangBitType '\%(\/\%(\s\|\n\|%.*\n\)*\)\@<=\%(integer\|float\|binary
 
 " Constants and Directives
 syn match erlangUnknownAttribute '^\s*-\%(\s\|\n\|%.*\n\)*\l[[:alnum:]_@]*' contains=erlangComment
-syn match erlangAttribute '^\s*-\%(\s\|\n\|%.*\n\)*\%(behaviou\=r\|compile\|export\(_type\)\=\|file\|import\|module\|author\|copyright\|doc\|vsn\|on_load\|optional_callbacks\)\>' contains=erlangComment
+syn match erlangAttribute '^\s*-\%(\s\|\n\|%.*\n\)*\%(behaviou\=r\|compile\|export\(_type\)\=\|file\|import\|module\|author\|copyright\|doc\|vsn\|on_load\|optional_callbacks\|feature\)\>' contains=erlangComment
 syn match erlangInclude   '^\s*-\%(\s\|\n\|%.*\n\)*\%(include\|include_lib\)\>' contains=erlangComment
 syn match erlangRecordDef '^\s*-\%(\s\|\n\|%.*\n\)*record\>' contains=erlangComment
 syn match erlangDefine    '^\s*-\%(\s\|\n\|%.*\n\)*\%(define\|undef\)\>' contains=erlangComment
@@ -104,8 +106,8 @@ syn match erlangPreCondit '^\s*-\%(\s\|\n\|%.*\n\)*\%(ifdef\|ifndef\|else\|endif
 syn match erlangType      '^\s*-\%(\s\|\n\|%.*\n\)*\%(spec\|type\|opaque\|callback\)\>' contains=erlangComment
 
 " Keywords
-syn keyword erlangKeyword after begin case catch cond end fun if let of
-syn keyword erlangKeyword receive when try
+syn keyword erlangKeyword after begin case catch cond end fun if let of else
+syn keyword erlangKeyword receive when try maybe
 
 " Build-in-functions (BIFs)
 syn keyword erlangBIF abs alive apply atom_to_binary atom_to_list contained
@@ -178,6 +180,7 @@ hi def link erlangModifier Special
 
 " Operators, separators
 hi def link erlangOperator Operator
+hi def link erlangEqualsBinary ErrorMsg
 hi def link erlangRightArrow Operator
 if s:old_style
 hi def link erlangBracket Normal
@@ -195,6 +198,7 @@ hi def link erlangLocalFuncRef Normal
 hi def link erlangGlobalFuncCall Function
 hi def link erlangGlobalFuncRef Function
 hi def link erlangVariable Normal
+hi def link erlangAnonymousVariable erlangVariable
 hi def link erlangMacro Normal
 hi def link erlangQuotedMacro Normal
 hi def link erlangRecord Normal
@@ -207,6 +211,7 @@ hi def link erlangLocalFuncRef Normal
 hi def link erlangGlobalFuncCall Normal
 hi def link erlangGlobalFuncRef Normal
 hi def link erlangVariable Identifier
+hi def link erlangAnonymousVariable erlangVariable
 hi def link erlangMacro Macro
 hi def link erlangQuotedMacro Macro
 hi def link erlangRecord Structure
diff --git a/syntax/gdscript3.vim b/syntax/gdscript3.vim
deleted file mode 100644
index cabfdfbd1..000000000
--- a/syntax/gdscript3.vim
+++ /dev/null
@@ -1,101 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'gdscript', 'syntax/gdscript3.vim')
-  finish
-endif
-
-" Syntax file for GDScript
-
-if exists("b:current_syntax")
-    finish
-endif
-let b:current_syntax = "gdscript3"
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-syn keyword gdConditional if elif else match
-syn keyword gdRepeat      for while
-syn keyword gdOperator    and or not is in
-syn match   gdOperator    "\V&&\|||\|!\|&\|^\||\|~\|*\|/\|%\|+\|-\|=\|<\|>"
-syn match   gdDelimiter   "\V(\|)\|[\|]\|{\|}"
-syn keyword gdStatement   break continue pass return
-syn keyword gdKeyword     extends tool signal self
-                        \ const enum var onready export setget
-syn match   gdKeyword     "\v^\s*((static\s*)=func|class)"
-                        \ nextgroup=gdFunction skipwhite
-syn keyword gdBoolean     true false
-
-syn match   gdMember   "\v<(\.)@<=[a-z_]+\w*>"
-syn match   gdFunction "\v<\w*>(\()@="
-syn match   gdSignal "\v(<signal>\s+)@<=<\w+>"
-syn match   gdSetGet "\v(<setget>\s+)@<=<\w+>"
-syn match   gdSetGet "\v(<setget>\s+\w*\s*,\s*)@<=<\w+>"
-
-syn keyword gdNull      null
-syn keyword gdClass     int float bool
-syn match   gdClass     "\v<\u\w+>"
-syn match   gdConstant  "\v<[A-Z_]+[A-Z0-9_]*>"
-syn keyword gdClass     AABB IP JSON OS RID
-syn match   gdNode      "\v\$\a+\w*"
-
-syn region  gdString      start='\v\"' end='\v\"'
-syn region  gdString      start='\v\'' end='\v\''
-syn match   gdEscapeError "\v\\."              containedin=gdString
-syn match   gdEscapeError "\v\\u.{,3}"         containedin=gdString
-syn match   gdEscape      "\v\\[abfnrtv\\'"]"  containedin=gdString
-syn match   gdEscape      "\v\\u[0-9]{4}"      containedin=gdString
-
-syn match   gdFormat "\v\%\%" containedin=gdString
-syn match   gdFormat "\v\%[+-]=(\d*|\*)=\.=(\d*|\*)=[scdoxXf]" containedin=gdString
-
-syn match   gdNumber      "\v<\d+(\.)@!>"
-syn match   gdNumber      "\v<0x\x+(\.)@!>"
-syn match   gdFloat       "\v<\d*\.\d+(\.)@!>"
-syn match   gdFloat       "\v<\d*\.=\d+(e-=\d+)@="
-syn match   gdExponent    "\v(\d*\.=\d+)@<=e-=\d+>"
-
-syn match   gdComment "\v#.*$"
-syn keyword gdTodo    TODO FIXME XXX NOTE BUG HACK OPTIMIZE containedin=gdComment
-
-syn region gdFunctionFold
-  \ start="\v^\z(\s*)%(%(static\s+)=func|class)>"
-  \ end="\v\ze%(\s*\n)+%(\z1\s)@!."
-  \ fold transparent
-
-syn region gdFold
-  \ matchgroup=gdComment
-  \ start='#.*{{{.*$'
-  \ end='#.*}}}.*$'
-  \ fold transparent
-
-hi def link gdConditional Conditional
-hi def link gdRepeat      Repeat
-hi def link gdOperator    Operator
-hi def link gdDelimiter   Delimiter
-hi def link gdStatement   Statement
-hi def link gdKeyword     Keyword
-hi def link gdBoolean     Boolean
-
-hi def link gdMember   Identifier
-hi def link gdFunction Function
-hi def link gdSignal   Function
-hi def link gdSetGet   Function
-
-hi def link gdNull     Constant
-hi def link gdClass    Type
-hi def link gdConstant Constant
-hi def link gdNode     Identifier
-
-hi def link gdString   String
-hi def link gdEscape   Special
-hi def link gdFormat   Special
-hi def link gdNumber   Number
-hi def link gdFloat    Float
-hi def link gdExponent Special
-
-hi def link gdEscapeError Error
-
-hi def link gdComment Comment
-hi def link gdTodo    Todo
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/syntax/git.vim b/syntax/git.vim
index 66a77c206..165930705 100644
--- a/syntax/git.vim
+++ b/syntax/git.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:	generic git output
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2019 Dec 05
+" Last Change:	2022 Jan 05
 
 if exists("b:current_syntax")
   finish
@@ -42,7 +42,7 @@ syn match  gitReflog /^\x\{40,\} \x\{40,\} .\{-\}\d\+\s-\d\{4\}\t.*/ skipwhite c
 syn region gitDiff start=/^\%(diff --git \)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff fold
 syn region gitDiff start=/^\%(@@ -\)\@=/ end=/^\%(diff --\%(git\|cc\|combined\) \|$\)\@=/ contains=@gitDiff
 
-syn region gitDiffMerge start=/^\%(diff --\%(cc\|combined\) \)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff
+syn region gitDiffMerge start=/^\%(diff --\%(cc\|combined\) \)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff fold
 syn region gitDiffMerge start=/^\%(@@@@* -\)\@=/ end=/^\%(diff --\|$\)\@=/ contains=@gitDiff
 syn match gitDiffAdded "^ \++.*" contained containedin=gitDiffMerge
 syn match gitDiffAdded "{+[^}]*+}" contained containedin=gitDiff
diff --git a/syntax/gitcommit.vim b/syntax/gitcommit.vim
index 3839fffbb..abd945770 100644
--- a/syntax/gitcommit.vim
+++ b/syntax/gitcommit.vim
@@ -6,7 +6,7 @@ endif
 " Language:	git commit file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
 " Filenames:	*.git/COMMIT_EDITMSG
-" Last Change:	2019 Dec 05
+" Last Change:	2022 Jan 05
 
 if exists("b:current_syntax")
   finish
diff --git a/syntax/gitrebase.vim b/syntax/gitrebase.vim
index c042f1939..5c94796dd 100644
--- a/syntax/gitrebase.vim
+++ b/syntax/gitrebase.vim
@@ -6,7 +6,7 @@ endif
 " Language:	git rebase --interactive
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
 " Filenames:	git-rebase-todo
-" Last Change:	2019 Dec 06
+" Last Change:	2022 Jan 05
 
 if exists("b:current_syntax")
   finish
diff --git a/syntax/go.vim b/syntax/go.vim
index 23270e842..2d7dbde41 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -169,14 +169,10 @@ endif
 syn match       goSingleDecl        /\%(import\|var\|const\) [^(]\@=/ contains=goImport,goVar,goConst
 
 " Integers
-syn match       goDecimalInt        "\<-\=\(0\|[1-9]_\?\(\d\|\d\+_\?\d\+\)*\)\%([Ee][-+]\=\d\+\)\=\>"
-"syn match       goDecimalError      "\<-\=\(_\(\d\+_*\)\+\|\([1-9]\d*_*\)\+__\(\d\+_*\)\+\|\([1-9]\d*_*\)\+_\+\)\%([Ee][-+]\=\d\+\)\=\>"
-syn match       goHexadecimalInt    "\<-\=0[xX]_\?\(\x\+_\?\)\+\>"
-"syn match       goHexadecimalError  "\<-\=0[xX]_\?\(\x\+_\?\)*\(\([^-+%&|^*/ \t0-9A-Fa-f_)]\|__\)\S*\|_\)\>"
-syn match       goOctalInt          "\<-\=0[oO]\?_\?\(\o\+_\?\)\+\>"
-"syn match       goOctalError        "\<-\=0[0-7oO_]*\(\([^-+%&|^*/ \t0-7oOxX_/)\]\}\:;]\|[oO]\{2,\}\|__\)\S*\|_\|[oOxX]\)\>"
-syn match       goBinaryInt         "\<-\=0[bB]_\?\([01]\+_\?\)\+\>"
-"syn match       goBinaryError       "\<-\=0[bB]_\?[01_]*\([^-+%&|^*/ \t01_)]\S*\|__\S*\|_\)\>"
+syn match       goDecimalInt        "\<-\=\%(0\|\%(\d\|\d_\d\)\+\)\>"
+syn match       goHexadecimalInt    "\<-\=0[xX]_\?\%(\x\|\x_\x\)\+\>"
+syn match       goOctalInt          "\<-\=0[oO]\?_\?\%(\o\|\o_\o\)\+\>"
+syn match       goBinaryInt         "\<-\=0[bB]_\?\%([01]\|[01]_[01]\)\+\>"
 
 hi def link     goDecimalInt        Integer
 hi def link     goDecimalError      Error
@@ -189,19 +185,55 @@ hi def link     goBinaryError       Error
 hi def link     Integer             Number
 
 " Floating point
-syn match       goFloat             "\<-\=\d\+\.\d*\%([Ee][-+]\=\d\+\)\=\>"
-syn match       goFloat             "\<-\=\.\d\+\%([Ee][-+]\=\d\+\)\=\>"
+"float_lit         = decimal_float_lit | hex_float_lit .
+"
+"decimal_float_lit = decimal_digits "." [ decimal_digits ] [ decimal_exponent ] |
+"                    decimal_digits decimal_exponent |
+"                    "." decimal_digits [ decimal_exponent ] .
+"decimal_exponent  = ( "e" | "E" ) [ "+" | "-" ] decimal_digits .
+"
+"hex_float_lit     = "0" ( "x" | "X" ) hex_mantissa hex_exponent .
+"hex_mantissa      = [ "_" ] hex_digits "." [ hex_digits ] |
+"                    [ "_" ] hex_digits |
+"                    "." hex_digits .
+"hex_exponent      = ( "p" | "P" ) [ "+" | "-" ] decimal_digits .
+" decimal floats with a decimal point
+syn match       goFloat             "\<-\=\%(0\|\%(\d\|\d_\d\)\+\)\.\%(\%(\%(\d\|\d_\d\)\+\)\=\%([Ee][-+]\=\%(\d\|\d_\d\)\+\)\=\>\)\="
+syn match       goFloat             "\s\zs-\=\.\%(\d\|\d_\d\)\+\%(\%([Ee][-+]\=\%(\d\|\d_\d\)\+\)\>\)\="
+" decimal floats without a decimal point
+syn match       goFloat             "\<-\=\%(0\|\%(\d\|\d_\d\)\+\)[Ee][-+]\=\%(\d\|\d_\d\)\+\>"
+" hexadecimal floats with a decimal point
+syn match       goHexadecimalFloat  "\<-\=0[xX]\%(_\x\|\x\)\+\.\%(\%(\x\|\x_\x\)\+\)\=\%([Pp][-+]\=\%(\d\|\d_\d\)\+\)\=\>"
+syn match       goHexadecimalFloat  "\<-\=0[xX]\.\%(\x\|\x_\x\)\+\%([Pp][-+]\=\%(\d\|\d_\d\)\+\)\=\>"
+" hexadecimal floats without a decimal point
+syn match       goHexadecimalFloat  "\<-\=0[xX]\%(_\x\|\x\)\+[Pp][-+]\=\%(\d\|\d_\d\)\+\>"
 
 hi def link     goFloat             Float
+hi def link     goHexadecimalFloat  Float
 
 " Imaginary literals
-syn match       goImaginary         "\<-\=\d\+i\>"
-syn match       goImaginary         "\<-\=\d\+[Ee][-+]\=\d\+i\>"
-syn match       goImaginaryFloat    "\<-\=\d\+\.\d*\%([Ee][-+]\=\d\+\)\=i\>"
-syn match       goImaginaryFloat    "\<-\=\.\d\+\%([Ee][-+]\=\d\+\)\=i\>"
-
-hi def link     goImaginary         Number
-hi def link     goImaginaryFloat    Float
+syn match       goImaginaryDecimal        "\<-\=\%(0\|\%(\d\|\d_\d\)\+\)i\>"
+syn match       goImaginaryHexadecimal    "\<-\=0[xX]_\?\%(\x\|\x_\x\)\+i\>"
+syn match       goImaginaryOctal          "\<-\=0[oO]\?_\?\%(\o\|\o_\o\)\+i\>"
+syn match       goImaginaryBinary         "\<-\=0[bB]_\?\%([01]\|[01]_[01]\)\+i\>"
+
+" imaginary decimal floats with a decimal point
+syn match       goImaginaryFloat             "\<-\=\%(0\|\%(\d\|\d_\d\)\+\)\.\%(\%(\%(\d\|\d_\d\)\+\)\=\%([Ee][-+]\=\%(\d\|\d_\d\)\+\)\=\)\=i\>"
+syn match       goImaginaryFloat             "\s\zs-\=\.\%(\d\|\d_\d\)\+\%([Ee][-+]\=\%(\d\|\d_\d\)\+\)\=i\>"
+" imaginary decimal floats without a decimal point
+syn match       goImaginaryFloat             "\<-\=\%(0\|\%(\d\|\d_\d\)\+\)[Ee][-+]\=\%(\d\|\d_\d\)\+i\>"
+" imaginary hexadecimal floats with a decimal point
+syn match       goImaginaryHexadecimalFloat  "\<-\=0[xX]\%(_\x\|\x\)\+\.\%(\%(\x\|\x_\x\)\+\)\=\%([Pp][-+]\=\%(\d\|\d_\d\)\+\)\=i\>"
+syn match       goImaginaryHexadecimalFloat  "\<-\=0[xX]\.\%(\x\|\x_\x\)\+\%([Pp][-+]\=\%(\d\|\d_\d\)\+\)\=i\>"
+" imaginary hexadecimal floats without a decimal point
+syn match       goImaginaryHexadecimalFloat  "\<-\=0[xX]\%(_\x\|\x\)\+[Pp][-+]\=\%(\d\|\d_\d\)\+i\>"
+
+hi def link     goImaginaryDecimal             Number
+hi def link     goImaginaryHexadecimal         Number
+hi def link     goImaginaryOctal               Number
+hi def link     goImaginaryBinary              Number
+hi def link     goImaginaryFloat               Float
+hi def link     goImaginaryHexadecimalFloat    Float
 
 " Spaces after "[]"
 if go#config#HighlightArrayWhitespaceError()
diff --git a/syntax/gsl.vim b/syntax/gsl.vim
deleted file mode 100644
index 1c8407be9..000000000
--- a/syntax/gsl.vim
+++ /dev/null
@@ -1,63 +0,0 @@
-if polyglot#init#is_disabled(expand('<sfile>:p'), 'gdscript', 'syntax/gsl.vim')
-  finish
-endif
-
-" Syntax file for Godot Shading Language
-
-if exists("b:current_syntax")
-    finish
-endif
-let b:current_syntax = "gsl"
-
-let s:save_cpo = &cpo
-set cpo&vim
-
-syn keyword gslConditional if else
-syn keyword gslRepeat      for while
-syn match   gslOperator    "\V&&\|||\|!\|&\|^\||\|~\|*\|/\|%\|+\|-\|=\|<\|>\|;"
-syn match   gslDelimiter   "\V(\|)\|[\|]\|{\|}"
-syn keyword gslStatement   return discard
-syn keyword gslBoolean     true false
-
-syn keyword gslKeyword shader_type render_mode varying flat noperspective smooth
-                     \ uniform lowp mediump highp in out inout
-
-syn keyword gslType void bool bvec2 bvec3 bvec4 int ivec2 ivec3 ivec4
-                  \ uint uvec2 uvec3 uvec4 float vec2 vec3 vec4
-                  \ mat2 mat3 mat4 sampler2D isampler2D usampler2D samplerCube
-
-syn match   gslMember   "\v<(\.)@<=[a-z_]+\w*>"
-syn match   gslConstant  "\v<[A-Z_]+[A-Z0-9_]*>"
-syn match   gslFunction "\v<\w*>(\()@="
-
-syn match   gslNumber   "\v<\d+(\.)@!>"
-syn match   gslFloat    "\v<\d*\.\d+(\.)@!>"
-syn match   gslFloat    "\v<\d*\.=\d+(e-=\d+)@="
-syn match   gslExponent "\v(\d*\.=\d+)@<=e-=\d+>"
-
-syn match   gslComment "\v//.*$"
-syn region  gslComment start="/\*" end="\*/"
-syn keyword gslTodo    TODO FIXME XXX NOTE BUG HACK OPTIMIZE containedin=gslComment
-
-hi def link gslConditional Conditional
-hi def link gslRepeat      Repeat
-hi def link gslOperator    Operator
-hi def link gslDelimiter   Delimiter
-hi def link gslStatement   Statement
-hi def link gslBoolean     Boolean
-
-hi def link gslKeyword  Keyword
-hi def link gslMember   Identifier
-hi def link gslConstant Constant
-hi def link gslFunction Function
-hi def link gslType     Type
-
-hi def link gslNumber   Number
-hi def link gslFloat    Float
-hi def link gslExponent Special
-
-hi def link gslComment Comment
-hi def link gslTodo    Todo
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
diff --git a/syntax/haml.vim b/syntax/haml.vim
index 0861ed33c..a6a8b5688 100644
--- a/syntax/haml.vim
+++ b/syntax/haml.vim
@@ -6,7 +6,7 @@ endif
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
 " Filenames:	*.haml
-" Last Change:	2018 Aug 21
+" Last Change:	2019 Dec 05
 
 if exists("b:current_syntax")
   finish
diff --git a/syntax/help.vim b/syntax/help.vim
index 5a39fd999..e11f345e7 100644
--- a/syntax/help.vim
+++ b/syntax/help.vim
@@ -5,7 +5,7 @@ endif
 " Vim syntax file
 " Language:	Vim help file
 " Maintainer:	Bram Moolenaar (Bram@vim.org)
-" Last Change:	2021 Jun 13
+" Last Change:	2022 Sep 26
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -43,6 +43,7 @@ syn match helpVim		"VIM REFERENCE.*"
 syn match helpVim		"NVIM REFERENCE.*"
 syn match helpOption		"'[a-z]\{2,\}'"
 syn match helpOption		"'t_..'"
+syn match helpNormal		"'ab'"
 syn match helpCommand		"`[^` \t]\+`"hs=s+1,he=e-1 contains=helpBacktick
 syn match helpCommand		"\(^\|[^a-z"[]\)\zs`[^`]\+`\ze\([^a-z\t."']\|$\)"hs=s+1,he=e-1 contains=helpBacktick
 syn match helpHeader		"\s*\zs.\{-}\ze\s\=\~$" nextgroup=helpIgnore
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
index a30956ebd..c4253b665 100644
--- a/syntax/javascript.vim
+++ b/syntax/javascript.vim
@@ -28,16 +28,18 @@ syntax sync fromstart
 " syntax case ignore
 syntax case match
 
-syntax match   jsNoise          /[:,;]/
+syntax match   jsNoise          /[:;]/
+syntax match   jsNoise          /,/ skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsDot            /\./ skipwhite skipempty nextgroup=jsObjectProp,jsFuncCall,jsPrototype,jsTaggedTemplate
 syntax match   jsObjectProp     contained /\<\K\k*/
-syntax match   jsFuncCall       /\<\K\k*\ze\s*(/
+syntax match   jsFuncCall       /\<\K\k*\ze[\s\n]*(/
 syntax match   jsParensError    /[)}\]]/
 
 " Program Keywords
 syntax keyword jsStorageClass   const var let skipwhite skipempty nextgroup=jsDestructuringBlock,jsDestructuringArray,jsVariableDef
 syntax match   jsVariableDef    contained /\<\K\k*/ skipwhite skipempty nextgroup=jsFlowDefinition
-syntax keyword jsOperatorKeyword delete instanceof typeof void new in of skipwhite skipempty nextgroup=@jsExpression
+syntax keyword jsOperatorKeyword delete instanceof typeof void new in skipwhite skipempty nextgroup=@jsExpression
+syntax keyword jsOf             of skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsOperator       "[-!|&+<>=%/*~^]" skipwhite skipempty nextgroup=@jsExpression
 syntax match   jsOperator       /::/ skipwhite skipempty nextgroup=@jsExpression
 syntax keyword jsBooleanTrue    true
@@ -103,7 +105,8 @@ syntax keyword jsStatement     contained break continue skipwhite skipempty next
 syntax keyword jsConditional            if              skipwhite skipempty nextgroup=jsParenIfElse
 syntax keyword jsConditional            else            skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock
 syntax keyword jsConditional            switch          skipwhite skipempty nextgroup=jsParenSwitch
-syntax keyword jsRepeat                 while for       skipwhite skipempty nextgroup=jsParenRepeat,jsForAwait
+syntax keyword jsWhile                  while           skipwhite skipempty nextgroup=jsParenWhile
+syntax keyword jsFor                    for             skipwhite skipempty nextgroup=jsParenFor,jsForAwait
 syntax keyword jsDo                     do              skipwhite skipempty nextgroup=jsRepeatBlock
 syntax region  jsSwitchCase   contained matchgroup=jsLabel start=/\<\%(case\|default\)\>/ end=/:\@=/ contains=@jsExpression,jsLabel skipwhite skipempty nextgroup=jsSwitchColon keepend
 syntax keyword jsTry                    try             skipwhite skipempty nextgroup=jsTryCatchBlock
@@ -139,19 +142,20 @@ syntax keyword jsHtmlEvents     onblur onclick oncontextmenu ondblclick onfocus
 " Code blocks
 syntax region  jsBracket                      matchgroup=jsBrackets            start=/\[/ end=/\]/ contains=@jsExpression,jsSpreadExpression extend fold
 syntax region  jsParen                        matchgroup=jsParens              start=/(/  end=/)/  contains=@jsExpression extend fold nextgroup=jsFlowDefinition
-syntax region  jsParenDecorator     contained matchgroup=jsParensDecorator     start=/(/  end=/)/  contains=@jsAll extend fold
-syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock,jsReturn extend fold
-syntax region  jsParenRepeat        contained matchgroup=jsParensRepeat        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsCommentRepeat,jsRepeatBlock,jsReturn extend fold
-syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsAll skipwhite skipempty nextgroup=jsSwitchBlock extend fold
+syntax region  jsParenDecorator     contained matchgroup=jsParensDecorator     start=/(/  end=/)/  contains=@jsExpression extend fold
+syntax region  jsParenIfElse        contained matchgroup=jsParensIfElse        start=/(/  end=/)/  contains=@jsExpression skipwhite skipempty nextgroup=jsCommentIfElse,jsIfElseBlock,jsReturn extend fold
+syntax region  jsParenWhile         contained matchgroup=jsParensWhile         start=/(/  end=/)/  contains=@jsExpression skipwhite skipempty nextgroup=jsCommentRepeat,jsRepeatBlock,jsReturn extend fold
+syntax region  jsParenFor           contained matchgroup=jsParensFor           start=/(/  end=/)/  contains=@jsExpression,jsStorageClass,jsOf skipwhite skipempty nextgroup=jsCommentRepeat,jsRepeatBlock,jsReturn extend fold
+syntax region  jsParenSwitch        contained matchgroup=jsParensSwitch        start=/(/  end=/)/  contains=@jsExpression skipwhite skipempty nextgroup=jsSwitchBlock extend fold
 syntax region  jsParenCatch         contained matchgroup=jsParensCatch         start=/(/  end=/)/  skipwhite skipempty nextgroup=jsTryCatchBlock extend fold
 syntax region  jsFuncArgs           contained matchgroup=jsFuncParens          start=/(/  end=/)/  contains=jsFuncArgCommas,jsComment,jsFuncArgExpression,jsDestructuringBlock,jsDestructuringArray,jsRestExpression,jsFlowArgumentDef skipwhite skipempty nextgroup=jsCommentFunction,jsFuncBlock,jsFlowReturn extend fold
 syntax region  jsClassBlock         contained matchgroup=jsClassBraces         start=/{/  end=/}/  contains=jsClassFuncName,jsClassMethodType,jsArrowFunction,jsArrowFuncArgs,jsComment,jsGenerator,jsDecorator,jsClassProperty,jsClassPropertyComputed,jsClassStringKey,jsAsyncKeyword,jsNoise extend fold
-syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
-syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
-syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      start=/{/  end=/}/  contains=@jsAll,jsBlock skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
-syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
-syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock,jsSwitchCase extend fold
-syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll,jsBlock extend fold
+syntax region  jsFuncBlock          contained matchgroup=jsFuncBraces          start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsIfElseBlock        contained matchgroup=jsIfElseBraces        start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsTryCatchBlock      contained matchgroup=jsTryCatchBraces      start=/{/  end=/}/  contains=@jsAll skipwhite skipempty nextgroup=jsCatch,jsFinally extend fold
+syntax region  jsFinallyBlock       contained matchgroup=jsFinallyBraces       start=/{/  end=/}/  contains=@jsAll extend fold
+syntax region  jsSwitchBlock        contained matchgroup=jsSwitchBraces        start=/{/  end=/}/  contains=@jsAll,jsSwitchCase extend fold
+syntax region  jsRepeatBlock        contained matchgroup=jsRepeatBraces        start=/{/  end=/}/  contains=@jsAll extend fold
 syntax region  jsDestructuringBlock contained matchgroup=jsDestructuringBraces start=/{/  end=/}/  contains=jsDestructuringProperty,jsDestructuringAssignment,jsDestructuringNoise,jsDestructuringPropertyComputed,jsSpreadExpression,jsComment nextgroup=jsFlowDefinition extend fold
 syntax region  jsDestructuringArray contained matchgroup=jsDestructuringBraces start=/\[/ end=/\]/ contains=jsDestructuringPropertyValue,jsDestructuringNoise,jsDestructuringProperty,jsSpreadExpression,jsDestructuringBlock,jsDestructuringArray,jsComment nextgroup=jsFlowDefinition extend fold
 syntax region  jsObject             contained matchgroup=jsObjectBraces        start=/{/  end=/}/  contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectShorthandProp,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsDecorator,jsAsyncKeyword,jsTemplateString extend fold
@@ -169,7 +173,7 @@ syntax match   jsFuncName             contained /\<\K\k*/ skipwhite skipempty ne
 syntax region  jsFuncArgExpression    contained matchgroup=jsFuncArgOperator start=/=/ end=/[,)]\@=/ contains=@jsExpression extend
 syntax match   jsFuncArgCommas        contained ','
 syntax keyword jsArguments            contained arguments
-syntax keyword jsForAwait             contained await skipwhite skipempty nextgroup=jsParenRepeat
+syntax keyword jsForAwait             contained await skipwhite skipempty nextgroup=jsParenFor
 
 " Matches a single keyword argument with no parens
 syntax match   jsArrowFuncArgs  /\<\K\k*\ze\s*=>/ skipwhite contains=jsFuncArgs skipwhite skipempty nextgroup=jsArrowFunction extend
@@ -237,7 +241,7 @@ if exists("javascript_plugin_flow")
 endif
 
 syntax cluster jsExpression  contains=jsBracket,jsParen,jsObject,jsTernaryIf,jsTaggedTemplate,jsTemplateString,jsString,jsRegexpString,jsNumber,jsFloat,jsOperator,jsOperatorKeyword,jsBooleanTrue,jsBooleanFalse,jsNull,jsFunction,jsArrowFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsFuncCall,jsUndefined,jsNan,jsPrototype,jsBuiltins,jsNoise,jsClassDefinition,jsArrowFunction,jsArrowFuncArgs,jsParensError,jsComment,jsArguments,jsThis,jsSuper,jsDo,jsForAwait,jsAsyncKeyword,jsStatement,jsDot
-syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsRepeat,jsReturn,jsException,jsTry,jsNoise,jsBlockLabel
+syntax cluster jsAll         contains=@jsExpression,jsStorageClass,jsConditional,jsWhile,jsFor,jsReturn,jsException,jsTry,jsNoise,jsBlockLabel,jsBlock
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -252,6 +256,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsComment              Comment
   HiLink jsEnvComment           PreProc
   HiLink jsParensIfElse         jsParens
+  HiLink jsParensWhile          jsParensRepeat
+  HiLink jsParensFor            jsParensRepeat
   HiLink jsParensRepeat         jsParens
   HiLink jsParensSwitch         jsParens
   HiLink jsParensCatch          jsParens
@@ -277,6 +283,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsBranch               Conditional
   HiLink jsLabel                Label
   HiLink jsReturn               Statement
+  HiLink jsWhile                jsRepeat
+  HiLink jsFor                  jsRepeat
   HiLink jsRepeat               Repeat
   HiLink jsDo                   Repeat
   HiLink jsStatement            Statement
diff --git a/syntax/julia.vim b/syntax/julia.vim
index 0dcb1382e..5f35f4071 100644
--- a/syntax/julia.vim
+++ b/syntax/julia.vim
@@ -62,12 +62,6 @@ let s:op_chars = '\U25\U26\U2A\U2B\U2D\U2F\U3C-\U3E\U5C\U5E\U7C\U7E\UAC\UB1\UD7\
 " The list contains the following characters: '…⁝⅋←↑→↓↔↚↛↜↝↞↠↢↣↤↦↩↪↫↬↮↶↷↺↻↼↽⇀⇁⇄⇆⇇⇉⇋⇌⇍⇎⇏⇐⇒⇔⇚⇛⇜⇝⇠⇢⇴⇵⇶⇷⇸⇹⇺⇻⇼⇽⇾⇿∈∉∊∋∌∍∓∔∗∘∙√∛∜∝∤∥∦∧∨∩∪∷∸∺∻∽∾≀≁≂≃≄≅≆≇≈≉≊≋≌≍≎≏≐≑≒≓≔≕≖≗≘≙≚≛≜≝≞≟≠≡≢≣≤≥≦≧≨≩≪≫≬≭≮≯≰≱≲≳≴≵≶≷≸≹≺≻≼≽≾≿⊀⊁⊂⊃⊄⊅⊆⊇⊈⊉⊊⊋⊍⊎⊏⊐⊑⊒⊓⊔⊕⊖⊗⊘⊙⊚⊛⊜⊞⊟⊠⊡⊢⊣⊩⊬⊮⊰⊱⊲⊳⊴⊵⊶⊷⊻⊼⊽⋄⋅⋆⋇⋉⋊⋋⋌⋍⋎⋏⋐⋑⋒⋓⋕⋖⋗⋘⋙⋚⋛⋜⋝⋞⋟⋠⋡⋢⋣⋤⋥⋦⋧⋨⋩⋪⋫⋬⋭⋮⋯⋰⋱⋲⋳⋴⋵⋶⋷⋸⋹⋺⋻⋼⋽⋾⋿⌿▷⟂⟈⟉⟑⟒⟕⟖⟗⟰⟱⟵⟶⟷⟹⟺⟻⟼⟽⟾⟿⤀⤁⤂⤃⤄⤅⤆⤇⤈⤉⤊⤋⤌⤍⤎⤏⤐⤑⤒⤓⤔⤕⤖⤗⤘⤝⤞⤟⤠⥄⥅⥆⥇⥈⥉⥊⥋⥌⥍⥎⥏⥐⥑⥒⥓⥔⥕⥖⥗⥘⥙⥚⥛⥜⥝⥞⥟⥠⥡⥢⥣⥤⥥⥦⥧⥨⥩⥪⥫⥬⥭⥮⥯⥰⦷⦸⦼⦾⦿⧀⧁⧡⧣⧤⧥⧴⧶⧷⧺⧻⨇⨈⨝⨟⨢⨣⨤⨥⨦⨧⨨⨩⨪⨫⨬⨭⨮⨰⨱⨲⨳⨴⨵⨶⨷⨸⨹⨺⨻⨼⨽⩀⩁⩂⩃⩄⩅⩊⩋⩌⩍⩎⩏⩐⩑⩒⩓⩔⩕⩖⩗⩘⩚⩛⩜⩝⩞⩟⩠⩡⩢⩣⩦⩧⩪⩫⩬⩭⩮⩯⩰⩱⩲⩳⩴⩵⩶⩷⩸⩹⩺⩻⩼⩽⩾⩿⪀⪁⪂⪃⪄⪅⪆⪇⪈⪉⪊⪋⪌⪍⪎⪏⪐⪑⪒⪓⪔⪕⪖⪗⪘⪙⪚⪛⪜⪝⪞⪟⪠⪡⪢⪣⪤⪥⪦⪧⪨⪩⪪⪫⪬⪭⪮⪯⪰⪱⪲⪳⪴⪵⪶⪷⪸⪹⪺⪻⪼⪽⪾⪿⫀⫁⫂⫃⫄⫅⫆⫇⫈⫉⫊⫋⫌⫍⫎⫏⫐⫑⫒⫓⫔⫕⫖⫗⫘⫙⫛⫷⫸⫹⫺⬰⬱⬲⬳⬴⬵⬶⬷⬸⬹⬺⬻⬼⬽⬾⬿⭀⭁⭂⭃⭄⭇⭈⭉⭊⭋⭌￩￪￫￬'
 let s:op_chars_wc = '\U2026\U205D\U214B\U2190-\U2194\U219A-\U219E\U21A0\U21A2-\U21A4\U21A6\U21A9-\U21AC\U21AE\U21B6\U21B7\U21BA-\U21BD\U21C0\U21C1\U21C4\U21C6\U21C7\U21C9\U21CB-\U21D0\U21D2\U21D4\U21DA-\U21DD\U21E0\U21E2\U21F4-\U21FF\U2208-\U220D\U2213\U2214\U2217-\U221D\U2224-\U222A\U2237\U2238\U223A\U223B\U223D\U223E\U2240-\U228B\U228D-\U229C\U229E-\U22A3\U22A9\U22AC\U22AE\U22B0-\U22B7\U22BB-\U22BD\U22C4-\U22C7\U22C9-\U22D3\U22D5-\U22FF\U233F\U25B7\U27C2\U27C8\U27C9\U27D1\U27D2\U27D5-\U27D7\U27F0\U27F1\U27F5-\U27F7\U27F9-\U27FF\U2900-\U2918\U291D-\U2920\U2944-\U2970\U29B7\U29B8\U29BC\U29BE-\U29C1\U29E1\U29E3-\U29E5\U29F4\U29F6\U29F7\U29FA\U29FB\U2A07\U2A08\U2A1D\U2A1F\U2A22-\U2A2E\U2A30-\U2A3D\U2A40-\U2A45\U2A4A-\U2A58\U2A5A-\U2A63\U2A66\U2A67\U2A6A-\U2AD9\U2ADB\U2AF7-\U2AFA\U2B30-\U2B44\U2B47-\U2B4C\UFFE9-\UFFEC'
 
-" Full operators regex
-let s:operators = '\%(' . '\.\%([-+*/^÷%|&⊻]\|//\|\\\|>>\|>>>\?\)\?='
-      \         . '\|'  . '[:<>]=\|||\|&&\||>\|<|\|[<>:]:\|<<\|>>>\?\|//\|[-=]>\|\.\.\.\?'
-      \         . '\|'  . '\.\?[!' . s:op_chars . s:op_chars_wc . ']'
-      \         . '\)'
-
 
 " Characters that can be used to start an identifier. Above \UBF we don't
 " bother checking. (If a UTF8 operator is used, it will take precedence anyway.)
@@ -80,6 +74,12 @@ let s:id_charsW = '\%([0-9A-Za-z_!\UA2-\UA6\UA9\UAA\UAE-\UB0\UB2-\UB5\UB8-\UBA\U
 " A valid julia identifier, more or less
 let s:idregex = '\%(' . s:id_charsH . s:id_charsW . '*\)'
 
+" Full operators regex
+let s:operators = '\%(' . '\.\%([-+*/^÷%|&⊻]\|//\|\\\|>>\|>>>\?\)\?='
+      \         . '\|'  . '[!:<>]=\|||\|&&\||>\|<|\|[<>:]:\|<<\|>>>\?\|//\|[-=]>\|\.\.\.\?'
+      \         . '\|'  . '\.!' . '\|'.s:id_charsW.'\@'.s:d(1).'<!!'
+      \         . '\|'  . '\.\?[' . s:op_chars . s:op_chars_wc . ']'
+      \         . '\)'
 
 
 syn case match
@@ -90,10 +90,10 @@ syntax cluster juliaExprsNodot		contains=@juliaParItems,@juliaStringItems,@julia
 
 syntax cluster juliaParItems		contains=juliaParBlock,juliaSqBraIdxBlock,juliaSqBraBlock,juliaCurBraBlock,juliaQuotedParBlock,juliaQuotedQMarkPar
 syntax cluster juliaKeywordItems	contains=juliaKeyword,juliaWhereKeyword,juliaImportLine,juliaInfixKeyword,juliaRepKeyword
-syntax cluster juliaBlocksItems		contains=juliaConditionalBlock,juliaWhileBlock,juliaForBlock,juliaBeginBlock,juliaFunctionBlock,juliaMacroBlock,juliaQuoteBlock,juliaTypeBlock,juliaImmutableBlock,juliaExceptionBlock,juliaLetBlock,juliaDoBlock,juliaModuleBlock,juliaStructBlock,juliaMutableStructBlock,juliaAbstractBlock,juliaPrimitiveBlock
-syntax cluster juliaTypesItems		contains=juliaBaseTypeBasic,juliaBaseTypeNum,juliaBaseTypeC,juliaBaseTypeError,juliaBaseTypeIter,juliaBaseTypeString,juliaBaseTypeArray,juliaBaseTypeDict,juliaBaseTypeSet,juliaBaseTypeIO,juliaBaseTypeProcess,juliaBaseTypeRange,juliaBaseTypeRegex,juliaBaseTypeFact,juliaBaseTypeFact,juliaBaseTypeSort,juliaBaseTypeRound,juliaBaseTypeSpecial,juliaBaseTypeRandom,juliaBaseTypeDisplay,juliaBaseTypeTime,juliaBaseTypeOther
+syntax cluster juliaBlocksItems		contains=juliaConditionalBlock,juliaWhileBlock,juliaForBlock,juliaBeginBlock,juliaFunctionBlock,juliaMacroBlock,juliaQuoteBlock,juliaExceptionBlock,juliaLetBlock,juliaDoBlock,juliaModuleBlock,juliaStructBlock,juliaMutableStructBlock,juliaAbstractBlock,juliaPrimitiveBlock
+syntax cluster juliaTypesItems		contains=juliaBaseTypeBasic,juliaBaseTypeNum,juliaBaseTypeC,juliaBaseTypeError,juliaBaseTypeIter,juliaBaseTypeString,juliaBaseTypeArray,juliaBaseTypeDict,juliaBaseTypeSet,juliaBaseTypeIO,juliaBaseTypeProcess,juliaBaseTypeRange,juliaBaseTypeRegex,juliaBaseTypeFact,juliaBaseTypeSort,juliaBaseTypeRound,juliaBaseTypeSpecial,juliaBaseTypeRandom,juliaBaseTypeDisplay,juliaBaseTypeTime,juliaBaseTypeOther
 
-syntax cluster juliaConstItems  	contains=juliaConstNum,juliaConstBool,juliaConstEnv,juliaConstMMap,juliaConstC,juliaConstGeneric,juliaConstIO,juliaPossibleEuler
+syntax cluster juliaConstItems  	contains=juliaConstNum,juliaConstBool,juliaConstEnv,juliaConstC,juliaConstGeneric,juliaConstIO,juliaPossibleEuler
 
 syntax cluster juliaMacroItems		contains=juliaPossibleMacro,juliaDollarVar,juliaDollarPar,juliaDollarSqBra
 syntax cluster juliaSymbolItems		contains=juliaPossibleSymbol
diff --git a/syntax/kotlin.vim b/syntax/kotlin.vim
index 7175f7e34..39ddd4717 100644
--- a/syntax/kotlin.vim
+++ b/syntax/kotlin.vim
@@ -60,10 +60,11 @@ syn keyword ktConstant null
 
 syn keyword ktModifier reified external inline noinline crossinline
 
-syn match ktModifier "\v<(data|value)>\ze\@=.*<class>"
+syn match ktModifier "\v<data>\ze\@=.*<(class|object)>"
+syn match ktModifier "\v<value>\ze\@=.*<class>"
 syn match ktModifier "\v<(tailrec|operator|infix)>\ze\@=.*<fun>"
-syn match ktModifier "\v<(const)>\ze\@=.*<val>"
-syn match ktModifier "\v<(lateinit)>\ze\@=.*<var>"
+syn match ktModifier "\v<const>\ze\@=.*<val>"
+syn match ktModifier "\v<lateinit>\ze\@=.*<var>"
 syn match ktModifier "\v<(internal|private|protected|public)>\ze\@=.*<(class|object|interface|typealias|fun|val|var|constructor|get|set)>"
 
 syn match ktOperator "\v\?:|::|\<\=? | \>\=?|[!=]\=\=?|<as>\??|[-*+/%]\=?|[!&|]"
diff --git a/syntax/llvm.vim b/syntax/llvm.vim
index ee58753f3..50dc0c9fe 100644
--- a/syntax/llvm.vim
+++ b/syntax/llvm.vim
@@ -19,8 +19,8 @@ syn case match
 " Types also include struct, array, vector, etc. but these don't
 " benefit as much from having dedicated highlighting rules.
 syn keyword llvmType void half bfloat float double x86_fp80 fp128 ppc_fp128
-syn keyword llvmType label metadata x86_mmx
-syn keyword llvmType type label opaque token
+syn keyword llvmType label metadata x86_mmx x86_amx
+syn keyword llvmType type label opaque token ptr
 syn match   llvmType /\<i\d\+\>/
 
 " Instructions.
@@ -29,16 +29,16 @@ syn match   llvmType /\<i\d\+\>/
 syn keyword llvmStatement add addrspacecast alloca and arcp ashr atomicrmw
 syn keyword llvmStatement bitcast br catchpad catchswitch catchret call callbr
 syn keyword llvmStatement cleanuppad cleanupret cmpxchg eq exact extractelement
-syn keyword llvmStatement extractvalue fadd fast fcmp fdiv fence fmul fpext
-syn keyword llvmStatement fptosi fptoui fptrunc free frem fsub fneg getelementptr
-syn keyword llvmStatement icmp inbounds indirectbr insertelement insertvalue
-syn keyword llvmStatement inttoptr invoke landingpad load lshr malloc max min
-syn keyword llvmStatement mul nand ne ninf nnan nsw nsz nuw oeq oge ogt ole
-syn keyword llvmStatement olt one or ord phi ptrtoint resume ret sdiv select
-syn keyword llvmStatement sext sge sgt shl shufflevector sitofp sle slt srem
-syn keyword llvmStatement store sub switch trunc udiv ueq uge ugt uitofp ule ult
-syn keyword llvmStatement umax umin une uno unreachable unwind urem va_arg
-syn keyword llvmStatement xchg xor zext
+syn keyword llvmStatement extractvalue fadd fast fcmp fdiv fence fmul fneg fpext
+syn keyword llvmStatement fptosi fptoui fptrunc free freeze frem fsub
+syn keyword llvmStatement getelementptr icmp inbounds indirectbr insertelement
+syn keyword llvmStatement insertvalue inttoptr invoke landingpad load lshr
+syn keyword llvmStatement malloc max min mul nand ne ninf nnan nsw nsz nuw oeq
+syn keyword llvmStatement oge ogt ole olt one or ord phi ptrtoint resume ret
+syn keyword llvmStatement sdiv select sext sge sgt shl shufflevector sitofp
+syn keyword llvmStatement sle slt srem store sub switch trunc udiv ueq uge ugt
+syn keyword llvmStatement uitofp ule ult umax umin une uno unreachable unwind
+syn keyword llvmStatement urem va_arg xchg xor zext
 
 " Keywords.
 syn keyword llvmKeyword
@@ -48,11 +48,12 @@ syn keyword llvmKeyword
       \ alias
       \ align
       \ alignstack
+      \ allocsize
       \ alwaysinline
       \ appending
       \ argmemonly
-      \ arm_aapcscc
       \ arm_aapcs_vfpcc
+      \ arm_aapcscc
       \ arm_apcscc
       \ asm
       \ atomic
@@ -62,51 +63,58 @@ syn keyword llvmKeyword
       \ byref
       \ byval
       \ c
-      \ catch
       \ caller
+      \ catch
       \ cc
       \ ccc
       \ cleanup
+      \ cold
       \ coldcc
       \ comdat
       \ common
       \ constant
+      \ convergent
       \ datalayout
       \ declare
       \ default
       \ define
       \ deplibs
       \ dereferenceable
+      \ dereferenceable_or_null
       \ distinct
       \ dllexport
       \ dllimport
       \ dso_local
       \ dso_preemptable
       \ except
+      \ extern_weak
       \ external
       \ externally_initialized
-      \ extern_weak
       \ fastcc
-      \ tailcc
       \ filter
       \ from
       \ gc
       \ global
-      \ hhvmcc
       \ hhvm_ccc
+      \ hhvmcc
       \ hidden
+      \ hot
       \ immarg
+      \ inaccessiblemem_or_argmemonly
+      \ inaccessiblememonly
+      \ inalloca
       \ initialexec
       \ inlinehint
       \ inreg
-      \ inteldialect
       \ intel_ocl_bicc
+      \ inteldialect
       \ internal
+      \ jumptable
       \ linkonce
       \ linkonce_odr
+      \ local_unnamed_addr
       \ localdynamic
       \ localexec
-      \ local_unnamed_addr
       \ minsize
       \ module
       \ monotonic
@@ -117,19 +125,32 @@ syn keyword llvmKeyword
       \ nest
       \ noalias
       \ nobuiltin
+      \ nocallback
       \ nocapture
+      \ nocf_check
+      \ no_cfi
+      \ noduplicate
+      \ nofree
       \ noimplicitfloat
       \ noinline
+      \ nomerge
       \ nonlazybind
       \ nonnull
+      \ noprofile
       \ norecurse
       \ noredzone
       \ noreturn
+      \ nosync
       \ noundef
       \ nounwind
+      \ nosanitize_bounds
+      \ nosanitize_coverage
+      \ null_pointer_is_valid
+      \ optforfuzzing
       \ optnone
       \ optsize
       \ personality
+      \ preallocated
       \ private
       \ protected
       \ ptx_device
@@ -139,16 +160,20 @@ syn keyword llvmKeyword
       \ release
       \ returned
       \ returns_twice
+      \ safestack
       \ sanitize_address
+      \ sanitize_hwaddress
       \ sanitize_memory
+      \ sanitize_memtag
       \ sanitize_thread
       \ section
       \ seq_cst
+      \ shadowcallstack
       \ sideeffect
       \ signext
-      \ syncscope
       \ source_filename
       \ speculatable
+      \ speculative_load_hardening
       \ spir_func
       \ spir_kernel
       \ sret
@@ -157,8 +182,12 @@ syn keyword llvmKeyword
       \ sspstrong
       \ strictfp
       \ swiftcc
+      \ swifterror
+      \ swifttailcc
       \ swiftself
+      \ syncscope
       \ tail
+      \ tailcc
       \ target
       \ thread_local
       \ to
@@ -171,10 +200,11 @@ syn keyword llvmKeyword
       \ volatile
       \ weak
       \ weak_odr
+      \ willreturn
+      \ win64cc
       \ within
       \ writeonly
       \ x86_64_sysvcc
-      \ win64cc
       \ x86_fastcallcc
       \ x86_stdcallcc
       \ x86_thiscallcc
@@ -189,7 +219,7 @@ syn match   llvmNumber /-\?\<\d\+\>/
 syn match   llvmFloat  /-\?\<\d\+\.\d*\(e[+-]\d\+\)\?\>/
 syn match   llvmFloat  /\<0x\x\+\>/
 syn keyword llvmBoolean true false
-syn keyword llvmConstant zeroinitializer undef null none
+syn keyword llvmConstant zeroinitializer undef null none poison vscale
 syn match   llvmComment /;.*$/
 syn region  llvmString start=/"/ skip=/\\"/ end=/"/
 syn match   llvmLabel /[-a-zA-Z$._][-a-zA-Z$._0-9]*:/
@@ -212,7 +242,8 @@ syn match  llvmSpecialComment /;\s*REQUIRES:.*$/
 syn match  llvmSpecialComment /;\s*RUN:.*$/
 syn match  llvmSpecialComment /;\s*ALLOW_RETRIES:.*$/
 syn match  llvmSpecialComment /;\s*CHECK:.*$/
-syn match  llvmSpecialComment "\v;\s*CHECK-(NEXT|NOT|DAG|SAME|LABEL):.*$"
+syn match  llvmSpecialComment /;\s*CHECK-EMPTY:\s*$/
+syn match  llvmSpecialComment /\v;\s*CHECK-(NEXT|NOT|DAG|SAME|LABEL|COUNT-\d+):.*$/
 syn match  llvmSpecialComment /;\s*XFAIL:.*$/
 
 if version >= 508 || !exists("did_c_syn_inits")
diff --git a/syntax/machine-ir.vim b/syntax/machine-ir.vim
new file mode 100644
index 000000000..ad43a9f5e
--- /dev/null
+++ b/syntax/machine-ir.vim
@@ -0,0 +1,42 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'syntax/machine-ir.vim')
+  finish
+endif
+
+" Vim syntax file
+" Language:   mir
+" Maintainer: The LLVM team, http://llvm.org/
+" Version:      $Revision$
+
+syn case match
+
+" FIXME: MIR doesn't actually match LLVM IR. Stop including it all as a
+" fallback once enough is implemented.
+" See the MIR LangRef: https://llvm.org/docs/MIRLangRef.html
+unlet b:current_syntax  " Unlet so that the LLVM syntax will load
+runtime! syntax/llvm.vim
+unlet b:current_syntax
+
+syn match   mirType /\<[sp]\d\+\>/
+
+" Opcodes. Matching instead of listing them because individual targets can add
+" these. FIXME: Maybe use some more context to make this more accurate?
+syn match   mirStatement /\<[A-Z][A-Za-z0-9_]*\>/
+
+syn match   mirPReg /$[-a-zA-Z$._][-a-zA-Z$._0-9]*/
+
+if version >= 508 || !exists("did_c_syn_inits")
+  if version < 508
+    let did_c_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink mirType Type
+  HiLink mirStatement Statement
+  HiLink mirPReg Identifier
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "mir"
diff --git a/syntax/meson.vim b/syntax/meson.vim
index c392cccd9..d3af405de 100644
--- a/syntax/meson.vim
+++ b/syntax/meson.vim
@@ -72,6 +72,7 @@ syn keyword mesonBuiltin
   \ add_global_link_arguments
   \ add_languages
   \ add_project_arguments
+  \ add_project_dependencies
   \ add_project_link_arguments
   \ add_test_setup
   \ alias_target
diff --git a/syntax/mir.vim b/syntax/mir.vim
new file mode 100644
index 000000000..55273945d
--- /dev/null
+++ b/syntax/mir.vim
@@ -0,0 +1,52 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'syntax/mir.vim')
+  finish
+endif
+
+" Vim syntax file
+" Language:   mir
+" Maintainer: The LLVM team, http://llvm.org/
+" Version:      $Revision$
+
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+syn case match
+
+" MIR is embedded in a yaml container, so we load all of the yaml syntax.
+runtime! syntax/yaml.vim
+unlet b:current_syntax
+
+" The first document of a file is allowed to contain an LLVM IR module inside
+" a top-level yaml block string.
+syntax include @LLVM syntax/llvm.vim
+" FIXME: This should only be allowed for the first document of the file
+syntax region llvm start=/\(^---\s*|\)\@<=/ end=/\(^\.\.\.\)\@=/ contains=@LLVM
+
+" The `body:` field of a document contains the MIR dump of the function
+syntax include @MIR syntax/machine-ir.vim
+syntax region mir start=/\(^body:\s*|\)\@<=/ end=/\(^[^[:space:]]\)\@=/ contains=@MIR
+
+" Syntax-highlight lit test commands and bug numbers.
+syn match  mirSpecialComment /#\s*PR\d*\s*$/
+syn match  mirSpecialComment /#\s*REQUIRES:.*$/
+syn match  mirSpecialComment /#\s*RUN:.*$/
+syn match  mirSpecialComment /#\s*ALLOW_RETRIES:.*$/
+syn match  mirSpecialComment /#\s*CHECK:.*$/
+syn match  mirSpecialComment "\v#\s*CHECK-(NEXT|NOT|DAG|SAME|LABEL):.*$"
+syn match  mirSpecialComment /#\s*XFAIL:.*$/
+
+if version >= 508 || !exists("did_c_syn_inits")
+  if version < 508
+    let did_c_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink mirSpecialComment SpecialComment
+endif
+
+let b:current_syntax = "mir"
diff --git a/syntax/mlir.vim b/syntax/mlir.vim
index 6539cbdc9..13f468c95 100644
--- a/syntax/mlir.vim
+++ b/syntax/mlir.vim
@@ -18,7 +18,7 @@ syn case match
 
 " Types.
 "
-syn keyword mlirType index f16 f32 f64
+syn keyword mlirType index f16 f32 f64 bf16
 " Signless integer types.
 syn match mlirType /\<i\d\+\>/
 " Unsigned integer types.
@@ -27,7 +27,7 @@ syn match mlirType /\<ui\d\+\>/
 syn match mlirType /\<si\d\+\>/
 
 " Elemental types inside memref, tensor, or vector types.
-syn match mlirType /x\s*\zs\(f16\|f32\|f64\|i\d\+\|ui\d\+\|si\d\+\)/
+syn match mlirType /x\s*\zs\(bf16|f16\|f32\|f64\|i\d\+\|ui\d\+\|si\d\+\)/
 
 " Shaped types.
 syn match mlirType /\<memref\ze\s*<.*>/
@@ -38,7 +38,6 @@ syn match mlirType /\<vector\ze\s*<.*>/
 syn match mlirType /x\s*\zsvector/
 
 " Operations.
-" Standard dialect ops.
 " TODO: this list is not exhaustive.
 syn keyword mlirOps alloc alloca addf addi and call call_indirect cmpf cmpi
 syn keyword mlirOps constant dealloc divf dma_start dma_wait dim exp
@@ -47,6 +46,9 @@ syn keyword mlirOps memref_shape_cast mulf muli negf powf prefetch rsqrt sitofp
 syn keyword mlirOps splat store select sqrt subf subi subview tanh
 syn keyword mlirOps view
 
+" Math ops.
+syn match mlirOps /\<math\.erf\>/
+
 " Affine ops.
 syn match mlirOps /\<affine\.apply\>/
 syn match mlirOps /\<affine\.dma_start\>/
@@ -57,8 +59,10 @@ syn match mlirOps /\<affine\.load\>/
 syn match mlirOps /\<affine\.parallel\>/
 syn match mlirOps /\<affine\.prefetch\>/
 syn match mlirOps /\<affine\.store\>/
-syn match mlirOps /\<loop\.for\>/
-syn match mlirOps /\<loop\.if\>/
+syn match mlirOps /\<scf\.execute_region\>/
+syn match mlirOps /\<scf\.for\>/
+syn match mlirOps /\<scf\.if\>/
+syn match mlirOps /\<scf\.yield\>/
 
 " TODO: dialect name prefixed ops (llvm or std).
 
@@ -84,12 +88,22 @@ syn match   mlirNumber /x\s*\zs-\?\d\+\ze\s*x/
 syn match   mlirFloat  /-\?\<\d\+\.\d*\(e[+-]\d\+\)\?\>/
 syn match   mlirFloat  /\<0x\x\+\>/
 syn keyword mlirBoolean true false
-syn match   mlirComment /\/\/.*$/
+" Spell checking is enabled only in comments by default.
+syn match   mlirComment /\/\/.*$/ contains=@Spell
 syn region  mlirString start=/"/ skip=/\\"/ end=/"/
 syn match   mlirLabel /[-a-zA-Z$._][-a-zA-Z$._0-9]*:/
+" Prefixed identifiers usually used for ssa values and symbols.
 syn match   mlirIdentifier /[%@][a-zA-Z$._-][a-zA-Z0-9$._-]*/
-syn match   mlirIdentifier /[%@!]\d\+\>/
-syn match mlirMapSetOutline "#.*$"
+syn match   mlirIdentifier /[%@]\d\+\>/
+" Prefixed identifiers usually used for blocks.
+syn match   mlirBlockIdentifier /\^[a-zA-Z$._-][a-zA-Z0-9$._-]*/
+syn match   mlirBlockIdentifier /\^\d\+\>/
+" Prefixed identifiers usually used for types.
+syn match   mlirTypeIdentifier /![a-zA-Z$._-][a-zA-Z0-9$._-]*/
+syn match   mlirTypeIdentifier /!\d\+\>/
+" Prefixed identifiers usually used for attribute aliases and result numbers.
+syn match   mlirAttrIdentifier /#[a-zA-Z$._-][a-zA-Z0-9$._-]*/
+syn match   mlirAttrIdentifier /#\d\+\>/
 
 " Syntax-highlight lit test commands and bug numbers.
 syn match  mlirSpecialComment /\/\/\s*RUN:.*$/
@@ -111,7 +125,6 @@ if version >= 508 || !exists("did_c_syn_inits")
 
   HiLink mlirType Type
   HiLink mlirOps Statement
-  HiLink mlirMapSetOutline PreProc
   HiLink mlirNumber Number
   HiLink mlirComment Comment
   HiLink mlirString String
@@ -122,6 +135,9 @@ if version >= 508 || !exists("did_c_syn_inits")
   HiLink mlirConstant Constant
   HiLink mlirSpecialComment SpecialComment
   HiLink mlirIdentifier Identifier
+  HiLink mlirBlockIdentifier Label
+  HiLink mlirTypeIdentifier Type
+  HiLink mlirAttrIdentifier PreProc
 
   delcommand HiLink
 endif
diff --git a/syntax/ocaml.vim b/syntax/ocaml.vim
index e3e6cfa3e..88b2fa314 100644
--- a/syntax/ocaml.vim
+++ b/syntax/ocaml.vim
@@ -10,6 +10,7 @@ endif
 "               Issac Trotts      <ijtrotts@ucdavis.edu>
 " URL:          https://github.com/ocaml/vim-ocaml
 " Last Change:
+"               2019 Nov 05 - Accurate type highlighting (Maëlan)
 "               2018 Nov 08 - Improved highlighting of operators (Maëlan)
 "               2018 Apr 22 - Improved support for PPX (Andrey Popp)
 "               2018 Mar 16 - Remove raise, lnot and not from keywords (Étienne Millon, "copy")
@@ -42,25 +43,18 @@ syn case match
 " Access to the method of an object
 syn match    ocamlMethod       "#"
 
-" Script headers highlighted like comments
-syn match    ocamlComment   "^#!.*" contains=@Spell
-
 " Scripting directives
 syn match    ocamlScript "^#\<\(quit\|labels\|warnings\|warn_error\|directory\|remove_directory\|cd\|load\|load_rec\|use\|mod_use\|install_printer\|remove_printer\|require\|list\|ppx\|principal\|predicates\|rectypes\|thread\|trace\|untrace\|untrace_all\|print_depth\|print_length\|camlp4o\|camlp4r\|topfind_log\|topfind_verbose\)\>"
 
 " lowercase identifier - the standard way to match
 syn match    ocamlLCIdentifier /\<\(\l\|_\)\(\w\|'\)*\>/
 
-syn match    ocamlKeyChar    "|"
-
 " Errors
 syn match    ocamlBraceErr   "}"
 syn match    ocamlBrackErr   "\]"
 syn match    ocamlParenErr   ")"
 syn match    ocamlArrErr     "|]"
 
-syn match    ocamlCommentErr "\*)"
-
 syn match    ocamlCountErr   "\<downto\>"
 syn match    ocamlCountErr   "\<to\>"
 
@@ -79,19 +73,22 @@ else
   syn match    ocamlEndErr     "\<end\>"
 endif
 
-" Some convenient clusters
-syn cluster  ocamlAllErrs contains=ocamlBraceErr,ocamlBrackErr,ocamlParenErr,ocamlCommentErr,ocamlCountErr,ocamlDoErr,ocamlDoneErr,ocamlEndErr,ocamlThenErr
+" These keywords are only expected nested in constructions that are handled by
+" the type linter, so outside of type contexts we highlight them as errors:
+syn match    ocamlKwErr  "\<\(mutable\|nonrec\|of\|private\)\>"
 
-syn cluster  ocamlAENoParen contains=ocamlBraceErr,ocamlBrackErr,ocamlCommentErr,ocamlCountErr,ocamlDoErr,ocamlDoneErr,ocamlEndErr,ocamlThenErr
+" Some convenient clusters
+syn cluster  ocamlAllErrs contains=@ocamlAENoParen,ocamlParenErr
+syn cluster  ocamlAENoParen contains=ocamlBraceErr,ocamlBrackErr,ocamlCountErr,ocamlDoErr,ocamlDoneErr,ocamlEndErr,ocamlThenErr,ocamlKwErr
 
 syn cluster  ocamlContained contains=ocamlTodo,ocamlPreDef,ocamlModParam,ocamlModParam1,ocamlMPRestr,ocamlMPRestr1,ocamlMPRestr2,ocamlMPRestr3,ocamlModRHS,ocamlFuncWith,ocamlFuncStruct,ocamlModTypeRestr,ocamlModTRWith,ocamlWith,ocamlWithRest,ocamlModType,ocamlFullMod,ocamlVal
 
 
 " Enclosing delimiters
-syn region   ocamlEncl transparent matchgroup=ocamlKeywordDelimiter start="(" matchgroup=ocamlKeywordDelimiter end=")" contains=ALLBUT,@ocamlContained,ocamlParenErr
-syn region   ocamlEncl transparent matchgroup=ocamlKeywordDelimiter start="{" matchgroup=ocamlKeywordDelimiter end="}"  contains=ALLBUT,@ocamlContained,ocamlBraceErr
-syn region   ocamlEncl transparent matchgroup=ocamlKeywordDelimiter start="\[" matchgroup=ocamlKeywordDelimiter end="\]" contains=ALLBUT,@ocamlContained,ocamlBrackErr
-syn region   ocamlEncl transparent matchgroup=ocamlKeywordDelimiter start="\[|" matchgroup=ocamlKeywordDelimiter end="|\]" contains=ALLBUT,@ocamlContained,ocamlArrErr
+syn region   ocamlNone transparent matchgroup=ocamlEncl start="(" matchgroup=ocamlEncl end=")" contains=ALLBUT,@ocamlContained,ocamlParenErr
+syn region   ocamlNone transparent matchgroup=ocamlEncl start="{" matchgroup=ocamlEncl end="}"  contains=ALLBUT,@ocamlContained,ocamlBraceErr
+syn region   ocamlNone transparent matchgroup=ocamlEncl start="\[" matchgroup=ocamlEncl end="\]" contains=ALLBUT,@ocamlContained,ocamlBrackErr
+syn region   ocamlNone transparent matchgroup=ocamlEncl start="\[|" matchgroup=ocamlEncl end="|\]" contains=ALLBUT,@ocamlContained,ocamlArrErr
 
 
 " Comments
@@ -141,7 +138,7 @@ syn match    ocamlKeyword "\<include\>" skipwhite skipempty nextgroup=ocamlModPa
 " "module" - somewhat complicated stuff ;-)
 syn region   ocamlModule matchgroup=ocamlKeyword start="\<module\>" matchgroup=ocamlModule end="\<\u\(\w\|'\)*\>" contains=@ocamlAllErrs,ocamlComment skipwhite skipempty nextgroup=ocamlPreDef
 syn region   ocamlPreDef start="."me=e-1 matchgroup=ocamlKeyword end="\l\|=\|)"me=e-1 contained contains=@ocamlAllErrs,ocamlComment,ocamlModParam,ocamlGenMod,ocamlModTypeRestr,ocamlModTRWith nextgroup=ocamlModPreRHS
-syn region   ocamlModParam start="([^*]" end=")" contained contains=ocamlGenMod,ocamlModParam1,ocamlSig,ocamlVal
+syn region   ocamlModParam start="(\*\@!" end=")" contained contains=ocamlGenMod,ocamlModParam,ocamlModParam1,ocamlSig,ocamlVal
 syn match    ocamlModParam1 "\<\u\(\w\|'\)*\>" contained skipwhite skipempty
 syn match    ocamlGenMod "()" contained skipwhite skipempty
 
@@ -155,7 +152,7 @@ syn region   ocamlVal matchgroup=ocamlKeyword start="\<val\>" matchgroup=ocamlLC
 syn region   ocamlModRHS start="." end=". *\w\|([^*]"me=e-2 contained contains=ocamlComment skipwhite skipempty nextgroup=ocamlModParam,ocamlFullMod
 syn match    ocamlFullMod "\<\u\(\w\|'\)*\( *\. *\u\(\w\|'\)*\)*" contained skipwhite skipempty nextgroup=ocamlFuncWith
 
-syn region   ocamlFuncWith start="([^*)]"me=e-1 end=")" contained contains=ocamlComment,ocamlWith,ocamlFuncStruct skipwhite skipempty nextgroup=ocamlFuncWith
+syn region   ocamlFuncWith start="([*)]\@!" end=")" contained contains=ocamlComment,ocamlWith,ocamlFuncStruct skipwhite skipempty nextgroup=ocamlFuncWith
 syn region   ocamlFuncStruct matchgroup=ocamlStructEncl start="[^a-zA-Z]struct\>"hs=s+1 matchgroup=ocamlStructEncl end="\<end\>" contains=ALLBUT,@ocamlContained,ocamlEndErr
 
 syn match    ocamlModTypeRestr "\<\w\(\w\|'\)*\( *\. *\w\(\w\|'\)*\)*\>" contained
@@ -167,7 +164,7 @@ syn region   ocamlWithRest start="[^)]" end=")"me=e-1 contained contains=ALLBUT,
 syn region   ocamlStruct matchgroup=ocamlStructEncl start="\<\(module\s\+\)\=struct\>" matchgroup=ocamlStructEncl end="\<end\>" contains=ALLBUT,@ocamlContained,ocamlEndErr
 
 " "module type"
-syn region   ocamlKeyword start="\<module\>\s*\<type\>\(\s*\<of\>\)\=" matchgroup=ocamlModule end="\<\w\(\w\|'\)*\>" contains=ocamlComment skipwhite skipempty nextgroup=ocamlMTDef
+syn region   ocamlKeyword start="\<module\s\+type\(\s\+of\)\=\>" matchgroup=ocamlModule end="\<\w\(\w\|'\)*\>" contains=ocamlComment skipwhite skipempty nextgroup=ocamlMTDef
 syn match    ocamlMTDef "=\s*\w\(\w\|'\)*\>"hs=s+1,me=s+1 skipwhite skipempty nextgroup=ocamlFullMod
 
 " Quoted strings
@@ -175,16 +172,26 @@ syn region ocamlString matchgroup=ocamlQuotedStringDelim start="{\z\([a-z_]*\)|"
 syn region ocamlString matchgroup=ocamlQuotedStringDelim start="{%[a-z_]\+\(\.[a-z_]\+\)\?\( \z\([a-z_]\+\)\)\?|" end="|\z1}" contains=@Spell
 
 syn keyword  ocamlKeyword  and as assert class
-syn keyword  ocamlKeyword  constraint else
-syn keyword  ocamlKeyword  exception external fun
-
+syn keyword  ocamlKeyword  else
+syn keyword  ocamlKeyword  external
 syn keyword  ocamlKeyword  in inherit initializer
 syn keyword  ocamlKeyword  lazy let match
-syn keyword  ocamlKeyword  method mutable new nonrec of
-syn keyword  ocamlKeyword  parser private rec
-syn keyword  ocamlKeyword  try type
+syn keyword  ocamlKeyword  method new
+syn keyword  ocamlKeyword  parser rec
+syn keyword  ocamlKeyword  try
 syn keyword  ocamlKeyword  virtual when while with
 
+" Keywords which are handled by the type linter:
+"     as (within a type equation)
+"     constraint exception mutable nonrec of private type
+
+" The `fun` keyword has special treatment because of the syntax `fun … : t -> e`
+" where `->` ends the type context rather than being part of it; to handle that,
+" we blacklist the ocamlTypeAnnot matchgroup, and we plug ocamlFunTypeAnnot
+" instead (later in this file, by using containedin=ocamlFun):
+syn region ocamlFun matchgroup=ocamlKeyword start='\<fun\>' matchgroup=ocamlArrow end='->'
+\ contains=ALLBUT,@ocamlContained,ocamlArrow,ocamlInfixOp,ocamlTypeAnnot
+
 if exists("ocaml_revised")
   syn keyword  ocamlKeyword  do value
   syn keyword  ocamlBoolean  True False
@@ -193,14 +200,10 @@ else
   syn keyword  ocamlBoolean  true false
 endif
 
-syn keyword  ocamlType     array bool char exn float format format4
-syn keyword  ocamlType     int int32 int64 lazy_t list nativeint option
-syn keyword  ocamlType     bytes string unit
-
-syn match    ocamlConstructorDelimiter  "(\s*)"
-syn match    ocamlConstructorDelimiter  "\[\s*\]"
-syn match    ocamlConstructorDelimiter  "\[|\s*>|]"
-syn match    ocamlConstructorDelimiter  "\[<\s*>\]"
+syn match    ocamlEmptyConstructor  "(\s*)"
+syn match    ocamlEmptyConstructor  "\[\s*\]"
+syn match    ocamlEmptyConstructor  "\[|\s*>|]"
+syn match    ocamlEmptyConstructor  "\[<\s*>\]"
 syn match    ocamlConstructor  "\u\(\w\|'\)*\>"
 
 " Polymorphic variants
@@ -215,26 +218,24 @@ syn match    ocamlCharErr      "'\\\d\d'\|'\\\d'"
 syn match    ocamlCharErr      "'\\[^\'ntbr]'"
 syn region   ocamlString       start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell
 
-syn match    ocamlTopStop      ";;"
-
 syn match    ocamlAnyVar       "\<_\>"
-syn match    ocamlKeyChar      "|[^\]]"me=e-1
+syn match    ocamlKeyChar      "|]\@!"
 syn match    ocamlKeyChar      ";"
 syn match    ocamlKeyChar      "\~"
 syn match    ocamlKeyChar      "?"
 
+" NOTE: for correct precedence, the rule for ";;" must come after that for ";"
+syn match    ocamlTopStop      ";;"
+
 "" Operators
 
 " The grammar of operators is found there:
 "     https://caml.inria.fr/pub/docs/manual-ocaml/names.html#operator-name
 "     https://caml.inria.fr/pub/docs/manual-ocaml/extn.html#s:ext-ops
 "     https://caml.inria.fr/pub/docs/manual-ocaml/extn.html#s:index-operators
-" =, *, < and > are both operator names and keywords, we let the user choose how
-" to display them (has to be declared before regular infix operators):
+" = is both an operator name and a keyword, we let the user choose how
+" to display it (has to be declared before regular infix operators):
 syn match    ocamlEqual        "="
-syn match    ocamlStar         "*"
-syn match    ocamlAngle        "<"
-syn match    ocamlAngle        ">"
 " Custom indexing operators:
 syn region   ocamlIndexing matchgroup=ocamlIndexingOp
   \ start="\.[~?!:|&$%=>@^/*+-][~?!.:|&$%<=>@^*/+-]*\_s*("
@@ -253,8 +254,8 @@ syn match    ocamlExtensionOp          "#[#~?!.:|&$%<=>@^*/+-]\+"
 " Infix and prefix operators:
 syn match    ocamlPrefixOp              "![~?!.:|&$%<=>@^*/+-]*"
 syn match    ocamlPrefixOp           "[~?][~?!.:|&$%<=>@^*/+-]\+"
-syn match    ocamlInfixOp      "[&$%@^/+-][~?!.:|&$%<=>@^*/+-]*"
-syn match    ocamlInfixOp         "[|<=>*][~?!.:|&$%<=>@^*/+-]\+"
+syn match    ocamlInfixOp   "[&$%<>@^*/+-][~?!.:|&$%<=>@^*/+-]*"
+syn match    ocamlInfixOp            "[|=][~?!.:|&$%<=>@^*/+-]\+"
 syn match    ocamlInfixOp               "#[~?!.:|&$%<=>@^*/+-]\+#\@!"
 syn match    ocamlInfixOp              "!=[~?!.:|&$%<=>@^*/+-]\@!"
 syn keyword  ocamlInfixOpKeyword      asr land lor lsl lsr lxor mod or
@@ -271,6 +272,9 @@ else
   syn match    ocamlKeyChar    "<-[~?!.:|&$%<=>@^*/+-]\@!"
 endif
 
+" Script shebang (has to be declared after operators)
+syn match    ocamlShebang       "\%1l^#!.*$"
+
 syn match    ocamlNumber        "-\=\<\d\(_\|\d\)*[l|L|n]\?\>"
 syn match    ocamlNumber        "-\=\<0[x|X]\(\x\|_\)\+[l|L|n]\?\>"
 syn match    ocamlNumber        "-\=\<0[o|O]\(\o\|_\)\+[l|L|n]\?\>"
@@ -278,10 +282,264 @@ syn match    ocamlNumber        "-\=\<0[b|B]\([01]\|_\)\+[l|L|n]\?\>"
 syn match    ocamlFloat         "-\=\<\d\(_\|\d\)*\.\?\(_\|\d\)*\([eE][-+]\=\d\(_\|\d\)*\)\=\>"
 
 " Labels
-syn match    ocamlLabel        "\~\(\l\|_\)\(\w\|'\)*"lc=1
-syn match    ocamlLabel        "?\(\l\|_\)\(\w\|'\)*"lc=1
+syn match    ocamlLabel        "[~?]\(\l\|_\)\(\w\|'\)*:\?"
 syn region   ocamlLabel transparent matchgroup=ocamlLabel start="[~?](\(\l\|_\)\(\w\|'\)*"lc=2 end=")"me=e-1 contains=ALLBUT,@ocamlContained,ocamlParenErr
 
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+"" Type contexts
+
+" How we recognize type contexts is explained in `type-linter-notes.md`
+" and a test suite is found in `type-linter-test.ml`.
+"
+" ocamlTypeExpr is the cluster of things that can make up a type expression
+" (in a loose sense, e.g. the “as” keyword and universal quantification are
+" included). Regions containing a type expression use it like this:
+"
+"     contains=@ocamlTypeExpr,...
+"
+" ocamlTypeContained is the cluster of things that can be found in a type
+" expression or a type definition. It is not expected to be used in any region,
+" it exists solely for throwing things in it that should not pollute the main
+" linter.
+"
+" Both clusters are filled in incrementally. Every match group that is not to be
+" found at the main level must be declared as “contained” and added to either
+" ocamlTypeExpr or ocamlTypeContained.
+"
+" In these clusters we don’t put generic things that can also be found elswhere,
+" i.e. ocamlComment and ocamlPpx, because everything that is in these clusters
+" is also put in ocamlContained and thus ignored by the main linter.
+
+"syn cluster ocamlTypeExpr contains=
+syn cluster ocamlTypeContained contains=@ocamlTypeExpr
+syn cluster ocamlContained add=@ocamlTypeContained
+
+" We’ll use a “catch-all” highlighting group to show as error anything that is
+" not matched more specifically; we don’t want spaces to be reported as errors
+" (different background color), so we just catch them here:
+syn cluster ocamlTypeExpr add=ocamlTypeBlank
+syn match    ocamlTypeBlank    contained  "\_s\+"
+hi link ocamlTypeBlank NONE
+
+" NOTE: Carefully avoid catching "(*" here.
+syn cluster ocamlTypeExpr add=ocamlTypeParen
+syn region ocamlTypeParen contained transparent
+\ matchgroup=ocamlEncl start="(\*\@!"
+\ matchgroup=ocamlEncl end=")"
+\ contains=@ocamlTypeExpr,ocamlComment,ocamlPpx
+
+syn cluster ocamlTypeExpr add=ocamlTypeKeyChar,ocamlTypeAs
+syn match    ocamlTypeKeyChar  contained  "->"
+syn match    ocamlTypeKeyChar  contained  "\*"
+syn match    ocamlTypeKeyChar  contained  "#"
+syn match    ocamlTypeKeyChar  contained  ","
+syn match    ocamlTypeKeyChar  contained  "\."
+syn keyword  ocamlTypeAs       contained  as
+hi link ocamlTypeAs ocamlKeyword
+
+syn cluster ocamlTypeExpr add=ocamlTypeVariance
+syn match ocamlTypeVariance contained "[-+!]\ze *\('\|\<_\>\)"
+syn match ocamlTypeVariance contained "[-+] *!\+\ze *\('\|\<_\>\)"
+syn match ocamlTypeVariance contained "! *[-+]\+\ze *\('\|\<_\>\)"
+
+syn cluster ocamlTypeContained add=ocamlTypeEq
+syn match    ocamlTypeEq       contained  "[+:]\?="
+hi link ocamlTypeEq ocamlKeyChar
+
+syn cluster ocamlTypeExpr add=ocamlTypeVar,ocamlTypeConstr,ocamlTypeAnyVar,ocamlTypeBuiltin
+syn match    ocamlTypeVar      contained   "'\(\l\|_\)\(\w\|'\)*\>"
+syn match    ocamlTypeConstr   contained  "\<\(\l\|_\)\(\w\|'\)*\>"
+" NOTE: for correct precedence, the rule for the wildcard (ocamlTypeAnyVar)
+" must come after the rule for type constructors (ocamlTypeConstr).
+syn match    ocamlTypeAnyVar   contained  "\<_\>"
+" NOTE: For correct precedence, these builtin names must occur after the rule
+" for type constructors (ocamlTypeConstr) but before the rule for non-optional
+" labeled arguments (ocamlTypeLabel). For the latter to take precedence over
+" these builtin names, we use “syn match” here instead of “syn keyword”.
+syn match    ocamlTypeBuiltin  contained  "\<array\>"
+syn match    ocamlTypeBuiltin  contained  "\<bool\>"
+syn match    ocamlTypeBuiltin  contained  "\<bytes\>"
+syn match    ocamlTypeBuiltin  contained  "\<char\>"
+syn match    ocamlTypeBuiltin  contained  "\<exn\>"
+syn match    ocamlTypeBuiltin  contained  "\<float\>"
+syn match    ocamlTypeBuiltin  contained  "\<format\>"
+syn match    ocamlTypeBuiltin  contained  "\<format4\>"
+syn match    ocamlTypeBuiltin  contained  "\<format6\>"
+syn match    ocamlTypeBuiltin  contained  "\<in_channel\>"
+syn match    ocamlTypeBuiltin  contained  "\<int\>"
+syn match    ocamlTypeBuiltin  contained  "\<int32\>"
+syn match    ocamlTypeBuiltin  contained  "\<int64\>"
+syn match    ocamlTypeBuiltin  contained  "\<lazy_t\>"
+syn match    ocamlTypeBuiltin  contained  "\<list\>"
+syn match    ocamlTypeBuiltin  contained  "\<nativeint\>"
+syn match    ocamlTypeBuiltin  contained  "\<option\>"
+syn match    ocamlTypeBuiltin  contained  "\<out_channel\>"
+syn match    ocamlTypeBuiltin  contained  "\<ref\>"
+syn match    ocamlTypeBuiltin  contained  "\<result\>"
+syn match    ocamlTypeBuiltin  contained  "\<scanner\>"
+syn match    ocamlTypeBuiltin  contained  "\<string\>"
+syn match    ocamlTypeBuiltin  contained  "\<unit\>"
+
+syn cluster ocamlTypeExpr add=ocamlTypeLabel
+syn match    ocamlTypeLabel    contained  "?\?\(\l\|_\)\(\w\|'\)*\_s*:[>=]\@!"
+hi link ocamlTypeLabel ocamlLabel
+
+" Object type
+syn cluster ocamlTypeExpr add=ocamlTypeObject
+syn region ocamlTypeObject contained
+\ matchgroup=ocamlEncl start="<"
+\ matchgroup=ocamlEncl end=">"
+\ contains=ocamlTypeObjectDots,ocamlLCIdentifier,ocamlTypeObjectAnnot,ocamlTypeBlank,ocamlComment,ocamlPpx
+hi link ocamlTypeObject ocamlTypeCatchAll
+syn cluster ocamlTypeContained add=ocamlTypeObjectDots
+syn match ocamlTypeObjectDots contained "\.\."
+hi link ocamlTypeObjectDots ocamlKeyChar
+syn cluster ocamlTypeContained add=ocamlTypeObjectAnnot
+syn region ocamlTypeObjectAnnot contained
+\ matchgroup=ocamlKeyChar start=":"
+\ matchgroup=ocamlKeyChar end=";\|>\@="
+\ contains=@ocamlTypeExpr,ocamlComment,ocamlPpx
+hi link ocamlTypeObjectAnnot ocamlTypeCatchAll
+
+" Record type definition
+syn cluster ocamlTypeContained add=ocamlTypeRecordDecl
+syn region ocamlTypeRecordDecl contained
+\ matchgroup=ocamlEncl start="{"
+\ matchgroup=ocamlEncl end="}"
+\ contains=ocamlTypeMutable,ocamlLCIdentifier,ocamlTypeRecordAnnot,ocamlTypeBlank,ocamlComment,ocamlPpx
+hi link ocamlTypeRecordDecl ocamlTypeCatchAll
+syn cluster ocamlTypeContained add=ocamlTypeMutable
+syn keyword ocamlTypeMutable contained mutable
+hi link ocamlTypeMutable ocamlKeyword
+syn cluster ocamlTypeContained add=ocamlTypeRecordAnnot
+syn region ocamlTypeRecordAnnot contained
+\ matchgroup=ocamlKeyChar start=":"
+\ matchgroup=ocamlKeyChar end=";\|}\@="
+\ contains=@ocamlTypeExpr,ocamlComment,ocamlPpx
+hi link ocamlTypeRecordAnnot ocamlTypeCatchAll
+
+" Polymorphic variant types
+" NOTE: Carefully avoid catching "[@" here.
+syn cluster ocamlTypeExpr add=ocamlTypeVariant
+syn region ocamlTypeVariant contained
+\ matchgroup=ocamlEncl start="\[>" start="\[<" start="\[@\@!"
+\ matchgroup=ocamlEncl end="\]"
+\ contains=ocamlTypeVariantKeyChar,ocamlTypeVariantConstr,ocamlTypeVariantAnnot,ocamlTypeBlank,ocamlComment,ocamlPpx
+hi link ocamlTypeVariant ocamlTypeCatchAll
+syn cluster ocamlTypeContained add=ocamlTypeVariantKeyChar
+syn match ocamlTypeVariantKeyChar contained "|"
+syn match ocamlTypeVariantKeyChar contained ">"
+hi link ocamlTypeVariantKeyChar ocamlKeyChar
+syn cluster ocamlTypeContained add=ocamlTypeVariantConstr
+syn match ocamlTypeVariantConstr contained "`\w\(\w\|'\)*\>"
+hi link ocamlTypeVariantConstr ocamlConstructor
+syn cluster ocamlTypeContained add=ocamlTypeVariantAnnot
+syn region ocamlTypeVariantAnnot contained
+\ matchgroup=ocamlKeyword start="\<of\>"
+\ matchgroup=ocamlKeyChar end="|\|>\|\]\@="
+\ contains=@ocamlTypeExpr,ocamlTypeAmp,ocamlComment,ocamlPpx
+hi link ocamlTypeVariantAnnot ocamlTypeCatchAll
+syn cluster ocamlTypeContained add=ocamlTypeAmp
+syn match ocamlTypeAmp contained "&"
+hi link ocamlTypeAmp ocamlTypeKeyChar
+
+" Sum type definition
+syn cluster ocamlTypeContained add=ocamlTypeSumDecl
+syn region ocamlTypeSumDecl contained
+\ matchgroup=ocamlTypeSumBar    start="|"
+\ matchgroup=ocamlTypeSumConstr start="\<\u\(\w\|'\)*\>"
+\ matchgroup=ocamlTypeSumConstr start="\<false\>" start="\<true\>"
+\ matchgroup=ocamlTypeSumConstr start="(\_s*)" start="\[\_s*]" start="(\_s*::\_s*)"
+\ matchgroup=NONE end="\(\<type\>\|\<exception\>\|\<val\>\|\<module\>\|\<class\>\|\<method\>\|\<constraint\>\|\<inherit\>\|\<object\>\|\<struct\>\|\<open\>\|\<include\>\|\<let\>\|\<external\>\|\<in\>\|\<end\>\|)\|]\|}\|;\|;;\|=\)\@="
+\ matchgroup=NONE end="\(\<and\>\)\@="
+\ contains=ocamlTypeSumBar,ocamlTypeSumConstr,ocamlTypeSumAnnot,ocamlTypeBlank,ocamlComment,ocamlPpx
+hi link ocamlTypeSumDecl ocamlTypeCatchAll
+syn cluster ocamlTypeContained add=ocamlTypeSumBar
+syn match ocamlTypeSumBar contained "|"
+hi link ocamlTypeSumBar ocamlKeyChar
+syn cluster ocamlTypeContained add=ocamlTypeSumConstr
+syn match ocamlTypeSumConstr contained "\<\u\(\w\|'\)*\>"
+syn match ocamlTypeSumConstr contained "\<false\>"
+syn match ocamlTypeSumConstr contained "\<true\>"
+syn match ocamlTypeSumConstr contained "(\_s*)"
+syn match ocamlTypeSumConstr contained "\[\_s*]"
+syn match ocamlTypeSumConstr contained "(\_s*::\_s*)"
+hi link ocamlTypeSumConstr ocamlConstructor
+syn cluster ocamlTypeContained add=ocamlTypeSumAnnot
+syn region ocamlTypeSumAnnot contained
+\ matchgroup=ocamlKeyword start="\<of\>"
+\ matchgroup=ocamlKeyChar start=":"
+\ matchgroup=NONE end="|\@="
+\ matchgroup=NONE end="\(\<type\>\|\<exception\>\|\<val\>\|\<module\>\|\<class\>\|\<method\>\|\<constraint\>\|\<inherit\>\|\<object\>\|\<struct\>\|\<open\>\|\<include\>\|\<let\>\|\<external\>\|\<in\>\|\<end\>\|)\|]\|}\|;\|;;\)\@="
+\ matchgroup=NONE end="\(\<and\>\)\@="
+\ contains=@ocamlTypeExpr,ocamlTypeRecordDecl,ocamlComment,ocamlPpx
+hi link ocamlTypeSumAnnot ocamlTypeCatchAll
+
+" Type context opened by “type” (type definition), “constraint” (type
+" constraint) and “exception” (exception definition)
+syn region ocamlTypeDef
+\ matchgroup=ocamlKeyword start="\<type\>\(\_s\+\<nonrec\>\)\?\|\<constraint\>\|\<exception\>"
+\ matchgroup=NONE end="\(\<type\>\|\<exception\>\|\<val\>\|\<module\>\|\<class\>\|\<method\>\|\<constraint\>\|\<inherit\>\|\<object\>\|\<struct\>\|\<open\>\|\<include\>\|\<let\>\|\<external\>\|\<in\>\|\<end\>\|)\|]\|}\|;\|;;\)\@="
+\ contains=@ocamlTypeExpr,ocamlTypeEq,ocamlTypePrivate,ocamlTypeDefDots,ocamlTypeRecordDecl,ocamlTypeSumDecl,ocamlTypeDefAnd,ocamlComment,ocamlPpx
+hi link ocamlTypeDef ocamlTypeCatchAll
+syn cluster ocamlTypeContained add=ocamlTypePrivate
+syn keyword ocamlTypePrivate contained private
+hi link ocamlTypePrivate ocamlKeyword
+syn cluster ocamlTypeContained add=ocamlTypeDefAnd
+syn keyword ocamlTypeDefAnd contained and
+hi link ocamlTypeDefAnd ocamlKeyword
+syn cluster ocamlTypeContained add=ocamlTypeDefDots
+syn match ocamlTypeDefDots contained "\.\."
+hi link ocamlTypeDefDots ocamlKeyChar
+
+" When "exception" is preceded by "with", "|" or "(", that’s not an exception
+" definition but an exception pattern; we simply highlight the keyword without
+" starting a type context.
+" NOTE: These rules must occur after that for "exception".
+syn match ocamlKeyword "\<with\_s\+exception\>"lc=4
+syn match ocamlKeyword "|\_s*exception\>"lc=1
+syn match ocamlKeyword "(\_s*exception\>"lc=1
+
+" Type context opened by “:” (countless kinds of type annotations) and “:>”
+" (type coercions)
+syn region ocamlTypeAnnot matchgroup=ocamlKeyChar start=":\(>\|\_s*type\>\|[>:=]\@!\)"
+\ matchgroup=NONE end="\(\<type\>\|\<exception\>\|\<val\>\|\<module\>\|\<class\>\|\<method\>\|\<constraint\>\|\<inherit\>\|\<object\>\|\<struct\>\|\<open\>\|\<include\>\|\<let\>\|\<external\>\|\<in\>\|\<end\>\|)\|]\|}\|;\|;;\)\@="
+\ matchgroup=NONE end="\(;\|}\)\@="
+\ matchgroup=NONE end="\(=\|:>\)\@="
+\ contains=@ocamlTypeExpr,ocamlComment,ocamlPpx
+hi link ocamlTypeAnnot ocamlTypeCatchAll
+
+" Type annotation that gives the return type of a `fun` keyword
+" (the type context is ended by `->`)
+syn cluster ocamlTypeContained add=ocamlFunTypeAnnot
+syn region ocamlFunTypeAnnot contained containedin=ocamlFun
+\ matchgroup=ocamlKeyChar start=":"
+\ matchgroup=NONE end="\(->\)\@="
+\ contains=@ocamlTypeExpr,ocamlComment,ocamlPpx
+hi link ocamlFunTypeAnnot ocamlTypeCatchAll
+
+" Module paths (including functors) in types.
+" NOTE: This rule must occur after the rule for ocamlTypeSumDecl as it must take
+" precedence over it (otherwise the module name would be mistakenly highlighted
+" as a constructor).
+" NOTE: Carefully avoid catching "(*" here.
+syn cluster ocamlTypeExpr add=ocamlTypeModPath
+syn match ocamlTypeModPath contained "\<\u\(\w\|'\)*\_s*\."
+syn region ocamlTypeModPath contained transparent
+\ matchgroup=ocamlModPath start="\<\u\(\w\|'\)*\_s*(\*\@!"
+\ matchgroup=ocamlModPath end=")\_s*\."
+\ contains=ocamlTypeDotlessModPath,ocamlTypeBlank,ocamlComment,ocamlPpx
+hi link ocamlTypeModPath ocamlModPath
+syn cluster ocamlTypeContained add=ocamlTypeDotlessModPath
+syn match ocamlTypeDotlessModPath contained "\<\u\(\w\|'\)*\_s*\.\?"
+syn region ocamlTypeDotlessModPath contained transparent
+\ matchgroup=ocamlModPath start="\<\u\(\w\|'\)*\_s*(\*\@!"
+\ matchgroup=ocamlModPath end=")\_s*\.\?"
+\ contains=ocamlTypeDotlessModPath,ocamlTypeBlank,ocamlComment,ocamlPpx
+hi link ocamlTypeDotlessModPath ocamlTypeModPath
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 " Synchronization
 syn sync minlines=50
@@ -311,19 +569,19 @@ hi def link ocamlBrackErr	   Error
 hi def link ocamlParenErr	   Error
 hi def link ocamlArrErr	   Error
 
-hi def link ocamlCommentErr   Error
-
 hi def link ocamlCountErr	   Error
 hi def link ocamlDoErr	   Error
 hi def link ocamlDoneErr	   Error
 hi def link ocamlEndErr	   Error
 hi def link ocamlThenErr	   Error
+hi def link ocamlKwErr	   Error
 
 hi def link ocamlCharErr	   Error
 
 hi def link ocamlErr	   Error
 
 hi def link ocamlComment	   Comment
+hi def link ocamlShebang    ocamlComment
 
 hi def link ocamlModPath	   Include
 hi def link ocamlObject	   Include
@@ -344,13 +602,12 @@ hi def link ocamlStructEncl	   ocamlModule
 hi def link ocamlScript	   Include
 
 hi def link ocamlConstructor  Constant
-hi def link ocamlConstructorDelimiter  ocamlConstructor
+hi def link ocamlEmptyConstructor  ocamlConstructor
 
 hi def link ocamlVal          Keyword
 hi def link ocamlModPreRHS    Keyword
 hi def link ocamlMPRestr2	   Keyword
 hi def link ocamlKeyword	   Keyword
-hi def link ocamlKeywordDelimiter	   ocamlKeyword
 hi def link ocamlMethod	   Include
 hi def link ocamlArrow	   Keyword
 hi def link ocamlKeyChar	   Keyword
@@ -359,8 +616,6 @@ hi def link ocamlTopStop	   Keyword
 
 hi def link ocamlRefAssign    ocamlKeyChar
 hi def link ocamlEqual        ocamlKeyChar
-hi def link ocamlStar         ocamlInfixOp
-hi def link ocamlAngle        ocamlInfixOp
 hi def link ocamlCons         ocamlInfixOp
 
 hi def link ocamlPrefixOp       ocamlOperator
@@ -384,7 +639,24 @@ hi def link ocamlQuotedStringDelim Identifier
 
 hi def link ocamlLabel	   Identifier
 
-hi def link ocamlType	   Type
+" Type linting groups that the user can customize:
+" - ocamlTypeCatchAll: anything in a type context that is not caught by more
+"   specific rules (in principle, this should only match syntax errors)
+" - ocamlTypeConstr: type constructors
+" - ocamlTypeBuiltin: builtin type constructors (like int or list)
+" - ocamlTypeVar: type variables ('a)
+" - ocamlTypeAnyVar: wildcard (_)
+" - ocamlTypeVariance: variance and injectivity indications (+'a, !'a)
+" - ocamlTypeKeyChar: symbols such as -> and *
+" Default values below mimick the behavior before the type linter was
+" implemented, but now we can do better. :-)
+hi def link ocamlTypeCatchAll Error
+hi def link ocamlTypeConstr   NONE
+hi def link ocamlTypeBuiltin  Type
+hi def link ocamlTypeVar      NONE
+hi def link ocamlTypeAnyVar   NONE
+hi def link ocamlTypeVariance ocamlKeyChar
+hi def link ocamlTypeKeyChar  ocamlKeyChar
 
 hi def link ocamlTodo	   Todo
 
diff --git a/syntax/odin.vim b/syntax/odin.vim
index 9f8521ae8..418aa8dbc 100644
--- a/syntax/odin.vim
+++ b/syntax/odin.vim
@@ -11,6 +11,7 @@ syntax keyword odinTransmute transmute
 syntax keyword odinCast cast
 syntax keyword odinDistinct distinct
 syntax keyword odinOpaque opaque
+syntax keyword odinWhere where
 
 syntax keyword odinStruct struct
 syntax keyword odinEnum enum
@@ -47,10 +48,11 @@ syntax match odinFixMe "FIXME"
 syntax match odinNoCheckin "NOCHECKIN"
 syntax match odinHack "HACK"
 
-syntax keyword odinDataType string cstring bool b8 b16 b32 b64 rune any rawptr f32 f64 f32le f32be f64le f64be u8 u16 u32 u64 u128 u16le u32le u64le u128le u16be u32be u64be u128be uint uintptr i8 i16 i32 i64 i128 i16le i32le i64le i128le i16be i32be i64be i128be int complex complex32 complex64 complex128 quaternion quaternion64 quaternion128 quaternion256 matrix
+syntax keyword odinDataType string cstring bool b8 b16 b32 b64 rune any rawptr f16 f32 f64 f16le f16be f32le f32be f64le f64be u8 u16 u32 u64 u128 u16le u32le u64le u128le u16be u32be u64be u128be uint uintptr i8 i16 i32 i64 i128 i16le i32le i64le i128le i16be i32be i64be i128be int complex complex32 complex64 complex128 quaternion quaternion64 quaternion128 quaternion256 matrix typeid
 syntax keyword odinBool true false
 syntax keyword odinNull nil
 syntax keyword odinDynamic dynamic
+syntax keyword odinMap map
 syntax keyword odinProc proc
 syntax keyword odinIn in
 syntax keyword odinNotIn notin
@@ -65,9 +67,9 @@ syntax keyword odinPackage package
 syntax keyword odinReturn return
 syntax keyword odinDefer defer
 
-syntax region odinChar start=/\v'/ skip=/\v\\./ end=/\v'/
-syntax region odinString start=/\v"/ skip=/\v\\./ end=/\v"/
-syntax region odinRawString start=/\v`/ skip=/\v\\./ end=/\v`/
+syntax region odinRawString start=+`+ end=+`+
+syntax region odinChar start=+'+ skip=+\\\\\|\\'+ end=+'+
+syntax region odinString start=+"+ skip=+\\\\\|\\'+ end=+"+
 
 syntax match odinFunction "\v<\w*>(\s*::\s*proc)@="
 
@@ -96,7 +98,7 @@ syntax match odinMacro "#\<\w\+\>" display
 syntax match odinTemplate "$\<\w\+\>"
 
 syntax match odinCommentNote "@\<\w\+\>" contained display
-syntax region odinLineComment start=/\/\// end=/$/  contains=odinLineComment, odinCommentNote, odinTodo, odinNote, odinXXX, odinFixMe, odinNoCheckin, odinHack
+syntax region odinLineComment start=/\/\// end=/$/  contains=odinCommentNote, odinTodo, odinNote, odinXXX, odinFixMe, odinNoCheckin, odinHack
 syntax region odinBlockComment start=/\v\/\*/ end=/\v\*\// contains=odinBlockComment, odinCommentNote, odinTodo, odinNote, odinXXX, odinFixMe, odinNoCheckin, odinHack
 
 highlight link odinUsing Keyword
@@ -121,6 +123,7 @@ highlight link odinAlignOf Keyword
 highlight link odinPackage Keyword
 highlight link odinOrReturn Keyword
 highlight link odinOrElse Keyword
+highlight link odinWhere Keyword
 
 highlight link odinInline Keyword
 highlight link odinNoInline Keyword
@@ -133,6 +136,7 @@ highlight link odinDo Keyword
 
 highlight link odinDefer Operator
 highlight link odinDynamic Operator
+highlight link odinMap Operator
 highlight link odinRange Operator
 highlight link odinHalfRange Operator
 highlight link odinAssign Operator
diff --git a/syntax/openscad.vim b/syntax/openscad.vim
index 40156d58e..14e6b2236 100644
--- a/syntax/openscad.vim
+++ b/syntax/openscad.vim
@@ -32,7 +32,7 @@ syn keyword openscadPrimitiveSolid cube sphere cylinder polyhedron surface
 syn keyword openscadPrimitive2D square circle polygon import_dxf text
 syn keyword openscadPrimitiveImport import child children
 
-syn match openscadSpecialVariable "\$[a-zA-Z]\+\>" display
+syn match openscadSpecialVariable "\$[a-zA-Z0-9_]\+\>" display
 syn match openscadModifier "^\s*[\*\!\#\%]" display
 
 syn match openscadNumbers "\<\d\|\.\d" contains=openscadNumber display transparent
diff --git a/syntax/qml.vim b/syntax/qml.vim
index 73540c7cd..aee23df44 100644
--- a/syntax/qml.vim
+++ b/syntax/qml.vim
@@ -31,7 +31,7 @@ endif
 
 syn case ignore
 
-syn cluster qmlExpr              contains=qmlStringD,qmlStringS,qmlStringT,SqmlCharacter,qmlNumber,qmlObjectLiteralType,qmlBoolean,qmlType,qmlJsType,qmlNull,qmlGlobal,qmlFunction,qmlArrowFunction
+syn cluster qmlExpr              contains=qmlStringD,qmlStringS,qmlStringT,SqmlCharacter,qmlNumber,qmlObjectLiteralType,qmlBoolean,qmlType,qmlJsType,qmlNull,qmlGlobal,qmlFunction,qmlArrowFunction,qmlNullishCoalescing
 syn keyword qmlCommentTodo       TODO FIXME XXX TBD contained
 syn match   qmlLineComment       "\/\/.*" contains=@Spell,qmlCommentTodo
 syn match   qmlCommentSkip       "^[ \t]*\*\($\|[ \t]\+\)"
@@ -49,6 +49,7 @@ syn region  qmlRegexpString      start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gi
 syn match   qmlObjectLiteralType "[A-Za-z][_A-Za-z0-9]*\s*\({\)\@="
 syn region  qmlTernaryColon   start="?" end=":" contains=@qmlExpr,qmlBraces,qmlParens
 syn match   qmlBindingProperty   "\<[A-Za-z][_A-Za-z.0-9]*\s*:"
+syn match  qmlNullishCoalescing    "??"
 
 syn keyword qmlConditional       if else switch
 syn keyword qmlRepeat            while for do in
@@ -1065,7 +1066,7 @@ syntax keyword qmlObjectLiteralType XYSeries
 
 syntax keyword qmlObjectLiteralType YAnimator
 
-syntax keyword qmlObjectLiteralType ZoomBlur 
+syntax keyword qmlObjectLiteralType ZoomBlur
 
 " }}}
 
@@ -1126,6 +1127,7 @@ if version >= 508 || !exists("did_qml_syn_inits")
   HiLink qmlNull              Keyword
   HiLink qmlBoolean           Boolean
   HiLink qmlRegexpString      String
+  HiLink qmlNullishCoalescing Operator
 
   HiLink qmlIdentifier        Identifier
   HiLink qmlLabel             Label
diff --git a/syntax/requirements.vim b/syntax/requirements.vim
index 3835c07f8..d665d456b 100644
--- a/syntax/requirements.vim
+++ b/syntax/requirements.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'requirements', 'syntax/requir
 endif
 
 " the Requirements File Format syntax support for Vim
-" Version: 1.6.0
+" Version: 1.7.1
 " Author:  raimon <raimon49@hotmail.com>
 " License: MIT LICENSE
 " The MIT License (MIT)
@@ -34,6 +34,7 @@ endif
 
 syn case match
 
+syn match requirementsVersion "\v\d+[a-zA-Z0-9\.\-\*]*"
 syn region requirementsComment start="[ \t]*#" end="$"
 syn match requirementsCommandOption "\v^\[?--?[a-zA-Z\-]*\]?"
 syn match requirementsVersionSpecifiers "\v(\=\=\=?|\<\=?|\>\=?|\~\=|\!\=)"
@@ -43,14 +44,15 @@ syn match requirementsVersionControls "\v(git\+?|hg\+|svn\+|bzr\+).*://.\S+"
 syn match requirementsURLs "\v(\@\s)?(https?|ftp|gopher)://?[^\s/$.?#].\S*"
 syn match requirementsEnvironmentMarkers "\v;\s[^#]+"
 
-hi link requirementsComment Comment
-hi link requirementsCommandOption Special
-hi link requirementsVersionSpecifiers Boolean
-hi link requirementsPackageName Identifier
-hi link requirementsExtras Type
-hi link requirementsVersionControls Underlined
-hi link requirementsURLs Underlined
-hi link requirementsEnvironmentMarkers Macro
+hi def link requirementsVersion Number
+hi def link requirementsComment Comment
+hi def link requirementsCommandOption Special
+hi def link requirementsVersionSpecifiers Boolean
+hi def link requirementsPackageName Identifier
+hi def link requirementsExtras Type
+hi def link requirementsVersionControls Underlined
+hi def link requirementsURLs Underlined
+hi def link requirementsEnvironmentMarkers Macro
 
 let b:current_syntax = "requirements"
 
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
index a2fae63a3..a2e3c3aa8 100644
--- a/syntax/ruby.vim
+++ b/syntax/ruby.vim
@@ -402,11 +402,6 @@ if !exists("b:ruby_no_expensive") && !exists("ruby_no_expensive")
 
   SynFold 'for' syn region rubyRepeatExpression start="\<for\>" start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+=-]\|\%(\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\@<![!?]\)\s*\)\@<=\<\%(until\|while\)\>" matchgroup=rubyRepeat skip="\<end:" end="\<end\>" contains=ALLBUT,@rubyNotTop nextgroup=rubyOptionalDoLine
 
-  if !exists("ruby_minlines")
-    let ruby_minlines = 500
-  endif
-  exe "syn sync minlines=" . ruby_minlines
-
 else
   syn match rubyControl "\<def\>"    nextgroup=rubyMethodDeclaration skipwhite skipnl
   syn match rubyControl "\<class\>"  nextgroup=rubyClassDeclaration  skipwhite skipnl
@@ -415,6 +410,11 @@ else
   syn match rubyKeyword "\<\%(alias\|undef\)\>"
 endif
 
+if !exists("ruby_minlines")
+  let ruby_minlines = 500
+endif
+exe "syn sync minlines=" . ruby_minlines
+
 " Special Methods {{{1
 if !exists("ruby_no_special_methods")
   syn match rubyAccess	  "\<\%(public\|protected\|private\)\>" " use re=2
diff --git a/syntax/solidity.vim b/syntax/solidity.vim
index e533ab545..d145a5476 100644
--- a/syntax/solidity.vim
+++ b/syntax/solidity.vim
@@ -126,7 +126,7 @@ syn region    solFuncBody         contained contains=solDestructure,solComment,s
       \ start='{'
       \ end='}'
 syn match     solFuncCall         contained skipempty skipwhite nextgroup=solCallOptions,solFuncCallParens
-      \ '\v%(%(<if>|<uint>|<int>|<ufixed>|<bytes>|<address>|<string>|<bool>)\s*)@<!<[a-zA-Z_][0-9a-zA-Z_]*\s*%((\{(\n|.|\s)*\})?\s*(\((\n|.|\s)*\)))@='
+      \ '\v%(%(<if>|<uint>|<int>|<ufixed>|<bytes>|<address>|<string>|<bool>)\s*)@<!<[a-zA-Z_][0-9a-zA-Z_]*\s*%((\{[^}]*\})?\s*\()@='
 syn region    solFuncCallParens   contained transparent contains=solComment,solString,solFuncCall,solConstant,solNumber,solMethod,solTypeCast,solComma,solOperator
       \ start='('
       \ end=')'
diff --git a/syntax/swayconfig.vim b/syntax/swayconfig.vim
index 93832bcf3..9752846ce 100644
--- a/syntax/swayconfig.vim
+++ b/syntax/swayconfig.vim
@@ -6,7 +6,7 @@ endif
 " Language: sway config file
 " Original Author: Mohamed Boughaba <mohamed dot bgb at gmail dot com>
 " Maintainer: James Eapen <jamespeapen at gmail dot com>
-" Version: 1.0
+" Version: 0.11.6
 " Last Change: 2020-10-07 
 
 " References:
@@ -60,30 +60,41 @@ syn match swayConfigInitialize /^\s*set\s\+.*$/ contains=swayConfigVariable,sway
 " Gaps
 syn keyword swayConfigGapStyleKeyword inner outer horizontal vertical top right bottom left current all set plus minus toggle up down contained
 syn match swayConfigGapStyle /^\s*\(gaps\)\s\+\(inner\|outer\|horizontal\|vertical\|left\|top\|right\|bottom\)\(\s\+\(current\|all\)\)\?\(\s\+\(set\|plus\|minus\|toggle\)\)\?\(\s\+\(-\?\d\+\|\$.*\)\)$/ contains=swayConfigGapStyleKeyword,swayConfigNumber,swayConfigVariable
-syn keyword swayConfigSmartGapKeyword on inverse_outer contained
-syn match swayConfigSmartGap /^\s*smart_gaps\s\+\(on\|inverse_outer\)\s\?$/ contains=swayConfigSmartGapKeyword
-syn keyword swayConfigSmartBorderKeyword on no_gaps contained
-syn match swayConfigSmartBorder /^\s*smart_borders\s\+\(on\|no_gaps\)\s\?$/ contains=swayConfigSmartBorderKeyword
+syn keyword swayConfigSmartGapKeyword on inverse_outer off contained
+syn match swayConfigSmartGap /^\s*smart_gaps\s\+\(on\|inverse_outer\|off\)\s\?$/ contains=swayConfigSmartGapKeyword
+syn keyword swayConfigSmartBorderKeyword on no_gaps off contained
+syn match swayConfigSmartBorder /^\s*smart_borders\s\+\(on\|no_gaps\|off\)\s\?$/ contains=swayConfigSmartBorderKeyword
 
 " Keyboard bindings
 syn keyword swayConfigAction toggle fullscreen restart key import kill shrink grow contained
 syn keyword swayConfigAction focus move grow height width split layout resize restore reload mute unmute exit mode workspace container to output contained
 syn match swayConfigModifier /\w\++\w\+\(\(+\w\+\)\+\)\?/ contained contains=swayConfigVariableModifier
-syn match swayConfigNumber /\s\d\+/ contained
+syn match swayConfigNumber /\s[+-]\?\(\d\+\.\)\?\d\+/ contained
 syn match swayConfigUnit /\sp\(pt\|x\)/ contained
 syn match swayConfigUnitOr /\sor/ contained
-syn keyword swayConfigBindKeyword bindsym bindcode exec gaps border contained
+syn keyword swayConfigBindKeyword bindsym bindcode bindswitch bindgesture exec gaps border contained
 syn match swayConfigBindArgument /--\w\+\(\(-\w\+\)\+\)\?\s/ contained
-syn match swayConfigBind /^\s*\(bindsym\|bindcode\)\s\+.*$/ contains=swayConfigVariable,swayConfigBindKeyword,swayConfigVariableAndModifier,swayConfigNumber,swayConfigUnit,swayConfigUnitOr,swayConfigBindArgument,swayConfigModifier,swayConfigAction,swayConfigString,swayConfigGapStyleKeyword,swayConfigBorderStyleKeyword
+syn match swayConfigBind /^\s*\(bindsym\|bindcode\|bindswitch\)\s\+.*$/ contains=swayConfigVariable,swayConfigBindKeyword,swayConfigVariableAndModifier,swayConfigNumber,swayConfigUnit,swayConfigUnitOr,swayConfigBindArgument,swayConfigModifier,swayConfigAction,swayConfigString,swayConfigGapStyleKeyword,swayConfigBorderStyleKeyword
+
+" bindgestures
+syn keyword swayConfigBindGestureCommand swipe pinch hold contained
+syn keyword swayConfigBindGestureDirection up down left right next prev contained
+syn keyword swayConfigBindGesturePinchDirection inward outward clockwise counterclockwise contained
+syn match swayConfigBindGestureHold /^\s*\(bindgesture\)\s\+hold\(:[1-5]\)\?\s\+.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,swayConfigWorkspaceKeyword,swayConfigAction
+syn match swayConfigBindGestureSwipe /^\s*\(bindgesture\)\s\+swipe\(:[3-5]\)\?:\(up\|down\|left\|right\)\s\+.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,swayConfigWorkspaceKeyword,swayConfigAction
+syn match swayConfigBindGesturePinch /^\s*\(bindgesture\)\s\+pinch\(:[2-5]\)\?:\(up\|down\|left\|right\|inward\|outward\|clockwise\|counterclockwise\)\(+\(up\|down\|left\|right\|inward\|outward\|clockwise\|counterclockwise\)\)\?.*$/ contains=swayConfigBindKeyword,swayConfigBindGestureCommand,swayConfigBindGestureDirection,swayConfigBindGesturePinchDirection,swayConfigWorkspaceKeyword,swayConfigAction
 
 " Floating
+syn keyword swayConfigFloatingKeyword floating contained
+syn match swayConfigFloating /^\s*floating\s\+\(enable\|disable\|toggle\)\s*$/ contains=swayConfigFloatingKeyword
+
 syn keyword swayConfigFloatingModifier floating_modifier contained
-syn match swayConfigFloatingMouseAction /^\s\?.*floating_modifier\s.*\(normal\|inverted\)$/ contains=swayConfigFloatingModifier,swayConfigVariable
+syn match swayConfigFloatingMouseAction /^\s\?.*floating_modifier\s\S\+\s\?\(normal\|inverted\|none\)\?$/ contains=swayConfigFloatingModifier,swayConfigVariable
 
 syn keyword swayConfigSizeSpecial x contained
 syn match swayConfigNegativeSize /-/ contained
 syn match swayConfigSize /-\?\d\+\s\?x\s\?-\?\d\+/ contained contains=swayConfigSizeSpecial,swayConfigNumber,swayConfigNegativeSize
-syn match swayConfigFloating /^\s*floating_\(maximum\|minimum\)_size\s\+-\?\d\+\s\?x\s\?-\?\d\+/ contains=swayConfigSize
+syn match swayConfigFloatingSize /^\s*floating_\(maximum\|minimum\)_size\s\+-\?\d\+\s\?x\s\?-\?\d\+/ contains=swayConfigSize
 
 " Orientation
 syn keyword swayConfigOrientationKeyword vertical horizontal auto contained
@@ -125,6 +136,10 @@ syn keyword swayConfigExecKeyword exec exec_always contained
 syn match swayConfigNoStartupId /--no-startup-id/ contained " We are not using swayConfigBindArgument as only no-startup-id is supported here
 syn match swayConfigExec /^\s*exec\(_always\)\?\s\+.*$/ contains=swayConfigExecKeyword,swayConfigNoStartupId,swayConfigString
 
+" Input config
+syn keyword swayConfigInputKeyword input contained
+syn match swayConfigInput /^\s*input\s\+.*$/ contains=swayConfigInputKeyword
+
 " Automatically putting workspaces on specific screens
 syn keyword swayConfigWorkspaceKeyword workspace contained
 syn keyword swayConfigOutputKeyword output contained
@@ -139,8 +154,9 @@ syn keyword swayConfigFocusType output contained
 syn match swayConfigFocus /^\s*focus\soutput\s.*$/ contains=swayConfigFocusKeyword,swayConfigFocusType
 
 " Changing colors
-syn keyword swayConfigClientColorKeyword client focused focused_inactive unfocused urgent placeholder background contained
-syn match swayConfigClientColor /^\s*client.\w\+\s\+.*$/ contains=swayConfigClientColorKeyword,swayConfigColor,swayConfigVariable
+syn keyword swayConfigClientKeyword client contained
+syn keyword swayConfigClientColorKeyword focused focused_inactive focused_tab_title unfocused urgent placeholder contained
+syn match swayConfigClientColor /^\s*client.\w\+\s\+.*$/ contains=swayConfigClientKeyword,swayConfigClientColorKeyword,swayConfigColor,swayConfigVariable
 
 syn keyword swayConfigTitleAlignKeyword left center right contained
 syn match swayConfigTitleAlign /^\s*title_align\s\+.*$/ contains=swayConfigTitleAlignKeyword
@@ -156,8 +172,8 @@ syn match swayConfigMouseWarping /^\s*mouse_warping\s\+\(output\|none\)\s\?$/ co
 
 " Focus follows mouse
 syn keyword swayConfigFocusFollowsMouseKeyword focus_follows_mouse contained
-syn keyword swayConfigFocusFollowsMouseType yes no contained
-syn match swayConfigFocusFollowsMouse /^\s*focus_follows_mouse\s\+\(yes\|no\)\s\?$/ contains=swayConfigFocusFollowsMouseKeyword,swayConfigFocusFollowsMouseType
+syn keyword swayConfigFocusFollowsMouseType yes no always contained
+syn match swayConfigFocusFollowsMouse /^\s*focus_follows_mouse\s\+\(yes\|no\|always\)\s\?$/ contains=swayConfigFocusFollowsMouseKeyword,swayConfigFocusFollowsMouseType
 
 " Popups during fullscreen mode
 syn keyword swayConfigPopupOnFullscreenKeyword popup_during_fullscreen contained
@@ -192,15 +208,15 @@ syn keyword swayConfigDrawingMarksKeyword show_marks contained
 syn match swayConfigDrawingMarks /^\s*show_marks\s\+\(yes\|no\)\s\?$/ contains=swayConfigFocusWrappingType,swayConfigDrawingMarksKeyword
 
 " Group mode/bar
-syn keyword swayConfigBlockKeyword set input mode bar colors i3bar_command status_command position exec mode hidden_state modifier id position output background statusline tray_output tray_padding separator separator_symbol workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained
-syn region swayConfigBlock start=+.*s\?{$+ end=+^}$+ contains=swayConfigBlockKeyword,swayConfigString,swayConfigBind,swayConfigComment,swayConfigFont,swayConfigFocusWrappingType,swayConfigColor,swayConfigVariable transparent keepend extend
+syn keyword swayConfigBlockKeyword set bar colors i3bar_command status_command position hidden_state modifier id position background statusline tray_output tray_padding separator separator_symbol workspace_buttons strip_workspace_numbers binding_mode_indicator focused_workspace active_workspace inactive_workspace urgent_workspace binding_mode contained
+syn region swayConfigBlock start=+.*s\?{$+ end=+^}$+ contains=swayConfigBlockKeyword,swayConfigString,swayConfigAction,swayConfigBind,swayConfigComment,swayConfigFont,swayConfigFocusWrappingType,swayConfigColor,swayConfigVariable,swayConfigInputKeyword,swayConfigOutputKeyword transparent keepend extend
 
 " Line continuation
-syn region swayConfigLineCont start=/^.*\\$/ end=/^.*$/ contains=swayConfigBlockKeyword,swayConfigString,swayConfigBind,swayConfigComment,swayConfigFont,swayConfigFocusWrappingType,swayConfigColor,swayConfigVariable transparent keepend extend
+syn region swayConfigLineCont start=/^.*\\$/ end=/^[^\\]*$/ contains=swayConfigBlockKeyword,swayConfigString,swayConfigAction,swayConfigBind,swayConfigComment,swayConfigFont,swayConfigFocusWrappingType,swayConfigColor,swayConfigVariable,swayConfigExecKeyword transparent keepend extend
 
 " Includes with relative paths to config files
 syn keyword swayConfigInclude include contained
-syn match swayConfigFile /^include\s\(\~\?\/.*$\|\.\{0,2}\/.*$\)/ contains=swayConfigInclude
+syn match swayConfigFile /^\s\?include\s\+.*$/ contains=swayConfigInclude
 
 " xwayland 
 syn keyword swayConfigXwaylandKeyword xwayland contained
@@ -227,9 +243,14 @@ hi! def link swayConfigEdgeKeyword                     Type
 hi! def link swayConfigAction                          Type
 hi! def link swayConfigCommand                         Type
 hi! def link swayConfigOutputKeyword                   Type
+hi! def link swayConfigInputKeyword                    Type
 hi! def link swayConfigWindowCommandSpecial            Type
 hi! def link swayConfigFocusWrappingType               Type
 hi! def link swayConfigUnitOr                          Type
+hi! def link swayConfigClientColorKeyword              Type
+hi! def link swayConfigFloating                        Type
+hi! def link swayConfigBindGestureDirection            Constant
+hi! def link swayConfigBindGesturePinchDirection       Constant
 hi! def link swayConfigFontSize                        Constant
 hi! def link swayConfigColor                           Constant
 hi! def link swayConfigNumber                          Constant
@@ -247,8 +268,10 @@ hi! def link swayConfigAssignSpecial                   Special
 hi! def link swayConfigFontNamespace                   PreProc
 hi! def link swayConfigBindArgument                    PreProc
 hi! def link swayConfigNoStartupId                     PreProc
+hi! def link swayConfigBindGesture                     PreProc
 hi! def link swayConfigFontKeyword                     Identifier
 hi! def link swayConfigBindKeyword                     Identifier
+hi! def link swayConfigBindGestureCommand              Identifier
 hi! def link swayConfigOrientation                     Identifier
 hi! def link swayConfigGapStyle                        Identifier
 hi! def link swayConfigTitleAlign                      Identifier
@@ -257,7 +280,7 @@ hi! def link swayConfigSmartBorder                     Identifier
 hi! def link swayConfigLayout                          Identifier
 hi! def link swayConfigBorderStyle                     Identifier
 hi! def link swayConfigEdge                            Identifier
-hi! def link swayConfigFloating                        Identifier
+hi! def link swayConfigFloatingSize                    Identifier
 hi! def link swayConfigCommandKeyword                  Identifier
 hi! def link swayConfigNoFocusKeyword                  Identifier
 hi! def link swayConfigInitializeKeyword               Identifier
@@ -265,7 +288,7 @@ hi! def link swayConfigAssignKeyword                   Identifier
 hi! def link swayConfigResourceKeyword                 Identifier
 hi! def link swayConfigExecKeyword                     Identifier
 hi! def link swayConfigWorkspaceKeyword                Identifier
-hi! def link swayConfigClientColorKeyword              Identifier
+hi! def link swayConfigClientKeyword                   Identifier
 hi! def link swayConfigInterprocessKeyword             Identifier
 hi! def link swayConfigMouseWarpingKeyword             Identifier
 hi! def link swayConfigFocusFollowsMouseKeyword        Identifier
@@ -281,6 +304,7 @@ hi! def link swayConfigVariable                        Statement
 hi! def link swayConfigArbitraryCommand                Type
 hi! def link swayConfigInclude                         Identifier
 hi! def link swayConfigFile                            Constant
+hi! def link swayConfigFloatingKeyword                 Identifier
 hi! def link swayConfigFloatingModifier                Identifier
 hi! def link swayConfigFloatingMouseAction             Type
 hi! def link swayConfigFocusKeyword                    Type
diff --git a/syntax/swift.vim b/syntax/swift.vim
index 2dcb0376e..90035eacd 100644
--- a/syntax/swift.vim
+++ b/syntax/swift.vim
@@ -192,6 +192,7 @@ syntax match swiftMultiwordKeywords "indirect enum"
 syntax region swiftEscapedReservedWord start="`" end="`" oneline
 
 syntax keyword swiftAttributes
+      \ @_disfavoredOverload
       \ @_exported
       \ @_implementationOnly
       \ @_silgen_name
diff --git a/syntax/tmux.vim b/syntax/tmux.vim
index f73e8e49b..f3917e703 100644
--- a/syntax/tmux.vim
+++ b/syntax/tmux.vim
@@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'tmux', 'syntax/tmux.vim')
 endif
 
 " Language: tmux(1) configuration file
-" Version: 3.3-rc (git-8bcd392e)
+" Version: 3.3a (git-7b8ececd)
 " URL: https://github.com/ericpruitt/tmux.vim/
 " Maintainer: Eric Pruitt <eric.pruitt@gmail.com>
 " License: 2-Clause BSD (http://opensource.org/licenses/BSD-2-Clause)
@@ -165,7 +165,7 @@ syn keyword tmuxCommands
 \ switch-client switchc unbind unbind-key unlink-window unlinkw wait wait-for
 
 syn keyword tmuxEnums
-\ absolute-centre always any arrows bar blinking-bar blinking-block
+\ absolute-centre all always any arrows bar blinking-bar blinking-block
 \ blinking-underline block both bottom centre color colour current default
 \ double emacs external failed heavy largest latest left manual no-detached
 \ none number off on other padded right rounded simple single smallest top
diff --git a/tests/filetypes.vim b/tests/filetypes.vim
index 1e54cfbe7..2588cf3f3 100644
--- a/tests/filetypes.vim
+++ b/tests/filetypes.vim
@@ -94,7 +94,6 @@ call TestFiletype('fish')
 call TestFiletype('fbs')
 call TestFiletype('forth')
 call TestFiletype('fsharp')
-call TestFiletype('gdscript3')
 call TestFiletype('gitconfig')
 call TestFiletype('gitrebase')
 call TestFiletype('gitsendemail')

From 692e359ad9344d6e69626131f5c96743560e4d53 Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Tue, 22 Oct 2024 08:33:53 +0200
Subject: [PATCH 297/299] Update README.md

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 113ce5a60..b4442d22f 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,7 @@ This is my top-starred repository on Github, so I've decided to put this ad here
 
 If you work for big corp and seek consulting, please visit following repository: https://github.com/sheerun/consultation
 
-![vim-polyglot](https://i.imgur.com/9RxQK6k.png)
-
-[![build](https://github.com/sheerun/vim-polyglot/workflows/Vim%20Polyglot%20CI/badge.svg)](https://github.com/sheerun/vim-polyglot/actions) [![Maintenance](https://img.shields.io/badge/maintained%20since-2013-yes)]()
+![vim-polyglot](https://i.imgur.com/9RxQK6k.png
 
 A collection of language packs for Vim.
 

From f5393cfee07aeb666f4d75f9b3a83163862fb094 Mon Sep 17 00:00:00 2001
From: Haim <himan7991@gmail.com>
Date: Thu, 5 Dec 2024 00:22:43 +0200
Subject: [PATCH 298/299] Update README.md (#861)

Fix parenthesis missing, thus logo was not showing up
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b4442d22f..474ecb54c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ This is my top-starred repository on Github, so I've decided to put this ad here
 
 If you work for big corp and seek consulting, please visit following repository: https://github.com/sheerun/consultation
 
-![vim-polyglot](https://i.imgur.com/9RxQK6k.png
+![vim-polyglot](https://i.imgur.com/9RxQK6k.png)
 
 A collection of language packs for Vim.
 

From f061eddb7cdcc614c8406847b2bfb53099832a4e Mon Sep 17 00:00:00 2001
From: Adam Stankiewicz <sheerun@sher.pl>
Date: Wed, 27 Aug 2025 19:10:22 +0200
Subject: [PATCH 299/299] Update README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 474ecb54c..5ae00fe5e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-This is my top-starred repository on Github, so I've decided to put this ad here:
-
-If you work for big corp and seek consulting, please visit following repository: https://github.com/sheerun/consultation
-
 ![vim-polyglot](https://i.imgur.com/9RxQK6k.png)
 
 A collection of language packs for Vim.